gentoo resync : 20.10.2021

10287 files changed, 99637 insertions, 108811 deletions

diff --git a/Manifest b/Manifest
index 00dfe11d9ba0..00504a55f2a8 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29301 BLAKE2B d4f8f77f2b9a82075e0a58ab19d22f9daa685f1058342471eabafa80fde103daacbfd0b3937c48b38b68bdd49eddbf1d099fa05adbb33c469510540853a3e566 SHA512 79877a9c11d5e329e4ccd24a9351476e48cd8797a09d40a6669ac30e635b7e9fe69a501efa9631e550264ddf6f1908aac1cc852111b37dd9f7f3939b8a19fcf6
-TIMESTAMP 2021-10-08T21:09:18Z
+MANIFEST Manifest.files.gz 29296 BLAKE2B 254213c98d92284d4bd96b8f10986be445398903a4dfa2398ecd5f21e598e27b02fd418bd71d36c216e8237f80531c2705da7c886bb7f8aeb8080d4dc10b16bd SHA512 7ffb33433c26b6827d8044eec7bf443e2a84f666bff00cfc989932de2422a8435575b3138e62d403833b11856b695f9931d7fee0a67ef7a1cb6affcfe81b6abb
+TIMESTAMP 2021-10-20T08:39:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFgs35fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFv1aRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAVJg/+JyC9we+c4V0DxZCAh8po/vR+dzqfkgr+37G6CVnYJsgfGoFXVTNoJle2
-wgMFfhN3FTondHBNhG2Pm8EaPIPgsyx1Uxz+a1qCJ7M4kHYkz4eXmMfOQs2rQaPs
-sS0Ppm7erDlXw0Oeobi2xacqoR1/vesuHeqs308h/ZEMlq+j6c9m6pvcuJJ20kiM
-geYvknz16CyXplEEaGLUkwMEGxuJrMDBA+zv+DEOYm/fTMx2154ejMx+SC9aLZTr
-OW+zs5fc1bOaWjR7XIgsQ+6h2Iy74Cd39afv7zWua92qbeJBcLvg37fncH7LUJfC
-T3N3hhbqLgjznzM8nTCHXpqvIdCvp/FKADIfalACp1PmQMRBOrop+WxYJafuPzGf
-b4zSBn60SgpPYFMHJHx7M3uCPuLqZZCPaq6xcGVD0tfkuvJ/cejSdPjyTCLm2j5y
-b4HU1b0hs4W/lLTSTupKxo83KUHyQIblZwx0CAEkCFa0VQWWMDvkm+/kHlgYyTqn
-NdYZCpPDbqDrp6K4aVgYEwvGQDwlhWjoCOYgNWqD1XoErjQ0ZAi5RVi96YCPy/SW
-oeykepbUDstsdn15M+7yjaMhGKB68y0wMCtO8niXFZKeXyy655jM5Tly/6oqiTOZ
-DVdIpOq2MfZvdx2nH1HvvvZCo1MqU+IBLbgKPIFpObClvfVraAk=
-=kY8d
+klACTw/9EcRloIwe7KhQt8SA8onOvhhdSvEgavfbdLpgcYqboTXve6IbrPG5OFm0
+BYiRReEceXV7g+eYFOz2T5YwOAOHg7VsqbhW5DvxmHQcWQ3pgXC3XiB+NKhczPu8
+ugetl1ihQ/WYCyMNwTylAoHngSd+Pv7Z6u11zKOuz1/jEItN2AN4OU1aLHa2P4eu
+U9QeTxAH/7Id3JZzK2/9+oT+x64gpFKmpVx2LfZXjtKXX21kiTlbwcGESjxry3R1
+ggQR5x197qrThyJdNpxKV1DbPIhCrYBgjiUi0ozJLomIv8xbYf4MHPMV87LY3zlj
+yqPz/C1IC8n69I6uHCcQQUDxGiFCmw7t2okRpRzLX0209QKSkG79hVOsIxo+5ECR
+AmKZNdrLo7SMun9lTgE4Mv18i1kVYk1vU9c0aBqEmChQcDvhdyQWWMiVPGB2ALAP
+JSZZ25sMMWExVLXgUS/wJnwou1MEWD1R+xZMiMSx9fQVm3KFvgEN2epKGQRHPldp
+1OQQUF4n26vwCnyGowqC82w4OvPj+5MoJMJ/2uG6vNXxDR6Q/qpe0pLr06uSBarP
+ssdxNqWQEv+U++K/0gqOnbgUcD4l4q4eaceoQkk4xDMXzwScVWauYR23le5NWn3a
+qfyUbZZrC0SiRAKTZJzJm8ZTn+j7O2Jwzqon9B7kn4IKzYcqrXU=
+=kErx
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 19d866dc6777..15a733e5ef8c 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 28212d799085..6819c8229081 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
diff --git a/acct-group/seat/Manifest b/acct-group/seat/Manifest
new file mode 100644
index 000000000000..fecea503330c
--- /dev/null
+++ b/acct-group/seat/Manifest
@@ -0,0 +1,2 @@
+EBUILD seat-0.ebuild 185 BLAKE2B be6dffb8cc37a688be351ddea569584a86063fe174237965fc304cc8880ffeae0763fe3e7ea5679d474a75d1104d50f2a2ab264de13c3bd5477f2cf68388dd83 SHA512 c6c4540f630a5e0253ae8ae933629f4c361aea37d70a08de31ea9449e786311654f421336c80e101a1bd81fe1593cc6c6f26745adc4dd7abd8cd679578c72a3d
+MISC metadata.xml 251 BLAKE2B b1949292bb332d69832bf47a05a2f53519bb6c233a09b8e595dac3ca8aff30e213aeefef78bbd8b0b52124b43669042e0d63c476b5dcacb309468bd4f233da83 SHA512 97acf3ebe0b0e94afecdbd634bb9800f9930660cb8f6be45fc54a6e24534a64399549ce1dc0862ab7d9bb3034bccdc6c96931046769846f847b769c9899f6037
diff --git a/acct-group/seat/metadata.xml b/acct-group/seat/metadata.xml
new file mode 100644
index 000000000000..8b1443351bf8
--- /dev/null
+++ b/acct-group/seat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arthurzam@gentoo.org</email>
+		<name>Arthur Zamarin</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/seat/seat-0.ebuild b/acct-group/seat/seat-0.ebuild
new file mode 100644
index 000000000000..b5c12d09822b
--- /dev/null
+++ b/acct-group/seat/seat-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+DESCRIPTION="Group for sys-auth/seatd"
+ACCT_GROUP_ID=202
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index a97de2176602..aae391e7ae37 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/fcron/Manifest b/acct-user/fcron/Manifest
new file mode 100644
index 000000000000..e46d03e80fb1
--- /dev/null
+++ b/acct-user/fcron/Manifest
@@ -0,0 +1,2 @@
+EBUILD fcron-0.ebuild 244 BLAKE2B e052d56cc913f14ea565234c61ba8802da78c3a3c1afd64399abd97e22a4ad9b6e525aea0bb85b63bf5f8dd056dcab7473f746408b05594f461722936974588b SHA512 4530971666a480beac9df22a759e50d76e7c82d586e083076ad010c6da5faf4ea863c4ce3e8907f8eed7583142872cec2b57780cafb1d28588c481ff91619dfb
+MISC metadata.xml 364 BLAKE2B 887c538de00fc598971f0d15f6010bf24e833fdd9a722fa7fb673a4b94c03cb7c34c787be036795861841a6c89028fd5e1bab56c063f20b48d5cd3e51c7e8b96 SHA512 ab949d886664b054e13d9503320af6d728044234fc1004686bbaedd66fbbd1899b896e085ae70edf3a4b0972242a43d4cd8a78ee23270bac41b5919ccac9bed1
diff --git a/acct-user/fcron/fcron-0.ebuild b/acct-user/fcron/fcron-0.ebuild
new file mode 100644
index 000000000000..2cf35de584c6
--- /dev/null
+++ b/acct-user/fcron/fcron-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sys-process/fcron"
+
+ACCT_USER_GROUPS=( "fcron" )
+ACCT_USER_ID="120"
+
+acct-user_add_deps
diff --git a/acct-user/fcron/metadata.xml b/acct-user/fcron/metadata.xml
new file mode 100644
index 000000000000..891fc5d08472
--- /dev/null
+++ b/acct-user/fcron/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>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 5be63f24eae4..4d0d55c0e5b7 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/espeak-ng/Manifest b/app-accessibility/espeak-ng/Manifest
index 5b78abad1ca3..a29f7d94178a 100644
--- a/app-accessibility/espeak-ng/Manifest
+++ b/app-accessibility/espeak-ng/Manifest
@@ -1,4 +1,4 @@
 DIST espeak-ng-1.50.tar.gz 13665536 BLAKE2B c64c2a474374d4b6fe13bf3a99f5dfb661923c13ebd6c0bc323e7f26d9d90945c7075cc5c8f4b51e5db3303632c8c9daca7a65a1883e09d7c3faf63dd725ea3f SHA512 297dd80a6cdae3e2b8acf6823475220ce89d6a5fb68ea303156ad52cb3e7388049b6921759d4ed4e3d2e2ebd19bf931259e454f74a2ac0b7ecf4ce56c1d60c0c
-EBUILD espeak-ng-1.50.ebuild 1701 BLAKE2B e30efb0469c9d60833f3c07c32a6bc23b501c40e893c04dd141202e55eac832b39d0e18e046640931ac2d2597d666f2dacf66dbab85a811cc1690a3cb3a13594 SHA512 1e382cffcefe6e7cb9775957edf51cc748944acc52cb06e01f360318c6b73fe2b0bb94f23e3c9ba5d52ded3ec683d6c80007340fcf48f4937b2a50fa45e836cd
+EBUILD espeak-ng-1.50.ebuild 1706 BLAKE2B bafd021df493c51764ec7341c191e6f12e907886deb3deebca7a7b44e791c9bbe7bb29b50e2e259948dde0970b9fb541469601f8529132f8a1d9c8b49d3ea108 SHA512 5b98b7e7d4fc8e9bbdda58579920aca7a2352f8f88a49861790b743c767d15efbd61f196263839d3fe88549ba2668c4d083148ae456dc2b15bb68e52622be99c
 EBUILD espeak-ng-9999.ebuild 1643 BLAKE2B c37bf379661ac3fdaf2bc6078868de82d57620dcbb0ce101065f28e275c985dbf034481bb7544dbf6858e1bd283f077f4f6eac01a2dc97b3333a2ea78e315c21 SHA512 1dc4ec1cfb1b317cfe645ba7f30a09689d00bad68f367d74e4564626535f564493f890cf26efc1738b8df084fc68b94a3a31407ff3eade05c1f189fc836105c4
 MISC metadata.xml 959 BLAKE2B cf593df0a2ac774e7ba15f77fc8b9cda2907d9d721c61fa602df8653f4019ed46fdadc39353c7ca4f1dbc46245ff28c922fe2844d49c5346a1b7fa7f02005c3b SHA512 4dce4bcbaf2dbd3bbfd0f6503884dc47690d648ce04c489688818aaef15e555fb76e33a49a484e8197631b2885297541f4ef80d0074d44d3f44aeb923a3ea698
diff --git a/app-accessibility/espeak-ng/espeak-ng-1.50.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.50.ebuild
index 9f3f16e4a69c..de70028fc38a 100644
--- a/app-accessibility/espeak-ng/espeak-ng-1.50.ebuild
+++ b/app-accessibility/espeak-ng/espeak-ng-1.50.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/espeak-ng/espeak-ng/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-3+ Turkowski unicode"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+async +klatt l10n_ru l10n_zh man mbrola +sound"
 
 COMMON_DEPEND="
diff --git a/app-accessibility/kontrast/Manifest b/app-accessibility/kontrast/Manifest
index a1514efb5471..895eebdf4df5 100644
--- a/app-accessibility/kontrast/Manifest
+++ b/app-accessibility/kontrast/Manifest
@@ -1,5 +1,5 @@
 DIST kontrast-21.04.3.tar.xz 123764 BLAKE2B 8788b3b0e479b39a2065be61ae2e4fdc34c393a12be6547b596be1dd60fce8d3c8a98b2d7bb8ac7626c75570c92b52cd13cbfec1c61470c09abba931e5c7d7ab SHA512 fc966e28e790d49e2c87d45c506a7cf5170115f6528821f8634ab2e767ba725b9c6934cdfec5a308c751ff1b83fc59bea31dc50a462a81d71f47652a8b974e2a
 DIST kontrast-21.08.2.tar.xz 125640 BLAKE2B c1338d2784aa94f421aa4093dfa0c92bf629a8517a2946a21ff4a6b7381c4cecd4e5a01e7853af7e574ff3625692af21582c68659cebfce31135a85cefa755e3 SHA512 31bae6276d70c917a6d8c8acf60405f9714d94d1918e2a5caef6ec9cd2038dab137ed28f5cd002fab1aea36aa9f01f97319fcce79c637f076a9dbcb195db9841
 EBUILD kontrast-21.04.3.ebuild 805 BLAKE2B bcdfa53b33b9881ad6fe8208cfe8e8ebf296762ab28f30183d89710b4ec1680657c9c37a2b82670eee86715d27c440dbfd8f1dc71d272579ff4c2f34e4cb768c SHA512 d833194e4d3e98d1e642447eb0b0193743b93f0fa8df704898f98af787c6da3eb2335f2a2d4240c5c9cdbc5a4144cae496acca496319d76d8da51ea618bd0e72
-EBUILD kontrast-21.08.2.ebuild 808 BLAKE2B 5fd4afc2036cc6ebd6375b159c436d2e3ea6fa80ca4464c7e33dc3f012598a068ca6626cd1286c67860292a529cf9715480cd2db968997d9c724fd7e5392fbc9 SHA512 6c88082d80c516def8c386f2bc52c77040a7738eb6848c3b6f6c5ffb5511d45d6f74cd6dbaaf89e3299195f6230d6164408b71b1c176de8a744ae24dcdfeeb35
+EBUILD kontrast-21.08.2.ebuild 815 BLAKE2B a4099b1063d3f54f805556342b3c1d07fc2a81f2423c6843dfd66fe87fb4a2753a6c1e063d6e71a5bd18f6adc2d7a2a7cfc75144deb76c5c89a65a1c8b86d853 SHA512 7141779ee01046e5c74fc4c8690545e0edf0886cd1cf5ac035408e8bd32fb503df05c4184d60b255c98dd219a5b0a6951bf08b796696dd8519b4f332906d1b63
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-accessibility/kontrast/kontrast-21.08.2.ebuild b/app-accessibility/kontrast/kontrast-21.08.2.ebuild
index dcd18ee7f2d7..e5237f9dd823 100644
--- a/app-accessibility/kontrast/kontrast-21.08.2.ebuild
+++ b/app-accessibility/kontrast/kontrast-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kontrast/"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index a9bc7e881002..df54ce7951b7 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index 80151bf3684c..cf3c40036dd6 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -2,9 +2,11 @@ DIST ansible-base-2.10.10.tar.gz 5986488 BLAKE2B 5c793d25ac5a216d05e15f49cd447cb
 DIST ansible-core-2.11.3.tar.gz 6841255 BLAKE2B fde1143515d04121de79ddb2c14bf326f9efa596c39418b9def1679539dd144551b64dff83c66795e44f48e776dbc60bc456125904bbb64970f8c44e072b5abf SHA512 93a28200dd0ab289cc05add5fbe46a1cfbbd4ba91fc7d7e95ee4060dc4f126bf4bd4affce5e44dac9cf2c12792b2a2a10b97d96b795f5bed579959391b7c4a65
 DIST ansible-core-2.11.4.tar.gz 6843603 BLAKE2B fa8e72a9e77633b1b43a9a290d92db009e95ed87357f666059ed7898031f584c993ebeb6acec8cad29376666f3a714a742f4e52ac8f2baaf5d01c02796b64acd SHA512 9385a3877e6e9a25d244c855cf50c0c6b62a91cc9cebc5e7b5b5ec23424b3e3dcddd71e7367482a03996fcd5d591ad29771edd19d62758ae61473f97a5c9351d
 DIST ansible-core-2.11.5.tar.gz 6847600 BLAKE2B 83a80dcfda427b5d41eb3288d6b60cf710124a82edce2817a6bd5bbed0dc0157fed444b45db6428640dd25164306c987af9aba6f87ef52c63229ae113754b7c3 SHA512 73cfdb65e984856b84a0f7d0e1164a97ddbcdc38e00479f15c4a335297ba3a8f43dc503dc5b4a3f1fea06f91a3c4590b66dd680adb95b765c034207a8de5d589
+DIST ansible-core-2.11.6.tar.gz 6999232 BLAKE2B 5105928881297226e982e42c8027a370ad31869d92ca87d338cdb6e72504a22cf3fe7843921905599c7126c840197fb7799a72c261a007437a437b85c4a65c68 SHA512 d14686afb7b2802be3bca3baf6f3840d33f7994b7c48fcb4d42f871e13e4eb54ffef413e124dbe614a55041c23b509f5e887b687dbb6c4868425957cac45910a
 EBUILD ansible-base-2.10.10.ebuild 1633 BLAKE2B 425db4ea1e64c960b86d56cccddeb59edd838f389bb685c145babd0e885677de76b364383b801f7ffbdc61fd6a46f8baa24c26e45f00e984aa162bbcac4ae24b SHA512 2b67326ac2653e03b37829db0952232183b2f79d7e66c3d5a78847f17b2f5f93f27bccf39e164af56f80c1ee8acb69c3379bb6107c0e987aeeabb6caf3547c52
 EBUILD ansible-base-2.11.3.ebuild 1603 BLAKE2B 8ca4f3d4c4a1e494e0efe5bba55de5e71ca5e229c86c5046181d8d89e890115b823ad99d133c3ec22b06dd653cd23b65b159bc83cdbe990c2c527c0bb8bca9f5 SHA512 2513a5654edbce7a6161044f6983f3b8f041f1b158598c64d14e242afc642309be559b89899472ceec5b253a1792909ccc1bd20d3bf82175eeac360ef6568d4a
 EBUILD ansible-base-2.11.4.ebuild 1613 BLAKE2B edd0951d0e8546271896856de2c23f6873d2ac2a0c0f68a82de24b1bc180e10dbe183f07611e5c872785a77048e5b642476d7b516367ef84d1622f3e5ca8098d SHA512 cf34c497fc24225adf242a7871bb078d90e337684e649b7643da11afc0892b3ddefacb4c55484007a1ceab9e7306ec7551d190154cdeae3a0d0461a9a9cdcdf6
 EBUILD ansible-base-2.11.5.ebuild 1613 BLAKE2B edd0951d0e8546271896856de2c23f6873d2ac2a0c0f68a82de24b1bc180e10dbe183f07611e5c872785a77048e5b642476d7b516367ef84d1622f3e5ca8098d SHA512 cf34c497fc24225adf242a7871bb078d90e337684e649b7643da11afc0892b3ddefacb4c55484007a1ceab9e7306ec7551d190154cdeae3a0d0461a9a9cdcdf6
+EBUILD ansible-base-2.11.6.ebuild 1613 BLAKE2B edd0951d0e8546271896856de2c23f6873d2ac2a0c0f68a82de24b1bc180e10dbe183f07611e5c872785a77048e5b642476d7b516367ef84d1622f3e5ca8098d SHA512 cf34c497fc24225adf242a7871bb078d90e337684e649b7643da11afc0892b3ddefacb4c55484007a1ceab9e7306ec7551d190154cdeae3a0d0461a9a9cdcdf6
 EBUILD ansible-base-9999.ebuild 1613 BLAKE2B edd0951d0e8546271896856de2c23f6873d2ac2a0c0f68a82de24b1bc180e10dbe183f07611e5c872785a77048e5b642476d7b516367ef84d1622f3e5ca8098d SHA512 cf34c497fc24225adf242a7871bb078d90e337684e649b7643da11afc0892b3ddefacb4c55484007a1ceab9e7306ec7551d190154cdeae3a0d0461a9a9cdcdf6
 MISC metadata.xml 1040 BLAKE2B c516a3b141924ad21424220f2a9df134d428156283f00f01a6c953ef837bef941fff9f345b48aae23a4af29c938d5053f6147d2e7c43b24af16c1c68b79b9d5b SHA512 6e99c597f3d16d8a5173da3334639e0beed6c95235082b152a3ca256de4a10907c083a646d69152fad23816ac2fb81d0f8d3188fe1713f4030a638cd225e3f61
diff --git a/app-admin/ansible-base/ansible-base-2.11.6.ebuild b/app-admin/ansible-base/ansible-base-2.11.6.ebuild
new file mode 100644
index 000000000000..18cd0f14676d
--- /dev/null
+++ b/app-admin/ansible-base/ansible-base-2.11.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	MY_PN="${PN/-base/-core}"
+	MY_P="${MY_PN}-${PV}"
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 435c2cf455e9..15059df9d95a 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,5 +1,7 @@
 DIST ansible-4.3.0.tar.gz 35135987 BLAKE2B 6f4bf55f07275b7264a7fba693816bf925d574d4da3d4d13af9b85c44d4b5adf9e823b9bd936408a0e424273f8f2aa529e960105842444d26eb3f45973109ec5 SHA512 035a236d0762e425c4ce4ffd709386075aee438bb8085a25920543bb2378feb07fb8f0a50ce9fb6b0d1f5dde1f27a408b828c286bfc1173d38da5f8c7b572c3a
 DIST ansible-4.5.0.tar.gz 35530106 BLAKE2B 3176f374df6b9e7fdb8554187f8132a25b474627d66729c776e5935ee0eb84c296e951a511afec6787bb1cebda8d72670f9305e1904cff221229a459a671ddf7 SHA512 fd8461d22d6d3fd325a12480d78009cf65580c790c56164a50c5d74061034a1f387772f687bc730d23192a9a72221f87e11a44e984d05308311b9d6d2441a976
+DIST ansible-4.6.0.tar.gz 35644507 BLAKE2B 94f544caa81ba7d20493f469483612f2ebf9eb1c4be18006b5ca6afdb3bd45428226340a0658b8f1ebecf8bd06396763ba888bb1cbd48aa6b71aaa6a56542d38 SHA512 5b7fad69628dded0b42a25e3f2fbbcc30ef876dc3f97dc1dff2c7db6443d1506fe5db62bc4d8a00ebfb7dc78ecc205a56bea3bf760f85260c835b2286f63b702
 EBUILD ansible-4.3.0.ebuild 701 BLAKE2B 23fb332fd50a5de4e58bdf7479eb072284e8bafac36a6340da061e8a0bda644a4dfb5e4aec4be0bd182a43d20a7157f8656016965a62ab5eca17dc9f72879686 SHA512 1887aefe7d3ceb06703cce26f2442fec8de7ccdd740b5cb24cf67945ee5efdbe7adbe3cbec64dbcd2ea6b16db573f80cd4fa22896187d976a5a2fb29cb885548
 EBUILD ansible-4.5.0.ebuild 704 BLAKE2B 89f8adde05724b84dd372ca4513a9f90f3a09587ca59e0c305a74d82558057d9250e8bbb6154d85cdb4e5756383f553e937823c34106de8560fed64a9d2ba7cc SHA512 dbe013ad6887395617645669b5395bbf9d8af7e15d8183811d1a2357b689c0dd9328b0984a6e2f3d7b34a4dd628c00be20fb13cfd7a6807c73a2cb2866fca641
+EBUILD ansible-4.6.0.ebuild 704 BLAKE2B 89f8adde05724b84dd372ca4513a9f90f3a09587ca59e0c305a74d82558057d9250e8bbb6154d85cdb4e5756383f553e937823c34106de8560fed64a9d2ba7cc SHA512 dbe013ad6887395617645669b5395bbf9d8af7e15d8183811d1a2357b689c0dd9328b0984a6e2f3d7b34a4dd628c00be20fb13cfd7a6807c73a2cb2866fca641
 MISC metadata.xml 726 BLAKE2B 92c09d65c38a346db34eddf78f75aba7d914df678e37dcd54b1a47cf3d7f043604fad89b435fa08877bb0c7254fb1a99db32bdd298f2b12af6f8089828f1e67e SHA512 40b712fc2055cfc60fdcb33705757509adc97feb893c46dab1e6e7d8b88ab2026b3b0ada66d7504f86b25072a4d3bffee023a5aa0e8b5286bcf58a8cb18c5ac3
diff --git a/app-admin/ansible/ansible-4.6.0.ebuild b/app-admin/ansible/ansible-4.6.0.ebuild
new file mode 100644
index 000000000000..7b9608af55af
--- /dev/null
+++ b/app-admin/ansible/ansible-4.6.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+RESTRICT="test"
+
+RDEPEND=">=app-admin/ansible-base-2.11.1
+	<app-admin/ansible-base-2.12"
+
+python_compile() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+python_install() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_install
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 106e396738f7..55cc9bcdd77b 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,18 +1,13 @@
-AUX awscli-1.19.47-py39.patch 2498 BLAKE2B 39f698d756422eecbb6a37bec572f00e184775b816f467d1b0275740b59678518db7ae44240476048c0f11d8d01403e8f9a03ad0f64414206fe77c15c4d695d0 SHA512 6a80d35495b63572e5e8ee6550a1c693d71adceaad79fba9d097668049a5c9d425b7eaaba008458cde8eb3e406e6e2850b6d43e6a610e9f28cb44278b231312a
-DIST awscli-1.20.28.tar.gz 2058578 BLAKE2B 3f6993a41f46ad9d8d45cebc0d5ea95a954e15c73d236426590c389aba6de6a99b6a5000f065f932733151c14f3112bacc25c670a05d2a991a976669ce54554e SHA512 b75974450cea3744ed15cf00ca82a35aa377c55e0ef67bb5536ed136e768d5030e6707f12e2e7de8bfce48296295ff4ed4c9f9b15c642104ea34c7492291135b
-DIST awscli-1.20.40.tar.gz 2071857 BLAKE2B b2511d610c13b4ddf8b1f5c6442f0939072eecf81d97805800bd83b6f481d744ad4344dace6e6553e3d4b7cbf9546f911398311cb04fb698a418579e784539a3 SHA512 aa39a8d67cd8efc63687929f19d5878269ce7f3155a0a64ca2f271251a334f57d2358aa4f0aee76415aee33fe23a1e3b19eb2c6dcfa21e8c0fb7409f5d29a001
-DIST awscli-1.20.47.tar.gz 2079314 BLAKE2B 2c202ed3e3527a6881c3f9ca73e8639732442948c6cd6a79fc3fe64de38ff56f7e595f0a0e4badeade81624f8a0323f435b63199a138ce90acb0a1785a326dcf SHA512 ad7be0753549c6f82f6f9a8631cbb8c56526ef17eb0152298bb78365735d4454ec4efb44a6858d01f31cff2ae54ad6a11e0afff3277dde2b70415d58bfb81c86
 DIST awscli-1.20.53.tar.gz 2081402 BLAKE2B 88d56df063ae6473122913e4713e17bfd8c32961477b8e723ed3c0c0b7dc72ccc4dfd8d897699e2060a2b65a198b96eccf77accdac9a21510aa56dba5423b76e SHA512 48576b535bdf6b9e6397eadd589c41eeec480d2eaf3035ca6e64bd86984aba9170a83b71c0f7f3f64cfaebaf5104fe3adcdaebace5166343fb3b772f5ad8ccfd
-DIST awscli-1.20.54.tar.gz 2082080 BLAKE2B 157e35ab297d18aa9739319801e28fabfbd9f68a2ea6215052d11821f96e8df022fe45ba9b34cc9e62ca59186fd16aeda453813f7ad86f96d2b6e483f8fd89a1 SHA512 845e5746808bb40ff41b4a3280bce7787fa6278f3b9176c8ae1237b06d1c6ea01a132ab8b4134d369380823d758c16317a1985ca9f307d17824d2cad5c92858e
-DIST awscli-1.20.55.tar.gz 2082482 BLAKE2B 5f8d9d84e6993e22ffd6f1e7e46b0afa2aecd12b4c2c18968e0f85d7544aced039a21b2245bfd66393bbb0d240f9b3119da7f745891b04f9156b677f613fbb63 SHA512 5d76c07417a3edcdff490ecdad9469f6f0f3077f4fccba9b6cf8518390df90d49d126e6c924a57333c5b68a97b833cb0bbb72133ddc63fd74893f888eca974a5
-DIST awscli-1.20.56.tar.gz 2082836 BLAKE2B e935334dba5aaa77cbd4fe3adb789c33c9fa80832bf4ad7517024787911e377020e8cdc38b0bd87db81571a2da888acd96306198a66748597495460292286938 SHA512 5b3bfebe217c05df70421b29c6a239a76493898717bd5db10ef7001e6c9af1488a52e6e25ab85b5ed725c87402a562ebe6849eb39743681c644143f17fccc3b6
-DIST awscli-1.20.57.tar.gz 2083414 BLAKE2B b3d21c0b8ceb0016def4aae9f2485dffd77bdd12a959b6c959d9c10cc3466fad9309a40102409ddf59d372bf95503a6bf87bc454d37400877a7cdc33564c0f45 SHA512 ad5d5a4de8083ce5198a49756da4ef6d630671c49ee0da0c15f06c9af1e92a9c98f2721b06df77adc47ea2b455e80e8aa92238a514039a213acbbf133753b430
-EBUILD awscli-1.20.28.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f
-EBUILD awscli-1.20.40.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.20.47.ebuild 1404 BLAKE2B 7fde5eebee2268092ca0ed774ea605f9080af17d87614f6892fbba1b1f44440bfb8ee88ca6714d54c6639e17d5955b22b01ef609dcb5154aaa98710a73e73521 SHA512 6319aa19de797f3d1d33d6499be8502efbb1f33df58f83874a79ddd0bfd59fb9837891cde5e8b3deec254dd8dcdc784d8f23985e4022b6e31a248bd5395dcaf1
-EBUILD awscli-1.20.53.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.20.54.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.20.55.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.20.56.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.20.57.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+DIST awscli-1.20.60.tar.gz 2090278 BLAKE2B 107d4d34730769fe18729cc2a42a574c8b66d0715eabc67c1a236d828ee7623387ece4dd8b3a80818b68be7439ffb74ba2c48bac74323b2a9e960f53c0508bf3 SHA512 7c4a1d79434ca2497d814dace68b537e5bc120f03d4f63cf74280d8c83d4c68273d9c0b16e90b477c91e49498468e1717ba6ba1b057590fd89c0c2cc82b90383
+DIST awscli-1.20.61.tar.gz 2090747 BLAKE2B ddd0ca28f0f36a69e0d03a15bab142df35f4695a1e3f2c71f3507325050aceb088a53cb18dc17c80b7c90e8bba7aee377ab4bf336188ae19adb095df4cfd5bd2 SHA512 c0ed1fdd11022c897e31f83be97bddc2dbc8d53e6571ffb5c5592f406f88c30eeb36f7530b541a7102a4426b1bf14114db08667e3c03e3583f3130e3e50767e4
+DIST awscli-1.20.62.tar.gz 2091052 BLAKE2B 95043ddac83c71a6153eb84b9e2e48ea5659d300fdec3bf4c7d0356d214da7a5ec15a0777c1eb41f275a2ee6fdf7996d28082fe604825234226a415e9c12181c SHA512 6f33f1a02703b81813c56872f4a90e712ef60775854d88f256c1c6fa487678f6bc8f5d8a4345b2a064ff18afaf9f5e336f4af0257fc746d83a703fcc4a655bc4
+DIST awscli-1.20.63.tar.gz 2091148 BLAKE2B 12e6aebf29b5d91b191f87568fb605513c86d30c2a4d6b553ab2a0fb90b6aa0bd4b7024981671566f0646811f39a88bc16ac888f511c29b0e459f86440300304 SHA512 adb57d355a7ba70cf166ea1544df4274caaedbea1a2c4ba7895be600a76d8ef0129ca20c6d03d702c073d21dfa4f70fa3f5488266dc0cc5ef7f5d952b6d6ee6f
+DIST awscli-1.20.64.tar.gz 2091360 BLAKE2B 24a0838f1348a05392736f580816b968cd28a252ade31559241fadc5cb2a36dcb6f31c8743c484879fc523b0282381625cbabd58656a00cce0dcb81a6b0319d4 SHA512 a3c0b393e9a5e7aee0e4e4bab14f2cb2c0877b22ead0547d99b430e24bd927391536bbae8b612612b9437dc0dba2cd804a858bddc980d29a74afac434ddc3ab3
+EBUILD awscli-1.20.53.ebuild 1306 BLAKE2B 1b1be64ca6072a28230aa36c66bea67684784f2d44e040ecdb6694ce5f023168e170a36d3a3e133a9a8559d15dd0aced5e7a78af349f3691a883bc19f7f60318 SHA512 6b9579b86a827d2a4d46568d17899f3a45b047621abec213da57f70603021ab2ac57dbe1e127ee12aa41edc93aafd503db911e13ab744fcaf5ea6d8b5d60ad6c
+EBUILD awscli-1.20.60.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.20.61.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.20.62.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.20.63.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.20.64.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.20.28.ebuild b/app-admin/awscli/awscli-1.20.28.ebuild
deleted file mode 100644
index 4221a0155f55..000000000000
--- a/app-admin/awscli/awscli-1.20.28.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.20.40.ebuild b/app-admin/awscli/awscli-1.20.40.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.20.40.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.20.47.ebuild b/app-admin/awscli/awscli-1.20.47.ebuild
deleted file mode 100644
index 95a3e5aaa0df..000000000000
--- a/app-admin/awscli/awscli-1.20.47.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.20.53.ebuild b/app-admin/awscli/awscli-1.20.53.ebuild
index 81d5997098c2..d2807dde6a53 100644
--- a/app-admin/awscli/awscli-1.20.53.ebuild
+++ b/app-admin/awscli/awscli-1.20.53.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/aws-cli-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # botocore is x.(y+1).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.20.54.ebuild b/app-admin/awscli/awscli-1.20.60.ebuild
index 81d5997098c2..81d5997098c2 100644
--- a/app-admin/awscli/awscli-1.20.54.ebuild
+++ b/app-admin/awscli/awscli-1.20.60.ebuild
diff --git a/app-admin/awscli/awscli-1.20.55.ebuild b/app-admin/awscli/awscli-1.20.61.ebuild
index 81d5997098c2..81d5997098c2 100644
--- a/app-admin/awscli/awscli-1.20.55.ebuild
+++ b/app-admin/awscli/awscli-1.20.61.ebuild
diff --git a/app-admin/awscli/awscli-1.20.56.ebuild b/app-admin/awscli/awscli-1.20.62.ebuild
index 81d5997098c2..81d5997098c2 100644
--- a/app-admin/awscli/awscli-1.20.56.ebuild
+++ b/app-admin/awscli/awscli-1.20.62.ebuild
diff --git a/app-admin/awscli/awscli-1.20.57.ebuild b/app-admin/awscli/awscli-1.20.63.ebuild
index 81d5997098c2..81d5997098c2 100644
--- a/app-admin/awscli/awscli-1.20.57.ebuild
+++ b/app-admin/awscli/awscli-1.20.63.ebuild
diff --git a/app-admin/awscli/awscli-1.20.64.ebuild b/app-admin/awscli/awscli-1.20.64.ebuild
new file mode 100644
index 000000000000..81d5997098c2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.64.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/files/awscli-1.19.47-py39.patch b/app-admin/awscli/files/awscli-1.19.47-py39.patch
deleted file mode 100644
index 4d1be8eab6d4..000000000000
--- a/app-admin/awscli/files/awscli-1.19.47-py39.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 85361123d2fa12eaedf912c046ffe39aebdd2bad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 22 May 2021 19:42:14 +0200
-Subject: [PATCH] Replace use of deprecated base64.encodestring()
-
-Replace the uses of deprecated base64.encodestring() in favor
-of botocore.compat.encodebytes().  This fixes incompatibility with
-Python 3.9 where the former function has finally been removed.
----
- awscli/customizations/ec2/bundleinstance.py  | 4 +++-
- tests/functional/ec2/test_bundle_instance.py | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/awscli/customizations/ec2/bundleinstance.py b/awscli/customizations/ec2/bundleinstance.py
-index f704ec301..775e75718 100644
---- a/awscli/customizations/ec2/bundleinstance.py
-+++ b/awscli/customizations/ec2/bundleinstance.py
-@@ -17,6 +17,8 @@ import hmac
- import base64
- import datetime
- 
-+from botocore.compat import encodebytes
-+
- from awscli.compat import six
- 
- from awscli.arguments import CustomArgument
-@@ -135,7 +137,7 @@ def _generate_signature(params):
-         policy = base64.b64encode(six.b(policy)).decode('utf-8')
-         new_hmac = hmac.new(sak.encode('utf-8'), digestmod=sha1)
-         new_hmac.update(six.b(policy))
--        ps = base64.encodestring(new_hmac.digest()).strip().decode('utf-8')
-+        ps = encodebytes(new_hmac.digest()).strip().decode('utf-8')
-         params['UploadPolicySignature'] = ps
-         del params['_SAK']
- 
-diff --git a/tests/functional/ec2/test_bundle_instance.py b/tests/functional/ec2/test_bundle_instance.py
-index 3eee363da..ca36d7cd5 100644
---- a/tests/functional/ec2/test_bundle_instance.py
-+++ b/tests/functional/ec2/test_bundle_instance.py
-@@ -17,6 +17,8 @@ import datetime
- import mock
- from six.moves import cStringIO
- 
-+from botocore.compat import encodebytes
-+
- import awscli.customizations.ec2.bundleinstance
- from awscli.compat import six
- from awscli.testutils import BaseAWSCommandParamsTest
-@@ -70,7 +72,7 @@ class TestBundleInstance(BaseAWSCommandParamsTest):
- 
-     def test_policy_provided(self):
-         policy = '{"notarealpolicy":true}'
--        base64policy = base64.encodestring(six.b(policy)).strip().decode('utf-8')
-+        base64policy = encodebytes(six.b(policy)).strip().decode('utf-8')
-         policy_signature = 'a5SmoLOxoM0MHpOdC25nE7KIafg='
-         args = ' --instance-id i-12345678 --owner-akid AKIAIOSFODNN7EXAMPLE'
-         args += ' --owner-sak wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'
--- 
-2.31.1
-
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 4ffd5e9aaa7f..c3d294d22f66 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -2,4 +2,4 @@ AUX calamares-3.2.32.1-remove-broken-tests.patch 1682 BLAKE2B 1d41c22b99797d4106
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
 DIST calamares-3.2.32.1.tar.gz 3425260 BLAKE2B e10174d400a402cfe3d7a015f4fe7a02ad1653e5a4cdf65c31360467e3b3ff10629d991dd206424d51c67533f8ab550e09e74b4334dbebe9e5fec1a06ed0dbd4 SHA512 30e523dd3c340f9c4385a53a4011ed0f16e317572fa2e5b6acfe638aaf029538f0ab85924999e9683ba10014be99b3c35ff3234bc85cefa2ccd14e2715c87222
 EBUILD calamares-3.2.32.1-r1.ebuild 2188 BLAKE2B 5e867dae027783603a5959405118b5127e7e2b7f7dc05a44e2274c12c458da88bfb753e618772f24abbfd4e1a43a3aa62d06edb9c313168a31b898463afba810 SHA512 f5cf285a7fd9e792b6c720ab45c4b0703f2911d29c7d0b03a61ff97b0f8339d6507732d3d39b6a5696642316c822f9b67c6f6cc452847d6fec0c10910e65bb1a
-MISC metadata.xml 859 BLAKE2B d56219a465eb37f0a7430763e84e709ffae577e08ac82bf012fd5e8ed62af83c6ae68091b25591130425693dc57a9ad24005de9c8b81ad766210871f123845d9 SHA512 bc7808e30ddd36e641718564bf0fff9d57d624bfea83044fd8383c4dc2d865c575e910d793e48b3448437efc2f818e1b5ce95c5135638bf9783b3b9aee82256e
+MISC metadata.xml 781 BLAKE2B 56d64535b539de398557b26f7705e6aa222d7073a0c31a38069d45deec697e488891c95850324a7610ee1faf8f4ce2e04d0d0a9fd29300afa5e5bf42804e6942 SHA512 156cd07700dfab61f78bbdd4c626a098ce111428cebbbc6ab541f60f12e347f62236ad21d2fd8031babfc0be87ad4b246ad2afb3e453005588f87bc500c78c72
diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
index 5ae792792420..8d5ab7cbdf57 100644
--- a/app-admin/calamares/metadata.xml
+++ b/app-admin/calamares/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Calamares is a distribution-independent system installer, with an
 		advanced partitioning feature for both manual and automated
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
index 218350ed06ab..3bc3c319e3c0 100644
--- a/app-admin/checksec/Manifest
+++ b/app-admin/checksec/Manifest
@@ -1,6 +1,8 @@
 AUX checksec-1.7.2-path.patch 510 BLAKE2B d17d260f41cf0c7e71accfa4b728a9c35511d1d1a90726bbd3a7fbbc401b69e6245f596c62d323013d29142d256eca6d792c6256f4b5d752bf55e64f96e7798a SHA512 5a5af3c35f8e8ca0ef0c44bc84ea3108bdd96c7ee98c3bda31a0f5308fd843c47a0d825fdff39e1995260391a7a747187ef804250fd0da6ccad5f93b3595a706
 DIST checksec-2.2.3.tar.gz 2241535 BLAKE2B 850977dc14d1b57dc947f81af904aca71a7d664bf695619de2b6f7a1014a95176813c4fcd8c39a6c89b028291fa1a08a2beaf6f4dce27f53624202bb0e72ed2c SHA512 d1516dc4321f30a57f88d3279fa228b4dbb0f16345c3c7e9d89575ddc3ed9dffae42f392e76321a5a9aba876717aae959365fc829f0abb58c1c21f34dbbf59b7
 DIST checksec-2.4.0.tar.gz 2242079 BLAKE2B c1878c1312d13591147f0efd1a2d535ae8e75292dbc53e7ba0802c8d165b18b4bc0b22a5cc3a9159ddcf05a1518d58c18cb54700ea5a52ff29d261068194b96a SHA512 1a02dfac48b5979cb5c2eb7b8f1fe290d3ac090726d1b95a14864bfc4bc3d32eefc10e2cc227c9dc01809c78fe003d1faea9b720d5cb5fbc16599fc0e2512947
+DIST checksec-2.5.0.tar.gz 2623122 BLAKE2B b4a876dfc8b9f02d5d74b6720b59ee216fbdab4e7df471aa4a78e7e6a98830b1b03f9a66d8b9dd344261fe1a253db4e5e9bede53f47e1fd171b2d23b0e04f031 SHA512 dd76061976d7f97c250b9d24b9cc7c6ea26c9df7e3521e3a1f39f56812485afaae6d60c611e1b7f4817b1585d10fc2116eaa032bb690e39a0243529e324943ab
 EBUILD checksec-2.2.3.ebuild 757 BLAKE2B f0752c0d0636142ecadf0abd561bebe82ee923570ef55374cfe567776d22785ad99e1ccd1cd5660723a24c0a2a9a9d428f43f3622e5bb472a4347514d8bf7692 SHA512 aa6e146d7ce82d49ada59ffb4f2f327c99608b5b2c164af317d4c0a627f28f10a8760f4b958678f1726fcaa496f87689165185f8a6e9bd2cb0c1cbb297fb7f91
 EBUILD checksec-2.4.0.ebuild 781 BLAKE2B 00490a46040ca8941022cf242fd98033e1dea0b923085c39c4d294aa632de3822eb32ce055c5f67fb65668beaba54c5b53d0de6b6b938ea35f937d5420c95685 SHA512 afcd0a3a9aa2690a9ef0881045e58907d1ddb42930a8f2e199ad4f71ddb074952c20c800fe0d5c803d44f401e144312898fbb0ef85a53800908c79bc1a0c867b
+EBUILD checksec-2.5.0.ebuild 785 BLAKE2B bb1f654903da6f13b3b708318e643a4962857d1a2dbc70851549e1600198236e0cc82f3eaeb9556d6b29d29586281be63f89af0b4336f7ef9436f5a4896ee142 SHA512 140488b6744699a027ed02fb0085e61e5dbe8332c22578971576076f81e68add6d01376ad449df9e22a93b6a0a05a489ca22786eb7d604c390d86e28b81dcb0c
 MISC metadata.xml 335 BLAKE2B 99e07579c1f644b8fa7d4b52de2110716ff7aef864466b323567f923623b41b6b1eccdfab55a0acb64ab0d8400497aa0b48bbb2095b2e115ecffb693a3ae40fe SHA512 c48521c1ce01a289d48974025a9aa8e6d8e00437bb89e1f35f862764872f73a988e17e53a903cf2c4ccfbebbaaa1cf57e548fc1741fabb0f958e991b4e0a02e5
diff --git a/app-admin/checksec/checksec-2.5.0.ebuild b/app-admin/checksec/checksec-2.5.0.ebuild
new file mode 100644
index 000000000000..901655f5fae5
--- /dev/null
+++ b/app-admin/checksec/checksec-2.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.2-path.patch
+)
+
+src_prepare() {
+	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
+	default
+}
+
+src_install() {
+	default
+
+	doman extras/man/*
+
+	insinto /usr/share/zsh/site-functions
+	doins extras/zsh/_${PN}
+
+	dobin ${PN}
+}
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index af531fef0755..c40ae853f09a 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -3,9 +3,9 @@ AUX consul-template.initd 592 BLAKE2B 21d6ff6bee67a82c4305eba3765f8e9c49ee59357a
 AUX consul-template.logrotated 103 BLAKE2B 66f91c1a2cd0c926da67e99ccf0535c6ff5ed1e57c23fb3bb3df4066cfdc1ff70f2eae6a67c7816d8d38d41106f003fe2a98732a9180838c05d04a710d9bef09 SHA512 642b53e43fd7a4da00907600f26e3814893b61856a62083c804b0077043a4f8f6603f0ae4461e901105f8e1fe52c2f34f3e949e752441f5f510e9cc21890ca75
 AUX consul-template.service 398 BLAKE2B 94a30973f6e0ee114dc844bf9b83e423d72a2fc0a3bc0fb6a01668fdc268c7a4f7d550c67f2f6f5e5de3140d6f14aba99eb65702ee8e335e2c3750a8aba6d7ef SHA512 6f0621088475a392c142ff8cc7236850a61f2fdcb10d456a29a68dff1c12cd52f66cdb37ae2d7c84ba7513f430dc8cea6fd5f128a559b4de708c5b517aab75e1
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
-DIST consul-template-0.25.0.tar.gz 197301 BLAKE2B f6e7d87b6fbb1d56728af0116ce0cd3ace800fa2e1d1edea57acbcd9cd1f1cf9a625426ab139744083071a1641a99aa526d44f28a147bbb1f2afe714b83969fd SHA512 225e0e1f400b6ca6913758f0c4c77788977d4e6f861d50efa89662a652b1c8c648d269c9cb42ae5a590739ab1159a8b1a386cd9942a1c7dafc5200a8923b4c9b
 DIST consul-template-0.25.1.tar.gz 198375 BLAKE2B e5cb75193a50939b92f6b9db9e998577f1c62cf55944052a4e9ca574ea52fe7284b2395ee3ce237923cc79337453ec43d37c103f3a7bf0fc092c877164ed89fa SHA512 ac02d6c26daadda62aff9b908836a6ac342ebebb9429c7a75306c4a76a2ba6bc6ab97f26e17ebfa64c171622068f89d006d48ccd7bfa28a71b43245357cbf524
 DIST consul-template-0.25.2.tar.gz 205359 BLAKE2B 9d0f1d7438b0ee2ca8e04afb3bce34699be8718de666cc46e20ddfa071438bbafc20d985469147606c21264594009517bc6fc19b6770cf1a4c80b7213ba9d80f SHA512 0fd8bd6b711af4e5e9e705efe4f1c41bfaae739d24173801bccf1e8fcb669f823f4723db4b7c09ef4adba95a4963f6b2d62cbd3cfcda1c28e83dc5c3ab587173
+DIST consul-template-0.27.1.tar.gz 214559 BLAKE2B a150e74fb260aa8f890f68b2bbd6f3ae87b754c4dd5473998dac0afa6ad3b10c3d0f7dddc7fbe0c7feff741a094704a660a75981d5c49a4f4995bad0bf4277c7 SHA512 46f32d8d3110fd7b09ffe5132a279e4a4116a7cb0a12c4d5334519c52b392c108e96ab33e9a41eb70c30ea505921ae7c8ca5a067d5dbcf5e44f9b88239b4adaa
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod 37 BLAKE2B 74a94066231395cbd85f1dbbb68408161ef74781c0c686746f97365dceb3ca69e3b924a86e6639b5e4cbcf64928fa21245e6828339105a779a86bc4f132a5bf5 SHA512 da3a3499834784b7ace8158659956206fdb113000fdc84d54b6525805727e37029bdcf263afcbabe724d8b10f6601f1f38a985e6ac10fd0466907ae56da3edd7
@@ -153,6 +153,8 @@ DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20190730042320-0dc007
 DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20190730042320-0dc007d98cc8.zip 329362 BLAKE2B ac1b5c838e2ebb3fbbbf99b82ae7c06d9501487033ba6217fa375b27ff2afbf99dfcce5e8c594170688b1e1bd3f49c493e1958f5a46836427c163dcdbfe39aa2 SHA512 8b7857e56778dd47dac98d7c21d176dfd37735b51607defd3e54287e1aef7cf3b36747a3d8f2d8eeeba3f6329f0cd3ab9ec5be517ea50a0eb49887fe449a8c97
 DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
 DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.12.mod 74 BLAKE2B 47557579d6c1e12c3b7dfdd9e5dd37291411cb87ff396973a0e17c97ffc79da1f6d81dec640d75cbc5e84ad9a8e17d729992c998dd614ef89a973d3cf5083b60 SHA512 2638750386491e91639a8d6e0fdd5dfe58ffca24a228d2810556b0f280839ca1489bcb47ea77adf287beb3b2d70ab2b1a664e0fd1b8b24cb3c88aea1265e47ab
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.12.zip 39947 BLAKE2B 31ff80fd9c0bee3183139da5f47f2db00e10f6f889f7f3ff17a7fcc4ec31569ac4576b22961f7e8986d01d443e79312dc786f22d276397b48075880273ea24cf SHA512 12ca7bca3eb32780025552ce6c5196d0aa19b0412db5d472349fdb949654c36852c5a5e54b845fa86826dc599cb4c35e8d4842ef89cd48dbe949cb87a308f146
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
@@ -270,6 +272,8 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod 146 B
 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-20201002170205-7f63de1d35b0.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.zip 1878084 BLAKE2B 3c16360d960d416d175ed4c93d3fa78d8798971d368e189acccb9e12bc4620f24894c739ac2d350ba5561dcaa6f2d297f3f8b51d5cf556f5a19c5f3c67d6d84d SHA512 8aa88bbc68d280a791035d107c67735b859afd5d69d802136d0d06f05e65d750e0f7d5d6e5db47b4edf8b5d07ea0850ea987055f64f6d2ea50a61ac31a97bdcc
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.zip 1876172 BLAKE2B 3b1e29d33ba8af42f20fc885b38014859d3c4d9d688f82354d2165649166a2211ce456afe273d61f302e2c1dab9f2ecbe8afdb0d6fde391e788c4783954bb104 SHA512 bb0e7965c8f5f6910d8d63951b16c23f0a832b2b5ed379b3261207f38dd4e859af47007163f5cea2bf7f8ab618f3e93abd91fcfcb64a942643d5273ea92f38af
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
@@ -291,6 +295,8 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.zip 1421740
 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-20201002202402-0a1ea396d57c.mod 181 BLAKE2B e3907d056d6b40484c28d766a8d6bd09127497c5ba1f04ad9ac287344960ab74c50dce08ee38d567d0de5d2ab4750b64340fcb8119b3b3b0f260f0fc0f25ee1f SHA512 7945ad77f2fa062ec18d926c61829a5b61f1f97bd5a6cd82909487e8d8f4d1cfdb0195f3269173ac25386d6837e4af808fc49dfafc0867bea30a9bad4bfd6196
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201002202402-0a1ea396d57c.zip 1502653 BLAKE2B d914ae05f7b1a64d244c14b226cdb6f21d32088e3ddb0b178a8b12936533f30980746c4f8f7e8924689e6000f1c57a81bd8a7bf1ca680171bfb77252cd189762 SHA512 7587fcaafbdbeccacc25687bf7f2f08a3e973d3c43b277728c9b1889a1e2d932b321cb873b2c77cfb0626ebb311c685a72fa37d512644a856f0fb1090ad2e370
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip 1587056 BLAKE2B b8b8cb2f12231f2e5129646f34a1138b138ea6b38af50ad8baafcaf155e9eb623e320823ec1b7502431df3f95dfa7ea1c8cc21abfee3c8831d913347aead0669 SHA512 0e635def6bc35ca664d28575366161fcce349c9f78386a9ffa3dc700da1e1badd6fbb8440113451ad7c1cb9a18b49f949632734946ec56ff56d894d8d74b56bb
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
@@ -325,6 +331,10 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.zip 1914030
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.zip 1488130 BLAKE2B 970a205f60773754e7d1768884216cff6b00cc16c63d90182531f4fcd9e60f4b58b6a9e143a18217a2d844d51f63ecb1f08b63ae9a6da83cee109352d1116d3d SHA512 80c5ab291a4d1614136f168b813b5d2cd75d781319b6f7aed3c37f645554c3f8283f7488578490e4d8acf3c24ca514323a0c4649b64dd556613dbf87ced11d61
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.zip 1644123 BLAKE2B f0bdd5627a676ea72767542669e8d0ad43ab0fd82386c6fe08da83e60a478c46d3899843703f9026cfecd416056d8dde242954faf5f3134f2b975dc8e61ca0e3 SHA512 ea2b0c8163b22097a9e6c57c9d2dfb75548f2b6004a775a6c97fceb1d2e3e1dbd4cb2050a36cd4e1e9cd0386794d7bd3a3b6b956b8a55009217b06e9b72f64b5
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 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%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
@@ -373,7 +383,7 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip 80765 BLAKE2B d6d8bfba5082aabb1a247add43b21ffa058b58fef60e8efbf973b724273cda2496ef0c9b226ad14bfea17f141f077d3bd98dfe3dbcf3c2938fd64570abd662b2 SHA512 2a89b2bce856cc11f3b71edec9e538048acf07f6aabbe27236b663b284c086c5862f086734e58727e9db8912a113fea51f72dad1a45a9e85860764f9c27b19d2
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
-EBUILD consul-template-0.25.0.ebuild 14026 BLAKE2B 2b71defb24c9727689c69f4e560b7d65938c40dd2a8e94b7dfd4b44dac268b8581e39c527710e8c60d684f73209aaab5d8dbb726df434ccdfc7e185fe61879bc SHA512 508c9f73c8ee542fca200126b32e2ddf092bbd57764440b3ce7a68bf4f273ca912f18337fc14844229a2366b71e7f216114f91490dae6a86f789b6eb4d9f6083
 EBUILD consul-template-0.25.1.ebuild 13778 BLAKE2B ca3687b5be36381e5d5bc64c3254650350888d7d2233768699995914f9a2bd9f3e74a7d58bf95e69d4022da60c0dd754186e21a5a3c3abe5abc6ff1d85b62b6c SHA512 d1fc0c079735cae434fdf4d3dbc8218cdf86e74bda4dc9db3d01a609469c7ff4a367c235b0383369af0eeee71c25df3b89b67c17f536f3e190ada84f73f9b35d
 EBUILD consul-template-0.25.2.ebuild 18562 BLAKE2B e6524f8b5fee4ff5584ad447306b0babd534f87b26a049480bb1c51edf4181cbeb6af1379905b65193ee56b6b55b9a2bd2bf5540f5ebe45f792036bb80583130 SHA512 8c017f2125f9a172079ac4abd9e20c1261eda92d1b53726dcbba965b326e71248e8928fce9a9c064435a22a854dca3df9dc54a6ff8f937fada485e53c3bcfda9
+EBUILD consul-template-0.27.1.ebuild 17002 BLAKE2B 95c75bf912916b87bd8533090b8d801a91134fb1c8e61082bc2ef86bd57126f0cb7516de5b2df55506d3326f2cb7102dcb8dee9edaf0a876bab51b1f8ae042c7 SHA512 980088c9e35813ceafb397b16a057f16308f8bb55a48b56530d5a59f212025b6c441f1b07ffca37988bce5de7988031cf799f23b893a38628e8308680477f4fe
 MISC metadata.xml 317 BLAKE2B d2427e36d0eec88eb97a7db510b4b45659b3d07b24228903eb5ed80807167c66cde6a3f1e63b1f55117974242ea9c06a78d58cca62359c775750ee34fe328ca0 SHA512 1e6e09983a77466e8671cfd7c848df28c2f35830a28a11c6c78369234fd35f35cb1dce8cbedfc97d2e5b1c4258db730e94c4d452d88b9841dc37e306d68d65b2
diff --git a/app-admin/consul-template/consul-template-0.25.0.ebuild b/app-admin/consul-template/consul-template-0.25.0.ebuild
deleted file mode 100644
index 1923fc309217..000000000000
--- a/app-admin/consul-template/consul-template-0.25.0.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module systemd
-
-DESCRIPTION="Generic template rendering and notifications with Consul"
-HOMEPAGE="https://github.com/hashicorp/consul-template"
-
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
-	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
-	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/bgentry/speakeasy v0.1.0/go.mod"
-	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
-	"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/fatih/color v1.9.0"
-	"github.com/fatih/color v1.9.0/go.mod"
-	"github.com/fatih/structs v1.1.0/go.mod"
-	"github.com/frankban/quicktest v1.4.0"
-	"github.com/frankban/quicktest v1.4.0/go.mod"
-	"github.com/go-ldap/ldap v3.0.2+incompatible/go.mod"
-	"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/snappy v0.0.1"
-	"github.com/golang/snappy v0.0.1/go.mod"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-	"github.com/google/btree v1.0.0"
-	"github.com/google/btree v1.0.0/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/hashicorp/consul/api v1.4.0"
-	"github.com/hashicorp/consul/api v1.4.0/go.mod"
-	"github.com/hashicorp/consul/sdk v0.4.0"
-	"github.com/hashicorp/consul/sdk v0.4.0/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.1"
-	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-	"github.com/hashicorp/go-gatedio v0.5.0"
-	"github.com/hashicorp/go-gatedio v0.5.0/go.mod"
-	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-	"github.com/hashicorp/go-hclog v0.8.0/go.mod"
-	"github.com/hashicorp/go-hclog v0.12.0"
-	"github.com/hashicorp/go-hclog v0.12.0/go.mod"
-	"github.com/hashicorp/go-immutable-radix v1.0.0"
-	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-	"github.com/hashicorp/go-immutable-radix v1.1.0"
-	"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.5"
-	"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-plugin v1.0.1/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.4"
-	"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.1"
-	"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.2"
-	"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
-	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-	"github.com/hashicorp/go-sockaddr v1.0.2"
-	"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
-	"github.com/hashicorp/go-syslog v1.0.0"
-	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-	"github.com/hashicorp/go-version v1.1.0/go.mod"
-	"github.com/hashicorp/go.net v0.0.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.3"
-	"github.com/hashicorp/golang-lru v0.5.3/go.mod"
-	"github.com/hashicorp/hcl v1.0.0"
-	"github.com/hashicorp/hcl v1.0.0/go.mod"
-	"github.com/hashicorp/logutils v1.0.0"
-	"github.com/hashicorp/logutils v1.0.0/go.mod"
-	"github.com/hashicorp/mdns v1.0.0/go.mod"
-	"github.com/hashicorp/memberlist v0.1.3/go.mod"
-	"github.com/hashicorp/memberlist v0.1.4"
-	"github.com/hashicorp/memberlist v0.1.4/go.mod"
-	"github.com/hashicorp/serf v0.8.2/go.mod"
-	"github.com/hashicorp/serf v0.8.3"
-	"github.com/hashicorp/serf v0.8.3/go.mod"
-	"github.com/hashicorp/vault/api v1.0.5-0.20190730042357-746c0b111519"
-	"github.com/hashicorp/vault/api v1.0.5-0.20190730042357-746c0b111519/go.mod"
-	"github.com/hashicorp/vault/sdk v0.1.14-0.20190730042320-0dc007d98cc8"
-	"github.com/hashicorp/vault/sdk v0.1.14-0.20190730042320-0dc007d98cc8/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pretty v0.2.0"
-	"github.com/kr/pretty v0.2.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.4"
-	"github.com/mattn/go-colorable v0.1.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.10/go.mod"
-	"github.com/mattn/go-isatty v0.0.11/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-shellwords v1.0.5"
-	"github.com/mattn/go-shellwords v1.0.5/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/miekg/dns v1.0.14"
-	"github.com/miekg/dns v1.0.14/go.mod"
-	"github.com/miekg/dns v1.1.15"
-	"github.com/miekg/dns v1.1.15/go.mod"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/copystructure v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.0.0"
-	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-	"github.com/mitchellh/gox v0.4.0/go.mod"
-	"github.com/mitchellh/hashstructure v1.0.0"
-	"github.com/mitchellh/hashstructure v1.0.0/go.mod"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-	"github.com/oklog/run v1.0.0/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-	"github.com/pascaldekloe/goe v0.1.0"
-	"github.com/pascaldekloe/goe v0.1.0/go.mod"
-	"github.com/pierrec/lz4 v2.0.5+incompatible"
-	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
-	"github.com/pierrec/lz4 v2.2.5+incompatible"
-	"github.com/pierrec/lz4 v2.2.5+incompatible/go.mod"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.2/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
-	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-	"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
-	"github.com/ryanuber/go-glob v1.0.0"
-	"github.com/ryanuber/go-glob v1.0.0/go.mod"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
-	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4"
-	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80"
-	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6"
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e"
-	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9"
-	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
-	"golang.org/x/text v0.3.0"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db"
-	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
-	"google.golang.org/grpc v1.14.0/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.22.0/go.mod"
-	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/square/go-jose.v2 v2.3.1"
-	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-	)
-go-module_set_globals
-SRC_URI="https://github.com/hashicorp/consul-template/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON_DEPEND="
-	acct-group/consul-template
-	acct-user/consul-template"
-
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# TODO: debug test failures
-RESTRICT="test"
-
-src_prepare() {
-	default
-	# remove -s and -w from the linker flags
-	sed \
-		-e '/-s \\/d' \
-		-e '/-w \\/d' \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake GOBIN="${S}"/bin dev
-}
-
-src_test() {
-	emake GOBIN="${S}"/bin test
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc CHANGELOG.md README.md
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-admin/consul-template/consul-template-0.27.1.ebuild b/app-admin/consul-template/consul-template-0.27.1.ebuild
new file mode 100644
index 000000000000..2e96e5dc540f
--- /dev/null
+++ b/app-admin/consul-template/consul-template-0.27.1.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+DESCRIPTION="Generic template rendering and notifications with Consul"
+HOMEPAGE="https://github.com/hashicorp/consul-template"
+
+EGO_SUM=(
+"cloud.google.com/go v0.26.0/go.mod"
+"github.com/BurntSushi/toml v0.3.1"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-metrics v0.3.4"
+"github.com/armon/go-metrics v0.3.4/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/armon/go-radix v1.0.0/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/fatih/structs v1.1.0/go.mod"
+"github.com/frankban/quicktest v1.4.0"
+"github.com/frankban/quicktest v1.4.0/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-ldap/ldap v3.0.2+incompatible/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/snappy v0.0.1/go.mod"
+"github.com/golang/snappy v0.0.2"
+"github.com/golang/snappy v0.0.2/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/hashicorp/consul/api v1.4.0"
+"github.com/hashicorp/consul/api v1.4.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.4.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.4.1-0.20200910203702-bb2b5dd871ca"
+"github.com/hashicorp/consul/sdk v0.4.1-0.20200910203702-bb2b5dd871ca/go.mod"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/errwrap v1.1.0"
+"github.com/hashicorp/errwrap v1.1.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-gatedio v0.5.0"
+"github.com/hashicorp/go-gatedio v0.5.0/go.mod"
+"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+"github.com/hashicorp/go-hclog v0.8.0/go.mod"
+"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+"github.com/hashicorp/go-hclog v0.14.1"
+"github.com/hashicorp/go-hclog v0.14.1/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.3.0"
+"github.com/hashicorp/go-immutable-radix v1.3.0/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.5"
+"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.0"
+"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+"github.com/hashicorp/go-plugin v1.0.1/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.7"
+"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.2"
+"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.2"
+"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go-version v1.1.0/go.mod"
+"github.com/hashicorp/go.net v0.0.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.4"
+"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+"github.com/hashicorp/hcl v1.0.0"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/logutils v1.0.0"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.1/go.mod"
+"github.com/hashicorp/memberlist v0.1.3/go.mod"
+"github.com/hashicorp/memberlist v0.2.2"
+"github.com/hashicorp/memberlist v0.2.2/go.mod"
+"github.com/hashicorp/serf v0.8.2/go.mod"
+"github.com/hashicorp/serf v0.9.4"
+"github.com/hashicorp/serf v0.9.4/go.mod"
+"github.com/hashicorp/vault/api v1.0.5-0.20190730042357-746c0b111519"
+"github.com/hashicorp/vault/api v1.0.5-0.20190730042357-746c0b111519/go.mod"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20190730042320-0dc007d98cc8"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20190730042320-0dc007d98cc8/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+"github.com/imdario/mergo v0.3.12"
+"github.com/imdario/mergo v0.3.12/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.9/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-colorable v0.1.6/go.mod"
+"github.com/mattn/go-colorable v0.1.7"
+"github.com/mattn/go-colorable v0.1.7/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.10/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-isatty v0.0.12"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/dns v1.1.26"
+"github.com/miekg/dns v1.1.26/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/cli v1.1.0/go.mod"
+"github.com/mitchellh/copystructure v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+"github.com/mitchellh/gox v0.4.0/go.mod"
+"github.com/mitchellh/hashstructure v1.0.0"
+"github.com/mitchellh/hashstructure v1.0.0/go.mod"
+"github.com/mitchellh/iochan v1.0.0/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.3"
+"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/oklog/run v1.0.0/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pascaldekloe/goe v0.1.0"
+"github.com/pascaldekloe/goe v0.1.0/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.5.2+incompatible"
+"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pkg/errors v0.9.1"
+"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/posener/complete v1.1.1/go.mod"
+"github.com/posener/complete v1.2.3/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.4.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.9.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+"github.com/ryanuber/go-glob v1.0.0"
+"github.com/ryanuber/go-glob v1.0.0/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+"golang.org/x/crypto v0.0.0-20210817164053-32db794688a5"
+"golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/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-20210226172049-e18ecbb05110"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1"
+"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
+"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
+"google.golang.org/grpc v1.14.0/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.22.0/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+"gopkg.in/square/go-jose.v2 v2.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"gopkg.in/yaml.v2 v2.3.0"
+"gopkg.in/yaml.v2 v2.3.0/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/hashicorp/consul-template/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="
+	acct-group/consul-template
+	acct-user/consul-template"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# TODO: debug test failures
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	# remove -s and -w from the linker flags
+	sed \
+		-e '/-s \\/d' \
+		-e '/-w \\/d' \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake GOBIN="${S}"/bin dev
+}
+
+src_test() {
+	emake GOBIN="${S}"/bin test
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md README.md
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index f3d1e5ea727c..2931f7320616 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -9,9 +9,10 @@ DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa62
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip 2721920 BLAKE2B f3fde8f5cc53496dc314bcae822a415cf00950da0a03b968de00685371e7a2e84ffa304fb176e791c85c930728859687e768ff785829f0751ae919546bd3326d SHA512 8981a08b1ba0226854567b0977d8a349abe2b58420421ab1dccdaf9c98e7657cb2140ad1a38767d25cb54249b61f162ecd51d401374a29f7368a550b19196595
-DIST consul-1.10.2.tar.gz 29636501 BLAKE2B 0552302b89e044723f95684468fffccd003f5768327e2ee2ca43784e811431ac0c71d52df869ed34ab830ee56d0cdabd4cb9ad51047366433d0bff3a06e4eb02 SHA512 7a1334668e22ffa4382b04844479a551cf45550d0298e8c619a6dd36866ee1830d1a23c76e4cc1dd0b77afabece641614fe8b345c673cd47d3f696183e0de6ff
+DIST consul-1.10.3.tar.gz 30831398 BLAKE2B 49db1b490f1402b6fda8107676361c12912aa381cb1d69e983f95abdfd618ec2a7cf202ff018899e773015cab7546b13b95c5966a50286eb66156380aff8aba9 SHA512 02bb8435e1a02711b5cacdc50165c8c81d27051c709d62a3f5e7b1b6121e1e47f20460b6a302ccc27a5ad9814774e8af1545e9b4a4ae4170b34218bf1587755b
 DIST consul-1.8.15.tar.gz 28558208 BLAKE2B e721296ac23ec39f27170bebf45997054338a28b9a2d2d817f606c4409a467897b2f18a32fea55f0c8950654c83181c3cced95e4678ddf1bfec10f6e56336d21 SHA512 73252ea703a0716308bcca7ede83352b09d9952ac2b5e55c74ad22dc57d2853b9c21fbf2bfb4c544a05044f3949d0fa46cadd186de3de9f183c294dc63ebb99f
-DIST consul-1.9.9.tar.gz 29421044 BLAKE2B d0ad79e6ff3afa9faeafc4ae8289575b1fd23681696f18e22cbf20f40bafe8feaea674a06f3789305239c96332c639f7e6522120b5c678fe6207fcec406fbdf3 SHA512 75a9f5cb423872dbf6e43c258ebf7f732e40ae4c2f97f13e656c39d15e371263ee2f36024db23d609b492481c206060f43c55060ce859615ed27f788169f193b
+DIST consul-1.8.16.tar.gz 28559668 BLAKE2B 51c643567a59a91d65f08eb5fdad12ab5f3b2940892dcccfb26a02fb095d608b213e76326b05e84313e25f3d85ce2e9e666ec668731a48572277a8f60113498e SHA512 6f9d1dca7334bb846e0ef0f5c007f0b50a4bf215fb7c443c37032770101492d2fb942ab257fe9e46720d44cf0c1fd0a67ce5c69c5236dbd3d900a790105573f2
+DIST consul-1.9.10.tar.gz 29427263 BLAKE2B 1ac815c880a1cc3daeb6260f5f6fb2399fdd0b86a51bca308c49bf8ee624d777cb4cea3fc893f1730b406533b954372b372c0883481cfd183228c1a8b105e654 SHA512 f97f54d6660bc306561602c7ca326a43b9d2bc8e3dbccde63768fb0177f60e79d39a1ae6369ee17eda8c35b42d647fce96d832208bcb1675d80c6ae9a8c2ef5b
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip 34780090 BLAKE2B 7a465854f74837c79c1b2166116d89b2156645f9ae80b13f0cd860eafddd17caf1a34f7876f54c5ede094fe808eb39f4a1bec54e02efc53fd0bd897c80bde21f SHA512 88a7e1ba6ac2bd373d82f0a6381565c24014b0cd339efcd815ce93dc9f223354f561cbe7bd021fd5635599331a23b7e9ca084754325c68edeecd6f5e1cc47227
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod 315 BLAKE2B 649b180d4b41279bde5a3ad4e7a8380b3e23d9428af2b2904612abfce99e5abf53ab7fa27ac7805faff0be8c2d52d685c7edc1380b909ad2c033beaae87be7f3 SHA512 eca3516d2491afa621522aae14e0e5c8632b984d8c6daff3a69df9b2b46416eeacdbd11de8cbc2247fb1119051466d24a4c178b065b630a684be8476be1ef15c
@@ -790,7 +791,8 @@ DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip 94436 BLAKE2B
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
-EBUILD consul-1.10.2.ebuild 40359 BLAKE2B ace27e59f946cc17579b57d8165ef47ee38434e759c95a3c66bc5a737e18fce33c7a02289f3a4122d7ac16630d1d310c52306016faecffb9c8959d1c5c91c01e SHA512 48e16056195cff1485e6fe7999d54ecc1eead28ae0444e0104c3dcc5259727df30db8f6ea5e6129152f35273f9a26d758c87bb1a123ed020264801b36be6aa21
+EBUILD consul-1.10.3.ebuild 40359 BLAKE2B ace27e59f946cc17579b57d8165ef47ee38434e759c95a3c66bc5a737e18fce33c7a02289f3a4122d7ac16630d1d310c52306016faecffb9c8959d1c5c91c01e SHA512 48e16056195cff1485e6fe7999d54ecc1eead28ae0444e0104c3dcc5259727df30db8f6ea5e6129152f35273f9a26d758c87bb1a123ed020264801b36be6aa21
 EBUILD consul-1.8.15.ebuild 39396 BLAKE2B f2debd8d22e89acc4cff56221368f6c563869cbc4aaa4d4de124b297c904d92694823b0ed996caa2a946007bf83cc26b0b41d0b4116071e96238ac78f15f9484 SHA512 911e1f7f77f02e2b86dc1318fe802ddc90557198ad5c94695b3efa041109277c35ba40e9265cfd0aca2383fc3826a07d601a717f75cc9c0d133a9b12a35c990e
-EBUILD consul-1.9.9.ebuild 40209 BLAKE2B 2c1214c9b7ba45a5c39682e9d1bcb0927a116696f219653c7f984d88c05b97195241bc95a8916a8630ad283a6b50d62c9daf69484b4ac117132b4a44c264b1e7 SHA512 90cce0abffff0c500b4b207c07c3e83907bf5141802c8185b70ed9ee1b669816a1b9f6e5bcf0ebfab3a77984fd61254a02d64748890b41489373b6f68dc67c67
+EBUILD consul-1.8.16.ebuild 39397 BLAKE2B 30841238f88c6d007d607383ff3ae787fdd567478c9b185412c4fe488d9689a6fb8586680d6f41f50acc02dc7bccfda16161c23f1adf678f2bb0d309fea6386b SHA512 ee7395ac3a9ae4824a4283c4a4c67b291cd3f494c441ef52da3007f281148207bb1d9f32a8ee0818cf569e9958e3a3d510a4b0184865773be01248daa980b182
+EBUILD consul-1.9.10.ebuild 40209 BLAKE2B 2c1214c9b7ba45a5c39682e9d1bcb0927a116696f219653c7f984d88c05b97195241bc95a8916a8630ad283a6b50d62c9daf69484b4ac117132b4a44c264b1e7 SHA512 90cce0abffff0c500b4b207c07c3e83907bf5141802c8185b70ed9ee1b669816a1b9f6e5bcf0ebfab3a77984fd61254a02d64748890b41489373b6f68dc67c67
 MISC metadata.xml 392 BLAKE2B 4995d973307987bb70802d4328dbb1d5e052683a2e1900912b40be5e345969740b1df9e8e1b3bcbf76fb90066ed43ac5ce91e8e11a0ad19c9d587c7204f45419 SHA512 92d4589b5294df0ddcee6fbafa5db5288b3e892dbec6d84bf0e53beb2b0a30e385f9166c536462e51aeaa9ee8799dd1ae3634b7b13e452e3059ba2853c5b77f1
diff --git a/app-admin/consul/consul-1.10.2.ebuild b/app-admin/consul/consul-1.10.3.ebuild
index 8c13968ff132..8c13968ff132 100644
--- a/app-admin/consul/consul-1.10.2.ebuild
+++ b/app-admin/consul/consul-1.10.3.ebuild
diff --git a/app-admin/consul/consul-1.8.16.ebuild b/app-admin/consul/consul-1.8.16.ebuild
new file mode 100644
index 000000000000..8933c9f0808a
--- /dev/null
+++ b/app-admin/consul/consul-1.8.16.ebuild
@@ -0,0 +1,774 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+
+# Upstream doesn't use "-mod=vendor" in their build system, and the
+# vendor directory is incomplete.
+# On the next bump, remove this if they have added "-mod=vendor"
+EGO_SUM=(
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.38.0"
+"cloud.google.com/go v0.38.0/go.mod"
+"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
+"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+"github.com/Azure/go-autorest/autorest v0.10.0"
+"github.com/Azure/go-autorest/autorest v0.10.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.2.0"
+"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/to v0.3.0"
+"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.2.0"
+"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+"github.com/Azure/go-autorest/logger v0.1.0"
+"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.5.0"
+"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+"github.com/DataDog/datadog-go v3.2.0+incompatible"
+"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+"github.com/Microsoft/go-winio v0.4.3"
+"github.com/Microsoft/go-winio v0.4.3/go.mod"
+"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+"github.com/NYTimes/gziphandler v1.0.1"
+"github.com/NYTimes/gziphandler v1.0.1/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
+"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+"github.com/armon/go-metrics v0.3.0/go.mod"
+"github.com/armon/go-metrics v0.3.4"
+"github.com/armon/go-metrics v0.3.4/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/armon/go-radix v1.0.0"
+"github.com/armon/go-radix v1.0.0/go.mod"
+"github.com/aws/aws-sdk-go v1.25.37/go.mod"
+"github.com/aws/aws-sdk-go v1.25.41"
+"github.com/aws/aws-sdk-go v1.25.41/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/boltdb/bolt v1.3.1"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/cespare/xxhash v1.1.0"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/chzyer/logex v1.1.10/go.mod"
+"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+"github.com/circonus-labs/circonusllhist v0.1.3"
+"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
+"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
+"github.com/cockroachdb/apd v1.1.0/go.mod"
+"github.com/coredns/coredns v1.1.2"
+"github.com/coredns/coredns v1.1.2/go.mod"
+"github.com/coreos/bbolt v1.3.2/go.mod"
+"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+"github.com/coreos/go-oidc v2.1.0+incompatible"
+"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+"github.com/coreos/go-semver v0.2.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/digitalocean/godo v1.1.1/go.mod"
+"github.com/digitalocean/godo v1.10.0"
+"github.com/digitalocean/godo v1.10.0/go.mod"
+"github.com/dimchansky/utfbom v1.1.0"
+"github.com/dimchansky/utfbom v1.1.0/go.mod"
+"github.com/dnaeon/go-vcr v1.0.1"
+"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+"github.com/docker/go-connections v0.3.0"
+"github.com/docker/go-connections v0.3.0/go.mod"
+"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+"github.com/dustin/go-humanize v1.0.0/go.mod"
+"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
+"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.5"
+"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/fatih/structs v1.1.0/go.mod"
+"github.com/frankban/quicktest v1.11.1"
+"github.com/frankban/quicktest v1.11.1/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
+"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-ldap/ldap/v3 v3.1.3/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logr/logr v0.1.0/go.mod"
+"github.com/go-ole/go-ole v1.2.1"
+"github.com/go-ole/go-ole v1.2.1/go.mod"
+"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+"github.com/go-test/deep v1.0.2"
+"github.com/go-test/deep v1.0.2/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+"github.com/gogo/protobuf v1.3.2"
+"github.com/gogo/protobuf v1.3.2/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/snappy v0.0.1"
+"github.com/golang/snappy v0.0.1/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.2"
+"github.com/google/go-cmp v0.5.2/go.mod"
+"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
+"github.com/google/go-querystring v1.0.0"
+"github.com/google/go-querystring v1.0.0/go.mod"
+"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+"github.com/google/gofuzz v1.0.0"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22"
+"github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
+"github.com/google/uuid v1.1.1/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+"github.com/googleapis/gnostic v0.2.0"
+"github.com/googleapis/gnostic v0.2.0/go.mod"
+"github.com/gophercloud/gophercloud v0.1.0"
+"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/hashicorp/errwrap v1.0.0"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/go-bexpr v0.1.2"
+"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
+"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de"
+"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-connlimit v0.2.0"
+"github.com/hashicorp/go-connlimit v0.2.0/go.mod"
+"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088"
+"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod"
+"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+"github.com/hashicorp/go-hclog v0.12.0"
+"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.2.0"
+"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
+"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod"
+"github.com/hashicorp/go-memdb v1.0.3"
+"github.com/hashicorp/go-memdb v1.0.3/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.5"
+"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.0"
+"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+"github.com/hashicorp/go-plugin v1.0.1/go.mod"
+"github.com/hashicorp/go-raftchunking v0.6.1"
+"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.7"
+"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.2"
+"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.2"
+"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go-uuid v1.0.2"
+"github.com/hashicorp/go-uuid v1.0.2/go.mod"
+"github.com/hashicorp/go-version v1.1.0/go.mod"
+"github.com/hashicorp/go-version v1.2.0"
+"github.com/hashicorp/go-version v1.2.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.4"
+"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+"github.com/hashicorp/hcl v1.0.0"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
+"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.1"
+"github.com/hashicorp/mdns v1.0.1/go.mod"
+"github.com/hashicorp/memberlist v0.2.2"
+"github.com/hashicorp/memberlist v0.2.2/go.mod"
+"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
+"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
+"github.com/hashicorp/raft v1.1.1/go.mod"
+"github.com/hashicorp/raft v1.1.2"
+"github.com/hashicorp/raft v1.1.2/go.mod"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
+"github.com/hashicorp/serf v0.9.3/go.mod"
+"github.com/hashicorp/serf v0.9.4"
+"github.com/hashicorp/serf v0.9.4/go.mod"
+"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086"
+"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086/go.mod"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267"
+"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/go.mod"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20210826001029-26ff87cf9493"
+"github.com/hashicorp/yamux v0.0.0-20210826001029-26ff87cf9493/go.mod"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
+"github.com/imdario/mergo v0.3.5/go.mod"
+"github.com/imdario/mergo v0.3.6"
+"github.com/imdario/mergo v0.3.6/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
+"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/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/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
+"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.9"
+"github.com/json-iterator/go v1.1.9/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/errcheck v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.5.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pretty v0.2.1"
+"github.com/kr/pretty v0.2.1/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/lib/pq v1.1.1/go.mod"
+"github.com/linode/linodego v0.7.1"
+"github.com/linode/linodego v0.7.1/go.mod"
+"github.com/magiconair/properties v1.8.0/go.mod"
+"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-colorable v0.1.6"
+"github.com/mattn/go-colorable v0.1.6/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.10/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-isatty v0.0.12"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/mattn/go-runewidth v0.0.3/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/dns v1.1.26"
+"github.com/miekg/dns v1.1.26/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/cli v1.1.0"
+"github.com/mitchellh/cli v1.1.0/go.mod"
+"github.com/mitchellh/copystructure v1.0.0"
+"github.com/mitchellh/copystructure v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.14.0"
+"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
+"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
+"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.3"
+"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+"github.com/mitchellh/pointerstructure v1.0.0"
+"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.1"
+"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
+"github.com/oklog/run v1.0.0/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.8.0/go.mod"
+"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+"github.com/onsi/gomega v1.5.0/go.mod"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pascaldekloe/goe v0.1.0"
+"github.com/pascaldekloe/goe v0.1.0/go.mod"
+"github.com/patrickmn/go-cache v2.1.0+incompatible"
+"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.5.2+incompatible"
+"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/posener/complete v1.2.3"
+"github.com/posener/complete v1.2.3/go.mod"
+"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
+"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.2/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.4.0"
+"github.com/prometheus/client_golang v1.4.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.9.1"
+"github.com/prometheus/common v0.9.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.8"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/rboyer/safeio v0.2.1"
+"github.com/rboyer/safeio v0.2.1/go.mod"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rs/zerolog v1.4.0/go.mod"
+"github.com/russross/blackfriday v1.5.2/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/ryanuber/columnize v2.1.0+incompatible"
+"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+"github.com/ryanuber/go-glob v1.0.0"
+"github.com/ryanuber/go-glob v1.0.0/go.mod"
+"github.com/satori/go.uuid v1.2.0/go.mod"
+"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
+"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/shirou/gopsutil v2.20.9+incompatible"
+"github.com/shirou/gopsutil v2.20.9+incompatible/go.mod"
+"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
+"github.com/sirupsen/logrus v1.0.6/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.2"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/afero v1.2.1/go.mod"
+"github.com/spf13/afero v1.2.2/go.mod"
+"github.com/spf13/cast v1.3.0/go.mod"
+"github.com/spf13/cobra v0.0.5/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/pflag v1.0.5"
+"github.com/spf13/pflag v1.0.5/go.mod"
+"github.com/spf13/viper v1.3.2/go.mod"
+"github.com/spf13/viper v1.4.0/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/stretchr/testify v1.5.1"
+"github.com/stretchr/testify v1.5.1/go.mod"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
+"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+"github.com/ugorji/go v1.1.4/go.mod"
+"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+"github.com/vmware/govmomi v0.18.0"
+"github.com/vmware/govmomi v0.18.0/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"github.com/yuin/goldmark v1.2.1/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0"
+"go.opencensus.io v0.22.0/go.mod"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/goleak v1.0.0"
+"go.uber.org/goleak v1.0.0/go.mod"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/zap v1.10.0/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
+"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a"
+"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/mod v0.3.0"
+"golang.org/x/mod v0.3.0/go.mod"
+"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/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-20191004110552-13f9640d40b9/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
+"golang.org/x/net v0.0.0-20201021035429-f5854403a974"
+"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9"
+"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
+"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
+"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
+"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+"golang.org/x/sys v0.0.0-20201007082116-8445cc04cbdf"
+"golang.org/x/sys v0.0.0-20201007082116-8445cc04cbdf/go.mod"
+"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
+"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+"golang.org/x/tools v0.0.0-20210106214847-113979e3529a"
+"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/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"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+"google.golang.org/api v0.4.0/go.mod"
+"google.golang.org/api v0.9.0"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.0"
+"google.golang.org/appengine v1.6.0/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/grpc v1.14.0/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.1/go.mod"
+"google.golang.org/grpc v1.21.0/go.mod"
+"google.golang.org/grpc v1.22.0/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.25.1"
+"google.golang.org/grpc v1.25.1/go.mod"
+"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+"gopkg.in/inf.v0 v0.9.1"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/resty.v1 v1.12.0"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.8"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"k8s.io/api v0.16.9"
+"k8s.io/api v0.16.9/go.mod"
+"k8s.io/apimachinery v0.16.9"
+"k8s.io/apimachinery v0.16.9/go.mod"
+"k8s.io/client-go v0.16.9"
+"k8s.io/client-go v0.16.9/go.mod"
+"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+"k8s.io/klog v0.3.0/go.mod"
+"k8s.io/klog v1.0.0"
+"k8s.io/klog v1.0.0/go.mod"
+"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
+"k8s.io/utils v0.0.0-20190801114015-581e00157fb1"
+"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod"
+"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+"sigs.k8s.io/yaml v1.1.0"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+	acct-group/consul
+	acct-user/consul"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+	local git_commit
+	git_commit=$(grep '^[[:space:]]*gitCommit[[:space:]]' vendor/k8s.io/client-go/pkg/version/base.go)
+	git_commit=${git_commit#*\"}
+	git_commit=${git_commit%\"*}
+	[[ ${git_commit} ]] || die "failed to determine gitCommit"
+
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${git_commit}" \
+	emake dev-build
+}
+
+src_install() {
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/consul
+	fowners consul:consul /var/log/consul
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/consul/consul-1.9.9.ebuild b/app-admin/consul/consul-1.9.10.ebuild
index 5b814bf371e3..5b814bf371e3 100644
--- a/app-admin/consul/consul-1.9.9.ebuild
+++ b/app-admin/consul/consul-1.9.10.ebuild
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
index 43711217d178..d03672f31140 100644
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@@ -1,10 +1,8 @@
 DIST eclean-kernel-0.4.3.tar.gz 10650 BLAKE2B 228d17cfc5bed34e892dd6340498b87cbc32f22e83aff70824ef24f88836e3ad2306eda8704e25b7cfbadb33984edee8effd613dad67ada25519c601ec6b6ec7 SHA512 a2ffbfe800672ad0cd105425497dae72c0779ec9da5ba6a6b4efd8846762467acf6b8e70c67744e7c7639d5ba2ba4643ad344aae193e72d12d12f48b1793ff4c
 DIST eclean-kernel-1.99.4.tar.bz2 78909 BLAKE2B 0cac3a001c3180c57bdf9a63366d9950928690328fd560f984c1d35bcf88712e897462a153bc3f0250ebbbb42518798e3407c3533351543ff32bd68ecee2ee5e SHA512 f3263b83b36878104e21fe122eb96a16c5c5a930b062fdd62d6a574db597644222d5a19d7833cbb894a955076b06bcb1a22c94d5f87c2787420dd1de32d0f789
-DIST eclean-kernel-2.99.2.tar.gz 18743 BLAKE2B 493a3f54e92821c76dde0228b382dbca0f9e9d69543e0af2269bdcfb736ef7450179d804f1a97b9e7700d812110c5f32b2667724f7c60e3377a8384e557b2f5c SHA512 48bb628be93922698483208471ec76b47615e80b5a7dead108d4f938664c72b080aa3f54f67056ce4b661ef92fff74f93ef842da1e177225793d13f8a3e16032
 DIST eclean-kernel-2.99.3.tar.gz 20031 BLAKE2B 70830639eb00bde810e29361dec7c7b90f5b85b79b5be865f23cf45254cbf6139ef335fb5bfef08e2512512e57867df62f6468ce8de1da58cc9a4cfa27a26244 SHA512 edbe373b81a2eb5c7fca8794f9577c68ab66305e9085cc7535cd5d8a8fdd549b2035cb0b5f3e5a69cc735146c2eef81dc5c1f5284ef255420aca0cda9e518b14
 EBUILD eclean-kernel-0.4.3.ebuild 502 BLAKE2B 068b3533ebd4613a0a8204e883d26db1070189d4baaeadb2d070d96aca0a75c23c2bddd1ac4ed1f37ecdf1702a16d0bf27d5863451781ba560113141e00bc0d0 SHA512 80bd3a50c8d8d9dc52d93f59583db74fc8a5b351f83c8b063e63cb8bae71830f5d44541f857f0129e7ce82da13fef17a32d8cc14b917027be21e916853f570c9
 EBUILD eclean-kernel-1.99.4.ebuild 362 BLAKE2B 20894519cc3270ab4880c0373894638d18ecfeb34fa49a7f801e4889d22f78702c87201c3cba929092b38149f3b14109b058f95f597eea8c1507011af37b14d8 SHA512 61b64ce5d1f0e842de988f1d62bb41af6e16ef73a05ab35b90d97410292c5409c3873fac6dbd9a09e4be033cd19e70a283cfd6be48183409822c29ef26abdc85
-EBUILD eclean-kernel-2.99.2.ebuild 539 BLAKE2B 06dbbbe514911dfef951353b79a804248c39a85509c2695af255c6668ef50ca67285ea46d60f30ebc972e5002527de8bd5b836c07b764d319c0f646bf3b53860 SHA512 11f0ae2c21864f0185598e866a1aa5dc9465a26c859756d9eb7e707dc96939dc8afa37b79a82576867505b5eb0a60950581052d34e86a3eeba9bab052d4f0510
-EBUILD eclean-kernel-2.99.3.ebuild 664 BLAKE2B 6c3ce3e67816a95e7125cda61b031a8ea62e1482a1e966a6a50bfd93604e0100bda7b97820d24e245a2c0ac7976853276d16159e75ba4f841fed236293ec22de SHA512 ab60bb93a8a5a16fb870968e330357d0f526a5927af3bed5ed8cda3cc167328858e2330c537a5f3b71bf0b785ad594462b2ae9e1c02862480f609c950214433d
+EBUILD eclean-kernel-2.99.3.ebuild 662 BLAKE2B 7501c90989e89a2e2fcf49bd31d22db2329423e1614f9880b26653afec258139320f369b72c9290ee95a5dfd25c42788f3bf81e52da4bd38e4b58725d57693a9 SHA512 b9d88cf2f414d60e59fecfe120d340ab44675ea6d3a19f12503e307219ef13ab833c5857a9a9f4971ede059b8bef829bd52c557c280b53e4edfb50107ca1f285
 EBUILD eclean-kernel-9999.ebuild 633 BLAKE2B 0a38b0691d5e7651cd372daa0b647fa15b66ac0a79ced82e8e00f475f82b2a3595a9b8f971051c01544f2c30755c65e87b330eca033fa93b1d22d3e442f20db5 SHA512 dd819f4105376e9c56427f1428e72a3ad9b7652cf68d5f4b94711c3f3936405cdf9c4b509a53d1b7a5e2494208bbac1445feb34c883c719f329e9036f00aa2e3
 MISC metadata.xml 618 BLAKE2B 5a88b3d477e80a853ac3eb5ee55fa5cc202b7a78d370a32fe47acb7e571cc23886b7f31e6684d9463e8ecfcaceb9157e2c2d3df74abc7866850f5dc37586ba94 SHA512 afd67bf9c6f53d807cf00b206113815e672a120231ba809143efac0395e3fefa443c7a69a9c702a7d60e3404e622ec562492f0497421cc0feb08f15ac2f3d779
diff --git a/app-admin/eclean-kernel/eclean-kernel-2.99.2.ebuild b/app-admin/eclean-kernel/eclean-kernel-2.99.2.ebuild
deleted file mode 100644
index 5bc3c626c409..000000000000
--- a/app-admin/eclean-kernel/eclean-kernel-2.99.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Remove outdated built kernels"
-HOMEPAGE="https://github.com/mgorny/eclean-kernel/"
-SRC_URI="https://github.com/mgorny/eclean-kernel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild
index f4274285b26b..ffe29d38df55 100644
--- a/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/eclean-kernel/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="lz4 lzo zstd"
 
 RDEPEND="
diff --git a/app-admin/evtxtools/Manifest b/app-admin/evtxtools/Manifest
index 9702a9a5d5e3..2a45555060b8 100644
--- a/app-admin/evtxtools/Manifest
+++ b/app-admin/evtxtools/Manifest
@@ -1,3 +1,3 @@
 DIST Parse-Evtx-1.1.1.zip 71351 BLAKE2B 27e28a75e5a4ccce437f86a5924790d602cb7091c422a5f39e5a1ee0e785762b2f77999c84dd7f4fc52dbd58a90e03a80ca9de916e4df12c464959c8c8a5bfc5 SHA512 308fc3da4e9291f5f84cfbb0a2a17f92d45a2314d6b1806acb59e1a2d521041487a51a6e88e70c03a683df5a9442a30d8dc2483cf684cb96bb86f0a05f27e752
-EBUILD evtxtools-1.1.1-r1.ebuild 767 BLAKE2B 49ea4ef7b318f48a16154c072b8549119e3cd422ba8e2bc83cb162e585919b9876917bc53da419a59b2f7a6d935002fb0d1d63183593b917098c5c0634a89104 SHA512 f97cd31347ebf8be1fbfa930caab5e10a6cf8a707bee63740664dee435b64855232ffef8b19a17bb6b5e16d66c78e1bb4980b2c6b4073bbeb4dfb91ff2ab151a
+EBUILD evtxtools-1.1.1-r2.ebuild 778 BLAKE2B c973ae0c240a99688ad97b5ec845059a1e66fefd2844d70288cf90d0e84e4bd838523d09d02cfef5caf57c717e43cff28019aa66ab55f8c6ad4b6f7cbdd5fa18 SHA512 3a74e5cf7361bef605d94bff1d2dbd153d2bcbed9f005513a64f7453e718e755ab93f088bffce88f815ccf5ad935b1579cc6e9af945b98f5654766a0050574a2
 MISC metadata.xml 248 BLAKE2B dba7ab19012197ff483b3c5febb6e1eae41d23999686b287a45c38e89ff7565454473fac44579b1e367345933bd749897f8e737f50eaf024190c42069a3d4d16 SHA512 abd659f01838c035f4dfeb2c13e95a0e8e249b41d093af54ff31b4d87bfe03ae472e911a20ff0ad3ea6bb9718dbab822c8b7553ac0a7a59c1d09db7b4d910ea9
diff --git a/app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild b/app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild
deleted file mode 100644
index 3beba8065263..000000000000
--- a/app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-MY_PN="Parse-Evtx"
-DESCRIPTION="Read, decode and dump Windows Vista/2008/7 event log file "
-HOMEPAGE="http://computer.forensikblog.de/en/topics/windows/vista_event_log"
-SRC_URI="http://computer.forensikblog.de/files/evtx/${MY_PN}-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip
-	dev-perl/DateTime
-	dev-perl/Digest-CRC
-	dev-perl/DateTime
-	dev-perl/Carp-Assert
-	dev-perl/Data-Hexify"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_postinst() {
-	einfo "Consider the following as how-to:"
-	einfo "http://rwmj.wordpress.com/2011/04/17/decoding-the-windows-event-log-using-guestfish/"
-}
diff --git a/app-admin/evtxtools/evtxtools-1.1.1-r2.ebuild b/app-admin/evtxtools/evtxtools-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..9b0c4c29cd6b
--- /dev/null
+++ b/app-admin/evtxtools/evtxtools-1.1.1-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+MY_PN="Parse-Evtx"
+DESCRIPTION="Read, decode and dump Windows Vista/2008/7 event log file"
+HOMEPAGE="http://computer.forensikblog.de/en/topics/windows/vista_event_log"
+SRC_URI="http://computer.forensikblog.de/files/evtx/${MY_PN}-${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	dev-perl/Digest-CRC
+	dev-perl/DateTime
+	dev-perl/Carp-Assert
+	dev-perl/Data-Hexify
+"
+
+BDEPEND="${RDEPEND}
+	app-arch/unzip
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_postinst() {
+	einfo "Consider the following as how-to:"
+	einfo "http://rwmj.wordpress.com/2011/04/17/decoding-the-windows-event-log-using-guestfish/"
+}
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index a1bcf34f310d..b88f27d593c7 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.44.0.tar.gz 5507722 BLAKE2B b42424a1327f0cb28b78f721f465b156eed6a223937e7d08f0f16a3829b497dd1c6a9d450d6d4d4cbf1db033729d91fa1566fa9c7871a07f32556cd2a153bfcd SHA512 8baaea5c727cdcf1b8b4272820d6f2b2740320e688c16b5efc7c9e51ce38c7951fd8252bf41d736ca0c3f7da605d751f56b79544af75f8d0ef0f671e867b6d59
-EBUILD exo-1.44.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
+DIST exo-1.45.1.tar.gz 5559372 BLAKE2B a5b43f5fcc363041db882de88c52a33e16fb7e85bff414d8560455223e2e76d94b66dbf0a1b71368e8d12c591030475fff47cc1004ab34296cdd7541f1b72e43 SHA512 4a5dfbd81226a0150feef3ad40711555e0b316ba05c6f07987f6c04b261c662aa2942930ae6e4566d87a05d61c19924a20add3225ff2f862c71595cf9f802281
+EBUILD exo-1.45.1.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
 MISC metadata.xml 334 BLAKE2B 230d1a47a3e39f796c16a9e9a622fbc27560c951da0c49adf7aca135970c0c944f42da7eb624c7193d44830c72cf95da9d69d977562853de6a00fd8fb6408977 SHA512 cd1366d99abc260c6f2899000e2a517be9a4c43e921078764fdc996871df34c1827e512087c3eb6f95bf3b685c2f34cbc1f1462eaa303a948640a362b4501b01
diff --git a/app-admin/exo/exo-1.44.0.ebuild b/app-admin/exo/exo-1.45.1.ebuild
index 49b1772f318b..49b1772f318b 100644
--- a/app-admin/exo/exo-1.44.0.ebuild
+++ b/app-admin/exo/exo-1.45.1.ebuild
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index e5086d503d16..74df5ffad915 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -1297,6 +1297,6 @@ EBUILD filebeat-7.10.2.ebuild 56909 BLAKE2B 595e7681a5f2ad3e93220e36a93e67b567d5
 EBUILD filebeat-7.12.0.ebuild 56889 BLAKE2B 0a544cd15867f9df0f4951df20d88a16aa695dfe84f1b6b22687712a2d9a6268ff6b1db67b631b0d75d0a628ce509b6f5b2495bc848f63095bdc99265fefff5c SHA512 7dead5a00d0ec225f58b278d44db1d874d36e90611ce2105ed7da79f89dfe0662dd985f6a60b4dad718f79ddb79ce4dc6b70b2fd81c753bb90591a22b882f748
 EBUILD filebeat-7.12.1.ebuild 56889 BLAKE2B 385ef4017cafe2dbd8b16172f2dd8cabdb6940d0706678f2caed89532030f01210663fd84fb0e8960b5502c5f6d783617e9b323367d9a2edb98972e5a2ada599 SHA512 3e159c707c8e4e69e7889fad39159bdfd57e026092cd81be6289d21d7d586e99620038f1023d9903292a0ecd7d439abe4b6d68df14c3c8506b99462fe1e548f0
 EBUILD filebeat-7.13.2.ebuild 61937 BLAKE2B 949b8cd97a05e6c8035ffa05dccd0acb7c2d61d6f28bbcf401a2fd02b138d9f4fbb5d7f9785e9a31be16aca59c40cd7df8c1ba0e2821e8dd8c67e419a9e422da SHA512 f4a892c6d0216cc42b1531c326e246aee83f34c65d96e560549c4b74006d88c74920a5332bbaa2af7c84c518070752ff53f5152281a7c7a4af029f760b62dff0
-EBUILD filebeat-7.13.4.ebuild 61937 BLAKE2B 949b8cd97a05e6c8035ffa05dccd0acb7c2d61d6f28bbcf401a2fd02b138d9f4fbb5d7f9785e9a31be16aca59c40cd7df8c1ba0e2821e8dd8c67e419a9e422da SHA512 f4a892c6d0216cc42b1531c326e246aee83f34c65d96e560549c4b74006d88c74920a5332bbaa2af7c84c518070752ff53f5152281a7c7a4af029f760b62dff0
+EBUILD filebeat-7.13.4.ebuild 61936 BLAKE2B 027b64824f4b67bc568932cc7422a7fe97c8558ffcaba040c8c4a99f580aa8cfcf4981c49f72386f225e3ec6c8e9260b639e5593cf07ce168cc1e17d89ff1443 SHA512 f73c540f5d4f20970ea3adf8fcdd1b468e2b01b485451bc36d2e5526d6c67d59f13442cf0b812039705ae6787749911c55dce99d0e736ad62c3ea124a363dcc8
 EBUILD filebeat-7.9.3.ebuild 55140 BLAKE2B b5cf3c10c29f84b63bc35f85eb78871b7fdb18db5048f6aa4f8421f09b50479eb4da290716110de4f2e8b6abae5b1cb1702a032505a95f93bcb0332170ace241 SHA512 694ac3ace92424e7bd1153270d88a9bd204c605d9608e430c101beffa973a1ef2c476f0c2ed0666024ab8040cd99dda15b2a7c092f4a75f888b24232225cec3b
 MISC metadata.xml 492 BLAKE2B 6b16876306316f37d59bf32aac33a2ff918c63dbf2ca0f71448249b20e99e5576f20dbad997a227730cb836c7f244ea8301dae62603e1961127bd755ab87f5b0 SHA512 c42a8bc75fd53383ea094d5049ba5f294cb8a2f0b0fe435eb74427bc82751bfbe4e4bfe076abbd052946ae6b0cf2f7129040a47b439a704629c6846ce6b7fdec
diff --git a/app-admin/filebeat/filebeat-7.13.4.ebuild b/app-admin/filebeat/filebeat-7.13.4.ebuild
index e3d05342b132..3aace26796b3 100644
--- a/app-admin/filebeat/filebeat-7.13.4.ebuild
+++ b/app-admin/filebeat/filebeat-7.13.4.ebuild
@@ -1127,7 +1127,7 @@ SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 
 S="${WORKDIR}/beats-${PV}"
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index f6c7628d482a..b90ae3d8525a 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -109,6 +109,8 @@ DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.15.mod 790 BLAKE2B 61a0b396ff
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.16.mod 790 BLAKE2B b2ede5d12e92b5594a854db2327c085d200ba72590a474cd5a2b5a030371ef3a9ceee584db1942891826993d80ba74ab4d7b70b0611184a120322860b66c9b39 SHA512 7cc7aa119bd7385db8a90e7770a6bcbcd2bd3f138a4562da3e0545893ccfccd1c5e4ae930fd0a645b1687e3e78264561647bb6540f2d501ceb2d89180d7d6437
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.18.mod 861 BLAKE2B 55f6b9763f5a966750b22b56cd428c1b4d385a60b5018ebce5959de182110ac3c223fa5cdf4a5e580dcc6f46632c354930701aa728d4dbd20c2404a54881463d SHA512 c9a070f5889052905faeb9095f5a9d5d921345ffb59b05aa1eed070e32526fd61855c84da26e04ccc823564832f60e0668940f6f3fc5538a5c733c964342b420
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.18.zip 724008 BLAKE2B 63b431b8148a5a5edcf27e2768354e0a3e7f81fe24f42e0f6bc4b3fc5b2e7ea93eddf463024c0a0d50c7d2c4cf1967121275d41d3cc6679e21c8095258f77bbe SHA512 ecbf676cf574de038369236a7233d05964f7d6a6c25b895991bf3c9ce226a4a7d5389532f61095629478e8ed7dc4a1111a5a23fe5cd083d3087052b95cb4163c
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.21.mod 861 BLAKE2B 55f6b9763f5a966750b22b56cd428c1b4d385a60b5018ebce5959de182110ac3c223fa5cdf4a5e580dcc6f46632c354930701aa728d4dbd20c2404a54881463d SHA512 c9a070f5889052905faeb9095f5a9d5d921345ffb59b05aa1eed070e32526fd61855c84da26e04ccc823564832f60e0668940f6f3fc5538a5c733c964342b420
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.21.zip 725991 BLAKE2B 5c07cadfad75c92ac959b5a9c23d27110da06b77f2fc2dcadd21cbd733b7c16c5a5a6c5224acb9f500d3af9c47af00228d22917c870124985642e742e659978f SHA512 e89f55720791fdc5f0e9a2628aa6cd1bb36b322dc011f31be7ca92807b3f5188dac21ed1949f00628a44ee43bb463b91a0237a9bb6299ee90e24675368552245
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod 36 BLAKE2B b225c59078b955a08b32e04bef09ef99df1befd791c66b6e8c1e97c820aa16bba520e2d9f31af170cfec4546a53b9f49eb59112e3ad5cb9f4ec1e32c570576cd SHA512 3035f5c6d6b72168b77140776f5a15d9ec7a81bacb1f0433d4595ad240c79d69466c6e2e4b2c025b30af68c88ebebe4fd011b04a8a82789401af4503a9cee29e
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7-0.20190325164909-8abdbb8205e4.mod 36 BLAKE2B b225c59078b955a08b32e04bef09ef99df1befd791c66b6e8c1e97c820aa16bba520e2d9f31af170cfec4546a53b9f49eb59112e3ad5cb9f4ec1e32c570576cd SHA512 3035f5c6d6b72168b77140776f5a15d9ec7a81bacb1f0433d4595ad240c79d69466c6e2e4b2c025b30af68c88ebebe4fd011b04a8a82789401af4503a9cee29e
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod 1988 BLAKE2B e89ecdb4644e50e2cd545eb43452729d909745705f5254a59547420baf3da357e77bf5d73b220da6899fe08a4eb034b0d1815702dceda20ada57e277b83b9954 SHA512 67df97dbec1c4a0c0f84551ea80df88a827c9ff4467614ef61544a611e19de6d063af40cf33673621f2e52e198595b61c8d6e5d732fe87f00eb7c5bd653e0399
@@ -163,6 +165,7 @@ DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc6
 DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
 DIST github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod 38 BLAKE2B f6ad4f22436471512ed4037c3f4c8dec4e0f7cb9191ddda23a2f5a5135785a6c5af99dd9005218bf196e0f48db755d040c894f6c5f2c1c338580597eca5eecd8 SHA512 05b70033a965ce6a70ea5fe7c635768c2c665942e04b17e47fba03b70cd977a8cbc292faacc3e10bd785523a43c61d42811c20513669592f308830863cfab56d
 DIST github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.zip 9009 BLAKE2B 5d6dbadcb0c94a610e600ab54c644c4169265fd251e1a083d8f4723289abd840982bf083c597cf32d5462388d2a3848f3c051001a5bcd605d2763386b727cfb8 SHA512 1551a4ab292ca95120abffd8ba4c53d4215a672539d969194f04c50cdde653afcdbfb7b0df8d7240a7846da7bca30b6760852a1df651cef37caae7603baf9d19
+DIST github.com%2Fbits-and-blooms%2Fbitset%2F@v%2Fv1.2.0.mod 50 BLAKE2B 4079755fe411598597b92696843fe84c0e2d7237e3c97b7fc74fbb12801f12c1f0c6202a6dbe69a30ae0c533bdd8946f89e8135771f92e98996033ac36a94d72 SHA512 5302c9bdc76781f7395c82a9c9498fd082069d0e26cd03dbe6c0a260a1c6aca19f5f54579fa5c156c19a7ff1e2bb724a81b339b2a4e40c2917b97b332378283b
 DIST github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod 568 BLAKE2B a2769032d81e02d8f4945648d36e862a996841d0e138077fd190b47b700fa08cd4e8e8d300925fcae5ebe48ea972afed0dcde81870f3673a3227ba90beb5e341 SHA512 262ec838f5c4b97bc186533c20456e62633038ae74747c7b884788bd06ce01863a59237557877d35f37338ebc018d2c1c8ae963e4a42dd42e0823a5b3ec81bb3
 DIST github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.4.mod 289 BLAKE2B c02564b45f86901f99c0813a0481d40db18804821e588e3a897e75558decb143327a3cd15d2244bd2c539d87a04ffcf1c55d8a1d78406bf50fcd38840fa41c4b SHA512 3d1227255f5e454682ed28d971b4ffbe35f80c127e0049d05d3ad24bc02fe97d257942180c6ca5b646ced2028805a94c0e2d62183bd311cdd2770da1ecbe19ec
 DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
@@ -190,6 +193,7 @@ DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
 DIST github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod 38 BLAKE2B d8a847320562a5d1158e868d3ade028d83059898bad409051f8a342843ec21d8df4305b50b35b7ba7fddad63b53f38c5689f4f7053cfa510a2b222a043880748 SHA512 b3a401f05d85f8d687fa8387b475211ec627c7d2c80f5fe1b5a4d97a41df7707d0cc0dab634bcab246f43058f204f10b45ee4cea5f61d8e7cb88c4ba8f085dd4
 DIST github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.mod 100 BLAKE2B e85f41fdbe685d35c78d22042afb1addb6e7b05a82f3818199928f68b95c3e188e80fc6f3f630c994f3e2b6a1724df5f8b4d407440e34adcc4b2c2c8cb55c53d SHA512 3b92bfd3d83eeec84259d527fc8fbb1854649b8fad658082e1f35044ac097b96f37ab6acbbd83fbe8915f4189bb2249364172d79b75b8d684a88e2c8744be0f3
+DIST github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.mod 194 BLAKE2B f83b4b8137ffece2fb4b6adc36ec7e3f64bcd112a63fdb8f32f9d486c28ab01e5e05b903e9888b9dd95bdd00496daafa178d78757d7c8bb3e08f40989854d2af SHA512 2d1cfdabd0a874430b31c1885a332f7f383ea0bf9643ccc34e9ff46444ca5a6a126848ed459e4d62eafd4eea05413c0e7bb15abf65a79ca38ef80e719015f296
 DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
 DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
 DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
@@ -197,6 +201,7 @@ DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod 13
 DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.mod 100 BLAKE2B a7a92e487b14e5f8e8bddffe2cba32e8876b9dfdafb1786b62b2cb1cb93ed646aa98a5093d7e488c00fccf9beb98c078e22d8dca5362618cdb5f4c3515113087 SHA512 ff846fd599947276853b6388db9d0af7ee90dacb6b7dacfe99d8540cb857ee4a530d9beb894f830c52b687f76e69a02347333f635d37498c8fb5ded3b06bc562
 DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod 138 BLAKE2B a94aeebc267e5d2869c162c5f672be9d76d68dab9968373a51c2da4ea9367f6049ad3ac9fbfae36192a4fed13d176c92675017d1d9ac67d267a0697987cedefb SHA512 ef0515f57df8f50eff19dda46cc3d167bb700d90c7e1080b3f0e7bc07657ed41169d77ec8a4de208b0115c07df42a7ce1cac9bc245ef5cd2688aedc259ba09d3
 DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.4.0.mod 177 BLAKE2B 0b2b115bd8498c8e4fe3c848cc9b8f1379165c4b1ee7abdb94733e3964ae15450bb6df4d8b959a03679d285cefac8862e0b57a9230f7d6137293c35d72366c54 SHA512 6e8fc3bc808aa947132c3fff22b4aa817fe2fae56fcdb5fb07445816fe45dd84db964dda36a795e9641dd2ce2a4df5487454884e42b0106603dfd7558e5928e9
+DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.mod 177 BLAKE2B 0b2b115bd8498c8e4fe3c848cc9b8f1379165c4b1ee7abdb94733e3964ae15450bb6df4d8b959a03679d285cefac8862e0b57a9230f7d6137293c35d72366c54 SHA512 6e8fc3bc808aa947132c3fff22b4aa817fe2fae56fcdb5fb07445816fe45dd84db964dda36a795e9641dd2ce2a4df5487454884e42b0106603dfd7558e5928e9
 DIST github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod 32 BLAKE2B 5483978ddce5f57e08f1358c34e5ea6b26a234e017b2e3a9af91296de3c79756f73f8cd9629b7d04c88e2135f30781cd0f43fbf9eceacebf26f141bb297f376a SHA512 865b4cc3ac91138e9b4581be778685f89bb93cdaf2372bb7b5db6227e249a2be89d5d14c89bd0e874e01d744aafc08b30b3ccee18a472981bed0e7740d892da0
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
@@ -246,6 +251,8 @@ DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.1.mod 3320 BLAKE2B 6b27caf
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.2.mod 3320 BLAKE2B 6b27caf17aab4e9496702c8e8cee8b75c7468cad1eaa36526f6bf72095cf03e9ac8b7391af44df313fc3656d3c52f595d05922b2896ad0cdaf1bd29294f27e74 SHA512 352a2693d1e0a85bf705ac47666757e0ce7529192ff9349fa115e528e33c27cbbaec072e7ca51e98cb20ce5baefe6bb238f4f7f599e08cc2ed53c8ddca085569
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.4.mod 3320 BLAKE2B 0fe34be345c6f00b41c19e1d6b3061c667fc0dbb191db911deb655ab8a95dae7b1a1f41ca948a0add693474e4e61ad4b73ad5ee067be8f99da935d1aa6e2cc75 SHA512 73f594bcb767e213bea9db5f1258f30344fce6f4bfa386d007c35ec55886f43e41f4eeded61b08958c2c10dae06b10f2adc0123b385c2081c3d3a46ccc38c417
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.4.zip 2576591 BLAKE2B 92f8dd6f90dc8dc1126495f7e6d93e3856435b8d12ef41f65b320df4a8157d4db6560d423188058765bc0b591b50f10d1ad276a798f31fcc146b9a243da6dcc7 SHA512 5aec337e7c0fd6572f95863c2675f78b366bc23223bf510aedc7232bea891c1d176c39ae91526559e3988db2a43f1c9c104e3d2edfc60adc0e156cabe662b7f0
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.7.mod 3315 BLAKE2B 61d955cea8876a6f400b2345aade50402af9c420dd4d8a258446c4e5985a252d2551c5f7e6e8fe575035717f9f284229bed6b165d88bdb97a421758ef2a91fa0 SHA512 dbdf82b793699e710b73b8034fd2c99f9eb2b8216c4653d3b2635ad3e61899f66d79fb06b2eaa01beda884c2ba277a8c6071d9e21ca2e52d45def385bec93f52
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.7.zip 2586285 BLAKE2B adece496811c1f6e7cbd1f28745b849e8ec9e0dad601418d47d064ea801a267bc66c8c8437af9b327e15d4330fcf9d5bd8d95c786f0e60abad8413099988a853 SHA512 fdc054bf09adbb2cfd77852f45c0e7809aa6994e94708fb714d4886b2d8001647b7eca24644515f7a7b0e521274c767b686a43df69bc00344c435c56befdaffe
 DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod 40 BLAKE2B d99a912436af30ef3f5fd53f6348367016633170289e08c271f0148a47db1f9c5ac5da362fcc3f6fa5a7e7977377299adcffe63e9c3315c45ec173d55248006c SHA512 442fc394b0be5c87d2b9edc858f47d52b1027acf1fade259879bac7c598e51692199cba7d4e175f21f772193f1570e47e82d6c6c6fa160e253eb49b09cbca793
 DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190815185530-f2a389ac0a02.mod 40 BLAKE2B d99a912436af30ef3f5fd53f6348367016633170289e08c271f0148a47db1f9c5ac5da362fcc3f6fa5a7e7977377299adcffe63e9c3315c45ec173d55248006c SHA512 442fc394b0be5c87d2b9edc858f47d52b1027acf1fade259879bac7c598e51692199cba7d4e175f21f772193f1570e47e82d6c6c6fa160e253eb49b09cbca793
 DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20191127005431-f65d91d395eb.mod 40 BLAKE2B d99a912436af30ef3f5fd53f6348367016633170289e08c271f0148a47db1f9c5ac5da362fcc3f6fa5a7e7977377299adcffe63e9c3315c45ec173d55248006c SHA512 442fc394b0be5c87d2b9edc858f47d52b1027acf1fade259879bac7c598e51692199cba7d4e175f21f772193f1570e47e82d6c6c6fa160e253eb49b09cbca793
@@ -690,6 +697,8 @@ DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.10.mod 74 BLAKE2B 47557579d6c1e12c3b7dfdd9e5dd37291411cb87ff396973a0e17c97ffc79da1f6d81dec640d75cbc5e84ad9a8e17d729992c998dd614ef89a973d3cf5083b60 SHA512 2638750386491e91639a8d6e0fdd5dfe58ffca24a228d2810556b0f280839ca1489bcb47ea77adf287beb3b2d70ab2b1a664e0fd1b8b24cb3c88aea1265e47ab
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod 74 BLAKE2B 47557579d6c1e12c3b7dfdd9e5dd37291411cb87ff396973a0e17c97ffc79da1f6d81dec640d75cbc5e84ad9a8e17d729992c998dd614ef89a973d3cf5083b60 SHA512 2638750386491e91639a8d6e0fdd5dfe58ffca24a228d2810556b0f280839ca1489bcb47ea77adf287beb3b2d70ab2b1a664e0fd1b8b24cb3c88aea1265e47ab
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip 38997 BLAKE2B 792e9f0dee385ecc3a0d3ab507a8b73c5f08392e63964f84045200fe1b380f05ece7e61a6359f263ef8daf682aae30e5b28b53ec17d0e897c83fbbf0dfe60e56 SHA512 fe6e378cd4bb82cbda102710a11a2f183d5286651ad7c641c33c9c1f251387bc95f72a5e995e4fb12dee33c69e6d4a81321a9ea75b27135cf977cddded98ff2b
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.12.mod 74 BLAKE2B 47557579d6c1e12c3b7dfdd9e5dd37291411cb87ff396973a0e17c97ffc79da1f6d81dec640d75cbc5e84ad9a8e17d729992c998dd614ef89a973d3cf5083b60 SHA512 2638750386491e91639a8d6e0fdd5dfe58ffca24a228d2810556b0f280839ca1489bcb47ea77adf287beb3b2d70ab2b1a664e0fd1b8b24cb3c88aea1265e47ab
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.12.zip 39947 BLAKE2B 31ff80fd9c0bee3183139da5f47f2db00e10f6f889f7f3ff17a7fcc4ec31569ac4576b22961f7e8986d01d443e79312dc786f22d276397b48075880273ea24cf SHA512 12ca7bca3eb32780025552ce6c5196d0aa19b0412db5d472349fdb949654c36852c5a5e54b845fa86826dc599cb4c35e8d4842ef89cd48dbe949cb87a308f146
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
@@ -908,14 +917,18 @@ DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc8.0.20190926000215-3e425
 DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
 DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.mod 1053 BLAKE2B eef9c12986cf3a2ee51a7c2bc72f01daeb0a6bf0da5c38716447745cb2f82baba7a8263f434c509ce96a26b84f80df93db62dfdc0a247a3cf80c36edd40cf34f SHA512 2f987fd2c36d91f5df6bfb3f2477ab948fa685e2e82e4b0260b369b1fa57aa48c393f0f7f985c5a917218305311ca691525faf7ceed7a0d2f726df04f10ecada
 DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.zip 684884 BLAKE2B 820095d03422b37402dee1d8999e7bda875202347a1c6542a0685a6551873d36991e52ffb4e5f0358609cac672f2273d5ec71d313b96edbeb6e28548c169cfc0 SHA512 e710c42be0d5f3b78bc417f1da7aa09e2d9f7ba80ed4506e3d2cf0f6f26156ff9bb099a6ccde3d2fda3d990a18001d19a7e8f0aaa0e5c5fe4d49186e0de25f51
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.2.mod 1063 BLAKE2B f217a9587ed64ad54d82280a62227e5429c8c35eaf5383b0be66dd818c1bd0632d807c3a9faa49a2c07d87323771221981983f32a36b02f434a8ad9aaee10b38 SHA512 6bfa852715f4fe13be43033f2905a4118f9fc9e4a101eee2e113c7410958f789d02d14eaa5f2bcbf76ca2320f1f37eeca9fba015200d73250f2c5c8afa4603aa
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.2.zip 714078 BLAKE2B 0c1ee7e017976d9cc8aab312a725c8fc44f7ed3615363bfd07b9c9856ad1a67c5a2f5f980124d0593073b342058bdee581b441b4986adf008653a16ebf7170cb SHA512 d5147d662c206b6763f7022a4715584358077bd18acf0b435b693f5790913087759b94a7fed18d4f85a6b03c403450f7b18e6ae99f47e1dc6a4be3620a60f4f2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20190207185410-29686dbc5559.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod 47 BLAKE2B 0eda9805fe0e1acdcc1e7b2693e72e39ea416cf57a108b1847491e1f15f8a7965c8aaa77baad1ae6148f39d36b1fc5fcf159b54111bee0d20bf2fe8edfdf85e2 SHA512 4e53e67b276ea3fe8a3977bbe72758bb2f844e22cdc3e23994176821cea51b10f5e802ca3db848a8b3d00a146c133a89271ee76158c478683b393682806400de
 DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.mod 209 BLAKE2B 5d7d5b4722834a34f8a63dfe72bd2f5a0426b284ace021ef7f6b7d16ac68710ccfd4ab21b442ac7cdd51f9a17fa116235f8c4d5e1d88c6b4392d89bbdc474e5a SHA512 13826a0b4d175ec2093d0854c789a2ce2c82d325b91d8bdd7dc0cc123b13ae59de2dd994039e90b9cb8ca424f5b642fed283bf8671b25c5c6117b168e5ce42bb
 DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.mod 179 BLAKE2B 16c3178a1515a77927002d1291ac1549ab95db0c67cc00f0d1c4ea543a636f6513e2ceaed328d8b3dcd864caff67ac4f0fdcf9d20fdf11fbcd4c49f527463db6 SHA512 b84b63dad1dedf0a1d06e8823c25a2eb5a833d2155e6e59b5205097cf9dcfe801b7a006e54730e512d0c094601237c2c2d9a4f518cf4fa392ef87f72d119776e
+DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.2.mod 188 BLAKE2B 916fbc3de4dfc6048a1573e2e2740edc80b4a1502fd85a5163d3b234556785ce4e1732104e7c249746cdbea6573878a174d097c8fb220775b9ca605ca744e7fe SHA512 8fd12c10bca0cc3602df94d71c782e2625e9909fe8d0746265d63b626bf538d4d213d3cb372295a38d510d83284c33efd9c1dc7b1d852fc2fe84d94193a66f25
 DIST github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod 45 BLAKE2B 4a11e9a4a24eb8e0603b2e708591792b76e8523cfe113df480a67bbe95169d1b1e30ff8267ed6530684369a445f2d15f433f258a7c36b7b03381154ca90e1ae0 SHA512 33ab2af09dda0c6ad1d7b3f85dee520f18971c9c0e161d260f04b08ff3cce9b0633fd09b90c46aa5770a783ab7fe6871e6f8a5a0ed90bf56d555bf325beaf46f
 DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
 DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
@@ -1425,6 +1438,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
@@ -1703,6 +1717,7 @@ DIST gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod 194 BLAKE2B aca56964199448b8220169f979c
 DIST gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip 95019 BLAKE2B e78e242f9ea5824ffa2d8c1dda6df571eb6d27af59ac9bd5f09e09c398fe47098895000752c6b79571398a0ca7e163a58ba789b15f0451e98d79e273e1afb58b SHA512 7f3f556401d7ce27f1dc88e8a022f8885cddd488f4ece632e24cf9b9f6504d748519480dcf60a577a3a9451104340a917f353f43f89e05f868913c26357593d6
 DIST helm-3.6.3.tar.gz 686200 BLAKE2B 5899a5d3a7a7564b59c2bcd7b862576052f56b24c940262eae6f178ebf12f3b2223b3a7c10cf218b9e3ff6c9d9bf6300b28c43f5f9454e23052f19ea98759178 SHA512 675e2bca107eab5955e6b921d12e829045c6b522574eb39a046eca2d1a97b6aa83360832c52904c425d58fa111c001187d95d18073dbda555b38a7679e20511b
 DIST helm-3.7.0.tar.gz 702358 BLAKE2B f2bce19cca5d2e302a3c33554e2bcec905af7d4ee735256996adc42e73decd1a493c2bbab830a4820e2db0a44eebb7515db98a779adb1a4ecac21cf4699e8370 SHA512 8e763308e2f4dcf73b2bcd3af22ed4fc1fd68603fa1edc5118ff6b1c401a0c85a50bb2e934e5bdefff2626778657c7da62e620982965edb5217bbef3f040433c
+DIST helm-3.7.1.tar.gz 702780 BLAKE2B d187d3009f3820fe7de83a7bac41d9fecda3671fcd13b512524095d95a6fe21c80148ad4e865b8815237d2fd16654785b2c74883c45e72d4d6bd01e91d98a6ff SHA512 60122fc14914549c3e8c328182c7902ab04dbb30d57d67ce864755fd332d8e2ce8f43ba579f72348697fba8bdb0e1b74b60da605c228e6ee431d17ce3fdbc872
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
@@ -1820,5 +1835,6 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea29
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 EBUILD helm-3.6.3.ebuild 63811 BLAKE2B aba5060c3050875934eddad1616d115142a273df59c93e4d0f2d7d35738875bc890a611be87ff379bff2d2e2c720fc95a8b2160169322ddf2b0f47220edfc412 SHA512 09b64150a1d2eb4ac633f547b54f063c02431b64ea90a013d96c03f91357f9fd2509c051467b3ce0eb37428fd15cb38404e63cb4dd3f5773a21c13d34e99f5a9
-EBUILD helm-3.7.0.ebuild 84338 BLAKE2B 6b9e10cedacff9c025248271e77c7cc5f56e1f4d0df288327a9c9c324598d924f0bd34b0e0fddf3792a238f06e3eb8a7c6df7bbca69c08a7d3c3b6413ffdb956 SHA512 1bbbaa27dd5c1cea80bda204ca944e1dcf666d98cad37cca4898210fcc86a1d6d9db32a90b745093a74010974dd2a34409cc297a5b4e7019909fedcfdcd34faa
+EBUILD helm-3.7.0.ebuild 84337 BLAKE2B 464dfc4ec78cb7b754e38a3147ea296ac6308aee80ca030d7f7daf91abbd35bf77d65d1f38b96d7bc6cf377f583b012aed16aaa9c25edc41c2334e7aec42b194 SHA512 6ff87b513856995cd2a746675b75d194aaa08c5317c786aea93a00c7d2634498f245f8da7e68168ec46bf64271d38835e3cd13c5f372502538c258c88c2f0f19
+EBUILD helm-3.7.1.ebuild 84772 BLAKE2B be7d26b5b28751010c422a6e950f780dc47cd5af8732565a74dd4c122475acb91e920d052b80200fc176f3f89bdd9712f9a117d689892db43f169c31089e7180 SHA512 40d793c824af492f660b0e21eb32a6a08ef5c762b192211c7a70057c0a87e611412127286d0da3dca73579281004f6b36e82f380ab529c7ada2ab8aed8a19dde
 MISC metadata.xml 323 BLAKE2B 5001082c76e55c24c27deced68a33a8fc8c9514b65116aa076ade0bacab00103a19e0807af8187b7bd8b761e64f20c4fab74b998e0f9ec473fb8d2bc9cbe4412 SHA512 a039551d398af15db8fb487b058ad569731376c51f8a23c245e4c14cd8924b960a2dcb286618c9365d21d219a271f1e0c6bcab712cf88920f4fc7fded832d800
diff --git a/app-admin/helm/helm-3.7.0.ebuild b/app-admin/helm/helm-3.7.0.ebuild
index 7c0a977c8b7e..dc87e4c6ea8c 100644
--- a/app-admin/helm/helm-3.7.0.ebuild
+++ b/app-admin/helm/helm-3.7.0.ebuild
@@ -1537,7 +1537,7 @@ SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RESTRICT=" test"
 
diff --git a/app-admin/helm/helm-3.7.1.ebuild b/app-admin/helm/helm-3.7.1.ebuild
new file mode 100644
index 000000000000..013fae044a08
--- /dev/null
+++ b/app-admin/helm/helm-3.7.1.ebuild
@@ -0,0 +1,1585 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+GIT_COMMIT=1d11fcb5d3f3bf00dbe6fe31b8412839a96b3dc4
+GIT_SHA=1d11fcb5
+MY_PV=${PV/_rc/-rc.}
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/helm/helm https://helm.sh"
+
+EGO_SUM=(
+	"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.50.0/go.mod"
+	"cloud.google.com/go v0.52.0/go.mod"
+	"cloud.google.com/go v0.53.0/go.mod"
+	"cloud.google.com/go v0.54.0/go.mod"
+	"cloud.google.com/go v0.56.0/go.mod"
+	"cloud.google.com/go v0.57.0/go.mod"
+	"cloud.google.com/go v0.62.0/go.mod"
+	"cloud.google.com/go v0.65.0/go.mod"
+	"cloud.google.com/go v0.72.0/go.mod"
+	"cloud.google.com/go v0.74.0/go.mod"
+	"cloud.google.com/go v0.78.0/go.mod"
+	"cloud.google.com/go v0.79.0/go.mod"
+	"cloud.google.com/go v0.81.0"
+	"cloud.google.com/go v0.81.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/bigquery v1.3.0/go.mod"
+	"cloud.google.com/go/bigquery v1.4.0/go.mod"
+	"cloud.google.com/go/bigquery v1.5.0/go.mod"
+	"cloud.google.com/go/bigquery v1.7.0/go.mod"
+	"cloud.google.com/go/bigquery v1.8.0/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/firestore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/pubsub v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.2.0/go.mod"
+	"cloud.google.com/go/pubsub v1.3.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"cloud.google.com/go/storage v1.6.0/go.mod"
+	"cloud.google.com/go/storage v1.8.0/go.mod"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1"
+	"github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod"
+	"github.com/Azure/go-autorest v10.8.1+incompatible/go.mod"
+	"github.com/Azure/go-autorest v14.2.0+incompatible"
+	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.1/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.18"
+	"github.com/Azure/go-autorest/autorest v0.11.18/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.13"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.1"
+	"github.com/Azure/go-autorest/logger v0.2.1/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.6.0"
+	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/DATA-DOG/go-sqlmock v1.5.0"
+	"github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod"
+	"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd"
+	"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod"
+	"github.com/Masterminds/goutils v1.1.0/go.mod"
+	"github.com/Masterminds/goutils v1.1.1"
+	"github.com/Masterminds/goutils v1.1.1/go.mod"
+	"github.com/Masterminds/semver v1.5.0"
+	"github.com/Masterminds/semver v1.5.0/go.mod"
+	"github.com/Masterminds/semver/v3 v3.1.1"
+	"github.com/Masterminds/semver/v3 v3.1.1/go.mod"
+	"github.com/Masterminds/sprig v2.22.0+incompatible"
+	"github.com/Masterminds/sprig v2.22.0+incompatible/go.mod"
+	"github.com/Masterminds/sprig/v3 v3.2.2"
+	"github.com/Masterminds/sprig/v3 v3.2.2/go.mod"
+	"github.com/Masterminds/squirrel v1.5.0"
+	"github.com/Masterminds/squirrel v1.5.0/go.mod"
+	"github.com/Masterminds/vcs v1.13.1"
+	"github.com/Masterminds/vcs v1.13.1/go.mod"
+	"github.com/Microsoft/go-winio v0.4.11/go.mod"
+	"github.com/Microsoft/go-winio v0.4.14/go.mod"
+	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
+	"github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod"
+	"github.com/Microsoft/go-winio v0.4.16/go.mod"
+	"github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod"
+	"github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod"
+	"github.com/Microsoft/go-winio v0.4.17"
+	"github.com/Microsoft/go-winio v0.4.17/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.6/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.7/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.9/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.14/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.15/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.16/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.21"
+	"github.com/Microsoft/hcsshim v0.8.21/go.mod"
+	"github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod"
+	"github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/NYTimes/gziphandler v1.1.1/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.1"
+	"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+	"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d"
+	"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+	"github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod"
+	"github.com/antihax/optional v1.0.0/go.mod"
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535"
+	"github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.11/go.mod"
+	"github.com/aws/aws-sdk-go v1.34.9/go.mod"
+	"github.com/benbjohnson/clock v1.0.3/go.mod"
+	"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bitly/go-simplejson v0.5.0"
+	"github.com/bitly/go-simplejson v0.5.0/go.mod"
+	"github.com/bits-and-blooms/bitset v1.2.0/go.mod"
+	"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
+	"github.com/bketelsen/crypt v0.0.4/go.mod"
+	"github.com/blang/semver v3.1.0+incompatible/go.mod"
+	"github.com/blang/semver v3.5.1+incompatible/go.mod"
+	"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
+	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod"
+	"github.com/bshuster-repo/logrus-logstash-hook v1.0.0"
+	"github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod"
+	"github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod"
+	"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd"
+	"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod"
+	"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b"
+	"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod"
+	"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0"
+	"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod"
+	"github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod"
+	"github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod"
+	"github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod"
+	"github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod"
+	"github.com/cilium/ebpf v0.2.0/go.mod"
+	"github.com/cilium/ebpf v0.4.0/go.mod"
+	"github.com/cilium/ebpf v0.6.2/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
+	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod"
+	"github.com/cockroachdb/errors v1.2.4/go.mod"
+	"github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod"
+	"github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod"
+	"github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod"
+	"github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod"
+	"github.com/containerd/aufs v1.0.0/go.mod"
+	"github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod"
+	"github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod"
+	"github.com/containerd/btrfs v1.0.0/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod"
+	"github.com/containerd/cgroups v1.0.1"
+	"github.com/containerd/cgroups v1.0.1/go.mod"
+	"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+	"github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod"
+	"github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod"
+	"github.com/containerd/console v1.0.1/go.mod"
+	"github.com/containerd/console v1.0.2/go.mod"
+	"github.com/containerd/containerd v1.2.10/go.mod"
+	"github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
+	"github.com/containerd/containerd v1.3.0/go.mod"
+	"github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod"
+	"github.com/containerd/containerd v1.3.2/go.mod"
+	"github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod"
+	"github.com/containerd/containerd v1.4.1/go.mod"
+	"github.com/containerd/containerd v1.4.3/go.mod"
+	"github.com/containerd/containerd v1.5.0-beta.1/go.mod"
+	"github.com/containerd/containerd v1.5.0-beta.3/go.mod"
+	"github.com/containerd/containerd v1.5.0-beta.4/go.mod"
+	"github.com/containerd/containerd v1.5.0-rc.0/go.mod"
+	"github.com/containerd/containerd v1.5.1/go.mod"
+	"github.com/containerd/containerd v1.5.2/go.mod"
+	"github.com/containerd/containerd v1.5.7"
+	"github.com/containerd/containerd v1.5.7/go.mod"
+	"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
+	"github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod"
+	"github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod"
+	"github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod"
+	"github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod"
+	"github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod"
+	"github.com/containerd/continuity v0.1.0"
+	"github.com/containerd/continuity v0.1.0/go.mod"
+	"github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod"
+	"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
+	"github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod"
+	"github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod"
+	"github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod"
+	"github.com/containerd/fifo v1.0.0/go.mod"
+	"github.com/containerd/go-cni v1.0.1/go.mod"
+	"github.com/containerd/go-cni v1.0.2/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod"
+	"github.com/containerd/go-runc v1.0.0/go.mod"
+	"github.com/containerd/imgcrypt v1.0.1/go.mod"
+	"github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod"
+	"github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod"
+	"github.com/containerd/imgcrypt v1.1.1/go.mod"
+	"github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod"
+	"github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod"
+	"github.com/containerd/nri v0.1.0/go.mod"
+	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+	"github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod"
+	"github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod"
+	"github.com/containerd/ttrpc v1.0.1/go.mod"
+	"github.com/containerd/ttrpc v1.0.2/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod"
+	"github.com/containerd/typeurl v1.0.1/go.mod"
+	"github.com/containerd/typeurl v1.0.2/go.mod"
+	"github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod"
+	"github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod"
+	"github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod"
+	"github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433/go.mod"
+	"github.com/containerd/zfs v1.0.0/go.mod"
+	"github.com/containernetworking/cni v0.7.1/go.mod"
+	"github.com/containernetworking/cni v0.8.0/go.mod"
+	"github.com/containernetworking/cni v0.8.1/go.mod"
+	"github.com/containernetworking/plugins v0.8.6/go.mod"
+	"github.com/containernetworking/plugins v0.9.1/go.mod"
+	"github.com/containers/ocicrypt v1.0.1/go.mod"
+	"github.com/containers/ocicrypt v1.1.0/go.mod"
+	"github.com/containers/ocicrypt v1.1.1/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
+	"github.com/coreos/go-iptables v0.4.5/go.mod"
+	"github.com/coreos/go-iptables v0.5.0/go.mod"
+	"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.1.0/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.3.2/go.mod"
+	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/creack/pty v1.1.7/go.mod"
+	"github.com/creack/pty v1.1.9/go.mod"
+	"github.com/creack/pty v1.1.11"
+	"github.com/creack/pty v1.1.11/go.mod"
+	"github.com/cyphar/filepath-securejoin v0.2.2"
+	"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
+	"github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod"
+	"github.com/d2g/dhcp4client v1.0.0/go.mod"
+	"github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod"
+	"github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod"
+	"github.com/denisenkom/go-mssqldb v0.9.0/go.mod"
+	"github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod"
+	"github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/distribution/distribution/v3 v3.0.0-20210804104954-38ab4c606ee3"
+	"github.com/distribution/distribution/v3 v3.0.0-20210804104954-38ab4c606ee3/go.mod"
+	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+	"github.com/docker/cli v20.10.7+incompatible"
+	"github.com/docker/cli v20.10.7+incompatible/go.mod"
+	"github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod"
+	"github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod"
+	"github.com/docker/distribution v2.7.1+incompatible"
+	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+	"github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible"
+	"github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible/go.mod"
+	"github.com/docker/docker-credential-helpers v0.6.3"
+	"github.com/docker/docker-credential-helpers v0.6.3/go.mod"
+	"github.com/docker/go-connections v0.4.0"
+	"github.com/docker/go-connections v0.4.0/go.mod"
+	"github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod"
+	"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c"
+	"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod"
+	"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod"
+	"github.com/docker/go-metrics v0.0.1"
+	"github.com/docker/go-metrics v0.0.1/go.mod"
+	"github.com/docker/go-units v0.4.0"
+	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1"
+	"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/emicklei/go-restful v2.9.5+incompatible/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.7/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanphx/json-patch v4.9.0+incompatible/go.mod"
+	"github.com/evanphx/json-patch v4.11.0+incompatible"
+	"github.com/evanphx/json-patch v4.11.0+incompatible/go.mod"
+	"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d"
+	"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod"
+	"github.com/fatih/camelcase v1.0.0/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/felixge/httpsnoop v1.0.1"
+	"github.com/felixge/httpsnoop v1.0.1/go.mod"
+	"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+	"github.com/form3tech-oss/jwt-go v3.2.3+incompatible"
+	"github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod"
+	"github.com/frankban/quicktest v1.11.3/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod"
+	"github.com/fvbommel/sortorder v1.0.1/go.mod"
+	"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7"
+	"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod"
+	"github.com/getsentry/raven-go v0.2.0/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-errors/errors v1.0.1"
+	"github.com/go-errors/errors v1.0.1/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+	"github.com/go-ini/ini v1.25.4/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-kit/log v0.1.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.5.0/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-logr/logr v0.2.0/go.mod"
+	"github.com/go-logr/logr v0.4.0"
+	"github.com/go-logr/logr v0.4.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.5"
+	"github.com/go-openapi/jsonpointer v0.19.5/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.2/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.3/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.5"
+	"github.com/go-openapi/jsonreference v0.19.5/go.mod"
+	"github.com/go-openapi/spec v0.19.3/go.mod"
+	"github.com/go-openapi/swag v0.19.2/go.mod"
+	"github.com/go-openapi/swag v0.19.5/go.mod"
+	"github.com/go-openapi/swag v0.19.14"
+	"github.com/go-openapi/swag v0.19.14/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobuffalo/logger v1.0.3"
+	"github.com/gobuffalo/logger v1.0.3/go.mod"
+	"github.com/gobuffalo/packd v1.0.0"
+	"github.com/gobuffalo/packd v1.0.0/go.mod"
+	"github.com/gobuffalo/packr/v2 v2.8.1"
+	"github.com/gobuffalo/packr/v2 v2.8.1/go.mod"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod"
+	"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
+	"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+	"github.com/godbus/dbus/v5 v5.0.4/go.mod"
+	"github.com/godror/godror v0.24.2/go.mod"
+	"github.com/gofrs/flock v0.8.0"
+	"github.com/gofrs/flock v0.8.0/go.mod"
+	"github.com/gogo/googleapis v1.2.0/go.mod"
+	"github.com/gogo/googleapis v1.4.0/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+	"github.com/gogo/protobuf v1.3.0/go.mod"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/gogo/protobuf v1.3.2"
+	"github.com/gogo/protobuf v1.3.2/go.mod"
+	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da"
+	"github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.1/go.mod"
+	"github.com/golang/mock v1.4.3/go.mod"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/mock v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/protobuf v1.3.5/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.4.3/go.mod"
+	"github.com/golang/protobuf v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.5.1/go.mod"
+	"github.com/golang/protobuf v1.5.2"
+	"github.com/golang/protobuf v1.5.2/go.mod"
+	"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod"
+	"github.com/gomodule/redigo v1.8.2"
+	"github.com/gomodule/redigo v1.8.2/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/btree v1.0.1"
+	"github.com/google/btree v1.0.1/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.4.1/go.mod"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/go-cmp v0.5.3/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.1.0"
+	"github.com/google/gofuzz v1.1.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/martian/v3 v3.1.0/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+	"github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod"
+	"github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod"
+	"github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod"
+	"github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/google/uuid v1.2.0"
+	"github.com/google/uuid v1.2.0/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/googleapis/gnostic v0.4.1/go.mod"
+	"github.com/googleapis/gnostic v0.5.1/go.mod"
+	"github.com/googleapis/gnostic v0.5.5"
+	"github.com/googleapis/gnostic v0.5.5/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod"
+	"github.com/gorilla/handlers v1.5.1"
+	"github.com/gorilla/handlers v1.5.1/go.mod"
+	"github.com/gorilla/mux v1.7.2/go.mod"
+	"github.com/gorilla/mux v1.8.0"
+	"github.com/gorilla/mux v1.8.0/go.mod"
+	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gorilla/websocket v1.4.2/go.mod"
+	"github.com/gosuri/uitable v0.0.4"
+	"github.com/gosuri/uitable v0.0.4/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod"
+	"github.com/hashicorp/consul/api v1.1.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/huandu/xstrings v1.3.1/go.mod"
+	"github.com/huandu/xstrings v1.3.2"
+	"github.com/huandu/xstrings v1.3.2/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.8/go.mod"
+	"github.com/imdario/mergo v0.3.10/go.mod"
+	"github.com/imdario/mergo v0.3.11/go.mod"
+	"github.com/imdario/mergo v0.3.12"
+	"github.com/imdario/mergo v0.3.12/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod"
+	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+	"github.com/jmoiron/sqlx v1.3.1"
+	"github.com/jmoiron/sqlx v1.3.1/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/jonboulle/clockwork v0.2.2/go.mod"
+	"github.com/josharian/intern v1.0.0"
+	"github.com/josharian/intern v1.0.0/go.mod"
+	"github.com/jpillora/backoff v1.0.0/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.10/go.mod"
+	"github.com/json-iterator/go v1.1.11"
+	"github.com/json-iterator/go v1.1.11/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/julienschmidt/httprouter v1.3.0/go.mod"
+	"github.com/karrick/godirwalk v1.15.8"
+	"github.com/karrick/godirwalk v1.15.8/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.5.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/compress v1.11.3/go.mod"
+	"github.com/klauspost/compress v1.11.13"
+	"github.com/klauspost/compress v1.11.13/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+	"github.com/kortschak/utter v1.0.1/go.mod"
+	"github.com/kr/fs v0.1.0/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pretty v0.2.1"
+	"github.com/kr/pretty v0.2.1/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.5/go.mod"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kr/text v0.2.0"
+	"github.com/kr/text v0.2.0/go.mod"
+	"github.com/lann/builder v0.0.0-20180802200727-47ae307949d0"
+	"github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod"
+	"github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0"
+	"github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod"
+	"github.com/lib/pq v1.2.0/go.mod"
+	"github.com/lib/pq v1.10.0"
+	"github.com/lib/pq v1.10.0/go.mod"
+	"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de"
+	"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod"
+	"github.com/lithammer/dedent v1.1.0/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/magiconair/properties v1.8.1/go.mod"
+	"github.com/magiconair/properties v1.8.5/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+	"github.com/mailru/easyjson v0.7.0/go.mod"
+	"github.com/mailru/easyjson v0.7.6"
+	"github.com/mailru/easyjson v0.7.6/go.mod"
+	"github.com/markbates/errx v1.1.0"
+	"github.com/markbates/errx v1.1.0/go.mod"
+	"github.com/markbates/oncer v1.0.0"
+	"github.com/markbates/oncer v1.0.0/go.mod"
+	"github.com/markbates/safe v1.0.1"
+	"github.com/markbates/safe v1.0.1/go.mod"
+	"github.com/marstr/guid v1.1.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.9"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-oci8 v0.1.1/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/mattn/go-runewidth v0.0.7/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/mattn/go-shellwords v1.0.3/go.mod"
+	"github.com/mattn/go-shellwords v1.0.11"
+	"github.com/mattn/go-shellwords v1.0.11/go.mod"
+	"github.com/mattn/go-sqlite3 v1.14.6"
+	"github.com/mattn/go-sqlite3 v1.14.6/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/miekg/pkcs11 v1.0.3/go.mod"
+	"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/cli v1.1.2/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/copystructure v1.1.1"
+	"github.com/mitchellh/copystructure v1.1.1/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.4.1/go.mod"
+	"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f"
+	"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.1"
+	"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+	"github.com/moby/locker v1.0.1"
+	"github.com/moby/locker v1.0.1/go.mod"
+	"github.com/moby/spdystream v0.2.0"
+	"github.com/moby/spdystream v0.2.0/go.mod"
+	"github.com/moby/sys/mountinfo v0.4.0/go.mod"
+	"github.com/moby/sys/mountinfo v0.4.1"
+	"github.com/moby/sys/mountinfo v0.4.1/go.mod"
+	"github.com/moby/sys/symlink v0.1.0/go.mod"
+	"github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod"
+	"github.com/moby/term v0.0.0-20210610120745-9d4ed1856297"
+	"github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00"
+	"github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod"
+	"github.com/morikuni/aec v1.0.0"
+	"github.com/morikuni/aec v1.0.0/go.mod"
+	"github.com/mrunalp/fileutils v0.5.0/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/ncw/swift v1.0.47/go.mod"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/nxadm/tail v1.4.4"
+	"github.com/nxadm/tail v1.4.4/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.5/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/ginkgo v1.10.3/go.mod"
+	"github.com/onsi/ginkgo v1.11.0/go.mod"
+	"github.com/onsi/ginkgo v1.12.1/go.mod"
+	"github.com/onsi/ginkgo v1.14.0"
+	"github.com/onsi/ginkgo v1.14.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/onsi/gomega v1.7.1/go.mod"
+	"github.com/onsi/gomega v1.10.1/go.mod"
+	"github.com/onsi/gomega v1.10.3"
+	"github.com/onsi/gomega v1.10.3/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0"
+	"github.com/opencontainers/go-digest v1.0.0/go.mod"
+	"github.com/opencontainers/image-spec v1.0.0/go.mod"
+	"github.com/opencontainers/image-spec v1.0.1"
+	"github.com/opencontainers/image-spec v1.0.1/go.mod"
+	"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
+	"github.com/opencontainers/runc v0.1.1/go.mod"
+	"github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod"
+	"github.com/opencontainers/runc v1.0.0-rc9/go.mod"
+	"github.com/opencontainers/runc v1.0.0-rc93/go.mod"
+	"github.com/opencontainers/runc v1.0.2"
+	"github.com/opencontainers/runc v1.0.2/go.mod"
+	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
+	"github.com/opencontainers/runtime-spec v1.0.1/go.mod"
+	"github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod"
+	"github.com/opencontainers/runtime-spec v1.0.2/go.mod"
+	"github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod"
+	"github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod"
+	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+	"github.com/opencontainers/selinux v1.6.0/go.mod"
+	"github.com/opencontainers/selinux v1.8.0/go.mod"
+	"github.com/opencontainers/selinux v1.8.2/go.mod"
+	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.8.1/go.mod"
+	"github.com/pelletier/go-toml v1.9.3/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2"
+	"github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pkg/sftp v1.10.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
+	"github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.1.0/go.mod"
+	"github.com/prometheus/client_golang v1.7.1/go.mod"
+	"github.com/prometheus/client_golang v1.11.0"
+	"github.com/prometheus/client_golang v1.11.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/client_model v0.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.6.0/go.mod"
+	"github.com/prometheus/common v0.10.0/go.mod"
+	"github.com/prometheus/common v0.26.0"
+	"github.com/prometheus/common v0.26.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.3/go.mod"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/prometheus/procfs v0.0.8/go.mod"
+	"github.com/prometheus/procfs v0.1.3/go.mod"
+	"github.com/prometheus/procfs v0.2.0/go.mod"
+	"github.com/prometheus/procfs v0.6.0"
+	"github.com/prometheus/procfs v0.6.0/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.5.2/go.mod"
+	"github.com/rubenv/sql-migrate v0.0.0-20210614095031-55d5740dbbcc"
+	"github.com/rubenv/sql-migrate v0.0.0-20210614095031-55d5740dbbcc/go.mod"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/seccomp/libseccomp-golang v0.9.1/go.mod"
+	"github.com/sergi/go-diff v1.1.0"
+	"github.com/sergi/go-diff v1.1.0/go.mod"
+	"github.com/shopspring/decimal v1.2.0"
+	"github.com/shopspring/decimal v1.2.0/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
+	"github.com/sirupsen/logrus v1.0.6/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/sirupsen/logrus v1.6.0/go.mod"
+	"github.com/sirupsen/logrus v1.7.0/go.mod"
+	"github.com/sirupsen/logrus v1.8.1"
+	"github.com/sirupsen/logrus v1.8.1/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.5/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/afero v1.6.0/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cast v1.3.1"
+	"github.com/spf13/cast v1.3.1/go.mod"
+	"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/cobra v0.0.6/go.mod"
+	"github.com/spf13/cobra v1.0.0/go.mod"
+	"github.com/spf13/cobra v1.1.3/go.mod"
+	"github.com/spf13/cobra v1.2.1"
+	"github.com/spf13/cobra v1.2.1/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.4.0/go.mod"
+	"github.com/spf13/viper v1.7.0/go.mod"
+	"github.com/spf13/viper v1.8.1/go.mod"
+	"github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod"
+	"github.com/stoewer/go-strcase v1.2.0/go.mod"
+	"github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.0"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/stretchr/testify v1.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"github.com/subosito/gotenv v1.2.0/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod"
+	"github.com/tchap/go-patricia v2.2.6+incompatible/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/urfave/cli v1.22.1/go.mod"
+	"github.com/urfave/cli v1.22.2/go.mod"
+	"github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod"
+	"github.com/vishvananda/netlink v1.1.0/go.mod"
+	"github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod"
+	"github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod"
+	"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod"
+	"github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod"
+	"github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod"
+	"github.com/willf/bitset v1.1.11/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
+	"github.com/xeipuuv/gojsonschema v1.2.0"
+	"github.com/xeipuuv/gojsonschema v1.2.0/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca"
+	"github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yuin/goldmark v1.1.25/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.1.32/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"github.com/yuin/goldmark v1.3.5/go.mod"
+	"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43"
+	"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod"
+	"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50"
+	"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod"
+	"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f"
+	"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod"
+	"github.com/ziutek/mymysql v1.5.4"
+	"github.com/ziutek/mymysql v1.5.4/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.etcd.io/bbolt v1.3.5/go.mod"
+	"go.etcd.io/bbolt v1.3.6/go.mod"
+	"go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod"
+	"go.etcd.io/etcd/api/v3 v3.5.0/go.mod"
+	"go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod"
+	"go.etcd.io/etcd/client/v2 v2.305.0/go.mod"
+	"go.etcd.io/etcd/client/v3 v3.5.0/go.mod"
+	"go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod"
+	"go.etcd.io/etcd/raft/v3 v3.5.0/go.mod"
+	"go.etcd.io/etcd/server/v3 v3.5.0/go.mod"
+	"go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.opencensus.io v0.22.3/go.mod"
+	"go.opencensus.io v0.22.4/go.mod"
+	"go.opencensus.io v0.22.5/go.mod"
+	"go.opencensus.io v0.23.0"
+	"go.opencensus.io v0.23.0/go.mod"
+	"go.opentelemetry.io/contrib v0.20.0/go.mod"
+	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod"
+	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod"
+	"go.opentelemetry.io/otel v0.20.0/go.mod"
+	"go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod"
+	"go.opentelemetry.io/otel/metric v0.20.0/go.mod"
+	"go.opentelemetry.io/otel/oteltest v0.20.0/go.mod"
+	"go.opentelemetry.io/otel/sdk v0.20.0/go.mod"
+	"go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod"
+	"go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod"
+	"go.opentelemetry.io/otel/trace v0.20.0/go.mod"
+	"go.opentelemetry.io/proto/otlp v0.7.0/go.mod"
+	"go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5"
+	"go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/atomic v1.7.0/go.mod"
+	"go.uber.org/goleak v1.1.10/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/multierr v1.6.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"go.uber.org/zap v1.17.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod"
+	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c/go.mod"
+	"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod"
+	"golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod"
+	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+	"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
+	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod"
+	"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a"
+	"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod"
+	"golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/mod v0.4.0/go.mod"
+	"golang.org/x/mod v0.4.1/go.mod"
+	"golang.org/x/mod v0.4.2/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod"
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+	"golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod"
+	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+	"golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod"
+	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod"
+	"golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
+	"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod"
+	"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
+	"golang.org/x/net v0.0.0-20210520170846-37e1c6afe023"
+	"golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602"
+	"golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
+	"golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod"
+	"golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod"
+	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
+	"golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod"
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod"
+	"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+	"golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod"
+	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+	"golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod"
+	"golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod"
+	"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
+	"golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod"
+	"golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod"
+	"golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod"
+	"golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod"
+	"golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+	"golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod"
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod"
+	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+	"golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
+	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod"
+	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
+	"golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+	"golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod"
+	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+	"golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod"
+	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod"
+	"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod"
+	"golang.org/x/sys v0.0.0-20210616094352-59db8d763f22"
+	"golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d"
+	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.4/go.mod"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/text v0.3.6"
+	"golang.org/x/text v0.3.6/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+	"golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod"
+	"golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac"
+	"golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+	"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/tools v0.0.0-20200308013534-11ec41452d41/go.mod"
+	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+	"golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod"
+	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+	"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+	"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
+	"golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod"
+	"golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod"
+	"golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod"
+	"golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod"
+	"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
+	"golang.org/x/tools v0.1.0/go.mod"
+	"golang.org/x/tools v0.1.2/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"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/api v0.14.0/go.mod"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/api v0.17.0/go.mod"
+	"google.golang.org/api v0.18.0/go.mod"
+	"google.golang.org/api v0.19.0/go.mod"
+	"google.golang.org/api v0.20.0/go.mod"
+	"google.golang.org/api v0.22.0/go.mod"
+	"google.golang.org/api v0.24.0/go.mod"
+	"google.golang.org/api v0.28.0/go.mod"
+	"google.golang.org/api v0.29.0/go.mod"
+	"google.golang.org/api v0.30.0/go.mod"
+	"google.golang.org/api v0.35.0/go.mod"
+	"google.golang.org/api v0.36.0/go.mod"
+	"google.golang.org/api v0.40.0/go.mod"
+	"google.golang.org/api v0.41.0/go.mod"
+	"google.golang.org/api v0.43.0/go.mod"
+	"google.golang.org/api v0.44.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/appengine v1.6.6/go.mod"
+	"google.golang.org/appengine v1.6.7"
+	"google.golang.org/appengine v1.6.7/go.mod"
+	"google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+	"google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod"
+	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+	"google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod"
+	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+	"google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+	"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+	"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
+	"google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod"
+	"google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod"
+	"google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod"
+	"google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod"
+	"google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod"
+	"google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod"
+	"google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod"
+	"google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod"
+	"google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod"
+	"google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod"
+	"google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c"
+	"google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod"
+	"google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.23.1/go.mod"
+	"google.golang.org/grpc v1.24.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.28.0/go.mod"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/grpc v1.30.0/go.mod"
+	"google.golang.org/grpc v1.31.0/go.mod"
+	"google.golang.org/grpc v1.31.1/go.mod"
+	"google.golang.org/grpc v1.33.1/go.mod"
+	"google.golang.org/grpc v1.33.2/go.mod"
+	"google.golang.org/grpc v1.34.0/go.mod"
+	"google.golang.org/grpc v1.35.0/go.mod"
+	"google.golang.org/grpc v1.36.0/go.mod"
+	"google.golang.org/grpc v1.36.1/go.mod"
+	"google.golang.org/grpc v1.37.0/go.mod"
+	"google.golang.org/grpc v1.38.0"
+	"google.golang.org/grpc v1.38.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+	"google.golang.org/protobuf v1.26.0"
+	"google.golang.org/protobuf v1.26.0/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c"
+	"gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+	"gopkg.in/gorp.v1 v1.7.2"
+	"gopkg.in/gorp.v1 v1.7.2/go.mod"
+	"gopkg.in/inf.v0 v0.9.1"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/ini.v1 v1.51.0/go.mod"
+	"gopkg.in/ini.v1 v1.62.0/go.mod"
+	"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.3/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.5/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+	"gotest.tools v2.2.0+incompatible"
+	"gotest.tools v2.2.0+incompatible/go.mod"
+	"gotest.tools/v3 v3.0.2/go.mod"
+	"gotest.tools/v3 v3.0.3"
+	"gotest.tools/v3 v3.0.3/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+	"k8s.io/api v0.20.1/go.mod"
+	"k8s.io/api v0.20.4/go.mod"
+	"k8s.io/api v0.20.6/go.mod"
+	"k8s.io/api v0.22.1"
+	"k8s.io/api v0.22.1/go.mod"
+	"k8s.io/apiextensions-apiserver v0.22.1"
+	"k8s.io/apiextensions-apiserver v0.22.1/go.mod"
+	"k8s.io/apimachinery v0.20.1/go.mod"
+	"k8s.io/apimachinery v0.20.4/go.mod"
+	"k8s.io/apimachinery v0.20.6/go.mod"
+	"k8s.io/apimachinery v0.22.1"
+	"k8s.io/apimachinery v0.22.1/go.mod"
+	"k8s.io/apiserver v0.20.1/go.mod"
+	"k8s.io/apiserver v0.20.4/go.mod"
+	"k8s.io/apiserver v0.20.6/go.mod"
+	"k8s.io/apiserver v0.22.1"
+	"k8s.io/apiserver v0.22.1/go.mod"
+	"k8s.io/cli-runtime v0.22.1"
+	"k8s.io/cli-runtime v0.22.1/go.mod"
+	"k8s.io/client-go v0.20.1/go.mod"
+	"k8s.io/client-go v0.20.4/go.mod"
+	"k8s.io/client-go v0.20.6/go.mod"
+	"k8s.io/client-go v0.22.1"
+	"k8s.io/client-go v0.22.1/go.mod"
+	"k8s.io/code-generator v0.22.1/go.mod"
+	"k8s.io/component-base v0.20.1/go.mod"
+	"k8s.io/component-base v0.20.4/go.mod"
+	"k8s.io/component-base v0.20.6/go.mod"
+	"k8s.io/component-base v0.22.1"
+	"k8s.io/component-base v0.22.1/go.mod"
+	"k8s.io/component-helpers v0.22.1/go.mod"
+	"k8s.io/cri-api v0.17.3/go.mod"
+	"k8s.io/cri-api v0.20.1/go.mod"
+	"k8s.io/cri-api v0.20.4/go.mod"
+	"k8s.io/cri-api v0.20.6/go.mod"
+	"k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod"
+	"k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod"
+	"k8s.io/klog/v2 v2.0.0/go.mod"
+	"k8s.io/klog/v2 v2.2.0/go.mod"
+	"k8s.io/klog/v2 v2.4.0/go.mod"
+	"k8s.io/klog/v2 v2.9.0"
+	"k8s.io/klog/v2 v2.9.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e"
+	"k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod"
+	"k8s.io/kubectl v0.22.1"
+	"k8s.io/kubectl v0.22.1/go.mod"
+	"k8s.io/kubernetes v1.13.0/go.mod"
+	"k8s.io/metrics v0.22.1/go.mod"
+	"k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod"
+	"k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9"
+	"k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9/go.mod"
+	"oras.land/oras-go v0.4.0"
+	"oras.land/oras-go v0.4.0/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/letsencrypt v0.0.3"
+	"rsc.io/letsencrypt v0.0.3/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod"
+	"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod"
+	"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod"
+	"sigs.k8s.io/kustomize/api v0.8.11"
+	"sigs.k8s.io/kustomize/api v0.8.11/go.mod"
+	"sigs.k8s.io/kustomize/cmd/config v0.9.13/go.mod"
+	"sigs.k8s.io/kustomize/kustomize/v4 v4.2.0/go.mod"
+	"sigs.k8s.io/kustomize/kyaml v0.11.0"
+	"sigs.k8s.io/kustomize/kyaml v0.11.0/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v4 v4.1.2"
+	"sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sigs.k8s.io/yaml v1.2.0"
+	"sigs.k8s.io/yaml v1.2.0/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT=" test"
+
+src_prepare() {
+	default
+	# Makefile:
+	# - Remove GOFLAGS entirely
+	# - Remove -w & -s from LDFLAGS
+	# - Git spec will be passed later
+	sed -r -i \
+		-e "/^GOFLAGS[[:space:]]+:?=/d" \
+		-e '/^LDFLAGS[[:space:]]+:?=/{s,-[ws],,g;s,:=,=,g}' \
+		Makefile || die
+}
+
+src_compile() {
+	# Do not pass LDFLAGS directly here, as the upstream Makefile adds some
+	# data to it via +=
+	emake \
+		GOFLAGS="${GOFLAGS}" \
+		GIT_COMMIT=${GIT_COMMIT} \
+		GIT_SHA=${GIT_SHA} \
+		GIT_TAG=v${MY_PV} \
+		GIT_DIRTY=clean \
+		build
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN}
+	dodoc README.md
+}
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index d4c6efc77a76..44170446b99c 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,4 +1,4 @@
 DIST keepassxc-2.6.6.tar.gz 9809433 BLAKE2B cfaadae509ff2a4fb4190dde8672201af128c2ae17950b7a4effa694ed3dc00f0a7d275d5031175191ce0f4bd7e323d29cfb3fa586653f3d3cd31f1747ef8c2f SHA512 fb41d25b9b4ac97feddf9632e7a26140d7a9fbba4256ac0394814fd9097d0d30f810cb48939325b4b858cac1378747aadd1987eb468657c929e0008b736eddd7
-EBUILD keepassxc-2.6.6.ebuild 2381 BLAKE2B 551bca5f58e013b4e90b4122bd02e623429839c168831687bd07a3f9c7f4a09ed2b2e2bab786354c1beb739326da08e7dc7a43c716353222e838cc34a5fbe623 SHA512 1526ab18936e4309935ffb58e549cdc72726d15ddadc6c00fc4fa68f7149fa0aff8ecee9d86872ee933d58255333a883316dc96c6a527baaca1e5464cfed899d
+EBUILD keepassxc-2.6.6.ebuild 2388 BLAKE2B 47c1666bfb48d6316711e468a03d878447600c7a36718888de3a0e2be75b8d55c524253b7a0f77cb11222113f8949901fe7ddadeca415d8264269537bfb1b1f7 SHA512 d51dde83d9f49c11b9f24429e0defca964087d154e009fc15ac42dd9295b5a2d5d316310d47cc3dde4a1eaf71fe0a5a907662dadb5ceb1c051c9dd3b1ce5fdff
 EBUILD keepassxc-9999.ebuild 2383 BLAKE2B f89da1f90b7c4e09ca19905a9b7daf3cc0cd114fc1f6873499fd58800d5b2706bad5d57d5313c9c11ced1fa666cc06ec90d251822c45c5c4deea1a20d6d4dc2d SHA512 e60806680f7e6bcc088b07dcf255f4477b079ae3bcc4f903db1507eb0d6b6476d7249120593fbd0b564efd13c2a6d36a6b6f2b7f74446ca361de655fff04eb4d
 MISC metadata.xml 1042 BLAKE2B 2fd425f8c61e45707a1f1c18a3ee5db9b902eaeb347ced5302495d92e82495fa5f87d73400ee849e5b97302d02faeeeb91f403646132c5e8b0206af04385af56 SHA512 d59770092ee152198e217f12207a257a58cfc5dd794170bbd8fb7f3ad6ed644714285874ecd70c77389bba95f4587e70dbb2a120067631d33acebb75f3f2f352
diff --git a/app-admin/keepassxc/keepassxc-2.6.6.ebuild b/app-admin/keepassxc/keepassxc-2.6.6.ebuild
index e88a934d8a69..af0c59d08079 100644
--- a/app-admin/keepassxc/keepassxc-2.6.6.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.6.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != 9999 ]] ; then
 	else
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		#SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+		KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 	fi
 else
 	inherit git-r3
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 54316611d534..4c2f0c6fb0a5 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -8,8 +8,8 @@ DIST mongo-tools-4.2.15.tar.gz 15028734 BLAKE2B 7479c5d0d9b6051f51e563f53a5c704a
 EBUILD mongo-tools-100.2.0.ebuild 1382 BLAKE2B ed2961f956d4dfb2da06270908ac3a5e36d2550e999a88266f30d12c13c6093bd642a4a0d334fe837e6c7b29fce5d54b74d374d3d30c5b8070d047ca04f7b1b4 SHA512 029a86ebf9d7deeddc74270c6ab86ec87e7a539cdae2d07c0a6e8ed0c55261380a7ab78488ce3d10b744bf720f11564df01b403c08701500c2a968169b5797fe
 EBUILD mongo-tools-100.2.1.ebuild 1383 BLAKE2B 8ecf9efa840b8e6242a36f34aff6f0ebb3cba25905fd488f34477c26133b7a33ef1d4bb0e10734d4faaa856980226533c5c4d0a58a56908b603ee18a4986048d SHA512 17960c5882da9cee65ba4338d9466e94fac20b61b01be65b5cb8bc2318f23a1f9e758ebf300e68809e7095ff12eedc185677ceded5173bd46a726d2e29440e28
 EBUILD mongo-tools-100.3.0.ebuild 1407 BLAKE2B e7aad248c57dff60208b7a4605ea260c9a4fe4990916e4bc6e0aecd33b60fe133758fda8367ed116942675c15d842206d653a50297df10505507a72c40129522 SHA512 8c5e3ee1d1ec458fd5724fa80a68c07094350930965966b744571eb8a83bcd3a913aac760305350a29113c81be1fe60627da5f82c2f75a22422d25bce9888eaf
-EBUILD mongo-tools-100.4.1.ebuild 1408 BLAKE2B b94672b43276df376e5b25a8f9bd7cba1b716de048ae88d10946d4280ea96af4607cc944cb2190f8dd84882066e9991e202d4a66a93aa45242e96be6c17a3b6e SHA512 a6ed9804709b1b334891f16ad34bdec642a2121da8772aeccd2f1ec724b058db79ff33335202f27154997d1f650c4f4a57ad829a2b5cc2696b0495cfd801e8f9
+EBUILD mongo-tools-100.4.1.ebuild 1407 BLAKE2B e7aad248c57dff60208b7a4605ea260c9a4fe4990916e4bc6e0aecd33b60fe133758fda8367ed116942675c15d842206d653a50297df10505507a72c40129522 SHA512 8c5e3ee1d1ec458fd5724fa80a68c07094350930965966b744571eb8a83bcd3a913aac760305350a29113c81be1fe60627da5f82c2f75a22422d25bce9888eaf
 EBUILD mongo-tools-4.2.11.ebuild 1619 BLAKE2B d5d812ce6d791dfccf36b3bd6a9819a72c6193b352aab311c52d6b9b7a97a9dd5178ddaea668fc2ea7e5d3f94ebd22ae7571cd0737036548d497d42efb4fdd24 SHA512 ea5be95fb8da2e394614bf968fe2c8a76698b8913bd3a753348b4410ea5f195abfec8a903d28a98ef81e130a4fd8ac5a7391c24088b3e6c37946c4a7532ca45b
 EBUILD mongo-tools-4.2.12.ebuild 1477 BLAKE2B 4385aa86cb9efe9919c8aa37ebffce773e868924ac25f47307319f79ceb0589bf2791e72a7bbedf79eba6e86728501703cae94e1f65fb47ea9243a391cd96884 SHA512 5517f05cd1b9948f428228557f1a4cb985706851fe53008983f97ae7298b7c96a20dcb7c4891723126d6fc444f4647016bfcf37fd9773ab489846b33bce2ada3
-EBUILD mongo-tools-4.2.15.ebuild 1478 BLAKE2B 454ea6a224b5cd9f7784c43be557bbde9f302dfe7de8d3dc3bc17a5d43d7043bcea2dc69fff9ca7d1bdb45db2ea541bd1effe2084649f16bed5df0fcc0772b93 SHA512 1927a99a1cc49df164dd5629a093415ac3a9f2305b2f5c86ca77954568bd400868e528ed6987fc58bfd1a19beca9b41c91240fc4017c36165da0e651a1e7a505
+EBUILD mongo-tools-4.2.15.ebuild 1477 BLAKE2B 4385aa86cb9efe9919c8aa37ebffce773e868924ac25f47307319f79ceb0589bf2791e72a7bbedf79eba6e86728501703cae94e1f65fb47ea9243a391cd96884 SHA512 5517f05cd1b9948f428228557f1a4cb985706851fe53008983f97ae7298b7c96a20dcb7c4891723126d6fc444f4647016bfcf37fd9773ab489846b33bce2ada3
 MISC metadata.xml 332 BLAKE2B 6b2bf395cc2ad023b2d2ee46ada7071bad92b2cb03debcffdfb7dd360fe12831891186bd2635c6a8d17841fb6ab9aa356b8c627acdf9321af9ee0f482d9b0d55 SHA512 4c951bc4dd2c0f76a855bcdadfcb887b8ccb9c758ea60de5195bf5497d0ca0e4339ca89a55b9c890b95b958b4bdb8778d18ba5eaea5b8bc8b89ed28152a7eab0
diff --git a/app-admin/mongo-tools/mongo-tools-100.4.1.ebuild b/app-admin/mongo-tools/mongo-tools-100.4.1.ebuild
index 5431dc042cab..52cc5e43f884 100644
--- a/app-admin/mongo-tools/mongo-tools-100.4.1.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-100.4.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="sasl ssl"
 
 DEPEND="dev-lang/go:=
diff --git a/app-admin/mongo-tools/mongo-tools-4.2.15.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.15.ebuild
index 1c622b0ee6a7..82253adc9ab4 100644
--- a/app-admin/mongo-tools/mongo-tools-4.2.15.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.2.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mong
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="sasl ssl"
 
 DEPEND="dev-lang/go:=
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 418455b23004..f759abef2f17 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -7,5 +7,5 @@ DIST monit-5.28.1.tar.gz 1470342 BLAKE2B 134f63f4560cf26a563cb8e1f063b291dd6d871
 DIST monit-5.29.0.tar.gz 1476102 BLAKE2B a4037c61e8d893b194317dc3c79d37f9b449d3524b91a06c0ff36a9c39016b12b0ce970c969fc10421412e6406c680714522379780cd80897a7a467f7b08450f SHA512 a69125bfa6fa9ea837f396e762a45e0cb41258c175d120c2af999ae1b500ce5cf5b57d774cc89299f70950a25ced5368c85455fffafd75677311c7912f86c49d
 EBUILD monit-5.27.2-r1.ebuild 1162 BLAKE2B 71b1d1a5e10520af69bebfcab81f17c7a72e43753d7fe1f0c421c4d2e738d20248638f6860baa9bcddff82294d0855cb004d974430dcff6a5de6cf2d6546f753 SHA512 70657c77855021896681345dc5fc4d654d356e559bd83f7ac92561e5e154aa5ec12234699a7e85551e92cf19a6eff54bba956a41f0180f5af909c1515b0465a7
 EBUILD monit-5.28.1-r1.ebuild 1231 BLAKE2B 1de7222521a60adfaf6abc1a2fc8b3e75bfaa669d167734a4c0058aead6f419f38b63dc01a9aee6ddd8b9934a0e87cb7bc0d50ef454ab80792bf117ee5eb3e7a SHA512 cf682f1d976b4ec006ad9429c4e06948a7857802f35f767d2b12728186320053332a2e59b74cdb2f2b91ee54eaea5c19e770329e95e89e6e3c5c21a080c4a854
-EBUILD monit-5.29.0.ebuild 1237 BLAKE2B 0c6dfc8c252d30d4fd22aeb31b23a57e8c9bbf7d16aef8d4b64e55270953f02f9d1f3e2682c682c7a3931db538f6313f7d2c10ac4b0d0adfd0f9100bf3540e8d SHA512 1f0956b9175a756ed8d5dbabdb835898af9870da46e79241f886f12a27e464b5a497cbb0bc284d8cd8d9bdb77c614d8a42436ae7b8fe945deadbecc60e3c779d
+EBUILD monit-5.29.0.ebuild 1244 BLAKE2B 0069b1b173c9b7ce8dbc7b492e9784d93deee868090a9bb00652a93386649783652ffc2f29a1e069d93d73914a0720bc3ecfa168a7cb7593a43524dfed03d1da SHA512 23f73feee042eaf1f9ae27c9914fda473d53b2cef3137d004d35f6655e43a640000c5ccbe248dfcfd5ba8656034b6c1d1f55a4d9d29ea371b24abb0dcafc26c0
 MISC metadata.xml 360 BLAKE2B a3f81501eab241aa1c3450f92d97af3560fb1fcf37a8faf864088abf58da5421486b4634da20773484acfe72d8d289a8e902f03db8206a798fd2e5e518313896 SHA512 69c092cbe229b63fa3154ab6735d327ed939aaa205bca9ec4c7b0b3994054f39714d2197fba0fe89710911a382e70680d20b4335ec70e233eeaf0d01da3ae342
diff --git a/app-admin/monit/monit-5.29.0.ebuild b/app-admin/monit/monit-5.29.0.ebuild
index 7daa636e4131..922d070f59f9 100644
--- a/app-admin/monit/monit-5.29.0.ebuild
+++ b/app-admin/monit/monit-5.29.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="ipv6 pam ssl"
 
 RDEPEND="sys-libs/zlib:=
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index af1e9734166b..bda36af273cb 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -2,6 +2,6 @@ AUX 50pass-gentoo.el 491 BLAKE2B 30c24a820e877e74d4308b42fab036c3c670353af6eb794
 DIST password-store-1.7.3.tar.xz 63416 BLAKE2B 5931608e0208dfe6965b79f586c153a4930d1c3d3b74433d026ee0bc5889fcc29334c637ca4fb68308d0169bad7c8235b6632e9f80eda1e24f0f5721353f88e3 SHA512 89755a7b02f05d75055a9fc14fd3f456c0a49ec31bdffd097a027f91228c64a98b18c1e80017aeda811773ae3287ff1b9737532da8ded06799d8fe3979ca06f7
 DIST password-store-1.7.4.tar.xz 65272 BLAKE2B db1a34b5900802731deaf09d3ade1d3f00022fd21eb0b21140dca3d399c89183dc901e5bce15d7bb6041e62017e2b8b6df61c6ec3eadb1df6c0278dbc6c2bc11 SHA512 1fe108895b224451b54e545d399b6a97040e094049448509f92ae33164a5cf9044a91f52edfc705fcf333f6526df1a478deeebc4df109764d58100f9e3e22681
 EBUILD pass-1.7.3-r1.ebuild 2037 BLAKE2B fe8df4ab2c95856a3144f04dc56c006ed49f86d83ddc8d4c61de24b2788334b0cd29b0709c60c05a8abe0f05c27c8fcf5c967f580b2fed4fe8828c49154f39a0 SHA512 bc8d994effc16552c13b69671bd7de507e7b03501874ac9600e77606400be07bdfeefb61f2d21f3c2d10a2c1b3bd8fe6f06d4394c4932a477ad35dd9daea6a13
-EBUILD pass-1.7.4-r1.ebuild 2085 BLAKE2B c9264776f83f717c49c0d86cd6dd4f769122c2d513e38aba71975537e3e6161c2172467454acb7a2de3f82e5b384c8aa38229f4b2bf2faf4bc3700f62dc962d9 SHA512 375bcb9398c5f8ece901ce87362e8f7c877d203d2d99116a32cb7bf4b5a901e63ffa213d7eca93d9015368f7b2fabdf9e4648229b029fde4362d8e54882cf7c1
+EBUILD pass-1.7.4-r1.ebuild 2092 BLAKE2B ab508109dffbac516c25a5c3a3d2365d1556d186e326bd3d266f638c4fb004d7a274ac913d7fd2b4a0a65e2b4d4d76baead5f9b2d700a5dabac7ff9f3dc7fa75 SHA512 436f3dbe2bd4efb6f6008838dfd4e32783b35876ca73f719ce84ec9dfd159894ec3ee7d585699f9d18ed344a996c31c7be7599218b1beda31cc6f1f294ef3e41
 EBUILD pass-9999.ebuild 2195 BLAKE2B 0e2e326f7aadf1719f667714d3866843e705a32fde248995af42b8bd524b91d58e6fd06feccffaf9571471a79e1974169b2ddc6fcefcc8f7aa0d87c50811141f SHA512 62e78aadfb9435e66fe39b54dfa30f3e454c90d48c94c14824373d8b05767638699bb86a7961d07dad21df586e238a6dc0b7a1b437560a1fdcde3d51a36df8db
 MISC metadata.xml 682 BLAKE2B 7f15c097f132cde3ee8647189fda93dabbcc5e0451380a6fde8f58c1d0b7c10df4cb8012832f282101795568cf170157d119bb668164005f8aeebe10682a918b SHA512 12d14970489971fea7766469584bce2881ebdadfebd4aece7efff56a5e7bdc0a3d12703134691c80da2635a5863a81c39c212bcdc7ae1b717ae5f1e0065212f2
diff --git a/app-admin/pass/pass-1.7.4-r1.ebuild b/app-admin/pass/pass-1.7.4-r1.ebuild
index 795de43f39b1..b42ea77bcb1b 100644
--- a/app-admin/pass/pass-1.7.4-r1.ebuild
+++ b/app-admin/pass/pass-1.7.4-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/password-store-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 IUSE="+git wayland X emacs dmenu importers elibc_Darwin"
 
 RDEPEND="
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index ed93fc3071fb..fb0c1848e5ec 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,6 +1,8 @@
 AUX passwordsafe-1.06_beta-system-gtest.patch 2962 BLAKE2B 1ef77391d355364e55da568c2686c1988916da9eadc312c37d01016df3449535b88b503dfd3aeac2bf3c8e613141552bb1d97f5f5a733becc33f3c565a610940 SHA512 2fc6745b84ad810a550c2b221aca4cd10f87d4bc77282cb31b3d3070b61a3958c126ce0d3da4eaf550d80be470ca4c5aefaeb863caaf2f9fb285bf844f5705bb
 DIST passwordsafe-1.12.0.tar.gz 14937705 BLAKE2B 523e4496ffb99f8a53e62252117d43b771af867b3505f3a5b8c8f1119e8365f0661090e410a832abca89e2ce35816d2046d4bff0ba1e0f06c52c01eaac9051b2 SHA512 c20cb754a2174e3b3ab61edf99f2a31c333144550103fac50cc26cea89669fa3574db3bdd59996fcd87b83c7bf6dd1e9d2b087c17615183cd7111f151be5a94a
 DIST passwordsafe-1.13.0.tar.gz 15022877 BLAKE2B 353976c22365fc98c034eac339f067061ee659043ab8507bbec174483414619b8442ba4fd7671e888127b83e9865d21587529c7821bd706a55da951c300425d4 SHA512 eb8ae46e9f3e8287b2ad781ed6d6e13026096a35fadc1fd1da1116e5e6b65e16e76090d8e7d1c64be387229ccd1053dcc820acbe7ee97914e46c311ee8ff03b8
+DIST passwordsafe-1.14.0.tar.gz 15303935 BLAKE2B 977386e5c469772753173bd46f608e9fb77e462706fbe6bf80a18cf8e5f3b89cc7300f92298b2b45885dafbef323a0ba59d67ddcea20c229f4f9520a54800653 SHA512 958ab87ac6a9066a0359890facd509c1085646eddcefc33f89b934a9375df51bcbc78213298d165d354c64618c8fb753c2588e386e886fa4c1c478e0a27d3d27
 EBUILD passwordsafe-1.12.0-r1.ebuild 1892 BLAKE2B 2943644c3546e9d31c29bda97d0292d31db902074452c025df2eaaf0f0128524974e8b933d018b84a66c1b6b5f39f4dac8be29d966870d1f497d17d661867115 SHA512 f6b29dc2a68f06ef500b8fcb2a8b5e14bdd89e93d074703c695c93749d9af283a118879c250b65e88b90d3b272d30e6f35d5323951449af67302d6242da84e02
 EBUILD passwordsafe-1.13.0.ebuild 1887 BLAKE2B dcfb7d0f84ae7817dd33233cd06df44f255c2590e617fc7d951042ee11c672622fd7f4ebcff80a9391e6f5e29aa1ad7c59d5488491a89a5246dfb2982722a1e3 SHA512 a6e31b0aa014f55fb6a269eeafb0b3bc9e449e8666cd30b4cd844a6f560c93ca631ce5c9c77307bbe6f20f5dd6b8d5111b03d9696d42b8e24b30ba74c700086d
+EBUILD passwordsafe-1.14.0.ebuild 1825 BLAKE2B fc833c72deeedd6d8d65ddbc8672a70d7540bec6489cda0427cf2994bdbff487a80b5bfc41b307c725801620adeb77c60608da0eae04b7d2a7b949590e3a4f7d SHA512 80f4587fbb19b80ac8f8ca7b653691147af7d39122d2459dc7d144870d7527cda585ec2bfbce85daafbe28e4f9b801996ca8a12e2bb22c8bbae8e20adbdc5736
 MISC metadata.xml 714 BLAKE2B 336a69bebe009487ad72444b3805a0b332fc78aacff06566601a431d91d7799a750cf2b7aa9d61df26061a4a073c9a3fe478e80419256bdb472374eeee3c3599 SHA512 d0e6fb3b93211ca74371beecf4099bad8c9ef608d804942b961ed0ec954cebd690c3d6157caf200c07f22af3169728f2a541be334142bce060890b88cac4b246
diff --git a/app-admin/passwordsafe/passwordsafe-1.14.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.14.0.ebuild
new file mode 100644
index 000000000000..42ae73ac83fd
--- /dev/null
+++ b/app-admin/passwordsafe/passwordsafe-1.14.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake desktop flag-o-matic optfeature wxwidgets
+
+MY_PV="${PV/_beta/BETA}"
+DESCRIPTION="Password manager with wxGTK based frontend"
+HOMEPAGE="https://pwsafe.org/ https://github.com/pwsafe/pwsafe/"
+SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qr test +xml yubikey"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/openssl:0=
+	net-misc/curl
+	sys-apps/file
+	sys-apps/util-linux
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	qr? ( media-gfx/qrencode )
+	xml? ( dev-libs/xerces-c )
+	yubikey? ( sys-auth/ykpers )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	app-arch/zip
+	sys-devel/gettext
+	test? ( dev-cpp/gtest )"
+
+S="${WORKDIR}/pwsafe-${MY_PV}"
+
+pkg_pretend() {
+	einfo "Checking for -std=c++11 support in compiler"
+	test-flags-CXX -std=c++11 > /dev/null || die
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	local mycmakeargs=(
+		-DNO_QR=$(usex !qr)
+		-DNO_GTEST=$(usex !test)
+		-DGTEST_BUILD=OFF
+		-DXML_XERCESC=$(usex xml)
+		-DNO_YUBI=$(usex !yubikey)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	dobin pwsafe
+	dobin cli/pwsafe-cli
+	dosym pwsafe /usr/bin/${PN}
+	dosym pwsafe-cli /usr/bin/${PN}-cli
+
+	insinto /usr/share/locale
+	doins -r src/ui/wxWidgets/I18N/mos/*
+
+	insinto /usr/share/${PN}/help
+	doins help/*.zip
+
+	popd || die
+
+	newman docs/pwsafe.1 ${PN}.1
+
+	dodoc README.md README.LINUX.* SECURITY.md docs/{ReleaseNotes.md,ChangeLog.txt}
+
+	insinto /usr/share/${PN}
+	doins -r xml
+
+	doicon install/graphics/pwsafe.png
+	newmenu install/desktop/pwsafe.desktop ${PN}.desktop
+}
+
+pkg_postinst() {
+	optfeature "on-screen keyboard for password entry" x11-misc/xvkbd
+}
diff --git a/app-admin/profile-cleaner/Manifest b/app-admin/profile-cleaner/Manifest
index e568ec286774..bc7007cb1e87 100644
--- a/app-admin/profile-cleaner/Manifest
+++ b/app-admin/profile-cleaner/Manifest
@@ -1,3 +1,3 @@
 DIST profile-cleaner-2.36.tar.gz 7757 BLAKE2B 32f7b690763f83771048b00dc102da1ca5cfc3d29c7bb3d36eff14db53bf7692b8ac4867d55e7313317635a09c59a959291835f4b614c042227e976b23043b78 SHA512 c56e92f816276d55e298dfac529e8195cf05f1a441aae40d25665d1db6d03b5ca741b99136e9f6fc93eabaa56dfcd8f2856a2dd5c37728c72befc756ff28ac75
 EBUILD profile-cleaner-2.36.ebuild 501 BLAKE2B afcfbe09e3dfbd7bb960b05cf57eb7194c742ffb01e41fc8eddfc1ff77e49919421e78793455b4953980fb818c7d57a76189fa4baf20fbf28a2d9a9a7a05d84e SHA512 de4e1b361be03eaa01f7b6512269d957f7e5789ad4ab3ce6ec957e886c8cd5614de4f2902a9bc41cf166e7294f44c141ee457490814429846b088afcf0980287
-MISC metadata.xml 407 BLAKE2B 79d9522e08f2a4d26a90b8200520bb634cbba257726f812db3511d93644d45682d294d76896cab3bff2f1413b5fb2b6c11ad3ec074d4417f6a4e08d405996d27 SHA512 b6a2c87897efee27a9d7141b84532c0fc50f1e57b5c988d286716f2a87cecffa97f5304aebf44779cbea77cea38e447fb0bf195c99272159937ed1a5fb199eec
+MISC metadata.xml 329 BLAKE2B 2bff84efcbfcfbdc69ffe9d0d7e5566c1882ed53accb4a15599d79d902eaf7b32bedb8fb54120b4049eca3418eef877c9eb66abb31a103810d0a8cf3ecc0fec5 SHA512 b0d8d5055cdd2795d3ede51fe5b4c15b0c53727947f329474accc8575870896915887fddb3ba69a1a4f7aa53f40db8086806cf8f691314471ab79b01cba09ccc
diff --git a/app-admin/profile-cleaner/metadata.xml b/app-admin/profile-cleaner/metadata.xml
index 67834c9e8ba6..32e9d1589015 100644
--- a/app-admin/profile-cleaner/metadata.xml
+++ b/app-admin/profile-cleaner/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/graysky2/profile-cleaner/issues</bugs-to>
 		<remote-id type="github">graysky2/profile-cleaner</remote-id>
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 745c35e7fbf4..d10202478de8 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -2,7 +2,9 @@ AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf
 DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170
 DIST puppet-agent_7.10.0-1focal_amd64.deb 20964600 BLAKE2B 160a5abf3dccb57b325283f9ec6f908be73aaa065787bc6cefe2db0fbfd67145a42cab1a763e2e14c64b7902c50814b09a4b4763aaa504536f289b485cd41a6b SHA512 88c2907e47ad3009c9ce9089d3fb91da68c6c80d9d50fbf714332f2f637ad69adc122a88042cac020ae9c637b07e6569ffab7998ca08aa57a67254748cce5d30
 DIST puppet-agent_7.11.0-1focal_amd64.deb 20968988 BLAKE2B 41c1464290fc38b9bb2a79384c6c427ec8cd1332b3ccba155cb26d43a87b36931415d3a54a10ae8f6a1322f02eeaef27147d4af7304f541ce38e668b072cc03c SHA512 38024f80af5ef69a1db22f9ed90b7b00af5183988b2029fa63a8b2fa1de1c189ba164d8cd450156c4d822a3e6404e5933ca09efdd4eeee7188c99791991a9921
+DIST puppet-agent_7.12.0-1focal_amd64.deb 20971412 BLAKE2B afb9af877e578b6ae24566e0688d14fa67fdb133a3fd9e15dc2473ea76f61a6551bd69a6fad18b6b555eea2afa8fd858a005f2c1cf6681c28f4422129211dea9 SHA512 f5fdab728baa7813f31ba174b0ee7e9dee3f5f954ed46a2f6740cf6ad075c8f36a1b6cb28e7c6223eb4aad02400252114a5dcede0085f7a7e7ba079bad2aedf9
 EBUILD puppet-agent-6.19.1-r2.ebuild 2613 BLAKE2B 577e3273fed0cef3beac556bd864c48b913eb056312eb8fc8aa693cd01ce57779f263100c827e1f254d8996fe7b226dfd88cf778797cb18c659f660a3380f496 SHA512 eda78460fe3b5478ddab1433f43b7849800fd36f1cdf0a0dc302c52d872b53f4abc402b3a345d82800b2526ac3d30474dfb8f06f44f30b86eb3285a28bf57165
 EBUILD puppet-agent-7.10.0-r1.ebuild 2475 BLAKE2B fe0abbb691d683c9edbd966eb3676c2b0c0a05535f179af030a1392030aef2a0ae9da5aa1948f79390b364c64befc90cf785cf656f504e315a5d86ddac278f21 SHA512 49117ad9d47ea1d293db51c7cf4fecc68700aed007df48a76b3585fd195fadca8d0e3a6341c8fa586bbab35359b1ccffde4020eb734d8f06644105eb6dfa4b2b
-EBUILD puppet-agent-7.11.0-r1.ebuild 2476 BLAKE2B 61b7d8647f55e8324a77cf28394e4ff755017d66da20ff782303c829dfba9d0831bd5b17dd3a498acf1578053bce7d5e5b4f070a5e5b30887fc555258627fa17 SHA512 c99ee3447e1b5e93ae41551b99b9aef4c16c911a8a6f8a25847e45c5135550405ca6e3f0dd5c39f954e786b567e14ed5619b0c2db25cdcd09f41dc8d87149196
+EBUILD puppet-agent-7.11.0-r1.ebuild 2475 BLAKE2B fe0abbb691d683c9edbd966eb3676c2b0c0a05535f179af030a1392030aef2a0ae9da5aa1948f79390b364c64befc90cf785cf656f504e315a5d86ddac278f21 SHA512 49117ad9d47ea1d293db51c7cf4fecc68700aed007df48a76b3585fd195fadca8d0e3a6341c8fa586bbab35359b1ccffde4020eb734d8f06644105eb6dfa4b2b
+EBUILD puppet-agent-7.12.0.ebuild 2476 BLAKE2B 61b7d8647f55e8324a77cf28394e4ff755017d66da20ff782303c829dfba9d0831bd5b17dd3a498acf1578053bce7d5e5b4f070a5e5b30887fc555258627fa17 SHA512 c99ee3447e1b5e93ae41551b99b9aef4c16c911a8a6f8a25847e45c5135550405ca6e3f0dd5c39f954e786b567e14ed5619b0c2db25cdcd09f41dc8d87149196
 MISC metadata.xml 1032 BLAKE2B 35156eb59a786ad7dab4ac5c281796af6a8f3dcad2b7ebc2c6af926aee6fcbffaef39f0f7119f1aefed42a1e8148f323ee4d3d5f77dfb4d3671317af6fd078cc SHA512 b624438f825e288802e516637dd38f775a63b4a4aabaa53c5adfd1f71f694018dbf3d47f1622a90d5da25a00aac696f9203c085190e574a586f3a3e4fe14f9d1
diff --git a/app-admin/puppet-agent/puppet-agent-7.11.0-r1.ebuild b/app-admin/puppet-agent/puppet-agent-7.11.0-r1.ebuild
index 6e7e8d74150a..77dd8d3fbcfa 100644
--- a/app-admin/puppet-agent/puppet-agent-7.11.0-r1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.11.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet-agent/puppet-agent-7.12.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.12.0.ebuild
new file mode 100644
index 000000000000..6e7e8d74150a
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-7.12.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd unpacker tmpfiles
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+# virtual/libcrypt:= is in here despite being a pre-built package
+# to ensure that the has_version logic for the symlink doesn't become stale
+CDEPEND="!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	app-emulation/virt-what
+	acct-user/puppet
+	acct-group/puppet
+	virtual/libcrypt:="
+
+DEPEND="
+	${CDEPEND}
+	app-admin/augeas"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/libselinux
+	sys-libs/glibc
+	sys-libs/readline:0/8
+	sys-libs/libxcrypt[compat]
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	keepdir var/log/puppetlabs/puppet/
+	chmod 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd2" puppet
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+
+	# Handling of the path to the crypt library during the ongoing migration
+	# from glibc[crypt] to libxcrypt
+	# https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
+	if has_version "sys-libs/glibc[crypt]"; then
+		local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
+	else
+		local crypt_target='../../../../usr/lib/libcrypt.so.1'
+	fi
+	dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet-agent.conf
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index a67f79ff7629..50daae557f84 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -6,7 +6,9 @@ AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7
 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
 DIST puppet-7.10.0.tar.gz 2856888 BLAKE2B 9322d59f0a8af26343f474e7b4295dfa3bfc105137498d7333776abf366c35fe66af137595ca26ea0d8cf0474151e290825240b4ee87679f25a817fa0ffdeb9d SHA512 686a9023549fb137d49c381f9c21402451503531d3edc4381a0c80dda584eac1621b1a33013e63c07158c8cec08c6e864ba70d0be4cd0c2cfeaf4f9fce9ed36a
 DIST puppet-7.11.0.tar.gz 2860556 BLAKE2B 4db6e9ba7da3c3fa8af845a9afa4a1029ae9f6e33b1a3977ab06058bdd1c230ec2cb7a7bbe54bfd6a193093f3020136f9dcfcb035f5031c06885d1df51b0f467 SHA512 dca5359c4caa07296c1ae79840d56b96b506521a9b7f32ff5aa4fbecb6277b579dff2f4d0df0c939d5f466f55b56ac8c7e2bd0ad83c024bf403f2652ecac3988
+DIST puppet-7.12.0.tar.gz 2862376 BLAKE2B da0d3d05de8187492cbb14d98df0c7eef7fea5a2fdad0f41b687fcef20979d34c1d84513c4c7a504eb95934228b832e416aecb5f626fba20920df286fd403bcd SHA512 5df5b78d5e27ff64e49f440c6e3add7af1b58cd4da6ac5cd649dce012e830e349c2dbc27bf03d4668e2a10cec6628b2872457c7b6f7fe7a4f7cfbd6c8fe8ae2d
 EBUILD puppet-5.5.22-r1.ebuild 3751 BLAKE2B f651b0c7d9196a83b00533a2cf6cb3b28e8b5de366cd792ed7194e84b93d971042c3e17a50abefe56e18f67bb0cd3d694604f19dc02c3ed7d72e11f1e0b71d22 SHA512 5d50d74214db6abac3fa66a5249b8b5dbfbc6340c6815e99611e2c62ff6347f2e9c96c53ad79221865e78eeed3e2796941cc50b5a979bdc8a589f57e6681ce06
 EBUILD puppet-7.10.0.ebuild 3538 BLAKE2B ffa6662cfe92ab50890fdcdffdf397c709c93f1a37e0cc12c6029fa718f78367b2ff4548757d5c1a798f46ad7243a3483d8066bdf29e1a9d78866dca16a64b34 SHA512 80f2fe881dbfee31b3e7fb81d0f9e2d029c696fb3c54d63489da74845c296bba7eb821124170c58dc992887817d2725f1a2bbcdb4e1efbadd1bea69c87ee107e
-EBUILD puppet-7.11.0.ebuild 3540 BLAKE2B a18427a2c3565af9faf11865b3a7f2aff763ecfd30bc92ab7ef92bf750eb6df69a5168564a617b5abcfab123a82a6741da3337c1a12a76a45bba2c7a4a7b252e SHA512 b30d8ef04c45e6c89b505524bc8b7414b212cfbb281fd53ed212e08ac64c85351bdde0924d50513ef99f24504265a47500c759fd08971947124c4c3484c28bcd
+EBUILD puppet-7.11.0.ebuild 3538 BLAKE2B b210c2f1d770288548d3b401afd9e54f5029e114619c124f4462ea27b0ff9d4e02f01a32b98d35950c330804b54db3e05aabf9e12eee8be0ef2bd9c885bb3706 SHA512 bb903b943b965137b8948ea2ce0716a402c593e152d23a2ddbc9c5b8f786252f4814b33ef6e39eca966e13319823b4adf3ed30b134ca7b78912c760b110f578c
+EBUILD puppet-7.12.0.ebuild 3540 BLAKE2B a18427a2c3565af9faf11865b3a7f2aff763ecfd30bc92ab7ef92bf750eb6df69a5168564a617b5abcfab123a82a6741da3337c1a12a76a45bba2c7a4a7b252e SHA512 b30d8ef04c45e6c89b505524bc8b7414b212cfbb281fd53ed212e08ac64c85351bdde0924d50513ef99f24504265a47500c759fd08971947124c4c3484c28bcd
 MISC metadata.xml 1570 BLAKE2B 5ea0d1f9d7e83fc99130bc7375de7638fd509d18ea5728d14d370338089c33c788156f20b976e6b909502e94e356428e4a1ce95e10bf307d81bd2fbbb1166941 SHA512 4ec568674227749e9644c4eb09d39c25f2458a7eb89f7d36d2be035845e8ffefc6bffbdbc09be9950bb424f2c940ff9bf43ea60e22cd4816bf12d3593e41e7b1
diff --git a/app-admin/puppet/puppet-7.11.0.ebuild b/app-admin/puppet/puppet-7.11.0.ebuild
index e4dadb18fe5f..af78e8216020 100644
--- a/app-admin/puppet/puppet-7.11.0.ebuild
+++ b/app-admin/puppet/puppet-7.11.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppet/puppet-7.12.0.ebuild b/app-admin/puppet/puppet-7.12.0.ebuild
new file mode 100644
index 000000000000..e4dadb18fe5f
--- /dev/null
+++ b/app-admin/puppet/puppet-7.12.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="https://puppet.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	dev-ruby/concurrent-ruby
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0
+	acct-user/puppet
+	acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# fix systemd path
+	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"
+		dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet.conf
+
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
+	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
+	elog "not already done so."
+	elog
+}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 4a9e4982ea80..24465ca69b71 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -2,6 +2,8 @@ AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
 DIST puppetdb-7.5.0.tar.gz 47469411 BLAKE2B 98bf574e8b4edba47f58b899bdc3b6037a3ae79a2a8d8b3f69a108c416648fdc35f804d71fc412bcc257f7609be9b4d706af7e28d2fd05d3768a02e9efd95841 SHA512 94bf5bc9a95cacb1a3a7f0fb5b04a05eab5ded7d18c2fb396e616b44e429a4a6299e6802fc0fd72aa832a6d8181a7ecf6ef6aff4696d4c9bc16a1954aee6f77c
 DIST puppetdb-7.6.0.tar.gz 48023530 BLAKE2B 9805b9d58b35475f744b262845e9f257666d5df8a8e97d024c4e128600285de871a758dd8650b4e28338792707e9baa23429547ef67ad3b8c5d7756d22fe49a0 SHA512 38c15ed990440bfdf575e624b24d35c6f5bdab943f6be4d86a2c9cfb24e09478fab15f1ce7886b7d3d4c2c368b35181a9203ac171246eda8c072973912210b38
+DIST puppetdb-7.7.0.tar.gz 48050200 BLAKE2B 67b0152b0d3219e21fd1f0c18f235f99ad5c566c2c24c24e442e511d3eb503265497de46c5fd2d414cda8827400ee50c628d2fe5287ee1a6e1c295dbc7f8cde3 SHA512 a8f67b9c587d285ddd530afe1d467eb1acb20f7a3deed6d1b951695575a4283c3f4c946c7263fd44962adf05f4466ae5eac33cbd6ca75ef8f9785b2e7be6afd7
 EBUILD puppetdb-7.5.0-r1.ebuild 2715 BLAKE2B 68d24327f5a873b964636dac583abd03997f7464901ed367c430417b637aea1bda2f6d22a68c39e4f331b12769d290e5d5a43a3d564f7d22ea47332fa68753ef SHA512 fea2907f21a276ce273c0d6c459a7df944aca133dd8f7ed2f9497016e97a112b5b820ac67423621167e06e63b766d23d55bbae31caa94d7a4c19f8c4a90b97d1
-EBUILD puppetdb-7.6.0.ebuild 2717 BLAKE2B d7d8b3e406e92a9d0ff73273a51559f67cf1cfcb398a9fa4c01bce018a1dfc836e2eac96424fe035f2f17d3d0e89616c3954b697b17f3789d5519a02099d3b04 SHA512 f7babb676043275f384343419bba2f60e250704ba1a05ae5c8aa10dd17358837afd9fbed5e48abf50b72328915807157067b4fba325f609f9238fc7d14b6b75d
+EBUILD puppetdb-7.6.0.ebuild 2715 BLAKE2B 68d24327f5a873b964636dac583abd03997f7464901ed367c430417b637aea1bda2f6d22a68c39e4f331b12769d290e5d5a43a3d564f7d22ea47332fa68753ef SHA512 fea2907f21a276ce273c0d6c459a7df944aca133dd8f7ed2f9497016e97a112b5b820ac67423621167e06e63b766d23d55bbae31caa94d7a4c19f8c4a90b97d1
+EBUILD puppetdb-7.7.0.ebuild 2717 BLAKE2B d7d8b3e406e92a9d0ff73273a51559f67cf1cfcb398a9fa4c01bce018a1dfc836e2eac96424fe035f2f17d3d0e89616c3954b697b17f3789d5519a02099d3b04 SHA512 f7babb676043275f384343419bba2f60e250704ba1a05ae5c8aa10dd17358837afd9fbed5e48abf50b72328915807157067b4fba325f609f9238fc7d14b6b75d
 MISC metadata.xml 486 BLAKE2B e74960c88243252794d20dd51c071147de88663d4e610e8358013b77ffaeb13b35edb7a48575932a8a30e0916782063459fe14b57ffcb2962e16b5d73c66f9d9 SHA512 e87f0d39aa659c53cb9798929c08a853247870f9c9b7dc85c9610f7b2b9c2f10a226ffeadc738e263c6bbcde495c438fbfd7dd951c2cff18b66646da9475c7c6
diff --git a/app-admin/puppetdb/puppetdb-7.6.0.ebuild b/app-admin/puppetdb/puppetdb-7.6.0.ebuild
index 5ccee6e5acad..dbb521426d94 100644
--- a/app-admin/puppetdb/puppetdb-7.6.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-7.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+="acct-user/puppetdb
diff --git a/app-admin/puppetdb/puppetdb-7.7.0.ebuild b/app-admin/puppetdb/puppetdb-7.7.0.ebuild
new file mode 100644
index 000000000000..5ccee6e5acad
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-7.7.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd tmpfiles
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.8.0"
+DEPEND+="acct-user/puppetdb
+	acct-group/puppetdb"
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	doins ext/config/conf.d/auth.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	tmpfiles_process puppetdb.conf
+
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 28191bc54865..46bd4d4ca997 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -2,6 +2,8 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
 DIST puppetserver-7.3.0.tar.gz 63289430 BLAKE2B d434c63dd189bfcb0ddcb9e286f0e46e5ac3d0f3612bcbeb52b582b57035d9edad2bc38856c9936cb35fccee34f93d7a22f4ea2b088b1e3bef619e69f014bbe2 SHA512 db38fb040e559eff8e219ab56c01bbb0ac1092c193095b79c5edb4206cd11f4ce211b5a4217f4027f31f46060937ca31a99bd77f3352813d1a5b56af35a36927
 DIST puppetserver-7.4.0.tar.gz 63333332 BLAKE2B 43e1301f62d49868baf10fffe74e103633547bc66d845c01be851fa78ba0a361600913e11cbe340bae881d0c85c2bf74e290cfdff1bd9f1012562537389230ce SHA512 54b9be31b38662a4d02efc1f00a24bba269f7c69e2bb3af2402b2cb61aa8a6be5a9ef82ce883a7ca805068f45e895ab3b2026179fe298a3a451dc30ed7404a5b
+DIST puppetserver-7.4.1.tar.gz 63334102 BLAKE2B 904f3f0a84a0954aef029f42623fd49480b98ff28b3c229205ea7c41c9db1c026c5408ae74775fe9fe598f95b43289ffc0fd34c384ffdd3a2a662382ae1f577f SHA512 6212ddc4b583f9e26227b5db25e7771684aca607787f8ee80920eaf398dd65d4f901774b0e439f006a2fc6a22e9143a1fc58b9003ecd59a115da7702a88210dd
 EBUILD puppetserver-7.3.0.ebuild 5330 BLAKE2B dfa1d0d6d15ca5e965ac2bd7dd8cbc89044db60ec4eb1bc71d17bbb8243b29ad6c5a75a623846f576e06edbd997a5b525ce2cbe1c044c7a4493083bc13e5e376 SHA512 f42646b2e12797783a3c1b67c06adf1eafacb734108c7b42d6a68595f51ae751b00cf74657107983a65ca7192aee7929d96f971dfc408176cceb421d19839376
-EBUILD puppetserver-7.4.0.ebuild 5331 BLAKE2B 999b5de0b2165e1e198abec668f9dd8d5efeee7f8282a9bed8df074e8a1d8e0b73cc6fae5eaae0c6916b9931f92480ad90516b625e435c214c525d83348e4014 SHA512 1ff8e175a7b11f5398f49bfc4e3fa426ef7c5eb1fe229d50d12427955e322a51cd19b7c888d568ebd63ee11a199eb03e0af71eee42b69bcaff3e93741ba1ff09
+EBUILD puppetserver-7.4.0.ebuild 5330 BLAKE2B dfa1d0d6d15ca5e965ac2bd7dd8cbc89044db60ec4eb1bc71d17bbb8243b29ad6c5a75a623846f576e06edbd997a5b525ce2cbe1c044c7a4493083bc13e5e376 SHA512 f42646b2e12797783a3c1b67c06adf1eafacb734108c7b42d6a68595f51ae751b00cf74657107983a65ca7192aee7929d96f971dfc408176cceb421d19839376
+EBUILD puppetserver-7.4.1.ebuild 5331 BLAKE2B 999b5de0b2165e1e198abec668f9dd8d5efeee7f8282a9bed8df074e8a1d8e0b73cc6fae5eaae0c6916b9931f92480ad90516b625e435c214c525d83348e4014 SHA512 1ff8e175a7b11f5398f49bfc4e3fa426ef7c5eb1fe229d50d12427955e322a51cd19b7c888d568ebd63ee11a199eb03e0af71eee42b69bcaff3e93741ba1ff09
 MISC metadata.xml 341 BLAKE2B 6e19f31ed866283c5827f9ca2550ca99c12d8b9506fbc13447d8bdad3ceaae844d3b103fe6cced8f829a75b7b1c317ef43bd2d1e885e9b509f70b8646a9e5bf6 SHA512 72945305ef496758676dba53925ebbd5cd0d01935fe82708559f941d831bf6b2ce34444d5b85a16b116f577596b2647183fe7b7c6ef92080a8e332fc0226d7ac
diff --git a/app-admin/puppetserver/puppetserver-7.4.0.ebuild b/app-admin/puppetserver/puppetserver-7.4.0.ebuild
index 15e9859ee758..c2df215b358d 100644
--- a/app-admin/puppetserver/puppetserver-7.4.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.4.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/puppetserver/puppetserver-7.4.1.ebuild b/app-admin/puppetserver/puppetserver-7.4.1.ebuild
new file mode 100644
index 000000000000..15e9859ee758
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-7.4.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd tmpfiles
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="~amd64"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+="acct-user/puppet
+	acct-group/puppet"
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	keepdir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process puppetserver.conf
+
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 0f9e9588b4cb..67469b5a3705 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -48,5 +48,5 @@ EBUILD salt-3002.5-r1.ebuild 6273 BLAKE2B e9768ac7fcd7a11c6c05bf8b9900428af79aa6
 EBUILD salt-3002.7.ebuild 6504 BLAKE2B 0633314b7c3b2ffff780c7b9d2aa2bcc329b5591e910ae5b98c03cd5a4174058dd79e2a0b5abf807153fed62c3c520cdaf028301bac223551888787105bd5ce1 SHA512 e5adfabfc656bcd479e9c18627ed42f2206af26916714ca421c3b552feac4e0180dcc3f939c768d98e69824211257baf8d80d418476c3a8e436da4bd45c70eb7
 EBUILD salt-3003-r1.ebuild 6578 BLAKE2B 3741769a693c4d2bd6868c0cd3ef47697e25a97675336c08c2af482702d48c43e6a54ed71092f1ba754c52938533d8dc8a94e6f5e678c77419824b2b51e04924 SHA512 c5bb47ee8a74e07bae14a368ad48f7ae5906a738ee04a48c4d2efea32f6cf65475e1d4db4107d61fd9fd267cf105d36a682171ae4af4745eed51e587a78514a7
 EBUILD salt-3003.1-r1.ebuild 6810 BLAKE2B a66ce2731f94e3a870a0ffb5ba0e2627a7c6cf345009b33b1095bd3e7439fb12450abc2d9aa858106bf590cceb198fbe449dd50b32e3bb2214bb96e9bc560309 SHA512 009ab916c2f44a7e99bc5fbc1e50709a361eaf395d26babadf88f5e05322a0b44596911cbd310fc4089928fbc1f100923b274307f759d169a40c604c6b377a31
-EBUILD salt-3003.3.ebuild 6801 BLAKE2B 2c345cc59f23ef925346a72f5e5613ec921a8bcf104ee793c4e004a414e780ab5068e66baf9d4adba85785378c48fcc17ce12876b7b8eb4d9ca198cdec182fc4 SHA512 cf3f92b3753f716f3ee11b9cfabe3dac2ce880fc30281fdc508bd6e7cdfcc61590049ad3ccfc0d6ecba45854356f7b4a2a6d6744c00acfb3baf9a19f605de7b6
+EBUILD salt-3003.3.ebuild 6800 BLAKE2B 2edfd7f0486a61384ce11c8b51f3db03150879ee170a1747d9d42d438c11fb4164d7f5572c94958adc36ef5f2ca506f24564e231b65a6c31702d55f049112741 SHA512 51774230b25d51aa7b887662635540943c137b4066745a50f56ca7464aa804d5e35250d71cb7ec73a37186a6a97f8d6615f40a3cbe5a12d669c05ad58957bf4a
 MISC metadata.xml 2362 BLAKE2B 60fd7a02823e610b4d12b1d4c6a066cf16f8ef4094397553381d62bc027715164f02ccad4c86e431a30822d5c4c25e4eebd814f99e43b7a45bc08a3fd885cfee SHA512 4aa7549a76e69233949c68841bfcdba6630eeb78a507f20119469f7835a6532b737f41d117c09b1e4c7574f95dec759deacf5d5482be961755d63a19b9eee9a7
diff --git a/app-admin/salt/salt-3003.3.ebuild b/app-admin/salt/salt-3003.3.ebuild
index bbf19fc2c44c..1611ed310b5b 100644
--- a/app-admin/salt/salt-3003.3.ebuild
+++ b/app-admin/salt/salt-3003.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index 231912f4cf23..6ced9fd285b9 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -1,9 +1,7 @@
 AUX sshguard-2.4.1-conf.patch 1203 BLAKE2B db97df31d61de23622faaaffdef23c5f55dac3fbe6947f6ec9b2dd3129cefac047acaf1134fb2259bb1d643f7a4bc61f699bfbd8e7523fa42f0f775b22a8b233 SHA512 54279f52e84ab5d32c4af5d2953ca6927b9c4dee2b4b9dda50c11cbf83f5051cc5c02ee25b8822e3e2b035fb7a0620d17706f84b028cc4f249b2cd733f41272f
 AUX sshguard.confd 634 BLAKE2B f083e6d4f7df6cefae89ef382a82cd7c5863c6a2ded34aee61ab028f8320c35552b80d5d8222ed35adb13a70cf6096eb5d88749f5b5ff72ca483f27fd1c0de56 SHA512 72b2a9c995bcb604516525f8190eaf35fa57e18274f83a8d00fd5b223b598c0c4ffd8b7ce89b1139c89380e5a7181c8024a6041375c445edb29c8f8b49abee50
 AUX sshguard.initd-r2 389 BLAKE2B b4098e0baf82e1c1f1978d6b3916fe9f2e67891d02b7b842492558f9b44c1c0c23204d88c036f49e069c42b0fbbdba31d8292419a2d22e603f29926228a8a223 SHA512 951ea1479836d1b318c35be03c340e5101aa3663bf2581cd0d928de2fea36f0b7906e50d9abf1b6b11fa682427e8d72b45bc95bb8f40a85fb471bfe354108108
-DIST sshguard-2.4.1.tar.gz 723940 BLAKE2B 04e72b9959ef3ead418d2a6fe8029b0806a4d91c91f7cd36c236c7203cca1afc67305b21de0b1dee1594b188564f201ff2770d54d4c57c54b4d23db15e0298a0 SHA512 bae7485d963454f2a6dc4b7d96506b03fb49013fe3ab3d81e315ea88bd8067e7a2305cdf25e411720ac014a68ee9635cdbcef65a7dc806b7fc942f099a9d5ba8
 DIST sshguard-2.4.2.tar.gz 835431 BLAKE2B f76cbe41ced4d23448ba09750d073a47dae263616c34ec2e2efd7d6367339d352925958b5d9d711a3c4a8c2da10fae2474384a3de14434c0dff19bd645325058 SHA512 f2fe35180af8698d4b2053e9ffbf17df9f033b0c2fcc045caa085467d14174e17aa266d2ef3ce9536037e54f7d3ea42de9e32e7faee65612894294793082862a
-EBUILD sshguard-2.4.1-r1.ebuild 1093 BLAKE2B 25f612896845751aa576aac877f1fae43e81fffe2830de361eb8f597034d1b60e5429d2e37ac87f29ea6f416a8710b2c7227827af71e8394b7a97da7ffd14fde SHA512 1a32abb81945b0fa36e8a8828dd95d328ce11df7d2d8d975daf523f5bd1af44f7e4b62c30f41e10a925cb0cc72e39590ff0cfc73b66d1d2b3cf4480113d5d90e
-EBUILD sshguard-2.4.2.ebuild 1102 BLAKE2B a0876a7bc5d376349e75991d336ac4a4c36f9fa59b8bcf6de1d64882a4732aaa5fade62c5fa252ea1741fd2b3d871d7dfd539bee7cf4ace21c20b03b723c5df7 SHA512 a0313a3a0b8d32a76823bb81db6d56d0224993055604b55ca4ccb52facb6781c3d3e420c8efef92002b5ba1b8b05b42bbc8fa4b25f885391d4792dc9fe873479
+EBUILD sshguard-2.4.2.ebuild 1100 BLAKE2B 1864b9b41ba272ed972776e14ba16877abf1921f48b0d55372563c023fdf5379c43cf13addeb9f8cabda96c3df18f3ee6a43c00fffee2fdd7224d4424d8a72ea SHA512 fb8ffd279ed992a6ad0d09b8157c430d6f6b8bc28c595e804ba2b86ccee0cf0a3e01288f1489b172e9f8d349ecd9ebaa7f00fce126ef2e43724082e87564bdaf
 EBUILD sshguard-99999.ebuild 1095 BLAKE2B c5d6d6d4450f4d98fe6f4486f05b93105ed46297068f960f82ca7df8410c15e8a731f7570f9afa7657b085f52df7fdf2c3796e83915c435967b9a00df44d1fec SHA512 3f3b35389987a9bd004425b3fe15a3ace3abdc6370341ae2af66cd7688b90106810e0e6da349179140c02b5a36f3a44246cd40f62c5596a23b8c711df95d77b9
 MISC metadata.xml 460 BLAKE2B 193bed37ae4de27932a759960d393d8efbe3e0be7e0a8f6a1d689e1236dde51461abfb1e23486669a850eeb4caba74dc9163a255b09d4c6de27a7e3aa6e2f9d1 SHA512 6d7439e739cc935c698e09ac3cae99c43121a60d4879b8df483cccd6347348e0c3c084b13223fe3f6bbecb18845e116243082e0dedcd1aa8ca21e67aa43b6ae7
diff --git a/app-admin/sshguard/sshguard-2.4.1-r1.ebuild b/app-admin/sshguard/sshguard-2.4.1-r1.ebuild
deleted file mode 100644
index dee670ce9642..000000000000
--- a/app-admin/sshguard/sshguard-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-DESCRIPTION="protects hosts from brute force attacks against ssh"
-HOMEPAGE="https://www.sshguard.net/"
-
-if [[ "${PV}" == 99999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}"
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-DEPEND="
-	sys-devel/flex
-"
-RDEPEND="
-	virtual/logger
-"
-DOCS=(
-	CHANGELOG.rst
-	CONTRIBUTING.rst
-	README.rst
-	examples/net.sshguard.plist
-	examples/whitelistfile.example
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.1-conf.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e "/ExecStartPre/s:/usr/sbin:/sbin:g" \
-		-e "/ExecStart/s:/usr/local/sbin:/usr/sbin:g" \
-		"${S}"/examples/${PN}.service || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	insinto /etc
-	newins examples/sshguard.conf.sample sshguard.conf
-
-	systemd_dounit "${S}"/examples/sshguard.service
-}
diff --git a/app-admin/sshguard/sshguard-2.4.2.ebuild b/app-admin/sshguard/sshguard-2.4.2.ebuild
index f85c4011fd60..4333d820bc82 100644
--- a/app-admin/sshguard/sshguard-2.4.2.ebuild
+++ b/app-admin/sshguard/sshguard-2.4.2.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == 99999 ]] ; then
 	EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="BSD"
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 0768e3e8cabc..c56d65ca02e8 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -16,6 +16,6 @@ EBUILD syslog-ng-3.30.1-r2.ebuild 4889 BLAKE2B a84207505959119191dd2097e7e0c6dce
 EBUILD syslog-ng-3.30.1.ebuild 4839 BLAKE2B 92c837ecd1d724d06457e586dfc35e483ab233b7cd0ed9fbb461174c2659d9aba967aff62a33cec504f13b85656b8b736f61b0cb57bc70fcee96cda795bd7d91 SHA512 b02e32aa65e0df8ca222d219bf70ccbb0260b40e3db98db7a9ac37998e8059992f35a2bb9d03a5adb2d60756bf065e9a4aa1ddd94dacf40505a701bcf6c373ad
 EBUILD syslog-ng-3.31.2-r1.ebuild 4940 BLAKE2B d7d0f6fec4570cbe20336b8332d17930ee310d904540fce3cb83434b98227e8fb40e7b7cde5eccaa16fc2142660d626361fca11d42ba386cd9196e7b1faef72c SHA512 af3b35519d289d06b74eaa2be42190c862743b18c85cdf75ab67193d6bff386fef5df546ea9e04290fec8cef41aa909a2d716869ac9cdeec0aa2d4cc7fc184db
 EBUILD syslog-ng-3.32.1-r1.ebuild 4941 BLAKE2B d06d4fd5bc2104c335d46d626657e800712382b0e8db648d737efe2a7be53e4766fc2795179aa08ae749edb7b152d9d1e3292c248b51dcd3d69216b07743abce SHA512 f1d1449199a773fc8474690ac5d074eec485d4f7f142825d7982c8279c781e0f8427d4be6c256be1a8569560d75e98ea74ae742e3f5cfcd3511da2d73d15c83b
-EBUILD syslog-ng-3.33.2.ebuild 4886 BLAKE2B 892245711c0fd7a3bab70ea523a7b224ee793cc6ec8f55066c32211de726de13f4a96bb62c269c5afc9bf8ac226f6f837c5c03693a8291c37fd4f0f880205381 SHA512 3a95c6fc9e114a588cc6026b881a1167833ee2d9364b7bd1816d679be873727b1d4a3c268426799feb6d5fb8023b11f83e7d91ecbde48fbacca874a7a99e88bf
+EBUILD syslog-ng-3.33.2.ebuild 4885 BLAKE2B 875a91e1a21a4b2026d20064526a97bbaac5f4632a3d66b5b56d031b6359a4a0e130e474ed91b4224471610e323b7cd6227b5f511b09ba08a2be52fbeb8a24f3 SHA512 11129fa4fcb04e69adc844d5939eadf594d6d878270596b5cf154227082e40c0764bde7639802c6843aad5be17491e40e901865e2616bb41564f2bd52575d9ec
 EBUILD syslog-ng-3.34.1.ebuild 4883 BLAKE2B b4b36e9aa1a62149ae9187196b810d4d74cd7b7bf02d222fefffd3c8603bcb35aa47dbc4703c1cfbe1cc811463db0cdb112d279b98a4035aeb843635ebf98134 SHA512 95fcc558278b04d0fe7de1f41f7585f192de4da8071bbdc4f6cb6818c9bafdd9a20e05587e730567fa660a58e1cc5cb58e4025bcffcc1e4f22ce03e78ef2dcf3
 MISC metadata.xml 1283 BLAKE2B 22643ccf254541685f0b58255d42ef6bdfc4af8800b871f96cc2e17e1f7aa05c3380672fe293260a7a395e0e7431c81abed871f248805a6dda991fcb877400b6 SHA512 37610fc48a1e169c478250a36634afae6de03c49b257e27d81cdef3243200c1fb3a00b84d4efc8e30020f9a6c1f6ed5828b2444e4b92fa5801e15c3bece8e25a
diff --git a/app-admin/syslog-ng/syslog-ng-3.33.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.33.2.ebuild
index e151546757f3..d34e04e0c520 100644
--- a/app-admin/syslog-ng/syslog-ng-3.33.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.33.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( python )"
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 8334c0ba8455..2819e237601e 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -1173,6 +1173,7 @@ DIST terraform-1.0.5.tar.gz 2890185 BLAKE2B 7033f0c96e7cf37341345faa02f2741dd5f5
 DIST terraform-1.0.6.tar.gz 2890564 BLAKE2B e40120cfdef8037fbf0326cf1e41079508b9bc2420c0189c1b15dad9eb7155d23f0821b89d22d4db3c927c0640b0b1e8e61c4ff07504faed384aba7d2ae18a64 SHA512 765e244f7fbb565f350543cdbe62469e8d2248a28c9c916fd5c34cbcf5a79b06c7df068221828daafd8a1bf4a3869d4772f662f364bc6410d91471ede2eefd5b
 DIST terraform-1.0.7.tar.gz 2892171 BLAKE2B 4484fd86ac404b5653e270e89992c369383948813573c43c2fc7ed1471ac6665719789f9532eee4f0e66affbf2e420d3831d4c88748e47e28b104cb5c2b2bda5 SHA512 09b43fb6dccc9c4af580321fbcb2a0d4bb00f29814565b1f9da2abd1beaad423b050c426f2344d8fc90b763cbd1f44a264db89a2966a2e5cf7d0361d7cc93f40
 DIST terraform-1.0.8.tar.gz 2893091 BLAKE2B b6580190cc0b600c6d790dbb162b25b01ac2f024a67bce13f82fd99dce3b32d80b5fd52d757df4f890675ccda9e5a01d232cada678fe91879c72383bc8ef3ce1 SHA512 8c3717da882c7ec9c71c4181f09f977eee8e374bb2b09b1974f82d5e0bbd74a97cacc7789c8317c01fa8b7bfca397ca2e1d7e3c14ef88aba43c5d2246dffeb6d
+DIST terraform-1.0.9.tar.gz 2893713 BLAKE2B f380c1f6567caba1226eaf703d6ef017fbc387d9db8ada3be1ace23b82f6d1f3a426837bd6ea928ac0e7537f6fcc72bef30c8974ba264ee6235510cadfea6421 SHA512 b1d75b59f667bf4ff94429f10b5dcb8a83e242b3206d0aeff008094069540debc65789ddd8635bd156bf4147f4f0eb7a254af58f053ac4e220c7c8d4a89ac3ba
 EBUILD terraform-0.14.10.ebuild 52142 BLAKE2B fa9347a9146993192c3e915de6f6dfd8759fe1108991d3b7f48699b13f4ccca8095789e84ce504f1a2fdd6a135090d67371a0dfe21d86f954bea7bcae51b02b7 SHA512 b9fd59984ec7195810eaa215a6fa8a8398752d36bafa6958b5cf8eff549b20950fe2d71d3c7e555168d9a80ca2aadfc9912c70636bb7440897870406140e94c0
 EBUILD terraform-0.15.5.ebuild 58399 BLAKE2B a73f374b870f4e7026e46f411d7b071cf005df9755795dca847050b4d0c740c31839eccdb9bca11083d6a83519b53b8dee676d86d4768c71a05c6780fbc0128e SHA512 4c353bf162f5606d744d7cadaa85cf204e96154f382fb92c1ee69dee3d79a0cffb33c5bf1cbbd794de3d3168b7105fbee3ea924d4b63adad50ae70978117adbd
 EBUILD terraform-1.0.1.ebuild 58400 BLAKE2B 0faccb9bb1c97ecc6a581066a86e15df7f0222f8749d894325e7511d1603c05c802494814102ad60011263d71d92f9eb2fa418485a8e17d7db715e8a8d561c1f SHA512 6d4a3c2ff9e0699485f9f2f48a521b5e23ef24bd97b91b13d2d63df30339b48131d8fc2184e55c10046acd40b71379c708e9b30e9caa1528dabb3b60f1861eb7
@@ -1182,4 +1183,5 @@ EBUILD terraform-1.0.5.ebuild 59141 BLAKE2B f8d58f7d539ec3b16d086b5a277b071d16a9
 EBUILD terraform-1.0.6.ebuild 59518 BLAKE2B 1425a318a7457d9e227ef1b9bb91844fd0bd3d4c70c535b6b990259601ee1618fb69a01e4147fdda56b410746c2e51ecf60cbab51786311c8d65e86e280ee8a6 SHA512 4332929b9fa314232eb0acabdd611eeeb70e77e7800429f881814d43716ba939a70b93376f2bbbbd406328856d001955f53aa4291dac0043a15bbce2199bad09
 EBUILD terraform-1.0.7.ebuild 59518 BLAKE2B 1425a318a7457d9e227ef1b9bb91844fd0bd3d4c70c535b6b990259601ee1618fb69a01e4147fdda56b410746c2e51ecf60cbab51786311c8d65e86e280ee8a6 SHA512 4332929b9fa314232eb0acabdd611eeeb70e77e7800429f881814d43716ba939a70b93376f2bbbbd406328856d001955f53aa4291dac0043a15bbce2199bad09
 EBUILD terraform-1.0.8.ebuild 59518 BLAKE2B 1425a318a7457d9e227ef1b9bb91844fd0bd3d4c70c535b6b990259601ee1618fb69a01e4147fdda56b410746c2e51ecf60cbab51786311c8d65e86e280ee8a6 SHA512 4332929b9fa314232eb0acabdd611eeeb70e77e7800429f881814d43716ba939a70b93376f2bbbbd406328856d001955f53aa4291dac0043a15bbce2199bad09
+EBUILD terraform-1.0.9.ebuild 59518 BLAKE2B 1425a318a7457d9e227ef1b9bb91844fd0bd3d4c70c535b6b990259601ee1618fb69a01e4147fdda56b410746c2e51ecf60cbab51786311c8d65e86e280ee8a6 SHA512 4332929b9fa314232eb0acabdd611eeeb70e77e7800429f881814d43716ba939a70b93376f2bbbbd406328856d001955f53aa4291dac0043a15bbce2199bad09
 MISC metadata.xml 1184 BLAKE2B 778da6678848ae048f8bf3d2e2ef2845269b82a14cc7d15044315c21d5e652774954028a81961eb04e32202cef5d67ab98f5c5ce423826477dd0cf049622de94 SHA512 09d06b2229442269fe078171e40d5bd0bd287e15999a0030be391d7ccabc906bb32af1a0e48addc50fc1230264018e3b06d656afc254b16621a6d851aba21b3a
diff --git a/app-admin/terraform/terraform-1.0.9.ebuild b/app-admin/terraform/terraform-1.0.9.ebuild
new file mode 100644
index 000000000000..7136cb2533de
--- /dev/null
+++ b/app-admin/terraform/terraform-1.0.9.ebuild
@@ -0,0 +1,1091 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.50.0/go.mod"
+	"cloud.google.com/go v0.52.0/go.mod"
+	"cloud.google.com/go v0.53.0/go.mod"
+	"cloud.google.com/go v0.54.0/go.mod"
+	"cloud.google.com/go v0.56.0/go.mod"
+	"cloud.google.com/go v0.57.0/go.mod"
+	"cloud.google.com/go v0.62.0/go.mod"
+	"cloud.google.com/go v0.65.0/go.mod"
+	"cloud.google.com/go v0.72.0/go.mod"
+	"cloud.google.com/go v0.74.0/go.mod"
+	"cloud.google.com/go v0.78.0/go.mod"
+	"cloud.google.com/go v0.79.0"
+	"cloud.google.com/go v0.79.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/bigquery v1.3.0/go.mod"
+	"cloud.google.com/go/bigquery v1.4.0/go.mod"
+	"cloud.google.com/go/bigquery v1.5.0/go.mod"
+	"cloud.google.com/go/bigquery v1.7.0/go.mod"
+	"cloud.google.com/go/bigquery v1.8.0/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/pubsub v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.2.0/go.mod"
+	"cloud.google.com/go/pubsub v1.3.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"cloud.google.com/go/storage v1.6.0/go.mod"
+	"cloud.google.com/go/storage v1.8.0/go.mod"
+	"cloud.google.com/go/storage v1.10.0"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod"
+	"github.com/Azure/azure-sdk-for-go v47.1.0+incompatible/go.mod"
+	"github.com/Azure/azure-sdk-for-go v51.2.0+incompatible/go.mod"
+	"github.com/Azure/azure-sdk-for-go v52.5.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v52.5.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest v11.1.2+incompatible/go.mod"
+	"github.com/Azure/go-autorest v14.2.0+incompatible"
+	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.3/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.10/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.18"
+	"github.com/Azure/go-autorest/autorest v0.11.18/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.13"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.1"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.1"
+	"github.com/Azure/go-autorest/logger v0.2.1/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.6.0"
+	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d/go.mod"
+	"github.com/Masterminds/goutils v1.1.0"
+	"github.com/Masterminds/goutils v1.1.0/go.mod"
+	"github.com/Masterminds/semver v1.5.0"
+	"github.com/Masterminds/semver v1.5.0/go.mod"
+	"github.com/Masterminds/sprig v2.22.0+incompatible"
+	"github.com/Masterminds/sprig v2.22.0+incompatible/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+	"github.com/agext/levenshtein v1.2.1/go.mod"
+	"github.com/agext/levenshtein v1.2.2"
+	"github.com/agext/levenshtein v1.2.2/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a"
+	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod"
+	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible"
+	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod"
+	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e"
+	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod"
+	"github.com/apparentlymart/go-cidr v1.1.0"
+	"github.com/apparentlymart/go-cidr v1.1.0/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0"
+	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod"
+	"github.com/apparentlymart/go-shquot v0.0.1"
+	"github.com/apparentlymart/go-shquot v0.0.1/go.mod"
+	"github.com/apparentlymart/go-textseg v1.0.0"
+	"github.com/apparentlymart/go-textseg v1.0.0/go.mod"
+	"github.com/apparentlymart/go-textseg/v13 v13.0.0"
+	"github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod"
+	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13"
+	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13/go.mod"
+	"github.com/apparentlymart/go-versions v1.0.1"
+	"github.com/apparentlymart/go-versions v1.0.1/go.mod"
+	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2"
+	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.78/go.mod"
+	"github.com/aws/aws-sdk-go v1.31.9/go.mod"
+	"github.com/aws/aws-sdk-go v1.40.25"
+	"github.com/aws/aws-sdk-go v1.40.25/go.mod"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bmatcuk/doublestar v1.1.5"
+	"github.com/bmatcuk/doublestar v1.1.5/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cheggaaa/pb v1.0.27/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
+	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
+	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/coreos/go-semver v0.2.0"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/creack/pty v1.1.11/go.mod"
+	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/dimchansky/utfbom v1.1.1"
+	"github.com/dimchansky/utfbom v1.1.1/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/dylanmei/iso8601 v0.1.0"
+	"github.com/dylanmei/iso8601 v0.1.0/go.mod"
+	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1"
+	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.7/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/form3tech-oss/jwt-go v3.2.2+incompatible"
+	"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-test/deep v1.0.1/go.mod"
+	"github.com/go-test/deep v1.0.3"
+	"github.com/go-test/deep v1.0.3/go.mod"
+	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
+	"github.com/gofrs/uuid v3.3.0+incompatible"
+	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
+	"github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.1/go.mod"
+	"github.com/golang/mock v1.4.3/go.mod"
+	"github.com/golang/mock v1.4.4"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.1.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/protobuf v1.3.5/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.4.3"
+	"github.com/golang/protobuf v1.4.3/go.mod"
+	"github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.4.1/go.mod"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/go-cmp v0.5.3/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/martian/v3 v3.1.0"
+	"github.com/google/martian/v3 v3.1.0/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+	"github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod"
+	"github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod"
+	"github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod"
+	"github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/google/uuid v1.2.0"
+	"github.com/google/uuid v1.2.0/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod"
+	"github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod"
+	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5"
+	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5/go.mod"
+	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d"
+	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/websocket v1.4.2"
+	"github.com/gorilla/websocket v1.4.2/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.5"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+	"github.com/hashicorp/aws-sdk-go-base v0.6.0"
+	"github.com/hashicorp/aws-sdk-go-base v0.6.0/go.mod"
+	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089"
+	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/errwrap v1.1.0"
+	"github.com/hashicorp/errwrap v1.1.0/go.mod"
+	"github.com/hashicorp/go-azure-helpers v0.12.0/go.mod"
+	"github.com/hashicorp/go-azure-helpers v0.14.0"
+	"github.com/hashicorp/go-azure-helpers v0.14.0/go.mod"
+	"github.com/hashicorp/go-checkpoint v0.5.0"
+	"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-getter v1.5.2"
+	"github.com/hashicorp/go-getter v1.5.2/go.mod"
+	"github.com/hashicorp/go-hclog v0.14.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.15.0"
+	"github.com/hashicorp/go-hclog v0.15.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa"
+	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.4"
+	"github.com/hashicorp/go-msgpack v0.5.4/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.1"
+	"github.com/hashicorp/go-multierror v1.1.1/go.mod"
+	"github.com/hashicorp/go-plugin v1.4.1"
+	"github.com/hashicorp/go-plugin v1.4.1/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.2"
+	"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-safetemp v1.0.0"
+	"github.com/hashicorp/go-safetemp v1.0.0/go.mod"
+	"github.com/hashicorp/go-slug v0.4.1"
+	"github.com/hashicorp/go-slug v0.4.1/go.mod"
+	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86"
+	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod"
+	"github.com/hashicorp/go-tfe v0.15.0"
+	"github.com/hashicorp/go-tfe v0.15.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-version v1.0.0/go.mod"
+	"github.com/hashicorp/go-version v1.1.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.1"
+	"github.com/hashicorp/go-version v1.2.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f"
+	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.0.0/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.10.1"
+	"github.com/hashicorp/hcl/v2 v2.10.1/go.mod"
+	"github.com/hashicorp/jsonapi v0.0.0-20210518035559-1e50d74c8db3"
+	"github.com/hashicorp/jsonapi v0.0.0-20210518035559-1e50d74c8db3/go.mod"
+	"github.com/hashicorp/memberlist v0.1.0"
+	"github.com/hashicorp/memberlist v0.1.0/go.mod"
+	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb"
+	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod"
+	"github.com/hashicorp/terraform-config-inspect v0.0.0-20210209133302-4fd17a0faac2"
+	"github.com/hashicorp/terraform-config-inspect v0.0.0-20210209133302-4fd17a0faac2/go.mod"
+	"github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734"
+	"github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
+	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/huandu/xstrings v1.3.2"
+	"github.com/huandu/xstrings v1.3.2/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.11"
+	"github.com/imdario/mergo v0.3.11/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jhump/protoreflect v1.6.0"
+	"github.com/jhump/protoreflect v1.6.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.4.0"
+	"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926"
+	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.2.1+incompatible"
+	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/compress v1.11.2"
+	"github.com/klauspost/compress v1.11.2/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+	"github.com/kylelemons/godebug v1.1.0"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/lib/pq v1.8.0"
+	"github.com/lib/pq v1.8.0/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
+	"github.com/likexian/gokit v0.20.15"
+	"github.com/likexian/gokit v0.20.15/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
+	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82"
+	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod"
+	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786"
+	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod"
+	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88"
+	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.4"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.10/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-shellwords v1.0.4"
+	"github.com/mattn/go-shellwords v1.0.4/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.8"
+	"github.com/miekg/dns v1.0.8/go.mod"
+	"github.com/mitchellh/cli v1.1.2"
+	"github.com/mitchellh/cli v1.1.2/go.mod"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb"
+	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod"
+	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/gox v1.0.1"
+	"github.com/mitchellh/gox v1.0.1/go.mod"
+	"github.com/mitchellh/iochan v1.0.0"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/panicwrap v1.0.0"
+	"github.com/mitchellh/panicwrap v1.0.0/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.1"
+	"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mozillazg/go-httpheader v0.2.1"
+	"github.com/mozillazg/go-httpheader v0.2.1/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod"
+	"github.com/oklog/run v1.0.0"
+	"github.com/oklog/run v1.0.0/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.8.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
+	"github.com/onsi/gomega v1.5.0/go.mod"
+	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db"
+	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pkg/browser v0.0.0-20201207095918-0426ae3fba23"
+	"github.com/pkg/browser v0.0.0-20201207095918-0426ae3fba23/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/posener/complete v1.2.1"
+	"github.com/posener/complete v1.2.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v1.0.0"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/common v0.4.1"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.2"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/satori/go.uuid v1.2.0"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a"
+	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
+	"github.com/soheilhy/cmux v0.1.4"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spf13/afero v1.2.2"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.2/go.mod"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.194/go.mod"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.232"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.232/go.mod"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.194/go.mod"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tag v1.0.233"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tag v1.0.233/go.mod"
+	"github.com/tencentyun/cos-go-sdk-v5 v0.7.29"
+	"github.com/tencentyun/cos-go-sdk-v5 v0.7.29/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod"
+	"github.com/tombuildsstuff/giovanni v0.15.1"
+	"github.com/tombuildsstuff/giovanni v0.15.1/go.mod"
+	"github.com/ulikunitz/xz v0.5.8"
+	"github.com/ulikunitz/xz v0.5.8/go.mod"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/vmihailenco/msgpack v3.3.3+incompatible"
+	"github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod"
+	"github.com/vmihailenco/msgpack/v4 v4.3.12"
+	"github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod"
+	"github.com/vmihailenco/tagparser v0.1.1"
+	"github.com/vmihailenco/tagparser v0.1.1/go.mod"
+	"github.com/xanzy/ssh-agent v0.2.1"
+	"github.com/xanzy/ssh-agent v0.2.1/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557"
+	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod"
+	"github.com/yuin/goldmark v1.1.25/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.1.32/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"github.com/zclconf/go-cty v1.0.0/go.mod"
+	"github.com/zclconf/go-cty v1.1.0/go.mod"
+	"github.com/zclconf/go-cty v1.2.0/go.mod"
+	"github.com/zclconf/go-cty v1.8.0/go.mod"
+	"github.com/zclconf/go-cty v1.9.1"
+	"github.com/zclconf/go-cty v1.9.1/go.mod"
+	"github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b"
+	"github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod"
+	"github.com/zclconf/go-cty-yaml v1.0.2"
+	"github.com/zclconf/go-cty-yaml v1.0.2/go.mod"
+	"go.etcd.io/bbolt v1.3.3"
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.etcd.io/etcd v0.5.0-alpha.5.0.20210428180535-15715dcf1ace"
+	"go.etcd.io/etcd v0.5.0-alpha.5.0.20210428180535-15715dcf1ace/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.opencensus.io v0.22.3/go.mod"
+	"go.opencensus.io v0.22.4/go.mod"
+	"go.opencensus.io v0.22.5/go.mod"
+	"go.opencensus.io v0.23.0"
+	"go.opencensus.io v0.23.0/go.mod"
+	"go.uber.org/atomic v1.3.2"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/multierr v1.1.0"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
+	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+	"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
+	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
+	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5"
+	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/mod v0.4.0/go.mod"
+	"golang.org/x/mod v0.4.1/go.mod"
+	"golang.org/x/mod v0.4.2"
+	"golang.org/x/mod v0.4.2/go.mod"
+	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+	"golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod"
+	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod"
+	"golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210614182718-04defd469f4e"
+	"golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84"
+	"golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+	"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+	"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod"
+	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+	"golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
+	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
+	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da"
+	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf"
+	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.4/go.mod"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/text v0.3.6"
+	"golang.org/x/text v0.3.6/go.mod"
+	"golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod"
+	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+	"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
+	"golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod"
+	"golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod"
+	"golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod"
+	"golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod"
+	"golang.org/x/tools v0.1.0"
+	"golang.org/x/tools v0.1.0/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"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/api v0.14.0/go.mod"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/api v0.17.0/go.mod"
+	"google.golang.org/api v0.18.0/go.mod"
+	"google.golang.org/api v0.19.0/go.mod"
+	"google.golang.org/api v0.20.0/go.mod"
+	"google.golang.org/api v0.22.0/go.mod"
+	"google.golang.org/api v0.24.0/go.mod"
+	"google.golang.org/api v0.28.0/go.mod"
+	"google.golang.org/api v0.29.0/go.mod"
+	"google.golang.org/api v0.30.0/go.mod"
+	"google.golang.org/api v0.35.0/go.mod"
+	"google.golang.org/api v0.36.0/go.mod"
+	"google.golang.org/api v0.40.0/go.mod"
+	"google.golang.org/api v0.41.0/go.mod"
+	"google.golang.org/api v0.44.0-impersonate-preview"
+	"google.golang.org/api v0.44.0-impersonate-preview/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/appengine v1.6.6/go.mod"
+	"google.golang.org/appengine v1.6.7"
+	"google.golang.org/appengine v1.6.7/go.mod"
+	"google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+	"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+	"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
+	"google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod"
+	"google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod"
+	"google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod"
+	"google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod"
+	"google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod"
+	"google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod"
+	"google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6"
+	"google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod"
+	"google.golang.org/grpc v1.8.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.28.0/go.mod"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/grpc v1.30.0/go.mod"
+	"google.golang.org/grpc v1.31.0/go.mod"
+	"google.golang.org/grpc v1.31.1/go.mod"
+	"google.golang.org/grpc v1.33.2/go.mod"
+	"google.golang.org/grpc v1.34.0/go.mod"
+	"google.golang.org/grpc v1.35.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"google.golang.org/protobuf v1.25.0"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/inf.v0 v0.9.0"
+	"gopkg.in/inf.v0 v0.9.0/go.mod"
+	"gopkg.in/ini.v1 v1.42.0"
+	"gopkg.in/ini.v1 v1.42.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711"
+	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
+	"k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
+	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655"
+	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod"
+	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
+	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+	"k8s.io/klog v0.3.1/go.mod"
+	"k8s.io/klog v0.4.0"
+	"k8s.io/klog v0.4.0/go.mod"
+	"k8s.io/klog/v2 v2.0.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
+	"k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
+	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4"
+	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+	"sigs.k8s.io/yaml v1.1.0"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+="${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	go build -o "bin/${PN}" . || die
+}
+
+src_install() {
+	dobin bin/terraform
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index dad0f0376e2f..05747840524c 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -366,7 +366,8 @@ DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20190203023257-5858425f7550.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.11.0.mod 126 BLAKE2B 3ad1240496ce1f7c94c224a1eca571a3671851bdfebb40b243cb4aec90e329c820788c6080083e138240b9aa0a6e980701e12349058a1fd7e9c972faf7085fd6 SHA512 d7e895c4a2e515a0d20f8839b4f6d52f3aa3d000b97cecc99fbeeb5080e53c260ebc3aba0ca6ea180a2f5c88d5ae303fb94a257cb55aa9430773f6f5b4048d87
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.11.0.zip 12350 BLAKE2B 768230cd188206896241c678c36826ba9d097c304cd6c5130fe61aae8ca8689f4d3c318803cb75b136c6aad6f45aad76082cc5baa2e778e97b7025c51a502af8 SHA512 eaf674e7e86855f9990bc271078e016aa473bb40de7baaceeaba65afb93cd926dd199c521a6b2fd66408d767d01bf8dddfb3304053a5bac824911f006f97a3dd
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.13.0.mod 126 BLAKE2B 994134e6d9b2ced5dccc884460b1e474a906c1fc27accd9481f0ae664d225eb57423f0820499b95157726a39dd69831aba944c443dafced0318af10cea46e53e SHA512 657d9220217da47372f647fee297258a13495d7c10bd75d0645a21e81c41443b7a71f8162178181396129983cb695241056f052412fc2d5c4fefb214a2a82587
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.13.0.zip 12921 BLAKE2B 9f4ddf0c3d4020892065746228c41e260abe78fb17f6ed87e664e8fd3e883f0851db52697eca0e6e52fa02d36509dca0092b516b5084a0cbb499e5f87a8e48b0 SHA512 64a2b414704a06e4b181984ea287a10db68e1a3af0df276da3fb8241ce7a2f5ec501dd1b8a0cb8ae093419378a6ef3b84b4ef197be66ba620ed296e9e99e68e6
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
 DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod 32 BLAKE2B a73ae1e577fbb84fd72de422c367c1003355c117a9660cadbb5d6d52fcd0c102fa3b22c7c7dfb6e149dc14ddcb9b5fef847fb2a7b9379a35405c7bd9d83ff1b5 SHA512 2ef8ab60b4320b9358614a28a02b4207f3986c4a06798c3e253a79bfb63692dfb1765476e9d154e15f9d5e30983609c98b6ee39ae910c678a3773fddca208cee
@@ -614,7 +615,8 @@ DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod 297 BLAKE2B 2b94bfb4df
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.15.0.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.1.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
-DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.1.zip 32582 BLAKE2B 2a85827de19748a87597fe7f7ecebf613969f5eb6bae2aa4f1053211110ed9e57623a1903e9106d727b050af93757813cf5edd1666152641004a62c8a2c58631 SHA512 d38361b1e9be344325b272ce81ae229da9d79569935460c224c9cde76c9d5f4fc5d7fbf44576a279d444a8ad8c2ddc97d5c04973fbde9452512dde296996ec13
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.2.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.2.zip 33142 BLAKE2B 64356b67ebfe6328638b15fbbb81bf0a525e20eed6194414ec08f26f17f1c3415a735ee8ac8c0d8f596163f117a424fca528e1036d3ab703fbdd87602c632f29 SHA512 a9380f39046fc8573c44ae21e91db4465cabd580c3730d577e751363494429e4cac8379f222408841dd5eb6b346b3ba6a8531683e977766024e1ac57d739d69e
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
@@ -622,8 +624,8 @@ DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B c
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip 31729 BLAKE2B cc35c143559499bb19e8802039ee32f1ba2db84cd4b6e7209feb9b4a9a36f2a7b21e817c40c82d75abd94dc02f4e3e89b38692c93fbca987a1ac16f2a43676e4 SHA512 b7a8bde64b16c032ab4ed47c7ec11da6661293d231d7e100b4fdf9db88a1ed2fb9f48b95f7a6c44fd14e033a5a02244c894496cac57fcefe8bcddc73f4755508
-DIST github.com%2Fhashicorp%2Fgo-kms-wrapping%2F@v%2Fv0.5.16.mod 1409 BLAKE2B 3cef23218a9a2a3b4a5be1cb54449332ac6db34e492c71f988b50bf9def0e97e42097c094ddf5dea70b0aadf32a1869a884b6842e2c2eb5889b05ec403f18c71 SHA512 620f33238095b01e3d411b64df3fd2042f761c0917e672fbed0775aafeff2ba490fbed4aab0ddf6ebc499f7a3047df2382ab221333003f62065860693cff7654
-DIST github.com%2Fhashicorp%2Fgo-kms-wrapping%2F@v%2Fv0.5.16.zip 97614 BLAKE2B c70de304bbe85c4f27a2b138a59e673e2e31536c549ce55d7ec94095642163f02ee4cdf8e16e1fac02bbb71e0f66ed2dc3580853d71848bfa454297d89d3d503 SHA512 82f8b75cb94a1c22b21cf7f363afbb5700386bce539b62ec226fc4566bcc82a5a03f8f7821436a3fb7e15d8888164e02849e1f07430e765d9728a805920bf35b
+DIST github.com%2Fhashicorp%2Fgo-kms-wrapping%2F@v%2Fv0.6.7.mod 1350 BLAKE2B 839f8314232246ec553e0877f76158abc9e35ca4235f810753d93435f79fbea778dc0e1a3e6a09fb54c356986e4ab04317d2b53c2dc5eab80e93d567d9afa71f SHA512 6dd45a45795641025cd93d5d7c9f1504747151d9217a7744672a9d5c1afccb6bf4b5db7823147cc4a3cd68cdd54da43025ce4c10a07610923b81ea4f297e7bad
+DIST github.com%2Fhashicorp%2Fgo-kms-wrapping%2F@v%2Fv0.6.7.zip 96048 BLAKE2B dd36a5cf4efa7d16467950f89d28d8c536e2a8dbc76a370e038792ae6090d4e465dea061b4b39a3bc36799714986886c99da618a5d3bb8671091a375661b6de5 SHA512 7544ae236066447a5c6a001d7ea7aa4f68e12776ad6f7aba45ba413d197671389f39963d9235b32799c89fdebfc7976a18834a44be3ea881d5d6084b89ef6d66
 DIST github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod 61 BLAKE2B f43ec3c9c450f07eeb5c08107e6320e5d98cc68b0bd388df850fe5c61ddc18b871956a75df797984b3f63d24b4ac5612d322d577e5ea371d24cd05cb0b4eb91c SHA512 9d86ce1de4bd2d4b32f76f69d0ce1f01c7db8b1a2555ae8b789c24fa5391e9e477bdd1d82719003f37205b102a845bce0b65611fd10cf52df4d49b6471f7e39e
 DIST github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.zip 8113 BLAKE2B b38a1dc8c25554a4f56d7dd26d37036381532e355ab05e458489a2ff0c0436e9ae7de28c8bde941b3ccd1e00ecd4bd0bc33e64060f6db41e348ee66d0bf6a3dc SHA512 d90328e546ccc43766a304f4971e6036337caed53204bd687c736ec3a5c82c538b929921ddc9745eab6315ddba741817d70b41dae2177a6a88e5991cf8c43d14
 DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.2.mod 102 BLAKE2B a406da5817f94ceca88556a1ae8ef772a12f868ceffd9fe1e758730b017919aa16e533c8fef194831b9225412ce38cdb7b578c5c95bc4f3f8418ef6e28628a19 SHA512 8e7ea5c9a297242229ea98835167536d3fa58765187d535d7f800e53819b5d5539a166566fe30d49a7c4d06b1eabd871574d8a3f2ad283818f68228eb766d749
@@ -649,6 +651,8 @@ DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip 15463 BLAKE2B 88fb544a56eb6266a2ed75b3b6380f52d11d725e8711f2fbe321bd30494201d43db01398348fca95ef76ebb46ce26f3f523be67bc2d56f264f5c9fc3ac1cb8c1 SHA512 891f2adbadf938d7d070d80198f50a62e187a6aa6fa6b489e0055b98a9b2547b43cda11ee983815026b1e6f0f8864d695bf7e72d70290423ff53b4872d310735
+DIST github.com%2Fhashicorp%2Fgo-secure-stdlib%2Fawsutil%2F@v%2Fv0.1.2.mod 260 BLAKE2B 043c7b20ea611517db574988365c8e48be423bb762a57f3bc96c6b09f2737f44e0e4ed8a36aa9e84ae63f3f07a3521fcbd5fbf2aa58c5404528af0cf7bd84a2c SHA512 67f15d18355d42e71a830ec30f53d4958ede4c766fc18fd831612481230ab8a93d3fb989be81e326818f51e542197762e068b3b20270e691abf63cb9ef6970d2
+DIST github.com%2Fhashicorp%2Fgo-secure-stdlib%2Fawsutil%2F@v%2Fv0.1.2.zip 16050 BLAKE2B 11396acaac636c3a13e5aa4814a6d742a55fe0060558f289ef0a359b7054db5a0d31cfbac8b13f71652eb6c4497dde70decef1b7d2fbe689a51b22860a07fff3 SHA512 8ecf07c154f3696076244682d63e1d3a46b5a380fe3e0dd7a571646dccb624d8685b083a7fc8b096859bb5fe56be202b17d287df25eb86961fabe17a4f03fe32
 DIST github.com%2Fhashicorp%2Fgo-secure-stdlib%2Fstrutil%2F@v%2Fv0.1.1.mod 147 BLAKE2B 81ee43fefd25e06c16eb85b870ee0a9181fbcd2eab194e5d9a696d863e6c25828de3904ca91b56a1748dbbbf75c13b3839dda5375ed265604b0e95fe07f441e5 SHA512 bfe78e3be4e4ba840a2d41307e9dd63cc091db14d96938e91f6503b36552a32f030f2a14a94048f3ca040de19d11c1f5fe71405cdef70418c7024afa303b50a9
 DIST github.com%2Fhashicorp%2Fgo-secure-stdlib%2Fstrutil%2F@v%2Fv0.1.1.zip 13880 BLAKE2B 60aa29a3385cf9c237aebd7056f14b6c49b8cf8c8d0f2b773b787f6fcb492e32a73779e50aa1117695ed415d8708d597419a06f706df8ff065d43fab12afa9bb SHA512 d43a564e2f931ddf55d9b0cc4d7e25ac0b1f4059bdb9425ac48bb37d438feb563d6d692fdd1a87988d155b96d6b1eb7dc802a8a9cb08a18e4ecc481903d7a721
 DIST github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.mod 45 BLAKE2B f929917e6591c425c0570baeba93a9f29783f8d76ddca583e7ef8741210d4798e6ae0373c19334a60d03417b11524eadf3af98fa452b4ee57f120838e61a6677 SHA512 ead2335e4739698a487b3defdf5f09fd5b43c7b39a7466b588d4057e4140061b38d2e23f4abdcbe1d26b4c2e300dc3a5bd6288e9285d36a8b0986c5020ba8e91
@@ -748,8 +752,6 @@ DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-kv%2F@v%2Fv0.9.0.mod 547 BLAK
 DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-kv%2F@v%2Fv0.9.0.zip 60417 BLAKE2B 2c2d338f38c9c459e97520cf981249cb673fab232c19a10d29aa4fa85d49694fb5d2f02a6a3fbd14d9de90ecbf103c94b42528df002a9e3477169e2c4d43c77b SHA512 c7f4baf8ca172bf89ce7c480edcebcee849b4562e64b759deef524f61eea441e47d9906071bbe620f089dbdacdd145a3fc851e3c8041be470710e759ebc235a0
 DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-mongodbatlas%2F@v%2Fv0.4.0.mod 897 BLAKE2B 62c09a2e517cd69ef1ecdea0e9fa81501e9254602fd0cfdd5f66ef9d37ad412ac90b37893ed948cca203881eae81355be9c244c2ea3593b74865a2bdcaf258f2 SHA512 aac484b5067e37c21411b61dba5f80755d6c74a4d526ccae4bef440936d7e9a1d759850a52f8b9113c67480c9815253996de2d86a58d04d57871f2755f79ffc3
 DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-mongodbatlas%2F@v%2Fv0.4.0.zip 44497 BLAKE2B 5aa70e4f68346c12f87677bf98b54c3a5bd5ecc2520d1f3e616f943fb2e2a16ea7e79ec82c6f4dd753baee577aebb2660cabaa381b625396756fe7b5872c4395 SHA512 c1d971eeacff84a5f3d0f203222c34483b1db575bbe61f0991565dc1471ac5c8df1eb6f5252faafa2d2473d2781ccaca6e38d3de86833b05a3e2557ee91b6e90
-DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.1.mod 654 BLAKE2B 65d973ef48076c9b11dd7a9057efeccaa7851cf1d42273b9fc722577844861694bab90e578a47ae144c3b568a381ea3c5501a951bdb7936ff247cc2c177e48ea SHA512 8ee81d2dfdbcffb4615add255cbee4cc8f369a035b865c0fc74ec9126418e6265518afd0223fdf09da3957ab325ce6c29d81b539be704815e64dfd821bafafae
-DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.1.zip 87114 BLAKE2B 76bce3b85179d005480590256a54cf5b2e6e69151775b86bf2668016ac80adf096c2196d33c2b35e211e31f0106b80fcdbcc338ef437d28004d017789d74c16f SHA512 99a6b117ca1900782c6bf06ddc63fb17778113ec8aaf0637a6b3530d0df5d5bd43b3ab8a6117551f0581fb04a49362bf7e67f3a17e9c600c4b98675c2f5b718e
 DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.2.mod 654 BLAKE2B 65d973ef48076c9b11dd7a9057efeccaa7851cf1d42273b9fc722577844861694bab90e578a47ae144c3b568a381ea3c5501a951bdb7936ff247cc2c177e48ea SHA512 8ee81d2dfdbcffb4615add255cbee4cc8f369a035b865c0fc74ec9126418e6265518afd0223fdf09da3957ab325ce6c29d81b539be704815e64dfd821bafafae
 DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.2.zip 90572 BLAKE2B b226be15ed5f335cb55be0928e541a0b30ea6e7effd0dcd764df764f90030a1d31d3530dd243f7fd826c1c245dbacc2820dd29e4e5a00c314dd3e1d418bb6acc SHA512 07dc170f3088452ac16c050de6388fbfb70474e7a0d36ef6fa89ab191d93e7cf9927989dd779b84da5694e1be02be71155bdecd9b194b3b72fcd9387afa235b3
 DIST github.com%2Fhashicorp%2Fvault-plugin-secrets-terraform%2F@v%2Fv0.2.0.mod 407 BLAKE2B 3381c3a22697e706463c781960e46457b346cee86a0b087205f24cf12804abb21e99acca67889cab9cfbf71da3fb642e96528fbc09526c1a294a00f591aef437 SHA512 858e53248937d9cae085e23e61a4b76a9c2acc1e955efb36110b53bb9e4a19ff7d4c3cb6693c5bd340402b5cedba132147d93295910126a90c7842c4e972ac0b
@@ -858,9 +860,10 @@ DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570c
 DIST github.com%2Flestrrat-go%2Fjwx%2F@v%2Fv0.9.0.mod 34 BLAKE2B 3d7eabace16abee8de4575a058588468e11ef91e3fecd49221b3daeac365695765ab16d4596ac0a6b3ba03c8a9a364e1a66ff6b85dbba8fa320d864e9fc0e7c7 SHA512 18c22c965b123460911646245a10cb5f5c249ef635331d38720d47bfd3ec9e2f8a39e024632d7a11ec1dee16ae5116b8150ad8b210ef25502f9d0d26a431dcbd
 DIST github.com%2Flib%2Fpq%2F@v%2Fv0.0.0-20180327071824-d34b9ff171c2.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.10.3.mod 34 BLAKE2B 1f70e2e8670ecb572e36b3697429bbe82bb3372aa977eb116270674c689b66d2195dff69887c8555bd886a67a07bf1bf5d43c2eeca0bbc51b6613183378eabef SHA512 f0f38407ddaf1cddb83a07d7435e78dc4bd789761325b68d689a6e571e8d28ae352717a7aebabf4b63918fac9fb792f6b7ecb0db4898b563706e1fad9c30e13a
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.10.3.zip 124624 BLAKE2B 45c3568404212f0304a4c28e4cb68011a18111376426293ceacc7f71bd24816a65c7f252442ed60d700ed94177a47abc335e38eaa4445b1875869bde56d06569 SHA512 04e3e3f7bb1d74a976f69daf67a9e034b2196e3fe4b5a855deeb8270c6eea7da131018cd5f65139e958418454349d4764d1ea49b688ca429b6e98d46176a0919
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod 34 BLAKE2B 1f70e2e8670ecb572e36b3697429bbe82bb3372aa977eb116270674c689b66d2195dff69887c8555bd886a67a07bf1bf5d43c2eeca0bbc51b6613183378eabef SHA512 f0f38407ddaf1cddb83a07d7435e78dc4bd789761325b68d689a6e571e8d28ae352717a7aebabf4b63918fac9fb792f6b7ecb0db4898b563706e1fad9c30e13a
-DIST github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip 118447 BLAKE2B 35bf2178c21f6b65693863db7160f4e2392b3525ca9d51db07c64eb026e736cc346009cf8b9b9a0415386c7792833ffe3715ce9658a2e0bdcff8162b7ace7829 SHA512 d01f415ee9e59e1e9b9d8d55a4f79b508aa871ea1106686defab608b6f2c76223e0b85bf7aef3b098b12cf66de89be5767180789691c1abe17680defedf408f4
 DIST github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod 267 BLAKE2B d2298b42ba1b8aed99658a846dd1ff5cadf5403411766efaa880ecd043a56703ac1089ea5edb04b391d710d99f9b1a1471628043be868fededf189130bf852e4 SHA512 76b19a140339b43774f3df87d1de97dd4bbdbf5939f523fe39faca051dd2a4b9e719dc147a0a2f931fd30871c30eb6a628d58bded12271e04f6de5d9dbab497d
 DIST github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod 414 BLAKE2B c0bcdf3e0a6f510eb3649030349e26c3d78608af9ea46150e891c17463491da92c544562b60cfaf35b8e6e11cba5b43bcfe0a8bbc3e3cf7832ba6114ba8cd9ae SHA512 1ca2109c477bea717b8f66a2d57c35373adea2fcaf4223d85770be21833824334e4f9010c1257db95e345d1fcab540c96a40e9abd7bb51cd993559c224e79500
 DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod 34 BLAKE2B 4217c6bd7b66d286e9ff72af7851bc7fc833e894887789e6610645e36bb72c66995d1c308170b54e21035195ff96ec6af8811b835f75995af0fc93be45d6b9d7 SHA512 5a5f833d51cc196adf1bc58ab4804951c2475b229c1a3c707c79b45e59e8ce98e9ba52d2624eb73617491c28bdcdb834038c4c5c75982559865d3d2b110994b8
@@ -873,17 +876,20 @@ DIST github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.mod 179 BLAKE2B de910385e475042
 DIST github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.mod 41 BLAKE2B 5b60f89d548875788ba9d28d5b570a44f14babbd6219613b338521c4ad200ac31c0a0292ae9d589cc79a424a39afab9f2fd590a9a64bb4dd68c67a13ed9e0b22 SHA512 fe7f14ea20575f82045ba640612e1ae728e05607849aff5905369cc0361186e879b6f056cc89c6c96a9ef6e8e4eaa2cd34aed843ca23870a735d17298f186fe8
 DIST github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.zip 11765 BLAKE2B 8fa0bc6987b422048df7e051e8ce2de530f2c70533f45f7a2c8cef7cb0c729cc9fcd39faa8061e2fb9177c6845574a3e827df6af01e68881b10acffa596b876c SHA512 6b1d2245c85cedbf2b2363ba07ec82dfd3d31c5d313605ae28ef4d6191f4903cb1e109c02464456f169415a6c7dae24a6e54f7c8fae1126ff7517712627bda07
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.11.mod 160 BLAKE2B 63be9d239ea8c5ad48c5bdefaf634f1ef2e3913f9c1f1eb0c48ccf9185a2c14c1030d1542048acd9c7c42399ebb752a8c943e70ed7b11d199ed9067b6e906480 SHA512 f2fa86449f7da9a73f3f8781e6b3dc6ad6e7d491cb37854be0dfb5c3ee086c36f509646e6fa383b4f00c3cb96c535e581016b2a43aedbfd9fe5861bada2f7ce0
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.11.zip 13999 BLAKE2B 95316c7c0aa7b5f79b15f1cb6c155b84b46c821fca0c2cb3bb4f29641df8ee687271f3565f82450b3089b89676a0624d5326158114254b486dfa10af43f8f3a5 SHA512 3fb2653e0986ebdc1243a024305aa9bbb9ecb2b8ff49362be1c93ad31995d9ca3a320a61c73df58b4195e750296e817a9126bb4f9c8a637421c6fc8a888660f7
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip 13690 BLAKE2B cc3568a99c03ce4ef19e52a8429b485e774eabddc3ab24315a58b149e8168c448bb1fdbaabb8e3eaea918de96cb7411caa000be4585f851edcb26cb0be9f0a7a SHA512 c39ebb2cc99a555054d55ffcefd5680292c66eed23b1ba8a3595259dc24cd42d432b558014066554308f14fc452b7a830f8b10e635d317b5f14ac0e0b24b1528
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.9.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
 DIST github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod 201 BLAKE2B e7d70655a2b746b1ebac46650c7539e492dd2b40c44d7fcaa397167be74f2bdd8a3997d4e31fb30739dc562eb883b82df5f7b95125ee6569e598517b13452d02 SHA512 65713ddcb3bf3c4b8352e7f07ebaa48ea539170b9bfa1026e7ec95084dc0ad4ae9217fcad5793ce9b01582c5cf225fbbadb0d79380df07f48703373b2e7f5237
 DIST github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.zip 15873 BLAKE2B 3da4b067d6eeb81a3a4b4c93c955b2fd63443f589c322735a9f2397b5ce21b7eb8da4ce201001fdaecec2857a971f2baa8a094b86e866bd43a5ba2f0159acc3e SHA512 ceac4faa43badb809362d1ee92623f1cbc1d17bb9ce067e8f7cb4e5f3e27126a7001aef2b536894611066792f3fd25572b562242fa7153cdc24daa95d358c848
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod 104 BLAKE2B ee5067e0e89fe2d374ea852dac828c094db84c3a3d2d8a991abeaf40385431015577eeb6b11a66033e8da599e808f9385a84843fd8f87dea487bd3bc9ba233da SHA512 f144089cc85271c7d91b9a6faf169018bb12177dd770db0092dfd0b4c71846e5cc6dea385c0158a974cfe86971e5642858a6d633c64d3b598f1ab254fd47db28
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.mod 104 BLAKE2B e859512911c1621e5ba3e46249c5b9b5e4b0bae854bb3a18d7e39d6da27c93e133d43851d5e6bf2ede44fdee31801b19fe274b55a1f37b1291bf27262e2f2385 SHA512 23b01eb4023ff5018437ff98b55ada053eba49feab2777eed36d033f426c5456b143f3defbc3131dad1251205f3ffb3553e3c10bd98de80f0a462e8450d6d56c
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.zip 8919 BLAKE2B fc84f4f16176d14f177f029cae5ecf0221a8f0ce716c499e8b5d49c8e1523673a2fbb600a769ac26be98b591b3cbc3730d447c412b2acd3eff7f878526c271a4 SHA512 c6401cf5af80ea2495cb63800ff39fb9490f212f3aae0ac1d86b3d37ce6734eb35aea00b35bd26532feab77ef80322e765925f302d77f664dd57163f67a8374e
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
@@ -1015,8 +1021,8 @@ DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod 1010 BLAKE2B 6bef0142
 DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod 1033 BLAKE2B a6a88217fc248fb358f71cea9af2fe5a4346d51927e75317792cda9e00896e20f70ac060618bb1a648a05c5d214482a2cdd4a4ed5c5685ba583fb17b7d7d9a10 SHA512 44a8be7c11b9055ee26d0386c31f27d24d7d82b5be2594842a5338007f9d7a0d2bf835a5a2ed20c3dd78a0f8188f7e1d2d2b072acae0346d170612d38df4e761
 DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod 1033 BLAKE2B a6a88217fc248fb358f71cea9af2fe5a4346d51927e75317792cda9e00896e20f70ac060618bb1a648a05c5d214482a2cdd4a4ed5c5685ba583fb17b7d7d9a10 SHA512 44a8be7c11b9055ee26d0386c31f27d24d7d82b5be2594842a5338007f9d7a0d2bf835a5a2ed20c3dd78a0f8188f7e1d2d2b072acae0346d170612d38df4e761
 DIST github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod 369 BLAKE2B 96cb4a6ca9813f733a4a86753a406716bdffb636c0df7a43227c6eb5f950cf9fc8d1510a02a6ac9f75198609e377a6f4c3af16650527345d9a2d369ff6792d39 SHA512 cee2d00b0b1b1c3d09c27566af4f47243360366597b3b101656cbeb4293ee3e36c38ed046d193bc28dedfc86d36a9d24343c2b0e4f231aa74b7528e1c302617a
-DIST github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv12.5.0+incompatible.mod 36 BLAKE2B aa3c0143ce0099e48e07d3282bb4bb680612890e5011c4eb5e49c131d71447598bf13e93e6938b6982ba0450c668c2ea949b53f2ecc0848744512de232bff39a SHA512 cd96f5afd87e43290e6e74bf2828ae1636d4f905e1ffe068888bc30d1313a9e4ec752dc2dede29c75f4f1dd8e695c43acbb01c116c2b8fb62a21d123594a6b2a
-DIST github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv12.5.0+incompatible.zip 3130892 BLAKE2B 9e9b6c8945f5b2e1e104eb2e404678575a59a6b5f409c39b74fb6959733b88226b9ee9f2c0756c2d9f8cd752d7921e40561c567cb832de7c63168888c376cbd5 SHA512 eded990bd80e5bf9beb7ba907c50ec315e8ddc18842e81dabb8e701bc2831901779ae87506192e6ce892b0eebcca3bd108b1b75fc3e9d3bb2c8b7e97d4e8c96e
+DIST github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv13.1.0+incompatible.mod 36 BLAKE2B aa3c0143ce0099e48e07d3282bb4bb680612890e5011c4eb5e49c131d71447598bf13e93e6938b6982ba0450c668c2ea949b53f2ecc0848744512de232bff39a SHA512 cd96f5afd87e43290e6e74bf2828ae1636d4f905e1ffe068888bc30d1313a9e4ec752dc2dede29c75f4f1dd8e695c43acbb01c116c2b8fb62a21d123594a6b2a
+DIST github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv13.1.0+incompatible.zip 3168896 BLAKE2B 059713f131c53faee1db8daf4a988b313ab9b07a69d3cdc3aa0daaaf7ff91dc39f5c061ad10e4addad6b96696f156276cb7c03ca745a6c7a22eab3f642d460df SHA512 f8795326181f0f4d46394f1f7e8c8b62556a48078da68f5602e8218409aff5d6f1525d286f97f22802b46b12fa0c1174b03c061688e5c19b972f1e8a17b4e8c0
 DIST github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv7.0.0+incompatible.mod 36 BLAKE2B aa3c0143ce0099e48e07d3282bb4bb680612890e5011c4eb5e49c131d71447598bf13e93e6938b6982ba0450c668c2ea949b53f2ecc0848744512de232bff39a SHA512 cd96f5afd87e43290e6e74bf2828ae1636d4f905e1ffe068888bc30d1313a9e4ec752dc2dede29c75f4f1dd8e695c43acbb01c116c2b8fb62a21d123594a6b2a
 DIST github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.4+incompatible.mod 33 BLAKE2B 641436802108b1bf3a64ba7f059e3c047f91c99fc091d47a33213e3f00006fe03787a36fa349e9b4d0669ecf911a0510da7c6b2f4663867b8261cd5ae987f5d4 SHA512 be5a940ffb5cba71c75b24fb97c2738e073b4a87b1e9a326f885c8cc175eb60f28160e35dd8b3c31f70a137f570314422564e85f1400311525fc0d75c7d0163e
 DIST github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.5+incompatible.mod 33 BLAKE2B 641436802108b1bf3a64ba7f059e3c047f91c99fc091d47a33213e3f00006fe03787a36fa349e9b4d0669ecf911a0510da7c6b2f4663867b8261cd5ae987f5d4 SHA512 be5a940ffb5cba71c75b24fb97c2738e073b4a87b1e9a326f885c8cc175eb60f28160e35dd8b3c31f70a137f570314422564e85f1400311525fc0d75c7d0163e
@@ -1195,9 +1201,9 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod 216 BLAKE2B c597010cf6690
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip 105564 BLAKE2B 7b082ff11190ff27ce4a3de68896fffbbbf80ebdead7612aa3b06981171974ad2935bee7d5d71cb9ea29b110a82b3e04447248e7b9376e84c8f3f53d5001ae4b SHA512 be80972112f0a3907bde960637cb2c08d6ba4256ca27cfa07de5a0a8e523d0dfbd8e90ae593e5302d7351b7dbddecf69dc3985a9d19b96087732dd886eff371f
 DIST github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.mod 39 BLAKE2B c3f72de1e0ea9f1bbe083bb8d97a4ba1af19d043aa6509d2d76c4250b9cd595273581e708b09bbc7495618cdb7498071feab530fc5c763a7f1eecb85693d7d21 SHA512 2b5bd6b760b9284457b198c3c0f162a326e75cb3a2937fa0305a9ac3243ed03e65d537795f22a4235265016dc8d4c83138bbd511e4aeafb0f1aaa75cf69020da
 DIST github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.zip 38488 BLAKE2B 7532c35cd0c74d7afdeb9bf6eba1732c671ac5ec8886d7a4df5f713ceb774f94dab7b203a3d5ff315cfc8ce2cdeaeb12f30e8b5032c016b5bf24d5c2b43be5d6 SHA512 32a14268df16b80f3675222486365449295f31c321713ed86153e061f6182d39d43b970978a820a95ace1cd6cf074a421b5931a8aa7c73ebb81b7c4f601bd264
-DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.171+incompatible.mod 51 BLAKE2B 08863dd989e6100eeb94aea780331caed21f93fa1ccc6dcb4c77050afe0b8ede362f40e0a8271668e2ca0e328a3594dfb6481640ff3d5f1d1ad3e6b4e7747e11 SHA512 dcbae023694dbb97fa3e1cd6bc20ab7eee364117c45a45912e6d782744a54e0b2292936cce6e807af0dff179a495993e19ff86360b27d3a79c90a1f81b6e22b6
-DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.171+incompatible.zip 1859180 BLAKE2B 3f0397dd309f2b8c051d949c626c269c9d3a87c948af50f9bffc1f11ab8067f6cd2371fe0db767c49f2a3bf3ab64fc2e35944db1a7b9b2226b179c4b0dd551c6 SHA512 52ba0238d28206e903b8319e2fd4a766429e9eb209ea0ef618c53fcfed2f35a26ceae6aca1ca6a0a68693cfd9e5776d2a06237a16bc7c47a44bda398907e7e15
+DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv1.0.162.mod 60 BLAKE2B 6e13cc2a35e2d4cc6d24e534f0038e9a1f4f6e12121822a546e282f2a6a8be1bb4ea8ae20097b502a4ac37dda1ad062765de8f7fed3852e19268a2e5788b8363 SHA512 3004f1a66c2a680e5a64993b821bcd610ce06ec7016b76a56a7191453ca63ad194f875b6d9e627044ca78a898bac27ca73a8605ccd25b2479eb545e4026132e4
 DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod 51 BLAKE2B 08863dd989e6100eeb94aea780331caed21f93fa1ccc6dcb4c77050afe0b8ede362f40e0a8271668e2ca0e328a3594dfb6481640ff3d5f1d1ad3e6b4e7747e11 SHA512 dcbae023694dbb97fa3e1cd6bc20ab7eee364117c45a45912e6d782744a54e0b2292936cce6e807af0dff179a495993e19ff86360b27d3a79c90a1f81b6e22b6
+DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip 1101286 BLAKE2B fedec4637e5f7bdc4edcc0cbbf3aa451125c95f932d81316351554bbce5b45b68ad359936afbc5d46d602e5cab4a7534fc8a80216a713ee8b364e000ceef8d65 SHA512 6d848faf0c554bd0a1818108b58f15dac2ea8378f5dae46bc1943e48319f9dbc87e2ba2efcfbd45b5c74e3f70ee8702c28b521e3fb2442b52c949bbabdf85d84
 DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod 33 BLAKE2B 2f2161156210fb855e4efe08126e21b4fed0ff111b4f03679aa26051e23ac71f9d269c26088262a3ebeb6364fa60cb9e85c1850d8fd1674ab488c6583d6034ac SHA512 39a892eb40bdbf1398cde6fe8575bf4fea604e3bb21473de5b2316ea182130b92c9dd2467e2807c0421a35cddd0096fa99134a9f9de02fe79bb59d82e2762937
 DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.mod 33 BLAKE2B 2f2161156210fb855e4efe08126e21b4fed0ff111b4f03679aa26051e23ac71f9d269c26088262a3ebeb6364fa60cb9e85c1850d8fd1674ab488c6583d6034ac SHA512 39a892eb40bdbf1398cde6fe8575bf4fea604e3bb21473de5b2316ea182130b92c9dd2467e2807c0421a35cddd0096fa99134a9f9de02fe79bb59d82e2762937
 DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.zip 9822 BLAKE2B 5690d7f66d1c403be95de8677b72c3fffe536d47fc113f49665037cb01afbb2abd3fb65fb391b7dad50e7a35a4686f6da5c8a7c9aea13a82e23671af6356fb36 SHA512 45f24b719e0104e2c2630ef77807093a37e96e26099391ddf001086e36cdf9e5c34540c79d5a01254e8431cee72d3db87dcfbf9cc7f2171506b509436ebb11a3
@@ -1485,7 +1491,9 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210316164454-77fc1eacc6aa.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.zip 1635348 BLAKE2B c4c3c22921fc17c195e3f50d35bf11cec02d102e2f5fd93ab92f3da1cb052ec4edb74a4fe62fcf048af600ed0bfec3264b8102dc0c017f0f96bd4ae1e1995e01 SHA512 57821ca04b380fe5fb0de3701fe47227e11a6459bf39b773dad257bf1d0755491f10b85daabe6e99a0cbbfa06afe5d7954a26d49c5ca4a10657a9cfd8fcebb49
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210927094055-39ccf1dd6fa6.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210927094055-39ccf1dd6fa6.zip 1655907 BLAKE2B 317486eaf6a714d7d74f563e20bbe3f0581c7331e3c8e492cb075476bdd57f9ae4a75c49834cc6912f7d9ed6a54c540a78f6e2556245afc05f6480019c7abc17 SHA512 dcd3d13b504c351483c49f93884b3e8635cb0377a51cd14fbd3efe8b55f3983e401ee746bbdb7e6904e472beb09343d9d1d1d9667f2cc515e991c8f5c3bf14cf
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip 23281 BLAKE2B b2fedb31c347f2b5b8bc3c0311f5078ab84359736379206227bd7ad4378cffb67f39cf078707a7095ecfac3c243bbac54b64cf41375a4261fbc9af9887d134de SHA512 267fab133c0ae306a1f484d17a9c3bc7bafb1ae77df3412ea4047de34a940b6425524a93b7b41d010cbf32160482fa3a370f93654e4ff73b6d11e45463bc185a
@@ -1752,10 +1760,7 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
-DIST vault-1.8.2-webui.tar.xz 1382592 BLAKE2B e7df79275f65b601de577f1197b89c03bd4e299fb4c5ee67f5e91439a79c15eeb4b58946d4cf2c837ca88883c2d655ae86388f2f194a06f159c6580d4e6b1e59 SHA512 35c738be79fd956f09595045d7616599cfd7948baf2b774d0585c4cc12f9cfbd8bf262eb3c9a3969b96184560f2b2f7eb203271100a4ce452347d1100a5884b8
-DIST vault-1.8.2.tar.gz 20974085 BLAKE2B dbef32b3b1881f61053fed410c80caca253af9fd27d525eaf7e8b471af15d62c16423d35905302ccd4c32d7f2bc983a09d4ccbf2f835b7c60e2ac5067b17348c SHA512 fe203f68a8b2f91356a59ee5a5e072aad232bfb9b037c7673297240ddd6270936f144c9a25bcba399053ef0fbc756146cc0e9e9f3642f0fd07008d8ee003d793
-DIST vault-1.8.3-webui.tar.xz 1380524 BLAKE2B d4c401cb637aa83712c9433a2c252d052a130021981e68462cff31f5192ad4d138a2e0f754386ad49cd05cfef3afe4dff039f759410b4aca41107693a301a841 SHA512 e09c46af20a4174add3ba55ca2e011beb5b0a074798bd736d3a0b0cf245428f33cf10059aa97d16c6ac015ce39b9ee0e2ce9904eed220422dfe21c0ad6637a42
-DIST vault-1.8.3.tar.gz 20983018 BLAKE2B 31bf4d4bf69b195c4cc31d2ee5e1c129167c781f6b8844fe168dd0746683b955928edcb2a879e83638e5a15c3e4b5b751ff5de2e4fd24d2f038f9f3b4428808f SHA512 a5c9366697ed293a67558e50037f6f76dac02362db51878ac9845b07e436e3c27e39d811369e616308a00c42af2b86f47f9b346f2d4561ea1aaa2203c6e589c2
-EBUILD vault-1.8.2.ebuild 95865 BLAKE2B 6f72e3a4c990600d2f0b2cd189ca4d0502195edd05e7fc1f00d6788243f535705226d5a0faa1f44618e49081c1230b71431d4e949b47e6c1c4f39247255dadbb SHA512 33ad1aca41e2d07adcff741e7eb603f87dded3bb4c794eceb6bbfca694944c0cf28f9b7ce19762a7a8aba1c2c512e4b9a90667ac1ff04069d257f3600d18c103
-EBUILD vault-1.8.3.ebuild 95873 BLAKE2B 8f615858a56b44127f371fd4527d44c78456db7e3b8a4289078c37ba31c7fa6d69f33fb6be4be7df9e923633ef476a3412d4f336ba66e8c7f22177dcaf06f933 SHA512 54d4f18d44747171b59bc4ff14a5748315af685cea491b5e2fbe79357f38b0562ccdfc5366ee0598a14826a247d7f375b3b72ebd758e641b3fb4735388c8e37b
+DIST vault-1.8.4-webui.tar.xz 1385416 BLAKE2B 87f6e07e702e69c2916372d26fdbfaadf1ae8ae20dbbb094a76397bc2897b44153f24b415963f40a90db0b05fa0846c3b9b6e8f609cf4cb32af4dd22b3e1effd SHA512 bc129773a644ebee7d7fe4570d7fa550bc105a918908efe910229aef158721c490de7a87a4bd4f21834d3d37b721a4afacee9c6d227616b71cd299a6d52e9b13
+DIST vault-1.8.4.tar.gz 20986102 BLAKE2B 410da007a4f251300a9c8e0eef9a32d445b0190a344f8e88e1ca2de47d77eb582eaea839e4502b6559c2c06cfe4f45cb0dca20f5033c9e42726ff5263b3d09db SHA512 93cb368003be41465677df69ea85e5cf19252ff368b77bb1a015b85d23903de8f36f1d93b10848082f27f22d0529ddc45587eabd3d7b979637aa895dedfdfa03
+EBUILD vault-1.8.4.ebuild 96356 BLAKE2B 42f8fafc010a9c822241d33aa5980fe559ac372a52fbd531ab1ac3777815c484c3f8f32bf222059f770334b3257216b177b75f1d0185813e105d8ebb4831fde4 SHA512 11d02ec1613b288c01dc65837653b396fd076335c748be691cbb2de5ffff30951652251c065b06595d6db55d7854e06a1702a14e5f1dc0a01eecf7a3018c43f1
 MISC metadata.xml 372 BLAKE2B 8e18e03d14e17a6a5d8c6b7bdb0d87ef6aec8530e203edc579a66b0c6ba0809bbddf4d68943281483ed841daa18a87ee13bed427162e40cd6c2fe3c45b0ec4fb SHA512 07bd140cd5152ccf7e9c39a0ad45a9361b56306b773176155fceaee3dbfa4645d74dba5a21a131f0221419aed5a9aeed4a5aef7c4eec2750c803e11c96621b02
diff --git a/app-admin/vault/vault-1.8.2.ebuild b/app-admin/vault/vault-1.8.2.ebuild
deleted file mode 100644
index 8957da4edc80..000000000000
--- a/app-admin/vault/vault-1.8.2.ebuild
+++ /dev/null
@@ -1,1827 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-EGO_SUM=(
-"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
-"cloud.google.com/go v0.26.0/go.mod"
-"cloud.google.com/go v0.34.0/go.mod"
-"cloud.google.com/go v0.38.0/go.mod"
-"cloud.google.com/go v0.39.0/go.mod"
-"cloud.google.com/go v0.44.1/go.mod"
-"cloud.google.com/go v0.44.2/go.mod"
-"cloud.google.com/go v0.45.1/go.mod"
-"cloud.google.com/go v0.46.3/go.mod"
-"cloud.google.com/go v0.50.0/go.mod"
-"cloud.google.com/go v0.52.0/go.mod"
-"cloud.google.com/go v0.53.0/go.mod"
-"cloud.google.com/go v0.54.0/go.mod"
-"cloud.google.com/go v0.56.0"
-"cloud.google.com/go v0.56.0/go.mod"
-"cloud.google.com/go/bigquery v1.0.1/go.mod"
-"cloud.google.com/go/bigquery v1.3.0/go.mod"
-"cloud.google.com/go/bigquery v1.4.0/go.mod"
-"cloud.google.com/go/bigquery v1.5.0/go.mod"
-"cloud.google.com/go/bigquery v1.6.0"
-"cloud.google.com/go/bigquery v1.6.0/go.mod"
-"cloud.google.com/go/datastore v1.0.0/go.mod"
-"cloud.google.com/go/datastore v1.1.0"
-"cloud.google.com/go/datastore v1.1.0/go.mod"
-"cloud.google.com/go/pubsub v1.0.1/go.mod"
-"cloud.google.com/go/pubsub v1.1.0/go.mod"
-"cloud.google.com/go/pubsub v1.2.0/go.mod"
-"cloud.google.com/go/pubsub v1.3.1"
-"cloud.google.com/go/pubsub v1.3.1/go.mod"
-"cloud.google.com/go/spanner v1.5.1"
-"cloud.google.com/go/spanner v1.5.1/go.mod"
-"cloud.google.com/go/storage v1.0.0/go.mod"
-"cloud.google.com/go/storage v1.5.0/go.mod"
-"cloud.google.com/go/storage v1.6.0"
-"cloud.google.com/go/storage v1.6.0/go.mod"
-"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f"
-"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod"
-"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
-"git.apache.org/thrift.git v0.12.0/go.mod"
-"github.com/Azure/azure-pipeline-go v0.2.3"
-"github.com/Azure/azure-pipeline-go v0.2.3/go.mod"
-"github.com/Azure/azure-sdk-for-go v36.2.0+incompatible/go.mod"
-"github.com/Azure/azure-sdk-for-go v44.0.0+incompatible/go.mod"
-"github.com/Azure/azure-sdk-for-go v51.1.0+incompatible"
-"github.com/Azure/azure-sdk-for-go v51.1.0+incompatible/go.mod"
-"github.com/Azure/azure-storage-blob-go v0.13.0"
-"github.com/Azure/azure-storage-blob-go v0.13.0/go.mod"
-"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
-"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
-"github.com/Azure/go-autorest v14.2.0+incompatible"
-"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.2/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
-"github.com/Azure/go-autorest/autorest v0.10.1/go.mod"
-"github.com/Azure/go-autorest/autorest v0.11.0/go.mod"
-"github.com/Azure/go-autorest/autorest v0.11.17"
-"github.com/Azure/go-autorest/autorest v0.11.17/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.6.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.7.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.9.2/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.9.11"
-"github.com/Azure/go-autorest/autorest/adal v0.9.11/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/auth v0.4.0/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/auth v0.5.0/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/auth v0.5.7"
-"github.com/Azure/go-autorest/autorest/azure/auth v0.5.7/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/cli v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2"
-"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.3.0"
-"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
-"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
-"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/to v0.4.0"
-"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
-"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/validation v0.3.1"
-"github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod"
-"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-"github.com/Azure/go-autorest/logger v0.2.0"
-"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
-"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-"github.com/Azure/go-autorest/tracing v0.6.0"
-"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
-"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
-"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
-"github.com/BurntSushi/toml v0.3.1"
-"github.com/BurntSushi/toml v0.3.1/go.mod"
-"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
-"github.com/DataDog/datadog-go v3.2.0+incompatible"
-"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
-"github.com/Jeffail/gabs v1.1.1"
-"github.com/Jeffail/gabs v1.1.1/go.mod"
-"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod"
-"github.com/Masterminds/goutils v1.1.0"
-"github.com/Masterminds/goutils v1.1.0/go.mod"
-"github.com/Masterminds/semver v1.4.2/go.mod"
-"github.com/Masterminds/semver v1.5.0"
-"github.com/Masterminds/semver v1.5.0/go.mod"
-"github.com/Masterminds/sprig v2.22.0+incompatible"
-"github.com/Masterminds/sprig v2.22.0+incompatible/go.mod"
-"github.com/Microsoft/go-winio v0.4.13/go.mod"
-"github.com/Microsoft/go-winio v0.4.14/go.mod"
-"github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331"
-"github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod"
-"github.com/Microsoft/hcsshim v0.8.14"
-"github.com/Microsoft/hcsshim v0.8.14/go.mod"
-"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-"github.com/NYTimes/gziphandler v1.1.1"
-"github.com/NYTimes/gziphandler v1.1.1/go.mod"
-"github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5"
-"github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod"
-"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-"github.com/SAP/go-hdb v0.14.1"
-"github.com/SAP/go-hdb v0.14.1/go.mod"
-"github.com/Sectorbob/mlab-ns2 v0.0.0-20171030222938-d3aa0c295a8a"
-"github.com/Sectorbob/mlab-ns2 v0.0.0-20171030222938-d3aa0c295a8a/go.mod"
-"github.com/Shopify/sarama v1.19.0/go.mod"
-"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
-"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
-"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
-"github.com/VividCortex/gohistogram v1.0.0/go.mod"
-"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
-"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
-"github.com/aerospike/aerospike-client-go v3.1.1+incompatible"
-"github.com/aerospike/aerospike-client-go v3.1.1+incompatible/go.mod"
-"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod"
-"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
-"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190412020505-60e2075261b6/go.mod"
-"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190620160927-9418d7b0cd0f"
-"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190620160927-9418d7b0cd0f/go.mod"
-"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5"
-"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod"
-"github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230"
-"github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230/go.mod"
-"github.com/apache/thrift v0.12.0/go.mod"
-"github.com/apache/thrift v0.13.0/go.mod"
-"github.com/apple/foundationdb/bindings/go v0.0.0-20190411004307-cd5c9d91fad2"
-"github.com/apple/foundationdb/bindings/go v0.0.0-20190411004307-cd5c9d91fad2/go.mod"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
-"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
-"github.com/armon/go-metrics v0.3.0/go.mod"
-"github.com/armon/go-metrics v0.3.3/go.mod"
-"github.com/armon/go-metrics v0.3.4/go.mod"
-"github.com/armon/go-metrics v0.3.7"
-"github.com/armon/go-metrics v0.3.7/go.mod"
-"github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a"
-"github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a/go.mod"
-"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-"github.com/armon/go-radix v1.0.0"
-"github.com/armon/go-radix v1.0.0/go.mod"
-"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
-"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf"
-"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
-"github.com/aws/aws-lambda-go v1.13.3/go.mod"
-"github.com/aws/aws-sdk-go v1.25.41/go.mod"
-"github.com/aws/aws-sdk-go v1.27.0/go.mod"
-"github.com/aws/aws-sdk-go v1.30.27/go.mod"
-"github.com/aws/aws-sdk-go v1.34.28/go.mod"
-"github.com/aws/aws-sdk-go v1.37.19"
-"github.com/aws/aws-sdk-go v1.37.19/go.mod"
-"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
-"github.com/aws/aws-sdk-go-v2 v1.3.2"
-"github.com/aws/aws-sdk-go-v2 v1.3.2/go.mod"
-"github.com/aws/aws-sdk-go-v2/config v1.1.5"
-"github.com/aws/aws-sdk-go-v2/config v1.1.5/go.mod"
-"github.com/aws/aws-sdk-go-v2/credentials v1.1.5"
-"github.com/aws/aws-sdk-go-v2/credentials v1.1.5/go.mod"
-"github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6"
-"github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6/go.mod"
-"github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.1.2"
-"github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.1.2/go.mod"
-"github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.4"
-"github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.4/go.mod"
-"github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.6"
-"github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.6/go.mod"
-"github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2"
-"github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2/go.mod"
-"github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0"
-"github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0/go.mod"
-"github.com/aws/aws-sdk-go-v2/service/sso v1.1.5"
-"github.com/aws/aws-sdk-go-v2/service/sso v1.1.5/go.mod"
-"github.com/aws/aws-sdk-go-v2/service/sts v1.2.2"
-"github.com/aws/aws-sdk-go-v2/service/sts v1.2.2/go.mod"
-"github.com/aws/smithy-go v1.3.1"
-"github.com/aws/smithy-go v1.3.1/go.mod"
-"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
-"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-"github.com/beorn7/perks v1.0.0/go.mod"
-"github.com/beorn7/perks v1.0.1"
-"github.com/beorn7/perks v1.0.1/go.mod"
-"github.com/bgentry/speakeasy v0.1.0"
-"github.com/bgentry/speakeasy v0.1.0/go.mod"
-"github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod"
-"github.com/bitly/go-hostpool v0.1.0"
-"github.com/bitly/go-hostpool v0.1.0/go.mod"
-"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869"
-"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
-"github.com/boltdb/bolt v1.3.1/go.mod"
-"github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc"
-"github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod"
-"github.com/briankassouf/jose v0.9.2-0.20180619214549-d2569464773f"
-"github.com/briankassouf/jose v0.9.2-0.20180619214549-d2569464773f/go.mod"
-"github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee/go.mod"
-"github.com/casbin/casbin/v2 v2.1.2/go.mod"
-"github.com/cenkalti/backoff v2.2.1+incompatible"
-"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
-"github.com/cenkalti/backoff/v3 v3.0.0"
-"github.com/cenkalti/backoff/v3 v3.0.0/go.mod"
-"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-"github.com/centrify/cloud-golang-sdk v0.0.0-20190214225812-119110094d0f"
-"github.com/centrify/cloud-golang-sdk v0.0.0-20190214225812-119110094d0f/go.mod"
-"github.com/cespare/xxhash v1.1.0"
-"github.com/cespare/xxhash v1.1.0/go.mod"
-"github.com/cespare/xxhash/v2 v2.1.1"
-"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-"github.com/chrismalek/oktasdk-go v0.0.0-20181212195951-3430665dfaa0"
-"github.com/chrismalek/oktasdk-go v0.0.0-20181212195951-3430665dfaa0/go.mod"
-"github.com/chzyer/logex v1.1.10/go.mod"
-"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-"github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod"
-"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
-"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
-"github.com/circonus-labs/circonusllhist v0.1.3"
-"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
-"github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
-"github.com/client9/misspell v0.3.4"
-"github.com/client9/misspell v0.3.4/go.mod"
-"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190201205600-f136f9222381"
-"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190201205600-f136f9222381/go.mod"
-"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
-"github.com/cockroachdb/apd v1.1.0"
-"github.com/cockroachdb/apd v1.1.0/go.mod"
-"github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c"
-"github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c/go.mod"
-"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
-"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
-"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
-"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0"
-"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
-"github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod"
-"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
-"github.com/containerd/containerd v1.3.2/go.mod"
-"github.com/containerd/containerd v1.4.3"
-"github.com/containerd/containerd v1.4.3/go.mod"
-"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
-"github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod"
-"github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe"
-"github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod"
-"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
-"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
-"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
-"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
-"github.com/coreos/bbolt v1.3.2/go.mod"
-"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
-"github.com/coreos/go-oidc v2.2.1+incompatible"
-"github.com/coreos/go-oidc v2.2.1+incompatible/go.mod"
-"github.com/coreos/go-oidc/v3 v3.0.0"
-"github.com/coreos/go-oidc/v3 v3.0.0/go.mod"
-"github.com/coreos/go-semver v0.2.0"
-"github.com/coreos/go-semver v0.2.0/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf"
-"github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod"
-"github.com/coreos/go-systemd/v22 v22.0.0"
-"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
-"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
-"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-"github.com/couchbase/gocb/v2 v2.1.4"
-"github.com/couchbase/gocb/v2 v2.1.4/go.mod"
-"github.com/couchbase/gocbcore/v9 v9.0.4"
-"github.com/couchbase/gocbcore/v9 v9.0.4/go.mod"
-"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
-"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
-"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-"github.com/creack/pty v1.1.7/go.mod"
-"github.com/creack/pty v1.1.9"
-"github.com/creack/pty v1.1.9/go.mod"
-"github.com/davecgh/go-spew v1.1.0/go.mod"
-"github.com/davecgh/go-spew v1.1.1"
-"github.com/davecgh/go-spew v1.1.1/go.mod"
-"github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc"
-"github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod"
-"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
-"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
-"github.com/digitalocean/godo v1.7.5"
-"github.com/digitalocean/godo v1.7.5/go.mod"
-"github.com/dimchansky/utfbom v1.1.0/go.mod"
-"github.com/dimchansky/utfbom v1.1.1"
-"github.com/dimchansky/utfbom v1.1.1/go.mod"
-"github.com/dnaeon/go-vcr v1.0.1"
-"github.com/dnaeon/go-vcr v1.0.1/go.mod"
-"github.com/docker/distribution v2.7.1+incompatible"
-"github.com/docker/distribution v2.7.1+incompatible/go.mod"
-"github.com/docker/docker v1.4.2-0.20200319182547-c7ad2b866182/go.mod"
-"github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible"
-"github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible/go.mod"
-"github.com/docker/go-connections v0.4.0"
-"github.com/docker/go-connections v0.4.0/go.mod"
-"github.com/docker/go-units v0.3.3/go.mod"
-"github.com/docker/go-units v0.4.0"
-"github.com/docker/go-units v0.4.0/go.mod"
-"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-"github.com/dsnet/compress v0.0.1"
-"github.com/dsnet/compress v0.0.1/go.mod"
-"github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod"
-"github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74"
-"github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74/go.mod"
-"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
-"github.com/dustin/go-humanize v1.0.0"
-"github.com/dustin/go-humanize v1.0.0/go.mod"
-"github.com/eapache/go-resiliency v1.1.0/go.mod"
-"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
-"github.com/eapache/queue v1.1.0/go.mod"
-"github.com/edsrzf/mmap-go v1.0.0/go.mod"
-"github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f"
-"github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f/go.mod"
-"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
-"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
-"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
-"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-"github.com/fatih/color v1.7.0/go.mod"
-"github.com/fatih/color v1.9.0/go.mod"
-"github.com/fatih/color v1.11.0"
-"github.com/fatih/color v1.11.0/go.mod"
-"github.com/fatih/structs v1.1.0"
-"github.com/fatih/structs v1.1.0/go.mod"
-"github.com/form3tech-oss/jwt-go v3.2.2+incompatible"
-"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
-"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
-"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
-"github.com/frankban/quicktest v1.4.0/go.mod"
-"github.com/frankban/quicktest v1.4.1/go.mod"
-"github.com/frankban/quicktest v1.10.0/go.mod"
-"github.com/frankban/quicktest v1.13.0"
-"github.com/frankban/quicktest v1.13.0/go.mod"
-"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-"github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7"
-"github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7/go.mod"
-"github.com/gammazero/workerpool v0.0.0-20190406235159-88d534f22b56"
-"github.com/gammazero/workerpool v0.0.0-20190406235159-88d534f22b56/go.mod"
-"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-"github.com/ghodss/yaml v1.0.0/go.mod"
-"github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32"
-"github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod"
-"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
-"github.com/go-asn1-ber/asn1-ber v1.4.1/go.mod"
-"github.com/go-asn1-ber/asn1-ber v1.5.1"
-"github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod"
-"github.com/go-errors/errors v1.0.1"
-"github.com/go-errors/errors v1.0.1/go.mod"
-"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
-"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
-"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
-"github.com/go-kit/kit v0.8.0/go.mod"
-"github.com/go-kit/kit v0.9.0/go.mod"
-"github.com/go-kit/kit v0.10.0/go.mod"
-"github.com/go-ldap/ldap/v3 v3.1.3/go.mod"
-"github.com/go-ldap/ldap/v3 v3.1.7/go.mod"
-"github.com/go-ldap/ldap/v3 v3.1.10/go.mod"
-"github.com/go-ldap/ldap/v3 v3.2.4"
-"github.com/go-ldap/ldap/v3 v3.2.4/go.mod"
-"github.com/go-ldap/ldif v0.0.0-20200320164324-fd88d9b715b3"
-"github.com/go-ldap/ldif v0.0.0-20200320164324-fd88d9b715b3/go.mod"
-"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-"github.com/go-logfmt/logfmt v0.5.0/go.mod"
-"github.com/go-logr/logr v0.1.0/go.mod"
-"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab"
-"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
-"github.com/go-ole/go-ole v1.2.4"
-"github.com/go-ole/go-ole v1.2.4/go.mod"
-"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-"github.com/go-sql-driver/mysql v1.4.0/go.mod"
-"github.com/go-sql-driver/mysql v1.5.0"
-"github.com/go-sql-driver/mysql v1.5.0/go.mod"
-"github.com/go-stack/stack v1.8.0"
-"github.com/go-stack/stack v1.8.0/go.mod"
-"github.com/go-test/deep v1.0.1/go.mod"
-"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
-"github.com/go-test/deep v1.0.2/go.mod"
-"github.com/go-test/deep v1.0.7"
-"github.com/go-test/deep v1.0.7/go.mod"
-"github.com/go-yaml/yaml v2.1.0+incompatible"
-"github.com/go-yaml/yaml v2.1.0+incompatible/go.mod"
-"github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod"
-"github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod"
-"github.com/gobuffalo/depgen v0.1.0/go.mod"
-"github.com/gobuffalo/envy v1.6.15/go.mod"
-"github.com/gobuffalo/envy v1.7.0/go.mod"
-"github.com/gobuffalo/flect v0.1.0/go.mod"
-"github.com/gobuffalo/flect v0.1.1/go.mod"
-"github.com/gobuffalo/flect v0.1.3/go.mod"
-"github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod"
-"github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod"
-"github.com/gobuffalo/genny v0.1.0/go.mod"
-"github.com/gobuffalo/genny v0.1.1/go.mod"
-"github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod"
-"github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod"
-"github.com/gobuffalo/gogen v0.1.0/go.mod"
-"github.com/gobuffalo/gogen v0.1.1/go.mod"
-"github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod"
-"github.com/gobuffalo/mapi v1.0.1/go.mod"
-"github.com/gobuffalo/mapi v1.0.2/go.mod"
-"github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod"
-"github.com/gobuffalo/packd v0.1.0/go.mod"
-"github.com/gobuffalo/packr/v2 v2.0.9/go.mod"
-"github.com/gobuffalo/packr/v2 v2.2.0/go.mod"
-"github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod"
-"github.com/gocql/gocql v0.0.0-20210401103645-80ab1e13e309"
-"github.com/gocql/gocql v0.0.0-20210401103645-80ab1e13e309/go.mod"
-"github.com/godbus/dbus/v5 v5.0.3/go.mod"
-"github.com/gogo/googleapis v1.1.0/go.mod"
-"github.com/gogo/protobuf v1.1.1/go.mod"
-"github.com/gogo/protobuf v1.2.0/go.mod"
-"github.com/gogo/protobuf v1.2.1/go.mod"
-"github.com/gogo/protobuf v1.3.1"
-"github.com/gogo/protobuf v1.3.1/go.mod"
-"github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod"
-"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe"
-"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
-"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
-"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
-"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
-"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
-"github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
-"github.com/golang/mock v1.1.1/go.mod"
-"github.com/golang/mock v1.2.0/go.mod"
-"github.com/golang/mock v1.3.1/go.mod"
-"github.com/golang/mock v1.4.0/go.mod"
-"github.com/golang/mock v1.4.1/go.mod"
-"github.com/golang/mock v1.4.3"
-"github.com/golang/mock v1.4.3/go.mod"
-"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-"github.com/golang/protobuf v1.2.0/go.mod"
-"github.com/golang/protobuf v1.3.1/go.mod"
-"github.com/golang/protobuf v1.3.2/go.mod"
-"github.com/golang/protobuf v1.3.3/go.mod"
-"github.com/golang/protobuf v1.3.4/go.mod"
-"github.com/golang/protobuf v1.3.5/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-"github.com/golang/protobuf v1.4.0/go.mod"
-"github.com/golang/protobuf v1.4.1/go.mod"
-"github.com/golang/protobuf v1.4.2"
-"github.com/golang/protobuf v1.4.2/go.mod"
-"github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod"
-"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
-"github.com/golang/snappy v0.0.1/go.mod"
-"github.com/golang/snappy v0.0.2/go.mod"
-"github.com/golang/snappy v0.0.4"
-"github.com/golang/snappy v0.0.4/go.mod"
-"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-"github.com/google/btree v1.0.0"
-"github.com/google/btree v1.0.0/go.mod"
-"github.com/google/flatbuffers v1.11.0"
-"github.com/google/flatbuffers v1.11.0/go.mod"
-"github.com/google/go-cmp v0.2.0/go.mod"
-"github.com/google/go-cmp v0.3.0/go.mod"
-"github.com/google/go-cmp v0.3.1/go.mod"
-"github.com/google/go-cmp v0.4.0/go.mod"
-"github.com/google/go-cmp v0.5.0/go.mod"
-"github.com/google/go-cmp v0.5.2/go.mod"
-"github.com/google/go-cmp v0.5.4/go.mod"
-"github.com/google/go-cmp v0.5.5"
-"github.com/google/go-cmp v0.5.5/go.mod"
-"github.com/google/go-github v17.0.0+incompatible"
-"github.com/google/go-github v17.0.0+incompatible/go.mod"
-"github.com/google/go-metrics-stackdriver v0.2.0"
-"github.com/google/go-metrics-stackdriver v0.2.0/go.mod"
-"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
-"github.com/google/go-querystring v1.0.0"
-"github.com/google/go-querystring v1.0.0/go.mod"
-"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
-"github.com/google/gofuzz v1.0.0/go.mod"
-"github.com/google/gofuzz v1.1.0"
-"github.com/google/gofuzz v1.1.0/go.mod"
-"github.com/google/martian v2.1.0+incompatible"
-"github.com/google/martian v2.1.0+incompatible/go.mod"
-"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
-"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
-"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
-"github.com/google/renameio v0.1.0/go.mod"
-"github.com/google/uuid v1.0.0/go.mod"
-"github.com/google/uuid v1.1.1/go.mod"
-"github.com/google/uuid v1.1.2"
-"github.com/google/uuid v1.1.2/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.5"
-"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-"github.com/googleapis/gnostic v0.1.0/go.mod"
-"github.com/googleapis/gnostic v0.2.0"
-"github.com/googleapis/gnostic v0.2.0/go.mod"
-"github.com/gophercloud/gophercloud v0.1.0"
-"github.com/gophercloud/gophercloud v0.1.0/go.mod"
-"github.com/gopherjs/gopherjs v0.0.0-20180628210949-0892b62f0d9f/go.mod"
-"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-"github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75"
-"github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod"
-"github.com/gorilla/context v1.1.1/go.mod"
-"github.com/gorilla/mux v1.6.2/go.mod"
-"github.com/gorilla/mux v1.7.3"
-"github.com/gorilla/mux v1.7.3/go.mod"
-"github.com/gorilla/securecookie v1.1.1"
-"github.com/gorilla/securecookie v1.1.1/go.mod"
-"github.com/gorilla/sessions v1.2.0"
-"github.com/gorilla/sessions v1.2.0/go.mod"
-"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
-"github.com/gorilla/websocket v1.4.0/go.mod"
-"github.com/gorilla/websocket v1.4.1"
-"github.com/gorilla/websocket v1.4.1/go.mod"
-"github.com/gotestyourself/gotestyourself v2.2.0+incompatible"
-"github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod"
-"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
-"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
-"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-"github.com/grpc-ecosystem/grpc-gateway v1.6.2/go.mod"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.5"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
-"github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed"
-"github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod"
-"github.com/hashicorp/cap v0.1.0"
-"github.com/hashicorp/cap v0.1.0/go.mod"
-"github.com/hashicorp/consul-template v0.26.0"
-"github.com/hashicorp/consul-template v0.26.0/go.mod"
-"github.com/hashicorp/consul/api v1.3.0/go.mod"
-"github.com/hashicorp/consul/api v1.4.0"
-"github.com/hashicorp/consul/api v1.4.0/go.mod"
-"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
-"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
-"github.com/hashicorp/consul/sdk v0.4.0/go.mod"
-"github.com/hashicorp/consul/sdk v0.4.1-0.20200910203702-bb2b5dd871ca"
-"github.com/hashicorp/consul/sdk v0.4.1-0.20200910203702-bb2b5dd871ca/go.mod"
-"github.com/hashicorp/errwrap v1.0.0/go.mod"
-"github.com/hashicorp/errwrap v1.1.0"
-"github.com/hashicorp/errwrap v1.1.0/go.mod"
-"github.com/hashicorp/go-bindata v3.0.8-0.20180209072458-bf7910af8997+incompatible"
-"github.com/hashicorp/go-bindata v3.0.8-0.20180209072458-bf7910af8997+incompatible/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.2"
-"github.com/hashicorp/go-cleanhttp v0.5.2/go.mod"
-"github.com/hashicorp/go-discover v0.0.0-20201029210230-738cb3105cd0"
-"github.com/hashicorp/go-discover v0.0.0-20201029210230-738cb3105cd0/go.mod"
-"github.com/hashicorp/go-gatedio v0.5.0"
-"github.com/hashicorp/go-gatedio v0.5.0/go.mod"
-"github.com/hashicorp/go-gcp-common v0.5.0/go.mod"
-"github.com/hashicorp/go-gcp-common v0.7.0"
-"github.com/hashicorp/go-gcp-common v0.7.0/go.mod"
-"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-"github.com/hashicorp/go-hclog v0.8.0/go.mod"
-"github.com/hashicorp/go-hclog v0.9.1/go.mod"
-"github.com/hashicorp/go-hclog v0.9.2/go.mod"
-"github.com/hashicorp/go-hclog v0.12.0/go.mod"
-"github.com/hashicorp/go-hclog v0.14.1/go.mod"
-"github.com/hashicorp/go-hclog v0.15.0/go.mod"
-"github.com/hashicorp/go-hclog v0.16.1"
-"github.com/hashicorp/go-hclog v0.16.1/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.3.0"
-"github.com/hashicorp/go-immutable-radix v1.3.0/go.mod"
-"github.com/hashicorp/go-kms-wrapping v0.5.16"
-"github.com/hashicorp/go-kms-wrapping v0.5.16/go.mod"
-"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0"
-"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod"
-"github.com/hashicorp/go-memdb v1.0.2"
-"github.com/hashicorp/go-memdb v1.0.2/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
-"github.com/hashicorp/go-msgpack v1.1.5"
-"github.com/hashicorp/go-msgpack v1.1.5/go.mod"
-"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-"github.com/hashicorp/go-multierror v1.1.1"
-"github.com/hashicorp/go-multierror v1.1.1/go.mod"
-"github.com/hashicorp/go-plugin v1.0.1"
-"github.com/hashicorp/go-plugin v1.0.1/go.mod"
-"github.com/hashicorp/go-raftchunking v0.6.3-0.20191002164813-7e9e8525653a"
-"github.com/hashicorp/go-raftchunking v0.6.3-0.20191002164813-7e9e8525653a/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.6.7"
-"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod"
-"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
-"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
-"github.com/hashicorp/go-rootcerts v1.0.2"
-"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
-"github.com/hashicorp/go-secure-stdlib/strutil v0.1.1"
-"github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod"
-"github.com/hashicorp/go-slug v0.4.1"
-"github.com/hashicorp/go-slug v0.4.1/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.2"
-"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
-"github.com/hashicorp/go-syslog v1.0.0"
-"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-"github.com/hashicorp/go-tfe v0.12.0"
-"github.com/hashicorp/go-tfe v0.12.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-"github.com/hashicorp/go-uuid v1.0.2"
-"github.com/hashicorp/go-uuid v1.0.2/go.mod"
-"github.com/hashicorp/go-version v1.0.0/go.mod"
-"github.com/hashicorp/go-version v1.2.0/go.mod"
-"github.com/hashicorp/go-version v1.2.1"
-"github.com/hashicorp/go-version v1.2.1/go.mod"
-"github.com/hashicorp/go.net v0.0.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.3/go.mod"
-"github.com/hashicorp/golang-lru v0.5.4"
-"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-"github.com/hashicorp/hcl v1.0.0/go.mod"
-"github.com/hashicorp/hcl v1.0.1-vault-3"
-"github.com/hashicorp/hcl v1.0.1-vault-3/go.mod"
-"github.com/hashicorp/logutils v1.0.0"
-"github.com/hashicorp/logutils v1.0.0/go.mod"
-"github.com/hashicorp/mdns v1.0.0/go.mod"
-"github.com/hashicorp/mdns v1.0.1"
-"github.com/hashicorp/mdns v1.0.1/go.mod"
-"github.com/hashicorp/memberlist v0.1.3/go.mod"
-"github.com/hashicorp/memberlist v0.2.2"
-"github.com/hashicorp/memberlist v0.2.2/go.mod"
-"github.com/hashicorp/nomad/api v0.0.0-20191220223628-edc62acd919d"
-"github.com/hashicorp/nomad/api v0.0.0-20191220223628-edc62acd919d/go.mod"
-"github.com/hashicorp/raft v1.0.1/go.mod"
-"github.com/hashicorp/raft v1.1.0/go.mod"
-"github.com/hashicorp/raft v1.1.2-0.20191002163536-9c6bd3e3eb17/go.mod"
-"github.com/hashicorp/raft v1.2.0/go.mod"
-"github.com/hashicorp/raft v1.3.0"
-"github.com/hashicorp/raft v1.3.0/go.mod"
-"github.com/hashicorp/raft-autopilot v0.1.3"
-"github.com/hashicorp/raft-autopilot v0.1.3/go.mod"
-"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
-"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
-"github.com/hashicorp/raft-boltdb/v2 v2.0.0-20210421194847-a7e34179d62c"
-"github.com/hashicorp/raft-boltdb/v2 v2.0.0-20210421194847-a7e34179d62c/go.mod"
-"github.com/hashicorp/raft-snapshot v1.0.3"
-"github.com/hashicorp/raft-snapshot v1.0.3/go.mod"
-"github.com/hashicorp/serf v0.8.2/go.mod"
-"github.com/hashicorp/serf v0.9.4/go.mod"
-"github.com/hashicorp/serf v0.9.5"
-"github.com/hashicorp/serf v0.9.5/go.mod"
-"github.com/hashicorp/vault-plugin-auth-alicloud v0.9.0"
-"github.com/hashicorp/vault-plugin-auth-alicloud v0.9.0/go.mod"
-"github.com/hashicorp/vault-plugin-auth-azure v0.8.0"
-"github.com/hashicorp/vault-plugin-auth-azure v0.8.0/go.mod"
-"github.com/hashicorp/vault-plugin-auth-centrify v0.9.0"
-"github.com/hashicorp/vault-plugin-auth-centrify v0.9.0/go.mod"
-"github.com/hashicorp/vault-plugin-auth-cf v0.9.0"
-"github.com/hashicorp/vault-plugin-auth-cf v0.9.0/go.mod"
-"github.com/hashicorp/vault-plugin-auth-gcp v0.5.1/go.mod"
-"github.com/hashicorp/vault-plugin-auth-gcp v0.10.0"
-"github.com/hashicorp/vault-plugin-auth-gcp v0.10.0/go.mod"
-"github.com/hashicorp/vault-plugin-auth-jwt v0.10.1"
-"github.com/hashicorp/vault-plugin-auth-jwt v0.10.1/go.mod"
-"github.com/hashicorp/vault-plugin-auth-kerberos v0.4.0"
-"github.com/hashicorp/vault-plugin-auth-kerberos v0.4.0/go.mod"
-"github.com/hashicorp/vault-plugin-auth-kubernetes v0.10.1"
-"github.com/hashicorp/vault-plugin-auth-kubernetes v0.10.1/go.mod"
-"github.com/hashicorp/vault-plugin-auth-oci v0.8.0"
-"github.com/hashicorp/vault-plugin-auth-oci v0.8.0/go.mod"
-"github.com/hashicorp/vault-plugin-database-couchbase v0.4.1"
-"github.com/hashicorp/vault-plugin-database-couchbase v0.4.1/go.mod"
-"github.com/hashicorp/vault-plugin-database-elasticsearch v0.8.0"
-"github.com/hashicorp/vault-plugin-database-elasticsearch v0.8.0/go.mod"
-"github.com/hashicorp/vault-plugin-database-mongodbatlas v0.4.0"
-"github.com/hashicorp/vault-plugin-database-mongodbatlas v0.4.0/go.mod"
-"github.com/hashicorp/vault-plugin-database-snowflake v0.2.1"
-"github.com/hashicorp/vault-plugin-database-snowflake v0.2.1/go.mod"
-"github.com/hashicorp/vault-plugin-mock v0.16.1"
-"github.com/hashicorp/vault-plugin-mock v0.16.1/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-ad v0.10.0"
-"github.com/hashicorp/vault-plugin-secrets-ad v0.10.0/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-alicloud v0.9.0"
-"github.com/hashicorp/vault-plugin-secrets-alicloud v0.9.0/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-azure v0.10.0"
-"github.com/hashicorp/vault-plugin-secrets-azure v0.10.0/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-gcp v0.10.2"
-"github.com/hashicorp/vault-plugin-secrets-gcp v0.10.2/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-gcpkms v0.9.0"
-"github.com/hashicorp/vault-plugin-secrets-gcpkms v0.9.0/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-kv v0.9.0"
-"github.com/hashicorp/vault-plugin-secrets-kv v0.9.0/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.4.0"
-"github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.4.0/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-openldap v0.5.1"
-"github.com/hashicorp/vault-plugin-secrets-openldap v0.5.1/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-terraform v0.2.0"
-"github.com/hashicorp/vault-plugin-secrets-terraform v0.2.0/go.mod"
-"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
-"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
-"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
-"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
-"github.com/hpcloud/tail v1.0.0"
-"github.com/hpcloud/tail v1.0.0/go.mod"
-"github.com/huandu/xstrings v1.3.2"
-"github.com/huandu/xstrings v1.3.2/go.mod"
-"github.com/huaweicloud/golangsdk v0.0.0-20200304081349-45ec0797f2a4/go.mod"
-"github.com/hudl/fargo v1.3.0/go.mod"
-"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
-"github.com/imdario/mergo v0.3.5/go.mod"
-"github.com/imdario/mergo v0.3.6/go.mod"
-"github.com/imdario/mergo v0.3.11"
-"github.com/imdario/mergo v0.3.11/go.mod"
-"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-"github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4"
-"github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4/go.mod"
-"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
-"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733"
-"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
-"github.com/jackc/pgx v3.3.0+incompatible"
-"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
-"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
-"github.com/jarcoal/httpmock v1.0.4/go.mod"
-"github.com/jarcoal/httpmock v1.0.5"
-"github.com/jarcoal/httpmock v1.0.5/go.mod"
-"github.com/jcmturner/aescts v1.0.1"
-"github.com/jcmturner/aescts v1.0.1/go.mod"
-"github.com/jcmturner/dnsutils v1.0.1"
-"github.com/jcmturner/dnsutils v1.0.1/go.mod"
-"github.com/jcmturner/gofork v1.0.0"
-"github.com/jcmturner/gofork v1.0.0/go.mod"
-"github.com/jcmturner/goidentity/v6 v6.0.1"
-"github.com/jcmturner/goidentity/v6 v6.0.1/go.mod"
-"github.com/jcmturner/gokrb5/v8 v8.0.0"
-"github.com/jcmturner/gokrb5/v8 v8.0.0/go.mod"
-"github.com/jcmturner/rpc/v2 v2.0.2"
-"github.com/jcmturner/rpc/v2 v2.0.2/go.mod"
-"github.com/jeffchao/backoff v0.0.0-20140404060208-9d7fd7aa17f2"
-"github.com/jeffchao/backoff v0.0.0-20140404060208-9d7fd7aa17f2/go.mod"
-"github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f"
-"github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f/go.mod"
-"github.com/jefferai/jsonx v1.0.0"
-"github.com/jefferai/jsonx v1.0.0/go.mod"
-"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-"github.com/jmespath/go-jmespath v0.3.0/go.mod"
-"github.com/jmespath/go-jmespath v0.4.0"
-"github.com/jmespath/go-jmespath v0.4.0/go.mod"
-"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
-"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
-"github.com/joho/godotenv v1.3.0/go.mod"
-"github.com/jonboulle/clockwork v0.1.0"
-"github.com/jonboulle/clockwork v0.1.0/go.mod"
-"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
-"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
-"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
-"github.com/jpillora/backoff v1.0.0/go.mod"
-"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
-"github.com/json-iterator/go v1.1.5/go.mod"
-"github.com/json-iterator/go v1.1.6/go.mod"
-"github.com/json-iterator/go v1.1.7/go.mod"
-"github.com/json-iterator/go v1.1.8/go.mod"
-"github.com/json-iterator/go v1.1.9/go.mod"
-"github.com/json-iterator/go v1.1.10"
-"github.com/json-iterator/go v1.1.10/go.mod"
-"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-"github.com/jstemmer/go-junit-report v0.9.1"
-"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
-"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
-"github.com/jtolds/gls v4.20.0+incompatible"
-"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-"github.com/julienschmidt/httprouter v1.3.0/go.mod"
-"github.com/karrick/godirwalk v1.8.0/go.mod"
-"github.com/karrick/godirwalk v1.10.3/go.mod"
-"github.com/kelseyhightower/envconfig v1.3.0/go.mod"
-"github.com/kelseyhightower/envconfig v1.4.0"
-"github.com/kelseyhightower/envconfig v1.4.0/go.mod"
-"github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f"
-"github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f/go.mod"
-"github.com/kisielk/errcheck v1.1.0/go.mod"
-"github.com/kisielk/errcheck v1.2.0/go.mod"
-"github.com/kisielk/gotool v1.0.0/go.mod"
-"github.com/klauspost/compress v1.4.1/go.mod"
-"github.com/klauspost/compress v1.9.5"
-"github.com/klauspost/compress v1.9.5/go.mod"
-"github.com/klauspost/cpuid v1.2.0/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
-"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-"github.com/kr/pretty v0.1.0/go.mod"
-"github.com/kr/pretty v0.2.0/go.mod"
-"github.com/kr/pretty v0.2.1"
-"github.com/kr/pretty v0.2.1/go.mod"
-"github.com/kr/pty v1.1.1/go.mod"
-"github.com/kr/text v0.1.0/go.mod"
-"github.com/kr/text v0.2.0"
-"github.com/kr/text v0.2.0/go.mod"
-"github.com/lestrrat-go/jwx v0.9.0/go.mod"
-"github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod"
-"github.com/lib/pq v1.1.1/go.mod"
-"github.com/lib/pq v1.2.0/go.mod"
-"github.com/lib/pq v1.8.0"
-"github.com/lib/pq v1.8.0/go.mod"
-"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
-"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
-"github.com/linode/linodego v0.7.1"
-"github.com/linode/linodego v0.7.1/go.mod"
-"github.com/lyft/protoc-gen-validate v0.0.13/go.mod"
-"github.com/magiconair/properties v1.8.0/go.mod"
-"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-"github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod"
-"github.com/markbates/safe v1.0.1/go.mod"
-"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11"
-"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod"
-"github.com/mattn/go-colorable v0.0.9/go.mod"
-"github.com/mattn/go-colorable v0.1.4/go.mod"
-"github.com/mattn/go-colorable v0.1.6/go.mod"
-"github.com/mattn/go-colorable v0.1.7/go.mod"
-"github.com/mattn/go-colorable v0.1.8"
-"github.com/mattn/go-colorable v0.1.8/go.mod"
-"github.com/mattn/go-ieproxy v0.0.1"
-"github.com/mattn/go-ieproxy v0.0.1/go.mod"
-"github.com/mattn/go-isatty v0.0.3/go.mod"
-"github.com/mattn/go-isatty v0.0.4/go.mod"
-"github.com/mattn/go-isatty v0.0.8/go.mod"
-"github.com/mattn/go-isatty v0.0.10/go.mod"
-"github.com/mattn/go-isatty v0.0.11/go.mod"
-"github.com/mattn/go-isatty v0.0.12"
-"github.com/mattn/go-isatty v0.0.12/go.mod"
-"github.com/mattn/go-runewidth v0.0.2/go.mod"
-"github.com/mattn/go-runewidth v0.0.3/go.mod"
-"github.com/mattn/go-shellwords v1.0.12"
-"github.com/mattn/go-shellwords v1.0.12/go.mod"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-"github.com/mholt/archiver v3.1.1+incompatible"
-"github.com/mholt/archiver v3.1.1+incompatible/go.mod"
-"github.com/michaelklishin/rabbit-hole v0.0.0-20191008194146-93d9988f0cd5"
-"github.com/michaelklishin/rabbit-hole v0.0.0-20191008194146-93d9988f0cd5/go.mod"
-"github.com/miekg/dns v1.0.14/go.mod"
-"github.com/miekg/dns v1.1.26/go.mod"
-"github.com/miekg/dns v1.1.40"
-"github.com/miekg/dns v1.1.40/go.mod"
-"github.com/mitchellh/cli v1.0.0/go.mod"
-"github.com/mitchellh/cli v1.1.0/go.mod"
-"github.com/mitchellh/cli v1.1.2"
-"github.com/mitchellh/cli v1.1.2/go.mod"
-"github.com/mitchellh/copystructure v1.0.0"
-"github.com/mitchellh/copystructure v1.0.0/go.mod"
-"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-"github.com/mitchellh/go-homedir v1.1.0"
-"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-"github.com/mitchellh/go-testing-interface v1.14.0"
-"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
-"github.com/mitchellh/go-wordwrap v1.0.0"
-"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-"github.com/mitchellh/gox v0.4.0/go.mod"
-"github.com/mitchellh/gox v1.0.1"
-"github.com/mitchellh/gox v1.0.1/go.mod"
-"github.com/mitchellh/hashstructure v1.0.0"
-"github.com/mitchellh/hashstructure v1.0.0/go.mod"
-"github.com/mitchellh/iochan v1.0.0"
-"github.com/mitchellh/iochan v1.0.0/go.mod"
-"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-"github.com/mitchellh/mapstructure v1.2.2/go.mod"
-"github.com/mitchellh/mapstructure v1.3.2/go.mod"
-"github.com/mitchellh/mapstructure v1.3.3"
-"github.com/mitchellh/mapstructure v1.3.3/go.mod"
-"github.com/mitchellh/pointerstructure v1.0.0"
-"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
-"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-"github.com/mitchellh/reflectwalk v1.0.1"
-"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
-"github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2"
-"github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-"github.com/modern-go/reflect2 v1.0.1"
-"github.com/modern-go/reflect2 v1.0.1/go.mod"
-"github.com/mongodb/go-client-mongodb-atlas v0.1.2"
-"github.com/mongodb/go-client-mongodb-atlas v0.1.2/go.mod"
-"github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod"
-"github.com/morikuni/aec v1.0.0"
-"github.com/morikuni/aec v1.0.0/go.mod"
-"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-"github.com/mwielbut/pointy v1.1.0"
-"github.com/mwielbut/pointy v1.1.0/go.mod"
-"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
-"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-"github.com/natefinch/atomic v0.0.0-20150920032501-a62ce929ffcc"
-"github.com/natefinch/atomic v0.0.0-20150920032501-a62ce929ffcc/go.mod"
-"github.com/nats-io/jwt v0.3.0/go.mod"
-"github.com/nats-io/jwt v0.3.2/go.mod"
-"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
-"github.com/nats-io/nats.go v1.9.1/go.mod"
-"github.com/nats-io/nkeys v0.1.0/go.mod"
-"github.com/nats-io/nkeys v0.1.3/go.mod"
-"github.com/nats-io/nuid v1.0.1/go.mod"
-"github.com/ncw/swift v1.0.47"
-"github.com/ncw/swift v1.0.47/go.mod"
-"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
-"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
-"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
-"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
-"github.com/nwaples/rardecode v1.1.0"
-"github.com/nwaples/rardecode v1.1.0/go.mod"
-"github.com/oklog/oklog v0.3.2/go.mod"
-"github.com/oklog/run v1.0.0"
-"github.com/oklog/run v1.0.0/go.mod"
-"github.com/oklog/ulid v1.3.1/go.mod"
-"github.com/okta/okta-sdk-golang v1.1.0"
-"github.com/okta/okta-sdk-golang v1.1.0/go.mod"
-"github.com/okta/okta-sdk-golang/v2 v2.0.0"
-"github.com/okta/okta-sdk-golang/v2 v2.0.0/go.mod"
-"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
-"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
-"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-"github.com/onsi/ginkgo v1.6.0/go.mod"
-"github.com/onsi/ginkgo v1.7.0/go.mod"
-"github.com/onsi/ginkgo v1.8.0/go.mod"
-"github.com/onsi/ginkgo v1.10.1/go.mod"
-"github.com/onsi/ginkgo v1.11.0"
-"github.com/onsi/ginkgo v1.11.0/go.mod"
-"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
-"github.com/onsi/gomega v1.4.3/go.mod"
-"github.com/onsi/gomega v1.5.0/go.mod"
-"github.com/onsi/gomega v1.7.0"
-"github.com/onsi/gomega v1.7.0/go.mod"
-"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
-"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
-"github.com/opencontainers/go-digest v1.0.0-rc1"
-"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
-"github.com/opencontainers/image-spec v1.0.1"
-"github.com/opencontainers/image-spec v1.0.1/go.mod"
-"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
-"github.com/opencontainers/runc v0.1.1/go.mod"
-"github.com/opencontainers/runc v1.0.0-rc9"
-"github.com/opencontainers/runc v1.0.0-rc9/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.2/go.mod"
-"github.com/openlyinc/pointy v1.1.2"
-"github.com/openlyinc/pointy v1.1.2/go.mod"
-"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
-"github.com/opentracing/basictracer-go v1.0.0/go.mod"
-"github.com/opentracing/opentracing-go v1.0.2/go.mod"
-"github.com/opentracing/opentracing-go v1.1.0/go.mod"
-"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
-"github.com/openzipkin/zipkin-go v0.1.3/go.mod"
-"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
-"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
-"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
-"github.com/oracle/oci-go-sdk v7.0.0+incompatible/go.mod"
-"github.com/oracle/oci-go-sdk v12.5.0+incompatible"
-"github.com/oracle/oci-go-sdk v12.5.0+incompatible/go.mod"
-"github.com/ory/dockertest v3.3.4+incompatible/go.mod"
-"github.com/ory/dockertest v3.3.5+incompatible"
-"github.com/ory/dockertest v3.3.5+incompatible/go.mod"
-"github.com/ory/dockertest/v3 v3.6.2"
-"github.com/ory/dockertest/v3 v3.6.2/go.mod"
-"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2"
-"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod"
-"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
-"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
-"github.com/pact-foundation/pact-go v1.0.4/go.mod"
-"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-"github.com/pascaldekloe/goe v0.1.0"
-"github.com/pascaldekloe/goe v0.1.0/go.mod"
-"github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627/go.mod"
-"github.com/patrickmn/go-cache v2.1.0+incompatible"
-"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
-"github.com/pborman/uuid v1.2.0/go.mod"
-"github.com/pelletier/go-toml v1.2.0/go.mod"
-"github.com/pelletier/go-toml v1.7.0/go.mod"
-"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
-"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5"
-"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod"
-"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
-"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
-"github.com/pierrec/lz4 v2.2.6+incompatible/go.mod"
-"github.com/pierrec/lz4 v2.5.2+incompatible"
-"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
-"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
-"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod"
-"github.com/pkg/errors v0.8.0/go.mod"
-"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
-"github.com/pkg/errors v0.8.1/go.mod"
-"github.com/pkg/errors v0.9.1"
-"github.com/pkg/errors v0.9.1/go.mod"
-"github.com/pkg/profile v1.2.1/go.mod"
-"github.com/pmezard/go-difflib v1.0.0"
-"github.com/pmezard/go-difflib v1.0.0/go.mod"
-"github.com/posener/complete v1.1.1/go.mod"
-"github.com/posener/complete v1.2.3"
-"github.com/posener/complete v1.2.3/go.mod"
-"github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac"
-"github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac/go.mod"
-"github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d"
-"github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d/go.mod"
-"github.com/prometheus/client_golang v0.9.1/go.mod"
-"github.com/prometheus/client_golang v0.9.2/go.mod"
-"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
-"github.com/prometheus/client_golang v0.9.3/go.mod"
-"github.com/prometheus/client_golang v1.0.0/go.mod"
-"github.com/prometheus/client_golang v1.3.0/go.mod"
-"github.com/prometheus/client_golang v1.4.0/go.mod"
-"github.com/prometheus/client_golang v1.7.1"
-"github.com/prometheus/client_golang v1.7.1/go.mod"
-"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-"github.com/prometheus/client_model v0.1.0/go.mod"
-"github.com/prometheus/client_model v0.2.0"
-"github.com/prometheus/client_model v0.2.0/go.mod"
-"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
-"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
-"github.com/prometheus/common v0.2.0/go.mod"
-"github.com/prometheus/common v0.4.0/go.mod"
-"github.com/prometheus/common v0.4.1/go.mod"
-"github.com/prometheus/common v0.7.0/go.mod"
-"github.com/prometheus/common v0.9.1/go.mod"
-"github.com/prometheus/common v0.10.0/go.mod"
-"github.com/prometheus/common v0.11.1"
-"github.com/prometheus/common v0.11.1/go.mod"
-"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
-"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
-"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
-"github.com/prometheus/procfs v0.0.2/go.mod"
-"github.com/prometheus/procfs v0.0.8/go.mod"
-"github.com/prometheus/procfs v0.1.3"
-"github.com/prometheus/procfs v0.1.3/go.mod"
-"github.com/prometheus/tsdb v0.7.1/go.mod"
-"github.com/rboyer/safeio v0.2.1"
-"github.com/rboyer/safeio v0.2.1/go.mod"
-"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
-"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
-"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
-"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-"github.com/rogpeppe/go-internal v1.1.0/go.mod"
-"github.com/rogpeppe/go-internal v1.2.2/go.mod"
-"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-"github.com/rogpeppe/go-internal v1.6.2"
-"github.com/rogpeppe/go-internal v1.6.2/go.mod"
-"github.com/rs/zerolog v1.4.0/go.mod"
-"github.com/russross/blackfriday v1.5.2/go.mod"
-"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-"github.com/ryanuber/columnize v2.1.0+incompatible"
-"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
-"github.com/ryanuber/go-glob v1.0.0"
-"github.com/ryanuber/go-glob v1.0.0/go.mod"
-"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da"
-"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
-"github.com/sasha-s/go-deadlock v0.2.0"
-"github.com/sasha-s/go-deadlock v0.2.0/go.mod"
-"github.com/satori/go.uuid v1.2.0"
-"github.com/satori/go.uuid v1.2.0/go.mod"
-"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
-"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-"github.com/sethvargo/go-limiter v0.7.1"
-"github.com/sethvargo/go-limiter v0.7.1/go.mod"
-"github.com/shirou/gopsutil v3.21.5+incompatible"
-"github.com/shirou/gopsutil v3.21.5+incompatible/go.mod"
-"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24"
-"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
-"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
-"github.com/sirupsen/logrus v1.0.6/go.mod"
-"github.com/sirupsen/logrus v1.2.0/go.mod"
-"github.com/sirupsen/logrus v1.4.0/go.mod"
-"github.com/sirupsen/logrus v1.4.1/go.mod"
-"github.com/sirupsen/logrus v1.4.2/go.mod"
-"github.com/sirupsen/logrus v1.6.0/go.mod"
-"github.com/sirupsen/logrus v1.7.0"
-"github.com/sirupsen/logrus v1.7.0/go.mod"
-"github.com/smartystreets/assertions v0.0.0-20180725160413-e900ae048470/go.mod"
-"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
-"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
-"github.com/smartystreets/goconvey v1.6.4"
-"github.com/smartystreets/goconvey v1.6.4/go.mod"
-"github.com/snowflakedb/gosnowflake v1.6.1"
-"github.com/snowflakedb/gosnowflake v1.6.1/go.mod"
-"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
-"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
-"github.com/soheilhy/cmux v0.1.4"
-"github.com/soheilhy/cmux v0.1.4/go.mod"
-"github.com/sony/gobreaker v0.4.1/go.mod"
-"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-"github.com/spf13/afero v1.1.2/go.mod"
-"github.com/spf13/afero v1.2.1/go.mod"
-"github.com/spf13/afero v1.2.2/go.mod"
-"github.com/spf13/cast v1.3.0/go.mod"
-"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
-"github.com/spf13/cobra v0.0.3/go.mod"
-"github.com/spf13/cobra v0.0.5/go.mod"
-"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
-"github.com/spf13/pflag v1.0.1/go.mod"
-"github.com/spf13/pflag v1.0.3/go.mod"
-"github.com/spf13/pflag v1.0.5"
-"github.com/spf13/pflag v1.0.5/go.mod"
-"github.com/spf13/viper v1.3.2/go.mod"
-"github.com/spf13/viper v1.4.0/go.mod"
-"github.com/square/go-jose v2.4.1+incompatible/go.mod"
-"github.com/square/go-jose/v3 v3.0.0-20200225220504-708a9fe87ddc/go.mod"
-"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
-"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271"
-"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
-"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod"
-"github.com/stretchr/objx v0.1.0/go.mod"
-"github.com/stretchr/objx v0.1.1/go.mod"
-"github.com/stretchr/objx v0.2.0"
-"github.com/stretchr/objx v0.2.0/go.mod"
-"github.com/stretchr/testify v1.2.0/go.mod"
-"github.com/stretchr/testify v1.2.2/go.mod"
-"github.com/stretchr/testify v1.3.0/go.mod"
-"github.com/stretchr/testify v1.4.0/go.mod"
-"github.com/stretchr/testify v1.5.1/go.mod"
-"github.com/stretchr/testify v1.6.1/go.mod"
-"github.com/stretchr/testify v1.7.0"
-"github.com/stretchr/testify v1.7.0/go.mod"
-"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
-"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod"
-"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
-"github.com/tencentcloud/tencentcloud-sdk-go v3.0.171+incompatible"
-"github.com/tencentcloud/tencentcloud-sdk-go v3.0.171+incompatible/go.mod"
-"github.com/tidwall/pretty v1.0.0/go.mod"
-"github.com/tidwall/pretty v1.0.1"
-"github.com/tidwall/pretty v1.0.1/go.mod"
-"github.com/tklauser/go-sysconf v0.3.6"
-"github.com/tklauser/go-sysconf v0.3.6/go.mod"
-"github.com/tklauser/numcpus v0.2.2"
-"github.com/tklauser/numcpus v0.2.2/go.mod"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
-"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
-"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
-"github.com/ugorji/go v1.1.4/go.mod"
-"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
-"github.com/ulikunitz/xz v0.5.6/go.mod"
-"github.com/ulikunitz/xz v0.5.7"
-"github.com/ulikunitz/xz v0.5.7/go.mod"
-"github.com/urfave/cli v1.20.0/go.mod"
-"github.com/urfave/cli v1.22.1/go.mod"
-"github.com/urfave/cli v1.22.2/go.mod"
-"github.com/vmware/govmomi v0.18.0"
-"github.com/vmware/govmomi v0.18.0/go.mod"
-"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c"
-"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
-"github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod"
-"github.com/xdg/stringprep v1.0.0"
-"github.com/xdg/stringprep v1.0.0/go.mod"
-"github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8"
-"github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod"
-"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
-"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
-"github.com/yandex-cloud/go-genproto v0.0.0-20200722140432-762fe965ce77/go.mod"
-"github.com/yandex-cloud/go-sdk v0.0.0-20200722140627-2194e5077f13/go.mod"
-"github.com/yhat/scrape v0.0.0-20161128144610-24b7890b0945/go.mod"
-"github.com/yuin/goldmark v1.1.25/go.mod"
-"github.com/yuin/goldmark v1.1.27/go.mod"
-"github.com/yuin/goldmark v1.2.1/go.mod"
-"github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da"
-"github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod"
-"go.etcd.io/bbolt v1.3.2/go.mod"
-"go.etcd.io/bbolt v1.3.3/go.mod"
-"go.etcd.io/bbolt v1.3.4/go.mod"
-"go.etcd.io/bbolt v1.3.5"
-"go.etcd.io/bbolt v1.3.5/go.mod"
-"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
-"go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547"
-"go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547/go.mod"
-"go.mongodb.org/atlas v0.7.1"
-"go.mongodb.org/atlas v0.7.1/go.mod"
-"go.mongodb.org/mongo-driver v1.4.2/go.mod"
-"go.mongodb.org/mongo-driver v1.4.6"
-"go.mongodb.org/mongo-driver v1.4.6/go.mod"
-"go.opencensus.io v0.19.1/go.mod"
-"go.opencensus.io v0.19.2/go.mod"
-"go.opencensus.io v0.20.1/go.mod"
-"go.opencensus.io v0.20.2/go.mod"
-"go.opencensus.io v0.21.0/go.mod"
-"go.opencensus.io v0.22.0/go.mod"
-"go.opencensus.io v0.22.2/go.mod"
-"go.opencensus.io v0.22.3"
-"go.opencensus.io v0.22.3/go.mod"
-"go.opentelemetry.io/otel v0.20.0"
-"go.opentelemetry.io/otel v0.20.0/go.mod"
-"go.opentelemetry.io/otel/metric v0.20.0"
-"go.opentelemetry.io/otel/metric v0.20.0/go.mod"
-"go.opentelemetry.io/otel/oteltest v0.20.0"
-"go.opentelemetry.io/otel/oteltest v0.20.0/go.mod"
-"go.opentelemetry.io/otel/sdk v0.20.0"
-"go.opentelemetry.io/otel/sdk v0.20.0/go.mod"
-"go.opentelemetry.io/otel/trace v0.20.0"
-"go.opentelemetry.io/otel/trace v0.20.0/go.mod"
-"go.uber.org/atomic v1.3.2/go.mod"
-"go.uber.org/atomic v1.4.0/go.mod"
-"go.uber.org/atomic v1.5.0/go.mod"
-"go.uber.org/atomic v1.6.0"
-"go.uber.org/atomic v1.6.0/go.mod"
-"go.uber.org/goleak v1.1.10"
-"go.uber.org/goleak v1.1.10/go.mod"
-"go.uber.org/multierr v1.1.0/go.mod"
-"go.uber.org/multierr v1.3.0/go.mod"
-"go.uber.org/multierr v1.5.0"
-"go.uber.org/multierr v1.5.0/go.mod"
-"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
-"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
-"go.uber.org/zap v1.10.0/go.mod"
-"go.uber.org/zap v1.13.0/go.mod"
-"go.uber.org/zap v1.14.1"
-"go.uber.org/zap v1.14.1/go.mod"
-"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
-"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
-"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
-"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
-"golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod"
-"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-"golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod"
-"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
-"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
-"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
-"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
-"golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod"
-"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-"golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod"
-"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
-"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
-"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod"
-"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
-"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
-"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
-"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a"
-"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod"
-"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
-"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
-"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
-"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
-"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
-"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
-"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
-"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
-"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
-"golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
-"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-"golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod"
-"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
-"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
-"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
-"golang.org/x/lint v0.0.0-20200302205851-738671d3881b"
-"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
-"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
-"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
-"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-"golang.org/x/mod v0.1.0/go.mod"
-"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
-"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
-"golang.org/x/mod v0.2.0/go.mod"
-"golang.org/x/mod v0.3.0/go.mod"
-"golang.org/x/mod v0.4.0"
-"golang.org/x/mod v0.4.0/go.mod"
-"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
-"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
-"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod"
-"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
-"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
-"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
-"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
-"golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod"
-"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
-"golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
-"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
-"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
-"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
-"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
-"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
-"golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod"
-"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
-"golang.org/x/net v0.0.0-20200505041828-1ed23360d12c/go.mod"
-"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
-"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
-"golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c/go.mod"
-"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
-"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
-"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
-"golang.org/x/net v0.0.0-20210510120150-4163338589ed"
-"golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod"
-"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
-"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
-"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
-"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-"golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod"
-"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
-"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
-"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
-"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
-"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
-"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
-"golang.org/x/sys v0.0.0-20181218192612-074acd46bca6/go.mod"
-"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
-"golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod"
-"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
-"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-"golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod"
-"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
-"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
-"golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod"
-"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
-"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
-"golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod"
-"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
-"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
-"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
-"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
-"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
-"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
-"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
-"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod"
-"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
-"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
-"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
-"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
-"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
-"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-"golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod"
-"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
-"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
-"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
-"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
-"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
-"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
-"golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa/go.mod"
-"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
-"golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod"
-"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
-"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
-"golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod"
-"golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod"
-"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
-"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
-"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod"
-"golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod"
-"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
-"golang.org/x/sys v0.0.0-20210514084401-e8d321eab015"
-"golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod"
-"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
-"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1"
-"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
-"golang.org/x/text v0.3.0/go.mod"
-"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
-"golang.org/x/text v0.3.2/go.mod"
-"golang.org/x/text v0.3.3/go.mod"
-"golang.org/x/text v0.3.6"
-"golang.org/x/text v0.3.6/go.mod"
-"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
-"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
-"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
-"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
-"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-"golang.org/x/tools v0.0.0-20181219222714-6e267b5cc78e/go.mod"
-"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-"golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod"
-"golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod"
-"golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod"
-"golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod"
-"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-"golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod"
-"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
-"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-"golang.org/x/tools v0.0.0-20190718200317-82a3ea8a504c/go.mod"
-"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
-"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
-"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
-"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
-"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
-"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
-"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
-"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
-"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
-"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
-"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
-"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
-"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
-"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
-"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
-"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
-"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
-"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
-"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
-"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
-"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
-"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
-"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
-"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
-"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
-"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
-"golang.org/x/tools v0.0.0-20200409170454-77362c5149f0/go.mod"
-"golang.org/x/tools v0.0.0-20200416214402-fc959738d646/go.mod"
-"golang.org/x/tools v0.0.0-20200521155704-91d71f6c2f04/go.mod"
-"golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c"
-"golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/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"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
-"google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod"
-"google.golang.org/api v0.2.0/go.mod"
-"google.golang.org/api v0.3.0/go.mod"
-"google.golang.org/api v0.3.1/go.mod"
-"google.golang.org/api v0.3.2/go.mod"
-"google.golang.org/api v0.4.0/go.mod"
-"google.golang.org/api v0.5.0/go.mod"
-"google.golang.org/api v0.7.0/go.mod"
-"google.golang.org/api v0.8.0/go.mod"
-"google.golang.org/api v0.9.0/go.mod"
-"google.golang.org/api v0.13.0/go.mod"
-"google.golang.org/api v0.14.0/go.mod"
-"google.golang.org/api v0.15.0/go.mod"
-"google.golang.org/api v0.17.0/go.mod"
-"google.golang.org/api v0.18.0/go.mod"
-"google.golang.org/api v0.19.0/go.mod"
-"google.golang.org/api v0.20.0/go.mod"
-"google.golang.org/api v0.21.0/go.mod"
-"google.golang.org/api v0.24.0/go.mod"
-"google.golang.org/api v0.29.0"
-"google.golang.org/api v0.29.0/go.mod"
-"google.golang.org/appengine v1.1.0/go.mod"
-"google.golang.org/appengine v1.2.0/go.mod"
-"google.golang.org/appengine v1.3.0/go.mod"
-"google.golang.org/appengine v1.4.0/go.mod"
-"google.golang.org/appengine v1.5.0/go.mod"
-"google.golang.org/appengine v1.6.0/go.mod"
-"google.golang.org/appengine v1.6.1/go.mod"
-"google.golang.org/appengine v1.6.5"
-"google.golang.org/appengine v1.6.5/go.mod"
-"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-"google.golang.org/genproto v0.0.0-20181219182458-5a97ab628bfb/go.mod"
-"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
-"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-"google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod"
-"google.golang.org/genproto v0.0.0-20190513181449-d00d292a067c/go.mod"
-"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
-"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
-"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
-"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
-"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
-"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
-"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
-"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
-"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
-"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
-"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
-"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
-"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
-"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
-"google.golang.org/genproto v0.0.0-20200323114720-3f67cca34472/go.mod"
-"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
-"google.golang.org/genproto v0.0.0-20200409111301-baae70f3302d/go.mod"
-"google.golang.org/genproto v0.0.0-20200416231807-8751e049a2a0/go.mod"
-"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013"
-"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
-"google.golang.org/grpc v1.14.0/go.mod"
-"google.golang.org/grpc v1.16.0/go.mod"
-"google.golang.org/grpc v1.17.0/go.mod"
-"google.golang.org/grpc v1.19.0/go.mod"
-"google.golang.org/grpc v1.20.0/go.mod"
-"google.golang.org/grpc v1.20.1/go.mod"
-"google.golang.org/grpc v1.21.0/go.mod"
-"google.golang.org/grpc v1.21.1/go.mod"
-"google.golang.org/grpc v1.22.0/go.mod"
-"google.golang.org/grpc v1.22.1/go.mod"
-"google.golang.org/grpc v1.23.0/go.mod"
-"google.golang.org/grpc v1.23.1/go.mod"
-"google.golang.org/grpc v1.25.1/go.mod"
-"google.golang.org/grpc v1.26.0/go.mod"
-"google.golang.org/grpc v1.27.0/go.mod"
-"google.golang.org/grpc v1.27.1/go.mod"
-"google.golang.org/grpc v1.28.0/go.mod"
-"google.golang.org/grpc v1.28.1/go.mod"
-"google.golang.org/grpc v1.29.1"
-"google.golang.org/grpc v1.29.1/go.mod"
-"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-"google.golang.org/protobuf v1.21.0/go.mod"
-"google.golang.org/protobuf v1.22.0/go.mod"
-"google.golang.org/protobuf v1.23.0/go.mod"
-"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
-"google.golang.org/protobuf v1.24.0/go.mod"
-"google.golang.org/protobuf v1.25.0"
-"google.golang.org/protobuf v1.25.0/go.mod"
-"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
-"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
-"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
-"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
-"gopkg.in/errgo.v2 v2.1.0"
-"gopkg.in/errgo.v2 v2.1.0/go.mod"
-"gopkg.in/fsnotify.v1 v1.4.7"
-"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-"gopkg.in/gcfg.v1 v1.2.3/go.mod"
-"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-"gopkg.in/inf.v0 v0.9.0/go.mod"
-"gopkg.in/inf.v0 v0.9.1"
-"gopkg.in/inf.v0 v0.9.1/go.mod"
-"gopkg.in/ini.v1 v1.42.0"
-"gopkg.in/ini.v1 v1.42.0/go.mod"
-"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
-"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
-"gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce"
-"gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod"
-"gopkg.in/ory-am/dockertest.v3 v3.3.4"
-"gopkg.in/ory-am/dockertest.v3 v3.3.4/go.mod"
-"gopkg.in/resty.v1 v1.12.0"
-"gopkg.in/resty.v1 v1.12.0/go.mod"
-"gopkg.in/square/go-jose.v2 v2.3.0/go.mod"
-"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
-"gopkg.in/square/go-jose.v2 v2.4.1/go.mod"
-"gopkg.in/square/go-jose.v2 v2.5.1"
-"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-"gopkg.in/warnings.v0 v0.1.2/go.mod"
-"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-"gopkg.in/yaml.v2 v2.2.1/go.mod"
-"gopkg.in/yaml.v2 v2.2.2/go.mod"
-"gopkg.in/yaml.v2 v2.2.4/go.mod"
-"gopkg.in/yaml.v2 v2.2.5/go.mod"
-"gopkg.in/yaml.v2 v2.2.7/go.mod"
-"gopkg.in/yaml.v2 v2.2.8/go.mod"
-"gopkg.in/yaml.v2 v2.3.0"
-"gopkg.in/yaml.v2 v2.3.0/go.mod"
-"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
-"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
-"gotest.tools v2.2.0+incompatible"
-"gotest.tools v2.2.0+incompatible/go.mod"
-"gotest.tools/v3 v3.0.2"
-"gotest.tools/v3 v3.0.2/go.mod"
-"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
-"honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod"
-"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-"honnef.co/go/tools v0.0.1-2020.1.3"
-"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
-"k8s.io/api v0.0.0-20190409092523-d687e77c8ae9/go.mod"
-"k8s.io/api v0.18.2"
-"k8s.io/api v0.18.2/go.mod"
-"k8s.io/apimachinery v0.0.0-20190409092423-760d1845f48b/go.mod"
-"k8s.io/apimachinery v0.18.2"
-"k8s.io/apimachinery v0.18.2/go.mod"
-"k8s.io/client-go v0.18.2"
-"k8s.io/client-go v0.18.2/go.mod"
-"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-"k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod"
-"k8s.io/klog v0.3.0/go.mod"
-"k8s.io/klog v1.0.0"
-"k8s.io/klog v1.0.0/go.mod"
-"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
-"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod"
-"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
-"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
-"layeh.com/radius v0.0.0-20190322222518-890bc1058917"
-"layeh.com/radius v0.0.0-20190322222518-890bc1058917/go.mod"
-"mvdan.cc/gofumpt v0.1.1"
-"mvdan.cc/gofumpt v0.1.1/go.mod"
-"rsc.io/binaryregexp v0.2.0/go.mod"
-"rsc.io/quote/v3 v3.1.0/go.mod"
-"rsc.io/sampler v1.3.0/go.mod"
-"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
-"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
-"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
-"sigs.k8s.io/yaml v1.1.0/go.mod"
-"sigs.k8s.io/yaml v1.2.0"
-"sigs.k8s.io/yaml v1.2.0/go.mod"
-"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
-)
-go-module_set_globals
-
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	webui? (
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+webui"
-
-BDEPEND="dev-go/gox
-	>=dev-lang/go-1.15.3"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-PATCHES=( "${FILESDIR}"/${P}-go-limiter.patch )
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-e "s/gofumpt/gofmt/g" \
-		-i Makefile || die
-	if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then
-		mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" ||
-			die "mv failed"
-	fi
-}
-
-src_compile() {
-	mkdir "${T}"/bin || die
-	BUILD_TAGS="$(usex webui ui '')" \
-	GOFLAGS="-mod=readonly" \
-	GOPATH="${T}" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-admin/vault/vault-1.8.3.ebuild b/app-admin/vault/vault-1.8.3.ebuild
deleted file mode 100644
index c93e0a0edd28..000000000000
--- a/app-admin/vault/vault-1.8.3.ebuild
+++ /dev/null
@@ -1,1827 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-EGO_SUM=(
-"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
-"cloud.google.com/go v0.26.0/go.mod"
-"cloud.google.com/go v0.34.0/go.mod"
-"cloud.google.com/go v0.38.0/go.mod"
-"cloud.google.com/go v0.39.0/go.mod"
-"cloud.google.com/go v0.44.1/go.mod"
-"cloud.google.com/go v0.44.2/go.mod"
-"cloud.google.com/go v0.45.1/go.mod"
-"cloud.google.com/go v0.46.3/go.mod"
-"cloud.google.com/go v0.50.0/go.mod"
-"cloud.google.com/go v0.52.0/go.mod"
-"cloud.google.com/go v0.53.0/go.mod"
-"cloud.google.com/go v0.54.0/go.mod"
-"cloud.google.com/go v0.56.0"
-"cloud.google.com/go v0.56.0/go.mod"
-"cloud.google.com/go/bigquery v1.0.1/go.mod"
-"cloud.google.com/go/bigquery v1.3.0/go.mod"
-"cloud.google.com/go/bigquery v1.4.0/go.mod"
-"cloud.google.com/go/bigquery v1.5.0/go.mod"
-"cloud.google.com/go/bigquery v1.6.0"
-"cloud.google.com/go/bigquery v1.6.0/go.mod"
-"cloud.google.com/go/datastore v1.0.0/go.mod"
-"cloud.google.com/go/datastore v1.1.0"
-"cloud.google.com/go/datastore v1.1.0/go.mod"
-"cloud.google.com/go/pubsub v1.0.1/go.mod"
-"cloud.google.com/go/pubsub v1.1.0/go.mod"
-"cloud.google.com/go/pubsub v1.2.0/go.mod"
-"cloud.google.com/go/pubsub v1.3.1"
-"cloud.google.com/go/pubsub v1.3.1/go.mod"
-"cloud.google.com/go/spanner v1.5.1"
-"cloud.google.com/go/spanner v1.5.1/go.mod"
-"cloud.google.com/go/storage v1.0.0/go.mod"
-"cloud.google.com/go/storage v1.5.0/go.mod"
-"cloud.google.com/go/storage v1.6.0"
-"cloud.google.com/go/storage v1.6.0/go.mod"
-"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f"
-"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod"
-"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
-"git.apache.org/thrift.git v0.12.0/go.mod"
-"github.com/Azure/azure-pipeline-go v0.2.3"
-"github.com/Azure/azure-pipeline-go v0.2.3/go.mod"
-"github.com/Azure/azure-sdk-for-go v36.2.0+incompatible/go.mod"
-"github.com/Azure/azure-sdk-for-go v44.0.0+incompatible/go.mod"
-"github.com/Azure/azure-sdk-for-go v51.1.0+incompatible"
-"github.com/Azure/azure-sdk-for-go v51.1.0+incompatible/go.mod"
-"github.com/Azure/azure-storage-blob-go v0.13.0"
-"github.com/Azure/azure-storage-blob-go v0.13.0/go.mod"
-"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
-"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
-"github.com/Azure/go-autorest v14.2.0+incompatible"
-"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.2/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
-"github.com/Azure/go-autorest/autorest v0.10.1/go.mod"
-"github.com/Azure/go-autorest/autorest v0.11.0/go.mod"
-"github.com/Azure/go-autorest/autorest v0.11.17"
-"github.com/Azure/go-autorest/autorest v0.11.17/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.6.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.7.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.9.2/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.9.11"
-"github.com/Azure/go-autorest/autorest/adal v0.9.11/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/auth v0.4.0/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/auth v0.5.0/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/auth v0.5.7"
-"github.com/Azure/go-autorest/autorest/azure/auth v0.5.7/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/cli v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod"
-"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2"
-"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.3.0"
-"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
-"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
-"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/to v0.4.0"
-"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
-"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/validation v0.3.1"
-"github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod"
-"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-"github.com/Azure/go-autorest/logger v0.2.0"
-"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
-"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-"github.com/Azure/go-autorest/tracing v0.6.0"
-"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
-"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
-"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
-"github.com/BurntSushi/toml v0.3.1"
-"github.com/BurntSushi/toml v0.3.1/go.mod"
-"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
-"github.com/DataDog/datadog-go v3.2.0+incompatible"
-"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
-"github.com/Jeffail/gabs v1.1.1"
-"github.com/Jeffail/gabs v1.1.1/go.mod"
-"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod"
-"github.com/Masterminds/goutils v1.1.0"
-"github.com/Masterminds/goutils v1.1.0/go.mod"
-"github.com/Masterminds/semver v1.4.2/go.mod"
-"github.com/Masterminds/semver v1.5.0"
-"github.com/Masterminds/semver v1.5.0/go.mod"
-"github.com/Masterminds/sprig v2.22.0+incompatible"
-"github.com/Masterminds/sprig v2.22.0+incompatible/go.mod"
-"github.com/Microsoft/go-winio v0.4.13/go.mod"
-"github.com/Microsoft/go-winio v0.4.14/go.mod"
-"github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331"
-"github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod"
-"github.com/Microsoft/hcsshim v0.8.14"
-"github.com/Microsoft/hcsshim v0.8.14/go.mod"
-"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-"github.com/NYTimes/gziphandler v1.1.1"
-"github.com/NYTimes/gziphandler v1.1.1/go.mod"
-"github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5"
-"github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod"
-"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-"github.com/SAP/go-hdb v0.14.1"
-"github.com/SAP/go-hdb v0.14.1/go.mod"
-"github.com/Sectorbob/mlab-ns2 v0.0.0-20171030222938-d3aa0c295a8a"
-"github.com/Sectorbob/mlab-ns2 v0.0.0-20171030222938-d3aa0c295a8a/go.mod"
-"github.com/Shopify/sarama v1.19.0/go.mod"
-"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
-"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
-"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
-"github.com/VividCortex/gohistogram v1.0.0/go.mod"
-"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
-"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
-"github.com/aerospike/aerospike-client-go v3.1.1+incompatible"
-"github.com/aerospike/aerospike-client-go v3.1.1+incompatible/go.mod"
-"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod"
-"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
-"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190412020505-60e2075261b6/go.mod"
-"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190620160927-9418d7b0cd0f"
-"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190620160927-9418d7b0cd0f/go.mod"
-"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5"
-"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod"
-"github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230"
-"github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230/go.mod"
-"github.com/apache/thrift v0.12.0/go.mod"
-"github.com/apache/thrift v0.13.0/go.mod"
-"github.com/apple/foundationdb/bindings/go v0.0.0-20190411004307-cd5c9d91fad2"
-"github.com/apple/foundationdb/bindings/go v0.0.0-20190411004307-cd5c9d91fad2/go.mod"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
-"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
-"github.com/armon/go-metrics v0.3.0/go.mod"
-"github.com/armon/go-metrics v0.3.3/go.mod"
-"github.com/armon/go-metrics v0.3.4/go.mod"
-"github.com/armon/go-metrics v0.3.7"
-"github.com/armon/go-metrics v0.3.7/go.mod"
-"github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a"
-"github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a/go.mod"
-"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-"github.com/armon/go-radix v1.0.0"
-"github.com/armon/go-radix v1.0.0/go.mod"
-"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
-"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf"
-"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
-"github.com/aws/aws-lambda-go v1.13.3/go.mod"
-"github.com/aws/aws-sdk-go v1.25.41/go.mod"
-"github.com/aws/aws-sdk-go v1.27.0/go.mod"
-"github.com/aws/aws-sdk-go v1.30.27/go.mod"
-"github.com/aws/aws-sdk-go v1.34.28/go.mod"
-"github.com/aws/aws-sdk-go v1.37.19"
-"github.com/aws/aws-sdk-go v1.37.19/go.mod"
-"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
-"github.com/aws/aws-sdk-go-v2 v1.3.2"
-"github.com/aws/aws-sdk-go-v2 v1.3.2/go.mod"
-"github.com/aws/aws-sdk-go-v2/config v1.1.5"
-"github.com/aws/aws-sdk-go-v2/config v1.1.5/go.mod"
-"github.com/aws/aws-sdk-go-v2/credentials v1.1.5"
-"github.com/aws/aws-sdk-go-v2/credentials v1.1.5/go.mod"
-"github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6"
-"github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6/go.mod"
-"github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.1.2"
-"github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.1.2/go.mod"
-"github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.4"
-"github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.4/go.mod"
-"github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.6"
-"github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.6/go.mod"
-"github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2"
-"github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2/go.mod"
-"github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0"
-"github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0/go.mod"
-"github.com/aws/aws-sdk-go-v2/service/sso v1.1.5"
-"github.com/aws/aws-sdk-go-v2/service/sso v1.1.5/go.mod"
-"github.com/aws/aws-sdk-go-v2/service/sts v1.2.2"
-"github.com/aws/aws-sdk-go-v2/service/sts v1.2.2/go.mod"
-"github.com/aws/smithy-go v1.3.1"
-"github.com/aws/smithy-go v1.3.1/go.mod"
-"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
-"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-"github.com/beorn7/perks v1.0.0/go.mod"
-"github.com/beorn7/perks v1.0.1"
-"github.com/beorn7/perks v1.0.1/go.mod"
-"github.com/bgentry/speakeasy v0.1.0"
-"github.com/bgentry/speakeasy v0.1.0/go.mod"
-"github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod"
-"github.com/bitly/go-hostpool v0.1.0"
-"github.com/bitly/go-hostpool v0.1.0/go.mod"
-"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869"
-"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
-"github.com/boltdb/bolt v1.3.1/go.mod"
-"github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc"
-"github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod"
-"github.com/briankassouf/jose v0.9.2-0.20180619214549-d2569464773f"
-"github.com/briankassouf/jose v0.9.2-0.20180619214549-d2569464773f/go.mod"
-"github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee/go.mod"
-"github.com/casbin/casbin/v2 v2.1.2/go.mod"
-"github.com/cenkalti/backoff v2.2.1+incompatible"
-"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
-"github.com/cenkalti/backoff/v3 v3.0.0"
-"github.com/cenkalti/backoff/v3 v3.0.0/go.mod"
-"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-"github.com/centrify/cloud-golang-sdk v0.0.0-20190214225812-119110094d0f"
-"github.com/centrify/cloud-golang-sdk v0.0.0-20190214225812-119110094d0f/go.mod"
-"github.com/cespare/xxhash v1.1.0"
-"github.com/cespare/xxhash v1.1.0/go.mod"
-"github.com/cespare/xxhash/v2 v2.1.1"
-"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-"github.com/chrismalek/oktasdk-go v0.0.0-20181212195951-3430665dfaa0"
-"github.com/chrismalek/oktasdk-go v0.0.0-20181212195951-3430665dfaa0/go.mod"
-"github.com/chzyer/logex v1.1.10/go.mod"
-"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-"github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod"
-"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
-"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
-"github.com/circonus-labs/circonusllhist v0.1.3"
-"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
-"github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
-"github.com/client9/misspell v0.3.4"
-"github.com/client9/misspell v0.3.4/go.mod"
-"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190201205600-f136f9222381"
-"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190201205600-f136f9222381/go.mod"
-"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
-"github.com/cockroachdb/apd v1.1.0"
-"github.com/cockroachdb/apd v1.1.0/go.mod"
-"github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c"
-"github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c/go.mod"
-"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
-"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
-"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
-"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0"
-"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
-"github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod"
-"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
-"github.com/containerd/containerd v1.3.2/go.mod"
-"github.com/containerd/containerd v1.4.3"
-"github.com/containerd/containerd v1.4.3/go.mod"
-"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
-"github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod"
-"github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe"
-"github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod"
-"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
-"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
-"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
-"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
-"github.com/coreos/bbolt v1.3.2/go.mod"
-"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
-"github.com/coreos/go-oidc v2.2.1+incompatible"
-"github.com/coreos/go-oidc v2.2.1+incompatible/go.mod"
-"github.com/coreos/go-oidc/v3 v3.0.0"
-"github.com/coreos/go-oidc/v3 v3.0.0/go.mod"
-"github.com/coreos/go-semver v0.2.0"
-"github.com/coreos/go-semver v0.2.0/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf"
-"github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod"
-"github.com/coreos/go-systemd/v22 v22.0.0"
-"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
-"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
-"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-"github.com/couchbase/gocb/v2 v2.1.4"
-"github.com/couchbase/gocb/v2 v2.1.4/go.mod"
-"github.com/couchbase/gocbcore/v9 v9.0.4"
-"github.com/couchbase/gocbcore/v9 v9.0.4/go.mod"
-"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
-"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
-"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-"github.com/creack/pty v1.1.7/go.mod"
-"github.com/creack/pty v1.1.9"
-"github.com/creack/pty v1.1.9/go.mod"
-"github.com/davecgh/go-spew v1.1.0/go.mod"
-"github.com/davecgh/go-spew v1.1.1"
-"github.com/davecgh/go-spew v1.1.1/go.mod"
-"github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc"
-"github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod"
-"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
-"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
-"github.com/digitalocean/godo v1.7.5"
-"github.com/digitalocean/godo v1.7.5/go.mod"
-"github.com/dimchansky/utfbom v1.1.0/go.mod"
-"github.com/dimchansky/utfbom v1.1.1"
-"github.com/dimchansky/utfbom v1.1.1/go.mod"
-"github.com/dnaeon/go-vcr v1.0.1"
-"github.com/dnaeon/go-vcr v1.0.1/go.mod"
-"github.com/docker/distribution v2.7.1+incompatible"
-"github.com/docker/distribution v2.7.1+incompatible/go.mod"
-"github.com/docker/docker v1.4.2-0.20200319182547-c7ad2b866182/go.mod"
-"github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible"
-"github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible/go.mod"
-"github.com/docker/go-connections v0.4.0"
-"github.com/docker/go-connections v0.4.0/go.mod"
-"github.com/docker/go-units v0.3.3/go.mod"
-"github.com/docker/go-units v0.4.0"
-"github.com/docker/go-units v0.4.0/go.mod"
-"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-"github.com/dsnet/compress v0.0.1"
-"github.com/dsnet/compress v0.0.1/go.mod"
-"github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod"
-"github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74"
-"github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74/go.mod"
-"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
-"github.com/dustin/go-humanize v1.0.0"
-"github.com/dustin/go-humanize v1.0.0/go.mod"
-"github.com/eapache/go-resiliency v1.1.0/go.mod"
-"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
-"github.com/eapache/queue v1.1.0/go.mod"
-"github.com/edsrzf/mmap-go v1.0.0/go.mod"
-"github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f"
-"github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f/go.mod"
-"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
-"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
-"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
-"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-"github.com/fatih/color v1.7.0/go.mod"
-"github.com/fatih/color v1.9.0/go.mod"
-"github.com/fatih/color v1.11.0"
-"github.com/fatih/color v1.11.0/go.mod"
-"github.com/fatih/structs v1.1.0"
-"github.com/fatih/structs v1.1.0/go.mod"
-"github.com/form3tech-oss/jwt-go v3.2.2+incompatible"
-"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
-"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
-"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
-"github.com/frankban/quicktest v1.4.0/go.mod"
-"github.com/frankban/quicktest v1.4.1/go.mod"
-"github.com/frankban/quicktest v1.10.0/go.mod"
-"github.com/frankban/quicktest v1.13.0"
-"github.com/frankban/quicktest v1.13.0/go.mod"
-"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-"github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7"
-"github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7/go.mod"
-"github.com/gammazero/workerpool v0.0.0-20190406235159-88d534f22b56"
-"github.com/gammazero/workerpool v0.0.0-20190406235159-88d534f22b56/go.mod"
-"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-"github.com/ghodss/yaml v1.0.0/go.mod"
-"github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32"
-"github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod"
-"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
-"github.com/go-asn1-ber/asn1-ber v1.4.1/go.mod"
-"github.com/go-asn1-ber/asn1-ber v1.5.1"
-"github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod"
-"github.com/go-errors/errors v1.0.1"
-"github.com/go-errors/errors v1.0.1/go.mod"
-"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
-"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
-"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
-"github.com/go-kit/kit v0.8.0/go.mod"
-"github.com/go-kit/kit v0.9.0/go.mod"
-"github.com/go-kit/kit v0.10.0/go.mod"
-"github.com/go-ldap/ldap/v3 v3.1.3/go.mod"
-"github.com/go-ldap/ldap/v3 v3.1.7/go.mod"
-"github.com/go-ldap/ldap/v3 v3.1.10/go.mod"
-"github.com/go-ldap/ldap/v3 v3.2.4"
-"github.com/go-ldap/ldap/v3 v3.2.4/go.mod"
-"github.com/go-ldap/ldif v0.0.0-20200320164324-fd88d9b715b3"
-"github.com/go-ldap/ldif v0.0.0-20200320164324-fd88d9b715b3/go.mod"
-"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-"github.com/go-logfmt/logfmt v0.5.0/go.mod"
-"github.com/go-logr/logr v0.1.0/go.mod"
-"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab"
-"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
-"github.com/go-ole/go-ole v1.2.4"
-"github.com/go-ole/go-ole v1.2.4/go.mod"
-"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-"github.com/go-sql-driver/mysql v1.4.0/go.mod"
-"github.com/go-sql-driver/mysql v1.5.0"
-"github.com/go-sql-driver/mysql v1.5.0/go.mod"
-"github.com/go-stack/stack v1.8.0"
-"github.com/go-stack/stack v1.8.0/go.mod"
-"github.com/go-test/deep v1.0.1/go.mod"
-"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
-"github.com/go-test/deep v1.0.2/go.mod"
-"github.com/go-test/deep v1.0.7"
-"github.com/go-test/deep v1.0.7/go.mod"
-"github.com/go-yaml/yaml v2.1.0+incompatible"
-"github.com/go-yaml/yaml v2.1.0+incompatible/go.mod"
-"github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod"
-"github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod"
-"github.com/gobuffalo/depgen v0.1.0/go.mod"
-"github.com/gobuffalo/envy v1.6.15/go.mod"
-"github.com/gobuffalo/envy v1.7.0/go.mod"
-"github.com/gobuffalo/flect v0.1.0/go.mod"
-"github.com/gobuffalo/flect v0.1.1/go.mod"
-"github.com/gobuffalo/flect v0.1.3/go.mod"
-"github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod"
-"github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod"
-"github.com/gobuffalo/genny v0.1.0/go.mod"
-"github.com/gobuffalo/genny v0.1.1/go.mod"
-"github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod"
-"github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod"
-"github.com/gobuffalo/gogen v0.1.0/go.mod"
-"github.com/gobuffalo/gogen v0.1.1/go.mod"
-"github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod"
-"github.com/gobuffalo/mapi v1.0.1/go.mod"
-"github.com/gobuffalo/mapi v1.0.2/go.mod"
-"github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod"
-"github.com/gobuffalo/packd v0.1.0/go.mod"
-"github.com/gobuffalo/packr/v2 v2.0.9/go.mod"
-"github.com/gobuffalo/packr/v2 v2.2.0/go.mod"
-"github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod"
-"github.com/gocql/gocql v0.0.0-20210401103645-80ab1e13e309"
-"github.com/gocql/gocql v0.0.0-20210401103645-80ab1e13e309/go.mod"
-"github.com/godbus/dbus/v5 v5.0.3/go.mod"
-"github.com/gogo/googleapis v1.1.0/go.mod"
-"github.com/gogo/protobuf v1.1.1/go.mod"
-"github.com/gogo/protobuf v1.2.0/go.mod"
-"github.com/gogo/protobuf v1.2.1/go.mod"
-"github.com/gogo/protobuf v1.3.1"
-"github.com/gogo/protobuf v1.3.1/go.mod"
-"github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod"
-"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe"
-"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
-"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
-"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
-"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
-"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
-"github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
-"github.com/golang/mock v1.1.1/go.mod"
-"github.com/golang/mock v1.2.0/go.mod"
-"github.com/golang/mock v1.3.1/go.mod"
-"github.com/golang/mock v1.4.0/go.mod"
-"github.com/golang/mock v1.4.1/go.mod"
-"github.com/golang/mock v1.4.3"
-"github.com/golang/mock v1.4.3/go.mod"
-"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-"github.com/golang/protobuf v1.2.0/go.mod"
-"github.com/golang/protobuf v1.3.1/go.mod"
-"github.com/golang/protobuf v1.3.2/go.mod"
-"github.com/golang/protobuf v1.3.3/go.mod"
-"github.com/golang/protobuf v1.3.4/go.mod"
-"github.com/golang/protobuf v1.3.5/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-"github.com/golang/protobuf v1.4.0/go.mod"
-"github.com/golang/protobuf v1.4.1/go.mod"
-"github.com/golang/protobuf v1.4.2"
-"github.com/golang/protobuf v1.4.2/go.mod"
-"github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod"
-"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
-"github.com/golang/snappy v0.0.1/go.mod"
-"github.com/golang/snappy v0.0.2/go.mod"
-"github.com/golang/snappy v0.0.4"
-"github.com/golang/snappy v0.0.4/go.mod"
-"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-"github.com/google/btree v1.0.0"
-"github.com/google/btree v1.0.0/go.mod"
-"github.com/google/flatbuffers v1.11.0"
-"github.com/google/flatbuffers v1.11.0/go.mod"
-"github.com/google/go-cmp v0.2.0/go.mod"
-"github.com/google/go-cmp v0.3.0/go.mod"
-"github.com/google/go-cmp v0.3.1/go.mod"
-"github.com/google/go-cmp v0.4.0/go.mod"
-"github.com/google/go-cmp v0.5.0/go.mod"
-"github.com/google/go-cmp v0.5.2/go.mod"
-"github.com/google/go-cmp v0.5.4/go.mod"
-"github.com/google/go-cmp v0.5.5"
-"github.com/google/go-cmp v0.5.5/go.mod"
-"github.com/google/go-github v17.0.0+incompatible"
-"github.com/google/go-github v17.0.0+incompatible/go.mod"
-"github.com/google/go-metrics-stackdriver v0.2.0"
-"github.com/google/go-metrics-stackdriver v0.2.0/go.mod"
-"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
-"github.com/google/go-querystring v1.0.0"
-"github.com/google/go-querystring v1.0.0/go.mod"
-"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
-"github.com/google/gofuzz v1.0.0/go.mod"
-"github.com/google/gofuzz v1.1.0"
-"github.com/google/gofuzz v1.1.0/go.mod"
-"github.com/google/martian v2.1.0+incompatible"
-"github.com/google/martian v2.1.0+incompatible/go.mod"
-"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
-"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
-"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
-"github.com/google/renameio v0.1.0/go.mod"
-"github.com/google/uuid v1.0.0/go.mod"
-"github.com/google/uuid v1.1.1/go.mod"
-"github.com/google/uuid v1.1.2"
-"github.com/google/uuid v1.1.2/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.5"
-"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-"github.com/googleapis/gnostic v0.1.0/go.mod"
-"github.com/googleapis/gnostic v0.2.0"
-"github.com/googleapis/gnostic v0.2.0/go.mod"
-"github.com/gophercloud/gophercloud v0.1.0"
-"github.com/gophercloud/gophercloud v0.1.0/go.mod"
-"github.com/gopherjs/gopherjs v0.0.0-20180628210949-0892b62f0d9f/go.mod"
-"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-"github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75"
-"github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod"
-"github.com/gorilla/context v1.1.1/go.mod"
-"github.com/gorilla/mux v1.6.2/go.mod"
-"github.com/gorilla/mux v1.7.3"
-"github.com/gorilla/mux v1.7.3/go.mod"
-"github.com/gorilla/securecookie v1.1.1"
-"github.com/gorilla/securecookie v1.1.1/go.mod"
-"github.com/gorilla/sessions v1.2.0"
-"github.com/gorilla/sessions v1.2.0/go.mod"
-"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
-"github.com/gorilla/websocket v1.4.0/go.mod"
-"github.com/gorilla/websocket v1.4.1"
-"github.com/gorilla/websocket v1.4.1/go.mod"
-"github.com/gotestyourself/gotestyourself v2.2.0+incompatible"
-"github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod"
-"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
-"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
-"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-"github.com/grpc-ecosystem/grpc-gateway v1.6.2/go.mod"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.5"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
-"github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed"
-"github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod"
-"github.com/hashicorp/cap v0.1.0"
-"github.com/hashicorp/cap v0.1.0/go.mod"
-"github.com/hashicorp/consul-template v0.26.0"
-"github.com/hashicorp/consul-template v0.26.0/go.mod"
-"github.com/hashicorp/consul/api v1.3.0/go.mod"
-"github.com/hashicorp/consul/api v1.4.0"
-"github.com/hashicorp/consul/api v1.4.0/go.mod"
-"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
-"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
-"github.com/hashicorp/consul/sdk v0.4.0/go.mod"
-"github.com/hashicorp/consul/sdk v0.4.1-0.20200910203702-bb2b5dd871ca"
-"github.com/hashicorp/consul/sdk v0.4.1-0.20200910203702-bb2b5dd871ca/go.mod"
-"github.com/hashicorp/errwrap v1.0.0/go.mod"
-"github.com/hashicorp/errwrap v1.1.0"
-"github.com/hashicorp/errwrap v1.1.0/go.mod"
-"github.com/hashicorp/go-bindata v3.0.8-0.20180209072458-bf7910af8997+incompatible"
-"github.com/hashicorp/go-bindata v3.0.8-0.20180209072458-bf7910af8997+incompatible/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.2"
-"github.com/hashicorp/go-cleanhttp v0.5.2/go.mod"
-"github.com/hashicorp/go-discover v0.0.0-20201029210230-738cb3105cd0"
-"github.com/hashicorp/go-discover v0.0.0-20201029210230-738cb3105cd0/go.mod"
-"github.com/hashicorp/go-gatedio v0.5.0"
-"github.com/hashicorp/go-gatedio v0.5.0/go.mod"
-"github.com/hashicorp/go-gcp-common v0.5.0/go.mod"
-"github.com/hashicorp/go-gcp-common v0.7.0"
-"github.com/hashicorp/go-gcp-common v0.7.0/go.mod"
-"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-"github.com/hashicorp/go-hclog v0.8.0/go.mod"
-"github.com/hashicorp/go-hclog v0.9.1/go.mod"
-"github.com/hashicorp/go-hclog v0.9.2/go.mod"
-"github.com/hashicorp/go-hclog v0.12.0/go.mod"
-"github.com/hashicorp/go-hclog v0.14.1/go.mod"
-"github.com/hashicorp/go-hclog v0.15.0/go.mod"
-"github.com/hashicorp/go-hclog v0.16.1"
-"github.com/hashicorp/go-hclog v0.16.1/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.3.0"
-"github.com/hashicorp/go-immutable-radix v1.3.0/go.mod"
-"github.com/hashicorp/go-kms-wrapping v0.5.16"
-"github.com/hashicorp/go-kms-wrapping v0.5.16/go.mod"
-"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0"
-"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod"
-"github.com/hashicorp/go-memdb v1.0.2"
-"github.com/hashicorp/go-memdb v1.0.2/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
-"github.com/hashicorp/go-msgpack v1.1.5"
-"github.com/hashicorp/go-msgpack v1.1.5/go.mod"
-"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-"github.com/hashicorp/go-multierror v1.1.1"
-"github.com/hashicorp/go-multierror v1.1.1/go.mod"
-"github.com/hashicorp/go-plugin v1.0.1"
-"github.com/hashicorp/go-plugin v1.0.1/go.mod"
-"github.com/hashicorp/go-raftchunking v0.6.3-0.20191002164813-7e9e8525653a"
-"github.com/hashicorp/go-raftchunking v0.6.3-0.20191002164813-7e9e8525653a/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
-"github.com/hashicorp/go-retryablehttp v0.6.7"
-"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod"
-"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
-"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
-"github.com/hashicorp/go-rootcerts v1.0.2"
-"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
-"github.com/hashicorp/go-secure-stdlib/strutil v0.1.1"
-"github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod"
-"github.com/hashicorp/go-slug v0.4.1"
-"github.com/hashicorp/go-slug v0.4.1/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.2"
-"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
-"github.com/hashicorp/go-syslog v1.0.0"
-"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-"github.com/hashicorp/go-tfe v0.12.0"
-"github.com/hashicorp/go-tfe v0.12.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-"github.com/hashicorp/go-uuid v1.0.2"
-"github.com/hashicorp/go-uuid v1.0.2/go.mod"
-"github.com/hashicorp/go-version v1.0.0/go.mod"
-"github.com/hashicorp/go-version v1.2.0/go.mod"
-"github.com/hashicorp/go-version v1.2.1"
-"github.com/hashicorp/go-version v1.2.1/go.mod"
-"github.com/hashicorp/go.net v0.0.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.3/go.mod"
-"github.com/hashicorp/golang-lru v0.5.4"
-"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-"github.com/hashicorp/hcl v1.0.0/go.mod"
-"github.com/hashicorp/hcl v1.0.1-vault-3"
-"github.com/hashicorp/hcl v1.0.1-vault-3/go.mod"
-"github.com/hashicorp/logutils v1.0.0"
-"github.com/hashicorp/logutils v1.0.0/go.mod"
-"github.com/hashicorp/mdns v1.0.0/go.mod"
-"github.com/hashicorp/mdns v1.0.1"
-"github.com/hashicorp/mdns v1.0.1/go.mod"
-"github.com/hashicorp/memberlist v0.1.3/go.mod"
-"github.com/hashicorp/memberlist v0.2.2"
-"github.com/hashicorp/memberlist v0.2.2/go.mod"
-"github.com/hashicorp/nomad/api v0.0.0-20191220223628-edc62acd919d"
-"github.com/hashicorp/nomad/api v0.0.0-20191220223628-edc62acd919d/go.mod"
-"github.com/hashicorp/raft v1.0.1/go.mod"
-"github.com/hashicorp/raft v1.1.0/go.mod"
-"github.com/hashicorp/raft v1.1.2-0.20191002163536-9c6bd3e3eb17/go.mod"
-"github.com/hashicorp/raft v1.2.0/go.mod"
-"github.com/hashicorp/raft v1.3.0"
-"github.com/hashicorp/raft v1.3.0/go.mod"
-"github.com/hashicorp/raft-autopilot v0.1.3"
-"github.com/hashicorp/raft-autopilot v0.1.3/go.mod"
-"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
-"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
-"github.com/hashicorp/raft-boltdb/v2 v2.0.0-20210421194847-a7e34179d62c"
-"github.com/hashicorp/raft-boltdb/v2 v2.0.0-20210421194847-a7e34179d62c/go.mod"
-"github.com/hashicorp/raft-snapshot v1.0.3"
-"github.com/hashicorp/raft-snapshot v1.0.3/go.mod"
-"github.com/hashicorp/serf v0.8.2/go.mod"
-"github.com/hashicorp/serf v0.9.4/go.mod"
-"github.com/hashicorp/serf v0.9.5"
-"github.com/hashicorp/serf v0.9.5/go.mod"
-"github.com/hashicorp/vault-plugin-auth-alicloud v0.9.0"
-"github.com/hashicorp/vault-plugin-auth-alicloud v0.9.0/go.mod"
-"github.com/hashicorp/vault-plugin-auth-azure v0.8.0"
-"github.com/hashicorp/vault-plugin-auth-azure v0.8.0/go.mod"
-"github.com/hashicorp/vault-plugin-auth-centrify v0.9.0"
-"github.com/hashicorp/vault-plugin-auth-centrify v0.9.0/go.mod"
-"github.com/hashicorp/vault-plugin-auth-cf v0.9.0"
-"github.com/hashicorp/vault-plugin-auth-cf v0.9.0/go.mod"
-"github.com/hashicorp/vault-plugin-auth-gcp v0.5.1/go.mod"
-"github.com/hashicorp/vault-plugin-auth-gcp v0.10.0"
-"github.com/hashicorp/vault-plugin-auth-gcp v0.10.0/go.mod"
-"github.com/hashicorp/vault-plugin-auth-jwt v0.10.1"
-"github.com/hashicorp/vault-plugin-auth-jwt v0.10.1/go.mod"
-"github.com/hashicorp/vault-plugin-auth-kerberos v0.4.0"
-"github.com/hashicorp/vault-plugin-auth-kerberos v0.4.0/go.mod"
-"github.com/hashicorp/vault-plugin-auth-kubernetes v0.10.1"
-"github.com/hashicorp/vault-plugin-auth-kubernetes v0.10.1/go.mod"
-"github.com/hashicorp/vault-plugin-auth-oci v0.8.0"
-"github.com/hashicorp/vault-plugin-auth-oci v0.8.0/go.mod"
-"github.com/hashicorp/vault-plugin-database-couchbase v0.4.1"
-"github.com/hashicorp/vault-plugin-database-couchbase v0.4.1/go.mod"
-"github.com/hashicorp/vault-plugin-database-elasticsearch v0.8.0"
-"github.com/hashicorp/vault-plugin-database-elasticsearch v0.8.0/go.mod"
-"github.com/hashicorp/vault-plugin-database-mongodbatlas v0.4.0"
-"github.com/hashicorp/vault-plugin-database-mongodbatlas v0.4.0/go.mod"
-"github.com/hashicorp/vault-plugin-database-snowflake v0.2.1"
-"github.com/hashicorp/vault-plugin-database-snowflake v0.2.1/go.mod"
-"github.com/hashicorp/vault-plugin-mock v0.16.1"
-"github.com/hashicorp/vault-plugin-mock v0.16.1/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-ad v0.10.0"
-"github.com/hashicorp/vault-plugin-secrets-ad v0.10.0/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-alicloud v0.9.0"
-"github.com/hashicorp/vault-plugin-secrets-alicloud v0.9.0/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-azure v0.10.0"
-"github.com/hashicorp/vault-plugin-secrets-azure v0.10.0/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-gcp v0.10.2"
-"github.com/hashicorp/vault-plugin-secrets-gcp v0.10.2/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-gcpkms v0.9.0"
-"github.com/hashicorp/vault-plugin-secrets-gcpkms v0.9.0/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-kv v0.9.0"
-"github.com/hashicorp/vault-plugin-secrets-kv v0.9.0/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.4.0"
-"github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.4.0/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-openldap v0.5.2"
-"github.com/hashicorp/vault-plugin-secrets-openldap v0.5.2/go.mod"
-"github.com/hashicorp/vault-plugin-secrets-terraform v0.2.0"
-"github.com/hashicorp/vault-plugin-secrets-terraform v0.2.0/go.mod"
-"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
-"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
-"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
-"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
-"github.com/hpcloud/tail v1.0.0"
-"github.com/hpcloud/tail v1.0.0/go.mod"
-"github.com/huandu/xstrings v1.3.2"
-"github.com/huandu/xstrings v1.3.2/go.mod"
-"github.com/huaweicloud/golangsdk v0.0.0-20200304081349-45ec0797f2a4/go.mod"
-"github.com/hudl/fargo v1.3.0/go.mod"
-"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
-"github.com/imdario/mergo v0.3.5/go.mod"
-"github.com/imdario/mergo v0.3.6/go.mod"
-"github.com/imdario/mergo v0.3.11"
-"github.com/imdario/mergo v0.3.11/go.mod"
-"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-"github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4"
-"github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4/go.mod"
-"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
-"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733"
-"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
-"github.com/jackc/pgx v3.3.0+incompatible"
-"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
-"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
-"github.com/jarcoal/httpmock v1.0.4/go.mod"
-"github.com/jarcoal/httpmock v1.0.5"
-"github.com/jarcoal/httpmock v1.0.5/go.mod"
-"github.com/jcmturner/aescts v1.0.1"
-"github.com/jcmturner/aescts v1.0.1/go.mod"
-"github.com/jcmturner/dnsutils v1.0.1"
-"github.com/jcmturner/dnsutils v1.0.1/go.mod"
-"github.com/jcmturner/gofork v1.0.0"
-"github.com/jcmturner/gofork v1.0.0/go.mod"
-"github.com/jcmturner/goidentity/v6 v6.0.1"
-"github.com/jcmturner/goidentity/v6 v6.0.1/go.mod"
-"github.com/jcmturner/gokrb5/v8 v8.0.0"
-"github.com/jcmturner/gokrb5/v8 v8.0.0/go.mod"
-"github.com/jcmturner/rpc/v2 v2.0.2"
-"github.com/jcmturner/rpc/v2 v2.0.2/go.mod"
-"github.com/jeffchao/backoff v0.0.0-20140404060208-9d7fd7aa17f2"
-"github.com/jeffchao/backoff v0.0.0-20140404060208-9d7fd7aa17f2/go.mod"
-"github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f"
-"github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f/go.mod"
-"github.com/jefferai/jsonx v1.0.0"
-"github.com/jefferai/jsonx v1.0.0/go.mod"
-"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-"github.com/jmespath/go-jmespath v0.3.0/go.mod"
-"github.com/jmespath/go-jmespath v0.4.0"
-"github.com/jmespath/go-jmespath v0.4.0/go.mod"
-"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
-"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
-"github.com/joho/godotenv v1.3.0/go.mod"
-"github.com/jonboulle/clockwork v0.1.0"
-"github.com/jonboulle/clockwork v0.1.0/go.mod"
-"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
-"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
-"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
-"github.com/jpillora/backoff v1.0.0/go.mod"
-"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
-"github.com/json-iterator/go v1.1.5/go.mod"
-"github.com/json-iterator/go v1.1.6/go.mod"
-"github.com/json-iterator/go v1.1.7/go.mod"
-"github.com/json-iterator/go v1.1.8/go.mod"
-"github.com/json-iterator/go v1.1.9/go.mod"
-"github.com/json-iterator/go v1.1.10"
-"github.com/json-iterator/go v1.1.10/go.mod"
-"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-"github.com/jstemmer/go-junit-report v0.9.1"
-"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
-"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
-"github.com/jtolds/gls v4.20.0+incompatible"
-"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-"github.com/julienschmidt/httprouter v1.3.0/go.mod"
-"github.com/karrick/godirwalk v1.8.0/go.mod"
-"github.com/karrick/godirwalk v1.10.3/go.mod"
-"github.com/kelseyhightower/envconfig v1.3.0/go.mod"
-"github.com/kelseyhightower/envconfig v1.4.0"
-"github.com/kelseyhightower/envconfig v1.4.0/go.mod"
-"github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f"
-"github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f/go.mod"
-"github.com/kisielk/errcheck v1.1.0/go.mod"
-"github.com/kisielk/errcheck v1.2.0/go.mod"
-"github.com/kisielk/gotool v1.0.0/go.mod"
-"github.com/klauspost/compress v1.4.1/go.mod"
-"github.com/klauspost/compress v1.9.5"
-"github.com/klauspost/compress v1.9.5/go.mod"
-"github.com/klauspost/cpuid v1.2.0/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
-"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-"github.com/kr/pretty v0.1.0/go.mod"
-"github.com/kr/pretty v0.2.0/go.mod"
-"github.com/kr/pretty v0.2.1"
-"github.com/kr/pretty v0.2.1/go.mod"
-"github.com/kr/pty v1.1.1/go.mod"
-"github.com/kr/text v0.1.0/go.mod"
-"github.com/kr/text v0.2.0"
-"github.com/kr/text v0.2.0/go.mod"
-"github.com/lestrrat-go/jwx v0.9.0/go.mod"
-"github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod"
-"github.com/lib/pq v1.1.1/go.mod"
-"github.com/lib/pq v1.2.0/go.mod"
-"github.com/lib/pq v1.8.0"
-"github.com/lib/pq v1.8.0/go.mod"
-"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
-"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
-"github.com/linode/linodego v0.7.1"
-"github.com/linode/linodego v0.7.1/go.mod"
-"github.com/lyft/protoc-gen-validate v0.0.13/go.mod"
-"github.com/magiconair/properties v1.8.0/go.mod"
-"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-"github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod"
-"github.com/markbates/safe v1.0.1/go.mod"
-"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11"
-"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod"
-"github.com/mattn/go-colorable v0.0.9/go.mod"
-"github.com/mattn/go-colorable v0.1.4/go.mod"
-"github.com/mattn/go-colorable v0.1.6/go.mod"
-"github.com/mattn/go-colorable v0.1.7/go.mod"
-"github.com/mattn/go-colorable v0.1.8"
-"github.com/mattn/go-colorable v0.1.8/go.mod"
-"github.com/mattn/go-ieproxy v0.0.1"
-"github.com/mattn/go-ieproxy v0.0.1/go.mod"
-"github.com/mattn/go-isatty v0.0.3/go.mod"
-"github.com/mattn/go-isatty v0.0.4/go.mod"
-"github.com/mattn/go-isatty v0.0.8/go.mod"
-"github.com/mattn/go-isatty v0.0.10/go.mod"
-"github.com/mattn/go-isatty v0.0.11/go.mod"
-"github.com/mattn/go-isatty v0.0.12"
-"github.com/mattn/go-isatty v0.0.12/go.mod"
-"github.com/mattn/go-runewidth v0.0.2/go.mod"
-"github.com/mattn/go-runewidth v0.0.3/go.mod"
-"github.com/mattn/go-shellwords v1.0.12"
-"github.com/mattn/go-shellwords v1.0.12/go.mod"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-"github.com/mholt/archiver v3.1.1+incompatible"
-"github.com/mholt/archiver v3.1.1+incompatible/go.mod"
-"github.com/michaelklishin/rabbit-hole v0.0.0-20191008194146-93d9988f0cd5"
-"github.com/michaelklishin/rabbit-hole v0.0.0-20191008194146-93d9988f0cd5/go.mod"
-"github.com/miekg/dns v1.0.14/go.mod"
-"github.com/miekg/dns v1.1.26/go.mod"
-"github.com/miekg/dns v1.1.40"
-"github.com/miekg/dns v1.1.40/go.mod"
-"github.com/mitchellh/cli v1.0.0/go.mod"
-"github.com/mitchellh/cli v1.1.0/go.mod"
-"github.com/mitchellh/cli v1.1.2"
-"github.com/mitchellh/cli v1.1.2/go.mod"
-"github.com/mitchellh/copystructure v1.0.0"
-"github.com/mitchellh/copystructure v1.0.0/go.mod"
-"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-"github.com/mitchellh/go-homedir v1.1.0"
-"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-"github.com/mitchellh/go-testing-interface v1.14.0"
-"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
-"github.com/mitchellh/go-wordwrap v1.0.0"
-"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-"github.com/mitchellh/gox v0.4.0/go.mod"
-"github.com/mitchellh/gox v1.0.1"
-"github.com/mitchellh/gox v1.0.1/go.mod"
-"github.com/mitchellh/hashstructure v1.0.0"
-"github.com/mitchellh/hashstructure v1.0.0/go.mod"
-"github.com/mitchellh/iochan v1.0.0"
-"github.com/mitchellh/iochan v1.0.0/go.mod"
-"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-"github.com/mitchellh/mapstructure v1.2.2/go.mod"
-"github.com/mitchellh/mapstructure v1.3.2/go.mod"
-"github.com/mitchellh/mapstructure v1.3.3"
-"github.com/mitchellh/mapstructure v1.3.3/go.mod"
-"github.com/mitchellh/pointerstructure v1.0.0"
-"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
-"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-"github.com/mitchellh/reflectwalk v1.0.1"
-"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
-"github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2"
-"github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-"github.com/modern-go/reflect2 v1.0.1"
-"github.com/modern-go/reflect2 v1.0.1/go.mod"
-"github.com/mongodb/go-client-mongodb-atlas v0.1.2"
-"github.com/mongodb/go-client-mongodb-atlas v0.1.2/go.mod"
-"github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod"
-"github.com/morikuni/aec v1.0.0"
-"github.com/morikuni/aec v1.0.0/go.mod"
-"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-"github.com/mwielbut/pointy v1.1.0"
-"github.com/mwielbut/pointy v1.1.0/go.mod"
-"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
-"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-"github.com/natefinch/atomic v0.0.0-20150920032501-a62ce929ffcc"
-"github.com/natefinch/atomic v0.0.0-20150920032501-a62ce929ffcc/go.mod"
-"github.com/nats-io/jwt v0.3.0/go.mod"
-"github.com/nats-io/jwt v0.3.2/go.mod"
-"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
-"github.com/nats-io/nats.go v1.9.1/go.mod"
-"github.com/nats-io/nkeys v0.1.0/go.mod"
-"github.com/nats-io/nkeys v0.1.3/go.mod"
-"github.com/nats-io/nuid v1.0.1/go.mod"
-"github.com/ncw/swift v1.0.47"
-"github.com/ncw/swift v1.0.47/go.mod"
-"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
-"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
-"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
-"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
-"github.com/nwaples/rardecode v1.1.0"
-"github.com/nwaples/rardecode v1.1.0/go.mod"
-"github.com/oklog/oklog v0.3.2/go.mod"
-"github.com/oklog/run v1.0.0"
-"github.com/oklog/run v1.0.0/go.mod"
-"github.com/oklog/ulid v1.3.1/go.mod"
-"github.com/okta/okta-sdk-golang v1.1.0"
-"github.com/okta/okta-sdk-golang v1.1.0/go.mod"
-"github.com/okta/okta-sdk-golang/v2 v2.0.0"
-"github.com/okta/okta-sdk-golang/v2 v2.0.0/go.mod"
-"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
-"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
-"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-"github.com/onsi/ginkgo v1.6.0/go.mod"
-"github.com/onsi/ginkgo v1.7.0/go.mod"
-"github.com/onsi/ginkgo v1.8.0/go.mod"
-"github.com/onsi/ginkgo v1.10.1/go.mod"
-"github.com/onsi/ginkgo v1.11.0"
-"github.com/onsi/ginkgo v1.11.0/go.mod"
-"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
-"github.com/onsi/gomega v1.4.3/go.mod"
-"github.com/onsi/gomega v1.5.0/go.mod"
-"github.com/onsi/gomega v1.7.0"
-"github.com/onsi/gomega v1.7.0/go.mod"
-"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
-"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
-"github.com/opencontainers/go-digest v1.0.0-rc1"
-"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
-"github.com/opencontainers/image-spec v1.0.1"
-"github.com/opencontainers/image-spec v1.0.1/go.mod"
-"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
-"github.com/opencontainers/runc v0.1.1/go.mod"
-"github.com/opencontainers/runc v1.0.0-rc9"
-"github.com/opencontainers/runc v1.0.0-rc9/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.2/go.mod"
-"github.com/openlyinc/pointy v1.1.2"
-"github.com/openlyinc/pointy v1.1.2/go.mod"
-"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
-"github.com/opentracing/basictracer-go v1.0.0/go.mod"
-"github.com/opentracing/opentracing-go v1.0.2/go.mod"
-"github.com/opentracing/opentracing-go v1.1.0/go.mod"
-"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
-"github.com/openzipkin/zipkin-go v0.1.3/go.mod"
-"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
-"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
-"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
-"github.com/oracle/oci-go-sdk v7.0.0+incompatible/go.mod"
-"github.com/oracle/oci-go-sdk v12.5.0+incompatible"
-"github.com/oracle/oci-go-sdk v12.5.0+incompatible/go.mod"
-"github.com/ory/dockertest v3.3.4+incompatible/go.mod"
-"github.com/ory/dockertest v3.3.5+incompatible"
-"github.com/ory/dockertest v3.3.5+incompatible/go.mod"
-"github.com/ory/dockertest/v3 v3.6.2"
-"github.com/ory/dockertest/v3 v3.6.2/go.mod"
-"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2"
-"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod"
-"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
-"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
-"github.com/pact-foundation/pact-go v1.0.4/go.mod"
-"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-"github.com/pascaldekloe/goe v0.1.0"
-"github.com/pascaldekloe/goe v0.1.0/go.mod"
-"github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627/go.mod"
-"github.com/patrickmn/go-cache v2.1.0+incompatible"
-"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
-"github.com/pborman/uuid v1.2.0/go.mod"
-"github.com/pelletier/go-toml v1.2.0/go.mod"
-"github.com/pelletier/go-toml v1.7.0/go.mod"
-"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
-"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5"
-"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod"
-"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
-"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
-"github.com/pierrec/lz4 v2.2.6+incompatible/go.mod"
-"github.com/pierrec/lz4 v2.5.2+incompatible"
-"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
-"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
-"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod"
-"github.com/pkg/errors v0.8.0/go.mod"
-"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
-"github.com/pkg/errors v0.8.1/go.mod"
-"github.com/pkg/errors v0.9.1"
-"github.com/pkg/errors v0.9.1/go.mod"
-"github.com/pkg/profile v1.2.1/go.mod"
-"github.com/pmezard/go-difflib v1.0.0"
-"github.com/pmezard/go-difflib v1.0.0/go.mod"
-"github.com/posener/complete v1.1.1/go.mod"
-"github.com/posener/complete v1.2.3"
-"github.com/posener/complete v1.2.3/go.mod"
-"github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac"
-"github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac/go.mod"
-"github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d"
-"github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d/go.mod"
-"github.com/prometheus/client_golang v0.9.1/go.mod"
-"github.com/prometheus/client_golang v0.9.2/go.mod"
-"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
-"github.com/prometheus/client_golang v0.9.3/go.mod"
-"github.com/prometheus/client_golang v1.0.0/go.mod"
-"github.com/prometheus/client_golang v1.3.0/go.mod"
-"github.com/prometheus/client_golang v1.4.0/go.mod"
-"github.com/prometheus/client_golang v1.7.1"
-"github.com/prometheus/client_golang v1.7.1/go.mod"
-"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-"github.com/prometheus/client_model v0.1.0/go.mod"
-"github.com/prometheus/client_model v0.2.0"
-"github.com/prometheus/client_model v0.2.0/go.mod"
-"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
-"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
-"github.com/prometheus/common v0.2.0/go.mod"
-"github.com/prometheus/common v0.4.0/go.mod"
-"github.com/prometheus/common v0.4.1/go.mod"
-"github.com/prometheus/common v0.7.0/go.mod"
-"github.com/prometheus/common v0.9.1/go.mod"
-"github.com/prometheus/common v0.10.0/go.mod"
-"github.com/prometheus/common v0.11.1"
-"github.com/prometheus/common v0.11.1/go.mod"
-"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
-"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
-"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
-"github.com/prometheus/procfs v0.0.2/go.mod"
-"github.com/prometheus/procfs v0.0.8/go.mod"
-"github.com/prometheus/procfs v0.1.3"
-"github.com/prometheus/procfs v0.1.3/go.mod"
-"github.com/prometheus/tsdb v0.7.1/go.mod"
-"github.com/rboyer/safeio v0.2.1"
-"github.com/rboyer/safeio v0.2.1/go.mod"
-"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
-"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
-"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
-"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-"github.com/rogpeppe/go-internal v1.1.0/go.mod"
-"github.com/rogpeppe/go-internal v1.2.2/go.mod"
-"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-"github.com/rogpeppe/go-internal v1.6.2"
-"github.com/rogpeppe/go-internal v1.6.2/go.mod"
-"github.com/rs/zerolog v1.4.0/go.mod"
-"github.com/russross/blackfriday v1.5.2/go.mod"
-"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-"github.com/ryanuber/columnize v2.1.0+incompatible"
-"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
-"github.com/ryanuber/go-glob v1.0.0"
-"github.com/ryanuber/go-glob v1.0.0/go.mod"
-"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da"
-"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
-"github.com/sasha-s/go-deadlock v0.2.0"
-"github.com/sasha-s/go-deadlock v0.2.0/go.mod"
-"github.com/satori/go.uuid v1.2.0"
-"github.com/satori/go.uuid v1.2.0/go.mod"
-"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
-"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-"github.com/sethvargo/go-limiter v0.7.1"
-"github.com/sethvargo/go-limiter v0.7.1/go.mod"
-"github.com/shirou/gopsutil v3.21.5+incompatible"
-"github.com/shirou/gopsutil v3.21.5+incompatible/go.mod"
-"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24"
-"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
-"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
-"github.com/sirupsen/logrus v1.0.6/go.mod"
-"github.com/sirupsen/logrus v1.2.0/go.mod"
-"github.com/sirupsen/logrus v1.4.0/go.mod"
-"github.com/sirupsen/logrus v1.4.1/go.mod"
-"github.com/sirupsen/logrus v1.4.2/go.mod"
-"github.com/sirupsen/logrus v1.6.0/go.mod"
-"github.com/sirupsen/logrus v1.7.0"
-"github.com/sirupsen/logrus v1.7.0/go.mod"
-"github.com/smartystreets/assertions v0.0.0-20180725160413-e900ae048470/go.mod"
-"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
-"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
-"github.com/smartystreets/goconvey v1.6.4"
-"github.com/smartystreets/goconvey v1.6.4/go.mod"
-"github.com/snowflakedb/gosnowflake v1.6.1"
-"github.com/snowflakedb/gosnowflake v1.6.1/go.mod"
-"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
-"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
-"github.com/soheilhy/cmux v0.1.4"
-"github.com/soheilhy/cmux v0.1.4/go.mod"
-"github.com/sony/gobreaker v0.4.1/go.mod"
-"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-"github.com/spf13/afero v1.1.2/go.mod"
-"github.com/spf13/afero v1.2.1/go.mod"
-"github.com/spf13/afero v1.2.2/go.mod"
-"github.com/spf13/cast v1.3.0/go.mod"
-"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
-"github.com/spf13/cobra v0.0.3/go.mod"
-"github.com/spf13/cobra v0.0.5/go.mod"
-"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
-"github.com/spf13/pflag v1.0.1/go.mod"
-"github.com/spf13/pflag v1.0.3/go.mod"
-"github.com/spf13/pflag v1.0.5"
-"github.com/spf13/pflag v1.0.5/go.mod"
-"github.com/spf13/viper v1.3.2/go.mod"
-"github.com/spf13/viper v1.4.0/go.mod"
-"github.com/square/go-jose v2.4.1+incompatible/go.mod"
-"github.com/square/go-jose/v3 v3.0.0-20200225220504-708a9fe87ddc/go.mod"
-"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
-"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271"
-"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
-"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod"
-"github.com/stretchr/objx v0.1.0/go.mod"
-"github.com/stretchr/objx v0.1.1/go.mod"
-"github.com/stretchr/objx v0.2.0"
-"github.com/stretchr/objx v0.2.0/go.mod"
-"github.com/stretchr/testify v1.2.0/go.mod"
-"github.com/stretchr/testify v1.2.2/go.mod"
-"github.com/stretchr/testify v1.3.0/go.mod"
-"github.com/stretchr/testify v1.4.0/go.mod"
-"github.com/stretchr/testify v1.5.1/go.mod"
-"github.com/stretchr/testify v1.6.1/go.mod"
-"github.com/stretchr/testify v1.7.0"
-"github.com/stretchr/testify v1.7.0/go.mod"
-"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
-"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod"
-"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
-"github.com/tencentcloud/tencentcloud-sdk-go v3.0.171+incompatible"
-"github.com/tencentcloud/tencentcloud-sdk-go v3.0.171+incompatible/go.mod"
-"github.com/tidwall/pretty v1.0.0/go.mod"
-"github.com/tidwall/pretty v1.0.1"
-"github.com/tidwall/pretty v1.0.1/go.mod"
-"github.com/tklauser/go-sysconf v0.3.6"
-"github.com/tklauser/go-sysconf v0.3.6/go.mod"
-"github.com/tklauser/numcpus v0.2.2"
-"github.com/tklauser/numcpus v0.2.2/go.mod"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
-"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
-"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
-"github.com/ugorji/go v1.1.4/go.mod"
-"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
-"github.com/ulikunitz/xz v0.5.6/go.mod"
-"github.com/ulikunitz/xz v0.5.7"
-"github.com/ulikunitz/xz v0.5.7/go.mod"
-"github.com/urfave/cli v1.20.0/go.mod"
-"github.com/urfave/cli v1.22.1/go.mod"
-"github.com/urfave/cli v1.22.2/go.mod"
-"github.com/vmware/govmomi v0.18.0"
-"github.com/vmware/govmomi v0.18.0/go.mod"
-"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c"
-"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
-"github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod"
-"github.com/xdg/stringprep v1.0.0"
-"github.com/xdg/stringprep v1.0.0/go.mod"
-"github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8"
-"github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod"
-"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
-"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
-"github.com/yandex-cloud/go-genproto v0.0.0-20200722140432-762fe965ce77/go.mod"
-"github.com/yandex-cloud/go-sdk v0.0.0-20200722140627-2194e5077f13/go.mod"
-"github.com/yhat/scrape v0.0.0-20161128144610-24b7890b0945/go.mod"
-"github.com/yuin/goldmark v1.1.25/go.mod"
-"github.com/yuin/goldmark v1.1.27/go.mod"
-"github.com/yuin/goldmark v1.2.1/go.mod"
-"github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da"
-"github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod"
-"go.etcd.io/bbolt v1.3.2/go.mod"
-"go.etcd.io/bbolt v1.3.3/go.mod"
-"go.etcd.io/bbolt v1.3.4/go.mod"
-"go.etcd.io/bbolt v1.3.5"
-"go.etcd.io/bbolt v1.3.5/go.mod"
-"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
-"go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547"
-"go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547/go.mod"
-"go.mongodb.org/atlas v0.7.1"
-"go.mongodb.org/atlas v0.7.1/go.mod"
-"go.mongodb.org/mongo-driver v1.4.2/go.mod"
-"go.mongodb.org/mongo-driver v1.4.6"
-"go.mongodb.org/mongo-driver v1.4.6/go.mod"
-"go.opencensus.io v0.19.1/go.mod"
-"go.opencensus.io v0.19.2/go.mod"
-"go.opencensus.io v0.20.1/go.mod"
-"go.opencensus.io v0.20.2/go.mod"
-"go.opencensus.io v0.21.0/go.mod"
-"go.opencensus.io v0.22.0/go.mod"
-"go.opencensus.io v0.22.2/go.mod"
-"go.opencensus.io v0.22.3"
-"go.opencensus.io v0.22.3/go.mod"
-"go.opentelemetry.io/otel v0.20.0"
-"go.opentelemetry.io/otel v0.20.0/go.mod"
-"go.opentelemetry.io/otel/metric v0.20.0"
-"go.opentelemetry.io/otel/metric v0.20.0/go.mod"
-"go.opentelemetry.io/otel/oteltest v0.20.0"
-"go.opentelemetry.io/otel/oteltest v0.20.0/go.mod"
-"go.opentelemetry.io/otel/sdk v0.20.0"
-"go.opentelemetry.io/otel/sdk v0.20.0/go.mod"
-"go.opentelemetry.io/otel/trace v0.20.0"
-"go.opentelemetry.io/otel/trace v0.20.0/go.mod"
-"go.uber.org/atomic v1.3.2/go.mod"
-"go.uber.org/atomic v1.4.0/go.mod"
-"go.uber.org/atomic v1.5.0/go.mod"
-"go.uber.org/atomic v1.6.0"
-"go.uber.org/atomic v1.6.0/go.mod"
-"go.uber.org/goleak v1.1.10"
-"go.uber.org/goleak v1.1.10/go.mod"
-"go.uber.org/multierr v1.1.0/go.mod"
-"go.uber.org/multierr v1.3.0/go.mod"
-"go.uber.org/multierr v1.5.0"
-"go.uber.org/multierr v1.5.0/go.mod"
-"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
-"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
-"go.uber.org/zap v1.10.0/go.mod"
-"go.uber.org/zap v1.13.0/go.mod"
-"go.uber.org/zap v1.14.1"
-"go.uber.org/zap v1.14.1/go.mod"
-"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
-"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
-"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
-"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
-"golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod"
-"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-"golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod"
-"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
-"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
-"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
-"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
-"golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod"
-"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-"golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod"
-"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
-"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
-"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod"
-"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
-"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
-"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
-"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a"
-"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod"
-"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
-"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
-"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
-"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
-"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
-"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
-"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
-"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
-"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
-"golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
-"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-"golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod"
-"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
-"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
-"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
-"golang.org/x/lint v0.0.0-20200302205851-738671d3881b"
-"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
-"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
-"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
-"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-"golang.org/x/mod v0.1.0/go.mod"
-"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
-"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
-"golang.org/x/mod v0.2.0/go.mod"
-"golang.org/x/mod v0.3.0/go.mod"
-"golang.org/x/mod v0.4.0"
-"golang.org/x/mod v0.4.0/go.mod"
-"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
-"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
-"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod"
-"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
-"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
-"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
-"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
-"golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod"
-"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
-"golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
-"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
-"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
-"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
-"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
-"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
-"golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod"
-"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
-"golang.org/x/net v0.0.0-20200505041828-1ed23360d12c/go.mod"
-"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
-"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
-"golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c/go.mod"
-"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
-"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
-"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
-"golang.org/x/net v0.0.0-20210510120150-4163338589ed"
-"golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod"
-"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
-"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
-"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
-"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-"golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod"
-"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
-"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
-"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
-"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
-"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
-"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
-"golang.org/x/sys v0.0.0-20181218192612-074acd46bca6/go.mod"
-"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
-"golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod"
-"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
-"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-"golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod"
-"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
-"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
-"golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod"
-"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
-"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
-"golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod"
-"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
-"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
-"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
-"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
-"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
-"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
-"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
-"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod"
-"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
-"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
-"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
-"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
-"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
-"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-"golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod"
-"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
-"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
-"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
-"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
-"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
-"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
-"golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa/go.mod"
-"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
-"golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod"
-"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
-"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
-"golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod"
-"golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod"
-"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
-"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
-"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod"
-"golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod"
-"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
-"golang.org/x/sys v0.0.0-20210514084401-e8d321eab015"
-"golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod"
-"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
-"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1"
-"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
-"golang.org/x/text v0.3.0/go.mod"
-"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
-"golang.org/x/text v0.3.2/go.mod"
-"golang.org/x/text v0.3.3/go.mod"
-"golang.org/x/text v0.3.6"
-"golang.org/x/text v0.3.6/go.mod"
-"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
-"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
-"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
-"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
-"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-"golang.org/x/tools v0.0.0-20181219222714-6e267b5cc78e/go.mod"
-"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-"golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod"
-"golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod"
-"golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod"
-"golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod"
-"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-"golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod"
-"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
-"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-"golang.org/x/tools v0.0.0-20190718200317-82a3ea8a504c/go.mod"
-"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
-"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
-"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
-"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
-"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
-"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
-"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
-"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
-"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
-"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
-"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
-"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
-"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
-"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
-"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
-"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
-"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
-"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
-"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
-"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
-"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
-"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
-"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
-"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
-"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
-"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
-"golang.org/x/tools v0.0.0-20200409170454-77362c5149f0/go.mod"
-"golang.org/x/tools v0.0.0-20200416214402-fc959738d646/go.mod"
-"golang.org/x/tools v0.0.0-20200521155704-91d71f6c2f04/go.mod"
-"golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c"
-"golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/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"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
-"google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod"
-"google.golang.org/api v0.2.0/go.mod"
-"google.golang.org/api v0.3.0/go.mod"
-"google.golang.org/api v0.3.1/go.mod"
-"google.golang.org/api v0.3.2/go.mod"
-"google.golang.org/api v0.4.0/go.mod"
-"google.golang.org/api v0.5.0/go.mod"
-"google.golang.org/api v0.7.0/go.mod"
-"google.golang.org/api v0.8.0/go.mod"
-"google.golang.org/api v0.9.0/go.mod"
-"google.golang.org/api v0.13.0/go.mod"
-"google.golang.org/api v0.14.0/go.mod"
-"google.golang.org/api v0.15.0/go.mod"
-"google.golang.org/api v0.17.0/go.mod"
-"google.golang.org/api v0.18.0/go.mod"
-"google.golang.org/api v0.19.0/go.mod"
-"google.golang.org/api v0.20.0/go.mod"
-"google.golang.org/api v0.21.0/go.mod"
-"google.golang.org/api v0.24.0/go.mod"
-"google.golang.org/api v0.29.0"
-"google.golang.org/api v0.29.0/go.mod"
-"google.golang.org/appengine v1.1.0/go.mod"
-"google.golang.org/appengine v1.2.0/go.mod"
-"google.golang.org/appengine v1.3.0/go.mod"
-"google.golang.org/appengine v1.4.0/go.mod"
-"google.golang.org/appengine v1.5.0/go.mod"
-"google.golang.org/appengine v1.6.0/go.mod"
-"google.golang.org/appengine v1.6.1/go.mod"
-"google.golang.org/appengine v1.6.5"
-"google.golang.org/appengine v1.6.5/go.mod"
-"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-"google.golang.org/genproto v0.0.0-20181219182458-5a97ab628bfb/go.mod"
-"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
-"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-"google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod"
-"google.golang.org/genproto v0.0.0-20190513181449-d00d292a067c/go.mod"
-"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
-"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
-"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
-"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
-"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
-"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
-"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
-"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
-"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
-"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
-"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
-"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
-"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
-"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
-"google.golang.org/genproto v0.0.0-20200323114720-3f67cca34472/go.mod"
-"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
-"google.golang.org/genproto v0.0.0-20200409111301-baae70f3302d/go.mod"
-"google.golang.org/genproto v0.0.0-20200416231807-8751e049a2a0/go.mod"
-"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013"
-"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
-"google.golang.org/grpc v1.14.0/go.mod"
-"google.golang.org/grpc v1.16.0/go.mod"
-"google.golang.org/grpc v1.17.0/go.mod"
-"google.golang.org/grpc v1.19.0/go.mod"
-"google.golang.org/grpc v1.20.0/go.mod"
-"google.golang.org/grpc v1.20.1/go.mod"
-"google.golang.org/grpc v1.21.0/go.mod"
-"google.golang.org/grpc v1.21.1/go.mod"
-"google.golang.org/grpc v1.22.0/go.mod"
-"google.golang.org/grpc v1.22.1/go.mod"
-"google.golang.org/grpc v1.23.0/go.mod"
-"google.golang.org/grpc v1.23.1/go.mod"
-"google.golang.org/grpc v1.25.1/go.mod"
-"google.golang.org/grpc v1.26.0/go.mod"
-"google.golang.org/grpc v1.27.0/go.mod"
-"google.golang.org/grpc v1.27.1/go.mod"
-"google.golang.org/grpc v1.28.0/go.mod"
-"google.golang.org/grpc v1.28.1/go.mod"
-"google.golang.org/grpc v1.29.1"
-"google.golang.org/grpc v1.29.1/go.mod"
-"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-"google.golang.org/protobuf v1.21.0/go.mod"
-"google.golang.org/protobuf v1.22.0/go.mod"
-"google.golang.org/protobuf v1.23.0/go.mod"
-"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
-"google.golang.org/protobuf v1.24.0/go.mod"
-"google.golang.org/protobuf v1.25.0"
-"google.golang.org/protobuf v1.25.0/go.mod"
-"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
-"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
-"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
-"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
-"gopkg.in/errgo.v2 v2.1.0"
-"gopkg.in/errgo.v2 v2.1.0/go.mod"
-"gopkg.in/fsnotify.v1 v1.4.7"
-"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-"gopkg.in/gcfg.v1 v1.2.3/go.mod"
-"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-"gopkg.in/inf.v0 v0.9.0/go.mod"
-"gopkg.in/inf.v0 v0.9.1"
-"gopkg.in/inf.v0 v0.9.1/go.mod"
-"gopkg.in/ini.v1 v1.42.0"
-"gopkg.in/ini.v1 v1.42.0/go.mod"
-"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
-"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
-"gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce"
-"gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod"
-"gopkg.in/ory-am/dockertest.v3 v3.3.4"
-"gopkg.in/ory-am/dockertest.v3 v3.3.4/go.mod"
-"gopkg.in/resty.v1 v1.12.0"
-"gopkg.in/resty.v1 v1.12.0/go.mod"
-"gopkg.in/square/go-jose.v2 v2.3.0/go.mod"
-"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
-"gopkg.in/square/go-jose.v2 v2.4.1/go.mod"
-"gopkg.in/square/go-jose.v2 v2.5.1"
-"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-"gopkg.in/warnings.v0 v0.1.2/go.mod"
-"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-"gopkg.in/yaml.v2 v2.2.1/go.mod"
-"gopkg.in/yaml.v2 v2.2.2/go.mod"
-"gopkg.in/yaml.v2 v2.2.4/go.mod"
-"gopkg.in/yaml.v2 v2.2.5/go.mod"
-"gopkg.in/yaml.v2 v2.2.7/go.mod"
-"gopkg.in/yaml.v2 v2.2.8/go.mod"
-"gopkg.in/yaml.v2 v2.3.0"
-"gopkg.in/yaml.v2 v2.3.0/go.mod"
-"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
-"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
-"gotest.tools v2.2.0+incompatible"
-"gotest.tools v2.2.0+incompatible/go.mod"
-"gotest.tools/v3 v3.0.2"
-"gotest.tools/v3 v3.0.2/go.mod"
-"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
-"honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod"
-"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-"honnef.co/go/tools v0.0.1-2020.1.3"
-"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
-"k8s.io/api v0.0.0-20190409092523-d687e77c8ae9/go.mod"
-"k8s.io/api v0.18.2"
-"k8s.io/api v0.18.2/go.mod"
-"k8s.io/apimachinery v0.0.0-20190409092423-760d1845f48b/go.mod"
-"k8s.io/apimachinery v0.18.2"
-"k8s.io/apimachinery v0.18.2/go.mod"
-"k8s.io/client-go v0.18.2"
-"k8s.io/client-go v0.18.2/go.mod"
-"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-"k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod"
-"k8s.io/klog v0.3.0/go.mod"
-"k8s.io/klog v1.0.0"
-"k8s.io/klog v1.0.0/go.mod"
-"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
-"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod"
-"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
-"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
-"layeh.com/radius v0.0.0-20190322222518-890bc1058917"
-"layeh.com/radius v0.0.0-20190322222518-890bc1058917/go.mod"
-"mvdan.cc/gofumpt v0.1.1"
-"mvdan.cc/gofumpt v0.1.1/go.mod"
-"rsc.io/binaryregexp v0.2.0/go.mod"
-"rsc.io/quote/v3 v3.1.0/go.mod"
-"rsc.io/sampler v1.3.0/go.mod"
-"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
-"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
-"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
-"sigs.k8s.io/yaml v1.1.0/go.mod"
-"sigs.k8s.io/yaml v1.2.0"
-"sigs.k8s.io/yaml v1.2.0/go.mod"
-"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
-)
-go-module_set_globals
-
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	webui? (
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+webui"
-
-BDEPEND="dev-go/gox
-	>=dev-lang/go-1.15.3"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-PATCHES=( "${FILESDIR}"/vault-1.8.2-go-limiter.patch )
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-e "s/gofumpt/gofmt/g" \
-		-i Makefile || die
-	if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then
-		mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" ||
-			die "mv failed"
-	fi
-}
-
-src_compile() {
-	mkdir "${T}"/bin || die
-	BUILD_TAGS="$(usex webui ui '')" \
-	GOFLAGS="-mod=readonly" \
-	GOPATH="${T}" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-admin/vault/vault-1.8.4.ebuild b/app-admin/vault/vault-1.8.4.ebuild
new file mode 100644
index 000000000000..edfbaa191bd8
--- /dev/null
+++ b/app-admin/vault/vault-1.8.4.ebuild
@@ -0,0 +1,1837 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+EGO_SUM=(
+"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.38.0/go.mod"
+"cloud.google.com/go v0.39.0/go.mod"
+"cloud.google.com/go v0.44.1/go.mod"
+"cloud.google.com/go v0.44.2/go.mod"
+"cloud.google.com/go v0.45.1/go.mod"
+"cloud.google.com/go v0.46.3/go.mod"
+"cloud.google.com/go v0.50.0/go.mod"
+"cloud.google.com/go v0.52.0/go.mod"
+"cloud.google.com/go v0.53.0/go.mod"
+"cloud.google.com/go v0.54.0/go.mod"
+"cloud.google.com/go v0.56.0"
+"cloud.google.com/go v0.56.0/go.mod"
+"cloud.google.com/go/bigquery v1.0.1/go.mod"
+"cloud.google.com/go/bigquery v1.3.0/go.mod"
+"cloud.google.com/go/bigquery v1.4.0/go.mod"
+"cloud.google.com/go/bigquery v1.5.0/go.mod"
+"cloud.google.com/go/bigquery v1.6.0"
+"cloud.google.com/go/bigquery v1.6.0/go.mod"
+"cloud.google.com/go/datastore v1.0.0/go.mod"
+"cloud.google.com/go/datastore v1.1.0"
+"cloud.google.com/go/datastore v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.0.1/go.mod"
+"cloud.google.com/go/pubsub v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.2.0/go.mod"
+"cloud.google.com/go/pubsub v1.3.1"
+"cloud.google.com/go/pubsub v1.3.1/go.mod"
+"cloud.google.com/go/spanner v1.5.1"
+"cloud.google.com/go/spanner v1.5.1/go.mod"
+"cloud.google.com/go/storage v1.0.0/go.mod"
+"cloud.google.com/go/storage v1.5.0/go.mod"
+"cloud.google.com/go/storage v1.6.0"
+"cloud.google.com/go/storage v1.6.0/go.mod"
+"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f"
+"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod"
+"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+"git.apache.org/thrift.git v0.12.0/go.mod"
+"github.com/Azure/azure-pipeline-go v0.2.3"
+"github.com/Azure/azure-pipeline-go v0.2.3/go.mod"
+"github.com/Azure/azure-sdk-for-go v36.2.0+incompatible/go.mod"
+"github.com/Azure/azure-sdk-for-go v44.0.0+incompatible/go.mod"
+"github.com/Azure/azure-sdk-for-go v51.1.0+incompatible"
+"github.com/Azure/azure-sdk-for-go v51.1.0+incompatible/go.mod"
+"github.com/Azure/azure-storage-blob-go v0.13.0"
+"github.com/Azure/azure-storage-blob-go v0.13.0/go.mod"
+"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+"github.com/Azure/go-autorest v14.2.0+incompatible"
+"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.2/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+"github.com/Azure/go-autorest/autorest v0.10.1/go.mod"
+"github.com/Azure/go-autorest/autorest v0.11.0/go.mod"
+"github.com/Azure/go-autorest/autorest v0.11.17"
+"github.com/Azure/go-autorest/autorest v0.11.17/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.6.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.7.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.2/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.11"
+"github.com/Azure/go-autorest/autorest/adal v0.9.11/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.0/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.5.0/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.5.7"
+"github.com/Azure/go-autorest/autorest/azure/auth v0.5.7/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2"
+"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.3.0"
+"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/to v0.4.0"
+"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.3.1"
+"github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod"
+"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+"github.com/Azure/go-autorest/logger v0.2.0"
+"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.6.0"
+"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
+"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
+"github.com/BurntSushi/toml v0.3.1"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+"github.com/DataDog/datadog-go v3.2.0+incompatible"
+"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+"github.com/Jeffail/gabs v1.1.1"
+"github.com/Jeffail/gabs v1.1.1/go.mod"
+"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod"
+"github.com/Masterminds/goutils v1.1.0"
+"github.com/Masterminds/goutils v1.1.0/go.mod"
+"github.com/Masterminds/semver v1.4.2/go.mod"
+"github.com/Masterminds/semver v1.5.0"
+"github.com/Masterminds/semver v1.5.0/go.mod"
+"github.com/Masterminds/sprig v2.22.0+incompatible"
+"github.com/Masterminds/sprig v2.22.0+incompatible/go.mod"
+"github.com/Microsoft/go-winio v0.4.13/go.mod"
+"github.com/Microsoft/go-winio v0.4.14/go.mod"
+"github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331"
+"github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod"
+"github.com/Microsoft/hcsshim v0.8.14"
+"github.com/Microsoft/hcsshim v0.8.14/go.mod"
+"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+"github.com/NYTimes/gziphandler v1.1.1"
+"github.com/NYTimes/gziphandler v1.1.1/go.mod"
+"github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5"
+"github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+"github.com/SAP/go-hdb v0.14.1"
+"github.com/SAP/go-hdb v0.14.1/go.mod"
+"github.com/Sectorbob/mlab-ns2 v0.0.0-20171030222938-d3aa0c295a8a"
+"github.com/Sectorbob/mlab-ns2 v0.0.0-20171030222938-d3aa0c295a8a/go.mod"
+"github.com/Shopify/sarama v1.19.0/go.mod"
+"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
+"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
+"github.com/VividCortex/gohistogram v1.0.0/go.mod"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+"github.com/aerospike/aerospike-client-go v3.1.1+incompatible"
+"github.com/aerospike/aerospike-client-go v3.1.1+incompatible/go.mod"
+"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190412020505-60e2075261b6/go.mod"
+"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190620160927-9418d7b0cd0f"
+"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190620160927-9418d7b0cd0f/go.mod"
+"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5"
+"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod"
+"github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230"
+"github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230/go.mod"
+"github.com/apache/thrift v0.12.0/go.mod"
+"github.com/apache/thrift v0.13.0/go.mod"
+"github.com/apple/foundationdb/bindings/go v0.0.0-20190411004307-cd5c9d91fad2"
+"github.com/apple/foundationdb/bindings/go v0.0.0-20190411004307-cd5c9d91fad2/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+"github.com/armon/go-metrics v0.3.0/go.mod"
+"github.com/armon/go-metrics v0.3.3/go.mod"
+"github.com/armon/go-metrics v0.3.4/go.mod"
+"github.com/armon/go-metrics v0.3.7"
+"github.com/armon/go-metrics v0.3.7/go.mod"
+"github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a"
+"github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/armon/go-radix v1.0.0"
+"github.com/armon/go-radix v1.0.0/go.mod"
+"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
+"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf"
+"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+"github.com/aws/aws-lambda-go v1.13.3/go.mod"
+"github.com/aws/aws-sdk-go v1.25.41/go.mod"
+"github.com/aws/aws-sdk-go v1.27.0/go.mod"
+"github.com/aws/aws-sdk-go v1.30.27/go.mod"
+"github.com/aws/aws-sdk-go v1.34.28/go.mod"
+"github.com/aws/aws-sdk-go v1.37.19"
+"github.com/aws/aws-sdk-go v1.37.19/go.mod"
+"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
+"github.com/aws/aws-sdk-go-v2 v1.3.2"
+"github.com/aws/aws-sdk-go-v2 v1.3.2/go.mod"
+"github.com/aws/aws-sdk-go-v2/config v1.1.5"
+"github.com/aws/aws-sdk-go-v2/config v1.1.5/go.mod"
+"github.com/aws/aws-sdk-go-v2/credentials v1.1.5"
+"github.com/aws/aws-sdk-go-v2/credentials v1.1.5/go.mod"
+"github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6"
+"github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6/go.mod"
+"github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.1.2"
+"github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.1.2/go.mod"
+"github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.4"
+"github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.4/go.mod"
+"github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.6"
+"github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.6/go.mod"
+"github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2"
+"github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2/go.mod"
+"github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0"
+"github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0/go.mod"
+"github.com/aws/aws-sdk-go-v2/service/sso v1.1.5"
+"github.com/aws/aws-sdk-go-v2/service/sso v1.1.5/go.mod"
+"github.com/aws/aws-sdk-go-v2/service/sts v1.2.2"
+"github.com/aws/aws-sdk-go-v2/service/sts v1.2.2/go.mod"
+"github.com/aws/smithy-go v1.3.1"
+"github.com/aws/smithy-go v1.3.1/go.mod"
+"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
+"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod"
+"github.com/bitly/go-hostpool v0.1.0"
+"github.com/bitly/go-hostpool v0.1.0/go.mod"
+"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869"
+"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc"
+"github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod"
+"github.com/briankassouf/jose v0.9.2-0.20180619214549-d2569464773f"
+"github.com/briankassouf/jose v0.9.2-0.20180619214549-d2569464773f/go.mod"
+"github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee/go.mod"
+"github.com/casbin/casbin/v2 v2.1.2/go.mod"
+"github.com/cenkalti/backoff v2.2.1+incompatible"
+"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
+"github.com/cenkalti/backoff/v3 v3.0.0"
+"github.com/cenkalti/backoff/v3 v3.0.0/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/centrify/cloud-golang-sdk v0.0.0-20190214225812-119110094d0f"
+"github.com/centrify/cloud-golang-sdk v0.0.0-20190214225812-119110094d0f/go.mod"
+"github.com/cespare/xxhash v1.1.0"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/chrismalek/oktasdk-go v0.0.0-20181212195951-3430665dfaa0"
+"github.com/chrismalek/oktasdk-go v0.0.0-20181212195951-3430665dfaa0/go.mod"
+"github.com/chzyer/logex v1.1.10/go.mod"
+"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+"github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+"github.com/circonus-labs/circonusllhist v0.1.3"
+"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+"github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
+"github.com/client9/misspell v0.3.4"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190201205600-f136f9222381"
+"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190201205600-f136f9222381/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+"github.com/cockroachdb/apd v1.1.0"
+"github.com/cockroachdb/apd v1.1.0/go.mod"
+"github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c"
+"github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c/go.mod"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
+"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0"
+"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
+"github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod"
+"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+"github.com/containerd/containerd v1.3.2/go.mod"
+"github.com/containerd/containerd v1.4.3"
+"github.com/containerd/containerd v1.4.3/go.mod"
+"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
+"github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod"
+"github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe"
+"github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod"
+"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
+"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+"github.com/coreos/bbolt v1.3.2/go.mod"
+"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+"github.com/coreos/go-oidc v2.2.1+incompatible"
+"github.com/coreos/go-oidc v2.2.1+incompatible/go.mod"
+"github.com/coreos/go-oidc/v3 v3.0.0"
+"github.com/coreos/go-oidc/v3 v3.0.0/go.mod"
+"github.com/coreos/go-semver v0.2.0"
+"github.com/coreos/go-semver v0.2.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf"
+"github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod"
+"github.com/coreos/go-systemd/v22 v22.0.0"
+"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
+"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/couchbase/gocb/v2 v2.1.4"
+"github.com/couchbase/gocb/v2 v2.1.4/go.mod"
+"github.com/couchbase/gocbcore/v9 v9.0.4"
+"github.com/couchbase/gocbcore/v9 v9.0.4/go.mod"
+"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+"github.com/creack/pty v1.1.7/go.mod"
+"github.com/creack/pty v1.1.9"
+"github.com/creack/pty v1.1.9/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc"
+"github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
+"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/digitalocean/godo v1.7.5"
+"github.com/digitalocean/godo v1.7.5/go.mod"
+"github.com/dimchansky/utfbom v1.1.0/go.mod"
+"github.com/dimchansky/utfbom v1.1.1"
+"github.com/dimchansky/utfbom v1.1.1/go.mod"
+"github.com/dnaeon/go-vcr v1.0.1"
+"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+"github.com/docker/distribution v2.7.1+incompatible"
+"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+"github.com/docker/docker v1.4.2-0.20200319182547-c7ad2b866182/go.mod"
+"github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible"
+"github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible/go.mod"
+"github.com/docker/go-connections v0.4.0"
+"github.com/docker/go-connections v0.4.0/go.mod"
+"github.com/docker/go-units v0.3.3/go.mod"
+"github.com/docker/go-units v0.4.0"
+"github.com/docker/go-units v0.4.0/go.mod"
+"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+"github.com/dsnet/compress v0.0.1"
+"github.com/dsnet/compress v0.0.1/go.mod"
+"github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod"
+"github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74"
+"github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74/go.mod"
+"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+"github.com/dustin/go-humanize v1.0.0"
+"github.com/dustin/go-humanize v1.0.0/go.mod"
+"github.com/eapache/go-resiliency v1.1.0/go.mod"
+"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+"github.com/eapache/queue v1.1.0/go.mod"
+"github.com/edsrzf/mmap-go v1.0.0/go.mod"
+"github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f"
+"github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
+"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/fatih/color v1.11.0/go.mod"
+"github.com/fatih/color v1.13.0"
+"github.com/fatih/color v1.13.0/go.mod"
+"github.com/fatih/structs v1.1.0"
+"github.com/fatih/structs v1.1.0/go.mod"
+"github.com/form3tech-oss/jwt-go v3.2.2+incompatible"
+"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
+"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
+"github.com/frankban/quicktest v1.4.0/go.mod"
+"github.com/frankban/quicktest v1.4.1/go.mod"
+"github.com/frankban/quicktest v1.10.0/go.mod"
+"github.com/frankban/quicktest v1.13.0"
+"github.com/frankban/quicktest v1.13.0/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7"
+"github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7/go.mod"
+"github.com/gammazero/workerpool v0.0.0-20190406235159-88d534f22b56"
+"github.com/gammazero/workerpool v0.0.0-20190406235159-88d534f22b56/go.mod"
+"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32"
+"github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod"
+"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
+"github.com/go-asn1-ber/asn1-ber v1.4.1/go.mod"
+"github.com/go-asn1-ber/asn1-ber v1.5.1"
+"github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod"
+"github.com/go-errors/errors v1.0.1"
+"github.com/go-errors/errors v1.0.1/go.mod"
+"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-kit/kit v0.10.0/go.mod"
+"github.com/go-ldap/ldap/v3 v3.1.3/go.mod"
+"github.com/go-ldap/ldap/v3 v3.1.7/go.mod"
+"github.com/go-ldap/ldap/v3 v3.1.10/go.mod"
+"github.com/go-ldap/ldap/v3 v3.2.4"
+"github.com/go-ldap/ldap/v3 v3.2.4/go.mod"
+"github.com/go-ldap/ldif v0.0.0-20200320164324-fd88d9b715b3"
+"github.com/go-ldap/ldif v0.0.0-20200320164324-fd88d9b715b3/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logfmt/logfmt v0.5.0/go.mod"
+"github.com/go-logr/logr v0.1.0/go.mod"
+"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab"
+"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
+"github.com/go-ole/go-ole v1.2.4"
+"github.com/go-ole/go-ole v1.2.4/go.mod"
+"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+"github.com/go-sql-driver/mysql v1.4.0/go.mod"
+"github.com/go-sql-driver/mysql v1.5.0"
+"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+"github.com/go-stack/stack v1.8.0"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/go-test/deep v1.0.1/go.mod"
+"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+"github.com/go-test/deep v1.0.2/go.mod"
+"github.com/go-test/deep v1.0.7"
+"github.com/go-test/deep v1.0.7/go.mod"
+"github.com/go-yaml/yaml v2.1.0+incompatible"
+"github.com/go-yaml/yaml v2.1.0+incompatible/go.mod"
+"github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod"
+"github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod"
+"github.com/gobuffalo/depgen v0.1.0/go.mod"
+"github.com/gobuffalo/envy v1.6.15/go.mod"
+"github.com/gobuffalo/envy v1.7.0/go.mod"
+"github.com/gobuffalo/flect v0.1.0/go.mod"
+"github.com/gobuffalo/flect v0.1.1/go.mod"
+"github.com/gobuffalo/flect v0.1.3/go.mod"
+"github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod"
+"github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod"
+"github.com/gobuffalo/genny v0.1.0/go.mod"
+"github.com/gobuffalo/genny v0.1.1/go.mod"
+"github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod"
+"github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod"
+"github.com/gobuffalo/gogen v0.1.0/go.mod"
+"github.com/gobuffalo/gogen v0.1.1/go.mod"
+"github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod"
+"github.com/gobuffalo/mapi v1.0.1/go.mod"
+"github.com/gobuffalo/mapi v1.0.2/go.mod"
+"github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod"
+"github.com/gobuffalo/packd v0.1.0/go.mod"
+"github.com/gobuffalo/packr/v2 v2.0.9/go.mod"
+"github.com/gobuffalo/packr/v2 v2.2.0/go.mod"
+"github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod"
+"github.com/gocql/gocql v0.0.0-20210401103645-80ab1e13e309"
+"github.com/gocql/gocql v0.0.0-20210401103645-80ab1e13e309/go.mod"
+"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+"github.com/gogo/googleapis v1.1.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.0/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/gogo/protobuf v1.3.1"
+"github.com/gogo/protobuf v1.3.1/go.mod"
+"github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod"
+"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe"
+"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+"github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/mock v1.3.1/go.mod"
+"github.com/golang/mock v1.4.0/go.mod"
+"github.com/golang/mock v1.4.1/go.mod"
+"github.com/golang/mock v1.4.3"
+"github.com/golang/mock v1.4.3/go.mod"
+"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/protobuf v1.3.3/go.mod"
+"github.com/golang/protobuf v1.3.4/go.mod"
+"github.com/golang/protobuf v1.3.5/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+"github.com/golang/protobuf v1.4.0/go.mod"
+"github.com/golang/protobuf v1.4.1/go.mod"
+"github.com/golang/protobuf v1.4.2"
+"github.com/golang/protobuf v1.4.2/go.mod"
+"github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod"
+"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+"github.com/golang/snappy v0.0.1/go.mod"
+"github.com/golang/snappy v0.0.2/go.mod"
+"github.com/golang/snappy v0.0.4"
+"github.com/golang/snappy v0.0.4/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/flatbuffers v1.11.0"
+"github.com/google/flatbuffers v1.11.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.0/go.mod"
+"github.com/google/go-cmp v0.5.2/go.mod"
+"github.com/google/go-cmp v0.5.4/go.mod"
+"github.com/google/go-cmp v0.5.5"
+"github.com/google/go-cmp v0.5.5/go.mod"
+"github.com/google/go-github v17.0.0+incompatible"
+"github.com/google/go-github v17.0.0+incompatible/go.mod"
+"github.com/google/go-metrics-stackdriver v0.2.0"
+"github.com/google/go-metrics-stackdriver v0.2.0/go.mod"
+"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
+"github.com/google/go-querystring v1.0.0"
+"github.com/google/go-querystring v1.0.0/go.mod"
+"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/gofuzz v1.1.0"
+"github.com/google/gofuzz v1.1.0/go.mod"
+"github.com/google/martian v2.1.0+incompatible"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+"github.com/google/renameio v0.1.0/go.mod"
+"github.com/google/uuid v1.0.0/go.mod"
+"github.com/google/uuid v1.1.1/go.mod"
+"github.com/google/uuid v1.1.2"
+"github.com/google/uuid v1.1.2/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+"github.com/googleapis/gnostic v0.1.0/go.mod"
+"github.com/googleapis/gnostic v0.2.0"
+"github.com/googleapis/gnostic v0.2.0/go.mod"
+"github.com/gophercloud/gophercloud v0.1.0"
+"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20180628210949-0892b62f0d9f/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+"github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75"
+"github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod"
+"github.com/gorilla/context v1.1.1/go.mod"
+"github.com/gorilla/mux v1.6.2/go.mod"
+"github.com/gorilla/mux v1.7.3"
+"github.com/gorilla/mux v1.7.3/go.mod"
+"github.com/gorilla/securecookie v1.1.1"
+"github.com/gorilla/securecookie v1.1.1/go.mod"
+"github.com/gorilla/sessions v1.2.0"
+"github.com/gorilla/sessions v1.2.0/go.mod"
+"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/gorilla/websocket v1.4.1"
+"github.com/gorilla/websocket v1.4.1/go.mod"
+"github.com/gotestyourself/gotestyourself v2.2.0+incompatible"
+"github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.6.2/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+"github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed"
+"github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod"
+"github.com/hashicorp/cap v0.1.0"
+"github.com/hashicorp/cap v0.1.0/go.mod"
+"github.com/hashicorp/consul-template v0.26.0"
+"github.com/hashicorp/consul-template v0.26.0/go.mod"
+"github.com/hashicorp/consul/api v1.3.0/go.mod"
+"github.com/hashicorp/consul/api v1.4.0"
+"github.com/hashicorp/consul/api v1.4.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.4.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.4.1-0.20200910203702-bb2b5dd871ca"
+"github.com/hashicorp/consul/sdk v0.4.1-0.20200910203702-bb2b5dd871ca/go.mod"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/errwrap v1.1.0"
+"github.com/hashicorp/errwrap v1.1.0/go.mod"
+"github.com/hashicorp/go-bindata v3.0.8-0.20180209072458-bf7910af8997+incompatible"
+"github.com/hashicorp/go-bindata v3.0.8-0.20180209072458-bf7910af8997+incompatible/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.2"
+"github.com/hashicorp/go-cleanhttp v0.5.2/go.mod"
+"github.com/hashicorp/go-discover v0.0.0-20201029210230-738cb3105cd0"
+"github.com/hashicorp/go-discover v0.0.0-20201029210230-738cb3105cd0/go.mod"
+"github.com/hashicorp/go-gatedio v0.5.0"
+"github.com/hashicorp/go-gatedio v0.5.0/go.mod"
+"github.com/hashicorp/go-gcp-common v0.5.0/go.mod"
+"github.com/hashicorp/go-gcp-common v0.7.0"
+"github.com/hashicorp/go-gcp-common v0.7.0/go.mod"
+"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+"github.com/hashicorp/go-hclog v0.8.0/go.mod"
+"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+"github.com/hashicorp/go-hclog v0.14.1/go.mod"
+"github.com/hashicorp/go-hclog v0.15.0/go.mod"
+"github.com/hashicorp/go-hclog v0.16.1/go.mod"
+"github.com/hashicorp/go-hclog v0.16.2"
+"github.com/hashicorp/go-hclog v0.16.2/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.3.0"
+"github.com/hashicorp/go-immutable-radix v1.3.0/go.mod"
+"github.com/hashicorp/go-kms-wrapping v0.6.7"
+"github.com/hashicorp/go-kms-wrapping v0.6.7/go.mod"
+"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0"
+"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod"
+"github.com/hashicorp/go-memdb v1.0.2"
+"github.com/hashicorp/go-memdb v1.0.2/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+"github.com/hashicorp/go-msgpack v1.1.5"
+"github.com/hashicorp/go-msgpack v1.1.5/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.1"
+"github.com/hashicorp/go-multierror v1.1.1/go.mod"
+"github.com/hashicorp/go-plugin v1.0.1"
+"github.com/hashicorp/go-plugin v1.0.1/go.mod"
+"github.com/hashicorp/go-raftchunking v0.6.3-0.20191002164813-7e9e8525653a"
+"github.com/hashicorp/go-raftchunking v0.6.3-0.20191002164813-7e9e8525653a/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.7"
+"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.2"
+"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+"github.com/hashicorp/go-secure-stdlib/awsutil v0.1.2"
+"github.com/hashicorp/go-secure-stdlib/awsutil v0.1.2/go.mod"
+"github.com/hashicorp/go-secure-stdlib/strutil v0.1.1"
+"github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod"
+"github.com/hashicorp/go-slug v0.4.1"
+"github.com/hashicorp/go-slug v0.4.1/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.2"
+"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-tfe v0.12.0"
+"github.com/hashicorp/go-tfe v0.12.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go-uuid v1.0.2"
+"github.com/hashicorp/go-uuid v1.0.2/go.mod"
+"github.com/hashicorp/go-version v1.0.0/go.mod"
+"github.com/hashicorp/go-version v1.2.0/go.mod"
+"github.com/hashicorp/go-version v1.2.1"
+"github.com/hashicorp/go-version v1.2.1/go.mod"
+"github.com/hashicorp/go.net v0.0.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.3/go.mod"
+"github.com/hashicorp/golang-lru v0.5.4"
+"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/hcl v1.0.1-vault-3"
+"github.com/hashicorp/hcl v1.0.1-vault-3/go.mod"
+"github.com/hashicorp/logutils v1.0.0"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.1"
+"github.com/hashicorp/mdns v1.0.1/go.mod"
+"github.com/hashicorp/memberlist v0.1.3/go.mod"
+"github.com/hashicorp/memberlist v0.2.2"
+"github.com/hashicorp/memberlist v0.2.2/go.mod"
+"github.com/hashicorp/nomad/api v0.0.0-20191220223628-edc62acd919d"
+"github.com/hashicorp/nomad/api v0.0.0-20191220223628-edc62acd919d/go.mod"
+"github.com/hashicorp/raft v1.0.1/go.mod"
+"github.com/hashicorp/raft v1.1.0/go.mod"
+"github.com/hashicorp/raft v1.1.2-0.20191002163536-9c6bd3e3eb17/go.mod"
+"github.com/hashicorp/raft v1.2.0/go.mod"
+"github.com/hashicorp/raft v1.3.0"
+"github.com/hashicorp/raft v1.3.0/go.mod"
+"github.com/hashicorp/raft-autopilot v0.1.3"
+"github.com/hashicorp/raft-autopilot v0.1.3/go.mod"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
+"github.com/hashicorp/raft-boltdb/v2 v2.0.0-20210421194847-a7e34179d62c"
+"github.com/hashicorp/raft-boltdb/v2 v2.0.0-20210421194847-a7e34179d62c/go.mod"
+"github.com/hashicorp/raft-snapshot v1.0.3"
+"github.com/hashicorp/raft-snapshot v1.0.3/go.mod"
+"github.com/hashicorp/serf v0.8.2/go.mod"
+"github.com/hashicorp/serf v0.9.4/go.mod"
+"github.com/hashicorp/serf v0.9.5"
+"github.com/hashicorp/serf v0.9.5/go.mod"
+"github.com/hashicorp/vault-plugin-auth-alicloud v0.9.0"
+"github.com/hashicorp/vault-plugin-auth-alicloud v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-azure v0.8.0"
+"github.com/hashicorp/vault-plugin-auth-azure v0.8.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-centrify v0.9.0"
+"github.com/hashicorp/vault-plugin-auth-centrify v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-cf v0.9.0"
+"github.com/hashicorp/vault-plugin-auth-cf v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-gcp v0.5.1/go.mod"
+"github.com/hashicorp/vault-plugin-auth-gcp v0.10.0"
+"github.com/hashicorp/vault-plugin-auth-gcp v0.10.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-jwt v0.10.1"
+"github.com/hashicorp/vault-plugin-auth-jwt v0.10.1/go.mod"
+"github.com/hashicorp/vault-plugin-auth-kerberos v0.4.0"
+"github.com/hashicorp/vault-plugin-auth-kerberos v0.4.0/go.mod"
+"github.com/hashicorp/vault-plugin-auth-kubernetes v0.10.1"
+"github.com/hashicorp/vault-plugin-auth-kubernetes v0.10.1/go.mod"
+"github.com/hashicorp/vault-plugin-auth-oci v0.8.0"
+"github.com/hashicorp/vault-plugin-auth-oci v0.8.0/go.mod"
+"github.com/hashicorp/vault-plugin-database-couchbase v0.4.1"
+"github.com/hashicorp/vault-plugin-database-couchbase v0.4.1/go.mod"
+"github.com/hashicorp/vault-plugin-database-elasticsearch v0.8.0"
+"github.com/hashicorp/vault-plugin-database-elasticsearch v0.8.0/go.mod"
+"github.com/hashicorp/vault-plugin-database-mongodbatlas v0.4.0"
+"github.com/hashicorp/vault-plugin-database-mongodbatlas v0.4.0/go.mod"
+"github.com/hashicorp/vault-plugin-database-snowflake v0.2.1"
+"github.com/hashicorp/vault-plugin-database-snowflake v0.2.1/go.mod"
+"github.com/hashicorp/vault-plugin-mock v0.16.1"
+"github.com/hashicorp/vault-plugin-mock v0.16.1/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-ad v0.10.0"
+"github.com/hashicorp/vault-plugin-secrets-ad v0.10.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-alicloud v0.9.0"
+"github.com/hashicorp/vault-plugin-secrets-alicloud v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-azure v0.10.0"
+"github.com/hashicorp/vault-plugin-secrets-azure v0.10.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-gcp v0.10.2"
+"github.com/hashicorp/vault-plugin-secrets-gcp v0.10.2/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-gcpkms v0.9.0"
+"github.com/hashicorp/vault-plugin-secrets-gcpkms v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-kv v0.9.0"
+"github.com/hashicorp/vault-plugin-secrets-kv v0.9.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.4.0"
+"github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.4.0/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-openldap v0.5.2"
+"github.com/hashicorp/vault-plugin-secrets-openldap v0.5.2/go.mod"
+"github.com/hashicorp/vault-plugin-secrets-terraform v0.2.0"
+"github.com/hashicorp/vault-plugin-secrets-terraform v0.2.0/go.mod"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
+"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
+"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+"github.com/hpcloud/tail v1.0.0"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/huandu/xstrings v1.3.2"
+"github.com/huandu/xstrings v1.3.2/go.mod"
+"github.com/huaweicloud/golangsdk v0.0.0-20200304081349-45ec0797f2a4/go.mod"
+"github.com/hudl/fargo v1.3.0/go.mod"
+"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+"github.com/imdario/mergo v0.3.5/go.mod"
+"github.com/imdario/mergo v0.3.6/go.mod"
+"github.com/imdario/mergo v0.3.11"
+"github.com/imdario/mergo v0.3.11/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4"
+"github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4/go.mod"
+"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
+"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733"
+"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
+"github.com/jackc/pgx v3.3.0+incompatible"
+"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
+"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
+"github.com/jarcoal/httpmock v1.0.4/go.mod"
+"github.com/jarcoal/httpmock v1.0.5"
+"github.com/jarcoal/httpmock v1.0.5/go.mod"
+"github.com/jcmturner/aescts v1.0.1"
+"github.com/jcmturner/aescts v1.0.1/go.mod"
+"github.com/jcmturner/dnsutils v1.0.1"
+"github.com/jcmturner/dnsutils v1.0.1/go.mod"
+"github.com/jcmturner/gofork v1.0.0"
+"github.com/jcmturner/gofork v1.0.0/go.mod"
+"github.com/jcmturner/goidentity/v6 v6.0.1"
+"github.com/jcmturner/goidentity/v6 v6.0.1/go.mod"
+"github.com/jcmturner/gokrb5/v8 v8.0.0"
+"github.com/jcmturner/gokrb5/v8 v8.0.0/go.mod"
+"github.com/jcmturner/rpc/v2 v2.0.2"
+"github.com/jcmturner/rpc/v2 v2.0.2/go.mod"
+"github.com/jeffchao/backoff v0.0.0-20140404060208-9d7fd7aa17f2"
+"github.com/jeffchao/backoff v0.0.0-20140404060208-9d7fd7aa17f2/go.mod"
+"github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f"
+"github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f/go.mod"
+"github.com/jefferai/jsonx v1.0.0"
+"github.com/jefferai/jsonx v1.0.0/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+"github.com/jmespath/go-jmespath v0.4.0"
+"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
+"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+"github.com/joho/godotenv v1.3.0/go.mod"
+"github.com/jonboulle/clockwork v0.1.0"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
+"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
+"github.com/jpillora/backoff v1.0.0/go.mod"
+"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
+"github.com/json-iterator/go v1.1.5/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.8/go.mod"
+"github.com/json-iterator/go v1.1.9/go.mod"
+"github.com/json-iterator/go v1.1.10"
+"github.com/json-iterator/go v1.1.10/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/jstemmer/go-junit-report v0.9.1"
+"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
+"github.com/jtolds/gls v4.20.0+incompatible"
+"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/julienschmidt/httprouter v1.3.0/go.mod"
+"github.com/karrick/godirwalk v1.8.0/go.mod"
+"github.com/karrick/godirwalk v1.10.3/go.mod"
+"github.com/kelseyhightower/envconfig v1.3.0/go.mod"
+"github.com/kelseyhightower/envconfig v1.4.0"
+"github.com/kelseyhightower/envconfig v1.4.0/go.mod"
+"github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f"
+"github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/errcheck v1.2.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/klauspost/compress v1.4.1/go.mod"
+"github.com/klauspost/compress v1.9.5"
+"github.com/klauspost/compress v1.9.5/go.mod"
+"github.com/klauspost/cpuid v1.2.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pretty v0.2.1"
+"github.com/kr/pretty v0.2.1/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/kr/text v0.2.0"
+"github.com/kr/text v0.2.0/go.mod"
+"github.com/lestrrat-go/jwx v0.9.0/go.mod"
+"github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod"
+"github.com/lib/pq v1.1.1/go.mod"
+"github.com/lib/pq v1.2.0/go.mod"
+"github.com/lib/pq v1.8.0/go.mod"
+"github.com/lib/pq v1.10.3"
+"github.com/lib/pq v1.10.3/go.mod"
+"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
+"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
+"github.com/linode/linodego v0.7.1"
+"github.com/linode/linodego v0.7.1/go.mod"
+"github.com/lyft/protoc-gen-validate v0.0.13/go.mod"
+"github.com/magiconair/properties v1.8.0/go.mod"
+"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+"github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod"
+"github.com/markbates/safe v1.0.1/go.mod"
+"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11"
+"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-colorable v0.1.6/go.mod"
+"github.com/mattn/go-colorable v0.1.7/go.mod"
+"github.com/mattn/go-colorable v0.1.8/go.mod"
+"github.com/mattn/go-colorable v0.1.9/go.mod"
+"github.com/mattn/go-colorable v0.1.11"
+"github.com/mattn/go-colorable v0.1.11/go.mod"
+"github.com/mattn/go-ieproxy v0.0.1"
+"github.com/mattn/go-ieproxy v0.0.1/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.4/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.10/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/mattn/go-isatty v0.0.14"
+"github.com/mattn/go-isatty v0.0.14/go.mod"
+"github.com/mattn/go-runewidth v0.0.2/go.mod"
+"github.com/mattn/go-runewidth v0.0.3/go.mod"
+"github.com/mattn/go-shellwords v1.0.12"
+"github.com/mattn/go-shellwords v1.0.12/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/mholt/archiver v3.1.1+incompatible"
+"github.com/mholt/archiver v3.1.1+incompatible/go.mod"
+"github.com/michaelklishin/rabbit-hole v0.0.0-20191008194146-93d9988f0cd5"
+"github.com/michaelklishin/rabbit-hole v0.0.0-20191008194146-93d9988f0cd5/go.mod"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/dns v1.1.26/go.mod"
+"github.com/miekg/dns v1.1.40"
+"github.com/miekg/dns v1.1.40/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/cli v1.1.0/go.mod"
+"github.com/mitchellh/cli v1.1.2"
+"github.com/mitchellh/cli v1.1.2/go.mod"
+"github.com/mitchellh/copystructure v1.0.0"
+"github.com/mitchellh/copystructure v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.14.0"
+"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
+"github.com/mitchellh/go-wordwrap v1.0.0"
+"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+"github.com/mitchellh/gox v0.4.0/go.mod"
+"github.com/mitchellh/gox v1.0.1"
+"github.com/mitchellh/gox v1.0.1/go.mod"
+"github.com/mitchellh/hashstructure v1.0.0"
+"github.com/mitchellh/hashstructure v1.0.0/go.mod"
+"github.com/mitchellh/iochan v1.0.0"
+"github.com/mitchellh/iochan v1.0.0/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/mapstructure v1.2.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.2/go.mod"
+"github.com/mitchellh/mapstructure v1.3.3"
+"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+"github.com/mitchellh/pointerstructure v1.0.0"
+"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.1"
+"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+"github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2"
+"github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mongodb/go-client-mongodb-atlas v0.1.2"
+"github.com/mongodb/go-client-mongodb-atlas v0.1.2/go.mod"
+"github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod"
+"github.com/morikuni/aec v1.0.0"
+"github.com/morikuni/aec v1.0.0/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+"github.com/mwielbut/pointy v1.1.0"
+"github.com/mwielbut/pointy v1.1.0/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+"github.com/natefinch/atomic v0.0.0-20150920032501-a62ce929ffcc"
+"github.com/natefinch/atomic v0.0.0-20150920032501-a62ce929ffcc/go.mod"
+"github.com/nats-io/jwt v0.3.0/go.mod"
+"github.com/nats-io/jwt v0.3.2/go.mod"
+"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
+"github.com/nats-io/nats.go v1.9.1/go.mod"
+"github.com/nats-io/nkeys v0.1.0/go.mod"
+"github.com/nats-io/nkeys v0.1.3/go.mod"
+"github.com/nats-io/nuid v1.0.1/go.mod"
+"github.com/ncw/swift v1.0.47"
+"github.com/ncw/swift v1.0.47/go.mod"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
+"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
+"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+"github.com/nwaples/rardecode v1.1.0"
+"github.com/nwaples/rardecode v1.1.0/go.mod"
+"github.com/oklog/oklog v0.3.2/go.mod"
+"github.com/oklog/run v1.0.0"
+"github.com/oklog/run v1.0.0/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/okta/okta-sdk-golang v1.1.0"
+"github.com/okta/okta-sdk-golang v1.1.0/go.mod"
+"github.com/okta/okta-sdk-golang/v2 v2.0.0"
+"github.com/okta/okta-sdk-golang/v2 v2.0.0/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.7.0/go.mod"
+"github.com/onsi/ginkgo v1.8.0/go.mod"
+"github.com/onsi/ginkgo v1.10.1/go.mod"
+"github.com/onsi/ginkgo v1.11.0"
+"github.com/onsi/ginkgo v1.11.0/go.mod"
+"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
+"github.com/onsi/gomega v1.4.3/go.mod"
+"github.com/onsi/gomega v1.5.0/go.mod"
+"github.com/onsi/gomega v1.7.0"
+"github.com/onsi/gomega v1.7.0/go.mod"
+"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
+"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+"github.com/opencontainers/go-digest v1.0.0-rc1"
+"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+"github.com/opencontainers/image-spec v1.0.1"
+"github.com/opencontainers/image-spec v1.0.1/go.mod"
+"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
+"github.com/opencontainers/runc v0.1.1/go.mod"
+"github.com/opencontainers/runc v1.0.0-rc9"
+"github.com/opencontainers/runc v1.0.0-rc9/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.2/go.mod"
+"github.com/openlyinc/pointy v1.1.2"
+"github.com/openlyinc/pointy v1.1.2/go.mod"
+"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
+"github.com/opentracing/basictracer-go v1.0.0/go.mod"
+"github.com/opentracing/opentracing-go v1.0.2/go.mod"
+"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
+"github.com/openzipkin/zipkin-go v0.1.3/go.mod"
+"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
+"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
+"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
+"github.com/oracle/oci-go-sdk v7.0.0+incompatible/go.mod"
+"github.com/oracle/oci-go-sdk v13.1.0+incompatible"
+"github.com/oracle/oci-go-sdk v13.1.0+incompatible/go.mod"
+"github.com/ory/dockertest v3.3.4+incompatible/go.mod"
+"github.com/ory/dockertest v3.3.5+incompatible"
+"github.com/ory/dockertest v3.3.5+incompatible/go.mod"
+"github.com/ory/dockertest/v3 v3.6.2"
+"github.com/ory/dockertest/v3 v3.6.2/go.mod"
+"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2"
+"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
+"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
+"github.com/pact-foundation/pact-go v1.0.4/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pascaldekloe/goe v0.1.0"
+"github.com/pascaldekloe/goe v0.1.0/go.mod"
+"github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627/go.mod"
+"github.com/patrickmn/go-cache v2.1.0+incompatible"
+"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
+"github.com/pborman/uuid v1.2.0/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/pelletier/go-toml v1.7.0/go.mod"
+"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
+"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5"
+"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod"
+"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.2.6+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.5.2+incompatible"
+"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
+"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
+"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pkg/errors v0.9.1"
+"github.com/pkg/errors v0.9.1/go.mod"
+"github.com/pkg/profile v1.2.1/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/posener/complete v1.2.3"
+"github.com/posener/complete v1.2.3/go.mod"
+"github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac"
+"github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac/go.mod"
+"github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d"
+"github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.2/go.mod"
+"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.3.0/go.mod"
+"github.com/prometheus/client_golang v1.4.0/go.mod"
+"github.com/prometheus/client_golang v1.7.1"
+"github.com/prometheus/client_golang v1.7.1/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.1.0/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+"github.com/prometheus/common v0.2.0/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.7.0/go.mod"
+"github.com/prometheus/common v0.9.1/go.mod"
+"github.com/prometheus/common v0.10.0/go.mod"
+"github.com/prometheus/common v0.11.1"
+"github.com/prometheus/common v0.11.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/prometheus/procfs v0.1.3"
+"github.com/prometheus/procfs v0.1.3/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/rboyer/safeio v0.2.1"
+"github.com/rboyer/safeio v0.2.1/go.mod"
+"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
+"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rogpeppe/go-internal v1.1.0/go.mod"
+"github.com/rogpeppe/go-internal v1.2.2/go.mod"
+"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+"github.com/rogpeppe/go-internal v1.6.2"
+"github.com/rogpeppe/go-internal v1.6.2/go.mod"
+"github.com/rs/zerolog v1.4.0/go.mod"
+"github.com/russross/blackfriday v1.5.2/go.mod"
+"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/ryanuber/columnize v2.1.0+incompatible"
+"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+"github.com/ryanuber/go-glob v1.0.0"
+"github.com/ryanuber/go-glob v1.0.0/go.mod"
+"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da"
+"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
+"github.com/sasha-s/go-deadlock v0.2.0"
+"github.com/sasha-s/go-deadlock v0.2.0/go.mod"
+"github.com/satori/go.uuid v1.2.0"
+"github.com/satori/go.uuid v1.2.0/go.mod"
+"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
+"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/sethvargo/go-limiter v0.7.1"
+"github.com/sethvargo/go-limiter v0.7.1/go.mod"
+"github.com/shirou/gopsutil v3.21.5+incompatible"
+"github.com/shirou/gopsutil v3.21.5+incompatible/go.mod"
+"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24"
+"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
+"github.com/sirupsen/logrus v1.0.6/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.0/go.mod"
+"github.com/sirupsen/logrus v1.4.1/go.mod"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/sirupsen/logrus v1.6.0/go.mod"
+"github.com/sirupsen/logrus v1.7.0"
+"github.com/sirupsen/logrus v1.7.0/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180725160413-e900ae048470/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
+"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+"github.com/smartystreets/goconvey v1.6.4"
+"github.com/smartystreets/goconvey v1.6.4/go.mod"
+"github.com/snowflakedb/gosnowflake v1.6.1"
+"github.com/snowflakedb/gosnowflake v1.6.1/go.mod"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
+"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
+"github.com/soheilhy/cmux v0.1.4"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/sony/gobreaker v0.4.1/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/afero v1.2.1/go.mod"
+"github.com/spf13/afero v1.2.2/go.mod"
+"github.com/spf13/cast v1.3.0/go.mod"
+"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+"github.com/spf13/cobra v0.0.3/go.mod"
+"github.com/spf13/cobra v0.0.5/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+"github.com/spf13/pflag v1.0.1/go.mod"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/pflag v1.0.5"
+"github.com/spf13/pflag v1.0.5/go.mod"
+"github.com/spf13/viper v1.3.2/go.mod"
+"github.com/spf13/viper v1.4.0/go.mod"
+"github.com/square/go-jose v2.4.1+incompatible/go.mod"
+"github.com/square/go-jose/v3 v3.0.0-20200225220504-708a9fe87ddc/go.mod"
+"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
+"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271"
+"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
+"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/objx v0.2.0"
+"github.com/stretchr/objx v0.2.0/go.mod"
+"github.com/stretchr/testify v1.2.0/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/stretchr/testify v1.5.1/go.mod"
+"github.com/stretchr/testify v1.6.1/go.mod"
+"github.com/stretchr/testify v1.7.0"
+"github.com/stretchr/testify v1.7.0/go.mod"
+"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
+"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod"
+"github.com/tencentcloud/tencentcloud-sdk-go v1.0.162/go.mod"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
+"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
+"github.com/tidwall/pretty v1.0.0/go.mod"
+"github.com/tidwall/pretty v1.0.1"
+"github.com/tidwall/pretty v1.0.1/go.mod"
+"github.com/tklauser/go-sysconf v0.3.6"
+"github.com/tklauser/go-sysconf v0.3.6/go.mod"
+"github.com/tklauser/numcpus v0.2.2"
+"github.com/tklauser/numcpus v0.2.2/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+"github.com/ugorji/go v1.1.4/go.mod"
+"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+"github.com/ulikunitz/xz v0.5.6/go.mod"
+"github.com/ulikunitz/xz v0.5.7"
+"github.com/ulikunitz/xz v0.5.7/go.mod"
+"github.com/urfave/cli v1.20.0/go.mod"
+"github.com/urfave/cli v1.22.1/go.mod"
+"github.com/urfave/cli v1.22.2/go.mod"
+"github.com/vmware/govmomi v0.18.0"
+"github.com/vmware/govmomi v0.18.0/go.mod"
+"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c"
+"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
+"github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod"
+"github.com/xdg/stringprep v1.0.0"
+"github.com/xdg/stringprep v1.0.0/go.mod"
+"github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8"
+"github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+"github.com/yandex-cloud/go-genproto v0.0.0-20200722140432-762fe965ce77/go.mod"
+"github.com/yandex-cloud/go-sdk v0.0.0-20200722140627-2194e5077f13/go.mod"
+"github.com/yhat/scrape v0.0.0-20161128144610-24b7890b0945/go.mod"
+"github.com/yuin/goldmark v1.1.25/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"github.com/yuin/goldmark v1.2.1/go.mod"
+"github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da"
+"github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.etcd.io/bbolt v1.3.3/go.mod"
+"go.etcd.io/bbolt v1.3.4/go.mod"
+"go.etcd.io/bbolt v1.3.5"
+"go.etcd.io/bbolt v1.3.5/go.mod"
+"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
+"go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547"
+"go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547/go.mod"
+"go.mongodb.org/atlas v0.7.1"
+"go.mongodb.org/atlas v0.7.1/go.mod"
+"go.mongodb.org/mongo-driver v1.4.2/go.mod"
+"go.mongodb.org/mongo-driver v1.4.6"
+"go.mongodb.org/mongo-driver v1.4.6/go.mod"
+"go.opencensus.io v0.19.1/go.mod"
+"go.opencensus.io v0.19.2/go.mod"
+"go.opencensus.io v0.20.1/go.mod"
+"go.opencensus.io v0.20.2/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0/go.mod"
+"go.opencensus.io v0.22.2/go.mod"
+"go.opencensus.io v0.22.3"
+"go.opencensus.io v0.22.3/go.mod"
+"go.opentelemetry.io/otel v0.20.0"
+"go.opentelemetry.io/otel v0.20.0/go.mod"
+"go.opentelemetry.io/otel/metric v0.20.0"
+"go.opentelemetry.io/otel/metric v0.20.0/go.mod"
+"go.opentelemetry.io/otel/oteltest v0.20.0"
+"go.opentelemetry.io/otel/oteltest v0.20.0/go.mod"
+"go.opentelemetry.io/otel/sdk v0.20.0"
+"go.opentelemetry.io/otel/sdk v0.20.0/go.mod"
+"go.opentelemetry.io/otel/trace v0.20.0"
+"go.opentelemetry.io/otel/trace v0.20.0/go.mod"
+"go.uber.org/atomic v1.3.2/go.mod"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/atomic v1.5.0/go.mod"
+"go.uber.org/atomic v1.6.0"
+"go.uber.org/atomic v1.6.0/go.mod"
+"go.uber.org/goleak v1.1.10"
+"go.uber.org/goleak v1.1.10/go.mod"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/multierr v1.3.0/go.mod"
+"go.uber.org/multierr v1.5.0"
+"go.uber.org/multierr v1.5.0/go.mod"
+"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
+"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+"go.uber.org/zap v1.10.0/go.mod"
+"go.uber.org/zap v1.13.0/go.mod"
+"go.uber.org/zap v1.14.1"
+"go.uber.org/zap v1.14.1/go.mod"
+"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
+"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
+"golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod"
+"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+"golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod"
+"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
+"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+"golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+"golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod"
+"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
+"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
+"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
+"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a"
+"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+"golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+"golang.org/x/lint v0.0.0-20200302205851-738671d3881b"
+"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+"golang.org/x/mod v0.1.0/go.mod"
+"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/mod v0.3.0/go.mod"
+"golang.org/x/mod v0.4.0"
+"golang.org/x/mod v0.4.0/go.mod"
+"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
+"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+"golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod"
+"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+"golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
+"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+"golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod"
+"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+"golang.org/x/net v0.0.0-20200505041828-1ed23360d12c/go.mod"
+"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
+"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+"golang.org/x/net v0.0.0-20201002202402-0a1ea396d57c/go.mod"
+"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+"golang.org/x/net v0.0.0-20210510120150-4163338589ed"
+"golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
+"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+"golang.org/x/sys v0.0.0-20181218192612-074acd46bca6/go.mod"
+"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
+"golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod"
+"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
+"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
+"golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod"
+"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+"golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod"
+"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod"
+"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
+"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+"golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa/go.mod"
+"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
+"golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod"
+"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+"golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod"
+"golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod"
+"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod"
+"golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod"
+"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+"golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod"
+"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod"
+"golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6"
+"golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod"
+"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/text v0.3.6"
+"golang.org/x/text v0.3.6/go.mod"
+"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+"golang.org/x/tools v0.0.0-20181219222714-6e267b5cc78e/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+"golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod"
+"golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod"
+"golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod"
+"golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod"
+"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod"
+"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
+"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+"golang.org/x/tools v0.0.0-20190718200317-82a3ea8a504c/go.mod"
+"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
+"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
+"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
+"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
+"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
+"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+"golang.org/x/tools v0.0.0-20200409170454-77362c5149f0/go.mod"
+"golang.org/x/tools v0.0.0-20200416214402-fc959738d646/go.mod"
+"golang.org/x/tools v0.0.0-20200521155704-91d71f6c2f04/go.mod"
+"golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c"
+"golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/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"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+"google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod"
+"google.golang.org/api v0.2.0/go.mod"
+"google.golang.org/api v0.3.0/go.mod"
+"google.golang.org/api v0.3.1/go.mod"
+"google.golang.org/api v0.3.2/go.mod"
+"google.golang.org/api v0.4.0/go.mod"
+"google.golang.org/api v0.5.0/go.mod"
+"google.golang.org/api v0.7.0/go.mod"
+"google.golang.org/api v0.8.0/go.mod"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/api v0.13.0/go.mod"
+"google.golang.org/api v0.14.0/go.mod"
+"google.golang.org/api v0.15.0/go.mod"
+"google.golang.org/api v0.17.0/go.mod"
+"google.golang.org/api v0.18.0/go.mod"
+"google.golang.org/api v0.19.0/go.mod"
+"google.golang.org/api v0.20.0/go.mod"
+"google.golang.org/api v0.21.0/go.mod"
+"google.golang.org/api v0.24.0/go.mod"
+"google.golang.org/api v0.29.0"
+"google.golang.org/api v0.29.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.2.0/go.mod"
+"google.golang.org/appengine v1.3.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.0/go.mod"
+"google.golang.org/appengine v1.6.1/go.mod"
+"google.golang.org/appengine v1.6.5"
+"google.golang.org/appengine v1.6.5/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20181219182458-5a97ab628bfb/go.mod"
+"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
+"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+"google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod"
+"google.golang.org/genproto v0.0.0-20190513181449-d00d292a067c/go.mod"
+"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
+"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+"google.golang.org/genproto v0.0.0-20200323114720-3f67cca34472/go.mod"
+"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+"google.golang.org/genproto v0.0.0-20200409111301-baae70f3302d/go.mod"
+"google.golang.org/genproto v0.0.0-20200416231807-8751e049a2a0/go.mod"
+"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013"
+"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+"google.golang.org/grpc v1.14.0/go.mod"
+"google.golang.org/grpc v1.16.0/go.mod"
+"google.golang.org/grpc v1.17.0/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.0/go.mod"
+"google.golang.org/grpc v1.20.1/go.mod"
+"google.golang.org/grpc v1.21.0/go.mod"
+"google.golang.org/grpc v1.21.1/go.mod"
+"google.golang.org/grpc v1.22.0/go.mod"
+"google.golang.org/grpc v1.22.1/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.23.1/go.mod"
+"google.golang.org/grpc v1.25.1/go.mod"
+"google.golang.org/grpc v1.26.0/go.mod"
+"google.golang.org/grpc v1.27.0/go.mod"
+"google.golang.org/grpc v1.27.1/go.mod"
+"google.golang.org/grpc v1.28.0/go.mod"
+"google.golang.org/grpc v1.28.1/go.mod"
+"google.golang.org/grpc v1.29.1"
+"google.golang.org/grpc v1.29.1/go.mod"
+"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+"google.golang.org/protobuf v1.21.0/go.mod"
+"google.golang.org/protobuf v1.22.0/go.mod"
+"google.golang.org/protobuf v1.23.0/go.mod"
+"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+"google.golang.org/protobuf v1.24.0/go.mod"
+"google.golang.org/protobuf v1.25.0"
+"google.golang.org/protobuf v1.25.0/go.mod"
+"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+"gopkg.in/errgo.v2 v2.1.0"
+"gopkg.in/errgo.v2 v2.1.0/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gcfg.v1 v1.2.3/go.mod"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+"gopkg.in/inf.v0 v0.9.0/go.mod"
+"gopkg.in/inf.v0 v0.9.1"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/ini.v1 v1.42.0"
+"gopkg.in/ini.v1 v1.42.0/go.mod"
+"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
+"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
+"gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce"
+"gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod"
+"gopkg.in/ory-am/dockertest.v3 v3.3.4"
+"gopkg.in/ory-am/dockertest.v3 v3.3.4/go.mod"
+"gopkg.in/resty.v1 v1.12.0"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.3.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+"gopkg.in/square/go-jose.v2 v2.4.1/go.mod"
+"gopkg.in/square/go-jose.v2 v2.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/warnings.v0 v0.1.2/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.7/go.mod"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"gopkg.in/yaml.v2 v2.3.0"
+"gopkg.in/yaml.v2 v2.3.0/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+"gotest.tools v2.2.0+incompatible"
+"gotest.tools v2.2.0+incompatible/go.mod"
+"gotest.tools/v3 v3.0.2"
+"gotest.tools/v3 v3.0.2/go.mod"
+"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
+"honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+"honnef.co/go/tools v0.0.1-2020.1.3"
+"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+"k8s.io/api v0.0.0-20190409092523-d687e77c8ae9/go.mod"
+"k8s.io/api v0.18.2"
+"k8s.io/api v0.18.2/go.mod"
+"k8s.io/apimachinery v0.0.0-20190409092423-760d1845f48b/go.mod"
+"k8s.io/apimachinery v0.18.2"
+"k8s.io/apimachinery v0.18.2/go.mod"
+"k8s.io/client-go v0.18.2"
+"k8s.io/client-go v0.18.2/go.mod"
+"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+"k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod"
+"k8s.io/klog v0.3.0/go.mod"
+"k8s.io/klog v1.0.0"
+"k8s.io/klog v1.0.0/go.mod"
+"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
+"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod"
+"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
+"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
+"layeh.com/radius v0.0.0-20190322222518-890bc1058917"
+"layeh.com/radius v0.0.0-20190322222518-890bc1058917/go.mod"
+"mvdan.cc/gofumpt v0.1.1"
+"mvdan.cc/gofumpt v0.1.1/go.mod"
+"rsc.io/binaryregexp v0.2.0/go.mod"
+"rsc.io/quote/v3 v3.1.0/go.mod"
+"rsc.io/sampler v1.3.0/go.mod"
+"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
+"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
+"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+"sigs.k8s.io/yaml v1.2.0"
+"sigs.k8s.io/yaml v1.2.0/go.mod"
+"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
+)
+go-module_set_globals
+
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	webui? (
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="+webui"
+
+BDEPEND="dev-go/gox
+	>=dev-lang/go-1.15.3"
+COMMON_DEPEND="acct-group/vault
+	acct-user/vault"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+PATCHES=( "${FILESDIR}"/vault-1.8.2-go-limiter.patch )
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-e "s/gofumpt/gofmt/g" \
+		-i Makefile || die
+	if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then
+		mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" ||
+			die "mv failed"
+	fi
+}
+
+src_compile() {
+	mkdir "${T}"/bin || die
+	BUILD_TAGS="$(usex webui ui '')" \
+	GOFLAGS="-mod=readonly" \
+	GOPATH="${T}" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 60dbc8280a8b..80da6340a6bf 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 1c9110c9a376..716d13e996e6 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -2,15 +2,24 @@ AUX clamav-0.102.1-libxml2_pkgconfig.patch 4012 BLAKE2B 4c3e4fc3522d317c57bae942
 AUX clamav-0.102.2-fix-curl-detection.patch 844 BLAKE2B a813b1f6003b9cff03fca8d72dbd44d6a4f700e3d60aee83f782a87893a3c6753698ca8715237155185660301dd81dc55bf6a6e3b9095f57b099607182c90bf5 SHA512 27e6aa5ad418eaa32b56ea7bbdab0b5b4cd649e55d34eb094b5f02d7e68d8913f39664ffd6bc4a07faf88f60bdbd15b0c381fbbd6d9c1c62cc36e72e34cabd19
 AUX clamav-0.103.0-system-tomsfastmath.patch 3725 BLAKE2B 85640ded83600adfdcc03e8f42e3153c71a8b6c5884ca4cbd79a69121943fd171bc528aed26ded895189293008924cef6762a22001b4ee098fe5f680c7619bf0 SHA512 b67df39bc7d60f6ea9bb06d12413f0e4774185d4f020a68bdfdf8fe1ca669f70a62699b0f1100702af5ec47e460a35625dcaa09cfc6ea6d2f3957de227e87306
 AUX clamav-0.103.1-upstream-openrc.patch 18249 BLAKE2B 305db3181a4a22acde5b28cef6c2d01b639be8c5b9e9c77737be1ebcb0553040b6eda117285e3e8b4bf06d2565a5d73225d7ce20ba1f115fd08bc822d779b370 SHA512 89e95057ee2f29bcdf5787f659ffe43b055b599d9bb80bf54794859113d760dad135b5b8d80c23e98f8c6b699dc839d4922c4c3b45edf97296f4eea668e62672
+AUX clamav-0.104.0-ncurses_detection.patch 906 BLAKE2B 9e1bd5814f0da5126fb9d8d34c2146c9cf9a6ca6e7ff2c574585f9df04c7f68f78ce8cc618cb346b9cdb545f78e938623adef642dd4b93961b2cf12047cdae5a SHA512 52d84cbe920e2dbdf4f6da26fe0ddc58596c0aa7e057cdd93407276847499269605e5a9db5fa61ab945b179a102c8d57930bad715cc595ebfb11ed7ba319d618
 AUX clamav-milter.README.gentoo 2284 BLAKE2B 7afc18f3dad57c2d7595257b356943efb3d1af28d55ac8f09f0506430fd0dedf0820906ced666a7237e3af44a9bc1b43fff017c03faad844f96b132ca4c5dde6 SHA512 38eadf2d919a0c48345600ea5a39c90e766b62e8b1ffc7bb01969a8fd93c4545f2030058a470ac7efb75a1d6c74f9930438f58aeff5035e19e38241ed381f7b3
+AUX clamav-milter.initd 1164 BLAKE2B 190dee3476f8763dc2498e2099e6afa83c36642298618ad959940771e73c07456e30e6319d649291c82fec49e3712e500a65b167fe91b12bd2758f79f040e1c3 SHA512 d21c60e7d3ee5eee65da18831eed905858a1c7ab4ec02de1c16fa36179d9c1cf517eca8402b872f3d995fa1d59a9b2e79994655ca4570370b40dc810af5e0a3d
 AUX clamav-milter.logrotate-r1 1103 BLAKE2B b506a07f6ebdf697f87060424368ce4e4085564c3fa8e8cc4780ba786f2f543ae51a6e0f9d04db9ea9eb5554c1e395592453235db5abcc243fd2523cb44adec2 SHA512 890744086dcd8d6f7eba0f49df0941c643c6d730ea27a660ecaaab50c51c931489fa25079ad1aa9e307f919ac98a4e5d6b2e952cc46dcea8322b3253c6ba07b1
+AUX clamav-milter.service-0.104.0 310 BLAKE2B 53b0ef9eb34eacbc11e71f857ac944050e0f41c58e633c04c56f28079a7aad84d7ac7625b637b1aa67f61a4e8556bee57fb19e650b19162a8160336f36e34330 SHA512 37d2654fb436935f67bea821ef76d3cd1d4fc7af997f624226180663d88808d5c479eccaad4730ff723c8f30d3d36b551eacb10195dd94547136fed8fa1451a3
 AUX clamav-milter.service-r1 303 BLAKE2B 55253d9a660699411e352bc80837add840dc6740afed4fe64a86def84610cad836ea3ea620664f540f242b917aab560201cca9c33b9fbc9b1cef2c8b29bfce36 SHA512 5dc30e3c57d9bff6595155e8299336c579c713aed429ab770f10d7678dd74691a135aa2070a825ddb726fdabcb001c19caeb993c1cd9a6fcf95d1d47f7160540
+AUX clamd.initd 918 BLAKE2B 68391c381004d57d9563b503f702699d27980e4fc5e052ac5c86841e99bf37b19ecf1dbfa2a141352c584578f4873b35460376a9a99e2a6623a2d9f476e3f48d SHA512 9a1b803562d4f9c08d5d79c54677aad43898b4c6e97f22ef27d866c74ee2b611e6ae476a43d9accb0e6e8a02c2ab0d09bd779d3b1e8de36d9980e3e00affe559
 AUX clamd.logrotate 603 BLAKE2B f39f5938f8fca2d2820d86c8dc144dca0216468a3cfd7dcd84c794d9402e3978da254684053eab108d71263a75266a96f2b6f5e0c635a2b5b0a1a50068920bde SHA512 e9689c99e37a1f2814497e4df19bd760dd94b6134be72341dd3b7f6e5f67505cda913367a5e80873ae601c88a9d7aa994733b8ac7017a6d0aa62d2170845df37
 AUX clamd.service 202 BLAKE2B 4d02132cdb44a7155e881037b45bab28f42445808d1d3ff5821e9b179b31efd7d5f217fb968efa17e77f6e0739f0258c4c49656283177a0f5b3d572490259bcd SHA512 799d3f33ca69841882f86f6853dd0dc6d8af73db8cfa5ce6dd6c873c5e7bc07d29bfe0f85cfb77edf2b0d8c05de73988d06148b993996ce639c5d0eeac908647
 AUX clamd_at.service 228 BLAKE2B 85181b02329a86495d0737308417dd873424da0bb1cd376725e7857b8b911c841df89ce63ed665a1d0ca6d30f9456c9d47c370b36a2cf8df1e2f3f520d121fe0 SHA512 69a0ca31a7288b5494d8c85ce5ff859a8f34b8a93f573eded90c270099ecac30e01d8549a07a160d74bfdc3c5401c3fd625b178080ea2c02520aab91252739e7
+AUX clamd_at.service-0.104.0 235 BLAKE2B 014d7346f45af2e42ade2a79c48fd4fd7314250aa6f6cd9e2a856fa0d7f176e90a292c56d28e8eec7b1c7628dc2701eb58f6e7ef23fd19315c8d0146114b111a SHA512 57f0292354751c0e35e7e3acff17e78ba84b2cdb4f0d64331d6e70a935d607f425ae44a22b456cc3113ae72bff4d8bd0b729693c87359e91f9b91f12856c7e0b
+AUX clamonacc.initd 437 BLAKE2B 230e8977659304cd78f280653b0e4d3fe88cb0571f98bc23b89f2394dc090f2343b33d5ecfdfec450606a0f39e97fb0516186fb367d7ba0ba3e961b96e813e36 SHA512 9713f7d5d4c1bb92e4dd456ba576fd810ddccb4352a861083d33e95692e0d76f0fcde82db6759e522f21ef37e9969cf10621ae876bd9d3f28d0d47d614308e93
+AUX freshclam.initd 202 BLAKE2B 3bc294930984b779b032d40f9dd5063fb168a096cd45ef43cbc42e1ae187c1add0c69303e616ade147633c45d2a980ad73adc25aeb04cb68ed4c41a54b88f551 SHA512 5cb65021b12756560aabb0df5a8223cd7d019471909c010096c2cf07b4b90b34622d7838c15807b0c66017177a98d056b4bab22053cb0cfd0b2071d599646fc3
 AUX freshclam.logrotate 631 BLAKE2B d5100e4f80227d3cda00193eb7a065f766d6b7b0c54ef58ad646fc7692cd4c6e572e053d368ba78c62c27cd3e1db111822208d29ecad67d10be7d5957d6622f3 SHA512 43838241c66bdf167105b25967576a568e0661e5b3292d24d3028837353280b03ffd1ea6adbbcbc152e50bc25f77357af42bbf3dd70817cf2cf02258ca0fe611
 AUX freshclamd.service-r1 177 BLAKE2B 8c9304e8c43e03288dcb1c6897b53e7c36b6e6116bb5c43db1e9735cc5d7b50094d33679d2b42839a09c572ad631daf572f62c57e4a7b74bfad5ce40a5916364 SHA512 5243465d30de1e64697455b3af50f62e6d7f3d0df7e2ef9b60f89dc974d8118ff67df0b44fbbddd04dd196ca17cf4306ac99f1eec42a5a0ddd42a64c4cb992c8
 AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2
 DIST clamav-0.103.3.tar.gz 13389239 BLAKE2B 1846cceed39fbd48fcf973d05a57901cf6f9ccdbb4d7eae501e712d84ab4d0a662e4477696aa6a1446116db85a89603428d7092a55e18f7acb805016d3cd5431 SHA512 c2ee24a6f63735c064140aa5baa347d51e8240b2f7eced3480d05435202aedd481fa7057fd40ecbc2e93a62fe8b0cefb574d8accdf9acede643ffbe0d396686f
+DIST clamav-0.104.0.tar.gz 11896747 BLAKE2B c3ca32c1277052301a8bff94fec66a2df8f589bc9a673a00d0f45aaf9d8fd23e8bb87dde787d4188a6318d6677c3364e377ccec16d8e44667430713ce7e2a78d SHA512 7a052e6310ef92068acc384d10a64eed6d54d2d408d203dab92defbb1a276e8a193a2096a8028c8982323ba0be83d25602f026aeffa056878ce36aa325c0046c
 EBUILD clamav-0.103.3-r1.ebuild 7405 BLAKE2B 48038b8bb6c1b1f045b24ae7d955226389a121604e2e4212c6eb81ce6c9aa9eea2a4ecd7d82409d2cf01dfc4c6fedee5d7188a6dbd9f0cd88546b6a35facd51c SHA512 0f19466145c340ddf7473876443c18e10b73b607c3b8b48bda31ad0740fa0835d2f21fd546bb7e9facb03fab2f792ab2343c9965064b6a17eca9eaafcb8d6fe6
-MISC metadata.xml 1060 BLAKE2B 77fa5fa0a2d6bd96b1ec797d42f7f626decf3c98c1563e87af503268f4f09d0a01f38651174546dd835476b635ae5a6a0535acd06849f58c2bbf41993d8a7ffc SHA512 334cc919ca47d8045ab61193e39f7dbf86a58d7619a193ed31da5cd5f82c99c2af210790d75f60f9951097915fa6805f5aa79f90efb3551322c9f0e54fc68e99
+EBUILD clamav-0.104.0-r1.ebuild 6531 BLAKE2B 9923cbb70a35a4a720c2034d610806614254fdad24fcb5accced8d1b0884eaf38e074e1d090f300145ca2de22894eda1a9d6fc55099adcc987ea5d8067618512 SHA512 9f233777906a7492ec18f2cedee16dbc578bbf808a64255a71a9d9c309d1675a1f6160df536d1000513b57883b7627917c6e8e1855953ac2762c424be9e3ccd2
+MISC metadata.xml 1287 BLAKE2B 75d0e2ee639919863a0b12951c04f6338fab836812a930b5cae82adc9546f0d9115c1c12a233b08e7bcf1810b38f8d0c119ee44a7640ade191f9bdb5c2bdf759 SHA512 2ef5d16db72356b72cfe6334b5a9b6c6e4d491ab445debbf9433d44c843e27d03aade9cc49a4fcad151ecfbb3dc4d99903e5a27eac8954991822eca3bad2b6c0
diff --git a/app-antivirus/clamav/clamav-0.104.0-r1.ebuild b/app-antivirus/clamav/clamav-0.104.0-r1.ebuild
new file mode 100644
index 000000000000..ee0e19b95004
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.104.0-r1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic systemd tmpfiles
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="https://www.clamav.net/"
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc clamonacc +clamapp libclamav-only milter rar selinux systemd test"
+
+REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter )
+	clamonacc? ( clamapp )
+	milter? ( clamapp )
+	test? ( !libclamav-only )"
+
+RESTRICT="!test? ( test )"
+
+# Require acct-{user,group}/clamav at build time so that we can set
+# the permissions on /var/lib/clamav in src_install rather than in
+# pkg_postinst; calling "chown" on the live filesystem scares me.
+CDEPEND="acct-group/clamav
+	acct-user/clamav
+	dev-libs/libltdl
+	dev-libs/libmspack
+	dev-libs/json-c:=
+	dev-libs/libpcre2
+	>=sys-libs/zlib-1.2.2:=
+	app-arch/bzip2
+	clamapp? ( sys-libs/ncurses:= net-misc/curl )
+	elibc_musl? ( sys-libs/fts-standalone )
+	virtual/libiconv
+	!libclamav-only? ( net-misc/curl )
+	dev-libs/openssl:=
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	dev-libs/libxml2
+	rar? ( app-arch/unrar )
+	test? ( dev-python/pytest )"
+# TODO: there is no way to use this with the new build system instead of the bundled one
+#	dev-libs/tomsfastmath
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+DEPEND="${CDEPEND}
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.104.0-ncurses_detection.patch"
+)
+
+src_configure() {
+	use elibc_musl && append-ldflags -lfts
+	use ppc64 && append-flags -mminimal-toc
+	use elibc_uclibc && export ac_cv_type_error_t=yes
+
+	local mycmakeargs=(
+		-DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav
+		-DAPP_CONFIG_DIRECTORY="${EPREFIX}"/etc/clamav
+		-DENABLE_EXPERIMENTAL=OFF
+		-DENABLE_JSON_SHARED=ON
+		-DENABLE_APP=$(usex clamapp ON OFF)
+		-DENABLE_MILTER=$(usex milter ON OFF)
+		-DENABLE_CLAMONACC=$(usex clamonacc ON OFF)
+		-DCLAMAV_USER="clamav"
+		-DCLAMAV_GROUP="clamav"
+		-DBYTECODE_RUNTIME=interpreter
+		-DOPTIMIZE=ON
+		-DENABLE_EXTERNAL_MSPACK=ON
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_DOXYGEN=$(usex doc)
+		-DENABLE_UNRAR=$(usex rar ON OFF)
+		-DENABLE_TESTS=$(usex test ON OFF)
+		-DENABLE_STATIC_LIB=OFF
+		-DENABLE_SHARED_LIB=ON
+		-DENABLE_SYSTEMD=$(usex systemd ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# init scripts
+	newinitd "${FILESDIR}/clamd.initd" clamd
+	newinitd "${FILESDIR}/freshclam.initd" freshclam
+	use clamonacc && \
+		newinitd "${FILESDIR}/clamonacc.initd" clamonacc
+	use milter && \
+		newinitd "${FILESDIR}/clamav-milter.initd" clamav-milter
+
+	rm -rf "${ED}"/var/lib/clamav || die
+
+	if ! use libclamav-only ; then
+		if use systemd ; then
+			# The tmpfiles entry is behind USE=systemd because the
+			# upstream OpenRC service files should (and do) ensure that
+			# the directories they need exist and have the correct
+			# permissions without the help of opentmpfiles. There are
+			# years-old root exploits in opentmpfiles, the design is
+			# fundamentally flawed, and the maintainer is not up to
+			# the task of fixing it.
+			dotmpfiles "${FILESDIR}/tmpfiles.d/clamav.conf"
+			systemd_newunit "${FILESDIR}/clamd_at.service-0.104.0" "clamd@.service"
+			systemd_dounit "${FILESDIR}/clamd.service"
+			systemd_newunit "${FILESDIR}/freshclamd.service-r1" \
+							"freshclamd.service"
+		fi
+
+		if use clamapp ; then
+			# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+			sed -e "s:^\(Example\):\# \1:" \
+				-e "s/^#\(PidFile .*\)/\1/" \
+				-e "s/^#\(LocalSocket .*\)/\1/" \
+				-e "s/^#\(User .*\)/\1/" \
+				-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+				-e "s:^\#\(LogTime\).*:\1 yes:" \
+				-e "s/^#\(DatabaseDirectory .*\)/\1/" \
+				"${ED}"/etc/clamav/clamd.conf.sample > \
+				"${ED}"/etc/clamav/clamd.conf || die
+
+			sed -e "s:^\(Example\):\# \1:" \
+				-e "s/^#\(PidFile .*\)/\1/" \
+				-e "s/^#\(DatabaseOwner .*\)/\1/" \
+				-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+				-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
+				-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+				-e "s/^#\(DatabaseDirectory .*\)/\1/" \
+				"${ED}"/etc/clamav/freshclam.conf.sample > \
+				"${ED}"/etc/clamav/freshclam.conf || die
+
+			if use milter ; then
+				# Note: only keep the "unix" ClamdSocket and MilterSocket!
+				sed -e "s:^\(Example\):\# \1:" \
+					-e "s/^#\(PidFile .*\)/\1/" \
+					-e "s/^#\(ClamdSocket unix:.*\)/\1/" \
+					-e "s/^#\(User .*\)/\1/" \
+					-e "s/^#\(MilterSocket unix:.*\)/\1/" \
+					-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+					"${ED}"/etc/clamav/clamav-milter.conf.sample > \
+					"${ED}"/etc/clamav/clamav-milter.conf || die
+
+				systemd_newunit "${FILESDIR}/clamav-milter.service-0.104.0" clamav-milter.service
+			fi
+
+			local i
+			for i in clamd freshclam clamav-milter
+			do
+				if [[ -f "${ED}"/etc/"${i}".conf.sample ]] ; then
+					mv "${ED}"/etc/"${i}".conf{.sample,} || die
+				fi
+			done
+
+			# These both need to be writable by the clamav user.
+			# TODO: use syslog by default; that's what it's for.
+			diropts -o clamav -g clamav
+			keepdir /var/lib/clamav
+			keepdir /var/log/clamav
+		fi
+	fi
+
+	if use doc ; then
+		local HTML_DOCS=( docs/html/. )
+		einstalldocs
+	fi
+
+	# Don't install man pages for utilities we didn't install
+	if use libclamav-only ; then
+		rm -r "${ED}"/usr/share/man || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+	emake quick-check
+}
+
+pkg_postinst() {
+	if ! use libclamav-only ; then
+		if use systemd ; then
+			tmpfiles_process clamav.conf
+		fi
+	fi
+
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+
+	local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d )
+	if [[ ! -f "${databases}" ]] ; then
+		ewarn "You must run freshclam manually to populate the virus database"
+		ewarn "before starting clamav for the first time."
+	fi
+
+	ewarn "This version of ClamAV provides separate OpenRC services"
+	ewarn "for clamd, freshclam, clamav-milter, and clamonacc. The"
+	ewarn "clamd service now starts only the clamd daemon itself. You"
+	ewarn "should add freshclam (and perhaps clamav-milter) to any"
+	ewarn "runlevels that previously contained clamd."
+}
diff --git a/app-antivirus/clamav/files/clamav-0.104.0-ncurses_detection.patch b/app-antivirus/clamav/files/clamav-0.104.0-ncurses_detection.patch
new file mode 100644
index 000000000000..aa403a90bab3
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.104.0-ncurses_detection.patch
@@ -0,0 +1,27 @@
+From cd99490efb82b66c75e92fab3ff97c480bfc9cf9 Mon Sep 17 00:00:00 2001
+From: Luca Barbato <lu_zero@gentoo.org>
+Date: Sat, 16 Oct 2021 10:56:22 +0200
+Subject: [PATCH] Use all the link line from ncurses pkg-config
+
+Otherwise it would fail at link time if ncurses has a stand alone tinfo library.
+---
+ cmake/FindCURSES.cmake | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/cmake/FindCURSES.cmake b/cmake/FindCURSES.cmake
+index 35d4a570f6..528211c45c 100644
+--- a/cmake/FindCURSES.cmake
++++ b/cmake/FindCURSES.cmake
+@@ -58,11 +58,7 @@ if(NCURSES_NOT_FOUND EQUAL -1)
+     set(HAVE_LIBNCURSES 1)
+     set(CURSES_INCLUDE "<ncurses.h>")
+ 
+-    find_library(CURSES_LIBRARY
+-      NAMES ncurses
+-      PATHS ${PC_NCurses_LIBRARY_DIRS}
+-    )
+-
++    set(CURSES_LIBRARY ${PC_NCurses_LINK_LIBRARIES})
+     set(CURSES_VERSION ${PC_NCurses_VERSION})
+ 
+     include(FindPackageHandleStandardArgs)
diff --git a/app-antivirus/clamav/files/clamav-milter.initd b/app-antivirus/clamav/files/clamav-milter.initd
new file mode 100755
index 000000000000..049d908155d3
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-milter.initd
@@ -0,0 +1,34 @@
+#!/sbin/openrc-run
+
+# Note: the "Foreground" option in clamav-milter.conf MUST
+# be set to "no".
+command="/usr/sbin/clamav-milter"
+
+# For now, must be manually synchronized with the PidFile
+# variable in clamav-milter.conf.
+#
+# https://bugzilla.clamav.net/show_bug.cgi?id=12595
+#
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+  # The milter can successfully launch without clamd, but it's not a
+  # great user experience to have the milter start accepting requests
+  # that it can't process. The "use" dependency below will start clamd
+  # before clamav-milter, so long as clamd is also present this runlevel.
+  use clamd
+}
+
+start_pre() {
+  # This exists to support the (disabled) default MilterSocket setting
+  # within clamav-milter.conf. The "clamav" user and group agree with
+  # the (disabled) default "User" and "MilterSocketGroup" settings.
+  #
+  # Creating this directory is harmless even when a local socket is
+  # not used. In fact, the clamd service that we depend on should
+  # create it as well, to hold its own local socket (if enabled).
+  checkpath --directory \
+           --mode 0755 \
+           --owner clamav:clamav \
+           "/run/clamav"
+}
diff --git a/app-antivirus/clamav/files/clamav-milter.service-0.104.0 b/app-antivirus/clamav/files/clamav-milter.service-0.104.0
new file mode 100644
index 000000000000..68acf0695ceb
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-milter.service-0.104.0
@@ -0,0 +1,13 @@
+[Unit]
+Description=Milter module for the ClamAV scanner
+After=nss-lookup.target network.target
+Before=sendmail.service
+Before=postfix.service
+
+[Service]
+Type=forking
+PIDFile=/run/clamav/clamav-milter.pid
+ExecStart=/usr/sbin/clamav-milter -c /etc/clamav/clamav-milter.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-antivirus/clamav/files/clamd.initd b/app-antivirus/clamav/files/clamd.initd
new file mode 100755
index 000000000000..efc01efc41b0
--- /dev/null
+++ b/app-antivirus/clamav/files/clamd.initd
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+
+# Note: the "Foreground" option in clamd.conf must be set to "no"
+command="/usr/sbin/clamd"
+extra_started_commands="reload"
+
+# For now, must be manually synchronized with the PidFile variable
+# in clamd.conf.
+#
+# https://bugzilla.clamav.net/show_bug.cgi?id=12595
+#
+pidfile="/run/${RC_SVCNAME}.pid"
+
+start_pre() {
+  # This exists to support the (disabled) default LocalSocket setting
+  # within clamd.conf. The "clamav" user and group agree with the
+  # (disabled) default "User" and "LocalSocketGroup" settings in
+  # clamd.conf. And everything here agrees with the
+  # clamav-daemon.socket systemd service.
+  #
+  # Creating this directory is harmless even when a local socket is
+  # not used.
+  checkpath --directory \
+           --mode 0755 \
+           --owner clamav:clamav \
+           "/run/clamav"
+}
+
+reload() {
+  ebegin "Reloading ${RC_SVCNAME}"
+  "/usr/bin/clamdscan" --reload
+  eend $?
+}
diff --git a/app-antivirus/clamav/files/clamd_at.service-0.104.0 b/app-antivirus/clamav/files/clamd_at.service-0.104.0
new file mode 100644
index 000000000000..5ab51e7fccf7
--- /dev/null
+++ b/app-antivirus/clamav/files/clamd_at.service-0.104.0
@@ -0,0 +1,12 @@
+[Unit]
+Description=clamd scanner (%i) daemon
+After=nss-lookup.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/clamd -c /etc/clamav/clamd%i.conf
+Restart=on-failure
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-antivirus/clamav/files/clamonacc.initd b/app-antivirus/clamav/files/clamonacc.initd
new file mode 100755
index 000000000000..f625707b171a
--- /dev/null
+++ b/app-antivirus/clamav/files/clamonacc.initd
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+
+command="/usr/sbin/clamonacc"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+# clamonacc doesn't support a PID file at the moment, so we
+# run it in the foreground and let OpenRC background it.
+#
+# https://bugzilla.clamav.net/show_bug.cgi?id=12595
+#
+command_args="--foreground"
+command_background=true
+
+depend() {
+  # Unlike the milter, the on-access scanner will simply fail to start
+  # until clamd is available.
+  need clamd
+}
diff --git a/app-antivirus/clamav/files/freshclam.initd b/app-antivirus/clamav/files/freshclam.initd
new file mode 100755
index 000000000000..415d94a87668
--- /dev/null
+++ b/app-antivirus/clamav/files/freshclam.initd
@@ -0,0 +1,8 @@
+#!/sbin/openrc-run
+
+command="/usr/bin/freshclam"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+# Ignore the value of "PidFile" set in freshclam.conf.
+command_args="-p ${pidfile}"
+command_args_background="--daemon"
diff --git a/app-antivirus/clamav/metadata.xml b/app-antivirus/clamav/metadata.xml
index 799ee7cad29d..955b022bfd36 100644
--- a/app-antivirus/clamav/metadata.xml
+++ b/app-antivirus/clamav/metadata.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>antivirus@gentoo.org</email>
-    <name>Gentoo Antivirus Project</name>
-  </maintainer>
-
-  <maintainer type="person">
-    <!-- for the LTS 0.103.x branch only -->
-    <email>mjo@gentoo.org</email>
-  </maintainer>
-
-  <use>
-    <flag name="clamonacc">Build the clamonacc on-access scanner</flag>
-    <flag name="clamdtop">A Top like tool which shows what clamd is currently scanning amongst other things</flag>
-    <flag name="clamsubmit">A tool to submit false positives / negatives</flag>
-    <flag name="libclamav-only">Bypass building of libfreshclam and the ClamAV CLI applications.</flag>
-    <flag name="metadata-analysis-api">Enables collection of file property metadata using ClamAV API for analysis by ClamAV bytecode programs.</flag>
-    <flag name="xml">DMG and XAR support</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">clamav</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>antivirus@gentoo.org</email>
+		<name>Gentoo Antivirus Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<!-- for the LTS 0.103.x branch only -->
+		<email>mjo@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="clamapp">
+			Build applications (clamscan, clamd, clamdscan, clamonacc (also has its own USE flag), sigtool, clambc, clamav-milter (also requires milter USE flag), clamdtop, clamsubmit, clamconf).
+		</flag>
+		<flag name="clamonacc">Build the clamonacc on-access scanner</flag>
+		<flag name="clamdtop">A Top like tool which shows what clamd is currently scanning amongst other things</flag>
+		<flag name="clamsubmit">A tool to submit false positives / negatives</flag>
+		<flag name="libclamav-only">Bypass building of libfreshclam and the ClamAV CLI applications.</flag>
+		<flag name="metadata-analysis-api">Enables collection of file property metadata using ClamAV API for analysis by ClamAV bytecode programs.</flag>
+		<flag name="xml">DMG and XAR support</flag>
+		<flag name="rar">RAR support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">clamav</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-antivirus/fangfrisch/Manifest b/app-antivirus/fangfrisch/Manifest
index 80487d1a69c8..557af92cf323 100644
--- a/app-antivirus/fangfrisch/Manifest
+++ b/app-antivirus/fangfrisch/Manifest
@@ -1,5 +1,7 @@
 AUX fangfrisch.conf 512 BLAKE2B 1b1cd87fbf2095f8d6839fef2175b70cdf1c8d72bcfa8eb06e9abe5e88150f3d4414a64679d775f1fef4378a940334c6c1567f387dbf6ce7f8bb40f6070f31c0 SHA512 e3fff2b24a6bd05a709472e9b7b5416732807171539d31c9f2129e8b7c2ef2b5f047a7090818a2aae77941169030e7785be7a6cded1220f8a130e9e60ea05ce6
 AUX fangfrisch.cron 170 BLAKE2B b2b3572bb468942eecc006749710900bb19e29d40ad444a4b1ee1575f2d4eda77e2b4c66f6ab75208bbb28c48f0d26075b2d0517982cd62d0f082aa657ff82f2 SHA512 46ba3a9bbdc93896387e9ca3a2fef1bbae6711b3680baa0afddf41c83b537e62d9425fe93d7d7befc60dd8a89aa4c70f9947b596594d5ca93024acec1f9bf454
 DIST fangfrisch-1.4.0.tar.gz 115303 BLAKE2B 6dea9305ad22e8beff0fc04219d24da995c36e0838e1be8b98d12b11db1f68d7ca4f6084d15270c09e8a4b8d94a7bdfe1b9bb336abef1767b1ded2d1751fa22b SHA512 5fca7b7e8d24daadfb450851c70391fce94943a718bbed4fc76efe08a730cce313d92e7d9a6a8324a0b0039871f8c77f1fcd3744c569826cc0d2e7a7fd4e9b32
+DIST fangfrisch-1.5.0.tar.gz 115352 BLAKE2B 2c8ed5484255e336a960285f4eb13180691b2e4da0260f6ed2d1308575f5104cb79602c6c5bda93d2889dfdf24817748560376c9e13e6071810d9246b6120724 SHA512 cb15933d0cacc0912e7f1f103a213e277905a40ff4f7fe818c60d28c2ce92377aaea77b413f55f0ae8701e41eb35bcb2c3b3e04c624a6a57533ca621f93e00f5
 EBUILD fangfrisch-1.4.0.ebuild 1976 BLAKE2B 6ae2b185454375f005ce29c44e20905c46ea68a6b9f7b12b340aae679f643880cd43d5e03606355b62156569900ef14aa567179ed5d317563ab5612b4f2c30da SHA512 ae3ac41b250d230c1d47c30b38aaa7f70391731d546d73148d9ae00a8a867f7205d98e613737289929ecfa0f0c4937ee87fe2bc81644228829b979d3fb8019c6
-MISC metadata.xml 902 BLAKE2B 3dd17ad91b99f579c7383daf5f4f468ce07280ffe6b82cf0dcc06e23a9bebeb39cae06a5ac39ee15146417b579cb46e57339fecd03cb3c7c1b84975013364fa3 SHA512 52c1b6258fdab7b1583823ed593b3a63f3b4fa1e3a7061c5b593ab5fbc8081ea4ff801708fc3f00a228df5855e121c1417d5811f32c84088b52b420291d28b24
+EBUILD fangfrisch-1.5.0.ebuild 1943 BLAKE2B 4f39d9ab447fe04d28eb1dad548d5bfdeff03b694f33399021580545039a89ef5c458abf09f038c2d8c534f791f7aea8e194ac3a734652a6cae19e70b9186378 SHA512 5b3076ce89f4898d55214d5de6245b926addf02cf374341bece8ea7c52354b45776625ef558bc3c7e715e2069918ad921862f72d93d041de8a79e028921e2b40
+MISC metadata.xml 920 BLAKE2B 879f3328bdda86673c3adcd3915c8031c39cf4b40b4c8a57bcaa9933c20c237066a83f5a8aad46df25701b85a06996d1b49132c3f9a938bd53abd5a1849ce759 SHA512 c7008978e3a919ddd3f2890cb4f29c23eebabccbd27f078b56749715862db3e604ca8b677af8c2b233d554f3089ff9c40b80a3bd49eebfb5c4c2a7db6d8436fe
diff --git a/app-antivirus/fangfrisch/fangfrisch-1.5.0.ebuild b/app-antivirus/fangfrisch/fangfrisch-1.5.0.ebuild
new file mode 100644
index 000000000000..87b2d6559446
--- /dev/null
+++ b/app-antivirus/fangfrisch/fangfrisch-1.5.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Update and verify unofficial Clam Anti-Virus signatures"
+HOMEPAGE="https://github.com/rseichter/fangfrisch https://pypi.org/project/fangfrisch/"
+SRC_URI="https://github.com/rseichter/fangfrisch/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+MY_CONF="/etc/${PN}.conf"
+MY_DBDIR="/var/lib/${PN}"
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="See https://rseichter.github.io/fangfrisch/ for the official
+documentation.
+
+### Fresh installations:
+
+Modify ${MY_CONF} according to your preferences.
+Assuming you place the database into ${MY_DBDIR}
+(recommended), execute the following commands in a root shell:
+
+mkdir -m 0770 ${MY_DBDIR}
+chgrp clamav ${MY_DBDIR}
+sudo -u clamav -- fangfrisch -c ${MY_CONF} initdb
+
+You can now enable /etc/cron.d/${PN} for periodic updates.
+
+### Alternative: Updating from release 1.0.1:
+
+Either create a fresh database or manually delete all existing
+database tables, then run the initdb command as shown above."
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.11[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	sed -i -e '/SQLAlchemy/d' setup.py || die
+	# Due to the nature of Fangfrisch, most tests require network
+	# connectivity. Upstream CI reports show that the tests are
+	# successful, so instead of a pick-and-choose approach, the
+	# complete tests directory is removed in this ebuild.
+	if [ -d tests ]; then
+		rm -r tests || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	insinto /etc
+	doins "${FILESDIR}/${PN}.conf"
+	insinto /etc/cron.d
+	newins "${FILESDIR}/${PN}.cron" ${PN}
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
+}
diff --git a/app-antivirus/fangfrisch/metadata.xml b/app-antivirus/fangfrisch/metadata.xml
index 6997a7fc0808..712e48db73b5 100644
--- a/app-antivirus/fangfrisch/metadata.xml
+++ b/app-antivirus/fangfrisch/metadata.xml
@@ -5,9 +5,9 @@
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>dilfridge@gentoo.org</email>
-		<name>Andreas K. Huettel</name>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
 		Fangfrisch (German for "freshly caught") is a sibling of the
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index f94bfffc8ffe..30df81f3a7c2 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/arj/Manifest b/app-arch/arj/Manifest
index 040df16099ce..761813559e52 100644
--- a/app-arch/arj/Manifest
+++ b/app-arch/arj/Manifest
@@ -4,5 +4,5 @@ AUX arj-3.10.22-implicit-declarations.patch 833 BLAKE2B 7162e7851dca555a1d904642
 AUX arj-3.10.22-interix.patch 1257 BLAKE2B 167249b08e73a1114f58781d732288397ba18030c00b3c0df99f5610946569de63fa5d5c2dcf6840cbc7785cc0f22948361ab5d21da6692fb0915a925f308804 SHA512 0ed64bd6d37dcca43651b32623881aaf94525c8dde82515f03ef748a642945366fe2da732aed7ac7c1f6165a6b03fd3b50f078afc135546704d06179d99227cd
 DIST arj_3.10.22-15.debian.tar.xz 16756 BLAKE2B f9bf45f103cf3f76867006bdbd61f6c5e04d75d9543e99e01304b285b8858034c60f38ea76bc8cdc502b44a8515fb7a04fd9d2f3d07f9ea19e1c5d3a4d448eff SHA512 66e1bc3188afc24573fe98374f9b0cf939d0d3c7a1b356e6367ef544fb0e64721fa686fd1e791f58508576f0f50994878347bcb054f48ebe240cc9ab97e00688
 DIST arj_3.10.22.orig.tar.gz 431467 BLAKE2B e40409b9f88a1a7e56de4200b464c3dc420659fa3991bf904ca86bbdb428fc8d17f095b9eabf3170712458ef2136e96545810201cc6755c15e45d4ae9a5e3a03 SHA512 4730dfdbab4f8095396c337578ed69bdaae52955ad468db50b52af8ad2846ecd6cfc05eb3ac0d03838c1c32ea60126f14a22b93e8181c06b9546456f3937ff76
-EBUILD arj-3.10.22-r7.ebuild 1263 BLAKE2B 3b185f881f8af90d4c4cabafdfe5591c7112804b0eedda95e8fb8111975a7d97ea74743a27475fa4d5124219d29a58cdd44982fb37fa4ddca6a4af2bc1ce9850 SHA512 ef3b7ecdb9b57cd51213a1e72ce77fae34207306c98e34009b5ad03f5d8e91ff5f889a86e077a084d951845a4fb8bc2685b5dffe064579a96ffd79f7cb393029
+EBUILD arj-3.10.22-r7.ebuild 1270 BLAKE2B d5e967cfa0ca78e2ad3f96a2c5d5b2e663fc7d36fbaa66d300a5bbd197ef8116cda796143229e6073ea2cdd0f5c159eee9e7ec33009bedd9fbb222e731250948 SHA512 992bc9a9dba7d0fb994f1c1df08886bac444a3ab70065f06b4dcf6ed24b9a8865466f176c4b812159ca8291a54c1cd2b58f6866be7167aead2a3b0f40a026bf1
 MISC metadata.xml 241 BLAKE2B 5c1b54358586f7e559555097bc0ed2152b557cd35dd5b28aeafb7992d810f57674e874a948a0345871cde19486fe6849ff5a5091e7ea67078f3295b935eb3e99 SHA512 5a82a671e4d5f34d32978ebd8acfc78e44d1d93df5e1c2eada2c3dc04d1e2db00c998346f1a71b6eeb0e0eaa964f70a33f7db6a73d551934d190f6e73baba28a
diff --git a/app-arch/arj/arj-3.10.22-r7.ebuild b/app-arch/arj/arj-3.10.22-r7.ebuild
index 2d32c5a42f08..25397e35a751 100644
--- a/app-arch/arj/arj-3.10.22-r7.ebuild
+++ b/app-arch/arj/arj-3.10.22-r7.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=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://debian/pool/main/a/arj/${MY_P}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 57c00113be8d..9a6b9f1b7046 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -2,5 +2,5 @@ AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611
 DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
 DIST gzip-1.11.tar.xz 804096 BLAKE2B c251066f0bded6a6557a5cbfe5d20090c6446051c31fad610af4f9f7b2537c28fed1cfab424a459452db73b7d1df1361e5aeba163a9e980fc611faf408cac128 SHA512 af297c173297d588722f4d0f140a2ae4d3ea3861464191772fb2e11e47be43644b5ae01ed63f0051d6eb4751666284de53e14c4dd9f0c1d25f61cf676fbf11f3
 EBUILD gzip-1.10.ebuild 1081 BLAKE2B af51b89c49e389fd2f38996790b6102730594d4bd66c7a4177de9643523c9c9142b5758f7aa610aba7150f4c03f9871c59bf32a3f125084d636de066f77fb4bd SHA512 5616d9ae48821f18464c7e9227aee73293179febfb6b76aca227efa97edf58ad5ba776c5e3b3c5852089ddc86e06a7edb99955176a5f9d3b05e10a630c1abf69
-EBUILD gzip-1.11.ebuild 1089 BLAKE2B 7d6bb6607f6cde4a8fd683ad2ebdaaff7e5381f871e2471521f705d1e1297c339fce2d7640ca398c68e1201310cd5136253cae2a8bcdda4b7b242c44068ab99d SHA512 b62fe8096223eb97ca73a9fe928ae3d7942361bd07e9d755cf055aa24eaf27dd4f91c6b9d396e81274202daa1cfaf45680741b922fcba9e39e6c9cf9e622d153
+EBUILD gzip-1.11.ebuild 1332 BLAKE2B 7cb55947297327ac5887613bedc882fbb18766fbe6dde763e6a6954b3392c0392d82c109ecb77a8a434cca89a66cdf15c9237607d20a279d2efcc804cd3eeeba SHA512 26557604af167b197280f99d28ac374b536f33bec0062eaaf3e6bf23112287ef4d8d10f85adc24ee066afb2b14db2ade1cf38263d9d74369f1929fbaa3d7f2f9
 MISC metadata.xml 422 BLAKE2B b3ba7db4fdf23c9b1b801f21a3230898f260b131344538ff8644bc842dcd5f6bef5e4e2f8d475267d6d39047a87c00e1138e69d49892d21d58249346bde1e57c SHA512 6241ec1357f2f326c745589a18622987e9444e515157a53cb1188a21cd90e14e392db1e31b24f833ba05647ddfcfd6a89e13f6125ca15451bceb1a14e80fbc23
diff --git a/app-arch/gzip/gzip-1.11.ebuild b/app-arch/gzip/gzip-1.11.ebuild
index b41b9f810670..395fb2de49bb 100644
--- a/app-arch/gzip/gzip-1.11.ebuild
+++ b/app-arch/gzip/gzip-1.11.ebuild
@@ -20,6 +20,15 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
 )
 
+src_prepare() {
+	default
+	if [[ ${CHOST} == *darwin* && ${CHOST##*darwin} -le 17 ]] ; then
+		# Fix older Darwin inline definition problem
+		sed -i -e '/define _GL_EXTERN_INLINE_STDHEADER_BUG/s/_BUG/_DISABLE/' \
+			lib/config.hin || die
+	fi
+}
+
 src_configure() {
 	use static && append-flags -static
 	# avoid text relocation in gzip
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 6a94f155436b..c206ab40c693 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,6 +1,9 @@
 AUX rpm-4.16.0-autotools.patch 439 BLAKE2B 173435c31b0e06f47948711da00452d08dd644fcd8ed05e61f7ed31db56a670bacdb4ca1504dd64818752e30868541e3c50f8ab84833101607cf8c487cc93bba SHA512 fce8b036dfc55e5602721206788a1a755e2df8ef6b1cc94f047f7180f97efa750957ffa063cc18c274fff8b20f41181aa1c46c11ad2feed9689d50f4f696afea
 AUX rpm-4.16.1.3-libdir.patch 1152 BLAKE2B b54191dbe36af115b828fc111cea0348ed7edae47f8b9597a57f1b7e3b4848129dc50f1b001f5e8ae92f5f1c07cbe51330ccd8c15867e7624ea07756317eaca6 SHA512 8fd4c0ee785fb583172df7b7543ba790927a9d4953a0368bc4a641fe6e34b35011e3d3cbecaf80c58e79239e68bdab6797c8592f0c5185197df726a51e06d224
+AUX rpm-4.17.0-libdir.patch 855 BLAKE2B 81a2daf0577c8dc3feac190764125da7a616e24ccdd38c3715c3c68f7fc831cf2662e629f23ed88f7d133961a40ac7f63acd6c7f52e99f17abe53442b2a5f14e SHA512 68d884cf9d57d89138ee7d6882869b0560aa9cd3dc82b837c47732f2d0248b42fbdafbbcc1f3f04322cd750744d97e4512491fb0591eb0622b2a5d1918391c46
 AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
 DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e
+DIST rpm-4.17.0.tar.bz2 4514138 BLAKE2B e2618f7ac59189fb880d6be853aae99080b5008865298d095a123a010ab70f9e2e3ad9402124afbf8291a3863e9e805c9c65ab47cc435df82a729e81984394bf SHA512 d32af8649c6d47796a645b6ecbe580df97f5423bfb17414d5ed0016373f5cfab86ebcfad6c480fb8bfafaf3a960f9bc095ef6faad7b40bdb208cc60e4080b0c8
 EBUILD rpm-4.16.1.3.ebuild 3642 BLAKE2B 20e3eebb5667d0367ae7d40892a0898c093e81a5d06a7e663b662bdbe93a9b1f8e5c9c48295ad5ca0aa49d2ff14974c79453d9625fc1ab607f818a02ccdd976a SHA512 092048f92e01f0c8aa7f42ee16a416fd3119b9571bf59f8c27a89e4bf328ac1ee56e2200d3ba227c2caaeafe86c3bc21817a34b603d0a3e0e56b1266a8008604
+EBUILD rpm-4.17.0.ebuild 3911 BLAKE2B dc7861a2407f74e2b53e18d49767c8e74cb03615f5e6338e7bba9edac6ff58e39df41d41d65ec95900556e1dc3e98a09c7c486e15d68e46713c706b16eb43dc0 SHA512 21fd70ad3bec10245f074b08120fa8869e55164b35781661f7d1fc80c7ff7ea91e6a9a0f32f5c65febac0862e8a1f7ae5a5ac661219ff0f66d164d696592f7d7
 MISC metadata.xml 260 BLAKE2B 00f83151d62c157bea18101b36007f01e6da9d16d438671c37b929b1e19cfc202f379816a1b0d9e3faea99c44a43f97a5d43100266c683487dabba09f1378eea SHA512 d6fc386bd5be91d5dff3d7aa514f4d72e7301a47f888db95573d72505ee86987ae6412fdd8aec82842c006abe831d99f6178b1ac78a04a7dbf9e5bce1d249cb7
diff --git a/app-arch/rpm/files/rpm-4.17.0-libdir.patch b/app-arch/rpm/files/rpm-4.17.0-libdir.patch
new file mode 100644
index 000000000000..5bff26b71290
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.17.0-libdir.patch
@@ -0,0 +1,32 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -865,13 +865,7 @@ AC_ARG_WITH([rundir],
+ AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory])
+ AC_SUBST(RUNDIR)
+ 
+-if test X"$prefix" = XNONE ; then
+-    usrprefix="$ac_default_prefix"
+-else
+-    usrprefix=$prefix
+-fi
+-
+-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
++RPMCONFIGDIR="`echo ${libexecdir}/rpm/`"
+ AC_SUBST(RPMCONFIGDIR)
+ 
+ AC_SUBST(OBJDUMP)
+--- a/rpm.am
++++ b/rpm.am
+@@ -1,10 +1,10 @@
+ # Internal binaries
+ ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
+-rpmlibexecdir = $(prefix)/lib/rpm
++rpmlibexecdir = $(pkglibexecdir)
+ 
+ # Host independent config files
+ ## HACK: it probably should be $(datadir)/rpm
+-rpmconfigdir = $(prefix)/lib/rpm
++rpmconfigdir = $(pkglibexecdir)
+ 
+ # Libtool version (current-revision-age) for all our libraries
+ rpm_version_info = 11:0:2
diff --git a/app-arch/rpm/rpm-4.17.0.ebuild b/app-arch/rpm/rpm-4.17.0.ebuild
new file mode 100644
index 000000000000..2bc134671182
--- /dev/null
+++ b/app-arch/rpm/rpm-4.17.0.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{3,4} )
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit autotools lua-single perl-module python-single-r1 toolchain-funcs
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="https://rpm.org
+	https://github.com/rpm-software-management/rpm"
+SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2
+	http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# Tests are broken. See bug 657500
+RESTRICT="test"
+
+IUSE="acl caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="!app-arch/rpm5
+	app-arch/libarchive:=
+	>=app-arch/bzip2-1.0.1
+	app-arch/xz-utils
+	>=app-crypt/gnupg-1.2
+	>=dev-lang/perl-5.8.8
+	dev-libs/elfutils
+	dev-libs/libgcrypt:=
+	>=dev-libs/popt-1.7
+	sys-apps/file
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/libintl
+	${LUA_DEPS}
+	dbus? ( sys-apps/dbus )
+	sqlite? ( dev-db/sqlite:3 )
+	python? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	acl? ( virtual/acl )
+	caps? ( >=sys-libs/libcap-2.0 )
+	zstd? ( app-arch/zstd:= )
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+	test? ( sys-apps/fakechroot )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-rpm )
+"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	lua-single_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+
+	# Added USE=openmp and this check for bug #779769
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
+	eapply "${FILESDIR}"/${PN}-4.17.0-libdir.patch
+
+	# fix #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+	# fix #492642
+	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
+
+	eapply_user
+	eautoreconf
+
+	# Prevent automake maintainer mode from kicking in (#450448).
+	touch -r Makefile.am preinstall.am || die
+}
+
+src_configure() {
+	# rpm no longer supports berkdb, but has readonly support.
+	# https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0
+	econf \
+		--without-selinux \
+		--with-crypto=libgcrypt \
+		$(use_enable berkdb bdb-ro) \
+		$(use_enable python) \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable dbus inhibit-plugin) \
+		$(use_enable sqlite) \
+		$(use_with caps cap) \
+		$(use_with acl) \
+		$(use_enable zstd zstd $(usex zstd yes no))
+}
+
+src_install() {
+	default
+
+	# remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# fix symlinks to /bin/rpm (#349840)
+	for binary in rpmquery rpmverify;do
+		ln -sf rpm "${ED}"/usr/bin/${binary} || die
+	done
+
+	if ! use nls; then
+		rm -rf "${ED}"/usr/share/man/?? || die
+	fi
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CREDITS README*
+	if use doc; then
+		local docname
+		for docname in librpm; do
+			docinto "html/${docname}"
+			dodoc -r "docs/${docname}/html/."
+		done
+	fi
+
+	# Fix perllocal.pod file collision
+	perl_delete_localpod
+
+	use python && python_optimize
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #657500):
+	if has usersandbox ${FEATURES} ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	emake check
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die
+	else
+		einfo "No RPM database found... Creating database..."
+		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die
+	fi
+}
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 6a9acdd4bd07..cff52dc4ede6 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,8 +1,9 @@
 AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 970 BLAKE2B 5288f515e3806394b540bd5187cc277467b462526fac35dc2112fde0529f952083a02dc3bdd349e8fd6d24598f1021904861dec683a03bf9c98d9bfc60bb0aa7 SHA512 070e4bb4c2e4f67d6c22743d82660506478fee8c6fd936508a2beb687a57fbb7325283fa2e9b3f6cdac599a5bc19519b35236752d1926554047444322ac7689f
+AUX snappy-1.1.9-clang-werror.patch 662 BLAKE2B 232e844f269658a757fbb904744b778d1f4c0f5127fb5596143463056238d8e0c1e448bfa0223cf061c2175e397c11965f1db9899434e8777fbc1bf310f0805b SHA512 82424729bbc8698fb0ff3827dfc5cbda9000cb5a80b6f668e30bcea38f1022a7008c60a56fc9b52dc57e771cf59766e4a43f60e04e0f750001c510e71f4263cc
 AUX snappy-1.1.9_external_gtest.patch 1092 BLAKE2B 392ee98254749dbf65ae8317dd2c26dfc140b768a08fe265cca26a0dce0eb43a1283eb55659c1fbf8e36e7037e65ec3f5ef970eb6436822fb6af212981f1facb SHA512 0b867b60b6e90551ab3c1ce4990775f2b0085d68fae72c4b63925f772b565cd86e9ad36659dae3a5cfb621ee628a0a547c82356f0f44d67ca2cc4ad9bfe16333
 AUX snappy-1.1.9_gcc_inline.patch 3166 BLAKE2B b4d05035647a97709ba43ee9673fbdaf1a160cc5859fd7401a8cdb67e04ba49bdfe98a9801257356841326b26759eff1022af3d5253628a87b0035af122a8fdd SHA512 5e8389e31a8d6e092843a3456f4a75d1f5f26af25d9d7ddfec283573a423522ce779b9ed4da5d2e3b6346153b5d137070611f88ebc907cfec64748afd29759f2
 DIST snappy-1.1.8.tar.gz 1096137 BLAKE2B e21f2ea23727f118920b7f67981354194f12d1d61eaa18eb1cb2f4285fabafdd221b88cf1e3b3261634f65469a714d3efe6b218c0b1e9d41639cdeb21097d75e SHA512 efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c
 DIST snappy-1.1.9.tar.gz 1102382 BLAKE2B 926d03156168e3d4800dc17144db3de2c182c6eb9970d87a00b94fb09b67e403479a64cbed75833b83fd03173c1bb8caaf248a55627e89fe2a34456f12ff3b42 SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024
 EBUILD snappy-1.1.8.ebuild 1832 BLAKE2B 7fb98c5cb96af2d0c928871ec1f53c1402e536d1b9063b137822d6229ac90f6ea397a81a92269a3c67bb3e5551b05158439e552b6ac4deb3905ed8e34ee92f8d SHA512 11813434621156c662bdbb1acce6b1279f8ad3e7ddf0eb446cac0961357334cd3b89fa9f640c01cb29e49d8c560253184287eee0cc763d1da7cb83840fa09f11
-EBUILD snappy-1.1.9.ebuild 1131 BLAKE2B 0c61bfe91d39ec064a79747cdcf525d562c0169c92d9a8625050f31ebe2f02197960be270a36a739b3a03876b0d844539d89f0db5c0ee4bb4364b0c210b88234 SHA512 7730eff003d49da217949413286ea5340d5894b5644aba08bbe479368df95bb6c18889f0182cb5798d885501524c8a27985af015ea4efd302b7c47e762ebe0d7
+EBUILD snappy-1.1.9.ebuild 1171 BLAKE2B 561f36ded3988a51e03ead969d965d11415348e0cc1541fe1d52ec2264bd62feb52db7c4ccc8fc5a26e5a109544395a893b42b71c9f752580386f2767f9f1d81 SHA512 3c1af7733450e69145afc58f568d27735d20ea7570af7f9b4939a88ce440ed096f0888794e495271d848eba08d28e2301473a26af7fc018f9a35b07b6cb9ecb7
 MISC metadata.xml 744 BLAKE2B b404083b800d59914c748d3a31aa13bb341dcb8f5fc227d3c003428455d459d0d011b2cd10e7d5d3cef3e73f66b14611fd04be409567392943cf1d09f0e4f066 SHA512 204079f9e40c81853343be190058b8dda25a25015c91704c98574151e7b06760d9c8f475790f95ebcbdce48c0b06a8e3e612c3183db1f4aa0b7ced8024c22fd2
diff --git a/app-arch/snappy/files/snappy-1.1.9-clang-werror.patch b/app-arch/snappy/files/snappy-1.1.9-clang-werror.patch
new file mode 100644
index 000000000000..e89a8305e731
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.1.9-clang-werror.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,13 +66,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
+   endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
+ 
+-  # Use -Werror for clang only.
+-  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-    if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+-    endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
+-  endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-
+   # Disable C++ exceptions.
+   string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
diff --git a/app-arch/snappy/snappy-1.1.9.ebuild b/app-arch/snappy/snappy-1.1.9.ebuild
index 1d6d63ebf93a..0d7529657a0a 100644
--- a/app-arch/snappy/snappy-1.1.9.ebuild
+++ b/app-arch/snappy/snappy-1.1.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -23,6 +23,7 @@ DOCS=( format_description.txt framing_format.txt NEWS README.md )
 PATCHES=(
 	"${FILESDIR}/${P}_gcc_inline.patch"
 	"${FILESDIR}/${P}_external_gtest.patch"
+	"${FILESDIR}/${PN}-1.1.9-clang-werror.patch"
 )
 
 multilib_src_configure() {
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 9e2863bed9f2..0c303970783b 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 593950c966f8..15db98fd5fff 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -3,6 +3,6 @@ DIST borgbackup-1.1.16.tar.gz 3777030 BLAKE2B bf5ad487fd0cdcce341b14ad950bc447d8
 DIST borgbackup-1.1.17.tar.gz 3781411 BLAKE2B 3ceb51f3c2e4ee4e38495ca0bdef2d5c1b30225afe9a3c9987a82f4a1facd4aa203fb21512e655fbbab400bcbd412ff4aefa80242aa21a579e086d38bf3e1078 SHA512 6170680efcca35341031a8fcfd9434d2dca530bb6f7fcabbf452e6af6a8df5a825b4991d342f3c97bd7378d56b9ee86e6118f9281a31ba51235f49818852f4bb
 EBUILD borgbackup-1.1.15.ebuild 891 BLAKE2B fd7e6dc50e0ca6cfd0773115bae0888f23b8f54b6a0772f8bb1457fae9b991c1a0ed18c7f353a779771b1a46affbccecb06b2d74eea6ec2f649a934baa7a15d4 SHA512 6d7e21a3af4a26e7a3ffca6b317a0c509e9cfc94ab042c3698a634a4576aef02269642ac485de4cd23b6d8bcb22ccddfd36eccaa827111af8b7056b549b7c96a
 EBUILD borgbackup-1.1.16.ebuild 893 BLAKE2B 1abe061f0005516b4a28fc5e9b116c8c84c63cb0433fcbe5b9c8cec57fde4153959a6708af600a6a934cd882b35aff8425ef627548acb51c04292a782b77abaf SHA512 5581b6d662431756c2eac76b5281085387f82d77f30a633db73c7dd80edfe1629d2a854bdaf7d4a56add593cddb90eeb96c33fb3af83f651f9bd39290e239892
-EBUILD borgbackup-1.1.17-r1.ebuild 940 BLAKE2B 14419908167e0b8bbd0309b1c271a615f59bf9a95caf85bc29a71787d2952a387a0c50dd9c0fbba4fd88a5909a0c0ab855e575ecb2f653f3f5e9a30d79347eff SHA512 4ab462d9c80f2ddcd267605823d141c0bf0524798d6c7707f4414fcf26e3b58ae85e0399e7114e286222c3bd229ae91350cdae8a5d404e9bbdc5baa415326bf3
+EBUILD borgbackup-1.1.17-r1.ebuild 938 BLAKE2B 9e1165ef693d028e2936f22ba5bf0af42bbd7a83d1df32f667bd79269cea3d39ee90cbfe9b9718d8e650cb0ab33d6de5d909a78274897ca1ebefd918538db2eb SHA512 04fdb94a90a9a0bc36de20029c03d73625bae7f1ae099f96ce225e778cc60a00e60fea2ebe5cb40b35c2fb8af46fd0cade56a359e2a2d9eeef99e5581c560dd0
 EBUILD borgbackup-9999.ebuild 933 BLAKE2B 3af24e55a1fc6b941896d858831900bd23223af3474907ab17ca04c40ff482be1a120bd35f4d979a8e747bd42ab7e106841dbfd117830ed02d89e7624d99b348 SHA512 4ab024b404b49997cccb3a633320bc1f06d5e7fa36e785225302e1fe2efb29e00e5d13a2a47f4b7de5295c022d1fea34d2b18a051e2b8942599cdfb5de45afc0
 MISC metadata.xml 494 BLAKE2B 885fa002bca2ba16e31bc66dde9d21aea8eb5a3ab5522cab3e824a9cde1d87f8819eb028eb21a9382d23622fe0a699a481e7cb7cd50fba897e59490ba0734d39 SHA512 bddc0ca7934315439e4a23b43fbd42d538c1570b43b0401efa9641c2854e5633d727db4bda82a34fe88ad2c1b512df47b6654b50f85a0501f0ef8405d7f8a667
diff --git a/app-backup/borgbackup/borgbackup-1.1.17-r1.ebuild b/app-backup/borgbackup/borgbackup-1.1.17-r1.ebuild
index 325844f806bd..f4117d28dc50 100644
--- a/app-backup/borgbackup/borgbackup-1.1.17-r1.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.17-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index a5819d7cfb3e..3503c3beb507 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,9 +1,8 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
-AUX borgmatic-1.5.1-systemd_service_bin_path.patch 446 BLAKE2B bad832573f35e832e5a111a12d6c61cf2e2b1111e91252923e841ae5ec6661ed4f1c4d1e4cc94fe31887d8ee0b2a54aac7d79f8bd0e6f27a2e89f1ff0484c091 SHA512 299791d5079522270954a6742669f3031c0d6164ad7037387dad7f7dccebbe20b83f21f1e30ee61915c2703a370ba9987ab66989c4a99c1706ddf2b17bc2c718
 AUX borgmatic-1.5.16-flexmock_write_args.patch 738 BLAKE2B aef28c6cc9f3e4c6294cf34cb6e3a1291fce90e0696f54d8f3975d7823faf64d73f2f625f1ccc7d1473e74f81342e6243d283950c505ed7cfc2279afe8eb5df9 SHA512 a9e1645dad137a9a20e71967d4578b3bbedca5556ce8e7b588215eb240c5581e6e0d5b657941eedb637ff94ac6e09ed06d3d9ef941cc1d4365daef0ae536659d
 AUX borgmatic-1.5.16-systemd_service_bin_path.patch 556 BLAKE2B f90b66d3d46ea972ed67bff74365b72e5e7df16199b439e5ad785b731eaa9a3eff5cfa6c9084c1b212b2359e9b8a14b1d0952ec6a560746acfbe594a2267e0ac SHA512 b23d899754762e29221b537c303e65a3b84e4a580d502f96870e8927ab2ef79b557f2c5638cfc4557ea5dfb6bea82b9776c6a67e65fda8a02138d3c57dfc00e6
-DIST borgmatic-1.5.15.tar.gz 275702 BLAKE2B c01c469a4e0b96f4a364e0e44cd26d60cf34bc1c969cbf9931ee5ec6688cf012a1c22acb20e3a434b765ef5ec68657a2507e292e5ed3b9e0587f8784e85ecfe9 SHA512 5520e2e903162caa42c66c1e172af225f5f9622c1b33e5f0854f2dc8379752865e8cb8c442e545ec4fc98509e5c7c863373b12e57cf0bbd417b4e8c0887a27fc
 DIST borgmatic-1.5.18.tar.gz 277064 BLAKE2B 43f5f8d2fb7f13ed6bcfd5b00f99a797f214f5220b27f8c173f636d37b4c0b5c8d1915a73684597d71fb436717a84de542be51a9b23f735e304e15427d40ace1 SHA512 2e008ef01922851a3fd5c7b5d1ad30d5b0e007e5f76af4849159ff2f730add591ffb30ba3d867b0e7221b98e949e4cf3e11b8853a3412395a63c135248761264
-EBUILD borgmatic-1.5.15.ebuild 2143 BLAKE2B 2a29e0c8c0274a2e02d4137c0cd3661bf2c86c9f9d5b3f59068d3222022ff70975eda4344699f03e181bd746b3c4ccda7e34c365301f1a1d4cb7a167e7ffcceb SHA512 cdabf0735ac44acdfd96f6ada94db2c9cb7fa0de0650d62948850156a08a7266184ed5da9d3d347e19a30609fd104f07c12fca6c515d5767403aa2bf9c42929f
-EBUILD borgmatic-1.5.18.ebuild 2089 BLAKE2B 323ef6ae7bf7a4193402bd4c6190a48a3649b631c47a80fb7092017a823e7ff151deb2b6e7778b3033e51479bcd577336f5630725e3ceebe81e66f597386c751 SHA512 cdf5ddd667b566a4750f583212c14c36cb2a0416addf265d6353dc981a39839f8802093b92748eb98a360d20e4cb6a36fa1061a2c61c60107e63d7204b52b7d1
+DIST borgmatic-1.5.20.tar.gz 277495 BLAKE2B 6714b132549633b1d24e3c0bd7cd16ee9ff5510c4915d4115d62f4a260dc3cc505a02d8a14220184d53c934384d9ca092a38d6deebcefb843e7ba4492043819a SHA512 ea370ea1e57f56c8c4b7636695ae40473b9d58696948f55afde55b31b3bcbd68923952e80b0ef0bc40f68bb265ccd47bd5e0b2735ee9b4b6f3418a5ff13eaaf4
+EBUILD borgmatic-1.5.18.ebuild 2096 BLAKE2B df79e8f214b7d8fc55fd6c21710b27ce9817695a7fc65ca4a9e1208ed9605cfb55f7064588c8c5b5897d790bd0e43283f673aeeedafd2bf1343396b140997321 SHA512 59123c827902346f4aca8841d93b8028817b17badf1cabbf1ece2aa7913d52cf00741d2ec54e11ee4485baf1843f4e9d8495df40c1fcb4f0784b3b16fa24beda
+EBUILD borgmatic-1.5.20.ebuild 2053 BLAKE2B c2ed86a406951acf3341d1808fd4976606026b37f010fa90a01eb1d65d4075c29177f7a14fcd5b2cccf3ff9c1851f0fe691a18170baa9baf0d942c37a1354823 SHA512 21b38e68e00a391c85b569f5fe5cae50dbae549931f81a53d338cae13328cc41a98ec45af917f0907893fe41c4f0721729aa25d4533bbfae43bc3a5563e33720
 MISC metadata.xml 366 BLAKE2B e4c95292ab3040a6e29337f620ee8b808b1da11733b300fe7d53f1bf1c9511c2835d122d1c4c8da36f99a98f35eb1f3f505357c9d5796c6b9dd187f7171098a4 SHA512 c23574795068b1a77b4c2c8efc7a171e9a6160b1f05f528c589589eb56d607ad03168c894f4c4f358e03a33c04b7e84a3b464be347b4cfbd7eea92d5f5b5f411
diff --git a/app-backup/borgmatic/borgmatic-1.5.15.ebuild b/app-backup/borgmatic/borgmatic-1.5.15.ebuild
deleted file mode 100644
index 55397ae435f9..000000000000
--- a/app-backup/borgmatic/borgmatic-1.5.15.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
-
-# Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
-RESTRICT="test"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-	$(python_gen_cond_dep '
-		dev-python/colorama[${PYTHON_USEDEP}]
-		>=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
-	')"
-#BDEPEND="
-#	test? (
-#		$(python_gen_cond_dep '
-#			dev-python/flexmock[${PYTHON_USEDEP}]
-#		')
-#	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch
-	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# Unlike the other two test files in integration/commands, which use the
-	# relevant modules' respective APIs, test_borgmatic.py tries to call the
-	# 'borgmatic' executable - which by the time we execute src_test will
-	# not have been created yet. Adding --install to distutils_enable_tests would
-	# likely take care of this - but between the aforementioned behaviour
-	# inconsistency and the fact the only test run from this file as of version
-	# 1.5.13 is the parsing of contents of 'borgmatic --version', just skip it.
-	rm -f "${S}"/tests/integration/commands/test_borgmatic.py
-}
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit sample/systemd/borgmatic.{service,timer}
-	keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To generate a sample configuration file, run:"
-		elog "    generate-borgmatic-config"
-	fi
-	elog
-	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
-}
diff --git a/app-backup/borgmatic/borgmatic-1.5.18.ebuild b/app-backup/borgmatic/borgmatic-1.5.18.ebuild
index 438a43dadf96..4b739e7cd033 100644
--- a/app-backup/borgmatic/borgmatic-1.5.18.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.18.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv"
 
 # borg is called as an external tool, hence no pythonic stuff
 RDEPEND="app-backup/borgbackup
diff --git a/app-backup/borgmatic/borgmatic-1.5.20.ebuild b/app-backup/borgmatic/borgmatic-1.5.20.ebuild
new file mode 100644
index 000000000000..74ed90e2da6c
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.5.20.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="app-backup/borgbackup
+	$(python_gen_cond_dep '
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
+	')"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
+		')
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
+	"${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# Unlike the other two test files in integration/commands, which use the
+	# relevant modules' respective APIs, test_borgmatic.py tries to call the
+	# 'borgmatic' executable - which by the time we execute src_test will
+	# not have been created yet. Adding --install to distutils_enable_tests would
+	# likely take care of this - but between the aforementioned behaviour
+	# inconsistency and the fact the only test run from this file as of version
+	# 1.5.13 is the parsing of contents of 'borgmatic --version', just skip it.
+	rm -f "${S}"/tests/integration/commands/test_borgmatic.py
+}
+
+src_install() {
+	distutils-r1_src_install
+	systemd_dounit sample/systemd/borgmatic.{service,timer}
+	keepdir /etc/borgmatic
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "To generate a sample configuration file, run:"
+		elog "    generate-borgmatic-config"
+	fi
+	elog
+	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
+}
diff --git a/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch b/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch
deleted file mode 100644
index 90e94ac1f558..000000000000
--- a/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/sample/systemd/borgmatic.service
-+++ b/sample/systemd/borgmatic.service
-@@ -21,4 +21,4 @@
- 
- # Delay start to prevent backups running during boot.
- ExecStartPre=sleep 1m
--ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting scheduled backup" /root/.local/bin/borgmatic --syslog-verbosity 1
-+ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting scheduled backup" /usr/bin/borgmatic --syslog-verbosity 1
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index ac59bafd29e6..f469ca005ffd 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -1,7 +1,5 @@
-DIST btrbk-0.29.1.tar.xz 98320 BLAKE2B f7e4939fec27cc85847d7cae8797de9c59040de641ed4c3c4dcd37102daad1d3910e2ef40c3ad486614a167a7d2206c92b961ba6e5d78e351dedb8de565e3172 SHA512 78bb24fff3606bcf5cb3f4b7e31c5423ca01208cf667efa6a67978696b06ffd4f368aed372d57372ef268ea9329d51f8abd7e2e9dc59dfb0d3133c992d1d788e
 DIST btrbk-0.31.2.tar.xz 107124 BLAKE2B a05ef8a665d50b0f9637b1bc7026f0ca0f8364377b4165dae09cd27790dc139aaea1096a54719d948adda5050f91580650bf58db70a086cfdd14b73559fad9f3 SHA512 f953fe1a231f7a28c2d98cf124e3d52cc6d0810e6cb1673b90f335e07cd7473d0302ec227361f902c40a36dab5c075c675d2ee0543a23c37cb1e4baaf74efea0
 DIST btrbk-0.31.3.tar.xz 109884 BLAKE2B 7f78d00815259e42bb3fd16ee48272717fe57913b7af83ca8a98f1dfd0de715cbf8b07177ea60b5b8bdcb9793ee0d5829b90b8327cd4810f6275611276a6e707 SHA512 62dee5430635b6a31edcdc9bed1829f549b60074ea09bb6f1fcd56d242d4215339846c8c2dbcd4bee05cd2a0cb32c1237ce7311d2b887885373c13fa15a6f476
-EBUILD btrbk-0.29.1.ebuild 2322 BLAKE2B afba2b06ace683bc10c725b5093d1f15183063405245117fcbcb14efe349c1c4cf1874bbacdea9120ed4fba2e36c7d65a7bcc6bf66afa301d636a3298d2acb19 SHA512 969f28f3ef93f08c7675b5b82a2b73a75a469d9f30c0e755924cfb0364ecfa8dae2cd9909767f0802d6ae6ec329dc79f3dd414b2fa27ec44c51ec3670e3686e7
 EBUILD btrbk-0.31.2.ebuild 2381 BLAKE2B dead45950b470fbd2303425a522186e5ac553711583ea1406112260a05484a7420884a3023dbc4314121f7ef28f4b473b78082a9a77ee9c6ab6c1afcb4a693e5 SHA512 6fb46ea01bb0f105ac50d28fb0c830b70934d8660ab24bc89c1f72eea2c5c1b6b150fab1eba9ade528a6e7b9cb514fe6f5255523ef455e23a634ae29a116c6f9
 EBUILD btrbk-0.31.3.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
 EBUILD btrbk-9999.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
diff --git a/app-backup/btrbk/btrbk-0.29.1.ebuild b/app-backup/btrbk/btrbk-0.29.1.ebuild
deleted file mode 100644
index d824116df3a1..000000000000
--- a/app-backup/btrbk/btrbk-0.29.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+mbuffer +doc"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 6e827416c652..2406fcb4407a 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -9,6 +9,6 @@ DIST snapper-0.9.0.tar.gz 399600 BLAKE2B 546fcdd8beb4b5404bb718577d53aa284f04a5a
 DIST snapper-0.9.1.tar.gz 400387 BLAKE2B fe9d25f573dc99e0eb6c876fa2ebb34140ea8177c72a65af65bd4b6621b81bcab71ee03948696d311444cad4c69d21db70161f67ef3917aea93e39ad54b10444 SHA512 447a024570bbb834adfc789aa5b12b037838fcf50f8d26f87a9a10b250541a589be3b24b01f990625021b8ff5b2eade0f2eda5e992f76113c62bd5e8a27c1293
 EBUILD snapper-0.8.15-r2.ebuild 2050 BLAKE2B 9aa6d6f8b72f680edf08ada7a87850e734a445c2b780403564bf3f1f1b51bebc1d2c02c195dc2ae1dd5214299fa8ff094a2a0e8f6549c053001b970f68d39e3b SHA512 8916ebc3ba6f3bd30a053b5e41d60de1057868f6e102151d0bd137b0af31acebcabfb7fd0922b451edbae4f38b75494a6db481c977eb50f2ab997ee0b141f403
 EBUILD snapper-0.8.16-r1.ebuild 2060 BLAKE2B 08c83366000f96267a5ac13ae7950c3471aa6ced6e88b394340f6c3555d7ebdeb9197a7102c3613d228c1bf7b10e967aa457f8e961c5a24a9c24c751b3ce43d8 SHA512 e295e6a70bc9e0834da1220538d93d2fc78bbdc98bdebddc10b1a272c89d9e5dccb3a6952e49173fd039353d709898cbad07af17e26be4974d3b56f23b1dab89
-EBUILD snapper-0.9.0-r1.ebuild 2059 BLAKE2B 24f81580afeb058a40cc1f6f1ce2a491c026b2a354e4982eec3065b92d6635f64296d852aaf5a1c686150617b9734f0fc0d076c222d0e5ef1545891adca981b1 SHA512 597e80417d5823dbb22543cf5c48e12626979395b7d2f80d59863c34428bd8bec77a24c2a136ebfdc1261c5e30c8bab418e53f0e3a947792f7f780b3b765f70e
+EBUILD snapper-0.9.0-r1.ebuild 2057 BLAKE2B 0984ee3f4edacf15fe522d9b9f165056f5cac0beafad3146e460e05a07193d7990bdffb36bde4cb78bfded98c7790482ffe998a46c936dc0f99b9a1bade0448f SHA512 f60866ffd8a1e896372bb993c6aade4f972b8207db7e9ddf44555e8b9c616e0e7cbe9044e8835d90f5c89094b94036ea8adad163defbfdd280d438e94df2fbe7
 EBUILD snapper-0.9.1.ebuild 2059 BLAKE2B 24f81580afeb058a40cc1f6f1ce2a491c026b2a354e4982eec3065b92d6635f64296d852aaf5a1c686150617b9734f0fc0d076c222d0e5ef1545891adca981b1 SHA512 597e80417d5823dbb22543cf5c48e12626979395b7d2f80d59863c34428bd8bec77a24c2a136ebfdc1261c5e30c8bab418e53f0e3a947792f7f780b3b765f70e
 MISC metadata.xml 1331 BLAKE2B 891a27fbae2ed364a26952def66b3e9e62be7025580d7b89f559f284888efed53476f4a8f5bcd7209c3c4de8494913a05354059004ef6c3aa6c1829a3e093efb SHA512 add8dffdf453f079d09f06608cae732ce61e04a5fac1988afb0733c8d60a943efe054a4973e54ca1cf304ad3d3778fd8aa6b01fc16815a1f42f83048d58adb63
diff --git a/app-backup/snapper/snapper-0.9.0-r1.ebuild b/app-backup/snapper/snapper-0.9.0-r1.ebuild
index 3f1b02d77735..e08297c0ff3a 100644
--- a/app-backup/snapper/snapper-0.9.0-r1.ebuild
+++ b/app-backup/snapper/snapper-0.9.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="doc lvm pam test systemd xattr"
 RESTRICT="test"
 
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index d1553021106b..26ebd1c71809 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 6ab02822784f..86d5b4096db3 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,3 +1,3 @@
-DIST stress-ng-0.13.04.tar.xz 580436 BLAKE2B c0aa542453fc0901f7cc6ad7500097df258c28cac2fe5136574b839abdbe349678d428571cb5eb1da1fb94b59a8ea23f20d96dba67c6210773f3bc8daf32fc3b SHA512 0d5dda9c7887cba9ce5b21d3a270e8c699df0d205f40ee2ccb5f45d49968feea850ed2e1008be2c3863a8d58f50d5a3e4327a4887ea68905e0355ae86101b48b
-EBUILD stress-ng-0.13.04.ebuild 861 BLAKE2B 504588591c0f907fa543f17bfebd05d52f4fbd950eab60f99f8879bfb19c8b8ca89b407e945e983121cae974d31a70a603b7ef9ab53a224acedc5f880c145813 SHA512 a2f9c9c86c514a5e6f26dc21f6cccd56ace01222cdb45ed9f04e8b9aa3a9b88b6c2fbf6ffdbd6a80f407eebb724dd14777578ec571c57d8d59a775f6aa285b4f
+DIST stress-ng-0.13.05.tar.xz 590340 BLAKE2B 214e98ef5db575a0835ccef15d9145bba6d25774bb26ce1ac2ffa3b29309a62416752b298ccb5b1ce91ad40a3c68dee7ada7c59fd85c06d8372e24c72a927480 SHA512 39a1622d63e88a1d0f535b36c57a01f734e686a3f4f2dc9dcf69154e7b0e4986c6bd654a42803cc3dc0e9a22151db9e2ae79a772758e9d80beb22bd39492d13a
+EBUILD stress-ng-0.13.05.ebuild 864 BLAKE2B a5fd3d9ba6d3e82ac303fef88418b915f0a883d8808d747e0d68434b2f2b17795e895babb46c0498d5c1c0a215c88ba43060b60626d218f80f17229601b72985 SHA512 7934595a8a43430c8ef6c24f895b476a7444ef0e04e5d0f29efcf0ac72f38ce0f7b472916aa6fd3af56d79f6b1299d2a48931a748376f436e2062823a5345fba
 MISC metadata.xml 835 BLAKE2B 88b503bcc225861dfd5a5e016bc0c6df87d13e758f9eb8d73103deb5f1d88163f260f24efcb4988a245b1ea2888e18da86d031d52c9dcdc702dbd9a7c510b691 SHA512 dfc8c9cb83e0960fd0881affc5cd12fe843743faa92e3af0edf0ba86ad8107de60669cd32e156be9ea645a817f38f7091be2b9c870902e7109f937e584feac99
diff --git a/app-benchmarks/stress-ng/stress-ng-0.13.04.ebuild b/app-benchmarks/stress-ng/stress-ng-0.13.04.ebuild
deleted file mode 100644
index 309cd350a1c7..000000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.13.04.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature toolchain-funcs
-
-DESCRIPTION="Stress test for a computer system with various selectable ways"
-HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
-SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-DEPEND="
-	dev-libs/libaio
-	dev-libs/libbsd
-	dev-libs/libgcrypt:0=
-	sys-apps/attr
-	sys-apps/keyutils:=
-	sys-libs/libcap
-	sys-libs/zlib
-	virtual/libcrypt:=
-"
-
-RDEPEND="${DEPEND}"
-
-DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
-
-src_compile() {
-	export MAN_COMPRESS=0
-	export VERBOSE=1
-	tc-export CC
-
-	default
-}
-
-pkg_postinst() {
-	optfeature "AppArmor support" sys-libs/libapparmor
-	optfeature "SCTP support" net-misc/lksctp-tools
-}
diff --git a/app-benchmarks/stress-ng/stress-ng-0.13.05.ebuild b/app-benchmarks/stress-ng/stress-ng-0.13.05.ebuild
new file mode 100644
index 000000000000..ec9f38a8fde6
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.13.05.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="Stress test for a computer system with various selectable ways"
+HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
+SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	dev-libs/libaio
+	dev-libs/libbsd
+	dev-libs/libgcrypt:0=
+	sys-apps/attr
+	sys-apps/keyutils:=
+	sys-libs/libcap
+	sys-libs/zlib
+	virtual/libcrypt:=
+"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.md" "README.Android" "TODO" "syscalls.txt" )
+
+src_compile() {
+	export MAN_COMPRESS=0
+	export VERBOSE=1
+	tc-export CC
+
+	default
+}
+
+pkg_postinst() {
+	optfeature "AppArmor support" sys-libs/libapparmor
+	optfeature "SCTP support" net-misc/lksctp-tools
+}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 7547e844c11b..59e08300d3a0 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cuetools/Manifest b/app-cdr/cuetools/Manifest
index 43ffc0c3659e..79364159a1a1 100644
--- a/app-cdr/cuetools/Manifest
+++ b/app-cdr/cuetools/Manifest
@@ -1,3 +1,3 @@
 DIST cuetools-1.4.1.tar.gz 32720 BLAKE2B 108b78f079e0065d1003bf09ee0a14b0ccf615e73cb5749ca92c0ef9a6580b023011d3aed83cea49256bdc743d13c6da5e394de019a120e7f8dc592e086bac50 SHA512 dc81e6ec756f9d040dd913e8f340be136d68619caa24bdec21364f94b4fc0ffcbcf21325c7fd53c9230d6d70a2856b45a32c5ca7f41ec76fa47298bf226d959e
-EBUILD cuetools-1.4.1.ebuild 714 BLAKE2B 7cd330b1bc284fc98776ef15374cfeb7cae01436c1a7e4c14ad9bfca0712bd17de0ad5076286a0f60c08d625a323ee1fd5b17a28b594c6dd92f6478a8b0a7120 SHA512 3d4fb8ae5b49eb121c4357a736657ebd55769dc393fd2c58506d41c2eb456d6a6782e6509c931f6d64d3d562d09422f1b7b1eb015140c9ca17d5ec38cff2d3ae
+EBUILD cuetools-1.4.1-r1.ebuild 707 BLAKE2B 8c3317fa90286b588c1148085923bdd70472e625a313cc2fd4c55a945b5a23366a40f83a5a04dc0bad6a6b48abacef2173ac6ef2c4a8168d174abae60fd36b92 SHA512 da9e1d47ebb788d058150b1b4e32ad8e9b22b1cb590626465e84d6ca01f595936dba6cd0342dcabb3a1f3c09277cf207d37c596c70f2aa6025092a4c70fb2b70
 MISC metadata.xml 654 BLAKE2B 3c621fc82d10986876fe4a93a757e37f98929de77c60dd39796199a9ce55ffcc882e5079d258cd0e070781d870f26fd5ccc374465a5d5689942719380aba991d SHA512 0f0b44d85c1a9f601b0dcb4364aafc5dd357e4e3969dce8d14c5290bd6e6a47e10245243ec4fc3abcbe7db635ebda816a528f342a68b2aec0c6ecf3e96166017
diff --git a/app-cdr/cuetools/cuetools-1.4.1-r1.ebuild b/app-cdr/cuetools/cuetools-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..07b455fc8677
--- /dev/null
+++ b/app-cdr/cuetools/cuetools-1.4.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools optfeature
+
+DESCRIPTION="Utilities to manipulate and convert cue and toc files"
+HOMEPAGE="https://github.com/svend/cuetools"
+SRC_URI="https://github.com/svend/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	docinto extras
+	dodoc extras/{cueconvert.cgi,*.txt}
+}
+
+pkg_postinst() {
+	optfeature "FLAC support" 'media-libs/flac'
+	optfeature "MP3 support" 'media-sound/mp3info'
+	optfeature "Vorbis support" 'media-sound/vorbis-tools'
+}
diff --git a/app-cdr/cuetools/cuetools-1.4.1.ebuild b/app-cdr/cuetools/cuetools-1.4.1.ebuild
deleted file mode 100644
index 2f34d2525069..000000000000
--- a/app-cdr/cuetools/cuetools-1.4.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Utilities to manipulate and convert cue and toc files"
-HOMEPAGE="https://github.com/svend/cuetools"
-SRC_URI="https://github.com/svend/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="flac mp3 vorbis"
-
-RDEPEND="
-	flac? ( media-libs/flac )
-	mp3? ( media-sound/mp3info )
-	vorbis? ( media-sound/vorbis-tools )
-"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README.md TODO
-	docinto extras
-	dodoc extras/{cueconvert.cgi,*.txt}
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 22d4007f4521..517ab684f5f8 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 5ca004ac403e..517180c9372c 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
+DIST certbot-1.20.0.tar.gz 1339066 BLAKE2B 01278a53ea7166037c039d270ddd11a10c0570a9f038571dc6791e51f214fbff1589371b40c0dc73cbc18ed2005cfc231452bd00b039841a09ddb3c65d4ab122 SHA512 d35b2574811ac896ad119355be3a901438400e81a67388bd93290c4e7e9f6fa60dad99b51bc9bac7a7ac60714ed8bb6f60f522ce1a1a169886d0a15f0d0e371b
 EBUILD acme-1.18.0-r1.ebuild 1123 BLAKE2B 37c29dec8eb47e63cc708fd431af8689155798c9a4fe2c07dd2de26980adf8335d523f1a5e06a17c707561571ac6b0b7ba97a477419b1f974c8881fd03b99ca4 SHA512 964a1b0e24ad95302f47a09d1c1f1560d5551547c36f3bd2eaaab6c03a320444ef296f4141017420a61d9d36378490a149a3c325e43e471796a960c913650a5d
-EBUILD acme-1.19.0.ebuild 1132 BLAKE2B c040463a55642cb2f08cd57c8dd7f8b2d338a785522b3aefb6f71f234d0800442c367ed545bb40b12eb82f0f43e8e26ba366d00f6e3bef8887e902b442cc8570 SHA512 3e75f147716119305b12826babb4431c467fd0bc285627e98ab3aa71008b7d70436cd6ca1cb595b5a8c743a07bea6d064024eba2ad0458486c94f8d2b18b0429
-EBUILD acme-9999.ebuild 1132 BLAKE2B c040463a55642cb2f08cd57c8dd7f8b2d338a785522b3aefb6f71f234d0800442c367ed545bb40b12eb82f0f43e8e26ba366d00f6e3bef8887e902b442cc8570 SHA512 3e75f147716119305b12826babb4431c467fd0bc285627e98ab3aa71008b7d70436cd6ca1cb595b5a8c743a07bea6d064024eba2ad0458486c94f8d2b18b0429
+EBUILD acme-1.19.0.ebuild 1130 BLAKE2B 2e8ae9c68f9af1eccbd9d16c7455f5c5d2f04b8501af4473bdff7318a688f7a61c16e2986323d2ece36a7dd63524526518fb9d4e115a4da1dddb17ce3201b62a SHA512 1b6934821006bc1608a47272d1beb4c8ab064cfdb2e5e9fc535a2544ab0a75df7b765c2e4bdb7349a899db41088e67909dac08226052b3a6e0da07557e760034
+EBUILD acme-1.20.0.ebuild 1132 BLAKE2B f8e07ded95e3da1a98b0e6ffc21c8bae395ad405e06fa455e57aeb76375c03a6f031951fc6a68c31eaf69073c6447c3b71009f388f78e361f2f62c3dfccd0d60 SHA512 1fd8de93d8b937a55600a92597a18c271cfc7cb407084ae88315616929c2e793ac0ccf6a219d0433270c0a68b8f8e2ae5996423c17403bf1dfdb7f19a40b31f0
+EBUILD acme-9999.ebuild 1132 BLAKE2B f8e07ded95e3da1a98b0e6ffc21c8bae395ad405e06fa455e57aeb76375c03a6f031951fc6a68c31eaf69073c6447c3b71009f388f78e361f2f62c3dfccd0d60 SHA512 1fd8de93d8b937a55600a92597a18c271cfc7cb407084ae88315616929c2e793ac0ccf6a219d0433270c0a68b8f8e2ae5996423c17403bf1dfdb7f19a40b31f0
 MISC metadata.xml 401 BLAKE2B 30a2ac1f03749a8e3bb98723c57f47ab6bcf7bfa58c2b6e21c309fae279feca0d3612df6c2a1dafaf27b4f0781c583a140322feac1a1cf2c13e50861cad129ea SHA512 d8e725b71ca81ce4ca6565ed58271b283c25394448f0f48f726f232122577c33d5b2d726e117419b2fae99f9dae29a8080bb9564eccbca13368c83988cf3da01
diff --git a/app-crypt/acme/acme-1.19.0.ebuild b/app-crypt/acme/acme-1.19.0.ebuild
index c3e47e636d10..433e9adde4d9 100644
--- a/app-crypt/acme/acme-1.19.0.ebuild
+++ b/app-crypt/acme/acme-1.19.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-1.20.0.ebuild b/app-crypt/acme/acme-1.20.0.ebuild
new file mode 100644
index 000000000000..0893747ea29d
--- /dev/null
+++ b/app-crypt/acme/acme-1.20.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index c3e47e636d10..0893747ea29d 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -27,7 +27,7 @@ SLOT="0"
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 616609dc2efe..0d78e6828785 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,8 +1,6 @@
 AUX 92_pcscd_ccid-2.rules 2275 BLAKE2B a72b8d2bb8cf56f621a0762dac95500f93afa224228f403395c9590758c8fa986b3e8d0d1b12353ec7fed5a40f6af900fcd57eaaa7b339018fe42c2b509c0c5d SHA512 f327eee35ca6009069389f935ca89feea4e693e8f0c73f8f218d2639faee4ce35df85832a71e3fe98ce24aae31861aa8bd290833e59ada75c1e1a2df9ff0a477
-DIST ccid-1.4.33.tar.bz2 659673 BLAKE2B f8dd37ed4fd2bd15e6313417dc01feecd0303502d24eeae101ad13233510b5e26b08439c4de453abc734695618faa1c8031e545d045527aa841ab9056a3d729e SHA512 ccfcecbaca4c8f1ee4a4925bd313ced6d6f15ad422cbcc387627aef203a9ae0ff7775c4a2c5d25978ab33ebfd93c34de50e1f783df787b77ea7c774a45ed126b
-DIST ccid-1.4.34.tar.bz2 667477 BLAKE2B 81f8f97fdb4526fa2f0bfe0890cc447c87671989159022a51fa15ed6e85760f7fc3a9b3f673e2cbf72373a9fc67df5304c0a93a945b97f5ad483de213f5b1a45 SHA512 8a71c100e2f0adfd6de89a86dab6690629b10c91d1fddc0a810df2ebeaea978eaaa7c6a21fa964b5cd1ea277b0efe75a2885b490f9bd9ac4776b8ff1848e4122
 DIST ccid-1.4.35.tar.bz2 676789 BLAKE2B d1123c024a798a22906a5c2c2e35f5485b8d2252ddec28571af835bbf169bc5abeb26fea871ef70d67270cc1eb52f992c56f0abb74f6deed555f15e39dbf4756 SHA512 da990b5537ec35baa1b36b9c4be7f1bdccfc149cfa4ce024ddf59504f2a2044273057c1454f227fdad8f6b04fceaf48b88e70d4d0a5475384749b367529deaeb
-EBUILD ccid-1.4.33.ebuild 1540 BLAKE2B 1070f46a0e0c96ec75f364196668d7da00e0987ad41b5c60fe202539141e77a196dbb29f0de19fc4f441931932d30964840adfd84a599bc7d07baf3481be5ad8 SHA512 066b3204120871b14df9770e0c8822d1620a00ba0e3d97474ba8e7e20131f2592cab98b0b78baee9f71cab7ba02250544291c4f61d036cf1a02ca043a98e3048
-EBUILD ccid-1.4.34.ebuild 1545 BLAKE2B 836348f61b179ac74d2531f71099c6116376f46626eb1b91e41b13803a36cc2639cf284f32fe7cfbafa723fbc21c13a9d440f5e3b37fadff45e06765fe467b69 SHA512 3edb62c28a55cc39f32e4da90088d34bb1e8e33112c6fa53e6610eaf093926e681170ba7adac9d0e637ffe8cd09853ac1093001b0709dd365ebcc51e88b60e76
-EBUILD ccid-1.4.35.ebuild 1552 BLAKE2B 35bd8d03921378293fafa523e7e2f1ef04657be1df3db2422f4cf699516eba8cb17b72a8ae117e5197b7b8c94c2769b7cd26e17e3c356aa25e2a8dd2d2e2d9e8 SHA512 81c6a26157a5284b7ac94d723238b2651fcb26d22e62830b465a8f2389e3cb510b6c72f07f8dc34005f8e9fe9e1a8ba21241abaeade6858117deb70b1f1a251b
+DIST ccid-1.4.36.tar.bz2 677047 BLAKE2B b3d48f1c51b64d260b7055251fb04aeea4a22cc5d4f024bb972a9a9874b1bdf4b75b9daf8cd7c9f26000b04e7d4c1779e20a26d4927aa1e403cd274f548b71b5 SHA512 e9ca3f5364c6cec988edad325c1ef1b35886e3ecb15d6e1409c989b9f669fbda3f0688e246e3976b58eacc0ed035cde36e65675abf12562e81c3630d4ce67773
+EBUILD ccid-1.4.35.ebuild 1547 BLAKE2B f9c400087032250e51f1103a4ea19491fbc68b47f4a02ff9474a7182b7dcc7405f4e128d9f02663685e4e33bb565354e2550f27ad86a253181c2c63e31cc50ee SHA512 267e3b6d789a33ebc01d0586524c423cbf03434ff34040d39c1039be235f982546b39acad51b38d4deb779786a542d5c5f843f3464abe8d3d30712d156a35197
+EBUILD ccid-1.4.36.ebuild 1552 BLAKE2B e595eaa1744b6e57b543507a29af3529c42a21899b82e4bcc36d26fc0b6ef04fa51c8a1f5af9cd93494cf8bca133714e0e513bf5832a01f20340831ab533205d SHA512 d02bf4e6d95eaf7d07eac814dc3c6bae87a6bc4d6e3ca394ce6d51d3e3c1ae2a01e73307347fcc78783b8de2d118407cadc1a840428d3ab4f50b3a835f4c5b7f
 MISC metadata.xml 490 BLAKE2B 4a9aeacde8629b331bfef0fd1f73b4709d182f90a53e43325a26191b7e1523ded2ddc001117b93fb24ce90014f16c927c591fbf720d3ba4210661f56ca4bf130 SHA512 f10c0f7a189353eb3160ad777412c9cfd49ba287a5923cffde6d112cde6a6f8f67268d590f611870ff55a61971df7426a7d4b761a404269228fe3ef785ddaf51
diff --git a/app-crypt/ccid/ccid-1.4.33.ebuild b/app-crypt/ccid/ccid-1.4.33.ebuild
deleted file mode 100644
index 746a54f09fad..000000000000
--- a/app-crypt/ccid/ccid-1.4.33.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
-SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="twinserial kobil-midentity +usb"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.8.3
-	usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}"
-BDEPEND="kernel_linux? ( virtual/pkgconfig )"
-
-DOCS=( README.md AUTHORS )
-
-src_configure() {
-	econf \
-		LEX=: \
-		$(use_enable twinserial) \
-		$(use_enable usb libusb)
-}
-
-src_compile() {
-	default
-	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
-}
-
-src_install() {
-	default
-
-	if use kobil-midentity; then
-		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
-		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
-	fi
-
-	if use kernel_linux; then
-		# note: for eudev support, rules probably will always need to be
-		# installed to /usr
-
-		# ccid >=1.4.11 version changed the rules drastically in a minor
-		# release to no longer use the pcscd group. Using the old ones in
-		# the mean time.
-		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
-
-		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
-		if ! use kobil-midentity; then
-			sed \
-				-e '/Kobil_mIDentity_switch/s/^/#/' \
-				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
-		fi
-
-	fi
-}
diff --git a/app-crypt/ccid/ccid-1.4.34.ebuild b/app-crypt/ccid/ccid-1.4.34.ebuild
deleted file mode 100644
index 54ad487a2623..000000000000
--- a/app-crypt/ccid/ccid-1.4.34.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
-SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="twinserial kobil-midentity +usb"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.8.3
-	usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}"
-BDEPEND="kernel_linux? ( virtual/pkgconfig )"
-
-DOCS=( README.md AUTHORS )
-
-src_configure() {
-	econf \
-		LEX=: \
-		$(use_enable twinserial) \
-		$(use_enable usb libusb)
-}
-
-src_compile() {
-	default
-	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
-}
-
-src_install() {
-	default
-
-	if use kobil-midentity; then
-		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
-		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
-	fi
-
-	if use kernel_linux; then
-		# note: for eudev support, rules probably will always need to be
-		# installed to /usr
-
-		# ccid >=1.4.11 version changed the rules drastically in a minor
-		# release to no longer use the pcscd group. Using the old ones in
-		# the mean time.
-		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
-
-		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
-		if ! use kobil-midentity; then
-			sed \
-				-e '/Kobil_mIDentity_switch/s/^/#/' \
-				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
-		fi
-
-	fi
-}
diff --git a/app-crypt/ccid/ccid-1.4.35.ebuild b/app-crypt/ccid/ccid-1.4.35.ebuild
index 13e71fba1d71..680c83b8ed8a 100644
--- a/app-crypt/ccid/ccid-1.4.35.ebuild
+++ b/app-crypt/ccid/ccid-1.4.35.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="twinserial kobil-midentity +usb"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
diff --git a/app-crypt/ccid/ccid-1.4.36.ebuild b/app-crypt/ccid/ccid-1.4.36.ebuild
new file mode 100644
index 000000000000..fb17ec0a07ed
--- /dev/null
+++ b/app-crypt/ccid/ccid-1.4.36.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
+SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="twinserial kobil-midentity +usb"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.8.3
+	usb? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="kernel_linux? ( virtual/pkgconfig )"
+
+DOCS=( README.md AUTHORS )
+
+src_configure() {
+	econf \
+		LEX=: \
+		$(use_enable twinserial) \
+		$(use_enable usb libusb)
+}
+
+src_compile() {
+	default
+	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
+}
+
+src_install() {
+	default
+
+	if use kobil-midentity; then
+		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
+		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
+	fi
+
+	if use kernel_linux; then
+		# note: for eudev support, rules probably will always need to be
+		# installed to /usr
+
+		# ccid >=1.4.11 version changed the rules drastically in a minor
+		# release to no longer use the pcscd group. Using the old ones in
+		# the mean time.
+		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
+
+		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
+		if ! use kobil-midentity; then
+			sed \
+				-e '/Kobil_mIDentity_switch/s/^/#/' \
+				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
+		fi
+
+	fi
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 50cb37a084c0..d29cd1e59d9c 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
+DIST certbot-1.20.0.tar.gz 1339066 BLAKE2B 01278a53ea7166037c039d270ddd11a10c0570a9f038571dc6791e51f214fbff1589371b40c0dc73cbc18ed2005cfc231452bd00b039841a09ddb3c65d4ab122 SHA512 d35b2574811ac896ad119355be3a901438400e81a67388bd93290c4e7e9f6fa60dad99b51bc9bac7a7ac60714ed8bb6f60f522ce1a1a169886d0a15f0d0e371b
 EBUILD certbot-apache-1.18.0.ebuild 945 BLAKE2B 5ec08b80fcce13df8f20cc1d2710abac4a8ed4e0847682b287c374921d2b7d301b75f34bce9090057548f5b1630f605a62fc3ffcfee3f13dff3f860350e04728 SHA512 8af41c92c60da9608015574316a2b776a8893b97e731d0bd779b200a2051708d3e6b2b98a0f140ed1c725bf697d56001cf608d51b68916c6e5fe6f19c40fb09d
-EBUILD certbot-apache-1.19.0.ebuild 947 BLAKE2B 5da53f56cef939f37cefd63251b522b54c18e30db386a229413bcc3a02605984194d1ea4c5647fa895a9502d254fcb9b73f5575fb7096f31df51f1e0b17659a5 SHA512 79358b1fe949ee2302a2db4c72b55bce960b0ba9aafff3cc50ee86e886c80a1337f086166646cb7f9e1baa8ead34dd43188feb53516321acd297e55a7475535b
+EBUILD certbot-apache-1.19.0.ebuild 945 BLAKE2B 5ec08b80fcce13df8f20cc1d2710abac4a8ed4e0847682b287c374921d2b7d301b75f34bce9090057548f5b1630f605a62fc3ffcfee3f13dff3f860350e04728 SHA512 8af41c92c60da9608015574316a2b776a8893b97e731d0bd779b200a2051708d3e6b2b98a0f140ed1c725bf697d56001cf608d51b68916c6e5fe6f19c40fb09d
+EBUILD certbot-apache-1.20.0.ebuild 947 BLAKE2B 5da53f56cef939f37cefd63251b522b54c18e30db386a229413bcc3a02605984194d1ea4c5647fa895a9502d254fcb9b73f5575fb7096f31df51f1e0b17659a5 SHA512 79358b1fe949ee2302a2db4c72b55bce960b0ba9aafff3cc50ee86e886c80a1337f086166646cb7f9e1baa8ead34dd43188feb53516321acd297e55a7475535b
 EBUILD certbot-apache-9999.ebuild 947 BLAKE2B 5da53f56cef939f37cefd63251b522b54c18e30db386a229413bcc3a02605984194d1ea4c5647fa895a9502d254fcb9b73f5575fb7096f31df51f1e0b17659a5 SHA512 79358b1fe949ee2302a2db4c72b55bce960b0ba9aafff3cc50ee86e886c80a1337f086166646cb7f9e1baa8ead34dd43188feb53516321acd297e55a7475535b
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot-apache/certbot-apache-1.19.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.19.0.ebuild
index b46b10fa3536..4ced4681cfbc 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.19.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.19.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-1.20.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.20.0.ebuild
new file mode 100644
index 000000000000..b46b10fa3536
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-1.20.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 8e9d164edf38..7938eb9285db 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
+DIST certbot-1.20.0.tar.gz 1339066 BLAKE2B 01278a53ea7166037c039d270ddd11a10c0570a9f038571dc6791e51f214fbff1589371b40c0dc73cbc18ed2005cfc231452bd00b039841a09ddb3c65d4ab122 SHA512 d35b2574811ac896ad119355be3a901438400e81a67388bd93290c4e7e9f6fa60dad99b51bc9bac7a7ac60714ed8bb6f60f522ce1a1a169886d0a15f0d0e371b
 EBUILD certbot-nginx-1.18.0.ebuild 962 BLAKE2B d395edd7714ead5647918d5e413b61e4c9a4a9fa363504c204250b511e92d35ac032816892f97322ac1c1f99b9c446c2b5abccb9d341193a0e6bacea84d887ed SHA512 cfc5b873c74156fe3d8843a6dcbd3084af86778b4d66c26bae0d1ba6f5c22ca147b79098cc4ffb40986bc6f38cca0475682b15669940c88f01be8f535a26d8dc
-EBUILD certbot-nginx-1.19.0.ebuild 964 BLAKE2B 7c84e63e0f822a1c3f6db07b53f7f7c00a66e2d0f37d5cd2eaf3042710c3184074709a24d7fbf0af88a5802957212304c4dce35bf4466b7a6959a20c4ef6e89f SHA512 a4606d2e422a002e04b15c22d7d111b04e12e6ebdcc17afbc24322d6786e82a9a999370c68e26f50a0dba1056e5f9e61f84f3c03a524cd1e55f35c0d2e43375a
+EBUILD certbot-nginx-1.19.0.ebuild 962 BLAKE2B d395edd7714ead5647918d5e413b61e4c9a4a9fa363504c204250b511e92d35ac032816892f97322ac1c1f99b9c446c2b5abccb9d341193a0e6bacea84d887ed SHA512 cfc5b873c74156fe3d8843a6dcbd3084af86778b4d66c26bae0d1ba6f5c22ca147b79098cc4ffb40986bc6f38cca0475682b15669940c88f01be8f535a26d8dc
+EBUILD certbot-nginx-1.20.0.ebuild 964 BLAKE2B 7c84e63e0f822a1c3f6db07b53f7f7c00a66e2d0f37d5cd2eaf3042710c3184074709a24d7fbf0af88a5802957212304c4dce35bf4466b7a6959a20c4ef6e89f SHA512 a4606d2e422a002e04b15c22d7d111b04e12e6ebdcc17afbc24322d6786e82a9a999370c68e26f50a0dba1056e5f9e61f84f3c03a524cd1e55f35c0d2e43375a
 EBUILD certbot-nginx-9999.ebuild 964 BLAKE2B 7c84e63e0f822a1c3f6db07b53f7f7c00a66e2d0f37d5cd2eaf3042710c3184074709a24d7fbf0af88a5802957212304c4dce35bf4466b7a6959a20c4ef6e89f SHA512 a4606d2e422a002e04b15c22d7d111b04e12e6ebdcc17afbc24322d6786e82a9a999370c68e26f50a0dba1056e5f9e61f84f3c03a524cd1e55f35c0d2e43375a
 MISC metadata.xml 335 BLAKE2B 048854ec6bc919f9bf9b0bc74e7c291841cbfea0e571f43437937c5dd78cc65f9df53463adcf313441e01323491709b462bd9bc364876eb1508a83b3426b6b78 SHA512 25ac45574a568e362c419dfbeade4a977afa2885e7b32fb4c3d4c765450b09aa98cf419df1a39ab194518ad6f2b582e162d4dd4eec14f278635d63bf66352523
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.19.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.19.0.ebuild
index 45a8976cfe34..f916e2e4708c 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.19.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.19.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.20.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.20.0.ebuild
new file mode 100644
index 000000000000..45a8976cfe34
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.20.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index ce9a13876033..27cf80eaa64d 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
+DIST certbot-1.20.0.tar.gz 1339066 BLAKE2B 01278a53ea7166037c039d270ddd11a10c0570a9f038571dc6791e51f214fbff1589371b40c0dc73cbc18ed2005cfc231452bd00b039841a09ddb3c65d4ab122 SHA512 d35b2574811ac896ad119355be3a901438400e81a67388bd93290c4e7e9f6fa60dad99b51bc9bac7a7ac60714ed8bb6f60f522ce1a1a169886d0a15f0d0e371b
 EBUILD certbot-1.18.0.ebuild 1180 BLAKE2B 55c9e5b606cd2d9e569483cc6d5e9ed558654685c30186dff79b38c0de8f449d16cf8b50151b0edee8343a8840e390019b75523be78f5db085914bc22bab57b4 SHA512 8299e5833351978765b9fc49dfb9f0434882a14d82ece0b21104ecdcd5d2e501d9c2407d0792ed1a9a3e26b56da0488c6d28603f9d85616296c50e0105b0d2e6
-EBUILD certbot-1.19.0.ebuild 1189 BLAKE2B 2bf07d3f5ce29a1d6fa94feac130e9b6826a5168762919953ff7496158103289a75f271c104774c6c9927750bcf126d40c3def6ade3bf15b108d4615b8e38e44 SHA512 2c6b143f928639c81cbd3d3d1b260a9231f75755ad10b470cd7e28b0f982094026f31ad75402f7e3aa20891448233751fb97b3185f79707d96f582c1b93d52ac
-EBUILD certbot-9999.ebuild 1189 BLAKE2B 2bf07d3f5ce29a1d6fa94feac130e9b6826a5168762919953ff7496158103289a75f271c104774c6c9927750bcf126d40c3def6ade3bf15b108d4615b8e38e44 SHA512 2c6b143f928639c81cbd3d3d1b260a9231f75755ad10b470cd7e28b0f982094026f31ad75402f7e3aa20891448233751fb97b3185f79707d96f582c1b93d52ac
+EBUILD certbot-1.19.0.ebuild 1187 BLAKE2B 94b32edb5153d49fd642b4f2eef6d14ff8691fd48586ccdb441ba51c5bc26b635281a0690850f1f98a93702021d129c0bceb144dc724622a641a7d9390537559 SHA512 5338016400e8103c6296efeba175452bbdfc962db04fec75a1dc8217fc20a1d727005e3d639eac127c1e32db146ac0e36aceb045f9b76cb2ab95618597da0400
+EBUILD certbot-1.20.0.ebuild 1189 BLAKE2B 361260e42aa3fd2f5ded08115be7a560baddc87b244c5149318bb7d86be6b1221a842d20a6b5e8ace174575d8ed2a9a8ac360fbc01756625d428bf13c314f64b SHA512 b9a40cca88a725402f3fb982868d885165d9136333ee80a04567376e21ee84ba50356b9b394c139332bafed2b3ac7d76b1fb6f5bf5ff7de6cf22feec7fa713ed
+EBUILD certbot-9999.ebuild 1189 BLAKE2B 361260e42aa3fd2f5ded08115be7a560baddc87b244c5149318bb7d86be6b1221a842d20a6b5e8ace174575d8ed2a9a8ac360fbc01756625d428bf13c314f64b SHA512 b9a40cca88a725402f3fb982868d885165d9136333ee80a04567376e21ee84ba50356b9b394c139332bafed2b3ac7d76b1fb6f5bf5ff7de6cf22feec7fa713ed
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot/certbot-1.19.0.ebuild b/app-crypt/certbot/certbot-1.19.0.ebuild
index 4c776f1113cc..d84a4206f10c 100644
--- a/app-crypt/certbot/certbot-1.19.0.ebuild
+++ b/app-crypt/certbot/certbot-1.19.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 S=${WORKDIR}/${P}/${PN}
 
diff --git a/app-crypt/certbot/certbot-1.20.0.ebuild b/app-crypt/certbot/certbot-1.20.0.ebuild
new file mode 100644
index 000000000000..18900751b704
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.20.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+S=${WORKDIR}/${P}/${PN}
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 4c776f1113cc..18900751b704 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 0f6951619d5f..8254bc7af91a 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -5,9 +5,11 @@ DIST gnupg-2.2.29.tar.bz2 7215986 BLAKE2B 04b777730b8fcbe8d93dfc8985aadd6bc7385a
 DIST gnupg-2.2.31.tar.bz2 7212188 BLAKE2B 57a2b6c6ea491137a708e18a0119502621b7bdf0591818d19beb8b08a521a7dbf60472243e1723f53acbfb9a5de612b8e5040c45dc847bdda26012244edb11be SHA512 2f6fa200e08d6b8993b482e5825bea6083afc8686c4e1ae80386b36ae49e1c2d73066c508edaa359a7794cb26ba7a00f81555a906fa422d1117e41415cfa2fea
 DIST gnupg-2.2.32.tar.bz2 7212625 BLAKE2B 8e1feba83a0d8fa1c154c814e26b41aa252cef4af53937e4e8954860249c180c1d6910356b0c46dfefde094846b02bd5375f17c8b6fdcc9138281d0daa292d42 SHA512 76b75d3688561ce65a8014812656aa87c9722c898d7e186fdb1331dee6af32f886a6b0a4806975c348a22ad6dda60f956ece56076d00153b9706aad4c934c6a1
 DIST gnupg-2.3.2.tar.bz2 7589445 BLAKE2B f7e35ed553ea89cdb073abb1432f67fa00bb625f6e686e534f96bca11d88f09ea272b3cb0d6706e4bce2c023f8c5b8d628742aa2f60752a2e605132cd32f62ed SHA512 2747cbe38546f500d165f024ebb2dc5be70fa68d20702af3f61e97db685eba94caf65307293137c76ea6cfcc189ed24aaee025c80cd33f26609e5fe512bdda73
+DIST gnupg-2.3.3.tar.bz2 7590874 BLAKE2B a80a84b4f6691815550de6125f4f24aa9c901b8ca8eeb6bc91c90ccd3d285a5ddb15688c7ab870aa6a6c418eb98b969e7b958120c3976b5aaea55188f39b67b0 SHA512 12d500e6b45910d5f7bfd4916bcee37ac988a58a35563fcf425a65b88c0cf92c2af2e94d3e31e9e5e19094c8beb5ec3779cf90bfe43d1555c4196f69eee2f102
 EBUILD gnupg-2.2.27.ebuild 5168 BLAKE2B cc9ad82a855cb56a630aa043537fe44fadbfece92cc09205996ba4cc3f3ca000534f7b11c29da543ec923b118d24bc23b490ce6ea29b09a799d17b36e387f855 SHA512 3f1377ad593d19580e953ef426dd23f23ae2fab65d8e6bcfee58c09605086fc0a2f2d2432b5d33ed70685ebb87561801a6b3dbf781d585aa59b6e8c9fc0dd81e
 EBUILD gnupg-2.2.29.ebuild 4709 BLAKE2B 709b2d1da7770181ce1c108c5f5afb668f46f3ac1673032c94eb41f24af6e78ab260180fad116aafd944336326d45d84388b48159518b776d3425cf40e07c605 SHA512 5617ad34369e42e934cb4704ce2c1191edb38eea902f2cdbe2494a27da86dbe92365c2dd836e24bae9aad2fb7d262df029a8fd5d1a5c0ab716f6d9918e8b04cc
 EBUILD gnupg-2.2.31.ebuild 4717 BLAKE2B cd39c581bf930c519e4f38fc0741d7c157ee44ebe6599253931e9a90f493cf28e06fac31a025a08b5958be04a0a92fa87bbc481153d746d4b8a194eb51d9377c SHA512 e3fe9d932a558b2e646b13fc98b429a6162d18f853481fe88218bde6b756a16eb8e24038860a2b8dd8922bb689e1c7b9df4855476315fd6fdf2249a169364a59
-EBUILD gnupg-2.2.32.ebuild 4712 BLAKE2B bb2e2463fb79fc39f06ff8c085caa4b80b2c70afecb24a446c78770732f7162daee4acdb57a8a45c94562b3225cd6d4a738dbc3754704e0e0c0fe3cb78e8371b SHA512 98d4559a461e4ccd9e52ce1bb847af09621407739b9e9e61cfbd8b78e59970426bfb97f2b224a09ff1cb992422a739daffca77a0eec6c2bdae9982cabbd4d3fd
+EBUILD gnupg-2.2.32.ebuild 4711 BLAKE2B 6c0897f89045f6d8fd4586b7299394f5d1d47297f1d444697fef6e86e25214ec94828e8bd3bc7f9bbab179a96c7d36605c17fd9c6f89811ac2ab995e017b1e74 SHA512 9dc84c38c52938f88a5f2e189f204f088cada182ca21b80c2463c40c3b2869d2689ad5681cca5d002b8140051341a7e260f5b23fabb779aa728611d8cae1487c
 EBUILD gnupg-2.3.2.ebuild 4752 BLAKE2B 4014d0cbab030ecfeeaef7b80424bc47f3b7d6b1b8605b1fcbf3b73a691bb451190c99639ab06be148cddc7de41a38fe4f73f20e96f5d38cb3386e5dc6e06b38 SHA512 d393dac1af9a5a76e087a747ef809f24f47b6735bbc5c42e584e8a532ed2c53a1868dc467702f1ac7042ea1fba73389a2d7db9719f3270726943294ca34cb526
+EBUILD gnupg-2.3.3.ebuild 4817 BLAKE2B 9cdf47a977c2dc90bbcd565df0aecded46f53ebc4d0b84005dfb1547d16b47788337c93de6e28378bebb66deff1391e3a5d1c5ab8227d4017ed73304291d9475 SHA512 9c53b205bd7c0cd14e93a8290677326d3765a9b906598912afe7067b827e2207af5108a6e3f951326d00a259dea27aef193907b24ae04c688a114e47f049c605
 MISC metadata.xml 1498 BLAKE2B aba846d09c0230ea7e10a5585068509c9f56575da979a85f84caf6244555609782381bb8beae68222a0ab71a0d820a4d4655ed3d9b1399cc259e400f29d8ab6b SHA512 1314093db4291b4230cdda07bdae9c30dbce8bb698a2afb236f6c657c636791c8e2a9d5a3fc488bffddbff25d307d0ba9d50c54551652dfd099e73e70811e859
diff --git a/app-crypt/gnupg/gnupg-2.2.32.ebuild b/app-crypt/gnupg/gnupg-2.2.32.ebuild
index 69c41d5c42c8..9539d8593240 100644
--- a/app-crypt/gnupg/gnupg-2.2.32.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.32.ebuild
@@ -13,7 +13,7 @@ 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"
+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 ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
diff --git a/app-crypt/gnupg/gnupg-2.3.3.ebuild b/app-crypt/gnupg/gnupg-2.3.3.ebuild
new file mode 100644
index 000000000000..b32b781d0fd9
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.3.3.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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"
+S="${WORKDIR}/${MY_P}"
+
+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 ssl test +tofu tools usb user-socket wks-server"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( tofu )"
+
+# 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 ) )
+	tofu? ( >=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 )"
+
+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"
+)
+
+src_prepare() {
+	default
+
+	# 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 ssl gnutls)
+		$(use_enable tofu)
+		$(use_enable tofu keyboxd)
+		$(use_enable tofu sqlite)
+		$(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}
+}
diff --git a/app-crypt/minisign/Manifest b/app-crypt/minisign/Manifest
index 4776d532d05a..4444cf5cc84c 100644
--- a/app-crypt/minisign/Manifest
+++ b/app-crypt/minisign/Manifest
@@ -1,4 +1,6 @@
+DIST minisign-0.10.tar.gz 18242 BLAKE2B 8b71f01ced4be00c38937e7db5ace2c7e348410a9381f6cc27374827fa0a9da70cca96153af199880ccd5f2265e18a7f21d074f877e0e21ca797bbba2bf5cbf5 SHA512 6a38500ed896c17b100bca47443f9806debe6e44d3ce09189f5f8913a41d4913434397175d1caa770fb0cc0918078dfc71c01b82b9bf919fdfba00434f4ce100
 DIST minisign-0.9.tar.gz 15664 BLAKE2B f9f358a27b069e752894326932a8c5c51f308ade49ed7088a5f693b4e8327639fc5578607f348994a7ab7484091ed93190894c1965cadbbbf2a27e939ccc117b SHA512 7970f3e72ff759f3f02416de5d6035e1c8dd4e92ea718083cc5091c7e2355b59c4e178c60ca934985ba1e1afcd970967d4fb39a434ba54b140f3fc9be661253d
+EBUILD minisign-0.10.ebuild 733 BLAKE2B 5964c8b791b2aef2ab987f43e90228ecaf13fe43006e06b5e2b855f5aea2db6b1418f3f907cc2e7304757d0811eacded3fc8a51882deebfca6f3878d97b04e68 SHA512 f54b9f43eca688a7ded56ff9223d9d9751dccc5e228e2b9fccdff6d9319f87b610893ec9e93c84ce0e5649bac0cce0cb511b5b2263fba75593057a1993650ed6
 EBUILD minisign-0.9.ebuild 725 BLAKE2B 798e077e132d183b8d40828c4c8d0b3f938fca4bba0e15eda0d91d6a6079feaba8776773fa4ef0f97949bf441156967484bed025abc0db8ce571f196472b915c SHA512 b165c58b237545ffa24aa670bb604b1bec3590543872611671c2a087af0b7045b264ac476eaea9a9ae47b82009b56eae5512e6f5fa0b7c410f9573fe22e1d6be
-EBUILD minisign-9999.ebuild 665 BLAKE2B 20395e22436151cbacb842badbf83ee829cdc278ac129b08db475cc87d35f7294097f87e4780a63a208d63b3f31edd244fb2da471d1de1dc95f744094c11f784 SHA512 b336ec7821b270de6f7b6a82d029cafde41ee685cd6a376d077e82451a6d223f0b0b5b6fbec6e994e009b8157b42d31c4ed7f0240b57a2877ffdb369742ff4a1
+EBUILD minisign-9999.ebuild 733 BLAKE2B 5964c8b791b2aef2ab987f43e90228ecaf13fe43006e06b5e2b855f5aea2db6b1418f3f907cc2e7304757d0811eacded3fc8a51882deebfca6f3878d97b04e68 SHA512 f54b9f43eca688a7ded56ff9223d9d9751dccc5e228e2b9fccdff6d9319f87b610893ec9e93c84ce0e5649bac0cce0cb511b5b2263fba75593057a1993650ed6
 MISC metadata.xml 682 BLAKE2B a3a405073dbad7ea7c570ae8eccef230b2f3baf389d0210e6ba1afb57e0b3504172225b1cb3a957812ed08bf2b8080b1b4dcb13ab982eccc8bdc15377a90cffa SHA512 8e88cae8452b76db2c57e86f6c50a5859964cb3e7e3f6a574990fbebd74d512a57015ed53c966ca714c7545d43160412c8aca9e954180333c6ecce81df8c4b51
diff --git a/app-crypt/minisign/minisign-0.10.ebuild b/app-crypt/minisign/minisign-0.10.ebuild
new file mode 100644
index 000000000000..154ff1cfe795
--- /dev/null
+++ b/app-crypt/minisign/minisign-0.10.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Dead simple tool to sign files and verify signatures"
+HOMEPAGE="https://github.com/jedisct1/minisign"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
+else
+	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/libsodium:=[-minimal]"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=( -DCMAKE_STRIP=OFF )
+	cmake_src_configure
+}
diff --git a/app-crypt/minisign/minisign-9999.ebuild b/app-crypt/minisign/minisign-9999.ebuild
index 6b1c1c8ca147..154ff1cfe795 100644
--- a/app-crypt/minisign/minisign-9999.ebuild
+++ b/app-crypt/minisign/minisign-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
 else
 	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="ISC"
@@ -21,10 +21,11 @@ SLOT="0"
 
 IUSE=""
 
-DEPEND=">=dev-libs/libsodium-1.0.16:=[-minimal]"
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/libsodium:=[-minimal]"
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	local mycmakeargs=( -DCMAKE_STRIP="${EPREFIX}/bin/true" )
+	local mycmakeargs=( -DCMAKE_STRIP=OFF )
 	cmake_src_configure
 }
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 2854c550ce2c..32286959abbf 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -4,5 +4,5 @@ AUX pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch 1606 BLAKE2B bebea2
 DIST pinentry-1.1.1.tar.bz2 515723 BLAKE2B f257fe552852e6d1ff2c23aeb0c1127b43e3a60e44c78dfa764d569e659ccb78528ce3ee863114af273a4b6f6c24686cda2cb14bb04995eb8c41ccd4541a9fbd SHA512 d6ab5af8ac2f3c9c05e09703e95d8e2676f9b2b7ceb97f6a31d101d0e9da7a1e106a6d3eabe86cab1bb35a4b119a7cba1380ac64bf13c61af0b3c48803116c12
 DIST pinentry-1.2.0.tar.bz2 498390 BLAKE2B 6e97b55fe39e9c17f8a87fa669d23fca56c1095c2533a9eebe459fafc95a3fcb0a5ea502077aae5480b5259a3096c5f85e05d4872c0b19ad33f3d9084a220cc7 SHA512 19cea79aa3982d1f0d75220c8e24ca38d6c49475c6f4c5aa7101151b4690db23ed316096a4a411136e716ba4eb471f48f9b09556e5c9837533c2356b9b384b63
 EBUILD pinentry-1.1.1-r1.ebuild 2312 BLAKE2B a195bb8d27f3f9af602dee69f329b712165ebc6f9bdb74736514e3ba6a8388fad1e26cce3fd45868033fd2b8d686aa973c6190c634f0fff20bc8d303be6bc2b5 SHA512 29bef11fe06782dba8e0776098a0eb9ba813778008b66e4442af545dcd0c91cda7852bc7a9b729c6ad049ea1c4f72bdf4467f6cb34ee92c78ced1ebf9e6d37dd
-EBUILD pinentry-1.2.0.ebuild 2320 BLAKE2B 8651c5ba8d9eb73b75b9390d69c9dddc531a3ddeaebf6c5c8ea6f3950759a02b54b51df5f0cd9661b06759aee072ff56f06e52e06e98fd369a885e422aca9311 SHA512 8b64420f9f1f0d28d7254293d6e4274216a8d1cf7164eb853256419af5052e7889e460acf9dfe0866c4128761d0f0d32b4b13cb5465ca2ccf767e8182d374bad
+EBUILD pinentry-1.2.0.ebuild 2315 BLAKE2B 7eae8d3b2b8ed379deb21fded2bd06bb0f52e2d27b01c34646fd8253ff043df5b03ff9e9064b9b6faf6df5535200024079e75175a4e30ed4c0f353fe808a9320 SHA512 ddebb43150cf8d97aecb5b492ac1524dedfa653800feee9da877a6e2208a51fb8d7c01f1fb8d38bc974e69df6ea6894a5d965531c203519b6cc188f2688ec9d0
 MISC metadata.xml 452 BLAKE2B a2aef88d14b75ddb8f8cced6ee2dc1d0d66ac52ac5c686bd8d230bd9291146fa3fc0411682488e0a45c05b20640cf8b4093ee71a0ec60e02fe507dda2910c5fa SHA512 0517e56cd5cb905f4951205f4f7db6d01a14d28e1578612f91bfaee5dfc93a56eff4896201cf3c02f9ca02329b8597d6469187f60f429f7c5f6995fa0023aaf7
diff --git a/app-crypt/pinentry/pinentry-1.2.0.ebuild b/app-crypt/pinentry/pinentry-1.2.0.ebuild
index 14485afa8415..0ca1d12f8c92 100644
--- a/app-crypt/pinentry/pinentry-1.2.0.ebuild
+++ b/app-crypt/pinentry/pinentry-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 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"
+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="caps efl emacs gnome-keyring gtk ncurses qt5"
 
 DEPEND="
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 487e0c992584..2e285151d599 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -2,5 +2,5 @@ AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c512
 DIST qca-2.3.3.tar.xz 736456 BLAKE2B f0812fd33bd19293c8034e48bcf214d2d70dc1397860779c2c145fe841365384a8eb6bad9859520d32104010acb0cefb97e3a974b9852a37ca8039d52d9dbd03 SHA512 9a262350502daa1dd10802a7a24f0e4712d87d4ddcf752452a51caa8694a30835672f54f8e600aa8dc4afdac9ef073641deed52a24423e304d18ad2b83deeca6
 DIST qca-2.3.4.tar.xz 737072 BLAKE2B 64e698135f02bf115269203d44a53d40449be1620487340551c1e45f66f042132beb2cfa2363d1249f92de3ffd670f1807219cb3ce3d6e7c05afd8c22242b703 SHA512 af27338b5c018d39c8c745b63691dec3914e29ff79347ab338f4391ee1dc9832d158b222bc9ef6c7681cf4b2893a38829a4daadf1d53622d6947de2efeb880a8
 EBUILD qca-2.3.3.ebuild 1854 BLAKE2B 080d8e3610ce39fa9b8cda3108059b55fc2f6eae2e068b286b7281d21406b401b03dab0eed05db163f7dc11fdf4904f9968d2f8de5412f1005ec724f62d04eb8 SHA512 4afc045a2f21942c51e89efa0c459284d33460e06a09972bcd38e86608a57d28ac558a2c88fb8cc90b39d4eac3999ecc3b828b9858691aea090baa474d4b6767
-EBUILD qca-2.3.4.ebuild 1856 BLAKE2B f4b8036718e9f7f1e153a6dda12a9c3bfa6bc165ff42d5a01106c2bb7a5feeb5f114b176bdd80da2e289863bccfcc4fb6b861996255fd2c08be687ece8557cbd SHA512 2c611e3a9ea42bf18b77651e51da93d769acd793b563bb3d4e31ffe858d1f71f29349adb880a560c710ebbac15bc29dab626ea09f87462cf2796b15e5fac1e5d
+EBUILD qca-2.3.4.ebuild 1854 BLAKE2B 10ff70fce7afde416cc3f6279d57c5f332c41b15f09bab173a8848b9dbed8c3fb3ee96d580577bb2432dc06c520190f301c83ae8d3c52e384899d40c4bc314b2 SHA512 db1f32ccfd7e2a9fd1529909a30512a6e1f461fcc6b2dfa6e06ae55ca6962ec8a6c5abee329b979b6cff470aff32d27ded10faee67a704a7b11a89f574b98d68
 MISC metadata.xml 832 BLAKE2B 9044b545fa732c5f86c7dbb026630b4946a538ba77369eae28e894bf636ca60f6a31d7aad258fa19aee4c433d6d5a8e2a34a7c2850eef3a40d44261e592032b0 SHA512 b01bfe83343fdc265abc25922300cdc67f556a9a6f6db16918b0b3ee44c4e83db524695c5cb8952278f3e1f2e5d60a49bcc9312b35ab95f0ecc42e03764fb6bd
diff --git a/app-crypt/qca/qca-2.3.4.ebuild b/app-crypt/qca/qca-2.3.4.ebuild
index e9d27c4d2098..b806e3cb3cf5 100644
--- a/app-crypt/qca/qca-2.3.4.ebuild
+++ b/app-crypt/qca/qca-2.3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 5e81ed2e0331..a94f58983493 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,11 +1,10 @@
 AUX darwin-triplet.patch 657 BLAKE2B cb710ca481e9a45d593ab857dc10ff8baf6c3bc5fbd2ac9ef97cee5589d8873cdc81a6a730f9058a7b9a10199667384ebbf56f828d2e6b817bf40443653adbe5 SHA512 5caec1179c860c0bf003605dd96d8c4a47a3ef784d937080a237106364918a36c1bf1138b9a4b1b0f5e5c042d653c5b324ada1a0f9b621dc33aa4a11d4f9c1c1
 AUX freebsd-triplet.patch 800 BLAKE2B 43f1f7e1fa43313e2f323a3e5031a463185c2388a3b59c75f1a3a216d6ce6e04be9cb584ffe3c44773c072408740c02354dec4969d42d6abd824a1fc633fa4dd SHA512 7f66e6ab4bdc21959e00b8ad21aaa13eab6d11552d92e8978ce5c501339a3ddf0b303f47ae5fce4056522ffea90cef3d25c5dc5d6469e7bbffa078526e1c7404
 AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc451986ba837807b3d7a56b80f50c8248d734745f886d40d341a99fefaf439f95bdeb0382ee15ea9e4f8561f98703fba2d SHA512 3771077c64c28b1fcf310d7a449d3e1eb951d1669b2ad3ddffe76d98ac5821ea8af40013984c65f28c7fce3434b7173a74a77120847f557cab2dedefac0c8b58
+AUX rhash-1.4.2-clang.patch 2775 BLAKE2B 0160a245931d58eb4809e95b5ab8a515fadf1459714378f254c597d56f3c4336ee59b17152c3fc23ae4ca39a4cc076eb78783e609b847b0c276c8f8c37fdd940 SHA512 3b28f8234d42f7dc46a8b890e5ba6f49e61f3db26019e81bfe8d4318b28d71ca781c49f0ee09c387a1cbef626ad016fc3177037f2d504be7572d56ed836ff954
 AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836f8a431d950392dafb46be646048a0ab4dc4a31ac20b6676fa8627b39bbb30a990861cf8d3cfc742f8 SHA512 7a4c2bf019cbcde021bb79572abdbc9b42f995ada5bb9798fed127d79c44ed9d4b9544c1413952604b1dd45ed307acdacba6675419f6331d75ecf34c15b8f5ca
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
-DIST rhash-1.4.1-src.tar.gz 413274 BLAKE2B 2027bccc677e8a1766f0624e67f475713653ddb4be457f9c8434c45019bc730934ca860e69f8b8e1fec349e724b1a366df0f5fb98501c825b44f9b8105068ff7 SHA512 30bbef7ce7815ee4ac062c537206a0b895845f61de4b1fdc0c0494f66284d9f3c1b06f812ea913fa35a3342d230d25d0986a1db644c7b4464bc1185997beb638
 DIST rhash-1.4.2-src.tar.gz 416853 BLAKE2B 06322825116cb00aa4987b01610d967eb57c94aa29b43348ec2c31f053fd471a900fcee776714263213e9a79eaf389b2e79d7b34a5afd3e98d68198193b5cbe7 SHA512 41df57e8b3f32c93d8e6f2ac668b32aaa23eb2eaf90a83f109e61e511404a5036ea88bcf2854e19c1ade0f61960e0d9edf01f3d82e1c645fed36579e9d7a6a25
 EBUILD rhash-1.3.6-r1.ebuild 1815 BLAKE2B 25d7980d3736edd66242acec9de12ef8bc434993a083dd2e12b3f382ca90aefbb42d4e96b35b6c42c106184e6956c8e33aac424d2272e1ae7eb77ead02f4d5af SHA512 15307b2110d89a05d3afdb6ee43a87f3ec33c921d7796cc73831d2d60c7e25df7531a73badb5a9721aa010b58dba74f1536bea7b7c9ec283e2a7ad1e430af1c4
-EBUILD rhash-1.4.1.ebuild 1885 BLAKE2B 65d6c7be3d3db04a2f43f1c1f4614ff3e812e56895ed7e0e0f8824e28a718224614366d08def5d1cb8f480744061b28ef00f08fe61e1859756af5cafeb0e282a SHA512 01e111abd4f61534bc6fef1ed0b76a085e377b698b0350855218e772927bc8adc557cc4e37928c9860649f775995a7e4da296bdb722b4589a5af13e3a4ef3f6b
-EBUILD rhash-1.4.2.ebuild 1891 BLAKE2B 3d91c3b3d806cef4e010c614060c45c0ddf9fa559321470c209eaa11b7a661428a98efc2d85224c4d4922be10f2df43c651b0bdbc0523e2cbf002a26949afcfa SHA512 924476fcc45ff97f78603c9475646247065647059b85de6bf79b03477250ed24e6c434af1933d1467561606a87892faa9b871db7557f6222c8c052af678bbf1b
+EBUILD rhash-1.4.2.ebuild 1936 BLAKE2B 881dcdcefc9c332aba1158c9170f14d3669676b6416598e058c88c0f69b1700f7b5c85bb874918ac37c43b0df7d887d751e9f94d9119e5d126da9d74f0b721a7 SHA512 b9c636c3347d32a6660c91199965fafc1eecc9d5c241c1a28af40d421335fe154e63585d727ad70699949831a032d531972ac7325a6b575625dfb6bba3c907fe
 MISC metadata.xml 817 BLAKE2B eeb15cde9e06507f73330759d44dca59dea3bbcb972cb25af71d91f065eb64dbd1ddc61e43f8fad50c264c269542f92efdace36d3397647c3c53972e695da22f SHA512 3e2f688b57c74e051fcfb90d34685346c459c5e9f425266fd3d8e099f586037b14c2bfdac76f135a046c77cc850bb49954c0e7d8dc9ded1db47bf0919ab3ea93
diff --git a/app-crypt/rhash/files/rhash-1.4.2-clang.patch b/app-crypt/rhash/files/rhash-1.4.2-clang.patch
new file mode 100644
index 000000000000..460e73a6ace7
--- /dev/null
+++ b/app-crypt/rhash/files/rhash-1.4.2-clang.patch
@@ -0,0 +1,80 @@
+From 4dc506066cf1727b021e6352535a8bb315c3f8dc Mon Sep 17 00:00:00 2001
+From: Aleksey <rhash.admin@gmail.com>
+Date: Sat, 17 Jul 2021 18:39:41 +0300
+Subject: [PATCH] configure: fix clang detection on macOS
+
+---
+ configure | 58 +++++++++++++++++++++++++++----------------------------
+ 1 file changed, 28 insertions(+), 30 deletions(-)
+
+diff --git a/configure b/configure
+index 59d432b..111270a 100755
+--- a/configure
++++ b/configure
+@@ -519,38 +519,36 @@ else
+     elif run_cmd "$CC --version"; then
+       cc_name_tmp=$($CC --version 2>&1 | head -n 1 | cut -d ' ' -f 1)
+     fi
+-    if test -n "${cc_name_tmp}"; then
+-      if echo "$cc_name_tmp" | grep -q "gcc"; then
+-        cc_name=$cc_name_tmp
+-        start_check "$CC version"
+-        cc_vendor=gnu
+-        cc_version=$($CC -dumpversion 2>&1)
+-        if ! echo $cc_version | grep -q '^[0-9][0-9]*\.[0-9]'; then
+-          cc_v2=$($CC -dumpfullversion -dumpversion 2>/dev/null)
+-          if echo $cc_v2 | grep -q '^[0-9][0-9]*\.[0-9]'; then
+-            cc_version=$cc_v2
+-          fi
++    if echo "$cc_name_tmp" | grep -q "gcc"; then
++      cc_name=$cc_name_tmp
++      start_check "$CC version"
++      cc_vendor=gnu
++      cc_version=$($CC -dumpversion 2>&1)
++      if ! echo $cc_version | grep -q '^[0-9][0-9]*\.[0-9]'; then
++        cc_v2=$($CC -dumpfullversion -dumpversion 2>/dev/null)
++        if echo $cc_v2 | grep -q '^[0-9][0-9]*\.[0-9]'; then
++          cc_version=$cc_v2
+         fi
+-        case $cc_version in
+-          2.96*)
+-            cc_fail=yes
+-            ;;
+-          *)
+-            _cc_major=$(echo $cc_version | cut -d '.' -f 1)
+-            _cc_minor=$(echo $cc_version | cut -d '.' -f 2)
+-            _cc_mini=$(echo $cc_version | cut -d '.' -f 3)
+-            ;;
+-        esac
+-        finish_check "$cc_name $cc_version"
+-        break
+-      fi
+-      if echo "$cc_name_tmp" | grep -q "clang"; then
+-        start_check "$CC version"
+-        cc_vendor=clang
+-        cc_version=$($CC -dumpversion 2>&1)
+-        finish_check "clang $cc_version"
+-        break
+       fi
++      case $cc_version in
++        2.96*)
++          cc_fail=yes
++          ;;
++        *)
++          _cc_major=$(echo $cc_version | cut -d '.' -f 1)
++          _cc_minor=$(echo $cc_version | cut -d '.' -f 2)
++          _cc_mini=$(echo $cc_version | cut -d '.' -f 3)
++          ;;
++      esac
++      finish_check "$cc_name $cc_version"
++      break
++    elif $CC --version 2>&1 | grep -q "clang"; then
++      start_check "$CC version"
++      cc_vendor=clang
++      cc_version=$($CC -dumpversion 2>&1)
++      finish_check "clang $cc_version"
++      break
++    else
+       cc_name_tmp=$($CC -V 2>&1 | head -n 1 | cut -d ' ' -f 2,3)
+       if test "$cc_name_tmp" = "Sun C"; then
+         start_check "$CC version"
diff --git a/app-crypt/rhash/rhash-1.4.1.ebuild b/app-crypt/rhash/rhash-1.4.1.ebuild
deleted file mode 100644
index 4aa5c894ec98..000000000000
--- a/app-crypt/rhash/rhash-1.4.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Console utility and library for computing and verifying file hash sums"
-HOMEPAGE="http://rhash.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="debug nls ssl static-libs"
-
-RDEPEND="
-	ssl? (
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-)"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/RHash-${PV}"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
-		# we lack posix_memalign
-		sed -i -e '/if _POSIX_VERSION/s/if .*$/if 0/' \
-			librhash/util.h || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	set -- \
-		./configure \
-		--target="${CHOST}" \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--sysconfdir="${EPREFIX}"/etc \
-		--disable-openssl-runtime \
-		--disable-static \
-		--enable-lib-shared \
-		$(use_enable debug) \
-		$(use_enable nls gettext) \
-		$(use_enable ssl openssl) \
-		$(use_enable static-libs lib-static)
-
-	echo "${@}"
-	"${@}" || die "configure failed"
-}
-
-# We would add compile-gmo to the build targets but install-gmo always
-# recompiles unconditionally. :(
-
-multilib_src_install() {
-	# -j1 needed due to race condition.
-	emake DESTDIR="${D}" -j1 \
-		install{,-lib-headers,-pkg-config} \
-		$(use nls && echo install-gmo) \
-		$(use kernel_Winnt || echo install-lib-so-link)
-}
-
-multilib_src_test() {
-	emake test
-}
diff --git a/app-crypt/rhash/rhash-1.4.2.ebuild b/app-crypt/rhash/rhash-1.4.2.ebuild
index fd42272e981c..0aea0acab044 100644
--- a/app-crypt/rhash/rhash-1.4.2.ebuild
+++ b/app-crypt/rhash/rhash-1.4.2.ebuild
@@ -29,6 +29,10 @@ BDEPEND="
 
 S="${WORKDIR}/RHash-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-clang.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/app-crypt/zulucrypt/Manifest b/app-crypt/zulucrypt/Manifest
index c35f8fa45819..7a854be1100f 100644
--- a/app-crypt/zulucrypt/Manifest
+++ b/app-crypt/zulucrypt/Manifest
@@ -1,4 +1,4 @@
 AUX zulucrypt-5.5.0_pre20180223-fno-common.patch 524 BLAKE2B 7abdc51e78c112ac8787c16278903e02bc05c7066f03fb2fe821311c6830000b81531bb9bdb19d7ca2d3c91b7d85642c943ed839012f612170a4da7466150361 SHA512 71808d1dce262ac0ccd834c5461e01115d80153f3b4ad6274575bb190e89a64ddb34a3c5c66701c5f2b1a83e1ccfcb495df1772dd1a13c6155b55188acc3cfb2
 DIST zulucrypt-5.5.0_pre20180223.tar.gz 2162535 BLAKE2B 7d098ec20b7f355be6ad863121f7016d6b1ccbcc133438b616cfbd805110b24ae91dc74b0c2daf3137511fcb72e0338663c3c743c6c3d2b761883c57c590c0e5 SHA512 38ea9442a48c02741e11e59759b745ce3d6d6ca5f37d8b685526be76308a8fa1f7db7fd38038e5ce50e2a8afd8740b0a683a3458cb1df6f0b70c41fbf8035c15
 EBUILD zulucrypt-5.5.0_pre20180223.ebuild 1132 BLAKE2B 1245f868fd6fff5c010d03ac6c41b441de23b6d8a5db046d8748a2827ff0f64c84338006d8a95bfe27799c9e44c747de8577f099eff9ad3415586c22df418964 SHA512 ef29713207100695fc5e5b5c4d49707d165f01ef2e823818f9ba1c561b4cd6428c58bc74606bb662230fac48634b368083b300ffd2310bc6de02bf8150ffc0ba
-MISC metadata.xml 698 BLAKE2B 4898767879109c624c42bf1ffb516483b7d33a58c117059d1441a6c6820f9d38c48ed7ae97287d9888f98b28416d9b6030e20533d2dbf1dc5c936a1fc37c44c1 SHA512 8b9e173e6404dfc35b9717abf1ae186091f19cd9f345ccd3731743fa8645177d8e05cd6115a18d278fbd3e8d2d9737802005f93eafbccfc3b568ef2627de9e3f
+MISC metadata.xml 620 BLAKE2B e2bab6922c8f34ef68b76ae4ffde3eacda3ff19c5b24267c972e7f6cbecada181eef2e12077fb49902f1e9786e90e4d1b63d8bf74f87606c0a6b14d0226dc295 SHA512 399ca0d7a6427d5f0cb25c319dcb605f176c5aec47cdd9b54dcd56321fe106b3455b17793ccf3b13c5506d18c61864be46197ad780dae24983e4e6fd8f9f99ef
diff --git a/app-crypt/zulucrypt/metadata.xml b/app-crypt/zulucrypt/metadata.xml
index d1ac1033b5d7..91676ea4813e 100644
--- a/app-crypt/zulucrypt/metadata.xml
+++ b/app-crypt/zulucrypt/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="gnome">
 			Enable support for the freedesktop.org Secret Service API via <pkg>app-crypt/libsecret</pkg>
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 06d976b13431..a78e8ea0fe54 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/wordnet/Manifest b/app-dicts/wordnet/Manifest
index 75042b4590d5..1e933cb92812 100644
--- a/app-dicts/wordnet/Manifest
+++ b/app-dicts/wordnet/Manifest
@@ -1,11 +1,5 @@
-AUX wordnet-3.0-fix-indexing-bug-314799.patch 732 BLAKE2B bb6d4453f9119a134c0b108984cc67a056a8f9a9cc4ed9c357e8eb7e68761e70680950475118198d6f9487ab7f14e5776798dff32d86e65e4db591e461595dbf SHA512 697a6279223270dad6a8f3834020560b6cde07edea62e3f4238c0b288b2cb875d294bf0101cf9c79f0e1d086116d90309ca851a926318a48f5cd02058062f149
-AUX wordnet-3.0-format-security.patch 1443 BLAKE2B 21e79d7341cd119598730d317c664406915cdb2aaf572e482061be913fcb85a372214eae71b93a2a31022c6b5638cf3bc8a2b2b719b975d15143c9487f443332 SHA512 5567b1d5e041ed39a38e40e253dc94e22a3a7c6b690bc452716b26c2932b94eeb065e00354e2c8f1dc77d53713fd2e69e44a498a8664e867de2df07f2f36c170
-AUX wordnet-3.0-src_stubs_c.patch 438 BLAKE2B de2bbb812e01d6c63912ae414a02e8f4c0caa697cf4ade90d605e10dce7afd8907ff65b3af0585ca100650264615ad9bbc2008098fec51969c406b563f1c783d SHA512 82bf6705b26bd0455a2a556abd9cd01cde7c7f738f3f4f5cbf49eefe5c301c7022e908208cce2617e0b95f78464beeab21c7af4131c3472fe4e2ba4650533359
-AUX wordnet-3.0-tcl8.6.patch 4974 BLAKE2B f26cdf66b00bbf2a5185642fbe140ee6294e6910e78d7230a7f4f4c7324a207537df8a5a32ba33c1166e332d4afcce621704f9186ac1adb362883d716ac8da22 SHA512 2dafc6a6cd332d387fa15b63a7c5cad222e611906582232f7bd6f2522773336e7b632775e73fcd1a8587bd95eabaf70ec1c9ea4b8a81a7c147360a836be0a90c
 DIST WordNet-3.0.tar.gz 11537227 BLAKE2B 358bdc3178f35f4f269ad9d0a5245396811f8678a020ab1ddf9978eef733bb91450f331d03734f585121b1532bb67ca97e765b13cb3f37018cd29df558201c5d SHA512 d39c008cec41de8f1b2aeacb4ad818f9997a13b30a992fda100b6dcc9c11c253530b00a1909b55ff7b564bafc33f7763c1ce9b0a6ae3e591695db2083e9ead7a
 DIST wn3.1.dict.tar.gz 16358468 BLAKE2B f3df09f39ea29fce3378122f1a93d713acb8be39e6798695b8cc412a3ae6e644cfcf906426d4091d9849be60620367d3de541ec6dd0d8016b8f0cf39a7bad346 SHA512 16dca17a87026d8a0b7b4758219cd21a869c3ef3da23ce7875924546f2eacac4c2f376cb271b798b2c458fe8c078fb43d681356e3d9beef40f4bd88d3579394f
-DIST wordnet-3.0-patchset-1.tar.bz2 8076 BLAKE2B 20684bd96814db6e0bf2d9aeb455def682fc38566d6abd3832bf0f7eae3b65b63e8b16aa21656bb81c1696bec0d179028ea8bb4687e5566a6d679bc55e300b9c SHA512 17668d736dd6dfe83e4d5d328729cbcdfb4dbca9a9707651534169bd2ce6fc2238d5c820d63330c51c20ab9b2964b56a609f58242b05dabbcfdfc0da61c048cb
-EBUILD wordnet-3.0-r4.ebuild 2099 BLAKE2B 7b936c3a1fe97bdd0223e06e5199b879aed52346542b50f774f15b8c633e2a237e3d0f8c0e191f0491bdf39e3f167f58c8c6df29d4a8b1c78be0cf88fc7421b2 SHA512 1ec886133b23f931052faee2a0a059f380879524f36f035676f4ac123ea0215386520ddfe1266fc030dea285c41e2f727dd0c0630458bfd8f85dc5d4b141062c
-EBUILD wordnet-3.0-r5.ebuild 2149 BLAKE2B 3860850921c4f54b21c92540870204210bba2a74ee9feeb05dd39c7cfe8b02ea7f46e24a0a73c6715d0c0e59af8454544dcec6e4b620a4941f5acf71b5de3398 SHA512 4685d889a731157f4a9254e713e1138539715289d1b50ae74cbdf63fc8205e36772c1abb5013173e5dcc955c21a2f1d1504e8337cffc73817473855abfcce78f
-EBUILD wordnet-3.1.ebuild 2771 BLAKE2B 095bcb04229fdff461d1198b2cd46a5eb15be069a4799721b4c82cc93d9b3db3e68881c753a3cefa0f38899e9d19593573558f9340e4b047922279129ab5c157 SHA512 5ac6e0691a3798e3094ea864c6d4112f604c0f94de702178d80932eb31843b5344cad42fdf599d5dc72574e839f9e80241c3c23eec15fe67b40b16eb4fcd8359
+DIST wordnet-3.0-patchset-2.tar.xz 8788 BLAKE2B 3e34b7f5f1011556fb9b53fc987fb3a0fd6818d68d8e71a35ee8d955071251648386c4a361bb902340c5ca899c993363721ee9acbea2eea1386e22502789be2d SHA512 2b72f12134cb60a1db98384650f13cd57012162908c0a37aa232ad0a04a249ce25cce76332dab08c5280d6f29fd58d5c874d5e8d6e00ef55523012d7faa09fcf
+EBUILD wordnet-3.1-r1.ebuild 2139 BLAKE2B ae6be8f280a5b0a41410d8e0aa6912b18665bc0900f6f184c8e993247ed312b93bfe1246aef098c1f17aa5908be49bc323ecc7d0247a44ca318bc852398f337a SHA512 2bca624a98035bee8ed2e4ee13135cd77ff569409a7db463b359e5ae28e38c12ed01cabced46a3e52a830839b333dc3da51affe3223337718d71e8ec0beac21a
 MISC metadata.xml 389 BLAKE2B 43d6aca669a34a791eea459cb4e2906b573e09bc03d6e79ca9432c15ebf89286a28378ac20a28467bbc6f6bf629ed20ea4e608a09762be8a677c0e3b7134d6f4 SHA512 562aa5c687da46765c959bf235ab0dcd5ef6edb9f105d46c50853dac8685a68ae8e9507662c0fddb2af155ced2aad54fa4230f467c48ffc2ed2fb72c98144297
diff --git a/app-dicts/wordnet/files/wordnet-3.0-fix-indexing-bug-314799.patch b/app-dicts/wordnet/files/wordnet-3.0-fix-indexing-bug-314799.patch
deleted file mode 100644
index fafaa2c331d7..000000000000
--- a/app-dicts/wordnet/files/wordnet-3.0-fix-indexing-bug-314799.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -p -u -r WordNet-3.0/lib/morph.c WordNet-3.0-mine/lib/morph.c
---- a/lib/morph.c	2010-04-12 13:53:04.000000000 +0200
-+++ b/lib/morph.c	2010-04-12 13:54:53.000000000 +0200
-@@ -375,14 +375,14 @@ static char *exc_lookup(char *word, int 
-     static char line[WORDBUF], *beglp, *endlp;
-     char *excline;
- 
--    if (exc_fps[pos] == NULL)
-+    if (exc_fps[pos-1] == NULL)
- 	return(NULL);
- 
-     /* first time through load line from exception file */
-     if(word != NULL){
-         if (strlen(word) > WORDBUF - 1)
-            return(NULL);
--	if ((excline = bin_search(word, exc_fps[pos])) != NULL) {
-+	if ((excline = bin_search(word, exc_fps[pos-1])) != NULL) {
- 	    strcpy(line, excline);
- 	    endlp = strchr(line,' ');
- 	} else
diff --git a/app-dicts/wordnet/files/wordnet-3.0-format-security.patch b/app-dicts/wordnet/files/wordnet-3.0-format-security.patch
deleted file mode 100644
index b5d86dbbdd89..000000000000
--- a/app-dicts/wordnet/files/wordnet-3.0-format-security.patch
+++ /dev/null
@@ -1,48 +0,0 @@
- lib/binsrch.c | 4 ++--
- src/wn.c      | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/binsrch.c b/lib/binsrch.c
-index 8b71216..9ac51a7 100644
---- a/lib/binsrch.c
-+++ b/lib/binsrch.c
-@@ -193,7 +193,7 @@ char *replace_line(char *new_line, char *searchkey, FILE *fp)
-     copyfile(fp, tfp);
-     if (fseek(fp, offset, 0) == -1)
- 	return(NULL);		/* could not seek to offset */
--    fprintf(fp, new_line);	/* write line */
-+    fprintf(fp, "%s", new_line);	/* write line */
-     rewind(tfp);
-     copyfile(tfp, fp);
- 
-@@ -220,7 +220,7 @@ char *insert_line(char *new_line, char *searchkey, FILE *fp)
-     copyfile(fp, tfp);
-     if (fseek(fp, offset, 0) == -1)
- 	return(NULL);		/* could not seek to offset */
--    fprintf(fp, new_line);	/* write line */
-+    fprintf(fp, "%s", new_line);	/* write line */
-     rewind(tfp);
-     copyfile(tfp, fp);
- 
-diff --git a/src/wn.c b/src/wn.c
-index 004e1e6..398632f 100644
---- a/src/wn.c
-+++ b/src/wn.c
-@@ -284,7 +284,7 @@ static void printsearches(char *word, int dbase, unsigned long search)
- 	    printf("\t");
- 	    printf(searchstr[j].template,
- 		   partchars[dbase], partchars[dbase]);
--	    printf(searchstr[j].helpstr);
-+	    printf("%s", searchstr[j].helpstr);
- 	    printf("\n");
- 	}
- }
-@@ -345,7 +345,7 @@ static int getoptidx(char *searchtype)
- 
- static int error_message(char *msg)
- {
--    fprintf(stderr, msg);
-+    fprintf(stderr, "%s", msg);
-     return(0);
- }
- 
diff --git a/app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch b/app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch
deleted file mode 100644
index 29c42dea9c35..000000000000
--- a/app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNad wordnet-3.0/src/stubs.c.orig wordnet-3.0/src/stubs.c
---- wordnet-3.0/src/stubs.c.orig	2007-01-04 18:47:55.000000000 +0100
-+++ wordnet-3.0/src/stubs.c	2007-01-20 19:01:19.000000000 +0100
-@@ -14,7 +14,7 @@
- #include <tk.h>
- #include <wn.h>
- 
--static char *Id = "$Id: stubs.c,v 1.7 2005/04/29 19:01:57 wn Exp $";
-+static const char Id[] = "$Id: stubs.c,v 1.7 2005/04/29 19:01:57 wn Exp $";
- 
- static char resultbuf[SEARCHBUF];
- 
diff --git a/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch b/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch
deleted file mode 100644
index 110ffc2110b8..000000000000
--- a/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch
+++ /dev/null
@@ -1,133 +0,0 @@
- src/stubs.c | 33 +++++++++++++++++----------------
- 1 file changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/src/stubs.c b/src/stubs.c
-index 794485c..cec2c04 100644
---- a/src/stubs.c
-+++ b/src/stubs.c
-@@ -40,8 +40,8 @@ int wn_findvalidsearches (ClientData clientData, Tcl_Interp *interp,
-    char *morph;
-    int pos;
-    if (argc != 3) {
--      interp -> result = 
--         "usage: findvalidsearches searchword partofspeechnum";
-+      Tcl_SetResult(interp,
-+         "usage: findvalidsearches searchword partofspeechnum", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    pos = atoi (argv[2]);
-@@ -52,7 +52,7 @@ int wn_findvalidsearches (ClientData clientData, Tcl_Interp *interp,
-       } while ((morph = morphstr (NULL, pos)) != NULL);
-    }
-    sprintf (bitfieldstr, "%u", bitfield);
--   interp -> result = bitfieldstr;
-+   Tcl_SetResult(interp, bitfieldstr, TCL_STATIC);
-    return TCL_OK;
- }
- 
-@@ -69,13 +69,13 @@ int wn_bit (ClientData clientData, Tcl_Interp *interp,
-    static char bitfieldstr[32];
-    int whichbit;
-    if (argc != 2) {
--      interp -> result = "usage: bit bitnum";
-+      Tcl_SetResult(interp, "usage: bit bitnum", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    whichbit = atoi (argv[1]);
-    bitfield = bit (whichbit);
-    sprintf (bitfieldstr, "%u", bitfield);
--   interp -> result = bitfieldstr;
-+   Tcl_SetResult(interp, bitfieldstr, TCL_STATIC);
-    return TCL_OK;
- } 
- 
-@@ -89,8 +89,8 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
-    int pos, searchtype, sense;
-    char *morph;
-    if (argc != 5) {
--      interp -> result = 
--         "usage: search searchword partofspeechnum searchtypenum sensenum";
-+      Tcl_SetResult(interp,
-+         "usage: search searchword partofspeechnum searchtypenum sensenum", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    pos = atoi (argv[2]);
-@@ -102,7 +102,7 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
-          strcat (resultbuf, findtheinfo (morph, pos, searchtype, sense));
-       } while ((morph = morphstr (NULL, pos)) != NULL);
-    }
--   interp -> result = resultbuf;
-+   Tcl_SetResult(interp, resultbuf, TCL_STATIC);
-    return TCL_OK;
- }
- 
-@@ -114,7 +114,7 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
- int wn_glosses (ClientData clientData, Tcl_Interp *interp,
-    int argc, char *argv[]) {
-    if (argc != 2) {
--      interp -> result = "usage: glosses [1 | 0]";
-+      Tcl_SetResult(interp, "usage: glosses [1 | 0]", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    dflag = atoi (argv[1]);
-@@ -129,7 +129,7 @@ int wn_glosses (ClientData clientData, Tcl_Interp *interp,
- int wn_fileinfo (ClientData clientData, Tcl_Interp *interp,
-    int argc, char *argv[]) {
-    if (argc != 2) {
--      interp -> result = "usage: fileinfo [1 | 0]";
-+      Tcl_SetResult(interp, "usage: fileinfo [1 | 0]", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    fileinfoflag = atoi (argv[1]);
-@@ -144,7 +144,7 @@ int wn_fileinfo (ClientData clientData, Tcl_Interp *interp,
- int wn_byteoffset (ClientData clientData, Tcl_Interp *interp,
-    int argc, char *argv[]) {
-    if (argc != 2) {
--      interp -> result = "usage: byteoffset [1 | 0]";
-+      Tcl_SetResult(interp, "usage: byteoffset [1 | 0]", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    offsetflag = atoi (argv[1]);
-@@ -159,7 +159,7 @@ int wn_byteoffset (ClientData clientData, Tcl_Interp *interp,
- int wn_senseflag (ClientData clientData, Tcl_Interp *interp,
-    int argc, char *argv[]) {
-    if (argc != 2) {
--      interp -> result = "usage: senseflag [1 | 0]";
-+      Tcl_SetResult(interp, "usage: senseflag [1 | 0]", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    wnsnsflag = atoi (argv[1]);
-@@ -175,12 +175,13 @@ int wn_contextualhelp (ClientData clientData, Tcl_Interp *interp,
-    int argc, char *argv[]) {
-    int pos, searchtype;
-    if (argc != 3) {
--      interp -> result = "usage: contextualhelp partofspeechnum searchtypenum";
-+      Tcl_SetResult(interp,
-+            "usage: contextualhelp partofspeechnum searchtypenum", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    pos = atoi (argv[1]);
-    searchtype = atoi (argv[2]);
--   interp -> result = helptext[pos][searchtype];
-+   Tcl_SetResult(interp, helptext[pos][searchtype], TCL_STATIC);
-    return TCL_OK;
- }
- 
-@@ -190,7 +191,7 @@ int wn_contextualhelp (ClientData clientData, Tcl_Interp *interp,
- int wn_reopendb (ClientData clientData, Tcl_Interp *interp,
-    int argc, char *argv[]) {
-    if (argc != 1) {
--      interp -> result = "usage: reopendb";
-+      Tcl_SetResult(interp, "usage: reopendb", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    re_wninit ();
-@@ -204,7 +205,7 @@ int wn_reopendb (ClientData clientData, Tcl_Interp *interp,
- int wn_abortsearch (ClientData clientData, Tcl_Interp *interp,
-    int argc, char *argv[]) {
-    if (argc != 1) {
--      interp -> result = "usage: abortsearch";
-+      Tcl_SetResult(interp, "usage: abortsearch", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    abortsearch = 1;
diff --git a/app-dicts/wordnet/wordnet-3.0-r4.ebuild b/app-dicts/wordnet/wordnet-3.0-r4.ebuild
deleted file mode 100644
index 8fc6f3f46f76..000000000000
--- a/app-dicts/wordnet/wordnet-3.0-r4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch flag-o-matic multilib
-
-DESCRIPTION="A lexical database for the English language"
-HOMEPAGE="https://wordnet.princeton.edu/"
-SRC_URI="
-	ftp://ftp.cogsci.princeton.edu/pub/wordnet/${PV}/WordNet-${PV}.tar.gz
-	mirror://gentoo/${P}-patchset-1.tar.bz2"
-LICENSE="Princeton"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-# In contrast to what the configure script seems to imply, Tcl/Tk is NOT optional.
-# cf. bug 163478 for details. (Yes, it's about 2.1 but it's still the same here.)
-DEPEND="
-	dev-lang/tcl:0=
-	dev-lang/tk:0="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/WordNet-${PV}"
-
-PATCHES=(
-	# Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
-	"${WORKDIR}/${P}-dict-location.patch"
-	# Fixes bug 130024, make an additional shared lib
-	"${WORKDIR}/${P}-shared-lib.patch"
-	# Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
-	"${WORKDIR}/${P}-docs-path.patch"
-	"${WORKDIR}"/${P}-CVE-2008-3908.patch #211491
-	"${WORKDIR}"/${P}-CVE-2008-2149.patch #211491
-
-	"${FILESDIR}"/${P}-tcl8.6.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	"${FILESDIR}"/${P}-src_stubs_c.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	# Don't install all the extra docs (html, pdf, ps) without doc USE flag.
-	if ! use doc; then
-		sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am || die
-	fi
-
-	# Drop installation of OLD tk.h headers #255590
-	sed '/^SUBDIRS/d' -i include/Makefile.am || die
-	sed 's: include/tk/Makefile::' -i configure.ac || die
-	rm -rf include/tk/ || die
-
-	rm -f configure || die
-	eautoreconf
-	MAKEOPTS+=" -e"
-}
-
-src_configure() {
-	append-cppflags -DUNIX -I"${T}"/usr/include
-
-	PLATFORM=linux WN_ROOT="${T}/usr" \
-	WN_DICTDIR="${T}/usr/share/wordnet/dict" \
-	WN_MANDIR="${T}/usr/share/man" \
-	WN_DOCDIR="${T}/usr/share/doc/wordnet-${PV}" \
-	WNHOME="${EPREFIX}/usr/share/wordnet" \
-	econf \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir)
-}
diff --git a/app-dicts/wordnet/wordnet-3.0-r5.ebuild b/app-dicts/wordnet/wordnet-3.0-r5.ebuild
deleted file mode 100644
index fc8af0edea2c..000000000000
--- a/app-dicts/wordnet/wordnet-3.0-r5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools epatch flag-o-matic
-
-DESCRIPTION="A lexical database for the English language"
-HOMEPAGE="https://wordnet.princeton.edu/"
-SRC_URI="
-	http://wordnetcode.princeton.edu/${PV}/WordNet-${PV}.tar.gz
-	mirror://gentoo/${P}-patchset-1.tar.bz2"
-LICENSE="Princeton"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-# In contrast to what the configure script seems to imply, Tcl/Tk is NOT
-# optional. cf. bug 163478 for details. (Yes, it's about 2.1 but it's
-# still the same here.)
-DEPEND="
-	dev-lang/tcl:0=
-	dev-lang/tk:0="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/WordNet-${PV}"
-
-PATCHES=(
-	# Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
-	"${WORKDIR}/${P}-dict-location.patch"
-	# Fixes bug 130024, make an additional shared lib
-	"${WORKDIR}/${P}-shared-lib.patch"
-	# Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
-	"${WORKDIR}/${P}-docs-path.patch"
-	"${WORKDIR}"/${P}-CVE-2008-3908.patch #211491
-	"${WORKDIR}"/${P}-CVE-2008-2149.patch #211491
-
-	"${FILESDIR}"/${P}-tcl8.6.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	"${FILESDIR}"/${P}-src_stubs_c.patch
-	"${FILESDIR}"/${P}-fix-indexing-bug-314799.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	eapply_user
-
-	# Don't install all the extra docs (html, pdf, ps) without doc USE flag.
-	if ! use doc; then
-		sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am || die
-	fi
-
-	# Drop installation of OLD tk.h headers #255590
-	sed '/^SUBDIRS/d' -i include/Makefile.am || die
-	sed 's: include/tk/Makefile::' -i configure.ac || die
-	rm -rf include/tk/ || die
-
-	rm -f configure || die
-	eautoreconf
-	MAKEOPTS+=" -e"
-}
-
-src_configure() {
-	append-cppflags -DUNIX -I"${T}"/usr/include
-
-	PLATFORM=linux WN_ROOT="${T}/usr" \
-	WN_DICTDIR="${T}/usr/share/wordnet/dict" \
-	WN_MANDIR="${T}/usr/share/man" \
-	WN_DOCDIR="${T}/usr/share/doc/wordnet-${PV}" \
-	WNHOME="${EPREFIX}/usr/share/wordnet" \
-	econf \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir)
-}
diff --git a/app-dicts/wordnet/wordnet-3.1-r1.ebuild b/app-dicts/wordnet/wordnet-3.1-r1.ebuild
new file mode 100644
index 000000000000..4601ea97c82f
--- /dev/null
+++ b/app-dicts/wordnet/wordnet-3.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A lexical database for the English language"
+HOMEPAGE="https://wordnet.princeton.edu/"
+SRC_URI="
+	http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz
+	http://wordnetcode.princeton.edu/wn3.1.dict.tar.gz
+	https://dev.gentoo.org/~soap/distfiles/${PN}-3.0-patchset-2.tar.xz"
+S="${WORKDIR}/WordNet-3.0"
+
+LICENSE="Princeton"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+# In contrast to what the configure script seems to imply, Tcl/Tk is NOT
+# optional. cf. bug 163478 for details. (Yes, it's about 2.1 but it's
+# still the same here.)
+DEPEND="
+	dev-lang/tcl:0=
+	dev-lang/tk:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${WORKDIR}"/patches/${PN}-3.0-build-system.patch
+
+	"${WORKDIR}"/patches/${PN}-3.0-CVE-2008-3908.patch #211491
+	"${WORKDIR}"/patches/${PN}-3.0-tcl8.6.patch
+	"${WORKDIR}"/patches/${PN}-3.0-format-security.patch
+	"${WORKDIR}"/patches/${PN}-3.0-src_stubs_c.patch
+	"${WORKDIR}"/patches/${PN}-3.0-fix-indexing-bug-314799.patch
+	"${WORKDIR}"/patches/${PN}-3.0-CVE-2008-2149.patch #211491
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DUNIX -I"${T}"/usr/include
+
+	PLATFORM=linux \
+	WN_ROOT="${T}"/usr \
+	WN_DICTDIR="${T}"/usr/share/wordnet/dict \
+	WN_MANDIR="${T}"/usr/share/man \
+	WN_DOCDIR="${T}"/usr/share/doc/wordnet-3.0 \
+	WNHOME="${EPREFIX}"/usr/share/wordnet \
+	econf \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tk="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	default
+
+	# For clarification: WN is still on  version 3.0. Only the database files
+	# have been updated to 3.1 as a package for 3.1 does not currently exist.
+	rm -r "${ED}"/usr/share/wordnet/dict || die
+	insinto /usr/share/wordnet
+	doins -r "${WORKDIR}"/dict
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "The WordNet 3.1 ebuild has installed WordNet v3.0 with v3.1 database files instead."
+	elog "See https://wordnet.princeton.edu/download/current-version/ for more."
+}
diff --git a/app-dicts/wordnet/wordnet-3.1.ebuild b/app-dicts/wordnet/wordnet-3.1.ebuild
deleted file mode 100644
index ff31be0b663f..000000000000
--- a/app-dicts/wordnet/wordnet-3.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A lexical database for the English language"
-HOMEPAGE="https://wordnet.princeton.edu/"
-SRC_URI="
-	http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz
-	mirror://gentoo/${PN}-3.0-patchset-1.tar.bz2
-	http://wordnetcode.princeton.edu/wn3.1.dict.tar.gz"
-LICENSE="Princeton"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-# In contrast to what the configure script seems to imply, Tcl/Tk is NOT
-# optional. cf. bug 163478 for details. (Yes, it's about 2.1 but it's
-# still the same here.)
-DEPEND="
-	dev-lang/tcl:0=
-	dev-lang/tk:0="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/WordNet-3.0"
-
-PATCHES1=(
-	# Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
-	"${WORKDIR}/"${PN}-3.0"-dict-location.patch"
-	# Fixes bug 130024, make an additional shared lib
-	"${WORKDIR}/"${PN}-3.0"-shared-lib.patch"
-	# Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
-	"${WORKDIR}/"${PN}-3.0"-docs-path.patch"
-	"${WORKDIR}"/"${PN}-3.0"-CVE-2008-3908.patch #211491
-
-	"${FILESDIR}"/"${PN}-3.0"-tcl8.6.patch
-	"${FILESDIR}"/"${PN}-3.0"-format-security.patch
-	"${FILESDIR}"/"${PN}-3.0"-src_stubs_c.patch
-	"${FILESDIR}"/"${PN}-3.0"-fix-indexing-bug-314799.patch
-)
-
-PATCHES0=(
-	"${WORKDIR}"/"${PN}-3.0"-CVE-2008-2149.patch #211491
-)
-
-src_prepare() {
-	eapply -p1 "${PATCHES1[@]}"
-	eapply -p0 "${PATCHES0[@]}"
-	eapply_user
-
-	# Don't install all the extra docs (html, pdf, ps) without doc USE flag.
-	if ! use doc; then
-		sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am || die
-	fi
-
-	# Drop installation of OLD tk.h headers #255590
-	sed '/^SUBDIRS/d' -i include/Makefile.am || die
-	sed 's: include/tk/Makefile::' -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DUNIX -I"${T}"/usr/include
-
-	PLATFORM=linux WN_ROOT="${T}/usr" \
-	WN_DICTDIR="${T}/usr/share/wordnet/dict" \
-	WN_MANDIR="${T}/usr/share/man" \
-	WN_DOCDIR="${T}/usr/share/doc/wordnet-3.0" \
-	WNHOME="${EPREFIX}/usr/share/wordnet" \
-	econf \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
-	emake -e
-}
-
-src_install() {
-	# For clarification, WN is still on  version 3.0. Only the database files
-	# have been updated to 3.1 as a package for 3.1 does not currently exist.
-	emake -e DESTDIR="${D}" install
-	einstalldocs
-	rm -r "${D}/usr/share/wordnet/dict" || die
-	mv "${WORKDIR}/dict" "${D}/usr/share/wordnet" || die
-}
-
-pkg_postinst() {
-	elog "The WordNet 3.1 ebuild has installed WordNet v3.0 with v3.1 database files instead."
-	elog "See https://wordnet.princeton.edu/download/current-version/ for more."
-}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index e81836e29dbf..13d8567586d5 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/devmanual/Manifest b/app-doc/devmanual/Manifest
index 38e9a96e6c7a..be330936c365 100644
--- a/app-doc/devmanual/Manifest
+++ b/app-doc/devmanual/Manifest
@@ -3,5 +3,5 @@ DIST devmanual-0_pre20200207.tar.xz 163940 BLAKE2B c6cf856a8f6c80b500466e27cc410
 DIST devmanual-0_pre20210118.tar.xz 165552 BLAKE2B 17b11ab8b5ec31b93fca95c472e7d137157c3d7629b80be26648d5b77f6a6a0709d1a622a079207695fe48cd9d24d48f5ece0a24259106547d84e7c47cb2199b SHA512 2cf40936ab6ee0acda6f71d44d4cbff03ed195688f172d749b32dab9edde005ab9c4ad28d84f7ad01fc82e0fb8a9441cba20c4c7435f21067abf49fe8da739ff
 EBUILD devmanual-0_pre20200207.ebuild 1383 BLAKE2B eebc48a0e5a564a72698e7ea71f74729574369bdaa310bb12d83e5d60bc1371e942b35eae13f380d3d8ea359b7f07c85d0db7b1353ca2bf7e8d31441c58afc4e SHA512 98593703f7bbde1da93f43266979c2f59f0b6d5ca4493a738a3dee0a2b0581b6a691615f296da43083266c7bd2555f28bc355b819836ffa08a06671f0ba22017
 EBUILD devmanual-0_pre20210118.ebuild 1478 BLAKE2B 6b78715ac26c53af1ac1160d75bc33c6ce8876464a8c4618a9b49c40f36a58d178ec0ed845ee399795ed983742d33ea211a4051495e6bef19300cceba30992bf SHA512 1ab86abfc466f6ab52d776794b485bc3241b17c29d33b597cba5f0873930240c8a5c3781cf7fed6206758cded44f206e24968b6983ba46a609e82d0ecf1ecad3
-EBUILD devmanual-9999.ebuild 1478 BLAKE2B 6b78715ac26c53af1ac1160d75bc33c6ce8876464a8c4618a9b49c40f36a58d178ec0ed845ee399795ed983742d33ea211a4051495e6bef19300cceba30992bf SHA512 1ab86abfc466f6ab52d776794b485bc3241b17c29d33b597cba5f0873930240c8a5c3781cf7fed6206758cded44f206e24968b6983ba46a609e82d0ecf1ecad3
+EBUILD devmanual-9999.ebuild 1547 BLAKE2B bdb891ec5acfa2d65adb80f763952b904b7e1e374d7331b0f7ceb94d12bab351118cfa1d12a1dd3ccb1a5f3e29f116c1c38f3b2d09e124398cc7704bcb355600 SHA512 8ba56467ad2f7f6b9bd0f3a4754ba33db2728c3c7f0c242a7c83ed98382328ba6a63a7308f8688603ba49b09ca87999d365db110e021a32b4599403cf20af538
 MISC metadata.xml 482 BLAKE2B e338138fd26d7940b74d33dda52c89c02237bc1256d43651acb1f9eebb3d1184e6a8b2ad636b8a661d1ebadb30d21932489cb05d86220bd65c7d594fd9b3dc41 SHA512 8675cb666e2a92264a4806fb6e957b398208cb53b075ebd9e63a6a2f9631b66e42495ddeb56712700a2612f2d231e75204eb132a36c237b3bf19107ef9e276bf
diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild
index 1170493b93eb..d5af3bf8fd76 100644
--- a/app-doc/devmanual/devmanual-9999.ebuild
+++ b/app-doc/devmanual/devmanual-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 PYTHON_COMPAT=(python3_{7,8,9})
 
 inherit python-any-r1 readme.gentoo-r1
@@ -21,13 +21,15 @@ fi
 
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
-IUSE="+offline"
+IUSE="+offline test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="dev-libs/libxml2
 	dev-libs/libxslt
 	gnome-base/librsvg
 	media-fonts/open-sans
-	${PYTHON_DEPS}"
+	${PYTHON_DEPS}
+	test? ( >=app-text/htmltidy-5.8.0 )"
 
 PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
 
diff --git a/app-doc/zsh-lovers/Manifest b/app-doc/zsh-lovers/Manifest
index 8d8432b74a5b..1315b34fb21e 100644
--- a/app-doc/zsh-lovers/Manifest
+++ b/app-doc/zsh-lovers/Manifest
@@ -2,4 +2,4 @@ DIST zsh-lovers_0.9.0.tar.gz 28883 BLAKE2B a9917c2441222ea27937e4bbcfc6ed4ab7594
 DIST zsh-lovers_0.9.1.tar.xz 26632 BLAKE2B b5c5015e7e61c21452b688aa46529dd468beac5a034b844185e1a497778a1c83b9d8124551a7b0dfd0d441394b0bf71fe64f4af5af7add3956c0a2a2f79f01ca SHA512 16493f2ec095fbdb992188a732ca4205880fa10fc1f1ab6cde8cbd2a0977d95bb06e46d1635c0c9910c249bec024f3cd13a1f8c6597e5201ef8a26b80fac9c2f
 EBUILD zsh-lovers-0.9.0.ebuild 741 BLAKE2B 4d0476681805a4794476f27c5bcf27e136c99c4c62f0de525bf2cbfbeaaf14c565bcb2e716c0aa175b886360bb357b459fc97738f5052604904dfa4da48b191e SHA512 cfda87b364bc49cc79712e3c7c4ecfe2b526c4515e2c978c1b1aa367cb1f346db660f2d9b41d8bb3ab219afef4d5085508a3db21b94428cc1fe3b41087c09cca
 EBUILD zsh-lovers-0.9.1.ebuild 711 BLAKE2B 5f35b820e52775ac57c6ec126bb2a133515bec5bd9e1a732a626e68e731414eefc60a68c4faa516eb8fff35cc18b224481e1e9ec3b6f40b6e46d325fd89247f8 SHA512 061735ac09a375c1db6f0986fc1004cadd0388e830c59d4d3298f6b0c52ad6a41288681b1bb4c65cc92c79e1e6063d62f3e92307ca46c22352f541f5cdbdc6e4
-MISC metadata.xml 246 BLAKE2B 9ee65595d2ce7d0c82f8bfa5110c981e55be2592e0ab8beb2abf163268dcbbe4ac2c1825bc1f3619c26fd447ef95a3153ce7ca7f627ca806030c217493fd51f0 SHA512 79818ad9d4436efa7bbeb3c302aee6b3c72ceadb118aab6d390fc4431110d2fdbc6cfe2d2c3c4e360688449279001e52acc9ace257b5ac401eb5c401e299bec1
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-doc/zsh-lovers/metadata.xml b/app-doc/zsh-lovers/metadata.xml
index be2af7044308..115e9d64a669 100644
--- a/app-doc/zsh-lovers/metadata.xml
+++ b/app-doc/zsh-lovers/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 50d40e346abd..f8916d73132c 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/diakonos/Manifest b/app-editors/diakonos/Manifest
index 456ed6668f05..73ce1703d418 100644
--- a/app-editors/diakonos/Manifest
+++ b/app-editors/diakonos/Manifest
@@ -1,4 +1,3 @@
 DIST diakonos-0.9.4.tar.bz2 102282 BLAKE2B f8625d87924815e816c2f5a07e5c1d35df4df6126531caf5c98a9fdcb20eb9543c028363344a3c20f2f8a0335fa9d071b168640d9bd4738b1d51737bcc548c12 SHA512 8aab6173c40b9a182853977ed7631c391a10d3339918fa96866da8c9fa8e36e40f1c5093465c734a9ce36a69c5d994d6b2d1c0306f1e57bff708fd7a64a62db7
 EBUILD diakonos-0.9.4-r1.ebuild 744 BLAKE2B 85acdf84654350292a5dc643285cb3255b0b135b5af24fdc988891f2348090d7145a23dbdd9130175bcc5f44d98fe6341286e810e3eb1d2465948bd5e96d28fa SHA512 eeba1065e75cf26a8699fb18a60618a23ed5cca6c7333e7ee3831e424254363152a1553ccb3aa4f388f10947124c8e4d61c6c0b73f0c35abf04268bb8bbad754
-EBUILD diakonos-0.9.4.ebuild 751 BLAKE2B c92192b54dd5789f6fdfb1aebbbccb7b21a6dcea061ca9f464a18d4c17b47cba13ce701ecba6c9f9dc3b30566d738da0de4b2859bae9b1673a98483cad47f1d1 SHA512 4ab68a494917f902cf1a8e53c53cdc00b06b59a2f00e5897540a80400aa17e963db6832ba6e4e4c651bf6eeb5aa5d2be984fe4b2eae3853902d25c408dd13070
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-editors/diakonos/diakonos-0.9.4.ebuild b/app-editors/diakonos/diakonos-0.9.4.ebuild
deleted file mode 100644
index d769980e0233..000000000000
--- a/app-editors/diakonos/diakonos-0.9.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit ruby-ng
-
-DESCRIPTION="A Linux editor for the masses"
-HOMEPAGE="http://diakonos.pist0s.ca"
-SRC_URI="http://diakonos.pist0s.ca/archives/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/curses"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/bacon )"
-
-each_ruby_install() {
-	${RUBY} install.rb --dest-dir "${D}" --doc-dir /usr/share/doc/${P} || die "install failed"
-}
-
-all_ruby_install() {
-	if use doc; then
-		rake docs || die
-		dodoc -r doc/*
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -S bacon -Ilib spec/*.rb spec/*/*.rb || die
-}
diff --git a/app-editors/fe/Manifest b/app-editors/fe/Manifest
index a2636e555d0c..dbd4c3b30c17 100644
--- a/app-editors/fe/Manifest
+++ b/app-editors/fe/Manifest
@@ -1,5 +1,6 @@
 AUX fe-1.8-makefile.patch 370 BLAKE2B f0bfc2c97e30ce35a904394a871b275043ee479392997117f1886cebf57fb1fe9f056fdb0bd94f4130837323fc2c20e94aeb575ad0d0f3a80af7199e2fbd3759 SHA512 09820543f98e166a9692788d0b42f29b6ee60852f0e6197af86b4b8da31c902ff9c8be59e925af21e50241d5ef6e629195190dda6a1d0317e601abb4135e1238
 AUX fe-2.0-ar.patch 502 BLAKE2B 4c3beea491ddb03a3adf5923c8fbdc0279ac9e6899216af71018af425f7caa33faa47ec6bc89b6a409d5370ffa0553fe9e7ca744a2ee238c36d2ceac378a1c3f SHA512 1c5ede0c9570f31ba3c42fd43f2c77170dce957a8376f02adaa2b82687e3daef9c8e0a941377de915be968d10e6fa34274b433eba396273cfe20ed1868dbd17b
-DIST fe-2.0.tar.gz 217430 BLAKE2B bbc886abdb54d5fe05f031a5e5700907586c4bae8812f4edd5bf6d35fa0ce16edb93a6f988a597e1b4aba69bde4019f3044091ab9285ee6138d913498816453b SHA512 85afa800466376e59aa8de4af06db51c5df8566109a1f632b30a366f944be3237f88a639329d44114360747836ed75c31746c7d6bf1568b7b4ff3e11d595a6e7
-EBUILD fe-2.0.ebuild 859 BLAKE2B 600346c9cd0ea2ffa6795579dfb05eb5af3307e9e63531049b717db05fcd140136d0c8d005cb0fc388e24c24c55cfeb6992cf324b782a9177f137c44f88b5b9f SHA512 d09002589b3c4a279131ce179bdade3772971980ad9bad00d3b9023b49f1a34e237fd083bb1b76001bfaece4608c54cbe26b72e0a9147e922bf9f1289a44513b
+AUX fe-2.0-ncurses.patch 784 BLAKE2B 90af3d2e4a402314b8d18bf817e84c7ca2b8f1d0da05d36d8971e31a8e293c016f6217f89d2575c4e3ecd5bab699bc3dd1a29118f7bfc174fa1e547a38be7650 SHA512 aedf564b7083536261d9b90dc3c8b9e247b98e5845c50259f27fe665661245f2454c3a1e3294815e32bb378f4959010ac0d181c9e8d56acbbbfa657a7b58ff3a
+DIST fe-2.0.tar.gz 237890 BLAKE2B 9fb2ad310016b52ebc807854c942c248b75a9e543aa919ccee0a1963d9a12b23ad9cbc4df884422654e2efb0b97ba2d590ac2d70be48dec3a19e7a455de5c168 SHA512 6967362b8ff9ce91e0480dfa8538e3d13b43748283423923a4ba19efc76fbe007975318d9fde758f9c9f0b8bd084ff49e45bfd5b9773a79ee85a2153646e0143
+EBUILD fe-2.0-r1.ebuild 999 BLAKE2B 91dd7ef8ba6f9ee2ad5057010ed057d61866bf63e20d50e316ced8e7702dd877e08d21b35ead4963c74cfccccb718c1ea2267d5974c075dc7dedee516c5757ab SHA512 a5a0a5cbe5dea74b17c35309b6ad3a2009f0e8411f5ffe8803e4005d56c94a83f8142189316a917747085bd62dc9e4ac3e24a78ac597ed7be85dcf0e70cd813b
 MISC metadata.xml 1260 BLAKE2B 50776c6064961af6dea0d9ff8435b5a8e246ae7b1a03f1b9181bd9b6b8cc66d0fd0426df3f323672f3e2b2014a7caf08f0a55da783565a870a16e2cff220b70f SHA512 84d731be9b361299802a4924278e5d7e3288075f7cdc3b8d1f8c78fd11a8f7bf9be58c89b5e5718a11e7c52b7aba1949db6a9f6b9a4cc278428dd292734aeff7
diff --git a/app-editors/fe/fe-2.0-r1.ebuild b/app-editors/fe/fe-2.0-r1.ebuild
new file mode 100644
index 000000000000..90e47d9c22e4
--- /dev/null
+++ b/app-editors/fe/fe-2.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A small and easy to use folding editor"
+HOMEPAGE="http://www.moria.de/~michael/fe/"
+SRC_URI="http://www.moria.de/~michael/fe/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="sendmail"
+
+RDEPEND="sys-libs/ncurses:0=
+	sendmail? ( virtual/mta )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8-makefile.patch
+	"${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${P}-ncurses.patch
+)
+
+src_prepare() {
+	mv configure.{in,ac} || die
+	default
+	AT_NOEAUTOHEADER=yes eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable sendmail) \
+		LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		datarootdir="${D}"/usr/share \
+		MANDIR="${D}"/usr/share/man \
+		install
+
+	dodoc NEWS README
+	docinto html
+	dodoc fe.html
+}
diff --git a/app-editors/fe/fe-2.0.ebuild b/app-editors/fe/fe-2.0.ebuild
deleted file mode 100644
index 207e9ec3f773..000000000000
--- a/app-editors/fe/fe-2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A small and easy to use folding editor"
-HOMEPAGE="http://www.moria.de/~michael/fe/"
-SRC_URI="http://www.moria.de/~michael/fe/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="sendmail"
-
-RDEPEND="sys-libs/ncurses:0=
-	sendmail? ( virtual/mta )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8-makefile.patch
-	"${FILESDIR}"/${P}-ar.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable sendmail) \
-		LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake \
-		prefix="${D}"/usr \
-		datadir="${D}"/usr/share \
-		MANDIR="${D}"/usr/share/man \
-		install
-
-	dodoc NEWS README
-	docinto html
-	dodoc fe.html
-}
diff --git a/app-editors/fe/files/fe-2.0-ncurses.patch b/app-editors/fe/files/fe-2.0-ncurses.patch
new file mode 100644
index 000000000000..8eef06db6454
--- /dev/null
+++ b/app-editors/fe/files/fe-2.0-ncurses.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/818415
+
+--- fe-2.0/configure.ac
++++ fe-2.0/configure.ac
+@@ -55,19 +55,6 @@
+ AC_CHECK_FUNCS(strdup)
+ AC_CHECK_FUNCS(strndup)
+ 
+-AC_CHECK_LIB(ncursesw, get_wch, [have_utf8_ncurses=yes; LIBS="-lncursesw $LIBS"])
+-if test "$have_utf8_ncurses" = yes
+-then
+-  AC_DEFINE(HAVE_UTF8_NCURSES)
+-  AC_CHECK_HEADERS(ncurses/ncurses.h,have_ncurses_ncurses_h=yes)
+-  if test "$have_ncurses_ncurses_h" != yes
+-  then
+-    AC_CHECK_HEADERS(ncurses.h,have_ncurses_h=yes)
+-  fi
+-fi
+-
+-if test "$have_utf8_ncurses" != yes
+-then
+ AC_CHECK_LIB(ncurses, get_wch, [have_utf8_ncurses=yes; LIBS="-lncurses $LIBS"])
+ if test "$have_utf8_ncurses" = yes
+ then
+@@ -78,7 +65,6 @@
+     AC_CHECK_HEADERS(ncurses.h,have_ncurses_h=yes)
+   fi
+ fi
+-fi
+ 
+ if test "$have_utf8_ncurses" != yes
+ then
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index a44e6df0b5b3..db15c4605514 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST gedit-plugins-40.1.tar.xz 951024 BLAKE2B 8a5fa07d6b9a5848e66de995c05f389b288e7863fa506476fd82157dc203e472b8ac8b8bdd15b09513e5d819fc58ce4d1077e62e6c5b90f93b14775052bf2737 SHA512 71649d157ac5591e4dd317c44ae167c98fb59e253c45f8c1ff8ef397a9e3f0bb968f0ef2486f9021354269e77defb9e5e305f1538f69818480a250966143c7a3
-EBUILD gedit-plugins-40.1.ebuild 2695 BLAKE2B ee992e1c12e00cfac023232d931807af1bb3ab31d9c705e4d04f915d2b6aff31e73cb646086b534a8cdf49b39b39538fb08ef4ecf12783e58d5fed6cefc64c6c SHA512 82a7ab9742e53665f280fa27be86ed695ddabccf91298022456aad45eeaf96abaac7528ca9ec8500214f41a23a0631c1069b7f719e31ae79535c661439f204f5
+EBUILD gedit-plugins-40.1.ebuild 2696 BLAKE2B 5da3de7197568124632bf3662a266f04e8381f89efd43cf74a29f949be71f7b119e2952af94feb2a8a8b9156b7cfbefa0d1631c32260cc93ea7b2f5197df9aff SHA512 bac3a2a2d2dd6f3f5d3eaf2c64fb2635d8d719b2b0650208961fe3e7dff38b3ae7d14710e8b7c444fddd225e0bd22ee4a427c15f4adb850fe0712716ed39d229
 MISC metadata.xml 481 BLAKE2B 5fbf2df78aa40fce971741bb7d04de00cdc7a6371c2652ae0ae4bf253ee469c4bbb5e5a7c2b88226f95bb8865930dd19e9adedb191fd5a173ce915890ce40b32 SHA512 3b4b858659d1597e6c1ee574143de4864be8b75d4a6399d47bff85c4b18ec35472523bfeaa0815189a9008764405ee3b2fa53e73fcdc3edc8eda00a5f943f762
diff --git a/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild
index 266db95b91a9..1f95326960d9 100644
--- a/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
 VALA_MIN_API_VERSION="0.28"
 
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 95fbaaff1de0..c1d1ca0cae8a 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -2,5 +2,5 @@ AUX 3.38-make-gspell-optional.patch 1896 BLAKE2B 51c05e9a45aeb7586ba37cc0a3c01ba
 AUX 3.38-make-python-optional.patch 2255 BLAKE2B 25b50cfab045ab54c3d9e0ba5043ec6b839cffc31df3ebfd43dd438880c45d2d6eac0bea583209960d946591d3348070ec99e0b0056a5807a47eb84ddfec6363 SHA512 ad39c6f6ce36b19760bf726aedca158866158a4f2bb2479f752eab0eb2af7e4e425797bb20e301dbfdd58ac83bd824335499f99a6b4091c0835091848cc5de50
 AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac333b772c415c49bbca472d60a87852473e4c73d5de327d83dc1756f188458564f5529555c69843b79274db83209faa4611e SHA512 37a6e3be8e62ede716ac3666f4ad5f2f12e2a49c5d4d15db91b2b3aaa27217b04e50bc80ed128da1b9f64d56a240c0d916d5b8335f1fec4db296f038951cca1e
 DIST gedit-40.1.tar.xz 6850264 BLAKE2B 2baabac1254d56bf4c6a663012f88505c8f3cfcdd8fd8e020e05d807f727f71cf9088c398702f559e40ba7db31d3a9d135c1148f8a8b178c9107aa2675265910 SHA512 ac4cd2864af63625dbdb5c55fcc5e7ea403d84d7cc25d9f1c121f544ef1cf686ab9b7c0d50ef73b4bf24e573cdf528622a49d82f675b0c1673c46f691b79ac09
-EBUILD gedit-40.1.ebuild 2270 BLAKE2B bf7a66b16e75dd44165ddd9c11be3621f7f8533d005ff73c5027267b56a4bb52c664d13e11f7b594bc1c59be045016019307dd78f59b7bbaee9e10d830d30a2e SHA512 dcd72286738424b24da6721a55f875131f343674ae2c306460352da986521079d9ef3e8245c4a8cb22e365b0ecf2d6ad841aa61f41e4ff037a8390747e56b5c9
+EBUILD gedit-40.1.ebuild 2271 BLAKE2B f6960c80961cdc8bdc11cd762e7935170ad08f8c6495b5bb9cd819f4732855faaf8f46a83af25d4b4ee1514fef233dd0ffcdca8747adafd49d8d5bfabbc9fe0e SHA512 35de2f1cf77a1f357c5427379dade5d252dc681435ceac949b9705bd5a8254e006d5257fc398e7bc63bbfed8fc57a47e727e372d05a3592c99397245878cabaa
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/gedit/gedit-40.1.ebuild b/app-editors/gedit/gedit-40.1.ebuild
index 415abe4e1829..78fd61b6a5d9 100644
--- a/app-editors/gedit/gedit-40.1.ebuild
+++ b/app-editors/gedit/gedit-40.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 75f631917890..b830acf675eb 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -4,6 +4,6 @@ DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7
 DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2
 DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 865842bae0de25c34f255085f6edfe35b6905e220bdcb76372d7289ef1f6c2b2dee2f88e4a5f849d43fa560db4ade1e8e498d86f5651c5218d9153cde5ecddd3 SHA512 7cb473afa0ad6a9728dfc2f7d8ca19a21de329c4790141c7cb815b71c07e92a1ce04a5fcc2a0381c4beb304670d6c08629dc2ed2cb0842998cca2fd846c8cd6b
 EBUILD gvim-8.2.0814-r100.ebuild 10548 BLAKE2B 97622d1ec117107f2576a4b7f75097c3b4711402c3affbf433b2b317048b74697a0fb2b795f2ce6e388cf26885af9b972b68d7f0f73db5110a2bb9a43061ed4f SHA512 654432cab7092fadfabf35996a1ccd807eb76becdd8ed5eb95a5e153e8a6dd342debbd7fd28398bb9e83b4fbe87fa89995a619d4044a1a6300213c04f48325d6
-EBUILD gvim-8.2.3428.ebuild 10555 BLAKE2B f5aa08ee07139b66e07579438bd983367de04f904347fb5cd341ebdf58faf4e8a960fc61347f533daad5ad23e02a4a54ff26461b74cf5b88b7a12a4fc6bcb7d1 SHA512 413bf55268850a3f7b4fa90d8e29eed4bd6333396d4a23a5e6742155a033989151c54c703b635f0659c15e3bab76ece52df00fbf25fe4937551e26b442acccfd
-EBUILD gvim-9999.ebuild 10549 BLAKE2B c7ab38cb377298b8a74ea21bd19e1f29f0e304fcf02d46046b49a7443d6c0d795f71fd46fff3b142cb97b12e198537844a007e133ece4bbe479cc7ffe6503306 SHA512 5d8dcd41a8df4d9a58d4fb4d7fba11848a910cfc6d1fbcbcc83c47f5177f1ecf860b0fc4bfbf3b550e3c9203624ef982d3059870b57af8e2c02b5b4cfd32219b
-MISC metadata.xml 634 BLAKE2B 7827c5d8322794d1c1ae34fbd24bdf9f4852fa987f785220f42e25d0e7d1847628d29a576c373a12ec4d3c65380cd260ded87d7c719859c967e2a1e03f883a43 SHA512 0d30693f6de91d67dd56e71f3f86dc9ca57622516705270027c62c0bba6a8e4dcd01046662f0cb758b78076f09b88b79cf000f3dcd50fc020409267c27c76c2f
+EBUILD gvim-8.2.3428-r1.ebuild 10626 BLAKE2B c947c1839816c57c403bec4585aef0e32d301ad7f20ffd18e0cd4c65f9ad389ddb5d98ea99f386ff7399deb0b0d9abdc64d55271b4d11c76680fdbf9b439b583 SHA512 3060d3c97496a975f2ee26223b448e33c7eb10e59923884866f0ee920a29cbbfcdc6f1f21700eed870a425be84662dcfcc4382705d5966eb2dbfae7b02515480
+EBUILD gvim-9999.ebuild 10626 BLAKE2B c947c1839816c57c403bec4585aef0e32d301ad7f20ffd18e0cd4c65f9ad389ddb5d98ea99f386ff7399deb0b0d9abdc64d55271b4d11c76680fdbf9b439b583 SHA512 3060d3c97496a975f2ee26223b448e33c7eb10e59923884866f0ee920a29cbbfcdc6f1f21700eed870a425be84662dcfcc4382705d5966eb2dbfae7b02515480
+MISC metadata.xml 717 BLAKE2B dd4eae2fc90d0a00452dd91391acb2e15538a956af6a2a423427dd4835292fb17c43d805bb32d119d3743a00a524e2216befdc32831339241d7285871798e7f7 SHA512 b0cc1bae40d3cfb51bcab00ea245688d68410c17220a3f3c80793b6fb62abb007251c2ee2abd7612ed507462a3c77de48f3ceaf622a75c54436298fd43b7df10
diff --git a/app-editors/gvim/gvim-8.2.3428-r1.ebuild b/app-editors/gvim/gvim-8.2.3428-r1.ebuild
new file mode 100644
index 000000000000..0a202597784e
--- /dev/null
+++ b/app-editors/gvim/gvim-8.2.3428-r1.ebuild
@@ -0,0 +1,380 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VIM_VERSION="8.2"
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+		!gtk? (
+			gtk2? (
+				>=x11-libs/gtk+-2.6:2
+				x11-libs/libXft
+			)
+			!gtk2? (
+				motif? ( >=x11-libs/motif-2.3:0 )
+				!motif? (
+					neXt? ( x11-libs/neXtaw )
+					!neXt? ( x11-libs/libXaw )
+				)
+			)
+		)
+	)
+	crypt? ( dev-libs/libsodium:= )
+	cscope? ( dev-util/cscope )
+	lua? (
+		${LUA_DEPS}
+		$(lua_gen_impl_dep 'deprecated' lua5-1)
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+# configure runs the Lua interpreter
+BDEPEND="lua? ( ${LUA_DEPS} )"
+
+# various failures (bugs #630042 and #682320)
+RESTRICT="test"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die
+	export HOME="${T}"/home
+
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -v src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	local file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e ${file} ]]; then
+			addwrite $file
+		fi
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--with-gnome=no
+		$(use_enable sound canberra)
+		$(use_enable acl)
+		$(use_enable crypt libsodium)
+		$(use_enable cscope)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python python3interp)
+		$(use_with python python3-command "${PYTHON}")
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+	fi
+
+	if use lua; then
+		myconf+=(
+			--enable-luainterp
+			$(use_with lua_single_target_luajit luajit)
+			--with-lua-prefix="${EPREFIX}/usr"
+		)
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                         CARBON (not tested)
+	# -aqua gtk                    GTK3
+	# -aqua -gtk gtk2              GTK2
+	# -aqua -gtk -gtk motif        MOTIF
+	# -aqua -gtk -gtk -motif neXt  NEXTAW
+	# -aqua -gtk -gtk -motif -neXt ATHENA
+	echo ; echo
+	if use aqua; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk; then
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	elif use gtk2; then
+		myconf+=( --enable-gtk2-check )
+		einfo "Building gvim with the gtk+-2 GUI"
+		myconf+=( --enable-gui=gtk2 )
+	elif use motif; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+	# this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+	# Make sure our VIMPROG is used.
+	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+	# Don't do additional GUI tests.
+	emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+		die "echo failed"
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# don't install vim desktop file
+	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# update icon cache
+	xdg_icon_cache_update
+
+	# call eselect vi update
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# update icon cache
+	xdg_icon_cache_update
+
+	# call eselect vi update
+	eselect_vi_update
+}
diff --git a/app-editors/gvim/gvim-8.2.3428.ebuild b/app-editors/gvim/gvim-8.2.3428.ebuild
deleted file mode 100644
index eac0fc37724a..000000000000
--- a/app-editors/gvim/gvim-8.2.3428.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VIM_VERSION="8.2"
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	~app-editors/vim-core-${PV}
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXt
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		gtk? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk2? (
-				motif? ( >=x11-libs/motif-2.3:0 )
-				!motif? (
-					neXt? ( x11-libs/neXtaw )
-					!neXt? ( x11-libs/libXaw )
-				)
-			)
-		)
-	)
-	cscope? ( dev-util/cscope )
-	lua? (
-		${LUA_DEPS}
-		$(lua_gen_impl_dep 'deprecated' lua5-1)
-	)
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	sound? ( media-libs/libcanberra )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-# configure runs the Lua interpreter
-BDEPEND="lua? ( ${LUA_DEPS} )"
-
-# various failures (bugs #630042 and #682320)
-RESTRICT="test"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--with-gnome=no
-		$(use_enable sound canberra)
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python python3interp)
-		$(use_with python python3-command "${PYTHON}")
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	if use lua; then
-		myconf+=(
-			--enable-luainterp
-			$(use_with lua_single_target_luajit luajit)
-			--with-lua-prefix="${EPREFIX}/usr"
-		)
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                         CARBON (not tested)
-	# -aqua gtk                    GTK3
-	# -aqua -gtk gtk2              GTK2
-	# -aqua -gtk -gtk motif        MOTIF
-	# -aqua -gtk -gtk -motif neXt  NEXTAW
-	# -aqua -gtk -gtk -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk2; then
-		myconf+=( --enable-gtk2-check )
-		einfo "Building gvim with the gtk+-2 GUI"
-		myconf+=( --enable-gui=gtk2 )
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# update icon cache
-	xdg_icon_cache_update
-
-	# call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# update icon cache
-	xdg_icon_cache_update
-
-	# call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index ecd0b5e0dd0f..0a202597784e 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
@@ -25,7 +25,7 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
 
 SLOT="0"
 LICENSE="vim"
-IUSE="acl aqua cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
+IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -59,6 +59,7 @@ RDEPEND="
 			)
 		)
 	)
+	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
 	lua? (
 		${LUA_DEPS}
@@ -198,6 +199,7 @@ src_configure() {
 		--with-gnome=no
 		$(use_enable sound canberra)
 		$(use_enable acl)
+		$(use_enable crypt libsodium)
 		$(use_enable cscope)
 		$(use_enable netbeans)
 		$(use_enable nls)
diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml
index eb9f0418416e..81f9a4724bf6 100644
--- a/app-editors/gvim/metadata.xml
+++ b/app-editors/gvim/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Vim Project</name>
   </maintainer>
   <use>
+    <flag name="crypt">Use <pkg>dev-libs/libsodium</pkg> for crypto support</flag>
     <flag name="cscope">Enable cscope interface</flag>
     <flag name="gtk2">Enable GTK+2 interface</flag>
     <flag name="netbeans">Include netbeans external editor integration support</flag>
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 3333beb5c8c3..81adc145e493 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -2,7 +2,7 @@ DIST nano-5.6.1.tar.gz 2957693 BLAKE2B dbd1a63b6e0997a30a2ef40ad3248a7f53e2613d4
 DIST nano-5.8.tar.gz 3038948 BLAKE2B 126976539e8ab3a7be986edc7422bc58d31e0c81dffbf34c9b701d09d268233ed0de4f07ac8d2dd0963b768cce4e2afe89a4f8ed9fd216a71ebac98c7f403deb SHA512 dd3a7e328f256052707c4d28f2ca32f9e44de123e3dee3c0747fbab222d215b2a895c403b9274fd286e19477b8be3314fc83167eec32194370105b1e70c05a3f
 DIST nano-5.9.tar.gz 3093675 BLAKE2B d4fa2f0e64b6ab243a2b127ff894e900098f6261f5d46657ff3459cc0b51683a63fc5de54bd4545b47bc16c633b09142f8501b84a09df3e8123da5233a063766 SHA512 61bf4de300579bc6f0028a2237e105228d8657819c02f32c7ef8f84f9c54734df8fb9a9cddbce0f7721ebc5ac8ae4799c118291ae15480082f8b1317019a485d
 EBUILD nano-5.6.1-r2.ebuild 2284 BLAKE2B 3de023e0cfdb8dd68560bf07d8a087d2fe6d0353301e7c4c9c5523678dd36d88a0c8b12aae748df5b84e7638aa05dd83f29586c53b250acd118280491594c62a SHA512 603dc715772e82eb32e1b639a4353869d29bdbd1dde767e7e6bb4b95cbb88d88f39ca48038f3c2a1dc988e8c74ba5bddab24060025fd8ebc89559f9d4a0f7b9d
-EBUILD nano-5.8-r2.ebuild 2286 BLAKE2B 37bbb792e4f3965b667b737c0a5da40b9d39c6031df43288acff77ff9693681d29afcb738cd06440dcd016acc1b4fb4388fd19a604de2166e3215fc459221170 SHA512 74d88caf1f4b70f832ff45f593e476898db59a70db6c02863b5e9cf2a680bd2769e05b66b1ad72e7d5593e6d2026592a384694663824b7bd8e110a078cae9c6e
+EBUILD nano-5.8-r2.ebuild 2284 BLAKE2B 3de023e0cfdb8dd68560bf07d8a087d2fe6d0353301e7c4c9c5523678dd36d88a0c8b12aae748df5b84e7638aa05dd83f29586c53b250acd118280491594c62a SHA512 603dc715772e82eb32e1b639a4353869d29bdbd1dde767e7e6bb4b95cbb88d88f39ca48038f3c2a1dc988e8c74ba5bddab24060025fd8ebc89559f9d4a0f7b9d
 EBUILD nano-5.9.ebuild 2292 BLAKE2B 0d92386a270b2b61978639ae83cef20a0cb426c4588b48cfda53916d78301c6dd1aa277c26e46458e6f9c475745930cf1d0c9cce706b4c528e82258d2697bbe6 SHA512 90e90e892197e5ed58e5097c98f7f68f92f52077a291c297db255908ce428b94be28ff84f2ced3a136448b3198ba326678d65727279cd6f9a396109fc2789bf5
 EBUILD nano-9999.ebuild 2292 BLAKE2B 0d92386a270b2b61978639ae83cef20a0cb426c4588b48cfda53916d78301c6dd1aa277c26e46458e6f9c475745930cf1d0c9cce706b4c528e82258d2697bbe6 SHA512 90e90e892197e5ed58e5097c98f7f68f92f52077a291c297db255908ce428b94be28ff84f2ced3a136448b3198ba326678d65727279cd6f9a396109fc2789bf5
 MISC metadata.xml 1643 BLAKE2B 0281963fbe6aff1bc6765b1c9964ac2a7e1237b4759c4ae34e83a9c79c86975d910a43edfec80f279ebf17beb58db2eeb430915a165ea252042900ecefa3c57e SHA512 8636fa9e9f1b2bbc72f3b7a4395a99a7158de48e6f10487f6b5d450e6c35226b0f4d4a68e5e995dd625065831a343070c4f227d1c4422a2140e09f9c003d8fdd
diff --git a/app-editors/nano/nano-5.8-r2.ebuild b/app-editors/nano/nano-5.8-r2.ebuild
index 855a256a8852..64cdf0ed0eba 100644
--- a/app-editors/nano/nano-5.8-r2.ebuild
+++ b/app-editors/nano/nano-5.8-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	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"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 4f498a65647c..b518c1d2d7ae 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -7,6 +7,6 @@ DIST neovim-0.5.0.tar.gz 10337976 BLAKE2B e7630e96fdd1a159ca68c8f61ed473a7fa7d0c
 DIST neovim-0.5.1.tar.gz 10349190 BLAKE2B eb7e0c6a0742369c4a0fbc32a0f0e5d595f03470fb10287c39dde2f86db433a21798acee49d2cc363f18843950ef76d1376f5e52358d0b19a4b1e090c0d620a6 SHA512 a5a976c4998e821e0d9a9038d3f0c9e7c424a951f6bfc6d75898916d6a004ac668f31a34c3472fc4fca6b1d9652ac662b06780dd04dc6a77ecdc81564ec05709
 EBUILD neovim-0.4.4-r101.ebuild 2831 BLAKE2B a40b6c9e26029ad0576b02980b2110ea5c4d4472d412f316d70124b4780cd1d63268c7e86f4115674697605b1af1171a8da43a985dcf629f5376a6e0377525a9 SHA512 f368803117ef4db403ea11dfba1c626bfc638e1ef278ec77e38de69043045632ed0aa2d40356ea8bc7a2ce74fef1086a879afc4da6cadcd820b5585ec1cd57ec
 EBUILD neovim-0.5.0.ebuild 2885 BLAKE2B c1897e51862089f380d35a3d54cef1c7105661b7987d0b5f9423910ea81d1d6c29af312398e22f7765b1496ebb695c4f50461b4a437837785127139be988da39 SHA512 48de0cc9496fd2c4f589abddc0c19c161535b69d3900bfe528a36e746774f98dc28e32f6698671943540a37a9227b756be5fadd605d39f29bcbe654dedb6f56e
-EBUILD neovim-0.5.1.ebuild 2885 BLAKE2B c1897e51862089f380d35a3d54cef1c7105661b7987d0b5f9423910ea81d1d6c29af312398e22f7765b1496ebb695c4f50461b4a437837785127139be988da39 SHA512 48de0cc9496fd2c4f589abddc0c19c161535b69d3900bfe528a36e746774f98dc28e32f6698671943540a37a9227b756be5fadd605d39f29bcbe654dedb6f56e
+EBUILD neovim-0.5.1.ebuild 2892 BLAKE2B aa157a38f7bd8a9a92b1a8ea2867adb56e973b817e6a1e813f9e37b97ee0c7f4f9e8bc2022ad1ffe55c2e4d227821eb6913e3eb03e97aae21a1fc5b6e0a3feef SHA512 1ec971589b5d84c3a89a79ddb670e89b340656fefca2a203c41f16f913f08b00879848e7bed80465fdf119731052558381c97db32bb07a71ae22907384e47bca
 EBUILD neovim-9999.ebuild 2885 BLAKE2B c1897e51862089f380d35a3d54cef1c7105661b7987d0b5f9423910ea81d1d6c29af312398e22f7765b1496ebb695c4f50461b4a437837785127139be988da39 SHA512 48de0cc9496fd2c4f589abddc0c19c161535b69d3900bfe528a36e746774f98dc28e32f6698671943540a37a9227b756be5fadd605d39f29bcbe654dedb6f56e
 MISC metadata.xml 536 BLAKE2B 48c85cdbe749584904a6719545308b55f130375464c55d6f458171707a2b72586bca6780b52bab3b379a2e0c471ec47026c1203edd4696fe38639f5718cc4896 SHA512 114c7fe41230c2aade3de44b37e51ae84a907b6fcb899732991f8013126214540f4b72e60b44c0993312ec8d7c8cc8c96eae8b9e0f78bd0d2cefb7497e5d16e8
diff --git a/app-editors/neovim/neovim-0.5.1.ebuild b/app-editors/neovim/neovim-0.5.1.ebuild
index 99aa8bbbb72f..6e99dc9e54d6 100644
--- a/app-editors/neovim/neovim-0.5.1.ebuild
+++ b/app-editors/neovim/neovim-0.5.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 1fa89ed677df..410a00840aec 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -3,6 +3,6 @@ DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7
 DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2
 DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 865842bae0de25c34f255085f6edfe35b6905e220bdcb76372d7289ef1f6c2b2dee2f88e4a5f849d43fa560db4ade1e8e498d86f5651c5218d9153cde5ecddd3 SHA512 7cb473afa0ad6a9728dfc2f7d8ca19a21de329c4790141c7cb815b71c07e92a1ce04a5fcc2a0381c4beb304670d6c08629dc2ed2cb0842998cca2fd846c8cd6b
 EBUILD vim-8.2.0814-r100.ebuild 9303 BLAKE2B 90209968ee61a842a569d8fa8dcf58f77acc181b617aa638d92baca8b448897b8e76f377134a062b2501166361e8284cf08a31db1c730716fe8247c76b9b16e1 SHA512 604983d7893ac4fe47cc74c2182a82b60464fe2910775c889ea7c251f846fff77908c00c987c6bedb9acc55a6a26dc812fad7694b264c4c18e0e1f72eeccf815
-EBUILD vim-8.2.3428.ebuild 9230 BLAKE2B 11fcd309559250e68b0ea9ddbe6309e9668afcbde293f5c2e4097a7cd3ed0abc559a1d4a2a1f9ce4bfd8b1bc04a1686cef901a6b2865124bb3ea0e1d7555d9dd SHA512 2ee8e6a42f84503c83be45f3ad2439dfdd6750a380a46bb2dd57737bf4e6e078528b958c964a0ac3362ffa09cc9b349094494b6aad7a1b2931253e4295586caf
-EBUILD vim-9999.ebuild 9230 BLAKE2B 11fcd309559250e68b0ea9ddbe6309e9668afcbde293f5c2e4097a7cd3ed0abc559a1d4a2a1f9ce4bfd8b1bc04a1686cef901a6b2865124bb3ea0e1d7555d9dd SHA512 2ee8e6a42f84503c83be45f3ad2439dfdd6750a380a46bb2dd57737bf4e6e078528b958c964a0ac3362ffa09cc9b349094494b6aad7a1b2931253e4295586caf
-MISC metadata.xml 868 BLAKE2B e4d87b075de11ce8f87d58f8c01f976b816854f3e1339bbef0e9cad892f07cf9564716d60ce3b1b83f0bb380b9dfb3fc94ac21c21df4704f5ab8b54e8997217d SHA512 fb51df080c0cc8a458def353fb3eccea40c050eeb3fca53f3aa2be0ca11b0e869f93da8f123bda1c328a8a8ba29c02268535336566a1a77f367c6dee041e5a8d
+EBUILD vim-8.2.3428-r1.ebuild 9302 BLAKE2B 383a03fd372c7569c1e63ae8f8be2fcddbd93b91ceaebef35ecf17146b78a8a6825d9bd7069d6683d568d3135047a08061a5b1545beaed455f5817b64654948b SHA512 3726ffa921f14a3d65d65f61fb56ef95dff1c49b24844ca3ba13adcfb0ee722fa77818633128934abafb2647d96da3bf73b64367853e6d9879e682da74a826dd
+EBUILD vim-9999.ebuild 9302 BLAKE2B 383a03fd372c7569c1e63ae8f8be2fcddbd93b91ceaebef35ecf17146b78a8a6825d9bd7069d6683d568d3135047a08061a5b1545beaed455f5817b64654948b SHA512 3726ffa921f14a3d65d65f61fb56ef95dff1c49b24844ca3ba13adcfb0ee722fa77818633128934abafb2647d96da3bf73b64367853e6d9879e682da74a826dd
+MISC metadata.xml 951 BLAKE2B 10b867295bee9174e71d1df8a2a8a251c669fb2415893f2e90e361622520fa6b357a2098cb0184637a6f3078ed1873ed1d38f64be205d941de13040fb9f197e2 SHA512 683a03f6198c53c16874cfd8b50a265460a507afcb1bff104ce8932a9957cd4a3cc0cd6d0e494ea0757645162994c55a792d282fd6ad1278dd10659804d2f54c
diff --git a/app-editors/vim/metadata.xml b/app-editors/vim/metadata.xml
index cd2ce2b6d09e..4f3a37faf97f 100644
--- a/app-editors/vim/metadata.xml
+++ b/app-editors/vim/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Vim Project</name>
   </maintainer>
   <use>
+    <flag name="crypt">Use <pkg>dev-libs/libsodium</pkg> for crypto support</flag>
     <flag name="cscope">Enable cscope interface</flag>
     <flag name="ipv6">Enable IPv6 support in channel</flag>
     <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag>
diff --git a/app-editors/vim/vim-8.2.3428-r1.ebuild b/app-editors/vim/vim-8.2.3428-r1.ebuild
new file mode 100644
index 000000000000..d15fa2f9dcc8
--- /dev/null
+++ b/app-editors/vim/vim-8.2.3428-r1.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VIM_VERSION="8.2"
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	vim-pager? ( !minimal )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	crypt? ( dev-libs/libsodium:= )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? ( ${LUA_DEPS}
+		$(lua_gen_impl_dep 'deprecated' lua5-1)
+	)
+	!minimal? ( ~app-editors/vim-core-${PV} )
+	vim-pager? ( app-editors/vim-core[-minimal] )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/autoconf
+	nls? ( sys-devel/gettext )
+"
+# configure runs the Lua interpreter
+BDEPEND="lua? ( ${LUA_DEPS} )"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die "mkdir failed"
+	export HOME="${T}"/home
+
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager; then
+		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			_EOF_
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite $file
+		fi
+	done
+
+	if use minimal; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-canberra
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			$(use_enable sound canberra)
+			$(use_enable acl)
+			$(use_enable crypt libsodium)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable python python3interp)
+			$(use_with python python3-command "${PYTHON}")
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+			$(use_enable terminal)
+		)
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope; then
+			sed -i -e \
+				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
+		fi
+
+		if use lua; then
+			myconf+=(
+				--enable-luainterp
+				$(use_with lua_single_target_luajit luajit)
+				--with-lua-prefix="${EPREFIX}/usr"
+			)
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	emake -j1 -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	if ! use minimal ; then
+		dosym vim /usr/bin/vimdiff
+	fi
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	domenu runtime/vim.desktop
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
diff --git a/app-editors/vim/vim-8.2.3428.ebuild b/app-editors/vim/vim-8.2.3428.ebuild
deleted file mode 100644
index fd00866b78b5..000000000000
--- a/app-editors/vim/vim-8.2.3428.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VIM_VERSION="8.2"
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	vim-pager? ( !minimal )
-"
-
-RDEPEND="
-	>=app-eselect/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? ( ${LUA_DEPS}
-		$(lua_gen_impl_dep 'deprecated' lua5-1)
-	)
-	!minimal? ( ~app-editors/vim-core-${PV} )
-	vim-pager? ( app-editors/vim-core[-minimal] )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	sound? ( media-libs/libcanberra )
-	tcl? ( dev-lang/tcl:0= )
-	X? ( x11-libs/libXt )
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/autoconf
-	nls? ( sys-devel/gettext )
-"
-# configure runs the Lua interpreter
-BDEPEND="lua? ( ${LUA_DEPS} )"
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die "mkdir failed"
-	export HOME="${T}"/home
-
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-		>> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager; then
-		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man ts=8' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			_EOF_
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die "sed failed"
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e "${file}" ]]; then
-			addwrite $file
-		fi
-	done
-
-	if use minimal; then
-		myconf=(
-			--with-features=tiny
-			--disable-nls
-			--disable-canberra
-			--disable-acl
-			--enable-gui=no
-			--without-x
-			--disable-darwin
-			--disable-luainterp
-			--disable-perlinterp
-			--disable-pythoninterp
-			--disable-mzschemeinterp
-			--disable-rubyinterp
-			--disable-selinux
-			--disable-tclinterp
-			--disable-gpm
-		)
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf=(
-			--with-features=huge
-			$(use_enable sound canberra)
-			$(use_enable acl)
-			$(use_enable cscope)
-			$(use_enable gpm)
-			$(use_enable nls)
-			$(use_enable perl perlinterp)
-			$(use_enable python python3interp)
-			$(use_with python python3-command "${PYTHON}")
-			$(use_enable racket mzschemeinterp)
-			$(use_enable ruby rubyinterp)
-			$(use_enable selinux)
-			$(use_enable tcl tclinterp)
-			$(use_enable terminal)
-		)
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
-		if use lua; then
-			myconf+=(
-				--enable-luainterp
-				$(use_with lua_single_target_luajit luajit)
-				--with-lua-prefix="${EPREFIX}/usr"
-			)
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=(
-			--enable-gui=no
-			--disable-darwin
-			$(use_with X x)
-		)
-	fi
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	emake -j1 -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	if ! use minimal ; then
-		dosym vim /usr/bin/vimdiff
-	fi
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	domenu runtime/vim.desktop
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-
-	# update desktop file mime cache
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Call eselect vi update
-	eselect_vi_update
-
-	# update desktop file mime cache
-	xdg_desktop_database_update
-}
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index fd00866b78b5..d15fa2f9dcc8 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
 
 SLOT="0"
 LICENSE="vim"
-IUSE="X acl cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
+IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -36,6 +36,7 @@ RDEPEND="
 	>=sys-libs/ncurses-5.2-r2:0=
 	nls? ( virtual/libintl )
 	acl? ( kernel_linux? ( sys-apps/acl ) )
+	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
 	gpm? ( >=sys-libs/gpm-1.19.3 )
 	lua? ( ${LUA_DEPS}
@@ -200,6 +201,7 @@ src_configure() {
 			--with-features=huge
 			$(use_enable sound canberra)
 			$(use_enable acl)
+			$(use_enable crypt libsodium)
 			$(use_enable cscope)
 			$(use_enable gpm)
 			$(use_enable nls)
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index fbbd6947d3d7..c1431b02ab20 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -18,4 +18,5 @@ DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e54
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 EBUILD xemacs-21.4.24-r3.ebuild 7093 BLAKE2B b110be14467c17919c72baeff5339dcc1d135f883047cf699e781b4302a0b37a6f6dfa0175de4a66e64fc0d457531ad85a20d83ca8e01d6660dcb0a5a83565ba SHA512 5f01488f2bc7155de34d0c8e7fde30f51584abbe45ad3f2d482b442df26305f8765c0940255e607bc09f9b914facaeb554e0d969bb72e2891fae944cb08c5f9c
 EBUILD xemacs-21.5.34-r6.ebuild 7320 BLAKE2B 7899c64b324d0ee03e39c4bc0e99ff376716fb9dd26a229a902392a8cbe7864c2a2069bb1d852e1bf551d7fde1e0d5dcecb62e1fea667bfc644ea4f77b6e996b SHA512 83fba83ef8fa82697a181f9c8934132e03e9452bb891112a91ddc0f720a9649942c9c2c7ea1c0151c48de8d342d85f83039f69faf685973d0112acb1cc224173
+EBUILD xemacs-21.5.34-r7.ebuild 7293 BLAKE2B 2d8ca8d8e740acd1ac2428a0ef6bf6f4ff4d0b7721269ac97134a998363f9785defa80ec557a1cc92d1bac30cfc8d66f8dd8a565e601883a45004ab4c8d5b889 SHA512 ac10ecd3e0ac78df8f57bdff5b32a5b9186699d03f3bc92f2333a8b757f17c8d216ed1eed38b2ec7d397906ecfb5153f25f7a3502f8bc33f3078109b350b283c
 MISC metadata.xml 683 BLAKE2B 060e4f7830a96404813a550debecf83c2de3993183d41638362ed01a3a6240bdd33a83c0db5e31a2f2e821046fb1c15199688271c27611689aac1bdf02bcde14 SHA512 176625d3c972766aaecd10125e69b4cdcbedff958b842b2ac2b6a39d728ec868b3311ef13f6854122063810c5125f48d73cd1e68083de5ddf3ef85f7f2b09cdc
diff --git a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild b/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
new file mode 100644
index 000000000000..c44dccad1aba
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: xemacs currently does not work with position independent code
+# so the build forces the use of the -no-pie option
+
+EAPI=8
+
+inherit flag-o-matic xdg-utils desktop
+
+DESCRIPTION="highly customizable open source text editor and application development system"
+HOMEPAGE="http://www.xemacs.org/"
+SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
+	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 -riscv ~sparc ~x86"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
+
+X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
+
+RDEPEND="
+	berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 )
+	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/openssl-0.9.6:0
+	>=media-libs/audiofile-0.2.3
+	gpm? ( >=sys-libs/gpm-1.19.6 )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( net-nds/openldap )
+	alsa? ( media-libs/alsa-lib )
+	nas? ( media-libs/nas )
+	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+	dnd? ( x11-libs/dnd )
+	motif? ( >=x11-libs/motif-2.3:0[xft=] )
+	athena? ( x11-libs/libXaw )
+	Xaw3d? ( x11-libs/libXaw3d )
+	xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
+	neXt? ( x11-libs/neXtaw )
+	xface? ( media-libs/compface )
+	tiff? ( media-libs/tiff:0 )
+	png? ( >=media-libs/libpng-1.2:0 )
+	jpeg? ( virtual/jpeg:0 )
+	freewnn? ( app-i18n/freewnn )
+	>=sys-libs/ncurses-5.2:=
+	>=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PDEPEND="app-xemacs/xemacs-base
+	mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+	default_src_unpack
+
+	use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
+	find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
+	eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
+	eapply "${FILESDIR}/${P}-gcc5.patch"
+	eapply "${FILESDIR}/${P}-glibc-macro.patch"
+	eapply "${FILESDIR}/${P}-as-needed.patch"
+	eapply "${FILESDIR}/${P}-configure-libc-version.patch"
+	eapply "${FILESDIR}/${P}-ar.patch"
+	eapply "${FILESDIR}/${P}-strsignal.patch"
+	eapply "${FILESDIR}/${P}-process-test-qa.patch"
+
+	eapply_user
+
+	# Some binaries and man pages are installed under suffixed names
+	# to avoid collions with their GNU Emacs counterparts (see below).
+	# Fix internal filename references.
+	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# bug #639642
+	test-flags -no-pie >/dev/null && append-flags -no-pie
+	filter-flags -pie
+
+	if use X; then
+
+		myconf="${myconf} --with-widgets=athena"
+		myconf="${myconf} --with-dialogs=athena"
+		myconf="${myconf} --with-menubars=lucid"
+		myconf="${myconf} --with-scrollbars=lucid"
+		if use motif ; then
+			myconf="--with-widgets=motif"
+			myconf="${myconf} --with-dialogs=motif"
+			myconf="${myconf} --with-scrollbars=motif"
+			myconf="${myconf} --with-menubars=lucid"
+		fi
+		if use athena or use Xaw3d ; then
+			myconf="--with-scrollbars=athena"
+		fi
+
+		if use Xaw3d; then
+			myconf="${myconf} --with-athena=3d"
+		elif use neXt; then
+			myconf="${myconf} --with-athena=next"
+		else
+			myconf="${myconf} --with-athena=xaw"
+		fi
+
+		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
+
+		myconf="${myconf} $(use_with tiff )"
+		myconf="${myconf} $(use_with png )"
+		myconf="${myconf} $(use_with jpeg )"
+		myconf="${myconf} $(use_with xface )"
+
+		use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
+			myconf="${myconf} --with-xft=no"
+
+	else
+		myconf="${myconf}
+			--without-x
+			--without-xpm
+			--without-dragndrop
+			--with-xft=no
+			--with-gif=no"
+	fi
+
+	if use mule ; then
+		myconf="${myconf} --with-mule"
+
+		if use xim ; then
+			if use motif ; then
+				myconf="${myconf} --with-xim=motif"
+			else
+				myconf="${myconf} --with-xim=xlib"
+			fi
+		else
+			myconf="${myconf} --with-xim=no"
+		fi
+
+		myconf="${myconf} $(use_with freewnn wnn )"
+	fi
+
+	# This determines the type of sounds we are playing
+	local soundconf="native"
+
+	# This determines how these sounds should be played
+	use nas	&& soundconf="${soundconf},nas"
+	use alsa && soundconf="${soundconf},alsa"
+
+	myconf="${myconf} --with-sound=${soundconf}"
+
+	if use gdbm || use berkdb ; then
+		use gdbm   && mydb="gdbm"
+		use berkdb && mydb="${mydb},berkdb"
+
+		myconf="${myconf} --with-database=${mydb}"
+	else
+		myconf="${myconf} --without-database"
+	fi
+
+	use debug && myconf="${myconf} --with-debug" ||
+		myconf="${myconf} --with-optimization"
+
+	econf ${myconf} \
+		$(use_with gif ) \
+		$(use_with gpm ) \
+		$(use_with postgres postgresql ) \
+		$(use_with ldap ) \
+		$(use_with eolconv file-coding ) \
+		$(use_with pop ) \
+		--prefix=/usr \
+		--without-canna \
+		--with-ncurses \
+		--with-msw=no \
+		--with-mail-locking=flock \
+		--with-site-lisp=yes \
+		--with-site-modules=yes \
+		--with-system-malloc \
+		--enable-option-checking=no \
+		--with-last-packages=/usr/lib/xemacs
+}
+
+src_compile() {
+	emake EMACSLOADPATH="${S}"/lisp
+}
+
+src_install() {
+	emake prefix="${ED}"/usr \
+		mandir="${ED}"/usr/share/man/man1 \
+		infodir="${ED}"/usr/share/info \
+		libdir="${ED}"/usr/$(get_libdir) \
+		datadir="${ED}"/usr/share \
+		install
+
+	# Rename some applications installed in bin so that it is clear
+	# which application installed them and so that conflicting
+	# packages (emacs) can't clobber the actual applications.
+	# Addresses bug #62991.
+	for i in b2m ctags etags gnuclient gnudoit gnuattach; do
+		mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
+	done
+
+	# rename man pages
+	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
+		mv "${ED}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
+	done
+
+	# install base packages directories
+	dodir /usr/lib/xemacs/xemacs-packages/
+	dodir /usr/lib/xemacs/site-packages/
+	dodir /usr/lib/xemacs/site-modules/
+	dodir /usr/lib/xemacs/site-lisp/
+
+	if use mule;
+	then
+		dodir /usr/lib/xemacs/mule-packages
+	fi
+
+	# remove extraneous info files
+	cd "${ED}"/usr/share/info
+	rm -f dir info.info texinfo* termcap* standards*
+
+	cd "${S}"
+	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
+
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+	domenu "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+
+	einfo "If you are upgrading from XEmacs 21.4 you should note the following"
+	einfo "incompatibilities:"
+	einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
+	einfo "- The X resource class has changed from Emacs to XEmacs,"
+	einfo "  settings in your .Xdefaults file should be updated accordingly."
+
+	if use xft;
+	then
+	  einfo "You have enabled Xft font support. Xft requires font names to be provided"
+	  einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
+	fi
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 9d3ec4bc8032..1667400d31d2 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/async/Manifest b/app-emacs/async/Manifest
index 08ae4ede21f3..6a686624905d 100644
--- a/app-emacs/async/Manifest
+++ b/app-emacs/async/Manifest
@@ -1,4 +1,4 @@
 AUX 50async-gentoo.el 80 BLAKE2B e6b27662c8c0d0e38785c4268fedec8da7e9fd72b75c7ada413fa878624be04808238db88a4508dadf3e1c5f0c6811cf9d779dd3f86171c5d7d3e55604d98870 SHA512 f4517bccd0bcd8658ddc8b1e8241a1f5dd08176f6f6a6174f7c33200d0cd1cfff2b78f32d60538259348fe872057bd394cbdf98dbdc05248ca7c2d0118250498
 DIST emacs-async-1.9.3.tar.gz 14394 BLAKE2B dd6a98e61027dae2fa9ebb8e20f81a2d2debff1e990e57084a747ea815d1e615dc0e4b8fe5fcdc1f562c0f02780951121f4a67b26584f4519290413da05dc1e9 SHA512 ecbbb6614882df8a58a3440a78867e6cd19ae448e2e897b27d6aeaf5e5a648dcedbac64afbfd6240b7e68c533c685060f453051ef9a85d9d4cca6831fbf2c1dd
-EBUILD async-1.9.3.ebuild 540 BLAKE2B b3a54ca20b47c3a0a020d5630bb50377da86f0bd6ea49bf337c3baf89f2bdbb87e6a9ea3240d577ab2feb218c3bbb1ae2762a20138155e68c665544febf90f4b SHA512 bbab62267b9773b89e95b4736e24abd66369104e62242e27188fe27fb177e3d3015f02d39b253223d914308f8bc8d351eca70d80398725d8b319bae07b350d04
+EBUILD async-1.9.3.ebuild 543 BLAKE2B 310360dd9accc1275f0f705c134fccb81088885519bb215586ce8c857f4c3020021127dc67a63e22a574c54787eb998e94a242f6a02f5fddc64bd74a1ef3679a SHA512 dcc87c78e978471647b6fe3ce595351949a9e62b0c854999cf77fd940329dbc3cd0f1add687092262743c5f9080eb61e59fdc3758f9b817460144124b04ccf7d
 MISC metadata.xml 366 BLAKE2B 773ef114fba2a72f9223282cd40b3e46966a015caa04e91610ef5106a6df8b253d37bba5f575260a138e1811b9b57384a035eb3e517b28233e604450ed4f3d1b SHA512 c64120f7a70e14723680475519d82bfa6a4fd2a651b3ada184033fa6894521bd2fdecc058f9f43ec910bad8c2b72efb33add458e5e4269427d092a0300f4c910
diff --git a/app-emacs/async/async-1.9.3.ebuild b/app-emacs/async/async-1.9.3.ebuild
index c59fc3c4339d..179ede444ddf 100644
--- a/app-emacs/async/async-1.9.3.ebuild
+++ b/app-emacs/async/async-1.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jwiegley/emacs-async/archive/v${PV}.tar.gz -> ${MY_P
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/dash/Manifest b/app-emacs/dash/Manifest
index 298a9e0cc9ff..0458ea7ccd14 100644
--- a/app-emacs/dash/Manifest
+++ b/app-emacs/dash/Manifest
@@ -6,7 +6,7 @@ DIST dash-2.19.0.tar.gz 155484 BLAKE2B 88ec15c5b566787191ef0b64ef1f6abeb191825ea
 DIST dash-2.19.1.tar.gz 155540 BLAKE2B 6c705d2a3af77c79d91e2fbf5dd766e6d1e6e741a56a8b1e062e9316d2c62f686a6935de46c56bb3a7a27bd823772061329aa09e2e33d68b3bf7a35f65732dc4 SHA512 6822e0068bf2f2082faa4de47521982eba0117037c333178517eca9e6db1c33a2767b250a6ecbd329d2e2ca9e107d2baf0b025e34ba50f1b60da5bb7da06c195
 EBUILD dash-2.16.0.ebuild 561 BLAKE2B 6b6f0318611b3b57e47b16225e2e0998c3f3020a6aa4195e65cd5954ff01518c2b026fb181f22cd5131ffc42d39eabf48fb54bee1188ae51a5556c1d1f396ea2 SHA512 34266ac3d94e0ba59061f8c7ef9946a55449621baeef3a72293486a9f9e7575b40fc78ffd3d2f37893f2c824c4caa4e987f18245fac6e04c47a7ea2351afc8bd
 EBUILD dash-2.17.0.ebuild 564 BLAKE2B 949c330e199f88ca957a348373db0a3208628762269cc832f3c5b308e5b4a5a6b9232de8180a52b8a583d36380dbb20f8c68bee9b26f2301e654a6b0a15e9004 SHA512 30cfd972903a1d4be4c1f68d71715703bd7ef00b6b4c6b554bde5b0d634fd9b07085ae13afaeb592ef73968b6e2bc4fdd553a6ade65853a70d87a005a1e4877e
-EBUILD dash-2.18.1.ebuild 525 BLAKE2B 05a3f145a89433220f90a50ed1bb52d24e0671704b00f52c31e9f16a16c44f5a05ab3cbe2b6c495d8c5f9c4b0b5d3a1c2c5bff4e1fe71519c2de7107974d3a73 SHA512 75255e9396bfe95b1a65f5300b766275d6a1e3cb316768b6b7ff63ef37ecc58632e253303b69ff2f8d3aca87a9f7085384dd119d307ea93f366eb824218d838d
+EBUILD dash-2.18.1.ebuild 523 BLAKE2B f55fd7874b5be0bf10ef48d1d7732cc35199cd16b5d29f90748d7bd0cc23d540e98444428cf5dbb99140c48e63ff9d017ef39e5148c3d25de6ed469bf245e1df SHA512 ccc55783b1892fb1cc323488fca514aa9b0121a2e0dde543eb27ce51e1c2649c40d6cce1cf29b979fb2a32217d28c1b5c0d7d446e3e9ec2021ba3a7638d1c084
 EBUILD dash-2.19.0.ebuild 525 BLAKE2B 56bbc542ab3da296acd8a3448e2c198c9b22b6474db9e64dbe41c92deaa7d9fbe273d08be3df8cc89086dd7c1720b29187b2df48c5ef6090704db8a068cf11f9 SHA512 8345d8bdf25e1a9c0a254990e7955d19936e92910991c18da13d533bda3c3805513af8a7d60dedfb5785679d925f8393688bba21b7f730a491fec977e10a9ad8
-EBUILD dash-2.19.1.ebuild 525 BLAKE2B 56bbc542ab3da296acd8a3448e2c198c9b22b6474db9e64dbe41c92deaa7d9fbe273d08be3df8cc89086dd7c1720b29187b2df48c5ef6090704db8a068cf11f9 SHA512 8345d8bdf25e1a9c0a254990e7955d19936e92910991c18da13d533bda3c3805513af8a7d60dedfb5785679d925f8393688bba21b7f730a491fec977e10a9ad8
+EBUILD dash-2.19.1.ebuild 532 BLAKE2B 2786afea701b6e1a3fb23b256e066bceca9f1d6b575066afab196de72441a75af21dc4313054718c801c81553cb7752eec0fbb849ff325e8c333289a3a483783 SHA512 51daf07963d1abf444321153c330b68b262bc60276e02cc7c5b57d1564857be86569eeefd522f7ea483bbd41887c874e9de98e9dffa60e7064466a0f761496ee
 MISC metadata.xml 361 BLAKE2B 526ffa8914e45d9df6ab9b109ebd1bdb229a72fd8bd3aa5afda015814245847540ca2528130953ceb17e16a8e8a4c736603cac7226a4dc05d2f0cb635e6b3924 SHA512 f7edd41fd870cb9d3bce26c0670515d13e175be0dab988889c36450c24d5b898ad49550902d5c07e898bf29cfe183372747b1317ba36834ce68e9ef0bfcb4f24
diff --git a/app-emacs/dash/dash-2.18.1.ebuild b/app-emacs/dash/dash-2.18.1.ebuild
index b35047c56b1b..acf135cdcb37 100644
--- a/app-emacs/dash/dash-2.18.1.ebuild
+++ b/app-emacs/dash/dash-2.18.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/dash/dash-2.19.1.ebuild b/app-emacs/dash/dash-2.19.1.ebuild
index fc2e95a1f688..3769f002f384 100644
--- a/app-emacs/dash/dash-2.19.1.ebuild
+++ b/app-emacs/dash/dash-2.19.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/editorconfig-emacs/Manifest b/app-emacs/editorconfig-emacs/Manifest
index 7c70cf3a4fd2..1099aad72ef3 100644
--- a/app-emacs/editorconfig-emacs/Manifest
+++ b/app-emacs/editorconfig-emacs/Manifest
@@ -1,6 +1,6 @@
 AUX 50editorconfig-emacs-gentoo.el 315 BLAKE2B caefc75ef9a37e43d2a5de2f9c50a8f2992124fa98030080d5a5dc6c37490e1217e47595e4e894aa264568899d54891db8676348d10984327a4c596bcbf7b923 SHA512 66e86f6af9fa2feadc5477b6b7290320b2544219d8c099f74f94873fa4d4d45dd8f0dad17b14dcb455f1e18f1dd7606ade1ef77e0aff5708102ed5f35df81705
 DIST editorconfig-emacs-0.7.8.tar.gz 28250 BLAKE2B 8c09b7e495ff38d4276cdbaf60109f91b3e32215f2c6a8aceffd80a02cf024d79eac1739b3f2efa3697b78804da32d0cc2969db628d1064a0fb1db1b059a191d SHA512 21815a5a778ffef68b5205e409aa827c1bd6c9a8c542647ebec889a9f00f5b3f71e3a2072bc2f0373e8ce30c1bb57f5f6350953a3c149742a8e2e46ca9846c9a
 DIST editorconfig-emacs-0.8.2.tar.gz 39675 BLAKE2B a2a9641185a00c2908715b59a7e4429008f7587e00552ebc19f6cc38b6a10423c26a25557b887caaddc47d9c136fdec82476ef916e18c06b8228925b4554428b SHA512 6934418fd7890c49d8df7cdac1a0afe066e07ddf6274f674a4624dca47de278a78778f25beca793cdb537852beb7c8df5ea46743fb0bc753acccbb9974448e18
-EBUILD editorconfig-emacs-0.7.8-r1.ebuild 648 BLAKE2B 613aad383cca044f944485ad202a062a33d21ed6d2a2b81e4d5e402055f58debefffa8888f2123849c31ae9091baf46755ad9c9d126ce41047da4f14ec791a0d SHA512 112c8a2861d5d845ce34107d02fde7f8d674930ae5c01cc9e6e868c3eff7bfaea74f4589774cb722c6f673f3bc11ac996425bbc212cbd246c0d2b4d86b013181
+EBUILD editorconfig-emacs-0.7.8-r1.ebuild 643 BLAKE2B e5917b6389fe7f6c620141059dc60f6e34b5bcf55476429b12395b087d2155406581cb8167f25413e12a2d3348f1ab1d3f63fdf1c41be1c595083df0cefee771 SHA512 2f423ca10282652112a89ca8300fb7846900862cfb4949c223d1faf0c82d14b5b8357ffdfbeab5bbb5c9f843b4afc810da77b5b3ea864911a3d68a263a74242c
 EBUILD editorconfig-emacs-0.8.2.ebuild 645 BLAKE2B ac115d62641e0f7db43c60e0a29fb68747cf982e9364496994a6c757af5bc7960716b1ac7595e0d1833d33425b7f41f9ca23e490d054d356732928eb5262d620 SHA512 cae754c60d8583ebd3f232635c48f4b36c25e64fc8feb08830cba9bad4ba33af522671df276d07c85a4af5dea567f68d1fcc0d56baabc4cf77a1f51fbcf3fd0d
 MISC metadata.xml 461 BLAKE2B e8415c92944d44ef9186b4882d7a5b912ccc16f224da3faef90b43ee8077e94496234341b80eaaf20a17118ebe6f8e8b0cfb70910c948a3ef5a8f853a02cba22 SHA512 a679c75eda6a98c3810b3fc1982ed8c7ff9349a63541eaf3c2b5dfdfec4d1a97f7c540d6b6442511c2645aed46e4b6d346f01ed952a51eb12d076aab8d29351f
diff --git a/app-emacs/editorconfig-emacs/editorconfig-emacs-0.7.8-r1.ebuild b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.7.8-r1.ebuild
index f79186d032e1..5108959d687f 100644
--- a/app-emacs/editorconfig-emacs/editorconfig-emacs-0.7.8-r1.ebuild
+++ b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.7.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="test"		# make test requires a git repo
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/eglot/Manifest b/app-emacs/eglot/Manifest
new file mode 100644
index 000000000000..76a03281f966
--- /dev/null
+++ b/app-emacs/eglot/Manifest
@@ -0,0 +1,4 @@
+AUX 50eglot-gentoo.el 76 BLAKE2B 0f41a5837bd485730c10074ca5c2dba963cf69b96043f3439e9f1e7a41d468cd706e974c7d7b312e51db98d6e7573b4ec284603998c2fe1de05f86496c3ec0cd SHA512 6c06dfa72ac6122c82dc59bb672f796ae86e71548babb2bb0dc2b00e58050e65b51e13aab279d5f3e7f1283ca2e0a64c7d34a55b412c2d81fc58fc495864c8c4
+DIST eglot-1.6.tar.gz 288078 BLAKE2B a2214d216d0eeaca32d974c6686696dfcf141b3384741bc8cce0d02abb508eb5713933bc227d12a07f4b87fc34601431845b1b8e519538ae04ecc74b24db4004 SHA512 51227c8e2b0a1dd9a63ededbea592f01616ff728c34c330400c078212fef3f3e747e6dd30ba312523cbe60c7ea663a7af9d83300210cf331ea6162d2db5c7e41
+EBUILD eglot-1.6.ebuild 670 BLAKE2B a1ca6c70ae3da6d338162f14bb0e778ef8eab25545622f1fcfc0e38df1df31588194cd3e7b8988c33dc39373b2c4bdeaad251cbd3e551ff16273936f33fc8d1b SHA512 77c26b1afba7513e8e3bf286003fd0a82971762b36cf78dfcda6101a03d043201c9d2b4e27a9773043ac62fe2d64c6bf25b74efc946d0b1f639219c928343ef7
+MISC metadata.xml 573 BLAKE2B cf91f12d06d2e0894d18c725eeef788341d8b1beb48eed71d7da0e31ac45e91e5df4e452613699dbed5f4da1e33c12a138296e983a51203f81c173db741001e2 SHA512 6d869d7cdd14557f758dce45df93822800577226518db4afc1ac9efbae4d97f99b77ef45afaf90f7b248ba5de76ec51ee2231ddea8095ddb09bf40eb0a378442
diff --git a/app-emacs/eglot/eglot-1.6.ebuild b/app-emacs/eglot/eglot-1.6.ebuild
new file mode 100644
index 000000000000..913bb955411f
--- /dev/null
+++ b/app-emacs/eglot/eglot-1.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.1"
+
+inherit elisp
+
+DESCRIPTION="A minimal Emacs LSP client"
+HOMEPAGE="https://github.com/joaotavora/eglot"
+SRC_URI="https://github.com/joaotavora/eglot/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+# test requires internet connection to install several language servers, one of which
+# is not packaged
+RESTRICT="test"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_REMOVE="eglot-tests.el"
+DOCS=( README.md NEWS.md )
+
+src_install() {
+	elisp-make-autoload-file "${S}"/${PN}-autoload.el "${S}"/
+	elisp_src_install
+}
diff --git a/app-emacs/eglot/files/50eglot-gentoo.el b/app-emacs/eglot/files/50eglot-gentoo.el
new file mode 100644
index 000000000000..b8a7e2b65eed
--- /dev/null
+++ b/app-emacs/eglot/files/50eglot-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "@SITELISP@/eglot-autoload.el")
diff --git a/app-emacs/eglot/metadata.xml b/app-emacs/eglot/metadata.xml
new file mode 100644
index 000000000000..4d327b888ffc
--- /dev/null
+++ b/app-emacs/eglot/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>jturner.usa+gentoo@gmail.com</email>
+    <name>John Turner</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">joaotavora/eglot</remote-id>
+    <doc>https://github.com/joaotavora/eglot/blob/master/README.md</doc>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/f/Manifest b/app-emacs/f/Manifest
index 8393b8de69b1..3fae737772a8 100644
--- a/app-emacs/f/Manifest
+++ b/app-emacs/f/Manifest
@@ -2,5 +2,5 @@ AUX 50f-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b5695179
 DIST f-0.19.0.tar.gz 19477 BLAKE2B 47cfb8c876e11cae7eca61815085c4290f65f9d72a7c5d397d8b53f6d57421f46997786556074027de5405acbf38ddb42ecbb767c809763e84d880286e6942dc SHA512 694eca1872cb0a0da7f75f610e4101993a79a5e7601c3f72fd2c642b1a44f5eada24777313b5166d901d9d983c18b4d412b4c6f01c382ace7530bacaa3b67c56
 DIST f-0.20.0.tar.gz 19907 BLAKE2B 20b82a19b227d2e0863e540e75bc5094c0cf267eae00d699ff5b00fa574213d303135c246c454c92785080feae63ba6c529b115aeb1368774dd548852d94fb48 SHA512 0c44e63cd527a37bd5582d5a2a4cb2269d179930d7f41b378b9100ad5bb4518291b02197b1d55e1bf603bb5b1c12181b982d9b9a3f8fbd48860f6e86ea36c03e
 EBUILD f-0.19.0.ebuild 526 BLAKE2B c8f84f7ea67d86cccf39dccb13e887026da2c4a52b16c9cbf9272c62694af5dbf5666a0688d0e8c8bad8d5b3639040676df11cbcad4ef1eb7eb4e325ecfeb4ba SHA512 f56bdbcd85b0aae7c3c70d3b9edee58ef668f9f12939f4f87e705d64d68dccd28f97e2838c0dfcdd6f64be780a5628af349507c9601fc054b6f536a4ca24e356
-EBUILD f-0.20.0.ebuild 534 BLAKE2B f7089333318eebe71fc08f0e55b4aae202cb76d58fa222fafd43cb492fd7f9eeb176574d88240ccbdea0ee70df1e35f51296beb29cb5cf4a50006741501f2632 SHA512 a7334745f16386d79d4f5b05a8477c198df30f64ed4f8c2487f5d2bde6e536667fb4ddfa17317ebce1d4d429018e1d9cdc67075f0b1d4e52c933aa39a8ab4bfb
+EBUILD f-0.20.0.ebuild 541 BLAKE2B 8483c4ea300583a939361c7738abb84d9ac8b524509f79fd8ecc2a500bf061422359e6c7e76b3a3be9b06a04cda7f85c24daba4a54dff7616d5726e6eaf4fc47 SHA512 87510b9d844aa5b99b5048ead021920783747485d924c610d14dd81c21f126e580f612bcc597b976e00a73d1fe79f3621c624c6a4c414bd075ebf69af6633053
 MISC metadata.xml 357 BLAKE2B a60c6938e7ac515ba2a2455784adc08fc1271acbdb8cffe5f78fb28eb532c491fa102dda5207a46b65c45e9eee680e18e5adcbae9ead84eb2ba7fdc785818533 SHA512 3a326f0132b4e6619d3c280d2740b231d03a00c3a9b5d77be10a017435cefe645be2f1c8a83e4a34336da5511a87913406b31be06e8e46de280dee3221b45a3b
diff --git a/app-emacs/f/f-0.20.0.ebuild b/app-emacs/f/f-0.20.0.ebuild
index f533cf8046b1..a26344476647 100644
--- a/app-emacs/f/f-0.20.0.ebuild
+++ b/app-emacs/f/f-0.20.0.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rejeep/f.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 RESTRICT="test"
 
 RDEPEND="app-emacs/dash app-emacs/s"
diff --git a/app-emacs/helm/Manifest b/app-emacs/helm/Manifest
index 28ec88a8ea90..b9bbad48c722 100644
--- a/app-emacs/helm/Manifest
+++ b/app-emacs/helm/Manifest
@@ -4,5 +4,5 @@ AUX helm-3.8.0-no-autoload-check.patch 629 BLAKE2B 23ae68b3f15b6a7b8bbe1c7c22c89
 DIST helm-3.6.0.tar.gz 2302677 BLAKE2B e9a83a1a4f46c1256090ff458ffc3cb158aaa320a067fb1474c9f62bd0cceaf98c53191790113c8af228d8a47fc7d2585a528ffed3e6e06030a4308f9c65e095 SHA512 1cfaf5cdef9203bb92b80c684b21ec7ca92df00aa2e82815e8f39c623648232405273fb272244d7d2b2756f4699f82f93e9a669a13a71da9410f0c0f9df30393
 DIST helm-3.8.0.tar.gz 3943168 BLAKE2B cee9ed8eafdf01cb2109dcf5289522f4a0d9db9a8626097a1ffc3bdeaee792b072b7b27e635ef360815a354c9796b55fc4b3921784e2fd0d655387507df208b6 SHA512 0aec3d4270205c61cabc991dd39d5bac3b10e827f362819e9fb85880985ce2c7e7c7b8f73d2f0cde5b5c168d4b9857e0379f1e4ca9395dbd8f083c1a707ad3f2
 EBUILD helm-3.6.0-r1.ebuild 654 BLAKE2B 5efa390436eb08d87393dcc3e7a9cc7726dfe49f687cdfac2e965f03557b575a3cd42432a0320c7e341ddf2a99d44aa5b48da7b915f2d92e7d6bdfabb4a803d4 SHA512 62b15b1121131970d81578879474f7053907b45955230a54640140fcfe1cec05f9118c58919f59326e09ea0f84a9ebcdc88e5d707719ae2f0a5180f121594ae1
-EBUILD helm-3.8.0.ebuild 654 BLAKE2B 3fcfd22dcfeb8da8cf66839b9314f7a41759dc52901fba35fb5fa0b8381e6e90667957f458ebea889e720bd78c12ccbb4d11a40448dd64e53fec6191042ab8e3 SHA512 a3911f1b610974313e94ed61275c7bd99195f0feae7f140ca631d6358a88325d0f2087e5f947907612399e2fad0d05055a36917fbbf54d2829c73d1c0fd7ac81
+EBUILD helm-3.8.0.ebuild 652 BLAKE2B 8daea4061ce9eba2fc25791b412e6605fe5ee76a9b3dd58e34b5d72b4547c68389eab20af5d00c23117a026326c2c6e5f247f33c8b02ecacd2d2fce1901ac588 SHA512 e6f3335e3f0ffbaf6e5e812002daecdeef04fbb74aaef431bee64677fdc2d9b4d12ce36bac356c28c35f1303161cbbdc9f6b2b83ddd67b6750a8608998b501f4
 MISC metadata.xml 822 BLAKE2B 5de057ddb881d67550d3e8cd0be43d3328b8e7a38b98338ffccec147095cd5d8f8bc68695c797a872e2ed7e455859fc1d6170f414231016edab5a8d742ad2a40 SHA512 08367530e4e47577e1812d229b97094b9c012c4c91eb7e69f5724e98d8790327fe35fb9b480cf33eedd105f1fd85133c39397eda0426461d80bdee704a51c55a
diff --git a/app-emacs/helm/helm-3.8.0.ebuild b/app-emacs/helm/helm-3.8.0.ebuild
index 6103dff04df4..c7df4d68e4d9 100644
--- a/app-emacs/helm/helm-3.8.0.ebuild
+++ b/app-emacs/helm/helm-3.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/emacs-helm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="app-emacs/async
 	app-emacs/popup"
diff --git a/app-emacs/libegit2/Manifest b/app-emacs/libegit2/Manifest
index 0ccfb55195b9..8a3a24cca8a9 100644
--- a/app-emacs/libegit2/Manifest
+++ b/app-emacs/libegit2/Manifest
@@ -1,4 +1,4 @@
 AUX 50libegit2-gentoo.el 199 BLAKE2B f9f7b6d2c6d8a70d37e698dd71a40b0ccb4224c1276393adfe2eb546313cc3bea29136820f98d3579f6cdeafd0559e1739150be503233de44dddefd3f97b66b6 SHA512 067030b050715f80251b28a179c0b4779efd311c4d5c1e0bb2bdd10f95442cd8f243c45c81f004ad8362740aa0139667324ef9c829abec7291ddfe801ea4c67a
 DIST libegit2-0.0.20200515.tar.gz 132122 BLAKE2B 2e8e06fb833e5ea2ee0f4e1fa760d30e91235a9b9c4a465de6d8a12d6c8431bdc85204546ba36c36f206e2788d9f1cda00d578c1c40057ccfb3f2117e8302013 SHA512 f604591ba272ea1cef8c428f644c0cfcc4ba2438a55c2b7a0dd1cdcb15836c755c0c6bdc6c42bd6da05935bba7fdac30efe65f26307599b07e591f4efdd1e897
-EBUILD libegit2-0.0.20200515-r1.ebuild 1056 BLAKE2B 164320fb0b496d8ffdb479eed62f90efe57666cae56163c8aa5545c92561e6366d3f90047e33982533868179ac2bff7b525a3cdfbc7d2d097f97f9b1c3593f3e SHA512 1cf2cf9c0a3e20a1f794482e452ee7b50f4934e19952358102226b6cba2b4ebfc4ee0b47ef77f0f0b7bc0ed9ae574ac1b1347f34663f8a8ee65fa909b6f7c423
+EBUILD libegit2-0.0.20200515-r1.ebuild 1054 BLAKE2B 9ada2156b66eed269f4c42616b007666052a10ad4352373377ed63a43187cda7f21ab70612e160e8c250ce5d36b77e0550cea53dbb81a02b770dd4a526548dc8 SHA512 38afc5dc2897eca226a1673df70f5f2de14b63f2f530842dd284052857da1dbd8fab7c79020040be4dcc7d26876158fb1ff4fecbc5adde4f75f52c65c177b865
 MISC metadata.xml 482 BLAKE2B 5217eaebb982cc094497ae980263833be6110d28c97ae7ef2324cc7bbeb400b942317973deee3617bfc607781318bd23f05904140324f064f1ccee1b9ab97f15 SHA512 13f73bd327d202c87f7e3ed27de50c3f6be1eb1941b4a753ba391f1ba3f4140eb3bcdfe1be5179ea1168ad1cedb963cb85f64b6f72ad1c112e8ea708b4a0ac9b
diff --git a/app-emacs/libegit2/libegit2-0.0.20200515-r1.ebuild b/app-emacs/libegit2/libegit2-0.0.20200515-r1.ebuild
index 7aa7a128835b..e416b4617bba 100644
--- a/app-emacs/libegit2/libegit2-0.0.20200515-r1.ebuild
+++ b/app-emacs/libegit2/libegit2-0.0.20200515-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/magit/libegit2/archive/${COMMIT}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=dev-libs/libgit2-1.0.0:="
 RDEPEND="${DEPEND}
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index a8f87b94df76..5a55c0f69c82 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -3,6 +3,6 @@ DIST magit-2.90.1.tar.gz 544968 BLAKE2B d3a38cf8c4d8c15529463028c4f6718d65bff044
 DIST magit-3.2.0.tar.gz 618602 BLAKE2B c96226669bc5160460d24a1b9b36784d6764234e2e2690f059c362176e9a56fc742b961a0d4103049b33d958e44c092f4bbb75de3b3437ac178dae89e34028e0 SHA512 3b4bd5a13592814c0c638a26ba09c6e01a15db6af3555db41bc0adc53e8c08eaa2e7c58d8a105101fb46a8a04be0e09a0f2c86d365391430b42adee83df382f6
 DIST magit-3.3.0.tar.gz 629283 BLAKE2B b07a071682ac543ba4a94b9bb8d78cedca1dcc4a7140ad2972d65e014666a2fea078611a7fd98356747d02431e5aa2456801e7e9a12e2b08027666b437863535 SHA512 22fa7c41cb18746b33f64ef936f88dbf229f998e2d2a5d066771711450753c98430335040d0a9812832f3fa39f96f6e88133d5274964332bc899fa7ef19422eb
 EBUILD magit-2.90.1.ebuild 828 BLAKE2B f2ddb437ef786073f6a9f7f5561cbc9452bfa274c3b1e31a49ae9f5984f5ca63d54468e51023e1990da073bc162808b38f12c9b1ee9a51509ea5d2fbf3de525c SHA512 a85ae33cef7625b40c7d8dd1794075adb4dbe0eae2b99a08395ab91bdd0ff590cec877298d5e20c1868322e6eba2dc1ee08ec9306b60be8c65a13cd15de0091d
-EBUILD magit-3.2.0.ebuild 823 BLAKE2B 0bd97294709e7cc31744117cf8cc92c00a1f7b3aac89a2085c1652510da6269ce9738302079f5828a909434fae9382387bf2d5ab1099cfe5dbab03e4d78cf680 SHA512 bfa883e5a9567aae7be3999536735fdc97707925095520a2307ddd01151052b70bd68d7991abfd3c50926793cdf673c277d0a7cf6b492775d3014606cb317e64
+EBUILD magit-3.2.0.ebuild 821 BLAKE2B a12cc523076680f32d32d3995b56f72dac50b105211b3ea958ecc9fe3df96d9be51751ccaa4425e32e3a1f9d44d1335901d40518e27813a0f4e43bda4a6fb94c SHA512 536284460a688e3bfde8f57f265a173259758a9a448a0efe307cefaba10d508ac5b706fcd633e97b64e25cc4a983cfc3662049cd3d5bb71a528ed30d7f7d2b12
 EBUILD magit-3.3.0.ebuild 823 BLAKE2B 7106b5b0ecf09334a6c9c906b973fc79b7224e8e9d63028831b4d94ec0d50c86acdf5099d8b8924df6d083a8f92cfea8927a97c84d8aee6852868ac9e94bf656 SHA512 b50e63e2bc0c63588e61295524062bda2f0ae9b9a204d74370856dd0656c44ea4d26b2c9f89cfde034c668dafd16b32c37d181d884032942f37df06f23f5ab3d
 MISC metadata.xml 812 BLAKE2B a00fcce22437d2853e3c6ab16e57e284444eed91cc2ec90e443ac14ab61c60dd476b21504fd41fae27eb0180cebb236f86b35cee557a41ca34c854939c8a0ab8 SHA512 a0aa797e586bdb7657c9f4af4eaa8611a012146abbae4f47f47b124a7ebb9c2a8e65f9e862464bef0cc6f5671da40a2bd6e6cb78e0fb9d6ec02c362bcbd27399
diff --git a/app-emacs/magit/magit-3.2.0.ebuild b/app-emacs/magit/magit-3.2.0.ebuild
index fc3d6da779de..eec1091e376e 100644
--- a/app-emacs/magit/magit-3.2.0.ebuild
+++ b/app-emacs/magit/magit-3.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/magit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${P}/lisp"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/popup/Manifest b/app-emacs/popup/Manifest
index bf8a107165aa..802eedf6c21d 100644
--- a/app-emacs/popup/Manifest
+++ b/app-emacs/popup/Manifest
@@ -1,3 +1,3 @@
 DIST popup-el-0.5.3.tar.gz 25785 BLAKE2B e0104a382730203a86c9ce4e1957c652c0e4b0ee84dfa465a94eddf942a249ccf83493bc04f8503e483f14cfeff3649f5264475531c10fe1a9cb1a08376b4499 SHA512 ad67e5d1e4d969151359a54759ae74b2f1107b25b56e7bcedf15995ff6bc0188916fcf5af64ee6ee2b5046e831ebb49c521724e224d7ddb473d3229f3094f5d5
-EBUILD popup-0.5.3.ebuild 457 BLAKE2B 21474f8747da43f0cb3730234bdc2e392cf3bd6dd2000f9a19fddf6e58cc0d54873ae7b27c23ea0c0ac7862267eb503c7b7fd48c22c093ee874783dbd65aa398 SHA512 32b85f1c7d3a47eb00affbac38c94add1b44a89f038fcc720cda95def2eee575dd5ab4f3e597348d340c2203f05efd17bfdf2b2aff17e2e9edc41c71ecd676d1
+EBUILD popup-0.5.3.ebuild 455 BLAKE2B a76fb31565eb029fd7eea91449ecbff3f29c90a435cdfd3d131e662dcb4524dc29d0df611abb0ba7e66e0bfb3f8b2b7a25b3458a4f830aeb13c6ed1c181e410c SHA512 b29c813e3f68058e8c0238d1e3471c1ae917dc08ef492ff8204073275fb9a84092265a1ef14dfd282f3b527e6bba83bcd9cc0cc109853454e38fa156cb3dfdda
 MISC metadata.xml 560 BLAKE2B 0ba703ba8fb3c87988cbf12735b8722de72ab589cdbc98ffa944037f32626a5e679d7d044c72104e2df24559ac426ef1fcb575ac5cfa7077a68524b0c8a37768 SHA512 1bc0b8059339b16a1244d1186f0bc7d7daa51c361cdca4af35dab6efea6642d1458a9932800387d0d8f6718e4233fdcaaba587d52d156b46fae82b5bbdec2f8a
diff --git a/app-emacs/popup/popup-0.5.3.ebuild b/app-emacs/popup/popup-0.5.3.ebuild
index 2c80655c662d..4a8fdc4f8bf5 100644
--- a/app-emacs/popup/popup-0.5.3.ebuild
+++ b/app-emacs/popup/popup-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/auto-complete/popup-el/archive/v${PV}.tar.gz -> ${MY
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-emacs/s/Manifest b/app-emacs/s/Manifest
index cc9b74d18391..fd2dcc34adff 100644
--- a/app-emacs/s/Manifest
+++ b/app-emacs/s/Manifest
@@ -1,4 +1,4 @@
 AUX 50s-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST s-1.12.0.tar.gz 59193 BLAKE2B 89e4c453b6590116a4cc08fc1be73519e6c95586c1e80b37f37d7273232aa707cd030cf74106fdd7eb7f05fe8ebd04253592076573472c3927cc1428b4c029f8 SHA512 036369011295dfde7567ae8bd479be9635de479e8821c3fe117a6c3827bc83492bb91e6ac64d4b20b061da95690f5585ed58f116a2b8c877dceee22153c8c990
-EBUILD s-1.12.0.ebuild 450 BLAKE2B 18ab861ac73c276bd269358e2a251ec37dd106c6462b6f7d9d585f8d0224ce57a59e45cb10d7b01fd578584990d31b63cbf1e98b2d4aa677eb9477f255778a0e SHA512 623e623c52cfdf4873030297b55fbbcc695253c2ea49e94d30a24a37c9487548ed760f863e3008bfbdcd80f73a35acc581e01cab3ae978c073a280dfd0d1f8f4
+EBUILD s-1.12.0.ebuild 457 BLAKE2B 501820173974c3eec5812c2844849859ada1ef5c8f1cc4ec711f8c8e5727821fdb62bd1097a78c192e63f3fd044f7863c32bd9a45dc9d79fc3d3db4a35daf8d8 SHA512 250638d81585dc593fea52e88add79f9d0ff878f16f9f8e79392a697b4f28aecea59b059a62dbe86c48f3d143056c369df093dffd78a3c5533ed0549ea5ffc5e
 MISC metadata.xml 358 BLAKE2B c966645ca03d9831e511a7b54ab031c9c9764ee8295d5b0a90dc1f80d93a68c95076329af5d8951dc025d86ab0f15580109b2c521178ff68694cfdce5fe0f9bf SHA512 268ef26faa4a736d2301efa6c3f745f90cc41fbc6fbaeb63931a6206a2cd78e66546d30f16dc956c7918a644522a637311047e71dc4318bdc588957085fca914
diff --git a/app-emacs/s/s-1.12.0.ebuild b/app-emacs/s/s-1.12.0.ebuild
index 8376aeeb30b3..1d0ca0aa37d0 100644
--- a/app-emacs/s/s-1.12.0.ebuild
+++ b/app-emacs/s/s-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/magnars/s.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 S="${WORKDIR}/s.el-${PV}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/transient/Manifest b/app-emacs/transient/Manifest
index 8d2861d3f980..5585c0e75216 100644
--- a/app-emacs/transient/Manifest
+++ b/app-emacs/transient/Manifest
@@ -4,5 +4,5 @@ DIST transient-0.3.5.tar.gz 100274 BLAKE2B ffb7f5823552eb3e84fd1d8c3842c8e49f7ce
 DIST transient-0.3.6.tar.gz 100905 BLAKE2B cc7a78104b77a7ff49d2ee686a780db7509744b1f737e4f995d5e5f8ada18828ccf1b6ae5d995fb8aa09e9fc16895226e5e8cf3cf50a79c246c5d07d5f467ce0 SHA512 c1b43046f07f9efce1720f6e151d8223922574262d4e5436b0c81453b0a21a404f1c555a5bc92a201c71beb1b2f95aafb38b88203cd08c1d3a9d80f45ed0d0c9
 EBUILD transient-0.3.4.ebuild 644 BLAKE2B c9d4448a5fbb145a2c687a1d1b368a50f49616a0869ff0e7714e7dd89d62c2b464f7ebbc1c473be394ac8bfbe2869b0e063887ceeb15b8fef9cde342f4e3d899 SHA512 cda1012b7d316c14f7d523e049075cd180c5a496d72527197c8a9166a84b14dc058b75c437237e4cd00fd4aafa1016dad9d6ce27f3752cae0f8e42a51db98908
 EBUILD transient-0.3.5.ebuild 644 BLAKE2B c9d4448a5fbb145a2c687a1d1b368a50f49616a0869ff0e7714e7dd89d62c2b464f7ebbc1c473be394ac8bfbe2869b0e063887ceeb15b8fef9cde342f4e3d899 SHA512 cda1012b7d316c14f7d523e049075cd180c5a496d72527197c8a9166a84b14dc058b75c437237e4cd00fd4aafa1016dad9d6ce27f3752cae0f8e42a51db98908
-EBUILD transient-0.3.6.ebuild 644 BLAKE2B c9d4448a5fbb145a2c687a1d1b368a50f49616a0869ff0e7714e7dd89d62c2b464f7ebbc1c473be394ac8bfbe2869b0e063887ceeb15b8fef9cde342f4e3d899 SHA512 cda1012b7d316c14f7d523e049075cd180c5a496d72527197c8a9166a84b14dc058b75c437237e4cd00fd4aafa1016dad9d6ce27f3752cae0f8e42a51db98908
+EBUILD transient-0.3.6.ebuild 642 BLAKE2B 9010b0818ee4b86e9091508a4c9760dcfe8ef638898bd8445a4970eda8bbdf540486518c45f15be459d12c195a1d7673ff0aeb9fbb5b111995dbc3f9a1ac6823 SHA512 6d410b422c2874190adf38b7a244806a926a18bcd37dfb80fffb1f1f51918d753d12f9203b7b9016f9fe2fccff80e7fb2b71ed7cb57c299668137bc3da9c9d91
 MISC metadata.xml 1434 BLAKE2B 6f7f91e2cd8c87559f15552d6fbe920e5262a50f21919a096af55df037726eb380a774cfba8be73b588ba9aa2c39da5caf6ad64a31106b843c6bd308fe7aa40e SHA512 3316d9ac21d2a2aa0a5824f2c8ded736ad1bfcd7319a9c4cb8b02f0ffec5f440820bfe48e4f4d4264fbc3864bd7959875f1396285b6a7eb2ad3333a6a062a14f
diff --git a/app-emacs/transient/transient-0.3.6.ebuild b/app-emacs/transient/transient-0.3.6.ebuild
index 5f2eb4af6a92..b799b098eb41 100644
--- a/app-emacs/transient/transient-0.3.6.ebuild
+++ b/app-emacs/transient/transient-0.3.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/transient/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="docs/*.texi"
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index 46eea38acbec..14973601689f 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -5,6 +5,6 @@ DIST with-editor-3.0.4.tar.gz 31998 BLAKE2B 9ad3311d24e791a4fd4d4a8ce190386a7143
 DIST with-editor-3.0.5.tar.gz 31985 BLAKE2B 9d4bda1f4e7ae3ec5c9014b0e7a74bf703e9b80990b138ef6108275c9a117611d542e1dad03bb8537c7e8e3ffbbf3aac433bb4d3fe5eb07378f27dc1579a13ca SHA512 cc60a69ebfbb7d802a7bc64b56bf866111799b5a2a3140dd203bc3a4257756f558e81169b418bce2daa91e7aab7feb4d22115fcedf9efe46026745c4e3cf0268
 EBUILD with-editor-2.8.3.ebuild 585 BLAKE2B dfb15f185a82227721d375b17e162e98b0e2620bb3bf71e6e110a68c1a8ec5f38a07d847918a9cedae4a506b2028c03f6032794c3ddb3341385fd5d518bbd10a SHA512 051602ed7993dcf52e8ce87ea00caa88e35b46a46e84acfb38adefe49808976f179f6e4672196032caf4901acc59439abf07cfa97234dc4d4038e9cbff35c847
 EBUILD with-editor-3.0.2.ebuild 588 BLAKE2B d8fda53659a95060e2ed96307d5f2b9ef3381eda05551a3e99609d8262cef9f4b35142eec138b5b625cd6b993b8a365d9455371457a03ea7953152984639eadc SHA512 97a68fd31882bbbc112096d76ebcf6326af1984d3d31b538f66654e068d4eb53adc0ccffb03d03a614ac2956679010539b94e700992a358309c96f325af10541
-EBUILD with-editor-3.0.4.ebuild 588 BLAKE2B d8fda53659a95060e2ed96307d5f2b9ef3381eda05551a3e99609d8262cef9f4b35142eec138b5b625cd6b993b8a365d9455371457a03ea7953152984639eadc SHA512 97a68fd31882bbbc112096d76ebcf6326af1984d3d31b538f66654e068d4eb53adc0ccffb03d03a614ac2956679010539b94e700992a358309c96f325af10541
-EBUILD with-editor-3.0.5.ebuild 588 BLAKE2B 2acd9f9fc583d83cf38652366fe0a89e1297869147b3a24640f46aa0f7125161950d0323f8841389703c6ed352971cccd7413ca5ce01f3f7226a4afc26d05a5d SHA512 ff4fdc1231df2f9130b05f0bcb16212a43b0bcc4d3d583e3e369152386e5f75cc61d4792ee64e774ce426b2b5730bd40ff25cf1e6e7bec5f26f8966b3c4a7efc
+EBUILD with-editor-3.0.4.ebuild 586 BLAKE2B aa010d8f93a59b38d278dea5f59f0f70a803b797878b6782fa4eef65c1638e97ac440b4541122799b6d030d58f63dcf35d4369f797de1783366960605c841fb3 SHA512 6caefcde481318471d86054bcfe801e0fb1f43e187965439e6b59da33a0347e868c021e6e8a12a1a9bff85c23441d8d574e630260a3fac95877a117df4566341
+EBUILD with-editor-3.0.5.ebuild 595 BLAKE2B e4acfc2ce0fd662ddab5d6bcb649eb1643eaad4df058ab98ddbe35e69b5c60c563471b8dc43633ae710e1505a25625cf49ea70859e329cff53e777d8dac6a274 SHA512 ce0f8290672e4652f6224f8280f4ca6c84db3a0a225c7854247f6581753f68bd6c5427c41343d9e788f547392094a158bc35db699449d557d61c0ebb9adec44b
 MISC metadata.xml 708 BLAKE2B f2e619818ede95a7a0b17cc7f36f903f4210ddc634d4f0edf27886e8fbc4d084daa5ef67c8167ef2f39930141c8dbe1e98c4e5992b7af35234499fa73e9de4cc SHA512 bf422e1a42e025426795319834a7fa75252e8f2c42da1d82098e2def918ed9c4f827978753c86cc4e41cde581bcdc8eb2c9781d75849a80ab6f94f945b4cdea3
diff --git a/app-emacs/with-editor/with-editor-3.0.4.ebuild b/app-emacs/with-editor/with-editor-3.0.4.ebuild
index 5ac353224ec1..cd68d6d394da 100644
--- a/app-emacs/with-editor/with-editor-3.0.4.ebuild
+++ b/app-emacs/with-editor/with-editor-3.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
diff --git a/app-emacs/with-editor/with-editor-3.0.5.ebuild b/app-emacs/with-editor/with-editor-3.0.5.ebuild
index a778e115e55d..d949851a1994 100644
--- a/app-emacs/with-editor/with-editor-3.0.5.ebuild
+++ b/app-emacs/with-editor/with-editor-3.0.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index b37f91b55d8a..6e4eefa2eeec 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/bochs/Manifest b/app-emulation/bochs/Manifest
index dd0c78a8f2a0..63d82ccfd162 100644
--- a/app-emulation/bochs/Manifest
+++ b/app-emulation/bochs/Manifest
@@ -1,4 +1,6 @@
 DIST bochs-2.6.10.tar.gz 5282176 BLAKE2B 9f75d5afd6bad9f91eb18dc0bd5c9ed998bf12077d3e8d944769055f0def1eed019756346071d3809d492c54177ec798e739259ee13f67ff4760744377dc877c SHA512 eff422cadc3e0db7a47c4015a59ca0fa8caf88ed3026706c1f766e802449ec8e4798e5f147a583e1cfbbc578f71da8800542c0e1f4d04bc2dea77955855e8689
+DIST bochs-2.7.tar.gz 5298413 BLAKE2B 570ac0fec74b8e79a8e78d32a1a8655b8e3a202a3247407a45b66991598486bd6c566711a1f8e18e717d4f2119b82ae03bf4a792eebdd25a6e7ca4dedb3901ab SHA512 d43bd557316dc370ba1c317f5c3292f724460515db01316614b2d585b2760120cadd1d27a286083ac3e6f57466ed889959abd7fe960c219c149dab9a053c6967
 EBUILD bochs-2.6.10.ebuild 1785 BLAKE2B a19e6aa898f4aaea6ed3f4874a31e28f1e01c513409de2fe6d1fd00a2badb64dbb5d980d7127841c93789af72a28a18a011481afc34232d6cd166e5f162e207e SHA512 e6c2fddefdba565ec2686ad6503be3304463007a918f9693b30ed4883932b4662e951a3f11a5d2438abc0b862fea02126eaac1bb314f63f1ebf428ff41d33750
-EBUILD bochs-9999.ebuild 1839 BLAKE2B ef1221afa5924d0acbc0473d3d7cb41c8574f8c22783efffad4525da3bf516c537e1142cfad4cc6f01704430dc35fd3bf6916693a02ea588dd808b1da5550db3 SHA512 e2d8d015b657a336b6a77b6b37609ff7d99c119f9c6f3831b366b17e5356cceb7f3af30c5104f0ddc5b0b40ec980023ac1d2e1862ac77ef582b60f119257aaae
+EBUILD bochs-2.7.ebuild 1685 BLAKE2B 25647c7c79dae40aeac097e90912feed37f958f01f051282a8630f0c5e51e0879cc322204e6488a54351b189f6227dfaec963561ef90f30866faf0f701c9c7bd SHA512 5293f7a01a36ffeecdfeff31eca46f87249724080a40fbd0fdfe9e8d569c28e470486834a31c3cd3881b779227a586be0096682928bb387eac339a44ebd94ca4
+EBUILD bochs-9999.ebuild 1727 BLAKE2B bb1574d3d72fd95be53898a774af9c26d16818c9b391c3d7565fc96ac7abdc1d5aeeec44c7c36febbfe62f754409249201437ae37960d613c49246f466f85827 SHA512 ec789e02da4974935eca97873c1f07ff2d2cfb3edbbaeaf7d05f766d3664044f4f3421e26a230d681a099a455ffa990b3f387475f99f5ce3ece9dc213435b6cd
 MISC metadata.xml 695 BLAKE2B 1244650b8c78b9033f108a560b132ec94bbdeffe69b697ba3721b8ce1d0f403def90af2767fde56573e16d6b8ae5f3ec47745e207094d19bb02b7ca4ddf4204c SHA512 30ec8cb8083f493bd0d46cd5ceeba0a8f38c667026f3d6bea171ed350b7370fc080d5cadfa257d8ab47368a9e88849309451c24f461d8e46eab21901f9869fb4
diff --git a/app-emulation/bochs/bochs-2.7.ebuild b/app-emulation/bochs/bochs-2.7.ebuild
new file mode 100644
index 000000000000..0191aeeca226
--- /dev/null
+++ b/app-emulation/bochs/bochs-2.7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="LGPL-ed pc emulator"
+HOMEPAGE="http://bochs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bochs/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+IUSE="3dnow avx debugger doc gdb ncurses readline sdl +smp vnc X +x86-64"
+REQUIRED_USE="
+	avx? ( x86-64 )
+	gdb? ( !debugger !smp )
+	debugger? ( !gdb )
+"
+
+RDEPEND="
+	ncurses? ( sys-libs/ncurses:= )
+	readline? ( sys-libs/readline:= )
+	sdl? ( media-libs/libsdl )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXpm
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	>=app-text/opensp-1.5
+	doc? ( app-text/docbook-sgml-utils )
+"
+
+src_prepare() {
+	default
+
+	sed -i "s:^docdir.*:docdir = ${EPREFIX}/usr/share/doc/${PF}:" \
+		Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--enable-all-optimizations \
+		--enable-idle-hack \
+		--enable-cdrom \
+		--enable-clgd54xx \
+		--enable-cpu-level=6 \
+		--enable-e1000 \
+		--enable-gameport \
+		--enable-iodebug \
+		--enable-monitor-mwait \
+		--enable-ne2000 \
+		--enable-plugins \
+		--enable-pci \
+		--enable-pnic \
+		--enable-raw-serial \
+		--enable-sb16=linux \
+		--enable-usb \
+		--enable-usb-ohci \
+		--enable-usb-xhci \
+		--prefix=/usr \
+		--with-nogui \
+		--without-wx \
+		$(use_enable 3dnow) \
+		$(use_enable avx) \
+		$(use_enable debugger) \
+		$(use_enable doc docbook) \
+		$(use_enable gdb gdb-stub) \
+		$(use_enable readline) \
+		$(use_enable smp) \
+		$(use_enable x86-64) \
+		$(use_with ncurses term) \
+		$(use_with sdl) \
+		$(use_with vnc rfb) \
+		$(use_with X x) \
+		$(use_with X x11)
+}
diff --git a/app-emulation/bochs/bochs-9999.ebuild b/app-emulation/bochs/bochs-9999.ebuild
index fa7208ddc58f..2ddaf54249b1 100644
--- a/app-emulation/bochs/bochs-9999.ebuild
+++ b/app-emulation/bochs/bochs-9999.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
@@ -12,9 +12,8 @@ ESVN_REPO_URI="svn://svn.code.sf.net/p/bochs/code/trunk/bochs"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 
-IUSE="3dnow avx debugger doc gdb ncurses readline svga sdl +smp vnc X +x86-64"
+IUSE="3dnow avx debugger doc gdb ncurses readline sdl +smp vnc X +x86-64"
 REQUIRED_USE="
 	avx? ( x86-64 )
 	gdb? ( !debugger !smp )
@@ -22,26 +21,27 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	X? ( x11-libs/libICE
+	ncurses? ( sys-libs/ncurses:= )
+	readline? ( sys-libs/readline:= )
+	sdl? ( media-libs/libsdl )
+	X? (
+		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
-		x11-libs/libXpm )
-	sdl? ( media-libs/libsdl )
-	svga? ( media-libs/svgalib )
-	readline? ( sys-libs/readline:= )
-	ncurses? ( sys-libs/ncurses:= )
+		x11-libs/libXpm
+	)
 "
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )
 "
 BDEPEND="
-	doc? ( app-text/docbook-sgml-utils )
-	sys-apps/sed
 	>=app-text/opensp-1.5
+	doc? ( app-text/docbook-sgml-utils )
 "
 
 src_prepare() {
 	default
+
 	sed -i "s:^docdir.*:docdir = ${EPREFIX}/usr/share/doc/${PF}:" \
 		Makefile.in || die
 }
@@ -53,7 +53,6 @@ src_configure() {
 		--enable-cdrom \
 		--enable-clgd54xx \
 		--enable-cpu-level=6 \
-		--enable-disasm \
 		--enable-e1000 \
 		--enable-gameport \
 		--enable-iodebug \
@@ -80,9 +79,7 @@ src_configure() {
 		$(use_enable x86-64) \
 		$(use_with ncurses term) \
 		$(use_with sdl) \
-		$(use_with svga) \
 		$(use_with vnc rfb) \
 		$(use_with X x) \
-		$(use_with X x11) \
-		${myconf}
+		$(use_with X x11)
 }
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 8783e1d66f46..489340697151 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,3 +1,5 @@
 DIST buildah-1.21.1.tar.gz 11693142 BLAKE2B 513f75d8f2831130759f3bcb77fad311c28862b82df8866608bd909eea38468a6b576dfad2598725caa9c4e413108ea6ec3557c8a777017cc8a37b5cb16b70a1 SHA512 8fb30ed0948f898aef9a32c34d4b2a2e04a376257a73184ec01b67c770be1c3c87e46987ad001ececf2235cb5e17f9d0ff9e9f34be61ddd0935859c4e5b37d1f
+DIST buildah-1.23.1.tar.gz 11872323 BLAKE2B 6e4cffd11177bca6c3e86cd3372fc7bf295b23559b7478a679ea2bea022c149b5ea058224f0a156df1b9511905795c44ed5e988ec68ca834dd80d0c198543d5f SHA512 2ceb6df5adb671483557bb03937df583857d99c116be5d44aae533c155f560d5d454bebf25908ac02bb85e4c2ba31533adb99f0946ecc4f4830977c14f324b6f
 EBUILD buildah-1.21.1.ebuild 1178 BLAKE2B 5d575de7c96580e111a4cc573bfb0b3d26ad948454dda01670b9e0e950c58cd1008f2b0d713aed596a63883c2223d616261256cf800759038970760d358702aa SHA512 58d6aaf63951b161693d4b7d6b3fa21aa1acc07cd7731cc3d019538601a22beb73c96772c1ef81b79855cc57398699221c66b46337906bbe372aa49129977b13
+EBUILD buildah-1.23.1.ebuild 1178 BLAKE2B da43c390d10e7a6fee233df20e48b243d82d50ad0bd7108a6b88459d1ae36172b4f301031931fb53d212c4739fd265b5a4e2158413c6074a356e111e37df2ff2 SHA512 b436538344ad99c98650afab8b2aa533660e2d4f7978458ea9c6c176bfa696ffbd82e448fa78827355779bbebd43eb2f4e76fcb524821ecaa99c99156a9ddd46
 MISC metadata.xml 328 BLAKE2B 55d2d2b5cc972b7e6b6fb77d14e79e304adcbc7056ff351f5ee3cac6cf5f83b4ef2a10c70754d1d30a5ecd88e652abc07cddd8005c3767e7f709c0c5cb61d068 SHA512 7520f5745909da195d4bfdd750e4c716c461a3789adfde56dd9be46b91dfb789653d642c0958b5a2950eea220cc00143bfcd5db402fcc2578c8fe5f8ff69275f
diff --git a/app-emulation/buildah/buildah-1.23.1.ebuild b/app-emulation/buildah/buildah-1.23.1.ebuild
new file mode 100644
index 000000000000..d801bf33465c
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.23.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+GIT_COMMIT=d9a41b85
+
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="selinux"
+
+RDEPEND="app-crypt/gpgme:=
+	app-emulation/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+	sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed'
+}
+
+src_compile() {
+	emake GIT_COMMIT=${GIT_COMMIT} all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin bin/{${PN},imgtype}
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	emake test-unit
+}
diff --git a/app-emulation/conmon/Manifest b/app-emulation/conmon/Manifest
index 00f5974480c6..35a093b7ac3b 100644
--- a/app-emulation/conmon/Manifest
+++ b/app-emulation/conmon/Manifest
@@ -1,9 +1,9 @@
-DIST conmon-2.0.22.tar.gz 103371 BLAKE2B f509ba800c847886ec2350e141d2b965ff1cc09822467718fb0d94acdabdc86c6f40dff9428679e4c4171ac6a522b3ba7622d66ebd8108be1a68cbf7418d5c09 SHA512 819e1d9279c1a22388220d710b975cdeb3c0b56413afb177afe1c96b649e2dce496d5f51fe4094f572111f771102ccd0ae86f1776e99fedb2e76e6e9130c2d5c
 DIST conmon-2.0.26.tar.gz 104681 BLAKE2B fc8369258a414d3a169b64019199c604d1d8bded70d5a38230f243053dcf09c6f9aee931b328913e6cbbe3c495aab4894647897f40f537a79eb587ecee58517a SHA512 5cbb66053fb48b514f93b3be4d4ac428f9eea8a3e1452b4df232250e9cd01202ecb7477c05e1e4dfb21595f2d1881be35cdea9b23f43c02bb7c0e67a3161396e
 DIST conmon-2.0.27.tar.gz 106647 BLAKE2B f242b1be4f86b18ca94dade3d1f5522d1ae1951f4b7abf7e563e1a93472c2a673cd48a136fdff12b410ebaa46694b70ffbf173fc37a3bbefb03891452c22dfae SHA512 2bc389fa3963cbb612669ec1d288adc888d7ac1de2b9bf483f18e0f62220775327ebcb771bfa7236815ef7247adb8fc6b8ae38748f7a383ec9590e3ee5769b65
 DIST conmon-2.0.29.tar.gz 160628 BLAKE2B 9cff934a6774ea51476624b9c56bc0dc71eeb9383d48fbb3d6b04ad7be462e8cb792e72cf9d98f9ca54eff274f1a3c2bbad3f8d8cf53fe0d2e259e4f6d93ed7e SHA512 0eec0322ee209efacae93b6e96c3bea2468a309d6211c8c047b49fa3bd8b5d1a198a16b3ff1ffe629dc37a12e2e0db1979e8876833c5cef0f69be35d4be8b550
-EBUILD conmon-2.0.22.ebuild 1184 BLAKE2B 75c40011ce14d692ab11310ba9e32a9bece265c4f636680bec93186fc9d751e916ef2ad4b9e6cf9f7ebcb6a6d38ff7d37f6f7ba68a50a73cc17564ad1b9a6b73 SHA512 22244dd45ac55b9231b685f0fdd7dcb62d9f4f08f7aea114cc2eb161e3911435f7042d47a7464130d240fe065871694c46f6caace4b6876dd3598dafbe154d6a
+DIST conmon-2.0.30.tar.gz 161285 BLAKE2B c4e01759d819d3dff94b9ae09caa72b6f664e49d907d3a1be9fb4a0e1f782fad29a7cd7c89703e861f4aa6d7955996386f81460f19f22be2889c4f88c34536cb SHA512 2451e441913925f8423385b83e97630e980948a9bd57ae8800889016c4412a26bed598825d3c034c3edcecbab66c38417f55ad3866d3c2c98cada6acce2b2d16
 EBUILD conmon-2.0.26.ebuild 1184 BLAKE2B efa932a65151a81d7163adce779affaa458f61a7afee968352af3703189660c5051d3de0b09dc17e1a26057e63a8f5e7b54503fb8b3d103650fdcab60e6a8b43 SHA512 91eb9099ee247b638a8cc5d256278e4dc23c7e40b3053e91d7b724f1ab6658f690e5e8cda79b0176a976319fbe1006ac095b81bec3f1a0646a5c22f20aeb8061
 EBUILD conmon-2.0.27.ebuild 1083 BLAKE2B 03930066ab4151282bffff47f34b101a74c2dcc2d011ab38b5f118393276af122c23f2e2de36bd9f118187f8a422f3036177bf2a00d943e72eb47af978149247 SHA512 eb742663c9816978588143346822c0803e386d3cd72a2fbe15908d1ac98afaab2b8a861eb7e01d802cb1d604348c3ba01eb905cd64d878fd541b19b757b5904c
 EBUILD conmon-2.0.29.ebuild 1083 BLAKE2B 03930066ab4151282bffff47f34b101a74c2dcc2d011ab38b5f118393276af122c23f2e2de36bd9f118187f8a422f3036177bf2a00d943e72eb47af978149247 SHA512 eb742663c9816978588143346822c0803e386d3cd72a2fbe15908d1ac98afaab2b8a861eb7e01d802cb1d604348c3ba01eb905cd64d878fd541b19b757b5904c
+EBUILD conmon-2.0.30.ebuild 1083 BLAKE2B 03930066ab4151282bffff47f34b101a74c2dcc2d011ab38b5f118393276af122c23f2e2de36bd9f118187f8a422f3036177bf2a00d943e72eb47af978149247 SHA512 eb742663c9816978588143346822c0803e386d3cd72a2fbe15908d1ac98afaab2b8a861eb7e01d802cb1d604348c3ba01eb905cd64d878fd541b19b757b5904c
 MISC metadata.xml 327 BLAKE2B f45e25a9bbdbdaf8142c7919e209ed153b819e5222f957600260362211946936c5cefc4f575a84930cad94d8e693efcb40e948c0f976e504a038c99b047be34b SHA512 55a208c97c7671ec03ac0a0b46ccbe70d21e336fe5e1cdc92eb987c9f499453a5f94927b7e3f397651477cf744613d39407d8d5fe1c8e730507077a3c5117b06
diff --git a/app-emulation/conmon/conmon-2.0.22.ebuild b/app-emulation/conmon/conmon-2.0.22.ebuild
deleted file mode 100644
index 22d66f80a279..000000000000
--- a/app-emulation/conmon/conmon-2.0.22.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-EGIT_COMMIT="9c34a8663b85e479e0c083801e89a2b2835228ed"
-DESCRIPTION="An OCI container runtime monitor"
-HOMEPAGE="https://github.com/containers/conmon"
-SRC_URI="https://github.com/containers/conmon/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="systemd"
-RESTRICT="test"
-
-RDEPEND="dev-libs/glib:=
-	systemd? ( sys-apps/systemd:= )"
-DEPEND="${RDEPEND}
-	dev-go/go-md2man"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-src_prepare() {
-	default
-
-	if ! use systemd; then
-		sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \
-			-e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
-			-i Makefile || die
-	fi
-	sed -e 's|make -C tools|$(MAKE) -C tools|' -i Makefile || die
-	sed -e 's|^GOMD2MAN = .*|GOMD2MAN = go-md2man|' -i docs/Makefile || die
-}
-
-src_compile() {
-	tc-export CC
-	emake GIT_COMMIT="${EGIT_COMMIT}" \
-		all
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		PREFIX="/usr" \
-		install
-	dodir /usr/libexec/podman
-	ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
-	dodoc README.md
-}
diff --git a/app-emulation/conmon/conmon-2.0.30.ebuild b/app-emulation/conmon/conmon-2.0.30.ebuild
new file mode 100644
index 000000000000..0a7306d1c2d7
--- /dev/null
+++ b/app-emulation/conmon/conmon-2.0.30.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An OCI container runtime monitor"
+HOMEPAGE="https://github.com/containers/conmon"
+SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="systemd"
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:=
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}
+	dev-go/go-md2man"
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \
+			-e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
+			-i Makefile || die
+	fi
+	sed -e 's|make -C tools|$(MAKE) -C tools|' -i Makefile || die
+	sed -e 's|^GOMD2MAN = .*|GOMD2MAN = go-md2man|' -i docs/Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake GIT_COMMIT="v${PV}" \
+		all
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PREFIX="/usr" \
+		install
+	dodir /usr/libexec/podman
+	ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
+	dodoc README.md
+}
diff --git a/app-emulation/fs-uae-launcher/Manifest b/app-emulation/fs-uae-launcher/Manifest
index b39c6fff02cb..eb515f7707a2 100644
--- a/app-emulation/fs-uae-launcher/Manifest
+++ b/app-emulation/fs-uae-launcher/Manifest
@@ -1,4 +1,6 @@
 AUX fs-uae-launcher-3.0.0-ROMs.patch 626 BLAKE2B 2662476f496345e6dc2f169b8c3e6e579ba68c3c7c1d9c782ce2dff39394520bde6dc1a52d9d43f562bddec9dc28daa3d0e7e1e93f1da48a0a932e1415ad40ea SHA512 8b607f64cd1c66601f7fccf5332377a85e905a6d9ba9fadb9a7234d5f36c350590011141602e093ee7a30dce4c9c6c0e9928b8b7a0be716eeaa15aeff1eacce0
 DIST fs-uae-launcher-3.0.5.tar.gz 9633819 BLAKE2B 8ce627302244bbd7d174f28c0dad345699942429c1109a7408c88412f6bb0e3e5d765e6c51abf2b95837a83261023b4f9c58d65892e58043889be8dc5e4cb759 SHA512 1a6700c56a14edce86ffbefee7494117af067da8b1dbc22937a36641ccb90927a3bbb011d15a891388bf08378aa623e00a2d45dbc49e822a5a569e110843add5
-EBUILD fs-uae-launcher-3.0.5.ebuild 2055 BLAKE2B d6bf506e21a0e22afa5517fef2d6af211c283c9cebbba267d2d4567a1b3ea0a899e1d0ffe6b482191efb032c9b960b18e661dce94a226ad219e2bbcbf22432e5 SHA512 ae1c722b35a0f4be42010a8bb09ae19d692a490106752c8ac8450ec3c2f8c8ddaacc5a5d3cd97036f84627539d14af50b02f0e3f6f0999310475081fc0c8abda
+DIST fs-uae-launcher-3.1.26.tar.gz 9656516 BLAKE2B 1b8d12ef91631dedf412976e81529ac7138b7f688ad6ae1ad55bfd3625590ee00aab89d229d2aa64eec577d291a6e634362c557428534c355fdb39e878f40253 SHA512 0e4e542bebfe2d8f862005c016fe70319dd6c5e1e413be9b0ce0421bb95253ba6eb92337989cc86210094b9b02a6ad86da4725f1a65d50673703fa6c6cb58f37
+EBUILD fs-uae-launcher-3.0.5.ebuild 2110 BLAKE2B d98ab94ef09957a0ab7b47787ab18eb0a9f2b6b363ad6f198654f37d31d795cac0acd3c4047361c66780f5b5e117ec02207177630a8a31cd45a54218d0151dbe SHA512 b1ce4eef78b6a2bf801e929c52a851cf46fd150f6712afd0fb4232c3d5739f63ae854fc5b76b6cee62f40a8853db347c2105b0861f9cb0bacc2a4c5440fe10d8
+EBUILD fs-uae-launcher-3.1.26.ebuild 2179 BLAKE2B 3b4e378a51a843e5e4236795a0da4b06382c80ea976f3e081d03207eecdcf1eebcc973c39be8447a9da56779c1243a564d7f9edfa27223341671a46bf8dacfb8 SHA512 2b7dc91feca4b751ec78d28155ce9d36d7e22889e3553f6e6131d2d161c4417c3803877958e66a5e7180970a340c776986f216334fc61dd94a93ccb61b633082
 MISC metadata.xml 409 BLAKE2B 0e27dad4e68facd0066f0f7d02e859eef7147a16cffa734b74efce77eea44ed333052e3a2a9956c052d9c7e8459b50893b0af78eb2061d1c0a1eaf32597ee1d0 SHA512 a4cf13ffb131f6049cdbd83c16ee1114651450d874dca73f68dfa19686ab09021277e860068a4ed6e8318d9bb1b750f861cb2a693945bcd8d0d4eece7f576e94
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild
index 915e269763e7..8c176e122d91 100644
--- a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="lha"
+RESTRICT="test" # The test files are just boilerplate.
 
 RDEPEND="
 	app-emulation/fs-uae
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.26.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.26.ebuild
new file mode 100644
index 000000000000..8bee34a33844
--- /dev/null
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.26.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="PyQt5-based launcher for FS-UAE"
+HOMEPAGE="https://fs-uae.net/"
+SRC_URI="https://github.com/FrodeSolheim/fs-uae-launcher/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="lha"
+RESTRICT="test" # The test files are just boilerplate.
+
+RDEPEND="
+	app-emulation/fs-uae
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_USEDEP},declarative,gui,network,opengl,widgets]
+		dev-python/pyopengl[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		lha? ( dev-python/python-lhafile[${PYTHON_USEDEP}] )
+	')
+"
+
+BDEPEND="
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-ROMs.patch
+)
+
+src_prepare() {
+	default
+	python bootstrap
+
+	# Unbundle OpenGL library. Keep oyoyo IRC library because upstream
+	# is long dead and it's not worth packaging separately.
+	rm -r OpenGL/ || die
+	sed -i -r "/OpenGL/d" setup.py || die
+}
+
+python_compile_all() {
+	emake
+}
+
+python_install() {
+	local dir=${EPREFIX}/usr/share/${PN}
+	distutils-r1_python_install --install-lib="${dir}" --install-scripts="${dir}"
+}
+
+python_install_all() {
+	dosym ../share/${PN}/${PN} /usr/bin/${PN}
+	emake install-data DESTDIR="${D}" prefix="${EPREFIX}"/usr
+	mv "${ED}"/usr/share/doc/{${PN},${PF}} || die
+}
+
+pkg_postinst() {
+	elog "Some important information:"
+	elog
+	ewarn " - Do not use QtCurve, it will crash PyQt5!"
+	elog
+	elog " - By default, FS-UAE creates its directories under Documents/FS-UAE."
+	elog "   If your Documents directory is not configured according to the XDG"
+	elog "   user diretory spec, ~/FS-UAE will be used as a fallback."
+	elog
+	elog " - You can override this by putting the path to the desired base"
+	elog "   directory in a special config file. The config file will be read"
+	elog "   from ~/.config/fs-uae/base-dir by both FS-UAE and FS-UAE Launcher"
+	elog "   if it exists."
+	elog
+	elog "   Alternatively, you can start FS-UAE and/or FS-UAE Launcher with"
+	elog "   --base-dir=/path/to/desired/dir"
+}
diff --git a/app-emulation/fs-uae/Manifest b/app-emulation/fs-uae/Manifest
index 5d7064dce50a..a4db69689903 100644
--- a/app-emulation/fs-uae/Manifest
+++ b/app-emulation/fs-uae/Manifest
@@ -1,5 +1,9 @@
 AUX fs-uae-3.0.0-Xatom.h.patch 669 BLAKE2B 3463b8f19551b8ea3d634bc75f9de2fb77685af9c24e1fba555991d1d094f4d75be048e4d9a7852bfd8882b1e9826f174550bc3953e3ec636193aaa647462d12 SHA512 af86c772049d8ff5eef36c8988888891ea60a68e929d752c8f1c9e325af584175f14496a2099654381bb33a3adecb913991e129fee05524ecad4a166228dbd68
 AUX fs-uae-3.0.0-libmpeg2.patch 1078 BLAKE2B 119d797854beb0148af9a77003b7b06696d9a474645ff15181044dcffd783a91f89a66cf90b072603c4f324b95a4a0cf124abefc6adc71b9be4b8a92f36060ac SHA512 8624c3404b627321a2b6673271be27daa24924a8c56903c870fd5a6f2dc50c18fd97810a1aab3cd684a5a97544c1e64f68c855c822d3e5bb5981faf264d28ae7
+AUX fs-uae-3.1.35-ar.patch 609 BLAKE2B 3e31b1cd19aaa88f73cb806d91b8187d7cf23338caec519afe29553fabcc7884fcc1c95a87731f1459b6e64c8eacfda060aec221a0342f4b5983fa80cc623b61 SHA512 0d808e8f6782ce4f9653ab3a100483a6f3e5d9104f8b0afc67ea7010beae7ebf4d1fb44a9a97bf21c119547d7fa2730a046f6e64cf24606f1e78c8a8ca0ad617
+AUX fs-uae-3.1.35-deepbind.patch 1150 BLAKE2B 2b75ae7e8ad353af78d02afec6e2c27f4bf442d201bd67ff9548e2c26d5ac2d15199ff1f649c0e1e6ed662e433bd103420f737d0a50db030bccc6eb687905fa6 SHA512 a645a05f16a9825d9f3f2ff798f0982687b8cae4accad1685e047e98648680e7b785d9efe0676c68ed9caf57ea39d08a70c60c3dc810117db714b800ef67a9a0
 DIST fs-uae-3.0.5.tar.gz 4819884 BLAKE2B 0a82e0635ed02c1b4f04610555370c80ea12a870a73fd00cc98adefcefada2deed293c437202af34fc98e2f695fe1b08df918eca71b504e5b94e5ab3a099d9ed SHA512 b34ffb818040c7bf67022f26e1dbc9ebf06742a354212f2b0d2aa6b8e04c60807893a16ff965c819395f4c3fb3c43c35b38dce848b86fa046a211e12414385c7
+DIST fs-uae-3.1.35.tar.gz 4817547 BLAKE2B 5f75a1e262ba8d642401a03ac5b2494be37b8bab8f014a48208cc6e0b2e33373a7ce6146065f41404d8fcbd60fe71582319abe51521336c2d7c04668c3adacd9 SHA512 96bec936f867fc42eb9f61058887c027da0bab1c8df196ab62a714b1f28c92aafe6c4a61d441e5c7b5d8aee28c90d68812d0f6049c610e2ef9eebdd7e3edf013
 EBUILD fs-uae-3.0.5.ebuild 2441 BLAKE2B dc324751f374098920fe05b64d3e784cda02ed8566772edffad946d20cf414c0396e5c438a5df92d9161982c77881520d2cac648d0168f1df25cc1260740cc7d SHA512 19ed36eb650ae6945c92b8a3e12d01333cdc59f39a77e80521d57c2e301d5832b7120f0ce34e049fb0e49d141af3b8a1a1ebd0acf5bda56c0d7d5de5313c7202
+EBUILD fs-uae-3.1.35.ebuild 2398 BLAKE2B ba24af3c9c413c7f1a0f3eea73964f601528e52974d9c734b95744ae55de5b2a526c1f62380e5e944b46a0ea655d9c6d723ca89682770e294b71c16087be9fb7 SHA512 5689de1dce62b37beeaefd751068e3fc68eaba19a228147076d8ac23278b9e62972e9dfeca94bb1059cb24d129c3414490bd789582692dac434d961375b5a6f9
 MISC metadata.xml 534 BLAKE2B 06da96462379543ad704ca1227e546f26e5578f1f62b14debe6297a659e250708b1c6b60d4e60805142f76b12b0c31812060af661f2166749aac811b82edc695 SHA512 2366d8d0d180a639d65aa1e7092cc9669f6d2ae07b3ce3ed6386e15795f141067ec93014f87bb6b0c57c51dfbb4c33ae5886f541a0634432c53a5541eb68f229
diff --git a/app-emulation/fs-uae/files/fs-uae-3.1.35-ar.patch b/app-emulation/fs-uae/files/fs-uae-3.1.35-ar.patch
new file mode 100644
index 000000000000..9075723da74c
--- /dev/null
+++ b/app-emulation/fs-uae/files/fs-uae-3.1.35-ar.patch
@@ -0,0 +1,25 @@
+From 4e6295094978817ba02e16ac5404ac9c9e287c82 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 17 Oct 2021 09:54:24 +0100
+Subject: [PATCH] Have configure respect the AR variable instead of setting it
+ to "ar"
+
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index bb2c69de..6e41d68e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -66,6 +66,7 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AM_PROG_CC_C_O
+ # AC_PATH_TOOL(OBJCOPY, objcopy)
+ AC_PATH_PROG([MSGFMT], [msgfmt], [not found])
+-- 
+2.32.0
+
diff --git a/app-emulation/fs-uae/files/fs-uae-3.1.35-deepbind.patch b/app-emulation/fs-uae/files/fs-uae-3.1.35-deepbind.patch
new file mode 100644
index 000000000000..0a60301772f1
--- /dev/null
+++ b/app-emulation/fs-uae/files/fs-uae-3.1.35-deepbind.patch
@@ -0,0 +1,43 @@
+From c5b02df4598c5fbe7a034b67ee06c506abeb3828 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Mon, 18 Oct 2021 10:22:09 +0100
+Subject: [PATCH] Don't assume RTLD_DEEPBIND is always present on Linux
+
+It's not supported by musl.
+---
+ configure.ac   | 5 +++++
+ src/dlopen.cpp | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6e41d68e..2cac2dac 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -655,6 +655,11 @@ AC_CHECK_FUNCS([gettimeofday])
+ AC_CHECK_DECLS([CLOCK_MONOTONIC], [], [], [#include <time.h>])
+ 
+ 
++# RTLD_DEEPBIND is not supported by all C libraries.
++
++AC_CHECK_DECLS([RTLD_DEEPBIND], [], [], [#include <dlfcn.h>])
++
++
+ # Check for POSIX support.
+ 
+ AS_CASE([$host_os],
+diff --git a/src/dlopen.cpp b/src/dlopen.cpp
+index f79c401b..14edbc02 100644
+--- a/src/dlopen.cpp
++++ b/src/dlopen.cpp
+@@ -22,7 +22,7 @@ UAE_DLHANDLE uae_dlopen(const TCHAR *path)
+ 	}
+ #ifdef _WIN32
+ 	result = LoadLibrary(path);
+-#elif defined(LINUX)
++#elif HAVE_DECL_RTLD_DEEPBIND == 1
+ 	result = dlopen(path, RTLD_NOW | RTLD_DEEPBIND);
+ #else
+ 	result = dlopen(path, RTLD_NOW);
+-- 
+2.32.0
+
diff --git a/app-emulation/fs-uae/fs-uae-3.1.35.ebuild b/app-emulation/fs-uae/fs-uae-3.1.35.ebuild
new file mode 100644
index 000000000000..be1afebd83dd
--- /dev/null
+++ b/app-emulation/fs-uae/fs-uae-3.1.35.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg
+
+DESCRIPTION="Integrates the most accurate Amiga emulation code available from WinUAE"
+HOMEPAGE="https://fs-uae.net/"
+SRC_URI="https://fs-uae.net/stable/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="fmv glew"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/libpng:0=
+	media-libs/libsdl2[opengl,X]
+	media-libs/openal
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libdrm
+	x11-libs/libX11
+	fmv? ( media-libs/libmpeg2 )
+	glew? ( media-libs/glew:0= )
+"
+
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+BDEPEND="
+	app-arch/zip
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-libmpeg2.patch
+	"${FILESDIR}"/${PN}-3.0.0-Xatom.h.patch
+	"${FILESDIR}"/${PN}-3.1.35-ar.patch
+	"${FILESDIR}"/${PN}-3.1.35-deepbind.patch
+)
+
+src_prepare() {
+	default
+	AT_NO_RECURSIVE=1 eautoreconf
+
+	# Ensure bundled libraries are not used. Udis86 is unused
+	# regardless. Only FLAC headers are bundled and the library is never
+	# used? Lua is bundled but differs from upstream. We keep the
+	# default of disabling the Lua feature anyway as it is unfinished.
+	rm -r libmpeg2/ libudis86/ || die
+}
+
+src_configure() {
+	# Qt and Udis86 are unused.
+	econf \
+		--enable-a2065 \
+		--enable-action-replay \
+		--enable-aga \
+		--enable-arcadia \
+		--enable-bsdsocket \
+		--enable-caps \
+		--enable-cd32 \
+		--enable-cdtv \
+		--enable-codegen \
+		--enable-dms \
+		--enable-drivesound \
+		--enable-fdi2raw \
+		--enable-gfxboard \
+		--enable-jit \
+		--enable-jit-fpu \
+		--disable-lua \
+		--enable-netplay \
+		--enable-ncr \
+		--enable-ncr9x \
+		--enable-parallel-port \
+		--enable-prowizard \
+		--enable-savestate \
+		--enable-scp \
+		--enable-serial-port \
+		--enable-slirp \
+		--enable-softfloat \
+		--enable-qemu-cpu \
+		--enable-qemu-slirp \
+		--enable-uaenative \
+		--enable-uaenet \
+		--enable-uaescsi \
+		--enable-uaeserial \
+		--disable-udis86 \
+		--enable-vpar \
+		--enable-xml-shader \
+		--enable-zip \
+		--without-cef \
+		--with-glad \
+		--without-qt \
+		$(use_with fmv libmpeg2) \
+		$(use_with glew)
+}
+
+src_install() {
+	default
+
+	# Needed for QEMU-UAE.
+	insinto /usr/include/uae
+	doins src/include/uae/{api,attributes,log,ppc,qemu,types}.h
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "Install app-emulation/fs-uae-launcher for a better graphical interface."
+}
diff --git a/app-emulation/grub-xen-host/Manifest b/app-emulation/grub-xen-host/Manifest
index a1363b0097e0..dfe92eda0d98 100644
--- a/app-emulation/grub-xen-host/Manifest
+++ b/app-emulation/grub-xen-host/Manifest
@@ -1,2 +1,3 @@
+EBUILD grub-xen-host-1.0-r1.ebuild 2054 BLAKE2B e9e3dec0b91d9e60395bf772486e725ae18e32981a38279e3255dad19c0860f6323ca006243be22ca3dba07a797983ffe60b50ca01a22f96ca6302f5ab719507 SHA512 d8b5bbbfe0e95afa3c44b8e3b8f323e5bb2f49ec86b32c81d0e6021feef7c959dbcda83e8d43f7e79353bd6fc406b624c52215a745eb551ebf7c808cf05e3a2e
 EBUILD grub-xen-host-1.0.ebuild 1682 BLAKE2B 3d718f06ccef3a0fc4d3d39d64e8fb39af24f558793e4f7c96ec616585cf95371091737287bbc282476c1a649bd390e0a4eda0da168c8c40b5c9294e24eded8f SHA512 08e24d2b9b0c45af8cc757fe8c7dd29d5e69803b953897c2e552053f09358a8ae1a328402f148337ba738476c14e1c6db4fa4f37d68d04a4c65b7cdc208bb83c
-MISC metadata.xml 437 BLAKE2B 632a6d7b1d99a24f04d533cd82c0c95bc851b912865f3d12f6dd1b187abbd76070657c1b93e3046f20ba32a42d51c25716843635414e651223621dafefda2d46 SHA512 dbca261ad36e310a76bc56464c25142647625f6696d987ab3af5dc834a0da6e189f6bfa133713137fb8481ef429f074b574bfebe7c12ee93e2b898c4c116a17c
+MISC metadata.xml 516 BLAKE2B f9183f3e1f7b6de089e478a77b9ff6282cdffc9cad59ed045488025ea05a12997ac18506f089396e99320d98159d8c1631d5ee8a81debc0647b24b66f253e9d3 SHA512 495b6a380e366760ce97f8d865c2ae118ed6a7c189983d871c6517b08e1a86e8d6a47fb43b85c2f175a10a234e1895fbabc98c4806eb79aade14955841a90813
diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
new file mode 100644
index 000000000000..288e12680781
--- /dev/null
+++ b/app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Grub2 built as a PV grub per the Xen PV Boot Protocol"
+HOMEPAGE="https://blog.xenproject.org/2015/01/07/using-grub-2-as-a-bootloader-for-xen-pv-guests/"
+SRC_URI=""
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pvh"
+
+DEPEND="sys-boot/grub:2=[grub_platforms_xen]
+	pvh? ( >=sys-boot/grub-2.04:2=[grub_platforms_xen-pvh] )
+	app-emulation/xen-tools:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+RESTRICT="binchecks strip test"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	cat > "${S}/grub-bootstrap.cfg" <<- EOF || die
+		normal (memdisk)/grub.cfg
+	EOF
+
+	cat > "${S}/grub.cfg" <<- EOF || die
+		if search -s -f /boot/xen/pvboot-x86_64.elf ; then
+			echo "Chainloading (${root})/boot/xen/pvboot-x86_64.elf"
+			multiboot "/boot/xen/pvboot-x86_64.elf"
+			boot
+		fi
+
+		if search -s -f /xen/pvboot-x86_64.elf ; then
+			echo "Chainloading (${root})/xen/pvboot-x86_64.elf"
+			multiboot "/xen/pvboot-x86_64.elf"
+			boot
+		fi
+
+		if search -s -f /boot/grub/grub.cfg ; then
+			echo "Reading (${root})/boot/grub/grub.cfg"
+			configfile /boot/grub/grub.cfg
+		fi
+
+		if search -s -f /grub/grub.cfg ; then
+			echo "Reading (${root})/grub/grub.cfg"
+			configfile /grub/grub.cfg
+		fi
+	EOF
+
+	tar cf memdisk.tar grub.cfg || die "failed to tar"
+
+	local grub_mkimage=grub-mkimage
+	if type grub2-mkimage &> /dev/null; then
+		grub_mkimage=grub2-mkimage
+	fi
+
+	local args=(
+		"${grub_mkimage}"
+		-O x86_64-xen
+		-c grub-bootstrap.cfg
+		-m memdisk.tar
+		-o grub-x86_64-xen.bin
+		/usr/lib/grub/x86_64-xen/*.mod
+	)
+
+	echo "${args[@]}"
+	"${args[@]}" || die "failed to grub-mkimage"
+
+	if use pvh; then
+		local args=(
+			"${grub_mkimage}"
+			-O i386-xen_pvh
+			-c grub-bootstrap.cfg
+			-m memdisk.tar
+			-o grub-i386-xen_pvh.bin
+			/usr/lib/grub/i386-xen_pvh/*.mod
+		)
+
+		echo "${args[@]}"
+		"${args[@]}" || die "failed to grub-mkimage"
+	fi
+
+}
+
+src_install() {
+	exeinto /usr/libexec/xen/bin
+	doexe grub-x86_64-xen.bin
+	if use pvh; then
+		doexe grub-i386-xen_pvh.bin
+	fi
+}
diff --git a/app-emulation/grub-xen-host/metadata.xml b/app-emulation/grub-xen-host/metadata.xml
index 212093a6f10e..485b9cd416b6 100644
--- a/app-emulation/grub-xen-host/metadata.xml
+++ b/app-emulation/grub-xen-host/metadata.xml
@@ -9,4 +9,7 @@
 		a guest installed PV grub (grub legacy or grub 2) or handle a guest
 		supplied grub 2 config file.
 	</longdescription>
+	<use>
+		<flag name="pvh">Build an additional grub bin for pvh.</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index f558a1ad0725..ff4b3f77e3ec 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -26,12 +26,15 @@ DIST libvirt-7.5.0.tar.xz 8642788 BLAKE2B 467dbd2a337beee5d9f10de7bc37ca988e85fa
 DIST libvirt-7.5.0.tar.xz.asc 833 BLAKE2B ab9ba2a02e4af90002fffbcd0bc04f9faa1d5a23ab815d6b9b6ef1410d9d114fc07c1b29850b59d1ab4ea3a186f4b7d65f5a5ca37d65f3034146617445849dcb SHA512 ebcc1fcce10e19e0a4ae43fbf9bfd5b1b7732829eeb3543c84ba24e0a5d9872be692e7b6c105cdcd730d1c26b895b306387ab380623acf6bba242bd2c62ec7b2
 DIST libvirt-7.7.0.tar.xz 8670212 BLAKE2B 93c72117941b0a74484c7510c8437054e66fc3ad20c02cead3ce917a38868da2acff9b1e70bbb823122ba647763a3682aaa0da04d82fa75e1acc67449301ae8c SHA512 a0d585c9ac46be08d2865d66456d681b7233291d17f6e0ed2564d0f29dc38ea7afc846ab382f58a193d3cd9acaf25fcc526feb3c98e12a6b4b8ae5aa4aec2f3e
 DIST libvirt-7.7.0.tar.xz.asc 833 BLAKE2B 86a77bf461e353776d79f31f1d0c82fa13e28348bd9c6ae7cb653b98886c7e070d67ed0db55f5e1f3b5e5bd2a3861a5cb08dbf95799b14df1037139f8001b030 SHA512 d5f8cd6accd3bfaebfb7c8761e321aaa9a090c7705256785c5507aa88d985f78a788047dc881f37ea6f64a4634c65c9718d8b1ee0a24744acc3ad5ed6e517bdf
+DIST libvirt-7.8.0.tar.xz 8735184 BLAKE2B 44ad9465a0bcb683777677de87e422741fe88d604297297f859ba94378b91b80855b9d4cd91de60a1c140c6dc2b4cb61020296933f68526605945e8accfadbcb SHA512 0fe31b70178d662a5c8019ef424568b95d9d4c2eb74113c1b697ccf4eef1e110c3095e19835cef2c9459a694a5f4785b0761c19ec78062af88c39651291fa040
+DIST libvirt-7.8.0.tar.xz.asc 833 BLAKE2B 10d315ec715a9ede62103276631ca4ac95feb543faea984e108f4d74857dbc3929d799a7b28d1816a3a6736fa388489a0c44ec01c6eef27528a94f997e8b2d65 SHA512 283c486ca9a56442f9aaead20e71e496a169f902ea33ad7ffe2a830630a50b4314abdd477727c502d3c273506f2a0014079420079907b568da449aaf546f3b60
 EBUILD libvirt-7.0.0-r3.ebuild 8827 BLAKE2B eed8aa4baf06ba16aaed2cf6fab85b003627a32c7279ebf2011a6c42da9f802e0d9db0fb19c0f38c49390574371f0b07ca10efbd4fc57f00ce56c24af4db64f0 SHA512 06fcd3e2a54acb7fc4963ad62cb82f8d30e671755cb1a3b4826161f7a528b60fb1472d0b96c0f8025619398842ac2e108d40cd9aef7ed8d0b7c3bb6052f8d489
 EBUILD libvirt-7.1.0-r1.ebuild 8518 BLAKE2B 25d37b8130237c1ce2f5c00f577196f361ffc23a33b1deccf13aea69320295eb08dac16bd4cfcddfa1274916a353a90befd7208dadeb3738ea305a3e4bba2d84 SHA512 701762b4a87afa9b4cf0eb9c2efc23d8fc3bce9cea11a1e9af2c9492b68a7ebb2f8feeb9ccf4229c1e8f77e4fa0e70a10e47ca17dfe906f25e9d50b06598bb4b
 EBUILD libvirt-7.2.0-r1.ebuild 8324 BLAKE2B d784f644bc4b404c2e53619d5edbef7c23dc9f05d48c1d487f7848c31d65f98a80b8a42f6c79f014c84b0206ea931fbd5473234ada7ea8c53978f94e7daba611 SHA512 dfd57fee30b103081ab144ba2aa97b491c4f9c708f31f7cfc1c1590a269d4767299f29537b11701e45b6ffb75380405969f11c1fa6cf1ece45e71631a8564341
 EBUILD libvirt-7.3.0.ebuild 8219 BLAKE2B 591ed0d35275dfd78196dd5edfb05026d6c8c40a075f57b925a57d0a731a9abb0fdb327df4b55583f1583a4887a3a672bfeccc2e052a9175016946d042a61fd8 SHA512 f9fe11aabda9c857dca633e1d3feb54e722ae22ffce052b950e05d9963c114f1aff2e9eec2721ae138adc4674d78191c77f2caaeecac3f4c08a39ea321f66b8d
 EBUILD libvirt-7.4.0.ebuild 8244 BLAKE2B 7a47ef108058c902eebb346d9790ba4df0bb28b8a8496a96d1524f0729dd2505ebc2190cf0c0d59284713d5d6df90621c164e20c11d5e9d0dd78a3dc79e811b4 SHA512 9f9038cf92992f1af707dff71b666a3031a13bcbecd5c6f0dff5094fac33dd1685498873ad6f1e7df6548cccb2f79845ef985eff49b040b624cbe05e38c62a00
 EBUILD libvirt-7.5.0.ebuild 8248 BLAKE2B 94be85984caddd918f6ca087a529135968fae60029b0a2072927c23c90f6c3b7d0be50607a4a50ac7238bf26512d722b90ed118365199806d2ddc4bb921d8336 SHA512 0ca222fd6b8e7125d76859c4ce147455aee2ced256f6609912b57b0e9b899bedfcabf591101554a8982abb335d8b0e214283b5227937c87a10c944d26207b4db
-EBUILD libvirt-7.7.0.ebuild 8248 BLAKE2B 94be85984caddd918f6ca087a529135968fae60029b0a2072927c23c90f6c3b7d0be50607a4a50ac7238bf26512d722b90ed118365199806d2ddc4bb921d8336 SHA512 0ca222fd6b8e7125d76859c4ce147455aee2ced256f6609912b57b0e9b899bedfcabf591101554a8982abb335d8b0e214283b5227937c87a10c944d26207b4db
-EBUILD libvirt-9999.ebuild 8248 BLAKE2B 94be85984caddd918f6ca087a529135968fae60029b0a2072927c23c90f6c3b7d0be50607a4a50ac7238bf26512d722b90ed118365199806d2ddc4bb921d8336 SHA512 0ca222fd6b8e7125d76859c4ce147455aee2ced256f6609912b57b0e9b899bedfcabf591101554a8982abb335d8b0e214283b5227937c87a10c944d26207b4db
+EBUILD libvirt-7.7.0.ebuild 8667 BLAKE2B a9a39304349998a62f1d690190c762a9ee8f101d7f78c43c135775f31f87827275c0ec100f6e66d474f0603359580b172700c61207912bd05a58b074193ee570 SHA512 4b488b4254d6c5a0a5c5c8b3b1a7b647335f0f076e19dd621d157cf50e5565128849f24b3fca6ad039d2221586e8e2ce3f71a1bc26116a1360436fb3754e687c
+EBUILD libvirt-7.8.0.ebuild 8670 BLAKE2B 234000ae5a52c1b9aea5cacad2c354349cbd6d4862ffb324e39a9f7e94134e1677272ec3ba064e6a5c0c7a17840a5f6a96ca6d9c4892dff64a0ba7886ba1c80b SHA512 b3c46c7806670ddadf6c6150d2557f2a439f0eaefb22d5eed245cb48996648a6bf78eddbe23a45eeb424c6cbff886bcc6343a96c0e2fe5fca35be97c6892d198
+EBUILD libvirt-9999.ebuild 8670 BLAKE2B 234000ae5a52c1b9aea5cacad2c354349cbd6d4862ffb324e39a9f7e94134e1677272ec3ba064e6a5c0c7a17840a5f6a96ca6d9c4892dff64a0ba7886ba1c80b SHA512 b3c46c7806670ddadf6c6150d2557f2a439f0eaefb22d5eed245cb48996648a6bf78eddbe23a45eeb424c6cbff886bcc6343a96c0e2fe5fca35be97c6892d198
 MISC metadata.xml 3327 BLAKE2B fef1f9f6cd9de49ca49cf1d19f5c030ed96957ad5030f8e5d01be1a18f4e8199bf98134074afb9be5b23ade7c3e5b45da920769eb5967e82410c282c7e30aaba SHA512 a9488c539ed02046243dd86f30a48449a2dd35423445422a0f89293e4c6d17c6a5de37663c492d7cf1ca32821a09574f6e3116f185439fad2f05ad80705bfcd6
diff --git a/app-emulation/libvirt/libvirt-7.7.0.ebuild b/app-emulation/libvirt/libvirt-7.7.0.ebuild
index 34cffee86294..9ced809f24aa 100644
--- a/app-emulation/libvirt/libvirt-7.7.0.ebuild
+++ b/app-emulation/libvirt/libvirt-7.7.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
 		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 	SLOT="0/${PV}"
 fi
 
@@ -217,6 +217,11 @@ src_prepare() {
 	default
 	python_fix_shebang .
 
+	# Skip fragile tests which relies on pristine environment
+	# (Breaks because of sandbox environment variables)
+	# bug #802876
+	sed -i -e "/commandtest/d" tests/meson.build || die
+
 	# Tweak the init script:
 	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
 	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
@@ -281,7 +286,11 @@ src_configure() {
 
 src_test() {
 	export VIR_TEST_DEBUG=1
-	meson_src_test
+	# Don't run the syntax check tests, they're fragile and not relevant
+	# to us downstream anyway.
+	# We also crank up the timeout (as Fedora does) just to preempt failures
+	# on slower arches.
+	meson_src_test --no-suite syntax-check --timeout-multiplier 10
 }
 
 src_install() {
diff --git a/app-emulation/libvirt/libvirt-7.8.0.ebuild b/app-emulation/libvirt/libvirt-7.8.0.ebuild
new file mode 100644
index 000000000000..885c9c37f2d2
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-7.8.0.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+	EGIT_BRANCH="master"
+	SRC_URI=""
+	SLOT="0"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
+IUSE="
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
+	parted pcap policykit +qemu rbd sasl selinux +udev
+	virtualbox +virt-network wireshark-plugins xen zfs
+"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+BDEPEND="
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( app-crypt/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+	acct-user/qemu
+	app-misc/scrub
+	>=dev-libs/glib-2.48.0
+	dev-libs/libgcrypt:0
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.7.6
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-1.0.25:0=
+	net-libs/libssh2
+	net-libs/libtirpc
+	net-libs/rpcsvc-proto
+	>=net-misc/curl-7.18.0
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:=
+	virtual/acl
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dtrace? ( dev-util/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( sys-fs/fuse:0= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( net-libs/libssh )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[-device-mapper-only(-)]
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
+	qemu? (
+		>=app-emulation/qemu-2.11
+		dev-libs/yajl
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[dhcp,ipv6,script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	xen? (
+		>=app-emulation/xen-4.9.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/libudev
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )"
+
+DEPEND="${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
+)
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP_NF_TARGET_MASQUERADE
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	touch "${S}/.mailmap" || die
+
+	default
+	python_fix_shebang .
+
+	# Skip fragile tests which relies on pristine environment
+	# (Breaks because of sandbox environment variables)
+	# bug #802876
+	sed -i -e "/commandtest/d" tests/meson.build || die
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature apparmor)
+		$(meson_feature apparmor apparmor_profiles)
+		$(meson_feature audit)
+		$(meson_feature caps capng)
+		$(meson_feature dtrace)
+		$(meson_feature firewalld)
+		$(meson_feature fuse)
+		$(meson_feature glusterfs)
+		$(meson_feature glusterfs storage_gluster)
+		$(meson_feature iscsi storage_iscsi)
+		$(meson_feature iscsi-direct storage_iscsi_direct)
+		$(meson_feature libvirtd driver_libvirtd)
+		$(meson_feature libssh)
+		$(meson_feature lvm storage_lvm)
+		$(meson_feature lvm storage_mpath)
+		$(meson_feature lxc driver_lxc)
+		$(meson_feature nls)
+		$(meson_feature numa numactl)
+		$(meson_feature numa numad)
+		$(meson_feature openvz driver_openvz)
+		$(meson_feature parted storage_disk)
+		$(meson_feature pcap libpcap)
+		$(meson_feature policykit polkit)
+		$(meson_feature qemu driver_qemu)
+		$(meson_feature qemu yajl)
+		$(meson_feature rbd storage_rbd)
+		$(meson_feature sasl)
+		$(meson_feature selinux)
+		$(meson_feature udev)
+		$(meson_feature virt-network driver_network)
+		$(meson_feature virtualbox driver_vbox)
+		$(meson_feature wireshark-plugins wireshark_dissector)
+		$(meson_feature xen driver_libxl)
+		$(meson_feature zfs storage_zfs)
+
+		-Dnetcf=disabled
+		-Dsanlock=disabled
+
+		-Ddriver_esx=enabled
+		-Dinit_script=systemd
+		-Dqemu_user=$(usex caps qemu root)
+		-Dqemu_group=$(usex caps qemu root)
+		-Ddriver_remote=enabled
+		-Dstorage_fs=enabled
+		-Ddriver_vmware=enabled
+
+		--localstatedir="${EPREFIX}/var"
+		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	export VIR_TEST_DEBUG=1
+	# Don't run the syntax check tests, they're fragile and not relevant
+	# to us downstream anyway.
+	# We also crank up the timeout (as Fedora does) just to preempt failures
+	# on slower arches.
+	meson_src_test --no-suite syntax-check --timeout-multiplier 10
+}
+
+src_install() {
+	meson_src_install
+
+	# Depending on configuration option, libvirt will create some bogus
+	# directoreis. They are either not used, or libvirtd is able to create
+	# them on demand, so let's remove them.
+	#
+	# Note, we are using -f here so that rm does not fail or warn if the
+	# directory is nonexistent.
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+	tmpfiles_process libvirtd.conf
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 34cffee86294..885c9c37f2d2 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -217,6 +217,11 @@ src_prepare() {
 	default
 	python_fix_shebang .
 
+	# Skip fragile tests which relies on pristine environment
+	# (Breaks because of sandbox environment variables)
+	# bug #802876
+	sed -i -e "/commandtest/d" tests/meson.build || die
+
 	# Tweak the init script:
 	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
 	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
@@ -281,7 +286,11 @@ src_configure() {
 
 src_test() {
 	export VIR_TEST_DEBUG=1
-	meson_src_test
+	# Don't run the syntax check tests, they're fragile and not relevant
+	# to us downstream anyway.
+	# We also crank up the timeout (as Fedora does) just to preempt failures
+	# on slower arches.
+	meson_src_test --no-suite syntax-check --timeout-multiplier 10
 }
 
 src_install() {
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 85c1b4b96915..6f686eb9540d 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -8,6 +8,6 @@ AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c29
 AUX lxd-syscall_wrappers-don-t-conflict-with-glibc-provided.patch 2055 BLAKE2B 4f17aeb03e6022b6e88c4279865215fbecb699b9cc112a8e1fe16d9cda113e41d39faf448d17f9810bb65efb37d37b74b3c20ffb65329e012820f46705235f6f SHA512 1f0846ab9aa3ebfd96e79a91bc17be871f0ac3af44ddd3f9ba2a17570b2d800407a76634476e61d6d1f8bfbb880f5df37ad3b435a139e62f4c1c786c002d29d4
 DIST lxd-4.0.7.tar.gz 15454709 BLAKE2B 6278fa058efa15a689a982dcf0bce58bf320ac500bc8bd6cd4227f5f126a03dd85a65363d4d36b3437a0a2fd8e08e8a7332b96f9aba8e8eb2aa508d1129fec13 SHA512 dd99db21a4de95d95e6bd53dcbd68f4d9f0ffbd9e60d994340cd0b1e820068e671507a9718d1c56488c79ad49019f86637a4a8b9c945cdd3f70d59c9e2026fb1
 DIST lxd-4.0.7.tar.gz.asc 833 BLAKE2B a28e43d1fd0d5851a62121069703637e7ba25cbeb142507e4e162b254eddce2b5a13a100eedb202fbf3d8aa40f6e20b4fd587ef38f6c73a07d2bd9d8d9d00c8f SHA512 561d7cbf94a37e7ed03828ac98a2022dc1a4e11b80cdee3ad925bf4226b78b9e1d1b9c51ed070e60fba881b69e06dc70be2713026285b10de5cca59549ac5f82
-EBUILD lxd-4.0.7-r1.ebuild 4362 BLAKE2B 2585df5d2e0d58a6f56a2ecd5a2542f88f31b5aaa5dd402048aa1a4ea6142245e4196f9a0fb9e91da6153a014fa68930fcf76cb8f2368086e64e69f47f618ecf SHA512 e0653c62444b847348507fefaa9364fc4220dbeaaf38a3b7cb0eff122558a752e3512d14d29174c69795fad96f560284bb8a64d027c7d66e260e16e825d8f88f
+EBUILD lxd-4.0.7-r2.ebuild 4445 BLAKE2B 4cb00d02df28930c549617e2b2e2b0633ac6d59a97f6d28cfa5071a96a5004a4448401a9c7ab46237981a9f8dc2d0b3c87e5e89a8a4db3c2ef200f63a80d303a SHA512 b75e872370ed56205ff1517f4eca96f895eab2cb4364ee3402d14b5d61cd7cc7ba14aa5afc7387c7d7d87ae5c2a6f899422b23b52f02edcbb72cd9ed04cb9a00
 EBUILD lxd-4.0.7.ebuild 4190 BLAKE2B 2938b717899c7ad9199b13265c4f250959d1b353ea4e591b8e77470c31e2cb72da47733dd823bcfbd842c26bcca9a9e820fb56784c0aca048b8221ac5ba7fbd6 SHA512 5699cdbb47c6752012f5500abae8d0ff655111d6d7843583e97e3ebd000bb63745e77dc7f3d4099c80d60939cf5d1972f74e8f90012c195ff135d7e9e3b6e749
 MISC metadata.xml 777 BLAKE2B e25ff2ac780143763e40917f2570bbe8244c2a2a9eac1a9761199e7ea19df9863ade968ca8218f62da9fe41f3b9e7110ef86abff764c2a3d85f02ae102951a16 SHA512 e39a06e8b838990a9b0019f52e1d0c7dd83527c6a15bc8a14f0aa9fec2ee86c914de52f1ba48e7a586c3866d9da46dc32c2d6e1ea3e2c42ca985fdfe0783b40c
diff --git a/app-emulation/lxd/lxd-4.0.7-r1.ebuild b/app-emulation/lxd/lxd-4.0.7-r1.ebuild
deleted file mode 100644
index cdfd0052cb63..000000000000
--- a/app-emulation/lxd/lxd-4.0.7-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apparmor ipv6 nls verify-sig"
-
-DEPEND="app-arch/xz-utils
-	>=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
-	dev-libs/dqlite
-	dev-libs/lzo
-	dev-libs/raft[lz4]
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
-	acct-group/lxd
-	net-firewall/ebtables
-	net-firewall/iptables[ipv6?]
-	sys-apps/iproute2[ipv6?]
-	sys-fs/fuse:*
-	sys-fs/lxcfs
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl"
-BDEPEND="dev-lang/go
-	nls? ( sys-devel/gettext )
-	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/fuidshift
-	/usr/bin/lxc
-	/usr/bin/lxc-to-lxd
-	/usr/bin/lxd-agent
-	/usr/bin/lxd-benchmark
-	/usr/bin/lxd-p2c
-	/usr/sbin/lxd"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-PATCHES=(
-	"${FILESDIR}/${PN}-syscall_wrappers-don-t-conflict-with-glibc-provided.patch"
-)
-
-src_prepare() {
-	default
-
-	export GOPATH="${S}/_dist"
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	# Fix hardcoded ovmf file path, see bug 763180
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
-		doc/environment.md \
-		lxd/apparmor/instance_qemu.go \
-		lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
-
-	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-	sed -i \
-		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-		lxd/device/disk.go || die "Failed to fix virtfs-proxy-helper path."
-
-	cp "${FILESDIR}"/lxd-4.0.7-r1.service "${T}"/lxd.service || die
-	if use apparmor; then
-		sed -i \
-			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-			"${T}"/lxd.service || die
-	fi
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export GO111MODULE=auto
-	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-	cd "${S}" || die
-
-	for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
-		go install -v -x "${EGO_PN}/${k}" || die "failed compiling ${k}"
-	done
-
-	go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${EGO_PN}"/lxd-p2c
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${EGO_PN}"/lxd-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	export GOPATH="${S}/_dist"
-	export GO111MODULE=off
-	go test -v ${EGO_PN}/lxd || die
-}
-
-src_install() {
-	local bindir="_dist/bin"
-	export GOPATH="${S}/_dist"
-
-	dosbin ${bindir}/lxd
-
-	for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
-		dobin ${bindir}/${l}
-	done
-
-	cd "${S}" || die
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
-	newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
-
-	systemd_dounit "${T}"/lxd.service
-
-	systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
-	systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
-
-	dodoc AUTHORS doc/*
-	use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-	elog
-	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	elog "including a Quick Start."
-	elog
-	elog "Please run 'lxc-checkconfig' to see all optional kernel features."
-	elog
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "lvm2 storage backend" sys-fs/lvm2
-	optfeature "zfs storage backend" sys-fs/zfs
-	elog
-	elog "Be sure to add your local user to the lxd group."
-}
diff --git a/app-emulation/lxd/lxd-4.0.7-r2.ebuild b/app-emulation/lxd/lxd-4.0.7-r2.ebuild
new file mode 100644
index 000000000000..70a7841f123b
--- /dev/null
+++ b/app-emulation/lxd/lxd-4.0.7-r2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 linux-info optfeature systemd verify-sig
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
+SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
+	verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apparmor ipv6 nls verify-sig"
+
+DEPEND="acct-group/lxd
+	app-arch/xz-utils
+	>=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
+	dev-libs/dqlite
+	dev-libs/lzo
+	dev-libs/raft[lz4]
+	>=dev-util/xdelta-3.0[lzma(+)]
+	net-dns/dnsmasq[dhcp,ipv6?]"
+RDEPEND="${DEPEND}
+	net-firewall/ebtables
+	net-firewall/iptables[ipv6?]
+	sys-apps/iproute2[ipv6?]
+	sys-fs/fuse:*
+	sys-fs/lxcfs
+	sys-fs/squashfs-tools[lzma]
+	virtual/acl"
+BDEPEND="dev-lang/go
+	nls? ( sys-devel/gettext )
+	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="
+	~CGROUPS
+	~IPC_NS
+	~NET_NS
+	~PID_NS
+
+	~SECCOMP
+	~USER_NS
+	~UTS_NS
+"
+
+ERROR_IPC_NS="CONFIG_IPC_NS is required."
+ERROR_NET_NS="CONFIG_NET_NS is required."
+ERROR_PID_NS="CONFIG_PID_NS is required."
+ERROR_SECCOMP="CONFIG_SECCOMP is required."
+ERROR_UTS_NS="CONFIG_UTS_NS is required."
+
+# Go magic.
+QA_PREBUILT="/usr/bin/fuidshift
+	/usr/bin/lxc
+	/usr/bin/lxc-to-lxd
+	/usr/bin/lxd-agent
+	/usr/bin/lxd-benchmark
+	/usr/bin/lxd-p2c
+	/usr/sbin/lxd"
+
+EGO_PN="github.com/lxc/lxd"
+GOPATH="${S}/_dist" # this seems to reset every now and then, though
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+PATCHES=(
+	"${FILESDIR}/${PN}-syscall_wrappers-don-t-conflict-with-glibc-provided.patch"
+)
+
+src_prepare() {
+	default
+
+	export GOPATH="${S}/_dist"
+
+	sed -i \
+		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
+		-e "s:make:make ${MAKEOPTS}:g" \
+		Makefile || die
+
+	# Fix hardcoded ovmf file path, see bug 763180
+	sed -i \
+		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
+		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \
+		doc/environment.md \
+		lxd/apparmor/instance_qemu.go \
+		lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
+
+	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
+	sed -i \
+		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
+		lxd/device/disk.go || die "Failed to fix virtfs-proxy-helper path."
+
+	cp "${FILESDIR}"/lxd-4.0.7-r1.service "${T}"/lxd.service || die
+	if use apparmor; then
+		sed -i \
+			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
+			"${T}"/lxd.service || die
+	fi
+}
+
+src_configure() { :; }
+
+src_compile() {
+	export GOPATH="${S}/_dist"
+	export GO111MODULE=auto
+	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
+
+	cd "${S}" || die
+
+	for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
+		go install -v -x "${EGO_PN}/${k}" || die "failed compiling ${k}"
+	done
+
+	go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
+
+	# Needs to be built statically
+	CGO_ENABLED=0 go install -v -tags netgo "${EGO_PN}"/lxd-p2c
+	CGO_ENABLED=0 go install -v -tags agent,netgo "${EGO_PN}"/lxd-agent
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	export GOPATH="${S}/_dist"
+	export GO111MODULE=off
+	go test -v ${EGO_PN}/lxd || die
+}
+
+src_install() {
+	local bindir="_dist/bin"
+	export GOPATH="${S}/_dist"
+
+	dosbin ${bindir}/lxd
+
+	for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
+		dobin ${bindir}/${l}
+	done
+
+	cd "${S}" || die
+
+	newbashcomp scripts/bash/lxd-client lxc
+
+	newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
+	newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
+
+	systemd_dounit "${T}"/lxd.service
+
+	systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
+	systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
+
+	# Temporary fix for #817287
+	keepdir /var/log/lxd
+	fowners root:lxd /var/log/lxd
+
+	dodoc AUTHORS doc/*
+	use nls && domo po/*.mo
+}
+
+pkg_postinst() {
+	elog
+	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+	elog "including a Quick Start."
+	elog
+	elog "Please run 'lxc-checkconfig' to see all optional kernel features."
+	elog
+	optfeature "btrfs storage backend" sys-fs/btrfs-progs
+	optfeature "lvm2 storage backend" sys-fs/lvm2
+	optfeature "zfs storage backend" sys-fs/zfs
+	elog
+	elog "Be sure to add your local user to the lxd group."
+}
diff --git a/app-emulation/nerdctl/Manifest b/app-emulation/nerdctl/Manifest
index ed5713422ade..8435519a2127 100644
--- a/app-emulation/nerdctl/Manifest
+++ b/app-emulation/nerdctl/Manifest
@@ -22,12 +22,14 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead SHA512 33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
+DIST github.com%2F!ada!logics%2Fgo-fuzz-headers%2F@v%2Fv0.0.0-20210715213245-6c3934b029d8.mod 53 BLAKE2B 4e2a4889c057ebc6c1fcb186571fd5e3aad3a54600f71213ab4fd60afcf21f3c8e5bf8843e8d9add2872421df8238ce8c9dddd898806b07f261becf04558285c SHA512 c4050e042ac4e97575638aaa46afef428c30b578e25707813695ae248dc50142c4ba13c6e0e0f0c6db8103b05e5adc6e77d7a7517c0ed24af11a9d3c040c21fb
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod 36 BLAKE2B 52a2c5272e004524397df00dfa03b4c2d2ebd985a0c974236aad6b847d6b2b4b7c9b69ef48e263f4c67983b845b020d2004fe749b46fee3c0525da0416b20f3e SHA512 350a16c68553738ce8c2f4a6ac8beba66a7dcf2386a42aff938ebaa3bdc526bda8e5c51c493331eda4666cbcf8411ee7ca3aeb0768cc4f557f34585960f9eb84
 DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip 32735 BLAKE2B 5de266d7400ae80c027f209cea91c911e22b0ff4fc6a2e964e8906f1a86cc6905b9c12d2588d5fdc91d0d8e9501a0ddf2f7a376cca9935d21943386c3ef31979 SHA512 72621865ffc0cadd27603e2f4032f1cd9c9d8bdcb920b3ca9fd02dbf88e52876a6f092c5b74eceb136021c514b68dc599f0cbbf18ed1620b827d46462aa55e32
 DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
 DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.mod 366 BLAKE2B 97345e1c4c80024fd786edc92d87c2429bfb7562be7e96648e887d44bbc8d7b4a28da6510910feb8eafe4a390339e83a394ee64ce0686f18fbb291a4792d5c1e SHA512 bfb202512ad2101bd0d0bf6bd3e712f528a5f3b280ccaabe96c54ae06e5deb474cc0bdef0be5f3faae1dee6ca676531acfb4c4e53a5c34022a718e73f457c9e7
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.12.mod 366 BLAKE2B 74f1d402b4fc7bb6bf54c6467067256504fe2e37419de2a5be55b9c105ca2d1c7951ece398fac6cf98d02b990da9ad0d2aa1f4d12c17dd99ad3b6df068d4e727 SHA512 67b890270798e538335a74754514d4f2fde7e012f1201d30d3450087866612b88c5613185a5dbc899af84d65fb4265fec59ea064eec3e9362aeecd1187dbfd30
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod 376 BLAKE2B f7e3a3f97b6a61ca9d5497ff96984c9f445d2c138f9d90157658cc697d9531cace1a87f6e2a18414ee2f7f54eee81d7652b3006b8be6c0137a2c794d37bf845b SHA512 684a7c8f51caebd1bb90c7eac482ebf9a52228c57a5b31ea1b3d3019864bf669688742bf5f9159995e5a6ddb3786aad9dd10c37925767ce9f38641c9a7448e3b
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod 380 BLAKE2B b6ea0cb491b11963174850acd4d525607eec5b63196c774afd73f974048a9a99d0ad6209fff72bab5238109d80d7498b4f8bb126b3c8a170f34373d69d96f4ba SHA512 63536f9954ee05c36e35abee4e91f9791fa97e10a945bb51c710cb2aeaf3a567d999193f968ce54e8d530be617fb55dd6e3a0c0b88f8edc96d1f92d348b13cac
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod 118 BLAKE2B 6c3b0310b2a333471afa5fb1c2cee19265ab4180b71cbfaeb875ae27e5db270fdbd141eb8d498e0e8dc300e4e0d9ea681e99e1a2a3b52c891cad52155cb88a58 SHA512 d48c483ef76bb5ec8d721ba828cade25defd91bb2c0dfc3b44df36742b86e8e0650a2d010bc7843a0b4317633676c393f4044998cf7f953125bed93bb7fb9375
@@ -47,10 +49,14 @@ DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210324224401-5516f17a
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210324224401-5516f17a5958.zip 120357 BLAKE2B aa587de00bab73955ad023c52b73a4cfeb6648a0c479a8dba0e3e0836b0a895cec920b520f44a3e97c334b8c079a0a5187b59cd2ea2d02cb9b50ff1dd5013080 SHA512 d9f12e153393ba3554834a9a286186cac894f408c716abcbc8a9d46d6f94663d9c1eef580be134dee7709988621f1eeead785b08167595b4b6d31c7b97f3bfad
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17.mod 177 BLAKE2B 1abd608ff82193394b1553334bad24f5062c68fbc1b773733d4e69d121e4c23879207bee0211488307dd055def52bf24464b2be9685f10efdb23d63f8745bcf7 SHA512 5a32f55d6a4c3269cfa12d67a4f083477dfc5743b80911055c9e415bcc7cf477077478286fee918c154309d1420d19f811b8222e022df09ba2b7a3e1c93ffb38
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17.zip 116037 BLAKE2B 950370d7e7af06a573c636bd7a99cb09882cd5a03f1f5ea8a1fee5ba6b64103e9a14b30261bf672efdb8abaa35f9a821d886164c8728355a6822c128b799f480 SHA512 e7f3f9ef96f80b0eeff77f75c668ed711583ea158d52e1d93daa413779d650d7796120a14fcf179b144716dd6b8f7df9c3044455b3b4742f34a39682732416c7
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.5.0.mod 177 BLAKE2B 1abd608ff82193394b1553334bad24f5062c68fbc1b773733d4e69d121e4c23879207bee0211488307dd055def52bf24464b2be9685f10efdb23d63f8745bcf7 SHA512 5a32f55d6a4c3269cfa12d67a4f083477dfc5743b80911055c9e415bcc7cf477077478286fee918c154309d1420d19f811b8222e022df09ba2b7a3e1c93ffb38
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.5.0.zip 116495 BLAKE2B cc0e829f93c7f5ac8a5a3e1f1dee0b6fe6472afad9552d73052b8b36dbc63697a24f433d07fc5f74a719549b668a52c42f93d7c981cfdc74fb4a044f5dbb7ad4 SHA512 6a53f2a836adc34f59860858ae718d46dd015dea0e6d53d19b58ce7ed662e877a36693c6b2b9c7e243bdb80ec7cde4bf122ebe45924aca8bbd90f7aef7ef0cf6
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.mod 1658 BLAKE2B c431a7025ea626886df3db5f97d03fcc46048cf2987af517d53d6ed088aba9cd023b3a298477fbbeade46c61a2dc2329901b6bbab6c2dd5166153cf571c8f02a SHA512 366574210523371803b9065deccfe090b868fcbdd6484722393e2cb8fa2f1e6a501dcea261c404ce03568f6359d9c9d3bcfda84aaf288f18e9d2235015e80e92
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.15.mod 790 BLAKE2B 61a0b396ffc0fdfd4a88f33c48add22ca1e943069ed96a04d2333f8468f234eb0d8e20dc1eb3a4bda69b0e605e334f84d7387e9a84b10dffc8238c3a1a1e2c61 SHA512 9ed0ff9065a0de72b5a32489a3a71989036e9535a5a69c4066ea2bb5fe51e4e0b90eb70757be7e6663f108564159b062d2fbf5edefc66cd2388008a1ce4feeb2
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.16.mod 790 BLAKE2B b2ede5d12e92b5594a854db2327c085d200ba72590a474cd5a2b5a030371ef3a9ceee584db1942891826993d80ba74ab4d7b70b0611184a120322860b66c9b39 SHA512 7cc7aa119bd7385db8a90e7770a6bcbcd2bd3f138a4562da3e0545893ccfccd1c5e4ae930fd0a645b1687e3e78264561647bb6540f2d501ceb2d89180d7d6437
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.16.zip 676527 BLAKE2B 94c0310f019ec80c48a68dbec00c3903e50cd9bd3d4083366a09bfa54e36c868bb3c2b7a1e0c660e16a46392f42b404c41594d4f0e196e870e7c2aceaf672121 SHA512 7cb2fa7c18812b2f9af5787fa2c11c92ab175057f484209792d91645e1e3d081d712d77270fc5b9d297ea0ee352030b59e8df5914da3b9e0382651e385a2a487
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.18.mod 861 BLAKE2B 55f6b9763f5a966750b22b56cd428c1b4d385a60b5018ebce5959de182110ac3c223fa5cdf4a5e580dcc6f46632c354930701aa728d4dbd20c2404a54881463d SHA512 c9a070f5889052905faeb9095f5a9d5d921345ffb59b05aa1eed070e32526fd61855c84da26e04ccc823564832f60e0668940f6f3fc5538a5c733c964342b420
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.18.zip 724008 BLAKE2B 63b431b8148a5a5edcf27e2768354e0a3e7f81fe24f42e0f6bc4b3fc5b2e7ea93eddf463024c0a0d50c7d2c4cf1967121275d41d3cc6679e21c8095258f77bbe SHA512 ecbf676cf574de038369236a7233d05964f7d6a6c25b895991bf3c9ce226a4a7d5389532f61095629478e8ed7dc4a1111a5a23fe5cd083d3087052b95cb4163c
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod 36 BLAKE2B b225c59078b955a08b32e04bef09ef99df1befd791c66b6e8c1e97c820aa16bba520e2d9f31af170cfec4546a53b9f49eb59112e3ad5cb9f4ec1e32c570576cd SHA512 3035f5c6d6b72168b77140776f5a15d9ec7a81bacb1f0433d4595ad240c79d69466c6e2e4b2c025b30af68c88ebebe4fd011b04a8a82789401af4503a9cee29e
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7-0.20190325164909-8abdbb8205e4.mod 36 BLAKE2B b225c59078b955a08b32e04bef09ef99df1befd791c66b6e8c1e97c820aa16bba520e2d9f31af170cfec4546a53b9f49eb59112e3ad5cb9f4ec1e32c570576cd SHA512 3035f5c6d6b72168b77140776f5a15d9ec7a81bacb1f0433d4595ad240c79d69466c6e2e4b2c025b30af68c88ebebe4fd011b04a8a82789401af4503a9cee29e
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod 1988 BLAKE2B e89ecdb4644e50e2cd545eb43452729d909745705f5254a59547420baf3da357e77bf5d73b220da6899fe08a4eb034b0d1815702dceda20ada57e277b83b9954 SHA512 67df97dbec1c4a0c0f84551ea80df88a827c9ff4467614ef61544a611e19de6d063af40cf33673621f2e52e198595b61c8d6e5d732fe87f00eb7c5bd653e0399
@@ -66,7 +72,9 @@ DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bcc
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod 79 BLAKE2B 51cb1c2c33300626f74f843ce56c333b194b9a46230d3befe94343fe9daa62314a59b74a6d78c97415f839997fb42700c762fe02ef76240924ba52d18f723ad6 SHA512 df2dd357e057bb1fc65ef4869f64149f6446257406886e89a39f7dbc7e6c9da25a8c17567b14c8d3adefaf21fba98e0f2663924c7d32a4f82d30377ab4032162
 DIST github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod 41 BLAKE2B bf54fa1827896179238ee6b907fa2222300f47daa86e06332ebd77710873d776ee3195eb506fe2aa5eda4c5b66e6a4121d362c99801ec59b8daf804944279657 SHA512 0c4cd8838cfda0eb234cb8eebc06b0c60bc6696add9d7ec918dfb05bbfafd0230dea107790ca5213a33baeb36d1bc48e4f837bb4000a5447211fbf380a6b83f4
+DIST github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.0.mod 44 BLAKE2B 9ee187c88e6e4eba0b58dc16701725ff50dfc3af729ff9b58c3dcd200854af59d50689ffc51caafbe6af5685d5796331fc69dcb4a1813f6124c4e6f1a0bb5725 SHA512 e594fe55205c9dd96af55f58d011e5ef916c66eb057f7c0cb73fda0388133b6b476bce423969f85c1b95eb87ed9ed48bce7570fdbd131e0ad5e7ac6010514c58
 DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
 DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod 145 BLAKE2B f28dde209c4d43940897c3dc758b088b19b38db865cba75b246477b497c1303301de7cfbfbea2a7eb1b124021967e4ead6dcfa8475ad240a7381bc7ec256b565 SHA512 00cbada20d24a2d08b1f06e0da060140820972c9718e707f0cce56ad62f1ab7344a969cefece18bee79f6b92dfc390e496d6a4af7c95eea0b66d27cc0f59f3f8
@@ -78,6 +86,8 @@ DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda861767
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf
 DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
 DIST github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod 38 BLAKE2B f6ad4f22436471512ed4037c3f4c8dec4e0f7cb9191ddda23a2f5a5135785a6c5af99dd9005218bf196e0f48db755d040c894f6c5f2c1c338580597eca5eecd8 SHA512 05b70033a965ce6a70ea5fe7c635768c2c665942e04b17e47fba03b70cd977a8cbc292faacc3e10bd785523a43c61d42811c20513669592f308830863cfab56d
+DIST github.com%2Fbits-and-blooms%2Fbitset%2F@v%2Fv1.2.0.mod 50 BLAKE2B 4079755fe411598597b92696843fe84c0e2d7237e3c97b7fc74fbb12801f12c1f0c6202a6dbe69a30ae0c533bdd8946f89e8135771f92e98996033ac36a94d72 SHA512 5302c9bdc76781f7395c82a9c9498fd082069d0e26cd03dbe6c0a260a1c6aca19f5f54579fa5c156c19a7ff1e2bb724a81b339b2a4e40c2917b97b332378283b
+DIST github.com%2Fbits-and-blooms%2Fbitset%2F@v%2Fv1.2.0.zip 25750 BLAKE2B 3caa8f889cae05483330730d033df92d3125817ce224ab84e0e611a354842e751697a7a5848617939b159858730c20248f9d18d7c0254e43ef40afae22db493f SHA512 bff4203c835b18907cf115d368303777c822695018e94dec2cac597a18250ad86078c98f0380ad3943e14a8df2a0f774661128849d69ac765bab463f494a4a9d
 DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
 DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
 DIST github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod 35 BLAKE2B 253b8f5c57339e04a68fcd945f25b655ae0d9b6a265fc3e02c9ab2a5cd0e41d68f5866e80aad321eda2e3fe0ae8b311ec0c4eb922d67e0c7f425ebff5d6dba69 SHA512 c19ab1ccc5297aae6bc7e3536b97091f3f877b1b76e5d93b89842e48ae3c9d4cf49a471ecf72ce6e2da001bd51ef3eb126a83bf5a35e50acc30a43db4d37c301
@@ -93,6 +103,7 @@ DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582e
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
 DIST github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.mod 100 BLAKE2B e85f41fdbe685d35c78d22042afb1addb6e7b05a82f3818199928f68b95c3e188e80fc6f3f630c994f3e2b6a1724df5f8b4d407440e34adcc4b2c2c8cb55c53d SHA512 3b92bfd3d83eeec84259d527fc8fbb1854649b8fad658082e1f35044ac097b96f37ab6acbbd83fbe8915f4189bb2249364172d79b75b8d684a88e2c8744be0f3
+DIST github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.mod 194 BLAKE2B f83b4b8137ffece2fb4b6adc36ec7e3f64bcd112a63fdb8f32f9d486c28ab01e5e05b903e9888b9dd95bdd00496daafa178d78757d7c8bb3e08f40989854d2af SHA512 2d1cfdabd0a874430b31c1885a332f7f383ea0bf9643ccc34e9ff46444ca5a6a126848ed459e4d62eafd4eea05413c0e7bb15abf65a79ca38ef80e719015f296
 DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
 DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
 DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
@@ -100,14 +111,18 @@ DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod 13
 DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.mod 100 BLAKE2B a7a92e487b14e5f8e8bddffe2cba32e8876b9dfdafb1786b62b2cb1cb93ed646aa98a5093d7e488c00fccf9beb98c078e22d8dca5362618cdb5f4c3515113087 SHA512 ff846fd599947276853b6388db9d0af7ee90dacb6b7dacfe99d8540cb857ee4a530d9beb894f830c52b687f76e69a02347333f635d37498c8fb5ded3b06bc562
 DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod 138 BLAKE2B a94aeebc267e5d2869c162c5f672be9d76d68dab9968373a51c2da4ea9367f6049ad3ac9fbfae36192a4fed13d176c92675017d1d9ac67d267a0697987cedefb SHA512 ef0515f57df8f50eff19dda46cc3d167bb700d90c7e1080b3f0e7bc07657ed41169d77ec8a4de208b0115c07df42a7ce1cac9bc245ef5cd2688aedc259ba09d3
 DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.4.0.mod 177 BLAKE2B 0b2b115bd8498c8e4fe3c848cc9b8f1379165c4b1ee7abdb94733e3964ae15450bb6df4d8b959a03679d285cefac8862e0b57a9230f7d6137293c35d72366c54 SHA512 6e8fc3bc808aa947132c3fff22b4aa817fe2fae56fcdb5fb07445816fe45dd84db964dda36a795e9641dd2ce2a4df5487454884e42b0106603dfd7558e5928e9
+DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.mod 177 BLAKE2B 0b2b115bd8498c8e4fe3c848cc9b8f1379165c4b1ee7abdb94733e3964ae15450bb6df4d8b959a03679d285cefac8862e0b57a9230f7d6137293c35d72366c54 SHA512 6e8fc3bc808aa947132c3fff22b4aa817fe2fae56fcdb5fb07445816fe45dd84db964dda36a795e9641dd2ce2a4df5487454884e42b0106603dfd7558e5928e9
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod 170 BLAKE2B c8f3e464fd2cb8f38cf999a300b44307a1e3d40101460176aaac8467ec7d371f08c69ebbcae7ad8086a48a02a0dd7fc4b1cda1bbd7b5199c4b76f1ff0492d7b3 SHA512 4cb0a4f9d5f74f3115a10661469cafa88044a8ed2de959b26054441714080fe8d639485b69df02e0f91fa9040db259fbef8281971c28a67953a5abe5b7220ccf
+DIST github.com%2Fcncf%2Fxds%2Fgo%2F@v%2Fv0.0.0-20210312221358-fbca930ec8ed.mod 169 BLAKE2B f8ad79343477a3ec93894b14455df80a67e35f5ce14950b0e41005535bb11147be95bf362ceabb251864a64297a5d6a8a594648928be0e8aac87052f19e9f91d SHA512 cd8c47886f01235398b4c2538ccb516754e2bae6e9a88e0fa2bd80232f974c5f8cd79249f459c9788fcb7b0c83ced5064f1d8916869e71a15377df20077f52a6
 DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod 41 BLAKE2B fce07437afe34fbb38dc2b3c8695440413610213aa82b910471dfdd37a5dfabd332513dff18fbef7b84469c0c137530e821e2a5adf0e660a96bb78446a084cc6 SHA512 180a8be6b0f3596aa376ec5f264ee545a082328067b3ffa5523634cc95b106328fbc6330fffcada0a1cf250c3a988971073441184b9194fe0d05fd62a33901fa
 DIST github.com%2Fcompose-spec%2Fcompose-go%2F@v%2Fv0.0.0-20210415072938-109132373677.mod 715 BLAKE2B 794a4c8ac6e4485fba17cc597f5b616e99946bd5eb324be3613b244e863f3fad1642d71e414759f6cc77c5f2d03cd14634bc6b58075627b50da1ecb8f5fa5a18 SHA512 4710ec78caf4e305babfee90da4b9570b07afb8ddbf05fd382485567c0b727c583a34dcab4c970b8488e3160ed8e78d148f7db48df8ca00954d8c072f2747c93
 DIST github.com%2Fcompose-spec%2Fcompose-go%2F@v%2Fv0.0.0-20210415072938-109132373677.zip 133336 BLAKE2B c4290b4cc780afa5e8c5e062b532b00e276c787adb25a264a962dfa32bedf66ce996bbafa8b95484ae2725678b9a456e4ae1a8c56a4a968350a38ae5b83f7672 SHA512 469adadad4c78321fa01836dbb1b684311d8075d94286a7072a608fcea5f574b5734783ee1801a49a50fe7a72286ed3f1aa44684d732289a40781e3b12e82c71
 DIST github.com%2Fcompose-spec%2Fcompose-go%2F@v%2Fv0.0.0-20210420125800-01e9e6b4c64c.mod 715 BLAKE2B 794a4c8ac6e4485fba17cc597f5b616e99946bd5eb324be3613b244e863f3fad1642d71e414759f6cc77c5f2d03cd14634bc6b58075627b50da1ecb8f5fa5a18 SHA512 4710ec78caf4e305babfee90da4b9570b07afb8ddbf05fd382485567c0b727c583a34dcab4c970b8488e3160ed8e78d148f7db48df8ca00954d8c072f2747c93
 DIST github.com%2Fcompose-spec%2Fcompose-go%2F@v%2Fv0.0.0-20210420125800-01e9e6b4c64c.zip 133345 BLAKE2B 5dff0e67195b4d632ce047c7003b9a39a0da20d3efe9257699012338ea2421a83f2fe224822c20ce586e1b835c4adba91c2cf89166b5ba68ddfa0e9cdfa72632 SHA512 45e88bfd92726d2cef32275ca97739431f958bf09cef104690731e764c28d42b2da9c50f349243864f13c29b15956dd5bca10ddf27c8a4c57fee3b9c46bdbd67
+DIST github.com%2Fcompose-spec%2Fcompose-go%2F@v%2Fv0.0.0-20210716132856-efad24e892ce.mod 715 BLAKE2B f427dfede634ff5a86babf1c21f7a9030aa1776ccacb6b73c05ac1b89579593754fdbe35df528d0df90e4757a0c42da70a4ce79683141b2bcf8af08927a9fb8e SHA512 4ed83b8b65ee63474e4e6fa4aa97c7209114421cf1b85c1f5059978827d2beb97b43247493736751a702e69a6bef188d7f3f5e932153eade7d31532a6945064d
+DIST github.com%2Fcompose-spec%2Fcompose-go%2F@v%2Fv0.0.0-20210716132856-efad24e892ce.zip 132802 BLAKE2B 239af006903b8f8d06d2e11192f5202bf814b74274f19e5a4598be6c04c1f218119e88186ac7d985888bbf06ca70301b2f5a77644366b16b6e7c09b934223abc SHA512 aadb686b266b121ece53e0cdd294e62af58dd91266fdb5dcbda595192f636c25e8a56ed8cb025243eb27364e12dc5f00cd91f515eb77b2eeb9ca3cd298958c69
 DIST github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20200908144142-dab0cbea06f4.mod 967 BLAKE2B e6ca6fbd86a4d7a4477dfc1277c989adf8df3a1797280c707793c2442aa7db91bc77a19d55844a15720eaaf9bc88441d135ef185e6ed083a13f03068cfe8421d SHA512 050128e0bf54a0c09ca9ee2a5ffeebaea26a9d1360f1848e797b2766d931191878bb6080eaa7d501271ad5fefa54be13503da3bbfdcbba7af059d43b64d0fbb9
 DIST github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20201003224125-76a6863f2989.mod 647 BLAKE2B 7f778d01f167f1f7359ae817b361bfa530a0eb0a80f410068504bcc53fb2eb47a2a1f9fc9fbac2b6506139c590126bb062dbb612c93f3ed2413f8207b39d46c6 SHA512 e3c8ccbdb8a0057eabb65421f8ca587f4cf5d9dcc0a33ce1ce7c6f827aec10c9d878c69bec1f01b9977e74f093d238326bc3eaea4cc63b0000bfa965406eb970
 DIST github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20210316121734-20793ff83c97.mod 256 BLAKE2B 84d24102b845ad59069a6e1eff870db229dc19d86f5e7c69db0bbea3160b31a2b9d665dee392f1690808a65fc291922017c9fd53faa6f2f1b7ef45107e1eb728 SHA512 64b634e3f82598c9efbe9b0b3d6d2e567595a500f8b19593c75bd2f9855c412ba2a94377e6b7b08925dbec2abc8b224afb314ac49c740318d8cc3001c9ecdb2d
@@ -130,6 +145,8 @@ DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e
 DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.mod 142 BLAKE2B b063852caf2c56ad1d7b42b5d6f621bc7c5d3b8cb53441688cccd11620bcca11806f01b999fec6ea5d9f297d7540845bbe1bf465f72ad15b87c1bba0e8a2478d SHA512 b14731c3e5c45c304480275ea23e80a5e287bf3eb2b6d56a9b8f6887eebe40fcc7ce22883ca53864ac9cec09f15657cc35a629aa08fc53268a9461d76e5f9a33
 DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.mod 142 BLAKE2B 904ed213588b607d9d3a8f66d34ee171c259d8d0a847d8fc2f758837e50890506ffefd103f6e7dacb6eb507a1b50ee77fb393f10c793b5887bcc94f9bdbc5251 SHA512 9c027acc553b3141cd60a6d9b7f7734d6e83820fe423036a63fe65311d128921848774240360b70a09e07ab48efb5ecc985d7afe4ef1b708d7f8fa60288e51a9
 DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.zip 29234 BLAKE2B a14bf498a29153650678b713d0a3e8648906806e5522cdf25a2b594c7db0b015a4e6533799cc1acfdb0e3b17018f45ef33785fc81953e5ba8ef6ad8161292b2c SHA512 b98e7adc8c4aadf5e5ad5ab8f68d8a8171e565e0e5ec5978215aa78fc08233fcc35481a2a564461a3e2cb7b086dfbaf5a05afcc25eff411266882d91e30c9e35
+DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.3.mod 107 BLAKE2B bff0a12bbb7fb7295895e1a88dfffa6ffe2b8967c586a95612a7d3889c9f833500554f116296b224c6f694112d884f2154bfde2bb39ddfb95fa4a89af6afd0aa SHA512 d5d47837f7da5f6512a0a1cefc5ef19dbfeb97c5430e34fcad4e1fe5b6f3dec50a31009110f6835cf8bc986c4f3d16d40e60495543009fc88791a88b99e49a68
+DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.3.zip 31330 BLAKE2B 08b62d62889975cc436da5c3f3c3f8e80d133cbc9aaeaee7074230e8446ce8096c7bb3f37c0f654ef9feac48f22eb2dc264da5303e14c4a28dde5b8df36d70e7 SHA512 739ce874e7269957c7e90da35d28d9ab2de6333c95f911d1529c7c1f0b4bd79073a437d2976e63bd964ec52170eabc75d9e650de7dc8056b5473aaec40e73049
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.2.10.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
@@ -145,8 +162,12 @@ DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-rc.0.mod 3189 BLAKE2B 43
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-rc.1.mod 3189 BLAKE2B 90595f2ec4c7cb1682a06853108dc226ba24465f209b33acac1f23fecf8649717a73cdc69c02aaa71182797d19893cf30faea08e60e1b759f7c0c2a949843267 SHA512 69da3e11eedbf4a2616f8f2d9b2b91b03e74c6afbeb474de90463eb7e83707bddae97ffc5bf20956980f2f576e16639010cd7463f4624d378310277271da0f4b
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-rc.1.zip 2564554 BLAKE2B e747cc481f7d757eeba4394918fdd979febb3af662f3ee96b7da22d4dbd7e63ebeb97e2b73cda737815d4d49baee1fb71f772a2666aa6b692200d22741c4a4c7 SHA512 3ffd89ed820daa7141d11229cd9035ab2fa4b711efd21ccc997e12e1911d7509511c594b421f7652581e73beb36f5a1766a29f769caa07d22ef66dbcd3c2f6d6
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0.mod 2936 BLAKE2B b75550f9c56cfc3fbf91fef8a4e4f72a5d99e5b36ad3b7d83193a02a460ee0e9420e8f59f6844112255d0c136df9fd0b295e40afa14534e1a0a5e62e2b3c763b SHA512 4d4997d4182a7ab330f907a7cf15052d16b5dbb61fb0a2b4d4a0fd9e017e1c1e7d44283ebcddb283b81df6ae48363d45810320f1673745b9642da4ec36a4cd36
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.1-0.20210802172229-7d4891783aac.mod 3524 BLAKE2B b6fdbbeb03135ff725eb35274e362132bcc81f5f87a6bf5fc14d2e0c411cd2c3d522392dabe5002152758e0d4b789b7ce7d83d7092e1e80099d33a62e608bb53 SHA512 bfafef78e8f07c4e113028b141c0c310f8147644621938b058e618f6533fe8b5f726e3ba971e40e5ace24eb3ab483baa2840df898104f6fcc3cf2f01c6311200
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.1-0.20210802172229-7d4891783aac.zip 2439575 BLAKE2B 6aec931efabc2f514e614072fc531e8723a666f79bd40a030ed1651ff874901b3fd1a5c54db8f765802a209acd6705e5e7c10e79ad9ca15c389b8a819882e2fc SHA512 f075712982990f360d22f54893399d77a40b59c8a06977efd270823e72b66cf4dd663d99f4e49a66b3ef973c424e80d76e042ca3d8c4d74e38160adb52d61f4d
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.2.mod 3320 BLAKE2B 6b27caf17aab4e9496702c8e8cee8b75c7468cad1eaa36526f6bf72095cf03e9ac8b7391af44df313fc3656d3c52f595d05922b2896ad0cdaf1bd29294f27e74 SHA512 352a2693d1e0a85bf705ac47666757e0ce7529192ff9349fa115e528e33c27cbbaec072e7ca51e98cb20ce5baefe6bb238f4f7f599e08cc2ed53c8ddca085569
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.2.zip 2566715 BLAKE2B db7364c2b2441ad58cc5e94f7553f6ea34f30e2361e8fa6f41e59dc64961d1d402e6a62ad9f19f4a2fa197e76ee45e72a55a19a7d395720510e5c14ff00ecfe5 SHA512 6758fd3c7ce462108a13f9d9f6d5622848ecc14cc4f02f3e6f1505061973640b049d926074a603092c410d4b3387a6014648c0a3b0702c90084c5206a7bc4c59
+DIST github.com%2Fcontainerd%2Fcontainerd%2Fapi%2F@v%2Fv0.0.0-20210802172229-7d4891783aac.mod 608 BLAKE2B e7ec9e168dd5d62859e5e1eb07c4ec3bcfb1269c4f182b34d9b14c442cab2547586de069a10d13fe95ae8e77cc6c07dcc7f4a0d50c37a837eaaee5179f313ec4 SHA512 714fc1bd2fa12785cab146df09d0ff39824c9230dbabf879f6c341a99f956b7dfb0636f9ac541369cf216d30daa81e7cc2a6176f719c496ee7028ce61ddc5811
+DIST github.com%2Fcontainerd%2Fcontainerd%2Fapi%2F@v%2Fv0.0.0-20210802172229-7d4891783aac.zip 248515 BLAKE2B f5406c65a31813d93dd23d884d7014513a4d42c2735a4ba43b5ac225527394b36fa184c7282797739cb273b58cf091275a7987aabc88ff69008fe3fdd6174933 SHA512 9f97d55beddbc89faa46ae0775249d1004635b72d45e9cd95aa8e7a6035fcfca59a8ab8a38975407e094fbaa8436b34368c9b84e2e1666e306951bfe2057420c
 DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod 40 BLAKE2B d99a912436af30ef3f5fd53f6348367016633170289e08c271f0148a47db1f9c5ac5da362fcc3f6fa5a7e7977377299adcffe63e9c3315c45ec173d55248006c SHA512 442fc394b0be5c87d2b9edc858f47d52b1027acf1fade259879bac7c598e51692199cba7d4e175f21f772193f1570e47e82d6c6c6fa160e253eb49b09cbca793
 DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190815185530-f2a389ac0a02.mod 40 BLAKE2B d99a912436af30ef3f5fd53f6348367016633170289e08c271f0148a47db1f9c5ac5da362fcc3f6fa5a7e7977377299adcffe63e9c3315c45ec173d55248006c SHA512 442fc394b0be5c87d2b9edc858f47d52b1027acf1fade259879bac7c598e51692199cba7d4e175f21f772193f1570e47e82d6c6c6fa160e253eb49b09cbca793
 DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20191127005431-f65d91d395eb.mod 40 BLAKE2B d99a912436af30ef3f5fd53f6348367016633170289e08c271f0148a47db1f9c5ac5da362fcc3f6fa5a7e7977377299adcffe63e9c3315c45ec173d55248006c SHA512 442fc394b0be5c87d2b9edc858f47d52b1027acf1fade259879bac7c598e51692199cba7d4e175f21f772193f1570e47e82d6c6c6fa160e253eb49b09cbca793
@@ -187,10 +208,14 @@ DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2F@v%2Fv0.5.0.mod 2103 BLAKE2B
 DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2F@v%2Fv0.5.0.zip 1322904 BLAKE2B 36f85acc756fb67c718cbb93379e8bbb8fda08e1187e5c585bea606d9df0a81c7505dabb6a7fc07b8f8de77394b27fbed013111525b9a5cd8b929ad2b4bc1d8d SHA512 2ecd2dd1d53b554a6d06949d9150438937c08ba1bda69b63e12f262abab81d8ebe730818b9b4fdf1e293be1b69a33334481ca5e66511ec1f0114cee42ad3248a
 DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2F@v%2Fv0.6.0.mod 1760 BLAKE2B 44223db76401f6be9c6e41ce99003ff40184051f7e56199cd17ad9aec45e4f77d561cb02662e588552486ec90d31a45676fa6fe07f7e69da89c39945b67e0b98 SHA512 518d9838e6611d58bf75a1e5e237b63180d79386a71a2bd947cd5c58e645360c2f0343e4dc46d1c9b341c5d341aab0b3f5256f278255f460bd8f2802bd9c8716
 DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2F@v%2Fv0.6.0.zip 1359161 BLAKE2B 2655438f9bf85b939d119db39f34e204a508cce949f03bfd800ba0c71fd8c068a7ec63b84d4ef93fbe9ab5503aba76108ea13c68f3aee4b0a544764687eb238f SHA512 74176c2a9fe4fba14903dc9e3008faa09ae527f070d243ef81d35158d3d0a13e4d48e58477743edb1253bd28c3b4b1fda8e64fc9142180fc7f56665b7d93a5e3
+DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2F@v%2Fv0.7.0.mod 1944 BLAKE2B 09042328852e68e13bcda9f2514d18352c837f72e9038bde3204719120a9d2e0ff2d483c80691ee28ca2905843652867f6f8e3a74f7e1cfa1f56864733e3cdcb SHA512 1ac65ab2f143695eb48a2a2a5307f8b5ba603d39ecf2d21b8abe610dfe497046764e1372d41eb1528c03ea31dd0f5e10a3f86ec517f9212fddf0deb41d487612
+DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2F@v%2Fv0.7.0.zip 1393578 BLAKE2B f3bbcc68eb66a7ebfaf0f883df7308214d65eac21ea130abc573eeaa3156080ce0d4b86109fed1e9b42b94c30c41da9f0f5e66df12dce7c6533b0cd374af3f1a SHA512 f357a8f0578c16616ecba069624a0335dc6a9a8179c074f4a1666504b4e5742b2f0453c609c7401363595bedc6a79cfe0aa43a5c8714151c841ff6f7679bfbae
 DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.5.0.mod 206 BLAKE2B 24bf49367435550e94b447bd721179472dac87baa5408d977cb74332d3692d737cf318b53862a5f491db9e1976d587ab2de0b6deaa0fa9eeedcb99bf9d0f15d7 SHA512 fac00528e2ab9ad25cab448470f587b75caa7a0306a2da67add4b53fc55c37edea98e1c78bc195f1a992d988f09cc2f0f27b1226fe970ec95299d13e9eeeb132
 DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.5.0.zip 40519 BLAKE2B d97e8dfbc8b4f1f5a0fee086c2c60eb13837d0d0df782703c6ee93d6760fc6aafd17f0332f6151daf549a68b2461bbe91f74b5532f504ef1d9b0ea97f5b7d9a3 SHA512 cd0019843d95c7647f0b6ff560367db54e420936c83c7931a21d56ca7654c3e33d820e36e2a6f206eaafacd7235f8086710ab2cbad62949152c964fd394c23f5
 DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.6.0.mod 245 BLAKE2B be0be58e14f8bf39d1081bacc3cd8aaf71d35b266591bc02beb55ca5189c0d00cabb9a5cc485034a02085744aee54ff7d4f5c8991a0d4cdf9ef60742946838e2 SHA512 70060fddba343303667b043a1dcdfe8ba82d6c942da23ea1001704e1f0cc51b6d802a44e747a9f5b70e707e3f879e64f35587061a885a2a3efed1378393e2fc6
 DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.6.0.zip 41321 BLAKE2B d393723608263d40a2b47b08a84beb3ba77ef5aacd15840c38b80af3922d54db9ae584819404a060a8c98faf92241889fb005c816268532d2d058460c164efe6 SHA512 c0526762d0ebb283669bb95b67fc70272836fe33d28660af5de337ec886a45d901fc5f47415c06a837bd3ed0a0d81448e36149a0e15e819e4f712bcfb01285a6
+DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.7.0.mod 245 BLAKE2B 21a2e7d2adb2f0542743f9e10abacf243eea6d4d2fdfac2e81a0062a13c6d0626175beb1f8b599de6be27f82592d5c3b635953bc10b75f5e1f645bcdf7681af7 SHA512 b43dffb865edc5df4062b293995662d203bc31450648e952726b20e11238b738badf0bef693d1804983607b9095bfefcf7a807bda8060108622b7492a8dc093f
+DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.7.0.zip 41472 BLAKE2B 35df1624b7d1419cf2dd77d385d44b0226162849c9508e627a7ac97e40e7b4c4b1c62793616ad3df1014619f01594956524df0d0ee1167c897bf92ec03c33f82 SHA512 3433093add08740a9ff53cea72ff08111e55c13834038819af3cc434e232e11c591281e9019a9865660af8465738c552e4720e785d14d49e1fbf56579b46bdf7
 DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod 35 BLAKE2B e2c6e0700e40d563dc690884628fa22b6dd56872a63ada54374c07cd6328aa332b6df2396300090da5c9f7ac730b6b9bd60dbc776557c4614d5ab3ce003579f2 SHA512 93f981daaa62351a480595cfb2feffad6c34770cf89f35399d777096fc524cafa50d0dd3f56231ae41b15e56061ab83f0f6829190730dbfc7f9fcd594af7b054
 DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828172938-92c8520ef9f8.mod 35 BLAKE2B e2c6e0700e40d563dc690884628fa22b6dd56872a63ada54374c07cd6328aa332b6df2396300090da5c9f7ac730b6b9bd60dbc776557c4614d5ab3ce003579f2 SHA512 93f981daaa62351a480595cfb2feffad6c34770cf89f35399d777096fc524cafa50d0dd3f56231ae41b15e56061ab83f0f6829190730dbfc7f9fcd594af7b054
 DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20191028202541-4f1b8fe65a5c.mod 368 BLAKE2B 52b871af9fd9f2b71074286d0877d16dbf6e9395f18326cfee8cd1eb7339b4694bfb90ae4c843ae1f71cea664a64d4b090b3b8be7e72f01366424400ec2ff05a SHA512 1655c00f6600d5a2ce87971a893f5e23b4d40f1e49d62fc39916751fc8c5352766321761b1e4c5f321f8e205d5164409c964ec508c9cb7372bd182b850692045
@@ -235,6 +260,8 @@ DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod 91 BLAKE2B fad305
 DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.zip 116823 BLAKE2B b33381de26ca23c0d218ecd16b22bcf13362635348a4c9887ab2c4ec803e0dc2996833eeab85b327b838a234198dcd555dc148a02b8b1282a1dab61e44e56c80 SHA512 4aeae5f35d7de56c2e693fae7eaf6f418745b9d9b8a7652bda4acd6c2979cc2cd175c4809386b7e762d9c243e1504baf82aa4e4dadd7bc6050d2227a61510b7d
 DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.mod 91 BLAKE2B 75d03e4a6fc970743c11a4a9d52dedc93f72b3dd3052c72cdd660af9df42b014f48ecd65961248e3b20f3e258d1ea36e058879a7039ea58441902ec5f339e382 SHA512 722430decd4f1022e8b035bcc7c1ed295db21a3c64f9dbdf409bd0442356664d378d4af37b7de828c02453014a5a9ddefb3397cbbbc8481c14179ecba9499a5a
 DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.zip 120665 BLAKE2B a4a827aa46ddaa2f2c5edebfd1a3073d9e7a2df73350e3911d13d0b0e6fdbeb350b43b21247dd352bbde10e4a70cc055c2c787d279742580a79036b3e85206a5 SHA512 ec784c6edd689968aa88bb5eb3efc096e9575b6472ddcbb01f0a57954ceae4461c6255242adfa9fd6976ec60ceed721ab2464c6d4132dd9c98ef3a588b6bd553
+DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.mod 91 BLAKE2B 75d03e4a6fc970743c11a4a9d52dedc93f72b3dd3052c72cdd660af9df42b014f48ecd65961248e3b20f3e258d1ea36e058879a7039ea58441902ec5f339e382 SHA512 722430decd4f1022e8b035bcc7c1ed295db21a3c64f9dbdf409bd0442356664d378d4af37b7de828c02453014a5a9ddefb3397cbbbc8481c14179ecba9499a5a
+DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.zip 120397 BLAKE2B b34e5bae7f632d263c866a599ed6eb9058636e8c69c972409497acb9e93ae0e5228899020c507d9041080ba8c57b8a8dd82cf74cc409edfb19ea5a3a2d6b6d4e SHA512 52b3913281e95bc58c31efab3112186e660ccd74b575f482ab6e830e7331aeec8b92778400259114816ba58648463f505de42c5aaf322a30184a8aec5a08b1e3
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
@@ -244,10 +271,13 @@ DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1c
 DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
 DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod 45 BLAKE2B fd78b551df24aaa503a1e3a673291776e988c7975ac3bad69beadbec7ac5c85675da6e6da9deb4463535e1b0ef0a3e640df6e7ce771de71f033f0e7a3f67a1c1 SHA512 9d9af0844e5c76f84c3804b788cd643e461b02b8a00fa5a41a6238dd72dbada1bb03aa3e7e420f0c68d9926b9cbd2d159456f26ceb64f1c51162da939742d0fd
 DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip 8869 BLAKE2B 9c466fbe14685f949b792015995e38f276bc66f3f6ce8df45cdce9b1fc362733b3f0b08de7ed393c4fd89f24a48e4bfe90dcc8302af8e636707b07da769b4e8d SHA512 e8c8cbc63aa82d0544634f3aae9a4c94816aa5797bbc1946aff148b19651bea6c3c544add0ddc644d20eec3df99a4056bf11f7f9dd83943c53e7c443cc393eba
+DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.3.mod 54 BLAKE2B 630d321607bdac211853e0e0e6649b1bc292bd52fee12528d8036ce02bc239e56647c75806a02f582c3e5388d9d8c66537182b94990d8b177869264675dce1a3 SHA512 78a9a387ac82a766c8c71c7fc31e977cd013c806d53794f81bb112ed2f6494ea2bc411e6f5746b71abcf8c39b0b60b981ccf09794197879ed96ba0aa8819580c
+DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.3.zip 9200 BLAKE2B 9deff8f1bf679bd1720b6b81885b86f5edb666a73013c3d6f53cdcff78636189fec3eef656c1207baad44ae5606ea4a0a1ee654dfdb5bba7a0ff823aeb173b36 SHA512 47ac4da2c1681795ad589033fe540797c0a9cb80de22ca4fbc2a9e741ae810f06a190eec7d1e26edeb1e99ea5a56cb82cd159a1edbe3ac04364b19455d85c1bf
 DIST github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod 28 BLAKE2B eaa8a9fbcae0146b856a3049263745784b408c86ebeec08966f1f51567eb6185a58ac126e1c2cedd76fb83904c2011e30be079eed09c1ae85184d3524fae2cd4 SHA512 26d198660f3090f0b407efa5c534e963fe98537117ee3bf8ce6b28d84d4cf74320abcfeacc400e873ab16cc28cc0b158b451526d8ce22d08e98f8c5c473423ae
 DIST github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod 34 BLAKE2B 9c3101272ec15930da5985c33a6f623be604c73281209793ab20276863a7552efaa8c1a9167e0a5ecdb11a4f713909be8dc12103ced353d21d19e28693820fb7 SHA512 d93e8325fc82633cea4ccd5ca7df21c9d72d9a0c79dc39299008d7b163fcb67a7f9bef8cad2d2a5c268e85c41ee8a54bbf4657f0f0ecf20b211eff7f1e5b3b36
 DIST github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod 34 BLAKE2B 0b56809cf0ed4e3bfa7b79df2e82e247e083dd3b7467cccf31efed7b2391c817a41eac5e85035ac5ed806bf19708c62b54f634ecf6b5ca83d5781f40a593dca2 SHA512 ff1020a813cca721b7c41d2d4c3fd1924af07afbe798d352a44b07486dff9d823f8953bb011ad3a5b2ad87baa4bd1baa97be1820bd22bd98d37f166b4f0bd9bd
 DIST github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod 35 BLAKE2B 9f1621229dc76bcc02487adf4642116dfb391ec3abc3fe408364eab83a969dd8219ae0d6b418ba181fc3750799ec55fc49a3e3619cbc1d09e11063ad85b61a5a SHA512 35fad2e2c4120e7a4a22b833a1e7c4c78a97498140a4f8d1233acf1cef5936fe45983217d45f73e5ecadf2c1981a0bf1952ea340e987429d3114b18054786c73
+DIST github.com%2Fdanieljoos%2Fwincred%2F@v%2Fv1.1.0.mod 90 BLAKE2B 0a24f9a2c83c1b9025634475d751568c7bc19debd6a8afad575b380a3d2c0ef96be606704bd499a73c2d9c8f9d01db4044fba2675946babf8abc887cd71a9be2 SHA512 fc8636375194f9bd930b3f2cde2fd77aa64f19eb54caadf65a1d1e10e2454902bdd9041942e9960eb9f84ef22a2838d581894d935c25d0bb837aaaedb412296e
 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.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
@@ -261,6 +291,9 @@ DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod 32 BLAKE2B c96afb14f9809bf9d
 DIST github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20191017083524-a8ff7f821017.mod 29 BLAKE2B e7c2f5d22f88da5836f4de5c23e6e1a0e1eeb43e7d6b49b79e25a2b5d04b892ad9dfe7bb174c93cb60faf8e78683af6b296606371ceaf7eafba76a85a6b1c73d SHA512 7681fbfbd36f2ab19e01f6e38f899cf538fa34e4abb34bd38660459d9060367f49680c85f75da08f8d3e7981e9ebf1f911db26e31e1ab44f451640e435cfd877
 DIST github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.6+incompatible.mod 29 BLAKE2B e7c2f5d22f88da5836f4de5c23e6e1a0e1eeb43e7d6b49b79e25a2b5d04b892ad9dfe7bb174c93cb60faf8e78683af6b296606371ceaf7eafba76a85a6b1c73d SHA512 7681fbfbd36f2ab19e01f6e38f899cf538fa34e4abb34bd38660459d9060367f49680c85f75da08f8d3e7981e9ebf1f911db26e31e1ab44f451640e435cfd877
 DIST github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.6+incompatible.zip 2028163 BLAKE2B 3e161139a3dc701565f3bfec1cdec3ac0db320beb9c4b7d9390046f26e55e79574894c124da6140bfc89c934e2b397056a077be7dd713137217e75475b43531d SHA512 b0d17ac301889ba472832418b075e2dc2af7573cf0bb286f0c985303285d9bf96e639441661eb9192f5ac830f3a20f1dc6790f36d73c36abff59d309d4321f44
+DIST github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.7+incompatible.mod 29 BLAKE2B e7c2f5d22f88da5836f4de5c23e6e1a0e1eeb43e7d6b49b79e25a2b5d04b892ad9dfe7bb174c93cb60faf8e78683af6b296606371ceaf7eafba76a85a6b1c73d SHA512 7681fbfbd36f2ab19e01f6e38f899cf538fa34e4abb34bd38660459d9060367f49680c85f75da08f8d3e7981e9ebf1f911db26e31e1ab44f451640e435cfd877
+DIST github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.8+incompatible.mod 29 BLAKE2B e7c2f5d22f88da5836f4de5c23e6e1a0e1eeb43e7d6b49b79e25a2b5d04b892ad9dfe7bb174c93cb60faf8e78683af6b296606371ceaf7eafba76a85a6b1c73d SHA512 7681fbfbd36f2ab19e01f6e38f899cf538fa34e4abb34bd38660459d9060367f49680c85f75da08f8d3e7981e9ebf1f911db26e31e1ab44f451640e435cfd877
+DIST github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.8+incompatible.zip 1875439 BLAKE2B 43c4fcf0abfbdcbc4b67e9a1e334ce8f6c5ee5f120a1f74f6334da267da7c4f9fbfab31bc30cbd0a15dd40a6a6e2e2605b539b3a96a7fe57b957eb9ac12fb05b SHA512 bc226854a8a98d68a73eefaafa2c8f5fc6e499a52f4a89433ff72c6bd988e1269f52a2fe90bd23760381333ac4458f86099b20c55b897119196033ca6ce255fb
 DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20190905152932-14b96e55d84c.mod 3136 BLAKE2B 7f2d74332ccfa9e92678b72ecbd9fa615c78924d6e8a7be0690cb11661d2a86ce19e97ca5839e848439bc91709c2b50d8d2f34cc91e50288cb3fee1b3a10a926 SHA512 5facb46a2728b34cbc10c9b1ea5f46da1b528e21214dfb4b12ce01de682d7340ceac6dc31cb6d840c6f596cbd1e2efff4003030864453d70280bba40cd256d9a
 DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3
 DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip 662227 BLAKE2B e9c50aec1dd4d34aab11819bd341b1f0f6fdc32bac63124930d45f76f0259aa5e1e4781bb408411e643574112ecbe57c3b9c4c5fe59399c153d48dc5eb5bea41 SHA512 aff78c88f3bdb596f1855ab993d8ec3315de9d4809757e2cba6fe22ad4d5dc220242f90e73d9d0a33f9a13521705b82c8526082e26c752fb027dee4b28299d52
@@ -268,8 +301,13 @@ DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0
 DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200730172259-9f28837c1d93+incompatible.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
 DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.6+incompatible.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
 DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.6+incompatible.zip 4574445 BLAKE2B 80512e0154222f11ff11e0e635c5e877f8d76eb524f13454b3c6923dc2ddc24fe4ea203d0b6f1f0d9ade39e02bb3c3780913e29ad57fe69562c82bb2f5ace7d8 SHA512 ecb7ef6c7f9ded19433b23ceb035f260a4294a1fd8aaf3ce8e3c87845fd1ce376f3034b8bd2e9c668ba9c8cbc6404d238165d72edd40eed7d38b435e821a59eb
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.7+incompatible.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.8+incompatible.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
+DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.8+incompatible.zip 4581937 BLAKE2B 4489a6cc2a99874169d19d795707a40b14486bf63be32193fc8b122d43c3670fe46012d04bcf02f4687a0aedbb607709862b5322a43a50e70ad5afec92e7f9c0 SHA512 84faba5542e022d9a003d2cf24d1088327a92247a344740c999648c37c934bf433089b035f2320cfed4fd914bbc5df4cc3f12661faf59f7d3827319ef0f25eea
 DIST github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.mod 51 BLAKE2B 324ddf12d16d5c0261f3700594d6a352ad79601237806dfa84179ff6524b7f8f2f7eb13326ab6ad1f7c22f4a358372de89f4f257d5ff6a702e865bbb56c45274 SHA512 a2ad0b6ddee7601a260905c3d146540292ff3bd69b62166b6b4ae1d25f4f0c8872fe144ad4f3024d0d9723f0f1c8c9ae7bf4e2c6ea5f30a14161bee94c3c06b1
 DIST github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.zip 41818 BLAKE2B 6ca108ca56e91e78fdce88d8b76b1bdc512b90094420a835ffe12da142cf77e44b34abe20276262f65574697f2b1ffe49f3a1d1885fb68d5c76804a7c0669967 SHA512 c622c80c2431280c295ba6fb7f1cb0306a0156d4c2a118d5e22294a92b5bf30cf0230540a979e94abf6dbacfae2fb9298384555415d1efb0a2c1a02863965efc
+DIST github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.4.mod 164 BLAKE2B 98d2cfea4693193f4ed90e3cbdfc20e607379f927fbd0093010177c769da53dac0e89b2c0fedb7003a785c509d0b8c70ab6dee84ee60ac48356d78f92fe8bd81 SHA512 d56ef606352ed3ab1e7f9e41f045aae08ee882d075dd5612fa3fb839e05243d1f365f6d045616ef4ac983e8585129a274624d26b7e8466546854e50e873174e9
+DIST github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.4.zip 42413 BLAKE2B 7226b21a60c88755c7a67767a41dcdbbf803457051fe063ac02bf7383f6260aea52aced8c5972e4b58d00ed74c2395c1ce41ca90a9e8d76349b6e9f133255b6f SHA512 3e4eaafca9fe197e10f4f9351889c72ec37871200325400080e67e8b670b589ee3016444e05b800a5a7ae82e427507019179c6e7b307f998d3a85f7a553aa5f6
 DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod 40 BLAKE2B 13f8b46e2e71edb04180a1734d63e1e84dc75661ca635d150fd2bb8b1213df768520fc1c5cffa7a9cb224cb11788efc5242dd85138915fc21dfc9ff95b1d2737 SHA512 721f6b5cc358f8ee7093f7c80e4153ebc474f2052bdb3a91bf2a4ae9d2dbd2e2e50635a5bb8f9b62bd8ee7a0b7420ca9f18c60abcfd5287a953ea63d21aec53d
 DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip 43214 BLAKE2B f64253be261a17ca9e2c6540d70b159c89b5f578921a7f6287e39be2a99fdec8b67191ff06315e5539585ffe812235ddd90c4a9754d8d63e512fec1991297709 SHA512 a61373f6a66f0ffecd3ffa78a99e6d9560419ab325f12101ae90f2623fdcb2e10adcf274459191263e1a80dd866fb98388434f9875c52e42dfd646d3d25264d3
 DIST github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20170721190031-9461782956ad.mod 35 BLAKE2B cb3636f6ba689ab17bbd240c10dd1f1f150988421212af1498f68fcce3250f61f1dedf1aec95c5437ca7ce92c26ebd115d1b3a16da55d07cfa423871e6f6f73c SHA512 ff56a30d40408c088c121984ad3ecfbc1214da641baf359fc36b8a3ae50ebfac8b98add4b9e4a47f8e03f586800fdd9c268582e581bf99e95009abdcb4e83af3
@@ -295,11 +333,15 @@ DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 57
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc51330df71ca612b3a573a93a8ebe57ef4e677157835221dfc5f7bcbada1fd90f7a6a3a002cbde08c6a95642477789d532ddc80e7ecae1f9e6e7c081364e970 SHA512 323c4b1c27bdc5bfb1795f1353d21ad6b7a2056bb0b364adab5960aabb7bea20ab3287ba60685df130abddbd66c3d82dc98a291aff1849dbce8c182c63c7b0bf
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod 543 BLAKE2B 35a7d739e1bc24c321c5732b27fcfc0bd4ef872610759ae867d08f2dea85e55b3f515698fc48299902703b7a8cff9658f30f855a6b472d4f4945f38101ee42d8 SHA512 b52cfc5fde9300a89cb4e59585c549582fbe75c33ca19fe06d1d8797216fdccee4f35a30fb794f37a16ac0a5d54dee0ce53fd938073b42b73cd96203b3819c61
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod 543 BLAKE2B 35a7d739e1bc24c321c5732b27fcfc0bd4ef872610759ae867d08f2dea85e55b3f515698fc48299902703b7a8cff9658f30f855a6b472d4f4945f38101ee42d8 SHA512 b52cfc5fde9300a89cb4e59585c549582fbe75c33ca19fe06d1d8797216fdccee4f35a30fb794f37a16ac0a5d54dee0ce53fd938073b42b73cd96203b3819c61
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210512163311-63b5d3c536b0.mod 581 BLAKE2B bed1b19ca816a806f1cd354de32c7bcf3280cad3afef7569dee60d0963e56a9ac42e3a88e5167df3652d41efc40c96cd88a9a8fa725eabbebe43796365eb6b5f SHA512 2e31005feb4c2a96fa527af45aa2093da2ef746edbd9fd37a7f788820c023d2de132fe3f56e76422d1be856216870f2c07f5c01046d968f2e61281d53e1942b4
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
 DIST github.com%2Ffanliao%2Fgo-promise%2F@v%2Fv0.0.0-20141029170127-1890db352a72.mod 37 BLAKE2B 2192038adcc0bd5fc5be522624f1e2953140a74612a2abbba7c93a24d9ff65b62d73764e4650ab8057927bca2a2bb06a7bdbc68cf1fc9774fd1906016c1f56d9 SHA512 ded2e5dd23c0af5d7c973c97ab390ac9de104f0043bc5cb7ef38a2d5cea715b66b895325cc4b9766da86c87a5b04c702e579a80e9e2e61cb2835e63c27549423
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.mod 126 BLAKE2B 3ad1240496ce1f7c94c224a1eca571a3671851bdfebb40b243cb4aec90e329c820788c6080083e138240b9aa0a6e980701e12349058a1fd7e9c972faf7085fd6 SHA512 d7e895c4a2e515a0d20f8839b4f6d52f3aa3d000b97cecc99fbeeb5080e53c260ebc3aba0ca6ea180a2f5c88d5ae303fb94a257cb55aa9430773f6f5b4048d87
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.zip 12593 BLAKE2B 359ee7d5efadf7957871e7fbe9671683380966044426e0318f582a5050fdc11a1168493aa7dc4690bd44eb75543536dd8390d37e14a9ac408d64374c20102e76 SHA512 205d595d76ba552b654c7c991d4df0cebddf1323915404749f28634f2bd881798f291e9dc1666a10fa00fe1fd95bb2afb091e7936a02d18082dbb4d21ee5cdac
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.12.0.mod 126 BLAKE2B 3ad1240496ce1f7c94c224a1eca571a3671851bdfebb40b243cb4aec90e329c820788c6080083e138240b9aa0a6e980701e12349058a1fd7e9c972faf7085fd6 SHA512 d7e895c4a2e515a0d20f8839b4f6d52f3aa3d000b97cecc99fbeeb5080e53c260ebc3aba0ca6ea180a2f5c88d5ae303fb94a257cb55aa9430773f6f5b4048d87
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.12.0.zip 12823 BLAKE2B e96e2f6181cc92fd6f7006bd19b89d68d57abf2d8ea35cb0e58a670cbdb03b9aba6ab916289254f5cdc41b641d7e1d6d37ce239f0399e94dbeeb6db0685f8aaf SHA512 d78e12fe8706e0eabf04a57212a013768d7b82f7eb45b675f424d0c92cf0a741cd42a423a4538cfb04d03242ac873cc41f0f0c9d01a3b5cc2c31c9dcffe6c132
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
 DIST github.com%2Ffelixge%2Fhttpsnoop%2F@v%2Fv1.0.1.mod 45 BLAKE2B 4a3237b18d8ed12d10bfcca77c7b481fbcdc328397faed7784ac1b31ff2f430710a41a383a1b4c63dd6e23eb972aef3de6848c19f49e182872b7c3c9d6cbe6c9 SHA512 7bdc5f80046ba76d6bea23b428460edb7ae3e0837574927b22f903ad2846eca18c202cb77cfe4273b8814bacbd6ce3f28581ae3e0c7c09342622e5a582f1b691
 DIST github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod 39 BLAKE2B 03c2848adc48e404015826fc857d2a7b923efe39f2b11ec28e238ad2b06b0c5f4539f256443f91a116bc135923de7c4013a44285763b482d2baab5db1bdbefc8 SHA512 6c5546d979277d5488fb31eeb9fc33999dea631baec6902f937e19f4d65a23a2bb8620481c3ec69606eabd019be0096553097040bc778522b05f85ebc56bb787
@@ -317,10 +359,13 @@ DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a98
 DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod 121 BLAKE2B 6463ba6a856a7bb4efcd00a3369f6593b31b8ef39da4bb16ce1acd741c0808d2243ca7787c0a52d4653a5b402841159e97cd4b42e0f6172ad39429beb2b06993 SHA512 564f0a1b0318004a7ed478c8f3a371ea2f59efd56eb2efec4fc806183de1b4a065d5b44aab6dbd40446d28caf5a74545a7ff6a3d428b1b41cb6df5eefc11e5c3
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod 44 BLAKE2B 0122d72cea88331beb9500849a0936a966e7a48abdd2e76363151bbb124e35481e7248fd896523eba3c51c5f4575dbc13304c2471477757c1eb2f8fb2eee9cc1 SHA512 bfebb8d865586729abcb0dcf4c19a8938f06f9b502c78bed92d01c18d1d037f7df44cc1a1fbd4ca094b1835b8aefbd48fb5988e2884656ca44be0aa83206aadd
 DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod 31 BLAKE2B d141d98fd2673b422369b754fbd430a465f08bcdb07fbbf1ed626304ecd0843255fd2e909fc395b04c7adec18a15dea65ede0c64689be98b7491729d13363db7 SHA512 45bbb63ae2dda8c2ea63c9e38405b379708326c3f2e7963e3589ea53d06fd3bdce1613b5a0c1ef66f9c6ddc21374b1669218bd6b3210918df0a4b205116f3e14
 DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod 40 BLAKE2B 58806201fdb03763a50b137694c83456be85e03dac2b8ac7a1dd39c27795225d009e38ca6bb232247dad1e9e6868fbc7d6e976ec8d50c36adc2f7ce7e66f75c7 SHA512 f1933f140710ea465e584361e0751356bea07b0e772ad7da7eb3d8ab2881a55c8c300140778defa1a541e3e7613819c28de76127168900c8d52e931a8b408d97
+DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.mod 40 BLAKE2B 58806201fdb03763a50b137694c83456be85e03dac2b8ac7a1dd39c27795225d009e38ca6bb232247dad1e9e6868fbc7d6e976ec8d50c36adc2f7ce7e66f75c7 SHA512 f1933f140710ea465e584361e0751356bea07b0e772ad7da7eb3d8ab2881a55c8c300140778defa1a541e3e7613819c28de76127168900c8d52e931a8b408d97
 DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod 126 BLAKE2B 27ace39813b8f55ba228ea7a2f298e26bc30daab931d25167887237a6e2a944014b132f143a20006e69861a6d4517d597ea6d56f74b2fa6941752f3161e44644 SHA512 a33deb764fbcafead3f863c4e20fbd6969e8ed04098fede6872555405fa4a352b31f771adfb5df03fd633ee5471dbe259407d873e230af01a1fd31b78042cee2
 DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod 210 BLAKE2B b3f610a7bbe7758041e145a17de7becfe6ef0d80bf8a2e6bb9de47883483b3ced7f09e0ef1d170f42f1c5928913cf80043727b3e62fc0025943f6a327a884f64 SHA512 d927113c08de347570e5ecf4ef7019c7574e9fa2d751273e8c68f114b49aa4a9d9c39e32937ddd1ad3d665757d59a4e498fe275578d40a6b0dc644ca7dd8fca2
 DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod 354 BLAKE2B fac3e9e9fd1514b1e07894e6931cd0368df9dcc09210519c569d81871ef1350810111ae38799b9f0b5692829d380b403d8f7468e81eab8ca22027ac3dd8f9adf SHA512 30bf4610b301503fed728f146ed4458dd3bf295e1e4f7e1ae4806f4ca6e8856be988a10642c84c5dad601d71ee5b7bbbbe0f3e371be1b382c3c3e869493721ab
@@ -332,6 +377,7 @@ DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod 47 BLAKE2B 7252c3d085a
 DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20151105175453-c7fdd8b5cd55.mod 30 BLAKE2B e9f919d91a822060a84e112358ad361bc7be6f3e6e7cd668aaa89ea053c08d27bd20d281550e1f5a34f3db10ef19d7ec918bf094c755ba58bc01e17f7269fb40 SHA512 b096b5a6e72184dd2be5fb4f7ea9458e0b61cf6ef43f92a5fe5d225318315fdedd92bdc351b0802bb0959f77beb0aba830ef171ed61c6d84103690c22e8d8945
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod 30 BLAKE2B e9f919d91a822060a84e112358ad361bc7be6f3e6e7cd668aaa89ea053c08d27bd20d281550e1f5a34f3db10ef19d7ec918bf094c755ba58bc01e17f7269fb40 SHA512 b096b5a6e72184dd2be5fb4f7ea9458e0b61cf6ef43f92a5fe5d225318315fdedd92bdc351b0802bb0959f77beb0aba830ef171ed61c6d84103690c22e8d8945
+DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.zip 79710 BLAKE2B e3ed337421026ef55bfa8f7f7b8dcc9d73c2689bed88d5a29a754ea57fac79b7f49bcbd9604ed899b5c849331435948d523c172cd5620a6541278a499d006ab5 SHA512 84df9cb96823f3bd063992f3ab89248eebc33cf1a78b2d72bbb5065d120240548ddd58490d25ab9a56c4c982d208b420e26d10a251ab0acf33e7458ca6d3a4eb
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod 39 BLAKE2B 9884f8a07f2a84a159eb17ef62e9b17398b84bdea38fc37591af050dcebc2f56b83f851046c3333e604a7f954b7628c16b267c0c94807f7a41d5d2b797db0918 SHA512 c32a84bb302c9db3f31f714484131ee3ea96fa98b224b9cbf2c5fdd15100a24094e94b55175cf1fb0b6326128c2db8950677d8f6d281b49645b0c7b51b759093
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip 91123 BLAKE2B 16eab5a0f642cdf2af9b9ffe96a6e83ad03f0a6d7898841defe1ee5855de12a28939c27c7cfa5c1a676c8293238e6282256ed22c10a32ea47bf3d41f7b2fd507 SHA512 74be69e28d337ea6c5a8ad4f2a563f0480d04efcd1e07d75cc73c008a79e5dc9bc4f8eb068a7eae263729a81f686f5614af211ba78dcdb786eaf65e4199e5363
 DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod 42 BLAKE2B 79541bfacd3378a6c6dbe9591309a80390444f2dc2419fb0137c723c6a2ec1e0588c00704ce3c19dc93297b19db89f79bfa09daa2632f6674e35e76819473cb0 SHA512 b9aad4f1c1d4f2c43b293b0c9ca8a600a37ca407ba8b22b0f826c8355828cb7860a96a85df84f720fe8aa2840974807ea7ea7b790790c6dafed794e761f1f26b
@@ -339,6 +385,7 @@ DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip 91628 BLAKE2B 740176e3d83
 DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod 42 BLAKE2B 79541bfacd3378a6c6dbe9591309a80390444f2dc2419fb0137c723c6a2ec1e0588c00704ce3c19dc93297b19db89f79bfa09daa2632f6674e35e76819473cb0 SHA512 b9aad4f1c1d4f2c43b293b0c9ca8a600a37ca407ba8b22b0f826c8355828cb7860a96a85df84f720fe8aa2840974807ea7ea7b790790c6dafed794e761f1f26b
 DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.zip 99582 BLAKE2B 1025ed3dc8e4d6df78ba5245b22e61bf5fe880c97578d137d24a975fd0076a7567b8ec90676f8d295c8b4b183dd7eced6ce898df68cc6f01f64e68ea651b2d54 SHA512 ce8a6e20c3f1276440d7e8858e938e5ac7706e100cc0e172c953b2c833b35f5b2c80c47c895787d0bc5170dbf2873e23c88e6e5991b74b7538365deb6e7d718d
 DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
+DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.1.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
 DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.2.0.mod 84 BLAKE2B c25f6962ddcb02b08459d3ea1063e6c3f20e5565e0a70673b7f7c505ca25e219e1e365cccac9d75054b23446e4957a5b136479a35e0d261e2e16519d17781e78 SHA512 be902a6eafa64bbbf2f347367265450369fcbd47a132c3937a7b72946aab00c85c8cae9f98c49dcededc5854362fd78786df3f54ef07e58cd5c92d2b5904828b
 DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod 84 BLAKE2B a4c32df89469a4b93e0d85b867852d870bca997fd2d31163529c9a9f43e67765099caa6dd708e2edc4500b5496c4d36445d8f5c13ec9b08345d6f155dd68fdf7 SHA512 435ffb431d95016e1b15d4bebf142423ab3ac863a17a8ceb4a1595892e1a786a77b37ae0d3c63cd55904e92a783fd908ff5d79f9eeb5e1ebe98dc7e2c0b9a078
 DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.zip 198421 BLAKE2B 34ce056cf560b297318507470d955feb6b085d43b9ddda94bdd04a5ce5f20b0a9f3964269b7746c80020d660d2856aab51dd202d67ab5ee04c34cfdd63d03c21 SHA512 39c6638ecf2e8b3a8d71f8f218b266d4d8d15c008dc5860cc7e335f13719003dc2cae0a478c57d16080009518fdf8567d23790d456598432ea4b8659feaeb9a7
@@ -376,6 +423,8 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod 124 BLAKE2B 9e60030e0014cb
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip 206951 BLAKE2B da403116137f70222d2028df84c6f872d324e6aef808ceb2f58dae257e9b7cd2fb37b477c2b61bda55888f5aa72fe6f46afc79ed4fb440f1212c5105f8b6dcc2 SHA512 8df603b906846c265342236e7bff8ad4f37fbac2ab425b6002201ec727602bc2454708985d44de11bd91212e15e338ce1942f33a3e38c328f2ab9e3b990a2ab5
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod 129 BLAKE2B 15d140a0b2b22d6c9886ee9e517f923fda26ee8179755702a8eebf1ae8cf75be48e8d28a1df1bf875a7bfd499075d83a541c9716601856abe0e7c850a3ec68fd SHA512 467a3f6fb4c941cd55d8d4b2d6a2015966c60a8614691539c88c4bf0da2f8022055be8561cddd0e60b118f74f010be5998dd128b7b136f14edd2674e5650db2a
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.zip 206670 BLAKE2B 8af535e80e1e73926cb7de0c16827156c89f41b1ec164ed6a0e8c9fff2316b5bb6f6e55b62775e4a46cde45ed36f440608bcc762d983b11e936cc9237f37482c SHA512 e91f339e9b4ccbdc3c7d4f8c3c0e23cbb5b55ef7ced715a7a80387232a25dc86918904e40159fda8a4d8bc20ed4404bbc15a425f24cac56d6c3eca1c1abefaec
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.zip 79266 BLAKE2B a012e020cf28ee7c9e096068c22514b643d4b299e9396a37f08a003a3167e341cdcf40e1cf424c22d81b9b696175210d42cb8398c9ff37a80d47f4daef10d82c SHA512 c8aeca0bebef35a5a5e87804cf3a74cfe879348fa091a8d49144e164449b9f15569a9ffb7f8f684149251762186ff898b1e8542ddf2ffc642ec625826523b5a1
 DIST github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.8.2.mod 87 BLAKE2B 0773fdd526eb902a32d34118dc076c69c3f139d460cf560de1e19c3e87c789e1bbc8817cdff589c3b80c2a6261cf12dddfff9dfa45c2b18115e8f58760772d5a SHA512 646e75a75a215257409eacab4870939be8858bb44279b446bfe11a3364272e9f9e463b6b0fa00dc739f6def2601aa1bf892c2c61b63135d597cd10249a672940
@@ -405,6 +454,8 @@ DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip 21941 BLAKE2B 94e8f4d50c0651e1bb47daf76c642871e1e3c53b725910aa101991a7a9b83b8042f76f20be54323b66b5dda1900a7fa5c3708ba0ef02fa2a72c2012efcfa1644 SHA512 eef3b3444dce760fb6cbca5e22f3fcb33fd418e2b54509e80a2150cc644f41a05a59f0acfb7fee386c994dca06d96f4cd023fa192aab368be08ef20eac4a626b
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.3.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.3.0.zip 25027 BLAKE2B c7bce22cd6fc49d4e5250a6dadae0bebb869d88fc0c7efaf22fa3345763488c9a7e5acc826b87c5001c5e53915e327c653e0a4e0bb945d601a79a40e125a775d SHA512 7160b10282b5e11df66caff015b151a1cb2f52794cd97fb0011440a6a374dcd1e88141b516ab1951de594bac0ca9401b2637c4fbcf3f9227d6fed87a21fc95aa
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod 278 BLAKE2B ddb0dfbc6706088c465077c061562538e66dd414033408a92d7a967fb4382f10ee4926bad97508e4106b9ee341bb7417337630ca006726fe79f3be7ae12a2953 SHA512 3a36f6a3ad1c6dd306291520ed836c77a58390fa21fb6777bc3158df18cb254096b0eecc791947e7815098e020f260a4914bbffdacb53407582f9cf2e908b7a2
@@ -421,6 +472,7 @@ DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.mod 588 BLAKE2B b3d6657ba787034ed2a14fdb98a7dee43e3d9dbcf253558c588f9dc550b58a294db9022d548d48717ece007f20f52f5004ccec0fe92415120f9110ccad5c9288 SHA512 6d314f14132c60d5dc614c81746fa3492dc821c77f2c0cfa90dccb3dddd5dac671682cd842d9ec4b0d03aefe1da92e5bc2275e9bfa2bbce60e8bcb8ea6bdb173
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv1.0.0.mod 94 BLAKE2B 36f3fb449d60fd88b98ab51277603a6c6aa551a1b15fc01ec289506cbb22fca2d7bc2841dd8574c9cdcc5ef14d70aacd5eecd240060b396c76422326f5e5dcea SHA512 a4ec6bdb7df5b5706be0a19144023042cce1fe54d1fe23d2556fcf1c23fadc112f5c4f16d6b497ab0ddf595fb21550543e65ace43a147747d894c220da346ce2
@@ -453,18 +505,22 @@ DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod 92 BLAKE2B 8b5eebcb883871ea090297a64f2ac5171b87eb4881fab71e73fc737e2ca4c301d8fa3a14f184d5c468120ea4b3f22c89867c952795fedbea7abc9b7e618d14c1 SHA512 8361dae50e9bc2db7887bd94f516f817dfc1a3c509c776640b0f9380343236d52a3f43a5ca0093a49a4ab6b5474ec2ad24a4c8549d5949e4f5fed0b322b83c21
 DIST github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod 32 BLAKE2B 108af2b21e180487fb535381cee881222cd34895f1b3d78561bee6bdfee40e7b9681c74345d10881fbe519fc496181b85eb880b5ec411e13b24926a39ae8a512 SHA512 5b3e66c42da78c7df031089cc05aabe56671eeda4617683a1e9857677108cd0dec00332f5b05f29923b1314fa1d1c88e57fac1b653808cadf5a3cde93daab03e
+DIST github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.zip 12758 BLAKE2B 09c81f777d01c390e78ceb0b3bdb54c0ab19e1dc8f1d8747ff79e96c12b9fb700e3affa05a65b2bd36b42cd86979a45a78cb3c7288ec9dbe3b8c972313dd83a2 SHA512 73928846a03ba2fc7df0952deddcfd553e2decfc4b336f4c60b90caace96621b2b01057319706d4e52c6590c4963c049a496aaae92bb054d0467a9977c4befb7
 DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod 44 BLAKE2B eb9ba00998f4a45590f7ab28d94adcda4e2b511ae7078f5583bfdcc792d34b6eded81b8c0f71ced35b782cd1bf344542673677915b44b9eb31873e9c5d69e133 SHA512 4d591cc0f2d11ba450f294361950972fe0dd71bdff5bb0c3e72b673cad6ea990335680bf7650093e1f9978bc8556a0ef9329ae2e8a14c10b7de668aead7afe33
 DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod 178 BLAKE2B 305d9f2431b92866a80f6d956d8c0e0825857da7177e9c628d2cfb88b6995a49696d9274d7e0a8ae5e3ec8a1e490f3e5ac74f8f1decf6730ce70bfc9d3681ec3 SHA512 9dae3380dc38404b99d1a7119e3607aae1cd1132f8d7a808733cc22ed21fbc4edc2d1320d008cb63439812151f44a69938abcff05a6c8727d1bc58b2c973dcc4
 DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod 215 BLAKE2B 290912a223a80b17cda3da4e72cb5a149e6c3e2fa8d79bf221d6529eb74c1e88c602bffe1234f16657433128f0ef3c9091b723689be39a6193e421b44bee1715 SHA512 549d0522fff36f194065fb864e65e0d11fb5aa45f4720d38c74049af138d75a1f7680489d5e7c4adca47abaf902dfdb202d05e8b040f119c1fcec2c22f412d0a
 DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod 183 BLAKE2B e9f24802c355e638823352a65cb9211b7ef90951890fe600791236d0877731924c34624c483ca14b5c97378ceedd35abd8b5f2e2397985039b0096057bd6c0e6 SHA512 c64bfec29d68ac738bfa3ec5263eba71ce749c89b5296e8e16205a286fe715536da5b66856065986e94172665dedbda96531f6c8b7f6803f2a1c4213d9f5f138
 DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201110080708-d2c240429e6c.mod 183 BLAKE2B cc512f6cf373325a09f20eb9dd33809c33d89d93d67ab1b57e95ccbd558e3ca7790ce8a2cbf77a8998bd8f4c7dae7acfed12d338991d036ba7613be8c6b71bdc SHA512 f019e3325b1eed1b46bc937b9aa1639fc611da42952c4095bf830afe8b8e0f237b5a9cda6663860e8bb31af07ec845753790f803f6ab8e7acdb368ef124b0746
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod 51 BLAKE2B 4cf5f813ed021b04c810da33b332dbf44f45594e3657779687cd24391d2a93770f2a0e8999fa5a8b6564da5e08ed9fea1e52394907d518ea14a9568adf263e67 SHA512 c5761bc45d554ee6639c4ca23fefa5fc5c8a7c818f8f18d0b43aaab26c8114615543a1be207f5aedaef53c2dda623edeb7d3ae1c5ce6b72ea42605a1d5c31667
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod 51 BLAKE2B 2e102c58874af58833146011d2b9d64950522530e5bb51d643b06f98b258d7cb52efa2caa36a1fd4d39d4307a37712de7f22d45990ebab7a755b7cacedcc861f SHA512 e208321653fa4f40d2af68b6db37a368134e27463a45691a1642bfbe67186efa2a6fa41cddb3e443e465c7425d8d44cee8364953b39e1b08fc16b447431cecb3
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod 107 BLAKE2B cd132ab287312d1ae53abd542a75e6bdd5cecdcd46c5311be91da88d54e1a114019440b12d71a9357851585672f440dc66eaf359a99b7682ce1bd4ee03869325 SHA512 302828b5c2b6eec77f4a2ed075cd8b721da8d62a8747883d4382d5674a7c82dcea01a7de664d15d5eeba7e35b9667347dceae9b4ec93858ed3acf8adee692967
@@ -474,6 +530,8 @@ DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.13.zip 17544576 BLAKE2B 6696
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.3.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.2.mod 99 BLAKE2B a790a0286893e5d0584fc25403bcd8844f321921992fc719399e34291f7e2f2155dff5202c7407eb5318713e580773208fc414404c86b6daaf8a94f6e3a71575 SHA512 40bef039d92b3a13a5759f1374a7348afa3ce43e1855494c765bf7c4905a22bc6a9abc6bf7b0e8de693f525189416e50eabed20422e07c9809d55d5b43e3df91
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.2.zip 15435518 BLAKE2B ac317e36f17db299bc02c59be373cc11dcb528b0365ce2ea389411323b2f677015c62a26d30a53323fe5e5b92a19c5ec707dea4ec5355d9e325a4cf112c7b54f SHA512 ea969e3eb563a1a729d44341f263cc4f1223e71c6343b8dd3058094c86cb8f590d888cb50aba38a37252aaf3876f4cc3974b1f04a76bc8982e5a24dac611c340
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.3.mod 99 BLAKE2B a790a0286893e5d0584fc25403bcd8844f321921992fc719399e34291f7e2f2155dff5202c7407eb5318713e580773208fc414404c86b6daaf8a94f6e3a71575 SHA512 40bef039d92b3a13a5759f1374a7348afa3ce43e1855494c765bf7c4905a22bc6a9abc6bf7b0e8de693f525189416e50eabed20422e07c9809d55d5b43e3df91
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.3.zip 15436903 BLAKE2B 4f1c974428894387dac6504df74e7988e12a0905428e2107c31b4622e852f998c220ec7ccd2413ba355e43b1a9940dcf27a98f86c9764c8b75fcd7ad6ada1ecd SHA512 7992907c4edf5ef41d77b5f3576ea51ffc555f714b428db9620c3d1064bc1814b1db841a74060ae52544fb074951f09f301354c3dd0facb421eb04b475de7a86
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
@@ -498,10 +556,14 @@ DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod 160 BLAKE2B 10c23e5a0ed
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip 13690 BLAKE2B cc3568a99c03ce4ef19e52a8429b485e774eabddc3ab24315a58b149e8168c448bb1fdbaabb8e3eaea918de96cb7411caa000be4585f851edcb26cb0be9f0a7a SHA512 c39ebb2cc99a555054d55ffcefd5680292c66eed23b1ba8a3595259dc24cd42d432b558014066554308f14fc452b7a830f8b10e635d317b5f14ac0e0b24b1528
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.13.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.13.zip 8623 BLAKE2B f4cc66d4782f84b13cc940e1235b8a76acb823c5f07baf15948e7e108e79d02154c3a7ac2a87b83ffdbf2f862f35bac436038b7ed2726a09b943269dc7321b14 SHA512 ecb1ef28f64bf0d0b713be8be6b338130aa2d7ea747d3644e79de6f0593ed0e5720e8100ff37cdf90798a28955e1854672e756fe364639c04d6bcaedc4c6bbeb
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
 DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.11.mod 47 BLAKE2B 4a848f4f2e5cc615dfc3fc62a9523eb7b3d79244393ce8203978051a34f981b0219f13f10bbae5169e03d919404f0ed6502b39c536218f8c8c8a5492561c1112 SHA512 c1a6d910b914ceef7ffea53c61f2225ebffeba2fc87c290aebdb739bf520494e35fef046eb9ced4fc9a3767523efefcce41ef5026fe11bad97c005b8e55d96f8
 DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.11.zip 8916 BLAKE2B 2d3735c7229348b12148a77ab7057473bb37db5667024f481d7ba309b90e92046416e17cc4ca8db0b903eac6311716c01052c9959ca2f884ce4f9bead6a21575 SHA512 54ac2b14cc0b8cd161d6514f9ee877aaa0035edf09c883680595e49e4b572f5cf5db1f88ef5a192a32c6f14cd8e049ebd73097e7866e199a289ce4ffe2934f54
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.12.mod 47 BLAKE2B 4a848f4f2e5cc615dfc3fc62a9523eb7b3d79244393ce8203978051a34f981b0219f13f10bbae5169e03d919404f0ed6502b39c536218f8c8c8a5492561c1112 SHA512 c1a6d910b914ceef7ffea53c61f2225ebffeba2fc87c290aebdb739bf520494e35fef046eb9ced4fc9a3767523efefcce41ef5026fe11bad97c005b8e55d96f8
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.12.zip 9134 BLAKE2B 337ad087c21153a61991839405f3d83daa7b8805da32d3a2a2f58b33716b87716f24de1b4fe4a58aded4373af3de742f669b9ad6563819d7a7cb3582dd74d335 SHA512 9ad6072ad5f2034e9f2c96870a58eb41ab50c563f7d9cbb952e989e7d6e2479100f39606e09ccad66d826b3f52a39d330a06f4f1ec995dcc5acbcd5809733e8f
 DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod 38 BLAKE2B ddc3076fa3a93a287dcc66d087fcfa08483a03baeccc6fcfdca7c390908cd0b83017754103a78f6977c929d24868a9ce78859bf9e270fd84b5fb38ef8f939f9c SHA512 79ad90998c2a3e01501014598c152d4d08a92d354678b5e395c4a16ded8519f12e4ea883485ef49f07e240c52e075c7f9a07a410eaa9a1aca3657cfbfe4b6368
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod 178 BLAKE2B ad9b4e7186954eb025beefa7c1d622146e2329ec6d9483da5f6066488a2422c28bc54071bc28bfc50b916a5cb9f07549bdf09bcfc4e1edc78234b84900638a91 SHA512 e830b9801e4d9645c55dbec3750189c4070d7125dd2aa7332c58e9307917a869bd432cc628680d2e9e88ce646eea9c63ba2f8aa85c53b20bfd3758c5217f5fd9
@@ -523,9 +585,12 @@ DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.zip 32972 BLAKE2B ead9d
 DIST github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod 34 BLAKE2B 420449db437a4343e47d666ed912d5c57298ec80d13265f293c3a2294624cdbbce9fa319e47ee530da73bdc06d48d80b4a590a03fa1d741f089ab302cadf071d SHA512 ded99f470ac6900d2627d6cefffc4adcd64946cc036657a805f90145aa83fe05478df9eb994059cd8d9613c75f3009221ab0405bcf7e14b00d5d950e09f3e354
 DIST github.com%2Fmoby%2Flocker%2F@v%2Fv1.0.1.mod 39 BLAKE2B 38f071790c09766b9d2305e4e20d237e53ad13cbd25231bc1dce1f27e18a518cb1e2889e660c182517e048ffd239a6554e7a46b82da07672cc63aa09132a2f23 SHA512 98d305cc5a12b2f4e38456f04f009646e627b45bb41c297c72fe689d673f550fa443813f489d4dcc5faa91892920b3e8d5f76a8000bbe134be2ea186f68c74b4
 DIST github.com%2Fmoby%2Flocker%2F@v%2Fv1.0.1.zip 7754 BLAKE2B 910f13da2635be870e43d0fccce5d3a138852d257de307af2c9b8a93ef3d89b621a70ea1cc288580d6ce748ad63ae13d4fc7fd8170f73bd459a23de9f5215a48 SHA512 00bbe5fd9f02f2e546ced31827d3261c905d671b535123f0660dc67fa3e41f2878507b0272e7cc1164be2512bae9920c458936773aa1dc865b7436f8ea18529f
+DIST github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.mod 88 BLAKE2B 614c7f42b35dc5e75d13415e50625c4f1bcad6e9a5c0d48625b70596be0954f22f41f2b7cfa8127aca712127d4f97cd80115a72c54356f07047dadd61c864e0d SHA512 7c2bde82f5a4469dedad4190881dc1977fc6d0e2de9848b272a285069c9073288b8cbc2126ce3b38d3edea1f1ce92ce4f1d3248284d3f654e918e2237ef20e22
 DIST github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.0.mod 107 BLAKE2B ab66968ee9263d9c9d1e1a85444ca0da86a5b0f263cdc51a4d4ae9d6398445b529ea4042e3d93560cade1321d0115c153950611f34a8075194ffaf19a7acc472 SHA512 55dc5a9ed85f4b355e9de88d26d76fe6d87aaf45f95574960d42af9d2c9e97c9685d5397faad9409e3384bb0a205b6546e40c303f127302cf9bea040466665e3
 DIST github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.mod 107 BLAKE2B ab66968ee9263d9c9d1e1a85444ca0da86a5b0f263cdc51a4d4ae9d6398445b529ea4042e3d93560cade1321d0115c153950611f34a8075194ffaf19a7acc472 SHA512 55dc5a9ed85f4b355e9de88d26d76fe6d87aaf45f95574960d42af9d2c9e97c9685d5397faad9409e3384bb0a205b6546e40c303f127302cf9bea040466665e3
 DIST github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.zip 36737 BLAKE2B 3edd53bcc466182fde46b860033e34cbd5bebff97fa22fcdab0ac5808e796cf9947f921ee267fe0fa3befacd032d655ed771cea4b80f633a321044d08dfc78f4 SHA512 0926b976e8ea08cefa68658519450675ec50e9dbad8716c8e211812bc36830746a75a1a8dea5a8365fdd8d383cda115b066c7cc93abf613f14203ad398d66813
+DIST github.com%2Fmoby%2Fsys%2Fsignal%2F@v%2Fv0.5.1-0.20210723232958-8a51b5cc8879.mod 104 BLAKE2B feb69c386a2c5383ebb512ab930b0e98872db410547cb8a0c562cef6cac2dc62a25b5c2b22527429c8f811de783b5ea49ed17e4d9c4bd821334ff9625b44eb70 SHA512 198e8b38ae71bb037c40ef46b2e0aaa156760346f60f4aa1102d3d485f8493d1349661ff25795f2b0852fbde824cd4c5787e2058656a8f627267be157308d2df
+DIST github.com%2Fmoby%2Fsys%2Fsignal%2F@v%2Fv0.5.1-0.20210723232958-8a51b5cc8879.zip 12011 BLAKE2B 8a368aff40e82e5ad77846c29bd6fe161b86edb4df8e1e4ffc3701694081897885cd19d06428b60357071c3f410d58684a50af94d54aff58d133b76368b4c2e2 SHA512 1a90c761237dc2faafeec6fda8f42aa56b966f2a0aab8a26089a670873d4313020d3668f65f07181ebfc30788d894684f99a174e896474bb0bf9da5b47a7f060
 DIST github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.mod 105 BLAKE2B 41a08600f3ac56f9fdd41ac16d9b662264da29ca65fb8008e76609dd33efb25c2e5f3b8c22b8a30255b86aed19291dec0401036707893bd4ce4ae213dc1f6762 SHA512 514dad44e0511ec48a367857dcafa6e899d1dddca56119463e0b411d5fc2a5184f79bfb1a26b871249dc76c52c58c0e42b5f748e2b44b6ecd9f2ce32a74d5a62
 DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.mod 348 BLAKE2B d8f1b00dfeb0f05350cb72b2c6b85ab12fbbe96233c40ebd1de6a72fdb78696d740b8e7e2e6620b7732c980e08fe778e7aec24c4375a36942b91827078645b14 SHA512 0106ae7b39364cccc6c6982989400c53cafe71f5062647e4170b5b98bb091e3f19d9cf35cad536f8f3ed7984d861e4e25df06387c558406dd42d96379dc7b62b
 DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.zip 23373 BLAKE2B 88c09582445122ca0b30be2b05631f79c7c96c86cae19ca503d95bcb7ad94485bcf35939d208407b5b1f48f81b837e15d9bc95ba71eeaf1e4bb0d89bada5ca08 SHA512 8e31b8842ff579a47d4d1d510663f75ea16ea39dc88722f1730e61fd12a04e0cdb0ec6a2782bc73de0e4613422d044d3c29a8dd56b0085f2a30c7487c30078ce
@@ -540,6 +605,7 @@ DIST github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.mod 45 BLAKE2B fed20163d5104
 DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod 36 BLAKE2B 636b2a1011ff647b1597c535916bdde712e45585b9be3e90191d474e88e293df5b30e2e15adbd2f6d631a57ac81b59b02055b439390664fbc8a8e224cfc51e39 SHA512 7873fe200c30b46285fa8a001345428db580c67cf634c1b1e4aef6a4a82d7b975545b827d00b1a3dad86b2f3f7681df739915f95144d4d3a3553f055fa70781a
 DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod 36 BLAKE2B 636b2a1011ff647b1597c535916bdde712e45585b9be3e90191d474e88e293df5b30e2e15adbd2f6d631a57ac81b59b02055b439390664fbc8a8e224cfc51e39 SHA512 7873fe200c30b46285fa8a001345428db580c67cf634c1b1e4aef6a4a82d7b975545b827d00b1a3dad86b2f3f7681df739915f95144d4d3a3553f055fa70781a
 DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
 DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod 34 BLAKE2B 315fe4d5620c1d1c92df3fd382560ac2cf164aa17a741c1a74fc25807819de811705467227923fee7f804c6b6e96606c87b4adb11a6b722f367b543c2792cda0 SHA512 b1c163d7a6a139eeee1457fa07933f01eaf6d2ff24d10385e75f87b443a95fe1b08e9e144d3c18eb6a77d34e8521cc6dbd486fefe908e60452c5a80f654c551a
 DIST github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod 28 BLAKE2B 57fb6c274af3e1f296bbb2c4b81cf52ecd31af71afac9be2f77ca58c67831ecac4eb2f4f8819c510f3e2982d9a5ffdfbb5f384db878b37b531e59e06e0093a31 SHA512 2f4794d0c8dfff16f1fa252eb5e3396e2cc5479c96b5e4af9ec01931387790e51273d4a308fb2813a699a54a3cbf6b3adb5e92d831d3032120cb5f19698bfd19
 DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea
@@ -579,6 +645,8 @@ DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc8.0.20190926000215-3e425
 DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
 DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.mod 1053 BLAKE2B eef9c12986cf3a2ee51a7c2bc72f01daeb0a6bf0da5c38716447745cb2f82baba7a8263f434c509ce96a26b84f80df93db62dfdc0a247a3cf80c36edd40cf34f SHA512 2f987fd2c36d91f5df6bfb3f2477ab948fa685e2e82e4b0260b369b1fa57aa48c393f0f7f985c5a917218305311ca691525faf7ceed7a0d2f726df04f10ecada
 DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.zip 684884 BLAKE2B 820095d03422b37402dee1d8999e7bda875202347a1c6542a0685a6551873d36991e52ffb4e5f0358609cac672f2273d5ec71d313b96edbeb6e28548c169cfc0 SHA512 e710c42be0d5f3b78bc417f1da7aa09e2d9f7ba80ed4506e3d2cf0f6f26156ff9bb099a6ccde3d2fda3d990a18001d19a7e8f0aaa0e5c5fe4d49186e0de25f51
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.1.mod 1063 BLAKE2B f217a9587ed64ad54d82280a62227e5429c8c35eaf5383b0be66dd818c1bd0632d807c3a9faa49a2c07d87323771221981983f32a36b02f434a8ad9aaee10b38 SHA512 6bfa852715f4fe13be43033f2905a4118f9fc9e4a101eee2e113c7410958f789d02d14eaa5f2bcbf76ca2320f1f37eeca9fba015200d73250f2c5c8afa4603aa
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.1.zip 710577 BLAKE2B 0d02cf47b08dfd5421a4bc5a8d04f3ffa04e3de6cee6bea03fb71ec8f141715c5400b876aa65103fb8863e86ca98645760ed82b3449ee09e25f2e1b6e0aff7b6 SHA512 42368e1050fac15acfded83cad47345b92b25976d1086c2d54deb2dd84f15271b5d744c0fff254f75e6c26b3b4a10227b760a7bac592ded3db8688433717006a
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20190207185410-29686dbc5559.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
@@ -586,13 +654,19 @@ DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod 46 BLAKE2B b95
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210303205135-43e4633e40c1.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210303205135-43e4633e40c1.zip 93776 BLAKE2B c12aee5d8adfbc89f513e29c79d9377e2c79f4ae598ddc8fe7dcae96b940bcef470ee9119483a61b682cc77cf446886eec5430c35d759504aebd5c6accd47517 SHA512 e9e44d734f573d56de0624def75c6e312695fea8804cf545d66b19366a8bc2b1b366187671edb3ce5fe7ea6f9af74154088b9bcbd61cb5462e064790b5e76b26
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.zip 95039 BLAKE2B 2d6069a8477d5431b05e12b6be6a7191c44e70aa352b8dbcce7cbe2c9c6bf9a21cdd3eaf2198ebe47eb1782de4792b90dbe07a9d6e94e95190c62aea9689a6f6 SHA512 42d5a708d0b0508147abdd9a62b9156b600e73e225fc3143922bf21e68e35d291367e5aa82fef37e9b12a1a54950a346cc7019bafd2d7c613cbd00a0fa89ff42
 DIST github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod 47 BLAKE2B 0eda9805fe0e1acdcc1e7b2693e72e39ea416cf57a108b1847491e1f15f8a7965c8aaa77baad1ae6148f39d36b1fc5fcf159b54111bee0d20bf2fe8edfdf85e2 SHA512 4e53e67b276ea3fe8a3977bbe72758bb2f844e22cdc3e23994176821cea51b10f5e802ca3db848a8b3d00a146c133a89271ee76158c478683b393682806400de
 DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.mod 209 BLAKE2B 5d7d5b4722834a34f8a63dfe72bd2f5a0426b284ace021ef7f6b7d16ac68710ccfd4ab21b442ac7cdd51f9a17fa116235f8c4d5e1d88c6b4392d89bbdc474e5a SHA512 13826a0b4d175ec2093d0854c789a2ce2c82d325b91d8bdd7dc0cc123b13ae59de2dd994039e90b9cb8ca424f5b642fed283bf8671b25c5c6117b168e5ce42bb
 DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.mod 179 BLAKE2B 16c3178a1515a77927002d1291ac1549ab95db0c67cc00f0d1c4ea543a636f6513e2ceaed328d8b3dcd864caff67ac4f0fdcf9d20fdf11fbcd4c49f527463db6 SHA512 b84b63dad1dedf0a1d06e8823c25a2eb5a833d2155e6e59b5205097cf9dcfe801b7a006e54730e512d0c094601237c2c2d9a4f518cf4fa392ef87f72d119776e
 DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.zip 39877 BLAKE2B 509d53b2cfd73768e3a43993c0a26c3d77a61c5b2e874d4e980ff0141019b6de810c6dffd1c9963342a9be987c70a82f625ed873e53363fa9bf7775dc5b5bf0e SHA512 54fedd3c2f3365a5838c4fb8deaa0f46e2220928e0a7d911efe399d61bd49eb150a5dc40e7cf9216500df10f44ec7ad652f625e64cbf5fc26a290356334072a0
+DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.2.mod 188 BLAKE2B 916fbc3de4dfc6048a1573e2e2740edc80b4a1502fd85a5163d3b234556785ce4e1732104e7c249746cdbea6573878a174d097c8fb220775b9ca605ca744e7fe SHA512 8fd12c10bca0cc3602df94d71c782e2625e9909fe8d0746265d63b626bf538d4d213d3cb372295a38d510d83284c33efd9c1dc7b1d852fc2fe84d94193a66f25
+DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.2.zip 40035 BLAKE2B d391b14c06dd10f7c1ea22e1332b113894ca3be1e4774ae59a1db34b72efab25c400f267f403192c4ec493a44d20ec84a09e5172f8997a8a1ec86ba9388ab521 SHA512 d13a8271def1c860f6ab94523106d89836626d9e186a1c52a8b736c48b83db8e4ecbb89ef543528b6c9a0a99dccd691f993ce60c0b4fa164bf567b1921ab1af6
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.mod 88 BLAKE2B d66a44b5b8c2818d6342f621c9821daefd16b262df9fcd630839073cafc65a1352e22aa52662bbd291a65abec09fd0c14576a6aa9f86bda4610db670f8d53e43 SHA512 0e73093ef44bd32ae02910471bd85f6d135cde6d0fbf48780b8a58efb7419e16ac1b01497d451e8d3ee32602b7e32c0673dffbfc822c8f3a2d7670378f47f7cb
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.zip 117762 BLAKE2B 3ef20be014c5e2419f28f7d5db4cf8e7a7589445eee7e34ac4705b5dfa3cca3c441d14df2be10244472dd6599a2b6c45811f9fef11f2b68fc77f75c32ff8a769 SHA512 09cca3645bbd191ffee980c80c747a8952a37a0e1bfb9615cc1d0c0c3fec7783a9254fa3e31239a036c2bfaabe8028525e9113327c6d72c385c8b9bad3b46017
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.mod 45 BLAKE2B 0a144164f01fb7455ab76875415874dc845b22f9cba88105b7453e5c4c07c21f00a3ce83b8802f333bd775fdce8bc8e998ad41f6fc65a34e92750fef0a7689c7 SHA512 fdeaa2c0dbeb52934d9b48cf468c923f89058e3a454cfa153c9392ab908e3868d501d7bc2b923f33ad5949df6fd9ef07e1336b2dd98f9efa70b1ca4a23918ce0
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.zip 126646 BLAKE2B 78a77568425e63a661b1ebe4bd565f8af0ceb68af0783088860d1e1e93f496b565e357a55c5860b12e41ff693e7e195fdbde2e98974043dd62f12f6e92a58586 SHA512 3878b23bc00b19a5463ce8416043e899167fc4c501a2d499c3d3947745cb4996c91e709dc2d670a16f8060c077a32212f158fc01afc36ca8530b80cfde6e659d
 DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B a52c6a0304ea7026657d40ff685f37799d37cf3b05a87b15336eb05eb8a12d8749cd73d8cc3228ba2a80ce1e489a3029617ecf301dbd51c7f5dc7630dc114801 SHA512 df531789f1495979faa830433a34e38996cd919757f0191b31b862a9e9dd48be68179e291416876cb31083dec78337abf6bee92c68cff38630aaa456cd3cf052
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
@@ -607,6 +681,8 @@ DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod 357 BLAKE2B ade628b5e576aac499156117606ac8b2458a5b481ee77be1df4b551133a3957dbce70e8674431420c181a67dfcf886d754b927ea06d588cc3df4e10a0ab8fbc5 SHA512 7bdbda1cfee6852064c8d4b15f1037a5153bfc66b59b3555416518a225b70c1db1daca32c0a7058e90d2b0f55da3d9cbb2f5b119107b5d96a874034158a69958
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod 468 BLAKE2B 4ac6ec5b71271218f33b753092c494ec6dd01e73373df68af2f399d8d8ba32de0f02150c1c5fdac8518ac244391f126cdac602c63ec862bff559d76015cc78f5 SHA512 9c6244491c9a3012c4a2e575cdb361f7fa577f391ced254adfd8d567c361f073ce23ddd57a0f18ec3327189cf97ad737254c0d0ef2872085af6af7bf9dec1d72
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip 240896 BLAKE2B 4745181476be50303fdf0e66ec147d643995c809a1fd969c846f656d453025f2cd67089f3065b41bede74bfcaa65e5307dd9541457ed7f7ace31b6b567e2e135 SHA512 20c4e6baf239cbc8c8a754ec1b9ee814ff29df1b41332f75f7440b27864bc28397071f3f4d60ba6ff4d0aa531b7a20857e11ecca93057784f76f03876151e8f8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod 569 BLAKE2B 0c975c1c48f40792b02fd8756be3b6bc044ca05725ae179445a858baed4861011ba76051aa25fb10be23c6cf14738cb9cab928418be49d8ad85211d398089ec8 SHA512 6fe81bf3c591058f2ff968b3c6656766d9d3fd74c8577b3e7cfac17e463392eed3268248237d252c98751b2f97bc7c48a8db15bfc3fbcd4afbbaca0e2970819b
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip 226158 BLAKE2B 899457f410f559d70cac7131e9c6057bfd749964b8b133943635b0ee78a12485d933718569d085f51dd34f831114c2f74986818536cf21ad642dac793b00390a SHA512 5c4d5e70be8984c9eea4211e06e1f9478fea4ee4cc227167b9a99d87fa773e060e42aa4866eaed39e58a251821840643d5117b12006a6809902daa08cca14b2b
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
@@ -619,6 +695,8 @@ DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod 817 BLAKE2B b4cabfb93633359c6ac6dcd400484e6162bc6b609bf0edfc4a82a2cc0137edef114d0d3e9c55bc47d1abd906d9ac00f9d84f07ee7072452c570ba9f98118f4b2 SHA512 7e1b17c424c8ec889d0efb0f5a171043ac0fffb48725144836d8ac635c036e877e65f34f75055359747142051afd00374cec9e39911175adddca2c50fde4c893
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.zip 163523 BLAKE2B 6d31ee2f8495605c967a41b12da3e854dadf4666641fa8a324f9926d1e965cb2693e390065f34892876c2eae5c1909b5bae8c11e484dd948b7c80983c8adb551 SHA512 74273a10b05fc2e0ea263ba57a52783c147e1f0ee6a1156879c387d0823f90d2c0072b5eea4325116fa621de0af1d5c2ba19e5dc188315c60ecdf74ff8ddcc99
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod 794 BLAKE2B 91c9bb4469ac63bd98bdd1ce4d2f2cf3a233f62f6c30b1da0b2a94eb1215a975f3a19cf066c6bc5847fd1a642da6082b8377825987ab5ba21620c2ed9ef26af4 SHA512 05a0bd8a7de559925fc5ba7753d9fc80db41271fedfcd0ca3137f9620c68468c0bfb706e0b4915151657c74a5d64f52a5594736e19fa1421aa65124f551f0ddf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.zip 175437 BLAKE2B e86832a3d0eea09f43735d7b45ec2335200d530bad4981da1d7cb12939d284cd769dab8e85412482c3b58a778cc910de6f5492765ff9745ec9a03b8276440411 SHA512 979628ae2384dde963f40dca23a77bd12138dad2b8d7bdd261cba5951678cf9287c47c335d40d4e7b54b561cc3101fcbd6eb7d9b1d039dc603917dbc84c1c4ef
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod 693 BLAKE2B 414677e90b5a1e5e2b5b498e46386fb2fa7c93314b390bc4337c74865b6a72f8a64804e4c30aefc54515e9261cda168358d70bc533e8686cbbe0f625b8957d08 SHA512 829b3d7349806cebfad94252c09095aba4c5cbe0cb77cc124e7fc514ded1d8faf0f158d21be97911b8937ab9d330b284139275837607950ca602b3faebef146c
@@ -636,12 +714,16 @@ DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod 198 BLAKE2B 954749eeaffd
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip 282768 BLAKE2B 22c62ac51bb14578571aa93f0acdecb984ca370b4617122078b28b8ec5ab4ac8cbd6e986d60335d5f9848028f51f94d8fcdae3d8b428c8d3c8196d97cb2f04db SHA512 1b73a550dfdda98e41da9ace048b230ba05bfe7518cec7b5f877c11afa58bdf9d53ad25fa848e316fcb5b25ff6eabb0a2d2688c1cfbd9642a8670b72c3f90a92
 DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod 45 BLAKE2B 6fe371f17a31bcd132ac67cb50052f6f3874c9f62e2d67f48d52d241026fd21e58ca9abdc15fd53cb949f79e7d40dd0c289af3849da3d4d9ff75b491e8235c10 SHA512 ea2e9a81d7720b4e11129fbdd4772be224b6e1267157c29b9d33813b6f4ae905e43c3840cf1ade6ff5f73bd22c103430a0bc882355c16715e124b442652cd4da
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
 DIST github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.1.mod 722 BLAKE2B 0e9fe08a26bc76d89f7cac87ca6bdac80701fc7bf31038860be5bcb3300b92301df3f975673e47beeea3e8e61aa95c6775ac55fd024ef3f054d8b1bf87df4894 SHA512 a085a3247728283ac02cdd41ecc0de8033a2b5735bdf951f22859a05cbb9b6110c2f8f94a21a2668d9084ac0abeb9a0fb68d3953db7f0262f2f5a310d904fa25
 DIST github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.1.zip 103579 BLAKE2B ab37eb76e38a51f7ba2fd2f0b0bd229a4d8859b9a1c7a92decb0a8d30351618e1808c6c2312003028cbf31b23aefe36c01dc19027b8b9abb3daef040d087cf71 SHA512 3076bd63a571e328d28ee3b4f390d97fc4b5faa253a8c4d36f2b08ef11980bacb378f528577ea3d2d09cc80a92495dd7bf37991aec85dd305c5cad8dffb8ed0e
 DIST github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.2.mod 722 BLAKE2B 0e9fe08a26bc76d89f7cac87ca6bdac80701fc7bf31038860be5bcb3300b92301df3f975673e47beeea3e8e61aa95c6775ac55fd024ef3f054d8b1bf87df4894 SHA512 a085a3247728283ac02cdd41ecc0de8033a2b5735bdf951f22859a05cbb9b6110c2f8f94a21a2668d9084ac0abeb9a0fb68d3953db7f0262f2f5a310d904fa25
 DIST github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.2.zip 103723 BLAKE2B 8f7756ba85935e418971f5d7d1d1a67a164327355e544dc1d732d634146b9187d8194dd2a1086832a8e84e44dd305b81c3eee79766f0fa284f954c560d7d9a19 SHA512 7ec21900319756f93a784e10beac47fcf95a70047b7741ab92b8a0ae32e7a80c519ceb53faf1cf71a3916e0ee178c78506cb0713f238494ab06eeca50762d23f
+DIST github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.5.mod 720 BLAKE2B de5c6f93aca5338c3288022c024ea7e0bd1a9942bcb00976fddc5fb430e08338020fc0dd8b416669440c22347ef4f8fc80be2115624dbc6ccff345dc87d185e1 SHA512 3e66eadeeec13bfc51931e64e8045ef85d0376022574de7f86f9b6ce61549111811a01ff65b143b4c54e70bff1ad119f7bd8e68a7d14786b88d8bbb251c148aa
+DIST github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.5.zip 104588 BLAKE2B bddc51e9b6e6ec1a841fd053e3d063d2d34d705aa033d2082945f2a557cc87923440ccf86b5b652000d41b7ffe32752bcd62811e496850152ff0cded462b1757 SHA512 52a7f6cf48c15cad78f1ae58fedd506c115be35a8b4174515ffe5b27571e6fc99bb27930cd2cab0e6af3c2c70222efc27adecbaa23deade62ceddee15d4510fa
 DIST github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod 25 BLAKE2B 23b4d575cda8259ac3498731524edc19e21e56ca2881d58ab40adad9469eb97d94036eaecd4fa5e78558e852f4c8f4242f830c962843d14779fbef470f3f8f2b SHA512 18a8e8a8b69974b2112578bd8995f31235bcfe49c218b2d0affd6fd5d6b7938687d9f5405d4a228a2ee2960de7960496319a92a26e8b29f6076983c0d07ee66c
+DIST github.com%2Frs%2Fxid%2F@v%2Fv1.3.0.mod 34 BLAKE2B 191c36f7e2328b0192de2eabff29eaa04575c74260f00171ec29e97ce46dddb7e6fdc32bd50ab5904f4c35f535be2a9af45a1613c4f1ee77c07435eca44118ee SHA512 d47bf7f1012d6b846425ee3b7ba44c64cb51d80e258e4c39df4365a3730e5c55f8836e484d7d77777160c35ad4431ee48f8a4d042b638d5c7eef86de6ad4b943
 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.1.0.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip 122358 BLAKE2B 8f906d748eda31f9e673fd8eb0978eb9ff17484d38cfef9f5cb7dd623005bb971d131dce52a6089f5a41deded4c4dbb956aa9a56da91b5a5b5eba9e3a9100f59 SHA512 11e29cdd7a8baee7995009755582c26eb819efd715e9dfa1442b5743c7bf5752188f0fa8f5ddb3452f05f371a280324406410b683609f6a510277d3e03b30ca0
@@ -662,6 +744,7 @@ DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0c
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fsonggao%2Fwater%2F@v%2Fv0.0.0-20200317203138-2b4b6d7c09d8.mod 32 BLAKE2B fee5139d049e48f06638b2c2c6212c62b063f02aa39e2ea6bd92bd7fa8e40a0e0affaf946aca271c53a312bd934c5c77466aab46b067d37b0013d04db4b34db1 SHA512 0b34358a6708a4b15b9268cb9e2093a3db82062d8d686ee85b0374384a5c892a17d1c3057dbb861ad3b372e92525c136d1cec526352c2bbfaa3221af3e7de233
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
@@ -695,6 +778,12 @@ DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c
 DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod 38 BLAKE2B eafcc0e8c3633f2d4c2cb4eeb38eacdb7d029944b76da9ee611b3fd2d3b82d2adfb726405168a34f70251be920da17fdc6c70e8052720a6093c788dd724d24b3 SHA512 1efa76d27434ede74fd37d57c1673c8a60cf06248a73c425b5bd08dd068d6b50166b17a15b52d0c059218479fa3976e80e16cba08f671e9ecf7744cf5daa199c
 DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.mod 38 BLAKE2B eafcc0e8c3633f2d4c2cb4eeb38eacdb7d029944b76da9ee611b3fd2d3b82d2adfb726405168a34f70251be920da17fdc6c70e8052720a6093c788dd724d24b3 SHA512 1efa76d27434ede74fd37d57c1673c8a60cf06248a73c425b5bd08dd068d6b50166b17a15b52d0c059218479fa3976e80e16cba08f671e9ecf7744cf5daa199c
 DIST github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.mod 36 BLAKE2B 4f0b6ce8011cb990e38d39f3598609c5b6fc72e3dfa12c8ab30fff486d65949c08bfb3934e8eecb4fd48f6fb77396e14bcc89282134b9b03a823291f789f3681 SHA512 f4cbae32bb681614253570a635d29bd25652cba1facd3bf0a6b7b288a992c890ffd901b8f1374349e0bf5181ba5fef54890a0777b2d0bcc4294af1438cec6335
+DIST github.com%2Ftidwall%2Fgjson%2F@v%2Fv1.8.1.mod 121 BLAKE2B 3d6311732c68cc3058b03a4dba3d120f9a2b6f82ba077506e0638600cb7285046138f32952b1121e2000c40fa85f0a045979d33701edb9489c829adf5b7e7cd6 SHA512 38b86d9763bc1b357afa88f93cf82189f0f747ba371efc4425a247ff4381c3431d68d85e2708646878e153f27741917593d3d3dd57606e1e30161e97ef4ecb85
+DIST github.com%2Ftidwall%2Fgjson%2F@v%2Fv1.8.1.zip 53675 BLAKE2B 976b43e4c8038c284e8757a4fcaee30d5fb044b8db2302bed375214085f40bab6e4fc99584483f8bc92e1bb3ef7e2e20e235b5bbc1363df1b9195e864d53cb65 SHA512 337686fb69acfb2593b86891250d5435230bfabaf834133f87a021867d5029b537d3dccbb6078c2cc1defe861ca2e5afe08ee0ca9388726723712fab08510d3f
+DIST github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.3.mod 41 BLAKE2B eda6c6808269e3ad5a8a72ad7605ef0d4e34c7b650aaa07d486e16edbc690744f94989e0100f8f028691bb77e1ab091fa93cb6e164defab335d5c4a83725246c SHA512 b792dca982ab257a5fc83d90b51ca74afc0a2e5c86c54c45197a36ee77380ef6cb88fe4659b49300a3e49d2588199c5b094d66f8bf2a5e3d6104333286e5a143
+DIST github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.3.zip 5762 BLAKE2B fe800cc27608d7de91e7780f576b766dfe4d52728086242ca7821f46a5ebbb66e7dbbc7919cc3c13e1484fe3a73240188453fd566bba49ccb69702019cde7cc9 SHA512 8cd20dd62573c08d61a137cf95c79f66f191ed37580669de295888997a2157fd64142b4a21e0060a86a393cdf3eaf8c0d159dc155bfdadf83ef2326147475cee
+DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.1.0.mod 33 BLAKE2B 2f2161156210fb855e4efe08126e21b4fed0ff111b4f03679aa26051e23ac71f9d269c26088262a3ebeb6364fa60cb9e85c1850d8fd1674ab488c6583d6034ac SHA512 39a892eb40bdbf1398cde6fe8575bf4fea604e3bb21473de5b2316ea182130b92c9dd2467e2807c0421a35cddd0096fa99134a9f9de02fe79bb59d82e2762937
+DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.1.0.zip 11776 BLAKE2B 25287b7e747b8c6ce557f166fc829c49f2b13c8a052db43e560c123ae6c49e3affaaef4853a3a046d55ede7e439a8101776f5ad773785d66d170e09dbc5e8d7a SHA512 1a0338f0d22bdf821c2a17a10b7e48ead6aeca7d6b1364f18ee2b468099d95b79370cddb45a1c1a6ab94dfdc493e792ee41c60c8d596852df59ece64122742d2
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Fu-root%2Fu-root%2F@v%2Fv7.0.0+incompatible.mod 32 BLAKE2B a7ad78e4f0640ac2e2a89707740847482b2c20c3156d929b27af98a496f720d3ee6579da516043c8f0a4849b3eae6ab3b42b6a6fec1d5dd320f94b21b8efbc97 SHA512 03919957e4a589b3576e8b9aed9e8d4a0858060f92c8e75756a7fbfcdf10326836cf3b03bfd1bd4405a1281fa01a92dcfc876301b5cb17c0a44105a2eb714368
@@ -740,6 +829,7 @@ DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b
 DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
 DIST go.opencensus.io%2F@v%2Fv0.22.3.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
 DIST go.opencensus.io%2F@v%2Fv0.22.3.zip 299798 BLAKE2B 6adc76c28569e177bf40cd2d4c7de912e92bb679c29ce669bda7e001d33f8e758d3f2a413857b2b74efc676d4d0cf239e9c7acefd2cb7cc502121f07b31d640a SHA512 99fe389fbe5fed1db31068ce5c4ebf597ac5b39203e3c5f13b0f92c3e66ed0b1ee9f6f3ec0d953a7f5d02d2db46969b8d3cb642703acf43cc0df5cda61c3e355
+DIST go.opentelemetry.io%2Fproto%2Fotlp%2F@v%2Fv0.7.0.mod 211 BLAKE2B 108e3a16472a1401b8ec1b18180c109e034394988b06050b6dd7e918d578917d1b6d139296b39046e09a9f6e251ea665a2cabb749b4b342cb301e6caa2cf0498 SHA512 4348e909c754b1ca8cabbafa293377cbb8f2b4f4d67ec412f6bcae4171d7d0212851d90631c1354e8b04b7955eb0a8077e5a86fbf8ed38d179e9ffb2e1ef16ae
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
@@ -757,6 +847,7 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.mod 155 B
 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-20200728195943-123391ffb6de.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod 209 BLAKE2B ae212ac1167b75a96c3b74f33594fa85e980530886edcf3bb58fb5e077793d24e69d1015e8581caafcc78b2d41cc75e4e17e82b2d3f76f10058ff5a715f00641 SHA512 c2a45c244884d6ccc5c4f73b6b3852d28c9ed1d3acd4805ff36292681e5011284af42ab75ebf6274cda4cc3bcd426496515db7eaca2a529500c0e896190f26a8
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.zip 1864784 BLAKE2B 6e21ae64d3917f37cc233bb3d63c25149182930d022ff1e70bfc50ead953f49d6fd434405b9c1a4ad5b31ea39471b0a9ae6a0093b53d8b7e6cc1e88a34a45544 SHA512 f7077f2cb6f051911f8d97449b22ca79679c5f8e0a29c3c438a4f4bad25fdc58dbfdb9baa32b008663059bf9054cb9ec029215262559fc655f05a413b7214bd3
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
@@ -819,15 +910,20 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+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-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201006153459-a7d1128ccaa0.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210224082022-3d97a244fca7.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip 1587056 BLAKE2B b8b8cb2f12231f2e5129646f34a1138b138ea6b38af50ad8baafcaf155e9eb623e320823ec1b7502431df3f95dfa7ea1c8cc21abfee3c8831d913347aead0669 SHA512 0e635def6bc35ca664d28575366161fcce349c9f78386a9ffa3dc700da1e1badd6fbb8440113451ad7c1cb9a18b49f949632734946ec56ff56d894d8d74b56bb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod 179 BLAKE2B d4f0ad22973a6e0a06b186e217dedbea3abb1800b259c56a29da9075c36808160620b42b0a485127f713760b24b4d9d6d9a61119c5739927340436bac307f5c4 SHA512 f48731641ffad3b90daf0a8bb79fdfc607c076961dbda1c51e71eab787dca0681e5984ffce048bd655ceb56052fa64426b30b32e6ee32957c92418a16d1c9f06
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.zip 1565731 BLAKE2B 25099f5d276bba9b2d3c5e75c603dac06f3364fd09d2a2c53aaf5030d4698fc3638758d23c0a82fc118a05661b40377b74ea55c2e8f5d9add2d03527104ae80b SHA512 23da0e9ed2c647eb043e4b57e384ae335119b3766411f84cb009496a1fae85c7cefed14a92154b3e8d7e93d92187dbfde9b9cc07236ea3a7ca4052b93c6dc0dd
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
@@ -895,6 +991,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod 33 BLAKE
 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-20200615200032-f1bc736245b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200622214017-ed371f2e16b4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200817155316-9781c653f443.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -912,11 +1009,21 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.zip 1668149 BLAKE2B fba6d207700d62a3966569ae0b1506c69eb56b4e6177edfee503e8cc36094671c418edad48265cbd14e9c71cb50109e491908f42319611370b80cb8aea5d7bf7 SHA512 991e394766c3de8b70e8078e0173d4763ada985ab9dcf33725fca4faebde461e7592ca66b5e077c34039ac4ba6643a82fff174edaaee8d4ab309bf915c5255b5
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210420072515-93ed5bcd2bfe.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210420072515-93ed5bcd2bfe.zip 1669454 BLAKE2B f58bdc4d07536e8a64910a6af8a83b26df6d2e6ed5a7cfea7721c86d1f8f15694a77d3dd68d3a408f6ca7489cc413ed3df4bd85be0624b5371e0dd3a35674e1e SHA512 947751f407711317c8954aca67c848bde2f17c30f7f18cd059c905e60a7a4b38e6c9c7a43ced7f0e03ca8370852e3f175d3c8f627a07511b278b0165c78ca563
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.zip 1646674 BLAKE2B a2975e42ede4b3923b53f6c28b8360a49b47734e5512ffe9e52e8920f79af09420d3702d3d7e54e5755c04fddd0836e11c7fb83441065bf9dd31da363f5121a2 SHA512 6a36b9dd8ab6582abf0721e3fdfd19c2cbf9caf02a2f8aeff8952175553e35ab9f9972c2e524ad947e51e24f5eaee23984fc1670d512c04e50b2d71890c5d392
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210406210042-72f3dc4e9b72.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210406210042-72f3dc4e9b72.zip 22672 BLAKE2B e36e6cfa566c936219702eb086d6fe20936dfd57b58f7643331b116b63dfbfd40e679794d453b9a4c5952d5523a52dc6538ea05466e6a291f9d1240d3a2381c6 SHA512 9dca218e749d2a405b7d7bdc29ce1a3219e5f965103a7cccd5468c861262539c0c13212b28059d27937a9b39ce0e16dff386f92a31b62cb23f3dbb52bf992660
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.mod 95 BLAKE2B 1d166082ebb4ba2dc69bdce6b84f285aa98967551bbfc1cbadeb2db086ef01b66455cd86b78deeec5ae998a7057c7e4f12026b2e02a9c5053093b9f644a59d1f SHA512 81f571821c669188c4482da38b6921ac4c2c1747f8a803a6846531127cfde25dd04819d971f08f601c2d2cee2e636644c1648eff55dd24d89dfb3777e90fe9a0
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.zip 21403 BLAKE2B f95e96b20328a04dd2a3a20985bf54d0d859a88e45f5f61eaee3f2bc22b575ae37c8ccf7275dbd68ac2851fd0d374f7ff8874ecc44c51629199a846154ed93d8 SHA512 82711ee27037e2ec090919fe58efb173626b31b4bc9e0118d732eb585ba4a16de6f1ee994b97ae78b7ff1cb89c34f6aa7392ff4b3432cf1cf2c56d101c64fec8
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 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.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@@ -929,6 +1036,7 @@ DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAK
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -1009,6 +1117,7 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod 353 BLAKE2B 7e159067adb934153bc2a45c1a091ea85083c9e52927db8aba3e7ef9e13f984dd738aaf3890e85f7daf86afdab8e5717775250715285c0edc05625a544664cd2 SHA512 17266a643d974e2fae18e7055986002b9705bd2a7fb1e3cd3664fe6dbefbc7a04aef6900146c1e1c3ed84bea8b4d1bda4d6c355af2cda013c01f19eed57568d5
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.zip 23783146 BLAKE2B 59b725b3a40f0591b08797ad52e9f0801144d7a182329fd7cbbae979de2c0cdbc1b1f4e5fc415483453af3d9b9ae0463f41d601ed8d7beeb05258bcc396a1c5e SHA512 a53b6715cccb7fd66a0546788aff268711febd897b3cd98245856c5062b1a8c18b3201799050b5bba3b996271a2b22770ea1139a3a30c7096c07e798ad587f43
@@ -1025,9 +1134,14 @@ DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bf
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.33.1.mod 542 BLAKE2B e4b2b7b1fa60a14dbc498ae1ba77dfe6056d4f990c8b699323802ca3f5c31896c498d907c766b49c093d0c89edf7d57604daac7f64a543fc5e0745e7b6fd1bc2 SHA512 4e4f309652556a76b4dcd3bc14b32c69d8aac9dde500456d1d9f9f4c773a5aeaa19061f29f5148f7e815c0c5dd0ba377470975d004b0b73213206e7d5aeb89df
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod 578 BLAKE2B db5963bd3e0da1108af3ae72d613cc24fbe23c0569e137ff8c4ba94e393b2b574612e0133a263e8a264cf781469983363a8f147a7f0d9e0f21ed4831772565a0 SHA512 3c04e477a21db637ce07078cb89ad236db3151ca0fe474eab32c326e7e849b41abfa873045d2214bc95e34ebec7767a68f9d5a9828ef286abb4636a14677c479
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod 608 BLAKE2B 01e491f455fd8b3faf2dabdc8ba3e343c67461f3c58621a9c63575940474e3b4346e4eb1c8f260e78f3ca7cfecddf54f7656f590665d3596e6af1391974b284f SHA512 33faa853ccdf8c52a82c9c44e4b5f2dae76e5cc2c1e8227036f8f5fe7f1b496066fa72a379714491c6d2ac14e0ea8fe5419dc0a1626f9e60933b897903377b45
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.zip 1436158 BLAKE2B e7e9e04e5a5f7b7d9bffaae6baacec3c78be6c47711dac08ec256bbd67e9f512b7780928284bde19f3655666ec8a0b61fef8abf6cdbbaccc09f401b8616971b4 SHA512 e8549e0db0d38757a7b9e64abcfa1ab3d8afd1475906cb10261ac06f08ca0ba6af2f3c1388dfc06193663b58860e0e353c5ffab152f0eb7e98c721c5e308488c
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod 608 BLAKE2B 01e491f455fd8b3faf2dabdc8ba3e343c67461f3c58621a9c63575940474e3b4346e4eb1c8f260e78f3ca7cfecddf54f7656f590665d3596e6af1391974b284f SHA512 33faa853ccdf8c52a82c9c44e4b5f2dae76e5cc2c1e8227036f8f5fe7f1b496066fa72a379714491c6d2ac14e0ea8fe5419dc0a1626f9e60933b897903377b45
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.mod 608 BLAKE2B 7de276dcb3541de0e9509c95860d13991855aa3f9193d32fe540fd41b28db88e3787c767073a6be9c294b6ece11742d80d13a98cbc1a57c48fe81d1bb7c45004 SHA512 bf2d4e70b656e1345aee9029d35a922424bdbdd05edb45fd8f0267af3a17da53d1d1ff005d58b99d721883e7371b2d2ea99fb67bda9ae880f5ea12a32d8f2078
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.39.0.mod 608 BLAKE2B e0fd588267fddeda3a91af18ec7eac08e8c83020e287f2737e93daa843ee2f87971c2385ecd531527316b5b0c63dc53021aca6f0f30e34a4d65ace222fb00739 SHA512 6eb0f8d38caeac4bd92806466132208239fee81c4af1c1f6200a3e9074a70b8ebe76ac8c2d9992e61ac9e86a5309a5333b37ce004a22305491d7d513ccf94d2e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.39.0.zip 1606286 BLAKE2B 6b98af0095b3f05952fe8688da8de9b800410f7b426c5acadf3e06a98da7a7ce65d49a24ccf86ff15d56e94ae9a516268ca3eef859a5557693df545004a4acd5 SHA512 76f2e5b34429e094d0c573c9f7cbf44518978f16007794d02583b577d7fb23354b44ab724743d127ea8eb19da76892b72fef9dbaeab671c87c8571cf6e762d12
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
@@ -1039,6 +1153,9 @@ DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.m
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod 186 BLAKE2B ac72ab4b58c29ea036b52ea6972dba93b3ff95ceea9b476355b14bc335bfb99ac350101e70ec678bfb6656157679f3dd42a200a1531b982ad9c995c5063ad541 SHA512 d9197910537264ba24d95110f470ce2b057b795e7244bcae423ea922a8eb4f2c89df3b6dceb58e71cc7ba1f68ccaa3dfa78d7c26d63f5949d4014b8df336512c
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip 1543881 BLAKE2B 2f556bdf8ed16bde9e6ecc8fc7339578c719ed0ec73ee426caa75b672ff5fcc442ea7dfed7f737900c98d5a5afc014b9e44b1b7f0f8147edb4627f3b390814c2 SHA512 29073698d91f0bd9d37cba38102b19e6223ea362f6eb331bb186670a0549391eaf856855d2978f70861e775af0a1f678a7669754862c9247edb0a682992debc7
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod 83 BLAKE2B 0e4901ba1d4e31ef22f0f978ee7b7d926ac2cd3a1cb5d8d8a81a33e02f9dc81aad6508280d65659862c3a9bc0667c334cb6cd8c0c532d5fdb3735a415c2a5eca SHA512 a7b2aad691925341e3d1f6d1d1453b68386902a4e2e1c0deb406bc157d04328c5519a01ce938a33a6e358cbd9dc0c2f862c9822bde5314d2eb9d416d7bf789d2
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod 123 BLAKE2B 73f875413489557d8f0bbcd665c06356b900f87e2cd9ef0ee5aba218a3a910842912d36dc9e653afa538c99cc723d28327a8bec6eac1f6bd93277d70fa891339 SHA512 d618524aca1cb3e525060bb66b0c8f06c9ad6be5389be228d265dbcdb368442f4f0a7e98f8c9082916b2579d77e627a550904f0b1c058b7d5e45eb7ceb77c2e0
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip 1557709 BLAKE2B bc672854cc46d48461bf28395c5be02fe99ff9da1d23e212078e549bf3e2beeaf953cc185e059c73a374f3e2662cb81fd6c3ff53472934964b8461f370b51a78 SHA512 de309c033d05be35503d6073e14ead585db4e6b75d478a674a37f93c7757e914c67bad446cf7ce04ccd49659d1ab2f9a024ee639a7536480ef92bb6b8b52dfdb
 DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod 36 BLAKE2B 33002a8288351a233f5e8236743a91df1f630355380a4ae8df10c32abc03470955eac6c15c95655caec990eb17ef2661985570e49293cb146517828090d95635 SHA512 8482c3135335a3a69611529f0d50bd19257b0fe8a8de2d4f2d6441ccde5f1e7a57d487cedc375575c5fe16094e5fc1c7f7f1a6bf04acc8a9d4f92701db279002
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
@@ -1087,15 +1204,18 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e
 DIST k8s.io%2Fapi%2F@v%2Fv0.20.1.mod 250 BLAKE2B e405b9fc54b7c3b375878adf1771869f8e5b64087d2fe9d3bfa9b3c6d30b6179c7ca193cfe29c5932f4ae85b31dd1db899100771fb3b3bb681ad6731eede4adf SHA512 89a8e511e48ef1df82e7f62cb9040c6ccc3bc2ce8a5e65af01195612546b05de24ab46294f88b9219a24863195e5c62c9cf8c32f205000d00e1e03da1486aa7c
 DIST k8s.io%2Fapi%2F@v%2Fv0.20.4.mod 250 BLAKE2B 39e76e250041b54a631413ddc838e5e48aa50ff9ec57d6da542b96ecbd5b27ef9dbbc7b938d24810205dec7ebecc6471d4cd80b64d9aa13db51608eedca32b8b SHA512 30508b37291b6b1cdbc1b7bd46283c249006b64119eb8f48903735b77811c98d05924de0d0f1786cc4c24b1f010d8ed12deae662a663050a5790a45643d1af83
 DIST k8s.io%2Fapi%2F@v%2Fv0.20.6.mod 250 BLAKE2B c4fd5e4a95af86dacbf46f84edf9cfc815c5e99a5329e51ead19e24d032803e8d11826df9a037028a738c3fb908c739f68a3e17e9a027ecdca811a2625526489 SHA512 db17d189cb0fed0e5aa202ce04643ec8bbcbbac703cc9d4f6785f5fee7bf90aa9d88013263ccc54ea243916f39f8c6c90c3809d1c575a993b72ec070fb250071
+DIST k8s.io%2Fapi%2F@v%2Fv0.21.2.mod 250 BLAKE2B 571e748acfceb3bdeeda74d8a6526be5b96c834bbdbb31f5811f41c15e4ab374fec326f76a42bb7fc85270250ecb18b8acfed970ae1eb2634cad11670abf6cfc SHA512 5d5f262e8d1748d280bcb7cab407cb9ae06f9f17858a53ead63723587c3879d8cdc20b54bd2cad26ec7f3993975e8197456eba9aea6bdac9a776b95dc6b2ec03
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.20.1.mod 1477 BLAKE2B 9093190a164cf46f5342b17755d15608ea7e75253ba12916153c03e69b311a879810dd52b28763b3f75b9ebd31c26bc35504fdf15da30cc68d35c6d5ae063a86 SHA512 957f6ec445363e9e13c972c951c65b7932708bd460afb42b08191740bb1e0b1547aa4f6e3a34031962753497cd079e074ec8a462dd8ed0953e434df36a7128f0
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.20.4.mod 1477 BLAKE2B 9093190a164cf46f5342b17755d15608ea7e75253ba12916153c03e69b311a879810dd52b28763b3f75b9ebd31c26bc35504fdf15da30cc68d35c6d5ae063a86 SHA512 957f6ec445363e9e13c972c951c65b7932708bd460afb42b08191740bb1e0b1547aa4f6e3a34031962753497cd079e074ec8a462dd8ed0953e434df36a7128f0
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.20.6.mod 1408 BLAKE2B ad631508b468e76593f3a77e2a238eb9223b0273a23647cb773fecbbd9b1a12c5ceafa0284fb0627be7fdda7ec779c0eaaed9a6d89e1f849dace1aba05359c70 SHA512 7a5ae495233cb1fc4936cd5ea9eb2e1620cdc2c0c83e894562dafb5f5263a1db5bd5b1be4e3552c966645abf8b5b2af54d9b6cac5aca42e79abdea3c8e9a2237
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.21.2.mod 1509 BLAKE2B 67c8ea4f424f6a40c8fdb840c6a2a94886ea5092a79450f06be2615798c3076557355f13d1eb4c86eb75261c9880c3f712cf5e61e5b29f23089acc0666f6f1c7 SHA512 c5d6e5816dd206a4ddf67098a019b2042a5a3d236957ed29e9c0a842c398f8b161e70431daa105f2fc1ab814b24486e0f9e4393372612764f961773824f6f616
 DIST k8s.io%2Fapiserver%2F@v%2Fv0.20.1.mod 2341 BLAKE2B 6deb62d7ab353791a696e7ad13bbdacb2972918880592d1299e1255ef907b5aa6b69a3cdc9cc9a331dd004fee516d2fd51e0fd4ff939925b7a514dcc74162b52 SHA512 3d26c0e3346609998201db174c1661a52f8742209ad660f2f03e975235e6358a1e27f03e47a1bca3413d0e61dcb70d83bac88491949303cb226ba9fe8dc7062d
 DIST k8s.io%2Fapiserver%2F@v%2Fv0.20.4.mod 2341 BLAKE2B f35eab0adc6243a985abbf5c8d83033d59a94cd6d28cd9ea3c6cb1792f3b6aed82acd7baded2e5049bb74cbdc6610f55ee2e2a33fa75516aed818eef1062a7fc SHA512 0ca6d5fd363a07f04e877a39a54dbfbbb1df4d445ed1f8ae3cabbe59776374979a7703ce53d4aaf87bab7892b5b86e3b161b11e15c2cd97ff9228a6d053f07e3
 DIST k8s.io%2Fapiserver%2F@v%2Fv0.20.6.mod 2341 BLAKE2B 2b6581013f1a802520ad93055b3837ee3dab3b7a6f09a08966efc04f4fcd50a52a22231eb5449b616e24e88d9ca09b678f51ef7e3c193a57766bd71c35305ba9 SHA512 ff0c3aba612b2f1e83975c1bcc19220e92fb68c698b45a7862cab3c666b10665decf7e623fd4a66972781239bcb45bbead395e2a99e9ce1d172977ac149e838b
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.20.1.mod 1273 BLAKE2B bde3696d8cac6866996e59257bf27f2149e83caa46214f4b2504e037fd6bea229f8934f6501942c159ba77798e77d6e2c875cd172e1c339384b64dca34a4047c SHA512 1f044bb05f17979f521b3db67550f31a09ff670591d72d9e6db8417adbcd6a50a1af78699e78a06d94b99cde7248653050ba1af1dc9f9394aabedfc184d958e8
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.20.4.mod 1273 BLAKE2B 381a5f7bfa959d191f4a2daed7b110aaa5d43ce3beab30863b77304ad4487caa958de48bd208cb5362fe07b8d1460ac861115c4cfe7bf78ecaf7391a15c62125 SHA512 cc162da3d8b68bc7fd817517527e62b698ca6113536cba99df024607b871621cdec5a5e81747b18d71c7f429b24e019753211435918f562dc18fb43729a0bd6a
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.20.6.mod 1273 BLAKE2B 6e30b9d53df588b358196b89553c3cdbefd2de730099df6ad34eb8403abd8735ba16ed6cb183c1eb11d2933d5c807e3925b2a781ea6d1f8dd6a203a3b1d6a1b7 SHA512 282f9f6d6c16b0fdff7d648d482b17e0610e52365cb92cae11e2a3e484a6067cddba62a17d38cdf3b1b6323f2d5658d324bbeef387e387fb1bc8884f844863f5
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.21.2.mod 1385 BLAKE2B a8d0beed9e41cc62af61154a09a52a08c0b83c4054ff0ad9c2b38af82e8df688ec6989cef1fc36e24d9ac4d8c27f8517247395e85005fe10929ff6b1f658c38e SHA512 698cbb4fccdb5d2f4e1d4270480b0685d8778c5d3ee203da86ed40cffb172e51f91ac9d4c17c80375857c6377c24282b81dc4c224b26fbdefbef7d0e59d4558d
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.20.1.mod 1022 BLAKE2B bd4fec68f01133e508105eef2c629bfb56f083d7c348fbbd761b421bb572698ce0efce3d5a7a794abac9dc35216191e05717cda32036a419a7bdb2ead868fd49 SHA512 32c0ae219d6d8f2e5bd6935eb31db5ea9c9f4c12c840f7cf7f8a57e0657230cb9255bfd00f8c1e52fb4ef13bdbc5f1bd07402925019567507549960c3037599b
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.20.4.mod 1022 BLAKE2B 0cf9d0a86a5039f254309ba4592f155afdfe3d36f0c52692e842a4268695dc9abc3e5f444a8eb98c0adc2ceffae8982b266c5ce188502aa5a83e998a40ee0e62 SHA512 4d773f10075cefac309f6dc6b1030cb6ddac539403f686326402691117c5dbb56219ad56a4e947e516acdfadc95d253753ac0ddb67d83120cc9f3f3cd63c09c3
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.20.6.mod 1022 BLAKE2B 680ba519d0ea589965070aeeda3cda02ab659803bc0aef9c06256da6987bc676f7c5b25d69f1a5999f8f7bd3a29ccb801d127ecae7432a00f80db8e2bde020a4 SHA512 1b3d066a52d342ef76078ab12d83a7a628184472095dea4a1c4b83a7320bdbb514e4077a6d7794cfac6bb2ccf076bfb00bb6f0b12c60b31988d43fbe50f6138d
@@ -1103,12 +1223,16 @@ DIST k8s.io%2Fcri-api%2F@v%2Fv0.17.3.mod 941 BLAKE2B 308754c84fcf1d8791cb4370e6d
 DIST k8s.io%2Fcri-api%2F@v%2Fv0.20.1.mod 803 BLAKE2B 981becb944601f06544d9e2100c82ad903393d9f7e25bdf5def56653278648b9d0f061eea4c94cb106d2835c50f4f1a2ab6a066bf3452071bbd08eb877fd4c06 SHA512 740016c54b0ee3aba85a2c8b61d1bd1f86359746de155139a5384d476b9fd7927eb6e2e4f35478085ef6d27cc7493c611ad1bb8a7a1234799b260f21a66aa2be
 DIST k8s.io%2Fcri-api%2F@v%2Fv0.20.4.mod 803 BLAKE2B 981becb944601f06544d9e2100c82ad903393d9f7e25bdf5def56653278648b9d0f061eea4c94cb106d2835c50f4f1a2ab6a066bf3452071bbd08eb877fd4c06 SHA512 740016c54b0ee3aba85a2c8b61d1bd1f86359746de155139a5384d476b9fd7927eb6e2e4f35478085ef6d27cc7493c611ad1bb8a7a1234799b260f21a66aa2be
 DIST k8s.io%2Fcri-api%2F@v%2Fv0.20.6.mod 734 BLAKE2B d67ca32ee2b60d5ea238530916eca253abaa50c977aea2c5fbdcfa0f3313df05b2e1b3f14ecb729af40d9fafef7e1a5c90b30b053a111b1e9e3e414b3a08c4e2 SHA512 c02067232bd52013a05079d8602651f792d3c457b2d0ff4441d52900f6bfdfefce9eb731f49e4a5a09dfa9b82b9e87c9ac5f8a052fa8fe4b34c72bca7447031e
+DIST k8s.io%2Fcri-api%2F@v%2Fv0.21.2.mod 807 BLAKE2B de75f1aea9150ff433ba9b49497938a09a70c127cd7d1d84ba942878fc74385c6b6b1335d38cc00f6984347de7128833b81997f573c63e089f8cf7ea2a04e3a6 SHA512 7e89e18d37396ed5843073d1dfbfb5c9ef175309c5222e4606c8c73dc72a8a3422f65b70662d3cc71c57eeb8bc70cb0d30d2f464596a05919df2d243c2ed6959
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
 DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod 71 BLAKE2B c6d2fc56898a5b4e11c13f2d102269674def5c651031128231aa23d016ac3e74c23c734c4637e574e7deea2173733ba6272f02fe05e3c39aa5d1de4713aa184e SHA512 29871958be33057ed4a8f81336085da0c633dcc4c00c4dcc134d1313b1220bd24124d5b2b7a47b26b56ba2e7daefcd33dbef7bbc0a344c72e6c2b039767f810a
 DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.mod 71 BLAKE2B 5379c4cfec1c33cee99fc39e4c30e0a83b523474b23c8fb332dcfe3e76463828c559e252a67f19c2b2421b36b5d3f85ab52915a5a959f02666f25bc97e6dbd0a SHA512 2addab12a7cc1ffa4b20d006278930f87efede3163ed08d93644668fd36b1878153e4e9bbc6562b09e2f6637024829199b90e827f94e0874c6fba40ef7d7ed8f
+DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.8.0.mod 71 BLAKE2B d211519da5641fd9e80f36d55ec4a81d4d943cc263d5ab664706ca4bfa843632ae15eaaaa19c4e0abcc4d67810e7736eaeff20c4a8bbc17a68c3b5211dd11dab SHA512 787d0191620cec13e492773d16600ec5ff90fb4d4253590010c02b473cacc62b547544f6c90502d9f1e53fe9f31dbc65cdfbd3bd2412628c44f37074505fff60
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.mod 1277 BLAKE2B 931fd6a123ccb62fee29d795690f778a4d39c8f84159bd85b80ff0d47f92d298985a6620eefece9c4c76d4e3ed795b4aaf8dfe6e53ceedebd68095a373fa2af9 SHA512 746bc18de0a8a3cfcd1707a3e6b01055a8e29dc2bebb6edb2a7abe8709c13199b288da6107ab3a85e35338a1b3c15eb73ac8f02243579aac0b9c4fe76c8f54fb
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210305001622-591a79e4bda7.mod 1218 BLAKE2B 381df39fe48c112be512fb3c954797c40daa45f05cf5afcae61333340f125edef6d4261d3462022f02211b82b5840e845528db3a2eedd8380727e015856c8d8a SHA512 cefbc18554b31bc93feb3722d3af94dd84f1d363306b8c3f78e39465de2d51212d592b7bf97e851317fafc45c0efb20c73224be89d5f5bcfa756f0169417fd7f
 DIST k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod 25 BLAKE2B 4060536d51fac9854215957b1108a158adb0b3aeb8bfc659eca1140efdcf79cffe378db6f3cb1f4a4b68aa36468b7d5631e993d5a089eb839bd03b6b608496be SHA512 2349b7dbe8409836cc70d97c5b336f518b809f5731baf05ce68d957c9970895a9b7f89caf09763794cf13824ee29410b3a6e431b2da7f64610895c44b86c4d2d
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod 167 BLAKE2B 2a61747d367153284e7e614a82f98c8913693f3b51174c24b7f25d8e9d236418c4da9e6b33c7cdb7b4350314373037e1e7121ad7c0ca5fbc9a3b4b711a078a98 SHA512 1117d2493d40a111a749b0033c92876773242b86da0b437ba063e5da21289102d784479b0c757ad8ce50de4b1d8a2f6956afe3b2656977bd76bfab9f97c1d8a9
+DIST nerdctl-0.11.1.tar.gz 196375 BLAKE2B ac554440385a0133ebc0add0917cdc69a3223777426d35b6a1e1ee32fecc662673ce5d0979d525f64b542b28aebf5569700a815f26f40312910bddc7b1e4af84 SHA512 db95f980d9f826fe54db34b01aea71cd20bed3041d6ff485cdd3708727cfbd9ff36f9feac050a089a1c1c9c846677cd423704419c0426a772c452414cfe1fcfe
 DIST nerdctl-0.8.0.tar.gz 169666 BLAKE2B c2961ee8ddf511b3b27c5548bf1c24cd92ab2db8744488616f758ce0178cd56c6b91b7d63255a917b50490d8eeb6c8a92384ef7ef47fcae963899b1e8272654a SHA512 c7ceff3e48021bcb5ad231d374cf27ccf2d2dbadb2b1d96c9a5eb77fdb60f2c16ee38c5fbd9edd0982540475015241f1590359c50b7fdb32343f28a12a63d2e9
 DIST nerdctl-0.8.3.tar.gz 181280 BLAKE2B 50f1efca00dd5117258f82ae1c39875a3d73074c54154aff85413067bb2367897b88927c4437d9658f96d9be9bd8c9c36532c8782b34e201c22fa5835d58127e SHA512 4fc86a8da23389be3253b2d7fa017988d7eb13263926b5e50d54dd138e29e6accb1a51acbf156d4b53b08d46ab6e0e036e73942cb4e4a24d790aa347a8b0688e
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
@@ -1118,8 +1242,10 @@ DIST sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.14.
 DIST sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.mod 175 BLAKE2B 62ceee8603e76513f82ac240141baa2752978c96b7f2d28dbd4ad5ea9136751af8baa7b0ecc539b22a5ec427446b091f2d33826ae7aff25dac6eb8635ccee4f5 SHA512 0d1d2566707d1ac2927404c5d08e75d4ae9818085c0a156ca81422a688575f913723be6ed07faabc3831fc467ae5e7a9f3d90a2609dbb93c47cc5b230f64ec4e
 DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod 346 BLAKE2B f7711e6d8685f0d5323a98161f831fbe6d411fba26a6b1ad91ea656faea33eb4ffd9a1b33539b585643006d468f804368ab277db997273da67fec3dc72042ed3 SHA512 ad7e33e7a6eea993c180fe2d26dfea41511ea39e1c28f03ef681dd45e17e2fc0917d673b2a8ca8c09afe5dd832d949873b98c10968e691396a28ccd7ba6bc839
 DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.3.mod 346 BLAKE2B f7711e6d8685f0d5323a98161f831fbe6d411fba26a6b1ad91ea656faea33eb4ffd9a1b33539b585643006d468f804368ab277db997273da67fec3dc72042ed3 SHA512 ad7e33e7a6eea993c180fe2d26dfea41511ea39e1c28f03ef681dd45e17e2fc0917d673b2a8ca8c09afe5dd832d949873b98c10968e691396a28ccd7ba6bc839
+DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.0.mod 346 BLAKE2B f7711e6d8685f0d5323a98161f831fbe6d411fba26a6b1ad91ea656faea33eb4ffd9a1b33539b585643006d468f804368ab277db997273da67fec3dc72042ed3 SHA512 ad7e33e7a6eea993c180fe2d26dfea41511ea39e1c28f03ef681dd45e17e2fc0917d673b2a8ca8c09afe5dd832d949873b98c10968e691396a28ccd7ba6bc839
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
+EBUILD nerdctl-0.11.1.ebuild 53383 BLAKE2B 1db5a37cdfbf8858619ce657eaf0beeac4019f8b9b295890b8bb6095cae3c387988638ba278c3393d3d29edca1a995ddb0818e17f1bf67eab591ae59f408f4a3 SHA512 2939294c87dabb2fe15521c6eb3e37c54256a55eccfc3d2eac2c0bfc24969b179d8fea79238340d49478d3a4c7ca8dad3397d03e49998ac3bc56f86608006ade
 EBUILD nerdctl-0.8.0.ebuild 58294 BLAKE2B fcf46797d62661b89bcbc985c4397601508fd38c443faeae8ce3da4b5cdfaf764bfaddc76a80a97b68fc205920fa2a456d5192a1836bc79dd2bbb5e10be4e84a SHA512 6b36a37adec632ce88e680da56d99f58c0f101af871ab87cd6ba69ad81b57cba3531d1c69a49839b2b02eac96d66467788e5fb9514f36cfa557667e9fad578b3
 EBUILD nerdctl-0.8.3.ebuild 60561 BLAKE2B a7bf7e6b5cb96d4fa9ea23b446332a78c796a08eab78d5b889fce0871bcf052bb91727067fab898f65e77b57479e0c907dfc2f3442ed812a5b27b7c320c6c669 SHA512 2ec7ef448be6298a6eccdabefd26418d090167b4ca26f977f8ef9efa7344d95670cc87fdbebdd8d2897a3940c6020c1067c4db1678c9c572159a2d8acd9c4a71
 MISC metadata.xml 328 BLAKE2B e1284388fe40d8aa709a783d583fc6116eafc276e6d3e65741a03dea3cfb007549c1dadfdc2eea8ee92e430c22b734ad76944efb9c00082b4dc84e003c684763 SHA512 27f4323cda23315264bc5ea386e19b3faea4fc4808835c7105b2827cb98ed62bbbc49fa9676bd8e897d66e1b2d1cc338eebfff4c7ed01b769c13f1b72e3d5252
diff --git a/app-emulation/nerdctl/nerdctl-0.11.1.ebuild b/app-emulation/nerdctl/nerdctl-0.11.1.ebuild
new file mode 100644
index 000000000000..d351262f3e84
--- /dev/null
+++ b/app-emulation/nerdctl/nerdctl-0.11.1.ebuild
@@ -0,0 +1,1013 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
+HOMEPAGE="https://github.com/containerd/nerdctl"
+
+EGIT_COMMIT="95071bf1c5ec9c844931bcedeff049d0ce6f3584"
+EGO_SUM=(
+"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.38.0/go.mod"
+"cloud.google.com/go v0.44.1/go.mod"
+"cloud.google.com/go v0.44.2/go.mod"
+"cloud.google.com/go v0.45.1/go.mod"
+"cloud.google.com/go v0.46.3/go.mod"
+"cloud.google.com/go v0.50.0/go.mod"
+"cloud.google.com/go v0.52.0/go.mod"
+"cloud.google.com/go v0.53.0/go.mod"
+"cloud.google.com/go v0.54.0/go.mod"
+"cloud.google.com/go/bigquery v1.0.1/go.mod"
+"cloud.google.com/go/bigquery v1.3.0/go.mod"
+"cloud.google.com/go/bigquery v1.4.0/go.mod"
+"cloud.google.com/go/datastore v1.0.0/go.mod"
+"cloud.google.com/go/datastore v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.0.1/go.mod"
+"cloud.google.com/go/pubsub v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.2.0/go.mod"
+"cloud.google.com/go/storage v1.0.0/go.mod"
+"cloud.google.com/go/storage v1.5.0/go.mod"
+"cloud.google.com/go/storage v1.6.0/go.mod"
+"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+"github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod"
+"github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod"
+"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+"github.com/Azure/go-autorest v10.8.1+incompatible/go.mod"
+"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+"github.com/Azure/go-autorest/autorest v0.11.1/go.mod"
+"github.com/Azure/go-autorest/autorest v0.11.12/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+"github.com/Microsoft/go-winio v0.4.11/go.mod"
+"github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod"
+"github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod"
+"github.com/Microsoft/go-winio v0.4.17/go.mod"
+"github.com/Microsoft/go-winio v0.5.0"
+"github.com/Microsoft/go-winio v0.5.0/go.mod"
+"github.com/Microsoft/hcsshim v0.8.6/go.mod"
+"github.com/Microsoft/hcsshim v0.8.16/go.mod"
+"github.com/Microsoft/hcsshim v0.8.18"
+"github.com/Microsoft/hcsshim v0.8.18/go.mod"
+"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+"github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod"
+"github.com/antihax/optional v1.0.0/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
+"github.com/aws/aws-sdk-go v1.34.9/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/bitly/go-simplejson v0.5.0/go.mod"
+"github.com/bits-and-blooms/bitset v1.2.0"
+"github.com/bits-and-blooms/bitset v1.2.0/go.mod"
+"github.com/blang/semver v3.5.1+incompatible/go.mod"
+"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
+"github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod"
+"github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod"
+"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod"
+"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod"
+"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/cespare/xxhash v1.1.0"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod"
+"github.com/chzyer/logex v1.1.10/go.mod"
+"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+"github.com/cilium/ebpf v0.2.0/go.mod"
+"github.com/cilium/ebpf v0.4.0/go.mod"
+"github.com/cilium/ebpf v0.6.2/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
+"github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+"github.com/compose-spec/compose-go v0.0.0-20210716132856-efad24e892ce"
+"github.com/compose-spec/compose-go v0.0.0-20210716132856-efad24e892ce/go.mod"
+"github.com/containerd/aufs v1.0.0/go.mod"
+"github.com/containerd/btrfs v1.0.0/go.mod"
+"github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod"
+"github.com/containerd/cgroups v1.0.1"
+"github.com/containerd/cgroups v1.0.1/go.mod"
+"github.com/containerd/console v1.0.1/go.mod"
+"github.com/containerd/console v1.0.2/go.mod"
+"github.com/containerd/console v1.0.3"
+"github.com/containerd/console v1.0.3/go.mod"
+"github.com/containerd/containerd v1.5.1-0.20210802172229-7d4891783aac"
+"github.com/containerd/containerd v1.5.1-0.20210802172229-7d4891783aac/go.mod"
+"github.com/containerd/containerd/api v0.0.0-20210802172229-7d4891783aac"
+"github.com/containerd/containerd/api v0.0.0-20210802172229-7d4891783aac/go.mod"
+"github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod"
+"github.com/containerd/continuity v0.1.0"
+"github.com/containerd/continuity v0.1.0/go.mod"
+"github.com/containerd/fifo v1.0.0"
+"github.com/containerd/fifo v1.0.0/go.mod"
+"github.com/containerd/go-cni v1.0.2/go.mod"
+"github.com/containerd/go-cni v1.0.3-0.20210427061315-4efee5f0b4db"
+"github.com/containerd/go-cni v1.0.3-0.20210427061315-4efee5f0b4db/go.mod"
+"github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod"
+"github.com/containerd/go-runc v1.0.0/go.mod"
+"github.com/containerd/imgcrypt v1.1.1"
+"github.com/containerd/imgcrypt v1.1.1/go.mod"
+"github.com/containerd/nri v0.1.0/go.mod"
+"github.com/containerd/stargz-snapshotter v0.7.0"
+"github.com/containerd/stargz-snapshotter v0.7.0/go.mod"
+"github.com/containerd/stargz-snapshotter/estargz v0.7.0"
+"github.com/containerd/stargz-snapshotter/estargz v0.7.0/go.mod"
+"github.com/containerd/ttrpc v1.0.2"
+"github.com/containerd/ttrpc v1.0.2/go.mod"
+"github.com/containerd/typeurl v1.0.1/go.mod"
+"github.com/containerd/typeurl v1.0.2"
+"github.com/containerd/typeurl v1.0.2/go.mod"
+"github.com/containerd/zfs v1.0.0/go.mod"
+"github.com/containernetworking/cni v0.8.0/go.mod"
+"github.com/containernetworking/cni v0.8.1"
+"github.com/containernetworking/cni v0.8.1/go.mod"
+"github.com/containernetworking/plugins v0.9.1"
+"github.com/containernetworking/plugins v0.9.1/go.mod"
+"github.com/containers/ocicrypt v1.1.1"
+"github.com/containers/ocicrypt v1.1.1/go.mod"
+"github.com/coreos/bbolt v1.3.2/go.mod"
+"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+"github.com/coreos/go-iptables v0.5.0/go.mod"
+"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+"github.com/coreos/go-semver v0.2.0/go.mod"
+"github.com/coreos/go-semver v0.3.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/go-systemd/v22 v22.1.0/go.mod"
+"github.com/coreos/go-systemd/v22 v22.3.2"
+"github.com/coreos/go-systemd/v22 v22.3.2/go.mod"
+"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+"github.com/creack/pty v1.1.7/go.mod"
+"github.com/creack/pty v1.1.9/go.mod"
+"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
+"github.com/cyphar/filepath-securejoin v0.2.3"
+"github.com/cyphar/filepath-securejoin v0.2.3/go.mod"
+"github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod"
+"github.com/d2g/dhcp4client v1.0.0/go.mod"
+"github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod"
+"github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod"
+"github.com/danieljoos/wincred v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod"
+"github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e"
+"github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e/go.mod"
+"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+"github.com/docker/cli v20.10.7+incompatible/go.mod"
+"github.com/docker/cli v20.10.8+incompatible"
+"github.com/docker/cli v20.10.8+incompatible/go.mod"
+"github.com/docker/distribution v2.7.1+incompatible"
+"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+"github.com/docker/docker v20.10.7+incompatible/go.mod"
+"github.com/docker/docker v20.10.8+incompatible"
+"github.com/docker/docker v20.10.8+incompatible/go.mod"
+"github.com/docker/docker-credential-helpers v0.6.4"
+"github.com/docker/docker-credential-helpers v0.6.4/go.mod"
+"github.com/docker/go-connections v0.4.0"
+"github.com/docker/go-connections v0.4.0/go.mod"
+"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c"
+"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod"
+"github.com/docker/go-metrics v0.0.1"
+"github.com/docker/go-metrics v0.0.1/go.mod"
+"github.com/docker/go-units v0.4.0"
+"github.com/docker/go-units v0.4.0/go.mod"
+"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1"
+"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod"
+"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
+"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+"github.com/dustin/go-humanize v1.0.0/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+"github.com/emicklei/go-restful v2.9.5+incompatible/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/evanphx/json-patch v4.9.0+incompatible/go.mod"
+"github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.12.0"
+"github.com/fatih/color v1.12.0/go.mod"
+"github.com/felixge/httpsnoop v1.0.1/go.mod"
+"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+"github.com/frankban/quicktest v1.11.3/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/fsnotify/fsnotify v1.4.9"
+"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-kit/log v0.1.0/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logfmt/logfmt v0.5.0/go.mod"
+"github.com/go-logr/logr v0.1.0/go.mod"
+"github.com/go-logr/logr v0.2.0/go.mod"
+"github.com/go-logr/logr v0.4.0/go.mod"
+"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
+"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
+"github.com/go-openapi/jsonreference v0.19.2/go.mod"
+"github.com/go-openapi/jsonreference v0.19.3/go.mod"
+"github.com/go-openapi/spec v0.19.3/go.mod"
+"github.com/go-openapi/swag v0.19.2/go.mod"
+"github.com/go-openapi/swag v0.19.5/go.mod"
+"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c"
+"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod"
+"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+"github.com/godbus/dbus/v5 v5.0.4"
+"github.com/godbus/dbus/v5 v5.0.4/go.mod"
+"github.com/gofrs/flock v0.8.1/go.mod"
+"github.com/gogo/googleapis v1.4.0"
+"github.com/gogo/googleapis v1.4.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/gogo/protobuf v1.3.1/go.mod"
+"github.com/gogo/protobuf v1.3.2"
+"github.com/gogo/protobuf v1.3.2/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/mock v1.3.1/go.mod"
+"github.com/golang/mock v1.4.0/go.mod"
+"github.com/golang/mock v1.4.1/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/protobuf v1.3.3/go.mod"
+"github.com/golang/protobuf v1.3.4/go.mod"
+"github.com/golang/protobuf v1.3.5/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+"github.com/golang/protobuf v1.4.0/go.mod"
+"github.com/golang/protobuf v1.4.1/go.mod"
+"github.com/golang/protobuf v1.4.2/go.mod"
+"github.com/golang/protobuf v1.4.3/go.mod"
+"github.com/golang/protobuf v1.5.0"
+"github.com/golang/protobuf v1.5.0/go.mod"
+"github.com/golang/snappy v0.0.3"
+"github.com/golang/snappy v0.0.3/go.mod"
+"github.com/gomodule/redigo v1.8.2/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.0/go.mod"
+"github.com/google/go-cmp v0.5.2/go.mod"
+"github.com/google/go-cmp v0.5.4/go.mod"
+"github.com/google/go-cmp v0.5.5"
+"github.com/google/go-cmp v0.5.5/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/gofuzz v1.1.0/go.mod"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+"github.com/google/renameio v0.1.0/go.mod"
+"github.com/google/uuid v1.0.0/go.mod"
+"github.com/google/uuid v1.1.1/go.mod"
+"github.com/google/uuid v1.1.2/go.mod"
+"github.com/google/uuid v1.2.0/go.mod"
+"github.com/google/uuid v1.3.0"
+"github.com/google/uuid v1.3.0/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/googleapis/gnostic v0.4.1/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+"github.com/gorilla/handlers v1.5.1/go.mod"
+"github.com/gorilla/mux v1.8.0"
+"github.com/gorilla/mux v1.8.0/go.mod"
+"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/gorilla/websocket v1.4.2/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod"
+"github.com/hanwen/go-fuse v1.0.0/go.mod"
+"github.com/hanwen/go-fuse/v2 v2.1.0/go.mod"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.3/go.mod"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod"
+"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+"github.com/imdario/mergo v0.3.5/go.mod"
+"github.com/imdario/mergo v0.3.12"
+"github.com/imdario/mergo v0.3.12/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/insomniacslk/dhcp v0.0.0-20210120172423-cc9239ac6294/go.mod"
+"github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod"
+"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+"github.com/joho/godotenv v1.3.0"
+"github.com/joho/godotenv v1.3.0/go.mod"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/jpillora/backoff v1.0.0/go.mod"
+"github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod"
+"github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod"
+"github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod"
+"github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.10/go.mod"
+"github.com/json-iterator/go v1.1.11/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/julienschmidt/httprouter v1.3.0/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/errcheck v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.5.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/klauspost/compress v1.11.13/go.mod"
+"github.com/klauspost/compress v1.12.3"
+"github.com/klauspost/compress v1.12.3/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pretty v0.2.1/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/pty v1.1.5/go.mod"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/kr/text v0.2.0"
+"github.com/kr/text v0.2.0/go.mod"
+"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+"github.com/magiconair/properties v1.8.0/go.mod"
+"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+"github.com/mailru/easyjson v0.7.0/go.mod"
+"github.com/marstr/guid v1.1.0/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.8"
+"github.com/mattn/go-colorable v0.1.8/go.mod"
+"github.com/mattn/go-isatty v0.0.4/go.mod"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/mattn/go-isatty v0.0.13"
+"github.com/mattn/go-isatty v0.0.13/go.mod"
+"github.com/mattn/go-runewidth v0.0.2/go.mod"
+"github.com/mattn/go-shellwords v1.0.3/go.mod"
+"github.com/mattn/go-shellwords v1.0.12"
+"github.com/mattn/go-shellwords v1.0.12/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
+"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
+"github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod"
+"github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod"
+"github.com/mdlayher/netlink v1.0.0/go.mod"
+"github.com/mdlayher/netlink v1.1.0/go.mod"
+"github.com/mdlayher/netlink v1.1.1/go.mod"
+"github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod"
+"github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod"
+"github.com/miekg/pkcs11 v1.0.3"
+"github.com/miekg/pkcs11 v1.0.3/go.mod"
+"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/mapstructure v1.4.1"
+"github.com/mitchellh/mapstructure v1.4.1/go.mod"
+"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod"
+"github.com/moby/locker v1.0.1"
+"github.com/moby/locker v1.0.1/go.mod"
+"github.com/moby/spdystream v0.2.0/go.mod"
+"github.com/moby/sys/mountinfo v0.4.1"
+"github.com/moby/sys/mountinfo v0.4.1/go.mod"
+"github.com/moby/sys/signal v0.5.1-0.20210723232958-8a51b5cc8879"
+"github.com/moby/sys/signal v0.5.1-0.20210723232958-8a51b5cc8879/go.mod"
+"github.com/moby/sys/symlink v0.1.0/go.mod"
+"github.com/moby/term v0.0.0-20200312100748-672ec06f55cd"
+"github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod"
+"github.com/moby/vpnkit v0.5.0/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/morikuni/aec v1.0.0"
+"github.com/morikuni/aec v1.0.0/go.mod"
+"github.com/mrunalp/fileutils v0.5.0/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+"github.com/ncw/swift v1.0.47/go.mod"
+"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+"github.com/nxadm/tail v1.4.4"
+"github.com/nxadm/tail v1.4.4/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.10.3/go.mod"
+"github.com/onsi/ginkgo v1.11.0/go.mod"
+"github.com/onsi/ginkgo v1.12.1"
+"github.com/onsi/ginkgo v1.12.1/go.mod"
+"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+"github.com/onsi/gomega v1.7.0/go.mod"
+"github.com/onsi/gomega v1.7.1/go.mod"
+"github.com/onsi/gomega v1.10.3"
+"github.com/onsi/gomega v1.10.3/go.mod"
+"github.com/opencontainers/go-digest v1.0.0"
+"github.com/opencontainers/go-digest v1.0.0/go.mod"
+"github.com/opencontainers/image-spec v1.0.1"
+"github.com/opencontainers/image-spec v1.0.1/go.mod"
+"github.com/opencontainers/runc v1.0.1"
+"github.com/opencontainers/runc v1.0.1/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.2/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod"
+"github.com/opencontainers/selinux v1.8.2"
+"github.com/opencontainers/selinux v1.8.2/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/pelletier/go-toml v1.8.1/go.mod"
+"github.com/pelletier/go-toml v1.9.3"
+"github.com/pelletier/go-toml v1.9.3/go.mod"
+"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pkg/errors v0.9.1"
+"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/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.1.0/go.mod"
+"github.com/prometheus/client_golang v1.7.1/go.mod"
+"github.com/prometheus/client_golang v1.11.0"
+"github.com/prometheus/client_golang v1.11.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.6.0/go.mod"
+"github.com/prometheus/common v0.10.0/go.mod"
+"github.com/prometheus/common v0.26.0"
+"github.com/prometheus/common v0.26.0/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.3/go.mod"
+"github.com/prometheus/procfs v0.1.3/go.mod"
+"github.com/prometheus/procfs v0.2.0/go.mod"
+"github.com/prometheus/procfs v0.6.0"
+"github.com/prometheus/procfs v0.6.0/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+"github.com/rootless-containers/rootlesskit v0.14.5"
+"github.com/rootless-containers/rootlesskit v0.14.5/go.mod"
+"github.com/rs/xid v1.3.0/go.mod"
+"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+"github.com/russross/blackfriday/v2 v2.1.0"
+"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
+"github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod"
+"github.com/satori/go.uuid v1.2.0/go.mod"
+"github.com/seccomp/libseccomp-golang v0.9.1/go.mod"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+"github.com/sirupsen/logrus v1.0.6/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/sirupsen/logrus v1.6.0/go.mod"
+"github.com/sirupsen/logrus v1.7.0/go.mod"
+"github.com/sirupsen/logrus v1.8.1"
+"github.com/sirupsen/logrus v1.8.1/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+"github.com/smartystreets/goconvey v1.6.4/go.mod"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/afero v1.2.2/go.mod"
+"github.com/spf13/cast v1.3.0/go.mod"
+"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+"github.com/spf13/cobra v0.0.3/go.mod"
+"github.com/spf13/cobra v1.0.0/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+"github.com/spf13/pflag v1.0.1/go.mod"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/pflag v1.0.5/go.mod"
+"github.com/spf13/viper v1.4.0/go.mod"
+"github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980"
+"github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/objx v0.2.0"
+"github.com/stretchr/objx v0.2.0/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/stretchr/testify v1.5.1/go.mod"
+"github.com/stretchr/testify v1.6.1/go.mod"
+"github.com/stretchr/testify v1.7.0"
+"github.com/stretchr/testify v1.7.0/go.mod"
+"github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod"
+"github.com/tchap/go-patricia v2.2.6+incompatible/go.mod"
+"github.com/tidwall/gjson v1.8.1"
+"github.com/tidwall/gjson v1.8.1/go.mod"
+"github.com/tidwall/match v1.0.3"
+"github.com/tidwall/match v1.0.3/go.mod"
+"github.com/tidwall/pretty v1.1.0"
+"github.com/tidwall/pretty v1.1.0/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/u-root/u-root v7.0.0+incompatible/go.mod"
+"github.com/ugorji/go v1.1.4/go.mod"
+"github.com/urfave/cli v1.20.0/go.mod"
+"github.com/urfave/cli v1.22.1/go.mod"
+"github.com/urfave/cli v1.22.2"
+"github.com/urfave/cli v1.22.2/go.mod"
+"github.com/urfave/cli/v2 v2.3.0"
+"github.com/urfave/cli/v2 v2.3.0/go.mod"
+"github.com/vishvananda/netlink v1.1.0/go.mod"
+"github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod"
+"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod"
+"github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod"
+"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f"
+"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415"
+"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+"github.com/xeipuuv/gojsonschema v1.2.0"
+"github.com/xeipuuv/gojsonschema v1.2.0/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"github.com/yuin/goldmark v1.2.1/go.mod"
+"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod"
+"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod"
+"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.etcd.io/bbolt v1.3.3/go.mod"
+"go.etcd.io/bbolt v1.3.5/go.mod"
+"go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod"
+"go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1"
+"go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0/go.mod"
+"go.opencensus.io v0.22.2/go.mod"
+"go.opencensus.io v0.22.3"
+"go.opencensus.io v0.22.3/go.mod"
+"go.opentelemetry.io/proto/otlp v0.7.0/go.mod"
+"go.uber.org/atomic v1.3.2/go.mod"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/zap v1.10.0/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
+"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2"
+"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+"golang.org/x/mod v0.1.0/go.mod"
+"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/mod v0.3.0/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+"golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod"
+"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+"golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod"
+"golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod"
+"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
+"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+"golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4"
+"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+"golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod"
+"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+"golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod"
+"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
+"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
+"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod"
+"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+"golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+"golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod"
+"golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod"
+"golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod"
+"golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod"
+"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+"golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod"
+"golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod"
+"golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod"
+"golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+"golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod"
+"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+"golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod"
+"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod"
+"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
+"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c"
+"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod"
+"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
+"golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b"
+"golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod"
+"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/text v0.3.4"
+"golang.org/x/text v0.3.4/go.mod"
+"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+"golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+"golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod"
+"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
+"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/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"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+"google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod"
+"google.golang.org/api v0.4.0/go.mod"
+"google.golang.org/api v0.7.0/go.mod"
+"google.golang.org/api v0.8.0/go.mod"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/api v0.13.0/go.mod"
+"google.golang.org/api v0.14.0/go.mod"
+"google.golang.org/api v0.15.0/go.mod"
+"google.golang.org/api v0.17.0/go.mod"
+"google.golang.org/api v0.18.0/go.mod"
+"google.golang.org/api v0.20.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.1/go.mod"
+"google.golang.org/appengine v1.6.5/go.mod"
+"google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+"google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod"
+"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+"google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod"
+"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+"google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a"
+"google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod"
+"google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.1/go.mod"
+"google.golang.org/grpc v1.21.0/go.mod"
+"google.golang.org/grpc v1.21.1/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.25.1/go.mod"
+"google.golang.org/grpc v1.26.0/go.mod"
+"google.golang.org/grpc v1.27.0/go.mod"
+"google.golang.org/grpc v1.27.1/go.mod"
+"google.golang.org/grpc v1.33.1/go.mod"
+"google.golang.org/grpc v1.33.2/go.mod"
+"google.golang.org/grpc v1.36.0/go.mod"
+"google.golang.org/grpc v1.38.0/go.mod"
+"google.golang.org/grpc v1.39.0"
+"google.golang.org/grpc v1.39.0/go.mod"
+"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+"google.golang.org/protobuf v1.21.0/go.mod"
+"google.golang.org/protobuf v1.22.0/go.mod"
+"google.golang.org/protobuf v1.23.0/go.mod"
+"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+"google.golang.org/protobuf v1.24.0/go.mod"
+"google.golang.org/protobuf v1.25.0/go.mod"
+"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+"google.golang.org/protobuf v1.26.0"
+"google.golang.org/protobuf v1.26.0/go.mod"
+"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+"gopkg.in/errgo.v2 v2.1.0/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
+"gopkg.in/square/go-jose.v2 v2.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.3/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"gopkg.in/yaml.v2 v2.3.0/go.mod"
+"gopkg.in/yaml.v2 v2.4.0"
+"gopkg.in/yaml.v2 v2.4.0/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+"gotest.tools v2.2.0+incompatible"
+"gotest.tools v2.2.0+incompatible/go.mod"
+"gotest.tools/v3 v3.0.2/go.mod"
+"gotest.tools/v3 v3.0.3"
+"gotest.tools/v3 v3.0.3/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+"k8s.io/api v0.20.6/go.mod"
+"k8s.io/api v0.21.2/go.mod"
+"k8s.io/apimachinery v0.20.6/go.mod"
+"k8s.io/apimachinery v0.21.2/go.mod"
+"k8s.io/apiserver v0.20.6/go.mod"
+"k8s.io/client-go v0.20.6/go.mod"
+"k8s.io/client-go v0.21.2/go.mod"
+"k8s.io/component-base v0.20.6/go.mod"
+"k8s.io/cri-api v0.20.6/go.mod"
+"k8s.io/cri-api v0.21.2/go.mod"
+"k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod"
+"k8s.io/klog/v2 v2.0.0/go.mod"
+"k8s.io/klog/v2 v2.4.0/go.mod"
+"k8s.io/klog/v2 v2.8.0/go.mod"
+"k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod"
+"k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod"
+"k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod"
+"rsc.io/binaryregexp v0.2.0/go.mod"
+"rsc.io/quote/v3 v3.1.0/go.mod"
+"rsc.io/sampler v1.3.0/go.mod"
+"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod"
+"sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod"
+"sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod"
+"sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+"sigs.k8s.io/yaml v1.2.0/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/containerd/nerdctl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+BDEPEND=">=dev-lang/go-1.16"
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE=""
+
+src_prepare() {
+	sed -e 's:/usr/local/bin:/usr/bin:' \
+		-e "s|^VERSION[[:space:]]*=.*|VERSION := v${PV}|" \
+		-e "s|^REVISION[[:space:]]*=.*|REVISION := ${EGIT_COMMIT}|" \
+		-i Makefile || die
+	default
+}
+
+src_install() {
+	DOCS=(README.md docs examples)
+	default_src_install
+}
diff --git a/app-emulation/podman/Manifest b/app-emulation/podman/Manifest
index d94c9c0f4726..187af279f8aa 100644
--- a/app-emulation/podman/Manifest
+++ b/app-emulation/podman/Manifest
@@ -2,5 +2,7 @@ AUX podman.confd 328 BLAKE2B e03a1f7f5cec555f195bd1ca9bea050a67ccac7866bd68f0c74
 AUX podman.initd 704 BLAKE2B 2fc4ffaa3b971774957ea244e05d851fa2797ec074529ea7c23bc6d7a3f597c04268d7f5580852dae4ab412629a513fed152f6a20a7ed432ef00cb96848c290c SHA512 bcf3e74a4a77bac82fc4679b3161091692b301426ecf81af7c5ea7e23ba66d15602d0cf1284f160d4179e52ae78f309ad826d9f3698dfcb78c2be2c6ac51417c
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
 DIST podman-3.3.1.tar.gz 10917305 BLAKE2B fe7856c2ad8893e40ec42fb242a088794ea18910388d5e8089885013cab45c98e03bef99a5e911749f95ce469518e6fa5b6d30400f52696645c9ba8c140ba445 SHA512 19003f63c17c1c5788f34d0d6426a366035fc76aa2312e6355464d204d6536e5f78652abaf01643d4be7c2ee5224c25717b41760a4be4f6de8031cca9b06efaa
+DIST podman-3.4.0.tar.gz 10950594 BLAKE2B 4a96b9be980f336bc7cfa6efa0f955da90b67e1ff3e45c34097b9eb4fcd611b3454860048410238aeb1063331b246e9c156f738813e7f585d2254a1568d20642 SHA512 195354b15beaaed19b4d5f71f5dbfcd1ebfc5c80c07db91043b76e3254d62b5fd001c52c536773656e5eba65954511c1639a50b955a9992fa4d18a55e573c2a1
 EBUILD podman-3.3.1.ebuild 4708 BLAKE2B 81122dfab3c2cc5f2b9011bbaeac253865662b4d0966125a405d3beadc09798d5b19694a0672d0f44b75cee00c2c1598cc385ac4632a75e22b9d7cd75ab4ef92 SHA512 a4415f1be56365bcba5a9be5dade198ac22ac20111fffcd660d9f3ccd47f2e7cddb3002a57d6d18cf6506c713a3220ff88137758d010b25a6d3b88360f29d98e
+EBUILD podman-3.4.0.ebuild 4710 BLAKE2B 6cbec602bebed87db289b4029da7e319b03ff078a1cdbf66bd20693da612a990074b665ef21644d2439c97eee7346bdcd7077cf92839b9145dddc132ebafa0e7 SHA512 4cd475ca845858efd12c6e13c790f454f64c68b4a99b077c0a40e6fa58df000f3fb4983c941522adf1a53231c30ff9155d167923f59220f2e77c8afc19c94353
 MISC metadata.xml 1161 BLAKE2B 2102871bd12b9db7469f59ba58dcd19f4d5916eb4820d18abc9f36528c00c3439f82ab3988686bbd5b18bc3e8a40a3eddd0e9ed579747ad8c19e9c2d89017e74 SHA512 5d138c94ea82af17594a94667f8306ca96dfb6c12dade1ea1681fedd42e83454f88b2de6dacec6e678b879ef66f3c8cd8d5fae0852c9e3b18239e9c881b4d268
diff --git a/app-emulation/podman/podman-3.4.0.ebuild b/app-emulation/podman/podman-3.4.0.ebuild
new file mode 100644
index 000000000000..2b32a24eb198
--- /dev/null
+++ b/app-emulation/podman/podman-3.4.0.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGIT_COMMIT="6e8de00bb224f9931d7402648f0177e7357ed079"
+
+inherit bash-completion-r1 flag-o-matic go-module tmpfiles
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/podman/"
+MY_PN=podman
+MY_P=${MY_PN}-${PV}
+SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="apparmor btrfs +fuse +rootless selinux"
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	>=app-emulation/conmon-2.0.0
+	|| ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	>=net-misc/cni-plugins-0.8.6
+	sys-fs/lvm2
+	sys-libs/libseccomp:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	rootless? ( app-emulation/slirp4netns )
+	selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+	fuse? ( sys-fs/fuse-overlayfs )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# Disable installation of python modules here, since those are
+	# installed by separate ebuilds.
+	local makefile_sed_args=(
+		-e '/^GIT_.*/d'
+		-e 's/$(GO) build/$(GO) build -v -work -x/'
+		-e 's/^\(install:.*\) install\.python$/\1/'
+		-e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
+	)
+
+	has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
+
+	sed "${makefile_sed_args[@]}" -i Makefile || die
+
+	sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
+		-i hack/get_release_info.sh || die
+}
+
+src_compile() {
+	local git_commiT=${EGIT_COMMIT}
+
+	# Filter unsupported linker flags
+	filter-flags '-Wl,*'
+
+	[[ -f hack/apparmor_tag.sh ]] || die
+	if use apparmor; then
+		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+	fi
+
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	if use btrfs; then
+		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+			hack/btrfs_installed_tag.sh || die
+	fi
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	if use selinux; then
+		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+	fi
+
+	# Avoid this error when generating pkg/varlink/iopodman.go:
+	# cannot find package "github.com/varlink/go/varlink/idl"
+	mkdir -p _output || die
+	ln -snf ../vendor _output/src || die
+	GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
+	rm _output/src || die
+
+	export -n GOCACHE GOPATH XDG_CACHE_HOME
+	GOBIN="${S}/bin" \
+		emake all \
+			GIT_BRANCH=master \
+			GIT_BRANCH_CLEAN=master \
+			COMMIT_NO="${git_commit}" \
+			GIT_COMMIT="${git_commit}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	insinto /etc/containers
+	newins test/registries.conf registries.conf.example
+	newins test/policy.json policy.json.example
+
+	insinto /usr/share/containers
+	doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
+
+	newconfd "${FILESDIR}"/podman.confd podman
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	dobashcomp completions/bash/*
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/*
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/*
+
+	keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+	PODMAN_ROOTLESS_UPGRADE=false
+	if use rootless; then
+		has_version 'app-emulation/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process podman.conf
+
+	local want_newline=false
+	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
+		elog "You need to create the following config files:"
+		elog "/etc/containers/registries.conf"
+		elog "/etc/containers/policy.json"
+		elog "To copy over default examples, use:"
+		elog "cp /etc/containers/registries.conf{.example,}"
+		elog "cp /etc/containers/policy.json{.example,}"
+		want_newline=true
+	fi
+	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
+		${want_newline} && elog ""
+		elog "For rootless operation, you need to configure subuid/subgid"
+		elog "for user running podman. In case subuid/subgid has only been"
+		elog "configured for root, run:"
+		elog "usermod --add-subuids 1065536-1131071 <user>"
+		elog "usermod --add-subgids 1065536-1131071 <user>"
+		want_newline=true
+	fi
+}
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 8766efeb83ee..d62f289661d9 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -6,13 +6,14 @@ AUX qemu-5.2.0-dce-locks.patch 738 BLAKE2B 121372ed4d812a19f365ec88b584a196548f8
 AUX qemu-5.2.0-disable-keymap.patch 884 BLAKE2B dbbe245a52615f8894cbac1c94ce3fee2051b1c54def32ec6ad43dedfe8190d02937c28ce93d93eeb13fe82f2ac2df52bec375501e83af53624d8292f8208fe3 SHA512 f84c6f37ce742201b63b308bef5fdaf1dc50e77e0dcf164e85284e338ed7bd861fc0e147fb88668b056ab0f15b4e6cbefbfb2cd2bafeb002c281ae88d08f9703
 AUX qemu-5.2.0-strings.patch 799 BLAKE2B 8f249a647714a4a677d1aca5d8d5c19b27a0e1933877a286017928e01ec23d82e41dc1d196a50ba38bcf4ec8b71fd89c89e41b7c9673faf13935188eebaf4a56 SHA512 481917c8ec9c5089c210f80e719f5a65af1193323ccda4d68bec6afaab0d0e6407cee1d05cd1f3b1bfbd7b7a5f9d2cdb42dd12123813f2c3c51116e999c09288
 AUX qemu-6.0.0-make.patch 306 BLAKE2B 701c6d929dc7544a2e155243a2545dc488765cf8b733fca29c4f4cb06cad732d72f64c330d95fbcdcf12b174b92b7fa5b713bf833065e5014f8aed1eec22c0a1 SHA512 5d22c6c4085dd0bf58752e21af9addd6a1a670a60f172b488d1ccfb1b9356ce9808a3b9337dd1bd2aa9e06735a3c7a465bc11ae3871cc4294ec609729b2e09c7
+AUX qemu-6.1.0-automagic-libbpf.patch 887 BLAKE2B 9c74ea440dbd958368ae41b4d39cf869fa34f70493c7e79d5be31309d343cb35b8061c9d99f3b5e7bfcf99f4cc590d9b4854b12f109a8dd247922d7a07aa68bf SHA512 76fcb4d280cd0c7f7610b55154d987501597b823f286110e0ae756ae6bb541193423f942ce6d4f8fefdc42d1727b8689142dd50f186689427afef18adb5f62b5
 AUX qemu-6.1.0-strings.patch 882 BLAKE2B 9c35aca28371c15e037af5e9deaa90edcad769b5346f7c90cbb7768ce5639b1d1d1204933024241b7349573cc94ebca7a85ebaf051a9fb9dab8ea7d87d843ef9 SHA512 fcbf02a38401dbc7612130bb993dbec72468c926f729cd32e822b39fefe446ed8fd0906d6ffd4557181df753a84d77182fa713a5939300f193008532be88ada4
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4
 DIST qemu-6.1.0.tar.xz 111258808 BLAKE2B 412eecf6d39debd6089b26d3b22e5d25c6c8c30d2eaf31b17c25cc2b3a1b10794a30218dfb151c78801aa295255aa974b297f1fe05b93f14334f203c2af5ccee SHA512 3378ae21c75b77ee6a759827f1fcf7b2a50a0fef07e3b0e89117108022a8d8655fa977e4d65596f4f24f7c735c6594d44b0c6f69732ea4465e88a7406b1d5d3c
 EBUILD qemu-6.0.0-r3.ebuild 25707 BLAKE2B e42d63e7b996356466a1aaecc99b6b6435d8a7c733694b9afd5279cebc973c9236e8544dc806d3117a60ee725e1a5a0bb3a2fbbecc0d7053b57fb4b5e66211b8 SHA512 26ff7c7d12b427621dbfea2a6fb9e5e79ae8e5ee6eb8bebfd6c0512bed547bb62c99629592d23ca2f24611fb17fd37f15a43ae063b5b4b8bf9c9ad0712c3c1ec
-EBUILD qemu-6.0.0-r53.ebuild 25774 BLAKE2B ad019835cd1acd45f7b5c4d29161b3626a8a285d3d2c67b65aca3a5fe05a8748b252eadaddfbd177213f70f8be14dfec820e29a7ff068eb7fe87e5e742bc5901 SHA512 21c12bd597e7f1ed984aa1a6fb880a3cdfc5d7eb91dedd6265b8cd9be1d162eab371b3245ae02975fd9d7c981d5f1b944fa00fe4abd55458544e0fea72d75d7d
-EBUILD qemu-6.1.0.ebuild 25679 BLAKE2B 41ce7b2b45928ea5b5218f5764d0de0e96b40235663e573ec9fea0531e77dc3764dc87107239d6aa08e2b20b44cd30d01bf6bd344045a7ba8a42d9ebb4f7635e SHA512 0e26b90e4395d33b1cdebb5bf6ceb38f49fb0c191a3ce11b736cf94a1fb29369134fab7df834faa3b289a4ae68206063b4ade91d524b2d06ea7ba894cf26b885
+EBUILD qemu-6.0.0-r53.ebuild 25771 BLAKE2B 24747bb80a6be10aeee0a57544fd888ea6f07c4df4185366243f8716f47e54f4efce6eee7294ec4418046f88e7a02b52ab2e672cc66fa1876414bbf4d5648e57 SHA512 c818fb678899e76b9b6e16f84328b0d1def41614272d49067a0719b8540e46b950daa9229cc2b055b32877287e5356751d5e5db07541d27762ccaf124c970fc6
+EBUILD qemu-6.1.0.ebuild 25776 BLAKE2B 8e9e76c6839891b180a81c5a8563b3103fadf0bdc9a7e9608d22d1068007066788cb04b31140522745d5805ed0a91bf091d7b912a2666ef4410a71dd0d4213f2 SHA512 c2f1eb8cf381ac37f017fceb93f6ea0f5a62294dce66d4c157b78f8e29c04f313077fdf4ab0c4cbad32a0fd87d282804d3a0d84379e08dd45203997c36e388b4
 EBUILD qemu-9999.ebuild 25643 BLAKE2B 662ee64944087293a48267ce2c2e09ae940b088a50bf1ff6e09efddaf2656119267511130b8030c1d4e05fa3eabfc6c69ed7c302da6d1e952679c743a16e9dda SHA512 7389c614c6f092a0e333d5f9deca972d85dbc08fdd9bcfc3894aa14b506bcbcfa2810ac8ca097de7415eb1c3915a02c5984ea483db2dd9260a71aafcad407009
-MISC metadata.xml 4412 BLAKE2B c941bfcd3b0e601598859f87e5651959553e5b0baaa5f0adad01c6ea840cffb03612310e9fa034a92b16a1db27a5c07be3bd41be5105ba02bd8719e65bd43d6e SHA512 3639168093bf902d954c90748b69e3af66d9d03aeae8ddbf8ee5969ea9329f5a3a57312adf6995d12a26140b952a0a534eb4db6952f59b8bdd979c9bc91323c1
+MISC metadata.xml 4482 BLAKE2B 0444445c2cd94eb4c5446bd05ebb40e6bef98483f399a6c976affd36535962cc0c60b870b94dbd3dc7d184fad11eb7b6f401aacef016bce677e44450609661d8 SHA512 88bdbadca89a143d8dcb4a1d00629feff7ab8ac87878a23207933f9f3f414f76023b329c0aa91dfbc025ace7c138b5d08c5c7ddb51d61a6933c225511c040b47
diff --git a/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch b/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch
new file mode 100644
index 000000000000..d067650dc8fa
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch
@@ -0,0 +1,21 @@
+commit 080832e4f4801a28bd1170c49e61f6a0f5f05d03
+Author: Paolo Bonzini <pbonzini@redhat.com>
+Date:   Tue Sep 7 12:45:12 2021 +0200
+
+    ebpf: only include in system emulators
+    
+    eBPF files are being included in user emulators, which is useless and
+    also breaks compilation because ebpf/trace-events is only processed
+    if a system emulator is included in the build.
+    
+    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/566
+    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+    Signed-off-by: Jason Wang <jasowang@redhat.com>
+
+diff --git a/ebpf/meson.build b/ebpf/meson.build
+index 9cd0635370..2dd0fd8948 100644
+--- a/ebpf/meson.build
++++ b/ebpf/meson.build
+@@ -1 +1 @@
+-common_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c'))
++softmmu_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c'))
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 6cc5daac8dcd..094f223846c3 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="accessibility">Adds support for braille displays using brltty</flag>
 		<flag name="aio">Enables support for Linux's Async IO</flag>
 		<flag name="alsa">Enable alsa output for sound emulation</flag>
+		<flag name="bpf">Enable eBPF support for RSS implementation.</flag>
 		<flag name="capstone">Enable disassembly support with <pkg>dev-libs/capstone</pkg></flag>
 		<flag name="curl">Support ISOs / -cdrom directives via HTTP or HTTPS.</flag>
 		<flag name="fdt">Enables firmware device tree support</flag>
diff --git a/app-emulation/qemu/qemu-6.0.0-r53.ebuild b/app-emulation/qemu/qemu-6.0.0-r53.ebuild
index ea4fef2265a6..c08a7c759b94 100644
--- a/app-emulation/qemu/qemu-6.0.0-r53.ebuild
+++ b/app-emulation/qemu/qemu-6.0.0-r53.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/qemu/qemu-6.1.0.ebuild b/app-emulation/qemu/qemu-6.1.0.ebuild
index 8365c047729d..15cd2a1d2944 100644
--- a/app-emulation/qemu/qemu-6.1.0.ebuild
+++ b/app-emulation/qemu/qemu-6.1.0.ebuild
@@ -32,7 +32,7 @@ HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org"
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
+IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc
 	+fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
 	jack jemalloc +jpeg kernel_linux
 	kernel_FreeBSD lzo multipath
@@ -142,6 +142,7 @@ SOFTMMU_TOOLS_DEPEND="
 	)
 	aio? ( dev-libs/libaio[static-libs(+)] )
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bpf? ( dev-libs/libbpf:= )
 	bzip2? ( app-arch/bzip2[static-libs(+)] )
 	capstone? ( dev-libs/capstone:= )
 	caps? ( sys-libs/libcap-ng[static-libs(+)] )
@@ -276,6 +277,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
 	"${FILESDIR}"/${PN}-6.0.0-make.patch
 	"${FILESDIR}"/${PN}-6.1.0-strings.patch
+	"${FILESDIR}"/${P}-automagic-libbpf.patch
 )
 
 QA_PREBUILT="
@@ -501,6 +503,7 @@ qemu_src_configure() {
 	conf_opts+=(
 		$(conf_notuser accessibility brlapi)
 		$(conf_notuser aio linux-aio)
+		$(conf_softmmu bpf)
 		$(conf_notuser bzip2)
 		$(conf_notuser capstone)
 		$(conf_notuser caps cap-ng)
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index 5efafeef2ba0..668129e9b770 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,5 +1,5 @@
-DIST slirp4netns-1.1.8.tar.gz 58022 BLAKE2B cb65af6a5298411c158dd3da8160f8e4999ce5cb6bafc85f233d4d64a58c545ff7e9db21501f718ce7990d2497a6960853ecb9ff548859b1be19f3d74e86610b SHA512 28b2dd73cfd0a0fc71338c55a7f4ae448456620a0d27eb1e7c79f2d58da2a90f2f9af363c9abf5148d4d6435f69ea26809e5f20721fec5daf4c9897bb29c3547
+DIST slirp4netns-1.1.12.tar.gz 60223 BLAKE2B 2bd4ed6cded075a151fec0e6b2222b0a72f2027d702cd3e2760ab8c811e375ea5becfeb32ccf71f4b41a257b9e7f32852d6d805912ad950da3364e240d191674 SHA512 82584e40079c2a7730c098f2a2406dc042498f7d50cc9ad8404acf3bb3a50c6969737be531d64b2eca6ba86a968bb5bfea9ad10eba4979cc40a5da5c9745ebdb
 DIST slirp4netns-1.1.9.tar.gz 58951 BLAKE2B e4fde408b3cd55dec0cca495c58936ec32c6201a0fe63c1a9fc9502ac41da615f92271d5fb365475f6864dd3c195097c81f01268b1b8d10d0f888c4e154cac34 SHA512 6471bf2b2eff9bd3ef037de986ab612f20bfce7a52bfd2b1b434d0606a3d2e6170b3fc43b168c8cc6f56ffb82f8361f21a26522ac1092c71f6e694a9588d5854
-EBUILD slirp4netns-1.1.8.ebuild 949 BLAKE2B 386ac222a7ddb0ed2d4ab6f90674904d0e97ad548034a73dae4a5e695378968bab976675cf910bcdcd26c2fdec28bb297eb3a408a06b3d3c1e0f266e6a815eff SHA512 5404cd12a3bdbc88a23ccd5f5769345f70e40f9fd68ca4c44278447eb35c0d5eab8307c0f70cd33e2b94fd43553fe0f3f181ba0ebc213970a06497595a7202b9
+EBUILD slirp4netns-1.1.12.ebuild 958 BLAKE2B d20291a49bd8227e45af3f6ce1f47c6a9ad02a760e122e7401dac7647a35f2d4000ae9bd151f3e788945cf0cea6755d84677288a5d85f7bb97995538db2e844f SHA512 e933b6dd3fe412fb2e692b6131222366e56de92228124901c3e1e07de62b387883288736dcc8fd001a2d4961a90f75eae869c1523e2b94095affb6976e3d5449
 EBUILD slirp4netns-1.1.9.ebuild 956 BLAKE2B 3e124c54f59260a727c8bce6d8c92778e4b4110d23464891844f97399bbdfa0570adc8b4670f19b689023948a099c4cbf067809afc99e30f6e666820a6296994 SHA512 1a41116be0660aded739fe100bd3c88570debadc08fa98a3f08d9f19f768f1c4d77ac33c63d64f405f9741f14dd3cc286841ed41c5a5090fa53f81ba32e3092f
 MISC metadata.xml 474 BLAKE2B 2ee42e8e38fbb422d879db39fd00613cf69d1760840d69f937e14be0bcb78edf763a749ebb0d72e278f0d71b59ddeb20c3cb67d24dc0d00fd4224575c3417818 SHA512 425ebcc108ae87e17d7ad57f6d868fa7cbc75f6e1ff6e8ec8aa00e217b384d43ccd7f77bb2092f10d25a5a690c82fd85d6f7f062bfb9721810de1fb27c3db192
diff --git a/app-emulation/slirp4netns/slirp4netns-1.1.12.ebuild b/app-emulation/slirp4netns/slirp4netns-1.1.12.ebuild
new file mode 100644
index 000000000000..1138f207bc0b
--- /dev/null
+++ b/app-emulation/slirp4netns/slirp4netns-1.1.12.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="User-mode networking for unprivileged network namespaces"
+HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
+SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2=
+	dev-libs/libpcre:=
+	net-libs/libslirp:=
+	sys-libs/libseccomp:=
+	sys-libs/libcap:="
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RESTRICT+=" test"
+
+src_prepare() {
+	# Respect AR variable for bug 722162.
+	sed -e 's|^AC_PROG_CC$|AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])\nAC_PROG_AR\n\0|' \
+		-i configure.ac || die
+	eautoreconf
+	default
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You need to have the tun kernel module loaded in order to have"
+		elog "slirp4netns working"
+	fi
+}
diff --git a/app-emulation/slirp4netns/slirp4netns-1.1.8.ebuild b/app-emulation/slirp4netns/slirp4netns-1.1.8.ebuild
deleted file mode 100644
index ab7c659fa363..000000000000
--- a/app-emulation/slirp4netns/slirp4netns-1.1.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm64"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2=
-	dev-libs/libpcre:=
-	net-libs/libslirp:=
-	sys-libs/libseccomp:=
-	sys-libs/libcap:="
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RESTRICT="test"
-
-src_prepare() {
-	# Respect AR variable for bug 722162.
-	sed -e 's|^AC_PROG_CC$|AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])\nAC_PROG_AR\n\0|' \
-		-i configure.ac || die
-	eautoreconf
-	default
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to have the tun kernel module loaded in order to have"
-		elog "slirp4netns working"
-	fi
-}
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index 32c12c2573e5..2909a476767f 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -2,7 +2,7 @@ AUX vagrant.in 1872 BLAKE2B c3c5acf65ef1187061609837ab7c3df429763b6561ec462f9ce9
 DIST vagrant-2.2.18.tar.gz 1620261 BLAKE2B 8938801b383373967365ca64a79f70885a61c02221eeebf75f15fa40440dfdc585f0a0d0cafe9a01484d594dc49b98397a0724776586c2c9fe4f529b6891bb26 SHA512 4694ca499136b53fc5cbab1efd47c9175293ba84521614edbe545766b93e54dc8dc11278f7170c88f3bb05a4ca0a7c52e21deca285f848578a890858b8f21b64
 DIST vagrant-2.2.7.tar.gz 2173893 BLAKE2B bf905cb25a905e4fb79ce9c1fb59ad5520b5176d5681dfdc22855ca0a7520535346d2aebffe47162a1f8ca008083c94426e9de92b6d92de4373c654784605c7e SHA512 3455b74c8a867ab37ca9873187a98cdb80feb22a400c4e9f2266897da815815aaefbe0c166172b1c1dbd66aa49ccb1201dcbf904fd883ad34218d694e20d7f87
 DIST vagrant-2.2.9.tar.gz 2215868 BLAKE2B 6d40827c91c86f6b11865d9949e5313c419456c573686944ecd0d1874323aa81d6f26178d5b7a16fee701c513a98b3483dbea0531d9d77dee7b7e284004e17b3 SHA512 15e230bcf336615f0d49a2c40db36f7f26a9f0f6fd42d2ce801f28afc663aadded4fa373e33f9102b21ee70d98563fc68e2b24ffa6c3eec321f58b2c42b0d260
-EBUILD vagrant-2.2.18.ebuild 2351 BLAKE2B 5c4e30d2cc2959349ff6c4c7fd4b567377f403163b8b068cbc96c51b8a6cdebb0cb6cf441f058baff9c413a08a68b35bf2f24b0616553cf8d881438f92aae68e SHA512 0e99860f7ecfc75f5f6d9e0258527b831fad5ebc4a4bebc5d34dbf0e71fe46963829a27b043ba742e4b2945d412b0421362d0c12c6145049f2734b172df7df28
+EBUILD vagrant-2.2.18-r1.ebuild 2375 BLAKE2B 32b99564f3e0ab9cebdb1b7e5bc4df59205d690620d24e1f182c5a19d787b7b4903ca77f207fa8a6700a02b24a11f8e585218fe427659788f7ba0e9cec9de40f SHA512 d93c0f4ef7470f95ad4f07872551ca4a67d652d9a6380a318736b6cdaf30e4fb3bbb174f54168c8d009197eb193a4d2b9781e4eb29aee51147788fa1056b3967
 EBUILD vagrant-2.2.7-r1.ebuild 2559 BLAKE2B dcb267f7c75f4bd744f2a83e416aa7005c8576f8d36326efd38b6dc634034b366ddf99016f24b5ced6a8ee87d8b7247db5c16e362f171be98ecd81c46d7d133f SHA512 e4f0a36c8b36625ad0ae660ed1eb4987f1a12f0d9c96316734cdcc31975f75621ea1e3f7a18162d780dc3d33e266e66f4fdd9014be557d50fbc1894ba602d852
 EBUILD vagrant-2.2.9-r1.ebuild 2561 BLAKE2B 4b510524099dddaa98fcc3a5df7a92b16e5ec2bc9983e55699a3d31689a5b1cc83c9467c248f25309ca9d9f226763664a33b4f9e4594a7e7459894586d1697a2 SHA512 e7ca458227e86b43cf01d3c76bd20342560256f8f35a483767a0e65ebd0a34d513de35d93f1b83c3e94441b5657c7bf5185127f85061eadaaeafbf0798a1eec5
 MISC metadata.xml 535 BLAKE2B 203604a2a73e7fcefba9bd8feed9886cb76fea74972704966b3d2a7577e6f1ae5787f38bf0fa6b5d843a3df56d1642c568c88a1b09141a0a083af014fd1af5d3 SHA512 1a6056d30f74a608af168120dcccaff027e67b63560152146909f0ecfb48863defcdf824e07c88d60bb70249107647e1bd0dc0502715e841c4d5237234783335
diff --git a/app-emulation/vagrant/vagrant-2.2.18-r1.ebuild b/app-emulation/vagrant/vagrant-2.2.18-r1.ebuild
new file mode 100644
index 000000000000..2b6991ee84d0
--- /dev/null
+++ b/app-emulation/vagrant/vagrant-2.2.18-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit bash-completion-r1 optfeature ruby-fakegem
+
+DESCRIPTION="A tool for building and distributing development environments"
+HOMEPAGE="https://vagrantup.com/"
+SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${RDEPEND}
+	app-arch/libarchive
+	net-misc/curl
+"
+
+ruby_add_rdepend "
+	>=dev-ruby/bcrypt_pbkdf-1.0.0
+	>=dev-ruby/childprocess-4.0.0
+	>=dev-ruby/ed25519-1.2.4
+	dev-ruby/erubi
+	>=dev-ruby/hashicorp-checkpoint-0.1.5
+	>=dev-ruby/i18n-1.8:1
+	>=dev-ruby/listen-3.1
+	<dev-ruby/log4r-1.1.11
+	>=dev-ruby/mime-types-3.3:*
+	>=dev-ruby/rubyzip-2.0
+	>=dev-ruby/net-scp-3.0.0
+	>=dev-ruby/net-sftp-3.0
+	>=dev-ruby/net-ssh-6.1.0
+	dev-ruby/rest-client:2
+	>=dev-ruby/vagrant_cloud-3.0.5
+	>=dev-ruby/rexml-3.2.5
+"
+
+ruby_add_bdepend "
+	>=dev-ruby/rake-12.3.3
+	test? (
+		dev-ruby/rspec
+		dev-ruby/rspec-its
+		dev-ruby/webmock
+	)
+"
+
+all_ruby_prepare() {
+	# remove bundler support
+	sed -i '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+	rm tasks/bundler.rake || die
+
+	sed -e ':rake\|rspec\|webmock: s:~>:>=:' \
+		-e ':bcrypt_pbkdf\|hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|net-sftp\|childprocess: s:~>:>=:' \
+		-e '/fake_ftp/ s:^#*:#:' \
+		-e '/wdm/ s:^#*:#:' \
+		-e '/winrm/ s:^#*:#:' \
+		-e '/rb-kqueue/ s:^#*:#:' \
+		-e '/ruby_dep/ s:^#*:#:' \
+		-i ${PN}.gemspec || die
+
+	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbashcomp contrib/bash/completion.sh ${PN}
+
+	# provide executable similar to upstream:
+	# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
+	dobin "${PN}"
+
+	# directory for plugins.json
+	keepdir /var/lib/vagrant
+
+	insinto /usr/share/vim/vimfiles/syntax/
+	doins contrib/vim/vagrantfile.vim
+
+	optfeature_header "Optional emulation/container backends:"
+	optfeature "VirtualBox support" app-emulation/virtualbox
+	optfeature "Docker support" app-emulation/docker
+}
diff --git a/app-emulation/vagrant/vagrant-2.2.18.ebuild b/app-emulation/vagrant/vagrant-2.2.18.ebuild
deleted file mode 100644
index 208e7ee15372..000000000000
--- a/app-emulation/vagrant/vagrant-2.2.18.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
-RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit bash-completion-r1 optfeature ruby-fakegem
-
-DESCRIPTION="A tool for building and distributing development environments"
-HOMEPAGE="https://vagrantup.com/"
-SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${RDEPEND}
-	app-arch/libarchive
-	net-misc/curl
-"
-
-ruby_add_rdepend "
-	>=dev-ruby/bcrypt_pbkdf-1.0.0
-	>=dev-ruby/childprocess-4.0.0
-	>=dev-ruby/ed25519-1.2.4
-	dev-ruby/erubi
-	>=dev-ruby/hashicorp-checkpoint-0.1.5
-	>=dev-ruby/i18n-1.8:1
-	>=dev-ruby/listen-3.1
-	<dev-ruby/log4r-1.1.11
-	>=dev-ruby/mime-types-3.3:*
-	>=dev-ruby/rubyzip-2.0
-	>=dev-ruby/net-scp-3.0.0
-	>=dev-ruby/net-sftp-3.0
-	>=dev-ruby/net-ssh-6.1.0
-	dev-ruby/rest-client:2
-	>=dev-ruby/vagrant_cloud-3.0.5
-"
-
-ruby_add_bdepend "
-	>=dev-ruby/rake-12.3.3
-	test? (
-		dev-ruby/rspec
-		dev-ruby/rspec-its
-		dev-ruby/webmock
-	)
-"
-
-all_ruby_prepare() {
-	# remove bundler support
-	sed -i '/[Bb]undler/d' Rakefile || die
-	rm Gemfile || die
-	rm tasks/bundler.rake || die
-
-	sed -e ':rake\|rspec\|webmock: s:~>:>=:' \
-		-e ':bcrypt_pbkdf\|hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|net-sftp\|childprocess: s:~>:>=:' \
-		-e '/fake_ftp/ s:^#*:#:' \
-		-e '/wdm/ s:^#*:#:' \
-		-e '/winrm/ s:^#*:#:' \
-		-e '/rb-kqueue/ s:^#*:#:' \
-		-e '/ruby_dep/ s:^#*:#:' \
-		-i ${PN}.gemspec || die
-
-	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbashcomp contrib/bash/completion.sh ${PN}
-
-	# provide executable similar to upstream:
-	# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
-	dobin "${PN}"
-
-	# directory for plugins.json
-	keepdir /var/lib/vagrant
-
-	insinto /usr/share/vim/vimfiles/syntax/
-	doins contrib/vim/vagrantfile.vim
-
-	optfeature_header "Optional emulation/container backends:"
-	optfeature "VirtualBox support" app-emulation/virtualbox
-	optfeature "Docker support" app-emulation/docker
-}
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 48dce6866252..6d9b2857d93e 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -2,5 +2,5 @@ AUX vice-pkg-config-3.4_p38553.patch 816 BLAKE2B 58fdde3647c520b12434b221197b91d
 DIST vice-3.5.tar.gz 22557578 BLAKE2B 5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e SHA512 02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70
 DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f SHA512 c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86
 EBUILD vice-3.4_p38553.ebuild 4410 BLAKE2B ea6539484a88baac8d3d98bbff3c4f589c4bac49c76586496b8453e7b1cfa5c402ff5a1e7a029483da5cf07d78006bc35a3557a67a63230bc85a8b12f3f469d6 SHA512 dd7a3ad05ceb453a71667e0628d8d925b03c864d07c90857d283e5737e0105895222f6bf635c28f0274c005c1f03324dfffef57610b9f32c031b76e2782339eb
-EBUILD vice-3.5-r1.ebuild 4079 BLAKE2B d771d1c419cc9e22ebc6e0c6b62ef55c5f52d16facb22c88997cc18ea053420bd3b6dc324a1f7c34a5cc59dec6960db213b083fddfa07348a0d45ada9abdaff2 SHA512 03bc43270e3ccbb5703006920f06854bf03ce06ebe7af33bf7a956355a527a47f671d0216c7e425345a6ede31e2f495247f23c11538f16bd4d69264d73b1ab30
+EBUILD vice-3.5-r1.ebuild 4077 BLAKE2B cf446708e7d2b3b84db74d7e59557a9cd078ea28cc3e3f3ec2024a14865f0ed5b8157a968bf9a53cb08c1c88c7ca1bb4937ec4b3c568fe70e9107619a5dd4942 SHA512 e207be81ee7ecd8f4049e69befd6171bcae1758538a34704e538d7903141c28b7a179c9ab2b3afddfeaabb3d410f31261f1cd525113a612d90e736c8f8f027ae
 MISC metadata.xml 785 BLAKE2B 1dc59c7b40fda968680e97b1ad83e741faf223143bbc1ab2d523e37312badd3a3aaedc3bbffbd158531c74ae73dab1bb1ee03666a081eb17d819dc9e0b783ee2 SHA512 b483d325702723d1395bca771d215709fc68b6ca8309c4297c6a668d5940502c9c8d5d4149e1f52b8fd6d5062cf04b2e3d7046ecfc0555d2703b064e329af283
diff --git a/app-emulation/vice/vice-3.5-r1.ebuild b/app-emulation/vice/vice-3.5-r1.ebuild
index 625f1bce3a1f..feb7dc528716 100644
--- a/app-emulation/vice/vice-3.5-r1.ebuild
+++ b/app-emulation/vice/vice-3.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="
 	alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
 	lame mpg123 ogg oss parport pci png portaudio pulseaudio sdl zlib"
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 1cd3f07ba086..e3f7f4c21211 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,16 +1,16 @@
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST gentoo-wine-patches-20210925.tar.xz 59836 BLAKE2B c6d41db309bf0470d0e8ef771d791240209f77d967031943232218e8e737987a4a74847d89d6bf8739ff0698b28b656a8b9ac830ee1da457be2aab27ededb123 SHA512 721d4d7b6a2c4336555a7faed7202a8ad6872ee37e4daea6fab2b5ff5bf5d73ce41f25d0bd4fd9b45e2c522cb19c1349144a40be32ccdd7ded7f61055d6d85c8
-DIST wine-6.15.tar.xz 24751680 BLAKE2B f1e8df4f6a65f5776b260edf5a12a48810b24ea668be5ef8b405b64a057a16329a30d0b295eefb8f79d378faa243c20884de543e96213ed5ee22b6c752dab028 SHA512 bb4420a6fb0455aaab2f45354ea470acba9feeaea07b6c2cbf8afd49a6ef97bfc794cee330ecb12fb2098994738227d149cd5685d29310bb6cd0ed25d5fdc8bf
 DIST wine-6.16.tar.xz 24789520 BLAKE2B 473ddec26139f7fedc091e2e037a88c8bde6f4061b196995aaa7e0352969fc8920edb47754c97478468a482f1d5a9be9e2cf858061d3add183fd90ee135a6ec3 SHA512 83d97eefeb35ee85d6ae180056d7b0e5864a90e1c2b63b6fd77d5cd38038b4eaa1fd067e7d5c5ee56d8cd811149db23a8581e1497bc1e36f9adad1012296b96e
 DIST wine-6.17.tar.xz 24838704 BLAKE2B 98014c8226db703a62e7c9e73eb5d76a10eb751e81e0f20bf409099bca4ce5a996f67401e6f39b140671c82aded8c7ccd483199990e55c9590715651ea5ae0db SHA512 87550105e27afedc02084172bbb84793891db711ee443bb2626fea56e720517205a06944198c1d05958d47025ad31d9c890d539cd9e60fadfe2947d83325a658
 DIST wine-6.18.tar.xz 24860880 BLAKE2B 411b74e92bf895f20e53ad7a203bd3fe84f1b414d8720b402bc17150fd663161e65be05b1fd5630dcc7a32fc6eba27dd0685f7b852dfb5852ea4f7fdb5af15a5 SHA512 d8f54f8fbb61b4af2a6f97328d33b0389ab0fb6a9dac97b2832af3d911a9f23c08653f40ec77f7c0eedd694c4a1c1228fe9dd4d859d8b3d7419e21847de7bcfe
-DIST wine-staging-6.15.tar.gz 9654539 BLAKE2B 943cebf79bfe906a9dde42cfae13443059d89cd8996a2d25fad685796605a3a45b05f960c9dfb05d968ed919a23b273ecc56aa4fcd98cc38dcc45c22813d830e SHA512 652e8319e4a06f64b7e4c05a139194b6b7189777632d26d79a3160447339cc5a93b42d810d8379eb7821485ccbbe8cd8e16e09e5223886027fae2f7737b8a115
+DIST wine-6.19.tar.xz 24894356 BLAKE2B 227424c5ff4887b8adca1452ded242d20793d8b5ea8cc8fc94d73f18d294bda5674d48102d6f61e6a5b0e1f76aaa4885ec530bd96b1ea70923bae479254d59d2 SHA512 6d58bca9a4b8ed94f34a532da6403341f325a30d8e1b78997de009ecaafad655d15733823d7d1c8bd906efc568a649f8b7bee5c10f2e271e449d6e1eaa8f7ce4
 DIST wine-staging-6.16.tar.gz 9655388 BLAKE2B 50feca959b0ff9056ed9e6f81f3dd11350391f30e4048ee6e4d4e5feaa837e31b580c22e63b6213fc77d866b362eb7922fd2c076bd9b6675abfe591a178a2d9c SHA512 2789200466adaae2f4fa4afcbb6aa88619748e69a2cb39c1ac957b408c8021e2cbac7ad0b1f2e295cd87640f494e173739df076743ec0606e4b13e83d0ac2824
 DIST wine-staging-6.17.tar.gz 9655082 BLAKE2B 9f2e0c800f221ecacba71942ef306fa5e2e8510572467ee528a58b0a63dc416281036eea419c55f46c7688418121184e620017e077ea873f3aadcda29f51f3ae SHA512 c1eaa3682effd7a555ba2deed85a196eca5a9824634f3daba9453d861b0c74c456f6cddf0c1f47e003dc31c4ff7e7b049234e20afd2ce6bc6cbe6e03e87101ec
 DIST wine-staging-6.18.tar.gz 9663936 BLAKE2B cd1a0314aa3bf890d57432e0680e13927a7ef4c50f47fe9bc17980208a77137508703d9b3155cfee6a340d954e832e99d66663d26518b425c4e60d8a3fd0ad2e SHA512 f718b4a6f314e8db4f6ad4cb41449d251d973b0942072411a70749398cec9d60ebcf29078cf00a895f665ea7e7846c3fd7e5553d04b3b451ae757c95fb49af58
-EBUILD wine-staging-6.15.ebuild 21892 BLAKE2B 7a7deaa07c9207e478a9d0456fb4394e64ebb80a7178c7f6438dc15296e78f44f4501b4cd89e069838d2902922d08540581028808deaed381824924cef286943 SHA512 d5e0e08ffcc02605a2ddbe9fae1bc395222b4f0dc9b00f55a5f4d8de809c674ac97fd6fca11fd1a61f2bbf10e4babf7a0106a8ff849e30da21c27833a33db8e6
+DIST wine-staging-6.19.tar.gz 9690585 BLAKE2B de5c172b600e8de59241e93a8938d4f6a943f97d1cccaba2aa2551886893848f43df5d2e375b588deabe722ff34d80ff62dfed376d41d309c6a36e03678b771e SHA512 f46d82dc034b0c701d00c70395edc306f6dcd3cd70091bb544c86c035e4221a370f6a1c39de4575e6cbb4eb587f5257d50ad5ada51fb6fee9f57b90dc0358034
 EBUILD wine-staging-6.16.ebuild 21892 BLAKE2B 7a7deaa07c9207e478a9d0456fb4394e64ebb80a7178c7f6438dc15296e78f44f4501b4cd89e069838d2902922d08540581028808deaed381824924cef286943 SHA512 d5e0e08ffcc02605a2ddbe9fae1bc395222b4f0dc9b00f55a5f4d8de809c674ac97fd6fca11fd1a61f2bbf10e4babf7a0106a8ff849e30da21c27833a33db8e6
 EBUILD wine-staging-6.17.ebuild 21397 BLAKE2B 5169ae698367bf3f5f55d79076e845256201fa3b8cce967435e372ec6a713f9a204ece9c6799718ea213e40ff9fde6fc8c66fd97e5d7546c14248d7eda19a1b1 SHA512 31e4f43358293ac5966858c5320c20716328136018f9a2f4bcf649221a38a77da864bcdafdc0f06fb31eb157ad3d3f4f1ab70c9bb23b3a7d5d2e7b5087528be0
 EBUILD wine-staging-6.18.ebuild 21397 BLAKE2B 8ed28d43731c72cb560e4b406e085dce48641361deec6030a62ceebfe1ab2df995b5aadc54aa71360f7a341561ca811b5308aa64615b5590d732b158c2196e41 SHA512 4e255c2d95d2d9e66c0ce084c9b8ea27dd8b8e80e354db754d344f4bb68120e6ee9aff34a553420964d0e3838e16141a1b192f421880aba9ea1f3b82bda8683d
+EBUILD wine-staging-6.19.ebuild 21397 BLAKE2B 8ed28d43731c72cb560e4b406e085dce48641361deec6030a62ceebfe1ab2df995b5aadc54aa71360f7a341561ca811b5308aa64615b5590d732b158c2196e41 SHA512 4e255c2d95d2d9e66c0ce084c9b8ea27dd8b8e80e354db754d344f4bb68120e6ee9aff34a553420964d0e3838e16141a1b192f421880aba9ea1f3b82bda8683d
 EBUILD wine-staging-9999.ebuild 21397 BLAKE2B 8ed28d43731c72cb560e4b406e085dce48641361deec6030a62ceebfe1ab2df995b5aadc54aa71360f7a341561ca811b5308aa64615b5590d732b158c2196e41 SHA512 4e255c2d95d2d9e66c0ce084c9b8ea27dd8b8e80e354db754d344f4bb68120e6ee9aff34a553420964d0e3838e16141a1b192f421880aba9ea1f3b82bda8683d
 MISC metadata.xml 3967 BLAKE2B bc3c9d997d843fea2119ca489dcc61624e29d86d83ed0cd2934a0f15137037b4625be02ad0e04088cf6658318a6256d6e27e91b0b64b8d1c905aa20366598185 SHA512 2106df5a805fc9800a51c0a511f9f2fc283283f1e927ae0ac904976222e97f878f874a8b9e0b00af05f8d3a59e8e367bcf451338144169f478354cace01d1c83
diff --git a/app-emulation/wine-staging/wine-staging-6.15.ebuild b/app-emulation/wine-staging/wine-staging-6.15.ebuild
deleted file mode 100644
index 1b3a52f79703..000000000000
--- a/app-emulation/wine-staging/wine-staging-6.15.ebuild
+++ /dev/null
@@ -1,663 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
-MY_PN="${PN%%-*}"
-MY_PV="${PV/_/-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	MINOR_V=$(ver_cut 2)
-	if [[ ${MINOR_V} != "0" ]] ; then
-		MINOR_V="x"
-	fi
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${MY_PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20200523"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${MY_PV} == "9999" ]] ; then
-	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
-else
-	SRC_URI="${SRC_URI}
-	staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${MY_PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	pipelight? ( staging )
-	test? ( abi_x86_32 )
-	themes? ( staging )
-	vaapi? ( staging )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	themes? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
-	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.3.0 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	staging? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${pn_live_val} ]]; then
-		if use staging; then
-			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
-			eerror "cannot be used to set the commit. Instead, you may use the"
-			eerror "environment variables:"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-			eerror
-			return 1
-		fi
-	fi
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environment variables:"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		wine_build_environment_check || die
-
-		# Verify OSS support
-		if use oss && ! use kernel_FreeBSD; then
-			if ! has_version ">=media-sound/oss-4"; then
-				eerror "You cannot build wine with USE=oss without having support from a"
-				eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-				eerror
-				die
-			fi
-		fi
-
-		if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
-			eerror
-			eerror "USE=\"mingw\" is currently experimental, and requires the"
-			eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
-			eerror
-			eerror "These can be installed by using 'sys-devel/crossdev':"
-			eerror
-			eerror "crossdev --target i686-w64-mingw32"
-			eerror
-			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-			eerror
-			die "MinGW build was enabled, but no compiler to support it was found."
-		fi
-
-		if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
-			eerror
-			eerror "USE=\"mingw\" is currently experimental, and requires the"
-			eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
-			eerror
-			eerror "These can be installed by using 'sys-devel/crossdev':"
-			eerror
-			eerror "crossdev --target x86_64-w64-mingw32"
-			eerror
-			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-			eerror
-			die "MinGW build was enabled, but no compiler to support it was found."
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${MY_PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${MY_PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-		if use staging; then
-			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
-			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
-			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
-				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
-				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
-			fi
-		fi
-	fi
-
-	default
-
-	plocale_find_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	if use staging; then
-		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
-		ewarn "Wine bugzilla should explicitly state that staging was used."
-
-		local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
-		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-
-		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
-		ebegin "Running Wine-Staging patch installer"
-		(
-			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
-			cd "${STAGING_DIR}/patches"
-			source "${STAGING_DIR}/patches/patchinstall.sh"
-		)
-		eend $? || die "Failed to apply Wine-Staging patches"
-	fi
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		plocale_for_each_disabled_locale rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-	if use mingw; then
-		export CROSSCFLAGS="${CFLAGS}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gcrypt)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		# TODO: Will bug 685172 still need special handling?
-		$(use_with mingw)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use staging && myconf+=(
-		--with-xattr
-		$(use_with themes gtk3)
-		$(use_with vaapi va)
-	)
-
-	local PKG_CONFIG
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	tc-export PKG_CONFIG
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		virtx emake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	plocale_for_each_locale add_locale_docs
-
-	einstalldocs
-	find "${ED}" -name *.la -delete || die
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-
-		if ! use mingw; then
-			rm_wineconsole() {
-				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
-			}
-		else
-			rm_wineconsole() {
-				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
-			}
-		fi
-
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	# Avoid double prefix from dosym and make_wrapper
-	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${PN}-${MY_PV}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${PN}-${MY_PV} || die
-	else
-		if use staging; then
-			eselect wine register --staging ${PN}-${MY_PV} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${PN}-${MY_PV}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${PN}-${MY_PV} || die
-	else
-		if use staging; then
-			eselect wine deregister --staging  ${PN}-${MY_PV}|| die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-staging/wine-staging-6.19.ebuild b/app-emulation/wine-staging/wine-staging-6.19.ebuild
new file mode 100644
index 000000000000..a6c1ddd53923
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-6.19.ebuild
@@ -0,0 +1,645 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+MY_PN="${PN%%-*}"
+MY_PV="${PV/_/-}"
+MY_P="${MY_PN}-${MY_PV}"
+
+if [[ ${MY_PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	MINOR_V=$(ver_cut 2)
+	if [[ ${MINOR_V} != "0" ]] ; then
+		MINOR_V="x"
+	fi
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${MY_PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+GWP_V="20210925"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${MY_PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${MY_PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:6.4.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use staging; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environment variables:"
+			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environment variables:"
+		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		wine_build_environment_check || die
+
+		# Verify OSS support
+		if use oss && ! use kernel_FreeBSD; then
+			if ! has_version ">=media-sound/oss-4"; then
+				eerror "You cannot build wine with USE=oss without having support from a"
+				eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+				eerror
+				die
+			fi
+		fi
+
+		if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
+			eerror
+			eerror "USE=\"mingw\" is currently experimental, and requires the"
+			eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
+			eerror
+			eerror "These can be installed by using 'sys-devel/crossdev':"
+			eerror
+			eerror "crossdev --target i686-w64-mingw32"
+			eerror
+			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+			eerror
+			die "MinGW build was enabled, but no compiler to support it was found."
+		fi
+
+		if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
+			eerror
+			eerror "USE=\"mingw\" is currently experimental, and requires the"
+			eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
+			eerror
+			eerror "These can be installed by using 'sys-devel/crossdev':"
+			eerror
+			eerror "crossdev --target x86_64-w64-mingw32"
+			eerror
+			eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+			eerror
+			die "MinGW build was enabled, but no compiler to support it was found."
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${MY_PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${MY_PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+		if use staging; then
+			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
+
+			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
+			fi
+		fi
+	fi
+
+	default
+
+	plocale_find_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+	fi
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		plocale_for_each_disabled_locale rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+	if use mingw; then
+		export CROSSCFLAGS="${CFLAGS}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir="${EPREFIX}/etc/wine"
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with udisks dbus)
+		$(use_with faudio)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gcrypt)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		# TODO: Will bug 685172 still need special handling?
+		$(use_with mingw)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	tc-export PKG_CONFIG
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		virtx emake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	plocale_for_each_locale add_locale_docs
+
+	einstalldocs
+	find "${ED}" -name *.la -delete || die
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${PN}-${MY_PV}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${PN}-${MY_PV} || die
+	else
+		if use staging; then
+			eselect wine register --staging ${PN}-${MY_PV} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${PN}-${MY_PV}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${PN}-${MY_PV} || die
+	else
+		if use staging; then
+			eselect wine deregister --staging  ${PN}-${MY_PV}|| die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index c234744cc5f1..31fb198df404 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -2,15 +2,15 @@ DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c809562
 DIST gentoo-wine-patches-20210925.tar.xz 59836 BLAKE2B c6d41db309bf0470d0e8ef771d791240209f77d967031943232218e8e737987a4a74847d89d6bf8739ff0698b28b656a8b9ac830ee1da457be2aab27ededb123 SHA512 721d4d7b6a2c4336555a7faed7202a8ad6872ee37e4daea6fab2b5ff5bf5d73ce41f25d0bd4fd9b45e2c522cb19c1349144a40be32ccdd7ded7f61055d6d85c8
 DIST wine-6.0.1.tar.xz 24210540 BLAKE2B 2075e59024e75594e0be0851db33981ebfcc57477bb9864055a938db0e39b8480f3c501b1d1fc39a9eee52303ad71ef71d24a0fb546697eecf3bb098f13317f1 SHA512 06b720d6adbbb7e2f15b963e4f3f1ff06e6d0d3973064d866ae720e6380bab8881fd1ebf16665435f5f7976b2c6dc72fd20631678a28e9d4d7b068c30cd22bb0
 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
-DIST wine-6.15.tar.xz 24751680 BLAKE2B f1e8df4f6a65f5776b260edf5a12a48810b24ea668be5ef8b405b64a057a16329a30d0b295eefb8f79d378faa243c20884de543e96213ed5ee22b6c752dab028 SHA512 bb4420a6fb0455aaab2f45354ea470acba9feeaea07b6c2cbf8afd49a6ef97bfc794cee330ecb12fb2098994738227d149cd5685d29310bb6cd0ed25d5fdc8bf
 DIST wine-6.16.tar.xz 24789520 BLAKE2B 473ddec26139f7fedc091e2e037a88c8bde6f4061b196995aaa7e0352969fc8920edb47754c97478468a482f1d5a9be9e2cf858061d3add183fd90ee135a6ec3 SHA512 83d97eefeb35ee85d6ae180056d7b0e5864a90e1c2b63b6fd77d5cd38038b4eaa1fd067e7d5c5ee56d8cd811149db23a8581e1497bc1e36f9adad1012296b96e
 DIST wine-6.17.tar.xz 24838704 BLAKE2B 98014c8226db703a62e7c9e73eb5d76a10eb751e81e0f20bf409099bca4ce5a996f67401e6f39b140671c82aded8c7ccd483199990e55c9590715651ea5ae0db SHA512 87550105e27afedc02084172bbb84793891db711ee443bb2626fea56e720517205a06944198c1d05958d47025ad31d9c890d539cd9e60fadfe2947d83325a658
 DIST wine-6.18.tar.xz 24860880 BLAKE2B 411b74e92bf895f20e53ad7a203bd3fe84f1b414d8720b402bc17150fd663161e65be05b1fd5630dcc7a32fc6eba27dd0685f7b852dfb5852ea4f7fdb5af15a5 SHA512 d8f54f8fbb61b4af2a6f97328d33b0389ab0fb6a9dac97b2832af3d911a9f23c08653f40ec77f7c0eedd694c4a1c1228fe9dd4d859d8b3d7419e21847de7bcfe
+DIST wine-6.19.tar.xz 24894356 BLAKE2B 227424c5ff4887b8adca1452ded242d20793d8b5ea8cc8fc94d73f18d294bda5674d48102d6f61e6a5b0e1f76aaa4885ec530bd96b1ea70923bae479254d59d2 SHA512 6d58bca9a4b8ed94f34a532da6403341f325a30d8e1b78997de009ecaafad655d15733823d7d1c8bd906efc568a649f8b7bee5c10f2e271e449d6e1eaa8f7ce4
 EBUILD wine-vanilla-6.0.1.ebuild 18928 BLAKE2B a0410ef88afc4230b111e59c531bf6e7ef186e89b42f6ce05d32c5e25f040afb14fa57517421ac5a207d297fc10914f12433d209adb9a80b9102771f2d417f76 SHA512 e845cbc96df01d9b81328bf04e36822ef892998e33367345c08152b67869c8b96115a9e8d38bb89d7083394e72529962ca3c8b90c6b0f040c43baa70821b042d
 EBUILD wine-vanilla-6.0.ebuild 18930 BLAKE2B 8aae443e03983edc1f972805d62af4e131fec25163f478851587bbf106d366cd6b64f8b789cc3c12d66d74072b70a38706f1a2045c8dcf526f63e16473af944c SHA512 f155ff81b2a51bc570f6d126b7052b862284463e375346b787a580e663319598424d33e48fd7ab5ac7116675e09a30fa96ae6976ced7890c01fefbf114830239
-EBUILD wine-vanilla-6.15.ebuild 18863 BLAKE2B c790d8ca48bda51cffed0cb2ae0f2884f6c2196dc8b0f04fbad9c77c607a1b78cd78ad385e6d196ecaec6a0085ce6ddb1f55695d16f35d9eb0a940c71916dc66 SHA512 9e6fd1d980a2d39ad2ed55e6b9e179776391b2dc0e8d5d9749158d78894d44c75354a28ccec9a3ecec015c2ebce49d939421547c42fa11e41020650a882edef3
 EBUILD wine-vanilla-6.16.ebuild 18863 BLAKE2B c790d8ca48bda51cffed0cb2ae0f2884f6c2196dc8b0f04fbad9c77c607a1b78cd78ad385e6d196ecaec6a0085ce6ddb1f55695d16f35d9eb0a940c71916dc66 SHA512 9e6fd1d980a2d39ad2ed55e6b9e179776391b2dc0e8d5d9749158d78894d44c75354a28ccec9a3ecec015c2ebce49d939421547c42fa11e41020650a882edef3
 EBUILD wine-vanilla-6.17.ebuild 18368 BLAKE2B 8831c62b5ea103040b9d25e6cf4c21b71aa44d8cf795da78ac553f7ce4bc6f4e103dfcf18868776d1bb241c421be841472ab244398d0cb8a70edf51a04f7dfc5 SHA512 e32b6c1aad3c5baef9e6434aaae82b753599fc9a4f36b84fc9f7ef4230cd9fae767ba7df127d434ee627e4556ebcde10a848f086cb88938e7bc21d7a96c8d133
 EBUILD wine-vanilla-6.18.ebuild 18368 BLAKE2B db6f70e7d343e722e0a675d2da0cf6c2e0a3b9bb00f472329cde15cf0c47667675e6a882d2b19e9e2bb229bc99806003b2dd227242838691068f1150da492876 SHA512 068508232f34f1fd2916d793b34c2c4e5071a5c63a9af6fa8c997600617b986d1f85a43febd303ce218f1c3134abf06b75401d24ed3d3519fb50ba245291d7ee
+EBUILD wine-vanilla-6.19.ebuild 18368 BLAKE2B db6f70e7d343e722e0a675d2da0cf6c2e0a3b9bb00f472329cde15cf0c47667675e6a882d2b19e9e2bb229bc99806003b2dd227242838691068f1150da492876 SHA512 068508232f34f1fd2916d793b34c2c4e5071a5c63a9af6fa8c997600617b986d1f85a43febd303ce218f1c3134abf06b75401d24ed3d3519fb50ba245291d7ee
 EBUILD wine-vanilla-9999.ebuild 18368 BLAKE2B db6f70e7d343e722e0a675d2da0cf6c2e0a3b9bb00f472329cde15cf0c47667675e6a882d2b19e9e2bb229bc99806003b2dd227242838691068f1150da492876 SHA512 068508232f34f1fd2916d793b34c2c4e5071a5c63a9af6fa8c997600617b986d1f85a43febd303ce218f1c3134abf06b75401d24ed3d3519fb50ba245291d7ee
 MISC metadata.xml 3494 BLAKE2B 0543d2465381f5dee52e2080ad8bf639a26f45d402ee646c5e815b5de93db4e64c1271e8daa464e30936eca3e11db96699ee382299df90992b39bc2fb3c32cbc SHA512 cf6a81b5a9fc7ad4b3fb35e57e64f6651becab199b2dd60016b74127b385a2da172e826d963e3c3aacefc0382b928b69a0ecaab922cac94c766eb7fa4fed1295
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.15.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.15.ebuild
deleted file mode 100644
index 7b3156ca675a..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-6.15.ebuild
+++ /dev/null
@@ -1,576 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20200523"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.3.0 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "EGIT_OVERRIDE_COMMIT_WINE"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-
-	if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
-		eerror
-		eerror "USE=\"mingw\" is currently experimental, and requires the"
-		eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
-		eerror
-		eerror "These can be installed by using 'sys-devel/crossdev':"
-		eerror
-		eerror "crossdev --target i686-w64-mingw32"
-		eerror
-		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-		eerror
-		die "MinGW build was enabled, but no compiler to support it was found."
-	fi
-
-	if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
-		eerror
-		eerror "USE=\"mingw\" is currently experimental, and requires the"
-		eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
-		eerror
-		eerror "These can be installed by using 'sys-devel/crossdev':"
-		eerror
-		eerror "crossdev --target x86_64-w64-mingw32"
-		eerror
-		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
-		eerror
-		die "MinGW build was enabled, but no compiler to support it was found."
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-	fi
-
-	default
-
-	plocale_find_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		plocale_for_each_disabled_locale rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-	if use mingw; then
-		export CROSSCFLAGS="${CFLAGS}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		# TODO: Will bug 685172 still need special handling?
-		$(use_with mingw)
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	tc-export PKG_CONFIG
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		virtx emake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	plocale_for_each_locale add_locale_docs
-
-	einstalldocs
-	find "${ED}" -name *.la -delete || die
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-
-		if ! use mingw; then
-			rm_wineconsole() {
-				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
-			}
-		else
-			rm_wineconsole() {
-				rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
-			}
-		fi
-
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	# Avoid double prefix from dosym and make_wrapper
-	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.19.ebuild
new file mode 100644
index 000000000000..5209a25f537c
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.19.ebuild
@@ -0,0 +1,558 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20210925"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:6.4.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "EGIT_OVERRIDE_COMMIT_WINE"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+
+	if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
+		eerror
+		eerror "USE=\"mingw\" is currently experimental, and requires the"
+		eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
+		eerror
+		eerror "These can be installed by using 'sys-devel/crossdev':"
+		eerror
+		eerror "crossdev --target i686-w64-mingw32"
+		eerror
+		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+		eerror
+		die "MinGW build was enabled, but no compiler to support it was found."
+	fi
+
+	if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
+		eerror
+		eerror "USE=\"mingw\" is currently experimental, and requires the"
+		eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
+		eerror
+		eerror "These can be installed by using 'sys-devel/crossdev':"
+		eerror
+		eerror "crossdev --target x86_64-w64-mingw32"
+		eerror
+		eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+		eerror
+		die "MinGW build was enabled, but no compiler to support it was found."
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+	fi
+
+	default
+
+	plocale_find_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		plocale_for_each_disabled_locale rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+	if use mingw; then
+		export CROSSCFLAGS="${CFLAGS}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir="${EPREFIX}/etc/wine"
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with udisks dbus)
+		$(use_with faudio)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		# TODO: Will bug 685172 still need special handling?
+		$(use_with mingw)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	local PKG_CONFIG
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	tc-export PKG_CONFIG
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		virtx emake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	plocale_for_each_locale add_locale_docs
+
+	einstalldocs
+	find "${ED}" -name *.la -delete || die
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index c5e7edd091d8..174c4809d092 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-java/Manifest b/app-eselect/eselect-java/Manifest
index db1ca44b5d7b..1f4af6fd6013 100644
--- a/app-eselect/eselect-java/Manifest
+++ b/app-eselect/eselect-java/Manifest
@@ -1,3 +1,5 @@
 DIST eselect-java-0.4.2.tar.bz2 13782 BLAKE2B 10fd7faa3759f5b0d52c04bcd5a9f1c438814f4b477c12d2f0843c146d10cd8f7db43594ca4dc29de85bc33864fe1b205c69f9d2dc10c739ca1d50071fac6aad SHA512 dbb9ff873cf3073f60ba783e32b5a75c88114f790643d4a898db5429d04452f64cc5757a1ec2fb7c33beee1fc4509abeb7016f112c2bc75543a4250a85cb19cb
+DIST eselect-java-0.4.3.tar.bz2 13799 BLAKE2B 353035ef1c0b3e1cd79021c9198bedf29fdcb3f13fdfb2e5a8384796f2a48236d671f07d7657409273dd1f52e37272d91383d2a14d64ed0cedb686a8e277b009 SHA512 40b10768f00f03c49e1b60aab615658ac1d986444aaf487ca74f7c14edb5dce62d85fc3ce049e857d0ec2eaea496afa17c45de59e7179331f112eb51cbe451e5
 EBUILD eselect-java-0.4.2.ebuild 1184 BLAKE2B 237d0a89ebebf52faadbf3739766fcc8c3b09ac2192249014ab609ddc493b513b95de93977b7a98fc676d6080b992547214ca4f642707f774e31355d9d563bc3 SHA512 a64163e41759b096592d7632994c19d4c5e0e04ef9be9c9712fd101c11a7cf98a893c51af51889a4f94c147f96d274f5b5e35d2704da78f68e5249700bab9036
+EBUILD eselect-java-0.4.3.ebuild 1134 BLAKE2B 8fdeb7331947a28be9db307e9785b1fa35c14458b742be7a93bc681bf196022c334cde546776a7a6ded66d52f6341ac309cd2728cfd2b2a545647d2a6e20cfca SHA512 daf0358f17c6f0493d44005c202c27c06e38ee7f95ea53bab92631df21964ca820757abeb231f1f9657805916473729a1d90ace4b674c803dcbec0be6ff441dc
 MISC metadata.xml 256 BLAKE2B 06034a9ec5059f1276335c4e4c5ec5203bccdecd555ff0c8c1d9d19db69f1540efc0c2265f4598fcd207d1b656a390c34908acd72600176a202d76ce64605270 SHA512 94123950f1f7bc7ec13f90d1c3f9f4c04deb2ac8997673683acf491733eb329a8b67658bd2fcfd11d2648823cbe4493ba14f0e549f711b477086d7ac98400e4e
diff --git a/app-eselect/eselect-java/eselect-java-0.4.3.ebuild b/app-eselect/eselect-java/eselect-java-0.4.3.ebuild
new file mode 100644
index 000000000000..a680ad3c189c
--- /dev/null
+++ b/app-eselect/eselect-java/eselect-java-0.4.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A set of eselect modules for Java"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	!app-eselect/eselect-maven
+	app-admin/eselect"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_postinst() {
+	local REMOVED=0
+
+	rm -v "${EROOT}"/usr/lib*/nsbrowser/plugins/javaplugin.so 2>/dev/null && REMOVED=1
+	rm -v "${EROOT}"/etc/java-config-2/current-icedtea-web-vm 2>/dev/null && REMOVED=1
+
+	if [[ ${REMOVED} = 1 ]]; then
+		elog "The eselect java-nsplugin module has been removed and your configuration"
+		elog "has been cleaned up. From now on, you may only install either Oracle or"
+		elog "IcedTea's plugin but not both. Note you can use IcedTea's plugin with an"
+		elog "Oracle VM. See the README installed with icedtea-web for more details."
+	fi
+}
diff --git a/app-eselect/eselect-ruby/Manifest b/app-eselect/eselect-ruby/Manifest
index 233b4e3f2342..c0648bf2b681 100644
--- a/app-eselect/eselect-ruby/Manifest
+++ b/app-eselect/eselect-ruby/Manifest
@@ -4,6 +4,6 @@ DIST ruby.eselect-20191222.xz 2000 BLAKE2B ec89dca67730ff3c6acba8906f9436866b45c
 DIST ruby.eselect-20201225.xz 2008 BLAKE2B 1471c174dddda5078f54b39b46d78dd0a5a2e23b19185d3c833f870b94809c4e7a642bb987d2213e9f99799c7669f0cbeca77dcefe381804f9aa91e197ed499c SHA512 e5b6ff18a7e1a7e3d902b59d27a558499fb87008abe51c3901430ebeaaacd1c1ebc6b782d6eb083d0d2abb5f0fd7cf712b42b451342cbeccceabb8d17859668c
 EBUILD eselect-ruby-20170723.ebuild 660 BLAKE2B f99f0a670cf3b8072f559d32f55c4e4084cda34be9792ad32897e80906a1e003399960a23e2e5f2bb6d44b6d730ff41e9e5a57176e26e3d9e22586311702f358 SHA512 b80d231e5251aaa9d8d1c43be530318f00b66a7a2b233067bfe13e51134a7767831499c68d797eb0086941812d2933c54645d62b5ed09e0d2902e0d1ec17b0ed
 EBUILD eselect-ruby-20190121.ebuild 659 BLAKE2B 44da41f3cb85c9055523e37d013055156fef7f0d77e12d95dec973f361b02e34599cfdff89bce040f5033c6105b32f306f1f171fa1a182a2a7ad6feb45d642b8 SHA512 6a4919551a48048f4123ea846983a14187fa599ea5e632cdf69fc54c80603d567fac710ab0d25b8211d043d2fd57db63d5c472b86a6615dcacb114adc40d58db
-EBUILD eselect-ruby-20191222.ebuild 660 BLAKE2B 612ef4f87880d2e1bd92cde6a11945cf13018494ba6851d1ba576c8da5335f746cbce823e6e28e09d6c30d35cc1ae25fd891a21f5784d62029d777525313febc SHA512 f2afe5357484f1c9e43caadb2358fec9ba3b46a748ce9d505669b1cebaee57a1081f5bd3860835f7e705125ffcd5f6c5df8fb1dfe2fd315f4c53ca20df4f0410
+EBUILD eselect-ruby-20191222.ebuild 653 BLAKE2B 39fdb60a88a6141e8944007e90e9424e6dfd6b708120aa0831f368a61942a8e6d459709dac9ca2d6904dddb96ccd247c1fcdf1829725e266f84b21938c80a18b SHA512 1737189b6c35fe8cfa82aa6877b8b1aa1ee39081540316b00b32706932c31560355e6a1ca1ed81c092a89695e9d2ca7d56a7afffaf09d0e9bafa403344d9fa44
 EBUILD eselect-ruby-20201225.ebuild 667 BLAKE2B 8099fd217a6e8823e535c8dce429b7179038912d7a2c36fc75f3386897db3868cc94b11d587dbc345144c0a9b7d7765970a1784bfdbf4b69dc5f419e06d6ef00 SHA512 291d22cbd51e986ffda457ad670ddfea3374694b369b5889b1f154f58fb29ecc3505cb6e02addb942d00bfbabfc384e6f8ee0ed3f4df3063a8a3621dd5634b05
 MISC metadata.xml 271 BLAKE2B ba1244de4ef19fe62ff4c24356d879f136972737333f8cb217b4b7ec8377c9eab52c0775ceb464b203167dd2a02245e5c5f4235b1eca422eb8e9432939e26d94 SHA512 71c167a5edafa5ca0d3fe6c97dd82c6e0fbbfdb4f7d4a85b19d2f96583d5a02e14f153c331345459bc448ccd8a387dd37034a56d2153a67b71056c7ca142c0cf
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild
index 587297ffbb97..a666bef2a72b 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
 
 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 ~sparc64-solaris ~x64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 743bb48a1457..b76fc9e133bd 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fbterm/Manifest b/app-i18n/fbterm/Manifest
index e99ac3760819..4675ef4b0a98 100644
--- a/app-i18n/fbterm/Manifest
+++ b/app-i18n/fbterm/Manifest
@@ -1,4 +1,4 @@
 AUX fbterm-autoconf-2.68.patch 788 BLAKE2B 318179878ee05ad8731fdc1969aab273b637bd5279ceafeb5a242f70fe9e2100f23e2f588d47fbf4616bb2d9b55d8e6c30928215e83a6b6900b1977848ed8ebe SHA512 c051f1200c5c1aeb89239204d39dc3cee853315b7fb68d3cd0f14cb19cb8abf73901f86479b4a510a63992fc95b3803f7f19a787e00856a40b09bffba8323557
 DIST fbterm-1.7_p20190503.tar.gz 187225 BLAKE2B 9efa290c73dae49e12bb53d44c502a58fa5baaf517248b18ae1218285a3785fe276bf028613eac0a78ccee51c8b392153533dffd1e2b88201cccf8badb6d34e1 SHA512 13a57f8c5fff1d9c70021cd01f554a76e5465ae49b05a5aa49949caf31eb2b8fc231bdfba6ac42840542b73edc4ab66e487eebd0fa9d92761c7193294edadf81
-EBUILD fbterm-1.7_p20190503.ebuild 1406 BLAKE2B 2745b2abcdc812d7ce9c3c51ad95bf65ace4f0b2bf6cee37ba1328444310f9cfc2ebb915ce90bae061a9d6c226271611b49637b08d1f20e69394844955de801c SHA512 04ddb9c4fdd99e3bef189f3db69b8d73ab6d336da1c49212dd77cfe162b49d5f3ac6bf6ef860cd119fd5d2d024045004b745d6763c1cef3a3ce0e1b6406ef1ab
+EBUILD fbterm-1.7_p20190503.ebuild 1404 BLAKE2B 9dbe69f46cd3d6d79d0a71469d99bb856026a48a90bf61fa880bb0190cc980b9adfa17eac6a80fde4f645097f6dd598236e552de0f2afb0502f16ccce9b87bf1 SHA512 5af4bace39d98946827f60e30c01043d2c345c8656ccefb131d99b1a1ef0d95649c338c2ab0dcd14c41a85ee6255cac64bf7ac6b74effef581f98e0373afab7f
 MISC metadata.xml 314 BLAKE2B 6c34283dc7627f2af6cde2409bc3d0320ce0bfbe01de4b1c386b05ae161c66147e0526f40b8b7f047f5dbfd8ba959bea2d04b0f4c718058b55e8a8d70d523018 SHA512 6fedfb485067e3f2fdc0f58e9b3bbb3c9942dac384d5a7e6d8df40c8bdcde1adc685b7e730cbeeb53fc8b795b4975d5ed321be4a7db2647dbd47d14513081f20
diff --git a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
index 408aa38f9e12..fa95d577d192 100644
--- a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gjedeer/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="gpm video_cards_vesa"
 
 RDEPEND="media-libs/fontconfig
diff --git a/app-i18n/ibus-chewing/Manifest b/app-i18n/ibus-chewing/Manifest
index 150bff575efc..2c1674c8a1d1 100644
--- a/app-i18n/ibus-chewing/Manifest
+++ b/app-i18n/ibus-chewing/Manifest
@@ -1,6 +1,5 @@
-AUX ibus-chewing-test.patch 1700 BLAKE2B 6cc7fa0fe7bbdb49f89adc5e0f2509bfd34222d3d7ab16e39effe98e973582120bcb90e7d00e859121fd1c16f41df3ade9750ed879e88269230d4984109f64a4 SHA512 124042ccebc509116661dd732b4bbb237a3962518a273701da7d4a20ec0109a3f5b850380c712e457df947e146c189a2606976262915d3973211b70b7464c061
-DIST ibus-chewing-1.5.1-Source.tar.gz 177044 BLAKE2B b188c7ea2c12fd1ccf64a70355da0a6f8a47976f141c8a0a7edcc7a5ccd6b959f73cad2cd1137874f965967780691fe920b44b3141cc6fa4e631921f4c4a2582 SHA512 2db6def1fe8ca3bd71419a001909d285ee48ef84c2f65e14bacff9cd114676bed594f0c90217e1fdab67c995a7b05d675812e90e281371d8464722c31649c633
-DIST ibus-chewing-1.6.1.tar.gz 111103 BLAKE2B c9b22b0fe4b164d02a1782479e139e04e3113299fb3ccebdba24eaa9d15964eca34d381f45f0c313bb53bc0b8c7f7b649ff4c0179c712f6d880e3d92a9d02692 SHA512 b093db79c656433614b9f72719a2b0768a30c2fb6fa066eda1e79cc9932ce1836f7f1e5611612fb44f260fe80a9baa9e18fdc9754b285e8a5f12a87c376cbd39
-EBUILD ibus-chewing-1.5.1-r1.ebuild 1450 BLAKE2B e2e8ee3f2dc2e805da44ccb7535e9b548f4f4bb6d32ec2d5f439776d17c9db75d9efa5ae4b3354d6ca8737c0e82a41e0bd67aa001427855e523ede0515c369c3 SHA512 69b31323aaee9f7c00a263c09169f69faf934fe605e7de0eef5a472fb56a52ccb6a6ac4c75c21dbe8b5bb0cffe91de56eb3522ced09e13e8ab8c814a387f9957
-EBUILD ibus-chewing-1.6.1.ebuild 1430 BLAKE2B 3b2c28285abc9d559961a16d1d7543118dd10c7c728d1ae123b74c1b776f25c890962f959167120aeb8ad12996804f6438729c6aff69db14764ceff0d1b1c2f0 SHA512 6631ce3998047f196dd6b8deef3570b39b937c7fd85facdfa1b720be773c87cafe5a36f8c1da7ad0458cdeee23591be0ddd621a0e0ebf93188cd7f1785b3d56f
-MISC metadata.xml 425 BLAKE2B 3d316bb5e0e46c4fb91e042eec905fb162abe1258796d1e31a029d272f413c8ef0266883ce4605d56d14910b319c1f14750e392f79fe807b19647ae79bc5b921 SHA512 e0c893b0d30b186f6c0f0043e1babbdf0f245f664dde4cf74d0a97367c94e975bb8d6874eddff69875f0a7741282aa118b34ff76f475aa2ada86fad9b93f594f
+AUX ibus-chewing-test.patch 2777 BLAKE2B cb7f3c8246ff80a6b7781a72aa27f0a5804d7dcfedd51001888c7833d6eb6790b5a931412d3bfad28c1711578799b48b5c39ce4760ebf96b03282bee2b233312 SHA512 245f907e51ffd4c7efd291055322e976eebf948f3f86b1e23a9f187f97ae91e20a41c6faf1a0396ebc097f09ba71e123940878c5211d2bf7f49ecce770a7a2cf
+DIST ibus-chewing-1.6.1_p20210117.tar.gz 112715 BLAKE2B 80279a40c8733fc8e9f43b09cf825bea53442a6572d7863bf7d8faf06765fcb3609c71b9087551c6b2d35b268b2585f6e4c019f15ccc08c8f91bc3a14427ad57 SHA512 979f58d3b32ec22051d32c7425867761eea8e13eb9dc900975e3986bb7b3064883474267731c32f79c96d2029da0415dba8d5ed7ae3645f04c3fed44dbe25bd6
+DIST ibus-chewing-gob2.patch.xz 11760 BLAKE2B 929c6f09ddc22efa47eb53fd9bd5833a5a5105e9e8c6251009699548b4b3a1bf124f335f9d963c42efe00a9f9276f4df303a087632d894237ee3f69f5c08b74e SHA512 4317f5e807d6114f9d1057421db9c032670578ca83898c7495a27bf76aaa0fee88649a5df9f16df74e7961129cfe2029eda66dcea9407263344add7670de088c
+EBUILD ibus-chewing-1.6.1_p20210117.ebuild 1577 BLAKE2B 7c6fde9cf845f13fd5391f96e61ff7517def1c52ecfe6bffc5eb702dbe7af3478cb3fa4239dd813fe526dd993c569f4a0175a3a05080dc798a4cfebc152ad6ad SHA512 ba5f4c24b13d9bcfb32f389d6aec842b6210fb61c9a94cd23c4fafc77bcf45888345628f743d809eeac955d4685e1fce0d468b84b94aa7b52fe7c1db4f9cdfd3
+MISC metadata.xml 411 BLAKE2B 39bf10c1dbb59f5213f9250b3780bb1a91bc7a13f6681eb996a64344779775247859b38d4a55c42b030ed15fa7d408ea387cd28c200740a76fd70383814cb016 SHA512 57eca3e6c4d055f23021ace5573124be9a826de6227391d024701faeea31c2e280633523ee509565c2c2223faa7d0a92c12f92b70b83bdfbc444b604066db481
diff --git a/app-i18n/ibus-chewing/files/ibus-chewing-test.patch b/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
index abed91d377d3..0d4ddc7a7838 100644
--- a/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
+++ b/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
@@ -1,6 +1,26 @@
+--- a/test/IBusChewingPreEdit-test.c
++++ b/test/IBusChewingPreEdit-test.c
+@@ -514,7 +514,7 @@ void process_key_down_arrow_test()
+     key_press_from_key_sym(IBUS_KEY_Down, 0);
+     key_press_from_key_sym(IBUS_KEY_Down, 0);
+     key_press_from_string("4");
+-    assert_pre_edit_substring("世", 1, 1);
++    assert_pre_edit_substring("勢", 1, 1);
+ 
+     ibus_chewing_pre_edit_clear(self);
+     assert_outgoing_pre_edit("", "");
+@@ -752,7 +752,7 @@ void test_arrow_keys_buffer_empty()
+     key_press_from_key_sym(IBUS_KEY_Page_Up, 0);
+     g_assert(chewing_cand_CurrentPage(self->context) == 0);
+     key_press_from_key_sym(IBUS_KEY_Up, 0);
+-    g_assert(!ibus_chewing_pre_edit_has_flag(self, FLAG_TABLE_SHOW));
++    g_assert(ibus_chewing_pre_edit_has_flag(self, FLAG_TABLE_SHOW));
+ 
+     key_press_from_string("`");
+     g_assert(ibus_chewing_pre_edit_has_flag(self, FLAG_TABLE_SHOW));
 --- a/test/MakerDialogBackend-test.c
 +++ b/test/MakerDialogBackend-test.c
-@@ -126,7 +126,7 @@
+@@ -132,7 +132,7 @@ gboolean mkdg_g_value_is_equal(GValue * value1, GValue * value2)
  void backup_key_to_g_value(const gchar * key, GType gType, GValue * value)
  {
      g_value_init(value, gType);
@@ -8,8 +28,8 @@
 +    mkdg_backend_read(backend, value, QUOTE_ME(PROJECT_SCHEMA_SECTION), key, NULL);
  }
  
- void change_new_value_from_orig_value(GValue * newValue,
-@@ -169,7 +169,7 @@
+ void change_new_value_from_orig_value(GValue * newValue, GValue * origValue)
+@@ -175,7 +175,7 @@ void assert_new_value_is_written(const gchar * key, GValue * newValue)
  {
      GValue storedGValue = { 0 };
      g_value_init(&storedGValue, G_VALUE_TYPE(newValue));
@@ -18,7 +38,7 @@
      g_assert(mkdg_g_value_is_equal(newValue, &storedGValue));
      g_value_unset(&storedGValue);
  }
-@@ -219,7 +219,7 @@
+@@ -225,7 +225,7 @@ void int_w_test()
  #define GCONF_KEY "max-chi-symbol-len"
      GValue origValue = { 0 };
      g_value_init(&origValue, G_TYPE_BOOLEAN);
@@ -27,7 +47,7 @@
  
      GValue newValue = { 0 };
      g_value_init(&newValue, G_TYPE_BOOLEAN);
-@@ -229,13 +229,13 @@
+@@ -235,13 +235,13 @@ void int_w_test()
  
      GValue storedValue = { 0 };
      g_value_init(&storedValue, G_TYPE_BOOLEAN);
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild
deleted file mode 100644
index c1924f9c8119..000000000000
--- a/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils gnome2-utils virtualx
-
-MY_P="${P}-Source"
-
-DESCRIPTION="Chinese Chewing engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/definite/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gconf nls"
-
-RDEPEND="app-i18n/ibus
-	app-i18n/libchewing
-	dev-libs/glib:2
-	dev-util/gob:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	gconf? ( gnome-base/gconf )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-test.patch )
-DOCS=( AUTHORS ChangeLog README RELEASE-NOTES.txt USER-GUIDE )
-
-src_configure() {
-	local mycmakeargs=(
-		-DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
-		-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
-	)
-	use nls || mycmakeargs+=( -DMANAGE_GETTEXT_SUPPORT=0 )
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${EPREFIX%/}/"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die
-
-	export GSETTINGS_BACKEND="memory"
-	export GSETTINGS_SCHEMA_DIR="${BUILD_DIR}/bin"
-	virtx cmake-utils_src_test
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild
deleted file mode 100644
index 94525afb3ed4..000000000000
--- a/app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils gnome2-utils virtualx
-
-DESCRIPTION="Chinese Chewing engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/definite/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gconf nls"
-
-RDEPEND="app-i18n/ibus
-	app-i18n/libchewing
-	dev-libs/glib:2
-	dev-util/gob:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	gconf? ( gnome-base/gconf )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/cmake-fedora
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-test.patch )
-DOCS=( AUTHORS ChangeLog README.md RELEASE-NOTES.txt USER-GUIDE )
-
-src_configure() {
-	local mycmakeargs=(
-		-DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
-		-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
-	)
-	use nls || mycmakeargs+=( -DMANAGE_GETTEXT_SUPPORT=0 )
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${EPREFIX%/}/"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die
-
-	export GSETTINGS_BACKEND="memory"
-	export GSETTINGS_SCHEMA_DIR="${BUILD_DIR}/bin"
-	virtx cmake-utils_src_test
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild
new file mode 100644
index 000000000000..85e9e8c0e864
--- /dev/null
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake gnome2-utils vcs-snapshot virtualx
+
+EGIT_COMMIT="8e17848d3fe3bd7de052a1c26b4161092ba1df9f"
+
+DESCRIPTION="Chinese Chewing engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/definite/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~hattya/distfiles/${PN}-gob2.patch.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gconf nls"
+
+RDEPEND="app-i18n/ibus
+	app-i18n/libchewing
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	gconf? ( gnome-base/gconf )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/cmake-fedora
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-gob2.patch
+	"${FILESDIR}"/${PN}-test.patch
+)
+DOCS=( AUTHORS ChangeLog README.md RELEASE-NOTES.txt USER-GUIDE )
+
+src_configure() {
+	local mycmakeargs=(
+		-DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
+		-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
+	)
+	use nls || mycmakeargs+=( -DMANAGE_GETTEXT_SUPPORT=0 )
+	cmake_src_configure
+}
+
+src_test() {
+	"${BROOT}"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die
+
+	export GSETTINGS_BACKEND="memory"
+	export GSETTINGS_SCHEMA_DIR="${BUILD_DIR}/bin"
+	virtx cmake_src_test -j1
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-chewing/metadata.xml b/app-i18n/ibus-chewing/metadata.xml
index 0889e6335dbe..cf7f054fe39e 100644
--- a/app-i18n/ibus-chewing/metadata.xml
+++ b/app-i18n/ibus-chewing/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <use>
-    <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="github">definite/ibus-chewing</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<use>
+		<flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">definite/ibus-chewing</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-handwrite/Manifest b/app-i18n/ibus-handwrite/Manifest
index f25313319dae..7da1de444ece 100644
--- a/app-i18n/ibus-handwrite/Manifest
+++ b/app-i18n/ibus-handwrite/Manifest
@@ -1,4 +1,6 @@
+AUX ibus-handwrite-blink.patch 647 BLAKE2B ed7914488f5d2fd69bb9c262d88b3b60cdccdbe5f37ce90a393cc99fd91dd1e862a18f2db70ebd83c357b0b06e4bdb5d63db72e421072db0551caaddcc52b7f2 SHA512 6b493fb3a964d36c63cc29d0f906a58041f93d2dd4008cf49e58540a833573e78492331203a69a0a880bb4eea8d34fbb8c953ee91af3d2ef2dc74a51c01fe977
 AUX ibus-handwrite-headers.patch 406 BLAKE2B cb683592e24d58d2fcd4718374e0d5e8cb51c6300f5123a3d9d43c34e24a3f3413dac5b256e6e7fb74494870d449ccc4a22fc5916a27407fe7c11af391ced5b3 SHA512 4629c68451d3b3ede478b03241d58c66f1a94be0caa05b4cf22d0287beb059c807e398457f0aaaccc6d0f85b9cb987153bae213d949e78afc2c66a6880baa7d7
+AUX ibus-handwrite-nested-function.patch 715 BLAKE2B e827ee4fdd65ab9dfb6aa2e484aff8d47d2a11993dc15668d34539c89adface47344aa724851d71a80424de46022b3adaf769259d995c61f290a816d7ff20658 SHA512 6df7fb76af1e229669b5e7d945daa01b1b61249cd244211388dc26d69a417ca49edb10f9adb2f5a7dd695b730926b6cda9570e1957341c94afce797016fcdb58
 DIST ibus-handwrite-3.0.0.tar.bz2 239452 BLAKE2B 379b283565efc16c75c1811e096f814a4a0f009ab469a7bc251f34889bd62c7158379a63b71529db942969a3444a6be42f3db3bc5787993f8e15f86a6a7ddb76 SHA512 ed9b2b35919f3e061230c7085c88e5ce80ee978ffa7f8391e74364e8d6152f0d88a08f91ec58b55fc7067e9fe45d03018760ccfca7b026f36211fa344d16c9b1
-EBUILD ibus-handwrite-3.0.0.ebuild 770 BLAKE2B b0d1f161950a855bc15c07874adc08febc65267f17ff4226b2ea61319c0efd2ae2bc82d29be4f35dc8fdfe13f9196650e63dccadc46e134c68d31b3b0be6b3ee SHA512 f229abca3430d75ff899e7acd70df8490f338c36128e463f59e4bdb31e939a9fa06f6fa7307ba02d69ce583d45c0886149b7b5e3ad94e2394558f05d54f3a9d6
+EBUILD ibus-handwrite-3.0.0-r1.ebuild 857 BLAKE2B 946020fb670f50354396a66d03547e798515a9d99fb591810a23e6342bfb1efefdef0b2be1b18796295b580da08191af225be99655a2b9968cbb68f401cbfb28 SHA512 991e936fc7dc9b384582879f72803510f98f5e19ede9719d19acacffc15c934249331fc84c50e0de37842075b2452dd457e1940afaf1c812ae069632d4e0afa5
 MISC metadata.xml 335 BLAKE2B 5d4efa4813ffaf66e29f26f03ff8dcbb29fc4ece8cee37a73930c67f05ccd74f9c0fe928f81b1c65639d28912e9926684dc667c359be4f2e8b499450b8433890 SHA512 8fc0585a3c14f950d2f979faa9d5636da0446b7b170df75859a03eb3128d3c68cdeaabd894cf2e59729719a907274190a885dd0981ef5f4a8bac3aa16dab115f
diff --git a/app-i18n/ibus-handwrite/files/ibus-handwrite-blink.patch b/app-i18n/ibus-handwrite/files/ibus-handwrite-blink.patch
new file mode 100644
index 000000000000..7954f2018c2e
--- /dev/null
+++ b/app-i18n/ibus-handwrite/files/ibus-handwrite-blink.patch
@@ -0,0 +1,23 @@
+From fcffa8f1ed798db3c2c4db0dbfc953f3147d37ba Mon Sep 17 00:00:00 2001
+From: Peng Wu <pwu@redhat.com>
+Date: Mon, 31 Aug 2020 15:32:48 +0800
+Subject: [PATCH] Fix focus in/out issue
+
+---
+ src/engine.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/engine.c b/src/engine.c
+index da01f06..d3d924e 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -155,9 +155,7 @@ static void ibus_handwrite_engine_focus_in(IBusHandwriteEngine *engine)
+ 
+ static void ibus_handwrite_engine_focus_out(IBusHandwriteEngine *engine)
+ {
+-	UI_hide_ui(engine);
+ 	printf("%s \n", __func__);
+-
+ }
+ 
+ static void ibus_handwrite_engine_reset(IBusHandwriteEngine *engine)
diff --git a/app-i18n/ibus-handwrite/files/ibus-handwrite-nested-function.patch b/app-i18n/ibus-handwrite/files/ibus-handwrite-nested-function.patch
new file mode 100644
index 000000000000..96cbc118fa4f
--- /dev/null
+++ b/app-i18n/ibus-handwrite/files/ibus-handwrite-nested-function.patch
@@ -0,0 +1,26 @@
+--- a/src/UI_gtk.c
++++ b/src/UI_gtk.c
+@@ -74,6 +74,11 @@
+ 	return TRUE;
+ }
+ 
++static void clicked(GtkButton *button, IBusHandwriteEngine *engine)
++{
++    ibus_handwrite_engine_commit_text(engine,GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button),"order")));
++}
++
+ static void regen_loopuptable(GtkWidget * widget, IBusHandwriteEngine * engine)
+ {
+ 	int i;
+@@ -98,11 +103,6 @@
+ 
+ 		gtk_widget_show(bt);
+ 
+-		void clicked(GtkButton *button, IBusHandwriteEngine *engine)
+-		{
+-			ibus_handwrite_engine_commit_text(engine,GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button),"order")));
+-		}
+-
+ 		g_object_set_data(G_OBJECT(bt),"order",GINT_TO_POINTER(i));
+ 		g_signal_connect(bt,"clicked",G_CALLBACK(clicked),engine);
+ 
diff --git a/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0-r1.ebuild b/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..ffbab3234760
--- /dev/null
+++ b/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Hand write recognition/input for IBus"
+HOMEPAGE="https://github.com/microcai/ibus-handwrite"
+SRC_URI="https://github.com/microcai/${PN}/releases/download/${PV%.0}/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls +zinnia"
+
+RDEPEND="app-i18n/ibus
+	x11-libs/gtk+:3
+	nls? ( virtual/libintl )
+	zinnia? (
+		app-i18n/zinnia
+		app-i18n/zinnia-tomoe
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-blink.patch
+	"${FILESDIR}"/${PN}-headers.patch
+	"${FILESDIR}"/${PN}-nested-function.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable zinnia) \
+		$(use_with zinnia zinnia-tomoe "${EPREFIX}"/usr/$(get_libdir)/zinnia/model/tomoe)
+}
diff --git a/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0.ebuild b/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0.ebuild
deleted file mode 100644
index cbabf59f6792..000000000000
--- a/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Hand write recognition/input for IBus"
-HOMEPAGE="https://github.com/microcai/ibus-handwrite"
-SRC_URI="https://github.com/microcai/${PN}/releases/download/${PV%.0}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls +zinnia"
-
-RDEPEND="app-i18n/ibus
-	x11-libs/gtk+:3
-	nls? ( virtual/libintl )
-	zinnia? (
-		app-i18n/zinnia
-		app-i18n/zinnia-tomoe
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-headers.patch )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable zinnia) \
-		$(use_with zinnia zinnia-tomoe "${EPREFIX}"/usr/$(get_libdir)/zinnia/model/tomoe)
-}
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 3a1f72895c8f..b21e08625186 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,5 +1,6 @@
+AUX ibus-hangul-test.patch 446 BLAKE2B 06a83c8701e803f97b5755215488639b77c3be819b39932e6d6e957467eec482f32bf0477d84e7ec552a495f2e5b56f4dc730c27851cff2f252b0b36152d19f6 SHA512 3171d14b3eb495f09c5a90cee9fc85d87a5b773452367f1ed1bd33eaa3a220658052f6edef53fc7585292b0811f5b04b53eade0175d609dadcee0d29ea3506ac
 DIST ibus-hangul-1.5.3.tar.gz 525834 BLAKE2B 6c92dbbde39bc42b7df974dbb23c9ef62088c8d3f63a500bd3c7e9c90b3d80d16dc1d76616620e1d7590fee549979a03585ac635761687dc11737d65fdf09e08 SHA512 ba21a8afb750e33744042c5e4f9d88891764921a37c4dbe1f4efa9883fd3c889789854af57adcd24bc1ca365ee49d2e01073c54d72cd025558b41788fb6213b4
 DIST ibus-hangul-1.5.4.tar.gz 542612 BLAKE2B 46495c04a37888a3ed21831b5bbca5b788f4d3a831fb3ce4eb13d95f302877fadddf831016f1d29aa2c1a6ba73fc0d585f2be57c10267a51a1a2186642632918 SHA512 dc4c755349424605de3832496a8a0cf7e8da577cbeff85d2b03da187fd5fdc9de5475eb523c69310e4f7edbb9a513f6f218de082ba32a25a477cdf5eb6f65513
 EBUILD ibus-hangul-1.5.3-r1.ebuild 988 BLAKE2B 843a94ce91a794fdb3edb82521e1ac317eb13d42a596286049b46bac75963987b3e8e62a462cfed23ac8ea1252c6cb04805a04d83dd767916816daabd9d43137 SHA512 31ca698a4989a3503ee2f79a6afb5d6e7dea3906f553ae03034f47c479e5a7bc404e7040c4344ffe117a1aad0db81b58189353e5ab1c569c377464ba8da05119
-EBUILD ibus-hangul-1.5.4.ebuild 990 BLAKE2B 7dd6f3dfd6f96637fd73e2e0f1dbe3eda72c454a319aa56fb389ebb1ad9667373d8992eaaacf2e54576b83182ae18c7bf9cabe185625da424cf407cae7458599 SHA512 a0b4d22d042f94880f07b38815bb8ff2fa9ed14698fcb40e33fc0b70e5c59311aae8f1683ea24959acae723596f1dfc52dadd243faf196c25e4bedd17ee04e30
+EBUILD ibus-hangul-1.5.4.ebuild 1223 BLAKE2B 73a04f764828b84eef8c7ca1f507fddf915e77432f281dfaf6a4c06ba8308813fd239f1c331e85cd618f1ceaf889d2aba585bcd50de6c1bdce62b2f435ec78e5 SHA512 dc7246018b7e13a098aceb39507da85329e91c167e18ddeaa4d486752accebf11732f21ab5bffcba73cc5f328d1456d69ae146223fd3ad15dcbe248a98c7057e
 MISC metadata.xml 321 BLAKE2B d336297b96a4ba3ae1e2c8bf3b1493717b49ce42c85cb0748af54c7bf6be4a1c74461c122dbbfc9b107fa02f4e83800798dd61c1bba74426bb7a2487e0d8fef9 SHA512 d05f79c856e4e579d1f98cd7c9869294f1906fa7e73eeae7120ee6af710d5f16f103d63f1261a9d798ba5584fa8e6f349d73d407a747811515280c736b43eb48
diff --git a/app-i18n/ibus-hangul/files/ibus-hangul-test.patch b/app-i18n/ibus-hangul/files/ibus-hangul-test.patch
new file mode 100644
index 000000000000..7a6ef479f0ee
--- /dev/null
+++ b/app-i18n/ibus-hangul/files/ibus-hangul-test.patch
@@ -0,0 +1,20 @@
+--- a/tests/ibus-hangul.c
++++ b/tests/ibus-hangul.c
+@@ -261,6 +261,7 @@
+                       G_CALLBACK (window_inserted_text_cb), entry);
+     gtk_container_add (GTK_CONTAINER (window), entry);
+     gtk_widget_show_all (window);
++    gtk_window_present (window);
+ }
+ 
+ static void
+--- a/tests/runtest
++++ b/tests/runtest
+@@ -7,7 +7,6 @@
+ : ${DISABLE_GUI_TESTS:=''}
+ 
+ ibus-daemon --xim --panel disable --config disable &
+-sleep 30
+ 
+ tst=$1
+ 
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
index 4d13e3d9b116..e8b64f68faad 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
+PYTHON_COMPAT=( python3_{8..9} )
 
-PYTHON_COMPAT=( python3_{8,9} )
-inherit gnome2-utils python-single-r1 xdg
+inherit gnome2-utils python-single-r1 xdg virtualx
 
 DESCRIPTION="Korean Hangul engine for IBus"
 HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
@@ -27,12 +27,22 @@ DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+
 src_configure() {
 	econf \
 		$(use_enable nls) \
 		--with-python=${EPYTHON}
 }
 
+src_test() {
+	"${BROOT}"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${S}"/data || die
+
+	export GSETTINGS_BACKEND="memory"
+	export GSETTINGS_SCHEMA_DIR="${S}/data"
+	virtx default
+}
+
 pkg_preinst() {
 	xdg_pkg_preinst
 	gnome2_schemas_savelist
diff --git a/app-i18n/ibus-kkc/Manifest b/app-i18n/ibus-kkc/Manifest
index d51a42bd29d3..20d91bd18dfb 100644
--- a/app-i18n/ibus-kkc/Manifest
+++ b/app-i18n/ibus-kkc/Manifest
@@ -1,3 +1,3 @@
-DIST ibus-kkc-1.5.22.tar.gz 518844 BLAKE2B eb3d562960729ff4967781ca3cc2797915c4c3e3b60281ca05483da3180575500fd5688c1481d03a909e8a108082159197e23b3a6c4df672b7d57ccc774783b3 SHA512 767a995cb97ca7cf5434f64094351c4fcf1d3de9f31da6f6642ccec2d199ddfb58e27f281b4dd3c63f44dc29cd46b36808ecd1aacfe0b1320d0688d567eb6fd4
-EBUILD ibus-kkc-1.5.22.ebuild 694 BLAKE2B ba1accb04e5bd10ebbee544e15e2865312d67338afef9a09cb321550ed7528a4439c96adcc2c20b377fb33ca37157847912c1a5939a7d90a987da91c96794568 SHA512 92d2c1c5587edb7a62bac7e86c53858dd77d4f273fa8db304fb8749671a0ca1c94bdfd8655724a3531754eae712981ff32596128ec2572dd20864977c2cbdb07
-MISC metadata.xml 323 BLAKE2B a3ecc316ff3c80a8f03b71c1157d908e13f010d53e745020478fc923c59225e600d51ca645da03fedd32e0aad15e1a1c39ceb4a6620ae0a95492138070177a58 SHA512 c60148ea94c635267c4f7b8b418d6ef49f9f19752c32084a8ed37e64f31022a0499a2f376b3f87709834fcb1edf1399539224a544b74b3d17d7eb54baa68f392
+DIST ibus-kkc-1.5.22_p20170607.tar.gz 55162 BLAKE2B 9d34a7da99a1792cad9ca1b82665b8008a2b11c7e09cdce7e0a5e9d0e9d482798a1facaf8d35e3daa296638383c267af70ae00d50b2c601b66895a0b1c8d2817 SHA512 519be83e17d9556c6839ecad2af4a46665a6aafd0f8072f4c1d2c8af33eb3ac814517b5b42513b898afe86ededf35b9082b9a1fb2a699dcb88757b159d5b74cf
+EBUILD ibus-kkc-1.5.22_p20170607.ebuild 779 BLAKE2B e20002a467c28e31a5d837e71c432a5190de99068f4c1c1cd755a7ce67c8af7828481e6d18f7e8c47c4ea70a4728d1b06cf48fd8f8c1ec53b7c43fd1a58c7d7d SHA512 4829a1e97feff5c95b248d5ad3647cf3dd9e5d07c85d82f832b86794ce76ce0495cfccc0831a147c59f3e8c78e7483fda4b9eda302e9ec93a84feac9505d4407
+MISC metadata.xml 313 BLAKE2B b1e1bcedbf32369841d3810fa0b7bca1b839f314b87e38f87b09761622f5c7dfa139b00e40cb605fbb847bcd7be00cb9f5d74e14f3ccf05196c088bc790f7692 SHA512 5d10e6154d3f6dade76491ab31ce770f8b967d536cfd90cc34b2e751d999a72c807c3d3704c5512b4c6299e141dcf3887661a64db4248a8bf7f93a5748a9d6de
diff --git a/app-i18n/ibus-kkc/ibus-kkc-1.5.22.ebuild b/app-i18n/ibus-kkc/ibus-kkc-1.5.22.ebuild
deleted file mode 100644
index a2b21852753a..000000000000
--- a/app-i18n/ibus-kkc/ibus-kkc-1.5.22.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit vala
-
-DESCRIPTION="Japanese Kana Kanji conversion engine for IBus"
-HOMEPAGE="https://github.com/ueno/ibus-kkc"
-SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-CDEPEND="app-i18n/ibus
-	app-i18n/libkkc
-	x11-libs/gtk+:3
-	nls? ( virtual/libintl )"
-RDEPEND="${CDEPEND}
-	app-i18n/skk-jisyo"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/app-i18n/ibus-kkc/ibus-kkc-1.5.22_p20170607.ebuild b/app-i18n/ibus-kkc/ibus-kkc-1.5.22_p20170607.ebuild
new file mode 100644
index 000000000000..a7cb005d4f3b
--- /dev/null
+++ b/app-i18n/ibus-kkc/ibus-kkc-1.5.22_p20170607.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools vala vcs-snapshot
+
+EGIT_COMMIT="f7516ae20cb648cd8b0904aec5853d3a3d2611c4"
+
+DESCRIPTION="Japanese Kana Kanji conversion engine for IBus"
+HOMEPAGE="https://github.com/ueno/ibus-kkc"
+SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DEPEND="app-i18n/ibus
+	app-i18n/libkkc
+	x11-libs/gtk+:3
+	nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	app-i18n/skk-jisyo"
+BDEPEND="$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-i18n/ibus-kkc/metadata.xml b/app-i18n/ibus-kkc/metadata.xml
index 94ae2db76fb8..74de0fde210d 100644
--- a/app-i18n/ibus-kkc/metadata.xml
+++ b/app-i18n/ibus-kkc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ueno/ibus-kkc</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ueno/ibus-kkc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-skk/Manifest b/app-i18n/ibus-skk/Manifest
index 7eb3aab2c4ce..0fc842f0c66e 100644
--- a/app-i18n/ibus-skk/Manifest
+++ b/app-i18n/ibus-skk/Manifest
@@ -1,5 +1,3 @@
-DIST ibus-skk-1.4.2.tar.gz 491882 BLAKE2B 999eb9f1b36406a8d665b2c929fcdef5e57bef5c6206075333435f46774445497d6d953bc695c22f6afa5700283c32a20c2d4e9227fd30e5552f5688cd524aab SHA512 cec7fbffaa78c406f3b9502bc64e2290fec579102a37ce61cb6424c3e06d159653f165b48e09f1256f38491bce6819460c6d226cd765ab150a8dfa80e2707fe1
 DIST ibus-skk-1.4.3.tar.xz 321344 BLAKE2B f761cf7c97ecf5830715a7bbae657c72d437e0be69a0867780ee574f9ea17f3d612dc5a76e3b4499fd203878702abdd2e37fdc980123a80daf5f03db7645b1f4 SHA512 c05302878f9c4b0a59daa1d285ab44501f63c0f7890149412137d3f6124fc4a7ebfe16172de311cbb5f2b9035255b5784a715a7832e6734d76e11bf19e2c9d3b
-EBUILD ibus-skk-1.4.2.ebuild 678 BLAKE2B 2a3201da67aa8eb51ca068cacc85b849cf9535ee82a0b2f9770120794b79b18bd3db6c550870d3918dd44b391d16235613e2f101478ab15083c6eea617b1cb83 SHA512 99e7464159290b7a3f4be05145233c1f7a64ee43a58a8d7c2174ffb91cd9d33866c977414bbd12c6b86cabfe8546618e05aad5a118e15873f9a55ca9c5ca20a3
-EBUILD ibus-skk-1.4.3.ebuild 680 BLAKE2B 1cdaafb4d8b32cf6ef8291e01cd10beec54dcf8aa6f7a135c221d9f6c127a9a31cd7d78f253b9d6f4667e2fe65d6b6a9c1337f8bb7b838562fbbb87365cb7e42 SHA512 52dd6e6f1470f1c91c1fa60bf74a35f2c9e32992eab259ca83eac40f57eff6d1f68a6587c4dc63551263f8fecc2e5d830087f2b4c3f1f522992c9722217f257a
+EBUILD ibus-skk-1.4.3.ebuild 665 BLAKE2B cd00e46e1b4d42fc7e1f45e22a20abd42ca6eb3778dfb0fb9958287e3198a53e2cfdd5585fedb87bb241bc19c3095f89b41ca85f2cb19f40a7c1efa3ebe69e01 SHA512 eef25ff3057251457950529aa3ecba5a05948c1fe0d1923e9b20d4444c3f5fe1eafec2c869cd1906f52cf8bc333c3b3413fc822e70fc296dd1a6035d7f15906b
 MISC metadata.xml 313 BLAKE2B 2e45d1f993a16fbd05d3018163b8ae6cf287c245c9c58f0e4334a03d8fda8f097fa0ed196c0930cd7f3efe4d2da55504199bf646fc32fcd28676c245a98575ce SHA512 3107b968458f30de3fedbd8d658490f10c4d1f5faf789685e5e963e6b8de4dd6dc1e823883cddf55b89e78fecbcd7b9b1e9b36b52055d1ff1c499505d67f4e27
diff --git a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild b/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
deleted file mode 100644
index 4717ee5c4370..000000000000
--- a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit vala
-
-DESCRIPTION="Japanese SKK engine for IBus"
-HOMEPAGE="https://github.com/ueno/ibus-skk"
-SRC_URI="https://github.com/ueno/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-CDEPEND="app-i18n/ibus
-	>=app-i18n/libskk-1.0.2
-	x11-libs/gtk+:3
-	nls? ( virtual/libintl )"
-RDEPEND="${CDEPEND}
-	app-i18n/skk-jisyo"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild b/app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild
index 60f705da342e..08bcec689cf0 100644
--- a/app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild
+++ b/app-i18n/ibus-skk/ibus-skk-1.4.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"
@@ -11,17 +11,16 @@ SRC_URI="https://github.com/ueno/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
-CDEPEND="app-i18n/ibus
+DEPEND="app-i18n/ibus
 	>=app-i18n/libskk-1.0.2
 	x11-libs/gtk+:3
 	nls? ( virtual/libintl )"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	app-i18n/skk-jisyo"
-DEPEND="${CDEPEND}
-	$(vala_depend)
+BDEPEND="$(vala_depend)
 	dev-util/intltool
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
diff --git a/app-i18n/ibus-table-chinese/Manifest b/app-i18n/ibus-table-chinese/Manifest
index cc1148d3f0be..2f180f14e172 100644
--- a/app-i18n/ibus-table-chinese/Manifest
+++ b/app-i18n/ibus-table-chinese/Manifest
@@ -1,5 +1,3 @@
-DIST ibus-table-chinese-1.8.2.tar.gz 10576111 BLAKE2B a80fa9c4780207efefba1118ee9dacc33dba4136b916a24971198b3325bf1b26f86cd4586db994db6dfaa85fffe087b021673d056b10df61c5f95ede4e967cd6 SHA512 30fd1c7ee8416cd62d8e26bc2646a667ac45c4579a7cb191c77e80fecccbc576c34f33ec0b5c55669c073a633298cfda1711e4b9d89a9ef8f6146acdc0167c1a
 DIST ibus-table-chinese-1.8.3.tar.gz 10824912 BLAKE2B e9f4e377a794827196e04e197044b3fdcd81d84ed89067e17745879495df69cc6e95814863f856cc0a7b7db0aba3cbd93d1c1d172f607fdd410dbed02dc4ad54 SHA512 610455343d9c9bf6577c7fd7aef9435c339c2f23c4d5f7ae2cbbc2366a9eb6a8a124e86621387497cc624e3276bf739b55602355ad41c4127f45f6d85cc5b4dc
-EBUILD ibus-table-chinese-1.8.2.ebuild 731 BLAKE2B ce48f80c7feb47b4ff2a0720e327faf322ebd180cfc022f4485d9a8d7da9de6ac8a480f8f3fc4beef1dfb811b15f2debbf4582c4a0f8cf70df26c985a32ec954 SHA512 13f1884ea80789b0436f3a993cd784fec1ac0417007c2b131ce3c3ce12e57c94b442d43e07a746c980360a910df7797cce9f11fefda92f6f5255ddc14f150212
-EBUILD ibus-table-chinese-1.8.3.ebuild 733 BLAKE2B 2e5b2092d7f6393a7d386e045444de81b7b0664744e085c14b2f70ecfac1e3371770a582172e74a881ae90823cf890369d3dcc033aee0f09aa3f0e20d6916ee3 SHA512 b691aea0d21000da67bc3a3c868c5db5d7b96799fd276092b9e43d439df9a15290ca98e599349e46511474abfccd9773b1438dbf6c888a04e20963dd56cc1e20
+EBUILD ibus-table-chinese-1.8.3.ebuild 731 BLAKE2B 8761567c6a2be7538d74e5b59e6b753f2f29880edea8980af2b02c043e0577b8f155e3de2f7e52649ad11e28f02f6b48fd0c63d05d24e162805048b0d49f3d05 SHA512 0bdee824e3ee3d5439fb3142dd9a079e084b1091dc26a40e246f6a2457714ef553e693940c779ebf1eb292b524f4cd3ece4dcf0b4207d1539975585838309463
 MISC metadata.xml 327 BLAKE2B c229992501fcb82736c7075b0bf06f3b6bd6999e54efc0bde71318a7b913d559af50f04ff04b30ca4c8d9028b061ea56a9eaa418314a8e28aac6b8e5897e527d SHA512 01c8f5543e6430b811708f685f545e969e4f7e1cd57f08613ea514ee5d14e1d79c9b49dd3e2cd62fe4d93137961f7503feac28331300bf50f8ea37657d7bd664
diff --git a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild
deleted file mode 100644
index 193cb2396567..000000000000
--- a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-CMAKE_IN_SOURCE_BUILD="1"
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake
-
-DESCRIPTION="Chinese tables for IBus-Table"
-HOMEPAGE="https://github.com/definite/ibus-table-chinese"
-SRC_URI="https://github.com/definite/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-i18n/ibus-table"
-DEPEND="${RDEPEND}
-	dev-util/cmake-fedora"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_FEDORA_TMP_DIR="${T}"
-		-DDATA_DIR="${EPREFIX}"/usr/share
-		-DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
-		-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
-	)
-	cmake_src_configure
-}
diff --git a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild
index a34f0e609639..dd7ce9042911 100644
--- a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild
+++ b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.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"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/definite/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="app-i18n/ibus-table"
diff --git a/app-i18n/ibus-table-others/Manifest b/app-i18n/ibus-table-others/Manifest
index e16a4f871478..ecf7fb7c07cb 100644
--- a/app-i18n/ibus-table-others/Manifest
+++ b/app-i18n/ibus-table-others/Manifest
@@ -1,5 +1,3 @@
 DIST ibus-table-others-1.3.11.tar.gz 662398 BLAKE2B a600535b51b731c482eeecb78b8bff6ca14795e411348ed0e2cd4207ad1a89aed7d338c6b706695dd734f405ee5203e23dfffa370cae12ad763eabf6bbdfe848 SHA512 bfa17338e3a6a3e392bb3e5e5736af9bfa5584a897aea4ca72aec0df2c84dc94a0737f8fb87ced382e6acac3f8169ed2aef93a2f94330a4829048d009cb96ee0
-DIST ibus-table-others-1.3.9.tar.gz 627253 BLAKE2B b4c72ead9364945a3f15a348aa14e0886ebc7c7fd35448d573540ffd9510139630ac22228229ee1a37687e01179a0ec880ce170e84a196b0defe5c059b662583 SHA512 4557ba981a00035226b6cbe0d97ae14df275d3e7c5c453097b85e433a524e00efeebe508621495e63d6ff9cdd590f9d54b51a143147b83e1e3748f05b03d2019
-EBUILD ibus-table-others-1.3.11.ebuild 552 BLAKE2B 1b430d48647bb709d400f599f734b835a924b31c65b8a139435c5ed8d8271aa7c30ba413738aecaccaedfff352ea55e70ba25e69ff5728c89cdd626d1b786b2f SHA512 8e0e686cdf3fbdac487bc9fa31009ff4f9ed60c1959a16219efe95a4ebcac935cde576cbc405963efddd9dcaca1444f89986940a52d2530338e9887871a64eb2
-EBUILD ibus-table-others-1.3.9.ebuild 550 BLAKE2B 00092cd76c017e18c6a51b55b420310f1ffd4857eac41b43ec55d2b3f708d0157b691b598c667874442eefebc47dd98a2652f4a66b514a77a7ed71c06ef5b59e SHA512 771619e90c05391279adf17213e2a66c323dc5927f25a73e1cfdc55886155ebb5f310bf0a81b9b344c1eb500009921092be0203715d696851734ceb110b17624
+EBUILD ibus-table-others-1.3.11.ebuild 550 BLAKE2B 17ad3e0df0cbb970720096eab210c6a594fa8246a13848a571f49b404639e08e1ed3497291e87ce43900e304da17c66961dab70c6874f2daedf0ce2ec74b61fe SHA512 a70c392425112b866ce7f3e7dc77959fe72834ef53c73bd3321d7369136f6dffe85c2ea4fa87c2d692b4c93c672a06ecfd51a9ed9ebad6c21be1113910e072ac
 MISC metadata.xml 642 BLAKE2B 0eb23a3102a282b9ff6e77a623f119ed41d1aff2afada1a32e4124de6b97ad4239bcba7738b9f3663f1277e70972314047a25c6da3a61d04ff7b0f6aa6caa896 SHA512 51b6e52fa107591db67c5ddddee30653475882125228c04ad37729eb7cf09fe9a39e016816177a2793a3bbb51a3001422b3f958c95832055867bfd98ea0367ba
diff --git a/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild b/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild
index 9a293c70f8c3..604b323c7394 100644
--- a/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild
+++ b/app-i18n/ibus-table-others/ibus-table-others-1.3.11.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"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/moebiuscurve/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="app-i18n/ibus-table
diff --git a/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild b/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild
deleted file mode 100644
index c2f63c11cdbc..000000000000
--- a/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Various tables for IBus-Table"
-HOMEPAGE="https://github.com/moebiuscurve/ibus-table-others"
-SRC_URI="https://github.com/moebiuscurve/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-i18n/ibus-table
-	!app-i18n/ibus-table-code
-	!app-i18n/ibus-table-cyrillic
-	!app-i18n/ibus-table-latin
-	!app-i18n/ibus-table-tv"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index 43a627ab6088..4f0b2b1d5f13 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1,5 +1,3 @@
-DIST ibus-table-1.14.0.tar.gz 1450310 BLAKE2B 72a655e378b39324ff849e6941dc28920760d030d748a5b4b0899e14b94874a52581d03ccbef2d72c5eaae51d20a0e19690bde5a1411960347fe49cf3137d21b SHA512 60e570b82c4f05200410e9e4e155089223a20ebcf66d1c039a783108005f63699e75bc528fc30cd370c1400b65e765ade0d069184bd2ab81e2eda9bade2e8ac9
 DIST ibus-table-1.14.1.tar.gz 1451943 BLAKE2B e8fc54daf89aaee813de6788bef9f56a654ffdf4751acf3e2f622d971134c3aba906ca2b106f51b2fa305b8c65fb4db862f57f5f9e3e82a569c5a72e3017e627 SHA512 a658c2d370d173d2fe2f38c02c6b822a17771754ac98a856f954c4c998e90a857f9d54ed652c74159af9545d445001d202e7b5578e7694f8767f928b42db9055
-EBUILD ibus-table-1.14.0.ebuild 1035 BLAKE2B 3d6f6497234af6e53a4095bc5fed4eb26c327efc72ab66133125aa015548d22117a97d4547acea1cd72b176c8eee9c8cbdf85566d87dec87b9d84f872fa92e34 SHA512 846f9911b80ed5230af4957c490f34969f4608ecf6f5011eb4ebd7742bdd5b64493df1b06951dd1edb678a4e8067400b5c6a28f8acdd6728990801e40d6ae29e
-EBUILD ibus-table-1.14.1.ebuild 1037 BLAKE2B ae710df21cae6d1efc385cb6dc2bac6cfc5dc899307a7b983f317d03160d0f7398afeebf2a5e040a422efba2fa98c508ff52fa38205f6b49c1d42191e5dc5c8c SHA512 8f1fa8e7a21ee39a7513413068f4a4e4c8e7e1f53249278b9db6a351caf763e401f70b1b51ef44efde28de9f88fa4116c1663f1de621ec84cf368e6b55768af2
+EBUILD ibus-table-1.14.1.ebuild 1035 BLAKE2B 3d6f6497234af6e53a4095bc5fed4eb26c327efc72ab66133125aa015548d22117a97d4547acea1cd72b176c8eee9c8cbdf85566d87dec87b9d84f872fa92e34 SHA512 846f9911b80ed5230af4957c490f34969f4608ecf6f5011eb4ebd7742bdd5b64493df1b06951dd1edb678a4e8067400b5c6a28f8acdd6728990801e40d6ae29e
 MISC metadata.xml 315 BLAKE2B eeff056ce020201cb6e59f0f160232486fd94cc9de7cc90980155f9ef97988199d592b01190b13b013433853fbc25d9c4e5e29fe33fb74aa4239318cfac312fd SHA512 3329cc73468815ecf7f122ee8e8b81ca7295abcfeab95082841ae460c7ca76fdf2cb3d01b1548795bb525ce855052f512b8b2d77fa3afd302f41c156edf35de0
diff --git a/app-i18n/ibus-table/ibus-table-1.14.0.ebuild b/app-i18n/ibus-table/ibus-table-1.14.0.ebuild
deleted file mode 100644
index 98017235346d..000000000000
--- a/app-i18n/ibus-table/ibus-table-1.14.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit gnome2-utils python-single-r1 xdg
-
-DESCRIPTION="Tables engines for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-RESTRICT="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	virtual/libiconv
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	python_fix_shebang .
-
-	default
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-table/ibus-table-1.14.1.ebuild b/app-i18n/ibus-table/ibus-table-1.14.1.ebuild
index ff60ef200c5d..98017235346d 100644
--- a/app-i18n/ibus-table/ibus-table-1.14.1.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.14.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/ibus-unikey/Manifest b/app-i18n/ibus-unikey/Manifest
index fc14cb8ba793..9815c7e3bbe8 100644
--- a/app-i18n/ibus-unikey/Manifest
+++ b/app-i18n/ibus-unikey/Manifest
@@ -1,4 +1,7 @@
+AUX ibus-unikey-slibtool.patch 578 BLAKE2B 97cca9aa00dc520da9850a197bde0065e3579cc8e4df73fbd9bf837ecc4f1df0c34e2c3339e9da8034fa8e4fbb3674ad8549e9917b448228b6a8f19f60ffed3e SHA512 5b609626d19b41186f309b96c55d7303b5ea1380089c27eeb4bc4cc7d7a07f77bdb33e26d7a642db6e83a74631b65eb4422566604f9cd60d662bcf9842602676
 DIST ibus-unikey-0.6.1-gcc6.patch 31686 BLAKE2B 5d04ba5e66b1a128a04d23e73e20a8e6a269240a07604e71f3e232e0087f0a47d9a4ff6aeaa10a001c5be9b113d8cdc2a917ecc5084d576d6f918b4c699f2ab3 SHA512 9e1b172a904076ba817c7bab80cbbf7d736c078d3ea285cb946be23552ff0f571ca8e0187cac4e5bfecc2b0032512d6f09af4435056d6b653a3648d07356d9b2
 DIST ibus-unikey-0.6.1.tar.gz 516250 BLAKE2B edb5e46df983fe54ce84f778a23814ae946c6ace772d262a06f473013b84d87d3b1293e7faa62f070763ea837eccc08dfde51cf4b23353e84ac1ceca79a44d80 SHA512 f8d519802d9b304cdaebfcee3f9fef5f17756cde48aa48b9dd357d714e2eaaba0df8f91218b658fdd1d85343804e054b7987caff2734913b29dc76263c30d4e6
-EBUILD ibus-unikey-0.6.1-r2.ebuild 838 BLAKE2B 26ba780c17d18916dbf7ac754e07b8d34ecd6095d5d4915c3568357edc5308327c377ba95e06b58a8cf2db047f15ac4f9eb4e6eecc667c009e8b5eed7609ccec SHA512 6bdd0b11d6a2e858fbe9d047c1235f0bc780eae844d5bfbd0292288fe8c80cb6a8604e00c81f83547c6a22466a6567f61828851518be24a5001e1832fc95925d
-MISC metadata.xml 633 BLAKE2B 3cbeee1f9c27a0a29f8cb003210783fca7d8c98f36b660f63b92cd40dfb1ae0c072982d52eca359c35cce60577fd52dd5f5f998421b2e42d8824a4e93b741e9f SHA512 037ad33153a13d18081a79a116a712237fef0060823f47995adf3a5ab30c0b9b02a87114607ab790499bd411b1da2e0a72b030322d1c7110bcb024a64ac30395
+DIST ibus-unikey-0.7.0_beta1.tar.gz 90086 BLAKE2B 450968ce10d5a455a9014cbd2cd9e6cbfbf559ae354dca8ca02b3a010edba4ff56caef7d79d5d80becbc51436e2192a8f9be5e936b606bae8ac65d003431188f SHA512 5e0bc188fe720014071c1c563c7bd3e92bc9e00d063c5c0647a9277fe3e05cb6c00a0aabb33e44ac5d31274f0fb03f495107195432bd7b0a89948ed3ba43d363
+EBUILD ibus-unikey-0.6.1-r2.ebuild 833 BLAKE2B f798e9ba64dc853d94a56c8003a0ebf36c379697489355dcf18f364cbcee825adc98a2924bd3e41beec608125ef51bcd7c4bfd244ec13d228bfe23d1a7aad68a SHA512 cf01f65749455c64b2ecb2225ce119da366ad8182e195187e7d28c502fc997b4e8038518c3d991bae66b2e25758aabdf26a011b1d510658186ddf339c4a4387d
+EBUILD ibus-unikey-0.7.0_beta1.ebuild 754 BLAKE2B 2c603b1321ae988cef8c34ac223bd79b5f62818b4dbedfdabe42c615853f8dad04cd6bf0d9b1288fb5aa3d773bcf1cdfa37b22e40dc1b7d564634f2c6239b1f5 SHA512 476014565c3445b6ae6f26b3045f58e85ca0082db74cf70e732dbf476531585d33b0b50e2c212ae6f9fce8d61da13a4ff78e371833a68c21f57457a6a6766cfb
+MISC metadata.xml 521 BLAKE2B e4def0d06f9ba87e61b682c8d18839725d2ee9f5fb51686be6ec5cd5dd9152d95063559ed12c9f4bcd106cc2e2b6aef97dcf51e337b603f3781b343e0072e822 SHA512 a1436b1b0c957a93eccdbf01b34b3f3bfd9772f02e1b646a867dba02beae6cb236a8cd071f42d91dd37160758de7fa139abbc2469600465c65027a04e95904ef
diff --git a/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch b/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch
new file mode 100644
index 000000000000..02551ba608fb
--- /dev/null
+++ b/app-i18n/ibus-unikey/files/ibus-unikey-slibtool.patch
@@ -0,0 +1,27 @@
+--- a/setup/Makefile.am
++++ b/setup/Makefile.am
+@@ -34,7 +34,8 @@
+ 
+ ibus_setup_unikey_LDFLAGS = \
+     @IBUS_LIBS@ \
+-    @GTK_LIBS@ \
++    @GTK_LIBS@
++
++ibus_setup_unikey_LDADD = \
+     $(top_builddir)/ukengine/libunikey-ibus.la \
+     $(top_builddir)/src/ibus_engine_unikey-utils.o
+-
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -25,8 +25,9 @@
+ 
+ ibus_engine_unikey_LDFLAGS = \
+ 	@IBUS_LIBS@ \
+-	@X11_LIBS@ \
+-	$(top_builddir)/ukengine/libunikey-ibus.la
++	@X11_LIBS@
++
++ibus_engine_unikey_LDADD = $(top_builddir)/ukengine/libunikey-ibus.la
+ 
+ component_DATA = unikey.xml
+ 
diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
index 63c9b7f58158..bbe901807543 100644
--- a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
+++ b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
@@ -1,35 +1,41 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
+
+inherit autotools
 
 DESCRIPTION="Vietnamese UniKey engine for IBus"
-HOMEPAGE="https://github.com/mrlequoctuan/ibus-unikey"
+HOMEPAGE="https://github.com/vn-input/ibus-unikey"
 SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz
 	https://dev.gentoo.org/~dlan/distfiles/${P}-gcc6.patch"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+gtk gtk2 nls"
-REQUIRED_USE="gtk2? ( gtk )"
+IUSE="nls"
 
 RDEPEND="app-i18n/ibus
 	x11-libs/libX11
-	gtk? (
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3 )
-	)
+	x11-libs/gtk+:3
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
 	dev-util/intltool
 	nls? ( sys-devel/gettext )"
 
-PATCHES=( "${DISTDIR}"/${P}-gcc6.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-slibtool.patch
+	"${DISTDIR}"/${P}-gcc6.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		--with-gtk-version=$(usex gtk2 3 2)
+		--with-gtk-version=3
 }
diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild
new file mode 100644
index 000000000000..2aa330c6d61e
--- /dev/null
+++ b/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake gnome2-utils
+
+DESCRIPTION="Vietnamese UniKey engine for IBus"
+HOMEPAGE="https://github.com/vn-input/ibus-unikey"
+SRC_URI="https://github.com/vn-input/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus
+	x11-libs/gtk+:3
+	virtual/libintl"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	sys-devel/gettext"
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGSETTINGS_COMPILE=OFF
+	)
+	cmake_src_configure
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-unikey/metadata.xml b/app-i18n/ibus-unikey/metadata.xml
index 90fe49a86ca3..f0eec6b726a9 100644
--- a/app-i18n/ibus-unikey/metadata.xml
+++ b/app-i18n/ibus-unikey/metadata.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <longdescription lang="en">
-    The UniKey engine for IBus. It provides a Vietnamese input method using
-    UniKey. Support via forum at: http://forum.ubuntu-vn.com/viewforum.php?f=85
-  </longdescription>
-  <use>
-    <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">mrlequoctuan/ibus-unikey</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">
+		The UniKey engine for IBus. It provides a Vietnamese input method using
+		UniKey. Support via forum at: http://forum.ubuntu-vn.com/viewforum.php?f=85
+	</longdescription>
+	<upstream>
+		<remote-id type="github">vn-input/ibus-unikey</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/libkkc-data/Manifest b/app-i18n/libkkc-data/Manifest
new file mode 100644
index 000000000000..90a1eab9907b
--- /dev/null
+++ b/app-i18n/libkkc-data/Manifest
@@ -0,0 +1,4 @@
+AUX libkkc-data-python3.patch 5566 BLAKE2B 6f7fdb8d7157f44e5d73521d2f5ca446729cedfcaa37b85c4f4b06bf063ac59eac4c803422f482cdef460b2025cdd9b8af8f26a3a56ecb38bfd10b49fb19e497 SHA512 3c353ad81fc7f7e773e7a1dfd3b488891c1ac6624e1abfdbf7c66d7a021a302e96e06d358bc1bb0587ddd413d23cf02efbb1b232a2dce03fe56aa744b80efef4
+DIST libkkc-data-0.2.7.tar.xz 22262552 BLAKE2B 2c735ee9fabf8f8f201591c9ed584cece22ddcd15da5f36b39bb422b1bce1dbcbcd66f71b5713e2dd4c5e2862b06b014c24a4a3db63c86ecee20519434da9261 SHA512 61c0cd8c0fa41ed8df49cac6709eebb245cc965d7e192b1ba945e95f2fc46aca8aa48c16e1977a12c157c55dab6b9f4c30f4905806725eca6e697b762eb7cbd7
+EBUILD libkkc-data-0.2.7.ebuild 522 BLAKE2B 3487d56f9c52e8b16c28e2788e6e7d97080916c60f74bf8d99e8a3aee1d4fed909e3465e385d86fae3415b92cf817d59298f1e7f0392ce1cdc70ffccf83f4f81 SHA512 2fe14d480f674c1cbcfaa01faab181b732f1664bf7cfeb91632a7c4fb306d49c056fc8d2bdd3a4ad88c39e0b51ef633bed36a5f55c2656df8fd28fccf3115562
+MISC metadata.xml 311 BLAKE2B caecd09cb85c028dbe6478523352bfaa1c577a93b747a39c4eafe68f7d154bb191320cb079e6cf288b59a5298a7953d0fd4d9ad3ab4a8973a5f6d04479e6222f SHA512 2ba94abaadf513ede547763494675f10a8d897be296937a9bff0ab97af7267f5213f4057d5b8a6127c913ecf4752661c4b873ee1cbda337002168a5dd1969c44
diff --git a/app-i18n/libkkc-data/files/libkkc-data-python3.patch b/app-i18n/libkkc-data/files/libkkc-data-python3.patch
new file mode 100644
index 000000000000..46109a92dff8
--- /dev/null
+++ b/app-i18n/libkkc-data/files/libkkc-data-python3.patch
@@ -0,0 +1,138 @@
+From ba1c1bd3eb86d887fc3689c3142732658071b5f7 Mon Sep 17 00:00:00 2001
+From: Takao Fujiwara <tfujiwar@redhat.com>
+Date: Mon, 30 Jul 2018 15:26:37 +0900
+Subject: [PATCH] build: Enable python3
+
+---
+ tools/genfilter.py | 18 +++++++--------
+ tools/sortlm.py    | 23 ++++++++-----------
+ 2 files changed, 19 insertions(+), 22 deletions(-)
+
+diff --git a/tools/genfilter.py b/tools/genfilter.py
+index 5ffab32..0c5f75a 100644
+--- a/tools/genfilter.py
++++ b/tools/genfilter.py
+@@ -84,24 +84,24 @@ def __init__(self, infile, outfile, record_size):
+ 
+     def generate(self):
+         size = os.fstat(self.infile.fileno()).st_size
+-        n = size / self.record_size
++        n = size // self.record_size
+         m = int(math.ceil(-n*math.log10(ERROR_RATE) /
+                           math.pow(math.log10(2), 2)))
+-        m = (m/8 + 1)*8
++        m = (m//8 + 1)*8
+         inmem = mmap.mmap(self.infile.fileno(),
+                           size,
+                           access=mmap.ACCESS_READ)
+-        outmem = bytearray(m/8)
+-        for i in xrange(0, n):
++        outmem = bytearray(m//8)
++        for i in range(0, n):
+             offset = i*self.record_size
+             b0, b1 = struct.unpack("=LL", inmem[offset:offset+8])
+-            for k in xrange(0, 4):
++            for k in range(0, 4):
+                 h = murmur_hash3_32(b0, b1, k)
+                 h = int(h * (m / float(0xFFFFFFFF)))
+-                outmem[h/8] |= (1 << (h%8))
++                outmem[h//8] |= (1 << (h%8))
+         inmem.close()
+-        # Convert bytearray to str, for Python 2.6 compatibility.
+-        self.outfile.write(str(outmem))
++        # Convert bytearray to bytes, for Python 3 compatibility.
++        self.outfile.write(bytes(outmem))
+ 
+ if __name__ == '__main__':
+     import sys
+@@ -110,7 +110,7 @@ def generate(self):
+     parser = argparse.ArgumentParser(description='filter')
+     parser.add_argument('infile', type=argparse.FileType('r'),
+                         help='input file')
+-    parser.add_argument('outfile', type=argparse.FileType('w'),
++    parser.add_argument('outfile', type=argparse.FileType('wb'),
+                         help='output file')
+     parser.add_argument('record_size', type=int,
+                         help='record size')
+diff --git a/tools/sortlm.py b/tools/sortlm.py
+index a0dd8fe..40f0837 100644
+--- a/tools/sortlm.py
++++ b/tools/sortlm.py
+@@ -40,10 +40,10 @@ def __init__(self, infile, output_prefix):
+         self.__min_cost = 0.0
+ 
+     def read(self):
+-        print "reading N-grams"
++        print("reading N-grams")
+         self.__read_tries()
+         self.__read_ngrams()
+-        print "min cost = %lf" % self.__min_cost
++        print("min cost = %lf" % self.__min_cost)
+ 
+     def __read_tries(self):
+         while True:
+@@ -58,7 +58,7 @@ def __read_tries(self):
+             line = self.__infile.readline()
+             if line == "":
+                 break
+-            line = line.strip()
++            line = line.strip('\n')
+             if line == "":
+                 break
+             match = self.__ngram_line_regex.match(line)
+@@ -89,7 +89,7 @@ def __read_ngrams(self):
+                 line = self.__infile.readline()
+                 if line == "":
+                     break
+-                line = line.strip()
++                line = line.strip('\n')
+                 if line == "":
+                     break
+                 match = self.__ngram_line_regex.match(line)
+@@ -125,14 +125,11 @@ def __write_ngrams(self):
+         def quantize(cost, min_cost):
+             return max(0, min(65535, int(cost * 65535 / min_cost)))
+ 
+-        def cmp_header(a, b):
+-            return cmp(a[0], b[0])
+-
+-        print "writing 1-gram file"
++        print("writing 1-gram file")
+         unigram_offsets = {}
+         unigram_file = open("%s.1gram" % self.__output_prefix, "wb")
+         offset = 0
+-        for ids, value in sorted(self.__ngram_entries[0].iteritems()):
++        for ids, value in sorted(self.__ngram_entries[0].items()):
+             unigram_offsets[ids[0]] = offset
+             s = struct.pack("=HHH",
+                             quantize(value[0], self.__min_cost),
+@@ -143,13 +140,13 @@ def cmp_header(a, b):
+             offset += 1
+         unigram_file.close()
+ 
+-        print "writing 2-gram file"
++        print("writing 2-gram file")
+         bigram_offsets = {}
+         bigram_file = open("%s.2gram" % self.__output_prefix, "wb")
+         keys = self.__ngram_entries[1].keys()
+         items = [(struct.pack("=LL", ids[1], unigram_offsets[ids[0]]), ids) for ids in keys]
+         offset = 0
+-        for header, ids in sorted(items, cmp=cmp_header):
++        for header, ids in sorted(items, key=lambda x: x[0]):
+             value = self.__ngram_entries[1][ids]
+             bigram_offsets[ids] = offset
+             s = struct.pack("=HH",
+@@ -160,11 +157,11 @@ def cmp_header(a, b):
+         bigram_file.close()
+ 
+         if len(self.__ngram_entries[2]) > 0:
+-            print "writing 3-gram file"
++            print("writing 3-gram file")
+             trigram_file = open("%s.3gram" % self.__output_prefix, "wb")
+             keys = self.__ngram_entries[2].keys()
+             items = [(struct.pack("=LL", ids[2], bigram_offsets[(ids[0], ids[1])]), ids) for ids in keys]
+-            for header, ids in sorted(items, cmp=cmp_header):
++            for header, ids in sorted(items, key=lambda x: x[0]):
+                 value = self.__ngram_entries[2][ids]
+                 s = struct.pack("=H",
+                                 quantize(value[0], self.__min_cost))
diff --git a/app-i18n/libkkc-data/libkkc-data-0.2.7.ebuild b/app-i18n/libkkc-data/libkkc-data-0.2.7.ebuild
new file mode 100644
index 000000000000..cde6550d2441
--- /dev/null
+++ b/app-i18n/libkkc-data/libkkc-data-0.2.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-any-r1
+
+DESCRIPTION="Language model data for libkkc"
+HOMEPAGE="https://github.com/ueno/libkkc"
+SRC_URI="https://github.com/ueno/${PN%-*}/releases/download/v0.3.5/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=""
+BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')"
+
+PATCHES=( "${FILESDIR}"/${PN}-python3.patch )
diff --git a/app-i18n/libkkc-data/metadata.xml b/app-i18n/libkkc-data/metadata.xml
new file mode 100644
index 000000000000..6853c12be89d
--- /dev/null
+++ b/app-i18n/libkkc-data/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ueno/libkkc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/libkkc/Manifest b/app-i18n/libkkc/Manifest
index 46681b867e67..0b335e9eac0f 100644
--- a/app-i18n/libkkc/Manifest
+++ b/app-i18n/libkkc/Manifest
@@ -1,4 +1,5 @@
-DIST libkkc-0.3.6_pre20190809104047.tar.gz 389976 BLAKE2B 03c43384f4f1f0e48a3eec2afb9f90a39e42469439a7dbc06692e020d83b8362f19c41ea8960cd5147edca04dcf67be5e74315f494dd017a6ce018f217b6a5a7 SHA512 87c5294900b29e4b2225c24ee744c619691a5f25edc453c2ece44133695a8d0e1a1a07bb5a00d615cc95057ae5b451c845c7ce476df555e025097c38aff87a69
-EBUILD libkkc-0.3.6_pre20190809104047.ebuild 1514 BLAKE2B 2c812e21be1734a9403ea270be1c815bfa7aad6b9e689a71ae97d731bcf07e7cc6d6efa43b32450f546c8540f4e8247c7066f3d7bed0946a6625c552db601a0f SHA512 b1b04062b2e8ad9f8220b99dc8e21baf87918951b99b11f2664349a6b0e38dcd28ac4777bd32a965b5e0f96f02d4e830874965e6635711626cced3ec2e6f8d93
-EBUILD libkkc-9999.ebuild 1463 BLAKE2B d584b34083dda535e540197f39a519b60f16ee1b1192b433945e44e07f79a805d5b4ab548c0d6e783df0959312eded5ba629a468eadbec5d2ef9115e8929414b SHA512 98459cbeb3a17a2affb401f180ad52a8cc7892accc5ae7fe1a66717dec6743a96de96fc921bc42e3b196ab3b156ad901d1ec31f9323424d4f30d48b7c4626537
+AUX libkkc-marisa-glib.patch 714 BLAKE2B dfe2c8c3f3fe0de904678a21890d99c548d08c2f79c9a2a5bf54080529336a0afe9ad1ef613fd1c2a2b692a3de6edd17e15a7434cb4c677660c035badc303c2a SHA512 b5f5f2158329b883709242bf7415fe91d1637f1ae6f8620ddf1b872b652292bda237b92ff1c0595168f3eb2b9b33cb48e33f02bcebd031081f2dff0b8493509f
+DIST libkkc-0.3.5_p20210928.tar.gz 390022 BLAKE2B d4b44861f4526f4f9581cd9343fb4d8dd361967cce153ab92fb9a3334502bd583081d4ae3c01879c94aee710d347c23d3372c0deb20d711b9792eb73a28b3beb SHA512 9c46ef09242ecf3d4864fff0e7df7ff362d71c382bb92fe1e784bd20bdf737dc6a528b57342093ab4415926b15f09db44a10b8088d1c9f8b9cebcb428aaee8c6
+EBUILD libkkc-0.3.5_p20210928.ebuild 1506 BLAKE2B 85943d5a57b656474f946449f72c2d9b8ad6c99345d2740bf34da023a4c8733e31a8e059c0bdb54bb7b44f701faacdc018b72c36b2697331596dc33c5fcd0c71 SHA512 f846510ef6de2f1cf2673ac62f9a068bac1b7fe27a38d2d7e8097c06526d45e507e0102022f6607b9a4e2d40b6929bed94ccedb755f9c93a06694c49449804ff
+EBUILD libkkc-9999.ebuild 1455 BLAKE2B 1fb2ca9fb62b7146abe5da7e49f11463824b5b83c8f8d99b572183d017b62e3983793c4745ffc1d8e45f82b7dcf8e76414644943d9d627c8032da3f68f1eec2b SHA512 52bd3c5257d28ae2a62b1c873d9f378cffa7007c77fe168a8decc7ed817d8eeca7fef5b82f82bdf431046290f1075c0432bbc936fc332aaf465412d02dcb3d46
 MISC metadata.xml 459 BLAKE2B fa914e2f676f1065402ac064f0253cd3ad5a97af0fa72f333bf312b033a1d8c7c40be04f6d9626afa4ad0b67c5cdfd6da4c75e0d261cfafcbe5010e8c994e4ec SHA512 8483db54ccb88733e541875f527350354c48bb258b7a7eb18f8d092eb4a1906082072178ad9ab371039dfc8dd2b2727dc4c269e5089f648a0bd03a3ee1233bf7
diff --git a/app-i18n/libkkc/files/libkkc-marisa-glib.patch b/app-i18n/libkkc/files/libkkc-marisa-glib.patch
new file mode 100644
index 000000000000..2b013d4f5779
--- /dev/null
+++ b/app-i18n/libkkc/files/libkkc-marisa-glib.patch
@@ -0,0 +1,23 @@
+--- a/libkkc/Makefile.am
++++ b/libkkc/Makefile.am
+@@ -49,7 +49,11 @@
+ 	-DLOCALEDIR=\"$(datadir)/locale\"	\
+ 	-I $(top_srcdir)			\
+ 	$(NULL)
+-libkkc_la_LIBADD = $(LIBKKC_LIBS) $(top_builddir)/marisa-glib/libmarisa-glib.la
++libkkc_la_LIBADD =					\
++	$(LIBKKC_LIBS)					\
++	$(top_builddir)/marisa-glib/libmarisa-glib.la	\
++	$(MARISA_GLIB_STATIC_DEPENDENCIES)		\
++	$(NULL)
+ libkkc_la_LDFLAGS =							\
+ 	$(CODE_COVERAGE_LDFLAGS)					\
+ 	-version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)"	\
+@@ -66,7 +70,6 @@
+ libkkc_internals_la_LIBADD =			\
+ 	$(libkkc_la_LIBADD)			\
+ 	$(libkkc_la_OBJECTS)			\
+-	$(MARISA_GLIB_STATIC_DEPENDENCIES)	\
+ 	$(NULL)
+ libkkc_internals_la_LDFLAGS =			\
+ 	$(CODE_COVERAGE_LDFLAGS)		\
diff --git a/app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild b/app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild
new file mode 100644
index 000000000000..fec5bceb750c
--- /dev/null
+++ b/app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit autotools python-any-r1 vala
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ueno/libkkc"
+elif [[ "${PV}" == *_p* ]]; then
+	inherit vcs-snapshot
+
+	EGIT_COMMIT="cdcaf4dceaf273bfe7b018a4a651a92f786c6ec6"
+fi
+
+DESCRIPTION="Japanese Kana Kanji conversion input method library"
+HOMEPAGE="https://github.com/ueno/libkkc"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+elif [[ "${PV}" == *_p* ]]; then
+	SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+else
+	SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls static-libs"
+
+RDEPEND="app-i18n/libkkc-data
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	dev-libs/marisa
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')
+	$(vala_depend)
+	dev-libs/gobject-introspection
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch )
+
+python_check_deps() {
+	has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	vala_src_prepare
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild
deleted file mode 100644
index d563af26c2cd..000000000000
--- a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2013-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-
-inherit autotools python-any-r1 vala
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/ueno/libkkc"
-elif [[ "${PV}" == *_pre* ]]; then
-	LIBKKC_GIT_REVISION="b2e5a152980ee627c39ca8a49082e6df7694b8fc"
-fi
-
-DESCRIPTION="Japanese Kana Kanji conversion input method library"
-HOMEPAGE="https://github.com/ueno/libkkc"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-elif [[ "${PV}" == *_pre* ]]; then
-	SRC_URI="https://github.com/ueno/${PN}/archive/${LIBKKC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls static-libs"
-
-BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')
-	$(vala_depend)
-	dev-libs/gobject-introspection
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-DEPEND="dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libgee:0.8
-	dev-libs/marisa
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"
-
-if [[ "${PV}" == *_pre* ]]; then
-	S="${WORKDIR}/libkkc-${LIBKKC_GIT_REVISION}"
-fi
-
-python_check_deps() {
-	has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-	vala_src_prepare
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/app-i18n/libkkc/libkkc-9999.ebuild b/app-i18n/libkkc/libkkc-9999.ebuild
index 1743990197eb..cbad641cc798 100644
--- a/app-i18n/libkkc/libkkc-9999.ebuild
+++ b/app-i18n/libkkc/libkkc-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2013-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit autotools python-any-r1 vala
 
@@ -10,16 +10,18 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/ueno/libkkc"
-elif [[ "${PV}" == *_pre* ]]; then
-	LIBKKC_GIT_REVISION=""
+elif [[ "${PV}" == *_p* ]]; then
+	inherit vcs-snapshot
+
+	EGIT_COMMIT=""
 fi
 
 DESCRIPTION="Japanese Kana Kanji conversion input method library"
 HOMEPAGE="https://github.com/ueno/libkkc"
 if [[ "${PV}" == "9999" ]]; then
 	SRC_URI=""
-elif [[ "${PV}" == *_pre* ]]; then
-	SRC_URI="https://github.com/ueno/${PN}/archive/${LIBKKC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+elif [[ "${PV}" == *_p* ]]; then
+	SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 else
 	SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
 fi
@@ -29,30 +31,29 @@ SLOT="0"
 KEYWORDS=""
 IUSE="nls static-libs"
 
+RDEPEND="app-i18n/linkkc-data
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	dev-libs/marisa
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
 BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]')
 	$(vala_depend)
 	dev-libs/gobject-introspection
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
-DEPEND="dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libgee:0.8
-	dev-libs/marisa
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"
 
-if [[ "${PV}" == *_pre* ]]; then
-	S="${WORKDIR}/libkkc-${LIBKKC_GIT_REVISION}"
-fi
+PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch )
 
 python_check_deps() {
 	has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]"
 }
 
 src_prepare() {
+	vala_src_prepare
 	default
 	eautoreconf
-	vala_src_prepare
 }
 
 src_configure() {
diff --git a/app-i18n/libskk/Manifest b/app-i18n/libskk/Manifest
index 6ebbd6bc7477..44c9a131c321 100644
--- a/app-i18n/libskk/Manifest
+++ b/app-i18n/libskk/Manifest
@@ -1,5 +1,5 @@
-DIST libskk-1.0.2.tar.gz 867572 BLAKE2B 32f599e83bf7ced796d2f37f6f4bf5e45f47c90e144784b7b3e082866cc619a26e3aca4f16051685baa4d8ac54b0462930193f978bc1e8220b378679269c5833 SHA512 f8fff94b216c18f66bf1004ee068f8d737177f1b70ac36d054d9a68ce02ba9b8d1b7b4127d9a330f64054b2fe06f352070c750a3562d4be36fecf20cb854e6c0
 DIST libskk-1.0.5.tar.xz 564488 BLAKE2B e7108bd2f44e5a0a0756cd25da4b07376b36604d6d2159b283e8a5f4ef76006210ff993d58b653cbce01ae4c9e003acf4acbd93ebc40711fec2600e514c49e9f SHA512 6db675edba89b83da0c29afb42644c39bcb0ccfc47f067a18e0eda817df4f58a86c86e8747080018c132d8734754a6fd8a30fe6578050eb93ff636edeed534ab
-EBUILD libskk-1.0.2.ebuild 1003 BLAKE2B 07baeb3e83de3b216fc0907650ab26c1fc4b27e4716e491c69f5fd7efd1d7ffbfc1a4af31fb65acd9427fdb76ed95cf0ed5cdce7a011718238409aff10ab7e39 SHA512 47b42411854c92f92e33539bd98d40b6ce021d1eb3f541c506cbd9c0020c65ec95e0d4345733c6c0ab9bb6ea3ce94cde9af6970b02d85ea476348e6688ad3c7c
-EBUILD libskk-1.0.5.ebuild 1009 BLAKE2B 2aa468ec81a2e21308128f5cd7d7040e7a94641a1b2dd4d05eeddfb1542ffafc73fd1c2cadc9282c07dc5408029a109324a35ab7c413c4cfd00ff265df7ba6ef SHA512 a3020515616d84e13604803a7d4c29f1b05ee337945e26f14e9a771cae2588c2761483bfaa1ed98280bde890513a805c817f8c21b69002b58b6558dfe58fe870
+DIST libskk-1.0.5_p20210830.tar.gz 190676 BLAKE2B 6b9f058669929efb292692b5047084e2e95e2003a9ecd093205b198bf201249811f672d74e8ee283e6b1f5a94b6a72c79dddb12c950ffe6958ca6aef3aaea5d9 SHA512 2a34111627a43de2d854e2236fd69ec5577b162b097b6e964b891cf09eafaed0d9c3f657bcb1f78ec985a3e2adbed079d37e5e873d1ec35e5f7c66960135ee2b
+EBUILD libskk-1.0.5.ebuild 1016 BLAKE2B 2806873aca5f24aaa5e0bf666e73aab9566ef50abf51d4b7c9c6f450f940be3241510b066c262ad4e573c7b9ec4b5d47962bc5250197e68ac40cb27d63f72ccc SHA512 3beeb39d0f1d228a9896d71f7f322fc5775e563fcffc7064d3465295768c713c804c96cf7b0ba460842bae723dbda5dd1c55f8ee9c9003e21be41d0e362cc842
+EBUILD libskk-1.0.5_p20210830.ebuild 1119 BLAKE2B d3d59524631296315def98905ea750bbac050bdef6bf4b24043b9875730295bfa8eabcbd40d9b51945304be6a20e679808b1d24bed6edc25a5c253d0fc53d320 SHA512 b779761cbb891a11dbcf0f363c602cf61006b595acaed3b281eb9c3b6837acd12ae7a03bd492e27aa2b47d5495428cd5e90649886bbeb136db7a5fa5c18af67e
 MISC metadata.xml 311 BLAKE2B c3d3e6eec52aafdd92e37f4fdc850b22d5bc13ca6adf24954f53d13f67d7acaa60a2e8fc74627c442617ec860ba02b614195a49f48551c937addda7b3732c44d SHA512 72e6be18642179d25f2eac33df667891cee4d571ffaf49f823fb31e2605cec2e8dac3b07e9aadc6080fccf96f09f8677421ee71dec0af8ae7178bca1991ffda7
diff --git a/app-i18n/libskk/libskk-1.0.2.ebuild b/app-i18n/libskk/libskk-1.0.2.ebuild
deleted file mode 100644
index 593469dc3036..000000000000
--- a/app-i18n/libskk/libskk-1.0.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit vala virtualx
-
-DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
-HOMEPAGE="https://github.com/ueno/libskk"
-SRC_URI="https://github.com/ueno/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+introspection nls static-libs"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libgee:0.8
-	introspection? ( dev-libs/gobject-introspection )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable introspection) \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	export GSETTINGS_BACKEND="memory"
-	virtx emake check
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-i18n/libskk/libskk-1.0.5.ebuild b/app-i18n/libskk/libskk-1.0.5.ebuild
index eab92a1f7f0c..3d761d619f7c 100644
--- a/app-i18n/libskk/libskk-1.0.5.ebuild
+++ b/app-i18n/libskk/libskk-1.0.5.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,7 +11,7 @@ SRC_URI="https://github.com/ueno/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+introspection nls static-libs"
 
 RDEPEND="dev-libs/glib:2
@@ -20,8 +20,8 @@ RDEPEND="dev-libs/glib:2
 	x11-libs/libxkbcommon
 	introspection? ( dev-libs/gobject-introspection )
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	$(vala_depend)
+DEPEND="${RDEPEND}"
+BDEPEND="$(vala_depend)
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
diff --git a/app-i18n/libskk/libskk-1.0.5_p20210830.ebuild b/app-i18n/libskk/libskk-1.0.5_p20210830.ebuild
new file mode 100644
index 000000000000..b0caa5c5a713
--- /dev/null
+++ b/app-i18n/libskk/libskk-1.0.5_p20210830.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools vala vcs-snapshot virtualx
+
+EGIT_COMMIT="5f5e5c2d3facfec9f577fb66032e6f1994ed5d44"
+
+DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
+HOMEPAGE="https://github.com/ueno/libskk"
+SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection nls static-libs"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	x11-libs/libxkbcommon
+	introspection? ( dev-libs/gobject-introspection )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="$(vala_depend)
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	export GSETTINGS_BACKEND="memory"
+	virtx emake check
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-i18n/tomoe-gtk/Manifest b/app-i18n/tomoe-gtk/Manifest
index 57d57dbe1c8f..c03d87fb654f 100644
--- a/app-i18n/tomoe-gtk/Manifest
+++ b/app-i18n/tomoe-gtk/Manifest
@@ -1,3 +1,4 @@
+AUX tomoe-gtk-math.patch 372 BLAKE2B 216e5872cbb6bdf031de53e0a8eda691c11ffc146b73bc1e46ac699acf7d55bea9f357ce531d462935dfbd6e6a27c451ef5f37a0e3faab573bdbb5474a76b362 SHA512 25188c72aaf884ad0c004a4b5a6261cb5a637be35036db7c4473f6ec4ba1d50d049d1df5e52105a4ae600e0b6db7041ca9f30384aa5f24de6697e02ab708da98
 DIST tomoe-gtk-0.6.0.tar.gz 448058 BLAKE2B 06db81c971bf06ae1b625afb90950e7a76ad2acfb6abf038ce0c6114c4f7bc42a76a7f07dc848cfa5e6aef3039e6bab32b0d7496fea1fb67bf936b5f9631a130 SHA512 caa9b79edde7885e00d939cb3de30b32da0c1c8a7d803e26c756ee0695f7e15bee241036b1125f838e72e016f4bee9736a398108fff0eed20f1fdb86d221dc43
-EBUILD tomoe-gtk-0.6.0-r6.ebuild 629 BLAKE2B 236e1b56c61c80bbb5cb687e45dcbab9ce3bc7b2c40bbd36e68fbc0ce883caab022f5df4acc821c0014ed03972b86fa22b882496ecee764933005bb136735f21 SHA512 ec741125c8de534e68679d086347a639a0a0f9fdcd9d93f8529349c7cdcc7ad0d449eb0e9ab0dae55bceaa2ed573fd709674350a52d435ca10a0f026d666672c
+EBUILD tomoe-gtk-0.6.0-r7.ebuild 752 BLAKE2B ed58579e63f289b82feb6477f298f7f68781ce99071aa6e758272b367e75087922191e04a8ca9b9b5a8bbaa89e4df98ac5370935d6892149336f7b33423e04a1 SHA512 b1ac593e6ab861eacd07c380cf03737eaa20226c0ecbed9432cfeba61ccd8b6b86c4bc2ceee8c1a76529191041504f8f8d1cc1c4482b6a783ef423a964680122
 MISC metadata.xml 363 BLAKE2B 3f2700b284429a05f2cf8d8b71b40dfa7ddfe91299664dc4611435aa1961a0569e23c5629813dfa125919b2ec9c16e22c13e77a3ad1b1ba5d986443084f16f5e SHA512 bcf9d68e9cce5b55ceae76133bb59842467b90ba84b1acf31656ee9379d8830d9cfe4e66388c3ff5b653d59279ded89dbb1b9f4b649b83cf32390e90cf5ba9e7
diff --git a/app-i18n/tomoe-gtk/files/tomoe-gtk-math.patch b/app-i18n/tomoe-gtk/files/tomoe-gtk-math.patch
new file mode 100644
index 000000000000..05fba04a194d
--- /dev/null
+++ b/app-i18n/tomoe-gtk/files/tomoe-gtk-math.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -4,7 +4,7 @@
+ 	-DTOMOEGTKDATADIR=\""$(datadir)"/$(PACKAGE)\"
+ 
+ INCLUDES = $(GTK2_CFLAGS) $(TOMOE_CFLAGS) $(GUCHARMAP_CFLAGS)
+-LIBS     = $(GTK2_LIBS)   $(TOMOE_LIBS)   $(GUCHARMAP_LIBS)
++LIBS     = $(GTK2_LIBS)   $(TOMOE_LIBS)   $(GUCHARMAP_LIBS)   -lm
+ 
+ lib_LTLIBRARIES = libtomoe-gtk.la
+ libtomoe_gtk_la_SOURCES =						\
diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild
deleted file mode 100644
index 24a7bebf2397..000000000000
--- a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Tomoe GTK+ interface widget library"
-HOMEPAGE="http://tomoe.osdn.jp/"
-SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-i18n/tomoe
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-util/glib-utils
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-static \
-		--without-python \
-		--without-gucharmap
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r7.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r7.ebuild
new file mode 100644
index 000000000000..e18c92f169e5
--- /dev/null
+++ b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="Tomoe GTK+ interface widget library"
+HOMEPAGE="http://tomoe.osdn.jp/"
+SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="app-i18n/tomoe
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/glib-utils
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-math.patch )
+
+AT_M4DIR="macros"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--without-python \
+		--without-gucharmap
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-i18n/tomoe/Manifest b/app-i18n/tomoe/Manifest
index 3e6112ac7cfa..7ee27ed4b65b 100644
--- a/app-i18n/tomoe/Manifest
+++ b/app-i18n/tomoe/Manifest
@@ -1,8 +1,8 @@
 AUX tomoe-export-symbols.patch 8483 BLAKE2B 45a7ce461400256809275d626bcf7c3d4b1201be2a07f7db2c77b94059e11b5026cdd060cc7e2f57a1c1d60498ca266218b3c26356dd27447f00bc8fd090b107 SHA512 32caa46e10d2c1885e7d850f7ecb3ac79a4754156100e4db68e87f1614b0d9db71fde6af9d8520f337143bf2a3e6f3fe1f6e7e83f1c066552238a2a2c3d3bba5
 AUX tomoe-gentoo.patch 599 BLAKE2B d297c41007f17ac07f6a80fb451c2d605ebf275b64af96b81e31875ff2ce065684d78e60610627b2295195b024813b3d02b2327a3c06c38e992d7e78361f897a SHA512 50b573c046f9b98c64bfd8e0320f7d4d7f4c113d6cc5368fbaa68575d199ce269bfc8827709a6565f244a1b6e82e220db7309570a022c30ad03c51317110030b
 AUX tomoe-glib-2.32.patch 688 BLAKE2B 5aeb0fa73f54331e20d8a3cd360a4e7c06e770f988686bd3ddd055b49390abd1c064a9369d89c7a4f6cd6c9631a075ba56857b0db54befeace96c233cf9e7947 SHA512 ec0344ccb48ecc8f0df3a76424ed93c9e223a3b22733626a460c4729681d7f9f072ddb84311d22e161c04503dd845c7da774ea9832df32cb79199ca47589073c
-AUX tomoe-glibc-2.32.patch 321 BLAKE2B 538417b3af4fd1664835760c1dd01ebb51ed6fb041e48f684c0463a084ce66e377ac390075cc165c8ad0836d9c9da2516d7911598c73d9123f6ed5b7154b10b8 SHA512 b4b0675eab9c34cd4e662d6dfb025680bb165354ea0785dad6ef4de83a3bd1a7afa2aae1d371e8fd30324c721ef5a89e324913ffd77b583a62da25fe1ab8a348
+AUX tomoe-glibc-2.32.patch 323 BLAKE2B 8d62be869d65fd66c632e9fed7eaa21cc64a6d9ebde742c00201c30bf0872213192e900d91ce04b30695b2743fc85247d2e8afe3227f8495474e20ff227a77d4 SHA512 a3d7fa84e661c44b264e93fdd7e47c238ae548c79a15a3582b38f287c523fe36229e95ecd8a01bb33ea2fb88e0a891e630094fc3bac238b4d5ede3a9249056d1
 AUX tomoe-ruby19.patch 2646 BLAKE2B 7b2289af7e87946bb9c4cb197b493bc2b8625a3bc3f22ee42270a403bd36b1bee4efcbb46117f11d537e3c8a38dfbcfca6484c0a1db6ec2f0b7a5469dac35b47 SHA512 52f555412853c3485e8d3ab7b7739f030e2c3d2b5c4aac14ebb967c93427fe04cbcfec2f5997f09f0f7611dc268ee63437b256ef4cac1ea805f0ae84a522b836
 DIST tomoe-0.6.0.tar.gz 4918949 BLAKE2B c9f4accc77fe7c6214c4d19dbbac7d0d39ed7947588ab1b8a1416f6cfeda33a6cfa84352f888d02848c8e2026bd5c36d2fe52d099bda6ca41a6d215733b11aa3 SHA512 eab618d7b28fc9613c175fab6f80fc7d6acc34af3a47f20c11b42a32acd87143ae10caca67fa1a5e2e75441d431799a5725a5d507604f8bd7447bbc1826f0bb8
-EBUILD tomoe-0.6.0-r6.ebuild 1806 BLAKE2B cd4409ea41a557bdda65162a59b3644bd1a0bee54866b13b0222f97a01158171b7593d560f4ff36cd8f0cba352575b03bc8ddfb9934178ca8b04962b0d4c2cd2 SHA512 bc1c4b59683ba077b3a67c7f1ddcdea4cadf4c98a9191219273817dca96d729b918357d9bae25c9ab20cfc095c829ce2a90fb3d7efe6255516ee067d9a0ae8c3
+EBUILD tomoe-0.6.0-r6.ebuild 1814 BLAKE2B 33d9b1d56cf5a3f7549cf8cf9f4f9d3dadc4c3cc9c91052c69384a288d668f7910580407a1cc33aa5702cdb6d6df071a5803ac9ce230b605a15de7114a60c1f9 SHA512 75e4b25f3ae6dde83b25fce7a56543c795669062b309446671442700be7b1e7cd1be866bcfb7e4e3fac9c1d48955ade6a4a5994032c7c8b860411086b0d74c4c
 MISC metadata.xml 483 BLAKE2B f396df4f2c3b5cdeaa58ade7ef43280e9aa892e584ac59d9e20ec98316d8fd8c24b2621aca5717849e63f1b5da289806ac17760fbd92abf6b36659ca9fe6d67e SHA512 2640c3150a31a7f74c5f9f7d2a7905a1ceb3981ff97e3ffcd39b5eecec0ca7696d1dae996aee7827b7b93a8effdc6b976e7853032b0bfd3f58c5c1f2cad0ad64
diff --git a/app-i18n/tomoe/files/tomoe-glibc-2.32.patch b/app-i18n/tomoe/files/tomoe-glibc-2.32.patch
index 5d296cdcdd39..2bade4ef7643 100644
--- a/app-i18n/tomoe/files/tomoe-glibc-2.32.patch
+++ b/app-i18n/tomoe/files/tomoe-glibc-2.32.patch
@@ -1,5 +1,5 @@
---- /lib/tomoe-xml-parser.c
-+++ /lib/tomoe-xml-parser.c
+--- a/lib/tomoe-xml-parser.c
++++ b/lib/tomoe-xml-parser.c
 @@ -441,7 +441,7 @@
      f = fopen (filename, "rb");
      if (!f) {
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
index ad6822db39c6..27f3f0c86a8d 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2006-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-
+EAPI="7"
 USE_RUBY="ruby25 ruby26 ruby27"
+
 inherit autotools ruby-utils
 
 DESCRIPTION="Japanese handwriting recognition engine"
@@ -14,9 +14,8 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="hyperestraier mysql ruby ${USE_RUBY//ruby/ruby_targets_ruby} subversion"
-REQUIRED_USE="ruby? ( ^^ ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
-
 RESTRICT="test"
+REQUIRED_USE="ruby? ( ^^ ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
 
 RDEPEND="dev-libs/glib:2
 	hyperestraier? ( app-text/hyperestraier )
@@ -30,8 +29,8 @@ RDEPEND="dev-libs/glib:2
 		done)
 	)
 	subversion? ( dev-vcs/subversion )"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/glib-utils
 	dev-util/gtk-doc-am
 	dev-util/intltool
 	virtual/pkgconfig"
@@ -66,9 +65,9 @@ src_configure() {
 
 	econf \
 		$(use_enable ruby dict-ruby) \
+		$(use_with ruby ruby "$(type -P ${ruby})") \
 		--disable-static \
 		--without-python \
-		$(use_with ruby ruby "$(type -P ${ruby})") \
 		--with-svn-include="${EPREFIX}"/usr/include \
 		--with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
 }
diff --git a/app-i18n/uim-tomoe-gtk/Manifest b/app-i18n/uim-tomoe-gtk/Manifest
index b67d0a317c74..dc98239f731e 100644
--- a/app-i18n/uim-tomoe-gtk/Manifest
+++ b/app-i18n/uim-tomoe-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST uim-tomoe-gtk-0.6.0.tar.gz 372357 BLAKE2B 4624dcaa209dd1f89bbcff6232b72673b9a9e22609c326104e1fbef9e007c33e8711cd435ef5239d43e0104a65fc652ff74eb9b8787b1e0123e10f71bb07b241 SHA512 201c6a755feaef22b11f88a27b0d004d22ab13e806684ad839f7491ca17626eaf0f866a026c3fcf3b981c41c9c6a880d7f9f7a5156d3dad70d8edb78568b1d5d
-EBUILD uim-tomoe-gtk-0.6.0.ebuild 475 BLAKE2B e748ece07f48b7c65100576ccb260280135643cecb36c423ab160a4ab0c5e4e9a6c6a882d9708601fa59455112e57f44d2529c27dcdd612e3ef4a6dba5ad0e6a SHA512 42af7aae71522172715c5cfc4cf71a2c76962ca41b110ff142e2ef770f105749ac17c8a24f318d355d68ec9e33716ab47ee180d9551c5b109efd784c1a75660c
+EBUILD uim-tomoe-gtk-0.6.0.ebuild 481 BLAKE2B c1c9067514e8085b2e15fda959ee9b16532d08bdd67c9b0e59cb6b4d3a413db98d63d889f4d11152a3e03602b00a5517e1f96919e63bd01e130f0e199efdb49a SHA512 464769a35725780c10ce84ab20d9eb0a4fe2c1d4140e79cf6f051e57ed3cf77d5972f20edea508fa7030dfb7ef756f7eb1a2adf0b79ff883ebefe16b48f3adcb
 MISC metadata.xml 310 BLAKE2B fc9dca325196e8ffcfca49c336d9d2bcc851a6c33e69ede9c8ed9d3bd1dac72d290dfabc7fecee3cc92259f6cc9a0c875d4a75dcd14d04e8e90acf287fba4e2f SHA512 682ac49db6b852d1221aca3b03b653a37a90efc10313c4c422cd86a6aa63d4ffedbd58848e71635fb7e763f70e7899a8eb17d3a0d4df3bf944f8293c2e046e6b
diff --git a/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild b/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild
index ff99b8ad6a2a..0775f7479887 100644
--- a/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild
+++ b/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit autotools
 
@@ -16,8 +16,8 @@ IUSE=""
 
 RDEPEND="app-i18n/uim
 	~app-i18n/tomoe-gtk-0.6.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/app-i18n/xvnkb/Manifest b/app-i18n/xvnkb/Manifest
index a7b00d331773..8effafd73c31 100644
--- a/app-i18n/xvnkb/Manifest
+++ b/app-i18n/xvnkb/Manifest
@@ -1,4 +1,8 @@
-AUX xvnkb-0.2.9a-ldflags.patch 1261 BLAKE2B cfa566937710bc9c45f9faa0cb6d5dc4d62ef96383c957e7e0d3d731814d5112978062dd873e5428b1035f77f2a96e5e76973258c35da859f98b76cc1773cc52 SHA512 5b54ce3d25a9f634f53347e553ce45b35456228b0cb00f9308d872dcbb33c18218e27921a54e4b9e91d98892f0490c864662d96cee09e99a8400fba46f590afb
+AUX xvnkb-0.2.11-ldflags.patch 1077 BLAKE2B a1302da0f64a8975d4c88c63ce80e21b43d656d0766940ada495509649f890f917cb7dbc78a874a2854ee6d096e3ef6cd4a582f52f48913fd5c618a5767187e5 SHA512 8e64e433b4d05c30579f61f38ebb2d3d8f96ef620ddee7da62196a480fcfaf03595058f7dbf53d25948b89c534eefb89e61e62a5bea54edaa9601fe299642ed3
+AUX xvnkb-0.2.9a-ldflags.patch 1065 BLAKE2B 9a1fdc685b0451c06acb5a66b85c632876bd6b542f61a66be4d9c4d502a4e96336eb4d81d707e0248940372681d70683f5192f6b07d30e6934b71c759f05b12d SHA512 34a526e4732ed63a308a5dc37a7dde762512598619e8c7e3258cc0a58e3c95cee2ee2baee8c91646683e738e7b5542c6696467d0b0f16f82f07fa3c5b0a842a5
+AUX xvnkb-cc.patch 217 BLAKE2B e33d60d26bef4c34f8f1e40a923ed3f1f759211965a6ecb66d8b257cdd2100112ab005899e208d0c89df63f38dac42bd215721d913a5dcad763a5dac2905fe7f SHA512 e5696260fb5e70e0c9d85b3d3686eb7f3f62df68b27d78e77bcecbf0177afeeaf805df0c71eb4f8a9c7209def0caf9cff096a515efd9812473f9848e8cce095f
+DIST xvnkb-0.2.11.tar.bz2 76397 BLAKE2B 8ebe4c389f5174b74af32fb001ef5f94d388b16a7c1ca0f409faffc6d63a4543d4daf7dc3609a8e7066324280eaf2d980e4a4e379ae478010269b808effb61cd SHA512 10d24ec159a89dd5fa68540bb8a92ae4d925f11039e7a7b77ed273862e4eb28ccd66d53ca1d0304f2a6d38182eddd304362d2bfd8c6804a2e7bfb354b20e5e83
 DIST xvnkb-0.2.9a.tar.bz2 76429 BLAKE2B 33205bfe8dcc2fd68eaffb507dfb2db55cc1a71d33765f807b3804091a29f8c34ca8dcaf65a3f3978da921534d054096fb22abded3c4829d5ca256d3e51fff34 SHA512 3dbf4adb65f321d721fc74e05e92d2d1460e63c49e8a1ab2e10ab9f015e1a57bd3e641645d1283f1d0c5592eb7b342bf210d9fcab9ba441b6416c2f8fd1af6da
-EBUILD xvnkb-0.2.9a-r1.ebuild 1284 BLAKE2B f098c17bb08a6b904a89ee08b9821770e63375983edef2e87c91c19a108652fc69199efe63cf5a81c3f282c12ea4850aaa991c3f73a919b573531a0b6f3b601d SHA512 adc863b50c4dab538ce46dc57c762efc513dbab83e922fe83dc7a85d9159bb0c21422b7f395184f621d332bb579cfb9e05f5213d6221a17a07e636d83e2632c4
-MISC metadata.xml 320 BLAKE2B e5356409f97855131627a00f695dc327d051fab6e9dfcf6b6edae5b584fdb03d2e3b77322a66aff607f6c9031ec80b7b7d196c220214895325ecd0643b280a67 SHA512 56222abda6239d6c1e522975c2461b37f4b1418e1317f250a71351579bb98ad770678ae32158f4e24ae68752cab290a40bbca42206ea951fbc3b949c70385e24
+EBUILD xvnkb-0.2.11.ebuild 1338 BLAKE2B 66dc96ec926be619406fd7c5d39e57e24b4477a58caf44da76002b8d3c80981a630bf0cedd0fb2a764971c478114566a4f0a72bb1dcc4a395738f1cdb2f5ad1f SHA512 5f68df0a7c19d698df2ad2081e0d0ce113a5d4304c38ea0a53de2aa448c1caacf832eda764df90b8456dbb45b0516758108dcc8bff2de049f2058ed25ac31015
+EBUILD xvnkb-0.2.9a-r1.ebuild 1335 BLAKE2B 5363f8b9ba2b09385d8b843bf9714a6a65aaad3029d8def9bcd590abbee5cc5cbf709b754d91cbb117ce9d566459e56d1b9ae175b47e34829ad013543050f6e0 SHA512 ce4cfadb50f778dd0ac9f915cb49dc8c8605e7ae906e07cf6eef0ad4bd1b16541ee547a755402e8709818ff23cb898e9152d7f70348a9d2fba0fa1d320f26a85
+MISC metadata.xml 310 BLAKE2B 8cc6252010668c0621159f3bfc8be62a27e75a6798aeab86824ca9670f10844199aa1960c93d4b3d0f6b614595c00e26126f280cde4ed1d253ac17de74864ab1 SHA512 3ae9cfe5184876f5754768c37e25425b1067fd53e1fdc16cfc19508cf7d4845ff47f6f7f0d7752a532e2f4c8f74ca7abb16ec69db00bfec78ba6aa25872663f0
diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch b/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch
new file mode 100644
index 000000000000..8cae65fda777
--- /dev/null
+++ b/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch
@@ -0,0 +1,30 @@
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -19,10 +19,10 @@
+ 	$(CC) -fpic $(CFLAGS) $(FPTR) $(VK_OPT) -DVERSION=\"$(VERSION)\" -Wall -I$(XLIB_INC) -c $<
+ 
+ $(CORE): $(CORE_OBJS)
+-	$(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) -lX11
++	$(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) $(LDFLAGS) -lX11
+ 
+ $(GUI): $(GUI_OBJS)
+-	$(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
++	$(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
+ 
+ main: $(CORE) $(GUI)
+ 	@echo >/dev/null
+--- a/tools/Makefile.common
++++ b/tools/Makefile.common
+@@ -16,10 +16,10 @@
+ 	$(CC) $(CFLAGS) $(DEFS) -Wall -I$(XLIB_INC) -c $<
+ 
+ xvnkb_ctrl: $(CONTROL_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS)
++	$(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS) $(LDFLAGS)
+ 
+ xvnkb_setup: $(SETUP_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
++	$(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
+ 
+ main-tools: $(TOOLS)
+ 
diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch b/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
index f089f0dde899..b954b2914178 100644
--- a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
+++ b/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
@@ -1,8 +1,6 @@
-diff --git a/Makefile.common b/Makefile.common
-index 06f0b78..d9f8976 100644
 --- a/Makefile.common
 +++ b/Makefile.common
-@@ -19,10 +19,10 @@ all: do-it-all
+@@ -19,10 +19,10 @@
  	$(CC) -fpic $(CFLAGS) $(FPTR) $(VK_OPT) -DVERSION=\"$(VERSION)\" -Wall -I$(XLIB_INC) -c $<
  
  $(CORE): $(CORE_OBJS)
@@ -15,11 +13,9 @@ index 06f0b78..d9f8976 100644
  
  main: $(CORE) $(GUI)
  	@echo >/dev/null
-diff --git a/tools/Makefile.common b/tools/Makefile.common
-index fe16cc1..16ec511 100644
 --- a/tools/Makefile.common
 +++ b/tools/Makefile.common
-@@ -16,10 +16,10 @@ all: do-it-all
+@@ -16,10 +16,10 @@
  	$(CC) $(CFLAGS) $(DEFS) -Wall -I$(XLIB_INC) -c $<
  
  xvnkb_ctrl: $(CONTROL_OBJS)
diff --git a/app-i18n/xvnkb/files/xvnkb-cc.patch b/app-i18n/xvnkb/files/xvnkb-cc.patch
new file mode 100644
index 000000000000..1104998f7883
--- /dev/null
+++ b/app-i18n/xvnkb/files/xvnkb-cc.patch
@@ -0,0 +1,10 @@
+--- a/tools/Makefile.common
++++ b/tools/Makefile.common
+@@ -49,6 +49,6 @@
+ Makefile.dep:
+ 	@echo
+ 	@echo -n Create $@ ... 
+-	@gcc -I$(XLIB_INC) -MM *.c > $@
++	@$(CC) -I$(XLIB_INC) -MM *.c > $@
+ 	@echo " done"
+ 	@echo
diff --git a/app-i18n/xvnkb/metadata.xml b/app-i18n/xvnkb/metadata.xml
index 5a3a0aa5676d..0df6a83c250e 100644
--- a/app-i18n/xvnkb/metadata.xml
+++ b/app-i18n/xvnkb/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">xvnkb</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xvnkb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/xvnkb/xvnkb-0.2.11.ebuild b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
new file mode 100644
index 000000000000..66a1c6ccd41f
--- /dev/null
+++ b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Vietnamese input keyboard for X"
+HOMEPAGE="http://xvnkb.sourceforge.net/"
+SRC_URI="http://${PN}.sourceforge.net/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="spell xft"
+
+RDEPEND="x11-libs/libX11:=
+	xft? ( x11-libs/libXft:= )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="xft? ( virtual/pkgconfig )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-cc.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_configure() {
+	# *not* autotools
+	./configure \
+		$(usex spell '' '--no-spellcheck') \
+		$(usex xft '' '--no-xft') \
+		--use-extstroke \
+		|| die "./configure failed"
+}
+
+src_install() {
+	dobin ${PN}
+	dobin tools/${PN}_ctrl
+
+	dolib.so ${PN}.so.${PV}
+	dosym ${PN}.so.${PV} /usr/$(get_libdir)/${PN}.so
+
+	einstalldocs
+	dodoc -r doc/. scripts contrib
+}
+
+pkg_postinst() {
+	elog "Remember to"
+	elog "$ export LANG=en_US.UTF-8"
+	elog "(or any other UTF-8 locale) and"
+	elog "$ export LD_PRELOAD=/usr/$(get_libdir)/${PN}.so"
+	elog "before starting X Window"
+	elog "More documents are in ${EROOT}/usr/share/doc/${PF}"
+
+	ewarn "Programs with suid/sgid will have LD_PRELOAD cleared"
+	ewarn "You have to unset suid/sgid to use with ${PN}"
+}
diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
index 3f52d6d81c32..5281e3024429 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
@@ -1,47 +1,50 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit toolchain-funcs
 
 DESCRIPTION="Vietnamese input keyboard for X"
-SRC_URI="http://xvnkb.sourceforge.net/${P}.tar.bz2"
 HOMEPAGE="http://xvnkb.sourceforge.net/"
+SRC_URI="http://${PN}.sourceforge.net/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="spell xft"
 
-RDEPEND="
-	x11-libs/libX11:=
+RDEPEND="x11-libs/libX11:=
 	xft? ( x11-libs/libXft:= )"
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
+BDEPEND="xft? ( virtual/pkgconfig )"
 
-PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-cc.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
 
-src_configure() {
+src_prepare() {
+	default
 	tc-export CC
+}
 
-	local myconf=()
-	! use spell && myconf+=( --no-spellcheck )
-	! use xft && myconf+=( --no-xft )
-
+src_configure() {
 	# *not* autotools
 	./configure \
-		--use-extstroke "${myconf[@]}" \
+		$(usex spell '' '--no-spellcheck') \
+		$(usex xft '' '--no-xft') \
+		--use-extstroke \
 		|| die "./configure failed"
 }
 
 src_install() {
-	dobin xvnkb
-	dobin tools/xvnkb_ctrl
+	dobin ${PN}
+	dobin tools/${PN}_ctrl
 
-	dolib.so xvnkb.so.${PV}
-	dosym xvnkb.so.${PV} /usr/$(get_libdir)/xvnkb.so
+	dolib.so ${PN}.so.${PV}
+	dosym ${PN}.so.${PV} /usr/$(get_libdir)/${PN}.so
 
 	einstalldocs
 	dodoc -r doc/. scripts contrib
@@ -51,10 +54,10 @@ pkg_postinst() {
 	elog "Remember to"
 	elog "$ export LANG=en_US.UTF-8"
 	elog "(or any other UTF-8 locale) and"
-	elog "$ export LD_PRELOAD=/usr/$(get_libdir)/xvnkb.so"
+	elog "$ export LD_PRELOAD=/usr/$(get_libdir)/${PN}.so"
 	elog "before starting X Window"
 	elog "More documents are in ${EROOT}/usr/share/doc/${PF}"
 
 	ewarn "Programs with suid/sgid will have LD_PRELOAD cleared"
-	ewarn "You have to unset suid/sgid to use with xvnkb"
+	ewarn "You have to unset suid/sgid to use with ${PN}"
 }
diff --git a/app-i18n/yaskkserv2/Manifest b/app-i18n/yaskkserv2/Manifest
new file mode 100644
index 000000000000..db81665fc2e0
--- /dev/null
+++ b/app-i18n/yaskkserv2/Manifest
@@ -0,0 +1,189 @@
+AUX yaskkserv2.confd 49 BLAKE2B 1e0af12edd4d1c7cd3460091d3fa1b4f33c12c5e5d5c9caae6ee8885938ecef3e8e924177ec0c0aafeb27722322ea48f77d1abd1c48f30ebf1bff5876ee94042 SHA512 546bbf158e1f09d368f82c57cc74d3683714ecbb3e0e04fe3b8438d024f01bce449e545b35e1e7ddb0dc2112865f793209c90d888afdcf5a9ecad53bd6053015
+AUX yaskkserv2.initd 314 BLAKE2B 6a54e240dc71c01dad1351a0609363a4403cf8da5eb406acd82952b77a1024279aec20422a2dc3a1975a8d5d8e4eaf987a8956981b2028183e8165d7d9daea27 SHA512 9d5aed94446ef6a1a4d9fc925ba3791972d75b677ec2fa9ded2211696ce5b592e235d84d50a808dfe9d6a78b9105cd3a48157cbd379387e86e9c2b4f65634b95
+AUX yaskkserv2.service 266 BLAKE2B 88a1cac14652b9bafea240cf930165273d9e5f1231517b174f42c1e3ba81d6a643c8d9d1e982606c2da878d806fc08472c0194687455f38639b7bf6165522a25 SHA512 f9474304b66398790099723d3fe4d5ce47b67661d3c618be1a3d2b9967000cd8f63c15713fd55831888a023b91f2f9293267fc7a6051edaf1b37b9ab16d02bb4
+DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
+DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST arrayvec-0.4.11.crate 26439 BLAKE2B 5ea27434d57f37f7ea3e7d94acc1a3450ec464bd62e2d377cd378f4faa13078244afc53284bf2838ea0f62802801961d6915f202eea951a8792e9fe825424be9 SHA512 6919f07fce0aa834b75ecc722476d05580a7dd58e8119b0ead5077d6501ee69ffef71016b6e63ed0617ce2d29a6fa1a4f5431d7aa20340c9f3f2e4c9c93d49c4
+DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
+DIST autocfg-0.1.6.crate 11439 BLAKE2B e0eb7a3176bb5ac27b8de466c5fcdfedb9ad32f4d2b52c0385550902d59d01c716a53179708bdeb250a91690edeb70ab81d91090ff0fd89a731dd365621aa496 SHA512 ac7dd73b7c6b8b54c4fc98c3e75210eb59d46ab3447fca533763bfebfa87dba5e947829e3ba56a8eb3403f6d317065b7d674da883741e619f3866b12267801fe
+DIST backtrace-0.3.37.crate 67955 BLAKE2B af9deeda806a9c47084df102ed6f5e6d57a81db9ac410678684c7026069be43bc4efd15bbf4b042d5aea9d85d619168484396d1dfc2ed83a69eeb29d750b6158 SHA512 d32ef8fa11cffeee298f7468f8f9b6d3492cdd805679fa72600115df7dd7e0ae65378ed7aa767a75a90743e278018cfb9631842e7eb633869d77485405dc520b
+DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
+DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
+DIST bincode-1.1.4.crate 14412 BLAKE2B e1ccc8e9954893c3f4efec56522281050b9567090fc37f6bcdd28804eccaf4e619892b1d64c9da6b555ffe10c9c47414414bcfff589cfa80e3fba5b086b513cb SHA512 31f32a3dfcb76f113b2e993938b4c708d98d3c75efa9414d74168b2ef8af544bfe64fe39dbc4ea556842ec11100c56f14bbad15aaab919c67a7c5be1aa584f28
+DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
+DIST boxfnonce-0.1.1.crate 9698 BLAKE2B 678cd597d002850a2ed7ae430b23fb71f7218cda3a874339f98e698c570fb1be466862db1365e80f62d0b5d9c0561cf65fed004ed460896f1f9dbb704c4c3cff SHA512 e027de23cb7c58fcf47dcdf1dc2adf7477408f2b4e6303b51a72e2b87de232d4898dcc064f43d7bd86e337f7e1b0c1f6324daa1cb8e9ba0e530674fb358eecc6
+DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
+DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
+DIST c2-chacha-0.2.2.crate 13766 BLAKE2B 0b963b7a4ac64d71d75ab542a23585cd7bb99995b923c52edf99c49a76222978d0a96c020a5a1199c971133fc1f8629b562088b34fd283b7b5da7800848f85ab SHA512 d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14
+DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
+DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST cookie-0.12.0.crate 25953 BLAKE2B 630dcb365132e952c81813a772f94266230fb1e83cac63d39713aefb0a4fc6449c144a7e9630ba8aa65194bbd732fb42b3fc150530f950ddeb6a2d6373a78197 SHA512 4a802118306d25f1e53444e143913ca2a14a9e5584b26c5aca67b5ce0ac5111c4469fc5d7ee6b5877f8ac59143739b749edac83ceedcef7b53ba1e15cd97a821
+DIST cookie_store-0.7.0.crate 25211 BLAKE2B 1c201c5baace2c595b2bd7c214140d1c97fab1c4143eb91adcdcaaba4cba8f1c97ebc8ecea626c77a1b482ca6c326f220920458c11f23e5a497b75f220c9bff3 SHA512 40584ddc3189ee798b5ba262934d0a48455376d9cab4d715e6c4dd476b75c62ec09fe0c2f1b748b266d20f2b84fd97e58cf1ec88cc6b245290a572fb29fbc4d4
+DIST core-foundation-0.6.4.crate 25233 BLAKE2B 720cb670e0ce589fcb75e583c3f70b54669407481f61b67bb5df1a5056f07c88f568f2adeb65188004424b26b623ac42b03d830239571c15f241216e55fd8dfa SHA512 5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632
+DIST core-foundation-sys-0.6.2.crate 16204 BLAKE2B 32766d4b23a2b108777c57b2115cc718a0cdb42fcd2e3973a0adf944d326e0796a6953756c42140eb4e6e96a2609bfb41f84a54c59b4b840d7213f3c5dd4234e SHA512 bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07
+DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
+DIST crossbeam-deque-0.7.1.crate 19407 BLAKE2B e2fa467b88ef0d6c7f6656bd87ade1306665bb5b56b1e494ed3a7bc59050ebf847de4c57c5dcc5d63688b60edd3645300cf4b3a2020280dcf0e47f434a9f3221 SHA512 6ea3f138aecb4e84b4f9754fa6abc164b5b558987b15bd34562b70cf93ffd9015d017f62098e578236ad8bc1db652b9bfa624edffd5a99f10c3618c3927d3fe2
+DIST crossbeam-epoch-0.7.2.crate 38134 BLAKE2B 1a71b24f507e95c9552a3d5906bdfa77add4723144e1f5275dad65a5de7cd82305eb2c4ad0d99b3f08a06ce050dbcfefff08790a4a65744f4d578c7106abc671 SHA512 672817b282692fa8dfd0e366853d72a2c14c43d54b8059a7b4761315bff20c342629ec1e64ca0e80e1e401cbd625b259d182546779291899334f1d9db56f1fc8
+DIST crossbeam-queue-0.1.2.crate 14104 BLAKE2B b084846e3adaefb33991770d53130b361f2dfa76ac9f4793618643afff09c4ebeae1545c33c59211d09427bf8d13d13d3ed0965211568884b0b2042e5542327d SHA512 f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444
+DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
+DIST daemonize-0.4.1.crate 14494 BLAKE2B 807b6270122b78cbd19792101d9be258b87b316d5bea4a25b4c600debe0a89f43ff69f4f9eb1366f905fc9d1adf4b1cfcb140a725769b1e04930d1eb6e906bd0 SHA512 acde0f361ad152e523877ebc714f4e5706b3c506914612ea8b2cace473df58c6153b327011acdfe039379d1bf13f45173092cf6ead3190fb77b5c27bd91e74de
+DIST dtoa-0.4.4.crate 14818 BLAKE2B b7abe646e02193a30ba17e17aa8ef19c59c4d925d8988b5f40c73f1c07ef3b9c5e6572a953d99b10ec24b100aabdb5d9d9968ea9864ccb2bba52f0fa2379c23f SHA512 d2ca487cf950dbab9cfa20eb8b712e07276e40f2cb8b0c5c56f60719ae18d8a1c7fbed2bbea869255b0d5286b9890ad6fc6b3d7be2cc13af28c84c2882de8044
+DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
+DIST encoding_rs-0.8.20.crate 1403599 BLAKE2B 23b3ed8c65d0002abd7d2deaf6ac04ef9bce374adb6ad3f4ca993a0f487d57543188ad8b58756d5268bcb130f0a4d6c7e3199c9c9c0c952510cb0ca925cdfc4f SHA512 601e0a8ac8eb39def2336463b38de3052123f62653e22f5a48b8015912f946ab7e78610eca65e7663b2158c908e7f7f4f9f6b48f188c18319ef5594fb7e86e9d
+DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
+DIST error-chain-0.11.0.crate 27207 BLAKE2B e50c4e2d6a173e9866311bb81adbde4bddd64d529bfcc919ecade60926112b537cff491a4ba8e84586b3dc63e87e2b3c0695452c165ddf202d6901b2d6247f2c SHA512 a7c06be660a554b4c50deacaf6ef0699cf6e8cf234d9610324c70dac0cffeff1540dfbf10efd41427858551b095c998d670f1287c9459c35217bd78d8887c60b
+DIST error-chain-0.12.1.crate 27906 BLAKE2B 66c54c3448b8968a70395861469d7b80aa101210a3c96d2f28b0933fce6d77ec28f4ee18d7666402abc8162f567029fe93f7dc80b93644ef6e488ad4062832bf SHA512 1a8baeac9f4d96214a878b5c80ec2c5753c2232a166515c96ad6a42424bbe32410f2acd3aefa70d9dda7036e1965d83aeb9fd1a393b11464fed751aaebc9bbdc
+DIST failure-0.1.5.crate 36749 BLAKE2B 97fb948770c3325862f449d5eafc07cfb170924b4a0efdf4e6d8902411eae6cade898c953a6b51a955838c359c670c1778b3a189c3e70152fe97e687df38a805 SHA512 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc
+DIST failure_derive-0.1.5.crate 4884 BLAKE2B f09bc82f9fb489950d886ed1276ffefe06e916389d034aa3b82521445829e7fcee102e1c03030df9cc55e4b1f14c933ab83faee8be910037d33f15d15ef9c86e SHA512 c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a
+DIST flate2-1.0.11.crate 68628 BLAKE2B a375952ec5ad14050e741fab7d62a56413bf50961c2c4e174bdc978b2e17681d4ae0398cdceeb5d4500e60c6b0a7d8b4c3692545bd2305d73a20d50874fcb7b6 SHA512 d2d67be2fa687d4a4e2f4486a14e95d2d73704e862940b9cf0072378916d8e41b70081d30ada2184827740450f5f73edd35ba3d960931e3edb4da8ffb4e35a4a
+DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
+DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
+DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST futures-0.1.29.crate 158346 BLAKE2B 943336cf753166f852f9dcbeb8e0b76d1d26cf6d688449a99f9f1885912cbc79327115514ad93d28bbdf1b8a91b2d22f8f62d7e5f5feb61f3024e9a749e11da5 SHA512 16b16ff65c75cc565c5364406f5d9c0d120a07a520f6ea2dc86aaf4644b9ad6fb32bc021b44fb7c74246cb7a700b3df3bfa813908541eec079bd7eb7beee0200
+DIST futures-cpupool-0.1.8.crate 10583 BLAKE2B 5832359dc451551a3cb77e48b73054ec1505e28e04b2307af5d8e17a3be9e0552941deaaa94d477082b924daade1a2aeb15a0e095629e29ce983b0788a15251a SHA512 49d7a75e2e0a6a6d2103212a9ad9474119f4f33cf3748b605dfbb461ec822330115cada6bbf6457f2093f4af4cc04b4db63dbab8c0faa8b25ee31fea29f660e6
+DIST getrandom-0.1.12.crate 23809 BLAKE2B 9669147c455bd03bd15f304eb7019b218cbc482af850ac3cb4378327de5afabd50826a686d51b00437d740ac4e3a0bfc761c54ed295806ac8b77ae6848742346 SHA512 0577f21f0ff01154453da92dd125c3bdea12a2bb2e7f5581add4306e28dfc448a0c084e9e64a0ef1da7baf8415965ea4ee32a5ef38d5af8ce4c6addab3cb0518
+DIST h2-0.1.26.crate 153921 BLAKE2B 4a84716e37abeeebbf0771720c5af636576cff47158eca1c7bc76f21c0531b41a75bf3ad7b6bd88aca960e96e15679a7908720d316321e319021624834a97c4c SHA512 37686cbb102eeb15de3f76d0607cf64210b11f5272ed83dbbb145650fbf11916027be3acb487cbb3e02654469b9f78167a7f18551f39af142e659cb149363d49
+DIST http-0.1.18.crate 101326 BLAKE2B fa8dcf6cb5dbafb5883dd27110cf583c4e656852170abba050568ced0241d4d62e0c299d9bcb50b707b495ed0ffbbf3688d7a5a5f29e6aac07657fdd0f279b58 SHA512 850145ca90272d5f474cc9998bdb173bd94a2a16cb08383815d30d9eb941b9fdb8b0d1a342a4c24bbf94d9e63336f4e10b2b95f5dcaeb26392efeef143cb0726
+DIST http-body-0.1.0.crate 4618 BLAKE2B 2320b5b52a64cfa32550ffeebd950fb56135a0dbb8e43122521a760cfd574083b19a5a41ead0809f5ae764d797eca7007397931b2e63a79dbd9b4a26055d81bd SHA512 b1c9fff799f6581160ef232ceff82a0c222a9f1ed3ec24760fb6b156d42739e06512086e4819323aee7e19b1d0b30ac8915f775f9c36d63b4f901546d331cc80
+DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457
+DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST hyper-0.12.35.crate 127971 BLAKE2B bd2b1cf87d30fba32fe96312164b5a55d595bb6f6495df4c0b219f9756c1ae9180f9380191ca202f5cfc49002416ccf05d4799bba62c7038578c59860c36a4ec SHA512 40f3285b4de23ac8404b191a44a78399ed3186d9e6abf77d759615cc4678292411df798cbe4c2d5405677cd5c108468c015d6b42fd8d833484f8ca9c1128f68c
+DIST hyper-tls-0.3.2.crate 8901 BLAKE2B 2b3810160156c584057101a25c8f7decec4fb4632631f4c048353d3d2f90a37cec7b20a85ceef61941f02c5264932c8d0255823c2d615825d2499951f5e25a0c SHA512 9179878b95e8e390b17d45bb02c24219066405f671fddc4e044ecac0a00646e9ae03e7cda31b0f6f7beddd8fbccfc873d28d52e6b46aab2d252a2472302a483c
+DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
+DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
+DIST indexmap-1.2.0.crate 46101 BLAKE2B da8be80f85b1f43beb487840cfda9feda8f71ceb14120af3efc642ca57ec18b227d4ff34ba1d8869d23ce4dd210f1e5d94835cd3e7b6ac059b071ad2aa36fe9e SHA512 de0fa70403f5874133c0b9c97892ffa65b3adf4a1e307fff7039e3a37be0a07de5133d33edeb4d1ac9791b6ead7bffc53f2cf5876a732fadd58977d6d36bed38
+DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
+DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
+DIST json-0.12.0.crate 46747 BLAKE2B 7fd6d6a548950160c8beec12d575480f793b3adcf6909a4c26de4f02846e1c444bb34a92e01012531e9d6b6e94043e015419f81b2427c6b54d205273c5753026 SHA512 6c0365ed00a41eadae2de44c75ee518b9f2c57e8a12b2d606796e900c20277bd5fa13c9661442a9f17961a2f5503b600ac49a15a84c93f243035452cf72fc56b
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
+DIST lock_api-0.1.5.crate 16967 BLAKE2B c44ebe24fa6074394d0719b293d447ab67a9a23788821f2ba816b5e5b7a6b09d543c630a946b956811dd199144bf43568b52da5ebdd5e8b674e489f9efd2234d SHA512 e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde
+DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
+DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST memoffset-0.5.1.crate 5958 BLAKE2B 2ac071da35c45d498889d38805223b46a0ec81b3fcd95da85ffc0f4512ca45f1eaa9fcffa8931e92fd11d16806a887d62d8bf15d2f3f759cf9c27695595d0881 SHA512 8bd14c74a65464061acc5594eb108e630e8dd7a9dedccfab0606c255bd43e7b30241ba0bea11bfa80f9afd8fdbf0879ad7d998628f938a558716ec10da31008e
+DIST mime-0.3.14.crate 15035 BLAKE2B ab9fcc2247637465d99006899fc120ff60fb4b61f603ea65b15da594bef80ed2b9788e2d893126ed46c5e8cecc0aad2a93be855a043f9224ac07c07fd601734d SHA512 7079ac27a2a7c5534ab8af24f1d84ce78d9b3906a56107198e5ac43e7b6cc74a980a38bffee0f988e7b4a9b8d3bc052797bcbaecfae4c9470073ac34674f6471
+DIST mime_guess-2.0.1.crate 26646 BLAKE2B e0ef30850cb07de190677229161bb9ce37c7f7cfeda2cd2c54c6ebf8b7009e56a9c84935c55e5ed0430f546d4b259867132a702bcd29d3f25a2dd1b3a59da5ca SHA512 c4d83d8c05b1173c531eea48073762dcc5e80efc2609e06dfc1413ae2f3a3f7d89e533453aeaa75182a8b663c51c7ad0d4eb0b5b4450afc8e11fd74b84a9799f
+DIST miniz_oxide-0.3.2.crate 54536 BLAKE2B c804e4a261ef2444ae539ced683af5d0358baf625d7e8a16979b7ae2f10549d08ed97cd1d3ccc2ab4b96867326775b769b451e5dbac168cc9494be627eda9e6d SHA512 ea5eb9236a8797892f0f4bdda07c37cb8a6e48cd2fa8e81e2a07c13961675688307f77533e79cda65a72312451ff46b31cf167507456e4186e2b19a86cf14b95
+DIST mio-0.6.19.crate 128192 BLAKE2B 26c821eef0aa49c80e4919d80a795971655b9726c24ce0a5b0716d89c0e254bfdf3a7d4e591ab70474dd9bdb92a48be9d74ff4d7beb3ae158accedcf780525cc SHA512 a6eeb93a34a4a4d486a821763cf660d6c5d3dcb08a7f1cd32a04d918d5196cd50cc29b30c5a97eeca68ab1cda50bf36a50c2c787e08ae3d2a2b9134350acd097
+DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
+DIST native-tls-0.2.3.crate 29087 BLAKE2B 0304db852e3b1261a791a5a8aba5dc6fd2e13bc32e6ade5ab0f58403583ea45324a4ae4359061c2a9137cc7f127404ef663702a22fe64f2489691de71eafc914 SHA512 9964d627c922261ea730076a2c8447784e0ceebd8e6218f5a61093021f10682c2fa25815c10711831b7d41c84b7c77cc1128a663669058882b0af6d70ac0bc09
+DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87bf507701ddf1b00208e7a321d34882282fa650a52f6b9d878605a6fc3be461fbb7e10182dda04a04e5806 SHA512 e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9
+DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
+DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
+DIST once_cell-1.4.1.crate 24366 BLAKE2B ad569e1d79ec41800a62a84be50d1624efc19e2d08757964e84eaf8b1bc341988636723de8f0c87b37cf72dd4a4fed9a4623c6deb2577172c3d85fd6849685ea SHA512 7d075cb115e6146a9e08e27fe123865bb54fb73c1da6c84f3ac991ff9f6f83bbb55245a9741279a12b72f143e3ed4ada3da7b13764e7655dfe64b70c5d6c1958
+DIST openssl-0.10.24.crate 182149 BLAKE2B 048d0c86c718b856cd2cb9a3ec0ab4074603439b23d17ec6511a5b1f37c8a6804157cfa1129fe14842559eab705029642f6aabe78a84b4ad3c13bfe9ed812c2b SHA512 2127ff5f9b8feb3b567362ea9988a125f39e524432c629481e5ab27f08e2bec20147fb14bfa2d10cecf357fef5f6d6447e8d045f157bac7c1a4e0175903e19ec
+DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
+DIST openssl-sys-0.9.49.crate 44767 BLAKE2B 613926e3f88379061c570917d24dfe5bb18af33ad339af5d76a498f3d9c1ed73362bcae34d1e95142ca747a74a2896303f33d34532f0cbc6ac39588522ce0466 SHA512 814febad99cc74eb5fee60d58d685b2c956893db8f3f4994a6f5226261c8dc8ab569067959aec2aaf3fc684eaef6654f102a1f82a215e42b4a087c357693b6a4
+DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba
+DIST parking_lot-0.7.1.crate 32670 BLAKE2B 46faa97dd3e3e5625fc40de75eb75f17512ba63ff5ef3ee380fc549bc08b3a119a91622cc67014b9c072ae0f5ab05b10f52c24486fc03633d850ce22812dfe4f SHA512 d83d3c457e15ffce500d4fc82d0b9840ea2ed36d43d4eca841b05b0a9ee73ff6fcce07ccc3a6f0d06d950d7beff85db0c3d13dc1461adfef390d6b3d85367bed
+DIST parking_lot_core-0.4.0.crate 26817 BLAKE2B f8a733cd6e14a2ad40adf498a3aa23bf3ad06e788f440bb435c544e5ff9750dab963ce4fc673014e54a851ed541975116f18f102f935e21912fc5b65a6aaef19 SHA512 25c0389e9d3d88725398fb304d3a4c20a3da0bf0d67f12c7cdca38f8068dc6ea7b57341579136cf4792cbb92fd64dd33cd91412463f4df8902e1b8c87ca08d08
+DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
+DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
+DIST pkg-config-0.3.16.crate 14429 BLAKE2B f850910fd54891c39bb4187c5ea49997e0628858d7c1f579cea719b8a2c47beb907b3f6e72056c8d8eb037314f4c5a129280504a7c1e8c676fae48241ee6dfdd SHA512 13431f3f8cda05615c91be2fcb8eb2fba085b46df70c5dce773748ffc15f0b48a45858aa69c37c173ce6353b028851f94f03ded58649c641e66a1c1a65b60572
+DIST ppv-lite86-0.2.5.crate 20606 BLAKE2B aeded44b0a0fc59073d358b565c6241ce537a29967fe8f95eadc4cce420752e619023b0f813d1f157756dabc640351de61e7da9bd030c91a14b70d34e300a217 SHA512 281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243
+DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
+DIST proc-macro2-1.0.3.crate 34868 BLAKE2B f97fa38afb8abca38d814673e0cc7d17e3bf623984afa7fc2601636508d8b32160fff4079d2e266e2d2e4519d0d8942e88cbabcde54a869dde0a7f0961d2afaa SHA512 ff4e32e42d206191741880e362e39e33149fec4f94cb38e2693e956e4c0dd680dba4712f436fddbc092a7ebef23b7cd4693345fb93d5b9713a516960c2bfd82e
+DIST publicsuffix-1.5.3.crate 16886 BLAKE2B d734f9b6fb5ce32b864e09fa541fbca6c7646c56196c2ae9fe3f7b47fb3ea4af5ec6208ad4e908681faf504c415433cef5f702fdaf65180f0a293e40ab1b85b4 SHA512 6ce7c1e37190892d454f9b858041640eac6749a392264cecf6a64696dddcdb038a9b81b580991aa0727b1b015e05e0b7582baea17b82ed327eea30ca01cd555c
+DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
+DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
+DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
+DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
+DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
+DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
+DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
+DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
+DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e
+DIST rand_jitter-0.1.4.crate 18409 BLAKE2B f346f6856128218aad0e70e8b4b70a19f39b4b3161ae2199d893f6427ea1e2b7aed4024de311add4ea9a19de898f5b34668a4c7727c9e7b32325663eb6ddbf51 SHA512 fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a
+DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
+DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c
+DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
+DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
+DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
+DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
+DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
+DIST reqwest-0.9.20.crate 105224 BLAKE2B b75633f08592303cd755758f0744637bc798614f9c9f81f5c20f529cc862efd6feac437d3ed9c50d16b448795a1701819cd0cfd854f6946946c506d6139b88c8 SHA512 c6683099c79ab48acd2b7abb903686f64e985bd239f3e348a7c6f80d248e3f2860d7f8eeca768244c8925794e96f6253d786e91d94b926bad2581f22f5a824e0
+DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
+DIST rustc-hash-1.0.1.crate 8976 BLAKE2B 847953648136fe54213e169b7ff414a42984ba9a591a52b3347c5b4a8503920b884b586d01573a975c464821d8667b631b49e83107573afb77503299a0bc9387 SHA512 e90af9d21da88c4da1deed8d5de65cedaae659819d0f5be8972a125b86d62d72ad710745f195a7a04a92442a6684ca9e7e85c734935852718434577df3dbb34b
+DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
+DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
+DIST schannel-0.1.16.crate 39153 BLAKE2B f06cb0dcb3d93ac1debf396b23faf5df2b87ce98732ccf5c0ef78af0c36fc9825f2b716f0a5772dc71cd2b2e6ecb477a81c2dbfb6bbd4f84bf3d1187dd7cf187 SHA512 11bb68e759e2ac0bb57a214e64d86fcc49903dc70f9e0582ac4bd0343e94da44d8d34d22649ffae41dc975b4390e7d10f3adcf79d9fe8c9fc95c747c58947b2b
+DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
+DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
+DIST security-framework-0.3.1.crate 46179 BLAKE2B 99cd9d5555908ecd082a7f934cae218b4dc106c799c7d4458e1e470169a657692170c2860a0c04eea89ad219280619e9cd4535e240a0bf2cd5286959b147f3f9 SHA512 69b1e32cc4cdd3a069e9f1de08d6b5563a90e094e0fce07b4949386072632cdfa5ee7711ae16904148936dafebd77321160b28acce239f0cbd5547ba1d77edc5
+DIST security-framework-sys-0.3.1.crate 9283 BLAKE2B 723d2df6a0d6cfffce0435feaba479159833e6a07fd851a6062ee0f5a65e23a7a07781a6596daad50a6e540e943c3df16eecbaf93e9785f6464eeeeac8d67e46 SHA512 28c731aba35ff80dedf73978ba18f47a80ed308ad6f123467ab435f825680386f665d06f93a5703b8dd0b6893f805f5ae6875a0a7c8669a478c71c69448b2a54
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST serde-1.0.101.crate 73115 BLAKE2B 6b80a6e7f8965c412c6f5db62cf3782329818c59c43c9947ad9a33be56b334feb0fc0afae4722f368d708236e2763ee2b1e71b323b3e961880f99f2e178a82a6 SHA512 3b6e2f8fc965ae2055a8eea007b3aa47715fdbd653cd0af81ada557559316ca65d7f3c75c3c5db0841aabcb2d4336092d339258829df11716b10a0c14597c678
+DIST serde_derive-1.0.101.crate 49736 BLAKE2B 247c6284e362d9a31eee6c92b257fd70733669627628cbdc921dbecc384d1a328fc8a37a8f5b96a84498d5fb4514374760ccccfcee1f3e809d35da5677cf4932 SHA512 08a014ff70718db11c5e3b8420d2b31379c14004b55c4521149030a00c3a623a358c3442815e492a2cd28d6a32002aa1c828cae2b5366f82d68c1e342eba0417
+DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
+DIST serde_urlencoded-0.5.5.crate 12429 BLAKE2B e91e4c6a41d2077a45656814b6291de75dd361e0be39bc952ddb23e06b1b2f29f0fb612fef472bbf6fe10b089639417b3aa8603ca09c70b471c6804e8772c0c0 SHA512 9c4a82907619aa211a5768628ae1cc749980b2df267f325cc1457031720d4166edb0b67e2144324e7f655384000583ac2ddeda33f7ab995a390324e2ef4de145
+DIST sha1-0.6.0.crate 9244 BLAKE2B d992f1803fc17f8f8081ccbafd07ebb9d78056a705444b45dd51b2f57cbdaaf071685b8e6ad9f4fa21e032cc78b4305c8101b079594c7bf6e67894bb798b16b3 SHA512 32081c99a0cd5fd6e651deb711eb4c9a8bc71c12e26b25a72b2dba9a3286502e56b23d068a2899764ce1cc0c615c2c1b22a6c7aae63e07a758745b533e70ff0c
+DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
+DIST smallvec-0.6.10.crate 22064 BLAKE2B 41a7ccd12c9b7e1dfaf43a9cee22c60d160b35a08024554cf8d68b59498a6e3fcd0e8146815bb61a6e1727b209ec85813127ab8520f8ef47716913a6ce6cd952 SHA512 802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4
+DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
+DIST string-0.2.1.crate 5081 BLAKE2B 27f02ed6a6545eac02d0b98852b2c362711dffe6dace552a24f8f3d69b8c9b0b60a147837c538f2fbdaeaab16b27eb7c554e9bc1aad6c2563b08f3c1a759ef9e SHA512 4d7ab65f12d63065e895947285d5aa1b9003324002b0f657e7ded975c90eebd63c1033ae9a01969c42d446b0ea878571af62776bcb4a8834cace173f908c76cd
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
+DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
+DIST synstructure-0.10.2.crate 17988 BLAKE2B 62bdc896819ba1f0820286dda3596e265dc7ebeda83595d89ad6baf584046242f774141b25ee4cd9b120bd7c392973a99d307abbe956b50eddbd05e9b7b7ce72 SHA512 48da0daf778cd18547e51a080f1e86149534527f20026601b21423c9f89cf6adb7a121b01dd9bb0b680403eb728a92e75242e5ae31a725ea5b1f19c5f47f0458
+DIST syslog-4.0.1.crate 7131 BLAKE2B a6555d6eed6a0701cca7d58554f2ee612a5d18975dc1979414ac536128e0e7d4a67dde0ad2e40b5ffec823f7edd55dc45d646097fcd457fa6124de95411b4c55 SHA512 faff2117fbf377343149e30a4b338fdd799fb7e4bf425962c2523423f8322aae75f180e4a4c42f1497239400cc60a49cfcf65c00c48433ac956ff17e52063341
+DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
+DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thiserror-1.0.20.crate 15950 BLAKE2B 747ff4ccdaddbbcc80225164b203cacc8669796e3c1515db9011f053486ce8d77a4560ae58756641fde7465ae6c818ddbb5b60641d1e5ae288ddcc549eef1848 SHA512 7f8e201f8d173112c7009fffa79e6d2bda5614cfb0439b81a9a990b777261de792d7e7750d75f7638bd58e6d72d183cffbada902595f425f037d6df04c0528a9
+DIST thiserror-impl-1.0.20.crate 13197 BLAKE2B f7da61d0dea4864bc3fbccad178b67f85223ab9f9529c118b07229d55a2568f23888041f2cd813efe51dacf8e01de62397092f56c43c640ba97a32dae2b7cd6d SHA512 3ca4dbdeff76c12c5a716d811891ce14bb16013749a45b8d8fae9cdc599e304065665dab051713d7e8e5bd2d2485ff9fa0904ca3cb5bf9e19f2cf66b42f10209
+DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
+DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
+DIST tokio-0.1.22.crate 70031 BLAKE2B 44a6d1ff8bbedfea304e4f44b5c4bf998876a632adfe611c3d851aa64ad092b7b0150c2b39ebeae8bb34cca6824922300bb3fb762cce6b5a1fcfa852ed8d86f1 SHA512 d92b8527bbeec84bb306686a7d29b705c36b59e9c0995154ed95d483c84952c838691f8c11615f481abb6c4fba470ba8968860a74a88b77dd67ccf659bf4e4e1
+DIST tokio-buf-0.1.1.crate 10815 BLAKE2B 0d3970a3722e3be109f8808bb7e26db618ceb22a8a1156ce219e6af9930b7f9f9948dab61fa4fa146e5eefcb7deb1332fcd643e0c3e64a879ce32305d0efeb94 SHA512 42f5db4f9ff1d0c6728c9ca899b85e40eaa92910d23f01dd7570c5988178879f3977ee2ad14f0f224562fa73ff8b01687dc963def2c62e93ac471903d5ce4e81
+DIST tokio-current-thread-0.1.6.crate 19339 BLAKE2B c3fe401178089864fe59286566b84a325d8a4101b0b72dda11fefef945d5e14b5e6b6c7de7d87cf222f0ea3d1c95aa65f2c43fe37c2e766f8d70da66c7d060ec SHA512 321d8b99ea18827400a6b7899755eea5a8299e53985f5640a6fd82bf6c3c5c45c68e9d125666968976d05be407d6c15401380870adc231233cc532eb979353f6
+DIST tokio-executor-0.1.8.crate 11775 BLAKE2B 0cef2a4848f624ef8c3a450b06d8530ca64be193980cf1cf6f4c1c74b6602e9e0f47ac070caded410a843938d2c3defe8696e4a27329d42d04ca9cb4f6d7811c SHA512 b6340dfa0cb67da1b00288b3250cfa4f0b55907d3448768f99a7cfcd46ebd1155c84cd35659d740501f0575e9c5b660a2f769335acc14da7dd5cea59b10b6334
+DIST tokio-io-0.1.12.crate 33555 BLAKE2B 5646f1d0c226d223fdbf648d95cd690ad6f755c5dfa9a6bc4d5fe4b5df634029db6178d852d3a4c2d481d06eec763985186753088157557871e5ba6e8aa650af SHA512 57c675ade48f2885ab8f42dac7297bf4bc5f7abef2302f7964dc145ce29d503c09e3ff890de01aedcf0c860fe22d2161f9837d658457695b6205e601fac74149
+DIST tokio-reactor-0.1.9.crate 20657 BLAKE2B 433b1302ab41d1c028c1fa726b796d41484526400801df2375de04faa1699cece0d55717f8ba4fc292d33fbc7fb343f766c1d474a36e36d72947bc7572e27a24 SHA512 134c78b449646f1b7cf9dc87de0f39ebfdb894103e0271a2b5115320add04de02aa1899206f332f111a9471f1f54776fe89e3ff879648fa206100b2be12e24e1
+DIST tokio-sync-0.1.6.crate 41598 BLAKE2B 855421bc62d8e09358c40c6692f770e78d2dc7acecfdac499d31aefd4feb70b93c104ae46fd7b64196d7667b232ca5debaa71d9f09d20b497a5b170133f87a8f SHA512 bebfe2173d544595cbc162fce2afe1574f267a08b77c8e056358cc4e959a94f1e899e47e76927e374ab1f51751079b283e0d13479a4a40c7f754cacad2578a1f
+DIST tokio-tcp-0.1.3.crate 12629 BLAKE2B 16a2763eeb2b65edd07f9b998535812efaa25584bfed5fd66fb1b2952893fa3ed330f597032b4140daf9635ba4f49e77aeabc2cea82c997dfc971bd97fa4f5d0 SHA512 ae42facabed1589764a8e4f789dabf5c7adfb3a67880a8bb6d7b0b6c082302a84b6acd8ec5f444dc59284407acad61518d60818eaeb34f874380f9593d540336
+DIST tokio-threadpool-0.1.15.crate 50047 BLAKE2B 74c7be4e542b9505052e29a97e0516a6d0ff3c9588da744881890cfa576d2c707f11c32a751169aac52d2478fd9108cad5b978c94cda639cf29338243943c797 SHA512 aa36de397b8a0dc9376073bcb2e661ff5fddf2754b391b854d8683398cf56a69e79a6dbd3f6e76d9d851752757a75b79673cff36b9e1987ed4c30dd38f9d483f
+DIST tokio-timer-0.2.11.crate 37578 BLAKE2B e9dd19db8bbba5edf74f7354d4d5e489780b5dbf009be095e7f00bb9e2276e10ebb643605beb6ffb035d1a7a0cfb23eede14e5ebdd228ee05ad9244ac3d1273d SHA512 2bb534417425b88dd1b90231cffb89a8ab97512f1ea9e26cd4afeab5f3aa691433062f093a6789222d1892532a9cf29e1016fc668ce2939536f89e0441740d57
+DIST try-lock-0.2.2.crate 3638 BLAKE2B fdd33b9760b12db5c90dd9c34980e62d061e1a691eab760ed80dafdcd1ae82055b4ccac7313babb43dc9f2f38d3cac3bbf3f586b26f407fbd035c5c3dfca168d SHA512 aeb54abe3cc02d5dfd0d13010558454e5caab2568bd923a035dfef5ed5d3394b4bab9f7ab21dbaf82f1c20ccd95955bcf6ac2bdc976a824d9508d6f2a27ef330
+DIST try_from-0.3.2.crate 4264 BLAKE2B 13a4f1698e711981c183478b4bd4138cc90e8451000e56c965691e7d0be96e3cd7ae78aca891ae4a0d6726ef9a1d3beb26e4a4c18042b409a232a467ac36c11a SHA512 a619b8fefaf8c25037f1e2e7f8e64506144c8a7080ad930138fc3c4a2541dc7fc83ffd9c9a8c762ddd57028072cfd8dcb9db0c590e3ac30a4863f8d4fbb63739
+DIST twoway-0.2.0.crate 30569 BLAKE2B f8f9f15b531a91aecb4e52ec228b5c3845edb263813841c566d75f43c955831aaf5e4c058794f489127c01bf4dd16c47783f4430348c1c5db1c4e104827556ee SHA512 1d2f75492089b9233756bec05eefccf09c7c602a3a12ab4b880fe712ff5b3328cba5bbc608e970576f3cb20b088dfb8551ab74a2f17a64132941ccc87076d5fd
+DIST unchecked-index-0.2.2.crate 8325 BLAKE2B 25c7bbee1d3b90bad05a91131ce1647a48b97e08a745e9cc8b829e1e9c2e1a6b650715ae7747105df07096607fc929ad7b8d54f06e23c662c1750bb4c7e7ca1b SHA512 3634e077fab98284e6e99bbb1fa6691f58d2c39ece67c65c89f8142820f0bb1836553a107f49eec0c72455c47807bd8bc1aba940029a6e27b4b79b9be79b2ca5
+DIST unicase-2.5.1.crate 23105 BLAKE2B 70e6c6b61e4a1e4de56174eacd08cef19d68202d40f403a0958d56690546a4b72f2fd0957a1d591bbe49fe6f6f5acf8c1b03b7eb884873b469c61aee7466335d SHA512 fe77fe7dacc1a340a760f3f474b2bcaf3cc0ad1b71ae6b5811dab77faaaf8bdf4bc8158682254971702bd648769ec776689560f4c2ed5c8c544cc04ace4608fd
+DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-normalization-0.1.8.crate 71158 BLAKE2B c548a2bc537abc6d86bffb0828a366ff82b143dcb0ee01e2c21b3b7134fd5f818f3775db391d358f4ebcb906ff256e3d2228ab042066a3de9a6747be05b8effa SHA512 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547
+DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
+DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
+DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
+DIST url-2.1.0.crate 64776 BLAKE2B aefc8cd2be90818c757312c354a0bd39ae08a52fb7d5a2a4552ffac3488a4bbc60c3f502ea5cd861aefbab02b0748e4bf35c49592b8fba4377cc17207c666d0c SHA512 1736f512039771b4a365df84937f039e1a0a3c90b827614af47403934ccc4af60077ae13ab585bfb1dc5bd88222edfc890b4ac2ab31872adca2e31bdf5ae45c3
+DIST uuid-0.7.4.crate 36325 BLAKE2B cc27afbfb37e01cf83ffbfe239e175019cc1ba77ac14d6392bff833b3482712a8d808cf17aa4e922a24e4728cfa60bc96bf03b0053b0126b65fb7fb583adc1c3 SHA512 5c0d5f85b05db505ba6736437c78fc62e7a961ec1fd7d262749c282ae41bc1b1adda373644790de64ebebf59a200f8e610767f3e5fe0caf87305ecd5a229c265
+DIST vcpkg-0.2.7.crate 11012 BLAKE2B 3d97c24c3ddafc4c5c56d54e682c828782d6900a10caa48552892c174e897c6b92d0477a2515df889c25297e43dc57538684cd761b8ff9f6855f6a6b748f4446 SHA512 d298d8a3de58138a4be622b3038949d29e92b83941765fc3e25539a3779451cb9deadceda9bdf46186700c01eb65bb1b5c03e3b3cf7a5fe1c48c06e1b1591a1b
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
+DIST want-0.2.0.crate 6265 BLAKE2B 4db642e6016fcb0e2b1ae595836af4ccfa3798a1333b71347ea5fb30c95dd6aa0fb8dc827fffe274503e284abb0bc73ad11955f26dd77c5c265cc4a041ffb698 SHA512 1264e8095ba41b6cde85517538449d99f05a40207437bad9b618af3668ad675a3517b3d190e8b962820e2c302146d8d0571b665a1176c090ed75a4e83e8c5b59
+DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST winreg-0.6.2.crate 19338 BLAKE2B d866995d54b69077efc1bb900235a4c00d9e69779cb365ad2fc97686a6c13de6a91d6204856ea35a18b86a7f32e8d4ac1ea2d2c096d7dd3e42f78400752cd3e2 SHA512 a2b6a7a0fcdb1f81dab62e1626089b6fd753a2233f9496505420ccb7997765c34293ce07b724b8179646345e0f6819eca88a6c167a03d8439a386fe53e184102
+DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
+DIST yaskkserv2-0.1.1.tar.gz 179125 BLAKE2B 28f55e7f584f977b1bc767af69211229d707752fb67782d75b9826c7cff7fda0c33efe9700fc95eae42eb7bd0d964df0f37e037416f0c1ac51182db3f788b413 SHA512 6c7749f7f36bf67ce5864b359eae1d3b6bf40bde7376c825274274cd42103e5c536ef000d8a00968a5a3d2099745f238d314b30352a2906cb315a710744549dd
+DIST yaskkserv2-testdata-202110.tar.xz 6789332 BLAKE2B fc7c44ca9899972095f37f01e9c08c95c763ff3fa027a785f8d979e4a8c6f0ad2defc965e1d3263d9fbc595368ab83022a2b615712b0795854538a68c138fc93 SHA512 351a5a67014bfcf0f8ed16ba171c59936e26c3aad960a44484304a0df86d26b2a6f75a3c4762149c5dbcc7c7717cc29559e7ce1b2f0e79f913c33501ee63e3c2
+EBUILD yaskkserv2-0.1.1-r1.ebuild 4698 BLAKE2B caf0f27e3921ec913c9eb01169e1b5ef91062e211f8173f23e6104e64b211bdd1ed5d57b63b9685ecf5c869f334c08a129158f276e50d38642bcc07038bf5590 SHA512 3f4b5367062f360b6e2af118710b3ab12050b41131d71d5d6f23c11183f6ea3df62a6cd521d9273316005c813ae32f3f91cc29f151c8aa3c7a22afc178db2177
+MISC metadata.xml 319 BLAKE2B 8dbf2c5097b7ad970f993abbff0032ea96967ce7fdc52daa575051315afb06d7d9672a84d9f302364a335374a32ff02887282bea59ab794f6d4052bf6cb1c5f2 SHA512 464009ebdc81836c45ca9397f5fcfc544f1208077ae4e342ff23388e7b3da829eb4296285ed08399efb1d7fa26f1f307b52bf380c8da66f5dcc4a73e8b5356e6
diff --git a/app-i18n/yaskkserv2/files/yaskkserv2.confd b/app-i18n/yaskkserv2/files/yaskkserv2.confd
new file mode 100644
index 000000000000..88aa250a0128
--- /dev/null
+++ b/app-i18n/yaskkserv2/files/yaskkserv2.confd
@@ -0,0 +1,2 @@
+# Options to pass to yaskkserv2
+YASKKSERV2_OPTS=
diff --git a/app-i18n/yaskkserv2/files/yaskkserv2.initd b/app-i18n/yaskkserv2/files/yaskkserv2.initd
new file mode 100644
index 000000000000..c07a1b30eadc
--- /dev/null
+++ b/app-i18n/yaskkserv2/files/yaskkserv2.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/${RC_SVCNAME}"
+command_args="--no-daemonize ${YASKKSERV2_OPTS}"
+command_background="true"
+pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}"
+
+depend() {
+	need net
+	use logger
+}
diff --git a/app-i18n/yaskkserv2/files/yaskkserv2.service b/app-i18n/yaskkserv2/files/yaskkserv2.service
new file mode 100644
index 000000000000..860da38ff83a
--- /dev/null
+++ b/app-i18n/yaskkserv2/files/yaskkserv2.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Yet Another SKK server
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=nobody
+EnvironmentFile=/etc/conf.d/yaskkserv2
+ExecStart=/usr/sbin/yaskkserv2 --no-daemonize ${YASKKSERV2_OPTS}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-i18n/yaskkserv2/metadata.xml b/app-i18n/yaskkserv2/metadata.xml
new file mode 100644
index 000000000000..488bef8ae6a4
--- /dev/null
+++ b/app-i18n/yaskkserv2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">wachikun/yaskkserv2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-i18n/yaskkserv2/yaskkserv2-0.1.1-r1.ebuild b/app-i18n/yaskkserv2/yaskkserv2-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..1233b64365a2
--- /dev/null
+++ b/app-i18n/yaskkserv2/yaskkserv2-0.1.1-r1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CRATES="
+adler32-1.0.4
+aho-corasick-0.7.6
+ansi_term-0.11.0
+arrayvec-0.4.11
+atty-0.2.13
+autocfg-0.1.6
+backtrace-0.3.37
+backtrace-sys-0.1.31
+base64-0.10.1
+bincode-1.1.4
+bitflags-1.1.0
+boxfnonce-0.1.1
+byteorder-1.3.2
+bytes-0.4.12
+c2-chacha-0.2.2
+cc-1.0.45
+cfg-if-0.1.9
+clap-2.33.0
+cloudabi-0.0.3
+cookie-0.12.0
+cookie_store-0.7.0
+core-foundation-0.6.4
+core-foundation-sys-0.6.2
+crc32fast-1.2.0
+crossbeam-deque-0.7.1
+crossbeam-epoch-0.7.2
+crossbeam-queue-0.1.2
+crossbeam-utils-0.6.6
+daemonize-0.4.1
+dtoa-0.4.4
+either-1.5.3
+encoding_rs-0.8.20
+env_logger-0.7.1
+error-chain-0.11.0
+error-chain-0.12.1
+failure-0.1.5
+failure_derive-0.1.5
+flate2-1.0.11
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fuchsia-cprng-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.29
+futures-cpupool-0.1.8
+getrandom-0.1.12
+h2-0.1.26
+http-0.1.18
+http-body-0.1.0
+httparse-1.3.4
+humantime-1.3.0
+hyper-0.12.35
+hyper-tls-0.3.2
+idna-0.1.5
+idna-0.2.0
+indexmap-1.2.0
+iovec-0.1.2
+itoa-0.4.4
+json-0.12.0
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.62
+lock_api-0.1.5
+log-0.4.11
+matches-0.1.8
+memchr-2.2.1
+memoffset-0.5.1
+mime-0.3.14
+mime_guess-2.0.1
+miniz_oxide-0.3.2
+mio-0.6.19
+miow-0.2.1
+native-tls-0.2.3
+net2-0.2.33
+nodrop-0.1.13
+num_cpus-1.10.1
+once_cell-1.4.1
+openssl-0.10.24
+openssl-probe-0.1.2
+openssl-sys-0.9.49
+owning_ref-0.4.0
+parking_lot-0.7.1
+parking_lot_core-0.4.0
+percent-encoding-1.0.1
+percent-encoding-2.1.0
+pkg-config-0.3.16
+ppv-lite86-0.2.5
+proc-macro2-0.4.30
+proc-macro2-1.0.3
+publicsuffix-1.5.3
+quick-error-1.2.3
+quote-0.6.13
+quote-1.0.2
+rand-0.6.5
+rand-0.7.2
+rand_chacha-0.1.1
+rand_chacha-0.2.1
+rand_core-0.3.1
+rand_core-0.4.2
+rand_core-0.5.1
+rand_hc-0.1.0
+rand_hc-0.2.0
+rand_isaac-0.1.1
+rand_jitter-0.1.4
+rand_os-0.1.3
+rand_pcg-0.1.2
+rand_xorshift-0.1.1
+rdrand-0.4.0
+redox_syscall-0.1.56
+regex-1.3.1
+regex-syntax-0.6.12
+remove_dir_all-0.5.2
+reqwest-0.9.20
+rustc-demangle-0.1.16
+rustc-hash-1.0.1
+rustc_version-0.2.3
+ryu-1.0.0
+schannel-0.1.16
+scopeguard-0.3.3
+scopeguard-1.0.0
+security-framework-0.3.1
+security-framework-sys-0.3.1
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.101
+serde_derive-1.0.101
+serde_json-1.0.40
+serde_urlencoded-0.5.5
+sha1-0.6.0
+slab-0.4.2
+smallvec-0.6.10
+stable_deref_trait-1.1.1
+string-0.2.1
+strsim-0.8.0
+syn-0.15.44
+syn-1.0.11
+synstructure-0.10.2
+syslog-4.0.1
+tempfile-3.1.0
+termcolor-1.1.0
+textwrap-0.11.0
+thiserror-1.0.20
+thiserror-impl-1.0.20
+thread_local-0.3.6
+time-0.1.42
+tokio-0.1.22
+tokio-buf-0.1.1
+tokio-current-thread-0.1.6
+tokio-executor-0.1.8
+tokio-io-0.1.12
+tokio-reactor-0.1.9
+tokio-sync-0.1.6
+tokio-tcp-0.1.3
+tokio-threadpool-0.1.15
+tokio-timer-0.2.11
+try-lock-0.2.2
+try_from-0.3.2
+twoway-0.2.0
+unchecked-index-0.2.2
+unicase-2.5.1
+unicode-bidi-0.3.4
+unicode-normalization-0.1.8
+unicode-width-0.1.6
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+url-1.7.2
+url-2.1.0
+uuid-0.7.4
+vcpkg-0.2.7
+vec_map-0.8.1
+version_check-0.1.5
+want-0.2.0
+wasi-0.7.0
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+winreg-0.6.2
+ws2_32-sys-0.2.1
+"
+TESTDATA="${PN}-testdata-202110"
+
+inherit cargo systemd
+
+DESCRIPTION="Yet Another SKK server"
+HOMEPAGE="https://github.com/wachikun/yaskkserv2"
+SRC_URI="https://github.com/wachikun/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+	test? ( https://dev.gentoo.org/~hattya/distfiles/${TESTDATA}.tar.xz )"
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-libs/openssl:0="
+RDEPEND="${DEPEND}
+	app-i18n/skk-jisyo"
+BDEPEND="test? (
+	app-emacs/ddskk
+	app-i18n/yaskkserv
+)"
+
+QA_FLAGS_IGNORED=".*"
+
+src_prepare() {
+	default
+
+	sed -i "/^dictionary =/s|= .*|= ${EPREFIX}/usr/lib/${PN}/default.euc|" etc/${PN}.conf
+	export OPENSSL_NO_VENDOR=true
+}
+
+src_test() {
+	export YASKKSERV2_TEST_DIRECTORY="${T}"/${PN}
+	mkdir -p "${YASKKSERV2_TEST_DIRECTORY}" || die
+	cp -r "${WORKDIR}"/${TESTDATA}/* "${YASKKSERV2_TEST_DIRECTORY}" || die
+	cargo_src_test
+}
+
+src_install() {
+	dosbin target/release/${PN}
+	dobin  target/release/${PN}_make_dictionary
+	einstalldocs
+
+	keepdir /usr/lib/${PN}
+
+	insinto /etc
+	doins etc/${PN}.conf
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_preinst() {
+	"${ED}"/usr/bin/${PN}_make_dictionary --dictionary-filename "${ED}"/usr/lib/${PN}/default.euc         "${EPREFIX}"/usr/share/skk/SKK-JISYO.L || die
+	"${ED}"/usr/bin/${PN}_make_dictionary --dictionary-filename "${ED}"/usr/lib/${PN}/default.utf8 --utf8 "${EPREFIX}"/usr/share/skk/SKK-JISYO.L || die
+}
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 2e3f9f2756ce..25b383d0965d 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/pushgateway/Manifest b/app-metrics/pushgateway/Manifest
index 4d9cfd21a3aa..53503ef039aa 100644
--- a/app-metrics/pushgateway/Manifest
+++ b/app-metrics/pushgateway/Manifest
@@ -4,7 +4,39 @@ AUX pushgateway-1.service 477 BLAKE2B 123c630e40ca47626cf1d6bc93e8556ab1fccb1dd7
 AUX pushgateway.logrotated 95 BLAKE2B 78db6689bbfac484b13a3444ebef47180aa94bfa6fa0c6b4fe273f415713b539116c1c05fc5348d504b9c6de270449a422fa7f49e63854a65d4ef6d25c3bf8c3 SHA512 615a8d105d97412b6819f65b9e34e28cb326457765ec9426f33d71cc4794aa1cbfff0abbcee14dbf94b6ae3f622c95d087ad485250c48b3e3efa8edcfe997069
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod 960 BLAKE2B 879529244d38fbecdaea27588031c2d0d82551d8173f7e41f004dae8356e2264259d80e66953e941aa856a9613ae82211ea8dc0b12f9188f65bdf54487052952 SHA512 cbe178d04fe28f9b7dd07b0317fd4404d805e80ceada4953ad47763bafa2f215f88464c1315261a902ebcc52145af09df4c96a341e42644d38526909fcef313c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod 1129 BLAKE2B 975226b22ad0291e83a5e47d901c79ac5a7c684010972581dc15f9713154141f3d6dd7231407255240620e29cbfeb877f05f5b5d388100a70d381f8f54f7db5f SHA512 70400a50eedc5305fef765d38f0428f636f439195d09cbb283ee7779b8aba1f881f83d894acbc6ee90ff016358aa9b117c79557da15d10fc60264eb36ed3fe3c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod 1226 BLAKE2B d0544ce288b6beec6b76bfd106924e8a9ad50913946ae7e8243dc3e61356363a361384ee6c827bb4040976d783b217ad1619be3a34cba533940ed4ecfce4be41 SHA512 104e7cd0eb1c4a3bccfca3feb31f1530973d4829d853ee30e8e03c2ef80ccef784bc0560342d31d8dcdc6d410fe8f64a302140e452fb77d96ea2b342bfb8b319
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod 1149 BLAKE2B bc4e8c16d0c809b4f5d46d8b29112192ff51066e7df99242923eed643339599ca3d1180afe571c3e826d656d935ccc9ff1ba1b79701de859cc15364415bb35ae SHA512 de15381b36dd6691bf40592be83b4ae5b58fc92111a3ccb8cb4b540e1230dc0798d86c149884e8dfb6f93ec827447acdd7ccca2f2942c81aeafd1b035f5c482a
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod 982 BLAKE2B 9e5e32bacbfe15d8c72b4ee66a6e4124a3d58b989ecf022cdcda38e99b83924382f412067de8f6bdf3b1ecf8deffdf8fc74a8be671221f39fc2c8b11b2919e88 SHA512 86e2e042bcb371780189029b21afe24ba8ee166a9c0a4eacc314444844cfca3dfdace1678b01a213b7452cd69acd1d46b7051614569b99ac6fed84887b0e3097
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod 1048 BLAKE2B 8e1306450c5e8dbba561b9b24ed532f78fdd40a27c989b2bb6a981f4583959f4ab71e913685444c291648254455662909243a547bd623aecc426a1a6971d0376 SHA512 deb18eadb388fdf52fc6345b05c30a459777f3cfc67ed44d072a16e214c4ad1ef88d4775d38a3abf03df26d42fad13405f6fba081c5c19c129ec39df1973d8fd
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod 1096 BLAKE2B 6e3982479d332fbcf74ee167d41289e6f4cb4c2982e85e0631bb4b2bad291d3b76d86a8c4e18b7aec9e6494b54e67a0ff2b2b65ff3f113f530501ba964f93e60 SHA512 cbd08504799b151d34a9f3594f0713077ed5b421ef9c0fe9dd90b773638617e6f6aa153e6241dbbffa891fdaad4b14e0523834cb45e84d28f7e213b007e7e08c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod 810 BLAKE2B 50cf503d994003d7974ad786a741c1429b44d6764bd9d9ba58139fc5fb88c0264a7e908699ee35667f4e827cbc59733f7fbb8b38837b495d4c23c2d10b1da114 SHA512 b6dd5fa24e928bad836e791a19a0d707c755d6c2b75c8f60f42a9e0410e91034373b01baa61104c24bf1565adade99656948c75be08cec2f945bb8bde91046d3
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod 831 BLAKE2B 9d34710c0f721d3f471c3da32555b4a3e559474afb8d30237b0935ce167e7bcb5507d2b19bd6675da724927109ed74ba79dc9dc3b3d8cb271515ef2c6bb0c7c1 SHA512 d1a718c4ba19ee0d4221858dd0710cc480fdf6c0b134f1ce5c4a805b15cac88a77e73f26e79f480b0852a6c0f499c63876dacdb3038ea40d38e9f8ae577ce219
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod 555 BLAKE2B 6707e248be1fa35970275388888eb7692f976a8fca6ddc7cf02e355f8d44264c7eef6d093d90c115670b7a3b495658b79e622c47d1c90b95684b8d32547d7342 SHA512 2df2dbf07037f027100f8beba6416c00fc115fcde2dce19ea4c0fe4a036e8f66f7ae278e9765d0fc80149a330e6dd90eee8e9a0c93aecfe16da65d02320aabd1
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod 631 BLAKE2B f7d342f7b6a9e0cc3249d9133a5408e9738957c57cedb13a64bd54d638cf85a17902bade3b452660b5e8b6aa6dbd76e0e93f0b0e4f5711856916879049f28e13 SHA512 3de4d1cf52d35112353c8d7e76df9915e92ba8addcbcf4c72e6d24c677bb642ff0b1011fca4e17dd9d364a03443710f452effb51965d95fd1571358b9aed7039
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod 489 BLAKE2B 036e068699429032701dd26044fd2353645e54260a7aab7f924fbfa1e1954eb814addbd9a0751ed1c786ed6c44566db5289cd4ba9e54727d5b24b6edd38a8562 SHA512 5f6a8f8f2d4ab26bdf3f150f22e6ef4feb26f264630315fdde8c171b6c2da5314057c4d763d4c61a66bc42badeba2745f576d52009c4549919e4afafa748b3be
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod 649 BLAKE2B d4ef60eed1eb5c4b84623a6bfb8bcdd52be49ea6723e2c39f8c7c87e34943aed3629d7413fbffbbac9e888bfbafd6f0f07ee84002901afb3a8cf1090b87b53a3 SHA512 3adbceec8b4bd989e804054b56e271f73658adc8a4a8bd53e32ced709a8796b33d9cf09f5ea3165dff931acc942de45508ae79634dcd9722c2220814b275f425
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod 639 BLAKE2B dfcb82794bc8e88465ca9c754b798d6f1f270e1fe5891221d482f6b5854524d09e3d19b6f75e494f69b4861e2f1b2329c08fe9e4235005f2dff41928950dccc3 SHA512 74886885016c92ce56b584665bdcc925404bab745a25ace03dacc2ace3f812a0d568ab8d19044097906b9da479037c41468c33f1243e6d55b36fba4571117607
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod 566 BLAKE2B 93ded2035caa89bff7ac5a432c713751fa04791c513b9464c409524157c62d0ad19929a65126785a1d167c499fbca2289da6e6657ab182bf38234a4d2f380d72 SHA512 e7056a89df84a1027e2dcb4e15c6e89e0279d4a8bf5a45dad7778587bbd06f5f359c7addde5a5a62e0cb454032cc3ae0fc443477bf2adc3422cb0c38009f4e52
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod 755 BLAKE2B 2a2aa8bcee45060e8a277379fabf5ce73a2c0a0abea8802c1bf152e31522b565b969ace4a49367048672908e55142c18b3c4ad60c7a468866ddf3316c722699a SHA512 2b2720ffcf11b02b3e12e794132f0d25e5e0afa08e4d617f9d4147d8bafbb6f00c8aa4c5776e039eba4ff5c8add0b4e73c8c928f4b155c5c386f09a4e06b765c
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod 858 BLAKE2B 7efdc0f9b152a5f49c07fb611f1807548f81f18f3a63b54d7f6d49a2f27c40941dc2c266e2abe0cddc60844ccb237bfbfd8afa3daa3f13c3a7ee34093e1a437d SHA512 de93e34151997c18f5d0211702ffbc19cfa1bbcd77fa6d194747e1094ffdefe7014a197f3a7c28fe99ae7677dce76e049566caeaba8a067bd4507dddeafc4f6a
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod 625 BLAKE2B 43378388e5a3391a431d0e842e23ef1fc74263a797bfefacebb61ad88b42f21d133d99638f06e03cadb7894d271884f06d1f3ad9743648c31b7d22bf7e19283d SHA512 0e2dc636df1de8119b3b4153466d8f31b4e2e9fa637c625ea0a7fd94951ee38edc02064cc00d7fe9a4d9f7e3d1ed521809003602398d68508772b11939755cdf
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod 622 BLAKE2B eda541042b6fe3c3f77512f322d535505b5545eb72dec0f4f3440af05e037bda987f1f97faf7a94ec946201e8ca26a2220bc570d7a9c40a08cfadd724fc2973e SHA512 2825d124965f45e40b36bc1d2f8133f8a1fb5ff94dd95d2ae4383bc4a300ddfe0efb75ace2f9408582525c377769bd1f75cd3c0c655c74aa75708f7a66c56352
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead SHA512 33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38
+DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
 DIST github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod 35 BLAKE2B 68297267e33add40ca12e681b6b4461ef8a3dd23eb205a365b13b158d0e055e3650fa9539eae43bbbf4ddb559c872b95ed541a3f4330a0ad3395089c4cb9c9f8 SHA512 73bd53e14c96c10e3288cd859b5d7758e6d2897369060b1581b6a4290e233877e408c9dc6350b763c2ab678a2e8f3e8f7f3bf563928b43ad37a48187ccc0ee7b
 DIST github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod 33 BLAKE2B 7013f44d03c22c21595c5369c52e1538a526891c9fc4cccac37373504f13c66d7c504552251f46632917739dfa1d6c3a15e15aec4dc03b9c69902b0bcfc8785c SHA512 db3271d8abd514934ce5d06fd20f7490db8368e57822a2379bbfd4ccb94e67354400d487d388a57467a5a16cec339cbae9488cecf82e41d85918639bedaa0a87
 DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod 36 BLAKE2B af7b84d9f1cd163555b32bcf960b28b64a5689a1c9694f430af310f5041cd967fcf0d6c1a6c4020478544d347e4ba5b2fd16a6ef54258d33314ee0ad9239752c SHA512 917ada7ac198a013d2b090dfc59a45bd2619dcb7227df1521ca38a0d822fab12ea8c158c526257fef4ef506af29d9fa678e8dc2a73fc13c8dfeb57b398801744
@@ -36,8 +68,12 @@ DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod 35 BLAKE2B 6
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
+DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
+DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
+DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
 DIST github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod 32 BLAKE2B 5483978ddce5f57e08f1358c34e5ea6b26a234e017b2e3a9af91296de3c79756f73f8cd9629b7d04c88e2135f30781cd0f43fbf9eceacebf26f141bb297f376a SHA512 865b4cc3ac91138e9b4581be778685f89bb93cdaf2372bb7b5db6227e249a2be89d5d14c89bd0e874e01d744aafc08b30b3ccee18a472981bed0e7740d892da0
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
 DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod 41 BLAKE2B fce07437afe34fbb38dc2b3c8695440413610213aa82b910471dfdd37a5dfabd332513dff18fbef7b84469c0c137530e821e2a5adf0e660a96bb78446a084cc6 SHA512 180a8be6b0f3596aa376ec5f264ee545a082328067b3ffa5523634cc95b106328fbc6330fffcada0a1cf250c3a988971073441184b9194fe0d05fd62a33901fa
 DIST github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod 40 BLAKE2B 58aa150182b5b43107154bd337eb024049bc2c7e2d26cf4344c97d554e03d4175862ecbd1b65527aecc85b9824c474c3e5a49eacaad18e253cec50785963b18c SHA512 8a0be9bb45924e5d384fa68dc2e990a4705b46e8878558d4db10fb794c8e20b13ec54831e7387cf425613f3f33b5952702deed074bee5818fed3fb9cff7b4259
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
@@ -55,21 +91,31 @@ DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d57
 DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod 32 BLAKE2B 51c322074fb7a69418dcdfd2e54b187fbfe541c21a979c8bf8b155a6264cc670eeaa95c2949f2b760b187fa582e86688a045f3f022cb45f053a58e00ec2c0c60 SHA512 bc43f85d5a21cbdf4b3821e707c845d08f8a6d8f2c6ef0f6ec76f7711c53bb4407f2a356c79bbbda438fe138a3cf74a4b279e8757cec7aa134a93f2173b931a0
 DIST github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod 33 BLAKE2B 52211e27792f060734989af8b47b48f3f9edbdc94b49917d715bd8853a3f05ac714cfbf752d3171b4c223a8787497df16e1ee46b07203a6d2c4cae3540c66af1 SHA512 ddf8e796d04c0741342eae18ad343861ad7a76d030a5dd9a27b1a68b2944a0f94ec21b1513640179c73c16d79ac309b8552dae42d6e45bc0f03d33269666bbf6
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod 46 BLAKE2B 26844d83faf5b29bc13a3a48ccf6a3648324503647617e8ff13baeabe4d95ebc0e4f2ca5014b553148964625323dc1a11bbc0a4fb5357be97770a3b6cf808bc5 SHA512 5ec3e01429b0c86caa7ee04de7fd70505cacce1ed540081ce4c40143c8776cbb75443dbaa47642da02e263c02c7e3557d6425c3cb60f03a5bc296a1cc3b6541d
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc51330df71ca612b3a573a93a8ebe57ef4e677157835221dfc5f7bcbada1fd90f7a6a3a002cbde08c6a95642477789d532ddc80e7ecae1f9e6e7c081364e970 SHA512 323c4b1c27bdc5bfb1795f1353d21ad6b7a2056bb0b364adab5960aabb7bea20ab3287ba60685df130abddbd66c3d82dc98a291aff1849dbce8c182c63c7b0bf
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
 DIST github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod 33 BLAKE2B 69d161a91f7a47f08054ac8715154885a3615d8366b32d226a08f3bc975f6c87d168006620ab53fff5ca938232f06ac9eccb1b7c0621c91f9d7368b38cf29bf4 SHA512 9376e6913b3d764bcf0de41f4d6cffec4da5a8d387488cf531113e1597371b838fc398020bc85fdbb0583fcd9fbc2fbcb23b246c3d8147a6c606bee3f0974882
 DIST github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod 32 BLAKE2B a4dc1d6fd70150916e3bab8b310fe7ba5c26aacb90241b18ddb51f2608ebcf4e82f29495e663181f5a7b1f0f09e0659607eae17850dd0bd3ea8dbdc0f4fa6ad1 SHA512 1e3cd7f2ca465a9930734e27984262e81d563551917c8af55c521f15cfbf56a423ef918fbd282b4947c81a65ffa1c17294d4cc83aae639d9432dd3a52fbe8e83
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8
+DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
+DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod 2670 BLAKE2B 211a6d7642da991f148a7998fd35875f316a143c62337214ff428b4eecc7dee7db044e42f337edf531edc70b9aa99f46e349821864a63d384c7d050e414a608a SHA512 fdfed8273d2014838eaed6d4d2b0d92ae905fd796a0fec6c5a0eb27d15ec31c72e1e79973d909a1ac01df1a2e5afac99bf17d5cc7d08f507474c8e8e7ea88ef8
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.zip 461958 BLAKE2B 025cdb8036d1e055a68ecb215d0e8464e0840d5ad9f63c7ea11cbdb20998c74d21f5b9d019bd4b36335e9bb485b6fa5ee285eab1080b755aad8bed59e29e7d9a SHA512 fce6fbee13f3b4eae6182c000d809d9d96918ee93be3d460a6ff359b0889299a806e76b9caf364454211116b5acabca02caf2f401e900c95ec41a5bc54c4d693
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod 121 BLAKE2B 6463ba6a856a7bb4efcd00a3369f6593b31b8ef39da4bb16ce1acd741c0808d2243ca7787c0a52d4653a5b402841159e97cd4b42e0f6172ad39429beb2b06993 SHA512 564f0a1b0318004a7ed478c8f3a371ea2f59efd56eb2efec4fc806183de1b4a065d5b44aab6dbd40446d28caf5a74545a7ff6a3d428b1b41cb6df5eefc11e5c3
+DIST github.com%2Fgo-kit%2Flog%2F@v%2Fv0.2.0.mod 82 BLAKE2B 59d4e37dde7daf55d8a0577ced1fa94dae6e7f19d39fc77c4b07b78f3b6b28238c498f9e4f5b9dc98f0f68b2b5f1c269c60cf7f2e51d1b813ead995fb4c148e5 SHA512 dbab40bfcb46612aa024f7fdddc749595b6d1d26cdde6d8cc57bd00279b5f437b276887d3a958b9012afc3fcfa9d9050474d3d93c8dcce1a5fc554436dfd7973
+DIST github.com%2Fgo-kit%2Flog%2F@v%2Fv0.2.0.zip 45218 BLAKE2B 27bd08971af513d59cfd81518024f9d63d591e9587a135a2c37c1048f25e6853bc8aa465ab9f04d898f733cca255717586a3d48a6bd88271e87b7fbdce6da06b SHA512 e1176e4ca33e6726d0e968a30ffc7c171c320c635adaee734377cb776aa1276cb99e0b0206cae5c9356c08bca30a47c631bfc7354f2560cbd1b09277860156d2
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod 44 BLAKE2B 0122d72cea88331beb9500849a0936a966e7a48abdd2e76363151bbb124e35481e7248fd896523eba3c51c5f4575dbc13304c2471477757c1eb2f8fb2eee9cc1 SHA512 bfebb8d865586729abcb0dcf4c19a8938f06f9b502c78bed92d01c18d1d037f7df44cc1a1fbd4ca094b1835b8aefbd48fb5988e2884656ca44be0aa83206aadd
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip 15925 BLAKE2B 66134bbd8bbdb9f4ed2db1a77eafd5a0403916ba2dbed0a0da0f7328d2edd7a16a59cd101efba4b5167ec249388027c3a7152de336d1544b98316ae68cf06aea SHA512 26e1b68fb64eb8830aa1140f7cac6d067c7089ba1ce0f10bd59acf9c906add6f64d7797de2799b33232185b8ae9b611234645c324a814c5be338d39a6c2d3488
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.1.mod 44 BLAKE2B 14144a1a466e70280c0a97be84ecd840602176766df6183d4af85fcd37a5e1f6614ac1ee2f5ae53cbd363e9c251682619d03dc88cc5cfcdc04802dbcbadc2bde SHA512 819c2cf17df3f2d6389e71c993279c4586c70253ca3ed6271db00b3d3d86cbca77e18a23d01d163efcf219b03ca30db5ed85bc4758675a2ab2b5bd8933601d5a
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.1.zip 16312 BLAKE2B 8a57575d920450e1afe785ac0cd4eabed3c02adc8bc69a122992ec7a5d1a4e6362b164ccf2d81e309592d4a7e7a482df19944c7aef8f9e2690dd3521ef0b2571 SHA512 fc71f0c239b0cb8dbf1ef7f8257220f3c2f0525fae94146147f1e1ccbe7837983a4ff27d3abc95dc01a30d17a9097ea53618f80c59c3ed672944e584c52c1ed0
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
 DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
 DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip 10204 BLAKE2B 37977dbc6c256bcd404d5b7076ac49d1c3c3c495ad0869cbdf8943b24b80ea5f155c80a0a23571b778e7fcb381140988fd19cae6b8ad681e115260b0fe19394c SHA512 1e834ba368fcac6e13fd8b3a478cbe9b181ec3660087733b68adc0dd41838e54367d22f9bc53e602ece889e6051e319fbf80d5874abcf4daeb0bfb9b64e298e6
@@ -80,20 +126,34 @@ DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod 102 BLAKE2B fc65ca5527061bb3ae4b156ab646ab37acec93f14ef00beb21d4ea93100e13a7f25e7d7bd3860b603ba18923075ccb2e106376f6f55ff261cdaa37ae325c554c SHA512 4e386a43067044e410312e3d6015ae59d6e77506b0db35d08fe7e6cda7b3908a5bcf6fa7432fbc5391252dd4dcb346bf359727680250af1311d5c839a4cbf4d7
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod 42 BLAKE2B 5e9f93d89d4f9aa6ac98c9fcf3f44177e95f08fa3d86789f56b6c52afa19c663fb36ec477a04611be15f51e8862ba90641fef9bac7c09b1baa7321b71b5c31e6 SHA512 603005008f167e32ed8984657a85676cc140d57adf0177895f6f4282a301c7f1fa2d826abddc0c59c725c810cf2356c820ac7fd64c6ccb2be132bead79603090
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod 151 BLAKE2B 9c1bc32114f742984396777149c3fad997bb47288dfe265614a1d17412ae3946581c2e60ff9ab87e784d71cfbe423b7ed1ea5864b6cd3f81f35e9103c8c08a00 SHA512 431b8d4756fe79e43cdc2f8478f3171ac9c90912222e50503301fc83d34c90001fb6ee0fee3bc05f66e47d657977395769e54efa0fb74ba35f34429cc0dac5c3
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod 151 BLAKE2B 260f1bb3e48b0bf9870ea3b725b13f84d2f18a12c6ca1275afcc2897bef547fcc1e893bd6b1efd46330bc1de66a00e3ef133a4418a50a075302aa3141abed8e5 SHA512 b6d7911148c590b3ce2a14a158cfbb94dd56dd402b3a4a2399adcd0421604f85d904244ddf5f8dba65326f04a7817d5652b30a306c65f44fd248ed269485a21c
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod 151 BLAKE2B efe8a8f8394f082a813ed4983158ada7bcd20f92f9f8b9b0d0e61e8dbb968b3c825432ae05d69c9b61a04ad57533c1e60438d9a1964312d4c9168f86864ba2d3 SHA512 2df7aaf6cb36a18165dc458a7b3f4158e2bce3bf10165418de401dd43e06d44378511dd4fea6530cb668a8ebb17b4c3f294ba35f5018e6aeb1b7b9082aac8a84
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod 154 BLAKE2B 8645404d124dde54c3e9c284b1243b1faf2124f2b7d6c5e6566ca600d3c965f7787f09f6825840f5e3ea6d36c016ef2c7fef10e8e12dce354593f7a8a3210a33 SHA512 4c9416c4777123a39b23b49ecf6265295fc3432de083a04dbefc87264b8c69f0d9e342ebb7e8e488f30c3efdc02951fd7dec23dfd1fef0802c8f0250f96612a8
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c8765cdd720690c1067c7c0ba1005bbfae01cd928bc60d96bd82321052fdb18a4ae12119144e34865cf910e306c5116e4f4f56cc5f70f5d52004e SHA512 acbd5afd399b3798d4b24529479b18523ae4009e21acde15a3893d2af75f9a6e65fcbd5a237423849003eb8903718eaa0b1aed9177c390972ab9490f3acc0d1f
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod 124 BLAKE2B 9e60030e0014cbc67c0bc7064eef3b127dec57dfe25bbf7f0d0e2b9c8c77e28477066daf073a6793428116419900e7c9f6dea6e8841a5f61812cf11ff77e7009 SHA512 14a0f1fed404939fad835398d5889ad57621edeb0e183785b3094957183bb29a2026e2af939b94c7155f8496e966116c4a6a2497fab113a175a9aef3f7ec3f32
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod 129 BLAKE2B 15d140a0b2b22d6c9886ee9e517f923fda26ee8179755702a8eebf1ae8cf75be48e8d28a1df1bf875a7bfd499075d83a541c9716601856abe0e7c850a3ec68fd SHA512 467a3f6fb4c941cd55d8d4b2d6a2015966c60a8614691539c88c4bf0da2f8022055be8561cddd0e60b118f74f010be5998dd128b7b136f14edd2674e5650db2a
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod 124 BLAKE2B 4f470777c8d8816c52e0fb82b2ef37d4e9879c46fa93e8e4fc87c46b85c36ee6b4b1ffea22db22af2946c0fd3a12affa9df706f13f2367b14bb1a72c737ddb66 SHA512 6b46c8a019e49c6ed2307e7bf633d4fa04627938bcdffec22da42f722aeceb35de8655b04f69eb651fbc662ac5554b54b393340bec3ef4cdd01be2d7f6d07eab
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.zip 206749 BLAKE2B fc2ddf3b24119173839d650da1e09d8acb6cdde376741fe38cdb19d4386847fa76a7631c9a67fb9d5504961f592128722db40408665ea9230c9c6660be38b9e5 SHA512 de3e38127f326e99c06f2db3fd86ca7ada6358a516d70ecd66fabe9c4a70ef8a82673e379b66f305ee7bcf00e0ccf56242cb6ee8c37420a8622d1e6c51f503a1
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod 192 BLAKE2B 08ac45ddd213c260f4b9d33fec4ba9758ce949c699e2d8d6c7b31bc0fbd7498618cd5144a6ccc3e1b852e9f1a6b7d00191ada7d464dd5784d132506c9a8639ce SHA512 44c996ad31bf02aec42bef934d7cd65379ae5eca4d1069dab8c478be169f9479cbd55f8f72bd9567e51535d31c9f65cd1d56bbefb8b745f96cad0f5953f8c420
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip 206858 BLAKE2B 42c113333104cf0335d16d24748ca111dc44a52b3c6ceb8e11388c85b8ac80c5c324ca9c6d90d08c07dc865909eed4510fb145153024890e4e160cde2b877269 SHA512 6df84a92489b04e55e35bb2334f7e9e55f4fac646e9ad904eca189d069443609fe1affc4cf5e92d0f90ea9c75162a72f134c6298f828608efe9a71b6e496eeb5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
@@ -101,12 +161,26 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip 130974 BLAKE2B 6e4efb8abb584c3839c7b1ab80c8060c125b695bddddd44c57f72c0fbf9de85d40595ecff57f57ddb533e34dbe72a95e0e8043d91d462d68818699f194766e90 SHA512 9cff1690cb177e70b1d67ddd305e4317e3d1ef2825f5f3ed4639210f7f2ee6e89ff03970495757b922f16fade5fafae5cc14c8da2b95694faa3fa48c63f3313d
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod 106 BLAKE2B 642b1dc88eac799a72044e1cb20ff58c99820a1c82b9fb48db65abad1f4e8609c884ce2b94283b29a88567d6f05974640dc4af3475e394ad106670085fd2e580 SHA512 0e7277a311af830264de9ebf0771f9067ae479da8131a02d6528cda56628ea3d8a50af2d76f718da5b9f51de989424f79bd9f7d58825a8d5cf958f2fd02797fa
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
 DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
 DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
@@ -137,6 +211,7 @@ DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
 DIST github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod 29 BLAKE2B 7cd37a0dd89dc331943531c8477a4773980f42e0c135a159bcee3ae6bd82aa8f15c4d67e7fa60878a35c7fcb69d647738095087775e18c540059fff6f4dc192a SHA512 28dafc16202503db863783e4701ab30b34c71b4435a4859329fa635c0915f0ca408dcd8c73217e0751f879400845d8136e171bde5d0cf6b7fa7ec4ae3ea97f69
+DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod 46 BLAKE2B 825c65ce0e045d5c764d3ccae81a25c6224c44656bb8ceb93f39d06a0c8d766ce7562e5ea1ceed903a5d1ad4c035e27ee84b4311548d024e108a5cd6ca142508 SHA512 324450602d8234231b0cf40b07e8936948487354b8f6e92012f3e65ba3c646b0993e4722d3867a12d0bd3749c8dd6fca4a1118393e2ca682170e500b3d54e5fd
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
@@ -144,9 +219,12 @@ DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab91
 DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod 44 BLAKE2B eb9ba00998f4a45590f7ab28d94adcda4e2b511ae7078f5583bfdcc792d34b6eded81b8c0f71ced35b782cd1bf344542673677915b44b9eb31873e9c5d69e133 SHA512 4d591cc0f2d11ba450f294361950972fe0dd71bdff5bb0c3e72b673cad6ea990335680bf7650093e1f9978bc8556a0ef9329ae2e8a14c10b7de668aead7afe33
 DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip 4359 BLAKE2B 4c85e5d2de711987feacb8cc322135e1ac899c3106f5976d8e397b6b7c6bd10490abd144a0e2429139156b51ddc395cb09bee4d257047062053c9ffa4f57b29e SHA512 d5a90394b45dd5179f285a7c6696277e3624c4011dd7ee9818c6a0a03657162bc1bdbd1a6540d167084a74b06b846fa33926f658017257a52839a01c5dea34ca
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod 51 BLAKE2B 4cf5f813ed021b04c810da33b332dbf44f45594e3657779687cd24391d2a93770f2a0e8999fa5a8b6564da5e08ed9fea1e52394907d518ea14a9568adf263e67 SHA512 c5761bc45d554ee6639c4ca23fefa5fc5c8a7c818f8f18d0b43aaab26c8114615543a1be207f5aedaef53c2dda623edeb7d3ae1c5ce6b72ea42605a1d5c31667
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod 51 BLAKE2B 2e102c58874af58833146011d2b9d64950522530e5bb51d643b06f98b258d7cb52efa2caa36a1fd4d39d4307a37712de7f22d45990ebab7a755b7cacedcc861f SHA512 e208321653fa4f40d2af68b6db37a368134e27463a45691a1642bfbe67186efa2a6fa41cddb3e443e465c7425d8d44cee8364953b39e1b08fc16b447431cecb3
@@ -226,6 +304,8 @@ DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c44
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.mod 377 BLAKE2B dc1cdf5c083f87f165dcdfd61ba38bffecb85e0706995aeb5bc3ea3c9ae4465e86cebe7e089b4aaf1ec9f79f5b3d843db14d19b62ccdc32f09afabd41d3fede4 SHA512 01ef1e7e81764709488bca1ea7434352e33eda89dfc16aff0735cf16e774fdcf2507b3565c62c31b17c60b52abf3edb95afa0034596d4d07bd315da843d09471
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.zip 242496 BLAKE2B 885faf82949b17b3c6aa100a4bd0f65a6bb9597516766f401ea73bc59b4728b839024319e1457385f7e37c2053a09ce42fe471d7c348a66896266ac723748cfe SHA512 2f1d44c4377b9fa66d65bc3b744b66e522e52c89c5d54cfb251e7e07c821a164319de8c628d4b4650d646177c49ae03507eab5aa10bb2b198bc6b45cce513513
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod 468 BLAKE2B 4ac6ec5b71271218f33b753092c494ec6dd01e73373df68af2f399d8d8ba32de0f02150c1c5fdac8518ac244391f126cdac602c63ec862bff559d76015cc78f5 SHA512 9c6244491c9a3012c4a2e575cdb361f7fa577f391ced254adfd8d567c361f073ce23ddd57a0f18ec3327189cf97ad737254c0d0ef2872085af6af7bf9dec1d72
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip 240896 BLAKE2B 4745181476be50303fdf0e66ec147d643995c809a1fd969c846f656d453025f2cd67089f3065b41bede74bfcaa65e5307dd9541457ed7f7ace31b6b567e2e135 SHA512 20c4e6baf239cbc8c8a754ec1b9ee814ff29df1b41332f75f7440b27864bc28397071f3f4d60ba6ff4d0aa531b7a20857e11ecca93057784f76f03876151e8f8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod 375 BLAKE2B fdacadbb6c23350ffa04e625324420df9b523d9fe5bccd8bd1d8f6d592d7ef5a2b4620c1d16c78bbbbbba2716f3edd015cc16ae5b0c3c31e5959ed12143ff3b2 SHA512 e98ebe9ff7f5f5c893ce7a54c12b3d5b86ae1f99a5117875bfb78aa2b59d9e9a95bd54e45e1a16e8bdfa79f38192626f49366a0ea4e36a25681e7448b544b144
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod 569 BLAKE2B 0c975c1c48f40792b02fd8756be3b6bc044ca05725ae179445a858baed4861011ba76051aa25fb10be23c6cf14738cb9cab928418be49d8ad85211d398089ec8 SHA512 6fe81bf3c591058f2ff968b3c6656766d9d3fd74c8577b3e7cfac17e463392eed3268248237d252c98751b2f97bc7c48a8db15bfc3fbcd4afbbaca0e2970819b
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
@@ -241,10 +321,16 @@ DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.18.0.mod 739 BLAKE2B 6a475498d76
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.19.0.mod 739 BLAKE2B 6a475498d76be0ec42814e1d5a932c707711b9538e8507afaa36a3ee6d26b78392f750e9553f960cd9768f3ba6a88b3d8c338b102ba48260c91b0f5b48e1cb06 SHA512 5d321367c7b93f913cb524c688dc515dfe28a0cd712665b61ac12dfebac8a67fd19ba578f8a3666b557b41670eb9f3cc718fb93ca413851552efd695859b7c4f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.19.0.zip 180339 BLAKE2B 67964e38da2ae81a187fa7c980de3472a9b866470c01c570a7891eecdc12f0f181782a916abdcec10e718792e91a9ea6d532651596c75c4364645049e7b62ac2 SHA512 a5b8a63ea03697672701610278283a715760a0c4fd1fa1ea9249cff6364cdcc55ac3bfef1a20e658c0f2f6ac1835ffd198c64f9ad4c7b72947f9d9a42da62b0f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod 794 BLAKE2B 91c9bb4469ac63bd98bdd1ce4d2f2cf3a233f62f6c30b1da0b2a94eb1215a975f3a19cf066c6bc5847fd1a642da6082b8377825987ab5ba21620c2ed9ef26af4 SHA512 05a0bd8a7de559925fc5ba7753d9fc80db41271fedfcd0ca3137f9620c68468c0bfb706e0b4915151657c74a5d64f52a5594736e19fa1421aa65124f551f0ddf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.29.0.mod 583 BLAKE2B a104cd758a5cc7962ce174ce93e8cdcb0320f4bc20b21ed3579a201e85ac851322ce06087d4f5514317731f97903a3e118d1001eb3ebd614158c1f7de9113e3e SHA512 550dd35c6ce6d98886c4f73ad3afedca13e12e39ba3c0958a4cf05a92db92187787591d33ebdbde6d961a451c615bed95cb75ec36b3e91ce0f2b12805d82d248
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.31.1.mod 583 BLAKE2B a104cd758a5cc7962ce174ce93e8cdcb0320f4bc20b21ed3579a201e85ac851322ce06087d4f5514317731f97903a3e118d1001eb3ebd614158c1f7de9113e3e SHA512 550dd35c6ce6d98886c4f73ad3afedca13e12e39ba3c0958a4cf05a92db92187787591d33ebdbde6d961a451c615bed95cb75ec36b3e91ce0f2b12805d82d248
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.31.1.zip 179237 BLAKE2B 2e3c42c259d0808791155939251b5fa3257d4aeebc9918cdba1a218d47264a2c9c7b4db111a0ef323c6268affe9dcab8f45490bf95ab270fe6ea836ded0c59b8 SHA512 1200c019c8809fe2cbe2cec83cf9fa66d621cb3bba96cdb8297fc3fd74529b8adcd32112c8cf68b59ccd37741c966e0b7fda058edd8d1b0a7c362072c5b59c2b
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod 857 BLAKE2B 4c4486d3772ba9c4ecb347940a8e6c84d650847e5e1d9f2a0165569bf062c2a2060cd01c8325221a0c59da8864881c35bcc1532acb0b52f617a02a28f4ebcce9 SHA512 17deca5d2ce10cfeaa0f8e0b1d83317023f4c9841149f9b989cedbc9ea2cdd2d05b2dec1a6323f6202290c7920a68d35da1d4b064892072fb056ba3a767129d2
 DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.5.1.mod 287 BLAKE2B 21f5e5b0f556844005234fb29f985a67de41a5344b0155e1bae329fd9d11412ef5cae6702b8d034bb7ab8d1c3f81ead7da62469a64814a3c4bfbca5dfa28ca6a SHA512 49ed1469c453e6ea78576c51424bee1f456705d7a2ab167d250364813c44eae39fb51e8fd0aa7418a585a48762d9e2c4afbc9119ebb76b781943dc1723ddfafc
 DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.5.1.zip 70154 BLAKE2B 70e3dc90ebec9462de8c05e1243bfa5754c1ffe421b5380e75ddef5109396453aeb18a107de3a03c1fc2f23243ba53668338fcfe1b289d85c8526bca5ce8c756 SHA512 f8b3286dbd38591987d4c4d4037d1fe16c5adb5bf971131dcda47c29a5c20286db863412056539829235c306bbb68b184052f26473a30fc8194b46a093881cae
+DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.1.mod 286 BLAKE2B 48741f0c3685fb8369151968db19610ce28f2a8341da2f3fc7d74ff221fd9b142cfcab2a336f9abffd69dc384972e14d1f033c5eb7de74013cd0617dab95e2fb SHA512 d736de8570a85068955bed17c17387873336142c02115cea7a257fd176310998cba737e9d121310a8dbb8d5cb98399b7427bc7a19da29ea10ab122efed8514b9
+DIST github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.1.zip 69904 BLAKE2B 59b2785d15ec473852426611e77696feb6d04ea42a8273e18cb5984b16c2149a06f7c80a1586a55c534b22db23b161444860bcf8ddf458134f32722fb2e2943d SHA512 2f54fa89a83afc22e27c055a3c4a9bbc273b61b4fcbf32a5a078b732994fee776b9dd13e7d2843e0726292932ca2e78f9b9459a80c19926c382224de3f4df693
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
@@ -286,11 +372,18 @@ DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d4
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
 DIST go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod 2182 BLAKE2B 024744c8c4b0f296f32ce1af2407eae0eb760a443d43e2a1824254c9b2aace62966a2f0f5b5dbfb0cdaf66f2f00740ab653a2b429cc9aadeb3e48421dd6e180b SHA512 904249febd483a4504d49a1b769ded804042c34acd6b7f76503af9f43c76c53063888a7d0e15ee457107cf688108d2bff057330d9d44548b2a30979336370f09
 DIST go.opencensus.io%2F@v%2Fv0.20.1.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
 DIST go.opencensus.io%2F@v%2Fv0.20.2.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
+DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
+DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
 DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
+DIST go.opencensus.io%2F@v%2Fv0.22.3.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
+DIST go.opencensus.io%2F@v%2Fv0.22.4.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
@@ -302,19 +395,44 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BL
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 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-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 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-20201208171446-5f87f3452ae9.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201208171446-5f87f3452ae9.zip 1861665 BLAKE2B 95df63738f62cd51ec4fe5e13e696123950f9e72d92909ead9b300615d8ce2a18be37548c4471e1348e3002f9df61327c1d957890b5e4e35aa25ed692d5456b7 SHA512 efd0155c4d968a337068e9d79847981f7f048dafcb98bfb53bf280222348e743d43e96e769ffa3eae984f29b762afe9dd7f93522869f8c5f445861f20d389779
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.zip 1874722 BLAKE2B bf7accca99c66208a9fed48a6cd003a5e29ba78bd28c836b5eeb0821c03a0729bc3b72177f249129f01292a4081731716b321e87dd577b9224aef22f081de179 SHA512 0f8c0643a716a7a84ed55906d7e5036ac99cfb0e3130486bd300e22fe942b825be6a46b6d217129232a0bd9f9fab98f5eca423feb0573ede7c23aa708b64aeec
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod 352 BLAKE2B 5e146ef1d6b71ec65511cb06d8392eddb9a126b6194213f3b2ac6b675977dcdc77cbb3e46fc936189269583df4d0d80d2e393523c3ba4c55f1e8f9294e0dcaa1 SHA512 8ea874c371c0a582410e682cf475628b4fe6a0c0f57b05566a03343999da063250dcb987d9a863b96a8e1ee913612f323de296b4ddbcfecb166884bee06a8af9
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod 475 BLAKE2B 3be94804cb1c692471ca7f2af890586ef57ed45a306a50fd6d6eaec9c7a161e2e4945ed11640ed30ab6f0e48ca644ec06b6b12e232b0990d4e9a08347c27491a SHA512 4b495d303e08e9bb4b43ff0c82665107a6e0a9cdd33a6d14aea491e634901fedb6341fe9e47c45fca1f89688ea3548f57ac8d62b79ef4ccb596ef4eb2e809241
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod 515 BLAKE2B b37d0d779f058e58ca3e350248cceaac958c4e406d70872fc3682f49b862391dc75d0a17a9ecac8a5dde4339552a222ce2f36b99d8daa3ad01fa5d8632351b3e SHA512 c5f79afe4531059fbc6acf58b7ec7f1e9558df83c4936c830dcb138cbfd7dbc4bab6c0acce6e0c588cc742ec3984d4116ad3e03be815c4f64af32f7ea5024053
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod 572 BLAKE2B fe37c4263fa4f07a01e65941f859f6abd92e26911622e8b06464ca1e4b65efa46b43eb1c475d6888a67d21b6104aca3c227f42210f0ea8e6709a497f13e1b45f SHA512 a773e3b5c26e95dd24414b9f2aa88225a330581cd9ed0c1ca83a3a6712dd3639e1526abe7c0ea47f9ca701828eb39e1df2144edd6ab261caf584a058f092f0fb
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod 97 BLAKE2B ec2dbdd2dad833a979dc53c8d170b4d0f5d336f4c52f36e3116cba2f3549e42fc3191fa56b81d3b9378a52322b86cf5eb0e947e6002dc1d1bee12f7a6bc2eb36 SHA512 23082eb3c6f3e4330e88178c7511b83a06288b678e517cf8ad5062943d0a0fdcea16973425a8dc01cfeacc32ec05b2dba8edb1adfba2e0bcb2d81cb5060c6085
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764
 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.1.1-0.20191107180719-034126e5016b.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+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-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@@ -327,20 +445,47 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod 24 BLAKE
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 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-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 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-20190628185345-da137c7871d7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.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-20200222125558-5a598a2470a0.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 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%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.zip 1566157 BLAKE2B 34caf278d6440392338ac082a6b532066b9dc29a381f8afc063de39980814e97c72dbdc933151dea18ecd95ac3786a6b7a25d40c73237d7ae600e6f9b2f484ba SHA512 4692d098499dcc3c1781380ae4e7fc0245a8539c26e5d6b86f8b83bab14c241cd6599855992e24a5974f794f9129fc3812d216f45bfbe07cd4a303084e7491cc
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.zip 130280 BLAKE2B 059657166d467838c995726802e70dd5b8937ce28d20e13551e26ac1ad82f95b5e2e43eafe1dca541b532599e634b82c490b5308b3d73fa643da8d67b8a85619 SHA512 24239f223b233ab07c98dca5db08f569230403e564843f043fc7bddc82fd4ffd21c1e576bd97f4a1c1b462e47c9275cb59707a003c4f68b7b2af477b2c6f204b
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 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-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.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%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -351,25 +496,57 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 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-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 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-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.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-20200331124033-c3d80250170d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210309074719-68d13333faf2.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210309074719-68d13333faf2.zip 1673261 BLAKE2B 527fc13120c9003819b3cd0f26a88c76aae47b72071332401533b3e9ee6fd80cd35660f6d8850c9ac2d1d5f8d46be62a5bcea0fa60c2ca29aaae0e02ec9840f7 SHA512 dd5765cd35524840afc166c15cf92cceb66fe868a9764ab979e963c8ebf3d80478eb80daa305be5d60673737f261ef271322a752d1447fd5fc71a7ec95ca877e
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.zip 1644123 BLAKE2B f0bdd5627a676ea72767542669e8d0ad43ab0fd82386c6fe08da83e60a478c46d3899843703f9026cfecd416056d8dde242954faf5f3134f2b975dc8e61ca0e3 SHA512 ea2b0c8163b22097a9e6c57c9d2dfb75548f2b6004a775a6c97fceb1d2e3e1dbd4cb2050a36cd4e1e9cd0386794d7bd3a3b6b956b8a55009217b06e9b72f64b5
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 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.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip 8610726 BLAKE2B 78870544de29f5cd9216befa8822c2387654c3987e09994dccf55d210ad7c517edb93bddcc68bd981f2c083a4ec5e012d558b0164901e2d74f6f447e75edfadf SHA512 494d58f2bc02819ec24d8e55f668a06694568e63bc4b41064a7e44aefcb2778c74983fc9126b50277845da8e6739e83fc1334aed989981e8e53b869878803d17
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -377,42 +554,136 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLA
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+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-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.zip 2928136 BLAKE2B c2424310ea982e33a8dcb5244b80bf379346052844bd67c88a235f42253e86ec5fa78f8e7b31869826f9a60f41395146386d378756185bfc4c973e80a978a9ee SHA512 518dd9fa1e3f2b575956bf97e270bcec26de1ab37d51d0b73b3151203e4719b954ccd7677e7fdaa79f9ea0336f0e05187108e471b36f6f93310e80704db1e4af
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod 271 BLAKE2B daceb2d4e388208a2619f2476085e0daa6b6546122a32355a3e005e6ac51ce72069c959a72c76078dedf82201fb217941091d3cc2b1bf4be8c77949b78ef6cd5 SHA512 c2c79e2a50a05d79909d58a13703e35f9cc9cf209be9593546c84883ac272e4e31a8ec9b2247d750b7cb42b088ad90214279c04b83a48173388fa13a71b6572d
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.zip 3290447 BLAKE2B 9a16042d60960559381ebdfd00018beb5fb84888c64b8711e12b12908bb9827252bc589453366a9436c490d83e3389db43bda6114a7cef8942077eff9a65dafb SHA512 ee125fa0f21444f081aaceaa2d3f787af1801dc00c6d105da3148eb19e777bfcfd71cdb73f284482c323b7a7474a6dbeea57e2c05e1fbf5a2a575fadbcfc5dc7
 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 golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip 22295 BLAKE2B 310f892b8ce32810a1afef53335428d73bc23e749e52d00d7624afea2d10422b1b73507026daf23efd2384b81262c4c7862c22da23f6fb43c1b5f79a51170d5e SHA512 34044424d303f5032d4fd302bbf1aca390d45e876583cc223fddf0d685a6eec2bde0a4c1b82c4e471eb5be97fc8aea9b14695b07940d1ecde806636a85d12051
+DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod 618 BLAKE2B 2b9706e395117be1f6fb728c055c6ba3dc9c2931589ac4fa66554a1a69a13961044f8d227cd5ca0643c8be742ab719af4866bf7f7cd2c60d7a9286458fda163a SHA512 ef0fe8dab48d31a477dfd1037229f12a47f6c1953ceafedb813facba73fcb6d880952151c50ed0a05279d7d93f288f8ad0381841ba263bfcb559b83d23b65c67
+DIST google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod 618 BLAKE2B 2b9706e395117be1f6fb728c055c6ba3dc9c2931589ac4fa66554a1a69a13961044f8d227cd5ca0643c8be742ab719af4866bf7f7cd2c60d7a9286458fda163a SHA512 ef0fe8dab48d31a477dfd1037229f12a47f6c1953ceafedb813facba73fcb6d880952151c50ed0a05279d7d93f288f8ad0381841ba263bfcb559b83d23b65c67
+DIST google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod 582 BLAKE2B cc82a660be4095a67922226ab37e8331301128d10332fe60fab27f17e1556b90031bf0c11dd53401fb0805632711296b561c1a7526d93545eaccb92c3ca5506a SHA512 930fb5295538f738db5258811eb8cb03e35f916a882cf271ef5175f0ea0d8fe905d040f5974b34cc9594b008f03fa7f4653ef7bcf5160d8498e18af0bc54d9af
 DIST google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod 506 BLAKE2B 106ba1eae2f79ddc10b69e21988215a1be000c5b32a4bd8315d473748780be8785e89ce269f1560dc23a8afcb199c8a0428aefdf8035991051021443c17fd206 SHA512 37d49dd9c576465cc9dec58fab5cd9c0fa84ab472d46c961e64f34fcda27f88c45925da72368268f857db22bc9cd1378c6595933ee33ed5a6253f62c221ca6ef
+DIST google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod 582 BLAKE2B 9551c78d14cf644fc943fc5fd7446eb42482bcb793f5f20db40e61f44178a306ce9aa8d49fddc9e36fff3cd0874d4c7b84b2a2a2139f32e915c938f9c6cd5af5 SHA512 936dc2fb686660be7aa7982ff5b224ac0dabb22d3bceb27287453a8dff62d846b81316588db4f7cbbd9bd172faee0eea6f2a55a8bf0e0ccc7af6414808ca4c02
+DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
+DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip 417793 BLAKE2B 7219518f67d83fad94a863f889af4c3a28a48b60fced31f33a3026c00bccfb6319060c5ff4712fed598824b5bf1448b0981fc21a6755855e91ce53b4026db062 SHA512 26520c7bbc5ec3c02dc86e5882ffae74b040f0600aa99832cb08cead5d3cd5c21a32d6df332c2c74a76b6c2a684141720b4fce874a07241412bc01837784b115
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod 340 BLAKE2B 70822d80e0c64a18bea901e30359c66d790629dfcfd7b4512b215b2c29bcfcc862bb68f9480357118c7adbe6a1b42754ef7703bb28e608abef8f8cdcbf6d2396 SHA512 461bf9e9c747d61500f3884c67f82cdf9394b186b512f6ff7537620a8f7a8de7a5c30af81c9a1303c0babfbc748c80460313e6b8e440e1f553fd4e1e8e12321c
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod 323 BLAKE2B 76123f14f32c6702557406271ddd9e0304f0c9d5bb53c2b503a0a1ca74892da8a685270b6463faf7fe746f7398080f8364afc94b6f7ac8ba1170d645328ce5ca SHA512 67bb03661d5b872932d9a18ee7edc2908612a31db6391a8797e1cfa9aec45c6a3643b7943c4157db60f7e7aa235368a844c5e1fb382fa705074fc721c855a441
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod 353 BLAKE2B 7e159067adb934153bc2a45c1a091ea85083c9e52927db8aba3e7ef9e13f984dd738aaf3890e85f7daf86afdab8e5717775250715285c0edc05625a544664cd2 SHA512 17266a643d974e2fae18e7055986002b9705bd2a7fb1e3cd3664fe6dbefbc7a04aef6900146c1e1c3ed84bea8b4d1bda4d6c355af2cda013c01f19eed57568d5
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod 323 BLAKE2B 264c38a1d0b5dec10ed5c1d4a073c68817dd538b602446ea3db3b53569f14dc1bd88250b6bc14656c5206d23e17858b986188fe0c217bf8853c76121d999b08f SHA512 ab15d32d1f044b9b5806dcf075f3cc4e32f2c79e9a273e5dd30848b6ebb26d71270627536f34010cfe23c130badcb02e5b6f306a1cc1f73ba76bb86bc5ba21b5
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod 832 BLAKE2B 9de27394e05cf42e762a8b7ed42b6715244ea1086acd7c44f71b04bc0dc23c31ab236e6474fea423953eb3001dcaa357938daad1d54debfb5d52bdecc1de6bda SHA512 ac90f3fc374cc1ac7706146efaa8488a59634a209c30bf87453fa150bf8849870db2ec04e854438d59911ea35930a5dd8f40f5d5954786d0e0565907fc42f711
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.0.mod 979 BLAKE2B cac1528e7af91a98ad2e1fcaee0892547eac67d1d6ce29473c1114eb2c373acebad87008124924adc3f1a98cc4a2911c1679cd7f24f025ffe0d4902d123a6639 SHA512 558a4f5d7910813809d7edead3f7e2300936a262e289905dc1e33ba293d89d9bb590ae0f8b00bedc1e30288257ac66d7edc2d3f3f657d2d31ffaef7ff0e24f92
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.22.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod 532 BLAKE2B 4c46c03905fc660d54c7acdb5cd614db9429b0e1add087fa5068f41a72d04b2f776e8326d1181e63ce29078f075d2312f9b0baeaeb048ea3d73f2fdba111e35d SHA512 0171fadf89079d7c0f18b1401aedfd886888d0a4ec4e107aec191c3875c640990532e1f57a3f5306a2e5705ddcf7e09ab2ce4953710347c09deb1d9d5f2d3c1f
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod 532 BLAKE2B ebe5fc28123fed2d7c497a7e237039a4a90f6eeb389b61650cede1d3bb850a1cd09c1574ee57fe65b6f4d338bb440a67ff802a28805b044bcc78b39ce2acd5b6 SHA512 85a0f6a03de8c151aacca3944a75738ac01ba368be98d6e4756a772976fccfd0faac55df170feb51ac86a10241a613b2ce1ac7d7c5cbef41ee2ed8eb93416801
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod 542 BLAKE2B d2411d4096489755e1a83388e3b3271930614b11b5d677af4a7ce0ee9c5d4618bda9ccf29c9dce7a2d0254676dfea8bd54c88ec857473f4beaee92d61da9c209 SHA512 a8ff8c888452392a2026849edd07ad5aa36691f7cb30357c33aee3457e03cac9daf48195b90c2ea62b71337c37bcea23d7a5996eaddc4330749487789dd70fb3
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod 128 BLAKE2B e36e105129abbd7729a6d509724246766c16df526ce22637e92ca8f29bf854b66622a0afc5afe8e4ad29c9efc498c488a87020fad5969e044757d49ed4bd6399 SHA512 802c0df5ed11f0bb2e221c01152c6339d3634068f89aac760654411884e6b936b031cbfabad57c5add340f9d504edfcd683c77cb0ba7d753e06bc604095257ce
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod 186 BLAKE2B ac72ab4b58c29ea036b52ea6972dba93b3ff95ceea9b476355b14bc335bfb99ac350101e70ec678bfb6656157679f3dd42a200a1531b982ad9c995c5063ad541 SHA512 d9197910537264ba24d95110f470ce2b057b795e7244bcae423ea922a8eb4f2c89df3b6dceb58e71cc7ba1f68ccaa3dfa78d7c26d63f5949d4014b8df336512c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod 83 BLAKE2B 0e4901ba1d4e31ef22f0f978ee7b7d926ac2cd3a1cb5d8d8a81a33e02f9dc81aad6508280d65659862c3a9bc0667c334cb6cd8c0c532d5fdb3735a415c2a5eca SHA512 a7b2aad691925341e3d1f6d1d1453b68386902a4e2e1c0deb406bc157d04328c5519a01ce938a33a6e358cbd9dc0c2f862c9822bde5314d2eb9d416d7bf789d2
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod 123 BLAKE2B 73f875413489557d8f0bbcd665c06356b900f87e2cd9ef0ee5aba218a3a910842912d36dc9e653afa538c99cc723d28327a8bec6eac1f6bd93277d70fa891339 SHA512 d618524aca1cb3e525060bb66b0c8f06c9ad6be5389be228d265dbcdb368442f4f0a7e98f8c9082916b2579d77e627a550904f0b1c058b7d5e45eb7ceb77c2e0
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip 1557709 BLAKE2B bc672854cc46d48461bf28395c5be02fe99ff9da1d23e212078e549bf3e2beeaf953cc185e059c73a374f3e2662cb81fd6c3ff53472934964b8461f370b51a78 SHA512 de309c033d05be35503d6073e14ead585db4e6b75d478a674a37f93c7757e914c67bad446cf7ce04ccd49659d1ab2f9a024ee639a7536480ef92bb6b8b52dfdb
@@ -439,10 +710,19 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d7850
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip 81183 BLAKE2B 0e3222d715fe7e9e8e9a10abad817f75bdd095f9af250d6bdf1ee2881930c739111de8b526175c9204995c48e0ade9852541a7f22b0ce1261f473986a2739182 SHA512 d6f4ac547609c943adfc6b518ff03ac09da566ba2b29466abe8f6db3d5a41ae7e5c187068dce4e77271905b1aa88497ca49a43bb9bbf9c94011b7ccf1b4b2f42
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
 DIST pushgateway-1.4.1.tar.gz 4264820 BLAKE2B 88fb916831a441478b5e03fdf6fccb32b33746569c109d17d9bcc0a76cbe0d0322399605118456b83bdffe7617f098c2e2188ddee9dc08568607e3bde2c7cc72 SHA512 4687836c6361d6c1a7e672018b1212a31a749af575707ac8e41f4f078e075e12658a52ae58ccbb27a5699c164255b6f4ec259f5433dffec8af25853f014fd17d
+DIST pushgateway-1.4.2.tar.gz 4264206 BLAKE2B 966593b53184e091400d73c7aa00b147597096ca61adc71964c5ca04c5c7487dbcc4eee652bc47745bb459fa0d3a27bad4936833cd759081c8ae735319582b15 SHA512 7b1da7eecf03c4f7b493d025920e93c52333becf7da6a2d7bdd0eb6f9a2a4a5d08b00786d0796682a465d84750e2c8092cdb1c4ca59a08f15b8b586d6eaa5f1a
+DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
+DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
+DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 EBUILD pushgateway-1.4.1-r1.ebuild 24615 BLAKE2B 874ae8acbead5184188b7c1ceebde4f5cc2efb7314c33f68c157a2bbbbf105c95b9fa6ae02f9de435149cf7fb738de743d6b0c3e2908a6408a4e0e1512faffa7 SHA512 5175699c795385efb6690ec27e772094d911514ed1c862b8699b7f746eeaa3178d7132cd721f5b08b68c81b98aeadd9617f6b21ece280dc833b63a95baa43af6
+EBUILD pushgateway-1.4.2.ebuild 27649 BLAKE2B 5a21f44e60bffc8fc97ac854677f88b4c3a0449861c27138bb80680931b46e65d31c61e0e5e09eac543426e76a42db0c8bed656a1abc64388834f1277e49b86f SHA512 a8622d6536eb8b6e4e757b376b8edbd9d219534c430ddec43613227b5054c26417e3df03daaf86e3b80f117fc465e16faceb4de571774deb21f8049841d4530d
 MISC metadata.xml 332 BLAKE2B a59160e8b0417c6a5e8f57d18f5fe22d700bfef266b0320e2b99539537082c57c25ad7ef7990eb467ad9c3706440476563800c7f66cc5494b3ecec655fb8fbe3 SHA512 8ed6ab262fa6a630b9f49fe55a41e32fba49e1670e606dc3472fb17d23b105ad2ca0bfc2b1aa872bbddad28780e5fd87b6e6eeace2cb12547308b158015ae39e
diff --git a/app-metrics/pushgateway/pushgateway-1.4.2.ebuild b/app-metrics/pushgateway/pushgateway-1.4.2.ebuild
new file mode 100644
index 000000000000..35b3d43017f0
--- /dev/null
+++ b/app-metrics/pushgateway/pushgateway-1.4.2.ebuild
@@ -0,0 +1,543 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+GIT_COMMIT="99981d7"
+EGO_SUM=(
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.38.0/go.mod"
+"cloud.google.com/go v0.44.1/go.mod"
+"cloud.google.com/go v0.44.2/go.mod"
+"cloud.google.com/go v0.45.1/go.mod"
+"cloud.google.com/go v0.46.3/go.mod"
+"cloud.google.com/go v0.50.0/go.mod"
+"cloud.google.com/go v0.52.0/go.mod"
+"cloud.google.com/go v0.53.0/go.mod"
+"cloud.google.com/go v0.54.0/go.mod"
+"cloud.google.com/go v0.56.0/go.mod"
+"cloud.google.com/go v0.57.0/go.mod"
+"cloud.google.com/go v0.62.0/go.mod"
+"cloud.google.com/go v0.65.0/go.mod"
+"cloud.google.com/go/bigquery v1.0.1/go.mod"
+"cloud.google.com/go/bigquery v1.3.0/go.mod"
+"cloud.google.com/go/bigquery v1.4.0/go.mod"
+"cloud.google.com/go/bigquery v1.5.0/go.mod"
+"cloud.google.com/go/bigquery v1.7.0/go.mod"
+"cloud.google.com/go/bigquery v1.8.0/go.mod"
+"cloud.google.com/go/datastore v1.0.0/go.mod"
+"cloud.google.com/go/datastore v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.0.1/go.mod"
+"cloud.google.com/go/pubsub v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.2.0/go.mod"
+"cloud.google.com/go/pubsub v1.3.1/go.mod"
+"cloud.google.com/go/storage v1.0.0/go.mod"
+"cloud.google.com/go/storage v1.5.0/go.mod"
+"cloud.google.com/go/storage v1.6.0/go.mod"
+"cloud.google.com/go/storage v1.8.0/go.mod"
+"cloud.google.com/go/storage v1.10.0/go.mod"
+"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d"
+"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/chzyer/logex v1.1.10/go.mod"
+"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-kit/log v0.1.0/go.mod"
+"github.com/go-kit/log v0.2.0"
+"github.com/go-kit/log v0.2.0/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logfmt/logfmt v0.5.0/go.mod"
+"github.com/go-logfmt/logfmt v0.5.1"
+"github.com/go-logfmt/logfmt v0.5.1/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/mock v1.3.1/go.mod"
+"github.com/golang/mock v1.4.0/go.mod"
+"github.com/golang/mock v1.4.1/go.mod"
+"github.com/golang/mock v1.4.3/go.mod"
+"github.com/golang/mock v1.4.4/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/protobuf v1.3.3/go.mod"
+"github.com/golang/protobuf v1.3.4/go.mod"
+"github.com/golang/protobuf v1.3.5/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+"github.com/golang/protobuf v1.4.0/go.mod"
+"github.com/golang/protobuf v1.4.1/go.mod"
+"github.com/golang/protobuf v1.4.2/go.mod"
+"github.com/golang/protobuf v1.4.3/go.mod"
+"github.com/golang/protobuf v1.5.0/go.mod"
+"github.com/golang/protobuf v1.5.2"
+"github.com/golang/protobuf v1.5.2/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.4.1/go.mod"
+"github.com/google/go-cmp v0.5.0/go.mod"
+"github.com/google/go-cmp v0.5.1/go.mod"
+"github.com/google/go-cmp v0.5.4/go.mod"
+"github.com/google/go-cmp v0.5.5"
+"github.com/google/go-cmp v0.5.5/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/martian/v3 v3.0.0/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+"github.com/google/renameio v0.1.0/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+"github.com/jpillora/backoff v1.0.0"
+"github.com/jpillora/backoff v1.0.0/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.10/go.mod"
+"github.com/json-iterator/go v1.1.11/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/julienschmidt/httprouter v1.3.0"
+"github.com/julienschmidt/httprouter v1.3.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f"
+"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pkg/errors v0.9.1"
+"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/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.7.1/go.mod"
+"github.com/prometheus/client_golang v1.11.0"
+"github.com/prometheus/client_golang v1.11.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.10.0/go.mod"
+"github.com/prometheus/common v0.26.0/go.mod"
+"github.com/prometheus/common v0.29.0/go.mod"
+"github.com/prometheus/common v0.31.1"
+"github.com/prometheus/common v0.31.1/go.mod"
+"github.com/prometheus/exporter-toolkit v0.6.1"
+"github.com/prometheus/exporter-toolkit v0.6.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.1.3/go.mod"
+"github.com/prometheus/procfs v0.6.0"
+"github.com/prometheus/procfs v0.6.0/go.mod"
+"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+"github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749"
+"github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod"
+"github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546"
+"github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/sirupsen/logrus v1.6.0/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/yuin/goldmark v1.1.25/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"github.com/yuin/goldmark v1.1.32/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0/go.mod"
+"go.opencensus.io v0.22.2/go.mod"
+"go.opencensus.io v0.22.3/go.mod"
+"go.opencensus.io v0.22.4/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e"
+"golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+"golang.org/x/mod v0.1.0/go.mod"
+"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/mod v0.3.0/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+"golang.org/x/net v0.0.0-20210525063256-abc453219eb5"
+"golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+"golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c"
+"golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod"
+"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1"
+"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/text v0.3.6"
+"golang.org/x/text v0.3.6/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d"
+"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/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"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+"google.golang.org/api v0.4.0/go.mod"
+"google.golang.org/api v0.7.0/go.mod"
+"google.golang.org/api v0.8.0/go.mod"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/api v0.13.0/go.mod"
+"google.golang.org/api v0.14.0/go.mod"
+"google.golang.org/api v0.15.0/go.mod"
+"google.golang.org/api v0.17.0/go.mod"
+"google.golang.org/api v0.18.0/go.mod"
+"google.golang.org/api v0.19.0/go.mod"
+"google.golang.org/api v0.20.0/go.mod"
+"google.golang.org/api v0.22.0/go.mod"
+"google.golang.org/api v0.24.0/go.mod"
+"google.golang.org/api v0.28.0/go.mod"
+"google.golang.org/api v0.29.0/go.mod"
+"google.golang.org/api v0.30.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.1/go.mod"
+"google.golang.org/appengine v1.6.5/go.mod"
+"google.golang.org/appengine v1.6.6"
+"google.golang.org/appengine v1.6.6/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.1/go.mod"
+"google.golang.org/grpc v1.21.1/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.25.1/go.mod"
+"google.golang.org/grpc v1.26.0/go.mod"
+"google.golang.org/grpc v1.27.0/go.mod"
+"google.golang.org/grpc v1.27.1/go.mod"
+"google.golang.org/grpc v1.28.0/go.mod"
+"google.golang.org/grpc v1.29.1/go.mod"
+"google.golang.org/grpc v1.30.0/go.mod"
+"google.golang.org/grpc v1.31.0/go.mod"
+"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+"google.golang.org/protobuf v1.21.0/go.mod"
+"google.golang.org/protobuf v1.22.0/go.mod"
+"google.golang.org/protobuf v1.23.0/go.mod"
+"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+"google.golang.org/protobuf v1.24.0/go.mod"
+"google.golang.org/protobuf v1.25.0/go.mod"
+"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+"google.golang.org/protobuf v1.26.0"
+"google.golang.org/protobuf v1.26.0/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/errgo.v2 v2.1.0/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.3.0/go.mod"
+"gopkg.in/yaml.v2 v2.4.0"
+"gopkg.in/yaml.v2 v2.4.0/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+"rsc.io/binaryregexp v0.2.0/go.mod"
+"rsc.io/quote/v3 v3.1.0/go.mod"
+"rsc.io/sampler v1.3.0/go.mod"
+)
+go-module_set_globals
+
+DESCRIPTION="Prometheus push acceptor for ephemeral and batch jobs"
+HOMEPAGE="https://github.com/prometheus/pushgateway"
+SRC_URI="
+	https://github.com/prometheus/pushgateway/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	acct-group/pushgateway
+	acct-user/pushgateway
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND=">=dev-util/promu-0.3.0"
+
+src_prepare() {
+	default
+	sed -i -e 's|{{\.Revision}}|'${GIT_COMMIT}'|g' .promu.yml || die
+}
+
+src_compile() {
+	mkdir -p bin || die
+	promu build -v --prefix bin || die
+}
+
+src_install() {
+	newbin "bin/${P}" "${PN}"
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}-1.service"
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index f62115335a8c..5959a329c806 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
index 4df9ac375cb9..a816d318daab 100644
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@@ -23,6 +23,7 @@ DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022
 DIST broot-1.6.1.tar.gz 8710957 BLAKE2B e2fc170ef09ae4207a83412f7b51141e08fc815a9cf9199768f79ce81befe2cc39fa1e5e698d42c38fc8125ca347cced5520eb08d7d0d4bef34783d03e1dbf62 SHA512 0a4df51c13455e13ac4b13e97d02016a70da7d2c37635ef8f5cf964b3cbaa9cbe40eb73380587e15749042bb480be5e3b1b67c54eaabf52d1b0fb9671ab13ce9
 DIST broot-1.6.2.tar.gz 8712669 BLAKE2B f69c5baad6b6c61a18007035aaa527db798c155c02ce39994a1784d9d4cd28d6ac35d72e29e360ee0f471f544b1f54f9f531869b9388b0437c9086cc98006cf2 SHA512 8200cf386b89cdc8ed20d9130ecd578fbf60dd5641bf5b27020fd5f5c8e882e837b488a785f44bb43dd67e3629acc2214b4a62dd35f8615e5984b6baa73ca954
 DIST broot-1.6.3.tar.gz 8712118 BLAKE2B 01d8332864c1a8ef92190d99ce701d4ceba5be0fceeb3cc5eb1fae65857b825c9ee68da137b28fa3320d8eb94d8d90d10ccd29717e1716cd02de72a620d484fc SHA512 6daf9b10eaa82a960da03b5295cd5147447bb462e67be22bd3ab134b30b26fa3e17ced2c1a1ca46a1a059cc32a1376ab82d0e60ce6c143aa2bd1d265c93937ce
+DIST broot-1.6.4.tar.gz 8711244 BLAKE2B df6dbd53dec512402608eb87359b233dc68f1c97a71d7bdd51b2c45cf317a0f6c3cccc223e8464fd08da110769b1abc42f555c42d8cddedc4991748c0d10f9fa SHA512 979889c3a226a145f55bdd036111c67cb25249e2e05c34487e37da36867c6a9671347809bcb2b36250b2c991d36e9d21f6fc86682a4d8923de579f73512fc8ca
 DIST bstr-0.2.16.crate 330346 BLAKE2B 75a345f3a5d428ec7278cd10fa676f5bb72685c65c4fe68163943cf3142b43ac45d458bce9323447b201ffcc91aa82cd8c762cb1954c055e34b1a5cebc686ee8 SHA512 33e82e5637efdc2f404ab9405331ae135df12586785491c3e61e70ea8406c67e2109e550cc70a4ab8e95d054e8519c48257fd3b55ef0b67b2530914a9a0b0fac
 DIST bytemuck-1.7.0.crate 27057 BLAKE2B 8ee0782cc080cae2c76738931be7076c0ab3529c07b1e03e2924e5e2940210ada4129731376016bafdceeff42984a5a3e5f9db7789071ef11d4e3902edac2857 SHA512 1512e461d17d65f9f462ea12151ebce82a84924a83422d213e690c68f41a024f99d825131a6f5de19994c5610f264c42ef8e09eca8378f5a99e325eecb2bdb00
 DIST bytemuck-1.7.2.crate 27489 BLAKE2B 2541a7561eb34351f58266451a020858d8ac1ad30ecb95b97d576e72532cae37ef0b747e2259aaf6052b65f951586425044f824a00dfabf54bba9462edf94c2a SHA512 fae361f5abe67215a7591d421a0b713b77b437123c56e21dd00421e95ab86d9dd9b0bf1daa6623b833ea65681fbeeb58f6feab9d323964304a3250f24df1ace2
@@ -47,6 +48,7 @@ DIST crossbeam-queue-0.3.2.crate 14993 BLAKE2B b22d68d0bebcee8eeb53fe431f54ae219
 DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
 DIST crossterm-0.19.0.crate 104572 BLAKE2B 13b341870516c5ce4f3ac1d4f40567a2a465d65f9dbe9f627821bd6dde994fa5f8d9802a1b42f19ff91d5511ef7d03a0b62361fe8addbb18e74c624dbe66c9e9 SHA512 c46c095d73be48a3c1875806547ba708a40abfc8e5cd89514162e0d1636675c4f4e2857ac3b4b32239d14f7ab57a61018b6a919160b2136ae761dbbde726b932
 DIST crossterm-0.20.0.crate 103025 BLAKE2B 8aed50d2df3e3705134f1d20bdd37a8a0b9c16afdff0701073723b038f916f6104d48d646fd3aed8fc93baf4e749f7447149a099829b137055deb9aec00eaa0d SHA512 998d5377b5e204375ba6016da678d3d3a4feb5174092b9e2dd8c8d26d8a5c7f321d60d829262f4b3a962566204fc6e804e3637494be97760e6ef66f888a6ab38
+DIST crossterm-0.21.0.crate 105045 BLAKE2B f79ca91006ed619a3e7a0fa1d5bc9acb2ca76809a83c17dfa351cf6a21ae53b29abf91c6788fc9c22f0a643835fd65fa26cd36a5b58fecce75691e18f88af209 SHA512 b45ffa4b303b1e8733e5ada4866c60184bd2095d6383cde42f5cb0508c5f2d639060d946f9da77d95de5cee4ebb588b877ff0ff4a2fcd41f40928c3fd1f8fde4
 DIST crossterm_winapi-0.7.0.crate 15187 BLAKE2B 5407aca29ccb36473b34527d977fd3fe9d190d2dd940da7077535351458fc0a06af114c145a0f3e741402f2df98a98605a8fb02e2e07c5bb107679a24260fc96 SHA512 5efbe7992b4a19725b5992e0b29a77673e8ecc03d28da35580a5cddaeb32b7e30c7bdb53a2392ebb5b1218617045c306d78451f109d5b836f0e00dcab59e0dfd
 DIST crossterm_winapi-0.8.0.crate 15531 BLAKE2B 663d08cffbf1996d585922ce09d486afa288b998b6509958ee0c89f8ca4ae316c8d404b326961a464435d22bfcb91e9c3fd26a48e90b8b267c40a7ab6f596c17 SHA512 e246db39c7adae89ee1699b6a0ca2f5aec2dd053db0698ee25c320eb315c59be51d6db2193493ebecadeebee5a4b6f3c52c2e9ede8088da7f9d102ff7ac1e936
 DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
@@ -88,6 +90,7 @@ DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77
 DIST instant-0.1.10.crate 5218 BLAKE2B 1e4203d235006ca922134c715781a5bda5a932f6740b7e22505db21d3b675758bce10dbb370e96694574c40c43a1d71ea2e6372df7116b30fe8cb0b65a3b95fe SHA512 a6b2c7e0a7b954e961f2d904a4cd6f701617ad70a7ea13230ee157c473c903803dd64596baa0fabd075e995cd3d013e10681c8d712977341ea2b6f97dd48d596
 DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b934ad45ffb0c9e44df5ef7e8189ba2fa12452f1c8a6416d6f7c0655365ba959bedf2b78228613944be8278 SHA512 3915f67c3629ec93296d56c4cda0cf97b29b1a70930a9d546abb9518139d4c2f35062563a5094e84841ddb1f00b0f3df9dc00801d96c01994765221edf03ef7c
 DIST is_executable-0.1.2.crate 9131 BLAKE2B 7e8f6c37a17a15677d24b1a6087402dfb509c15e7feccb79cf393c877ef471286ae297ee2aed1dad92d4a07544af3466883a82d1261c790572cf5060f22dd681 SHA512 4749e5c20a44a5012ae3420f8af1f59c8bf4f47f281c779a86284d774a9bfc9c9ce37addbeac451792be581aed76c3dbf820a69325dcc249b398698fc2674d69
+DIST is_executable-1.0.1.crate 9550 BLAKE2B 64fbfd2805b9e7a2498a59bd1ff924f84a42c5f1061ba59e7d3cd72cbecb394272c3f9af101f838c7a6a636746d8ed3b7f698c5720857675c58127cec9846d81 SHA512 677980983db2c8ed72e87a2f2df3bac328dc6ba6dba6c3e8c4e4eaa7b8fee160ef4e81d105f65ed718fb7263137ffdb21d86b148f614f04fb9e24201417c8a29
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST jobserver-0.1.22.crate 21175 BLAKE2B dc0f20541fd14aa5c8b161cf36829a36e550ef414215417e25516ef1cf67cc1c7100cbe4ebcf8d2530e3245f8793a3ff11f407a0ec5d96385ecb6618e2de7a20 SHA512 ad3d180bb49fbaf51c9a2f40de0e2082947a0cb5bef95001bcc664e4c98f75a4c32a6c53f5eba90595e415b600aacae54d92c2f613dbeb8af94fa08b6d770d8b
 DIST jpeg-decoder-0.1.22.crate 228366 BLAKE2B 97dee932aae8d7d08ceaf37c9659d52a93be7c964468087aa39377fb2657c64cf8fe20516337cbe5fe0452c3686e9d1b7cd6c0932bf1ca6562358fd4a8cd69be SHA512 3edf415eb11909b7b16755f54c6a5b082200f81e6ce5dede413e41be221c8be5c14035a171fa1c21771c8d11f30cd990f57e6e98e3204e34e3f0e7ca2c3e38b4
@@ -127,14 +130,19 @@ DIST onig-6.2.0.crate 30671 BLAKE2B 5b284338aa2860209238312dd2aaeccb630d4614f45e
 DIST onig_sys-69.7.0.crate 631318 BLAKE2B 3c13902fc1d3c27f809b61535dfdd27c2f96e0cf3c1889ba723d57b9a149534f91e925f52e7534722ecf56095a0a6819c9c787c29dcfec97a63c706ee540d434 SHA512 56be1a8088aceb3348d349fe0b2692eb2fd7810b4aed1c878ec402af848a0bc4563e0721685597ab3d77c037874d00acafcb7b735aa8077d0a36c19f82f13a0d
 DIST open-1.7.0.crate 6101 BLAKE2B a0ab3b5c9c48999962dcd7af73231f3b2887fdc4244ac066998660029216f10c71cf32e7f08e788bb6cf4f945569acdc4ebb2ce2094d82377b7a4f38304a03da SHA512 755d199424644347dc60527865141616a64d86c2629b35960e30a8130f6f1e6c389c1f6cbb13b9c2f8746f9bfbf599ed708a54aeef95a107ab73631e8006921b
 DIST open-1.7.1.crate 6129 BLAKE2B 024657c1e17e73f1aa24921e0b6bcd11b94754cb9032dfb1aafd6e3f58e484d0f5a1b4e504febfc514dd15e947791095465d2090ac4bd7b6dc43cb38b1e63ac3 SHA512 97c064ade1c9e1329aef03cffc6dbf565a7a3c0acf41845236202b0003d4d709b769e22cef0190624c32b5b6e1506964028a4649e4bb79f1ced5ae9f954508b3
+DIST open-2.0.0.crate 6777 BLAKE2B 8ca08b182b361d89b5decb9daab617b26ca648ecccab2fde81895f683e5faf580665a0feade1f32cba4436e98c870e851d5cb4af8eeab9aab4d9cce0988744c1 SHA512 6aa8ebbb2f5a978a259a7d8c9a2db98000f39b598551e8c1a991dea435b841c48521458ce7a784ea5e6d1843f1418bcab321c9f2113534fa82414150036df48c
 DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
 DIST parking_lot_core-0.8.3.crate 32147 BLAKE2B 5218cfbff706c4388fef31c885c7a5d53566005775a3c440c6a2890efb189a4edfe8e99f6499cac36038846628a915ac988c15e1ebab1b3a3ffb53a64631dc19 SHA512 1dba5a7e68ee007918fb210ff308f7382ed1c54d2fe6db36a8246453434246b71e6795db107c83ca39c2bddf5e4a27da7978a464b53d41e150e744d81e75b341
 DIST pathdiff-0.2.0.crate 6189 BLAKE2B b04f2769452686f94651251f017ed03c264b4fbd471a1ea1c529d48d0a2899a491aaa7f757dc6e5338e4536fcb0641bac46a7c6bc99280bdea7f6b91c7231bfb SHA512 9527aa96b6f873014c216c6326e0d235f764951d244f5cf36e2eaa0b8182b25e7766a46967b5b0b936163c6ec4796a15e72540dd3faca8abfdcbeba651c21f71
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST phf-0.8.0.crate 3902 BLAKE2B 3f1d4f9c23cfa2a3a0b7e4f809ff00783d71bb4839b27246d5244e5aee61a211498715ed576f00749e8132a6af1cdf50b2eb27d2f49896f006212981886a0e44 SHA512 a3013c4106ba72aa3cf22bd3f903eeacc24ac7cc47aad791bc5e9a63e1aff928a537399b6a86b0346c5eb37979ec01b404807e622e79a0a70a0e01e63c07a47f
+DIST phf-0.9.0.crate 4712 BLAKE2B 1ecba00b75d980ac6f7d0a2065233c1b388bf54dfb8efda7f7deb5221ccc7975b94dc9731481043a94ec06d2d54206c77891351701fe8fb7e5e01e017586f6e3 SHA512 0a10c9afbff6e40146cf32f8a279368ef0f73ce32d1ca7f7e527e03f3432635ae2b993531b3d9ae3624c2feb875b302cdd0c3588047287dbbc201e8485260ee6
 DIST phf_generator-0.8.0.crate 7604 BLAKE2B 936c9ad95d2d5b6b4bc97dac9bcf99813462950f6280d9cbb8c8ae9253d3197f25b8173c202cdd51c4a2d3f422ca1d6f5c9055e7a87e45b2dc5fbe5aa6aa45ce SHA512 de045f47567defd43fe32fc62191a9a892e5a478e1a84b853cff3005e94967ded68e5770eacb43f2e97e58b8f4283327a38a3bdbd55e1d5c708dab601ea66270
+DIST phf_generator-0.9.0.crate 7769 BLAKE2B fca5d84d48164ab394b335368861fc601bf7d16726b2a2b9d99cc27447a3b61c1a63a9a6c3b32fd59bf66eb7eaf100ba252880b0ddb07fbc6f36d7b9e699c713 SHA512 6adb363d1ee9f2b64e29755e8e92efb3203f3f384bd0cffab60a14b98ba544c3f6da067ba714cf3cc9901c153d5b464d2824216f35f94fc95cdcff7f8657c36e
 DIST phf_macros-0.8.0.crate 5814 BLAKE2B 39f40a52c177da227b3bf54d0fe4f05a2d6c382183ab0400d74a06d34fb3f28a23342496f6e0d48d25a792bb848bd9ed740a10d37c39969ad79c929fdc98d743 SHA512 ba56661aa92393fad7712f774fe4f0b7bf25d483aa7d4c4617409e655e9448b39780a904b8865293e16f8e63d62440aa0d653fe231beda4f58194de455598170
+DIST phf_macros-0.9.0.crate 3537 BLAKE2B 4e82ea5dec7b8b9d0e321a56b12218c8b04292a90465b11c6f8b2f0440dcf9a9b02dc15e6ef775b091dacbbc589d3cec03770a0ecdc779b2f97a85a238875335 SHA512 92b14f1b9e47acf448583538d4f783e0c8da1ed0231165cf852788e2aa5af29e646d655612b7ca7a2af14e0139dc7be5a34464938109863db33aeac2d5c313a2
 DIST phf_shared-0.8.0.crate 2860 BLAKE2B db48d88ad6e7aa6bdb2f6750ab66063a55d005b4f5e92ededb59da1f1fa9b1296d30f87d32d036f08e3a74111ea4d8287e8eb6c86d0edd76b3ceb38f223696db SHA512 6ad7ac732b7cc42e7e179329fbfee7074d26652d73eb4f2b97224491d978ad9b14c66e5a539c96b84c70124ac44cfc009bf963a42c438d028bd9737b99f463f3
+DIST phf_shared-0.9.0.crate 4111 BLAKE2B 04d4344d7f07a8116ff7ac2497d64e60eb527d1387107d7bb8f7dafe14802434e8e8e3f4587580a673760a7332fab90fe6307905d571ada432b6541cc29af2b6 SHA512 9c15d6d0af7809c036c510b964a6f9e2c07b7c866333b30e71c3e302035821ad1c21993b3c56522c0f2641028dce42aaa8532a04a50f0706c6501f5c2c739f26
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST plist-1.1.0.crate 40173 BLAKE2B dc689529f09dc5370e4e98129bed5580a7d8dcc8b588d4acd66aea9c13d49ec67f449c26dbeb300016585f707267c03fbcb1310b033f423d3a03ea93026bb8f5 SHA512 11617001327b310978bfc114cb4549586af2f25d03563adcaba062d78f34ef2ccf72b4779877f206a06d0a7aed62253fa853c4544285542b6ee88331845c28c9
 DIST plist-1.2.0.crate 41056 BLAKE2B 9d23b210569eddc25da3cc6632b88345fec54f7a725617d7b71f90abefff4ea4a0ab58dec044fdfbca817c08bfcadac9bed3bab1e9f63890cf4535196d48d67f SHA512 545ebae943341302edd992f7937f43fa7c931e3b9e499b2a933901549b9dc16a8398216b5aa50b3cdc8175519769af1662996513085c4711400eb9cbe6fbe0e6
@@ -196,6 +204,7 @@ DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1
 DIST termimad-0.10.3.crate 316247 BLAKE2B acda7abe193eeb015c9e144e765b3fe075fda1fcba410a41ecea84f72d3ba455f528267a7300c5e5ee626a1c1f87a9bd7ee7ab336812718c66fe2877f3ff855b SHA512 c25aa79fa0053c1e7ac88405b45742d3e34d58f4293405699e601122451e18ac9532b80413df9032850d983e3abcb1b1656de3428bface46efd2505d2a2137bc
 DIST termimad-0.11.1.crate 316869 BLAKE2B a669f9cf3b4b8ff9179b475f4d5c73282beb8cde520de7fa074feff17274a5597cc5c929525d9996397104131d978d095efc8880f9efab7c5b5ffd6c695c7ce1 SHA512 b930c5b9da286a0754bdf7749cded52aaa4af8c050f88b5aeff2a4f3fd95720ca82ed90d2f4249054ca7f2b1cf31fde8a8808fc5bb1c63649da325c017658433
 DIST termimad-0.14.0.crate 334991 BLAKE2B 0bd2d35b68f841e0c764a0b489b29767a141b54576259beecc39adcb1105f952a248cb3030b6e79a819148edb61f028b5ecb64b221cb21236bd031194404e983 SHA512 c96c2c43b091f174bbe1105c91d426786964dafd6477004828e798c3e911f391e12c33afdc4c9872523206481100c4656e722acdbd4a64db92ac88ec1b5040fb
+DIST termimad-0.16.1.crate 344819 BLAKE2B 8cc26f5c5ce84ab12c05aa9eed0e0fa06cbd764a4665f91c9818e2c0c27b13976a36402caa0b7be5da54fcb750f92c330cb04c158540f2ceecf4b79124d9acd2 SHA512 a496ca4c40a4d54fad929de1b7062ed9269e34b46ed4a6fbd94d6f212be69c28f135185579bb655c5d2e34eb6192a17271d1544b5cfeba9e33a68f87c4254616
 DIST terminal-clipboard-0.2.1.crate 4056 BLAKE2B 638662ebf46e0cb67df5a33905b5384b9270276c243b6f53a66415509eabb4da48c2d8257b5f67518712911395698cd02a745b6daf42d1cab30a1253a7dd98bf SHA512 10b6d024b24fb236954a981c17dec25b4d4b8f06c4cef3edb9137cf291099453926b5793c6f19bd3b69a9db88e38ed4ea72bbf8aa6f57434a30974b9fb9ab763
 DIST termux-clipboard-0.1.0.crate 2033 BLAKE2B 33003b25e6236370b2423472e87deaac8ee282c375e02faa3575aaec7ef547674f0218a50f0a2d42ff75dcf088ef31d94f44c4b05c0f526dddbaef2e06a8c722 SHA512 acd972d9c9eaa20dfadf1ec01274ed27fb33d16d97b504d8f41fea9c6598557a32d939d0a8a8585d919ee9d1b411d714851d662b5bc7d1a5f3b97d8cd423a434
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
@@ -238,4 +247,5 @@ DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a6
 EBUILD broot-1.6.1.ebuild 4004 BLAKE2B 408b4110e0ff1395e0005df4796ad82d7e9ae5decf5fd463d623aa4af73f3af05cccfe0fcdc2a4012eccf3a1df710bcdbaff488d518cb42cb3b92ce64f661430 SHA512 519ceee993b558e09a778b14cd243207d418f85b7c6c1d93166b230f6450e22728436eea0324e124f08a7498b6b8de67dee34bb5a7d3799adf8037e9aeaa904b
 EBUILD broot-1.6.2.ebuild 4135 BLAKE2B 8c39e8ecfaf64768b0bc31cc9bd3133b9ae138f1bf307c0296d474ced6c77239c8b77d9e8f721d032b8c09f403eb2895ceefd117d4333258a762623be7abcbbb SHA512 2caf1be25e7d4750d4ae8cef126bdd735cb604628f13777cee731aeb4ab3eda1c53884bb4a0b8aa14c14f2fdb20d88f778f6f7c5522a6fd739348160052af124
 EBUILD broot-1.6.3.ebuild 4135 BLAKE2B 69eac0ccd1ece65e72fb9cdcca8a6b0a48b8a7952fac86f7f5beb39ab5d4c95195dc08a70c8cdc00e8f3bb35e7a8e95c43791b83d0d30145815c1af147d650df SHA512 99d454972ca9278ddcc8ccb58ea81fdfb8a5b6dbc2cf051f2b534c53243b4cdb0646e1896921d962255f1e2d1d869b7951015b0890b6dffc742ec698f1c9e11c
-MISC metadata.xml 499 BLAKE2B b16f4d5f2480a6bb47e865113440e6d6622e171bc6865152536ba01953672a409ee00e161b403b42d41de7c7cb79feb21ce1f2a108f2bbccec4a91300c078bd8 SHA512 1296000c3d77708cca841f9c8b82cb358a72002235213d70be4b69f5152689e2f41a716863f3d23cd0b7a87fae556c2fe51117ead647ef78ebb1d3dd7a3c8145
+EBUILD broot-1.6.4.ebuild 4641 BLAKE2B aa7c24dc2c4f2a70b85d643bc4e7defa9075ece3b73913591579a0f6a024a9bf026b31f145d3b6490a8f3a418b0e9351f6822aca896dc560fc155beb2e550a76 SHA512 4e33d0977004bdde36f111404d73cb03b2e8976214a0312d76c5730a9a5bc368e816617d1725bf3a69be89a1ca2f647e58448cc06cb1a9f2cf88fd904cb15118
+MISC metadata.xml 564 BLAKE2B 0c694d4996ceefd6b05c3ff74f313d775c820d3eb0ae327cc2c130a608fd8595c64aa1217599d61952c6ade05415eaac53056c3fad30ccb5347df134715bb573 SHA512 5533ba0526ff6cbb801696c8ddba2dc393b158bdc2cf5dedc3b245362d924172e4bd321412cd6976735bcabe01d5e7e191e11b2718412b5e389e9251ca5ea695
diff --git a/app-misc/broot/broot-1.6.4.ebuild b/app-misc/broot/broot-1.6.4.ebuild
new file mode 100644
index 000000000000..c44d5d72e043
--- /dev/null
+++ b/app-misc/broot/broot-1.6.4.ebuild
@@ -0,0 +1,266 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+adler-1.0.2
+adler32-1.2.0
+ahash-0.4.7
+ahash-0.7.4
+aho-corasick-0.7.18
+ansi_colours-1.0.4
+ansi_term-0.11.0
+anyhow-1.0.42
+argh-0.1.5
+argh_derive-0.1.5
+argh_shared-0.1.5
+atty-0.2.14
+autocfg-1.0.1
+base64-0.13.0
+bet-1.0.0
+bincode-1.3.3
+bitflags-1.2.1
+bstr-0.2.16
+bytemuck-1.7.2
+byteorder-1.4.3
+cc-1.0.69
+cfg-if-1.0.0
+char_reader-0.1.0
+chrono-0.4.19
+clap-2.33.3
+cli-log-0.1.0
+cli-log-2.0.0
+clipboard-win-4.2.1
+color_quant-1.1.0
+crc32fast-1.2.1
+crossbeam-0.8.1
+crossbeam-channel-0.5.1
+crossbeam-deque-0.8.1
+crossbeam-epoch-0.9.5
+crossbeam-queue-0.3.2
+crossbeam-utils-0.8.5
+crossterm-0.19.0
+crossterm-0.21.0
+crossterm_winapi-0.7.0
+crossterm_winapi-0.8.0
+csv-1.1.6
+csv-core-0.1.10
+csv2svg-0.1.5
+custom_error-1.9.2
+deflate-0.8.6
+deser-hjson-1.0.2
+directories-3.0.2
+directories-next-2.0.0
+dirs-sys-0.3.6
+dirs-sys-next-0.1.2
+either-1.6.1
+error-code-2.3.0
+fallible-iterator-0.2.0
+fallible-streaming-iterator-0.1.9
+file-size-1.0.3
+flate2-1.0.20
+fnv-1.0.7
+form_urlencoded-1.0.1
+getrandom-0.2.3
+gif-0.11.2
+git2-0.13.20
+glassbench-0.3.0
+glob-0.3.0
+hashbrown-0.9.1
+hashbrown-0.11.2
+hashlink-0.6.0
+heck-0.3.3
+hermit-abi-0.1.19
+id-arena-2.2.1
+idna-0.2.3
+image-0.23.14
+indexmap-1.7.0
+instant-0.1.10
+is_executable-1.0.1
+itoa-0.4.7
+jobserver-0.1.22
+jpeg-decoder-0.1.22
+lazy-regex-2.2.1
+lazy-regex-proc_macros-2.2.1
+lazy_static-1.4.0
+lazycell-1.3.0
+lfs-core-0.4.2
+libc-0.2.98
+libgit2-sys-0.12.21+1.1.0
+libsqlite3-sys-0.20.1
+libz-sys-1.1.3
+line-wrap-0.1.1
+linked-hash-map-0.5.4
+lock_api-0.4.4
+log-0.4.14
+matches-0.1.8
+memchr-2.4.0
+memmap-0.7.0
+memoffset-0.6.4
+minimad-0.7.1
+minimad-0.8.0
+miniz_oxide-0.3.7
+miniz_oxide-0.4.4
+mio-0.7.13
+miow-0.3.7
+ntapi-0.3.6
+num-integer-0.1.44
+num-iter-0.1.42
+num-rational-0.3.2
+num-traits-0.2.14
+num_cpus-1.13.0
+once_cell-1.8.0
+onig-6.2.0
+onig_sys-69.7.0
+open-1.7.1
+open-2.0.0
+parking_lot-0.11.1
+parking_lot_core-0.8.3
+pathdiff-0.2.0
+percent-encoding-2.1.0
+phf-0.9.0
+phf_generator-0.9.0
+phf_macros-0.9.0
+phf_shared-0.9.0
+pkg-config-0.3.19
+plist-1.2.0
+png-0.16.8
+ppv-lite86-0.2.10
+proc-macro-hack-0.5.19
+proc-macro2-1.0.28
+proc-status-0.1.1
+quote-1.0.9
+rand-0.8.4
+rand_chacha-0.3.1
+rand_core-0.6.3
+rand_hc-0.3.1
+rayon-1.5.1
+rayon-core-1.9.1
+redox_syscall-0.2.9
+redox_users-0.4.0
+regex-1.5.4
+regex-automata-0.1.10
+regex-syntax-0.6.25
+remove_dir_all-0.5.3
+rusqlite-0.24.2
+ryu-1.0.5
+safemem-0.3.3
+same-file-1.0.6
+scoped_threadpool-0.1.9
+scopeguard-1.1.0
+secular-1.0.1
+serde-1.0.127
+serde_derive-1.0.127
+serde_json-1.0.66
+signal-hook-0.1.17
+signal-hook-0.3.9
+signal-hook-mio-0.2.1
+signal-hook-registry-1.4.0
+siphasher-0.3.6
+smallvec-1.6.1
+splitty-0.1.0
+str-buf-1.0.5
+strict-0.1.4
+strsim-0.8.0
+svg-0.8.2
+syn-1.0.74
+syntect-4.6.0
+tempfile-3.2.0
+termimad-0.10.3
+termimad-0.16.1
+terminal-clipboard-0.2.1
+termux-clipboard-0.1.0
+textwrap-0.11.0
+thiserror-1.0.26
+thiserror-impl-1.0.26
+tiff-0.6.1
+time-0.1.43
+tinyvec-1.3.1
+tinyvec_macros-0.1.0
+toml-0.5.8
+umask-1.0.0
+unicode-bidi-0.3.5
+unicode-normalization-0.1.19
+unicode-segmentation-1.8.0
+unicode-width-0.1.8
+unicode-xid-0.2.2
+url-2.2.2
+users-0.11.0
+vcpkg-0.2.15
+vec_map-0.8.2
+version_check-0.9.3
+walkdir-2.3.2
+wasi-0.10.2+wasi-snapshot-preview1
+weezl-0.1.5
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+x11-clipboard-0.5.2
+xcb-0.9.0
+xml-rs-0.8.4
+yaml-rust-0.4.5
+"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 cargo python-any-r1
+
+DESCRIPTION="A new way to see and navigate directory trees"
+HOMEPAGE="https://dystroy.org/broot/ https://github.com/Canop/broot"
+SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X"
+
+RDEPEND="
+	dev-libs/libgit2:=
+	X? ( x11-libs/libxcb:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="X? ( ${PYTHON_DEPS} )"
+
+QA_FLAGS_IGNORED="usr/bin/broot"
+
+pkg_setup() {
+	use X && python-any-r1_pkg_setup # Used by XCB crate
+}
+
+src_configure() {
+	local myfeatures=( $(usev X clipboard) )
+
+	cargo_src_configure --no-default-features
+}
+
+src_prepare() {
+	default
+
+	local mandate=$(date -r man/page +'%Y/%m/%d' || die)
+	sed -e "s|#version|${PV}|" \
+		-e "s|#date|${mandate}|" \
+		man/page > "${T}"/${PN}.1 || die
+}
+
+src_install() {
+	cargo_src_install
+
+	doman "${T}"/${PN}.1
+
+	local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out )
+	cd ${build_dir[0]} || die
+
+	newbashcomp ${PN}.bash ${PN}
+	newbashcomp br.bash br
+
+	insinto /usr/share/zsh/site-functions
+	doins _${PN}
+	doins _br
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+	doins br.fish
+}
diff --git a/app-misc/broot/metadata.xml b/app-misc/broot/metadata.xml
index 2312211da243..9ba7fe219ce3 100644
--- a/app-misc/broot/metadata.xml
+++ b/app-misc/broot/metadata.xml
@@ -12,4 +12,7 @@
 	<upstream>
 		<remote-id type="github">Canop/broot</remote-id>
 	</upstream>
+	<use>
+		<flag name="X">X11 clipboard interaction</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index b13a79e0ed21..60bb0cf220ef 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -2,7 +2,9 @@ AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d
 DIST ca-certificates_20210119.tar.xz 232964 BLAKE2B 593352912d2b490e3f46ea032ac1ddf1c87a7ac93859d475461cbba490918cdec853b0bb30bb253a634d8d597ca6f0304bc81122b4b31b5b31fd6a80e1faaf33 SHA512 a824209fa0ff0865872a07d8e6b901d8407f599243810fd5c820e1f69226e05b0b4f1e25e5ff3d8d398ff952529084442f026e32220961f359f6323f6bf03373
 DIST nss-3.66.tar.gz 82401896 BLAKE2B ae369899af681e1c6ea8046098c83da08c2112b16d85a0eaee46e9d4f97dfb3f7c3e97eb681ec947b5648446c6db51e8f1396ec9bb6c731c9678ecf925e7f743 SHA512 327129cb065a8c19246e081e3cbc4798c81dc52eab6ee366eade151e9d308990592075c52a7c672165725fd855a0c539d56a803c26ef066561c584d693e0e467
 DIST nss-3.70.tar.gz 83917362 BLAKE2B 51de2e2cf5feb11045388b0badec24509d50f8bc8abd4116cbab77ff434f86a44ad4c98e533a1dd7093a9d1be9b7deb45f0426e3a173f9b2b92995cf63f2ea51 SHA512 9766282b36560d2f73ac5e90dbc3962802d6b1e8650ff9c0afbd6d2e1ff4cf8f2bc251f972344dc8a6ac5209b917aae03cc9883cb081011a7dea7bd258a95d82
+DIST nss-3.71.tar.gz 83927933 BLAKE2B a8d683b9f9bff5390e0378ab0d55156f7cc69a52b0667658738e67e920548965e7a276dc4104547b2e6a1a6d18325c3f85b955b9c12d7f071d10930b5264207e SHA512 a4a724dc4e8677965b6245ea2309790d31ec7719658e2b349eb67c9008082132c76277340d15e4fdd8d2fe1f560ae6803fb038d023c3dfd2e3772fa3b77720e2
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD ca-certificates-20210119.3.66.ebuild 5729 BLAKE2B 621fa9f502341120c79456c777adc53bc5f745e30c5f0262f9939115d0aa689e050c1fa0804c60f576e6a6e4d551eed66ae1688fb1221f3df0457a5d1fc12c66 SHA512 ebc95de3a0c5d64927d6aea7399ed7d7d314ff275de0e8ffe3c62a26b86518104cdba475ca99b01de0967a0dcc807bd8e1b5fc7528f77d890a7f7d46b30f2855
 EBUILD ca-certificates-20210119.3.70.ebuild 5737 BLAKE2B 58d29e546924fffc92dbcea7b2758b5486c1338852d3d6794df12cd07770552ad961fcdf961bb2c486dfb0a15b12d234cd4e4ac4c127f1ac2fedf4b829daf0ea SHA512 5750aa5e1c62ad82dadac6a67fb847d4f6c18f30c2fd4eca0da9c798ef285a49784633f399f1df0cd4a3a480fa936f471c06e90a693b46ab7d943574dec9c7a6
+EBUILD ca-certificates-20210119.3.71.ebuild 5737 BLAKE2B 58d29e546924fffc92dbcea7b2758b5486c1338852d3d6794df12cd07770552ad961fcdf961bb2c486dfb0a15b12d234cd4e4ac4c127f1ac2fedf4b829daf0ea SHA512 5750aa5e1c62ad82dadac6a67fb847d4f6c18f30c2fd4eca0da9c798ef285a49784633f399f1df0cd4a3a480fa936f471c06e90a693b46ab7d943574dec9c7a6
 MISC metadata.xml 373 BLAKE2B 578ac9cb9ac73fc04e06667e896227927d5438e5c1ef3eae1966e8d01a8dd915669b8c81418f6558b4b5d561473111e50f9d94d4b50f1f03355130c9d9be61f0 SHA512 56216f969a510a4c054109ca6fab651cfb0aaf4768d43f70a21aeea6778ced6793957d9bd39bede89e9fc8577aa6c27bf1ca0402aa1e9aa49ec5981a3230b954
diff --git a/app-misc/ca-certificates/ca-certificates-20210119.3.71.ebuild b/app-misc/ca-certificates/ca-certificates-20210119.3.71.ebuild
new file mode 100644
index 000000000000..589797be2800
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20210119.3.71.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result.  The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# When triaging user reports, refer to our wiki for tips:
+# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+	# Compile from source ourselves.
+	PRECOMPILED=false
+
+	DEB_VER=$(ver_cut 1)
+	NSS_VER=$(ver_cut 2-)
+	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+	# Debian precompiled version.
+	PRECOMPILED=true
+	inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+		cacert? (
+			https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch
+		)"
+fi
+
+LICENSE="MPL-1.1"
+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 ~x86-winnt"
+IUSE=""
+${PRECOMPILED} || IUSE+=" cacert"
+
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+CDEPEND="app-misc/c_rehash
+	sys-apps/debianutils"
+
+BDEPEND="${CDEPEND}"
+if ! ${PRECOMPILED} ; then
+	BDEPEND+=" ${PYTHON_DEPS}"
+fi
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+	DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+
+RDEPEND="${CDEPEND}
+	${DEPEND}"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+	if ! ${PRECOMPILED} ; then
+		default
+		# Initial 20200601 deb release had bad naming inside the debian source tarball.
+		DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
+		DEB_BAD_S="${WORKDIR}/work"
+		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]] ; then
+			mv "${DEB_BAD_S}" "${DEB_S}"
+		fi
+	fi
+
+	# Do all the work in the image subdir to avoid conflicting with source
+	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
+	mkdir -p "image/${EPREFIX}" || die
+	cd "image/${EPREFIX}" || die
+
+	${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		mkdir -p usr/sbin || die
+		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
+			usr/sbin/ || die
+
+		if use cacert ; then
+			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
+			eapply "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+			popd >/dev/null || die
+		fi
+	fi
+
+	default
+	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+	sed -i \
+		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
+		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+		-e 's/openssl rehash/c_rehash/' \
+		usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		python_setup
+		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
+		# Grab the database from the nss sources.
+		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+		emake -C "${d}"
+
+		# Now move the files to the same places that the precompiled would.
+		mkdir -p etc/ssl/certs \
+			etc/ca-certificates/update.d \
+			"${c}"/mozilla \
+			|| die
+		if use cacert ; then
+			mkdir -p "${c}"/cacert.org || die
+			mv "${d}"/CA_Cert_Signing_Authority.crt \
+				"${c}"/cacert.org/cacert.org_class1.crt || die
+			mv "${d}"/CAcert_Class_3_Root.crt \
+				"${c}"/cacert.org/cacert.org_class3.crt || die
+		fi
+		mv "${d}"/*.crt "${c}"/mozilla/ || die
+	else
+		mv usr/share/doc/{ca-certificates,${PF}} || die
+	fi
+
+	(
+		echo "# Automatically generated by ${CATEGORY}/${PF}"
+		echo "# $(date -u)"
+		echo "# Do not edit."
+		cd "${c}" || die
+		find * -name '*.crt' | LC_ALL=C sort
+	) > etc/ca-certificates.conf
+
+	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+	cp -pPR image/* "${D}"/ || die
+	if ! ${PRECOMPILED} ; then
+		cd ${PN}-${DEB_VER} || die
+		doman sbin/*.8
+		dodoc debian/README.* examples/ca-certificates-local/README
+	fi
+
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+	doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+	if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then
+		# if the user has local certs, we need to rebuild again
+		# to include their stuff in the db.
+		# However it's too overzealous when the user has custom certs in place.
+		# --fresh is to clean up dangling symlinks
+		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+	fi
+
+	if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+	fi
+}
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index fdf489b75262..33ee91480b0d 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,6 +1,5 @@
 AUX ckb-0.4.4-libinput-1.2.0.patch 1188 BLAKE2B 36ee73dbd1f8ffa70fae27dd4915837d09eef2226d908aa4cd8e7b5c9bde2a645cb212535d33879efdefee687ac52177979116a0ef81ee921f24fad1654608de SHA512 1d39cfe1bceb8b950f6952e57c7848870a3ffd359adb2245b570dc9fe928480b07cd5332e3cabb9b47090b4b3216474f380c5679db963611c7657bea7d3ac083
 AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
 DIST ckb-0.4.4.tar.gz 1593244 BLAKE2B 99476d3be98b3edac540b67b275a1ebec440f2a55d8bedd9bbdc815abd15bbeb3d035c703faa2dfdf9f4dcb70f49024c82b2990b1151b0ad5b78b741430d80f9 SHA512 b03d301a6b984957b5a3047769f25311c479f7992c59222b0ce9314b3204dac2d937c26997b97ec2ee1fdc79e3208c76a57a5c603dc1cd99ffb39fd426f58385
-EBUILD ckb-0.4.4-r1.ebuild 1222 BLAKE2B 9bbe18f605c63962190d6b9ff32b9f15481e9b561d1979ca7e885ea06c67b12e39427a26cceb9210f0ecc89a10928d7b3ef9676f28106bf1ee330c5fad9e4f88 SHA512 49d385934ae7c6948f73086950e1aa0a82c7043c1b563282f649c84d37372abd07879641f022486c1d4d3879b8dae3efa9742636b08edc1b8a5b67560e49dd3b
 EBUILD ckb-0.4.4-r2.ebuild 1270 BLAKE2B 66122b7f5a540f2deb6409018acfa5410c8442ddd773a4c00f01b5e0c4bce9d194728fa47a2873e41811cb2c0b378c9d551553bd309c05e4fdda02e02b112221 SHA512 c834ed41c22b438c582a22aae9025e61a2258df7e849ab31a8dca532e07547dccafc246a2ba192e4fe98b9138344597585b5a1b262151ba77068c592f3142c11
 MISC metadata.xml 330 BLAKE2B 1620c787b0b2ede7874f1b8dba4aa6629f436217278024965a9e5a715cb3196b8630351a1b742f7f05177dc7a22b76caf16cc0ed8fd52dec2e81c54dc1f7f3db SHA512 241b50400569870e01576e52b871aded1ab05853677a05ac42a54eb03295ec9e197a6a592e9182c1169dc9e1f963b9439bce6a2c75eddf5ea7168e07ca362dae
diff --git a/app-misc/ckb/ckb-0.4.4-r1.ebuild b/app-misc/ckb/ckb-0.4.4-r1.ebuild
deleted file mode 100644
index 7b290d85ef3a..000000000000
--- a/app-misc/ckb/ckb-0.4.4-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-DESCRIPTION="Corsair K65/K70/K95 Driver"
-HOMEPAGE="https://github.com/ckb-next/ckb-next"
-SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="systemd"
-
-RDEPEND="
-	dev-libs/libdbusmenu-qt
-	dev-libs/quazip:0=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-sound/pulseaudio
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/xcb-util-wm"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${PN}-next-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_UPDATER=yes
-		-DFORCE_INIT_SYSTEM=$(usex systemd systemd openrc)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodoc CHANGELOG.md
-
-	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "The ckb daemon will have to be started before use:"
-		elog
-	        if use systemd ; then
-			elog "# systemctl start ckb-next-daemon"
-		else
-			elog "# rc-service ckb start"
-		fi
-	fi
-}
diff --git a/app-misc/detox/Manifest b/app-misc/detox/Manifest
index baeb5a3f5543..4747e2b34ed0 100644
--- a/app-misc/detox/Manifest
+++ b/app-misc/detox/Manifest
@@ -1,5 +1,5 @@
 DIST detox-1.4.2.tar.gz 106736 BLAKE2B a27f9d93bf6f6c1634517c0f193affe576b2eec6be4b8fc38e91ef75a6f1a01a4376684d5a9b109b3971d0e311b64faeba020a3b7660ff130086956a7ebe92bd SHA512 ca1327e127cf1ba1803d8931aa119c9d11fc5b998f45ad5f7c339cea7f7928a5a6a45f90db9a51a7ccf6d4ee268cd316461c621db62dcc7182cd0255e74a1481
 DIST detox-1.4.5.tar.gz 111745 BLAKE2B 2da339ea0be836671d792bd2582815f9bcf4b6a0681d4a2b52062462fe2657c01c8adf378a53b2f758c138445c5acf6183c31047bd170bc21b088635768247e9 SHA512 f91ae893cf50a3f9d731a26218625f572c783406056c0accbd8253d6dc5de9013ffbe1497120af7be4b7054d65ebbe96b73df64a5d1cc3aaec40e6542e5c6208
-EBUILD detox-1.4.2.ebuild 758 BLAKE2B 605cda9872bffe8755ece521b9bc7ecfc6ea3300a1cef8e93ff204da7d5da54f6a49e32a77864c54b036a0f571a5b52419d16733de28fa8874294d4e02948367 SHA512 8d083039907bcbb7f935f65b9129658a7b0071c90c6d03224a3d200ad3cf490f1575e77fefb08f66c32552c3db7fd06b0294045b7af091e629cfbc6789de488b
-EBUILD detox-1.4.5.ebuild 745 BLAKE2B 895e93808596dc415ba918b65a63ad11d3add168f52cc92a90dd8f548b29d0e2b3bfe73d4858951ab418674cf646303cd893372a4e94b4d195fed727e4b57eb8 SHA512 fd4be905001c282beb12c4cd2f548d587c85561298cdcbf00e0be68e2b6cd28644c81c1c377a1456e58712e384e0c1974be525b9d9b52a0051d3a5952d9b3341
+EBUILD detox-1.4.2-r1.ebuild 796 BLAKE2B f10de920042dba56509776b75b0e4e925df05b7f8ea8411eac439bd9a1fc0c72b795204b1c19bb116aa9d6c6c20bda6218929c2b0931dfbc2102fc65beb2620c SHA512 5e23aafc1370911ce72c1d7377def59289493fbf37e8916c03e740cccdad1ea798ad8ff02d0dd88de196cd962d7d1ddcba3ff3d98f4ba970aebc2ba659c54323
+EBUILD detox-1.4.5-r1.ebuild 783 BLAKE2B eb1e2a8c7df4b0ccc726d30649bdebb3d9e3aaddf474faddc6cb2b1688d1312e3356e4b5f2f03afcbb40f2655ebb9b274c0374c3661177a847f3b9e07fae9a0e SHA512 70fd10c4a862c747aebfe1d0e1568b00bc1ddd707aff7b02a32b43793a15f3a3e963a8e86c6f8479d62100c57eda482199475405bdae0dd02758ffa141bab977
 MISC metadata.xml 341 BLAKE2B 3a5f0b5465950aaf5b6140e8eb01933d909487899187bf69ceed815061be77da98591efc404cdfbebf828bd0883e47a7e3ff16de09ae7038643d3ff033a166ce SHA512 088a7bafca6cf9c382870e859bbf27f46fa0b7478b9e34d28a1bd63b23ea48c023c1a4f834f0a6ca124c80d2744c336ce6eb070851368cbbc0c246ead85444a4
diff --git a/app-misc/detox/detox-1.4.2-r1.ebuild b/app-misc/detox/detox-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..549e71fe960c
--- /dev/null
+++ b/app-misc/detox/detox-1.4.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Safely remove spaces and strange characters from filenames"
+HOMEPAGE="http://detox.sourceforge.net/ https://github.com/dharple/detox"
+SRC_URI="https://github.com/dharple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"/${MY_P}
+
+RDEPEND="
+	!dev-python/detox"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	sys-devel/bison
+"
+
+src_prepare() {
+	default
+	sed \
+		-e '/detoxrc.sample/d' \
+		-i Makefile.am || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	# bug #811945
+	insinto /etc
+	newins etc/detoxrc.sample detoxrc
+}
diff --git a/app-misc/detox/detox-1.4.2.ebuild b/app-misc/detox/detox-1.4.2.ebuild
deleted file mode 100644
index d168fe1e4e09..000000000000
--- a/app-misc/detox/detox-1.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Safely remove spaces and strange characters from filenames"
-HOMEPAGE="http://detox.sourceforge.net/ https://github.com/dharple/detox"
-SRC_URI="https://github.com/dharple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}"/${MY_P}
-
-RDEPEND="
-	!dev-python/detox"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	sys-devel/bison
-"
-
-src_prepare() {
-	default
-	sed \
-		-e '/detoxrc.sample/d' \
-		-i Makefile.am || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	dodoc etc/${PN}rc.sample
-}
diff --git a/app-misc/detox/detox-1.4.5-r1.ebuild b/app-misc/detox/detox-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..d04bce3cb5cf
--- /dev/null
+++ b/app-misc/detox/detox-1.4.5-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Safely remove spaces and strange characters from filenames"
+HOMEPAGE="http://detox.sourceforge.net/ https://github.com/dharple/detox"
+SRC_URI="https://github.com/dharple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="!dev-python/detox"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/bison
+	sys-devel/flex"
+
+src_prepare() {
+	default
+
+	sed \
+		-e '/detoxrc.sample/d' \
+		-i Makefile.am || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	# bug #811945
+	insinto /etc
+	newins etc/detoxrc.sample detoxrc
+}
diff --git a/app-misc/detox/detox-1.4.5.ebuild b/app-misc/detox/detox-1.4.5.ebuild
deleted file mode 100644
index 14a57b781c02..000000000000
--- a/app-misc/detox/detox-1.4.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Safely remove spaces and strange characters from filenames"
-HOMEPAGE="http://detox.sourceforge.net/ https://github.com/dharple/detox"
-SRC_URI="https://github.com/dharple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="!dev-python/detox"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/bison
-	sys-devel/flex"
-
-src_prepare() {
-	default
-
-	sed \
-		-e '/detoxrc.sample/d' \
-		-i Makefile.am || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	dodoc etc/${PN}rc.sample
-}
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 8dba32c9d2a6..14ba80251eee 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -14,7 +14,7 @@ DIST elasticsearch-7.15.0-no-jdk-linux-x86_64.tar.gz 196775804 BLAKE2B c08a77a03
 DIST elasticsearch-oss-6.8.17.tar.gz 68247749 BLAKE2B 12e85804a7d58dc27d85fbed6501831d92428405cb4636355c523a370863e00301bd75d7d12404ee0c7eefc32c53bc4b23e8fc1fecf2f606faf85369b2262cc7 SHA512 0f165357b1f389fbd01f07397a2b3ea5d493fae720c15213f2ee47a0c2c75bc4a448384767646d7585a18d4577899b840121c1829a987a16d2de68f216b28f7c
 DIST elasticsearch-oss-6.8.19.tar.gz 68255213 BLAKE2B 7fba24a70dafbaf94d2c9f2f25dfc976f831759e8be67ce0a5f15ffe11b9f8d4d62b7906ad5250bcbaacab43139b4471328978c8adc4be527e178597b6bf3294 SHA512 d0a371a4bf19db38b8b0379856a3535c6472e373abd1e9cae0171cffed97005b9fb7b6f7d3d67edc3d67feb5265a9f33d974d6abad8e398148be94566735c2c0
 EBUILD elasticsearch-6.8.17.ebuild 2539 BLAKE2B de446b12484037a7952b5b21537189b1ee7157d87a779109e025648fe8cfe3c82f3c8d59dc823350faddc5ec0c6b01e7461739da052226134353ae9c3e388cea SHA512 ee3431551b5a0c2896172e00f42b96da8c400526fd907ba6c4e6e0b352a224fa85589c5b17924d42915490b0449b207652c6442b6fcd51a37d080f82b944069f
-EBUILD elasticsearch-6.8.19.ebuild 2558 BLAKE2B 0f161790a6d08f70c9657d39610504867ad758eb5142d64121df0e46e83278240251d8d24b234c79c6b2ee362ac4231d0755c5cf4092084c3fad05882b9da51d SHA512 00e7f0cee8e0ebda9af7e52678a141f06a05968e39679509a48758bc32309ddd37eb49bd5567e32a67b023e69e2e293da37fcc0a7957a4d92224e7d67d73ea8d
+EBUILD elasticsearch-6.8.19.ebuild 2597 BLAKE2B 2796e7be1cd512db6f812a049aae01f659d4090aabd0d70e347e237f8ea5c3f4dec6099165e135cd5cc000020315381674af375138eacebb11737d9801ede2bd SHA512 4d5cc3a06fd06b21601777b1de1ae8b3c4a5f98e3661c0f95e0956ad06ed6e6d9f42ddc8f170ee90a37638d9e4eea7f8bbf422ab87d61db2b0c1d062c8301dea
 EBUILD elasticsearch-7.13.4.ebuild 2389 BLAKE2B 0a33190cd4dd3c80a69bd4356ee696639c17f8e1d8b97780bac4a12435a03cd3fcb6186e0a7f916f04dfcd0358055fb6153fe3f090f9c4cfabfc982727f2fb88 SHA512 7fb066fb4aef44bb335675a20b52857d3b1cef213401bc48fc333483bc6091f8cd52e0056e0b93e1da3bba9cc571985ece4329397c93e401c7bbd9c012642ce2
 EBUILD elasticsearch-7.15.0.ebuild 2404 BLAKE2B b4b45c6b66072bb78efa7fd9c9e248c08283a412389df9211a8ffdd66c9daf918cf1492790fa991db124ea4fc76e66fe8b2ad2e1643f5d59d47304ce84249046 SHA512 afa0314c8cd2f46ed5af2a47d2500e4c44358c851713125027a68b578a5ca34895e8e6d966b968539b2a3ddb646c4845f48a4bff3774dcece23d6228420dce8b
 MISC metadata.xml 490 BLAKE2B 48bca2017c5b522ba95203316efcb1fa711a0a1689fe75bc3b645f3f305d0671e69747d657e0b561237b472a721edf7cbe51a32919a71b57dc30e86bd4c05655 SHA512 37e637e54f452cd1fcc23a5e1537d53af6a17f3e7d805bb6d091d85e564f9132931ebf9c020580bf9fe81721293d972b03fa47985c04a722570630248ca416c4
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.19.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.19.ebuild
index 24df69cda8d5..8fe587826d7b 100644
--- a/app-misc/elasticsearch/elasticsearch-6.8.19.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.8.19.ebuild
@@ -86,5 +86,5 @@ pkg_postinst() {
 	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
 	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
 
-	tmpfiles_process
+	tmpfiles_process /usr/lib/tmpfiles.d/elasticsearch.conf
 }
diff --git a/app-misc/gcal/Manifest b/app-misc/gcal/Manifest
index bdd1739ecd93..0d0e54366e3e 100644
--- a/app-misc/gcal/Manifest
+++ b/app-misc/gcal/Manifest
@@ -2,5 +2,5 @@ AUX gcal-4.1-glibc228.patch 3267 BLAKE2B b754919136da6652ef2f44bfbf9f9b0be839b89
 DIST gcal-3.6.3.tar.xz 1640172 BLAKE2B 322a3bf34a389ab92daa0262b8b36f99b585c7f76e46e5a921a5e23ced74ae98bf09446e02988c98c29ecadf631b6624cb43e76c8da736a185e52ed34441c334 SHA512 9be7d6e58a55fbb7531f91bd2a6fa51e8d62364636c31d8d65f6ac24415ac2de8af5eaab8496e155c2820b7480ecf926c4395114ff4363deb21bd268dec44963
 DIST gcal-4.1.tar.xz 1658948 BLAKE2B 980b509923d7e3afbd391f1129a77e647f61e09d68aec29490bc16041260e56082097732f015260515036a4560bee18391c8f6aaa5eaff69740f18a37a44d8f2 SHA512 24b9ee87c3dbfd3231b2017fd0a3030cc5b7c7fde032ea1fcf816b0f10dc40d808c646aa8ece86651da4f3928fecf35f84f4c68c0bfdb8cf63e3ecc189d2074d
 EBUILD gcal-3.6.3.ebuild 756 BLAKE2B d921836afc98c73ef7040bb23f6672fc80b0c4256351b1ad53d4219de8574d6f20154b7e59dc41517a065411ca24d7f356ebe2c31621837a82fd27c86d4a2b1a SHA512 abec0eb87080b32bdbf86be2643eb9aa56f0fbdd4fe5d8355a3f40fa1ffc241335793150bf1634691448ba60998eee2ed91419d49a3190b6e05043993788d851
-EBUILD gcal-4.1.ebuild 884 BLAKE2B 6729643c4a7e0f34ce43e3af35b85b4c577878d4b018e828ac3c7920eae12f441399811fe93aff1d5eb39f8a5667d89004508fd8274119be8898a35d5b9ab7cf SHA512 a1e0d8a1fddc97b240ec18bb1218278e45bfce65d4522576a6cbc786ac94b22b1fed3fc915e763e7bcfb014074beaeb2cfcddc1230244e347ba451bccd3e6769
+EBUILD gcal-4.1.ebuild 881 BLAKE2B 9e9cf497307c14dc5d745a1d1937976e2b8d1729c3564afe7997f41fa4a1a07a80f89cdce4bc80553f52f7594ad04326332c7f88ef9856f24fed77e2ba60a412 SHA512 b6b5b4ad0353b626c5a0bf80f8a9fb0459182f2e5848130d2761fe91684fc61d95d926eeeb166b6f937260488afe66f153d82af8beab01a53d93f25b52770080
 MISC metadata.xml 1019 BLAKE2B d4fc884d4d383b567d1017a8634eeb63b1cdf9efdcfa094973320e2308708aeffd0f1832a4acc34099d53542aff5ae6a87c557b2a7e52370987ce02d5c16f34c SHA512 4a8cfa4915eb41bdcb95f22b2c5ef1c0b67cafa270b46e75ac33cdac28b1c4e3c771356c5a4942860ee423eb30e4b9edda9ac66d292b1a4828fbdab529984287
diff --git a/app-misc/gcal/gcal-4.1.ebuild b/app-misc/gcal/gcal-4.1.ebuild
index 5fda1b0ee397..ee18f98e3850 100644
--- a/app-misc/gcal/gcal-4.1.ebuild
+++ b/app-misc/gcal/gcal-4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gcal/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ncurses nls unicode"
 
 RDEPEND="nls? ( virtual/libintl )
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 229ebf6b2a36..7fbb28285526 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,5 +1,5 @@
 AUX geneweb.confd 67 BLAKE2B 83af31b2708fc64dfba852fce65d6c76bf71bceff40ef5b7ef32a58ea9ae941771569d664f3fc0d555dd8ac9e78740fc0449d1011dbcfeeb66dd320c7b1f44fd SHA512 5d7e373c042ba1de97261807cf3b223157c0f383106b4fb2f2b04de21214218ad3a6e0f097101d45cb61e74d90d060ead93dc6e79a125ad97a0126690ae732b3
 AUX geneweb.initd 429 BLAKE2B d216c7970cd7e62a3732faeee6ac97062712023a6bbad6d6542aaf930f4e7e34d4f3e3cb844b734ee3e8fbae9950438f1a7d5b7206e9a2d304b77095107e5814 SHA512 8daa663aa7d7f614ddd709616411b2078dad492813de80dd9be9866c61a1ed97c41b28ec94fece79648e2c587b991ab0820e6601891add6d0c6867fe82782eb8
 DIST geneweb-7.0.0.tar.gz 14767981 BLAKE2B 3a0a777a934d26fa91bd94d20311c6147e749961035b57aed8322c4e96f5cead2edde3a96e362b5de35073fa594d4cb5f3ef0f4d7eeaebea2095bfeef37740b6 SHA512 359b8e2258d572198a7516dd03830e536038392d552482f25fe4b93ded76dccebfe3c420eb2ba1a566500200755c87cbe19a2060eaeea895bd84c505b7b65345
-EBUILD geneweb-7.0.0-r2.ebuild 1812 BLAKE2B 9429e6b583ba623170136caa894445b3769ccc6a736ae38b9f4000f863e4646a2a85b385da171e091e23b28201b9d5b60bf84721b1479e712c9a0068e58fc0d4 SHA512 9df0d06cc98007923a895e9c7af6f5ec21bc5527a99c6fecb4e070e6358947a5db2518a9cf23d523a5b414391a63495e5328a3ea99a4184bc3b396c82cbbdef1
+EBUILD geneweb-7.0.0-r2.ebuild 1886 BLAKE2B cdf31d6c0cd6b02b1ec96442255ebcddcb3e8af2a25c995ff3404e5471f6b43e25aab5531f607e9b7c560586ad51e6e4714076da15bb7554ff7dfb4628a69995 SHA512 ae84b83647fc6cc069d512f00360085b6bded9033d8f75472e2f4002b5c5893e1047c47c3002cd1c5f3f9797c11bb073f9f36477b6264ed0f457ac2af872ac25
 MISC metadata.xml 653 BLAKE2B eb1a56a2d9653f3dfaa2d22e6e3515f371d0d2f0d8a7fcf645ece5cb9d3c475703dc5c78379522264a3164606246368e1be056b915123aa7fbb9d111807d319f SHA512 923b0b1debec0cc57ce0b5616b187b54f20ad1dd151eda62bce5f12c2f1767f40f236118224e1ff92bd8894e09d5628313ce391220d60ac903240bdf15cda3ef
diff --git a/app-misc/geneweb/geneweb-7.0.0-r2.ebuild b/app-misc/geneweb/geneweb-7.0.0-r2.ebuild
index 5215b8968136..22aceff8db39 100644
--- a/app-misc/geneweb/geneweb-7.0.0-r2.ebuild
+++ b/app-misc/geneweb/geneweb-7.0.0-r2.ebuild
@@ -32,6 +32,7 @@ src_prepare() {
 	default
 
 	sed -i -e "s/oUnit/ounit2/" test/dune.in || die
+	sed -i -e "500,$ s| compare | Stdlib.compare |" lib/util/mutil.ml || die
 }
 
 src_configure() {
diff --git a/app-misc/jdupes/Manifest b/app-misc/jdupes/Manifest
new file mode 100644
index 000000000000..d7abd35f6e72
--- /dev/null
+++ b/app-misc/jdupes/Manifest
@@ -0,0 +1,4 @@
+DIST jdupes-1.20.0.tar.gz 93809 BLAKE2B cce6ca06794ee3af9523e3c86550ff2b49a5f42a13278bd61c99099b4c2cab1a392bc973c44593acb23b7e8f99d4f23518f526244182a0d9d3b4084e80cc1015 SHA512 62bb78a902e77f0c9acce93c7c139fc2aaa5911aa85322a372dd0e6b375ee5c4992e91b821fa3f9eb407820657f57591303c9bc14a9fe453d9a4c5651caf05ff
+EBUILD jdupes-1.20.0.ebuild 776 BLAKE2B 48fe263aa0ced74f6b506af656ec2e4f23b08f67d84374af444749dc113004f11acdadc41dd23f38b709ed351eabcd16918902046cd264e0c1402f2efb481914 SHA512 b19b6acc2bd9b1c888a636b48a4ad6c9dde4889771460823e4e916489a973f18686e03b421c68b33ef9e61f0da96b24d80c9358041ca9685dea2fa66c5abd814
+EBUILD jdupes-9999.ebuild 776 BLAKE2B 48fe263aa0ced74f6b506af656ec2e4f23b08f67d84374af444749dc113004f11acdadc41dd23f38b709ed351eabcd16918902046cd264e0c1402f2efb481914 SHA512 b19b6acc2bd9b1c888a636b48a4ad6c9dde4889771460823e4e916489a973f18686e03b421c68b33ef9e61f0da96b24d80c9358041ca9685dea2fa66c5abd814
+MISC metadata.xml 472 BLAKE2B 516816d73afd9e585ba072227c897943c45e86f7cf139858ac1768c97751b6491ca53b7232c7438e9c148c430c4e389d54f121ff71c239e3cc5c747ac49d8447 SHA512 3eae4e232c16d37e0e540a80dae26dc22c5594ce779cfce29da2173b66cfb0424d0cb808e54653f83204d2eab779ee9b64c0bc4347d84464f958c19a1a67c13d
diff --git a/app-misc/jdupes/jdupes-1.20.0.ebuild b/app-misc/jdupes/jdupes-1.20.0.ebuild
new file mode 100644
index 000000000000..681f1d0f1493
--- /dev/null
+++ b/app-misc/jdupes/jdupes-1.20.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Identify duplicate files on the filesystem"
+HOMEPAGE="https://github.com/jbruchon/jdupes"
+if [[ "${PV}" == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/jbruchon/jdupes.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jbruchon/jdupes/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+LICENSE="MIT"
+SLOT="0"
+
+# missing test.sh script
+# https://github.com/jbruchon/jdupes/issues/191
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -e '/PREFIX/s/=/?=/' Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	einstalldocs
+}
diff --git a/app-misc/jdupes/jdupes-9999.ebuild b/app-misc/jdupes/jdupes-9999.ebuild
new file mode 100644
index 000000000000..681f1d0f1493
--- /dev/null
+++ b/app-misc/jdupes/jdupes-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Identify duplicate files on the filesystem"
+HOMEPAGE="https://github.com/jbruchon/jdupes"
+if [[ "${PV}" == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/jbruchon/jdupes.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jbruchon/jdupes/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+LICENSE="MIT"
+SLOT="0"
+
+# missing test.sh script
+# https://github.com/jbruchon/jdupes/issues/191
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -e '/PREFIX/s/=/?=/' Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	einstalldocs
+}
diff --git a/app-misc/jdupes/metadata.xml b/app-misc/jdupes/metadata.xml
new file mode 100644
index 000000000000..401065d65687
--- /dev/null
+++ b/app-misc/jdupes/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>jakov.petrina@sartura.hr</email>
+		<name>Jakov Petrina</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jbruchon/jdupes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/kanatest/Manifest b/app-misc/kanatest/Manifest
index c0bc2870344f..bcdbbc7cc8a2 100644
--- a/app-misc/kanatest/Manifest
+++ b/app-misc/kanatest/Manifest
@@ -1,6 +1,8 @@
 AUX kanatest-0.4.8+gtk-2.22.patch 967 BLAKE2B d8e0802faeccdf32449ec49ff6f2a828dbf78663d690ed543a6e5cae20fa651de4e106476408bff623e016fe446f06641cfedba06d3d07031b1705b360c67a24 SHA512 d996ba512c7b10d8971cd5f7ee1bd25517f1847f3f4466e25b3217fbff23c6164ac51e5d29bc4ed6f6e02251e02f00b5d430e004d50b8f00eab468efc4f51def
 AUX kanatest-0.4.8-autoconf.patch 363 BLAKE2B 4f73332578adaeae1d9cd9368e377b76810e1b1c4c2e8fe02f2e647c15b95bd4bd860a24955b27b7ee223a321e0fa88386b45ae47f3786dc4f23a00e1ad7dd39 SHA512 25dff41e539ce5b758799df673735407c13560762a091a886e552c26be4dd7191bcd867523756e1f0b52066c13774ee16d5b1a32deb94e0355a9ae1396d0cf54
 AUX kanatest-0.4.8-cflags.patch 432 BLAKE2B 95da5c15032bf7476814da5b2a8d946f8a65f19e410618a59c3872122f2d9fd8499b1bc273941152034e0860f5700060eb96360012b20ab5a95c058f12bd250f SHA512 7d1d9ffda261a918d37b76fac63e641428c41ac225845cfe58b1bf5e4c8908447c56340f581b918ef55d34754f7b795d4cd0fb1eb03ea6327e43b719a95a367d
+AUX kanatest-0.4.8-desktop-QA.patch 388 BLAKE2B e894bc7497920187e1c9469b93860bfe0cbdf089f05b3392c2137379253085aba22316f8cd126e7a8b8017e90373e66f56cd0bd0f15cf500d54424aea83c0286 SHA512 7cee66cff16552831bb935f93eb2144a6b35ab4563be0750beaf83da95f7cf54292b29d70f92b4b4be9202784c56e5bd082df49d870cd22a5fb89380112a2ca9
+AUX kanatest-0.4.8-format-security.patch 1151 BLAKE2B bffee4a4301b78e92cad399457cb988754380c42c9e880148b3b7c4b01b06f013b623a05941d43f55d580d304d156ff6830322126a1610e2c6bea6cbba2f6f6a SHA512 6d97fbf0fc4e7013e43db609f193efd28eda45e209b70d2310efa1ae525da554c8b59abb514fd5a085973dd0c1532bafca6fc0514b1e8fe6144c5d39d3a6124e
 DIST kanatest-0.4.8.tar.gz 302154 BLAKE2B b5bc8668f2526abef3ec576c5781b16d7c226f744613a38010125bcb1c977f0fc0b58809ba2a468a216f4b4d7b974e0d12693eea9754cc4a0ce75efcedfb1333 SHA512 c52a5e4104c17eae29f03f30abd7f003c83757e04298427112593603eab0edf7d7927b0567a053f2ea3b8aac66921546180c452d84ef6b3cdc2a361f14cbac47
-EBUILD kanatest-0.4.8.ebuild 950 BLAKE2B a3e9df62e38ae30ce582c571cfbf965bc9f36efd25fa5203800b9cacdf056d24ba7bcbebe7486a4360c404f2c46f8d081a7de3bb6b7814dd562adbb683373914 SHA512 73bf94c9e66e22184feb62719a604e99e3333e19a2e07bd69e8d940fdf4a9de51d8652697b265ae5491f4ba557b271b9f6e2adc569ff3e8e763c65600e53b5e5
+EBUILD kanatest-0.4.8.ebuild 767 BLAKE2B 24e1f3f6aadc241150bff453d104db334e9ebc6d7821777d426bd712fb247cf3eb5e09110730e7f18edd56a26c1409d10ecca39b8b4bac0480e022e3857843e7 SHA512 ad7d2b67465a54d5b3dc87ad9f405f14a977015c359448a23278df7e47154d0e2c61f2f676897959a5ada0571f4deeefd06b6d6444f69046cd0c82b8d2e2fb97
 MISC metadata.xml 231 BLAKE2B c2fdc9ca113ea1fb6cb14f865609798058c3443d097117d61de82b4f53e8d293bc187413600b6a6eb3e1c744ae7712bf8c55db53562076e7bc5de5eae0c1f209 SHA512 281ccb55b01108f6fd9953a4fc8723e312c6416b885b11a32d2a0d4d532ebbc361990c814402bc8061e360c02b8074797b1b68ee9a8bc96d37f2cb6455e5949c
diff --git a/app-misc/kanatest/files/kanatest-0.4.8-desktop-QA.patch b/app-misc/kanatest/files/kanatest-0.4.8-desktop-QA.patch
new file mode 100644
index 000000000000..83169e34a9ad
--- /dev/null
+++ b/app-misc/kanatest/files/kanatest-0.4.8-desktop-QA.patch
@@ -0,0 +1,16 @@
+--- a/data/kanatest.desktop
++++ b/data/kanatest.desktop
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Hiragana and Katakana Test
+ Comment=Hiragana and Katakana drill tool
+ Exec=kanatest
+-Icon=kanatest.png
++Icon=kanatest
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+ X-Desktop-File-Install-Version=0.10
+-Categories=Game;Application;X-Fedora;
++Categories=Game;X-Fedora;
diff --git a/app-misc/kanatest/files/kanatest-0.4.8-format-security.patch b/app-misc/kanatest/files/kanatest-0.4.8-format-security.patch
new file mode 100644
index 000000000000..7493d0a7bd15
--- /dev/null
+++ b/app-misc/kanatest/files/kanatest-0.4.8-format-security.patch
@@ -0,0 +1,22 @@
+--- a/src/stats.c
++++ b/src/stats.c
+@@ -84,7 +84,7 @@ gchar buffer[BUFFER_SIZE];
+ 
+     info_dialog = gtk_message_dialog_new (GTK_WINDOW(appGUI->sts->stat_window),
+                                           GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+-                                          GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, buffer);
++                                          GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", buffer);
+ 
+     gtk_window_set_title(GTK_WINDOW(info_dialog), _("Question"));
+     gtk_widget_show (info_dialog);
+--- a/src/test.c
++++ b/src/test.c
+@@ -538,7 +538,7 @@ test_info(GUI *appGUI) {
+ 
+     info_dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW(appGUI->main_window),
+                                                       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+-                                                      GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, message);
++                                                      GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "%s", message);
+ 
+     gtk_window_set_title (GTK_WINDOW(info_dialog), _("Information"));
+     gtk_widget_show (info_dialog);
diff --git a/app-misc/kanatest/kanatest-0.4.8.ebuild b/app-misc/kanatest/kanatest-0.4.8.ebuild
index d24f05ecee86..c1d64fbe9eb8 100644
--- a/app-misc/kanatest/kanatest-0.4.8.ebuild
+++ b/app-misc/kanatest/kanatest-0.4.8.ebuild
@@ -1,48 +1,38 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit autotools epatch gnome2-utils
+inherit autotools xdg
 
 DESCRIPTION="Visual flashcard tool for memorizing the Japanese Hiragana and Katakana alphabet"
-HOMEPAGE="http://www.clayo.org/kanatest"
-SRC_URI="http://www.clayo.org/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.clayo.org/kanatest"
+SRC_URI="https://www.clayo.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 
-RDEPEND=">=x11-libs/gtk+-2.12:2=
+RDEPEND="
+	x11-libs/gtk+:2
 	dev-libs/libxml2:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS=( AUTHORS TRANSLATORS ChangeLog README )
+PATCHES=(
+	"${FILESDIR}"/${P}+gtk-2.22.patch
+	"${FILESDIR}"/${P}-autoconf.patch
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-desktop-QA.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}+gtk-2.22.patch \
-		"${FILESDIR}"/${P}-autoconf.patch \
-		"${FILESDIR}"/${P}-cflags.patch
-
-	sed -i \
-		-e '/Encoding/d' \
-		-e '/^Categories/s:Application;::' \
-		-e '/^Icon/s:.png::' \
-		data/${PN}.desktop || die
-
+	default
 	eautoreconf
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+src_install() {
+	default
+	dodoc TRANSLATORS
 }
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index 3761a8d81fd4..4d3e9af452f8 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -6,5 +6,5 @@ AUX lcdproc-0.5.9-use-freetype2-pkg-config.patch 552 BLAKE2B afa135d8abb2bb47f75
 AUX lcdproc.initd 325 BLAKE2B 405944d2808e308c27732ef9e75d65e388616596ede330848a66d9135c6dfd48101534159c344a3b4afc1fbba9694f412e5a82ed8cc3a9a2cff0a74754348192 SHA512 057c0f6aef2d6e09c3707382f281888738d7e30f25f151f0588c5a678e34f5bc2e2f11a44fe1c4e30ba13c18504e8578f45b92c3ce5822259f9e9a9cba8a6ae9
 AUX lcdproc.service 171 BLAKE2B aca4177b065f31aab4c940629850f7045ff7a9420975f8555f1dad9071cb58a17be8123c4a72f26e6a366ca0edd5581724b16bb3fbc4e0457c9016af802a18f2 SHA512 c71684ad0ff7b81466922676fd8612f6f8ec6641c4504089efb1a335d5f7eccbcce010de1e0c7a33dc07d9cd8abf80a3f5d0118fc7c711fe592ef9f98643a629
 DIST lcdproc-0.5.9_p20200721.tar.gz 936215 BLAKE2B d861346c9b0bd66a181cd80d98624b453f84944842a80fed8afab436539a617ed195481f0fb244839c8978b2c3eb587f521b5f185c324151273ec739753f6c45 SHA512 11895caedc66e337a3f6c9a57ef50e6f690982078f682ad3d4d0fadec771c6073727238e7347e7461dca32e735110162d44d0d25c76026775159e4a65cd758cd
-EBUILD lcdproc-0.5.9_p20200721.ebuild 6265 BLAKE2B af1bcfb8adef86ae9ed86a8da82f8735ff199b7b5b3ae1b22c4fed1360ef2a616e03f66140e910fee2b1b6201ef382134075018bbedaab4b6110251655082537 SHA512 46879d75a8ce5018bcb36ec0ce181a806223430dbc207485518654ab76d1af5958441eb2bc9990f3155d35b619cbd4eed0cb1b0d3abd1a9820721d822c0f4f3c
-MISC metadata.xml 1539 BLAKE2B 8af66dc4aa03741adb139a157ac7321696c66e1da965e264b898a4357ad9470fe1ceba69a10469302443f277b5e72d8e69d2b7e1c1ff865d3e5f101227410047 SHA512 d693013f0b8d63b7c245f59f5f0fce7dda3594623afd6006d6d41c0439c53a6097e6091d8d50c38568f5f504911c7d4cd123ab405f1d1f27f0f5447e1a1eacef
+EBUILD lcdproc-0.5.9_p20200721-r1.ebuild 6273 BLAKE2B cc138508e66102a3666809c6a22e2dce10a06848b480a220fc679b85ced8b4ff7bab6239ce7113350b25a06deba9aee8ae23529c1922d6e807f5f1fbd4145cd0 SHA512 a35e94408dbc28c1cd54c5fdf90456b1f1eb9c60bef2b04ef47f1c1b7bcc8736d9db9e1ec029716b2b5323f20cc9a9bcbad5ce6f13f4c35ce5bbdb02fd59f698
+MISC metadata.xml 1539 BLAKE2B d2f01507bd93dbaf286576e2f66e5c617f8b0fbfbbe94565f5de2eee406fdd7a66d77467db5af7c521ff3838b718a4872fac74332f587ff602c20681b968a09d SHA512 d5a36d6c40c5c49245f62dee9063fad6eb8f1391ac694bd7a2a9cc1cdc0cc1d74659a3e2baefd9750f3267aee8ae53dfc1b3527c32e3e4811b268d45ac5f83c1
diff --git a/app-misc/lcdproc/lcdproc-0.5.9_p20200721-r1.ebuild b/app-misc/lcdproc/lcdproc-0.5.9_p20200721-r1.ebuild
new file mode 100644
index 000000000000..5cf2727dfe34
--- /dev/null
+++ b/app-misc/lcdproc/lcdproc-0.5.9_p20200721-r1.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="9ec9ba4e5dda653288bc55d2898723aa2c2ad9c1"
+
+inherit autotools systemd
+
+DESCRIPTION="Displays real-time system information from your Linux/*BSD box on a LCD"
+HOMEPAGE="http://www.lcdproc.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+KEYWORDS="amd64 ppc ppc64 x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc ethlcd extra-charmaps menu nfs png samba test-menu truetype"
+REQUIRED_USE="
+	ethlcd? ( lcd_devices_hd44780 )
+	png? ( lcd_devices_glcd )
+	truetype? ( lcd_devices_glcd )
+"
+
+# Define the list of valid lcd devices.
+# Some drivers were removed from this list:
+# - svga: It needs media-libs/svgalib, which is masked and obsolete.
+IUSE_LCD_DEVICES=(
+	bayrad CFontz CFontzPacket curses CwLnx ea65
+	EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd
+	icp_a106 imon imonlcd IOWarrior irman irtrans
+	joy jw002 lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a
+	ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD
+	Olimex_MOD_LCD1x9 picolcd pyramid rawserial
+	sdeclcd sed1330 sed1520 serialPOS serialVFD
+	shuttleVFD sli stv5730 SureElec t6963 text
+	tyan ula200 vlsys_m428 xosd yard2LCD
+)
+
+# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
+REQUIRED_USE+=" || ( "
+for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
+	LCD_DEVICE="${LCD_DEVICE,,}"
+	IUSE+=" lcd_devices_${LCD_DEVICE} "
+	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
+done
+IUSE="${IUSE/lcd_devices_glcd/+lcd_devices_glcd}"
+REQUIRED_USE+=" ) "
+unset LCD_DEVICE
+
+# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
+DEPEND_LCD_DEVICES="
+	lcd_devices_cfontz? ( dev-libs/libhid:= )
+	lcd_devices_cfontzpacket? ( dev-libs/libhid:= )
+	lcd_devices_cwlnx? ( dev-libs/libhid:= )
+	lcd_devices_futaba? ( virtual/libusb:1= )
+	lcd_devices_g15? (
+		app-misc/g15daemon
+		dev-libs/libg15render:=
+		virtual/libusb:0=
+	)
+	lcd_devices_glcd? (
+		app-misc/glcdprocdriver:=
+		dev-embedded/libftdi:1=
+		dev-libs/libhid:=
+		dev-libs/serdisplib:=
+		virtual/libusb:0=
+		x11-libs/libX11:=
+	)
+	lcd_devices_hd44780? (
+		dev-embedded/libftdi:1=
+		dev-libs/libugpio:=
+		virtual/libusb:0=
+	)
+	lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= )
+	lcd_devices_irman? ( media-libs/libirman:= )
+	lcd_devices_iowarrior? ( virtual/libusb:0= )
+	lcd_devices_lirc? ( app-misc/lirc )
+	lcd_devices_lis? ( dev-embedded/libftdi:1= )
+	lcd_devices_lb216? ( dev-libs/libhid:= )
+	lcd_devices_mdm166a? ( dev-libs/libhid:= )
+	lcd_devices_mtc_s16209x? ( dev-libs/libhid:= )
+	lcd_devices_mx5000? ( app-misc/mx5000tools )
+	lcd_devices_noritakevfd? ( dev-libs/libhid:= )
+	lcd_devices_picolcd? ( virtual/libusb:1= )
+	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
+	lcd_devices_ula200? ( dev-embedded/libftdi:1= )
+	lcd_devices_xosd? (
+		x11-libs/libX11:=
+		x11-libs/xosd:=
+	)
+"
+
+RDEPEND="${DEPEND_LCD_DEVICES}"
+
+DEPEND="
+	${RDEPEND}
+	doc? (
+		app-doc/doxygen[dot]
+		app-text/xmlto
+	)
+	nfs? ( net-fs/nfs-utils )
+	png? ( media-libs/libpng:0= )
+	samba? ( net-fs/samba )
+	truetype? ( media-libs/freetype:2= )
+"
+
+DOCS=( "CREDITS.md" "TODO" )
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.9-use-freetype2-pkg-config.patch" )
+
+src_prepare() {
+	default
+
+	# Fix path for modules
+	sed -e "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" -i LCDd.conf || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Enable all users enabled lcd devices
+	local myeconfargs_lcd_devices
+	for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
+		if use "lcd_devices_${lcd_device,,}"; then
+			myeconfargs_lcd_devices+=",${lcd_device}"
+		fi
+	done
+
+	local enable_ftdi="--disable-libftdi"
+	if use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_i2500vfd || use lcd_devices_lis || use lcd_devices_ula200; then
+		enable_ftdi="--enable-libftdi"
+	fi
+
+	local enable_hid="--disable-libhid"
+	if use lcd_devices_cfontz || use lcd_devices_cfontzpacket || use lcd_devices_cwlnx || use lcd_devices_glcd || use lcd_devices_lb216 || use lcd_devices_mdm166a || use lcd_devices_mtc_s16209x || use lcd_devices_noritakevfd; then
+		enable_hid="--enable-libhid"
+	fi
+
+	local enable_png="--disable-libpng"
+	use lcd_devices_glcd && enable_png=""
+
+	local enable_usb0="--disable-libusb"
+	if use lcd_devices_futaba || use lcd_devices_g15 || use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_iowarrior || use lcd_devices_picolcd || use lcd_devices_shuttlevfd; then
+		enable_usb0="--enable-libusb"
+	fi
+
+	local enable_usb1="--disable-libusb-1-0"
+	if use lcd_devices_futaba || use lcd_devices_picolcd; then
+		enable_usb1="--enable-libusb-1-0"
+	fi
+
+	local enable_x11="--disable-libX11"
+	use lcd_devices_glcd && enable_x11="--enable-libX11"
+
+	local myeconfargs=(
+		--enable-drivers="${myeconfargs_lcd_devices#,}"
+		$(use_enable debug)
+		$(use_enable doc doxygen)
+		$(use_enable doc dot)
+		$(use_enable doc html-dox)
+		$(use_enable doc latex-dox)
+		$(use_enable ethlcd)
+		$(use_enable extra-charmaps)
+		$(use_enable menu lcdproc-menus)
+		$(use_enable nfs stat-nfs)
+		$(use_enable samba stat-smbfs)
+		$(use_enable test-menu testmenus)
+		$(use_enable truetype freetype)
+		${enable_ftdi}
+		${enable_hid}
+		${enable_png}
+		${enable_usb0}
+		${enable_usb1}
+		${enable_x11}
+		--with-lcdport="13666"
+		--with-pidfile-dir="/run"
+		--without-included-getopt
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake dox
+
+		local docbook
+		for docbook in lcdproc-user lcdproc-dev; do
+			cd "${S}"/docs/"${docbook}" || die
+			xmlto html "${docbook}".docbook || die
+		done
+	fi
+}
+
+src_install() {
+	default
+
+	# Move example clients from '/usr/bin' into '/usr/share/lcdproc/clients'
+	rm -f "${ED}"/usr/bin/{fortune,lcdident,lcdmetar,iosock,tail,x11amp}.pl || die
+	insinto /usr/share/lcdproc/clients
+	doins clients/examples/*.pl clients/metar/*.pl
+
+	newinitd "${FILESDIR}"/LCDd.initd LCDd
+	newinitd "${FILESDIR}"/lcdexec.initd lcdexec
+	newinitd "${FILESDIR}"/lcdproc.initd lcdproc
+
+	systemd_dounit "${FILESDIR}"/LCDd.service
+	systemd_dounit "${FILESDIR}"/lcdexec.service
+	systemd_dounit "${FILESDIR}"/lcdproc.service
+
+	if use doc; then
+		dodoc -r docs/html
+
+		local docbook
+		for docbook in lcdproc-user lcdproc-dev; do
+			docinto "${docbook}"
+			dodoc docs/"${docbook}"/*.html
+		done
+	fi
+}
diff --git a/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild b/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild
deleted file mode 100644
index 85a8e7263990..000000000000
--- a/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="9ec9ba4e5dda653288bc55d2898723aa2c2ad9c1"
-
-inherit autotools systemd
-
-DESCRIPTION="Displays real-time system information from your Linux/*BSD box on a LCD"
-HOMEPAGE="http://www.lcdproc.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 ppc ppc64 x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu"
-REQUIRED_USE="
-	ethlcd? ( lcd_devices_hd44780 )
-	freetype? ( lcd_devices_glcd )
-	png? ( lcd_devices_glcd )
-"
-
-# Define the list of valid lcd devices.
-# Some drivers were removed from this list:
-# - svga: It needs media-libs/svgalib, which is masked and obsolete.
-IUSE_LCD_DEVICES=(
-	bayrad CFontz CFontzPacket curses CwLnx ea65
-	EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd
-	icp_a106 imon imonlcd IOWarrior irman irtrans
-	joy jw002 lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a
-	ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD
-	Olimex_MOD_LCD1x9 picolcd pyramid rawserial
-	sdeclcd sed1330 sed1520 serialPOS serialVFD
-	shuttleVFD sli stv5730 SureElec t6963 text
-	tyan ula200 vlsys_m428 xosd yard2LCD
-)
-
-# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
-REQUIRED_USE+=" || ( "
-for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
-	LCD_DEVICE="${LCD_DEVICE,,}"
-	IUSE+=" lcd_devices_${LCD_DEVICE} "
-	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
-done
-IUSE="${IUSE/lcd_devices_glcd/+lcd_devices_glcd}"
-REQUIRED_USE+=" ) "
-unset LCD_DEVICE
-
-# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
-DEPEND_LCD_DEVICES="
-	lcd_devices_cfontz? ( dev-libs/libhid:= )
-	lcd_devices_cfontzpacket? ( dev-libs/libhid:= )
-	lcd_devices_cwlnx? ( dev-libs/libhid:= )
-	lcd_devices_futaba? ( virtual/libusb:1= )
-	lcd_devices_g15? (
-		app-misc/g15daemon
-		dev-libs/libg15render:=
-		virtual/libusb:0=
-	)
-	lcd_devices_glcd? (
-		app-misc/glcdprocdriver:=
-		dev-embedded/libftdi:1=
-		dev-libs/libhid:=
-		dev-libs/serdisplib:=
-		virtual/libusb:0=
-		x11-libs/libX11:=
-	)
-	lcd_devices_hd44780? (
-		dev-embedded/libftdi:1=
-		dev-libs/libugpio:=
-		virtual/libusb:0=
-	)
-	lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= )
-	lcd_devices_irman? ( media-libs/libirman:= )
-	lcd_devices_iowarrior? ( virtual/libusb:0= )
-	lcd_devices_lirc? ( app-misc/lirc )
-	lcd_devices_lis? ( dev-embedded/libftdi:1= )
-	lcd_devices_lb216? ( dev-libs/libhid:= )
-	lcd_devices_mdm166a? ( dev-libs/libhid:= )
-	lcd_devices_mtc_s16209x? ( dev-libs/libhid:= )
-	lcd_devices_mx5000? ( app-misc/mx5000tools )
-	lcd_devices_noritakevfd? ( dev-libs/libhid:= )
-	lcd_devices_picolcd? ( virtual/libusb:1= )
-	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
-	lcd_devices_ula200? ( dev-embedded/libftdi:1= )
-	lcd_devices_xosd? (
-		x11-libs/libX11:=
-		x11-libs/xosd:=
-	)
-"
-
-RDEPEND="${DEPEND_LCD_DEVICES}"
-
-DEPEND="
-	${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		app-text/xmlto
-	)
-	freetype? ( media-libs/freetype:2= )
-	nfs? ( net-fs/nfs-utils )
-	png? ( media-libs/libpng:0= )
-	samba? ( net-fs/samba )
-"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-DOCS=( "CREDITS.md" "TODO" )
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.9-use-freetype2-pkg-config.patch" )
-
-src_prepare() {
-	default
-
-	# Fix path for modules
-	sed -e "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" -i LCDd.conf || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Enable all users enabled lcd devices
-	local myeconfargs_lcd_devices
-	for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
-		if use "lcd_devices_${lcd_device,,}"; then
-			myeconfargs_lcd_devices+=",${lcd_device}"
-		fi
-	done
-
-	local enable_ftdi="--disable-libftdi"
-	if use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_i2500vfd || use lcd_devices_lis || use lcd_devices_ula200; then
-		enable_ftdi="--enable-libftdi"
-	fi
-
-	local enable_hid="--disable-libhid"
-	if use lcd_devices_cfontz || use lcd_devices_cfontzpacket || use lcd_devices_cwlnx || use lcd_devices_glcd || use lcd_devices_lb216 || use lcd_devices_mdm166a || use lcd_devices_mtc_s16209x || use lcd_devices_noritakevfd; then
-		enable_hid="--enable-libhid"
-	fi
-
-	local enable_png="--disable-libpng"
-	use lcd_devices_glcd && enable_png=""
-
-	local enable_usb0="--disable-libusb"
-	if use lcd_devices_futaba || use lcd_devices_g15 || use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_iowarrior || use lcd_devices_picolcd || use lcd_devices_shuttlevfd; then
-		enable_usb0="--enable-libusb"
-	fi
-
-	local enable_usb1="--disable-libusb-1-0"
-	if use lcd_devices_futaba || use lcd_devices_picolcd; then
-		enable_usb1="--enable-libusb-1-0"
-	fi
-
-	local enable_x11="--disable-libX11"
-	use lcd_devices_glcd && enable_x11="--enable-libX11"
-
-	local myeconfargs=(
-		--enable-drivers="${myeconfargs_lcd_devices#,}"
-		$(use_enable debug)
-		$(use_enable doc doxygen)
-		$(use_enable doc dot)
-		$(use_enable doc html-dox)
-		$(use_enable doc latex-dox)
-		$(use_enable ethlcd)
-		$(use_enable extra-charmaps)
-		$(use_enable freetype)
-		$(use_enable menu lcdproc-menus)
-		$(use_enable nfs stat-nfs)
-		$(use_enable samba stat-smbfs)
-		$(use_enable test-menu testmenus)
-		${enable_ftdi}
-		${enable_hid}
-		${enable_png}
-		${enable_usb0}
-		${enable_usb1}
-		${enable_x11}
-		--with-lcdport="13666"
-		--with-pidfile-dir="/run"
-		--without-included-getopt
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake dox
-
-		local docbook
-		for docbook in lcdproc-user lcdproc-dev; do
-			cd "${S}"/docs/"${docbook}" || die
-			xmlto html "${docbook}".docbook || die
-		done
-	fi
-}
-
-src_install() {
-	default
-
-	# Move example clients from '/usr/bin' into '/usr/share/lcdproc/clients'
-	rm -f "${ED}"/usr/bin/{fortune,lcdident,lcdmetar,iosock,tail,x11amp}.pl || die
-	insinto /usr/share/lcdproc/clients
-	doins clients/examples/*.pl clients/metar/*.pl
-
-	newinitd "${FILESDIR}"/LCDd.initd LCDd
-	newinitd "${FILESDIR}"/lcdexec.initd lcdexec
-	newinitd "${FILESDIR}"/lcdproc.initd lcdproc
-
-	systemd_dounit "${FILESDIR}"/LCDd.service
-	systemd_dounit "${FILESDIR}"/lcdexec.service
-	systemd_dounit "${FILESDIR}"/lcdproc.service
-
-	if use doc; then
-		dodoc -r docs/html
-
-		local docbook
-		for docbook in lcdproc-user lcdproc-dev; do
-			docinto "${docbook}"
-			dodoc docs/"${docbook}"/*.html
-		done
-	fi
-}
diff --git a/app-misc/lcdproc/metadata.xml b/app-misc/lcdproc/metadata.xml
index e29400e82aee..f30bb2e941db 100644
--- a/app-misc/lcdproc/metadata.xml
+++ b/app-misc/lcdproc/metadata.xml
@@ -16,12 +16,12 @@
 	<use>
 		<flag name="ethlcd">Enable support for ethlcd in the hd44780 driver.</flag>
 		<flag name="extra-charmaps">Enable extra language specific charmaps.</flag>
-		<flag name="freetype">Enable support for <pkg>media-libs/freetype</pkg> in the glcd driver.</flag>
 		<flag name="menu">Enable menu support in the lcdproc client.</flag>
 		<flag name="nfs">Display NFS filesystem stats in the lcdproc client.</flag>
 		<flag name="png">Enable support for <pkg>media-libs/libpng</pkg> in the glcd driver.</flag>
 		<flag name="samba">Display SMBFS filesystem stats in the lcdproc client.</flag>
 		<flag name="test-menu">Enable test menu support for the lcdproc server.</flag>
+		<flag name="truetype">Enable support for <pkg>media-libs/freetype</pkg> in the glcd driver.</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://www.github.com/lcdproc/lcdproc/issues</bugs-to>
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index 07de66ff618c..316c279e3444 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,5 +1,5 @@
 DIST neofetch-7.1.0.tar.gz 95400 BLAKE2B 32368d461835d95ba8203c560b2f6733594966cbaf809d877a46c08675284288565e3a21b14d94900dd66b778dc975339196f182732e2cd8bc1ccc9e6da6253e SHA512 fe1013fb54585c15ba556054478a2c8c503120387e81bd16bfdfbb6f3a188ed4124585540abf43da9209cbbe0d7fb90d50914cd6620137d00f013cfb6954a042
-EBUILD neofetch-7.1.0-r1.ebuild 1147 BLAKE2B 12a4fe99b0c45f980d0452a4b96288a8543beb03f94eb81195dd11a1b87129506f7d9bf5a6a54380d4b6289988e7f2098680804924fb9cf32a7386fe1e6efaa7 SHA512 753c3e6ebae6688c78246d2276dfadd37baeb004763e5d9d26cd04dcafa1b77f48304456df92e3ca78eefb0d419bde969eb438d1bd2d80674ed5d8504bb3a7ed
+EBUILD neofetch-7.1.0-r1.ebuild 1152 BLAKE2B b6f1dffe6170bd6da9f0406bb023b4633b90db41dc5d19d255eedea868ea5df9ed65c418932f54b03e4b9738b26da8683e2e83084ac6ad3bec926541ee6bdea6 SHA512 483f3c77a121fb1b538faec852a2d12edf43188d8e33c249ea708cac8dc1b1e4deabe0435ffbaf763c15292744a763ac7761f1f95a5af5a3c8c948d9b8d6ad82
 EBUILD neofetch-7.1.0.ebuild 937 BLAKE2B 72424ef48458c2c4c0a70900f42f597ebaf0ec659b3fadc9e860262b336d066786b078412c363394c674250d52fcb2ab267c665d2778b98cea96a1baf759134c SHA512 568336106a81b75f35e657c7f494e6b1b7683dbba29085bc28c0e7b441d288c5a013ba3c6ebd1ad62b3862ec8ad835b6fcea07eb0dcd590b907c38f4427d79aa
 EBUILD neofetch-9999.ebuild 1147 BLAKE2B 12a4fe99b0c45f980d0452a4b96288a8543beb03f94eb81195dd11a1b87129506f7d9bf5a6a54380d4b6289988e7f2098680804924fb9cf32a7386fe1e6efaa7 SHA512 753c3e6ebae6688c78246d2276dfadd37baeb004763e5d9d26cd04dcafa1b77f48304456df92e3ca78eefb0d419bde969eb438d1bd2d80674ed5d8504bb3a7ed
 MISC metadata.xml 863 BLAKE2B 3a4dbfbeea790e95fafbe9b47169bd43c127be69f21ffb2c0752ad2003304ef7628f0c95388288cf00b5d567b83626ac15cb015a8fd9c4c6cacc1137410a7887 SHA512 593a76d4beb607cf64a5dfeec978d7c6be6ad2a1dc36aefa44c2e18724d09c76133d3bab0fc5692f2bd997c86156337142b5115e7d34d4da59f91e69f44d4f30
diff --git a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
index b0c0a070de9b..ea69aef4419f 100644
--- a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
+++ b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit optfeature prefix
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~mips ~ppc64 ~riscv x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index 506d9f7118a9..744f8b0fde27 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -2,4 +2,4 @@ DIST screenfetch-3.9.1.tar.gz 77350 BLAKE2B 10852e63c9ad615cea9a5e53374f16e2f3ac
 EBUILD screenfetch-3.9.1-r1.ebuild 783 BLAKE2B 6cc07a31e3a1f6f2bde2cf8fed3f3d487d6d8775b51dec38f1b29dbb3aaa6b5fe3fc5708acaf382739d252da5f05f6ee7ecbc6abf5b5b25a2b38a210838673c1 SHA512 073eac6b7f4108e02408eb91c97ca3ce2e1fe9b50dc8960eabc93117cb3a87b5bc4f0925145f62a7ef6dd47add325b3bb4e4a78b6c821ae0183d85dab46b68c1
 EBUILD screenfetch-3.9.1.ebuild 699 BLAKE2B f70b0de1eb3d79064a25e74315b1e9bea733c310d6c236c26b345f5ca460cfedef4cf85a854247e1fdb47918be5ed1fbdec82f6a0468d926dd516dd78fafdfad SHA512 4e1729290cc836d02578db0b6b2065cbdae13f2a55f14febf512aa12a064f6818c63cc8b25b91d9b0b4f24e2c431b16947ba229cafeb74d5865259402e8f5980
 EBUILD screenfetch-9999.ebuild 783 BLAKE2B 6cc07a31e3a1f6f2bde2cf8fed3f3d487d6d8775b51dec38f1b29dbb3aaa6b5fe3fc5708acaf382739d252da5f05f6ee7ecbc6abf5b5b25a2b38a210838673c1 SHA512 073eac6b7f4108e02408eb91c97ca3ce2e1fe9b50dc8960eabc93117cb3a87b5bc4f0925145f62a7ef6dd47add325b3bb4e4a78b6c821ae0183d85dab46b68c1
-MISC metadata.xml 434 BLAKE2B c9328470fe18927a6538ac6b8767d1a914649dbf1c00806b107ebfd6a885431fbc3e85d6ac128c3d0a3509faf7de7a5019f4667c1551176f1ca30dbab214572c SHA512 2e4d19b8f71bad6e2f9c7db679db71d631d0092975e09d745d90f580bf0d1f692f051d19646de90dffe00f1d6b15502ad98e32c90245c842e6961ae2c1bcf2b0
+MISC metadata.xml 440 BLAKE2B 5e088a9a7872f816c9f4da9443593a10296a21960aed04341053e6c0cf4ae55510f553280c6c349cdb9d21c96eb70d1f2bf97882fcac0f0fa32243b1b61f340d SHA512 bcd65a8f941a6a8d0c28c3975084f5f00f32452f2ee58ed54ac7e153f3b704bf1cc033fb0ad63c4917643490c36a71a38d830a494aef265e031fdcb5f38e5ed0
diff --git a/app-misc/screenfetch/metadata.xml b/app-misc/screenfetch/metadata.xml
index 2434515b11ca..caeed7436b9b 100644
--- a/app-misc/screenfetch/metadata.xml
+++ b/app-misc/screenfetch/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
 	</maintainer>
 	<use>
 		<flag name="X">Use the <pkg>media-gfx/scrot</pkg> package to take screenshots</flag>
diff --git a/app-misc/srm/Manifest b/app-misc/srm/Manifest
index 36ad6a2e18c5..3ca5364244a3 100644
--- a/app-misc/srm/Manifest
+++ b/app-misc/srm/Manifest
@@ -1,4 +1,5 @@
-AUX srm-1.2.15-cflags.patch 343 BLAKE2B e6159fdc6211273859215dc2a90fe598a1c956bef5aa69c02cb6bef54129873e71189d1646d04cb89f3be8bf968cc23631452e089a819d57d4fe3681ff3e4dd9 SHA512 81196944b68b0bff7b32a16dd749cc15ce73c125dba6bfa175dbc38b4baf3a291702139ae63f900e94c3babdacf769fc943992e192371c5c7073275320f0f9c6
+AUX srm-1.2.15-cflags.patch 435 BLAKE2B 6b3b0a87a2cd193ead17aa3588d1636ab632a77f50bd4d250948c5b0d68b876e540d258523824d2e578afb1fccaaaef32a447d012e253b18e9a24a34d5806816 SHA512 1b2e7a53a2518d805892804911d52b4e9ccef6cbd7e2b1c2b0da52ac3b512d2b12eb06cb893c498b6ed28e8f6d5a9ca68d7381fef7ba2a94fffcfe0760bc1407
+AUX srm-1.2.15-musl.patch 472 BLAKE2B eea5d31861785ce74d0c8de4641ea0697bda80962fb2a72488393c5b7164901b60be1203cf3bd401f0d6eba1c62d5243cb556c19437a936dd611ac679ac6a7c3 SHA512 515fa37d3cad0dc5e917908c308c33fba9bbf89ca04301610d02540e1afbad29874755dc59e6464776cf2e31b8bd0bbbee403c8d0449020f99366905a21ebccb
 DIST srm-1.2.15.tar.gz 132031 BLAKE2B f01fd8fce0095f5d2247026d3627fc8100b1bc9263f947f2d8500c999220c781ff109283c25b480fe295deb7e162f246afbad68c0797e0fec180ff57f1ff87be SHA512 a8ec78473c55b70557fca88f525998ed51df3be58618b9da220e1bb73df013163f4e1563cbe2062b9cf1512152afeb9004b5be0be69cc1278c0d28597310dfd2
-EBUILD srm-1.2.15.ebuild 822 BLAKE2B 8b82bae77a52035b8a0b09123eb0c6cd45e722ad3a5988224953752d5c5733740f22839842a254739cef88c3af5cd98f635f6366c2b5127e9f51245f1b7a43aa SHA512 54c1b081bb8f02f75846615458c49e71c14ea6ceeb6fa26190b3af49b0e836060c73f42917b165e408baed3df0b5ca309497ed0ae4c270ca889ca15d2362ed92
+EBUILD srm-1.2.15.ebuild 889 BLAKE2B 400862c383b0c0ace4f39f3e4653978d72fabd5a6f6cabe5e5c0e1cf17b4e0377293d9b76759b61c66c4053c9af811b07aab39655d444d51f44d81223a12e804 SHA512 2474e155459c6c07c703f39b567b4fd40c3b440cf9ad889e25e1ee9938f05e4e156dcce330b0ede28156fb73f07e12bc6a7c4401bbadda0fc784c24e43c3f905
 MISC metadata.xml 327 BLAKE2B 8b76b855e466f402df68277c417d0c7deec7a25f5b89ac6935fb0b3a9678cfa350ac5d59a4e04bd850d5f6c6512a8adc5fc1e3e04011f422fcd7bf9330946c1a SHA512 48ee707e4446bb599761bdf02980bbd486ca30ccc9ec40ca87cdd9bc1723c23d26619153c21d016c9ee2a0ba7fb6907cc110d5bbb32dbf7cbae81784772a177a
diff --git a/app-misc/srm/files/srm-1.2.15-cflags.patch b/app-misc/srm/files/srm-1.2.15-cflags.patch
index 0a45bdc12520..22710b8af389 100644
--- a/app-misc/srm/files/srm-1.2.15-cflags.patch
+++ b/app-misc/srm/files/srm-1.2.15-cflags.patch
@@ -1,6 +1,14 @@
---- srm-1.2.15/configure.ac
-+++ srm-1.2.15/configure.ac
-@@ -42,7 +42,6 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,6 +9,7 @@
+ 
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl enable 64bit file ops
+ AC_SYS_LARGEFILE
+@@ -42,7 +43,6 @@
  AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes] turn on debugging
                         [default=$debug_default]],, enable_debug=$debug_default)
  if test "x$enable_debug" = "xyes"; then
diff --git a/app-misc/srm/files/srm-1.2.15-musl.patch b/app-misc/srm/files/srm-1.2.15-musl.patch
new file mode 100644
index 000000000000..e22c5efcc8b3
--- /dev/null
+++ b/app-misc/srm/files/srm-1.2.15-musl.patch
@@ -0,0 +1,17 @@
+musl doesn't have an internal __sighandler_t type,
+and only makes sighandler_t visible if _GNU_SOURCE
+is defined.
+https://bugs.gentoo.org/714026
+
+--- a/src/sunlink.c
++++ b/src/sunlink.c
+@@ -102,9 +102,6 @@
+ static volatile int SIGINT_received = 0;
+ #if defined(__unix__)
+ #include <signal.h>
+-#if defined(__linux__) && !defined(__USE_GNU)
+-typedef __sighandler_t sighandler_t;
+-#endif
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ typedef sig_t sighandler_t;
+ #endif
diff --git a/app-misc/srm/srm-1.2.15.ebuild b/app-misc/srm/srm-1.2.15.ebuild
index a086636c2048..cedaa944e3f7 100644
--- a/app-misc/srm/srm-1.2.15.ebuild
+++ b/app-misc/srm/srm-1.2.15.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit autotools epatch
+inherit autotools flag-o-matic
 
 DESCRIPTION="A command-line compatible rm which destroys file contents before unlinking"
 HOMEPAGE="https://sourceforge.net/projects/srm/"
@@ -14,23 +14,26 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="debug"
 
-DEPEND="!app-misc/secure-delete
-		sys-kernel/linux-headers
-"
+DEPEND="sys-kernel/linux-headers"
 
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.15-cflags.patch
+	"${FILESDIR}"/${PN}-1.2.15-musl.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.15-cflags.patch"
+	default
 	eautoreconf
 }
 
 src_configure() {
+	# enable the sighandler_t decl on glibc and musl
+	append-cppflags -D_GNU_SOURCE
 	econf $(use_enable debug)
 }
 
 pkg_postinst() {
 	ewarn "Please note that srm will not work as expected with any journaled file"
 	ewarn "system (e.g., reiserfs, ext3)."
-	ewarn "See: ${EROOT%/}/usr/share/doc/${PF}/README"
+	ewarn "See: ${EROOT}/usr/share/doc/${PF}/README"
 }
diff --git a/app-misc/supercat/Manifest b/app-misc/supercat/Manifest
index f35c89bcaecc..d84df1be62f5 100644
--- a/app-misc/supercat/Manifest
+++ b/app-misc/supercat/Manifest
@@ -3,5 +3,5 @@ DIST supercat-0.5.6.tar.gz 150193 BLAKE2B a289beceabee0bff8c25b3430803032c1192c4
 DIST supercat-0.5.7.tar.gz 154020 BLAKE2B 8b3852d174863a1249bd71345049791827e2dba41e2d9d3426bdd2f98c395b01e804337813492efc46cd9c0950526aa26cc909f056b2f1f7c2dbdecb8129da63 SHA512 36b9d1e24edc8b83f0e87a401a99188ac53ab8b69c3ba2b196c5dd6d21b034c9522f729e4805238ce6cd28622f78c1e4dfbee93acd23ed2faa87da8e41d5647d
 EBUILD supercat-0.5.5-r2.ebuild 464 BLAKE2B 9f09fbfa9591fda52f33d5b3f9d7ff0669e47cf2eecfb045affb865b3c30eafacc87aa9e1aee87f13880b6c347f6fa1b3b14608c69e31e28c0bbe9743e5ed851 SHA512 b421f6c69d897326f2cb55789c1c55baa59e61b462406299806275a5069bb9ce41af14c559df3cb7344f57d4af586cc360b96c7792ad9d6aedf2b33fd8e50ec1
 EBUILD supercat-0.5.6.ebuild 464 BLAKE2B 9f09fbfa9591fda52f33d5b3f9d7ff0669e47cf2eecfb045affb865b3c30eafacc87aa9e1aee87f13880b6c347f6fa1b3b14608c69e31e28c0bbe9743e5ed851 SHA512 b421f6c69d897326f2cb55789c1c55baa59e61b462406299806275a5069bb9ce41af14c559df3cb7344f57d4af586cc360b96c7792ad9d6aedf2b33fd8e50ec1
-EBUILD supercat-0.5.7.ebuild 468 BLAKE2B b7efae4f0cf5182980af219af3dde0ddd21c504cf31700e30a563f56a02d5db9b485a7f1812a572d9e6c992dac3ff3797c1a4aed1481b8ec7f22dcb707046745 SHA512 d6dd32b40262c2b8b55e2be5d66cf74f46b9441cc05c2ca602c7c31f134a064daaeed31c13652fe07c1ea9e3cfbbbb92b19602d83bbd8604243c59f29b5ebc47
+EBUILD supercat-0.5.7.ebuild 464 BLAKE2B 460bb1c2bb6054db9b1d1732168253600d7dbb2077857632f6b8049dd6b75ac50c65917ea691e6dcdbee02133a7e2c6d8667202156f461aeb02ed8b2640dd3a7 SHA512 775de98ed1661fef819d86ae9a9d03e3d3027a0f742ce7e9c84ed046ab7def44770fe5cd73638cfe2b529e9fe957b286b73a1111fd658f4fff98db90afa640a9
 MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
diff --git a/app-misc/supercat/supercat-0.5.7.ebuild b/app-misc/supercat/supercat-0.5.7.ebuild
index 9edb488358eb..364a1c0ec327 100644
--- a/app-misc/supercat/supercat-0.5.7.ebuild
+++ b/app-misc/supercat/supercat-0.5.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://supercat.nosredna.net/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	econf --with-system-directory="${EPREFIX}/etc/supercat"
diff --git a/app-misc/tmux-xpanes/Manifest b/app-misc/tmux-xpanes/Manifest
index ec57cd0a1c22..929186b2fe73 100644
--- a/app-misc/tmux-xpanes/Manifest
+++ b/app-misc/tmux-xpanes/Manifest
@@ -1,5 +1,3 @@
-DIST tmux-xpanes-4.1.2.tar.gz 63337 BLAKE2B 1ddc0c0422eec64697aea7eb97c8bbbbd4005f4c470d5d0bf1fae4eab01d8ced50503180f76d0ed5aa9d29e854b54aab8f8216ac945e6c1c2e4b4833c5661ceb SHA512 b18445940052a6af848286b901bfd81abfbdf83356cd1b39ac592e1509c9d63b81440978a8c2632672bfb7a2429a7fcc57b7c55c91a00d751b43aa9f368a5c57
 DIST tmux-xpanes-4.1.3.tar.gz 64101 BLAKE2B ec7e025adcfb2436b416a37de87cbf335bdc92d7653a65be9299c10993d273746a0678ee3e418df483697f1f2dd556063e98d984006e2137e2cdeb6f8634f75c SHA512 6545ec75a522b05eb8079c93830c81ac3c6a9ac338a3cc51c491f69a4602bef5b9f19c9f18b2975d0470c4af0a83ebf2357a4461024508ff0f6ac61d1099b22e
-EBUILD tmux-xpanes-4.1.2-r1.ebuild 577 BLAKE2B dbf2634b99daed9cbad1b8114d7217f13978861264c0ee3c7075595918145bc607508ee7718070783bfd099f96347d8af5c720d2a4a1bd10737a756a7417001c SHA512 5a7b71dae2a67e6c9d145f92a7dba31e77d5b74de6dd0719503ef98f7a9cbb1b02f65286549b360703b02031a01b01c9210e9c346a3f432b76148727042dfa82
-EBUILD tmux-xpanes-4.1.3-r1.ebuild 579 BLAKE2B ce2c7a24062172ad021212bf28ef56d7d815fe24ec6b4790b1392e92f41cfe06c161fbd90d083c3652752aac5ecc5dcdf9ae3f13b22fa16090b9a1002d67b4b1 SHA512 ae9809ceb3df5c2d3a9f635c978614ded26f69922b52acff855dea5d1185e0bd0d8aeb64eeac1b75c0033ded64e69cdbbe839690e163d74a6cc4d35436b17c28
+EBUILD tmux-xpanes-4.1.3-r1.ebuild 577 BLAKE2B dbf2634b99daed9cbad1b8114d7217f13978861264c0ee3c7075595918145bc607508ee7718070783bfd099f96347d8af5c720d2a4a1bd10737a756a7417001c SHA512 5a7b71dae2a67e6c9d145f92a7dba31e77d5b74de6dd0719503ef98f7a9cbb1b02f65286549b360703b02031a01b01c9210e9c346a3f432b76148727042dfa82
 MISC metadata.xml 461 BLAKE2B 53eeda61e700b6088bd3be518823fe8b597cc8a250662d1091662fd557874e4dafa1b92b7630f2be6030b5ee6182bc36cf09a185c860125838d2d3e326c0f92a SHA512 620a672c014f7a990528a503ab14dd0596be44cbdddf5ea92b0cd9961961a00e92e72a9274b864879d14c76ecab3295dc4e27fa8aefbdb38e1e7dcc956761d2f
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-4.1.2-r1.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-4.1.2-r1.ebuild
deleted file mode 100644
index 1fbee411365e..000000000000
--- a/app-misc/tmux-xpanes/tmux-xpanes-4.1.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="tmux-based terminal divider"
-HOMEPAGE="https://github.com/greymd/tmux-xpanes"
-SRC_URI="https://github.com/greymd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="app-misc/tmux
-	dev-lang/perl
-	dev-libs/openssl:0"
-
-RESTRICT="test"
-
-DOCS=( CONTRIBUTING.md LICENSE README.md )
-
-src_install() {
-	dobin bin/*
-	doman man/*.1
-	einstalldocs
-
-	insinto /usr/share/zsh/site-functions
-	doins -r completion/zsh/.
-}
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-4.1.3-r1.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-4.1.3-r1.ebuild
index 3d28ac557e8d..1fbee411365e 100644
--- a/app-misc/tmux-xpanes/tmux-xpanes-4.1.3-r1.ebuild
+++ b/app-misc/tmux-xpanes/tmux-xpanes-4.1.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/greymd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="app-misc/tmux
 	dev-lang/perl
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index e123720890c4..0dd780d0c616 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -3,6 +3,6 @@ DIST tmux-3.1c.tar.gz 561323 BLAKE2B c6f688a854e128acffa140321a5dd00e4ca090ff79c
 DIST tmux-3.2a.tar.gz 648394 BLAKE2B 94527d4d1016caddab170b5bbfd181514768474898314241fb65a53a1f5ae94863bacedf90a7543690c115d15295960dfab4d5ba2ce31cd105585a73fb9b82d1 SHA512 6e52c7f5d03b2c8b8c4c8caac092a166956ba97334b426f2823d74dc5849a1d31a80145924f641f69dd2c244809e9350d9bd7070897fa2e3e1f9f086f9b2f365
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 EBUILD tmux-3.1c.ebuild 1666 BLAKE2B 4e4a0a6cbc7a1976647d5272f7a479b06667d49d496567bcfe38ac8d8575b80bb41231a8e34b98c1ec85871dba2381a8ce875250a99052309b2482446837ce2a SHA512 17cf8aa479294119573612d233a5cbba52e4027d5e6a5707f02b2cec4f8408e898a0a095f8cc7e8421bfcedc8f96c06582400f0ae5117f819c517a8abf600cb1
-EBUILD tmux-3.2a.ebuild 1645 BLAKE2B 989ceca7f7360b197023c28bedadc6d2c34546a58a24c8bede8d732df577fda815d0c1ec6d3ce150b052d2880af109bb1fff6a94cf213a7170ff98d49464c710 SHA512 965f4ab18c5f2292b8af638a87277cb56358fcbbe0b8ac170b47810194d530c3bd244fc977bacf227394d19355f9759fe5d3c5be715cbd294db3c405fa2fbcca
+EBUILD tmux-3.2a.ebuild 1638 BLAKE2B d45c70e759fee7494d714c3a5ba1012db5a05d7617f91d49a11bb7e13c26391e7a3b5f8042f7d7921ca50db457e04c5d5732b23ac35630ccd5604bfdd1b00031 SHA512 f88694683ea9803b1786aa0f377acb450836fa47ae051e6f6f155596be7a26eedc3f9466a3dab7bb3b75a6df71992776762a32ac2a23a3df8446330c2e1bd5c6
 EBUILD tmux-9999.ebuild 1647 BLAKE2B 1e438f3e076ecc281fa1fd71185dda46a094152191c45ce7343d1a888ac5d8fab3d3e7e84b4916ce3153ef57d431ab2065247bc57d57765aaed4641d8006733e SHA512 c1bb99f996aeb30f1faa040ab5b006aedbf7c2dfba381c62d9c95385770b5740b42681436e4c467bc58ddf6f63895f2805f3503fdff8ee571de8ad1f8403c8ca
 MISC metadata.xml 817 BLAKE2B 82a6ef0299449e66a441f24d6ababd640926b51a2196573d1d21076e83709db1c4e3ca9a466d8220ac4bc5fb4ae8aee02b49c8573011524e2d9509802553c092 SHA512 5cdbfe700d3c1f37fb1d958ada1078ab22d1236248872f1aad6e311ec0aad1fb32b8988acf2e1ade98ba1a6644ffc39b9a29d553271fa12d73afc27b78c8b141
diff --git a/app-misc/tmux/tmux-3.2a.ebuild b/app-misc/tmux/tmux-3.2a.ebuild
index 4039d86b4da0..e188c1d7429e 100644
--- a/app-misc/tmux/tmux-3.2a.ebuild
+++ b/app-misc/tmux/tmux-3.2a.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/ttyload/Manifest b/app-misc/ttyload/Manifest
index f8dd8782026a..991343d20bc3 100644
--- a/app-misc/ttyload/Manifest
+++ b/app-misc/ttyload/Manifest
@@ -1,5 +1,5 @@
 AUX ttyload-0.5.3-fix-sigabrt-in-strcpy.patch 414 BLAKE2B 005931b3e1c333f7af68a856650be0388bca7865d503eb1ed090de395c29e7ef52834a7a13c55c55f192c2a74fd4a667e51be792debb0456aef946cc77e8ceef SHA512 ddc6ddc5915878b1392813d7547636af56b60bf28ae030074b767179f60c66c866470af4a448f5c7629e0d0b0781ba35cd46a2a6728c9c4c1c5ba47f58f72a4c
 DIST ttyload-0.5.3.tar.bz2 15039 BLAKE2B 0614b492a86013c524d21de9dcb2c28e357afd8cc811b103b294d60c89c8b7503ca3e47dfe0c2eaa0ff92c76ff7e4453761300ea2fae1d8f5adbbe36d201c93e SHA512 1affc171fd569d4127d7a51dda5764272e554a96db6ad4418ff6120f9b0e573679b33d45797adcb667216d167e9f3ee41349a53d4f7808b3b1c5bed76e3f4bbb
-EBUILD ttyload-0.5.3-r1.ebuild 870 BLAKE2B cf2ea9d6cd90e5cb59326824d8f4b2377d0538988e3f5ab91b189260a5658ecd06fd894fa6ef39e74686210d05cd381ec165a1ccfcf4c6d9d31a011bd3f865e6 SHA512 5034d206c688fa1cf84bb74b2eda9ce149b1744e24adc6fa0d5be5fbdc4f5f74cb3abec6793506530c4d560016a5c1bc77869490b01016af6cec0d428b512ba4
+EBUILD ttyload-0.5.3-r1.ebuild 868 BLAKE2B 26eb417e79e25732a9c4af6d5be6f8a62139fe14c363641d9151e45c1fc14b275ef83ec46460e620fecfdfb1910d99329f9cd2e9688f2b76daed76d652aa8325 SHA512 dd45b261c7859a5b199f7c28ae256f96bab1ae559208248a9aef7ec5451413f7493a8b470d7451c9c7a4ef99ac4a099b30ca288a9d090a1937352bda99da2b7a
 EBUILD ttyload-0.5.3.ebuild 802 BLAKE2B 4a29f5d4d29d6d4f720dd8fa6362a52cc01c49a49bb4b5d7dec9baff453adbfb62827898fb0c13fc7897d3d9c290e2a2dd5a25b4011b2328f22481ed4c9fe64d SHA512 53be4bbef175cae500e6c8d5480f3cc1d5e8e3c399a7997397911f7caa683701f98f64d7f0f11db097b8a67cff6785076da949a7389e71c5d31e50c846a26693
 MISC metadata.xml 378 BLAKE2B 7dfd6f3df156040cf1c245d5a8376d42fab7dd63d38eeaf173c61ad5174cdac63f80e96de17777b6214dc2c7e39a201e0370cc8caf7ceb2cf55f41077c415e99 SHA512 bacc3fb8f1db6ddeb1678314b2d184234e856ad0ad29df11b9d3a0885675b3b3e690a15b964a9d2522bdcf5ebf4c5288498c291d40328272c88806c29580337b
diff --git a/app-misc/ttyload/ttyload-0.5.3-r1.ebuild b/app-misc/ttyload/ttyload-0.5.3-r1.ebuild
index 5a031a28898f..9d52721f3c58 100644
--- a/app-misc/ttyload/ttyload-0.5.3-r1.ebuild
+++ b/app-misc/ttyload/ttyload-0.5.3-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="color-coded graph of load averages over time"
 HOMEPAGE="https://www.daveltd.com/src/util/ttyload https://github.com/lindes/ttyload"
 SRC_URI="https://www.daveltd.com/src/util/${PN}/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="ISC"
 SLOT="0"
 
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index 2d432147dca6..a1cc4257501f 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -1,9 +1,9 @@
 AUX uptimed.init-r1 730 BLAKE2B 21d7b8f5fa4daee5a3807d35f749a467731b5e2ebc0e2b741cbe20ad9af32aefa52566fe99dedc31abf30c3f74d74ced97ce094f07203b1473bc79d9ee2546e2 SHA512 8a9e054b2ae3f5479504b0d466a96687f5be2c5d1d8fda740597ca21d8854b4ba4bc8576f8f903392e1b3c7564e3e9e80eb39f30f5a8df0b228d1bdae04725f0
 AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bceee3bb7856e67c1010d067c06ae699f4dd0389228392d5828e1bf75636c69171e2d21509330f6baf SHA512 949baf12782d4b8a976d29ec44bd31323500de763b82601634eea3721ce9035bb9b7ca906384e2b8ebd57371a1116a95dd78c3610c27fa1d93e36b9f897bcd98
 DIST uptimed-0.4.2.tar.gz 55339 BLAKE2B 120a3b1d6dc9518f7051af4d7e0f1bcf455f7dd989687fa8f5a40f160f2912c21d09298bbb9c676af5387d96890a98acf3f21b60e046a9548a735ca10dbc4006 SHA512 a18cc8580a4dc7db7f4d97d70e25d76e7b98b9d328a0fa4ece4176d40fc26589149d63ffc9d2638cc35003cf485b43ae6e115aa1821c662d77f234eb3c4c0a4f
-DIST uptimed-0.4.3.tar.gz 55396 BLAKE2B bebea6559c436d2700df905b63fabd73b1c55463e8633409bc05cd16c7d110d8116f52e00d63879cfb2e0482f648bda04dcb5a1d5ff629699d2758dcc85ba53a SHA512 f9485224dfe7173bab135a87b047d749f9b61d3c29d50523126b585ae77e68837680fdb725a08fd7cad39f0b35b2da7a6923b8540700881f9638286ab5082260
 DIST uptimed-0.4.4.tar.gz 55491 BLAKE2B 8c4d19733e1b8f8ae682ac3238677e6ab24f9a5e8f948a130a2f6e345afe4cbb70e19ea789772fa9ec9c7f89fe1ea72e6a3c549dbb6e95e66c83a0a4a6966db0 SHA512 a39a3fe54dbd9373f1bf081584b16686f3a4ce742e282f8dfde7460ac156c2e189f48976fe32723468316c231ca6a3ea404ce42465460b2b52e96b7dbb92fe48
+DIST uptimed-0.4.5.tar.gz 55727 BLAKE2B 4d1f29eea3d0a4237bd7c81f60fcc115cd6762dc90cdcecfcad852b672f98e70e4cdb1988c10a00a76ba0a55f6bd921c8d294d38e3e50e5a317717b62807dd61 SHA512 11e99677eca5e0cbb81a72077bae9c8fe2c70054e9fa05d1656cb64837e1aa63984ef6b87f563dda09ea0ae3d452d6be7ccf3d21c04f5f6ba67d618d72923514
 EBUILD uptimed-0.4.2.ebuild 1569 BLAKE2B 56f8fb30e6203406c3c66d64bd62857f4a64407a8c6733fdbaa33a7f0a104ccf25d83d0215ffc73cafb6cf8d9d7ce9d71ecfb201dfb4320155763f6cc4dfd66e SHA512 c54a493c777a05e75afd1f6a8139cc41866ae183fc2b80bb3021fa54de90c325b2d6ca459bd0589383d12ee7075e9eb0129caeaf70476a6c6d8ea750d4f6d595
-EBUILD uptimed-0.4.3.ebuild 1582 BLAKE2B ea46b1de7783486a189514c91bbb11f79cf62f23f6dcda1131f5a16a416c4818b79dbac52b9223b142b5f4e54d2bc30bc26fb39ac0648edc1e10701718621883 SHA512 6b2634410d9c23ae74f8510a9fe5f7b399a3ab32475e5f36d78197fc1c2bfb7f3e47f7d23da36ce2c72163c0cccb91bbcfa88181a501a50d15a535ca41509a99
-EBUILD uptimed-0.4.4.ebuild 1410 BLAKE2B 7015e898cd82e64d546133bd62a2cc28fa4c6d8640230301fc60b090948417d48e009654506cb1a271fb68e3a196c42c17201a154029e39e98a506fcc1fc03f2 SHA512 077996018d3a1b48faddb019ef32a0cfced5c00364be3d556ac0a259e8bb009806027f8020be09dec223a6e7e8626d08fcfa4143a40efa84fa5972e5ab301eef
+EBUILD uptimed-0.4.4.ebuild 1404 BLAKE2B 2837246830414ba708fafe75111bd37cc0cf9bfbe6d3a25c0dec462d087bacb2f5496f32256855fb327100edd5bf4eb4491bc9b6ea334e6464feca2ca69f10e2 SHA512 b93c15b25611077e73dff9d2f0bce24f8c55b58a92d9b99baa5ab659be47a5abfd87864717426648686c83dbf091a0196dd5a66f88c1462a144c7609d15e06d4
+EBUILD uptimed-0.4.5.ebuild 1410 BLAKE2B 7015e898cd82e64d546133bd62a2cc28fa4c6d8640230301fc60b090948417d48e009654506cb1a271fb68e3a196c42c17201a154029e39e98a506fcc1fc03f2 SHA512 077996018d3a1b48faddb019ef32a0cfced5c00364be3d556ac0a259e8bb009806027f8020be09dec223a6e7e8626d08fcfa4143a40efa84fa5972e5ab301eef
 MISC metadata.xml 344 BLAKE2B 634b39532568022b95f0022976cb87f043e3f76dc287badbecaf7dc5d9cd4953aa11e9c35a95b8cd6aa2f47c8a2ecb6df680aabc66e3d90def348d87b8f3c70d SHA512 6d561adcf5995e8844cee3f83cf2a1f80cb69e111e185d5f5ca9c9837ae997f71262a7ea907e3755d9f76ab948e7a59c807687122d35c7523ae5449dd9190051
diff --git a/app-misc/uptimed/uptimed-0.4.3.ebuild b/app-misc/uptimed/uptimed-0.4.3.ebuild
deleted file mode 100644
index 47b0a188f7a4..000000000000
--- a/app-misc/uptimed/uptimed-0.4.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
-HOMEPAGE="https://github.com/rpodgorny/uptimed/"
-SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	acct-group/uptimed
-	acct-user/uptimed
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	# fix configure.ac for >=automake-1.13 (bug #467582)
-	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	local spooldir="/var/spool/${PN}"
-	keepdir ${spooldir}
-	fowners uptimed:uptimed ${spooldir}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	local spooldir="/var/spool/${PN}"
-	if [[ -d "${spooldir}" ]] ; then
-		einfo "Fixing permissions in ${spooldir}"
-		find ${spooldir} -type f -links 1 \
-			\( -name records -o -name records.old \) \
-			| xargs --no-run-if-empty chown uptimed:uptimed || die
-	fi
-	echo
-	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
-	elog "or systemctl start uptimed (for systemd)"
-	elog "To view your uptime records, use the command 'uprecords'."
-	echo
-}
diff --git a/app-misc/uptimed/uptimed-0.4.4.ebuild b/app-misc/uptimed/uptimed-0.4.4.ebuild
index 5d9a04fa9963..c17b13c2d032 100644
--- a/app-misc/uptimed/uptimed-0.4.4.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	acct-group/uptimed
diff --git a/app-misc/uptimed/uptimed-0.4.5.ebuild b/app-misc/uptimed/uptimed-0.4.5.ebuild
new file mode 100644
index 000000000000..5d9a04fa9963
--- /dev/null
+++ b/app-misc/uptimed/uptimed-0.4.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
+HOMEPAGE="https://github.com/rpodgorny/uptimed/"
+SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	acct-group/uptimed
+	acct-user/uptimed
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	local spooldir="/var/spool/${PN}"
+	keepdir ${spooldir}
+	fowners uptimed:uptimed ${spooldir}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	local spooldir="/var/spool/${PN}"
+	if [[ -d "${spooldir}" ]] ; then
+		einfo "Fixing permissions in ${spooldir}"
+		find ${spooldir} -type f -links 1 \
+			\( -name records -o -name records.old \) \
+			| xargs --no-run-if-empty chown uptimed:uptimed || die
+	fi
+	echo
+	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
+	elog "or systemctl start uptimed (for systemd)"
+	elog "To view your uptime records, use the command 'uprecords'."
+	echo
+}
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 4b564997a63a..20c71fbc4fb6 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,4 +1,4 @@
 DIST vifm-0.11.tar.gz 1525791 BLAKE2B c2aa6d3ddd0304ce1e3a0d1c9ac3218a783bc6dd8eebf7b3346ca262811f63dac75597913ad4883c62680cb77036c2985ca4ce88989a0dd0212dce975d8ec8b8 SHA512 15ace460da6d5f9bb7a016d8bb3f3d9cba47a608da5a39defbf7d09ff9de64c90a63a44264d695fe005f2f6d27ecb07dcec8f4ed5aef15e9d8728b52f1168dbd
-EBUILD vifm-0.11.ebuild 1780 BLAKE2B a194381f233f025f8a18cdbdc989921fb52d8a72a0acefeae24c69b6ea8c0cb16e599f007e848d537de1c80888415f44678408a880cb7f3ebb4e890c7be82e2b SHA512 b27a656abc42fce68750e7fe71f22e214cd02276940c930134e3bab10c725a14bf87905b717782c0bd503975768cbf474433dc53eaca957ea6e6a2830dd5a54b
+EBUILD vifm-0.11.ebuild 1787 BLAKE2B d48017b1746fac00076c48ba6c0543b792742f366a57903c7f4a07b99658a042b21948b4229566dc611c8d59ce1c713204ec1b28ca18f947b6d60f1a000486c3 SHA512 32be00a9e1996f7f19cbcd1990604f13b4c22b68c82dc38b19e1d0b7dbe385e57183e009f3b6a971af8c0a1bf52cbec998b7495a2a94a4f79544adc73463a6dc
 EBUILD vifm-9999.ebuild 1735 BLAKE2B 688aaae57026fb8dee116d87937a3068b596f8c209f207ffd20b157f52d5a87e3cb23eddddc4c1a6f735b26d67b0d7589d47356dfe74c21df1a34f48916c3848 SHA512 567bc9e169e54fed4097b6f42f16febd8164126490001a002f4e23e610dc87368046318b511b4a0242857e35b597afb532428498c0fd61ffbeb50f46b759ebdc
 MISC metadata.xml 1145 BLAKE2B e8b81bf341d337db3acd85377469b8ea1b14c8eeea5ebb16b8bcf69ff9836b9ccd98fde69205a312a2771b8629ce6eb4f33a4e43e9f007b5d183ac75db2350d1 SHA512 6b66b4abf0acec95f65c954b5d0b3854a811aa8b4561d12cf5afb0a9743903f2f5602c0a45ea1d717669491d726a3cc496459a34abf74dba315e4b5e63f31769
diff --git a/app-misc/vifm/vifm-0.11.ebuild b/app-misc/vifm/vifm-0.11.ebuild
index 107adaeaf4ec..ab6195b7ede0 100644
--- a/app-misc/vifm/vifm-0.11.ebuild
+++ b/app-misc/vifm/vifm-0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vifm/vifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~arm64 ppc x86"
 IUSE="developer +extended-keys gtk +magic +vim +vim-syntax X"
 
 DEPEND="
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index c4b9a53bd047..3049394ada49 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/dfu-util/Manifest b/app-mobilephone/dfu-util/Manifest
index 11790ad988e7..a8c9b6605a99 100644
--- a/app-mobilephone/dfu-util/Manifest
+++ b/app-mobilephone/dfu-util/Manifest
@@ -1,6 +1,6 @@
 DIST dfu-util-0.11.tar.gz 152462 BLAKE2B 3734698dd62de8a1c781f7631ae17ee9755241ce4d614b028fe6d6c3a117f3a301c174dcadf52252d55b08cfd75298c27a588e880837317ff73c32ab8863ccdd SHA512 fc5304a483ac10e35bf1b9304becdeb407b2e44d8ac51474d2fa17877e6cf71b0126f7e12ebb331d75e7adeb9c173ff5cf083a06ded5847dbe477534cf26a553
 DIST dfu-util-0.9.tar.gz 138397 BLAKE2B e3a9db3276204d25fbcdd7d50caacd28a8e043d2781b5f942cd0df343d046870003abeaa1005a2774d03c4198ce96fa2124040987069c5f444e36e4f365a5e0e SHA512 caa7148b7a9004e2b1f7bc4f1a26b48abfe311743bc0eeed1ab57459910371affc39b6fe7e74b7cac6ca9de41a9901b7a970253ca92d7d66d5008f8a11d2c952
-EBUILD dfu-util-0.11.ebuild 617 BLAKE2B 47e3d3d28b1e22d26ea01b2ffc2b07987940877038463607b316a7f2d30e2bd9896f5df06bac07672f4d3489d0511bc4c8690702f19a81d4126a5b88795e3641 SHA512 7b992b0c8b4a73eb8ca435010564c937439ff37607b30d8446c95cc9d3adfa2200325a5c337ce42b43b80074bf8161e62de1a95c5b8033f86cfb019879651dcd
+EBUILD dfu-util-0.11.ebuild 624 BLAKE2B c17bfc7d7ae1583239e76ed7e710e23771bcd97d9a12d8e83c0fc197572b2bf3e37056568b1e33765508dcedd58e2227aa2a6c88d3a6954f771b1a878cc186cb SHA512 433025d5702855deb3478d8d794197bea5af5b161bde8e104570d2d38d5fc25ee6de5531f95e987327f1ad4d9af009ef4a32adb1523b3f13e09a29cd5d11f3dd
 EBUILD dfu-util-0.9.ebuild 611 BLAKE2B 1684c27777969c7aefefa831a4f93b1e58bee27042d2f57d026aaa3cc8a71597211fad44ee5b7763c22ba307bb6fac6b89318ccaf94998673eccc2f9e536774b SHA512 3df4947a9180bdd44cf3125dfa3d4f8cf4aed05b45397a7365a42de045dc7ed3ce12e2f6c1ae5f0fa5b317fcd0501ee8a40dae514af6baaae48df39cd9eea46f
 EBUILD dfu-util-9999.ebuild 617 BLAKE2B 47e3d3d28b1e22d26ea01b2ffc2b07987940877038463607b316a7f2d30e2bd9896f5df06bac07672f4d3489d0511bc4c8690702f19a81d4126a5b88795e3641 SHA512 7b992b0c8b4a73eb8ca435010564c937439ff37607b30d8446c95cc9d3adfa2200325a5c337ce42b43b80074bf8161e62de1a95c5b8033f86cfb019879651dcd
 MISC metadata.xml 330 BLAKE2B 8dd6ce23111123463d3a9585b1fdff4cdf8a7670803dc36c007daa02796e764a29eff3b420dba2651e8812ae39d7df0a7de6f20a10ad5447c0b799074346fb42 SHA512 fb9646c59340854d13fb4f82e13f467a34090eb629937cf846c9db1a6ed2095d9bf6456741e6ba3460709d95f9a36bc6bdbc6063492eb5222330190b52c961df
diff --git a/app-mobilephone/dfu-util/dfu-util-0.11.ebuild b/app-mobilephone/dfu-util/dfu-util-0.11.ebuild
index 0f4c6cd5a619..b6dbaf8f4aa0 100644
--- a/app-mobilephone/dfu-util/dfu-util-0.11.ebuild
+++ b/app-mobilephone/dfu-util/dfu-util-0.11.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="implements the Host (PC) side of the USB DFU (Device Firmware Upgrade) protocol"
diff --git a/app-mobilephone/vmoconv/Manifest b/app-mobilephone/vmoconv/Manifest
index c479eb37379e..fc1b3b649253 100644
--- a/app-mobilephone/vmoconv/Manifest
+++ b/app-mobilephone/vmoconv/Manifest
@@ -1,6 +1,6 @@
 AUX vmoconv-1.0-external-libgsm.patch 863 BLAKE2B 3468d81dfcb51ca6da6b9dba74f3a8536955686456a4e055823184cad06f7d28908338c0bc61f109cd48594d89718fc2e3d0fb6818b4ab15d95d31898a496e34 SHA512 d02dc343c59ef15d21b08478d3e9f6393f95c59ecf340afb09945d4897481e9c859f83752b6d79e1ae03563b9d9deb129a0a1db5e0acd69ed1a815b5be408058
-AUX vmoconv-1.0-flags.patch 683 BLAKE2B 9320d396eaf46480c7473fa52934c8786ca31dac2d638a8463a8e5350d5006f73938e4085622034ec0abc1d866d7ceefee59b17f3e8cfe987fe1fd6ad550be67 SHA512 431e10787bed24cc775a43f44c60a64610f03c25956efb8892d7117476e01261ae06c644a1ac9ada6f9dc94ad5a38745beb8fb2dbe3dfe8546ecfa51902f0770
-AUX vmoconv-1.0-glibc28.patch 876 BLAKE2B 5d58b8ddda99b268748bdcea1004dfc4ddb48547ea502fd5a3f98683338230f23a15584d854bfa2147e702be06a22621a03767c9563522cf6c350155c7e13cfd SHA512 14477a9c13fabae162dfe8fc4b701019fb52e387198c70542275b1e9562a683532f8b88a96a9b8c7d9aea8e5f27224baa27046a04ce164adcd2d260f0a22e011
+AUX vmoconv-1.0-flags.patch 777 BLAKE2B 93720ca0a8cbd8fe29025632034d2e125a8c5d076a8ea6ecdf7d07b3de03729df6540a27a1412c390232fdb512b88a8937d2817a0e6b8173dc2432c12b88e492 SHA512 928d8b4f5722fe030f1b4b588c8117388a56a6ae44aead185c27ca55d6082283e01e33840363f54bfcf494d71a200567eba3c1fbb22c6b7abed9657ebe94343f
+AUX vmoconv-1.0-glibc28.patch 546 BLAKE2B 1f0d7913e64c8486ed277cf99279bdbe820b6eb437f39705ace632ea1b112404c1cb11d49d56bf25ab6ed912daebb4156fd3415d0ec34521eabcd69f1cc8a420 SHA512 bf17a7dbe17bba0fa94b41128b7c6481781e822f30867b042b76fefb266493ff899e7f648df09f73b14e7bcd77bc4086784377ea04bad5316320d1fd3d4b61c2
 DIST vmoconv-1.0.tar.gz 315028 BLAKE2B c31d2f4f5c45511b52a80b829b9c632519eccaf6aeb3bb74deef8ff9cdf0aea244e52c82751f8d23865e5250004d33dfc2c0b101fd03ce7cf0c08f94c3a79ce2 SHA512 c4bd65f2c034317e43736198eaea6a3cfbbc6be015dc1ac5efa51633c2779bf5af87ea037084173b377a7521538e4a235f264b5f09fedcdaf7f4a815289a7ec2
-EBUILD vmoconv-1.0-r1.ebuild 749 BLAKE2B 4d937fc8d3069fd9cfbc836e2d6a1dd9250fdfb8addcfc3d77eab93d84de61c58754f8d91d1454cdf8d4553ed84057a2b3a4c7ddde6da57a1cb0196b12a8f701 SHA512 d07e19ad9a24fa004cc66c70277103f5582b01dfc78f42a6ea01be5d4c0fbdc6c243ef98577110c1bb282e377227f23119c8d7963f9b33991f6236c5000b347d
+EBUILD vmoconv-1.0-r1.ebuild 636 BLAKE2B a20002455a2c548a56cf191a214e72bd4a2705816ed81843a8e8c43c0bad27be3d24913043d647a2799820f550128c4e9033b9dcc019a16a758ab869d9ae20bf SHA512 45e8168a28c482a8a2eb9dd3306a84934d5e93b61b19620560b95a48be100c23f0a095b753fe0c3c3670ef2ad3fb3b14989a5b1543055f0213a2e8f5814a5152
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch b/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch
index 031b6eefaaca..c0d145257858 100644
--- a/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch
+++ b/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch
@@ -1,6 +1,14 @@
-diff -Nru vmoconv-1.0.orig/configure.in vmoconv-1.0/configure.in
---- vmoconv-1.0.orig/configure.in	2004-09-26 15:17:48.000000000 +0000
-+++ vmoconv-1.0/configure.in	2009-03-03 21:32:40.000000000 +0000
+--- a/configure.in
++++ b/configure.in
+@@ -2,7 +2,7 @@
+ # try CFLAGS="$CFLAGS -g -Wall -Wmissing-declarations -Wmissing-prototypes -Werror"
+ AC_INIT(vmoconv, 1.0, zany@triq.net)
+ AM_INIT_AUTOMAKE(vmoconv, 1.0)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ dnl AM_MAINTAINER_MODE
+ 
 @@ -26,10 +26,10 @@
      [printf(__func__)],,
      [AC_DEFINE(__func__, "", [non-C99 fake support for __func__])])
diff --git a/app-mobilephone/vmoconv/files/vmoconv-1.0-glibc28.patch b/app-mobilephone/vmoconv/files/vmoconv-1.0-glibc28.patch
index ec957b40c5cd..02c000412fbf 100644
--- a/app-mobilephone/vmoconv/files/vmoconv-1.0-glibc28.patch
+++ b/app-mobilephone/vmoconv/files/vmoconv-1.0-glibc28.patch
@@ -1,6 +1,5 @@
-diff -Naur vmoconv-1.0.orig/src/gsm2vmo.c vmoconv-1.0/src/gsm2vmo.c
---- vmoconv-1.0.orig/src/gsm2vmo.c	2008-06-15 12:57:07.000000000 -0400
-+++ vmoconv-1.0/src/gsm2vmo.c	2008-06-15 12:57:36.000000000 -0400
+--- a/src/gsm2vmo.c
++++ b/src/gsm2vmo.c
 @@ -27,7 +27,7 @@
   * 12 bit header and 260 bits standard GSM frame, as described
   * in GSM 06.10 and GSM 06.12. The header is 0x2010 always.
@@ -10,11 +9,10 @@ diff -Naur vmoconv-1.0.orig/src/gsm2vmo.c vmoconv-1.0/src/gsm2vmo.c
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-diff -Naur vmoconv-1.0.orig/src/vmo2gsm.c vmoconv-1.0/src/vmo2gsm.c
---- vmoconv-1.0.orig/src/vmo2gsm.c	2008-06-15 12:57:07.000000000 -0400
-+++ vmoconv-1.0/src/vmo2gsm.c	2008-06-15 12:57:36.000000000 -0400
+--- a/src/vmo2gsm.c
++++ b/src/vmo2gsm.c
 @@ -27,7 +27,7 @@
-  * 12 bit header and 260 bits standard GSM frame, as described
+  * 12 bit header and 260 bits standart GSM frame, as described
   * in GSM 06.10 and GSM 06.12. The header is 0x2010 always.
   */
 -
diff --git a/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
index 6a145ab58049..0e19246d04ba 100644
--- a/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
+++ b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
@@ -1,31 +1,33 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch autotools
+inherit autotools
 
 DESCRIPTION="A tool that converts Siemens phones VMO and VMI audio files to gsm and wav"
 HOMEPAGE="http://triq.net/obex/"
 SRC_URI="http://triq.net/obexftp/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
 DEPEND="media-sound/gsm"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc28.patch
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-external-libgsm.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-glibc28.patch"
-	epatch "${FILESDIR}/${P}-flags.patch"
-	epatch "${FILESDIR}/${P}-external-libgsm.patch"
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
+	default
 	eautoreconf
 }
 
 src_install() {
 	dobin src/vmo2gsm src/gsm2vmo src/vmo2wav
-	dodoc AUTHORS ChangeLog NEWS README THANKS
+	einstalldocs
 }
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 712ec6fd9cb8..bdecd3b4a53f 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index bf81c7f0f153..b5bc4b3688bb 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -3,7 +3,8 @@ AUX scribus-1.5.5-findhyphen-1.patch 1118 BLAKE2B c542a292601b43f12ee2b682225064
 AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06
 AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
 AUX scribus-1.5.8-findhyphen-1.patch 1264 BLAKE2B e35c561c275ef945aca9a7cc34e9ac9732450d7a2d15f5766c2a637f296d026fbc1d777266634b98cc5e8ad09364019f8eeeffd63f634e0836144cb6dacd3f5d SHA512 c0db1a12698b2e9770049b20c73b33e3cd5f56d8a69486a42955949f37216c0347df32e6acbdd7567075f98450dd59e9ef2f6a42f82ce38699fa704d77fbc60d
+AUX scribus-1.5.8-harfbuzz-3.patch 2703 BLAKE2B c870a6be1a9e2921ff3336852782bb1fbeb51c0fd797de1a59605723810279e4c48ac65bc8abce5a71cdad16a9c62c7d2f0759fa7593bc3ddc70f5f22a6e0d5b SHA512 589e87973d316d8a96d731e649becfe63b24f26bab9e81da57cf8d049b9a0da78a659c089ab71439232fa56019c0cfaea6fbdce3081eb90c2cd07c6c995d740e
 DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01
-EBUILD scribus-1.5.7.ebuild 3981 BLAKE2B a1e9e67d0c942109d2270ffd4bda424176f695ed6ccc01b3b64aca1bf68ad5f08faa1f2ca2b6a079dd61263af860f8dac63678e8831705804e83a6fa685dc55d SHA512 97e876421064b7e3669e30af46f335a0e6755e196de579e0b062441819720c3edc7ec77039ce83a951c6de34689e1168be3ab66f53415a18732a801278b14bfa
+EBUILD scribus-1.5.7.ebuild 4037 BLAKE2B 3adc052c369208604d04014c2cbe462c2fb2b6043f429b2d63bada56140de9c2753ca292888877c16c9fed65a3b39045ce0207e3239cf6837ed799292d65fa71 SHA512 17a5db410e675ac01e30eea960f41da3429c95f616f924511c0750f5973334e33e631c1dc8eff1f8002b439d5cbaf9e9b1808fd1a72314f83cc337bcda7d0b90
 EBUILD scribus-9999.ebuild 3944 BLAKE2B cfbe26f95ec4dbf0b1044e61882ce00fbdda133a113bc76c87a30814e64044cdd16b1128da4f1259ca5855440f748a6a849387210982f2442e9d323c9823fa6a SHA512 f1a0bc8c0e395ee24b3d9ce7404c4106f12289cbd1506c0c1f8153f7d3a07154770a9f5cb4f20bb1a5752e83367e5a950e9ec363142d8725b4432f1561aea8c8
 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91
diff --git a/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch b/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch
new file mode 100644
index 000000000000..f1645e516faf
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch
@@ -0,0 +1,68 @@
+https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch
+https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch
+https://bugs.scribus.net/view.php?id=16635
+https://bugs.gentoo.org/817281
+https://bugs.gentoo.org/813711
+
+From 1b546978bc4ea0b2a73fbe4d7cf947887e865162 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Sat, 21 Aug 2021 20:05:43 +0000
+Subject: [PATCH] Use new hb-subset api with harfbuzz >= 2.9.0 in order to
+ prepeare for removal of legacy API in 3.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24696 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/fonts/sfnt.cpp | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp
+index 50777f66e3..fca8b39158 100644
+--- a/scribus/fonts/sfnt.cpp
++++ b/scribus/fonts/sfnt.cpp
+@@ -1256,11 +1256,19 @@ namespace sfnt {
+ 

+ 		for (int i = 0; i < cids.count(); ++i)

+ 			hb_set_add(glyphSet, cids.at(i));

+-	

++

++#if HB_VERSION_ATLEAST(2, 9, 0)

++		uint32_t subsetFlags = (uint32_t) hb_subset_input_get_flags(hbSubsetInput.get());

++		subsetFlags |= HB_SUBSET_FLAGS_RETAIN_GIDS;

++		subsetFlags &= ~HB_SUBSET_FLAGS_NO_HINTING;

++		subsetFlags |= HB_SUBSET_FLAGS_NAME_LEGACY;

++		hb_subset_input_set_flags(hbSubsetInput.get(), subsetFlags);

++#else

+ 		hb_subset_input_set_retain_gids(hbSubsetInput.get(), true);

+ 		hb_subset_input_set_drop_hints(hbSubsetInput.get(), false);

+ #if HB_VERSION_ATLEAST(2, 6, 5)

+ 		hb_subset_input_set_name_legacy(hbSubsetInput.get(), true);

++#endif

+ #endif

+ 

+ 		QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));

+
+From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Sun, 19 Sep 2021 11:59:50 +0000
+Subject: [PATCH] #16635: Replace hb_subset, removed in harfbuzz 3.0, by
+ hb_subset_or_fail
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24707 11d20701-8431-0410-a711-e3c959e3b870
+--- a/scribus/fonts/sfnt.cpp
++++ b/scribus/fonts/sfnt.cpp
+@@ -1271,9 +1271,15 @@ namespace sfnt {
+ #endif

+ #endif

+ 

++#if HB_VERSION_ATLEAST(2, 9, 0)

++		QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get()));

++		if (hbSubsetFace.isNull())

++			return QByteArray();

++#else

+ 		QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));

+ 		if (hbSubsetFace.isNull())

+ 			return QByteArray();

++#endif

+ 

+ 		QScopedPointer<hb_blob_t, HbBlobDeleter> hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get()));

+ 		if (hbSubsetBlob.isNull())
\ No newline at end of file
diff --git a/app-office/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild
index 67c6ac3aa058..806085da0d11 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -76,6 +76,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
 	"${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch
 	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
+	# upstream
+	"${FILESDIR}"/${PN}-1.5.8-harfbuzz-3.patch
 )
 
 CMAKE_BUILD_TYPE="Release"
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index dc3b04551772..6a68c9c2fb82 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -2,8 +2,10 @@ AUX texstudio-3.0.5-quazip1.patch 554 BLAKE2B 239f468f72655b579b70503856a87230b7
 DIST texstudio-3.1.1.tar.gz 83239128 BLAKE2B 7aeedba9ec5a404d51e8854a67c2e07f4efdc03882ebe83ba4d5e99376dcac5c906b40f093129106cfbec716be6001ae6c1848f323147289a5d252c713cb25a6 SHA512 b8c843693d781052914f43215ee42c7bafd4bffe676aede966bafa08b4b74616b55a60e611878a8f0188c84d364ba27f86425adfd4e640c7d4390b0fdfcee8c7
 DIST texstudio-3.1.2.tar.gz 83987451 BLAKE2B 0649a4f2a429d1d7a6134e154c338f623de23c8b05829a169599f6950b59190736a0f4c2a4dc0e57ae2c47a5eb26594639660a8b691adbb768cb013061d5c1d8 SHA512 c8ce74cca6620ba725c4e8ff66564cc4804f3b922877af5c4952a8cd5b43fdf2deb88c1515f457f75a67d7d29ca1d6307779b8304c0b78b37f585c61a12221c4
 DIST texstudio-4.0.0.tar.gz 88426776 BLAKE2B 616ffaf35a4f2c5e5290517b38301c575b91251374ee96dc58560f40115ffd5e4e68830fe927283dcdf0f9c9b38815fe04a86a7e58e2dc7936b2b32e38bd6662 SHA512 9025e0709145ed9c352f9cfd748087b331fd2894c913d7b7707254050ea41d5df74077c8f94cc3fb19c4700d468d55e91895da1ea474759d83af499ef436cdbc
+DIST texstudio-4.0.1.tar.gz 88469841 BLAKE2B ef1987fd3e733e9de57db5d8f2e25802f8eb86ad8a957f236283db41756c6e8cb133646d212d2d85d9c2ea9b53f2677f8ce76509d7e4634465859251a280c978 SHA512 cb993027950a525ac8cc5eac4ca95e0c9ffa712aab6f27d8c22b46e52d4edc3e05b2ba16efbf5d8c0e40d6ef75abcdd6dbd86ef59fd0f7b87ab4cbbd03f83b85
 EBUILD texstudio-3.1.1-r1.ebuild 1741 BLAKE2B 7fec25e47073dd6943faf080e207c83c5e4c37cf491fd7e43a4996bab28e025520f2a448e3b1125c5ce77af1ca9f8939b2ca2aff6842de199c42bd5ab93526a0 SHA512 0ca6c81335acbf0eda33c201569c39b475e4e75a585aa2e5fd0949ce2fd9378767e0e61a06735d63c3e185e4e28b6a4786ff207a5985428791180450e57a32f6
 EBUILD texstudio-3.1.2-r1.ebuild 1741 BLAKE2B 7fec25e47073dd6943faf080e207c83c5e4c37cf491fd7e43a4996bab28e025520f2a448e3b1125c5ce77af1ca9f8939b2ca2aff6842de199c42bd5ab93526a0 SHA512 0ca6c81335acbf0eda33c201569c39b475e4e75a585aa2e5fd0949ce2fd9378767e0e61a06735d63c3e185e4e28b6a4786ff207a5985428791180450e57a32f6
 EBUILD texstudio-4.0.0-r1.ebuild 1723 BLAKE2B 74614a553436ae07150a474ac73e2bec598b9d7b83179858f6b2c432bd1b960efa5aa9d02b6bee2f821eae0f3ee7335a3c0549750bd929c816b5b5d92216fcb1 SHA512 72e0e969688680647b1538efbbc28f53519886a5d54a3cd2c7e1081e01855de904d70b7a1e1c475d7b459bfaffd703572dd7aad11f3f44bc366344699639e19a
+EBUILD texstudio-4.0.1.ebuild 1723 BLAKE2B 74614a553436ae07150a474ac73e2bec598b9d7b83179858f6b2c432bd1b960efa5aa9d02b6bee2f821eae0f3ee7335a3c0549750bd929c816b5b5d92216fcb1 SHA512 72e0e969688680647b1538efbbc28f53519886a5d54a3cd2c7e1081e01855de904d70b7a1e1c475d7b459bfaffd703572dd7aad11f3f44bc366344699639e19a
 EBUILD texstudio-9999.ebuild 1661 BLAKE2B 7ab31d156cb4b4a192ebbd96628f4f427ffe8f2f05296292bd3c98590c73110d5022e929df11f009188c347e108d5d460498ce44e243cfd91e49f9d8b2e7a405 SHA512 293d1621312fc9c5fb580a868bd67a43434c671b3b623048e9b93e6093d292e3975b292c1a7f6014853e44f803b0253a87a716ee30fa68bfec251f6dead07780
 MISC metadata.xml 523 BLAKE2B a16bc006c6ab5dd0536e77a5bbe1681cc84c3aa5be50bdb567eccecab426688c751c0bec2c34bf221ec54f5ba772236a81a227067e426bb545755a129ebb6e41 SHA512 91f8748cb661e3e2ef7c027d02aecccbe23cce00c0da8486227d237ee6429e84ac9a8c2b32d4c518a4583d0643871b0c50c838d3c40004c0df7ae9c8ecefceed
diff --git a/app-office/texstudio/texstudio-4.0.1.ebuild b/app-office/texstudio/texstudio-4.0.1.ebuild
new file mode 100644
index 000000000000..1e8cd724e856
--- /dev/null
+++ b/app-office/texstudio/texstudio-4.0.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+MY_PV="${PV/_/}"
+DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
+HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio"
+SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="video"
+
+DEPEND="
+	app-text/hunspell:=
+	app-text/poppler:=[qt5]
+	>=dev-libs/quazip-0.7.3-r1:0=
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtsvg:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	video? ( >=media-libs/phonon-4.11.0 )
+"
+RDEPEND="
+	${DEPEND}
+	app-text/ghostscript-gpl
+	app-text/psutils
+	media-libs/netpbm
+	virtual/latex-base
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.5-quazip1.patch" # TODO: upstream
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
+	rm -r src/quazip || die
+
+	if use video; then
+		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
+	fi
+
+	sed -e "/qtsingleapplication.pri/s/.*/CONFIG += qtsingleapplication/" \
+		-i ${PN}.pro || die
+}
+
+src_configure() {
+	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1
+}
+
+src_install() {
+	local i
+	for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
+		newicon -s ${i} utilities/${PN}${i}.png ${PN}.png
+	done
+
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 744a18018687..ef3ddf131ef9 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/genlop/Manifest b/app-portage/genlop/Manifest
index d50af50cd521..e920f2235c7c 100644
--- a/app-portage/genlop/Manifest
+++ b/app-portage/genlop/Manifest
@@ -1,6 +1,6 @@
 AUX genlop-0.30.10-sandbox.patch 1057 BLAKE2B c26b81d97da834af5c54cd4f6b27cf1556a54936b263497174d6baf85ccf9b7da6a3dc48235eea8e389ad431ea10fb8eb26be21cea9a3c7d26a474686fd9fcef SHA512 c7c4a4de633bb96fbc380e168ebe3f3bff411ede87245b2bb0039834f6b7f09d1342549f755fdcc925b5b15ff0f194a4abca0f0c5ed0082961c0d40dd122e933
 AUX genlop-0.30.10-sync.patch 671 BLAKE2B 21f73d44ac404fc94462e8cba765baa6f88c1dfa0e4add517087765d056e98fdd9bfe26838ec2f94b001c14175f8e98b45f4bab95e50d99f87083910864e86ed SHA512 dfb9edf5eefac114e868590df49b36e1f799ce4849448ca081d12c70019d40dee3dd7056665281728891ad8b7cada9213f17f0260347aa867b20009c0f87781d
 DIST genlop-0.30.10.tar.gz 20872 BLAKE2B e06088678598464c67b78cf10a7472d7bf7b22d69c85fc072064b7a90fe57e2015fddba30edaa85574381cd59367b81c7bf514c269d5dc186fbcc367bba0cca4 SHA512 eab59d7dc012fbbdbe7de509deba66e6c7d0c5a37064e79c25a37c64becc259ee5206194615b60b3363022fa59e458356547edca307ceb4e19eeeaf4b146c593
-EBUILD genlop-0.30.10-r2.ebuild 756 BLAKE2B 4264c32d9ac3b9055e4fa461836e03091a0a824e8f768c2f40fc2fad4fc35774e57e35d8153bd53331285fe77f821574d265b09ecfd5e31722713ea21adf7f68 SHA512 76263c86e18e5ff854af0e10f2e72240d73220cd758536f8f126231a32e80cb622501e3584f96fa66e498875dfffe06278911ceebf3c9e3de6170377dd186d9a
+EBUILD genlop-0.30.10-r2.ebuild 755 BLAKE2B 319862c8d826e6d32a5e4b38a72845632a45cf6d3afff42f2d83a2dedc8e03e46a927bb7905a2c863a4efce15831be936a6527d7649e90ca67ff18f915471009 SHA512 1bfc54adf7d5acd4719595f35d2df66bc6c7b6d12c15e12379b32eb427bd8514b99e07943f8dddf2fdc8389918abd316a32952d00ef77064fcf76635233fb292
 EBUILD genlop-9999.ebuild 529 BLAKE2B 5657b64c97a6b71c1a5a7170489d1950460f20d2088deb140ce43a35a6b492706f3524b32f299ebe2366648a51b3d2faf7d32a9686466d327bf4c64dc597c5ea SHA512 76ecf847069e02b319049ee1557de0cdd6b9756ea8dbc820081832387659b364650318b8538fd64161f3259e7354894958f373a4dbf3863c1eeb902f2e102b1d
 MISC metadata.xml 378 BLAKE2B d111f1f1120ef7b16841af32d2ba15f322c190e31c697ff4e80d5edfd19a1732b13666e6f00c6c1e1deae255773ed564c0694b88cd405e3e9074ee31c17312db SHA512 30008fa17e957d098023ceaa3b9c51dd413e54f828ee97e8dd093d477a8517517d7257c000b0b07a5943610dd3b5fdd04522328cc9c77e89523c21b197ce722a
diff --git a/app-portage/genlop/genlop-0.30.10-r2.ebuild b/app-portage/genlop/genlop-0.30.10-r2.ebuild
index 65d3383ba30b..52b09ff5dc30 100644
--- a/app-portage/genlop/genlop-0.30.10-r2.ebuild
+++ b/app-portage/genlop/genlop-0.30.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="
 	dev-lang/perl
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 5434cfc131db..4b732976528b 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,3 +1,3 @@
 DIST mgorny-dev-scripts-11.tar.gz 8045 BLAKE2B 3b2b023b87902c1ee9c5bec7cb1b70bbfbc141383167b497d5dd67fa4b46b4d0882be49d3595db0b699ff0112cf2431653c0cdb72c187589c958f7052aeeb663 SHA512 5b053d2a053e73208cf5ccd4aa00b61733c4ba14f1df9e0cabfc8667e0cce8637c18be09c6366e384cffce3b8954d29619efd9085c21fb72afa0de61a7b833b9
-EBUILD mgorny-dev-scripts-11.ebuild 603 BLAKE2B f502fb3777848f54b09d9e83fd82153ab44e089f550403b4b83ce148a1e7b60ec499a5c364e98075281eb443e7de01ad7a89be819bcf48aaa7a269a81cf4b7f3 SHA512 80ea57e86f5e8a42b09429fa482ac0504cb85e09726d11a87ccd094ca460f12aa473ae386fd0b8f8d7e067cb0388578648fe06725f6c6635f7c9a109ef9f4dda
+EBUILD mgorny-dev-scripts-11.ebuild 615 BLAKE2B e388d2b1a15895e18da3b2109c4ea1c22cd3275aa6440766499c26203e2a9783ef1c4190a16c3f9baf2eeae29caab6944043c526799149162408ef2850bb2fe7 SHA512 18ccc0cb3ebf73cbe34b1301d953ff803ac7018202c6557adffd299399689d5b7684f016112bfa617d354412f7f121a522ac7df9d2fa01c81d515b160e4a436e
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-11.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-11.ebuild
index 3aa5c6d2cdf8..0897d3c3330d 100644
--- a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-11.ebuild
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	app-portage/gentoolkit
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index 12ce17ab7c3b..9263dacd0708 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -1,5 +1,5 @@
 DIST pfl-3.1.tar.gz 5521 BLAKE2B fdc6e82c5d61d694a188c479b0566aafc507bcc2bbd1f176cd2771586b13de86a43a5d2e156beb4c9b5d10cd718046a05fce099894430c8f3d04c0922078e988 SHA512 b2bf79445a5b15caf339106f376d64accf5aad2c60038ba88180d64ce49e23dc3015efa2fcbeec886ba591cada053dfdc96873bda71b092be4622608062b6dcc
 DIST pfl-3.2.tar.gz 5373 BLAKE2B 3fcb771a6d67ec7198b83eeeb161d7caea7ccbc3933ff3ef7a48b106e9c86c331f2ac1a4c589135a4f57f40bfcd668f075f17865ff58feb027cd02d90b52bc2a SHA512 e424b5a5c6dbb848057fe357ae98196f2c238351dfe7fd19a9b7f423c245b1372ec270c6b8d2e8265a05a442d7afc2c5feef6dbe5eed5e240e78c88a6748d1d5
-EBUILD pfl-3.1-r1.ebuild 1238 BLAKE2B 72d1d2c6eba21c7079c5dac440c2e44ab96a2e1e643a093ca2ca5e5f77f78966316467e9a21b0a8d2593c2a88a481568a9eb90df21e14edd4ee5d4342726fb8b SHA512 28fba5ff79305c5bb43f2ce6d4e4a59ee11522c45e896d80a89a80c52204e08e11dfd64cffa6cb54b1fbebabec9b2e4ddf3017838d2b8f789e8d30692e309501
+EBUILD pfl-3.1-r1.ebuild 1237 BLAKE2B 1a7d996b467166a8b5316608fd8d67ce07ea7efecd3515aba191f3799b9e8f0c8962037f723f3fd4f88818622f404a8406a46edc4cc61969e99fb47e0243d9b4 SHA512 4be1fb60b06394dad3ace70b8c4fc4ad7558ba98510376a7df2eb7a6d7b98ded243277c31346a8ab314b8e017cd31e4db941def29be389890ebd5cb293bca652
 EBUILD pfl-3.2.ebuild 1269 BLAKE2B 7c4162d31ac37867b1faece56146e918ef2f3cedb8029f4ee8d933b0bd7733f78c2531a555e5c0f7be5b7cbdb9c34e393189017feaabf59e24ea8eb3088de3e8 SHA512 e2bb872c838863e41041bccd108fc8f190165d4a983aa1fb25f37efa41e1cef8a82a49a66977742e6399fc734c813d50ab050ed7c762d7757f42efcee38bb988
 MISC metadata.xml 520 BLAKE2B d00ce805891280e0f73e051f0083e511ec670101253995b437d3e352fa0e390b1bbe65de02d4b501a965f330f5c6b30b218af26b327bb31c9c1e50b7d65b86a5 SHA512 8d11818801dae3dcc52ab93ca33fce7842c2a9ba159fd85fce19c316781a4e611c166672e640ac56e34cea34a92500f958b06335e27e3804e5becc645ce11d42
diff --git a/app-portage/pfl/pfl-3.1-r1.ebuild b/app-portage/pfl/pfl-3.1-r1.ebuild
index e59b6444a068..1b567813f2e8 100644
--- a/app-portage/pfl/pfl-3.1-r1.ebuild
+++ b/app-portage/pfl/pfl-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/portagefilelist/client/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+network-cron"
 
 DEPEND=""
diff --git a/app-portage/pkg-testing-tools/Manifest b/app-portage/pkg-testing-tools/Manifest
index 3e988751db49..ffd52dfc4a0b 100644
--- a/app-portage/pkg-testing-tools/Manifest
+++ b/app-portage/pkg-testing-tools/Manifest
@@ -1,3 +1,3 @@
 DIST pkg-testing-tools-0.1.0.tar.gz 6131 BLAKE2B 6d8dddb81e57159df9f2e1897718433d29f330286afb868a1111db4e0bb7a53823df57a5d7084a24fd5807787f169fff137f5c6c0bdcddeec2c59090d9b90775 SHA512 05165d3790b4d38c939226d1149c0c44cd62fe222a199bce8f1e108d12475710f8482f82e2e2e45223ba24fd1b50451dea8b3761c8f474a59e660b9a67bf8ab4
-EBUILD pkg-testing-tools-0.1.0.ebuild 463 BLAKE2B b551b3e2ddd64f7c8b7e356ef9cc97c9a10975b55d0b1c509c399d61bfa20383b46a8e0506521c748c1211ec16327965cd0245105029338f27c2976f8777e7f4 SHA512 584665ad4c7230ede8653f16e5c6a81f9202034f67fbad1ce76cb6f1f93150130a6b4592800bd3bc51c8eaee55e85455730ed8a84a12209043c4941e76454bae
+EBUILD pkg-testing-tools-0.1.0.ebuild 475 BLAKE2B 3d30ccaf52f71a82f07170b852cf2040be7de86d3cc2fa8ae3b4c33d69e7879c7bbd8ea2f30d606f80cbc38bd48d82feafcf0410a3a7f953ef1b56b1388530bc SHA512 2e2a7274f21b5aabe70a90f1bc58829c9679656da83f23e44bed72c904909bc02682967cb201aa264a4f62938400d8b238dc45ae5840871ffb87bfce000f54c8
 MISC metadata.xml 346 BLAKE2B 3722dffc5927806f50a95438483030320544f0ba1c23dc286373bc801241416eb54269849de2fa9dbcd7921607f52baf63d6ee3dc509a5c1270895d9e8dbc450 SHA512 f41ac37cdfba066c194e16d89e2741a44388e8811cadd601811e858452c6c848dd5463b499a674f40c24250ee5aac98ba774fc227994f3ebca307700b6901377
diff --git a/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.0.ebuild b/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.0.ebuild
index 3177469c8986..5ff3aab7cbab 100644
--- a/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.0.ebuild
+++ b/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/slashbeast/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 17453746141f..5c5f0666588b 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index abe823ba26de..299487e7dc09 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -411,5 +411,5 @@ EBUILD bash-4.2_p53.ebuild 4345 BLAKE2B 4a872160fef38f2eb94a625060a637c2e66e01b8
 EBUILD bash-4.3_p48-r2.ebuild 5624 BLAKE2B 4d4056a9a6ee1b0602f106caf0798820953f4d2d0e7bcf6f54923e1edebedb6ea24ccb3dcbb42b3229967e08e162fa89253ae2a03fd7cbe0829ac315616a1681 SHA512 c74853e84737bcc4fbf745e0c49d77d156e69106b2b66fd67885b16cfdb3e59ab84648b03cdf35274402d89a725b79f0da83fe4ab16f9c17a7938da45853692d
 EBUILD bash-4.4_p23-r2.ebuild 5709 BLAKE2B 533de68a81792479a0da8e18a7700d5b29f78370ebaaf582069cfc21177c4cf94754afa5328ec2ee4dbd3807db37cb5e01f40d28d10ffd71e3c62c8f81a62d2d SHA512 d8fe7e91ccf16f972a91263d485d299b5cf79f7676f18f6027d9f808961a3647e6db6b978c7617658b185cc89ebd70de7c25dba318a27ed21bb1310881da0a8c
 EBUILD bash-5.0_p18.ebuild 7009 BLAKE2B a89c8fe825839b3308a78ff398a6389c2e1586231eb99e7b25c61fdb4e12c2b4ba715ec6ef5e98e5423e7f5855de2472c6e69673a6886f22acd160f525b297e9 SHA512 8bee7a015cee324276d8a3d7814da8515540fd7d4a4d85ee63525628a2d21714a84f261694a2d45a11e494183e9ec467edf3173b6f9b22130ff959cea8131ee8
-EBUILD bash-5.1_p8.ebuild 6991 BLAKE2B 93d1328bfb8530b53cdc0ff81b85f475b4aa03377b71937e93a9b62c977dfb86e0f7b81fbe1c14e020d8fcc7a6e8521ea027b5992ac6c8efc9c010d0b6ce235d SHA512 bc67182c7bdb2b8a29f367b0f60fcc700b1b0b326457121c445badb2204e4472688010910ba316b99eeb8078bf5571bc7f318e61c10c54b126f75b3604c47ed3
+EBUILD bash-5.1_p8.ebuild 7003 BLAKE2B 8cbd144d9f53b360ad296be4ce926e7b92aff8f168eabeb9d8721916e978c7436e3d4ebbaf19dae8582898d3a13f29059db8164364ec795eab5d3d4e23934e84 SHA512 7be24042c0322ecedfab3cf15fd381eec9fa5568111656faaa26532dda5fe4c0115249bb2327929e05772407d6e25ca89d496e5a5dc1ba0d373e4afe05c0e990
 MISC metadata.xml 735 BLAKE2B fb066d2f79f6b109d949f711d97a1446d3399b16aa2ed6934ba953179d0f6239ce677f5d887e49d7f5a9cf0680f31b560437e9b4399209ba8a7d2e09f05d864d SHA512 91b1f9e7c6419c3a7165180140fbc9754686fcd31f726b52a990a4dcddd290b049f3b681242ddf06f8e6ce0b2fafb7915052fa55c5fe205488361aa61dbc3b57
diff --git a/app-shells/bash/bash-5.1_p8.ebuild b/app-shells/bash/bash-5.1_p8.ebuild
index 88199a177aa1..5f26b4a7e3ab 100644
--- a/app-shells/bash/bash-5.1_p8.ebuild
+++ b/app-shells/bash/bash-5.1_p8.ebuild
@@ -159,7 +159,7 @@ src_configure() {
 	fi
 
 	if use plugins ; then
-		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
 	else
 		# Disable the plugins logic by hand since bash doesn't
 		# provide a way of doing it.
diff --git a/app-shells/yash/Manifest b/app-shells/yash/Manifest
index 5fbbedd2ff5d..b76e7e9817ea 100644
--- a/app-shells/yash/Manifest
+++ b/app-shells/yash/Manifest
@@ -1,5 +1,5 @@
-DIST yash-2.50.tar.xz 739988 BLAKE2B 4d8047150e2326b7c401f79416d87d09c099d4743026ee997e7f49d096cb23de210ded489b348cc9a264ece2fd4778b4f5c5c9999ed7391ab78699ce77ec03e0 SHA512 fc78d61b09f7c81d1d7bd3f4feefa7d4c0de910524759ebcba2b53322abc3f1e0a937007b36a5060af0ee759df210ec06d5eed2c71cf3f7ccd0825521b50edb7
 DIST yash-2.51.tar.xz 753880 BLAKE2B 4c66137eb2abf454c75b50c9d153522136bd835e7c26a305b424b8cf88694fd1dc83d9012efc8e2a611abc25217b34ae1dd36c20e0645204fb349871d23feefa SHA512 53f85f98dfd66c8937db292694da05fb7fdc8d270fc4811d7ec4d2787ab56600eca8e44379ef349755ec5fb739af3b32036a588ac35be810108ccc388be122e6
-EBUILD yash-2.50.ebuild 801 BLAKE2B 73fe91dce46af85386a2fe79d641fa83127f1deba19b5674a516072f844faf8f9d5f841d323acc773bc3ca6afb6886b7afd1ef1201fc13c0112a18e50d254fe5 SHA512 6fae1500368d7d01083dac98e536055557a68b6eba8f39ee6a6825d20cc54e9a78dca3414a7641e9fe1259f3ac4f3fe3a6a1b1ab9bf8be12f1b95f58da41e12a
-EBUILD yash-2.51.ebuild 803 BLAKE2B 80c52ab9e5e9a4fd67134f2baf36b918d0e3935261865dbfe7eaf5d86e3d944546af1076069d150f99be70732a104c42388e1751f677c10e311f9baecd86e997 SHA512 bd43bef33687eaecadaa703171f00e09a5d71cdb2fae749500579a5921340f62f42b88a045382adce93e08f36411ff06753a692888c13466704170788e4d9066
+DIST yash-2.52.tar.xz 755016 BLAKE2B 44c26d310e9bd50a6f381adefedcdf9bcb49998860a8a67e300d31d5a8615d7346e06e7c4ca5e098d7232a0acc112daa2230572939f665db982f187ccd741778 SHA512 1024ff7e3cce6e64cbc0bd5c0d04a9863d0d51013baf07723d09562b156d05dbfe1fc2df5b736cdec5f562c56ad634f865554a1fe5aeeed91ec0d9276667f02a
+EBUILD yash-2.51.ebuild 801 BLAKE2B 314d4f4c32661b8e0c57b2066a90e672fb064284aad81d511c289698b235b89b01e3e66d56f5a4d0d96dd16f5299e5b60a53acd4197e26d469013735d0473a50 SHA512 e928382ec0c2adb8989c99bc4ce466b264616a86150d001a5b1d2aa5fedc53152d5ff9154948fd13f04821f78b4a1fe1868db57b6447fe08b06bcaaaa37c4dc2
+EBUILD yash-2.52.ebuild 803 BLAKE2B ecbed1ff0436ecde8ca0134e1b0d53a84701d5ac3a30ea3402fd1f90a492fb62161d638cba0018943217019d36c96eeba64491a6cb5443e6b7d7c275ff96b3f1 SHA512 d38758b98d7104e6c8eccd5c64fc7d019820500a2a47dcd700ae940e6d1a2b3cded431f8b76c8552adb6b8e80841bae1d74700d5a8d82450caf9dddb1cd2f16b
 MISC metadata.xml 1075 BLAKE2B dff6217754d5c5217c62464665b4ad06424e541a96d48109cad2171d8b678eadec5ef6838ca78151c48e072d7a46c0fb5b3b71bb71da8dc1aaedc2c9d567d111 SHA512 c8e612bdb0feae7f3bb498b822f05cfb57eaf2f9d6a2503a5939436285eda1d3984f9658209d895443f5e00fc6e9e15341f854d84034c5a02060039cd6580f8a
diff --git a/app-shells/yash/yash-2.50.ebuild b/app-shells/yash/yash-2.50.ebuild
deleted file mode 100644
index 878b8ade8019..000000000000
--- a/app-shells/yash/yash-2.50.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PLOCALES="en ja"
-
-inherit flag-o-matic plocale toolchain-funcs
-
-DESCRIPTION="Yash is a POSIX-compliant command line shell"
-HOMEPAGE="https://yash.osdn.jp/"
-SRC_URI="mirror://sourceforge.jp/${PN}/73097/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:=
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )
-	test? ( sys-apps/ed )"
-
-src_configure() {
-	append-cflags -std=c99
-
-	sh ./configure \
-		--prefix="${EPREFIX}"/usr \
-		--exec-prefix="${EPREFIX}" \
-		$(use_enable nls) \
-		CC=$(tc-getCC) \
-		LINGUAS="$(plocale_get_locales | sed "s/en/en@quot en@boldquot/")" \
-		|| die
-}
diff --git a/app-shells/yash/yash-2.51.ebuild b/app-shells/yash/yash-2.51.ebuild
index 0b53c22ccf26..a71eb24ef614 100644
--- a/app-shells/yash/yash-2.51.ebuild
+++ b/app-shells/yash/yash-2.51.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/74064/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-shells/yash/yash-2.52.ebuild b/app-shells/yash/yash-2.52.ebuild
new file mode 100644
index 000000000000..d9439e440b70
--- /dev/null
+++ b/app-shells/yash/yash-2.52.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PLOCALES="en ja"
+
+inherit flag-o-matic plocale toolchain-funcs
+
+DESCRIPTION="Yash is a POSIX-compliant command line shell"
+HOMEPAGE="https://yash.osdn.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}/76153/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-libs/ncurses:=
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )
+	test? ( sys-apps/ed )"
+
+src_configure() {
+	append-cflags -std=c99
+
+	sh ./configure \
+		--prefix="${EPREFIX}"/usr \
+		--exec-prefix="${EPREFIX}" \
+		$(use_enable nls) \
+		CC=$(tc-getCC) \
+		LINGUAS="$(plocale_get_locales | sed "s/en/en@quot en@boldquot/")" \
+		|| die
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 96dabf895e23..2900a5213527 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 64991bd3daf3..4eea455035c2 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,5 +1,5 @@
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
 DIST build-docbook-catalog-2.1.tar.bz2 4731 BLAKE2B 38864866f03052386a0ba2fe832c750b851a5a0730df54fbac5253da682e92c0d865333c136d9c169a843e2a1ce291b2e5b5af657e7dba0dbf8d2fda213f6891 SHA512 8399652841f25feefa9ad3c138580f31da34410a44f2bdbdb4d63cb6efd1be445c7c4df6ed93629e53df4a4c6d988ed32a6a709f1abb059ccac0bc35b3b516a5
 EBUILD build-docbook-catalog-1.21.ebuild 1155 BLAKE2B d8b4c8b5da15b768d2035cd6be5ecd87b8464b06d6b1170dd95916f83e7bce3c7dda519d204beb82d001a693456984bc790e952dba24fb63f81b17e5595c1835 SHA512 c3d583f8a38c1992dc7afc750a797ad17d14700331d2717244ff46f86cc859c8b91c5d899b58388b389ab34e2db2fbbc599805b1815476d093d7430d349c597b
-EBUILD build-docbook-catalog-2.1.ebuild 1120 BLAKE2B c8e9e18687d7cd93e99e4587f7dcee1e9d7b48b05972d28f647d445ad1269f23a4c8d9b2b882dfcbdf1521583283c97c80b1c425bc14fe3e22008055c56edd1e SHA512 de0acf25ef5e5fc7266bdbf65098e8d83c9c455afc43e9f13f9bfc6e10023c05ad533e70f155667b7a12318a654ebb0919aeb99d8e9bca80921d1ac51d15bb6b
+EBUILD build-docbook-catalog-2.1.ebuild 1180 BLAKE2B 3b9962c4df00aade63ffd8280e95d641c549d776608f28cb4090cf8a987e875f7393a34045d11eb4551060545f2f9ef0d54dbd752dd930baaa92c1676c699873 SHA512 67b67fc302ea71d86e0b74653ae4be83adcfca4eb87c5752fc983ae47be78a712fb53c5833de562bf58bca637af0bf4bed1e1259f582039668610c81aa9117ba
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild
index d3143b3652b1..3deb1d96043e 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild
@@ -33,5 +33,7 @@ src_configure() {
 pkg_postinst() {
 	# New version -> regen files
 	# See bug #816303 for rationale behind die
+	# create directory if needed
+	mkdir -p "${EROOT}"/run/lock
 	build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
 }
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index 0a390640c038..64d66bc0799b 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -2,7 +2,7 @@ AUX coolreader-wxwidgets.patch 3660 BLAKE2B f7f736e0b9aedffe80f8327e0e0090439bdb
 DIST coolreader-3.2.57.tar.gz 13281238 BLAKE2B 8a6739f38d72b13af7b79160dee8cfc08bd9e54d3698fd44c7f6ad8bd575b1f389c2c349c1e2ef71a55fb0068e9d64b5baa4a0a8b945cdb873e833178d81cbbe SHA512 d5bf46f7dbf19177a54742d5c300002c8b7a504052bd003d2e1a7380ac3460dbe648d7f923d26e6390e9296ce6b090c947204725ab2a30c78f26893868a61161
 DIST coolreader-3.2.58.tar.gz 13454079 BLAKE2B e3b85ffbb3e4023a8c0567879a4a67d21141c1025b58f7d2c5017cab773e989e797229529440167a8c83db810f599566a77aaaab06b34081472f0e4b20293ec9 SHA512 d1d3e60bf5b73c20617937850912d7c452863bd5c91f0154be320ad256f774f368039896ad5e8acfc3cafa7361e8c11ca526accf0a14dabb79f059255989bac6
 DIST coolreader-3.2.59.tar.gz 13596218 BLAKE2B a59d11aff93166de77add5d230539068172a81968414b9c38b6ca25f08bd7830b81c0b800055a4eefbd6bb1be94298bf74d240f981c928bd4514073d943bb33d SHA512 72fc05814ca4f6da5310f7b47fd7939bc1567e5dd7e7e75bc29e2b1436dc4901498622a770e89323581c3f0b3b9ec305050ca5917eceba4df4a07cff3e1748d6
-EBUILD coolreader-3.2.57.ebuild 1838 BLAKE2B 4102bd201652798763151becd33544ead1797676999f2365fb73edd4164bc732dc1402ecfa7e682c51d4d51247485cbb0f929d00862bfdc59a8db8c47a65afbe SHA512 be37d6dcd3a81c8fddd4ed6cc23d210b1d718dff8a1a572c9046789eb50d961766755e1c064603bc59a9827c20bc876bcfe4cf34603058cc85c251e0f02769e7
-EBUILD coolreader-3.2.58.ebuild 1840 BLAKE2B 81e9fa93ea854a110e2e69fa34a91a520f86ac55e0f8da883c0ec6e390a50a5932c2fc9f0fea5d474e73a9eb4cfd6a92e03afc9307bef78ec9171ebb3eefd545 SHA512 cf24327f8e9cc384b26c4352b13cabfedf38dcb870a6f2915a39a1e639514c8cdcba8150f5e1ce3daa885208fab2491292fd2e393523e9e5bdd795841df0534b
-EBUILD coolreader-3.2.59-r1.ebuild 1930 BLAKE2B a79387e9aebb5cd755f3aa66ece91f9c80d81ad2683d445c0f688baac861018fc5519da0d8141549411a1dbf352c673849a69acaa7a8cfe822fe2f338d0b1c32 SHA512 07e3264cf3fef156b5ada758e0ec9027901caf229f7553a57d599a73edf820232cd18b4a5c02a5464681f23f7867bdd18c802e68fc53a2a85f130d1915814f16
+EBUILD coolreader-3.2.57-r1.ebuild 1840 BLAKE2B 408ea434056c1571d2b9a033390936f5fb4700417906cb7cdb3ea8100e9be5f8b3e027e629cfcf322a2789fe76b55cd27883f8006e056f483b9c4a72f2551685 SHA512 fe90b681538287500d04b53b778ba7cd309cbda5d4d3cf91ddb53b76392874b4d061bdbd10e58f56e4b5229fc8aa6a7c2da3001310289f8a0d47a6ac2895e298
+EBUILD coolreader-3.2.58-r1.ebuild 1842 BLAKE2B db8738996a1f3755cb2ffed9d05f4582a5e27eeedb5010ea5a516184d94b5343ca8bcfe398ae913869783d4f0eb2d5f4cd6f721554c1268a9d71efb30f6e6628 SHA512 b56f40a1f20feb6ccc88e521152625ba21a2569449509d3613fb647c17b1b510ff87c238f4f2d16c4ff29365a3e6f88d47b68baa208c24b0b802bb5ea9553eb0
+EBUILD coolreader-3.2.59-r2.ebuild 1932 BLAKE2B ec440bf43368ad140490a0c9a17976b803b4c1d32591a227450273327ddfb71db11371126e9c244254b3962fdde9ee67f9b92d6642cc96f7ca8bd44638bcaea9 SHA512 cca2e53dbcd9ba38df55c8a553cc86f8d49d944df67f16efa9c2ad56bb2abbf5a18b431498668d00d11e93d2f4b44848b7863ba35730bf64cfa7740e87476d26
 MISC metadata.xml 625 BLAKE2B 19c586a05d2469157d23709430c5929215eaab28ab25e124526c685fd0dd87c2ddbafa06968927cfbc74f29317c290296b000eb42443bb87f20e6d50615298d6 SHA512 755074e5507e33fb110368c6ce25055a449534c7458127500ac233955abcf167394eb265b5ad5b680c2cf06c57c479909870935e63ceabd91b4db583ecb95d8d
diff --git a/app-text/coolreader/coolreader-3.2.57-r1.ebuild b/app-text/coolreader/coolreader-3.2.57-r1.ebuild
new file mode 100644
index 000000000000..ee6aad129b3c
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.57-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake plocale wxwidgets xdg
+
+CR_PV=$(ver_rs 3 '-')
+SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-cr${CR_PV}"
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://github.com/buggins/coolreader/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="wxwidgets"
+
+CDEPEND="sys-libs/zlib
+	media-libs/libpng:0
+	virtual/jpeg:0
+	media-libs/freetype
+	dev-libs/fribidi
+	media-libs/fontconfig
+	media-libs/harfbuzz:=
+	dev-libs/libunibreak
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+BDEPEND="${CDEPEND}
+	!wxwidgets? ( dev-qt/linguist-tools:5 )"
+RDEPEND="${CDEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+src_prepare() {
+	cmake_src_prepare
+	xdg_src_prepare
+
+	# locales
+	plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_get_locales))|" \
+		-i "${S}"/cr3qt/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	if use wxwidgets; then
+		setup-wxwidgets
+		local mycmakeargs=(-D GUI=WX)
+	else
+		local mycmakeargs=(-D GUI=QT5)
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if ! use wxwidgets; then
+		mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed"
+		rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
+		gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
+		gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
+	fi
+}
diff --git a/app-text/coolreader/coolreader-3.2.57.ebuild b/app-text/coolreader/coolreader-3.2.57.ebuild
deleted file mode 100644
index 7e824ab85bc6..000000000000
--- a/app-text/coolreader/coolreader-3.2.57.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-PLOCALES="bg cs de es hu pl ru uk"
-inherit cmake plocale wxwidgets xdg
-
-CR_PV=$(ver_rs 3 '-')
-SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-cr${CR_PV}"
-
-DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
-HOMEPAGE="https://github.com/buggins/coolreader/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="wxwidgets"
-
-CDEPEND="sys-libs/zlib
-	media-libs/libpng:0
-	virtual/jpeg:0
-	media-libs/freetype
-	dev-libs/fribidi
-	media-libs/fontconfig
-	media-libs/harfbuzz
-	dev-libs/libunibreak
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
-BDEPEND="${CDEPEND}
-	!wxwidgets? ( dev-qt/linguist-tools:5 )"
-RDEPEND="${CDEPEND}
-	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
-
-src_prepare() {
-	cmake_src_prepare
-	xdg_src_prepare
-
-	# locales
-	plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
-	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_get_locales))|" \
-		-i "${S}"/cr3qt/CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	if use wxwidgets; then
-		setup-wxwidgets
-		local mycmakeargs=(-D GUI=WX)
-	else
-		local mycmakeargs=(-D GUI=QT5)
-	fi
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	if ! use wxwidgets; then
-		mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed"
-		rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
-		gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
-		gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
-	fi
-}
diff --git a/app-text/coolreader/coolreader-3.2.58-r1.ebuild b/app-text/coolreader/coolreader-3.2.58-r1.ebuild
new file mode 100644
index 000000000000..185afe5052b9
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.58-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake plocale wxwidgets xdg
+
+CR_PV=$(ver_rs 3 '-')
+SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-cr${CR_PV}"
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://github.com/buggins/coolreader/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wxwidgets"
+
+CDEPEND="sys-libs/zlib
+	media-libs/libpng:0
+	virtual/jpeg:0
+	media-libs/freetype
+	dev-libs/fribidi
+	media-libs/fontconfig
+	media-libs/harfbuzz:=
+	dev-libs/libunibreak
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+BDEPEND="${CDEPEND}
+	!wxwidgets? ( dev-qt/linguist-tools:5 )"
+RDEPEND="${CDEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+src_prepare() {
+	cmake_src_prepare
+	xdg_src_prepare
+
+	# locales
+	plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_get_locales))|" \
+		-i "${S}"/cr3qt/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	if use wxwidgets; then
+		setup-wxwidgets
+		local mycmakeargs=(-D GUI=WX)
+	else
+		local mycmakeargs=(-D GUI=QT5)
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if ! use wxwidgets; then
+		mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed"
+		rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
+		gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
+		gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
+	fi
+}
diff --git a/app-text/coolreader/coolreader-3.2.58.ebuild b/app-text/coolreader/coolreader-3.2.58.ebuild
deleted file mode 100644
index 32e43b6cdee3..000000000000
--- a/app-text/coolreader/coolreader-3.2.58.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-PLOCALES="bg cs de es hu pl ru uk"
-inherit cmake plocale wxwidgets xdg
-
-CR_PV=$(ver_rs 3 '-')
-SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-cr${CR_PV}"
-
-DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
-HOMEPAGE="https://github.com/buggins/coolreader/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wxwidgets"
-
-CDEPEND="sys-libs/zlib
-	media-libs/libpng:0
-	virtual/jpeg:0
-	media-libs/freetype
-	dev-libs/fribidi
-	media-libs/fontconfig
-	media-libs/harfbuzz
-	dev-libs/libunibreak
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
-BDEPEND="${CDEPEND}
-	!wxwidgets? ( dev-qt/linguist-tools:5 )"
-RDEPEND="${CDEPEND}
-	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
-
-src_prepare() {
-	cmake_src_prepare
-	xdg_src_prepare
-
-	# locales
-	plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
-	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_get_locales))|" \
-		-i "${S}"/cr3qt/CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	if use wxwidgets; then
-		setup-wxwidgets
-		local mycmakeargs=(-D GUI=WX)
-	else
-		local mycmakeargs=(-D GUI=QT5)
-	fi
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	if ! use wxwidgets; then
-		mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed"
-		rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
-		gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
-		gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
-	fi
-}
diff --git a/app-text/coolreader/coolreader-3.2.59-r1.ebuild b/app-text/coolreader/coolreader-3.2.59-r1.ebuild
deleted file mode 100644
index e8422f1bb4a3..000000000000
--- a/app-text/coolreader/coolreader-3.2.59-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-PLOCALES="bg cs de es hu pl ru uk"
-inherit cmake plocale wxwidgets xdg
-
-CR_PV=$(ver_rs 3 '-')
-SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-cr${CR_PV}"
-
-DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
-HOMEPAGE="https://github.com/buggins/coolreader/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wxwidgets"
-
-CDEPEND="sys-libs/zlib
-	app-arch/zstd
-	media-libs/libpng:0
-	virtual/jpeg:0
-	media-libs/freetype
-	dev-libs/fribidi
-	media-libs/fontconfig
-	media-libs/harfbuzz
-	dev-libs/libunibreak
-	dev-libs/libutf8proc
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
-BDEPEND="${CDEPEND}
-	!wxwidgets? ( dev-qt/linguist-tools:5 )"
-RDEPEND="${CDEPEND}
-	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
-
-PATCHES=( "${FILESDIR}"/${PN}-wxwidgets.patch )
-
-src_prepare() {
-	cmake_src_prepare
-	xdg_environment_reset
-
-	# locales
-	plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
-	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_get_locales))|" \
-		-i "${S}"/cr3qt/CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	if use wxwidgets; then
-		setup-wxwidgets
-		local mycmakeargs=(-DGUI=WX)
-	else
-		local mycmakeargs=(-DGUI=QT5)
-	fi
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	if ! use wxwidgets; then
-		mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed"
-		rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
-		gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
-		gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
-	fi
-}
diff --git a/app-text/coolreader/coolreader-3.2.59-r2.ebuild b/app-text/coolreader/coolreader-3.2.59-r2.ebuild
new file mode 100644
index 000000000000..187ca478a5be
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.59-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake plocale wxwidgets xdg
+
+CR_PV=$(ver_rs 3 '-')
+SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-cr${CR_PV}"
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://github.com/buggins/coolreader/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wxwidgets"
+
+CDEPEND="sys-libs/zlib
+	app-arch/zstd
+	media-libs/libpng:0
+	virtual/jpeg:0
+	media-libs/freetype
+	dev-libs/fribidi
+	media-libs/fontconfig
+	media-libs/harfbuzz:=
+	dev-libs/libunibreak
+	dev-libs/libutf8proc
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+BDEPEND="${CDEPEND}
+	!wxwidgets? ( dev-qt/linguist-tools:5 )"
+RDEPEND="${CDEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+PATCHES=( "${FILESDIR}"/${PN}-wxwidgets.patch )
+
+src_prepare() {
+	cmake_src_prepare
+	xdg_environment_reset
+
+	# locales
+	plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_get_locales))|" \
+		-i "${S}"/cr3qt/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	if use wxwidgets; then
+		setup-wxwidgets
+		local mycmakeargs=(-DGUI=WX)
+	else
+		local mycmakeargs=(-DGUI=QT5)
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if ! use wxwidgets; then
+		mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed"
+		rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
+		gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
+		gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
+	fi
+}
diff --git a/app-text/cssmin/Manifest b/app-text/cssmin/Manifest
new file mode 100644
index 000000000000..e6730b9de62a
--- /dev/null
+++ b/app-text/cssmin/Manifest
@@ -0,0 +1,3 @@
+DIST cssmin-0.2.0.tar.gz 3228 BLAKE2B 2322d7c38e334234b11292c24752549404ce8c70068c6c70a1c6e227a9f63a721a923dbb3006199df2e96fc5c0aba44349a6d8ce33791aff2dc1275e186b8961 SHA512 9422152578bf28cf7c3eb063c1f0dd3604a3d8fa73cd81cde09ae297ab27669126c230ef40a2e8c37083c1e781ab977554f9012e60979fe431ceb83d43452a9d
+EBUILD cssmin-0.2.0.ebuild 413 BLAKE2B fb12342ce54a089618aa0ec062b4b99389bb41574df1800b7fcd17aeca2002a8c66eaa98c820b041f4b90d172d7837789431a418ce40e40f94073d0a680b4368 SHA512 9d2a562761b7896acdab44fdb5ea14318affbc5333e60d24224f9a0e5a259fc33e4d019d26f34c269c9024ac667ea7b2c19872817a4098d055bbd661a5a3008a
+MISC metadata.xml 393 BLAKE2B 44094e942e960611713f2b2a7fb46659f57d936afb809eedc372f6d2172b1243c45400829d3ff573654f57b5ab83e1ce76375e9d1c6654c2f162c72949d209c1 SHA512 33d4fa57a51a33bd10074f071387a9eb436fb4c3d4302047fdc1d35fc59c21110060695492ff116badd14f2b5ea8692c60fd132a1ec9aa59390c1376b58aaf37
diff --git a/app-text/cssmin/cssmin-0.2.0.ebuild b/app-text/cssmin/cssmin-0.2.0.ebuild
new file mode 100644
index 000000000000..03344db2ee85
--- /dev/null
+++ b/app-text/cssmin/cssmin-0.2.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python port of the YUI CSS compression algorithm"
+HOMEPAGE="https://pypi.org/project/cssmin/ https://github.com/zacharyvoase/cssmin"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-text/cssmin/metadata.xml b/app-text/cssmin/metadata.xml
new file mode 100644
index 000000000000..48e52c4496a4
--- /dev/null
+++ b/app-text/cssmin/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">cssmin</remote-id>
+		<remote-id type="github">zacharyvoase/cssmin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/epstool/Manifest b/app-text/epstool/Manifest
index d08679ac879f..64b81caf7b43 100644
--- a/app-text/epstool/Manifest
+++ b/app-text/epstool/Manifest
@@ -1,5 +1,5 @@
 AUX epstool-3.09-no-gcc-linker.patch 763 BLAKE2B e106b30948a7fb12ecf76c58a80336a90ab29602c608a5c966cede91e5ff6034de69957719ff08c7b9942dda81c38459f95430c1c65dfce449774b2f023de6e0 SHA512 9d043a52524a0e15166c0437e11373724068ad1c468bf528eb39fb3d4a3a1e44973e554ec5b82d45fb2e8af8f5768294029fef91eda6b21cad51b3227e6a8a90
 AUX epstool-3.09-no-use-gnu.patch 951 BLAKE2B 22dd85e96cb2ceb4001c0713da541414ab158614352adadc6d523f67abd9fdd28089c8728e52d01659676ac3630c61fbfb467aa1b6a5f95be75aa84c60b058fe SHA512 adcaa0a1f35aaeae8e373147183665ee45db98170784070f7959bbd5e145169bd99ac21fc199a97e93fede6db9ac67eeead4367f434cbc0f46eff727a7d06aa6
 DIST epstool-3.09.tar.gz 191023 BLAKE2B becb264bf93bdb1244550e0707eb2d513d8c4b8d9eee09356bd2ddaf25bc8b97e0c5e73a02839a0f66f18bd1949cb549525967ec430104c33067d9ca57984a6f SHA512 cb9519be0879ff791f0e243a541538254e24949683aa792f673334d2d1dbd3e449ec36890ccbb3852563cf8da997a035a80df605b395a1b84cbced7522dce291
-EBUILD epstool-3.09.ebuild 887 BLAKE2B 034788c62daa7083120f6a829c2ba160953a8959ee62553573bce1ac5e257f1ffd5b0fc626391741796fd131138026f31102b39ce302a3397cc3f5b98af58e02 SHA512 62ec1172e8ed6dfb4a3aff5277486b8fe4d0869d834d13677fb4a5d3b653e3c580da9714aede11e9b2509dbe0445ce70b01e49dc50cbfd5a419f290e75ce41b7
+EBUILD epstool-3.09.ebuild 894 BLAKE2B 9685ad9cd736af615b0b47567dc971dc6147e97bef97bd5750254ecab0cce0cf3f628ecb42341d696d4c2a7716aab36f6273efa43a0388dc0a8c86234c916f30 SHA512 d471fe87ec07a1e146c3fa934102108bccff084ed3dad87ed4eef753a916626fbe7f0e1312135471c64efeed9898f5cc3cc42782a2a7b235c6e6a4ccc3e0eaf0
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/epstool/epstool-3.09.ebuild b/app-text/epstool/epstool-3.09.ebuild
index 285d5ecb3f1f..96cdb44c516c 100644
--- a/app-text/epstool/epstool-3.09.ebuild
+++ b/app-text/epstool/epstool-3.09.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,7 +11,7 @@ SRC_URI="http://www.ghostgum.com.au/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="app-text/ghostscript-gpl"
 RDEPEND="${DEPEND}"
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index b935f90eab56..565e4dbb3102 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -11,6 +11,6 @@ DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c08431883
 DIST ghostscript-gpl-9.54-patchset-01.tar.xz 2600 BLAKE2B e89f16f149ba3c46b1e81d774a3dca8345dfb60ec959249292cc0f3d8bc811ac169e232e3fb85de9d0ce65dd41453f90461798007b8b9fdd2c6e44d55e7a9d10 SHA512 0c49fbe6ece86b0c7729421cf06a6a210341fbe676efd89c0f97c96a426d3156e6a8ee596e050b8ee6a1af7a94ea8d1d54a6166f020a7d40fec95949cd7f3b12
 EBUILD ghostscript-gpl-9.52-r1.ebuild 5176 BLAKE2B db5d5ca4785c48ca75d55c980f9e1aae1132f3e68dd52e2443fe8bf0202b7c82367893167a8cc8a700c7ef12ff9d8743eb41732b8ba450b9fd9606a274210a36 SHA512 44a43ed682065164dafcfe7eb62918fb9906197569be216bfcc800d232d2ffc33702090844ad8b10f65492c60cb90a5b162560ad26b828973ca46ea85f993a8c
 EBUILD ghostscript-gpl-9.53.3-r5.ebuild 5297 BLAKE2B 2e113f1d62339e4f09612787a016bcb67fa12cb93e40480a536d621fe4530005dd5827cd6141bd9cbab739fdf5870522ff7082faef73ef3fa955c98b50e6603c SHA512 0ed8f0571efe2853937ec4fe79c6f875728721a1b66d29df5f2e99de329e54354243c148a64493d969ac64b82bf56ba4333fe43cc93f3f1e27dea9fe955ec33b
-EBUILD ghostscript-gpl-9.54.0-r1.ebuild 5289 BLAKE2B 0ec2dd40b3a8347214a4be30f3606de48de7dc1e9058d05510c874053b2ffb6a3059164cc9dd5c244ff717cd30d8260b2ea8a38ca85a8cf2772a69385cf6ae89 SHA512 e2d26a81f2741064fa4f3345b34c19c70b1ea12614f93bcba392df2b8bf68881db48c1d17695dfd58f7223d68649fe0c3a77305be30d53ded5c12d0f6e0f1d12
+EBUILD ghostscript-gpl-9.54.0-r1.ebuild 5288 BLAKE2B 1f194c1941407cef1131e3e43e4ed01cc0faf1f66c41c94ebd7e1cb40ca99b52e132200bf0dc667e4a6bb32382764b59954fc711d7c6955075db5b9cdd8c81ff SHA512 d73961f100f711592e9a59b52ec27a5cba04cb1c53e09dd009a1f623a179e8fc44dc14ba5ed1d64a6240478eb034ef1865d7b7ed49e9c846e9cd992ce0aff109
 EBUILD ghostscript-gpl-9.54.0.ebuild 5143 BLAKE2B d9f1444bc320b4c7747722ffafdf5b8d47edc9ec60abc682d0ce91c53d8ff3e047b51a06af5d3acf2d09603b775bce0a199c9647f3ba2a61b3a249891327b29e SHA512 a6a5623daad8e504a8afe6e18a1fc9783ce9eb6dc2b8504eaa161d4d51dfedda2a45c85802eb72519ddb47fa2278c104946fc66dd9feafd763fc999d54e90be6
 MISC metadata.xml 765 BLAKE2B dc8466ca08f1fa1891cc60e886bfdd4cccc517c4b355ba6d7697acdece16657982adbfbd4f5709b3850dfba1293ce269b17f9c05bb92f5e5531f3c7debd13613 SHA512 7f4dba7c256642b532cb7418507169a2554e0c4058011ff8dba802f93d677a824b8ae7896840369f06c801ca4a7d27fda86f8c6a344127f65f61ca6e3a02c0ee
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
index c5e6900b4f22..d112d0051958 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0/$(ver_cut 1-2)"
-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="cups dbus gtk +jpeg2k l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/kramdown-rfc2629/Manifest b/app-text/kramdown-rfc2629/Manifest
index 226133d436fa..2f88c7bab67b 100644
--- a/app-text/kramdown-rfc2629/Manifest
+++ b/app-text/kramdown-rfc2629/Manifest
@@ -1,5 +1,5 @@
 DIST kramdown-rfc2629-1.4.19.gem 47104 BLAKE2B a967987f34b0af0bff964488d640a8ca830e55b8a1955442896ed0bebf2cd4d9b902699e1347bd81d82a1b10e085ad2f2827968ff62e96cc4ea7f023f8336af1 SHA512 4843690fe10ae02d90a4dde9ade086308b8081155bd6fea1d83c38563cba1c2d447e337f658666fabb57ca9f85b5f4d5687db2503b0b28b5718b978b1db2714a
-DIST kramdown-rfc2629-1.5.6.gem 49152 BLAKE2B 8c358dafdd467d211a4402c33204a8bc95580ccc8d232fed04b3e950911a6b854b09f2c09e0f0a0d20893cd8189e7bb633e832eabd2f0b0006241063eadd3302 SHA512 4203c094ae61dc39ee64253352a842892a58f4b12df75ccd2534ee70e1dd00bf546ccb9c426c896836be7e0833db29ec725aa5a10a51fe587e3c83f627fd8a7d
+DIST kramdown-rfc2629-1.5.9.gem 49152 BLAKE2B 08250e69009d5f4ab1be51bb749d0e43d8b33c9142cbe4d0b63b7d3ca6e2d1e52631d31ac43477ad336607f6ed80232eb69db92835b584972e392327e7b86016 SHA512 b4644738ee2985cb0461ff13ac5575c8f8ad2eabb89cd68d8623f2fe5d164da7c80d665b7bfe4e74faea1a1a182aaecc30f572ff8ee56c9ff11c866879404cc5
 EBUILD kramdown-rfc2629-1.4.19.ebuild 615 BLAKE2B cefdf9146f455535b25cee3168dfd48770e2710200dcd6f7d1b5a65a73c653a76cb266f09fe952bf481f68f647ac1cd4794c67eae7a98bdcef4556cb0f342998 SHA512 92f772c80ccf2778c80542ee189f8f2528e85657bc4519fcbda10b3c9083fc4a55336d7a7d10e7fe4a211510d6d95099d0180e513e696ca50740e097bf5f0951
-EBUILD kramdown-rfc2629-1.5.6.ebuild 653 BLAKE2B 7bb06b55d72f27e09787ba115c14faaa3b2fbce1ecc0dfa7c1c0681cba6cf8eb3a895c98da9390b1923c29e98df7c4e9bcc5066833bb8253c409b7b71acd6f55 SHA512 0eec3f27b5a5c385a1bd70a0f71c9cd5a9fac465277cb854afd0b9f4d151ab8bedda7368e93f9083520ccc42170dec3aa04036656cdac74915146d5d698b0e1a
+EBUILD kramdown-rfc2629-1.5.9.ebuild 653 BLAKE2B 7bb06b55d72f27e09787ba115c14faaa3b2fbce1ecc0dfa7c1c0681cba6cf8eb3a895c98da9390b1923c29e98df7c4e9bcc5066833bb8253c409b7b71acd6f55 SHA512 0eec3f27b5a5c385a1bd70a0f71c9cd5a9fac465277cb854afd0b9f4d151ab8bedda7368e93f9083520ccc42170dec3aa04036656cdac74915146d5d698b0e1a
 MISC metadata.xml 247 BLAKE2B aa1ac899418ae6358314e4cbda5c7db1a4f1e7fd8587e101508aa77bfe6d127e1c7bc762c52a81810f22baf7cf6a3a3a22da3810beecdccc5307c42d028dbbcc SHA512 b93f40a4fe9148f409cb20b5db2233ef29cbd27ce7dfeac19e0f3d9cb6b81c6eb2fcb19ce31739eb83911298f089f0bec7e372b5581fc3c839174129f3ab36cc
diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.6.ebuild b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.9.ebuild
index 057efaabbd87..057efaabbd87 100644
--- a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.6.ebuild
+++ b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.9.ebuild
diff --git a/app-text/languagetool/Manifest b/app-text/languagetool/Manifest
index 5cdc34ba640e..3cdd7c643e73 100644
--- a/app-text/languagetool/Manifest
+++ b/app-text/languagetool/Manifest
@@ -1,7 +1,10 @@
 AUX languagetool.desktop 191 BLAKE2B 726e670645f78c3ea11c788a6440116753d66cf9886155ffa0f9cfad7deab000891276526aea17bae4977472c5d154837fb779de6abdb9cbe47148ce6ff96fe7 SHA512 d54542d4e742e83a7514857a11756f66966a9714f0f7b781aabd635b14cfa4f4d2b0fc1f98b2148af92e469fe877ffb61995c2abe5f59678174eae1d9c3dcbfe
+AUX languagetool.initd 473 BLAKE2B 74f55cfaf5b6c2e2fa166533c031408dc7e2e2b1882e6e09227af38e500f12481a551e8cec166620c73e671f00063cb63cc9dda500355110ff048d806dfa2d77 SHA512 fb9ab4fa28df1f43791995557fc4568ee79f7af7991481d295c28739c975c6648999676ea078ee852dc3dc9f49fbb9945c9dc571c385dd4db3d69ca5bf501623
 AUX logo.svg 2824 BLAKE2B 7653478b44ebd3dc80691849751745aba14a652d1ffaf52ef27910a52fae15b39c9ef0224795f698b1ac6f95a3e677ee46603b29261dff0d50d9eedba5e09de5 SHA512 501e3dee99f762556774f42829a9e450fc412271a7ade87f17ffb211929d24564ea3385b2bfc1c261e46d4b0b3562be62903b111ecd1c7dacb97c3c8ffb0d6d5
 DIST LanguageTool-4.5.zip 189327638 BLAKE2B b0ba0a67ee3de4ef6e452e6c47d5c03800f4e93acdaee03da37dca1a626e808bef91a167a62bd1fd7e732c86010523193d197083179cd40aa22de67bbbe5c4d5 SHA512 66bf6c99425d66ca8bc03b609f07d85f3989dbe73d7a93e81b6dc21d751fe05dd439d4753b51282d359a08ecdd92a18d9deab53d7b3a144c605d4429b2949eef
 DIST LanguageTool-4.6.zip 170185393 BLAKE2B 323b313933f7fd5c4ea4ab32d2b31c85495daac02ba1aba678482d9077f4f86331caa5d98546735ab1cee213276488ca00ad3181499bd09cbb26a9fffff5642f SHA512 eff159a1387a914447e3dcf1061efe445d2d939cbfcfa0a19e427cda58cbe5ca90db074dd1bb7e52c939ada3924cbe2e3c5392ac57a93a07922114dc354e849d
+DIST LanguageTool-5.4.zip 202761711 BLAKE2B b23c2944bf40dbef70d43391761849fb83b55538ac1cf0312c82079caef0a91f177f67c0e5818ea558c485d0bc2f4425f6cd32064095aede755a3b1233cf62d7 SHA512 08048f5bb8c5f7050ca2081a9f00405b0b397c37511a8297675f031bbb59e19863195e3b624dabb0964d436ad1570112e8c85225905ae22f2bde2a0200fcd883
 EBUILD languagetool-4.5.ebuild 1404 BLAKE2B 2b2717f6a7a5e934461f865e924bc97db50a02eebab44c0e3d6ab44c4342cd8844950e1592cd509ac6ca76ba8cd996efbf7096112167c1f551930fe5ec33bc36 SHA512 d438bcb7e1b9125793501fd923ab1703efd5d4532e6099a8887cd5a42d48d69ddd4fbbefafa192683e6cee3ae306534a8b6682e4b3df037902d745c93a9016f7
 EBUILD languagetool-4.6.ebuild 1665 BLAKE2B 62e05624a11e46aef1aa2e4e8b4b1f2ad2a743d3ee6843f5b6dcff449451518e50740acf7a6a579f414fb9ca919407a053d65b3be2bf03c3603d188f13fe31b2 SHA512 52b40e0af61da7098716c52e21343d069055bdef56ba25b2f631c90553204e73153780b89612971975ed76afce381b47c741f34396ae28e14ea0de3f02b7d0f7
+EBUILD languagetool-5.4.ebuild 1699 BLAKE2B 0cb39a453278852524a7e4495f2b16d5d157ca3074fe994d9a858308e3507c0a3221647fc82c9c2501141c5987cc9462cf2f5846d63c36fa1aff5499cf94dac1 SHA512 470199e51884c0294df159ec4a2399fd460bb27ba8eeec6ee7deff925ea80374c77e09953bc958ee75a58c090572d34168bca344f6d4984ea935992d435da246
 MISC metadata.xml 256 BLAKE2B a2cc41acd036354767d8637d65524b95dd6a79ae0126f7e6ba61abd53bf681cc4b7eb8f06c2842be9a634ef4b6820aa20bf7931debb508b2e819706665dd6eef SHA512 bd920ac1d3d1ac26afc3685652533d93bed59162ce9acab9f44cf4548f75ebcec2a1713f0f596a1d3e08a06a72fa27c56331a19321eeae5bce74e8a10a79ae70
diff --git a/app-text/languagetool/files/languagetool.initd b/app-text/languagetool/files/languagetool.initd
new file mode 100644
index 000000000000..30a72a91a932
--- /dev/null
+++ b/app-text/languagetool/files/languagetool.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	after modules
+}
+
+start() {
+	ebegin "Starting languagetool [server]"
+	start-stop-daemon --start --background --exec /bin/bash /usr/bin/languagetool-server \
+        --config "/etc/languagetool.cfg" --allow-origin "*" --port 8081
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping languagetool [server]"
+	start-stop-daemon --stop --exec /bin/bash /usr/bin/languagetool-server 
+	eend $?
+}
diff --git a/app-text/languagetool/languagetool-5.4.ebuild b/app-text/languagetool/languagetool-5.4.ebuild
new file mode 100644
index 000000000000..34da42ede96b
--- /dev/null
+++ b/app-text/languagetool/languagetool-5.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit java-pkg-2 desktop xdg-utils
+
+MY_PN=LanguageTool
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A proof-reading tool for many languages"
+HOMEPAGE="https://www.languagetool.org/"
+SRC_URI="https://www.languagetool.org/download/${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="
+	dev-java/commons-cli:1
+	dev-java/commons-collections:4
+	dev-java/commons-io:1
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/hamcrest-core:1.3
+	dev-java/jcommander:0
+	dev-java/jna:4
+	dev-java/slf4j-api:0
+"
+
+RDEPEND="
+	>=virtual/jre-1.8
+	${CP_DEPEND}"
+
+BDEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	rm libs/commons-{cli,collections4,io,logging}.jar || die
+	rm libs/{hamcrest-core,jcommander,junit,slf4j-api}.jar || die
+
+	# Loads of bundled stuff :(
+	#java-pkg-2_src_prepare
+}
+
+src_compile() { :; }
+
+src_install() {
+	java-pkg_dojar *.jar libs/*.jar
+
+	local DIR=/usr/share/${PN}/lib/language-modules
+	java-pkg_addcp "${EPREFIX}${DIR}"
+	insinto ${DIR}
+	doins -r org META-INF
+
+	java-pkg_dolauncher ${PN} --main org.${PN}.commandline.Main
+	java-pkg_dolauncher ${PN}-gui --main org.${PN}.gui.Main
+	java-pkg_dolauncher ${PN}-server --main org.${PN}.server.HTTPServer  --config /etc/languagetool.cfg
+	newicon -s scalable "${FILESDIR}"/logo.svg ${PN}.svg
+	domenu "${FILESDIR}"/${PN}.desktop
+	newinitd "${FILESDIR}/languagetool.initd" languagetool
+
+	dodoc CHANGES.md README.md
+
+	unset MY_DEPEND
+	java-pkg_gen-cp MY_DEPEND
+	java-pkg_register-dependency "${MY_DEPEND}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index 42219134a54e..5aa5312d9db5 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,3 +1,5 @@
 DIST master-pdf-editor-5.7.90-qt5.x86_64.tar.gz 15962243 BLAKE2B 4331a5d17ed9a0ff7a70c353907a4c0d5e99db447760f6103d412eabe0064b1e4ac59ca85bb0cab2bffc5867c8ccde96f68e7ceee227b7b319d93b70482f233d SHA512 823c7212cd3d469bb972e7da66e6eada31149c0bab2a6c577e537ca203862d0fe862e8c9b0cbb479eca0557da4b69a91a88ae0c9215d3b5f105288a9c6c1f2bf
+DIST master-pdf-editor-5.8.06-qt5.x86_64.tar.gz 15975595 BLAKE2B 627a4a1f551ffe13917f44768dc6b990d3582a5c2c7d6b7670c94fd880882dcec93c8ccca69240ecb568a7ab20d752180c2981870e5d5671d69c404a7b99c791 SHA512 dd079d11d570909faaf1129342d075550dca3095c5a76748f6f77e2e7df50ec4b46646c5edf40fd2d2f783baaa602fee292dd2fd54ac94fa723e3a40c454e7ad
 EBUILD master-pdf-editor-5.7.90.ebuild 1092 BLAKE2B 0d43d8511a262454d533e3961fc1f313de5e17638cab6178cc4357edfa750a80dde9e0e32c32a05c522dfb699738054ad2953fd489e754158558780c6fc697cf SHA512 8870aba2272c522a995fa2cda76530e0847e3ba06102599595e8dcc2d1209b0a2b6588876fd3292e938e9c69c8a5fa3561922a788149cccdea7ccece18901e56
+EBUILD master-pdf-editor-5.8.06.ebuild 1090 BLAKE2B d5330620c8deaf59887cc302acb5ada48cf24a09fd9b870737403e5ab756dbfe7b982af7edb4fbbe4cf92f721ac197c38114e0f298b67af4e8160c3a16a801db SHA512 cd989d52947cb890faf76a83c2707fc384c5e8f832b85ad1de434a286a14ae183b299e7b6df9aad5efcfe88bf41bd67e9c7b8c157f846493e63a54da15543069
 MISC metadata.xml 398 BLAKE2B 77ea4e0c5491a2722b46aed4e28ae0dc69dc59b68b44d527bde9b29647a3051b515a806729efe587ab80e08befe791871c043b4cde22755a69bcc73ac7d775a2 SHA512 8d84545bedebf1d841388e3c36c6f5e3bf696de1b008629c6ec367e5040e73a7a971bc8ea93a9ce1096471c01d0ed541deb3d9fe17d4c2ad37d598c614c88906
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.8.06.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.8.06.ebuild
new file mode 100644
index 000000000000..b6b616512c5b
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.8.06.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="https://code-industry.net/public/${P}-qt5.x86_64.tar.gz"
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="
+	dev-libs/nss
+	>=dev-qt/qtcore-5.12.9:5
+	>=dev-qt/qtgui-5.12.9:5
+	>=dev-qt/qtnetwork-5.12.9:5
+	>=dev-qt/qtprintsupport-5.12.9:5
+	>=dev-qt/qtsvg-5.12.9:5
+	>=media-gfx/sane-backends-1.0
+"
+
+QA_PREBUILT="opt/${PN}/masterpdfeditor5"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r fonts lang stamps templates masterpdfeditor5.png
+
+	exeinto /opt/${PN}
+	doexe masterpdfeditor5
+	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+
+	make_desktop_entry "masterpdfeditor5 %f" \
+		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index b879cad60b74..c25fb6446462 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,9 +1,6 @@
 AUX po4a-0.60-man.patch 577 BLAKE2B e2f9263b5c92b798224a1ae9ba9e3358bbf755f0573c34512151e7110517ecd7570b7946291de945f8f6557f6ff4b33c2d4f7900c4937ea284fe11e23f50c8a4 SHA512 5d88645d35234723f3b397953bf1aaaa8160fa591dd86430663f270ad10e4d5cceb7957774ce741bc0a46f37120473cb511eab88e78c0826717a4c5761d1c13a
-AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32a2a243995d9f26b0099e2194848a9a4d3b01dc24d4657cdc4470977838a96a1979495871dac5b8b SHA512 0d797b92c551eb75fa144e9b39d1aacc8acb00104a6d9e0dbdf4d00219b4c0c074637c953764e8cf1d67bdb1f3941fa0727da242b7761a96a8dafe66af224397
-DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
 DIST po4a-0.63.tar.gz 4067940 BLAKE2B 4cfa4163c21f5f8b783a5bdc29595f10cd172f7813de5617ed67a25bef547697084511a6f3897c47acb9158f15b3fcd97600bec7e23ba560cffe7cc646ce4c39 SHA512 556859b73728249795df22676a3cde1cbf575c608ad20f267fe7a6ee224d0262db2db19df8b7369ebf1ab568c017548ff118ae035608cca7a4d0963db8acd633
 DIST po4a-0.64.tar.gz 4121565 BLAKE2B a579aabb4245501be4ec7c319e8cef91db2e10883a09ef5a7eaf2d97aad64e8e59f25101c20286c955067fef2f58bc08c9865d5d608dd72913a38eaaff0ac542 SHA512 3d51aaa5894365087523b82e218819ba8a92d3cbc1b389648526f26fbbf37ccaa7ed6643bb388e5fa73a7a1abadee2b4ee2ebbcac14790c56567bf1a3e766fb0
-EBUILD po4a-0.57-r1.ebuild 1290 BLAKE2B df2dbc33e75186c1e578cc4ba02ae7df6aeee4e14139d8b9174791a747ae4064012df67b169f11ea5ca84f3b5d96abefd92faf39a0810a9b8e7dbe865bac4c3a SHA512 28847b243fb6a82d9650a1088db67d118ee53808231d2907ebe349e79e66f754a15747981d59faff82365363be613a42e8b5691a9a0118060c9df2e875b053b0
 EBUILD po4a-0.63-r1.ebuild 1379 BLAKE2B 69a7969a88f555ac4ea1b3a27cd99ca145f06c0accb67f6643374ddeea67e86590c54294de671350120bd6e7cca7af5ab57879baa147be1b1d0d138dfa98f7ee SHA512 d0d3afb9ddc10971ebef10faf3df5847a1a4c135311da11b504fdf4e0069073efaf86fd366680297edf46cd42f352d497c60da6e97665755f366d0345270bd8b
 EBUILD po4a-0.64.ebuild 1397 BLAKE2B 4aeba42b51780c8eae9fe0d594a286aa2febe52cd07cfe2b905742fe3aa44b7200f03fc242eb318a59142897a7b8a2badcfefe6d60eabf7fea04c994b583f32c SHA512 b6f5a4b8581599f3f2eb1d9ec36eba749be90c2c58e373cbb4030a56667c940d8430b836af329d6daa222c269b6076864461d85794e13f39770aff8ad8fa2e75
 MISC metadata.xml 327 BLAKE2B e4ac438b10bde7e247b0f098c104aa9956b264df04c81d10aff0f0a0ae45184a953443062f38bbc5fe0c7fd9a4e48219c5e0a76c5bb0b4fee9edf51e35ad50ec SHA512 934e9519050daf07edfee9e4a0041d808ea5eec4d414b738f1e2b909e821b83c8c7b39a15170041a9aba31df1c1a0b6323bd245507f7c9bea9556a332c6939ec
diff --git a/app-text/po4a/files/po4a-man.patch b/app-text/po4a/files/po4a-man.patch
deleted file mode 100644
index 6dd94aed153d..000000000000
--- a/app-text/po4a/files/po4a-man.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Po4aBuilder.pm
-+++ b/Po4aBuilder.pm
-@@ -233,7 +233,6 @@
-         }
-         $parser->parse_from_file ($file, $out);
- 
--        system("gzip -9 -f $out") and die;
-         unlink "$file" || die;
-     }
- 
-@@ -245,7 +244,6 @@
-         if ($file =~ m,(.*/man(.))/([^/]*)\.xml$,) {
-             my ($outdir, $section, $outfile) = ($1, $2, $3);
-             system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
--            system ("gzip -9 -f $outdir/$outfile.$section") and die;
-         }
-         unlink "$file" || die;
-     }
diff --git a/app-text/po4a/po4a-0.57-r1.ebuild b/app-text/po4a/po4a-0.57-r1.ebuild
deleted file mode 100644
index e05dec8567cb..000000000000
--- a/app-text/po4a/po4a-0.57-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sv uk vi zh_CN zh_HK"
-
-inherit perl-module plocale
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/opensp
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/SGMLSpm
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	dev-perl/Unicode-LineBreak
-	dev-perl/YAML-Tiny
-	sys-devel/gettext
-	dev-perl/Pod-Parser"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		virtual/latex-base
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
-
-PERL_RM_FILES=(
-	t/09-html.t
-)
-DIST_TEST="do"
-
-src_prepare() {
-	plocale_find_changes "${S}/po/bin" '' '.po'
-
-	rm_locale() {
-		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
-	}
-	plocale_for_each_disabled_locale rm_locale
-
-	perl-module_src_prepare
-}
diff --git a/app-text/vgrep/Manifest b/app-text/vgrep/Manifest
index 7d69e92ac7fe..ec7fb23d9e02 100644
--- a/app-text/vgrep/Manifest
+++ b/app-text/vgrep/Manifest
@@ -1,3 +1,5 @@
 DIST vgrep-2.5.1.tar.gz 1355092 BLAKE2B 82b9da137400ede07b3fc2472168139385df8ee639aa0ba34832d20e437ac3da5a86f89fcc9139faa0ca3a037a358a50947b982473d114056483aaf9cfdde52e SHA512 97561ac933fa8a716c9205910d088bf0bb852f2d68ea2226e27e30b5885aabd37223ec4368d72cd0ae5c72735e273004bd054a2b633e61ecb7fd854254cfaecd
+DIST vgrep-2.5.2.tar.gz 1571753 BLAKE2B c3378fa11e9bb88fb8d63a380722603efa0725e2d43b69aafbb6ff8788abab441f1fbd3d0c946c922c8100863c185623b41aa76a04e81aab302b26d68f5956d7 SHA512 dc63647b995a21e75d9658efd7e9bcc4c706221ac249d0273cf6997eef832ba4a27f825126fb3fb4c65d724c75e27d04e9b5505b0b65c9b9b0022a49580011a6
 EBUILD vgrep-2.5.1.ebuild 645 BLAKE2B 00198ae16ad677349172aa644376ec3057d6e813575c28558ece7aa39ffde63a383bfe69111ce9cf25465cb66f0dfd4b12b4ab1cf1c3bc0cec17626db3b52367 SHA512 42caca3b8423f3189005c74d6bb52aae5f86d62e4b98293887fc5bfce5af4e50c0e6764064006a8ba46ff61977f06b070dc414cebe2a1515a2269e49fb0e5d5e
+EBUILD vgrep-2.5.2.ebuild 646 BLAKE2B 4c20d640f0842e708fe2e75eef6bc467a940d78305b81fee64ca4ac97e06e309b88da0dd3ab83c91a82bbf07cbadc8b8617f1e4444268cd0a45cb8d3ab5ac73c SHA512 ebb564be732ce64e4ca68a8848ae6bb78a4f8f8d056ee682a961f076b44f671bc78793bbc1959b3d2d10a07c51e1c14e8dd22b7ef30863ec6349bf894d52d9e5
 MISC metadata.xml 395 BLAKE2B e88ecee1ff22ae904be1240a1fcc62b8c93adbcc1a50cdc5109dca17359d0d39f2c3468e844cb125870f244a1fd3c1eaa6332f91c6936c76911678d1872ba56a SHA512 adb30f2b4351a77f73c617b4bfce45dafec6f8c17ff4cb0b375598e05c92fda79a2f091553c68df383bbda5d9001e73f23607bc3ca07515fa389f1bb25392b2a
diff --git a/app-text/vgrep/vgrep-2.5.2.ebuild b/app-text/vgrep/vgrep-2.5.2.ebuild
new file mode 100644
index 000000000000..8946ea7fa45b
--- /dev/null
+++ b/app-text/vgrep/vgrep-2.5.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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"
+
+# golangci-lint is required to run tests which is not yet packaged
+RESTRICT="strip test"
+
+BDEPEND="dev-go/go-md2man"
+
+DOCS=( README.md )
+
+src_compile() {
+	emake build
+}
+
+src_install() {
+	emake PREFIX="${D}/usr" install
+	einstalldocs
+}
diff --git a/app-text/wscr/Manifest b/app-text/wscr/Manifest
index 1ef6b31d2aeb..cdd8ab5757c3 100644
--- a/app-text/wscr/Manifest
+++ b/app-text/wscr/Manifest
@@ -1,3 +1,3 @@
 DIST wscr-1.2.tar.gz 3502 BLAKE2B 4a6684dd6d9eb9c23caa92f9ddf62332f59b20eb4aba0f475015ddc7e66c592177b0d15ec25249fed86e2302a53463f59d608bd727d97bc33a42d903ecd04281 SHA512 8a26c7fb190f830f6436240fc00dcf61405b1818ff311999e02c64b3506fa6abf13a6f212dbb9b15794ecae4f122def563f9301eebdd7e8d09f22cd647467ee3
-EBUILD wscr-1.2-r2.ebuild 615 BLAKE2B 18ec7f574e279bd960b9609673ce34af861c6aa390f4a238f89f82a7ec56f0c297029142ac08e4a20dc9baf8a43eaf74a800b954c1369dd7bb242a118f7e36e7 SHA512 945b79643488740ce22f6e255a61b7618bcdeeb6c7f8bfa06f0c2b51f4a9fafb152de0376bf322ea6136ae8deef602369a93f2f6fc72208f5dd59d4a27c43190
+EBUILD wscr-1.2-r2.ebuild 629 BLAKE2B d81dbe88489e552e86ccf22f3be7fc4a6a88ccc1eafee89ce8dea5cc8aad08ff63180b3bba0dd8362b28c8c2e6f705cb21d2133ca57351fa936efc7bc7a98642 SHA512 ba8863831e91de0f5a4639e30c0b9b8cb93759dbf08e1280686561f575853321baf50df0556e817f4fad298a3abf9b5f437586836263f77f8f2ea769b43ee35e
 MISC metadata.xml 378 BLAKE2B c86120cb2e88344f068ad030af114d3f7d6cde4d8dcb6fb7ba4968553191c384c9923b5282e1a3964b85f6cdb551267af8f0375f1b1f5a208822f597c5b82d21 SHA512 eed68380e933d71cad150b6fc031e3854edd3640ee5e7bc3e426a67cfd6067ba54344cc86717436926f29c531696a86f5bd6c2910f555a299bbcd25e324e02de
diff --git a/app-text/wscr/wscr-1.2-r2.ebuild b/app-text/wscr/wscr-1.2-r2.ebuild
index b0d8920b953b..b035e8ba14fa 100644
--- a/app-text/wscr/wscr-1.2-r2.ebuild
+++ b/app-text/wscr/wscr-1.2-r2.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
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="A Lightweight and Fast Anagram Solver"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
 
diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest
index 63b4a5deabdb..d0d6951fb4d3 100644
--- a/app-text/xournalpp/Manifest
+++ b/app-text/xournalpp/Manifest
@@ -1,5 +1,5 @@
 AUX xournalpp-1.0.18-nostrip.patch 498 BLAKE2B 451eff71c86eff703d7b9dbee910c8938e10fe963d416c10fc0a5da04071672a26313d7c6fd887e960df3dc9b717a74d7b3974020ea6dfafefe2f06ec539cd6e SHA512 b883ba8094f46462c8415df10154fcbe2e773df981bc31fae5695a7d34de97bb984aa7b912cab3c9dcb121f10d52796c766f295d1d6a6ff424fa4d99a9f04e2e
 DIST xournalpp-1.0.20.tgz 14895705 BLAKE2B f1a4721f4f0b2f0e666c7466d7ddbd1f299172576d5f86b4ab8150d3bf05231cc7bb40e750394d892fe8ce32b6106e29456e3e9fa976b1bf07a808bf1bfff953 SHA512 c73783d5e40262b2c6f7f6be372839c73a19ab25fc258a7524660654526a3a35a6ba16ba282f793e7982ff97d006703c103fdd579fc16a3e636bf6daf94fe346
-EBUILD xournalpp-1.0.20.ebuild 912 BLAKE2B 0b563fe3d1501467c8deebafde7d79baae3e46dada7e574e2c78d08c3ac09ab22cf4512a24a75a4a2bb8ab2126be36cef2d8bcad403412cc40e87281bd61a9aa SHA512 1fce747a69e646b04c7937b3d7051dbfb20571a0f1c8f351edf59098deba2feeb7a286f8c656b8e5588d50ca7e3cdf91ea72eb3e988af0a7710c48668aa6c5a5
+EBUILD xournalpp-1.0.20.ebuild 919 BLAKE2B 7528a7ca321f0d96b1e6bf3577457aa71e079599674064dc0e9be296a39736399daeb03fce279f965f25366921245a386ff374fb52236a05a5bbea0c6d8476ed SHA512 93e304cfa2d0e63523eda840b7e65572bf7ec1263cbf02d60c8a5dbc91b6efd587f53921cba2705d138150480cebd53317efe0968f36046ab351d8223532a9d4
 EBUILD xournalpp-9999.ebuild 845 BLAKE2B 054a68301b4d46cf6dd3a7a768d113b1782775612a768181fb4c384e2ba16b6e1f21abbacf05bb3b7a6396d026164cd462273a7f05b3d24d4a5cab310229e54f SHA512 a2a7f9a71aeea60780b89cc0cf3a0ef0a62c3de72c6fa0f9a3863a4245069975ae230a14aac59940bcad919edb031d686bf0c7a3f2da444fc836eb911e510d26
 MISC metadata.xml 221 BLAKE2B 4b8e1435358aa300f6debd1760de3509ae9e0ae2678b4d55057c3940efa9b15d62881ac988725e58cce5d2cf63d1de6791cb0b98aa797eecbcdd29c85d8a682f SHA512 40bf10d939c1f6ba4a0594cff7f4a44c16660489226a9a23a6e9327a43dbf757b42a8be0bc8d82daa8818b90c1b4f8c3d093a6b9f36ca15dc36301cda2a308dc
diff --git a/app-text/xournalpp/xournalpp-1.0.20.ebuild b/app-text/xournalpp/xournalpp-1.0.20.ebuild
index 1feb81cd876a..24914b97a852 100644
--- a/app-text/xournalpp/xournalpp-1.0.20.ebuild
+++ b/app-text/xournalpp/xournalpp-1.0.20.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
 	unset SRC_URI
 else
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 ~ppc64"
 	SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz"
 fi
 
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 6aa7df01223f..9468fc2740c5 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -2,9 +2,11 @@ DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e
 DIST zathura-0.4.4.tar.gz 194105 BLAKE2B dc99005c6e967a46af0db0001193d1b1551e9adb78acc88343096407ed4a61b889be600acaf83b45bd603e3b7c4b93402f619e06e7146089d4990309d3301d5f SHA512 8d1e5969cc2f9502d7d966d3341c8f7437422f2dcf952bc2567a5061e611c6fe90c2bc6670963d81b608aa621d70f77ec513d6ab9f03304894bd9ac648aaa6e7
 DIST zathura-0.4.5.tar.gz 195275 BLAKE2B c50793fac6e473c7ccc4cccf15674dd8f33c504675e95501d05dc396dc4803f327e0144c72e6182671118ec1234cbd5a75ad8b6ea129bc7d471e683ff90ad392 SHA512 9ce6c7745d83d7e21fcbbc6a7c799a4223cf77afbe1c933b710c1c7920c98ae1edcf683ae42433f448a091eb317f2b71b3bde9d1b27c8089d1adbc9aa0ab4e78
 DIST zathura-0.4.7.tar.gz 199857 BLAKE2B c4fd99049ed81c7965cc474f0c543ebd1aef55ff63312c21a33ce9161afb78da1c9f0a13ff86d5d69b2ce6b17965632de282a9c8bd60b0a8297d96528b5f2c5f SHA512 adfe69cbef6088a6fa7d49686194a0a3dc13757535974476742c733076dc5bb5ad95ed447d50cd1efdfb23fe2fb1f64452d5d8aeb27a80c3101f2ab5c68f9b60
+DIST zathura-0.4.8.tar.gz 202264 BLAKE2B 70916ac23624b8e55b39bc2b9329fc5d992d3e2e3989b17bebf0f8b1bcb26ed943c15866c0b37e0a4a29fee7c264d6309bf1d036d770817e13a14a13af7499d7 SHA512 00d7b735154ff0e857f8a0a21c24b3fbbff8c166d93a34bee725072ee00f2870adecb956e9445334be2a84827778bd874cc1d4bda7f8b32e4468ea3784834b86
 EBUILD zathura-0.4.3.ebuild 1334 BLAKE2B b8887cbbf8b755c44d79bf4c517ea4c6669566b5576584cf5f6b20fd918ef53ca36ec8918608070548556978a776fa80873716c108e32be0e252f9acc350ea1b SHA512 c9a38f2029607e41eac29b14446028eb6969317360039add7b3d7d8fa9add0c3fbba40d900053db498c7d0e6e83af67f6aec774259a2bb7613f6901631b7bb39
 EBUILD zathura-0.4.4.ebuild 1347 BLAKE2B 48da5928fb897cb42e2d76dfe24b4d6b55aefd8fd336d41af466b00a01dd75d59566f0b1d9a57d982ed94d543f8862f8205979e2bb2c084b162c77219b9dbe2e SHA512 58a2e7db42b483c922412a74bd47e938355ce828b9aa172c1a2bfd4a10690892101641fada3ff080cbdd0ca9dc8e491768ac114ab36a7cb560061b830b393d2a
 EBUILD zathura-0.4.5.ebuild 1350 BLAKE2B 8f4d976a62b7ab8ec19e300a85742aa270c965ab2dcdcb3a43aa81b2db3faceaf7cee4a5dc41870edd96b6180487026f965743e4fcc2cdc2b0221be1e33241e9 SHA512 195dcff04cd249ab9860f0468e9df0f3470256d52a03bd37d982f1469ad6a6fdf2539bce2afa47996fe5316c7f173b851cb343d51e75545333236ad91dd4b281
 EBUILD zathura-0.4.7.ebuild 1358 BLAKE2B 7c35176562a0d79c560291b94511b40ac435a39595de2473327d4711caaa1ccee0f84d5a090e508496c9502d22770c2ea27cd153db2b6349f0ff011079eb6b91 SHA512 da770ed67844205850b17eaa8eb4091ce728717b44d868bc0987c33683b8e4892872b60ba79983ddecabf264c342c2f1eed8cd8057eb60895d70f39e79cc95ac
-EBUILD zathura-9999.ebuild 1354 BLAKE2B 348e576e02dcd442ad97f58a0f00998fe171f78865b7a15b4e232ed5fc1874d7bb1f55bb487ade91a638c98cbebdb4da269e4a246d84f593d79f92484b6dc7cc SHA512 69cb2554be7174a20857494068ca036c0dd2e1ed3e35f4a00c3e4d205359bc98b10f648ce99a1d3cfe89d92a0ed3092df461bb7c0e138066bab9f4a4c80bb0d1
+EBUILD zathura-0.4.8.ebuild 1358 BLAKE2B e7b0c718a45053c4221a28533fbee7cf6b782521aa27ef78677abaeab8478948a889a525e3afae27eacef51551c60c6b67960c4208813b0576a92b61803c5309 SHA512 df6e72ede3828f94b783f1bbd5caa7907b6be8c261f1f249474744d6cc199b4d472de23a59e0c35a07200928cd35e406a332f0f722f989c519a5d4a2695f7695
+EBUILD zathura-9999.ebuild 1358 BLAKE2B e7b0c718a45053c4221a28533fbee7cf6b782521aa27ef78677abaeab8478948a889a525e3afae27eacef51551c60c6b67960c4208813b0576a92b61803c5309 SHA512 df6e72ede3828f94b783f1bbd5caa7907b6be8c261f1f249474744d6cc199b4d472de23a59e0c35a07200928cd35e406a332f0f722f989c519a5d4a2695f7695
 MISC metadata.xml 769 BLAKE2B 417d92ddfcbc7c2352a79c4275022515fa0bf31b7c06058bb29452f7e15882b59ad3d2b92a2aa8063bb54120377e028449c0e253cd2aeab719a92e4853a3eea7 SHA512 9f7284f67e9bb6b454670393431546685ede815937bb06f7a73ebf25c9cbecca734a8e09753ffc803f8f44ce3a67002c59e31d98bce6185b4237e5d499e3165f
diff --git a/app-text/zathura/zathura-0.4.8.ebuild b/app-text/zathura/zathura-0.4.8.ebuild
new file mode 100644
index 000000000000..0de2aed7939f
--- /dev/null
+++ b/app-text/zathura/zathura-0.4.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx xdg
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc +magic seccomp sqlite synctex test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-libs/girara-0.3.6
+	>=dev-libs/glib-2.50:2
+	>=sys-devel/gettext-0.19.8
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	magic? ( sys-apps/file )
+	seccomp? ( sys-libs/libseccomp )
+	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
+	synctex? ( app-text/texlive-core )"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="doc? ( dev-python/sphinx )
+	test? ( dev-libs/appstream-glib
+		dev-libs/check )
+	virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		-Dconvert-icon=disabled
+		-Dmagic=$(usex magic enabled disabled)
+		-Dmanpages=$(usex doc enabled disabled)
+		-Dseccomp=$(usex seccomp enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsynctex=$(usex synctex enabled disabled)
+		)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 932897b2939e..0de2aed7939f 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit meson virtualx
+inherit meson virtualx xdg
 
 DESCRIPTION="A highly customizable and functional document viewer"
 HOMEPAGE="https://pwmt.org/projects/zathura/"
@@ -23,7 +23,7 @@ IUSE="doc +magic seccomp sqlite synctex test"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=dev-libs/girara-0.3.3
+DEPEND=">=dev-libs/girara-0.3.6
 	>=dev-libs/glib-2.50:2
 	>=sys-devel/gettext-0.19.8
 	x11-libs/cairo
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 15126bd12c5b..84b7a17e4731 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/command-t/Manifest b/app-vim/command-t/Manifest
index 6871bde2a7e0..8a70eddc202b 100644
--- a/app-vim/command-t/Manifest
+++ b/app-vim/command-t/Manifest
@@ -1,4 +1,3 @@
 DIST command-t-5.0.3.tar.gz 84019 BLAKE2B fec893aa698a1d1bfc86cf7bd08562f19b54e58d81b7650e50acdf17bfcec54f78aae38d05ca5f93ae60c981a6e606d5c68c008be3508c7d41e74aa9f064943a SHA512 588ee1516039e6cd45210de43307c02259fed29cc7610c222fe705cdf1d5938f51f823d41b546a36320da31db12e902363867da91b18fe56ea09c1efe2bb51fb
 EBUILD command-t-5.0.3-r1.ebuild 1231 BLAKE2B 9afdf59212b3d02bc2a898ed31f2acd619242badef9823c8dda2e0135bf4b65a509e22a4a4e03b650f78fb2fee304ee9e8dc341f543ac6b2d0d3581c83792331 SHA512 76fbed23a6e345342a236311051ebdcf3c2330a8b5dec7a8e34d43d9eed2ed3aab334f4b13c6dc03f45405a49c102925ed1d5067ab8068ece73ab36ae89f22a0
-EBUILD command-t-5.0.3.ebuild 1231 BLAKE2B d275f621c31913875f1e3fe8481c6753ca08765e26b2ca3a71018ba27d0c14d49368e2e29679a4c65b06fa9c850fe37cc57d4c3c68bb2393ee057e90e8334402 SHA512 6ae0e3aea757eba418ecccaeb362f0ea9e19d1ffd5b0ea3197f9b772ea747aaa97bfe5995720f068a2a4b7b27ae8d2d37b01f75b0f530217f708662633442a37
 MISC metadata.xml 332 BLAKE2B 2cb0014bbfdaad5ce956789dfe9da16946df23b6141576d766b45c1f2fec538b67528fa0b424310bf0b57ddb27a923ff1b8bd286288a4beaa7ace02a9f91278a SHA512 fe0ee1fca7681866403add9a498f9a46f3a33186fc3c3fe40d96234def8b46cf1f9b7b03cbce3944286725da600e4d8b7b73464ad458c222c16137d0490e4ea2
diff --git a/app-vim/command-t/command-t-5.0.3.ebuild b/app-vim/command-t/command-t-5.0.3.ebuild
deleted file mode 100644
index 0783b39f1266..000000000000
--- a/app-vim/command-t/command-t-5.0.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit vim-plugin ruby-ng
-
-DESCRIPTION="vim plugin: fast file navigation for vim"
-HOMEPAGE="https://vim.sourceforge.io/scripts/script.php?script_id=3025 https://github.com/wincent/command-t"
-SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="|| ( app-editors/vim[ruby] app-editors/gvim[ruby] )"
-
-all_ruby_prepare() {
-	find "${S}" -name .gitignore -delete || die
-}
-
-each_ruby_configure() {
-	cd ruby/${PN}/ext/${PN} || die
-	${RUBY} extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	cd ruby/${PN}/ext/${PN} || die
-	emake V=1
-	rm *.o *.c *.h *.log extconf.rb depend Makefile || die
-}
-
-each_ruby_install() {
-	local sitelibdir=$(ruby_rbconfig_value "sitelibdir")
-	insinto "${sitelibdir}"
-	doins -r ruby/${PN}/{ext,lib}/*
-}
-
-all_ruby_install() {
-	rm -r appstream bin fixtures data ruby/${PN}/{ext,lib,*.gemspec} spec vendor || die
-
-	vim-plugin_src_install
-
-	# make sure scripts are executable
-	chmod +x "${ED}"/usr/share/vim/vimfiles/ruby/${PN}/bin/* || die
-}
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index 81aa1b98e358..f9128cbb321d 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,10 +1,4 @@
-DIST gentoo-syntax-20210716.tar.bz2 18872 BLAKE2B faef2f356331c8560cb8e8014ad1a32a299f94fe8d05be499955cb78f1537f85abe44864b782df34244c3e606443b2146bd58a55047b23d327a548a436e818dc SHA512 f1a374fb5cf05563ea8cafa2209c9e8ba62bc072cac99202f486c3f7412cbb63432a33830e285ba706f8f73ee7f7bfd4e0b30bfad6feee1643e862b86495b82e
-DIST gentoo-syntax-20210828.tar.bz2 18872 BLAKE2B bd3e152718b921aef8ce93e2d3e66d6195ab01801ea60987f62f9cb541fb726c2d552b6ec341943c1ca0e0cc1419c1cb75266e653b8bc958c8103855688f3d54 SHA512 e148c42b3e3281780d4f23ff1e464ba3c8404b3a4ba566a1a685c8364b6dd174830b489d5c7b561c3e30375fd9f510cfbf56d92f81c3f8fec8ab792ab48aa62a
-DIST gentoo-syntax-20210901.tar.bz2 18876 BLAKE2B ef3913d8e631903003f469a8500c24f751ab70c17b1718cb9cd06b1e81b2dc7c07ed686b03be1da05afd5c238b8fddf67d35a63e7f381176be9340371cdc5dc9 SHA512 40c4f8522ce90bb529fd1cb050d1dd50010547006e385827980559a9febaa78f6d29b4798f6580a0c00de32db21a5528a051c2906d9dec95b62b992ea4875afe
 DIST gentoo-syntax-20210911.tar.bz2 18865 BLAKE2B 14dfe4b1eaab39a7de11c9b2e00c6a39385cd81d5717522dbac1f9ff265047c9ded745c335cca88413f6ad622f2858d996bdb39c5f4b1b4796ef7740c48c5f68 SHA512 b7ac7aba50c086e1e550692426bb38dbca5bf4770c148ff4989686ef043a2d990710bec782f1baba582ff67da3b3db007a4dbc6dec16f69830312205f1a45d3c
-EBUILD gentoo-syntax-20210716.ebuild 1237 BLAKE2B e4376fc40d3d7c829e253383c0744e4369d312657a539b5d82387128c50c2ae35431207171d9f9a312e7350485c7f2c417d07c665fa345b5193964489a1727f5 SHA512 e692cfa8d4e37e9bfa6bea96c7948e1230a6ebf7bdb7601980e3f918fdec8e69d7e7273e6979ea3ac36446c2c7040e79e09e42d185e8e915d00286cd6c693521
-EBUILD gentoo-syntax-20210828.ebuild 1245 BLAKE2B 4de7b82e15d0e8e0716fa3b419297d3ce15bbe12d7fc8007e231bc09cd3d9236af4c5d08e7c6dec0c1058150eec401c37a24d3b5bade0319947617db9d358bb6 SHA512 9a14cb1d43d22cde53c0f7c9598bfdbb2cd1f0417bc69b604823f595b6f1a59a95aeb47cd61a68707abe8412a2ca44d71a67a51c731d7e083b2f4cab299e6584
-EBUILD gentoo-syntax-20210901.ebuild 1245 BLAKE2B 4de7b82e15d0e8e0716fa3b419297d3ce15bbe12d7fc8007e231bc09cd3d9236af4c5d08e7c6dec0c1058150eec401c37a24d3b5bade0319947617db9d358bb6 SHA512 9a14cb1d43d22cde53c0f7c9598bfdbb2cd1f0417bc69b604823f595b6f1a59a95aeb47cd61a68707abe8412a2ca44d71a67a51c731d7e083b2f4cab299e6584
-EBUILD gentoo-syntax-20210911.ebuild 1245 BLAKE2B 4de7b82e15d0e8e0716fa3b419297d3ce15bbe12d7fc8007e231bc09cd3d9236af4c5d08e7c6dec0c1058150eec401c37a24d3b5bade0319947617db9d358bb6 SHA512 9a14cb1d43d22cde53c0f7c9598bfdbb2cd1f0417bc69b604823f595b6f1a59a95aeb47cd61a68707abe8412a2ca44d71a67a51c731d7e083b2f4cab299e6584
+EBUILD gentoo-syntax-20210911.ebuild 1237 BLAKE2B e4376fc40d3d7c829e253383c0744e4369d312657a539b5d82387128c50c2ae35431207171d9f9a312e7350485c7f2c417d07c665fa345b5193964489a1727f5 SHA512 e692cfa8d4e37e9bfa6bea96c7948e1230a6ebf7bdb7601980e3f918fdec8e69d7e7273e6979ea3ac36446c2c7040e79e09e42d185e8e915d00286cd6c693521
 EBUILD gentoo-syntax-99999999.ebuild 1084 BLAKE2B cbe1d6aa8eca271a997dec67ba8ba3725e3c50d97ff2f1f18c169bd3ea84ed568390ffef00742d20748dec2ec9b98468a119fc10b62bd55cd05e0506227e58cd SHA512 e59ceccbaaeb0947a66c079380269acd431d9694a20b851c13d5772a610306db1ddb04e8d8173ad5b84723077dae034a60ac7d53ba448ae00e816fdc03dc9f61
 MISC metadata.xml 586 BLAKE2B 9425e6a21617f806a0232c7f0ff75f148dc6855679236c9c2b88270db48161d3bffcb32066b372dc6af9cbac594f9d9dce6447d03fc675c151e75982f86ba598 SHA512 cb343dede228edd5c51dc2b2f6b8a1f09e4847365284218d5eb0c23c675f32fe4ab5025c6671f1dafbb63a87b83763a9caf97b04945329c32a1898123149d04b
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20210716.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20210716.ebuild
deleted file mode 100644
index 9a1891798a14..000000000000
--- a/app-vim/gentoo-syntax/gentoo-syntax-20210716.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
-
-LICENSE="vim"
-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="ignore-glep31"
-
-VIM_PLUGIN_HELPFILES="gentoo-syntax"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
-	default
-	if use ignore-glep31 ; then
-		for f in ftplugin/*.vim ; do
-			ebegin "Removing UTF-8 rules from ${f} ..."
-			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
-				|| die "waah! bad sed voodoo. need more goats."
-			eend $?
-		done
-	fi
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		if use ignore-glep31 1>/dev/null ; then
-			ewarn "You have chosen to disable the rules which ensure GLEP 31"
-			ewarn "compliance. When editing ebuilds, please make sure you get"
-			ewarn "the character set correct."
-		fi
-	fi
-}
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20210828.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20210828.ebuild
deleted file mode 100644
index 72f25ef766b6..000000000000
--- a/app-vim/gentoo-syntax/gentoo-syntax-20210828.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
-
-LICENSE="vim"
-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="ignore-glep31"
-
-VIM_PLUGIN_HELPFILES="gentoo-syntax"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
-	default
-	if use ignore-glep31 ; then
-		for f in ftplugin/*.vim ; do
-			ebegin "Removing UTF-8 rules from ${f} ..."
-			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
-				|| die "waah! bad sed voodoo. need more goats."
-			eend $?
-		done
-	fi
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		if use ignore-glep31 1>/dev/null ; then
-			ewarn "You have chosen to disable the rules which ensure GLEP 31"
-			ewarn "compliance. When editing ebuilds, please make sure you get"
-			ewarn "the character set correct."
-		fi
-	fi
-}
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20210901.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20210901.ebuild
deleted file mode 100644
index 72f25ef766b6..000000000000
--- a/app-vim/gentoo-syntax/gentoo-syntax-20210901.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
-
-LICENSE="vim"
-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="ignore-glep31"
-
-VIM_PLUGIN_HELPFILES="gentoo-syntax"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
-	default
-	if use ignore-glep31 ; then
-		for f in ftplugin/*.vim ; do
-			ebegin "Removing UTF-8 rules from ${f} ..."
-			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
-				|| die "waah! bad sed voodoo. need more goats."
-			eend $?
-		done
-	fi
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		if use ignore-glep31 1>/dev/null ; then
-			ewarn "You have chosen to disable the rules which ensure GLEP 31"
-			ewarn "compliance. When editing ebuilds, please make sure you get"
-			ewarn "the character set correct."
-		fi
-	fi
-}
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20210911.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20210911.ebuild
index 72f25ef766b6..9a1891798a14 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20210911.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20210911.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
 
 LICENSE="vim"
 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"
+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="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-vim/gnupg/Manifest b/app-vim/gnupg/Manifest
index 302ad71171e0..c9650559fadf 100644
--- a/app-vim/gnupg/Manifest
+++ b/app-vim/gnupg/Manifest
@@ -1,3 +1,5 @@
 DIST gnupg-2.6.tar.bz2 12074 BLAKE2B d06e4637627187e1d276c3b485e22b35f0cba78a491d34f0884da7ad320f12a3443e40a7c0e7e3f27be03984380eb966d593a283d768bb834a1fefed05656dd3 SHA512 1b7307954aad751006286edebb80767951b9bd9a8eff4c4a57fa6030cb442ceca12730a82c76a2181e1da19cc4cc8be21ccd4f8a21817aedf42785d8ff4b61ac
+DIST gnupg-2.7.1.zip 16131 BLAKE2B 82e29fd95adc5d6690409ec136086be2f0f358143de0bd6ad53c095d4cdcebe47f463f30cc5f494c441222380b5fac3291a9a6f7937f487ad28702ed3e175873 SHA512 07599e981e55d7eac7b06169e9ce30d33374b01680ad0317d5e4b51addce22b195dbd7a22a2adc381dfb89bd66aad9c377b43f36e6a5b32b7c577462b149e0a2
 EBUILD gnupg-2.6.ebuild 771 BLAKE2B f3767681669d829f63e517e3919e5921c8903f231dc7138470cab808c2d82ba7a5681ad8210d0cb279af7e33bda6ad227792a9d8c24ceaf1e9172ad6b1f227f5 SHA512 16533f194b0f5f78afaf278f4722317c71cace8db2982d6d759070b079ed72c73ebaaaa38d6654b272328c9b4281a02b1ffa100262e1c6aaff457896a67e06f2
+EBUILD gnupg-2.7.1.ebuild 886 BLAKE2B 12dc71ab4f0a09c9d9d254d539f20a63e4472eb110de492a46402b0d042ebb5ccf791618c6b2a4779ed9c23652d0efc5338e31d62111ae9fe8b9f79296c9deab SHA512 cd9614b5a4c497b4c0933f15e6ffd4ce3e836875a4426814abf1070c21f4455fd5f08feec9d8b0bd23bd0c800891adebe83b1296af3b53360957eb48f4104615
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/gnupg/gnupg-2.7.1.ebuild b/app-vim/gnupg/gnupg-2.7.1.ebuild
new file mode 100644
index 000000000000..af2368e71d4c
--- /dev/null
+++ b/app-vim/gnupg/gnupg-2.7.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+DESCRIPTION="transparent editing of gpg encrypted files"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3645"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=27359 -> ${P}.zip"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+
+S="${WORKDIR}/vim-${P}"
+
+RDEPEND="app-crypt/gnupg"
+
+BDEPEND="app-arch/unzip"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+
+	# There's good documentation included with the script, but it's not
+	# in a helpfile. Since there's rather too much information to include
+	# in a VIM_PLUGIN_HELPTEXT, we'll sed ourselves a help doc.
+	sed -e '/" Section: Plugin header.\+$/,9999d' -e 's/^" \?//' \
+		-e 's/\(Name:\s\+\)\([^.]\+\)\.vim/\1*\2.txt*/' \
+		plugin/${PN}.vim \
+		> doc/${PN}.txt || die
+}
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index a4f5a28cefca..219ee62c2ca3 100644
--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
diff --git a/app-xemacs/ada/Manifest b/app-xemacs/ada/Manifest
index e73bf948a3a4..d9e4f8d1f3c7 100644
--- a/app-xemacs/ada/Manifest
+++ b/app-xemacs/ada/Manifest
@@ -1,5 +1,3 @@
-DIST ada-1.14-pkg.tar.gz 55836 BLAKE2B d61de679848b2cda840ee24fc930495b3b16c664a63d8e5d960cc891c3b327417657b143b18052f33b530aa82971154737c66d71876ca872e7ec0973fdff0834 SHA512 9925cd30f9d67b72086114b1cc723ab131541f694eda77a6094a7d5b5d20b340ef9e285930e793b61c87bd8f732acc37a80ffe3fe0836ee01beca36b303bb1e3
 DIST ada-1.16-pkg.tar.gz 55782 BLAKE2B a5f7e7856a6fb990090fb8bd4295f58f4e8c2bb9b292e4922560c393189c6c8f92e075573aa2c3b2077b0f3c32dc077441cb3839312aba9e290a34991cdc0c0a SHA512 e6e461de26895ba3b3b3666d22af8fa5cec50cc9249dec6f79e433500a7b63f848c94943aeaa4c75ea2b305bf6e235ee62fb0e52fcdfd29410a51a803d8232d0
-EBUILD ada-1.14.ebuild 287 BLAKE2B cac5f393213de8f3fb1196d019d3d630b77ef0bfbc7ac2c4bb645e01dd3deb4e5999a52cb112922bdd132b2b1876e3361ca66fad4f91947d5993900adbea041c SHA512 dd85cc083d892c8a113376bc091b3ca47d0999137aa1e411105ee4d32ad1cd1072ab24aa42dd1108a3b2bf99bd1f634c3de5680ad092204e59702c675ef2684e
 EBUILD ada-1.16.ebuild 287 BLAKE2B cac5f393213de8f3fb1196d019d3d630b77ef0bfbc7ac2c4bb645e01dd3deb4e5999a52cb112922bdd132b2b1876e3361ca66fad4f91947d5993900adbea041c SHA512 dd85cc083d892c8a113376bc091b3ca47d0999137aa1e411105ee4d32ad1cd1072ab24aa42dd1108a3b2bf99bd1f634c3de5680ad092204e59702c675ef2684e
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/ada/ada-1.14.ebuild b/app-xemacs/ada/ada-1.14.ebuild
deleted file mode 100644
index c940f6a5b5d6..000000000000
--- a/app-xemacs/ada/ada-1.14.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Ada language support"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/apel/Manifest b/app-xemacs/apel/Manifest
index 9efdd97c44cc..54432fab72e1 100644
--- a/app-xemacs/apel/Manifest
+++ b/app-xemacs/apel/Manifest
@@ -1,7 +1,3 @@
-DIST apel-1.32-pkg.tar.gz 121589 BLAKE2B 177a29672eec4ee8b47235eebed5bce25c90431461e23f378c6dd3d3303abc6e2b9667dd845b80e27421d1007ee2e377395fd2b64b72fe4d1298ea689edd96d3 SHA512 5f0c18fcd05ef28766a0e5fe265cfbb5fd637fb393c10eee47475898617dfc54563e3e021a8b9cd54baca7b0a29168aeb451382c89c3ef0a3fe96f0682ba1d8b
-DIST apel-1.34-pkg.tar.gz 124989 BLAKE2B c8504878f8c0df2e41bfd81db76136f280f22309e339bdb119260acc6aed568b240db1b82bf506bf26034543df1134ff50874a233d0e959c34ba2df126c6e0e9 SHA512 29c42c0908499d4e78f1ba7197d2d0da57f1bea179dd870422b3ea8475c50a91cb5d0470b6b02d241b2af46b2ee4e05f7b3d836bb7315dbb58bf75751048da30
 DIST apel-1.36-pkg.tar.gz 124997 BLAKE2B 53e44f513d1e5d2513e2bf91a2585928d3150bc3509ce6d25475173c80273bf117fc19f003eb22b9cdc8e0fd9ad7faf368bc63736987a5e3b4baddfff0635500 SHA512 5fadf5892084eef5fb83c71340a927bdd70b031b9b6352c58ee567089c0d169bfa073cbf6409ed3fc46da262e540eee8c26611fd28a4cbbfcd943145936006bd
-EBUILD apel-1.32.ebuild 349 BLAKE2B 772c9ec226c38b84bbd05d3cacbf73f989a82378063909072cbc7a5774d070a216c280fb41571b33fd26ef21fb6989f61888257b370af4c5f40867c0f80b2fcc SHA512 28b84c6eedb4ba535984d640d0d8e102d86862bd2c813bbc51023c1a0245f3d99c7a319b6c68ef3dd068540d880671a75fb78eac2e39a7eb304d8006a383bd32
-EBUILD apel-1.34.ebuild 356 BLAKE2B d91996751bfa4d3d1a6cdadab7ca679be0c194d14d78a84aaf20adaa8375aa71a2d23a392e4a72233c4cf09e316946e94cc61963bf8b4e540b6c260cd494118c SHA512 6d6b18fd046bfce56bf61397070143ba233fec787b3e0cafff3184f1024d9be89dfc9d78af2abf6349a5fa0277d329d5e10418ebd3523ee1526cf6280e5bd677
 EBUILD apel-1.36.ebuild 355 BLAKE2B d9fa8dea666cf39c8749a4faf1096ef003e4472253695bd52e594f3fe64b2e528853a0617df4e51517b61ffae9bf08cf8d7ffe36652d11911c9b217d2e0ba1e8 SHA512 17973244748095e50a4c099b626792aac395b2aa2443d1517c0775452ce2154b02a6b73a58e63d213e6f59fb242e646ab4c830abf493a9e54b33fcd3114931a5
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/apel/apel-1.32.ebuild b/app-xemacs/apel/apel-1.32.ebuild
deleted file mode 100644
index 7a84064458b4..000000000000
--- a/app-xemacs/apel/apel-1.32.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="A Portable Emacs Library.  Used by XEmacs MIME support"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/fsf-compat
-app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/apel/apel-1.34.ebuild b/app-xemacs/apel/apel-1.34.ebuild
deleted file mode 100644
index b02cca6335a0..000000000000
--- a/app-xemacs/apel/apel-1.34.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="A Portable Emacs Library.  Used by XEmacs MIME support"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/fsf-compat
-app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/auctex/Manifest b/app-xemacs/auctex/Manifest
index b6e1d98d7762..c9439973c266 100644
--- a/app-xemacs/auctex/Manifest
+++ b/app-xemacs/auctex/Manifest
@@ -1,7 +1,3 @@
-DIST auctex-1.47-pkg.tar.gz 710901 BLAKE2B 438296d1b4fb038b3c2956cfe4f54432680c76298f81610094a0be2c9cf0efa181f7cdc6d7fa1766b66f9851aa73636da018eb282b7c24de70a11bf246a74956 SHA512 a5c06277decb8ce5f515ec09103702bff95eeba48b7d9df9ca6f8fbaab33bd9964d6296de5d5baae0f02e07fb434b48831ff9bc86f061f38eedb1b6c708f4e56
-DIST auctex-1.51-pkg.tar.gz 1002835 BLAKE2B 8f71cb30bb78108d59e5ba76dbf0763c781167d112e1c59b2869a16e033061f5414709e31642a39ca0180333a3dfb50c304436a61d73653ff8b9a7812812cdf4 SHA512 f6a3edcf2992c03e6e39ecfdf534589341a5331df712a534c39b70976eaf6f353271987282d1217fc8bae2daf7104273f5eb0134f95a5bdf2d2e0fab31a5675f
 DIST auctex-1.58-pkg.tar.gz 1364246 BLAKE2B f0b906d676b3f75f9878a3fb5b0fb64299ad50d5055a986e1e4d3bcef19eab73412b0b217e167a876420d8dab3fc5a764fe9deb103790d28d8cf9f364cbfa51c SHA512 2a41c1a03c428958d2a572172680541c966ba2257f2f5601b18a5a44c95df7d0363240dd2060ca7d415513d1ebd7259446d9eccdd94eeca3fa656eb1d8a46ac5
-EBUILD auctex-1.47.ebuild 290 BLAKE2B c540cc7275dbf0626326ddb8b079a099d5bda4f034dae23b4bed32e13d01f9bbf94365bc2f3e4257df663725b619e1093de09f50348cdb903f0416578bbaaf33 SHA512 fb83367c0ca8126ad7bee5e8a802fc24a7d016036971c8f5efb2bc9d12395069ec3700fc58b0ed42a008d1e4ebd7032e5b39864a0f9fc09b5af2d069fd980ae1
-EBUILD auctex-1.51.ebuild 373 BLAKE2B ccfc6ce088587aa04da1cdc78ef3c70af6b80f2393585a61512bff9d149cbf70d1999f2259fe329266b4471ef010f1cd4e81df81e4458b715368ed9ced40dcde SHA512 8e0bfef4e42c28a402e60f987d60e2fa801b56a04af064734c785e5d7864ecc78f2395d7f6577e89e8b0143bf47d35c36518c471b77c640e6405d638341106d4
 EBUILD auctex-1.58.ebuild 398 BLAKE2B dd0603a6f1bfd6f5614cfc7940e43d8609659c034388b72c4df8540cde24545b0cc7301c9d8f0a40281eb275b91b8233b1ace0d2a08319a0f0dba7b4eb351ce9 SHA512 f2c059e3d8644650e25586d76b075c3c2fa6a705539ac764020360fa28c900123b22004c4a7031a7356e8e5926861519e57046c05b1d0f4fbb8146d32778eac6
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/auctex/auctex-1.47.ebuild b/app-xemacs/auctex/auctex-1.47.ebuild
deleted file mode 100644
index bbf9ff73902b..000000000000
--- a/app-xemacs/auctex/auctex-1.47.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Basic TeX/LaTeX support"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/auctex/auctex-1.51.ebuild b/app-xemacs/auctex/auctex-1.51.ebuild
deleted file mode 100644
index 2401c948a724..000000000000
--- a/app-xemacs/auctex/auctex-1.51.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Basic TeX/LaTeX support"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/texinfo
-app-xemacs/fsf-compat
-app-xemacs/mail-lib
-app-xemacs/edit-utils
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/bbdb/Manifest b/app-xemacs/bbdb/Manifest
index f7ff4261c620..81158c8eafd1 100644
--- a/app-xemacs/bbdb/Manifest
+++ b/app-xemacs/bbdb/Manifest
@@ -1,7 +1,5 @@
-DIST bbdb-1.32-pkg.tar.gz 380002 BLAKE2B d4ba20cdcbb63cbe3aae65cf7c7dc69ef1dea7c888a841a697a77ca63bf6af58caab38efcda5993e6b029e8536cbe47312670498c0f0496dc2422138d8c8d6eb SHA512 238ab158f3a3606bfb753aa02aa6556170df61bfa523cada8570feb97d43cdee481264c2faef30eb2a9c6e345dc1e3f5fbdbe1e44272a2a57115733cc4e2e28c
 DIST bbdb-1.34-pkg.tar.gz 379894 BLAKE2B 5d6eba9c0594a4edc61d626245a0827f2886cf588de9c7fca9748af88cd3ac9740c9552f817f3f882129dbfa5daed9d5c7f00698aa14e63852daf2b81f5a1236 SHA512 2f92a7dca882083631bf0c4dcbad3e29cdd2920b48aebb19a6f83e21ccfefbd8534278579248d74f1f152613fa601af22f8d30236ed0fcae83c3e3eed0ccd4e3
 DIST bbdb-1.35-pkg.tar.gz 379950 BLAKE2B 6882b1ed92edc0f65ab272e8b4642bbdc0af72220b764ae0d5f13589f82d936b90040f7a8792794884fa73ea9cc49415d15a0883cd693610190fcfa06a2a8b6d SHA512 616c260cbd673fd71387a35eb266763a9558f7d0645d57d6aa0fe53b071e23166e7cb8e070876abf279af434583956c68544921f26e661348b7ee42905c872a1
-EBUILD bbdb-1.32.ebuild 589 BLAKE2B 4e3e2840f4ef88089c23c609be7b6ead4f854f5245f327ff0fd42b5554c47fd7576db82a3422930557e1266af0aef571d051a849d2d2c4c4151294aa7e8d302e SHA512 b3e1de88f094b16d1ec362edfd27b7b320d733b0588dfe7eddf01a013de5a82d2b280e37daa3091a95a8bf94b586c6094b4d19a472464ec0e1468064ab1794a2
 EBUILD bbdb-1.34.ebuild 589 BLAKE2B 4e3e2840f4ef88089c23c609be7b6ead4f854f5245f327ff0fd42b5554c47fd7576db82a3422930557e1266af0aef571d051a849d2d2c4c4151294aa7e8d302e SHA512 b3e1de88f094b16d1ec362edfd27b7b320d733b0588dfe7eddf01a013de5a82d2b280e37daa3091a95a8bf94b586c6094b4d19a472464ec0e1468064ab1794a2
 EBUILD bbdb-1.35.ebuild 622 BLAKE2B 9edad65c8ebfcd9c01431a40ab26a003a39cd8897dbd10f55ec6e2378b68ab5acd6ca39cd25dd39e69670ca4a92398ae63c85bfb86b8fcee450bdbce684382ea SHA512 ecc28050dfa71f980084642a5fa760e7cbb5005c67ff6218f55545320bcbf19f81716a4ad336121902281ae1e35ec6ed8c1952294202a9210ef4722701eeb46e
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/bbdb/bbdb-1.32.ebuild b/app-xemacs/bbdb/bbdb-1.32.ebuild
deleted file mode 100644
index 66642b99a103..000000000000
--- a/app-xemacs/bbdb/bbdb-1.32.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="The Big Brother Data Base"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/edit-utils
-app-xemacs/gnus
-app-xemacs/mh-e
-app-xemacs/rmail
-app-xemacs/supercite
-app-xemacs/vm
-app-xemacs/tm
-app-xemacs/apel
-app-xemacs/mail-lib
-app-xemacs/xemacs-base
-app-xemacs/w3
-app-xemacs/fsf-compat
-app-xemacs/xemacs-eterm
-app-xemacs/sh-script
-app-xemacs/net-utils
-app-xemacs/os-utils
-app-xemacs/ecrypto
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/build/Manifest b/app-xemacs/build/Manifest
index 23c8366c4ba9..c65b3515b9ac 100644
--- a/app-xemacs/build/Manifest
+++ b/app-xemacs/build/Manifest
@@ -1,7 +1,3 @@
-DIST build-1.14-pkg.tar.gz 49484 BLAKE2B 1d0072b9d7737a8d74a12ef0ce45909f212aeb58a4343522da0036f65be11955766756428fd7f6302c449cbb8936bfad70e69fc3b90ec90884de79b248753633 SHA512 bdda0904d8790df0adcaace0df038714f8175dea682af567daac8b0436436dd6e20d2f49f84deae5090f6d5013165de61b8ca50d81d5fea837b9f6013f9ba050
-DIST build-1.15-pkg.tar.gz 49849 BLAKE2B a41e3441a9e1734bfd5caf1b999644fe0ff36c5e9bcb12d03b551bbcee308c14a5378f45966ca5b460a52950e22b4e06c20b215e2b5ccd1d2caef3b8f1f36812 SHA512 bf72d2509250fbd93a512ce445a5a17f01ea47965a729dc3e9a4745093b3057158482674393fa10fd76574f1cad0a998d0ceb5cd37d959cee70a3d8f098e5640
 DIST build-1.18-pkg.tar.gz 50029 BLAKE2B a23fbd5f7d42c964673e0cf07559f5bcc5ad426001656c9d824f7390258cd1f40082b5674a30dedd4759cd49bde803d2074b67974b15be0cb38c030b9c397e57 SHA512 f4a189b65abd6a6373f0596d39ce061c4e1d371ae9bfee5daa70a60ee48cf99e9ed032bf9f70a4af90507239ee425c4dce7906f2dda98079da833b9b86a0cae7
-EBUILD build-1.14.ebuild 379 BLAKE2B 57484d13f6e06c8e92bcd0b740722b8ad0c9c8d3cdaf5aea863a259b2cc553cca7950197c6a78806afb35c9f5ce593150b01eb38ff47c614d069467f9f464756 SHA512 89a2f0ee4faca93156f07400f6b717cae7ffe245383617a004f9dca687340ee284a449da288e28f5d678a47babe4f728d6193427fc43cad2fc8cc71545062f71
-EBUILD build-1.15.ebuild 379 BLAKE2B 57484d13f6e06c8e92bcd0b740722b8ad0c9c8d3cdaf5aea863a259b2cc553cca7950197c6a78806afb35c9f5ce593150b01eb38ff47c614d069467f9f464756 SHA512 89a2f0ee4faca93156f07400f6b717cae7ffe245383617a004f9dca687340ee284a449da288e28f5d678a47babe4f728d6193427fc43cad2fc8cc71545062f71
 EBUILD build-1.18.ebuild 379 BLAKE2B 57484d13f6e06c8e92bcd0b740722b8ad0c9c8d3cdaf5aea863a259b2cc553cca7950197c6a78806afb35c9f5ce593150b01eb38ff47c614d069467f9f464756 SHA512 89a2f0ee4faca93156f07400f6b717cae7ffe245383617a004f9dca687340ee284a449da288e28f5d678a47babe4f728d6193427fc43cad2fc8cc71545062f71
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/build/build-1.14.ebuild b/app-xemacs/build/build-1.14.ebuild
deleted file mode 100644
index d00f8ad08b47..000000000000
--- a/app-xemacs/build/build-1.14.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Build XEmacs from within (UNIX, Windows)"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/pcl-cvs
-app-xemacs/dired
-app-xemacs/w3
-app-xemacs/prog-modes
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/build/build-1.15.ebuild b/app-xemacs/build/build-1.15.ebuild
deleted file mode 100644
index d00f8ad08b47..000000000000
--- a/app-xemacs/build/build-1.15.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Build XEmacs from within (UNIX, Windows)"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/pcl-cvs
-app-xemacs/dired
-app-xemacs/w3
-app-xemacs/prog-modes
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/c-support/Manifest b/app-xemacs/c-support/Manifest
index fee0c98f17b8..3291de98cafc 100644
--- a/app-xemacs/c-support/Manifest
+++ b/app-xemacs/c-support/Manifest
@@ -1,5 +1,3 @@
-DIST c-support-1.22-pkg.tar.gz 78027 BLAKE2B 6431841a5bde016211016723b633b6aa1c7c10e62f0a846d52b4b77053226392e4ed4170384144235ca48f5dde5d47312c34085069ef682bb0b199f7d926c289 SHA512 38ca69f114541a9886ac547701d3d2bae90707307e73ca9ef2b2867500c0ea1b16f9a1fe3bc69b039dafe9cfabafadab46c11d156873c3105c77026655ae00a4
 DIST c-support-1.24-pkg.tar.gz 77955 BLAKE2B 1e55fabfe0888fd84d416b3433e64ee45c597b38942048eca1d082afa1dc59ed3714c0be499e6b960c39c30dbd595fbe493167515f3a0968da74ada51650ab79 SHA512 dec220ef2b354da746b0552e37bada1b73f07f14b96996e2ad98cb089a105afbf95003f5d4f51a1ba09498d26fc9c65241835c2a40c19d1bd0c50ff9333216b9
-EBUILD c-support-1.22.ebuild 330 BLAKE2B 80bea72e65cc9cfebbb68e3fe5d75e13f6fef99dc3386797f4596446f4b798fdfa12f2931b707330b78429471869c92defc067f19365f0a148f8c47aa30df169 SHA512 b34a692932ce0cb697fcefb995242b9e68e2f2b705ebdee8a19c1b00c1c9d4c2c99bac74358e0c9ed1ebc5489b9cdfa115211ab953ea02f23a8eaf7b4f691cf7
 EBUILD c-support-1.24.ebuild 330 BLAKE2B 80bea72e65cc9cfebbb68e3fe5d75e13f6fef99dc3386797f4596446f4b798fdfa12f2931b707330b78429471869c92defc067f19365f0a148f8c47aa30df169 SHA512 b34a692932ce0cb697fcefb995242b9e68e2f2b705ebdee8a19c1b00c1c9d4c2c99bac74358e0c9ed1ebc5489b9cdfa115211ab953ea02f23a8eaf7b4f691cf7
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/c-support/c-support-1.22.ebuild b/app-xemacs/c-support/c-support-1.22.ebuild
deleted file mode 100644
index b880fa4ef5f5..000000000000
--- a/app-xemacs/c-support/c-support-1.22.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Basic single-file add-ons for editing C code"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/cc-mode
-app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/calc/Manifest b/app-xemacs/calc/Manifest
index 6b20eb886534..7b26febcb3a0 100644
--- a/app-xemacs/calc/Manifest
+++ b/app-xemacs/calc/Manifest
@@ -1,5 +1,3 @@
-DIST calc-1.26-pkg.tar.gz 1600637 BLAKE2B 5ded27390d06e9e5ade53e6b33ad9583233ebae64f2600e9cb3c8717bac7e372bad4e45c2fad45f15090bfaa7e661f98a84414e297765dae0578a58f06b49394 SHA512 f727675754980f448d9607fd45b561642104888042fae35f64e20130e0ee7c9dae8cb24b07d871281e3e995b97addf268e6d2db390d900f4826c85c89c30845b
 DIST calc-1.28-pkg.tar.gz 1607492 BLAKE2B 34204674fd925dae07e0eb13c8303c38947dbe2bc7e7117b8cda96cbf3d100cf2ef12f94420e50e5dbbc925aa2a35383ab444734756f94e4920988750d999bd0 SHA512 829577c6cd1029e07ba1b813755bcf6b19d14be5e75e4d10c8e8dfca4dd250b66c76ce4cb63965274e2ba3235488d42112c295791c5dbc4ffd26faa855e70d90
-EBUILD calc-1.26.ebuild 283 BLAKE2B 89fa0cc0546507917b3fcd32e947609497ace0281cab3b7e0b61bd06f306ef2ea76a1718ac65a3bdaf1713a02e4deee3eba2f4dbf7417ae0106ab1e0a42433c2 SHA512 cbd8c288322b02357cb41877f20509eaf0347f2d06c19ced8ba198286f3c44c6a1e4dd0c7f28f64f91c951ae8e6c289ba2037afa7a741778e37a01102d174e49
 EBUILD calc-1.28.ebuild 283 BLAKE2B 89fa0cc0546507917b3fcd32e947609497ace0281cab3b7e0b61bd06f306ef2ea76a1718ac65a3bdaf1713a02e4deee3eba2f4dbf7417ae0106ab1e0a42433c2 SHA512 cbd8c288322b02357cb41877f20509eaf0347f2d06c19ced8ba198286f3c44c6a1e4dd0c7f28f64f91c951ae8e6c289ba2037afa7a741778e37a01102d174e49
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/calc/calc-1.26.ebuild b/app-xemacs/calc/calc-1.26.ebuild
deleted file mode 100644
index 4d94e8a66b4b..000000000000
--- a/app-xemacs/calc/calc-1.26.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Emacs calculator"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/calendar/Manifest b/app-xemacs/calendar/Manifest
index ae730376a779..41b79ce945f5 100644
--- a/app-xemacs/calendar/Manifest
+++ b/app-xemacs/calendar/Manifest
@@ -1,7 +1,3 @@
-DIST calendar-1.32-pkg.tar.gz 410752 BLAKE2B 698ffcef148c6c84fbea7328da45d73bdf49601a94e3776b00ea7bae58223ef6ff1706ee8bf0e090e6aca16bcc6ed5c2037af2f9bb694ba03a840b20913afc19 SHA512 ca9a2dd135d012e094044f066939dafad0ef5f73f738b538c0f7aefc08c2e9efa0e1bcd3a3630681cfb90ec3b3319fd9b8594675ca2747627924d53d3fbe8ec1
-DIST calendar-1.38-pkg.tar.gz 411386 BLAKE2B be833c4f81a9d2e79e06768836fe1e58601c9b483f9febe127bd2c2bfe77259a3cd50630920e2df38de14234c1eece9c498b71073d967a06bf27258d91c9010c SHA512 d5158147df3fffcba550f4bdb34aba916b9071734c2e08b3bebb4c1969ac06b15b79337b4d2f50a53e057ff097fc63162849d5dc0983da4363e4e484357c571f
 DIST calendar-1.42-pkg.tar.gz 409513 BLAKE2B 81f59fa4743682beed93be1eadf211ef8f096720bc44ee47d80142ec037029942e2cb02166b15318dbba300eedaa551c1426fbf3e454c3de119f5c2e41a8d4d8 SHA512 75e0eeaab3c818d28d4b0da798c961108457d7b2ffb9c671589194473ff3d3f967e52b956601acd42d53ef584d72cac08d4de47a9aa3ea3720211bfde201c8f2
-EBUILD calendar-1.32.ebuild 293 BLAKE2B cc2c724cae6cb3df593ef3ebdee1d00378d38f3b504ead5c44363e4a9b9ebcced4d8ce05de7b66b662a0345f485632bd6acd5e63cfa7886561d7ae2d5ceabc80 SHA512 1ad28bdebd0a3a52cb118f327a57dddc50b9f6c3abc8966a0ce5b0ab76c40cf508a65cfaa590697802652685d8d05b8af9de55e03e549e8e72b37ffd800a385f
-EBUILD calendar-1.38.ebuild 293 BLAKE2B cc2c724cae6cb3df593ef3ebdee1d00378d38f3b504ead5c44363e4a9b9ebcced4d8ce05de7b66b662a0345f485632bd6acd5e63cfa7886561d7ae2d5ceabc80 SHA512 1ad28bdebd0a3a52cb118f327a57dddc50b9f6c3abc8966a0ce5b0ab76c40cf508a65cfaa590697802652685d8d05b8af9de55e03e549e8e72b37ffd800a385f
 EBUILD calendar-1.42.ebuild 315 BLAKE2B e00356182be5e2f4174c43173b4f72ed9d91822c7600dcd977c109602233719486cd5c21ecbd1d407a3185ab9dc6f46c081b468ba33ac1f7100f72944265b458 SHA512 a6e46eb0264d4d01463a53f43d484fb45554ce7f419588409c3694304c093677e34e83b8d069967a0683924ad23cad35755e07f5d0844d98f4761dc445a52ca1
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/calendar/calendar-1.32.ebuild b/app-xemacs/calendar/calendar-1.32.ebuild
deleted file mode 100644
index 28bfda824328..000000000000
--- a/app-xemacs/calendar/calendar-1.32.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Calendar and diary support"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/calendar/calendar-1.38.ebuild b/app-xemacs/calendar/calendar-1.38.ebuild
deleted file mode 100644
index 28bfda824328..000000000000
--- a/app-xemacs/calendar/calendar-1.38.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Calendar and diary support"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/cc-mode/Manifest b/app-xemacs/cc-mode/Manifest
index eadfb4ff7ca2..6089946a4f8a 100644
--- a/app-xemacs/cc-mode/Manifest
+++ b/app-xemacs/cc-mode/Manifest
@@ -1,5 +1,3 @@
-DIST cc-mode-1.45-pkg.tar.gz 524116 BLAKE2B ba250dd9f9fd97c7659768f23c215a31e1b0b9fc7e60824328048bf3624a88577586e3cb06bd9e12a667b30a6dd68d097d6c448a571498b6d88dc73afae65268 SHA512 1b584685e2d6878d29e07e0618ac1e3a8306be8e5f8e39f9ccecc9458d155967844a0544f87d9f25518d52f322dfc7433e5578f84e46423f14ffa8f901537d3c
 DIST cc-mode-1.99-pkg.tar.gz 815847 BLAKE2B d08ec17fb5c73b69cfd55de96a9cb65be48c3868f665187b5319fd4dbbe52112a8280c72ef5a565f4eb9529073c12a1351b8c76bdb30c26e9788c1f20361b239 SHA512 6e50b6bfcdfddac5e07b76e2fa8f5ece4db4279f1442a14ba6f7788ff187f4bed7d3b3c900c8403d9c0232768cc000f5ba63df87969d34fb6d35d6e5577fc835
-EBUILD cc-mode-1.45.ebuild 319 BLAKE2B bb6eafd1c21a50c67059777173d31ac980675a87ad8d9c2477c2d0c8dc4c9be1514ff351c600408c2bbf81a199b36b81b3ef3d48d3f9e37ee8e05e057fb8122b SHA512 02c228159d4f9653ceb59bf42888821aae1ed22b7d4dc45c4c30786c7502f06c129bf7c58f95a2f6d2f91d9a0dbf40b47fd81cd955034019d3b8ca1940da404b
 EBUILD cc-mode-1.99.ebuild 319 BLAKE2B bb6eafd1c21a50c67059777173d31ac980675a87ad8d9c2477c2d0c8dc4c9be1514ff351c600408c2bbf81a199b36b81b3ef3d48d3f9e37ee8e05e057fb8122b SHA512 02c228159d4f9653ceb59bf42888821aae1ed22b7d4dc45c4c30786c7502f06c129bf7c58f95a2f6d2f91d9a0dbf40b47fd81cd955034019d3b8ca1940da404b
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/cc-mode/cc-mode-1.45.ebuild b/app-xemacs/cc-mode/cc-mode-1.45.ebuild
deleted file mode 100644
index 04990e2c2d14..000000000000
--- a/app-xemacs/cc-mode/cc-mode-1.45.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="C, C++ and Java language support"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/mail-lib
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/cedet-common/Manifest b/app-xemacs/cedet-common/Manifest
index 95b1d08a212f..a0cd9b98ad03 100644
--- a/app-xemacs/cedet-common/Manifest
+++ b/app-xemacs/cedet-common/Manifest
@@ -1,5 +1,3 @@
-DIST cedet-common-1.01-pkg.tar.gz 73671 BLAKE2B ced597935ef483ee6d92a1245d255200a767b0663b7c90d0adefadecf5b42bc4734597cefcb35268ef6eda5bc1887ea7a9110fc894e72b6fcefd7ea8d1ddb2a7 SHA512 53ee8486ff02ff5dccfd9974b3f7bfc710befee95ad3db1bcfe5e67c5dcf740440f060770a080264f0b0f09013867ee7d66a83d7b3919c7e598ef3207340d9d8
 DIST cedet-common-1.03-pkg.tar.gz 73644 BLAKE2B 314d24fe951fcf7922a1e0c84dc96744d0b515a1ab27de4c23217b60936e746ac6ec78d6a526af8e1658d6c9b8494f77ea4dbb4135e5c3164e8f3a7f32bf36d8 SHA512 25263858e8cadb5bcc2e822021a0b7d76e61442d9de7670dc4f5b73c3cc752f36a43622ced8f4d9d9a594a2c5b9c6cfca052dfd3d60c639dc1854908cd6fbb0d
-EBUILD cedet-common-1.01.ebuild 332 BLAKE2B 09090d21d0941c05634260bcd028ba40c8fae7a4eba9055307619958f721b53e5b8c8a7771c21c0f62314568be54c94bf10a09a81c7a9f4cdd1ba9ae4a5f44a7 SHA512 01bf516a5d281835246b62050b8a9291d38a25ba4274c301b764b47fcac2990bdf7f443e6278f488d541c852a4054128dbf0ce85eb93999d195f61f4edba48d6
 EBUILD cedet-common-1.03.ebuild 331 BLAKE2B 014d6637d015324b9c18d0081b0f26bba73433b07a491169c80bbbefe032ca63c6ac56f88c71f617632bd007a148bb69b48d965dfa5d667d1d9da0e5a88b1b10 SHA512 7e5a3f0b0280cc45515c24558e882a4c5cddaff2e7036b82f2e08dd86543d1a30b01e230cf4703292a868548e30215dfc395050c26e11b9b4787b9e64a296d17
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/cedet-common/cedet-common-1.01.ebuild b/app-xemacs/cedet-common/cedet-common-1.01.ebuild
deleted file mode 100644
index 2f38c97c3b90..000000000000
--- a/app-xemacs/cedet-common/cedet-common-1.01.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Common files for CEDET development environment"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/edebug
-	app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/clearcase/Manifest b/app-xemacs/clearcase/Manifest
index 788f5df87541..7df7072f4a5b 100644
--- a/app-xemacs/clearcase/Manifest
+++ b/app-xemacs/clearcase/Manifest
@@ -1,5 +1,3 @@
-DIST clearcase-1.10-pkg.tar.gz 105865 BLAKE2B 42738b8614b4feae38fb45d4839219a523052bb330a78ca7f4c271b0163c89934c4e18b7329d970270880ae197a6ba1aec6e5713aebe073007cf079635ebfdd7 SHA512 a2e909efcc372e40f05af9a588eb8e6222c64947ca61460e137f516c43294120727527e98af72bbd9c4c3782d62cc9ff8fe06743d4dc498e0c12721f229d9a1a
 DIST clearcase-1.12-pkg.tar.gz 105934 BLAKE2B 313bb0079d2f8683cda9c68493f286adcb867e8feaa13134eec5b75b37d98778ea2a170685e359ec94b48f2be3832d0b15efbd26b2023b5b204592b9e78b479f SHA512 e5c284800ef5c42a367739fc71209acbc8d4a59a60851ac089693da1bf11458cda81f0cf46c05cb415337248dc9b448b82a230a5645ce414e54d61e197a3244b
-EBUILD clearcase-1.10.ebuild 381 BLAKE2B 7ac7d5cc6edf560723aea9368aec2e87cc2e298cf04f796f0acdb4a0633b71b0c005be1a136678b6bc76f7acc3707ce3d57619e79d47499fd057d90bced6c7a9 SHA512 b9385c61c41ae8d00c189d387a57bfe4ea8ce514c1db411cdd4eecb327a8385d9d53fc88bfff62ba6adb11d4dc4e295338e78d2dd846be3a24e4da1d5473e866
 EBUILD clearcase-1.12.ebuild 381 BLAKE2B 7ac7d5cc6edf560723aea9368aec2e87cc2e298cf04f796f0acdb4a0633b71b0c005be1a136678b6bc76f7acc3707ce3d57619e79d47499fd057d90bced6c7a9 SHA512 b9385c61c41ae8d00c189d387a57bfe4ea8ce514c1db411cdd4eecb327a8385d9d53fc88bfff62ba6adb11d4dc4e295338e78d2dd846be3a24e4da1d5473e866
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/clearcase/clearcase-1.10.ebuild b/app-xemacs/clearcase/clearcase-1.10.ebuild
deleted file mode 100644
index 64f49cad4f30..000000000000
--- a/app-xemacs/clearcase/clearcase-1.10.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="New Clearcase Version Control for XEmacs (UNIX, Windows)"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/dired
-app-xemacs/mail-lib
-app-xemacs/xemacs-base
-app-xemacs/sh-script
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/cookie/Manifest b/app-xemacs/cookie/Manifest
index 05044d3ade55..d288ca068ba4 100644
--- a/app-xemacs/cookie/Manifest
+++ b/app-xemacs/cookie/Manifest
@@ -1,5 +1,3 @@
-DIST cookie-1.15-pkg.tar.gz 35035 BLAKE2B 4cd1408781337b8f124a5106a0a1c5d0f47860c3300f5451a031ec0403e6434a13973d93906e6585318b757fbd670aa7dd7a239445f6882f2574f92e48bff66b SHA512 0fdbc6f1db7f0fceaa35aaf8ab148875f4b391a3a2accab41c02267ad385fff4e54538e5335b2acca3e2d2550a9b2b00e78ae1e0b1bb997617ab439db9c89ece
 DIST cookie-1.17-pkg.tar.gz 35032 BLAKE2B 9df6bc6fe8d3c14c62130aa87766b809700d10749a5f5127f8c378a6b2010f5f1dfcf174f2467fcda42acf120e076681e84559bb26c4d94337d2f0d0d7560764 SHA512 f6bacd78ee83ea78a91a16a77491ed763e46098a9a8b922aa6dca1150179272a6624563e802d0cdce09a317f2a70b6a4ddb07359e18d2d25726aa25b2d9c2d90
-EBUILD cookie-1.15.ebuild 295 BLAKE2B 78e8fc05711be09aad3f41c6037ecabb9ffa36f8364d7cbf2e8beabff58cbe363ae3dc772db4b1585708e96f113769a89ffc06fb40f989cf2c56f07629cc2e1d SHA512 dbb106ef24346b4847dc88f0275d06fdb1f98b23e33e7d816c1accb81bd1674013878025a856c0095ba4aef2465778eaa0c742a26ccd4fecbc96fc49d505ec33
 EBUILD cookie-1.17.ebuild 295 BLAKE2B 78e8fc05711be09aad3f41c6037ecabb9ffa36f8364d7cbf2e8beabff58cbe363ae3dc772db4b1585708e96f113769a89ffc06fb40f989cf2c56f07629cc2e1d SHA512 dbb106ef24346b4847dc88f0275d06fdb1f98b23e33e7d816c1accb81bd1674013878025a856c0095ba4aef2465778eaa0c742a26ccd4fecbc96fc49d505ec33
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/cookie/cookie-1.15.ebuild b/app-xemacs/cookie/cookie-1.15.ebuild
deleted file mode 100644
index 3ea71fefc0e5..000000000000
--- a/app-xemacs/cookie/cookie-1.15.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Spook and Yow (Zippy quotes)"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/crisp/Manifest b/app-xemacs/crisp/Manifest
index 5f4761e07cc4..0560050c3237 100644
--- a/app-xemacs/crisp/Manifest
+++ b/app-xemacs/crisp/Manifest
@@ -1,5 +1,3 @@
-DIST crisp-1.15-pkg.tar.gz 10436 BLAKE2B df57ef3f1eb7cc235f21bf40c8770cecf3ea139833cb1f27b3c25649721734fe88eb9af88a7da2e19cc98d869816087c52464e13dc254d6c1693e05089ed8083 SHA512 815d86bfc854e78c35fc8468f4e9aa3de05f9b029f4ec9e344880d398ae4b5a2bf8cc3391b0f6b8030090fcb4966dbc3871518410c99cd265c751b40c0e2b42f
 DIST crisp-1.17-pkg.tar.gz 10489 BLAKE2B 5929ef5e5d91a5516a4ab56e61106def470cbe0c3d0075b9bd4f030a1c9afdc1e8bd92b3c6620dafec51a43d8ece08889674acb421d63834825b01d8de24e33a SHA512 9cd9da5166e5651b719ff3d7f499e7b92311fe6bf6df072ccfafce85d6cdd54ad24295fdc1165304db79625f159db5078a2e5f51290f269a87db38493f7f4458
-EBUILD crisp-1.15.ebuild 254 BLAKE2B 834a4e5cbab8af3ff39ab58557a35bd42bb86c381e759ea093c4c2c590ad29fde031cc8722aec9f34539a9308c3903a7ccb320563900c1da2c383755ab5aeedd SHA512 d0ea62708337ba3576f810e48a0629376427b9d90a1d0e768121dfa10c71843395413c103bc4a07d6380b2ce4b2b816ea68f36f2d04b2ab27396cc0a924a590e
 EBUILD crisp-1.17.ebuild 254 BLAKE2B 834a4e5cbab8af3ff39ab58557a35bd42bb86c381e759ea093c4c2c590ad29fde031cc8722aec9f34539a9308c3903a7ccb320563900c1da2c383755ab5aeedd SHA512 d0ea62708337ba3576f810e48a0629376427b9d90a1d0e768121dfa10c71843395413c103bc4a07d6380b2ce4b2b816ea68f36f2d04b2ab27396cc0a924a590e
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/crisp/crisp-1.15.ebuild b/app-xemacs/crisp/crisp-1.15.ebuild
deleted file mode 100644
index c4c760441eb8..000000000000
--- a/app-xemacs/crisp/crisp-1.15.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Crisp/Brief emulation"
-XEMACS_PKG_CAT="standard"
-
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/debug/Manifest b/app-xemacs/debug/Manifest
index 8c6e49a8cc3a..d166fea790ae 100644
--- a/app-xemacs/debug/Manifest
+++ b/app-xemacs/debug/Manifest
@@ -1,7 +1,5 @@
-DIST debug-1.18-pkg.tar.gz 107997 BLAKE2B 06873ef6d3886c8b5e9659084bb3a50db955e27ab5104d0f29271ebcfa2e5c298c1bee59f46dac0d4d10f8c0dd89c4b0c99e23bef2c449da697d22641d15bb6f SHA512 0bbd5496636bf6b850d44f953865ca7c23bb5f5040be0d8f6ec385a590ffaa6d5e325b24aac7f07b0b6c8ba0abf3fc3b7214f06a09d20eabc6bdf940237106a1
 DIST debug-1.20-pkg.tar.gz 107953 BLAKE2B 90af70a49f6d62224248a73907dec986ba9671a99782aa84cdf9024426f192fca74781ced10f539da9c3115586cc1fe6ecfbe91fef536228d259280c251fb6f3 SHA512 3985447986f5129a8789d1f9058a662cef5dbbe0e9d565f00973e79a6d32139581fef777f0e6d683ad5338896cc679bea3ffaf18d51976a5a2e27ba5484cd9c9
 DIST debug-1.21-pkg.tar.gz 108036 BLAKE2B a713832c1ccb5c17d61b8ddd054db638537bbb8f9d82e59a7caaa623c2fdb1cacd7d6c585fc2ccb25948ed73a578720eae9508fc81b710e0949654891f0919f0 SHA512 91d2597c85ee207b1c28c433aacd856bbdb136d69c1979a6d84a567dcb1b1ac2b09fcc788a784252d4319d52d45788f3570c59fb248c99983144114b31fd7f17
-EBUILD debug-1.18.ebuild 311 BLAKE2B 9b803080436f34dbed89469ee4ccf1d317896a494909ec5f4d0eb3bebe3e26edf4564376bb5d4bb8e07d9a1020fcb29acaa39ae270c1bb427a0321d50d33e820 SHA512 f718e6ee7d3682ff92559c612a43d6a1d8b6fd113a7dce5eddfa89ed7684defd326b7676252066776022493c5665781a1e7cb200041d048cb3a0db2685a00284
 EBUILD debug-1.20.ebuild 310 BLAKE2B fee374e5762c46f193929372779e3fcfbd983e1f15d76e5c9f95fd8ee21a7feaed083bb59a591292b2375ee1c340eb8fbd9727e3dbb205ad5aa89073a31b54f7 SHA512 eea988f19ce44f282a2af6433587139459bc8fd52938e5c81f59b61e2c402fe8ec26ffc12c1429ae195f785c8f4bbb8877ddc80645e3b69eceef74d73a6ba71f
 EBUILD debug-1.21.ebuild 344 BLAKE2B bc590b24dde185205207ea1c3cdb6b247d239bfe4ddfaebf124916c8c501336756e11e77a14a739d3b1620f53e9c5fb690505df4bfb3eddaa6b7f431a52348e6 SHA512 59648f9290b32d503d5ea7fe6b490ab1f777f9ff90bffdfe61502f04189d9fe9f99f7bdabbfd5c47d40c941cd8a47fb054c170cb8016e40d62fca73fd993357b
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/debug/debug-1.18.ebuild b/app-xemacs/debug/debug-1.18.ebuild
deleted file mode 100644
index e66822956721..000000000000
--- a/app-xemacs/debug/debug-1.18.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="GUD, gdb, dbx debugging support"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/dictionary/Manifest b/app-xemacs/dictionary/Manifest
index 788bfd95bde7..7c8350c2d66c 100644
--- a/app-xemacs/dictionary/Manifest
+++ b/app-xemacs/dictionary/Manifest
@@ -1,5 +1,3 @@
-DIST dictionary-1.16-pkg.tar.gz 40085 BLAKE2B 413d5b82704eed5f96b99ffaedecdb149e8e562fa7e1a559cb396076d1ddae758fb634e00326f3f8682f7a1199905e3be7b0f271903f52faa532dbf31b8367fe SHA512 8dc0c0809d713f9eda280b110dbffa6f237c50ebb2e6c93f571efb3d22c1875ee5359fa91bc3faa58b3b0f431e75b84527262defb8aff5174a400be61f1a80dd
 DIST dictionary-1.18-pkg.tar.gz 40135 BLAKE2B 1fab7942a70e622613a5e126d2e48403d6b0d5594aca00e4cff9ac56db03aa2379a9742301a5a959e54ba8ca29780bd138d871577e31dc72805a6ccdabc4b44a SHA512 bdcdf63eb60dfe1a296b22b7493d842cbb3ae210dfc4cbcf7602fd00e7791736690961bb339293e1fdcee2bb527b87c003acd0dc640dce0c4dd5208c03fb1386
-EBUILD dictionary-1.16.ebuild 306 BLAKE2B 4deb58ace0e38527e7145bc35ccd06bb90517a65a1d8a408a9361e719b9f2c122dbd99e2a52578752170e8059c0cd2fa84ec97e74aa445171bf72a6fe65c5f5a SHA512 01718b404a4491d61d3e8902760088e1a8bed63477b786171e9dae2ee0523c43e4a06eef723d3661249fb364b01f83dddc59b046bf23f689a7f677fcd0d57209
 EBUILD dictionary-1.18.ebuild 306 BLAKE2B 4deb58ace0e38527e7145bc35ccd06bb90517a65a1d8a408a9361e719b9f2c122dbd99e2a52578752170e8059c0cd2fa84ec97e74aa445171bf72a6fe65c5f5a SHA512 01718b404a4491d61d3e8902760088e1a8bed63477b786171e9dae2ee0523c43e4a06eef723d3661249fb364b01f83dddc59b046bf23f689a7f677fcd0d57209
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/dictionary/dictionary-1.16.ebuild b/app-xemacs/dictionary/dictionary-1.16.ebuild
deleted file mode 100644
index 3db061687e14..000000000000
--- a/app-xemacs/dictionary/dictionary-1.16.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Interface to RFC2229 dictionary servers"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/dired/Manifest b/app-xemacs/dired/Manifest
index 98412459680d..32677c985fcc 100644
--- a/app-xemacs/dired/Manifest
+++ b/app-xemacs/dired/Manifest
@@ -1,9 +1,3 @@
-DIST dired-1.17-pkg.tar.gz 201027 BLAKE2B f5662499f2c374fe8fe8bbcf7b859e3d923576078b126012d5d2b9b8c4581df607df0e3a9b9244afe333652ce0c92051e939d029c74d168b7052fa11e7e9cbb8 SHA512 337e32734df33520d3bfb492f04c82430ca473da5d8f69ced98f7562260e40d1ff85739e905c05412d8ad8b0e175927e90304fb2c79b8670899173d8c0cc0472
-DIST dired-1.19-pkg.tar.gz 203355 BLAKE2B 9825024621fc488d8ba603bf430b5ab9457afecdf288b95bcafab5e04bbf0524b49d642371e82aa1cee9d551c70867ed93a721e6568598f0797a8e2d4ac800c3 SHA512 522d63a018f640cc1120dfe4bce8215649b745f8c692e0dd875f41b92ffb54cf22968983befb7a3e3dcede562c947aa92336c247522bd520b8fb5e53909f5d51
-DIST dired-1.20-pkg.tar.gz 203778 BLAKE2B 90fdcdfc6cc33e58745bf65eb226c52617cccc73a246bcc4e7bb5525cb625b40ca0cbfd2bef1a97e1b7176c21efa11a0c157103bed7a35417ba06af034b3db94 SHA512 889b922cc187689c67c3b6f98264780b4653fe2707730cfa9c32cf5e3d93a5c80c4599daabbe1273f25f32dfc4f487288cdcbc09b8d0ac8b58dc09efb18f689d
 DIST dired-1.22-pkg.tar.gz 203803 BLAKE2B 24a8980ecea5c3f1630f70cece6f84a25cf3949c04107a9dcd9fc045a0303f4664550f85c713653972cc135d81cb189d288249a2d00c9e00e043a68f6f2a11d5 SHA512 9a6e1e5cb4a219049386704b8cb45f533f0f1a300bfb1d9cdf13eca9b61cad64452306425b12acfc401b889570af1007b5fd0adcd6e71416718205321a9bb5e5
-EBUILD dired-1.17.ebuild 308 BLAKE2B a5fbc7abde8f059c5e1b7eefb17cfd6e43dd4bdd57bb8935edee8a2ee4d281c46d25c4cb6afc32a745f427a30ed0731ce68a0037f59b624e3c443192b81dbdae SHA512 e3ccb2a14c4ad3e32dc286fc33d99f2fb1a85f3ba219a10c35107636697cf4add7aecb20b910903935c485ff7b4903f27531290e52b3ca27496d849c60ae512e
-EBUILD dired-1.19.ebuild 316 BLAKE2B 92244d2f28d006695cab4528a4b683baf80832aa6bdee43a3328702302f36ca4b9afc91edd79243faabae57a54089116410abf23662ea40511e7f1fff68a3061 SHA512 44a64f869617cb770abd7a9dc6bb1b6edd878abb896932282ab2234f78a51b7ab10aff5e9f43984bd47d75ba38b632fcaf2101b8eb85165c616a7f2ba396eab7
-EBUILD dired-1.20.ebuild 308 BLAKE2B a5fbc7abde8f059c5e1b7eefb17cfd6e43dd4bdd57bb8935edee8a2ee4d281c46d25c4cb6afc32a745f427a30ed0731ce68a0037f59b624e3c443192b81dbdae SHA512 e3ccb2a14c4ad3e32dc286fc33d99f2fb1a85f3ba219a10c35107636697cf4add7aecb20b910903935c485ff7b4903f27531290e52b3ca27496d849c60ae512e
 EBUILD dired-1.22.ebuild 308 BLAKE2B a5fbc7abde8f059c5e1b7eefb17cfd6e43dd4bdd57bb8935edee8a2ee4d281c46d25c4cb6afc32a745f427a30ed0731ce68a0037f59b624e3c443192b81dbdae SHA512 e3ccb2a14c4ad3e32dc286fc33d99f2fb1a85f3ba219a10c35107636697cf4add7aecb20b910903935c485ff7b4903f27531290e52b3ca27496d849c60ae512e
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/dired/dired-1.17.ebuild b/app-xemacs/dired/dired-1.17.ebuild
deleted file mode 100644
index 773ffd7cf2e3..000000000000
--- a/app-xemacs/dired/dired-1.17.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Manage file systems"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/prog-modes
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/dired/dired-1.19.ebuild b/app-xemacs/dired/dired-1.19.ebuild
deleted file mode 100644
index eff4c39aac6f..000000000000
--- a/app-xemacs/dired/dired-1.19.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Manage file systems"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/prog-modes
-"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/dired/dired-1.20.ebuild b/app-xemacs/dired/dired-1.20.ebuild
deleted file mode 100644
index 773ffd7cf2e3..000000000000
--- a/app-xemacs/dired/dired-1.20.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Manage file systems"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/prog-modes
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/docbookide/Manifest b/app-xemacs/docbookide/Manifest
index f402f06b57b1..491ff7c39e17 100644
--- a/app-xemacs/docbookide/Manifest
+++ b/app-xemacs/docbookide/Manifest
@@ -1,5 +1,3 @@
-DIST docbookide-0.08-pkg.tar.gz 32061 BLAKE2B 051331b77ed2d68feaadd163134b7c39e1c57e87b3ff925ba2c2c353d470f94f575c4977ee18e84acf9e84de5440ebf32a31f507d99b110dbc1bf271069d1164 SHA512 a5de9193285bf185ab808c9aef3f483f81493a0f30327a923ed898700a5a7dcc489e4b6f9fc7767cadae481b62faa5f18e956955575543a037aba1a4059a42b0
 DIST docbookide-0.10-pkg.tar.gz 32361 BLAKE2B 88aa1d4cc69d632fa11f856a49b30e94decbe2b96c53312963b2b40fc965f45e40b0f3b550442ee51d90845d19eabb62aa47fa4b94a530498aa8470dc9deb9df SHA512 831bee6d1214b027ae4b6c95c5166af63181966d42487881986f8b66db125cc54d34770c2a1cfece630257645380a3f926f2d197f20f4c32c6d42fdf56081f88
-EBUILD docbookide-0.08.ebuild 335 BLAKE2B 9b78c082f1f8d251091ad1a089fbe3f4b1976d081743ba5dfac8d525ac7908f85681377010becc5cebbe47916cc0eaac91b9c91c111ae09c89b6b5ae79f93c47 SHA512 ce76480228f84343b6805af2671529abc6b692a6dca8bdb08d11404d277648d4e62c100442c387886280e466c5f02cbedb8fbd6d921050a83381881aad5877bb
 EBUILD docbookide-0.10.ebuild 335 BLAKE2B 9b78c082f1f8d251091ad1a089fbe3f4b1976d081743ba5dfac8d525ac7908f85681377010becc5cebbe47916cc0eaac91b9c91c111ae09c89b6b5ae79f93c47 SHA512 ce76480228f84343b6805af2671529abc6b692a6dca8bdb08d11404d277648d4e62c100442c387886280e466c5f02cbedb8fbd6d921050a83381881aad5877bb
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/docbookide/docbookide-0.08.ebuild b/app-xemacs/docbookide/docbookide-0.08.ebuild
deleted file mode 100644
index de47982b3d22..000000000000
--- a/app-xemacs/docbookide/docbookide-0.08.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="DocBook editing support"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/xemacs-ispell
-app-xemacs/mail-lib
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/easypg/Manifest b/app-xemacs/easypg/Manifest
index 78fee3d2b726..2e51c0e6c182 100644
--- a/app-xemacs/easypg/Manifest
+++ b/app-xemacs/easypg/Manifest
@@ -1,7 +1,3 @@
-DIST easypg-1.02-pkg.tar.gz 73462 BLAKE2B 050b064cf3b7618defbaf893babb5406f6715cb292aed99d9f54ae4e31a26f89a032a90aff0ffa313c7dd12d07e894ebc302fd311e5e5f3e7c49630285ff5fdf SHA512 ec73fbdec50a01788ca586212d4b71e2c744e3283117515a71f73c3bda82b26d86ef9be52c4f78efeb574635e0b84a87b763f09bb1ced956699d1d97fb294aee
-DIST easypg-1.03-pkg.tar.gz 78192 BLAKE2B 5369dbf4f5da0c25c9a2e451dd775a0dc4e6bb5fe077e35b98f655cd23174ec5fc3bcf5df397ad0e9fc5b5728b919da666e91397f0cf13c3a0d9788c580275af SHA512 62541d38a09bcd60232cd18c54ded710515a88c2aa7940d823f120fef1c5316afca746723fb7ac564fad7407365daa736d96afc9d228d74b5d9ff19c4121b506
 DIST easypg-1.05-pkg.tar.gz 78239 BLAKE2B 9ffa9b61b4089111d36119d0a011fbaf4b26c5715c383c65600499ca1d06f7f0030ee6d1fd4c746239757745058032aaad562bdeb5ac2ee0a8997ca4167e0f31 SHA512 be7f6770a6f343375ddc9aa54025985382ca41a598c935bceee6055d0bbddb7780f820e4124a5b634cb2c61585c6bcc4b9e3859a62a57f55538bc17c76a6e4ee
-EBUILD easypg-1.02.ebuild 308 BLAKE2B 37bc16f8b21c0c835269baccb6cf9b705111a27b5fd06c8b3133e34ca0351fee642df8001f619fd9370d1377afec87d86fdd50a4d91f7d4ab32bfbf6e5a32047 SHA512 a3cb0980b83c149a7abb9953e6c79cb815ba0d24e1a6e30183f30f7ed9a0d710e0a60daed9ce682acb3995c0f7cbdf6492abccc6c074dc624d259ccd2e41979d
-EBUILD easypg-1.03-r1.ebuild 331 BLAKE2B c508deba2e2d51da7a281fbf861fe68f6eadadd727ae0d4292418496a41c9ea97f1841f6aeb77d13a6a515870ffb8fea2a0046a68e53132838049358c56d9b84 SHA512 e71257993b2e3ecda07a32e0295dfd972090079f36e6c01a381a401469060763fcc68ff46181372df294775c3fd1015aa09ae6932d34b3fa0eea8b1c70058a2c
 EBUILD easypg-1.05.ebuild 331 BLAKE2B c508deba2e2d51da7a281fbf861fe68f6eadadd727ae0d4292418496a41c9ea97f1841f6aeb77d13a6a515870ffb8fea2a0046a68e53132838049358c56d9b84 SHA512 e71257993b2e3ecda07a32e0295dfd972090079f36e6c01a381a401469060763fcc68ff46181372df294775c3fd1015aa09ae6932d34b3fa0eea8b1c70058a2c
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/easypg/easypg-1.02.ebuild b/app-xemacs/easypg/easypg-1.02.ebuild
deleted file mode 100644
index 497ad8c018aa..000000000000
--- a/app-xemacs/easypg/easypg-1.02.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="GnuPG interface for Emacs"
-XEMACS_PKG_CAT="standard"
-
-KEYWORDS="~amd64"
-
-RDEPEND="app-xemacs/xemacs-base
-	app-xemacs/dired
-	app-xemacs/mail-lib"
-
-inherit xemacs-packages
diff --git a/app-xemacs/easypg/easypg-1.03-r1.ebuild b/app-xemacs/easypg/easypg-1.03-r1.ebuild
deleted file mode 100644
index 95c3af2c26d6..000000000000
--- a/app-xemacs/easypg/easypg-1.03-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-XEMACS_PKG_CAT="standard"
-
-inherit xemacs-packages
-
-SLOT="0"
-DESCRIPTION="GnuPG interface for Emacs"
-
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/dired
-app-xemacs/mail-lib
-"
diff --git a/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index 88bea5130ab4..b4fe3abf1470 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -1,7 +1,5 @@
 DIST ebuild-mode-1.51.tar.xz 35280 BLAKE2B 63f57919bb73937ce3d40b4d6762e78c78d273bcf67875434d12450e00632d457d3dedbe6f213c1979a60cbc0a0874723e3e9424fdcfb64a48acc885cc90e577 SHA512 ff9ece96fbe7bfc9c070769dc6667e8c33f8fb7ef20a2d347c670342ef7500b52b54a93ed37ac9ea13a89c1b89752f5dd6e56c234abe9a4fcd4eb6bad0d0b466
-DIST ebuild-mode-1.52.tar.xz 36100 BLAKE2B d5207d910088de9cf1a41580ce61c49632e8e7c1a1af5d95ba13a7865125ca487d770731bb49e12fdc36d3f557fadd51109de628e958166d064be025e4b91257 SHA512 852f968b44c80f98363d4663856317946992cf5d0daf9a9c63e8ec17c1a684e28c2de510ded98bd2ef84428d8d094c1b6f5060510e6475ce60183fbc8e5a0322
 DIST ebuild-mode-1.53.tar.xz 35920 BLAKE2B ee932441e23ba4b876e98feb9ff9dfea2e395296846e14f776ac10f4c5bab6b711161b4c890b0d8f2ccb5749db5bced3f693aa172e3ae92af506fee26fb5750a SHA512 8fcc28139c0cace21159a0b5026573f401f65b4501ff888f9818d8f5a506a7bc1f8d8a133f775619efc9e16e2172d6b5daba539b4e38b1a378c0b35395263ef9
 EBUILD ebuild-mode-1.51.ebuild 1001 BLAKE2B 5cfd46db07183e4a042b09072272acadba4c698baddb1022583d4f80b76a07f176bec9d58f348dd888c7b805ceb380a5bd99bc810b6e259d0b0924d95e1ef2d3 SHA512 5770a49c1af09516ee92468db7c7151fd817581836c84a289a936e4f63eeff2b002bd369ba9790d831807c759eabffaa5ce4fb74cda9cf7778ea507a86345fc5
-EBUILD ebuild-mode-1.52.ebuild 1003 BLAKE2B 2db38863c7f77c607530f79f9323d48c8c3c9635223a0c7c9a607524358aa494ca158516bcee91327f16e96413a69d3ea98e43e4a038d3ba78bfd59cde283e8f SHA512 c7dc7282574a83fb85f8dc7950365ad90e27a15b3fdc1be137593d2e07811fd8984cb3893421c271a544d35adf812cac8de131fe41e138389294555140177747
 EBUILD ebuild-mode-1.53.ebuild 1003 BLAKE2B 65c69a3ffae1c8ce9fd288ea981dd42da2c6ee8bddfa0a5ef893eece67a870ee74954e30c73d9380cb77b7fc63389c5b4756624ed46b8543a97ef56f60258b64 SHA512 2c82012b75ea3d3b8a3cb54764a3edd6eb93d59fb0882f42adbb9fe3dc47aaf93639b8f4005ed1d829f7fe4c22e44ce31ac0d67f20eb619dd85e62c8e1106a34
 MISC metadata.xml 443 BLAKE2B 80d7f482f6c34ad6d4a6073d2db913563da67e857e40bc68d04a603f9854bc7e6e06fcc025c92185b19c5705eccf92f4dc3852f3da895c7535222831e1bee119 SHA512 e712bc0b67b050d864c5a341728b3991f59b9be7bc9922c8eb7b67fea130b50ee76918b5a617df9bbde085e489592001dfc833189eeda1b89af31a3ab6c7c5bc
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.52.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.52.ebuild
deleted file mode 100644
index 1ff99d0876b1..000000000000
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.52.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-
-RDEPEND=">=app-editors/xemacs-21.4.20-r5
-	app-xemacs/sh-script"
-BDEPEND="${RDEPEND}"
-
-src_compile() {
-	local XEMACS="${EPREFIX}/usr/bin/xemacs"
-
-	"${XEMACS}" -batch -q --no-site-file \
-		-eval "(add-to-list 'load-path \".\")" \
-		-f batch-byte-compile \
-		ebuild-mode.el gentoo-newsitem-mode.el || die
-
-	"${XEMACS}" -batch -q --no-site-file \
-		-eval "(setq autoload-package-name \"${PN}\")" \
-		-eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \
-		-l autoload -f batch-update-autoloads \
-		ebuild-mode.el gentoo-newsitem-mode.el || die
-}
-
-src_install() {
-	insinto /usr/share/xemacs/site-packages/lisp/${PN}
-	doins *.el *.elc
-}
diff --git a/app-xemacs/ecrypto/Manifest b/app-xemacs/ecrypto/Manifest
index bea705efc6a9..343e021b4423 100644
--- a/app-xemacs/ecrypto/Manifest
+++ b/app-xemacs/ecrypto/Manifest
@@ -1,7 +1,3 @@
-DIST ecrypto-0.20-pkg.tar.gz 76257 BLAKE2B f9ae37e7addb3670a162ac36750def814121da60864372ab1f75ceacd7133e7071d94962b41a103a27edd081d0f093859eb2db6f6a84f3dcb9517e12af37fe1e SHA512 bacf0b8e5ee3c11aed744a9e7a3b33a7e4d10aa698b43b95226cc476db0daaa821b1d8e9fd64a487efc8a8c69b932c3112020815ca8abfaa7e5b08785d8b3e9b
-DIST ecrypto-0.21-pkg.tar.gz 76396 BLAKE2B b5f730a90370968ab5596a5b0ec8ee72ec93eb71f14df30161be19a9d0b2b8ca82195df462c80120aca3dc6189a1a2158b724eae7ac21c47c88332db79c4f9bb SHA512 b5d74079d940753a809ac294f466ee93244f5c96a79d9af26a45d005ed9b2b4ccb2459baeb63430b8e3dab44db31ea845ec8c64c8d57482e382955b793510e67
 DIST ecrypto-0.23-pkg.tar.gz 76345 BLAKE2B c6d28f0d9b7b733fd5a976ebb14cfc846ed8bbe563d75f75103c0f05ae8b6830927d8cdef6c7f225d37fbf536687c54a0dfece04796714c39ee488fc5397bce9 SHA512 a273f687eb89360c521d478fc6f1d7bfde0bb0537c95eb05d5ffde2a20024e99cdd44ab8ec253093ab941322c1c7574bef474e8659d94c480079e3f58cdbdcbe
-EBUILD ecrypto-0.20.ebuild 301 BLAKE2B b63c4804b2733f3704dd464d18cf2f5a4ea7dfeeadab883e43008085410b8bbaad2ba84240833c5129bd7e37184d98729029ba49d470ed69bb30a0c455a5ff87 SHA512 17eeb75e4f9da611b00433522ab35b32b788c65c450041349869e9c0ec925807f7386f50eb8ef9be144accf643690f8d02e8a8fc2b2c7750e50d0ec7766fea9a
-EBUILD ecrypto-0.21.ebuild 301 BLAKE2B b63c4804b2733f3704dd464d18cf2f5a4ea7dfeeadab883e43008085410b8bbaad2ba84240833c5129bd7e37184d98729029ba49d470ed69bb30a0c455a5ff87 SHA512 17eeb75e4f9da611b00433522ab35b32b788c65c450041349869e9c0ec925807f7386f50eb8ef9be144accf643690f8d02e8a8fc2b2c7750e50d0ec7766fea9a
 EBUILD ecrypto-0.23.ebuild 301 BLAKE2B b63c4804b2733f3704dd464d18cf2f5a4ea7dfeeadab883e43008085410b8bbaad2ba84240833c5129bd7e37184d98729029ba49d470ed69bb30a0c455a5ff87 SHA512 17eeb75e4f9da611b00433522ab35b32b788c65c450041349869e9c0ec925807f7386f50eb8ef9be144accf643690f8d02e8a8fc2b2c7750e50d0ec7766fea9a
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/ecrypto/ecrypto-0.20.ebuild b/app-xemacs/ecrypto/ecrypto-0.20.ebuild
deleted file mode 100644
index 821101086640..000000000000
--- a/app-xemacs/ecrypto/ecrypto-0.20.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Crypto functionality in Emacs Lisp"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/ecrypto/ecrypto-0.21.ebuild b/app-xemacs/ecrypto/ecrypto-0.21.ebuild
deleted file mode 100644
index 821101086640..000000000000
--- a/app-xemacs/ecrypto/ecrypto-0.21.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Crypto functionality in Emacs Lisp"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/edebug/Manifest b/app-xemacs/edebug/Manifest
index 9b14c6f64288..c8e84bdb428f 100644
--- a/app-xemacs/edebug/Manifest
+++ b/app-xemacs/edebug/Manifest
@@ -1,5 +1,3 @@
-DIST edebug-1.22-pkg.tar.gz 115557 BLAKE2B ce828bf916a02d15a699cbf0e1da97b3f2492595685bcd40c038dfdb3de2bc93cb1ef62a1ba280642384363a8c7fc7a23aa35073036d7e13aaa43597015a94e3 SHA512 5f4d86d770d68ab2199cb781da4f3b67dbda979396349212d851890bd257a85195fc5a8e0fa4ab337335887b3c2ff27e46002758926828093b6dce25f8796ada
 DIST edebug-1.24-pkg.tar.gz 115557 BLAKE2B 8112dcaf87747389c8311cbc47416b84eecda1b3393964444e342d97ec3ac3dd27330c16334c5ef435a314343a993c42892f50631149621cb94bcf2c2ce332cb SHA512 6af78de22e6ab18cf84602c4f19e0c6c8e91bf996e7c9faf97470246ec25df203cccff43b4172689ab1bfc3a7fd888f06e5306f6f5d3118d2cbfe453efa37b22
-EBUILD edebug-1.22.ebuild 313 BLAKE2B ba9b7ef3b564b2b93136366306e3b7b293f5f96d8f69cb830586d75117202b14c9592b7981608818de864dcba30d70b612f8f3956316cdac14620114124f0bd5 SHA512 bfbce094e72f42fbad3b3a62024c9e3905430fa585d6655783c6ebff94ca287c507eb1792ec40ff8e661f94789e8641ab407702f90243f0d30e6bb122c5a0051
 EBUILD edebug-1.24.ebuild 313 BLAKE2B ba9b7ef3b564b2b93136366306e3b7b293f5f96d8f69cb830586d75117202b14c9592b7981608818de864dcba30d70b612f8f3956316cdac14620114124f0bd5 SHA512 bfbce094e72f42fbad3b3a62024c9e3905430fa585d6655783c6ebff94ca287c507eb1792ec40ff8e661f94789e8641ab407702f90243f0d30e6bb122c5a0051
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/edebug/edebug-1.22.ebuild b/app-xemacs/edebug/edebug-1.22.ebuild
deleted file mode 100644
index e6f892a3f7ef..000000000000
--- a/app-xemacs/edebug/edebug-1.22.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="An Emacs Lisp debugger"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/xemacs-devel
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/edict/Manifest b/app-xemacs/edict/Manifest
index 264d631d1947..5817b7d758f6 100644
--- a/app-xemacs/edict/Manifest
+++ b/app-xemacs/edict/Manifest
@@ -1,7 +1,3 @@
-DIST edict-1.16-pkg.tar.gz 96111 BLAKE2B 60d0a990e8c2938205cdca4159f0d77360bb864b7ee66ac11b8f5714aa7cab1c2baf23fbcd891a2e0151be221efd9e46754e6ce651b2b4db2172a8835d7bbc46 SHA512 702d8d454310aaeb0804a96ed5f90c34eb2eeb72c598504404e257640a6cc153e5603cd7d8d1233b152e828fa44ec6919c7e0f9a9870a303b837db6dd5e0632c
-DIST edict-1.17-pkg.tar.gz 96241 BLAKE2B 7f353921e15a4334d5ba62048ed755b35e492536e43009c07d52acbb6a81ae92bc2190e3e8c033e1b9ad7cb685b2c673097ebe17c1eceab3d74fff4c9d82b44f SHA512 df70e1c128fd5d70ce9b5a927e25d3787b6f7e9bf7683c2da98e7a428d8bedbf2da9f1b26f7db41e94857cb30eed43e01eb9073b85a70650cabeea706599449c
 DIST edict-1.19-pkg.tar.gz 96228 BLAKE2B 32654036721787e8f3617303b61b26532d2e2ef56861c6d97e7f25a28953f95c275edb6c8778263a3209a22ebd2b22fed333740feaaa101169fba915a35f8e8d SHA512 2ce2028108a4d8923b3d9d82b8afffb228d103bab2d21c8a18649861a8e2281d3e68dda7990ac2d28d31171426344a0d7ab3a329f6f9d4a71b0300d368c4d36f
-EBUILD edict-1.16.ebuild 331 BLAKE2B 8528604227263e4f7003ce382a752c252651cc7566acd11878606fa26af25c25856a4ffead355a7c825c1484235180d751637e473ccec2c965a30ff3343a626b SHA512 ee02da2dae09eee85ce457c7f1cb1d7169c67ee14caf94059d7e47bc6215a0eda8e4764df29e7948cc1a87c928ed3b67e365437479edd7e3125b4b69d9955279
-EBUILD edict-1.17.ebuild 331 BLAKE2B 8528604227263e4f7003ce382a752c252651cc7566acd11878606fa26af25c25856a4ffead355a7c825c1484235180d751637e473ccec2c965a30ff3343a626b SHA512 ee02da2dae09eee85ce457c7f1cb1d7169c67ee14caf94059d7e47bc6215a0eda8e4764df29e7948cc1a87c928ed3b67e365437479edd7e3125b4b69d9955279
 EBUILD edict-1.19.ebuild 331 BLAKE2B 8528604227263e4f7003ce382a752c252651cc7566acd11878606fa26af25c25856a4ffead355a7c825c1484235180d751637e473ccec2c965a30ff3343a626b SHA512 ee02da2dae09eee85ce457c7f1cb1d7169c67ee14caf94059d7e47bc6215a0eda8e4764df29e7948cc1a87c928ed3b67e365437479edd7e3125b4b69d9955279
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/edict/edict-1.16.ebuild b/app-xemacs/edict/edict-1.16.ebuild
deleted file mode 100644
index c9a25cb2ba0d..000000000000
--- a/app-xemacs/edict/edict-1.16.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="MULE: Lisp Interface to EDICT, Kanji Dictionary"
-XEMACS_PKG_CAT="mule"
-
-RDEPEND="app-xemacs/mule-base
-app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/edict/edict-1.17.ebuild b/app-xemacs/edict/edict-1.17.ebuild
deleted file mode 100644
index c9a25cb2ba0d..000000000000
--- a/app-xemacs/edict/edict-1.17.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="MULE: Lisp Interface to EDICT, Kanji Dictionary"
-XEMACS_PKG_CAT="mule"
-
-RDEPEND="app-xemacs/mule-base
-app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/ediff/Manifest b/app-xemacs/ediff/Manifest
index 005d2423c6a4..e4fb48c53b61 100644
--- a/app-xemacs/ediff/Manifest
+++ b/app-xemacs/ediff/Manifest
@@ -1,9 +1,3 @@
-DIST ediff-1.68-pkg.tar.gz 317183 BLAKE2B 56610f91e61cf4cfba0c7ad444d06a929ddfb6fc65e41bc8dce57ba354e1e6d5b99c5cea0121d11c32d4f277b7f8303026522b0423669d2e77126905b8d61a0b SHA512 adf3fc6fb0692022d4f44e9b966d076574dc12025b3f90bfb7f7bab6f3735d39c993757619d09a19479afdb73554cf484aae457f1184a8bf5bf831923c4ac6bb
-DIST ediff-1.77-pkg.tar.gz 317283 BLAKE2B 1f0fb3206ef6b05cc56ae9512ba7a3f9368952b898e6e324e7b73f748c91de3ec7ed0d7c34dd4961ba9c2d86b988e75065d0578f0777bba602e7693983829e20 SHA512 5f1ba2019dfa762382639516eabcfd81da14dcbb35df77c82f24ae3250d003fb4c596d529c6897b7502ee227a67be85da8d01d4d3109d9f28ef6558f0ebc78d2
-DIST ediff-1.81-pkg.tar.gz 321669 BLAKE2B b4d28035fc6ed786053c04f759524f538e1e61c18df6db1d9e844e8f5718c228cd4c3e8d62f0ba3ef112b6e7bd85c02727a4404fb067fca0135784b963323e20 SHA512 1535f39a6af02e488f756303223cb116687c28d635f761f8456a439c576bf6691119d29e5fa2c7fca2e2a578faa4d09bac34145a8ca92116aca14e7ea93d694f
 DIST ediff-1.84-pkg.tar.gz 321644 BLAKE2B 8d328b8d85103c6485af311b93265c0c48336f6c587a287312d654c57e97b80924b342e5fbab72a7ce23ea08461361ddb81ae4b9120c6e18f45c5e4f8f05e72d SHA512 e3655de8af7bfa44193ca2d168804ad047de686df5b46e8bdf521df69e38e6f9818415b7b031e8379ab2579276bd114920c1e7796f6a98f9808099a56a5c5913
-EBUILD ediff-1.68.ebuild 383 BLAKE2B 54818aa5c4932ef3ef11688daafd49ce281f4fa43d113d219cee3739c84a40194286c96676b51bf636280cd7f0407dce158cb2e3dc85bfa969ab70c148eba756 SHA512 24440d0a1cc80942b3c23c9e865559f885543d152ae1616a600ef3365509d04622a311eb45a269441974a15bcbdb33c921589a7b9fcf81e7f64667a06dcec355
-EBUILD ediff-1.77.ebuild 438 BLAKE2B 3c83c1884e1f6aa76fdb6dc5560fef1f9f0edd923981ab5e5fbe2be61388da3f7334b204adaf6e7a7f8f77ee67d1ac546fd89543cc86f9b20711eeff317b36f4 SHA512 51fbeca99179ded5f0ddb65d892a123e1f484d7198d75025e0d287aa8f3049737e05bd2a5286ad87631db771baa5151ccf38879f4c8174b36fd4cab0bc836b1f
-EBUILD ediff-1.81.ebuild 430 BLAKE2B 642a71dbb687165045c3033977d25405b824a7b41f8c5b1c3bbe0262b618d7d71eada771a7b8af4f9900ea1b55abb552eeafc789643affd45dca7c0f1f50e0cd SHA512 e314e06a838267770a1c367176816dde8920c1bf68a2a50cf3e8f0f4d391bfcab89022908fabc37c3be01c5c90b50f433ac6dfbe8452c88eda5425927a0662fb
 EBUILD ediff-1.84.ebuild 451 BLAKE2B 68af2da4bc02ce57fedd053c03a63138264b76207d80d52a399b079c167e396a61d344c8ded7c235354ac8ab153a36a978199d3accd987cbf6425af93990e59d SHA512 fd98e335a47c1aa0b8fc70b44e8da7f234c9018ed26a65cec3e4813dce2daa3f48b39ae4702bfcba3cf4a27c5f9ae7f8af89094c353707dad7cf4b9278b8e800
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/ediff/ediff-1.68.ebuild b/app-xemacs/ediff/ediff-1.68.ebuild
deleted file mode 100644
index 75adb1de6400..000000000000
--- a/app-xemacs/ediff/ediff-1.68.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Interface over GNU patch"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/pcl-cvs
-app-xemacs/elib
-app-xemacs/dired
-app-xemacs/xemacs-base
-app-xemacs/edebug
-app-xemacs/prog-modes
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/ediff/ediff-1.77.ebuild b/app-xemacs/ediff/ediff-1.77.ebuild
deleted file mode 100644
index c1c90e40757e..000000000000
--- a/app-xemacs/ediff/ediff-1.77.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Interface over GNU patch"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/pcl-cvs
-app-xemacs/elib
-app-xemacs/dired
-app-xemacs/xemacs-base
-app-xemacs/edebug
-app-xemacs/prog-modes
-app-xemacs/gnus
-app-xemacs/tramp
-app-xemacs/vc
-"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/ediff/ediff-1.81.ebuild b/app-xemacs/ediff/ediff-1.81.ebuild
deleted file mode 100644
index f05ca7006fd4..000000000000
--- a/app-xemacs/ediff/ediff-1.81.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Interface over GNU patch"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/pcl-cvs
-app-xemacs/elib
-app-xemacs/dired
-app-xemacs/xemacs-base
-app-xemacs/edebug
-app-xemacs/prog-modes
-app-xemacs/gnus
-app-xemacs/tramp
-app-xemacs/vc
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/edit-utils/Manifest b/app-xemacs/edit-utils/Manifest
index 550808a5b470..2bd07671bfca 100644
--- a/app-xemacs/edit-utils/Manifest
+++ b/app-xemacs/edit-utils/Manifest
@@ -1,11 +1,5 @@
-DIST edit-utils-2.39-pkg.tar.gz 962340 BLAKE2B 58fd356da23467c29976f39642d5aeac0898418deb60edc909b79d76e0e196bdf3757a672a12bebfd258014c495a8c43cc177dc00b5da5877905fe991814c41e SHA512 dcd6634ec0eb9cb71336ac445fa063a3fabf34d5bfe47f417c00b111a82c42f10679ab6512e1bfcb80596cacb532fa14cb3f5675fb36a5e6258696bb7491fb51
-DIST edit-utils-2.43-pkg.tar.gz 958798 BLAKE2B 276bc16f5e7dbf29fcc78ed05da80976262dd48b1a088e8070192dd414240389da08a737dc6fb8c8459552d9c5ae491e248196ba8e7bf30d49cd7c74d0070cae SHA512 e42e416002f0f0c580f241ce4753c3868494025b4bfd087f5654e3c238a4b5c99d56f01db6b0fa47d1142085d5b4183625248266d76381387030a89e47a9e68f
-DIST edit-utils-2.44-pkg.tar.gz 958866 BLAKE2B 826d508304a2b08b76b7f358e7629184ef5d441d5a728e4943158b6e5c37cd128a5353f4b760a1a460f7f6487b51f10882462859388618587a984b298dc92b98 SHA512 fcb37c24304756e83cd273497cedf671e62ddce78f7bc460052cd3725948e35d87ce9d3108938483cd2ab8fb2d663ffb1df033b47b6e4b7e73f3a71d6d0ae886
 DIST edit-utils-2.58-pkg.tar.gz 1159051 BLAKE2B 4eb07e163863724431e2b2692014db84b0aa3926f1a40e3ef958285f692107fc00c132b30e6b74bd68fd90e916d1602dbc98b29c13d3c1e59e2f4f58b387c3a9 SHA512 42fa35bf31a0941186ceeb89afd138604cfc9903ad2feeaa7623e8d2343660368cb57b8aaaa9104182eb314a3641b0a7a9f8ee8fa525cff88a6b071c96820b5d
 DIST edit-utils-2.59-pkg.tar.gz 1161415 BLAKE2B dbfa16c4b641cce2b8d122bd3e3e55a56347cdac8bf9fe03987f32d6ee607ba29e976b0ee3e2532f79194f3352650b8943a9c7867a6ec877f1af108d2919780f SHA512 d602bb7f238f8dc6f716be6e1a83c7d027c0b0e57b7538a28ed60103c0afb746f6aeffc3d88f7f8b70d130ed47f2842769d30cbc006f7b574bdf78f5aa298c98
-EBUILD edit-utils-2.39.ebuild 405 BLAKE2B 5f1f6b1aa72a8f9706f98fe217c50480c1ca31978506582c25b8796001e87d17772bbf53c856fabb5342d30de5943e34f9db8e1db0d24a98aeecb1edad49501c SHA512 2cffa7f1f051913d62d069748c39d08c7b86e1562080e82596aa6df88c7cc4bab569cc1de9199267eb1b5927f98b79d60a216270824ee50820ce65bde6fa0cde
-EBUILD edit-utils-2.43.ebuild 405 BLAKE2B 5f1f6b1aa72a8f9706f98fe217c50480c1ca31978506582c25b8796001e87d17772bbf53c856fabb5342d30de5943e34f9db8e1db0d24a98aeecb1edad49501c SHA512 2cffa7f1f051913d62d069748c39d08c7b86e1562080e82596aa6df88c7cc4bab569cc1de9199267eb1b5927f98b79d60a216270824ee50820ce65bde6fa0cde
-EBUILD edit-utils-2.44.ebuild 441 BLAKE2B 80e3e76d4377de7a1fcc9feb131c8c1b747c8821dad6f3677b031df875251ccc19429e77ab4cc897f9c7c0ca47f8369f80483d26893509ae5c0f71f9e8364e7f SHA512 b0e5deb82a3725758175ef0348229d59a9e647a6efd40dbf689baa842aedb9f3521cd6ca18b013ceade9f709e65abf826abe9c7e322b8ca7aad40a10c79a5b1a
 EBUILD edit-utils-2.58.ebuild 405 BLAKE2B 5f1f6b1aa72a8f9706f98fe217c50480c1ca31978506582c25b8796001e87d17772bbf53c856fabb5342d30de5943e34f9db8e1db0d24a98aeecb1edad49501c SHA512 2cffa7f1f051913d62d069748c39d08c7b86e1562080e82596aa6df88c7cc4bab569cc1de9199267eb1b5927f98b79d60a216270824ee50820ce65bde6fa0cde
 EBUILD edit-utils-2.59.ebuild 438 BLAKE2B a7fff7b20a23a988d5db53eeac5aded48d2903b35f0ec7073e179bfa438eabed4cc6829da271c922c39c534c8467392e2ac7b478481038dc0c58b0b50b36b3e6 SHA512 381a344170658c3b7544074f905dcc20a6738fdb485fdeade7e0e5fe030b0f46def9b84474328b8bbe16e3d98554118d3dfdc8a055462d43f8a3482af6adbc8e
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/edit-utils/edit-utils-2.39.ebuild b/app-xemacs/edit-utils/edit-utils-2.39.ebuild
deleted file mode 100644
index 71e35676802f..000000000000
--- a/app-xemacs/edit-utils/edit-utils-2.39.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Miscellaneous editor extensions, you probably need this"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/xemacs-devel
-app-xemacs/fsf-compat
-app-xemacs/dired
-app-xemacs/mail-lib
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/edit-utils/edit-utils-2.43.ebuild b/app-xemacs/edit-utils/edit-utils-2.43.ebuild
deleted file mode 100644
index 71e35676802f..000000000000
--- a/app-xemacs/edit-utils/edit-utils-2.43.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Miscellaneous editor extensions, you probably need this"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/xemacs-devel
-app-xemacs/fsf-compat
-app-xemacs/dired
-app-xemacs/mail-lib
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/edit-utils/edit-utils-2.44.ebuild b/app-xemacs/edit-utils/edit-utils-2.44.ebuild
deleted file mode 100644
index 66d1a24c46d9..000000000000
--- a/app-xemacs/edit-utils/edit-utils-2.44.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Miscellaneous editor extensions, you probably need this"
-XEMACS_PKG_CAT="standard"
-
-XEMACS_EXPERIMENTAL="true"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/xemacs-devel
-app-xemacs/fsf-compat
-app-xemacs/dired
-app-xemacs/mail-lib
-"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/edt/Manifest b/app-xemacs/edt/Manifest
index cde2c00c8f77..602cf62754ec 100644
--- a/app-xemacs/edt/Manifest
+++ b/app-xemacs/edt/Manifest
@@ -1,7 +1,3 @@
-DIST edt-1.13-pkg.tar.gz 62754 BLAKE2B f327f44febb3fcca7a79771126ff85716464ce23739b2caf49a95047f2244da706576f80e5ea58125f0c7cd4723262b6d759c77c66581d3393f56f1950465544 SHA512 8371dd96b6996d1257c769be4fcc77ae386d187bfb51ccd03c57e09b12a2b193c575f15b8fce29380a59f795adaf02a3528fa80f3b24536c349fc10ab54f808a
-DIST edt-1.14-pkg.tar.gz 62824 BLAKE2B 9ab1cc9e55364b901ee51d16b97ea8a72a935e10d2aec5ef4f1757954a5f3e0c36132686225bb64e47227e2c83171632b004621f14b1508a9bfc07c8ad4cfc04 SHA512 8179652766eeffdd12b673e453f4dbe0117bc8f2ad743943c5f613dd217c80d3433b7cbe3a2d8b55604eaff489416edc5afd3e5bafafcec8782dd471688555c2
 DIST edt-1.16-pkg.tar.gz 62865 BLAKE2B 22f62a7ab87a723339693fcd6351263b1347b464db1f2f15ad79543505faf837154d95efa03f9401a03d7838452cab72484251c80a517cb3337ea8e3bf2f595b SHA512 46a0452b11119d926a3d612acdbefec37731ac60a86b207e125c7ca6dcd962b419173d4a5cb96117a8f0afb29b9c8173a5bbdc69e8d8ae09276829a6dc44c931
-EBUILD edt-1.13.ebuild 289 BLAKE2B ca3abde2c2057e1c9054530c1e408d6c4cdf17669d666a5e813362db7dccbb530758d868d1cf38c39332348b5c257d7bb4672f636edaf504bb3ff77a07d82df7 SHA512 7110841668c31fe610f077abc1796303b07341fd089fdd0ccf7e6aaf4b1a96232ae23e631c936a0384b2c4e7f342fc35bf8525f3c8a5bb4985f2f6d7bbc405d3
-EBUILD edt-1.14.ebuild 289 BLAKE2B ca3abde2c2057e1c9054530c1e408d6c4cdf17669d666a5e813362db7dccbb530758d868d1cf38c39332348b5c257d7bb4672f636edaf504bb3ff77a07d82df7 SHA512 7110841668c31fe610f077abc1796303b07341fd089fdd0ccf7e6aaf4b1a96232ae23e631c936a0384b2c4e7f342fc35bf8525f3c8a5bb4985f2f6d7bbc405d3
 EBUILD edt-1.16.ebuild 289 BLAKE2B ca3abde2c2057e1c9054530c1e408d6c4cdf17669d666a5e813362db7dccbb530758d868d1cf38c39332348b5c257d7bb4672f636edaf504bb3ff77a07d82df7 SHA512 7110841668c31fe610f077abc1796303b07341fd089fdd0ccf7e6aaf4b1a96232ae23e631c936a0384b2c4e7f342fc35bf8525f3c8a5bb4985f2f6d7bbc405d3
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/edt/edt-1.13.ebuild b/app-xemacs/edt/edt-1.13.ebuild
deleted file mode 100644
index a6367a8a3345..000000000000
--- a/app-xemacs/edt/edt-1.13.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="DEC EDIT/EDT emulation"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/edt/edt-1.14.ebuild b/app-xemacs/edt/edt-1.14.ebuild
deleted file mode 100644
index a6367a8a3345..000000000000
--- a/app-xemacs/edt/edt-1.14.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="DEC EDIT/EDT emulation"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/efs/Manifest b/app-xemacs/efs/Manifest
index 7db5d240cf77..2a0c93ad08b3 100644
--- a/app-xemacs/efs/Manifest
+++ b/app-xemacs/efs/Manifest
@@ -1,7 +1,3 @@
-DIST efs-1.33-pkg.tar.gz 375842 BLAKE2B 61e7751d5571a57ed0781773a6f26d476cc63a86a82ff9f381f4221e82c6731287c138e66326cb7881fab5656e04be1cb5de4f2a0fe09cb71cc82526c390efb0 SHA512 d588b8885ec659a78b4b64dadf10e75d08766e1cdfbd03dda9fc822081552dd8f27ed77dbff6be28a8f52fcb6f6747d27b7dea5ed3c7defd704639d49d7d4ae1
-DIST efs-1.34-pkg.tar.gz 376920 BLAKE2B c441fb03cebb97f845d3767001312a99d505c3fb7af4ae7d1902a67ba27633f18952136fdcfda442608034bc843a0a1754d3db829da967aa816a484f21a2f67e SHA512 44550090f4b122d995c10fa4e82972adeb4261bb27a431f7ac40a61773252fff1024a0f6a480cc7f35705aaa90781aed8473b96b5468d0ed18d2f5b3f59cb9fd
 DIST efs-1.37-pkg.tar.gz 377188 BLAKE2B 88c4d38e174cb1afe56db3148348e3b33a985692160e28ffa1db39b7da521ee2057bb709608c8c692c512b9acc9663bcf13105cc5e7ed531c4f9d5dedbad1873 SHA512 f66dce45470654dc4d47fecec10648db2e2940972f4f03540e4006e585f88379da90b6ef3fd6ecbff6517226b596520e129389a06df42a4bffb1b0b2d01b3676
-EBUILD efs-1.33.ebuild 337 BLAKE2B 93fa6d9333ad8fde77c81c48a385bca2b903aa5d8f07a5ae9b1911f8bf899938939327e3f9e720472c3c41a43d7eaefe5d8e9681cd972f01548fa9c386db5ba5 SHA512 aa06c994b12b7ae7f13641131b4c5aae0a12c028be55c362b974dfff53001e4e4a180ab464efd3e48134429290474f1616a3793368dd8f3ad69be8cc537f678b
-EBUILD efs-1.34.ebuild 337 BLAKE2B 93fa6d9333ad8fde77c81c48a385bca2b903aa5d8f07a5ae9b1911f8bf899938939327e3f9e720472c3c41a43d7eaefe5d8e9681cd972f01548fa9c386db5ba5 SHA512 aa06c994b12b7ae7f13641131b4c5aae0a12c028be55c362b974dfff53001e4e4a180ab464efd3e48134429290474f1616a3793368dd8f3ad69be8cc537f678b
 EBUILD efs-1.37.ebuild 337 BLAKE2B 93fa6d9333ad8fde77c81c48a385bca2b903aa5d8f07a5ae9b1911f8bf899938939327e3f9e720472c3c41a43d7eaefe5d8e9681cd972f01548fa9c386db5ba5 SHA512 aa06c994b12b7ae7f13641131b4c5aae0a12c028be55c362b974dfff53001e4e4a180ab464efd3e48134429290474f1616a3793368dd8f3ad69be8cc537f678b
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/efs/efs-1.33.ebuild b/app-xemacs/efs/efs-1.33.ebuild
deleted file mode 100644
index c2aed63ee149..000000000000
--- a/app-xemacs/efs/efs-1.33.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Treat files on remote systems the same as local files"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/dired
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/efs/efs-1.34.ebuild b/app-xemacs/efs/efs-1.34.ebuild
deleted file mode 100644
index c2aed63ee149..000000000000
--- a/app-xemacs/efs/efs-1.34.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Treat files on remote systems the same as local files"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/dired
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/egg-its/Manifest b/app-xemacs/egg-its/Manifest
index 757b9936dadf..c6bda252e70c 100644
--- a/app-xemacs/egg-its/Manifest
+++ b/app-xemacs/egg-its/Manifest
@@ -1,5 +1,3 @@
-DIST egg-its-1.27-pkg.tar.gz 261339 BLAKE2B 8e0fb9cf66d373ccdee6d54c0eb0d996d5ebc03a5d85e1ae8c43b66ae53b7a9ee97a90526b70d52232397ef2982baefc3d4bb327bdebe60aa79bb77ffe4a785a SHA512 f5a2a9412175cc4a825de907f566df0228a1838b082a20f9f11164fb76b7f87db2f4f4e337a8d58f7e0479ffb498c32ac0a7413a70f047a10ecc631edebd4ded
 DIST egg-its-1.29-pkg.tar.gz 261073 BLAKE2B cc5c515f4ae3918954ad4fedb21b5262b29fe3cbfcb43faabbefb7882f16583b53b8a68cc943af77471fc4431898db6de1dd38f1146150050f5d422308ef241f SHA512 9457e69c652f13309616ffaa97bfbe64bb0699c958442a0b0bd5f9f215951688a77d7d689567b1fb09d74229460c2a7687b661bcd21a68646a01283929ef764f
-EBUILD egg-its-1.27.ebuild 365 BLAKE2B 9f479026668ff1466cb3310e6f6a7d2b210beb25f219170257a07b6633e7796f4cbe75a660543e212a5fb9206f196474033f9444e5f8cf4a3db208f2d89b7a0d SHA512 7b190c9dd1c75566e8798b99d739a90bc542e809d1914b33fcf53c3f82530ce2ea2709f096814b1e046281368d89cccc678b7ed54fbf46287b0e94c08356c856
 EBUILD egg-its-1.29.ebuild 365 BLAKE2B 9f479026668ff1466cb3310e6f6a7d2b210beb25f219170257a07b6633e7796f4cbe75a660543e212a5fb9206f196474033f9444e5f8cf4a3db208f2d89b7a0d SHA512 7b190c9dd1c75566e8798b99d739a90bc542e809d1914b33fcf53c3f82530ce2ea2709f096814b1e046281368d89cccc678b7ed54fbf46287b0e94c08356c856
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/egg-its/egg-its-1.27.ebuild b/app-xemacs/egg-its/egg-its-1.27.ebuild
deleted file mode 100644
index 70586f694c1d..000000000000
--- a/app-xemacs/egg-its/egg-its-1.27.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="MULE: Wnn (4.2 and 6) support.  SJ3 support"
-XEMACS_PKG_CAT="mule"
-
-RDEPEND="app-xemacs/leim
-app-xemacs/mule-base
-app-xemacs/fsf-compat
-app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/eieio/Manifest b/app-xemacs/eieio/Manifest
index ab603328444c..5ccf16df1919 100644
--- a/app-xemacs/eieio/Manifest
+++ b/app-xemacs/eieio/Manifest
@@ -1,7 +1,3 @@
-DIST eieio-1.05-pkg.tar.gz 165803 BLAKE2B 92425dbaf275be435acc9d51f1ab5fad0a771d8205b11881229a244372059f71a8fa5c2d485c9cdc5208a21a4b54acd03f41e39847c4901bde81bb42b30bb2a5 SHA512 7caa2cff977f850e4b59b00a2c34252bb235d901e4605092181aebac7690eb996b2bce7bb9262a9ec4c6aa691e89046cb723b8f0cd643f5b9b6cb5af51385497
-DIST eieio-1.07-pkg.tar.gz 177923 BLAKE2B efc84c48fac4bd76ca4c843a4bff97dc10f21f45be9067c54c871a64314c9012b80e8d5e292f8844e1b7c3ed86a3f8044dfa547109c09891a3aeb11d515b7b0d SHA512 e4c76aa617bf80ca3fa7de249535ba63b22c3c8d787361dfce9381f4cb31500cb8f40e564c70928ee99492a0b71a67a13dd90e9626335b18b2a49877a124a551
 DIST eieio-1.10-pkg.tar.gz 179945 BLAKE2B 5bca0fb3ac1a94adc73dc7d0233645308aee5bd12923cb390c648a1334cb2b69488b8593781936ccea8719dc1e9a53526b1b348e1b9ca42681531f409029a48c SHA512 deb5de328e40a7c2fed189c89a3e3ab5cd5a26cd7243398c34bf2ed6bc1ebe7e72ecc23a2aef9d967a2477ecc4c797486e477a50e1cc78cd506c1e3170a85512
-EBUILD eieio-1.05.ebuild 357 BLAKE2B 9e75a8402e8effa825ee12189040860d88d55979545c9dcb249dd35d96e00ce693b4c37caba7a7b35fe7966f3900e17c9d65b678ea62a839e746524fd8d93928 SHA512 9cc259cd44f4be156fa70badcc387d94ed0e1a0d250dd1c1f362a9b754bfb24c1cc1bfe51cd20daaffb31ac0c0803abad8e284e6939c299bd430ff9fe3901f0a
-EBUILD eieio-1.07.ebuild 381 BLAKE2B 800a73d54872a13b574891ad6048deb1cc090dc3b8e7a2832aef9b28e583b2a1a0e286cda71992743e858c2a466603c82f0be5cb0fa2859eb43a2a8bf3427d3a SHA512 978abc828b206f85d5c2d0d849691c49f9ae6dcf39861a519e534ec3eb0e63cfa9f90cc13c53e39e463071573c3ebba8b5523f2a95c1e70976196adea81058f9
 EBUILD eieio-1.10.ebuild 381 BLAKE2B 800a73d54872a13b574891ad6048deb1cc090dc3b8e7a2832aef9b28e583b2a1a0e286cda71992743e858c2a466603c82f0be5cb0fa2859eb43a2a8bf3427d3a SHA512 978abc828b206f85d5c2d0d849691c49f9ae6dcf39861a519e534ec3eb0e63cfa9f90cc13c53e39e463071573c3ebba8b5523f2a95c1e70976196adea81058f9
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/eieio/eieio-1.05.ebuild b/app-xemacs/eieio/eieio-1.05.ebuild
deleted file mode 100644
index 84ca0b0e923c..000000000000
--- a/app-xemacs/eieio/eieio-1.05.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Enhanced Implementation of Emacs Interpreted Objects"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/speedbar
-app-xemacs/xemacs-base
-app-xemacs/edebug
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/eieio/eieio-1.07.ebuild b/app-xemacs/eieio/eieio-1.07.ebuild
deleted file mode 100644
index d338fb8cc1a3..000000000000
--- a/app-xemacs/eieio/eieio-1.07.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Enhanced Implementation of Emacs Interpreted Objects"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/edebug
-app-xemacs/cedet-common
-app-xemacs/speedbar
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/elib/Manifest b/app-xemacs/elib/Manifest
index 397da8671bdd..7e57c646959a 100644
--- a/app-xemacs/elib/Manifest
+++ b/app-xemacs/elib/Manifest
@@ -1,7 +1,3 @@
-DIST elib-1.11-pkg.tar.gz 73387 BLAKE2B 423476172a1a1ffe2731ca67fc24bec37a52de5387afc22c044aa90c40dbc0c2d4d858f57ccf2237274b7b3cc7b7b366bb44cd52c9c6f0d1264d1ad051a10be8 SHA512 0ed1b6bd47b13c69b5990e6e1ca8e203440e28527f860a70e22fe0da94811909bcddcf184cfc9a8016a2fe590cea5e3ceec270bfb33ff655b542a3c8c0ea8638
-DIST elib-1.13-pkg.tar.gz 80235 BLAKE2B b81ca5b529a808ee5a9c7f514cf53dfa1c5d5ad4531b3aef10706ba746b4ee4a3216460e006842f733bba073d1048d2d26c88643c1d3f9f5744924e66f84a9c4 SHA512 edffc77f9db1300693701df56fea7fa6e0fe3c4d11949bd8766faea21ccad79cb52b60f5c25e84350fa7f3cfc45820035b06f82890ea760dcb90e93a065feec9
 DIST elib-1.15-pkg.tar.gz 80288 BLAKE2B b336e467ef1b586bfcdec74f7c7766f16623ad223ced12c66b4a38282683e7a9ce7b8eb70b0b263be5e2cc42468c7cab622e8c2ce843680c28751c6202966e82 SHA512 16594062b094330a6cecfb9de8698c4f6608ed9276f8e4600658a9026ace1b3185fb9d23ec70fe4474093c8e95d67255d5a8741f0d84a906b415704e6fdc78ce
-EBUILD elib-1.11.ebuild 281 BLAKE2B 43ab30ca0efc7520bd50f2f01195721812da0ada78929c1acabca903a4f21d0f68ec70ca972f80317d645c80abd9305e16948d39ef4e9cbf3ab48494dcb3b1e0 SHA512 d973543fa435792c94f6701354343b4264796162483f899249c4d3883278773da2e06cea09612c8d7c5637841a2037f09a333e7521432c29995c6e8bf1aaf18e
-EBUILD elib-1.13.ebuild 304 BLAKE2B 52c98d7978e4dd320ff9adcd4650c24d245e9ec456cb76d9de581204bbf86b3828b38acdb5835eaf3fe76cd45a36168dadfb751ca3b140b4f35d4cacd9260997 SHA512 ba49c8b66fbc39fbf3a04ff47ee0ac15587d2140ad9bbbe81d5196d82d2718a5484d923c53411d830093f66f4e349d941fce08a3861a0f98382007617df9f1db
 EBUILD elib-1.15.ebuild 304 BLAKE2B 52c98d7978e4dd320ff9adcd4650c24d245e9ec456cb76d9de581204bbf86b3828b38acdb5835eaf3fe76cd45a36168dadfb751ca3b140b4f35d4cacd9260997 SHA512 ba49c8b66fbc39fbf3a04ff47ee0ac15587d2140ad9bbbe81d5196d82d2718a5484d923c53411d830093f66f4e349d941fce08a3861a0f98382007617df9f1db
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/elib/elib-1.11.ebuild b/app-xemacs/elib/elib-1.11.ebuild
deleted file mode 100644
index 2d54ea332cda..000000000000
--- a/app-xemacs/elib/elib-1.11.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Portable Emacs Lisp utilities library"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND=""
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/elib/elib-1.13.ebuild b/app-xemacs/elib/elib-1.13.ebuild
deleted file mode 100644
index fa6883d778bd..000000000000
--- a/app-xemacs/elib/elib-1.13.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Portable Emacs Lisp utilities library"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/emerge/Manifest b/app-xemacs/emerge/Manifest
index 42ee3578168a..5a8fa3ab5b02 100644
--- a/app-xemacs/emerge/Manifest
+++ b/app-xemacs/emerge/Manifest
@@ -1,5 +1,3 @@
-DIST emerge-1.11-pkg.tar.gz 61367 BLAKE2B 4b97e5118c34d89f7387e29c7e19337a0adc89c1588d35f338f910ea8d5f3003e358613850acf3124911e88aee31f387a7853ad51cf9a0f90d5b13608c81fcaa SHA512 c72569dc28b5db4c1e6b5b35107dcb4e1772de7a7b42898895c538f0ec127e28104b0ea0612d01138c1ff715285f06b9cd642609272ed40360f9b97e5e8dc784
 DIST emerge-1.13-pkg.tar.gz 61362 BLAKE2B 23269f38554fe99532389831ed3f9ad310ebe78d8edb3475096170a8062671e609bfe2ec45e2b27bf6f90d0e90db1592be360c4600828f3f2c8fb9e71d07769b SHA512 4fe0545d6bf67bdd7456e19fbaefb741c20a0119e1bf780e9d43163970c1d2d76ab0a79bdadf24b38643423773db89d37e6cdeb131fb96154ed5df91cc7e55d8
-EBUILD emerge-1.11.ebuild 265 BLAKE2B 139ae3238b6589f9954e276e7e805e6392911751a69aefa2e82e24cbb6fbb4e1377b75f5a43dc011009d2a7e37ef56befc3d9bcdd417be93a52ba5c18278d44a SHA512 922bedfb7cd9acb49249558529b73748b3817be6a071b047053ba9631b1a7ddf65d724117653dce6b6952bfcd1acb2507cbf1c1da3cd8d5c1c70694aa4a91218
 EBUILD emerge-1.13.ebuild 265 BLAKE2B 139ae3238b6589f9954e276e7e805e6392911751a69aefa2e82e24cbb6fbb4e1377b75f5a43dc011009d2a7e37ef56befc3d9bcdd417be93a52ba5c18278d44a SHA512 922bedfb7cd9acb49249558529b73748b3817be6a071b047053ba9631b1a7ddf65d724117653dce6b6952bfcd1acb2507cbf1c1da3cd8d5c1c70694aa4a91218
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/emerge/emerge-1.11.ebuild b/app-xemacs/emerge/emerge-1.11.ebuild
deleted file mode 100644
index 8dcc13981778..000000000000
--- a/app-xemacs/emerge/emerge-1.11.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Another interface over GNU patch"
-XEMACS_PKG_CAT="standard"
-
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/erc/Manifest b/app-xemacs/erc/Manifest
index 9d2ce0d0f522..acf6af6194c5 100644
--- a/app-xemacs/erc/Manifest
+++ b/app-xemacs/erc/Manifest
@@ -1,7 +1,3 @@
-DIST erc-0.21-pkg.tar.gz 516214 BLAKE2B f9f7811e9f73d895186e4c3bf6774db6304aba11af829886ccb4a7a4553a43e055baaf6ff830e757d75436cbbbdf1e1d341441d71cab4b75ca253481910390fe SHA512 5743fe1840a1e42700aa3fe41292b29a31f93e7ba7956ec80eda6df0c4d4300da268ccc692fe48b24dc59a60234e7d5a5d774dd8e9db8b6bcd91ddd4b11562e2
-DIST erc-0.23-pkg.tar.gz 517288 BLAKE2B ce5a5f41b70b25d8e4a123d3a7a8d32815f3059da2e5353dace6ef185d8df2d2539c88155136a60ef7bd934a79db87b772267836cdce1ee2d691a9f1a4917f8f SHA512 54df94abb666d76f65faf668e8f85d20f5411c70031e709387706fe7d77b9403dd9e8d4fc2c634cbe58f5de896bb2780e2fae2706758774e295e3bc2704e7dc0
 DIST erc-0.26-pkg.tar.gz 517470 BLAKE2B 49bbe65ed658310397e4407f50b32b768c67723256123920f924d8cfe7b496b8185cc94753a7e5a778b928466ed8599b21d2cfbcfa063851f4eb424f75a066df SHA512 d1a9300dba716d9d569708977864cefeca225d22980df80617428c76c940a54c726cc99699e19a7fc966831042e5358c10744b4ffa7c8093e0b5feee4c070d1c
-EBUILD erc-0.21.ebuild 292 BLAKE2B 54c33e7b6a73b04a953de5e53e17cc7f9d1493885c3b4a2ac45d21d7a830ac3575db3322181149638400829bef7f8188e16895b19e6c1574f638081d32614edc SHA512 3d7019484299847a0b4288f41280ce6aa881462d92a3f1045a82c4f1bc9adb006b6dfda89a1e76d8ef143fc3826a3b8e1b8089c24b9048bf9eda544dcc14e6b2
-EBUILD erc-0.23.ebuild 439 BLAKE2B 401944acb4f5f8693dc149c3b64897be55961417d1a979d5bab56b3b94fae4c31eb7d1232e3601e25e8a0035a6a06d833923571244c0f2a84b3666747c4b19b7 SHA512 f2e2d2e7a73de5b97dacd88caa78c8ec06a3d0e122e9621e2c13fbfb18b9e584941ca3cfaa7ec063ba305f327dc1468fd17da484e46b2869a742b71b1bd64287
 EBUILD erc-0.26.ebuild 439 BLAKE2B 401944acb4f5f8693dc149c3b64897be55961417d1a979d5bab56b3b94fae4c31eb7d1232e3601e25e8a0035a6a06d833923571244c0f2a84b3666747c4b19b7 SHA512 f2e2d2e7a73de5b97dacd88caa78c8ec06a3d0e122e9621e2c13fbfb18b9e584941ca3cfaa7ec063ba305f327dc1468fd17da484e46b2869a742b71b1bd64287
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/erc/erc-0.21.ebuild b/app-xemacs/erc/erc-0.21.ebuild
deleted file mode 100644
index 8958b9abe990..000000000000
--- a/app-xemacs/erc/erc-0.21.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="ERC - The Emacs IRC Client"
-XEMACS_PKG_CAT="standard"
-
-DEPEND="app-xemacs/xemacs-base"
-
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/erc/erc-0.23.ebuild b/app-xemacs/erc/erc-0.23.ebuild
deleted file mode 100644
index 4c2c0395514a..000000000000
--- a/app-xemacs/erc/erc-0.23.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="ERC - The Emacs IRC Client"
-XEMACS_PKG_CAT="standard"
-
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
-
-RDEPEND="app-xemacs/edit-utils
-app-xemacs/fsf-compat
-app-xemacs/gnus
-app-xemacs/pcomplete
-app-xemacs/xemacs-base
-app-xemacs/text-modes
-app-xemacs/xemacs-ispell
-app-xemacs/viper
-"
diff --git a/app-xemacs/escreen/Manifest b/app-xemacs/escreen/Manifest
index f009edec0a1f..dc045d7c5021 100644
--- a/app-xemacs/escreen/Manifest
+++ b/app-xemacs/escreen/Manifest
@@ -1,5 +1,3 @@
-DIST escreen-1.01-pkg.tar.gz 14639 BLAKE2B 4686dfecc40c7f90b4351de0b3ab20b5c5fcbc77760de7d5e0e115ddfbf792b5f7238df5272b33c3f98e7fd5ef4ecc8b79b08723217a4dad7e0c65bc0f4e8eed SHA512 3fb4d47ed6ae6173a530ea31b7ae759a34e2257e85e3f512c841234f7eba9780cd160e4ed600dd5f1871a022d4b2b28dd3dcdff788f679a07c05745914a04a89
 DIST escreen-1.03-pkg.tar.gz 14702 BLAKE2B 1057fcb27b555f4ebc173570df8b8b1f44a0e91fbd7e01b6196c963a3f76ed8f8c0889223b089482658269afd728e84aacc46cdb6ea56b50bf354dfa95afadb6 SHA512 7645fc60611162d60f8c7d0d81727c3c273d7b8883a0613d83cb98ae44a01ba62d575f67a657ce8d1c67afe7f6a8b7e925790c3e4429a715db3aff297eaeeaf4
-EBUILD escreen-1.01.ebuild 331 BLAKE2B c95ec6bb885ec57c36da9d115ba77254b59b3428b857437dd895d0c92a1cad4002370fa93a0241e423258f7d679ab6392d33587be36592b1b1c770ee35dea5ba SHA512 ee0db1417020f226ea8eab2b5304355c917ae482ab9ea51a4b4fcc677dc839b0dfcf32b53b9b4232a29ae0e3dbc526c6e16e18564157c6bc0418772bace925e3
 EBUILD escreen-1.03.ebuild 331 BLAKE2B c95ec6bb885ec57c36da9d115ba77254b59b3428b857437dd895d0c92a1cad4002370fa93a0241e423258f7d679ab6392d33587be36592b1b1c770ee35dea5ba SHA512 ee0db1417020f226ea8eab2b5304355c917ae482ab9ea51a4b4fcc677dc839b0dfcf32b53b9b4232a29ae0e3dbc526c6e16e18564157c6bc0418772bace925e3
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/escreen/escreen-1.01.ebuild b/app-xemacs/escreen/escreen-1.01.ebuild
deleted file mode 100644
index 9ad5736ed1c2..000000000000
--- a/app-xemacs/escreen/escreen-1.01.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Multiple editing sessions withing a single frame (like screen).."
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/eshell/Manifest b/app-xemacs/eshell/Manifest
index 59895279ae1f..d32a9666fc43 100644
--- a/app-xemacs/eshell/Manifest
+++ b/app-xemacs/eshell/Manifest
@@ -1,7 +1,3 @@
-DIST eshell-1.10-pkg.tar.gz 232616 BLAKE2B 42c057c6afc401f480c8531be0b6dd2f1a1d1230063ca9649c23f751c6d988d2eb1918a3158840ada50d1b59f02319f7e06d1e021bd0b502be77dfe13036ea64 SHA512 97b4d81b024513b4dacbdbd3d04150a3dcc10aa9c2a8ed0e7157ada3aa404de6c44f8cce60c59f1c75c0e9e31f0f7b6de86b402b2c6527111162e2ee54e51dc9
-DIST eshell-1.18-pkg.tar.gz 238988 BLAKE2B d595f9c36ca5cd50ac46efabc813575b6f8415f47ac1d44632151bf8a39233c7166a0d9fdc2eb2cf00565b4e4f9ed9b4828ffb385ef4941745529260d31850e3 SHA512 3cb3f66c2714ffc5e2875bdbc3fd02dd60032db338ef9ef9c0904ec89945075ae95a5e02ce402299dbbc98b6e53d7304dbe50fc3cb3eb0dd2aacaef5535f2792
 DIST eshell-1.21-pkg.tar.gz 239308 BLAKE2B a20c3cfdb64f0b604f4aa0af44279598f0564bc623ce75303df7133b560846d4e79286914e8b5f06941503563cab6204962ba9c1be7f54290d1af3afbb023ef3 SHA512 d7724d43b2451e237f7a9f281f3aebb15266a1f58fe0e5a5f4c8104a6d85163d61877cdeee57ee7ace2d824ffe2d131624e4bfe3854ddd4581ba7b92cad076e3
-EBUILD eshell-1.10.ebuild 339 BLAKE2B b2e12c714212bbfd9bb4e03b1decd017c810d5c1fe3e029e2950db5bd8627704731e4ffc310d3428a7223645c25127d5d5751547fae7c8f60dd487c2db83cd73 SHA512 6aeac7d421d10d07c7b2bb2c6c1ff069e6d4d70b3edd547c1145fae142a0937d7d7388228337be8a5ae1ea3690150cc638c01dde0de913c59931de594bde6385
-EBUILD eshell-1.18.ebuild 339 BLAKE2B b2e12c714212bbfd9bb4e03b1decd017c810d5c1fe3e029e2950db5bd8627704731e4ffc310d3428a7223645c25127d5d5751547fae7c8f60dd487c2db83cd73 SHA512 6aeac7d421d10d07c7b2bb2c6c1ff069e6d4d70b3edd547c1145fae142a0937d7d7388228337be8a5ae1ea3690150cc638c01dde0de913c59931de594bde6385
 EBUILD eshell-1.21.ebuild 339 BLAKE2B b2e12c714212bbfd9bb4e03b1decd017c810d5c1fe3e029e2950db5bd8627704731e4ffc310d3428a7223645c25127d5d5751547fae7c8f60dd487c2db83cd73 SHA512 6aeac7d421d10d07c7b2bb2c6c1ff069e6d4d70b3edd547c1145fae142a0937d7d7388228337be8a5ae1ea3690150cc638c01dde0de913c59931de594bde6385
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/eshell/eshell-1.10.ebuild b/app-xemacs/eshell/eshell-1.10.ebuild
deleted file mode 100644
index f527918e2ddf..000000000000
--- a/app-xemacs/eshell/eshell-1.10.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Command shell implemented entirely in Emacs Lisp"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/xemacs-eterm
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/eshell/eshell-1.18.ebuild b/app-xemacs/eshell/eshell-1.18.ebuild
deleted file mode 100644
index f527918e2ddf..000000000000
--- a/app-xemacs/eshell/eshell-1.18.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Command shell implemented entirely in Emacs Lisp"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/xemacs-eterm
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/eudc/Manifest b/app-xemacs/eudc/Manifest
index acfec9d27984..b2f981dd2cf9 100644
--- a/app-xemacs/eudc/Manifest
+++ b/app-xemacs/eudc/Manifest
@@ -1,9 +1,5 @@
-DIST eudc-1.39-pkg.tar.gz 79488 BLAKE2B 62789aeedcc6f1efa1cb453161cee6d3134295d84bff591c606b5a871cf355a2f377d557a99bb4e818916b5a611c18d838bc375e539fe0219f07d111125914df SHA512 c2442e701dad665fc0651aee3d9f0affd72006abcceb6da46eea67f0cdaf75a285f330615de54a5097ce39786537612b1dd053268fda01c0c18a00bb44c0fdda
-DIST eudc-1.40-pkg.tar.gz 79675 BLAKE2B e3bac796fb0b7d496d6a3066795c5e89372b22a4af693a91cc3dbe6b6e68b3b9327841a18fb42b03bc6435b8831785872dad95516f2b494bc003be4ac85745ef SHA512 ecd14560771652450e6f4acbf468efad9215681e6c85e8f5b3c999a222f8e90299f7e63c4951a122f5d04a08ec247c95bc5da910df47f66b5f88656acf2ad827
 DIST eudc-1.43-pkg.tar.gz 79973 BLAKE2B 86c53b32707c715f7501d5467c8c6e80a5829a5c36baf57ee6ec23766a5ab5882731eacf258489fa8c1120ab1e593e8fbfc66e33b1cb758ac3a9743f85536e2c SHA512 2a4b4c46c4e164fcac083dc75c8c2f2b8eafc0882d966c5e7fea8cc899a13f0c89f8d7b8562a79f972482dc569d48e8004a121a02a7a0b430a1da0800009635d
 DIST eudc-1.44-pkg.tar.gz 79883 BLAKE2B 81c5c4ddd8244a422a229c47826f8d39876aa474ce38236bbeed311ed4349ad04a7b8ed2a4f23585a65273fd8636adcb8b2f57031516c509b32ef22d928d6972 SHA512 5d0348454e52bb8140f9df3f09fad909ad3927ba849faf8dd3c4b31aa4d0774957bb16b1edc8827f2e1248dc2646b51a772a015da54520dbe65c42741e95f978
-EBUILD eudc-1.39.ebuild 495 BLAKE2B 77ae2ff176e89797f7023cef15eda6f62f548a43715ba099f0a1ec437f449122a87fc4c2466012807004e3a418a4f9f70d3833b3fec28eac15938e9f259c21d6 SHA512 d265b24210b53d2e9ed6535f90746fb4e64fcc652d031ba0d2a4ff09d3eb46a177509785a8ab00af14668fe86f1a7456c8ecf015f807f13ea08c386d88578d13
-EBUILD eudc-1.40.ebuild 514 BLAKE2B e00c8448d773a6698c41ecf18251b3865700fb650bed95bdea38f866a537a79440bd935ad1e8310603606b39891c2e901431a92669ce17a4308ed58805f1eaa5 SHA512 0ce9e22b918e791895511abdcea06701966c7650b04a2be5087099abf7a97d1858a3f2a2ed3cab324f560af6c0be681b09a05be30f61c9069864a0501e2b6b0c
 EBUILD eudc-1.43.ebuild 514 BLAKE2B e00c8448d773a6698c41ecf18251b3865700fb650bed95bdea38f866a537a79440bd935ad1e8310603606b39891c2e901431a92669ce17a4308ed58805f1eaa5 SHA512 0ce9e22b918e791895511abdcea06701966c7650b04a2be5087099abf7a97d1858a3f2a2ed3cab324f560af6c0be681b09a05be30f61c9069864a0501e2b6b0c
 EBUILD eudc-1.44.ebuild 547 BLAKE2B 44e5d3333ab6bdd5d480224f7ff7e77085ce00b836d3c56f3459134d758e6ff29e6ac7b2d20b01ee864de48a3ecc88229128fc690f6f5e4095a5b68243c75315 SHA512 b41241ce064e53e3bc81051f20407c4a63f8ecaf8cf24fd739b577377bc81aa952e18b9479b6979239390decd4339aedb32265d2b566b2b0ccfdd4ba65176fce
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/eudc/eudc-1.39.ebuild b/app-xemacs/eudc/eudc-1.39.ebuild
deleted file mode 100644
index d75a300b0e03..000000000000
--- a/app-xemacs/eudc/eudc-1.39.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Emacs Unified Directory Client (LDAP, PH)"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/fsf-compat
-app-xemacs/xemacs-base
-app-xemacs/bbdb
-app-xemacs/mail-lib
-app-xemacs/gnus
-app-xemacs/rmail
-app-xemacs/tm
-app-xemacs/apel
-app-xemacs/xemacs-eterm
-app-xemacs/sh-script
-app-xemacs/net-utils
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/eudc/eudc-1.40.ebuild b/app-xemacs/eudc/eudc-1.40.ebuild
deleted file mode 100644
index 76934ee64fb9..000000000000
--- a/app-xemacs/eudc/eudc-1.40.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Emacs Unified Directory Client (LDAP, PH)"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/fsf-compat
-app-xemacs/xemacs-base
-app-xemacs/bbdb
-app-xemacs/mail-lib
-app-xemacs/gnus
-app-xemacs/rmail
-app-xemacs/tm
-app-xemacs/apel
-app-xemacs/xemacs-eterm
-app-xemacs/sh-script
-app-xemacs/net-utils
-app-xemacs/ecrypto
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/footnote/Manifest b/app-xemacs/footnote/Manifest
index c2b5e99ffe4e..e6e98be58b28 100644
--- a/app-xemacs/footnote/Manifest
+++ b/app-xemacs/footnote/Manifest
@@ -1,5 +1,3 @@
-DIST footnote-1.16-pkg.tar.gz 22152 BLAKE2B 4ff8d3df1d76fcf23ec5191516bfeb7be4dbdf11a428d387a5c4a722b8c9b7cf34680548a8e7be2fa39b8dc83f623c96328c974ea4f3d940879b57ae03fde259 SHA512 4eba15270fd4529c3a8b5e8f488cd9dc294dab2f4b968490e8bbfc09e81bc4abd4f9c95b38a295a8f5899f4df55b7dab18e8979130cd8b24a533fbc609f0bf92
 DIST footnote-1.18-pkg.tar.gz 22196 BLAKE2B a6e99875cda4cf8bba7d27c2fad3d0bc61fcca09d6a79cc30b4e83004fa3dce704201e818ab6b0df96b5359425691f02ee5be92b347c41df6e842a6de6c44437 SHA512 222f2aafa6b0e56fdeacacc36a3dffec6ee6de103ae100f8900e00bfbf866d9bc1c3b6f00999c4d9a3c657bea6282a8b3fd89cac10856491745cab182a86e2c9
-EBUILD footnote-1.16.ebuild 327 BLAKE2B 0c12922e5fdd8747055def24a33d63a8af229eca1a7106729311c892bde8ecfe3f43c12b7b04b7b6a126c0659dde0cfd5a0381e74ac4a4aa5a254d52fea075d1 SHA512 546fd5f5e53e2f302a190509d57c9a657dd06def32741a0a7d18a9771fdad7bef8a098294e6ec232519b22f4f1ac20a6e57c2bd63552c1b5a60d870685cd4dae
 EBUILD footnote-1.18.ebuild 327 BLAKE2B 0c12922e5fdd8747055def24a33d63a8af229eca1a7106729311c892bde8ecfe3f43c12b7b04b7b6a126c0659dde0cfd5a0381e74ac4a4aa5a254d52fea075d1 SHA512 546fd5f5e53e2f302a190509d57c9a657dd06def32741a0a7d18a9771fdad7bef8a098294e6ec232519b22f4f1ac20a6e57c2bd63552c1b5a60d870685cd4dae
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/footnote/footnote-1.16.ebuild b/app-xemacs/footnote/footnote-1.16.ebuild
deleted file mode 100644
index 37ffb042f47d..000000000000
--- a/app-xemacs/footnote/footnote-1.16.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Footnoting in mail message editing modes"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/mail-lib
-app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/forms/Manifest b/app-xemacs/forms/Manifest
index 2aa5de62b181..be2f6ad2335a 100644
--- a/app-xemacs/forms/Manifest
+++ b/app-xemacs/forms/Manifest
@@ -1,5 +1,3 @@
-DIST forms-1.15-pkg.tar.gz 48747 BLAKE2B a7695c1d07fc33cf6ccf7f0a3e7bd1039da1f662d589fea02716c9dcccf1441c7acc6bfdf344f6f0dd55965d45fd55633af3f369d57cb18bab3c62f3f95417c8 SHA512 eec09fe907c6b2ec94132ccc508d70903b27fb74cd02ae58a60d2196b80ea62111b0849db0c220e205d9e58394e588913b42dcf350d83cbe17cd9fbdd8ac6a62
 DIST forms-1.17-pkg.tar.gz 49071 BLAKE2B f0ef7c71819f5d4c036025d8acd7e9da369143500850f7c094729a0d98a5ff3d7fa8f39b2783f3338a9ce81f2036ad2161edecfd3a35966284f39ce5bf44ac55 SHA512 7ef9eade79bf53b1c2e3c1f86d9e3e70225f0041c7b41db844ec55bbfaded100edf9b432813ae5dc6a0f8237faa6e3ba7c58acaa26ec73438a45cd2ba326a249
-EBUILD forms-1.15.ebuild 285 BLAKE2B 0d8f5281017a7fd20e7551b1b176c8807b34c3327ff4529d59fbbbe4cce42c1b85ea02e14be6369aaf294112584ea8cfe970406c4580d05fe4b6cdbbec8c8842 SHA512 e456f5cd4be6821a5fa4449c005578eaaf650f03cb22607ad8041b0a828aff9a798911fae07f23c6c76845665cb4a1da2e1755762dafe3b93cb34e8b96f1af21
 EBUILD forms-1.17.ebuild 285 BLAKE2B 0d8f5281017a7fd20e7551b1b176c8807b34c3327ff4529d59fbbbe4cce42c1b85ea02e14be6369aaf294112584ea8cfe970406c4580d05fe4b6cdbbec8c8842 SHA512 e456f5cd4be6821a5fa4449c005578eaaf650f03cb22607ad8041b0a828aff9a798911fae07f23c6c76845665cb4a1da2e1755762dafe3b93cb34e8b96f1af21
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/forms/forms-1.15.ebuild b/app-xemacs/forms/forms-1.15.ebuild
deleted file mode 100644
index 35d2025c2d92..000000000000
--- a/app-xemacs/forms/forms-1.15.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Forms editing support (obsolete, use Widget instead)"
-XEMACS_PKG_CAT="standard"
-
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/fortran-modes/Manifest b/app-xemacs/fortran-modes/Manifest
index 13e6d1c76137..80cb4468ba8c 100644
--- a/app-xemacs/fortran-modes/Manifest
+++ b/app-xemacs/fortran-modes/Manifest
@@ -1,5 +1,3 @@
-DIST fortran-modes-1.05-pkg.tar.gz 70602 BLAKE2B da1e620e74b497290bf655fcbf9d45b5510193388557e33abc769d874ef2d75786cb91ea9964f0019a40b19de968690f396523144f49c7bd79be783111830d8c SHA512 c3eac57a6d84605fde545951d423855cca8a40dd02dc24d0e005e165ab4e52f2f76f7347ddf33e4e85d25717689b85c578ce1e2b3b738df8a080b56057747b27
 DIST fortran-modes-1.07-pkg.tar.gz 70601 BLAKE2B 637c183415e196090acdaeaf73a1dbc35ba0aa089ed66ffb1cf69240c5bbce84dc30b7563665a0f7cb0615c16590f11ed5b167d25d71cbc50eb750d682e2d1f3 SHA512 760d60adacec1f9c1ee591193ced65560968363e7a3d148530a493ce04a4efca4c7a15e6058f30b744d7de7763968064b4f4a7b0a831542fbd2bf4d22d2adb38
-EBUILD fortran-modes-1.05.ebuild 282 BLAKE2B 33514f65938a3c1223bb521f14d4af5a26cce640fbeefc4c0c0fac9e6a8d92b6fcc618f5669d3c18e97a70e5058bf28e3a58bc05c5b4c6b87b211c1ceb7fa837 SHA512 b60e5bbf4a5e155cf3f795bc28c290d5ce3d8f14b5f294f497dbffc1ae05c215ae7323d00720cc1fa7389218de6a0265edd30a4c1e7b9858ca7e7011cbd219f9
 EBUILD fortran-modes-1.07.ebuild 282 BLAKE2B 33514f65938a3c1223bb521f14d4af5a26cce640fbeefc4c0c0fac9e6a8d92b6fcc618f5669d3c18e97a70e5058bf28e3a58bc05c5b4c6b87b211c1ceb7fa837 SHA512 b60e5bbf4a5e155cf3f795bc28c290d5ce3d8f14b5f294f497dbffc1ae05c215ae7323d00720cc1fa7389218de6a0265edd30a4c1e7b9858ca7e7011cbd219f9
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/fortran-modes/fortran-modes-1.05.ebuild b/app-xemacs/fortran-modes/fortran-modes-1.05.ebuild
deleted file mode 100644
index 06ecd86d4c2c..000000000000
--- a/app-xemacs/fortran-modes/fortran-modes-1.05.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Fortran support"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/frame-icon/Manifest b/app-xemacs/frame-icon/Manifest
index 6e6ac0316902..2274b8fe5ae1 100644
--- a/app-xemacs/frame-icon/Manifest
+++ b/app-xemacs/frame-icon/Manifest
@@ -1,5 +1,3 @@
-DIST frame-icon-1.11-pkg.tar.gz 33800 BLAKE2B 93c404c9dfc894634e1b463d54eb53812de102e20f0d622dec9dcd5b37006bc92f5f4c1a2d47c5e1e1bc2344a49819bb6839a5c3d41df68546d6027abf6f5f8f SHA512 30e4de2e4bdac71483d39f3893b4ccd5d1ec37bc8b522a621af35f569e00c69bf02312c1039a52bfae759da2eaa748d26356a2b7db8c6b4dc8ce2ceb494d7d82
 DIST frame-icon-1.13-pkg.tar.gz 33818 BLAKE2B 73f88b6a41c42a5376d68820245b341d9ff290f62b6cfb6b40201c90523d80386b07613a824e35c898456cdd8bcebeb82973eb98724c64e702b5ebdec4aa7ed9 SHA512 45e37a4dd59f6e7bdac12558079a4b7c0cd552053950fbc5b67b32b00c3631580d3645bfc2d662a91b3da7410754d89f402ed1faa02eecefcc1691460aea95a2
-EBUILD frame-icon-1.11.ebuild 287 BLAKE2B e7b48cdb1c91c4baf10c7cace9bc97d6efc7da76fcea947aa34aeb82292d91309e235d22dede91603612780105b6d64b8a7c436b01c0caef5682db27cd6cd86f SHA512 c0fa9ede9f5d1a22cd94623cf7caa342c9027041f4aceefe69f537ca6d6904502ffab4a1d0e7545315ac0a3ed24ed5da2e75a3f2ff5f649b39e4d4715eaff5fa
 EBUILD frame-icon-1.13.ebuild 287 BLAKE2B e7b48cdb1c91c4baf10c7cace9bc97d6efc7da76fcea947aa34aeb82292d91309e235d22dede91603612780105b6d64b8a7c436b01c0caef5682db27cd6cd86f SHA512 c0fa9ede9f5d1a22cd94623cf7caa342c9027041f4aceefe69f537ca6d6904502ffab4a1d0e7545315ac0a3ed24ed5da2e75a3f2ff5f649b39e4d4715eaff5fa
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/frame-icon/frame-icon-1.11.ebuild b/app-xemacs/frame-icon/frame-icon-1.11.ebuild
deleted file mode 100644
index bbc1a2b8e154..000000000000
--- a/app-xemacs/frame-icon/frame-icon-1.11.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Set up mode-specific icons for each frame under XEmacs"
-XEMACS_PKG_CAT="standard"
-
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/fsf-compat/Manifest b/app-xemacs/fsf-compat/Manifest
index e828fb3f5bb4..cf7e189fbd7b 100644
--- a/app-xemacs/fsf-compat/Manifest
+++ b/app-xemacs/fsf-compat/Manifest
@@ -1,7 +1,3 @@
-DIST fsf-compat-1.15-pkg.tar.gz 18912 BLAKE2B c44bea3e0aba7dbd13d747a6faf6e5824df5cae83a2fb341d4fe81590cd0575c163f6f3a7a919ec71a7b3d2860436342df87fb93db89375099b1e08c7ceeeea5 SHA512 87e208b0f30d58953c9d49b7988b0dcd886870e29083ec9bfd47eef347e83b2c275e446593f200c8b76075b70c9691286f6c1e6639b82eb9f1599df33c5042a6
-DIST fsf-compat-1.19-pkg.tar.gz 20477 BLAKE2B d231757c8498693b1f08d164f1b93a89352e081cb52e3c46dc79007d5e5b0076d59950e7269b62eaa1efdf990aac21f56a355e42dd52b59008e5c182b4179912 SHA512 e1c64af5aee787691b527ee90a7ca6112ec0556b5939fc916c32fd4f990a60c8af70fda3b5c9e557888596ae5294b7ca8ddc4ae0df741299ec5d17a99a2479db
 DIST fsf-compat-1.24-pkg.tar.gz 30304 BLAKE2B e54d2484b0dd7e42543e7e629bf403e042e3966e3776e9a108a19b34db4ce634a2e9d99122225d005e09bf2a35411d95f613b1aaac2f57755e8af685084872b0 SHA512 b16e4ac297bbc6fecd278bb7e26842f92cba279c0edf7ddf880c43470e586232d30e84d923f52f5bf13904fb7ce3fb3193f48ecc3d5709fe6613bf6dec681f2d
-EBUILD fsf-compat-1.15.ebuild 302 BLAKE2B 98acf424b15b86c795b34e0d9d566e4fb27c283de3eca122ee64a5d1e988f887b74de019ff670d5bd41d189a64814c3803f6075a469648548422536247be6adf SHA512 16022cd1727480d586db5de02fdd2ccfa31628d4437a81d2eeac7f54f7c9b6d204c9bb1122008489f2dcfd07db16782f05d9c29ba7ab3409a5f92c49064a76c4
-EBUILD fsf-compat-1.19.ebuild 310 BLAKE2B df6076eafa72ef97812914cfbe03ef6a62778acc3b28fcd6859c658ad79da07908e75b60cc43dadd84a4fa1a6888fafe969ba608adb2d98d2d254a4ffc027d8e SHA512 bbaf4919a7c8e1fcda32d0ea591707dace2ca830046f1004d271a0846dfc294bc8355998a7093bd08b22cfe4d8c7ad8a3228e9517694e8bc626d284d4e4fdc3f
 EBUILD fsf-compat-1.24.ebuild 309 BLAKE2B 11d79a03dcaadaf11a51b913aa5a1e86ec3ed9ef87bbf675468c67e571347cc2c455607a1345394ca0cddcd9b52a9b362316040d56e3b1345447933b0087a95b SHA512 71a14aa4c0f45ea1b6ba385eeb496a8ab65f1bf6628549b54274ece13d90e963c0d8f4808c5552282135c9cfc7764e2923683b4c813dcf5361e90578ffedd888
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/fsf-compat/fsf-compat-1.15.ebuild b/app-xemacs/fsf-compat/fsf-compat-1.15.ebuild
deleted file mode 100644
index c454bdc84e7d..000000000000
--- a/app-xemacs/fsf-compat/fsf-compat-1.15.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="FSF Emacs compatibility files"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base"
-
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/fsf-compat/fsf-compat-1.19.ebuild b/app-xemacs/fsf-compat/fsf-compat-1.19.ebuild
deleted file mode 100644
index e3d1a4bba7bf..000000000000
--- a/app-xemacs/fsf-compat/fsf-compat-1.19.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="FSF Emacs compatibility files"
-XEMACS_PKG_CAT="standard"
-
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
-
-inherit xemacs-packages
-
-RDEPEND="app-xemacs/xemacs-base
-"
diff --git a/app-xemacs/games/Manifest b/app-xemacs/games/Manifest
index e27ec2ed6690..a73bb6a0dd03 100644
--- a/app-xemacs/games/Manifest
+++ b/app-xemacs/games/Manifest
@@ -1,5 +1,3 @@
-DIST games-1.20-pkg.tar.gz 84330 BLAKE2B c2f7fbd059de6e9da0670ed77fc86d8ada289f9841885038ed81bcf7db2825cf2006fc12f12dd308287a4bcea4d06ee98bb60ec0a0d4d4867356f1e48c446544 SHA512 dbee4a0da7a7ef1ddffcec72caa1af09aaa449c3d1f662c217bbd53ce0a7651c0ba3b31a3af750cba79454455c5325c5a9d81bcbae80610f356656b998b2f649
 DIST games-1.23-pkg.tar.gz 84601 BLAKE2B 05af9e6ef9425712324947369bc84cf8dfd5996293777255f4ff8b06990057eef91bf71d504243e11688098b2ea6f3942819ca0a3aa9762e1d94b5c7066b8605 SHA512 0aad12664b89c27bb809d02514cc406165c9d9c938c0cd910ff31380f30898faaf4e38a0cbebd5d9a744321ae4c726f30ad4a920185e7d78b654329adf533a0f
-EBUILD games-1.20.ebuild 293 BLAKE2B 1904ea20e8a2378a0a383e275ae551752280d31216c1dddb3a1b6af481efbe8324ab6e0d32fcd69a42aafdcdf02659383e7c4a07329bf23eb97ae821061b8229 SHA512 656c00044d163700ec51ab00b151efb171525d12efe96475bfa8999d67866da38d23500b199c8a25529a55925b1b8c75fd2f5cc590fb505ebd422970f363a36d
 EBUILD games-1.23.ebuild 293 BLAKE2B 1904ea20e8a2378a0a383e275ae551752280d31216c1dddb3a1b6af481efbe8324ab6e0d32fcd69a42aafdcdf02659383e7c4a07329bf23eb97ae821061b8229 SHA512 656c00044d163700ec51ab00b151efb171525d12efe96475bfa8999d67866da38d23500b199c8a25529a55925b1b8c75fd2f5cc590fb505ebd422970f363a36d
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/games/games-1.20.ebuild b/app-xemacs/games/games-1.20.ebuild
deleted file mode 100644
index ddc27cb82757..000000000000
--- a/app-xemacs/games/games-1.20.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Tetris, Sokoban, and Snake"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/general-docs/Manifest b/app-xemacs/general-docs/Manifest
index 58244e158bfc..9886bed8175c 100644
--- a/app-xemacs/general-docs/Manifest
+++ b/app-xemacs/general-docs/Manifest
@@ -1,9 +1,5 @@
-DIST general-docs-1.04-pkg.tar.gz 43374 BLAKE2B 535370c9dd135ac36603812db099624a167bc234203fb4b87f5a8b0e9a535d9e0bb9f6a9adad00fd62d4caf904f551ad61e50f3b16d9ccff9ab795b9e88d5a78 SHA512 a5df76303cffcac6e334decca3b11900e927e1ee70be73bbbd217e67ab0594c8f9829f7a0f582c254e616df491aee9a4e89c5a8ad6ef54ab3157abf367ecf647
-DIST general-docs-1.06-pkg.tar.gz 146305 BLAKE2B 5341120385d4c6c9d631f604e8ad71a8213c5033184a1b8ed14a14c066024a16bda397db9c656dc0d01483e42bfc9ff7754a47afce654014677187479dc4b828 SHA512 ff4847f881dd2f431e3a861015212798b23716087bd15ec117b7edb8f182bf5bddb31d370e9e69aa21847fd062164f05d2b4eba93326d6ffb784134b9152ddf8
 DIST general-docs-1.10-pkg.tar.gz 150069 BLAKE2B 12bc9cdb095685d954500373dcbf5b9000cbea49bda67dc81945ade24896a66ff3ec7b9d73a840706f48570b30da2dd10874bb15bc732a6cd11de5bfa56f64aa SHA512 f94798e437d5278c31e0cf18e22f22c88cc0c8eca1febf23f6c1e5dbe8856955c9334334c70832d6ce25db535704e56355536cb402c7c587a2bfee450c1485b9
 DIST general-docs-1.11-pkg.tar.gz 150119 BLAKE2B 3f7a9a32d6725de4ebf146df461b4a2d2b4d23ef49b91efbe201e964d6a82721d7a9eee8f960565b683255057dc6f3fdd49114a5032703a6d869a1ae0a50589f SHA512 9b11acf31eed4ff79f2c488f7036d4855fe7dd38bf510d00bb87b94b4fbe7587c0cef776b6d2b5a69d9c69745e534b997a2374d625c179c540c631d396361599
-EBUILD general-docs-1.04.ebuild 272 BLAKE2B 5de092cd657db9896a7b1e070daed7b1f6f4ac26784b4e1396f175d9fabaf1d739b1038bab60564660ce5e0bc4d27326ee2105cbf06b1550987753e8b7ec800b SHA512 823d0e2b2a9d80ec1f8d2432013bd6cd912102b7eac0f142829551d51621e8cd4324a332d0fdb574e2ed0396cdeaf5867007141e2238a51be003bf5eccb62dd0
-EBUILD general-docs-1.06.ebuild 272 BLAKE2B 5de092cd657db9896a7b1e070daed7b1f6f4ac26784b4e1396f175d9fabaf1d739b1038bab60564660ce5e0bc4d27326ee2105cbf06b1550987753e8b7ec800b SHA512 823d0e2b2a9d80ec1f8d2432013bd6cd912102b7eac0f142829551d51621e8cd4324a332d0fdb574e2ed0396cdeaf5867007141e2238a51be003bf5eccb62dd0
 EBUILD general-docs-1.10.ebuild 272 BLAKE2B 5de092cd657db9896a7b1e070daed7b1f6f4ac26784b4e1396f175d9fabaf1d739b1038bab60564660ce5e0bc4d27326ee2105cbf06b1550987753e8b7ec800b SHA512 823d0e2b2a9d80ec1f8d2432013bd6cd912102b7eac0f142829551d51621e8cd4324a332d0fdb574e2ed0396cdeaf5867007141e2238a51be003bf5eccb62dd0
 EBUILD general-docs-1.11.ebuild 305 BLAKE2B 0650852233c2c3b229129cf7b8e042fb0f4e3ae9faf28929aaf62e9748ae7476ad42c8bde3915a3623237edc5968b5a3973836acfb77beefba5636f808c32661 SHA512 0d28a61cfca7fb07bb79dd61ea869815b4a1b8dd5d7ca7fd87a0bff4c87dbb4a3bf6fa9bd26aa6807a6bb260a030257dcbd547f4d017642f73c4c5397662c301
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/general-docs/general-docs-1.04.ebuild b/app-xemacs/general-docs/general-docs-1.04.ebuild
deleted file mode 100644
index f7955730c84b..000000000000
--- a/app-xemacs/general-docs/general-docs-1.04.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="General XEmacs documentation"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND=""
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/general-docs/general-docs-1.06.ebuild b/app-xemacs/general-docs/general-docs-1.06.ebuild
deleted file mode 100644
index f7955730c84b..000000000000
--- a/app-xemacs/general-docs/general-docs-1.06.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="General XEmacs documentation"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND=""
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/gnats/Manifest b/app-xemacs/gnats/Manifest
index 5b8b923dd5e5..f0fa629c91e6 100644
--- a/app-xemacs/gnats/Manifest
+++ b/app-xemacs/gnats/Manifest
@@ -1,5 +1,3 @@
-DIST gnats-1.17-pkg.tar.gz 188959 BLAKE2B fd32eea586b1610abba78a51383d86714091a3656dabeeb871bb56eb5b85e7f9ff52dfba87da76bdf3abd15c1e66f98c03d807b26071879f64b33b3fac048b4e SHA512 b8d5a0faeb55c46b7a4f2d42d7b347304bff7a94f8487df72fac0a1aa4e388f188abb351de8764fac1c2381b01b3ac21abb1682878d4e998b5e141e4c443d29b
 DIST gnats-1.19-pkg.tar.gz 190492 BLAKE2B a0ee4d1c7014dde6ece2f8e7919832a36ebdfa556083af37561404cd002239ff25d2c7074ac1498f2e388e133040445745620513955f5c4f345b213232c91219 SHA512 116375ab1830fff3ecb889a5236c1915a69b4d2e08daa95885aaa22c4980ee27d4e5ea41c3e5d2a9bad507acf3d668752b068c8e3ae9281e4a129f297fb0a9c1
-EBUILD gnats-1.17.ebuild 305 BLAKE2B 8ab405aaab034b04ed5bc51b2d6519f5b6cc096b4fc7d488facb5b408691af3c29be1eaaee79303be43e15d481d909be90cd2293bc8090590bc72aef116dbc28 SHA512 26b20e41b36ee48abb5cf7686f0572fee05c0e9ed870ec98670c3c9c8cc97d92e3ee4a14e269d46b441d714f421e41bd620865cbf336333e9dd3127ddfbd8076
 EBUILD gnats-1.19.ebuild 305 BLAKE2B 8ab405aaab034b04ed5bc51b2d6519f5b6cc096b4fc7d488facb5b408691af3c29be1eaaee79303be43e15d481d909be90cd2293bc8090590bc72aef116dbc28 SHA512 26b20e41b36ee48abb5cf7686f0572fee05c0e9ed870ec98670c3c9c8cc97d92e3ee4a14e269d46b441d714f421e41bd620865cbf336333e9dd3127ddfbd8076
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/gnats/gnats-1.17.ebuild b/app-xemacs/gnats/gnats-1.17.ebuild
deleted file mode 100644
index 98e85af7f520..000000000000
--- a/app-xemacs/gnats/gnats-1.17.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="XEmacs bug reports"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/mail-lib
-app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/gnus/Manifest b/app-xemacs/gnus/Manifest
index d9da3edc9e5f..bcfe6037de24 100644
--- a/app-xemacs/gnus/Manifest
+++ b/app-xemacs/gnus/Manifest
@@ -1,7 +1,5 @@
-DIST gnus-1.99-pkg.tar.gz 3636886 BLAKE2B 5345498a95388998c5cefe65c20991ae34386e582e291c45d51194e509670ec395b2d4ad164ca219e4892a7377030bd769b2e76e3f624b6751d60f2a5161bb5d SHA512 f938e77d2a93e29b7eb89db5b67d717a55ff36e827b7ba3ea1d114f59eda763e06933b645fe42d51a53c483f1e6fe74c669d595af36aa97b30cb97f5ca39db79
 DIST gnus-2.04-pkg.tar.gz 3628467 BLAKE2B 1b6f6ffd4693065a666353e87cf5ec4ae5f897470fe1423f43c5f3ec99c827f6c9074c70f4add6cbf7462491ee0a50b8faf0b9f6e1d4cab16d23e64e20d07975 SHA512 d7bce3b6ff62ca901e9dabf59a5bf2044ec569ab1dd84898f11cb966dc97bc35b1842b61c62ad024e200db4bd1df9f7d17fd642c251e42931603b0eb286356e2
 DIST gnus-2.05-pkg.tar.gz 3615284 BLAKE2B c06784a2e7a42df390f67b3e2e4dbba2a427b932bb4e2e864b2bf696adda8bff16d61892167219f5b391befd2ef667f36b67304b22d3e80cb63a6e7a47df485c SHA512 892b76ec6a57d8359d48cfda322ccd7679a018d2f7e6bf40b5d4c412dcac0fe3ea42e94decb05d5ada4765e323646c1eae6d30f1ade97ae30ded07355279a75a
-EBUILD gnus-1.99.ebuild 590 BLAKE2B 9356ed44b129999ad090b20fb4de9a47b8a1453c0340f1e3a53866db4408280bee9929012b7de04f51456ff00634b554bbc697d6f4a193c9f4fa301b1c2156e3 SHA512 9ae505201fc7697eeaa92bfb6f1cda7f22f60c933232b648eb6a25910c13d2213f95d6a8aff5109d81d7ea6b35210d5a19c99d2fcd47050b7aa48ce7adabe066
 EBUILD gnus-2.04.ebuild 562 BLAKE2B 981f97ca6f2ddf0ac3060c10b12119f8f83e08537c7d58ebb95abc46918b13bf039cb668fa7f67e61ee93bc178f2a5d43a2803f91fe28fcc7803b3545a4084fe SHA512 8447da2c422f2d8045b0e9bb2330652f37fe381126b3ab76fe1e443da598b5ced9cad829ae36a51622f5d7b37007fbc67e11a1dd6633b311ff2e5c548f20044f
 EBUILD gnus-2.05.ebuild 595 BLAKE2B 84e9bda8c1465071a0011601521480a2c5131258e9d493728c8f22ea15a21e440fe14afa3c52903a9c4d8a7d7b9cd3b1cacf8ed3618503af12796080e82e248f SHA512 555b41a9da1aa486fa9e009b8c6d9092cc396e6972fb141d7eeae7e867dc692417d141792a502a401903f8308ebdccfcccd40a035529db43fe72d5a34463926a
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/gnus/gnus-1.99.ebuild b/app-xemacs/gnus/gnus-1.99.ebuild
deleted file mode 100644
index b1c3cc278d17..000000000000
--- a/app-xemacs/gnus/gnus-1.99.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="The Gnus Newsreader and Mailreader"
-XEMACS_PKG_CAT="standard"
-
-XEMACS_EXPERIMENTAL="true"
-
-RDEPEND="app-xemacs/mail-lib
-app-xemacs/xemacs-base
-app-xemacs/xemacs-eterm
-app-xemacs/sh-script
-app-xemacs/net-utils
-app-xemacs/os-utils
-app-xemacs/dired
-app-xemacs/mh-e
-app-xemacs/sieve
-app-xemacs/ps-print
-app-xemacs/w3
-app-xemacs/pgg
-app-xemacs/mailcrypt
-app-xemacs/ecrypto
-app-xemacs/sasl
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/guided-tour/Manifest b/app-xemacs/guided-tour/Manifest
index 6c4fe0d9695e..1c482874a985 100644
--- a/app-xemacs/guided-tour/Manifest
+++ b/app-xemacs/guided-tour/Manifest
@@ -1,5 +1,3 @@
-DIST guided-tour-0.52-pkg.tar.gz 1450982 BLAKE2B e201ec081b563998f269dd051e298591be1a885270b8e05b1c4f8e905f977ffcd173b5ea7b684a461866939490d783ef52e6d2c12c659065b542ec85d344b038 SHA512 160a4a1a70acaf6e6b02e5d9b3a0fa1d5a31accb98a3b9ad131d08dbc0366163cee21ec912aaa0c2bde7f0c785e01c417f3541bca0ba2eed8a88ad30c0a44691
 DIST guided-tour-0.54-pkg.tar.gz 1451029 BLAKE2B 015887c44331679d09a32559271da90af8b713ee20cb48ebd680c2cc0efeb993ef8bfbfee70c0dacdef52d0c7ae80edfee6c64dd7bd6a816870b9abb926834d0 SHA512 fd395b0b340e0962b589a37cae4af8f2a1c36259c4417019857dcc7dc2ae10b55df754883e618a35cb95e94358f669f557dd173c1da85b251982ccb4b34adaff
-EBUILD guided-tour-0.52.ebuild 242 BLAKE2B 434e345c29ac11bbb80de8811000f3f6fc801a4a2b3d125813ba13b8f96b6f848782acac5d167777d0735980f4daa92666929025b39698ee9d37fca5bacf2b20 SHA512 a4cd91a344fb1c1939bbd1af330cfdd6549ad0863274845e593c97a276045657194f50dbb6d66d7d37b3aefba4ddae064a79302d76d17696d024acd769501751
 EBUILD guided-tour-0.54.ebuild 242 BLAKE2B b6f5cc75ea1571b5c4afdfaed8ab034ee009837999a672fe9a2dac234a2d66c9ce7fb7bd37f6e248ffb7522674b70be018bf6ce3ccaf235aa678f8b181e72394 SHA512 5465510094e024e922ccad5069264d57d0de006f50e4c598bb65913477abfc681e4a7c18d12f48c12ab797df6b123c87954041ff1580199c43bb3ed4551ec327
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/guided-tour/guided-tour-0.52.ebuild b/app-xemacs/guided-tour/guided-tour-0.52.ebuild
deleted file mode 100644
index c1bacaeb4fb2..000000000000
--- a/app-xemacs/guided-tour/guided-tour-0.52.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Phil Sung's Guided Tour of Emacs"
-XEMACS_PKG_CAT="standard"
-
-KEYWORDS="~amd64"
-
-inherit xemacs-packages
diff --git a/app-xemacs/haskell-mode/Manifest b/app-xemacs/haskell-mode/Manifest
index ca7048bebb90..9e81d74c443c 100644
--- a/app-xemacs/haskell-mode/Manifest
+++ b/app-xemacs/haskell-mode/Manifest
@@ -1,5 +1,3 @@
-DIST haskell-mode-1.11-pkg.tar.gz 110350 BLAKE2B 05acfe43c5fbf87dd97543d300c41695ee1383267dc0e88aa2b0ae9e2b84b179127500b5d292280099b77597fb93bee4504544979956a814d081b99bb0b88861 SHA512 719b65cbf70680be25912a972fc1c4ce4609bd93f6decac6904b8d8b6266d466c577eb1a60d179f4d356af96f755f24b2802a2803be27e01be0132a22c75abb0
 DIST haskell-mode-1.14-pkg.tar.gz 110367 BLAKE2B e59067f89993eeaa79f07110afdee88405a8b0c4ada8d817bb3e0dfa83baba1b8d1e5c1e7ce676cdc37aff02827746a29d1c2c4408d301a88e192dcecf13b509 SHA512 d3bbb6989182f8c2a432fac8d33c5a0deaf7e043a7b91f85a1016584beee5d45d5b480c1c810bbb8c78c56af61cec52ee3ef4e0467a098e080af5d1dfbd71442
-EBUILD haskell-mode-1.11.ebuild 349 BLAKE2B 84fd3ba07436ec799fa95cf2bdd04c3d4683fc9c51a51ab8ef31bce50b3030af43a5f04b0e4accf0888962cb049fa3d39eb99c2e55f4c426e2c79ddaaef31f8f SHA512 f1d13be9ac996c400cce814ef5943cc9afe4819929e8935e05711f4397d1f4862b6ad3a059fc806da15bb9dc4d8a967691a8db8d16c59e740299c130e5e335e2
 EBUILD haskell-mode-1.14.ebuild 349 BLAKE2B 84fd3ba07436ec799fa95cf2bdd04c3d4683fc9c51a51ab8ef31bce50b3030af43a5f04b0e4accf0888962cb049fa3d39eb99c2e55f4c426e2c79ddaaef31f8f SHA512 f1d13be9ac996c400cce814ef5943cc9afe4819929e8935e05711f4397d1f4862b6ad3a059fc806da15bb9dc4d8a967691a8db8d16c59e740299c130e5e335e2
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/haskell-mode/haskell-mode-1.11.ebuild b/app-xemacs/haskell-mode/haskell-mode-1.11.ebuild
deleted file mode 100644
index 54ca4ffa5aec..000000000000
--- a/app-xemacs/haskell-mode/haskell-mode-1.11.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Haskell editing support"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/dired
-app-xemacs/mail-lib
-app-xemacs/xemacs-base
-app-xemacs/edit-utils
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/hm-html-menus/Manifest b/app-xemacs/hm-html-menus/Manifest
index 5e2d1c530755..dda3e58e6a79 100644
--- a/app-xemacs/hm-html-menus/Manifest
+++ b/app-xemacs/hm-html-menus/Manifest
@@ -1,9 +1,5 @@
-DIST hm--html-menus-1.23-pkg.tar.gz 179091 BLAKE2B caac889d17634f85084db88f4b6e2d97e0aa69224f52ae1e68daa536b7c339b8d1ab55e8b04f9ba26173b07e0bbfc8e6850285ff39311a30ff33d34b70671e9d SHA512 9197c8a5c8bdf10c69e974ef80c51cb3849fd86f6ac40cccc50bf044f09d47d0f8ab77c637789a3175024ed8f818cbe0ffcfb548028e7cdcc112f81e0b2c3e54
-DIST hm--html-menus-1.24-pkg.tar.gz 179443 BLAKE2B 91c8d753f7687b12f0d0b95393a21a3d05705725dcf9f1ed9eff44949763f3c6ec06367cb7df8d0ecf1aa11fbeb7409df316781dc51b0db37bd9a7ca53f77434 SHA512 2576ba402fbbb6a538e497c88fd3472c37f7047c75a41396a94e17984021fa3c2bcf2c0c7c2c81a4a1a711d1dde474ad7505b7c78d7300d46a64ce3fdceded7f
 DIST hm--html-menus-1.26-pkg.tar.gz 179409 BLAKE2B 483ec82621700591f47128f9268b0c839d9094cff1044ac00deea0c4d1629bd7a6d4a66d7bd4db7e3ef54a73e89574ec23a1568a204b05713ffedf083396dfe9 SHA512 943c3e5667ad1f2caf6d66ef046e744c90cd1a2b7f06dcbf1e935cda984b62365b34b74e66f014c79e1a1bc0b97b183f85846d59a9f3da1aa400cb3d39949ce1
 DIST hm--html-menus-1.27-pkg.tar.gz 179441 BLAKE2B 3ec0aff8ca7697576c82cc0efef441996d950784363b69662f048892c541c0e532f221c514f62fb94070cd851bc2929371485c555336d624c6662a61860d69af SHA512 91856d8687803c486935ae85f6252ae94f3c04af32285ee3993c1f796488c7234f5d24b834ced3e574b2b1046ad72f562fad61b69e4bb733ff75696bf9945218
-EBUILD hm-html-menus-1.23.ebuild 369 BLAKE2B 8793cca6a963e896f6359a141d96b06e5171c57453a343783e393834ceab1d59e1975b3bbd57c8a8fe9225fb1a1971a7c7bb20172e71b8427d009bfca7a64440 SHA512 87951bf6395b6c5c1124dafda84634a58472e16dcde8cd4f27981aebe781d2b9d87685931c490383716f6c068333625089e013a9f7991bb8ed03bce459af1e7f
-EBUILD hm-html-menus-1.24.ebuild 369 BLAKE2B 8793cca6a963e896f6359a141d96b06e5171c57453a343783e393834ceab1d59e1975b3bbd57c8a8fe9225fb1a1971a7c7bb20172e71b8427d009bfca7a64440 SHA512 87951bf6395b6c5c1124dafda84634a58472e16dcde8cd4f27981aebe781d2b9d87685931c490383716f6c068333625089e013a9f7991bb8ed03bce459af1e7f
 EBUILD hm-html-menus-1.26.ebuild 380 BLAKE2B bd1dda03355303abe66f5c43f1a7460b4a1619fc1329c9074f3eedda8c6ea3991db8f4b5d640682570eeb65bcbb2d0018ffeace4c5f8b9cec35f7dd8a188c0f0 SHA512 90acff24200f374a6837a5ad977b1f319a4fa8699787406fa0e0a9110f4da22b4ce06fafcee15e490d63f996853a54dfee86d46d7e2bca572b63b2e83802dec8
 EBUILD hm-html-menus-1.27.ebuild 431 BLAKE2B a58354af41f1ab1abb6f1902bbbe772040c0d91e1982ebe375cccaa562adf4c309285858ed00a4e1016fe2c2014e9f7b9721b84e4d3452ca9ea5ddf664f8b75d SHA512 5d96f5f65aabec7876e463552e561e549dfaf92fe10c025fa95707013bcbc5d12505a73aff57eeeb8ef3f176a16d5f1050ba777afc19634524c0df036760b594
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/hm-html-menus/hm-html-menus-1.23.ebuild b/app-xemacs/hm-html-menus/hm-html-menus-1.23.ebuild
deleted file mode 100644
index a698089802bd..000000000000
--- a/app-xemacs/hm-html-menus/hm-html-menus-1.23.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="HTML editing"
-SRC_URI="http://ftp.xemacs.org/packages/hm--html-menus-${PV}-pkg.tar.gz"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/dired
-app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/hm-html-menus/hm-html-menus-1.24.ebuild b/app-xemacs/hm-html-menus/hm-html-menus-1.24.ebuild
deleted file mode 100644
index a698089802bd..000000000000
--- a/app-xemacs/hm-html-menus/hm-html-menus-1.24.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="HTML editing"
-SRC_URI="http://ftp.xemacs.org/packages/hm--html-menus-${PV}-pkg.tar.gz"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/dired
-app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/hyperbole/Manifest b/app-xemacs/hyperbole/Manifest
index 19ca144693df..47ccba8c9eec 100644
--- a/app-xemacs/hyperbole/Manifest
+++ b/app-xemacs/hyperbole/Manifest
@@ -1,7 +1,3 @@
-DIST hyperbole-1.16-pkg.tar.gz 636211 BLAKE2B 87099625589e1bc8d39f9d3c6ea102f6796f8a74067b0234955dff355c1f2dd2781b0825f5885f750fe6440087cdff2d219496a0b1e018d63d1472b88f83c889 SHA512 f0064bf8580c321cd73922cbf651fcd9242ab8aa409ad2eb99ae620f1e284abdd24ad0fa104636646b974f15892d7d7e895fdd35603e42827f3f06c3eca86964
-DIST hyperbole-1.17-pkg.tar.gz 555380 BLAKE2B 35deb594f6fc9c335d8e5f35dce0eb0581a0aa7c0b85dbfaaef9e50250b56e6d00cca2c633dca71e56e241f342535871393ee706598e4cd06d3db3a309e89cd8 SHA512 154e750124df8a610695847c041a3588404b4d2524dbe60a7ab86e546d4920eb95cd7abe34f82535d7c2869fbb80f12349ac41e87a67b614dbd19df034fe4c03
 DIST hyperbole-1.22-pkg.tar.gz 555128 BLAKE2B 1774c3ebf35ed0806308bbb8138e9ee45ad8b0efece0d718ab1226429f6dab34f7e4582178bdd1403b47f965b5272950131238b443f645dd22fea7ca4c3ddfd6 SHA512 726a1fa769df822e077d649d7d24664b1293d7402afde832616d5fe9d1bc5cbb2db205cf78844559cf189ddbfba5c05140df300a9a2d7c1f95994c5cf476cae6
-EBUILD hyperbole-1.16.ebuild 500 BLAKE2B 7d6921a1077196d272e7d8d68d71d3836bd5c5e899d6b10429a72e87172317349a5d591e205d54946bf82f3db9d85f5e080c796eefd1172d7e3adae348544183 SHA512 94640092c63a25c3e705cdd213aee650bca43cd89fe0dfde9afcd9b82edb3205cbfdc694b53ae87b35d9bc4001af8596270ce6389260591570e0476fb2dd250b
-EBUILD hyperbole-1.17.ebuild 519 BLAKE2B f53d375e4d057fbd9e5eabf9636448e7c182cb58519c0628203850094d007eafa07a01b245c428e6976962333771c0c1828fc3232a26b646327fdc5d7e50b0f7 SHA512 4dde6099710d2664616195cca7c08c9f565406033d659ee1be008e213e875c3ae5794748e1322250a385ea421f6b894bce915394ad69ef2bcf46ff92ccc42d95
 EBUILD hyperbole-1.22.ebuild 519 BLAKE2B f53d375e4d057fbd9e5eabf9636448e7c182cb58519c0628203850094d007eafa07a01b245c428e6976962333771c0c1828fc3232a26b646327fdc5d7e50b0f7 SHA512 4dde6099710d2664616195cca7c08c9f565406033d659ee1be008e213e875c3ae5794748e1322250a385ea421f6b894bce915394ad69ef2bcf46ff92ccc42d95
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/hyperbole/hyperbole-1.16.ebuild b/app-xemacs/hyperbole/hyperbole-1.16.ebuild
deleted file mode 100644
index f0fddb4b8ed6..000000000000
--- a/app-xemacs/hyperbole/hyperbole-1.16.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Hyperbole: The Everyday Info Manager"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/mail-lib
-app-xemacs/calendar
-app-xemacs/vm
-app-xemacs/text-modes
-app-xemacs/gnus
-app-xemacs/mh-e
-app-xemacs/rmail
-app-xemacs/apel
-app-xemacs/tm
-app-xemacs/sh-script
-app-xemacs/net-utils
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/hyperbole/hyperbole-1.17.ebuild b/app-xemacs/hyperbole/hyperbole-1.17.ebuild
deleted file mode 100644
index c7ee4903f83a..000000000000
--- a/app-xemacs/hyperbole/hyperbole-1.17.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Hyperbole: The Everyday Info Manager"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/mail-lib
-app-xemacs/calendar
-app-xemacs/vm
-app-xemacs/text-modes
-app-xemacs/gnus
-app-xemacs/mh-e
-app-xemacs/rmail
-app-xemacs/apel
-app-xemacs/tm
-app-xemacs/sh-script
-app-xemacs/net-utils
-app-xemacs/ecrypto
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/ibuffer/Manifest b/app-xemacs/ibuffer/Manifest
index 380a6e0a2d3d..9d35f36375b0 100644
--- a/app-xemacs/ibuffer/Manifest
+++ b/app-xemacs/ibuffer/Manifest
@@ -1,7 +1,3 @@
-DIST ibuffer-1.09-pkg.tar.gz 89926 BLAKE2B 3d8cac6a487e281fd73cb443137421a85367f6141b2dad3f6530540a7764b4c3f9ba7e3551b243815cd97846afdba7811cc0c3b6a02f45e6d48f31392aeb3915 SHA512 d5a9d4aa5fa9fbbab7a50d488742c271d2810f5312f7e1db04c2ef600e94473acf6a6c6e6bbe5f1ba4c35f2f550044a0f8847a7cbc0963386b18fa2ad36be1d2
-DIST ibuffer-1.10-pkg.tar.gz 87849 BLAKE2B 54e5b403d50691cc3a0989f1aad9c043d815a6b092237c8cee218b95c5b65e8b3b8bddd620546952d4d1a391c6758803dd288582e584e0534abe73c549765a28 SHA512 698ab658eabbcefe7826d8fe01978bae33158275727b61a404b8f7fcb6361b9c3bb502e50123a05e789571b06f4d113ea64052c90f669f5648d4050f5d25ad31
 DIST ibuffer-1.12-pkg.tar.gz 87663 BLAKE2B 895d5622534c6e25f6f3a4e1ec352fe481d965514eb75d41200dcf72cc0506239785b1f2f1fd4ffc73bc4de70e7c031564849490042f9f589fd313d842c071a3 SHA512 3ae3f79cddcb2c45ec485d8e0debf8b835c64fa0b4f4fa06a98ae682153d5983fe156982c784d26188a47f9a89cc9a370b88ded703b9672bd8f76fba41c7d3c9
-EBUILD ibuffer-1.09.ebuild 303 BLAKE2B ed2d194c698d8a54f72d6d5c29660ca0bd35071a5c013e19ba18aba72b8ec0ab25f51a3e59ec1b4ff361fef20162e778ef8758701c46623b0bb147adba3d30d7 SHA512 cc435f8ee30c125f47ea989d3aa3cba79ceb8a189ab795fd1c75a86e6e6dbee53c2643ed2931f3eff87593004bd4c84a7b35be17916ffe17744fbea03c3af5ed
-EBUILD ibuffer-1.10.ebuild 303 BLAKE2B ed2d194c698d8a54f72d6d5c29660ca0bd35071a5c013e19ba18aba72b8ec0ab25f51a3e59ec1b4ff361fef20162e778ef8758701c46623b0bb147adba3d30d7 SHA512 cc435f8ee30c125f47ea989d3aa3cba79ceb8a189ab795fd1c75a86e6e6dbee53c2643ed2931f3eff87593004bd4c84a7b35be17916ffe17744fbea03c3af5ed
 EBUILD ibuffer-1.12.ebuild 303 BLAKE2B ed2d194c698d8a54f72d6d5c29660ca0bd35071a5c013e19ba18aba72b8ec0ab25f51a3e59ec1b4ff361fef20162e778ef8758701c46623b0bb147adba3d30d7 SHA512 cc435f8ee30c125f47ea989d3aa3cba79ceb8a189ab795fd1c75a86e6e6dbee53c2643ed2931f3eff87593004bd4c84a7b35be17916ffe17744fbea03c3af5ed
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/ibuffer/ibuffer-1.09.ebuild b/app-xemacs/ibuffer/ibuffer-1.09.ebuild
deleted file mode 100644
index 9d886352a98f..000000000000
--- a/app-xemacs/ibuffer/ibuffer-1.09.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Advanced replacement for buffer-menu"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/ibuffer/ibuffer-1.10.ebuild b/app-xemacs/ibuffer/ibuffer-1.10.ebuild
deleted file mode 100644
index 9d886352a98f..000000000000
--- a/app-xemacs/ibuffer/ibuffer-1.10.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Advanced replacement for buffer-menu"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/idlwave/Manifest b/app-xemacs/idlwave/Manifest
index add28354739e..3bfdb2b3cdd9 100644
--- a/app-xemacs/idlwave/Manifest
+++ b/app-xemacs/idlwave/Manifest
@@ -1,5 +1,3 @@
-DIST idlwave-1.32-pkg.tar.gz 520863 BLAKE2B 1156dcb89c9900ade58f35de3fae1e6cad96fa7dcbfeda30a9097108614bb5d1f8e8e618112dd47320700d36165ee11abee86e41d8a0cf944a8c32c9c3f5904b SHA512 deebd2e3f49e8a0cf057735a6639f890da5282edbb67cc35bb653456d488e9d0c9f5c69a73a70023f276d7c8df974d9b9a3400c2a7ef1e0bbc4c07c416353995
 DIST idlwave-1.34-pkg.tar.gz 522052 BLAKE2B 3ceacc3d56ee54a678dbb4db84691eba451e382e1c0492efb13ad02a60efd9c046616dac8be838f82d4de2cb77dbba2ad1b9438af502d3133794f839bc1d9dce SHA512 ed4904fbd6f37dcce063c5507b2258d64e0909419ddf1f8dfa0b4526a99412a422b819560c502f92033071025d871b4f6f63ac18c7dce9970ad2fb54622d4bea
-EBUILD idlwave-1.32.ebuild 365 BLAKE2B dd875e801728fe0bfaa089d0caac7db792d04b4f6303563a44436d6ce688c01d18001e579f19d4f81b8d13534ae5e9d611e4c421aa2b6d177c2d0eb213172e3d SHA512 dcfd67531a2c3261af1ce6340a78a51047179420b890fae3ba84c5cab05af195be583496580bd1bcd96d53c6d0540afa65f72bfcd9fc1e73e92552f6b72c8221
 EBUILD idlwave-1.34.ebuild 365 BLAKE2B dd875e801728fe0bfaa089d0caac7db792d04b4f6303563a44436d6ce688c01d18001e579f19d4f81b8d13534ae5e9d611e4c421aa2b6d177c2d0eb213172e3d SHA512 dcfd67531a2c3261af1ce6340a78a51047179420b890fae3ba84c5cab05af195be583496580bd1bcd96d53c6d0540afa65f72bfcd9fc1e73e92552f6b72c8221
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/idlwave/idlwave-1.32.ebuild b/app-xemacs/idlwave/idlwave-1.32.ebuild
deleted file mode 100644
index d74daaa7b778..000000000000
--- a/app-xemacs/idlwave/idlwave-1.32.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Editing and Shell mode for the Interactive Data Language"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/fsf-compat
-app-xemacs/xemacs-base
-app-xemacs/mail-lib
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/igrep/Manifest b/app-xemacs/igrep/Manifest
index fac058d8a998..90bfb45b5278 100644
--- a/app-xemacs/igrep/Manifest
+++ b/app-xemacs/igrep/Manifest
@@ -1,7 +1,3 @@
-DIST igrep-1.14-pkg.tar.gz 20838 BLAKE2B 5dba352e6084d9f9b6715d5a855cfbaf9e79d4e198bbd373b6e25e61f6c8cc38f19d83b0672618778eaa243695a2748c6a78ae75dfb0a25278eaf18950c2df4d SHA512 f5fd38a84cd46478bf48bb2c8629aefba9e5e967c66b0dca716df9d7a840871e9874b3786d95820219c8b00b7beafe770e3363352f1384a18bb0084ee1ed0f8e
-DIST igrep-1.16-pkg.tar.gz 21993 BLAKE2B 688a1dd31421a07558da5d567d31d2ba14bc847943e201dc136023e5bf5a2aa595a3b0227d2cf38c0f0fc3f591316ec03a340390362953aafc432bedbf48e921 SHA512 0cc70a42434398e4e15240935660477ba7104e9531d7f87f5d5fbaa73b3f36fe8016d17211270a5f7274478335930b970430921a94571b28b39d0da96d579a0e
 DIST igrep-1.18-pkg.tar.gz 22032 BLAKE2B 57d8cfec4b210e52368bc5879f015323ad494ec6503f8ecd568f0ac3e12c7cdda40c08e1fd63ab006570342cc629e527c906ecf274e441d72b7134bb20e32c32 SHA512 c2e4420b43c00f38a368016ec46c2f8d24580c7d2d36d269be942d81af07b8997d402185d08a81acd863fda0716b4c0ae17dde812ea440b06672885638ce6f2e
-EBUILD igrep-1.14.ebuild 326 BLAKE2B 085493d05f520a37f729397d2de0309d91527ba3732e1ac018f6b7d23d63b6c30c9f53bd181aa8098db47c5e53f58c2add0201fccaa365b80a6c2226ca293da8 SHA512 c35a366c0470447d033774012334753cf1cd7f139c8f516fd70a9e1d85d3dc808f2b408eaef6b66fa502dd923304600db06df2d895f9612555d785148ab21c6b
-EBUILD igrep-1.16.ebuild 326 BLAKE2B 085493d05f520a37f729397d2de0309d91527ba3732e1ac018f6b7d23d63b6c30c9f53bd181aa8098db47c5e53f58c2add0201fccaa365b80a6c2226ca293da8 SHA512 c35a366c0470447d033774012334753cf1cd7f139c8f516fd70a9e1d85d3dc808f2b408eaef6b66fa502dd923304600db06df2d895f9612555d785148ab21c6b
 EBUILD igrep-1.18.ebuild 326 BLAKE2B 085493d05f520a37f729397d2de0309d91527ba3732e1ac018f6b7d23d63b6c30c9f53bd181aa8098db47c5e53f58c2add0201fccaa365b80a6c2226ca293da8 SHA512 c35a366c0470447d033774012334753cf1cd7f139c8f516fd70a9e1d85d3dc808f2b408eaef6b66fa502dd923304600db06df2d895f9612555d785148ab21c6b
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/igrep/igrep-1.14.ebuild b/app-xemacs/igrep/igrep-1.14.ebuild
deleted file mode 100644
index 792e971a81bd..000000000000
--- a/app-xemacs/igrep/igrep-1.14.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Enhanced front-end for Grep"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/dired
-app-xemacs/xemacs-base
-app-xemacs/efs
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/igrep/igrep-1.16.ebuild b/app-xemacs/igrep/igrep-1.16.ebuild
deleted file mode 100644
index 792e971a81bd..000000000000
--- a/app-xemacs/igrep/igrep-1.16.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Enhanced front-end for Grep"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/dired
-app-xemacs/xemacs-base
-app-xemacs/efs
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/latin-euro-standards/Manifest b/app-xemacs/latin-euro-standards/Manifest
index 9127e3c93f28..070f42a27e50 100644
--- a/app-xemacs/latin-euro-standards/Manifest
+++ b/app-xemacs/latin-euro-standards/Manifest
@@ -1,7 +1,3 @@
-DIST latin-euro-standards-1.07-pkg.tar.gz 13887 BLAKE2B 5a97c6639668d77e376af24ffa14723acd2b40a4bac0fad334f881319a537d5d610a9ddfa0a0f021e5fdba8df684bb0c3c5a514c8efbec52aaef684b1a546b24 SHA512 71e666f40be2e299394400235ab8d4474807feb7f8e041ad8f55fc743c71feb4edc71cebdc7a19a1cc22949752d4af297b16c1c03520cc17b1ed5882d6f4fc6d
-DIST latin-euro-standards-1.09-pkg.tar.gz 14360 BLAKE2B 00ce57c201c0e815f30eb284d04a04cb3670a2a8af8ef721d7fb46c926ab7a882d0ff23a8311900619347cc8daf85d9a73cb3ef43980cd179da16b119f138ce1 SHA512 d76928736b98bd8c27aa8624de23702ca1f3f121ea926cfb11306bb6a5c64f452474ca643da63ce3801e5ddf757d67f28f92ce95fe885d56ce6f4e9baecb55f3
 DIST latin-euro-standards-1.11-pkg.tar.gz 14443 BLAKE2B 19c7675b682ad3d68325eddd6f0ff9c831347ecb27e8db98c1deb55eef4f866d60369f433b2a8577297117d338c936f6938a451bf5fcf79d3914a5fb74acc8e5 SHA512 ab7f05609ead5176a9effcad7aad29cf5e86a7954c8dc64e99cc4901f8551262a7e770888dce3855ef66349b85980c29eda895e7a619ea87fa239dbd420e2695
-EBUILD latin-euro-standards-1.07.ebuild 330 BLAKE2B 31a862d04201bdf65bb90449058cc9601475a87365c11647693740552abe3a46001ab1029e7666dc4a004a96494267837fe743965275f985de898a0ae43873b6 SHA512 a8bd1367669047d3ffa814c9101869105d2864776ce733cf64cc47cf2ea15686856ffbbe79d983ad330e6d951fec3546391824f44bac5c28ded0a42c60241452
-EBUILD latin-euro-standards-1.09.ebuild 330 BLAKE2B 31a862d04201bdf65bb90449058cc9601475a87365c11647693740552abe3a46001ab1029e7666dc4a004a96494267837fe743965275f985de898a0ae43873b6 SHA512 a8bd1367669047d3ffa814c9101869105d2864776ce733cf64cc47cf2ea15686856ffbbe79d983ad330e6d951fec3546391824f44bac5c28ded0a42c60241452
 EBUILD latin-euro-standards-1.11.ebuild 330 BLAKE2B 31a862d04201bdf65bb90449058cc9601475a87365c11647693740552abe3a46001ab1029e7666dc4a004a96494267837fe743965275f985de898a0ae43873b6 SHA512 a8bd1367669047d3ffa814c9101869105d2864776ce733cf64cc47cf2ea15686856ffbbe79d983ad330e6d951fec3546391824f44bac5c28ded0a42c60241452
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/latin-euro-standards/latin-euro-standards-1.07.ebuild b/app-xemacs/latin-euro-standards/latin-euro-standards-1.07.ebuild
deleted file mode 100644
index 50a3de2c31d3..000000000000
--- a/app-xemacs/latin-euro-standards/latin-euro-standards-1.07.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="MULE: Support for the Latin{7,8,9,10} character sets & coding systems"
-XEMACS_PKG_CAT="mule"
-
-RDEPEND="app-xemacs/mule-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/latin-euro-standards/latin-euro-standards-1.09.ebuild b/app-xemacs/latin-euro-standards/latin-euro-standards-1.09.ebuild
deleted file mode 100644
index 50a3de2c31d3..000000000000
--- a/app-xemacs/latin-euro-standards/latin-euro-standards-1.09.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="MULE: Support for the Latin{7,8,9,10} character sets & coding systems"
-XEMACS_PKG_CAT="mule"
-
-RDEPEND="app-xemacs/mule-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/latin-unity/Manifest b/app-xemacs/latin-unity/Manifest
index aa2519804d3d..3ad226531f54 100644
--- a/app-xemacs/latin-unity/Manifest
+++ b/app-xemacs/latin-unity/Manifest
@@ -1,5 +1,3 @@
-DIST latin-unity-1.20-pkg.tar.gz 106399 BLAKE2B 3e5270865879a49f0ecd2eace7635df32219834240ed84e1a1953d2ad5c943fbff96b2e6efb3bd79ea1053adcd4a0daa1de9a62320eea313d43b1cbf0dd6e994 SHA512 9e2634c69ba1382113811e31b9bb2a4d3aa5780fb5d98b0bcb3e8c3ae813ff881ae13032318e14000f9ecb2c68d4490cb168ea8b10a373889962ba7c920569d1
 DIST latin-unity-1.23-pkg.tar.gz 106169 BLAKE2B 4b3e3a72a9589a0afd4f5c6c03af269599300f785ae4f7bcf35aac0fd7b24c0d191f225501468f90a5ca9d422b3453d289ef8306fee4e8e24a53f2190dca5a83 SHA512 5fd5b05f0528a83eda423233a6312f7b81f8b9d77987193d2425c9308dbcec391edccc8c16ec1de3d95cacaba809c3e8ba8f170d32c772225ffc780ee5389553
-EBUILD latin-unity-1.20.ebuild 427 BLAKE2B 818a797c9fa0ebe5ab682d64efc34c49677cfab76d2cdf52622cb1c0cfc5ba3d6905f2af723415002cb3c0bf43670376eceacb83e3e98d95f38ce401cea88a97 SHA512 f0024f29b06a65930d3e72d427415a7f74bc705ea8e46936885688bc8c23efd9339c31a066a6de5ee46eaf17ba2f2af5bfc02ac6f69b62136027b8ebe24d9ca1
 EBUILD latin-unity-1.23.ebuild 427 BLAKE2B 818a797c9fa0ebe5ab682d64efc34c49677cfab76d2cdf52622cb1c0cfc5ba3d6905f2af723415002cb3c0bf43670376eceacb83e3e98d95f38ce401cea88a97 SHA512 f0024f29b06a65930d3e72d427415a7f74bc705ea8e46936885688bc8c23efd9339c31a066a6de5ee46eaf17ba2f2af5bfc02ac6f69b62136027b8ebe24d9ca1
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/latin-unity/latin-unity-1.20.ebuild b/app-xemacs/latin-unity/latin-unity-1.20.ebuild
deleted file mode 100644
index f7278d531d52..000000000000
--- a/app-xemacs/latin-unity/latin-unity-1.20.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="MULE: find single ISO 8859 character set to encode a buffer"
-XEMACS_PKG_CAT="mule"
-
-RDEPEND="app-xemacs/mule-base
-app-xemacs/latin-euro-standards
-app-xemacs/mule-ucs
-app-xemacs/leim
-app-xemacs/fsf-compat
-app-xemacs/dired
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/leim/Manifest b/app-xemacs/leim/Manifest
index 01c35bc19b1c..ebc5e803c29e 100644
--- a/app-xemacs/leim/Manifest
+++ b/app-xemacs/leim/Manifest
@@ -1,7 +1,3 @@
-DIST leim-1.24-pkg.tar.gz 1723174 BLAKE2B 103b0f73a3fcb81c7f8f4faab7a59b59b615f8731682eceb927d9307b21f8d1f41449cf9e908fe06579a2802187c39f6cbcf2c22949bed28fe11246bbd5f85a9 SHA512 a5f338e63806802c743b1fc8702612948cccd43cb6ce87cc88059502a6ee3d919e48bbe0e6a34b3338e4d6ed617530e399169c35988cac4e5e17fd096676b83c
-DIST leim-1.31-pkg.tar.gz 1804784 BLAKE2B e18e999335494795f1821e8a6d6e762c1a5db74f61e9ecf8f40dab4fc484ca6ff226799369f71df9628b09c1d92d328895405bd769e0cc62979cae328a1fa9a1 SHA512 1179480967e12a7a9701cba24e40f6bdeb51e57fe32e7f4ead4196e652029fa04e0470dfdbc5aecd4a0caf0b53893a815559c5c550d9dacf7e724c898ce6f26f
 DIST leim-1.39-pkg.tar.gz 1810480 BLAKE2B 1e8be69ef59a89a6498fb51cbf261cdde90c2bcbbb515831dfcb7ec487f3e14842ac8ce2b5949bbb5197632a7d52f69500fb0bc81bb5814ba4f35c693bf870e1 SHA512 d695f725733cb4455e75a4c9b511abdb6c78a9208f5b04dd5ec8641ee8f899a269b72ef8820f3dd780f71bec67979640fb3968f54f4c304b2decaa0e442f4197
-EBUILD leim-1.24.ebuild 369 BLAKE2B 994e828fb64725c6e3b3d2c21b0c9ef236d911532f04857b906b9f2a6c02b7a6154b161276f81928fc16fdf1cff087256cb25d35022fd8e8258787eb30d356fe SHA512 b30103c5c8403ad01169185a303662ac56ac6ec9a3e9aef1c3db77a409620453b0e20959d6bacaa512f8c435f53322c7c4e279bf0fcdf16c636c7c0af6cefa87
-EBUILD leim-1.31.ebuild 401 BLAKE2B 0cb2a142bc63310ed56e20e8eb88a95076310c7300c75d51941ce42536b382623977e0d20af2effdf81727d8e9b4babc3f64af71b5666c320c7ef8eb53ae9f6d SHA512 8343fae83ad8c5b0d675aa7b66f53010f4df24fecdcaa02b762ccc5c5a5606d2529f52eb7bc3d884a8ebae16c4c5cd005b4101d66fea0b42304b97d515a8e003
 EBUILD leim-1.39.ebuild 401 BLAKE2B 0cb2a142bc63310ed56e20e8eb88a95076310c7300c75d51941ce42536b382623977e0d20af2effdf81727d8e9b4babc3f64af71b5666c320c7ef8eb53ae9f6d SHA512 8343fae83ad8c5b0d675aa7b66f53010f4df24fecdcaa02b762ccc5c5a5606d2529f52eb7bc3d884a8ebae16c4c5cd005b4101d66fea0b42304b97d515a8e003
 MISC metadata.xml 262 BLAKE2B e476ea04c86ed4c8225e65e2eab757ba330323bb3976769b3a066ca059a90fa597536aa74fe1ad9f924be96f13a5fdafa663a4ed6f802d06e03dfb7567f52fd0 SHA512 4c936b32a6c7160469a80d2c376ebf09ed8c42efe26beccfbfb0320ad285337f3351c1546a02865605f00c0320fe97dcf0ca1a1465d5d51f35e2347092a2679c
diff --git a/app-xemacs/leim/leim-1.24.ebuild b/app-xemacs/leim/leim-1.24.ebuild
deleted file mode 100644
index 1768d27add19..000000000000
--- a/app-xemacs/leim/leim-1.24.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="MULE: Quail.  All non-English and non-Japanese language support"
-XEMACS_PKG_CAT="mule"
-
-RDEPEND="app-xemacs/mule-base
-app-xemacs/fsf-compat
-app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/leim/leim-1.31.ebuild b/app-xemacs/leim/leim-1.31.ebuild
deleted file mode 100644
index 81703929ae3e..000000000000
--- a/app-xemacs/leim/leim-1.31.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="MULE: Quail.  All non-English and non-Japanese language support"
-XEMACS_PKG_CAT="mule"
-
-RDEPEND="app-xemacs/mule-base
-app-xemacs/fsf-compat
-app-xemacs/xemacs-base
-app-xemacs/latin-euro-standards
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index cbd85f3fbc10..ad025cc05fe7 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index 2f31c7132a4a..09f27dbafc4e 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,9 +1,7 @@
 DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd0447d1951a907f47f77832dcd42df4cb9b5b392feaaa2ea7c79d8bedfcf12e3052957ec012d8bb6b4d1347eb5 SHA512 d870686d2b19bec9925c311f2f0fd370e9797bbad252176a80a998f9c322ecd502b5081826105712e7caf87c03c3e6b70a0e219019e5bff46077d6e8c3c6db09
-DIST asio-1.17.0.tar.bz2 1694631 BLAKE2B 0463355eef1714604290be43247139ea0220c5614c3c280ccf6049b64a2bb920c9eb885cf5f00c7e007caf3b049fe5cd6589dad0cb23cda4994fd31c7ecd8102 SHA512 5978cbf452aff07d6d19a2e641824628f409ab74e2e1a964776dae4c586386149acea56e4c8aa1075b247d2ce566daad640c3bbd15e211df1f73fc7b02964353
-DIST asio-1.19.1.tar.bz2 1842955 BLAKE2B d60c1f98ad563eb7c1b163baac3a5560be1cd712e6b21dedc367b547d62725f22c96cea2ebb4dce1e37163a540ae24d65e9ebc37cde0046c043e83685b7d80c9 SHA512 af4501fbd6965ef2efb1f71cd703dec9bb65aaa62243649899469b711f9260936bbce7d261a6bb0db5ca47b7bccb89f72b219b19a249171c18d0a30fb40607e2
 DIST asio-1.19.2.tar.bz2 1842597 BLAKE2B b2236c33432984ab660eba4c93be32374bb49f688a1e6a0711d7bac322cc4a7f817db209278f216468c6a72b9d3dd564cf298e1f49f8098c3fd9aec7acd66eb7 SHA512 07f9c29d8f02090b4d4b6a1867bcc07a8e9f3388556dff787ca3ba143022eeb63bfac0b5bc264076fed4db3b2e5ec6b7ff0ebefde40ba4753c832032a72d54cc
+DIST asio-1.20.0.tar.bz2 1845826 BLAKE2B a768dc0b9ae380bef07d674507f7571d0bc47e182cdde10b24cee246814874dd7739c523b071dfede61a12059f52e04d7bbd309a03d93070bc1dd4640c253c19 SHA512 6421960abd2cf0c205cc50e86adfe492bca2870b486328b4825dc0cefc9c40cdc085516d474c23e15a73f4c108c0e69add5fab6dbe594a1e53636c5c3027e4c5
 EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
-EBUILD asio-1.17.0.ebuild 1121 BLAKE2B b39f6f2a7060601d146fa3146fc0d487c894cf7ac2a4afb2d6b8370692944853f976b16e70a6e30aa3292f6e5b811a0718b503c6c061b49d63dbe87daac6ed46 SHA512 dd346b7cf8b7ff07ae8ddd387065350d1aefc938bb9dc20ab2c0af7946bb455cb5d1694aa064ca4e601ad477099d4ff96b729de524769510a292577ae27fb40e
-EBUILD asio-1.19.1.ebuild 1128 BLAKE2B 51a905624608b573a9bf246531d1c7d53f0fd685c2b02440b5c9493b2969e7ca418b323c8cf70c9f8caa526412f5f7a2c186520554dfc1d9b562d09f3814e20e SHA512 f08b8c89cd36ca32f6c9f58aa72c68abf9962495a6953f36c7df80f6c149099d0540c1dd26b91188a8e1051ac2380e0a054ced86332e3a659599e74c5b0a6bfa
 EBUILD asio-1.19.2.ebuild 941 BLAKE2B 451a472e38271e36d7bf4dc660c251475ef2781b748c4215330ea0b7db93ff1fa940f119d2fc98893a9667d68a34f9cc7132ee8b3e8b8867450beca8a7436830 SHA512 2cab95165d0414b7d5209cc8938a3f33423679e5909540aa2cdf23ba988e7c122dcb93564b4746566ac369306f495dfdc125082a62a2f0ebaf7352a0880c9fe4
+EBUILD asio-1.20.0.ebuild 946 BLAKE2B 91a50e5f66e132353c4d822df9f5401a662be2257a70e700c2e80dd476ee028bd1030dbb10ebbd9c52a525f5a528a7ca0294237a155eeec92ddaa8ef6e0e278c SHA512 8a21e1e1397b5f7c301cfa35ecd7347cb07b313c0dedafec9b1ad18a4be11f77daaf9cba583a956bdc6ba8ac491fab055bca081c9251e722be1d2f3004b2ab1c
 MISC metadata.xml 487 BLAKE2B 57785b73f498590d36241612367eda9036cc4ce85baa6c59e45a4c4f0b696f24f7bbe012eef33dd2e29a9c82fad82f75639e55f9c7a6e2e001b7ab48b65787cc SHA512 4a4f9713ea7274f730707dda0f2de0e0c19e50166466c0b8c3e5053e44fa5df02866235cfd97ebeaff15271cce662f1ae19383c0023813d429eded937d9b9cfb
diff --git a/dev-cpp/asio/asio-1.17.0.ebuild b/dev-cpp/asio/asio-1.17.0.ebuild
deleted file mode 100644
index 434556c8ecbb..000000000000
--- a/dev-cpp/asio/asio-1.17.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Asynchronous Network Library"
-HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="doc examples ssl test"
-RESTRICT="!test? ( test )"
-# test searches for libssl during ./configure, and REQUIRED_USE is easier than
-# patching configure to not search for it with USE=-ssl
-REQUIRED_USE="test? ( ssl )"
-
-RDEPEND="dev-libs/boost
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		# Don't build nor install any examples or unittests
-		# since we don't have a script to run them
-		cat > src/Makefile.in <<-EOF || die
-			all:
-
-			install:
-
-			clean:
-		EOF
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/. )
-	default
-
-	if use examples; then
-		# Get rid of the object files
-		emake clean
-		dodoc -r src/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-cpp/asio/asio-1.19.1.ebuild b/dev-cpp/asio/asio-1.19.1.ebuild
deleted file mode 100644
index 82d648ca221a..000000000000
--- a/dev-cpp/asio/asio-1.19.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Asynchronous Network Library"
-HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples ssl test"
-RESTRICT="!test? ( test )"
-# test searches for libssl during ./configure, and REQUIRED_USE is easier than
-# patching configure to not search for it with USE=-ssl
-REQUIRED_USE="test? ( ssl )"
-
-RDEPEND="dev-libs/boost:=
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		# Don't build nor install any examples or unittests
-		# since we don't have a script to run them
-		cat > src/Makefile.in <<-EOF || die
-			all:
-
-			install:
-
-			clean:
-		EOF
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/. )
-	default
-
-	if use examples; then
-		# Get rid of the object files
-		emake clean
-		dodoc -r src/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-cpp/asio/asio-1.20.0.ebuild b/dev-cpp/asio/asio-1.20.0.ebuild
new file mode 100644
index 000000000000..0b91e779c0be
--- /dev/null
+++ b/dev-cpp/asio/asio-1.20.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Asynchronous Network Library"
+HOMEPAGE="https://think-async.com https://github.com/chriskohlhoff/asio"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/boost
+		dev-libs/openssl
+	)
+"
+
+src_prepare() {
+	default
+
+	if ! use test; then
+		# Don't build nor install any examples or unittests
+		# since we don't have a script to run them
+		cat > src/Makefile.in <<-EOF || die
+			all:
+
+			install:
+
+			clean:
+		EOF
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/. )
+	default
+
+	if use examples; then
+		# Get rid of the object files
+		emake clean
+		dodoc -r src/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-cpp/ctemplate/Manifest b/dev-cpp/ctemplate/Manifest
index f9eb9c910e54..4ea0a26f7c6a 100644
--- a/dev-cpp/ctemplate/Manifest
+++ b/dev-cpp/ctemplate/Manifest
@@ -1,4 +1,4 @@
 AUX 70ctemplate-gentoo.el 282 BLAKE2B 6004cc2b2e543f47c0c808bf494160c4b7e7e4768a954c1b0d99bc065a89145875dfc2b1e386bdf3a5e4dbb375a0bf5badc45b1666320f2a00fa8bd108f16c09 SHA512 36bc5424cb6dce40026f1d08b8764bf43d42159ff20e7d81484f5baf1c1e3c2042c12b1a60fc3cef48e297e816a12dbc41169988a6537ee41a2e2528b3c834a3
 DIST ctemplate-2.4.tar.gz 391923 BLAKE2B 96b585ed6ca323fc461857e1f2f381e0ca5c229d8c6039c24efcf34fb9ddf45cc36bef141af337e591e1cdd95ca510ea5ba1e539554322c578c25187b1906195 SHA512 4955489e7327bce18802d50fd9dfc8ac12af685e556d1c9d0eb2b7a2f4a9b6086e30be8388d694ec8912623738973d0c76e9ca97196c63c139ee5b468d4858b7
-EBUILD ctemplate-2.4.ebuild 1521 BLAKE2B a2f09889458d826530b80c0c4f348f98d9c80c6d60d414949269d2782de56f85d330fa043dcc20ca28e93932425ee2cfaabce00669f4ea1ec8ea1cd3eac43dd0 SHA512 e4978012875f94d8807d343fc09e46a05afc22824b463226adcd43d2eadee76d1db5c4ecb3db8ff269486438ade74521a22ff53a6dca3410b30b57424c194c42
+EBUILD ctemplate-2.4.ebuild 1521 BLAKE2B c204a0f74ae07e76f005a0bc075aca150693c7ddf2519655c95c21e6de45ac0841e7d7cb4c00e371bc33bd0a208a40400ea9978c25b536b0f94fb4a77f83fea0 SHA512 d7b6773281f8a5d5e3ac872a7285a0256d7036b75145c9a3aafd2f0496a2de804c5186d3b10a098c68e6cdd548de71f3b3bd15fd403d247da377183a064da3c0
 MISC metadata.xml 314 BLAKE2B f6d4b334aa6c7bdc8e813da5170b39f55d111fc1112595fc5000f7b05866a518141d514e6496ad4bfef4c818646bfdccec88fe73a6caf1912c8cf65fb064b1ff SHA512 e9f7539c69d3a229e776513eddddc9a8b7151e4dea8d2782335f169d5a988c8f1e7e28fc3698832bc1fae58d47e5274d608e3ce5772a69bac1a2f4000c39e656
diff --git a/dev-cpp/ctemplate/ctemplate-2.4.ebuild b/dev-cpp/ctemplate/ctemplate-2.4.ebuild
index 0c28fddff04c..369e0bd725d5 100644
--- a/dev-cpp/ctemplate/ctemplate-2.4.ebuild
+++ b/dev-cpp/ctemplate/ctemplate-2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools elisp-common python-any-r1
 
diff --git a/dev-cpp/doctest/Manifest b/dev-cpp/doctest/Manifest
index a6c215d25c8b..7b70374a2af9 100644
--- a/dev-cpp/doctest/Manifest
+++ b/dev-cpp/doctest/Manifest
@@ -1,4 +1,4 @@
 AUX doctest-2.4.6-remove-unused-bla2.patch 665 BLAKE2B 2c91d9905421944f5c2d1fd5ee557203d0ffa949e60ef0899257899b378d50b69b51c368bdd16a6b9db1de588b1c4ee056c738d6085f698b01777301219ec8f3 SHA512 7bd083866864afe4c6afd647489978b973015a38917d368cf26c76e5ecebc038b7cc819b7ed28b5aaaf6a4673b5f53dd60696a14cb850e0ea6184ecc8fd47dfe
 DIST doctest-2.4.6.tar.gz 2277281 BLAKE2B e6835ad33522273a3151ccfa1e760a150e2f0ccc15fb739cb518d8c9b4258f4b1529537bb6f41b285660aa00f1791b30a7db14155d9f23ea54dd11bfdeb81ec3 SHA512 a5cccf085af946003140af688f071a6407d42fc685324a537e3b704ef9de0f2228bd06eabfd1df8da70dec001420dd0b2813e5e4320b5c1da450cb0aadd63788
-EBUILD doctest-2.4.6.ebuild 579 BLAKE2B 722a3ae87ef4ae92d69be89a39ef1551fd2c772c96f5e6de249bfe54e30ec58941477531a92fecd1f96b779d3f33011719c60a20cbb1ac65f964686b96b78446 SHA512 5c9779ecb94c53c20c21204a8b4faa694a2fc271ff4f637c703bb5a1ff635d5de7f3788a373cbcb45dd7e09e7ce797d21b76c1f7d6dfe97c939ca60ffda56af1
+EBUILD doctest-2.4.6.ebuild 596 BLAKE2B 97b362f828df1cc3677f29289d8f1ec34857ad6e53b8043fb8556e816810ac6fd2f506a277f83927bb407112c6e99240dc94ed84f22e814fc42af2c9d3c808f2 SHA512 6afb7c0b5676653386d5a26c518f14de0896a6611976a6cef1790fb46339b2b8edb63d325aac2dfb6f9a162a69d459747ca956111cb5472be07e3c243e3f8de5
 MISC metadata.xml 470 BLAKE2B 015ed231346c9084f15d2fc64775368a20a4a5aeee80f93f36e8c4ec49c2eeee42ad3b3fa05b9602509f1578b5cb939882dd034bba31b74d12491004cb842b27 SHA512 6f57a45c551d475e818b5417897adda318be669e750715cd4dabbd905d6c8df4847ab060498d3a41b50f20cfd66e8f8486d3a9c38f07346ed45b13eee4e15126
diff --git a/dev-cpp/doctest/doctest-2.4.6.ebuild b/dev-cpp/doctest/doctest-2.4.6.ebuild
index 19efed964dd5..4c3df901696d 100644
--- a/dev-cpp/doctest/doctest-2.4.6.ebuild
+++ b/dev-cpp/doctest/doctest-2.4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/onqtam/doctest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 61ce75a78be9..76e011974474 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,5 +1,7 @@
 AUX gtest-1.10.0_p20200702-increase-clone-stack-size.patch 570 BLAKE2B dc6e87cc33314fa15b0bdf78baf6672915befe2c14c695681701975dfb3d6572b2254596789dc1cc2010db2bd391e1d26f17a3a83d6c3aa96a9252a0fd1ea3d5 SHA512 406f1f6e900b0fe2c042cb6d219f20586058e1e7e1af38ffa7059f0d5e6b24cebb7b034237d154d9669a9a860497a36b3c7a0308a0698af23bb07cb29cf38851
 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
+DIST gtest-1.11.0.tar.gz 886330 BLAKE2B d11fdd485f292d96508cbc27a9a444ab69b86571cc594298fd3f0e6d4bd8d6ec20dea848fe11be165d34054b2251ad377f0930f852914feaa1416ff156986a9c SHA512 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28
 EBUILD gtest-1.10.0_p20200702.ebuild 1833 BLAKE2B 68116cb37b4f39dc0c8d2b1d7132c905c207a04b22af6c3c921882f877b85eeb0c6d734905ad4da1837abc5fa952340c666072fe3d25ad5a190f5587f80e4a6d SHA512 cbd8d53c88e299235cff7c7e1517b40d8a1ce03dd099511357677797a3826b82edd011153314e2518e87a15ef0cbf5bd7331081f981f6621695d4c4f5051a3e2
-EBUILD gtest-9999.ebuild 1705 BLAKE2B ac5f3a1f3b3c2c3ca4f06fa59d0f03dabfef0acd1f9d7e8cd8001f1a8e7c498f283a5c1de5958db3b28a8dd19492e716e7ef4dc484752de05dde89bb398f37c0 SHA512 1a0b1964b068bb26e3f7d14699a23f67e08c29f0e90e861fb58192ccf8707c176ce9c6cf79fccd621d700b571dd19537c6103eb8de342acbb101554d49aff5e0
+EBUILD gtest-1.11.0.ebuild 1898 BLAKE2B 79ce4ea6d5691411bea3f6b18d890e323040948e3b34c9bf538cad4d666efed3741b6114d5b36bc2190ae155cc18a16c50d98acf17a96328a66eb7c375c2e56c SHA512 7c9ab9fd7d1491bc36032df95b952f0d5cb53742df962fb7c270fc30886b3db9ce317123231344078e8db600c8335f9a4f542426daa5840eb7a22bd517fd3448
+EBUILD gtest-9999.ebuild 1898 BLAKE2B 79ce4ea6d5691411bea3f6b18d890e323040948e3b34c9bf538cad4d666efed3741b6114d5b36bc2190ae155cc18a16c50d98acf17a96328a66eb7c375c2e56c SHA512 7c9ab9fd7d1491bc36032df95b952f0d5cb53742df962fb7c270fc30886b3db9ce317123231344078e8db600c8335f9a4f542426daa5840eb7a22bd517fd3448
 MISC metadata.xml 566 BLAKE2B 9500d2b76c2ab413e2113a67dc071ef02e3520e2db4996c04205f0d97ac3cc1b2a5f412da27460e9446920765a76507b85aed5d6f2c01a3399ffe095549a4c44 SHA512 abe19d395e258cdb2dca0510cb8d2b4acbc0ea907493672442c1343d9b68a748c244c2ac10044a4e1c659c5bd1e89159fad8ba267fd1d0643447f5d2691aa92a
diff --git a/dev-cpp/gtest/gtest-1.11.0.ebuild b/dev-cpp/gtest/gtest-1.11.0.ebuild
new file mode 100644
index 000000000000..89518bffd1d1
--- /dev/null
+++ b/dev-cpp/gtest/gtest-1.11.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Python is required for tests and some build tasks.
+PYTHON_COMPAT=( python3_{8..10} )
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/google/googletest"
+else
+	if [[ -z ${GOOGLETEST_COMMIT} ]]; then
+		SRC_URI="https://github.com/google/googletest/archive/refs/tags/release-${PV}.tar.gz
+			-> ${P}.tar.gz"
+		S="${WORKDIR}"/googletest-release-${PV}
+	else
+		SRC_URI="https://github.com/google/googletest/archive/${GOOGLETEST_COMMIT}.tar.gz
+			-> ${P}.tar.gz"
+		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
+	fi
+	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"
+fi
+
+DESCRIPTION="Google C++ Testing Framework"
+HOMEPAGE="https://github.com/google/googletest"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.0_p20200702-increase-clone-stack-size.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e '/set(cxx_base_flags /s:-Werror::' \
+		googletest/cmake/internal_utils.cmake || die "sed failed!"
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GMOCK=ON
+		-DINSTALL_GTEST=ON
+
+		# tests
+		-Dgmock_build_tests=$(usex test)
+		-Dgtest_build_tests=$(usex test)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	newdoc googletest/README.md README.googletest.md
+	newdoc googlemock/README.md README.googlemock.md
+
+	use doc && dodoc -r docs/.
+
+	if use examples; then
+		docinto examples
+		dodoc googletest/samples/*.{cc,h}
+	fi
+}
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index 43e102b84c64..89518bffd1d1 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Python is required for tests and some build tasks.
 PYTHON_COMPAT=( python3_{8..10} )
@@ -14,13 +14,15 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/google/googletest"
 else
 	if [[ -z ${GOOGLETEST_COMMIT} ]]; then
-		URI_PV=v${MY_PV:-${PV}}
+		SRC_URI="https://github.com/google/googletest/archive/refs/tags/release-${PV}.tar.gz
+			-> ${P}.tar.gz"
+		S="${WORKDIR}"/googletest-release-${PV}
 	else
-		URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}}
+		SRC_URI="https://github.com/google/googletest/archive/${GOOGLETEST_COMMIT}.tar.gz
+			-> ${P}.tar.gz"
+		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-	S="${WORKDIR}"/googletest-${MY_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"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
@@ -64,12 +66,10 @@ multilib_src_configure() {
 multilib_src_install_all() {
 	einstalldocs
 
-	if use doc; then
-		docinto googletest
-		dodoc -r googletest/docs/.
-		docinto googlemock
-		dodoc -r googlemock/docs/.
-	fi
+	newdoc googletest/README.md README.googletest.md
+	newdoc googlemock/README.md README.googlemock.md
+
+	use doc && dodoc -r docs/.
 
 	if use examples; then
 		docinto examples
diff --git a/dev-cpp/json11/Manifest b/dev-cpp/json11/Manifest
new file mode 100644
index 000000000000..d67e8b3bf2d5
--- /dev/null
+++ b/dev-cpp/json11/Manifest
@@ -0,0 +1,4 @@
+AUX json11-1.0.0-fix-multiarch-install.patch 786 BLAKE2B 5362fce55049ed95f0de5467a53c54bd3e0b82c91fcbefe1d6b8d35629a1d968527157720a19c478690d787a1baac634d4b927424d6e4c27abdc89427fe46b7f SHA512 0ef4a3ff19d2ffbf7772b83782ada2fcd2e3baacdd32d6a74931b035166041b7471800fbb01801dbe9b5b1cc003128dbb406a736da1f016c4cb1980ec11a9902
+DIST json11-1.0.0.tar.gz 13104 BLAKE2B 9f4fef741b40f1d163dd96555a521b6220c47402624baa5446fb94592989a830a0c511162a6af64b76962c8b07b83a324845dc61c1ca91bbb99e2b0511fb962a SHA512 c49aa9ebc75199528a13cd255d9362acb797d73a17fd69fb22673e945b8719a3d70fdf2d886fed342ca13ed1b4ea578534520d87c46c4a418929f9124aee3ec3
+EBUILD json11-1.0.0.ebuild 406 BLAKE2B 24421b0ef162daec04764b4e55782253b58d4127f05db5a2967e4b448bb66084c6ef135710bcc61ee878a4264b02d54e3e20daa4c70116184dbf30ab818e9b33 SHA512 d57f0b1ed94a67b4a3fae34d2ee657913d301c7f6281a53cdd6d768916cc1de5ea73d1af4ecc4fdf50b5b1e7d5b22a3dce44ad90ee89a74567d822fa4f6ac9e1
+MISC metadata.xml 246 BLAKE2B e270b04a529da44d267eaf5bfd160569fc99a3521dfc6495e0a4db19c98e5b9badf77774cc80c7be905f3e97b1c75784bc7b4cb6bfe659d726a47c7ae70e7bfb SHA512 7e2151bbca24beeefd585e18d6c1108442b2d9197679876bb180da3d4896602e83ea701432ff67fc61cccfa9bf642a01a62d87bacf32c55e0a54336c7c5a2c53
diff --git a/dev-cpp/json11/files/json11-1.0.0-fix-multiarch-install.patch b/dev-cpp/json11/files/json11-1.0.0-fix-multiarch-install.patch
new file mode 100644
index 000000000000..fef15e0e153a
--- /dev/null
+++ b/dev-cpp/json11/files/json11-1.0.0-fix-multiarch-install.patch
@@ -0,0 +1,14 @@
+diff -Naur before/CMakeLists.txt after/CMakeLists.txt
+--- before/CMakeLists.txt	2019-05-12 16:45:39.995871663 +0200
++++ after/CMakeLists.txt	2019-05-12 16:44:56.154872666 +0200
+@@ -52,6 +52,7 @@
+   target_link_libraries(json11_test json11)
+ endif()
+ 
+-install(TARGETS json11 DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE})
+-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/json11.hpp" DESTINATION include/${CMAKE_LIBRARY_ARCHITECTURE})
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/json11.pc" DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig)
++install(TARGETS json11 DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/json11.hpp" DESTINATION include)
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/json11.pc" DESTINATION
++    ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
diff --git a/dev-cpp/json11/json11-1.0.0.ebuild b/dev-cpp/json11/json11-1.0.0.ebuild
new file mode 100644
index 000000000000..94fcfeb98c40
--- /dev/null
+++ b/dev-cpp/json11/json11-1.0.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A tiny JSON library for C++11"
+HOMEPAGE="https://github.com/dropbox/json11"
+SRC_URI="https://github.com/dropbox/json11/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-multiarch-install.patch
+)
diff --git a/dev-cpp/json11/metadata.xml b/dev-cpp/json11/metadata.xml
new file mode 100644
index 000000000000..87a759d410cf
--- /dev/null
+++ b/dev-cpp/json11/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 472fd9714814..7f8759ba1fee 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,8 +1,10 @@
 DIST nlohmann_json-3.10.0.tar.gz 7006504 BLAKE2B 2ccb2e50a46a8579b6a848f6fee35ad1ff11a1491157bdf5d343133f24d4468ddfabc4fe4e9909b47011d52b3604566d5d7e275f0731c8d91efd1e1b9c545ef2 SHA512 1531780110260ea4cd8fbe79d860f1ea46fa8377d520669f938ddb5f8a4b11fe550fc7d2d978a281d5ddcc511447d160a2f68c06583672496c57c6672a4036a1
 DIST nlohmann_json-3.10.2.tar.gz 7054440 BLAKE2B e7da213fb75d528b1f5425822f5b598e882f232a67670aaae2d8f89c76e72ee23fa3344d1acfef2b0338a6a423d17b231b7e047ff064c984c2ec7783b721a22c SHA512 9a399dfc8aab19c9fc12470e8087895b1c05d48a9bcc731b483d8670c361cffb2adc3ccced822b7f17255e88387a441d619c4e1f1afeb702d1d035ad24fe22ed
+DIST nlohmann_json-3.10.4.tar.gz 7062443 BLAKE2B 7f526d12c4ce8148c874c76d280090ef69ae3adf817b63758bbcc23ff9476e119ede90bebc397b9bb84b54012f057e3e010d643c595b4699a8ecd437a5a3f913 SHA512 f78592db6218165cbc74c10bcba40366f1bfea84405b7ee25fe97a056d5b7a15aeeb956d93296673928dcbd6e26ffcfb152f885b4a44d5d55751396ccf090835
 DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B 97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090 SHA512 e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
 DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d SHA512 d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
 EBUILD nlohmann_json-3.10.0.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
 EBUILD nlohmann_json-3.10.2.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
+EBUILD nlohmann_json-3.10.4.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
 EBUILD nlohmann_json-3.9.1.ebuild 1564 BLAKE2B 5a5b4e28ec5a79e1f263a7a79b28ff000cfe8b62d56e1d1a6c29ab3fc11deff72e443dba409dc68b431b1e85f86a521f6b2383c8fdda66b6cb656178d2e49c47 SHA512 5cbf13fff01f5e1da5d594e86a3c2c22b135785579391c2d4d6067d95572a9fd0109b5580ae67ebadba745e4a1c8a06f789efdb0c17df0babb6161bbc7beda9c
 MISC metadata.xml 338 BLAKE2B c5eb95ba7048308eab4753ea01c015781ce85db42d2e50f8ed9e3f7fb6945cfb8b90f5b3216799ad53137ceef6eae4636eea482e86206b19589ddf2e42caaaa1 SHA512 4198102ff79678a8e9be9146fc97991b1b205be3d34ebaece3dcab46a36ee5af904f463fcd0dc2a88fb362aa7a81e8d713af7b55db594a7069efc0276c94ff49
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.4.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.10.4.ebuild
new file mode 100644
index 000000000000..39a2c4c723af
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+# Check https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to find test archive version
+TEST_VERSION="3.0.0"
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
+SRC_URI="
+	https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz -> ${PN}-testdata-${TEST_VERSION}.tar.gz )"
+S="${WORKDIR}/json-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc test"
+#RESTRICT="!test? ( test )"
+# Need to report failing tests upstream
+# Tests only just added, large test suite, majority pass
+RESTRICT="test"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( ChangeLog.md README.md )
+
+src_configure() {
+	# Tests are built by default so we can't group the test logic below
+	local mycmakeargs=(
+		-DJSON_MultipleHeaders=ON
+		-DJSON_BuildTests=$(usex test)
+	)
+
+	# Define test data directory here to avoid unused var QA warning, bug #747826
+	use test && mycmakeargs+=( -DJSON_TestDataDirectory="${S}"/json_test_data )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		emake -C doc
+		HTML_DOCS=( doc/html/. )
+	fi
+}
+
+src_test() {
+	cd "${BUILD_DIR}/test" || die
+
+	# Skip certain tests needing git per upstream
+	# https://github.com/nlohmann/json/issues/2189
+	local myctestargs=(
+		"-LE git_required"
+	)
+
+	cmake_src_test
+}
diff --git a/dev-cpp/notcurses/Manifest b/dev-cpp/notcurses/Manifest
index dade93b7e205..dd8dba63d01e 100644
--- a/dev-cpp/notcurses/Manifest
+++ b/dev-cpp/notcurses/Manifest
@@ -1,4 +1,4 @@
-DIST notcurses-2.4.3.tar.gz 10070959 BLAKE2B 8be967d7f1d49936c12c46f4d9c54ac83e974e4f637fa224000a2459d4143590264dc75c4d36d55ec9cfaa0d737de3298e42156a25b3eef84109883b3e80e8ae SHA512 a16d4e8d8108f565fd6f073b9529b6d7d52569d5241ee0df7186b44800a82a5e488d275c01c6af045419a2ae960f14a99fffe0cf5d600b5901973d93d3c82f82
-DIST notcurses-doc-2.4.3.tar.gz 132158 BLAKE2B f96f41c659903e6fbac56318adf1de1b26dd7052e4c5958d60ff7f51c4c30ccf2a522f2581a69a7f54d1cd7774bb72fffc0bba760366294a261a7086611ff696 SHA512 7972d61cefcfa4cfdc3f6138202e1448c37dc2b3154307e4a7c0734e67b80919db75520f40f53c198c268f0f905720e75de4ef0ea7a6c0cd196a355b8dbf1e5c
-EBUILD notcurses-2.4.3.ebuild 1216 BLAKE2B 16d640dceeed8f18983d069f9cf3dd2e67b4de226e8f1ce9146abdeec78a7552e708c0294c6cdca63fe6759c26ed571dfad1b4e4949e478d3469386dd6b30ad7 SHA512 a7f10b981c2d06cd3e6298453087cdfc3fc523189c85fe22ce5e19eaf8646a31067769a7e69a448d1021007cf82f079c2bd1fdb5a0ab90862531c6801e258b80
+DIST notcurses-2.4.5.tar.gz 10082686 BLAKE2B 7205f4b5864cf9c09342a4c171f16be85abe92c1ad445ff31aa180837628b897fee8ce702340b68457b729f741a67d360e233d4344244627ed7bffcc07ae9818 SHA512 0ad1f22b591fd36eea9917c50b51a7811aec9662edec475d5555896115b5c7d3e51487a3b1d67298cfc5472be367d7b8a71b6554811e8e3a4d9d781adc2d01eb
+DIST notcurses-doc-2.4.5.tar.gz 133547 BLAKE2B 65795b4f58eb9f905f17a58e7435579f1bc17e72d0aa8816f6dd7c9f41fc1b8568dc078a93c9184e6324e6c02d3187f36e95f41ba9cf8dbd3dd1be5074b55f11 SHA512 9c29fda1b13530931f7f1768b607371e553f8b1fbd573c4cd80bbfacafa2e9b2eaa2063c4c324e8d9878fe62f44c013ab2402126e97f484a4442e791922c3622
+EBUILD notcurses-2.4.5.ebuild 1189 BLAKE2B 72759d232b0a29d4b61ff59ebcef2222f34656323ffb5f91aa8e5589de0c095c2d3e55b54d2020a7068ce0e5fb8ea1a4e829b2f1d712ca8233bc20fb581ac949 SHA512 6bbee1f5303fa8140de288ebc76b1b21f5049ae5e3aaaa5c1c3494258cf9c487c4cb9868267d6f5f84d183af8cb357b67e0ebec20e312db952c6ab4ea78325bf
 MISC metadata.xml 870 BLAKE2B 67904fea263b93b4fe7cf331087c1c04aed9d8010f73cc38bd9bebe0e695cd67af728bf962c4459c99bbf7218edf02720f3889d24b8184be85a9472faec56f13 SHA512 b418cbe7abf512f9d94637e624eb05831a35d08710431c9a3f53c01d038e273116d1d755308157608fe486aaee60feb99d73f365df1d5d4c7db51f5b75e33c2b
diff --git a/dev-cpp/notcurses/notcurses-2.4.3.ebuild b/dev-cpp/notcurses/notcurses-2.4.3.ebuild
deleted file mode 100644
index 238a985a305e..000000000000
--- a/dev-cpp/notcurses/notcurses-2.4.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS="cmake"
-inherit cmake-multilib
-
-DESCRIPTION="Blingful TUIs and character graphics"
-HOMEPAGE="https://notcurses.com"
-SRC_URI="https://github.com/dankamongmen/notcurses/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/dankamongmen/notcurses/releases/download/v${PV}/notcurses-doc-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/libunistring:=
-	media-video/ffmpeg:=
-	sys-libs/gpm
-	sys-libs/ncurses:=
-	>=sys-libs/readline-8.0:=
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_DOCTEST=OFF
-		-DUSE_GPM=ON
-		-DUSE_MULTIMEDIA=ffmpeg
-		-DUSE_PANDOC=OFF
-		-DUSE_QRCODEGEN=OFF
-		-DUSE_STATIC=OFF
-	)
-	cmake-multilib_src_configure
-}
-
-src_compile() {
-	cmake-multilib_src_compile
-}
-
-src_test() {
-	multilib_src_test
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	# we use this tortured form lest we try, every time we release a
-	# x.y.1 or x.y.3, to install the source dir as a man page.
-	# exploit the fact that there's a bijection from html<>man.
-	for i in ../*.html ; do
-		doman ../$(basename ${i} .html || die)
-	done
-}
diff --git a/dev-cpp/notcurses/notcurses-2.4.5.ebuild b/dev-cpp/notcurses/notcurses-2.4.5.ebuild
new file mode 100644
index 000000000000..56e13b2f06ae
--- /dev/null
+++ b/dev-cpp/notcurses/notcurses-2.4.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS="cmake"
+inherit cmake-multilib
+
+DESCRIPTION="Blingful TUIs and character graphics"
+HOMEPAGE="https://notcurses.com"
+SRC_URI="https://github.com/dankamongmen/notcurses/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/dankamongmen/notcurses/releases/download/v${PV}/notcurses-doc-${PV}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libunistring:=
+	media-video/ffmpeg:=
+	sys-libs/gpm
+	sys-libs/ncurses:=
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_DOCTEST=OFF
+		-DUSE_GPM=ON
+		-DUSE_MULTIMEDIA=ffmpeg
+		-DUSE_PANDOC=OFF
+		-DUSE_QRCODEGEN=OFF
+		-DUSE_STATIC=OFF
+	)
+	cmake-multilib_src_configure
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+}
+
+src_test() {
+	multilib_src_test
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	# we use this tortured form lest we try, every time we release a
+	# x.y.1 or x.y.3, to install the source dir as a man page.
+	# exploit the fact that there's a bijection from html<>man.
+	for i in ../*.html ; do
+		doman ../$(basename ${i} .html || die)
+	done
+}
diff --git a/dev-cpp/tree/Manifest b/dev-cpp/tree/Manifest
index f1c08acbdf3a..9be9423dfbcb 100644
--- a/dev-cpp/tree/Manifest
+++ b/dev-cpp/tree/Manifest
@@ -1,5 +1,3 @@
-AUX tree-2.81-gcc11.patch 933 BLAKE2B c3b1afcd9325e9b452eb5b9279e4542d9f82f7d8de7060efbabecb302c2c064e5a5891533449e33f75c45078b2bc8c5fc7f7e3e8f204118345a02afa5a32b5c6 SHA512 43ec3975ecbd4b38105a2c4980da8ca0b19a5075bb6eaa5cae313c4f2eb5b8d44118dc55b778c5f973bc5ad69236bb94086cf1c72e8d9a9198ad25c14a8b5fa1
-AUX tree-2.81-test.patch 550 BLAKE2B fe73799591f7f0c65d2f031792bc87b2d85bc143bf4adb35e04db712ef95a5ba0e15d8256aec28a0ac95d2306fa45de41d1a8dc5d53629d38ede35fe87cef256 SHA512 a859891662a1093f517f43a6ea14a4e1f7d81988d0fe83253554bea83bfdecde0b51ed05795d0d6f0b3494a7cde6db56a8304397ea5ad9fb2d446647f4301514
 DIST tree-3.17.tar.gz 1178425 BLAKE2B f59239b861c0495c48036d0fffa49370d4cd78a94bfc35348bbbe0232a3c1221293a23366a6289429adabcb00b21292288ce085fa54f74dc204537c95c5b7c37 SHA512 af11f693c13dd37dddf016751c0f975c21d7a5ad405879e18fbe5387400ee1fcfb42942ee8888efffcb0c985d7875f2698591139aeb18b4809e83e225a743112
 EBUILD tree-3.17.ebuild 743 BLAKE2B ee1f494c9b7a0b29c220135e3304e638e45e820718967582814de04e66626ec8dbb6c132fb4e739c4b7cdc49f89f9398da9516fa3900ec8bedeb5a3cc3491c08 SHA512 4d45fa7d72cf2aba431d8fb4560dbae9608b0f6152433c2844af683b767495bbcec666b11bb967b48ce178ed2f28bf11cba2d4699fe31f8dd30b1ae4f67d1a9b
 MISC metadata.xml 620 BLAKE2B 30c1a3c6c5416691c41fa2d587d80e76e72a7c349cc7e57afc723caddb6874cb849cf0db5943a12373253383845b649b522bc1abce65d036fc4757120b3524cc SHA512 ec64c3f8832072c5bac618a3990c6b488be2b6da98514d6ca508c620817c9c7ad40479c96168c7ab0078169f72f68a8e52131fb7b4786b281865e50c9a612e1a
diff --git a/dev-cpp/tree/files/tree-2.81-gcc11.patch b/dev-cpp/tree/files/tree-2.81-gcc11.patch
deleted file mode 100644
index feffe0de13cc..000000000000
--- a/dev-cpp/tree/files/tree-2.81-gcc11.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- "a/simple tree.hpp"
-+++ "b/simple tree.hpp"
-@@ -323,7 +323,7 @@
- 	public:

- 		compare_nodes(StrictWeakOrdering comp) : comp_(comp) {};

- 

--		bool operator()(const tree_node *a, const tree_node *b) 

-+		bool operator()(const tree_node *a, const tree_node *b) const

- 		{

- 			return comp_(a->data, b->data);

- 		}

---- a/tree.hh
-+++ b/tree.hh
-@@ -422,7 +422,7 @@
- 			public:
- 				compare_nodes(StrictWeakOrdering comp) : comp_(comp) {};
- 				
--				bool operator()(const tree_node *a, const tree_node *b) 
-+				bool operator()(const tree_node *a, const tree_node *b) const
- 					{
- 					return comp_(a->data, b->data);
- 					}
---- a/xinlin.hh
-+++ b/xinlin.hh
-@@ -332,7 +332,7 @@
- 	public:

- 		compare_nodes(StrictWeakOrdering comp) : comp_(comp) {};

- 

--		bool operator()(const tree_node *a, const tree_node *b) 

-+		bool operator()(const tree_node *a, const tree_node *b) const

- 		{

- 			return comp_(a->data, b->data);

- 		}

diff --git a/dev-cpp/tree/files/tree-2.81-test.patch b/dev-cpp/tree/files/tree-2.81-test.patch
deleted file mode 100644
index c9e675dc7953..000000000000
--- a/dev-cpp/tree/files/tree-2.81-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,13 +1,6 @@
--
--%.o: %.cc
--	g++ -c -I. $^
--
--test1: test1.o
--	g++ -o test1 test1.o
--
--run_tests: test1 test1.req
--	./test1 > test1.res
--	@diff test1.res test1.req
-+check: test_tree
-+	./test_tree > mytest.output && \
-+	diff -Nu test_tree.output mytest.output
- 	@echo "*** All tests OK ***"
- 
- clean:
---- a/test_tree.output
-+++ b/test_tree.output
-@@ -1,3 +1,8 @@
-+-----
-+hi
-+  1
-+  0
-+-----
- empty tree to begin with:
- 0
-  'more text' is sibling 2 in its sibling range
-@@ -309,3 +314,5 @@
-     D
-       I
- -----
-+G
-+H
diff --git a/dev-cpp/websocketpp/Manifest b/dev-cpp/websocketpp/Manifest
index 4f12659aa83a..275c36c21bf8 100644
--- a/dev-cpp/websocketpp/Manifest
+++ b/dev-cpp/websocketpp/Manifest
@@ -7,4 +7,4 @@ DIST websocketpp-0.8.1.tar.gz 699468 BLAKE2B e5769229b400d2f42e69541b07cfba17dcc
 DIST websocketpp-0.8.2.tar.gz 701364 BLAKE2B dacee33832f493d465afe208f9edea1393414a22c8db8f8c86b8f913521d0d8d68b95673a2e82b7479acfbab1ac541eda2d713a55d5de387b3879461d5884df7 SHA512 b2afc63edb69ce81a3a6c06b3d857b3e8820f0e22300ac32bb20ab30ff07bd58bd5ada3e526ed8ab52de934e0e3a26cad2118b0e68ecf3e5e9e8d7101348fd06
 EBUILD websocketpp-0.8.1-r1.ebuild 1327 BLAKE2B f7bd8864f76bbb9a8f10520d64a64283a74bf6390d95a0240f5a2d075b9d476a49e7a54835bf6311bba15131f73800c4a03b5cbd4b1a7863d0e6dc35b68657f8 SHA512 dcc5ce6f4f13be6d6b880daabe9d9830ba33096afdf5dc6fb576e32394ac5a5f8f90cb79dc121faea8792926fd02554a278ce156e337e10f91d07b1562e81802
 EBUILD websocketpp-0.8.2.ebuild 1271 BLAKE2B 1f7411b49bf296e3c67e336d94c3f0be5abc4b78a3efbedc19e8fb4551926d0865c9d9339819fd19d7dbaaef2293274e7be843a611209322d6824b4f674bbba0 SHA512 f783b260c9c592bce423117ae53821d6d565f531c00a3154bd021c4aea8797baf14e41f2e90ea66dd58013d82f816ffdf91909f447998baa37d4afece6d98e49
-MISC metadata.xml 330 BLAKE2B ab9c9837e31c22bed5ae982debb3b3258aead63ed4ceaf2b7400d5d6bd94e8d86401c7c207dc23fd5eff1f059bfbf6a5a3402f9717d03c6fade8fcfb21bfc825 SHA512 8f7be32ded6af843487f94f62b21f408a0dce9b88adb5dc30db9053fe9500bf8086b97436d29e7b938f79b60c1419fd621838964d261983b78d7d1a0b92c170f
+MISC metadata.xml 252 BLAKE2B 4beafc2dbc69f457e4880196afd696198e1d4006e76836d7581c4a3098bf68d58da79344c88974c92a63303dbd0199d5de0bfd984adbc358ad92da2a9edd96a4 SHA512 20cc70561adba76fc4ac65953dc2a2dfc4b8261d6a56bed78d00b7aa8e0edd507bc851bf7c1dba138b55175dd1d1bb8b4f853fe96242046dc7611ab10cfb0a5b
diff --git a/dev-cpp/websocketpp/metadata.xml b/dev-cpp/websocketpp/metadata.xml
index 5addda310cde..f9e91f9ca911 100644
--- a/dev-cpp/websocketpp/metadata.xml
+++ b/dev-cpp/websocketpp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">zaphoyd/websocketpp</remote-id>
 	</upstream>
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index 5e0cd5d268e7..c6d3f1b770bf 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -8,5 +8,5 @@ DIST yaml-cpp-0.6.3.tar.gz 1398768 BLAKE2B 07abe1c56740105a0af2335bb1cd48086cb61
 DIST yaml-cpp-0.7.0.tar.gz 1033237 BLAKE2B 69a11a8503ad607aa0d54912a5e53d305a643fe2d36dd86fa96832e3d4930b39a85318dc130e438210a9ca60357f3aa9aa6cd0f2b6bc45728b648c545a437368 SHA512 2de0f0ec8f003cd3c498d571cda7a796bf220517bad2dc02cba70c522dddde398f33cf1ad20da251adaacb2a07b77844111f297e99d45a7c46ebc01706bbafb5
 EBUILD yaml-cpp-0.6.3-r3.ebuild 1047 BLAKE2B 48e6082d4d7a9814504ace6472166f026bba2267459080cae0b20774a36bb873a25bb2811ab98b1ac24b349d344b304c9e671518444ebf9f704e78dbeb4b6261 SHA512 a8847865f37d31b0f69025f10f95ccf35bdd6c7badeb1377c24b155f9094fbb13bcbd2bb7e3ef9d6d1f60f57998a3f73074251ed043da694de7a48217694905e
 EBUILD yaml-cpp-0.6.3-r4.ebuild 1073 BLAKE2B a2a1737410781e389494b054d1539dec976d3a193ffaa530ac35f65014008928abc056f0f55caf32f48b18d7f1366a1797c37088be17f6bbbec410ce98655bd2 SHA512 be8bacf1a1a3fddb364405e5533af8e402fe42c3e7a7331f92ef644623871aabc86653f748115659c6ec888bcd824acc8617f367f022e941b92699d45ebe7325
-EBUILD yaml-cpp-0.7.0-r1.ebuild 897 BLAKE2B fe0a2083727c3b6796299747408aeb13746b7c3ae46fc0c0d96358f3a3af3311282bf6044354c8a93cb4285a1b0405f0e5965820953037c200395591c3b70d29 SHA512 bf424f80eaeb22c27e44dc8d85360eb36df562354802c32900e88bfa5f0f17de183902c7fe54bd6b9d79d3f823c48a0abc0119dd8b100690d389e2d94baef490
+EBUILD yaml-cpp-0.7.0-r1.ebuild 896 BLAKE2B 6bd07e0ede4fd7bb0532629a903f7f6824f770edba183caf177a2d70a96e97bf562bd10b62f48a5c6adb68a2599fc174d1b02a0a6f132eba446b91f069aad62d SHA512 4682ca320932043f1cf930f2578446c51afea0a8137fc7eebffbe18ee41c08950562d3fd545e9e1096a7970e5a4d34ad0b0ff1e56f0996e9d4b34629781d51c5
 MISC metadata.xml 484 BLAKE2B e973aef681bed7de47725bab49d2acfe809ad73c97eea709bec9d5bb9d720f89bc222ff77f09b90780b2a14d6a094f9ddd24a4f15d6ad88b94060d240c5836d8 SHA512 612604d3b0c2edd157c4a55ae22d92e174cdcbc17532de7f2888b9579b4b028da2214e6d756864dfffdeca129f32e5db2241308d326c6ff21044f48bf2d87d73
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild
index aa6dcdf6eacf..77f6bb3f5c1a 100644
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/yaml-cpp-${P}"
 
 LICENSE="MIT"
 SLOT="0/0.7"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index b0717fb0d514..4ab7efae2ee1 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index fe8c6c84f6e0..f9887fffdb0c 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -6,5 +6,5 @@ AUX resolve-config-softlinks.patch 846 BLAKE2B 257d552458e7d4b59d45fa6827e081dfc
 AUX server.properties 686 BLAKE2B 6b4482dfe6187adada772cffb1a46e39bacd9fa8ca5501dd58414f9815dc6b118d3f9de909953f88f1055ae1984ef3f9aee479c339920bf182f31f4265cdb6f1 SHA512 c36a1d2e387762f96872d94bdb3a6a2af9edb949be9d33321f9ea4e3fb996baecff6fc3875b6bef8f73a54a6a1cedd71dcdf97c881819cb130b1a2b43ec7e842
 AUX sqltool.rc 560 BLAKE2B 5f5e4bd1e9fe9759c2e2d5b6b5274343caa5028b29cfa4597c3a3348a1b07e4540d608d3dea5b189cf471b85721f15018490a7e4f8c56cc48ce648a07f0b7a45 SHA512 80ce53ad07c2091113787cb41232e5900426b042dcc3f62157569588538ad26d471e5d17aac62052902789065efb01647bfbc3488ff3d0f3c9e3df513895f57c
 DIST hsqldb_1_8_1_3.zip 3170550 BLAKE2B 0664bfa259af5091e3e76ca804e9c9890457ecc982ab07ee37640dc713053fb63d6dd295e9db4adb5e5436fac6275745526d3e830dd84e5daa3a32162627dc76 SHA512 0483ca3299b63b4931b07d49588c729231efca76a317b9620abbd5039127f3f79449eaa1e9d29c52782c58bdb0cc4879b1e3f30f669d2c02c880818f531a8442
-EBUILD hsqldb-1.8.1.3-r3.ebuild 5445 BLAKE2B ce7628d681e8345394d5a6331a3c669b5fb5dbfd2e31bdfb487c62e1622a4aadc6277563c11a6b955cdca8a4797b9475a56c7ca7a5df04a643a772b02e7022d8 SHA512 47843945a3aad0416f61620645d72a9ecc3a89332f4b3c023439f5c1cc080c28cd448f09b15be98e597d9066eb9ae9a7068f849ec912636a9f719007eab3afd5
+EBUILD hsqldb-1.8.1.3-r3.ebuild 5452 BLAKE2B 1d363cad69c6b8bda0052c7acbbd2f9d33c4be63783791f84410fb18d84f244bf9c7c23befc54c09fbd91f6494f351a9d85f27f38b8ffd41d02a3023e601f8cc SHA512 24410edeaa729fbbfb72e2bd1fc81b81a5cbb7d1601a7906d5dd074c90dbbbed7fdb33ca53d3b8080b58451fcd80b9593f6d7c9c0d3caf02bf2f44ab728301e9
 MISC metadata.xml 313 BLAKE2B 9e6ce7bf4cf82ff78b3a930ec36589308e448ae076c231a742ce3bdc3c43648bb63946636c5564995f7463d2d69b039d0d533d4af1d55790f3fafaeaf68597d8 SHA512 f56b3020ded5e21f6ca53bd6d81396f16c3917c702bcda8553a46bdc996bd751ef30757f241efe61343a5af58886b3cfdad51aa7b1e008378bbc4891dd7fa308
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
index fa8ac6606938..be9c505d1c2e 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="
 	acct-group/hsqldb
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index f654b2758e77..398eb333a6e1 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -4,8 +4,10 @@ AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3
 DIST mariadb-connector-c-3.1.12-src.tar.gz 966702 BLAKE2B 8187199f43ccb6f92ea9df61a1f62e48dbef4744cda9a5e865f71038e47a65dea3ed094dd76d81d0d8d357a8d611a9770590a3504c297ea30f59f285ab511d17 SHA512 a46e8ec976c28e227a72f09c15c92126d178b422a92a4c90fd52c8053604c3309aeb3bd098dc63fbd0d87059d5360c8b63d76e61a1152e7a3e7145e13681453d
 DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01 SHA512 a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
 DIST mariadb-connector-c-3.2.3-src.tar.gz 992155 BLAKE2B 39f0c5f15c2b016e7708ca32f9f4c08ae87f52c38a1a6433ade66b03b9e2144744c559838c3c0bb98465b7e5c1d2f3d5678ee6b1197790c18740f990dbc82284 SHA512 0d45278ba55b3cda809d9d6c3d9726ec8b2f629c7da1205fcb936594ca6ea439039c02f484f7e31fca3e55288339c9bf64c06518988a8fed016c6ce544fac631
+DIST mariadb-connector-c-3.2.4-src.tar.gz 991053 BLAKE2B 7378ddb47e7cbb8b6bec4d7daa1572e05ca494cd1585fff8c3dc9fca088d11ca523a2571fdda570e7a68633a6cf753fca12ba6b505dbdfa7ee9c9cc07223d0b7 SHA512 3debf8b31f280d70ba4f163351658dc1d15f2d250e0d7098200516f96a782cb66ef38855b2436d3d23a3385f79309d5c41b05b8d7d673001de4b4a62555511ca
 EBUILD mariadb-connector-c-3.1.12.ebuild 2148 BLAKE2B a6328dd0a6416691513398220dda45e3fa4a3f857c5f908f11b06095252e02e15102708181af2aef2e809045ec4fa7617e379517499b27ee3dfb98aaf0cfd98b SHA512 9762c0c60084675e61e5843c7b113ba3809d8f60c082ebc3e0c4a167683cc71cb321de8633fcbe52faf0e4ef9c05e50efb7c8ee3ca6b9b0544e06fa5c89ca890
 EBUILD mariadb-connector-c-3.1.13.ebuild 2095 BLAKE2B e4cfcce60afebb3c706c585396950e4e90dd4eba29e22a541ad4947639ee2e5d957bf0347be30fdd5525af93e53824ba6a99a4057d2676b70b143bf0faeb1e86 SHA512 7b2f9d3098d43fdff9ec0e44beab28dc5a1e0bf66460d402cb8e66c528f4dbe04a15e0aba2b5dcfe96924d818d1c0be5db81abb13ee2dbb4e1d98da51fa086bd
 EBUILD mariadb-connector-c-3.2.3.ebuild 2129 BLAKE2B d166508f5a826a721b3822eab5a6f5a8c9161f084e0f2f7e57bea70897344b4f82fc2d26860e459002786e6b83ef0f214a42526ff9965594ea23847aa1c76ffe SHA512 e10c8135d1cfccc68d57990220d64ceba5b5aa33f9a6d9a507ac3ca5d4730b11802f31ccef9ced4673bd85e2640af21dc325262aa3e5e8c40ff0d258a14d94e2
-EBUILD mariadb-connector-c-9999.ebuild 2129 BLAKE2B d166508f5a826a721b3822eab5a6f5a8c9161f084e0f2f7e57bea70897344b4f82fc2d26860e459002786e6b83ef0f214a42526ff9965594ea23847aa1c76ffe SHA512 e10c8135d1cfccc68d57990220d64ceba5b5aa33f9a6d9a507ac3ca5d4730b11802f31ccef9ced4673bd85e2640af21dc325262aa3e5e8c40ff0d258a14d94e2
+EBUILD mariadb-connector-c-3.2.4.ebuild 2102 BLAKE2B 0f8057839f5b2f595c5d5eadbc9788e9f8d0d3ef76d52fbcf5d027a96e872f9a890b743fee7856833f41e45b0fa58ce7af7a2718461d1ea24dbc50b7a76c1a70 SHA512 0b516ff055adad048d9746498835c537a8c5dbb2f7d1ca8f9b7d6c3833f010ed163f7e26330c1208355e26d3ed9ddcf0a8514933262d8b9d7cc085ac211b8392
+EBUILD mariadb-connector-c-9999.ebuild 2102 BLAKE2B 0f8057839f5b2f595c5d5eadbc9788e9f8d0d3ef76d52fbcf5d027a96e872f9a890b743fee7856833f41e45b0fa58ce7af7a2718461d1ea24dbc50b7a76c1a70 SHA512 0b516ff055adad048d9746498835c537a8c5dbb2f7d1ca8f9b7d6c3833f010ed163f7e26330c1208355e26d3ed9ddcf0a8514933262d8b9d7cc085ac211b8392
 MISC metadata.xml 244 BLAKE2B 4123aca5430915cc6801ba9b4e57e1ff48f31a4bacaa785c4dfbbf2d1aadf14f274684cad9b24a09e875a7f621b33bd9bd3333f7ababbd44aa173d4ace98b46e SHA512 380cbd85bebb869f4a2ec1e3518dc6ac5abed1fa5364172e7436098dbd910e738c4d59ee18aa7cf387b354020ed5782732e43702dc83c1857d46b720d623143d
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.4.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.4.ebuild
new file mode 100644
index 000000000000..fb175f8f7402
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
+else
+	MY_PN=${PN#mariadb-}
+	MY_PV=${PV/_b/-b}
+	SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz"
+	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib toolchain-funcs
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mariadb/mariadb_version.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0/3"
+IUSE="+curl gnutls kerberos +ssl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/libiconv:=[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
+		!gnutls? (
+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/gentoo-layout-3.0.patch
+	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+multilib_src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+
+	local mycmakeargs=(
+		-DWITH_EXTERNAL_ZLIB=ON
+		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
+		-DWITH_CURL=$(usex curl ON OFF)
+		-DWITH_ICONV=ON
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
+		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_LIBDIR="$(get_libdir)"
+		-DINSTALL_MANDIR=share/man
+		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+		-DINSTALL_BINDIR=bin
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
index 055778b5039c..fb175f8f7402 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
@@ -9,7 +9,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	MY_PN=${PN#mariadb-}
 	MY_PV=${PV/_b/-b}
-	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
+	SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz"
 	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index b1c83be69ee0..1183da71dcd2 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -24,9 +24,9 @@ DIST mongodb-src-r4.4.1.tar.gz 49644743 BLAKE2B 7d84998c69b9b55164ebab04b49c38a4
 DIST mongodb-src-r4.4.4.tar.gz 49942905 BLAKE2B 8aa9813e87e216899b3c609b413ce6915d6ddf30faea3c0ecda2a14476fc6b08024614fa7b20e1703b5908759459e88e5e302539c27525c2359233743aa7dcda SHA512 a999528a8a6bf4bf0b8ff8f5169b1aadb3c4dab9c7d936c59d66f238b864fad6e8fb6a1b9ec27f395fca95152ee020f96a8c1cf8960a48de3ce5141f8dda7d88
 DIST mongodb-src-r4.4.8.tar.gz 50492854 BLAKE2B 4776b17e88104879ea69468ff277b07dc317d936654bb26c69750e0aaf8f51bea73994e7fc4841228d8506db392e0454b5fd16257071b86a2e4ad34e90f33632 SHA512 9b0cd81c9c731255a6c079c040ed342a51a72e3ea72047d3ae959c0afde50b0cdb1fcfe7fcbea30c449a3618a09d213752277cee6eb9bc0a55915b9229543606
 DIST mongodb-src-r5.0.2.tar.gz 54527477 BLAKE2B f71102f4c2711074498c288817ee06156cb030ee647541f6604582b918fb75239cc5a551c08b745b6296a2693d2a1ac28d94c1365b86bc508257b9d42142612a SHA512 179d57a0a12c5c23e54208c262edff6976f509324be8ad68d6761997dc702534f618dea1a24568fdb2d716359762e64da54e2d152a685447b4e0450996bf2154
-EBUILD mongodb-4.2.15-r1.ebuild 4816 BLAKE2B 6858f1d32f923fa11419dc81b38ab934f9ea6303c3f6ab4136eb8dacad1637bf5896658c185f41513f255663f0ff2eea7238f1adaf8593be478997dd46e1ff26 SHA512 b4032c15613b52f755f039e52869dfa97794ed43dfb5a90b68975718cc10fb5e3ab63df33d8cf57d153eaf72c869fac453c36bf215953a7eb9f2d05d061ced38
+EBUILD mongodb-4.2.15-r1.ebuild 4815 BLAKE2B 06b240707fe453731b56711ee3959d76b528b5599edd537ac650bb71c1da360ad689fb2a7f5592ad5f6f30b5af5b3d4329e47d7f727206d57142294ab29aaf8b SHA512 463600e4cb4c84eedff6e6383d21faaadada38da2a022a96bf779bcecba8c4437992408908506df8652aab8bcc998bec0f31d9fe6573c036671cfefa6a219ffc
 EBUILD mongodb-4.4.1-r1.ebuild 4862 BLAKE2B 23c6628f1a955024a2d40abdc7b97f481a70aca4df5b69d9c1c40ebde4ca4bc5c4cbf099507f92e6b0ed6514bee8af2a320bb6ed172405e06e23d9f843fe9fae SHA512 7ed3b5fdf0d7a1cc5c765414c6c1669d2dc00c5585eb2ab042ab078a0c6ff58d13a4ac7127dcb74bc0e84ae113ea2cbbdb3cc1fe3d173a47abb3fadb4de499fa
 EBUILD mongodb-4.4.4-r1.ebuild 4824 BLAKE2B 56fb4abdc1cb9b67c8b9e52629efe4bddcde99772e4c0c05b3624b2b2a5c0bb7cc25c15a7c38dabc9f10fa0df6fb9aa39f6bd6083d488f2e3cf0ebd5d2abf60b SHA512 be7286a9a666f818e1c1a5e55c97ed466fca571a3888a5de5efe128022055291eabdfca5138a0d696da1979fb4b227884fce498d539e24962fac66bf68f09b66
-EBUILD mongodb-4.4.8-r1.ebuild 4868 BLAKE2B 3f54e2ad478d88fbee99bc6854333485a7a2ff840f74781b2449ce57356c79520e00debcf92c56cb5c4bc89f0d06f5573ec36d23eb88ed644bf6d872bc20448a SHA512 e65b5d56fc0372b1be33c484a9c14f6b91fa3c304d468ea27e9e4262bce2ac5f47fc039c6ed1f88d065f6709d562d1d957bc58d06fa9a3803f620e7afce32cf4
+EBUILD mongodb-4.4.8-r1.ebuild 4867 BLAKE2B 935521811a6017674225c22ac41e97f09aaa4c379540be612b1345b3694407c2a762cbfe13c9fd25fbd53e759087180eef8c9610823624e28718dc74b3cac0f7 SHA512 52b9de7f98d1ab7c8d5f2421f05091e8ae1cfd79e70366b0c6e67725d042abbad1a4bb2024401a1d7e00005cf2d1d68c700b456f0c641f6d02311268eafb402e
 EBUILD mongodb-5.0.2-r1.ebuild 4914 BLAKE2B 7d8b37aa8d505a7e078229dd91a6836bbea3f1dfd88bcc5229246bbffc98dda2eb6445ab8df798a1f2443048fe277fa90d6678ed07b1ec86d7170341227acd6c SHA512 03558fc720e369e4c4c3f745e21287a97f510fae1432868bfa41f96a136616c428710e99e3f8f1a90ff39be2e33e82c2f8b2dfd6873a1a83bcf1eae2750b289d
 MISC metadata.xml 919 BLAKE2B 59d8c500d1b14701caa3feef86c2377c3a2cb870bc218f8aaf993ddcf22f0b75e3b34715446900b6aaf03404387b67c5a23df3d47a64cc7b280a6bfc93f6de45 SHA512 af222eae62fc327ac2ff9f8bf2727ab8f1199a0aabb7fa9a1bd229bd817b9260fe6357ae0ca9d7184bcbc865e2a91195c84efecb430436a0bdb207910850cdda
diff --git a/dev-db/mongodb/mongodb-4.2.15-r1.ebuild b/dev-db/mongodb/mongodb-4.2.15-r1.ebuild
index 3002335b9c77..4877cf52d7b1 100644
--- a/dev-db/mongodb/mongodb-4.2.15-r1.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.15-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="debug kerberos lto ssl test +tools"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/mongodb/mongodb-4.4.8-r1.ebuild b/dev-db/mongodb/mongodb-4.4.8-r1.ebuild
index dc16e9d2e44c..8429beb08e60 100644
--- a/dev-db/mongodb/mongodb-4.4.8-r1.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.8-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 -riscv"
+KEYWORDS="amd64 ~arm64 -riscv"
 IUSE="debug kerberos lto ssl test +tools"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index 1843e8b37848..1d98e9816dc2 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -3,7 +3,9 @@ AUX mydumper-atomic.patch 948 BLAKE2B 78bc073083a44ad21346e419de6f76195d3e9c1687
 DIST mydumper-0.10.3.tar.gz 64622 BLAKE2B 14020b6bbb72271659dec965de164274e2bf81c72b52fa7c1d6997f393d1c0cc977d06d689bb7d7c6e3da86926add2c61f1551afdd30be71ddc97c4803d4e455 SHA512 d7cf6897815de3d46ec15cbcacc393722f7d547300a45e70960e47b8ce30e06a5e652f52a0ff8999d2ac3662b4a48927aadbab464668ac23f446eee95ba574cf
 DIST mydumper-0.10.5.tar.gz 66399 BLAKE2B 77bba97580bcdb267d77be455f56831209a29b71389337c844e4e0cb37749dc22d000d3845e936f5d589951a21ad61bf19cd3b9084004a62aa1b33f16f81b5a0 SHA512 61127c4b9ae5a01111d431672ec3818a6c3db74704ac5db12d286e380273968b8b9e56298ac73eb6c1c32649875fd2ee01d099a73c99cb9c8d4604eaf0eedb09
 DIST mydumper-0.10.7-2.tar.gz 71660 BLAKE2B 44410294505beb9752bbd78b9235e2e75606b3423cf4966110732896c1f1934e94dc95554b7f17240e76fafbd0074415159ab89dca4e3f506c9da7bed2eba28d SHA512 6af4cc80a6faee410ed91367147e7cd32eec8a90d798d5cc10bc24090c945192f9d2e151bf8c24d8d593996d72eb93329557580419591bba980eba5efdeefcff
+DIST mydumper-0.11.1-3.tar.gz 77589 BLAKE2B 5b5a6965ee07fb265e2f3dad288195035554c02da49337ed008b01b6a5f5d399769e67c00f57f4531ed1a1b14233829f617f4bbfb45abb904f1f3054a41b0b01 SHA512 70f5e4dac5af4e016bfc85d8befa2eebbe9e5c1a6b2ee1ccbd491bed29e2625202aee7961ead41d0cf432b23e8ce06dfa4474587663b35fbbdd5bffabc32ae2e
 EBUILD mydumper-0.10.3.ebuild 1022 BLAKE2B 27782ee1ecf8053c36c6495ea66bf7761d0a29f452529a02fd041abbee08accaf6ca68ebb3ea8f848ab0b1256bb907d00386fec61b5150548e1492d766589ebf SHA512 530a786b9c5263aa8396849885612d4f0a432ccbe2c7f1fe59d78bfd8902586e5664e6d8dcdc8d8ff03dfcf1c38c23d39f84036015687b461b12e061af4a81d1
 EBUILD mydumper-0.10.5.ebuild 1022 BLAKE2B d398aaa8aed706e8d3f3599ba2912c263b4be2610e81970b0293ac61c6379ddbc9a961e37bdb6b2dd540d38cb4ecd7d51da52bcdeee093683cb2a7c3ca90744e SHA512 dadfaa10053cefc4e4e6a5bb6ee397aab7ee6668b1f812ee5e813c09a6c2bc687d8618b3700447ad7efcee3e42c463e1b4be382469b50f2a1c3c723b273b9b99
 EBUILD mydumper-0.10.7.2.ebuild 1104 BLAKE2B 2cf84ba759487109d58b7a0cc36cc757d1ca74475e639254195083e33b6dfa8f0ec3244ec0c3894a3ebdb12b13c4fbaf8b4009836d8996c94e7e1e6619406c8e SHA512 275251e976ad151a46b1bfb67c4da19a685269fe3ea8a1e00414c016eb8d886011798fe17ae3bddd7c048098ba2a75ae45998a1b34f52eae2c7412b20fb51266
+EBUILD mydumper-0.11.1.3.ebuild 1103 BLAKE2B 8d0b27e49c8334030907ce1b96d49c1bbd1a37a82840a2619064201ff636d8d7a2b2e48832ff4a18bce5333455c948cbb9bfb97ab499e0416b88339f3b0e25ac SHA512 db64fc1e96b46cece40e14642d95f2c33b16e410c65458a9f0f807218c38b238aa823dcf87a32680b048605c9d7d78479f9f7fc97dac622e86a71df4fd83bac3
 MISC metadata.xml 479 BLAKE2B a45a9746e2f5be11c4cd992e81135c8b39fa494c105f1f3c01586482b635596f1384690d0d1bfa3f08b8e33d1bd64b625fba07f410b8a8220a9a19f7f048f2dd SHA512 b0f20f8fb1b5eb3771d9a59869a3a28b0011642721dd12b5545b4f80456556f2f7a9da3b4b69c85cfae666534bad6143ae437b43b45179544626455a03b9218a
diff --git a/dev-db/mydumper/mydumper-0.11.1.3.ebuild b/dev-db/mydumper/mydumper-0.11.1.3.ebuild
new file mode 100644
index 000000000000..b087cfa64bd1
--- /dev/null
+++ b/dev-db/mydumper/mydumper-0.11.1.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL"
+HOMEPAGE="https://github.com/maxbube/mydumper"
+SRC_URI="https://github.com/maxbube/mydumper/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="app-arch/zstd
+	dev-db/mysql-connector-c:=
+	dev-libs/glib:2
+	dev-libs/libpcre
+	dev-libs/openssl:=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( dev-python/sphinx )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.5-atomic.patch" #654314
+)
+
+src_prepare() {
+	# respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)
+	sed -i -e 's|-Werror -O3 -g|${CMAKE_C_FLAGS}|' CMakeLists.txt || die
+
+	# fix doc install path
+	sed -i -e "s|share/doc/mydumper|share/doc/${PF}|" docs/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(-DBUILD_DOCS=$(usex doc))
+
+	cmake_src_configure
+}
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 7b397ce3640b..d914b634aa07 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -8,6 +8,6 @@ DIST mysql-connector-odbc-8.0.25-src.tar.gz 3736461 BLAKE2B 888219340ed2ea86194b
 DIST mysql-connector-odbc-8.0.26-src.tar.gz 3760542 BLAKE2B e0da539743335bc70a7b809759121d5186782df27c301dc9bb34a73d5584540906df72f0e2b2bfa8af47587693063286cd3eadd3b69f77398264463e69a20e35 SHA512 caed3db20fb42df5123356a973e4f8cc1b162be0ada1de881981237e9a7b39d95f3f0aa48fceeff23139c3d05fc24115bf900206db7a497f4ed734a2234eb528
 EBUILD myodbc-8.0.22.ebuild 3113 BLAKE2B e27fc21290dfa09309813f047e0c72bad42c2cc5ca6aa54c3698b0456b42007d3c7676c5062838be9ecb8033d8b1e12dae01a7bc213cd7ce3356bdd30dee7a86 SHA512 f34dc7a7aaa9825c42ffca24cb9ffa136a8e0abeb5de0871bb3413f7b28cc8587fb01768d60ca55434787ca818acb29d97b13b6ba3ef9e3791e38c8f7b445652
 EBUILD myodbc-8.0.23.ebuild 3225 BLAKE2B c0cf4254bb89e23bd358454addbc27f2c27ebef6923766433a5a7e0b5071787d41b9eedea1dff3efc9544788f52a23383800dae0376512fa04d56d53a7363f2f SHA512 f1b2950e6f30ef9f623f53ab7634aeff21a533fb6889e8593461a88987e8bbf15a70fdaf9d3ea1608c3fb7d446e71ab366ae2ff07cd1dc7c5d266dea7044eb24
-EBUILD myodbc-8.0.25.ebuild 3405 BLAKE2B c7395baa5a00a1469215ce3b7457d80e180f428843ac943d2e607f2efdba2ab821998fb2b6b67692825ca5f8bbaf4ccbf4df91336b884af5478335e402849fbc SHA512 6c8f7a07558dd81f01c636b4b3293119478e9b1c4ec8d7d72927baa42915768ab3a8f9017e2ec45e993063682bf74bd1e671052d3a79997e48e4f641be233bd4
+EBUILD myodbc-8.0.25.ebuild 3404 BLAKE2B b3c703cc8ff74fac5f118921b6cb2262e8b1b7ff627f6a8b5069de4d7456dd00ce5cd5c007c2eef258d8fc006c7b1cdddbb3b760289f1ee319f7d93ea56e99c8 SHA512 9cd63ac127093aba36e1b8065bd92a8fe8992b4a061622f0f892126e07ccdb63716c26f56b9e2ef8480ff6e861d827feae9488ff47eaa7204a3b0717c4d73bc4
 EBUILD myodbc-8.0.26.ebuild 3415 BLAKE2B f9df1d9e752db751bae9a5564008e9b252dee975649f319bda446a9a41bf84eec00fcd2887228db67b9a3533349e52cce6c9aef4eabd8383342d80eeeb554abd SHA512 09c17e88f8a06e1987f9cab064d78d4cf43a0dac1f0044edf92d9a1cf9642e73b51087ba4aa7ff0b53c4c44018bf8e8303cedd17d35a293edc1030e8fdcc6486
 MISC metadata.xml 240 BLAKE2B cc93ae4da8408b221c296e092d9db6ae3879754ade669d81c1218d53a5f007c6b7717bda6f92dbb0af38ff9b5e45f44e91503b12d3603d9955ec7d5a2a67399b SHA512 0f41c32ce3d736e061302252f14913d7425bc97e19d0c2f3b80c50637ab3521aa6cfc67f82e5f70f91174cddb36bb5622837dc18fd9db3bf75eb860359aade27
diff --git a/dev-db/myodbc/myodbc-8.0.25.ebuild b/dev-db/myodbc/myodbc-8.0.25.ebuild
index 47d507edc552..0d31b30ad0bb 100644
--- a/dev-db/myodbc/myodbc-8.0.25.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.25.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
 
 LICENSE="GPL-2"
 SLOT="${MAJOR}"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 7bda144a297a..63960901c5df 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -9,7 +9,7 @@ DIST mysql-connector-c++-8.0.24-src.tar.gz 3797356 BLAKE2B e509e04f6c93893948c57
 DIST mysql-connector-c++-8.0.25-src.tar.gz 3800065 BLAKE2B 67546b2d7d9de25ccb440c22bd58ee83e6fae78710e6dfa802cb0446bf5be433c56458424f0ee81c9a899bbfd5f464712d2d0b43dceb4205b492c7b1a79f7858 SHA512 44dd7f4296d666801be55642e53cb5181d9b5c3b080306975a48eb6280e555d9b924b42b14b44dffee4c54fab3f662a7b6bb6584d9a1ed710f0026788611c525
 DIST mysql-connector-c++-8.0.26-src.tar.gz 3980027 BLAKE2B 86ce0d94db588ed86ce7b21851f866da26268f7c9059b57697cbe1f5c5d031a3eada2f55042feb7b2888b538277c773215c0d19e8a1968ff70ce363e8f95bd77 SHA512 e3a08551a4245bf886cb7e3775a256fa379bb781b523a84d30e0d0c16cae73c808a3413b08b09998eba9c0ea3ede19e505b6392ed71712a8e9a2df31f07e4c79
 EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1576 BLAKE2B e1835aadf499196ba42dcff6a1671bc32a4224133d68630bea249fb22ef35db6275f448bb1c891e0dcd9934fd66b3a7ebbe9935573f7f85a1d00e2613bab98fb SHA512 983abc70a156b0b0c39bd693c6ac62a149897f3b5bfddd54bc52463a5fa84397692134a16045d640db3d4797d3264803c0563a282495c21f54d4b48390223d39
-EBUILD mysql-connector-c++-8.0.24.ebuild 997 BLAKE2B 184b385509ec362bc962357f9c54dc554d6c1d66500154b6c8243ce2b8d2a01bfeb68d0e1c01c0e8dd98f16ef718b587b407e44a68010ae7bcb6f7583b32285d SHA512 df28ab886f014f30a44898b72f8a12e41bae8bc7109952712d7b44fd451de4b32babc0c5aaaf8142d7f90aa8b07a4f80ffe3d0cf34694be003c6234705acf6cc
-EBUILD mysql-connector-c++-8.0.25.ebuild 1063 BLAKE2B 1ce9e11fdcd814c1e464098ffe61027e36136562adbd1efa9a4ba10c252ac04eb5602f47abf5ec94f5514c778c38b3f0d81d82a66a113e647b3f02baf2a4eeb7 SHA512 db6ebd66158eadefa3a355d5add58e015a62587f51b07484fcefa8b59d28c199ee81d468a51f534b7be37a0246331edbf845680181fa3e27ff6ce086397dc940
-EBUILD mysql-connector-c++-8.0.26.ebuild 945 BLAKE2B b25f6d25971355f414cacd22507fa53b3ad056a41555157328137d36b9f269b4c99e2574bf9246ef79527e18a5a8a4556c040ec8fb58362020a19d81a3369ef5 SHA512 de38a9ab31d08db5220a8ed0698377e7fdf135d8ddada619ad026a91b9d2cf132a805e49b7fe5a01236ac860cc4d5ca02083d9c30e3d5de08ea4315d98b4d55d
+EBUILD mysql-connector-c++-8.0.24.ebuild 1028 BLAKE2B 288d17c80f54d3b6c4adea98bf348a1d55bd5e3d26f82264c140304679ea658c2dcfe9354c382e925c00546373155bdc0b20134254efc6b5d1df8b1f22f4b5bf SHA512 6a26377b9d577584010c47642f4852333bbbf1311446423c0f28b521d5c8ec4380d81d257237d66b8f16cfcb01c9d654a486312c0e3c36fd71aa67facb33fd52
+EBUILD mysql-connector-c++-8.0.25.ebuild 1093 BLAKE2B 050385919d4526016450efc45cadfc6ae7c6361a1585479f68d20a711b7053b12603153d42e3f1a073ef421c267e934e7e1ee920b00063fbbaf9aeffa16a9fe0 SHA512 1da205f366f7c6acc3a5bb9840829d8565426c224939750bc0bb096bf059d223eceb2c8a3044b24610dff776d1b89b1c46f0504288c090b39ac2a06ddd86bd13
+EBUILD mysql-connector-c++-8.0.26.ebuild 976 BLAKE2B da877a73f3760d1f717b51b2a41aa3b8cdbd39e416301d6022f983f7db15903d0efaa3bbd7f2341ab347805575030bf3b410679bdca506f37ae21dd816336e75 SHA512 9f6c7ea47bb51b139ebf7b53b7dbe0154d7d3583ebaa98d79202df8bcc37bfa83c098a5c53208f0345520f388c565f89d6eb5044794c24621145f562a8bb263a
 MISC metadata.xml 379 BLAKE2B c33f69c8b5aa23c867d8312fc2fffec9d22a2fa3f8f1d93f235282fb4f68869599ad8a49e46290679eea3faf1536fe13224af9dcc5eec625374bc7e28ab591fa SHA512 26cc6101cc8240e26c3491dfafc1c7ddda626e7de3ccfc235c02e92f0226c9e11109dcaeddfa934dc02dbdf99215e5899cac606f50a647d90937770e88670d67
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild
index 9aae59fbcac4..4dbabcaa25f9 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild
@@ -13,7 +13,8 @@ SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+# -ppc, -sparc for bug #711940
+KEYWORDS="amd64 arm ~arm64 -ppc ~ppc64 -sparc x86"
 IUSE="+legacy"
 
 RDEPEND="
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.25.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.25.ebuild
index 0114e1a21a46..af695b76938c 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.25.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.25.ebuild
@@ -13,7 +13,8 @@ SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+# -ppc, -sparc for bug #711940
+KEYWORDS="amd64 arm ~arm64 -ppc ~ppc64 -sparc x86"
 IUSE="+legacy"
 
 RDEPEND="
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.26.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.26.ebuild
index c5ac6ef6bc72..7947c1c52e8f 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.26.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.26.ebuild
@@ -13,7 +13,8 @@ SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+# -ppc, -sparc for bug #711940
+KEYWORDS="~amd64 ~arm ~arm64 -ppc ~ppc64 -sparc ~x86"
 IUSE="+legacy"
 
 RDEPEND="
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index 671cc153d1af..89a14cf3a896 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -8,6 +8,6 @@ DIST mysql-boost-8.0.26.tar.gz 291285918 BLAKE2B 6198ca8982a8c9df7e6ee4df5e2c1e0
 EBUILD mysql-connector-c-8.0.22.ebuild 2782 BLAKE2B a03af99dd8eb16b78a7b891b9eb6c79a893edef92410b614722f2857ee21d1b519f93f74842d89b56ef50d628abd4873c00b59b4fcc06f1606319c078c2b89f6 SHA512 7dbf5e4d22d5d000e702809b2356bbe842da16b1bb61aa7d8fc3fd62f56449f5d893f377cb9a4b5b4b7019679a05f20aa67fd570caa4d9ccf27dccdc9c549df4
 EBUILD mysql-connector-c-8.0.23-r1.ebuild 2986 BLAKE2B a7f75b2115e7e4f8caf06ba5a81d6227214178d9b70c12007f13615ea55d75c1918b6d38e9e47f5caa4dde3539df10c8a21a9fedf9b325cc82ed2a875a346467 SHA512 b916eaa8cf6a4d3b39e65ae531324b9c13fcc4a65fd69ebe6d9b476f220ffefa542d6e5c7f835a83d283b751119f84c81fef234a6b2d164e4cd91dffecef13c3
 EBUILD mysql-connector-c-8.0.25-r1.ebuild 3138 BLAKE2B ec501d87b6bc3a3d1a68ab741607aff5dc2ff27fc12b537fae7d47f5b65c57880e301006a1363b7d6e4e52d51ed918fedbe0ffda9e77207b048c014c2352f883 SHA512 4840eff53fa2c43762e35ba5d638c5f8702522e2084a1a7c52432a7f340e9f2c44b087b3f029b1c7b61f70c6a6e5ed4d9af84261057be47728140b8dc5a9e2d1
-EBUILD mysql-connector-c-8.0.25.ebuild 3067 BLAKE2B f13a525798256e2677fc2749a5ce460ee0002774a5528a73e281504e0ea632f51431d33251d1d629878a9549dd4bf7080caf5b6693ca1e790d17509c2c15e07a SHA512 1ff8ed515e6720eb9b509ab5fa268f7217bd2fa94b9f9052f8fe28ba78a32dce3270b965afff2e68e87a196d5d5cc861b1595254bc4e0c5655000426aa71ddcd
+EBUILD mysql-connector-c-8.0.25.ebuild 3064 BLAKE2B 3a10106d3e3beb7bb048ea830d7fa18738b9ca36fbcc0a257cdfebbdc52c986f6ce7b9f806412595690fad2d5e9cd643427326639c492ff83b404c6ac4117e59 SHA512 cd80c6d89e5a8b000025237ae45854700a0565be784cc6d10f9d38ede2be73ea3303404420701de859db9533652c7fe7762e3197df8e9bc14256f4ecf4b493b0
 EBUILD mysql-connector-c-8.0.26.ebuild 3138 BLAKE2B ec501d87b6bc3a3d1a68ab741607aff5dc2ff27fc12b537fae7d47f5b65c57880e301006a1363b7d6e4e52d51ed918fedbe0ffda9e77207b048c014c2352f883 SHA512 4840eff53fa2c43762e35ba5d638c5f8702522e2084a1a7c52432a7f340e9f2c44b087b3f029b1c7b61f70c6a6e5ed4d9af84261057be47728140b8dc5a9e2d1
 MISC metadata.xml 240 BLAKE2B cc93ae4da8408b221c296e092d9db6ae3879754ade669d81c1218d53a5f007c6b7717bda6f92dbb0af38ff9b5e45f44e91503b12d3603d9955ec7d5a2a67399b SHA512 0f41c32ce3d736e061302252f14913d7425bc97e19d0c2f3b80c50637ab3521aa6cfc67f82e5f70f91174cddb36bb5622837dc18fd9db3bf75eb860359aade27
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.25.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.25.ebuild
index 6f5a2cb668c2..a8126e853fd8 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.25.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.25.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 	S="${WORKDIR}/mysql-${PV}"
 fi
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 1f771a59ce9e..42bccebc1e54 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -24,11 +24,11 @@ DIST mysql-boost-8.0.26.tar.gz 291285918 BLAKE2B 6198ca8982a8c9df7e6ee4df5e2c1e0
 EBUILD mysql-5.7.32.ebuild 37185 BLAKE2B 13be67482bf1e3e7171b9ce7468d51c1f67dc469f61c4ec18de94548e1077bb31fb7848feecd3761b3549fb4afbfaff6a128223b0bc516b0b4601edb4729468a SHA512 e457f6cc626d3ed452d772bba59428d60eed2c40d2d7fa52a9ab91538123e332d8c86b1a1da8217f1bd81c807c459d4397d237ac04c2e22f37a2e9e775878fc9
 EBUILD mysql-5.7.33.ebuild 37400 BLAKE2B 9245b583265b65125d35d6d52c317c547ded926243c0d7d430e7739c27efc2148e40c968aa55eed964c3064c4f4df82ddeacfc180d47e62e51c5707bc7984311 SHA512 dba99a3536f75fced834e3eb9da03ae5e0f026409165cf805295f216b7e3bc2d153927f7716d1cc52bf4f1f1d88fa834383a25d16ca263e036c01f07db7935f9
 EBUILD mysql-5.7.34-r1.ebuild 37926 BLAKE2B e54221ee692a88622ee14de708a8b6915e094c79e8a5335f21daa31de9faad2239a7bbecf0a0f6a06454181644d4d94fd391a4ad69e1357c46dd8823f0b2bc9e SHA512 487af4a1700925a64f57317094f6dcf77a78012efb2aff8ed56996e635376ba8337c247c089ac2cb68dff229af73978d542134149a9753475656a7f9ea88cdfa
-EBUILD mysql-5.7.34.ebuild 37469 BLAKE2B 3f757205809101de39ab46dc0e87c030596fbe0a716154f59c17b4e185b13763c74a334f2855715e4daeb660aadaa21684489afa68aa3dea0e1188a60e10a6ea SHA512 2dac5cf7e07e177bf7262400a7610d65e524b76bbc6e4a8270fc9a20fbe82f650790df33f0f0aa003dfa16dc6d9e24619270160e039488c5ae9915103d377e5c
+EBUILD mysql-5.7.34.ebuild 37465 BLAKE2B bfefdb20a309c18080b7882f77f7ba5fcce53e36d65a31d6a3738cb08bc62e1667c9bcfd73776894c1927307f8d923cf3cb8cceac57393bf062b9753c98125aa SHA512 47504f10d25a7720470d4c411e7cc8abc5dc84d69de5db43dbb116eb9fe23d8330cc47ba0ca1f73de1f2e1020cd9da2fc16d3b3e1b1e2474dcb75e8a61ae31b0
 EBUILD mysql-5.7.35.ebuild 38794 BLAKE2B 98fb41f3f809247823e40dcdf1a7a42d1522b22a466aa4e0049d875d7bf09fd1495e785cb637292bfb9084aac082b6cbe7bf3d6e9cf349c034ab8d93d44bcd72 SHA512 3e9ce6308bb4f0310aeed26fdfd576aba1c08380e1844b5a39162a918b29109fa653ab293c2dadd87619bab36c9a7d1077b67c79261ae1b904caceaaaf9f5ff9
-EBUILD mysql-8.0.22.ebuild 37433 BLAKE2B 7d047acfdde052e6745869ae3dc3536cc4f6d171bc04c18aaf7ce7773f2bb840f3b826ed091d6b89aa0af1167e372aa6fdcae0328a9591eb0de0e74465f9aea8 SHA512 2e7cb6a55376f03757e14d08801be88ac07ca7ec7d2afa23c73da44cd72a9f7a02212f310176de4fae076421e363b29b29b251ec98057ad54ad7ca6ea313d3f4
-EBUILD mysql-8.0.23.ebuild 37575 BLAKE2B 135ee2f924ab3b50a73ee6366ee9b84815cb81944c9be9ae48c3ed643e6f288d7b2541f6feafa3bffefa28e75b81eaead199704b93b6c3e4e02a158cea868b0b SHA512 3f0dbca7e24b4c696d5970657bb7b405878e6330a6fb26815707d5a3bee7117ab0f1434ecc799515790870544f92973a31eb871363926b5d3be4b9617484decd
-EBUILD mysql-8.0.25-r1.ebuild 38788 BLAKE2B 244b3d40e9259afac98fe5fb390dea72c129ae146e084ba96c18f9d66ebc6d18816f9a41dffa9f1d320a3e27a11f88fdbfa2ebe7793c0239b7dc3ce5fd31883d SHA512 7256272c163cee93b11ad6a2d7beb17a639aec3553c7fe8082a759961c3103e3dc1cdd4faa28d3fa8d3ff4f83da08c8915a363f0e38a98d96ec22d5c151fdf69
-EBUILD mysql-8.0.25.ebuild 38045 BLAKE2B 58b11ccbfa68becee5f4c4f9f9a8401a68feaa32614e0490d80f2647a05209610bffed0840b9f823060641db015fd5919ff02e5a649e08733bcaf92c7ede466e SHA512 82819be1bf26aa113b49bad38652969722988829b5e8fd97202258bc7a06a8ddd2d77ca5c4e8cdf7f50700cbb4d26c4515ef62ae8489dd0c650416f0e770d405
-EBUILD mysql-8.0.26.ebuild 40492 BLAKE2B 631156f6e14886d17d0e2e424c092fcf48cd744513a070b65cbd660fdf4e5270fe34bbe5fbfd8342b34169b5117d2da1bd8c76ffd2158c5fba672afdd650f972 SHA512 158c1d69f43469aeac5a535cc04b1e9214e32b302256965976824b7c51789dcec50027efb247184d70dedced94dfd2c288255ab407d3e0f8a6c64aaa1bdb5f65
+EBUILD mysql-8.0.22.ebuild 37464 BLAKE2B 144f41a1fc6f1da7fbcba3a69c6bee21919765e865d19f740152ce0e639a14a31a2731ddd925e95c5f5e682d9329c88648ae7d82f3070e7e6d758bccd47e39eb SHA512 0ffcc90f9b69902643305943a198bc36969cca9c88f615b824fc31e7a7f9f1e35645b2223c73357900c5ecaec0be19415b14cb48bd92d033ecc0b091af3e18d2
+EBUILD mysql-8.0.23.ebuild 37606 BLAKE2B d61dc6769312ba2ebfe9cc22acd80e21d6643686cc705b27d2a4c757f22849c9f142d6f604ca6b081733c7942d0ca4b8e45d291880d240937d17dd4403844777 SHA512 fdf44f44d5f0e718f3f0031e8ea19420287226635c9298696843f21c5a0ab3caec68e9502839f9506abf1ac2977872d2ac7ddf027241f82bf1d314b50277e152
+EBUILD mysql-8.0.25-r1.ebuild 38819 BLAKE2B 3d72eb2ef1401b4c953886fe8e03422eb6b1fa5048b0243da832f509008a88056623fcbfd2f67f8167d0cc79264f77d264128388ba55369dd2fcc0c52a1fcf73 SHA512 6422c0bd842d86cbe86e2dff22e7687d97ef4bb43a050521ecfad016f60a8feb195fe7f43ffd29592d9472b6bb4d5e25ac60710ac4ec3c819240f9e9b25dd2d9
+EBUILD mysql-8.0.25.ebuild 38073 BLAKE2B 6a841ba18414360510eded7e384f9de4d81b7b558817dae5cf0ec83df8c0bd135e2ebd08ef5729d63a41764871b64384bf47a35858d8f55528d41c9fb8b8907a SHA512 1a1aa099b1503b74bd2d4fd267b92729a4d57f612e3629790d3739cc7da9defc3de5cd4ab9ae71b77f1102c8dab9b0cd45704173b1eeec26bccabf6a5dd809de
+EBUILD mysql-8.0.26.ebuild 40523 BLAKE2B a65190c96c5257bb5c149fad673b72437802959a18d2bff1f7f33902490cf08c4a734bbdc383f685d3be50b9300082c6bea0ffaed49ba79f46596c3f913bea69 SHA512 b27bea81e6112ac4e3d24a261020e569e39c0e3fa3980cfda2c3c8042fac6f80c217767cd52a4c3115105899e588fda011002d611d406f43389ee657b4bc6db4
 MISC metadata.xml 1265 BLAKE2B ce4c9d4870ab4915abe269b27cba4854c0b5d1f44683ef6e9ed5ad7eb17e0e89b9f0b5ecce77477819afc16d9b769de4d084457b4a10032969d53dd093af209a SHA512 1cd8b25e9f1979ef95babf5a506b3978569e341a031b9e4d52b383166f3311310934338747b05363e11bcdf61f3c76f6a4eff62f7ed949bc151c1ed3c93dae42
diff --git a/dev-db/mysql/mysql-5.7.34.ebuild b/dev-db/mysql/mysql-5.7.34.ebuild
index 998dc2dbcc42..6a6d053d9b44 100644
--- a/dev-db/mysql/mysql-5.7.34.ebuild
+++ b/dev-db/mysql/mysql-5.7.34.ebuild
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-8.0.22.ebuild b/dev-db/mysql/mysql-8.0.22.ebuild
index 1c0cd3052d7f..7ba23d865dfb 100644
--- a/dev-db/mysql/mysql-8.0.22.ebuild
+++ b/dev-db/mysql/mysql-8.0.22.ebuild
@@ -36,7 +36,8 @@ REQUIRED_USE="?? ( tcmalloc jemalloc )
 	router? ( server )
 	tcmalloc? ( server )"
 
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+# -ppc, -riscv for bug #761715
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips -ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-8.0.23.ebuild b/dev-db/mysql/mysql-8.0.23.ebuild
index 4de06f95e603..2ad3f320946d 100644
--- a/dev-db/mysql/mysql-8.0.23.ebuild
+++ b/dev-db/mysql/mysql-8.0.23.ebuild
@@ -36,7 +36,8 @@ REQUIRED_USE="?? ( tcmalloc jemalloc )
 	router? ( server )
 	tcmalloc? ( server )"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+# -ppc, -riscv for bug #761715
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips -ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-8.0.25-r1.ebuild b/dev-db/mysql/mysql-8.0.25-r1.ebuild
index a3ee94b35233..9a4e4b01dc9a 100644
--- a/dev-db/mysql/mysql-8.0.25-r1.ebuild
+++ b/dev-db/mysql/mysql-8.0.25-r1.ebuild
@@ -36,7 +36,8 @@ REQUIRED_USE="?? ( tcmalloc jemalloc )
 	router? ( server )
 	tcmalloc? ( server )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+# -ppc, -riscv for bug #761715
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips -ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-8.0.25.ebuild b/dev-db/mysql/mysql-8.0.25.ebuild
index 98b2c22e5b20..57a120868df3 100644
--- a/dev-db/mysql/mysql-8.0.25.ebuild
+++ b/dev-db/mysql/mysql-8.0.25.ebuild
@@ -36,7 +36,8 @@ REQUIRED_USE="?? ( tcmalloc jemalloc )
 	router? ( server )
 	tcmalloc? ( server )"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+# -ppc, -riscv for bug #761715
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips -ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-8.0.26.ebuild b/dev-db/mysql/mysql-8.0.26.ebuild
index 3ea480113f16..7667bc29e608 100644
--- a/dev-db/mysql/mysql-8.0.26.ebuild
+++ b/dev-db/mysql/mysql-8.0.26.ebuild
@@ -36,7 +36,8 @@ REQUIRED_USE="?? ( tcmalloc jemalloc )
 	router? ( server )
 	tcmalloc? ( server )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+# -ppc, -riscv for bug #761715
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips -ppc ~ppc64 -riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index 10e38d56157f..2ff80e4d07a1 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -1,10 +1,6 @@
 AUX percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch 4034 BLAKE2B 0ce65196d4679481d3197e95d9efc3783c1e4f37dcd602588fc3e8da5957f63cf68b9222a7ab12fe2e8fd19d69e8a24e9f86cc7dd2ba776d473a95b9279a1f24 SHA512 4dd9352b8d8ae46782925daae27cd5ad1765c5f4ab26f1f5f07fbac68f0cb83e4979009dddacd8a55ba818c93014b46dee997b43f6951820337e0cb79733f60e
 AUX percona-xtrabackup-2.4.20-fix-gcc10.patch 931 BLAKE2B 77c433ab006f2fc5c36c5cee17fd37d98136779884ad0075b4547671690307a253dec9ac7aa80998bb1ee02b5568d053d7b41b5df348b5338c83497c744d421f SHA512 2a6f4f745a57df0f8df4f684e8ab194de0b00c1578e91823c7cafce1338bbfea873d1fb7d34f94233e40fb7a0b9d7edd869a482e7cb46f3706caf3d297983397
 AUX percona-xtrabackup-2.4.6-remove-boost-version-check.patch 485 BLAKE2B c9330c5b0a163a0d95682a81cee9e3c99cebdb2a6ed124cb5f424ade92728b11b29685e2c1eee0fbf9df613f5a1b08cc4021daec8b60a6c66ab51b08a397b33d SHA512 31277d6bef14a6b642ce425ce9f2c92fe49f905c42c720a583cb45406c1ee18ccbf2bef224b9b89bb02de18aecc1ec48576f5ca0c9bfef0cc683d78218506906
-AUX percona-xtrabackup-8.0.13-remove-rpm.patch 1139 BLAKE2B c2ada7337f6596ac5c37b1ebe7f2324fb4ee43e14ec41cfeb8d861bc2df0614ca1957c9d44cf81530b1f4bac9d6143edc906721aeebfe4551fe37dec9a41ed7b SHA512 99d4e92c5f979b4d3e9edb6ebae73e88f81d5696826d4f477f8cd885d8c54d955c879eed45779aca092facfef7aa29f818cf467c3302a7e8db6ca89fa5e38e28
-AUX percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch 1094 BLAKE2B 25b43fc6ca621e6f7a93a214580fb491d7c8c4ac7d4fbaca93e521eebb6b63b48e5526cd8aeff4d92c7715416833ed16df4c258ebbd8c5ce8015a0afdd32e11d SHA512 c0b9fe123766b70d324dd9388bd0762e734bc728c3dd8f750f06ac7432a1907fc45aaad7b1c79418446af0c416e962c116a15e17ac7091607df09f2fa04fa555
-AUX percona-xtrabackup-8.0.22-remove-rpm.patch 1086 BLAKE2B fdac1fa3f83cd7b3b82ca7dd443ba9d170051d1b2e92fbb267524b46c8272c28586cce58de6b71eae1372f08fd5e89b0faee567885bc3de7650cb42c4749ec8a SHA512 2362805b7937b9b1922f4d8be86031b58df9c1475c849052727f190ec08b32cbf07bee98ac38fe7a362e8e10fa1dcb4ee16f9bbeb6f36ddfc2931b9f14c05553
-AUX percona-xtrabackup-8.0.23-gcc11.patch 931 BLAKE2B df3465d46495f329015452aa17981323f9981cf43a460c206ccc9730d747881559a058ebafb0960c70689df5ef35d7fc2d2a920199f3e13f52c0ac34b29fffda SHA512 6e5981c5868d5d025cfad0a718804f2006535f3cf55965cd7fbd5ca7a62bc871e2c0bf3638be2b9549121948b0a6fa750c0842970088dc1c489f7ce811e047c1
 AUX percona-xtrabackup-8.0.25-remove-rpm.patch 1272 BLAKE2B 228b1eb3be43686cd09f7c07401010b6174f0770c2d6975b0e89fc69f493012cfad262536f3366e44bb3e0d94af7b072d593b820209700fe5795d6c01e9fa8e5 SHA512 bd4295934c9855b2c4274407660e6952a29807964286d286643a547b4397c13ebaff2bec0a42de352a06cebb5fbf449dc28bade849be4857d34d7ab68abf1ec2
 AUX percona-xtrabackup-8.0.26-remove-rpm.patch 568 BLAKE2B 67c25aaa4abbc2ebc51bc9a2e68e7ea25aec1b82f27fc19bd983bdb59edb5c21e8ea4a1dd954cc41143e126413818987bebfc41d2ee4be3fe79e255ecdcfdd68 SHA512 cd2333cc08dcded5060ab961b4458fe9d04d2d5040efc49552361cad5ff12459e7c72a2abea67fedd46ee7f018f8622b0be528017fe2b98256718dae21f682c7
 DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch
deleted file mode 100644
index 759598637a82..000000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1b9865e2..e3c82cdd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -181,27 +181,6 @@ ENDIF()
- OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF)
- MARK_AS_ADVANCED(WITHOUT_SERVER FORCE_UNSUPPORTED_COMPILER)
- 
--# Use 'uname -r' and 'rpm -qf /' to figure out host system.
--# For Docker images we cannot trust uname, so use rpm instead.
--IF(UNIX)
--  FIND_PROGRAM(MY_UNAME uname /bin /usr/bin /usr/local/bin /sbin)
--  IF(MY_UNAME)
--    EXECUTE_PROCESS(COMMAND ${MY_UNAME} -s
--      OUTPUT_VARIABLE MY_HOST_SYSTEM_NAME
--      OUTPUT_STRIP_TRAILING_WHITESPACE
--      RESULT_VARIABLE MY_UNAME_RESULT
--      )
--  ENDIF()
--  FIND_PROGRAM(MY_RPM rpm /bin /usr/bin)
--  IF(MY_RPM)
--    EXECUTE_PROCESS(COMMAND ${MY_RPM} -qf /
--      OUTPUT_VARIABLE MY_HOST_FILESYSTEM_NAME
--      OUTPUT_STRIP_TRAILING_WHITESPACE
--      RESULT_VARIABLE MY_RPM_RESULT
--      )
--  ENDIF()
--ENDIF()
--
- IF(CMAKE_HOST_UNIX AND NOT FORCE_UNSUPPORTED_COMPILER
-     AND NOT CMAKE_C_COMPILER AND NOT CMAKE_CXX_COMPILER)
-   # Cannot INCLUDE(CMakeDetermineSystem) prior to PROJECT initialization below.
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch
deleted file mode 100644
index b3e1662a0cf6..000000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-fix-building-against-ICU-68.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 16048ed60bef16d4bf1e361a59e7899845b9426a Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Sun, 20 Dec 2020 21:47:33 +0100
-Subject: [PATCH 10/10] Fix building against >=ICU-68
-
-Link: https://github.com/unicode-org/icu/commit/a18df7ba2834afc2b577a1d5a7d906868ade6fa9
-Bug: https://bugs.gentoo.org/759070
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- sql/mysqld.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sql/mysqld.cc b/sql/mysqld.cc
-index c400e5584..5d2ebfaea 100644
---- a/sql/mysqld.cc
-+++ b/sql/mysqld.cc
-@@ -7323,7 +7323,7 @@ int mysqld_main(int argc, char **argv)
-   if (opt_keyring_migration_source || opt_keyring_migration_destination ||
-       migrate_connect_options) {
-     Migrate_keyring mk;
--    my_getopt_skip_unknown = TRUE;
-+    my_getopt_skip_unknown = true;
-     if (mk.init(remaining_argc, remaining_argv, opt_keyring_migration_source,
-                 opt_keyring_migration_destination, opt_keyring_migration_user,
-                 opt_keyring_migration_host, opt_keyring_migration_password,
--- 
-2.29.2
-
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch
deleted file mode 100644
index 91f67c437168..000000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.22-remove-rpm.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -222,28 +222,6 @@ ENDIF()
- OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF)
- MARK_AS_ADVANCED(WITHOUT_SERVER FORCE_UNSUPPORTED_COMPILER)
- 
--# Use 'uname -r' and 'rpm -qf /' to figure out host system.
--# For Docker images we cannot trust uname, so use rpm instead.
--IF(UNIX)
--  FIND_PROGRAM(MY_UNAME uname /bin /usr/bin /usr/local/bin /sbin)
--  IF(MY_UNAME)
--    EXECUTE_PROCESS(COMMAND ${MY_UNAME} -s
--      OUTPUT_VARIABLE MY_HOST_SYSTEM_NAME
--      OUTPUT_STRIP_TRAILING_WHITESPACE
--      RESULT_VARIABLE MY_UNAME_RESULT
--      )
--    EXEC_PROGRAM(${MY_UNAME} ARGS -r OUTPUT_VARIABLE MY_HOST_SYSTEM_VERSION)
--  ENDIF()
--  FIND_PROGRAM(MY_RPM rpm /bin /usr/bin)
--  IF(MY_RPM)
--    EXECUTE_PROCESS(COMMAND ${MY_RPM} -qf /
--      OUTPUT_VARIABLE MY_HOST_FILESYSTEM_NAME
--      OUTPUT_STRIP_TRAILING_WHITESPACE
--      RESULT_VARIABLE MY_RPM_RESULT
--      )
--  ENDIF()
--ENDIF()
--
- # See comments above, about CMAKE_MINIMUM_REQUIRED VERSION and macOS 11.
- IF(APPLE)
-   IF(MY_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 20)
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.23-gcc11.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.23-gcc11.patch
deleted file mode 100644
index 83aa6ab78a59..000000000000
--- a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.23-gcc11.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/extra/robin-hood-hashing/robin_hood.h
-+++ b/extra/robin-hood-hashing/robin_hood.h
-@@ -42,6 +42,7 @@
- #include <algorithm>
- #include <cstdlib>
- #include <cstring>
-+#include <limits>
- #include <functional>
- #include <memory> // only to support hash of smart pointers
- #include <stdexcept>
---- a/include/my_alloc.h
-+++ b/include/my_alloc.h
-@@ -32,6 +32,7 @@
- 
- #include <string.h>
- 
-+#include <cstdint>
- #include <memory>
- #include <new>
- #include <type_traits>
---- a/include/mysql/components/services/page_track_service.h
-+++ b/include/mysql/components/services/page_track_service.h
-@@ -27,6 +27,7 @@
- #include <mysql/components/service.h>
- #include <functional>
- 
-+#include <stddef.h>
- #include <stdint.h>
- 
- #ifdef __cplusplus
---- a/sql-common/sql_string.cc
-+++ b/sql-common/sql_string.cc
-@@ -23,6 +23,7 @@
- #include "sql_string.h"
- 
- #include <algorithm>
-+#include <limits>
- 
- #include "my_dbug.h"
- #include "my_macros.h"
- 
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 2f5446d3c940..d3b2bc1c7c33 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -28,9 +28,9 @@ DIST redis-6.0.16.tar.gz 2288647 BLAKE2B f3552cc0d27cbc5cf6556792da9a75d01ff70d3
 DIST redis-6.2.5.tar.gz 2465302 BLAKE2B 51cc672ab432bb87560151521289d04e8fefb8e4df820f58a9b742131a0f1960c0019dec42a601bad827ec2a172375b88b6cf32a19aef42964e18f5a7a911c40 SHA512 8c54451032cbb627ec2827251556cba2010e56544baca7ea117b5afd2c2add484acbedd3baf21bdb8fd10672602cf52294a4e26b135c1406d7a723c048275e3a
 DIST redis-6.2.6.tar.gz 2476542 BLAKE2B d139479432171294911d99e7e8c2327dbbc6682ea49de761c4bb4089a2efd814926f2f8823dca1826b4a61dd9ccf79abb22878c9463ac92870481b43d8a7fff7 SHA512 9b947d26fd9e208627ed22d318ab3d0775ab0be46d98db1c1d158feac671b984e75ce33e647d196face9643f80768af47e678be1b4e1ddd3eb56dff467c46022
 EBUILD redis-5.0.13.ebuild 4665 BLAKE2B cf9e076f373a99384e49a4f411aa7e34a692b94dbbb4b58e2465735efe55fbd05ea10152373a14ac115f4f08b41b5eff580d3b457bff596ff29af9981433ffda SHA512 6fc35519713d68a57fd18dd3a6b36f1ed109481be47c988c5335469fe760a63f8f976c9834df0f25d9fb35d1c9b634c60316d64e0fd3ae32460d819ecbed2216
-EBUILD redis-5.0.14.ebuild 4667 BLAKE2B e0dc1a2ee0edfbd6422d908ee29adc27125d9bfcae5f5ffd9d3801060e3d9b0fd8a184ede300ca6f457cde027db16429a68fa37020db807779ffa95bb1605c06 SHA512 93a8d01868180f443ac192420902b7a34bf84998e864c0e96b008f421d43dd3f469931ba6eb1fc56b665ffb4282fe51b7194825becde7fcdf6dc53e798ea3784
+EBUILD redis-5.0.14.ebuild 4666 BLAKE2B 6d8a3f7eef132c3c342e2246feb27b3272f041f2dfe8371ee05b14c8842e48daa2064526211d22222122e3539a93e08dbd2709926cd79903fa74303a523e5274 SHA512 1216b1c29c4c8724639faf148022a329aa66ef09de949fc1767dfd90588f18e9208f63d52a351cbfc6ab70c28803ae7c5daf024ddfd05eebcdd91ccfece19382
 EBUILD redis-6.0.15.ebuild 5122 BLAKE2B b6a0e8a15dba59fb7614ab9f0747f26165ce1ec96e735e783450c2a1eed9fa767a35d5ad172483b620da1dc0bb8b368643f692bb57c72c31deb4245774f60dfc SHA512 831b3fa61caad327c61e1132f53a35ae47efb1b5986142cdaf348aad0c6e885b9e36e1c4be2bfe99777270ef4f4074b2350913a435156b657dc01c71eaa31be1
-EBUILD redis-6.0.16.ebuild 5124 BLAKE2B 0e4f450765059a026c82224d91e585ddf2e3b14bfe2a8d395a2ec8760cdf7a93aa4e2e6971f5a83509b387d9f54c75c44c5126f16956d2f42619143666d4fbca SHA512 28997a913a386c568eb82051ff3e3c256b00d7f01734d24b7459312ce9ccd3c43e3a893c5cf90993cb288700340ca5c99d0a7bedb8431237c037ae0fdd067433
+EBUILD redis-6.0.16.ebuild 5123 BLAKE2B 8d59bb2c02c5b2d91468182ff17c9b286bc31cabbfa8ac566595721e12e1197fe1158fea5aa5303baccd28cc2cec4db00a71edef5e7ca611ddba99b37062615d SHA512 af428c7da99e770fef3e695398b55a790f1ce8274f537d127f823ab1fb99966cf4f2d14e6eb289d0b75648416355c6d7be514e2007b6d15d17c0ace4e5142f38
 EBUILD redis-6.2.5.ebuild 5128 BLAKE2B 5c13e1c15456d1038ba306e6a59c26fc56dc9558aa15e846becc56a950864203d85ef03f8c2e3d41fa24cb62fca0963bcb253c0badf49052e3b0f6f25cd297f9 SHA512 c89904640ef675c807f673a4100058bb7443895272fd73a9bd9b6d749275be3124d25203603b9459178df9c58c25a9ffcb13c330b5daaa50a4cd53d1702e12d9
-EBUILD redis-6.2.6.ebuild 5130 BLAKE2B 3565f578329569756ad67ebff767d3c2463705d19f41b4efc595490f8eb043cd8eea6753cc5a5decda4cc748015320997e345190fde310e448b879ae43bc931a SHA512 4af5a863a3865caf81d7c210054393b27394f4e02b9b63f693e2b13557943fcba57f0f8ea2ac0d2f25ca6493a5e6ce638fbfee0f29e49c39861f25013cb47550
+EBUILD redis-6.2.6.ebuild 5129 BLAKE2B dadfb0c3b4e0b4f9ea096515c13a119a2c5c55aec1817e024f0c8f7d59b49661f559c3a0162560bd3e909f79dc9972df7ee01fcf9d127c857fff43099def1a03 SHA512 fbb519b23191f51f3ab4154a8fb0f6aeec569bc7ddeb9744d6b7536bf7f014604bd2a883dc0ef94a223fc28ccfde3c2cd110908b9b97cecbf7bd35bf447f5250
 MISC metadata.xml 365 BLAKE2B a2a33da17b877c0e66732b18af4c41e78ad7f60403f7d63b43d16797228c2fe0b3e2af2d0ff56af23baa944ae489163732d84e0921335919f5cea26c589e12ea SHA512 54a8b9cb42305881b12ef37c4da78ba3760ab2de4b8f2663b099eba7188deaeae08f5649a0c101d6acae63cf20c20d4c5d33274dc3ec6ced80bed68114f32db2
diff --git a/dev-db/redis/redis-5.0.14.ebuild b/dev-db/redis/redis-5.0.14.ebuild
index 8895f4972586..28815605a2ac 100644
--- a/dev-db/redis/redis-5.0.14.ebuild
+++ b/dev-db/redis/redis-5.0.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/redis/redis-6.0.16.ebuild b/dev-db/redis/redis-6.0.16.ebuild
index 1c21ca033b32..7b33d5e5e542 100644
--- a/dev-db/redis/redis-6.0.16.ebuild
+++ b/dev-db/redis/redis-6.0.16.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+jemalloc ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/redis/redis-6.2.6.ebuild b/dev-db/redis/redis-6.2.6.ebuild
index 4317e3e01089..e20ab768e39d 100644
--- a/dev-db/redis/redis-6.2.6.ebuild
+++ b/dev-db/redis/redis-6.2.6.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+jemalloc ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 45d8e05707c5..31bff2ac11d9 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index ac032c554f20..1a59de2d35a5 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -3,6 +3,6 @@ AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd
 AUX openscenegraph-3.6.5-cmake_lua_version.patch 440 BLAKE2B 51a35309b01a096f9423ff64e66d62f99d3e26bd898db0b53c135dc99318b236a1b129211f51de9b1a29d054e0810aa4ff2a7c307dc4b4a606eb4075a60748d9 SHA512 a41c7a65b1cfd0dabc080f509cf288f575b3ec5d7666a4a889a8c3156e9d32559e1f802e23783c5c70376c82a24dd87813e9bfde0876085e0e3967b47852059a
 AUX openscenegraph-3.6.5-use_boost_asio.patch 6995 BLAKE2B 0b0c0af9980b59e1cfd4cc5256720d0e69d5e3a65173c9364036e42efa34377beb00811fc4a0aee0cead870abe0c33feaaebe57c22cbefac43d4dcf65a1d19e1 SHA512 fa7c702eaf69c7b7890cf44e5293f9c8ea73ac441af1e4573dadd62f3ca797ccbbc2fbafd8c946a936192f7331fa16d8d4247de8b657db77791d5137207c23b6
 DIST OpenSceneGraph-3.6.5.tar.gz 5780762 BLAKE2B 31ebeeae94eb6aff043788313946d5c08886f97d97cd5796e600918e137ef7f06839206b79b2f5649aac7f34037d4d79e18a5638152e150de931b7f7a7d3c38b SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b
-EBUILD openscenegraph-3.6.5-r101.ebuild 4239 BLAKE2B 13d97221c12e136146d4b45bdc1105145eaabcd227e5c6ea04e7862b7ebc6aa14c53a6ba963ef168ddfb211dbdf04c67f01aa44a92ab97c6bf2f2be098b16543 SHA512 2e209e92e96459e40e6c0ab3a4bb9386e0ea033ef2d42be28ef60f290e5892e9dfe7ed1bc59d090aac53529b76205e6d6c7daefa921df35f7fbc18b34ba017b5
-EBUILD openscenegraph-3.6.5-r110.ebuild 4318 BLAKE2B 33cb90c8c586662b64e2604e1ec0f5d0851eda7ca1b86e768b268977377d22093fa7e63525bc9328d1f995e86c72069cda7a6bc9a35b2655cf43f6497564c79e SHA512 de1ff9febb2cb269140d467185a578d1cad68dc14b12b5ae1730824cc2dfc435dfd62fc2511a321bf28797e77c82d2a5f2cccf69b0a30f051658f4ae7dd85ba6
+EBUILD openscenegraph-3.6.5-r101.ebuild 4235 BLAKE2B 4a7c2f0be520081d4a58d75cfc57d08b2d25a026bed530993a1f7d16e33b834627c56d71c8ce73e82cbf3dbd92bef8f4a98b19679a5b5e4bb75b738bf811f1dd SHA512 34378246056b1d03e5b4dbdadf2c6e26130aae56e3e4e7302dec77fa481913301f2a7ce65cb2dcde77c05be430178a49661810de40a8347d6c37ef39f6beb020
+EBUILD openscenegraph-3.6.5-r110.ebuild 4313 BLAKE2B bff8a20562c18676d3a95653fa7352e3d733757bffa9a0d543dea1f199cc05115cf0f51117eb77255d666cdaf5c090cf98330cd03030d81d4b5a6edc06f88dd0 SHA512 75c3a51760c9cace6543e3a615b8f02283dd0241687bdc38ed5c7e03d7e122065a5e7a5d580cdeb03c915a15ee60c290e7c05810d480947e605414a63004808b
 MISC metadata.xml 1866 BLAKE2B 9165a16faa78d3298365ca0d0814f7e4f1a1f8d514d7dfb1dbe613f7ab2212e30ae7e8518dc430d2626967be779330179023f445d9214ac4b2062a08df1298b2 SHA512 7b9abb010e2021656bb4e48c84bd8d0879606f05ce9213323159e6f415cea1226cd6a3c2b7290dcb68c1a99dafce5295fd18b4ad542e2d888ac8d06ed0c4f03e
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r101.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r101.ebuild
index 9ae46872143a..146cca587a7f 100644
--- a/dev-games/openscenegraph/openscenegraph-3.6.5-r101.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r101.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/161" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc64 x86"
 IUSE="curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut
 gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2
 svg tiff truetype vnc wxwidgets xrandr +zlib"
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r110.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r110.ebuild
index 34031794ef52..bc94e28c8d19 100644
--- a/dev-games/openscenegraph/openscenegraph-3.6.5-r110.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r110.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-${MY_P}"
 
 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/161" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
 IUSE="
 	collada curl dicom debug doc egl examples ffmpeg fltk fox gdal
 	gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 1d620d672a63..25d2ba99a586 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/delve/Manifest b/dev-go/delve/Manifest
index 62f7cfade75d..035c92ed7457 100644
--- a/dev-go/delve/Manifest
+++ b/dev-go/delve/Manifest
@@ -1,3 +1,336 @@
-DIST delve-1.6.1.tar.gz 7686466 BLAKE2B 24ac5d3219ec5972a985b95a94c543af10c045d7ed7f3ea23234ef1284dd143ba719b2dd2a962c9fdbb2cf516cec65dac3a21c69500542db0ce8e6cf08ee2d31 SHA512 8665ecdad1cb27500ca5628ce0ef4cc5c23295fc3f67aa17fc1cd080d58fcd31c3a806b01e9cdf383907ae7fc07e9a57ce88f971205e43e069f26bf1cc3200cf
-EBUILD delve-1.6.1.ebuild 725 BLAKE2B e951d2410a500daef587658102c6a80d2ffed8017a260b96e537bcd4a73a6fbf779a014477c66baa1b5fb09b9e065b6ba6a5aeddb862792eff43ee4ca5f8ef75 SHA512 2db060724dc153e72bc6d8aef109a59d7f708f2f49968cd87daa190cc71ac205f7d9fd246a40bd64498c7ec835b7447c79829571555e012d84fe36f5e74c5495
-MISC metadata.xml 247 BLAKE2B 8cd296da4d8e2dddabdb690dde45f597166e0a1c272e948e6257a55bd72ee9f17bcac263c75d307177e34d19e6fa3afca0a544deb61355b4e14260de8a9d0665 SHA512 f9adbc3aec70f190ba32579314750f6222eaedf1eca2f55ce41c008a93a47a0eb00d00c756cd8f1558ac34a31317f833bf6a9a147887e5999e236fabe05f320b
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod 960 BLAKE2B 879529244d38fbecdaea27588031c2d0d82551d8173f7e41f004dae8356e2264259d80e66953e941aa856a9613ae82211ea8dc0b12f9188f65bdf54487052952 SHA512 cbe178d04fe28f9b7dd07b0317fd4404d805e80ceada4953ad47763bafa2f215f88464c1315261a902ebcc52145af09df4c96a341e42644d38526909fcef313c
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
+DIST cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod 568 BLAKE2B d3d62f2d5c018c4ea3c829f7485e5a1239e2d810f79306af4d08ac32acda4d33e8e90c66c63540c4c95231f5fa116634758858dbf4af2a953a17b0db2b5c1cc9 SHA512 adb3d294ec1e9476bed820afa92aea5cabf77e7996d83bd1f03dff8447dfb13dd18ab4f091ad6ee209128151dcbfedb4967f99ccf7e10f5286e90b2ad56441d6
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b
+DIST delve-1.7.2.tar.gz 8527848 BLAKE2B 04527796bd82287b2b8e795b0b232b0fc6e9fbc9fd42ac81c83feda5f2198a8e601496eb9f2f7e21adfafd0756a9abd842c38c6732c824faee434978ec281acd SHA512 2d070e51732df10d8f8c05e4cc26ce43ea1ea4085b5c0b7343420838c7de89e8990a2c7320e8dc54c5780b68a9527ebfd5c4ae225e71abb06406b2a7d6f3bc5a
+DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Faquasecurity%2Flibbpfgo%2F@v%2Fv0.1.2-0.20210708203834-4928d36fafac.mod 151 BLAKE2B 1f1c61f2b1ca4ec838f66e4430fcc20ae946a1f3094bbc1ee2006887bb4fb7a1e7b9addde1693f66dc6e64a1c9e9eb2cc0f619422a9c9877999867fda4ab3fbc SHA512 6aecbc135070ce231f037a420c4a2a552c069b7ad5d2ad1dad687569cf5f2d2e63fe31d630b61337bd2fadf441c60a51c597341faa543d293c56091bcaae8efa
+DIST github.com%2Faquasecurity%2Flibbpfgo%2F@v%2Fv0.1.2-0.20210708203834-4928d36fafac.zip 175215 BLAKE2B 1297ea8cdbab9ab2d9b01c48017e2b8d696d469294b6a68e11672e306c0e319140480700c5fa0ab1ff762e59d98e5988db486672a64d023c30c92b56b1bb2f36 SHA512 825d46730f9cd895ebf94021680555ac6d2cbd31cd422eb3235ffffa25fd64ffc3585d0b203f0124aea034ee851c991867bc5fa8fa6cb01cd107ae3b831c0e90
+DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
+DIST github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod 568 BLAKE2B a2769032d81e02d8f4945648d36e862a996841d0e138077fd190b47b700fa08cd4e8e8d300925fcae5ebe48ea972afed0dcde81870f3673a3227ba90beb5e341 SHA512 262ec838f5c4b97bc186533c20456e62633038ae74747c7b884788bd06ce01863a59237557877d35f37338ebc018d2c1c8ae963e4a42dd42e0823a5b3ec81bb3
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
+DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
+DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
+DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
+DIST github.com%2Fcosiner%2Fargv%2F@v%2Fv0.1.0.mod 40 BLAKE2B a547ba8408a1f20e897b62c9abc8e001b8fde2477f483182f863cdce500e96e20eadd5fa9ae49dba9b2e31ff62f5fbc6bee89106e35272ad9332dc120e1ce5c5 SHA512 728246be55df3959532ba02b532165208bb6bf4af55686c728b1a137d1eb501a0c6baae633e87800e870665c9cbe8d6c02b9a52431cae7df5c31ad28adcc099e
+DIST github.com%2Fcosiner%2Fargv%2F@v%2Fv0.1.0.zip 7809 BLAKE2B 5cfdaaa2a773c60d5043b15e09901742ff84b1bcf13e9ef4f4adb1e9aadd749da2805f33f6400e1e42596cb316628f3a6ae45fca8bf8e1cd958f461f4bfb1771 SHA512 1cf7809df5a120f438800bb67f3844339fd03e633db102c83851dcfd2bedbef7c536b6ab796b19f722d8b230ff6f5ce3eea5c3fcccc0daaa631206c80a7a7c74
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.zip 19440 BLAKE2B 6a8bbf9d62017ca1b87fcf4bcc1de1e968acfcd28e20bfbe140150bb24dea998b7bae1acd18db0168aaca02fa0502769bdc9e9f698294f429c7a03384d80511a SHA512 fb756e3ca66d8968c9059e59c8488108623b536e6619454049904372f265e7dba23be6bc35f9f4c7fcd38f95c4ef20efec42fbe7b9c7148b392f94f6774921ab
+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.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fderekparker%2Ftrie%2F@v%2Fv0.0.0-20200317170641-1fdf38b7b0e9.mod 35 BLAKE2B f8e6c622758429f9acc6321e493ce347872f1f90d93450e1771c445c0c354080ab30e7ea3e3c8601fe508162dcca718fb8452b534742e3b3855bab67511caa30 SHA512 d8107de8074ae064226f6c538133cb611f4829ba77d82b141ca01a367b792da16041b6659f64ee9c7c73c2daf74ce2bb36f335acce7e8b48bb34c86e06ddc624
+DIST github.com%2Fderekparker%2Ftrie%2F@v%2Fv0.0.0-20200317170641-1fdf38b7b0e9.zip 6969 BLAKE2B ba00c7abadd800f48a06a7442d077be280b1b14242da8c74f5d1c956f920b8d2f9334fa9f065cfe76e132c59af37ae1e80a3b247e121c477003b48fbab576bb1 SHA512 534155dfe88761b23ab2b094d577b8de46ce4bc47e611064dba174b55a578b9375b0c3919f2cdcb4aa9fff9c9525875fe90c2c3a074ac8243b2babee1f385db8
+DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
+DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-dap%2F@v%2Fv0.5.1-0.20210713061233-c91b005e3987.mod 41 BLAKE2B 550d864b9a032d8e2b942cabc5702787933e3c65922ef6cff2c4a717e05339ef80b5ced0ef2a5f8ee93b9ebfb36905bb683a4ad7a45bdba679ad2a709f9a6d32 SHA512 ca1e03e494faa26b69dcd1d39cd4c43f41307e8d0fa4cdc6c837225827d8cca593d6086dd30545472a4aef282f582f572a2e040abb01257ac5f31fb8f2ee8a9c
+DIST github.com%2Fgoogle%2Fgo-dap%2F@v%2Fv0.5.1-0.20210713061233-c91b005e3987.zip 78580 BLAKE2B f6d65f43d86cb505588ed8fb81d50d29f35b41ded07db601ce99a2f5a0954445d08b74456de2facfe9ff8fb222cc3c4a184fbfe5c4376198e9d4c92ae2fbede2 SHA512 bee8c580f73618e133f41ebcf220c266847f1ea1e6591e412eeaf7653cd30e1ead811faa409984cd2fc44620709d6f6cc2e52df44b9c5ec13989ac8eaf7ab1ca
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod 449 BLAKE2B 1fbabe18b977c8e6283312fc1f8d8b35514104080a4880afd4445b92fa20af4db49ef3f7fe1da703d4237e6bd78902e64fcc7e9d4db85e84153c2bdbc6a6366b SHA512 a6d33e281b580e5a3461edadbf4e5ebe6aa74a8a929b9f0e96582592b24c85eea1ab202457f88f648018cf5991d267811132ec77255ab4886b6ccf958487d5eb
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
+DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip 20160 BLAKE2B 19b98d09d695d9d1d999e30896d7bc6b5f7266adebcf182ea18cf8bb379ded400d2200e22ec4151831d4e124c4cbfa0c6332678b20311134d5666eae24302f07 SHA512 f18b267cf4ebb61f56c726f2e6b7ebe33bf97d445d44648d41a5ba9734fd7ef7dcb034ef8881f476ff2ce843118703ecaa01f9925c2fec08bc642cdadab742b7
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip 3966 BLAKE2B b638ca22c4f9df8cce5b84837e4f72b009c1ead300c08807b8268d26f04d6cc5476d9af56f676d8f4ac046c78c333614670e0853bee13de3439b5d89b96bfbb0 SHA512 ff98f8c05d8e23fca69ee5ed780e728f9d1779ab55cecd16bff890a91d14af81ae7a0304f34b3e04fbcbbb61e3c97c044dd9c190bd8359f3b19bdd31f8a37329
+DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip 10606 BLAKE2B d9aed996970ecc4828716e86ddbc85a7949f60ceacc7326708ce499bfc09250bc8ee336806b229a44064839e7ce34f5cb2a7607da5e82c417a737ea869f97f03 SHA512 dd1763a8d04540b3e579d397fa4888c4bd8c00c3963cfcd1fe42af7c1990ef85f9a2e2fd5c5f2c7d3e6817448df5e2237241ff5a2cda651b061cc8932e0afdca
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.zip 7014 BLAKE2B 077be89b06969ca8149b1f3838940633896f1da465e21a189809ca1efda41755d33c5f52b3c6dab971726c2d8044b169950198c62f3223cc01ff813f6439bcb4 SHA512 bb4845cfecd934818a6352ee9d9311d795e0c6e7f8af97da4676b9e2085154bd0175599f745e3cc30ddf123cc807ce50ca02d82fdb665b2582edb842c001a8f7
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
+DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod 32 BLAKE2B d511476a16a86c50db84dbacb40afb4b30ac3f72c4fd5a8b20fdd8bc6de1c46592bd16b24f77bd037dcb23ba86cd217fa740b59a784c6fff0fea1720d2045695 SHA512 451fbf9129c151784d97cfe6af29d27a277b6821411cfa5b23e6730ba0f5d5a830054eb6ed660dd2192c16abd54d5999be5b80e39bbac3499c3198311d01ec1f
+DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod 35 BLAKE2B 0b603da65c4738d257fb759b8aa3971011ee721c1fc783663e1b26175335c6c90ad56eab45ddb6422e39dc0c6603e13ea64756f8a97bbfcc5e77845248b16a74 SHA512 2249854bef533dc77479041f9dc5610e14c549be1aac292a39b8b74b36c9fc42c04d211d8d5b71082c05971cc26a94a57751c3e61895050d41909270ee5123f3
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fpeterh%2Fliner%2F@v%2Fv0.0.0-20170317030525-88609521dc4b.mod 31 BLAKE2B 7d0579fb1469d76d519c6c5257b978dc5d34f568b26a4a0e21112affe84cc42cc894a48123f4c6da1d2132d34e9088849e38403b260e772d4f690163e196d186 SHA512 157d394ce35054f717ec2f03c677592d0a56586171489111c3904c734ff0170d34559015a16f9172b84b389f1d2a7d40b2647a94657edd350dedbafae8bbac98
+DIST github.com%2Fpeterh%2Fliner%2F@v%2Fv0.0.0-20170317030525-88609521dc4b.zip 28261 BLAKE2B 8858f720603f1087682ac23a87326ab468a577070b264ca9f6fcb002ff26d61c05c050e96de24ea97ec44a6f891595f16bae59dac668486c4411ed17dca7ab49 SHA512 dea1702e08ba6bad32ce87b16deb6bee14225775c2247cd8d470ec06a0ce926fa298790eea70c3bb60734bf4a5a1dfb6e3ef6dddd91051f97759280f69adccf7
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.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%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+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%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
+DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
+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%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod 301 BLAKE2B 5322be7914862368eba07f521c046dbd7580edafd47ac633116b8c9f4b61526d0d63df11ba6894223590a1ffcf4bf478c394a335c305010ca9fc18107d4e61b7 SHA512 8fe5a437a5f3f8c1ce0aff067ee261a946d946d7640aa5acf7c34b9c8c4ee65128a6421aa38bbb1feeba1339b356952ad58b4bad98f1c89ac455d94e86684a8c
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip 65802 BLAKE2B e0487985824efba7ee61c5a73df7b591d625dcda32f833ae276191cd82bec8f3db30cc2ba217d80cb56af1436b8954fcd22ed3f861c6c7fcb4a94818357bbde3 SHA512 abd13a98d10b6c996918712443edacf97ba5fcb9ece7615f59458a583130f68920dd313533ff0d8c84c6011fd2c4d221783b1250e3250b569a6ead9d7c02f7a7
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod 265 BLAKE2B 22909466af108048bc272b0e67db40f6fcac375de02b29aaee7bc31153d73b2c1130faab8e27a82dba9b5930c789de1840468fe9eafaa8881cbee126b0c9df1d SHA512 17049e0eb9bab7ebe298bcc1fd3ffe0eebd40a7642c48f4e5c2447dc37a3099359d04dd929643497f25ed55a71d7ab6ad6bf0e75553afd4fc98616295745a25b
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip 190543 BLAKE2B 692f5c496466f8d914c1172446f3cb79b1ff9c9e08d7afe44d8af3fe1248b6c1b31fecca3fdd8343afc2b014535dc8e1d3f49a3c71f360d46933ee28002c4c40 SHA512 12bf06f87e15ee039ca148873a13f5944ac6aa6800999ccd5df5175a79fca03edf4672236e2c25ebfe1a28a0aca24d0f6965c8b040c09fb648650976baf8c305
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod 1694 BLAKE2B 195244bf4042b519551efc149dfbd9fe10ff87e5b2ffe6f9a2d3777516315db8b43968533ff089b257c10f94f99babd076ff0a7203a434a79ea5aa7e39eb9818 SHA512 9f614a57ccae909af00a67e464b04eb91a92eebf1c28de3809351363b441d22a4a6628a1902fde8b67956d0bdedd91423d20158eaa6b9cd994fb7e284a35e061
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip 105564 BLAKE2B 7b082ff11190ff27ce4a3de68896fffbbbf80ebdead7612aa3b06981171974ad2935bee7d5d71cb9ea29b110a82b3e04447248e7b9376e84c8f3f53d5001ae4b SHA512 be80972112f0a3907bde960637cb2c08d6ba4256ca27cfa07de5a0a8e523d0dfbd8e90ae593e5302d7351b7dbddecf69dc3985a9d19b96087732dd886eff371f
+DIST github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod 34 BLAKE2B 85a4e50642e7088ee26b82c69c65e1bb0396d4e8819088fbdf1d93a8348d7aab950630e3bba1747517d01e0cfb9a9dd1b95341df0722480bbecf18399ba84674 SHA512 50b858817db72f0615a74431c9966f969d12a85fccc3f0dde25a72fbda32f77f3ac76cba50b12fdfd87ed7a7b3a337a291b1f9c86e1fbde81d2d0c2890c1c21d
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
+DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
+DIST go.starlark.net%2F@v%2Fv0.0.0-20200821142938-949cc6f4b097.mod 289 BLAKE2B 35aa01f56e3594f91ae0b6ec3b242f768107b29c5b3af92c4c28606308207ce7bffcc225879086cedd55fd63e15090b1b788c5b5de77b84dfcbbed67d7efbc93 SHA512 0d8fc273b9a7514dcc805e35285aa749854490937491e0920ce0e5b057988bb8c277a39456bfc58c5b3cffc9cbf6a94d4258a95104acd79838382581211529f7
+DIST go.starlark.net%2F@v%2Fv0.0.0-20200821142938-949cc6f4b097.zip 274702 BLAKE2B 5919842d65814566617528ca0a9ea51040f0728f28bef7b9a075068086642df996ad69c3ad0b955fcdfa7fcd485c1ce3c9f8e2dfa74c0387b3d81f44825e302d SHA512 a40b0dcec54a17ce0222f0e1abb2792faddbf2f7602dcdb7eb48e46958fca430c2bb3a9479a35318269465656e1f9b5cdd4df8af0f672d585f5699df4364354e
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
+DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
+DIST golang.org%2Fx%2Farch%2F@v%2Fv0.0.0-20190927153633-4e8777c89be4.mod 61 BLAKE2B 431faf76d0cd0d8410a37694d4f8b3220f7759c6d083094c43b66ba50c0c32773622795da78a97c848a15e3915971f854264cb07ff2284f4a3d5cd78dafb7369 SHA512 092b0d04aac89b86648eed91b1bfc4660efefa925da46cd477d4b377c90c6823bbc5da077e4e5f3612207d9e129c4fbeda3adfca7a1b07d742ddcf8e1212085e
+DIST golang.org%2Fx%2Farch%2F@v%2Fv0.0.0-20190927153633-4e8777c89be4.zip 845425 BLAKE2B 112d1c2599461f5ba6fefca3fbc508f09a6682168750d61c87c1ac103087d5590986e0cbc209b4bb5aa0cd43408414be4213b2cdfcf6f6cec3afb2c7c4d9a055 SHA512 929cf182067d6ac819a9581e1d9d24083e6c213e4805633116807a4db98547bb97826605dcfc72172a92665cb3ce44254af03444f87a9d138be67ab17dcf93b0
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+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-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod 352 BLAKE2B 5e146ef1d6b71ec65511cb06d8392eddb9a126b6194213f3b2ac6b675977dcdc77cbb3e46fc936189269583df4d0d80d2e393523c3ba4c55f1e8f9294e0dcaa1 SHA512 8ea874c371c0a582410e682cf475628b4fe6a0c0f57b05566a03343999da063250dcb987d9a863b96a8e1ee913612f323de296b4ddbcfecb166884bee06a8af9
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod 475 BLAKE2B 3be94804cb1c692471ca7f2af890586ef57ed45a306a50fd6d6eaec9c7a161e2e4945ed11640ed30ab6f0e48ca644ec06b6b12e232b0990d4e9a08347c27491a SHA512 4b495d303e08e9bb4b43ff0c82665107a6e0a9cdd33a6d14aea491e634901fedb6341fe9e47c45fca1f89688ea3548f57ac8d62b79ef4ccb596ef4eb2e809241
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+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-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+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-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+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-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.zip 1635348 BLAKE2B c4c3c22921fc17c195e3f50d35bf11cec02d102e2f5fd93ab92f3da1cb052ec4edb74a4fe62fcf048af600ed0bfec3264b8102dc0c017f0f96bd4ae1e1995e01 SHA512 57821ca04b380fe5fb0de3701fe47227e11a6459bf39b773dad257bf1d0755491f10b85daabe6e99a0cbbfa06afe5d7954a26d49c5ca4a10657a9cfd8fcebb49
+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.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191127201027-ecd32218bd7f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191127201027-ecd32218bd7f.zip 2892565 BLAKE2B 3173032849cf64e68258acc5473bb9a796a2c2ede7b077b4ff9da563afd355c21cba1a4581e3d18236a060b695da49879ba18d47cdd13eed3626abfef9920e2b SHA512 d95de42fbd79865b750719841951208069dc5296ddcf8581ccc8d3d3571018f909ffc873ed3e6d452c100c6c8c684295051a388886ee0ffb9639f1daaa3048ec
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
+DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
+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%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
+DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d78507081f30342eb4be40c01252683b16cd3658dd7b30d5f8a071dffe2c05f57bbee3afbc1ee4324c471788c633a878d498ff7d57 SHA512 2790882fbfa812468b9b3443630b1f1ee67a968eb20da8e4a1bfd410e4b516a8a7e77c07414b64f17e11e2151161b85d019e172cc833a45b19e66d4c70f89f82
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip 81183 BLAKE2B 0e3222d715fe7e9e8e9a10abad817f75bdd095f9af250d6bdf1ee2881930c739111de8b526175c9204995c48e0ade9852541a7f22b0ce1261f473986a2739182 SHA512 d6f4ac547609c943adfc6b518ff03ac09da566ba2b29466abe8f6db3d5a41ae7e5c187068dce4e77271905b1aa88497ca49a43bb9bbf9c94011b7ccf1b4b2f42
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
+DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
+DIST rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod 18 BLAKE2B 02f32b5a77e5009f179cf1fdc9acbb977fe219698f19ef41acee8129e0de7ad93b0b39ce82ac1538c82a7cdd33776e270f0acec114716c791727b021a4d3e147 SHA512 f911a889614d9177295952c82f8b4a0942fcbb7b4fca7378c0b98a63ed0e37e1319d51905f906ad08144eb0f3f829a2ccc2af04c2147e60cc2ac1ea8d7dab16f
+EBUILD delve-1.7.2.ebuild 18973 BLAKE2B 6457dec36be978c5652db997ddc69cc46769549614347a3ae8d2f0aeeea5b87b68e53673a4a8f71eb7c4f8183e6b51342be8484303ddde1af0c0a465b3260476 SHA512 c5393d3af5448ede17ffb79c2847fa4d959e013a4c0a675e2e32ca14ca980bc188024e7b92fd96c3e95bba5e1fd4ffaffb1f65c9596272c7b28eece739eb81bc
+MISC metadata.xml 486 BLAKE2B 320bf446d8f68c0468f96134d1a858610680c734ff4a8873d558610e2d3344431a24545c98ed9e55ea815425996db5a5dd3b5692559dd8e8f8138a78ea6f67e8 SHA512 43c9f733ee7b9dabb34f47221a6eb1d5cce65e9e54accf1d46a2a2efc6d3654d108002cfd226a2826bcf83dc1ae083d26e5ca014133445cd6749418d00b28dea
diff --git a/dev-go/delve/delve-1.6.1.ebuild b/dev-go/delve/delve-1.6.1.ebuild
deleted file mode 100644
index d484c713c345..000000000000
--- a/dev-go/delve/delve-1.6.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-DESCRIPTION="A source-level debugger for the Go programming language"
-HOMEPAGE="https://github.com/go-delve/delve"
-
-EGO_PN="github.com/go-delve/delve"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-
-LICENSE="MIT BSD BSD-2 Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-# Needs network access to download more unspecified modules.
-RESTRICT="test"
-
-src_compile() {
-	go build -mod vendor -ldflags="-X main.Build=5dd4b7df9da1770edb4c2fd86535b58b1df294e7" -o "${S}/dlv" ./cmd/dlv || die
-}
-
-src_test() {
-	go test
-}
-
-src_install() {
-	dodoc README.md CHANGELOG.md
-	dobin dlv
-}
diff --git a/dev-go/delve/delve-1.7.2.ebuild b/dev-go/delve/delve-1.7.2.ebuild
new file mode 100644
index 000000000000..44325d77e6c9
--- /dev/null
+++ b/dev-go/delve/delve-1.7.2.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+DESCRIPTION="A source-level debugger for the Go programming language"
+HOMEPAGE="https://github.com/go-delve/delve"
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/firestore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/aquasecurity/libbpfgo v0.1.2-0.20210708203834-4928d36fafac"
+	"github.com/aquasecurity/libbpfgo v0.1.2-0.20210708203834-4928d36fafac/go.mod"
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cosiner/argv v0.1.0"
+	"github.com/cosiner/argv v0.1.0/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/creack/pty v1.1.9"
+	"github.com/creack/pty v1.1.9/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/derekparker/trie v0.0.0-20200317170641-1fdf38b7b0e9"
+	"github.com/derekparker/trie v0.0.0-20200317170641-1fdf38b7b0e9/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-dap v0.5.1-0.20210713061233-c91b005e3987"
+	"github.com/google/go-dap v0.5.1-0.20210713061233-c91b005e3987/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/websocket v1.4.2/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/hashicorp/consul/api v1.1.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/magiconair/properties v1.8.1/go.mod"
+	"github.com/mattn/go-colorable v0.0.9"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-isatty v0.0.3"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/peterh/liner v0.0.0-20170317030525-88609521dc4b"
+	"github.com/peterh/liner v0.0.0-20170317030525-88609521dc4b/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.6.0"
+	"github.com/sirupsen/logrus v1.6.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v1.1.3"
+	"github.com/spf13/cobra v1.1.3/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.7.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"github.com/subosito/gotenv v1.2.0/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.starlark.net v0.0.0-20200821142938-949cc6f4b097"
+	"go.starlark.net v0.0.0-20200821142938-949cc6f4b097/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/arch v0.0.0-20190927153633-4e8777c89be4"
+	"golang.org/x/arch v0.0.0-20190927153633-4e8777c89be4/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+	"golang.org/x/sys v0.0.0-20210514084401-e8d321eab015"
+	"golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
+	"golang.org/x/tools v0.0.0-20191127201027-ecd32218bd7f"
+	"golang.org/x/tools v0.0.0-20191127201027-ecd32218bd7f/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/ini.v1 v1.51.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/pdf v0.1.1/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/go-delve/delve/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT BSD BSD-2 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	go build -mod vendor -ldflags="-X main.Build=${PV}" -o "${S}/dlv" ./cmd/dlv || die
+}
+
+src_test() {
+	local packages
+	readarray -t packages < <(go list ./...)
+	(( ${#packages[@]} > 0 )) || die "go list failed"
+	# The first test fails, without network since it is calling go build ...
+	# disabled for now. Future ebuilds will patch that test.
+	go test -count 1 -p 1 -v "-ldflags=-X main.Build=${PV}" ${packages[@]:1} || die
+}
+
+src_install() {
+	dobin dlv
+	dodoc README.md CHANGELOG.md
+}
diff --git a/dev-go/delve/metadata.xml b/dev-go/delve/metadata.xml
index 9746fd154d94..9744c5cdd6be 100644
--- a/dev-go/delve/metadata.xml
+++ b/dev-go/delve/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">go-delve/delve</remote-id>
-	</upstream>
+    <maintainer type="person">
+        <email>oz.tiram@gmail.com</email>
+        <name>Oz Tiram</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">go-delve/delve</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f45d82a5fe85..8aee40352f78 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/aopalliance/Manifest b/dev-java/aopalliance/Manifest
index 18265d27da5b..6be90d85aa6c 100644
--- a/dev-java/aopalliance/Manifest
+++ b/dev-java/aopalliance/Manifest
@@ -1,3 +1,3 @@
 DIST aopalliance-1.0-gentoo.tar.bz2 4203 BLAKE2B 193ef51f8670a0e659ff7d43e909629168c3840f205368ab31a00b07e1e0bd81c8fec2a0429dd4d2932dd7bc6f582c54708c4f118ad697b4f3b41ab999a322c7 SHA512 6761933b9c127af9773f518df89a905fd67696964837b8cb841664f16564bc879dcfbd5f47dcf85e999d4dd64561a3b46edac1c639471d3ee9be3237d9064187
-EBUILD aopalliance-1.0-r2.ebuild 884 BLAKE2B fea455d72fb5aecbf124ad5d1cbc03c48772f67fdc8278dee0bb5ded7b734dc810b359b3ce66c0e6d194058725dd08867eee8169757c376f4363d87bea1bd95f SHA512 e413f134cc19802a46865abb8ff281ba943944234fc677b59b0053ae03e4785a80ec42d8f33b215363a36c9bb5f13460ec9ade5d651622e615c1987c9ff600d2
+EBUILD aopalliance-1.0-r2.ebuild 891 BLAKE2B 041254a0ccb03d6280b0aaedd4d0b642f49f6825a74b6fd2b9ad03c8a1901547d166f7dc7d70a8c4d1e9f89c521d71415174fa4955bf5607308bf7a3ee685da3 SHA512 bbb01117a800615d77975a6accdd9fb16b5cdb016746bd9aa382e57315d475b0458889bff9c80602e4cd7cb11b4475eb61ab97416bf8f70bc51f6a0b799e8285
 MISC metadata.xml 318 BLAKE2B 8f8307ee22954f2e845092c05b3552d9320a1ccb8421787a5373cbc0123e76ce2dacc93cfd6b83cec87b85927c95a674b28b81811ebd2223b78a1988c7904e4c SHA512 4307e863e3fabedc9971ae68ad8f1c46c2bef00e7daea5fc928c623caeb09424150b1f724dda149d755a7af1ddf22db065160e3dd11dc86b51ec32f6846d4d8d
diff --git a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
index 4c1a89b6d3d6..c4597d374e9b 100644
--- a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
+++ b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="http://aopalliance.sourceforge.net/"
 LICENSE="public-domain"
 SLOT="1"
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux"
 
 IUSE=""
 
diff --git a/dev-java/bnd-junit/Manifest b/dev-java/bnd-junit/Manifest
index 0bae1b3d08cb..9cbb04805610 100644
--- a/dev-java/bnd-junit/Manifest
+++ b/dev-java/bnd-junit/Manifest
@@ -1,4 +1,5 @@
 DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
 EBUILD bnd-junit-2.1.0-r1.ebuild 959 BLAKE2B 3ff80d51205a61a3ee5bb66dd2fa08643f8e5a41024937c8d83af1b0ed68f852d5006727b83ce2ecf0dfa12431738042cc10a501847e94d54f1da60260a5f39f SHA512 9f5ab4569b9a2801f59b7fbaa59e9951c88382ae4d1c1895dbc3024039abedfa46e4e4c2a897831b6a30a11a5fc5cfb854dfe1a85658d24cfa6a32d7e5c6c68a
+EBUILD bnd-junit-2.1.0-r2.ebuild 955 BLAKE2B af87f54f96f02dfa7f038a2f01fa49c98c221e7e543e6da62603a7f430815efaab02a33cd5fd9d54b3985909068e5df762d040409d4863ac19e3dbeb1223b4d0 SHA512 1887c9f82c01d5eda2b730bccbb860e3f40556cc5623c10250eb453e2700bf92a0e9d2e01daf9d9cbd34f070dbf800cde79c8699fe8096728d9089df9bac1a60
 EBUILD bnd-junit-2.1.0.ebuild 1108 BLAKE2B e23ae80e3510e5858ae86cf1d08a029cc6f65a57516538496db22cc37c3c84d58df4d2563a8da1a08f3ba435a1e2b1ff02a71031fb9f277dbb6c276c76fdf553 SHA512 4ca41cd6424423e74da9251835c15ff946d9d9a157cf1760f30daf6e5ffe61b420c01fec4fc78bac46d946010925bced7534d88e2b9f6ea0c80f74a0ce02ae2f
 MISC metadata.xml 324 BLAKE2B 4abc17608a568a12af96dc0ddb7b82d55341ad891537e120633fd8517e09a339d805325988f3208050cde9b20aeb0a4dcab95e55ba13c66854a0d90b0e54551c SHA512 e9e23c794433024b0888c2d5859120c0ef39cd6b55df99035c3ea1761280bd4287fdeb4aaf8ff067bab1bea80dcdcc9060f74b43b1a6a004bad87eb69a9bd3c3
diff --git a/dev-java/bnd-junit/bnd-junit-2.1.0-r2.ebuild b/dev-java/bnd-junit/bnd-junit-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..3c659d744e29
--- /dev/null
+++ b/dev-java/bnd-junit/bnd-junit-2.1.0-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Junit plugin for bndlib, a swiss army knife for OSGi"
+HOMEPAGE="http://www.aqute.biz/Bnd/Bnd"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> bndlib-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/osgi-core-api:0
+	dev-java/bndlib:0"
+
+DEPEND="
+	${CDEPEND}
+	virtual/jdk:1.8
+	test? ( dev-java/junit:4 )"
+
+RDEPEND="
+	${CDEPEND}
+	virtual/jre:1.8"
+
+S="${WORKDIR}/bnd-${PV}.REL/biz.aQute.junit"
+
+EANT_BUILD_TARGET="build"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="bndlib,junit-4,osgi-core-api"
+
+# Tests appear broken and cause a circular dependency.
+RESTRICT="test"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	cp ../cnf/build.xml . || die
+}
+
+src_install() {
+	java-pkg_newjar generated/biz.aQute.junit.jar
+}
diff --git a/dev-java/bndlib/Manifest b/dev-java/bndlib/Manifest
index 0f8685191d21..9b6256c61ab4 100644
--- a/dev-java/bndlib/Manifest
+++ b/dev-java/bndlib/Manifest
@@ -1,3 +1,4 @@
 DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
+EBUILD bndlib-2.1.0-r1.ebuild 1634 BLAKE2B bc7bf92b7418b0c4f7e5dafc7fe4d1ad3460860108237730ddd2773321232c0e0bab50dbd27e4819c7139270ef755ea821cdce98e00dcb1d6a6f42f91cc0c145 SHA512 57dbd1539215383963118773f5888ef50b7602cc5f03918a54054bcc1a9e76fde9795e554fda9fdda697daf748921aa23562a795fcc8c06432e7da540ef09977
 EBUILD bndlib-2.1.0.ebuild 1633 BLAKE2B d3612e6f1f296b7326f8fccd826d5fb791bb3ea07a62213968c09315aec1bca37c79b40c8782a3947feb1eb1011bb8133c455bb49edb4b3cb0a5ebd83f3c943f SHA512 957f9543060c2f51e50641b3663d334efd20cf8ec04cdceb18824e82e125b33e330eba1346f8784b0ab5757e1ab868f00cf5450df515701cd3100c792cdcc6ad
 MISC metadata.xml 324 BLAKE2B 4abc17608a568a12af96dc0ddb7b82d55341ad891537e120633fd8517e09a339d805325988f3208050cde9b20aeb0a4dcab95e55ba13c66854a0d90b0e54551c SHA512 e9e23c794433024b0888c2d5859120c0ef39cd6b55df99035c3ea1761280bd4287fdeb4aaf8ff067bab1bea80dcdcc9060f74b43b1a6a004bad87eb69a9bd3c3
diff --git a/dev-java/bndlib/bndlib-2.1.0-r1.ebuild b/dev-java/bndlib/bndlib-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..e8cfe3bbe14d
--- /dev/null
+++ b/dev-java/bndlib/bndlib-2.1.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A swiss army knife for OSGi"
+HOMEPAGE="https://bnd.bndtools.org/"
+SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+CDEPEND="dev-java/libg:0
+	dev-java/osgi-compendium:0
+	dev-java/osgi-core-api:0
+	dev-java/osgi-enterprise-api:0"
+
+# Tests appear broken and cause a circular dependency.
+# test? ( dev-java/bnd-junit:0 )
+DEPEND="virtual/jdk:1.8
+	${CDEPEND}
+	test? ( dev-java/junit:4 )"
+
+RDEPEND="virtual/jre:1.8
+	${CDEPEND}"
+
+S="${WORKDIR}/bnd-${PV}.REL/biz.aQute.${PN}"
+
+EANT_BUILD_TARGET="build"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+# Tests appear broken and cause a circular dependency.
+RESTRICT="test"
+
+src_prepare() {
+	default
+	# Move the correct build.xml into place, needed for testing.
+	cp ../cnf/build.xml . || die
+
+	# Remove bundled jar files.
+	find . -name '*.jar' -delete > /dev/null
+
+	if ! use test ; then
+		rm -rf src/aQute/bnd/test || die "Failed to remove tests."
+	fi
+}
+
+src_compile() {
+	local extra_cp=""
+
+	if use test ; then
+		extra_cp=":$(java-pkg_getjars --build-only junit-4)"
+	fi
+
+	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars libg):$(java-pkg_getjars osgi-compendium):$(java-pkg_getjars osgi-core-api):$(java-pkg_getjars osgi-enterprise-api)${extra_cp}" \
+		java-pkg-2_src_compile
+}
+
+EANT_TEST_GENTOO_CLASSPATH="junit-4,bnd-junit"
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar generated/biz.aQute.${PN}.jar
+}
diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index e01db3b653bd..668d0eaf05c1 100644
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1,5 +1,5 @@
 AUX bsf-2.4.0-PyJavaInstance.patch 1650 BLAKE2B ceb772a69d454d1d85e05486d28d13824724813e7875f731a165aaf97bdd7f0c006baa927e849f82de7fa16228c3de5847f8d59013142f8df4823a951b42c785 SHA512 7946622658473ef4cf6b5921f58d224f7378cb00c345a748653306d2648a89b5ab3ed68786d09bbb170b95dc657f7f55501013c854536d6dfd6b38e6a1f3963e
 AUX bsf-2.4.0-build-properties.xml 1984 BLAKE2B 6db0c1ca7f899e95a0728d61b79ef6c0a1320ee747b5479c9c50a7bd258dc7fee0b6b569e3813f323cbc694d405f9af1d269dd5370ac82e6eca2bde5072d905d SHA512 d262daec432d7a22c217e24089f22e4c349be0487fd00a2e6992e77770a3699e7e2b5977e2108455d7f73c31b372d6a73febdff2856e256f93b25f3781e11679
 DIST bsf-src-2.4.0.tar.gz 299749 BLAKE2B 41f3cfe77b1ccf6b78493df7f5f288b397234b3236977c4b7d2e6c85b330e40319474419f560eefa1632da4d0524593b8c3e0c66cd27b852749b1405c20df5a6 SHA512 a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43
-EBUILD bsf-2.4.0-r2.ebuild 2692 BLAKE2B 2d65425bc980e49f947e282d96d8c9f4caadeba19119e77fd6cd5ef10095a7f755acb1e21d8b35628ecc8f1853d1ba1ab7625ce0ae322efdd95988136a9e7f8a SHA512 2348ae0a68288013e8994d162575bf9c29e52f29f758f6df77640e8e9aaddd60978f69af7364c957ec48672a6ee45217792dcc2a20ad76df758a82a935cd767a
+EBUILD bsf-2.4.0-r2.ebuild 2699 BLAKE2B 4e07987ed018b3edc2ce32d18d73bffde0a811f6928caad3572ca4255ffb09edf25e764a8cdb18f4bdbb27ff6bd5618398a78f06ec2e101990d19555278be215 SHA512 ece46be8f7a0fc3e9eb3ec233becbd65fb539c289a52e7d2cf2263f2558ae7167f9ffe63c4cdda4850abd3f2c70a3871625334da372631e4e553741e7ce75be1
 MISC metadata.xml 904 BLAKE2B 6e791ca9562cd211b97a13c79701155efa8b58be87f9af9c076017da0ca9f406a2ccc673eefb1d56db9cb2b9481fc77b01e9f762a98bd858199883ac06fde17e SHA512 36cd9c82eaa80842fae4c0f51ca63611d6a2b7a5724d755d0651edf069a67dcad3ce13789ca07cf2be353efb1c8b3a04e367be548925e29507155235749af66b
diff --git a/dev-java/bsf/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild
index 01984239b9f1..135ed88dfa27 100644
--- a/dev-java/bsf/bsf-2.4.0-r2.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://commons.apache.org/bsf/"
 SRC_URI="mirror://apache/jakarta/bsf/source/${PN}-src-${PV}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # If you add new ones, add them to ant-apache-bsf too for use dependencies
 IUSE="javascript python tcl"
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index 932439451e92..2ba88b41f104 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,3 +1,3 @@
 DIST bsh-2.0b6.tar.gz 1720334 BLAKE2B 7ade7d35ac66dad8c79dd2cb541c8851b321601bc6239f4d82e6b37269fdefc5cfa5efd1198f58030bb9dcc4712b42c1ca07071f0b042a59ebdbc4168e472fb0 SHA512 3d4458153f5e2a3b30d9afd79f0fe28862effa8e490fd1649d435c03bf90b060c255949a49780afee95069da4e8e8d2e4e2c5d979908370a525b3ca9a396458c
-EBUILD bsh-2.0_beta6-r1.ebuild 1303 BLAKE2B a74bca95046e027ce0f462b559ebd8c679545d034f3b4057759e96b32c61898e5c707444e40965e2b0e7cd5df7e4c78b97eb68e419305d18df48c4d62694ce18 SHA512 847ec48e9c52470178835285f7cd1b575cb73af4f206efaa9007adb6d4306057aea26516ab5f804adf379ddf2d12736b00831b562e200743f245dcd804dece1c
+EBUILD bsh-2.0_beta6-r1.ebuild 1310 BLAKE2B b8331c3f7d87b5ec1395cd0ce0b27803fb302811cd1ee9f7935de028bbff73de7b9c4ee990d6f79d443da78d52fb7d4ca0babc38e4e7c65deba79331440add54 SHA512 ac4f102ed37dde99bf1065e9479b9bf4872521e29d3c1b7645a459059ee197a3bf396cbc8db6c642326a72f7a286dece3ab223cd397f2db5dc2f89f9361a6b4f
 MISC metadata.xml 331 BLAKE2B faccf5565dc11dfae5b8874e970f2d055f49319264c1c2d11a685659cd5c0dacbd2f915c8e45d376e8b210dac6221e172909f62be63030e4e257157feface3bb SHA512 bce4790cca3f4c4c883c1befc7d2dcabb1456dd88fef57cd2ffb25f45f9505f921a428c830d17c0ca92f876d921d56684bf7bce3bbe277c33ddd19fb03118381
diff --git a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
index 6453015fe973..8acac44b6f5e 100644
--- a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index 2e58076856c7..db695a09abb8 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,3 +1,6 @@
+AUX commons-compress-1.21-asm7+.patch 7037 BLAKE2B 49270e040492c413fb9f26ce81dde2e7594a02b48d4dfd68bfe977eefc9d41e21e585d1a0d2e56803d08d1af617f8c2d0e3f3d3b0cffa893bfc8d2d3c50b6d9d SHA512 6722a9fb119d72c7061d12b94452fac40eef63be7610eee81ddc115c346610e5e4caca0cbf659ec9e7ff1a58f9def4ebfef26476b915bc74299a1f984d2eb29c
 DIST commons-compress-1.20-sources.tar.gz 12990994 BLAKE2B 5709419bc7b54ac9eee4ee9a42f2ecef9ae7ed0d4b1a91e0b79c791f4cf018aed8bff4ce507d1ef9136fdc28bd550d234632d0bb9ebe7819b57c5ce99694adb6 SHA512 1794bae69e00339d9e4d35b3276543ff6f9a0f1614ec9bd7c4ec8ff1bc86d08cd48e9dc3ec712b969cf8ccd61ef6054d0c6203d7cba0c28b22e6a3ecccd0c43e
+DIST commons-compress-1.21-sources.tar.gz 15165800 BLAKE2B 3fed32af039860c6b434c485f0c78939ed810a224a12680ddf1d9d6ed540f4e74530edd0e0077fd41af31404c296a607db912465cfd725c31446bc6fa7b8df8a SHA512 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1
 EBUILD commons-compress-1.20.ebuild 1080 BLAKE2B 7f8ec8fd6bc9dd45e53cf4766a419bb2f74c9d3aad7de3641bdbc0c86cc67719e592dfb64583bc0a3df51f3b2b37264eade555133c4cf249a38b10a02bff6053 SHA512 a8f6cff1e9332f5ff83e58f01a6900dd81dcf51e190cc447fb92b0fd02f31583278b5d70aaa50ba114b4c04cffbce8af7d08db3ab2c0da7aacfe1fa1df628e00
+EBUILD commons-compress-1.21.ebuild 2361 BLAKE2B 84c3980c685abf58728d1b5e1c6ccc40780e16cb6237164751705c89bac091c7db69193025b831f624fcfa58c83b1a9a7762adca9b3a6a515ef8ec47af2a3844 SHA512 3c081300aad69e4b5e0cbc2cd8a318ef4b0826bbda4c275d637223b30919dec18122ba7138700a7681b2a51c429613f8814a694d405388834420d2ff52490333
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-compress/commons-compress-1.21.ebuild b/dev-java/commons-compress/commons-compress-1.21.ebuild
new file mode 100644
index 000000000000..3d5ac30baec0
--- /dev/null
+++ b/dev-java/commons-compress/commons-compress-1.21.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://apache.miloslavbrada.cz//commons/compress/source/commons-compress-1.21-src.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~x86" --ebuild commons-compress-1.21.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-compress:1.21"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java API for working with archive files"
+HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
+SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# asm:asm:3.2 -> !!!groupId-not-found!!!
+# com.github.luben:zstd-jni:1.5.0-2 -> >=dev-java/zstd-jni-1.5.0.4:0
+# org.brotli:dec:0.1.2 -> >=dev-java/brotli-dec-0.1.2:0
+# org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
+
+CDEPEND="
+	dev-java/asm:9
+	>=dev-java/brotli-dec-0.1.2:0
+	>=dev-java/xz-java-1.9:0
+	>=dev-java/zstd-jni-1.5.0.4:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.osgi:org.osgi.core:6.0.0 -> !!!artifactId-not-found!!!
+# POM: pom.xml
+# test? com.github.marschall:memoryfilesystem:2.1.0 -> !!!groupId-not-found!!!
+# test? javax.inject:javax.inject:1 -> !!!groupId-not-found!!!
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+# test? org.apache.felix:org.apache.felix.framework:7.0.0 -> !!!groupId-not-found!!!
+# test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!!
+# test? org.mockito:mockito-core:3.11.1 -> !!!suitable-mavenVersion-not-found!!!
+# test? org.ops4j.pax.exam:pax-exam-cm:4.13.1 -> !!!groupId-not-found!!!
+# test? org.ops4j.pax.exam:pax-exam-container-native:4.13.1 -> !!!groupId-not-found!!!
+# test? org.ops4j.pax.exam:pax-exam-junit4:4.13.1 -> !!!groupId-not-found!!!
+# test? org.ops4j.pax.exam:pax-exam-link-mvn:4.13.1 -> !!!groupId-not-found!!!
+# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}-src"
+
+PATCHES=(
+	"${FILESDIR}/${P}-asm7+.patch"
+)
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_GENTOO_CLASSPATH="asm-9,zstd-jni,brotli-dec,xz-java"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	default
+}
diff --git a/dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch b/dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch
new file mode 100644
index 000000000000..e20fa89787dc
--- /dev/null
+++ b/dev-java/commons-compress/files/commons-compress-1.21-asm7+.patch
@@ -0,0 +1,164 @@
+From 7709c8be97147e8d5c5d7fa42d076504931ba9e0 Mon Sep 17 00:00:00 2001
+From: Stephan Blecher <token_github@blecher.at>
+Date: Tue, 10 Aug 2021 14:39:21 +0200
+Subject: [PATCH] COMPRESS-582: update harmony to ASM >= 7.0
+
+---
+ pom.xml                                       |  5 +--
+ .../harmony/pack200/Pack200ClassReader.java   |  2 +-
+ .../compress/harmony/pack200/Segment.java     | 35 +++++++++++++++----
+ .../harmony/pack200/tests/ArchiveTest.java    |  0
+ 4 files changed, 32 insertions(+), 10 deletions(-)
+ mode change 100644 => 100755 src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java
+
+diff --git a/pom.xml b/pom.xml
+index 28f50f06a..1c6844d24 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -78,6 +78,7 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj.
+     <commons.jacoco.version>0.8.7</commons.jacoco.version>
+     <commons.japicmp.version>0.15.3</commons.japicmp.version>
+     <commons.javadoc.version>3.3.0</commons.javadoc.version>
++    <asm.version>7.0</asm.version>
+   </properties>
+ 
+   <issueManagement>
+@@ -119,9 +120,9 @@ Brotli, Zstandard and ar, cpio, jar, tar, zip, dump, 7z, arj.
+ 
+     <!-- Pack200 -->
+     <dependency>
+-      <groupId>asm</groupId>
++      <groupId>org.ow2.asm</groupId>
+       <artifactId>asm</artifactId>
+-      <version>3.2</version>
++      <version>${asm.version}</version>
+       <optional>true</optional>
+     </dependency>
+ 
+diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java
+index 2a017bc01..7022b7b30 100644
+--- a/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java
++++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java
+@@ -40,7 +40,7 @@ public int readUnsignedShort(final int index) {
+         // Doing this to check whether last load-constant instruction was ldc (18) or ldc_w (19)
+         // TODO: Assess whether this impacts on performance
+         final int unsignedShort = super.readUnsignedShort(index);
+-        if (b[index - 1] == 19) {
++        if (index > 0 && b[index - 1] == 19) {
+             lastUnsignedShort = unsignedShort;
+         } else {
+             lastUnsignedShort = Short.MIN_VALUE;
+diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java
+index 0609aa4c2..1bc73a018 100644
+--- a/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java
++++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java
+@@ -32,12 +32,20 @@
+ import org.objectweb.asm.FieldVisitor;
+ import org.objectweb.asm.Label;
+ import org.objectweb.asm.MethodVisitor;
++import org.objectweb.asm.Opcodes;
+ import org.objectweb.asm.Type;
+ 
++
+ /**
+  * A Pack200 archive consists of one or more Segments.
+  */
+-public class Segment implements ClassVisitor {
++public class Segment extends ClassVisitor {
++
++     public static int ASM_API = Opcodes.ASM4; /* see https://asm.ow2.io/javadoc/org/objectweb/asm/Opcodes.html#ASM4 */
++     
++    public Segment() {
++        super(ASM_API);
++    }
+ 
+     private SegmentHeader segmentHeader;
+     private CpBands cpBands;
+@@ -255,8 +263,12 @@ public void visitEnd() {
+      *
+      * It delegates to BcBands for bytecode related visits and to ClassBands for everything else.
+      */
+-    public class SegmentMethodVisitor implements MethodVisitor {
+-
++    public class SegmentMethodVisitor extends MethodVisitor {
++        
++        public SegmentMethodVisitor() {
++            super(ASM_API);
++        }
++        
+         @Override
+         public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
+             return new SegmentAnnotationVisitor(MetadataBandGroup.CONTEXT_METHOD, desc, visible);
+@@ -427,7 +439,7 @@ public ClassBands getClassBands() {
+     /**
+      * SegmentAnnotationVisitor implements <code>AnnotationVisitor</code> to visit Annotations found in a class file.
+      */
+-    public class SegmentAnnotationVisitor implements AnnotationVisitor {
++    public class SegmentAnnotationVisitor extends AnnotationVisitor {
+ 
+         private int context = -1;
+         private int parameter = -1;
+@@ -443,17 +455,20 @@ public ClassBands getClassBands() {
+         private final List nestPairN = new ArrayList();
+ 
+         public SegmentAnnotationVisitor(final int context, final String desc, final boolean visible) {
++            super(ASM_API);
+             this.context = context;
+             this.desc = desc;
+             this.visible = visible;
+         }
+ 
+         public SegmentAnnotationVisitor(final int context) {
++            super(ASM_API);
+             this.context = context;
+         }
+ 
+         public SegmentAnnotationVisitor(final int context, final int parameter, final String desc,
+             final boolean visible) {
++            super(ASM_API);
+             this.context = context;
+             this.parameter = parameter;
+             this.desc = desc;
+@@ -478,7 +493,7 @@ public AnnotationVisitor visitAnnotation(String name, final String desc) {
+             nameRU.add(name);
+             nestTypeRS.add(desc);
+             nestPairN.add(Integer.valueOf(0));
+-            return new AnnotationVisitor() {
++            return new AnnotationVisitor(context, av) {
+                 @Override
+                 public void visit(final String name, final Object value) {
+                     final Integer numPairs = (Integer) nestPairN.remove(nestPairN.size() - 1);
+@@ -552,7 +567,7 @@ public void visitEnum(String name, final String desc, final String value) {
+         }
+     }
+ 
+-    public class ArrayVisitor implements AnnotationVisitor {
++    public class ArrayVisitor extends AnnotationVisitor {
+ 
+         private final int indexInCaseArrayN;
+         private final List caseArrayN;
+@@ -561,6 +576,8 @@ public void visitEnum(String name, final String desc, final String value) {
+         private final List T;
+ 
+         public ArrayVisitor(final List caseArrayN, final List T, final List nameRU, final List values) {
++            super(ASM_API);
++
+             this.caseArrayN = caseArrayN;
+             this.T = T;
+             this.nameRU = nameRU;
+@@ -612,7 +629,11 @@ public void visitEnum(final String name, final String desc, final String value)
+      * SegmentFieldVisitor implements <code>FieldVisitor</code> to visit the metadata relating to fields in a class
+      * file.
+      */
+-    public class SegmentFieldVisitor implements FieldVisitor {
++    public class SegmentFieldVisitor extends FieldVisitor {
++
++        public SegmentFieldVisitor() {
++            super(ASM_API);
++        }
+ 
+         @Override
+         public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
+diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java
+old mode 100644
+new mode 100755
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index 38f5b490070c..3855b3c1a4c8 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -5,5 +5,5 @@ DIST dom4j-2.1.3.tar.gz 565918 BLAKE2B d6f8c9ae22f84086491ca7e60e5498edda727b219
 DIST jaxen-1.2.0.jar 232455 BLAKE2B 6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e44440a2fdcc6dc06a6ea427b04e6bf1f370 SHA512 cad582fc12d0741e9e6fd7e0cf80a50feb04f5ef42043df96f8a5b78476c77695d8b43836d2241f76b35676ea759921edd25eaeb2c04ec916eb138aa2901ce5f
 EBUILD dom4j-1.6.1-r8.ebuild 1907 BLAKE2B c2802e3270130c27a14cbcd02dfb9228f73e29f39f9866521af5f870396e43a0745836c2279f16b8f4452bed47f2529ac9cb488aa7fe982602affd9ef5fc2f00 SHA512 843e5b3a520ab7ed50fe1ec926b34d5ef114c2dd5d3d7813f12fbd00c018ba791f98294aa300b8042bd6659c31e2e25ee407710c0f9e8a36f79eba7a4e3c603f
 EBUILD dom4j-1.6.1-r9.ebuild 1900 BLAKE2B 314238d8a36167053c0b148c429206b042b5fa14929edd7c92741131596fc24f39e668d165abcb26ea3b5b14363777f725a30893e2395ee57564a875b6cc2306 SHA512 30dab95cdb84bae7a4873be00f1d37f8f412a31f19748a02370071a94407c7d0de1dcdcaaee67aad7d1e024db24218b88d206d373e781b5d2e18154dab051cb1
-EBUILD dom4j-2.1.3.ebuild 2242 BLAKE2B 60865c1e1d62568a6debf5801ae28c9c9422cc6b365877e7545db5f17963f9b1ca56e2682aae83c3d91473f403045350ab74ad4edf01503371e175583ce74288 SHA512 8efac8eddd40e323ca4cd15281dfaf1ea33ced91b5b2d0faabf9ccf54ba5d43ed258a635cc64e952c567e3a89f0b7ccf33f18bde26c96f5fc1fea950d6766b7e
+EBUILD dom4j-2.1.3.ebuild 2249 BLAKE2B 40adc7c304a6715c46ecb65166735b60f250193a8dd7f796155cf80f0192a0f13a35928c9316cf3a4e68b629a34ae78781fd2e882188f5dfe74d4f68f6fe4890 SHA512 d843698aff07affdfaf601b92ac6559e87fd233ca6bbb73ddeac060d6e185225db407062ca35e6bd1078f8965275c0b40dc9a31cafbc1aa34b302ae52363527c
 MISC metadata.xml 715 BLAKE2B c04caaffea1283ffce1b0057504dc0f1962cdab8c5f17ec933699b1731d75799ce969ee41b75f004d64de46b0be92cc36bd7147d4e06d1f53245a570264be0a8 SHA512 23834e036c2ff56e52bc5f7d2b4eb357dc438fd44245bf30bf2c2946a50b7872f07b2651df2ed4772235cf1457928c71fc1d993c6a7e9229e247fc15a279a456
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild b/dev-java/dom4j/dom4j-2.1.3.ebuild
index f3635e0992e8..da4825f390c5 100644
--- a/dev-java/dom4j/dom4j-2.1.3.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -
 
 LICENSE="dom4j"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="jaxen"
 
 CDEPEND="
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 1b5845691a59..3725522a0359 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,3 +1,3 @@
 DIST guice-4.1.tar.gz 23212767 BLAKE2B bab34da971c1a154eca468bbae4f32db97c0f7ce88bd66cea9c79ef08871db06877ab1ea6495c920977ae139af0bddef2fa4bef8ff5783d2bd53c736bfa07153 SHA512 b42c6475a1d17c111a2ca278ac007bee541806685c0938c66f638808bd81d58aa99ba5aef2e4d8320dd5014df4307c5d2dd192111f4610c73a1eeef328771c00
-EBUILD guice-4.1.ebuild 1130 BLAKE2B ac5cbf10156dd69bc528468314da5d70740d545e6bdf8ec6c3442972c8a8eb19716ea98a5b444b1fd8cb829ee650ce100d6802d890388743ac102a5f1e0f4825 SHA512 ab5e1dfb01c4f4d84fd5aef2226ea8a103deda3ef7b2850191b98cda9067b29e071d029daf7ce3b7eeb68baad6daac9ea47722e802b6f7e1c112651d2ef3aa2c
+EBUILD guice-4.1.ebuild 1137 BLAKE2B 2c9ad78cccbf2612af1e9cfe5a09bd845231c396aaefd9c6735e0431239d0e330f9746a5d9ffe8b35c6a81cdc6de483dad788f04848cce922dd531d2a7f40982 SHA512 8504e61a6937648464530ebba4192d0cab00a666ec3ef2bc425591c9220517eee4480e4ec730576b2b11b798319119a0a55ae9a8c18802ef594301cc91a66de9
 MISC metadata.xml 371 BLAKE2B 2960f7040449f39cf4371b64df2a64fadfb000d042ccc4560d23cdc0f92cc4c55718a155990db42f7d1eebf1d8b5702e5094cca9bcb0e3e01cccf37e6509889d SHA512 522b9d8b6b85e48e522663cf9b93ee077b2adeb073795d5adb4df81935518dc8e712e85e2a4fc56e4ae1a0656ccc0b35831038afed7d65b880b80d1bffcbbec8
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
index f1239b6deefc..c0a7d2f86aca 100644
--- a/dev-java/guice/guice-4.1.ebuild
+++ b/dev-java/guice/guice-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 RESTRICT="test"
 
 CP_DEPEND="dev-java/aopalliance:1
diff --git a/dev-java/jacl/Manifest b/dev-java/jacl/Manifest
index 7b67dfe52598..4206493f4789 100644
--- a/dev-java/jacl/Manifest
+++ b/dev-java/jacl/Manifest
@@ -1,3 +1,3 @@
 DIST jacl-1.4.1.tar.gz 1921630 BLAKE2B 1b5693aa79fc50b5ff7a1ef86608b640d0bf391ced72dbe5d30f30fb46b26174535aac9d0ec32e1528f16af9e54def344d2fe38602700f921d612761f706fcce SHA512 e4b906efbd3ef4ab9338e8bf2f50c3b820e25b9fbe61f194e90cc0fa128f68d64eb459f7b05171d4b86b4c9635ef483906a02952bdedcee89ccb92256b789247
-EBUILD jacl-1.4.1-r1.ebuild 968 BLAKE2B 8c91bde2f3ee92e895ff97c463b37aebb093a2d71d9965e3d1e5fa5bc9821c0a15fe507640a4862cb45fff476e580aac82b3dd9b4b96d5c35e4ceab474729222 SHA512 37d37c33a0f0ab28e20febd2a11542903416b5bf6a85ec9bb25064723eeb84ed6c09891952fd01da033358d176073719e819020dc520aff8333437980be3b64c
+EBUILD jacl-1.4.1-r1.ebuild 972 BLAKE2B 773834cf88888ca8f8b1ae9a76ea93a5ad6f715cda372802ea6a7c8487bc6d1ee0112f1fa177fab1d0b06877ff9bb845ac2786ded7c756d557ea12562999d66f SHA512 d4a85899501b9bb27f7b4523233e3c92c3dbe18d0f72b9a65e62469c57ebe0c06f78c4a6b156ef72a8ad913f93b4e6ad26c2ee8108fb83ff0514d4cb0578b984
 MISC metadata.xml 2117 BLAKE2B a5929a947338b70ae6e55e33385ec8a709d191d75d93122a56c202add8f3b9350a2f54e6c1f87ad1206235bb273c88dac1707446b2d864227b9ae6335dd03bce SHA512 8e41dac5346fafe366423a573ae61149a6f7d451219bc31ab65c1031d8f8e33318791ea08fe340fc79305f4df4fea5c26da821513912c010fca8382a74093fac
diff --git a/dev-java/jacl/jacl-1.4.1-r1.ebuild b/dev-java/jacl/jacl-1.4.1-r1.ebuild
index 1b1b4647978a..3e19a608653a 100644
--- a/dev-java/jacl/jacl-1.4.1-r1.ebuild
+++ b/dev-java/jacl/jacl-1.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ HOMEPAGE="http://tcljava.sourceforge.net"
 SRC_URI="mirror://sourceforge/tcljava/${MY_P}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE="doc"
 
 CDEPEND=">=dev-lang/tcl-8.4.5:*"
diff --git a/dev-java/janino/Manifest b/dev-java/janino/Manifest
index 5fe835faa074..9e5e5c46feb1 100644
--- a/dev-java/janino/Manifest
+++ b/dev-java/janino/Manifest
@@ -1,3 +1,3 @@
 DIST janino-2.7.0.zip 992669 BLAKE2B cc9ba79d0fc9af5bbe73f167dee6d15619b40b75852fcc227eaf5399e427cde2aeca4b6ef3ff21f303b71dbc21f432cc3e844583cafce3cb073eec1a1498c45a SHA512 0fe0faf16c9d7c63ed14b156bbf75b1ce6deebda24fc0eb0176e96693de9877187694dfb39e748523329430332a36017b2d7d04b2b26ef0847fde7396106185f
-EBUILD janino-2.7.0.ebuild 1102 BLAKE2B c4e84bc87ec98018dd9ecd818f92d923fc25fbc5fbc752fca9f104441df1d11c0fbf3cd6d15045789f8a485533bc67c1f8ae643dde79da10c18d061f2a2d5219 SHA512 c7b00f2b4f3901003d17ac36fb8ac1230e72d75eaa44396bd05e2e5706a7965d2d35f9fc84f27ef9d2905043cd9c14dec7fdc2a487c6be5f88ec54f924c74d89
+EBUILD janino-2.7.0.ebuild 1111 BLAKE2B 96bba70bbd3777e7bf2732ae7c4684bd6e1f649d2b4caac1f90396f4d613e7971874937bad58354b179e819a10172887695db3f4396597a2a9f06a6eba8a15d6 SHA512 80c05cda932ec89ced7d3d065db2a8f9107c557dd28665c7dced26ee1dc768f144fd7e1c73fc4265b4c1cef01b3de9faa7b267a8dc37d3eccc173f5246924bf3
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/janino/janino-2.7.0.ebuild b/dev-java/janino/janino-2.7.0.ebuild
index c4ef9b3b80de..92ea09bfe8cc 100644
--- a/dev-java/janino/janino-2.7.0.ebuild
+++ b/dev-java/janino/janino-2.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="http://janino.net/download/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 IUSE=""
 
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index 4070962a231d..513afe59f6f8 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,4 +1,4 @@
 AUX javacc-4.0-javadoc.patch 420 BLAKE2B 8f26c37e26f8967cf527a6f7f4b6c5396bffb5cde4cf9aad292217d41e614800cac438b92971e0c942f71ace4f551db30bae873e83ecdcf2ee7940153fca50bf SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438
 DIST javacc-5.0src.tar.gz 810123 BLAKE2B 6833e79a33c7ae8b28902d1c372162a2f9e326629f0d4c1936a8c3638d3aa3f6bd5713aca8398ba5f1ff963fe585eb683fcd3009602ee592ba79692c8ba0f3d6 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6
-EBUILD javacc-5.0-r3.ebuild 1394 BLAKE2B 473d5547e934a2bbb07f11b93c473288bb86f47fa9fd1e559b831aaeba14588c6e8c19987722928924e35c4911aac3dbb2c0246f3d090487bf88220307d50f1d SHA512 8d9a3d455ee51ab568e6b91f1aed6160abad1d93f45e8edbe99bedbcc24de12c567d3b1f7f5730789cd5fd5ec987dcd4559e4240df72494bbdd01191e04eced6
+EBUILD javacc-5.0-r3.ebuild 1398 BLAKE2B 90b4cd4743940b6fd9f43586a0bd41ce31979e2abb0dc699260b4bb001878761441986cea0968ddcec1c74b41036fe306bd9393fb4972eb6ae18f62f7e8d832d SHA512 05734030a082c714c5174b1c7a22b34647013c840d8b214d85fb244c0aae91b56bb693d4ee9af0ced98365722d926153b62c71e6442884d8f16327d232effc5d
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/javacc/javacc-5.0-r3.ebuild b/dev-java/javacc/javacc-5.0-r3.ebuild
index 455204cb8ba3..de30b3ba8d41 100644
--- a/dev-java/javacc/javacc-5.0-r3.ebuild
+++ b/dev-java/javacc/javacc-5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 CDEPEND="dev-java/junit:0"
 
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index 6fc1b2c5a851..7e5ac79e4bf5 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,5 +1,5 @@
 DIST javassist-2.6.zip 1143271 BLAKE2B 05f4e5ebc47420054d4c3d2f77cde33b92e616f3c6740fc030e69b90a697bfbb67be300375d9efc1929a2acfe3493f427222f8a7b1e3137d8bc42f749e51f840 SHA512 8a6da5e2a44cc3bc5b87538a4eda56808d13998d8c9932153f9bb42a1c7844d1a1c7311eb22b0b4ad04649bb7c22156acf851bee638cffbd3328bcef1d2a9f37
 DIST javassist-3.18.2.tar.gz 1179428 BLAKE2B cc7dfebca2e47576f902e6249c1efb65c18823e75ba3698c2d94541bdc910b9b7547e8619c1f19a84c158771230ddd112ddb0445ed97cd64810beacf3468a1ba SHA512 67f22a70584eba31088d63b7862f0f7872a6a7ec57f4397b95044695af75be005e86aa5a5f20fe8e650c2178a9b63b4b922accf940b46ceb1c8e7ce9c51798ca
 EBUILD javassist-2.6-r2.ebuild 756 BLAKE2B 42f0ab587abaa592c82da66bca499abca1c726ed39b9588a8cdfe3a74c78a8d1c30982aaaa8c754af53c9728e0f341b4c4ec7b189249ac161ae63bd220c6a738 SHA512 58373704cb574b16a6bae4c2a1788c565fdfc83eaa6774a21f6dcae1814fd0be1c9306209b08d8aec801e5d4e34ef6a0f190cfa6ff410515230ef626c439c50f
-EBUILD javassist-3.18.2.ebuild 995 BLAKE2B 5cccc97d10360d9b2191a01bb2f0e426965c479fc6da87d81e8fd9d018e383959eaf719ef711bb609db320240b2006ec8ac41d1e3938c5105014b3744a54612f SHA512 ce54d3530bb757068a8233df0586e4d48f3005caf3ec19b88e1b113bc94aa1b782ae8d4dc26dfb3c80c4a4f864e6cb36e8762a93ddf420d6d57e0d2869ae4f9a
+EBUILD javassist-3.18.2.ebuild 1000 BLAKE2B 26fa128fb46bb3746bdc9efb3556329b78f612bf5d419eed5719ba0e98d2e2314a9cc2e325ba0c9100265d756b5b53857f03a6540afd2dc4d7740b154a23b7f5 SHA512 ae7b080aac74f5973431125e8351aba6c533743d1df0e157ba624523efb8628eef3824261161d6091c6cba14683767145721f750dd3523d62799b38fa9806a81
 MISC metadata.xml 377 BLAKE2B 4503d9387a65e6f722a3694870c9a9b36a2a1ccc09a2635372d386484a4113c507ade595283ee1f77038517f87814e923bb2f342e226eabb900abb9fdea9b407 SHA512 159f9374d2b9ce20eb531961e35dff0cf90b93eac4a929d1c4cf85242b50bac082ee3bd6dab5cae10dd9cd50a19b7af650df379e27d3238f12794b75ddcbeeb8
diff --git a/dev-java/javassist/javassist-3.18.2.ebuild b/dev-java/javassist/javassist-3.18.2.ebuild
index 6205ac4cdea5..6aa16a6c6f67 100644
--- a/dev-java/javassist/javassist-3.18.2.ebuild
+++ b/dev-java/javassist/javassist-3.18.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga_
 
 LICENSE="MPL-1.1"
 SLOT="3"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/javax-inject/Manifest b/dev-java/javax-inject/Manifest
index 9470e54f100c..83a5e73b1556 100644
--- a/dev-java/javax-inject/Manifest
+++ b/dev-java/javax-inject/Manifest
@@ -1,5 +1,5 @@
 DIST javax-inject-1.jar 10928 BLAKE2B 3294e302dd1af079d1bc57620dcd4b46169498a1619711837e329dc682aae4e204bc1d6733c9e7dac3fa978ddc183bf6d9833f5d0524d31c1ac95db8c81f2648 SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b
 DIST javax.inject-1-sources.jar 10928 BLAKE2B 3294e302dd1af079d1bc57620dcd4b46169498a1619711837e329dc682aae4e204bc1d6733c9e7dac3fa978ddc183bf6d9833f5d0524d31c1ac95db8c81f2648 SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b
 EBUILD javax-inject-1-r2.ebuild 578 BLAKE2B 060433c8a619ebb3d2538115922820f85a1c63d19998a345160a83d07bc1afde5593de92f60f165acab4bd61d9f60f3281e11a9b29b202a2ac54da905e3853de SHA512 411f1bec81aaf28f8f94fdc42325a71c30bf33a57c872b3fd34184a5603866b15c8f17cfce7727f623e8223086babed3654860449e8ed73dadd1555d05f503b5
-EBUILD javax-inject-1-r3.ebuild 554 BLAKE2B b04cb19f7c7faa1f077585385cebef61b56bd28bec8b690408f7b8ebf7c21e0bde328a0b80be666b8d070d9b155e3fa3ea83de0d30cfff164d8260fcbffcef74 SHA512 3b643fe363571bc0d0fcac2e122f671d8d1e7295c9101863c8ffbb9b96e21660baa7f069c2660039692870bc952eba6e45170d7ce8a3b756756943b634d773a4
+EBUILD javax-inject-1-r3.ebuild 558 BLAKE2B c57421d9a4a5e0ab9c62c5fa0f90ce71a9a5eee1f39d73baac7f79b9fecf6172c7d7dae25361e5f84f95f93b3d12f9f67c26d45cc0a6bb04876b8f3ee2a46ee9 SHA512 9006b1f749b0eeda97bd2970fe096e1addcf810083ff7767aae9acc9818979d7be56501c4f676d54353f5ed2940f6ff3b4baaf0055885239ea16152afc920d4a
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/javax-inject/javax-inject-1-r3.ebuild b/dev-java/javax-inject/javax-inject-1-r3.ebuild
index 92989f88e4ee..17c565ad43dc 100644
--- a/dev-java/javax-inject/javax-inject-1-r3.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sou
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jclasslib/Manifest b/dev-java/jclasslib/Manifest
index a31de29a2756..80a411d52396 100644
--- a/dev-java/jclasslib/Manifest
+++ b/dev-java/jclasslib/Manifest
@@ -1,3 +1,3 @@
 DIST jclasslib-3.1.tar.gz 4630493 BLAKE2B 2dbede05833a6f7ff0f32194ea91aeb071615ee8562541d1b5abc2fc61c3f393bd93f5e444110a6a72df161d488cf21551af8208b1f391951b5ae7002ceb6ef3 SHA512 5c44043eb30ab32110097ef6b52f459bf4d512db71efc79aae99fdb6b9db740a7be1e6a59f6e3a233a3b303933ed90fe482c6b9c81d76de93af6c9724aad41dc
-EBUILD jclasslib-3.1.ebuild 776 BLAKE2B 29602b4386651dd5edaeb924ce4b56125554159e448b649ecb99cbd3a0ea0dabd1d0fd0d7714a070d078aaefed44e93991671a1c98f92809c249dc32d077c652 SHA512 91d0ebeffa9539c9e6aeae71951d9cd89f1c1aa2c701a086c3bcc904f8692af6cbd3038c63faa40c918bc64af4cb6fc15b1dd26347df0a96d3c8ca3b045e1cb6
+EBUILD jclasslib-3.1.ebuild 785 BLAKE2B d2074d2243658320d3c4b18b0a57306b23e8f7d1a0d9aaf26c890b153bdb8d3edf1b044b33382da9acd7f429700b952c9260b57f2a955bff78bc14ceb0e1dd9e SHA512 339dde0b536f81c8a1d3de60571b16c0a22801d29c264f4d6a22e12e1fb936a5ff2464c68973dbc90d56c2079c2accdc2420ebb0d6a3b49047789a17defe3ad0
 MISC metadata.xml 375 BLAKE2B a604e3c57ee7ec7fc9d48a15cbfeeec58ce11483275d250f5fbeb69d0343f41de2617770a2445c575ce0d66ff4619e4bd2e1a7911d117282e66ee5ea7bc5d9a4 SHA512 c3b644a00bf9a0c92cfdc04c4d03f3974dc151538f67925ab967b8e2e5ce8e3865129f01843cd2c55d23a85365e31d2bb526f6c4c2e4edca13381dabea29c786
diff --git a/dev-java/jclasslib/jclasslib-3.1.ebuild b/dev-java/jclasslib/jclasslib-3.1.ebuild
index 5a0c811e7b02..e4554abb2b4a 100644
--- a/dev-java/jclasslib/jclasslib-3.1.ebuild
+++ b/dev-java/jclasslib/jclasslib-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ingokegel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jcommander/Manifest b/dev-java/jcommander/Manifest
index 257bac6a0df2..8a90f78b6aed 100644
--- a/dev-java/jcommander/Manifest
+++ b/dev-java/jcommander/Manifest
@@ -1,3 +1,3 @@
 DIST jcommander-1.48.tar.gz 64544 BLAKE2B 29ed81d5f9a7e4ec193c8fa03cdd67481e9904898bee2730c585be6b6beb2e0ec37b31634513095b660655b8202c42077361318a83c1e016c9450d7d7ff30244 SHA512 1304bb14ecb89f9945e8219f3229941e556c7cccef52a2eb4e4663da9dbf9fa5ecec4914275a743fb7d90ca301153284dc76dd380903aac93db1507894d72a6e
-EBUILD jcommander-1.48.ebuild 546 BLAKE2B 950cb6834b570d885603ad1d37c89d9fe1b3343422bceb534fe26cfdb7435bf11cc1913801653bc72ced4999bd246147fadfa2e47325566a61541472b04aa1ba SHA512 88419c1d22bf69289690ab3808f65af9b5a3208b4eaa5b38bd393cf53be9f859de9ffa803a5a6b801f0f45e94c1aebefb7d6d18d2ad81538845ab40f279c0309
+EBUILD jcommander-1.48.ebuild 553 BLAKE2B 655bc1d5d398940dad8b3e6753f402b1c244c853837dee48af356741359f264e8c33fe8e44d096f1e875d6f55a26e7a861f8a4ae4720ac9d598127c9df71c169 SHA512 6f6046761c0dd530ee3269240c3f95be6d4fc33646af53aa53d2e6c2a762382531f28b67cd963f1c79a5f153609a020a0cfa6dafaf6fd242b2fab1da5f3441f2
 MISC metadata.xml 329 BLAKE2B 35efab95ec95b721d53463b4fe8d98358c632a76476f1648e2e1f33f7432b2fbf9d00199e4e53c047a91c90ac9e86e733089bf1c9dc69a9f2961d7cc8266b710 SHA512 c83a4611485d806ca1c1848db6605a8d4956956dd521e5b6171d98027324236e51a13c9032e76b462168d07bb74dc105fb9587ab91bd554845d733e668c9df32
diff --git a/dev-java/jcommander/jcommander-1.48.ebuild b/dev-java/jcommander/jcommander-1.48.ebuild
index 87807fdf13b4..d57af99e370e 100644
--- a/dev-java/jcommander/jcommander-1.48.ebuild
+++ b/dev-java/jcommander/jcommander-1.48.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cbeust/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest
index ddc4a9454c0e..b7bcc2dd15ab 100644
--- a/dev-java/joda-convert/Manifest
+++ b/dev-java/joda-convert/Manifest
@@ -1,4 +1,4 @@
 AUX joda-convert-1.3.1-build.xml 10459 BLAKE2B 79f7930f5d71e046a5e0ad8e4b7bbddb10ce2be67e6d4120685e640d51d201289e02a45bf37a5c295add8cc90404c74c06709b996a946f88b4b2c7a0467c7cb2 SHA512 cfeec9e9ee537814eaa3277037e45878a71b80cd73705bce560cf24d1c0d20033dadd030dcc447b1be5ad742fa97637f57931cab96ca7e21d6b79c7897d7f0ce
 DIST joda-convert-1.3.1-dist.tar.gz 131288 BLAKE2B 0b7b6cebb7e13e89d838ec10c4edd54b52bf3449b3003cd41ea2628719b8ea52bc00a8681a96fad0de79b4acd56fc4a8d4a31d558841fa268d9ffbeb97ca1ed0 SHA512 ee3f7264e9ee445dd8cf088c862809faceb012d317c4974d2312e1ce9b580193096259978a79cdefc2217818600ff38569348625986e19bdb753edb03ba58451
-EBUILD joda-convert-1.3.1-r1.ebuild 931 BLAKE2B 2f74298f6d5641fe6f251075943a70a918e4e46b36a4430c01832bb52d81dda5282764c39c1834ff6fd77815049f8c1ba17c0cb8645cda4c90c4adff30c7e8b4 SHA512 7a7c44975ff1a890e1fe79860b08fe5e77a0aaca31947d7b72807744598ae169b3900f0652d21d0f3f25b02cf21905e82d795e1166556ce47e28f470dab8bb63
+EBUILD joda-convert-1.3.1-r1.ebuild 938 BLAKE2B 1452931f2a92c5008e7303b81439008c1be44bd940885edca9dfb57b402324fbf877306417831a7b437e81157fedba04ce11fb2c5c6bcc4427c5e0275bc45809 SHA512 ef2dc016406aeac697cb4d038b4bd2fe394590cef97b565211c051341c2e74ef9c74fa6a5e5e02c7034133e9b9bbe4faa788ceee41e7c781d5af296348b02d39
 MISC metadata.xml 319 BLAKE2B 8effac0f7bbb056b42b58598eb277775583ec45ca172e3ddd743dd9ae5845f90fa966f7e87771b48548dd48bc7ec87527c83774419866f2dc6c8ec5bd40153ce SHA512 a01502a0e630c0665e38c7b5af500022fef3cff85b68ba4fecd6adb8cfc5e85c919990d63750c824409d973fc506c1bf2a0351cb97ad1f4b74ca6e10ad5784bf
diff --git a/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild b/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
index 80b986790cd2..abb974d1e9ad 100644
--- a/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
+++ b/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 DEPEND="virtual/jdk:1.8
 	test? (
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index 31f5ad134530..a0324704fb52 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1,3 +1,3 @@
 DIST joda-time-2.10.10.tar.gz 1052384 BLAKE2B 656efddf6b98f10ce6729c6fa4c76ddfeb86dd94971c2637af3ddcb8a3a47f83948dbd58b04a6249445ef2857c5c5edb994a6d56349ed4ff4130ce9aaebd57e9 SHA512 e7917fd28cd10d7fbee02016b1f13a15a80af099b952cc0e8978bfc7fa389109553804670492c206f2b49bcf910ea093fc1838cb45ce4b7a3a885aac2aaf5943
-EBUILD joda-time-2.10.10-r1.ebuild 1955 BLAKE2B b122e651f5473fc5facd6ea265cbe6bf56363d26a2ad3c8b17890172e8a38d690f4b13ccb6a88e23457a0a0e4bf24985c42464758370fb705acb6dbcf4395bc2 SHA512 97600dbda51c1593abcd4a34faa18496ebbdd42db941a8f075506fc636d0caa8556081427f3ac6ca911884a69e9cea1529c737a5ef086851f3b4896b650069ee
+EBUILD joda-time-2.10.10-r1.ebuild 1962 BLAKE2B 8ebc596a56cf8dfac5f2b9f91587acbe9790f5b6ff0e824c71925033c49b06f4f5f31788da2d50bd502e84fb07dfde1d4c80fb2648567c8b3e52eee82e7cf94f SHA512 8700b05cfbe493780e21f1557b754af1cea62c034efb0c7fde518c55b2289a1e46cb7430454e037f21bdddba7ab5371a431c477cb9de2243aa407ce777d280cc
 MISC metadata.xml 497 BLAKE2B 96303e9c4ee30156cb9f6dc9260155270fbc3aece7c8dcfb1fd796e69ed4ee2f3ec91030f016dcdd53f411a5c216c3d41dd68ea45079c036e0ee55d529548fd2 SHA512 9f5a300ca1ee6a68e555393879c61c6898c5ba22f0cdd83d83c1411d3009af7478ddb0e1087bc88d695b2bab162c4cc62952d3fc29b4902a857db95c2fc2f130
diff --git a/dev-java/joda-time/joda-time-2.10.10-r1.ebuild b/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
index ac875a454202..4b598afeced3 100644
--- a/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
+++ b/dev-java/joda-time/joda-time-2.10.10-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JodaOrg/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 # Common dependencies
 # POM: ${P}/pom.xml
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 5940ae0ee4ce..b1211290ee0a 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -6,5 +6,5 @@ AUX jython-2.7_beta1-ant.patch 996 BLAKE2B ea81e5c330e1e2b45378d91baed45b7d60cdd
 AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 BLAKE2B 72fe6e0afe6346ed4af714485aa70cccc202aa9b8f4587df380697b54d55ce278a89685144620c4695acf212e3e4654b476865d54643b88dbfc2468b2c33fb98 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18
 AUX jython-2.7_beta2-maxrepeat-import.patch 457 BLAKE2B a55f47a16264544608ba9916d3f2ced081a4f47d260bab2eeeb5959ad1aaf1074a69bea4d8083383d039f541f6b379a141c81c4376a7f7cf324ce06ddeb84ab1 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0
 DIST jython-2.7.0-sources.jar 15371691 BLAKE2B 7e1c29f2a2c03b034e89bb9c3a8fdddbaef6a0191a7320c82b76e31b41336f3d99c1995b2e9864c033ec53629d45669ad460fb4a1433ea7bc6b0390919500a24 SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6
-EBUILD jython-2.7.0-r2.ebuild 4286 BLAKE2B b7ed97fdea6ae0aae0368c6f8b4799fbc176c31069ad0cef99ceb93f8c617dbf5211d33c1062d5094f028ed3914c919a2351b7571d6b6a7954c44abb602e6347 SHA512 878c49a18b063d9e15881fb79ad5d37fc9c9e20533dee47bdbaaa40fb1900fb8a1537649e73706da76adbc8c319e12eb67eee198017a4535c8d3dcdf03b75462
+EBUILD jython-2.7.0-r2.ebuild 4293 BLAKE2B bda7d9292683c1b8d1b411e537cd82820a4cea8ecc53ac43089bb8252cdfee7f5c89a9cbaac05970a547c0aa27a35739237d7026cb347156baf27f74fae1fad5 SHA512 65412b5ecbf72f2dc4e8f7873e600e3fb044b8377c07b9b1e3ace713796603945b0c823d8064eceb0700434045693926ea5ddc8ec6ab758683b42f9b37064576
 MISC metadata.xml 323 BLAKE2B 4c2b07b6a519fb3f1e4f7d0662e2488705d8ba2239a6cbd25b42aebd1bff1ca368105e1c5eee604915428c5b909ecc2547f6be4dfad126139a7f496bb276ae02 SHA512 de33eb0b1518ca8c0c9f8a44880946f491620bbcbfe0d5ebcb68dca71eba3965f0cf0ccd8c67128022c33845699222bd8b899c061cb5f7d7c0e09a4783fa3464
diff --git a/dev-java/jython/jython-2.7.0-r2.ebuild b/dev-java/jython/jython-2.7.0-r2.ebuild
index 82ca29839984..51252ea7dfa7 100644
--- a/dev-java/jython/jython-2.7.0-r2.ebuild
+++ b/dev-java/jython/jython-2.7.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_P
 
 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 CP_DEPEND="dev-java/antlr:3
diff --git a/dev-java/netty-buffer/Manifest b/dev-java/netty-buffer/Manifest
index 4e407133d829..e5b5e6ee924c 100644
--- a/dev-java/netty-buffer/Manifest
+++ b/dev-java/netty-buffer/Manifest
@@ -2,5 +2,5 @@ AUX netty-buffer-4.0.21-build.xml 9693 BLAKE2B ec0f0c5ba4b4c259e1ab1045124190aa7
 DIST netty-4.0.21.Final.tar.gz 960489 BLAKE2B ef279fcc2d56baaee62841ad973702c585d5450a45e513ca6beafa295943878b88ed81b8a167091e77aa9f26bccbdcea4138230850dca57321f1241c4ff56d0b SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
 EBUILD netty-buffer-4.0.21.ebuild 1290 BLAKE2B ef10b99db8b803f3aa667274a8b4414c9a50d00c8a63ad696c7938134ea347874a7f88d14faa0fb9ecf9ad397698b1914e5553ab18ee5b162765d82827c18fdd SHA512 a64a46e9b0d496aea9887c8494f693b70ddfb6a95ab4f383e1a5682b6c80af0e523334637a8630a189c9f0b1285e62fcb77eb0c970511220621bf551fc92331f
-EBUILD netty-buffer-4.0.36.ebuild 1258 BLAKE2B 6aff6b7d1dc6e9e5aaf26f8e56a9ca2331d1103ee7b636802c1ad8f88c2c4908aed71f06dfa33c81eaee70894e7e2c4b835ea0643ddf453593e691e61b6c53e0 SHA512 1003897203cb8ddd77dfe2d4d6c94697fe17f03ef95e4e2ae607167f65fc28ec9632873c30d4f651ea5399d1e8958dc518d891a4c8aa5a7e566a19a003e2b3f9
+EBUILD netty-buffer-4.0.36.ebuild 1265 BLAKE2B 020335469fc1ac0a126331d114cd6e0dbfd6ba0efe7f47762fe7757be5d53d21f58e8263622ce070858c1c99db6746193b0b0bed89f6d683b3bd96d6bfc42c02 SHA512 cccd9020fe92694719a0bef5cf59bf27ae956e3764df459afabce011b98d1c1c901f811a648e968b04bc551db6d90c57f10d68fdf646a7b2662f0115d5c19e17
 MISC metadata.xml 323 BLAKE2B de4c9f6ab6a8f2e4243cb7ea8d3e96a08e9a99b579d7996601094ca1bba95c4331fec32c42c4fa42defb8de1f5ed3bf9e52cc3ac3ca9e6a0bec6a55c3edf3d3a SHA512 99c3bb74ad41a72119dbccfaf446e9d13fd1002204188c363531a68e4434fb01a9f2ab0158ad359cea6163f3791759e8fa5b7b2c8cb7268212776d912840b89a
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
index b8f079b88e59..9b2d89634f9c 100644
--- a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
+++ b/dev-java/netty-buffer/netty-buffer-4.0.36.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="5"
@@ -14,7 +14,7 @@ HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/netty-transport/Manifest b/dev-java/netty-transport/Manifest
index f6be76898dce..a2bb676f2e1c 100644
--- a/dev-java/netty-transport/Manifest
+++ b/dev-java/netty-transport/Manifest
@@ -2,5 +2,5 @@ AUX netty-transport-4.0.21-build.xml 9699 BLAKE2B ca533763bf7d1a2c05436e598db421
 DIST netty-4.0.21.Final.tar.gz 960489 BLAKE2B ef279fcc2d56baaee62841ad973702c585d5450a45e513ca6beafa295943878b88ed81b8a167091e77aa9f26bccbdcea4138230850dca57321f1241c4ff56d0b SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
 EBUILD netty-transport-4.0.21-r1.ebuild 1107 BLAKE2B 8d2cd8f6f80d90a6859e18015b96248749b0262ccc5e25ff508104a0811fde92be01645ddd75912a492a0c0de9963d4d254ba3f20d66c7b85d61e2afdfac29d1 SHA512 3e4caf4915993af3052fc1376e30a3dbe8716318738a353b84b1a01e477c1ab407790a2ffe4152cb4cf273e96f8702bf7b34aaa279147a45d4c78258403823dd
-EBUILD netty-transport-4.0.36.ebuild 1712 BLAKE2B f18cba6097d96d8234ec28f383e5e78a36c2be837b9d743aaddeb6e5d0e56ae1e5fe2467c164b6244eb5cfee88bbcbb9bb3df9cf821c70d53ac2d9055b2f3cf2 SHA512 61b5d880ed003fe30d0c2356bc14b4f38aa472ab509b7bc03e8f91485898e715884ef9a41ee62a417f87e0c8b0d4fbf6d972fea15b5e72b704f8e2b3a81ac66c
+EBUILD netty-transport-4.0.36.ebuild 1719 BLAKE2B 245c1d218d7063a482f4d8fe7ff0e58fcf0d6cc27372ebd0dafb667170d7679de6e65a625c3605ae476d9037a27ba0a8eef702210b5c147c1a453da73fa919b5 SHA512 e8dcb425c06d3e93d12b48ccb5a2cec28dc3fc903fb92cf93ca88a6929bf94a5d173da5aaa79592b4fd51e7f08466331d6b2ef5be73e076f65bed6d68250c89a
 MISC metadata.xml 323 BLAKE2B de4c9f6ab6a8f2e4243cb7ea8d3e96a08e9a99b579d7996601094ca1bba95c4331fec32c42c4fa42defb8de1f5ed3bf9e52cc3ac3ca9e6a0bec6a55c3edf3d3a SHA512 99c3bb74ad41a72119dbccfaf446e9d13fd1002204188c363531a68e4434fb01a9f2ab0158ad359cea6163f3791759e8fa5b7b2c8cb7268212776d912840b89a
diff --git a/dev-java/netty-transport/netty-transport-4.0.36.ebuild b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
index 0c0f9456d7e5..f994446a3a2b 100644
--- a/dev-java/netty-transport/netty-transport-4.0.36.ebuild
+++ b/dev-java/netty-transport/netty-transport-4.0.36.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="5"
@@ -14,7 +14,7 @@ HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index e3da1c3c042a..c4b6d1c5e8e9 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -14,6 +14,7 @@ DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.12_7.tar.gz 191257594 BLAKE2B f747b108b
 DIST OpenJDK17-jdk_aarch64_linux_hotspot_17_35.tar.gz 188907472 BLAKE2B 7159e03fe2a9ae79bea6130574b484e9f1ecc0549065d31e019f9d90c299be4b4f4a09bea85e6ebb13eabb5eace3db0283f00f19d7bdf362e52849aeb476adf5 SHA512 1daec8504962c06cbafeb3265edf5e220adb75e7b9d11e8f92b784ee273623b770bb38182dbbab2ffd8751254667d972c99f3d859620751f94c9c1d1b603546d
 DIST OpenJDK17-jdk_arm_linux_hotspot_17_35.tar.gz 188807831 BLAKE2B 55e0d944f5d2f7f09ce9a6bd87d6d432f9b086083f906fa9aa6f85f0e006cf15bb88cc6433ce41d6840ab2d7bc6d07223b51a1855ceb937aff6d0142c3f87c63 SHA512 a20c0de63ea404653e54b7eb30fd9c8c66cf6aae43845fefc7a67edbfc60e777fc4bf1a16a7958a56b36a868a8b4ce75e065b78ccb74a8ff26efc61a90d6e498
 DIST OpenJDK17-jdk_ppc64le_linux_hotspot_17_35.tar.gz 187664371 BLAKE2B c12df4a24cd14fb57e6757056931da69b067576d22fdc9493c3d8eee34cace10718dc234b4f1cf6b525ee082752cdc7de9e1bc6467f2ecfffd5fa391095662e6 SHA512 c1f3ce3d8d7e33dbf1a838fee054741cf1aa6133fe375ec8c8508072b9da78158bcbbe633f4cdd3b1b8dae4915418b26de2fd218354ae2264a3694aad5fc9cd9
+DIST OpenJDK17-jdk_x64_alpine-linux_hotspot_17_35.tar.gz 191382466 BLAKE2B 78b5e126b25bf6fa4471913cb209ff0f76838b44f1a2a5845cee190d2fa5b3957696f353ff8bcf7395a716b3ff22431e12be2f966457cf525fb89ff1a6f32d7c SHA512 2264bebae07d060ce34ef0b743d11afb06c66fcd21d2ff338c5fb641cc55b95d70b2e1b17456cf68264442e58d0dea3988a36ee29d7c2430ee8a8f84116a5584
 DIST OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz 192014376 BLAKE2B 6707451ca3aaa22f232592f6497899f4751a67cfce5c539a275806b551d3494c686905dd91c03ba6de64afc65841d1e9836a1dead4ce55d99df3da4a077aecb4 SHA512 9af1945e46a1b444cb49ec8e58e14650098266e29973688c2a25b3707d23bf90b0a1287ad0ea5c467425f959354359fcdf1eaa8bd68e784399a6780298b22a44
 DIST OpenJDK17-jdk_x64_mac_hotspot_17_35.tar.gz 192417649 BLAKE2B 53fdd3f71b9c3860231451eb0f59414c03a863944c9b7f2106490c1d39a8b94715d1743bab10959fe513277f5fa9a4d397c76c464680f9b1f35d879e7c82ff05 SHA512 ebe2f1f936c93150f2bd5e2bb9b07b572eb14abd71ad7446dd0f5c511c8b6debc882d6ec69376b55a50b964c9a2b8efb52db96de1041dd2aa857bcdb64915494
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz 102423506 BLAKE2B dab839491d359e4366d316fd1a0eb3b7009e1739d7c6d4dc3ded47bd44fc7af36068d76183d9656d748beec0117bf95f09a78e577c3e1f685f0fb3c2e2d45e28 SHA512 6ca2dddd371223c0bae6caea1f4841d7d718b9ea812d914ec8fe3f03671e2176454ca094c05e55286ba0560e2897a515714bf607e868b4b0405b6bce03c5c22c
@@ -28,7 +29,7 @@ DIST OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz 103785976 BLAKE2B 81f4b24f2b2
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u302b08.tar.gz 107303398 BLAKE2B 0eda36bfe60a870d7389eef6f5babc96e7777896c3a3fe584cc713db962175aeb504ec3b69c4a8f126568596b81ad3df855097d5c179dbada10545bee3771cab SHA512 a0bd5d487ddd1d0370b20879249b63981b9739455d280c3e7d9a13d62e5f255a7f9cc34e892c45bcc2f8dce0e29c9f93842a99ab909b63432e194eeaf3ec494b
 EBUILD openjdk-bin-11.0.11_p9-r1.ebuild 3622 BLAKE2B 2406f9ed451ea6433bbb399d3b6d141876192abbfd79199361a3254206644e0dd7dc310b7859dd594568052df8aa75330d2603073627c81c02c94d5bf63542af SHA512 cb02764cdca39c3dbd525d2604378e4593919c2a94b16deca5a34cdba00932d370ecc295a09697bd4fe81dee0e47c16408c2805a6c3cebbc37a8fb1a6aeea73c
 EBUILD openjdk-bin-11.0.12_p7.ebuild 3618 BLAKE2B 7ea41f851fd51bdea387e959721f4a2c5843785460f5897eba27e0a088cfbb52ae953941a8e3a64dfe18ef052a3ab293ed58bc6ac2c70f55037e4d3de7c61f65 SHA512 9fe249b28a686b596e45c4d904cf54abe8eb2940783f9701eda0bb234dd19cd9cf249f1fa16cf2f43be3b810322900b10a86d4f5d8e85567918e9246bc3c4c4c
-EBUILD openjdk-bin-17_p35.ebuild 3629 BLAKE2B 7004f68a190ecd65b005fb402a10f2121e437beef6056393afa7f4189d5e4f5ed6c2c27719f6eb797397b418221b898d4754dbb5f2c28b51ef842aefd5f153a1 SHA512 c8e9ca7a10d8a0bdf69e1957d080c696a4451e8bf8633633a095e1585a13d7234435d7a4532ff55f994f34ad8bb18da534183670295a027a00c38ef1fd823a48
+EBUILD openjdk-bin-17_p35.ebuild 3821 BLAKE2B 4f67024f885da85a8336f662cfa0587b082d73e07b90e063133325af1a8efcea074d67a3f264aa8f73ec99027c01f19331afa53f95ce33759ed8eb32995a700d SHA512 449dd32bee45a47cee082de1a3a8638ae26532aaf0972fa67543d0dfea1c27958dc2877f296807dd13862545e4f57398bc062572c638f614983dbfdc6bf84f6e
 EBUILD openjdk-bin-8.292_p10.ebuild 3052 BLAKE2B 65641297f9bd53fcc2db687520cadf650e8e342e6920694507c1bcb2e7356c8d849f90b1946098ab40339b26810f369aa7cc3ea55ab9fef809de3365d225e877 SHA512 ce12ff1d1f36f2ac0c44fde0c35af334d4a43e76a217f1f943261e2971ad41539bfb933ff7ab584826b096d16e13c1ee0a3447e3b22a65361cf1a400bcc29387
 EBUILD openjdk-bin-8.302_p08.ebuild 3048 BLAKE2B 7c5b1f0dc83fe6c27feb67a4268fc5353ec08556486b1be745aca38d259d7cea632a452a6808eb56d4b43f0bc728d71ca3b545a45fb58a783824db46ac468d23 SHA512 df1ec46275ab1cdf8fc091da0ea1901c1231bdb1a002a49fbeddd3de09268cd69917ebc3f4707c83a93a823db52d59bef897ce6fac9b9934172ca6c55a744bab
 MISC metadata.xml 941 BLAKE2B 16002011c075cd453721b20649521e7370b0835939bf228e3a66cb6994b98d11ee2b0074bd9ead474c8787301d2be44a2c05d2d49c09b3f2767995153c37a69a SHA512 37681cf8ecc00361d9bc3ab5b26defae227a1d95aec0a5f51b39d412e1d4f62bc3c9db0c1296b394c02f81f0b8eb052ea85212eed0319991f372525c0bf26b09
diff --git a/dev-java/openjdk-bin/openjdk-bin-17_p35.ebuild b/dev-java/openjdk-bin/openjdk-bin-17_p35.ebuild
index e7f747915308..c931ac0e6022 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17_p35.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17_p35.ebuild
@@ -6,14 +6,24 @@ EAPI=6
 inherit java-vm-2 toolchain-funcs
 
 abi_uri() {
+	local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
+	local musl=
 	local os=linux
+
 	case ${2} in
 		*-macos)    os=mac      ;;
 		*-solaris)  os=solaris  ;;
 	esac
+
+	if [[ ${3} == musl ]]; then
+		os=alpine-linux
+		musl=true
+	fi
+
 	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
-		)"
+		${musl:+ elibc_musl? ( }
+			${baseuri}/OpenJDK${SLOT}-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+		${musl:+ ) } )"
 }
 
 MY_PV=${PV/_p/+}
@@ -24,6 +34,7 @@ SRC_URI="
 	$(abi_uri aarch64 arm64)
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
+	$(abi_uri x64 amd64 musl)
 	$(abi_uri x64 x64-macos)
 "
 
@@ -39,7 +50,7 @@ RDEPEND="
 		media-libs/fontconfig:1.0
 		media-libs/freetype:2
 		media-libs/harfbuzz
-		>=sys-libs/glibc-2.2.5:*
+		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
 		sys-libs/zlib
 		alsa? ( media-libs/alsa-lib )
 		cups? ( net-print/cups )
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 2044f1f0520d..7936573832be 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,8 +1,10 @@
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
+AUX openjdk-17.env.sh 537 BLAKE2B 64ef0f37bc0fb1f20d5f30751727e8f70a0460ad5917a9aa0dd346732e0862ebe10ea48145d585aea45f3689c9d359ed3f983dbaafeaf9da4c5f306fac8db0fa SHA512 b6add3bd4cf296debcaa57c7e73c1469c2dab1450157259a70702098aaa40339b6927ac444116f62b9448806c88616049d4733b4d7d8b2ae6a1ec106c16a6a07
 AUX openjdk-8-insantiate-arrayallocator.patch 647 BLAKE2B b2403d842ace7198520a25bf7c2027e6d74b5d418b52321722b21cac866df883d47e53e4f5e040aed55a9cc4bf03b5a62d008a0877add6c649a41f6230d78a38 SHA512 4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de
 AUX openjdk-8.env.sh 792 BLAKE2B efabd83be56cdbd06419267361b82278bd52bfce8df8f369b7b9cadac74196ad90b9ab83e3abe8ae73e5ac51c49236d24d7762450832236414f98c1f6d13d6b2 SHA512 acdf229fff329c79e2263bd433c953dd18fc0945a0ffb6428c7004baf0bedbe3a9503c22ba1e777e7598412dfa2d2d9255c9007ecd14b4590c558e6a52c48a9f
 DIST openjdk-11.0.11_p9.tar.bz2 95298760 BLAKE2B 7572d297fecffa9d38998c79dda00ea9361c1cf2f6c8bf51bac782da17cd3b6b272d08ab57fff96d523a1299f5514cb3788d05eeb37ef467ee7ad8bbb156d98e SHA512 72deecf32b793fa331deb6a1c0294b1efc68b72af9aebc1ba0528189e0097ff6d226cd0c3947d3cdc35c3cf28b3450cc538d375be0b9d43dca379f244894d20e
 DIST openjdk-11.0.12_p7.tar.bz2 95201432 BLAKE2B 6a031fec8e49025dd07d970bc12ef4da23c0e6be8a7b6f6609154bbe607de386669e58c529a935504a4a115269cf3e5a142ced50be5b21961b21d6ba53c6ecc2 SHA512 ca2af877839ee91b989981112be0af446d835ddf9eb68fc4976c2f97b21a4b0c9ec67625c202084e92834dd1a75f97a8aeff77a45570a79dc870cf6bd9d5d97f
+DIST openjdk-17_p35.tar.gz 104583143 BLAKE2B bc5cb90ea42d6a6fa414e807c04dbabadb097e9a3a3fe27010b03375997446a1d2ddfcd6ca8afc604730538ad0a375266e5a7fa4e111b02cef23b06b39160a89 SHA512 38a108752072133683bfdb5564f6406a4d0e95f4c15116f0b0dbae1d024450ff0be8a01f3a58ed5de9d93e1b0c70cb481a21237a9eb0d5034be85793785d19a4
 DIST openjdk-8.292_p10.tar.bz2 457861 BLAKE2B 043c1d6f7d040dedaadd05091ce4fdf3f516c1cd241e3603c81f2c49fd81df9c4f1082822a5471255381d56f3ab838a24e499b4ec647f3354ee051078c496b2c SHA512 6e1ac380db32fa5f1decc80291dcdb5e1d3d9afb0dc4587966c5a1b840588a984bc07109c23cb0c69c60509c6db8152e7306509280063f7d2e853aed41e391cc
 DIST openjdk-8.302_p08.tar.bz2 459824 BLAKE2B 19909605f3ae93f94875268e88b8fea0a49be0d8adbf2d2369c5fa1e66f6880094730294cb52bad009984c7ac7f63b8271fa43d0901fe4ce52b7b03696aaa6e3 SHA512 2be9c2965e307b09dcd07225e09665bbc818ba851d9e854645218194f0052eb4736f49915fddebb2a89043b0c14d7a6d5de145fb712034661568610e596fe0e5
 DIST openjdk-aarch64-shenandoah-8.292_p10.tar.bz2 464164 BLAKE2B 3f50f20517ef7b4599f9062330b3bc86900c137751e65d3047d165ad153032447b5f9c88e0d390c0ed758ad10d818295ce2cde04150da5036dd6b05fa26c2745 SHA512 074e9ea2fe83f4edb4d0de72f0d1a9c9091c28707c17b08ffab11cad2620790e740bfe53cef41a07d04b31cc32c1388e52e09eb07ca0b9929300d611c514619e
@@ -35,8 +37,9 @@ DIST openjdk-langtools-8.292_p10.tar.bz2 2401270 BLAKE2B b4043862df04e9f0056d420
 DIST openjdk-langtools-8.302_p08.tar.bz2 2401910 BLAKE2B 64e1d65121bfc75314b0f4205691140ec167f2ee72472650b1558f0a387bad1a657ad51a001c184ae65d8e8a1fd5bbe6f07a96e7e8c41cf13a195e0ba6aaf638 SHA512 517f75fa6e22fca92892d1811914bdcbcd7d85bd5357ac5253a0c3b3551a119d0ec68a82ca99bb336e34c6ff33b82195379c4ae9fb07f10e71f45e9a2ed65d75
 DIST openjdk-nashorn-8.292_p10.tar.bz2 2849397 BLAKE2B d875dea02ec8a3a3cba49f173f42ad7d73d15492cb86a15b095063ad327655ab9c260571c8a8ed35daf4078d52eb24d58b04125d3cea148bbc9e3fe924375c45 SHA512 4b707059bc6b217bdae2d9ea685c18b9cc3759180d5dcb5e51ad4eb00e6e660ca6181a68427f1e53c81b9636a323c1229e19de35b51e14a5d599cb64412ae11f
 DIST openjdk-nashorn-8.302_p08.tar.bz2 2848729 BLAKE2B 75cb7e04c0b398f7b5443738b08473a4a806ffbd416828dfa9d7696e11c4ed28337330a4ba19794394689d571a05e6dd95ffbb047482b744cf25ac9551e94100 SHA512 c0634948d4d35271c27009108c322779ee67cdc764c3e49aeaa0bf9e59729486bdaf7f54dcd5289e82fd0e83f03f68a04597d187d37ccb4aa5b2e93f30111a06
-EBUILD openjdk-11.0.11_p9-r1.ebuild 7792 BLAKE2B e56b763df2fd4006fb19f4ee4fcbc661bd7e2cb30bba2ccf203685bb7e194540d9cc39d53c6e1f7b8f19353a9dbf964a47d43b816d45cfbf22a339a373e3e28b SHA512 e11ee803045f9fd994ccf4ee617aceb31a527a64b568290a46f7f36a260c2a0587dc65c1104780a54d4d73110027d83dc077e2c1703ec2e932ca090b54390db4
-EBUILD openjdk-11.0.12_p7.ebuild 7793 BLAKE2B e6c81ae0203613ff9151c388c7f706e9cb314a113501a2d8707e14026ba7dde339e9522d611dd9cdfa0339f2c6a90b4a403a7e293181f3db4479ab75121255c8 SHA512 da62cee1d726339b8555d1db5826a5ef2263a54f29958b26405c261ffa365345a87cb8ec05b0acf78b87e2d9800ec5fe2133dad69b0125c6226966a0816cc394
-EBUILD openjdk-8.292_p10.ebuild 7313 BLAKE2B 1c5db4f660ab13a3bdd21e009900fd6f4f7b79005f89da8c802e611cb325929f42eb60f59c88220fc2d865fa5554d0b88c09846767e907c11d787a9433b6cee1 SHA512 eb35e875c863ba47d1a1b6de1f493ff2efdd5bc82a82be775f9977ffc46cb64854f9576498aba8cf424bdb78003c1301efae487c7223b4ef138f1efbe7e51b2b
-EBUILD openjdk-8.302_p08.ebuild 7315 BLAKE2B e3c1fa880c236700019e5ffe4d63767c3b4a20ecd5e4b31905d60b079e4b8326058cac97a4db5970a3fc30dfe42f682937e45a8731a6b3f4468598c955d8e12f SHA512 a494bcb6e77f7e00691df22eda50f1028aef090c83102e6d01b8fe351674e1373d3ef4799ad9db4e188deed7401f95c64883983a6a01a0dc10f6b3ea8e7c1e95
+EBUILD openjdk-11.0.11_p9-r1.ebuild 7880 BLAKE2B f445e99b98d7833b477af27ad5f3912a7db667ee4dc851898cc509197af42c40bf93a5b640627bdb4fd6e8dba624f99884a54b31cdda788290bdb971cbe28877 SHA512 3c072d057b6987315b0722fc76e9c00773fc347cb7412811b4aa6479baee8278e88aefb2a29ea9c5c14b70241815fec09c2f9d1268474386938b7cd55873215e
+EBUILD openjdk-11.0.12_p7.ebuild 7880 BLAKE2B 90be95ba0aa11179f0cb1f71277c28d53c9df33f630e5c3cf876009efeed9032426d85d304b20990972fb2b5eead1c67c3d25b1b546c88c83273fb0401d82c86 SHA512 631287cbf9a147fb7a6a0d33d5011b34229ac66b09234cdc750ac3019765cae990016b2c3821048a524bb6e54784c74342966f94d1e332fae1284b4ad0183eb6
+EBUILD openjdk-17_p35.ebuild 7801 BLAKE2B de1e5e767add36f98d18180bb57e2f65e73d2119e68f025cd315264bc486979ccd5e26b1c748c2c7b246b39ed67f9749bd0f484408549064c267c00356b06462 SHA512 3b0301ce9ec2ca457e687661b6f1444db69cffde4b5ba3c1984cf38f9c2d20fcf41b197a8dda4427c8fa8a4c1018eb233bce06c5205f9bbed03e026bf5ff6c1c
+EBUILD openjdk-8.292_p10.ebuild 7401 BLAKE2B fdaac61668973e591bc885b6a2033da7ac3ffa3263558a507f800df7a013d873eadec2259b324c1f56823e7c36629f7af7e470552c58e29a53096de212309a6a SHA512 0972113635d2c22aa7cad3b847368d0ce89f85ede1441488d8f13df19fbfbb051513188513960299b0ef1d57c8e5c4b2a898ee01c171cc6ebecc0d8ed954ca39
+EBUILD openjdk-8.302_p08.ebuild 7402 BLAKE2B 9c305a3a852441a557f9bd4213e9c4c29c6cc2cd8184c6c68d4181f65680efe4fb783f50f8d70e5257e4e0b1b1666ff475bf4cd33ed0dddf453e77c6a8859160 SHA512 aaae2b31dedd15ae27bd369d34bcd2077b8ab820d2ca54b99cbf83dfc3f58c68c618485cc6d58597de944b3c3efade774184359ed49444245cd71076d9576fc5
 MISC metadata.xml 1433 BLAKE2B f1c32727711519e4f3ecbaf9f9be6c025b467d93e2423bb5e6d9f3644242ad8f356204e7a804b0fccb56a3df5b9283cce305e82b19659a1c39bffc6b65676316 SHA512 cee169279a8c13fd3bfbc89eb1e0ecdda9a34214d001cf941f08abf89516f224e1532e916bbdb6597c56bd6a1df18ede2c4bb18e54c5e4ad67be70250f836fb5
diff --git a/dev-java/openjdk/files/openjdk-17.env.sh b/dev-java/openjdk/files/openjdk-17.env.sh
new file mode 100644
index 000000000000..7db6461bf48f
--- /dev/null
+++ b/dev-java/openjdk/files/openjdk-17.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="OpenJDK ${PV}"
+JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
+JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH=""
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk/openjdk-11.0.11_p9-r1.ebuild b/dev-java/openjdk/openjdk-11.0.11_p9-r1.ebuild
index 789f3f0fde3b..d54714848896 100644
--- a/dev-java/openjdk/openjdk-11.0.11_p9-r1.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.11_p9-r1.ebuild
@@ -141,6 +141,9 @@ src_configure() {
 
 	# Work around -fno-common ( GCC10 default ), bug #713180
 	append-flags -fcommon
+	
+	# Strip some flags users may set, but should not. #818502
+	filter-flags -fexceptions
 
 	# Enabling full docs appears to break doc building. If not
 	# explicitly disabled, the flag will get auto-enabled if pandoc and
diff --git a/dev-java/openjdk/openjdk-11.0.12_p7.ebuild b/dev-java/openjdk/openjdk-11.0.12_p7.ebuild
index 29fdbe9c1a1a..e0b6a2896eeb 100644
--- a/dev-java/openjdk/openjdk-11.0.12_p7.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.12_p7.ebuild
@@ -142,6 +142,9 @@ src_configure() {
 	# Work around -fno-common ( GCC10 default ), bug #713180
 	append-flags -fcommon
 
+	# Strip some flags users may set, but should not. #818502
+	filter-flags -fexceptions
+
 	# Enabling full docs appears to break doc building. If not
 	# explicitly disabled, the flag will get auto-enabled if pandoc and
 	# graphviz are detected. pandoc has loads of dependencies anyway.
diff --git a/dev-java/openjdk/openjdk-17_p35.ebuild b/dev-java/openjdk/openjdk-17_p35.ebuild
new file mode 100644
index 000000000000..b5e1cacf9515
--- /dev/null
+++ b/dev-java/openjdk/openjdk-17_p35.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
+
+MY_PV="${PV//_p/+}"
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.java.net"
+SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
+
+COMMON_DEPEND="
+	media-libs/freetype:2=
+	media-libs/giflib:0/7
+	media-libs/harfbuzz:=
+	media-libs/libpng:0=
+	media-libs/lcms:2=
+	sys-libs/zlib
+	virtual/jpeg:0=
+	systemtap? ( dev-util/systemtap )
+"
+
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+	${COMMON_DEPEND}
+	>=sys-apps/baselayout-java-0.1.0-r1
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	app-arch/zip
+	media-libs/alsa-lib
+	net-print/cups
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
+	javafx? ( dev-java/openjfx:${SLOT}= )
+	|| (
+		dev-java/openjdk-bin:${SLOT}
+		dev-java/openjdk:${SLOT}
+	)
+"
+
+REQUIRED_USE="javafx? ( alsa !headless-awt )"
+
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+	local M
+	M=2048
+	M=$(( $(usex jbootstrap 2 1) * $M ))
+	M=$(( $(usex debug 3 1) * $M ))
+	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	openjdk_check_requirements
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+	fi
+}
+
+pkg_setup() {
+	openjdk_check_requirements
+	java-vm-2_pkg_setup
+
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	# The nastiness below is necessary while the gentoo-vm USE flag is
+	# masked. First we call java-pkg-2_pkg_setup if it looks like the
+	# flag was unmasked against one of the possible build VMs. If not,
+	# we try finding one of them in their expected locations. This would
+	# have been slightly less messy if openjdk-bin had been installed to
+	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+	# file but disable it so that it would not normally be selectable.
+
+	local vm
+	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+			java-pkg-2_pkg_setup
+			return
+		fi
+	done
+
+	if has_version --host-root dev-java/openjdk:${SLOT}; then
+		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+	else
+		if [[ ${MERGE_TYPE} != "binary" ]]; then
+			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+			JDK_HOME=${JDK_HOME#*/}
+			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+			export JDK_HOME
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	chmod +x configure || die
+}
+
+src_configure() {
+	# Work around stack alignment issue, bug #647954. in case we ever have x86
+	use x86 && append-flags -mincoming-stack-boundary=2
+
+	# Work around -fno-common ( GCC10 default ), bug #713180
+	append-flags -fcommon
+
+	# Strip some flags users may set, but should not. #818502
+	filter-flags -fexceptions
+
+	# Enabling full docs appears to break doc building. If not
+	# explicitly disabled, the flag will get auto-enabled if pandoc and
+	# graphviz are detected. pandoc has loads of dependencies anyway.
+
+	local myconf=(
+		--disable-ccache
+		--disable-warnings-as-errors
+		--enable-full-docs=no
+		--with-boot-jdk="${JDK_HOME}"
+		--with-extra-cflags="${CFLAGS}"
+		--with-extra-cxxflags="${CXXFLAGS}"
+		--with-extra-ldflags="${LDFLAGS}"
+		--with-freetype=system
+		--with-giflib=system
+		--with-harfbuzz=system
+		--with-lcms=system
+		--with-libjpeg=system
+		--with-libpng=system
+		--with-native-debug-symbols=$(usex debug internal none)
+		--with-vendor-name="Gentoo"
+		--with-vendor-url="https://gentoo.org"
+		--with-vendor-bug-url="https://bugs.gentoo.org"
+		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+		--with-vendor-version-string="${PVR}"
+		--with-version-pre=""
+		--with-version-string="${PV%_p*}"
+		--with-version-build="${PV#*_p}"
+		--with-zlib=system
+		--enable-dtrace=$(usex systemtap yes no)
+		--enable-headless-only=$(usex headless-awt yes no)
+		$(tc-is-clang && echo "--with-toolchain-type=clang")
+	)
+
+	if use javafx; then
+		local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+		if [[ -r ${zip} ]]; then
+			myconf+=( --with-import-modules="${zip}" )
+		else
+			die "${zip} not found or not readable"
+		fi
+	fi
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		myconf+=( --enable-precompiled-headers )
+	else
+		myconf+=( --disable-precompiled-headers )
+	fi
+
+	(
+		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
+		CFLAGS= CXXFLAGS= LDFLAGS= \
+		CONFIG_SITE=/dev/null \
+		econf "${myconf[@]}"
+	)
+}
+
+src_compile() {
+	local myemakeargs=(
+		JOBS=$(makeopts_jobs)
+		LOG=debug
+		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+		$(usex doc docs '')
+		$(usex jbootstrap bootcycle-images product-images)
+	)
+	emake "${myemakeargs[@]}" -j1 #nowarn
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+	local ddest="${ED}${dest#/}"
+
+	cd "${S}"/build/*-release/images/jdk || die
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	rm -v lib/security/cacerts || die
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	# must be done before running itself
+	java-vm_set-pax-markings "${ddest}"
+
+	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
+	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${S}"/build/*-release/images/docs/*
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break"
+		ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}"
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
+	fi
+}
diff --git a/dev-java/openjdk/openjdk-8.292_p10.ebuild b/dev-java/openjdk/openjdk-8.292_p10.ebuild
index 898080f8d64f..efa35fc97284 100644
--- a/dev-java/openjdk/openjdk-8.292_p10.ebuild
+++ b/dev-java/openjdk/openjdk-8.292_p10.ebuild
@@ -154,6 +154,9 @@ src_configure() {
 
 	# Work around -fno-common ( GCC10 default ), bug #706638
 	append-flags -fcommon
+	
+	# Strip some flags users may set, but should not. #818502
+	filter-flags -fexceptions
 
 	tc-export_build_env CC CXX PKG_CONFIG STRIP
 
diff --git a/dev-java/openjdk/openjdk-8.302_p08.ebuild b/dev-java/openjdk/openjdk-8.302_p08.ebuild
index e358542ca062..fef83580c303 100644
--- a/dev-java/openjdk/openjdk-8.302_p08.ebuild
+++ b/dev-java/openjdk/openjdk-8.302_p08.ebuild
@@ -155,6 +155,9 @@ src_configure() {
 	# Work around -fno-common ( GCC10 default ), bug #706638
 	append-flags -fcommon
 
+	# Strip some flags users may set, but should not. #818502
+	filter-flags -fexceptions
+
 	tc-export_build_env CC CXX PKG_CONFIG STRIP
 
 	local myconf=(
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index b82e0c228147..b570ceec57ef 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,4 +1,4 @@
 AUX snakeyaml-1.28-fix-test-check.patch 728 BLAKE2B 3c2e1607f03cfb00dba8808fec19b7a705afcc6ad8b1a3c2ee9b2b38e05e0e4e50b00413e5da236827ba4d7ca715b27158d0354dd7ce3950645a2a3bc9057540 SHA512 81bd69b9780e75df4d0964119a0c15684b54533ce2eebc94de3d481b7cf521b26f82f62279eabf3fc0e41eefb9c1648fb2700d6f07ae3b1fd99c6a5f55cbecd8
 DIST asomov-snakeyaml-b28f0b4d87c6.tar.gz 397832 BLAKE2B 054c228cd739e0d7ae89227cba7ae1aba76e5b6a7aae4915a765816d916ab3a47e80d6c2795a5e9bcaee96a70c1751fb9e67523e7faed2db5a6d2123d773d04a SHA512 2d19aee8c3aef2c4c300382451c1241dd2452180fe28c39eb9fe1bbc9d6c615bb8504535d3cf1cf5fe2ad55def8c43b709e8ecd97f760403cfaee7db977f074c
-EBUILD snakeyaml-1.28-r1.ebuild 2954 BLAKE2B e02678eba3b0c292630eb119ec8f3d5eceea41f32a444b010735cefd0e326d78f1f48ea7b0ce6e30139da3081c932956d40f9998e622e072872b9ed8bbf8b984 SHA512 3d37c060da80b201206b32f15f80d84318dddae83d3515a3fb1a224cccc610bc6f8461243a55986dfb3adc91df9cf7face08dd5e08a249bbb5026bdef81f5b15
+EBUILD snakeyaml-1.28-r1.ebuild 2961 BLAKE2B 55e25a0aec4279a1847d3fef81a9638d7f894bd7b616a69e82ede019c80b4a51fe71c344018bc7477f6f131fa98a7f4ac03bf346d8f4e684063dc97ee6ca5b7b SHA512 5901b210ea06f4eac34abe3f8678cf751cc1458066181e4ea83f2622eb8e17fda321d44a8de9eb12192de6bdf527fce434ad27b2f80178fec329d88495bbc4d6
 MISC metadata.xml 321 BLAKE2B 289b6f22e9b660717461d5da64ab6fc7543bc6d46dc803e79ac0694ad1836297469eec4ab224b1c5dccf8a77e7e750b688e0cfcdab371506aff143fce090794c SHA512 b4a92e6a613847f4b8d59e723505b223ee34cc03a31ab656b5d4f8424ff76f3073ec626dbe4ef6cabb93674c62a4ac923756d05bec8a110c25f0b9880effa5d7
diff --git a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
index 174855c3830d..6162bde6ffe7 100644
--- a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://bitbucket.org/asomov/${PN}/get/${P}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest
index e65d8526beae..3eaf763cb39a 100644
--- a/dev-java/testng/Manifest
+++ b/dev-java/testng/Manifest
@@ -1,3 +1,3 @@
 DIST testng-6.9.10.tar.gz 6271781 BLAKE2B 5b77f4b1d9bfdca6749a1d33f465a30bcd9ab9dd9fc37abf8148301c24d6bf287224d9886c0f681deac54e12f9460139ce2a2058b3d160c05cf8fcb9f7808373 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e
-EBUILD testng-6.9.10.ebuild 1757 BLAKE2B 78497046df9d6f5230ad92e63acc6fda91a1c035ffdaf04adc2047eead5efda78ca3e7f368aa2dfcdc921c7c451d1416117c1561877b46a1258f47fd9f34a6c4 SHA512 4adfe1cfeaeed6d0c59280abe7fe3f0a00824b5120f981bcd0532848164dd2fceffe10a1f69fcbdfd7d5b5bdd5c1f3ba110c968c4050983ee52fe105219bd8e3
+EBUILD testng-6.9.10.ebuild 1764 BLAKE2B 43e0258d4d2e785a4e3d5399382b4a64859c7bb5ad9b475292dde82d74f5a9a006f44d3b0957758688615e2b061193f13e9c73a39c8bc350204126a4bc76ad10 SHA512 dec742ca31f213f3b51daa7322948bf734fba958c06f7adc71069089d0854979150989e7f0035f947d08a71d92fc90ea9c9400977b5735b2383f10d2321947e4
 MISC metadata.xml 315 BLAKE2B f3779acd8d9bdbe1e65e6fd147aafd16773a99db420ea47fffa6f8501e0160341cafc9f46d72a860de2bffe572c721177f9c5afdd320b991784ad8e6935c7674 SHA512 108fd9d1659bcd11c414264f52f42b60a7287962aad427f7773971fffbbf9b7d97cefb9a39b64c8d12e00d04cb1188d36031a2d7c94aa57929503299636c6616
diff --git a/dev-java/testng/testng-6.9.10.ebuild b/dev-java/testng/testng-6.9.10.ebuild
index 4166a670f721..240420f9398f 100644
--- a/dev-java/testng/testng-6.9.10.ebuild
+++ b/dev-java/testng/testng-6.9.10.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Testing framework inspired by JUnit and NUnit with new features"
 HOMEPAGE="https://testng.org/"
 SRC_URI="https://github.com/cbeust/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="test" # Occasionally fail or run *REALLY* slowly.
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 2421ac15c1ae..55f4121654dd 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,28 +1,18 @@
 AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfdfe4ac706137791b329b05a28f56f77c57fa8de30b77d457e912208068b97bf6b8fbee7d7af168d07a5 SHA512 1bf5789c683896ffde160f96dc6fcb2ef58dd645a208b3d8e08863fd176337ae81e4d29535bb18df909cfe233576f25d93c35ad1072fca3a79b19e784638f5fb
 AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41
 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
-DIST apache-tomcat-10.0.10-src.tar.gz 6032784 BLAKE2B f73d2b0d549d773a13a8adcc76a87713f0f146d80bca2d2ba633ce3145d69505fb7172eac0f04bb6d10fd9f9abb0cbbca7fb6d5b4608e2f6f07df88e5e661d70 SHA512 6241a62d01dcbf37e4745803c77dfbc4307d43c884e8e4c78c33b10d45a9b42e0103ef94acaff19790fa4876bdb369e9aca4974a4dae2622cedfa56b3fbe0658
-DIST apache-tomcat-10.0.11-src.tar.gz 6065513 BLAKE2B e734a3f5086d94dd49886a1fc7e1fddc1b500240837ccba945dc0d10ad5aaaf580d1b9e2c78aca8af474c4312d723bc4095ec8e90a14f0bd7f292b9333bc554f SHA512 c06f4069c1664483f176231dd9fe132c89e7c66f845d82b41d6c962ea2d2ba2d3c6004b6a875388925ba295761f533ced416fc91261ecb97d11219a87940db2b
 DIST apache-tomcat-10.0.12-src.tar.gz 6066701 BLAKE2B 24acb9e10de923c9d6443c956cd6e6c5b5463f4f6af72d89445c7d635731449afc9b7050c95af3cbd3653168c073840f02472dd01bde65c1bcbdfcba41814117 SHA512 753d36edb5ce873e346856305d6a7f40d762ae8fb9ecd20406ed9ff400e9e1261f66d4549fc98f20a05b01136ff4beaacb462147e84a306858e2acc7fcd98d5b
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.70-src.tar.gz 5939095 BLAKE2B 9a2bf14c9b9f551af15ebf2b95ffede140b3accdb9fc1b9836c980169b597e8c796d5aa59df28cd42ccff67dbda83c7b7ced8b0ac2954a40214a0767ad8b90ce SHA512 fe752c4196d12496a3dcb4e6b59df30da10cd52b8642f9273de7158dcf6dd16d2443675744db0033e6dc5c1cf0aeaf0125c9921e1e36ceb8dea9ba58328a4133
-DIST apache-tomcat-8.5.71-src.tar.gz 5945776 BLAKE2B b7a5b344dbe09ef88ee046dcce701ea65d8587f1d8c2f980c67fff5466979d15dea019a9abae6d48a45797a989ebddb4dbdbc5196c8740cde9ebc45041b857ef SHA512 df99749d7ef387e29c1d2976c584dc219fc8764f618a004a646564315ab3f00a71ca94408d1fbaff20c3bab3911c82af4f7cf2ec02f0408d9e829c27f8aabdba
-DIST apache-tomcat-9.0.52-src.tar.gz 6110883 BLAKE2B 8d2d4e3640fdc43a3b20d9722a73a8756de7ad71b2f05e8b2090bc712811cfcf6f8e79eeded039291b9306d1c49aec46fe8c7e347aab10384ca293894984ab27 SHA512 8b1817c171fa49e5568fb24a72b6b7533c5eb3ddd6d232b78e67186574f70bb311bbef9a58af047caa14bdae57c27c6a3df721c4583072740fec0a3863bb068d
-DIST apache-tomcat-9.0.53-src.tar.gz 6142608 BLAKE2B 71f45e04ac01221cbfc6e730066e1aa7f5d65d31a497a775a3147180591f23799f0b47db3a1dd4a86936c40f624795cf4fd1d3dd44d4d39633aeb0733f4f9f26 SHA512 f72b9abff6af24d486a1e3dd3cd8b6cb44feab811efb74a3469502676e661bdb4cfed0fe44f38b7f5a6f74a6776ae1c0c732504d26609b88280e0b0da6710b27
+DIST apache-tomcat-8.5.72-src.tar.gz 5954383 BLAKE2B ddf342e3bb604ffd5d70e9b822a110654434aac0da0bd28e8649a0ce312706c202f48077ee18f43398d91bc000ea5287d87e0fd2bda9d2c8493e1b6b012945fc SHA512 69c27076d193a874416c83a1dcb80f71af78cb201b0990795d389f0a389e0537749b62256408c6249031abd2e62f268c8b451328284dbbff50a457937cfa6f6d
 DIST apache-tomcat-9.0.54-src.tar.gz 6132613 BLAKE2B 5d37359ac9cac2a1387675a095aa0bea3e2bc74740d761a13fb2313aaca8ddb14f10922a8edc0932c9139c04b4df7f5735b067a71ac75ebbfe16ff6066311993 SHA512 e9d532a966aa8e7c2fcf28e4ecb0a618a8be4dacf8dc579a407483de86ef969383e3662fba07be629bfb8fbd85c041a5a2f1dd8875cc309b69a147b37c58974b
-EBUILD tomcat-servlet-api-10.0.10.ebuild 3015 BLAKE2B d00f9dd42643a5ac88e522cc7c8b6dae88a11b59189d5424d248859d2223432af20ad966f9173a7419cee39eeb7b4bb04dbef9b261eacfe3e1f3fbeda6500820 SHA512 479cad183a31ab15d32d24d125aa00e472d8264656ba6013f383fcc6163ffdc79307bd10ed991620b1e4c60e102337d4cbb6dd3111e2e9761c6fa02df3b2bd43
-EBUILD tomcat-servlet-api-10.0.11.ebuild 3018 BLAKE2B 1b0a0ae5ade523a746c6f9d62a805ef1332a5d021fbb3f2b3893ce7c5204afa140da818010676bbd0751f64a56b135557f6f4af509b826bda21aa0eb4d4f172c SHA512 fdee126c42bde90a7265f3ea7d742a58552c6a578724157e35e76233a9b0299e522778659e8d9a0468a15eac762c0acebb2564eec08697d49bdfa542debdc803
-EBUILD tomcat-servlet-api-10.0.12.ebuild 3018 BLAKE2B 1b0a0ae5ade523a746c6f9d62a805ef1332a5d021fbb3f2b3893ce7c5204afa140da818010676bbd0751f64a56b135557f6f4af509b826bda21aa0eb4d4f172c SHA512 fdee126c42bde90a7265f3ea7d742a58552c6a578724157e35e76233a9b0299e522778659e8d9a0468a15eac762c0acebb2564eec08697d49bdfa542debdc803
+EBUILD tomcat-servlet-api-10.0.12.ebuild 3015 BLAKE2B d00f9dd42643a5ac88e522cc7c8b6dae88a11b59189d5424d248859d2223432af20ad966f9173a7419cee39eeb7b4bb04dbef9b261eacfe3e1f3fbeda6500820 SHA512 479cad183a31ab15d32d24d125aa00e472d8264656ba6013f383fcc6163ffdc79307bd10ed991620b1e4c60e102337d4cbb6dd3111e2e9761c6fa02df3b2bd43
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1419 BLAKE2B e512a93e76e7e675606f112baad26f0c5013654293bf0a95085d255911c444b8ede5f0c283237810e025a9877dd41ae7285c57e0ce781ab434f29a98d3f58122 SHA512 d64b2289bdd50b8e320bc2927580080e70b532c25ffd4743342401527c4e90b7db2b6ffec35598d4e6e9e426880f7b0e10ccffc711ae05c06043586f06972ee2
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 955 BLAKE2B e7046e9afdfc33a906b44bcc98d092f75d3c6cae4ca7263b5e0605318aa19257edeaf83c2ea7a3639852c0ff140b6b65d16dc04433d94bbccce9db12ad82a9c6 SHA512 3a3d5450df02d079c04406cb3a4b63e986ce4f2d591ab12ee8918d4fecc6337634cf5627539bd277d9fda07ed4b6398c70dd87c322ae598649b61a8fd7cab58a
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
-EBUILD tomcat-servlet-api-8.5.70.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
-EBUILD tomcat-servlet-api-8.5.71.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
-EBUILD tomcat-servlet-api-9.0.52.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
-EBUILD tomcat-servlet-api-9.0.53.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
-EBUILD tomcat-servlet-api-9.0.54.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
+EBUILD tomcat-servlet-api-8.5.72.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
+EBUILD tomcat-servlet-api-9.0.54.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild
deleted file mode 100644
index e360880764ab..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="5.0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.11.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.11.ebuild
deleted file mode 100644
index fb739b89bf7a..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.11.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.12.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.12.ebuild
index fb739b89bf7a..e360880764ab 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.12.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.71.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.71.ebuild
deleted file mode 100644
index eaffc40f4037..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.71.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.70.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.72.ebuild
index 8846bfbc900c..8846bfbc900c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.70.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.72.ebuild
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.52.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.52.ebuild
deleted file mode 100644
index 4811db9874c5..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.52.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.53.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.53.ebuild
deleted file mode 100644
index 4a8d22d12869..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.53.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.54.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.54.ebuild
index 4a8d22d12869..4811db9874c5 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.54.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.54.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/unkrig-nullanalysis/Manifest b/dev-java/unkrig-nullanalysis/Manifest
index cb3d3f3ca7af..ffbd429945c8 100644
--- a/dev-java/unkrig-nullanalysis/Manifest
+++ b/dev-java/unkrig-nullanalysis/Manifest
@@ -1,3 +1,3 @@
 DIST unkrig-nullanalysis-0_pre1644.tar.bz2 2322 BLAKE2B 49873e7c5eaa6b367350f3569d4d36945222b8048ed67fa7c77337133d67b68dda5344057fe80caaf34e54378da579e0525179e72ac8ef88865571c0381a2d14 SHA512 6e4f069023043ac24f7e68f748ad4c6cfaf16312310abfd9c6d395b34491b68a7c3cca6b3a36b18c4dd656cc15f17755dbd4ce3e6379da06f82a2691453c3c03
-EBUILD unkrig-nullanalysis-0_pre1644.ebuild 491 BLAKE2B 7df6f21d39725143579e9465b55ddbd8be15b31fde4c73d26303bf44425d888854d6349e3e7343c0ae04425f8b056aa54352f6fcce19d8677143b2b32fb41591 SHA512 3e04419c0b8ee9085de9ef6312b3ed2c262e8115173a5df4d3ad67b961e42c6f6c74ed8db7c9f7e0dd7ce3dadd9fd7434d1e28856ee7e12456068241e06636d3
+EBUILD unkrig-nullanalysis-0_pre1644.ebuild 500 BLAKE2B ee666634b3cd88a170921b916a478fa951b90b294707c1a544c3ccb2e851e5674bfc555281088767a275d57cbd054fdcc93b0a849db802dc65cd28c54d7b8d36 SHA512 8fbabcfcf97f030e71ef9d4e0572b012b391e80aa2e94ac05fccf6e84dd53effa92467429f3298a5c4c4b0f017b13c8a87c2462fea72ca7266e3f28ecb7b40b9
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.ebuild b/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.ebuild
index a47290e3483e..4f856cfa6c0c 100644
--- a/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.ebuild
+++ b/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 5f0a4a29627f..55a4ab5d74ae 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,3 +1,3 @@
 DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb
-EBUILD velocity-2.3.ebuild 5218 BLAKE2B ef7f3f7db7a87d45a11ca1f92ec6202561710da834ecf226c41d2020c5e835c106d1fa2ae49e7648c1bb5ea98349d77989df47f5991fc3c9443d2bb091b1266c SHA512 0447f2f916e65fa00f5da1293e7c4ff4db53a1902f4344f82e334f320301cd8d56375dbe74af0a4c20b9fede2aa3f24903eef059ed52dc310b8240121c0e9e78
+EBUILD velocity-2.3.ebuild 5225 BLAKE2B 690aef62fefdc2b214843926354dd73e3636d22017cb895c993a806c0ff04f990e29f4126862c5ccbdd48b820f71e72127af1b47a38591ff609b2cd321e0c04c SHA512 b6dada0a50a62f81b71332846f19f34a1ebc6a8b9c14a39b5c01f7edbcffe2d4f29942d9da12dea30b75f2392413c618371087daeb95f377cfbc7599858aec01
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
index 894f53e4285f..0cdd182bf73b 100644
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 73fa4f481b34..24032b65fcbc 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/cfortran/Manifest b/dev-lang/cfortran/Manifest
index d0fac2f4fd8e..4e12ea726ba0 100644
--- a/dev-lang/cfortran/Manifest
+++ b/dev-lang/cfortran/Manifest
@@ -1,7 +1,10 @@
 DIST cfortran_20110621-1.debian.tar.xz 13352 BLAKE2B 0039dd4b5973e5cd13a136c51e8719ffa8e104db0d716cbd247fe440643dfce5308767d182abbcbafbd1de791e8cb4384c479660fe8b592477968d40c54078e8 SHA512 51387a17e4f69e5f5e53e188b5397a08d578aba42fdc446d4901e59be32bb0e5f07d871daa809e9de6051b4d9213b4312e25f70970db9173e4f33a0e66b4b44b
 DIST cfortran_20110621.orig.tar.gz 129061 BLAKE2B 16c0cae1675923c1f6f13fe5a2a65ff86a2a80e4b3c3956c04cbc2df562dad8426b90c8a3a34919c28a7bee29f7430ffe8b415e28a484421aa8f58430456b934 SHA512 59b4285bb5392916880503bdd1cead5602944ebbf615d3c40bb7232770d6a74d3138a0b2abbab4fed9ea9bd2a56b2d3097d9609833c07d773dc43b8be0a3258a
+DIST cfortran_20210827-1.debian.tar.xz 8096 BLAKE2B 719b9cda29149e88342a54931af7f3b85a3cccc5dd5c573d9cce24fd67975141062fa538243ad40cb259464a53f3c77280a6097f01cb67f49b5e650cf49ab78f SHA512 86eb0692679dc0f3ec06d5f8c36c2ba242a52a01eb9bf1f9830dd2a689014ab2f0733c2c6210033e982d644bc4babf8420354f05079dfed30361a822b62aa845
+DIST cfortran_20210827.orig.tar.gz 94493 BLAKE2B 9ba0a22d1231702d04e484c21b566967a44684691fe08f7dc156e7b58946ab72694040e1513d51754993f82c4b80e58b365c25ad99acfb875cd2bf5db29dd7f6 SHA512 df12086f7718d205f3d0e40fafc1584339020e2be8ce5a96a314448018eac8d76fa7ae888c353e36f10e7347add609c2fe00558ec369e0ede2580973c21e5963
 DIST cfortran_4.4-14.diff.gz 23084 BLAKE2B 8e760b3697869c12e94925c4781318fbe7640f0563a2464bf5d9f51a4afcb4bf9c281bab189542f2342d6dbc6f5524b4a48d9f844459d190e9182a96ebefbf9b SHA512 1e0b267efc17c2ba30ca1108d59ef87d1a401e6b88bea2c7045458f8cfad6ec9a05f6bf4a08c1d6cb314c790a4969a1f0fdf0c7b6abc28bae544928aad5b0218
 DIST cfortran_4.4.orig.tar.gz 120119 BLAKE2B df4e0650e2718ed0c2009fb1b85330266308b0b584fcdc85e08cad0913bf063ab38824724b43a005a63a6e6bd5152b35115a68659487a992b96d0d38792e6d0a SHA512 969d0db566ecd7ed7945cac7f8ceea1cbd94ab427734ba83882acf97022c83b1417e32515d847fee89144137f58f7041cf5164fc397f3d7526f3aa958f8b038c
-EBUILD cfortran-20110621.ebuild 1420 BLAKE2B 609c101e7d72edf3b020b70146f7a656dc04beb0be2fbb2a43257d5b9afc0da64aaccd51bb35bd027da4d560d5d50fcf11b04d5cdd30959bfd17b388084c192f SHA512 ee9a24fe8e6749bbfec7cd388b029cd30fd552649b3f2c710e4b7d1f60df970d5569b89b33b9e9ae14425581408c4c0cc28c48458a84b04928dd250f74bb2a69
+EBUILD cfortran-20110621.ebuild 1416 BLAKE2B 4175b7a75672f246ad5a2474374204cea62ad438000df92678846ac365188afa928f276172dbc6939b298c2bf8baa23e4b89a731ae5180454e7c21723fd664dd SHA512 ae9ac2cce49dea1ae3b9791afeb9e922c73e3078ae21b365b4b6076f3b37801a51d4b224e1a51a8207613c32ca74043d0cdffff16be791926328954849a8661c
+EBUILD cfortran-20210827.ebuild 1525 BLAKE2B a5718642d226b61ac91ba0b47cc44b4b28f6419637c15917ebc99f08174adda7c4a3d70b5c822786c97ac098b4db37a5546d3ad425f9da883ca2857c32c27907 SHA512 142974415f6f3dd0781a05d0675a9cc07c021c2eead30509b485002dc22a811e4d6d2f13b761f5fc8ae01ac81f91e8ed749dd225bc0b1f401404ba8738de668e
 EBUILD cfortran-4.4-r3.ebuild 1136 BLAKE2B 79debf78d636671368b117d93e58482eacda398b631f7855d075fcbb8785dbc069c45edcd4d3fe6f9ea84d13768dc3c7741eb633eabe67c79af8187c7c315d6d SHA512 aeed0e2b0532ce563554afc3df7576c9b7ac8d8e1706bfaac4291f42b957036bb7e5be0267d42305830b33f8fd3818ce4d62352d82b271b3f6c12a86bc746347
 MISC metadata.xml 589 BLAKE2B 0d608e14da396cb7c906fd1859a36eecd8adc283a0c4e5202bbb022adc95dd148c7de31dd6d65f8e611b2e79a96290b2fa59447d564780ebe58cf7a1d092e74c SHA512 a3b37c71425dc57d3116a6bac8ed5935a2f558e58f78bbe34faadd5f0584bbeb954af353778d5c46aaa667a2dacd06de6cd8ff8f95882f6c2ee898f1cd03cbd5
diff --git a/dev-lang/cfortran/cfortran-20110621.ebuild b/dev-lang/cfortran/cfortran-20110621.ebuild
index 521e4f2464b1..e61e831fc6a1 100644
--- a/dev-lang/cfortran/cfortran-20110621.ebuild
+++ b/dev-lang/cfortran/cfortran-20110621.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-lang/cfortran/cfortran-20210827.ebuild b/dev-lang/cfortran/cfortran-20210827.ebuild
new file mode 100644
index 000000000000..d389fc9ca6b7
--- /dev/null
+++ b/dev-lang/cfortran/cfortran-20210827.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=test
+
+inherit autotools fortran-2
+
+DEB_PR="1"
+
+# https://github.com/bastien-roucaries/cfortran is for the Debian fork
+DESCRIPTION="Header file allowing to call Fortran routines from C and C++"
+HOMEPAGE="https://www-zeus.desy.de/~burow/cfortran/ https://github.com/bastien-roucaries/cfortran"
+SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz"
+SRC_URI+=" mirror://debian/pool/main/c/${PN}/${PN}_${PV}-${DEB_PR}.debian.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	default
+
+	if [[ -d "${WORKDIR}"/debian/patches ]] ; then
+		eapply "${WORKDIR}"/debian/patches/
+	fi
+
+	eautoreconf
+
+	if use examples; then
+		# The examples are also used as tests and it's tricky to clean up
+		# afterwards, just save a clean copy (sans Makefiles, as they only
+		# cover the test phase) before the tests are run.
+		cp -ar eg eg_src || die "Failed to preserve a clean copy of examples"
+		rm -f eg_src/Makefile{,.am,.in}
+	fi
+}
+
+src_install() {
+	default
+
+	# For compatibility with older versions
+	dodir /usr/include/cfortran
+	dosym -r /usr/include/cfortran.h /usr/include/cfortran/cfortran.h
+
+	docinto debian
+	dodoc "${WORKDIR}"/debian/{NEWS,changelog,copyright}
+
+	if use examples; then
+		docinto examples
+		dodoc -r cfortest.c cfortex.f eg_src/*
+	fi
+}
diff --git a/dev-lang/fpc/Manifest b/dev-lang/fpc/Manifest
index 206b9191c2eb..1f98b44a093f 100644
--- a/dev-lang/fpc/Manifest
+++ b/dev-lang/fpc/Manifest
@@ -3,11 +3,12 @@ DIST fpc-3.0.4.i386-linux.tar 54691840 BLAKE2B c0951c85a3916c29e8e7391408da09abd
 DIST fpc-3.0.4.source.tar.gz 40347617 BLAKE2B 0764c92cc379d6e70a3f33368d96244ea0203b3395a5dbcadebe6ef51b508cbc7c112f9bc7bce69ae6dae1fde03bc9e45a1a8ad70ca154cc4dd51bc93cab82f9 SHA512 fc64fd94c39f220bd7531126d6281fa2141aed61c218595a7906a025660b46629a305ff7eb023f5e1359eafdec2dba69aa5405f1bbc3c1182414968689cbb52e
 DIST fpc-3.0.4.x86_64-linux.tar 56842240 BLAKE2B fda488466f409d4f50501ad17edcce2740f0a7e60ac86bbfec235ccc27c619d62d2aab01aa7878ba3e174c35fd46aab98e43eda4528e98fdf3e098330eea9b26 SHA512 085110d0fade11c4e6e79c002522080eb070cebb8ebbed48ca35e3a2dc025df678516e36c7cba5f951e20c0da57dd261d673dda6839ecdf5d88aa8dfe15a56e5
 DIST fpc-3.2.2-doc-html.tar.gz 5810672 BLAKE2B 5d2c0ce35024f58d35e59034d4c071ec58214874f31ef44b8f4ea8cb68636080b61dea9a5d0ccc8062814c0b2fe3bc5269e6584ae30fedb29dbb0709ce1b3103 SHA512 0bdefd25b9f46bb6684bb4dd8f60de796cbbf81049a7e8bac4cc4bc87dd6100a42ea05601cf1bb0254e8b73ddaf5d1bf186dbf1909f1ed7db7bdf97f50df7cdc
+DIST fpc-3.2.2.aarch64-linux.tar 137943040 BLAKE2B 1f2b3ff35d33419bd60a65bee8e20264a7970e515e0d8239dc51bd415b9a4fc580b7d3bd7fcd2a6964f78669e9dda13d1349281116004d582236a4f314dc6935 SHA512 8a52c53cd167af39222296db7c91aadf0b5d845272833a961c5db0c7d2d4cb5e61f41f71e0989c193dc2923770440b19d7d3d71de65291d0a3e0a15edc793316
 DIST fpc-3.2.2.i386-linux.tar 85043200 BLAKE2B 9e2fae2d272c79cc7fcf4d062589bd888c342ccfb01e3f14e412bc58ff6b04928c6a7a0a4b3392b30f0864f16029d063632bd72bd9cac55e0a40a00fb726ef93 SHA512 b4f1a94d1a05901f4ffc2e07519e9b03666850211e571cbce33f0ba16d8a1d88de256c8e111579f46d56f157630dfc722a8ae9ce2b200fc784c588ea4e6bd5df
 DIST fpc-3.2.2.source.tar.gz 52240052 BLAKE2B e30cf1b10c4cafd0ae2a25673678213669c29dec0549f4d7b357011e84a0a2c8ecf343cb6443798e6c36c02ae97a0c7cae7ca24829510c552968d4a58426576f SHA512 6d320b4e0805d63c40d3037f9d2078068c2c9fcdeb6ac073a6fcc19249bd6325dc542fcc7fc6dbb7e69507dcd84cf9e720e7d73925afe955e2a24e8c7d92606a
 DIST fpc-3.2.2.x86_64-linux.tar 86978560 BLAKE2B 29cac8c0da4ba65cee6a0e0cd3c111202c8943ca61a02c5dfeaeb174c353db6fc07e291794ef7433f9fdf88ed694260e734bc715567c6a12292b0c8524d17f4e SHA512 534df830a951824525044479ded23ef1e61b104c0dd65c837ad0d8d9ced9eb7349925a3f759756aa95ae17e567d8b1cd5c7e2092d3c665eaac578845b48aa467
 DIST fpcbuild-3.0.4.tar.gz 68908523 BLAKE2B b5c3936cf0b803aa2cc71f9c25ded470f207c540a1691cf3c2a9876c9e4eefd5c04f45b9f1f3ca17917b14ba4a90e0f16cc890b27024ff225d9d6bb25649862b SHA512 eedfeb4d25b3f4cb30ae9c8f30e0fec2405ef806fa565933cef7904d512f781730e3f023aea2f908c21250e3ced4f74fa780abad77b560728a88cedf591505b6
 DIST fpcbuild-3.2.2.tar.gz 84195619 BLAKE2B 88848308c93f949b59197649cc344498082b6520e43eb1d4413bf68eb251fcab75c863794a188a2298d9e8aba47346253a596ac630b30049ac8bd6f6934aa5a2 SHA512 75889bb54adc70a6e2cbd291476b9b12d61c8f943a05b7d16d2024de3215c935465ff43b1400c412e128e260c7f49a9c66e35c21f86cb866e671b5b60a282d82
 EBUILD fpc-3.0.4.ebuild 4462 BLAKE2B be022df7469922721d72f3e859b87ef9f265e5523105f7534bc590670b9ac416cf3e3d4f425f2804bc914bfa31f11911728fd74dce36afc76c1de0f0fa865f80 SHA512 0a1636056da7eb640123aa11a9f77f26a438f302c6dc6de18d5c9156c737dc2d8ab035b4e17636078ac5b122eac1850f8d7ab42e556cadd0af6f41e4eadd2adc
-EBUILD fpc-3.2.2.ebuild 4477 BLAKE2B 03acc59ada56841cb2ac7426f21ebe93825997f0b0ab444aecae228c3fe641b5b671809bbf1a880b1e5ddd66728bc4338f5c1f69a863b7d60e2b9755f05a57a9 SHA512 7c223e78e4b72cc73e6e4235cb80f00278182e65d428fd1d0732cd6e782fc440971922401527d66dc7ac63b8677ab13c0080f4978d0010bad45503e6c92822ac
+EBUILD fpc-3.2.2.ebuild 4666 BLAKE2B 06aaf8875f7abd3d017245cd25f2e36e58b95d19afe0cfb8c64be5df4d1aea1df73b438b508be4bd7991739fcca06e0b772ed664dacfc94ed18b4082a9ed8b05 SHA512 f58deae3e635c8f2ddf7a8ed5449f6445a34e87769d6b613c858e3e3f9955ea89d3a7a1df651989390ee601e20b273272385d25777b492a83abc5c1b18f112e7
 MISC metadata.xml 386 BLAKE2B dbaae2622365b59e14a6e0daace220a41d2038d93d861045245f3b688edf0467044cfb4672be9e286466044647efb3edbf0cbfa79270b0cd35bd8a6575b642a5 SHA512 cec11361b6248b0a3c5a26fb8de7ba99517a193e6add2c4d6cda0213421f8f9d4f63465f65f1fefba293b0f49a8e452e8de3ca06be8a99b5a203f48e01b742bf
diff --git a/dev-lang/fpc/fpc-3.2.2.ebuild b/dev-lang/fpc/fpc-3.2.2.ebuild
index ffe9f92b4f08..ce1852bf58e9 100644
--- a/dev-lang/fpc/fpc-3.2.2.ebuild
+++ b/dev-lang/fpc/fpc-3.2.2.ebuild
@@ -10,13 +10,14 @@ DESCRIPTION="Free Pascal Compiler"
 SRC_URI="mirror://sourceforge/freepascal/fpcbuild-${PV}.tar.gz
 	mirror://sourceforge/freepascal/fpc-${PV}.source.tar.gz
 	amd64? ( mirror://sourceforge/freepascal/${P}.x86_64-linux.tar )
+	arm64? ( mirror://sourceforge/freepascal/${P}.aarch64-linux.tar )
 	x86? ( mirror://sourceforge/freepascal/${P}.i386-linux.tar )
 	doc? ( mirror://sourceforge/freepascal/Documentation/${PV}/doc-html.tar.gz -> ${P}-doc-html.tar.gz )"
 S="${WORKDIR}/fpcbuild-${PV}/fpcsrc"
 
 LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~arm64 x86"
 IUSE="doc source"
 RESTRICT="strip" #269221
 
@@ -43,6 +44,10 @@ src_unpack() {
 			FPC_ARCH="x86_64"
 			PV_BIN="${PV}"
 			;;
+		arm64)
+			FPC_ARCH="aarch64"
+			PV_BIN="${PV}"
+			;;
 		x86)
 			FPC_ARCH="i386"
 			PV_BIN="${PV}"
@@ -75,6 +80,10 @@ set_pp() {
 			FPC_ARCH="x64"
 			FPC_PARCH="x86_64"
 			;;
+		arm64)
+			FPC_ARCH="a64"
+			FPC_PARCH="aarch64"
+			;;
 		x86)
 			FPC_ARCH="386"
 			FPC_PARCH="i386"
@@ -163,7 +172,7 @@ src_install() {
 	rm -r "${ED}"/usr/lib/fpc/lexyacc || die
 
 	case ${ARCH} in
-		amd64)
+		amd64|arm64)
 			mkdir -p "${ED}"/usr/$(get_libdir) || die
 			mv "${ED}"/usr/lib/*.so "${ED}/usr/$(get_libdir)/" || die
 			;;
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 569c07fa283b..c41e4afdd46d 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,7 +1,5 @@
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
-DIST go1.17.1.src.tar.gz 22181735 BLAKE2B 77ce952e14c101776935c625aa39596a6b8923ca5ac264c72ed08a578f08fbbbc1825315a5dd84f9fa1412aaa7400b31e73117d5919aeb527c084173d8e11504 SHA512 23d4e003651204c5bcc5cf41437134e07a3fe3c188eb129f2d6366a7445a7919d6a7319c57483e91b3415fd28aa55df8d58eec398434f20ce6accd587925a14b
-DIST go1.17.src.tar.gz 22178549 BLAKE2B 86cb84ff782eaee3fc0411b1f31cd985f3fdcda7b2709f3a94cba0fbe827ac13632d0476e1f67deaf06d2352c2ea3ac9217db7d170702dffff6a64beabdb0814 SHA512 bb94d69555faa103bc092ce85b73168954a553a5c72e4b38c39bd99a3eb4db679f352685e66507b0945ed12676eb2a0c51674e456f68a9a5b98c3ec6a948d35b
-EBUILD go-1.17.1.ebuild 4859 BLAKE2B d811b883c708d26bf3915e2eb270655cd52bb4e5686ee46342cb2c34e3f8f14ac7f3ac0dcc66d66d2491a11aaf096dd00e9f8ce006abfee7d126927071f79b77 SHA512 6593287c2c5de92e9acd91d677281d3dc25a50b2c513ae788e19500205bf497facd6ff28d276b55be4ea6ef8b6584c7ca01fcd27c582dbc89d53cf893bfe17ff
-EBUILD go-1.17.ebuild 4868 BLAKE2B 00ba0cded39fd819257207ca29f9fb05061a0a08c9594c456fa7947f7fe2b192753a95b97673babdcf1d751be77e6d652f8536f9d29232310497b8c0b8406d83 SHA512 269368e6caf90524fef72167010a86c104311993e092590e5025d6dcf92dfdea96122ac88d30d16306d56aded36fa45b74a930e43864f8452d50e8166d622523
+DIST go1.17.2.src.tar.gz 22182111 BLAKE2B 83b665af212f3e20dc9c9f4bd80ac0e1e4acb8ba6653835f6a8b990a5d6074a25ba78b783f7a4f9402b3f1916a65ddba4ad9780e4eae871719cff13f7bb9c980 SHA512 167220293e02d6994b5cdee5909cbdbe66f692619baeb6ff9ee0d56660eb39cfd9eac2ac510f113d5222dadd5858fd6276bd961365ca42b42c07af5d24d48107
+EBUILD go-1.17.2.ebuild 4859 BLAKE2B d811b883c708d26bf3915e2eb270655cd52bb4e5686ee46342cb2c34e3f8f14ac7f3ac0dcc66d66d2491a11aaf096dd00e9f8ce006abfee7d126927071f79b77 SHA512 6593287c2c5de92e9acd91d677281d3dc25a50b2c513ae788e19500205bf497facd6ff28d276b55be4ea6ef8b6584c7ca01fcd27c582dbc89d53cf893bfe17ff
 EBUILD go-9999.ebuild 4864 BLAKE2B 25499638c8cb647c86222a7eb665e1897bb1cd7a0e5f379d5b5fdad43da77dbb2355e7d25f2cea25f96b6df1441a10dcfd1e2aa9a03d546996b9db74003bf016 SHA512 c3f237385c9f24ed02bbbb0afc0b5547077aa8543ccddcd7eee5b3be2d4d4fbf25ca685cede3954738cd84417d41dda6c10b7191bfce0a09c1d84e635f1ddc90
 MISC metadata.xml 463 BLAKE2B 133822f9d8be6d5aeb0bf8b9e41ee17637cc3e6f78590a36c1811b77a77a74dd541bb98ad57cfeb6b71a9bcb106c4ac58effcfcfbbef6db4e05b155ef196fd0b SHA512 2837a80088ac2e07cccfb78497c121902a3a0e2f6677b42b1cd82dd3b4e2703099b6d4c95c6c08fefbc647b9b279692e3a46b1126acaad9298c1ecd3b6899fe5
diff --git a/dev-lang/go/go-1.17.1.ebuild b/dev-lang/go/go-1.17.2.ebuild
index 4b20d98f17e7..4b20d98f17e7 100644
--- a/dev-lang/go/go-1.17.1.ebuild
+++ b/dev-lang/go/go-1.17.2.ebuild
diff --git a/dev-lang/go/go-1.17.ebuild b/dev-lang/go/go-1.17.ebuild
deleted file mode 100644
index bfde2d27f4dc..000000000000
--- a/dev-lang/go/go-1.17.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="cpu_flags_x86_sse2"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-RDEPEND="!<dev-go/go-tools-0_pre20150902"
-
-# the *.syso files have writable/executable stacks
-QA_EXECSTACK='*.syso'
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# This package triggers "unrecognized elf file(s)" notices on riscv.
-# https://bugs.gentoo.org/794046
-QA_PREBUILT='.*'
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch() {
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		riscv) echo riscv64 ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm() {
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os() {
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple() {
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile() {
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile() {
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="${PWD}"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	use arm && export GOARM=$(go_arm)
-	use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test() {
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install() {
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	einfo "due to the static linking nature of go."
-	einfo "If this is not done, the packages compiled with the older"
-	einfo "version of the compiler will not be updated until they are"
-	einfo "updated individually, which could mean they will have"
-	einfo "vulnerabilities."
-	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	einfo "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 011498ef62c4..f3b1e92dd041 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1,5 +1,7 @@
 AUX ispc-9999-llvm.patch 1410 BLAKE2B 77027da9032fa230c72d8608c2a6cd63c33601e17acab0260101c64dbb50a0aa3cc30702c4480ae5d63e95ec3e962e28bdbbd90cd72f4e91d30dc364b82367b6 SHA512 116078d5ab99c849584cc4ece8dc3ebc817221a2377e26083071e206b5e83c4f3ed594f84b86c9659ef86a497bd3cd058ee32138238e12e6aa9dac0f11cf1440
 DIST ispc-1.16.0.tar.gz 19548153 BLAKE2B 9b6d9329430d59041a76c20332b527560afa47a5585652abdf93aedb7907483d1647c829f2bd3f396cd53301bc79367cd91606b90a543fa8bec2f6ab34452989 SHA512 8469db4e3e9834477345b431162543f1c8e680aa9834c9a50239781dc7febfdde0561c2f13d1387e37f95a18c4376a85cb9cbae33cb614dc8977dfc9f47da215
+DIST ispc-1.16.1.tar.gz 19549428 BLAKE2B 742d94208d39f0560c3f2199ee06fc12f3ec2cf47c1039212219c6aa106b20cd58219e5d439c4fd1ce4a0c1a423655d0c2113a2a78152c99b4d77452171acce6 SHA512 89b844a15a888ae7074c4baa47f46d1d7176501f215c9a8c3b4bf9ad1960dc77d53f1f448d5253ad0c6a91e5088af243c3dfd148e619f9abeb6a16f715e3b463
 EBUILD ispc-1.16.0.ebuild 1641 BLAKE2B b4e6feb2095d03e34d62130d70c97ee0179236f78640ed6f027702af41a88f56f9da9cb5a27d005b19b7d9e4cf930774e0ee2df8b313f1be03490f439d869c0f SHA512 8c05ec02c0e8b153674b0cd923c2bd10058c28d52a0c562bcc8fba081fdaf4ed6d3d07c557261d0e0696d0ef00faa047000a66cb9e9c87993b0a7cc203882fb0
-EBUILD ispc-9999.ebuild 1622 BLAKE2B 927a3d1d9877f703f45f715862cb3102b3ec507b1d252831cacaaecdbcd114e1e8769b41e917618c6db0ea0d31d9f8515afd400c394a6b56f3933836dd994cf2 SHA512 5f2d8f7aadeec0a31ed92fcb6d399768ed0ec50a46c2d8eb726c6a30881492f50dde2f3f1c0e48ef3cd989accd6a708158e7bfbdaad1a33e67326e84ffd7827a
+EBUILD ispc-1.16.1.ebuild 1648 BLAKE2B fe5e36cf7555a0dfcaccc9a64434cf8691bbdd5bfdd0db25bc9ae954ac78ccdf292e233a150bbe91febeed6f7dc9efb5546b67d544742adf3b64487c6872cc51 SHA512 c5dd01950694517b53b392da60492ec82e762c6f3e6abe1e3844bf3d8b97064759fb56095299a99ec12b0b6e4a080a34ab0dffe2b21ad909906da2e83363fd1f
+EBUILD ispc-9999.ebuild 1648 BLAKE2B fe5e36cf7555a0dfcaccc9a64434cf8691bbdd5bfdd0db25bc9ae954ac78ccdf292e233a150bbe91febeed6f7dc9efb5546b67d544742adf3b64487c6872cc51 SHA512 c5dd01950694517b53b392da60492ec82e762c6f3e6abe1e3844bf3d8b97064759fb56095299a99ec12b0b6e4a080a34ab0dffe2b21ad909906da2e83363fd1f
 MISC metadata.xml 242 BLAKE2B ec655bbb26e5d545a7b25a9906e315b54a18cca56613207ce76c9e002fb8968e269627e75639053d7da3c46d8ba34296129458adcad9a561414628e8957d2d9e SHA512 7702a5b2bfe0d81904e069fa097af3c739a21ffad9b03cf9931e398dc904d10501854cc2605fb34415f3f13e58a990b7ff8c3aa803f981889c53b25cc23c6115
diff --git a/dev-lang/ispc/ispc-1.16.1.ebuild b/dev-lang/ispc/ispc-1.16.1.ebuild
new file mode 100644
index 000000000000..d71abadb585a
--- /dev/null
+++ b/dev-lang/ispc/ispc-1.16.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+LLVM_MAX_SLOT=12
+inherit cmake python-any-r1 llvm
+
+DESCRIPTION="Intel SPMD Program Compiler"
+HOMEPAGE="https://ispc.github.io/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ispc/ispc.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="BSD BSD-2 UoI-NCSA"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9999-llvm.patch"
+)
+
+CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use amd64; then
+		# On amd64 systems, build system enables x86/i686 build too.
+		# This ebuild doesn't even have multilib support, nor need it.
+		# https://bugs.gentoo.org/730062
+		ewarn "Removing auto-x86 build on amd64"
+		sed -i -e 's:set(target_arch "i686"):return():' cmake/GenerateBuiltins.cmake || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DARM_ENABLED=$(usex arm)
+		-DCMAKE_SKIP_RPATH=ON
+		-DISPC_NO_DUMPS=ON
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# Inject path to prevent using system ispc
+	PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} ./run_tests.py || die "Testing failed under ${EPYTHON}"
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/bin/ispc
+	einstalldocs
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
diff --git a/dev-lang/ispc/ispc-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild
index b0a22ba1f907..d71abadb585a 100644
--- a/dev-lang/ispc/ispc-9999.ebuild
+++ b/dev-lang/ispc/ispc-9999.ebuild
@@ -3,11 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit cmake llvm python-any-r1
-
+PYTHON_COMPAT=( python3_{8..10} )
 LLVM_MAX_SLOT=12
+inherit cmake python-any-r1 llvm
 
 DESCRIPTION="Intel SPMD Program Compiler"
 HOMEPAGE="https://ispc.github.io/"
@@ -17,20 +15,20 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ispc/ispc.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="BSD BSD-2 UoI-NCSA"
 SLOT="0"
 IUSE="examples"
 
-RDEPEND="<sys-devel/clang-13:="
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}"
+RDEPEND="<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):="
+DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-devel/bison
-	sys-devel/flex"
+	sys-devel/flex
+	${PYTHON_DEPS}
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-9999-llvm.patch"
@@ -38,8 +36,9 @@ PATCHES=(
 
 CMAKE_BUILD_TYPE="RelWithDebInfo"
 
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
diff --git a/dev-lang/janet/Manifest b/dev-lang/janet/Manifest
index edbc6060135d..81c5c24c258d 100644
--- a/dev-lang/janet/Manifest
+++ b/dev-lang/janet/Manifest
@@ -1,6 +1,6 @@
 AUX janet-1.16.1-make.patch 435 BLAKE2B a8d038c83a051e8d93dbdaa3456a9c93403a11dbe6b38cc2283c2b1884235ad76a42707d1c19bd5db2f66a86cdbacfd36196a12abea9fc66c4ac78fba5dcea50 SHA512 a9fab424e33d50e56c9ab3090a0b1a6c5b477e459128f1529deaf2452705345829c23d8a86b7e37bf1e7fc24fc37dffe293cc67550b24b065b439e0b5a9ead5e
-DIST janet-1.15.5.tar.gz 601033 BLAKE2B dfc8c2a2d238f2554aae667f706e84905ba15c732fa2f06b3c537f08d064375dcb00043117dfc56328365627e2e8f4e2a8f171731d9d6bc0d48206cea58f127c SHA512 ebdc090de6fbea0c94f0618957a4b36776fa0009298df77b279b79064d4524e73f42723ba2c315167cb6f3a40f2a4dffbb2a865fa2d479ba196aa9f0aa24cbf6
 DIST janet-1.16.1.tar.gz 493490 BLAKE2B 7542644a647d9d2ddd73d8e284f749cdad1900b8df2797c99a2f176c93eca412427b7f571493cfe62f64dd9c90bd12d8506b0f4b6b485ab2d3633e989e735cd9 SHA512 f4be0703676acad8896e41b46d79c4f6d99990c487028f1fd1abd681f756db119a06a5d6a0653b9301afcd62f45d6f1bb7876b9613c0ea28d7199e310a52895d
-EBUILD janet-1.15.5.ebuild 1748 BLAKE2B 50067fd265f5e08344fe43f59628c1a5b9c5f1a735f85e9a1d8eee680af21443915d66120dcb07dcc3c317e20201168261bd9b65ae883fcfaae74448d6ec746f SHA512 957db602a769368862904df84deb119eea06b70fe46c07a41af3cef0bbe3bd66c6dc64885440da73fe44572fd522cb6e0b5a8cd5f9560c29f228802823cdd74d
+DIST janet-1.17.2.tar.gz 488524 BLAKE2B 33e801eb10b46d44a36b95bd29ea318ab3daa88654f47e12303344d2362a2ecc0d0f2ab9371d9539e0787df08664f503ee268b7acf967bd74a929992bc3ea2be SHA512 608ae20992d90cd93a364239c967fef8fdd1c631f1777211d916c6dc16cac5f007f52565bdf24cc0f8af1f521a0977a7245a3c137fc3b61583c2900e26fee81c
 EBUILD janet-1.16.1.ebuild 1790 BLAKE2B 09702dccd44f59a809bb2e001d9197e83d7196b8cfe17e7659a931ba3b6d83920b68a102ff9289b23539c5be1cd470fc263fcda36186f47991cbef1a30888783 SHA512 c4343c4135e929d30d78e0f9f76573c3fabb11f5760343ab833e366e0b6089fcf70fd65783ad5b79570cb2d98f2ca64e304e96c6f74780c938cf5a0f949e5d62
+EBUILD janet-1.17.2.ebuild 1720 BLAKE2B 0b6f3478a950edd5475eae1041ae5f87bd50f640ddb53a4a053e92ffbfddd9b4919e25019d18999b0786f0672b885d71f32fe58c0114f7b9d92e9f007b32cebb SHA512 df830edb0c82a7edafc257b28cf6d11f33f461651bf02f11863800e679da68bb7bcfb78f0a909d498d575bb98000504ecde5a6c1eb4ced747fd7881e3a8b47b1
 MISC metadata.xml 991 BLAKE2B 07e892f19d1408eb2168385bb4f7e170a72221798710a4397f60500ba9b18c9ce743bbdcc79aa8868ab0ceccd19eed5d414ba743ffc76690ab4df41499457a7c SHA512 c326a2ccbf2c7a0e043d3d86cc9ccb887773708c919709156cb1117b1df13825bcf27dd06193e91bd035917049e3577b810064687c992fddc29e1aee1b555af6
diff --git a/dev-lang/janet/janet-1.15.5.ebuild b/dev-lang/janet/janet-1.15.5.ebuild
deleted file mode 100644
index 49f4ff2d82f8..000000000000
--- a/dev-lang/janet/janet-1.15.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="A dynamic Lisp dialect and bytecode vm"
-HOMEPAGE="https://janet-lang.org https://github.com/janet-lang/janet/"
-SRC_URI="https://github.com/janet-lang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-MY_RELEASE="${PV::-2}"
-
-src_configure() {
-	append-ldflags -Wl,-soname,libjanet.so.1.${MY_RELEASE}
-	append-cflags -fPIC
-}
-
-src_compile() {
-	# janet_build is the git hash of the commit related to the
-	# current release - it defines a constant which is then shown
-	# when starting janet
-	local janet_build='\"1.15.5\"'
-	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" JANET_BUILD="${janet_build}"
-	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" build/janet.pc JANET_BUILD="${janet_build}"
-	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" docs JANET_BUILD="${janet_build}"
-	emake LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" build/jpm JANET_BUILD="${janet_build}"
-}
-
-src_install() {
-	dobin "build/janet"
-	dobin "build/jpm"
-	insinto "usr/include/janet"
-	doheader "src/include/janet.h"
-	doheader "src/conf/janetconf.h"
-
-	dolib.so "build/libjanet.so"
-	dosym libjanet.so /usr/$(get_libdir)/libjanet.so.${MY_RELEASE}
-	dosym libjanet.so.${MY_RELEASE} /usr/$(get_libdir)/libjanet.so.${PV}
-
-	if use static-libs; then
-		dolib.a "build/libjanet.a"
-	fi
-	doman "janet.1"
-	doman "jpm.1"
-
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins "build/janet.pc"
-	dodoc -r examples
-	dodoc "build/doc.html"
-	# required for jpm
-	keepdir /usr/$(get_libdir)/janet/.cache
-}
-
-pkg_postinst() {
-	elog "Enable use flag \"static-libs\" for building stand-alone executables with jpm"
-}
diff --git a/dev-lang/janet/janet-1.17.2.ebuild b/dev-lang/janet/janet-1.17.2.ebuild
new file mode 100644
index 000000000000..540be0ac1f9c
--- /dev/null
+++ b/dev-lang/janet/janet-1.17.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A dynamic Lisp dialect and bytecode vm"
+HOMEPAGE="https://janet-lang.org https://github.com/janet-lang/janet/"
+SRC_URI="https://github.com/janet-lang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+MY_RELEASE="${PV::-2}"
+
+src_configure() {
+	tc-export CC
+
+	append-ldflags -Wl,-soname,libjanet.so.1.${MY_RELEASE}
+	append-cflags -fPIC
+}
+
+src_compile() {
+	# janet_build is the git hash of the commit related to the
+	# current release - it defines a constant which is then shown
+	# when starting janet
+	local janet_build='\"'${PV}'\"'
+
+	local target
+	for target in '' build/janet.pc docs ; do
+		einfo "Building: ${target:-main}"
+		emake \
+			LIBDIR="/usr/$(get_libdir)" \
+			PREFIX="/usr" \
+			JANET_BUILD="${janet_build}" \
+			CFLAGS="${CFLAGS}" \
+			LDFLAGS="${LDFLAGS}" \
+			${target}
+	done
+}
+
+src_install() {
+	dobin build/janet
+
+	insinto /usr/include/janet
+	doheader src/include/janet.h
+	doheader src/conf/janetconf.h
+
+	dolib.so build/libjanet.so
+	dosym libjanet.so /usr/$(get_libdir)/libjanet.so.${MY_RELEASE}
+	dosym libjanet.so.${MY_RELEASE} /usr/$(get_libdir)/libjanet.so.${PV}
+
+	if use static-libs; then
+		dolib.a build/libjanet.a
+	fi
+
+	doman janet.1
+
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins build/janet.pc
+
+	dodoc -r examples
+	dodoc build/doc.html
+}
+
+pkg_postinst() {
+	elog "Note: jpm has been extracted to its own repository upstream."
+	elog "Follow the upstream instructions on how to install it."
+	elog "Enable use flag \"static-libs\" for building stand-alone executables with jpm"
+}
diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index 869b2d55d155..bc3ac9f7f144 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -1,7 +1,9 @@
 AUX lazarus-0.9.26-fpcsrc.patch 407 BLAKE2B c3b006fd7bb58fb7037aae3d8d35ac146ab971fc6063652e3185b320e4cb05ccedb6c26c7d64b2f2998a901608ee251762b723f62bd9c239a51ab6a6d6f2b39d SHA512 823d9ba2041f97c39d8ea5f49cb02f68d8c98da95d0a479cc65a638365e2adafd1c5645fa6846720af18198834958f37b0cc0d92f38023ccdaf40ec8dc848f64
 DIST lazarus-1.8.4-python.tar.gz 1060859 BLAKE2B 4d6f7dc275aacd0f70d9f7c85aba99a7722b02165a5bf287bfeed46f28e3b36c5abeac19bd7c6555250102dce169f7c9c213b634ce1b634c24dadc84171aed10 SHA512 f244b4e86410fdb2ffe8ccba7fcb51c270286172b6102f757118827cac3b652210a625d65dd6c017c1992983527792ed64334291ab0e0b824f187316452c56b5
 DIST lazarus-1.8.4.tar.gz 63130653 BLAKE2B f9b2ba9971f1a9a9c3b8d2004bd3516c12db5384bb6243ef275c2fc0d458634fba0c1c23e7ecd5c160c1204d6cc2b4ebc340ce8bb5cfdd9c531f8c36ae59d1e2 SHA512 82cdc3c32dddf8e67c0bed9292a9a924227bab50f22ca479f5e98ecccbf60dd66c7f886ecb8e2979d9d8fccc3d25462ee8c55fcab085aa4194b4704660e0b95d
+DIST lazarus-2.0.12.tar.gz 69560778 BLAKE2B ff6c9414483b0d50dbbb30c8fbf626c81d9c71ef0329aa1d58b37aa4288a500e1ab55d06bad27f637e3f09b9d062af1896720b9cb7367b092fc872cf613f8a3d SHA512 dfd22b2b96fca9d0f672f03b9120c4294a7e640737a09b26c274d304025c61566a8504a5484638c108e42a322b21992229451d95e38d7e491a1c2f07a663483e
 DIST lazarus-2.0.6.tar.gz 65558951 BLAKE2B f5289562adcfeab86af074de9fc44d7faf5939655587ea9951559bbefc15ce1730e7b7dafb6ec1d0a11eb0f8f069309b8fa0a305051c5cc9ea0fcf9665e883bc SHA512 cdb4c5861e130c12bf0a4938a73c439f2766a73008678028d7e9c9bcabe7b277e70025a7c720a5c14c157cf0227e0ff629a44cf983537b3afbf341343e816d07
 EBUILD lazarus-1.8.4-r2.ebuild 3530 BLAKE2B 98ad3bf609155c9171b0911812c2cbf9bb7286ab3eee9c1d6c010dec5f0fd694409eb35f0a4d67d5e27f1abe8959129c87ef13f01e9491480d44a339c976db32 SHA512 767e7a9961425daefb834eb4cec25ce9ea537eb1ed50a44fefa11be4fd703fe3747c18158b81799f7cedad25d27e26b2bef3513a9f8f7fa6eba5b21f1bb01dc4
+EBUILD lazarus-2.0.12.ebuild 2667 BLAKE2B d6e1a545dd5a90f61b2f447205bdfb325f7a10e26f79891dd8fb229f76933f437277aba252253b123313ebc3189440d8b82bd1e794873e127c0f543ad514e1b8 SHA512 479430f9b6f5b15cb1fac203fe9d133706d2a01bc9020b23f35d1a5935dbf1bf116e2e9095b7e4175cad964f91def11cbfbb5f3daa21c0b3c47c834d4195643f
 EBUILD lazarus-2.0.6.ebuild 2471 BLAKE2B e9b45f75b6a7c397d09e123bd3ceb53365656271fe6ffbb150543da83d07f6b216977a1fdb405ff17fc22fd48d2a7162c6ad88ce8cf06aaa64e572e6ff151527 SHA512 ef7ad240944f7380302ef1189669df6d3b3815f428bec0a59758b17d64ae9ed2b29c9e3a8f006138536d8e41203518f7fe715238d4afad671b5ae555a02862fe
 MISC metadata.xml 395 BLAKE2B ddc65b4329ed615ee2692ee80ff2b74b1b72992742ee27e6338aaa1ea8b7e39114ce5f735c61bf64bd603dbac7a1828f8bdb4c29b78a339a878b61092556e7ac SHA512 161abe773c486138f13a426c0d056d7efaf62f4180fc4fdfa85aa688021a5a834af7fc972867b92c6f53d45ca40940ff70ba07d7c4f61c4cfc32c2880286ba60
diff --git a/dev-lang/lazarus/lazarus-2.0.12.ebuild b/dev-lang/lazarus/lazarus-2.0.12.ebuild
new file mode 100644
index 000000000000..63ba361cacc4
--- /dev/null
+++ b/dev-lang/lazarus/lazarus-2.0.12.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop
+
+# See https://wiki.freepascal.org/Lazarus_2.0_fixes_branch for notes and
+# changes in FPCVER. It *does* change between minor versions of lazarus.
+FPCVER="3.2.0"
+
+DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
+HOMEPAGE="https://www.lazarus-ide.org/"
+SRC_URI="https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
+SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
+KEYWORDS="amd64 x86"
+IUSE="minimal"
+
+DEPEND=">=dev-lang/fpc-${FPCVER}[source]
+	net-misc/rsync
+	x11-libs/gtk+:2
+	>=sys-devel/binutils-2.19.1-r1:="
+RDEPEND="${DEPEND}"
+
+RESTRICT="strip" #269221
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch )
+
+src_prepare() {
+	default
+	# Use default configuration (minus stripping) unless specifically requested otherwise
+	if ! test ${PPC_CONFIG_PATH+set} ; then
+		local FPCVER=$(fpc -iV)
+		export PPC_CONFIG_PATH="${WORKDIR}"
+		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
+			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
+	fi
+	sed -i \
+		-e "s;SecondaryConfigPath:='/etc/lazarus';SecondaryConfigPath:=ExpandFileNameUTF8('~/.lazarus');g" \
+		-e "s;PrimaryConfigPath:=ExpandFileNameUTF8('~/.lazarus');PrimaryConfigPath:='/etc/lazarus';g" \
+		ide/include/unix/lazbaseconf.inc \
+		|| die
+}
+
+src_compile() {
+	# TODO: Change to LCL_PLATFORM=qt5?
+	# bug #732758
+	LCL_PLATFORM=gtk2 emake \
+		$(usex minimal "" "bigide") \
+		-j1
+}
+
+src_install() {
+	diropts -m0755
+	dodir /usr/share
+	# Using rsync to avoid unnecessary copies and cleaning...
+	# Note: *.o and *.ppu are needed
+	rsync -a \
+		--exclude="CVS"     --exclude=".cvsignore" \
+		--exclude="*.ppw"   --exclude="*.ppl" \
+		--exclude="*.ow"    --exclude="*.a"\
+		--exclude="*.rst"   --exclude=".#*" \
+		--exclude="*.~*"    --exclude="*.bak" \
+		--exclude="*.orig"  --exclude="*.rej" \
+		--exclude=".xvpics" --exclude="*.compiled" \
+		--exclude="killme*" --exclude=".gdb_hist*" \
+		--exclude="debian"  --exclude="COPYING*" \
+		--exclude="*.app" \
+		"${S}" "${ED}"/usr/share \
+		|| die "Unable to copy files!"
+
+	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
+	dosym ../share/lazarus/startlazarus /usr/bin/lazarus
+	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
+	use minimal || dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
+	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
+
+	make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
+}
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 8a7b7abbcf07..3b04bc07b4bb 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -2,24 +2,22 @@ AUX ocaml-4.04.2-tinfo.patch 506 BLAKE2B 889c964385442247a70b7205abc497a8d83ac9e
 AUX ocaml-4.05.0-CVE-2018-9838.patch 2888 BLAKE2B 75fe491c1b12d9882c7b558efb3384a133c56bea0c85e97a6b46ec5b5f4050da4752228c795d937875645260b98ac9d203b9cdbf583ed36934a29faf4d47ecc3 SHA512 3da218dcea2c08ed97da805a2c1a1bc134a48b4425b4912283e353dde606ae99c95b86b59c6575b42961c9eb6903e09d60968c5a8db72a58510c4e3dcd13a5ef
 AUX ocaml-4.05.0-gcc10.patch 1976 BLAKE2B cf1240a815d731e99862740ddf90f6a0ea1d078c9e4e1cef126eff4a7d80afbde73f45d360a26eaa14863cc35d2086d98d130251490959df4c361a51ced0557e SHA512 e55cb651431798294b21ee0ea8818d6c42f88c329b7a1985af9d460f2a5b3057f2ee229e72699f9660168202a0c78dcf89b8bfce2154ca3e141fe8fb5f861773
 AUX ocaml-4.09.0-gcc-10.patch 571 BLAKE2B 990107a1d199d350a821596e7655566bb8eb71ee828eb0247bd25111760dd4dd6952a0bea6c29f69f6fa4ef8d02bd47166b5f2c4ced30ed830078b1555ca86eb SHA512 430774f62cea3f4ed06c9a1cbc73c68e3eab0d6fbebb5e62ea12a012cc2b25bb1a776ff08a7d532140bc2e12eae3e1a43605bf5708e1333b23a135b9801de084
+AUX ocaml-4.11.2-glibc-2.34.patch 3318 BLAKE2B 96fe61e553e7c67f76df32f2e5532f7a6eae57fb60752c7c49d71baf416ac74a4c7b925ecfd0bd5874a1728b51ca36b82d636bfa6ab30ec5f3df37fbac2a73b9 SHA512 eb54d912338a42a21f736dcd1591f77403b0dff8772059bd7f39a6e83b8a5e89bd5a7a9d4200bacbcaa8ec0450a5a78ecf6645bb5405d45fd1c077cbe1c36f7f
+AUX ocaml-4.12.0-glibc-2.34.patch 3411 BLAKE2B d5138feaf6ca1e4a25ee85100013e343f8867bfe22d1c8c26df56fe1a6266b9cf37738f0b5fa6ee6daaaed9c90880529a50ffa1e789766039727dd407d15da51 SHA512 978a300d28bcb4c4d312e5b9f830140b08a282ba850d7c7a3866ca54413a321695d21315fff423d646085d8eed148a3f84567c08a4e09957b4b87010d65ee694
 AUX ocaml-rebuild.sh 1120 BLAKE2B 6f88a9f2b99fae7f89b884bb08d2c6ad6a0e14d4a8fd06d498037f78c5f6ef040428f9de224b5fe5df4ef64eaed419cda6d8715ea0c0a4c4dad60c5cf75a4147 SHA512 05a3e81e95533135d9895091c21621c73ae82851abd4889d64f035979eb25f8d90b60f469d7ef5e789fd1a4adffd6bbe255e6708c14c24a04f8a423507d19a40
 AUX ocaml.conf 177 BLAKE2B da070848d9e3a30ad303c296f55de87c30fd15feee3304ccc1d1f844d83c5a646664cd4d9958375ead2324e25bb88280fdb78f9e4230eeb8cd5825eed6f2f91d SHA512 4f0a48b8101b77d568d8d0a852f2a21fd46b7947c5d3f975ee4cd8a9c37c993d689cf5fb53b54a6b2740cb865051dc50c74c0c373eb697fca800ca143d401aa4
 DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
 DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B 80f29d535c64bf2371b480217723ed20b2b21cfd93ce31366a7b91e7ddffdf68db4e88d085288b7e21efee567a13f42ecff24c3a0115507b006acf844239cefd SHA512 dc0271e591bf929b751705835790949a9d741e12d085c8b207c3689b5838a02ea8de80da8b2605d2e6744f2f541b0d1694ffafff9509e99ce01f3a391f6ef2ae
 DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B ec5e92adb23c28a254247182c79ab555fd82603e02f24799049b8057abf869d18234302408c8ae89b9997a2b210ed6965e45c2c03e4f0cab34262ad3f6ebb528 SHA512 1dd827da07f01e815fd74dd7ee84db0900f24782f8f7fd426e2d71b9fb03c7b8045f22e018120a0446c362315751365d1bd8c1724edef2b182394e76eb0a07b2
 DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B bdc503d9a8d0e39dd11060febcd0287657b460e50ed81e55578a3e778af990ca5d4ef9011753eee4e1a144da33eb76c95b1672dc99b76e65a2e107eee472fe06 SHA512 03d8a9f6e130142c121ff2eb3d54f584f1e7c8475f066a5803bb0edd2fa172ca06a56a3ec548b225f5c8b12112d7a68511b1e16f3ade075b5f02610d4247bbb3
-DIST ocaml-4.12.0.tar.gz 5179734 BLAKE2B 318be7e306157102d7ad22802db381dfa9c675e43325395695c3564e5ffee87d9b55d1152ea1603edb5ef715a28cbde85d835dbf1b5aface2dc415c67192c208 SHA512 951e44cdda613f9c6c5f988434c84249a2d63ba14e21938a9e74c174ebaf9d81a3160d1e5021d57fcd4882732ae6aefc05239ac38116f39ca83d53879d5d4eaf
 DIST ocaml-4.12.1.tar.gz 5181696 BLAKE2B 9d21438e09b1a9680eabb65f5c78d9fe84459592ef7bb797a1933e5383f7b6d5cefffa8cdc184abc102417f5dbc0fca8ef624c9b560f89eaff6537544b5b395f SHA512 e942e5cf5530804690ec45c40936ad2acbb60e11279fc676e0f04181fe1855f84ee5c3cb9c337fc5d01f6ee0e7b2251a6c04f7de56d99c20bb62026dff6c5671
-DIST ocaml-4.13.0.tar.gz 5323007 BLAKE2B 56cbb64272ac2b4b8894b3bb91ec184eb977cb056ae75ace2fce716fdb9853d5626b8f91dcc339d1d0f9f033f032f99bc6e49c443ee142f6005aaabeef9a670a SHA512 553c94ba5c5332d134f2695b3323e4be60ef2d0a404652cbcc56968ec91b1de19a6d894c6e365e418fe814595bb926450d7b109e328e25fc317f13ed6b703080
 DIST ocaml-4.13.1.tar.gz 5323203 BLAKE2B f1dcb1601ebfa2a37351e3a466a7ca601518c2da403b01aeb182738a54d5887523ab554d747d6591cb09b07b417865e20907f7877117b2d2d069ef6c9edc0fae SHA512 da3434177438c852da53c0fda7bc2519adcda6384d97d45e44137ed0fd384ffb3da61958a7b51296edb3f88f5a5310ca71b6862f6d756aaa4012d1f54e5955f6
 DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B 4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
-EBUILD ocaml-4.05.0-r7.ebuild 4138 BLAKE2B 745222cde60f1ddae4a7a437100e724a88ddaab89bfc78befd5572d6a582e344564b78350acdb47a626a4d9f95612e64d2419534b48dec5782990b1dc35c3376 SHA512 a9fa601a6a34c84aeb262d027936861e45ea23cc8ba679ebefa6d49de0e5170cec3c213c33bed4acaa4dbae37e8bcf4b1890a623bbdd1c2c552567146ac1fdcd
-EBUILD ocaml-4.05.0-r8.ebuild 4178 BLAKE2B 505af46e12d67cbaab60ed33ee91ce46d7670a4fdc09d5ad80cd31fa00c69d7a8f32f469cdbbd1a531624d4a347a56b823aa056447f4ed911c0ea7669827d469 SHA512 8c555496ac8f0ac1a671be1e2321d336a5001fc90fb92ba2007466677d2653436d4b4651339f7f07c91b7f9d0d2b96bcb8db55ab2b02f47106e3c44821524202
-EBUILD ocaml-4.09.0-r2.ebuild 2573 BLAKE2B 1d50f2cbad2e338864f4045d321184c4de79557428e25a10d5949ebdc3c2ff252520d9a6638080384ec48f00742a87301913d5a038919734698bb5a9f5bdea18 SHA512 ed60dcedffdd8238ddeb976dc210a0156316b92a54070c5a523ecb9e29f500d8f430bb737788d0c1fda66ad5855f1da74d11addedb927e2935e02609531d66ae
-EBUILD ocaml-4.10.2-r2.ebuild 2530 BLAKE2B f428c3a4f0d65464bb384c066b58ddf11993547629070265e79d482f0df8fc861a25e5d62d04e397356ef6b12fffc3fcbabafe5be788cc403ab772cbdd523cca SHA512 834a2a86aa66211f07bbaae967e0da94eb3fb9ffd3ff29724b6002080ff26b3a0e1b8ded081f3ff7d92adf6e1cc373d6f4165dc94cf01b0ea28b2210a6700f6a
-EBUILD ocaml-4.11.2-r2.ebuild 2402 BLAKE2B 8638f476f62c156c878a5a78e644882f84dab1a7c05642914b07e26672076ae850af94e564460e4a396c0f19a64cafad8c37f3c029aa190fdd9980db6352e0db SHA512 5f2c79e1e5f47dd7eec5e119213132433970437fcb7ca9c053ace5a89f5ea553f3b2b72253fc82a7262b898977f2064fa7556740a0c5f2e6d17080a7d5a326c9
-EBUILD ocaml-4.12.0-r2.ebuild 2406 BLAKE2B 24b58bb81263db44c0a5037e598b3a10b66abfebf2f38341f289bdea588e514b949ae36ca6e3cdc500bed0078c744af48d72e705bf927aa45978ba7d009a3c53 SHA512 6488b249be59af91b5d9b16eab129237535fe31ed388b8b8a69db77d1b506cfde24dfae02b851f907c3cb4b16160b36ced431fa81e321a5788483854da4ff80d
-EBUILD ocaml-4.12.1.ebuild 2406 BLAKE2B 24b58bb81263db44c0a5037e598b3a10b66abfebf2f38341f289bdea588e514b949ae36ca6e3cdc500bed0078c744af48d72e705bf927aa45978ba7d009a3c53 SHA512 6488b249be59af91b5d9b16eab129237535fe31ed388b8b8a69db77d1b506cfde24dfae02b851f907c3cb4b16160b36ced431fa81e321a5788483854da4ff80d
-EBUILD ocaml-4.13.0.ebuild 2406 BLAKE2B 24b58bb81263db44c0a5037e598b3a10b66abfebf2f38341f289bdea588e514b949ae36ca6e3cdc500bed0078c744af48d72e705bf927aa45978ba7d009a3c53 SHA512 6488b249be59af91b5d9b16eab129237535fe31ed388b8b8a69db77d1b506cfde24dfae02b851f907c3cb4b16160b36ced431fa81e321a5788483854da4ff80d
+EBUILD ocaml-4.05.0-r7.ebuild 4233 BLAKE2B f36bb3443204c123a153a2c6571923e3b55d62796c2070603c52fdbab45df81afe4a33b701b6ac5335c53b12f1bafb6664a5b83364c742d168f04c7c7d4beb18 SHA512 16fcb2fa8a40aa7aebeb3f18031204c04a2d6407f9f54488a02b0ec8f1f78d44c30238b2e682507fe77cfe1c7958c809ad2112d532edcce91303646338e1cfc2
+EBUILD ocaml-4.05.0-r8.ebuild 4273 BLAKE2B 3bd81d4fd9e6933cd56657b91d38b0eb32c37740371f1a5407c7c0dd8a4d49707e7d045626f501f99b312d7e36d4f9a0af561cda3a5f866153e00d8dfac25cfb SHA512 16e6038aa3701f031fddb7c38efed5f883624800d970f3f636c3da6fec93fb7b70cb6e7e1c99eba8324568c2d59cd2626b707b03d82c63a809cf2f5fa72def0e
+EBUILD ocaml-4.09.0-r2.ebuild 2670 BLAKE2B 9f1f961c10033da32c1f03351a77ca41d0f0deda525b56b0a7adb8d1b307f289c6852ab5ccafb6d47c17408ebf86ee9b87f0096862310714b0d5bb539e7d9963 SHA512 7de20119f0a8f392cf95c6593b93b4e995fb8e1c0872577b2816a42b0c9c2c40b74282ea3db90dbf10f05dfdb0a62e8452b3178ffaa42c576c36312db09efdfe
+EBUILD ocaml-4.10.2-r2.ebuild 2625 BLAKE2B 9c0505058ed5bcadc60e0cff518fc43fde91a40b938ea8e0c9383e2a25542c06b7216ac859366c583ac338761656d41b2dbf0b6a2e62b7faa9f8f7d24cf22d3e SHA512 210276caba4bf5e4e2b368f92582bf7007334adf347e223e8a2f18b2301bb25bbff9bcae5767bbd4e5927c44e7e694da01107337c4684830eff00bd6a7cbe17e
+EBUILD ocaml-4.11.2-r2.ebuild 2549 BLAKE2B 84ad17fc96ebc5221c6323499a0317a7c7ad453b143a4602229748a70a8c024450292292518ab200796fa8dca4a7f363bde2d3c4035af29cb6830df857f878b0 SHA512 82a007665435733d750c4bdc51c54cf548d9c2f3201112143bab962479f532a6270a2bc0089402c879330320c11b8387bddba0f3e10094ff7cf464a4052e0d52
+EBUILD ocaml-4.12.1.ebuild 2464 BLAKE2B eadf170ff1ab0e3fc99c662d6e523a2fda6d4ab27d684b56c37bba2f02a03d7ccfefc2bf153f6eaa350e74a2e735cdf415b3d278210ed44337d45e45688663a1 SHA512 0ddeb9d7dd3b124fce02d291377f6c8964e19fb8709ce57b0e52a8628523991d3780862c4c0df55f4d7694f159ab65df89ec23d52182fd87d9c9c155b0423235
 EBUILD ocaml-4.13.1.ebuild 2406 BLAKE2B 24b58bb81263db44c0a5037e598b3a10b66abfebf2f38341f289bdea588e514b949ae36ca6e3cdc500bed0078c744af48d72e705bf927aa45978ba7d009a3c53 SHA512 6488b249be59af91b5d9b16eab129237535fe31ed388b8b8a69db77d1b506cfde24dfae02b851f907c3cb4b16160b36ced431fa81e321a5788483854da4ff80d
 MISC metadata.xml 776 BLAKE2B e7b13b4bb764cec6df76ede0eb2d492cc705ce51b18a445fa3f9ebaab119fab8cae45a2a9d02c70f38e19f2e2d2c06de648a3a0843a603dd7b68942c7cd00bdb SHA512 92e3afe1c40991d37dc460d6091ff2b15c83740343e5d8dd69344eb61d873fbd66af1b96e70904f7757c06f2b104d1450883cc79877709c779467af64e2ea96e
diff --git a/dev-lang/ocaml/files/ocaml-4.11.2-glibc-2.34.patch b/dev-lang/ocaml/files/ocaml-4.11.2-glibc-2.34.patch
new file mode 100644
index 000000000000..22cbb806e6ea
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-4.11.2-glibc-2.34.patch
@@ -0,0 +1,91 @@
+https://gitlab.com/redhat/centos-stream/rpms/ocaml/-/raw/c9s/0006-Dynamically-allocate-the-alternate-signal-stack-1026.patch
+https://bugs.gentoo.org/804498
+
+From 24a9db7784ddfcf0af2d2be2f51616ed960ae7e8 Mon Sep 17 00:00:00 2001
+From: Xavier Leroy <xavierleroy@users.noreply.github.com>
+Date: Fri, 5 Mar 2021 19:14:07 +0100
+Subject: [PATCH 6/6] Dynamically allocate the alternate signal stack (#10266)
+
+In Glibc 2.34 and later, SIGSTKSZ may not be a compile-time constant.
+It is no longer possible to statically allocate the alternate signal
+stack for the main thread, as we've been doing for the last 25 years.
+
+This commit implements dynamic allocation of the alternate signal stack
+even for the main thread.  It reuses the code already in place to allocate
+the alternate signal stack for other threads.
+
+Fixes: #10250.
+(cherry picked from commit fc9534746bf5d08a4c109f22e344cf49d5d46d54)
+--- a/runtime/caml/signals.h
++++ b/runtime/caml/signals.h
+@@ -82,7 +82,7 @@ void caml_set_action_pending (void);
+ value caml_do_pending_actions_exn (void);
+ value caml_process_pending_actions_with_root (value extra_root); // raises
+ int caml_set_signal_action(int signo, int action);
+-void caml_setup_stack_overflow_detection(void);
++CAMLextern int caml_setup_stack_overflow_detection(void);
+ 
+ CAMLextern void (*caml_enter_blocking_section_hook)(void);
+ CAMLextern void (*caml_leave_blocking_section_hook)(void);
+--- a/runtime/signals_byt.c
++++ b/runtime/signals_byt.c
+@@ -86,4 +86,4 @@ int caml_set_signal_action(int signo, int action)
+     return 0;
+ }
+ 
+-void caml_setup_stack_overflow_detection(void) {}
++CAMLexport int caml_setup_stack_overflow_detection(void) { return 0; }
+--- a/runtime/signals_nat.c
++++ b/runtime/signals_nat.c
+@@ -195,8 +195,6 @@ DECLARE_SIGNAL_HANDLER(trap_handler)
+ #error "CONTEXT_SP is required if HAS_STACK_OVERFLOW_DETECTION is defined"
+ #endif
+ 
+-static char sig_alt_stack[SIGSTKSZ];
+-
+ /* Code compiled with ocamlopt never accesses more than
+    EXTRA_STACK bytes below the stack pointer. */
+ #define EXTRA_STACK 256
+@@ -282,28 +280,33 @@ void caml_init_signals(void)
+ #endif
+ 
+ #ifdef HAS_STACK_OVERFLOW_DETECTION
+-  {
+-    stack_t stk;
++  if (caml_setup_stack_overflow_detection() != -1) {
+     struct sigaction act;
+-    stk.ss_sp = sig_alt_stack;
+-    stk.ss_size = SIGSTKSZ;
+-    stk.ss_flags = 0;
+     SET_SIGACT(act, segv_handler);
+     act.sa_flags |= SA_ONSTACK | SA_NODEFER;
+     sigemptyset(&act.sa_mask);
+-    if (sigaltstack(&stk, NULL) == 0) { sigaction(SIGSEGV, &act, NULL); }
++    sigaction(SIGSEGV, &act, NULL);
+   }
+ #endif
+ }
+ 
+-void caml_setup_stack_overflow_detection(void)
++/* Allocate and select an alternate stack for handling signals,
++   especially SIGSEGV signals.
++   Each thread needs its own alternate stack.
++   The alternate stack used to be statically-allocated for the main thread,
++   but this is incompatible with Glibc 2.34 and newer, where SIGSTKSZ
++   may not be a compile-time constant (issue #10250). */
++
++CAMLexport int caml_setup_stack_overflow_detection(void)
+ {
+ #ifdef HAS_STACK_OVERFLOW_DETECTION
+   stack_t stk;
+   stk.ss_sp = malloc(SIGSTKSZ);
++  if (stk.ss_sp == NULL) return -1;
+   stk.ss_size = SIGSTKSZ;
+   stk.ss_flags = 0;
+-  if (stk.ss_sp)
+-    sigaltstack(&stk, NULL);
++  return sigaltstack(&stk, NULL);
++#else
++  return 0;
+ #endif
+ }
diff --git a/dev-lang/ocaml/files/ocaml-4.12.0-glibc-2.34.patch b/dev-lang/ocaml/files/ocaml-4.12.0-glibc-2.34.patch
new file mode 100644
index 000000000000..486b44846a86
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-4.12.0-glibc-2.34.patch
@@ -0,0 +1,91 @@
+https://src.fedoraproject.org/rpms/ocaml/blob/129153b85109944bf0b2922949f77ef8f32b39a1/f/0004-Dynamically-allocate-the-alternate-signal-stack-1026.patch
+https://bugs.gentoo.org/816765
+
+From 3104d92743614f8f52039e0520116af4179880a5 Mon Sep 17 00:00:00 2001
+From: Xavier Leroy <xavierleroy@users.noreply.github.com>
+Date: Fri, 5 Mar 2021 19:14:07 +0100
+Subject: [PATCH 4/4] Dynamically allocate the alternate signal stack (#10266)
+
+In Glibc 2.34 and later, SIGSTKSZ may not be a compile-time constant.
+It is no longer possible to statically allocate the alternate signal
+stack for the main thread, as we've been doing for the last 25 years.
+
+This commit implements dynamic allocation of the alternate signal stack
+even for the main thread.  It reuses the code already in place to allocate
+the alternate signal stack for other threads.
+
+Fixes: #10250.
+(cherry picked from commit fc9534746bf5d08a4c109f22e344cf49d5d46d54)
+--- a/runtime/caml/signals.h
++++ b/runtime/caml/signals.h
+@@ -87,7 +87,7 @@ value caml_do_pending_actions_exn (void);
+ value caml_process_pending_actions_with_root (value extra_root); // raises
+ value caml_process_pending_actions_with_root_exn (value extra_root);
+ int caml_set_signal_action(int signo, int action);
+-CAMLextern void caml_setup_stack_overflow_detection(void);
++CAMLextern int caml_setup_stack_overflow_detection(void);
+ 
+ CAMLextern void (*caml_enter_blocking_section_hook)(void);
+ CAMLextern void (*caml_leave_blocking_section_hook)(void);
+--- a/runtime/signals_byt.c
++++ b/runtime/signals_byt.c
+@@ -81,4 +81,4 @@ int caml_set_signal_action(int signo, int action)
+     return 0;
+ }
+ 
+-CAMLexport void caml_setup_stack_overflow_detection(void) {}
++CAMLexport int caml_setup_stack_overflow_detection(void) { return 0; }
+--- a/runtime/signals_nat.c
++++ b/runtime/signals_nat.c
+@@ -181,8 +181,6 @@ DECLARE_SIGNAL_HANDLER(trap_handler)
+ #error "CONTEXT_SP is required if HAS_STACK_OVERFLOW_DETECTION is defined"
+ #endif
+ 
+-static char sig_alt_stack[SIGSTKSZ];
+-
+ /* Code compiled with ocamlopt never accesses more than
+    EXTRA_STACK bytes below the stack pointer. */
+ #define EXTRA_STACK 256
+@@ -276,28 +274,33 @@ void caml_init_signals(void)
+ #endif
+ 
+ #ifdef HAS_STACK_OVERFLOW_DETECTION
+-  {
+-    stack_t stk;
++  if (caml_setup_stack_overflow_detection() != -1) {
+     struct sigaction act;
+-    stk.ss_sp = sig_alt_stack;
+-    stk.ss_size = SIGSTKSZ;
+-    stk.ss_flags = 0;
+     SET_SIGACT(act, segv_handler);
+     act.sa_flags |= SA_ONSTACK | SA_NODEFER;
+     sigemptyset(&act.sa_mask);
+-    if (sigaltstack(&stk, NULL) == 0) { sigaction(SIGSEGV, &act, NULL); }
++    sigaction(SIGSEGV, &act, NULL);
+   }
+ #endif
+ }
+ 
+-CAMLexport void caml_setup_stack_overflow_detection(void)
++/* Allocate and select an alternate stack for handling signals,
++   especially SIGSEGV signals.
++   Each thread needs its own alternate stack.
++   The alternate stack used to be statically-allocated for the main thread,
++   but this is incompatible with Glibc 2.34 and newer, where SIGSTKSZ
++   may not be a compile-time constant (issue #10250). */
++
++CAMLexport int caml_setup_stack_overflow_detection(void)
+ {
+ #ifdef HAS_STACK_OVERFLOW_DETECTION
+   stack_t stk;
+   stk.ss_sp = malloc(SIGSTKSZ);
++  if (stk.ss_sp == NULL) return -1;
+   stk.ss_size = SIGSTKSZ;
+   stk.ss_flags = 0;
+-  if (stk.ss_sp)
+-    sigaltstack(&stk, NULL);
++  return sigaltstack(&stk, NULL);
++#else
++  return 0;
+ #endif
+ }
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
index 7604e5ba353b..68a369bcebf8 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
@@ -66,6 +66,11 @@ src_configure() {
 	# Bug #285993
 	filter-mfpmath sse
 
+	# Broken until 4.12
+	# bug #818445
+	filter-flags '-flto*'
+	append-flags -fno-strict-aliasing
+
 	# -ggdb3 & co makes it behave weirdly, breaks sexplib
 	replace-flags -ggdb* -ggdb
 
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
index aab387a10427..4c2da17dac59 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
@@ -67,6 +67,11 @@ src_configure() {
 	# Bug #285993
 	filter-mfpmath sse
 
+	# Broken until 4.12
+	# bug #818445
+	filter-flags '-flto*'
+	append-flags -fno-strict-aliasing
+
 	# -ggdb3 & co makes it behave weirdly, breaks sexplib
 	replace-flags -ggdb* -ggdb
 
diff --git a/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
index 23d27276013c..68b58ca86b18 100644
--- a/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
@@ -21,13 +21,18 @@ BDEPEND="${RDEPEND}
 PDEPEND="emacs? ( app-emacs/ocaml-mode )
 	xemacs? ( app-xemacs/ocaml )"
 
-PATCHES=("${FILESDIR}"/${PN}-4.09.0-gcc-10.patch)
+PATCHES=( "${FILESDIR}"/${PN}-4.09.0-gcc-10.patch )
 
 src_prepare() {
 	default
 
 	cp "${FILESDIR}"/ocaml.conf "${T}" || die
 
+	# Broken until 4.12
+	# bug #818445
+	filter-flags '-flto*'
+	append-flags -fno-strict-aliasing
+
 	# OCaml generates textrels on 32-bit arches
 	# We can't do anything about it, but disabling it means that tests
 	# for OCaml-based packages won't fail on unexpected output
diff --git a/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild b/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
index 7203dec65d67..3b6334a9c87c 100644
--- a/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
@@ -26,6 +26,11 @@ src_prepare() {
 
 	cp "${FILESDIR}"/ocaml.conf "${T}" || die
 
+	# Broken until 4.12
+	# bug #818445
+	filter-flags '-flto*'
+	append-flags -fno-strict-aliasing
+
 	# OCaml generates textrels on 32-bit arches
 	# We can't do anything about it, but disabling it means that tests
 	# for OCaml-based packages won't fail on unexpected output
diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
index 3ef5a4d10154..cbc5b7cb458b 100644
--- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional, imperative & object-ori
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
 
 RDEPEND="sys-libs/binutils-libs:=
@@ -21,11 +21,20 @@ BDEPEND="${RDEPEND}
 PDEPEND="emacs? ( app-emacs/ocaml-mode )
 	xemacs? ( app-xemacs/ocaml )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.11.2-glibc-2.34.patch
+)
+
 src_prepare() {
 	default
 
 	cp "${FILESDIR}"/ocaml.conf "${T}" || die
 
+	# Broken until 4.12
+	# bug #818445
+	filter-flags '-flto*'
+	append-flags -fno-strict-aliasing
+
 	# OCaml generates textrels on 32-bit arches
 	# We can't do anything about it, but disabling it means that tests
 	# for OCaml-based packages won't fail on unexpected output
diff --git a/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild b/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild
deleted file mode 100644
index da99522c6e38..000000000000
--- a/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-HOMEPAGE="https://ocaml.org/"
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
-
-LICENSE="QPL-1.0 LGPL-2"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="emacs flambda latex +ocamlopt xemacs"
-
-RDEPEND="sys-libs/binutils-libs:="
-BDEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
-	xemacs? ( app-xemacs/ocaml )"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}"/ocaml.conf "${T}" || die
-
-	# OCaml generates textrels on 32-bit arches
-	# We can't do anything about it, but disabling it means that tests
-	# for OCaml-based packages won't fail on unexpected output
-	# bug #773226
-	if use arm || use ppc || use x86 ; then
-		append-ldflags "-Wl,-z,notext"
-	fi
-
-	# Upstream build ignores LDFLAGS in several places.
-	sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
-		-e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
-		-e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
-		Makefile.config.in || die "LDFLAGS fix failed"
-}
-
-src_configure() {
-	local opt=(
-		--bindir="${EPREFIX}/usr/bin"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
-		--mandir="${EPREFIX}/usr/share/man"
-		--prefix="${EPREFIX}/usr"
-		$(use_enable flambda)
-	)
-
-	econf "${opt[@]}"
-}
-
-src_compile() {
-	env -u P emake world
-
-	if use ocamlopt ; then
-		env -u P emake opt
-		env -u P emake opt.opt
-	fi
-}
-
-src_test() {
-	emake -j
-
-	# OCaml tests only work when run sequentially
-	if use ocamlopt ; then
-		emake -j1 ocamltest.opt
-	else
-		emake -j1 ocamltest
-		#ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests."
-	fi
-
-	emake -j1 tests
-}
-
-src_install() {
-	default
-
-	dodir /usr/include
-	# Create symlink for header files
-	dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
-	dodoc Changes README.adoc
-
-	# Create envd entry for latex input files
-	if use latex ; then
-		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die
-		doenvd "${T}"/99ocamldoc
-	fi
-
-	sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die
-
-	# Install ocaml-rebuild portage set
-	insinto /usr/share/portage/config/sets
-	doins "${T}"/ocaml.conf
-}
diff --git a/dev-lang/ocaml/ocaml-4.12.1.ebuild b/dev-lang/ocaml/ocaml-4.12.1.ebuild
index da99522c6e38..287a7f38e79d 100644
--- a/dev-lang/ocaml/ocaml-4.12.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.12.1.ebuild
@@ -20,6 +20,10 @@ BDEPEND="${RDEPEND}
 PDEPEND="emacs? ( app-emacs/ocaml-mode )
 	xemacs? ( app-xemacs/ocaml )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.12.0-glibc-2.34.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/dev-lang/ocaml/ocaml-4.13.0.ebuild b/dev-lang/ocaml/ocaml-4.13.0.ebuild
deleted file mode 100644
index da99522c6e38..000000000000
--- a/dev-lang/ocaml/ocaml-4.13.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-HOMEPAGE="https://ocaml.org/"
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
-
-LICENSE="QPL-1.0 LGPL-2"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="emacs flambda latex +ocamlopt xemacs"
-
-RDEPEND="sys-libs/binutils-libs:="
-BDEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
-	xemacs? ( app-xemacs/ocaml )"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}"/ocaml.conf "${T}" || die
-
-	# OCaml generates textrels on 32-bit arches
-	# We can't do anything about it, but disabling it means that tests
-	# for OCaml-based packages won't fail on unexpected output
-	# bug #773226
-	if use arm || use ppc || use x86 ; then
-		append-ldflags "-Wl,-z,notext"
-	fi
-
-	# Upstream build ignores LDFLAGS in several places.
-	sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
-		-e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
-		-e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
-		Makefile.config.in || die "LDFLAGS fix failed"
-}
-
-src_configure() {
-	local opt=(
-		--bindir="${EPREFIX}/usr/bin"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
-		--mandir="${EPREFIX}/usr/share/man"
-		--prefix="${EPREFIX}/usr"
-		$(use_enable flambda)
-	)
-
-	econf "${opt[@]}"
-}
-
-src_compile() {
-	env -u P emake world
-
-	if use ocamlopt ; then
-		env -u P emake opt
-		env -u P emake opt.opt
-	fi
-}
-
-src_test() {
-	emake -j
-
-	# OCaml tests only work when run sequentially
-	if use ocamlopt ; then
-		emake -j1 ocamltest.opt
-	else
-		emake -j1 ocamltest
-		#ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests."
-	fi
-
-	emake -j1 tests
-}
-
-src_install() {
-	default
-
-	dodir /usr/include
-	# Create symlink for header files
-	dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
-	dodoc Changes README.adoc
-
-	# Create envd entry for latex input files
-	if use latex ; then
-		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die
-		doenvd "${T}"/99ocamldoc
-	fi
-
-	sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die
-
-	# Install ocaml-rebuild portage set
-	insinto /usr/share/portage/config/sets
-	doins "${T}"/ocaml.conf
-}
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index f80185c70a10..8f62de3d0bd9 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,13 +1,8 @@
-AUX perl-5.26.2-hppa.patch 3231 BLAKE2B d59eab55eea3daceb0d3df39778d43ebaee2c065c052ca048ec17c06fa90049eb7fd5ae40092f11248de25cdf9cff96dc69626e7f3269b24cf618004deeb5859 SHA512 24856ae3c637c58d16d543240f5028e137c33c7aeae7c0c3dfa1a69b621057a84ab4ddf8b12ac6ef251381af4b190c200262bec9bdaa6001199dbd1d15cf4bae
 AUX perl-5.34.0-crossfit.patch 388 BLAKE2B dda2f10732422857f1a3977b6aa6ec0536dffaa53658e23378083393a55cf283906ef8f41dde2eb83e0de4e5dfd6dcd06d6b236f0a91c44086172bcaf105396a SHA512 5da4dd913790bd125667851807da9e37dac9cda78cce18ecffb8780f42d30b65f46817633e65027f5438f1a39286139fcf961d4bc98caf70946152200c3e72ee
-DIST perl-5.32.0-patches-1.tar.xz 20220 BLAKE2B 46ebca5c74f59aa935ceec2a5807426c0e653ad7ba27de441d26e049e62dc67b17d58dfe5755f31bdd157e349d47fd46a98699207729f8f4f747930ed1064ba2 SHA512 42ed00f5f6be40af59e02691ff439a048cccd96fb970cca0976209faa921af98a773cc4cb1466e164328350d58cb46950ffa8c6f2fddabbeb3e8819349b06849
-DIST perl-5.32.1.tar.xz 12610988 BLAKE2B 9f89bcf9cffb245a0f2cb0afa17c25f092c84cc2f29bb1c744294c2f0393c72dc3beb9fcbe256cf252677b33bc594b294b3f6a4774ad9e30b771aceed1f4f147 SHA512 3443c75aea91f0fe3712fee576239f1946d2301b8f7390b690e2f5d070fe71af8f9fa7769e42086c2d33d5f84370f80368fa9350b4f10cc0ac3e6c1f6209d8f9
+AUX perl-5.34.0-gdbm-1.20.patch 1627 BLAKE2B 9cbe976f43134022aab2aca203ee6590af52ccf628fa240c00334b14f090d01959764cd7d495a39c59eb59cdf69b0e527900350450f9995d934769ee461aac33 SHA512 fc6481a6ccbef4a19a966453472bde0c5dd1ea321be2a9682eff009c7431e18043d2c75b26ef296232a5f4e310992fc8955d19aef439d9f30b42ba9e9c9d561e
 DIST perl-5.34.0-patches-1.tar.xz 20360 BLAKE2B e60074c49f357d4841708f58b5165a44201783238ff33ee81580bb83ba07d3d2dda447edd30a71ce8c9bafe5e5e0235b68e31a79081c3482bdd589231f0e898e SHA512 909e1fb22cda4ca769b51645b51a64df81b92210cfee388ac57834406bc13e404f0a1e6bad0888fafc73fc34b7fb224801fd02e87fb4c2f9145482ad74374e7b
 DIST perl-5.34.0.tar.xz 12881416 BLAKE2B 4139e77fbb38b2b72671c0b130233cf5ed35112bbba3301b8ed724739c7ff96b041752aa505b938e257ef6ebf98a9b6dad1858e00f756c841a0520688d974e9a SHA512 691b4b31eacec357191fba777612b4e3eae59e946a22998a50766697c0d61db1d42a9b3bc1e41abf0d1ca1893e4a7c06d7bf3290480cf03d7f79befd7a8a3267
-DIST perl-cross-1.3.4.tar.gz 108461 BLAKE2B 28f207d235f51ebf681598cf85f7f16923574aafb593426a59d67578135ee3632efb12b9e1a672759195a79f80e49f5c929ec42b2b4571b1d36f5d8c8dceadc2 SHA512 7e1fc7b2b19d8c2e2fb8615e074e218b2e1a4d276b563ffabccfd0c7398bc8680fca96da89cc61d611993f38a2c67dfbb0201c58658e05437395ad8c00d31874
 DIST perl-cross-1.3.6.tar.gz 110210 BLAKE2B 39074d6f4a526f59de2b1c40432936552e625a5a4e44fbb7ce3c1c3828b12c5298d1ab49b7d34ea92e2a4c8c88f8bbef8cc0c582a3fbbed975cf46d331e89c08 SHA512 d394fbd75d890442aa599eae8893a26540c8b7af966583ad1c3213c3fe0e074415cfed8814de8f397830833fd78267bdc55adc5267168198f269634c2ef3b982
-EBUILD perl-5.32.1.ebuild 25927 BLAKE2B f40fe88a214912fd791cbeb9fd3031227fa1caecbf8f0109821cb7309a902e3eeb56ff73db8c58643ca5f1b7fb5a9bba31bc3a2b1a639691506ba7c5f6f39ca4 SHA512 e1e69f8ae8fb62e334c53dc28c073246dba8698ae139a6bfd0cc4fdad4aee56b44d005dc3a022f02afda18371a2e88a5e15820148d1017c5a8224a2f118abaa0
-EBUILD perl-5.34.0-r1.ebuild 25937 BLAKE2B ab5b2e7a112a8c751a1df7c26272480236fe0e56346e2a4810a54c24b660859bb1a2c0dce8f5a420a9482ac031952138843602c556a354459d42c4e26a3078a3 SHA512 e8b16af390714ad9aeeff5a7e8ec5fe73612331b1459fda1caa2f16c17b25ee7d69df5d69ea5809cbf24f1d38a39942c095136c0f0815e5877cebb953c1827e6
 EBUILD perl-5.34.0-r2.ebuild 25961 BLAKE2B 52db67be3b652189eb95a96b9949cffcccaf3d518850e2874daf51407c3904076ff69f57508888c4cb82d2a6bb412717b81878bf5a89e1ab5e9e6ab327620547 SHA512 7f694dc10ae960869dab2b74464b0804f4b5ca197c59a914ed674a185fcfc434a363ff48bb9bea67a4b02bcd4ed134d39cf0e8700a17515d63d049d6ab9fd089
-EBUILD perl-5.34.0.ebuild 25814 BLAKE2B 3ffb3b2423b4dc3f1b7ae5d1b4d586c8add7c03702e9bd1d9de1688970848b8e5038a38fa0e9d62ad81f10c47f663b5c03bddd70321416eea689bf5912ce7828 SHA512 3a809bd06bc774ac5dd42c90cb24e2f08629449fa46731189d831270c860d75d1afb606a555ba67a9550baa3320dd7165a5219d69b7daac1ea1757e28057e5d5
+EBUILD perl-5.34.0-r3.ebuild 26141 BLAKE2B 9eb33f6777b266b9a617a06d14b89ec29ca7e3a0a3596d5955f1b5f9e10a05db45eb2883b782329317065f2e92fee4378e75faebcbf49ad83d13f7714d036dcd SHA512 f0a140c3536192d0198e54b7d2f7b2316eae2b065627fe96df8949d97e0e61c37406e0cac7c827a58002251235c2b21f75d5b32f4cdf874596e6ec0fcbbe7295
 MISC metadata.xml 431 BLAKE2B 89471506c7b258c1806338a5850ee9337f48b8e7497a3cad8b1e8bf18811152071d416732e0267e7d0c13386097990d1ca12bb0051deb7cb70403ab2e9bdb367 SHA512 87d2a0c6a10f71b243b1e9a79306ed0d440a7f447d84fe37f2bd3c40c60e8749fd9d7e97ad482e286153587b57d7db5d6a8df7cef94f332de7175f053dc843e1
diff --git a/dev-lang/perl/files/perl-5.26.2-hppa.patch b/dev-lang/perl/files/perl-5.26.2-hppa.patch
deleted file mode 100644
index 83ed944353e5..000000000000
--- a/dev-lang/perl/files/perl-5.26.2-hppa.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-https://bugs.gentoo.org/634162
-
-Source:
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=869122
-
-Index: perl-5.26.0/op.c
-===================================================================
---- perl-5.26.0.orig/op.c
-+++ perl-5.26.0/op.c
-@@ -14832,6 +14832,7 @@ Perl_custom_op_get_field(pTHX_ const OP
-     SV *keysv;
-     HE *he = NULL;
-     XOP *xop;
-+    XOPRETANY any;
- 
-     static const XOP xop_null = { 0, 0, 0, 0, 0 };
- 
-@@ -14874,58 +14875,37 @@ Perl_custom_op_get_field(pTHX_ const OP
- 	else
- 	    xop = INT2PTR(XOP *, SvIV(HeVAL(he)));
-     }
--    {
--	XOPRETANY any;
--	if(field == XOPe_xop_ptr) {
--	    any.xop_ptr = xop;
--	} else {
--	    const U32 flags = XopFLAGS(xop);
--	    if(flags & field) {
--		switch(field) {
--		case XOPe_xop_name:
--		    any.xop_name = xop->xop_name;
--		    break;
--		case XOPe_xop_desc:
--		    any.xop_desc = xop->xop_desc;
--		    break;
--		case XOPe_xop_class:
--		    any.xop_class = xop->xop_class;
--		    break;
--		case XOPe_xop_peep:
--		    any.xop_peep = xop->xop_peep;
--		    break;
--		default:
--		    NOT_REACHED; /* NOTREACHED */
--		    break;
--		}
--	    } else {
--		switch(field) {
--		case XOPe_xop_name:
--		    any.xop_name = XOPd_xop_name;
--		    break;
--		case XOPe_xop_desc:
--		    any.xop_desc = XOPd_xop_desc;
--		    break;
--		case XOPe_xop_class:
--		    any.xop_class = XOPd_xop_class;
--		    break;
--		case XOPe_xop_peep:
--		    any.xop_peep = XOPd_xop_peep;
--		    break;
--		default:
--		    NOT_REACHED; /* NOTREACHED */
--		    break;
--		}
--	    }
-+
-+    if(field == XOPe_xop_ptr) {
-+        any.xop_ptr = xop;
-+    } else {
-+        const U32 flags = XopFLAGS(xop);
-+        switch(field) {
-+        case XOPe_xop_name:
-+            any.xop_name = (flags & field) ? xop->xop_name : XOPd_xop_name;
-+            break;
-+        case XOPe_xop_desc:
-+            any.xop_desc = (flags & field) ? xop->xop_desc : XOPd_xop_desc;
-+            break;
-+        case XOPe_xop_class:
-+            any.xop_class = (flags & field) ? xop->xop_class : XOPd_xop_class;
-+            break;
-+        case XOPe_xop_peep:
-+            any.xop_peep = (flags & field) ? xop->xop_peep : XOPd_xop_peep;
-+            break;
-+        default:
-+            NOT_REACHED; /* NOTREACHED */
-+            break;
- 	}
--        /* On some platforms (HP-UX, IA64) gcc emits a warning for this function:
--         * op.c: In function 'Perl_custom_op_get_field':
--         * op.c:...: warning: 'any.xop_name' may be used uninitialized in this function [-Wmaybe-uninitialized]
--         * This is because on those platforms (with -DEBUGGING) NOT_REACHED
--         * expands to assert(0), which expands to ((0) ? (void)0 :
--         * __assert(...)), and gcc doesn't know that __assert can never return. */
--	return any;
-     }
-+
-+    /* On some platforms (HP-UX, IA64) gcc emits a warning for this function:
-+     * op.c: In function 'Perl_custom_op_get_field':
-+     * op.c:...: warning: 'any.xop_name' may be used uninitialized in this function [-Wmaybe-uninitialized]
-+     * This is because on those platforms (with -DEBUGGING) NOT_REACHED
-+     * expands to assert(0), which expands to ((0) ? (void)0 :
-+     * __assert(...)), and gcc doesn't know that __assert can never return. */
-+    return any;
- }
- 
- /*
diff --git a/dev-lang/perl/files/perl-5.34.0-gdbm-1.20.patch b/dev-lang/perl/files/perl-5.34.0-gdbm-1.20.patch
new file mode 100644
index 000000000000..fc4c55c6899f
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.34.0-gdbm-1.20.patch
@@ -0,0 +1,40 @@
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Wed, 23 Jun 2021 10:26:50 +0300
+Subject: Fix GDBM_File to compile with version 1.20 and earlier
+
+* ext/GDBM_File/GDBM_File.xs (ITEM_NOT_FOUND): Define conditionally,
+depending on the GDBM_VERSION_MAJOR and GDBM_VERSION_MINOR.
+Don't assume GDBM_ITEM_NOT_FOUND is a define (it isn't since
+gdbm commit d3e27957).
+
+Origin: backport, https://github.com/Perl/perl5/pull/18924/commits/aacd2398e766500cb5d83c4d76b642fcf31d997a
+Bug: https://github.com/Perl/perl5/issues/18915
+Bug-Debian: https://bugs.debian.org/993514
+---
+ ext/GDBM_File/GDBM_File.xs | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs
+index cd0bb6f..494c288 100644
+--- a/ext/GDBM_File/GDBM_File.xs
++++ b/ext/GDBM_File/GDBM_File.xs
+@@ -145,14 +145,13 @@ output_datum(pTHX_ SV *arg, char *str, int size)
+ #define gdbm_setopt(db,optflag,optval,optlen) not_here("gdbm_setopt")
+ #endif
+ 
+-#ifndef GDBM_ITEM_NOT_FOUND
+-# define GDBM_ITEM_NOT_FOUND GDBM_NO_ERROR
+-#endif
+-
++#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13        
+ /* Prior to 1.13, gdbm_fetch family functions set gdbm_errno to GDBM_NO_ERROR
+    if the requested key did not exist */
+-#define ITEM_NOT_FOUND()                                                \
+-    (gdbm_errno == GDBM_ITEM_NOT_FOUND || gdbm_errno == GDBM_NO_ERROR)
++# define ITEM_NOT_FOUND()  (gdbm_errno == GDBM_NO_ERROR)
++#else
++# define ITEM_NOT_FOUND()  (gdbm_errno == GDBM_ITEM_NOT_FOUND)
++#endif
+ 
+ #define CHECKDB(db) do {                        \
+     if (!db->dbp) {                             \
diff --git a/dev-lang/perl/perl-5.32.1.ebuild b/dev-lang/perl/perl-5.32.1.ebuild
deleted file mode 100644
index 97963cf4402c..000000000000
--- a/dev-lang/perl/perl-5.32.1.ebuild
+++ /dev/null
@@ -1,822 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-
-PATCH_VER=1
-CROSS_VER=1.3.4
-PATCH_BASE="perl-5.32.0-patches-${PATCH_VER}"
-PATCH_DEV=kentnl
-
-DIST_AUTHOR=XSAWYERX
-
-# Greatest first, don't include yourself
-# Devel point-releases are not ABI-intercompatible, but stable point releases are
-# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
-PERL_BIN_OLDVERSEN=""
-
-# Yes we can.
-PERL_SINGLE_SLOT=y
-
-if [[ "${PV##*.}" == "9999" ]]; then
-	DIST_VERSION=5.30.0
-else
-	DIST_VERSION="${PV/_rc/-RC}"
-fi
-SHORT_PV="${DIST_VERSION%.*}"
-# Even numbered major versions are ABI intercompatible
-# Odd numbered major versions are not
-if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
-	SUBSLOT="${DIST_VERSION%-RC*}"
-else
-	SUBSLOT="${DIST_VERSION%.*}"
-fi
-# Used only in tar paths
-MY_P="perl-${DIST_VERSION}"
-# Used in library paths
-MY_PV="${DIST_VERSION%-RC*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/5.0/${MY_P}.tar.xz
-	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
-	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
-	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
-"
-HOMEPAGE="https://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0/${SUBSLOT}"
-
-if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-# SOMEWHAT EXPERIMENTAL CODE, DO NOT USE WITHOUT AN ADULT PRESENT, CHECK CHANGELOG
-# FOR DETAILS
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="berkdb debug doc gdbm ithreads minimal"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
-	app-arch/bzip2
-	sys-libs/zlib
-	virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-PDEPEND="
-	!minimal? (
-		>=app-admin/perl-cleaner-2.5
-		>=virtual/perl-File-Temp-0.230.400-r2
-		>=virtual/perl-Data-Dumper-2.154.0
-		virtual/perl-Test-Harness
-	)
-"
-# bug 390719, bug 523624
-# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual      perl-core/Archive-Tar        2.360.0       ptar ptardiff ptargrep
-	src_remove_dual      perl-core/CPAN               2.270.0       cpan
-	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
-	src_remove_dual      perl-core/Encode             3.60.0        enc2xs piconv
-	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.440.0       instmodsh
-	src_remove_dual      perl-core/ExtUtils-ParseXS   3.400.0       xsubpp
-	src_remove_dual      perl-core/IO-Compress        2.93.0        zipdetails
-	src_remove_dual      perl-core/JSON-PP            4.40.0        json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.202.101.23  corelist
-	src_remove_dual      perl-core/Pod-Checker        1.730.0       podchecker
-	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
-	src_remove_dual      perl-core/Pod-Usage          1.690.0       pod2usage
-	src_remove_dual      perl-core/Test-Harness       3.420.0       prove
-	src_remove_dual      perl-core/podlators          4.140.0       pod2man pod2text
-	src_remove_dual_man  perl-core/podlators          4.140.0       /usr/share/man/man1/perlpodstyle.1
-}
-
-check_rebuild() {
-	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
-	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl the installed Perl modules"
-		ewarn "have to be re-installed. In most cases, this is done automatically"
-		ewarn "by the package manager, but subsequent steps are still recommended"
-		ewarn "to ensure system consistency."
-		ewarn
-		ewarn "You should start with a depclean to remove any unused perl dependencies"
-		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
-		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
-		ewarn "Recommended: emerge --depclean -va"
-		ewarn
-		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
-		ewarn "remaining rebuilds portage may have missed."
-		ewarn "Use: perl-cleaner --all"
-		return 0;
-
-	# Reinstall w/ USE Change
-	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-		echo ""
-		ewarn "TOGGLED USE-FLAGS WARNING:"
-		ewarn "You changed one of the use-flags ithreads or debug."
-		ewarn "You must rebuild all perl-modules installed."
-		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-	fi
-}
-
-pkg_setup() {
-	case ${CHOST} in
-		*-freebsd*)   osname="freebsd" ;;
-		*-dragonfly*) osname="dragonfly" ;;
-		*-netbsd*)    osname="netbsd" ;;
-		*-openbsd*)   osname="openbsd" ;;
-		*-darwin*)    osname="darwin" ;;
-		*-solaris*)   osname="solaris" ;;
-		*-cygwin*)    osname="cygwin" ;;
-		*)            osname="linux" ;;
-	esac
-
-	myarch="${CHOST%%-*}-${osname}"
-	if use debug ; then
-		myarch+="-debug"
-	fi
-	if use ithreads ; then
-		mythreading="-multi"
-		myarch+="-thread"
-	fi
-
-	PRIV_BASE="/usr/$(get_libdir)/perl5"
-	SITE_BASE="/usr/local/$(get_libdir)/perl5"
-	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-
-	# This ENV var tells perl to build with a directory like "5.30"
-	# regardless of its patch version. This is for experts only
-	# at this point.
-	if [[ -z "${PERL_SINGLE_SLOT}" ]]; then
-		PRIV_LIB="${PRIV_BASE}/${MY_PV}"
-		ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
-		SITE_LIB="${SITE_BASE}/${MY_PV}"
-		SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
-		VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
-		VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
-	else
-		PRIV_LIB="${PRIV_BASE}/${SUBSLOT}"
-		ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-		SITE_LIB="${SITE_BASE}/${SUBSLOT}"
-		SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-		VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}"
-		VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-	fi
-
-	dual_scripts
-}
-
-src_remove_dual_file() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
-			done
-			;;
-		setup)
-			for i in "$@" ; do
-				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
-					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
-					break
-				fi
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i}{,-${ver}-${P}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual_man() {
-	local i pkg ver ff
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
-				ff=${ff##*${i#${i%.[0-9]}}}
-				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	for i in "$@" ; do
-		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
-		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
-	done
-}
-
-src_prepare_perlcross() {
-	cp -a ../perl-cross-${CROSS_VER}/* . || die
-
-	# bug 604072
-	MAKEOPTS+=" -j1"
-	export MAKEOPTS
-}
-src_prepare_dynamic() {
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
-	ln -s ${LIBPERL} libperl$(get_libname ) || die
-}
-
-# Copy a patch into the patch series
-# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug']
-# - description is optional, but recommended
-# - all arguments after descriptions are bug URLs
-add_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local src_name dest_name desc
-	src_name="$1"
-	dest_name="$2"
-	desc="$3"
-	shift; shift; shift;
-	einfo "Adding ${dest_name} to patch bundle"
-	cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}"
-	if [[ -n "${desc}" ]]; then
-		printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc"
-	fi
-	if [[ $# -gt 0 ]]; then
-		# Note: when $@ is more than one element, this emits a
-		# line for each element
-		printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs"
-	fi
-}
-# Remove a patch using a glob expr
-# eg:
-#	 rm_patch *-darin-Use-CC*
-#
-rm_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local expr="$1"
-	local patch="$( cd "${patchdir}"; echo $expr )"
-	einfo "Removing $patch ($expr) from patch bundle"
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )"
-	else
-		ewarn "No ${expr} found in ${patchdir} to remove"
-	fi
-}
-# Yes, this is a reasonable amount of code for something seemingly simple
-# but this is far easier to debug when things go wrong, and things went wrong
-# multiple times while I was getting the exact number of slashes right, which
-# requires circumnavigating both bash and sed escape mechanisms.
-c_escape_string() {
-	local slash dquote
-	slash='\'
-	dquote='"'
-	re_slash="${slash}${slash}"
-	re_dquote="${slash}${dquote}"
-
-	# Convert \ to \\,
-	#         " to \"
-	echo "$1" |\
-		sed "s|${re_slash}|${re_slash}${re_slash}|g" |\
-		sed "s|${re_dquote}|${re_slash}${re_dquote}|g"
-}
-c_escape_file() {
-	c_escape_string "$(cat "$1")"
-}
-
-apply_patchdir() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local patchoutput="patchlevel-gentoo.h"
-
-	# Inject Patch-Level info into description for patchlevel.h patch
-	# to show in -V
-	local patch_expr="*List-packaged-patches*"
-	local patch="$( cd "${patchdir}"; echo $patch_expr )";
-	einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )"
-
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\
-			>"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc"
-	else
-		eerror "No $patch_expr found in ${patchdir}"
-	fi
-
-	# Compute patch list to apply
-	# different name other than PATCHES to stop default
-	# reapplying it
-	# Single depth is currently only supported, as artifacts can reside
-	# from the old layout being multiple-directories, as well as it grossly
-	# simplifying the patchlevel_gentoo.h generation.
-	local PERL_PATCHES=($(
-		find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\
-			grep -E '[.](diff|patch)$' |\
-			sort -n
-	))
-
-	for patch in "${PERL_PATCHES[@]}"; do
-		eapply "${WORKDIR}"/patches/${patch}
-	done
-
-	einfo "Generating $patchoutput"
-
-	# This code creates a header file, each iteration
-	# creates one-or-more-lines for each entry found in PERL_PATCHES
-	# and STDOUT is redirected to the .h file
-	for patch in "${PERL_PATCHES[@]}"; do
-		local desc_f="${infodir}/${patch}.desc"
-		local bugs_f="${infodir}/${patch}.bugs"
-
-		printf ',"%s"\n' "${patch}"
-		if [[ ! -e "${desc_f}" ]]; then
-			ewarn "No description provided for ${patch} (expected: ${desc_f} )"
-		else
-			local desc="$(c_escape_file "${desc_f}")"
-			printf ',"- %s"\n' "${desc}"
-		fi
-		if [[ -e "${bugs_f}" ]]; then
-			while read -d $'\n' -r line; do
-				local esc_line="$(c_escape_string "${line}")"
-				printf ',"- Bug: %s"\n' "${esc_line}"
-			done <"${bugs_f}"
-		fi
-	done > "${S}/${patchoutput}"
-	printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST"
-
-}
-src_prepare() {
-	local patchdir="${WORKDIR}/patches"
-
-	# Prepare Patch dir with additional patches / remove unwanted patches
-	# Inject bug/desc entries for perl -V
-	if use hppa ; then
-		# bug 634162
-		add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\
-			"Fix broken miniperl on hppa"\
-			"https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162"
-	fi
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# do NOT mess with nsl, on Solaris this is always necessary,
-		# when -lsocket is used e.g. to get h_errno
-		rm_patch "*-nsl-and-cl*"
-	fi
-
-	apply_patchdir
-
-	tc-is-cross-compiler && src_prepare_perlcross
-
-	tc-is-static-only || src_prepare_dynamic
-
-	if use gdbm; then
-		sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \
-			ext/NDBM_File/Makefile.PL || die
-	fi
-
-	# Use errno.h from prefix rather than from host system, bug #645804
-	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
-		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# set a soname, fix linking against just built libperl
-		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name (soname) not to reference $D
-		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
-	fi
-
-	default
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-# Outputs a list of versions which have been seen in any of the
-# primary perl @INC prefix paths, such as:
-#  /usr/lib64/perl5/<NUMBER>
-#  /usr/local/lib64/perl5/<NUMBER>
-#  /usr/lib64/perl5/vendor_perl/<NUMBER>
-#
-# All values of NUMBER must be like "5.x.y", unless PERL_SUPPORT_SINGLE_SLOT
-# is enabled, where it will also allow numbers like "5.x"
-#
-# PERL_SUPPORT_SINGLE_SLOT should only be used to transition *away* from PERL_SINGLE_SLOT
-# if you used that.
-find_candidate_inc_versions() {
-	local regex='.*/5[.][0-9]+[.][0-9]+$';
-	if [[ ! -z "${PERL_SUPPORT_SINGLE_SLOT}" || ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
-	fi
-	local dirs=(
-		"${EROOT}${PRIV_BASE}"
-		"${EROOT}${SITE_BASE}"
-		"${EROOT}${VENDOR_BASE}"
-	)
-	for dir in "${dirs[@]}"; do
-		if [[ ! -e "${dir}" ]]; then
-			continue
-		fi
-		# Without access to readdir() on these dirs, find will not be able
-		# to reveal any @INC directories inside them, and will subsequently prune
-		# them from the built perl's @INC support, breaking our compatiblity options
-		# entirely.
-		if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then
-			eerror "Bad permissions on ${dir}, this will probably break things"
-			eerror "Ensure ${dir} is +rx for at least uid=$EUID"
-			eerror "Recommended permission is +rx for all"
-			eerror "> chmod o+rx ${dir}"
-		fi
-	done
-	einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}"
-	find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f "  2>/dev/null
-}
-# Sort versions passed versiony-ly, remove self-version if present
-# dedup. Takes each version as an argument
-sanitize_inc_versions() {
-	local vexclude="${DIST_VERSION%-RC}"
-	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		vexclude="${SUBSLOT}"
-	fi
-	einfo "Normalizing/Sorting candidate list: $*"
-	einfo " to remove '${vexclude}'"
-	# Note, general numeric sort has to be used
-	# for the last component, or unique will convert
-	#  5.30.0 + 5.30 into just 5.30
-	printf "%s\n" "$@" |\
-		grep -vxF "${vexclude}" |\
-		sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg
-}
-
-versions_to_inclist() {
-	local oldv="${PERL_BIN_OLDVERSEN}"
-	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-	fi
-	for v;	do
-			has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ ";
-			echo -n "${v}/ ";
-	done
-}
-versions_to_gentoolibdirs() {
-	local oldv="${PERL_BIN_OLDVERSEN}"
-	local root
-	local v
-	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-	fi
-	for v;	do
-		for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
-			local fullpath="${EROOT}${root}/${v}"
-			if [[ -e "${fullpath}" ]]; then
-				has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}";
-				printf "%s:" "${fullpath}"
-			fi
-		done
-	done
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
-
-	# Perl has problems compiling with -Os in your flags with glibc
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-
-	# xlocale.h is going away in glibc-2.26, so it's counterproductive
-	# if we use it and include it in CORE/perl.h ... Perl builds just
-	# fine with glibc and locale.h only.
-	# However, the darwin prefix people have no locale.h ...
-	use elibc_glibc && myconf -Ui_xlocale
-
-	# This flag makes compiling crash in interesting ways
-	filter-flags "-malign-double"
-
-	# Generic LTO broken since 5.28, triggers EUMM failures
-	filter-flags "-flto"
-
-	use sparc && myconf -Ud_longdbl
-
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=${EROOT}/usr/include
-	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
-
-	export BUILD_ZLIB=False
-	export ZLIB_INCLUDE=${EROOT}/usr/include
-	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-	if use gdbm ; then
-		mygdbm='D'
-		if use berkdb ; then
-			myndbm='D'
-		fi
-	fi
-	if use berkdb ; then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
-	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf -Ui_db -Ui_ndbm
-	fi
-
-	use ithreads && myconf -Dusethreads
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	# modifying 'optimize' prevents cross configure script from appending required flags
-	if tc-is-cross-compiler; then
-		append-cflags "-fwrapv -fno-strict-aliasing"
-	fi
-
-	# Autodiscover all old version directories, some of them will even be newer
-	# if you downgrade
-	if [[ -z ${PERL_OLDVERSEN} ]]; then
-		PERL_OLDVERSEN="$( find_candidate_inc_versions )"
-	fi
-
-	# Fixup versions, removing self match, fixing order and dupes
-	PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )"
-
-	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
-	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
-		local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )"
-		einfo "This version of perl may partially support modules previously"
-		einfo "installed in any of the following paths:"
-		for incpath in ${inclist}; do
-			[[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}"
-			[[ -e "${EROOT}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}"
-			[[ -e "${EROOT}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}"
-		done
-		einfo "This is a temporary measure and you should aim to cleanup these paths"
-		einfo "via world updates and perl-cleaner"
-		# myconf -Dinc_version_list="${inclist}"
-		myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )"
-	fi
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
-	# Make sure we can do the final link #523730, need to set deployment
-	# target to override hardcoded 10.3 which breaks on modern OSX
-	[[ ${CHOST} == *-darwin* ]] && \
-		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
-
-	# Older macOS with non-Apple GCC chokes on inline in system headers
-	# using c89 mode as injected by cflags.SH
-	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
-		append-cflags -Dinline=__inline__
-
-	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
-	[[ ${CHOST} == sparc-*-solaris* ]] && \
-		myconf -Ud_flock
-
-	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
-	# Prefix itself we don't do multilib either, so make sure perl can find
-	# something compatible.
-	if use prefix ; then
-		# Set a hook to check for each detected library whether it actually works.
-		export libscheck="
-			( echo 'main(){}' > '${T}'/conftest.c &&
-				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
-			) || xxx=/dev/null"
-
-		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
-		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
-		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
-	elif [[ $(get_libdir) != "lib" ]] ; then
-		# We need to use " and not ', as the written config.sh use ' ...
-		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
-	fi
-
-	# don't try building ODBM, bug #354453
-	disabled_extensions="ODBM_File"
-
-	if ! use gdbm ; then
-		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
-		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
-	fi
-
-	myconf -Dnoextensions="${disabled_extensions}"
-
-	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
-
-	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
-	# allow fiddling via EXTRA_ECONF, bug 558070
-	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-
-	# setting -Dld= to tc-getLD breaks perl and all perl things
-	# https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
-	myconf \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Dar="$(tc-getAR)" \
-		-Dnm="$(tc-getNM)" \
-		-Dcpp="$(tc-getCPP)" \
-		-Dranlib="$(tc-getRANLIB)" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix="${EPREFIX}"'/usr' \
-		-Dsiteprefix="${EPREFIX}"'/usr/local' \
-		-Dvendorprefix="${EPREFIX}"'/usr' \
-		-Dscriptdir="${EPREFIX}"'/usr/bin' \
-		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
-		-Darchlib="${EPREFIX}${ARCH_LIB}" \
-		-Dsitelib="${EPREFIX}${SITE_LIB}" \
-		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
-		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
-		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
-		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
-		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
-		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth="${EPREFIX}"'/usr/include ' \
-		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Ud_csh \
-		-Dsh="${EPREFIX}"/bin/sh \
-		-Dtargetsh="${EPREFIX}"/bin/sh \
-		-Uusenm \
-		"${myconf[@]}" \
-		"${EXTRA_ECONF[@]}"
-
-	if tc-is-cross-compiler; then
-		./configure \
-			--target="${CHOST}" \
-			--build="${CBUILD}" \
-			-Dinstallprefix='' \
-			-Dinstallusrbinperl='undef' \
-			-Dusevendorprefix='define' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	else
-		sh Configure \
-			-des \
-			-Dinstallprefix="${EPREFIX}"'/usr' \
-			-Dinstallusrbinperl='n' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	fi
-}
-
-src_test() {
-	export NO_GENTOO_NETWORK_TESTS=1;
-	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
-	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	use elibc_uclibc && export MAKEOPTS+=" -j1"
-	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-	emake DESTDIR="${D}" install
-
-	rm -f "${ED}/usr/bin/perl${MY_PV}"
-	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
-
-	if ! tc-is-static-only ; then
-		dolib.so "${ED}"${coredir}/${LIBPERL}
-		rm -f "${ED}"${coredir}/${LIBPERL}
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
-
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
-	fi
-
-	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-	# This removes ${D} from Config.pm
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	dodoc Changes* README AUTHORS
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${ED}/usr/share/doc/${PF}/html"
-	fi
-
-	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
-
-	dual_scripts
-}
-
-pkg_preinst() {
-	check_rebuild
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ "${ROOT}" = "/" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
-		einfo "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-
-	fi
-}
-
-pkg_postrm() {
-	dual_scripts
-}
diff --git a/dev-lang/perl/perl-5.34.0-r1.ebuild b/dev-lang/perl/perl-5.34.0-r1.ebuild
deleted file mode 100644
index 8f4017c8989f..000000000000
--- a/dev-lang/perl/perl-5.34.0-r1.ebuild
+++ /dev/null
@@ -1,822 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-
-PATCH_VER=1
-CROSS_VER=1.3.6
-PATCH_BASE="perl-5.34.0-patches-${PATCH_VER}"
-PATCH_DEV=dilfridge
-
-DIST_AUTHOR=XSAWYERX
-
-# Greatest first, don't include yourself
-# Devel point-releases are not ABI-intercompatible, but stable point releases are
-# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
-PERL_BIN_OLDVERSEN=""
-
-# Yes we can.
-PERL_SINGLE_SLOT=y
-
-if [[ "${PV##*.}" == "9999" ]]; then
-	DIST_VERSION=5.30.0
-else
-	DIST_VERSION="${PV/_rc/-RC}"
-fi
-SHORT_PV="${DIST_VERSION%.*}"
-# Even numbered major versions are ABI intercompatible
-# Odd numbered major versions are not
-if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
-	SUBSLOT="${DIST_VERSION%-RC*}"
-else
-	SUBSLOT="${DIST_VERSION%.*}"
-fi
-# Used only in tar paths
-MY_P="perl-${DIST_VERSION}"
-# Used in library paths
-MY_PV="${DIST_VERSION%-RC*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/5.0/${MY_P}.tar.xz
-	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
-	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
-	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
-"
-HOMEPAGE="https://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0/${SUBSLOT}"
-
-if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="berkdb debug doc gdbm ithreads minimal"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
-	app-arch/bzip2
-	sys-libs/zlib
-	virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-PDEPEND="
-	!minimal? (
-		>=app-admin/perl-cleaner-2.5
-		>=virtual/perl-File-Temp-0.230.400-r2
-		>=virtual/perl-Data-Dumper-2.154.0
-		virtual/perl-Test-Harness
-	)
-"
-# bug 390719, bug 523624
-# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual      perl-core/Archive-Tar        2.380.0       ptar ptardiff ptargrep
-	src_remove_dual      perl-core/CPAN               2.280.0       cpan
-	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
-	src_remove_dual      perl-core/Encode             3.80.0        enc2xs piconv
-	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.620.0       instmodsh
-	src_remove_dual      perl-core/ExtUtils-ParseXS   3.430.0       xsubpp
-	src_remove_dual      perl-core/IO-Compress        2.102.0        zipdetails
-	src_remove_dual      perl-core/JSON-PP            4.60.0        json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.202.105.200 corelist
-	src_remove_dual      perl-core/Pod-Checker        1.740.0       podchecker
-	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
-	src_remove_dual      perl-core/Pod-Usage          2.10.0       pod2usage
-	src_remove_dual      perl-core/Test-Harness       3.430.0       prove
-	src_remove_dual      perl-core/podlators          4.140.0       pod2man pod2text
-	src_remove_dual_man  perl-core/podlators          4.140.0       /usr/share/man/man1/perlpodstyle.1
-}
-
-check_rebuild() {
-	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
-	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl the installed Perl modules"
-		ewarn "have to be re-installed. In most cases, this is done automatically"
-		ewarn "by the package manager, but subsequent steps are still recommended"
-		ewarn "to ensure system consistency."
-		ewarn
-		ewarn "You should start with a depclean to remove any unused perl dependencies"
-		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
-		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
-		ewarn "Recommended: emerge --depclean -va"
-		ewarn
-		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
-		ewarn "remaining rebuilds portage may have missed."
-		ewarn "Use: perl-cleaner --all"
-		return 0;
-
-	# Reinstall w/ USE Change
-	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-		echo ""
-		ewarn "TOGGLED USE-FLAGS WARNING:"
-		ewarn "You changed one of the use-flags ithreads or debug."
-		ewarn "You must rebuild all perl-modules installed."
-		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-	fi
-}
-
-pkg_setup() {
-	case ${CHOST} in
-		*-freebsd*)   osname="freebsd" ;;
-		*-dragonfly*) osname="dragonfly" ;;
-		*-netbsd*)    osname="netbsd" ;;
-		*-openbsd*)   osname="openbsd" ;;
-		*-darwin*)    osname="darwin" ;;
-		*-solaris*)   osname="solaris" ;;
-		*-cygwin*)    osname="cygwin" ;;
-		*)            osname="linux" ;;
-	esac
-
-	myarch="${CHOST%%-*}-${osname}"
-	if use debug ; then
-		myarch+="-debug"
-	fi
-	if use ithreads ; then
-		mythreading="-multi"
-		myarch+="-thread"
-	fi
-
-	PRIV_BASE="/usr/$(get_libdir)/perl5"
-	SITE_BASE="/usr/local/$(get_libdir)/perl5"
-	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-
-	# This ENV var tells perl to build with a directory like "5.30"
-	# regardless of its patch version. This is for experts only
-	# at this point.
-	if [[ -z "${PERL_SINGLE_SLOT}" ]]; then
-		PRIV_LIB="${PRIV_BASE}/${MY_PV}"
-		ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
-		SITE_LIB="${SITE_BASE}/${MY_PV}"
-		SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
-		VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
-		VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
-	else
-		PRIV_LIB="${PRIV_BASE}/${SUBSLOT}"
-		ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-		SITE_LIB="${SITE_BASE}/${SUBSLOT}"
-		SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-		VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}"
-		VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-	fi
-
-	dual_scripts
-}
-
-src_remove_dual_file() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
-			done
-			;;
-		setup)
-			for i in "$@" ; do
-				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
-					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
-					break
-				fi
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i}{,-${ver}-${P}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual_man() {
-	local i pkg ver ff
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
-				ff=${ff##*${i#${i%.[0-9]}}}
-				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	for i in "$@" ; do
-		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
-		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
-	done
-}
-
-src_prepare_perlcross() {
-	cp -a ../perl-cross-${CROSS_VER}/* . || die
-
-	# bug 794463, needs further analysis what is exactly wrong here
-	eapply "${FILESDIR}/perl-5.34.0-crossfit.patch"
-
-	# bug 604072
-	MAKEOPTS+=" -j1"
-	export MAKEOPTS
-}
-src_prepare_dynamic() {
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
-	ln -s ${LIBPERL} libperl$(get_libname ) || die
-}
-
-# Copy a patch into the patch series
-# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug']
-# - description is optional, but recommended
-# - all arguments after descriptions are bug URLs
-add_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local src_name dest_name desc
-	src_name="$1"
-	dest_name="$2"
-	desc="$3"
-	shift; shift; shift;
-	einfo "Adding ${dest_name} to patch bundle"
-	cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}"
-	if [[ -n "${desc}" ]]; then
-		printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc"
-	fi
-	if [[ $# -gt 0 ]]; then
-		# Note: when $@ is more than one element, this emits a
-		# line for each element
-		printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs"
-	fi
-}
-# Remove a patch using a glob expr
-# eg:
-#	 rm_patch *-darin-Use-CC*
-#
-rm_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local expr="$1"
-	local patch="$( cd "${patchdir}"; echo $expr )"
-	einfo "Removing $patch ($expr) from patch bundle"
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )"
-	else
-		ewarn "No ${expr} found in ${patchdir} to remove"
-	fi
-}
-# Yes, this is a reasonable amount of code for something seemingly simple
-# but this is far easier to debug when things go wrong, and things went wrong
-# multiple times while I was getting the exact number of slashes right, which
-# requires circumnavigating both bash and sed escape mechanisms.
-c_escape_string() {
-	local slash dquote
-	slash='\'
-	dquote='"'
-	re_slash="${slash}${slash}"
-	re_dquote="${slash}${dquote}"
-
-	# Convert \ to \\,
-	#         " to \"
-	echo "$1" |\
-		sed "s|${re_slash}|${re_slash}${re_slash}|g" |\
-		sed "s|${re_dquote}|${re_slash}${re_dquote}|g"
-}
-c_escape_file() {
-	c_escape_string "$(cat "$1")"
-}
-
-apply_patchdir() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local patchoutput="patchlevel-gentoo.h"
-
-	# Inject Patch-Level info into description for patchlevel.h patch
-	# to show in -V
-	local patch_expr="*List-packaged-patches*"
-	local patch="$( cd "${patchdir}"; echo $patch_expr )";
-	einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )"
-
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\
-			>"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc"
-	else
-		eerror "No $patch_expr found in ${patchdir}"
-	fi
-
-	# Compute patch list to apply
-	# different name other than PATCHES to stop default
-	# reapplying it
-	# Single depth is currently only supported, as artifacts can reside
-	# from the old layout being multiple-directories, as well as it grossly
-	# simplifying the patchlevel_gentoo.h generation.
-	local PERL_PATCHES=($(
-		find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\
-			grep -E '[.](diff|patch)$' |\
-			sort -n
-	))
-
-	for patch in "${PERL_PATCHES[@]}"; do
-		eapply "${WORKDIR}"/patches/${patch}
-	done
-
-	einfo "Generating $patchoutput"
-
-	# This code creates a header file, each iteration
-	# creates one-or-more-lines for each entry found in PERL_PATCHES
-	# and STDOUT is redirected to the .h file
-	for patch in "${PERL_PATCHES[@]}"; do
-		local desc_f="${infodir}/${patch}.desc"
-		local bugs_f="${infodir}/${patch}.bugs"
-
-		printf ',"%s"\n' "${patch}"
-		if [[ ! -e "${desc_f}" ]]; then
-			ewarn "No description provided for ${patch} (expected: ${desc_f} )"
-		else
-			local desc="$(c_escape_file "${desc_f}")"
-			printf ',"- %s"\n' "${desc}"
-		fi
-		if [[ -e "${bugs_f}" ]]; then
-			while read -d $'\n' -r line; do
-				local esc_line="$(c_escape_string "${line}")"
-				printf ',"- Bug: %s"\n' "${esc_line}"
-			done <"${bugs_f}"
-		fi
-	done > "${S}/${patchoutput}"
-	printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST"
-
-}
-src_prepare() {
-	local patchdir="${WORKDIR}/patches"
-
-	# Prepare Patch dir with additional patches / remove unwanted patches
-	# Inject bug/desc entries for perl -V
-	# Old example:
-	# add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\
-	#		"Fix broken miniperl on hppa"\
-	#		"https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162"
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# do NOT mess with nsl, on Solaris this is always necessary,
-		# when -lsocket is used e.g. to get h_errno
-		rm_patch "*-nsl-and-cl*"
-	fi
-
-	apply_patchdir
-
-	tc-is-cross-compiler && src_prepare_perlcross
-
-	tc-is-static-only || src_prepare_dynamic
-
-	if use gdbm; then
-		sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \
-			ext/NDBM_File/Makefile.PL || die
-	fi
-
-	# Use errno.h from prefix rather than from host system, bug #645804
-	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
-		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# set a soname, fix linking against just built libperl
-		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name (soname) not to reference $D
-		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
-	fi
-
-	default
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-# Outputs a list of versions which have been seen in any of the
-# primary perl @INC prefix paths, such as:
-#  /usr/lib64/perl5/<NUMBER>
-#  /usr/local/lib64/perl5/<NUMBER>
-#  /usr/lib64/perl5/vendor_perl/<NUMBER>
-#
-# All values of NUMBER must be like "5.x.y", unless PERL_SUPPORT_SINGLE_SLOT
-# is enabled, where it will also allow numbers like "5.x"
-#
-# PERL_SUPPORT_SINGLE_SLOT should only be used to transition *away* from PERL_SINGLE_SLOT
-# if you used that.
-find_candidate_inc_versions() {
-	local regex='.*/5[.][0-9]+[.][0-9]+$';
-	if [[ ! -z "${PERL_SUPPORT_SINGLE_SLOT}" || ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
-	fi
-	local dirs=(
-		"${EROOT}${PRIV_BASE}"
-		"${EROOT}${SITE_BASE}"
-		"${EROOT}${VENDOR_BASE}"
-	)
-	for dir in "${dirs[@]}"; do
-		if [[ ! -e "${dir}" ]]; then
-			continue
-		fi
-		# Without access to readdir() on these dirs, find will not be able
-		# to reveal any @INC directories inside them, and will subsequently prune
-		# them from the built perl's @INC support, breaking our compatiblity options
-		# entirely.
-		if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then
-			eerror "Bad permissions on ${dir}, this will probably break things"
-			eerror "Ensure ${dir} is +rx for at least uid=$EUID"
-			eerror "Recommended permission is +rx for all"
-			eerror "> chmod o+rx ${dir}"
-		fi
-	done
-	einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}"
-	find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f "  2>/dev/null
-}
-# Sort versions passed versiony-ly, remove self-version if present
-# dedup. Takes each version as an argument
-sanitize_inc_versions() {
-	local vexclude="${DIST_VERSION%-RC}"
-	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		vexclude="${SUBSLOT}"
-	fi
-	einfo "Normalizing/Sorting candidate list: $*"
-	einfo " to remove '${vexclude}'"
-	# Note, general numeric sort has to be used
-	# for the last component, or unique will convert
-	#  5.30.0 + 5.30 into just 5.30
-	printf "%s\n" "$@" |\
-		grep -vxF "${vexclude}" |\
-		sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg
-}
-
-versions_to_inclist() {
-	local oldv="${PERL_BIN_OLDVERSEN}"
-	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-	fi
-	for v;	do
-			has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ ";
-			echo -n "${v}/ ";
-	done
-}
-versions_to_gentoolibdirs() {
-	local oldv="${PERL_BIN_OLDVERSEN}"
-	local root
-	local v
-	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-	fi
-	for v;	do
-		for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
-			local fullpath="${EROOT}${root}/${v}"
-			if [[ -e "${fullpath}" ]]; then
-				has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}";
-				printf "%s:" "${fullpath}"
-			fi
-		done
-	done
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
-
-	# Perl has problems compiling with -Os in your flags with glibc
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-
-	# xlocale.h is going away in glibc-2.26, so it's counterproductive
-	# if we use it and include it in CORE/perl.h ... Perl builds just
-	# fine with glibc and locale.h only.
-	# However, the darwin prefix people have no locale.h ...
-	use elibc_glibc && myconf -Ui_xlocale
-
-	# This flag makes compiling crash in interesting ways
-	filter-flags "-malign-double"
-
-	# Generic LTO broken since 5.28, triggers EUMM failures
-	filter-flags "-flto"
-
-	use sparc && myconf -Ud_longdbl
-
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=${EROOT}/usr/include
-	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
-
-	export BUILD_ZLIB=False
-	export ZLIB_INCLUDE=${EROOT}/usr/include
-	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-	if use gdbm ; then
-		mygdbm='D'
-		if use berkdb ; then
-			myndbm='D'
-		fi
-	fi
-	if use berkdb ; then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
-	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf -Ui_db -Ui_ndbm
-	fi
-
-	use ithreads && myconf -Dusethreads
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	# modifying 'optimize' prevents cross configure script from appending required flags
-	if tc-is-cross-compiler; then
-		append-cflags "-fwrapv -fno-strict-aliasing"
-	fi
-
-	# Autodiscover all old version directories, some of them will even be newer
-	# if you downgrade
-	if [[ -z ${PERL_OLDVERSEN} ]]; then
-		PERL_OLDVERSEN="$( find_candidate_inc_versions )"
-	fi
-
-	# Fixup versions, removing self match, fixing order and dupes
-	PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )"
-
-	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
-	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
-		local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )"
-		einfo "This version of perl may partially support modules previously"
-		einfo "installed in any of the following paths:"
-		for incpath in ${inclist}; do
-			[[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}"
-			[[ -e "${EROOT}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}"
-			[[ -e "${EROOT}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}"
-		done
-		einfo "This is a temporary measure and you should aim to cleanup these paths"
-		einfo "via world updates and perl-cleaner"
-		# myconf -Dinc_version_list="${inclist}"
-		myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )"
-	fi
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
-	# Make sure we can do the final link #523730, need to set deployment
-	# target to override hardcoded 10.3 which breaks on modern OSX
-	[[ ${CHOST} == *-darwin* ]] && \
-		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
-
-	# Older macOS with non-Apple GCC chokes on inline in system headers
-	# using c89 mode as injected by cflags.SH
-	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
-		append-cflags -Dinline=__inline__
-
-	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
-	[[ ${CHOST} == sparc-*-solaris* ]] && \
-		myconf -Ud_flock
-
-	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
-	# Prefix itself we don't do multilib either, so make sure perl can find
-	# something compatible.
-	if use prefix ; then
-		# Set a hook to check for each detected library whether it actually works.
-		export libscheck="
-			( echo 'main(){}' > '${T}'/conftest.c &&
-				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
-			) || xxx=/dev/null"
-
-		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
-		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
-		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
-	elif [[ $(get_libdir) != "lib" ]] ; then
-		# We need to use " and not ', as the written config.sh use ' ...
-		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
-	fi
-
-	# don't try building ODBM, bug #354453
-	disabled_extensions="ODBM_File"
-
-	if ! use gdbm ; then
-		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
-		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
-	fi
-
-	myconf -Dnoextensions="${disabled_extensions}"
-
-	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
-
-	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
-	# allow fiddling via EXTRA_ECONF, bug 558070
-	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-
-	# setting -Dld= to tc-getLD breaks perl and all perl things
-	# https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
-	myconf \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Dar="$(tc-getAR)" \
-		-Dnm="$(tc-getNM)" \
-		-Dcpp="$(tc-getCPP)" \
-		-Dranlib="$(tc-getRANLIB)" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix="${EPREFIX}"'/usr' \
-		-Dsiteprefix="${EPREFIX}"'/usr/local' \
-		-Dvendorprefix="${EPREFIX}"'/usr' \
-		-Dscriptdir="${EPREFIX}"'/usr/bin' \
-		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
-		-Darchlib="${EPREFIX}${ARCH_LIB}" \
-		-Dsitelib="${EPREFIX}${SITE_LIB}" \
-		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
-		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
-		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
-		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
-		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
-		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth="${EPREFIX}"'/usr/include ' \
-		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Ud_csh \
-		-Dsh="${EPREFIX}"/bin/sh \
-		-Dtargetsh="${EPREFIX}"/bin/sh \
-		-Uusenm \
-		"${myconf[@]}" \
-		"${EXTRA_ECONF[@]}"
-
-	if tc-is-cross-compiler; then
-		./configure \
-			--target="${CHOST}" \
-			--build="${CBUILD}" \
-			-Dinstallprefix='' \
-			-Dinstallusrbinperl='undef' \
-			-Dusevendorprefix='define' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	else
-		sh Configure \
-			-des \
-			-Dinstallprefix="${EPREFIX}"'/usr' \
-			-Dinstallusrbinperl='n' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	fi
-}
-
-src_test() {
-	export NO_GENTOO_NETWORK_TESTS=1;
-	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
-	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	use elibc_uclibc && export MAKEOPTS+=" -j1"
-	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-	emake DESTDIR="${D}" install
-
-	rm -f "${ED}/usr/bin/perl${MY_PV}"
-	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
-
-	if ! tc-is-static-only ; then
-		dolib.so "${ED}"${coredir}/${LIBPERL}
-		rm -f "${ED}"${coredir}/${LIBPERL}
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
-
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
-	fi
-
-	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-	# This removes ${D} from Config.pm
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	dodoc Changes* README AUTHORS
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${ED}/usr/share/doc/${PF}/html"
-	fi
-
-	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
-
-	dual_scripts
-}
-
-pkg_preinst() {
-	check_rebuild
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ "${ROOT}" = "/" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
-		einfo "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-
-	fi
-}
-
-pkg_postrm() {
-	dual_scripts
-}
diff --git a/dev-lang/perl/perl-5.34.0-r3.ebuild b/dev-lang/perl/perl-5.34.0-r3.ebuild
new file mode 100644
index 000000000000..4f15c0a9e41f
--- /dev/null
+++ b/dev-lang/perl/perl-5.34.0-r3.ebuild
@@ -0,0 +1,827 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
+
+PATCH_VER=1
+CROSS_VER=1.3.6
+PATCH_BASE="perl-5.34.0-patches-${PATCH_VER}"
+PATCH_DEV=dilfridge
+
+DIST_AUTHOR=XSAWYERX
+
+# Greatest first, don't include yourself
+# Devel point-releases are not ABI-intercompatible, but stable point releases are
+# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
+PERL_BIN_OLDVERSEN=""
+
+# Yes we can.
+PERL_SINGLE_SLOT=y
+
+if [[ "${PV##*.}" == "9999" ]]; then
+	DIST_VERSION=5.30.0
+else
+	DIST_VERSION="${PV/_rc/-RC}"
+fi
+SHORT_PV="${DIST_VERSION%.*}"
+# Even numbered major versions are ABI intercompatible
+# Odd numbered major versions are not
+if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
+	SUBSLOT="${DIST_VERSION%-RC*}"
+else
+	SUBSLOT="${DIST_VERSION%.*}"
+fi
+# Used only in tar paths
+MY_P="perl-${DIST_VERSION}"
+# Used in library paths
+MY_PV="${DIST_VERSION%-RC*}"
+
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+
+SRC_URI="
+	mirror://cpan/src/5.0/${MY_P}.tar.xz
+	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
+	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
+	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
+"
+HOMEPAGE="https://www.perl.org/"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0/${SUBSLOT}"
+
+if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+IUSE="berkdb debug doc gdbm ithreads minimal"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
+	app-arch/bzip2
+	sys-libs/zlib
+	virtual/libcrypt:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+PDEPEND="
+	!minimal? (
+		>=app-admin/perl-cleaner-2.5
+		>=virtual/perl-Encode-3.120.0
+		>=virtual/perl-File-Temp-0.230.400-r2
+		>=virtual/perl-Data-Dumper-2.154.0
+		virtual/perl-Test-Harness
+	)
+"
+# bug 390719, bug 523624
+# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
+
+S="${WORKDIR}/${MY_P}"
+
+dual_scripts() {
+	src_remove_dual      perl-core/Archive-Tar        2.380.0       ptar ptardiff ptargrep
+	src_remove_dual      perl-core/CPAN               2.280.0       cpan
+	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
+	src_remove_dual      perl-core/Encode             3.80.0        enc2xs piconv
+	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.620.0       instmodsh
+	src_remove_dual      perl-core/ExtUtils-ParseXS   3.430.0       xsubpp
+	src_remove_dual      perl-core/IO-Compress        2.102.0        zipdetails
+	src_remove_dual      perl-core/JSON-PP            4.60.0        json_pp
+	src_remove_dual      perl-core/Module-CoreList    5.202.105.200 corelist
+	src_remove_dual      perl-core/Pod-Checker        1.740.0       podchecker
+	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
+	src_remove_dual      perl-core/Pod-Usage          2.10.0       pod2usage
+	src_remove_dual      perl-core/Test-Harness       3.430.0       prove
+	src_remove_dual      perl-core/podlators          4.140.0       pod2man pod2text
+	src_remove_dual_man  perl-core/podlators          4.140.0       /usr/share/man/man1/perlpodstyle.1
+}
+
+check_rebuild() {
+	# Fresh install
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		return 0;
+	# Major Upgrade
+	# doesn't matter if there's multiple copies, it still needs a rebuild
+	# if the string is anything other than "5.CURRENTMAJOR"
+	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
+		echo ""
+		ewarn "UPDATE THE PERL MODULES:"
+		ewarn "After updating dev-lang/perl the installed Perl modules"
+		ewarn "have to be re-installed. In most cases, this is done automatically"
+		ewarn "by the package manager, but subsequent steps are still recommended"
+		ewarn "to ensure system consistency."
+		ewarn
+		ewarn "You should start with a depclean to remove any unused perl dependencies"
+		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
+		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
+		ewarn "Recommended: emerge --depclean -va"
+		ewarn
+		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
+		ewarn "remaining rebuilds portage may have missed."
+		ewarn "Use: perl-cleaner --all"
+		return 0;
+
+	# Reinstall w/ USE Change
+	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
+		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+		echo ""
+		ewarn "TOGGLED USE-FLAGS WARNING:"
+		ewarn "You changed one of the use-flags ithreads or debug."
+		ewarn "You must rebuild all perl-modules installed."
+		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
+	fi
+}
+
+pkg_setup() {
+	case ${CHOST} in
+		*-freebsd*)   osname="freebsd" ;;
+		*-dragonfly*) osname="dragonfly" ;;
+		*-netbsd*)    osname="netbsd" ;;
+		*-openbsd*)   osname="openbsd" ;;
+		*-darwin*)    osname="darwin" ;;
+		*-solaris*)   osname="solaris" ;;
+		*-cygwin*)    osname="cygwin" ;;
+		*)            osname="linux" ;;
+	esac
+
+	myarch="${CHOST%%-*}-${osname}"
+	if use debug ; then
+		myarch+="-debug"
+	fi
+	if use ithreads ; then
+		mythreading="-multi"
+		myarch+="-thread"
+	fi
+
+	PRIV_BASE="/usr/$(get_libdir)/perl5"
+	SITE_BASE="/usr/local/$(get_libdir)/perl5"
+	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
+
+	LIBPERL="libperl$(get_libname ${MY_PV} )"
+
+	# This ENV var tells perl to build with a directory like "5.30"
+	# regardless of its patch version. This is for experts only
+	# at this point.
+	if [[ -z "${PERL_SINGLE_SLOT}" ]]; then
+		PRIV_LIB="${PRIV_BASE}/${MY_PV}"
+		ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
+		SITE_LIB="${SITE_BASE}/${MY_PV}"
+		SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
+		VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
+		VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
+	else
+		PRIV_LIB="${PRIV_BASE}/${SUBSLOT}"
+		ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+		SITE_LIB="${SITE_BASE}/${SUBSLOT}"
+		SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+		VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}"
+		VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+	fi
+
+	dual_scripts
+}
+
+src_remove_dual_file() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
+			done
+			;;
+		setup)
+			for i in "$@" ; do
+				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
+					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
+					break
+				fi
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i}{,-${ver}-${P}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual_man() {
+	local i pkg ver ff
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
+				ff=${ff##*${i#${i%.[0-9]}}}
+				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	for i in "$@" ; do
+		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
+		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
+	done
+}
+
+src_prepare_perlcross() {
+	cp -a ../perl-cross-${CROSS_VER}/* . || die
+
+	# bug 794463, needs further analysis what is exactly wrong here
+	eapply "${FILESDIR}/perl-5.34.0-crossfit.patch"
+
+	# bug 604072
+	MAKEOPTS+=" -j1"
+	export MAKEOPTS
+}
+src_prepare_dynamic() {
+	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
+	ln -s ${LIBPERL} libperl$(get_libname ) || die
+}
+
+# Copy a patch into the patch series
+# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug']
+# - description is optional, but recommended
+# - all arguments after descriptions are bug URLs
+add_patch() {
+	local patchdir="${WORKDIR}/patches"
+	local infodir="${WORKDIR}/patch-info"
+	local src_name dest_name desc
+	src_name="$1"
+	dest_name="$2"
+	desc="$3"
+	shift; shift; shift;
+	einfo "Adding ${dest_name} to patch bundle"
+	cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}"
+	if [[ -n "${desc}" ]]; then
+		printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc"
+	fi
+	if [[ $# -gt 0 ]]; then
+		# Note: when $@ is more than one element, this emits a
+		# line for each element
+		printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs"
+	fi
+}
+# Remove a patch using a glob expr
+# eg:
+#	 rm_patch *-darin-Use-CC*
+#
+rm_patch() {
+	local patchdir="${WORKDIR}/patches"
+	local expr="$1"
+	local patch="$( cd "${patchdir}"; echo $expr )"
+	einfo "Removing $patch ($expr) from patch bundle"
+	if [[ -e "${patchdir}/${patch}" ]]; then
+		rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )"
+	else
+		ewarn "No ${expr} found in ${patchdir} to remove"
+	fi
+}
+# Yes, this is a reasonable amount of code for something seemingly simple
+# but this is far easier to debug when things go wrong, and things went wrong
+# multiple times while I was getting the exact number of slashes right, which
+# requires circumnavigating both bash and sed escape mechanisms.
+c_escape_string() {
+	local slash dquote
+	slash='\'
+	dquote='"'
+	re_slash="${slash}${slash}"
+	re_dquote="${slash}${dquote}"
+
+	# Convert \ to \\,
+	#         " to \"
+	echo "$1" |\
+		sed "s|${re_slash}|${re_slash}${re_slash}|g" |\
+		sed "s|${re_dquote}|${re_slash}${re_dquote}|g"
+}
+c_escape_file() {
+	c_escape_string "$(cat "$1")"
+}
+
+apply_patchdir() {
+	local patchdir="${WORKDIR}/patches"
+	local infodir="${WORKDIR}/patch-info"
+	local patchoutput="patchlevel-gentoo.h"
+
+	# Inject Patch-Level info into description for patchlevel.h patch
+	# to show in -V
+	local patch_expr="*List-packaged-patches*"
+	local patch="$( cd "${patchdir}"; echo $patch_expr )";
+	einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )"
+
+	if [[ -e "${patchdir}/${patch}" ]]; then
+		printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\
+			>"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc"
+	else
+		eerror "No $patch_expr found in ${patchdir}"
+	fi
+
+	# Compute patch list to apply
+	# different name other than PATCHES to stop default
+	# reapplying it
+	# Single depth is currently only supported, as artifacts can reside
+	# from the old layout being multiple-directories, as well as it grossly
+	# simplifying the patchlevel_gentoo.h generation.
+	local PERL_PATCHES=($(
+		find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\
+			grep -E '[.](diff|patch)$' |\
+			sort -n
+	))
+
+	for patch in "${PERL_PATCHES[@]}"; do
+		eapply "${WORKDIR}"/patches/${patch}
+	done
+
+	einfo "Generating $patchoutput"
+
+	# This code creates a header file, each iteration
+	# creates one-or-more-lines for each entry found in PERL_PATCHES
+	# and STDOUT is redirected to the .h file
+	for patch in "${PERL_PATCHES[@]}"; do
+		local desc_f="${infodir}/${patch}.desc"
+		local bugs_f="${infodir}/${patch}.bugs"
+
+		printf ',"%s"\n' "${patch}"
+		if [[ ! -e "${desc_f}" ]]; then
+			ewarn "No description provided for ${patch} (expected: ${desc_f} )"
+		else
+			local desc="$(c_escape_file "${desc_f}")"
+			printf ',"- %s"\n' "${desc}"
+		fi
+		if [[ -e "${bugs_f}" ]]; then
+			while read -d $'\n' -r line; do
+				local esc_line="$(c_escape_string "${line}")"
+				printf ',"- Bug: %s"\n' "${esc_line}"
+			done <"${bugs_f}"
+		fi
+	done > "${S}/${patchoutput}"
+	printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST"
+
+}
+src_prepare() {
+	local patchdir="${WORKDIR}/patches"
+
+	# Prepare Patch dir with additional patches / remove unwanted patches
+	# Inject bug/desc entries for perl -V
+	# Old example:
+	# add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\
+	#		"Fix broken miniperl on hppa"\
+	#		"https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162"
+
+	add_patch "${FILESDIR}/${P}-gdbm-1.20.patch" "0101-Fix-build-with-gdb120.patch"\
+			"Fix GDBM_File to compile with version 1.20 and earlier"\
+			"https://bugs.gentoo.org/802945"
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# do NOT mess with nsl, on Solaris this is always necessary,
+		# when -lsocket is used e.g. to get h_errno
+		rm_patch "*-nsl-and-cl*"
+	fi
+
+	apply_patchdir
+
+	tc-is-cross-compiler && src_prepare_perlcross
+
+	tc-is-static-only || src_prepare_dynamic
+
+	if use gdbm; then
+		sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \
+			ext/NDBM_File/Makefile.PL || die
+	fi
+
+	# Use errno.h from prefix rather than from host system, bug #645804
+	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
+		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# set a soname, fix linking against just built libperl
+		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_name (soname) not to reference $D
+		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
+	fi
+
+	default
+}
+
+myconf() {
+	# the myconf array is declared in src_configure
+	myconf=( "${myconf[@]}" "$@" )
+}
+
+# Outputs a list of versions which have been seen in any of the
+# primary perl @INC prefix paths, such as:
+#  /usr/lib64/perl5/<NUMBER>
+#  /usr/local/lib64/perl5/<NUMBER>
+#  /usr/lib64/perl5/vendor_perl/<NUMBER>
+#
+# All values of NUMBER must be like "5.x.y", unless PERL_SUPPORT_SINGLE_SLOT
+# is enabled, where it will also allow numbers like "5.x"
+#
+# PERL_SUPPORT_SINGLE_SLOT should only be used to transition *away* from PERL_SINGLE_SLOT
+# if you used that.
+find_candidate_inc_versions() {
+	local regex='.*/5[.][0-9]+[.][0-9]+$';
+	if [[ ! -z "${PERL_SUPPORT_SINGLE_SLOT}" || ! -z "${PERL_SINGLE_SLOT}" ]]; then
+		regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
+	fi
+	local dirs=(
+		"${EROOT}${PRIV_BASE}"
+		"${EROOT}${SITE_BASE}"
+		"${EROOT}${VENDOR_BASE}"
+	)
+	for dir in "${dirs[@]}"; do
+		if [[ ! -e "${dir}" ]]; then
+			continue
+		fi
+		# Without access to readdir() on these dirs, find will not be able
+		# to reveal any @INC directories inside them, and will subsequently prune
+		# them from the built perl's @INC support, breaking our compatiblity options
+		# entirely.
+		if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then
+			eerror "Bad permissions on ${dir}, this will probably break things"
+			eerror "Ensure ${dir} is +rx for at least uid=$EUID"
+			eerror "Recommended permission is +rx for all"
+			eerror "> chmod o+rx ${dir}"
+		fi
+	done
+	einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}"
+	find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f "  2>/dev/null
+}
+# Sort versions passed versiony-ly, remove self-version if present
+# dedup. Takes each version as an argument
+sanitize_inc_versions() {
+	local vexclude="${DIST_VERSION%-RC}"
+	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
+		vexclude="${SUBSLOT}"
+	fi
+	einfo "Normalizing/Sorting candidate list: $*"
+	einfo " to remove '${vexclude}'"
+	# Note, general numeric sort has to be used
+	# for the last component, or unique will convert
+	#  5.30.0 + 5.30 into just 5.30
+	printf "%s\n" "$@" |\
+		grep -vxF "${vexclude}" |\
+		sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg
+}
+
+versions_to_inclist() {
+	local oldv="${PERL_BIN_OLDVERSEN}"
+	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
+		oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
+	fi
+	for v;	do
+			has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ ";
+			echo -n "${v}/ ";
+	done
+}
+versions_to_gentoolibdirs() {
+	local oldv="${PERL_BIN_OLDVERSEN}"
+	local root
+	local v
+	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
+		oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
+	fi
+	for v;	do
+		for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
+			local fullpath="${EROOT}${root}/${v}"
+			if [[ -e "${fullpath}" ]]; then
+				has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}";
+				printf "%s:" "${fullpath}"
+			fi
+		done
+	done
+}
+
+src_configure() {
+	declare -a myconf
+
+	export LC_ALL="C"
+	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
+
+	# Perl has problems compiling with -Os in your flags with glibc
+	use elibc_uclibc || replace-flags "-Os" "-O2"
+
+	# xlocale.h is going away in glibc-2.26, so it's counterproductive
+	# if we use it and include it in CORE/perl.h ... Perl builds just
+	# fine with glibc and locale.h only.
+	# However, the darwin prefix people have no locale.h ...
+	use elibc_glibc && myconf -Ui_xlocale
+
+	# This flag makes compiling crash in interesting ways
+	filter-flags "-malign-double"
+
+	# Generic LTO broken since 5.28, triggers EUMM failures
+	filter-flags "-flto"
+
+	use sparc && myconf -Ud_longdbl
+
+	export BUILD_BZIP2=0
+	export BZIP2_INCLUDE=${EROOT}/usr/include
+	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
+
+	export BUILD_ZLIB=False
+	export ZLIB_INCLUDE=${EROOT}/usr/include
+	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
+
+	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
+	myndbm='U'
+	mygdbm='U'
+	mydb='U'
+	if use gdbm ; then
+		mygdbm='D'
+		if use berkdb ; then
+			myndbm='D'
+		fi
+	fi
+	if use berkdb ; then
+		mydb='D'
+		has_version '=sys-libs/db-1*' && myndbm='D'
+	fi
+
+	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
+
+	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
+		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
+		myconf -Ui_db -Ui_ndbm
+	fi
+
+	use ithreads && myconf -Dusethreads
+
+	if use debug ; then
+		append-cflags "-g"
+		myconf -DDEBUGGING
+	elif [[ ${CFLAGS} == *-g* ]] ; then
+		myconf -DDEBUGGING=-g
+	else
+		myconf -DDEBUGGING=none
+	fi
+
+	# modifying 'optimize' prevents cross configure script from appending required flags
+	if tc-is-cross-compiler; then
+		append-cflags "-fwrapv -fno-strict-aliasing"
+	fi
+
+	# Autodiscover all old version directories, some of them will even be newer
+	# if you downgrade
+	if [[ -z ${PERL_OLDVERSEN} ]]; then
+		PERL_OLDVERSEN="$( find_candidate_inc_versions )"
+	fi
+
+	# Fixup versions, removing self match, fixing order and dupes
+	PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )"
+
+	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
+	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
+		local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )"
+		einfo "This version of perl may partially support modules previously"
+		einfo "installed in any of the following paths:"
+		for incpath in ${inclist}; do
+			[[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}"
+			[[ -e "${EROOT}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}"
+			[[ -e "${EROOT}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}"
+		done
+		einfo "This is a temporary measure and you should aim to cleanup these paths"
+		einfo "via world updates and perl-cleaner"
+		# myconf -Dinc_version_list="${inclist}"
+		myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )"
+	fi
+
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
+
+	# Make sure we can do the final link #523730, need to set deployment
+	# target to override hardcoded 10.3 which breaks on modern OSX
+	[[ ${CHOST} == *-darwin* ]] && \
+		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
+
+	# Older macOS with non-Apple GCC chokes on inline in system headers
+	# using c89 mode as injected by cflags.SH
+	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
+		append-cflags -Dinline=__inline__
+
+	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
+	[[ ${CHOST} == sparc-*-solaris* ]] && \
+		myconf -Ud_flock
+
+	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
+	# Prefix itself we don't do multilib either, so make sure perl can find
+	# something compatible.
+	if use prefix ; then
+		# Set a hook to check for each detected library whether it actually works.
+		export libscheck="
+			( echo 'main(){}' > '${T}'/conftest.c &&
+				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
+			) || xxx=/dev/null"
+
+		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
+		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
+		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
+	elif [[ $(get_libdir) != "lib" ]] ; then
+		# We need to use " and not ', as the written config.sh use ' ...
+		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
+	fi
+
+	# don't try building ODBM, bug #354453
+	disabled_extensions="ODBM_File"
+
+	if ! use gdbm ; then
+		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
+		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
+	fi
+
+	myconf -Dnoextensions="${disabled_extensions}"
+
+	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
+
+	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
+	# allow fiddling via EXTRA_ECONF, bug 558070
+	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
+
+	# setting -Dld= to tc-getLD breaks perl and all perl things
+	# https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
+	myconf \
+		-Duseshrplib \
+		-Darchname="${myarch}" \
+		-Dcc="$(tc-getCC)" \
+		-Dar="$(tc-getAR)" \
+		-Dnm="$(tc-getNM)" \
+		-Dcpp="$(tc-getCPP)" \
+		-Dranlib="$(tc-getRANLIB)" \
+		-Doptimize="${CFLAGS}" \
+		-Dldflags="${LDFLAGS}" \
+		-Dprefix="${EPREFIX}"'/usr' \
+		-Dsiteprefix="${EPREFIX}"'/usr/local' \
+		-Dvendorprefix="${EPREFIX}"'/usr' \
+		-Dscriptdir="${EPREFIX}"'/usr/bin' \
+		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
+		-Darchlib="${EPREFIX}${ARCH_LIB}" \
+		-Dsitelib="${EPREFIX}${SITE_LIB}" \
+		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
+		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
+		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
+		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
+		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
+		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dman1ext='1' \
+		-Dman3ext='3pm' \
+		-Dlibperl="${LIBPERL}" \
+		-Dlocincpth="${EPREFIX}"'/usr/include ' \
+		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
+		-Duselargefiles \
+		-Dd_semctl_semun \
+		-Dcf_by='Gentoo' \
+		-Dmyhostname='localhost' \
+		-Dperladmin='root@localhost' \
+		-Ud_csh \
+		-Dsh="${EPREFIX}"/bin/sh \
+		-Dtargetsh="${EPREFIX}"/bin/sh \
+		-Uusenm \
+		"${myconf[@]}" \
+		"${EXTRA_ECONF[@]}"
+
+	if tc-is-cross-compiler; then
+		./configure \
+			--target="${CHOST}" \
+			--build="${CBUILD}" \
+			-Dinstallprefix='' \
+			-Dinstallusrbinperl='undef' \
+			-Dusevendorprefix='define' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	else
+		sh Configure \
+			-des \
+			-Dinstallprefix="${EPREFIX}"'/usr' \
+			-Dinstallusrbinperl='n' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	fi
+}
+
+src_test() {
+	export NO_GENTOO_NETWORK_TESTS=1;
+	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
+	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
+	if [[ ${EUID} == 0 ]] ; then
+		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
+		return 0
+	fi
+	use elibc_uclibc && export MAKEOPTS+=" -j1"
+	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
+}
+
+src_install() {
+	local i
+	local coredir="${ARCH_LIB}/CORE"
+
+	emake DESTDIR="${D}" install
+
+	rm -f "${ED}/usr/bin/perl${MY_PV}"
+	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
+
+	if ! tc-is-static-only ; then
+		dolib.so "${ED}"${coredir}/${LIBPERL}
+		rm -f "${ED}"${coredir}/${LIBPERL}
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
+
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
+	fi
+
+	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
+
+	# This removes ${D} from Config.pm
+	for i in $(find "${D}" -iname "Config.pm" ) ; do
+		einfo "Removing ${D} from ${i}..."
+		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
+	done
+
+	dodoc Changes* README AUTHORS
+
+	if use doc ; then
+		# HTML Documentation
+		# We expect errors, warnings, and such with the following.
+
+		dodir /usr/share/doc/${PF}/html
+		LD_LIBRARY_PATH=. ./perl installhtml \
+			--podroot='.' \
+			--podpath='lib:ext:pod:vms' \
+			--recurse \
+			--htmldir="${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
+
+	dual_scripts
+}
+
+pkg_preinst() {
+	check_rebuild
+}
+
+pkg_postinst() {
+	dual_scripts
+
+	if [[ "${ROOT}" = "/" ]] ; then
+		local INC DIR file
+		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
+		einfo "Removing old .ph files"
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
+					rm -f "${file}"
+					einfo "<< ${file}"
+				done
+			fi
+		done
+		# Silently remove the now empty dirs
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+			fi
+		done
+
+	fi
+}
+
+pkg_postrm() {
+	dual_scripts
+}
diff --git a/dev-lang/perl/perl-5.34.0.ebuild b/dev-lang/perl/perl-5.34.0.ebuild
deleted file mode 100644
index a9aa55e7376c..000000000000
--- a/dev-lang/perl/perl-5.34.0.ebuild
+++ /dev/null
@@ -1,819 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-
-PATCH_VER=1
-CROSS_VER=1.3.6
-PATCH_BASE="perl-5.34.0-patches-${PATCH_VER}"
-PATCH_DEV=dilfridge
-
-DIST_AUTHOR=XSAWYERX
-
-# Greatest first, don't include yourself
-# Devel point-releases are not ABI-intercompatible, but stable point releases are
-# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
-PERL_BIN_OLDVERSEN=""
-
-# Yes we can.
-PERL_SINGLE_SLOT=y
-
-if [[ "${PV##*.}" == "9999" ]]; then
-	DIST_VERSION=5.30.0
-else
-	DIST_VERSION="${PV/_rc/-RC}"
-fi
-SHORT_PV="${DIST_VERSION%.*}"
-# Even numbered major versions are ABI intercompatible
-# Odd numbered major versions are not
-if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
-	SUBSLOT="${DIST_VERSION%-RC*}"
-else
-	SUBSLOT="${DIST_VERSION%.*}"
-fi
-# Used only in tar paths
-MY_P="perl-${DIST_VERSION}"
-# Used in library paths
-MY_PV="${DIST_VERSION%-RC*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/5.0/${MY_P}.tar.xz
-	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
-	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
-	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
-"
-HOMEPAGE="https://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0/${SUBSLOT}"
-
-if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="berkdb debug doc gdbm ithreads minimal"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
-	app-arch/bzip2
-	sys-libs/zlib
-	virtual/libcrypt:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-PDEPEND="
-	!minimal? (
-		>=app-admin/perl-cleaner-2.5
-		>=virtual/perl-File-Temp-0.230.400-r2
-		>=virtual/perl-Data-Dumper-2.154.0
-		virtual/perl-Test-Harness
-	)
-"
-# bug 390719, bug 523624
-# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual      perl-core/Archive-Tar        2.380.0       ptar ptardiff ptargrep
-	src_remove_dual      perl-core/CPAN               2.280.0       cpan
-	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
-	src_remove_dual      perl-core/Encode             3.80.0        enc2xs piconv
-	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.620.0       instmodsh
-	src_remove_dual      perl-core/ExtUtils-ParseXS   3.430.0       xsubpp
-	src_remove_dual      perl-core/IO-Compress        2.102.0        zipdetails
-	src_remove_dual      perl-core/JSON-PP            4.60.0        json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.202.105.200 corelist
-	src_remove_dual      perl-core/Pod-Checker        1.740.0       podchecker
-	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
-	src_remove_dual      perl-core/Pod-Usage          2.10.0       pod2usage
-	src_remove_dual      perl-core/Test-Harness       3.430.0       prove
-	src_remove_dual      perl-core/podlators          4.140.0       pod2man pod2text
-	src_remove_dual_man  perl-core/podlators          4.140.0       /usr/share/man/man1/perlpodstyle.1
-}
-
-check_rebuild() {
-	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
-	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl the installed Perl modules"
-		ewarn "have to be re-installed. In most cases, this is done automatically"
-		ewarn "by the package manager, but subsequent steps are still recommended"
-		ewarn "to ensure system consistency."
-		ewarn
-		ewarn "You should start with a depclean to remove any unused perl dependencies"
-		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
-		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
-		ewarn "Recommended: emerge --depclean -va"
-		ewarn
-		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
-		ewarn "remaining rebuilds portage may have missed."
-		ewarn "Use: perl-cleaner --all"
-		return 0;
-
-	# Reinstall w/ USE Change
-	elif (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-		echo ""
-		ewarn "TOGGLED USE-FLAGS WARNING:"
-		ewarn "You changed one of the use-flags ithreads or debug."
-		ewarn "You must rebuild all perl-modules installed."
-		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-	fi
-}
-
-pkg_setup() {
-	case ${CHOST} in
-		*-freebsd*)   osname="freebsd" ;;
-		*-dragonfly*) osname="dragonfly" ;;
-		*-netbsd*)    osname="netbsd" ;;
-		*-openbsd*)   osname="openbsd" ;;
-		*-darwin*)    osname="darwin" ;;
-		*-solaris*)   osname="solaris" ;;
-		*-cygwin*)    osname="cygwin" ;;
-		*)            osname="linux" ;;
-	esac
-
-	myarch="${CHOST%%-*}-${osname}"
-	if use debug ; then
-		myarch+="-debug"
-	fi
-	if use ithreads ; then
-		mythreading="-multi"
-		myarch+="-thread"
-	fi
-
-	PRIV_BASE="/usr/$(get_libdir)/perl5"
-	SITE_BASE="/usr/local/$(get_libdir)/perl5"
-	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-
-	# This ENV var tells perl to build with a directory like "5.30"
-	# regardless of its patch version. This is for experts only
-	# at this point.
-	if [[ -z "${PERL_SINGLE_SLOT}" ]]; then
-		PRIV_LIB="${PRIV_BASE}/${MY_PV}"
-		ARCH_LIB="${PRIV_BASE}/${MY_PV}/${myarch}${mythreading}"
-		SITE_LIB="${SITE_BASE}/${MY_PV}"
-		SITE_ARCH="${SITE_BASE}/${MY_PV}/${myarch}${mythreading}"
-		VENDOR_LIB="${VENDOR_BASE}/${MY_PV}"
-		VENDOR_ARCH="${VENDOR_BASE}/${MY_PV}/${myarch}${mythreading}"
-	else
-		PRIV_LIB="${PRIV_BASE}/${SUBSLOT}"
-		ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-		SITE_LIB="${SITE_BASE}/${SUBSLOT}"
-		SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-		VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}"
-		VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}"
-	fi
-
-	dual_scripts
-}
-
-src_remove_dual_file() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
-			done
-			;;
-		setup)
-			for i in "$@" ; do
-				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
-					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
-					break
-				fi
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i}{,-${ver}-${P}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual_man() {
-	local i pkg ver ff
-	pkg="$1"
-	ver="$2"
-	shift 2
-	case "${EBUILD_PHASE:-none}" in
-		postinst|postrm)
-			for i in "$@" ; do
-				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
-				ff=${ff##*${i#${i%.[0-9]}}}
-				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
-			done
-			;;
-		install)
-			for i in "$@" ; do
-				if ! [[ -f "${ED}"${i} ]] ; then
-					ewarn "${i} does not exist!"
-					continue
-				fi
-				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
-			done
-			;;
-	esac
-}
-
-src_remove_dual() {
-	local i pkg ver
-	pkg="$1"
-	ver="$2"
-	shift 2
-	for i in "$@" ; do
-		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
-		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
-	done
-}
-
-src_prepare_perlcross() {
-	cp -a ../perl-cross-${CROSS_VER}/* . || die
-
-	# bug 604072
-	MAKEOPTS+=" -j1"
-	export MAKEOPTS
-}
-src_prepare_dynamic() {
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
-	ln -s ${LIBPERL} libperl$(get_libname ) || die
-}
-
-# Copy a patch into the patch series
-# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug']
-# - description is optional, but recommended
-# - all arguments after descriptions are bug URLs
-add_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local src_name dest_name desc
-	src_name="$1"
-	dest_name="$2"
-	desc="$3"
-	shift; shift; shift;
-	einfo "Adding ${dest_name} to patch bundle"
-	cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}"
-	if [[ -n "${desc}" ]]; then
-		printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc"
-	fi
-	if [[ $# -gt 0 ]]; then
-		# Note: when $@ is more than one element, this emits a
-		# line for each element
-		printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs"
-	fi
-}
-# Remove a patch using a glob expr
-# eg:
-#	 rm_patch *-darin-Use-CC*
-#
-rm_patch() {
-	local patchdir="${WORKDIR}/patches"
-	local expr="$1"
-	local patch="$( cd "${patchdir}"; echo $expr )"
-	einfo "Removing $patch ($expr) from patch bundle"
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )"
-	else
-		ewarn "No ${expr} found in ${patchdir} to remove"
-	fi
-}
-# Yes, this is a reasonable amount of code for something seemingly simple
-# but this is far easier to debug when things go wrong, and things went wrong
-# multiple times while I was getting the exact number of slashes right, which
-# requires circumnavigating both bash and sed escape mechanisms.
-c_escape_string() {
-	local slash dquote
-	slash='\'
-	dquote='"'
-	re_slash="${slash}${slash}"
-	re_dquote="${slash}${dquote}"
-
-	# Convert \ to \\,
-	#         " to \"
-	echo "$1" |\
-		sed "s|${re_slash}|${re_slash}${re_slash}|g" |\
-		sed "s|${re_dquote}|${re_slash}${re_dquote}|g"
-}
-c_escape_file() {
-	c_escape_string "$(cat "$1")"
-}
-
-apply_patchdir() {
-	local patchdir="${WORKDIR}/patches"
-	local infodir="${WORKDIR}/patch-info"
-	local patchoutput="patchlevel-gentoo.h"
-
-	# Inject Patch-Level info into description for patchlevel.h patch
-	# to show in -V
-	local patch_expr="*List-packaged-patches*"
-	local patch="$( cd "${patchdir}"; echo $patch_expr )";
-	einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )"
-
-	if [[ -e "${patchdir}/${patch}" ]]; then
-		printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\
-			>"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc"
-	else
-		eerror "No $patch_expr found in ${patchdir}"
-	fi
-
-	# Compute patch list to apply
-	# different name other than PATCHES to stop default
-	# reapplying it
-	# Single depth is currently only supported, as artifacts can reside
-	# from the old layout being multiple-directories, as well as it grossly
-	# simplifying the patchlevel_gentoo.h generation.
-	local PERL_PATCHES=($(
-		find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\
-			grep -E '[.](diff|patch)$' |\
-			sort -n
-	))
-
-	for patch in "${PERL_PATCHES[@]}"; do
-		eapply "${WORKDIR}"/patches/${patch}
-	done
-
-	einfo "Generating $patchoutput"
-
-	# This code creates a header file, each iteration
-	# creates one-or-more-lines for each entry found in PERL_PATCHES
-	# and STDOUT is redirected to the .h file
-	for patch in "${PERL_PATCHES[@]}"; do
-		local desc_f="${infodir}/${patch}.desc"
-		local bugs_f="${infodir}/${patch}.bugs"
-
-		printf ',"%s"\n' "${patch}"
-		if [[ ! -e "${desc_f}" ]]; then
-			ewarn "No description provided for ${patch} (expected: ${desc_f} )"
-		else
-			local desc="$(c_escape_file "${desc_f}")"
-			printf ',"- %s"\n' "${desc}"
-		fi
-		if [[ -e "${bugs_f}" ]]; then
-			while read -d $'\n' -r line; do
-				local esc_line="$(c_escape_string "${line}")"
-				printf ',"- Bug: %s"\n' "${esc_line}"
-			done <"${bugs_f}"
-		fi
-	done > "${S}/${patchoutput}"
-	printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST"
-
-}
-src_prepare() {
-	local patchdir="${WORKDIR}/patches"
-
-	# Prepare Patch dir with additional patches / remove unwanted patches
-	# Inject bug/desc entries for perl -V
-	# Old example:
-	# add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\
-	#		"Fix broken miniperl on hppa"\
-	#		"https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162"
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# do NOT mess with nsl, on Solaris this is always necessary,
-		# when -lsocket is used e.g. to get h_errno
-		rm_patch "*-nsl-and-cl*"
-	fi
-
-	apply_patchdir
-
-	tc-is-cross-compiler && src_prepare_perlcross
-
-	tc-is-static-only || src_prepare_dynamic
-
-	if use gdbm; then
-		sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \
-			ext/NDBM_File/Makefile.PL || die
-	fi
-
-	# Use errno.h from prefix rather than from host system, bug #645804
-	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
-		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# set a soname, fix linking against just built libperl
-		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name (soname) not to reference $D
-		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
-	fi
-
-	default
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-# Outputs a list of versions which have been seen in any of the
-# primary perl @INC prefix paths, such as:
-#  /usr/lib64/perl5/<NUMBER>
-#  /usr/local/lib64/perl5/<NUMBER>
-#  /usr/lib64/perl5/vendor_perl/<NUMBER>
-#
-# All values of NUMBER must be like "5.x.y", unless PERL_SUPPORT_SINGLE_SLOT
-# is enabled, where it will also allow numbers like "5.x"
-#
-# PERL_SUPPORT_SINGLE_SLOT should only be used to transition *away* from PERL_SINGLE_SLOT
-# if you used that.
-find_candidate_inc_versions() {
-	local regex='.*/5[.][0-9]+[.][0-9]+$';
-	if [[ ! -z "${PERL_SUPPORT_SINGLE_SLOT}" || ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
-	fi
-	local dirs=(
-		"${EROOT}${PRIV_BASE}"
-		"${EROOT}${SITE_BASE}"
-		"${EROOT}${VENDOR_BASE}"
-	)
-	for dir in "${dirs[@]}"; do
-		if [[ ! -e "${dir}" ]]; then
-			continue
-		fi
-		# Without access to readdir() on these dirs, find will not be able
-		# to reveal any @INC directories inside them, and will subsequently prune
-		# them from the built perl's @INC support, breaking our compatiblity options
-		# entirely.
-		if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then
-			eerror "Bad permissions on ${dir}, this will probably break things"
-			eerror "Ensure ${dir} is +rx for at least uid=$EUID"
-			eerror "Recommended permission is +rx for all"
-			eerror "> chmod o+rx ${dir}"
-		fi
-	done
-	einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}"
-	find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f "  2>/dev/null
-}
-# Sort versions passed versiony-ly, remove self-version if present
-# dedup. Takes each version as an argument
-sanitize_inc_versions() {
-	local vexclude="${DIST_VERSION%-RC}"
-	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		vexclude="${SUBSLOT}"
-	fi
-	einfo "Normalizing/Sorting candidate list: $*"
-	einfo " to remove '${vexclude}'"
-	# Note, general numeric sort has to be used
-	# for the last component, or unique will convert
-	#  5.30.0 + 5.30 into just 5.30
-	printf "%s\n" "$@" |\
-		grep -vxF "${vexclude}" |\
-		sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg
-}
-
-versions_to_inclist() {
-	local oldv="${PERL_BIN_OLDVERSEN}"
-	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-	fi
-	for v;	do
-			has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ ";
-			echo -n "${v}/ ";
-	done
-}
-versions_to_gentoolibdirs() {
-	local oldv="${PERL_BIN_OLDVERSEN}"
-	local root
-	local v
-	if [[ ! -z "${PERL_SINGLE_SLOT}" ]]; then
-		oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
-	fi
-	for v;	do
-		for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
-			local fullpath="${EROOT}${root}/${v}"
-			if [[ -e "${fullpath}" ]]; then
-				has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}";
-				printf "%s:" "${fullpath}"
-			fi
-		done
-	done
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
-
-	# Perl has problems compiling with -Os in your flags with glibc
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-
-	# xlocale.h is going away in glibc-2.26, so it's counterproductive
-	# if we use it and include it in CORE/perl.h ... Perl builds just
-	# fine with glibc and locale.h only.
-	# However, the darwin prefix people have no locale.h ...
-	use elibc_glibc && myconf -Ui_xlocale
-
-	# This flag makes compiling crash in interesting ways
-	filter-flags "-malign-double"
-
-	# Generic LTO broken since 5.28, triggers EUMM failures
-	filter-flags "-flto"
-
-	use sparc && myconf -Ud_longdbl
-
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=${EROOT}/usr/include
-	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
-
-	export BUILD_ZLIB=False
-	export ZLIB_INCLUDE=${EROOT}/usr/include
-	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-	if use gdbm ; then
-		mygdbm='D'
-		if use berkdb ; then
-			myndbm='D'
-		fi
-	fi
-	if use berkdb ; then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
-	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf -Ui_db -Ui_ndbm
-	fi
-
-	use ithreads && myconf -Dusethreads
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	# modifying 'optimize' prevents cross configure script from appending required flags
-	if tc-is-cross-compiler; then
-		append-cflags "-fwrapv -fno-strict-aliasing"
-	fi
-
-	# Autodiscover all old version directories, some of them will even be newer
-	# if you downgrade
-	if [[ -z ${PERL_OLDVERSEN} ]]; then
-		PERL_OLDVERSEN="$( find_candidate_inc_versions )"
-	fi
-
-	# Fixup versions, removing self match, fixing order and dupes
-	PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )"
-
-	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
-	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
-		local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )"
-		einfo "This version of perl may partially support modules previously"
-		einfo "installed in any of the following paths:"
-		for incpath in ${inclist}; do
-			[[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}"
-			[[ -e "${EROOT}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}"
-			[[ -e "${EROOT}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}"
-		done
-		einfo "This is a temporary measure and you should aim to cleanup these paths"
-		einfo "via world updates and perl-cleaner"
-		# myconf -Dinc_version_list="${inclist}"
-		myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )"
-	fi
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
-	# Make sure we can do the final link #523730, need to set deployment
-	# target to override hardcoded 10.3 which breaks on modern OSX
-	[[ ${CHOST} == *-darwin* ]] && \
-		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
-
-	# Older macOS with non-Apple GCC chokes on inline in system headers
-	# using c89 mode as injected by cflags.SH
-	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
-		append-cflags -Dinline=__inline__
-
-	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
-	[[ ${CHOST} == sparc-*-solaris* ]] && \
-		myconf -Ud_flock
-
-	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
-	# Prefix itself we don't do multilib either, so make sure perl can find
-	# something compatible.
-	if use prefix ; then
-		# Set a hook to check for each detected library whether it actually works.
-		export libscheck="
-			( echo 'main(){}' > '${T}'/conftest.c &&
-				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
-			) || xxx=/dev/null"
-
-		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
-		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
-		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
-	elif [[ $(get_libdir) != "lib" ]] ; then
-		# We need to use " and not ', as the written config.sh use ' ...
-		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
-	fi
-
-	# don't try building ODBM, bug #354453
-	disabled_extensions="ODBM_File"
-
-	if ! use gdbm ; then
-		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
-		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
-	fi
-
-	myconf -Dnoextensions="${disabled_extensions}"
-
-	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
-
-	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
-	# allow fiddling via EXTRA_ECONF, bug 558070
-	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
-
-	# setting -Dld= to tc-getLD breaks perl and all perl things
-	# https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
-	myconf \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Dar="$(tc-getAR)" \
-		-Dnm="$(tc-getNM)" \
-		-Dcpp="$(tc-getCPP)" \
-		-Dranlib="$(tc-getRANLIB)" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix="${EPREFIX}"'/usr' \
-		-Dsiteprefix="${EPREFIX}"'/usr/local' \
-		-Dvendorprefix="${EPREFIX}"'/usr' \
-		-Dscriptdir="${EPREFIX}"'/usr/bin' \
-		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
-		-Darchlib="${EPREFIX}${ARCH_LIB}" \
-		-Dsitelib="${EPREFIX}${SITE_LIB}" \
-		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
-		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
-		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
-		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
-		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
-		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
-		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth="${EPREFIX}"'/usr/include ' \
-		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Ud_csh \
-		-Dsh="${EPREFIX}"/bin/sh \
-		-Dtargetsh="${EPREFIX}"/bin/sh \
-		-Uusenm \
-		"${myconf[@]}" \
-		"${EXTRA_ECONF[@]}"
-
-	if tc-is-cross-compiler; then
-		./configure \
-			--target="${CHOST}" \
-			--build="${CBUILD}" \
-			-Dinstallprefix='' \
-			-Dinstallusrbinperl='undef' \
-			-Dusevendorprefix='define' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	else
-		sh Configure \
-			-des \
-			-Dinstallprefix="${EPREFIX}"'/usr' \
-			-Dinstallusrbinperl='n' \
-			"${myconf[@]}" \
-			|| die "Unable to configure"
-	fi
-}
-
-src_test() {
-	export NO_GENTOO_NETWORK_TESTS=1;
-	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
-	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	use elibc_uclibc && export MAKEOPTS+=" -j1"
-	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-	emake DESTDIR="${D}" install
-
-	rm -f "${ED}/usr/bin/perl${MY_PV}"
-	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
-
-	if ! tc-is-static-only ; then
-		dolib.so "${ED}"${coredir}/${LIBPERL}
-		rm -f "${ED}"${coredir}/${LIBPERL}
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
-
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
-		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
-	fi
-
-	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-	# This removes ${D} from Config.pm
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	dodoc Changes* README AUTHORS
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${ED}/usr/share/doc/${PF}/html"
-	fi
-
-	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
-
-	dual_scripts
-}
-
-pkg_preinst() {
-	check_rebuild
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ "${ROOT}" = "/" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
-		einfo "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-
-	fi
-}
-
-pkg_postrm() {
-	dual_scripts
-}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a3341bb032cf..d846310092b3 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -21,23 +21,25 @@ DIST Python-3.9.6.tar.xz.asc 833 BLAKE2B 41901bfb80a901f2f14e86769e6d08ded8f7565
 DIST Python-3.9.7.tar.xz 19123232 BLAKE2B 69dfba6974c8c74de1b71977d28cad4d7c26615695f48a99444d2eb83d657b4bd8d22e7f6e94b1b2dcbcc5605c0aee08c609b9564e306f48588e2a7f471209b2 SHA512 55139776ab58a40f9e1e70613d7071d559ef9e51e32a77791422aac134322c21a49f0348c42813214b69789c589367eae43e16d4ae838a73daf37617e966b735
 DIST Python-3.9.7.tar.xz.asc 833 BLAKE2B 2d9c47e47d9a625e393a8b456dd5b10dd485fc13ca7c236b5fd304c373879bea8ab3c67ff99c3a81350443f6ccba20718466a221a05faada6b82cfe92943fdbf SHA512 7ff9f845f520efab3b4a0e95da3ffe055ee5777a4173a5b2cc1fd2419dc2b4faf30d1e711e372df36e34bc971ecfcde88a7cd815cfe2d8080ccb575a1ae8e101
 DIST python-gentoo-patches-2.7.18_p13.tar.xz 33296 BLAKE2B 91b711458aff4f6337ee1b34aff58d7edda6725644a64c9320076a1e04c816729ed163d82333cfe4dfef379a9ad5ef50ba00abdbbfed4503b0f92c8f0b7ca683 SHA512 97f3657a4a95e8492aa710801b974a56e6dd4636e475aea45cbbe76e7ae32d00f07b05769887f05e49cb0df8584ac9499a7ce842bad77f837a7c869f9b769b07
-DIST python-gentoo-patches-3.10.0.tar.xz 8528 BLAKE2B 5217172056a00196969dc462c7b89e629fe2dbf258cac9b3695b8e61441426d024f6656e984c61966f954b4599bf7a88071b3902791d66fc787ff992d052bbe1 SHA512 6bdd9741b065dc6482c66d9a78cc58d72ee754d588cdbe427cbe7ba3ce3cb917f655e8a22053b5561134b15587694ea3f440518b5443e379cebe49585af64c82
+DIST python-gentoo-patches-3.10.0_p1.tar.xz 10068 BLAKE2B 1c9817b449831559f0a0b722c02a5f55d94b3dfde98e5882c1403fe24a4addf7074ab39c09b91cff6fd7ace2e4b6e8ed899d9a0b9ffd6612ce315c4c192bd309 SHA512 39aa41dbf17b6dc5255491c75031a3dae6962b44125e426dbfdce365a6533c5dae9856b1fff8016a189124b7cff72d2665ce99da344c2f9dff005ba685e8c2c4
 DIST python-gentoo-patches-3.10.0rc2.tar.xz 8488 BLAKE2B d7c1e45e63bf5bfe5d41823ea183608f4bcb44694feb18ee6d315250f1563684ce87dec29f46c16da223b6bbd1d20e75791d347ae6ac1d4b5130ba3f08c55ca1 SHA512 c2ca3b60f33131b20037fc0f53a5ce655e9978c5fa42d0b8e2c6b56aec24f6f37d8997fa146a446e5fd72b5d2c4b017d5e4fb71318a51dbb45f5d3b0ea4ed4ad
 DIST python-gentoo-patches-3.6.14_p1.tar.xz 16576 BLAKE2B 902a9073e6d3e40cfba105680d9947b64a4bfa1632381bc71afbd2691350dccb36f498bf17ac7dfc8ce331dfc3fb7e3cdd539cea3f5e9db1c49210ad4d124182 SHA512 4aa354f1ca8d9bb3c30b666ef61cac8380741342102aeb9ea77cc06ae62179f595acc1c2e6321e9c2395abbc3fbc649ecc93b80443d139859924524989539992
 DIST python-gentoo-patches-3.6.15.tar.xz 15300 BLAKE2B f49fd96f6ad1a1c94fea6b83acd229a81754b86061e243044ead4b9a9d5122a2e43b270b68722c359c084c05a566a3ad70aa46588ab7a005ee560ee118b92b8b SHA512 cc33491a33f3f1d990cf494d53b91b74db761142e8aebe1bd4b128ef10a268ff945e5ba08daad39cee095612a8e52265d6988873ecf9c073377cbbc10735aa39
 DIST python-gentoo-patches-3.7.11_p1.tar.xz 18540 BLAKE2B 717f3b279368faa355e9b306ede5aa3cf750b7a862e50553caf4efe19b6b8d40431974fbb510414291c4c91623addebff54fd6d4f7f7553c686c5382174bc81f SHA512 e403d2364bbe600d7c3dba8f70157b1f243b00848e3826e6f350d7dbbdd0966229fbf9aa11e0e87fb5ab93b8ea69893f389e5b92c22d7315f99657d69695ded2
-DIST python-gentoo-patches-3.7.12.tar.xz 17292 BLAKE2B f2e6629c8386c352254f8335fbfc53ddd5e7d86e1b6b71d57b6ff84f11974bf58ab894e687e866c4af60c25f43db01b11427f10c0755b494fa1f579af1b68750 SHA512 d6a1fb5e9ecf2691060f24078039dcbdafa4a27f17b7ede843bbda45016e86756a57e453da3e370b57c74d05c6dc894aa201f356e13ce94d3d9776fcbb673ed2
+DIST python-gentoo-patches-3.7.12_p1.tar.xz 19112 BLAKE2B e9964244af3db544dd6e96d85ca4bc24d7131b48eda85df5bafa3fb36474a024cecbbf4b27324e1f35f76ae6a1aed31dd7896e831b79b574b45a4371afcc7e5b SHA512 9ec996c2904f99bd6651ed1b700eabd91f2b82b1e9e0f3d9572243886a9c7139bf8ac2af04169485d3ca6339e1a87044cba203f6f0aee9609d2a1d53c812548d
 DIST python-gentoo-patches-3.8.12.tar.xz 14936 BLAKE2B 1cb6cdb0bb659b1bc3f8a4ecd80da74b41a9fa2f4d5646ac4b48ddecd5124677cb24574a425404fedab4fb9c7faba4b1cb54cc3482785559a54fa3e9b3ca13f1 SHA512 86c30622bbf6847efcdf2bc43d916b05ee78ab17f45b93148a01cf4c181592029ecc52e8c4887112d97aeece63a92ee0f685a689287c133443cf51b3f8171fb9
+DIST python-gentoo-patches-3.8.12_p1.tar.xz 16632 BLAKE2B cce7a41d020af1ffc55a01ef67b20bcb16c68adbccc1e44ef166d1707e817ed6c3bae70f84c56553f27bca449015e273014c0be73bc2f9b4e25844ddce385486 SHA512 4621727c2e9cc1c5519e021210e16a97e7167ea831445dfdd07f5b0ed642b5919834244111708a971ce098b10b439797e1c76827eccab803f801052c671f1ae6
 DIST python-gentoo-patches-3.9.6_p2.tar.xz 14720 BLAKE2B e14634229b65a29f5294694949c138bfa6146810349d1207a07d84eeca529571eb9c760b58ddbe6e8d96d50d1a3e0d1dfe42328c53c977a9eeb22ecd553317dc SHA512 5d84b8bb4e5584e3ef8e6298af000e772240ad93ed0aaadf1d785db947f1e79aecae7313b8dbeb65849212c9930e683be6e18e42ef6c41a3c27d60f75df08a01
-DIST python-gentoo-patches-3.9.7.tar.xz 12764 BLAKE2B 0cdd255ee1b90f117a7b11cf3ce96d48fe6e8b7b0d43958c473c23489fa4b512f7d8c385fc7c67ba0e62946fd22a608c3f088a3220934136c056bdd14e802752 SHA512 64ba96a5b07ff986b07c2694cd917d5542513cdf2d8ec96940bc2a730a479538968789121e6608feb1bae5465eafbae176726d79f2ddf025a0b7f59b67404b07
+DIST python-gentoo-patches-3.9.7_p1.tar.xz 14444 BLAKE2B c976beb1205b0b777ff3375f538758bf28443bcf4c953fe161545791763da043e32582c398ec8151478afc40e53f963e080d29420066305c12963c953887e4b8 SHA512 283c8975885f9306e46a0047219f3a70e1000f3401affb0b55cde976be6fb6df2f1c13f4e05a479e72e0731d683fef9b22413f7cd320298295a31b19c8915b3d
 EBUILD python-2.7.18_p13.ebuild 10084 BLAKE2B 1dad5dbeec00ae05accd7a05614991812facf0fce7b6d3afb978019ac2facd204156d44d9df76190de9c2075b5c8d0dcbceead7ac445361fcab97309e8dd67f3 SHA512 84d49306ba25875b3542b3a825aaa613516501a348746e3d7f3f74fb44d7e14a393ac0d7180b33ff43e9d879392a9a086c78894b1f2644c9e21ec5a68e1e7c22
-EBUILD python-3.10.0.ebuild 10024 BLAKE2B 24fc7022b48d8a8059e9c99855971ee1602845038f34b704291615738325dc563aae7a2e31670df275e1e31b1f2cd301d38bf348644f99b5ec7b5cd0225099e7 SHA512 29dc55d30993c91d3ada87d2287ad34a349f4d83d9b8dda9c8d479acd9e9f15ab0b3e11fce6da417b2081f74affbb13ad669b894f61e2d1d42e2f16b2d294046
+EBUILD python-3.10.0_p1.ebuild 10009 BLAKE2B be9e178279612086f3cefd33683b1c91fb019c7a6f159753f59305648b94daf31812a04c463d9c3c5fdc797ff8b9b50fd9ab3d7fbc70d565b6af04bd9ea2a8fe SHA512 67af2b30c1c98fc370b1ca77e2fb76e1285d6a180bd46d4e71cde3c92abbbe37bb9110d0f56ed5f4cb093129201b2d1697c36414dedcce3110ddb3be1d8b43ae
 EBUILD python-3.10.0_rc2.ebuild 10013 BLAKE2B 0fc5812116ad7d044e61ca6103b75cbf42c309799c70d59f4fff7d496893d3e1ed6f0a4381772e41ccb945a09948cf90ffaf61003da3b15853a55436cdc2865d SHA512 7048e4eabec33c57dc17c4867ef0b867df71cc00ce038252ad67cf88b83ef94250313463a2e6941b427600947b8e49a2a2f11b46c8fbb448fbb854ce4be83e1a
 EBUILD python-3.6.14_p1.ebuild 9702 BLAKE2B 5b247e39c0d753420adba7b83f952cdf75805815585d221642499223f894fd6a0365385806cf9edb2ce0b79956efdb6e5fc7b64020382a6216159d449c2a49f7 SHA512 f6b1f0ad1f82b68eae9f2a8691daa85bbc75fa0ccc3c24036174d9c38c8bd5d8bb93b79b587c2815dc56eeb1db24e288043629fea0bdbd13ca2b98a687eafeee
 EBUILD python-3.6.15.ebuild 9710 BLAKE2B 8bd667da95e331d0d1ece3089b990fb3d4769dd6b632b98086edb389b10fac4f341a2616dec459dfb9501a14376253bfd13fe3a68dca1b6494d02a9365183add SHA512 85bb866b40325e793c0dd0ef3d69e88d6b34ebc4cecfb9f441bcce0259c09751d1033f101d48826186c8fb97b3d77f3ca6c18bddafdb42e8469b2cf09f6240ae
 EBUILD python-3.7.11_p1.ebuild 9601 BLAKE2B 8d410e5eb77a2af1612f8f0c3e1d18f360bccdcc95d466c65150875146ab9d6469c9bfda41295ea19bcaa04a3f9dbb89841491d4d9420384c5c29a0098337a25 SHA512 a696575a1ddb66bb6c0a6a3931cdd3c5b0544eb686dd446ed775e45268ff2642a19f92eab5476840f2f644e5ec4cbb3bcd938f956c0c229e26804a05f6822c23
-EBUILD python-3.7.12.ebuild 9609 BLAKE2B 66790a5b9ae9ff9fe193f41950eb1317dbde909dd4ccdc24e5cfbcf063705e4aee38c021207fb5aef9f5c89b3013e86b4c3af959563c409ac5ba738bedacc425 SHA512 247928e121eb17560d2d8db71a321a0a7ef6f1a4b096d3bf349d76d9cca597abce07d3515a02a22b09bb7260efc0092a76f0841498a0452dd969339601129709
+EBUILD python-3.7.12_p1.ebuild 9597 BLAKE2B 6047255b5cc230884bcd6168e8495013aafe781a8885c0b190cc8dc4b80d7d05242d214e055c215827968a94d2193ce95fe727dd9c6961ace1eba3be1309ea07 SHA512 fb59c050dd42f615881a52198b894653c69c5fab267453c5c04a367ddb7610ea8d27d1ea2d192be94c9ed2515b8ef56465ec7679c015def5f5d9c00c9c9a0c76
 EBUILD python-3.8.12.ebuild 9755 BLAKE2B c547d90b8d6a07ffba68d5fc45bf247927b759cf66ea0e1d752d104d994403bb9d5f453ca3d7220ec06b9cc52325b98776bc1078227fd583483e72d29d9609d9 SHA512 9d568dd1a3aa64c3b04d92a4bf463b2911351ad3a611ae3530d45e185fa7a95f82f41c98ed6a44576192d564cfcf5110c1f504a56ef47d50388d4845d8c27b84
+EBUILD python-3.8.12_p1.ebuild 9751 BLAKE2B 7324e10e05dc1aad568af0e4a6c57ae27918dc973259981be548649e3af65da46592d53d43f1733efe8f878aecdbc07809a2745bda44a50d948a49f6f44cc7bb SHA512 f8d0998e6d00ef3d6e877cef57ae69976cdd0c946c9927a7edb6ed4dd02f0a74f2a5cbc75c9d27ce152df6a66e708fdf86acbce82707e30b412d3c4dd9606f21
 EBUILD python-3.9.6_p2.ebuild 9894 BLAKE2B 78998d700dcbfae7a80ec67162f8f770b69c538c6cb881044b10bd3064fd26038415456f23727d2dbff7765652837be05c4b4d25b1af252f2ab44296defdebc7 SHA512 8d689629b00d0d67cecdeed88e52d7c44c25bcadf42a889a7219a74166de25e883c18fb237d64dc0b79d6895dee21259af95c273ad2582456132529a1a7f4878
-EBUILD python-3.9.7.ebuild 9902 BLAKE2B 4bcf17e812cc2dcfdaf4ff2b7f2be3a23905247630f456bcb0e4db2966683b5e0dbe640ff822395b3c0f7c5f79c9dac68b2141f2bbdd745ec52a017111f40c23 SHA512 342f3d6566dec3dc698fff54df77dc46144b8b80c96efece51ca9f0c460c46b167939182f297a20ebf15423a9cd7dd6f51be62e1a6e75036e962352c94dc1fae
+EBUILD python-3.9.7_p1.ebuild 9890 BLAKE2B 5dbea7e2ba4db850b2ed67ea27781613ec71a0fa23d040dcdfcb4d1919d5cfbeff541b0e7a0763381508b8597d392fc157a88d52edf0ec00cb1417af62059061 SHA512 a6438dce5e69e520f160aab01e10b1523eb56b700a4bdc7d694f3060103aaa9d637defc3340ec27677d83532e35b0c124d7b284c7287c30165ff6b0affbf9d4a
 MISC metadata.xml 447 BLAKE2B 0f4f1f1af9e1d7e00f984eae6e555d57ebd41f36ace2c24781ec0fdb08d2d3fc96de80e83a2da89ce3f06b209781a674dfcfd1ced5204f3c5d3cada8f58ea417 SHA512 b309e96985959bf70da42d43604e7acd9eacd62d321f5efdb68b77ebcc496e56104da0c5b3b65b6e74e4d0acce8e66aa572baf49277546044ecc8d0f61c6148c
diff --git a/dev-lang/python/python-3.10.0.ebuild b/dev-lang/python/python-3.10.0.ebuild
deleted file mode 100644
index 016c5e8dd443..000000000000
--- a/dev-lang/python/python-3.10.0.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~sam/distfiles/dev-lang/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )
-	!!<sys-apps/sandbox-2.21"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-	verify-sig? ( app-crypt/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite /usr/lib/python3.10/site-packages
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.10.0_p1.ebuild b/dev-lang/python/python-3.10.0_p1.ebuild
new file mode 100644
index 000000000000..33025d94f31f
--- /dev/null
+++ b/dev-lang/python/python-3.10.0_p1.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )
+	!!<sys-apps/sandbox-2.21"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	verify-sig? ( app-crypt/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.10/site-packages
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	local -x EPYTHON=python${PYVER}
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.7.12.ebuild b/dev-lang/python/python-3.7.12.ebuild
deleted file mode 100644
index 710da1dda38e..000000000000
--- a/dev-lang/python/python-3.7.12.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_P="Python-${PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
-	)"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )"
-BDEPEND="
-	virtual/pkgconfig
-	verify-sig? ( app-crypt/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc, pyvenv
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	ln -s "../../../bin/pyvenv-${PYVER}" \
-		"${scriptdir}/pyvenv" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.7.12_p1.ebuild b/dev-lang/python/python-3.7.12_p1.ebuild
new file mode 100644
index 000000000000..d01c389e0cfc
--- /dev/null
+++ b/dev-lang/python/python-3.7.12_p1.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs verify-sig
+
+MY_P="Python-${PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
+	)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}/${PYVER}m"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( app-crypt/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	local -x EPYTHON=python${PYVER}
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc, pyvenv
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	ln -s "../../../bin/pyvenv-${PYVER}" \
+		"${scriptdir}/pyvenv" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.8.12_p1.ebuild b/dev-lang/python/python-3.8.12_p1.ebuild
new file mode 100644
index 000000000000..8463533c8cbb
--- /dev/null
+++ b/dev-lang/python/python-3.8.12_p1.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
+	)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/autoconf-archive
+	verify-sig? ( app-crypt/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	local -x EPYTHON=python${PYVER}
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.9.7.ebuild b/dev-lang/python/python-3.9.7.ebuild
deleted file mode 100644
index 27fbaaa34a57..000000000000
--- a/dev-lang/python/python-3.9.7.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-	python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
-	)"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )"
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/autoconf-archive
-	verify-sig? ( app-crypt/openpgp-keys-python )
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	# force correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
-	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.9.7_p1.ebuild b/dev-lang/python/python-3.9.7_p1.ebuild
new file mode 100644
index 000000000000..0bd5616552c6
--- /dev/null
+++ b/dev-lang/python/python-3.9.7_p1.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
+	)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/autoconf-archive
+	verify-sig? ( app-crypt/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	local -x EPYTHON=python${PYVER}
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 50db3b0b3552..0a3590913a83 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -5,12 +5,15 @@ AUX 2.6/010-default-gem-location.patch 688 BLAKE2B 4c2074d69b9fe5258a2fe0e38bb50
 AUX 2.7/002-autoconf-2.70.patch 964 BLAKE2B ccddabc1d6d7321a46fa0a0facb85a221b11d05fd21abbdffcd6111117449bfa78d98080f61181720cd1c784320ae1d1de2fdcf6c5996bd0d6932b4d4e029e71 SHA512 0d07e1c74dfa7d620b6eab2a0cc7c8e05211e5a5458d3deab9eed699f3e34ed80ace803f65efb71805be6d67e4aa9150fefb85f2631fbea2003b3e1a5cc44cbe
 AUX 2.7/003-did-you-mean.patch 459 BLAKE2B af0f9c8b5a79c80c68163de7c766042ad276910a54dc8dee04a575c8a36af0c93b825c4383ef93c9116c14aaa4e0400619783f9c597650bd8fd23940f1aa3c3a SHA512 c395d8dc5167b055d67b7ffaec8aabe26fae5a75c92e663cb414d19695f74a2bb3ce67693272ffcae407bb5ccf04b8ce799ae6c0498665fbb0274fcc6483baba
 AUX 2.7/010-default-gem-location.patch 688 BLAKE2B 4c2074d69b9fe5258a2fe0e38bb501a39f34ad1fa08ef338224edba1f06073138cbe3d831ecdf9910c989a7f0a1c6c6b73ced0d8ff212207a3a3df5f4d90b5de SHA512 65206a6ca42ade0413ae1467f41082f4a93b3166644d2504cff3d280d23da02fd41aea5aca69dd43f6081b436db90a5b1e98725d8fa51519ca302c02ec526ad7
+AUX 2.7/900-musl-coroutine.patch 1190 BLAKE2B ea8f562cbfc3bef5292bff56302b252e2a65b34b513716edc0543c3345188e1fc45d521c01ad2646298f86e501442cafeaf258c61579c1fe203231c9c09e4bee SHA512 747eccdb6529a96188e35cb2e9e4a723f3226bb5250f911b7fa69e003a0a263d3ee6512e70faf281e4e3c69631f71eed645398b69525cbc04b2ce27b9e3436f0
+AUX 2.7/901-musl-stacksize.patch 945 BLAKE2B 7187ee4c73fb4a9ec00b32a02a176863d88437abae60c20955f28baf939aa76daee7d8accfa5b35c8ae857c25b243d57d719e7542a20439b1eb5952b319fa383 SHA512 5db3e96891498aee8f97f0c5ffe0633c6554b8d8a4975fd73f838ebac1ceea248d18aa4262c2b865b7ca15e9d293d482f7323565ed6ae47ed632cb8a044976e6
 AUX 3.0/001-socksocket-fix.patch 457 BLAKE2B cf3e15858481cdaa48be2cb3685bed663d9de792c743f6ef07ea5d2be214d630ee9bd70c1b6958110516d69a1889fdc4cf26676e52c55d4d530588b8274f962e SHA512 77381cb3c8d4a87a5ae06966d5dd00a38ea07148ed2feacb883e1d041d85ae0a6d64b30fd213f2ac0b1a07e3722f0e724cd0ec8414e74dc4de8844d849584b00
 AUX 3.0/010-default-gem-location.patch 753 BLAKE2B 2e9c209521e113c9b5b66ef305a2f29e042bc9330cc95ca847e04aec7a9450de48904bf583265aceec5984e8384e78a37b16a65435962ffc3ef458019b5ebedf SHA512 af63cd6c2c998533fd518abc6f48d1acb0f185e3bc9c4747301f7c7f3b3780e456f32db0252a0a03306dbc19a63d24c031fcfb7c35d732190fa68763e5817dcd
+AUX 3.0/900-musl-coroutine.patch 842 BLAKE2B 21b58911e2c020ed956a837f006b20f30a123f96a52b19c62093f9d9fabb2f812fc3de8539c67a1b9aa4d106d5b7b2e91729e7aba030ebbdc67b1b3f590bf560 SHA512 ba292e5465c09df675fef34a77bbf4e16ebd807d2e5174d0e3f94be26e0694ea84dc46ee25de2d3b882b906779f0d08a173ee4c708f20b4f7f1032a238d8896c
 DIST ruby-2.6.8.tar.xz 11599488 BLAKE2B e5b2949233d8540f72d4d8b9c246f9bd0d1342426d2a1c19cb240b7c86f37299e9dc1dfc98ef2a86d1d91055865b4542d690de5567c71189bf2973a4989fa0fd SHA512 d040ad2238523587d8f356fcb796b8b6ad7f8caff7dd6df09e3f7efcbfa0369e33600e78c7f2bc713ae77c040757cce5c4fec223cb9070209f2bf741899c556d
 DIST ruby-2.7.4.tar.xz 12067588 BLAKE2B 2680a7ccd1daf3d156d9519d9132853e68f5f1aad592abce3e73fdd03314a6c28e7d94590153aead86af8952ff51f804ee029f8100b0137919cc27373cb8b9cd SHA512 2cbb70ecfdd69120e789023ddb2b25cab0d03bc33fdc367a8f74ca8a3ee785c18c8ded9de3ecee627c7e275ffb85147e6abf921b6a61e31851b37c7fedf45bf9
 DIST ruby-3.0.2.tar.xz 14746080 BLAKE2B 47c5591261fb63b1ec3ca719ea6b0c348937456c3711351c1f5317d1e6a748de197e90c8bd4ff822f7b2d4580ad7ed0b54b9eb7aaa5166ea1a15ab2deae96439 SHA512 0f702e2d8ca1342a9d4284dbdd234a3588e057b92566353aa7c21835cf09a3932864b2acf459a976960a1704e9befa562155d36b98b7cda8bd99526e10a374c4
 EBUILD ruby-2.6.8.ebuild 7481 BLAKE2B c37e80c3f6debd1befd5d8b5cfff7ffa547557e94fecfb51c962a7a4ce6052fd047d9f5f143302d5d53887bac0463b65f2649b199625430fd5a49e32c565884a SHA512 b3be72cde078972a1e6dd9969dd7dd085d4fed10d2c7a87128773962955e788cd11868a93f44adb2887a23bffebca3a4155309bb9cb0af55fa2df851f48410c0
-EBUILD ruby-2.7.4.ebuild 7720 BLAKE2B fd322cb2b1e580e2bc64c273f5bd6983b267dec2f3b3cd5a13aef3ef3406936f5a24802f0403afa787a92a803f98a9b17bf2323ae1b9f2357c2c9ee500d001c1 SHA512 3e438dededf89ee6ad6d7e7e9c842714c6f904023ebcd11de25ddf8520170c3057515392640503264d3c7041e19fbdc81a990eb032e09c7f7af28ab80779b832
-EBUILD ruby-3.0.2.ebuild 7684 BLAKE2B 8783bf44e0da28ea94b68b65795d551e88e25628284ae1671074b38843a39d52a908e82ae6ce6e4ad91e7c1ef37d307ded17c153a0cbbc15bae6f92222351b0e SHA512 582bf0a50b4d0f00bfaba643ea2ef79a22c354b8650da1dde2d05e11689d0ac0f8e67b79793451f6a246e8f30be4760188e5f08164169a91a1e1ee90aa62574c
+EBUILD ruby-2.7.4.ebuild 7794 BLAKE2B 56d2afa53101a685e10b4035fbc255dcde9bb43c99aec8a6268f420109bcef1495d690ee86cab704f39ac9faf11f99d95cb31bb022e134bfb8c272c851d2348e SHA512 3363c57844f706a93b397eb23bbda7665465b65b8930bb73cf06e4bb027f588de4cf4df6d5183be8e651e10df5a49625a43a172b7d3496458bbb20a507330048
+EBUILD ruby-3.0.2.ebuild 7803 BLAKE2B 56b59ef10cc36a467f8778a4e2f3115c8647664a2800535c79cffc932b7bb836ba43dbc81d87c20e394f3a276fd2260a1bb0b3db67dce2bb66fb86b7cdfe3d16 SHA512 68066fa039fcdecd83ff94314780e4acc7d1ba3a55f5028b7dea72cc9794f1478086b2e6a2aed03168351324ab5dd8791a1e2f086b5ee424aa531d8dd11142c8
 MISC metadata.xml 524 BLAKE2B 78b64ea8e53d1bcfa249561354ef45ca34cdbcf6c4147944e98e6a17d884f5b4b29c0ddb6047bf2883a57f9a53386626bb7a779ef80ddcb33301d0e3822ead6b SHA512 1b254526486eb7d1d132f1286056d55963cb569ab47ccc94d625a9789e4dd3c45b5639510535543d96d2d7a3ccae13535e2e35ba9d78873d75ecac3bedfae762
diff --git a/dev-lang/ruby/files/2.7/900-musl-coroutine.patch b/dev-lang/ruby/files/2.7/900-musl-coroutine.patch
new file mode 100644
index 000000000000..ed47c54e29c7
--- /dev/null
+++ b/dev-lang/ruby/files/2.7/900-musl-coroutine.patch
@@ -0,0 +1,41 @@
+Adapted for Gentoo version 2.7.4
+
+From b570e7de87aaad8c903176d835e8124127f627b3 Mon Sep 17 00:00:00 2001
+From: Andrew Aladjev <aladjev.andrew@gmail.com>
+Date: Sat, 26 Sep 2020 12:58:06 +0300
+Subject: [PATCH] fixed default coroutine selection for musl
+
+---
+ configure.ac             | 5 ++++-
+ coroutine/copy/Context.c | 2 ++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ab5d532c103b..084f0936c006 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2364,7 +2364,10 @@
+             rb_cv_coroutine=copy
+         ],
+         [*], [
+-            rb_cv_coroutine=ucontext
++            AC_CHECK_FUNCS([getcontext swapcontext makecontext],
++                [rb_cv_coroutine=ucontext],
++                [rb_cv_coroutine=copy; break]
++            )
+         ]
+     )
+     AC_MSG_RESULT(${rb_cv_coroutine})
+diff --git a/coroutine/copy/Context.c b/coroutine/copy/Context.c
+index c1b4144e9857..94a7f57f7d89 100644
+--- a/coroutine/copy/Context.c
++++ b/coroutine/copy/Context.c
+@@ -5,6 +5,8 @@
+  *  Copyright, 2019, by Samuel Williams.
+ */
+ 
++#include <sys/types.h>
++
+ #include "Context.h"
+ 
+ // http://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html
diff --git a/dev-lang/ruby/files/2.7/901-musl-stacksize.patch b/dev-lang/ruby/files/2.7/901-musl-stacksize.patch
new file mode 100644
index 000000000000..e5fcfce2195e
--- /dev/null
+++ b/dev-lang/ruby/files/2.7/901-musl-stacksize.patch
@@ -0,0 +1,26 @@
+musl has a conservative stacksize, as compared to glibc, so treat it
+like other systems with such stacksize
+
+diff --git a/thread_pthread.c b/thread_pthread.c
+index 951885ffa0..e2d662143b 100644
+--- a/thread_pthread.c
++++ b/thread_pthread.c
+@@ -721,7 +721,7 @@ ruby_init_stack(volatile VALUE *addr
+ {
+     native_main_thread.id = pthread_self();
+ 
+-#if MAINSTACKADDR_AVAILABLE
++#if MAINSTACKADDR_AVAILABLE && !(defined(__linux__) && !defined(__GLIBC__))
+     if (native_main_thread.stack_maxsize) return;
+     {
+        void* stackaddr;
+@@ -1680,7 +1680,7 @@ ruby_stack_overflowed_p(const rb_thread_t *th, const void *addr)
+
+ #ifdef STACKADDR_AVAILABLE
+     if (get_stack(&base, &size) == 0) {
+-# ifdef __APPLE__
++# if defined(__APPLE__) || (defined(__linux__) && !defined(__GLIBC__))
+ 	if (pthread_equal(th->thread_id, native_main_thread.id)) {
+ 	    struct rlimit rlim;
+ 	    if (getrlimit(RLIMIT_STACK, &rlim) == 0 && rlim.rlim_cur > size) {
+
diff --git a/dev-lang/ruby/files/3.0/900-musl-coroutine.patch b/dev-lang/ruby/files/3.0/900-musl-coroutine.patch
new file mode 100644
index 000000000000..a323cdd6e770
--- /dev/null
+++ b/dev-lang/ruby/files/3.0/900-musl-coroutine.patch
@@ -0,0 +1,28 @@
+Adapted for Gentoo version 3.0.2
+
+From b570e7de87aaad8c903176d835e8124127f627b3 Mon Sep 17 00:00:00 2001
+From: Andrew Aladjev <aladjev.andrew@gmail.com>
+Date: Sat, 26 Sep 2020 12:58:06 +0300
+Subject: [PATCH] fixed default coroutine selection for musl
+
+---
+ configure.ac             | 5 ++++-
+ coroutine/copy/Context.c | 2 ++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ab5d532c103b..084f0936c006 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2364,7 +2364,10 @@
+             rb_cv_coroutine=copy
+         ],
+         [
+-            rb_cv_coroutine=ucontext
++            AC_CHECK_FUNCS([getcontext swapcontext makecontext],
++                [rb_cv_coroutine=ucontext],
++                [rb_cv_coroutine=copy; break]
++            )
+         ]
+     )
+     AC_MSG_RESULT(${rb_cv_coroutine})
diff --git a/dev-lang/ruby/ruby-2.7.4.ebuild b/dev-lang/ruby/ruby-2.7.4.ebuild
index c067a680a09b..91fa086e55cc 100644
--- a/dev-lang/ruby/ruby-2.7.4.ebuild
+++ b/dev-lang/ruby/ruby-2.7.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
 
 RDEPEND="
@@ -65,6 +65,10 @@ PDEPEND="
 src_prepare() {
 	eapply "${FILESDIR}"/2.7/{003,010}*.patch
 
+	if use elibc_musl ; then
+		eapply "${FILESDIR}"/2.7/{900,901}-musl-*.patch
+	fi
+
 	# Reset time on patched gem_prelude.rb to avoid the need for a base
 	# ruby during bootstrapping, bug 787137
 	touch -t 202001010000 gem_prelude.rb || die
diff --git a/dev-lang/ruby/ruby-3.0.2.ebuild b/dev-lang/ruby/ruby-3.0.2.ebuild
index baa8d04f1336..ae8a7216c6d8 100644
--- a/dev-lang/ruby/ruby-3.0.2.ebuild
+++ b/dev-lang/ruby/ruby-3.0.2.ebuild
@@ -67,6 +67,11 @@ PDEPEND="
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 
+	if use elibc_musl ; then
+		eapply "${FILESDIR}"/3.0/900-musl-*.patch
+		eapply "${FILESDIR}"/2.7/901-musl-*.patch
+	fi
+
 	einfo "Unbundling gems..."
 	cd "$S"
 	# Remove bundled gems that we will install via PDEPEND, bug
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index b3bf1cc599e3..8b76129c8c07 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -8,7 +8,9 @@ DIST swipl-8.3.28.tar.gz 11350778 BLAKE2B d90a939c27a8b9e57ebf52f5e7cd1b2f9f5f07
 DIST swipl-8.3.29.tar.gz 11362591 BLAKE2B bc541be585d81f04aac82e6ffdef51e816d4ec18f0b517e581f0a8edc89966958d07fe5f3ef11120e17bb5823e3fd26a37fd072895f5dc63be4d4021e109d063 SHA512 2845246b3e8d14b1050cb55685f22ad3be9818ad4e5915e223a55c85bcb51f2dfe8338beceae27a2ed92aa8b2fae209220a4e06deb6e629cc3bbf6019788f917
 EBUILD swi-prolog-8.2.3-r2.ebuild 2661 BLAKE2B 34a523f318cf39453bb07e8f484958585180f77b5cec51ccbc5f1cc5f26016dfa01793e1cc98ddd26dea30e33bdfb8ee14380a7465080fcc4f2b9edefc9675e3 SHA512 554e2e2c587fd0b7de160f8789ecfa8459149c2fca221fb7c8df9bb789b91247ae22eade75fc52b614eba2548db2314a013676c4c0bc7883a2166db0e8028ca8
 EBUILD swi-prolog-8.2.4-r2.ebuild 2854 BLAKE2B 61ed52d692815431f8965aaccb426dab4af427794b7fcc8b9882d16c535386d834b3433a5e0694a9848d41f28f8e56dd27ba1b54da1341b32c141e008c479736 SHA512 a13d74f6e0e69f7a219fb03e18f7de143e52a7e9ed5fdbac8da6dc0e1058802b70491ecf6a81b335377421ac6ecee1cf6aa035579b659d12c5d4ce37e0ec8624
+EBUILD swi-prolog-8.2.4-r3.ebuild 3179 BLAKE2B b7915971a67b22780cdc5d9e7049625da526b3406a2d016037de5387715a0a115fb9518a355d7484eca462246e2c4bccd3eeef6a4c26b9ca550e156ed887e466 SHA512 ce973ad56f63d7d25845f6bc7608ea9a54fb972453f4c62ccdb2c5715a680e752d4a5038ba24dd1c28bc86c31629b4541decb3e1078d23665a9eb87eb3001f4e
 EBUILD swi-prolog-8.3.27.ebuild 2853 BLAKE2B ac2ef59af6d586e10fb5891e7f2869c9792d0e5007d74cfa56b703a6c7ed0574f0698d3d1f683778fba1285c1014e6bf114fa7b5792fcfedd1b272e13c167335 SHA512 838263f5c7767e6c06abca9824edd02db7554daeac9b2146bea2e76e11489eef56c7df5d314b20e4625b715a3f38167a32e058771441cba08527e475759761e8
 EBUILD swi-prolog-8.3.28.ebuild 2949 BLAKE2B 5a9bf0e0c1516d27c82548a964c983071bd5d27b21a441917fec53ac9b1123ddca9fd58533d141ccea50e88119a5b76d88dad976b7312f5c254b78df65df5424 SHA512 d4781009075e399ef507c38273c250aa5761cd965ac57f2d4d62567f023b90fa9113f7c104224a4cf8836b2c6cb48a4d99ee8f3df0dd9bb00c9794d1595088de
+EBUILD swi-prolog-8.3.29-r1.ebuild 3275 BLAKE2B 0d60e625d01ab4e08de0d9f09e8632e2c0604fbd4115bc85df6d051c2491d6db235b24ae40c7bb76b414d465e812ce46333bd4d5a98c17ee7669b8263e1dee7d SHA512 d992c634c53d3b29c05fdde8202227fba26551850c63e806335cec2d88a2324804f784ae9bb36de6b54d7e87987af2f3a0178c4a15be22a247f93ef1daf4f8df
 EBUILD swi-prolog-8.3.29.ebuild 2950 BLAKE2B 2937554a047b19bc912ae4db649e200fa12f1d3a8b20e4376649c29716dd05ee1cba2db70cfb7531971eecca6feedee6b86babdd36ff60c6f861854bb44e76aa SHA512 08b361f5b98524e1cf74d4becb556269b7e9d2b39b1508dc1d6bbd6adfb4ca4ca87803ba828b178d7ea6ebd6567ebe8f1fb219db5a9f2ed368a50f66a05dfda4
 MISC metadata.xml 420 BLAKE2B 9818164553dd7e47db556eebaa71cabc54621317465c3ef09a0fae22259c9d20bede548a61ffa383e9df8eaf6efa6b5ac800d49b1ee5cae3691d0112ed4a2a30 SHA512 6ce90a29c77852e822d5c35c4a1b0b4a093cb90070656b06b09337c57f00fb6ff42ae3c8178a22bee17ffcec8f40ea4ed6c9d0cecf4afe74e01b3389479fa4ff
diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.4-r3.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.4-r3.ebuild
new file mode 100644
index 000000000000..2b6f4bef271d
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-8.2.4-r3.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg-utils flag-o-matic
+
+PATCHSET_VER="0"
+
+DESCRIPTION="Versatile implementation of the Prolog programming language"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-libs/ncurses:=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	archive? ( app-arch/libarchive:= )
+	berkdb? ( >=sys-libs/db-4:= )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0= )
+	ssl? ( dev-libs/openssl:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	uuid? ( dev-libs/ossp-uuid )
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+	)
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXinerama
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )
+	yaml? ( dev-libs/libyaml )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+
+	sed -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" \
+		-e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" \
+		-i CMakeLists.txt || die
+
+	local ncurses_lib_flags=$(pkg-config --libs ncurses)
+	sed -i "/project(SWI-Prolog)/a set(CMAKE_REQUIRED_LIBRARIES \${CMAKE_REQUIRED_LIBRARIES} ${ncurses_lib_flags})" CMakeLists.txt || die
+	sed -i "/project(SWI-Prolog)/a set(CMAKE_EXE_LINKER_FLAGS \"${ncurses_lib_flags} \${CMAKE_EXE_LINKER_FLAGS}\")" CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use debug && append-flags -DO_DEBUG
+
+	local mycmakeargs=(
+		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
+		-DUSE_GMP=$(usex gmp)
+		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
+		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
+		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
+		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
+		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
+		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
+		-DSWIPL_PACKAGES_YAML=$(usex yaml)
+		-DSWIPL_PACKAGES_SSL=$(usex ssl)
+		-DSWIPL_PACKAGES_JAVA=$(usex java)
+		-DSWIPL_PACKAGES_QT=$(usex qt5)
+		-DSWIPL_PACKAGES_X=$(usex X)
+		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	XDG_CONFIG_DIRS="${HOME}" \
+	XDG_DATA_DIRS="${HOME}" \
+		cmake_src_compile
+}
+
+src_test() {
+	USE_PUBLIC_NETWORK_TESTS=false \
+	USE_ODBC_TESTS=false \
+		cmake_src_test -V
+}
+
+src_install() {
+	cmake_src_install
+
+	if use qt5; then
+		doicon "${S}"/snap/gui/swipl.png
+		make_desktop_entry swipl-win "SWI-Prolog" swipl "Development"
+	fi
+}
+
+pkg_postinst() {
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.29-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.29-r1.ebuild
new file mode 100644
index 000000000000..a2ca0d2e06bb
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.29-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg-utils flag-o-matic
+
+PATCHSET_VER="0"
+
+DESCRIPTION="Versatile implementation of the Prolog programming language"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
+	 https://dev.gentoo.org/~keri/distfiles/swi-prolog/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test +uuid X yaml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-libs/ncurses:=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	archive? ( app-arch/libarchive:= )
+	berkdb? ( >=sys-libs/db-4:= )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0= )
+	ssl? ( dev-libs/openssl:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	uuid? ( dev-libs/ossp-uuid )
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+	)
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXinerama
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )
+	yaml? ( dev-libs/libyaml )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+
+	sed -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" \
+		-e "s|\(SWIPL_INSTALL_CMAKE_CONFIG_DIR\) lib/|\1   $(get_libdir)/|" \
+		-i CMakeLists.txt || die
+
+	local ncurses_lib_flags=$(pkg-config --libs ncurses)
+	sed -i "/project(SWI-Prolog)/a set(CMAKE_REQUIRED_LIBRARIES \${CMAKE_REQUIRED_LIBRARIES} ${ncurses_lib_flags})" CMakeLists.txt || die
+	sed -i "/project(SWI-Prolog)/a set(CMAKE_EXE_LINKER_FLAGS \"${ncurses_lib_flags} \${CMAKE_EXE_LINKER_FLAGS}\")" CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use debug && append-flags -DO_DEBUG
+
+	local mycmakeargs=(
+		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
+		-DUSE_GMP=$(usex gmp)
+		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
+		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
+		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
+		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
+		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
+		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
+		-DSWIPL_PACKAGES_YAML=$(usex yaml)
+		-DSWIPL_PACKAGES_SSL=$(usex ssl)
+		-DSWIPL_PACKAGES_JAVA=$(usex java)
+		-DSWIPL_PACKAGES_QT=$(usex qt5)
+		-DSWIPL_PACKAGES_X=$(usex X)
+		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	XDG_CONFIG_DIRS="${HOME}" \
+	XDG_DATA_DIRS="${HOME}" \
+		cmake_src_compile
+}
+
+src_test() {
+	USE_PUBLIC_NETWORK_TESTS=false \
+	USE_ODBC_TESTS=false \
+		cmake_src_test -V
+}
+
+src_install() {
+	cmake_src_install
+
+	if use qt5; then
+		doicon "${S}"/snap/gui/swipl.png
+		make_desktop_entry swipl-win "SWI-Prolog" swipl "Development"
+	fi
+}
+
+pkg_postinst() {
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 28fd96106d41..47d77e1829fa 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest
index 3eee5752ad30..f538311ef99b 100644
--- a/dev-libs/angelscript/Manifest
+++ b/dev-libs/angelscript/Manifest
@@ -1,5 +1,5 @@
-DIST angelscript_2.34.0.zip 2020026 BLAKE2B f002c67d812cc6453d1e93ffba4aaa4c300926996b74f8d596642625e251ccd14b97473f8f0ff595e3233a3ebc7654c94420ae761eaa0b67439e18472f8df977 SHA512 c26dba452ab52c300da9c95fde8398acf4840cbc0e653ededf978d4a3e942cfe5b77292c74c49dc0279250a27cfd324c696c49d139a97c844b2a1eead9aae2f4
 DIST angelscript_2.35.0.zip 1971850 BLAKE2B 2253583f46181b420514e3f5a4609a33a019e47ac4ef183d1ddbca52610ce421da28a0e67f16f04b873bd18d9c56673bfac5aba152e6fadff84f8fe4718308a4 SHA512 e54b58e78b21c2ff6aa34d5f55b18fcf8737d057c86aef8901ac0c11f14739fe7f1494f9bcfdbca6a8e54b6d0b36a04dd098780bcd02dea5764fd6d22984b6b0
-EBUILD angelscript-2.34.0.ebuild 986 BLAKE2B a3d46781774031df2820e0c5f3755cbf835157866ac2d1ab65a0138e507f1f54cf58573f14c302db07266baa0e977c5047bbde6fc33f5f20625cd045a7b607d7 SHA512 0b22fa066cb4eebd20e1fe093d8365f8fb839c6f138b3841c14b7badb11ba77c3823b407518c8c5e9720ca5e2b943a9cee4f2bee3e261cb4260a94dc7735cbbe
+DIST angelscript_2.35.1.zip 2033435 BLAKE2B b88189fb78294e5804adf313bc333a9a21760120a42b3df78c9c54861718acf435de55dcfb26a8975407102c1182093caed11bfecc6ba946bc7614f62f7e176a SHA512 b15083c7a77434c291e72ea82cfbab7734fa79df654d911a822f306d526669ebe9e55a981e8a1914deda0d2a52ebdc0ffb51a4179f307632c8c7d74b1abc69fa
 EBUILD angelscript-2.35.0.ebuild 993 BLAKE2B d3a12ba2531ce84532b7dcb61a4921fd3caa17820c032c0a79803d4c7bcfad4202c1a3b0c95f1453ebbc0b239c8e7935703d23e181c7dc1cad9420eb2e87e3fe SHA512 148a185791b7d9cf4e51781da3911a9080cf70495b4e1198700791149c4885ce5752775394fc807230b892fb153aced0a8e31bfba90d7cc6cefa76dea70d342f
+EBUILD angelscript-2.35.1.ebuild 993 BLAKE2B 63f4afc6e695bc594eb9ba8352dedd13ae43fc473ed5a34516b288a7565fb7416f599bc8a3b0603d2f8290504c44cc7bc86150bb25ff1bea3b441c433b765e2c SHA512 0a5bbef25caef9d930c67260d065a8fb735f2819e443b4d07eca72af06e5d8a3207b9f353aa7b8a07411ff9329bd88c46b401b03e920baf2be4528037d2e5a85
 MISC metadata.xml 407 BLAKE2B 5d10a87729e294d0df6a7afd624cd4012116e773736aae89ee56763eee0002feca2206d62b22feaa835383c1b0d197966a5e19f48851281b06df0c7cf9c0a4a8 SHA512 883e575349da504d73f1aad6b8e03fe12a1a0c05a33c63cf592bc1919fe926a4f5fcc80fc68deeb026adc143ebee0b96bbff2f32d0d5fa49554a0af28ee69b19
diff --git a/dev-libs/angelscript/angelscript-2.34.0.ebuild b/dev-libs/angelscript/angelscript-2.34.0.ebuild
deleted file mode 100644
index 5020c2d65b17..000000000000
--- a/dev-libs/angelscript/angelscript-2.34.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="A flexible, cross-platform scripting library"
-HOMEPAGE="http://www.angelcode.com/angelscript/"
-SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip"
-LICENSE="ZLIB"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/sdk"
-
-pkg_setup() {
-	tc-export CXX AR RANLIB
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake -C ${PN}/projects/gnuc shared \
-		  $(use static-libs && echo static)
-}
-
-multilib_src_install() {
-	emake -C ${PN}/projects/gnuc \
-		  DESTDIR="${D}" \
-		  PREFIX="${EPREFIX}"/usr \
-		  LIBDIR_DEST='$(PREFIX)'/$(get_libdir) \
-		  install_header install_shared \
-		  $(use static-libs && echo install_static)
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		docinto html
-		dodoc -r docs/*
-	fi
-}
diff --git a/dev-libs/angelscript/angelscript-2.35.1.ebuild b/dev-libs/angelscript/angelscript-2.35.1.ebuild
new file mode 100644
index 000000000000..b6aecfbeccf1
--- /dev/null
+++ b/dev-libs/angelscript/angelscript-2.35.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="A flexible, cross-platform scripting library"
+HOMEPAGE="http://www.angelcode.com/angelscript/"
+SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip"
+LICENSE="ZLIB"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="doc static-libs"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/sdk"
+
+pkg_setup() {
+	tc-export CXX AR RANLIB
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake -C ${PN}/projects/gnuc shared \
+		  $(use static-libs && echo static)
+}
+
+multilib_src_install() {
+	emake -C ${PN}/projects/gnuc \
+		  DESTDIR="${D}" \
+		  PREFIX="${EPREFIX}"/usr \
+		  LIBDIR_DEST='$(PREFIX)'/$(get_libdir) \
+		  install_header install_shared \
+		  $(use static-libs && echo install_static)
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		docinto html
+		dodoc -r docs/*
+	fi
+}
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 4619aecc6f88..f460db64fa54 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,6 +1,4 @@
 AUX appstream-0.14.3-disable-Werror-flags.patch 449 BLAKE2B e6513b3c64b5f99afe8aa231d1885c157a8fb1a0849ddd4e2c015a87df58965ec6ae9c36b536bfdd3969ead61215686021f5e39274e00d9179e7e00c1f975aad SHA512 2e9e2597df81015c2eb91dabd39d3cbb6bcf01b3732a35e68e08e52df40e80edfade620e525d480f46126b5c1080027516a13a524da11d71f5c63844ce714ba6
-DIST AppStream-0.14.4.tar.xz 2309444 BLAKE2B 0c1fd20a01d0fe59d1b1ff029e4fbddbf9cea833d4665549480744e48dc0b3615b0d507278c75025c99ccda21b97e25e62496ecfc49dbe6527132f5dad5d6ad5 SHA512 86bd98e94f3e730d37030be31c6ea0000ba12b35e13778458c0f50bad75babf8c8e93b62492a2546a42f750f91ae81f3456d04e63ad9a4acb804cf38493440a4
 DIST AppStream-0.14.5.tar.xz 2344820 BLAKE2B 714f7004db7579fb293c68e8574f0ebb8cea230e090edbaf459e6e2e0833656d7dd6372bd55c39c5e0b665117015c768990ac8b182a51219823c9cf90360263d SHA512 3f2fff8ee98a5689534802136b9fc8368422ce73c72458924b49beeb5b01170dadf25308bee692cfbc0b0a6cd4b3ee3047e46668a1b76a16b23faec4bf8ae78c
-EBUILD appstream-0.14.4-r1.ebuild 1781 BLAKE2B 3c5ebb2dc3e83dce3dc762a378d7864479adac8dd6b0b679734870c0c872915efc8a8caaa6648bf0e41fdf63b0d2ba84d5a4aa5c2fa478c6ec3c6b38fed2ea79 SHA512 3c7387b09e4e9d253d07b7042630f0feddd0a4418bb638a1f88d22da5c2441a9d3c2fb3f9e725d3e14db4eadee26dcd1b521a50cfc02d5a2eeb2539bd00b43bd
 EBUILD appstream-0.14.5.ebuild 1788 BLAKE2B 6caa408ff4ce96c547fddae9396d6e92d9721febf16d73c32052a93bbfe47add052c4b49185d8616eee1aa79ad3f69a9cac2caa5c6f4ff807063746f3db4ddb6 SHA512 b615ef8dc0d8ea2f87cff9c7b98c3c14eb2dd08369f69ff0119e735a40344fac6b370dcddcf78dc6e74f7433b7c0c81d5868d544cb1450affd846c8e694a377c
 MISC metadata.xml 400 BLAKE2B c9855a1e3650a66c8b42fb9055d6de0aa0575ed86bb1e8695d112f2e7cdfbd5f55d6805dfeb0ed19c3354ee3cda8208fd8a4adf4e8313e791493fa1730fb32d9 SHA512 9723ac7481f748429bddde7579b81c7db2dfad2ecd5150c1c4023843c5ef47e02ce41ff43508437ae60ba427a072d09e8d46a6e6b82fc946ea3af71dd71c52f2
diff --git a/dev-libs/appstream/appstream-0.14.4-r1.ebuild b/dev-libs/appstream/appstream-0.14.4-r1.ebuild
deleted file mode 100644
index 2916ede87699..000000000000
--- a/dev-libs/appstream/appstream-0.14.4-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ximion/${PN}"
-else
-	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
-	S="${WORKDIR}/AppStream-${PV}"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
-HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-# check as_api_level
-SLOT="0/4"
-IUSE="apt doc +introspection qt5 test"
-RESTRICT="test" # bug 691962
-
-RDEPEND="
-	dev-db/lmdb:=
-	>=dev-libs/glib-2.58:2
-	dev-libs/libxml2:2
-	dev-libs/libyaml
-	dev-libs/snowball-stemmer:=
-	net-misc/curl
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	qt5? ( dev-qt/qtcore:5 )
-"
-DEPEND="${RDEPEND}
-	test? ( qt5? ( dev-qt/qttest:5 ) )
-"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	doc? ( app-text/docbook-xml-dtd:4.5 )
-	test? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.3-disable-Werror-flags.patch # bug 733774
-)
-
-src_prepare() {
-	default
-	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
-	if ! use test; then
-		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local emesonargs=(
-		-Dapidocs=false
-		-Ddocs=false
-		-Dcompose=false
-		-Dmaintainer=false
-		-Dstemming=true
-		-Dvapi=false
-		-Dapt-support=$(usex apt true false)
-		-Dinstall-docs=$(usex doc true false)
-		-Dgir=$(usex introspection true false)
-		-Dqt=$(usex qt5 true false)
-	)
-
-	meson_src_configure
-}
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index d7f10179846a..a83738c1a32d 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -1,3 +1,5 @@
 DIST gc-8.0.4.tar.gz 1160528 BLAKE2B ec42378c964fc573e53f6f58aa22fa63a0b421c91b81336acfeb2e2afdb5c89514edace3a9500699e13ff1cadc4205ea245af4f0dfa5e439ed9b78cabf6058f7 SHA512 57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e
+DIST gc-8.0.6.tar.gz 1168660 BLAKE2B c23cb10db54db0e8b16c429e039791086dfec4216ad65fabf072bc0f05df66364d019fccf945bffc32ce12868edfbaf6d9482acb2949d1e233bd89925ab55ebd SHA512 2ea25003d585118e3ac0e12be9240e8195db511c6e94949f20453dc3cb771380bd5b956c04243b2a8ce31508587aa32de4f0f10a813577e6dbe8367688b7614e
 EBUILD boehm-gc-8.0.4.ebuild 1417 BLAKE2B 0a0d40849a901b436928f336c1e897ad6731317767d396aa0b606db1f8c1f21ab4a28e3e9730b5bda2772547903df19950fbbb228e688892b0475664af14d70a SHA512 2fbab201dcbc7eb60c4331f512a1c44947a5be15e70ef5de535cf2571a8bbb64f4a1aa571bcb08c8c2bb8c84eec336b8f01ef1320e08d303d4bcca724e2d3116
+EBUILD boehm-gc-8.0.6.ebuild 1422 BLAKE2B fbf46110e837ef054eb2173816d4ec4165cbafc355a487540133133a503b8ce25c56815f91705e4d981e82e71fbc7b22a54147e62f1f5fd64bcbd2e5a40bcc03 SHA512 66e35b05815d72e218e01412d0f2cd1f524301ecd85011d5d9bc6449608b741c3411df5650bae2972b879492bb6578d02f368331e1d7504d45c8b3f123f07951
 MISC metadata.xml 366 BLAKE2B 29c98f78f2dbe359f1210fb58bd24365791b393cd4bda563185cea4fd35633e0affc82ef00e1e933a1fca0893054d81dd2e1a0c32c861b3cd496766d9decfbe7 SHA512 949dcd60bcde0641526151369de2195e7f784e30e7652087c58f30f3dce1646f619a0c31a0ffdbfa4dc1053d10d713e7e49050c1cf61a7fb8ecb40b479357eb6
diff --git a/dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild
new file mode 100644
index 000000000000..fe999330ff0e
--- /dev/null
+++ b/dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+MY_P="gc-${PV}"
+
+DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
+HOMEPAGE="https://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/"
+SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="boehm-gc"
+# SONAME: libgc.so.1 libgccpp.so.1
+# We've been using subslot 0 for these instead of "1.1".
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cxx +large static-libs +threads"
+
+RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	elibtoolize #594754
+}
+
+multilib_src_configure() {
+	local config=(
+		--disable-docs
+		--with-libatomic-ops
+		$(use_enable cxx cplusplus)
+		$(use_enable static-libs static)
+		$(use threads || echo --disable-threads)
+		$(use_enable large large-config)
+	)
+
+	ECONF_SOURCE=${S} econf "${config[@]}"
+}
+
+multilib_src_install_all() {
+	local HTML_DOCS=( doc/*.md )
+	einstalldocs
+	dodoc doc/README{.environment,.linux,.macros}
+
+	# package provides .pc files
+	find "${ED}" -name '*.la' -delete || die
+
+	newman doc/gc.man GC_malloc.1
+}
diff --git a/dev-libs/crc32c/Manifest b/dev-libs/crc32c/Manifest
index 87f2e3bc1ad3..e1bbc60166b1 100644
--- a/dev-libs/crc32c/Manifest
+++ b/dev-libs/crc32c/Manifest
@@ -3,5 +3,5 @@ AUX crc32c-1.1.1-system-testdeps.patch 755 BLAKE2B 5eedd88abddcb93e33dd4dd37b442
 DIST crc32c-1.0.6.tar.gz 29596 BLAKE2B 5806e0a48cb3048c9b07abb75eb232491483176bbeb98bc11ad1b0ef7d4ce89929ad20b0354906fd67e8773541f9913f3948f1db9a3f3987fe7e2ca67e9d2467 SHA512 c30f6510d6348f15dcdddc06e375f21a69681cd615483d67628b32de747e5e98200fa49faf7e3fc30a1302991fd1f9c9a706c9eb4e13c9c6c09e74066474ea7b
 DIST crc32c-1.1.1.tar.gz 29829 BLAKE2B 5ffb0809e80d1fad81a77d96683d44142a7d84fc15ce18070cdcdb12fd9b67f7ec732a53d8af7dc4b77add859bf64c4fa8bc52a593830de931a7bd12c60498cc SHA512 c276160ec960a38cd535c998336472694819bc6eb37beb711bd43a31441d1808c8a14d3a1f0eccc780785b19f739a4a51f923867a20b0707c465e0cc03f457e9
 EBUILD crc32c-1.0.6-r1.ebuild 703 BLAKE2B 3443d226948d7357e5db97f791a96abf123a4e99573dfed1d3d15a3ed4547f43d8f9e2ed6aa72edbd373770c822582123ac162a197d70016365d489f0b6e5781 SHA512 87923213b411d5ca4c92cadd3d18aa61965e1d50f18c84d9ffbd7a2f789d9353629b768824debd9a1cbb1fb5aedf90e0e216482e907bac63ff684e7a4f61f9a3
-EBUILD crc32c-1.1.1.ebuild 868 BLAKE2B ae499e557adaabaf2b66f4bc0b323fdb4713cbfb2f73657e8cbab6036829bfebe5cacee05718cb579ebf5eb3e1a637073046389d95bcc54913b1c360265d22b9 SHA512 90d74eda12d9262f7b95718f89c5a7d141761490923be58049fa9b3eb9fff9ac8f5c926dd788d0538f33a89b21a6916b7361c8073a2ce1a2efee2fcc55c6108d
+EBUILD crc32c-1.1.1.ebuild 866 BLAKE2B b72361efd51aea538bc2e82fa4d23a10eb954a261334989937a9f3635ce46abb797c1f19a3f4c783b10a2c8ed67040dfb199d7c25dd26b98bf6b84c9bee1d737 SHA512 bb2ad906d9124847f5df27d6980cb59b720b5f7e27dde5933f09b802883d01f3f3a999b968637e147a1075579cb895e5080f6e5e0c7be2dfb6053d92d5cf4817
 MISC metadata.xml 251 BLAKE2B b1949292bb332d69832bf47a05a2f53519bb6c233a09b8e595dac3ca8aff30e213aeefef78bbd8b0b52124b43669042e0d63c476b5dcacb309468bd4f233da83 SHA512 97acf3ebe0b0e94afecdbd634bb9800f9930660cb8f6be45fc54a6e24534a64399549ce1dc0862ab7d9bb3034bccdc6c96931046769846f847b769c9899f6037
diff --git a/dev-libs/crc32c/crc32c-1.1.1.ebuild b/dev-libs/crc32c/crc32c-1.1.1.ebuild
index 6c0d39fcd71f..0086632b41ee 100644
--- a/dev-libs/crc32c/crc32c-1.1.1.ebuild
+++ b/dev-libs/crc32c/crc32c-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 5e227ee54e2c..cfd655d211b2 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -9,5 +9,5 @@ DIST cryptopp860.zip.sig 659 BLAKE2B 591a535092c61964c0fbb1ba31e44e70fc5f15757b9
 EBUILD crypto++-8.2.0-r2.ebuild 1775 BLAKE2B b53a3c343a882953244e8232e9ab7dcafb9ff0dfd60f80449d9057e9ac60811e628668704adc474f88385ae9fe363534990c162ca8af82f1d78c43dd333d38d5 SHA512 491829f87023ec95132521a1605a17b3eb9e8e58b92bb4ebcbae5feed98a058731398858d8c5e0e8af6f63d7df01ff13cc3154b0340f6e4ed7a226ee22fd1861
 EBUILD crypto++-8.4.0.ebuild 1190 BLAKE2B aaeb8f3171c59e2e8061b01fc8e515da289017720b162614ea77d0d7c49dd4c0d558cbf8042272f736a2786e2eb32d05b49669c5df6a1990dcadcae60004613d SHA512 1ec1a83bff3e783106705dfa46dad55bf80026dc0665e58e325f4b43fd314036f33e94a60b392b6fd9b48aae5e2c4534619ba22d4a072ccdfb4e497dd9df1cde
 EBUILD crypto++-8.5.0.ebuild 1447 BLAKE2B d9d8f823078f8bdbe335cc305a11c4f8d4d40b2c23614133a43d330cc183e8af7efe065611aba160e7eb3d8dff264eaf3afae6f26b4b171b2101380d8cc8a273 SHA512 3c7e7827dad7c689926e048349d11f3ada622687ae32813fe9bc9604eecebc04f251470364978ff44170133112a82b07693561f17d2678c61db70ea703b98fd1
-EBUILD crypto++-8.6.0.ebuild 1491 BLAKE2B c0883009b23220a1c17b0797c47a5e743707e6858d192a8fe1c82a0e0e87efbc8d2aa67f579de135751e1239e6214dd9049c1f19b60deb9c24a97206a2527f2d SHA512 3665e5b2de685f647c6131a45c32a178463f72f888da0b2757f8da73b226af89ee75fa906af40b45bd8f310a2eca96f7d3661863f16a2835916f6cb194891b9e
+EBUILD crypto++-8.6.0.ebuild 1485 BLAKE2B af5d71ff66b85afe974b4d8152a12c8453be92b69abe98eee3aeb9b762825e4490583ecde2d8ef4af342737d1e90cc8f4075ffd5cb826f734a39ce9f0963a999 SHA512 c4527ee11924249315dc8ba37adc2484976c9de1ef705ad16cf381732fc1065b3ff3872378e6542e94b59f624ba950a1d087b3d16fd48c633dc5abb1786f54bc
 MISC metadata.xml 506 BLAKE2B 5d6a8770ad53c178e43d30c04be9924718eaf373e8d9945f637db7af71fccf9b21bf46141910ec1cb1ea12e3817dfef4c7881d935fb6f441898ee949ac13ee5f SHA512 8d195dfc2d4f627f59d3a37d4988a0bc59e420a64f8615b819760e32449640eff2f357160b2b9797817d38b0e44c8d6bc04bc4f84a2bd20cfdb7fb5d12df7f2d
diff --git a/dev-libs/crypto++/crypto++-8.6.0.ebuild b/dev-libs/crypto++/crypto++-8.6.0.ebuild
index 93a1b6bd3929..442c22f0aba7 100644
--- a/dev-libs/crypto++/crypto++-8.6.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.6.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="Boost-1.0"
 # subslot is so version (was broken in 8.3.0, check on bumps!)
 # Seems to be broken in 8.6 again too
 SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="+asm static-libs"
 
 BDEPEND="
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 4c6f4cdb8cad..fbb5d9d2c7b0 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,6 @@
 DIST ell-0.41.tar.xz 525240 BLAKE2B 80614190c1237fdbb867300418d474d50e163fba7ca15f4c74c3019b4d407da8319b67be5a88886894dd8869620bae1338e91d28993077690e93260ed1dc3cf6 SHA512 bfbc18195126196776a0d00b4ae8bd8358a6cd1d2f8221132fdae1f323172f148a3faad84a951774ca38a3a72e8d96512b9cac84d9ef3a6cddf4b1490b34453e
 DIST ell-0.44.tar.xz 530720 BLAKE2B 682217828a6a8c6b429bd3760f39fe2d4139b2836daa30d9cd6fe2149c30db63acbeb9be0b4e2f8ed6debf3a6b153950b12995fa5093078f93b4c45b7425bfd8 SHA512 589bf5d8b2954ea7ab38d9673b7ef59729a51c50c20c03b35673bf777b369819222390f471fcd58651f7d51e42375197792119327d4e7e7b101d1bf22c9b7078
 EBUILD ell-0.41.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
-EBUILD ell-0.44.ebuild 1175 BLAKE2B 38153be8a98441d30ba0299302e0913631abee145ad6c2c212ef6d4c9ef7ba97f4408aa79119f2ee6e2ada5731d8811288fcd9d98385f1660efa89d58dc2c149 SHA512 9572ec6ecf0e0bb036934ca776675d1d14694df5a0efda4bc2045e45c2478b2c8c9c1488b9daa123754f3eed2c14a883dc3d1d64bfbf4085961e3720fac7e46c
+EBUILD ell-0.44.ebuild 1169 BLAKE2B ed818bc1b592a9d5768ee4875205a63bedc7c32cad81e5be707e5b345aa78de37e1c337a33fdbae36a934bb2c01e288f5ab27a8af6a3fcfd795912414dd4437c SHA512 b4aab5df0c8036b434c05e46f00277f5b9a111567b3fd1b7ecff52cbb0c6e3678fa8cd9afcba57c43bc316b7416a28582484791d66b1ffb9357e366e3821241b
 EBUILD ell-9999.ebuild 1168 BLAKE2B 229eaef8e41979c42c2a5b5a233cda5701be588f5dc093eb8b288ef3ad05c9216b065cb8e29bf4adc4d8f702331032f9904f443f139ac72936fe776434f32b59 SHA512 e9719214985628d7e6f752df9a69f4576efb2c0e418f9bf44968c0c23ed81ede0483fe9f5f79bf9ef32a18fbaded57fc3c38c582f02bd2e5cd0dacfda5532028
 MISC metadata.xml 337 BLAKE2B 48c0725411f6975e1e1d6783c7c8cb76e0918265c4ac90a762a440e34505db05096bdacc9dba9cf928ae39dc40e94a59305ef5cfa5f6e80c5711909cee1ce1c3 SHA512 b7ed002ca708259ce0a7a1106b944fa5f463fe600ba390059e9b6b7c79f70dc88c76666d7245c0334a29efc1170f6797d710e14811f187856406c1f9d6812e9f
diff --git a/dev-libs/ell/ell-0.44.ebuild b/dev-libs/ell/ell-0.44.ebuild
index e2a5fd2979c4..21c528b64073 100644
--- a/dev-libs/ell/ell-0.44.ebuild
+++ b/dev-libs/ell/ell-0.44.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 813f84fbfd6e..3207f698f984 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,5 +1,3 @@
-DIST folks-0.15.2.tar.xz 489236 BLAKE2B 63bcfedb88205b37c6e9595c3e0c34f7fc869045648e04042cce9300776e4b7d102f91312434545581882f0959502be7ba1bc2f77d50ec2af7f649444da9197d SHA512 c327e39b7cf32b72db3f84504f8ec2a4bc2d98693ca5ff21c3b544e37b58a1df9241dd1be541a39be83468b62dd0f5d7b5a3a0ca4bde5e94d1e075d77d3be505
 DIST folks-0.15.3.tar.xz 491432 BLAKE2B f11123a2c41c4a36c002b26f3c3616d62e4a74bbddbde84643143404497c8e3c31d8cafc8bff0ba4714606259aaa6f7adf352ba4bb98a20c75a181ee68bfda3a SHA512 dd54aef470990974bfc9b22fb83c868ca9674608ccfddeea1bb7507dfc77d7d12a43d43462957b0bb99bf249c13868ba7326f7fd7e38de8802a3ba54e33d8d58
-EBUILD folks-0.15.2.ebuild 2236 BLAKE2B 26740bbbd0ece731614d8023d803ded59e2f31a460cd1e2441b374a07be5d673e00eea984f6ddc93a859dfeb4ed1b95c31fe63c35a219a84c04806185aecb5fa SHA512 6edb3876d6c904a3a166011440edf925146ac6c554201ad06b369ea7f791ab9d65ac68a3db02db6babd834320e7102f969f2d84620fae531fb9dea50df89e555
 EBUILD folks-0.15.3.ebuild 2342 BLAKE2B 7c8163357b69e5fa6ee31f43bd0b44d80113373c7d54e4e4356be0d3f97cee0bd786579fdba66e075d1c5e1f06915e69a447c68310d1ef97d91629ab4efca838 SHA512 5c8e12e8d23ca8edbd75fbe025d34dd50d4e655f64dd4b6cc2263978a59ac9b58c3fcf36db8e3b0435cbdc3c092390a94033ca1b9b56b6d5406f73d69094317c
 MISC metadata.xml 396 BLAKE2B f4e55d5af852a227b66080749510b9915ac9c3f7081c88051f06be73465235ccc326db015238366e62c40d6e8027eac233644ad8421eb0b59f881e2ec215a1e2 SHA512 4a6a15a7ecee35f43c7f82d24e82c32ca3811058f5135e473e15bcae21fc3023d61a6c9f638c9d97336baef3fa8126ab31a49eb036545f521dab2bf93c2a0f0a
diff --git a/dev-libs/folks/folks-0.15.2.ebuild b/dev-libs/folks/folks-0.15.2.ebuild
deleted file mode 100644
index dc0e45aa8416..000000000000
--- a/dev-libs/folks/folks-0.15.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.48"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/26" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-
-IUSE="bluetooth eds +telepathy test utils"
-REQUIRED_USE="bluetooth? ( eds )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.58:2
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	telepathy? (
-		>=net-libs/telepathy-glib-0.19.9
-		dev-libs/dbus-glib
-	)
-	eds? ( >=gnome-extra/evolution-data-server-3.38:= )
-	dev-libs/libxml2:2
-	utils? ( sys-libs/readline:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${DEPEND}
-	bluetooth? ( >=net-wireless/bluez-5[obex] )
-	telepathy? ( net-im/telepathy-mission-control )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	telepathy? ( net-libs/telepathy-glib[vala] )
-	eds? ( gnome-extra/evolution-data-server[vala] )
-	test? (
-		sys-apps/dbus
-		bluetooth? (
-			$(python_gen_any_dep '
-				dev-python/python-dbusmock[${PYTHON_USEDEP}]
-			')
-		)
-	)
-"
-
-python_check_deps() {
-	if use test && use bluetooth; then
-		has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth bluez_backend)
-		$(meson_use eds eds_backend)
-		$(meson_use eds ofono_backend)
-		$(meson_use telepathy telepathy_backend)
-		-Dzeitgeist=false # last rited package
-		-Dimport_tool=true
-		$(meson_use utils inspect_tool)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 510ad1310ede..5e7d48dfb6d5 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,4 +1,6 @@
 DIST girara-0.3.5.tar.xz 60488 BLAKE2B 2d0f2f0635e8e8906810b1425191f5d70b7f9af0985c461bd90654e83d87ad698da225d70064438fed4473295aca8dbd26c4ce1efd96f8a7399e7145b1f8c111 SHA512 e7c5bf887b29767878502224ad45d62e43b3da91bd8e754603256550d4f0126f1493f0fb7473a4ebb8cc5909306564249c6a60e99eba2b0b417b98c728fcdc84
+DIST girara-0.3.6.tar.xz 60056 BLAKE2B 4a9f651e2127c7924cd3e55c7f955b3f80b90849b5ee06f2785388ae3adbb8910bb90e59f934f426fdb6d8e7d797ac82a52bc7b05becff56e1aff610e5e56081 SHA512 e9496b1bb629d59377ed1fee8a2fab2c7e5d60845e6777ed9bb796e1843fea20abda32d7de885f01e892654ea996490403c442021528b6b4f2aa50cf54d74c42
 EBUILD girara-0.3.5.ebuild 964 BLAKE2B 51d28f0e2c7655adcaebc3951b12895ec5adeca8d066ef901c236f93f5ee6b1734d3b98f6e2c85bd7b6aa00bbde60915e3fd15f01530365adfae7a4f1f4b18de SHA512 9540e0664f7c4ebfc3f856df9e78bed86dcf98403fbc43a2971635014a1968b63b1ee8257b35ca2eabdc2c989f0afa9dd76433aa94a09bde4ff3e1aee9500c30
+EBUILD girara-0.3.6.ebuild 967 BLAKE2B f105816e38708efa8ec963e953a878aee03ef216308bb26d5bf5c4fdf6bd1668a215641354ba793ae896fdc53ddc8262ca81dc58e04f8cec66935dd2734abdb5 SHA512 4ca523fa13be09ad4bb7afc7d9d70280e38cdf592fe3e6e4a5f6020534e7716529909c7035344133b51aa722f2431ffa00f2d3b8c1b8460c6995d93cffca232e
 EBUILD girara-9999.ebuild 1102 BLAKE2B 7d305110e6e6c72090a938d9f4c46f39f58a9cdf6cc5eb704b43c683772e069f9888f2bc4ec59e2ab1a8fefb64d0be165db2d8412383b4b3e0a5d78cc7e02192 SHA512 f0f8a6a60d25c2525b2724fb8143f6dfccfc5cb05cae8c1acf350575ddabf80fd4f1066797f9556a839f824a4a87e0c9ebcbbd5a2169e764232eaeb157cab3f4
 MISC metadata.xml 582 BLAKE2B 2ec3bae683d84fb4fd9fbf5114606ac1191df2ca8ac2fdf46b5b4da32999342af02881c67b96df28b39499bed88db1a6512922df437b2a3335fdf62ee56a57bd SHA512 86df21ee24a4f91bbe8329b197ebe7b327ffaa1949c66d7cea4a3cb955aeafa122192c2d2178234b014d5e3824a041641243ebc9869a789d5238942fd6c200cf
diff --git a/dev-libs/girara/girara-0.3.6.ebuild b/dev-libs/girara/girara-0.3.6.ebuild
new file mode 100644
index 000000000000..712c70f1c1cc
--- /dev/null
+++ b/dev-libs/girara/girara-0.3.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx
+
+DESCRIPTION="UI library that focuses on simplicity and minimalism"
+HOMEPAGE="https://pwmt.org/projects/girara/"
+
+if [[ ${PV} == *999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc libnotify test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/glib:2
+	dev-libs/json-c:=
+	>=x11-libs/gtk+-3.20:3
+	libnotify? ( x11-libs/libnotify )"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )
+	test? ( dev-libs/check )
+	virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		-Djson=enabled
+		-Ddocs=$(usex doc enabled disabled)
+		-Dnotify=$(usex libnotify enabled disabled)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index c6889affadc5..2df4621fd3f1 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -3,9 +3,11 @@ DIST gjs-1.68.1.tar.xz 558920 BLAKE2B f5364fe92ddf4cb1e9b5dac5921fa180ed31bfe54b
 DIST gjs-1.68.2.tar.xz 559432 BLAKE2B 09146cadcc17f16c36f2a07108b086850d51d95cba21ca95ff0311dd107835b6c5fc9d5d682c9c6713ebd082372f8b46aae31b71f7f5e0e03dcb0d47c5d3c72f SHA512 a42d4ee7be92c869ad9e74c0e02debbe62d13fd0926aa0d903efe802d0f8bc6bc18959d4e161b3960261f9e7b9c0de1d4df5cfcf1eabea29fd75063af8cba154
 DIST gjs-1.68.3.tar.xz 559792 BLAKE2B 0e625c80164ea6053941ce04d00ac688e7a2ea79150dba8849ffc22ae51951d3a6442d8a28755400331a13bf8fcff01dc299d37e61d165de61bbdc1416298f63 SHA512 1b93bdce97b81ec439cde7824491661fc7e4296464a41e4357fc902ec62024e855a4dec24ae7dcb01ec57d4a0019ab2c4aff0b3c08fb94c7beecdefe34226d46
 DIST gjs-1.68.4.tar.xz 559768 BLAKE2B 0e5f2cbb5b93c7ddc05916c95f23d9438c8e76bc2eb35c11eca5414d9f4327e0c99ec9c85795880bd478de5e3655da0f7e9223ba4c3f7c8d5685bdb4a00920d5 SHA512 c610abfa701c0a61ffa6916ec5ebcd07b1dcb04607d74ab0b6d30583da27d60f9993e037fab73e66e1580d644d3a57f0a479f55a09e3bf56fea7f17367c787b3
+DIST gjs-1.70.0.tar.xz 595292 BLAKE2B fc06f4b397350daf19a532a3ec3c2851e106bc76dda41d4a9c32b2718a6f5add1bf0c1066ba9cc5aaeeb192cb4f0a0e3dba1c16826fb3157c0a1e0a8bfe88606 SHA512 e32ee511c34fa9af210061a106d42de67d40c20f398dfacc541db0323bb4a499f2552aa28028eba16ec42afd4dec5a0cea4292155a66b966c3731ded45b23cb4
 EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df80632b13ef2ce357ecd5cd3030a3816258317977e1fce9021e87650d6128d71f773704b7340b6319c419f5b SHA512 229e77055f686debdebdd32e667ad59e706a77346772c8fa6164425bd3e60cb4947d477af9925aa4da8f90eaf55807ebea6c05c85acc594367bb4745f73a576a
 EBUILD gjs-1.68.1-r1.ebuild 1120 BLAKE2B 19bcb66930e48d86adcc80fb753b5cd97b26c137e0a35ff98ddae38dba162a7dd82522e5f25ea2e4f62ccf46829ad89e654cae583bc0d2628bcebce63426461a SHA512 211799f2a201f419f6122fad8f98bfa3cfc904b566dffb6ab2c1a6195c5651834b0f60738d4f7c654f49782ace3c9f5d6c103153ad523e306fdc07383654e93e
 EBUILD gjs-1.68.2.ebuild 1125 BLAKE2B 13fd2a1ec2904660be057b1ef8702b704161dbe23796634bb62fab968d156cdf462603ec02a147f2d9ca0d9724f7769ca502613bcb640c90f0ea829f308dd8ad SHA512 b5be649efc4c5835701675423fea9153439d3f17232c9b16d2220588c7b8bdf2abf03a8c5334c18e7b9941e02b5e4a7ab9c961c563a910d5a41a84198b41be85
 EBUILD gjs-1.68.3.ebuild 1123 BLAKE2B 0c93c957a12a41b9233a5b307de829ee1a477d13cf6f5517ba8bf2c33d0aa3f2d9373c59f4d4f66d403dc8585a8b7bdf24bad9c4690a3f0408bec48af9a185a7 SHA512 1558ac302ca7f12655b8de50637ecdd9790216749dbf52042440dceb4e89622ef36509e2b64656cd81376303d4b98ec0feec88ed50cd7483603fbe6c6b72c6c1
 EBUILD gjs-1.68.4.ebuild 1122 BLAKE2B 1f1ddf1335f6651e95f1c0eed3a8bbd79fcdd457ee9d662333f36c260e78db28dda58412169c8c72802f83b616d099b67316854f35eb1cd0a588b00e45df336d SHA512 5bc16f6c8c1f4e5aebbef6595f1cb1a30b6fabb530b998d591a35aba28ba1e0a40508adc825f5b09f9b171d1bc099ef5c714fa28f36ba4f235196cd1a8645643
+EBUILD gjs-1.70.0.ebuild 1189 BLAKE2B 29ff3e597493e433fd70b443c0e6f12f0667d86a1b6c4dec38ff559a74c17641a6ab4e1a89182e0413146af473ede2bf6e0f6381ea0ce44b5c6f0c7409c10832 SHA512 722f5b3365e37f697dcc8cbaa484067bcd92ad793180089b17c2bdfd306016668dec439fafad2772092aaabb6da78214b19e27325ccfc5cd135c2c4c98804b51
 MISC metadata.xml 389 BLAKE2B 68d318dc917f5072b08e83506e14d0f4b8f25bdb90b95701013466112f8fdd77c2cc193257eee82fbce517e41056eeff61cd20137b697f6d1d688d943bafb8cc SHA512 bc4b0c94d58f3f67cbe481c45fdedb5d601e3ca40b5dcc88ef8c7ad9b214e7cd0d5c47d94599f85c11cd1c21dfd57770fd64d442f4b3f960ebc70a8e16f8e8eb
diff --git a/dev-libs/gjs/gjs-1.70.0.ebuild b/dev-libs/gjs/gjs-1.70.0.ebuild
new file mode 100644
index 000000000000..ea422c9bfc60
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.70.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic gnome.org meson virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk readline sysprof test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.66.0
+	dev-libs/libffi:=
+	>=dev-libs/gobject-introspection-1.66.1:=
+	>=dev-lang/spidermonkey-78.2.0:78
+	cairo? ( x11-libs/cairo[X,svg] )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	test? ( sys-apps/dbus
+		>=x11-libs/gtk+-3.20:3[introspection] )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	append-cppflags -DG_DISABLE_CAST_CHECKS
+
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	local emesonargs=(
+		$(meson_feature cairo)
+		$(meson_feature readline)
+		$(meson_feature sysprof profiler)
+		-Dinstalled_tests=false
+		$(meson_use !test skip_dbus_tests)
+		$(meson_use !test skip_gtk_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index e0fda7659fa3..e5620258b83f 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,7 +1,6 @@
-AUX imath-3.0.5-0001-changes-needed-for-proper-slotting.patch 7130 BLAKE2B a041a7ce654c32443457b34d9c2c4d0d919b9fe373971675ec265218dff7f8a2b470a44e7af44d27cb4d8c8c4b8f3e405b4b9762e7f8cfa8ad84db9c37f4baf0 SHA512 6407eaf9041105da66bfd70fa6e8b99813f938636dfda10b29aa078c445244b0f188f097bd4540ab3e1f1113faff6e1e7531df5ebbba28b7ab511ebbdae297a4
 AUX imath-3.1.1-0001-changes-needed-for-proper-slotting.patch 7206 BLAKE2B b812c30370a0022824fe8d251e26ce63abc0ba3f970059336cd8402f899ecae456982e4a3cda0e152323005d5eba3adaeee47bbacf78084ae3dbafa5bd0a89f2 SHA512 5df522b31043cbfcaa21c5fca4e4d6866f3ed93530fd0beba81d2c6c684003cf3214e3e011816996e76e177cdb60d1aec584c454664362e6079f1efaf9e857d7
-DIST imath-3.0.5.tar.gz 528503 BLAKE2B c1fcb199a81aff25f1ad26ccfcef2802861401f3fee5dc24035216aa16fd9a5344ec6c37139a0850f1a4bc580dc1fdd068eca9473a19e4aaf329cfc5f53a4cd6 SHA512 df206315d822266cf32a5a4399abff7ad1dd0bd1f0372d61f61516e2acdefd13e3cfd9cf54373a3fb49bb28c9f80915ca5ecaec2a068a1d6ea231d71a5316da2
 DIST imath-3.1.1.tar.gz 568231 BLAKE2B a1210b5f6ff4723a133d317c2b40338e387973a1409868a218192a53778b86a0912c77911bdf76286a6ed6931175aec38bf24ddc0c76eed3375b7a2945dba124 SHA512 b2f4cc21e44094ef139a1f04bb997c7e41770ff886457fff00d65ca477ba579c86fd5fbd465998c4519855fcb34328ac834d84d0d011f758f56a20ef79e9ca3d
-EBUILD imath-3.0.5-r1.ebuild 2307 BLAKE2B ea32f43a16047b17499fdbee21978bd3ad824bdc0fa543e31f0ac63b8694f084968fe19e746a2f0d40d92b82fb2501b3342d90cfa7587e33cb775af6814e1a52 SHA512 8bf1d5a7047b62bc5036b38e1d4ae5c5ccd41ac15c6f28de89cec79a5db30ba199e50406075772aa5b74c47ca4e25bf1caccd989b89817930c512aa550dd1eb8
+DIST imath-3.1.3.tar.gz 570840 BLAKE2B b037c9bdee87f58c7a2be9dbda52c89c26eba25fe07342710578f9eef4b90a49b9d5dc5451702c960ae94427d7f748b79b81b7fc9ad350d2252e9e4bf6a1d6cc SHA512 a11f5e736bc49098d735c7903f186c15b03efbec082a8cf2e6635546368035cec0d36c7ae64bfd01bd8eeffb2dd247b8dab19e440a3e1fe33008edacc1268f75
 EBUILD imath-3.1.1.ebuild 2246 BLAKE2B 952a2801dcad6d79c53bb5375f391e9f4e0827b1f0b9c2837a13e77df08baaeb101ed8532ec30012ae2fa05d71f75ff18a9a5e239a148358e19225058a444a2d SHA512 eb9ac6c21b0c8ce528644999da28e0beb6653b860c160961def13f933c7e0af9f3b1439b8224b916851815a6767b0b8ee2fb063a0baf41666f26328c24175e66
+EBUILD imath-3.1.3.ebuild 2020 BLAKE2B a2e3fe8154387da1b3c4da28b5ee1bf398d55ec51a7a079b9a35b5bca9ad1f62a4268d639f4615c7bb563f81a68fcebdb37ac5a860ca527f2393e1e0b914ce3a SHA512 142571ae60baeeec6004a4bdf304bc60a27b25d8ffc744fa867cb51db049019586742cdeb78a0d95c036370c18fc5ff329658291370c81eb13805cf284f42dfc
 MISC metadata.xml 820 BLAKE2B f035962970166d4c636e8b98b9301e31fbc27aecb7059289a7581958619b85c7f60551d56175637d373363a41c7349c8c78ec31348590826313bdca94aec6727 SHA512 9dbff2f917f1705a611680c46f73a0ad372f27f6b5c236f691f16b6c41a51cb3d8712c4bceddb5469742f4952385e2a2b07377c4c216736810562ae89c5c52f4
diff --git a/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch b/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch
deleted file mode 100644
index 74d0f2dff7d7..000000000000
--- a/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 20 Jul 2021 19:18:20 +0200
-Subject: [PATCH] changes needed for proper slotting
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- config/CMakeLists.txt                  | 6 +++---
- config/Imath.pc.in                     | 4 ++--
- config/LibraryDefine.cmake             | 8 ++++----
- src/python/PyImath.pc.in               | 4 ++--
- src/python/PyImathNumpy/CMakeLists.txt | 2 +-
- src/python/config/CMakeLists.txt       | 4 ++--
- src/python/config/ModuleDefine.cmake   | 6 +++---
- 7 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
-index d51c25b..63cc98d 100644
---- a/config/CMakeLists.txt
-+++ b/config/CMakeLists.txt
-@@ -60,7 +60,7 @@ include(CMakePackageConfigHelpers)
- 
- configure_package_config_file(ImathConfig.cmake.in
-   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
--  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- )
- 
- write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-@@ -70,11 +70,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
- 
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-               ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- )
- 
- install(EXPORT ${PROJECT_NAME}
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
-   FILE ${PROJECT_NAME}Targets.cmake
-   NAMESPACE ${PROJECT_NAME}::
-   EXPORT_LINK_INTERFACE_LIBRARIES
-diff --git a/config/Imath.pc.in b/config/Imath.pc.in
-index df11cfd..6eb4f40 100644
---- a/config/Imath.pc.in
-+++ b/config/Imath.pc.in
-@@ -5,7 +5,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
- includedir=@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: Imath
-@@ -14,4 +14,4 @@ Version: @IMATH_VERSION@
- Requires:
- Conflicts:
- Libs: -L${libdir} -lImath${libsuffix}
--Cflags: -I${includedir} -I${includedir}/Imath
-+Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
-diff --git a/config/LibraryDefine.cmake b/config/LibraryDefine.cmake
-index e9ff904..00e5176 100644
---- a/config/LibraryDefine.cmake
-+++ b/config/LibraryDefine.cmake
-@@ -74,8 +74,8 @@ function(IMATH_DEFINE_LIBRARY libname)
-   install(TARGETS ${libname}
-     EXPORT ${PROJECT_NAME}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-     INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-     PUBLIC_HEADER
-       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}
-@@ -88,8 +88,8 @@ function(IMATH_DEFINE_LIBRARY libname)
-       install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-       install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")")
-     else()
--      install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
--      install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")")
-+      install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-+      install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR} ${baselibname} -> ${verlibname}\")")
-     endif()
-     set(verlibname)
-     set(baselibname)
-diff --git a/src/python/PyImath.pc.in b/src/python/PyImath.pc.in
-index 8e8de6f..1902660 100644
---- a/src/python/PyImath.pc.in
-+++ b/src/python/PyImath.pc.in
-@@ -5,7 +5,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
- includedir=@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- 
-@@ -13,4 +13,4 @@ Name: PyImath
- Description: Python bindings for the Imath libraries
- Version: @IMATH_VERSION@
- Libs: -L${libdir} -lImath${libsuffix} -lPyImath@PYIMATH_LIB_PYTHONVER_ROOT@@Python_VERSION_MAJOR@_@Python_VERSION_MINOR@${libsuffix}
--Cflags: -I${includedir} -I${includedir}/Imath
-+Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
-diff --git a/src/python/PyImathNumpy/CMakeLists.txt b/src/python/PyImathNumpy/CMakeLists.txt
-index 7b4f6b2..8f7fd70 100644
---- a/src/python/PyImathNumpy/CMakeLists.txt
-+++ b/src/python/PyImathNumpy/CMakeLists.txt
-@@ -48,5 +48,5 @@ if(TARGET Python3::Python AND
-     LIBRARY_OUTPUT_NAME "imathnumpy"
-     DEBUG_POSTFIX ""
-   )
--  install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
-+  install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
- endif()
-diff --git a/src/python/config/CMakeLists.txt b/src/python/config/CMakeLists.txt
-index 4f796df..15d7026 100644
---- a/src/python/config/CMakeLists.txt
-+++ b/src/python/config/CMakeLists.txt
-@@ -41,10 +41,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-   COMPATIBILITY SameMajorVersion
- )
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- )
- install(EXPORT ${PROJECT_NAME}
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
-   FILE ${PROJECT_NAME}Config.cmake
-   NAMESPACE ${PROJECT_NAME}::
-   EXPORT_LINK_INTERFACE_LIBRARIES
-diff --git a/src/python/config/ModuleDefine.cmake b/src/python/config/ModuleDefine.cmake
-index d9a8907..ebe1a95 100644
---- a/src/python/config/ModuleDefine.cmake
-+++ b/src/python/config/ModuleDefine.cmake
-@@ -54,8 +54,8 @@ function(PYIMATH_ADD_LIBRARY_PRIV libname)
-   install(TARGETS ${libname}
-     EXPORT ${PROJECT_NAME}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-   )
- endfunction()
- 
-@@ -154,7 +154,7 @@ function(PYIMATH_DEFINE_MODULE modname)
-         LIBRARY_OUTPUT_NAME "${modname}"
-         DEBUG_POSTFIX ""
-       )
--      install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
-+      install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
-     endif()
-   endif()
- endfunction()
--- 
-2.32.0
-
diff --git a/dev-libs/imath/imath-3.0.5-r1.ebuild b/dev-libs/imath/imath-3.0.5-r1.ebuild
deleted file mode 100644
index f2fc31012332..000000000000
--- a/dev-libs/imath/imath-3.0.5-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-single-r1
-
-MY_PN="${PN^}"
-
-DESCRIPTION="Imath basic math package"
-HOMEPAGE="https://imath.readthedocs.io"
-SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-# re-keywording needed for (according to ilmbase keywords):
-# ~arm ~arm64 ~mips ~x64-macos ~x86-solaris
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="3/28"
-IUSE="doc large-stack python static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# blocker due to file collision #803347
-RDEPEND="
-	!dev-libs/imath:0
-	sys-libs/zlib
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_USEDEP}]') )
-	python? ( ${PYTHON_DEPS} )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch )
-DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local majorver=$(ver_cut 1)
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DIMATH_ENABLE_LARGE_STACK=$(usex large-stack)
-		-DIMATH_INSTALL_PKG_CONFIG=ON
-		-DIMATH_OUTPUT_SUBDIR="${MY_PN}-${majorver}"
-		-DIMATH_USE_CLANG_TIDY=OFF
-	)
-	if use python; then
-		mycmakeargs+=(
-			# temp. disable for finding libboost_python310, #803032
-			#-DBoost_NO_BOOST_CMAKE=OFF
-			-DPYTHON=ON
-			-DPython3_EXECUTABLE="${PYTHON}"
-			-DPython3_INCLUDE_DIR=$(python_get_includedir)
-			-DPython3_LIBRARY=$(python_get_library_path)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		pushd "${S}"/docs 2>/dev/null || die
-		doxygen || die
-		emake html
-		popd 2>/dev/null || die
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${S}/docs/_build/html/." )
-	cmake_src_install
-
-#	if use python; then
-#		rm "${ED}"/usr/$(get_libdir)/cmake/${MY_PN}/${MY_PN}Config-gentoo.cmake || die
-#	fi
-}
diff --git a/dev-libs/imath/imath-3.1.3.ebuild b/dev-libs/imath/imath-3.1.3.ebuild
new file mode 100644
index 000000000000..8ce94a93b3bc
--- /dev/null
+++ b/dev-libs/imath/imath-3.1.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+MY_PN="${PN^}"
+
+DESCRIPTION="Imath basic math package"
+HOMEPAGE="https://imath.readthedocs.io"
+SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+# re-keywording needed for (according to ilmbase keywords): ~x64-macos ~x86-solaris
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="3/29"
+IUSE="doc large-stack python static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# blocker due to file collision #803347
+RDEPEND="
+	!dev-libs/imath:0
+	sys-libs/zlib
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_USEDEP}]') )
+	python? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.1.1-0001-changes-needed-for-proper-slotting.patch )
+DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local majorver=$(ver_cut 1)
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DDOCS=$(usex doc)
+		-DIMATH_ENABLE_LARGE_STACK=$(usex large-stack)
+		-DIMATH_HALF_USE_LOOKUP_TABLE=ON
+		-DIMATH_INSTALL_PKG_CONFIG=ON
+		-DIMATH_OUTPUT_SUBDIR="${MY_PN}-${majorver}"
+		-DIMATH_USE_CLANG_TIDY=OFF
+		-DIMATH_USE_NOEXCEPT=ON
+	)
+	if use python; then
+		mycmakeargs+=(
+			# temp. disable for finding libboost_python310, #803032
+#			-DBoost_NO_BOOST_CMAKE=OFF
+			-DPYTHON=ON
+			-DPython3_EXECUTABLE="${PYTHON}"
+			-DPython3_INCLUDE_DIR=$(python_get_includedir)
+			-DPython3_LIBRARY=$(python_get_library_path)
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index 2142d48ccaa6..2c6870ed9ee8 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,10 +1,12 @@
 AUX intel-compute-runtime-21.31.20514-no_Werror.patch 346 BLAKE2B 0ffeef51d3f2aa4ccd295cf1317b58343e39c7b32fe2acd52e45c0596c22b4c5fd3d301c333010abc3386b797c05d20860e61496444598c8f271b5e4b0f4fcae SHA512 932d80d81947c96f543f9d8704120e851f1004ba93718566f578610cbe8c2c65a131246bbc0e392135f866f277270d6bfe4424abca25f6cceedcfe17a4e800ba
-DIST intel-compute-runtime-21.33.20678.tar.gz 4534884 BLAKE2B 9a5e7f962be08701bec1e890eeb5b6208694a33b524872494e428b73d46629b7cde1522c6b7d0b27725cc170f1e65391892b253ca84d988b209e41631548b135 SHA512 278284fafe0e2d340668e1c21188b706ab48439c6ea573885d1b060df458e2016ed40e0a0c65e4076378ddb3ab284eb2cd92b1db5e6bd892babf2275ed600341
 DIST intel-compute-runtime-21.37.20939.tar.gz 4576917 BLAKE2B 42563ce897667025100b40f504fe4897222fd28f1b82ac22fb6cfaa6a273b8e9199d57743ab338ab52b32c9598bbf6856530688ca9cbff360db356dabed6d96b SHA512 ed213e2fd234300ac940ffa503a34ae54698e2d359927b3bdcb59bf7ea9d6b950073e9e2e750ec5b8e3e387f0c8d74b4852627c283964fd6a9742dcdc32f518f
 DIST intel-compute-runtime-21.38.21026.tar.gz 4655853 BLAKE2B 28ebfb1cbce30fdefb7104a2b6840ea95d62645ae51a97a0b970aa4344fca7e64eb8f289895c30cf9fe4a0d9e5294490810236c0e565e78383ad7096429e2155 SHA512 08ffaaed80ef5776e6ecff15467170ca143887cda7905a49f7b2d12862ff17e75e7ff89ff2bb76ce25eec4ef32dfc882ac3cddf5a3e71d24adb21cc8c806cf5b
 DIST intel-compute-runtime-21.39.21127.tar.gz 4666632 BLAKE2B 0e63e1bdf152e9995d48bc514ad86ce107ab7a62946b349f88fee3dfea89c93d3c2c7ce0ff3fd670d9944fa563cb409a04ae65820f3bb591f56638a7be54ec16 SHA512 7f526ec6f3c38586f75bcb0acdc312fc954655f2a92f78e820be722c27cac60b961b73897a1bd4ceeb397abdf3565be5e9c0859a0906723cb79e2947df2d2136
-EBUILD intel-compute-runtime-21.33.20678-r1.ebuild 1377 BLAKE2B cf691d661311001daa82c720b2bab9992994a42be7375b3a9372cb9c719a18195b08270f45b332bd37871bad0ff6afb120adce6ae4c40c00be0dca36e57ce68d SHA512 d956347a35e2999136cbe58828768fc37a6ffb44af3e2dd09b6b4425e6dec5ff09fe0fdf8e14e6031ac9543435d7e285978ec93fcb36fceab2bd58a571810c63
+DIST intel-compute-runtime-21.40.21182.tar.gz 4678271 BLAKE2B c8f5c324af0e8ef787b287ee1e3fcacc217c3d935ce859123a217c088323f97a80293749689959be22502e7f569ad0fb917868c526dcea7905e80585e7376f53 SHA512 fdf74ae700a444ba9732938d9cdda3ba6f6baac209ca1611488b405a4ecced7cdd434a9e349af8a095b5adcd583b84294cb831ddc785520cd697a7af1ffa0437
+DIST intel-compute-runtime-21.41.21220.tar.gz 4753783 BLAKE2B a340c2b5c1199498a68aa66c1d88367b99bc2404f35da10135030aa68462a909808fb2358dbc3d75357e00ccf30bb259a325a3d4523d862c0da358eae7528f65 SHA512 df397688423dbe0ec2e61c9a9c8b6ee1ee4451a95ef01aefcc2a0ed956e6b8273a4e9975c9aca592b51b4ce85324f5bdcd6a835f8eab40a0e715eb10000f1ceb
 EBUILD intel-compute-runtime-21.37.20939.ebuild 1388 BLAKE2B 5bffd85ae102c1079ae6d1bab8cfd531f302a1c1c2ddbe5d27bafd10e90c734171128abf686178b97cab9392e38d53c2f09335626a72bb4a756f614dbcf6b650 SHA512 812b0e8e78dde7cf287730efeed5f1d1d58bd542f69aba014683489ab4a6655b4bc07f6a2968a04eebaf59c21f11ab12986d8bac254a3f0a8f4cf90bdbad5db5
 EBUILD intel-compute-runtime-21.38.21026.ebuild 1386 BLAKE2B 0d00917c93bc06395d15e08542148e8a06c91dc095b22122d893dc0112c0b6e134eae91cbb8062938894bf1722f094195b9088b46da22a7941a6dc57fc4ed5fc SHA512 bdb6a276d513e5544b70174fbed3cf2d76e936e5041344a461e3487230e89f47144d0c7569e2fe1a0a6f78f24b31d84271c5cfd79961778899fb87ea2ca5142f
 EBUILD intel-compute-runtime-21.39.21127.ebuild 1386 BLAKE2B e7fa088d3c0869f7a5b251095bc33531a242c555c25ced19182b91786372cdbb0d308a3b6b12c63cd49fd8680d8810a0936582e12bb70a8511d7eeac0b8e56d6 SHA512 e082c0fbfc6d6ca10f2c6ced5f43a2b4071437e79974cf1c075ab4d1319f0786d2d97fa545671b8060cee87a661f755d0833c53ec560c3a2cb424c2aec072986
+EBUILD intel-compute-runtime-21.40.21182.ebuild 1386 BLAKE2B e7fa088d3c0869f7a5b251095bc33531a242c555c25ced19182b91786372cdbb0d308a3b6b12c63cd49fd8680d8810a0936582e12bb70a8511d7eeac0b8e56d6 SHA512 e082c0fbfc6d6ca10f2c6ced5f43a2b4071437e79974cf1c075ab4d1319f0786d2d97fa545671b8060cee87a661f755d0833c53ec560c3a2cb424c2aec072986
+EBUILD intel-compute-runtime-21.41.21220.ebuild 1386 BLAKE2B e7fa088d3c0869f7a5b251095bc33531a242c555c25ced19182b91786372cdbb0d308a3b6b12c63cd49fd8680d8810a0936582e12bb70a8511d7eeac0b8e56d6 SHA512 e082c0fbfc6d6ca10f2c6ced5f43a2b4071437e79974cf1c075ab4d1319f0786d2d97fa545671b8060cee87a661f755d0833c53ec560c3a2cb424c2aec072986
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.33.20678-r1.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.33.20678-r1.ebuild
deleted file mode 100644
index 331420e21856..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.33.20678-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+l0 +vaapi"
-
-RDEPEND="
-	dev-libs/libnl:3
-	dev-libs/libxml2:2
-	>=dev-util/intel-graphics-compiler-1.0.8365
-	dev-util/intel-graphics-system-controller
-	>=media-libs/gmmlib-21.2.1
-	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.4.1 )
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		x11-libs/libva
-	)
-"
-
-# for Khronos OpenGL headers
-DEPEND="
-	${RDEPEND}
-	media-libs/mesa
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "README.md" "FAQ.md" )
-
-PATCHES=( "${FILESDIR}/${PN}-21.31.20514-no_Werror.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_L0="$(usex l0)"
-		-DDISABLE_LIBVA="$(usex !vaapi)"
-		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
-		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
-
-		# If enabled, tests are automatically run during
-		# the compile phase and we cannot run them because
-		# they require permissions to access the hardware.
-		-DSKIP_UNIT_TESTS="ON"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.40.21182.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.40.21182.ebuild
new file mode 100644
index 000000000000..030eef16a573
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.40.21182.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND="
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-compiler-1.0.8744
+	>=dev-util/intel-graphics-system-controller-0.2.4
+	>=media-libs/gmmlib-21.2.1
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.5.0 )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)
+"
+
+# for Khronos OpenGL headers
+DEPEND="
+	${RDEPEND}
+	media-libs/mesa
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+PATCHES=( "${FILESDIR}/${PN}-21.31.20514-no_Werror.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="ON"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.41.21220.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.41.21220.ebuild
new file mode 100644
index 000000000000..030eef16a573
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.41.21220.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND="
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-compiler-1.0.8744
+	>=dev-util/intel-graphics-system-controller-0.2.4
+	>=media-libs/gmmlib-21.2.1
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.5.0 )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)
+"
+
+# for Khronos OpenGL headers
+DEPEND="
+	${RDEPEND}
+	media-libs/mesa
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+PATCHES=( "${FILESDIR}/${PN}-21.31.20514-no_Werror.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="ON"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index b0e498d25041..fbb3eb09b379 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1,5 +1,8 @@
 AUX isl-0.19-gdb-autoload-dir.patch 809 BLAKE2B 59dce21b8f0a7226b7b266eebd6226c0821658a548d6b1f896e58f09b03f703162db287df2f2dcaaebe58bcb76ea7e24075802e6df32581cf5e96f3e43ca1e58 SHA512 396c7c00b00c19a269540abf464f6e30d4473c9413d67a436cd4294b3cb53a5c94ab34e8e5c76c863243437d8754edaf924148596e547ef551e6d72c8122ff27
+AUX isl-0.24-gdb-autoload-dir.patch 1577 BLAKE2B e7d7fad85d194f2e55a319ee7cd803813332780a75b904897f2141d6e4797a6be3e467e28bfa007b2a14568c9f56c0efa10bdef185547179345689032cde9e57 SHA512 168e3875248af7abf432d8a82af1b9e9232fdb251425fc9d35ee3930d307f1543444d83fc46cea9bc295ec15f855c736889388a6c06062c78f06f8f39df0aa1f
 AUX isl-0.24-nobash.patch 1092 BLAKE2B 42dc0587fbb05584ff51ad490cc487159a7bb2ab5fd7db2c46bc70c572dd6ee391b077cf54767f3811b6586e8e6271a7d4d93e9a21fe968db683d349fa02103c SHA512 92ae3b054eb5cdce3e8bbc54c072e8d5cbf691a325b06269d4fe9fe6d889e1a291bb622ecf98b1c63177112914cc1836c646503b0f8f50a4cea24634f55b5445
+AUX isl-0.24-respect-flags.patch 204 BLAKE2B 34d028a22ad608fbddf7a3909000351f7cf9b7e75cf3b0f687fafc35554163a123467053433c96c32764b155c02f01a336e92e67e25726bfd3e109ba18de42b7 SHA512 0d72d99266d181cef9fac1388c254f1e85c64aa394a672245013be17f2f4117c3f23252bca42746fce91fb2b266688245c1747cf21a69afe82de058cdcb600b6
 DIST isl-0.24.tar.xz 1930956 BLAKE2B 39cbfd18ad05778e3a5a44429261b45e4abc3efe7730ee890674d968890fe5e52c73bc1f8d271c7c3bc72d5754e3f7fcb209bd139e823d19cb9ea4ce1440164d SHA512 ff6bdcff839e1cd473f2a0c1e4dd4a3612ec6fee4544ccbc62b530a7248db2cf93b4b99bf493a86ddf2aba00e768927265d5d411f92061ea85fd7929073428e8
-EBUILD isl-0.24.ebuild 1985 BLAKE2B e0a65b6a516eb5a69ccc4f82af31b51912561c371005f01552f0441d5d1dab906cd64ac0d6796e33548a4684b3f4cca39c471051b9d467b655923d18a5ee811d SHA512 b18e57fcc4ddb1aa00a9e849d2741dc5a91120e7bf0a1d5fb67ba2af2b88a2ac998e592e31865629dc57516723fbf08c17878d30803d621a356f19e0eca769af
+EBUILD isl-0.24-r1.ebuild 2179 BLAKE2B 9da3c3903e80c0727ba2c3bfda463b57ec95cc07c48899663e616a0ef64163831bc3af76443ef69eb538f89b047e8bb5ae83de29bf0d905a1cd6b79db9377c96 SHA512 7c25d27f7b95bc669dcf30b14916190d415c17bab7c2ac8a7f6c9d39681f407489bd856e04713735c5458550918298a5f6fd9ddbd182b1012e34218b3a17481a
+EBUILD isl-0.24.ebuild 2065 BLAKE2B 3e9a9474be627c9832a3347f9a6fc96371eda37f017be6770b4a60061185afac16d5479e8bb0d3cd0dbf56bf3d042a86aabaf9685541ee4571466a16843a6ae9 SHA512 226512b08c6d26de9d624ed0fefd38613e2cf1675f55b7bee31b666c4c17b1d54843808724825c9c42f31d8b146c49d2195eac49439501dd7c476a66184c1b75
 MISC metadata.xml 226 BLAKE2B 99dd52557be714400c2d45f1621a6ed5e95b38fee6c6812b4681e5363c84bac0e5a55026b609b0ec9196348fc1ea5f55b4763220ca16cf45c3b61a20dc0fb745 SHA512 df6b46a0133ce8106a367f43e477f044f06a8411b9164ed4cc8543289ec78c5e3f8d4dd3fc36100f39f5c9928d1100c0f5a25cf457dc7048dd37ccc3fec24f57
diff --git a/dev-libs/isl/files/isl-0.24-gdb-autoload-dir.patch b/dev-libs/isl/files/isl-0.24-gdb-autoload-dir.patch
new file mode 100644
index 000000000000..6751d5755fbe
--- /dev/null
+++ b/dev-libs/isl/files/isl-0.24-gdb-autoload-dir.patch
@@ -0,0 +1,35 @@
+diff -Naur isl-0.19.orig/Makefile.in isl-0.19/Makefile.in
+--- isl-0.19.orig/Makefile.in	2018-03-03 11:32:15.000000000 -0500
++++ isl-0.19/Makefile.in	2018-03-10 17:29:30.039182728 -0500
+@@ -2269,10 +2269,10 @@
+ 	case $$libisl in \
+ 	'') echo Cannot find isl library name. GDB bindings not installed.;; \
+ 	*) echo $(INSTALL_DATA) $(srcdir)/libisl-gdb.py \
+-		$(DESTDIR)$(libdir)/$$libisl-gdb.py; \
+-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"; \
++		$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)"; \
+ 	$(INSTALL_DATA) $(srcdir)/libisl-gdb.py \
+-	    $(DESTDIR)$(libdir)/$$libisl-gdb.py; \
++	    $(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
+ 	esac
+ 
+ uninstall-local:
+diff --git a/Makefile.am b/Makefile.am
+index 96cac65..8bb6aa2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -639,10 +639,10 @@ install-data-local: $(srcdir)/libisl-gdb.py
+ 	case $$libisl in \
+ 	'') echo Cannot find isl library name. GDB bindings not installed.;; \
+ 	*) echo $(INSTALL_DATA) $(srcdir)/libisl-gdb.py \
+-		$(DESTDIR)$(libdir)/$$libisl-gdb.py; \
+-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"; \
++		$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)"; \
+ 	$(INSTALL_DATA) $(srcdir)/libisl-gdb.py \
+-	    $(DESTDIR)$(libdir)/$$libisl-gdb.py; \
++		$(DESTDIR)$(prefix)/share/gdb/auto-load$(libdir)/$$libisl-gdb.py; \
+ 	esac
+ 
+ uninstall-local:
diff --git a/dev-libs/isl/files/isl-0.24-respect-flags.patch b/dev-libs/isl/files/isl-0.24-respect-flags.patch
new file mode 100644
index 000000000000..e00748b24330
--- /dev/null
+++ b/dev-libs/isl/files/isl-0.24-respect-flags.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/815700
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,6 @@ AC_PROG_CC
+ AC_PROG_CXX
+ AX_PROG_CC_FOR_BUILD
+ 
+-AX_CC_MAXOPT
+ AX_GCC_WARN_UNUSED_RESULT
+ AX_C___ATTRIBUTE__
+ 
+-- 
+
diff --git a/dev-libs/isl/isl-0.24-r1.ebuild b/dev-libs/isl/isl-0.24-r1.ebuild
new file mode 100644
index 000000000000..71aaf3b34155
--- /dev/null
+++ b/dev-libs/isl/isl-0.24-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib multilib-minimal preserve-libs toolchain-funcs
+
+DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
+HOMEPAGE="http://isl.gforge.inria.fr/ https://libisl.sourceforge.io/"
+SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz https://libisl.sourceforge.io/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS doc/manual.pdf )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.24-gdb-autoload-dir.patch
+	"${FILESDIR}"/${PN}-0.24-nobash.patch
+	"${FILESDIR}"/${PN}-0.24-respect-flags.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local econf_opts=(
+		$(use_enable static-libs static)
+
+		# AX_PROG_CC_FOR_BUILD deficiency:
+		# https://wiki.gentoo.org/wiki/Project:Toolchain/use_native_symlinks
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+	)
+
+	if ! tc-is-cross-compiler; then
+		# Incorrect CFLAGS handling as CFLAGS_FOR_BUILD
+		# even for native builds. As a result -O3 is being used
+		# regardless of user's CFLAGS.
+		econf_opts+=(
+			CFLAGS_FOR_BUILD="${CFLAGS}"
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${econf_opts[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	preserve_old_lib \
+		/usr/$(get_libdir)/libisl$(get_libname 14) \
+		/usr/$(get_libdir)/libisl$(get_libname 15) \
+		/usr/$(get_libdir)/libisl$(get_libname 19) \
+		/usr/$(get_libdir)/libisl$(get_libname 21) \
+		/usr/$(get_libdir)/libisl$(get_libname 22)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify \
+		/usr/$(get_libdir)/libisl$(get_libname 14) \
+		/usr/$(get_libdir)/libisl$(get_libname 15) \
+		/usr/$(get_libdir)/libisl$(get_libname 19) \
+		/usr/$(get_libdir)/libisl$(get_libname 21) \
+		/usr/$(get_libdir)/libisl$(get_libname 22)
+}
diff --git a/dev-libs/isl/isl-0.24.ebuild b/dev-libs/isl/isl-0.24.ebuild
index 9b5ae94248d8..3c45913215e2 100644
--- a/dev-libs/isl/isl-0.24.ebuild
+++ b/dev-libs/isl/isl-0.24.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit multilib-minimal preserve-libs toolchain-funcs
 
 DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
-HOMEPAGE="http://isl.gforge.inria.fr/"
-SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
+HOMEPAGE="http://isl.gforge.inria.fr/ https://libisl.sourceforge.io/"
+SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz https://libisl.sourceforge.io/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/23"
@@ -35,6 +35,7 @@ multilib_src_configure() {
 		# https://wiki.gentoo.org/wiki/Project:Toolchain/use_native_symlinks
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 	)
+
 	if ! tc-is-cross-compiler; then
 		# Incorrect CFLAGS handling as CFLAGS_FOR_BUILD
 		# even for native builds. As a result -O3 is being used
@@ -49,7 +50,8 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }
 
 pkg_preinst() {
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index dc838714510f..8dbf118205b6 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -2,5 +2,5 @@ AUX jansson-2.13.1-sphinx3.patch 10268 BLAKE2B 97fd3c0faec1201f703d93bdc049eac24
 DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192
 DIST jansson-2.14.tar.gz 535618 BLAKE2B eb514ff222444d4c0d1ef6b99150e3e43bd4d7a1bec3d66e5ece8bc59ac19a0898d9eb061cacad52afda7fe172ec6df46b5a90952707422f56daae53f82c9427 SHA512 5a592776c7ba8c0b1f5efaf813f77948bbc4bda168a72d221d176af0cf61038e26c1f30795433be10e2fc5069d5763d11852a8574774906a9f8ad261ac30109c
 EBUILD jansson-2.13.1-r1.ebuild 942 BLAKE2B a410c9992a4b386d189e4dfa5cb56c6d815a8e0751251e923fe85c227e1458e296330b3be284d8ed7ab409085cc4ff76472c8ee1c4fa63d140b09350af3b116c SHA512 c6f8114764f437f6f96437ee1108784982dd223adf9cb29d81ba5a57354bbc7dc07377b7d60ff5cf234729ed1a509ce7ce543067434a9fb88a1297d99ea3cd69
-EBUILD jansson-2.14.ebuild 847 BLAKE2B 129ce6812cdff2caee84bfe7d505bd6cb97304199550864821520fc966052bff237ec81c0ee4dfe27203b851a23ee1b4c642ae6c276b7e746f2b2465cb647d88 SHA512 b01db7151486e367683e9cdb65c4463b2e1e3fbc1dbc568c43d13ff1f14b1ec5777a13d73a2c74829ec39d5a8da0d47f5e7039021216342633e218b06d4b057e
+EBUILD jansson-2.14.ebuild 878 BLAKE2B bcf501239b88fe0e185d155a7bd053599a5ee682e94f461a865bd6a28b31df845d9f0512e8ebef8c0fa8cd4cc42f08f14c30a50c583661f9621e77e72e35bd19 SHA512 859fbbe220b20b915ad63a3cd859207c49a6bbd5258a1a111e7059fcbb1a4fc096d9bd9f3eb5ba8497b4fe5eeadc40dcc2ace065c28239695e77eb92d36a3f03
 MISC metadata.xml 395 BLAKE2B 414a914de07c51b1fae68121cbeeff2b4975fa351e068d250c7d88f6ac8832a2c954f311f547494e10a78dbc5b9b7ccd1fdbb46335f28bac7b23cb5aa13050ba SHA512 067ae2c24fdd77747a78590731e1946bc0a2150038e9722d60ef97c428538046f20843bea2bd970d9591c7f7dbbef2fd81b605fcc2d67daaa55551cfd3d7dd24
diff --git a/dev-libs/jansson/jansson-2.14.ebuild b/dev-libs/jansson/jansson-2.14.ebuild
index b6d6d015ad68..396096cda49d 100644
--- a/dev-libs/jansson/jansson-2.14.ebuild
+++ b/dev-libs/jansson/jansson-2.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit multilib-minimal
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="C library for encoding, decoding and manipulating JSON data"
 HOMEPAGE="https://www.digip.org/jansson/"
@@ -11,12 +11,14 @@ SRC_URI="https://github.com/akheron/jansson/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc static-libs"
 
 BDEPEND="doc? ( dev-python/sphinx )"
 
 multilib_src_configure() {
+	tc-ld-force-bfd
+
 	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
 }
 
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index 124c6f5aa89b..ec5be7302896 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -2,6 +2,6 @@ DIST level-zero-1.4.1.tar.gz 391185 BLAKE2B 470df7a3fdc8562fd427bb94e236553f76b7
 DIST level-zero-1.5.0.tar.gz 395657 BLAKE2B ccd667f39b36f24826ec2ce2f9a755111d09f47798a7af9ddafc78947d008d0af82aa6189683b29acb59f9dc54d20fe0419ec4fbf5728e1652513b43b058db45 SHA512 2fd822dafbfaa1f51ff04e33f1cc3f5bdc4d71d45f1a3f7795ca870882647b162d2e4f727341542b09efe38e7bdb21bbefe5e6ea5af97c2579c7d74df55c5c1d
 DIST level-zero-1.5.4.tar.gz 395657 BLAKE2B ccd667f39b36f24826ec2ce2f9a755111d09f47798a7af9ddafc78947d008d0af82aa6189683b29acb59f9dc54d20fe0419ec4fbf5728e1652513b43b058db45 SHA512 2fd822dafbfaa1f51ff04e33f1cc3f5bdc4d71d45f1a3f7795ca870882647b162d2e4f727341542b09efe38e7bdb21bbefe5e6ea5af97c2579c7d74df55c5c1d
 EBUILD level-zero-1.4.1.ebuild 727 BLAKE2B 5e3b87746f59c74f9b89ccf926e3f042f8907194a793ac329b04e5c6b673f31e3e3b945a9230af9a7775bd9d8d41a293a56500ffdb81cd5b9f2d07a1c8147655 SHA512 93b57b3ed85ad42f9017417cc29b978b79ad7145c7c5ef3be079044beac17be43a103ef003959cc3a3630c52da822416d552f68196299a6ecad4d0c4d3c44e51
-EBUILD level-zero-1.5.0.ebuild 728 BLAKE2B 22309937e74456276ed9261a84b17d063ea7711fd72b7a8218869ad8d1bdcd1f48a9ab32bc9c87b6740ac1c685c9d5239f7598f68cc8d06fcd5b74bcc9bc492f SHA512 97fea4c2d0e23673c3ba1caaa5e2b663e136c1fddd3f16554c6bcb156f244d6103916770d763dfaff5166bb68153e5c020256746f6c54575bfb54f7c22ba3912
+EBUILD level-zero-1.5.0.ebuild 727 BLAKE2B 5e3b87746f59c74f9b89ccf926e3f042f8907194a793ac329b04e5c6b673f31e3e3b945a9230af9a7775bd9d8d41a293a56500ffdb81cd5b9f2d07a1c8147655 SHA512 93b57b3ed85ad42f9017417cc29b978b79ad7145c7c5ef3be079044beac17be43a103ef003959cc3a3630c52da822416d552f68196299a6ecad4d0c4d3c44e51
 EBUILD level-zero-1.5.4.ebuild 729 BLAKE2B 3308c284a5ace378ab808a03dd09fe3e81f22c703c7c62eb9dc161c2010e2c70843308125d02444921f80bf1bd6daffdacb1fb38f4e5d8049da067af5ce23130 SHA512 2b03676b7a1fff4858d0fd393be61a69229c39315364526d0c82f8d84b1bd5e6ac7727dea9e2d12110166f5926cfeac812d876adb6ff102e603ed642b895d9c2
 MISC metadata.xml 586 BLAKE2B 44eca05640a9276ea9cbddccc0d199dc8c7297a3fbf5ad6b58693c406961efa2aabf99501faaace47ce6bb97736fe371533e89a5a700949b03db66359222b269 SHA512 da9b222b216ed217842f236eeb1991e31ec4f140d86c0a048e9e401a18018d90d6ad8d4f10edec8b71386687bc9481ebf9154a1190bf6969d4fab04bba20100e
diff --git a/dev-libs/level-zero/level-zero-1.5.0.ebuild b/dev-libs/level-zero/level-zero-1.5.0.ebuild
index 87cf476cc25a..0cef8138c81c 100644
--- a/dev-libs/level-zero/level-zero-1.5.0.ebuild
+++ b/dev-libs/level-zero/level-zero-1.5.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index 93b641ed4b9c..0f13c049d517 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -1,6 +1,7 @@
 AUX libaio-0.3.111-optional-werror.patch 911 BLAKE2B f6ce9b16bfe7d3fe3fde520c4e6438b534b1ea54561faf94229cbdaa2cae40ee6e6ab0e9a689f08f7e43442d1b863bdf2c42e784774cca89003feb5dbbffd63b SHA512 8315c9ca018578d4b8e81b87ce155d8ebfc586be68f24659a91f027449cd27a9660b2cf33ce47fcf240ce44f2b7f1095e8d5996ad08782d91392f6dd8fafa5a8
 AUX libaio-0.3.112-cppflags.patch 350 BLAKE2B 8c2d0706f92a47dffff6465712588b525b89ff223019cf3ec759beca14ff2ef9515d4b3697ca64931c2d86969a40ad74642aa06544cc2671906e5b49d2e10352 SHA512 7386d741658af265cc4f156d4cc8518a7ec9abc15e8738cb13c2e2c3827b284cf8f8ee07c4a16dd0b7ae424cf87e9aad438389f0a832dac2e49ef945e3829374
+AUX libaio-0.3.112-respect-LDFLAGS.patch 521 BLAKE2B f45b0147202e767385f6816192c0fe8418cd7ed61b6807d9a6d16ec7448f10f4f842c32167f6a2ef82df820c291142cedcd66b610693858aa6ca956de272d2a4 SHA512 c1d8385fc66909168e2ff39d334e9ac37a02527a892ed13a594c1b0b55103a5115d79c32aff756a9ec96117a7001703a3d141319369dc7bcb118eb752860f0ba
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
-EBUILD libaio-0.3.112.ebuild 2125 BLAKE2B de7aeb7469543f50fce366acfc71ce5635b0ce1a30e65b7a96228d7f58d0939c050c494a193b2eef4b1fb31ac022fe8117d55c6703964f9937043a40f40f625f SHA512 e87fbbbc0e97827e9c19680e9ed6c77f3b8b515c9394e925cfa381542149b3bae64786cd20d2a666f5c4ce03f4a0878ffcd97a847a4e2405bfe85ad16a72114e
-EBUILD libaio-9999.ebuild 2133 BLAKE2B fe7d9b4ce5833f1c69d3a8fd96ca96fbed6a6a3c258c11ede1cced85ea0bea6bdcf69fc0465ba34807a40e18a7e2969dabe7b7b40ad68edce4e20c80adb0ee1b SHA512 b66c4a780ba95d16eb7e0c9f8bd7d432c864a22bcfa3d06d6954de02e95c891a1dda29893da944ebd1b817ac83afdbc351ede92f065059c50861c7a17d100232
+EBUILD libaio-0.3.112.ebuild 2176 BLAKE2B 7b01abde1954d1f1d5a5b64e4abd8c2f1620497e567bb425e78f8c54216df4d8627473bf2cca714543e015a35b9136982ddf39ff98909f5d1e75031f68e159e2 SHA512 596a1fae4d24cbc19784a183b67b165bf693b2a7c07798d75540c350efdc88dca34149b6bda5014eb108e3730e28ebe7b9a90440d0bb30d75a72e4fd623234a2
+EBUILD libaio-9999.ebuild 2184 BLAKE2B 6b0e607d7978885115bf87ede0e72bb89ca78ca4d9b493aa27e3a4bfab98f5dd288c979850d902756fc8baf0ea7ab203b026e3d3b5fa9b2c28d10ba85246a996 SHA512 5c511bcc4aafd5a0952fd1a6816dc94631f198345e7a821f692c9a7d9d76f2d3c2536f9bb9b697c122e9c3579c511b7f7077574a472ea60c2436046c1009597d
 MISC metadata.xml 415 BLAKE2B 5f25806b5b169a85b455a39a9ba1995ccfa3c41e17ce1b8a7f2269167ba477fa0b76abc4ba46d977e5d6bba365b63e342304837a19dd57c0ac8d83e5846a2b22 SHA512 ad7bc8b579f5037c678294b77511af2b9027ed696a814bbbda6e3f630853040092b0abe20967d52fef7f65815c807bd49a2e57f392cd1035d1133e6d48009204
diff --git a/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch b/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch
new file mode 100644
index 000000000000..20e23874fb6b
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch
@@ -0,0 +1,13 @@
+We need to place LDFLAGS earlier to ensure e.g. as-needed works correctly.
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -56,7 +56,7 @@ libaio.a: $(libaio_objs)
+ 	$(RANLIB) libaio.a
+ 
+ $(libname): $(libaio_sobjs) libaio.map
+-	$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
++	$(CC) $(SO_CFLAGS) $(LINK_FLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs)
+ 
+ install: $(all_targets)
+ 	install -D -m 644 libaio.h $(includedir)/libaio.h
+
diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
index 93a8952b8ee0..a83b08bd9822 100644
--- a/dev-libs/libaio/libaio-0.3.112.ebuild
+++ b/dev-libs/libaio/libaio-0.3.112.ebuild
@@ -22,6 +22,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
 	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
+	"${FILESDIR}"/${PN}-0.3.112-respect-LDFLAGS.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-9999.ebuild
index 6ddf6077967e..232c53681871 100644
--- a/dev-libs/libaio/libaio-9999.ebuild
+++ b/dev-libs/libaio/libaio-9999.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"
@@ -22,6 +22,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
 	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
+	"${FILESDIR}"/${PN}-0.3.112-respect-LDFLAGS.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/libdbh/Manifest b/dev-libs/libdbh/Manifest
index 20933f5325bd..013cc1ea07e5 100644
--- a/dev-libs/libdbh/Manifest
+++ b/dev-libs/libdbh/Manifest
@@ -1,5 +1,3 @@
-DIST libdbh2-5.0.19.tar.gz 1608949 BLAKE2B 405a2903c8f4dddcd66153304bfff5084e549f650846cc2e8afecb6783cbb5fcf391cc251e4805486f9ad62cac4c59a3112fc7a6d0ced6e93e0e88be707e9a83 SHA512 35c368e82f8f7c4c7d4960731214ff3863530795b16716c0be7351e0ca10740ac26a99930369f4df78c8e108d929124c222b5942ce5f521ecb58afd38d55bbe9
 DIST libdbh2-5.0.22.tar.gz 1641669 BLAKE2B 835a1d112ac34ff025002c826fa6f1291a8da2442901396e79abbf5e3c315654cef2a9d45c852821fa373b132e0e8a04695c4cf5c830bac9a3b40dd32ce5b543 SHA512 d0cb69bbd3d54600cd14f4d1d7ee7f87c52c9bea9f475763b1d43c053a7571063f42b59cef8d08632b065f44cd85b5ccb0fcd31052202aa8f8a49f34669c7930
-EBUILD libdbh-5.0.19.ebuild 771 BLAKE2B 2c0cb01aa6ed080ba8fa85d308e0069024a65ff70972f82a5160ace00a5a57e5cadb0df2fe06ebc256df53423ca50795e7cafc17771887ea0db5539e076ddce6 SHA512 27f8345459aa9c6852a386b1ea8384c86116c767674e55fde533b3caf934e25482b3b04e61f3da218cfb98d3328c1fabcce77306c9d0164eeb28573262d5102e
 EBUILD libdbh-5.0.22.ebuild 741 BLAKE2B a980e996e70ef687900f1174a9d485b9e67fb1532153d8298d827361c3f93598083bc08210b43392390323f6bc5ad8eb6a2d2696bff8eaa6fbe0c4bc3d346fda SHA512 443158de2cb28a88ebb5c85e0e705c152cedaa90c341f3b4561ba290c257313ff709b188ed1ffad4ada886e999b3afec74ee1c9f92283b96dfb9491be4119925
 MISC metadata.xml 467 BLAKE2B 384be2f35e1176fa3bdba972d8ec7c9c28958fb5b41faa68a190a72654967dc9dc0e259d8883d18bf5ebbeb366b7c445dc18050a0386b2bc3dd552a7cf3dd119 SHA512 7b75ccb2a04fb846ff020c73d8e59fcff114288cc1ecac307d5d40726553e6028b3e7b47cdeadac03bcd2b90c116c599a2583e5b48af0636a928a0d239f8a5ea
diff --git a/dev-libs/libdbh/libdbh-5.0.19.ebuild b/dev-libs/libdbh/libdbh-5.0.19.ebuild
deleted file mode 100644
index ffa6f88eec88..000000000000
--- a/dev-libs/libdbh/libdbh-5.0.19.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# eutils for einstalldocs in EAPI 5
-inherit autotools eutils
-
-MY_P=${PN}2-${PV}
-
-DESCRIPTION="a small library to create and manage 64-bit disk based hash tables"
-HOMEPAGE="https://www.gnu.org/software/libdbh/"
-SRC_URI="mirror://sourceforge/dbh/dbh/${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	sed -i -e "s:-O2:${CFLAGS}:" m4/rfm-conditionals.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index fb32dd440925..87060b5d6d1a 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,4 @@
 DIST libevdev-1.11.0.tar.xz 445316 BLAKE2B f3c1aa688d83f4a27abec23f18817bbdb7a5911cc30fab694271f620c23273cf20109598edb0049239e78a173baa20471ad1f25266eff34a50ed8898d7b86080 SHA512 b3c6b4a1532c5142f3684b920dcdd497a5368aec516e8c389e2c8f9d1eaba16c907b2a7f2c82a3c3ff89bb4d0ae5503c736098c095f9f1bc98f0668e99bf639d
-EBUILD libevdev-1.11.0.ebuild 1111 BLAKE2B a441858e338406d2466d8f74994df7df6031361cbf4eab9de748ce1ee59ef326df8337498ca8c3d3dd1b36b262eca501b0904b2605effed1c9190a5199bb1ac3 SHA512 d3172c7f843589d8bd373288af2b38cca467b71793ef323e22726e7e055c9f1a777e962f876814fdba66a4d337b762f0cd02e662fd6b7de00dafc4e1ba7c87b6
-EBUILD libevdev-9999.ebuild 1119 BLAKE2B 4817d8e335bd1f409e33813d03e19ff45727e6902a9340db6b67fc13f03cf2373e989f3ad0f69b77b8975ad90dec1f6c960aece32e92656d9a295b458c4e1caf SHA512 379a7786ee845919e75e1577aabc7f8460723ea2758de577789e73e3b30be0acaaf6461da790fc0ce96a5371e24abf0aa3e6f6e4fd01e1e8da6094eb1986ac59
+EBUILD libevdev-1.11.0.ebuild 1111 BLAKE2B f10e33cfa17f0171956e65da7125225ff1d39d6356f48451465523fab1bb0112f6842aad3986c7720ddfc240e6cdf9162a7394038893ffd23d0b44badea90013 SHA512 9903be70f11c5ea07ac6c4005ad698f3a93068f8d30118cdade48833423ae73ddee35660e2a7d54a4cd2309a5e865d30ad50347af8ea445529eb2b0b4473d831
+EBUILD libevdev-9999.ebuild 1119 BLAKE2B 7454c31abb9ea204726b25bdf082078716cca0e911e3012121c06cb37663ebf911e48765a5e718db2b65ace23cebcc305e34129576e4bb1ff863829520f21b6d SHA512 805de4364e75326dada41594b727af707f8b1682b990cc4871a475a545b43a4539e29b57b26bde18e72620d38f2dbae0139094e8d00b4c872b0bd174a83fe8b9
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/libevdev/libevdev-1.11.0.ebuild b/dev-libs/libevdev/libevdev-1.11.0.ebuild
index 01acbddf9775..39c22f360654 100644
--- a/dev-libs/libevdev/libevdev-1.11.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit meson-multilib python-any-r1
 
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index 7a92403df430..a5a5af24e1b8 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit meson-multilib python-any-r1
 
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index b8c65fbfdf41..b1eb3a26e87f 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -3,8 +3,10 @@ DIST libfilezilla-0.27.1.tar.bz2 568252 BLAKE2B 5ab11e60a3df1e56275b0a1eeb94a91a
 DIST libfilezilla-0.28.0.tar.bz2 572028 BLAKE2B 579881b1bf127f709cdfda61efb71cce3df741152124b74a2f7d718e43d7d71ce678ec6ba10ff61926b275d5b9e69f8df0f9741a0ba1e9b5ff2c51d35472d10a SHA512 e14bc3d5d20c62f0910ab55aa6466590a0d55aedf534e7eb67481a65b372c62fd0015506a1acdc476811aa2c0ce7561f30e79a10f994dfd98014e4ed4b4f471e
 DIST libfilezilla-0.30.0.tar.bz2 578592 BLAKE2B abfef274989b0ba31d9237394aa1e88012e9fe9d071c11e7350e0ada8d5da54d7cdc93f46f65b38fa9a811a638210238f42de99fdd6832f97ede3808723e5d4f SHA512 f05a1ef2be7a6d32a6c5adf8e02f2b17e83deb67bf7c67b1bc1fec539a7235903d91dd3e98412aa1b90f1fcb322cb9ab54d3a1ff4ec44889b4dcdda6984300c9
 DIST libfilezilla-0.31.1.tar.bz2 585070 BLAKE2B b7cd275ee39d5ac62801889adae79515c056a5f838f4348324c0f5a975d3cc45a058b4c7d37f99179efe6808464b7972c31e300ae9e05371134d7a149b5616d5 SHA512 072ae343bc44939deff435078c29954dc60e4bb5079aa705b7445bec17717919d4957858538284e4f131d734439743bd5d39085a618ea41d586be8be887cf2b8
+DIST libfilezilla-0.34.0.tar.bz2 593998 BLAKE2B 3f3563389f4dfe3667c8c1e46d5f4ab76e02f93188bada3c15e974405c49e0d1346813e64457ec5b60bdeca98629e5a05941f76cb375bb229eee759cc6ab5246 SHA512 960908aa570704e983e51e2eaa13a7fb688587bd1f3c37ade6a3f1b3f5379d0b9e5d3c727bcf58f033a1cc0fce2fc34e2fdffdb379ad5be85de917c0a590de22
 EBUILD libfilezilla-0.27.1.ebuild 1241 BLAKE2B bb00084913fae7dae260d3ecff107d4bdfd27fd8b8a5338c05fcbe9cc521a022b2daeedb6e341b97ce529646f0a415190bcccc06564ac017150c28436e959330 SHA512 edb4e98d5d68d6848984eb58c09605ae170f19f7be44bfa183f880364b40363c14dc2a937634696e941b3981f23a1274df731f4864f054f1409b693fa087cc16
 EBUILD libfilezilla-0.28.0.ebuild 1195 BLAKE2B c437655e4fff0fbc8a2b04316f48d0294c3679a532c337af8fe4fb6a521bf79febd33ef366ef1c46746202f01a8b43cef68d65b84da9f1dbe72461d229b50d56 SHA512 00c1b6556ed183280ed87e7c73529440043582ae0e818b06de66e614199c293117794e23443c2870c787ba22f5b7c0b20cc8a95681dc818df7d0fc203a84a48e
 EBUILD libfilezilla-0.30.0.ebuild 1195 BLAKE2B 6542369e8d9785df7603b283e63bc14cb0cbdcc208b4eadc367a89fc286435c62e5763fe6be8de6aec9f17cb9b6a4b52c14f342d95e642a949cb26a89ccfb052 SHA512 e60c681739a20877635e88cad841942eed0192812be10ebfc30022fe9781b3924a635418bcf89099fa02892f196c8366e6596fcd1f2c8fd123b432447d2bbb96
 EBUILD libfilezilla-0.31.1.ebuild 1195 BLAKE2B c24e1fa7f4264cc320a4fd2f03dd16de950f48e5faf750939b2b26e9558e6432b6f0b7baf0e6c5c92907664ed7dd624ebf7dd67dc46e7f4d9fc75f34699a869e SHA512 7b2a20fdb5be7e1d34707c91a241ca820803fd5dc56190fc39ddaa67e200627eea62dbbec114fdf47c456093e03003d1fe3b9e325a1f9f079d25af19c895d5aa
+EBUILD libfilezilla-0.34.0.ebuild 1215 BLAKE2B f28398b8f2649d074e87cbaffa0cb8713c4a0ae97ee0e009f360302ece2c93b544546308c8178a200de8665e8f316f7e554c28850c5289fc6e54689df999728c SHA512 03f1a0a9c7c6a94e83640d751fe909ef9161de482b09d6749ce6d4dfb0050e1fd5c4320e31748d4c9fa447759f2d3e9e35cf4f88c79502df443f43a4404e059a
 MISC metadata.xml 1136 BLAKE2B 9db086df9b33ec49950324ad327f9746b79667dfd61028ec173ac71fe16000549cf6bcf2270f7e8c3f85e1ff2de88620867db9f52cd6530716154cd1ede8902f SHA512 2ccacf35e9b6f503ac4e46c6705cd032ba4895c02c8ab9f3da6898ac20f4dff999bb8a649f71d4a222fca4b9237b0a7d819d6929468390df92806fccb82be781
diff --git a/dev-libs/libfilezilla/libfilezilla-0.34.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.34.0.ebuild
new file mode 100644
index 000000000000..91f14170584c
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.34.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/21" # libfilezilla.so version
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+	virtual/libcrypt:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_configure() {
+	if use ppc || use arm || use hppa; then
+		# bug 727652
+		append-libs -latomic
+	fi
+
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 7776d5937f47..7602fd0ee8a6 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -4,6 +4,6 @@ DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808a
 DIST libgcrypt-1.8.8.tar.bz2 2987685 BLAKE2B 7b590c06d91403f1bbfa108379b3747271e9c83acc5547a4d43ef9ada9b0b7c78654cdc24f6cd0db012d50628ae4ec9320dcb63a901ec2dadde6a7ed56dbed7e SHA512 9861f3b5da3cb013eb79efbf2859864f8c2c11b41484b051c981c45cc0bf1569202838226da10ebddeb7a7b7f39ebd3a95f107b9bf6f908074ccc9a51ea94db8
 DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
 EBUILD libgcrypt-1.8.7.ebuild 2307 BLAKE2B 07fbec8932d2aa100e835463a98cae64451eac74ad8e0f9d96d642d7f7430bd4e778b82e6851c537f3e31a11b5acc52a396bb9c86cb21d81556417e0ee49e922 SHA512 8225fbe1f3154766235ae022bae1e0a31287ff6b27f6cd68b549724c13469ed32bd6387817b95bf6e2baa5a6b6be28b0914043b995cd1d0ffd258dfc200134a5
-EBUILD libgcrypt-1.8.8.ebuild 2319 BLAKE2B 44c283a4f060218aec481eb0b2a7ee4254b6cdc9839b9cd2a5bc06d710da512c08eaf8d645649a50aeb7d8670132fc7c0953c1bcc6fde2dfd8e0358fc7eff8fd SHA512 04258e2f8af72ab67a5171e0fc767815b0e000544fe9d289f495c7abe35450458e1fe062905aa6d9400eccb676e208fffcff4cea3886efeecc232e32d5868914
+EBUILD libgcrypt-1.8.8.ebuild 2318 BLAKE2B 335fffac9a01ebe760a019fb668ce229f22ac6bc6aea38d2fd893fdda587d76895b0bf27146a32c4817d955eab4ac5ae9aa032a3157f9dcf3ae07a98599cc60e SHA512 eea978726cb25bb0c9de94b8617cabd3e5c28b20010ccfba2f4124a4609b655d496ea376d9d72bf07c031116433f74c03d69335950ce295d922ae83801a19ada
 EBUILD libgcrypt-1.9.4.ebuild 2802 BLAKE2B 642897f4dbb962c190a298cefff57212deb1ab759570184697f559f97d63bcc93008167dade91d207e08164b5496202f896aa25cac103f7bf70d288c93744cfe SHA512 fb8ade270e82a45dc3f8449af41454310176fd8a72a50ea44399992fb8fdff35fa3e241699635f8353cfd75f3d9ed632da253a6f8666a968f8bba1d1ad98fec2
 MISC metadata.xml 597 BLAKE2B c16e58e302622a51420a94adf5a3f47bf16e49cf5c3e21f5c552d1f64a533aa9ad9a58ae15fb4a314bf7bc833706f0a35ca74305fe96e40a6f8a5b20a267e2c6 SHA512 0d5ea002080a6e0d656c2be39b725168a323ec9536ec85cf791d64d7f0dd8255e3dd541934866c61d61d19789860fc71b2f6fa11ffdfc9b83c8177773f451632
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild
index b3ba8ae295d6..45f5a784c691 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-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="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 9011ef8909b4..9895bba2af1f 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -5,5 +5,5 @@ DIST libgudev-237.tar.xz 29060 BLAKE2B 5d39d4d26d8c8b3fa877319c294036294dbda96b3
 EBUILD libgudev-234-r1.ebuild 1031 BLAKE2B e9fc631fe3b5d56bf098701f0eb94fd82a79601e2e251905df9092c0650dd4465949be740d70fc5a1948ecc609d58af85695b804897196963ce383dc7a9a7e32 SHA512 d7707c4a4df0f19cfc37395e65b804b1401f7443c4de90f02f72b05e9c348f0dc02115c78a8f582f2f4c01fadc8e352eeae563c8053e3171f91c4ccdb245d22f
 EBUILD libgudev-236-r2.ebuild 1257 BLAKE2B fde97372a639c3a08ca0e63e538c2995f7705d56ef2900031414c9423bec3f42b52e08d375935f7e796df986a3e3fbde3a3c60fbe923f10d577b9a8ead97ed3f SHA512 4b5404579aa1f0548260ba7321ef4ddb6e8344e456d7b5808f82371026e686feb4d8c7a8dc60dc0a714e66ca0f9b4f7753da249d0d4d3f41d2ef530bd4d09fe4
 EBUILD libgudev-236.ebuild 1070 BLAKE2B e353dceec8a5bde960cad17d994f0d861eb2b619a191235f6d8a876cad3daecea52fee39f176d375fdbc0d86c51015c99785e3e4c2335fc5fa707cd8cfa41e85 SHA512 9c84e51ae33a92da3046e6d878379e0574277c656d83382d16c39a466c18ce9ac01ab21c55b1f8e7fb188f63f0a994c34b439575cad62b9e5daac6819405868f
-EBUILD libgudev-237-r1.ebuild 1234 BLAKE2B 65f2b65d51a1719a57469016071c607f35172c65a910bb6a0d3c8df389cd99aaab9ec0d904cebd8e480a30fb064f3df740c6d1132f7431ef371cc2cd293e4e69 SHA512 bbb809ef75fe4931c4d216817c917b216ad107009c6a32aae492f6e3c0e45a83f3cc254facead6474d9c22251e4cb672a5ddf5789ac8d2a6efb33a2f7f39a582
+EBUILD libgudev-237-r1.ebuild 1233 BLAKE2B c9f2a4712c14f1cab94a95fdb72c0cdedefcabc2dda3784bafb4c798b056edd2ce9935f245f8d6f8127b66b70fe746e6b0c4b419414b7bd9cab63cc2d6fa2019 SHA512 f7409b14d67f73cdd8afa5902342550d8b164cd000163d987f72cc2b69993c25107e69e987a6fd5b2cf46a4eafe12bf5eabe91b71577d438320de9cb2ea3b83b
 MISC metadata.xml 334 BLAKE2B 16d65758def16c080294ffb595910025504d5a99302bf2e6901a9e24780ded6358396e7a7376538c5d6236f4fa277d450559d601d2969b417a81a3b54d607a96 SHA512 2ca5619250aa499b2580f036db00a273f0d719dc1ee283e1e6931c1a56d87275e130fafc9ef8f776aa2894b11ed3adb895a1f8cbf75a03bbbd86a3a9b3781075
diff --git a/dev-libs/libgudev/libgudev-237-r1.ebuild b/dev-libs/libgudev/libgudev-237-r1.ebuild
index e9323284f1a7..0e8919dab601 100644
--- a/dev-libs/libgudev/libgudev-237-r1.ebuild
+++ b/dev-libs/libgudev/libgudev-237-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.gnome.org/sources/libgudev/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index ef1df19209a6..f3ca120b38cb 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -5,5 +5,5 @@ DIST libinput-1.19.1.tar.xz 654600 BLAKE2B fb1c26874e29fc12d5259b00e0790d65584c8
 EBUILD libinput-1.18.0.ebuild 2238 BLAKE2B 0298d4a85c802869d83200b71780460ccfd8fc8994632053e19a291caa54d74ef4b893e7694e4c6a2a28f49cb4dc0acb715ddca6725419d2cef9a91f8c19aff8 SHA512 9fda7370585beebc50b3ec3e0541773f255d813cf8e3fe371e830f0234ea955fd0a5873580d5cedcfd10a2413bf732280884bad141febb4aa85f42b30f1b86d7
 EBUILD libinput-1.18.1.ebuild 2237 BLAKE2B c4837c5b445f2593b213b08592bb95560ebd951e9c2444ebc372d0e3c43735edae2ff965b27c07eabd148209f8d2ae2c20504297611725aeb8a864a2def8e95a SHA512 ff7d787e1b80672225acc7d82179b9074db406411297b13e9f277fd32965e6e8344043a55272446a702733c51733b80d1219ed40a5d68f21d23a14644b955f39
 EBUILD libinput-1.19.0.ebuild 2256 BLAKE2B a5c89595ed81f17ed42ec1803995eb490c2394ad94449a37c33ea678b6bbbd4acd65423e3b395aae4d150f3496cc75cee4eab18e3b0a106ee192fd7e817fa472 SHA512 7c1b12ff9408f7cb383cbc9fd17665769addfeb5731dda2f2b607964c47eaa22bc2bb6429ba9bda88f7d50a3eea49dbcc6d0dc35084fd39f5dae747e52e05f40
-EBUILD libinput-1.19.1.ebuild 2256 BLAKE2B a5c89595ed81f17ed42ec1803995eb490c2394ad94449a37c33ea678b6bbbd4acd65423e3b395aae4d150f3496cc75cee4eab18e3b0a106ee192fd7e817fa472 SHA512 7c1b12ff9408f7cb383cbc9fd17665769addfeb5731dda2f2b607964c47eaa22bc2bb6429ba9bda88f7d50a3eea49dbcc6d0dc35084fd39f5dae747e52e05f40
+EBUILD libinput-1.19.1.ebuild 2260 BLAKE2B 9babe7b5ddf3d1fec6e0048203cb29117189ac7315358f47ee2eb7ebc69d5a2e891532b8ee2d618c9e2ca845b88d00302d603896e2253af253c71b40f6f7b4c1 SHA512 be57cba2f8dcd093a199bde1c9d28afdf78ce6976b55f73bc07964a537a0f7a5f5864c1fc80ee13fd2cbd88f1edc983b1755c6472b7c11244785071af2ad8b30
 MISC metadata.xml 449 BLAKE2B 677e5fee3bf4047ba47b90aca7f30b9ce57e947e6b5f6903cbb93c214b084f0d93f6253980090544d4ff4a821263c156e0706ae5499cacbb2e52d629f3a7b253 SHA512 103e8b39ad6b9ffde159095dbc4553d8b695db44e49582518055313c79ff6123bcc424c3980cbbaeabaa455e00a828039f73c1f3424ce038d5a2d63ed3e7849d
diff --git a/dev-libs/libinput/libinput-1.19.1.ebuild b/dev-libs/libinput/libinput-1.19.1.ebuild
index c16d3716f3d0..8a59c1743716 100644
--- a/dev-libs/libinput/libinput-1.19.1.ebuild
+++ b/dev-libs/libinput/libinput-1.19.1.ebuild
@@ -32,8 +32,8 @@ BDEPEND="
 "
 #	test? ( dev-util/valgrind )
 RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-1.3
+	input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
+	>=dev-libs/libevdev-1.9.902
 	>=sys-libs/mtdev-1.1
 	virtual/libudev:=
 	virtual/udev
diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
index 9ebb9ed7fab2..b70b5a216c47 100644
--- a/dev-libs/libmemcached/Manifest
+++ b/dev-libs/libmemcached/Manifest
@@ -5,6 +5,5 @@ AUX libmemcached-1.0.18-disable-sphinx.patch 264 BLAKE2B 6b26230f2c79d4f9f0cffcd
 AUX libmemcached-1.0.18-gcc7.patch 846 BLAKE2B 6c82a0cec03e6992e975b30a6c2b00bf6630104b107ee1241fc9fc6be11054f3def0b2a3c9606762d193f7c729e3ef31865cdaab6b4294071a14bbb0a0aed212 SHA512 87667843bee44e1388f6088085a5d0c3a3a824f4830861024f5a19ab1747e96a74b8fae5870f848358a66258aeb18c9a6fa3a1d17bd03260b41f389e01e19c49
 AUX libmemcached-1.0.18-musl.patch 1495 BLAKE2B be213de08d246829d5a017ca4f77c7c4581ead106c7ec817511698f2d66bca3271c2d2ab5f2017a15545538787f0c3a6bee8d0b148b180718fd43809a6bc6b6c SHA512 ddb0594d826d756115743caec69762995fd25e09fd3765c685cfd558e2918ffad0679fc2872d37c8e1954cbcdc14852dd861fcbf9eac645f47a86265ab2bd651
 DIST libmemcached-1.0.18.tar.gz 1039649 BLAKE2B e55acdc4c0cb2417f01b2980f7f71d9dfd685877361622422ee812f9e066ed2711549d457cf1b4a48a14c778e820b54abfe0c6274812c71fc7961e68167975e9 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585
-EBUILD libmemcached-1.0.18-r3.ebuild 1608 BLAKE2B 9f2407ed8d539dcda7af004f743f4e99cccbc20d29d6ef1670a5288c51a9137da8ddffb5ea93d4aacee8acdf64ecbdd1e310cd971fd04dab2645bcfbf3efee79 SHA512 1dce280cc7a5d9b3aa3ec5a6880747f513faf5d6390078c1caef1cd3b7617eb997a5fa205bb4866bd8d803dfc57511a230c948a3e1eb23496519f41dba576f1f
-EBUILD libmemcached-1.0.18-r4.ebuild 1412 BLAKE2B 36bac5bd8bdb31b5eab5cd1f64b7d0188020b539c7e308128a345bbb7b948e17c8967851cf4afb1cb00a6a04f8fe6d843bbe7aba3e5765427fcfda15cb01440d SHA512 580b63b314ff87a1ef1dba80c54f32681c60a3d188cbd794abae2d37a18bd31f3331117e67cbdd6e60ebe2be5991faddd9a3d6eafd00b64f001778ec1e9f59a7
+EBUILD libmemcached-1.0.18-r4.ebuild 1405 BLAKE2B 31c13537a1643368d6b61c8345ca831f87f6be44c8b9a91bf3e170598834a8accbda232a4370cfe2ef2c21f81f1bd7184820e4ef0d50be66fea3f08d3671abf5 SHA512 5506713ed94046270f469af8595e31746f6ee7b03ccd9a5cf9725d87cbf5fb2e22b12aa65589c29da7287194dd31e9eabf64b82ceadc2c07866135f3a7347f3b
 MISC metadata.xml 827 BLAKE2B b3e3a04c088a9119eba98099919684fc7b59205259b6cac2301eefbfe3623d4dac1fc9692abce68505af65fb8a5a277337488f18d32bdf6e3823199a3c86391f SHA512 579b472acfc9763e94e7ccbf8173327aa40cc89c7dddb4234e20e9106aab809ccc928cf197c81f5bea096c2c2fb6703aba518e003122d7e552f75e7d59cb2f25
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
deleted file mode 100644
index cca07f3e5255..000000000000
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOMAKE=1.13
-
-inherit autotools epatch multilib
-RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
-
-DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="https://libmemcached.org/libMemcached.html"
-SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug hsieh +libevent sasl static-libs"
-
-DEPEND="net-misc/memcached
-	sasl? ( dev-libs/cyrus-sasl )
-	libevent? ( dev-libs/libevent )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/debug-disable-enable-1.0.18.patch"
-	epatch "${FILESDIR}/continuum-1.0.18.patch"
-	epatch "${FILESDIR}"/${P}-gcc7.patch
-	sed -i '6i CFLAGS = @CFLAGS@' Makefile.am
-	sed -e "/_APPEND_COMPILE_FLAGS_ERROR(\[-fmudflapth\?\])/d" -i m4/ax_harden_compiler_flags.m4
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dtrace \
-		$(use_enable static-libs static) \
-		$(use_enable sasl sasl) \
-		$(use_enable debug debug) \
-		$(use_enable debug assert) \
-		$(use_enable hsieh hsieh_hash) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.*
-	newman man/memdump.1 memcached_memdump.1
-}
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
index 213043a11dc1..494ea66b4cd5 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug hsieh +libevent sasl"
 # https://bugs.gentoo.org/498250
 # https://bugs.launchpad.net/gentoo/+bug/1278023
diff --git a/dev-libs/libmpack/Manifest b/dev-libs/libmpack/Manifest
index 9a1a809de606..06ba00c5b118 100644
--- a/dev-libs/libmpack/Manifest
+++ b/dev-libs/libmpack/Manifest
@@ -1,3 +1,3 @@
 DIST libmpack-1.0.5.tar.gz 32966 BLAKE2B 8ad01de11c740c3efc7b42046b89f7691dd32d228e126485bc49224e54789e7f12a611982c0fd9d2bbe8b06d1ce2df1ceea1b302e139e30d0a8c31f251129166 SHA512 6e30edafcacfb580b410bc6749ed7fe8f18b3be0cb98959339853e77bc3ec0cda6df08a0f1f22768cfc773458a2ea6bcef4f0421eea55cf56c58981d13711a04
-EBUILD libmpack-1.0.5.ebuild 1313 BLAKE2B a442d80eadc638b6af35bf7abe6628c9f433d41d0185ad8b935356a696610cd0d9101398e0cdefc245c5c21a7630f5e67f77121e877e17c941e61777e2e92a8a SHA512 8ddc0a4a2d8b408ef12ef406ddfac55ba5662b2efd161d986ea747a26884154f843001d952eea454b09119f440bead40644b7f8836adb8c763f7c9ff1213c158
+EBUILD libmpack-1.0.5.ebuild 1320 BLAKE2B e97ffd6f0577790448f2e13fd534f090b644f1b67321373095377326a42a51f8b8d8cd875aa5d659cf742647fd1287d170c95ef6ffb5e49e6c4ab0d71874d29f SHA512 19c0158d623da72c4346dabe22268a97d80f109b740a5614ea2e3b155ed871ebe97032d2bd47a68b9a1787e22825b03600f9de3cf63e8026d5fb1a32f719b65d
 MISC metadata.xml 333 BLAKE2B f3e54e3a241a85adad55693f7dd3cc47cc646d1432b4281c264c849fb2a2bfc050aee53f5ae766063335b72c3ca91ed9054bac758d82c969acb61913f7282940 SHA512 aa83f4113099ecf8b749a070014b9d9c09fc1c0d4836f2cf621b2966088cf3ee73e26ab4f365063713db353671ad5937f98ffe4c87762c6e196cd57c8eb595ea
diff --git a/dev-libs/libmpack/libmpack-1.0.5.ebuild b/dev-libs/libmpack/libmpack-1.0.5.ebuild
index fdebde99d872..3b35596600f3 100644
--- a/dev-libs/libmpack/libmpack-1.0.5.ebuild
+++ b/dev-libs/libmpack/libmpack-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libnfc/Manifest b/dev-libs/libnfc/Manifest
index 82f430252194..461797a57b43 100644
--- a/dev-libs/libnfc/Manifest
+++ b/dev-libs/libnfc/Manifest
@@ -1,5 +1,3 @@
-DIST libnfc-1.7.2.tar.bz2 534821 BLAKE2B 015634a696aeda77abdb53ab658504d0183b8d8d5899f368b122660d6527cf4d3ec988147082620d87d007ea33320acfde6cc013c9257b9c62fa4fb99528eeeb SHA512 c93ab10667998b6c6bf948082253715762ae91699d3e035f1149cebf6d3881cbc2ab570976c70cd12f886f76a18a82ac048fad0664512d1cd553c0fd1fdf7674
 DIST libnfc-1.8.0.tar.bz2 553511 BLAKE2B 060ef4f24b3387393faf43f37a3a245177cb9697d42df1a8e8e5155af8b6e7b818b4bd710ff73929bde39274eda0235d111627cfd3931bd3fe9addde10af0fad SHA512 aa8762ecb5b94167d20346f2c81491bb5b634bcedbf2aae3e2efdb301bca89ceb7c2e15148d0934fdc1cce6d77ee0225e28e84893232999fdc09d8a90ae2a7c5
-EBUILD libnfc-1.7.2.ebuild 1030 BLAKE2B 185e653a815d5682d4dc9f31aeabca00c4ff5612c622f9da6763bc4db30d1d304b7088052e77a47894774a2951db3c89f26a7c066e1674dcc87e8861a9a6ecfc SHA512 6dcde7d4f1af93ac238d6ebab7ecd27b85210c18c61d5fa0d99c6c6f2db75549d7d824ad7d7e723dd5e4a9532053e33147905ec53125582d273ec3047ac940aa
-EBUILD libnfc-1.8.0.ebuild 1030 BLAKE2B 185e653a815d5682d4dc9f31aeabca00c4ff5612c622f9da6763bc4db30d1d304b7088052e77a47894774a2951db3c89f26a7c066e1674dcc87e8861a9a6ecfc SHA512 6dcde7d4f1af93ac238d6ebab7ecd27b85210c18c61d5fa0d99c6c6f2db75549d7d824ad7d7e723dd5e4a9532053e33147905ec53125582d273ec3047ac940aa
+EBUILD libnfc-1.8.0-r1.ebuild 1050 BLAKE2B b89dbe3c9f21a5637836a755b648c0d6e5853b65b380acb99cc81c120e6c08f1e9305dabab00bd14d773ed46da7851edf97086fb204d09f947cede68f2fa344e SHA512 6a4e1fb8df883712b67eec0fee8ee97d93e1eb15aa56a5c981870074eea7dc496a6aec964d16d9829473951f0cd019f8dcd7f56b185b1d1d2d9e3852ff4c15a2
 MISC metadata.xml 389 BLAKE2B 699fb3cd9d37fe58a3f4d4c80bdad576dfae94d3f45318107c08741ee2cf5dd0c66266987e4c80321bfa69e1b7c5ed8e987ffc93e058d0b709c56dbef5477c72 SHA512 abf7bbbf9ce7e0364690079bb7ace4b3db320ee0468f76e80182244432ef8781249b1d7df66c361644fbfe8e0e843fda4014704792b64677769e8b4e48a33d52
diff --git a/dev-libs/libnfc/libnfc-1.7.2.ebuild b/dev-libs/libnfc/libnfc-1.7.2.ebuild
deleted file mode 100644
index ae5228fdac73..000000000000
--- a/dev-libs/libnfc/libnfc-1.7.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Near Field Communications (NFC) library"
-HOMEPAGE="http://www.libnfc.org/"
-SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc pcsc-lite readline static-libs usb"
-
-RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite )
-	readline? ( sys-libs/readline:0 )
-	usb? ( virtual/libusb:0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-	local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s"
-	use pcsc-lite && drivers+=",acr122_pcsc"
-	use usb && drivers+=",pn53x_usb,acr122_usb"
-	econf \
-		--with-drivers="${drivers}" \
-		$(use_enable doc) \
-		$(use_with readline) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	use doc && doxygen
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name 'lib*.la' -delete
-	use doc && HTML_DOCS=( "${S}"/doc/html/* )
-	einstalldocs
-}
diff --git a/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild b/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..fba699e4b06a
--- /dev/null
+++ b/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Near Field Communications (NFC) library"
+HOMEPAGE="http://www.libnfc.org/"
+SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc pcsc-lite readline usb"
+
+RDEPEND="
+	pcsc-lite? ( sys-apps/pcsc-lite )
+	readline? ( sys-libs/readline:= )
+	usb? ( virtual/libusb:0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s"
+	drivers+=$(usev pcsc-lite ",acr122_pcsc,pcsc")
+	drivers+=$(usev usb ",pn53x_usb,acr122_usb")
+	econf \
+		--with-drivers="${drivers}" \
+		$(use_enable doc) \
+		$(use_with readline)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		doxygen || die
+		HTML_DOCS=( "${S}"/doc/html/. )
+	fi
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	insinto /etc/nfc
+	newins libnfc.conf.sample libnfc.conf
+}
diff --git a/dev-libs/libnfc/libnfc-1.8.0.ebuild b/dev-libs/libnfc/libnfc-1.8.0.ebuild
deleted file mode 100644
index ae5228fdac73..000000000000
--- a/dev-libs/libnfc/libnfc-1.8.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Near Field Communications (NFC) library"
-HOMEPAGE="http://www.libnfc.org/"
-SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc pcsc-lite readline static-libs usb"
-
-RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite )
-	readline? ( sys-libs/readline:0 )
-	usb? ( virtual/libusb:0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-	local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s"
-	use pcsc-lite && drivers+=",acr122_pcsc"
-	use usb && drivers+=",pn53x_usb,acr122_usb"
-	econf \
-		--with-drivers="${drivers}" \
-		$(use_enable doc) \
-		$(use_with readline) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	use doc && doxygen
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name 'lib*.la' -delete
-	use doc && HTML_DOCS=( "${S}"/doc/html/* )
-	einstalldocs
-}
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 1c840ee389df..28cc485620c6 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,4 +1,4 @@
 AUX 1.26.0-lua.patch 3695 BLAKE2B 16f370ea0707743db9a28cd511f6b9521d285bb37eb3a49d916fcce84965c84490253c1a30e729b21eb528b3a6397cab9bb372b9afeb22bed05e278048734bc4 SHA512 d8939b9a21b838db8e34ddfba7f54f17e88c4387cc3baa15f4df6386180677b419bb9989cecd8e0757442a45bc04f83bef06df5a8df86c17f6812a41044a7eb7
 DIST libpeas-1.30.0.tar.xz 193108 BLAKE2B 071e24530934605a6364816165d8f47ac9c94887e80eda9175b163d9af64b2624d42df75c7697220e888f2f9150c6e121bd1dc2716de5bcf0d392722938de945 SHA512 10ebcc61c8aa42b5f6892a74d5e02a52dbc8fe4c35280d78f41adc915dd9c08e9756608f8cbdbaf3d63c44074f0b9e9e531dd077ba201b416acfdcfb94b4bc42
-EBUILD libpeas-1.30.0.ebuild 1968 BLAKE2B 246c675b6753f318a830821717717778e0a7966bf3939f19c6a5edb2abdf50bdd354ffc3430ee3f067a0e86804d4fea60f9669274a6b1777ae6d7dc25250f1fe SHA512 16c8ca60a05107943a79791b28ad256516c6ffceed97075d5b650088ac288e85d3bb1af50df45f3726ee325bdaef4a7c07602a06a881389d58942c52d7f9ed93
+EBUILD libpeas-1.30.0.ebuild 1969 BLAKE2B 70cdf310399ca03c7ad52c01678b5627cf669eec971175c5842c502bc4561ca42997eed6581182ae8ab474b1fd8b86ab179e78f751842b77a8dacea64cb302ce SHA512 9524e9a8904337dd4a15aae436da9ab184265dcdcb8ab5595da19d305bf8a1a0eda5820873e88cb4f76a325d9c2317b711c272f3ac2790ad793eec97b2dcd9de
 MISC metadata.xml 416 BLAKE2B 9383d1583b61f2218efb3b8c7bf6855e30ab8ee3f4e0829b78f17832af533a6839e713c702e0dbdcdeb24a516badb446b935e0ee1abc112c2342c2f0ce321d81 SHA512 3fb271973b7b510983e84c2d0188688f04a1f6a1a80aabc15dcbdb14276608ed59ee3ea1f77feade9b08785651ea4f85e400d928a267651c40f0e490c175da62
diff --git a/dev-libs/libpeas/libpeas-1.30.0.ebuild b/dev-libs/libpeas/libpeas-1.30.0.ebuild
index a267bee72c7f..bfb4cc876dbf 100644
--- a/dev-libs/libpeas/libpeas-1.30.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.30.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg
 
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
index 3ad2230094f3..82d367cca488 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,5 +1,7 @@
 DIST libretls-3.3.3.tar.gz 434208 BLAKE2B 74dd3d4e0a1aff8295b4c5023c2736006c2a8a0dab1e82457c5ec9d4c27ae57816557810b3a714bb5bbb9a560eb0dd5667af1097f1727878b1844a3e8bfa4323 SHA512 21128107ce833690f43400b11c2a841373bbe1f045a6db5ad6cbcbee181ddf97c173bb05ba41805ee0324d7435a52ad3027551f20083df9a3d052956a412bccd
 DIST libretls-3.3.4.tar.gz 434605 BLAKE2B 08f85c420952599375ab3905238bb3fac474b2b97b6359517201dc85e5bf2d5dc9825c0ca186560435cf2a6ea5a6733e39d772116a892904ed0cc6f08e0f3f3f SHA512 ae6f1b7bf9f61948e88ce87c93921b2b27652d85a95062f38abe7dfbb30d40c974c79b7d6faab43b3a987abff5e761b5c2a1982af8cc1511fb3136c580a0e3d6
+DIST libretls-3.4.1.tar.gz 435404 BLAKE2B 11b828f5c058b929d1d4bc0cd3c53f17592c113f10f6bb73f8b7e672b5ab376e768e33893c4fcf5c0b447bc5cd30012c8aaaf5b639cb4962f4e0849ac3ee6cf1 SHA512 5d8b8d6cafd4b3c7e97eb417dad35a415bd69d599e9ee720f5598452a6750589b570ffa52718062d2ae3477df81b2316064577a25d2c68fa673082bb766b16ad
 EBUILD libretls-3.3.3.ebuild 660 BLAKE2B 8a49aeecf3e04a40250be81afb3141024fc5a8b5fb2b07a1a417c7224ed08393b334d839579d1ee658241a507d318a1d0117cfa0fd3e4ae8ee3b82f92972fda6 SHA512 3d366fbd6f4cb8ce708da2cf0dde0e94984ddb0f85f4563ae8f46fc315f2e9269834f773f6aa03242207ef61328f51f30f009f31adb2d94f3ba89a53cf1e4596
 EBUILD libretls-3.3.4.ebuild 666 BLAKE2B 4a03d1eb6005f5ce5325d9981345912d737ed39a3bc69537acf6a77e786f2701db555de7c822a2efee4a4ce7ee3bee7eb4af46762e2e7555ad856ce44f28fb44 SHA512 8a17029b9fb3efc80356eca3969eedb1f3ac242d7b52340ab874a29554993354e6f0e0d2f0b33627767724465ed060c1599043cd4e9c8d5d32fe04ab8fee7832
+EBUILD libretls-3.4.1.ebuild 669 BLAKE2B 4e6fb3eda557ffa19559af80e4887693b513202db8f67a61f47618a5d17580fc4502234fc921cb3c627555c640694a90bbd3551e3126614db14f7975d3f505ba SHA512 4710c7fa4fd92e09bfa17757084476e0f8550fcc11a6276d22ee694a479acd27fed20d4109b753a758b6ca35b4b56f8d4026a0e19789d56f1308b50550281d86
 MISC metadata.xml 361 BLAKE2B 9f05ddd1ac3e1a634962c9c800c3bdf60554488c61dff9b215866b24e0b2472d7c0873f0fd6bacec2abbab0e79faca728a4b22e34633c3dde64995b05b86db61 SHA512 c7b186da31da21b4ad5c5662325cb2757e3ee8d7cfd84d75a49b07aebd4dc882cb9b0e16ffce99a8ae2409a53dd750dfb5ec6eff0f9da9f4afee013f102ef688
diff --git a/dev-libs/libretls/libretls-3.4.1.ebuild b/dev-libs/libretls/libretls-3.4.1.ebuild
new file mode 100644
index 000000000000..8ee6adc2c9a0
--- /dev/null
+++ b/dev-libs/libretls/libretls-3.4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Port of libtls from LibreSSL to OpenSSL"
+HOMEPAGE="https://git.causal.agency/libretls/about/"
+SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/22"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DEPEND="dev-libs/openssl:="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-static
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest
index a43dade046d5..7bd8e2496c6b 100644
--- a/dev-libs/libtermkey/Manifest
+++ b/dev-libs/libtermkey/Manifest
@@ -1,5 +1,5 @@
 DIST libtermkey-0.20.tar.gz 45167 BLAKE2B e51a0c91efce056824ee56918aa6a794096e1f19e02d04278c0f3e82382055f16b0413c9f3832492677fbb68bcc1803303cb4c8ee8dc7363276dfeda3e5a6e4f SHA512 81a4bc5917c60ca692ec3065ac0252ae5dc1adccc2832be1c83c82318c97473d883900ab88a8a0ee08ab3f831ff07f3a4827ee3d8e936a3a42c4708ee58f6301
 DIST libtermkey-0.22.tar.gz 46147 BLAKE2B fddc00a1ae525e5ed8c9c6eaee46fe30a99dbbc76ca988f9f5301b3c5c13a6de4462d6cc612119409a21737176f67ac196109b11fb58f414b25db5b6a49f4982 SHA512 2e8242cd1e6acb8900125dcee9fd47f7554c359363f760b88858c82667e1f3871bdd87358b14c8a133ef3cd2699947a5045477e64cdf7f96d4ead1723e73a219
 EBUILD libtermkey-0.20.ebuild 965 BLAKE2B 1e16f410da62765d9818cd526aa1e2cb5e88f96940d17bbd21c9d90ca7d50787825f0115a633dc4803be5e37d2cf39945c84d559a21dc22ca0ae62f1ff6fcae6 SHA512 a738569e408342f8605d32dbe96fda1f4843a39efe49f998b981b5d4f3d78cacf2e2be5832603704aac66c6a9fe84fc052aaea925196298721d4f69380bf641e
-EBUILD libtermkey-0.22.ebuild 984 BLAKE2B d2026920989f636c339058ac83b0ecda50c82d7a386ffb18840e530c3a6143ef7dbe1318ad5b8efbfee0f028de665eee142196d8477e281a623085ff16e82e1b SHA512 ad9a012b24b91eee34532c8e08b81d936d4e4f85b696c291a00867a7791ce4284b47f40c2789216ab525c492be45ca96d83551ee3e925357491ed1ff8f83e11a
+EBUILD libtermkey-0.22.ebuild 991 BLAKE2B 603a7b0bc41525bd0b8e3b2ebd374e3b96b5f844224934903e8c9cad292bc5cb0e6f7ce8bf919318f03b054d43ca87cca46c778992335124561b2e9722606a75 SHA512 25432f5e2da375485e155dfddcffba3daa269bb6179535e59c9d6da309691b091ac17b70705ac61f8c0122b24d913ded2ae1c6ac8512e2a45eb3830a09eff11d
 MISC metadata.xml 358 BLAKE2B 555dc6dc5edb485ded5e2fec2eef70426c2e693853954c5feb8d39914b1cc88aed79dae13df257df86193701e9f842fad8e4686941d3a143a261e289ebc0960c SHA512 1a9faab554e113b8c3c83ad7a6e24fa71ed7ea3838a11677465cc824c7181d512d58443b5ea2fbd52492345e62db5895e3f17a47dc7e413842b02cdad85c5411
diff --git a/dev-libs/libtermkey/libtermkey-0.22.ebuild b/dev-libs/libtermkey/libtermkey-0.22.ebuild
index 5f60647df324..3f15192f8ff7 100644
--- a/dev-libs/libtermkey/libtermkey-0.22.ebuild
+++ b/dev-libs/libtermkey/libtermkey-0.22.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~x64-macos"
+KEYWORDS="amd64 arm ~arm64 ~riscv x86 ~x64-macos"
 IUSE="demos static-libs"
 
 RDEPEND="dev-libs/unibilium:="
diff --git a/dev-libs/libthreadar/Manifest b/dev-libs/libthreadar/Manifest
index 14a171cb3279..43f442411f9d 100644
--- a/dev-libs/libthreadar/Manifest
+++ b/dev-libs/libthreadar/Manifest
@@ -1,3 +1,5 @@
 DIST libthreadar-1.3.2.tar.gz 442260 BLAKE2B 2a743fbcd8ae0b462910b7ccde34a3fcb90239df9bf608c9d249dd9bf100315ade3b2151339ae55b1121709446c23044c3fd7bb420efb009ae8d5fe0a21a496a SHA512 6edc3a1a6eb41a3b9ada35327d712fcf3562875dbddd0bd2f3f016492cb0f10fe669ed1ac3a65573d88261b4de50201b2abe8dcbffa0abc5cc257d7a8c3c4df2
+DIST libthreadar-1.3.3.tar.gz 442979 BLAKE2B bf310487fc377d648610157953ff8be4b5ae1d1ba046ac18743c0a83f3cd1b6a1a0fffdb917cb9744f48a241321f52300e6627ed398918a934bfc61c374f8d10 SHA512 0ad4ea503ce55a5482275d6a1a0eb4b7b886a26646db9e21c458d28898a473c1ed028c5c08ce7db82e9daf100bb1944710ae3f67f829cb883265f053385fc8c5
 EBUILD libthreadar-1.3.2.ebuild 912 BLAKE2B 48391b40e27a540218552b5abd895476a1bdba0aec771bd6385f56ae90ce5bb97f0971a11bf4133f4e16072dd8faf83e3404a384cd77ad144074b1853f8bcab1 SHA512 e383c7048c93936ef171bd945fa658350a81aac641a00fefc06b13cafd5bfa48ec0b2c3e20ea035e858c1772ceb7fb27425150a55fef2d60256c2591c2faef98
+EBUILD libthreadar-1.3.3.ebuild 491 BLAKE2B 0576688a8965d61d116eb33040a6eadb27d47df3531a2e8c6209f0cd7c6faba1cdb3a5dda767a44b57087b5d05a0ac682abf7cab526d4100ca719418b4a25210 SHA512 715d4b6daa599ee8f55b232a7a90cc336d79ac26fb04360acae3ce1b0b19fc0c49299341eeedd0f7772090a609a5fea5043fe1b06132c80911d660304d9271f6
 MISC metadata.xml 890 BLAKE2B aaf5d415466806037fcc87f048d8ebecc04d3c04613e828a3783e194f265bd25938d98e1f83d778c0e970e458115654faa87826af0e1af58f02a5cc1660df08c SHA512 7bf58461d45c6c9e00e3987aa7d66202cab8382fc84e775c17c59158404bdd5d179975d0afdf383ed654e34105820fcf2a83436716eea11c3f808a746d7291dd
diff --git a/dev-libs/libthreadar/libthreadar-1.3.3.ebuild b/dev-libs/libthreadar/libthreadar-1.3.3.ebuild
new file mode 100644
index 000000000000..56f7aff09459
--- /dev/null
+++ b/dev-libs/libthreadar/libthreadar-1.3.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Threading library used by dar archiver"
+HOMEPAGE="https://sourceforge.net/projects/libthreadar/"
+SRC_URI="mirror://sourceforge/libthreadar/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libuev/Manifest b/dev-libs/libuev/Manifest
index acde352215a7..165e35d8d41e 100644
--- a/dev-libs/libuev/Manifest
+++ b/dev-libs/libuev/Manifest
@@ -1,3 +1,6 @@
+AUX libuev-fix-tests.patch 378 BLAKE2B fd5f675e9734e10be8c136b44ee8eeb3ef7ce3a4182051c2e38009e004d8854a97c266ec126b5037f66f95961eb485ac5fd2922f8dbdb9a9134f7c2b3df05775 SHA512 85fb791829d08ec42725157f8d90b7101b8520f9c25fe5207db1baec53d340574298f4d288f0940ef4bf3eff447452b98cd0336051f0f87fbe92946d8977f701
+AUX libuev-large-files-fix.patch 412 BLAKE2B 4deb78a3702c0dfa2fc0bb86b21be32abb5e94d3a14a37f5385845cbc8661404a8c896ac1de800e7ddce63af2e1072558f3740af9ebcc349dc52c5228205d04f SHA512 a4536d9f0bc4b877a6e0fd8b404e740f0de492b6a083b59a58da6cae5090f421d2306fcb20644fa3833dc7f07db27f7f3e14bd4d1e01ea33dc34b193822ed603
 DIST libuev-2.3.2.tar.xz 247784 BLAKE2B 30f9ca2d71c2f05173d4c5863e0dce64e7a77987e3472b11ac5f3ecf677712ddc5fe9e9cc9587f73d6a5acfb716d02dfa744bb301d55b834d44e944bf09f3bd0 SHA512 dccf83ea61dd4841d2b7e1e75b8c46f41607b26aeefd49bc3d594d864408a282c2ff4cf6ff84cf596fe3382c02e53631593f12d5b79afd9f2e57fb9d021b60a8
+EBUILD libuev-2.3.2-r1.ebuild 748 BLAKE2B 79116713035e509f1bd113755dda16ed2e39d8628f58115010f5e5124d9d75fa8362c444894321e94b2e2bee0d039f9018d6863a315fc88d2b78c66e4aeb11f8 SHA512 2088a9bb455953c2e839c0507544adeca41051b785a37944dd88f67b5bfcd359c372491bea28b6d042675ee9d702a40c1c68043592be0fbbd57956e586ddcc76
 EBUILD libuev-2.3.2.ebuild 562 BLAKE2B 438adf14a6c25b8a7e2994c761650a02f2a55f976971cf5ad7715881b65a7848ee8e468934d45add587e69d23dbfad3092d4872fb1674f247b5739a80ea11944 SHA512 862d201fc3db9d81182a155f3d30c86ce7b8399ac5315810bcd440d1fad73d65bd88fabcf1ec85992bba3f0b0db355a0eb492b21908f552506263644926e17f4
 MISC metadata.xml 728 BLAKE2B 53b2361b48ee3ec6aefd2df57085086744ae67b1e88a2327d22e3c608165e3147209639d9ed44c4a0fb5fdda85c970d4140211b6f4a3508a079e67b4073a78a6 SHA512 ead8ab50cf78faaade004f31faaa6c5090df43e95afe917d0ca302af45adfa9f6724f14c955bb5685f3434749e1593e1271eed707ffaeace9c2960b31dab81f6
diff --git a/dev-libs/libuev/files/libuev-fix-tests.patch b/dev-libs/libuev/files/libuev-fix-tests.patch
new file mode 100644
index 000000000000..68e4b2c4fd6b
--- /dev/null
+++ b/dev-libs/libuev/files/libuev-fix-tests.patch
@@ -0,0 +1,9 @@
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -14,5 +14,5 @@ check_PROGRAMS  = $(TESTS)
+ 
+ # Ignore warnings about unused result, in e.g. write()
+ CFLAGS          = -W -Wall -Wextra -Wno-unused-result -Wno-unused-parameter
+-CPPFLAGS        = -D_GNU_SOURCE
++CPPFLAGS        = -D_GNU_SOURCE -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64
+ LDADD           = -L../src ../src/libuev.la
diff --git a/dev-libs/libuev/files/libuev-large-files-fix.patch b/dev-libs/libuev/files/libuev-large-files-fix.patch
new file mode 100644
index 000000000000..61a4cdb3ed27
--- /dev/null
+++ b/dev-libs/libuev/files/libuev-large-files-fix.patch
@@ -0,0 +1,9 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,6 +1,6 @@
+ lib_LTLIBRARIES     = libuev.la
+ libuev_la_SOURCES   = uev.c uev.h private.h io.c timer.c signal.c cron.c event.c
+-libuev_la_CPPFLAGS  = -D_GNU_SOURCE -D_TIME_BITS=64
++libuev_la_CPPFLAGS  = -D_GNU_SOURCE -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64
+ libuev_la_CFLAGS    = -W -Wall -Wextra -std=gnu11
+ libuev_la_LDFLAGS   = $(AM_LDFLAGS) -version-info 4:0:2
diff --git a/dev-libs/libuev/libuev-2.3.2-r1.ebuild b/dev-libs/libuev/libuev-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..f8a20c0605ff
--- /dev/null
+++ b/dev-libs/libuev/libuev-2.3.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Lightweight event loop library for Linux epoll() family APIs"
+HOMEPAGE="https://github.com/troglobit/libuev"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-fix-tests.patch
+	"${FILESDIR}/${PN}"-large-files-fix.patch
+)
+
+src_prepare() {
+	default
+
+	# Needed for glibc/LFS patches
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-static=$(usex static-libs)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
+}
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 7b03c1589a58..39ceee7e6f12 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,7 +1,5 @@
 AUX libuv-1.41.0-darwin.patch 1747 BLAKE2B a5a2d3ac70468515e395f69c9a80748d6db261f8ae7c4979fc3965d32d7d8acd6c6edad4a4e9afc449e36df0f7544ecd1823bceba17ba456f21b221c78341243 SHA512 23be80dedc692cae3dc67d66834c937a890f781a9f73c68ebc3181130a5f33f981f822ef026464f77aa134701505054cbf76cf852429d0b3194d6a48773a0b8d
-DIST libuv-1.41.1.tar.gz 1281506 BLAKE2B 4102df9559724c4f6bab090c57c8c976b7784bdc28243047c6c4cb2d61ce97deeb6f02e322238b98e9900575c981e8a586db852d5d34f0fd222a0091fc391a5b SHA512 dfd4996a2e8d6cc1ffe141921b2472070c8678cbbb8f0cf333dba7e7a36be0dee7fc3515152a27253252bbe48a9b29766d654f7f77137dd6f6bf0a8330c90fc4
 DIST libuv-1.42.0.tar.gz 1293478 BLAKE2B c2b46492167d759fd781b704dd256de100ca5bed62b0afe74fd8c46d5ecce15c53c4158d2e938314c578f26978e9be0bc69c4ffd0f40b2cd8419fa120df5dc2e SHA512 29982c975fccb99dcf28c8cc0f9fe9f15a0c546778b0723596a790021441b8be1ccece17f63319b5a1f0ccda8a846c0b544f9259d3482e84e14138461a0d882b
-EBUILD libuv-1.41.1.ebuild 1358 BLAKE2B 9747dc11abcd8beecfb0c266b7ab6614d9b4e59da41dc26adb95099f7c586039bfcf4b962dd08bab5fc6d4a07011b83689cc8bb5825f39c8cad90e3f123a2d4b SHA512 470307b8d473833c187302907a74378e20123a16a382d801a4850d2b8adcaf610f019e6592b9766a304c807a12614a4d018d3da7b6b74ee746be8259ce046d29
-EBUILD libuv-1.42.0.ebuild 1360 BLAKE2B 5af5b931ef11ee6105ff089dae358e1ba9600b1fdb69eb90ec0a14919ca477e34cb5f49202adab873d0164389cb7cd301c40d148a0cd1a4cb33f5b21c183639f SHA512 3b216ef128d41771f4ac01dc4b21823aa219afe68d94b2b318866eaf448f89a739849b03f8e54a21697bf0d40114634b9a1bbaac25d503a3ded305a88d040447
+EBUILD libuv-1.42.0.ebuild 1358 BLAKE2B 9747dc11abcd8beecfb0c266b7ab6614d9b4e59da41dc26adb95099f7c586039bfcf4b962dd08bab5fc6d4a07011b83689cc8bb5825f39c8cad90e3f123a2d4b SHA512 470307b8d473833c187302907a74378e20123a16a382d801a4850d2b8adcaf610f019e6592b9766a304c807a12614a4d018d3da7b6b74ee746be8259ce046d29
 EBUILD libuv-9999.ebuild 1366 BLAKE2B 417a761a89412ec9010fe8f7e28c64dd9faaa8c5dda6c5b920d372eb3283665db7cba9b73976264dbe043f898ae5a90e35e508cc628bc32491d803d38e141555 SHA512 265ab2037600825d36c12df3a4ff6db43631c28c481116963d9c5ba6bce555e18572bf91ac7900d74c1fc70d201d93499055bf89c9c8912b49ae7dda318b9479
 MISC metadata.xml 1426 BLAKE2B 79a040706bd2e88560fdf7cdd75226c51384f1b27f8f86798f3a694d1d4b02ce309edef4f1921f73e498533e37deff9051ebdaa6ae565defabe9d4546aa33bd4 SHA512 a6fa2c3217de06d7d324b37b00e0cb19e8d0b192cd10736d32f5d459c701c14a6aa296d7d4d292f7c56120953423df0068f3f71495941295c97e86c283b084d3
diff --git a/dev-libs/libuv/libuv-1.41.1.ebuild b/dev-libs/libuv/libuv-1.41.1.ebuild
deleted file mode 100644
index 082ca534234d..000000000000
--- a/dev-libs/libuv/libuv-1.41.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Cross-platform asychronous I/O"
-HOMEPAGE="https://github.com/libuv/libuv"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/libuv/libuv.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="BSD BSD-2 ISC MIT"
-SLOT="0/1"
-
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
-		> m4/libuv-extra-automake-flags.m4 || die
-
-	if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
-		eapply "${FILESDIR}"/${PN}-1.41.0-darwin.patch
-	fi
-
-	# upstream fails to ship a configure script
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		cc_cv_cflags__g=no
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
-	default
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libuv/libuv-1.42.0.ebuild b/dev-libs/libuv/libuv-1.42.0.ebuild
index c64a64a9f971..082ca534234d 100644
--- a/dev-libs/libuv/libuv-1.42.0.ebuild
+++ b/dev-libs/libuv/libuv-1.42.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="BSD BSD-2 ISC MIT"
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index 6f0c146cfa92..dbe175004b67 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -5,5 +5,5 @@ DIST libvterm-0.1.3.tar.gz 69115 BLAKE2B befdb173a75652a42f3ba72682cc5c411ee170f
 EBUILD libvterm-0.0_pre20181126.ebuild 819 BLAKE2B 407c20beaada04be4a5ccf381780f9c4f3003a621f6fef0a300a261e58380a1771ab5448c4cdcfa2492dac558b18a083c5ec10bbb8a27b2ab948d08c72951249 SHA512 929568c1d1c5c56c43c39fb502cc1d08691dae6a6da69c6673baee415d8f17e6f0e7a0296d09d51ccac227d1accae9d147aef24762c665b516cdd154a552be07
 EBUILD libvterm-0.1.1.ebuild 877 BLAKE2B d7ccb94b2b5302528a32d1c5eb9cfd93b55a201059f117e5c07911a5f734e05d3b7a62c4694aec0b1e519c820e550ee65a41a28ae57f96454589477d031595af SHA512 f1a89cd21460683084fe86dfb511897ad60a45eae00f5d5f90b5053876f047fcbc4b8d1e81d1278e0486bf1e856f69c43a0673d5bd94e21b6197d5ebfeb5d85d
 EBUILD libvterm-0.1.2.ebuild 856 BLAKE2B f0280c1a73cab89dc1b306df9f2e690bb7ae4a524af4d1b5ba4bc1dfa12c07b4a777bf08214ce5fc27725e334fbd0dcf1a5d8baaf3e7ab808816caaa18620e7f SHA512 2de243264c74a0cb432b49615aa4400eb64833c502237c8eec95706625ca0b2130a5201a4f97c94b50d93d187ad9d79803e09a796a37100ffc31729249b98fcf
-EBUILD libvterm-0.1.3.ebuild 874 BLAKE2B c7950e6791458d4bc90123d20cd9df202552bf906dc86aeafaef30c90f04ddd852740c5dfe8e41e00e08bff76b2d8a93c768cc907c050a5180c8eb78f05cd1c2 SHA512 5dd4c45fa505acedf8be522a01f82bb2d2765f41d69458b56ff63d3412408d7a187f995009d15d7fe669d1c774764541eec9f798583a4957e78f23fd66d7312e
+EBUILD libvterm-0.1.3.ebuild 881 BLAKE2B e47aa30b6d333e556fd2970d15081166bc64b318f0a8e51089209e85e11f7d0c63acdd93c79e9d6164a6dfc9160d8853a284f92f4d758f72e97a6c118d254760 SHA512 591a3ebe5ddfa0f73d575abe1b78ad59205df61d6f4c507ac91c74279bc8a351fa06dd4c6f6d8cd76228176084546b15827d05cab80cda05eea312c70ff94312
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/dev-libs/libvterm/libvterm-0.1.3.ebuild b/dev-libs/libvterm/libvterm-0.1.3.ebuild
index 93b4531f0e54..47bea98026fe 100644
--- a/dev-libs/libvterm/libvterm-0.1.3.ebuild
+++ b/dev-libs/libvterm/libvterm-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
 
 BDEPEND="
 	dev-lang/perl
diff --git a/dev-libs/libx86/Manifest b/dev-libs/libx86/Manifest
index 869bfb1ec856..5ee2684b8216 100644
--- a/dev-libs/libx86/Manifest
+++ b/dev-libs/libx86/Manifest
@@ -2,5 +2,5 @@ AUX libx86-0.99-ifmask.patch 584 BLAKE2B 33c0ebeb0ca32b892cebf4bdd91bb2f82fefa3c
 AUX libx86-1.1-makefile.patch 853 BLAKE2B 48a25cd96bacd2e39bc8ecb4fd7988ab3775441f259bfe56fedf0f39f8cb894f3f4bcd64a03a6a5357ed064f9dc0e0b578cccbd760cd2056c564f2502f065d6c SHA512 a61e21ab31b1f22d898799ecc3db57e6816146488d436d3d33817f0ac19d420562830411111bacd8ca4c80a446c088fb931ee293522828076d0a1cae6e7ee0a6
 AUX libx86-1.1-x86emu.patch 1194 BLAKE2B e4f721ca09e081fb9f528ec95ea491a8267a9be8a169a12ebfd05d18425d473b89fe3e6d121ece254b6764a66a4adaeee9d811e619c6db1ce0c62178185d1ac5 SHA512 476d0bc7d3e903c1b1dff75577ea0caa80a5dd06618a08b24300367031ccb578322fcc267746285bcb671583407f22bfb7165374eeb2301ed67177ee18ec549e
 DIST libx86-1.1.tar.gz 87428 BLAKE2B cee90a446994816ce925a5b9edb3de5256f404bcadd9853ad197f13bdf4c86bf4c2def6d38e342ed9af5eba9e87400bfb76cad56852d44583b183853b65dcfff SHA512 b946555a45405a06fdf00b3e2522fc99dd7c61349c32726221aa60117a8d3da6da4b44188b1ebb208368e12b396f26055437cebcc8a0e6df10c7a006182c9280
-EBUILD libx86-1.1-r4.ebuild 1223 BLAKE2B f465918876f219c1eaf76d5a223176c2a82bb1ee3d3cdfff14df433c9410fc6294fe53851f800e9b323442c3e3609683ccd0638cced62de9911912aa42553f98 SHA512 63789d27dc2c5963f24e64f3c7234ba75523f21b70270240d928a011fab4a3c5a1173ff7185f3ff971270fc7a3d4ccb005db217f5624a94ee9889358ea01f0ff
+EBUILD libx86-1.1-r4.ebuild 1242 BLAKE2B f982484fc4e2b7f8d4c8c92171ba039ed808eb503ccd205b366a6a29a4d8f0d0de6048921be7538055948c1fb379b0bbe1241d7dccff07a98e29f2a096ca450c SHA512 1a39f419d07d2bf5200ae07e5a4aa0669a96d728be24f2d2a5e6a1c1d5b9eb371d02c890c1a7c35b6742dc09de254a07424ff68aa279bc9dc7dced4b5b654cfb
 MISC metadata.xml 248 BLAKE2B 66e4449d4247cee6b9b5f83956e415b9dbb08cf64770a96cbf98d9be71b52f99633ac4724d01684446f72c07e8604ea59c12df34cefda37386d3f43ab1606425 SHA512 01f5f77d52fbb159724187a68a6d5f9fe00ddd3f04657629c8c432dc8290d499779b3920fd3feeb21a8408bacf3c4064fe14827384569c7e044eb6d81dd9dd93
diff --git a/dev-libs/libx86/libx86-1.1-r4.ebuild b/dev-libs/libx86/libx86-1.1-r4.ebuild
index e001fab4a41a..350a47c4a088 100644
--- a/dev-libs/libx86/libx86-1.1-r4.ebuild
+++ b/dev-libs/libx86/libx86-1.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm -ppc -riscv -sparc x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 4c2720144c98..9e7c3131a2a8 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,3 +1,5 @@
 DIST libzia-4.30.tar.gz 633287 BLAKE2B 7ca2fa4eb4e887e77658dc66b455ab830da31634a121d2fc58ec4e038a62d09d2c392ca70dbe7df3740592d82e9861086f398d82fba1af8e4d6066c395dca3fd SHA512 ba04206427c6bfd63c4799e2728fd5487a75757a42281daf87c8aee87d3c685e5fa60a0c77409fa774e4fddaaa3336f96bce002e88e6ad54f9af2c2cc939b9fa
+DIST libzia-4.32.tar.gz 633444 BLAKE2B 60fbc85297b06e109f6c989798b6c5629d6f2d861b52388b134f896ee5232f75dc362fd847fd557d4aacced1c2264554c2861c9af7acfbb1e6837d9348aac30e SHA512 e426626d54c97dbce88e11eaefcee84a4e0a23e17a196f46ed4319a22d0f55bf9524c542bd4d41c376b26b51553d4cf7e0d994125cb2321549620f4b4aea5912
 EBUILD libzia-4.30.ebuild 972 BLAKE2B 9f4836d3afecae91e382f7a5bca85ff975027da86e4d9c1dcd100ffe283772bc526bb0086051b5d4459c4f562d25f0be303579b7f8f1facccca6fbb3353754c5 SHA512 5f024cd389418478031574adbc2f08a1550283fa3e1d3e37add45a232d9e2e4ec7e71d9cb1b48f5c24fc68f8374ff567b8765f7e58db11d8b0ba2cdab571b3f8
+EBUILD libzia-4.32.ebuild 974 BLAKE2B b74446348dfd0d0f0c1470349aaa04ae1d59d034c1ecf96d5da37a9507e7200d6e487c427e4312464e90561668cd06274140e74e2a00c46aba0c2ee0d51ed4c4 SHA512 6555ced9e553fc7546163ee0e77f0c87f8421d038bccdca61e290414d3fa30ac3dfadc4d86154933c1926018fcd6b365a29246abf41f66db59432ecc4a2a4e59
 MISC metadata.xml 326 BLAKE2B 1b8ed6c9d40252f3371cf9a1ec295f593c8898dd8e45173ca05cededf987c7e44e2fafca613f8ad3022e9fbb6886d6aec2d183fd47c3064f35038784f361ebc4 SHA512 0c8a48b1101aa184dc596581feaf47463688801cb0f342177ecfb6fade1d63520ca1b9dcb278279470c181b560f555de332e4d2583e8856eec9057cde34df48f
diff --git a/dev-libs/libzia/libzia-4.32.ebuild b/dev-libs/libzia/libzia-4.32.ebuild
new file mode 100644
index 000000000000..0e9b995dd476
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.32.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index c97a6d9f2402..f1e335677304 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,3 +1,3 @@
 DIST mpfr-4.1.0.tar.xz 1525476 BLAKE2B 41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68 SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273
-EBUILD mpfr-4.1.0.ebuild 1030 BLAKE2B a1b8777c4f2fe4ac8afd3976f558337939a8e014ca769ca578e4da191ff9979812d0cac14e07d548e62d6894953745dd5c12a784ba9c6e02155ce24f1cbb26be SHA512 7a72b7738bcdd94af674217928b449350f085e9269ee4440dd4d50d3307cf65f77fef95b4ffb16e5f1ffee5a1703f565a0736d9d5600a12a7a2d74fa5266215c
+EBUILD mpfr-4.1.0-r1.ebuild 1032 BLAKE2B cc2f05e76164efac0956867232086096e20afcd9137953f883835e8f762524328fcafbc306a6d44c45f34086bbf8f11bf5e50cf56dfb4d5aa3bcf1793c98dca1 SHA512 9112a81d34c9e3808eed001f3d567a1534b3e3e1eab9a5ab4f9d4da8c40d8c78cf4ca0717fe089dc57e6728883d6ddd0427bdafb58ca8a764862affcb09ed80d
 MISC metadata.xml 258 BLAKE2B f45bf60ab247635720461e6f8028b41d748c2c0fecea4d5b6eb29a9f532de573e8054773a084b99b2a6a040e980cfc41c8839b13bdeb8ebe6e1de12a1492873b SHA512 2cd16eedd80ae476d1611112f620d3d5eee88fd181fe635d9f9235ac312e24bf8eac5b44f54ff55806ee7a03aaf1d1382a734f7b3496814853d238b9a7b6ee1e
diff --git a/dev-libs/mpfr/mpfr-4.1.0-r1.ebuild b/dev-libs/mpfr/mpfr-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..986919466dde
--- /dev/null
+++ b/dev-libs/mpfr/mpfr-4.1.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Library for multiple-precision floating-point computations with exact rounding"
+HOMEPAGE="https://www.mpfr.org/"
+SRC_URI="https://www.mpfr.org/mpfr-${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/6" # libmpfr.so version
+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="static-libs"
+
+RDEPEND=">=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/FAQ.html )
+
+multilib_src_configure() {
+	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
+	ECONF_SOURCE=${S} \
+		user_redefine_cc=yes \
+		econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	rm "${ED}"/usr/share/doc/"${P}"/COPYING*
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/dev-libs/mpfr/mpfr-4.1.0.ebuild b/dev-libs/mpfr/mpfr-4.1.0.ebuild
deleted file mode 100644
index 286e23371367..000000000000
--- a/dev-libs/mpfr/mpfr-4.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="https://www.mpfr.org/"
-SRC_URI="https://www.mpfr.org/mpfr-${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/6" # libmpfr.so version
-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="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/FAQ.html )
-
-multilib_src_configure() {
-	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
-	ECONF_SOURCE=${S} \
-		user_redefine_cc=yes \
-		econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	rm "${ED}"/usr/share/doc/"${P}"/COPYING*
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index ee20cc76ca8d..285733c17068 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -6,10 +6,12 @@ DIST nss-3.68.tar.gz 82405833 BLAKE2B 0a48c599bb3c97f41e41c5723e6c1b12d7f03469bf
 DIST nss-3.69.1.tar.gz 82426679 BLAKE2B 71948a9fee08536c41da9916e6d2eb82bf52bf688c900eb283f83f0ac60498cce2d936950836b0bfb097ee9315860dbbd402a3b63ab28d23b3bd90523b65ead3 SHA512 26895e542e66bb99965da9832cd7f5b191336aa1027b2e90f194473dd8f6277909102f21833d988fa8d8b0e2178eaca9437b182d1155038abb0743eda2cc5697
 DIST nss-3.69.tar.gz 82427268 BLAKE2B 1467c7f17b1d3d46fb4fcb1d19112585c24ec3d10125d7e954a87c3a6d0e20a300d2084a9480c88dad20274c500e1efb70143bb92b4a8110c2080abf3fe68dfe SHA512 9dd824b3e96aa5a032d5005cdf60a55efac23f69f3857cd1f4337f3ebad92fc2354bb05ed85f04a368e55306a46ebd17a91f7f432f1c191a96e99aecfa62cfdf
 DIST nss-3.70.tar.gz 83917362 BLAKE2B 51de2e2cf5feb11045388b0badec24509d50f8bc8abd4116cbab77ff434f86a44ad4c98e533a1dd7093a9d1be9b7deb45f0426e3a173f9b2b92995cf63f2ea51 SHA512 9766282b36560d2f73ac5e90dbc3962802d6b1e8650ff9c0afbd6d2e1ff4cf8f2bc251f972344dc8a6ac5209b917aae03cc9883cb081011a7dea7bd258a95d82
+DIST nss-3.71.tar.gz 83927933 BLAKE2B a8d683b9f9bff5390e0378ab0d55156f7cc69a52b0667658738e67e920548965e7a276dc4104547b2e6a1a6d18325c3f85b955b9c12d7f071d10930b5264207e SHA512 a4a724dc4e8677965b6245ea2309790d31ec7719658e2b349eb67c9008082132c76277340d15e4fdd8d2fe1f560ae6803fb038d023c3dfd2e3772fa3b77720e2
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD nss-3.63.1-r1.ebuild 9506 BLAKE2B 28105fb764f1f57e8d06fc8e58ac7cc03534c9a83f939dd49b63a3ae84a79d82a815858680f4bccd03abca8703b39329cb5ddea21bd06648bed9460a68b4af50 SHA512 ddcb298b779ca3430b18eba1da4ad1778b39b7c946f22b92c2857ed0e612e93138a57f486c37980ebbcc53b906beff68d6ebec58e2fbb821930053b78a76e9b1
 EBUILD nss-3.68.ebuild 9521 BLAKE2B de04a237b2980036eaf2012346b4f0b8e9fa83ff0cec78319f9b69fb34861d8047d53045ae7c1b64a2784476292cf4eb34fae99e7b5fbdc9b7920615922345ea SHA512 d9cdb53234d74e823bafc1ff9c1e80538866efe0618f7660ef7f297fda32f1d9a8580e91ff5f28d659dbe995e143538464eaa46c2429b2d6bee6d102505d6c79
 EBUILD nss-3.69.1.ebuild 9547 BLAKE2B 97d1aa4b223070c9f18590cc2c97aae0891d9c32722277a715ef83dcdf6403305eb0436e06e3888d9ccafa37cd3645165fd8481ba3270e9a04f38143e529d4c1 SHA512 c48956c7dab9d0c8298b1b153dd40017c4e5f659a7458cddbfbb7b85f08cd31630fece3164a6df455c3549621bc0b1ada3369f4da88491cdf658a95b59f09115
 EBUILD nss-3.69.ebuild 9521 BLAKE2B 5ad382679f739a612e30c5670df39fcb92306e79307f348c47968355536a65252c3424a90977d18245d4f50d8cab233946389fa6e83f9e3188ceed3ec650d4be SHA512 afccf0a6a2c3851375cb459619e0a5773e4e4ba27697596b057ebe1a0a79adbdf229bd1ef1967bc6e23a82d9a063571c9c3c68d410f50b79af7473044eb108a3
 EBUILD nss-3.70.ebuild 9545 BLAKE2B 11e6bb946ec4d094b604f2c22a7e6f78ac0331faf409938b6ffccf0ea902b70eb195ad85359613e591c6555af8e17550bb756c20ac84f886ba17e3f5eda446c8 SHA512 85a9aaf8c321c4ef04cf8724c8b3865f0038779612e8990f92878359282225a33f184487f342d01c2aaf7b2fc2c14d44d4b8b2d0f9e45c1b6779fc089383f30b
+EBUILD nss-3.71.ebuild 9545 BLAKE2B 11e6bb946ec4d094b604f2c22a7e6f78ac0331faf409938b6ffccf0ea902b70eb195ad85359613e591c6555af8e17550bb756c20ac84f886ba17e3f5eda446c8 SHA512 85a9aaf8c321c4ef04cf8724c8b3865f0038779612e8990f92878359282225a33f184487f342d01c2aaf7b2fc2c14d44d4b8b2d0f9e45c1b6779fc089383f30b
 MISC metadata.xml 517 BLAKE2B 85fba14d0b8a3539c57b8dca15a0f7789bb78a92891ff39271f804fa07b1620f5f3ece89269e3305b578064a53aeae7ab298bb97cdc019f41793888d42159727 SHA512 7b1fba5488498d5499134f1b58ecaa01cb8c51af3da666d55fba3884703d34efb57b449e76461fb6e13c37687bf5125c5dbab1934a950d4d13c0cff5a3b3318e
diff --git a/dev-libs/nss/nss-3.71.ebuild b/dev-libs/nss/nss-3.71.ebuild
new file mode 100644
index 000000000000..97adb106159f
--- /dev/null
+++ b/dev-libs/nss/nss-3.71.ebuild
@@ -0,0 +1,367 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.32"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index b35b4218dcbc..3a2ebf71c3e5 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,12 +1,8 @@
 AUX opencl-clang-10.0.0.1_find-llvm-tblgen.patch 379 BLAKE2B 23587b8500ad6215603326572a10aef71ce66fcec322834b7e6a7648bfee5a92ce698fa706ebd9cfc0fe3048005919b1d9ec1ebb1d4123412f2fd06593b64841 SHA512 b2e9ae0ceec231b33e2b70664c3cb7c56f5d30f62e2444c6a505c7ab300a463d32ad1a650e8afe1b1bd4b568b3a31c02c280ead3caa8a66548d96df16dc8f131
 AUX opencl-clang-11.1.0_version.patch 404 BLAKE2B 31d8f90de04be1d563caf35534b86fb5f9aba08922be00b9685a402550eaf09334fb7ced28e7ba05d840e389b8d0b315d4809cd26763b4d9a76410401dded687 SHA512 57f59db22b33d856bec6deba6c04ae68d9e5da2c0b2da4fad5053c6915a5e634bb0206eb3c933f2228947df92a633ee2d051164b696803a8e6c330a9218ca6f9
 AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
-DIST opencl-clang-10.0.0.1.tar.gz 23549 BLAKE2B 8663da4525507862835ebc14fb4666d9f2f3cca0a2c08aadfc2875bc285e604e81b21ccc7476976eea2e3eb1ce88ae7b187c2d0ce085fc3ede1a2dbfea0789eb SHA512 406e27d90ae26a2f8ade04172bf680f8786011c7e8357a40b15c8bbfd933d0f1c5e0c114e371036318439fcab999ec5f141dab2df4b498eb9d2548bf175f8502
-DIST opencl-clang-10.0.0.2.tar.gz 53935 BLAKE2B a0f1c1d8f9e4be24e63318daf38fc70a0372ee1dc5cb2443831b6bf64dd3d44ac3f52ca70de5f52dabab2b34a53d4efafd9c19598b471e6f3b855355c03cf4af SHA512 817cc7d977629e63b9d61bdf7ec8e93596f28102a321927507b035397c99e6e6eda1e5f36d0ed59c9949ba12baab32b138f5053a6bc84ba74211e199ddbf3109
 DIST opencl-clang-11.1.0_pre20201222.tar.gz 77968 BLAKE2B efb1759329869eda69cb2e001afe27180d69f030b980cd45f137a34ca54be0bb41849a447dff8a28f20dbe3e7ed66204bcf54a62caef9efcecea815b25951f9e SHA512 46e904855122e24f6214748186d40ba3f85c14169403a192bd28b8d5faf68afeca36a424609ee7c94ddaa5aa0d8b1268bf89ce9cc255933093d71f587889e3e4
 DIST opencl-clang-12.0.0.tar.gz 25292 BLAKE2B 6979ce3f37b0e29e6b7ca9b015c04af6e01ceb6381158492a928d805b26b9bddf00b7a7a3edd987924f1c3a8ad914b7d6e9d9fea22b12166afceb25365edae6c SHA512 7fa05480b10be97dd784b8fb7579a2471cf3a904facd9949a980602085515bb3d42a042c74db80381771ad18f78bed2efdcb09538a865ac4a600d6190b8f9c31
-EBUILD opencl-clang-10.0.0.1-r1.ebuild 1135 BLAKE2B 1c99942d66a2bf1e3b9e8f4e8f778b2af0452529f6bfa1aab10e1fab66739296613853180e9b22a8aaea8c5f53dc84cbdd235a79b8d5fed479787f48e4148e8b SHA512 631065c3510b38de41ea37663bb95fe49fbce708f363a654ee532f50f5743b115b1c73d1b2a40258d3aa6f9ae38de196ba32aac31db6bf76ca97df44b2fbbdcb
-EBUILD opencl-clang-10.0.0.2-r1.ebuild 1156 BLAKE2B 267d9b3b910ec6e141aaa7ae309eae9b50f5212f5d56084ae4c339f1df563839ac24292d199544e152fc0f39e12dab5e8c9268470ca36deb0fc98bdef381d84a SHA512 647d1edbd6d2a69ea16e5388c56e0b933c0c5dce741b028a1369a07398fc485bb30cf4836641bb23faf68f63c0196a11300499e65ad67a4ae00de20dd2a1bfb8
 EBUILD opencl-clang-11.1.0_pre20201222.ebuild 1262 BLAKE2B 4b130083a32b8e696a70a6f1058409596823de40432ae2925756ba901223981bc92f32380e74874ac67a0e4001dc1304939329ad34f901fc564ad2bca2c7c96a SHA512 44ce33fd10db3aedd36c892815326cd1295983cf267ec9fa57518067d8d974463953313bcea915a0d16cdcba8ae7935a94c09c10eab0de7825dcd90b203af205
 EBUILD opencl-clang-12.0.0.ebuild 963 BLAKE2B 75f81c1822e9977fc38a8bb296e209e7ecbed243a66874773e6d04cb44cfb832fcba1bef0df8338c7bbc68f79f23c1bc933325cf00a8969a3459402d8e55ea88 SHA512 3b46e1fd9878e169c800ed4cc5115f1ea8f10a80c6c221b2ef4931ea20c8328249b2e884085eb63cd209deaf58ef54151d55d692de9b4c881c26dec7eeca20cb
 MISC metadata.xml 251 BLAKE2B b22019593bb3b4bc147601f4bb0d9b1b581cdc60b044374d440221c23a56dd8d66361e70a22f91445b364a91e5082a103107c9b17e25370d9e5da54a38031438 SHA512 0ed66fe371eb8158e69a8bf0cbf9b184e7d04450c034121fe45d200be9285ee4e6347c5fa9c7bfead588bcfdbe4928556418e3cac6d3e55622eb30d47c186a78
diff --git a/dev-libs/opencl-clang/opencl-clang-10.0.0.1-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.1-r1.ebuild
deleted file mode 100644
index 8d0b22328075..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-10.0.0.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib llvm
-
-MY_PV="$(ver_rs 3 -)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="10"
-KEYWORDS="amd64"
-
-S="${WORKDIR}/${MY_P}"
-
-# Force a rebuild of this package once clang has been updated from 10.0.0 to 10.0.1
-# in order to work around Bug #743992. Hopefully a one-time thing.
-DEPEND="~sys-devel/clang-10.0.1:10=[static-analyzer,${MULTILIB_USEDEP}]
-	sys-devel/llvm:10=[${MULTILIB_USEDEP}]
-	dev-util/spirv-llvm-translator:10=[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-LLVM_MAX_SLOT=10
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
-	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-10.0.0.2-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.2-r1.ebuild
deleted file mode 100644
index 1c81dddfcdf5..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-10.0.0.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib llvm
-
-MY_PV="$(ver_rs 3 -)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="10"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/${MY_P}"
-
-# Force a rebuild of this package once clang has been updated from 10.0.0 to 10.0.1
-# in order to work around Bug #743992. Hopefully a one-time thing.
-DEPEND="~sys-devel/clang-10.0.1:10=[static-analyzer,${MULTILIB_USEDEP}]
-	sys-devel/llvm:10=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-llvm-translator-10.0.0_p20200909:10=[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-LLVM_MAX_SLOT=10
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
-	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index 408e746b4f44..6daca253b2aa 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -1,4 +1,6 @@
 AUX vendor_opencl_libs_location.patch 962 BLAKE2B 6d0e3f070fa2022d95d35fb1563f72f5dc1b544c7f83417dbb5e3d100dad07bdf3365a48ee92e856de4edc4b7c25674b45efd6d0ace1ac559273641ca175a269 SHA512 2ae144e7590049cc1eac8fa30e360cd511331abba0dfe683867d6a089742ea12cc3bc48dafe41a1c1c9b891fdf35aaac8b14cc1e10a78d2ab49b5e14635bb258
 DIST pocl-1.7.tar.gz 1577676 BLAKE2B 50d4f50236b1c81f319b5559ca2b1df529209f07899acf51c487820d97cc6766c5130a55afca910517c7db63d8041ac8306062880c3a821cbc1bf9108bf13d65 SHA512 23bb82b25a222186c001b2ed413f26253e1e0e16518e98c95173f51491e15d107e6ab1b334ffd490b41199743267d9ad64882a22fea327e17ec9604f9847fc38
+DIST pocl-1.8.tar.gz 1614545 BLAKE2B b0ccc08d1f899719f5def731c61727440035a879ebeebae89dd406423eba6c12b866f34cd47dd0e0f944b7f0c4569c57c44a9a62bf02552de5c4c3b8c9fb3b48 SHA512 bcbb3fa3d2234d4c5b0c17863eba0bc4c8f13f863cc58cfd1de49e21fa7bf0aec82b81aec143c81885e3a39274c8ae783b2f03b9a12846e024204d6ed0e59a9d
 EBUILD pocl-1.7-r2.ebuild 2862 BLAKE2B 23f201f50ac726297c8bfdc3408c3f1741989f78d8dfdccf566759fa3fd362127c28f524f6752f0f2fe882aeb431352af1f0fbc891a297c26fd66edfd44f04d4 SHA512 e7587d0f337b12e22e408b30f55b2a5ca887697529a1be5f734edf2ff37ea10c671002b7ef6e17569cd7deacfa8d37a097ff3b86f8538b47fab7f25446483d34
+EBUILD pocl-1.8.ebuild 3117 BLAKE2B 4b1cbf0f14995f0e7c77d1df60735cdd13b23d5b6b5cd60eedcd98fb9ed1fae892f860199da19706ce89b8830fecf45012876a33ecf132eb136fe4dac32f1761 SHA512 64f564f725f281d70ebf47309a1bb294877cce08028d2dab9f3f524ce8b2d6c7faca8670934a02ec1e7ec8fb8bc60858a4ec6ed4975a57f683a4c218160d8827
 MISC metadata.xml 1199 BLAKE2B 90d31048bcc33a76837977547ba818b2d2a268c408e7ad40eb157864d7c561d0bbc8ad40a013e28c74092f27f7fc3d23ae52322a2ca2d681c109ace154e29214 SHA512 98341aa0795cf9439ed4c0b8e2575657eaa5898e21b64d7d73592badac0b2a82fe061005a6adcf4e9d3318a4f20b80c62bd379f587dd4fcf993a95017f8ce867
diff --git a/dev-libs/pocl/pocl-1.8.ebuild b/dev-libs/pocl/pocl-1.8.ebuild
new file mode 100644
index 000000000000..6f112bf49132
--- /dev/null
+++ b/dev-libs/pocl/pocl-1.8.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOCS_AUTODOC=0
+DOCS_BUILDER="sphinx"
+DOCS_DIR="doc/sphinx/source"
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+LLVM_MAX_SLOT=13
+
+inherit cmake llvm python-any-r1 docs
+
+DESCRIPTION="Portable Computing Language (an implementation of OpenCL)"
+HOMEPAGE="http://portablecl.org https://github.com/pocl/pocl"
+SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+# TODO: hsa tce
+IUSE="accel cl20 +conformance cuda debug examples float-conversion hardening +hwloc memmanager test"
+# Tests not yet passing, fragile in Portage environment(?)
+RESTRICT="!test? ( test ) test"
+
+# TODO: add dependencies for cuda
+# Note: No := on LLVM because it pulls in Clang
+# see llvm.eclass for why
+CLANG_DEPS="!cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= )
+	cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_NVPTX] )"
+RDEPEND="
+	dev-libs/libltdl
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):*
+	virtual/opencl
+
+	${CLANG_DEPS}
+	debug? ( dev-util/lttng-ust )
+	hwloc? ( sys-apps/hwloc[cuda?] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${CLANG_DEPS}
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]')
+	)"
+
+PATCHES=(
+	"${FILESDIR}/vendor_opencl_libs_location.patch"
+)
+
+python_check_deps() {
+	has_version -b "<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]"
+}
+
+llvm_check_deps() {
+	local usedep=$(usex cuda "[llvm_targets_NVPTX]" '')
+
+	# Clang is used at both build time (executed) and runtime
+	has_version -r "sys-devel/llvm:${LLVM_SLOT}${usedep}" && \
+		has_version -r "sys-devel/clang:${LLVM_SLOT}${usedep}" && \
+		has_version -b "sys-devel/clang:${LLVM_SLOT}${usedep}"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+
+	llvm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DENABLE_HSA=OFF
+		-DENABLE_ICD=ON
+		-DENABLE_POCL_BUILDING=ON
+		-DKERNELLIB_HOST_CPU_VARIANTS=native
+		-DPOCL_ICD_ABSOLUTE_PATH=ON
+		-DSTATIC_LLVM=OFF
+		-DWITH_LLVM_CONFIG=$(get_llvm_prefix -d "${LLVM_MAX_SLOT}")/bin/llvm-config
+
+		-DENABLE_ACCEL_DEVICE=$(usex accel)
+		-DENABLE_CONFORMANCE=$(usex conformance)
+		-DENABLE_CUDA=$(usex cuda)
+		-DENABLE_HOST_CPU_DEVICE_CL20=$(usex cl20)
+		-DENABLE_HWLOC=$(usex hwloc)
+		-DENABLE_POCL_FLOAT_CONVERSION=$(usex float-conversion)
+		-DHARDENING_ENABLE=$(usex hardening)
+		-DPOCL_DEBUG_MESSAGES=$(usex debug)
+		-DUSE_POCL_MEMMANAGER=$(usex memmanager)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	docs_compile
+}
+
+src_test() {
+	export POCL_BUILDING=1
+	export POCL_DEVICES=basic
+	export CTEST_OUTPUT_ON_FAILURE=1
+	export TEST_VERBOSE=1
+
+	# Referenced https://github.com/pocl/pocl/blob/master/.drone.yml
+	# But couldn't seem to get tests working yet
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc CREDITS README CHANGES
+
+	if use doc; then
+		dodoc -r _build/html
+		docompress -x /usr/share/doc/${P}/html
+	fi
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${P}/examples
+	fi
+}
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index 2c368470928a..745522abc40e 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -2,6 +2,6 @@ AUX poco-1.10.1-iodbc-incdir.patch 369 BLAKE2B 345540ebd9c448a21e6c8adccba040a43
 AUX poco-1.7.2-iodbc-incdir.patch 321 BLAKE2B 640c0b69e8c925d48da6f2bfc59cd2c77a02662ad1d8d447bb8c7ca23234ca1859c4aa9497d5703ef5f675d9096606254a9142770c6fffa4334cf71b1ca6953f SHA512 f3a0b4032fd4f71f0281d58c00241b1cd2f92da1a23a8501c420949621167d1fc7e2a2ed3ec48b6f75d35569f6443e3391eaf19a8c8fbd17e24d1cbd9ffd892d
 DIST poco-1.10.1.tar.gz 10224204 BLAKE2B 644bb2134c571e10b63937ca15b3f5d7255767bcc99dd6b6107a13d64ed7ac83d499d74f04084c666bbf5ef6f033d57d2fb1de0b8b8487844e3aaf8cefe6fba8 SHA512 40aa8049c68651f461280937c1c733e13d1cedbec12bc44a7f3a6c131d31229c5445067052441427071f6102fd1965d238b2222c0689279dd156b4e261ac9e73
 DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
-EBUILD poco-1.10.1.ebuild 3772 BLAKE2B f80f31b0f0996f974de2dbde09264d803aacb1d2245b3fb425cbd0c18e1ae333ca011ca1bb2074368a6120f95b92429b380588d5f44b8a82bc430ac454a6cbd8 SHA512 7722395e53d00cdd7ef38b3ced7c25713c7f88bdb5518ccade1a297f7b09380e18ee0b8000f2fd6d83422e2b70c06b76f247b44c1088ed5dee87d9815c820610
+EBUILD poco-1.10.1.ebuild 3771 BLAKE2B 74964571e0a493a721d1336f7e039f2e6da6e2f0bca7da2131188746e669f30cb6b6cd9f649ac643ab9199598d5ef40eaa24fa10bdf60899b538d75ace82a261 SHA512 33f04c62da4d52c6c72e58e57c683e8532ca2a3eb8aa79d6734b17e31d224f742b61a9dfbab28c17a0ad65bc600762e5ab24dc0efa116932085bdef66b00a013
 EBUILD poco-1.9.0-r2.ebuild 3784 BLAKE2B 0e03a468a231f441c59b2e5900ef3b47694b822ef01abde89aa3d5d142e0db2a776c8f2c817e84ee890338b87cabd8f89d07fc34c41d7709380a3664f94bf8fd SHA512 2f9918b32a2fc7a78569f305a4bc270f6d2f80aecffbffeac2573c98d0981bfdd11b65e757a1f8b78965b2009d11e43fb73eff15a13c9455915158db1d55cf20
 MISC metadata.xml 2584 BLAKE2B 666f63e00f654571eece88d1d4679673323570c5b68e4dda840ec94413461307a1b2eade7acd89852e0bf5163cafce9ed7d75c55fa3be7071a2d9445ffcbdca4 SHA512 c6526c758b0d06cc5b2b57b56f6e61f92950f88f62e38967948edcaa2b3fc618836b667ff57dc9b8c52e71e5921b14181376c79a8cfead7e607cfbc554f73dfd
diff --git a/dev-libs/poco/poco-1.10.1.ebuild b/dev-libs/poco/poco-1.10.1.ebuild
index d615fee58123..47a8c8a18c4c 100644
--- a/dev-libs/poco/poco-1.10.1.ebuild
+++ b/dev-libs/poco/poco-1.10.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}-release"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="7z cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/dev-libs/qqwing/Manifest b/dev-libs/qqwing/Manifest
index 770856a6028e..432f89007b58 100644
--- a/dev-libs/qqwing/Manifest
+++ b/dev-libs/qqwing/Manifest
@@ -1,6 +1,3 @@
-AUX qqwing-1.3.0-autotools.patch 5417 BLAKE2B 9314f4e0c85b8bf646b22ebd13409b305f05a25eecaaced65ba76b307a0c062eee7a9dbdc79c4ecab69d84756c646caf6e69183ad3621379aef14492b91f1ad6 SHA512 cdb88b9a07cf5c68790c4ce7e6f1156dff4c985c0f65bd73f81556d41570be5789d8fce53594bcd698fdf182dfa0f88618f49fbdaee153b5dcb4c833553ff515
-DIST qqwing-1.3.3.tar.gz 89629 BLAKE2B 5583318d15a4bf31833576bec037ab27fc17a57c95ef42be828ae0de9d6d86709fdcb63f71cf51b737b45c39657220e1e14a817094065f29b17c668f53b16075 SHA512 cce6e3122f0620b4a27f5c4186b468906006b6f9deda0b3fc474d40e678722bbb07474c479a75cbcac0812a097e5be4d7ae58339810a897f966d5a73b07a6833
 DIST qqwing-1.3.4.tar.gz 352060 BLAKE2B cf78a3d06c529ab1d47739ee0914e268fe8375d5dd7eb73a05ed91fcd7231b0f2103ae2490a8edf438ebce5ec77457f2686338edb61c38a804af34df78763c31 SHA512 6762b97d7595e7831edb80d9fac06ca784c6dfb6c5717e72adaac6973ec94bec417806f8ae4b80ed95b876388c8c1a00906b0fa8653a115998c5170db25aab0d
-EBUILD qqwing-1.3.3.ebuild 489 BLAKE2B 6a7a6bb5ae79a76ec00bfd818c15817c3ec12abbc580c8a6358f7e323056d95450908363bf562f1af5f9704b0215a8559e0e02fcab32529857344335af15ba03 SHA512 3d78c8ef369708afd53aab36d7166add1b9f009ce68cbf25b621db4e9e3ad57412f02b341c3ee773e67deeeeace069c0588693df95bbeac207d45d61d4b60684
-EBUILD qqwing-1.3.4.ebuild 364 BLAKE2B d8c9a7f0e534fa4587d89b264d25a1fa6b43999a896ebd73eb88dfbbd84c5b7aba4871792d98de323c6054d0a13415c7ee6dbebfee63317ab339d5f936fab0a3 SHA512 f2adb6a4bddee3545bb7d2480808d97df181e751637e8aa09814bd705cb4106f143f5f81d6c0561562285a0f5cdb92a21789a3af18c7fd49d7f52a6846b541f6
+EBUILD qqwing-1.3.4.ebuild 364 BLAKE2B 1c1c9704e93059764f543364122fc5bee16e1d8553804b8de8f0806dc235d8631445558268b13bbf0d4f7aecf4e93b943439ddb44e2173001bdd8ca607650dd3 SHA512 e3d5857fabafebc2699d4243085a2b1fad7c5f3035522227705b3352e3d09a43d32aeba2604948b3be209d33afd7b860f56593637b07d5c1e61b8706fab458ed
 MISC metadata.xml 344 BLAKE2B 7ccab937a954c7bf6a62964af9cf5da988d468441feea89de8c82870e4d414b8d916e63db83e026886c636d5d204d4415581a84b408e8e453293285e94d3cd38 SHA512 d3bb75e12aee5f1d3126b583c178048d365f28bb219953e32d20b1b59e809d24e916ae81617b16f3e31a5ba9f9ddd87cac9fa20e38a65d757fa41184f8f51640
diff --git a/dev-libs/qqwing/files/qqwing-1.3.0-autotools.patch b/dev-libs/qqwing/files/qqwing-1.3.0-autotools.patch
deleted file mode 100644
index 1a7bf41aeaf7..000000000000
--- a/dev-libs/qqwing/files/qqwing-1.3.0-autotools.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-From d94d718154c065218bc9db8ccfe638d84b86bdb4 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 18 Oct 2014 13:02:58 +0200
-Subject: [PATCH] Make autotools a bit saner
-
----
- Makefile.am        | 16 ++++++++++++++++
- build/Makefile.am  | 17 -----------------
- build/configure.ac | 47 -----------------------------------------------
- build/qqwing.pc.in | 10 ----------
- configure.ac       | 47 +++++++++++++++++++++++++++++++++++++++++++++++
- qqwing.pc.in       | 10 ++++++++++
- 6 files changed, 73 insertions(+), 74 deletions(-)
- create mode 100644 Makefile.am
- delete mode 100644 build/Makefile.am
- delete mode 100755 build/configure.ac
- delete mode 100755 build/qqwing.pc.in
- create mode 100644 configure.ac
- create mode 100644 qqwing.pc.in
-
-diff --git a/Makefile.am b/Makefile.am
-new file mode 100644
-index 0000000..d6109ba
---- /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1,16 @@
-+ACLOCAL_AMFLAGS = -I m4
-+
-+include_HEADERS = src/cpp/qqwing.hpp
-+
-+lib_LTLIBRARIES = libqqwing.la
-+libqqwing_la_SOURCES = src/cpp/qqwing.cpp src/cpp/qqwing.hpp
-+libqqwing_la_LDFLAGS = -no-undefined -version-info $(QQWING_CURRENT):$(QQWING_REVISION):$(QQWING_AGE)
-+
-+bin_PROGRAMS = qqwing
-+qqwing_SOURCES = src/cpp/main.cpp
-+qqwing_LDADD = $(top_builddir)/libqqwing.la
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+dist_pkgconfig_DATA = qqwing.pc
-+
-+dist_man1_MANS = doc/qqwing.man
-diff --git a/build/Makefile.am b/build/Makefile.am
-deleted file mode 100644
-index ef647d2..0000000
---- a/build/Makefile.am
-+++ /dev/null
-@@ -1,17 +0,0 @@
--ACLOCAL_AMFLAGS = -I m4
--EXTRA_DIST = debian
--
--include_HEADERS = qqwing.hpp
--
--lib_LTLIBRARIES = libqqwing.la
--libqqwing_la_SOURCES = qqwing.cpp qqwing.hpp
--libqqwing_la_LDFLAGS = -no-undefined -version-info $(QQWING_CURRENT):$(QQWING_REVISION):$(QQWING_AGE)
--
--bin_PROGRAMS = qqwing
--qqwing_SOURCES = main.cpp
--qqwing_LDADD = $(top_builddir)/libqqwing.la
--
--pkgconfigdir = $(libdir)/pkgconfig
--dist_pkgconfig_DATA = qqwing.pc
--
--dist_man_MANS = qqwing.1
-diff --git a/build/configure.ac b/build/configure.ac
-deleted file mode 100755
-index ca75f59..0000000
---- a/build/configure.ac
-+++ /dev/null
-@@ -1,47 +0,0 @@
--AC_PREREQ(2.59)
--AC_INIT(qqwing, 1.3.3, http://qqwing.com/)
--AC_CONFIG_MACRO_DIR([m4])
--AC_CONFIG_SRCDIR([config.h.in])
--AC_CONFIG_HEADER([config.h])
--
--# Before making a release, the LT_VERSION string should be modified.
--# The string is of the form C:R:A.
--# - If interfaces have been changed or added, but binary compatibility has
--#   been preserved, change to C+1:0:A+1
--# - If binary compatibility has been broken (eg removed or changed interfaces)
--#   change to C+1:0:0
--# - If the interface is the same as the previous version, change to C:R+1:A
--QQWING_CURRENT=2
--QQWING_REVISION=3
--QQWING_AGE=0
--
--AC_SUBST([QQWING_CURRENT])
--AC_SUBST([QQWING_REVISION])
--AC_SUBST([QQWING_AGE])
--
--AM_INIT_AUTOMAKE([foreign])
--
--# Checks for programs.
--AC_PROG_CXX
--AC_PROG_CC
--
--LT_PREREQ([2.2])
--LT_INIT([disable-static])
--
--# Checks for libraries.
--
--# Checks for header files.
--AC_HEADER_STDC
--AC_CHECK_HEADERS([stdlib.h sys/time.h])
--
--# Checks for typedefs, structures, and compiler characteristics.
--AC_HEADER_STDBOOL
--AC_C_CONST
--AC_C_INLINE
--AC_HEADER_TIME
--
--# Checks for library functions.
--AC_CHECK_FUNCS([gettimeofday])
--
--AC_CONFIG_FILES([Makefile qqwing.pc])
--AC_OUTPUT
-diff --git a/build/qqwing.pc.in b/build/qqwing.pc.in
-deleted file mode 100755
-index fcc4c45..0000000
---- a/build/qqwing.pc.in
-+++ /dev/null
-@@ -1,10 +0,0 @@
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--
--Name: libqqwing
--Description: Sudoku generator and solver library
--Version: @VERSION@
--Libs: -L${libdir} -lqqwing
--Cflags: -I${includedir}
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..646494f
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,47 @@
-+AC_PREREQ(2.59)
-+AC_INIT(qqwing, 1.3.3, http://qqwing.com/)
-+AC_CONFIG_MACRO_DIR([m4])
-+AC_CONFIG_SRCDIR([config.h.in])
-+AC_CONFIG_HEADER([config.h])
-+
-+# Before making a release, the LT_VERSION string should be modified.
-+# The string is of the form C:R:A.
-+# - If interfaces have been changed or added, but binary compatibility has
-+#   been preserved, change to C+1:0:A+1
-+# - If binary compatibility has been broken (eg removed or changed interfaces)
-+#   change to C+1:0:0
-+# - If the interface is the same as the previous version, change to C:R+1:A
-+QQWING_CURRENT=2
-+QQWING_REVISION=3
-+QQWING_AGE=0
-+
-+AC_SUBST([QQWING_CURRENT])
-+AC_SUBST([QQWING_REVISION])
-+AC_SUBST([QQWING_AGE])
-+
-+AM_INIT_AUTOMAKE([foreign subdir-objects])
-+
-+# Checks for programs.
-+AC_PROG_CXX
-+AC_PROG_CC
-+
-+LT_PREREQ([2.2])
-+LT_INIT([disable-static])
-+
-+# Checks for libraries.
-+
-+# Checks for header files.
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS([stdlib.h sys/time.h])
-+
-+# Checks for typedefs, structures, and compiler characteristics.
-+AC_HEADER_STDBOOL
-+AC_C_CONST
-+AC_C_INLINE
-+AC_HEADER_TIME
-+
-+# Checks for library functions.
-+AC_CHECK_FUNCS([gettimeofday])
-+
-+AC_CONFIG_FILES([Makefile qqwing.pc])
-+AC_OUTPUT
-diff --git a/qqwing.pc.in b/qqwing.pc.in
-new file mode 100644
-index 0000000..fcc4c45
---- /dev/null
-+++ b/qqwing.pc.in
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: libqqwing
-+Description: Sudoku generator and solver library
-+Version: @VERSION@
-+Libs: -L${libdir} -lqqwing
-+Cflags: -I${includedir}
--- 
-2.1.2
-
diff --git a/dev-libs/qqwing/qqwing-1.3.3.ebuild b/dev-libs/qqwing/qqwing-1.3.3.ebuild
deleted file mode 100644
index 8755e040c441..000000000000
--- a/dev-libs/qqwing/qqwing-1.3.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch
-
-DESCRIPTION="Sudoku puzzle generator and solver"
-HOMEPAGE="https://qqwing.com"
-SRC_URI="https://github.com/stephenostermiller/${PN}/archive/v${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-src_prepare() {
-	# Make autotools work out of the box
-	epatch "${FILESDIR}"/${PN}-1.3.0-autotools.patch
-
-	eautoreconf
-}
diff --git a/dev-libs/qqwing/qqwing-1.3.4.ebuild b/dev-libs/qqwing/qqwing-1.3.4.ebuild
index 02c5bd8cc293..8fa1cf43c1b0 100644
--- a/dev-libs/qqwing/qqwing-1.3.4.ebuild
+++ b/dev-libs/qqwing/qqwing-1.3.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="Sudoku puzzle generator and solver"
 HOMEPAGE="https://qqwing.com"
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index 3720b166a997..8651315aa945 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,5 +1,5 @@
 DIST qtkeychain-0.11.1.tar.gz 41001 BLAKE2B 155ca333d403e6ad91c2f733dec06e7957d3998c8124156cf33ea9b79521a6838e9c5a317b591897543b820d436d89ce3eada6425318d801834c133b6c55c982 SHA512 45551003000b8ed76d44767c54d18dcbb956d5aeb63d8bf2f0fc06c61eab4d7d2e70b894e9c0729722dfcb5004f818f4f4c9a413444fc2aebe0271f104b500e6
 DIST qtkeychain-0.12.0.tar.gz 46070 BLAKE2B 42ae7b1e86cdfd26c7603c7bf3dfda9e0b856e44e531b92436ba260e32d51be9884602afff996c9cf5837c3cf6453fec70a9d06ac2e51c7e028305706e0ceeeb SHA512 ad8f7b3e8f59894a09892aeb78118f5ed93aa4593eece782c1879a4f3c37d9d63e8d40ad4b2e6a2e286e0da39f45cd4ed46181a1a05c078a59134114b2456a03
 EBUILD qtkeychain-0.11.1.ebuild 912 BLAKE2B d3aadb60a1d4f2bb71e5c375e295b52604d56ba985f7c1deffdeab62cf5fb2a6bc1251aadf2ac165b257fa8365f9c6e9624f6e02db0322127b173a0a4a793024 SHA512 c1a328752f37c523e5f9425d9a15110d9bc24fbc6759b99d3fc7e60a2bbc36472321d3f765a8c55f76fe6536011c5857cdda6e5bda86c462132e0b38b059979a
-EBUILD qtkeychain-0.12.0.ebuild 916 BLAKE2B baaac58f1edbb08b5f756d0055bad24b41647bff975a81f21554e0677c5c7464177acba98d624ae2277d4f65db70d696626a1c1698cfb27d757f4cc797b71e9b SHA512 b560fcfdf0be1305c959c5ebf7e910c7c86a5c12ee92f6ab4d31271332b5d32801cbb7ea8b155a05ef1095284e3dc8b588d5d272f0b81734d2364ee5176a1939
-MISC metadata.xml 336 BLAKE2B c44b0f04c0aad2382c06bcab4257d49e7143d78c7575feb9225df0ac8f572530ad44cd24391c71cd97fe788aec862398276b34d6f4f630b6a3f10cf0fd3a679f SHA512 e56b9c10ebdf60c9148b26346b62c0586051578819c010edff5b3a38d9e04c0715afd9a54bef31ece58c2f6550b52050aed86eaba568634038894cab88185e8d
+EBUILD qtkeychain-0.12.0.ebuild 923 BLAKE2B 6a52f2a8ab12abd4c5bfa1865559fe1480407c0c34535e308d57e3f25bc25ab7b8f98dfc7f4e5a9ef927ad4680dc85051395969793ce58cf42dc9b8344b7ea5d SHA512 f544618b1e12adf1cc8b09713e5858bb6875c7c914a3b84fcd0335688d44ad016c10eaa9c82b46fcdaad72a45bf021fcba29428e765e87fa00699dfeae212f72
+MISC metadata.xml 340 BLAKE2B 4ae9796b7c395cbb0dc0c4a06d203db9a270ec00dba635bdeb0f46b350fffd3784f98a700f645238824cf6b474215c1cbed4c1ede1df16f47185598c81de5610 SHA512 3bf8c371c3268190a04f67f2213b89efe9f1dad96cbf2ee5ad3d112d5ea6b164ccbfefabaed55a6e0cdfa3e4bb06d6e7959b88513567a1d619aa1138957c5027
diff --git a/dev-libs/qtkeychain/metadata.xml b/dev-libs/qtkeychain/metadata.xml
index d4921375172b..a892d85458ef 100644
--- a/dev-libs/qtkeychain/metadata.xml
+++ b/dev-libs/qtkeychain/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">frankosterfeld/qtkeychain</remote-id>
diff --git a/dev-libs/qtkeychain/qtkeychain-0.12.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.12.0.ebuild
index b2a7c0bb00b7..c38e507a0711 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.12.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.12.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Qt API for storing passwords securely"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/frankosterfeld/qtkeychain/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="${HOMEPAGE}.git"
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 63892f8e9e3b..651863f83ce1 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,4 +1,4 @@
 AUX quazip-1.1-cmake.patch 3279 BLAKE2B 5b596da742e87c00c742881a8585d4f48955d99dfd868451ad2eacde64b7f035dfcf38efeb21335ee8c2e68a6aa0606a7d18e2a23198efc5e1d3f3068a93261d SHA512 5c28adf3e6ae96c3be89dab18092be2089e2b622a9c88e9423abdd505db306680c97abc861d4b90829efeca6b3a85907ad927512e95da575eaec39bd231a8b5a
 DIST quazip-1.1.tar.gz 153870 BLAKE2B c784d21d7c9623472fabf9bbf68c9d191dd0765f6b7114f0ea0b2597bbb31a9957feaea4d0325f98116d71acc4a7057f5c28ce5b84c6317cd25fdade30a279da SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c
-EBUILD quazip-1.1-r1.ebuild 934 BLAKE2B 3bf86d7872c881b8bce8b141e6f6c807e37d396ad54f103e240bb167d22e48ba62124700bcc2438e9ddcf242cc52e9490a839a77cec69f866ed987ced5d476af SHA512 5373be3092940b55575cca3f28645ee8726cc066a71a546964d50e5d9945ddb28f6674eba3ca636178c70b50cf5f3a3ebccc70c309e2553bc961ad8f88b35c32
+EBUILD quazip-1.1-r1.ebuild 941 BLAKE2B 19855983f1cfcfd549bfbd4e183c570d663492e507ff1daed5821d76c75dc9bf18b55697cb4e555091e8f2e538111d400979d4cc175556269dbd6ff46d1b0ae8 SHA512 d8545a52bd5ec70501514f3fe45808190c393c892b8a8e3abe0810bbd1d091378ef4d397a8239413f075d4f0453a9ef2a9ef57379180ec13808a3172f6f16eb1
 MISC metadata.xml 348 BLAKE2B 756252686a3a4888fa4466e59594dc39bd40675d1a9b4b98124ec014d6fdaa14ad5dfd0659712fe5c2e7d338753d7b101fa3183831964764f68e67bb7b950ac7 SHA512 e10894c3e476992491b0692fcce8091450deee9782c7b580e2b956276b000a851844f9a0c408708c9508be607e3744be4f6849162ee362ac818a2e6ad05eb9a7
diff --git a/dev-libs/quazip/quazip-1.1-r1.ebuild b/dev-libs/quazip/quazip-1.1-r1.ebuild
index 069d025af9ad..29a58b0ea105 100644
--- 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 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index 5238a2a56458..b06c4e747710 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1,4 +1,6 @@
 AUX rccl-2.7.0-change_install_location.patch 894 BLAKE2B b38635d2eaa2e3f342c9db7ede66eb91a6170cc486ce90f487820895879ad6666a35ffe3673dcc2ee610ade9c8b5fcb6a65f0469aa971aa3c0994ee347d22eae SHA512 97b1d3799e3eb105045d1c29df498c1255bd008433f56dd53cedd602fef77d9cee61b3b9db9281d72ec297da19058e86e74b66380b321f1727053e8c6148e698
 DIST rccl-4.0.0.tar.gz 741814 BLAKE2B c20178e45fb7787ef7f5e20326f91f11a1b2a575277b5f28591b0be6efa6730c3509b11255372648f1df50e33b5e593dbe9c3334c5001f39423fc70acfa49d07 SHA512 d25754895d7b5695e46031642c2550cf2b6b5c42628d8381a23d6d1a48699a14a4fdf842205a14b96bdd1339341f9e558492ef9366a63036d8a8a7011d2c1b05
+DIST rccl-4.3.0.tar.gz 836631 BLAKE2B c7fede9cf92d3e75b79da2874c0a1e45c5fd4ad9d24b11c9870e9fdef8d571a286cbf54ae0a033f2aec3d21b06cafc2b1c097aaf87ecd628f0c33e9267103be1 SHA512 1a27e6441955f01c853861f83743da2fc9597978c3ff99f238734d4bafb1e277d626811b72c6a12563d69b2b8265960b8a2566df618921557837035b92993f0e
 EBUILD rccl-4.0.0-r2.ebuild 791 BLAKE2B 1d2b95f2086c0f14ab87779e5d8d0304ec030dd985e8161aa9467455e414457508eac9a9450638bfa43499e38d9c597302399e4a08474568752bb47e6b378321 SHA512 79f6f264b5466b4a8c4389923487c4378fe8c59c9c34f5bbc0f5ded01beb2793b9981c982ee1598b00d5a16668f44a5c226e0d2cb40ed0eea1efd871825b4851
+EBUILD rccl-4.3.0.ebuild 967 BLAKE2B f20905c502a65cd81931e72565034932f11c0946c9d49a81a5a727b7681be6777d2a34c048715a7e5c117aa9190a5ffe04c1a658bf2af67fb01cfabad2abff21 SHA512 bbb740273d7d2c3083db2b165fcb773c52328ec3036e9f9173aa43bc69f4c573015513e88eedc79e78aefa948c12aa3d10d269b20a43e550bb985b9f1f88abc8
 MISC metadata.xml 598 BLAKE2B bda73827e412b7addb0788cb2bd769138f8872f9be48abc482a455dd88de8bcccce6687041e15d27d79301459cb8455c773447d6cab64fef97ccdaa60c929c90 SHA512 66d6c53cb8f15c595d3c3a2de8eece79460cf0f4c0f5c0a082539a409aadd17f05f5b5561c7d65864db60b56117270c2c36e1ad547a91495f6628bf04f78d015
diff --git a/dev-libs/rccl/rccl-4.3.0.ebuild b/dev-libs/rccl/rccl-4.3.0.ebuild
new file mode 100644
index 000000000000..532bea5d7dfa
--- /dev/null
+++ b/dev-libs/rccl/rccl-4.3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="ROCm Communication Collectives Library (RCCL)"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rccl"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-${PV}.tar.gz -> rccl-${PV}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="=dev-util/hip-$(ver_cut 1-2)*"
+DEPEND="${RDEPEND}
+	dev-util/rocm-cmake"
+
+S="${WORKDIR}/rccl-rocm-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/rccl-2.7.0-change_install_location.patch"
+)
+
+src_configure() {
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	export DEVICE_LIB_PATH="${EPREFIX}/usr/lib/amdgcn/bitcode/"
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_TESTS=OFF
+		-Wno-dev
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+		-D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
index 3a0dac81d231..64b046f78142 100644
--- a/dev-libs/unibilium/Manifest
+++ b/dev-libs/unibilium/Manifest
@@ -4,5 +4,5 @@ DIST unibilium-2.1.0.tar.gz 121971 BLAKE2B e035eab4343ee779218c302b3cae3ff5d443f
 DIST unibilium-2.1.1.tar.gz 121998 BLAKE2B 0bd032d0cc32011fa66604b39412116824b79aeb3cebb394efcad7591d5bd18031d465f7736ff1e65914f2fcf7beca1cbee4c7ad07426cdbf45e1c82e1894d94 SHA512 ebcdcddc6c3a540d086b113bb83470c1c17cf59056b28308a484b20dc3df71de0f5d6e5bf105f9e4a8347c78500c65ae46c2b53ec87692a898c321a047664ee2
 EBUILD unibilium-2.0.0.ebuild 784 BLAKE2B f8decdab42671f3f9891ae9f019692f0c658c527c902ee2499395c1b0ec34b49f0056deec87396ed439ea1cb0a25d12b50d7727da739d4db5f4d9d11add57d43 SHA512 2c1f1edc2b1e0ace8f7dc54840636558873004f44d68ce0f434cfc403437d9fe5873ca1a66841febcaf4923bff2c82ac9d0c7937c180f11cddc721783d6eef66
 EBUILD unibilium-2.1.0.ebuild 879 BLAKE2B 03c1096e39a86fbd1a5da4f5cce318008e40fad7006de440a22a44a22412bc780253c2d4474ff5b2b2cce43d8fe2fc69bd5429e14c844a87d7c08ec673f580f4 SHA512 8a9d47758dd30e851575e487797ac435b94c57e01730710ee09d6ea10d0bfda0a613167be5554bad6dc390c36fef0cce77078dbb32d2e072b211c5c881447527
-EBUILD unibilium-2.1.1.ebuild 880 BLAKE2B 6c157de6197fca6388426d2f68fdf69abedd123c77fcdfd89be72fba636b38b396284ad4abdaedc994135ed111b5115aee8fdfcc70a3f5c200fc31b80ce5583a SHA512 909682dc33579c7be3529769d5d8e1b8221501f33f59faebaa4dbfe74a0354dc2d1f4edcafcc2997a8374685ac08b27a337baf952fc7d7ceb0a1483adc60838e
+EBUILD unibilium-2.1.1.ebuild 887 BLAKE2B a7fe78c7a903fd9c4526ddfdb7a6c64abc7c5adf75d6191e5a5104d7b37a8e0ad2716e6c3a8370b4380bda1c5e8429c1f6159bf7e6a5a07b84a776d077449ea2 SHA512 1feccff6e13f7743074228a929947ed4c804a7998e16c6f978a6b0d73fbbc164068248d4602d444c1f76d4969291d5ef0cc1e68a1138e7797e155b10c896f9be
 MISC metadata.xml 340 BLAKE2B fbc2fee17ce03a1aafb74a76eee00909ec9d6ab01a62bb0fc0fbf7a9e0e30fab6390ab964d908b9d3b3c22400e5720856da6aac6a3c5ac77a0f3c8e1493f7316 SHA512 bb01973af5dc1a5240f268e62428a227fc4f575bb2d359c4b1f9d129d5c5693a17054aca080a72dcb938b325c493d9690bcfc5e15feab675f02c50bc855f8dc9
diff --git a/dev-libs/unibilium/unibilium-2.1.1.ebuild b/dev-libs/unibilium/unibilium-2.1.1.ebuild
index d064fcfbef8c..d2448195ad85 100644
--- a/dev-libs/unibilium/unibilium-2.1.1.ebuild
+++ b/dev-libs/unibilium/unibilium-2.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/neovim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+ MIT"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 IUSE="static-libs"
 
 BDEPEND="dev-lang/perl
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 27df48171cb4..73fd7f984dff 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,3 +1,3 @@
 DIST uriparser-0.9.5.tar.bz2 176501 BLAKE2B 5ec3d993e60c62f2478e4012354cf82f2e4155ea1a69e9a3d6611d1765fe0f3b8ba5382c928852a5fd215f51ebb0688c9d713e9f1208f18f5ce2d8b8f0fb1dca SHA512 44d36a33565b7724d721e2b5e689530227bc87e609ee78f1d23e7353480191313b1b91039c7a046566d14b83eb320c97d75e74c8ef4841e1b9c8559c3feddb34
-EBUILD uriparser-0.9.5.ebuild 1408 BLAKE2B 3cb84c56f0572692bdab1b579f47ed492d6db3e368fcabf5d128f414a1a9e3c9c32d6e2e6899d9c441ebe7dcd2faa5a03e5e95211b595087f277d3f6903d7e25 SHA512 e6dcd85c451b8ce0e2afe455b121cb8ce09002e7738792d405f6668131a36fdc22de3abab2b75c568c0c14411e9b9bacba86857497703ad3563a2780075c90f1
+EBUILD uriparser-0.9.5.ebuild 1407 BLAKE2B 57422dee563f1a8ba6e8a60b415d71b1a23011cee1bf7576df37d943436056f84e8a40f3e8d2331c3a03d45fbfa9e0da3e2d1cfe3eae5126a582e27b3da25056 SHA512 940372852b7e53c41eb5cf90ca0da08b1c3e789ce303fc68fb0d77c9eed06981e54ff09ec5c9790dae028edce839b1e665a59979d0b394c5c77b61349e3e857a
 MISC metadata.xml 543 BLAKE2B f58d06655dac12b918bc151308a170bd3b1f2eecdf54e1ca38badb1b4fe26966461238e5975fb566a3e8014bdfe2133ffafdc322b4664d18ea657a30fbba3aee SHA512 8004df7b46cc798bb654f62b4ca9de1a26302e901f0fd77bfee5c9d8b6fa52a2084666b21c7b84fce09d9d197854383eafe20766ae0a5f181cb29b2e8ad530b3
diff --git a/dev-libs/uriparser/uriparser-0.9.5.ebuild b/dev-libs/uriparser/uriparser-0.9.5.ebuild
index e300d61b8425..9b07a35769dd 100644
--- a/dev-libs/uriparser/uriparser-0.9.5.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="+doc qt5 test unicode"  # +doc to address warning RequiredUseDefaults
 
 REQUIRED_USE="qt5? ( doc ) test? ( unicode )"
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index 0d89bd8ddbc2..43c8d9991fe8 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -1,4 +1,4 @@
 AUX uthash-2.1.0-cflags.patch 228 BLAKE2B 2f6e1ee3b9bcac275c40470567ff1c044f727546d7c1c62f72c6d85a38c477c7a439d1924188f046ac263f21153f5499a1aa29aa0b9061b0e683f101951f1b53 SHA512 046e619a75a8ef28c7c18d078ffba1653971536a287ded36b22c6700358351fd95b2709318ed05d68e81edc13a8f7abdb03d0c5616a01817752fec45605215c1
 DIST uthash-2.3.0.tar.gz 191291 BLAKE2B 473e263df9f3555c9ef41c2b39cf2ed33a4624ce7325bbe52db805ac741b8383e64f84a9e249f96faf40e0b94fa4a7fc6c0e83bebe8b3677a90cdca82a4e3f51 SHA512 3b01f1074790fb242900411cb16eb82c1a9afcf58e3196a0f4611d9d7ef94690ad38c0a500e7783d3efa20328aa8d6ab14f246be63b3b3d385502ba2b6b2a294
-EBUILD uthash-2.3.0.ebuild 668 BLAKE2B cf07d7e7f25b55d2d325e0dd6f81ab8f135f5752d1e84f325536f517e5f19fef457ce1e4e6bc6746c7a894a4613eba12b7b7ce997ef361e68131ee60b303e2c9 SHA512 ee109e34c19e834f56ee97c158610ab5d47247c984e62fd1d1b2e7ec5ec548bc8a49068531084fce0268974357a2c80ea40b6080e145f07a73d9003775ea0fd1
+EBUILD uthash-2.3.0.ebuild 675 BLAKE2B 9013878b8498ca948eeac87173c7c6b71359cd8ff2d6833d7853fee7d195d4644f03f1a97c5da5f994f3e819d51ece3e2ef0dbba8ead56fb373e213874188bd5 SHA512 0c8f59e175f27a73cb993a0cf3315f9cec5a7f9efeb802717939674f7905a6dc47e7f4b12eb1964419cb3f62890dbff8e366bf1541a061de7fc9a004fb5535cd
 MISC metadata.xml 333 BLAKE2B 3c81a1a696bb53654558b17bb88f9b1c7c5086a07ec61148924b4ce062846233d5642304cb770b51d823de1d1bf86de538009d66099302d0a3a62e25b1db172c SHA512 bb882dac43b09c488ee541c90b05e8a4c62aa8700d3b85c3c491a2e5bb918b7b6032a018ed5a23f6e5c093c8e2b32bae8c7416119f12243e7a1700e83febc900
diff --git a/dev-libs/uthash/uthash-2.3.0.ebuild b/dev-libs/uthash/uthash-2.3.0.ebuild
index 6a3882e3aa85..f9db43ac9176 100644
--- a/dev-libs/uthash/uthash-2.3.0.ebuild
+++ b/dev-libs/uthash/uthash-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
deleted file mode 100644
index 11bcdb422dd5..000000000000
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} luajit )
-
-inherit flag-o-matic lua toolchain-funcs
-
-DESCRIPTION="Bit Operations Library for the Lua Programming Language"
-HOMEPAGE="http://bitop.luajit.org"
-SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x64-macos"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-HTML_DOCS=( "doc/." )
-
-src_prepare() {
-	default
-
-	lua_copy_sources
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"CCOPT="
-		"INCLUDES=$(lua_get_CFLAGS)"
-	)
-
-	emake "${myemakeargs[@]}" all
-
-	popd
-}
-
-src_compile() {
-	if [[ $CHOST == *-darwin* ]] ; then
-		append-ldflags "-undefined dynamic_lookup"
-	fi
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_test() {
-	pushd "${BUILD_DIR}" || die
-
-	local mytests=(
-		"bitbench.lua"
-		"bittest.lua"
-		"md5test.lua"
-		"nsievebits.lua"
-	)
-
-	for mytest in ${mytests[@]}; do
-		LUA_CPATH="./?.so" ${ELUA} ${mytest}
-	done
-
-	popd
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}" || die
-
-	mycmoddir="$(lua_get_cmod_dir)"
-	exeinto "${mycmoddir#$EPREFIX}"
-	doexe bit.so
-
-	popd
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local luav=$(lua_get_version)
-		# we only want the major version (e.g. 5.1)
-		local luamv=${luav:0:3}
-		local file="lua/${luamv}/bit.so"
-		install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" "${ED}/usr/$(get_libdir)/${file}" || die "Failed to adjust install_name"
-	fi
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r103.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r103.ebuild
index 99f1259bb78b..70ede4e19327 100644
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r103.ebuild
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r103.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="${LUA_DEPS}"
diff --git a/dev-lua/LuaBitOp/Manifest b/dev-lua/LuaBitOp/Manifest
index a1902a6bfd76..94c89182c277 100644
--- a/dev-lua/LuaBitOp/Manifest
+++ b/dev-lua/LuaBitOp/Manifest
@@ -1,5 +1,4 @@
 AUX LuaBitOp-1.0.2-support-lua5-3+.patch 2747 BLAKE2B 1e00ea3f2b8c99b49bff1b0ed43e3bea370646a2a9c80856bafdcb58f2fc68ed3050ee980546ec75996608f7e97c3201f3b9240a13941edb43f7ef883c261ec0 SHA512 2b6a247b4fe18a87b7b3114d7b01dfbd36e2acd2c937661e1224f2828f610150022949f8b4b8a2d07f21bb1c79a1113b6d78436a284b4552b3ebf9f72184be82
 DIST LuaBitOp-1.0.2.tar.gz 23127 BLAKE2B 97b2ded135903f7bf2165a03d611fc2864336929706eb67097b5d67d0a0ec156c855a1637bc309d8dd03cb68beeda350b33eed7678b82540da54502cf981333a SHA512 a652050ea5c6fbeb8a28b05e2bc4a3550c854cc45f7f42c8c1b0a81f5b76773cdf061e6a839cdb339614118169e578b6e3efa5a3efbe59a2f01874b2fa2b4f2e
-EBUILD LuaBitOp-1.0.2-r102.ebuild 1746 BLAKE2B a065378b441af4f0ce0c571f17a1942d631e263fab06348ddd9409ac36eef4eded9a213413da3e98ea6e035a1d5b90a21137e4ff10c087409d3c2098c47bafc0 SHA512 3cdf405feb439e55fd2060c337e34ba23b79a5c8a2664771cfd0da378afd9f46bb58d904eca96792d7a73e6ae325f194e17124fb2f0d8bf3a07443740b3ab89a
-EBUILD LuaBitOp-1.0.2-r103.ebuild 1801 BLAKE2B d44472af6e499cc2c0a8767d11d3505062f61b52015489bdf7afcdf3b6672b93e0ecd2eeb77986e95ec1105e195d0fa2e8c1d76dc97a4046bf45815b1f35c368 SHA512 485b0703412050a640c49073a5d79fce0cfd1d14156502613d3037c5f4d35f4ac50cf78421e9407481e6fe2bb35126525a1bb5fe42c7b49788895879116f8a4a
+EBUILD LuaBitOp-1.0.2-r103.ebuild 1807 BLAKE2B f3ff5fd6f7a14ba393d4ba6241f724baaff905b0b415df6acec9bafd96a015324cece36c3ce6ac5936184c3346a42b7e817eb985cc41fa46eab1812a675c326f SHA512 0081442c7723354f8c33e74a733334924c81948cdd62ed899bd8f143ba5c8877cd5ca1ee55e084c8f31a8239dda868a589d634e00811b869a9f9bcdf5702b777
 MISC metadata.xml 360 BLAKE2B e4c9313bdd5791822c8af70399c9fb8674b0650f600ea6c15e804756e50d201e1b07bc98f4556181dc4575a9dec07de525fb972bfa0980920cbefc83d7fb8a06 SHA512 c7bea4ae5b69e5e446054b553678263b5971e620ec491c0f5872ff5b292f45614191ffe0b01ba6a9a73dcc43cca0c249f1a31ad23f22b6a4ff3cc4bfc2980cf6
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 3a968f971860..8d56486db307 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
index 9c09b19195b8..83f017970a00 100644
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@@ -1,4 +1,4 @@
 AUX lpeg-1.0.2-makefile.patch 671 BLAKE2B 4ed03dc08e737fe6cc45f4fe9c53657a71341cac69a3ec6fa52d124dbf5c3b58bcf1077d255598f98952eb2329905a25b45e4c031ab9fb82700d919d7f264452 SHA512 0d17351cda382ddb5574f7d14bc6479439cc703ac0c360b2b0f043288427beda9aea1f229fd2e0ea8b604bd935bce2fc959a2410804bfd82bb2c2e128ab501ac
 DIST lpeg-1.0.2.tar.gz 71840 BLAKE2B e0d8fb4e9d17c9018f0b206cd3f7c9c0e21398c119600b5b0705c8df19e0956347bea795c7c3ded8e62e0c09802dd8eab931a5e3769fcacf44c35aa2b17fa8d6 SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814
-EBUILD lpeg-1.0.2-r101.ebuild 1962 BLAKE2B 9cdb51345a6caffb9bc5e4c2c310b9957e5a8bbd46a89949ca238072acb83115ec04f19384f78cd5590540e4f6068e17624f0106652cc5cd9a42f7ac09b32f74 SHA512 1d0eab5ee3c14f988a270a9ef597342f0206e9b6934b71df4cb87b6630fe6308cc690d57f37e1a2d443cdcd3893cceb09b2f227c32abc5cda339290fdabd80c4
+EBUILD lpeg-1.0.2-r101.ebuild 1969 BLAKE2B c5a61fdff2f2f7c767c432bf2adf72aaebdd8b9e1bd8095c5d5c8b747e10525c81a14288fc29cb311d2c2b9117fa2d9384550d0b2e16fcf7324dca4b5da23efd SHA512 1a07cb30b9996833d39bd886f9a90e739227d74246c620be5ec61d1b203d19ccc738207c196a315b56caa589af6e689a1be4cb42abcdae9e4371ddef967a9258
 MISC metadata.xml 258 BLAKE2B c0d0fed17412419de0d059e7ccb4289f3ffb2628a07c3d15329cba8ed726b2c52efde7ad15857b845ce71e7eeca903467f592e3e324d91147583f5178e5378fa SHA512 0dbe2c5806353798c494bddc4034ccd37181951a6f5085bbb25d15d36d4a800634db47d25d1834bc920000533e4f4db7a02840dd18bd460b35c1f77b743fa1d1
diff --git a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
index d911bbbf5ae5..08b5a63d3bf1 100644
--- a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
+++ b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="test debug doc"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index c69f35ea69ba..bc996fc09191 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,3 +1,4 @@
 DIST luasec-1.0.2.tar.gz 52838 BLAKE2B 41bfaf8af6be56bb46c747b2bf3e938a164f43d2f39cde7386d5795811a555ebad3146344ef491412489de7679f82948bb9fb862e3ae98ab9b73f4116218a5ac SHA512 a873d8217b1ec9e66f50d7319ea0fa467b92b5855e7514dbd00429a26be3546e69fdfc985ac79a80d86f3c6845910b2e14a2198951dcad249b2d1c7d6855453f
+EBUILD luasec-1.0.2-r1.ebuild 1743 BLAKE2B 3d92e0484e7566daa5b2528faae99af5cd702d03c69f8c29a8b41616c12637418d01a55be361d2d6b11e8993c4a458e3c7f81c39ef30968a59340aadfcf806f5 SHA512 40b2a54a1c611e5de01dc3fa641bbdfa66f5a9cafa40a76e55fd47bec2d11067fb109feb1beba0c01b8c1c534961d9c45a11c659f08436b055552f4c633e5d00
 EBUILD luasec-1.0.2.ebuild 1538 BLAKE2B 2acc3879b5d0c0d815b62fdb6168bdb7a5b0620ee69afd44760532fe4317f0db8151a8f6e1baf3c23ff05aa5dfd669db267187e3028bbf1332be033a42f847b1 SHA512 6fa9484a5168bfad532ca016ed5020f62cb68934b5115af11cc80f53aaebbf947d8b6c2afb76bf085002b960fd6bde877a96024b39b00cc8f4cee5b64d0430e0
 MISC metadata.xml 597 BLAKE2B 6398ca37e0d10458a7b1a111d2d0e8d44aa64136ada116a8bb73bf200be4c10f673c8f574733043eb7b2216c28b003c30a993736145344ae72ef25f001a5783e SHA512 399501a7a9c0b08d8747b30478a3810dde63efb48d2d42eeff1ba7355c882e35fd3528424930f618d51182f80641c1c6fb4662b31ec21cf38abd0f0fde0d17dd
diff --git a/dev-lua/luasec/luasec-1.0.2-r1.ebuild b/dev-lua/luasec/luasec-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..b347d6e6c493
--- /dev/null
+++ b/dev-lua/luasec/luasec-1.0.2-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
+HOMEPAGE="https://github.com/brunoos/luasec"
+SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-lua/luasocket-3.0_rc1_p20200328-r103[${LUA_USEDEP}]
+	dev-libs/openssl:0=
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+lua_src_prepare() {
+	pushd "${BUILD_DIR}" || die
+
+	${ELUA} src/options.lua -g /usr/include/openssl/ssl.h > src/options.c || die
+
+	popd
+}
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-O2//g' -i src/Makefile || die
+
+	# Allow to redefine libraries linking
+	sed -e 's/LIBS=/LIBS?=/g' -i src/Makefile || die
+
+	lua_copy_sources
+
+	lua_foreach_impl lua_src_prepare
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"CCLD=$(tc-getCC)"
+		"INC_PATH=-I$(lua_get_include_dir)"
+		"LIB_PATH=-L$(lua_get_cmod_dir)/socket"
+		"LIBS=$($(tc-getPKG_CONFIG) --libs openssl) $(lua_get_cmod_dir)/socket/core.so"
+		"MYLDFLAGS=-Wl,-rpath,$(lua_get_cmod_dir)/socket -Wl,-soname=socket/core.so"
+		"EXTRA="
+		"DEFS="
+	)
+
+	emake "${myemakeargs[@]}" linux
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	local emakeargs=(
+		"DESTDIR=${ED}"
+		"LUAPATH=$(lua_get_lmod_dir)"
+		"LUACPATH=$(lua_get_cmod_dir)"
+	)
+
+	emake "${emakeargs[@]}" install
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index c1eb0dce3093..3828eebe5ab2 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,3 +1,6 @@
+AUX luasocket-3.0_rc1_p20200328_makefile.patch 2886 BLAKE2B df7b5a9c060cfa3516207c4b652c467c490fe3821ca21f709bb9fe1cafe8a41815874074857498fe073913820646c1fb627060d61267d57a2278b06b5ed731ce SHA512 3abb11d0f32e8f1a4cd95b8eec706b871600e1cbfd55288c26aa2975662000dd3393b865a7a293f5dc6b51bc703dba3844cfb4e83cdbbc753e4ea697f9b8901a
+AUX luasocket-3.0_rc1_p20200328_publish_API.patch 10781 BLAKE2B 783e223732aec39b4c7a7b6c49f051d6c3e9c8f1c8b1e91df68265598b9d1a5929f7dff21642d0ea4aba6a2d5ebda6cdf0eb2e567b6f996d260e8119da704952 SHA512 697d37344684bf6943ca360d1b25440e7b678b12e7cf0735c62985deb32862351ec63d8a6192dc732fd832dc16a9172e3ff13ccce52aeca4f4665bcf4555ef2c
 DIST luasocket-3.0_rc1_p20200328.tar.gz 335628 BLAKE2B 9e5d3e415337903b689705669b586c4481179a319b4e3428823c8f442d04f26db86bfeca66db7e58d157e31431c31e4f687403f7163b75f57d6f87cdb934717f SHA512 bdf7086a0504b0072b9cfd1266fc4ae89504053801722859a426f567fca00ed76f4c295c2a3a968e93f0036d9b792cf97561e9baa82c09ea23999cfd473227eb
 EBUILD luasocket-3.0_rc1_p20200328-r102.ebuild 1829 BLAKE2B a05a297f6fe9bdb8e4ec0a08b443c721626339fc22f9cca14b271aa30773ea5605018da75719c903260a0a8407ea10bc1e15bdb97211c6207545bdaa0d595b51 SHA512 dfe60d5b4ead58b3b5523da92b25cc2050e0624aa532d10fed58219ef900f45f3c11c4425534e20f9da00a7d8346bd2d740cf45b60d9f6c9e05a7446f5f959d5
+EBUILD luasocket-3.0_rc1_p20200328-r103.ebuild 1726 BLAKE2B 8a11b01eeade6275f5f92ddc54664d5ca8a3c7a654e83aa54efe5aa3cffced57d1c13d72210f645f190572bb5ae4273ecd65913926d8e0d905887652301f370c SHA512 cb646e6e62a6621caa91e7af970e737abb597cd7169af468ea1a988db69c7f2235349fceb0fda89f9ce32454fd572db931f5c9b94b007be49c3c2f231d24cb43
 MISC metadata.xml 603 BLAKE2B 594c4454fadefcc94e1697d28300a12ccd373f365543fab2cdc3b9a90a6fd4d614b13705026a2a9956aaeab78e88ca10ef608e96c968b20825340503e5675537 SHA512 03612e81cc1d8e9279a16270d5eb391917798fca0148616e2e99aa2994f109d34ac657a89d0d3cfd853af372d7fdc14703f97c1cbc5ca7f8a63f07f0eee93259
diff --git a/dev-lua/luasocket/files/luasocket-3.0_rc1_p20200328_makefile.patch b/dev-lua/luasocket/files/luasocket-3.0_rc1_p20200328_makefile.patch
new file mode 100644
index 000000000000..c6e25d7969f6
--- /dev/null
+++ b/dev-lua/luasocket/files/luasocket-3.0_rc1_p20200328_makefile.patch
@@ -0,0 +1,89 @@
+From 49f935a774661d5d0d9b1727c2eee12d11f3b692 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Tue, 19 Oct 2021 01:13:28 +0300
+Subject: [PATCH 2/2] Fix CFLAGS and LDFLAGS options
+
+Remove CFLAGS optimization overrides, add -Wl,-soname option to LDFLAGS
+for external linking.
+---
+ src/makefile | 21 +++++++++------------
+ 1 file changed, 9 insertions(+), 12 deletions(-)
+
+diff --git a/src/makefile b/src/makefile
+index 522d378..cf4a571 100755
+--- a/src/makefile
++++ b/src/makefile
+@@ -162,7 +162,7 @@ SO_macosx=so
+ O_macosx=o
+ CC_macosx=gcc
+ DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
+-CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
++CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -fno-common
+ LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o 
+ LD_macosx=gcc
+ SOCKET_macosx=usocket.o
+@@ -174,8 +174,7 @@ SO_linux=so
+ O_linux=o
+ CC_linux=gcc
+ DEF_linux=-DLUASOCKET_$(DEBUG)
+-CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
+-	-Wimplicit -O2 -ggdb3 -fpic
++CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra -Wimplicit -fpic
+ LDFLAGS_linux=-O -shared -fpic -o 
+ LD_linux=gcc
+ SOCKET_linux=usocket.o
+@@ -187,8 +186,7 @@ SO_freebsd=so
+ O_freebsd=o
+ CC_freebsd=gcc
+ DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
+-CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
+-	-Wimplicit -O2 -ggdb3 -fpic
++CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra -Wimplicit -fpic
+ LDFLAGS_freebsd=-O -shared -fpic -o 
+ LD_freebsd=gcc
+ SOCKET_freebsd=usocket.o
+@@ -200,8 +198,7 @@ SO_solaris=so
+ O_solaris=o
+ CC_solaris=gcc
+ DEF_solaris=-DLUASOCKET_$(DEBUG)
+-CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
+-	-Wimplicit -O2 -ggdb3 -fpic
++CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra -Wimplicit -fpic
+ LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o 
+ LD_solaris=gcc
+ SOCKET_solaris=usocket.o
+@@ -214,7 +211,7 @@ O_mingw=o
+ CC_mingw=gcc
+ DEF_mingw= -DLUASOCKET_$(DEBUG) \
+ 	-DWINVER=0x0501
+-CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
++CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -fno-common
+ LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o 
+ LD_mingw=gcc
+ SOCKET_mingw=wsocket.o
+@@ -396,18 +393,18 @@ none:
+ all: $(SOCKET_SO) $(MIME_SO)
+ 
+ $(SOCKET_SO): $(SOCKET_OBJS)
+-	$(LD) $(SOCKET_OBJS) $(LDFLAGS)$@
++	$(LD) $(SOCKET_OBJS) -Wl,-soname,socket/core.so $(LDFLAGS)$@
+ 
+ $(MIME_SO): $(MIME_OBJS)
+-	$(LD) $(MIME_OBJS) $(LDFLAGS)$@
++	$(LD) $(MIME_OBJS) -Wl,-soname,mime/core.so $(LDFLAGS)$@
+ 
+ all-unix: all $(UNIX_SO) $(SERIAL_SO)
+ 
+ $(UNIX_SO): $(UNIX_OBJS)
+-	$(LD) $(UNIX_OBJS) $(LDFLAGS)$@
++	$(LD) $(UNIX_OBJS) -Wl,-soname,socket/unix.so $(LDFLAGS)$@
+ 
+ $(SERIAL_SO): $(SERIAL_OBJS)
+-	$(LD) $(SERIAL_OBJS) $(LDFLAGS)$@
++	$(LD) $(SERIAL_OBJS) -Wl,-soname,socket/serial.so $(LDFLAGS)$@
+ 
+ install:
+ 	$(INSTALL_DIR) $(INSTALL_TOP_LDIR)
+-- 
+2.32.0
+
diff --git a/dev-lua/luasocket/files/luasocket-3.0_rc1_p20200328_publish_API.patch b/dev-lua/luasocket/files/luasocket-3.0_rc1_p20200328_publish_API.patch
new file mode 100644
index 000000000000..874f0eb26a7c
--- /dev/null
+++ b/dev-lua/luasocket/files/luasocket-3.0_rc1_p20200328_publish_API.patch
@@ -0,0 +1,294 @@
+From 88cefd1ff8e70c10661c81b96baf5da1fc49feef Mon Sep 17 00:00:00 2001
+From: Jonas Wielicki <j.wielicki@sotecware.net>
+Date: Wed, 31 Jul 2013 14:25:23 +0200
+Subject: [PATCH 1/2] Make the API more accessible by publishing constants
+
+---
+ src/buffer.h  | 15 ++++++++-------
+ src/common.h  | 16 ++++++++++++++++
+ src/io.h      |  7 ++++---
+ src/socket.h  | 51 ++++++++++++++++++++++++++-------------------------
+ src/timeout.h | 19 ++++++++++---------
+ src/usocket.c |  6 ------
+ src/usocket.h | 16 ++++++++++++++++
+ src/wsocket.c |  4 ----
+ src/wsocket.h |  5 +++++
+ 9 files changed, 85 insertions(+), 54 deletions(-)
+ create mode 100644 src/common.h
+
+diff --git a/src/buffer.h b/src/buffer.h
+index a0901fc..66acf09 100644
+--- a/src/buffer.h
++++ b/src/buffer.h
+@@ -18,6 +18,7 @@
+ #include "luasocket.h"
+ #include "io.h"
+ #include "timeout.h"
++#include "common.h"
+ 
+ /* buffer size in bytes */
+ #define BUF_SIZE 8192
+@@ -37,13 +38,13 @@ typedef t_buffer *p_buffer;
+ #pragma GCC visibility push(hidden)
+ #endif
+ 
+-int buffer_open(lua_State *L);
+-void buffer_init(p_buffer buf, p_io io, p_timeout tm);
+-int buffer_meth_getstats(lua_State *L, p_buffer buf);
+-int buffer_meth_setstats(lua_State *L, p_buffer buf);
+-int buffer_meth_send(lua_State *L, p_buffer buf);
+-int buffer_meth_receive(lua_State *L, p_buffer buf);
+-int buffer_isempty(p_buffer buf);
++LUASOCKET_API int buffer_open(lua_State *L);
++LUASOCKET_API void buffer_init(p_buffer buf, p_io io, p_timeout tm);
++LUASOCKET_API int buffer_meth_getstats(lua_State *L, p_buffer buf);
++LUASOCKET_API int buffer_meth_setstats(lua_State *L, p_buffer buf);
++LUASOCKET_API int buffer_meth_send(lua_State *L, p_buffer buf);
++LUASOCKET_API int buffer_meth_receive(lua_State *L, p_buffer buf);
++LUASOCKET_API int buffer_isempty(p_buffer buf);
+ 
+ #ifndef _WIN32
+ #pragma GCC visibility pop
+diff --git a/src/common.h b/src/common.h
+new file mode 100644
+index 0000000..9bb0666
+--- /dev/null
++++ b/src/common.h
+@@ -0,0 +1,16 @@
++#ifndef LUASOCKET_COMMON_H
++#define LUASOCKET_COMMON_H
++
++#ifndef LUASOCKET_API
++#define LUASOCKET_API extern
++#endif
++
++#ifndef UNIX_API
++#define UNIX_API extern
++#endif
++
++#ifndef MIME_API
++#define MIME_API extern
++#endif
++
++#endif
+diff --git a/src/io.h b/src/io.h
+index b8a54df..6e399fb 100644
+--- a/src/io.h
++++ b/src/io.h
+@@ -14,13 +14,14 @@
+ \*=========================================================================*/
+ #include "luasocket.h"
+ #include "timeout.h"
++#include "common.h"
+ 
+ /* IO error codes */
+ enum {
+     IO_DONE = 0,        /* operation completed successfully */
+     IO_TIMEOUT = -1,    /* operation timed out */
+     IO_CLOSED = -2,     /* the connection has been closed */
+-	IO_UNKNOWN = -3
++    IO_UNKNOWN = -3
+ };
+ 
+ /* interface to error message function */
+@@ -60,8 +61,8 @@ typedef t_io *p_io;
+ #pragma GCC visibility push(hidden)
+ #endif
+ 
+-void io_init(p_io io, p_send send, p_recv recv, p_error error, void *ctx);
+-const char *io_strerror(int err);
++LUASOCKET_API void io_init(p_io io, p_send send, p_recv recv, p_error error, void *ctx);
++LUASOCKET_API const char *io_strerror(int err);
+ 
+ #ifndef _WIN32
+ #pragma GCC visibility pop
+diff --git a/src/socket.h b/src/socket.h
+index e541f27..e0b6432 100644
+--- a/src/socket.h
++++ b/src/socket.h
+@@ -10,6 +10,7 @@
+ * creates a interface compatible with the io.h module.
+ \*=========================================================================*/
+ #include "io.h"
++#include "common.h"
+ 
+ /*=========================================================================*\
+ * Platform specific compatibilization
+@@ -40,31 +41,31 @@ typedef struct sockaddr SA;
+ #pragma GCC visibility push(hidden)
+ #endif
+ 
+-int socket_waitfd(p_socket ps, int sw, p_timeout tm);
+-int socket_open(void);
+-int socket_close(void);
+-void socket_destroy(p_socket ps);
+-int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, p_timeout tm);
+-int socket_create(p_socket ps, int domain, int type, int protocol);
+-int socket_bind(p_socket ps, SA *addr, socklen_t addr_len); 
+-int socket_listen(p_socket ps, int backlog);
+-void socket_shutdown(p_socket ps, int how); 
+-int socket_connect(p_socket ps, SA *addr, socklen_t addr_len, p_timeout tm); 
+-int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *addr_len, p_timeout tm);
+-int socket_send(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm);
+-int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, SA *addr, socklen_t addr_len, p_timeout tm);
+-int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm);
+-int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, SA *addr, socklen_t *addr_len, p_timeout tm);
+-int socket_write(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm);
+-int socket_read(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm);
+-void socket_setblocking(p_socket ps);
+-void socket_setnonblocking(p_socket ps);
+-int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp);
+-int socket_gethostbyname(const char *addr, struct hostent **hp);
+-const char *socket_hoststrerror(int err);
+-const char *socket_strerror(int err);
+-const char *socket_ioerror(p_socket ps, int err);
+-const char *socket_gaistrerror(int err);
++LUASOCKET_API int socket_waitfd(p_socket ps, int sw, p_timeout tm);
++LUASOCKET_API int socket_open(void);
++LUASOCKET_API int socket_close(void);
++LUASOCKET_API void socket_destroy(p_socket ps);
++LUASOCKET_API int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, p_timeout tm);
++LUASOCKET_API int socket_create(p_socket ps, int domain, int type, int protocol);
++LUASOCKET_API int socket_bind(p_socket ps, SA *addr, socklen_t addr_len);
++LUASOCKET_API int socket_listen(p_socket ps, int backlog);
++LUASOCKET_API void socket_shutdown(p_socket ps, int how);
++LUASOCKET_API int socket_connect(p_socket ps, SA *addr, socklen_t addr_len, p_timeout tm);
++LUASOCKET_API int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *addr_len, p_timeout tm);
++LUASOCKET_API int socket_send(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm);
++LUASOCKET_API int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, SA *addr, socklen_t addr_len, p_timeout tm);
++LUASOCKET_API int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm);
++LUASOCKET_API int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, SA *addr, socklen_t *addr_len, p_timeout tm);
++LUASOCKET_API int socket_write(p_socket ps, const char *data, size_t count, size_t *sent, p_timeout tm);
++LUASOCKET_API int socket_read(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm);
++LUASOCKET_API void socket_setblocking(p_socket ps);
++LUASOCKET_API void socket_setnonblocking(p_socket ps);
++LUASOCKET_API int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp);
++LUASOCKET_API int socket_gethostbyname(const char *addr, struct hostent **hp);
++LUASOCKET_API const char *socket_hoststrerror(int err);
++LUASOCKET_API const char *socket_strerror(int err);
++LUASOCKET_API const char *socket_ioerror(p_socket ps, int err);
++LUASOCKET_API const char *socket_gaistrerror(int err);
+ 
+ #ifndef _WIN32
+ #pragma GCC visibility pop
+diff --git a/src/timeout.h b/src/timeout.h
+index 9e5250d..b36bd58 100644
+--- a/src/timeout.h
++++ b/src/timeout.h
+@@ -5,6 +5,7 @@
+ * LuaSocket toolkit
+ \*=========================================================================*/
+ #include "luasocket.h"
++#include "common.h"
+ 
+ /* timeout control structure */
+ typedef struct t_timeout_ {
+@@ -18,18 +19,18 @@ typedef t_timeout *p_timeout;
+ #pragma GCC visibility push(hidden)
+ #endif
+ 
+-void timeout_init(p_timeout tm, double block, double total);
+-double timeout_get(p_timeout tm);
+-double timeout_getstart(p_timeout tm);
+-double timeout_getretry(p_timeout tm);
+-p_timeout timeout_markstart(p_timeout tm);
++LUASOCKET_API void timeout_init(p_timeout tm, double block, double total);
++LUASOCKET_API double timeout_get(p_timeout tm);
++LUASOCKET_API double timeout_getstart(p_timeout tm);
++LUASOCKET_API double timeout_getretry(p_timeout tm);
++LUASOCKET_API p_timeout timeout_markstart(p_timeout tm);
+ 
+-double timeout_gettime(void);
++LUASOCKET_API double timeout_gettime(void);
+ 
+-int timeout_open(lua_State *L);
++LUASOCKET_API int timeout_open(lua_State *L);
+ 
+-int timeout_meth_settimeout(lua_State *L, p_timeout tm);
+-int timeout_meth_gettimeout(lua_State *L, p_timeout tm);
++LUASOCKET_API int timeout_meth_settimeout(lua_State *L, p_timeout tm);
++LUASOCKET_API int timeout_meth_gettimeout(lua_State *L, p_timeout tm);
+ 
+ #ifndef _WIN32
+ #pragma GCC visibility pop
+diff --git a/src/usocket.c b/src/usocket.c
+index acfe186..7490df5 100644
+--- a/src/usocket.c
++++ b/src/usocket.c
+@@ -20,9 +20,6 @@
+ #ifndef SOCKET_SELECT
+ #include <sys/poll.h>
+ 
+-#define WAITFD_R        POLLIN
+-#define WAITFD_W        POLLOUT
+-#define WAITFD_C        (POLLIN|POLLOUT)
+ int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
+     int ret;
+     struct pollfd pfd;
+@@ -41,9 +38,6 @@ int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
+ }
+ #else
+ 
+-#define WAITFD_R        1
+-#define WAITFD_W        2
+-#define WAITFD_C        (WAITFD_R|WAITFD_W)
+ 
+ int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
+     int ret;
+diff --git a/src/usocket.h b/src/usocket.h
+index 45f2f99..ca67c95 100644
+--- a/src/usocket.h
++++ b/src/usocket.h
+@@ -56,4 +56,20 @@ typedef struct sockaddr_storage t_sockaddr_storage;
+ 
+ #define SOCKET_INVALID (-1)
+ 
++#ifndef SOCKET_SELECT
++#include <sys/poll.h>
++
++#define WAITFD_R        POLLIN
++#define WAITFD_W        POLLOUT
++#define WAITFD_C        (POLLIN|POLLOUT)
++
++#else
++
++#define WAITFD_R        1
++#define WAITFD_W        2
++#define WAITFD_C        (WAITFD_R|WAITFD_W)
++
++#endif
++
++
+ #endif /* USOCKET_H */
+diff --git a/src/wsocket.c b/src/wsocket.c
+index 20da330..6101dd6 100755
+--- a/src/wsocket.c
++++ b/src/wsocket.c
+@@ -42,10 +42,6 @@ int socket_close(void) {
+ /*-------------------------------------------------------------------------*\
+ * Wait for readable/writable/connected socket with timeout
+ \*-------------------------------------------------------------------------*/
+-#define WAITFD_R        1
+-#define WAITFD_W        2
+-#define WAITFD_E        4
+-#define WAITFD_C        (WAITFD_E|WAITFD_W)
+ 
+ int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
+     int ret;
+diff --git a/src/wsocket.h b/src/wsocket.h
+index 3986640..55ab0a9 100644
+--- a/src/wsocket.h
++++ b/src/wsocket.h
+@@ -30,4 +30,9 @@ typedef t_socket *p_socket;
+ #define AI_NUMERICSERV (0)
+ #endif
+ 
++#define WAITFD_R        1
++#define WAITFD_W        2
++#define WAITFD_E        4
++#define WAITFD_C        (WAITFD_E|WAITFD_W)
++
+ #endif /* WSOCKET_H */
+-- 
+2.32.0
+
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
new file mode 100644
index 000000000000..6011ad7d5976
--- /dev/null
+++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62"
+LUA_COMPAT=( lua5-{1..4} luajit )
+MY_P="${PN}-${EGIT_COMMIT}"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Networking support library for the Lua language"
+HOMEPAGE="
+	http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
+	https://github.com/diegonehab/luasocket
+"
+SRC_URI="https://github.com/diegonehab/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS="doc/."
+
+PATCHES=(
+	"${FILESDIR}/${P}_publish_API.patch"
+	"${FILESDIR}/${P}_makefile.patch"
+)
+
+src_prepare() {
+	default
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LD=$(tc-getCC)"
+		"LUAINC_linux=$(lua_get_include_dir)"
+		"LUAV=${ELUA}"
+		"MIME_V=1.0.3-${ELUA}"
+		"MYCFLAGS=${CFLAGS}"
+		"MYLDFLAGS=${LDFLAGS}"
+		"SOCKET_V=3.0-rc1-${ELUA}"
+	)
+
+	emake "${myemakeargs[@]}" all
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CDIR=$(lua_get_cmod_dir)"
+		"DESTDIR=${ED}"
+		"LDIR=$(lua_get_lmod_dir)"
+		"LUAPREFIX_linux="
+		"MIME_V=1.0.3-${ELUA}"
+		"SOCKET_V=3.0-rc1-${ELUA}"
+	)
+
+	emake "${myemakeargs[@]}" install
+	emake "${myemakeargs[@]}" install-unix
+
+	insinto "$(lua_get_include_dir)"/luasocket
+	doins src/*.h
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/luv/Manifest b/dev-lua/luv/Manifest
index 19e1cf88ccb1..13baaf77528d 100644
--- a/dev-lua/luv/Manifest
+++ b/dev-lua/luv/Manifest
@@ -1,5 +1,5 @@
 AUX luv-1.32.0.0-cmake_lua_version.patch 342 BLAKE2B f4b6b5d45ed4b39ba0a1ed0ae60708583be04cb9a2e785c1ba09a171c7cdeb3cb18e1baf9dba976c429d6f7a5737c0c8ca803b3241d170f395f6045da03ece03 SHA512 6e8341db5eeb5c1e51cc9c812ffc99c2a15a18467456fa20c7dc37c100ac269ef4b416a311f7d435b89c824171218193b00e8e7dccf7506eaf789a88121866bd
 DIST luv-1.36.0.0.tar.gz 107196 BLAKE2B 31a02c3e928559037355186810187299a3cb1420265a27756b0613781621c78c18edc272072cc29c46336787b040453cc9a06195264c0a72a985e49c48202022 SHA512 3119c1450a8317725d59cc1ab6afccfbde752b0c32b38909dfdd31bf88ea0751920dc68750da52cf17a6430637cf1094f4d5500e4c50d1145eca48bb12728ba1
 DIST luv-lua-compat-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
-EBUILD luv-1.36.0.0.ebuild 2296 BLAKE2B db184e750df7311e87258da93f473d9f1449093b399620da8d6b13824f6b3e067bb1cfff9531f84af9f77e032711aba6e3fd37afee6174ce0c5aad63dc943047 SHA512 3b3122bc5421ab16a09c465f7a37bdd43f80424cadaf66f8fb471349ee4c4bcceadba3c48957717e0ad599d4d3054aa00c21d031164104ee996464c26e2f8f88
+EBUILD luv-1.36.0.0.ebuild 2303 BLAKE2B 516f7e876698b6b15639e648778d59f044d89ec216e2152fa607e24eaebeb0f3c6f5150de367aee211ac3c08b00407b325ab4c3289f873de3abe72f139ea9458 SHA512 732a3d8900cf3695a7ea65ab75c2f05c6cef120d43295a12413ea76c0a838dab4f18e64c815c38a634651af000b9219ee164d52814cf06c0ca5076945a45adeb
 MISC metadata.xml 484 BLAKE2B eb035fd19fe978128b6742025f44fc233348a496de2628c80f67db2ae64717e4a3685eec1456f920052e406d15855e225987389a4e33d7caaa5b938418849ecf SHA512 4bf472b91b176e1af730ffb84fade9ab49590726107c73f6c37dac491df394b6779a50e658d062b1cedc0a05f1fb89463817945bc075df572e3e9d6adab04a2f
diff --git a/dev-lua/luv/luv-1.36.0.0.ebuild b/dev-lua/luv/luv-1.36.0.0.ebuild
index 74f839486381..676af8b3f60e 100644
--- a/dev-lua/luv/luv-1.36.0.0.ebuild
+++ b/dev-lua/luv/luv-1.36.0.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index a196fa77d669..155b81e074a4 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1,5 +1,5 @@
 DIST mpack-1.0.8.tar.gz 15616 BLAKE2B 06593296d1d36459127bf35eaeb37c894a0c0c6ccff0969cd0a82bee1920a715801db26f0ba0bc54a56399d07efc262666ee4ce79878288a5c0221fd27febea1 SHA512 6d21cc6bbdee583a1d808742991459e4b1796f347b2f4eaa747b576f5bb1ca989123339120e43246bac859c20e6f46ac57116ce9f135157256fecbd8cf817f75
 DIST mpack-1.0.9.tar.gz 16087 BLAKE2B 062f0deaa9ea359486933b5736591ea3ee78886e31259b721d88ef44762403185b881d076ca35fe6e8c16ab756d36698fec1ca893ab3667635e388456a8ad417 SHA512 c663a6cb29c1ae3f88baf25d36b076c35b35b96a16f9df472f8063009dc70886071cc27bf9224aceb86afb5c590ac072fd484435f40ecc4961eabfb5df08f395
-EBUILD mpack-1.0.8-r100.ebuild 2293 BLAKE2B 7e4d11b5c859d51813251caef4ca2fda1110d62b0cd068ae3fc62ad93346f7d4a97e0c9ba1ff8cdc79afc548a70155df209a6bf2ddef33f7e62884d7015a4d3b SHA512 c422c57c5db234c5334e353ef1e3a7570e9f2ec745ace398841089397e56f3ec61752943c226600fde3dde6fca9521c93e85b62b22116fd73c62fad2e883d3d2
+EBUILD mpack-1.0.8-r100.ebuild 2300 BLAKE2B f00cb2c108e6bea4f5f69550442947189d50ff15904e07444badd9ce59698638fd357473aa16c962dce4e1e1a3bcef6aa25bd97936160ff570f1f11820b8c2be SHA512 31505f52bdb79d8165d0c622ca9d7b111d4ca72a91cca87626a06dedd27d5b89ab70c4a73b3186808074ede6dc6672f0cbde8f785a43d436b24573ab63e14de2
 EBUILD mpack-1.0.9.ebuild 2295 BLAKE2B 497b611896fd5110c5c6b423357544920c536f57fb37d19378c30fbfaca2ee0fca937f64480630145809c545d4a4267457665ce2f46a866519d2f2a8f3cd2889 SHA512 c845b69773c2600f76515b46fcf64856621ede5d0b88b25dcca5f3cfcfa0a1902891491dc865861bb248fa86ce510fe2ffb2c8c3d3c1e7d6d36608124243ed93
 MISC metadata.xml 337 BLAKE2B 552e6b193055ff86ce3bc29ec14b7ba72bf99ba5458c8588af1d53b6d393759118103d95f9b3e3f4c8582b19f7daccf0a5b619a8b171f5c74e2a8ad4f0648875 SHA512 6cc2098e7e31232ff9b6aa2cecfe7f9cde61d1ee36efb190d87330a5b6088a9d43f999d3cbce632925c01e35806c09022170230934f526febe1bd24c384b3ce1
diff --git a/dev-lua/mpack/mpack-1.0.8-r100.ebuild b/dev-lua/mpack/mpack-1.0.8-r100.ebuild
index b8aedd1891d9..b403ed3deab8 100644
--- a/dev-lua/mpack/mpack-1.0.8-r100.ebuild
+++ b/dev-lua/mpack/mpack-1.0.8-r100.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/penlight/Manifest b/dev-lua/penlight/Manifest
index e62f4291da7d..b73dee45cee4 100644
--- a/dev-lua/penlight/Manifest
+++ b/dev-lua/penlight/Manifest
@@ -1,5 +1,5 @@
 DIST penlight-1.10.0.tar.gz 413134 BLAKE2B 2091cc6b06f4b64c19f21e25e17495d35d90bc49895b810fb2b31ff99abcd4ac71048d215050e09c27c3954f45cc5a0509886ad66dc17532500238bdf78a926e SHA512 47128b09d1f7d41e8cac7ecc50338b7ebe9095b6768a43f961e27156aac7129e192909e771711e3d2fbd87d3ef475d5934874e0b7ad44f1e40ab4c1cee00736d
 DIST penlight-1.11.0.tar.gz 413442 BLAKE2B 47b2713f26c6f0879e439d94c4306968312f6394cc96bf9c6d0c78b886a3d8f5c9678bc66eb90dc48900cfc4ab219618386e75a43e7795095db198b01dc7dbeb SHA512 dbf5b1a558cf7279db793c6e0b63a7cd5eade87c4c6c12d7de3c1416f85008b2fef44c90fd1268761a64d3f8f18a971a1b645ba55278032611fb04cd2276d23b
 EBUILD penlight-1.10.0.ebuild 1211 BLAKE2B 4892c02c044e72862793ee26fdb247e476221c56a49245b98f21860fc2fc4e3c68e4976781b7591be7f465af3079dc6c1e6afe2de5778c45b66cbfa0c969c930 SHA512 89732457341bcb7810091a632dfea305e5d9189e541ea288cad85c1ad5e2e421342dbd7f30ad1fb9e743b23b239d0f88fe3b6847fc721f43d6dc78388cc73a3c
-EBUILD penlight-1.11.0.ebuild 1224 BLAKE2B 10f5c73fb442490f0b41d21218cac41dd6e80929a8a99638286275ed77d652182f170d0f81ccacc7082a03fd5d5215848b043abb2e6b47b8f09c579f1972b90e SHA512 d4788a10e30932a501dd6cd37b3b87d938e8ccffc39abcfbdff5b30c10e55abccfd576d828fb09a47afb7af5e24c76213ec70851c0248d30a4a557d706077f20
+EBUILD penlight-1.11.0.ebuild 1218 BLAKE2B 7da094f3c6988d8f44307e6b63841eb633fe93bf7c0085bd9d77b5a8f3328b1fd8525e8e83ee1ee46ad7136de7537745ba3fe59ca9a5941635b3e897ee0c08e2 SHA512 9eb9467c421d70e30291dd34c04211e4a08c706d9bc3b7faba52972b9414a330f4504d28701c52691212b4e72da18ed90b6f63b4bccbfc12d8bf6f367040d3c2
 MISC metadata.xml 729 BLAKE2B 17f0fbc28fb9cf4ca711c87af3bed31dcf145b348e6abd6eb3b62cc29e52949ee7b54d006da2accd60f6d5a1d17137c6e28b1d897aed6ec969685fbad34e516b SHA512 52fe762113833b6658431544a3f929e786423a294327d60cd07d3aaec09fb03ed3e6870ff393ef6dc00926eed95b142eba0753835e314a0625aec751ffbfaa31
diff --git a/dev-lua/penlight/penlight-1.11.0.ebuild b/dev-lua/penlight/penlight-1.11.0.ebuild
index 8816ee133e13..ce818e4ccc23 100644
--- a/dev-lua/penlight/penlight-1.11.0.ebuild
+++ b/dev-lua/penlight/penlight-1.11.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index f8a916db82ed..9d306c4a56f0 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest
index ebfa23a45a63..1b7511daa09f 100644
--- a/dev-ml/alcotest/Manifest
+++ b/dev-ml/alcotest/Manifest
@@ -1,5 +1,5 @@
 DIST alcotest-1.2.3.tar.gz 274177 BLAKE2B 1c38baf8932fe16ec3899cd1dd747099065cf93677271aad5ec33706ed7b6fd82dac84f9ed7518c56d178bf1f98a0b131d5e0f4745d47b07021f0fef932fde28 SHA512 0f3e2a5f56a17b6ddf5173d490b8a1aa2b23382bd0535d9d8be09fb8d4dd02dd1b92f9d00b957b11843d671262469e28b3be4f987538e373eb5e1f30c3a406a3
 DIST alcotest-1.4.0.tar.gz 279675 BLAKE2B 3cc50ab37a16948ceca9b5e6aa885fa50bbe0722c6132ed4991fb64c568253d9913287d1b9e5547f59a210d6803e2a83565f02950fb12cb91ed9f8e24d7864c1 SHA512 adb73c8b2be6f47cb406bbc49dba7dc86e990a60e2e68302592a24dcc24e11e76e2aa6fc2f003c1e4fdbb79744df6ab601daff9540cd7b0096ac9f9bff18098c
 EBUILD alcotest-1.2.3-r3.ebuild 668 BLAKE2B 6147c5b6a4f40d3ee6b04f57939751098d0558135534e523585c69aafc2c4b6074a66d65d7a5b8df01d419123d0fc68585a0f5315c66d8d9199c6c1ffb6ca51e SHA512 6b5ddbe10503affb3ed5149f05b4dfe5385d0c5a40ce110f7bf0efa13297c3c807003c13af2fea8b25474e9113a7b0853787ebf8112a60bbe99893302460b009
-EBUILD alcotest-1.4.0.ebuild 674 BLAKE2B 04400310ad7b3cd2650e348cfa5ac85b7b8d1ac351d2cf674f9443b45e8332e398ff9e159f06cb624da3f7d4dd58eea7fef2ae977774003f1916450f8e161011 SHA512 438d310049747a102cf14b06d5d1b5a14b752fc236f8bcc5e2942632d772e5e9913ab035b9d2b3f0de86dd1c9df0c40a61ad8491269a56fbe9b8c7aa9ea94d84
+EBUILD alcotest-1.4.0.ebuild 668 BLAKE2B 6147c5b6a4f40d3ee6b04f57939751098d0558135534e523585c69aafc2c4b6074a66d65d7a5b8df01d419123d0fc68585a0f5315c66d8d9199c6c1ffb6ca51e SHA512 6b5ddbe10503affb3ed5149f05b4dfe5385d0c5a40ce110f7bf0efa13297c3c807003c13af2fea8b25474e9113a7b0853787ebf8112a60bbe99893302460b009
 MISC metadata.xml 313 BLAKE2B 8f2a0fe29ed0694a9f3b13a3c093cec830ed9bdfc482cfcb78019fa7621f5982f4f158fd8d1505dc7972a9fd4386629433f679ed216a006176444bca75313911 SHA512 72de033c1529758f63f093c39f71336490bf8628cdd51f3c0d40fcafa4602d2a877601bd316851db15097747bf1342840f150d390cd093c843767f6785cdb3f2
diff --git a/dev-ml/alcotest/alcotest-1.4.0.ebuild b/dev-ml/alcotest/alcotest-1.4.0.ebuild
index 0ca71621477e..5b7a4817580f 100644
--- a/dev-ml/alcotest/alcotest-1.4.0.ebuild
+++ b/dev-ml/alcotest/alcotest-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/base_quickcheck/Manifest b/dev-ml/base_quickcheck/Manifest
index 8dc5fdadb5ea..1529b65e33bb 100644
--- a/dev-ml/base_quickcheck/Manifest
+++ b/dev-ml/base_quickcheck/Manifest
@@ -1,5 +1,5 @@
 DIST base_quickcheck-0.14.0.tar.gz 66736 BLAKE2B eeaa92ec0eec4736be911128f46b8e4698034b2cb8afa131b31ee96a6edb5db0f28cfd611c101e4417305ee5a1babc2f869f4690b266218562a8fc50f5830acf SHA512 52333bee2591531665b8f8ad0fac1cdaa607b448d0a33b9b905cf98e00df5a700bf0a4ee3cdf3c06d7fcb2b5190363dd5908cc743b2854af9ce5c8d743e3fd58
 DIST base_quickcheck-0.14.1.tar.gz 66827 BLAKE2B 2a274fc0edab3daf7e3d671f7ea24912ecf273cf2b4cb4ab2bd74171a8848163526f97ed860b44aeaa9f3f3faabb22f4598bf604b33c8401733faa22ca7a3c93 SHA512 5d5a3a070a6903ffdd1e13754721d48a9df164f78bd569d3a18b3fd808354550e4603b76d5e48eaa6a4c4d3433f18bb29888478d640fde9ea004619448c3d7d0
-EBUILD base_quickcheck-0.14.0.ebuild 765 BLAKE2B 08d36c59b4f8fcf6bb43ed9e319dfe9e1a175eda8447b41435c257f34f42eb35c26d7e5a95a28f27060983911ee22ee36f08ec67d7ecc2760979c08019f3b6c2 SHA512 30c91a1b596cd0652c2f2084ccfd9b5e3dca9ef4227a14ab2d5d3aeb413311b8846911edc0830c6190841b5290693797dcd36015f83ae4f274f4405231d740e2
-EBUILD base_quickcheck-0.14.1.ebuild 771 BLAKE2B 1311571b056ff6dcf769bac74f8faaecda3cdfc3a3151e5634a4f6d11e107a6da651641be84589a2388deebf1a34592c49a7b2945ad7913a9f0c749428c620d1 SHA512 dcba6c81e7b31b531ecdffc1c06be95bd68023c30fe7b3d02e8252589d0a2af9de1ebb3bcc5a2d2805a5bb4da55b880abdc3b119a85d577b02f095be7367829b
+EBUILD base_quickcheck-0.14.0-r1.ebuild 790 BLAKE2B 4d37037084c2eab51d1704a61029fb7a764080b907bc4fb60e3ff9306293bdbdace802230cda8b306ee84c4c205ccddbb96dabb143a26d5eb9345e685a9fbb15 SHA512 8a831c31d1c909db60868f682bb8178ff1a1e13ac7f589ef5a004d47ad89ef8fe829fe1747ff8cb9aeb565ed3a97cf41cc0c560e9653c51d9ddf451088f832d1
+EBUILD base_quickcheck-0.14.1-r1.ebuild 771 BLAKE2B 78e8ba66b0d538d90c67768570be78944e304400d5b29ec564e5f0c9d5616c15fb5c21a4231cf0cfec292388dcdaba1cb0dd9f75020078d88e219d6fa954b81e SHA512 a55e364752125ff8e902684f4395ae72283999599d8b6eb70d8a75ce0980990022520a3740d5c882d9991aeea8712894a0296573710d26cf2604a3d854c3f50d
 MISC metadata.xml 336 BLAKE2B 6e0fd85af8abd5f25bcaadbeb62f0971f6ed38780d6b045431cb258cb47bb41c958c596b01d6b5b8ba569a55976f15113c1655125c8b0d11a3b73597069e1ca1 SHA512 9cfe316d1df1581c39124da69fb2ea008e7c517eaf4bd2f46d4ef7b8d68b9c150425b878ec132f19bc8574b3ff41bffcf0d2f8a04955573b1deaf26391b53ee6
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.14.0-r1.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.14.0-r1.ebuild
new file mode 100644
index 000000000000..22f5dc4817f2
--- /dev/null
+++ b/dev-ml/base_quickcheck/base_quickcheck-0.14.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Randomized testing framework, designed for compatibility with Base"
+HOMEPAGE="https://github.com/janestreet/base_quickcheck"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	>=dev-ml/base-0.14.0:=
+	>=dev-ml/ppx_base-0.14.0:=
+	>=dev-ml/ppx_fields_conv-0.14.1:=
+	>=dev-ml/ppx_let-0.14.0:=
+	>=dev-ml/ppx_sexp_message-0.14.0:=
+	>=dev-ml/ppx_sexp_value-0.14.0:=
+	dev-ml/splittable_random:=
+	>=dev-ml/ppxlib-0.18.0:=
+	<dev-ml/ppxlib-0.22.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild
deleted file mode 100644
index da316d2b46e8..000000000000
--- a/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Randomized testing framework, designed for compatibility with Base"
-HOMEPAGE="https://github.com/janestreet/base_quickcheck"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt"
-
-DEPEND="
-	>=dev-ml/base-0.14.0:=
-	>=dev-ml/ppx_base-0.14.0:=
-	>=dev-ml/ppx_fields_conv-0.14.1:=
-	>=dev-ml/ppx_let-0.14.0:=
-	>=dev-ml/ppx_sexp_message-0.14.0:=
-	>=dev-ml/ppx_sexp_value-0.14.0:=
-	dev-ml/splittable_random:=
-	>=dev-ml/ppxlib-0.18.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-	dev-ml/cinaps:=
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.14.1-r1.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.14.1-r1.ebuild
new file mode 100644
index 000000000000..7b0d4c531b9f
--- /dev/null
+++ b/dev-ml/base_quickcheck/base_quickcheck-0.14.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Randomized testing framework, designed for compatibility with Base"
+HOMEPAGE="https://github.com/janestreet/base_quickcheck"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	>=dev-ml/base-0.14.0:=
+	>=dev-ml/ppx_base-0.14.0:=
+	>=dev-ml/ppx_fields_conv-0.14.1:=
+	>=dev-ml/ppx_let-0.14.0:=
+	>=dev-ml/ppx_sexp_message-0.14.0:=
+	>=dev-ml/ppx_sexp_value-0.14.0:=
+	dev-ml/splittable_random:=
+	>=dev-ml/ppxlib-0.22.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.14.1.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.14.1.ebuild
deleted file mode 100644
index 3f8f641d04a3..000000000000
--- a/dev-ml/base_quickcheck/base_quickcheck-0.14.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Randomized testing framework, designed for compatibility with Base"
-HOMEPAGE="https://github.com/janestreet/base_quickcheck"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-
-DEPEND="
-	>=dev-ml/base-0.14.0:=
-	>=dev-ml/ppx_base-0.14.0:=
-	>=dev-ml/ppx_fields_conv-0.14.1:=
-	>=dev-ml/ppx_let-0.14.0:=
-	>=dev-ml/ppx_sexp_message-0.14.0:=
-	>=dev-ml/ppx_sexp_value-0.14.0:=
-	dev-ml/splittable_random:=
-	>=dev-ml/ppxlib-0.18.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-	dev-ml/cinaps:=
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/bigarray-compat/Manifest b/dev-ml/bigarray-compat/Manifest
index 7e2520f131b1..0aed8c79f243 100644
--- a/dev-ml/bigarray-compat/Manifest
+++ b/dev-ml/bigarray-compat/Manifest
@@ -1,3 +1,3 @@
 DIST bigarray-compat-1.0.0.tar.gz 1385 BLAKE2B afa38fd206de8738db51742467b95df4aec3e4e713c946c2c1d041da7e19483bdb53dca440b50c9c1b3c3a5fd7ac71a63ccfe74a14a5743f10f35429838a1c14 SHA512 c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f
-EBUILD bigarray-compat-1.0.0.ebuild 438 BLAKE2B a4f5050a4abd86b62895718ba5b48d784ea0ed104511db597ac3ffb1ac3edfebcd43a2e3b23056f327c34a1eaeabc75dae0cf007c0116acebff0d4ac295bbf89 SHA512 f4aebdc53cc7297b18043b3e5866092b31038a974d47c5a3c8b19e02ed11b9355ad18f5b2bf149cd462d18b24a5fa81a3426eac667eb66fa1a90b41df07b942d
+EBUILD bigarray-compat-1.0.0.ebuild 445 BLAKE2B 7b3d454aaa9ecf49e8f754c605f58d66e51444689689785b32d51ce6bc66721e98a9b45732cc58f5b821a4e6bd0f40245b4c838f6b3da36f006a52816f283ee5 SHA512 03b5728f663eab1fa8d1cf882289db513a4168a11dd589bbf672df4679b1782b8adc41003fee445d51395f11a5b9f8cbecc056142b60e41d509f6dce36a21f5a
 MISC metadata.xml 320 BLAKE2B 01aff5c109d72cdbeea68a7170d2ddc0dbac8b02e667df569c4a1111ba7fc8f73114f1d32dc3883e5bcf07b85bc9d2c5bc6940c65b8ce4d316f2eb7eb9f620a3 SHA512 f4512e72cde3192cd47c1083077ae9d8520cc7067c8249966fd5522d7113b4d4d390897b0abd7fb5c5e292fe490c57e689312ff47b509af3709faf3a27440b3f
diff --git a/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild b/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild
index bfeb0770b6b3..fbf62fa457b2 100644
--- a/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild
+++ b/dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+ocamlopt"
 
 DEPEND=""
diff --git a/dev-ml/bos/Manifest b/dev-ml/bos/Manifest
index 36f78b03e0ab..43f203dd508a 100644
--- a/dev-ml/bos/Manifest
+++ b/dev-ml/bos/Manifest
@@ -1,5 +1,5 @@
 DIST bos-0.1.6.tbz 39822 BLAKE2B 0e10eb14fb5d429b81c67659c936e8b700c4cd417d1f5be000c8bdb0304de8ad9130e597f6e2e7771380c29c148f4339817bacc458e72a8efa894be3b85965bf SHA512 f1f10a97a32da936a7d5a0c70632e723723ee523c79f9dfd23bc42c039a194e8d69658483e6e856c7911332b799a92bf8cabfe96cc387522d7450b8f3f8f8343
 DIST bos-0.2.0.tbz 41008 BLAKE2B badc344e561ba9335a4ded0c8100da91fe2bc882698c94daa42d9db2f1e2c8c627b81eebb5a7067778c332384504391ea402f7363ec552e8517cb048c8e384fe SHA512 f9120f8108c6da5647c9fbcc78736a5f87bf5627fad01035fdab1af6322c93e75df670d7d2910fe474c92c48ffffcf15955a84e698cfc7bfb7c1ac4fe27d472f
-EBUILD bos-0.1.6.ebuild 908 BLAKE2B c3dd6cd8b24a3e1cf999190ca5879604fbe54e1a3a8499b02b1272d86c37674b2411688b36c02dfb7e0902048f8ea983a5a51b4a2968caf5fcfe8b1cd5a3d9ba SHA512 1321689a587cea31d91f79c8638d4d95b65ab3db3341b0df61959577aa094ba31b26670f402e08949b9fc99ddc8c2c62f230875d2ba4b348170133454f21e174
-EBUILD bos-0.2.0.ebuild 918 BLAKE2B 6fee708d89ca615a5574745791753ccc1ecfa888b29cd9ff345a934cdbf04e31d9937376be181529a0450617615d3f67ad6a53f79d0f94d5787521f5420adf97 SHA512 fa4742dcff0daff633ace9e5370f57e6cf1864750aeafce22cfcafd1209b85970683907dc3f4c90698b22a1ae13784748f6f8490a0ab7b29e82a4806d9a9b53f
+EBUILD bos-0.1.6.ebuild 907 BLAKE2B 5f456180ba9fb42674936229c6b06ea4c3961d2805bf5e05f734822cb3071a17528aed8826c8a14b635ed69508f8ae809d07f1c9acea88092d643deaf825a24f SHA512 12ce7f43ec3435493c849956657661268fb4d7a3f3bbd2cbb6ef12f276438e51c028b4d01f635aa970368f6ee1a970bd57afc92e63a1b59d6491f44a169f2e02
+EBUILD bos-0.2.0.ebuild 913 BLAKE2B 3be255c90118706a0ce266fac420b78156ab2e318314fee0127087f0de2ce17598768e4ab26188a444928ca0f4b6bad9a252a2b73daa2cc5e8a458f9d6f05515 SHA512 79041ab8028199fc08a844ea0af85aa47cb3e3211e14fb0ed55315ef8030af9c0125e0b763d1d17837e046d993ba76a932386ffb91235c871f0f711cf1339cae
 MISC metadata.xml 310 BLAKE2B 451869df8c70299f88448015fc68cb0b72768885c18fc66abc5ccd1c08e3ac0be865c64538536572d02de0515187c21e3af7ed44ba66593598d9327252408629 SHA512 ecd83848005eb7e6351cd793c12e43eb23a1e01c9f740c91bcff14c310c47f764a7ab55a0225be6fc17c2cc56fb1e972ab4ac21f53f532548ba744e0ef950309
diff --git a/dev-ml/bos/bos-0.1.6.ebuild b/dev-ml/bos/bos-0.1.6.ebuild
index db3fc9fd2725..1c8791ab0f6b 100644
--- a/dev-ml/bos/bos-0.1.6.ebuild
+++ b/dev-ml/bos/bos-0.1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://erratique.ch/software/bos/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/bos/bos-0.2.0.ebuild b/dev-ml/bos/bos-0.2.0.ebuild
index f1bcc15aeb1a..d2de94db0e18 100644
--- a/dev-ml/bos/bos-0.2.0.ebuild
+++ b/dev-ml/bos/bos-0.2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://erratique.ch/software/bos/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/cairo2/Manifest b/dev-ml/cairo2/Manifest
index 2521ca3dda76..7efe2e24b276 100644
--- a/dev-ml/cairo2/Manifest
+++ b/dev-ml/cairo2/Manifest
@@ -4,5 +4,5 @@ AUX cairo2-0.6.1-ignore-gtk-and-pango.patch 2168 BLAKE2B f444c6056af8708bd4dd838
 DIST cairo2-0.6.1.tbz 90006 BLAKE2B 78f1a998f821aad9b2a1d2deacffd9290920e6d351e0c66b6cc2a6f4f6140fef67c0dde9c1c317e743b5930e09d68d6c1830beb554d23ac9bcc95738a4091850 SHA512 d09274624854a45cf914ffbe984f1bcdd30db6283e7a0fd73aeec2a19226ff8f68d3f7139bbab72ca5698b58b840d6fd8a35570efc228391a7c5d031421f5c1f
 DIST cairo2-0.6.2.tbz 90428 BLAKE2B a8c03e6ea8d4dcfc34a744f48b9a55a5e84b964602358f1c90aadcc5fdaed8eebecba2c851e71ef60066d42088d0baf9f4b90824541af93426e47f2539d6f41b SHA512 789b65428855c3b8fb71836ee6e607870c3140a6152fb01b8ba6e7d2e2f4842a62412061a5eff99023234d305587b605d0cbbacd29456c86a52e9df6466bd302
 EBUILD cairo2-0.6.1.ebuild 1138 BLAKE2B a708b4bb1c159ddd8a0eb71b07c575aeeaf6c942041099d89789e7b1fef9d0d5ab8570aceb7de424f7be39972b1b1268cc89b7323da045df129c4a9b72b0b69f SHA512 cce637e651b75d953334a71e1dd1ad31590180dd7e17d2fbc90e643d184d380ea6b1e82252225ad9ebfb7585dfa22f90e33ca86fbe16356d7a24eae2dab9bc67
-EBUILD cairo2-0.6.2.ebuild 1019 BLAKE2B a55ddf93f0dd72b02abb13307b8428dd84878cd4ded26096ae6e4174f15241d1a0834d306b58b03279e2eb5ffa60126e68d6ee56edf4913e6a5c8a0f0c7449bd SHA512 4f919ad9a56c473cde92e50651f4e31c476c6da8f430dcf5afac3b24193df6d35da2df39df25f816e57bf8266c555dd6e20aaf765490beefc78e4383deaf8ef1
+EBUILD cairo2-0.6.2.ebuild 1015 BLAKE2B 32cf7f22398b353a5c3b9727e1c0e6c2d707e82c5fcd22fbb3f2897c907023cb98ed7f05804c127f722e283775be1a7b4b8c184cce26485fa7ef9bf9295432cb SHA512 1bd5b2c89a387f8b88c55d10fde7de6046617bd376013a97a99d102b8efa432ccf7df469a652a143ca429f1a884abd37edd6cebcdfe38d403e0893228c6c8b03
 MISC metadata.xml 422 BLAKE2B 247d46b642a4b11443adef6724b00fcf6fd9e8dc09ae1a8bbef9a6069d79efa29a24e24b8ead3231006dae4368da0ed94bcc29b208cb1e0db387754bfffe40e9 SHA512 138f87c890e35c7e3627bc1206927a1cbe7347cbcfe9861f249580dd4ca348c82dad8411c78711d63b70097753bad50a67a1f05dafd9b1349b13a1cd7ff44439
diff --git a/dev-ml/cairo2/cairo2-0.6.2.ebuild b/dev-ml/cairo2/cairo2-0.6.2.ebuild
index 812ac046545e..a24437297856 100644
--- a/dev-ml/cairo2/cairo2-0.6.2.ebuild
+++ b/dev-ml/cairo2/cairo2-0.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Chris00/ocaml-cairo/releases/download/${PV}/cairo2-$
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/camlbz2/Manifest b/dev-ml/camlbz2/Manifest
index 276ba8d85dd1..0d7209368467 100644
--- a/dev-ml/camlbz2/Manifest
+++ b/dev-ml/camlbz2/Manifest
@@ -1,3 +1,3 @@
 DIST camlbz2-0.7.0.tar.gz 22769 BLAKE2B 4bfd1c4e7e4b47e666dc3053bf1536ce71b9d32fa0dff2a11642176431af89f83007bae23c61335eb1153e21300a91193f86a40af7ff0c133d491b6e6a3ec4f6 SHA512 570901199df4b5ef79e158f5309ff69d2b85babe002a0324244868f4201f0e9d6aeec377b2ec9a6bf657a29857dc13a0f63e05d162f76c7d412fa6c5f3c0e0f6
-EBUILD camlbz2-0.7.0.ebuild 779 BLAKE2B 0d6226027d927665e16931304b00b851e595fb7a75d3d4ff39255f6800f06183334a3fcfafb870430d2d3d9a207291fc5a3fa163687759e0ae9010e28473d8c7 SHA512 1aaa0b126416f66a63ce1e45500ad9eae5aa0e4b1ed477e944e70236cf6e56b5772ac48681dc2a3d9f8ca34f583a2a713aaed7feb16ef3cade654a208973840a
+EBUILD camlbz2-0.7.0.ebuild 683 BLAKE2B 107279edafc0597f355e00b5cd61cab783eabace7a0f9c8a728772d2f7bc232b730bf1cb7613a68040e1dfac0cba0269682121e8e5b1e8b5ba6b5a74985beb91 SHA512 02db2953337b75db9518422aa0872c741054e2ee969a7457f794217372ce2ad1c5669dea28a20d5402eb3ec80bb226146c9b2838671539b0971d729531d2c267
 MISC metadata.xml 245 BLAKE2B a7cadf465163ca1df604d88e904902634f1559b696dd48e5a57ebf2b7d27917f6ebbef65492ffdf5b620df01825f242d9311161f5624adaa709eaf7eebe0f5fa SHA512 27160785fd59931535cbc1c56f34e2f7e79f477bc9157eff9a07bd7b3f49f1c8c1c20106c9a7148123dcdc3b64411b9f706d49b544eca4415d8d13152fd05c9d
diff --git a/dev-ml/camlbz2/camlbz2-0.7.0.ebuild b/dev-ml/camlbz2/camlbz2-0.7.0.ebuild
index 774e2b6b2f7f..a406153daeb5 100644
--- a/dev-ml/camlbz2/camlbz2-0.7.0.ebuild
+++ b/dev-ml/camlbz2/camlbz2-0.7.0.ebuild
@@ -13,7 +13,6 @@ SRC_URI="https://gitlab.com/irill/camlbz2/-/archive/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="doc"
 
 DEPEND="
 	app-arch/bzip2
@@ -21,9 +20,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( ChangeLog README ROADMAP BUGS )
-HTML_DOCS=( doc/. )
-
 src_prepare() {
 	default
 
@@ -40,5 +36,4 @@ src_compile() {
 src_install() {
 	findlib_src_preinst
 	emake DESTDIR="${OCAMLFIND_DESTDIR}" install
-	use doc && einstalldocs
 }
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 1b1fefb3dc24..c29acb1690d6 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -5,10 +5,10 @@ DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B d7a6221dba5f6ec6963fe35236c29f39b8ae8f
 DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B 6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995 SHA512 8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c
 DIST camlp4-4.12.tar.gz 650428 BLAKE2B 4957d3db73ec82fbac58dd95fa13c48f9f8480a70cd6bded43a00df0a182f9b9e31a43acef8264f9d940776667d10b0a5c46bded59ebf4a645719264628428fc SHA512 0a19bb596e47076a28a6bea62007f1d3b59c4d688075f6b723abaa205c555707feb4ea0624259994a4ba5251fdea9dc61cdc936dc13611b36937e755a4bc9b7b
 DIST camlp4-4.13.tar.gz 650642 BLAKE2B 5bf70b21f47eefe4631227d0d30fdd08ab965020026d0183fc94b9dbfd1eee45626afbe62bf9507b1a887217cf9245901d40f25cce9430155eb9ec1ddc577554 SHA512 d3307bd11b813540d126719c0afe7e75a7740d0851b272be9bd1a28e8b1ab1ed9a7576109000c8d6cee7ece7f777122aa83917a48147d42ed8f4d72994397819
-EBUILD camlp4-4.05_p1-r1.ebuild 1182 BLAKE2B c7f79908b6e5bb7a64ad6a63a472e44c6fbbb07447623e4fa67a5020ee8770f20558dcfb6f6107dcb0eaea12ff83181ee0785cb658d2a154972d8f4c7af20b0e SHA512 19a429da37b07fce0a5a03068eb6a182788d455692d6d585c2da4fc3e9b7e585ee5e93d0dd71d7f142cf0e44a6b18d325b3a533f265f88a2f2b39e6e5ec65db0
-EBUILD camlp4-4.09_p1-r1.ebuild 1205 BLAKE2B 20c353735915b452053f7b939bbf307dacc09eda5da67075bf30d5bc7f2abdfdbb1534fd8c2166006aab869126ada91a643c3fe8eedadc4c8b4146caa513ba65 SHA512 4ef84ebbd16d74949021fe6bbd98efbb495fe1c246faa2a07180452620c2fa2bdc1dc33fce6342ab4a6f2a19c2995cedb5394cd837913d37126f4caabf75f028
-EBUILD camlp4-4.10_p1-r2.ebuild 1221 BLAKE2B 39586e51ff36e0bb3756776eed91a1cebe90d7be9c3adce8a3c583cfa9f2cded3aa5239e0dab84e9cc9c8079d19a7bc314b875814150566bf2dfefe02bf3d5cf SHA512 24a597fc8be6e52f5b61d4cf33600175461bbc03f3126a0d660c40316ca9073b654fb583bcaa6065455c878bb80beb75e0f2b4b1331906aadd2a60e4260d7465
-EBUILD camlp4-4.11_p1-r2.ebuild 1244 BLAKE2B 994b91a58fc981cb5e85694b65494cf3c503732404dbbbbf5d944313f12bd3a901854b8e4fb345d48dc3510d0abe2a0291348e71659d560887094bc8c35e50a8 SHA512 11863063ffac5d8b9d7cd10a4c7f396a3ca35913bc767db2806f203dff287d7c45ff1054df4c93bb9c2fcaaf8b4d79761c8d588253f72e403136a313dc90583c
-EBUILD camlp4-4.12-r1.ebuild 1244 BLAKE2B 994b91a58fc981cb5e85694b65494cf3c503732404dbbbbf5d944313f12bd3a901854b8e4fb345d48dc3510d0abe2a0291348e71659d560887094bc8c35e50a8 SHA512 11863063ffac5d8b9d7cd10a4c7f396a3ca35913bc767db2806f203dff287d7c45ff1054df4c93bb9c2fcaaf8b4d79761c8d588253f72e403136a313dc90583c
-EBUILD camlp4-4.13-r1.ebuild 1244 BLAKE2B 994b91a58fc981cb5e85694b65494cf3c503732404dbbbbf5d944313f12bd3a901854b8e4fb345d48dc3510d0abe2a0291348e71659d560887094bc8c35e50a8 SHA512 11863063ffac5d8b9d7cd10a4c7f396a3ca35913bc767db2806f203dff287d7c45ff1054df4c93bb9c2fcaaf8b4d79761c8d588253f72e403136a313dc90583c
+EBUILD camlp4-4.05_p1-r1.ebuild 1164 BLAKE2B dc7d5851ab7af7f86914045ff027f72579dad2feb4c4a54861a3a5ab024bdeb6698c311b455746c1c8a9167e90f8551a904327675aaed88f16452817ac841c40 SHA512 7b6c9890ee22dbb117a83935decea9b9dcf58c6db0a0f2a8e974b9bb9c232755161a066339695a33425487f5da041b085a2c2c2fb60a622eeddb93b5fde0b663
+EBUILD camlp4-4.09_p1-r1.ebuild 1187 BLAKE2B 10819597a5cd44b5feba7a6a301e08e277d3bee9343744ed15f8e5aeea791938b3961c13574a1db34c19019afc70b6533a0c02b93e061dc4c23b53b20fb94aa7 SHA512 3a395692a7bccc8bcf5388f6ccc613cb616580f3c36518c134d158b4769067a6364cb0d62f239a3de9967e49b36d394e115defa68d4e8ad5f0e6fb9de2cd8175
+EBUILD camlp4-4.10_p1-r2.ebuild 1203 BLAKE2B 5db74bdf68a0aad49fdfd91f1a0dbb2be000b32f20851e5a252263a18d0b79af859b99d80bff2d3591ae3677650dabcaca8ea6d96b2934438d842fd19254a7e7 SHA512 f0aedb50993288f85e154d862d66ec61f39908571a6723eb5fde32f0e6d9f859b6e35da37702fea4282d742a71fabfcc7f85532037cd8099ad54cdaf635b2610
+EBUILD camlp4-4.11_p1-r2.ebuild 1220 BLAKE2B 078b7899c5dc77d03786c8d18c6365bf48bcb1d43bc44795ae9d0236b44cc17b45434f34796e65b733c7bb4eef29559d4c09b9e6ddd078501af3946a30ad49c6 SHA512 1b0725a99136faad1de580612b6e7673ada360d813dc53389fa684afc3f8dc14fe16f23d5f5b950e9d3968a93754489cdc1462d8bec5268b344fdbfe7fad69f9
+EBUILD camlp4-4.12-r1.ebuild 1226 BLAKE2B b45edf72bbe4d817b354414fa04da81527ca3d0d2c8d08ca65a24243a1127b02ed7e71f389c28337b65d8512ceebbb72f6d6a10a8292c8529f956831b58a118d SHA512 5651b20b5e15852508430028b84466a4c55a5708b1d025dae004eb52242bb464071ed11fe06258ffa556e082b4c856f590dc08d4e30ef0a36c19414595d599ee
+EBUILD camlp4-4.13-r1.ebuild 1226 BLAKE2B b45edf72bbe4d817b354414fa04da81527ca3d0d2c8d08ca65a24243a1127b02ed7e71f389c28337b65d8512ceebbb72f6d6a10a8292c8529f956831b58a118d SHA512 5651b20b5e15852508430028b84466a4c55a5708b1d025dae004eb52242bb464071ed11fe06258ffa556e082b4c856f590dc08d4e30ef0a36c19414595d599ee
 MISC metadata.xml 416 BLAKE2B 560e2116bb064decbc8d5e5391966be20ecdfa18ffc362c947b3d5f9aeae1bb2e5d3f391f765e9485075e05a90db69c4f9283b028bd15211e6979621b50d4428 SHA512 db6518378e93c20fd831ab4d2b6ac2168dcb456cf8c6e203f4c2d5a121404e530a8646f1346f34bb4db776cc9caf5f39f0749a6f46b7cc087ad38e7512e9872e
diff --git a/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
index e55cdec3ea78..7c3455031b75 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
@@ -15,9 +15,8 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+DEPEND="${RDEPEND}
 	dev-ml/ocamlbuild
 	dev-ml/findlib:="
 
diff --git a/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
index 4489b5085c96..4df4e6606fe2 100644
--- a/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.09_p1-r1.ebuild
@@ -15,9 +15,8 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]"
+DEPEND="${RDEPEND}
 	dev-ml/ocamlbuild
 	dev-ml/findlib:="
 
diff --git a/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
index 0d165e7722af..539fe3cd8554 100644
--- a/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
+++ b/dev-ml/camlp4/camlp4-4.10_p1-r2.ebuild
@@ -15,9 +15,8 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+DEPEND="${RDEPEND}
 	dev-ml/ocamlbuild
 	dev-ml/findlib:="
 
diff --git a/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
index ff2914c91084..24d6b91a79bb 100644
--- a/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
+++ b/dev-ml/camlp4/camlp4-4.11_p1-r2.ebuild
@@ -12,12 +12,11 @@ SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+DEPEND="${RDEPEND}
 	dev-ml/ocamlbuild
 	dev-ml/findlib:="
 
diff --git a/dev-ml/camlp4/camlp4-4.12-r1.ebuild b/dev-ml/camlp4/camlp4-4.12-r1.ebuild
index ff2914c91084..e159ddff977f 100644
--- a/dev-ml/camlp4/camlp4-4.12-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.12-r1.ebuild
@@ -15,9 +15,8 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+DEPEND="${RDEPEND}
 	dev-ml/ocamlbuild
 	dev-ml/findlib:="
 
diff --git a/dev-ml/camlp4/camlp4-4.13-r1.ebuild b/dev-ml/camlp4/camlp4-4.13-r1.ebuild
index ff2914c91084..e159ddff977f 100644
--- a/dev-ml/camlp4/camlp4-4.13-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.13-r1.ebuild
@@ -15,9 +15,8 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+DEPEND="${RDEPEND}
 	dev-ml/ocamlbuild
 	dev-ml/findlib:="
 
diff --git a/dev-ml/cinaps/Manifest b/dev-ml/cinaps/Manifest
index 6af314471ac9..e2b08c03c671 100644
--- a/dev-ml/cinaps/Manifest
+++ b/dev-ml/cinaps/Manifest
@@ -1,7 +1,7 @@
 DIST cinaps-0.14.0.tar.gz 9602 BLAKE2B 01d71b199dc966ac7653aca31d8a2e238102a5a29c4b6a1cf2ddd3f4624b41a4fd3e433025217951e7bd49b5eba21b6e4462217ef65a8755e6a4075683a55c5e SHA512 03f94ce7ab16d034edfc1976dd8fb83d533a1e5bc7f89dde3ea661553e05d6d8098c62c7e154013ef7814a283bb8cf535df0256891bcc6e0fdc847f6bf62aaf9
 DIST cinaps-0.15.0.tar.gz 9697 BLAKE2B b3c28b54269b7c35070b1a61b99087986aa5fead2792558597964a55d935544f09167aed269d6d68be65c1f588b7c0d645aabeed303885929a2f41628f6fabd9 SHA512 e69018c1b8ffc8895a5280c592bfbb0ac074b5a0367dc79392198819e751bf77dcbb67cf56e5f722e57939538a54b584bdb998cd8baedf6d01014a1f7d18a0c5
 DIST cinaps-0.15.1.tar.gz 9752 BLAKE2B 56b0a8fda6e0e420b3062001f853e187c78ca9adfba7a2204845f61f6480fc9984578db00a9aaba7cefa2bc41234d710a2079300b2dcdf6791d6e037d0a82f3d SHA512 ca53a9da8aa71ce7cddf7e24778e9c4d3f3e5784209da85a5a6b2d5af83cd8ad769fbe3009d2757ebf4a25ca39d76af00ebc693b1b01c3b53c8775ea479123a5
-EBUILD cinaps-0.14.0.ebuild 545 BLAKE2B 48b581375ac583904e5e91d7f8bf1b696ba77f9b67b434d107178eb56c2095168b99be2dd830d32a7dd42e2ec3e27d87afce1be8315a719fa8ae4a8571df3cf5 SHA512 2e79d9a29b94e1bb74c0988be7bd6320b4181d8607f8f9af2a2725b44b110a4e9968f32f2237c78c21a00fa2b72d7bd096118ca8faf8d21d4e8065ed01082ba5
+EBUILD cinaps-0.14.0.ebuild 515 BLAKE2B bc2cf74213305448c62496770daceecc7d8c87c654c0ff65da9b4cc8b3921a170bacf3d6ebf93d42db004cfaa62698462e831a5fbd451dce491ca91f9c883567 SHA512 8892f1b6875f77628e20e045eee93667af23e6be61ba10abcd324924ec0fa22803c9c933062a0b63f0bb6fe91931163041256ed4473e2d381b9ffb737544104d
 EBUILD cinaps-0.15.0.ebuild 504 BLAKE2B 36834a92bb2b3d9ae4326dc0b88d28b701b47f461e6ca35b2034feba17c717bc8e8477ee946965d9b8f2b940148d378cac40891bf1c21572dcdd780d25b3e11f SHA512 61682db11933dd1a8409c5894f89613e3958a283da5d0c157f133182fc52d0784c0bba340c2599af1a36d2f33cb7154cde20666c84abfa69de5085287b7d5de3
-EBUILD cinaps-0.15.1.ebuild 510 BLAKE2B f85fb27821b015fa56a6264d629eff6641f91e4a6c6df27a6491f070a25dfdc5ce3e12d6304a72148ce96451f35514e7bcc8d8a1033b5f32208d44f3819ac158 SHA512 d9a6e88526dd9460c560c58a60aed0679d7d2e27875bad42eb269772fc78fc6d64eb5f3785b9f5fb30619f2510c5ec50910248ec372da6e38ab956523c403ecf
+EBUILD cinaps-0.15.1.ebuild 504 BLAKE2B 36834a92bb2b3d9ae4326dc0b88d28b701b47f461e6ca35b2034feba17c717bc8e8477ee946965d9b8f2b940148d378cac40891bf1c21572dcdd780d25b3e11f SHA512 61682db11933dd1a8409c5894f89613e3958a283da5d0c157f133182fc52d0784c0bba340c2599af1a36d2f33cb7154cde20666c84abfa69de5085287b7d5de3
 MISC metadata.xml 419 BLAKE2B 6bf5394549a11a1113867c019e509098de6b532bf028e22241ca20159219380a3fe34f34ffed0e54cd25d1348d8c9ccec163c5dbc2dee581f59b7a64e93dd995 SHA512 352c5c0c3bde9e8a2bf2db9e3c94baec858d7216087020dd9e4dd69bc61257876ae586e364a9ff01714b2b84008b2b413b5238c1b7c5b78be4eeb10c5bdf596e
diff --git a/dev-ml/cinaps/cinaps-0.14.0.ebuild b/dev-ml/cinaps/cinaps-0.14.0.ebuild
index 300f13b069f1..891d83ba04c5 100644
--- a/dev-ml/cinaps/cinaps-0.14.0.ebuild
+++ b/dev-ml/cinaps/cinaps-0.14.0.ebuild
@@ -15,14 +15,12 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	dev-ml/findlib:=
 	dev-ml/re:=
 "
-RDEPEND="${DEPEND}"
-BDEPEND=""
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/ppx_jane
-		)
+	)
 "
diff --git a/dev-ml/cinaps/cinaps-0.15.1.ebuild b/dev-ml/cinaps/cinaps-0.15.1.ebuild
index beef48458589..52c200249b97 100644
--- a/dev-ml/cinaps/cinaps-0.15.1.ebuild
+++ b/dev-ml/cinaps/cinaps-0.15.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-ppx/cinaps/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/csexp/Manifest b/dev-ml/csexp/Manifest
index 217f9c16e56b..6529a74c792d 100644
--- a/dev-ml/csexp/Manifest
+++ b/dev-ml/csexp/Manifest
@@ -1,5 +1,5 @@
 DIST csexp-1.3.2.tbz 9775 BLAKE2B b1afea15558a5520abab214874653e9768ebbb22e064b51dab2f5bd5543460e357f9e1cba964341bcb24c5d53d8477de5458186e4d83db21d99a8ca45009d818 SHA512 ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026
 DIST csexp-1.5.1.tbz 10082 BLAKE2B 71d6844d5ae37d64c4b29ed8e2479869bda23bc8b352acc17a83a061acb6bb2dc223e3e9aba444c87949137123a716450a0c665c2c109bd98dcd702931e4a2be SHA512 d785bbabaff9f6bf601399149ef0a42e5e99647b54e27f97ef1625907793dda22a45bf83e0e8a1eba2c63634c5484b54739ff0904ef556f5fc592efa38af7505
-EBUILD csexp-1.3.2-r1.ebuild 569 BLAKE2B 6c394f1fd9093fc1f1f2603a84d6fe804a829fc2a48d65a8eb11b33b179906baf6fa8624737aaf42eb6bcf87be3589df9fd5fe190ed2da9d1d2288104873caf4 SHA512 5d33595266645f3dec19e40a18aba9c68f6148ec06dfcc575475d934e423e1a342de2f549035013cb189c843c49b617e661ec53aa2f1347e1da4d2e78f65a1a9
-EBUILD csexp-1.5.1.ebuild 575 BLAKE2B 091ea82ee13267bbacc63ef8469dc1817c02eb1864e37c93b75813981eae93c855b4b81c3bfa27d3ca04ac7e7f4f4f49f93f57555ec83407a186796324259e98 SHA512 ebc738b190fac8cdf34b9603d6b17feb5a54853bcd3d45dc6da28a29fe3bb06e01381ebbf2cdc353511cf3e4060361aa2e186fe3787ccd832418ba9aae8fa548
+EBUILD csexp-1.3.2-r1.ebuild 536 BLAKE2B ea864346923d2cc20dc26914b34f2ff8c09ed70b8f02b687ad3cfad79e526dc2b8d0a921c201d590aca08d5f90bff4eb048e0de0d27b1ac647c25bee9764d92f SHA512 297ea3a572d7afa052bb43a29ecb19e43f0d2321b92a7742dadcc7cb5492531322f0b133c4c431c26faac40cdcbc6fcdbcb4a01a51e15c70a3bb009737b63170
+EBUILD csexp-1.5.1.ebuild 536 BLAKE2B ea864346923d2cc20dc26914b34f2ff8c09ed70b8f02b687ad3cfad79e526dc2b8d0a921c201d590aca08d5f90bff4eb048e0de0d27b1ac647c25bee9764d92f SHA512 297ea3a572d7afa052bb43a29ecb19e43f0d2321b92a7742dadcc7cb5492531322f0b133c4c431c26faac40cdcbc6fcdbcb4a01a51e15c70a3bb009737b63170
 MISC metadata.xml 419 BLAKE2B 393ddafadd2d367c70b559c8da57b48db180b80c2a27d8d2ee9e311684034596edd12bf48b061cddae4b6718f1f4f536e8aec8d5698db58f6f9a933cfa0c0f8b SHA512 4a4cf3230718991dd88e5e1ecc6fe99bc4b5c3983f27bd61d804b57090673f27da642530845266c275bd658be1e2c18b3cdcfeb7bb43860eecc05129f5383214
diff --git a/dev-ml/csexp/csexp-1.3.2-r1.ebuild b/dev-ml/csexp/csexp-1.3.2-r1.ebuild
index 3299c8a7c789..824799a6c309 100644
--- a/dev-ml/csexp/csexp-1.3.2-r1.ebuild
+++ b/dev-ml/csexp/csexp-1.3.2-r1.ebuild
@@ -15,11 +15,6 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	>=dev-ml/result-1.5:=[ocamlopt=]
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-DEPEND="${DEPEND}
-	test? ( dev-ml/ppx_expect )
-"
+RDEPEND=">=dev-ml/result-1.5:=[ocamlopt=]"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ppx_expect )"
diff --git a/dev-ml/csexp/csexp-1.5.1.ebuild b/dev-ml/csexp/csexp-1.5.1.ebuild
index 471655dd5cf4..824799a6c309 100644
--- a/dev-ml/csexp/csexp-1.5.1.ebuild
+++ b/dev-ml/csexp/csexp-1.5.1.ebuild
@@ -11,15 +11,10 @@ SRC_URI="https://github.com/ocaml-dune/csexp/releases/download/${PV}/${P}.tbz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	>=dev-ml/result-1.5:=[ocamlopt=]
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-DEPEND="${DEPEND}
-	test? ( dev-ml/ppx_expect )
-"
+RDEPEND=">=dev-ml/result-1.5:=[ocamlopt=]"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ppx_expect )"
diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
index b86a564fd21b..1c45e12666e7 100644
--- a/dev-ml/cudf/Manifest
+++ b/dev-ml/cudf/Manifest
@@ -1,4 +1,4 @@
 AUX ounit2.patch 380 BLAKE2B 20d0c2f0b719715fc5f111bfbd81e814a4ae8229a7365ed2073d0ecc3ad1eafa4377bc3c0e497d4bf0ab73af986255ac48e179d34dfb2ded3fd7b55c22f339ba SHA512 d53ac28ba8b8eeda612d7f323bb658f272dcc785596eb47b4148ed7954a6ca0204e42b5e3cb6a55211fc1117432f3088fdc215930c26238dc2d34f063f21b062
 DIST cudf-0.9.tar.gz 55124 BLAKE2B 013f97d13b732674a7d0f9188590bbb8150ae9dc32ce26b56fb04848629fb27a3c850aa327e687d6aa80eb62ba6f67af2fcf86a647520e73d7f76748871a79cc SHA512 4abdd1a5a3d616273abe9dda87450a922ecd69b64d32f34d8fa3086bbd07fd23ffb01c24b128bf4d1c0c817cfa1da8029e743d33b3ad6a04e7a8f706b098c427
-EBUILD cudf-0.9-r1.ebuild 1721 BLAKE2B b332911014c9d395ecbbf61cd411ebad8f23e3bf422640039105f8fd01ad5a44d17ce8ca4dc33adf338d7f2111dbe687e388e18246cd544a309e9c53aabd4eb0 SHA512 086107cc8479ddee9b596e987fe525ff17a6176a187c0f6614078da7c3b232f35630fcfe2e8fd479f4352a4348bab1edaa14fe684e0bd92d8c35eca7aa0dc1a5
+EBUILD cudf-0.9-r2.ebuild 1802 BLAKE2B 7f83d5026dd7dc06c1bdde67fb2065e204f3a135339f8938675e6673c0ac42f9edbf9c367a199da933a3de0bbbd519ca95e7dbd832ac832983544e08177ab184 SHA512 6f601e703129bed82fa8f698a8b03eeb8f92a7f4fb31516f4ee8771a149ff28e5d0b1d7532d7f4e5fce17935863d34b5845e3e3dc1956b70634ec099bd21120b
 MISC metadata.xml 338 BLAKE2B f947fa0825c1a3fd959515164da36ffc9694c570ed6eb6eef8686fc24b4582ee88ecb7304507c79cf2733fb77ae3570468ec8da886367d79721c81f148931833 SHA512 9d052ada92f441fa4908f4ec9a2561f7276872281ffa65f0ad92c8d0f7c15aeea11d6c887d4af7535d7d72bce3dec8f12622aee5eb9a79e510e8baaa208a54cd
diff --git a/dev-ml/cudf/cudf-0.9-r1.ebuild b/dev-ml/cudf/cudf-0.9-r1.ebuild
deleted file mode 100644
index 769436a427c4..000000000000
--- a/dev-ml/cudf/cudf-0.9-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Library to parse, pretty print, and evaluate CUDF documents"
-HOMEPAGE="http://www.mancoosi.org/cudf/"
-SRC_URI="https://gforge.inria.fr/frs/download.php/file/36602/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.12:=[ocamlopt?]
-	dev-ml/extlib:=
-	dev-ml/findlib:=
-	dev-libs/glib:2
-	sys-libs/libunwind:=
-	sys-libs/ncurses:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit2 )
-	dev-ml/ocamlbuild
-	dev-lang/perl
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/ounit2.patch" )
-
-QA_FLAGS_IGNORED='.*'
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|make|$(MAKE)|g' \
-		Makefile || die
-	sed -i \
-		-e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
-		c-lib/Makefile || die
-	sed -i \
-		-e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
-		c-lib/Makefile.variants || die
-
-	tc-export CC PKG_CONFIG
-
-	sed -i \
-		-e "s|-lncurses|$( $(tc-getPKG_CONFIG) --libs ncurses)|g" \
-		c-lib/cudf.pc.in || die
-}
-
-src_compile() {
-	emake OCAMLBUILD="ocamlbuild -classic-display" -j1 all
-	emake OCAMLBUILD="ocamlbuild -classic-display" c-lib
-	if use ocamlopt ; then
-		emake OCAMLBUILD="ocamlbuild -classic-display" -j1 opt
-		emake OCAMLBUILD="ocamlbuild -classic-display" c-lib-opt
-	fi
-}
-
-src_test() {
-	emake OCAMLBUILD="ocamlbuild -classic-display" test
-	emake OCAMLBUILD="ocamlbuild -classic-display" c-lib-test
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
-	dodoc BUGS ChangeLog README TODO
-}
diff --git a/dev-ml/cudf/cudf-0.9-r2.ebuild b/dev-ml/cudf/cudf-0.9-r2.ebuild
new file mode 100644
index 000000000000..dcde53347192
--- /dev/null
+++ b/dev-ml/cudf/cudf-0.9-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Library to parse, pretty print, and evaluate CUDF documents"
+HOMEPAGE="http://www.mancoosi.org/cudf/"
+SRC_URI="https://gforge.inria.fr/frs/download.php/file/36602/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+IUSE="+ocamlopt llvm-libunwind test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-3.12:=[ocamlopt?]
+	dev-ml/extlib:=
+	dev-ml/findlib:=
+	dev-libs/glib:2
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )
+	sys-libs/ncurses:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit2 )
+	dev-ml/ocamlbuild
+	dev-lang/perl
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/ounit2.patch" )
+
+QA_FLAGS_IGNORED='.*'
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|make|$(MAKE)|g' \
+		Makefile || die
+	sed -i \
+		-e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind|g' \
+		c-lib/Makefile || die
+	sed -i \
+		-e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind|g' \
+		c-lib/Makefile.variants || die
+
+	tc-export CC PKG_CONFIG
+
+	sed -i \
+		-e "s|-lncurses|$( $(tc-getPKG_CONFIG) --libs ncurses)|g" \
+		c-lib/cudf.pc.in || die
+}
+
+src_compile() {
+	emake OCAMLBUILD="ocamlbuild -classic-display" -j1 all
+	emake OCAMLBUILD="ocamlbuild -classic-display" c-lib
+	if use ocamlopt ; then
+		emake OCAMLBUILD="ocamlbuild -classic-display" -j1 opt
+		emake OCAMLBUILD="ocamlbuild -classic-display" c-lib-opt
+	fi
+}
+
+src_test() {
+	emake OCAMLBUILD="ocamlbuild -classic-display" test
+	emake OCAMLBUILD="ocamlbuild -classic-display" c-lib-test
+}
+
+src_install() {
+	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
+	dodoc BUGS ChangeLog README TODO
+}
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index 51880c7e0ae7..b55d0ad088a3 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -3,7 +3,7 @@ DIST dose3_5.0.1-16.debian.tar.xz 39448 BLAKE2B a5ae8c74ee1a5a89bf3594cbaf0b3770
 DIST dose3_5.0.1.orig.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
 DIST dose3_6.0.1-2.debian.tar.xz 23320 BLAKE2B 0351a715756b76c1f81fdf5599d10373ce85554f1d63b4dcbaa647dcf81b099e59c68f93413ca391bdf17b52831b085a7d2b86bc64d86676763bbabd7804a6a4 SHA512 219bb7614d1200adb5d22032cb3d7442c16cdce785088f58b3fcc188856b93817f0157ea6ed1bd72e1f565b9a98df145c188e0fa5d7f538d616b7eccc20ab706
 DIST dose3_6.0.1.orig.tar.gz 1417354 BLAKE2B c5fb08c853d2d3589416237addf767912fffab5ef74b7f3332799ae350a371307bd06a24abe6565d2d00aedc01f58d0a2583db6d2d76fc2ebee634b05405ab86 SHA512 cb9dad4ae296b85317f60133bb9dcc63dad8560486e2bd83139205810643e701de5e9834d8d2de34d8237d0abfd394970088c73eeab08956fc9c4178411303ea
-EBUILD dose3-5.0.1_p16-r3.ebuild 2256 BLAKE2B 04d27714676035014da0ff4dc1b062f4d790629f6aa2487f6afa05e4d95088148a1d7822910833c906b7bf0d9f88003e487582ce46802400291164a7c3bb1716 SHA512 c453ec3a3a63f761e58d0d0d48ab83570eaf9530a17855806e27240b87f1379aead72f528ab907bb33e4c8eae9bdd8b94d53b1b52eda1926b0ab5c07116b3fd7
-EBUILD dose3-6.0.1_p2.ebuild 1290 BLAKE2B df43efc990783797735461cf0f17430a6565508b8b03dc9f90531963021626b15eddaad531a9c549993abbab17d58d0b09160b25a4b0b596e2b09fdb16c752a9 SHA512 71195ada929102fb6230e8f3ad8e12fe78a789c383b303513066befbf69855cb4b236e1911b26e6d1e522f38eb951dc23d6563cf543f6f3c77718828b8e5c92e
-EBUILD dose3-6.1.ebuild 1040 BLAKE2B e0225b471809cf25b3b11079ba1755c3f894a83ce536d38d6dba27dea8172b98ec2489cbe56a991a3ce6f5efd7dd1b3c57d3cb0c06f009001489bb65bacc0a47 SHA512 30d2a470ce0f164a8f661e2cdd2ef8ac88e9ee41399d89a24e3ca56053c19c4e1312f9953dd2074e0eee2806bc23be0b46a122c5fda0939846a82a55c98fe81d
+EBUILD dose3-5.0.1_p16-r4.ebuild 2259 BLAKE2B b016b7b7c8bf9cbe9d1e7e6f0a93d5eb732eb990cce85843d31b9c647858a47b6b5cd051335dbd5308e771cd8551b48f95378d23f877aceacb7d992aba775039 SHA512 8240f18ae018888fba3227d8f40b2c5cb778f2d429fa56c8fde276a52b751277d0d44d23424045d73ee7b229e3a58a34a07c3206c8c3aeb715212b70c2716723
+EBUILD dose3-6.0.1_p2-r1.ebuild 1292 BLAKE2B 00fa53f6f9f3b2d87469231a275ded2eb16a40a01fad6662074397d60ff30a3bb3002ebc868b088b160dc3c2cbb648ad2b52f61dda7e0504c8760a363a6ced6e SHA512 fdc2ec0def4a90a22d581700e88192751448aa90239dbc835cd3769cf332d83f9e75d514a4797f1e24bab9ac52cac9dbd7e2e428d149f6888e0f384fad0fad08
+EBUILD dose3-6.1-r1.ebuild 1038 BLAKE2B d5db83477cab9226d44a8b41424d36690f5d97417be179b9f826c750dea653d0c8ddd614c7d8b234b820088547c3a91fde527071f93fead3d546a99f4cfb317b SHA512 cad5d9167d5a2bcc4a05aa061ea38a1386932d7d31759dda6c95df2d43f0a205feade88a7baae5cabab6c717f705d1d007cb7ed3fcc8fc558c8439249b39afc1
 MISC metadata.xml 568 BLAKE2B 3ded228894bc51a457d66de967eb5b1a47fd4a1239709f4573e7746198eccbea27db34cb6dface497e38f14b0c3e9405d85241d7757984961c2169f1699cc3b0 SHA512 8fdbf1f9e6fd6719ff88deb8ea5c705be2d35831713c2fbc4d55d9cc6277d1822ede3af006b1e818ed0bca18e84e8b2a1f10b26593a525132a4d40a8e5844e05
diff --git a/dev-ml/dose3/dose3-5.0.1_p16-r3.ebuild b/dev-ml/dose3/dose3-5.0.1_p16-r3.ebuild
deleted file mode 100644
index 8a2d9bb0eca3..000000000000
--- a/dev-ml/dose3/dose3-5.0.1_p16-r3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library to perform analysis on package repositories"
-HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
-SRC_URI="http://deb.debian.org/debian/pool/main/d/dose3/${PN}_$(ver_cut 1-3).orig.tar.gz"
-SRC_URI+=" http://deb.debian.org/debian/pool/main/d/dose3/${PN}_${PV/_p/-}.debian.tar.xz"
-#SRC_URI="https://gforge.inria.fr/frs/download.php/file/36063/${P}.tar.gz"
-S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt parmap zip bzip2 xml curl rpm4 test"
-
-BDEPEND="
-	dev-ml/cppo
-	dev-ml/findlib
-	dev-ml/ocamlbuild
-"
-RDEPEND="
-	>=dev-lang/ocaml-3.12:=[ocamlopt=]
-	<dev-lang/ocaml-4.10.0:=[ocamlopt=]
-	dev-ml/cudf:=[ocamlopt=]
-	>=dev-ml/extlib-1.7.0:=[ocamlopt=]
-	>=dev-ml/ocamlgraph-1.8.6:=[ocamlopt=]
-	<dev-ml/ocamlgraph-1.8.9:=[ocamlopt=]
-	>=dev-ml/re-1.9.0:=[ocamlopt=]
-	parmap? ( dev-ml/parmap:=[ocamlopt=] )
-	zip? ( dev-ml/camlzip:=[ocamlopt=] )
-	bzip2? ( dev-ml/camlbz2:= )
-	xml? (
-		dev-ml/ocaml-expat:=[ocamlopt=]
-		dev-ml/xml-light:=[ocamlopt=]
-	)
-	curl? ( dev-ml/ocurl:= )
-	rpm4? ( app-arch/rpm )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pyyaml[libyaml] )
-"
-
-# missing test data
-RESTRICT="test"
-
-QA_FLAGS_IGNORED='.*'
-
-src_prepare() {
-	default
-	sed -e 's/INSTALLOPTS=-s/INSTALLOPTS=/' -i Makefile.config.in || die
-
-	# Not relevant to us, Debian specific adjustments
-	rm "${WORKDIR}"/debian/patches/0009-Fix-and-constraints-against-virtual-packages.patch || die
-	rm "${WORKDIR}"/debian/patches/binaries-prefix-edos || die
-
-	elog "Applying Debian patchset..."
-	for file in "${WORKDIR}"/debian/patches/*.patch ; do
-		eapply "${file}"
-	done
-}
-
-src_configure() {
-	econf \
-		$(use ocamlopt || echo "--with-bytecodeonly") \
-		$(use parmap && echo "--with-parmap") \
-		$(use zip && echo "--with-zip") \
-		$(use bzip2 && echo "--with-bz2") \
-		$(use xml && echo "--with-xml") \
-		$(use curl && echo "--with-curl") \
-		$(use rpm4 && echo "--with-rpm4")
-}
-
-src_compile() {
-	emake -j1 VERBOSE="-classic-display"
-}
-
-src_install() {
-	emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" install
-	dodoc CHANGES CREDITS README.architecture TODO
-}
diff --git a/dev-ml/dose3/dose3-5.0.1_p16-r4.ebuild b/dev-ml/dose3/dose3-5.0.1_p16-r4.ebuild
new file mode 100644
index 000000000000..fd0e74c8c652
--- /dev/null
+++ b/dev-ml/dose3/dose3-5.0.1_p16-r4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library to perform analysis on package repositories"
+HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
+SRC_URI="http://deb.debian.org/debian/pool/main/d/dose3/${PN}_$(ver_cut 1-3).orig.tar.gz"
+SRC_URI+=" http://deb.debian.org/debian/pool/main/d/dose3/${PN}_${PV/_p/-}.debian.tar.xz"
+#SRC_URI="https://gforge.inria.fr/frs/download.php/file/36063/${P}.tar.gz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+IUSE="+ocamlopt parmap zip bzip2 xml curl rpm4 test"
+
+BDEPEND="
+	dev-ml/cppo
+	dev-ml/findlib
+	dev-ml/ocamlbuild
+"
+RDEPEND="
+	>=dev-lang/ocaml-3.12:=[ocamlopt=]
+	<dev-lang/ocaml-4.10.0:=[ocamlopt=]
+	dev-ml/cudf:=[ocamlopt=]
+	>=dev-ml/extlib-1.7.0:=[ocamlopt=]
+	>=dev-ml/ocamlgraph-1.8.6:=[ocamlopt=]
+	<dev-ml/ocamlgraph-1.8.9:=[ocamlopt=]
+	>=dev-ml/re-1.9.0:=[ocamlopt=]
+	parmap? ( dev-ml/parmap:=[ocamlopt=] )
+	zip? ( dev-ml/camlzip:=[ocamlopt=] )
+	bzip2? ( dev-ml/camlbz2:= )
+	xml? (
+		dev-ml/ocaml-expat:=[ocamlopt=]
+		dev-ml/xml-light:=[ocamlopt=]
+	)
+	curl? ( dev-ml/ocurl:= )
+	rpm4? ( app-arch/rpm )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pyyaml[libyaml(+)] )
+"
+
+# missing test data
+RESTRICT="test"
+
+QA_FLAGS_IGNORED='.*'
+
+src_prepare() {
+	default
+	sed -e 's/INSTALLOPTS=-s/INSTALLOPTS=/' -i Makefile.config.in || die
+
+	# Not relevant to us, Debian specific adjustments
+	rm "${WORKDIR}"/debian/patches/0009-Fix-and-constraints-against-virtual-packages.patch || die
+	rm "${WORKDIR}"/debian/patches/binaries-prefix-edos || die
+
+	elog "Applying Debian patchset..."
+	for file in "${WORKDIR}"/debian/patches/*.patch ; do
+		eapply "${file}"
+	done
+}
+
+src_configure() {
+	econf \
+		$(use ocamlopt || echo "--with-bytecodeonly") \
+		$(use parmap && echo "--with-parmap") \
+		$(use zip && echo "--with-zip") \
+		$(use bzip2 && echo "--with-bz2") \
+		$(use xml && echo "--with-xml") \
+		$(use curl && echo "--with-curl") \
+		$(use rpm4 && echo "--with-rpm4")
+}
+
+src_compile() {
+	emake -j1 VERBOSE="-classic-display"
+}
+
+src_install() {
+	emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" install
+	dodoc CHANGES CREDITS README.architecture TODO
+}
diff --git a/dev-ml/dose3/dose3-6.0.1_p2-r1.ebuild b/dev-ml/dose3/dose3-6.0.1_p2-r1.ebuild
new file mode 100644
index 000000000000..481f80ee4a29
--- /dev/null
+++ b/dev-ml/dose3/dose3-6.0.1_p2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Library to perform analysis on package repositories"
+HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
+SRC_URI="http://deb.debian.org/debian/pool/main/d/dose3/${PN}_$(ver_cut 1-3).orig.tar.gz"
+SRC_URI+=" http://deb.debian.org/debian/pool/main/d/dose3/${PN}_${PV/_p/-}.debian.tar.xz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+IUSE="+ocamlopt test"
+
+BDEPEND="
+	dev-ml/findlib
+	dev-ml/ocamlbuild
+"
+RDEPEND="
+	>=dev-lang/ocaml-4.03:=[ocamlopt=]
+	dev-ml/ocaml-base64:=[ocamlopt=]
+	>=dev-ml/cudf-0.7:=[ocamlopt=]
+	>=dev-ml/extlib-1.7.8:=[ocamlopt=]
+	>=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=]
+	>=dev-ml/re-1.2.2:=[ocamlopt=]
+	dev-ml/parmap:=[ocamlopt=]
+	>=dev-ml/camlzip-1.08:=[ocamlopt=]
+	>=dev-ml/camlbz2-0.7.0:=
+	dev-ml/ocaml-expat:=[ocamlopt=]
+	dev-ml/xml-light:=[ocamlopt=]
+	app-arch/rpm
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pyyaml[libyaml(+)] )
+"
+
+# missing test data
+RESTRICT="test"
+
+QA_FLAGS_IGNORED='.*'
+
+src_prepare() {
+	default
+
+	elog "Applying Debian patchset..."
+	for file in "${WORKDIR}"/debian/patches/*.patch ; do
+		eapply "${file}"
+	done
+}
diff --git a/dev-ml/dose3/dose3-6.0.1_p2.ebuild b/dev-ml/dose3/dose3-6.0.1_p2.ebuild
deleted file mode 100644
index c2656b5b378b..000000000000
--- a/dev-ml/dose3/dose3-6.0.1_p2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Library to perform analysis on package repositories"
-HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
-SRC_URI="http://deb.debian.org/debian/pool/main/d/dose3/${PN}_$(ver_cut 1-3).orig.tar.gz"
-SRC_URI+=" http://deb.debian.org/debian/pool/main/d/dose3/${PN}_${PV/_p/-}.debian.tar.xz"
-S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
-IUSE="+ocamlopt test"
-
-BDEPEND="
-	dev-ml/findlib
-	dev-ml/ocamlbuild
-"
-RDEPEND="
-	>=dev-lang/ocaml-4.03:=[ocamlopt=]
-	dev-ml/ocaml-base64:=[ocamlopt=]
-	>=dev-ml/cudf-0.7:=[ocamlopt=]
-	>=dev-ml/extlib-1.7.8:=[ocamlopt=]
-	>=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=]
-	>=dev-ml/re-1.2.2:=[ocamlopt=]
-	dev-ml/parmap:=[ocamlopt=]
-	>=dev-ml/camlzip-1.08:=[ocamlopt=]
-	>=dev-ml/camlbz2-0.7.0:=
-	dev-ml/ocaml-expat:=[ocamlopt=]
-	dev-ml/xml-light:=[ocamlopt=]
-	app-arch/rpm
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pyyaml[libyaml] )
-"
-
-# missing test data
-RESTRICT="test"
-
-QA_FLAGS_IGNORED='.*'
-
-src_prepare() {
-	default
-
-	elog "Applying Debian patchset..."
-	for file in "${WORKDIR}"/debian/patches/*.patch ; do
-		eapply "${file}"
-	done
-}
diff --git a/dev-ml/dose3/dose3-6.1-r1.ebuild b/dev-ml/dose3/dose3-6.1-r1.ebuild
new file mode 100644
index 000000000000..bbef234541cc
--- /dev/null
+++ b/dev-ml/dose3/dose3-6.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Library to perform analysis on package repositories"
+HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
+SRC_URI="https://gitlab.com/irill/${PN}/-/archive/${PV}/${P}.tar.gz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
+IUSE="+ocamlopt test"
+
+BDEPEND="
+	dev-ml/findlib
+	dev-ml/ocamlbuild
+"
+RDEPEND="
+	>=dev-lang/ocaml-4.03:=[ocamlopt=]
+	dev-ml/ocaml-base64:=[ocamlopt=]
+	>=dev-ml/cudf-0.7:=[ocamlopt=]
+	>=dev-ml/extlib-1.7.8:=[ocamlopt=]
+	>=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=]
+	>=dev-ml/re-1.2.2:=[ocamlopt=]
+	dev-ml/parmap:=[ocamlopt=]
+	>=dev-ml/camlzip-1.08:=[ocamlopt=]
+	>=dev-ml/camlbz2-0.7.0:=
+	dev-ml/ocaml-expat:=[ocamlopt=]
+	dev-ml/xml-light:=[ocamlopt=]
+	app-arch/rpm
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pyyaml[libyaml(+)] )
+"
+
+# missing test data
+RESTRICT="test"
+
+QA_FLAGS_IGNORED='.*'
diff --git a/dev-ml/dose3/dose3-6.1.ebuild b/dev-ml/dose3/dose3-6.1.ebuild
deleted file mode 100644
index 4cb33909265c..000000000000
--- a/dev-ml/dose3/dose3-6.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Library to perform analysis on package repositories"
-HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
-SRC_URI="https://gitlab.com/irill/${PN}/-/archive/${PV}/${P}.tar.gz"
-S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
-
-LICENSE="LGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-
-BDEPEND="
-	dev-ml/findlib
-	dev-ml/ocamlbuild
-"
-RDEPEND="
-	>=dev-lang/ocaml-4.03:=[ocamlopt=]
-	dev-ml/ocaml-base64:=[ocamlopt=]
-	>=dev-ml/cudf-0.7:=[ocamlopt=]
-	>=dev-ml/extlib-1.7.8:=[ocamlopt=]
-	>=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=]
-	>=dev-ml/re-1.2.2:=[ocamlopt=]
-	dev-ml/parmap:=[ocamlopt=]
-	>=dev-ml/camlzip-1.08:=[ocamlopt=]
-	>=dev-ml/camlbz2-0.7.0:=
-	dev-ml/ocaml-expat:=[ocamlopt=]
-	dev-ml/xml-light:=[ocamlopt=]
-	app-arch/rpm
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pyyaml[libyaml] )
-"
-
-# missing test data
-RESTRICT="test"
-
-QA_FLAGS_IGNORED='.*'
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index 4da3fc8ac227..b63ed9665dba 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -2,8 +2,8 @@ DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
 DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
 DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
-EBUILD dune-configurator-2.8.2-r1.ebuild 3691 BLAKE2B 6cceed0e264b8c1a8a6bc19b4fd790426f68556bf17b0fa80d8e3ec4f129aac627301f4dc61005e9bda9706f5d60425d1576044ef4a6c14e20e1a16c4e1790e4 SHA512 2d7b330a4fa3fb4ad8ddef912aa05f2b2d83123d434189a48b1a6f5b058ac3d80541e51d7ea53d5b85316c61914d1dfe7b814f773621522f52e23481bd7d3bc2
-EBUILD dune-configurator-2.8.4.ebuild 4113 BLAKE2B a7b7a6dd0339659e6a1f7a2a1e3ca9a086d849860164c1fda0f3f605208ba2fc71226688f87ffc29a8aef0db03713b2ce135ff8ba80b1e6b555d04c7b630460b SHA512 248672c231a7c1971ee4fb15ec5bc9c73b90a470dd2c41f6e69c1e8a1aa79cf1d77a4a7fde288a6ecfa3d798ca8ea70957a8925652b527920d3f7546e1edd53d
-EBUILD dune-configurator-2.9.0.ebuild 4119 BLAKE2B 41ee9db5c9e79840dae7e1cf2489f83f154ba64a90e32260fdb0af5b738e046a0d4d9912c59301fbf9567f3beb502e0164a7a9a7abaf3a4d0fc4f87949663b2f SHA512 17f1777fbacebca4abbf2636a6b6ff46a5b58fa32d28fee2cd6b9e9168f2200ba31f1b998ff3f4fd9b59a6b1df7afb4320f82ae5197a32c5a3d15a3aaf9cdacd
-EBUILD dune-configurator-2.9.1.ebuild 4119 BLAKE2B 41ee9db5c9e79840dae7e1cf2489f83f154ba64a90e32260fdb0af5b738e046a0d4d9912c59301fbf9567f3beb502e0164a7a9a7abaf3a4d0fc4f87949663b2f SHA512 17f1777fbacebca4abbf2636a6b6ff46a5b58fa32d28fee2cd6b9e9168f2200ba31f1b998ff3f4fd9b59a6b1df7afb4320f82ae5197a32c5a3d15a3aaf9cdacd
+EBUILD dune-configurator-2.8.2-r1.ebuild 3673 BLAKE2B d31ebf45cc51b44d9adaf9492aa713f1a42c85921dfae894e8c59604126e046615236eb28b77da0da683e8cb0e758b83f4c85e16b905b56b2ed0718fc4393338 SHA512 a3bd94c56071878c025d5f384419636b1a6cdd9cf4f972ea4ea92667b8b0e47d32199a44c79206d1e9a76f96fbc8aae4b86f10792c989934ef7e66ae551265d3
+EBUILD dune-configurator-2.8.4.ebuild 4095 BLAKE2B 440ac69c0b4571560d90c39ee5f2ed6860bb1b592c7e2b3fae4c2d02bd1e953be24af97f436566d618b6ff5d0523ae25516d3f7d15b2960daa4f92eb3bae4170 SHA512 d03fcad1bd2d4679881607f5af4b7995b41492336331201fb5457e410014d0eb1c652e747b78e78385c03520748a5ca7cabd8debb4a52548ddc9cce06aea9917
+EBUILD dune-configurator-2.9.0.ebuild 4101 BLAKE2B fa84f951fac3a9e4882c3542cdbcbe0b8e0ef5ce6bc8835481a33e95dc216b29b662b4c4d995f7ad17b10a68ed53f422973c82d355a41f12c9ad00758bb5cc17 SHA512 d98dd50f8d1a1624aaf7b76d1a3827560324f0eff3e5040643794ed0f6385c8ddaefbed05f471b7119fb757b15673a6907f622891ef11ae8c71e233c45a82f6c
+EBUILD dune-configurator-2.9.1.ebuild 4101 BLAKE2B fa84f951fac3a9e4882c3542cdbcbe0b8e0ef5ce6bc8835481a33e95dc216b29b662b4c4d995f7ad17b10a68ed53f422973c82d355a41f12c9ad00758bb5cc17 SHA512 d98dd50f8d1a1624aaf7b76d1a3827560324f0eff3e5040643794ed0f6385c8ddaefbed05f471b7119fb757b15673a6907f622891ef11ae8c71e233c45a82f6c
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
index a4ac4db266dd..28997fac63b7 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
@@ -16,13 +16,12 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
 	dev-ml/csexp:=[ocamlopt=]
 	dev-ml/result:=[ocamlopt=]
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/core_bench
 		dev-ml/menhir
diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
index 61ca3646a68e..d47c38cb2a82 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
@@ -16,13 +16,12 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
 	dev-ml/csexp:=[ocamlopt=]
 	dev-ml/result:=[ocamlopt=]
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/core_bench
 		dev-ml/menhir
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
index 87edcf4c3a33..a8a42765fa98 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
@@ -16,13 +16,12 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
 	dev-ml/csexp:=[ocamlopt=]
 	dev-ml/result:=[ocamlopt=]
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/core_bench
 		dev-ml/menhir
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
index 87edcf4c3a33..a8a42765fa98 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
@@ -16,13 +16,12 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
 	dev-ml/csexp:=[ocamlopt=]
 	dev-ml/result:=[ocamlopt=]
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/core_bench
 		dev-ml/menhir
diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest
index 0fb39be4eca4..eadd8623c7e1 100644
--- a/dev-ml/extlib/Manifest
+++ b/dev-ml/extlib/Manifest
@@ -2,5 +2,5 @@ AUX extlib-1.7.7-no-git.patch 283 BLAKE2B 2cfc23016472905c9dfb28615bce04d607a70b
 DIST extlib-1.7.7.tar.gz 88870 BLAKE2B fff84524ef227718d3908c5b65f4b781360cebc0dca3a8862aa11ea671499b45192c5106769e104d396118e3cdcd904ddce06df784f8fd0eadb7a2372ca3df94 SHA512 088a6c5bbe6530cd60e2276dc02592b69ad7ad685b752f0544c54b6246b8131238c6423ce7bfc81fe3ad1766f605ecf52fd3888d55cca63e22c947afedf610c5
 DIST extlib-1.7.8.tar.gz 90213 BLAKE2B cf78d819c542e84825bea3422d1b9afb46a3f72274ac40c704ae872a5889cbe0793f1e27f2dd8f38dee118590300d3bc6a336bfd29a16dfad00008a63ceeb17c SHA512 4a0d5d82da068c34286a1547e173f2634372d01c201823edfda2b8f72d3ff58fa26da29dde9a8b2fda28989cdb655d5a9cfd71310660e5c593026a75a833e6c6
 EBUILD extlib-1.7.7.ebuild 971 BLAKE2B e6197bf35b329a9a78def6c235793a8266e4379ece7b4c58d47259d7adb96fa758ca8639eddcbbc38f8df377682f6d9d655e8929160857147040a77d82340a71 SHA512 6b5bea15b76345fe16a7015147164b291e975ccbe64d41a4ed8e23dcb21724d0dd0b0622400858f0738ddfeacfd999d1b55e060358715bb996699c7f2a780a36
-EBUILD extlib-1.7.8.ebuild 918 BLAKE2B dc4e4df094178eeb1db700c472efbe29f7f9082073a888b11b3aca67dde55ca1f5e40dead97af6e9dd3682977351c8c877fc0b59f1b72b5fcdeca9562aeb2888 SHA512 ff10d53b326235ad9c6827e6cc6fbd6c7aa53fd3aac5c2975eed6cb1bd81c13a2774d188ab21714d17ed301707b37bb5ac3d50f5ec0665eb5635da60a95bb909
+EBUILD extlib-1.7.8.ebuild 917 BLAKE2B 429e797cea05c1a14f3e23b6baaff43cb5f4d7e24819d353a8779b0299492b68977ce08a9bd3462e15d89c7c400fa479227dbda59ac361a005b0ba03c438b4d9 SHA512 b1d430a77673e4d4a853402c0ddc9f018e47f03b5c8715f9b2ade2e74c61be2fe9976a01a9522af07807c7e3920f16dbea213693769a8567e6d83bc7dca9ade5
 MISC metadata.xml 385 BLAKE2B 69ceb184f4b3add8c192dc74c7a8c588f885a125f4fdb0d2d83a1760241ea35fb6365604268ce66c9759a52c742abbcf02a6cc9738eecad5a6cdc0bc247001e5 SHA512 8157c72cfce80eb5981add6285952d2befee14a0dedf3276985d2c9f812b588d6d022178cbebf5b7bf5950ca6744bd5c8daa4a76a5863299eebdd4f90e9d4a67
diff --git a/dev-ml/extlib/extlib-1.7.8.ebuild b/dev-ml/extlib/extlib-1.7.8.ebuild
index 86f42e414812..78f973f346e5 100644
--- a/dev-ml/extlib/extlib-1.7.8.ebuild
+++ b/dev-ml/extlib/extlib-1.7.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/ocaml-${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc +ocamlopt"
 
 # See bug #704146
diff --git a/dev-ml/fpath/Manifest b/dev-ml/fpath/Manifest
index de062d7548e8..76b61b67a3c9 100644
--- a/dev-ml/fpath/Manifest
+++ b/dev-ml/fpath/Manifest
@@ -1,5 +1,5 @@
 DIST fpath-0.7.2.tbz 24142 BLAKE2B 5aa22a33d0155c2a446c3622d6feef0748be3eaa72f07e7e2770fda1993794864072a5f50a052537b9724e39935064967c87f82d860a2da17fbc86279a1930ab SHA512 d8ab8d6f183a1742d74a3a3220cc1d62e7df38a6f3ca1c04fad18426a0897152255382305ad14d058b5b85ab55a27536c39a62deffac8d46984a730a2a18405d
 DIST fpath-0.7.3.tbz 24345 BLAKE2B 5d4e68acebdafb6378422b31385e78decff2dfce1bedd102c7e6baac519f9843e0828629f4a15e075f506865e1af6f9cc7ece761e74fe6608d3476338cc556cb SHA512 acf4b379aee3c25305ef71d1b97b154faa6de1e8248a8e8d046cf11090a3e94f2dc048b961bb51725ca7384e784455f2893fbd51f26bf80571a9cc7e9475b945
-EBUILD fpath-0.7.2.ebuild 562 BLAKE2B 3f1fd182e9e06b250a70da7dba5912c482be621497f217dcd6faacb4de6e1dcf0e998923cf076f893a1cb201f931b9437c9a580ab307b5160d3914ce0c0389a4 SHA512 7c0087bea3e7daefbfb716fad0007a56ff73f3c81b4269865e64448c1f939c07460297a1d19ce471bd10a6a96794da3c260e7cd298758f20a70e38cba80cae4b
-EBUILD fpath-0.7.3.ebuild 565 BLAKE2B bae6063030f1d9da97f30f1ee8403502760a57f4da88c6d2284a54b887145dc28fcb5f794403090a9ce3a6d0128c5f379f769f1202ef17a78a328fe29c617ffe SHA512 eea81ad44218a70c4157b32390fa01d4ed65c50a1cf36de2dd6bb2dc9f5dcbd809ad28a4a32a7fdded311f08dd9d8e931b435d4cdd3a61b7f6ffb12512592b58
+EBUILD fpath-0.7.2.ebuild 561 BLAKE2B 6ba84c3f260f346ada51bef1e566b841011657eb118af2791beff08b1f9ea95bad8982c8e93083a898b654ae2b70c89baf91958dedbcdf6463a09b6345981bc9 SHA512 a7c7f593b72c109c1f017c432ac52f431b164a25b4f245debb9fea0cb398411c7bc9c29f09d03fed1de019599d78db60b7c3cc1eb015d86dabae0a80326c089a
+EBUILD fpath-0.7.3.ebuild 560 BLAKE2B a1d2e2ea940448bdc9de3b628cc6b9d309c7304b8ef247f8bfee07a700302079aecf8b65a3033c870748b3fcae0c55293956e305bb69f6b36d6364506995c852 SHA512 6ee9235580e857b989dd71cb2ccf716229ba0eb41a4cd5b249885efdbd240e6284a5ce7beb0545a272c4a624c7ae35589da9a010478120dd6b9c9f301f8824d5
 MISC metadata.xml 312 BLAKE2B 25e78fc547cff8e938dcd8eeaac127b31e60a758a183cd4d01258e7efac1b8a820eb241adc66169b15806fc539dbab324b85f9d50cb10f2aba61a8f64d3c7dab SHA512 b835a40c52db072c5f0bbca539437f959be01089e1aa6587cc4f8dc16150ec8be3800c9aeb00143b29c6557eba5bf952718f1cdbb96fe5f30851a165f410131d
diff --git a/dev-ml/fpath/fpath-0.7.2.ebuild b/dev-ml/fpath/fpath-0.7.2.ebuild
index cd686c223196..c2909f3c6d01 100644
--- a/dev-ml/fpath/fpath-0.7.2.ebuild
+++ b/dev-ml/fpath/fpath-0.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/fpath/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-ml/fpath/fpath-0.7.3.ebuild b/dev-ml/fpath/fpath-0.7.3.ebuild
index 13e85c27b103..6882f7558f4c 100644
--- a/dev-ml/fpath/fpath-0.7.3.ebuild
+++ b/dev-ml/fpath/fpath-0.7.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/fpath/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 
 RDEPEND="dev-ml/result:=
 	dev-ml/astring:=
diff --git a/dev-ml/graphics/Manifest b/dev-ml/graphics/Manifest
index 5d5b6eb1dea9..a0e4cf2c8979 100644
--- a/dev-ml/graphics/Manifest
+++ b/dev-ml/graphics/Manifest
@@ -1,5 +1,5 @@
 DIST graphics-5.1.1.tbz 58713 BLAKE2B 75f81b938be8a44f904418851ed747742ad63556ef94c533872f4b04705a0209a06f969add207bf332e1ab3d6a98a819c0ed2b0f50bdf1275f5d57ff6caa2fed SHA512 15adbe03211e7392a2fded2d9fd5e0cc2c532b4a1de3b6c90945e9e99cc4f419583a204f357f8c9fd92d1ffce48e13e1f146da1f009eb4645150b7394f799e0a
 DIST graphics-5.1.2.tbz 58863 BLAKE2B 640a288759f5c233f3ded3c0e974329b0b8a41ab60772d0d41e6f89057432215a35c0f06facc552fcacf2e1fb8d0f5c47bc5d0aad5ca89dcf4ab71732a9b1c9f SHA512 1387c1ecf5dfd62c3927f1f8ce0bcc8b162ef22f15bfd41eba47c955091f7ce5f19395beab550d31cff38d22c4ad097350975381e60936a0004271e96f65b09b
 EBUILD graphics-5.1.1-r1.ebuild 517 BLAKE2B b524e4a516d11651721d075acb1aee40581737b818ddcb98aec15334fafd0215dfb62d21e6275befb196477e4a641999e3fb6dde544f87822f8d5fe319fc7a55 SHA512 ec78284c78bdb135056c98ca415700b5de7e5f8c937c7d53855743d6d210b90e5dbf1db7e7ddb20664062f16c4971d36e0490dcc72b64852ea35f4eb9560fafa
-EBUILD graphics-5.1.2.ebuild 523 BLAKE2B 7bfec9f03f0829ca0d2d2d5e2c38dff5b7e27e05f24b14c749897d2a2ae519bf086206804f5aedc8069b19a36162030b300540e6450d79fb624a12867eaea3d0 SHA512 cb2278d0019721404922c5ebe82b316a6691fda75a6b36ee0e993268a78e317bd1f61b2300bb80284ee3e7150177da3c3e8f1b375f3951cbaa9cdf54d1de743e
+EBUILD graphics-5.1.2.ebuild 517 BLAKE2B b524e4a516d11651721d075acb1aee40581737b818ddcb98aec15334fafd0215dfb62d21e6275befb196477e4a641999e3fb6dde544f87822f8d5fe319fc7a55 SHA512 ec78284c78bdb135056c98ca415700b5de7e5f8c937c7d53855743d6d210b90e5dbf1db7e7ddb20664062f16c4971d36e0490dcc72b64852ea35f4eb9560fafa
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/graphics/graphics-5.1.2.ebuild b/dev-ml/graphics/graphics-5.1.2.ebuild
index 68860652dce7..7a3977c3a2ce 100644
--- a/dev-ml/graphics/graphics-5.1.2.ebuild
+++ b/dev-ml/graphics/graphics-5.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 RDEPEND="dev-ml/dune-configurator:=[ocamlopt?]
 	>=dev-lang/ocaml-4.09:=
diff --git a/dev-ml/jst-config/Manifest b/dev-ml/jst-config/Manifest
index a40ffa98e9e6..89de07cfb2f4 100644
--- a/dev-ml/jst-config/Manifest
+++ b/dev-ml/jst-config/Manifest
@@ -1,3 +1,5 @@
 DIST jst-config-0.14.0.tar.gz 4916 BLAKE2B e052cf9aad6e7bef737cd39643663b4577cffe9b9a8e116a8f23ce8d92ebb172d8c66eb20976c319593c217d95de253b4b7f86c05616bf665061896989f0908c SHA512 9d76f3394490762aaef36a3fd3ced4769da05e5a62176bb215379f18a29eab5089e65f599a3a3621937a5a79fcbda22cecf189e8e290acffef5b565e1b4d3b58
+DIST jst-config-0.14.1.tar.gz 4931 BLAKE2B b24aefa5f4e0b76c3cfd1ecbb9ae7789891db8ade236f6071b814dc3d4be6d94ad39b2d0808ca81a633f2b7a31db18b530c73a7a0c43c65f4ddc8abe90adddd6 SHA512 0a43ba941c2915afb30b3cdc09c3c83e05d5b1367bf89aaa4b3adb72878c8435e07838bcf345452c25482d7621d2a7277b92328a2a8842ec172d4bf73005d9c2
 EBUILD jst-config-0.14.0.ebuild 529 BLAKE2B f56c9c1f1ad30edcfa66b391be8cb0aba83761149024a84513dc460e2be540321dfee2661fee64d732c6669b9dab0b6e6a76ff024651adf1b3bdb8a334c01796 SHA512 b09832a6d2a2c5eb88fdee7920f1fb602fa4c864acd57b09a0a3b78f0ff4de7a2ded2f4b10f644e8a08c559b3748a4f8987eb417f18a3ae298c5495fc0306073
+EBUILD jst-config-0.14.1.ebuild 535 BLAKE2B ab8249dc0deac947976d356f4d883a56748b591f295f8fe99b0b34bae60dbcb1291ed49ef6255afd1cbfcfacaa242b6687680cd3d99589e008fa330b90a0fa8f SHA512 15c488168e103aff99d8d60fc2a9168d937380d7568a3629f8c7b6fa20438a2424b929aec292e96d425bd218be11a3a1432cfc889aae7239ab41210d7af54257
 MISC metadata.xml 331 BLAKE2B 8c60d8ec76cd4490f44777691314913be8ef21fe7df79c7808c8050d04325cd8209aeb801b4a816770e79f6c01a0e9746e3a70a59d8e17fc9c2095515fdfdfc7 SHA512 edd11273f875929a3c9ae1372a28a8311d7cc22f6aa92175b5964a74fc6217f43a20814c6947d87877d81a728eedfe90b3e5734099469b3de04d7e13ee6b6199
diff --git a/dev-ml/jst-config/jst-config-0.14.1.ebuild b/dev-ml/jst-config/jst-config-0.14.1.ebuild
new file mode 100644
index 000000000000..17ae2234d2b2
--- /dev/null
+++ b/dev-ml/jst-config/jst-config-0.14.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Compile-time configuration for Jane Street libraries"
+HOMEPAGE="https://github.com/janestreet/jst-config"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppx_assert:=
+	dev-ml/stdio:=
+	dev-ml/dune-configurator:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index b4b6a8bdd373..5448ff1c6490 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -3,7 +3,7 @@ AUX labltk-8.06.10-this-expression-has-type.patch 644 BLAKE2B 951ccdfa410298bb16
 DIST labltk-8.06.10.tar.gz 371871 BLAKE2B da67b13aa0a0c179c2fcefe6b03f68225b6e886a1233de77b9749be32b8efc845cac60244f9a8494241c8c77c7d6991786280c274becb70f5527ad891c3aac69 SHA512 ef797d21adac48ca5ed35d95ad05fee26f9b6c99b0510909f6087abb9580b8efd219ca65b1efddb170b5409567d83eaaac0473898f5f4db3e15ae4f39df364c8
 DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837eecb4f94f6c89c657966774fe7d6ed928459be3ccca7fd3e7cf67a54ee63f7d2d08dcc8b7e853f5ad64769b33a2 SHA512 3c7352d14bc337adfb1939e72bd2658bb5e60b463f10f3748779084d1b7a6e6225028c775b548e355d69984a8944b91580fa978ff904b20b8b762ba9046f5e7d
 DIST labltk-8.06.9.tar.gz 371504 BLAKE2B 587ff01da120501f85f6d9921e46275858f1e1ce730eef205f9e7d7c64f6d3c0ea701cf832fdb8eb0746e1f0cff1151bccb077641740fb18811473b1553e2940 SHA512 fd6defa302d919f229394c486dcefab110b144534525a87082a27d2cab29c0af4ece3da821098fea25416850ad857f7af979d48790330d62dfb8d8db8f2bf6ca
-EBUILD labltk-8.06.10.ebuild 1109 BLAKE2B 43329dcce76e081ee41e741a2c8bf9e089fe835e292e97fcdd5dea84f677155c7a1f3164cce4008f7cdca39b1250328f5eac1bfc0489f49663efe36296a0f572 SHA512 b51fbe704766d898630afcf12e1cac590a610173c385b23c054a5f42a22b8a7c0236c622d60e998e72045ae3e19469d378b9abe1da9fb6c2577ac170bb4a58cb
+EBUILD labltk-8.06.10.ebuild 1103 BLAKE2B ddc3964a1fb8d9736c8eb70be8e8c9de03c1239c1bc5df3bda1cdaed7f995e3e3634fd79648809e5dc6371c30336db3328b6bb4c213d4f44eb743bd164d7d27a SHA512 dd52812e8a721b7f587492ec898e062e46f056e400904111307abf066f226569da7ad227de58e8a4308001e5c0584806d62aea8567c6cd8d6cecc94fa0d8f113
 EBUILD labltk-8.06.7.ebuild 992 BLAKE2B 67153839b68d13cfdbe8eab47a10c65d03beefbcc08b27edeb9d75c144ef563787978037e6a7a52f6c50707d0ecc52e77c29fe3de509bd19d8c670e4cc82344a SHA512 181baa5df2eada2fb0768691bdf37a2b18e91633e99b529205477310d8eed23a9fd35250aa19ae2e849a09b3ba660483911cc3a3aa60f862f3105ab7e0a1c417
 EBUILD labltk-8.06.9.ebuild 980 BLAKE2B 030b066865f536672e2f097909a622175edb0e0fe622734628cce7cd556ee602041842e99beb79009089e6a59edb450e5542f4ca873ccc732c5bcb10187aab36 SHA512 8c25f38845bc032fba61c9f7694eaf8aa82ca1b80401aad0650fc350dea967dc60bfc53cd625e9de9c6b9f4b551a9c17d1d5adab033b0bd413576e8ece9c6d22
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/labltk/labltk-8.06.10.ebuild b/dev-ml/labltk/labltk-8.06.10.ebuild
index 3390c7d7b988..11b2200caa2d 100644
--- a/dev-ml/labltk/labltk-8.06.10.ebuild
+++ b/dev-ml/labltk/labltk-8.06.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt X"
 
 RDEPEND="dev-lang/tk:=
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index fae744a59f97..ea47efedcc06 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,5 +1,5 @@
 DIST menhir-20190924.tar.gz 2491000 BLAKE2B 463825aa0f3ea41e49d9c130226bc8bbfc2b96650debf8d79422a90b93338ead58e01aa0c34b2161e4383d1c9a8d77ab58bb1da78e3187ed60b02e13f7742844 SHA512 8036eb8a65f123ceadd21739d88dafca54a2338fc168922a1301a9fbe709ac5e8e7214d95d8114f3798c15f458822e64dcedb94f7fff18ab6f9ccfb6de462e46
 DIST menhir-20210419.tar.gz 1136536 BLAKE2B 9d95600221aca25983674fa736c35ac0c5f2809a8aade5f9163a7b8baaacc660c03376b52749ae1d75d0d35ad8f4710d7f43832ef5ee0283fce7f7a41f15c120 SHA512 cca9037586635a6603531629671cc1448d65deb47c66654928d34c9163c4b501901428afc95eb0efdfc7f010d2efa176385420d9296d59b840176e07b8bf0fce
 EBUILD menhir-20190924.ebuild 915 BLAKE2B c33ff204555d700ec02abc8bef23ca5e30767b409f3d226dd5fd380ce75d11fc1bb228d3446c3f7d1822530e6a556225138fa2700ea8ed99c828bdcc0dd983d4 SHA512 0ea611c2f1f32aaeee73ee407a9eae82a24bca518e006eeb66b33ab5f1f0adb3c06ff85fd2c0a99fdd865f8a3245239165617a0c3ccbe815009aa761b8ad7b21
-EBUILD menhir-20210419-r1.ebuild 543 BLAKE2B 12230575ad22528949d5388f1e57f447334f306df992328b2974b017fedc2c2d1be99978bb2c2d3ab5d9ef5097e73596127f0907a0693a3ba792c63306ea3a3c SHA512 f262ea1825b660624d8716b44aed0b6bec99ea5448dcf29e9c960d9c5b45e168fb904c14b6b724505507aa145546de13582ab207508603696c175ed08de155ec
+EBUILD menhir-20210419-r1.ebuild 537 BLAKE2B 4d094a8b25103cb2159a6a2e06ccb6c3841089649307f1aaeb6f882fb575dc7ee69713e44a802fc455c180e5ea6953d6cdf191ac346ba3512fb0cff20de185c5 SHA512 4f3544aedf425767fd627809d3f66f6dfb5123437bf7d5a420d1c77c4a48b7e1e49ab07b43b9a3914b8e152fb96bfbd4b552f61ab616f1ad52f837bc5ff1da49
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/menhir/menhir-20210419-r1.ebuild b/dev-ml/menhir/menhir-20210419-r1.ebuild
index eee8ab93b315..4c393d9c4ec6 100644
--- a/dev-ml/menhir/menhir-20210419-r1.ebuild
+++ b/dev-ml/menhir/menhir-20210419-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.inria.fr/fpottier/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 src_install() {
diff --git a/dev-ml/merlin-extend/Manifest b/dev-ml/merlin-extend/Manifest
index bb582b6f062f..5dd4ecfbe226 100644
--- a/dev-ml/merlin-extend/Manifest
+++ b/dev-ml/merlin-extend/Manifest
@@ -1,5 +1,5 @@
 DIST merlin-extend-0.3.tar.gz 15422 BLAKE2B cfd658c9afa6f4500899c342c86c75399cbbef89fe5817c2a957ec93ba02c360fff66e01b81890d19c87a89380ba1cd352a2ffdc10a2dc53c7d535e8af5f720a SHA512 1e6436299b38c7fa57ae5b681a1409795545bc6f5956d6b1c37cbfdbdabfd90da476c030067fe2e016c823d60d1e5498c4536c869bf58425e1a6ff78295efba4
 DIST merlin-extend-0.6.tar.gz 8098 BLAKE2B c8adb32c03a3fe423aa1bb9e10ed9d5041cfbbdc991ae656180debbcad6ee72404bdd7c03d8ee609b809aa27e8013f14785204c759221e33405182ef6c9d1616 SHA512 5cfe4bb1fe8804dcb52eb4cebea6176b5d50fdafbdcd4f5854726c74f196ad06fe3b1b46dde7622f2e5c99ce6bfea9efd070fb81e5fd5e2b5197f40cee109ea7
-EBUILD merlin-extend-0.3-r1.ebuild 486 BLAKE2B f227cdf4269f27a1b06b23535039c85b4bbc8482e2ae752a4dc45c2abf643fa5d025d4d852c13ac3ea0b264494047fbe86411b770659f3f2e258d8ba149e01d5 SHA512 ed84872092614bb99c9a623d098d40cdbfd51d69e7ae1432d20f6b8efd81bec7cdc9b860fb274840fa73029b87ac381d0ea0fab73da863757094b32c41647024
-EBUILD merlin-extend-0.6.ebuild 481 BLAKE2B c8323e66fd99225ee36771290b137526def8d831098e944fb7e708bd8c7c22de7f50aff8c3b3097443149cc55d59acd5c40c91507354ee093c11e176e751ee7f SHA512 dabec95c8a521ff3a0a2ce2c5924d50d48baf38c94a791bd37ec85db704f2707f4c3217c0dd0d9af022d596e15055eab941e06f49d25f2b0fbbb92c2677ee127
+EBUILD merlin-extend-0.3-r1.ebuild 468 BLAKE2B 4c2a223fab1b140888113d1a8bfcf08993f8d2d83706fd9ad6dfba63371d7e5783f983f5698b2a08324a5bc5f2ec602338ae8489066c74bd9dacb17f6e3e8b87 SHA512 3abe591dfb6460a42815ba8a04a44ff8078515efb36518d7067ea644aca99457953aa896e1b748f364a78056b157b773e56c513dafc11f7ccc7c586e29f090b9
+EBUILD merlin-extend-0.6.ebuild 463 BLAKE2B 5eea33928354fca00a371511af2d0316a176b78944cb476e833c41281d4ca83036e28720b50b97ee98dd03aeb758854c347ed6ec5314b4ff3326d249bb6f3574 SHA512 8f59bf539f5d1dab272bdf40013dad07fd521409f5f4d44ace2407ae5de1f662980315e26480bf276681b900c2eda6a5c96d76c8de092f63faf7037ec111fe42
 MISC metadata.xml 319 BLAKE2B 1a5504443802ca145e62b7a0a93d0db800a0723d8ccb18945d407d43f45b1631b9887d83a66062fba544fe3822b6193c0709615380baff74d2be0d60e764409d SHA512 cd5db8c1f6db80a9179cfb785c9405825285846a1bf307dea9a8bc4b1a3e21d7008ad7be8acf827abf7458690b20a41731fb3ec0a10a31350dbdb8dbd3427118
diff --git a/dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild b/dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild
index 049701ee3106..e4f2fb196f08 100644
--- a/dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild
+++ b/dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild
@@ -13,9 +13,8 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 
-DEPEND="dev-lang/ocaml:0/4.05"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:0/4.05"
+DEPEND="${RDEPEND}
 	dev-ml/cppo"
 
 src_install() {
diff --git a/dev-ml/merlin-extend/merlin-extend-0.6.ebuild b/dev-ml/merlin-extend/merlin-extend-0.6.ebuild
index d1ed1442d2d0..8643e7059fd7 100644
--- a/dev-ml/merlin-extend/merlin-extend-0.6.ebuild
+++ b/dev-ml/merlin-extend/merlin-extend-0.6.ebuild
@@ -13,9 +13,8 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 
-DEPEND="dev-lang/ocaml:="
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+RDEPEND="dev-lang/ocaml:="
+DEPEND="${RDEPEND}
 	dev-ml/cppo"
 
 src_install() {
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index f8016977d04f..13a5c5bd3418 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,6 +1,12 @@
 AUX 50merlin-gentoo.el 195 BLAKE2B a5bcca9e3af1810b18337680b4878dcfc41296b98a4b949293367935a741b0ab8dcf9f40cfbab2042fc4afd95f09b3ac9980f7daa371dab93fe39cf56245c111 SHA512 7dfbbccee288d91c010cf0bd18d490ac2fdb8c5a2f6cb5ae55697f196ba9e4965ed6c0b0140aadc0685a3bfde58a4b30ca85658876c22c9f91b456aa1753ba4b
 DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 6fa55423df7ae8f7a8056e90be630f148dd101194de1921605843caf805bd6c9694fa3fe5b8c2f8eff5d57d7d0e9d8653036b6165a49af655158925c7af87d2f SHA512 8225366ebf27ca656ca89fe00d5aec581487ae332aeab81568e7606eaf575648a7614d4d2de8e0757a4e69c6f4014fefa4574c95da13d42acb310c9dd58a468a
 DIST merlin-4.1.tar.gz 2136082 BLAKE2B 3e7e1996611f0cefb3a33b2a78cd36b6e8b84d48bc48f46c45ba340c4be1b93b4a1876f8f4192e911c1c384c416ad7502ba3c7a2abb72eff01215f9fb26bfaf0 SHA512 f0f3ada007f8214b97a8557bddca87eded48ee01a8bb88aba6476e52881ead52d9f47e2666a9292b5c6a490e4cfdc7d8bb322e8489f78eaac7b0f80b6d1e87bc
+DIST merlin-4.2-411.tar.gz 1601588 BLAKE2B 348b48ccf2b209bb511450e4ba46ceb3639b1a5facd70bec4519369907e162e95575fa101aa1b79c56719927272a4feebf981692ea2bcb2299fc2c284833b1be SHA512 9ca8d3690621019b8213abcc1a32e1d754b93849f0bbd79bcab3a14915acc295eb60a7b68e997a75e777daaef83d5ca3e81944b7baf352dc4cce8480905ea2d7
+DIST merlin-4.2-ocaml-4.12.patch.gz 816740 BLAKE2B d96ab1059683799312fc8828e8a46bccaae9279b6d711eb7ed47b6e8631d80e09f236bf6f726bafb37ae243457df3220a9948f4f6de6da20c2a6c66a1edb8f3f SHA512 4eef08ac8a7f240596395d8460a4d3195c1483fb686aa7d5231d7ea28c9c6996196890f76feae951d2539ac7abc1f16ee3c453031e6d19af554ff27d67a63229
+DIST merlin-4.3.1-411.tar.gz 1626551 BLAKE2B c4340ff9b50c72208c4cb13d13e26f36463d7c257530d183a293eaaf3d86aaa71745d8154bb5c0e2149003b3cbe5a127fb6187e7bb7fa7024924fd239f981cfc SHA512 bcbba0c1bb1c84eef7becc4a537e1c2a4bd370a33333bfba1029c82fa8b1d9cdf367f98779fe3329286e418c41b06b49bfe796f5cf8058bcd189b4f33aad1abf
+DIST merlin-4.3.1-ocaml-4.12.patch.gz 818559 BLAKE2B accf65bd5d5798bafe2be022d685da8f829aa9a9c98784420d8a62646d80ab73d1e189e3601266e09eebd4732ae241e8d11dc9663adac3b03a555db663a6d649 SHA512 8823b6e30e49ab3cf35a78063066f01aa7dcbc9174d45b0fed94a3f50e388c35e7ac810c5548c57d7bcf9304b045c483080496865b011269913120a5509a1149
 EBUILD merlin-3.4.2-r1.ebuild 1265 BLAKE2B a12e5b68da2899f57ecb73de9ff4558a2069fef7056f7a6775616801bd809d058e8c457afe7c659e16f31861786311871860ce2ef58460f50a738939ffab9750 SHA512 355c89138e3838407d9f05d1d393411307700deb38fca7f17efb6cce553f2a4d159fb2b13568704bca3c655dfb975e50afa52f314f7c8815370f3ebf1cf74188
 EBUILD merlin-4.1-r2.ebuild 1407 BLAKE2B 31dca48e94c00c377212114a39879922ff4bcd5ed5069a13a3a760f0a05fc92dc2c2d7f89fc73a9e489185cba0e4e36b4ed53f46f9f0d1a49e40f1b6339cff9c SHA512 0fcc8a797b5e2cdcffab5276d403add0cfe341cc6d9571730b74ae1d01e833c5227d7eb1a4443853d65836e6ea8e1c2ec60e23f790fbeda5c3b2a144f0f06e02
+EBUILD merlin-4.2.ebuild 1625 BLAKE2B f684cb80ec4dc21471f3e80bc526c1d7b7241ce259230318e25cdda710b50ad6f58ce6485642a867889f1d4b34f60a102bd614f548b903024cb99e58df6b4fbe SHA512 2682e471f6e59d12ca02909c15aa9855a65d8aad4d91d001b34980bcc147dc3a1a641ee91262aa577ae1ef8616ef3feda6f00c0a568f667dde47a32bf09a037f
+EBUILD merlin-4.3.1.ebuild 1644 BLAKE2B 504f8244a7f427889b8bbb1ffa3e8621762c6295f8b4e5a58a26cf762c251d3a839116dae269e47aeea3788ebfef98641f54525b469c45c596d955141347685a SHA512 ad6f2b092e00f0be513a03652371bbb58e855e084240ff2ed0d672e9f70260b921570aa4d59ad1a8289710ed05777710d4cf4c108ad3c3c592e2440b80b992a4
 MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
diff --git a/dev-ml/merlin/merlin-4.2.ebuild b/dev-ml/merlin/merlin-4.2.ebuild
new file mode 100644
index 000000000000..ba04028ea42c
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}-411.tar.gz -> ${P}-411.tar.gz
+	https://dev.gentoo.org/~tupone/distfiles/${P}-ocaml-4.12.patch.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ml/csexp:=
+	dev-ml/yojson:=
+	dev-ml/menhir:=
+	|| (
+		dev-lang/ocaml:0/4.11
+		dev-lang/ocaml:0/4.12
+	)
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( app-misc/jq )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+S="${WORKDIR}"/${P}-411
+
+src_prepare() {
+	has_version "dev-lang/ocaml:0/4.12" && \
+		eapply "${WORKDIR}"/${P}-ocaml-4.12.patch
+	default
+
+	# Handle installation via the eclass
+	rm emacs/dune || die
+
+	# rm failing test
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+}
+
+src_compile() {
+	dune build @install
+
+	if use emacs ; then
+		# Build the emacs integration
+		cd emacs || die
+
+		# iedit isn't packaged yet
+		rm merlin-iedit.el || die
+
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		cd "${S}/emacs" || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-ml/merlin/merlin-4.3.1.ebuild b/dev-ml/merlin/merlin-4.3.1.ebuild
new file mode 100644
index 000000000000..d269247a3728
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.3.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}-411.tar.gz -> ${P}-411.tar.gz
+	https://dev.gentoo.org/~tupone/distfiles/${P}-ocaml-4.12.patch.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ml/csexp:=
+	dev-ml/yojson:=
+	dev-ml/menhir:=
+	>=dev-ml/dune-2.9
+	|| (
+		dev-lang/ocaml:0/4.11
+		dev-lang/ocaml:0/4.12
+	)
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( app-misc/jq )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+S="${WORKDIR}"/${P}-411
+
+src_prepare() {
+	has_version "dev-lang/ocaml:0/4.12" && \
+		eapply "${WORKDIR}"/${P}-ocaml-4.12.patch
+	default
+
+	# Handle installation via the eclass
+	rm emacs/dune || die
+
+	# rm failing test
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+}
+
+src_compile() {
+	dune build @install
+
+	if use emacs ; then
+		# Build the emacs integration
+		cd emacs || die
+
+		# iedit isn't packaged yet
+		rm merlin-iedit.el || die
+
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		cd "${S}/emacs" || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-ml/mtime/Manifest b/dev-ml/mtime/Manifest
index 6a68de0ab759..522b052b493a 100644
--- a/dev-ml/mtime/Manifest
+++ b/dev-ml/mtime/Manifest
@@ -1,5 +1,5 @@
 DIST mtime-1.1.0.tbz 15467 BLAKE2B 975fdb01c6a4806035a5fbc256d192d6c2f45bdfb750045293b10a732c5613108d9bce897d3c1be660af60d6e9bafbf299dedbc0d872d1c09f65f47b11c9a6b6 SHA512 8ed5dae589dd27fc6e748218a9d9fb9d7d954d231fc2100d61c1b336e0ed38a215bc608cdea9965547729177c78c868c1de6a5ceac6735686a3de1c4a791746c
 DIST mtime-1.2.0.tbz 16272 BLAKE2B 317201f8d5e7a55636e58748ffd269db5e88aed012e8dd7ed269d1f128f8d21ed0e707679b030b9c822bac98c9b76033e8d2402171c4ee758d8c936fbeee7ee9 SHA512 0f0ed220cd0f899643930814010f8592e1f47b6dc6c4dce8eebfb17a81b0abed093a3dbf9c02490af99bf81ea640372f73b4ab88fd8ef0e0c7c66920692a8778
 EBUILD mtime-1.1.0.ebuild 717 BLAKE2B d49774f2eb6d262680e3f0bd929ad61a91a16913864361d374188004c2ebd5c52ebefaae73d1b5a38c588a258fbd317f612f83392a32bce10b618ccd5c00d40b SHA512 03b1bcd56fa44c53c2e10967fa29a5211057dded1de5554db54cbed83a0dd8d3c9202d8dcddc157f1cdfaf494c9043e628e3777023ffd866b2151948ab12fd10
-EBUILD mtime-1.2.0.ebuild 723 BLAKE2B 3da03fa3bd6a6ddc6621e6ed26cc9cc54e55488ad504b81d5c38b38f68e991631b95aeb8dcd2b60892c729a849fa4a1e0e3fb349d8eaa0e2cafe2a231cac88a0 SHA512 22c755c8c00adac4711d1fecfeb3410688d2ecc022f46f696fc2c711e1f84a0558bb73683116a99f62d880f684895bf33a7d0389bc1260dce2fdbb880bfd7a65
+EBUILD mtime-1.2.0.ebuild 717 BLAKE2B d49774f2eb6d262680e3f0bd929ad61a91a16913864361d374188004c2ebd5c52ebefaae73d1b5a38c588a258fbd317f612f83392a32bce10b618ccd5c00d40b SHA512 03b1bcd56fa44c53c2e10967fa29a5211057dded1de5554db54cbed83a0dd8d3c9202d8dcddc157f1cdfaf494c9043e628e3777023ffd866b2151948ab12fd10
 MISC metadata.xml 312 BLAKE2B aad4e2756300a7fdc494215d874c8a754ddee0f94fb24788b8b7ba17d0062f266790d8bc74954c7c21ed481782ed9ddb2b007284266f92f707078a7466f961dd SHA512 aabba72b993e6d70b4d1d1ef3eba7d8adb37ace4afc51c4f9a067f6176bd525716118d225518b00ddc28aa31150b4c558b64d1a43b3a3db2319e02f03afef338
diff --git a/dev-ml/mtime/mtime-1.2.0.ebuild b/dev-ml/mtime/mtime-1.2.0.ebuild
index a6d491ea6add..4ca1ab377ca3 100644
--- a/dev-ml/mtime/mtime-1.2.0.ebuild
+++ b/dev-ml/mtime/mtime-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/mtime/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ocaml-base64/Manifest b/dev-ml/ocaml-base64/Manifest
index 6c16c6489e2f..090743a21770 100644
--- a/dev-ml/ocaml-base64/Manifest
+++ b/dev-ml/ocaml-base64/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-base64-3.5.0.tar.gz 18888 BLAKE2B e35d6331f163a066169455ea3dac304cedd7ca47fac0a2cbda26b8bd9620b4e49e144d5a06a8a2c6085501e531b2be98f6b24002880d83d6d57025ee055e0887 SHA512 a3886701943a9b165a74e45f66c3d8279b381927774217f5e042494811bc17a08f8933292335d4b76f01c6b1d3c496b4cfca650faa5848ddbf6150ac87386038
-EBUILD ocaml-base64-3.5.0.ebuild 530 BLAKE2B 70026070d451ddf36d7676eef873ec852a5ef0c762137a99ace24ded245dee8626821c936d8be56cc66bc374cba1cbe8d297dcb9a27471ef5ea564af9d35bfea SHA512 642d0c02d40dd51cd711f9c970856fef55cfb68143f326ca20c6ac21b3438ac6304529c8cd271fd92efcf4a35535d0bc223fac4fa4924b460ba25f66b0790d32
+EBUILD ocaml-base64-3.5.0.ebuild 529 BLAKE2B 20e5049fe3d970c7f335c94d5fa049520fa74f333bf3a6463f872802da7957587d4c0cfa8bff045fe592340e603047388fe6d7a6440042f432fb958a9f9275ce SHA512 2e63e3bcd4557e8aba437eeef19d90c5b1db2c82113a29dda5ffebf6954ff9eacd74ee8a407bccb37caa0d1902ced08f63609038dbb9d9beb61ef7e6e201f945
 MISC metadata.xml 327 BLAKE2B 8c6793a0aedb17700d928b0c30d92298db13be50e6b7f520a7838fd76f4331c28a1787585cbc13999c125d39dd49698a3adab5b2822e2a7fe3b7204dc5f224f6 SHA512 3c806541652650a16615df0a83510a97f82ab3eb3208b47f341842ffbbd16984660b22d99c678896eb82e0c278e8a82824d17574ed4b7cf31291793d1bbbb78b
diff --git a/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild b/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
index 389d8b0497a3..8cd94a37b883 100644
--- a/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
+++ b/dev-ml/ocaml-base64/ocaml-base64-3.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mirage/ocaml-base64/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ocaml-compiler-libs/Manifest b/dev-ml/ocaml-compiler-libs/Manifest
index 0d2f117680ff..67fc6e2fc9f3 100644
--- a/dev-ml/ocaml-compiler-libs/Manifest
+++ b/dev-ml/ocaml-compiler-libs/Manifest
@@ -1,3 +1,5 @@
 DIST ocaml-compiler-libs-0.12.3.tar.gz 4982 BLAKE2B 83432cbb2707964f025b294a84cdcce77137156e409d85ce8615dd6e9a26ad085cd5de178ebeb7520cd95b19a15b3cfbf7ef9567d165b55e07850a231b68371c SHA512 748ae11fe4cedb12d153ef2e712a9899f6a7ab4a35ddb7c95c0ae25af979c3edf274046745dddb2253fc06be41d5b0029f11a5a823a17d1ee680ffb29c4bdc89
-EBUILD ocaml-compiler-libs-0.12.3.ebuild 473 BLAKE2B ce4a65bac57a4ff76e7fe11e70f3262f649583a0f15bd6bef73fc4459e3f35d45e664ec0b7bd8b9511a93f5e24fb61c2f4bfa277f51b7369f40170e345ca655b SHA512 3889faea6798a6e3849747a6f2255acbc400dabb2bfb30a41cb77c9da49280ce67b1c7876102c1f7fbbb17c1959787c8184b3707f48ab1830906a74344de2616
+DIST ocaml-compiler-libs-0.12.4.tar.gz 5435 BLAKE2B 2c7b3f79315945d094dd4102da748dda55265bdd36753606ec03eef6a39eb385b84e7bfd0f43a04583271bf7c53b15481e9dcbb48c362d472bb3f740ec48853a SHA512 cf08e8d4bf25fff26a16a05036f08247176f4845d9d9ada85944c3fa89b6df9a5092d7a1025415a3b2ce00dd45b544cc82247648cf3952be2304e5d9ebab121d
+EBUILD ocaml-compiler-libs-0.12.3.ebuild 466 BLAKE2B fed250997f42d537a4be8c32f2d65e99b78c1adb30941e8917f78e49cb1245523ab0231b86f11e1e407f049fb6ece12884f6c39b4e7373bae709b39fb4aa86a9 SHA512 0591fb26e0e018b5f202b586c92c1f2274f2c57490e8dcdea34cb0d78618d44a9e1f4cf6a6588bc2bfb97cee3100e8b3e2b4e38866d953e7fa169f1d49f54529
+EBUILD ocaml-compiler-libs-0.12.4.ebuild 472 BLAKE2B 0c8b133a8ed1a6b0ebf203e5baa3e2b94e1010ff42e023a1fb421a34ea53a3331949444982a8bcb9e25d150dcb75b97d0c49df2214a0afffde34669f90f6bd20 SHA512 d5413ba80a4b9d95bf89dfb34ef69b319d763e525d75eb8dd058cdf36188c18a5e0cf125cad5865421ce3ffc12772fb58659e01db7380fb3582f553e3900d4e6
 MISC metadata.xml 340 BLAKE2B 1aa54d3afdff85b09abb144e98e91f5b87cf2cc42e915694cb61a2fe2676969b76eeaddef4f6c2821b9415f8a655e2fe30a2e68cef3460ad9b75e21311fa8ae2 SHA512 32442d765b80b2cf543decc9246fd4a2b44f4a8353e301cc958570757aa9f896edbc2ca6806e05d2c3e50893eb8570a5b4366bd2a83c5718dca79e2a3120f75e
diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild
index ce40ed8ba22c..345396f5fa7c 100644
--- a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild
+++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Repackage the OCaml compiler libs so they do not expose everything
 HOMEPAGE="https://github.com/janestreet/ocaml-compiler-libs"
 SRC_URI="https://github.com/janestreet/ocaml-compiler-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild
new file mode 100644
index 000000000000..e7afbbcd5579
--- /dev/null
+++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Repackage the OCaml compiler libs so they do not expose everything at toplevel"
+HOMEPAGE="https://github.com/janestreet/ocaml-compiler-libs"
+SRC_URI="https://github.com/janestreet/ocaml-compiler-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index fc928cd8320d..89c34d13e36d 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -1,5 +1,5 @@
 DIST ocaml-ctypes-0.17.1.tar.gz 208101 BLAKE2B b9fe6632058a670c988ba9f1ae81b75aa5373de7231cef04d5e2ede61a44cbaa0324c04197a0a202847599a9bbe7dccd18fd3279f3f351493aaec4959caf3ada SHA512 1e197009f7e6b29b43944f757e987934337ebfa11bb2ff2ca8ba3ebc607e37cf1259d07a90d7faf4b91b49ee20d5c65357ad305f34ada0a8d336a3904233150e
 DIST ocaml-ctypes-0.19.1.tar.gz 206762 BLAKE2B 29b4636e711b9b3ecf3de5d66b796d4d8ddf1109fd7b065666577ce9412e0ef3712f704729dac3b9467ac7ace8f501b90bfc1dc82b86dbe1668e5d13be46741f SHA512 cbf422a2c457b215815a04122d0522ed0f274c5927cecd25951472de6cc6fcd1151b67f95d6bbfeeb3b5f15a9fe9bdedb8861e77bd0de9902418962065e4dfc0
 EBUILD ocaml-ctypes-0.17.1-r1.ebuild 800 BLAKE2B 4df19810dd960c6d51525dde9dc2b374e7ffed06102bdb6622c847b621e699caba711e3b1ca06ea4daeeb87fb7ec05c0c3a41c8b58120ce658633ffeacd8fd09 SHA512 2239d8cef4ce0c401be0422dd8daf73de29322228ad7764c5d0e2d558bdbfc65d77728a97ff2a7987bb502a45ba8774108ec7f18f247d8dd31d22af4068b4786
-EBUILD ocaml-ctypes-0.19.1.ebuild 822 BLAKE2B 3680401b400804b3f3cb891aaacab783643d0c3e1473de0634c29ca4330af45f14d7ba20aeeddac6f9314fd9127597c16acdd0dc4522ddafec0b1edc8f8d6abd SHA512 2e7479c1fb7808421f3823f8623e15777bb116cf6a560ac0b5db338289e456a608f843566bb5dccc61de551d73bfb8ff474840aed11853a3cc431ae2e399671f
+EBUILD ocaml-ctypes-0.19.1.ebuild 829 BLAKE2B ee4443cdae4266ec868c203cf98a9361523dbeed0dd6c1c4dc42778b62461d3f725a37209d7dac34c578a646a33e6f8c45c98e1c3b51f87468bb6b5e38d915db SHA512 8ff2dbf4a3cf2ed89b9e236169f6f61ea2b25a52ebeabc4465a2cb3de73379cae000808c29f7b9b357400cc3a2ea57a53a539ca1bf9ba44502deda8121e4861c
 MISC metadata.xml 332 BLAKE2B 96f7e364efba1f351c647a1c929d7f945badd062b9b6b85107f2df8638b21cad9ca52457e58ab7e13d203817baef5644d752e7d35703f78672cf91173abcb0bd SHA512 f982ae0f1c07b31bba3df030e972c88621521f7c5c205b9b31e5385395558f0471ad31dd612e247190df7b6663e8180ec1e525a15c24b0c2fa4d0823e4ed052e
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
index 7bdbd62f4abd..805f10af8954 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.19.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ocaml-migrate-parsetree/Manifest b/dev-ml/ocaml-migrate-parsetree/Manifest
index 729a08ba3edc..2e685e220340 100644
--- a/dev-ml/ocaml-migrate-parsetree/Manifest
+++ b/dev-ml/ocaml-migrate-parsetree/Manifest
@@ -3,5 +3,5 @@ DIST ocaml-migrate-parsetree-2.1.0.tar.gz 169358 BLAKE2B 072ba6e1a879d5e308e7b40
 DIST ocaml-migrate-parsetree-2.2.0.tar.gz 188265 BLAKE2B a551ab1abd9db751d5300cd6c570e2072fa8d242c6a58c9b84387b177211081f6747526ae787ad51817bd63162c3fed61cbd1e3af083a49a524c0e38c69546e1 SHA512 7c1eec4b1d66d6d7df685684b054d8e98de6d4bafb6601116affc9f05fa89fb098824005891f0002e12c2d83ade734cffde2070792db8c9bc2d79825b86b45c1
 EBUILD ocaml-migrate-parsetree-1.8.0.ebuild 559 BLAKE2B 90ed2c07d5c9aa5b3050545dbd0c2544ce622a24e50f53f3f2f6e13120767fe058bc29f283e6928b99fe615c859a43f6627e3c116a2883190053f8f688da16fd SHA512 10a4625b8238d3ee6a628bebd28386aaa3a228bf83f472062056c082d3f38e6ca884a8839deda917f8782db86a42f661a95ac9fac3f7d0d3ebb1d03f20156aa8
 EBUILD ocaml-migrate-parsetree-2.1.0.ebuild 518 BLAKE2B 9f1a41716bcc98179981cee1b9d64da9b30c2177bd9e3aaf5350918929ab853a1755ca451e53495c61f7ec58c83662642ec7dd61aa4c593f63980e7981761deb SHA512 10c31cbd85fd0e291182b42a540e5a14edfc0930f6d9615a79498c9572045871149f8eaa89d9f722529de471c17e28de7065ea4036013227179b5e311d030974
-EBUILD ocaml-migrate-parsetree-2.2.0.ebuild 524 BLAKE2B b233a05a2876dbeac640b5dab4f417937cfd08a7863eecf1153d6401828595b48ca02bc861fd990f13c1d5e1f10305cd6a594f4d850ef54d24bca526f8d4d124 SHA512 34ee9d90eb24436c56f77d800ffb177905f8184b27fc0d2b063cc32e79d2e287ce4190e78153bf6afe3a544ba2f07e7963c49b786f4e6cd2c865d3c57732327d
+EBUILD ocaml-migrate-parsetree-2.2.0.ebuild 554 BLAKE2B e8df8edd0f07020467488ea8e69a453c0a2a52fda322b1ab7435da0002d05357195bcd3d22682cfab4a741e26258584b27102b5afd4134c11487103df465f590 SHA512 23538d9bf5159eb1d0034b7c6bfa7f66536d84c6477f9ac72731f45c336dad44e7cbfbb1f3197cd91758e1124f12ad45e7a1c085d56b127d3b8a1c7622679ff6
 MISC metadata.xml 436 BLAKE2B ec12ef5053e8fd2d654d38ca5b81823eed65bde5ae354c27cb166834da0dd0e34a4e038d1912cc9d6653b14cff9cb06d6a3bec4388b6d4d3a96cdc20faec3efa SHA512 99bc47f7b568fc287370b85da88f4f57630844ad50e2085a5f6d6fe17d1707ace3843751b07c061a80076661edcfbfa3714eaa248009b9562e60a591b0047774
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.2.0.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.2.0.ebuild
index 15c2c38d9b40..ae708d50d3c2 100644
--- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.2.0.ebuild
+++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.2.0.ebuild
@@ -11,8 +11,9 @@ SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test ) strip"
 
 DEPEND="test? ( dev-ml/cinaps )"
+BDEPEND=">=dev-ml/dune-2.3"
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index 9449d630c6b8..ebae5b7b2e05 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -1,5 +1,5 @@
 DIST ocamlnet-4.1.8.tar.gz 4620065 BLAKE2B 8f84ce4d79de5f4a1f26d4e45f68327042b0adc22717e56eeaca03ee6371e9251c01e8736d3afe5c00a1c65ef0286d56a04c57e80377402bb19ff87955ae98d9 SHA512 e238235968b9546c60568a38e68e354378d30e7137973332dcb10da21fa775ab7b367889fc51f5bd7cb00e51582834cafe2a0c4706b0bc77a44d4571a6f22815
 DIST ocamlnet-4.1.9.tar.gz 4628747 BLAKE2B 40e41edee79ba5957d297506cdf1b907adc8d44a33f25f25b8b1a18487f5ec379fb328c86d6283f7da7cedd8d35b80809e1cd5224522d51afa3e5f2402ac8663 SHA512 a251724deb35e756c81d2d3ac836d413b659acdce6c0acf479a4fca48934ab62ad399a884197d00dbb7e7558132a56be1c8efd553c0a644d329418272f809a46
 EBUILD ocamlnet-4.1.8-r1.ebuild 1559 BLAKE2B 5f9a1839a3c3248f00250000d28770a2e60667a36b221b81c0fe37c8491f3089266aaad18464656ea6878965615660784f69351e6ff3f6abb0ad6dfb82494360 SHA512 3f7353bfd894c9acf9b9949fc0a2b9e153ab4c013a67c182771b914cb1750ea2f02251a184fe6ff3cdcacf8df2fb760e61982940c5877ec293b5f1307cef949c
-EBUILD ocamlnet-4.1.9.ebuild 1562 BLAKE2B 9c047b948a3b94cc6ee31d6cfa3693bdb882507c134d010e8d7a1b56e958f3eed0a20d2ef6825e7580fae87313e73f9bda17ad7b5a953ba3cd7b1f6623d43121 SHA512 d7ece3bdca5f2c7206f164020d26f1a724b01ebbc70f003cbff92cb1f1a626598bc656cb6e79ec928a81234f63e9ba74b4a234fe307a6b2680706d2172504573
+EBUILD ocamlnet-4.1.9.ebuild 1559 BLAKE2B 5f9a1839a3c3248f00250000d28770a2e60667a36b221b81c0fe37c8491f3089266aaad18464656ea6878965615660784f69351e6ff3f6abb0ad6dfb82494360 SHA512 3f7353bfd894c9acf9b9949fc0a2b9e153ab4c013a67c182771b914cb1750ea2f02251a184fe6ff3cdcacf8df2fb760e61982940c5877ec293b5f1307cef949c
 MISC metadata.xml 406 BLAKE2B 765eb184895dcb4d3769fc590facc0435ca84a33a1954b8c33b2f1f40f775fd165aa7e1d86b3f874a8c83c8020c094f73d3174d46d94c1c455d54069ff431414 SHA512 911bd8206d13c92e78ceb3ea00c71ddebc1ab83459bd2d209f2209b81e7952b69ee6ee53003806c8c674dd083c300cd0b243ccfc7449c2a8678a3d459c434879
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild
index c0ee784e835e..8976098b07bc 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.9.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB GPL-2+"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="kerberos tk httpd +ocamlopt +pcre ssl zip"
 RESTRICT="installsources strip"
 
diff --git a/dev-ml/ocamlweb/Manifest b/dev-ml/ocamlweb/Manifest
index 17c53da3e38f..023f545e54b6 100644
--- a/dev-ml/ocamlweb/Manifest
+++ b/dev-ml/ocamlweb/Manifest
@@ -1,5 +1,5 @@
 AUX ocamlweb-1.41-ocaml-4.08.0.patch 1798 BLAKE2B 3bd06439f093dd25195070b41bfc59af9f0b54ad5d6dd0a705926961a1e60f49a64b62d11ffaa56f40bcd9cb0260344a8cd66f1c9b713b7238a2a83d710e06e5 SHA512 b9019c0377e24f719c086ce3ecc1117a2a96375f608d63a5267e0e6c466e60d43db2a714659201d2c74da7c0d7499c8c8982e31f5f87d7f6229a77f7ceb3dadf
 AUX ocamlweb-1.41-strip.patch 705 BLAKE2B 207e1771412bdba7985cebcb349e5c8fca09218dcee0ec78183bcb3160dc039e7ea7f81fbbdc2ef80dda05c1130faa24a3d09f4546262c4dbb832ed2b532b982 SHA512 54c211cb3b78b04bd4212acee0065e3c8614729a841691e1e29b8c553b73df20114bfcee4191ea519597c37a3c7344651647263fe6463829b780d7cc17710491
 DIST ocamlweb-1.41.tar.gz 141844 BLAKE2B b89b20bdc8b99d34069b2e32a6bd8c9684e294fba667a4b74080b34f37c6d90432c61e71e27f4f1772cda8a26891655bd99a21defa584f4a1c68ae1e0d58d454 SHA512 7a6403f8b0de3feeef9657e8aff10e6f1fe29edc400ce3f11c6435d6350314423fb74e192e4275a9ad47170019d6a960daf74f245539f0f3f2a6072cc7195442
-EBUILD ocamlweb-1.41.ebuild 830 BLAKE2B fad80e14433e9f7310c14b5d38a9f28fa8d693965edb7f8a44b1b64d8fe9c3724ca5c28bcbd68a906b563b6fad3278bf02f3addc35fd6a3c7d16c4eefd135fda SHA512 ff57843464c013acc18c0e1d353885cfaf2ed6d2560123925085e86b8acac2e0faee8b204fac992c5c09d6e541987d9592ee378d873a779a4a0be63b58635608
+EBUILD ocamlweb-1.41-r1.ebuild 849 BLAKE2B cb2cfa0d5669fd58079fde7d8a90cd056291f39eb09567786d233a2e01228afe65de9f04add5e1147baaab657f0f60a549c97c25f0ac4aa159ccb2f2f05197c1 SHA512 b14733f9e3c1caa81373caaed50ff68281eaba02fea182f9224d36457ee7f4fef28a8d09eba71d2c2bdc33b4c438ab93c1767e4e95b65c9dae3a640bba3fc4c1
 MISC metadata.xml 338 BLAKE2B f947fa0825c1a3fd959515164da36ffc9694c570ed6eb6eef8686fc24b4582ee88ecb7304507c79cf2733fb77ae3570468ec8da886367d79721c81f148931833 SHA512 9d052ada92f441fa4908f4ec9a2561f7276872281ffa65f0ad92c8d0f7c15aeea11d6c887d4af7535d7d72bce3dec8f12622aee5eb9a79e510e8baaa208a54cd
diff --git a/dev-ml/ocamlweb/ocamlweb-1.41-r1.ebuild b/dev-ml/ocamlweb/ocamlweb-1.41-r1.ebuild
new file mode 100644
index 000000000000..0e13362dc9ee
--- /dev/null
+++ b/dev-ml/ocamlweb/ocamlweb-1.41-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit latex-package
+
+DESCRIPTION="O'Caml literate programming tool"
+HOMEPAGE="https://www.lri.fr/~filliatr/ocamlweb/"
+SRC_URI="https://www.lri.fr/~filliatr/ftp/ocamlweb/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-lang/ocaml-4.08.0:=
+	virtual/latex-base
+	dev-texlive/texlive-latexextra"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-tex/hevea )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.41-strip.patch"
+	"${FILESDIR}/${PN}-1.41-ocaml-4.08.0.patch"
+)
+
+QA_FLAGS_IGNORED=/usr/bin/ocamlweb
+
+src_compile() {
+	default
+}
+
+src_install() {
+	emake UPDATETEX="" prefix="${D}/usr" MANDIR="${D}/usr/share/man" BASETEXDIR="${D}/${TEXMF}" install
+	dodoc README CHANGES
+}
diff --git a/dev-ml/ocamlweb/ocamlweb-1.41.ebuild b/dev-ml/ocamlweb/ocamlweb-1.41.ebuild
deleted file mode 100644
index 1cd6b57b27bb..000000000000
--- a/dev-ml/ocamlweb/ocamlweb-1.41.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit latex-package
-
-DESCRIPTION="O'Caml literate programming tool"
-HOMEPAGE="https://www.lri.fr/~filliatr/ocamlweb/"
-SRC_URI="https://www.lri.fr/~filliatr/ftp/ocamlweb/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-lang/ocaml-4.08.0:=
-	virtual/latex-base
-	dev-texlive/texlive-latexextra"
-BDEPEND="test? ( dev-tex/hevea )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.41-strip.patch"
-	"${FILESDIR}/${PN}-1.41-ocaml-4.08.0.patch"
-	)
-
-QA_FLAGS_IGNORED=/usr/bin/ocamlweb
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake UPDATETEX="" prefix="${D}/usr" MANDIR="${D}/usr/share/man" BASETEXDIR="${D}/${TEXMF}" install
-	dodoc README CHANGES
-}
diff --git a/dev-ml/opam-file-format/Manifest b/dev-ml/opam-file-format/Manifest
index b9e8a40c8eba..ea1cb59856e0 100644
--- a/dev-ml/opam-file-format/Manifest
+++ b/dev-ml/opam-file-format/Manifest
@@ -3,5 +3,5 @@ DIST opam-file-format-2.1.2.tar.gz 32120 BLAKE2B 3756ae2e2ad8e60d9611f1879ee0717
 DIST opam-file-format-2.1.3.tar.gz 36255 BLAKE2B eabd343d1ebb5708e57a125cf6f15105e263d0cc0885717df58249313de77cf1063efa2fc0f9b92d67a83649f3bdd8fa65c13077ca4b3814182ec750701570a1 SHA512 90da53a2b19eb97c17ec71d3ac00969863ef3458f421189413b3ec2d96f8822da9fba51ef95f55064bbb17f1729104a1fe4fed1d61d5006568b53165f0c6931f
 EBUILD opam-file-format-2.1.0.ebuild 722 BLAKE2B 3f6748e96bc9e6c19827dd03e03869e9ae1b8e95a180bdc050aa75ad7ffe27d75cbca38345455bf6899b5b5797b045a781ce276165a643d79f12e2cebcab7208 SHA512 2ef42c81d573649da5690120aad105e178d89dcb8cae95c49f99d2c3452348f110ef0bad4563ad9f05c9d168f7d19f62155afb90b8d8b99c9110b7401bedc00c
 EBUILD opam-file-format-2.1.2.ebuild 572 BLAKE2B 3e889c1cd89dee0649cfa12fe06e23a2e97c3c77ed80391d931055593d93973c848e0b258e5f24665e1e48c942c22b88ad58528da2cf87baaff84c4a11ab3eb7 SHA512 a08f520e8296b67363d6f609cb78e17193d77b7ca3febe9caae653983404d81dd3cd3197bd097a9230f4a18a524fb0f64a26dad1a773fff7ff83464e64342486
-EBUILD opam-file-format-2.1.3.ebuild 578 BLAKE2B bb952e031263e0da424399f4e7d0a2adc0db94c9715fd77f6fb635dc2467fd02c4cf24a55ee6eac8cb35c4b16513975d71c1ce6c82878fd3173c8ea55f5fbcc1 SHA512 518e0af5afbc7526d57048f553e59e5b5ee91aabb37800c218cc472c43ff7e2a2a0bd533a47c29f84335f2b57601f048d80a4cf084961c5c3c13e75919a9ba5a
+EBUILD opam-file-format-2.1.3.ebuild 573 BLAKE2B bd3752908350affce41b7045ef293a12f339aaa08088523f1ce54984685827041ec7d72f468d094de309aaaa534c98f3bf54951fefe95cbdabc85c7b28f617ea SHA512 2172a5b7b840e662d366264dd84f59929cedf41cf242f8c1fe305dc9c85cd042f3836537e41eb4e6a8534b6f5d1eacd9760a334fcb6be23213c0fda4820d710d
 MISC metadata.xml 425 BLAKE2B 25f90cb0096de48ad7397ad960e1b3ae342abeb784e62e9a878d960cb6300fef998a303d9db88a99aa435be856a25d2221dc4046ddf776f40a5c6bba29981770 SHA512 d6961adf7d8b4517b5e10a344c3a373d925c76cfca0d80c854ae00f40c812095f257c2eb55dd9ea5dcca327ecd3a2bba560f64cbc56d5b208ddda0b6fea4951f
diff --git a/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild
index fe3328205eeb..943ebfa49c02 100644
--- a/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild
+++ b/dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 6feaf42b8ea2..0789464efd1a 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -5,7 +5,7 @@ DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B c2ae06bdbbdbe9db270ec0027ec8d13a228f
 DIST opam-full-2.1.0.tar.gz 9136886 BLAKE2B 3d51159568b6e85834f70a3545fe37d82470d4253bf9db6fef32b4314fd0a82182737bba6be62a9dd04b6d8fb8d7468b2e23ac39fa475f467adfdb0ec8d52181 SHA512 2c4955e450cde7211dbab507cbdc5d6e67805353e384df525d77ebf5561d6a4de91f7e5691567b2dc61146fc29df6fa5dc8aa8562330a4746db3a52b7487811a
 EBUILD opam-installer-2.0.8-r1.ebuild 1029 BLAKE2B 53066e7d4fe28f77ae2cbc1a1eb3056a60d04ada7eb72c0589498815c8ad3937ef6335b73a675bcf7060c6bf85534b3b497b55ac782c1f7a0d3e32537c1489cd SHA512 df08f41985fd16842021dc0e5c8a361a1d8376d1b716f3fb2aff8bdc007ff311ba51844894325e76657a688a03021fe7360c9522ac6f41231ef499de214d469e
 EBUILD opam-installer-2.0.8-r2.ebuild 1014 BLAKE2B d5152345b50b7475a4f19f8e34bce269a8329e85ad7ca86f89373cc20f5ffc6e5e233c8ccf5247797fb86880a8bfd37005941e753b2bf6a06d3a7194462da18b SHA512 4d91c847eca096f95654cffa6c26701e1c4e65c1bf0e28c3eba3b01da9170071449a7e335954da270764581b4bc7a7dc1b0210d50e254bd22c9eeeef22f0223d
-EBUILD opam-installer-2.0.8-r3.ebuild 1188 BLAKE2B 6116289307046edd8627abb25a9d10a34bf07dca499c853f452a1d7b3a76a06545b0c30ca8fdeb9e5fdf1384b697a2764fb42be453310ecefdf370e8a3a71405 SHA512 33d7f0bf455b6366349d60119a4f2c96ba87e6da47b775ce154ed59652d4ae002b6ac00fa23c57a7984b17ffc8f9dd614549fc756b833cefe6d56c8bda5d9c7c
+EBUILD opam-installer-2.0.8-r3.ebuild 1187 BLAKE2B d18cdb65a28ed6043ad63c818ad7dfe9552f4d128353438ce9d6bcc2af16ccd89b5b6b6432ea46eee3216eac401f6c97df56067d95ce994ae8b8d93ca52d4a59 SHA512 bb8f6fa1251c10097d06443b866d139372fd2da2b0cbd5057c673d1507d451d13ca60677e0be7b92e546149d6843a27275159ec1a23d5a5fe785937e24e4ba4e
 EBUILD opam-installer-2.0.9.ebuild 1193 BLAKE2B 2146bb8d98820a6baeffb5ee098527ca75529e4fa8302efac24e455526242db224707dced11a2bad732da18db02e680d979518fb156e28974c4dac4ca833c909 SHA512 3572227ee5a0c0b89d4ed201da95d831056d5227673a5015bb4139fd08b2b5ff0e73a22c0e2e14fec989b18303222abf38ae7d78c7b7385f8e45c4420c9db299
 EBUILD opam-installer-2.1.0.ebuild 1025 BLAKE2B 4fcb445ca539b14a30c79788fbd7350eaf242fb8dace406f043d4db4adaf8bec51a1d72c3134dfab25e615501f5ea8c2e751ee1e00502b4adbeb22ac9048b97b SHA512 f237e7f35d2567d8bba39f9a281706a8060cfb2680be1ecad78094ace4ac14a4be5d65b5715c2f213b39335df7ddbb27f1b54c8da21864474624def819f5abcf
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
index 2f86f0c66750..919e02b41347 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 # Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
 PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index be2c60a102e0..4d0d0121c2b2 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1,7 +1,10 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
+DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
+DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
 EBUILD opam-2.0.8-r1.ebuild 818 BLAKE2B 2cdef3169d4c660daa501a449c0f204ae3bd12e8bd1a66cb4bde94ea4e523457fe952a61330cecbd1a59d14754d0e167efe453589387f9fe666b7804caa370f4 SHA512 7ebd4e81e160649198b792911d5f16bd4a7c001b60b2b4db3b8509caeb0d537c4114618d25b1ffbbd66c96f32373a7824b6530587ad8f9f4d1249de9400cf7d2
 EBUILD opam-2.0.8-r2.ebuild 958 BLAKE2B a29b001a98117c644dce3c731db62520631662fa9dc5b73ca247e1234dc2c7d95c0b2535fc2d4c186fadb0461cce62423fd1d434843527cf0b6f7a4ce4f79a96 SHA512 c8b808a8bee1947f8aaff9cb7204013c8686302ffa43e6390ed8096b515019b869aa14d86591117dff7f09896229996c544ce5abb8bccc03580b3b54b104de3f
-EBUILD opam-2.1.0.ebuild 963 BLAKE2B 3ba5f51f310eaa23515c561525215b2e21ce836d77aae765829a30b79c440d4910870171176e5460a8c6075e1c0f9e3bf699d5f9eefb2a80757a13ad18b5f6c1 SHA512 3b3e82b207f16807d1e266b5e1284622c5a8c58aad21dcd56664f053a84c4cae3029286c8ddf5c0082be13b8ba6bb43d6f7775d475be9c01b0002ea566a43e95
+EBUILD opam-2.0.9.ebuild 963 BLAKE2B 3ba5f51f310eaa23515c561525215b2e21ce836d77aae765829a30b79c440d4910870171176e5460a8c6075e1c0f9e3bf699d5f9eefb2a80757a13ad18b5f6c1 SHA512 3b3e82b207f16807d1e266b5e1284622c5a8c58aad21dcd56664f053a84c4cae3029286c8ddf5c0082be13b8ba6bb43d6f7775d475be9c01b0002ea566a43e95
+EBUILD opam-2.1.0.ebuild 949 BLAKE2B c3db9b32322ae6acb0dc76e22fd67eea01d2e03016b6bf8aa41223065dd18d5f00eeeb26b57f45d83f9836fe8da960db4177f244ea6b032b80f6353843125914 SHA512 0189369c5a3daf3f596cac822437c6edf71fa0c6a7257ef78f5ceb16a293902962d44cb51462550302b36aa64a94f2bf5a96905ef532296244f8c82931befe0e
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam/opam-2.0.9.ebuild b/dev-ml/opam/opam-2.0.9.ebuild
new file mode 100644
index 000000000000..e882aefd038f
--- /dev/null
+++ b/dev-ml/opam/opam-2.0.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A source-based package manager for OCaml"
+HOMEPAGE="http://opam.ocaml.org/"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/cmdliner:=
+	dev-ml/cudf:=
+	>=dev-ml/dose3-6.0:=
+	dev-ml/extlib:=
+	~dev-ml/opam-client-${PV}:=
+	dev-ml/opam-file-format:=
+	dev-ml/re:="
+DEPEND="${RDEPEND}"
+
+# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
+PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
+
+src_prepare() {
+	default
+
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam/opam-2.1.0.ebuild b/dev-ml/opam/opam-2.1.0.ebuild
index e882aefd038f..c123071f54ab 100644
--- a/dev-ml/opam/opam-2.1.0.ebuild
+++ b/dev-ml/opam/opam-2.1.0.ebuild
@@ -8,6 +8,7 @@ inherit dune
 DESCRIPTION="A source-based package manager for OCaml"
 HOMEPAGE="http://opam.ocaml.org/"
 SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
 S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1-with-linking-exception"
@@ -25,8 +26,7 @@ RDEPEND="
 	dev-ml/re:="
 DEPEND="${RDEPEND}"
 
-# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
-PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
+PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
 
 src_prepare() {
 	default
diff --git a/dev-ml/parsexp/Manifest b/dev-ml/parsexp/Manifest
index c444e991311e..871a29b96d9c 100644
--- a/dev-ml/parsexp/Manifest
+++ b/dev-ml/parsexp/Manifest
@@ -1,3 +1,5 @@
 DIST parsexp-0.14.0.tar.gz 48617 BLAKE2B eba36c17f08b59ed7601c4f9906e80de45e377d0134fdee30b5536c3d91af0cb45a1cdab90333498da8bf3fcf5e5bea16a8f734e7f1a92c9b865cd3136a668c2 SHA512 d9e9ea936dcf23d700e6ddd4153a2a96df6819094eaebe15d949c4569fa5125ab308af2c10f4ba2161610d8673eeb3928dd19c10a21974c140e4c89537a86575
-EBUILD parsexp-0.14.0.ebuild 466 BLAKE2B dff08580ce79deafaaf7d99149a07c0f3c5d3b8e7b59596b716af6ab95e31cffad0aeacc8a5739aa8655b6de62a12ba983ece9e650a45822daeea9b4ff53340d SHA512 24858538ec6fde8f7172a7564de4027688485ff54a9eba781a7fbda5dc26693116c4292c2ddf03153336e415158dc669defcc63e3c2efd4b86c7408901b177e4
+DIST parsexp-0.14.1.tar.gz 48617 BLAKE2B d491b8c28eb0a269985df107152b6239513fb9d59dc723c9692dd436883331ce23fdd714bc467b4fcdaba81baa2adb2421110e92fb5bd3f526437856f4edaa02 SHA512 c9d6a00dbe49272fa32ba3684249d5085482fe2024795391aa3605b21962e9d426535a46d7139b487332b86e05f042226dd1a8166d2a3cb9dcee9b4b06b81ab8
+EBUILD parsexp-0.14.0.ebuild 459 BLAKE2B 5dd52c6258dbe2468c62eca0b1d772ab918b27f2c4e4006398420e1df6748c071286b3fbd6887da9ee435c127ba72d10987ed4a8fdccaeb11261d9dec3f456ce SHA512 314891a056f7a279d681464296d3984f44c69602511fb4e3b77d682f64b6e5fabac678983b706a2e3ec796efe8899feb0d9be7bd6b06015a4d207d58a38f38ce
+EBUILD parsexp-0.14.1.ebuild 465 BLAKE2B ff208ddb76738d30053b4b7630877765c403cddce3626610542bb8264c599ba4cf24f8ea1fd81b8624967163cc464c86e390dc88b560230f1b7063282137069e SHA512 c0b888ca7e41918180566bfcbaf8c7e308ca45dd5a15148e0aad3302a33ee2f3a7e7d1b6863128980309c5b518066338e3bec195e199818b96f0b7d6bc65fcd2
 MISC metadata.xml 328 BLAKE2B 2223ef57e895aa54de9a3c2f29df0c228bcfe6b10b9e9f7524ef153f459e07cd8020d0f6d42fa7ccfde38d06773567bcc8864ab8961793cad9c1f4cfb5b935f1 SHA512 fafdaf40f0fd9876d984a7d0c9fb42d434c511f4428111459cb618ba0210f84eee960b7abb1f3b36ec446e2a3703e21429027e3534937fe074b11fef8de62b94
diff --git a/dev-ml/parsexp/parsexp-0.14.0.ebuild b/dev-ml/parsexp/parsexp-0.14.0.ebuild
index fef7fd77106b..f8584c55d192 100644
--- a/dev-ml/parsexp/parsexp-0.14.0.ebuild
+++ b/dev-ml/parsexp/parsexp-0.14.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="S-expression parsing library"
 HOMEPAGE="https://github.com/janestreet/parsexp"
 SRC_URI="https://github.com/janestreet/parsexp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
diff --git a/dev-ml/parsexp/parsexp-0.14.1.ebuild b/dev-ml/parsexp/parsexp-0.14.1.ebuild
new file mode 100644
index 000000000000..810e47fb94a5
--- /dev/null
+++ b/dev-ml/parsexp/parsexp-0.14.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="S-expression parsing library"
+HOMEPAGE="https://github.com/janestreet/parsexp"
+SRC_URI="https://github.com/janestreet/parsexp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/sexplib0:=
+	dev-ml/base:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest
index 7982e05d585d..d8e169606155 100644
--- a/dev-ml/pcre-ocaml/Manifest
+++ b/dev-ml/pcre-ocaml/Manifest
@@ -1,3 +1,3 @@
 DIST pcre-ocaml-7.4.6.tbz 41027 BLAKE2B 1faecd96cb6f7af248e8ace7409a49131f5c654320f8ac432fd4aff602d0c4187733419e9cc73ca52cf0a3e5b725afa9357fe9ec191bf1ca42d4dc47a36e45b7 SHA512 a356c78dc19d3b3741d1fa0277c4fb0cb545f12499165526fae80a0ff8a7b1f1e6e5e916b16f8336bcec3661de811686b814fe4afc677965fec7a63d4fc53b1f
-EBUILD pcre-ocaml-7.4.6-r1.ebuild 717 BLAKE2B 0bd70c8f70604015568c5a5d7a9ba819836874561b8e3d0f9574849e03b4d667f2a5aa25b233fb3958a8b317f8be91ddb200c1a5ff6bb23d23dc13ed0591073b SHA512 f8bf6b2ef96cd1c7c528cf2939cc7e4a5d6b601f5726d0f8109e71fb066a100463207ac33903fa8699b1d3103a1099155b47c1de40f82108ac4269d32623c3d2
+EBUILD pcre-ocaml-7.4.6-r2.ebuild 716 BLAKE2B 6c1dd764659a12b8c05d17de6b687123e0b64e5f11e1399b093c7f7bd32138299ae31a14452382e8810bae72d9f8139b0e5105f98e11a78028a308def17557ec SHA512 c778e403a5422152fe226add191a7be4b7fdc2e90512b79f41aa90adf4af4fac9a10d62403b909db8856056a802859624a1c04e41eb4d58fca8fc88f30a4f15e
 MISC metadata.xml 387 BLAKE2B 3cc3f72757575c7ef774afb844b7ade41a0fc8e5679e0679143f8a0e36c55b26c056962075acccd91bdf77b16a2068601d48ee21573ed9e6e9e162a1fd46cdbb SHA512 f3c7c2cbaf4fab907509c97d3638718604905da35896ffbd14772e03ffdd45b08faacb0a0efe93cef4b27875fa0c27712a6f3c1e0d75cf6cc6416d9378573c50
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r1.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r1.ebuild
deleted file mode 100644
index a5f56117f2dd..000000000000
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
-HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml"
-SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}.tbz -> ${P}.tbz"
-S="${WORKDIR}/pcre-${PV}"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-IUSE="examples +ocamlopt"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86"
-
-BDEPEND="dev-ml/dune-configurator"
-RDEPEND=">=dev-libs/libpcre-4.5"
-DEPEND="
-	${RDEPEND}
-	dev-ml/stdio
-"
-
-src_install() {
-	dune_src_install pcre
-
-	if use examples ; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r2.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r2.ebuild
new file mode 100644
index 000000000000..7bc4861b3f59
--- /dev/null
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
+HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml"
+SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}.tbz -> ${P}.tbz"
+S="${WORKDIR}/pcre-${PV}"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+IUSE="examples +ocamlopt"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
+
+BDEPEND="dev-ml/dune-configurator"
+RDEPEND=">=dev-libs/libpcre-4.5
+	dev-ml/stdio:="
+DEPEND="${RDEPEND}"
+
+src_install() {
+	dune_src_install pcre
+
+	if use examples ; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-ml/ppx_bin_prot/Manifest b/dev-ml/ppx_bin_prot/Manifest
index cfa5ac4a47ba..d3e73100a7da 100644
--- a/dev-ml/ppx_bin_prot/Manifest
+++ b/dev-ml/ppx_bin_prot/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_bin_prot-0.14.0.tar.gz 36642 BLAKE2B 6a80f574fad5e3ba2bb1adad8e6af86a9bd463ab7ed8976901234694a56f9e17c04ccc74f0bd4a18c75f1a4ccd81848218078bb387f8ff2f5df337c5f2492226 SHA512 7d61624d18fd76daed5a5d60d16ac0a3fd658ef650ee6ae4b65346e96d1718a044deb3ca6fbb63c69176505f64d0d1b6becd8419061cfb69466d45e16964329b
-EBUILD ppx_bin_prot-0.14.0.ebuild 727 BLAKE2B 6a007fec49c085d047c40bb0f4686a3236203ab7ff6e70beb4da87989ccc3232db4dae34dc293649608f1c82fe2b0db1baf4ac5f90bd05e65154da9c6f2c2ae9 SHA512 53c68ffd99373551bcb5d5947367a485c1a0637733294c7b527a2ba9eec164b1ff46b669f2c919891d113c3289b1b5711fed44000640b0f3b289b71fe75e580c
+EBUILD ppx_bin_prot-0.14.0.ebuild 706 BLAKE2B 2e00c6cb87370d337cd8955d5dcac730feada8deb1888fb7d10c60d69f89b863ae4b779093e86c5f504d12217a5f2b2a1a2606a9942ec0159d9cee33502ef797 SHA512 cb72b71d876648ae42d64c760e2dbd9f4fa1e6427e5df69a70900197f132b60f8f9e1e9606bfbb8cc943473fc7113ef35df1048fb8eed2734e168400ba445f61
 MISC metadata.xml 333 BLAKE2B f75b4906a1255eb440784d36003b9b475a52633b442f4cd01a22f5841be1e87fcb73eee4d20d2652b2f994e572c0f0b78f05bcc5e5df425cf4e5bf67bb9620a1 SHA512 14c143cc4d5b3a11cb1acc4aedd419d2cb1e418543d4d889fdc82cbd696e7fe4e7a2402229d05602aee402eb51869b9e1d236c35a5da30e955c86598b59d0027
diff --git a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild
index 5c074d9d55ca..d2f36bcbc01f 100644
--- a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild
+++ b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild
@@ -15,17 +15,16 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	>=dev-ml/base-0.14.0:=
 	dev-ml/findlib:=
 	>=dev-ml/bin_prot-0.14.0:=
 	>=dev-ml/ppx_here-0.14.0:=
 	>=dev-ml/ppxlib-0.18.0:=
-		>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-			dev-ml/cinaps:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
 	"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/ppx_jane
 	)"
diff --git a/dev-ml/ppx_expect/Manifest b/dev-ml/ppx_expect/Manifest
index c070bc24994b..6505a903dece 100644
--- a/dev-ml/ppx_expect/Manifest
+++ b/dev-ml/ppx_expect/Manifest
@@ -1,6 +1,6 @@
 AUX ppx_expect-0.14.0-ppxlib-0.18.0.patch 1641 BLAKE2B ea0857a3681c6bce3a39191904a2223d899e9cfb362c9961e897c613dfa8f5879837cc80120653db88bd509c16b474079cf9c8ddfce3e6b79b12ddb284dab1e6 SHA512 11ab0e5d9a97d1a5749ba728c197c4a56905b21b7628d6a2c3594e46960b07bf6d9eb50d25ffc7bec77ea1e966d5016d8a20c5608f09817c73e06021c11ae372
 DIST ppx_expect-0.14.0.tar.gz 45661 BLAKE2B 0cba3840743d45f0f11936f090319aab3237c7a14389eb6d035a3b7cdac91e0b169c3ed84407e1bb01a00738bf97b62dba313965e93a2177388666764fe5854b SHA512 7de5d84640d16101d38140b5f621301c9935e3161a7c7d978373940be92fa7f14cad429e79eec294a20d1f379e969cf3c25d15810f1a4d3ad1bb8ba0eb7d7109
 DIST ppx_expect-0.14.1.tar.gz 45699 BLAKE2B b52d579d92156344ff44d30c88603840eb7d6a0d346de49fcbc01ef16fe3c33e664486de4cb2d09f74e853e39b9a01778e7e0f489497fdd34fc9582d895a0d3b SHA512 fd98e79d5b3bb935b2a4077a07894c159b48e142268c2e30ebff2cbfecc92266b454be69f5080b315eefa9184372e5e5248bd8a3b2b9d6cad59e2d517c94bd02
-EBUILD ppx_expect-0.14.0.ebuild 869 BLAKE2B 458e3ed359a5a9ca0bb597e03ceed5d6310713de23336b7b3537246218b5687100745aa0c3c55ff7b1b7d931b802419736ac0d93ff9216fd0d36d64bc28f6b9f SHA512 bd12f065567069707760be84f93a850098474ee979f606ee5c8feabb7c99627e409687879c725bcc14959cca602c04fadb55dbd69de9cc46d20c13d853e7c44c
-EBUILD ppx_expect-0.14.1.ebuild 819 BLAKE2B 71169c55952e0e96044296863463f225b4571a48b54f9bf69fbf19f822b6804a447d44538cd2deb8fef2a98c8535c6b0a6275514215d945ec5a528acb9a37b1e SHA512 37791ed2c19d3deb8f6749dddad265cf8da83e20646ae08ab5cc925f8eba215a787cbf4c4ea04b49f877024672379c4398fa589a4595de80223de56b6195775d
+EBUILD ppx_expect-0.14.0.ebuild 850 BLAKE2B 68be94026fc1f5e952b5cfcdd582374e241ccb76861bba8731b61135ee5972341bf9316de21bdd1b380484d570c28f72c2a46a5f7b650daa6f8d913438679283 SHA512 76dd1e4257e202793757177553c6d0cd6dd292f9c7f909d7a29480b6a480df4310f4005060402287526377cb095cf8b2867c4ad8ddeb1a979b92afde67e2847a
+EBUILD ppx_expect-0.14.1.ebuild 798 BLAKE2B 1760833220b258af77f5aa4a544770b7536c49e15815a232d566c070dbd4124d947917a015894e116b42f536a6894bd747421770e1a6c282e3e895491cd18d30 SHA512 1baca937165a63a1a1dff1b0b1085d010c292d4c07301cfa64ca46cf636edf2b8432bb269c77e2d092c3f0d29add31498a019f11b7dbf32346caea469fbb84ce
 MISC metadata.xml 424 BLAKE2B aa0469c6e2e68d01d80a467c0904f683f71612dfaa586430fc21a7dbe4284951b12f12e518491a9c14886b5d8b915573875a733f946a44b8713b82bbc05bd08b SHA512 de95b09128ed6c02327103f1ba2cf58b079e7e5be40ceaed1e199fff54a6e78a8a1c96b2cc6a4c99638f226ef942f5633c47885e005d878e0f9060e091d62109
diff --git a/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
index b055cba214fa..6fd1fa74a288 100644
--- a/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
+++ b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
@@ -15,23 +15,23 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	>=dev-ml/base-0.14.0:=
 	>=dev-ml/ppx_here-0.14.0:=
 	>=dev-ml/ppx_inline_test-0.14.1:=
 	>=dev-ml/stdio-0.14.0:=
 	>=dev-ml/ppxlib-0.18.0:=
-		>=dev-ml/ocaml-compiler-libs-0.11.0:=
-		>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-			dev-ml/cinaps:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
 	dev-ml/re:=
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/ppx_jane
 	)"
+
 # https://bugs.gentoo.org/749291#c2
-RESTRICT=test
+RESTRICT="test"
 
 PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )
diff --git a/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild b/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild
index 9d7682d713fc..5463fa2ad199 100644
--- a/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild
+++ b/dev-ml/ppx_expect/ppx_expect-0.14.1.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	>=dev-ml/base-0.14.0:=
 	>=dev-ml/ppx_here-0.14.0:=
 	>=dev-ml/ppx_inline_test-0.14.1:=
@@ -26,10 +26,10 @@ DEPEND="
 	dev-ml/cinaps:=
 	dev-ml/re:=
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/ppx_jane
 	)"
+
 # https://bugs.gentoo.org/749291#c2
-RESTRICT=test
+RESTRICT="test"
diff --git a/dev-ml/ppx_optcomp/Manifest b/dev-ml/ppx_optcomp/Manifest
index f596387a2501..2bb89f0a919a 100644
--- a/dev-ml/ppx_optcomp/Manifest
+++ b/dev-ml/ppx_optcomp/Manifest
@@ -2,5 +2,5 @@ AUX ppx_optcomp-0.14.0-ppxlib-0.18.0.patch 2581 BLAKE2B bf7f888acc462481e03a2d09
 DIST ppx_optcomp-0.14.0.tar.gz 16583 BLAKE2B 9b139708e02501245d5440a862324fe0191c9c96772e6599ed474a734263c4d2c0fa08fff666abd2efb218ec03a2b9b47c5ef6480d53a8d0f280550b741ac39a SHA512 e86b108d805500cbd7be628f41436ec8de0e8622d4218631d01bf73b0e70da0a057b8531465206baa9b8851ce9c22c5cd53921fccfae352ee46527d69964dc44
 DIST ppx_optcomp-0.14.3.tar.gz 16749 BLAKE2B 3c6dd2b5ac0a10e3d95c6a734ee09b0bef8af6d949c9f31150f1f8ac14ec72bb06455c3bf0c025bc99b939fa86b0d730abd8aefcdbd3998bfc16eef7a6a766bd SHA512 73b53dece639aebe20a8c9eaec50f6f491ac8163d96ceab66169d99f9bb50ed9c40c38731cd6e8543dae97c3a45650733d622e5bd4a2db812000c4694c823157
 EBUILD ppx_optcomp-0.14.0.ebuild 688 BLAKE2B 433e1f96b3758e705bf0896c8b61c88a6a17d6d5b6298beba3e52ac72816374343899fed09b3dababc26f862251267455df400606917b10bd406d31b8dc00f61 SHA512 b393ee83145a552f568d8c7302dd878d02ace806fb158ff7b78aa489500641d0152919ae937f9cddc2912a87f793db7163d186efe5fb4c1a31858b273eadc642
-EBUILD ppx_optcomp-0.14.3.ebuild 638 BLAKE2B c14194aadc3ff5c85cd358a251ecac2ab3399fb6d0179eecf43347d4cb67b1802cb83452df9bccf2a71e7423c63022f1b8dd28258bbc1dbee1570825b0efbbd8 SHA512 5cfa4f219cf194985e599a021b27c31333e4f18f7aca3c705bcafe631f1af09463b81273c88b57ca585da9224e80f8523d9b4a42ca7c8f4ec1436ac9207eb042
+EBUILD ppx_optcomp-0.14.3.ebuild 632 BLAKE2B b0a51da6481715de3541e695e3ba7b8a4c4661272eb207738b3d78705a14d5a7ae0a3ae63f56de5ca7d77bb0de1761ccf94498fbfa5553049862a5caab1c999c SHA512 886dea540aedd28c92576f71a765e19ba580f1fb1a7bdc8eee84afe232db10b861bc6d995d2656ab7f3bf4f999ec350abc623bb6239fc201fc22fc1772e9d0d5
 MISC metadata.xml 332 BLAKE2B b14db5b16fb10c0e04248ce53e7506ad7bbffb9d4a41ea26821a680d7166e66d0060e3bb117304e585fc5dc6fcdc30d245a28edeeb3535d1e6ae04f2147a361b SHA512 791b64320d146e5fd0e46990e01123069243119b1229b9446d9fd7e9dbc6976c9f93cdfc63884ff22fcc35de64c944e3822ec9fccb88bac7eae97e6e0b368bb8
diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild
index d01ce62cd244..a55939544f16 100644
--- a/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild
+++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_optcomp/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest
index a77fd0cbfbd6..d8341d3ec032 100644
--- a/dev-ml/ppx_sexp_conv/Manifest
+++ b/dev-ml/ppx_sexp_conv/Manifest
@@ -3,6 +3,6 @@ DIST ppx_sexp_conv-0.14.1.tar.gz 49857 BLAKE2B ede55963d995917bd0c4a1464b58f8584
 DIST ppx_sexp_conv-0.14.2.tar.gz 49876 BLAKE2B 32109eb6300894156f91721a1c74e94803106cf8a9a9326bf815d3094e166ce34b19f3d28b770d381ca3ce32227a80b15baa61e6f9c2d0082c47b87678c0f239 SHA512 d0121770030da142fd559b5f8d52d4a029d032c5ac9c79bf235190e0aaff58e5cce0a5ca5f198ca8a112e0970ca27ab18d4f201376ca6b799b91d71deb915f25
 DIST ppx_sexp_conv-0.14.3.tar.gz 49886 BLAKE2B 9fda18267995cdd8efb9dafb069df6a51106a800b263f4c94129957a3f23d2bee72f39382623a320cb09ea13c255000ecf9670c19ccf49d55627c02bb0912224 SHA512 7de81d64e7eeb4d6097134606411830dd066f94222ed320a9c32752116961806ccf807f802e07c522c32aa6f7c20bb901804612a0ffc1b14807903c92acb2f44
 EBUILD ppx_sexp_conv-0.14.1.ebuild 722 BLAKE2B 56e8596dd6063a6ff69d82c8ca862357d25034add0beb42c4d5e044b0cc95de73c5cc93ceb4c8999df1a1eb3e0f8c11f434f4d1f1cbce157a476fc4c5491bc7d SHA512 569f6c2990f5197e1298ec369aab259143be88b267a0136b3702497fb36d00bebe761f0c443a528981dfd5b2239332d066d86945c1e29307b65be83466e9087b
-EBUILD ppx_sexp_conv-0.14.2.ebuild 706 BLAKE2B 15aaae9c03b97fa49f8d8161ae9f524b21d6ecc783688362bf782a8a71d8a4962e1cfa355b1b690fe17818bca9a185c2c2f2c28a247884b8e741cbdb1338164b SHA512 78c833ca8d6c97feea80c236f01efafa9f29224a1db57411182b04b2a1f6109d4c149e32af34bed31cf6e3b3d16431af8c2c4a35f2b8de37e648e402171148b2
-EBUILD ppx_sexp_conv-0.14.3.ebuild 686 BLAKE2B 791c5c21e22e2369d8a2020131e683606edd0fec0e3e37254b2e94cbe69f3c0e344d895d1c0d04ecdf573a429a992af48ff155b0139fa6b23adf530f9904db96 SHA512 74851675ca6d1c0a691588c415a7eb6ec69f7fe9394e283f3d5c98142cb1a4b33f2b493b402ded4353ecb2b18912b797ee61ca6be03e43ec4aa489c85a45871c
+EBUILD ppx_sexp_conv-0.14.2-r1.ebuild 705 BLAKE2B 882974b6e2bdf2d7cb30f9d2a4bf4caa327a6ee160b8a84eccdf504e0c5e25117158853a0a5d0f10369636d34b7688f9b9ec6b20abaa2090d5718e66a54f6866 SHA512 9b32b1725bc3eefc70ca169cc46b6d3b9acf1365370b5a75c287e7c83b9b81acc9a886465d2483c595a28fb401688d93911f07a1d4931e6c17619c23cb903023
+EBUILD ppx_sexp_conv-0.14.3.ebuild 684 BLAKE2B 78b47f8f3c746eb69b424d1ae1a144ec8c18589cfc2773cfc409c4bbbe3287ede3a7d99c804f953f7d7d3accf25fda3186a3f33aa00386aa9635b07610f8b002 SHA512 cd86bf999fc678b9359301e6fa6245688f53a620a2fe2590553b5f856c2ab47940a58c3033f29450344f2b950e8cade4ff9fc2cad3d761d12c7095194652f394
 MISC metadata.xml 427 BLAKE2B 40cf563b5bf060e3d241038655ac6f7fa0d96e0d3aafd8bbe27cf77e5a997129dcecfb9cc907734a5fdadd720f848807aa60ae4bdf6a924cbce3b7277d605882 SHA512 e29de52e463fa9c21b92a52a6454f2cadc9bd6677d549c86ee43383a88af9ee43134ecca2379088a40f0e89aa7d98b552480e8dc2cd8042f9a8e5453e8ab1d6d
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2-r1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2-r1.ebuild
new file mode 100644
index 000000000000..7cdc3f5e627e
--- /dev/null
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Support Library for type-driven code generators"
+HOMEPAGE="https://github.com/janestreet/ppx_sexp_conv"
+SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+IUSE="+ocamlopt"
+
+# Upper bound on ppxlib for bug #769536
+DEPEND="
+	>=dev-ml/base-0.14.0:=
+	dev-ml/findlib:=
+	>=dev-ml/ppxlib-0.18.0:=
+	<dev-ml/ppxlib-0.21.0:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+	dev-ml/sexplib0:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild
deleted file mode 100644
index 6f07d06be7e8..000000000000
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Support Library for type-driven code generators"
-HOMEPAGE="https://github.com/janestreet/ppx_sexp_conv"
-SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt"
-
-# Upper bound on ppxlib for bug #769536
-DEPEND="
-	>=dev-ml/base-0.14.0:=
-	dev-ml/findlib:=
-	>=dev-ml/ppxlib-0.18.0:=
-	<=dev-ml/ppxlib-0.20.0:=
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-	dev-ml/cinaps:=
-	dev-ml/sexplib0:=
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
index 4c7a9470da50..e757ef8332b3 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 # Upper bound on ppxlib for bug #769536
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index c75b6917230d..5c83e42cdff3 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -2,6 +2,6 @@ DIST ppx_tools-6.2.tar.gz 46150 BLAKE2B f8af2a1eee81d5a1e73ac606ab79d285c8c22653
 DIST ppx_tools-6.3.tar.gz 18811 BLAKE2B b1389dbe0c6fd855cafc8d64a9db550866317172909c2731f01acd412c6f8147f07e19a82d527187d0b211fca9eb2f2ad63bb53e8f375b0b8107c4e723710000 SHA512 6a88f6f877f49ea8736aeca60673a19c52d5104ad9e2a3e56db3f71cd557d39df9c709c4e678ccf10263ff1f3e0504f4676227bd05ceba1e0294453a988a736c
 DIST ppx_tools-6.4.tar.gz 19051 BLAKE2B dcb3e5a4ca5dd6243cae013739b93c6fe100ca21ad56c46e284255977f4e6d4263ef8d937ed672939e5b31bbe0904dcb1d71105f49385ad5d43404b19a9fe2c6 SHA512 514aa283f6bee11bf257abec98a751c656db63203caa4caee5ce606bcdee75891441a794b0bac22e2ff2e5d2760cd39ffaa2fce6bb118155daf05175917e6e7c
 EBUILD ppx_tools-6.2.ebuild 505 BLAKE2B 690649eab5fc48940936171e98bcf51edb1c0dafeebfe378a88b2c646f8df488270baed8845d480dfb47523819d6bc02daec4f9fd7265c4899cdd1bb4ffb5749 SHA512 c4cab13bb3694fad4c39300d31a9a81487f873eb45e0af9b243c891f646a505a2c33641cf25ddf084ae295f6577700cec8fcf478dce3c7f1b5391dee90d50b45
-EBUILD ppx_tools-6.3.ebuild 469 BLAKE2B b0c45a83419c6dbfb95d0585be01fccaf1e1af16278f1faabe7a00ec9e0e40d31335211ffdacc062ec05c251e39b33f1754364beb538d1afed6ca8c9ef55e933 SHA512 d483bf1fe95c97d0d23677d70d348fa5490e49be5bc7819696e0ae6a47a70cbfb116c5ab08dd3e8e058285ef73793793fe0af92e400b24c0063ff299d972c0b3
-EBUILD ppx_tools-6.4.ebuild 471 BLAKE2B 8eb9d070efc1b625c6f1d5e1b80babe69018e5626e1a45d37c0233f01b526707e90fae71501a227e16f3eda16ed22010ebafbf2c6fcd75df860cd6f80190786c SHA512 0cbc257b617cfd5383fdb42b130233993dc201836ea2dd29556d60e2915456b0d84bf34c5eb26f8e433af4e9ac7bd4c34560ba76e5eacffd27a9046aafca1a31
+EBUILD ppx_tools-6.3.ebuild 492 BLAKE2B 684cd8eea3e558bc8c221580a31482ab14f64b03fbd10f4359e167f2591233b1d2f30e43ca89b9293f6fff8557f08ac35910cdd1434eab10d7adc0b3d94302fa SHA512 ef50e708fcbea8f4999bb0239c4ba1260ac5c222998629a0aea6efa248c345fd21946971d6a6e668108d9a76eeb657869727f9b4a775fe01bd81c4ddeaa1e235
+EBUILD ppx_tools-6.4.ebuild 494 BLAKE2B 4f0a7f1842f10abe06534e02edde8169d54415053881711938a22463bd0e8b9da646ff314861e9cf691bded3d1e43d89982f70fda77d9174c5a01e0a1cc08c73 SHA512 5b2032b06cd21f402f14f28991979be50045d86b75f28d93a777b970cff20c5d80e41b9bdc0f0e37ed5b9f2540ba3b54dc94424e628029dddf5dea249121874c
 MISC metadata.xml 424 BLAKE2B ef86805d6a907c1d81fa71dd3599c66bbe5f6f2275b17c8f43998276d3c99329d96754717bfe935a56ed50fdf65f9e688a01832220253bc2d5909c0717661ff9 SHA512 5dc85ce4085784bda6fe0b3b601858f784c542c26444eb92068328324898d5835eba450ef723d3eb1317f1a0eae82a1e7a430c609bf57162b1c2ac5ea142c501
diff --git a/dev-ml/ppx_tools/ppx_tools-6.3.ebuild b/dev-ml/ppx_tools/ppx_tools-6.3.ebuild
index b8a168bdfde7..fa8079b62de1 100644
--- a/dev-ml/ppx_tools/ppx_tools-6.3.ebuild
+++ b/dev-ml/ppx_tools/ppx_tools-6.3.ebuild
@@ -15,3 +15,5 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
+
+BDEPEND="dev-ml/cppo"
diff --git a/dev-ml/ppx_tools/ppx_tools-6.4.ebuild b/dev-ml/ppx_tools/ppx_tools-6.4.ebuild
index 1d025b5dacda..b8c31373448b 100644
--- a/dev-ml/ppx_tools/ppx_tools-6.4.ebuild
+++ b/dev-ml/ppx_tools/ppx_tools-6.4.ebuild
@@ -15,3 +15,5 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
+
+BDEPEND="dev-ml/cppo"
diff --git a/dev-ml/ppx_typerep_conv/Manifest b/dev-ml/ppx_typerep_conv/Manifest
index ea054a3668d8..71dbbd46248f 100644
--- a/dev-ml/ppx_typerep_conv/Manifest
+++ b/dev-ml/ppx_typerep_conv/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_typerep_conv-0.14.1.tar.gz 9453 BLAKE2B 4acafdd51df0659746697283aa3240f1b1403e4e9f9b5fafa6c4b09f4c76f6ac645e2ccab53cba7371b5b004edba38d24198334d10b295d90c8ba5814a602a23 SHA512 6e32f6c2cf6c370fcb8d3b341dbd797c3b7c2557c8604253d744b266c9a3f4984e62ffe6ec5717044378f81e5b78e7f206a7f0f4b43c0dda97a4e7ece745d26d
 DIST ppx_typerep_conv-0.14.2.tar.gz 9474 BLAKE2B 7a7ff6669d9af2ced905e5b104058d26ffe06e3784af366a1a4ce753337eeb87c9bfe02d1a6fddaac6c387105d2583194cbd06b915eb35d16e06b1d4ab977e2f SHA512 9372f13cb3f62b3732af4f8ddc00314dd71869bab5599ae0a112d32669de300346781b7fcd2bd649ccedfde54fcd86fb6186812eeb528858048bcd9d5ad443dd
-EBUILD ppx_typerep_conv-0.14.1.ebuild 654 BLAKE2B 2bb653c4348a9f83308c62bcb518e5db1301fb08e24a88edb7d12a7e79881b514c81e14f64187cb91984e6b67fdca3c2e0c490c7ca78255ad609c5cc69f13944 SHA512 2eeaccc68a922e24e012917bce9e53db806942e9f2583789f078295acd6914e28bed2b08fb43df97de01395ac11d42244ad59d3783fd3eb75333819d6af5c923
-EBUILD ppx_typerep_conv-0.14.2.ebuild 634 BLAKE2B ec2e5787b889b7a9bf9eafe47b54224ebd6921b23b4a3099a56d965817375b478c8b54c2a55cdc96e50cb31d2e880ba26e7275ea085389472cb14b101366cb5d SHA512 68f4f58a79b0987bb492ff4336b6111a1e5bc145c7ea507744c82fcc94310c9bfb725c287f302994cfa644f2001af526f3c88a385fcf8e9eccc2dbf4822d61f7
+EBUILD ppx_typerep_conv-0.14.1-r1.ebuild 653 BLAKE2B f47242e7d5b9f18641a6a8748ec7ec12e0f716260ec4f61f7ffd841863194f554f796923b6a51e5dce674247487a764aef9f782c8132cc54c93db409d0786712 SHA512 46d2b4010e1d346c6450ee79ff49e5c9898d811909637a8b12666603622267c6b34719410216caa25356ec460377bc9547b762da60391c135b5e95936a44b9b1
+EBUILD ppx_typerep_conv-0.14.2.ebuild 632 BLAKE2B 209be5c997580b564c24db6541d4812f5c72e645dcf5cf5b10117d468dbfff899816652d66e44fc5c9111ce1623094db0e90902cb13d6c1e0bce3a4f4b6a5e77 SHA512 47f05f5127ecd667d63617a6f09e430e6902f57b1332ac6069d4e95ada3b2bb27c8f5f6d20390f7746d3a91f876cd7420df94aec0528b8d25124691224dad476
 MISC metadata.xml 430 BLAKE2B 1f8c9b9c75af8dde9e6180ce99665d6504abf4d86eda54e7104ba92c69bfd32d95ba21aa8292aa038d6827c5f73fc4e2cd6b3294ba6984b5931f5e1d29e3d2c7 SHA512 0f0f1ae7a2cecd2eb6544a8219bfd19d8e5ac638d68753ab64b34f8759e1a71d51ee9a74dc7e28b37d8ff749a131c5f701aa7ec18644aa65d99df5a3cac73d3f
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1-r1.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1-r1.ebuild
new file mode 100644
index 000000000000..d864e10d34aa
--- /dev/null
+++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Generation of runtime types from type declarations"
+HOMEPAGE="https://github.com/janestreet/ppx_typerep_conv"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	>=dev-ml/base-0.14.0:=
+	>=dev-ml/typerep-0.14.0:=
+	>=dev-ml/ppxlib-0.18.0:=
+	<dev-ml/ppxlib-0.21.0:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+	dev-ml/cinaps:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild
deleted file mode 100644
index 35c02ef0a8cb..000000000000
--- a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Generation of runtime types from type declarations"
-HOMEPAGE="https://github.com/janestreet/ppx_typerep_conv"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt"
-
-DEPEND="
-	>=dev-ml/base-0.14.0:=
-	>=dev-ml/typerep-0.14.0:=
-	>=dev-ml/ppxlib-0.18.0:=
-	<=dev-ml/ppxlib-0.20.0:=
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-	dev-ml/cinaps:=
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
index d7592ebf551d..33347b97f969 100644
--- a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
+++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppxlib/Manifest b/dev-ml/ppxlib/Manifest
index b271fcca81ce..7e3d1e4e0629 100644
--- a/dev-ml/ppxlib/Manifest
+++ b/dev-ml/ppxlib/Manifest
@@ -5,10 +5,10 @@ DIST ppxlib-0.21.0.tar.gz 201905 BLAKE2B f7a7b69ab07b2a5dce542877989fb4ca820acdd
 DIST ppxlib-0.22.0.tar.gz 202241 BLAKE2B 6b18ceb23e248eb2b4faed66ba0ea1cbee36df61cee9458fc0fd7057eff433340cb602a429c3f100ee054da06d9de20eca44e5ecc4ba98c888cfec2c83097151 SHA512 11442120c24bf60d9de90c9a325de9e5d87d87ba08d8e4cd216a3434f422c62427aa4214909b80646db638423ea35dff4280d5a70cf51bdfadc0a97745c32d41
 DIST ppxlib-0.22.2.tar.gz 202895 BLAKE2B 41d2c2e698846e5dfeb4158966b65dd29b253645b0286d0eab5a9dfb0e684b8b43f17a32b23023198d2c4e50e836705d2c965ea74ef337c5b0cf6aecd6fa4167 SHA512 3a83693551f11965b219a9caa4eaffbf358ea1311e05a38bfd531b8ad225d6571d86db7282e1d5bdc09775f2ba47791c03351402720cf5c2adefc52926d498e4
 DIST ppxlib-0.23.0.tar.gz 364308 BLAKE2B b1cc622eb5e01c455da437365053fd32a00d33007520cf28536e1f45c142aa0a9083da614110c1096fd3f8326453eb037a8c0054e00e17a813f99f3d8efde5d7 SHA512 9d6692ec4247031f26aed3bdc59808a5f929c34dbac3515a8b2a61c59ec118f0e90d12948d22aea40e9f01b1ed782e9dfa5b0263314b967217b2ac4006446c53
-EBUILD ppxlib-0.18.0.ebuild 944 BLAKE2B b99d31790fa17ba7f143859e2ec4cfdcc6a6e879c161e34f5996a5eb881d63889f69a4ac65d1412582722c4e4f1c784ee4ecdb823edc55a065bb9067787fe1ed SHA512 7455d8e04281bd708968d5f58d0d4a09032305a25db0cda77643ce4962c367a85ebaa5c48785441f842c829b0c93d858b31a9fe4e11560892f447dbdc098f263
-EBUILD ppxlib-0.20.0.ebuild 901 BLAKE2B b57d590e48284b9649369eeb22d9375df37f67731f831eccb84e7e725b8fe6089848880ff290dfde59313808528796da4738a3d5adbfebc962acd3d5c0742f4c SHA512 aa83ca0db89d6c1de32ce271e357f5d8b8a1a60feaccff566ae8528a1ec3db49bcab9204731cfe7e19ff21915565a89a8ed5bff02c81201b41912b83e0ca9815
-EBUILD ppxlib-0.21.0-r2.ebuild 1112 BLAKE2B 2483fe8e618d609243789a36723f8b4529d0838c9e4e79ae1e88fbe6852642779a6e759b4a5dafce84d00cc7e28b3505786cd40736b31c30eb8f75ea19ffea42 SHA512 678061b8c983ac71c545448a6e058d4f7ae2cb30534bc51b40bd08ee6bdc7e9fe137ca93eb26e3f2457a22c9e828693cd1fd83b80eb725c6ac2dc30eda5e0634
-EBUILD ppxlib-0.22.0-r2.ebuild 1143 BLAKE2B c71e6f6736f0e1edd8116827779a24f3ab0050e6207e5bd2cc192d5d4106a60a578d08a2de55279baeb2f0aae77fd675bc3f3818c449cb9bf72b3b727d863bed SHA512 4d56a68e5e0dac526b2e2ee8e470755af03edc6c7ddf084aa0c7718802ec4f56472eff28931840ed480feb242fb814e3f1e76163e7b684bffc29c36cf934a8ac
-EBUILD ppxlib-0.22.2-r1.ebuild 1143 BLAKE2B a6986fa8ad936d5ff6247ced664d094c818bde608a53c083f99885419a3a61e4e63a6b3bbdf2be2842f1402de2982d4e25ee1e90df1c4d39a93b607d7490035e SHA512 8f908a7b0a5fdecef965078984a4179e7c662b7572d0f00ef274568ca61cd650fb9f6f25e742433091b7595b20cc4a0dd5c277d037a4cdf50bfff8a1fa55d6ee
-EBUILD ppxlib-0.23.0.ebuild 1010 BLAKE2B 9fb76e9323c8b323536abe9cd27221e5ec4a8667365fde8f4e74e0cf0b9cc9add952c1ab8a0571ad1eb54ccbae0b577a4b1a3fe329e60b6471c29eeb347ba797 SHA512 75e482e0a387a79b263afbe51c98e97a0c4ac8a3dc8d35f10a978889355a60cae5b8caab354722748b465fc7dd0db7b4744f783df446240c01fbd35e51d44eba
+EBUILD ppxlib-0.18.0.ebuild 926 BLAKE2B f8affb8c0961a039d9e560db8ef47c435c0aec44b2a2a349bc40404486245b8ee0b303946646f8116b49d0e568cb8e63a699dc5c4e8c110a87b12e7c781ce742 SHA512 8d901792835259e0a32a3972d7cb9aee21a733131eec117fe9522f56cb8d6fee9674f4f08a5cbd9e0114ea82d7165b81122337b3973aa1c2fc021dd76c5243ea
+EBUILD ppxlib-0.20.0-r1.ebuild 902 BLAKE2B 168d53ba94211b5436c5b880b58031e3f3efb50ba29f0772b1c3d6f340649b2a3e0d7551ed47340fe8a2232d0743f8b15b2fcb7b265bfa0223c8936d88f86c1b SHA512 1a8a91b842fbd7dfaed8962b7f052126a5fd8c56fa23347c6f6f6c30edc89345a88e9fe7828737c643f69bbafe89bc1bdf58574019651e355eeb33d4d15dcee7
+EBUILD ppxlib-0.21.0-r3.ebuild 1113 BLAKE2B 864aab6473c4a64d8728216359aaeef62a992bcb018554b67c0d4b3533d7944b25747b9c5b9fc0acaa01b94e9eda886fe086284026068f5762ba60b7afff8704 SHA512 af7c307191efe5f632439867159caabfa3639450cdb7e7861d1bead2d3c6d14278b28118e47e8332a4d56cb78a0839969aa8f68c05d976e1ac164797e29fa017
+EBUILD ppxlib-0.22.0-r3.ebuild 1144 BLAKE2B 8bb514b1d67bf4e2275c398829643eb39b7acfef826920250b0b315fe3b2faef582a8b200e97bffedd5250791d013db002b3400ee25a12f14308e271b1c8fa42 SHA512 ffba32287c1b504d3b556a4c88be356e3371f7bed11b2ba5eca7667f3d8cad22229e2226d791de0422db974411520f7e75cfc4682b831359b91b1b402e63026b
+EBUILD ppxlib-0.22.2-r2.ebuild 1142 BLAKE2B b65b7676d84dadc4bad2a86f02a6c4c35a33bf51c3aa1efc483a4ea297cb7a7545024b59dc173f4e80705647a3d6d00d37320c1230dcc95b68c1a7ce82de9990 SHA512 61e564bc558651a5e040703bc89c5181c398adf6b677dc7ca9941a6baf592f43040ce6767cae87efd2e4429a8b9c52a22d5621f587b37cbd286c7a8c56f64254
+EBUILD ppxlib-0.23.0-r1.ebuild 1011 BLAKE2B 3bfcb9e6ce7f21b2e6dc784dcbcfc297f372232c40c8513460d29306d6976243eebd797a710452ef6c33be71d707b23891126e4275430d26787a8f726a8b1884 SHA512 cc2e0ac82fd5c545f550c1b515ca4a040bf964637d98ee64fae22b405683080e60d9890f193ee8799fea0a9a5098c0ed0671aeb7a31df4c77b65abac84770dd2
 MISC metadata.xml 419 BLAKE2B 97371846a88fb0008519bfb72fff654aa18401b2066073c09099b1987efbb9ad49012c0ab7624218894130a2cda3d5fba6056522eacd30712d08b7784801d9cf SHA512 8dc94b1dd499f7caa3696de963e69063193892dc939609c581fec3b2d93eca4f266e9360cb5144978ba36864d9143b6fb0a1eb0e0ac5061e04b84a68e787a8f7
diff --git a/dev-ml/ppxlib/ppxlib-0.18.0.ebuild b/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
index 322bc6a963d6..2358fdf46446 100644
--- a/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	>=dev-ml/base-0.11.0:=
 	dev-ml/findlib:=
 	>=dev-ml/ocaml-compiler-libs-0.11.0:=
@@ -31,8 +31,7 @@ DEPEND="
 	>=dev-ml/ppx_derivers-1.2.1:=
 	>=dev-ml/stdio-0.11.0:=
 "
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	test? (
 		dev-ml/cinaps
 	)"
diff --git a/dev-ml/ppxlib/ppxlib-0.20.0-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.20.0-r1.ebuild
new file mode 100644
index 000000000000..d1dbfa8de952
--- /dev/null
+++ b/dev-ml/ppxlib/ppxlib-0.20.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
+DESCRIPTION="Base library and tools for ppx rewriters"
+HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
+SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-ml/base-0.11.0:=
+	dev-ml/findlib:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=
+	dev-ml/sexplib0:=
+	dev-ml/stdlib-shims:=
+	>=dev-ml/ppx_derivers-1.2.1:=
+	>=dev-ml/stdio-0.11.0:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/cinaps:= )"
diff --git a/dev-ml/ppxlib/ppxlib-0.20.0.ebuild b/dev-ml/ppxlib/ppxlib-0.20.0.ebuild
deleted file mode 100644
index 8ea171116681..000000000000
--- a/dev-ml/ppxlib/ppxlib-0.20.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-# Note that new "major" versions may change which OCaml version they support
-# See:
-# https://github.com/ocaml-ppx/ppxlib/issues/243
-# https://github.com/ocaml-ppx/ppxlib/issues/232
-
-DESCRIPTION="Base library and tools for ppx rewriters"
-HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
-SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-ml/base-0.11.0:=
-	dev-ml/findlib:=
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
-	>=dev-ml/stdio-0.11.0:=
-"
-DEPEND="${DEPEND}
-	test? ( dev-ml/cinaps:= )"
diff --git a/dev-ml/ppxlib/ppxlib-0.21.0-r2.ebuild b/dev-ml/ppxlib/ppxlib-0.21.0-r2.ebuild
deleted file mode 100644
index e6b9510929d3..000000000000
--- a/dev-ml/ppxlib/ppxlib-0.21.0-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-# Note that new "major" versions may change which OCaml version they support
-# See:
-# https://github.com/ocaml-ppx/ppxlib/issues/243
-# https://github.com/ocaml-ppx/ppxlib/issues/232
-
-DESCRIPTION="Base library and tools for ppx rewriters"
-HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
-SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-ml/base-0.11.0:=
-	dev-ml/findlib:=
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
-	>=dev-ml/stdio-0.11.0:=
-"
-DEPEND="${DEPEND}
-	test? (
-		dev-ml/cinaps:=
-		dev-ml/re:=
-	)
-"
-
-src_install() {
-	dune_src_install
-
-	# Clashes with dev-libs/nss[utils], accidentally installed upstream
-	# https://github.com/ocaml-ppx/ppxlib/issues/224
-	rm "${ED}"/usr/bin/pp || die
-}
diff --git a/dev-ml/ppxlib/ppxlib-0.21.0-r3.ebuild b/dev-ml/ppxlib/ppxlib-0.21.0-r3.ebuild
new file mode 100644
index 000000000000..d6be89711e15
--- /dev/null
+++ b/dev-ml/ppxlib/ppxlib-0.21.0-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
+DESCRIPTION="Base library and tools for ppx rewriters"
+HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
+SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-ml/base-0.11.0:=
+	dev-ml/findlib:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=
+	dev-ml/sexplib0:=
+	dev-ml/stdlib-shims:=
+	>=dev-ml/ppx_derivers-1.2.1:=
+	>=dev-ml/stdio-0.11.0:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ml/cinaps:=
+		dev-ml/re:=
+	)
+"
+
+src_install() {
+	dune_src_install
+
+	# Clashes with dev-libs/nss[utils], accidentally installed upstream
+	# https://github.com/ocaml-ppx/ppxlib/issues/224
+	rm "${ED}"/usr/bin/pp || die
+}
diff --git a/dev-ml/ppxlib/ppxlib-0.22.0-r2.ebuild b/dev-ml/ppxlib/ppxlib-0.22.0-r2.ebuild
deleted file mode 100644
index eca76b2308f1..000000000000
--- a/dev-ml/ppxlib/ppxlib-0.22.0-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-# Note that new "major" versions may change which OCaml version they support
-# See:
-# https://github.com/ocaml-ppx/ppxlib/issues/243
-# https://github.com/ocaml-ppx/ppxlib/issues/232
-
-DESCRIPTION="Base library and tools for ppx rewriters"
-HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
-SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
-"
-DEPEND="${DEPEND}
-	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
-		dev-ml/cinaps:=
-		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
-	)
-"
-BDEPEND=">=dev-ml/dune-2.8"
-
-src_install() {
-	dune_src_install
-
-	# Clashes with dev-libs/nss[utils], accidentally installed upstream
-	# https://github.com/ocaml-ppx/ppxlib/issues/224
-	rm "${ED}"/usr/bin/pp || die
-}
diff --git a/dev-ml/ppxlib/ppxlib-0.22.0-r3.ebuild b/dev-ml/ppxlib/ppxlib-0.22.0-r3.ebuild
new file mode 100644
index 000000000000..bb3fbecbb17a
--- /dev/null
+++ b/dev-ml/ppxlib/ppxlib-0.22.0-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
+DESCRIPTION="Base library and tools for ppx rewriters"
+HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
+SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=
+	dev-ml/sexplib0:=
+	dev-ml/stdlib-shims:=
+	>=dev-ml/ppx_derivers-1.2.1:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ml/findlib:=
+		>=dev-ml/base-0.11.0:=
+		dev-ml/cinaps:=
+		dev-ml/re:=
+		>=dev-ml/stdio-0.11.0:=
+	)
+"
+BDEPEND=">=dev-ml/dune-2.8"
+
+src_install() {
+	dune_src_install
+
+	# Clashes with dev-libs/nss[utils], accidentally installed upstream
+	# https://github.com/ocaml-ppx/ppxlib/issues/224
+	rm "${ED}"/usr/bin/pp || die
+}
diff --git a/dev-ml/ppxlib/ppxlib-0.22.2-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.22.2-r1.ebuild
deleted file mode 100644
index 0acf232740e3..000000000000
--- a/dev-ml/ppxlib/ppxlib-0.22.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-# Note that new "major" versions may change which OCaml version they support
-# See:
-# https://github.com/ocaml-ppx/ppxlib/issues/243
-# https://github.com/ocaml-ppx/ppxlib/issues/232
-
-DESCRIPTION="Base library and tools for ppx rewriters"
-HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
-SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
-"
-DEPEND="${DEPEND}
-	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
-		dev-ml/cinaps:=
-		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
-	)
-"
-BDEPEND=">=dev-ml/dune-2.8"
-
-src_install() {
-	dune_src_install
-
-	# Clashes with dev-libs/nss[utils], accidentally installed upstream
-	# https://github.com/ocaml-ppx/ppxlib/issues/224
-	rm "${ED}"/usr/bin/pp || die
-}
diff --git a/dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild b/dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild
new file mode 100644
index 000000000000..33ca5ab0fb8d
--- /dev/null
+++ b/dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
+DESCRIPTION="Base library and tools for ppx rewriters"
+HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
+SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
+	dev-ml/sexplib0:=
+	dev-ml/stdlib-shims:=
+	>=dev-ml/ppx_derivers-1.2.1:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ml/findlib:=
+		>=dev-ml/base-0.11.0:=
+		dev-ml/cinaps:=
+		dev-ml/re:=
+		>=dev-ml/stdio-0.11.0:=
+	)
+"
+BDEPEND=">=dev-ml/dune-2.8"
+
+src_install() {
+	dune_src_install
+
+	# Clashes with dev-libs/nss[utils], accidentally installed upstream
+	# https://github.com/ocaml-ppx/ppxlib/issues/224
+	rm "${ED}"/usr/bin/pp || die
+}
diff --git a/dev-ml/ppxlib/ppxlib-0.23.0-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.23.0-r1.ebuild
new file mode 100644
index 000000000000..5cb0b9a5899a
--- /dev/null
+++ b/dev-ml/ppxlib/ppxlib-0.23.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+# Note that new "major" versions may change which OCaml version they support
+# See:
+# https://github.com/ocaml-ppx/ppxlib/issues/243
+# https://github.com/ocaml-ppx/ppxlib/issues/232
+
+DESCRIPTION="Base library and tools for ppx rewriters"
+HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
+SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
+	dev-ml/sexplib0:=
+	dev-ml/stdlib-shims:=
+	>=dev-ml/ppx_derivers-1.2.1:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ml/findlib:=
+		>=dev-ml/base-0.11.0:=
+		dev-ml/cinaps:=
+		dev-ml/re:=
+		>=dev-ml/stdio-0.11.0:=
+	)
+"
+BDEPEND=">=dev-ml/dune-2.8"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-ocaml-4.13.patch
+)
diff --git a/dev-ml/ppxlib/ppxlib-0.23.0.ebuild b/dev-ml/ppxlib/ppxlib-0.23.0.ebuild
deleted file mode 100644
index c34f8878151c..000000000000
--- a/dev-ml/ppxlib/ppxlib-0.23.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-# Note that new "major" versions may change which OCaml version they support
-# See:
-# https://github.com/ocaml-ppx/ppxlib/issues/243
-# https://github.com/ocaml-ppx/ppxlib/issues/232
-
-DESCRIPTION="Base library and tools for ppx rewriters"
-HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
-SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
-"
-DEPEND="${DEPEND}
-	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
-		dev-ml/cinaps:=
-		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
-	)
-"
-BDEPEND=">=dev-ml/dune-2.8"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-ocaml-4.13.patch
-)
diff --git a/dev-ml/rresult/Manifest b/dev-ml/rresult/Manifest
index ea17185f5745..31c9793fc22c 100644
--- a/dev-ml/rresult/Manifest
+++ b/dev-ml/rresult/Manifest
@@ -1,5 +1,5 @@
 DIST rresult-0.5.0.tbz 9185 BLAKE2B efe8d248aa3d68b13b011dccb98cb04127dfec9d659dfe8619f658b254cfcdca833e125310553dee54ef4be239c308e762d2290386f4fd08a5f2c1835faa9ef1 SHA512 45787b61adb7daedf72e4ff632cf3d4917bccb3e83613dabf93437982887d9a0ed3b6cbefb2b17cb341a825346cb0609286df581c6ff379583dc83672ee25efc
 DIST rresult-0.6.0.tbz 7731 BLAKE2B d93b4a3fe54541101d52e768555aa306f87d1c34b57c7eb7a92092051a047586c43dded3be9ef0c84675d935c4a91162a8ff612d540f951f2842cfdf9f709f24 SHA512 66cb7acb525c17dde4e7572fa5a0d925466f8e759b90a12d952ca076d25de49404c962e061557f2255112fbf1d731f8da696acd536cbb9433a4b1d9662095c3a
-EBUILD rresult-0.5.0.ebuild 537 BLAKE2B 268da618a4d646f5f879b2897b99b78fb5a93725a8502cb2bde5d907c78b2d3a7e9c10d47e8d6e17d8852cdbf4c6089440ec9fca0ee020df3f81e16cb6a174ed SHA512 11ae7ab67ea3d474c8f952f1f3b9400414d5dea30aa910c62f97d3942276cde5345c70dc3d0a2fc92092e379c7d373b6dd2515c2e443a6122de2ea8749fe5e17
-EBUILD rresult-0.6.0.ebuild 543 BLAKE2B 821ba47da90a028bfabd5c98a0767229d5db9a13e17b58c9744adc2d7e2b7714058f885b4702932a664ca5ec7975ca3c1d42e4620796667540a2d749420cdbaf SHA512 d31aacf899f5479bb348b2b9a23b57862d2225b5debfde2f40da977e286122c58519b77c1a94b9a5b54898148841c225111dccb03cbbcd5a57c0859c749e56e3
+EBUILD rresult-0.5.0.ebuild 536 BLAKE2B 73570cd0efb1b8808154e8a578baef8fa0e2c7c5ad273328ebf3a3e4ae013e84ce1238cf7b430869e1c57d111bbb7351e32de76c579cd73a115056e1b6577cac SHA512 7a2b488ac8d6af920705a155f582f7879ca650cfcc733cadaf809cb030336deb38626ef61def7e4c8244a5290693abd31de32b389987180f5427758a7be480b2
+EBUILD rresult-0.6.0.ebuild 538 BLAKE2B 1aec18ca9d5765e1917eebb1e7c00e5e6a85f427c47c92006794150d7acf3bbde1dccdafef05414772438a0eefc97c15d4788b2d2619a4badfd46c431594f5b7 SHA512 6dcfae504bcd8c240642d54151ba27801a151bd8237184fb7e580d39603fb7e1a581c01848195e27a8f9dca263f46d2984d8055a62995965494a7110be1f6cf5
 MISC metadata.xml 314 BLAKE2B 3ec15d97bf35ceb3f76caa4268557f4a32cff0673c4dcc20376d2cf8f41eae93f154a77b2ab56f82a9b370e1ab51eaf09bcae142cd9b0fd5cb653f78f7bd9d5d SHA512 60a95e3a7fd8c3f4dfcb5c150630f2f0df58b129de1b69a6cbf29f9aafbbe7a9b03795ee9e9448c5ff14103f631dc85fd9689e2fa3a82bb1b7953b6b1ba171f7
diff --git a/dev-ml/rresult/rresult-0.5.0.ebuild b/dev-ml/rresult/rresult-0.5.0.ebuild
index 9144c414ce88..3d12ef8d3f7a 100644
--- a/dev-ml/rresult/rresult-0.5.0.ebuild
+++ b/dev-ml/rresult/rresult-0.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/rresult/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-ml/result:="
diff --git a/dev-ml/rresult/rresult-0.6.0.ebuild b/dev-ml/rresult/rresult-0.6.0.ebuild
index 0c47040813b3..cdea5cc2d55d 100644
--- a/dev-ml/rresult/rresult-0.6.0.ebuild
+++ b/dev-ml/rresult/rresult-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/rresult/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
 
 RDEPEND="dev-ml/result:="
 DEPEND="${RDEPEND}"
diff --git a/dev-ml/seq/Manifest b/dev-ml/seq/Manifest
index 935fd57e84dc..f59b8633e336 100644
--- a/dev-ml/seq/Manifest
+++ b/dev-ml/seq/Manifest
@@ -1,5 +1,5 @@
 DIST seq-0.2.2.tar.gz 12240 BLAKE2B 0f7c64e26593b012b60cfdcba02dc2748558c46a72789c77eaff70bcb24ab601895c429aa16dc066151323a48c312a372af5e19cebe0886e9203d55436c09cb1 SHA512 cab0eb4cb6d9788b7cbd7acbefefc15689d706c97ff7f75dd97faf3c21e466af4d0ff110541a24729db587e7172b1a30a3c2967e17ec2e49cbd923360052c07c
 DIST seq-0.2.tar.gz 12012 BLAKE2B 2321caabaefd98d4237d6ede034007ae5a4295765df4df21d4f0d475f097461992e4619f817ea7ebb20a3023e9d175237d636ed99bb8b1ca7b097c805daffbe8 SHA512 b2571225a18e624b79dad5e1aab91b22e2fda17702f2e23c438b75d2a71e24c55ee8672005f5cc4b17ae79e3b277b1918b71b5d0d674b8b12ea19b3fb2d747cb
-EBUILD seq-0.2.2.ebuild 409 BLAKE2B 63ebca61b463b5fd8eade670d9f8a2db5093979644d5e8de59042ab30a7a0ce795dece0c3f2751495ca5215d6c3d85608ec3274c1add1ebb0c42829961cc14a6 SHA512 0b4667195eb9016a46ea4ebb32014fbf8638e4eea0641a9e41b133c6c72f5c251dc54063db4caeb119c82f1b1b48ca2ecfa12baf4d4391631ae721f0aca595ea
+EBUILD seq-0.2.2.ebuild 403 BLAKE2B 8c58bed29e07e93c0515e0208748dbc147a8acbfd0607ad2af1c49fb2981916f01601691e27c0f644c980c984627758a5fa50754b8c3e9d2137cefa3376340ef SHA512 b3cc81ebfe29d816a852cf708da2a0991fc10e2c595031c700736206d80d1c78c0dff59c04f56d3ce0862c06d53fd23e8c31f1f6ad8ba63934f20d7a5e2084da
 EBUILD seq-0.2.ebuild 403 BLAKE2B 8c58bed29e07e93c0515e0208748dbc147a8acbfd0607ad2af1c49fb2981916f01601691e27c0f644c980c984627758a5fa50754b8c3e9d2137cefa3376340ef SHA512 b3cc81ebfe29d816a852cf708da2a0991fc10e2c595031c700736206d80d1c78c0dff59c04f56d3ce0862c06d53fd23e8c31f1f6ad8ba63934f20d7a5e2084da
 MISC metadata.xml 338 BLAKE2B f947fa0825c1a3fd959515164da36ffc9694c570ed6eb6eef8686fc24b4582ee88ecb7304507c79cf2733fb77ae3570468ec8da886367d79721c81f148931833 SHA512 9d052ada92f441fa4908f4ec9a2561f7276872281ffa65f0ad92c8d0f7c15aeea11d6c887d4af7535d7d72bce3dec8f12622aee5eb9a79e510e8baaa208a54cd
diff --git a/dev-ml/seq/seq-0.2.2.ebuild b/dev-ml/seq/seq-0.2.2.ebuild
index 0027a100131d..2f4f1e6fa6e4 100644
--- a/dev-ml/seq/seq-0.2.2.ebuild
+++ b/dev-ml/seq/seq-0.2.2.ebuild
@@ -11,5 +11,5 @@ SRC_URI="https://github.com/c-cube/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
diff --git a/dev-ml/uunf/Manifest b/dev-ml/uunf/Manifest
index 18622286313a..065385afdf47 100644
--- a/dev-ml/uunf/Manifest
+++ b/dev-ml/uunf/Manifest
@@ -1,3 +1,3 @@
 DIST uunf-13.0.0.tbz 39387 BLAKE2B fa8c46f63e2f8cf44cffe0db8c0aea73a0ffb6449f4a3c7c59baf4750db8e2364686276e6e5f284b2a528a45f02400274669c4e081533fbb25cdd36c6eb8fcb0 SHA512 ade9815b1d620a055a63dd0f8c5d5c54544eacfdcf0c6059cd20f1004a1319287f71021018fbc7e652bde738a97fae7e9d0963d5b192a4b0bb6e5b95456012a8
-EBUILD uunf-13.0.0.ebuild 536 BLAKE2B 18e88fb8b2896c905c3b1b9e0989fdb7dece056f048c10e984496aaf21a1730be3d3ddc6c3ccd0632c8ff31d9e043673a2edbfddf37bfe7fd6e0ffff6b175c1c SHA512 a9e569e49b5504d970ff88a538daa1462fb0208051ab36ceab0287d6010fc1b84ad30a97e82193167db63920e8fe27bb19a3b54345627cb6b4474fa33c45f907
+EBUILD uunf-13.0.0-r1.ebuild 642 BLAKE2B 08da265b6544b5104422cd7c8be75764813e7ff25c25b58b5f44b48982616b54a48ca836b83fec5975ca811269f91a69ef1353afebbcac692985d451551dfcd3 SHA512 d2e6b64510dbb875c2ab7cfa873552e72bdeef7eda5a666a1642e9ab967ae2f0e14730046d46ef4eecb6bc9cca3564592312534ae2152f2561b0a275e2185284
 MISC metadata.xml 311 BLAKE2B aac48b9d1bd548674249d1bf7e6bffde917939ee8a30a9975871db0ae1ac6b3649286ac2ac5f63f767d489b41894a4e02155ce77a890a06e4ad9b981edeb7af2 SHA512 acbee992f129174ff16ec565e878627096346afc0b99c4b2a2f56efb7932b069e8bbc7d8918c180ebe4753593848deb5f956a2cacdf54445529b6b68f7d238f1
diff --git a/dev-ml/uunf/uunf-13.0.0-r1.ebuild b/dev-ml/uunf/uunf-13.0.0-r1.ebuild
new file mode 100644
index 000000000000..bc1af4246d94
--- /dev/null
+++ b/dev-ml/uunf/uunf-13.0.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit opam
+
+DESCRIPTION="Unicode text normalization"
+HOMEPAGE="https://erratique.ch/software/uunf https://github.com/dbuenzli/uunf"
+SRC_URI="https://erratique.ch/software/uunf/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-ml/topkg:=
+	dev-ml/uutf:=
+	dev-ml/cmdliner:="
+RDEPEND="${DEPEND}"
+BDEPEND="dev-ml/findlib"
+OPAM_FILE=opam
+
+src_compile() {
+	# Increase stack limit to 11GiB to avoid stack overflow error.
+	# bug #798270
+	ulimit -s 11530000
+
+	ocaml pkg/pkg.ml build \
+		|| die
+}
diff --git a/dev-ml/uunf/uunf-13.0.0.ebuild b/dev-ml/uunf/uunf-13.0.0.ebuild
deleted file mode 100644
index d34bf31c1772..000000000000
--- a/dev-ml/uunf/uunf-13.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit opam
-
-DESCRIPTION="Unicode text normalization"
-HOMEPAGE="https://erratique.ch/software/uunf https://github.com/dbuenzli/uunf"
-SRC_URI="https://erratique.ch/software/uunf/releases/${P}.tbz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-ml/topkg
-	dev-ml/uutf
-	dev-ml/cmdliner"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-ml/findlib"
-OPAM_FILE=opam
-
-src_compile() {
-	ocaml pkg/pkg.ml build \
-		|| die
-}
diff --git a/dev-ml/uutf/Manifest b/dev-ml/uutf/Manifest
index 49fc4d12ec38..f813845bea51 100644
--- a/dev-ml/uutf/Manifest
+++ b/dev-ml/uutf/Manifest
@@ -1,5 +1,5 @@
 DIST uutf-1.0.1.tbz 22215 BLAKE2B 58cbb8db94024ddaa02c213df4e5321ad33513370c6d1d54ac09f57821df8ac3b330c2659f9aeb0e78dfd15d2f50be714a5a5d6e6d3dcc3f81539c1a6c8c3771 SHA512 35cbee8c82a566f2fe4fcd549936d4c4dc67f5b71bfd3ea97ff25d7cf21cfb77cb5ee313c95ad26a2a61bb84aa48c300bbb79a1a7128c6161e9abe9c390a7d18
 DIST uutf-1.0.2.tbz 22420 BLAKE2B 8391f6c3cde40db3fa86b9243d8ea8fb52409aa958d1020f302d602bf7c06c44b7d93f7a6a64a1b0964c7bb5856e15178957bba48102dbd36d8efe9581db3787 SHA512 5f2dbe78eaf73a292438d84c7185c839a7ac13cee9616a7b5006990314c6a0d42b212854cc2e89d815d3c45804f94bb40af75ecb60da7092887d8dc21e968bdd
-EBUILD uutf-1.0.1.ebuild 1589 BLAKE2B 97df4d6bd39a80eaa5e1cf303b2a7ce5735cf4df7564282b6d0b98b23f6f51063c20f120eda76220aae96c80a95bdb9523bb3494149ea5cb91572b60962b465e SHA512 c56f090492fab0564607595faa7e5765ffd7e13d3bda71e0ed99841bb01183c286b7e7c552e5766626674169bcf88604a6ff9ffa720d21fdd46bd8e38cbc1f65
-EBUILD uutf-1.0.2.ebuild 1595 BLAKE2B a9958781ecb69f2e8e160ee23607ed0b6f3fe9501ec9ab3146e59e30fc475d81992976955d33a78a10f04ee895d3bf0c312dbdba97a50cc3c5c4bca40baa7afd SHA512 f233de55edd0e346bf851a824e4ce31923cf02153a874f46b46dcbf1666a1059d88170c555891e2fc52d57cb304bad6835a77a93423825e105cc8b75172187ed
+EBUILD uutf-1.0.1.ebuild 1601 BLAKE2B 68d7fd446277ba74b4551fa1ada1c93415d33fa8a95957035ba3713565f3349537965c7881b5f78445b49ce98f573d8110ecf090a934251710d242700418277b SHA512 24ffd10517018740af3c3c7ac71deee2ea509de1f23bab9e503cb687ba12168f7f5e63a10dd5430aac92faf48938144c46f31d9970a9b84b0dfb346119bd82e1
+EBUILD uutf-1.0.2.ebuild 1603 BLAKE2B 0d658aee8fa3b2923584ed7d3c5e80ab39f86c4915edaaf0b8bb9777bc61cfdb4721cb75225097d9b35d2cc7fa01e90607cdec1b8f7b434aa2752bf14b73ec97 SHA512 927d8d6f2f466cbbd6066d2225da9daccf93610f263b26c017ed0b40eceb0a54aa61076326bdeb2886f15c35ffe53532d38dec26a46824d92bb31a3405edf580
 MISC metadata.xml 391 BLAKE2B 0f8f1c945c9a92d261312c24f4f23e50eb2183ab374e7f72f3e2aadd1678b130f230f39821209ac11156a0bbf3383552ff10552a7657da7c7b76abaa916585f2 SHA512 6953d1cde6c4c779d81b451f762f7aedf2f789aecaf87ac874475003b696546918d8f894cec935bf9cfc4ecdfdc1ec816fb3aa117f90e59fceabaf90d66d5157
diff --git a/dev-ml/uutf/uutf-1.0.1.ebuild b/dev-ml/uutf/uutf-1.0.1.ebuild
index ca6cd4708b6e..d182d94e70ca 100644
--- a/dev-ml/uutf/uutf-1.0.1.ebuild
+++ b/dev-ml/uutf/uutf-1.0.1.ebuild
@@ -53,7 +53,7 @@ src_install() {
 	use ocamlopt && nativelibs="$(echo _build/src/uutf.cm{x,xa,xs} _build/src/uutf.a)"
 	ocamlfind install uutf _build/pkg/META _build/src/uutf.mli _build/src/uutf.cm{a,i} ${nativelibs} || die
 
-	use utftrip && newbin utftrip.$(usex ocamlopt native byte) utftrip
+	use utftrip && newbin _build/test/utftrip.$(usex ocamlopt native byte) utftrip
 	dodoc CHANGES.md README.md
 
 	if use doc ; then
diff --git a/dev-ml/uutf/uutf-1.0.2.ebuild b/dev-ml/uutf/uutf-1.0.2.ebuild
index 320c6dea77ec..76819981b6cc 100644
--- a/dev-ml/uutf/uutf-1.0.2.ebuild
+++ b/dev-ml/uutf/uutf-1.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/uutf/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="doc utftrip +ocamlopt test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="utftrip? ( ocamlopt )"
@@ -53,7 +53,7 @@ src_install() {
 	use ocamlopt && nativelibs="$(echo _build/src/uutf.cm{x,xa,xs} _build/src/uutf.a)"
 	ocamlfind install uutf _build/pkg/META _build/src/uutf.mli _build/src/uutf.cm{a,i} ${nativelibs} || die
 
-	use utftrip && newbin utftrip.$(usex ocamlopt native byte) utftrip
+	use utftrip && newbin _build/test/utftrip.$(usex ocamlopt native byte) utftrip
 	dodoc CHANGES.md README.md
 
 	if use doc ; then
diff --git a/dev-perl/Alien-HDF4/Alien-HDF4-0.50.0.ebuild b/dev-perl/Alien-HDF4/Alien-HDF4-0.50.0.ebuild
index 6ecb7127c2db..77189312be02 100644
--- a/dev-perl/Alien-HDF4/Alien-HDF4-0.50.0.ebuild
+++ b/dev-perl/Alien-HDF4/Alien-HDF4-0.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Encapsulate install info for HDF4"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	sci-libs/hdf
diff --git a/dev-perl/Alien-HDF4/Manifest b/dev-perl/Alien-HDF4/Manifest
index 333844c062f4..3c5caa8143a5 100644
--- a/dev-perl/Alien-HDF4/Manifest
+++ b/dev-perl/Alien-HDF4/Manifest
@@ -1,4 +1,4 @@
 AUX Alien-HDF4-0.50.0-shared.patch 1187 BLAKE2B bc4f13db33702dece41797761625842701b4023dacbf93d0c0ea12f24f0be77d5c8648f6137a308bc12dd792e16b5fc7969a824904c4ad49c075d9acf72b42fe SHA512 8cb49e09393ed983da6a65fbe8fdb42a4b156479d5b8fb65b7db0d7e674357d9ae749c64498958141215a7beb1f0bca61b738117550e03dbf253826a523d8701
 DIST Alien-HDF4-0.05.tar.gz 3408 BLAKE2B af2d7d924712c2f520b391c897172a5116f4bded164a9249270aa5eb130a0d0a95939591a0002115c9f07c4da89f6c1ab31411a6daf666f2d7f7f6b4b214665a SHA512 1c9a81a7cdb74ef86c9d0a295b9f7143d207f0b9afd19047592990c173889d1ee7cd5a33c5a6e0970cbec65af7dfd40a66fe122a32ce5864b3a461577e1754bb
-EBUILD Alien-HDF4-0.50.0.ebuild 415 BLAKE2B b345cc4eefb3808527aa9efd0f44ee71a1172decd8700b1fbbb66303b52c1447ae8a9adef1e40e0d2a3051aa5cce76c0df1f38a462f36401390b2a8fa122dded SHA512 af4560b93788f750c8b55ea904eec24136715471f10223fd7a7841a21e3eb4c528b4b1b52ec071a4eb9c81d16702053dc720d8a5715b0e83c0daa4e0e60859aa
+EBUILD Alien-HDF4-0.50.0.ebuild 420 BLAKE2B b6b4e28d3a84a71b917819f04cb9a6508cfeb1364135f4a3abf165817794e838deacfe7d8c207465c95316c7aadc69e31f9c33746da1b0263b2f4a4e2e86659a SHA512 7b489a8f553f77d9607dc0a8eef35c656a1bf4a9915707ad7400cb3f01f1c3fefdf1a329c6f9cc0cd4eb4ab32085e2d18daca248256f1fc7270cd3da9acfd188
 MISC metadata.xml 294 BLAKE2B 70d1cda9ea7f2785001a5fd2faf78cabc587ce4f33148491ddba845f0c485b6843340c3ebf2e451696072dd7d80c51ee79d81dca7f9429de9c959f40ba6e140c SHA512 8c0038d56b818641476af6a7ec0eec1ea686b6235fadb3a6b653caa6279cad41e67897035b3070e21bfd965fe64ec7e7d430391eead352332f8630474461db86
diff --git a/dev-perl/Apache-DBI/Apache-DBI-1.120.0-r2.ebuild b/dev-perl/Apache-DBI/Apache-DBI-1.120.0-r2.ebuild
deleted file mode 100644
index 838ee8c9c2b0..000000000000
--- a/dev-perl/Apache-DBI/Apache-DBI-1.120.0-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=PHRED
-DIST_VERSION=1.12
-DIST_EXAMPLES=( "eg/*" )
-inherit perl-module
-
-DESCRIPTION="Authentication and Authorization via Perl's DBI"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-perl/Digest-SHA1-2.10.0
-	>=virtual/perl-Digest-MD5-2.2
-	>=dev-perl/DBI-1.30"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-src_test() {
-	local MODULES=(
-		"Apache::DBI ${DIST_VERSION}"
-	# Defaults to Apache1 Logic, but supports
-	# Apache2 but must run under Apache2
-	#	"Apache::AuthDBI ${DIST_VERSION}"
-	)
-	has_version "dev-perl/DBD-mysql" && MODULES+=( "DBD::mysql" );
-	local failed=()
-	for dep in "${MODULES[@]}"; do
-		ebegin "Compile testing ${dep}"
-			perl -Mblib="${S}" -M"${dep} ()" -e1
-		eend $? || failed+=( "$dep" )
-	done
-	if [[ ${failed[@]} ]]; then
-		echo
-		eerror "One or more modules failed compile:";
-		for dep in "${failed[@]}"; do
-			eerror "  ${dep}"
-		done
-		die "Failing due to module compilation errors";
-	fi
-	local i;
-	elog "Install the following dependencies for comprehensive tests:"
-	i="$(if has_version "dev-perl/DBD-mysql"; then echo '[I]'; else echo '[ ]'; fi)"
-	elog " $i dev-perl/DBD-mysql"
-	elog "    - Test apache authentication using mysql as a backing store"
-	elog "      (Also requires a running mysql instance)"
-	elog "For testing details, see:"
-	elog "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Apache-DBI"
-	perl-module_src_test
-}
diff --git a/dev-perl/Apache-DBI/Apache-DBI-1.120.0-r3.ebuild b/dev-perl/Apache-DBI/Apache-DBI-1.120.0-r3.ebuild
new file mode 100644
index 000000000000..39a9379ae0b0
--- /dev/null
+++ b/dev-perl/Apache-DBI/Apache-DBI-1.120.0-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=PHRED
+DIST_VERSION=1.12
+DIST_EXAMPLES=( "eg/*" )
+inherit perl-module
+
+DESCRIPTION="Authentication and Authorization via Perl's DBI"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
+
+RDEPEND="
+	>=dev-perl/Digest-SHA1-2.10.0
+	>=virtual/perl-Digest-MD5-2.200.0
+	>=dev-perl/DBI-1.300.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+src_test() {
+	local MODULES=(
+		"Apache::DBI ${DIST_VERSION}"
+	# Defaults to Apache1 Logic, but supports
+	# Apache2 but must run under Apache2
+	#	"Apache::AuthDBI ${DIST_VERSION}"
+	)
+	has_version "dev-perl/DBD-mysql" && MODULES+=( "DBD::mysql" );
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	local i;
+	elog "Install the following dependencies for comprehensive tests:"
+	i="$(if has_version "dev-perl/DBD-mysql"; then echo '[I]'; else echo '[ ]'; fi)"
+	elog " $i dev-perl/DBD-mysql"
+	elog "    - Test apache authentication using mysql as a backing store"
+	elog "      (Also requires a running mysql instance)"
+	elog "For testing details, see:"
+	elog "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Apache-DBI"
+	perl-module_src_test
+}
diff --git a/dev-perl/Apache-DBI/Manifest b/dev-perl/Apache-DBI/Manifest
index 27b78f144de9..880af1a700fd 100644
--- a/dev-perl/Apache-DBI/Manifest
+++ b/dev-perl/Apache-DBI/Manifest
@@ -1,3 +1,3 @@
 DIST Apache-DBI-1.12.tar.gz 35017 BLAKE2B 876c9d98cd087e5e7e057d3dc298d2fa90aae6777883386e6fd33241c229b601e2b71edba3ad54bcdcd0f6ca261f524466cbe7466e0d12c671b2f165d83ad4bc SHA512 5b989856f7b6cb75a7a7a9b1ee8e166a1f5aa03475574d340933f135f813d55806f4bdf878faac49cb72a1b00f4ee23ddedb90909869771f4d613bbfd4ed135b
-EBUILD Apache-DBI-1.120.0-r2.ebuild 1591 BLAKE2B a2814021eb9e7d11cc755c8095faa47f4d34d8aa68b4e95930b6ecb470ae736f4f476b3ee58bbdcdb63c50b9afd639d8a4924206868e29fa6717cb8c0f6c1b27 SHA512 12beec975b83a24710e5de8eae3a2cd4ae3dbf8e3aedc9dd9f23b72d1fbb8578c5ce392798730001cd5da5de2be02fc28eb8c719a42d111b848e624450f5777e
+EBUILD Apache-DBI-1.120.0-r3.ebuild 1563 BLAKE2B b6892dbbda037865f22e7f44c4e3904954f8090b78d652b5e970283a9727021dc684be91d090fe13d8156925e57274086961bac4af9ffbcd1831289888033206 SHA512 1889abd8928d3d214d39d87e8b750f3a4b8df19049fcf3be6db731ac773007f557c6489a758f03fbbc72b7c893cc7c835ec8cca9c8d55ab83f58accd0a34ee74
 MISC metadata.xml 517 BLAKE2B 3226702ed61c377ff64d0e70e5dfed762a8af884ef793bc0b2969d781975efd7466d90c8b908a8c98f8f45132047725f57b26e99f6772e87f35624eb111d11f7 SHA512 eb4ab0b719d782bd7bcb00974cdef51bacea8b5886717adde81821be3ab57599b2e1387eb775f6a664d6e2809be9701594e48a35fb6084b5885a849678f59e66
diff --git a/dev-perl/Apache-Reload/Apache-Reload-0.130.0-r1.ebuild b/dev-perl/Apache-Reload/Apache-Reload-0.130.0-r1.ebuild
deleted file mode 100644
index 6af61da4f62c..000000000000
--- a/dev-perl/Apache-Reload/Apache-Reload-0.130.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SHAY
-DIST_VERSION=0.13
-inherit perl-module
-
-DESCRIPTION="Automatically reload changed modules without restarting Apache"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="www-apache/mod_perl"
-DEPEND="${RDEPEND}
-	dev-perl/Apache-Test
-"
-
-src_test() {
-	local MODULES=(
-		"Apache::Reload ${DIST_VERSION}"
-		"Apache2::Reload ${DIST_VERSION}"
-	)
-	local failed=()
-	for dep in "${MODULES[@]}"; do
-		ebegin "Compile testing ${dep}"
-			perl -Mblib="${S}" -M"${dep} ()" -e1
-		eend $? || failed+=( "$dep" )
-	done
-	if [[ ${failed[@]} ]]; then
-		echo
-		eerror "One or more modules failed compile:";
-		for dep in "${failed[@]}"; do
-			eerror "  ${dep}"
-		done
-		die "Failing due to module compilation errors";
-	fi
-	perl-module_src_test
-}
diff --git a/dev-perl/Apache-Reload/Apache-Reload-0.130.0-r2.ebuild b/dev-perl/Apache-Reload/Apache-Reload-0.130.0-r2.ebuild
new file mode 100644
index 000000000000..c50e6b88247a
--- /dev/null
+++ b/dev-perl/Apache-Reload/Apache-Reload-0.130.0-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SHAY
+DIST_VERSION=0.13
+inherit perl-module
+
+DESCRIPTION="Automatically reload changed modules without restarting Apache"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
+
+RDEPEND="www-apache/mod_perl"
+BDEPEND="${RDEPEND}
+	dev-perl/Apache-Test
+"
+
+src_test() {
+	local MODULES=(
+		"Apache::Reload ${DIST_VERSION}"
+		"Apache2::Reload ${DIST_VERSION}"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	perl-module_src_test
+}
diff --git a/dev-perl/Apache-Reload/Manifest b/dev-perl/Apache-Reload/Manifest
index 8310b9af9b44..0ee7a582621f 100644
--- a/dev-perl/Apache-Reload/Manifest
+++ b/dev-perl/Apache-Reload/Manifest
@@ -1,3 +1,3 @@
 DIST Apache-Reload-0.13.tar.gz 18908 BLAKE2B 7e231913a18c86b3c5e2e65ed2ad68e3a43451e256f8ac911d140a96b14ea32db69b7f3ffff07dfc788467721617659be3293854ed6e219b6b79c7cbffcdbe3b SHA512 7209fbd682093cca5f724050ee71d8bd26d101c3edfedb2cdaaf2e09df903e1f12cdf5cb6f4717eb8814802924359a01c89657dd5769f94c46d064db30c9f7e2
-EBUILD Apache-Reload-0.130.0-r1.ebuild 883 BLAKE2B 8cc8bf9b8994fd978d52f2c74c66c8a66653df2ab7984423661f5441afc9c86766bcb2bdc58ad01a8489e2747d4401430bdaefe99e717027d75dccfee5f3d94d SHA512 064e63d7033d7182f7d865440eb86e51ba90eba1936971df5844b912d134d5f44fba03190d24af7af1eaf4c85f7330fb8ca072ed9e9ec8e831f24d72afbd4f1f
+EBUILD Apache-Reload-0.130.0-r2.ebuild 876 BLAKE2B 0acbc4c042746d740ad2adb2b4256633dd36a313657a354e08a50fbe43dc34a479d6117d514f8e53d30e06e806b46453968a8e1e8368c4f5d06f05a25ce6f2ee SHA512 521062c3f3b533ec0d1cb2b0a6aeff674b28977797f40be6e41198aade7957581df6df31c34250e920c74684e060688c8948ef24b213cad4b815119ba1ac344c
 MISC metadata.xml 461 BLAKE2B 9ecf766fdadc91c9d32e7b0cab78e6e0719c2f4ad5edc8d31c452902d0b7e650d5cc3f37d2b6f6604570706c1f90a82117ea223194cc58f8ed1a668f456cefb4 SHA512 437060f2dc212268a40e01f37d4b72d71865e7f975bd2a14bebd5b2c2cf3d29c4482eac9e2bc98216d46079434627e380e72df8c3b995832b43a01e6155b9dc6
diff --git a/dev-perl/Apache-Session/Apache-Session-1.930.0-r1.ebuild b/dev-perl/Apache-Session/Apache-Session-1.930.0-r1.ebuild
deleted file mode 100644
index ff6664120069..000000000000
--- a/dev-perl/Apache-Session/Apache-Session-1.930.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=CHORNY
-DIST_VERSION=1.93
-inherit perl-module
-
-DESCRIPTION="A persistence framework for session data"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Digest-MD5
-	virtual/perl-File-Temp
-	virtual/perl-IO
-	virtual/perl-Storable
-"
-DEPEND="
-	dev-perl/Module-Build
-"
-BDEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		>=dev-perl/Test-Deep-0.82.0
-		>=dev-perl/Test-Exception-0.150.0
-		>=virtual/perl-Test-Simple-0.470.0
-	)
-"
diff --git a/dev-perl/Apache-Session/Manifest b/dev-perl/Apache-Session/Manifest
index 1aafc22b1e8f..a61a932d56bc 100644
--- a/dev-perl/Apache-Session/Manifest
+++ b/dev-perl/Apache-Session/Manifest
@@ -1,5 +1,3 @@
-DIST Apache-Session-1.93.tar.gz 49995 BLAKE2B 85185f30ae25d83ca0ed3bd7e926c7ccfe55495891af98cd06305effc8163f6c2afae7d4f79e3e5dface8453b1ab3a8859f0e951c261eb417ab784a08123de72 SHA512 568653b5151df61dbbc4b034043e1d4be75642122ab920a13155c4abbe052e4d96915b1453eb9f2f06bd1159d95efef7ed5905b4d2f2b8c6fdd3711d0cf5dbe4
 DIST Apache-Session-1.94.tar.gz 49899 BLAKE2B d3ee985030e9dcf27dc2d9734f741614d73a09461e106fe6f60ef877ea4916d1c0f58224e5889b6bbcce14e877bb9e3bdaf27948d9e22579fd0173f08777c80a SHA512 796874e25dfc38a45998f8e13c3dabda779c9590c768ddc706a7bdae4b9e4b74ea457617c0079dd6d8168d97c19428d7609af00d5db218ad545f3c7dd0c0b825
-EBUILD Apache-Session-1.930.0-r1.ebuild 603 BLAKE2B 94b62048f7aed40d5e4cf3f09e915d6c87a1b83ebee596403cc06f2bdbcdbd8616360fd2b6630c38b669ec474d00e434a236aedac24c976aa87c10108cb08001 SHA512 dc22030e5733492e88d7a4923b1a17da693b54a7e14e6faa6ec5c0cf07e49d88db8b91fc7ff33cf64f5fb648d35b370af81d2f99cc05a247d901aba8d9d4b47d
 EBUILD Apache-Session-1.940.0.ebuild 698 BLAKE2B 2c298e26932e1d1eec29c2b40add7a34fd9799249b8e66127fb0720b824d958a7eb12a6b356a6d812eb049940f6666bec1fd283bba161008ea38a1b2c6348258 SHA512 78f39b95e837b17ec493b289e3668ed84b6d6bbfa5cb80a2ef0b3d025145a383c6111aa5b219874884e0f6a4fa73b2fa0e5fba2fb394b0d08659d6572fc9a09e
 MISC metadata.xml 2607 BLAKE2B 2e389bcb1a6f76540e7dabada92734f269e53e37857cad11f85290357a6fb70ccf625a947ba81fe6fb1119774cbd89cc160e5c218528fc6a0bc36bbbbf57a2e4 SHA512 760a5be0493c017bf2bf8df596bd95bd58265601e525f309cb7d42edb0b2ec02e9c552c4befd5045847bb298974d179f1797812589a5e7e9f42cb9f2883b4fd3
diff --git a/dev-perl/Apache-SizeLimit/Apache-SizeLimit-0.970.0-r2.ebuild b/dev-perl/Apache-SizeLimit/Apache-SizeLimit-0.970.0-r2.ebuild
index 70c3be7cfff7..415987c7f8cf 100644
--- a/dev-perl/Apache-SizeLimit/Apache-SizeLimit-0.970.0-r2.ebuild
+++ b/dev-perl/Apache-SizeLimit/Apache-SizeLimit-0.970.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Graceful exit for large children"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 LICENSE="Apache-2.0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-perl/Apache-SizeLimit/Manifest b/dev-perl/Apache-SizeLimit/Manifest
index a3a7e25c4159..ece807e6944c 100644
--- a/dev-perl/Apache-SizeLimit/Manifest
+++ b/dev-perl/Apache-SizeLimit/Manifest
@@ -1,4 +1,4 @@
 DIST Apache-SizeLimit-0.97.tar.gz 24544 BLAKE2B 590d5861b064109688172ff362303cc5cb223e31b730558fac91e512c0df868897b8dd8ac5b59a636bc70952455c19cacf3d8a46209bcc668a6f6cf4e3b54643 SHA512 d3c4e97e3f9c7e3bb9a8868dd89ee14443f8596c900b85ea4b6d766b9d71001e3e920871adf58829c8d17d03dea6fd48901d2082b83c7382cf0bf30b8238472a
 EBUILD Apache-SizeLimit-0.970.0-r1.ebuild 540 BLAKE2B 0c878020d02c722e3a37961923a4a6417e6cb7a1f7566ed209c2eb4cb1a1825ca4044db82efa953c8de67e00a505d5f40ff1b03c0838b31b15efac5cdd63052f SHA512 c60f029d4689c0fb41be9934eef67b470e164cd4ccb05bd3d4eff8d4db7155d6dd854a4b1c5a4b6c1507e1476ff4feff25699915abe57c8ba4c29f67aad734f3
-EBUILD Apache-SizeLimit-0.970.0-r2.ebuild 598 BLAKE2B 4e57f70814c1249b469dcf0bf43ccf819898c7d1ed1ecb78b5ba446ab11f32d5fe342e66f6b44bc34af47f4a5724a6c7517e805141c54574cdbe95ddc56ae80d SHA512 b289686a8b0d0575e67a808661035a3261f77625d914f077e7ab6d8976817b9302f7ce90425f184685c103c5295e378e0d13a0fc7c9ffdabc934e5eaaf9f5344
+EBUILD Apache-SizeLimit-0.970.0-r2.ebuild 596 BLAKE2B 87fa7eaac555983c81148209c17b9962296d1ca4e8859478fd593047b207eaee1de0cea5e28da9df882c1bf043c28e1f7af1f8fd0f568bd0a578f63dd68907ab SHA512 a142535749489a4d70dd7a6a3b0baccd492faed78b96d83c4ee9754f99d0ca543d85d1cdb2f4fb5ef164a8e51ad944e837a50aee3c778dafcb5da74f191b4a0d
 MISC metadata.xml 524 BLAKE2B d3f4a57169680703b661ceb8690daa4adfdab1d8bd12e58ef9b5affce0aa516f1ab3e9084ddbf7123bb8853bc7098c09dd470c92708736f4a6734034ae128dbd SHA512 01072f5cb7efab9c1e0aea0216b829dbc8385eaea2ee9e13be4a225f461c3fe4ec19fdd8814055a027241b2c1d4e58a0bd7267c5a40aa49428a08411bf5c9776
diff --git a/dev-perl/App-Cmd/App-Cmd-0.331.0.ebuild b/dev-perl/App-Cmd/App-Cmd-0.331.0.ebuild
deleted file mode 100644
index 13885e870d8f..000000000000
--- a/dev-perl/App-Cmd/App-Cmd-0.331.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=RJBS
-DIST_VERSION=0.331
-inherit perl-module
-
-DESCRIPTION="write command line apps with less suffering"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
-
-# r: File::Basename -> perl
-# r: Text::Abbrev   -> perl
-# r: constant, strict, warnings -> perl
-# r: Module::Pluggable::Object -> Module-Pluggable
-# r: Sub::Exporter::Util -> Sub-Exporter
-RDEPEND="
-	>=dev-perl/Capture-Tiny-0.130.0
-	virtual/perl-Carp
-	>=dev-perl/Class-Load-0.60.0
-	dev-perl/Data-OptList
-	>=virtual/perl-Getopt-Long-2.390.0
-	>=dev-perl/Getopt-Long-Descriptive-0.84.0
-	dev-perl/IO-TieCombine
-	dev-perl/Module-Pluggable
-	dev-perl/String-RewritePrefix
-	dev-perl/Sub-Exporter
-	dev-perl/Sub-Install
-	virtual/perl-parent
-"
-# t: IPC::Cmd -> perl
-# t: base, lib -> perl
-DEPEND="
-	${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		!minimal? (
-			>=virtual/perl-CPAN-Meta-2.120.900
-		)
-		virtual/perl-Data-Dumper
-		virtual/perl-File-Spec
-		virtual/perl-IPC-Cmd
-		dev-perl/Test-Fatal
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
diff --git a/dev-perl/App-Cmd/App-Cmd-0.334.0.ebuild b/dev-perl/App-Cmd/App-Cmd-0.334.0.ebuild
new file mode 100644
index 000000000000..16150bfa3317
--- /dev/null
+++ b/dev-perl/App-Cmd/App-Cmd-0.334.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.334
+inherit perl-module
+
+DESCRIPTION="Write command line apps with less suffering"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+RDEPEND="
+	>=dev-perl/Capture-Tiny-0.130.0
+	virtual/perl-Carp
+	>=dev-perl/Class-Load-0.60.0
+	dev-perl/Data-OptList
+	>=virtual/perl-Getopt-Long-2.390.0
+	>=dev-perl/Getopt-Long-Descriptive-0.84.0
+	dev-perl/IO-TieCombine
+	dev-perl/Module-Pluggable
+	dev-perl/String-RewritePrefix
+	dev-perl/Sub-Exporter
+	dev-perl/Sub-Install
+	virtual/perl-parent
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? (
+			>=virtual/perl-CPAN-Meta-2.120.900
+		)
+		virtual/perl-Data-Dumper
+		virtual/perl-File-Spec
+		virtual/perl-IPC-Cmd
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/App-Cmd/Manifest b/dev-perl/App-Cmd/Manifest
index 287b9d2e9503..290ef2ae3742 100644
--- a/dev-perl/App-Cmd/Manifest
+++ b/dev-perl/App-Cmd/Manifest
@@ -1,5 +1,5 @@
-DIST App-Cmd-0.331.tar.gz 48848 BLAKE2B 84a5958879505499cb826a82cbda675a67dd4421378a3a7bb7943f39e68c414ceb5dddc9cf5000e0164f1553cb74d82f1c9f8f980c71a52811933d89c3282dc2 SHA512 cb5f4515417affc46e48aa0cfecc37b2856a35081f1e1a4197a1ef020de69a5d0ba19bc54be6c84f239147e8dbfb538e7b8ea760431a2d0f4b369684e4ea42c6
 DIST App-Cmd-0.333.tar.gz 49657 BLAKE2B 8958299e26083845eb6ea00f00b6629c823245d652a08b9ddd72a42da3f421dd7d5c1d6a667d2537dd1305ba9ff8eff19689d6810aeb308b616c62d50a4a57de SHA512 59b8526cc6efa29e9f5eafce1d9adbc9c706314aa8e7265d7be2c0c57210384a7bcfc2ef5650d36d9715a5da96a829a9a75524a5bed58c21eac1d35f286ef765
-EBUILD App-Cmd-0.331.0.ebuild 1142 BLAKE2B f9f9e12537efc65b43a4687efe72814b00ed3c272496200624bf70687a69ae2f85ecc4e5f04ea6fc5221304a74334244997c2871f20a8f18bec8299451482ed8 SHA512 37e55c6a1e7b6753e0c03ee63f8243776a48267c1a22231fde615a532649aeac174798daa3bb8bba4c15ed523353bd792c8b006dfeb47eda1076eb9fbd28d035
+DIST App-Cmd-0.334.tar.gz 50175 BLAKE2B 25349c7f072c01056b8ccd62a8e22c52cc5ec312ad8799acfca8fa30a5f61424ce11320eb7ec05bf9f69badc9cf7bd506581babeaf4f4d863cc8b9f3d4278e41 SHA512 bc45141475cc389afea4220c5197559be0e379ee7c9668e52fae9864c5747f4bd487edf44abc25a21ab5b428689b93ed7607e4fe8a8844faab248623b027288d
 EBUILD App-Cmd-0.333.0.ebuild 1142 BLAKE2B 01b867b67b5d74d20e223ab30171dfeda8f3300faaeb414bd99030d619df2542df954192f41899474b34b616bb925347a2ff271d6dcf3cb0f991f3680bc1c986 SHA512 c47dc57db36b71ba9eb5a0b1ea87184ace497bc6cc6b2ae1aa41fc371b493a4b94abb807d062dbaf7e4f4ebd5fc595aebebcdf5ad4cd2747861c53fe4177ea3d
+EBUILD App-Cmd-0.334.0.ebuild 879 BLAKE2B e4b3d62fbf4a8eeada5f8479d8ffad5b675224dac50107919154ef72440976343419df193c6d1162a0b88dd315b67db3731dabba4b01a3ee76adf6247f4e0ce0 SHA512 c87479f144674142f19efdff9d551c5e3223f185777ea669fcb5a6123979736e4725aa70e192c11f2696581bc85505598965a3d171bd2debf724ef62b9bd17d0
 MISC metadata.xml 1359 BLAKE2B 1b455678f3b3f9e8016db283b638a09adca0c27564e6f17405d209a891d479327a9903d0710d21e2809738e08b2661bb8ccf8ad047b5b54036b58676e3ebcbee SHA512 44238ca6d4e816b93d30387932faa9363eb9cb021c0cd6b6fcd35179548311647b6bd5c85e2edf6a660c6560aaece5929dcb8d4161581b45433e7471519ac9af
diff --git a/dev-perl/App-cpanminus/App-cpanminus-1.704.400-r1.ebuild b/dev-perl/App-cpanminus/App-cpanminus-1.704.400-r1.ebuild
new file mode 100644
index 000000000000..2b164f69d523
--- /dev/null
+++ b/dev-perl/App-cpanminus/App-cpanminus-1.704.400-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MIYAGAWA
+DIST_VERSION=1.7044
+inherit perl-module
+
+DESCRIPTION="Get, unpack, build and install modules from CPAN"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc x86"
diff --git a/dev-perl/App-cpanminus/App-cpanminus-1.704.400.ebuild b/dev-perl/App-cpanminus/App-cpanminus-1.704.400.ebuild
deleted file mode 100644
index e3a8b1ae6699..000000000000
--- a/dev-perl/App-cpanminus/App-cpanminus-1.704.400.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MIYAGAWA
-DIST_VERSION=1.7044
-inherit perl-module
-
-DESCRIPTION="Get, unpack, build and install modules from CPAN"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
diff --git a/dev-perl/App-cpanminus/Manifest b/dev-perl/App-cpanminus/Manifest
index db0138683745..26820891d996 100644
--- a/dev-perl/App-cpanminus/Manifest
+++ b/dev-perl/App-cpanminus/Manifest
@@ -1,4 +1,4 @@
 DIST App-cpanminus-1.7044.tar.gz 316368 BLAKE2B 093f48282349be882afbdb2480e42ea73ece061fe01919c8d7bbf8890ccb83a699be0a54126556620e03b1cf9da195a9c266186c9b84427d4bba57ebd11b62a9 SHA512 85e88de8fbefabdfd84fe8aeaa8294d58d63e27276cd6d8b8dfc5dc4cd6c30c12f5859f30e4930842d6d06af50c88d71358dee49c93821234c811aa39de822d7
-EBUILD App-cpanminus-1.704.400.ebuild 420 BLAKE2B bdc8096b2c3138702eeac8e66b5966867df045d8fe392da9183ea72e0535152f3eeea780588eaf69378893a3ef6879dd84a7352c4c5d1586c2373df48b0a73a2 SHA512 e71a9a471feb50528ef96e7ad457e059767073f3ae3d5c913b4c1f26bf1e65ab6a31edcbbdaff0cb9f3b9a0e24c6fc71577621a6002459bbb8f1edb22c709f03
+EBUILD App-cpanminus-1.704.400-r1.ebuild 279 BLAKE2B 52cea306ae533858be7e093e069e6fdd315165e80a6145e20601d70307d41f58ac9834e5da53ecdef4c86384dd915beb3dfaef11c6d6bc86be47ef333eb9dbc7 SHA512 e59bc0e2f2f45b9f7a1ef95dc5d34b83f7b774bba1e8f2973e75a72cd4ad1f1294c6fb7557fe574ff53ca5df4df870eb2596562c0ae2968d9aba5fb5ade014dc
 EBUILD App-cpanminus-9999.ebuild 2820 BLAKE2B 22f2052c1fdf895a3a0bb26c3a403100082266766d3d4a3f3a19f6ca55e50897b2e4dd330e5f9d53b49a2739d7e221822277892d310ebe5e68d40bd7938c0413 SHA512 8344c27b6534c2dd21df5df340ecee380727576ac1facd9ef4db10fec6a7c85e7df9502931c294cf53c86ffa9037513e03be23f608914af46b01a65e38dcfcf4
 MISC metadata.xml 423 BLAKE2B 9d1e597191ab1defbe2cf322012e1dc5013cbfccddd7905e6dcb65952eabc3cc5fbc5cfb04427be90d0478a965f817eb24e19f4a60aa11e01892eb8665786c55 SHA512 2db0a705cf4d3b0e6838193b16b4996555f9ef0321016d12832896b5c676dd3037be44697229ac8dc01ed427406ecd98ec98e392e79e8dcf3adb85b0cb30e07d
diff --git a/dev-perl/Archive-Extract/Archive-Extract-0.800.0.ebuild b/dev-perl/Archive-Extract/Archive-Extract-0.800.0.ebuild
deleted file mode 100644
index d9be24a97d3b..000000000000
--- a/dev-perl/Archive-Extract/Archive-Extract-0.800.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=BINGOS
-DIST_VERSION=0.80
-inherit perl-module
-
-DESCRIPTION="Generic archive extracting mechanism"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	virtual/perl-IPC-Cmd
-	virtual/perl-Locale-Maketext-Simple
-	virtual/perl-Module-Load-Conditional
-	virtual/perl-Params-Check
-	virtual/perl-if
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
diff --git a/dev-perl/Archive-Extract/Archive-Extract-0.880.0.ebuild b/dev-perl/Archive-Extract/Archive-Extract-0.880.0.ebuild
new file mode 100644
index 000000000000..4a70481f9c9a
--- /dev/null
+++ b/dev-perl/Archive-Extract/Archive-Extract-0.880.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=BINGOS
+DIST_VERSION=0.88
+inherit perl-module
+
+DESCRIPTION="Generic archive extracting mechanism"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	virtual/perl-File-Path
+	>=virtual/perl-File-Spec-0.820.0
+	>=virtual/perl-IPC-Cmd-0.640.0
+	virtual/perl-Locale-Maketext-Simple
+	>=virtual/perl-Module-Load-Conditional-0.660.0
+	>=virtual/perl-Params-Check-0.70.0
+	virtual/perl-if
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/Archive-Extract/Manifest b/dev-perl/Archive-Extract/Manifest
index bad724c43fab..734a1a6c18d7 100644
--- a/dev-perl/Archive-Extract/Manifest
+++ b/dev-perl/Archive-Extract/Manifest
@@ -1,5 +1,5 @@
-DIST Archive-Extract-0.80.tar.gz 27813 BLAKE2B 0775eab96cfb67d742ecb2663fc58133368358187f22e89ed0b1bb113bd0efd680b800225fb65ab11379feab767aa3e6c31a7cac2b018acb6341799d4d605fb4 SHA512 2f216ea29639c4d8b7b19e4b23542b6f69e970cfb0188dca55ff7ce7d3a3021e43129dbdf81b82f7d97d0080d00f858c6af3595520b6bacac30073a8b25ea4f0
 DIST Archive-Extract-0.86.tar.gz 28033 BLAKE2B 0a2f6551d31d43256405379c980e5f671e4a9b168050a0b08b8ecc2d076b5f3cdc49075f1001646a3d2c0b9eb60aefd79aeb11997f2de3766cd9b23839bbdac7 SHA512 a091b8c489275b8dd3d38e52e983bef7cab7d642e0dc8f6e95f1d8d006d769857b4e5950778bddd3044d6f11b3563c7796361e88869f60a9875529b78c9d1c76
-EBUILD Archive-Extract-0.800.0.ebuild 597 BLAKE2B 632c30840d31a1233d76af531d75ea1d05eda3e62e61ef613c80c18f7ee6b26b8c0c5380fc1da8921bb00bb352e8c933790c1f1c78305e75d76d62caea23d13e SHA512 543e460cc853bd51ad9b80b4d14029c9946b801e775baa1e51b07df67fd6daa12cb9b2c47d1567dac9c365b794893fd9f3dae9087ed395aa994fb8e9ffcd1ff6
+DIST Archive-Extract-0.88.tar.gz 28294 BLAKE2B 59c19013c486c0c691d7436ca70805275b448b4725ee955f4b1f4fd37fbf46b5d80a38c3406f0bedba7f1a2c7c56f1f84d02df7d5bef1f5b7d4868eb70557a6b SHA512 6fcb6a49e59fac5340663e5d906978af390f4ba66da6c4f02e6b2db666da68440af59ec93a687d13316089b07237b2213df55d8ebb940c4fa9eadd09d1bacc86
 EBUILD Archive-Extract-0.860.0.ebuild 698 BLAKE2B 7702f402551907ada3672080768d161533c1925b6d9660de9bac199ccfb51abb676c72daecf64c5070ea3b850fb74e5f8308f12a39ff036e166c331cce3d2e42 SHA512 ae2908ea7f7ef5fa270abed0bc351c4753b8b8d8b55866c6fb2e91b2faa490b54844ec1e60e0f582ccded19fd6a10a216451ffbe9bb819459be5dfb7ff5cd34b
+EBUILD Archive-Extract-0.880.0.ebuild 667 BLAKE2B 94112f0b53cf7c641c29a0e5b1048af76a553a13da219f50a058b1cbbc6c2652dbbb95880e63947a89ae4c0054ead64986cc6b83b99006e014f4471f5ed621be SHA512 36e98b60c45148183507a0a40feade6f50a73f18d6b3e967d305382544a87a164e52a8666231c78a5f24bdfb3189fc6b5cff808fe170e961075862a757a561c1
 MISC metadata.xml 403 BLAKE2B 252ca6445d3a5ee3b87c185860f3225b8155f1abb70234c42d5157f13c79fc77d6211aa21d54afc81e1a756b2206c6f81b31efc55229ea0095d9f3b7bdda2ad3 SHA512 77270fdc98059e4e58a8016efdc34e4cd6b3b63bb89a4c17eabcc27b74cc1dee965d8f47274f8b490adceb5e9e7ba48d18167d416125b467039c4281f14f56f5
diff --git a/dev-perl/Array-Compare/Array-Compare-3.0.3.ebuild b/dev-perl/Array-Compare/Array-Compare-3.0.3.ebuild
deleted file mode 100644
index baca60b7b1b4..000000000000
--- a/dev-perl/Array-Compare/Array-Compare-3.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=DAVECROSS
-DIST_VERSION=v3.0.3
-inherit perl-module
-
-DESCRIPTION="Perl extension for comparing arrays"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	dev-perl/Moo
-	dev-perl/Type-Tiny
-"
-DEPEND="
-	dev-perl/Module-Build
-"
-BDEPEND="
-	>=dev-perl/Module-Build-0.420.0
-	test? ( ${RDEPEND}
-		dev-perl/Test-NoWarnings
-	)
-"
-PERL_RM_FILES=("t/pod.t" "t/pod_coverage.t")
diff --git a/dev-perl/Array-Compare/Manifest b/dev-perl/Array-Compare/Manifest
index 3a7c7b8d7234..801d610e5a8c 100644
--- a/dev-perl/Array-Compare/Manifest
+++ b/dev-perl/Array-Compare/Manifest
@@ -1,5 +1,3 @@
-DIST Array-Compare-v3.0.3.tar.gz 9831 BLAKE2B 2440fdac5aed53e4195b8f679aa1309870b0be3c1c00c745d68f4c038cb57d5deac1c852b0d63cab5cbfca5cbdb956c1ddd3b19596ddb876bf9750da1e7caea6 SHA512 a2b3b7c7f153c30548d3e90bbe77ad8d609cd0abcb6a0f188c90b4f09f9be457906694cdd3d819a75a33aeab088586c0636d3f212dd5354d0cbcbe713897c867
 DIST Array-Compare-v3.0.8.tar.gz 9977 BLAKE2B a624189d07497112a4194b1120db4a1838a3925e4b3e80baf002613f5f52beb0bac9461d465e9e2b8a22f8f5643cf40c29e3f179c7fe2c253cfe2f129a78007d SHA512 648dbf2a65d94c3bfaab34ec765d0ad7e86f5c0b704078278f43a28a668cb70606a039cceab96f31af439f661c2c6538571b142ec938738f3cb94438b40e2838
-EBUILD Array-Compare-3.0.3.ebuild 575 BLAKE2B ac927dc4957f8da5a076981088d8a01ded5d8db9b37f512e5cf12e1cefabe13edacf3df4f0cfd6bd6d93b1f2b7a92ae52f1032ea41f295022d6410d86261f35b SHA512 77e4eb9592dc096ff65d275b7e8d7657ccf286e9c1da014803cca802542e2da7102f59d6c0b50992539f01458999ba91acc11bf6b009548bb7c53d6c6555543a
 EBUILD Array-Compare-3.0.8.ebuild 575 BLAKE2B 4046e67f4e4683033150633d1cbf83736a72bb80e68ffdd13a7aa22b26e3748937b593db768b58f2d05cc3ea2e57146b86e04051947435d3c023137e6732b1b3 SHA512 adf86638c7abb3047c4f7705695a5ea8d80470ba09084894cd50ffe067c920863aba128a295cd6ef162736f735e04a32383e0d820748df8e5439f4a22fa659a4
 MISC metadata.xml 399 BLAKE2B 2d3b78b9e39e4a75b6081154e3002b771ea0362a13b59f1445b776090d3ededede7710239c03cfdfb3783c03c18f21133b971fb246522c62470bcca9113585ae SHA512 760578bf7554392368cd743017fca19837331e0618e702e0f435e71926d9d76160cc25614cbe4e6abeb33bcdbd12919129505c8121c3ad1d6f7567536e9b8d5d
diff --git a/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.70.0-r1.ebuild b/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.70.0-r1.ebuild
deleted file mode 100644
index d97aeb28aeff..000000000000
--- a/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.70.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=TJENNESS
-DIST_VERSION=3.07
-inherit perl-module
-
-DESCRIPTION="Interface to FITS headers"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-perl/Module-Build
-"
-BDEPEND="
-	dev-perl/Module-Build
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Astro-FITS-Header/Manifest b/dev-perl/Astro-FITS-Header/Manifest
index eb99a520dc65..fdd9dfbee3a1 100644
--- a/dev-perl/Astro-FITS-Header/Manifest
+++ b/dev-perl/Astro-FITS-Header/Manifest
@@ -1,5 +1,3 @@
-DIST Astro-FITS-Header-3.07.tar.gz 105979 BLAKE2B 0193f6691aae31134e2537c328a0aaef501b1ac4289df2aa825f28e01ade37338d34ae3979f0d71c1d6706e5cd567cc158a5560b4002bdb8baf192109ca64fca SHA512 21b72ca2727fd77c6da01407ab97ac1bc3bfb4f6864d7a4728fa3f9cbad07b64ca20445bc8daf6c34a3523ab16a2b688cf99936157a41f36147b39f05a6c1f90
 DIST Astro-FITS-Header-3.08.tar.gz 116038 BLAKE2B 1b8b96e7a352634083322746970cf60855b81ec811fe82eddfd7b49bd037f660a292d9656bdfffc89b19370424ca1e8f343d7ab4a7c2c0dd8c457b0eab0ccd7b SHA512 c94a9da46212a2db95c1ce32da2609869bc85687c236919791c16b06f1787311ee3ac3323baece790c04d56818754c6f487b15c20487ded9ebe61bf97cc11c29
-EBUILD Astro-FITS-Header-3.70.0-r1.ebuild 453 BLAKE2B 1a1f02ac4777deeaa53e49e9968625b4de91f96f485eb93a6cfe71fa4f2ca6fc88bfc7282eb943e9b720d3cfb54d28e95e0f79c795ab7b4964bdc714dbe4c247 SHA512 331e409d797bb1710fdb11c4e808fc073b26fcf73e4aa0aeeaee3ecf26836c9ece2a751131329dda649e7a889806964cc403b198d94ba2748170c143a3e9fbcd
 EBUILD Astro-FITS-Header-3.80.0.ebuild 424 BLAKE2B cc010c122ec56faf90f8246205a0c71524fbabbf21903968476fe33a2fb7420c4e405e17c33f6ec5a08e767616f9ac8ece0060c60dacda5efb93727ec89bf16e SHA512 142b4d22acb26bae8d01eefb85a6f3516e3eb92a53d8561737f1ac425cf97ebcc8821becb9106be366c7e5cf977f3b49034a30345a7efe5038f81cb2e5d9007d
 MISC metadata.xml 844 BLAKE2B 0519b8ea183ed10b9b20fbc3a75fd74f5e29e1a2ab6b051d738c4ac8c7bc906ebee216d7fbae09965bf8fa753840edc91ce2ce3405425aaad33d179fe68eef36 SHA512 c8fa62cbb006c3b533d119b7d2340a28e3b1a5740e9473da5e043e734cdc20a076aff65c6a85ee6465e69353cc042caae28872b3e9241a09f466d9a07f8d65a7
diff --git a/dev-perl/AtExit/AtExit-2.50.0.ebuild b/dev-perl/AtExit/AtExit-2.50.0.ebuild
new file mode 100644
index 000000000000..17169038cfa3
--- /dev/null
+++ b/dev-perl/AtExit/AtExit-2.50.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=JANITOR
+DIST_VERSION=2.05
+inherit perl-module
+
+DESCRIPTION="atexit() function to register exit-callbacks"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	virtual/perl-Exporter
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Capture-Tiny
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/AtExit/Manifest b/dev-perl/AtExit/Manifest
index 0145f7b85e1b..4b3e38e73ac2 100644
--- a/dev-perl/AtExit/Manifest
+++ b/dev-perl/AtExit/Manifest
@@ -1,3 +1,5 @@
 DIST AtExit-2.03.tar.gz 11263 BLAKE2B 0ae54e3eded9bda74e314f1c5b6c7d9013b479671950f0fc390568f7f6b8a715dd2c59b30ae131669fa1be8565c9f088ea9763ff765314b11eb4ee55f98a7979 SHA512 ce522b44ad5c2360c8e7f7f49257fe50f0079bd2070ddaa33916b2484ef8e6f6430df045e5693356c37651aa96ef6a7e7694a04ecbc91817d12d032681105b60
+DIST AtExit-2.05.tar.gz 11793 BLAKE2B e0bfc9bb49c843a4920d0e9c3c2d503dbd952bef5439e5606b07e0ae104ff601e2d18c1cc0b4713b22818f3c0de9f8c3a038fda1d85f9e70a37fd7f63e8cf5b0 SHA512 1d65da5c384e09d0f85f5a3c57f63f3b19d14558d07f0cb8ef388d01298b788e405562750503a9cfcf6d841866649ead1e96fcf501a84924680bc85a904f64ef
 EBUILD AtExit-2.30.0-r2.ebuild 574 BLAKE2B 7f4d727f35f415b26a53d56d2bc92670f2d4ad5d47796d5739094d79270adfb51f6d31d3d1817638a8136c539b64dbafec22230bf61c677a87b7dad8e3ee67e6 SHA512 9c45e3833ec7771aabb708c3d478ef06daadb0d93e55eeed6b11c6fcf66e529ef83543fbb8b0bbd5b316b650640c254040e3c50799e2d0188b32e39f6e08ffa5
+EBUILD AtExit-2.50.0.ebuild 455 BLAKE2B b16a7491290a3a66408a147f66006795f4a02140b40ef91f4db4d9fabd5afac117be1d1babf87ecac63d9d2ef0491fad0206a269496a731bd0f9aaac238f730d SHA512 ac86b7291efcc59a4070fbd54101cbc0bd5a30b510238de63c6739c655a3a053316866009f9f5055a1de0f524d0678df0b602e40341992f0844cbb8c300a8857
 MISC metadata.xml 384 BLAKE2B d57ccdd2fea7eb8858286f80f641a47dfb58a26a1a72aea0165335d6245f5abee78dd276e71522b449903fafc65e5cc10bfb8b3acee8ada2fa08b88d6a0b80d7 SHA512 2ab2be86e382c909121f921549eb402113cd47d3b0045b8067e3a8c5ce94ca8ca9f63510581cdea6ea3ff9d3f58cd05ab4930bf63bcca02261abfd8a8e3d75f4
diff --git a/dev-perl/Authen-Radius/Authen-Radius-0.310.0.ebuild b/dev-perl/Authen-Radius/Authen-Radius-0.310.0.ebuild
deleted file mode 100644
index 530753d946ea..000000000000
--- a/dev-perl/Authen-Radius/Authen-Radius-0.310.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=PORTAONE
-DIST_VERSION=0.31
-DIST_EXAMPLES=("contrib/*")
-inherit perl-module
-
-DESCRIPTION="Communicate with a Radius server from Perl"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-Data-Dumper-1.0.0
-	>=dev-perl/Data-HexDump-0.20.0
-	>=virtual/perl-Digest-MD5-2.200.0
-	>=virtual/perl-IO-1.120.0
-	>=dev-perl/Net-IP-1.260.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
-	test? (
-		dev-perl/Test-NoWarnings
-		virtual/perl-Test-Simple
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.26-cisco-dictionary.patch
-	"${FILESDIR}"/${PN}-0.26-no-install-db.patch
-)
-
-src_configure() {
-	export OPTIMIZE="$CFLAGS"
-	perl-module_src_configure
-}
-
-src_install() {
-	perl-module_src_install
-
-	# Really want to install these radius dictionaries?
-	insinto /etc/raddb
-	doins raddb/dictionary*
-}
diff --git a/dev-perl/Authen-Radius/Manifest b/dev-perl/Authen-Radius/Manifest
index fa061071f6b1..fb73aae80e74 100644
--- a/dev-perl/Authen-Radius/Manifest
+++ b/dev-perl/Authen-Radius/Manifest
@@ -1,8 +1,5 @@
 AUX Authen-Radius-0.26-cisco-dictionary.patch 1176 BLAKE2B a090393a57ee39c06345d0969f5c54de30158265fd548fbe88d7dfd40335523c9ef3c9c5d5ae6432796d992c4f19e793544013bbdb7f9c5cc7854a66ae5a15c6 SHA512 f040137ade128614a0f35fe016a58989e3d5bf8fdc2ed20358223fd5ac4792d72edc135e0c1a4335be3f66d38e0120d8d42950266def30b273484ed6bda66b4c
-AUX Authen-Radius-0.26-no-install-db.patch 1234 BLAKE2B 004c2fefaf43efedfcf92bacff4139795a66c06394984f2c5cda14951214d0fdb97a84f4fbe9617b991a052091281037fcfb2592df0a620c4b8090c9365c5eca SHA512 ee947157e5bb02ccb171554d5b83e44482f0fc44b5d2c1e3d3488943baa175a87950999930ea79dd087c731b145ee15bcf394d784cbcabcd73a2f4ef8362b485
 AUX Authen-Radius-0.32-no-install-db.patch 1236 BLAKE2B 9e17c1ed8faa32ab0f7faca2e19f85204f18521f99576ff386e2f3764b7b3cd665a4f41ccb649aa0d128f2c758b744db011804260d1a2d1df4339aa56d56d124 SHA512 ea66e67af47419772b199128fc52e541a91afeabb34934b8a310d944010fb1daaf3699fff668a81151c2694f86a23429477d166452a40ce717adaf896f229980
-DIST Authen-Radius-0.31.tar.gz 51311 BLAKE2B 52aaa623ca28b1b406c027fb54f38c9f24b347815aefb3336649b4ff505a0b97db516b6877546bd330505516f3481934b0c46975c017ae76ed475bc476bd1c6d SHA512 6b78254a6a94f67bd3a5529d4313da779d630a57e2300b02a49034c153b34fec0c6e745c5419f5a5e3ba2996d39907834d3f909ce9fdbd0edc6c43668f89d380
 DIST Authen-Radius-0.32.tar.gz 51366 BLAKE2B 12b18554fccd56aa3668224e2e1a932108993ef845b10b3220eed212fb3413d875cdeb8e8fdef2ba439b0b0ab72417bbb9c830bc2a023a03a0c221b3f52b3170 SHA512 323bddead9465d60da8d1b0f4500fec436c14a8c82552b24da54a6798c0583dffb37005f7abc627ea9532ca46bd442063cddd52d8c5923aa10fa7954c728bca5
-EBUILD Authen-Radius-0.310.0.ebuild 986 BLAKE2B 8ca3ef42d2ffa3dc40b93bcdeeeebaca6f903a8c67df69326e244eca7ac4d2bc10fe782572211a29433dfccb5fc47acc7580a786da1475dd6eb5f37375c9c6de SHA512 9c8fc015aa9ea0bd8dfa90d49d552f4ccb66daf43f8eb1f357df4a517cfd3199f64fa80aeb2e9e241e8bdbe2039a5ccc053abd440824589cde322d27f9133874
 EBUILD Authen-Radius-0.320.0.ebuild 986 BLAKE2B 293423bb066dd4f00be145f7074a6c026354e5aa70a5cb68210e2b515f7b178e4b449c7f1b4ed7aaa601b7f2bed143da053ff1513b143bab9e875f2514e863a4 SHA512 bd2247a40a9f13a287313e9054071933697a0ff67deb1e310b8bca0f9f4e2b1389518dfca0591175777352eb69191a8aa3b8a1dc974c1bd41544d2959f25fe03
 MISC metadata.xml 399 BLAKE2B da5e404d785df50126b2074f7419d182301101cbf0e3a50ef6227cc60647264e738f7df6f36298c867a37ff36cd329515dc2d1baf9e0859e01527621fd2f2893 SHA512 0de28d5d6e43f34202b4e0a67292e3550c90d8476e170ca6f61ef1e878c719a2c79d0c153ab1dfe57f917a0278d428e501c86ea640ca4c5c626f87d2b8bdca57
diff --git a/dev-perl/Authen-Radius/files/Authen-Radius-0.26-no-install-db.patch b/dev-perl/Authen-Radius/files/Authen-Radius-0.26-no-install-db.patch
deleted file mode 100644
index 746ba993defc..000000000000
--- a/dev-perl/Authen-Radius/files/Authen-Radius-0.26-no-install-db.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 57b9f1a710c2eee1c8f54eb87d164584aa9532ce Mon Sep 17 00:00:00 2001
-From: Torsten Veller <tove@gentoo.org>
-Date: Mon, 5 Nov 2012 01:02:48 +1300
-Subject: Remove automatic radis-db installer code
-
----
- MANIFEST                                          | 1 -
- Makefile.PL                                       | 1 -
- install-radius-db.PL => install-radius-db.PL.orig | 0
- 3 files changed, 2 deletions(-)
- rename install-radius-db.PL => install-radius-db.PL.orig (100%)
-
-diff --git a/MANIFEST b/MANIFEST
-index a8e2801..09913da 100644
---- a/MANIFEST
-+++ b/MANIFEST
-@@ -4,7 +4,6 @@ README
- LICENSE
- MANIFEST
- Radius.pm
--install-radius-db.PL
- t/decode.t
- t/dictionary.t
- t/digest.t
-diff --git a/Makefile.PL b/Makefile.PL
-index 45653ab..7f1b202 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -4,7 +4,6 @@ use ExtUtils::MakeMaker;
- WriteMakefile(
-     NAME => 'Authen::Radius',
-     VERSION_FROM => 'Radius.pm', # finds $VERSION
--    PPM_INSTALL_SCRIPT => 'install-radius-db.PL',
-     MIN_PERL_VERSION => "v5.10",
-     BUILD_REQUIRES => {
-         # Support for TEST_REQUIRES
-diff --git a/install-radius-db.PL b/install-radius-db.PL.orig
-similarity index 100%
-rename from install-radius-db.PL
-rename to install-radius-db.PL.orig
--- 
-2.15.1
-
diff --git a/dev-perl/Authen-SASL-SASLprep/Authen-SASL-SASLprep-1.100.0-r1.ebuild b/dev-perl/Authen-SASL-SASLprep/Authen-SASL-SASLprep-1.100.0-r1.ebuild
new file mode 100644
index 000000000000..765548e7dd5e
--- /dev/null
+++ b/dev-perl/Authen-SASL-SASLprep/Authen-SASL-SASLprep-1.100.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CFAERBER
+DIST_VERSION=1.100
+inherit perl-module
+
+DESCRIPTION="A Stringprep Profile for User Names and Passwords (RFC 4013)"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/Unicode-Stringprep-1
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.420.0
+	test? (
+		virtual/perl-Test-Simple
+		dev-perl/Test-NoWarnings
+	)
+"
+
+src_test() {
+	perl_rm_files t/10pod.t t/11pod_cover.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Authen-SASL-SASLprep/Authen-SASL-SASLprep-1.100.0.ebuild b/dev-perl/Authen-SASL-SASLprep/Authen-SASL-SASLprep-1.100.0.ebuild
deleted file mode 100644
index e29bf6bdb535..000000000000
--- a/dev-perl/Authen-SASL-SASLprep/Authen-SASL-SASLprep-1.100.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CFAERBER
-DIST_VERSION=1.100
-inherit perl-module
-
-DESCRIPTION="A Stringprep Profile for User Names and Passwords (RFC 4013)"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Unicode-Stringprep-1
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.420.0
-	test? (
-		virtual/perl-Test-Simple
-		dev-perl/Test-NoWarnings
-	)
-"
-src_test() {
-	perl_rm_files t/10pod.t t/11pod_cover.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Authen-SASL-SASLprep/Manifest b/dev-perl/Authen-SASL-SASLprep/Manifest
index 816b54a54672..12bfc707a5b5 100644
--- a/dev-perl/Authen-SASL-SASLprep/Manifest
+++ b/dev-perl/Authen-SASL-SASLprep/Manifest
@@ -1,3 +1,3 @@
 DIST Authen-SASL-SASLprep-1.100.tar.gz 13473 BLAKE2B caf694674522495a3540e4d1c1125251f63ff5e3e40669f0df1b2c73bb911c58be3f083c05bea8ce880a8d1333cb2d86daa533cd82d1d194b21f62d187115901 SHA512 ba6d17d6db6c28f30ed03bbd3d1e7a2fdc5b751b8124b7c3739bd3b32d749b410273f21dd17162aafec77c8ac439b841a7fdbd964e87946223fd1e9f0b25e333
-EBUILD Authen-SASL-SASLprep-1.100.0.ebuild 565 BLAKE2B a583bf1630816025a2a0e0f35008f26bb07d764ec5d1abc5e72c42fd5362d29ee61ccc88aef7fa230992f0d49d1678be7ead0ad004a16d08e3d468be71ed329a SHA512 cc816c2536b4e8755ee448002eae7279fd7296a43515439560745d133c2b8f6c2362f12208bcadb5c9cd849ed2cbc1c26a937e55c627ee118456c0ab7f68a10d
+EBUILD Authen-SASL-SASLprep-1.100.0-r1.ebuild 528 BLAKE2B b123315e79fa27bb61c73cd500a44e0a809374dbd52a5ad5ee354e170875ab02e5576d5b99abda8370ef5e330bab9c7660c662c4d32a3ef26b1419b8d056da7c SHA512 6558600904c3065a19698083e983b7c2257a1d30a498719c537da7dad4e974e453b5f1c3adf492ba7422d5a79a5249cdcf58c9dd4c7968c8b3c89ce92bf147ee
 MISC metadata.xml 414 BLAKE2B 347f6e846d5e3f4547457834cba8f1189d66d6dbd8c7793824b79af18d6566564292f7077803c5a218cf885195ec2868eb725d180c8ae5d078b7a72f328aa537 SHA512 42f965a9ccdfed8cce38c648f286c183a9d284a292a85d74d77b6e584126b79826fae0fff1712fd8909c7d12bd6c81ede88c3cf21ac5c5fcac46a00d29781180
diff --git a/dev-perl/Authen-Simple-Passwd/Authen-Simple-Passwd-0.600.0-r1.ebuild b/dev-perl/Authen-Simple-Passwd/Authen-Simple-Passwd-0.600.0-r1.ebuild
new file mode 100644
index 000000000000..76449b92bc4f
--- /dev/null
+++ b/dev-perl/Authen-Simple-Passwd/Authen-Simple-Passwd-0.600.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHANSEN
+DIST_VERSION=0.6
+inherit perl-module
+
+DESCRIPTION="Simple Passwd authentication"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+
+RDEPEND="
+	>=dev-perl/Authen-Simple-0.300.0
+	virtual/perl-IO
+"
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+"
+
+PERL_RM_FILES=( "t/02pod.t" "t/03podcoverage.t" )
diff --git a/dev-perl/Authen-Simple-Passwd/Authen-Simple-Passwd-0.600.0.ebuild b/dev-perl/Authen-Simple-Passwd/Authen-Simple-Passwd-0.600.0.ebuild
deleted file mode 100644
index ea963cb442ac..000000000000
--- a/dev-perl/Authen-Simple-Passwd/Authen-Simple-Passwd-0.600.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CHANSEN
-DIST_VERSION=0.6
-inherit perl-module
-
-DESCRIPTION="Simple Passwd authentication"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/Authen-Simple-0.300.0
-	virtual/perl-IO
-"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-"
-
-src_test() {
-	perl_rm_files "t/02pod.t" "t/03podcoverage.t"
-	perl-module_src_test
-}
diff --git a/dev-perl/Authen-Simple-Passwd/Manifest b/dev-perl/Authen-Simple-Passwd/Manifest
index 2dd9638b36ef..efffbbb1f7f7 100644
--- a/dev-perl/Authen-Simple-Passwd/Manifest
+++ b/dev-perl/Authen-Simple-Passwd/Manifest
@@ -1,3 +1,3 @@
 DIST Authen-Simple-Passwd-0.6.tar.gz 3849 BLAKE2B a19ad52e5094e21743bbfdabaf058962755fa3b41d0f913d1960891aa23f4c9a212577744b10b9dd275072d99f8eee8460ffb84c0004029c89e33745169c83f0 SHA512 719d61a0645f376f706193778a48d470bb96d9c884c2d9515d5cd5df390e378ea99cd27ae75a3493e72faec6e11b95cb72d7425b646f95a5c06b84f00d1a07ed
-EBUILD Authen-Simple-Passwd-0.600.0.ebuild 474 BLAKE2B 2ad481bda2e7e29b6172de1a7064972f899090974bdf86bafae178846ff66d5f3fa65971733c3e64942f7d3f413f9ce3ae99522ca7880ea5a970f79fb4feefdd SHA512 9972f177af79da9d14304428b8f1d9b304c7a41fd689582c81e6172ff228ff59e33aab1d9ab0046bc6d68fd6d940fb9821d1d77c81b5bd4faf646054036992e1
+EBUILD Authen-Simple-Passwd-0.600.0-r1.ebuild 433 BLAKE2B 72f51c5174d6f35929f39fd3a7f7f4d6354bdae1218b8f4804308f89e8a1f7d75fd306a18e84d57a8a19c0dc9bb9c564b7822341fd8a3b7798845c1197c8bbbb SHA512 89b1c55aac03df63b7a1584f16a212604bd58eaeacfc57326e593db060c51eb1ebc64791fb83103f8ed584f996c44251358c127aa9df777f93ebf7c56e4401ba
 MISC metadata.xml 414 BLAKE2B 3066b0e2f6210fbbfb56d969b2cdcef7efa62ff270c8150ebb464dd47c86f57290190163cddc8d055ee241ac8c9e1f7cd3db8d81de07bab086956eef36153246 SHA512 892e313edce20c29faaa93b50fe422acfb7197d5d1972a6566c7c496cd059a0cdd1275d750685a4f14c8dd1785ecbeff8235c92622d3b0b5fff23ce421208455
diff --git a/dev-perl/Authen-Simple/Authen-Simple-0.500.0-r1.ebuild b/dev-perl/Authen-Simple/Authen-Simple-0.500.0-r1.ebuild
new file mode 100644
index 000000000000..8d6bfac19c93
--- /dev/null
+++ b/dev-perl/Authen-Simple/Authen-Simple-0.500.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHANSEN
+DIST_VERSION=0.5
+inherit perl-module
+
+DESCRIPTION="Simple Authentication"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+
+RDEPEND="
+	dev-perl/Class-Accessor
+	dev-perl/Class-Data-Inheritable
+	dev-perl/Crypt-PasswdMD5
+	virtual/perl-Digest-MD5
+	virtual/perl-Digest-SHA
+	virtual/perl-MIME-Base64
+	dev-perl/Params-Validate
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
+	test? ( virtual/perl-Test-Simple )
+"
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
diff --git a/dev-perl/Authen-Simple/Authen-Simple-0.500.0.ebuild b/dev-perl/Authen-Simple/Authen-Simple-0.500.0.ebuild
deleted file mode 100644
index 5672ecc7bc6c..000000000000
--- a/dev-perl/Authen-Simple/Authen-Simple-0.500.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CHANSEN
-DIST_VERSION=0.5
-inherit perl-module
-
-DESCRIPTION="Simple Authentication"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Class-Accessor
-	dev-perl/Class-Data-Inheritable
-	dev-perl/Crypt-PasswdMD5
-	virtual/perl-Digest-MD5
-	virtual/perl-Digest-SHA
-	virtual/perl-MIME-Base64
-	dev-perl/Params-Validate
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
-	test? ( virtual/perl-Test-Simple )
-"
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Authen-Simple/Manifest b/dev-perl/Authen-Simple/Manifest
index fc1dc9f81728..176662129fc1 100644
--- a/dev-perl/Authen-Simple/Manifest
+++ b/dev-perl/Authen-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST Authen-Simple-0.5.tar.gz 24613 BLAKE2B f2f7beae99e2539b0004881bb4367ea858ce0d469f3b589af5d1784541d2fc907bd064ac7519938d9898f4fdc362c7177fc8f0e0eeb71b666225969d8e2f3090 SHA512 c8ccd41aee1fd1fba1aa2cb7854918a8ab45e3528f0f2677f8dd7a13bd326c9a13f8c8a2c8f45fc5caecbd328aadbbbda8ca22cef8187e7ce3da4dbca5b718ac
-EBUILD Authen-Simple-0.500.0.ebuild 797 BLAKE2B ca17f1a258d0783f285e04fa802614011834097aeaed1cce5967e23c2ba5f5c1f6f24e2d8d526ce5e806751affee91e751364c4f9974ca3355d26d944ff0931b SHA512 530122fe0da48a00c91856f58634d3ef91b98c44d231ce8d88bcd8298d042e859b95c4c980cb043fa1bd4df3b993264c4919dc271f0a2f972a45d63ecaa23e7f
+EBUILD Authen-Simple-0.500.0-r1.ebuild 759 BLAKE2B fb55e0d7b0e931402e6ef7db1c29f82e651cef9e697ea56970985dec4acf373fe03e29be375cf6f307904270ed6785ce2767c387800e2d5d6785457bbc0bc73c SHA512 d4701658a83edb2722b2ab1278092b0d2184533c2744e9abdc20b83ea6a2fa0c36ee624c158bd8c570bb3dde54899d78109d22811e6e9a981dc42595effe058b
 MISC metadata.xml 399 BLAKE2B e9abce490d7dce09cb720f97bd49766bc4878d632ca139ba2ef1fc310c809656b8856091ad0c84618e91a401785458a76133ec5e5fcf79c411de504743768f3a SHA512 dcba22db52a3d6206055983b4e25b516786859d2bb71d376f25e562b0c35120249cdf2df5c390c87832852c2727817d1697d53cb70c69ef87db37394dba88e91
diff --git a/dev-perl/B-Debug/B-Debug-1.260.0-r1.ebuild b/dev-perl/B-Debug/B-Debug-1.260.0-r1.ebuild
new file mode 100644
index 000000000000..4e9771d24104
--- /dev/null
+++ b/dev-perl/B-Debug/B-Debug-1.260.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RURBAN
+DIST_VERSION=1.26
+inherit perl-module
+
+DESCRIPTION="Walk Perl syntax tree, printing debug info about ops"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="minimal"
+
+RDEPEND="
+	!minimal? (
+		>=dev-perl/B-Flags-0.40.0
+	)
+	>=dev-lang/perl-5.19.2
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+
+PERL_RM_FILES=( "t/pod.t" )
diff --git a/dev-perl/B-Debug/B-Debug-1.260.0.ebuild b/dev-perl/B-Debug/B-Debug-1.260.0.ebuild
deleted file mode 100644
index e6280262fb4d..000000000000
--- a/dev-perl/B-Debug/B-Debug-1.260.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=RURBAN
-DIST_VERSION=1.26
-inherit perl-module
-
-DESCRIPTION="Walk Perl syntax tree, printing debug info about ops"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
-
-PERL_RM_FILES=(
-	"t/pod.t"
-)
-# requires deprecate 0.03 => perl 5.19.2
-RDEPEND="
-	!minimal? (
-		>=dev-perl/B-Flags-0.40.0
-	)
-	>=dev-lang/perl-5.19.2
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/B-Debug/Manifest b/dev-perl/B-Debug/Manifest
index 8b223611acb1..2d4ce36f8afe 100644
--- a/dev-perl/B-Debug/Manifest
+++ b/dev-perl/B-Debug/Manifest
@@ -1,3 +1,3 @@
 DIST B-Debug-1.26.tar.gz 17725 BLAKE2B 5c9fc8e63a6c2511ef8189ea34b66d7795785ee2a71c429487cbd3dbf03aea42e0c1a4e4d15209627d22327ef99d9d193616050102a71d12b6fbb62eba2394a5 SHA512 d15a1b8283a9c9582cebf9d5fdc38289160c601603498eb79d120154c8643a81e256c4afe2ee938c9db04989af0544bdf312d2d0fe5b898b1dcee756d084db6e
-EBUILD B-Debug-1.260.0.ebuild 568 BLAKE2B 35bf452d7b5a51db2660b9efa238f215700f90d9baaa91b5372d81066b7fe918fa4da624b0aff53bdb7891484198004b289e5260c27bd4b39b347e3a400d31ac SHA512 a3103f2e9da5e58738562838bd19b38ae1387fc811e3d0a52b624efd46a1ffb7d6a97d25f16d4fdfaf0e36b1e7a17a5bc3fa7e29cb98770fdc38aa99ca8825e2
+EBUILD B-Debug-1.260.0-r1.ebuild 496 BLAKE2B f82f072b8aa6b2f4c234b83dfea1f5d1daacdeb45e0bf419621b881d3eae18934fbf4ea9bacef7d7d9f5fbb71344c9f68d156acb6244a30f15f157482c5ecfa8 SHA512 9cee6d06c37fb707139a480e9ea52eb9c5a9131efb206967b59b5f36dc2e9dd4bede276da6713666548ef84022220ae2b37d1ce7a1d9a4ecf972ae58e9f27bf6
 MISC metadata.xml 387 BLAKE2B 2a01e53d8d20678918245c473c2b2fbfce61bfdd60a81b1833844e271c4a1548f97edf5247800ff3fa488541431971d322813455e121de7a781082ee66e8dd86 SHA512 aeaa3910d7245bd630aa54f2ebb1d18144a7c9e410c56aeb29d7560af6d99a6f6928fbd901db32b1404f8558cd9df70ae6d9f28955ee42b696c7656caabf0427
diff --git a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0-r1.ebuild b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0-r1.ebuild
new file mode 100644
index 000000000000..c3c5ddc1e810
--- /dev/null
+++ b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.24
+inherit perl-module
+
+DESCRIPTION="Execute code after a scope finished compilation"
+
+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 ~x86-solaris"
+
+RDEPEND="
+	>=dev-perl/Module-Implementation-0.50.0
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/Sub-Exporter-Progressive-0.1.6
+	>=dev-perl/Variable-Magic-0.480.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-Text-ParseWords
+	test? (
+		>=virtual/perl-CPAN-Meta-2.120.900
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
diff --git a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0.ebuild b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0.ebuild
deleted file mode 100644
index 77fb6657abaa..000000000000
--- a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.240.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ETHER
-DIST_VERSION=0.24
-inherit perl-module
-
-DESCRIPTION="Execute code after a scope finished compilation"
-
-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 ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Module-Implementation-0.50.0
-	virtual/perl-Scalar-List-Utils
-	>=dev-perl/Sub-Exporter-Progressive-0.1.6
-	>=dev-perl/Variable-Magic-0.480.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	virtual/perl-Text-ParseWords
-	test? (
-		>=virtual/perl-CPAN-Meta-2.120.900
-		virtual/perl-File-Spec
-		>=virtual/perl-Test-Simple-0.880.0
-	)
-"
diff --git a/dev-perl/B-Hooks-EndOfScope/Manifest b/dev-perl/B-Hooks-EndOfScope/Manifest
index f3dc2a7e809b..e3bac733d8f1 100644
--- a/dev-perl/B-Hooks-EndOfScope/Manifest
+++ b/dev-perl/B-Hooks-EndOfScope/Manifest
@@ -1,3 +1,3 @@
 DIST B-Hooks-EndOfScope-0.24.tar.gz 37859 BLAKE2B b5e4f0061949af112b9bcb89c1352e1385222c291624df330e8e60d3faf48f78a669650b074b1659f8287f14d46bdb488da0c943a0d22adb5a50dc37aebf7754 SHA512 5c061a81a3fed88ad868a14a1f817f7952b2f0c9512408174354e0ecf7e3caa5d646054cf75efa8b8c558e6241a8dfebf9400e8826021bdb5cbdf3a00065b147
-EBUILD B-Hooks-EndOfScope-0.240.0.ebuild 789 BLAKE2B d15e7f40c7a624d982efffbf0be24f82be15e7da682b74b9e93de3a548cf74dfdfe4f761e427345eaf017ddf14ca9f88b6a564d61dcc541a0352096e033eba37 SHA512 d14e2fd0c73e96e7d9ac84684605d87a49de6e0867e6c91577f726dfde14beb787c26278536df94b0d85dc81c0f0b45422ee28dba32ed1b818f10186b062a10e
+EBUILD B-Hooks-EndOfScope-0.240.0-r1.ebuild 751 BLAKE2B 5ae68b3abb8514ff95f3b449edd34bdc671d0a298ec2cad191c9677c12a9c40b817a3f757df6d696c5d99f81ef6ac4ef14d394459c4bbd45100134ac4867114d SHA512 347d2537496aa44fa03786d9c54f10a4e07d84fc3b9341751a5db547613ce227b31769f6f3dc1d9c752b71a0305b46f7553dd95b33c682f64762973380bf2fee
 MISC metadata.xml 552 BLAKE2B 3a7ef82086f6452d8a46cc9d98249ce02d0bbd5a870f242b5d81f889a8e2ed18a90449f11678b610a07366f61427867d4f6fcacc893c701374026576480767f1 SHA512 a17bad4f21f41975fb5e7fe664f85891d9b9dc348c26c69ffcb6e67db76809b11ea1a40962d2e0706b7fac1e521429020971866a98b6f4289afd65139fcfe7d6
diff --git a/dev-perl/B-Keywords/B-Keywords-1.210.0.ebuild b/dev-perl/B-Keywords/B-Keywords-1.210.0.ebuild
deleted file mode 100644
index 7ef53bce2376..000000000000
--- a/dev-perl/B-Keywords/B-Keywords-1.210.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=RURBAN
-DIST_VERSION=1.21
-inherit perl-module
-
-DESCRIPTION="Lists of reserved barewords and symbol names"
-
-# GPL-2 - no later clause
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-
-BDEPEND="virtual/perl-ExtUtils-MakeMaker"
-PERL_RM_FILES=(
-	"t/z_kwalitee.t"
-	"t/z_perl_minimum_version.t"
-	"t/z_meta.t"
-	"t/z_pod-coverage.t"
-	"t/z_pod.t"
-)
diff --git a/dev-perl/B-Keywords/Manifest b/dev-perl/B-Keywords/Manifest
index 3776ea8bc563..6d8dd670d441 100644
--- a/dev-perl/B-Keywords/Manifest
+++ b/dev-perl/B-Keywords/Manifest
@@ -1,5 +1,3 @@
-DIST B-Keywords-1.21.tar.gz 12349 BLAKE2B cf88796bcd9a1c9b324649188b61eb1939396b8e7cc9aba7ce62702c642b9f8fab04c6733b377f0914827417e35ff5aa3d7360d70704b8f20476877c8f55b430 SHA512 80965484f35b21478279664aa6d0bf582a8cfe684469b944b3b514edb706bd8d1a4edba37d567badd581ce0a3ee23550fcbb93c1681665a36d02fae1a0cf1d96
 DIST B-Keywords-1.22.tar.gz 12417 BLAKE2B 4cc51674062299a3776e395910f5d1ee279a5bde68b35adf867ea263bb225487ba85e5100e1474207e7fa6ac336d8bc880990749710e72864d344c51097535e3 SHA512 9dd44cafe4502edb519d885d74688183275550c3ad4da61387e805cf7a4789434ebda8f1f71104515c688e0e0358ca38399a1d1bd2ba066c7e1e3de76ae68bb2
-EBUILD B-Keywords-1.210.0.ebuild 550 BLAKE2B 130df41462b59dce8b2fdccc6d31ee49f2360d086a1721b235ab2f6377505bba3579691175028bb5c314934860670943f16a3c4a12814b7fa4ae011abd066d0e SHA512 738b2b1a79caa04e14dda7d410f05b6ecd0b362e6306b8a4778a784ee784d42b9a679918f0897775a62eb776f65c2c8a8fbdf54715f961c621abd9498ab4d0fd
 EBUILD B-Keywords-1.220.0.ebuild 550 BLAKE2B 13e8831021abd23c2da8c94721f5c9aab66c289dbcc3e577375bfbbb93bae6ec8ca212e38410d3f092bdacf4af5616ad6712b59794eb4e76b0d8e1b15aef9659 SHA512 833cf8a869aece2cc22b73033db584373a3d070613be0a1a1d1b0925aefa7f4e6e4a30b9d543eb4e2c84d8190bbdba690d01b0b23cff3c47ec87cbe258b5a19c
 MISC metadata.xml 393 BLAKE2B bc98e38d5dfbadc296e201fa2bd738bf149278a5af52b738e5c5e8813f164dc2f252b2b9691d1e3813a26aa35c1ade600f967ff694bde02b74db9a0ccff5385d SHA512 e86b75c1f1606ea93050c4e9928c5b9f00844c95d3e0e7032fdc43dd5644b0a6bd9cf08b9d033c3ba62ea2c3194561993023c0ab2318006710d42e5fa7c14e97
diff --git a/dev-perl/BZ-Client/BZ-Client-4.400.300.ebuild b/dev-perl/BZ-Client/BZ-Client-4.400.300.ebuild
deleted file mode 100644
index 38e62e76b9aa..000000000000
--- a/dev-perl/BZ-Client/BZ-Client-4.400.300.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=DJZORT
-DIST_VERSION=4.4003
-DIST_EXAMPLES=("eg/*")
-inherit perl-module
-
-DESCRIPTION="A client for the Bugzilla web services API."
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/DateTime-Format-ISO8601
-	dev-perl/DateTime-Format-Strptime
-	dev-perl/DateTime-TimeZone
-	virtual/perl-Encode
-	virtual/perl-File-Spec
-	dev-perl/HTTP-CookieJar
-	virtual/perl-HTTP-Tiny
-	virtual/perl-MIME-Base64
-	dev-perl/URI
-	dev-perl/XML-Parser
-	dev-perl/XML-Writer
-	virtual/perl-parent
-"
-DEPEND="dev-perl/Module-Build"
-BDEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.280.0
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-CPAN-Meta-2.120.900
-		dev-perl/Clone
-		virtual/perl-Data-Dumper
-		dev-perl/DateTime
-		dev-perl/IO-Socket-SSL
-		dev-perl/Test-RequiresInternet
-		virtual/perl-Test-Simple
-		dev-perl/Text-Password-Pronounceable
-	)
-"
-PERL_RM_FILES=(
-	t/release-distmeta.t
-	t/release-kwalitee.t
-	t/release-unused-vars.t
-	t/author-critic.t
-	t/author-eof.t
-	t/author-eol.t
-	t/author-no-breakpoints.t
-	t/author-no-tabs.t
-	t/author-pod-syntax.t
-	t/author-portability.t
-)
-src_test() {
-	has network ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}} && export TEST_AUTHOR=1
-	perl-module_src_test
-}
diff --git a/dev-perl/BZ-Client/Manifest b/dev-perl/BZ-Client/Manifest
index 6c8de6506335..f09b15519441 100644
--- a/dev-perl/BZ-Client/Manifest
+++ b/dev-perl/BZ-Client/Manifest
@@ -1,5 +1,3 @@
-DIST BZ-Client-4.4003.tar.gz 85579 BLAKE2B d9310fd594d3a0a19ee9e08b047efbc89ee36e1d0c8a25f79f9dd3f4de661f7cfd1de27d1017a6cabcb356362b27ba2c9cc5c908dc43c6e43b52b7eeb16e3b15 SHA512 d4b8bb4de96ca40f37f0ab6576095341cd3c7be41d6d4bdfd88f7b25de8ce77130a1736ea4e577f57186191cee2eeff6131fe107a0cb56e9439f4258fb560432
 DIST BZ-Client-4.4004.tar.gz 87209 BLAKE2B 6300d93cd6fefb1271a11f0703757dc7bce8955fd60f11afd7a856267bf37cd5c33e42c28a783b2287b5cb359caaef6ae0aee3481f505118558f6bbf1b3929d7 SHA512 23cf61f3ffdf85e53924e54acc8d0d069f602ea15d35f94b4b8f2f1fd1fd33b27b95afe2125d01ae47c9eb191106d65acd475924bd3158c882cc3e208a711193
-EBUILD BZ-Client-4.400.300.ebuild 1344 BLAKE2B 6fc3b799d6d2f58738ef9a450770e1b9a763f7e9200684767f405dc5ab30849d5c55a841e0da61a169d80abc7fc644e9c537e272aec9024b911cfb3b999d7781 SHA512 745082637a7310b0d57f1cc7a934e306b7859f1f2000677b661830379b548956df6799d22d73005fb099c37002d50b4e67dd01e25388c1c3682cd5d4d2001baf
 EBUILD BZ-Client-4.400.400.ebuild 1344 BLAKE2B b58161d80d6f0854542b9a8dd4a4cf17581331fb75650d011b86e98f72ac764eb21d1e96b4838d288a76f0a8bb5a5936e85a4b194fa69cc3008da12e0796f485 SHA512 b5696841cfbd76254eff64754a119a8c7c69a4ba54443e62a77b25bc86225359a9edbc0cc36bb817e461e6309fe6b0d1c0cbba42174618c6acd5a6d4d86081a0
 MISC metadata.xml 2123 BLAKE2B 9391209ebfb122b2e2f5249d1f525a46ef30a43e3837cce7dcf1ce97d1442bee62b6cf112239250493875ce4c27328c749c76dbb672b3c3a99cb61457f25814d SHA512 3b1758c3776c8e07903fa56b22e4d676d04e69a4a60beec911caa41028eeae2f6359c7cc0fdb7576a96160521e37feacad2420d3e6386e74200e56189c0af0cb
diff --git a/dev-perl/Benchmark-Timer/Benchmark-Timer-0.711.200-r1.ebuild b/dev-perl/Benchmark-Timer/Benchmark-Timer-0.711.200-r1.ebuild
new file mode 100644
index 000000000000..cb27e10d2f4a
--- /dev/null
+++ b/dev-perl/Benchmark-Timer/Benchmark-Timer-0.711.200-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DCOPPIT
+DIST_VERSION=0.7112
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Perl code benchmarking tool"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Statistics-TTest
+	virtual/perl-Time-HiRes
+"
+
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
+	test? ( virtual/perl-Test-Simple )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7112-noauthortests.patch"
+	"${FILESDIR}/${PN}-0.7112-relocateexample.patch"
+)
+
+PERL_RM_FILES=(
+	"inc/Module/Install/AutomatedTester.pm"
+	"inc/Module/Install/Bugtracker.pm"
+	"inc/Module/Install/GithubMeta.pm"
+	"inc/Module/Install/PRIVATE/Enable_Verbose_CPAN_Testing.pm"
+	"inc/Module/Install/StandardTests.pm"
+	"inc/URI/Escape.pm"
+	"private-lib/Module/Install/PRIVATE/Enable_Verbose_CPAN_Testing.pm"
+)
diff --git a/dev-perl/Benchmark-Timer/Benchmark-Timer-0.711.200.ebuild b/dev-perl/Benchmark-Timer/Benchmark-Timer-0.711.200.ebuild
deleted file mode 100644
index 4ea5165248fb..000000000000
--- a/dev-perl/Benchmark-Timer/Benchmark-Timer-0.711.200.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DCOPPIT
-DIST_VERSION=0.7112
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Perl code benchmarking tool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.7112-noauthortests.patch"
-	"${FILESDIR}/${PN}-0.7112-relocateexample.patch"
-)
-PERL_RM_FILES=(
-	"inc/Module/Install/AutomatedTester.pm"
-	"inc/Module/Install/Bugtracker.pm"
-	"inc/Module/Install/GithubMeta.pm"
-	"inc/Module/Install/PRIVATE/Enable_Verbose_CPAN_Testing.pm"
-	"inc/Module/Install/StandardTests.pm"
-	"inc/URI/Escape.pm"
-	"private-lib/Module/Install/PRIVATE/Enable_Verbose_CPAN_Testing.pm"
-)
-RDEPEND="
-	dev-perl/Statistics-TTest
-	virtual/perl-Time-HiRes
-"
-
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
-	test? ( virtual/perl-Test-Simple )
-"
diff --git a/dev-perl/Benchmark-Timer/Manifest b/dev-perl/Benchmark-Timer/Manifest
index 89e6b843b7b2..e177aa54fe58 100644
--- a/dev-perl/Benchmark-Timer/Manifest
+++ b/dev-perl/Benchmark-Timer/Manifest
@@ -1,5 +1,5 @@
 AUX Benchmark-Timer-0.7112-noauthortests.patch 4425 BLAKE2B 75a0e8b76ad02ad3459f19af390a78a2b3fba7352cbada0bc3bd27eecfb0676cb6862ec35ef64eabb0bab3eef57293e65adfdc28a0547561297cc34717d24034 SHA512 46ed5bec3063a1c07477cb5d106e47a424433dd4fce018cc07100f07a0ab45813ed0d7d71375c0b361a8a0d3a187144ba4ae0272064524f99426b8d560550008
 AUX Benchmark-Timer-0.7112-relocateexample.patch 903 BLAKE2B 510a219bde83d8fc6a4e3aa9b86b8880ce873576d483cff6ffa47a0be1cf06cbc01db21792766ba285b13250f74526601c4b97c95c838ea1a0d7c34241226ecf SHA512 3a0234b22be26ef3c06b83f33c338cd9da6901e1c5081911f2166685ab3aee8f9dffedc523a36ad25d35f9d759dade8782b5fc1d19aef6f914c215458bb2e8db
 DIST Benchmark-Timer-0.7112.tar.gz 47756 BLAKE2B 524992cb051a712c90ee6f32e9cdc6391608ea00fb41b3bd1e45d1d5f75f52d7a4ae0c79fefcf5967d67b2317f147f773edebfdb73209acd5c721c771d1f531d SHA512 6ae3ef700a777debb06cb2bbb19c34170e9bd88917c6441a44149f3b8094a5ed1690d727e3fc4e63b48e1bbcab85dd917c6f659ebfad8a8304134ea04e9262eb
-EBUILD Benchmark-Timer-0.711.200.ebuild 930 BLAKE2B 3bc2be4c84aec76f44ef13851fbb7290cb1e7ae2b0b36b068d9244958759271727b3d7f4990f4b0f48249d8a8127d340e3c37766930e415f9e03f4363016c7d8 SHA512 32dde71a8359c0d80be8589b67c589af8387bc94bde7455ad8279584cb9982e593ed4a4d26333a0c9463392fa99b7c61f981c41ba69b4564adfc05167485b455
+EBUILD Benchmark-Timer-0.711.200-r1.ebuild 894 BLAKE2B c209c3a7a1f6417816b357d711d77dd832566f73bc273ed1167e2868501f29f4a2bdadbf65c9641873b3b2e1228064cd3e14da2e732a2d8ad1713c39853241d4 SHA512 cd9d9a05b333c92b82c42cba6ff006f77130d76559bd9c9249543286763613ecb18b9ec3db3fe78fd1e18431fb131fa4af97f239ae7ed0455d633dc09655c58e
 MISC metadata.xml 403 BLAKE2B d00c53a42658e0a7ea2c6fba4313c9b8a6f4f539c6ac234c1a3fe82616e2883cf8f2ba621814edb2cb163a36638812802dbc67f70e1e9745022a8db6d2bda01d SHA512 c29d30369db26682de39c4943a882b61125b3d1da9c26c9595c356e735a1d5057a802cc2b57b6c7d05ff41968e1f02fad160a38dfaaf8cacbf78db36eaeeb6b3
diff --git a/dev-perl/Bio-ASN1-EntrezGene/Bio-ASN1-EntrezGene-1.730.0.ebuild b/dev-perl/Bio-ASN1-EntrezGene/Bio-ASN1-EntrezGene-1.730.0.ebuild
index 238af8879f52..3295b278b7a0 100644
--- a/dev-perl/Bio-ASN1-EntrezGene/Bio-ASN1-EntrezGene-1.730.0.ebuild
+++ b/dev-perl/Bio-ASN1-EntrezGene/Bio-ASN1-EntrezGene-1.730.0.ebuild
@@ -26,6 +26,7 @@ BDEPEND="${RDEPEND}
 		virtual/perl-File-Spec
 		virtual/perl-IO
 		virtual/perl-Test-Simple
+		dev-perl/Test-Exception
 	)
 "
 
diff --git a/dev-perl/Bio-ASN1-EntrezGene/Manifest b/dev-perl/Bio-ASN1-EntrezGene/Manifest
index f928704f3521..78ed22597fd1 100644
--- a/dev-perl/Bio-ASN1-EntrezGene/Manifest
+++ b/dev-perl/Bio-ASN1-EntrezGene/Manifest
@@ -1,5 +1,5 @@
 DIST Bio-ASN1-EntrezGene-1.72.tar.gz 49080 BLAKE2B f3f5d1ab76be2bd478353158a041f03d2dea44f5463ccb4de7563975f3a5e30532a846a58a26428f6d0a079f3f6dbc92b7a34b8267906a21b2d67b5849973182 SHA512 eb8d2c76d0a77febafb7f06e276de3e9d0c9128e1b14e3899edaca25d6c00fffd11a9b0e589ed143bd5ec7807d18c2df599b0cd95e5c77cb20787f6df8c0b315
 DIST Bio-ASN1-EntrezGene-1.73.tar.gz 157307 BLAKE2B 4a2ad557e42467af1d13ae9cef22732c2dda5b19ec9ba74db72824d10c17bb7f5773be2b64883163bd71daba4af53cdfc9656de0acfcddfd9e0da3193b99002a SHA512 b94f3b4f394861178a405f82a8d929c9be2f8f23b911f5737ab80da0dc30a6cf5fb3166a783b5e172de4ba99094a02ffc03dc456e55f46079042ab7ec03b53dc
 EBUILD Bio-ASN1-EntrezGene-1.720.0.ebuild 642 BLAKE2B 316c435a3a7d72017e7bf3c24e4780fd599134d0915c21de09413f64d57c0ef8a8095ca07f0c165360740313f5607ef93c7f29d67c637805473cd1e0d4003605 SHA512 6fe746bc420e322729bcd598f5e04ff7f0f31708207d20e775e163b32729914f3021f92bc0c8ac6c555ff1b64a748d787c747251a304d0e5991370fe14f7f7aa
-EBUILD Bio-ASN1-EntrezGene-1.730.0.ebuild 645 BLAKE2B 119b1fbb1dc462cc4c69d06e83770f18691bb1249cf127cb12f6e46d018096bcc9c3a1b5ff51facc7a4e2fb23d2ced71ef6348494193bd75ede33a593b38f6be SHA512 a8bc3a6e19dfb4d468aa5cd8a1b6130b8f32b42b46059b57b91623038998f77b7d87cf11ecf0e18bec87f60b617202f7b4d58e05be9cb9093fcedef63cd97aa1
+EBUILD Bio-ASN1-EntrezGene-1.730.0.ebuild 671 BLAKE2B bb66002922008b4a095bd4b01e6fe2802bd3250fffce43b83eefaa692ab36fd96ecfe9c86a5b265e70be62100b2fcdf78a731bdbc13af89196be6f6494bc7261 SHA512 c96833c0b6dbabe016d3aa485a861853d22db445ade4d567c3451596ddfbc92c0b4da350eb691a2091268c7890e456a3521c0659db0e973e6626428076739c0a
 MISC metadata.xml 750 BLAKE2B 0c31adf0c073a6461c7c29b64c98e66e296be0027dc39fdb5d8d26e8c38036ac83d91fe9af60a08d6a37604f2d9af13e5b3e3f9a55b3c969f640ccc8466c69f6 SHA512 342123b4753c6ec85464089d52f96248b6a1164fa338a7d5686a53b424f50c8e65244f0562e1acf8098e4234b89c53a75584e749613aa8a65ac18619a432a3ff
diff --git a/dev-perl/Bio-Das/Bio-Das-1.170.0-r2.ebuild b/dev-perl/Bio-Das/Bio-Das-1.170.0-r2.ebuild
deleted file mode 100644
index fbd25fa1e003..000000000000
--- a/dev-perl/Bio-Das/Bio-Das-1.170.0-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=LDS
-DIST_VERSION=1.17
-DIST_EXAMPLES=("eg/*")
-inherit perl-module
-
-DESCRIPTION="Interface to Distributed Annotation System"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/perl-IO-Compress-1.0
-	sci-biology/bioperl
-	>=dev-perl/HTML-Parser-3
-	>=dev-perl/libwww-perl-5
-	>=virtual/perl-MIME-Base64-2.12"
-RDEPEND="${DEPEND}"
-
-optdep_notice() {
-	local i
-	elog "This package has several modules which may require additional dependencies"
-	elog "to use. However, it is up to you to install them separately if you need this"
-	elog "optional functionality:"
-	elog
-	i="$(if has_version 'dev-perl/CGI'; then echo '[I]'; else echo '[ ]'; fi)"
-	elog " $i dev-perl/CGI"
-	elog "     - Running a reference DAS server driven by an AGP File via"
-	elog "       Bio::Das::AGPServer::Daemon"
-
-	if use test; then
-		elog
-		elog "This module will perform additional tests if these dependencies are"
-		elog "pre-installed"
-	fi
-}
-src_test() {
-	local MODULES=(
-		"Bio::Das ${DIST_VERSION}"
-		"Bio::Das::AGPServer::Config 1.0"
-		"Bio::Das::AGPServer::Parser"
-		"Bio::Das::AGPServer::SQLStorage"
-		"Bio::Das::AGPServer::SQLStorage::CSV::DB"
-		"Bio::Das::AGPServer::SQLStorage::MySQL::DB"
-		"Bio::Das::DSN"
-		"Bio::Das::Feature 0.91"
-		"Bio::Das::FeatureIterator 0.01"
-		"Bio::Das::HTTP::Fetch 1.11"
-		"Bio::Das::Map 1.01"
-		"Bio::Das::Request"
-		"Bio::Das::Request::Dnas"
-		"Bio::Das::Request::Dsn"
-		"Bio::Das::Request::Entry_points"
-		"Bio::Das::Request::Feature2Segments"
-		"Bio::Das::Request::Features"
-		"Bio::Das::Request::Sequences"
-		"Bio::Das::Request::Stylesheet"
-		"Bio::Das::Request::Types"
-		"Bio::Das::Segment 0.91"
-		"Bio::Das::Stylesheet 1.00"
-		"Bio::Das::Type"
-		"Bio::Das::TypeHandler"
-		"Bio::Das::Util 0.01"
-	)
-	has_version dev-perl/CGI && MODULES+=(
-		"Bio::Das::AGPServer::Daemon"
-	)
-	local failed=()
-	for dep in "${MODULES[@]}"; do
-		ebegin "Compile testing ${dep}"
-			perl -Mblib="${S}" -M"${dep} ()" -e1
-		eend $? || failed+=( "$dep" )
-	done
-	if [[ ${failed[@]} ]]; then
-		echo
-		eerror "One or more modules failed compile:";
-		for dep in "${failed[@]}"; do
-			eerror "  ${dep}"
-		done
-		die "Failing due to module compilation errors";
-	fi
-	if has "network" ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
-		perl-module_src_test
-	else
-		ewarn "Functional parts of these tests require network access"
-		ewarn "For details, see:"
-		ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Bio-Das"
-	fi
-}
diff --git a/dev-perl/Bio-Das/Bio-Das-1.170.0-r3.ebuild b/dev-perl/Bio-Das/Bio-Das-1.170.0-r3.ebuild
new file mode 100644
index 000000000000..b58408fc8d75
--- /dev/null
+++ b/dev-perl/Bio-Das/Bio-Das-1.170.0-r3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=LDS
+DIST_VERSION=1.17
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Interface to Distributed Annotation System"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/perl-IO-Compress-1.0
+	sci-biology/bioperl
+	>=dev-perl/HTML-Parser-3
+	>=dev-perl/libwww-perl-5
+	>=virtual/perl-MIME-Base64-2.12"
+BDEPEND="${RDEPEND}
+"
+
+optdep_notice() {
+	local i
+	elog "This package has several modules which may require additional dependencies"
+	elog "to use. However, it is up to you to install them separately if you need this"
+	elog "optional functionality:"
+	elog
+	i="$(if has_version 'dev-perl/CGI'; then echo '[I]'; else echo '[ ]'; fi)"
+	elog " $i dev-perl/CGI"
+	elog "     - Running a reference DAS server driven by an AGP File via"
+	elog "       Bio::Das::AGPServer::Daemon"
+
+	if use test; then
+		elog
+		elog "This module will perform additional tests if these dependencies are"
+		elog "pre-installed"
+	fi
+}
+
+src_test() {
+	local MODULES=(
+		"Bio::Das ${DIST_VERSION}"
+		"Bio::Das::AGPServer::Config 1.0"
+		"Bio::Das::AGPServer::Parser"
+		"Bio::Das::AGPServer::SQLStorage"
+		"Bio::Das::AGPServer::SQLStorage::CSV::DB"
+		"Bio::Das::AGPServer::SQLStorage::MySQL::DB"
+		"Bio::Das::DSN"
+		"Bio::Das::Feature 0.91"
+		"Bio::Das::FeatureIterator 0.01"
+		"Bio::Das::HTTP::Fetch 1.11"
+		"Bio::Das::Map 1.01"
+		"Bio::Das::Request"
+		"Bio::Das::Request::Dnas"
+		"Bio::Das::Request::Dsn"
+		"Bio::Das::Request::Entry_points"
+		"Bio::Das::Request::Feature2Segments"
+		"Bio::Das::Request::Features"
+		"Bio::Das::Request::Sequences"
+		"Bio::Das::Request::Stylesheet"
+		"Bio::Das::Request::Types"
+		"Bio::Das::Segment 0.91"
+		"Bio::Das::Stylesheet 1.00"
+		"Bio::Das::Type"
+		"Bio::Das::TypeHandler"
+		"Bio::Das::Util 0.01"
+	)
+	has_version dev-perl/CGI && MODULES+=(
+		"Bio::Das::AGPServer::Daemon"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	if has "network" ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
+		perl-module_src_test
+	else
+		ewarn "Functional parts of these tests require network access"
+		ewarn "For details, see:"
+		ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Bio-Das"
+	fi
+}
diff --git a/dev-perl/Bio-Das/Manifest b/dev-perl/Bio-Das/Manifest
index 13ff854ccc1d..a9c62a6782c5 100644
--- a/dev-perl/Bio-Das/Manifest
+++ b/dev-perl/Bio-Das/Manifest
@@ -1,3 +1,3 @@
 DIST Bio-Das-1.17.tar.gz 105270 BLAKE2B 0203891fe6f4a0847040f43817d9e0a2eb12dd76eebbab4616f2d9a16c35aa6fa3632071e66a135a49e2a308c30ec971eefabb11371e0abfbe6293fffb4a7b55 SHA512 c44d3571f4f4c777d8315db19cf704cc5ff4d48a8edae8b9a43f7d47df709bee476d810ce1e96bec5ccf44b7cf3373f79b892c0a1d17715f19ffdff81558292e
-EBUILD Bio-Das-1.170.0-r2.ebuild 2557 BLAKE2B 0348a208fea7df69883a3e701e67026c397e60bd88f817cbc5aca01ddd6e96f69a9689b4a4b0ee925437e607c8ce99535840869ffcd2ab43de89a90ab4926bae SHA512 93a97d39620eb67fa9cb1d1f86a65c52a86640440ac0d4de3d397f225e9af243d2b60b4a313c4252a280d3ca54e893225bbae835461fb70c41e3fb894b6bcdae
+EBUILD Bio-Das-1.170.0-r3.ebuild 2550 BLAKE2B 44bd6c59d60cd7f6418f0c97c155e3b0a95a1c818d2d6688c9520d5b4f6f6015fbd76a66b5f2c6608e4772838ccfa47b6cbbe4f7e914c271bd73c25b162c6194 SHA512 9d06312a16cf42ba49936f22c31ccf7202dc12f78a11e52adc7adf11ffc87f1f627aa1bb9366d7ee04e4ad9be3b0b029feabd42d8ea842b818b4f0e975d55094
 MISC metadata.xml 2287 BLAKE2B 0ff4308bfe2880b98103aee62f882d811970c217935cfcf957ed92287aed1f0320a62c6280f1d7b8f9d45bb0ef45ab252402244da60b484c1239f12cabe882ac SHA512 b76f420f6fbeff6aea5804b8310be18c2121f80724c1cd805f633292cdeba7bc49c107479bafc95d7cabbac80f8da9d21712b5b59d02cd5e7b0b4bba4cf2722e
diff --git a/dev-perl/Boulder/Boulder-1.300.0-r2.ebuild b/dev-perl/Boulder/Boulder-1.300.0-r2.ebuild
deleted file mode 100644
index f4249f7d0dc4..000000000000
--- a/dev-perl/Boulder/Boulder-1.300.0-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=LDS
-DIST_VERSION=1.30
-DIST_EXAMPLES=( "eg/*" )
-inherit perl-module
-
-DESCRIPTION="An API for hierarchical tag/value structures"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86"
-IUSE="genbank store xml"
-
-RDEPEND="
-	genbank? ( dev-perl/CGI )
-	store? ( virtual/perl-DB_File )
-	xml? ( dev-perl/XML-Parser )
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-${DIST_VERSION}-no-xml-parser-check.patch"
-)
-PERL_RM_FILES=(
-	# Incomplete, instructs not to use, deps not in Gentoo
-	"Boulder/Labbase.pm"
-)
-src_prepare() {
-	use xml || PERL_RM_FILES+=(
-		"Boulder/XML.pm"
-	)
-	use genbank || PERL_RM_FILES+=(
-		"Boulder/Genbank.pm"
-		"Stone/GB_Sequence.pm"
-		"doc/genbank_tags.txt"
-		"eg/gb_get"
-		"eg/gb_search"
-		"eg/genbank.pl"
-		"eg/genbank2.pl"
-		"eg/genbank3.pl"
-	)
-	use store || PERL_RM_FILES+=(
-		"Boulder/Store.pm"
-		"t/store.t"
-	)
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Boulder/Boulder-1.300.0-r3.ebuild b/dev-perl/Boulder/Boulder-1.300.0-r3.ebuild
new file mode 100644
index 000000000000..b3331230d7e2
--- /dev/null
+++ b/dev-perl/Boulder/Boulder-1.300.0-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=LDS
+DIST_VERSION=1.30
+DIST_EXAMPLES=( "eg/*" )
+inherit perl-module
+
+DESCRIPTION="An API for hierarchical tag/value structures"
+
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc sparc x86"
+IUSE="genbank store xml"
+
+RDEPEND="
+	genbank? ( dev-perl/CGI )
+	store? ( virtual/perl-DB_File )
+	xml? ( dev-perl/XML-Parser )
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-${DIST_VERSION}-no-xml-parser-check.patch"
+)
+
+PERL_RM_FILES=(
+	# Incomplete, instructs not to use, deps not in Gentoo
+	"Boulder/Labbase.pm"
+)
+
+src_prepare() {
+	use xml || PERL_RM_FILES+=(
+		"Boulder/XML.pm"
+	)
+	use genbank || PERL_RM_FILES+=(
+		"Boulder/Genbank.pm"
+		"Stone/GB_Sequence.pm"
+		"doc/genbank_tags.txt"
+		"eg/gb_get"
+		"eg/gb_search"
+		"eg/genbank.pl"
+		"eg/genbank2.pl"
+		"eg/genbank3.pl"
+	)
+	use store || PERL_RM_FILES+=(
+		"Boulder/Store.pm"
+		"t/store.t"
+	)
+	perl-module_src_prepare
+}
diff --git a/dev-perl/Boulder/Manifest b/dev-perl/Boulder/Manifest
index 8726691e207b..aa0249052edf 100644
--- a/dev-perl/Boulder/Manifest
+++ b/dev-perl/Boulder/Manifest
@@ -1,4 +1,4 @@
 AUX Boulder-1.30-no-xml-parser-check.patch 795 BLAKE2B e109ec3a4ec7bd29e06c41e8aad25d70a58a5f63546bfd18f1d81ad99a208495a1a94c0bf8a86743f234104b4915749ce3aa0ad0c2e85939d05e8c8084e90a56 SHA512 d4baa7f9b1d2b3e0ace66cb3e3508ed9f711dd9786a0af1fb030b1d2cd8acda1337bea8004a1e1799fb3706bc7c742a1691a0ae5c97d00af774ed9939cc62459
 DIST Boulder-1.30.tar.gz 91202 BLAKE2B e1c7f44248d9b257669713b0168b395cad73713476c0cbf688c1513f99552cafc428c7118bdc13ec33018d198434d36d76cbbfe06308d17df230c951ce85c8d2 SHA512 787c80fb578afd8495e57d96f4db69c6d02f69957593cae9e1e130f58f6b34b79bebe60e2484e6cbc81906e60f79df0f55e9479cffc5c0b800c00c6946d5479e
-EBUILD Boulder-1.300.0-r2.ebuild 1012 BLAKE2B eed422db58b1d9995f678369f3fbe385390d9f0bd671d53e7ce17de6201d5280820f43653195303eb1271e522d8c75c49ef366cd22b22c86c263c3c1287be514 SHA512 ba23eb8dd2fc3673beb0677fd3f225f01156b828832d00429b4d98bbbbce270102848125ec524be4a6396bb87633da5113ab00414d0238235296d46c599a9a13
+EBUILD Boulder-1.300.0-r3.ebuild 1016 BLAKE2B 8fe4e5ca53bb4ea724c8e667ab5b2a53612a9ef45b6434b6e89668f7740b385d5ffee9e03d212643b4b3a4f7ead7872b8a29e6542871fc51998f0a36d13cdabc SHA512 ce23bb4289dbc59ee9b47c8ef95f14f9232d1946b6e5ab26040cf668c8a50e3daaa7b2f45f9512e5bb2cf35a563b7b5760eb9b465d5de00bbaec0373d8bf71ba
 MISC metadata.xml 2070 BLAKE2B 4e7e7ec3404dd1a4b6b111d172a7c9bfef10936a39fbff2fbb68d2f1614945130de89a5a00480b02de8cd59a32a355a1b6322b53c078bd626600e79566ef6023 SHA512 62d0d0da8c87118b0f393da22c0acd62c10344b274f0965cb2dd3776bd2224b1d1cef773d6a9601aac950f345a5297a45ee5fa4be009a77f0a3257f38d9c771c
diff --git a/dev-perl/Browser-Open/Browser-Open-0.40.0-r1.ebuild b/dev-perl/Browser-Open/Browser-Open-0.40.0-r1.ebuild
new file mode 100644
index 000000000000..8a13a37620a6
--- /dev/null
+++ b/dev-perl/Browser-Open/Browser-Open-0.40.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CFRANKS
+DIST_VERSION=0.04
+inherit perl-module
+
+DESCRIPTION="Open a browser at a given URL"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND=""
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.920.0
+	)
+"
diff --git a/dev-perl/Browser-Open/Browser-Open-0.40.0.ebuild b/dev-perl/Browser-Open/Browser-Open-0.40.0.ebuild
deleted file mode 100644
index b38008d75988..000000000000
--- a/dev-perl/Browser-Open/Browser-Open-0.40.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CFRANKS
-DIST_VERSION=0.04
-inherit perl-module
-
-DESCRIPTION="Open a browser at a given URL"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.920.0
-	)
-"
diff --git a/dev-perl/Browser-Open/Manifest b/dev-perl/Browser-Open/Manifest
index d4ae9f5eb1a4..4ff13ec1bb99 100644
--- a/dev-perl/Browser-Open/Manifest
+++ b/dev-perl/Browser-Open/Manifest
@@ -1,3 +1,3 @@
 DIST Browser-Open-0.04.tar.gz 4006 BLAKE2B 13e2b615211c2184fb54c29d9cc197e84a8660076c2b83a5e1fed85e1babbe07968eaa25d32b5608fb97bf237ed8bcc6d7b7547cbf45ede898f2f8b7346b8fd9 SHA512 70f5559c4dd4a07ed8513340871a2c04b2c4118b8f160e23586fc170d5f9123ab287d6031860096ca6329c03df8f077d96f0af2656efe46a9b1629d92255e7ae
-EBUILD Browser-Open-0.40.0.ebuild 413 BLAKE2B 2d2567a0635c8d69982e2d3208022f16c051454055ec242ab9388ee23708f82a0a14f8c6bc6af54107d5c1437c2069ea8c51da237277979404f4b5fb5775d002 SHA512 c57aaecbfa6314bd893bd71256f00cdf1746d0ac40cc9c53c16c7a773cf33a319278a2b75db1cb45f2f0ed8d7081b571384a46da6ad4f226ab240e58e0c5a410
+EBUILD Browser-Open-0.40.0-r1.ebuild 375 BLAKE2B 9c53c9ad3355a98acaa6eefbba7f624533b95cf00dbe33b815fe6390535ed7f525d5e198db5be70c9724efdfeac7af545fef5db9468a28d283d8cb1b9e2d89b7 SHA512 e4571f5aa377c81bee6b610917563cc0d181ab9077a2e8d58e728d818caa510d0fd53ca27f11cdb99dc2900cbddad8aba029d3881f20a5469901eb789db23eae
 MISC metadata.xml 385 BLAKE2B dde6f9d0a1d69bba6f55c3de7d2608b65d640f09c06130ce725a7206779b94b2d4ed068ea9bfae23a6c7f075d342e25f95b40e2870f4ae7af9d405ce1de8bc3f SHA512 fb6b3e628defd32ed8d528127bed2d86862e5e8c0b96cbfe8d371fce40757f60f246585dada53f82abce3a75d337173727fb66addc402aba0c4e11cef2f8b9b9
diff --git a/dev-perl/Business-Hours/Business-Hours-0.130.0-r1.ebuild b/dev-perl/Business-Hours/Business-Hours-0.130.0-r1.ebuild
new file mode 100644
index 000000000000..b2435878eb84
--- /dev/null
+++ b/dev-perl/Business-Hours/Business-Hours-0.130.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=BPS
+DIST_VERSION=0.13
+
+inherit perl-module
+
+DESCRIPTION="Calculate business hours in a time period"
+
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/Set-IntSpan-1.120.0
+	virtual/perl-Time-Local
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Business-Hours/Business-Hours-0.130.0.ebuild b/dev-perl/Business-Hours/Business-Hours-0.130.0.ebuild
deleted file mode 100644
index 22b44101502a..000000000000
--- a/dev-perl/Business-Hours/Business-Hours-0.130.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=BPS
-DIST_VERSION=0.13
-
-inherit perl-module
-
-DESCRIPTION="Calculate business hours in a time period"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	>=dev-perl/Set-IntSpan-1.120.0
-	virtual/perl-Time-Local
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/Business-Hours/Manifest b/dev-perl/Business-Hours/Manifest
index c837405cf436..6df289e9b519 100644
--- a/dev-perl/Business-Hours/Manifest
+++ b/dev-perl/Business-Hours/Manifest
@@ -1,3 +1,3 @@
 DIST Business-Hours-0.13.tar.gz 16391 BLAKE2B ec29b4f0c75953ba5f6c5862c5e4851f82ed827ea01c113bff89082dc264c368f45fed6e1def64b283fb1ef72c633ce28ff301fc8e522c9ff06906cd6bc3e2a2 SHA512 2fb0c5c017f4dd5eaeaf394b7534348473bf47009020d23d5fb642ae67a06d8041f6dae4d554e8e36412cecf447a300f30bcacf4f8aab3c357ea81b6a5c55d7c
-EBUILD Business-Hours-0.130.0.ebuild 381 BLAKE2B a75414333da50026ac48927731cbd08367679bd8a7b8422aabb7a055ea5e7af227b71d82616a1718baf4ab3a23efe302734b05e478d1fca2c3cdaba17c23f114 SHA512 910b78073cef0596cb81876ebb68e6298025313a34d9811ee8a8c974ef9139dd0bf687bc039c1a1572f86b8361c7748673374887e1b476f78e7ac2687ea2831e
+EBUILD Business-Hours-0.130.0-r1.ebuild 382 BLAKE2B 14cf7721a4992f0f58e945c7257bae00329a33441722ce698a3887fcff7c8cc3fb5d7645e930ee2a88b00ca931727c0253219e70e7fe6ee63036a356bf5c0dae SHA512 396bb390e4acff0977b378da70adc2a6a8d95ec208e456c8103b92c53957bd749ca2ad9f07d61f33ad446fff002b88dc337292b1d4bdb753700a81ec8d78e496
 MISC metadata.xml 401 BLAKE2B c70deb95731f4e08ac13a4c40cdb82c186ed675afeb3b48c7d85a56ce811ab0d4bd8bdde6d2a1a696d5546eac2e8de3213cdb8e9b6f2ac945f3d04904befe9ad SHA512 d3f7f9b80342ff933de63adf5c91c365bb326ce57073e451b51d796d198b6c24c55404e8b5416429a0826220f05ed38f5fc8835a07708722abec11051141cc57
diff --git a/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20191107.0.0.ebuild b/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20191107.0.0.ebuild
deleted file mode 100644
index c35f46f1b921..000000000000
--- a/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20191107.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=BDFOY
-DIST_VERSION=20191107
-inherit perl-module
-
-DESCRIPTION="Data pack for Business::ISBN"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-LICENSE="Artistic-2"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PERL_RM_FILES=(
-	"make_data.pl"
-	"t/pod.t"
-	"t/pod_coverage.t"
-)
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-File-Spec
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
-	test? (
-		>=virtual/perl-Test-Simple-0.950.0
-	)
-"
-src_prepare() {
-	sed -r -i '/^pod(|_coverage)\.t$/d' "${S}/t/test_manifest" || die
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Business-ISBN-Data/Manifest b/dev-perl/Business-ISBN-Data/Manifest
index 478220d0b91f..14314a10f5e2 100644
--- a/dev-perl/Business-ISBN-Data/Manifest
+++ b/dev-perl/Business-ISBN-Data/Manifest
@@ -1,5 +1,3 @@
-DIST Business-ISBN-Data-20191107.tar.gz 24838 BLAKE2B 660a7aa9ab7848cc74c20bcc8426126dc8054d81b0229c609d808bd3300a967d177a474019b2faf87d44198bdfbb4cab1fc39b3da7352d725a92795edee8f3a7 SHA512 33e6197de8b026484784d33fdd88e1a0d442b633ade4eeeb45812709cca252c235a377e3b03bb3cade35256b5f5d592b70504cfb7cccd1005544af2a1e4a11a2
 DIST Business-ISBN-Data-20210112.006.tar.gz 29035 BLAKE2B e496a689afb12341307d80d16a2044dd39cd350caf86b9010f94a023ac285991486f6c5dc3e34d9efee70506dcb0aedb98abae7e5e7d573d9385bea6c5729ce0 SHA512 36245caf60d0b210dfbbc1f2668e6b8a227e6641be3800d4e62f6a9902b6b95bc2e952bc48ccd2a61ba958c68b142f64592ffeec9da8bc35d7c8bc5d9b625c80
-EBUILD Business-ISBN-Data-20191107.0.0.ebuild 665 BLAKE2B e5be92ad812b9560974fa941f4dfc2b920096cc150ab2e81f0f279bf619621a24c673fa314e194eeb663fc9f65939458bd3d86eff2fb0cbb80d1c74784b42845 SHA512 d68d38ddea6b1f4206bd073b616449edd49ebd7fb29400dfd113c3a721a35707ea028716ea52544975eaa2d2fc3abcd6d4a7a8985f8c27b19ce4e714eca54f2a
 EBUILD Business-ISBN-Data-20210112.6.0.ebuild 668 BLAKE2B 677050ddcfc0d39f3b54becd067cd1b756e3ff60e4e9faeec8f1ffa5617ec1e842bae3e290da2dc8a97163bf26110689001e2e95bdfc3c8e1d396a9531d9f6c7 SHA512 629dba6118c9246a753085a9c730cbcf1af59389914173f5cadb4698f0acd96280f12a0669b82a7003a33adeeb45ceb3f5f50cabad7a4f9ec762274a68cba6fd
 MISC metadata.xml 398 BLAKE2B e24d6a33e77c91398204722d91f6373eac7eb0ee01708e81d7b68b478744fc309bec0467507e38ba5521dc8c51dd75575e1d8a1214124e793a207455a88867ba SHA512 9a348426ed67bf0cec4a88fcf41b7db6917929c9651f6e6cf1fd01346faa13156aaf9e02ed0aa623596bdd1c23fdd277a7cc8d795bb4cef16c7ca498a5eeef29
diff --git a/dev-perl/Business-ISMN/Business-ISMN-1.201.0.ebuild b/dev-perl/Business-ISMN/Business-ISMN-1.201.0.ebuild
deleted file mode 100644
index 95e8ecf0fbd7..000000000000
--- a/dev-perl/Business-ISMN/Business-ISMN-1.201.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=BDFOY
-DIST_VERSION=1.201
-inherit perl-module
-
-DESCRIPTION="International Standard Music Numbers"
-LICENSE="Artistic-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Tie-Cycle-1.210.0
-	virtual/perl-Scalar-List-Utils
-"
-BDEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
-	virtual/perl-File-Spec
-	test? ( >=virtual/perl-Test-Simple-0.950.0 )
-"
-PERL_RM_FILES=(
-	t/pod.t
-	t/pod_coverage.t
-	t/test_manifest
-)
-PATCHES=(
-	"${FILESDIR}/${PN}-1.132-no-test-manifest.patch"
-)
diff --git a/dev-perl/Business-ISMN/Manifest b/dev-perl/Business-ISMN/Manifest
index 7df15c8321e9..349bb5a242c0 100644
--- a/dev-perl/Business-ISMN/Manifest
+++ b/dev-perl/Business-ISMN/Manifest
@@ -1,6 +1,4 @@
 AUX Business-ISMN-1.132-no-test-manifest.patch 755 BLAKE2B eaed31d13688d5afd1f17301225f17ef2751bcdb2155d905b5f50363912de00b47c325332eeb76bf96aa41fae66d0ab11c7216d236b5fa7dd47048f7f40adec2 SHA512 f183c66de430edecdb05eba7f31b8afbe8a6ac9831b81792bce198b1bbdebc0b7e085cc2132f1dea444a377f89fb145167e4cfefc93e1818d6dbd749ead38651
-DIST Business-ISMN-1.201.tar.gz 14793 BLAKE2B fad3341efd853824e529b5629d501b7c8129724e922868f09cee13209281f15f65e04d7cb2b0d7a5c2c1599effa8367bf71bc503908307ddba00fffc4dc7fd06 SHA512 96f8783d90ddc561a24dff4905127b8983357809df2e31524f3e1f3ec30a56eb07ac9312bc127196602f72d4442b284fa195be22d6d71bb3a6e971dbabe46e22
 DIST Business-ISMN-1.202.tar.gz 14872 BLAKE2B 4101c2ddeec2f285f5d77a8c7fe2f2be325f99b569c759dd521c9078a3b4b479933d4408c839def5c0155cac907b9a8cecbe9a2133b20b31a14004bd5af4488b SHA512 3f3dc2805f15edc92175c60fcf149e7a9558dd91a70173d559b298cedf177b92967f62581f16036a6c4269c3a5bec0d4bcd20a6ff9c13f4e17bec62fdca19ab2
-EBUILD Business-ISMN-1.201.0.ebuild 660 BLAKE2B 20ec4cf8f38fd852aa678b9150dfe92619048fe84505c7d4730aec4eacb69fac907fa1c4dd894fa1f5a8a66d5fea25142fadabed68eef50d7c4a8b9d77b95a92 SHA512 8ec9433d379fcde38bac5e91603ff657607d5534af1e1a931141b2ebcb8b3ee2d0c0b7eab507736ffd735e490446a6a0854732edda28549e59cf98f9f0cb13bd
 EBUILD Business-ISMN-1.202.0.ebuild 663 BLAKE2B e6b4003631292e22d5eaa98fd8b596718858cf54909f83108363b68ab37d94af00c6d3cc1fd86af4e0fe8dfb9f79924def1fa125b536e13ba8f1635812972384 SHA512 268a028777ec929a0a7e7a31358b981c50eacabd5e3b2a7c3e1c9be45e30a4c9f8cdd01e0ab15b4ae0b88baf996af2c22498bc27fa35668192233cba23522bb2
 MISC metadata.xml 452 BLAKE2B cb58818b775d7efad608387ea458ebada5d2ebe452d33793f06ab5ce9be6273488a93877560b2d7be62ac65b48deb5f124ed5b487a954700f1a9f4519e26cfa6 SHA512 13f5b20b98c00ff91ef26fab888d2ed67fdab87d6e49d89f928ebc8e124cefb8a67032a6ef5e49da04ab01b29c165b3cfe701a99955e4e2c56f797068de37807
diff --git a/dev-perl/Business-Tax-VAT-Validation/Business-Tax-VAT-Validation-1.120.0.ebuild b/dev-perl/Business-Tax-VAT-Validation/Business-Tax-VAT-Validation-1.120.0.ebuild
deleted file mode 100644
index 83706eeb84b1..000000000000
--- a/dev-perl/Business-Tax-VAT-Validation/Business-Tax-VAT-Validation-1.120.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DIST_AUTHOR=BIGPRESH
-DIST_VERSION=1.12
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="A class for european VAT numbers validation"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-perl/HTTP-Message-1.0.0
-	>=dev-perl/libwww-perl-1.0.0
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-PERL_RM_FILES=(
-	"t/pod.t"
-	"t/pod-coverage.t"
-)
diff --git a/dev-perl/Business-Tax-VAT-Validation/Manifest b/dev-perl/Business-Tax-VAT-Validation/Manifest
index 8a90355077f3..9713205fc954 100644
--- a/dev-perl/Business-Tax-VAT-Validation/Manifest
+++ b/dev-perl/Business-Tax-VAT-Validation/Manifest
@@ -1,5 +1,3 @@
-DIST Business-Tax-VAT-Validation-1.12.tar.gz 24732 BLAKE2B 5f774cb4765787f8410abc8d0e12f306c4e1d1859864e1e31111c5785825e3d5d613f75dc52d63bcf8b3defb505357f3e87511acda70d01ab40dfde25735a99c SHA512 993660e635a9037f546f428a4a9e572a0b7917a6cb3ff2f20cdaff83f1076c547dc8f12c0c9d69ffeace358328c5c00d084b8aed13d01d3e07659df6ab119419
 DIST Business-Tax-VAT-Validation-1.20.tar.gz 26055 BLAKE2B 3e10a13ecc4ced5274a1a99c36ba738aa23c01b97cb54995e99dd4744d5592ea6c4920fb54ddef7b46000c6182c7f2b7b333b278f7666cd91fc03545c7334f62 SHA512 8504629cd44ef98faba91c01bef80d55c687b73384ea38827fa4c54bd48454522129f941f259a6b1e4b2118110bc552b40530b3c5697b1ef3c83099c36ca2f31
-EBUILD Business-Tax-VAT-Validation-1.120.0.ebuild 485 BLAKE2B eb4a85f1016bb6f14a8f83d36416623a8cf5de61a595709339233d7c47954ecaa383d68b3cd7637aa8bd47ece3f3cce88952fda748cc6cf6a5b62e746d98d2d5 SHA512 aa3b4414a716f5bca808295e5c20f0a330f0da9e14d59b40ae40c949bb256cab055c98749a8c1b1b7730575b018e7e21a6592f7f61d1a01ed3fafb1474d5b6f8
 EBUILD Business-Tax-VAT-Validation-1.200.0.ebuild 501 BLAKE2B 8a378551fa487faad962c2364a59f4d711e0cb3c17bae8699628ee9e747e4d972f1d4e572e7320ff9dea8f43fab1c7ddbcda434cbdfc8b04938398e7016c9073 SHA512 c17d88a8a6152b8be6046a8af5894bbfaae81366b67c7665f921c199f5ece8df247fbd428eb853f5393597d29495dc0d80456616f62c45f0646555c711779b69
 MISC metadata.xml 453 BLAKE2B 13f139744b5f82e26a5c7ffe5164b81e5f4b766f679e83043240af8d1642b94b0ccb76b9efcb51af00da93db27aa03f887bdc96c06258ed5016c94e96e4a8f77 SHA512 70ff6fa3d9bf0a557a76486a65f410da631a4e0c021fb1d6b9354c4ea80ea090c466c2f4cdf34af04e251e18ca93236d87bf6a15876dba7df10974b4e43346f1
diff --git a/dev-perl/Business-UPS/Business-UPS-2.10.0-r2.ebuild b/dev-perl/Business-UPS/Business-UPS-2.10.0-r2.ebuild
deleted file mode 100644
index 0b1f8f6a320d..000000000000
--- a/dev-perl/Business-UPS/Business-UPS-2.10.0-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=TODDR
-DIST_VERSION=2.01
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="A UPS Interface Module"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-perl/libwww-perl"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/Business-UPS/Manifest b/dev-perl/Business-UPS/Manifest
index b6ca5bfb926a..dfbb18e4a921 100644
--- a/dev-perl/Business-UPS/Manifest
+++ b/dev-perl/Business-UPS/Manifest
@@ -1,5 +1,3 @@
-DIST Business-UPS-2.01.tar.gz 9341 BLAKE2B b3b4e6e80fbd42e9e0626befd49bf6318d31215fdca1707516e1c104249ddb8e40d7c3df3c23a5284102d7a41006bb9b803ba890f9997402cbeda152ee1413b8 SHA512 1c0d60e9a3a513fd0ce2513e4e561eec60de5890bfe497b19d44976a2da9d7f31870bbc1824569b882ac573ddd969ad1d67293a2ac08a7750e2dd881d0f49f16
 DIST Business-UPS-2.02.tar.gz 10189 BLAKE2B b70a1d43a34ef4ba51dc7e0a7add8ddc32e614841e94da6344155cdc18eb7cb1cc88f63db6c95f6b9bc8903bff3b3a35dd0a08992d1327bde740c61cbc1a4c8c SHA512 417245c9197de23bce3a816dad79c212f6aaf26554b7f79fc55b4686b590836bc1febce4e0a6605939ffbb051f8b928f3ec2d113e75c632c1f59acf8b719347d
-EBUILD Business-UPS-2.10.0-r2.ebuild 354 BLAKE2B e767d61a8434627eee88c4b3ec58c84127676bbcf26cf02d4682057b5d83897d5ba2290a0f36c43271a2438519bcc01ca85a31652052090e1a16e6c35b7cba98 SHA512 4ba0cb3d1e44948ade652fc3005fdc1ed4084e84c213f67c5c37b0d240e9e45eb9527e8e9d76ff4eb8a46e77360d98c6d3c4f8933ca87184e493100fcc506c6d
 EBUILD Business-UPS-2.20.0.ebuild 354 BLAKE2B 4a77f94e19a2188e117a5d23d13f75fefd070ee81fa11b451488b040ba86636c6f4d09a8675aa176330d680d17b9bf0f8a8a10f5bf06f995a67010a151847bdf SHA512 9ae62a61105d53c641faf7c587b01df7c01162a71635f259f6d3000f77c676cf2cb683d2ec8d4d89523cc3a8d5b471225479b0ca01784a0ea595f88172d4a875
 MISC metadata.xml 397 BLAKE2B 1a4622d988e72d2c35cd0eae2ad32d00286c9b10827650a7c181f7be26cf4a3f779c077d583c7b8acf0e51a401e9964e976bee2fadb22b4ce1d92be4dcdfa932 SHA512 428a4330b1bc04c05f2c7e38a397453292a92496f936992d21614c4eb7109b4613938ae0c631c52e34107552020dad5ef6801c7abd9337d584562693da9994bf
diff --git a/dev-perl/CBOR-XS/CBOR-XS-1.710.0-r1.ebuild b/dev-perl/CBOR-XS/CBOR-XS-1.710.0-r1.ebuild
deleted file mode 100644
index 249754da5781..000000000000
--- a/dev-perl/CBOR-XS/CBOR-XS-1.710.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=MLEHMANN
-DIST_VERSION=1.71
-inherit perl-module
-
-DESCRIPTION="Concise Binary Object Representation (CBOR, RFC7049)"
-# License note: see bottom of ecb.h license block
-LICENSE="GPL-3 || ( GPL-2+ BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Types-Serialiser
-	dev-perl/common-sense
-"
-DEPEND="${RDEPEND}
-	dev-perl/Canary-Stability
-	>=virtual/perl-ExtUtils-MakeMaker-6.520.0
-"
-src_compile() {
-	mymake=(
-		"OPTIMIZE=${CFLAGS}"
-	)
-	perl-module_src_compile
-}
diff --git a/dev-perl/CBOR-XS/Manifest b/dev-perl/CBOR-XS/Manifest
index 85c4d2ea5432..d699206cb608 100644
--- a/dev-perl/CBOR-XS/Manifest
+++ b/dev-perl/CBOR-XS/Manifest
@@ -1,5 +1,3 @@
-DIST CBOR-XS-1.71.tar.gz 72356 BLAKE2B ea3a10d7c3d4e018685e021f4dbec5897acafb465d7c3f50e11d93e3e9b08ef49489d8778710de973390bfe10d5b80310035fa57ea3b8d289182fc0172158a33 SHA512 20be0484c159431a52f4e3c7f7541c7739a86eedf5c4900df71efe693bf3c0367c8540b43d1e95849cbb4f0380d7b8140908b041fca1ed63e868203e1aa57c69
 DIST CBOR-XS-1.83.tar.gz 77046 BLAKE2B c4bccd58a7b1903518b1726cc8e3deaafb376fe9a5af1ebdae648ee3a941559f6f0f0d250a070214710a1556ef3df56ba737748e3f7c4bcb589d2d3dd5878018 SHA512 280c820d247c09c3b77722b369dd23667c846b04109e78ec9f4ce408f033082351596b3652b861f936460a5a2157019eeb3ca51f3093e10cfb7b3ef9cc4565b6
-EBUILD CBOR-XS-1.710.0-r1.ebuild 653 BLAKE2B 6b3f823ca32aa8c013d5b42d9515f44226072c9417ea72c8f26772adcf9bd511cd634385ad915f9c4dfb1c3608f4486af36197064148b41bdaca6197f507c0c2 SHA512 d63c45c2988fad3279123a151965d593fb37fa565ebf437f89de8aa64fcc28656aaa029f1dd08d9e2751ecdbfa1286775d3b8b5f76e111413dd158c5c160f6b8
 EBUILD CBOR-XS-1.830.0.ebuild 655 BLAKE2B 27b9335b98cd8313cfa074d324b8a5ccb8f848e608591251149de15c78173c8d6f7b397f8ed1a6e451bad42dc81b8b07f282f85a0833ed65202980511f7360ce SHA512 ec5cd4ad3e25826f1c0b4cb3363a75e28d9a075d62fc31cf46ecf733c6ba2ad8a976fc88c537d225f248b780f314bd17ca4dc824909cd5ecaabe4b865ada7939
 MISC metadata.xml 387 BLAKE2B f896cd3ebfdf646200dd2a1c936bb72ef56b7c1280f8a0b79bc0f9631460860e5977d206e2faeea0800b8264122ebd727cfd693e617046a3edcb1fd7b2e2e5c1 SHA512 c709786765ca6951a2ed7a5de95bcec05e2d0d00d4cf8272ea71c652808100161c56a53d792dbec28a23a4ffd2fdbeb3361c134743722300cbf680683da8cdc2
diff --git a/dev-perl/CDB_File/CDB_File-1.20.0-r1.ebuild b/dev-perl/CDB_File/CDB_File-1.20.0-r1.ebuild
deleted file mode 100644
index a753c1041d5f..000000000000
--- a/dev-perl/CDB_File/CDB_File-1.20.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=TODDR
-DIST_VERSION=1.02
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Tie to CDB (Bernstein's constant DB) files"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/B-COW
-		virtual/perl-File-Temp
-		virtual/perl-Test-Simple
-	)
-"
-# Parallel breaks
-DIST_TEST="do"
-
-src_prepare() {
-	mkdir "${S}/examples" || die "Can't make examples dir"
-	einfo "Moving bun-x.pl to examples/"
-	cp "${S}/bun-x.pl" "${S}/examples/" || die "Can't copy example to examples/"
-	perl_rm_files bun-x.pl
-	perl-module_src_prepare
-}
-
-src_compile() {
-	mymake=(
-		"OPTIMIZE=${CFLAGS}"
-	)
-	perl-module_src_compile
-}
diff --git a/dev-perl/CDB_File/Manifest b/dev-perl/CDB_File/Manifest
index 118ce52208a9..3307f2bdf30a 100644
--- a/dev-perl/CDB_File/Manifest
+++ b/dev-perl/CDB_File/Manifest
@@ -1,5 +1,3 @@
-DIST CDB_File-1.02.tar.gz 61980 BLAKE2B 435071c501d6b72e077717adce1ed612fc06c6e287382c3beefe34387fe694ae155169a9c45ed84251a8a96bfba00fc6267279f67e0911d594e91b1e8bed66d1 SHA512 301be6f63bb65434bdd93503394514d828be83a1028a3e75b77ca4977c4c1c806c209f338ab2949caaa7c55cab9c263096674f265bc7555385da7e778640faa6
 DIST CDB_File-1.05.tar.gz 138550 BLAKE2B 57b17b59bce907265b3eceb0957adf8790ea21a1b837fca99e9854284ea185ffcb80511f2ec9909db47425a6bde22d9a07bdfb40fdd02b84d816b2c224d56fc0 SHA512 e2612f52ea4c420b73af33b1ee6189967cb69076b4e816aa51987cb724908a768435429eba65e4aca641512bdea355a76663991da542a14a6300f03ce2d488f7
-EBUILD CDB_File-1.20.0-r1.ebuild 808 BLAKE2B 707ffdaba89d26f25a20b5092a721177cde4afb33f1650b1557dacc4b89e190f074c4b645bc30daf8da8633cbc0eea23c014bf06f0caa18bf420d1569b02e0fa SHA512 e30768ce1c7aeebc525112397e95cdc0dbc55cd6e07583a1635eeb8486885d5c6c11ac20ff64dc5b1982fc236fff2c5aeaf7f838bca6556332e93453e9105230
 EBUILD CDB_File-1.50.0.ebuild 902 BLAKE2B 8e9ac44aaef5f6abd208508e4c1a3b469bd526e58cea644439cbce978f34760afd64e30a819c920974308279aaa28bf05a6b671fdba95827808fa3f4a1f4cca3 SHA512 989d9ca17fad5573dbe4dbe6855a0084b4b5d7836fbfc18b613eb7db004cc3349a2557bbbd83d043a25aa0bf0777c0b3188e38fef009df65bd65f6afcb9bd920
 MISC metadata.xml 388 BLAKE2B 1fc2a2802b7710ae0a96962f32c5e97efcc0549f1e245667538b1a8d2236216c44e81a0f258179af48b595486fe5ae613170f86be8689c4aa43f9d592b751f73 SHA512 d7b0f1b2403fda93faba174faf8374c175077fa3562608f331290c369abaf8210fa333f42167b181f21de68630f05a9f008f8ed70d176ff4b42a1665ef1aff51
diff --git a/dev-perl/CDDB/CDDB-1.222.0-r2.ebuild b/dev-perl/CDDB/CDDB-1.222.0-r2.ebuild
deleted file mode 100644
index 96a520a7b36d..000000000000
--- a/dev-perl/CDDB/CDDB-1.222.0-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=RCAPUTO
-DIST_VERSION=1.222
-DIST_EXAMPLES=( "eg/*" )
-inherit perl-module
-
-DESCRIPTION="high-level interface to cddb/freedb protocol"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-Carp-1.260.0
-	>=virtual/perl-Encode-2.510.0
-	>=virtual/perl-IO-1.310.0
-	>=virtual/perl-MIME-Base64-3.130.0
-"
-DEPEND="
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	test? (
-		${RDEPEND}
-		>=virtual/perl-Scalar-List-Utils-1.290.0
-		>=virtual/perl-Test-Simple-0.980.0
-	)
-"
-optdep_installed() {
-	local chr=" "
-	has_version "${1}" && chr="I"
-	printf '[%s] %s\n' "${chr}" "${1}";
-}
-
-optdep_notice() {
-	elog "This package has support for optional features via the following packages"
-	elog "which you may want to install seperately:"
-	elog
-	elog " - Support for submitting disc changes via email:"
-	elog "   $(optdep_installed ">=dev-perl/MailTools-2.40.0")"
-	elog "   $(optdep_installed ">=virtual/perl-MIME-Base64-3.130.0")"
-	if use test; then
-		elog
-		elog "Additional tests may be performed automatically if the above packages"
-		elog "are pre-installed."
-	fi
-}
-
-pkg_postinst() {
-	use test || optdep_notice
-}
-
-src_test() {
-	optdep_notice
-	local MODULES=(
-		# https://rt.cpan.org/Ticket/Display.html?id=123290
-		"CDDB 1.220"
-	)
-	local failed=()
-	for dep in "${MODULES[@]}"; do
-		ebegin "Compile testing ${dep}"
-			perl -Mblib="${S}" -M"${dep} ()" -e1
-		eend $? || failed+=( "$dep" )
-	done
-	if [[ ${failed[@]} ]]; then
-		echo
-		eerror "One or more modules failed compile:";
-		for dep in "${failed[@]}"; do
-			eerror "  ${dep}"
-		done
-		die "Failing due to module compilation errors";
-	fi
-
-	if has network ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
-		perl_rm_files t/release-pod-coverage.t t/release-pod-syntax.t t/000-report-versions.t
-		perl-module_src_test
-	else
-		ewarn "This package needs network access to run functional tests."
-		ewarn "For details, see:"
-		ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/CDDB"
-	fi
-}
diff --git a/dev-perl/CDDB/CDDB-1.222.0-r3.ebuild b/dev-perl/CDDB/CDDB-1.222.0-r3.ebuild
new file mode 100644
index 000000000000..5ab72190c086
--- /dev/null
+++ b/dev-perl/CDDB/CDDB-1.222.0-r3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RCAPUTO
+DIST_VERSION=1.222
+DIST_EXAMPLES=( "eg/*" )
+inherit perl-module
+
+DESCRIPTION="high-level interface to cddb/freedb protocol"
+
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
+
+RDEPEND="
+	>=virtual/perl-Carp-1.260.0
+	>=virtual/perl-Encode-2.510.0
+	>=virtual/perl-IO-1.310.0
+	>=virtual/perl-MIME-Base64-3.130.0
+"
+BDEPEND="
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		${RDEPEND}
+		>=virtual/perl-Scalar-List-Utils-1.290.0
+		>=virtual/perl-Test-Simple-0.980.0
+	)
+"
+
+optdep_installed() {
+	local chr=" "
+	has_version "${1}" && chr="I"
+	printf '[%s] %s\n' "${chr}" "${1}";
+}
+
+optdep_notice() {
+	elog "This package has support for optional features via the following packages"
+	elog "which you may want to install seperately:"
+	elog
+	elog " - Support for submitting disc changes via email:"
+	elog "   $(optdep_installed ">=dev-perl/MailTools-2.40.0")"
+	elog "   $(optdep_installed ">=virtual/perl-MIME-Base64-3.130.0")"
+	if use test; then
+		elog
+		elog "Additional tests may be performed automatically if the above packages"
+		elog "are pre-installed."
+	fi
+}
+
+pkg_postinst() {
+	use test || optdep_notice
+}
+
+src_test() {
+	optdep_notice
+	local MODULES=(
+		# https://rt.cpan.org/Ticket/Display.html?id=123290
+		"CDDB 1.220"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+
+	if has network ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
+		perl_rm_files t/release-pod-coverage.t t/release-pod-syntax.t t/000-report-versions.t
+		perl-module_src_test
+	else
+		ewarn "This package needs network access to run functional tests."
+		ewarn "For details, see:"
+		ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/CDDB"
+	fi
+}
diff --git a/dev-perl/CDDB/Manifest b/dev-perl/CDDB/Manifest
index 73c7c5e68c65..3e533d4209fe 100644
--- a/dev-perl/CDDB/Manifest
+++ b/dev-perl/CDDB/Manifest
@@ -1,3 +1,3 @@
 DIST CDDB-1.222.tar.gz 45771 BLAKE2B 631566dad71e2a10103b749e4139f6bbfce67a1fdd70ce1d09ead9bff5d4faa2aa8d2d0e8d8ce962d76fb40aff2f7c57ee4ab87712619ca19434232e3c6dfa3c SHA512 addd0f4f3fecab7d599eb7ead93828d6a9c74a779a344f190a629e666c95af47b5eea05f885564a90bfa1fa6c128dc3e60e510f295f6f35b3eae2d8939109d98
-EBUILD CDDB-1.222.0-r2.ebuild 2121 BLAKE2B ab1175ca585fb4b9eb032b5d3f3661b4d67c5818eec52d397773c72db45132903491061aa9302c5785de8b1ec4f7980fc96c3482a272603ef3f7cb5027fabc6b SHA512 f827b2f5145aef0fda6041220c5cc1fbe0bbbad287814b34ab2d7a1541034d4e78d041e8a03e5953cc3bbb904c7f349338dce3b4e38584fd09cbce60cece057e
+EBUILD CDDB-1.222.0-r3.ebuild 2084 BLAKE2B 38d6f7069e10781a16e726a109b8229c17a4a9e141622e78af52d53cb09a81f02c2c5e5aca919516e747470b64ff780f11de2d87c1ed693c08b28e67a23dc134 SHA512 a7b1143e4f455365a26583f5b4710bfc0403eafd8991b97507994ac05a7ae68645b72d356151e00dcdb7e66ac6f23d4824ba40f717273df43c830af754e17bbe
 MISC metadata.xml 380 BLAKE2B 79a6fd1371d6eeaef26d832dde37afd7fa4b26166d2872b1b37337a1983800085e56a1fa49bdc485f01f15a8ce74de0889c4f0f60dc3e52b96ad95b33e8fd2d3 SHA512 f570422b1f51f438ff6fe6c31df801ba19cda47213649bfbcf52ef6473ccf7d06314652fb1659492453da90dfb671dd247140e2c5e12e89065de273ec0f4c92a
diff --git a/dev-perl/CGI-Builder/CGI-Builder-1.360.0-r2.ebuild b/dev-perl/CGI-Builder/CGI-Builder-1.360.0-r2.ebuild
deleted file mode 100644
index a5c86b1d0bd0..000000000000
--- a/dev-perl/CGI-Builder/CGI-Builder-1.360.0-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DOMIZIO
-DIST_VERSION=1.36
-DIST_EXAMPLES=( "CBF_examples/*" )
-inherit perl-module
-
-DESCRIPTION="Framework to build simple or complex web-apps"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-perl/OOTools-2.21
-	>=dev-perl/IO-Util-1.5
-	dev-perl/CGI
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-test-cgipm.patch" )
-src_test() {
-	local MODULES=(
-		# https://rt.cpan.org/Ticket/Display.html?id=123292
-		# "Bundle::CGI::Builder::Complete ${DIST_VERSION}"
-		"CGI::Builder ${DIST_VERSION}"
-		"CGI::Builder::Conf"
-		"CGI::Builder::Const"
-		"CGI::Builder::Test"
-	)
-	local failed=()
-	for dep in "${MODULES[@]}"; do
-		ebegin "Compile testing ${dep}"
-			perl -Mblib="${S}" -M"${dep} ()" -e1
-		eend $? || failed+=( "$dep" )
-	done
-	if [[ ${failed[@]} ]]; then
-		echo
-		eerror "One or more modules failed compile:";
-		for dep in "${failed[@]}"; do
-			eerror "  ${dep}"
-		done
-		die "Failing due to module compilation errors";
-	fi
-	perl_rm_files t/test_pod.t t/test_pod_coverage.t
-	perl-module_src_test
-}
diff --git a/dev-perl/CGI-Builder/CGI-Builder-1.360.0-r3.ebuild b/dev-perl/CGI-Builder/CGI-Builder-1.360.0-r3.ebuild
new file mode 100644
index 000000000000..1bf2110faffa
--- /dev/null
+++ b/dev-perl/CGI-Builder/CGI-Builder-1.360.0-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DOMIZIO
+DIST_VERSION=1.36
+DIST_EXAMPLES=( "CBF_examples/*" )
+inherit perl-module
+
+DESCRIPTION="Framework to build simple or complex web-apps"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-perl/OOTools-2.210.0
+	>=dev-perl/IO-Util-1.500.0
+	dev-perl/CGI
+"
+BDEPEND="${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}/${P}-test-cgipm.patch" )
+
+src_test() {
+	local MODULES=(
+		# https://rt.cpan.org/Ticket/Display.html?id=123292
+		# "Bundle::CGI::Builder::Complete ${DIST_VERSION}"
+		"CGI::Builder ${DIST_VERSION}"
+		"CGI::Builder::Conf"
+		"CGI::Builder::Const"
+		"CGI::Builder::Test"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	perl_rm_files t/test_pod.t t/test_pod_coverage.t
+	perl-module_src_test
+}
diff --git a/dev-perl/CGI-Builder/Manifest b/dev-perl/CGI-Builder/Manifest
index 48db12167220..5b4b52c7b7d2 100644
--- a/dev-perl/CGI-Builder/Manifest
+++ b/dev-perl/CGI-Builder/Manifest
@@ -1,4 +1,4 @@
 AUX CGI-Builder-1.360.0-test-cgipm.patch 726 BLAKE2B 06ac4e1722b9da0eab227cae453869edc068bc4530f835ba3958e30031c9c5ea5331556386539d16c9fa116c2f66bd2fcd3bf0dcd4a6969de3bf12930af2944e SHA512 e3460ca3170cf1d598943102d4c07b362200db71bf862d3e067ccca3eed8cc6938631d90c71b699d02ff9ff908f7cdeea73c15a2ec6c9a54b761d59be4e8a3bb
 DIST CGI-Builder-1.36.tar.gz 40247 BLAKE2B 89ed85807dc0d308e30fd7ccce135e88246b00291187d66fbd48207d651be8a495ec7fc132702cf96ad7980b7d8d2e170dd380ef3e0e4ddd54c8d63195e37fe6 SHA512 511bb4e7bfd22ffc08eef3735499c0251ab7039f5bf1fef61b2a690cb6c27aed624a26fd14229af81548d58de3439699d5b0583f3593c1a12c8dbfb2166692a5
-EBUILD CGI-Builder-1.360.0-r2.ebuild 1129 BLAKE2B 7fdbe0f2ef4862a0ce7f708f24a7084fe92eb0f92b5d253ef743141aa1871033512bcb2e12fdcb474f9a46282cccb1a249c1233a5b1e39f3620b9cc551b13469 SHA512 10d24222c654a60ad490c441f34e92700d07c83c4d1ab305685197600dc9c4d4c1bf60cdf11cefa4536dc5a4db83ac471ee99ec7d4bb48759219dcc7ad10dbc8
+EBUILD CGI-Builder-1.360.0-r3.ebuild 1129 BLAKE2B 8682d648e1774d053624ac1856c35d9e403dd8bbeed2f19364615011b25447e5e52dda208c0e976e74939845b75e639428429be9d8d905b3042c71bf7495e2e2 SHA512 bb14708590d4cfe64633903e4e2985c6717119301bdafca083f5956bb662b3e8aa27d3dc24d209b15067179e517b74c3e0b3c8849ddada2d290f632281bfe973
 MISC metadata.xml 395 BLAKE2B cfa2fbda91f728c078c8be9dc63a4cea534656aacf892e9d0c542488ba060673a1bd4897a1ff23c86ccd2a1aff5b209b7f3cb1a98c5bdffa042de3de1571224e SHA512 6ab073e9de2e71e6d4f8cae16432fe9a1d7e3f0419e2a5ae8844a3c62b85984ff77948215841f1ee2dc8bae2d1cdc9ee0674174a9fd4ec15edc07a0ca30e8b3a
diff --git a/dev-perl/CGI-Compile/CGI-Compile-0.240.0.ebuild b/dev-perl/CGI-Compile/CGI-Compile-0.240.0.ebuild
deleted file mode 100644
index 8c9d416108da..000000000000
--- a/dev-perl/CGI-Compile/CGI-Compile-0.240.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=RKITOVER
-DIST_VERSION=0.24
-inherit perl-module
-
-DESCRIPTION="Compile .cgi scripts to a code reference like ModPerl::Registry"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/File-pushd
-	dev-perl/Sub-Name
-"
-DEPEND="
-	dev-perl/Module-Build-Tiny
-"
-BDEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-Tiny-0.34.0
-	test? (
-		dev-perl/CGI
-		dev-perl/Capture-Tiny
-		dev-perl/Sub-Identify
-		dev-perl/Switch
-		dev-perl/Test-NoWarnings
-		dev-perl/Test-Requires
-		virtual/perl-Test-Simple
-		dev-perl/Try-Tiny
-	)
-"
-PERL_RM_FILES=(
-	"t/author-pod-syntax.t"
-)
diff --git a/dev-perl/CGI-Compile/Manifest b/dev-perl/CGI-Compile/Manifest
index 58ce0f630caf..9f8d53ed1f2a 100644
--- a/dev-perl/CGI-Compile/Manifest
+++ b/dev-perl/CGI-Compile/Manifest
@@ -1,5 +1,3 @@
-DIST CGI-Compile-0.24.tar.gz 22392 BLAKE2B 874789fb78b9df5c1a207c3ebdc864bc3a648cd9c41943d64a94eef95c3c1d20d287e893f3ea2fa89ae4754f9ffaa931b7f5cfa239f984009ab06c266d1113c9 SHA512 bfb0e0d34f7088acc04811d8f778721b6b77afeeca1b3cdb7c21d633152f17af33c5de8772ef81adea48315d6eae5c7706a5cbbb7f373dbc0b08fe0ee8335abe
 DIST CGI-Compile-0.25.tar.gz 22479 BLAKE2B e321ec4d0ecee66f0efb8c89f322a036b135449938840aa0cfe0bf714bb2e8a0ad2d8d8f4397b00aa9e86d03190cb9429aaa8e0420528f233ddc9c066f768859 SHA512 760481c3868592d7dbeab10125ee76c608ea6a705926597c4219dc128c3ffb642ff39e6ddf72aa916c183fb6baf3671e687ea9a41b86987a60fc076d304d6fe6
-EBUILD CGI-Compile-0.240.0.ebuild 735 BLAKE2B 85aa4d8076f926cc0dcdc077594817724521c15741f4bbb843a96822f3ff01d3c3bada4c0a721c30ca9ccd9aa6f83fc8fabd9c6051c639aea11c750df59380cc SHA512 bcbda81e1f578b5852b02ac0f3b2eb30faff6ac16a22f9677cc7cc432c7928030ff27e83bc946227290677b84cbe4982f4d00649049512b501539976512453bb
 EBUILD CGI-Compile-0.250.0.ebuild 735 BLAKE2B aefcaaff7c0f2aa794f1b19ead5b6095a2c0eda80bb81539bffff6d21096bdc25b876929436288b3c280324573223d90818a39d9cf39369ac9504796413f8ed0 SHA512 16be7b77df75764bef60cb111db296caa77739111c08a58b7e39a8d0b55171fd64ac64ed0474431f10982140a50743394c0a00dde4584560ce44344b3ed633e5
 MISC metadata.xml 395 BLAKE2B c13ed4c51fccab9ee326f71b530c3a680e02f599c46e33eb65bb5a1dab388dd7af60e1997df741002cd969a35a353ff73db7e1f720e50e7ca261521e162cb557 SHA512 94e8e07e80ef77ca6da533576ddcd3b0a53189b9692094c0d728d7fb7bdd1f8ae15ace9631f78c98afd314e590f521e4434f1395cdd4fcd1e07acdb5c40eef24
diff --git a/dev-perl/CGI-Emulate-PSGI/CGI-Emulate-PSGI-0.230.0-r1.ebuild b/dev-perl/CGI-Emulate-PSGI/CGI-Emulate-PSGI-0.230.0-r1.ebuild
new file mode 100644
index 000000000000..39a76dd9bad7
--- /dev/null
+++ b/dev-perl/CGI-Emulate-PSGI/CGI-Emulate-PSGI-0.230.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TOKUHIROM
+DIST_VERSION=0.23
+inherit perl-module
+
+DESCRIPTION="PSGI adapter for CGI"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+
+RDEPEND="
+	>=dev-perl/CGI-3.630.0
+	dev-perl/HTTP-Message
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.880.0
+		>=dev-perl/Test-Requires-0.80.0
+	)
+"
+
+src_test() {
+	perl_rm_files t/author-pod-syntax.t
+	perl-module_src_test
+}
diff --git a/dev-perl/CGI-Emulate-PSGI/CGI-Emulate-PSGI-0.230.0.ebuild b/dev-perl/CGI-Emulate-PSGI/CGI-Emulate-PSGI-0.230.0.ebuild
deleted file mode 100644
index 7d5418a9511d..000000000000
--- a/dev-perl/CGI-Emulate-PSGI/CGI-Emulate-PSGI-0.230.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=TOKUHIROM
-DIST_VERSION=0.23
-inherit perl-module
-
-DESCRIPTION="PSGI adapter for CGI"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/CGI-3.630.0
-	dev-perl/HTTP-Message
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.880.0
-		>=dev-perl/Test-Requires-0.80.0
-	)
-"
-src_test() {
-	perl_rm_files t/author-pod-syntax.t
-	perl-module_src_test
-}
diff --git a/dev-perl/CGI-Emulate-PSGI/Manifest b/dev-perl/CGI-Emulate-PSGI/Manifest
index 58d0f5453fee..d31dd9df9f64 100644
--- a/dev-perl/CGI-Emulate-PSGI/Manifest
+++ b/dev-perl/CGI-Emulate-PSGI/Manifest
@@ -1,3 +1,3 @@
 DIST CGI-Emulate-PSGI-0.23.tar.gz 15713 BLAKE2B b45e41838b16df58d6df67bb9a819b02283f78fe109f8013a7912c2afb59aec2764b4312a3b92a27b7959ca91e34dd9e4dacc5e01a5b2a8a6b822d843a89a07f SHA512 0e1017175ccab53ef50993c9884990dc85c7cdb30744f4bac2df4486a63fd5fd24e7f4b0e473d39b1f2b4dfdcf12756016edbc39e0fb725c6c610c21e6a7f96a
-EBUILD CGI-Emulate-PSGI-0.230.0.ebuild 579 BLAKE2B f9969347b0b43bcb77cce1cc3afb597d109558a19fd885dbb35295a89d769b3e3a739c0675ac5114157af4a4465565dee85f7e51c2170dff9e337328ec7ca696 SHA512 a1ad47de799eef31df63a2918e7a56e313c63c05047f7c9cbb98d5dfc25f9110e27f6c85e0e54a5fa9c843cf0a6a160927affa52592e43c8a30fbfe5bc511e48
+EBUILD CGI-Emulate-PSGI-0.230.0-r1.ebuild 542 BLAKE2B 5e1ca0c379763178952bf00fa5b28bcf93ccfab8a689d8c3332341c5a39a7fb48dba69412265b3679fed085150a96aba9c37565b67a75e530d7947602115ac24 SHA512 0d944b4e234a985555bec0403070649d2af138d45ba9db5679c2094c9f5ff4396114e59957d18b45c8301164768aec7fe09797d26e0ced881f7c818404424a09
 MISC metadata.xml 469 BLAKE2B 87ed6e8f745894972a87cf613898760aa2ecc287dd0769ed3b0101dd13711fc5209011f8d73cc89ff156ea87b9bfbce31d7d5271a05ea5001d2292064d59b7f1 SHA512 d4f6eb7c348902212af61c5121d830bea852a315e65a3ec65864bb33a03ae7383a48ab2b139ba6b8b184f59a0da6ca924122c60b84725314edf9b7f21bfbcd9e
diff --git a/dev-perl/CGI-Fast/CGI-Fast-2.160.0.ebuild b/dev-perl/CGI-Fast/CGI-Fast-2.160.0.ebuild
new file mode 100644
index 000000000000..cf8a2c801676
--- /dev/null
+++ b/dev-perl/CGI-Fast/CGI-Fast-2.160.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=LEEJO
+DIST_VERSION=2.16
+inherit perl-module
+
+DESCRIPTION="CGI Interface for Fast CGI"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-perl/CGI-4
+	virtual/perl-Carp
+	>=dev-perl/FCGI-0.670.0
+	virtual/perl-if
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Temp
+		virtual/perl-Test-Simple
+	)
+"
+
+PERL_RM_FILES=( "t/006_changes.t" )
diff --git a/dev-perl/CGI-Fast/Manifest b/dev-perl/CGI-Fast/Manifest
index c42994990cd8..f73fb28a30c5 100644
--- a/dev-perl/CGI-Fast/Manifest
+++ b/dev-perl/CGI-Fast/Manifest
@@ -1,3 +1,5 @@
 DIST CGI-Fast-2.15.tar.gz 9277 BLAKE2B 95de6374611d8719195a65ef9a9575b34b82922f4a87c8844fc9ac4e62f219b3b19dafe10baaef8431e297cafe495a43c1761b9d3b275d471fed3855e95b4386 SHA512 b984cbcf5d1d96dd9fcb58b704ae643e127fcdbe37b4d7e7560e5e1219abb849d72c4ff5a2eb45d7f076a126543b06fda282aabf2c3788b8a87f075c081d30c1
+DIST CGI-Fast-2.16.tar.gz 9310 BLAKE2B b5d5643642a5091e9ed053995c592d3356de40f734fd881e07db81e9743e55a007597a8e32c18519a048e7ce540d0ca0860c3efa066adfcb77b824449b2c7ff1 SHA512 50dce23855809f53c722a9ed7839469400baafdf8cf006cce4a7686a0e9a1a6ee500ffbd3bb418ecfa7d14efa3f9adb96c37dea8282a3d05b9c0e7e723bc7e37
 EBUILD CGI-Fast-2.150.0.ebuild 679 BLAKE2B 1da9e6f7ffb2585c42f5253edc4af280a87f3fc8b7b75c5adedb4659cbcd4f04a98de2ca7670af8f583f74d6b6830ebb00134231f26568c21bf6def359b68081 SHA512 1721618b987382e84690346d5cfed4a24655c868be71c5c28dbc65c18424062da8941451e4dd37178d3fb6769e1fcd1bd2f056eabc9c6565d4de36bbb4c53144
+EBUILD CGI-Fast-2.160.0.ebuild 644 BLAKE2B 4f61766408fb76c8ce188df09317ed31f5a4b0a2b3ec9cb8793bc48a25d88eeeece7755fd790a8622ac7089c2a09be785369e450a2eced9fa34a6e88873128ea SHA512 6e17c0555c2b66c28b409e7f76aed08054beef0a57d187292e3dc5ad32c2e9bb3c1d237fe10ba173b94aacb755e941acd2a889e44d48e375cf362d743cef7d59
 MISC metadata.xml 389 BLAKE2B 178910985fc7a4fbead2f1e68944ea88364d31c53229f2b4c9ae1f3b1acde3f73e2a6dd84c1c2abbc8b66fcc46506b0dd4009d6c6b454c9148afdb4769478e9d SHA512 6c763b04ee2bb62c763db44c5cefe62f1acb337aa4a0544c6a07fbd5f962563a297eeafff51f2965819237257617da62d0a021b64e7fbede1cb9cf7ca7b816ee
diff --git a/dev-perl/CGI-FastTemplate/CGI-FastTemplate-1.90.0-r2.ebuild b/dev-perl/CGI-FastTemplate/CGI-FastTemplate-1.90.0-r2.ebuild
deleted file mode 100644
index 97c9ed6959c5..000000000000
--- a/dev-perl/CGI-FastTemplate/CGI-FastTemplate-1.90.0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=JMOORE
-DIST_VERSION=1.09
-inherit perl-module
-
-DESCRIPTION="High Performance Templates and Variable Interpolation"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
-IUSE=""
diff --git a/dev-perl/CGI-FastTemplate/CGI-FastTemplate-1.90.0-r3.ebuild b/dev-perl/CGI-FastTemplate/CGI-FastTemplate-1.90.0-r3.ebuild
new file mode 100644
index 000000000000..7014a87a3a87
--- /dev/null
+++ b/dev-perl/CGI-FastTemplate/CGI-FastTemplate-1.90.0-r3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=JMOORE
+DIST_VERSION=1.09
+inherit perl-module
+
+DESCRIPTION="High Performance Templates and Variable Interpolation"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
diff --git a/dev-perl/CGI-FastTemplate/Manifest b/dev-perl/CGI-FastTemplate/Manifest
index a2c5d133bf91..7371062f4616 100644
--- a/dev-perl/CGI-FastTemplate/Manifest
+++ b/dev-perl/CGI-FastTemplate/Manifest
@@ -1,3 +1,3 @@
 DIST CGI-FastTemplate-1.09.tar.gz 13635 BLAKE2B 8be2c1c6959ba08f3cd0b117e40ff29a8fdbe0f174848852478167317b2f14bfdb184346cbd7c6e0aa2bdcc4baac0ce9a55d00b2602ead8c7d1efbfd9228d606 SHA512 ff8907573d86cdc534ddd8f1b3b1d697df9eab429510b3b090371f01d856d8a374a7a0cfe0a2709468dd5e8be1b5738801859e0b138adcf5357daff09343136b
-EBUILD CGI-FastTemplate-1.90.0-r2.ebuild 301 BLAKE2B 483bd42bcff38e418ceba142082220e22a18c975e43f498de085106a247204b5e9578b7284e22a8d49d35fa4a9f80828852f55d0cf42de8fcf4cb30228ebed85 SHA512 c6d49ebf4bc4aa47e4e47219640d8c0a9322423b4ed7a8cd1b4cd883f32c9d8972011096eecd9c1abe7ea071b9562a6663b3d83c1cdc0d0d9f69674ea2bf697a
+EBUILD CGI-FastTemplate-1.90.0-r3.ebuild 293 BLAKE2B c98923cb30d04da734b7cc077e954adb43c3e831c28eee8925a63dc261dfc9a3657d30b43cf4b41f520b8364c341d307e9963d4b264302a1e04ee58cf15f3a35 SHA512 d5ec53265f35d623189ef13d968390cdc7f293060d2115841c0c69e9073301aab63a46c34641803b4144367b8f3d863772932e01bd9d0e9ea2c654eede774282
 MISC metadata.xml 405 BLAKE2B fd3333c4fd9fdf9de5bfeaf3aa1516463560114190eaa12a6ef775ad44e33f9cbd9176fabb8e81542d55771d323f8937dabf5ce5cd7a68e7a2fad3dd711973f1 SHA512 3a3b946c4aacc50ae9b9955777e9e9525f1b3a61740f369744d74e0593371dbaf3da510ce963fe2398473164aad340be6d0544fff88582b175ecc6ef4bf3af77
diff --git a/dev-perl/CGI/CGI-4.470.0.ebuild b/dev-perl/CGI/CGI-4.470.0.ebuild
deleted file mode 100644
index 968bac85dce0..000000000000
--- a/dev-perl/CGI/CGI-4.470.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=LEEJO
-DIST_VERSION=4.47
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Simple Common Gateway Interface Class"
-LICENSE="Artistic-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Encode
-	virtual/perl-Exporter
-	>=virtual/perl-File-Spec-0.820.0
-	>=virtual/perl-File-Temp-0.170.0
-	>=dev-perl/HTML-Parser-3.690.0
-	virtual/perl-if
-	>=virtual/perl-parent-0.225.0
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-IO
-		>=dev-perl/Test-Deep-0.110.0
-		dev-perl/Test-NoWarnings
-		>=virtual/perl-Test-Simple-0.980.0
-		>=dev-perl/Test-Warn-0.300.0
-	)
-"
-PERL_RM_FILES=( "t/compiles_pod.t" "t/changes.t" )
diff --git a/dev-perl/CGI/CGI-4.530.0.ebuild b/dev-perl/CGI/CGI-4.530.0.ebuild
new file mode 100644
index 000000000000..f35e1f694ab2
--- /dev/null
+++ b/dev-perl/CGI/CGI-4.530.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=LEEJO
+DIST_VERSION=4.53
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Simple Common Gateway Interface Class"
+LICENSE="Artistic-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"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Encode
+	virtual/perl-Exporter
+	>=virtual/perl-File-Spec-0.820.0
+	>=virtual/perl-File-Temp-0.170.0
+	>=dev-perl/HTML-Parser-3.690.0
+	virtual/perl-if
+	>=virtual/perl-parent-0.225.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-IO
+		>=dev-perl/Test-Deep-0.110.0
+		dev-perl/Test-NoWarnings
+		>=virtual/perl-Test-Simple-0.980.0
+		>=dev-perl/Test-Warn-0.300.0
+	)
+"
+
+PERL_RM_FILES=( "t/compiles_pod.t" "t/changes.t" )
diff --git a/dev-perl/CGI/Manifest b/dev-perl/CGI/Manifest
index 9a2bf770b3b3..42fe82dc2369 100644
--- a/dev-perl/CGI/Manifest
+++ b/dev-perl/CGI/Manifest
@@ -1,5 +1,5 @@
-DIST CGI-4.47.tar.gz 204940 BLAKE2B fa0c4492b19543061403ff65be0d304fe166ece4cdfdb19c9c55de391001add2c03bd4c99019ddeae1b2fc70009a5419de8baa7159548f237351572d11c9c004 SHA512 1f46c15071254a691781a93cfdaed62da01486bb32d68ef6999ad1aa6f8b631452fad4aa95fdf8ce63a7314023853f01fddfb9aabf3f49460d174d118136822d
 DIST CGI-4.51.tar.gz 205366 BLAKE2B 1fd76c82610ad1b017f19bd055bbf4a533f96e385891c53832a7e43f4c8d5fc74ed81a6e86e4e44443ce666bf30a7354b06f808d2c68e65c0fea75b2ce5fb7b8 SHA512 1ff69bf78c346142f0355e816fae18c69eb57504c2fc06738f2d26b97adee7cee1df2b4b2246ae72532e769a613aea6d6f7027956066a0c12354658e62a98e5d
-EBUILD CGI-4.470.0.ebuild 1000 BLAKE2B 8b19c07ef01c94ec55e49f62a4008a9d578a44f2a8eaac4a172669b916a13f8d850f956591d07fbfe6ca8bc779bed2a133b31eec7ba5ff13c3dacf521ab9d829 SHA512 7f1e7f8c122b0512741829f754894ca086bc3da53971ec5a2145fa2c42b90cacd78f6b73ec385175cb13aad7214cc04dc5ca7ac2dab0307c7731550762d22f3d
+DIST CGI-4.53.tar.gz 205366 BLAKE2B 8ca6c79688233e09e988097c465bef646f49e2abd82709918406ebcf5da9d7d5b7765691842f44b52ddde694864e0adcaedf869de4750d033253b68ad5bc5982 SHA512 8b037d4c3240dd87ab888245b604efb43d25e155e3e7e4068b373ef73d7dc2d6361d83819733f62a5c138003290d5195ec8cfaa1a5e8ca6356e6e9aa52813567
 EBUILD CGI-4.510.0.ebuild 1000 BLAKE2B 29df1e62b7c7b1f3ea97d592d4b054c44b6327619000d696a955814c567376e7fbfc36148b5744e2caaa0ac5c693d218d1d78f2ca1728890f36167134944e48d SHA512 07d8defbcd8b74336eab1938b16f12ae3cd79da2958801a3aecb23e6d3528e647b3864aff45eaf2a9707bf58e59e2a3c63429bfd160f6a40d4f6bf2368a11d6f
+EBUILD CGI-4.530.0.ebuild 970 BLAKE2B 639e36eb58e09497eefe0d4f7e434d6e4af0a399b2e39e7e744af60afc67750b904c1ca85702497779afcc07179f4ec26a69a86d0a32c47cc577b4e4e83a145d SHA512 5c08d440c044779c1e895b950f2f0bfe99e8917bea95f3b7c12162c08e0e8868101116aa4f3cf5c038edd3f0753d35aee47876be57eb97b6fff995320fdb2ac6
 MISC metadata.xml 907 BLAKE2B 1b907ab91726723b459cb5d15cfdaf999c5362b1444855b41bc1f8019066add4042e02a77cf3f34d5c0669e5d72ea30efc5806c28d84f6aa16f665767717295b SHA512 dae5c307728f06c5b60a564512c366b59f3df66314c0564c91a8d8de4a331be0bad24dee0daf656f6a82d1be1b9dfb983618bb09c30629c46d514786fede6033
diff --git a/dev-perl/CPAN-Checksums/CPAN-Checksums-2.120.0-r1.ebuild b/dev-perl/CPAN-Checksums/CPAN-Checksums-2.120.0-r1.ebuild
new file mode 100644
index 000000000000..3987b0a99db8
--- /dev/null
+++ b/dev-perl/CPAN-Checksums/CPAN-Checksums-2.120.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ANDK
+DIST_VERSION=2.12
+inherit perl-module
+
+DESCRIPTION="Write a CHECKSUMS file for a directory as on CPAN"
+
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-perl/Compress-Bzip2
+	dev-perl/Data-Compare
+	virtual/perl-Data-Dumper
+	>=virtual/perl-Digest-MD5-2.360.0
+	virtual/perl-Digest-SHA
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+	virtual/perl-IO
+	virtual/perl-IO-Compress
+	virtual/perl-Safe
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Path
+		virtual/perl-Test-Simple
+		virtual/perl-Time-HiRes
+	)
+"
+
+PERL_RM_FILES=(
+		t/00signature.t   # Online test, invalid if dist tweaked
+		t/52podcover.t    # Author Test
+		t/pod.t           # Author Test
+	)
diff --git a/dev-perl/CPAN-Checksums/CPAN-Checksums-2.120.0.ebuild b/dev-perl/CPAN-Checksums/CPAN-Checksums-2.120.0.ebuild
deleted file mode 100644
index 55945224b216..000000000000
--- a/dev-perl/CPAN-Checksums/CPAN-Checksums-2.120.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ANDK
-DIST_VERSION=2.12
-inherit perl-module
-
-DESCRIPTION="Write a CHECKSUMS file for a directory as on CPAN"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Compress-Bzip2
-	dev-perl/Data-Compare
-	virtual/perl-Data-Dumper
-	>=virtual/perl-Digest-MD5-2.360.0
-	virtual/perl-Digest-SHA
-	virtual/perl-Exporter
-	virtual/perl-File-Spec
-	virtual/perl-IO
-	virtual/perl-IO-Compress
-	virtual/perl-Safe
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Path
-		virtual/perl-Test-Simple
-		virtual/perl-Time-HiRes
-	)"
-
-src_test() {
-	local bad_files=(
-		"t/00signature.t" # Online test, invalid if dist tweaked
-		t/52podcover.t    # Author Test
-		t/pod.t           # Author Test
-	)
-	perl_rm_files "${bad_files[@]}"
-	perl-module_src_test
-}
diff --git a/dev-perl/CPAN-Checksums/Manifest b/dev-perl/CPAN-Checksums/Manifest
index 153bf6f3c295..7aadb97d040b 100644
--- a/dev-perl/CPAN-Checksums/Manifest
+++ b/dev-perl/CPAN-Checksums/Manifest
@@ -1,3 +1,3 @@
 DIST CPAN-Checksums-2.12.tar.gz 14868 BLAKE2B f76ce9bf174d35225d16327b816ef34555c5417f577256b173731d15d7ccc38f6bd982758a3f578a7ca04b7bb08636accaada0f50a015808923d330a22ec18cf SHA512 86cf82d04bb9611d2efbbb1a5c5d5b793a07a1c844e205b6c3ebddc26b4fd5f5a9b3a5a8ca659d5a546c4c3ab0de93b39f1af2d4cae802213d40e1f93f60d4c7
-EBUILD CPAN-Checksums-2.120.0.ebuild 957 BLAKE2B beab57b955dd21af76aac5bb93396122539577fc984c6a9ed267bb563c22b6a2f9d18a8033b79f983cc3727f25980d355063688b4684bcd9cd8c208c6b03b996 SHA512 11433863733d84d6761f854221fac79e87b6c4b0da1e4d70e752e8ee0e6764083cfd632cab7b86b297522f5d86fddc3d2cd8de415c7589f4b163371c0fe4577b
+EBUILD CPAN-Checksums-2.120.0-r1.ebuild 847 BLAKE2B 998b261ccdf02994fad1f0885fe0dd0e8359ec75da9b51b3d611f3fb4413074f19a017fa1bdfcabed7403896a28b1300ff6d96815fc23a1d96fd63a09f7bb759 SHA512 2191289a204d13208a1f8eb8b6f8db67479513711b2c1515b8bc0417e433d5a16f41927453221e1a0afcbd4c95cf89c05313a8db86dca68aac528b265900ab68
 MISC metadata.xml 401 BLAKE2B a0d529f820a8dc8c09b950c6c7e34853d65107e310c2c97c5ecd24d4084f50844761d45d971210e60bf50690b8ee27192bad5f4450bbdc3475943266dfa32308 SHA512 2b59aa815bb9b577651925f88e6f1990bfb025983c1349ae0e17b480921ad5f4ffbc5e98ace9a022967cf88a826eca04fdc1d79b88cebd04cb1482862cb9dbc1
diff --git a/dev-perl/CPAN-DistnameInfo/CPAN-DistnameInfo-0.120.0-r2.ebuild b/dev-perl/CPAN-DistnameInfo/CPAN-DistnameInfo-0.120.0-r2.ebuild
deleted file mode 100644
index d7c34bae6b6b..000000000000
--- a/dev-perl/CPAN-DistnameInfo/CPAN-DistnameInfo-0.120.0-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=GBARR
-DIST_VERSION=0.12
-inherit perl-module
-
-DESCRIPTION="Extract distribution name and version from a distribution filename"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/CPAN-DistnameInfo/CPAN-DistnameInfo-0.120.0-r3.ebuild b/dev-perl/CPAN-DistnameInfo/CPAN-DistnameInfo-0.120.0-r3.ebuild
new file mode 100644
index 000000000000..ea10b0471e56
--- /dev/null
+++ b/dev-perl/CPAN-DistnameInfo/CPAN-DistnameInfo-0.120.0-r3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=GBARR
+DIST_VERSION=0.12
+inherit perl-module
+
+DESCRIPTION="Extract distribution name and version from a distribution filename"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-perl/CPAN-DistnameInfo/Manifest b/dev-perl/CPAN-DistnameInfo/Manifest
index 8b539595e03b..be684c01fd2c 100644
--- a/dev-perl/CPAN-DistnameInfo/Manifest
+++ b/dev-perl/CPAN-DistnameInfo/Manifest
@@ -1,3 +1,3 @@
 DIST CPAN-DistnameInfo-0.12.tar.gz 14523 BLAKE2B 62db32c6e158e08d876986960f5139c4b7020c662d03233ac08c1484b2cf623b80b1b11b5908d07a19f4d1e6c2ab8d129b403cd493dfc46dc7051498d1066f95 SHA512 f52eb88b87ab732d13c2ee4e4770cf27c249d2b2446b51e75abe31f2a70b8dc7d8370f4c4426fa68cc8fa7a905668dfdcd1387cd98e239393bde90d1965929f1
-EBUILD CPAN-DistnameInfo-0.120.0-r2.ebuild 531 BLAKE2B 6f1054d6a01feae4e7389e91f8b3ce578bf24302b22217b943e6d41a1aa2c81957ff1ad17c99e975c6099e907fd62eff68f39d607cfd92f8c6aa524eb2f681ff SHA512 0425e17613abe187d008c5823c9ef8d9835e153ecde9de65f7c3dce67f298a896dd4b793c57f8f2e80392a2f0abc7904800c9f9e8ef724dcd8669a8646fb7046
+EBUILD CPAN-DistnameInfo-0.120.0-r3.ebuild 387 BLAKE2B efb0e21bf143d57ac326ba3811188b44d0f387f21480868722d8a49c52821ed50608fd60945ea6a7ca7c4fb28a2103e04193966588a235076c03d8a8fc77e139 SHA512 65225fa43490d6144c9362df6e3eb042fc100aafd318317e4ec0e79b721f1e3d5280e4b008d8de003c0464aea3b94c6966f93457b616ee19cd5d99cd4a98383b
 MISC metadata.xml 407 BLAKE2B d915041f65a73bf4d389a86a1efbdffa806d695176f603a37d73626674d694cb1b2932a082bf7fb22f89737e345db7415dbc0eacc6ea715995e64d32f00895a4 SHA512 d11e0a04d25d2a741f5dc3dec3d0e527b3f5a3d77a10f6d3edaf4b15268d72b1a74d2ac2be6475c2c52791a98c9fe9903b6334d1d018ca602e6152cfacbb767d
diff --git a/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0-r1.ebuild b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0-r1.ebuild
new file mode 100644
index 000000000000..bedbe32ca90e
--- /dev/null
+++ b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=LEONT
+DIST_VERSION=0.014
+inherit perl-module
+
+DESCRIPTION="Verify requirements in a CPAN::Meta object"
+
+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"
+
+RDEPEND="
+	>=virtual/perl-CPAN-Meta-2.132.830
+	>=virtual/perl-CPAN-Meta-Requirements-2.121.0
+	virtual/perl-Exporter
+	>=virtual/perl-Module-Metadata-1.0.23
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		dev-perl/Test-Deep
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
diff --git a/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild
deleted file mode 100644
index cb9d12e06006..000000000000
--- a/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=LEONT
-DIST_VERSION=0.014
-inherit perl-module
-
-DESCRIPTION="Verify requirements in a CPAN::Meta object"
-
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# CPAN::Meta::Prereqs -> perl-CPAN-Meta
-RDEPEND="
-	>=virtual/perl-CPAN-Meta-2.132.830
-	>=virtual/perl-CPAN-Meta-Requirements-2.121.0
-	virtual/perl-Exporter
-	>=virtual/perl-Module-Metadata-1.0.23
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	test? (
-		dev-perl/Test-Deep
-		>=virtual/perl-Test-Simple-0.880.0
-	)
-"
diff --git a/dev-perl/CPAN-Meta-Check/Manifest b/dev-perl/CPAN-Meta-Check/Manifest
index 1a3be15b21ac..3fbb139320f9 100644
--- a/dev-perl/CPAN-Meta-Check/Manifest
+++ b/dev-perl/CPAN-Meta-Check/Manifest
@@ -1,3 +1,3 @@
 DIST CPAN-Meta-Check-0.014.tar.gz 13187 BLAKE2B 49e21dd269265f6ce279fe88430d9eb3b7bcd65e932da18eb7b6e762a69c20683279c9413157b8df432c480a8950097ee288013e648e062fe55280088276a48c SHA512 a10af09a7ce771ca3983adea8053d141750fd09849609a28e7f973831fd3a3ece55281841aec93c099154bb59135986da4983bf612ae4e956c45dbb3f2770f5e
-EBUILD CPAN-Meta-Check-0.14.0.ebuild 803 BLAKE2B 3428dd12ec685ddba4ecb7936b4a47d8bd3c0403cea778f299de69dd49f095155ef4b8dd5b5af6f1d9d611ccaf5c3bcd0bfb6cc6ab8f3cfa5e3a197653598cd6 SHA512 eb7c88f6ed62a0d48ade6940c6a21c77c0f1aa9e2c523bd6b5b3ab2d4393771b6c4c3b1870c7e7bb65b3806cbe129d3fcaff40dcb87bd6a636e487de041b63a9
+EBUILD CPAN-Meta-Check-0.14.0-r1.ebuild 725 BLAKE2B fb2644f865c7d7f42c4256e3a8bfb3e1e66233249f556155a0657a6e0d8374b360923d8f6eec4d99d3b4cf4078089e089fd0e2de85d974d39cb14590bad8dc3e SHA512 397c765a2ad0375ad32b5817e1dd63d3970d78d26700eeb85a2c31ad8d3e422364a4eeae51e3862e38590acefeb9779da8828f3349d701649a851b5d3080c8b3
 MISC metadata.xml 392 BLAKE2B 21dcb238438753fef06101921ea0b81e3de4186f6accace7a381fcee7c6c56d57be3ad1c2b7e1946459e57b2c40aec1eb28ee69be762ec9c104ad9074e9ac6c3 SHA512 3da3f5f538cdcf2088748c5f3f98ccac630b272b9fda2dd8db3c7b7b41eb462de441281b5ae28fed85cd0d67e9e9fac9f534c76e7119a87d0decc9a63f6b6d0e
diff --git a/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.350.0-r1.ebuild b/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.350.0-r1.ebuild
new file mode 100644
index 000000000000..ea983542be52
--- /dev/null
+++ b/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.350.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MITHALDU
+DIST_VERSION=0.35
+inherit perl-module
+
+DESCRIPTION="Inject modules into a CPAN::Mini mirror"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/CPAN-Checksums
+	>=dev-perl/CPAN-Mini-0.320.0
+	virtual/perl-Carp
+	>=dev-perl/Dist-Metadata-0.921.0
+	>=virtual/perl-File-Path-2.70.0
+	dev-perl/File-Slurp
+	>=virtual/perl-File-Spec-2.70.0
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long
+	virtual/perl-IO-Compress
+	virtual/perl-IO-Zlib
+	dev-perl/libwww-perl
+	dev-perl/YAML"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.400.0
+	test? (
+		>=dev-perl/HTTP-Server-Simple-0.70.0
+		dev-perl/Test-TCP
+		virtual/perl-Test-Simple
+	)
+"
+
+# Tests fail with parallel testing
+DIST_TEST="do"
+
+PERL_RM_FILES=( t/pod-coverage.t t/pod.t )
diff --git a/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.350.0.ebuild b/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.350.0.ebuild
deleted file mode 100644
index 9dcc9335e123..000000000000
--- a/dev-perl/CPAN-Mini-Inject/CPAN-Mini-Inject-0.350.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MITHALDU
-DIST_VERSION=0.35
-inherit perl-module
-
-DESCRIPTION="Inject modules into a CPAN::Mini mirror"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/CPAN-Checksums
-	>=dev-perl/CPAN-Mini-0.320.0
-	virtual/perl-Carp
-	>=dev-perl/Dist-Metadata-0.921.0
-	>=virtual/perl-File-Path-2.70.0
-	dev-perl/File-Slurp
-	>=virtual/perl-File-Spec-2.70.0
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long
-	virtual/perl-IO-Compress
-	virtual/perl-IO-Zlib
-	dev-perl/libwww-perl
-	dev-perl/YAML"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.400.0
-	test? (
-		>=dev-perl/HTTP-Server-Simple-0.70.0
-		dev-perl/Test-TCP
-		virtual/perl-Test-Simple
-	)
-"
-# Tests fail with parallel testing
-DIST_TEST="do"
-src_test() {
-	perl_rm_files t/pod-coverage.t t/pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/CPAN-Mini-Inject/Manifest b/dev-perl/CPAN-Mini-Inject/Manifest
index e199a06798e6..0585b722e050 100644
--- a/dev-perl/CPAN-Mini-Inject/Manifest
+++ b/dev-perl/CPAN-Mini-Inject/Manifest
@@ -1,3 +1,3 @@
 DIST CPAN-Mini-Inject-0.35.tar.gz 27156 BLAKE2B 256985e0740ba9f6be2e94d332a553bc5c1a5bca53511e0811034f8dbea42a71c512333b19a985142cc6916b929f55f85c47e9555374fb0a4fb74ab0900daf26 SHA512 58e1fba755d6f13c40f46f3fe6d3c603512b4b0152ab18e69c838d91feab7757fff8175cb8d6b30893e0cd59ca39a513e8fef554c58cd7cc898fba7f490fdbaf
-EBUILD CPAN-Mini-Inject-0.350.0.ebuild 920 BLAKE2B de20b79ab0bfb6c2ac651514ae4f96d6c63231db8f01e29d94ddba159c1c2b6a63f551f41bbd0625be0fd636cbef41f2b1c154fa693c5ed6d2242cb4d98c9b89 SHA512 c1c111fcbf175717f59635f7cf8df7933029a13f73480caedb3bd365f332d0c252181a23304c7e0f332a2d7ac9db91ce4f03097be8b92da6a8b43292e16231fb
+EBUILD CPAN-Mini-Inject-0.350.0-r1.ebuild 850 BLAKE2B 8d9f1339a766b7a672bdddb75084a9fe01c97e38330189c57611a39b8445c546cfa5e9f700a0e94e6aa9d28fdc45dff89da3c7e933c1cf7fb4edf613ff77c65a SHA512 657f26e0ee72a21f4a795a57bf019b438715cb4013211539043796133cdfbacd7785b96b12d74a4fe1881a4874ea70c972b2ef73ec967bd52df08adabe4360e2
 MISC metadata.xml 626 BLAKE2B a26f3ed2bac2ef06697cb1bf0a436d2c30f505fa642375446a113c887a18e93f0ce4bf0318a7ae108a94c248d5b1ae08e9d634b57db953b8c614c9bce9d4fcae SHA512 b0722cba0db39d00a89e59bbc8a3c5cc28b533b6cdef4ddcf48c88a6d7c58fa20ef23c6ac26f3f716f020a98682d34f357fb73a0dd4d6a2d378743ecb0663fc8
diff --git a/dev-perl/CPAN-Mini/CPAN-Mini-1.111.16-r1.ebuild b/dev-perl/CPAN-Mini/CPAN-Mini-1.111.16-r1.ebuild
new file mode 100644
index 000000000000..0d5649b2136c
--- /dev/null
+++ b/dev-perl/CPAN-Mini/CPAN-Mini-1.111.16-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=1.111016
+inherit perl-module
+
+DESCRIPTION="Create a minimal mirror of CPAN"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/File-HomeDir-0.570.0
+	>=virtual/perl-File-Path-2.40.0
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long
+	>=virtual/perl-IO-Compress-1.20
+	>=dev-perl/libwww-perl-5
+	>=dev-perl/URI-1
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/CPAN-Mini/CPAN-Mini-1.111.16.ebuild b/dev-perl/CPAN-Mini/CPAN-Mini-1.111.16.ebuild
deleted file mode 100644
index 7559d2ffeb22..000000000000
--- a/dev-perl/CPAN-Mini/CPAN-Mini-1.111.16.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=RJBS
-DIST_VERSION=1.111016
-inherit perl-module
-
-DESCRIPTION="Create a minimal mirror of CPAN"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=dev-perl/File-HomeDir-0.570.0
-	>=virtual/perl-File-Path-2.40.0
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long
-	>=virtual/perl-IO-Compress-1.20
-	>=dev-perl/libwww-perl-5
-	>=dev-perl/URI-1
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
diff --git a/dev-perl/CPAN-Mini/Manifest b/dev-perl/CPAN-Mini/Manifest
index f9c2c9fb2ce2..aa02137c4031 100644
--- a/dev-perl/CPAN-Mini/Manifest
+++ b/dev-perl/CPAN-Mini/Manifest
@@ -1,3 +1,3 @@
 DIST CPAN-Mini-1.111016.tar.gz 29748 BLAKE2B c8577984068bfee45888bde0853120d2285aa08c65a69b29c5730664eef6f5e6bb248ded358f514abd049665deba0567ca62e7bd19c13a6341da1ae78fb91834 SHA512 c5bc365efe95fb22c7e003246f8d1c508e57f8560f2293068b27b564ed246c5bd588733ddba1a994584102da695219c58d6589b366d782bcd7a7f6da194e538a
-EBUILD CPAN-Mini-1.111.16.ebuild 641 BLAKE2B 7fbdba2292c14d26d9973aa49ad06b049dce9581b7d6b6e68662f5e4a73c509e8f86c9564bc9c96da85267405ac06f3b57726de3cdffab1339e8ad5d01ec6db5 SHA512 5cca74f3bec4ee4d4f32fb795638a541e962f4d589d6cb5a9ed2ced132d67ad1d05969db4ced035969f023fcf7bcd28ff7f9b221d5c5aa02a6d847c28a225456
+EBUILD CPAN-Mini-1.111.16-r1.ebuild 603 BLAKE2B 2506e191cae5a7c210aef0fb9c1a110f63230f751e2f37813df4bce075b6c629e0c6fe8fda55bb6a87aa8490bd163535cba5938809b07603d98dcf14dfda09f4 SHA512 3b8b3c3d3dcd1efd51d7fe260f29e308f0ab412b356fc9d08aa74a92640d74b9a33f76dddcde61ebb601077c5733be7e390ee34ab6f244fa9dd7262b57033883
 MISC metadata.xml 453 BLAKE2B 4b5c2b6c376a4e9cd26ebb8e1b2d57d76a385409300938d2c29d7663e95ad487effee1bbdfba1efbe28efa2d837c4c2160ced29ef89503041a22653127a45a10 SHA512 301583d3b7960037198e1418f86065bfdcb57487222fabdadb4983f04082896fe9bee4a688299451009c12b9529f364e6e76e61044340b1d05ba27af0e9d70bd
diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.103.200.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.103.200.ebuild
deleted file mode 100644
index 3c2235f0b921..000000000000
--- a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.103.200.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=BINGOS
-DIST_VERSION=5.20210320
-inherit perl-module
-
-DESCRIPTION="Mapping Perl releases on CPAN to the location of the tarballs"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-IO
-		>=virtual/perl-Test-Simple-0.470.0
-	)
-"
-PERL_RM_FILES=( "t/author-pod-coverage.t" "t/author-pod-syntax.t" )
diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.109.200.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.109.200.ebuild
new file mode 100644
index 000000000000..01858dcc6021
--- /dev/null
+++ b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.109.200.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=BINGOS
+DIST_VERSION=5.20210920
+inherit perl-module
+
+DESCRIPTION="Mapping Perl releases on CPAN to the location of the tarballs"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		>=virtual/perl-Test-Simple-0.470.0
+	)
+"
+
+PERL_RM_FILES=( "t/author-pod-coverage.t" "t/author-pod-syntax.t" )
diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.4.280.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.4.280.ebuild
deleted file mode 100644
index 0b2dbe9bdebe..000000000000
--- a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.4.280.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=BINGOS
-DIST_VERSION=5.20200428
-inherit perl-module
-
-DESCRIPTION="Mapping Perl releases on CPAN to the location of the tarballs"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-IO
-		>=virtual/perl-Test-Simple-0.470.0
-	)
-"
-PERL_RM_FILES=( "t/author-pod-coverage.t" "t/author-pod-syntax.t" )
diff --git a/dev-perl/CPAN-Perl-Releases/Manifest b/dev-perl/CPAN-Perl-Releases/Manifest
index 16685c7c540f..f3db5fd197c3 100644
--- a/dev-perl/CPAN-Perl-Releases/Manifest
+++ b/dev-perl/CPAN-Perl-Releases/Manifest
@@ -1,7 +1,5 @@
-DIST CPAN-Perl-Releases-5.20200428.tar.gz 23709 BLAKE2B 0ef30b30e482884d6a18d78402a7ead872ff8a0100723921e8b1e39d851af7c2dc432d5033b7524afa44cfdca87fdd8d8d9f5cc70d88df723a8bbd2962571079 SHA512 44ea58bd29d3db8715c92a1d1e5953a5a185669a08d5f01bd36a695ef8687c9fcf08a399a2d52a84c214f0b4dceaf829030fc17d29b6663bc50f9abb89378c9b
-DIST CPAN-Perl-Releases-5.20210320.tar.gz 23384 BLAKE2B 2f877172251478f43f16a3ad449dafbef890cf50041440fe4d9ae54c5b9704817df508405b27d6589004c2ae7654d9a12d87c232675e2409dcb1400097b1a73e SHA512 2e637949930de9f97648e7e9dd4e4ed90dcf87cb594b8244ad3dfda247f8f093883b10e6b4fa5376b83f980f1b39855788f052e5496a8e54fe50e4880d1c177e
 DIST CPAN-Perl-Releases-5.20210420.tar.gz 23356 BLAKE2B c77610c07e04312087eb8d9cb59a4ded3ffbd2f02301149a42ebe7855ac94755c7116ce13ddf66eecdb818440db3e33479321b89deb31c02b1e0c02934045666 SHA512 14dac283c46b9fc59939095abd5df2ed606f23823df0a23b06f804974e407ecaa6d0d2143664116b7e0a4990f3dfbc6d901acb02b2353b503ffc46b1a8cc41dd
-EBUILD CPAN-Perl-Releases-5.202.103.200.ebuild 528 BLAKE2B 853a5baf8e0c40a72d0af451f80e80aa177a13e6fc6241d1194aa7ac60b2811068cf86b9b64e928ae6191ba72cbf1cef45dabd4d94233e6204dbcee686b194a0 SHA512 497a08309cf9119dfba0899e9f09fa67e7b489d4aa175b07cf4c19f9bda4124c64667361d5a1678492def7cf6d44626d2ab4b42d1760266db0d762ac6772fc22
+DIST CPAN-Perl-Releases-5.20210920.tar.gz 22961 BLAKE2B b669e8a7b784269a9bb4c949bf2a9a04c234f1ef5fa0f0e30d4910d3faae3f73db6076f9c467f0ca0f75ea26567b211a9808bb0ff1a9f58d0b102ead56595559 SHA512 0456340858756c895a292ba769a6c4374a9754a199d0ce3ae66c893f3bffae18729d866fa5d6f15a9070ccb2360068cd85c45800f59d662fdb21162a0c8bdd83
 EBUILD CPAN-Perl-Releases-5.202.104.200.ebuild 528 BLAKE2B 6bd1de33879a6f385c537ac12b578d2e55b0f1af2541868a3d48c2916cac628a31d1da37d4f54b571136d952360f1016ffc6f6461f246e6f1e53d9d7db5df5c6 SHA512 44ed26e3db518956ef7fef6828c95d0b55494ff3abe92d6194724229d70a423afd69ef12d04db8e9a952e27101e02cc944ae54ca2cfd9f4f5f8f21ed3fd0debb
-EBUILD CPAN-Perl-Releases-5.202.4.280.ebuild 528 BLAKE2B 24eb766a5c697f36442d752871e7c6e01464d2a0febcebdaa36b467d1e29d5ee5f9ef0c5de2d297459876229b86395459ef8abed85dd9973f6228d239bf927df SHA512 95734c8c1306b9e5333ff3209c512d3b2109e28b2d2648d847f80afec49c208a750cc8ba50570ed5432dc592a9ad8ffb03d0a7ccd5eef254958e209dd2551ba2
+EBUILD CPAN-Perl-Releases-5.202.109.200.ebuild 492 BLAKE2B 129a949296eddc70af8b0547ff612d72bd3edb78b062d007041629ee9b246ed8993023c463df7c3194002de4716a273d6bb447dac00c05a7e682f7cb5aac9ece SHA512 f476e0b96ea2933abae285799bf62ca2de9e0fdedab5679cf488bbb32b082ecc149e4898054033fc54a6f8a1cc3aea3f28397733a3eb4ad35abc43d3c783dccb
 MISC metadata.xml 434 BLAKE2B 48902f307723ea046c44e6f55b54e874e1502fc9627590cac36171c2e73bc691f654a46ae0da6ae42ea5d5068fe30e912bea744f48ae26772d4a437b18b3fdbe SHA512 2c4e6e89930ffbdac66c53600e9f35c13982e8816e8c70004d7be6716d82793940ee94788fe42dee1980b1b58d596d284861115d5b9a7d145aa02bfb4205133f
diff --git a/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.90.0-r2.ebuild b/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.90.0-r2.ebuild
deleted file mode 100644
index d5f2c29520b7..000000000000
--- a/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.90.0-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=GTERMARS
-DIST_VERSION="0.09"
-
-inherit perl-module
-
-DESCRIPTION="XS based CSS minifier"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="
-	dev-perl/Module-Build
-"
-BDEPEND="
-	>=dev-perl/Module-Build-0.40.0
-	virtual/perl-ExtUtils-CBuilder
-"
-src_configure() {
-	unset LD
-	[[ -n "${CCLD}" ]] && export LD="${CCLD}"
-	perl-module_src_configure
-}
-src_compile() {
-	./Build --config optimize="${CFLAGS}" build || die
-}
diff --git a/dev-perl/CSS-Minifier-XS/Manifest b/dev-perl/CSS-Minifier-XS/Manifest
index 02ccad2f639c..7a7d1d5b4df7 100644
--- a/dev-perl/CSS-Minifier-XS/Manifest
+++ b/dev-perl/CSS-Minifier-XS/Manifest
@@ -1,5 +1,3 @@
-DIST CSS-Minifier-XS-0.09.tar.gz 14363 BLAKE2B e7dd8c24ef30c98146ec4bce1c0299fcf83c7c7696b8ffed96100b02654a313d826cdbf87cb9c60f08ac850b7cc5389f8cc38e2ff50d544237084dd84f2ed105 SHA512 520e40fa4a6d70bd7692880f3bc5c813a8648dfe12946426dedf0874e180ccd98e703d67ed8b502a7b00489aa2404edce844d80b1eccc48f94156a0d5c36ad51
 DIST CSS-Minifier-XS-0.13.tar.gz 25935 BLAKE2B 408907b70081963a1e2149ea976822723f510c94917c620df8122642213465f17759c522bd626b161404f2b7ba243ccb112786a026ee3241553a410e89764d49 SHA512 cd924e9d47e52fc96ed41ce4a8e4bbb3f9eea594b47cc6bb388050f1a2c3154d9dc359bc6c7f6c5f2811489eaba21416b9703d152fa403842aee08f44e148ae6
 EBUILD CSS-Minifier-XS-0.130.0.ebuild 287 BLAKE2B 5a6e44173ce6d6e18e4f6519d6254cc6586d7422afaf0059c95c5fa65d2a46be70e2a18ad4879e2f4126b6e7ba24cd51c70a77726569032f392bbb833dbd5010 SHA512 31269e05a53ea3d71b158b9219618145e326a8d46ddf0cc9618390c43094991e2eba8c49d9cc63d7990e91687aeac1dcd5c7ffa31f037459240123576e94e761
-EBUILD CSS-Minifier-XS-0.90.0-r2.ebuild 525 BLAKE2B ce5ac2add8fe5e5494620effc05de9ae3e66b477625833791918eba8be2e3112475c7ed669a42652a14ae8597c8c35112bf37cb853edcfa1731538ec0615143b SHA512 0e5156cd56f2a13837ff79d58ab360df5d33d0e628b156aa213b1759c00feb8abbfdc662dd4855f638633800b52a08d6bbb226033953862e15bdf5ff3b63a7d3
 MISC metadata.xml 404 BLAKE2B 039043611e60d2086e272541248dbaae2652cdab956ddb452789fae252b9574bcf53f340ca8bf2758c2bc1f19525affb1267bf3e8000f41d01d7a68ccfb0fa8c SHA512 1ab38ca1f712a498a9c1304245ef0082e1dc1e1cc3d26e8426658e7d5f59d551f1f63f708402900d66881aeb85295a8c2956c425b302ddee5ff76b4906f13ddd
diff --git a/dev-perl/CSS-Packer/CSS-Packer-2.70.0.ebuild b/dev-perl/CSS-Packer/CSS-Packer-2.70.0.ebuild
deleted file mode 100644
index a98408d704c0..000000000000
--- a/dev-perl/CSS-Packer/CSS-Packer-2.70.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DIST_AUTHOR=LEEJO
-DIST_VERSION=2.07
-inherit perl-module
-
-DESCRIPTION="Another CSS minifier"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Regexp-RegGrp-1.1.1_rc
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/Test-File-Contents
-		virtual/perl-Test-Simple
-	)
-"
-PERL_RM_FILES=(
-	"t/changes.t"
-	"t/pod.t"
-)
diff --git a/dev-perl/CSS-Packer/Manifest b/dev-perl/CSS-Packer/Manifest
index fd07fd33b3b3..8e733fdbf0e5 100644
--- a/dev-perl/CSS-Packer/Manifest
+++ b/dev-perl/CSS-Packer/Manifest
@@ -1,5 +1,3 @@
-DIST CSS-Packer-2.07.tar.gz 9360 BLAKE2B e0e9233e3217d8f75a26f0a811cb71f0f8fd9c391518966737adbd91b27ef4c8e801c1ba42130825bd7233472ba0dce6bf96bf216a015a8d054b8b9814a11c5e SHA512 adeca2ec7dd28ad04eeda01b1f42ac0c586bd4c167f385950d4a297b95f1f66c938972bd3e34d6cfe323a3b24190b6ca1a90c898e77f86360ea84324eab01374
 DIST CSS-Packer-2.08.tar.gz 9491 BLAKE2B 0c0090441fc9450529407ac3d7f674230062bd580ed68feacefbc534be501f4a9e457c9e02cbacfb45f4d3fdc7a9b2c0ec8b6a5135108f7c620fe739b687a967 SHA512 07f7798db95411962cfdb5ac0989557a2b0deb3e664a688113c755391dd85967a9dcf7c0b76cf87cbe7068830df98da988c82306ab19294a68ae8418880f0d0d
-EBUILD CSS-Packer-2.70.0.ebuild 491 BLAKE2B 9d7311a8452648ee6100cfefc6c41d4f9c72dd122432d1fdd957b7ef908cbb5b9ef9cb9f58fad8ca160ef2978eca25dc07ea35adbe1ac1eadd392af10cf3325d SHA512 31ad4ecf540d000a0bad2110363acd21c2d6cad1e221cde3f3106d9a8462eecb7da99b672f1ea18f397afa184db465be851cbdcc898f44913fc52d07e66a078d
 EBUILD CSS-Packer-2.80.0.ebuild 512 BLAKE2B bbe1da27f957c2d21a9b13c90ce52694e0ce5b54faddcba0a76061d3eda8015288ef5a3138aca19dfac7d4ce2317d89ef3e3d73b06417940d2333fe1f50b70b1 SHA512 43a07da782970a9434c6f8f6a6c118af37b11c54f40a43cec69f83d95aef411d140a177493ddfd1cdbea83c44883ec1cc1f94e6ff9a0bb2869c0ed207b7c49bc
 MISC metadata.xml 465 BLAKE2B 7bc17db01b9501c021d30d2989e4dcbedecae32f7df28c3ae4cb35411ccefde7d6b9875c59e4c5bb2ee36d855158a037fea145bc5fadb719a7037b68ba77f966 SHA512 4c8e04ff5f2b74f0d1dc679f2ed516cc29b1157da51591cb2054134c53cd84618cb63d5c6b49ff0b4d9555c9c9eaadf7ff6ecf9e546b364318df5ce2c57853c4
diff --git a/dev-perl/CSS-Tiny/CSS-Tiny-1.200.0-r1.ebuild b/dev-perl/CSS-Tiny/CSS-Tiny-1.200.0-r1.ebuild
new file mode 100644
index 000000000000..5c62138eeae4
--- /dev/null
+++ b/dev-perl/CSS-Tiny/CSS-Tiny-1.200.0-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHORNY
+DIST_VERSION=1.20
+inherit perl-module
+
+DESCRIPTION="Read/Write .css files with as little code as possible"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-perl/CSS-Tiny/CSS-Tiny-1.200.0.ebuild b/dev-perl/CSS-Tiny/CSS-Tiny-1.200.0.ebuild
deleted file mode 100644
index 10405e9f88cc..000000000000
--- a/dev-perl/CSS-Tiny/CSS-Tiny-1.200.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CHORNY
-DIST_VERSION=1.20
-inherit perl-module
-
-DESCRIPTION="Read/Write .css files with as little code as possible"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.470.0
-	)
-"
diff --git a/dev-perl/CSS-Tiny/Manifest b/dev-perl/CSS-Tiny/Manifest
index 10152b28eac7..7019f1ebd390 100644
--- a/dev-perl/CSS-Tiny/Manifest
+++ b/dev-perl/CSS-Tiny/Manifest
@@ -1,3 +1,3 @@
 DIST CSS-Tiny-1.20.tar.gz 8706 BLAKE2B 90ce756d9f7aa818ade359328d920e39139f125ad2c533de8377f61ccc93704e5582533646e0dec449e6957675fe9357e29dc777153eb7f72f75ecce96e70ef8 SHA512 22913c13d6df3e5ffb73fa5bbb60aeede9e7bd44a59031c566da882015e24ff839968aac211c4fd2aa8570b23ee4bd4df2828e366371218cbee18ce85cfab2b6
-EBUILD CSS-Tiny-1.200.0.ebuild 426 BLAKE2B 045114b04b1372981756813c98c7cf73e11bf9c8616985e4ee4a19505f26a8fad3b02528dcb1a82f867a591b0a7c80d3e224029a9ecdb3135c0d564288024dd6 SHA512 930886dcfb55f44bc455d2e9aca55da8d7b9d30514fd5ec7fce6d287c7cc4b85a70e6b22dfe7f797c20d9c07c5dc29b33b586e0005ea0a6eb44052aede11e16f
+EBUILD CSS-Tiny-1.200.0-r1.ebuild 271 BLAKE2B e5d6c0c9c0da7a796bd71f72de1e052cff776cc79976aa394405236430910e028a84e8a906036c338e9a45add94fae1d65bd5dae3296948382ee291e5e017247 SHA512 c18af84413b205646ca732648bd8e2537ca14426e3b52408ea8dc59c086fbb6283413f56d6438c7ec900923f1134012fed4f2bcb3de02c06cef17028d188be3d
 MISC metadata.xml 377 BLAKE2B 8009e697826b6e0142b7bbc8a7460cc306b5acef75afb60f81e0205092ffb20129782b09824d9af4fd9157b910fd03c8d1b02325f0921d129cc64b1a587646f1 SHA512 785d97235c0e77b4fe3e42808c8cbb117affeadc6c21405966ddffeb71108b796430beab8b00ce64237c40230f16a20079cd162372d0f5fd9fe83b710aac5e9f
diff --git a/dev-perl/Cache-Cache/Cache-Cache-1.80.0-r1.ebuild b/dev-perl/Cache-Cache/Cache-Cache-1.80.0-r1.ebuild
new file mode 100644
index 000000000000..cfce4832d6a9
--- /dev/null
+++ b/dev-perl/Cache-Cache/Cache-Cache-1.80.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=1.08
+inherit perl-module
+
+DESCRIPTION="Generic cache interface and implementations"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~x86-solaris"
+
+RDEPEND="
+	>=dev-perl/Digest-SHA1-2.20.0
+	>=dev-perl/Error-0.150.0
+	>=virtual/perl-File-Spec-0.820.0
+	>=dev-perl/IPC-ShareLite-0.90.0
+	>=virtual/perl-Storable-1.14.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+# https://rt.cpan.org/Ticket/Display.html?id=92600
+# Parallel testing causes failure
+DIST_TEST="do"
diff --git a/dev-perl/Cache-Cache/Cache-Cache-1.80.0.ebuild b/dev-perl/Cache-Cache/Cache-Cache-1.80.0.ebuild
deleted file mode 100644
index 26664e90e820..000000000000
--- a/dev-perl/Cache-Cache/Cache-Cache-1.80.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=RJBS
-DIST_VERSION=1.08
-inherit perl-module
-
-DESCRIPTION="Generic cache interface and implementations"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/Digest-SHA1-2.20.0
-	>=dev-perl/Error-0.150.0
-	>=virtual/perl-File-Spec-0.820.0
-	>=dev-perl/IPC-ShareLite-0.90.0
-	>=virtual/perl-Storable-1.14.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-# https://rt.cpan.org/Ticket/Display.html?id=92600
-# Parallel testing causes failure
-DIST_TEST="do"
-
-src_test() {
-	# https://bugs.gentoo.org/625736
-	perl_rm_files t/6_test_size_aware_memory_cache.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Cache-Cache/Manifest b/dev-perl/Cache-Cache/Manifest
index cb298e7ab1ca..604b161d4db7 100644
--- a/dev-perl/Cache-Cache/Manifest
+++ b/dev-perl/Cache-Cache/Manifest
@@ -1,3 +1,3 @@
 DIST Cache-Cache-1.08.tar.gz 35124 BLAKE2B 8a66f65cec5d85804a2166de7fa7026cdfde63f154f28dd8ea8719ad73be80ab835be6e2b66c22699b28fe2ea9f6fb8774b1920044667401f55afb35dbc82210 SHA512 7b0f215b9c765840a1ca1e831735aeff610288048c352889408d514d41820b9315d2de03712b4ad6637d9f0db59467240a0918c22c1257a3f87bc62add4f0e06
-EBUILD Cache-Cache-1.80.0.ebuild 759 BLAKE2B a48cf0ab090d650d76b7c7173a0f626d00f22beedb5fbb885bd67f6dd514e23de6aad1386ca8f5d1f55b4665d3f3a204dd0be9d6fec4418ef18afdec5fb23f17 SHA512 5b25fcbcb2ddeb3831e330f07c58b35ee86d85a13b402cc76da1d6523a9dfe75f4c1ffefc385c867443b8b5c93fbc6eca5ccecaa4c3c7194713903d7d2f6a33c
+EBUILD Cache-Cache-1.80.0-r1.ebuild 631 BLAKE2B f7e51e8a44ec67ce18c297c556081553f5f436b0d74f4bac1c45173319fcb5747871c74792134d389d7a482eccbd9506d970bbaa9d9ecd463d4ce5b6afc64e2b SHA512 f154089e043638e250c9e129ed1faeb7bb0a54e931bd7cc7cf78430f906875402598c9d9a3f33ea8e36318c55f44dd3f958b6cbf75722da85d0aab008f6037d6
 MISC metadata.xml 1682 BLAKE2B ce8546a30e585c4fb4a97b13c06ab1f6ce826ed8ca0cc0f31e178efa8972cc16569931ba3258b5603d4cde479bd364b107f067140337f1b4f7d9c749755cb5c8 SHA512 cddee718d964371520f8ce2e2e239ae1b07f5d08bbfc265d0123d26c98107478d3827a60937a3fe26ae4012e1bbcecd08ea5486f874c4407d5ee350274750ea9
diff --git a/dev-perl/Cache-FastMmap/Cache-FastMmap-1.490.0-r1.ebuild b/dev-perl/Cache-FastMmap/Cache-FastMmap-1.490.0-r1.ebuild
deleted file mode 100644
index 4d61b8f8c8d9..000000000000
--- a/dev-perl/Cache-FastMmap/Cache-FastMmap-1.490.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DIST_AUTHOR=ROBM
-DIST_VERSION=1.49
-inherit perl-module
-
-DESCRIPTION="Uses an mmaped file to act as a shared memory interprocess cache"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/perl-Storable
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-src_compile() {
-	mymake=(
-		"OPTIMIZE=${CFLAGS}"
-	)
-	perl-module_src_compile
-}
diff --git a/dev-perl/Cache-FastMmap/Cache-FastMmap-1.570.0.ebuild b/dev-perl/Cache-FastMmap/Cache-FastMmap-1.570.0.ebuild
new file mode 100644
index 000000000000..afd8e1805b3f
--- /dev/null
+++ b/dev-perl/Cache-FastMmap/Cache-FastMmap-1.570.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ROBM
+DIST_VERSION=1.57
+inherit perl-module
+
+DESCRIPTION="Uses an mmaped file to act as a shared memory interprocess cache"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Storable
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( dev-perl/Test-Deep )
+"
diff --git a/dev-perl/Cache-FastMmap/Manifest b/dev-perl/Cache-FastMmap/Manifest
index 729b5104a962..10cef1f5f082 100644
--- a/dev-perl/Cache-FastMmap/Manifest
+++ b/dev-perl/Cache-FastMmap/Manifest
@@ -1,5 +1,5 @@
-DIST Cache-FastMmap-1.49.tar.gz 52512 BLAKE2B a0632b526b62acdf200102de1c6c6da98f6b167d0897c91f9eee7bf60118dfb753554fc2a25b0c737639df20af423147104cfca71b8e1c86abeff34ac86d23c5 SHA512 686f4cc360b6106f87c6068e99eaee708f6045d1651cfdfcd2819f7fedeb7563b185df6e3ae6e99c079b3993ada9a356cce69ad4e95659c664f5bfe78ada7939
 DIST Cache-FastMmap-1.56.tar.gz 56713 BLAKE2B e1a94f6e15a103102f667e56a2ec701ba613c931779310149eb6827245d0279c82dde23c80016458d2bad10f5fecbebbffd2bf715d84540c3573feab1a368665 SHA512 742b2657007ce944ab636494a03ce7bfb6ea52663d1e4d3b10928f534f4fa4c564831e50737e7d6b79903f49b434fcdd441e664fe8afe156cc0468c2319cd0fe
-EBUILD Cache-FastMmap-1.490.0-r1.ebuild 457 BLAKE2B 8b8436ae4eaaf4604e6b9c680df6a4e467f936cf839aad5767d325803de0db41ba14ff9481479a0e4eaf1e8e449b60cf37594e5171f8c02c42274bb5fd49b3a2 SHA512 0757af8d36122aff8aee61723fe1100cdf3c64c449c4f3eb0cd704602df4472e0cec889c97c250f34029198639a6eeccd629267fb0f9fd5b9ecead94b88c953e
+DIST Cache-FastMmap-1.57.tar.gz 57502 BLAKE2B 35a808d07f36885d987f6f376512a0e787f44dc6a8d12d3e4638aa8d24401ff30451530eac45317c964cac55f0912f26bac1caed20991dee8cfa004d09c2ec66 SHA512 12bcf7af5723ba58bc0f74e689a1667b1055755a06a750aafc0f17075a94205a3aa0cc87a4a1f1da125c52b30516afeeb1f3a4f9422ef863fe8255bec53a3ecc
 EBUILD Cache-FastMmap-1.560.0.ebuild 520 BLAKE2B 8be5fcab714de681225f96a0ba93c621a499c91c95b896f3ed7d4e83f922420e2fb145957ded8ed0e1b89f2a335fc8a1ed8036426c839a0b85c8ed833ef9308c SHA512 f03456ec98e9e8e77c45f5f3479ec337924f2e4aef605a4e69d74df6d8ad5912e32c32f529605d1dd108e14d444b1ba71317b8c753d49a3ba5d5d8d7bb733ac9
+EBUILD Cache-FastMmap-1.570.0.ebuild 401 BLAKE2B 6ae22f8a2b916f684b3691e3b53b765fde1fa1cb6e9f5d72826470f0d35b25ecdad4f221091e05f0747ecfea7fcb2c0ee9ce2b18013254b48e17cd924da1a549 SHA512 118e66902a9ace6a07e63154675626b652d32c02370bd3161225f6c494acfdf18c7b6278784a59f4942818f464bee24e642faf276f19d9d3ae4e9b82073b8c86
 MISC metadata.xml 472 BLAKE2B 0ebeb08bbd3839125fe1e4fb2376adc2e418ecfdf80fcefd28c7b22b595403b22460a655961a05f5e296279ac8e919a12a5fe61fe1e9d8b4ea22f5907db187c6 SHA512 0a991833dabebad58f8072d536f5fb9a2b29ce7b36477d961996b19aeb05c729cc1bd8c9fe4a8dc6cd32c9fa5ffa7204cc84f191c903a948ba9711ae6239c8c6
diff --git a/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.260.0-r1.ebuild b/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.260.0-r1.ebuild
deleted file mode 100644
index 1c39f3f15862..000000000000
--- a/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.260.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=RAZ
-DIST_VERSION=0.26
-DIST_EXAMPLES=("script/*")
-inherit perl-module
-
-DESCRIPTION="Perl client for memcached, in C language"
-# License note: Perl 5.x or newer, + "when C parts used as standalone library"
-# Bug: https://bugs.gentoo.org/718946#c4
-LICENSE="|| ( Artistic GPL-1+ ) LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/0.230.0-parallel-make.patch"
-	"${FILESDIR}/${PN}-0.250.0-no-flto.patch"
-)
-RDEPEND="virtual/perl-Storable"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test?	(
-		net-misc/memcached
-		virtual/perl-Test-Simple
-	)
-"
-PERL_RM_FILES=(
-	"t/pod-coverage.t"
-	"t/pod.t"
-)
-
-src_compile() {
-	mymake=(
-		"OPTIMIZE=${CFLAGS}"
-	)
-	perl-module_src_compile
-}
-src_test() {
-	ewarn "t/commands.t is known to fail: https://bugs.gentoo.org/722848"
-	local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 )
-	[[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
-	memcached "${memcached_opts[@]}" || die "Can't start memcached test server"
-
-	local exit_status
-	perl-module_src_test
-	exit_status=$?
-
-	kill "$(<"${T}/memcached.pid")"
-	return ${exit_status}
-}
diff --git a/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.270.0.ebuild b/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.270.0.ebuild
index bfece06a6c72..b7a1566640c8 100644
--- a/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.270.0.ebuild
+++ b/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.270.0.ebuild
@@ -38,6 +38,9 @@ PERL_RM_FILES=(
 	"t/pod.t"
 )
 
+# Tests a bit flaky
+DIST_TEST=do
+
 src_compile() {
 	mymake=(
 		"OPTIMIZE=${CFLAGS}"
diff --git a/dev-perl/Cache-Memcached-Fast/Manifest b/dev-perl/Cache-Memcached-Fast/Manifest
index 2ca72ae2dfa7..0641ea0f90a1 100644
--- a/dev-perl/Cache-Memcached-Fast/Manifest
+++ b/dev-perl/Cache-Memcached-Fast/Manifest
@@ -1,8 +1,5 @@
 AUX 0.230.0-parallel-make.patch 436 BLAKE2B 272a6dea999ad674143f50f57570bd7b14cb05bb9bf5cac929fb33e1f77113c752a7ffff9ed54c4ada7cfd424f34d3ecd26a86e2547d46890248a975fa445ad4 SHA512 05ea5189c664b7e98e54f9db186cd4cf3089a3d99acb915770a04ee0f3d2d4e870823b5c701cf4c2d0a4be7624e79cd8b590a274a570219bc59a02ddda4c093c
-AUX Cache-Memcached-Fast-0.250.0-no-flto.patch 720 BLAKE2B 85c83887363b8128105857f30c21cf29998e10de97a1237111d61e3ece26fde3670b9609762c9442fdd322b1bf9dee7a4c2b4ab3d9159d5aa68101303d754073 SHA512 1319a3235533a74aca7484006336cf2991bf5f8825f908e7837a81a837214ebe295f79881c19a542d0812cb8c3ac1cea61af2079de7014b170d647c67639dc1a
 AUX Cache-Memcached-Fast-0.270.0-no-flto.patch 499 BLAKE2B 7403d0bed21d8f7c57386891b799c7ee1621edfb0d6b73fab50b931c927bbda7e169814ea4cee2328239baffe41e315ddd10b4c7c95ef29337f36937adc2b571 SHA512 237a300645afcc38992e5cc02aa2161ac3fe5d9cf754982f6e97b0f9853b32e39e16c69b03ef0c85ed7d8866b7b5ef1223e88a13f73b4ce078c0615aef6bd6dc
-DIST Cache-Memcached-Fast-0.26.tar.gz 87887 BLAKE2B d7877a56ba94bd173290ccc66ea91d8ff86ee22a9d381a0a8be5049194ffae97b8084f7fdb464c377e632525a9f08084258153e7c358f32926b687f46ca94a53 SHA512 aea565be2d1aaae186c6d985d88e444fa39311338a851f7f05b013affcab0bfcabd258a3df08849b9429b7168ff0d1e59ab27b1e843b217093b2b64786e890b1
 DIST Cache-Memcached-Fast-0.27.tar.gz 88712 BLAKE2B a889e719ae36721dea203b54488d86e52b40df2f1aceab1bca386a5619e80f40e27ef7fdd09ba5ef5c0678659be44b43c9416066585a0b746cf46025e546496b SHA512 6e3f7cb6ae317312a16aad7888fb75ec03ff7be5b79aef1702c8bc8a1499995379b42c1afd6c587d419ea4dbe880836c874d4929f968f7a384ab152e5baa03fa
-EBUILD Cache-Memcached-Fast-0.260.0-r1.ebuild 1266 BLAKE2B e3a34ea44e65e7f195daf10826ca6d7809087b65816601b3ef076c4df801e5802667618d88257ecad516755030da0151c306360ba29386f678edfa8bc0ee4e2c SHA512 68843f548c710ff96731f426c860619ef3f7a043325bc60538d23bf3f2c4647ea30089a8e9d584b1eb0886fc05547290d03d4a1f07f9a4866b70e2cc9fe1dd45
-EBUILD Cache-Memcached-Fast-0.270.0.ebuild 1271 BLAKE2B 3702f0d259dbe5fec00fcec79f8e3bd5252ce23f796b001de503e7f7fa404060e21e204ec53eba3b644c49ff5b09faf239205de994cf380d27c228e8a9d83479 SHA512 678eaa81e8aec87d8b97d24d3c2f30f98ebd839492413b6e1b2ef756c89564778b9a41796ae4f2a974018a413bcb97590bb41de6bd9e056e57e8e01644cb99fa
+EBUILD Cache-Memcached-Fast-0.270.0.ebuild 1305 BLAKE2B 03d61821bd17c4151796bf834d22130b13aeebbbf383a2ec4f085afd307caf0275babc22cc20b2bbb45825d8b0002bb91d94ba1adc272a5632422041e7581dd5 SHA512 0b379a6ef683dea99f5d0afc51846a1c152864d4d87162c77ec3b67289b9848e43c0656eca1ac6f701d4ebe90e8d64dddab0d6b971e15d2bf7c35e5d3afcd139
 MISC metadata.xml 497 BLAKE2B 8f551912d4c147bc32036fe551d40f84ecd7b81888715fa416be605e96aff2c159763ce3e4e5162a027776b4bb1fa0cbeee342a0abf05403c7f95e07f60e31c6 SHA512 cb7f9b8b1d12c9fa2368730f12fb9de8bb4a168c3c3b3b64796411359eba44f34bc009542f4191d1472c6db804ee361ce3cc103168c38717a38e1237700dbeaa
diff --git a/dev-perl/Cache-Memcached-Fast/files/Cache-Memcached-Fast-0.250.0-no-flto.patch b/dev-perl/Cache-Memcached-Fast/files/Cache-Memcached-Fast-0.250.0-no-flto.patch
deleted file mode 100644
index d78c3fad0d7f..000000000000
--- a/dev-perl/Cache-Memcached-Fast/files/Cache-Memcached-Fast-0.250.0-no-flto.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d1c5f70b144abfd4783f866aef27f60a35b61f8b Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Tue, 3 Oct 2017 20:20:14 +1300
-Subject: Strip -flto from CFLAGS
-
--flto breaks compilation of static archives and needs significant  magic
-to not break, including sentience about which CC you're using.
----
- Makefile.PL | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/Makefile.PL b/Makefile.PL
-index 0054164..ad249b9 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -22,6 +22,13 @@ WriteMakefile(
-     },
- );
- 
-+sub MY::cflags {
-+  my $self = shift;
-+  my $orig = $self->MM::cflags(@_);
-+  $orig =~ s/-flto\b//g;
-+  return $orig;
-+}
-+
- sub MY::postamble {
- '
- $(MYEXTLIB): src/Makefile
--- 
-2.14.1
-
diff --git a/dev-perl/Cache-Simple-TimedExpiry/Cache-Simple-TimedExpiry-0.270.0-r2.ebuild b/dev-perl/Cache-Simple-TimedExpiry/Cache-Simple-TimedExpiry-0.270.0-r2.ebuild
index 26b249299b5f..d08409e5f626 100644
--- a/dev-perl/Cache-Simple-TimedExpiry/Cache-Simple-TimedExpiry-0.270.0-r2.ebuild
+++ b/dev-perl/Cache-Simple-TimedExpiry/Cache-Simple-TimedExpiry-0.270.0-r2.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DIST_AUTHOR=JESSE
 DIST_VERSION=0.27
 inherit perl-module
 
 DESCRIPTION="A lightweight cache with timed expiration"
-# License note: no formal upstream license declaration
-# only an assumed one from 'license => perl' in Makefile.PL
-# Bug: https://bugs.gentoo.org/722854
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-0.27-no-dot-inc.patch"
 )
diff --git a/dev-perl/Cache-Simple-TimedExpiry/Manifest b/dev-perl/Cache-Simple-TimedExpiry/Manifest
index 3f9cfde2445b..99700eb9d1fb 100644
--- a/dev-perl/Cache-Simple-TimedExpiry/Manifest
+++ b/dev-perl/Cache-Simple-TimedExpiry/Manifest
@@ -1,4 +1,4 @@
 AUX Cache-Simple-TimedExpiry-0.27-no-dot-inc.patch 493 BLAKE2B 6ca4bd69bb9f27bc42316b5730d320858ced4d5d76a2f4c04dedaf96bf73ab36042f985079624e70f18c1874cb23a7bc0284b5645bbc3ef7fa4400e71451f2b1 SHA512 bb0b9794a50198d6020458d051d70199b491fa65f5d4d939d9b5fc12fd16388e7ff744b82ea190a4e9f422361378b2f458e2d8d4da877f3f71785b8be9e3577a
 DIST Cache-Simple-TimedExpiry-0.27.tar.gz 13110 BLAKE2B 7ddaf8354f376c2a5744921114dd86653bed1c26f69797c49c309d3bbe6b928658084c421ef259dd6ca6acb62e30b13a9eb80e4931922b4ee5137afb02af7d33 SHA512 80317eab341d307ad9d0fd76a92726a2d963deb9a5397ceb1a1383f0f8c5ca07e8553307d15f5a23f0c1b0a2765c1bba83bf1cdfc963e9e3271399c2d12cd79f
-EBUILD Cache-Simple-TimedExpiry-0.270.0-r2.ebuild 493 BLAKE2B a19e11c9638d680d4201f996ea8d7da3847dfaa9104f9b62b2e56ec8364db98f9394fc35e60f34e91da1047747b2d033d855a8860a656d5c2ed31f7bea5e3925 SHA512 901a29d845be34be7afd24fcd0c7bd6f2d51d9e88d3d9064ebdfc2307b94fb80dc1394f4a088a39e72d4326ec52520d9cfaf619a2595f230aa3425359f348beb
+EBUILD Cache-Simple-TimedExpiry-0.270.0-r2.ebuild 341 BLAKE2B 0d5efb2af7c4caec675525c0a88bf8707967f8434524861c4313a55e3e997e7c8c772a2820a7fe90a766d3b83c5638e8c8ced4036ec49d72e45497bfc1a889a5 SHA512 df08988fab56523e92058acb8a67bb454116a1752836d426191e08abbfe9fda25bf073dddd8920dd2b94d0272b1e4e217bd45b9cc4f0cce5ca3588414aee8d94
 MISC metadata.xml 422 BLAKE2B a98f744e76242b4c18b751fda671f20ef498c8a29be818baebe974e247c1763c1a36d214fd172e25c49875fad8b71ad55d7218b290b035a265b8e1bbc95c75a5 SHA512 b6f3268fbd209a9d96675b53e4c2e2d8c4568e2561e42ec67ddaedfa5e052f68e338be098ba8f7e6afce0933bf06ca4fbc089bc43cb0946129762ca0ce91fdea
diff --git a/dev-perl/Cache/Cache-2.110.0-r1.ebuild b/dev-perl/Cache/Cache-2.110.0-r1.ebuild
new file mode 100644
index 000000000000..ceff07a6fbba
--- /dev/null
+++ b/dev-perl/Cache/Cache-2.110.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SHLOMIF
+DIST_VERSION=2.11
+inherit perl-module
+
+DESCRIPTION="the Cache interface"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=virtual/perl-DB_File-1.720.0
+	virtual/perl-Digest-SHA
+	>=virtual/perl-File-Path-1.0.0
+	>=virtual/perl-File-Spec-0.800.0
+	>=virtual/perl-Storable-1.0.0
+	>=dev-perl/Heap-0.10.0
+	>=dev-perl/IO-String-1.20.0
+	dev-perl/TimeDate
+	>=dev-perl/File-NFSLock-1.200.0
+	virtual/perl-Test-Simple
+"
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+"
+
+src_test() {
+	perl_rm_files t/pod.t t/style-trailing-space.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Cache/Cache-2.110.0.ebuild b/dev-perl/Cache/Cache-2.110.0.ebuild
deleted file mode 100644
index 06c3dc82777d..000000000000
--- a/dev-perl/Cache/Cache-2.110.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SHLOMIF
-DIST_VERSION=2.11
-inherit perl-module
-
-DESCRIPTION="the Cache interface"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/perl-DB_File-1.720.0
-	virtual/perl-Digest-SHA
-	>=virtual/perl-File-Path-1.0.0
-	>=virtual/perl-File-Spec-0.800.0
-	>=virtual/perl-Storable-1.0.0
-	>=dev-perl/Heap-0.10.0
-	>=dev-perl/IO-String-1.20.0
-	dev-perl/TimeDate
-	>=dev-perl/File-NFSLock-1.200.0
-	virtual/perl-Test-Simple
-"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-"
-src_test() {
-	perl_rm_files t/pod.t t/style-trailing-space.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Cache/Manifest b/dev-perl/Cache/Manifest
index 16c529c39068..12d2474efef8 100644
--- a/dev-perl/Cache/Manifest
+++ b/dev-perl/Cache/Manifest
@@ -1,3 +1,3 @@
 DIST Cache-2.11.tar.gz 54809 BLAKE2B 8376e85ca56ff4ed52595e525aabebfeb094158053a90cfbd90627635cd9af6eb60b3b7ad69c2d32ab88dd860eb79b168d6e1db0171ea1c3c648240a16515dd4 SHA512 cee1069bef2fbc19d6836181e6fda8eb479207864063ddb40ad009b5f4cd9be9e774a0a88311b4205439303a59426c349f4d875a5d417fc211e150942592a6c4
-EBUILD Cache-2.110.0.ebuild 674 BLAKE2B d77194630e1f49e7cbefb09fffa11a5191b1b9a1d599dbc241b8f29ca13ae628a63b2e8c4f424bd40da3db79043949712b256606afc59b83396eb51936be1c93 SHA512 052c6dacf252732c36afc40cae728d98214e7b01d7977458b65e8ddcf43dd273da2aca0cbce00604961c9edf2a9591c8554fb15e572c876f7b8736b73bbbe39d
+EBUILD Cache-2.110.0-r1.ebuild 665 BLAKE2B 926adb1e4f8eb4416648feb173a3f0d1893b7022d39141c8c0ab32497a689ebc302c54a8a9aac8dd54702f6ee8b06deca674ad25239ea8bfe2387f2d02ec7eed SHA512 a07b0dca0837573d637e0a0332ffdcbc5bc36b20ce757c9bd5588352ddecfbb97125147cf0d5392119815e8b1015ca327bef811aafaec382488487747d81fe14
 MISC metadata.xml 1312 BLAKE2B d8a49acb432ea34c3c55b210015a33e3c14dc2a81ce26cb4db65eac9a98e10eaf4c2a658756e7275aa054da7f212fad92409d81d2b8531a5629a4d66842ca241 SHA512 9e5df751b7bb7c18895ba6a115f1c471800cbe68a63a5c55f44e1a309a2ba05f22220a44b84b6aae16c68b6fff6b4c96912e1f7d6d6898f190b5d4ae82aac0c8
diff --git a/dev-perl/Cairo/Cairo-1.107.0-r1.ebuild b/dev-perl/Cairo/Cairo-1.107.0-r1.ebuild
deleted file mode 100644
index fbc6a61e489f..000000000000
--- a/dev-perl/Cairo/Cairo-1.107.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=XAOC
-DIST_VERSION=1.107
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Perl interface to the cairo library"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/cairo-1.0.0
-"
-DEPEND="
-	>=x11-libs/cairo-1.0.0
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	>=dev-perl/ExtUtils-Depends-0.200.0
-	>=dev-perl/ExtUtils-PkgConfig-1.0.0
-	test? (
-		dev-perl/Test-Number-Delta
-	)
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.107-fatal-exit.patch"
-)
-src_compile() {
-	mymake=(
-		"OPTIMIZE=${CFLAGS}"
-	)
-	perl-module_src_compile
-}
diff --git a/dev-perl/Cairo/Manifest b/dev-perl/Cairo/Manifest
index 6d32343f412a..704c2ad2c978 100644
--- a/dev-perl/Cairo/Manifest
+++ b/dev-perl/Cairo/Manifest
@@ -1,6 +1,4 @@
 AUX Cairo-1.107-fatal-exit.patch 562 BLAKE2B 321c95dcead052af47e6541d0ed7b86a75d09707ebea63ee474c28dada5adabfce00be211d70cdd289d400e7147f0e874d0cea06a610a26e37a629c4ffa10a69 SHA512 3ff858177e63842d48b9faa1e186fef49907e67aab9b07e5e162df95a82890013965e4c958e106651292826fcc541c2a3c09f61000d6ebd6f0fb3a13feae7fac
-DIST Cairo-1.107.tar.gz 111203 BLAKE2B 17093ee7058ecf27848042d3f49a841b6d6b4be9327adb959ee0d93a10f03de9caecd172b31775847b3561470aaf0f3c72b458fe0b37d2a451df47833e0df622 SHA512 613ba59ee3bd1adc2f33be60b395148f23d1de793fde888fd417f0b0cb6631a35429ee696172e9292b7d3fecab93de8ca958c96f803b9f5a16747a6d1fc7e9cb
 DIST Cairo-1.109.tar.gz 116924 BLAKE2B 0761066948797b06dcf89adb5f0d962f4ed48ba6bc3aa0c4b99a31c4bea96f71ffe0f378a1ea27e080c099b99cf8e99896abcbd042d91da747786475a3da1bf5 SHA512 b80841bff480acf95f69659cba02ca17c79b67a2dc5c9b9302efb15bbd79bd4bc2f1801c001c220723da11081e86a08a83e07ecc8866810ebf9406e1f6fa1c53
-EBUILD Cairo-1.107.0-r1.ebuild 865 BLAKE2B 0a8c474b7478d36a8ea0091895149df55bbaab7a48f61253c5dec0e4e1f6d9c3827877ba083bf6057b759a1a0885b36bdaa8e51bce5f1b6bd1e1713e4c290739 SHA512 6cd91327600684e41c0e278873d1181af14f72852de0731d2a811f90fb6699028b2c773d13ed051899dd12b4e637ec58b94e7fdba6fc3ba1576261c4ddd4fcb4
 EBUILD Cairo-1.109.0.ebuild 867 BLAKE2B c8127f5f53bd15a2b1f8aff4b3682f90d8d4ee123d5a4e76dee7026ca6e5c4c0772815f08aa1d61705b31bcc7952f8a7bf45293250603b1e0530c4aee6880f48 SHA512 f3f2489a7f7ae7006a8fad57955023e2e38890d98911c55c55305cc394d8346c28e9ddf4b61b089f279c5e3f5ba4ae5d46b420b982be6ac29476fd3f61ef4a5a
 MISC metadata.xml 382 BLAKE2B 4acf895db01bfa4f8411719ccab7a76d0eb8552daffd7052a45f8c573ac5ba3b7828f686a876d1a04f9e4271829c80a9063f5979dfe1485467cc32076a386fef SHA512 6c2ae098490270cf780394cc729634d2f2fd5b12c9a92dac4fa88c764f0e4e4f010267347a7e1df610147b67ab6cb883d94660edebed52647c09e52cf4b52242
diff --git a/dev-perl/Calendar-Simple/Calendar-Simple-2.0.0.ebuild b/dev-perl/Calendar-Simple/Calendar-Simple-2.0.0.ebuild
deleted file mode 100644
index 0952136a52bc..000000000000
--- a/dev-perl/Calendar-Simple/Calendar-Simple-2.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=DAVECROSS
-DIST_VERSION=v2.0.0
-inherit perl-module
-
-DESCRIPTION="Perl extension to create simple calendars"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-IUSE="minimal test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Time-Local
-	!minimal? (
-		dev-perl/DateTime
-	)
-"
-DEPEND="
-	dev-perl/Module-Build
-"
-BDEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.28
-	test? ( virtual/perl-Test-Simple )
-"
-
-PERL_RM_FILES=( "t/pod_coverage.t" "t/pod.t" )
diff --git a/dev-perl/Calendar-Simple/Manifest b/dev-perl/Calendar-Simple/Manifest
index 050c624d2885..f3a76f17f5b2 100644
--- a/dev-perl/Calendar-Simple/Manifest
+++ b/dev-perl/Calendar-Simple/Manifest
@@ -1,5 +1,3 @@
-DIST Calendar-Simple-v2.0.0.tar.gz 7024 BLAKE2B b86153bd0d50b14e6910bc0bafe5aa8c7343112c2538001714c62de3a2926a1b98e2cfbc05289e7fac702e638c5ad6090929baf611e33366bb309bfb5ae231ea SHA512 2e9e16a27d254cf68e38be2ee1715e1f8d0d3b224ed8fb1a2a5e56ac172a25f67beec08b7a18bf0bf69a66a3ed7d94d058faad46f3a266a24e2b39fa8e2d3efe
 DIST Calendar-Simple-v2.0.1.tar.gz 7079 BLAKE2B bad35402ec02c0a161d4c7e04ea4f01dff1a5120fb1da79550d4eb073142f05de8b2badf3fdcdb899d202ba307c851dcf7c9ef71364409c264fceb97afe34a87 SHA512 158df4171a712a14190ac539c32dd3afd8cfa9873e14295d19dd6f140b19d853574c9452485ac427e1dd803ee5721b2231e3a404f98c50a0441efbc7e983ac64
-EBUILD Calendar-Simple-2.0.0.ebuild 584 BLAKE2B 6deff2e103647591315f002a160051c73f651e6b147d7fcaec2426577b34c2a3b620b038e6e1fdb129de36381085697410a507130dc4fcd0fe3ea3918f8e8816 SHA512 65f958aa2eb66ad086f5bb6ee0790b0cc292c3f7959f8d47843ff148cddc2a6a19c3a1e9e8edc91b1eb9c35b0323f217174708f45bb7ba2e963ab867aafb47d0
 EBUILD Calendar-Simple-2.0.1.ebuild 553 BLAKE2B 830e01a8456bc916adb81d7a55478bb8bc2e03a3046a8c2b5bf61971809fa5838ca93511523e64287953869331c892141b40084ea224aae545968b8d85d9e68a SHA512 56a8bea474547ae6b5bb50f8dbe4f09c9c17f2a41b9007b30b983a1a3f55b29445401ff77d445c9db667556c7a3d2125fff0574d49243c505beecd67dfd06fa3
 MISC metadata.xml 403 BLAKE2B b4f7b08defe3a0881191f166dfecf32336bd74a01b4147b647542196fe3c542ce4ba2d4a60db75e6e5c4cbb4064b8156d6724c80c067bf6d6719569e40249e82 SHA512 d795e2ee036e9a1fbbafbd663a20153ae56b9f590ad6ffb4574f5f6556865390a9b64055ecdf1092666637d287d5b4d691372c3b422a9f7764bc7ff4045a493e
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.480.0-r1.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.480.0-r1.ebuild
new file mode 100644
index 000000000000..3f0d2a36aa51
--- /dev/null
+++ b/dev-perl/Capture-Tiny/Capture-Tiny-0.480.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DAGOLDEN
+DIST_VERSION=0.48
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"
+
+LICENSE="Apache-2.0"
+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"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	virtual/perl-IO
+	virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.480.0.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.480.0.ebuild
deleted file mode 100644
index d9dac305abba..000000000000
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.480.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DAGOLDEN
-DIST_VERSION=0.48
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"
-
-LICENSE="Apache-2.0"
-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="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Exporter
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	virtual/perl-IO
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Capture-Tiny/Manifest b/dev-perl/Capture-Tiny/Manifest
index 6ff518f32e31..730a5a271647 100644
--- a/dev-perl/Capture-Tiny/Manifest
+++ b/dev-perl/Capture-Tiny/Manifest
@@ -1,3 +1,3 @@
 DIST Capture-Tiny-0.48.tar.gz 37480 BLAKE2B e6de05459478131c5129dd5ffc84744e2d3440c2e31545ed101c2986b2bc970106f126286dea50350f4b5ea330ffac423693d755e29850883bdc215437bf7488 SHA512 96d140b33a5ee147804925353ec5b49b806fa9c98b4ac23ec9c9494828f52ac72fd6f69c08e14ada18e5187dc4cece3d72901ce07b12eef20595322161a98437
-EBUILD Capture-Tiny-0.480.0.ebuild 798 BLAKE2B cc42f603c3a9b0985e7d7a5a5f439e64d3f2e7b4c79856b878d722b8a7278dd03168bd62fa8abad9a1e9f168cde5d5cb42b6a16850a6d52895ead87bf531ef80 SHA512 12dcafc36f9fc07ed45ba224f988ff371998eae34576e1b5901b53e571cdbb6744e3b442efca16ecd7f6184ce5a8940b8f143d3a9280e5ef74c31a091d11b2ca
+EBUILD Capture-Tiny-0.480.0-r1.ebuild 760 BLAKE2B 2fbaf7d006da14127ba7f5a63537c3cf8c667b1be92f90b0d0923eeab2062e8f33b686016d598efc4a832d5cf018d30b064bf42208f9ca4b7053b0068635b7b6 SHA512 70f6fb0d741651ca82646dc2b07887e17b9cf7d73b31eda35c3b0edb656d59ee0ce8d0fa5aab64876a4902ec317a6acd9712bc3d5556bdc167e15cd7f84ffe8b
 MISC metadata.xml 397 BLAKE2B ef9c239d5b6dfd3484a22acc30479af296112bbdfdbdefb437e69fc0c177f0d49158daad916ed8bee1ccdad1280cfb02e6e1cebe484c67ae66f0ed1d4914aced SHA512 a0775f910914af99366034f18f6210f095c80766abc3472a89cc906e7556189311824623f99edf21a6c19cd50d84b8845daee35cf3051525125e41fcfe01c1ed
diff --git a/dev-perl/Carp-Assert-More/Carp-Assert-More-2.0.1.ebuild b/dev-perl/Carp-Assert-More/Carp-Assert-More-2.0.1.ebuild
new file mode 100644
index 000000000000..62fe69dcc9cc
--- /dev/null
+++ b/dev-perl/Carp-Assert-More/Carp-Assert-More-2.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=PETDANCE
+inherit perl-module
+
+DESCRIPTION="Convenience assertions for common situations"
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Exception
+		>=virtual/perl-Test-Simple-0.180.0
+	)
+"
+
+PERL_RM_FILES=(
+	"t/pod-coverage.t"
+	"t/pod.t"
+)
diff --git a/dev-perl/Carp-Assert-More/Manifest b/dev-perl/Carp-Assert-More/Manifest
index c2d8b7f18b9c..03b3f5d68e85 100644
--- a/dev-perl/Carp-Assert-More/Manifest
+++ b/dev-perl/Carp-Assert-More/Manifest
@@ -1,3 +1,5 @@
 DIST Carp-Assert-More-1.26.tar.gz 15205 BLAKE2B d64da531e68c59378bf1d42f15f622910dbb5c72078cdc4b37dd82564471e437c73bbfeece6297bed93b25f5e623795cd318db02dc4535a8a2e6d47bf3deeb2d SHA512 ef2a6adc62706dc15f45eb54968eeb216afd2864386f26ffac3a78750290b34e08b52149938b02b7f252252ddd85a676d6a94572d49ca0ca743beace24bc5c36
+DIST Carp-Assert-More-2.0.1.tar.gz 16730 BLAKE2B 8796cb61caf2687dbd55a892a74eac48bf00352a29eb07b29b724eada37755341fd13e97fda6c12aad54ecbf57dbeda8240424d9223981d8ed47f19d281addbb SHA512 584b838cd32b342b27f6e8281e2cb3439cd0077e121e16a482e32c5c3f28a07ed38b476d412d19c7ad7a85fb4079943806c258db6fc9ef4377d285494765e253
 EBUILD Carp-Assert-More-1.260.0.ebuild 844 BLAKE2B e2dce1424277b334d474c539b9990f6170698be1ee77067c365cbdfdf38cd8987ef9552a546b323a853c94f919d098d198212f9cee6a33a186e6ecba85998fbb SHA512 3dc0a27b245ceb534806cac912ad03836a4847c5e56334262ba4400cd4757e957235a9f653ab5bb8cdc5a3c0341f209d7eab81578f675b3abf7eeda55465d08b
+EBUILD Carp-Assert-More-2.0.1.ebuild 564 BLAKE2B 311570a8ceb8e8927e2e8595543410a56e5bdb9264fff5f0c8f9595dcf9ceeecf233babd8b8c54ffe26a1f779d9f182f3884b6f2c98f86a6e2b92e76bad08865 SHA512 779ce8a09262a9ceb585c231a392f215c5872f285e28914db114a3843d0998db5377b228205954f7cde3eb8b9cc3ae33251adf2c4f56dcc11b4fb850c273656c
 MISC metadata.xml 406 BLAKE2B 919fdbd59d320d9893ed2d49c085e319691d551513b93119e83478391b4f58455245d9fec13474df6bee96550edbff2492847ddbc8bef1b6a3b59d86d7e97ae1 SHA512 5531d16fbdfda3451d9e2015d1c3b59dd027147ef4d35cb6dd73a1310a7a76042bc7c1ea8c14432ed32dd791556d3ed35d063905695f9c4a9c34b462e42d7a51
diff --git a/dev-perl/Chatbot-Eliza/Chatbot-Eliza-1.80.0-r1.ebuild b/dev-perl/Chatbot-Eliza/Chatbot-Eliza-1.80.0-r1.ebuild
new file mode 100644
index 000000000000..a8e4a608c77a
--- /dev/null
+++ b/dev-perl/Chatbot-Eliza/Chatbot-Eliza-1.80.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=GRANTG
+DIST_VERSION=1.08
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="A clone of the classic Eliza program"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86"
+
+RDEPEND="
+	virtual/perl-Carp
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
diff --git a/dev-perl/Chatbot-Eliza/Chatbot-Eliza-1.80.0.ebuild b/dev-perl/Chatbot-Eliza/Chatbot-Eliza-1.80.0.ebuild
deleted file mode 100644
index af90e72727f5..000000000000
--- a/dev-perl/Chatbot-Eliza/Chatbot-Eliza-1.80.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=GRANTG
-DIST_VERSION=1.08
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="A clone of the classic Eliza program"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.880.0 )
-"
diff --git a/dev-perl/Chatbot-Eliza/Manifest b/dev-perl/Chatbot-Eliza/Manifest
index 76839392a0e9..bedee72f389e 100644
--- a/dev-perl/Chatbot-Eliza/Manifest
+++ b/dev-perl/Chatbot-Eliza/Manifest
@@ -1,3 +1,3 @@
 DIST Chatbot-Eliza-1.08.tar.gz 40294 BLAKE2B 74c84eec13daecab44d15d2d8a27c9c08f1ac590948e9e89842df3cf77f28c3abb7c00b6763f563f54063c4151e9ca22a044411276424b980d6ecc0041b92334 SHA512 9d90fc0064541167c85491e03bb8a8d8bee16986cd7a07a1e1ff99d4e80bb854e1d87869b9bb2f6b33de5c84bf479aa95a045a234317226f53f490eebde506d0
-EBUILD Chatbot-Eliza-1.80.0.ebuild 475 BLAKE2B 3c7aff02f317998502a02eb72a7e7571d6a368082557e7c043b1cf326c9896f0fabacc9bbdcd33fa64174e4bc12a4206b05f48701215d64c6af5c18fc1e96872 SHA512 1053bc88e747b56c23d513c678c191db4fa477f530cfcd731b06a9fb3430889ea7ce83ad9da3d81434f1d8be0795c5a12fd86464872b2907789bfac13efdf4a8
+EBUILD Chatbot-Eliza-1.80.0-r1.ebuild 437 BLAKE2B 6e4730817139672cde530e188f0c51ec6f3509550eb368e199b701b30634139b9f6478ce495b01acf348bd3a0862658b53a4c2bea59811f09210ceba656bcdec SHA512 6137a442a9fbf54defcc2fff387178581453bfcf87941208f31258569eb9df604be0aa23eb55236638b67960a9a0b82ea07c0bc3d9ed7526700b84cd6c514783
 MISC metadata.xml 399 BLAKE2B ba67ed4abc0c1dd314b748a0b7cd747ed0a0ce4b5545609c5dbe7108945cc3c5c2799ac8cb7beee9ee61e15102cf70156137552bbb676e6a8d3d566c1df692ba SHA512 bf8e75ed3bb465bc1c4a1c76f0611909f086f904baa11a5c49c81be82ec7f486e3dee18b3e86a2c60902f0b7556d3186b1edd1f6a7d9af2fb2be9dae8d7cec23
diff --git a/dev-perl/Cisco-IPPhone/Cisco-IPPhone-0.50.0-r2.ebuild b/dev-perl/Cisco-IPPhone/Cisco-IPPhone-0.50.0-r2.ebuild
deleted file mode 100644
index 77a95a3d3c32..000000000000
--- a/dev-perl/Cisco-IPPhone/Cisco-IPPhone-0.50.0-r2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MRPALMER
-DIST_VERSION=0.05
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Cisco IP Phone interface using XML Objects"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-perl/Cisco-IPPhone/Cisco-IPPhone-0.50.0-r3.ebuild b/dev-perl/Cisco-IPPhone/Cisco-IPPhone-0.50.0-r3.ebuild
new file mode 100644
index 000000000000..8d5c78577bc5
--- /dev/null
+++ b/dev-perl/Cisco-IPPhone/Cisco-IPPhone-0.50.0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MRPALMER
+DIST_VERSION=0.05
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Cisco IP Phone interface using XML Objects"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-perl/Cisco-IPPhone/Manifest b/dev-perl/Cisco-IPPhone/Manifest
index f5a55d4efa27..4a785a14ab44 100644
--- a/dev-perl/Cisco-IPPhone/Manifest
+++ b/dev-perl/Cisco-IPPhone/Manifest
@@ -1,3 +1,3 @@
 DIST Cisco-IPPhone-0.05.tar.gz 175465 BLAKE2B f6c407d893236a1d88e2ddc62d39a975f36640ebe9e99515b9f98640f263fd7311dd5a8cabde8e624633ca1741430d38407e18a03486446d95fa64f4f5debc4b SHA512 99f1aa35512226ffa0c6aeef41876146bcae51bf82c25dc9b230459a74bc48f5048254db07afe9dbe8680f476dcd767b2c764980aacb484e3a4bb23fde49116c
-EBUILD Cisco-IPPhone-0.50.0-r2.ebuild 319 BLAKE2B 64a3f83943bfcecd8ded444ffd6fdcb6d53b5e56d7bb76f72de2ef972900249fb73fc79fc34e92b5efccf77652004e5a01470b4bc96e02ac2e9c500ce10542b4 SHA512 da718d2a985565a0cff1236656b362125fc0c984caa817a89af7beb3c983fbb4c2f1617e9c92a58b6c49ad14cbc417729e73feb8df9f5e9c0ee7764cce8fa360
+EBUILD Cisco-IPPhone-0.50.0-r3.ebuild 311 BLAKE2B c6032685940be979971c72617cf4360b8030fb203a5628c5c16c43bb216af55b1352ee66ac61f69f6650423deefaaba83fc720ef34dc5df1a267829b713cb1c4 SHA512 c7be1ec86b905b5b709ed76881192ae10e2b4fdcd392638b63aaf2c8fc0313f4f2410a0411c2e316be170a5a8214576eab335df8ca5c7f2e2043a59be8154a2a
 MISC metadata.xml 399 BLAKE2B 8aed25f88f2fc76c62cea2ef32db73746a0435b0a5dc62a144d5ce25466dbc0282bf9b942fb5e30c32f99e5f1c86895f516f583cc19c32da04d92f9b916da925 SHA512 df845409f9521ec323b3794f15bb9a528e7e34c8606f48d8363324076ea7d29c4171c70650914453f4bb04697086df40c2cadc2ccce8ce8208bf86f32617381a
diff --git a/dev-perl/Cisco-Reconfig/Cisco-Reconfig-0.912.0-r1.ebuild b/dev-perl/Cisco-Reconfig/Cisco-Reconfig-0.912.0-r1.ebuild
new file mode 100644
index 000000000000..6561b836d876
--- /dev/null
+++ b/dev-perl/Cisco-Reconfig/Cisco-Reconfig-0.912.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MUIR
+DIST_VERSION=0.912
+DIST_SECTION=modules
+inherit perl-module
+
+DESCRIPTION="Parse and generate Cisco configuration files"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=virtual/perl-Scalar-List-Utils-1.70.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Cisco-Reconfig/Cisco-Reconfig-0.912.0.ebuild b/dev-perl/Cisco-Reconfig/Cisco-Reconfig-0.912.0.ebuild
deleted file mode 100644
index 88739e5c20bb..000000000000
--- a/dev-perl/Cisco-Reconfig/Cisco-Reconfig-0.912.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MUIR
-DIST_VERSION=0.912
-DIST_SECTION=modules
-inherit perl-module
-
-DESCRIPTION="Parse and generate Cisco configuration files"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/perl-Scalar-List-Utils-1.70.0"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/Cisco-Reconfig/Manifest b/dev-perl/Cisco-Reconfig/Manifest
index 6627d9f8f23c..22d3196cb09c 100644
--- a/dev-perl/Cisco-Reconfig/Manifest
+++ b/dev-perl/Cisco-Reconfig/Manifest
@@ -1,3 +1,3 @@
 DIST Cisco-Reconfig-0.912.tar.gz 25818 BLAKE2B 77d62bbf8615fef48846b8b767c128980ddf8fdfe37daf1a59c103bb44ac9f6648fd3523708333bc5e7ebf3678ae62724bbd75ee7b5a1ccec45d388165996859 SHA512 f8cfe7ba9b0d91e27265977525775cc5858fd2a0f1c425ec82118cfadb7489ca605c785a7c17af537959cfb58b15d485cb116aacfd115d79e77e351cffdd6fdf
-EBUILD Cisco-Reconfig-0.912.0.ebuild 397 BLAKE2B 494d6bb6401d6b3c77220354190dacd90983ddecf63cf31d17a12e204291aa8283204fb2470a3d91c8349ed8c8febec93ebf31c705e9d3c29aa3bdee896e899a SHA512 cca9eac8b53599760e0afdfb0870212f99f374177bc86534e69ac989efbbf2165a78fe7a80de0012ddf5104bfb3d6d07a4331dd08a6c7f83c74595ef6cf79765
+EBUILD Cisco-Reconfig-0.912.0-r1.ebuild 389 BLAKE2B a2abec996fd8e9508023c74432d0b079bab07744178a7589fde9e43e7f03aa72c9b98287df17422a5553c23cfcebe0be9b3d3fec47d10a4eb89ce22b751bf56a SHA512 f86dbb8b7304723f58678ee0ae4bb59b61eeef079d08b48370c74f6575784c44add9e144e95866782094c3ceb5b0713e33e4a1d7c1400801fd076a97750f3804
 MISC metadata.xml 401 BLAKE2B ff97a8d8a82d372ad16bf44f19e34730ebece0915e686dfd4d7016950ef7be15085d73ce41f333de99105c35a61669d4b3dc880a495ac6e6162afc96e17df943 SHA512 f0c74beca48451a9d3e0d6295fce6aaaa57c56f91ad5d82332b05482d91f782dfb71aecb313bbaf6a770c942cb7b81a0f20c9188ad9e85d588ecb1a38301f31c
diff --git a/dev-perl/Class-Accessor-Lite/Class-Accessor-Lite-0.80.0-r1.ebuild b/dev-perl/Class-Accessor-Lite/Class-Accessor-Lite-0.80.0-r1.ebuild
deleted file mode 100644
index 6c52d2875056..000000000000
--- a/dev-perl/Class-Accessor-Lite/Class-Accessor-Lite-0.80.0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=KAZUHO
-DIST_VERSION=0.08
-inherit perl-module
-
-DESCRIPTION="A minimalistic variant of Class::Accessor"
-# License note: perl X.y or later perl X
-# https://bugs.gentoo.org/718946#c5
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-BDEPEND=">=virtual/perl-ExtUtils-MakeMaker-6.360.0"
-PATCHES=(
-	"${FILESDIR}/${PN}-0.08-no-dot-inc.patch"
-)
diff --git a/dev-perl/Class-Accessor-Lite/Class-Accessor-Lite-0.80.0-r2.ebuild b/dev-perl/Class-Accessor-Lite/Class-Accessor-Lite-0.80.0-r2.ebuild
new file mode 100644
index 000000000000..ad872c3c9075
--- /dev/null
+++ b/dev-perl/Class-Accessor-Lite/Class-Accessor-Lite-0.80.0-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=KAZUHO
+DIST_VERSION=0.08
+inherit perl-module
+
+DESCRIPTION="A minimalistic variant of Class::Accessor"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+
+BDEPEND="
+	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.08-no-dot-inc.patch"
+)
diff --git a/dev-perl/Class-Accessor-Lite/Manifest b/dev-perl/Class-Accessor-Lite/Manifest
index bf1cc9d3d38e..963edce2cc4b 100644
--- a/dev-perl/Class-Accessor-Lite/Manifest
+++ b/dev-perl/Class-Accessor-Lite/Manifest
@@ -1,4 +1,4 @@
 AUX Class-Accessor-Lite-0.08-no-dot-inc.patch 467 BLAKE2B 875a47078f6dc88aa87101a065da8b78a897bf0c30d7ae8abe359409ce826718f81a143da115969f3012268f4e4f2b1ee0f6ddbbfceea03cb1ee396d479d9ed8 SHA512 9e08eaae15eba71aae8ec6f5f86f6bd1599b751d6216e076b1ecccc8757cad22ea724a7867af484d8339d267848e7521de652afe0519200638f3c333755d4802
 DIST Class-Accessor-Lite-0.08.tar.gz 30014 BLAKE2B 68c16c3d15f3a8cf42a0d42242e027be23fe138aa3e14dbd2cf44bcf3c2057e6b78ecb50bcf2da60e21fa88e36073d6b4d2d370e29789fa334acb137b353253f SHA512 e23afed2c0c7eb887d23c80dca1b8b0cc42d38c86f8fcceb87d384b10403e0d74d3ae3b41a9654f4fcb58462ec138f0266a0b7e94d389ecb91d271600c6e293b
-EBUILD Class-Accessor-Lite-0.80.0-r1.ebuild 470 BLAKE2B 2e443036850967faaa86f795dc5245b8f5212e3863ff4d1fcc638245b4cef4e668c5491040531cb5e060c8f410e8a4be01fbb5d508039c27cc84128d91c69584 SHA512 7f28e2bac69114800487af3e287dcc53ea1b238a0a309b3a4b183dd10ceb20befc099e0c26bc282d658788245aea6d2d90114223a676b69c75e319342030ca81
+EBUILD Class-Accessor-Lite-0.80.0-r2.ebuild 399 BLAKE2B 641e7695cf1875cfeafb1883909e0c99ac18b7a539aad5bbfb8dbfa4657ceabfa0c4d2b0612ddf6614b89277fa0b551447b39cedda7e9c84843bdc3ac1817c3d SHA512 32f508ddb3aaaf3c70425dae9e1f0ee05e4b0091f2fd056f22da7b4f6b821db930e844ac78799eaa0302ff349708f146ae87a8c4c70d84b9a9263fd2c3dc62a2
 MISC metadata.xml 412 BLAKE2B 989daab9ed69a149ec036bfd6ecbc43d9392645c89d942ce01db859197adf54020644088a9303df45232c410c19d973222a3a291edfda6b9fa9a296497118569 SHA512 2f9af712a4e76aa48b4c948e7d000851603b08c9e547ee2b62cef4aa34c7ea16825358a6c8cf47acd01f0c59683b24fd96ed618c77a87f1201a7b47479399857
diff --git a/dev-perl/Class-C3/Class-C3-0.340.0.ebuild b/dev-perl/Class-C3/Class-C3-0.340.0.ebuild
deleted file mode 100644
index b3584616c0b3..000000000000
--- a/dev-perl/Class-C3/Class-C3-0.340.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=HAARG
-DIST_VERSION=0.34
-inherit perl-module
-
-DESCRIPTION="A pragma to use the C3 method resolution order algortihm"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Note: https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Class-C3#Bundling
-RDEPEND="
-	>=dev-perl/Algorithm-C3-0.70.0
-	virtual/perl-Scalar-List-Utils
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.470.0
-	)
-"
diff --git a/dev-perl/Class-C3/Manifest b/dev-perl/Class-C3/Manifest
index a65d09f0858f..6b049a347b30 100644
--- a/dev-perl/Class-C3/Manifest
+++ b/dev-perl/Class-C3/Manifest
@@ -1,5 +1,3 @@
-DIST Class-C3-0.34.tar.gz 24819 BLAKE2B a97dbec6ca02bbbc17e0f2887dc0ee0e36bac7d3ef17606a0d913ba163b07f87019ade080d7f4a70afae0dc16c4ab3af4c6163102cb64631b70d0460fd1643aa SHA512 3400b0f827cceca47fa352f634c1a08f33f880e7899be4c44f7bf2a113f5530a7ac07269ae6a15a3c6cccc7dc6bc106c8888daa68bcf7a41bdce072e32c957f4
 DIST Class-C3-0.35.tar.gz 34534 BLAKE2B 6a75b55f14349094ddcd62aecd736ad5de588a767e90a683bc4ca2731dda5cf97110ac8e336fc060db42c21e9da39674eca34a9fe129e17575e191dbf24b67d5 SHA512 792dda26d6c77652ae0d1ca868284a798c631523d29f338d3b5bc771fd151a8529f6f8692a8fec7a9116ac8e40831b714bcfd205736c04e56e91fa39a4bae9a6
-EBUILD Class-C3-0.340.0.ebuild 645 BLAKE2B 6c827c5b0d6ce21fad4a6bbf1467e1ccc0f7d2d06f39a9aebcef547fac16ce47d638c60e85d0e6b45276a4d700ec749c61c13d70a7b18126a479685d61fb3c4e SHA512 21e1382c5c49620e32d5f7eb3f5d9b6586f1502f1f3949184528519534f718cd074e83194775a136a2bf3fada00a94b4330b5b1ff5f4138d58d12a8c0edbbd2f
 EBUILD Class-C3-0.350.0.ebuild 646 BLAKE2B e0a06f2478486ad98e2b9a6e7c3260f65e4d954625f2571127f5b5cfeafe797fd9d4faa10d168414a4251917a0b86bceec1c1708b090aedeab689a1c40b15e63 SHA512 09bc0e71f50f2fc2b50997dc8652e407900751aae67f92dcba3287962f17cad3e3227b21f3d7c2824b6bc4dac10ff50e7378decaaa78ebb53229120d3e35c7d0
 MISC metadata.xml 389 BLAKE2B 9b3bb3071721e634b4b50303757eee0f698775b13db0962c23c3290c7c881e1cf12c434266ab81ce5eef25d4aa3848d1b2e9bcfb0ba7dd6804c4473802b9e7fd SHA512 c3621f858923cd5c1111b9cbdc74cf991e9a2dd8450c6e3051ff574b42cdb4f074c1c68a505987343f327bb8355ad99886a4a44040bb3ec4cbb9137f2a658253
diff --git a/dev-perl/Class-DBI-mysql/Class-DBI-mysql-1.0.0-r3.ebuild b/dev-perl/Class-DBI-mysql/Class-DBI-mysql-1.0.0-r3.ebuild
deleted file mode 100644
index b4654f5c3392..000000000000
--- a/dev-perl/Class-DBI-mysql/Class-DBI-mysql-1.0.0-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=TMTM
-DIST_VERSION=1.00
-inherit perl-module
-
-DESCRIPTION="Extensions to Class::DBI for MySQL"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Class-DBI-0.940.0
-	dev-perl/DBD-mysql
-"
-BDEPEND="${RDEPEND}
-	test? (
-		>=virtual/perl-Test-Simple-0.450.0
-	)
-"
-PERL_RM_FILES=(
-	t/pod-coverage.t
-	t/pod.t
-)
-src_test() {
-	local MODULES=(
-		"Class::DBI::mysql ${DIST_VERSION}"
-	)
-	local failed=()
-	for dep in "${MODULES[@]}"; do
-		ebegin "Compile testing ${dep}"
-			perl -Mblib="${S}" -M"${dep} ()" -e1
-		eend $? || failed+=( "$dep" )
-	done
-	if [[ ${failed[@]} ]]; then
-		echo
-		eerror "One or more modules failed compile:";
-		for dep in "${failed[@]}"; do
-			eerror "  ${dep}"
-		done
-		die "Failing due to module compilation errors";
-	fi
-	if [[ -n "${DBD_MYSQL_DBNAME}" ]]; then
-		perl-module_src_test
-	else
-		ewarn "Functional testing of this package requires user intervention."
-		ewarn "For details, see:"
-		ewarn "https://wiki.gentoo.org/Project:Perl/maint-notes/dev-perl/Class-DBI-mysql"
-	fi
-}
diff --git a/dev-perl/Class-DBI-mysql/Class-DBI-mysql-1.0.0-r4.ebuild b/dev-perl/Class-DBI-mysql/Class-DBI-mysql-1.0.0-r4.ebuild
new file mode 100644
index 000000000000..6d05760b793a
--- /dev/null
+++ b/dev-perl/Class-DBI-mysql/Class-DBI-mysql-1.0.0-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TMTM
+DIST_VERSION=1.00
+DIST_WIKI="tests"
+inherit perl-module
+
+DESCRIPTION="Extensions to Class::DBI for MySQL"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=dev-perl/Class-DBI-0.940.0
+	dev-perl/DBD-mysql
+"
+BDEPEND="${RDEPEND}
+	test? (
+		>=virtual/perl-Test-Simple-0.450.0
+	)
+"
+
+PERL_RM_FILES=(
+	t/pod-coverage.t
+	t/pod.t
+)
+
+src_test() {
+	local MODULES=(
+		"Class::DBI::mysql ${DIST_VERSION}"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	if [[ -n "${DBD_MYSQL_DBNAME}" ]]; then
+		perl-module_src_test
+	fi
+}
diff --git a/dev-perl/Class-DBI-mysql/Manifest b/dev-perl/Class-DBI-mysql/Manifest
index 193731a169ba..ebff81220801 100644
--- a/dev-perl/Class-DBI-mysql/Manifest
+++ b/dev-perl/Class-DBI-mysql/Manifest
@@ -1,3 +1,3 @@
 DIST Class-DBI-mysql-1.00.tar.gz 6411 BLAKE2B 9105265fd43f61c58f2763847f36ad2e9d01974f23d0cbf76d5224f59daca2bf3dd52924e187090ed5581be8ed64cb9a9f37b54c079f680e01886311c29cdfcb SHA512 4b8ba9b092f7331a37d7d708a77ac301512ee9b10bd1b4fea2a73a876fca737be4709ab821701ff45a1f007aa3a952a82bbe72e7894707fe89ba4a66108cc08a
-EBUILD Class-DBI-mysql-1.0.0-r3.ebuild 1175 BLAKE2B 6053977cb75d9e29051152bc92a24016539d18299d57eeb9163c1949839cecbefad4f62f1496e427cd5723a3b6651ae4cca6fe48e9c2593b720194cf498e6d95 SHA512 ce95e38e83a84e8279f71b761907b493e01850fd17c114ed1c92ac10dbc7e4e14967073384eccd09020930e3252bf37b2f2f8493fe8863cb71b07ce2ee5d470e
+EBUILD Class-DBI-mysql-1.0.0-r4.ebuild 965 BLAKE2B 954872cda9877de137e3a57e94743a6743f744c22b0835513eb8f59ca63289265d427d46ff820301674f09190cce757d9256a0bc15a33016ea6c4328d9112723 SHA512 8272a7fa32c8e924d4b8979f4ee27653370ab1261ea4491a19644b3b86c960dfaf21ddbd5bd51577e89f0739f01314b7ba026fb4e4713ccfb0b92f65357d67a6
 MISC metadata.xml 404 BLAKE2B c07b0591514669d56016130a7c4f68165c9a9767e68636f747f2328c514cf0d35951b92d176428fdb1fd412808b0106503796f01e0a800848f95d522bbc5baba SHA512 e56c8a11fbe5212516cb2c0df6e7d7eaeb2607717e7d6a54d7226f7fbb1877578fa2d5990345e1e8917dcfadbd02deb52eee2fddd666c2bf805aede1b30e2e42
diff --git a/dev-perl/Class-DBI/Class-DBI-3.0.17-r2.ebuild b/dev-perl/Class-DBI/Class-DBI-3.0.17-r2.ebuild
deleted file mode 100644
index 261720071530..000000000000
--- a/dev-perl/Class-DBI/Class-DBI-3.0.17-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=TMTM
-DIST_VERSION=v${PV}
-inherit perl-module
-
-DESCRIPTION="Simple Database Abstraction"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-perl/Class-Data-Inheritable-0.20.0
-	>=dev-perl/Class-Accessor-0.18.0
-	>=dev-perl/Class-Trigger-0.70.0
-	>=virtual/perl-File-Temp-0.120.0
-	virtual/perl-Storable
-	>=virtual/perl-Scalar-List-Utils-1.80.0
-	dev-perl/Clone
-	>=dev-perl/Ima-DBI-0.330.0
-	virtual/perl-version
-	>=dev-perl/UNIVERSAL-moniker-0.60.0"
-DEPEND="${RDEPEND}
-	test? ( >=virtual/perl-Test-Simple-0.470.0 )
-"
-src_test() {
-	perl_rm_files t/97-pod.t
-	ewarn "Testing this package comprehensively needs some manual interaction."
-	ewarn "For details, see:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Class-DBI"
-	perl-module_src_test
-}
diff --git a/dev-perl/Class-DBI/Class-DBI-3.0.17-r3.ebuild b/dev-perl/Class-DBI/Class-DBI-3.0.17-r3.ebuild
new file mode 100644
index 000000000000..86061c2015d6
--- /dev/null
+++ b/dev-perl/Class-DBI/Class-DBI-3.0.17-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TMTM
+DIST_VERSION=v${PV}
+DIST_WIKI="tests"
+inherit perl-module
+
+DESCRIPTION="Simple Database Abstraction"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-solaris"
+
+RDEPEND="
+	>=dev-perl/Class-Data-Inheritable-0.20.0
+	>=dev-perl/Class-Accessor-0.18.0
+	>=dev-perl/Class-Trigger-0.70.0
+	>=virtual/perl-File-Temp-0.120.0
+	virtual/perl-Storable
+	>=virtual/perl-Scalar-List-Utils-1.80.0
+	dev-perl/Clone
+	>=dev-perl/Ima-DBI-0.330.0
+	virtual/perl-version
+	>=dev-perl/UNIVERSAL-moniker-0.60.0
+"
+BDEPEND="${RDEPEND}
+	test? ( >=virtual/perl-Test-Simple-0.470.0 )
+"
+
+src_test() {
+	perl_rm_files t/97-pod.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Class-DBI/Manifest b/dev-perl/Class-DBI/Manifest
index 7486ce931650..d31eb10951d0 100644
--- a/dev-perl/Class-DBI/Manifest
+++ b/dev-perl/Class-DBI/Manifest
@@ -1,3 +1,3 @@
 DIST Class-DBI-v3.0.17.tar.gz 105416 BLAKE2B e02c373b5e9fe2a315588dc6b9353bf35b1fd1dee3489785ae4cbe215d9a1137376f7f958e2ebcf50346de0423d4d40474e1460dd55b255d9ad1077e8a63a54b SHA512 006bc6ca754d24d9cb3791fa99128df597be1f96cb62c309a0f37f169e02e2baec6aa7e6395ddea8202df11488a9db52fa817d8fff7f925097769d70356d1fe7
-EBUILD Class-DBI-3.0.17-r2.ebuild 943 BLAKE2B 9a642ab9da323508cfda60a766554f318e8ce1439c3d7e8a6d40ff478766ce6b8f470c30d3673f8317f0928cc746d0ce5dbe9c740a734032b63b194be3044cf6 SHA512 3c3f71bb428c3f9b2c0ce44f880d48b0f988f871f65bafbf40b73f4fdb31cfe33d0eb693296aa14c8c6a02d91843164060679fc3fb1b5b488770d1d497f9754c
+EBUILD Class-DBI-3.0.17-r3.ebuild 741 BLAKE2B 5f23f481241f7e853311b1c0648f02e313c8102cccff6ee77b4401abae17857e96f35f5fa957b6fb65d2cd13f155cc8fab6bb81c84b685a4bbd1d412bbea3546 SHA512 1130d7d3d7a17e67a55fa838b4f93afe769555ac61f9ee241f4673372fdfb6f90e816217f5bbedbba5318497d4e498e4ab3dde93e5458027683d6eae5353cae2
 MISC metadata.xml 1610 BLAKE2B bf7b33ac0049099f8a226b20d351c67136fb14637cc3cd4683cb36fd6bf78ac98f541abe75d67b8172d9919356045aacd5d4b278d1bfb5c7a6a2962c50dcd807 SHA512 5f4bd2c4700267c46b8d3de597394384ce7b1d5e72972368146b5561bde72516954f1b2400a636c0ac644ebd03dbf5986299ed625ea4ee1afd23c609382f54df
diff --git a/dev-perl/Class-Data-Accessor/Class-Data-Accessor-0.40.40-r2.ebuild b/dev-perl/Class-Data-Accessor/Class-Data-Accessor-0.40.40-r2.ebuild
deleted file mode 100644
index 788655828864..000000000000
--- a/dev-perl/Class-Data-Accessor/Class-Data-Accessor-0.40.40-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CLACO
-DIST_VERSION=0.04004
-inherit perl-module
-
-DESCRIPTION="Inheritable, overridable class and instance data accessor creation"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-PATCHES=( "${FILESDIR}/${PN}-0.04004-no-dot-inc.patch" )
-
-RDEPEND="virtual/perl-Carp"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-PERL_RM_FILES=(
-	t/manifest.t
-	t/pod_coverage.t
-	t/pod_spelling.t
-	t/pod_syntax.t
-	t/strict.t
-	t/style_no_tabs.t
-	t/warnings.t
-)
diff --git a/dev-perl/Class-Data-Accessor/Class-Data-Accessor-0.40.40-r3.ebuild b/dev-perl/Class-Data-Accessor/Class-Data-Accessor-0.40.40-r3.ebuild
new file mode 100644
index 000000000000..d894661a7f0f
--- /dev/null
+++ b/dev-perl/Class-Data-Accessor/Class-Data-Accessor-0.40.40-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CLACO
+DIST_VERSION=0.04004
+inherit perl-module
+
+DESCRIPTION="Inheritable, overridable class and instance data accessor creation"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.04004-no-dot-inc.patch" )
+
+PERL_RM_FILES=(
+	t/manifest.t
+	t/pod_coverage.t
+	t/pod_spelling.t
+	t/pod_syntax.t
+	t/strict.t
+	t/style_no_tabs.t
+	t/warnings.t
+)
diff --git a/dev-perl/Class-Data-Accessor/Manifest b/dev-perl/Class-Data-Accessor/Manifest
index 6cd5bde2b3be..21c1b27e1d94 100644
--- a/dev-perl/Class-Data-Accessor/Manifest
+++ b/dev-perl/Class-Data-Accessor/Manifest
@@ -1,4 +1,4 @@
 AUX Class-Data-Accessor-0.04004-no-dot-inc.patch 628 BLAKE2B ae8243ad76c9e837af264aaa090eafe48eb95c4a1f05241dc48d7f2d8285235e6c73ab4aed6f8ab85d5c4ccf323e618d451064b833d276502beaafaef08e27b4 SHA512 d830f45ee56c7cef247284dd02a9b153d877494ac18eeff2ed8a8219aa2d37aea81839228d6466e03f122f95860ed489bd774500ee52a07890073992ab1c29d0
 DIST Class-Data-Accessor-0.04004.tar.gz 24131 BLAKE2B 2452a67f5b8ee2a7d78ff6b80f65cd0295af12dc95d3c3f6d1f19e1d89241059a4e7f791fbd1e7beed62a9c7c657ca69090e85e86142943b145c2a499f5b5305 SHA512 2e36a4227f14baab9514ca299d5d6e44b69c049d4d166b4c1a12373205ccbf6ec39c35697425b9ede07657effd283cbce2dc8a92d1d12f3ae237cfd556e26169
-EBUILD Class-Data-Accessor-0.40.40-r2.ebuild 631 BLAKE2B 607f0c47e4fb5c380e4a074ff6560bf52c71501bc436dfb159a88e111cdccd8820f94275fd61da868c00306ac96951f8d93695b313ac61150a133cd8676f912c SHA512 56a9d3d645c0d3a213168ff1812437bc329a638ca64c585e65ca032c7679791406fa6bf095b685f22320af08af4a712b1d414ca4b1118309027b185e4a50f692
+EBUILD Class-Data-Accessor-0.40.40-r3.ebuild 598 BLAKE2B 1f62242d236b4944878e79f43ec04bcd968797c74288f70bcea62c17607cde6bbf29856c8b5ccccb47314fbac8538a897d4567fefe1ebc614592dc393701950e SHA512 2cce11a9013352b02ad809d8d34f89cc38f092972c476a49df37e9f7f32f6c3cf1c03daf2042fa07fa6c57f23b02e82aaa0a25f17d13b050f5d9da444259c70e
 MISC metadata.xml 412 BLAKE2B 2727a900862b5c5d243194cfe7e7bd2cbbb2aef34353fb6d7997388b84c890b82116b2f3e1fccfb18888632b9eececa12f4ee0196b1e2592a73df39e6b85f3d8 SHA512 f4ac10748fd8cf95403424b2353d618497d989e323c34cea8e5ad2a86f4206812f8676e2d758f9a92f3efdbb2f9070ad15f193105b53a56a9ecb150870a83727
diff --git a/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r3.ebuild b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r3.ebuild
deleted file mode 100644
index 2b3bd747d66e..000000000000
--- a/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=TMTM
-DIST_VERSION=0.08
-inherit perl-module
-
-DESCRIPTION="Inheritable, overridable class data"
-# License note: Artistic only for one file
-# https://bugs.gentoo.org/728662
-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"
-
-PERL_RM_FILES=(
-	t/pod.t
-	t/pod-coverage.t
-)
diff --git a/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r4.ebuild b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r4.ebuild
new file mode 100644
index 000000000000..e0af31998bfb
--- /dev/null
+++ b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TMTM
+DIST_VERSION=0.08
+inherit perl-module
+
+DESCRIPTION="Inheritable, overridable class data"
+# License note: Artistic only for one file
+# https://rt.cpan.org/Public/Bug/Display.html?id=132835
+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"
+
+PERL_RM_FILES=(
+	t/pod.t
+	t/pod-coverage.t
+)
diff --git a/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.90.0.ebuild b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.90.0.ebuild
new file mode 100644
index 000000000000..172426cce422
--- /dev/null
+++ b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.90.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RSHERER
+DIST_VERSION=0.09
+inherit perl-module
+
+DESCRIPTION="Inheritable, overridable class data"
+# License note: Artistic only for one file
+# https://rt.cpan.org/Public/Bug/Display.html?id=132835
+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"
+
+PERL_RM_FILES=(
+	t/pod.t
+	t/pod-coverage.t
+)
diff --git a/dev-perl/Class-Data-Inheritable/Manifest b/dev-perl/Class-Data-Inheritable/Manifest
index ded6ae9d1342..8d302643c1ba 100644
--- a/dev-perl/Class-Data-Inheritable/Manifest
+++ b/dev-perl/Class-Data-Inheritable/Manifest
@@ -1,3 +1,5 @@
 DIST Class-Data-Inheritable-0.08.tar.gz 5660 BLAKE2B 258e9d143b157b97995ace7236fbe12600d3de2c4301c6996ef66ac96c3d5f685224a0846fa0a52449e5c080dbaadc29ab9838037285ace5a6217bd69bb7ccd7 SHA512 bddc61096158b21d4cfa69538d5db0f53617a66c71447ee193141064f4f58194462b21e0a849510e24e4c263b13be3ee1bc6bb8504320e0a86c02b67ad1652c8
-EBUILD Class-Data-Inheritable-0.80.0-r3.ebuild 544 BLAKE2B 812a558752c1cfa02a2ee2bfe8e994d19d67807028b4cefe2c7fa7d016beb3872e0400f90921075296744efe482d370a0638c58291ee3763750e4377ef84c3ed SHA512 9ace51db8cac823f41175fe6294bb9545226791f0e3d45c2d5fe6adfd8004944c063f130b0a1b685ca0aac1ade5afd02e63682cff081c0aa44e5c89070575757
+DIST Class-Data-Inheritable-0.09.tar.gz 6087 BLAKE2B 687c4738b2323e707247e6544a20056b841d18ee8e12811a1e98ed2e0ce1ef6ea2bb4f3a8906df48cc7849ff16d347a6de3e99e8fa6cf992252a828dd1f92b96 SHA512 2e76aaf12c8d26442d53746e5d74636bb35c55461efb6d9b5ea50a635e3f781707b2d7f9cb3da9113ed31de464d3931f9734c29ace2a7ee5c6e111392b6a97cf
+EBUILD Class-Data-Inheritable-0.80.0-r4.ebuild 567 BLAKE2B 7940080c29aa140481b954be9be9da7342ebb9966fa0163ed86d5e08ae5951526efdcaee342ef147fddcc138324604c2e9936d23ed0ec9e31849ca0b31b6eaa7 SHA512 a3356ed11b3fbfc876d6b624764faadd096ae2c8ec0c8eb0facea2be9b9fe5d09acc831d97ea7f2e44c0b5239bd94b5970480e4d577cc9ee9f2094a91f630c7a
+EBUILD Class-Data-Inheritable-0.90.0.ebuild 578 BLAKE2B 7b60fd02d3589efc54f7021275858293fb784c17e45bdef539b834baf1f4f3bde76fbe6a79af70ee5aa59187a8ddb58e90036a1897be760b8e37b5cbbff0953f SHA512 c921499b1a1f48d02dd53b74eefc942caa299b1dd56c53940ba042e3bdf2f2507f1132842fbfaf7f1339ba4a289add71dd5855911343e316f3664094a337154b
 MISC metadata.xml 418 BLAKE2B 1af9d4842aac6bbb73db9418add1ca0b0b04e821689ed85788245e7d47aa87012700e62c587430bc4e4ec3e2b56f22e37ff02172fc3ff318019614f2ab3e2e75 SHA512 e1c57e31d0212bc9251525e658b70ca38893711ce32adae780f1fa9fd847e5209e496e6b5a984cc8a5349334c24672903a0a69c9bfb85e621babdac198d27aeb
diff --git a/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.40.0-r1.ebuild b/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.40.0-r1.ebuild
new file mode 100644
index 000000000000..468cb097b66a
--- /dev/null
+++ b/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.40.0-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TOKUHIROM
+DIST_VERSION=0.04
+inherit perl-module
+
+DESCRIPTION="Automated accessor generation"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
diff --git a/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.40.0.ebuild b/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.40.0.ebuild
deleted file mode 100644
index 04ed74b3eeb7..000000000000
--- a/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.40.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=TOKUHIROM
-DIST_VERSION=0.04
-inherit perl-module
-
-DESCRIPTION="Automated accessor generation"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Class-ErrorHandler/Manifest b/dev-perl/Class-ErrorHandler/Manifest
index d197061fde92..c2b105eee624 100644
--- a/dev-perl/Class-ErrorHandler/Manifest
+++ b/dev-perl/Class-ErrorHandler/Manifest
@@ -1,3 +1,3 @@
 DIST Class-ErrorHandler-0.04.tar.gz 9821 BLAKE2B f92318211d23b42652eee40aaf538567f0047daeb8b7b5bc80c91759c5e103314ca3bf712524ffe66897873e10b689be13ce10ad0a83604743c3dc927d24f320 SHA512 9e235da1c2091f9422723af4528305b8ed2b50920a865e6fee76380a8c512fcd837d752f4ea5146df12c506c776e88c1075419ab3809be3296995387df759c83
-EBUILD Class-ErrorHandler-0.40.0.ebuild 399 BLAKE2B 73b5628d593304aed0c356a9e1e12197c341a9ad74065922566fd31618509c0c4f7e6a92005ad0171ffab42476c664769ac4ee7290ffa6333b86a42f4927a061 SHA512 f7ef63ff52df903fef31eb0c31ffb2bc1fae4db3f1a8b8491ad5af160c629adbd1a985b136203b17879e15a168326657c52d399d8537f92eaf19a51f53cba1f9
+EBUILD Class-ErrorHandler-0.40.0-r1.ebuild 338 BLAKE2B 0e9659048104bf9a8c4312921a930fa3e8d245047bde28d4c4e35fba1c1ce4a3aa748197591c8bddb845c0a4c8803a047dd9c5a38d3b8f5977557638017a6591 SHA512 758b9e3af0e0983a40ec32acde87aa1bb278a63d4997a63a1e1351eaa5cb60021bf8c2c53a7a1cb3a794a06c00b57228d797de09e67b33946f71131d400faeee
 MISC metadata.xml 409 BLAKE2B 493977d6210f99cd221147525c28b8c3446dc7ef0342c7d2fcd0f47a1eede6ccbca5e0603b9ed5db915584164dee0820599e5e9f58cbb0b1156b22df5a1e9c27 SHA512 c3e7ba0b1bd6b50a92f3051dc9f1aad7d481c126e22ff3b9ffe0338ad13bb1dcf2d7aa7082cb794d51afdcf0a6c939f862b7e7384a12a62d386a3342d1c3bee3
diff --git a/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r2.ebuild b/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r2.ebuild
deleted file mode 100644
index 4b100ccc7f62..000000000000
--- a/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DROLSKY
-DIST_VERSION=1.7
-inherit perl-module
-
-DESCRIPTION="Provide utility methods for factory classes"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.28"
-
-src_test() {
-	perl_rm_files t/pod{,-coverage}.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r3.ebuild b/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r3.ebuild
new file mode 100644
index 000000000000..fce00da5c275
--- /dev/null
+++ b/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=1.7
+inherit perl-module
+
+DESCRIPTION="Provide utility methods for factory classes"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND=""
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.280.0
+"
+
+src_test() {
+	perl_rm_files t/pod{,-coverage}.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Class-Factory-Util/Manifest b/dev-perl/Class-Factory-Util/Manifest
index 4058cf3471e2..911afba8b9b5 100644
--- a/dev-perl/Class-Factory-Util/Manifest
+++ b/dev-perl/Class-Factory-Util/Manifest
@@ -1,3 +1,3 @@
 DIST Class-Factory-Util-1.7.tar.gz 11942 BLAKE2B 1274784f799ed9960d54443837277712093f64e7ec4b1c07ff88861c1a28e7138ed8c1ad529d871f66a2c839925b980638fda03fa932f5be9eb183ee0046d431 SHA512 8b8af36f1100805a9f59bd8745bc41455ebc20af9ff9cedd8a36370f66e0fb63a761918ae4f268d5546aeeecdd4ca7de448aca36e84f27b8f0932f34db68982e
-EBUILD Class-Factory-Util-1.700.0-r2.ebuild 507 BLAKE2B 642818fe3b792dde83e1c1e6d9baa5f4cfdcb531f0b277d233a262fc9086cdaf4455275b7e7f77e9d06e8c0ca5564419723631b18073189aa6ee97b8f848f5c0 SHA512 08bf22d2e243d9469c9e0ac826f16a6a8202b3fdd9a63b019169a3bfd09ff2d52518caec42026313aa87f0fce25ea5b199f7f31f7081a4d2167849203d72a228
+EBUILD Class-Factory-Util-1.700.0-r3.ebuild 504 BLAKE2B 2c3dd071de4181142fce7babf45bbf3014a3dad5c5b4a5f2d0ac9b37e42f4eca3bb83269d5b41100b06dee03d49ee6ff9cafb7bd2b581c48065a7a15b508a8c8 SHA512 4387055f493f5f1a44c4b19521ff38b1ea17d3ecbaaa7d71dd14f83cdeb15f4b6102180986b741efde63d53ff9f0112784268791def4d90d3328c2d4d9694dbc
 MISC metadata.xml 410 BLAKE2B 42a8331dd42d31a3d71262c37bdf43b5773e14ead916855047a8aee9750ecae915482d29f8eda7b4a78ab19298b2ad7530028590a4904e1072436d820c82f91b SHA512 29b72cb406924612d7f828dda6114b74db45a96e99ea6cfb2379f0a89c83b676d3235bb681d763ee2dd5f5a3ae20709243e85997c8af1372f8ac481003ba832d
diff --git a/dev-perl/Class-ISA/Class-ISA-0.360.0-r1.ebuild b/dev-perl/Class-ISA/Class-ISA-0.360.0-r1.ebuild
new file mode 100644
index 000000000000..30eb48b8a272
--- /dev/null
+++ b/dev-perl/Class-ISA/Class-ISA-0.360.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SMUELLER
+DIST_VERSION=0.36
+inherit perl-module
+
+DESCRIPTION="Report the search path thru an ISA tree"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-solaris"
+
+RDEPEND="
+	virtual/perl-if
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test )
+"
diff --git a/dev-perl/Class-ISA/Class-ISA-0.360.0.ebuild b/dev-perl/Class-ISA/Class-ISA-0.360.0.ebuild
deleted file mode 100644
index ad208f01b328..000000000000
--- a/dev-perl/Class-ISA/Class-ISA-0.360.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SMUELLER
-DIST_VERSION=0.36
-inherit perl-module
-
-DESCRIPTION="Report the search path thru an ISA tree"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/perl-if"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test )
-"
diff --git a/dev-perl/Class-ISA/Manifest b/dev-perl/Class-ISA/Manifest
index 2a0da96a0e93..667a5df52156 100644
--- a/dev-perl/Class-ISA/Manifest
+++ b/dev-perl/Class-ISA/Manifest
@@ -1,3 +1,3 @@
 DIST Class-ISA-0.36.tar.gz 6056 BLAKE2B 5b5bab6cbede8a5871daa25e988605325f4affcf481b64eb801f950ab72531999af12a2414fc52432de406fce9003c5922cb65ba2df38cb573d40ed5cc1dc9a7 SHA512 49171bc0f78bd8aa74271d2f9eb1f2e535e69c6774f47557b07df011c9b8f44f960ec3c162acd256218944e866666731af27520d1e66cf560f065995b7658416
-EBUILD Class-ISA-0.360.0.ebuild 449 BLAKE2B bdbf4dee9f2eb02bb0faf005c08185a4428991216a0c4a4912e04a21cfebf0eeeb290c09ecd58e8e2896cd5cc4e1026c06b857cccbec4a36d3c05cdc287e9c11 SHA512 f46a1a5582b70ddca496278f183ca0022331163b512daeb03eb2390e5f7188982728820cda1245a2b59c015c81a0ae709d69710f1ba09c0dfaf04945a4fc9954
+EBUILD Class-ISA-0.360.0-r1.ebuild 414 BLAKE2B 8e173049631766aa54d4a498692287ea06772e3b4deeb5494d238bc7322979d4986c625c90474e0cf666f6e7fc1ee047fd076919ca646c05aab42d7360fa95db SHA512 91128bd7ca7e02b9c5a56120e287bb1f040e852e9daafcfe78b1f4d90163ebdfbe614233bc585b7c5889de1da2f1279e32422722638a4c3e8cbd92347db951a4
 MISC metadata.xml 391 BLAKE2B aa85c7c07e697e4272c0d8f4dd46ebecd09bd7b6103849585d61ed5ca7271ba5efd54308faa3c01935402de5b7e7ead428b0e8926e615c9dfe3aac81075ee98b SHA512 6b55b74a2aa71569cdd2b874810f4bdd4c07a73a07667ec2adf7ad1e6cb553901f38c5ad8c45dd609f9babd0a6b82a361c813a6f63747058c739aa7802184f8f
diff --git a/dev-perl/Class-InsideOut/Class-InsideOut-1.140.0-r1.ebuild b/dev-perl/Class-InsideOut/Class-InsideOut-1.140.0-r1.ebuild
new file mode 100644
index 000000000000..794ba650d449
--- /dev/null
+++ b/dev-perl/Class-InsideOut/Class-InsideOut-1.140.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DAGOLDEN
+DIST_VERSION=1.14
+inherit perl-module
+
+DESCRIPTION="A safe, simple inside-out object construction kit"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/Class-ISA
+	virtual/perl-Exporter
+	>=virtual/perl-Scalar-List-Utils-1.90.0
+	virtual/perl-Storable
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		virtual/perl-IO
+		virtual/perl-Scalar-List-Utils
+		>=virtual/perl-Test-Simple-0.45
+		virtual/perl-XSLoader
+	)
+"
diff --git a/dev-perl/Class-InsideOut/Class-InsideOut-1.140.0.ebuild b/dev-perl/Class-InsideOut/Class-InsideOut-1.140.0.ebuild
deleted file mode 100644
index 9cd9c67d288c..000000000000
--- a/dev-perl/Class-InsideOut/Class-InsideOut-1.140.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=DAGOLDEN
-DIST_VERSION=1.14
-inherit perl-module
-
-DESCRIPTION="A safe, simple inside-out object construction kit"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	dev-perl/Class-ISA
-	virtual/perl-Exporter
-	>=virtual/perl-Scalar-List-Utils-1.90.0
-	virtual/perl-Storable
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-File-Temp
-		virtual/perl-IO
-		virtual/perl-Scalar-List-Utils
-		>=virtual/perl-Test-Simple-0.45
-		virtual/perl-XSLoader
-	)
-"
diff --git a/dev-perl/Class-InsideOut/Manifest b/dev-perl/Class-InsideOut/Manifest
index d38c4ecda616..b195be12829e 100644
--- a/dev-perl/Class-InsideOut/Manifest
+++ b/dev-perl/Class-InsideOut/Manifest
@@ -1,3 +1,3 @@
 DIST Class-InsideOut-1.14.tar.gz 49341 BLAKE2B d35ed17bfee71fe78b4c12598548567ae7ca1984d0b0afa6ae41042b149f26df8df0c0142be71026e7c3c72e53306ead0d8747db2849b4a4796418631c037a37 SHA512 e1f33edeb8ac2623f48c862cc90fbca63c28707d571017e34db5e3eebb01f4ae333602215eaed9aa562d1aa4b95d8bebff4e6401db101da7fc26537c8554dff4
-EBUILD Class-InsideOut-1.140.0.ebuild 702 BLAKE2B 04badfdcbd10d222672493ac47dfd9fbb2841728b8e3261c0b795f7e9e9cd6e78813bc4790c259ab588413a49e2b91fcfeee8e7891b7599db03f93b6ef0e00a6 SHA512 7ee15eaa6b1a66bb4f2c97aecbc73364b4c4bc2c1be21434d90051dc4732d81f4a3c954f8723917f821182c536a46e1e9a839c539fd543c035181a81c4439814
+EBUILD Class-InsideOut-1.140.0-r1.ebuild 665 BLAKE2B 2d020616b8b764ede86d9421fb5da7d204f2ebc89eb524fc4e36e6a543864b4170beeea0433e712a13938b04715b7836b6aa7969b5cb887fab53e01a0365e09f SHA512 f9b7a576cea91aa6b181ac4ccaaec237b0efb40c08f7ec8e3cffb2bfb42a2c6d4a86f229c8a5b1f57f52a5d4a933da9a5bf0ac4f7b66229d06905bb047e73746
 MISC metadata.xml 475 BLAKE2B c6c6a50a7ed7461e18a75b53ff21b4d3b17a4ab80ede45f37b1bb54a822549a481f788f33205a1e32617b2ef74918e55addd3921aa559a3d619e53a280261a6d SHA512 85626a4bb1deda38fdca5f5a7c48afd389895e489a8875ea9739097b5c1ec6b5ce8c7a9f778845bd6934dbb1a2422bed1e19258d07ebce45ccf3209fcd1e26e8
diff --git a/dev-perl/Class-Singleton/Class-Singleton-1.500.0-r1.ebuild b/dev-perl/Class-Singleton/Class-Singleton-1.500.0-r1.ebuild
deleted file mode 100644
index 0673be5c39d3..000000000000
--- a/dev-perl/Class-Singleton/Class-Singleton-1.500.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=SHAY
-DIST_VERSION=1.5
-inherit perl-module
-
-DESCRIPTION="Implementation of a Singleton class"
-
-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"
-
-BDEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/Class-Singleton/Manifest b/dev-perl/Class-Singleton/Manifest
index 8f2d19d02257..f84e18aa8029 100644
--- a/dev-perl/Class-Singleton/Manifest
+++ b/dev-perl/Class-Singleton/Manifest
@@ -1,5 +1,3 @@
-DIST Class-Singleton-1.5.tar.gz 7785 BLAKE2B 98bc10c6fda65abe6958360c780826bd76597cc597f8d1910cddf309c04eb3228d4ce8f5f03029a3a99a464eb158de69e167e5e9efc0c0f6d4f3c60938be2444 SHA512 f061a8b92d5f65e4fbcd14ef36ff1216f84443f487de34c98f7d08d6d18148f156c0cbd6249e75ac448c17547d1172dbda8b670a8e7573d3581c9c1196eb4804
 DIST Class-Singleton-1.6.tar.gz 16164 BLAKE2B 6b788f00ee703d1c09b1da54e24fd109f223cc825d9e41e8333758935a161ac9cb00e40cd013d3ebbc2c5ac94e29b2c4db1558784d6a5c870bf813647059582c SHA512 68b637ba57d5da70ac8e7a8a5e1874481681d6a217bb0c58a232d4329c582f32d29b5ac4c60a131bc863c8faf2852c5249bced9d286e87fefe4960e95f35b1ec
-EBUILD Class-Singleton-1.500.0-r1.ebuild 469 BLAKE2B 4fc69fab4175b0d880234b9d830937687f1f8708ac2a1e3300bdd7566b986dc370ef80349fa92bc0a63c4f29c40b3717679e15bce9fd92883743e0bc03ae29e1 SHA512 812e46b5b250ab8d591ed53fd991fecd66613e13e7a4191060b0d59b809425b6e8a91d59e5b96a1f4f1968e9ff577baf009aad2ba699e0beb75fd57c1d05b978
 EBUILD Class-Singleton-1.600.0.ebuild 480 BLAKE2B 7f27c44b524a61e09e6d5bd32973e0e6b9d14e4836e83ac5ea738ebedf2a7d6b236fad1afb2c523b7f5e7cc41bd6e4b1bfd96ced7284b594218d8de69ffe39de SHA512 256222ac72b9e10e3ba1bd25180fae7396600c22eafd0f7278bf14ac5afdb7fe79215352993bc7ac21e4238f462bd7b2ebbe1414de9f82a2b3f0da4d63397013
 MISC metadata.xml 403 BLAKE2B 7a3e50d07e36a933d60dc2f72a5a63b06fa15bb2409192f44f047290c663ff7e7c61d7b4a04be07804416deb2e64441bcf2dc214f6aca54b500c75445c8a7e74 SHA512 8c5de18a2de8fe80897aa4ca4bf5ffa0396b8a284a768680949c5aeeaeee0dd185d66d1be863b13cc864379c371d4fc243cdb2dc0af869d9f8de4a57de514535
diff --git a/dev-perl/Class-Std/Class-Std-0.13.0-r1.ebuild b/dev-perl/Class-Std/Class-Std-0.13.0-r1.ebuild
new file mode 100644
index 000000000000..c6dcc1e6086f
--- /dev/null
+++ b/dev-perl/Class-Std/Class-Std-0.13.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHORNY
+DIST_VERSION=0.013
+DIST_EXAMPLES=("demo/*")
+inherit perl-module
+
+DESCRIPTION='Support for creating standard "inside-out" classes'
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Data-Dumper
+	virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.420.0
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Class-Std/Class-Std-0.13.0.ebuild b/dev-perl/Class-Std/Class-Std-0.13.0.ebuild
deleted file mode 100644
index 02f29a3ccf09..000000000000
--- a/dev-perl/Class-Std/Class-Std-0.13.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CHORNY
-DIST_VERSION=0.013
-DIST_EXAMPLES=("demo/*")
-inherit perl-module
-
-DESCRIPTION='Support for creating standard "inside-out" classes'
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Data-Dumper
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.420.0
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Class-Std/Manifest b/dev-perl/Class-Std/Manifest
index 994bcd56ae81..413c86178fde 100644
--- a/dev-perl/Class-Std/Manifest
+++ b/dev-perl/Class-Std/Manifest
@@ -1,3 +1,3 @@
 DIST Class-Std-0.013.tar.gz 39384 BLAKE2B 85d87339cdcf5b313c5e97dc1052dc903c2d8d90f33aa0623004c07774f06958158a10e7644a061d97e2177614ab66bf9d57e4809e9b89d042079bf183e976db SHA512 10e0c23866753a82fc981931053fa786ba8c4fa6d90b18788220d7bb414886c567545b13a2e6a4db565b0a2be67ff6524bc1f22154a2fa1223dc0cdb5e05f109
-EBUILD Class-Std-0.13.0.ebuild 498 BLAKE2B b80e977a0542814e21856b34e02ed1cf100e5c0db7933ade49d63d0effc521b5c8b10b5096cb2044c5d77725c2e1a03a813bc22395f93aa3f1c599f682d59131 SHA512 06cb7f27bcc253ecf9ca2e56f20e6b58a749b0dae0ce8ba600b0556a97597be43350d689ed9a39273f56a5a291f90535a8fde44e27ba58a4e08cb96e6fa0972a
+EBUILD Class-Std-0.13.0-r1.ebuild 460 BLAKE2B e319140eca603d1a941bc3af79f9e65cbf520b5db1a79fbf3226c1c6f0c904a41dbf3d84e24bf8719ebefe7eec8d1374f543ba3369fb98f6fd666eca70ba3884 SHA512 b965723957e4cdd0832fffabb99bcd44851c6823e9368dd27dfb0e2b4b71148190dfd73fe045952ebbaff65a3e7aa30583fefbd4ccf6af0b78ea8094409515a5
 MISC metadata.xml 453 BLAKE2B a39ab01ebd9168c8a88e05515cc882f02fb75d5d945daa8c1a6f4c166de578f6a67b6136f9756873148912ac3787b2be71af4b791f0c1d26d7fe9321389e01cd SHA512 da00679af0a32d734026278edf45a9b7a14fb60b7aa95b48572cd8e6215ae387ac10d18f02a19f088784735dd41eb04800871588a51b34e0246a5699273871d4
diff --git a/dev-perl/Class-Tiny/Class-Tiny-1.6.0.ebuild b/dev-perl/Class-Tiny/Class-Tiny-1.6.0.ebuild
deleted file mode 100644
index 005530858677..000000000000
--- a/dev-perl/Class-Tiny/Class-Tiny-1.6.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DAGOLDEN
-DIST_VERSION=1.006
-inherit perl-module
-
-DESCRIPTION="Minimalist class construction"
-
-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"
-LICENSE="Apache-2.0"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
-	test? (
-		!minimal? (
-			>=virtual/perl-CPAN-Meta-2.120.900
-			dev-perl/Test-FailWarnings
-		)
-		virtual/perl-Exporter
-		virtual/perl-File-Spec
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
diff --git a/dev-perl/Class-Tiny/Manifest b/dev-perl/Class-Tiny/Manifest
index 0dca49090611..d24349e62e4d 100644
--- a/dev-perl/Class-Tiny/Manifest
+++ b/dev-perl/Class-Tiny/Manifest
@@ -1,5 +1,3 @@
-DIST Class-Tiny-1.006.tar.gz 27773 BLAKE2B af9d754db8c260da6ee814c3bf6f4532b98a646719f5102b774204c07d6031c271a0e0d5fb6473e6ebe23790928c65723f4644f32f6b92e21a38979f81b65722 SHA512 0a6ca0b99bd10a39445bb582bcf89f3668747f05b13b1f7271e934a73781c855a0418ae19a41593c64288b74710f49c1dcda0005be4edf9965e8020139ca0c7e
 DIST Class-Tiny-1.008.tar.gz 24657 BLAKE2B 1c344df4747fb30b8b8b840b885cded57b9d3f3d032989672770bc9b2cafd8bae8b841bf8d045e70b59902454359e9d3a9c0efb1a354be037029cd17dee07375 SHA512 908eb8547e01036ef361f0a8623d028b1e733ea003fc227788b9c18d0db544a70dbe47de18822f9699a19156f36eac73caeb4849d44eea14ada1128afdb7efbd
-EBUILD Class-Tiny-1.6.0.ebuild 771 BLAKE2B 3a8977b9213307a51df34a3aa4a913c2933c41d1c3440ce44dd74e2177f059d74bc0178fc5a232f518c78b89e9016b49ce0fb35452c8d2564e2aea4e7c940daa SHA512 1875f659f7ddb2cddd294fe937b3f457c96bb263b559a03566706f0901b4fdbc286b7dae5a2d34c47ec3570a75794b7e9405fbd125beb5480c4d8b4040bd0d2b
 EBUILD Class-Tiny-1.8.0.ebuild 772 BLAKE2B b1887e51268ed8b156cba4aa56ccd85565885669f5b098a71d23c2602173e7fab4e470e5584b72f5a6a981a93c3bf272563379c832a054c5655016121c44c321 SHA512 ac31042299a9f810fc3e97d8a32f138bdf2761191bc3b5e697fd8da83b4986f5a089697eab53d3cad6041ef915bd7f6b8427ab41e0cc234059680b87ce1840f9
 MISC metadata.xml 459 BLAKE2B d31fce5656e4436a2e0f25c4eee91089caeb852ab7833c82e5c575e0a255cc1e47d522f4216633a21903083ea5e35458a6cb3f6c46ba664dac06457359eee4c1 SHA512 7f0cd697428f15f2e7443e72f1698b4e7c852d0b62d4f2a2416629d93758132a3b85f35ac1e9daa397a783683ff619dddcdb495c4f2aba1313c94f1e5f40a2f6
diff --git a/dev-perl/Class-Unload/Class-Unload-0.110.0-r1.ebuild b/dev-perl/Class-Unload/Class-Unload-0.110.0-r1.ebuild
new file mode 100644
index 000000000000..66d42f25aa66
--- /dev/null
+++ b/dev-perl/Class-Unload/Class-Unload-0.110.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ILMARI
+DIST_VERSION=0.11
+inherit perl-module
+
+DESCRIPTION="Unload a class"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Class-Inspector
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.880
+		dev-perl/Test-Requires
+	)
+"
+
+src_test() {
+	local i;
+	elog "Install the following optional dependencies for comprehensive tests:"
+	i="$(if has_version 'dev-perl/Moose'; then echo '[I]'; else echo '[ ]'; fi)"
+	elog " $i dev-perl/Moose"
+	elog "     - Test unloadability of Moose Classes and Meta-Classes";
+	elog
+	perl_rm_files t/author-{eol,no-tabs}.t t/author-pod-{coverage,syntax}.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Class-Unload/Class-Unload-0.110.0.ebuild b/dev-perl/Class-Unload/Class-Unload-0.110.0.ebuild
deleted file mode 100644
index 3cfde6678ec5..000000000000
--- a/dev-perl/Class-Unload/Class-Unload-0.110.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ILMARI
-DIST_VERSION=0.11
-inherit perl-module
-
-DESCRIPTION="Unload a class"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-perl/Class-Inspector"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.880
-		dev-perl/Test-Requires
-	)
-"
-src_test() {
-	local i;
-	elog "Install the following optional dependencies for comprehensive tests:"
-	i="$(if has_version 'dev-perl/Moose'; then echo '[I]'; else echo '[ ]'; fi)"
-	elog " $i dev-perl/Moose"
-	elog "     - Test unloadability of Moose Classes and Meta-Classes";
-	elog
-	perl_rm_files t/author-{eol,no-tabs}.t t/author-pod-{coverage,syntax}.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Class-Unload/Manifest b/dev-perl/Class-Unload/Manifest
index 1fd2b728bf34..a61356934955 100644
--- a/dev-perl/Class-Unload/Manifest
+++ b/dev-perl/Class-Unload/Manifest
@@ -1,3 +1,3 @@
 DIST Class-Unload-0.11.tar.gz 11607 BLAKE2B c2cad8f6440d078deed31c5baf66f65a544dba90406baa64dd6afcc4dd9c0b2d3f05ab1ea916ce376991590739ef1d5aee57bbd776ded757ef0a69021dc42e81 SHA512 464e5c82578bf43ac97a9c434bb1b4889a7b2d5e97d51b5f6965c3de44d81016177d2b1596a93d09bfac38266ffff7bd668b1f15d11444c692530894df9348e8
-EBUILD Class-Unload-0.110.0.ebuild 811 BLAKE2B 072f7c645ecbdd80d91d393d4ed19981da68b9ddbfc9ef0d7ad844f5fcf9a575c84e5cd55a016c3923635c8e3d1c0c5ea975a692d5e5fef09cd2aca7e9b22bec SHA512 8e32f08aea763ac87d2c33481eebdef246373202f4de8f047046e0b38be4e42eb4d0369016adcc0c649f92b11bdb2e47596c0d6a1d652cfc8d41f22557441471
+EBUILD Class-Unload-0.110.0-r1.ebuild 777 BLAKE2B ffe199d465a77fad6bfdf27d725b2606231dadff7dbebfc40ac07c6410b4170533c6a2a2bdd6db4819ae25ad04e7b80cac38a844c143150328f654a6ca58d074 SHA512 f958a95206e32edd5c1a976173c2601d188da8ca2839b4954ad57b9df5adcc63b6804b4fb70b13243653b030d0501e364b3de86552bf72e93282ecdee6b85f10
 MISC metadata.xml 397 BLAKE2B 34dcca57847cbef2c34a801b39305fc626c7e8428d55ab1315ee7dfc5ab352d4e34778b73cc91040224bf226fa91f1683a38747081889560922b3bbb7bae04cf SHA512 809207e8357f29fa708e4513c5e8b62bc50d504f3be1bc404326b8773f44d58be7a3e573ec3755d3c72421d9b3e675eea5a4c4a3d90414d9cf8869296f06650f
diff --git a/dev-perl/Class-Virtual/Class-Virtual-0.80.0-r1.ebuild b/dev-perl/Class-Virtual/Class-Virtual-0.80.0-r1.ebuild
new file mode 100644
index 000000000000..6af1922f4362
--- /dev/null
+++ b/dev-perl/Class-Virtual/Class-Virtual-0.80.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MSCHWERN
+DIST_VERSION=0.08
+inherit perl-module
+
+DESCRIPTION="Base class for virtual base classes"
+
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc sparc x86 ~x86-solaris"
+
+RDEPEND="
+	>=dev-perl/Class-Data-Inheritable-0.20.0
+	>=dev-perl/Carp-Assert-0.100.0
+	>=dev-perl/Class-ISA-0.310.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/Class-Virtual/Class-Virtual-0.80.0.ebuild b/dev-perl/Class-Virtual/Class-Virtual-0.80.0.ebuild
deleted file mode 100644
index 6931a79da3e4..000000000000
--- a/dev-perl/Class-Virtual/Class-Virtual-0.80.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MSCHWERN
-DIST_VERSION=0.08
-inherit perl-module
-
-DESCRIPTION="Base class for virtual base classes"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86 ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-perl/Class-Data-Inheritable-0.20.0
-	>=dev-perl/Carp-Assert-0.100.0
-	>=dev-perl/Class-ISA-0.31"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
diff --git a/dev-perl/Class-Virtual/Manifest b/dev-perl/Class-Virtual/Manifest
index 3a66fa987705..a3638e3726dc 100644
--- a/dev-perl/Class-Virtual/Manifest
+++ b/dev-perl/Class-Virtual/Manifest
@@ -1,3 +1,3 @@
 DIST Class-Virtual-0.08.tar.gz 6864 BLAKE2B 7b74d55a38bf1122f336d3a32d352ba04d24552f0b9fd58f0537edd895b2bc6c39fbec45dda96f87084907a5cf3e5502f6d509a90a3939ab39f4f546ed7368ec SHA512 43a95d1339724b9b6392ab7c13eba502938cfee9ad29eaeaae0dc84549f29ecc700af38a7f04bbd357fc76c30b878532c919edc69bc986d791556eea46ef4439
-EBUILD Class-Virtual-0.80.0.ebuild 524 BLAKE2B df1ab2a8b60e5b6edaed6bae7172ff7a06fb4d8f0bf2042b9fb2fbeb30e8e1622aa5e2267280473033f711b6ef70d5d5c04bccd286f6c54f2470470bab77e741 SHA512 28739fa7be1fa7401b56c6673c78e958735674c7c9997765d23aae72c5739e84e24a92d5b9fef80cb986bbe89419aee0e6c5d82eec8d92750839d0f9b07a339a
+EBUILD Class-Virtual-0.80.0-r1.ebuild 492 BLAKE2B 2e266dceb8de45fe4496714bfb00f4050718c6207192a1573f2861d5e0008deac0141a5cae5d79275ec32d2914596b441631d4d44aaa96d47644656766ecf4c9 SHA512 f64fcf4bd5b5810ceca4c068cb9bda64174505b336f940cc9d4670c0d12c0ec9ca8e42429cef70d49477e0e08f0783eecc12c0952862ac0c3d6225ccfb27afad
 MISC metadata.xml 472 BLAKE2B 0e90132c5d5dc45c66ebdee4a6cee55cf8f62f965747e51e4245a74ad6f622fdd15bb541045336da664bd622dd8cf8fb1f308055e2c50550c98b3ac49b3f95ca SHA512 0b2b79a757b2b91d1f9bf9d342b69816bffc7682acfa9eade5f9c9c9b2c0e9495daf03233718a50133b1b3e8ac7faedb6ac1a6a3b802d709bc2370c7160b876f
diff --git a/dev-perl/Clipboard/Clipboard-0.260.0.ebuild b/dev-perl/Clipboard/Clipboard-0.260.0.ebuild
deleted file mode 100644
index bda71bb30a31..000000000000
--- a/dev-perl/Clipboard/Clipboard-0.260.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=SHLOMIF
-DIST_VERSION=0.26
-inherit perl-module virtualx
-
-DESCRIPTION="Copy and paste with any OS"
-
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/CGI
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	dev-perl/URI
-	x11-misc/xclip
-"
-DEPEND="
-	dev-perl/Module-Build
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-perl/Module-Build-0.280.0
-	test? (
-		>=virtual/perl-Test-Simple-0.880.0
-	)
-"
-src_test() {
-	virtx perl-module_src_test
-}
diff --git a/dev-perl/Clipboard/Manifest b/dev-perl/Clipboard/Manifest
index 7db8cf49e8ca..a48d854c26d2 100644
--- a/dev-perl/Clipboard/Manifest
+++ b/dev-perl/Clipboard/Manifest
@@ -1,5 +1,3 @@
-DIST Clipboard-0.26.tar.gz 25159 BLAKE2B d4bb2c311afabf5e6e751b144d71f269aebdc743cab31b1064e1f77f563e109ee1a196ec0a483aa362d39e1549cc02ebfa01b82172dcd10a3a173278fa64ece3 SHA512 68427934e4c460492f0fca1ea45891070e6aa544b49896d383786918055889ab179bc9d926018f85d6f77e89f7882098750d55b8dc656047bc63ec07d1c515c1
 DIST Clipboard-0.28.tar.gz 26673 BLAKE2B d0fa906f3761407513214cc7fe49b6f14c31d078cb15a58a5f515823c2216a89dfaff02dde58853f4e236302d635a97ecbf4050c2474a6dc33dbc8f5cfd83349 SHA512 154aad47e03cce2609a6fb615fd95ca283d18b7c8f6af2219f662946d13b7554088c585b8160ae35f96137a411236fcd81a89dc4388ab03da4318d0cc7767c32
-EBUILD Clipboard-0.260.0.ebuild 594 BLAKE2B 909c92c47a073addcb0eef6120bcddb325628be58842050b95e33f598cd9bd9a2d1c349a02bcf1102eca04c598ce16554a3dbeae04fc77298e68318c8a399615 SHA512 f577af1316545fd56d36b3bf44021b75c491fc994ca4b80c85c4f36dba8c9eb3e77864964d9fc62f849b052db00c98f02d0ad89e98c499dbdc35d3cd47f3b54c
 EBUILD Clipboard-0.280.0.ebuild 594 BLAKE2B c541490059c8745d5a8f4f6a937fd1bc77e385802e2ead18a628fefce958b53fbd6dcfe615c5304097ae59e7dfeab5b6c1ba37a8586d843c9f32d33bf510966f SHA512 e64d066237b1628e3a058198178816418ab97e9bc794378fb596619c477d02199cc4f22880057819bec1306e2f59b7015c20a33476a01cff88acf36086b56f18
 MISC metadata.xml 587 BLAKE2B 5bf4d6ed56d7f53b5bcd6905610afb084ca3949a7f428f7f7376c1b0a65db9151a89b7651263032a25596de2fbbf9e9a00d67ee0963b77d764753593eb38c0a6 SHA512 e24ab1972f0896d8fa3ffa91b06422e43a0d57e56ab72417c8d379ae60fd49cbd9cb5d94a7376d0711eb882251ba61f147df0576f60584125075a5ada9547089
diff --git a/dev-perl/Clone-Choose/Clone-Choose-0.10.0.ebuild b/dev-perl/Clone-Choose/Clone-Choose-0.10.0.ebuild
index 493c37ae98f7..9d374f6a6fc5 100644
--- a/dev-perl/Clone-Choose/Clone-Choose-0.10.0.ebuild
+++ b/dev-perl/Clone-Choose/Clone-Choose-0.10.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Choose appropriate clone utility"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Clone-Choose/Manifest b/dev-perl/Clone-Choose/Manifest
index ff5540bd1dba..92b77d1d3fab 100644
--- a/dev-perl/Clone-Choose/Manifest
+++ b/dev-perl/Clone-Choose/Manifest
@@ -1,3 +1,3 @@
 DIST Clone-Choose-0.010.tar.gz 10828 BLAKE2B 0a07211af1f1be7370520eb55f0bb663fa4c02642cbbcc20643137e719eade61e59548119cd79fc1442c85cad07840bbf08eb782a0b2ca433dff4f0bfdd0d327 SHA512 5dbcd1b031ddbdaff81c46c5a48eb51b31bfe451e0777dc88a107d2b104e8708f08a5717a0f82f4d03efb8610e2b42fcb2dc1269e3262ece16b9a503d606face
-EBUILD Clone-Choose-0.10.0.ebuild 535 BLAKE2B 4890c6b1f7e7cab4a3777d22a94598bf7c81eb50ba18ed8d699dcf9e438196b16ae59581ac8eef5631df6ef6de49524a2cfea4d0104668adaa45bee8bee6bcb7 SHA512 91b8c7f7be7585e1d087a7189b4bbc889d4d9f2162857bbfaeb5ce935beb4b0d340094fd635d8cdaaa2eacc4a839f0bdc1c8c1ff1f7f8f791451a24931c0f389
+EBUILD Clone-Choose-0.10.0.ebuild 532 BLAKE2B 655f9cb8ea6ef49b01dda099dcb5949135e746e74c8dfc97ec0f9d3d43ff47ab3623dc5a8a99c5b5b51e0e24e76401a32f6c0f1b96082d72e89f620602e4102e SHA512 9b91eedf411d1e20ea4904b7874b28cbbb8981cc26c22702dfec8a5ab9b5085cf5fe4d490123ee0d1998e576449c3515d685a70c6a0e9597fff35221c8b31ced
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/Clone-PP/Clone-PP-1.70.0.ebuild b/dev-perl/Clone-PP/Clone-PP-1.70.0.ebuild
deleted file mode 100644
index 9c3c9dbd96ff..000000000000
--- a/dev-perl/Clone-PP/Clone-PP-1.70.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=NEILB
-DIST_VERSION=1.07
-inherit perl-module
-
-DESCRIPTION="Recursively copy Perl datatypes"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND="
-	virtual/perl-Exporter
-"
-BDEPEND="
-	${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Carp
-		virtual/perl-Data-Dumper
-	)
-"
diff --git a/dev-perl/Clone-PP/Clone-PP-1.80.0.ebuild b/dev-perl/Clone-PP/Clone-PP-1.80.0.ebuild
index 7c06c5901ad5..87fd92e1565b 100644
--- a/dev-perl/Clone-PP/Clone-PP-1.80.0.ebuild
+++ b/dev-perl/Clone-PP/Clone-PP-1.80.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Recursively copy Perl datatypes"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Clone-PP/Manifest b/dev-perl/Clone-PP/Manifest
index aa6e3c0f0ba8..3117945c3169 100644
--- a/dev-perl/Clone-PP/Manifest
+++ b/dev-perl/Clone-PP/Manifest
@@ -1,5 +1,3 @@
-DIST Clone-PP-1.07.tar.gz 9508 BLAKE2B 864239679a7af4362a01b3f250e073daf3751c07de8768793a3d5c0517a4035216eccc69d76b25ec1669b71a799196129f459ff18bd7232922ff8fa23de6e46b SHA512 28faae5dc42ff5ae850fe9f664dca8b52ff77823c5f157c62c52254fa4f1e217d3344f6e79a2ddad169f934e7be262dc79f32e885cb1d25db182050800ac805a
 DIST Clone-PP-1.08.tar.gz 9527 BLAKE2B ff93f777bc235146ce137c470931ee30422d72a45154bec22b3ef7d377d6f3ddc5af39feba41d89a76ff52ff9f8e5c0c5c0efc9d620d80e4d77392b9aa130b97 SHA512 912898b0617597429a08a6b2717aec75ee9c3f41e2c05512f434a9cb82dad3274b4dbbc4332725248d7c6071eec670e6977c05994cef090df6f591cdfe2f606c
-EBUILD Clone-PP-1.70.0.ebuild 433 BLAKE2B da280e1fff380e39e31ebf163185abeef26ae9f4ab4e6e752ea148dec926ad0b9ea4e9191de02839ee2c68620bfbed6828ef410bcc13db8f682c7a43c3191780 SHA512 bcf0e99fd91c7125a711554fd88fd19f21a1f11479ed828877ca923aae4ab1b9e27eb33560671010edf3b0ad2370c8f6b5db49ba46cc022bfabb51d4d6627080
-EBUILD Clone-PP-1.80.0.ebuild 453 BLAKE2B 573efe8714e87141efa65119b8f951cc0828279db9b7fc4d1bc30967a6db36d76e964c2474babbd7a7b891e3784e4e162a91b75d4677057dea259cf2083674d4 SHA512 ef3d7f33da850e0433c147ce66ea477072d8e47bfca4fde523cb3d420c3ec9721993fce631b8e0cc659a7c196692d4a91f67eb152722a5b37deab9dc59f99965
+EBUILD Clone-PP-1.80.0.ebuild 450 BLAKE2B a1bda509e5db6f1f407c64b91516fc512949da145aca0b64a9a8be73452096d45417c034af05d077d35118ee2ca6841b1d60003de83498dab6ce547a5460eaa5 SHA512 a3080ea59a735acc8ef6d3d1efcb6c4f2968aa41eaffa95339298db0d9a3081aed8ef4e751fce7c81f9bf78523786e322cfacfbb03896aea3b01355cc7548ae4
 MISC metadata.xml 520 BLAKE2B 0b35f34445d809e30bfb055f78c119be29d077ec400a3f26f0005bea8901418031dd6990aa0494d3e86269f2809e1be6e3d79fad9e9b2283d4b365a3b8293be3 SHA512 87d81349a4b74f3f4943cb438e4924db86a061f03dea0233856a91aaf467183c7a606ad2a6bf57bd920236006c7acfe622f47a1c875679025a7df50e2644d27f
diff --git a/dev-perl/Clone/Clone-0.390.0.ebuild b/dev-perl/Clone/Clone-0.390.0.ebuild
deleted file mode 100644
index c62b9e01ec49..000000000000
--- a/dev-perl/Clone/Clone-0.390.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=GARU
-DIST_VERSION=0.39
-inherit perl-module
-
-DESCRIPTION="Recursively copy Perl datatypes"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-mymake='OPTIMIZE=${CFLAGS}'
diff --git a/dev-perl/Clone/Manifest b/dev-perl/Clone/Manifest
index cccc3b29648a..20a826ea5dbb 100644
--- a/dev-perl/Clone/Manifest
+++ b/dev-perl/Clone/Manifest
@@ -1,5 +1,3 @@
-DIST Clone-0.39.tar.gz 13785 BLAKE2B d3a1434a922f602110156e1eceb51709d8c41a292e69e9822f508d99c8868e617f46e71b3c640f15fd994700cbc8187e3dabdd43d1dfc1a7d2f19c8608f40e4a SHA512 5e3feeff7646fb2ea075267962f7f7013186310974cdbb87f779ece0f56baf62e7dbb0afa94816e20675dc03bc5fbe271b9594e12ea441863b78860691822b6b
 DIST Clone-0.45.tar.gz 16130 BLAKE2B 92c4dd90e26b14754a77452c9e185094cb4604aecd06261783dc3d805e75a3d8e0a93492002c1e771b0e562b06a942d987e6bf3f2cf9e2450d5749146b98cb1b SHA512 4d91580fb60876cca7670411748e42e6af0eaba8fac25d60e7a50685ae7b1e697e12c8a2835693e3e4abf3c13c060a2740344eb804ec26ed274b895f599340af
-EBUILD Clone-0.390.0.ebuild 570 BLAKE2B 05a2cd10a026565e11f515ac7714a61f7025aa86d271d624f5f705fd7bcf160e9492067511bf023f5f5e1aa5ab295f3e970a5a73c9fae8a75bc827b81af783b2 SHA512 08deac4a384583ad9cf6cc9ff98ce870776563de98281f173156a3b7d5073a8fcc98a91fee31bdb7eb7ae60ec8e275ab046394595b29fc996f55facd0e0d78ed
 EBUILD Clone-0.450.0.ebuild 546 BLAKE2B 0f7a41ea960f288bfa79381d1e03fa4ac85016b2a200d63ed00e7d122ed08ab303a041ce85d288fe145358cff1bae5c80c00db469a319647aac95c982e23a11e SHA512 87941e5a3821cc55517a8d455c90c36466461dd5aff5be8cf203441c1e44f66810282e291c6bd4ddec009c29d640e7732693e3e8fcc9abcbc72c4153ea189d3d
 MISC metadata.xml 382 BLAKE2B e8f888580c6c1afad098b58d27be33fc986db7bd569c02fd7aa29f2f53f49892da26f96aca64868129bcb09ead4793485bf37b85adf70360be90fc237d61e617 SHA512 5c4a5b8c826069ffbdb6d357bda3446c132a1e1d5d9a658ef88c838d946cbe5bfc45f443b16225b706c6b916f21bdede2ed3c1840055c3c65d99faeb4759eac5
diff --git a/dev-perl/Color-Calc/Color-Calc-1.74.0-r1.ebuild b/dev-perl/Color-Calc/Color-Calc-1.74.0-r1.ebuild
new file mode 100644
index 000000000000..6e5cb94b1bf6
--- /dev/null
+++ b/dev-perl/Color-Calc/Color-Calc-1.74.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CFAERBER
+DIST_VERSION=1.074
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Simple calculations with RGB colors"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+RDEPEND="
+	>=dev-perl/Graphics-ColorNames-2.100.0
+	dev-perl/Graphics-ColorNames-HTML
+	>=dev-perl/Graphics-ColorNames-WWW-0.10.0
+	!minimal? ( >=dev-perl/Graphics-ColorObject-0.5.0 )
+	>=dev-perl/Params-Validate-0.750.0
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.420.0
+	test? (
+		virtual/perl-Test-Simple
+		dev-perl/Test-NoWarnings
+	)
+"
+
+PERL_RM_FILES=( t/10pod.t t/11pod_cover.t )
diff --git a/dev-perl/Color-Calc/Manifest b/dev-perl/Color-Calc/Manifest
index e0b93bdc5f5f..1b9938204f9f 100644
--- a/dev-perl/Color-Calc/Manifest
+++ b/dev-perl/Color-Calc/Manifest
@@ -1,3 +1,4 @@
 DIST Color-Calc-1.074.tar.gz 27254 BLAKE2B 13b01c88a2c595834ffa1b73b165c4cc44197b39501d7a5fa114ad634805f8ed3d24dfe44ffaa9481ae540ccefef1d66bcc22257c237a87b048f897b06f7e3e8 SHA512 9902ada0599f4d1a499226398943e460a5ed470d2c5d4d1992036c186a6962d6b9ea35a436541339717e613fb249b7d43de81a6dfc1ba237fcf9350782aab3ac
+EBUILD Color-Calc-1.74.0-r1.ebuild 681 BLAKE2B dce89d32272f5a815f9d8fde4ebb9edd702df0f5ccb12871819ec3a77b27204879a17c4765f2f5bf473a2e2b3e50605544329d97fac11e38aa237cc2f5be9803 SHA512 d8c2b638860f093ad9bd0bb3c102aa3ca2d4452017d1a0282b5fb9f33264e7bdb92b938ee72adb862638b41bcdeccb126939b42137b32aaf71c68cb3f92ce6be
 EBUILD Color-Calc-1.74.0.ebuild 706 BLAKE2B 4050fdc75200d1edc865edb25d0ab28ff50b7a5fc790d87cb8248cd82ac796f06f1bbba10e0e7f01009a81937c44a8b207572e16095684707e686fe1f9df8664 SHA512 e6ddb4c3495d2c591e6c41a5c777e67f15c3e2e292d0939634d6b322e81ab9960debcce3f2b46bbf0fedfe53fe90bb2c5ea585fc02fa8f61a4b584507a45afda
 MISC metadata.xml 456 BLAKE2B 8b5165ef36ac08591087934b4ed15ffeec95e3e45d02c80ee224053d7f2a3bb1e6559714d4425c27ebbd27816f5cf1b9627ece590efd3290a7f5decb02cf9bc1 SHA512 650016717cd5cfccafe7756cce6cd0b961dc5cda839cc7a2c0506b54e3eefbfe2545bb61b99abc4b31d53b8f0984a22586528d1db4dbd9c4b20ab238d3bb5ed9
diff --git a/dev-perl/Color-Library/Color-Library-0.21.0-r1.ebuild b/dev-perl/Color-Library/Color-Library-0.21.0-r1.ebuild
deleted file mode 100644
index 4402024f7ee9..000000000000
--- a/dev-perl/Color-Library/Color-Library-0.21.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=ROKR
-MODULE_VERSION=0.021
-inherit perl-module
-
-DESCRIPTION="An easy-to-use and comprehensive named-color library"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Module-Pluggable
-	dev-perl/Class-Accessor
-	dev-perl/Class-Data-Inheritable
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/Test-Most
-	)
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/Color-Library/Manifest b/dev-perl/Color-Library/Manifest
index 7fefe54b4413..fbafc2c128d7 100644
--- a/dev-perl/Color-Library/Manifest
+++ b/dev-perl/Color-Library/Manifest
@@ -1,4 +1,3 @@
 DIST Color-Library-0.021.tar.gz 343300 BLAKE2B f0debb8be5ef66111f24494509d75823faecad64f976cd229d8efc0212131b557b32a50fc85dd4c6c4e56efe3385af3fd59af92999b84923ba8bc72bef4719ea SHA512 2338ad5a4e313d0f47604678a511845be1d02ed62804109d7338cae0831130751933a4b0f6c0056e684da926e135542292a10cedd6b3d5cee6b3110bbb98cef8
-EBUILD Color-Library-0.21.0-r1.ebuild 582 BLAKE2B 638516de6f622a08c22eee375683dacc74d369d4b8d6c6a3a200948ef668c7271a50173e8a523b4d55229f91ca656f074336116fe2effd8fbd60c7a44d946cf1 SHA512 be0a616718cf7fdad9698611cecc1d9306490577003a447f57b7cf8a75b24e4568c2030e8e601d45bc8a57aa452e4634b1814dd61372e8eda3d21d9b6fd54ec8
 EBUILD Color-Library-0.21.0-r2.ebuild 607 BLAKE2B bb0caaf29cb2887d81a8b891e82061c99ca3358725507ab9424b6ed96a084d7339f5a4ffd0bfa0ad1decdd48c022733ec9422080d0d284aa442f448be70593b5 SHA512 4163bccd7e1570d98dccb0e8534d0cde3e3f0dbbca0d9c24092c55968000fd5c1dcb307207804ae38b0b6fa0f1458c1fcfa9f3194553ad8c4248c3d0c76dd2a3
 MISC metadata.xml 2369 BLAKE2B ad15e97c7a7bc324b68e8836a8e7a9dc8ed4eb6ea9d1604368e99c2bae6133c4b875b3ef98ba300c90ecdfd22795436482496697d3393c005a122dd270093d2b SHA512 20712f191c7f0d20c8f3fbd47976b409727739b09e863069a7b6dfb7872b4288ad62cb9ba7f3b22b6697b14b935cca88ebd5ae360bf1d1667c6c4eae6ce4f2cc
diff --git a/dev-perl/Compress-Bzip2/Compress-Bzip2-2.260.0.ebuild b/dev-perl/Compress-Bzip2/Compress-Bzip2-2.260.0.ebuild
deleted file mode 100644
index 57b504b3a136..000000000000
--- a/dev-perl/Compress-Bzip2/Compress-Bzip2-2.260.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_VERSION=2.26
-DIST_AUTHOR=RURBAN
-inherit perl-module
-
-DESCRIPTION="Interface to Bzip2 compression library"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~mips sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/bzip2
-	virtual/perl-Carp
-	virtual/perl-File-Spec
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-
-src_test() {
-	perl_rm_files t/900_*.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Compress-Bzip2/Manifest b/dev-perl/Compress-Bzip2/Manifest
index 9f1756f98f39..d062b21e3f6a 100644
--- a/dev-perl/Compress-Bzip2/Manifest
+++ b/dev-perl/Compress-Bzip2/Manifest
@@ -1,5 +1,3 @@
-DIST Compress-Bzip2-2.26.tar.gz 886999 BLAKE2B b7107d522c172958f9cf137b2fa5ba7a88da8114b467eb20eb7da5d67f09d86105277ad4711cff0cfc3478518557fb37cbc8a1b80d1f37070d51e69b93747f3b SHA512 be1670303496a9f48989777468234d52276b34e6c0fdb6e99d2199134f353f1ee32e0489a3797ab3a2d4777bb5f03f78dff39f3bf75b8cc511b754da2b7e4959
 DIST Compress-Bzip2-2.28.tar.gz 895637 BLAKE2B 06fdbf3460fbd1b7f2f915095d9100ee69e3012d0cb0eecd63c7eeef67dcf1cf9f043e7c448688c9d5394efb195218d26efede48a15735000e1c44ee226eb47c SHA512 3b00eab4cec4ec62c2b590dc63e92b4f167407edcee3bdb6581d570bc82c47b6152eb0f21a8b748ac49e87c89a1b99358785609e8f832da16107b6cdc4d9e852
-EBUILD Compress-Bzip2-2.260.0.ebuild 641 BLAKE2B d173aa5b333c95f1e42cda8c97cf533b83b7766656b83866d28f5fe55ab1673859b6ba1d00d2367fcbdc04ab2ecc198c4d349c13e62f8fcc78ac143e48678f41 SHA512 1cfed79d9fc994ca0c3b7de72a3676e49f215db921999525360d15b412db3e0fbfdfaa89a6e11f33ef189e8702ae3b490bf67d3ce09d40c1f32ec01a5b4c593a
 EBUILD Compress-Bzip2-2.280.0.ebuild 893 BLAKE2B 78094a6e2ecad073cbf2d0ca838bd7111085d750189f38bd581acb323ef230cb392bee580b95d2d96082131fafbaf30ccbe3ae66e33a75b48182f7b2ae7bb877 SHA512 35b80cbc0bc9affef652f9ee2fcf8de880f46bc129efaab23f09ffd6823fe493545a93e7f8744ac0823095d3065d07992640942dbbbef50b0ffe7cec81e02a82
 MISC metadata.xml 401 BLAKE2B e3b337e9ea0257095c02293acea4bab8faaf1326ab47ea848ae3530e7023bcec5ace8a109911267451dabecfd2a087bc1058dac09d7262a2ffef841cee7f081c SHA512 dea339f65bfab5fe34d197e7c881091349741d853fe34cf996aa05a1731437ba5c242153b5ffa2b7873cb75b384a5dccad66cff0853b8139737a4f7d31cac1b7
diff --git a/dev-perl/Config-Any/Config-Any-0.320.0-r1.ebuild b/dev-perl/Config-Any/Config-Any-0.320.0-r1.ebuild
new file mode 100644
index 000000000000..35d6d10dc9a0
--- /dev/null
+++ b/dev-perl/Config-Any/Config-Any-0.320.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=HAARG
+DIST_VERSION=0.32
+inherit perl-module
+
+DESCRIPTION="Load configuration from different file formats, transparently"
+
+SLOT="0"
+KEYWORDS="amd64 arm ppc x86"
+IUSE="test +conf +ini +json +xml +yaml"
+
+RDEPEND="
+	>=dev-perl/Module-Pluggable-3.600.0
+	conf? (
+		>=dev-perl/Config-General-2.470.0
+	)
+	!conf? (
+		!<dev-perl/config-general-2.470.0
+		!<dev-perl/Config-General-2.470.0
+	)
+	ini? (
+		dev-perl/Config-Tiny
+	)
+	json? (
+		|| (
+			dev-perl/Cpanel-JSON-XS
+			dev-perl/JSON-MaybeXS
+			dev-perl/JSON-XS
+			>=virtual/perl-JSON-PP-2
+			dev-perl/JSON
+		)
+	)
+	xml? (
+		dev-perl/XML-NamespaceSupport
+		dev-perl/XML-Simple
+	)
+	yaml? (
+		|| (
+			dev-perl/YAML-LibYAML
+			>=dev-perl/YAML-Syck-0.700.0
+			dev-perl/YAML
+		)
+	)
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Config-Any/Config-Any-0.320.0.ebuild b/dev-perl/Config-Any/Config-Any-0.320.0.ebuild
deleted file mode 100644
index aabb9283596e..000000000000
--- a/dev-perl/Config-Any/Config-Any-0.320.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=HAARG
-DIST_VERSION=0.32
-inherit perl-module
-
-DESCRIPTION="Load configuration from different file formats, transparently"
-
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86"
-IUSE="test +conf +ini +json +xml +yaml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Module-Pluggable-3.600.0
-	conf? (
-		>=dev-perl/Config-General-2.470.0
-	)
-	!conf? (
-		!<dev-perl/config-general-2.470.0
-		!<dev-perl/Config-General-2.470.0
-	)
-	ini? (
-		dev-perl/Config-Tiny
-	)
-	json? (
-		|| (
-			dev-perl/Cpanel-JSON-XS
-			dev-perl/JSON-MaybeXS
-			dev-perl/JSON-XS
-			>=virtual/perl-JSON-PP-2
-			dev-perl/JSON
-		)
-	)
-	xml? (
-		dev-perl/XML-NamespaceSupport
-		dev-perl/XML-Simple
-	)
-	yaml? (
-		|| (
-			dev-perl/YAML-LibYAML
-			>=dev-perl/YAML-Syck-0.700.0
-			dev-perl/YAML
-		)
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Config-Any/Manifest b/dev-perl/Config-Any/Manifest
index e7e6766e92b2..5a46242897f4 100644
--- a/dev-perl/Config-Any/Manifest
+++ b/dev-perl/Config-Any/Manifest
@@ -1,3 +1,3 @@
 DIST Config-Any-0.32.tar.gz 21045 BLAKE2B d3eb7df6ea972bdad2ff416adb3f6744ab972520bcef0b116bd29249416bd4184935d92752f4b1aec371656462db08e87ba9de78f7cf36c53d9425673f083ad0 SHA512 7c6fa9f341b1392ffd71babca688e3fb8bcd5f6330fe15aefb36ac002af83ed3674667dcddd9a500404bc4e019609f392c173653a8a792267fdb609e9323116c
-EBUILD Config-Any-0.320.0.ebuild 964 BLAKE2B 10a49e50ab1321e4198a9afec3b5700aee593136e3fa2a33a881af5f8a1a973e9951671e6c744b808b90e48296de9e6d247651ac6912b355a209c56835eff61d SHA512 8d43b6f047ba9f3397bf0942f0b4ec5bbd4f51165c416882f052f5c3debf6203a4db27ba1599d1bdb2cb403a05e22bfdb24353890947363618e5d47147f8a27d
+EBUILD Config-Any-0.320.0-r1.ebuild 938 BLAKE2B 0a4c69d68a6e8f6190be8f6ff1b1fff547e4f5a2947a5d37ce7805e6de0d7fe9438fe5a679a735c12a6aa483a2125aad158e34cf6cc91b4912f591b9d154fc58 SHA512 35aa80a2776f9ea6c5def65c458c54a89d45fd6840d86441802cf6913a457fac5793fceb136f87b87641ca7a942e882f4430f267d03d9aeaed632e478fe9613b
 MISC metadata.xml 1350 BLAKE2B 936cabefd1039102dd94d4f3422489caa3acb4946d716abae7a71a9bb6fa6c640c384284e99293a047fb1cffdf32b2cfa8f2967e0de2f096c4a00bde00b2b69b SHA512 b40991abcff1904781284cb0a348341c2bdc21763ee1cd3eb6efa289e9925d11589de09973668c4f00998bd446c997a3f8d52dcf3e2fdc16e7ad532ed57f1ba0
diff --git a/dev-perl/Config-ApacheFormat/Config-ApacheFormat-1.200.0-r1.ebuild b/dev-perl/Config-ApacheFormat/Config-ApacheFormat-1.200.0-r1.ebuild
deleted file mode 100644
index d02beb80feb0..000000000000
--- a/dev-perl/Config-ApacheFormat/Config-ApacheFormat-1.200.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SAMTREGAR
-MODULE_VERSION=1.2
-inherit perl-module
-
-DESCRIPTION="use Apache format config files"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="dev-perl/Class-MethodMaker
-		virtual/perl-Text-Balanced
-		virtual/perl-File-Spec"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Config-ApacheFormat/Manifest b/dev-perl/Config-ApacheFormat/Manifest
index 14d3a130bf79..0504fb840ed8 100644
--- a/dev-perl/Config-ApacheFormat/Manifest
+++ b/dev-perl/Config-ApacheFormat/Manifest
@@ -1,4 +1,3 @@
 DIST Config-ApacheFormat-1.2.tar.gz 56817 BLAKE2B afe86cf760842cf18a11794067aea3dba99816e6e40df3c92efd09bd50fb2937678747f340474171517d4cbfeb9361079bc8d0752ce07cdfdc6ed108b3d90346 SHA512 4e57d191692834128ce06510dbe9c94a9e2b5f45ef4d2177380b2800f5689c6178182e8843657f90a5374e348d2152856a305585ba8ec851eb9ae2d667b6b71d
-EBUILD Config-ApacheFormat-1.200.0-r1.ebuild 412 BLAKE2B da49c252e6e23e1e1ad05f7822b2cb875d6a455edb31832153608cfd5e0bfa8d6a16e3de03b824ee4263b9203dec7449bf9a53c53b0de63fbf68e8b18073dcb4 SHA512 5062c6192897a9cfadea03e706358e704d6f8bce46ace0ccea623d27779b1fbe2c671cc13ed07e8685b934638c0f5b93d03234b6a4d49281c7087759f62e7692
 EBUILD Config-ApacheFormat-1.200.0-r2.ebuild 483 BLAKE2B 5af3046e6a15016f63956e71b6df75ca7c911b96aeb197cea91893d6129ebf7baa0311f6233f73ef71ea9f0252af50eba6373347b6802ad3e0edce3f0452801e SHA512 bb1279826a76bd0b4b00a8da929d58fdbe2c2a38c422e8d97ed04ab3e1153dee342c6c41e9c3c5884a17113c836f3b401155b152d74bf125231458e01d629561
 MISC metadata.xml 411 BLAKE2B 33a48e7e8e38bd8925b0ee21548b7a1fdccc8ba20a413e13202857259a88b9e2fc1b6a37296c8c20f1810d55d6db976238fa265e58b2c0e0fba8beaebd3a75fe SHA512 88ac9b09ca2c25953b169d0042abbd44b6d4dc4c42b5e13cd7d639d8c782011e143c9a62df91d63fa46c7d395fc5f5781d7172c2b00ec235f8b1a26f9c6bc341
diff --git a/dev-perl/Config-AutoConf/Config-AutoConf-0.315.0.ebuild b/dev-perl/Config-AutoConf/Config-AutoConf-0.315.0.ebuild
deleted file mode 100644
index 5837f6a39579..000000000000
--- a/dev-perl/Config-AutoConf/Config-AutoConf-0.315.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR="REHSACK"
-DIST_VERSION=${PV%.0}
-
-inherit perl-module
-
-DESCRIPTION="A module to implement some of AutoConf macros in pure perl"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Capture-Tiny
-	virtual/perl-Carp
-	virtual/perl-Exporter
-	>=virtual/perl-ExtUtils-CBuilder-0.280.220
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	>=virtual/perl-Scalar-List-Utils-1.180.0
-	virtual/perl-Text-ParseWords
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.900.0 )
-"
diff --git a/dev-perl/Config-AutoConf/Config-AutoConf-0.320.0.ebuild b/dev-perl/Config-AutoConf/Config-AutoConf-0.320.0.ebuild
new file mode 100644
index 000000000000..ba7b9a11888f
--- /dev/null
+++ b/dev-perl/Config-AutoConf/Config-AutoConf-0.320.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=AMBS
+DIST_VERSION=0.320
+
+inherit perl-module
+
+DESCRIPTION="A module to implement some of AutoConf macros in pure perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-perl/Capture-Tiny
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	>=virtual/perl-ExtUtils-CBuilder-0.280.220
+	dev-perl/File-Slurper
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	>=virtual/perl-Scalar-List-Utils-1.180.0
+	virtual/perl-Text-ParseWords
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.900.0 )
+"
diff --git a/dev-perl/Config-AutoConf/Manifest b/dev-perl/Config-AutoConf/Manifest
index b90e9072cd5b..4dc132709963 100644
--- a/dev-perl/Config-AutoConf/Manifest
+++ b/dev-perl/Config-AutoConf/Manifest
@@ -1,5 +1,5 @@
-DIST Config-AutoConf-0.315.tar.gz 49738 BLAKE2B e1fe0be1c113a66583d4db40c81c74bd7f1884155c1f0da180546c2c26a2bb4b496ab4f8fce9f5a5cf4e22a15ace8fae8f2bf51e5a4cb662e8a58d5a9e83a808 SHA512 ab52d4d19ede25b1f7030b461b931f5cd5bc5f0af50a584a015b367ff2085b2e58826f079290a22194f50ef063c2ba8b469ced913e4c306f788ef28efa41f2e1
 DIST Config-AutoConf-0.319.tar.gz 52118 BLAKE2B 8c0596a22d7accab0366f33f4f72315356abb61ccc3c0c816651724fc21a091607c48b4bb69b5441771795c432376e0811ecaa799b3b7b38b05d6cbdae80c29c SHA512 156b40e9728f9b02530cb490b31a0d439414ab5c4b43a216f7f649c23f62462a441923dc02d22735fcd44a70a5314fc8e9465047261f0e61a2013c05ff69a3bd
-EBUILD Config-AutoConf-0.315.0.ebuild 676 BLAKE2B 9eb69c1d3712a637d67637c2bd13b2bc55a34d0f691e543553fd68b5a5125a32fbb58864411a85a9f535a8b0327f8a736648b39a47d328df4bc3039a7f0516bd SHA512 b4232d65d0d2c1715f6c704108f3db2e0201cecff3194b01f62d2e682cf65b294a9a10337ea9802677cfb5f7453bc49fb113cb15b1a0bcce63b7e0a77cdfe114
+DIST Config-AutoConf-0.320.tar.gz 52267 BLAKE2B 649ef56196a5984437f299f96b156f63560a247a35f0547145e3519648ba5fc86c057957570b45b696c2092a56deaf0595d9191b4fe389e0a0f183b79d6c500a SHA512 ea07e3d08af4c2b3e983f108bd7a0830731dc485f8af4b48f7064057097bfdad8e7c51640bdd634a276042f101c5fbd55e9c074fa5ed29aa4615786bbd3c3a99
 EBUILD Config-AutoConf-0.319.0.ebuild 740 BLAKE2B 14594b14ea2399f1333fdff68066f0a95db967d41649abf25a7bf3d4cf3e137aebba2e596564e3b5260316aa647bce774c1e27d43e71ab38a538ad65d7093594 SHA512 b0f300adc1dcba02196b4abc92c5db8009ae14ce3c96b450fde6850a354339c4aac6b0d8679819bfb8ec7db3cc74c8a31437d13ff7ca7eaa72b2462ac2543590
+EBUILD Config-AutoConf-0.320.0.ebuild 706 BLAKE2B 6fdda6799d5c2cf900775a4b51e24235fc3c3676b918be850ed4aba3e791b65d64ccff85eaf5bac89b21048199b6fe3bfe8549af1168a351cfc87912317a08f1 SHA512 ec15f2b082ee82c991d7a930b1002c294a9941dbf8bdecd37b3fa08e59533f6d0d943c655e19ced8e78260d01a6ffef45c680e2872338ea7476614d709615b31
 MISC metadata.xml 403 BLAKE2B 7a9adfd461b4a487d0ec31412b9e45b10eba50664930c21be146e3726c6005c52669a6ae06a02ad48f0bd164ff2b3d0082eccfcf8a54326bdbb4d47bb6f79607 SHA512 6f8661adddc2153a9c3b5efd73a460a735ed5d91d0379ef857bbeee384d396f92c093978f3c0b38b2505c831b05cf79cbd3cb3f181169235d0f520ecd58cf2ae
diff --git a/dev-perl/Config-Crontab/Config-Crontab-1.450.0-r1.ebuild b/dev-perl/Config-Crontab/Config-Crontab-1.450.0-r1.ebuild
new file mode 100644
index 000000000000..9d019b339cd6
--- /dev/null
+++ b/dev-perl/Config-Crontab/Config-Crontab-1.450.0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SCOTTW
+DIST_VERSION=1.45
+DIST_EXAMPLES=("example/*")
+inherit perl-module
+
+DESCRIPTION="Read/Write Vixie compatible crontab(5) files"
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="amd64 x86"
diff --git a/dev-perl/Config-Crontab/Config-Crontab-1.450.0.ebuild b/dev-perl/Config-Crontab/Config-Crontab-1.450.0.ebuild
deleted file mode 100644
index f403608b1591..000000000000
--- a/dev-perl/Config-Crontab/Config-Crontab-1.450.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SCOTTW
-DIST_VERSION=1.45
-DIST_EXAMPLES=("example/*")
-inherit perl-module
-
-DESCRIPTION="Read/Write Vixie compatible crontab(5) files"
-LICENSE="Artistic"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=""
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Config-Crontab/Manifest b/dev-perl/Config-Crontab/Manifest
index d7eb1f18f061..548f95874483 100644
--- a/dev-perl/Config-Crontab/Manifest
+++ b/dev-perl/Config-Crontab/Manifest
@@ -1,3 +1,3 @@
 DIST Config-Crontab-1.45.tar.gz 41420 BLAKE2B e59847017289ff8a3611f1c18a3a103a9305229d2224a0fe3612a4551b94d3a6eb38e5650786fea283e468a8b4a8ead780e4b839a76c602eae64c2222fb0a6cf SHA512 b4aa82341b113c698a8a5434ac406217877f27b5eb876d409a675daf8c9a5f5ed56cccac3a9e775437427691547b5c3b7829a5c35edee4c9fe33d9cace0879e9
-EBUILD Config-Crontab-1.450.0.ebuild 364 BLAKE2B 7f3441d348b5670f28964ee60596d76720fa6fa79a6f19c0890e63736f3a03fd8742d112793854fec89a534e0f83e9feeac32506370d3623cbb5f28dbc8ac46b SHA512 d74a532d162ec135ff062c47daba2d650fc7ec8d2f082a63924709d49a0c6056019d76e50e4a45a3cd83708273b7dd48a8e0106f623e7362565111069ccfce46
+EBUILD Config-Crontab-1.450.0-r1.ebuild 307 BLAKE2B a2ff864253962c1368e4fb27b3b96f4b9e2ce1ff4533595bafcaf9893f06eb2904da1b31fb37e480b2c5c9c4c385221230557ceefd465e896c2de7c1900e8d6b SHA512 46e7d46bd725f179b64ce371624d4e218b6cab74c8323bf218474db61fab37d595d40e3b8d412d0b245538e01f93f924e3c729afa5b2e2989ee08f60ad1d113f
 MISC metadata.xml 818 BLAKE2B 165251aeb4d41b2c2c7d064d589a1dc853d248c1eecc12ee0b0358fe77ec18fc6bddb927916bf6266c4f187e7a667588075e78eef8db5799fec08ad267a08c04 SHA512 7519125b629405c105af48a46ce05b4b7fab32ffc907f6f8bc3659f21ea02bdd111d30bb73c3f1ed40ea3c4f37794a8dc5e6ef9cea8ec257c511b494b261ad9b
diff --git a/dev-perl/Config-General/Config-General-2.630.0-r1.ebuild b/dev-perl/Config-General/Config-General-2.630.0-r1.ebuild
new file mode 100644
index 000000000000..6f03aa9777ba
--- /dev/null
+++ b/dev-perl/Config-General/Config-General-2.630.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TLINDEN
+DIST_VERSION=2.63
+DIST_EXAMPLES=("example.cfg")
+inherit perl-module
+
+DESCRIPTION="Config file parser module"
+
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	virtual/perl-File-Spec
+	virtual/perl-IO
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Config-General/Config-General-2.630.0.ebuild b/dev-perl/Config-General/Config-General-2.630.0.ebuild
deleted file mode 100644
index 4742f7633507..000000000000
--- a/dev-perl/Config-General/Config-General-2.630.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=TLINDEN
-DIST_VERSION=2.63
-DIST_EXAMPLES=("example.cfg")
-inherit perl-module
-
-DESCRIPTION="Config file parser module"
-
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	virtual/perl-File-Spec
-	virtual/perl-IO
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/Config-General/Manifest b/dev-perl/Config-General/Manifest
index b3a32f08bfe4..7b09019ae7fe 100644
--- a/dev-perl/Config-General/Manifest
+++ b/dev-perl/Config-General/Manifest
@@ -1,3 +1,3 @@
 DIST Config-General-2.63.tar.gz 64700 BLAKE2B 71217b5ffc163932804f329edc95204389964a7aa3e84cb6c1854c7559fbc4b8940bd6cc61c149a04f2db38d7c094017e98eadf48ec81b7b0f9f54b4a70615f6 SHA512 ba9fdbf992049936ea288a90d8f8360821fc96f8d42df0298888b25543d2ac43e2958c5f7a8bbbae7cad1e2151ea00528756a3bc0cfbe408e5ee82bf309615f3
-EBUILD Config-General-2.630.0.ebuild 513 BLAKE2B 617dbef9ae43b42453fa8611760d1221087ee6fb98a24ff81a2b0cd3aacb37eac19dca2c2e21ffca4bc753e2e79e51ad12e75c3596151144b721eaea37216350 SHA512 8bf7f0b2b6b1b9362e9407e8fcffa408d17e50960b27db40e39cca36e1173b134ad5d1af908e741a310874f3af6f19818b9abb5741b09aea9832e95cf1374223
+EBUILD Config-General-2.630.0-r1.ebuild 506 BLAKE2B 8ad9f3d5d0e0f5ac69ad544424e4bfba5a47da389d3d8d331042fc5e2844db405c9f752770c3a1a16b8cd8542b3a1f2001fc9ca02102dd45ef604f1e1361fbb5 SHA512 847375abdb13d9b31a52591758e4cc9a22e03927ee1adb454fa6572fd8a12d0450975854c6bfc44076605232a03cdec8e0ae6f68385bc25422fff24ce701b886
 MISC metadata.xml 549 BLAKE2B 2cffdf7472125211475fcaafb95f6359d2b0d553ab6c2c7a3977fc7abef579b70b215fc801607813b3dc3171b9ed96d0e3dfa4c2a45cb0c354b90c2e0df997a3 SHA512 0cc6e3177c4f26cadd75392e4bebd9a63080d47160f7e847979e79dbaa09f62898e245c7496f768a6c461d1d033ff7b849d979155ae3d39380751918e4c08565
diff --git a/dev-perl/Config-Grammar/Config-Grammar-1.120.0.ebuild b/dev-perl/Config-Grammar/Config-Grammar-1.120.0.ebuild
deleted file mode 100644
index 67b6407cf9d6..000000000000
--- a/dev-perl/Config-Grammar/Config-Grammar-1.120.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DSCHWEI
-DIST_VERSION=1.12
-inherit perl-module
-
-DESCRIPTION="A grammar-based, user-friendly config parser"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test
-		virtual/perl-Test-Simple
-	)
-"
-PERL_RM_FILES=(
-	"lib/Config/Grammar.pm~"
-)
diff --git a/dev-perl/Config-Grammar/Manifest b/dev-perl/Config-Grammar/Manifest
index 5bb767f1b3a8..8861023f266b 100644
--- a/dev-perl/Config-Grammar/Manifest
+++ b/dev-perl/Config-Grammar/Manifest
@@ -1,5 +1,3 @@
-DIST Config-Grammar-1.12.tar.gz 26163 BLAKE2B ed0e1e38698dc1d3d09f7eb5026765a6a91d599b2d222016ac82d44d8da18035603e2ae97e13c1066d7bf0259993e0e9bcde2257f17c18854b9e713b74896332 SHA512 44d46019b32d891830d224b6002c2c73fd59c772b0308ac27ab68b5899bb921c74184a0c354a41c8bef3eb876eb1fdc0f07334bcaf4394d907059fae903ba12e
 DIST Config-Grammar-1.13.tar.gz 26281 BLAKE2B a94ff7ab3fbeac8849798cc778d5b764396d51a541d43fdfa622ff702b0492ad73fa29baa85669f6b18893238fcdea7f3feb3f8a7fb0948382f8e3301599f455 SHA512 51b165ccec452e48906d3c8972bb68841de93f0ece11104fea837eebefa1569e921a7532f7e4a3d204e73cf4c9b592f8707fc4741481c99b67d1b7a3eb5644d9
-EBUILD Config-Grammar-1.120.0.ebuild 471 BLAKE2B ae70df8a722f226d1ca3485291c3c07ad0d53584e3821b809311a1daff34f8db68494310684db0e0a8f53060b3009ce5f9d60866419fd40749cd778cd7e6abad SHA512 5c360d9988a48de87d1075edea1c38f74fc5b6959cf3d027c4ed2aedbb431f7b4d13fd01ca1c8258fe8f8cf31226b3f9f2a2cea2b4e22d51189ba8321cd5776b
 EBUILD Config-Grammar-1.130.0.ebuild 461 BLAKE2B 3043987e8eb7329639394364a7099784e112bc8b4a2406383c7ada657a6326cd5a0d58b946d0ffb5aa623a8e3a7ead8e8238fe64978cd05bd5a36d493028edc3 SHA512 b4bcc8d6f195445e8f8642e3adb93930e0ce5c487bc18a1b45e418c769b9f33f414fd7ad0fd4aedd43f0b5b3c09ce591fbe11bae6ef9fd784a8f3ee16ad3feb1
 MISC metadata.xml 528 BLAKE2B 6219f0cae4bd81a4a27a2b53dd50894d61f6d0f31d87365117999155049639da89bec4c091426ec8cfaeba680a38fed97114ebae589f0c9b3b7be7ae29b90b8a SHA512 e3fa381464a77b53024126fb9e2b66e77c4c3033b917a32ca97e6d29f574277113b6e883ee6bf0a62acc139ce7c37f70961abfebaca9d73a3c5a2c5ca41a1358
diff --git a/dev-perl/Config-INI/Config-INI-0.27.0.ebuild b/dev-perl/Config-INI/Config-INI-0.27.0.ebuild
new file mode 100644
index 000000000000..4bb7577b6b65
--- /dev/null
+++ b/dev-perl/Config-INI/Config-INI-0.27.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.027
+inherit perl-module
+
+DESCRIPTION="simple .ini-file format"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/Mixin-Linewise-0.110.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? (
+			>=virtual/perl-CPAN-Meta-2.120.900
+		)
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Config-INI/Manifest b/dev-perl/Config-INI/Manifest
index 3d6cf81c3891..b2f9409d48f3 100644
--- a/dev-perl/Config-INI/Manifest
+++ b/dev-perl/Config-INI/Manifest
@@ -1,3 +1,5 @@
 DIST Config-INI-0.025.tar.gz 25405 BLAKE2B b1ea45c20d93c57490373ef5a3ba63c14d3a69cbc51121a05211067b059e08cdf77354eb866e2bbfc066036b57043dd58debc6f3e7380a8cd01b7feb5ccef69f SHA512 2831e2611409c1f09029b37e56bcbc875051cf9ac5e458f38fbac29a3e48665f49ea9ac66519eeee71e9b52b2c702507eb801c518a8417bbf0806270b0bc4155
+DIST Config-INI-0.027.tar.gz 26638 BLAKE2B 27fc0d086b0530881e4ad1d09c650e34656453e6330a89515ec00138c0fa92d78509a9445c14bf56a79069752527e4d7f6a107366ab4bff015d3587e136dfad2 SHA512 c0a7d363550cac186b639555e63ac27d613cb2e63d57786aabe63dd65bcb0e2043c3bf80f820bfd975d7111d14567af466e82ed35f9cc2294bfe78ef2a519516
 EBUILD Config-INI-0.25.0.ebuild 680 BLAKE2B 7b99a48d003f7d886f1b0ffaeb698b19e9b9ac8c5a4eed76144c7cd226acc88dc15386e951d12e85e868ebaa3fb133447f10c272e4a1b4be59671f324c92fdc1 SHA512 e9122044ed8b58d2cbc8b182dc7060c78a2591c479f3a6a59cf9c18afc270b574ad58f9cfde2d5666fbc46b26d7269cb8fb8e47f2049bbe89fe1ed9af598b4a3
+EBUILD Config-INI-0.27.0.ebuild 525 BLAKE2B 6ed9be52f272cd968f262bc8c3490ab3d15d5f8a2abd6806261d25bb827a3da6db09f5a0758051414f8ad6951d3518d34ce049f80e1113883bc8738bf437fe43 SHA512 daa74d6618440a7b17f893667ac4b3d7a3852b9a4f015b65c7c5b3ff7b2b712a9220580ed115b06f8a32d7df59a480bd9a08245e37eacd7b418e3beeb3f516ad
 MISC metadata.xml 525 BLAKE2B fce6b57d3d201981235e54afe4eacee3325169e61f910bf0305e9df4e6ff37af868bd4e54308a5d17f07c55596d7d7e6ea53272453417f0cdf8c573588bb2076 SHA512 da37778eb40b36a18ddcc30a2645ee0d2008d35c40935f962468a4a90745bbba6008df58e7151ac48b496a4cd5694654262bfe42cf9647657d012e569cbee1ec
diff --git a/dev-perl/Config-IniFiles/Config-IniFiles-2.940.0.ebuild b/dev-perl/Config-IniFiles/Config-IniFiles-2.940.0.ebuild
deleted file mode 100644
index 00ef462f9f26..000000000000
--- a/dev-perl/Config-IniFiles/Config-IniFiles-2.940.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SHLOMIF
-DIST_VERSION=2.94
-inherit perl-module
-
-DESCRIPTION="A module for reading .ini-style configuration files"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# needs List::Util and Scalar::Util
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-File-Temp
-	dev-perl/IO-stringy
-	>=virtual/perl-Scalar-List-Utils-1.330.0
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.280.0
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Exporter
-		virtual/perl-File-Spec
-		virtual/perl-IO
-		virtual/perl-Test-Simple
-	)
-"
-src_test() {
-	perl_rm_files t/pod.t t/pod-coverage.t       \
-			t/author-{pod-syntax,pod-coverage}.t \
-			t/release-{cpan-changes,kwalitee}.t  \
-			t/cpan-changes.t t/style-trailing-space.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Config-IniFiles/Manifest b/dev-perl/Config-IniFiles/Manifest
index 4c2a3134e8f9..cdbc55daf932 100644
--- a/dev-perl/Config-IniFiles/Manifest
+++ b/dev-perl/Config-IniFiles/Manifest
@@ -1,5 +1,3 @@
-DIST Config-IniFiles-2.94.tar.gz 65322 BLAKE2B ae3271acf5ebea9f479fa9142c0931192134ea0d25d361c2a0caa90b7ad95234983d6b4469ab73d302bda7ce2a719374b593233de728e5428511675fe3766eba SHA512 9ca9950f31a00bde580dc73b5120971070aa053f36f9a0ee29532b17b9a070de8ad3184631427ad442dbcbe087a9680366849b5e10f264e20694ddade7e3ca7c
 DIST Config-IniFiles-3.000003.tar.gz 70024 BLAKE2B 215896e05d09ab5c7d6d6ddda768c7eccfbac808eed3b3a6c89218a06bb813af404c621e1dce28a3aa4869fe49d2dbd40da354ec3b3b36a2a1e5d1c50d9f0a32 SHA512 29278b7f6aaf9ffcc0cd8b48ca0e1f1084b10278e50764b2b93e3e9b156ef13d6e54f779f41d0a6cbf6e0b23da1b73a3bb83fbf873add0a604693a41312b91f5
-EBUILD Config-IniFiles-2.940.0.ebuild 874 BLAKE2B 7ad1f5f4cbe5aaf42d3cec580e93ea826e08fe3e04250e23cf83aaad4ba15f975e2012ba2be682a414d57347d3d6fd17f5cf95550e30d4d639a982050f0977c4 SHA512 c2150404fbd5024f5c889fbb94854a548c5f92c9a886d2bb6fce8abebb2e969c90bc1dd76c5df2018709cdaa983de1e0c3815ba9c13917cdbe1d31b65d0626a1
 EBUILD Config-IniFiles-3.0.3.ebuild 731 BLAKE2B 48fc45df378d7f89bb81b1b56c35ec142161b714b378c82e1c18ffcc0b62c3b2047fb24baa16ac455fe3ad4df37d66b55aa126ad74f93e5027ece55dab916285 SHA512 d83532844bbb811e599f57b13ebfd59c069bcfba8b8b169735ffaf3465d30e1a94b5d7361cc2ae1a3f544cb49b488e02c46644785bb582ff80ed6f73c1b7c8bb
 MISC metadata.xml 403 BLAKE2B 4e9184a2b717f930dd351af5a8a61d881711b1c28a046fb8ff038fab0810e9107ee6e6a50d1b143350f1a7c6b96c74b395cc443fe3874dc036c1bdb0e70626a1 SHA512 5ef1a32203656624c63c6ee7800bf466460926ac63dc9c33c4b167bd8fb3dd1ff42660ae8d3b3e91298b17dfbbfbc67c4a43fe4e1ba2a8c9eeb26732a062f265
diff --git a/dev-perl/Config-MVP-Reader-INI/Config-MVP-Reader-INI-2.101.464.ebuild b/dev-perl/Config-MVP-Reader-INI/Config-MVP-Reader-INI-2.101.464.ebuild
new file mode 100644
index 000000000000..f1c3908211e3
--- /dev/null
+++ b/dev-perl/Config-MVP-Reader-INI/Config-MVP-Reader-INI-2.101.464.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=2.101464
+inherit perl-module
+
+DESCRIPTION="an MVP config reader for .ini files"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Config-INI
+	>=dev-perl/Config-MVP-2
+	dev-perl/Moose
+	virtual/perl-parent
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Config-MVP-Reader-INI/Manifest b/dev-perl/Config-MVP-Reader-INI/Manifest
index 01058f73a96c..263a0a5e7125 100644
--- a/dev-perl/Config-MVP-Reader-INI/Manifest
+++ b/dev-perl/Config-MVP-Reader-INI/Manifest
@@ -1,3 +1,5 @@
 DIST Config-MVP-Reader-INI-2.101463.tar.gz 14671 BLAKE2B 3102343c6d8387027a3a17be0d57bce21ee0cc5bd88006c1fee5617c23b12b3f2796514e8a26a9dc5df1b003ce5701854bba4295492faaea2d6b461666dc9371 SHA512 79e65082058fa7c5ae24e8deb69c0f17dafe9727c57c7fdb4fc2cbc4f634b424c8d1a17e16f879b879769b3030f9f7cf555d9f582db6df83a33ea86141449e54
+DIST Config-MVP-Reader-INI-2.101464.tar.gz 17164 BLAKE2B a13bc011d81b11428b09bbb563ff2d5cc1ec80f38fa4f4ef24859f26e747db8bdfdb4920e5718ecfd0f40ab921a39fc4a66a029e637232367513971c138f6779 SHA512 45457bed49849959fe7411181821e2d2495009a3e575272f1b3898a3fed22f7278c025ba9e83a0c145bd9c5a7906eb8353c0ffaa8cd712451fda5a9dd7e2a503
 EBUILD Config-MVP-Reader-INI-2.101.463.ebuild 630 BLAKE2B e049ad0ed199ba178856887581f8988a9d92b3917833d67ec21e5de0febf9fc2cc6587f7a6efa57f09fc368dc67f6cf4a14d9a8263299c2df13c2153c41b7b0d SHA512 f196f80c55fcbcb1cd80eca4e6cbbdb5c23d33f3ed7c374a159180466bf716619c1d21a8bca90d95b9502b3ad0d379922ecb48678b6196f2d66dfa014fb3efa1
+EBUILD Config-MVP-Reader-INI-2.101.464.ebuild 466 BLAKE2B e02b328315bbb6310bd6d074b7e828f13a513801ccc5cd1647f272d739e215eb18ef70d473cefdafb46cb21d28de2fdbc0c036a0c0b3838e7d8540a2ad1ef08c SHA512 7eac1564d5e9cf76d1ad0334f1e89955807fb6ce6ab6702cb3423fa85968c999ee32a7565c4e0225155dba8a583c44218e5595d4b03cf75d9fa580319b7c141f
 MISC metadata.xml 417 BLAKE2B b7e9abc98025f2fc5e3dbfee853701da79d631935743ff31459f871e4e2a1d6b43fdc43886448282a3e151a5ab435cd2bc95e25ba61e258a06ec0777b4d1f5af SHA512 217d118c4b42781813cb1f95bc08199abd29304779c715c9647b7ac35fbe53bb8d53ea55085089dd25e2e12bd52c20dd8630c5c7cd94cd1c0e0bf03688cbd10c
diff --git a/dev-perl/Config-MVP/Config-MVP-2.200.11.ebuild b/dev-perl/Config-MVP/Config-MVP-2.200.11.ebuild
deleted file mode 100644
index bbfc6b109458..000000000000
--- a/dev-perl/Config-MVP/Config-MVP-2.200.11.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DIST_AUTHOR=RJBS
-DIST_VERSION=2.200011
-inherit perl-module
-
-DESCRIPTION="multivalue-property package-oriented configuration"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
-
-# r: Module::Pluggable::Object -> Module-Pluggable
-# r: Moose::Role -> Moose
-# r: Moose::Util::TypeConstraints -> Moose
-# r: Role::Identifiable::HasIdent -> Role-Identifiable
-# r: StackTrace::Auto -> Throwable
-# r: Test::More -> Test-Simple (Yes, Runtime)
-# r: overload, string, warnings -> perl
-RDEPEND="
-	>=dev-perl/Class-Load-0.170.0
-	virtual/perl-File-Spec
-	dev-perl/Module-Pluggable
-	>=dev-perl/Moose-0.910.0
-	dev-perl/MooseX-OneArgNew
-	dev-perl/Params-Util
-	dev-perl/Role-HasMessage
-	dev-perl/Role-Identifiable
-	dev-perl/Throwable
-	dev-perl/Tie-IxHash
-	dev-perl/Try-Tiny
-"
-# t: lib -> perl
-BDEPEND="
-	${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		!minimal? (
-			>=virtual/perl-CPAN-Meta-2.120.900
-		)
-		dev-perl/Test-Fatal
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
diff --git a/dev-perl/Config-MVP/Manifest b/dev-perl/Config-MVP/Manifest
index 73873ade1796..c2fd89d9f95d 100644
--- a/dev-perl/Config-MVP/Manifest
+++ b/dev-perl/Config-MVP/Manifest
@@ -1,5 +1,3 @@
-DIST Config-MVP-2.200011.tar.gz 33387 BLAKE2B cd57bc21b3106ee991dcaf07017a41dbec4453bc98b823820f431d86101ed0c0a0814a8617c37b3df1bf1a264ff07a184fedc94920c68946837e3852076b0f92 SHA512 8e4c178b355a5e4ef4a1d7f8b304a1411f19f6ca601e6ab6593b0b3e9002f7f5ba64eb49714bc155741651dc501b87296e2fc4a3388e7616efdd4dd893866606
 DIST Config-MVP-2.200012.tar.gz 34232 BLAKE2B 89a99cfc6b9c79abbca4ee2d8874bc77be4190c62cf30cd92acdac3ec2eab609acb3492a4bdf465b6a7caeaaaa56f17ca936257ac22876a9babeacef804383f9 SHA512 1da64c93c0298dc9a25b289632ee59e61de0640d545049505825353c1f7c88e039fc09d4037e13bc51c27bea3f10fdca542eea2f15ef9e4694e5dd0d565ef414
-EBUILD Config-MVP-2.200.11.ebuild 1097 BLAKE2B ed8a4aa634c898c30e6d5e23bb8ac74fc7e32b60827e250c8aa2b8907149ed55694fda55560eb3ed30628137a2c7ca1ca6babd32e7347b710d6cd6e30cb28d6d SHA512 bd447399e64818371737947f12be16850dd94fcc84c673edc67c296aee0b2e5b58b2348bc30977c4ab7853ff26682fba8ce8f8c41fc39a68e458e7d2be9fc7c7
 EBUILD Config-MVP-2.200.12.ebuild 1096 BLAKE2B c958238da480d8f0b4fc03a67222015fe61630dfb32444ee0fe2b2fd60c6bd5be98991b14a647e35ff12751d99585b9d7c16d580b32a69890d8e7300b12d1fd8 SHA512 25c577cd8afe16054a755fe389f6360a997a3c4f9616b7c4427b045b669d9b5fadf06851ce46c08a5c9fab609b98d67a32654776e41c02b61c1cac530b58f7ed
 MISC metadata.xml 1121 BLAKE2B d059d65d7ef04e3d53f64768e9cc263a524c446a80f25aae92c197bcef6a4e456991dbcf40d1a5319cd4fdffab1dd21a2b31d3fe0c60097cd9732a5b81fa3c08 SHA512 40ea0290b0b48da8a59da5be829aaf244cef531bce94c7cab443b26aa0cccc762f76df380d5158ae61a23d9c9beec933ad12a1ec1348814579c976cd81de5061
diff --git a/dev-perl/Config-Tiny/Config-Tiny-2.270.0.ebuild b/dev-perl/Config-Tiny/Config-Tiny-2.270.0.ebuild
new file mode 100644
index 000000000000..46402649b652
--- /dev/null
+++ b/dev-perl/Config-Tiny/Config-Tiny-2.270.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RSAVAGE
+DIST_VERSION=2.27
+DIST_A_EXT="tgz"
+inherit perl-module
+
+DESCRIPTION="Read/Write .ini style files with as little code as possible"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=virtual/perl-File-Spec-3.300.0
+	>=virtual/perl-File-Temp-0.220.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-1.1.2
+	)
+"
diff --git a/dev-perl/Config-Tiny/Manifest b/dev-perl/Config-Tiny/Manifest
index fd3fa5f6244b..677157fe03ff 100644
--- a/dev-perl/Config-Tiny/Manifest
+++ b/dev-perl/Config-Tiny/Manifest
@@ -1,3 +1,5 @@
 DIST Config-Tiny-2.26.tgz 22443 BLAKE2B 7b6e24de08559172920ef52968eb1dca1a1ce2b52b0e02fa1cd54c741402ec5eb9c32b46a911850410056ab7c8f04d9b85021e539d9439f6e8b3e4c847b36be0 SHA512 647c48f3c4480bf8bb8ec22b7b9a3a5b813d4bc633760f5aef4e03ea90b4b979a0a1617dfc3dba6c31779d04bc2d8233bf61ee509bceb8b2d32e1df481c3f135
+DIST Config-Tiny-2.27.tgz 22653 BLAKE2B 6c4f4db5ed3f6f18341cb19993e0b0e8e96dcaec17e705364cda6f652435d63b5143f2dbe1d75f001cbbdaa1647693ecdc0b7e8c9d77b0b94fa6a78730a2ef62 SHA512 2ab77d2f9e01f14047a2c079c58941d707fdc54ea0d30c43e0cfad162b8e810a25a62a435abd11b5da8a7cff9027511534205bf625a2ee9ee7824d4c3eb9d0e9
 EBUILD Config-Tiny-2.260.0.ebuild 680 BLAKE2B 07d2c571347fffc1c850a6600097e56261c98d932538f28ada64bb268cdc2ca9028368a64ed668543f522507e71d1850ebe8b5b4b4747117e64bc04d205e323b SHA512 46abec171a7de5cd565cb5039cb54b45923b5907912dd30182f942936c2a4485dd3fb6bfc34e9fdd2bc6a69c289ff00f8e7d00cfbe87e4af3a5c352087be459b
+EBUILD Config-Tiny-2.270.0.ebuild 645 BLAKE2B 6a7997c896a2975953dc5f0d3ef75599c3f76d7bb4ac43dfca825e04b5f43af510dffd0c84109b44fff3cd52ebcec8c5cad36952976e6d6e3abb0f7d73e7c246 SHA512 3bec5d9976a8b3c84256234bde3198a313aa0415a10cd28cbaf73213f69ab2d4d58c73e77181a77a0affe3cfb66e58e3dcdeffd7635475f16b8b97e6c3bfe890
 MISC metadata.xml 395 BLAKE2B edaab60fca18e627f1f74b1e7d7792b6a4dd666f7f02908d27a7f6c29bec9049facd968a41aae8b7643c51c85d701e1526c7cbb869cd7b8dae5cff8ae14e2eae SHA512 0dc84787aa032ad27aabe5eb851c3178662b396739bb3ffc53577f650bb1fca180b4b51074dc557a32bd393db4f28ef4facde8586925fd6174493f83cb985ed1
diff --git a/dev-perl/ConfigReader/ConfigReader-0.500.0-r2.ebuild b/dev-perl/ConfigReader/ConfigReader-0.500.0-r2.ebuild
deleted file mode 100644
index 278e4d698f1e..000000000000
--- a/dev-perl/ConfigReader/ConfigReader-0.500.0-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=AMW
-DIST_VERSION=0.5
-inherit perl-module
-
-DESCRIPTION="Read directives from a configuration file"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-makefile-tests.patch" )
diff --git a/dev-perl/ConfigReader/ConfigReader-0.500.0-r3.ebuild b/dev-perl/ConfigReader/ConfigReader-0.500.0-r3.ebuild
new file mode 100644
index 000000000000..373e76cc792e
--- /dev/null
+++ b/dev-perl/ConfigReader/ConfigReader-0.500.0-r3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=AMW
+DIST_VERSION=0.5
+inherit perl-module
+
+DESCRIPTION="Read directives from a configuration file"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc sparc x86"
+
+PATCHES=( "${FILESDIR}/${P}-makefile-tests.patch" )
diff --git a/dev-perl/ConfigReader/Manifest b/dev-perl/ConfigReader/Manifest
index 549790594cc8..2ba91fd3aa25 100644
--- a/dev-perl/ConfigReader/Manifest
+++ b/dev-perl/ConfigReader/Manifest
@@ -1,4 +1,4 @@
 AUX ConfigReader-0.500.0-makefile-tests.patch 1527 BLAKE2B 2e3dba757e9143518312ddfcddb673f81827e353bfc92eb2a5489fcd0317f47ae50b671e1eb1bdb0c83176ffcc8e8c499d15437ee39dca27ee1a28f647bc7041 SHA512 f29fcf200d9134ff3f50a6f233df98a1f403bb63ccd37e4bf475196faa2d96f1e73fe9d04d032f2f04486edbde7c86ac9cbdecbc5a20d2c2ca63dd35e0000ed7
 DIST ConfigReader-0.5.tar.gz 17592 BLAKE2B 1232cb8ba6fa80f6b3ba7cc0ba477b83e57d5698b259db20482fbe39d36fab863f62ebeaf56a3196108bc873b0dd0410636962e692a2784a6fa346d93feaee3b SHA512 625c7ba506e7d501adf1fa22830b104e413f115c1e3758235d395fe2995e84abe92cfc5b13e0d23deb255e849c3a99ce56a8006c8b6a967d5d60598337aa303e
-EBUILD ConfigReader-0.500.0-r2.ebuild 352 BLAKE2B 8f994dd2e7fca1e12acf37cdcca3e79f1f86f86ad8336b8c5a7a76c3044d144fe69696583e0f9a160e1610dc442e85224f0e14b5f2f0aeb8ee72a9dc9bc4e226 SHA512 f26b52f0fe2ec219b814b5b9baef020b63919169d5216c910ea60c6839622b38039101f51c277497ccb58fc5c2ea1e7e6f434e926b21672baae15d3cb545e881
+EBUILD ConfigReader-0.500.0-r3.ebuild 341 BLAKE2B 3bc2bdaa2fdecb2a8111f7585477aeca63256ec1e0cdf5d9f2790307b7f103ada80455b3aeb275941bde8bfd4bc52d5c9565fa662a20b8faa7067018394e9844 SHA512 e8a7728fc2be475f8ee87299c0b3ad8f20be2101c5273c30968389c6f2d884378ff34128f1d822eec2d3adac65a808a6a6ddc995678a2f2f1b7d566298d49e3d
 MISC metadata.xml 544 BLAKE2B 8f40f176f1ef27b8e6f1f5eb9cd222fdcdb720866e6559f090ef125a168fe2f0d2cbca53be9a632d9edb42f27131628495a7b7c884547e6d39a5770305db1705 SHA512 f42ca71505dc5b006825ba4caa09dd847e2f7f4f3d323aece789e2c854c8bd4844c4ee36bef904aec2e723f80245767cdf846c7d3f7209fd1def9e707f6fc24a
diff --git a/dev-perl/Contextual-Return/Contextual-Return-0.4.14-r1.ebuild b/dev-perl/Contextual-Return/Contextual-Return-0.4.14-r1.ebuild
new file mode 100644
index 000000000000..d8dee4d79e06
--- /dev/null
+++ b/dev-perl/Contextual-Return/Contextual-Return-0.4.14-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DCONWAY
+DIST_VERSION=0.004014
+inherit perl-module
+
+DESCRIPTION="Create context-sensitive return values"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Want
+	virtual/perl-version
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+PERL_RM_FILES=( t/pod.t )
diff --git a/dev-perl/Contextual-Return/Contextual-Return-0.4.14.ebuild b/dev-perl/Contextual-Return/Contextual-Return-0.4.14.ebuild
deleted file mode 100644
index 65fac2093b28..000000000000
--- a/dev-perl/Contextual-Return/Contextual-Return-0.4.14.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DCONWAY
-DIST_VERSION=0.004014
-inherit perl-module
-
-DESCRIPTION="Create context-sensitive return values"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Want
-	virtual/perl-version
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-
-src_test() {
-	perl_rm_files t/pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Contextual-Return/Manifest b/dev-perl/Contextual-Return/Manifest
index 9eebb68d1ff8..8af23317eafd 100644
--- a/dev-perl/Contextual-Return/Manifest
+++ b/dev-perl/Contextual-Return/Manifest
@@ -1,3 +1,3 @@
 DIST Contextual-Return-0.004014.tar.gz 41028 BLAKE2B feed6dde129ab9d8eca60e04f6c9a4b92b83226a5110ad3f3fc2043601c10be05c593c411f8c358545459adc5f6ef32584dcde0e14a69ac91c72fa22bcdd88c9 SHA512 5728b6b2347c888f32876226d4a940cafd0c41dc4a15e82d7f2c3a82d5585f2fa0e54477e466bcbdafcd7a607cd05483442f3c6270d08fdd632215b68b8abe27
-EBUILD Contextual-Return-0.4.14.ebuild 502 BLAKE2B 50f912f8fccfe4f8af476fe2e7392fc70190993c2cd43f5df5cd0348f49ec16ef2c838d064225c7c1a40977072f4d57149e0bc76f23f2a52bb5ede0063369f64 SHA512 bb17ea608976094e578b89da40254e4ca4bb1b983ca9b7e685b3237d311fa04eb3a94db498bc6c2a2efcd2805ec0b44dabeb6def9dcf5545a37cef1d30504db3
+EBUILD Contextual-Return-0.4.14-r1.ebuild 430 BLAKE2B 15bf568e1d02c0d8356461836ef792fed35b5f6d197afe9c6824a8ae39865cecfbca7aecdb0eb4a2020470bd1ab44f0bd21695aeb2bd5b4caa6b50836a05a563 SHA512 0a54064d1c666fa3479aa5c42ffa3e9e91fb542db9fc8f0089f6484d6a4c9aeb52a85a9a7b6cc987abc3da8055c364a7c467977b5888ad716649f89189963ac6
 MISC metadata.xml 626 BLAKE2B fdfbeb939320d47d5c7225b969e3928500ff9212dead9f2c66ffde5f68810a54481129a8fd447dff1391ff766c2f947247ca66b3ee223153d112ae016a5c6b35 SHA512 129a6d0c34a72355689b3fc90aca5e99c8c7d37ba5055f5466a4968feaf566601cd70395830dcda822e39abcb9332f4641f54d05f12385e457c5ff7c7002bef4
diff --git a/dev-perl/Convert-ASN1/Convert-ASN1-0.330.0.ebuild b/dev-perl/Convert-ASN1/Convert-ASN1-0.330.0.ebuild
new file mode 100644
index 000000000000..6c2efd7d1407
--- /dev/null
+++ b/dev-perl/Convert-ASN1/Convert-ASN1-0.330.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TIMLEGGE
+DIST_VERSION=0.33
+inherit perl-module
+
+DESCRIPTION="Standard en/decode of ASN.1 structures"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+BDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Math-BigInt-1.997.0
+		>=virtual/perl-Test-Simple-0.900.0
+	)
+"
diff --git a/dev-perl/Convert-ASN1/Manifest b/dev-perl/Convert-ASN1/Manifest
index 8aab205865e8..f9ea84c73d65 100644
--- a/dev-perl/Convert-ASN1/Manifest
+++ b/dev-perl/Convert-ASN1/Manifest
@@ -1,5 +1,7 @@
 AUX Convert-ASN1-0.270.0-CVE-2013-7488.patch 1362 BLAKE2B 670b391c12cfa89051440fae8e796248b1f70695b95f47ad0bf420034b8b669a757b380be94ec530e6e692440170fd1b804e3c75b38d82bd5bccc41ea6083ff2 SHA512 6b4da9b77f9b7f7b0cb096858848568ca0ca2e52e359b53bb860965051356e310cfd5b916bcc16e0ac0562f4383aa2b9dbace394ca6e690b5aa39f44c850b5ef
 AUX Convert-ASN1-0.270.0-perl-526.patch 6189 BLAKE2B 93614ec863a4a90e195fb7e99e4e4a6b729fa1d154a85d9d9f72232ff9cdca50868d5ba320653853ae6da5d612533d57cb9470c56ad2e01e979613cf628509bb SHA512 a6805154a0b7da8af86c101521b74d88562e34f95890ab62221bd7d0d03a41a1dcc82b26eb79383d84274abbb9ed4c683f627e75434062b7cf0984b340f5192c
 DIST Convert-ASN1-0.27.tar.gz 74081 BLAKE2B 14929ec5f25ac85465204fb8f584384c5c65e73cb3ee5bfd9510a9bb2580e7c1a86f485af99ab7cd83813914ae6e277020720d26af8d2bda54acdd06fff7e984 SHA512 253bc0c1b2919841497a95bcbd05825217a3013c7f789fd9f3d389808fb015daca91f5c149797574bf32d38e94efb7f1d8df62e9e4c13928ec3b978cc9fd6fe8
+DIST Convert-ASN1-0.33.tar.gz 79306 BLAKE2B 591c45a5aa6d934e1fabd2c0f02614b2efb229e717b0ec15b84f3ec8d8bb6960eca84a38ef4a5609c7a67455c20d07d44aec0ac273ada11619b5886bce717b59 SHA512 be66298816d41965d1d579ea60186f62d0f00585fbeba8422eee71e4ec4a06026d36eab5144c305da2525c5d652b5f1eed7ade039d93136bfc81d28b496c74f8
 EBUILD Convert-ASN1-0.270.0-r1.ebuild 657 BLAKE2B b73ecebd1a596220bf73b15d6a2c17bf8a77171ecffed30bbd614267d45455fb6a4b5fcacf7e72c63dee94d9a3e3f7683f82f81d0c34c5cfd83510f4d32c8bd5 SHA512 934bca4e5b612a8f6b087484ddb85a8c827c0f8bb6142c2d28d6ea6ca98b7d50eb370274d8e39a41cacb1eb22b6eeb47d8a72dbf43112d7426b8aff88a71848b
+EBUILD Convert-ASN1-0.330.0.ebuild 522 BLAKE2B f68f229a952a0bbeab83052a171a9c889fd480417d8eab62b70e6aacaff7f968675c4e46500d75d3ca57c845d746becc2f1f80f5738fa5b2a506cdb95adcc402 SHA512 2fd0cb1c999bbe33ca92bcdad2087531f0398a24035b17ce87f5fb61f8a9922929727676e8fd923503bf1e8afc88f2f8107a6aceb0d7a04385e58954d2ba0204
 MISC metadata.xml 397 BLAKE2B b1d6a0462ba2f42d68e9ef44d929196ba10676f1dcb61c526613c46ff8d5077569e7f7f73af19af737652f992eda5f41f1047eb2f9252a962ef14802c49a5244 SHA512 7287d7e8d83236d6bb3d6166713e3bdd9ffb9eb2c71280f292a11c829b503a0fbc9a610a1456e19a2de4fa3d4f7af7fbbcc1a1b8bff3372d6dcb4c016b3e377b
diff --git a/dev-perl/Convert-BinHex/Convert-BinHex-1.125.0-r1.ebuild b/dev-perl/Convert-BinHex/Convert-BinHex-1.125.0-r1.ebuild
new file mode 100644
index 000000000000..a0c8eb006e72
--- /dev/null
+++ b/dev-perl/Convert-BinHex/Convert-BinHex-1.125.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=STEPHEN
+DIST_VERSION=1.125
+inherit perl-module
+
+DESCRIPTION="Extract data from Macintosh BinHex files"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/File-Slurp
+		virtual/perl-File-Temp
+		virtual/perl-Test-Simple
+		dev-perl/Test-Most
+		virtual/perl-autodie
+	)
+"
diff --git a/dev-perl/Convert-BinHex/Convert-BinHex-1.125.0.ebuild b/dev-perl/Convert-BinHex/Convert-BinHex-1.125.0.ebuild
deleted file mode 100644
index 7c36a16ac627..000000000000
--- a/dev-perl/Convert-BinHex/Convert-BinHex-1.125.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=STEPHEN
-DIST_VERSION=1.125
-inherit perl-module
-
-DESCRIPTION="Extract data from Macintosh BinHex files"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Exporter
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/File-Slurp
-		virtual/perl-File-Temp
-		virtual/perl-Test-Simple
-		dev-perl/Test-Most
-		virtual/perl-autodie
-	)
-"
diff --git a/dev-perl/Convert-BinHex/Manifest b/dev-perl/Convert-BinHex/Manifest
index 47ee7711f75d..4836e3e75c23 100644
--- a/dev-perl/Convert-BinHex/Manifest
+++ b/dev-perl/Convert-BinHex/Manifest
@@ -1,3 +1,3 @@
 DIST Convert-BinHex-1.125.tar.gz 73122 BLAKE2B 9f8731a3f258c747c909c3870b7738b4242f52b8181603693e99ba3680a154a185e9a694a0a762a75f96f9e5b3452798560a2c68e65155a0bc8c381d90312357 SHA512 c088feb0d9dd2c56d79e4fe21494e5957f763bfb4afbd0335ba099f4babbc7790951897730faf097d61ebca4a262f6676a9532d8861c2deca5a6d61ffdd6f115
-EBUILD Convert-BinHex-1.125.0.ebuild 572 BLAKE2B 2b10addcd09c411a57e86cc1c7dd3a4ab0b965534a25235688e46557addfb5901879be8bcb27d7210944c56764b678f0909ef68a0190fbe735485090edb7e6e6 SHA512 3900dd39f023aad09b1dc71c3c3f76df5e0c817f74128ee1c4a43bbb08ecd39fbc1f3916f716141701f61a24dceaaa5c945ddb9a0c33c87f9aa84326f99ba09c
+EBUILD Convert-BinHex-1.125.0-r1.ebuild 534 BLAKE2B f33ce74f7505003199f9a774e4d2596515f331fe690640c52b5d0dd0a7b9e2af90bebff4283e44e33bb7d807a4880fb19ea241bba7a5fad6980681ab8c170038 SHA512 8f6879e1ac05048932e4090e644982086fcf3534cc61714abe788b7ed27cdedaa6ddb9c435edf01a4e6ede63bd997facfa04bd2bc4498984e519225121e9047b
 MISC metadata.xml 757 BLAKE2B b15384ffd024468f2391b508c2e2739257c534a1eb22151ff8e855d59ed59bc50b1097c1cda8a40101df538814206ccb0bba5657563722f45c186039d4da42cb SHA512 59e09378a2db09b7545ae99fee92b9b57cbe8198c2128d555696f21622d42dc299c07cb91f5f74547eaacfd5a973d68b4dcf1a8ab184bd030f33c5958c53af0f
diff --git a/dev-perl/Convert-Color/Convert-Color-0.110.0-r1.ebuild b/dev-perl/Convert-Color/Convert-Color-0.110.0-r1.ebuild
new file mode 100644
index 000000000000..b26a5d9e47db
--- /dev/null
+++ b/dev-perl/Convert-Color/Convert-Color-0.110.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=PEVANS
+DIST_VERSION=0.11
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Color space conversions and named lookups"
+
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Module-Pluggable
+	dev-perl/List-UtilsBy
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.380.0
+	test? (
+		>=virtual/perl-Test-Simple-0.880.0
+		dev-perl/Test-Number-Delta
+	)
+"
+
+src_test() {
+	perl_rm_files t/99pod.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Convert-Color/Convert-Color-0.110.0.ebuild b/dev-perl/Convert-Color/Convert-Color-0.110.0.ebuild
deleted file mode 100644
index 630f180afabb..000000000000
--- a/dev-perl/Convert-Color/Convert-Color-0.110.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=PEVANS
-DIST_VERSION=0.11
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Color space conversions and named lookups"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Module-Pluggable
-	dev-perl/List-UtilsBy
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.380.0
-	test? (
-		>=virtual/perl-Test-Simple-0.880.0
-		dev-perl/Test-Number-Delta
-	)
-"
-src_test() {
-	perl_rm_files t/99pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Convert-Color/Manifest b/dev-perl/Convert-Color/Manifest
index ceb6c194a1f2..baf92e7298a2 100644
--- a/dev-perl/Convert-Color/Manifest
+++ b/dev-perl/Convert-Color/Manifest
@@ -1,3 +1,3 @@
 DIST Convert-Color-0.11.tar.gz 37659 BLAKE2B 034ac79279a6679014edefb5ef5ae90748e264a5169e2d30306c6767ed585c36a34380aa5bd9ef2edb386401fb06df1e6247e4f3db7b8aa9777234f95340aee7 SHA512 add90dff917a8fbc553fbd67826bb66b59319f7331dc7e13c79c525b1cbc6ab2f01161a20caacf2de90b28794451b34e3f60b5f21a413177ba7e92a349fffaf6
-EBUILD Convert-Color-0.110.0.ebuild 584 BLAKE2B 5bc6cac6c49c92c9684e20b559525b69a8b5a213905671a836b0b2118d0e1e362645acf5e7dd9910eec7a054707ba70ab86cfe1654a774b969dcea8067dbf977 SHA512 8295f786b11fd31323cab692f9de13a914bf9d5f781385fd800b30b89547671a6756871648b775f2ad5f3a2a22077f57607960f7c96a6aca0dab173766f2c0da
+EBUILD Convert-Color-0.110.0-r1.ebuild 547 BLAKE2B 087a2c923cdab41ceab360b9999777e57c5d0a2d5421bbaf50f49f70ac1a2ed136b06d6b4eb72b7568a62d0441d25cd0c4648d36334c8484ec4f2c78ab0c9423 SHA512 8acefaa4ea86c2538bf1baaf530b037e18877cac833c9f780f84d1c439343f25ca34a76f8f05069743a37f49f4c64fa0e6b5a6e0ee955f8a053174994c65e110
 MISC metadata.xml 997 BLAKE2B a6962f27031092700db48c53792b1f4cccf84020b93de1bab22bda5ad8396720f8072cd7a7ae820b8e041a7513bf1ad39662f37badfab915bae4f04282f79b6e SHA512 97343d74b9cb68f3d10c8fb4bfc4109b964ba21e1b03e71b752e80a44115c483d9cda79768d622fd16d46d630537d36a20b84b9ef9268cfc24dd86aa96b6d38c
diff --git a/dev-perl/Convert-PEM/Convert-PEM-0.80.0-r1.ebuild b/dev-perl/Convert-PEM/Convert-PEM-0.80.0-r1.ebuild
deleted file mode 100644
index bdd3f39c8dbd..000000000000
--- a/dev-perl/Convert-PEM/Convert-PEM-0.80.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=BTROTT
-MODULE_VERSION=0.08
-inherit perl-module
-
-DESCRIPTION="Read/write encrypted ASN.1 PEM files"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	dev-perl/Class-ErrorHandler
-	dev-perl/Convert-ASN1
-	dev-perl/Crypt-DES_EDE3
-	virtual/perl-Digest-MD5
-	virtual/perl-MIME-Base64
-"
-DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/${P}-526.patch"
-	"${FILESDIR}/${P}-decryptiontest.patch"
-	"${FILESDIR}/${P}-testbuilder.patch"
-)
-
-SRC_TEST=do
diff --git a/dev-perl/Convert-PEM/Manifest b/dev-perl/Convert-PEM/Manifest
index 3e22501d897f..475e7496f807 100644
--- a/dev-perl/Convert-PEM/Manifest
+++ b/dev-perl/Convert-PEM/Manifest
@@ -2,6 +2,5 @@ AUX Convert-PEM-0.80.0-526.patch 578 BLAKE2B 4a2f391fdd035758d9b5c51b2499cee1c78
 AUX Convert-PEM-0.80.0-decryptiontest.patch 2509 BLAKE2B bf0da476d2ccdb72d55b88ab114d3deacf32d457535464bcf84b3c9d082f2ae5d1bd65557c66c21f5374950bbba2cc02e88f61e0788152f305e442b077e8085b SHA512 554e98c100a47d396b00529e7b77afad26d491eb04b0e58dc45c94b699440133abdc9c30be4ccf8e6b692fb386a1867a49d2e5243f6a42e3423f67aed50d0ae7
 AUX Convert-PEM-0.80.0-testbuilder.patch 802 BLAKE2B 267c7e62334e50039fb3db105e31d0ba799265e83b26f996f1c27b3a1f4954eb768131437cd95f07b4c78d96511b2252881e43cdabab97e9f77efdc0eaf98a95 SHA512 cb41dd95c3f5556e98a102bd3b776b8ad284407fbdc4eb669d9de6d5b5e78bf69ab90067d0d512a4527a3f82952b5405aa42bb17198a64d29a7cb196b981d09e
 DIST Convert-PEM-0.08.tar.gz 54089 BLAKE2B f550295b225539ac5ab91e05cf1b0fa8fdfb8d0f1e718d69c7c86a318173cabe4967efd4abba4e0a1f3ff86811a87ceb27b306cf1026b39652e4d1c7e402139e SHA512 d5e4342b40d01d534ec5f81ab009af185f795267c1bce792d26739ab07078a618093c720230ac2b6cf10c4b5ae1c282c94afa5b9db2eef6fd66e684d2080c273
-EBUILD Convert-PEM-0.80.0-r1.ebuild 638 BLAKE2B fbcbd0738544df78f1a39dc679fa895777005acf9fa5c128ba5416ec7fca5e71afc37dd1edf29d4e3c01bd38bc2f7394679a6198e386e6e8073385b061cce7a0 SHA512 5d5bb7a56c48ed6df163a938096e42169dd8d3cd6994e215c40da86baea8cb3aef302d3c5eb2620f592477cb03275bef8e997f8720aaeaf6cc38a3a66068cbbe
 EBUILD Convert-PEM-0.80.0-r2.ebuild 673 BLAKE2B 13c83ad21b356b9d93da179eeb51618e011b8cdaf24319a03b5f1fc980584289d8494949df5dd57aa84628a8dca14e14e1df9218275090d5c4c1e678dec7c16f SHA512 49a14864621e8bc135f0dd45fbf7fe66c63123633c3430efcd26912f137964f380fe07c660540cc74240b7d1b50f0a781d745c3449275e5968de2fb9bf2e2515
 MISC metadata.xml 459 BLAKE2B 5d6c0b0b3f6926568ea47c0b1cc32b879ce5990aa184ae75b74fe6f20dd6ee30f4b62d81b411799d07e5716c3e325aa51e9ec969e48e35e2314ed1d5fd6191a7 SHA512 f2ba761d6f30a999bc2835cb7efdd3d64aeaf8aac85f5ccc7c15e880c7f7ff2e9b930a48cf8281361245d4922c075df8d426aac4f51e5e9889f4f49cc7bccc25
diff --git a/dev-perl/Convert-UU/Convert-UU-0.520.100.ebuild b/dev-perl/Convert-UU/Convert-UU-0.520.100.ebuild
index 9c187d2466b3..4fe8d9fc893a 100644
--- a/dev-perl/Convert-UU/Convert-UU-0.520.100.ebuild
+++ b/dev-perl/Convert-UU/Convert-UU-0.520.100.ebuild
@@ -9,4 +9,4 @@ inherit perl-module
 
 DESCRIPTION="Perl replacement for uuencode"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-perl/Convert-UU/Manifest b/dev-perl/Convert-UU/Manifest
index 06346627b343..4fd235b2fe73 100644
--- a/dev-perl/Convert-UU/Manifest
+++ b/dev-perl/Convert-UU/Manifest
@@ -1,3 +1,3 @@
 DIST Convert-UU-0.5201.tar.gz 7048 BLAKE2B 1b762afa8fea704f954151c15722d6465a0b65188193e131184cb0d7c73aab3c5bcd63426ef848872511bc8f9ed3a23ad0148d502f5fb3cce3e38b4c5905f224 SHA512 2f44805dfef3bc0ea3f632c474ddbe8bde12e3b986eb49a21b68a730bb1df7afe8b5a64e57855ff9911a2bfe7f517b14a7ecee9d33b2f3a892871507fe461476
-EBUILD Convert-UU-0.520.100.ebuild 242 BLAKE2B 2d7d93dc809ed8041531543da9bfe56dbd278f7fe6c12a6c23d8e574edb2cc8c2a9912a99575cea98476ede874612049ef70f2b7ff600d8482444b775f83c917 SHA512 931cc88c81fdb708067c0207175a0189b14614389c4117c92645ed7219fe141207c6a3af0dd96fac3c72dbe21d147fc143f8429043338ac783ca84cfb563f0e1
+EBUILD Convert-UU-0.520.100.ebuild 247 BLAKE2B 6887a2d98478597b898282d8b960a6739461c39691e95db3e55f6aadf6b255af9c24c327ce19c91d6c494cd4002e216dbebf6774b90220ebd9bd13b80f8322fc SHA512 92265237b2870b4215e9f9ac1df404242c0632704677d7921b98c75011efa4d8a206ab991e9676c19462e5e30f2222a1294f451bc8711bf1c279de2b15393459
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/Convert-UUlib/Convert-UUlib-1.710.0.ebuild b/dev-perl/Convert-UUlib/Convert-UUlib-1.710.0.ebuild
deleted file mode 100644
index 1dcd1bac1c1e..000000000000
--- a/dev-perl/Convert-UUlib/Convert-UUlib-1.710.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=MLEHMANN
-DIST_VERSION=1.71
-inherit perl-module toolchain-funcs
-
-DESCRIPTION="A Perl interface to the uulib library"
-# https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Convert-UUlib#Licensing
-LICENSE="BSD CC0-1.0 GPL-1 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/common-sense-3.740.0
-"
-BDEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.520.0
-	dev-perl/Canary-Stability
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.71-tc-ar.patch"
-)
-# system-uulib support had to be removed
-# - uses 'unint.h' that no longer ships with system uulib
-# - Bundled headers use different symbols not exported by system uulib
-# - XS code makes use of DEFINE's no longer in system uulib headers
diff --git a/dev-perl/Convert-UUlib/Manifest b/dev-perl/Convert-UUlib/Manifest
index 68568c086898..f5eda6b5c35d 100644
--- a/dev-perl/Convert-UUlib/Manifest
+++ b/dev-perl/Convert-UUlib/Manifest
@@ -1,6 +1,4 @@
 AUX Convert-UUlib-1.71-tc-ar.patch 542 BLAKE2B a31d565d82d1af82a8a4c626046b46487960f74ffb52e610823d728703e9e3e67afec75ffbfaa226298c7901f2eb7cd580f5b8f914d3580375bffa09ee768d13 SHA512 d8a314fe1c22dcb72627a9c97b8bb689b96bec618f316875e9b2efb0e30a0af7ce248cffabb6b560c0c247ad9293e10b1089b7137c3a53ac3e5393ac6a1e865e
-DIST Convert-UUlib-1.71.tar.gz 277227 BLAKE2B ea5eab834a1b7c1d2edf19fabdc51bd2e2fac73413b26b7bf8c1d5c4accb342e9c9cfe026182188bd4efa50bafa34f033735109ca356eed7569a569284e823db SHA512 6ca67737a29709903322f506063c4c65e17a15a2cef40959cbf1309ba608867516f554bdec426e217ec610f84e76197d41cb8a2ac7d57fb640728b0e2ae5ef31
 DIST Convert-UUlib-1.8.tar.gz 302763 BLAKE2B 350e7eae80d3bad0b1f7020cbcc3f08113ff48ec9ed1bb3a7bcaefabc9c352382da719349aca92f4b8a533edbd3036e55fcc75f05cc80e4a52bbfa9231de328a SHA512 4ea39cf36e7406c9e8a8e0c50778594f004b91a53f7aa0f90d8e127791d85bad00d8d5586bb35180b2605c5552567d0ae62f048de92fb85b9d99a8f14d9a0a40
-EBUILD Convert-UUlib-1.710.0.ebuild 1015 BLAKE2B 98e4572af30783c9d44a0c648a81e3c8c710ef69367d13bb52ebc86d292c4af24625fb2d157236ca989c8cfd7c20ec975bb9eeb02282b273a32ff25ecde97f76 SHA512 fabf6d01ea9d51ab9431bea7a54893abf2bc7b6f7814fdb6f9ae18c61eacf457f7b7919c7c76a67f4abcf882969f9a323c2ebe644297beb3560c4b50defcd714
 EBUILD Convert-UUlib-1.800.0.ebuild 1020 BLAKE2B f77486dd6cae1e0f2f3eda407ae1a9983d4cbd740a01538a8649a1b92833be934d3149936fecba4e87e0d840fb34eb8b41f0d59b60e4e089273bf2abd5846ed4 SHA512 09f1d4bc7f2bc6648b30730eac0d48e45241a358c3fc078c48c7f98fe4a2f49878e987b4ea147a4f5038e5710715e79769d2574b3901500bb25202ef0b0e3437
 MISC metadata.xml 399 BLAKE2B ec43a2776f0e563c9fb1bef5d3183c6d43e55ff6ee6d209d56b5a55e0d3cf13bddeeba690d6f85e1030a9653ca8985831a4a3f51e253c17f798d59ce8d699208 SHA512 7d367d403f6186803c1fa9b297357e3db3c362bd5c8f4be36ed0ce6cd8f6cd4204cb311203de583a8558b98d3b0e47a3a4c0f1abed31e9614576452d22101df6
diff --git a/dev-perl/Cookie-Baker-XS/Cookie-Baker-XS-0.80.0.ebuild b/dev-perl/Cookie-Baker-XS/Cookie-Baker-XS-0.80.0.ebuild
deleted file mode 100644
index d23155fdc242..000000000000
--- a/dev-perl/Cookie-Baker-XS/Cookie-Baker-XS-0.80.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=KAZEBURO
-DIST_VERSION=0.08
-inherit perl-module
-
-DESCRIPTION="Accelerate Cookie::Baker's crush_cookie"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Exporter
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
-	test? (
-		>=virtual/perl-Test-Simple-0.980.0
-	)
-"
diff --git a/dev-perl/Cookie-Baker-XS/Manifest b/dev-perl/Cookie-Baker-XS/Manifest
index 252b49632041..aeff1bccee63 100644
--- a/dev-perl/Cookie-Baker-XS/Manifest
+++ b/dev-perl/Cookie-Baker-XS/Manifest
@@ -1,5 +1,3 @@
-DIST Cookie-Baker-XS-0.08.tar.gz 56729 BLAKE2B 040688d8b0d519a40833cb99b0601e1b591f7db33c63673f0acebea8c2228fb3e2b5f2cb32a7dbd2e793a61203af3a232c67f7df6d0acf99664b183fe4c4d7ad SHA512 ac51a13f0cedb329b15abefd4f4eefd6f40729f0dcc0458154ddba30fff53e9b5ae994a8d6051c1da2105c0901480c22ae99845d46a7fc5ba980cc447f98ee34
 DIST Cookie-Baker-XS-0.11.tar.gz 56814 BLAKE2B a62fafe4c5ec0a789865737440c08769b66fd5de637806ffee6f39be3810db21ab141c37709f416e1a3e140b931d05df8296236ecbaa7b676d6481a83319f3d8 SHA512 01c75cb2bd9163cc2e27bf5343a9bc7c596158ca57f93437307ee3a0d991ecc5c1c24e26c3e2a1116e5685fc5b6aacf17d09f22bba99919acd3df55964be762f
 EBUILD Cookie-Baker-XS-0.110.0.ebuild 554 BLAKE2B 754fd07519014c1765a99255c866138ee740e2eea6d4b9d3ba3d49830cddfffbbe7075a672d120d50fd8c6119b41d23d30c65bdceff41bd26be9edc07c69bf58 SHA512 70929d3b164f3b6da6a2abcef0a8838ffcbfeb62d7f274e61a73c16bf1b15755298ee11df9bca1576922b72abfff367d3c1acf260a269503d6ce4ed6300e0994
-EBUILD Cookie-Baker-XS-0.80.0.ebuild 474 BLAKE2B 2c335f2e5a5d6897f919f951da9ce5ebf92b8c43b9e6844545a70bdc1236bed88e8b0c0750cc5ad78545ebd57fbcbb25ad2c9ac8e7df03dd80f91b7a4c0f5e84 SHA512 a84d0bef87443a669700ecde23873b57fb9f7e6c5c06febf676db770001e23e1fff552a495843da4f686195c8bdff0dbc443739c4b4663474ebb3681ffe54fda
 MISC metadata.xml 404 BLAKE2B 9cc838ecef3c4468c0c8e2270805ca077a62bb22914646d199113fe9478d3053c166a6d69a8b6a5641ae7743513c8ff57eecf53d5d200002365d6c05cba4b1a1 SHA512 769574029f70eab3a831993b3d1e50fac7fd1bcacc8881295036a3f0a93067480296bbf91efa0c05d579cc9107aa01de6943ae327f10d839338e18960024082a
diff --git a/dev-perl/Cookie-Baker/Cookie-Baker-0.80.0.ebuild b/dev-perl/Cookie-Baker/Cookie-Baker-0.80.0.ebuild
deleted file mode 100644
index b0d58f753c64..000000000000
--- a/dev-perl/Cookie-Baker/Cookie-Baker-0.80.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=KAZEBURO
-DIST_VERSION=0.08
-inherit perl-module
-
-DESCRIPTION="Cookie string generator / parser"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test +xs"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Exporter
-	dev-perl/URI
-	xs? ( >=dev-perl/Cookie-Baker-XS-0.80.0 )
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-Tiny-0.35.0
-	test? (
-		>=virtual/perl-Test-Simple-0.980.0
-		dev-perl/Test-Time
-	)
-"
diff --git a/dev-perl/Cookie-Baker/Manifest b/dev-perl/Cookie-Baker/Manifest
index dfdad9d3d7ef..b7dcf12adb8d 100644
--- a/dev-perl/Cookie-Baker/Manifest
+++ b/dev-perl/Cookie-Baker/Manifest
@@ -1,5 +1,3 @@
-DIST Cookie-Baker-0.08.tar.gz 11981 BLAKE2B 47f15e9f5333c4e5ece274dec44f54275bed02570a253cb46903495961f2c68f3cd77fcf73747e7e17e8649fe75439ec08ea1cbfaca7a0d03bbeea07b292af0a SHA512 5beeac6ff3a2d2ae73d5efd49490af240c2580201a87e739882f3c7d8fc20ee77c225349d130752b52ddbabf7bd173015d8d5cedb609c30a748e3d9e41efda51
 DIST Cookie-Baker-0.11.tar.gz 12496 BLAKE2B 906a1edb558edfe4da6b42a6ec82fc2635d355b90f784d5e7c3e2783691afc21e20ab2129bb231b2607e3fb8a0650436a328b7851aaa07dca3dd0036f9d2dfcf SHA512 0b75d9c74e1daa5d4dd63febd887e6c4825fd1df5f56335bf733b5bf2f24a56f6b76728259799aaf4dedf27efae90c238962585956608b1408a67164c3759ed2
 EBUILD Cookie-Baker-0.110.0.ebuild 546 BLAKE2B 488f6d474393db8d9187f352bfde7745728a58118ab01ac6b9091b21a0bf1b4a800cefc04a3b0fc4410f065deeb1ce75198d0fbdeceabf26c88dd99871f28941 SHA512 aee4412dfdbb10159f855bc6b8ad95f09ad4cbaa76e40d87759d525d055f6009e7b345c9b17c3d3781102d7f70a53b208b708c213b6f63ee26d3e730d19c026e
-EBUILD Cookie-Baker-0.80.0.ebuild 544 BLAKE2B 9ac0aa3d077c14a7d264fd4a89734dff69c7a61ba6e6ac784fe08587f79ac15f916835767853ad62aeb49cef62e12a9a59bf5dce84b1ba509b09b06c564b6774 SHA512 fa4d421fb4ef98f0993396778a779f6f16fcbb03b43c6579334c7acc5a750a75dbd51a32c3ec725290ebdff7a938c8fc86d52215a29c3242851cf59aa59231ba
 MISC metadata.xml 513 BLAKE2B d0ab57c673995e5417bfa8affcefac2f5cea048acc6e64d4c32f97e2eccb67f771b391d1941bace7cdc679f3ecbbcbcff48a1a0a7b1443c9313a7e9a5fefdbe7 SHA512 f935646530d24f2f908b2e80aac14e8d87a95aadc72fc942dfafbaf47f80df275e0735d34d44888a0fc023954c158a9922fd94acea5fdb69489b6c6162ddd59f
diff --git a/dev-perl/Coro/Coro-6.550.0.ebuild b/dev-perl/Coro/Coro-6.550.0.ebuild
deleted file mode 100644
index 7ba23ca2253e..000000000000
--- a/dev-perl/Coro/Coro-6.550.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=MLEHMANN
-DIST_VERSION=6.55
-DIST_EXAMPLES=( "eg/*" )
-inherit perl-module
-
-DESCRIPTION="The only real threads in perl"
-LICENSE="|| ( Artistic GPL-1+ ) LGPL-2.1+ || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ev event"
-
-RDEPEND="
-	>=dev-perl/AnyEvent-7
-	ev? ( >=dev-perl/EV-4.0.0 )
-	event? ( >=dev-perl/Event-1.80.0 )
-	>=dev-perl/Guard-0.500.0
-	virtual/perl-Scalar-List-Utils
-	>=virtual/perl-Storable-2.150.0
-	dev-perl/common-sense
-"
-BDEPEND="${RDEPEND}
-	dev-perl/Canary-Stability
-	>=virtual/perl-ExtUtils-MakeMaker-6.520.0
-"
-PATCHES=(
-	"${FILESDIR}/6.514.0-ev-config.patch"
-)
-src_configure() {
-	local myopts=()
-	use ev && myopts+=("EV")
-	use event && myopts+=( "Event" )
-	GENTOO_OPTS="${myopts[@]}" perl-module_src_configure
-}
-src_compile() {
-	mymake=(
-		"OPTIMIZE=${CFLAGS}"
-	)
-	perl-module_src_compile
-}
diff --git a/dev-perl/Coro/Manifest b/dev-perl/Coro/Manifest
index fb875b3ae6ad..33fa5d4b52bd 100644
--- a/dev-perl/Coro/Manifest
+++ b/dev-perl/Coro/Manifest
@@ -1,6 +1,4 @@
 AUX 6.514.0-ev-config.patch 1910 BLAKE2B ff12ad9b3728434bf44c8052b6eb9eeafc92ed3b1473b7bf81c2fb93eb1b5be3839e129fccc6bea422446bdeb84b630aa955deef86bf7b2e608dca02411408e5 SHA512 8738d753d174bc1de81d8d21a59de4ca738e2f9b5810b3a5d0b66c06b724aaa5b4a98b229ef0eaaf0ce2f435b8566fb89b5de24a7156f0c4a3504a7954b81e92
-DIST Coro-6.55.tar.gz 195586 BLAKE2B b2f6f47f91fcb4af584896cd91c2631d5622556d63206eb1e7a5796cc3b7d0498d40021f06a8367402a34b0771b7ccc80776598a61811cc67d828828bb8a5f4a SHA512 47f22033e52d1734755d7f68175b86784c688a8b8e87d0ce0295e7fe9df9134d5ac9fce8915e8ea1d9355a6d1f3642c44c3c4d745e1e6afb0a9e61c15b47d41e
 DIST Coro-6.57.tar.gz 198128 BLAKE2B 1f4dc360fcf40aecaf283ca73b8ac29d9c905f2b6231ecbef708b3ae677a5fb483478521da5a550da37bf2df7f045bfe82de76d3feafab6b9b3c04ba8baebd84 SHA512 d5655c5df1d502c265b26e474f1423f9406029ce56254a92d78b51e14313f685575095e185758d743d78f3c74d758922ec57f714498cf982819c110d198d6f42
-EBUILD Coro-6.550.0.ebuild 942 BLAKE2B 09c5ad672978caeff15aee41c68ceb6b5eb256659399300db4de2ba8c81a3254c892b55ece6d08c0c27e79d15b64c4e110ad46a9b2e61910d9103b942861f88f SHA512 42f5e6d52e027dfab40cac76a3aad259ebc2fe0e08d6b517e8438930e61e6e2af4d0b9fdbffb87312f27e67904224a9551de37a3fc1b55f14d124951cd540942
 EBUILD Coro-6.570.0.ebuild 942 BLAKE2B 043fdfda412d1a4dd3da18fcecf67ff40c0f0cb75a0657fb8f869ec59fd7e5e7a75a3bb5a01873a0e6ebf21ddad7d7683667b13813688f7db5bb728881513b1b SHA512 b2b5b7a5f244e9b740a03ee20a545b090454b67ed14f9ad348aa79a17c2f771f5ce429e7e171f0f853d055a61607c7618b38318aef4c1393f46d59fa417ff679
 MISC metadata.xml 2047 BLAKE2B 605c8db809c39726086f590de31545be61b3987aeaa6c3a6881e8b78775efaa9d01bb595b4fb6fed0c60b4bb2372cf8114e6c21e44c0483233677b60d34c1016 SHA512 b9059669495c5210e8f84c5d2584f826d1935733916b8db107dafa4dd4889713961cc04411e930d5c404195ac376a0735c8bfb9b24a0c39b299f6590ac10951a
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.190.0.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.190.0.ebuild
deleted file mode 100644
index f7852a59aa23..000000000000
--- a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.190.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=RURBAN
-DIST_VERSION=4.19
-DIST_EXAMPLES=("eg/*")
-inherit perl-module
-
-DESCRIPTION="cPanel fork of JSON::XS, fast and correct serializing"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-Math-BigInt-1.160.0
-	virtual/perl-Carp
-	>=virtual/perl-Encode-1.980.100
-	virtual/perl-XSLoader
-	>=virtual/perl-podlators-2.80.0
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Data-Dumper
-		virtual/perl-Test
-		virtual/perl-Test-Simple
-		virtual/perl-Time-Piece
-	)
-"
-src_compile() {
-	mymake=(
-		"OPTIMIZE=${CFLAGS}"
-	)
-	perl-module_src_compile
-}
-src_test() {
-	ewarn "Comprehensive testing may require manual installation of dependencies"
-	ewarn " See: https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}#Tests"
-	perl-module_src_test
-}
-pkg_postinst() {
-	ewarn "This package provides 'cpanel_json_xs' in PATH, which includes optional features"
-	ewarn "otherwise not automatically made available yet. If you desire to use these,"
-	ewarn "please consult:"
-	ewarn " https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}#Optional_Features"
-}
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.260.0.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.260.0.ebuild
index d739ae23dc60..cc156cc2c0e5 100644
--- a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.260.0.ebuild
+++ b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.260.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="cPanel fork of JSON::XS, fast and correct serializing"
 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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.270.0.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.270.0.ebuild
new file mode 100644
index 000000000000..a7438bb6d3c3
--- /dev/null
+++ b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.270.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RURBAN
+DIST_VERSION=4.27
+DIST_EXAMPLES=("eg/*")
+DIST_WIKI="tests"
+inherit perl-module
+
+DESCRIPTION="cPanel fork of JSON::XS, fast and correct serializing"
+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"
+
+RDEPEND="
+	>=virtual/perl-Math-BigInt-1.160.0
+	virtual/perl-Carp
+	>=virtual/perl-Encode-1.980.100
+	virtual/perl-Exporter
+	virtual/perl-XSLoader
+	>=virtual/perl-podlators-2.80.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Data-Dumper
+		virtual/perl-Test
+		virtual/perl-Test-Simple
+		virtual/perl-Time-Piece
+	)
+"
+
+pkg_postinst() {
+	ewarn "This package provides 'cpanel_json_xs' in PATH, which includes optional features"
+	ewarn "otherwise not automatically made available yet. If you desire to use these,"
+	ewarn "please consult:"
+	ewarn " https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}#Optional_Features"
+}
diff --git a/dev-perl/Cpanel-JSON-XS/Manifest b/dev-perl/Cpanel-JSON-XS/Manifest
index e8f615f96ff0..20f6755a3e67 100644
--- a/dev-perl/Cpanel-JSON-XS/Manifest
+++ b/dev-perl/Cpanel-JSON-XS/Manifest
@@ -1,7 +1,7 @@
-DIST Cpanel-JSON-XS-4.19.tar.gz 251461 BLAKE2B fa22192d017fc41327e71b84f47e3939765b0c48586cc31876f744c2a51a93b36f6d41b8c9f92bba04875123604efe3fed6a486839dbfb39623cb2a4a4064087 SHA512 c67b62e8f95900cb3626357cfa9976f1553f84ffd10a977d47839ca3b317014473c3a6e48f6680478b89bbdc2ac177b22441ad5e49e7e8eb0344ef14a3c52b10
 DIST Cpanel-JSON-XS-4.24.tar.gz 254008 BLAKE2B 4449d0d562388c547ab26e87048b49d2e77e7508c8bc2c4db4af562ecfed768452cea1daca60e8ce59ed464b9d4ceca17d73326a16bec3e3a6d42bd6e13df7fe SHA512 311746bd6d686f758db4507c1219675b262205a8d798662b8f5521d3f9c7d76678580a30e26281b461647763d552cb76fdbbcf4aa1737dc7c7416364179741bb
 DIST Cpanel-JSON-XS-4.26.tar.gz 254123 BLAKE2B 52a42c48b920a536a9c203964a4a379555f2032e75d5e32d5a9865f62a05e4377ce80ff1a2f882c9d5932f4b602de1f562b9e1e4fb3001813b6fffe2702be2bc SHA512 3193988a09670a5de6b6292e9f35e8c374518120648a206b769802fb4a66e6487a4ba05b3e89e214b9e3f5985452be74c17aa67e4bf96e88097812be75b2ed9e
-EBUILD Cpanel-JSON-XS-4.190.0.ebuild 1439 BLAKE2B e2a5b335a450d12ddd516ed99e1603f1d9e2705a322d2dff4f5f831ffc2cba5b246b9ad50b60a3db75246280d8004f763ac26542ddf8f65e3134a2ae16f59313 SHA512 e52fa56865fe26dc2c52ad16f721e4dbb977d46ec8bfde648681b0de33dfad7123c6f66d226e6db42864a8a2d8cb4d7f05f02d91a14ef0e91c0163cd667cb601
+DIST Cpanel-JSON-XS-4.27.tar.gz 254221 BLAKE2B 02000882b22413e2012d9b63e2dbf78c5cc4d1263c15132592d6a219b0ab4ace15ca7e833e1abaa950363a0dccccba1e505c48160cc1a69af884b007ebb8ca49 SHA512 881da3685f96111db5b99fd6889f40af49398c77b24afed3a92d852c615448fc7221d7f2c417a7abbb50e49176092379b20c90a0cafb324817dc2f6d8bfa794b
 EBUILD Cpanel-JSON-XS-4.240.0.ebuild 1462 BLAKE2B 623f1257ed431f84c6f2b0b370b164a76a8f8154f0f6b325600e144384cf315288b76d3692548a96cfeca7e2f1513a80d5acc49a1ba611b77be6827462117d8b SHA512 2d5148ff49da822dd6410d6d5a7bff6c975f5381f27b683a31fa9205ab2196e0500872c4bcb768b2055211ea12346da1cf47012f9dffca46cc7ff61bb4ba3e67
-EBUILD Cpanel-JSON-XS-4.260.0.ebuild 1462 BLAKE2B ed6db5594a239e463263bb606a66145b1696b00b933fcfecd8da1a93778fa05b430caddb3e5b80d29e97afe7df1132a3d9c5da548cb3eae930cb2d3e3e92ec66 SHA512 f0ed45353ab86285e62f12196c81cc964821fc518008baea8779d9c219ce348e5181f0e6f55ad5f3d6c00c4112e78353860bea12b75cb487d5f01a1fcd98f2fb
+EBUILD Cpanel-JSON-XS-4.260.0.ebuild 1460 BLAKE2B be08e53a1e61afe37384fcc3f7d34dd4c34d8dd4f9bded2e007089339968c1c02f52b485b7f1eba98ad470a8bc43351fc9b672f68186ae4666c73f6a2dcbd8e8 SHA512 a6a549fb7a4ac89ab6c250dc1039de77444571ec0193cadb962244cf138465fd5b7b21e7c48680bc2c6792c63be37984c30483e7b214c67cdcdf4ecf7969ed31
+EBUILD Cpanel-JSON-XS-4.270.0.ebuild 1158 BLAKE2B 6d7ec603e8fa5e08abf1d044d79ab37bf6f1929c31f6172b6abc2e196cf9a20ecb5ccf2d24d394bcb6c1fb77e607b572b483ec329e8efe900e475b99541b51c4 SHA512 0907489cee361d7f6889f5b58fafcfb87f64e778694ed18532f2115876d528f74658093d0a9e8a7e8f9675c9cd515c895d78485b35b6586ba66148c9b3997e10
 MISC metadata.xml 471 BLAKE2B 65685b2accba3914e74f5c8f993fd2a8dee694ea6e0bed7393a4e8050d741fd352f03383d52420ee85a6dceedd2a485c886d1ff25c8835b1444fb1000a067022 SHA512 4edf8236a19c33f4562110b31c1f11950211d7888e8842b09ce9bda8c513939bd8e96244f646b7f26dd974175703c7100a7158ac496fd1b33ccde5c5b62424a2
diff --git a/dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r1.ebuild b/dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r1.ebuild
deleted file mode 100644
index a63e93282742..000000000000
--- a/dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=LDS
-MODULE_VERSION=2.33
-inherit perl-module
-
-DESCRIPTION="Encrypt Data with Cipher Block Chaining Mode"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/perl-Digest-MD5"
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/Crypt-Blowfish
-		dev-perl/Crypt-DES
-		dev-perl/Crypt-IDEA
-	)"
-#		dev-perl/Crypt-Rijndael"
-
-SRC_TEST="do"
diff --git a/dev-perl/Crypt-CBC/Crypt-CBC-3.40.0.ebuild b/dev-perl/Crypt-CBC/Crypt-CBC-3.40.0.ebuild
new file mode 100644
index 000000000000..981b71b48d83
--- /dev/null
+++ b/dev-perl/Crypt-CBC/Crypt-CBC-3.40.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=LDS
+DIST_VERSION=3.04
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Encrypt Data with Cipher Block Chaining Mode"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~mips ~ppc64 ~sparc"
+
+RDEPEND="
+	dev-perl/CryptX
+	dev-perl/Crypt-PBKDF2
+	virtual/perl-Digest-MD5
+	virtual/perl-Digest-SHA
+	virtual/perl-Math-BigInt
+	dev-perl/Math-Int128
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Crypt-Blowfish
+		dev-perl/Crypt-DES
+		dev-perl/Crypt-IDEA
+		dev-perl/Crypt-Rijndael
+	)
+"
diff --git a/dev-perl/Crypt-CBC/Manifest b/dev-perl/Crypt-CBC/Manifest
index 6deec3abcf74..c45b2de5b6e5 100644
--- a/dev-perl/Crypt-CBC/Manifest
+++ b/dev-perl/Crypt-CBC/Manifest
@@ -1,6 +1,7 @@
 DIST Crypt-CBC-2.33.tar.gz 23470 BLAKE2B 476e555df0000fc81c8be9af6133f018bc1daaa5b0d4f5f16ba37c68ce07dc720d418fd9f0ce1c452d5ad82fe00014ab735c6a94d3d5cc052284faf95e21d548 SHA512 5db17905c38b46f496617095655bb48e4737d6813c794f65dce88556f177caee1d5f669ddb0da3ad4b00e11ff1bc0af91fd4cd312ed2fd8497e410ef11176244
 DIST Crypt-CBC-3.03.tar.gz 40174 BLAKE2B 3a104c630bd355cfd1f4b87836db4460530437dfd21facbe221062c7a7a7142ec7450c79bcc93e797b219251622dc5c4d0c9e7f849fc060f6e197d3a1c66cc54 SHA512 c1c55dd5fae83d45893f47319323f6d0ad8295ec480b8ab034beeb33bb7d16f26bbedaeef6613a3495849f5034e7502b01c88ab75dd4d69234151d3b674929e6
-EBUILD Crypt-CBC-2.330.0-r1.ebuild 656 BLAKE2B 9cb7e3dc011ef7fe45041e375913232c7a7ba1f5e2ac5648217668ade87e943629b241550f9b3ed05f70253f9c6e4ed34a0d40df8cb8d6cccc4a198c9c0fe91f SHA512 d864dddf1e279af769f1688b5228c4f9de8a8343d1c22ec8f1a1ee54f75ebcd656679e3e60de9391ab763ab20a76acbe326e1ae2d6f6cfb8f861cad04d8c9989
+DIST Crypt-CBC-3.04.tar.gz 40237 BLAKE2B 32565d45dd16ecb49dc0da3f751db8f4c700ebc9215a0e9c7c7ef7c9c83ea622f8a7e6dfb0ed28561c8c7653fc5c000e7f8d29ed744eb5f614a5c8540121e2e0 SHA512 e1d972d2e7865b9799b289d3633342dae6b942295e3a63ad9edaf6c25c30d6691366a6a27896b39a1ef1a25ad83ebb25545c71e31b04a978377da4db5edf2f25
 EBUILD Crypt-CBC-2.330.0-r2.ebuild 685 BLAKE2B 686572fa2b5571d8acca686e4a86ca998840ee57d8d3c1ae948f2c8be2af9588421c708162808ab712a209379dda948f54aa7f609f420b4a1e00b991a0e72dbc SHA512 0b0fb6b30341d79feb0087b5186abfe3c91bec0f5aabcfcb4d17f767368b3d9df52f2d704d14b6cf6311484981b9f6a71a740ac3d3cb2b2f92dcbc1777483892
 EBUILD Crypt-CBC-3.30.0.ebuild 667 BLAKE2B e11bf20f4d7c81bb6cfba61fcceee8f3cb859f723a10467922ed43ebd9571220988faa5d7d6b408b72f7aba93f40cf1e5841840c3c01253191e82d084db98f9e SHA512 e9944561ab69e9e00a4a278e37feb76721d658a6fec42983805b926f37bbe9f91337c6a7c322e3f8ae591cd7ea1fef0d06ece032d522d6750155897dae81ee70
+EBUILD Crypt-CBC-3.40.0.ebuild 631 BLAKE2B a6563a182159770e8d8debf9c2ccefaf63bcd5ed9f63a36fc6f734db8f70fc2cd37ce90fc12dff95fa6224c33a29573495f9d40830c80aceedf7483df67317d6 SHA512 0edb8f62b85b44c5b2f4b3d244467f5dfb0e06861069d77e4e32cbec0985b50f52342a1a4b4bf3f7c6225b7e006c57f28c8589cd7495d07f095f0c55d807c63e
 MISC metadata.xml 391 BLAKE2B bdec40b3e49a61d734c22d926bc4a2a4ccae14a878d92272f36689991114ada06b27895916a3f095a372b03a129a40aa38f32cc2eeb26ed8e286164c5641b7c7 SHA512 98a77c9957bf9b37eb9930193ab448e929c54e4ac78b57e8d318bf08c17d85a69be91c3e5ef1869d8a8cd01b8590f529d8c27abbc413480be80486fc3ddf1d53
diff --git a/dev-perl/Crypt-CipherSaber/Crypt-CipherSaber-1.10.0-r1.ebuild b/dev-perl/Crypt-CipherSaber/Crypt-CipherSaber-1.10.0-r1.ebuild
deleted file mode 100644
index fe61b23df93f..000000000000
--- a/dev-perl/Crypt-CipherSaber/Crypt-CipherSaber-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CHROMATIC
-DIST_VERSION=1.01
-inherit perl-module
-
-DESCRIPTION="Perl module implementing CipherSaber encryption"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-Scalar-List-Utils-1.4.2
-"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		>=virtual/perl-Test-Simple-0.600.0
-		>=dev-perl/Test-Warn-0.300.0
-	)
-"
-PATCHES=(
-	"${FILESDIR}/${P}-newline-iv.patch"
-)
diff --git a/dev-perl/Crypt-CipherSaber/Crypt-CipherSaber-1.10.0-r2.ebuild b/dev-perl/Crypt-CipherSaber/Crypt-CipherSaber-1.10.0-r2.ebuild
new file mode 100644
index 000000000000..958f8de0be75
--- /dev/null
+++ b/dev-perl/Crypt-CipherSaber/Crypt-CipherSaber-1.10.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHROMATIC
+DIST_VERSION=1.01
+inherit perl-module
+
+DESCRIPTION="Perl module implementing CipherSaber encryption"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/perl-Scalar-List-Utils-1.4.2
+"
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? (
+		>=virtual/perl-Test-Simple-0.600.0
+		>=dev-perl/Test-Warn-0.300.0
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-newline-iv.patch"
+)
diff --git a/dev-perl/Crypt-CipherSaber/Manifest b/dev-perl/Crypt-CipherSaber/Manifest
index 71d5120d7629..816220bd408b 100644
--- a/dev-perl/Crypt-CipherSaber/Manifest
+++ b/dev-perl/Crypt-CipherSaber/Manifest
@@ -1,4 +1,4 @@
 AUX Crypt-CipherSaber-1.10.0-newline-iv.patch 3370 BLAKE2B c2a97a2d879a26493b3a538e500f6a7cbeb6eebc1eed04ca45d9040a54dcf399529278190bcaa9f36360e5858f8a4f910d0e5d72d41234a920d1e88072a63411 SHA512 ca7d330f5e5aa7197ddb6092a737a381ba9e2d8ad7caa0c8ffcbcf570aafd402024e74baf05d32051f7239bd09c6e6d918ed8a28aeec772d8e273737cb8b626e
 DIST Crypt-CipherSaber-1.01.tar.gz 11527 BLAKE2B 620830f192fbc73812209f41fffda0f397140d2b4d6a293eb53dcbb5f8bcd27f3eb7e2881daf58bff2b976ce82dc56346931e621c3a946f41e18b2598b162363 SHA512 c523b3db0b011b560a3f1f45793cdcdfb2bda0ed196bed02f058d39a5f9505826113eb6f0f6baedcb3a0bcc5dc1218fb311361c74701b321ecf8df4080722201
-EBUILD Crypt-CipherSaber-1.10.0-r1.ebuild 534 BLAKE2B fa2081d2b6470c3b73c613c81c6d323ca13c3682724b8246dde994b532a03f5d933cd1e6f8030681c1ae350970264dea937956c9ea928433e86e58a3a10e96b7 SHA512 ef88f4467d2186af02703c2118d22f0e2f064dd1c8d98ffb00274dcfac33b4d0616f766f818d4ac939df2b6406d4b80f8b6b9f7b6803ae5bc6392de87e8972cc
+EBUILD Crypt-CipherSaber-1.10.0-r2.ebuild 497 BLAKE2B 509b8ee60b250722f398b80363ced8225389555799041727299c2c5800db080be4eed77a1658e004ed96a6ebbd3fe94849896e8576e5dd659879291a76681422 SHA512 fd0a8d9bd8422fe93401cee1ee0e57303b4f8b478bc0aa149b8a1470c7a1bd9cef6493382fd3e742c30ef10cb27c139133b61df12e01e72d2ae96849bd13af19
 MISC metadata.xml 407 BLAKE2B 0b975e470de76bac561a78241eea5be067643f86af94720c0e7b176c8d1ccb803537a6df3490b062ce2c6ab04f42c9ff550bdfc94e6d9b57e1300a7e99f3a2da SHA512 e9c9bdb514d310f95dd66af0de167f26e8439ef62ba9ae10e9fa7abe07c2328c7ecc95106e7ead362735d1c373f3b7240fc4150c62e7e22d9d100101e0fc7817
diff --git a/dev-perl/Crypt-Cracklib/Crypt-Cracklib-1.700.0-r2.ebuild b/dev-perl/Crypt-Cracklib/Crypt-Cracklib-1.700.0-r2.ebuild
deleted file mode 100644
index f19a634b0f67..000000000000
--- a/dev-perl/Crypt-Cracklib/Crypt-Cracklib-1.700.0-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DANIEL
-DIST_VERSION=1.7
-inherit perl-module
-
-DESCRIPTION="Perl interface to Alec Muffett's Cracklib"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/cracklib"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-CFLAGS.patch" )
-
-src_prepare() {
-	use test && perl_rm_files t/pod-coverage.t t/pod.t
-	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Crypt-Cracklib/Manifest b/dev-perl/Crypt-Cracklib/Manifest
index 5a3602c715e8..2d3d76319562 100644
--- a/dev-perl/Crypt-Cracklib/Manifest
+++ b/dev-perl/Crypt-Cracklib/Manifest
@@ -2,6 +2,5 @@ AUX Crypt-Cracklib-1.7-CFLAGS-1.patch 615 BLAKE2B 411b7d0838c3572d2022d50eb9e9f5
 AUX Crypt-Cracklib-1.7-no-dot-inc.patch 449 BLAKE2B 10f24e1cefbec04b92bf86ba223568b26882791e113549ea846257fd9af9a399e38ecbabebadf36fa4b71913824ce95dde863c6e440ca4efc77d3f2f8ab67239 SHA512 759811c9146ae4547c2f535a0297687683cf53766bfa8105c8dab550d85fa2908a117fd003bf74743a1a1d14bb49c66d79efe502f092cf0a6eeeeb51004216e6
 AUX Crypt-Cracklib-1.700.0-CFLAGS.patch 365 BLAKE2B 810f920be8111b0371d529f005cbe3bc3f6c2b353efd7aac128182eda1f94f85c668f9d18caf432303eb6a344cf77557efb4ca9585df04bacd030f2250220422 SHA512 83ae51755f643f7069fffe82f9edf38378a987b087abb887d90a74a59997268d78d44e0f6c3c091e2f09eeba1f140d22c288ff2fb2b7fd1639fd1f92c1cbeb73
 DIST Crypt-Cracklib-1.7.tar.gz 27529 BLAKE2B af59e82f36baea3871dcd9de501c5dcd44c652207d5e3df8cd001e48285965ca26bb5df81e50ebfd5c575629783f7ba8c0f225cacb13eaff5c2ca2c3bfd1a018 SHA512 1364fb75bf363d81d418c2f0590dbe6f889ffc5db2a467931d5ef9221c1c762244eae34016a0c0ad57a12aeaa108ad22b3ab67cb8b28beb2f486d13e497f8e13
-EBUILD Crypt-Cracklib-1.700.0-r2.ebuild 635 BLAKE2B a0f1dcd441589a7ab7a3144bd39a876d8e26fa57184ed85f028c675d8a65753f0ac1ad48eacaf68917d7ae75e42054ed208d4af32e0313dcac618bca7f86d8b0 SHA512 b8aa76f3acb91395ad22f04c1c30ce26c002ed9a70d90b5065c0f8ec90725d66bf119a616a9ae96f34e89793a0d51a10a5830e59bf8323091693dcdef1031803
 EBUILD Crypt-Cracklib-1.700.0-r3.ebuild 678 BLAKE2B 7b1e0722cb6e3749514869a99cfe1b6a36cf35e4afbbbab5e3fdb69b947e789b09f55cdd83b282ba8711e7b45bb657dcc218eca13843c81ea1d7592c28be5883 SHA512 8ae56cf25aaa3862e1ab2b706e7f67229e726c9d1bafc35a3e7cbf74ccf107b2f77de841333ccc5c7b4c00be8a49139176faf61a530f443293faed583b243974
 MISC metadata.xml 401 BLAKE2B d6f316dac4db065a2995e02952acf652d85794d3484468b89d8e5673b1aec0b9c789fad25e9352f7edc4f6bb238feb7a7b289d9299863d9a9d40a4c6cb7c4402 SHA512 55e01c18a40842a096f3a64a14b87b13481549328a03d79bbb4ac6f4bd17f00e36fd9843f485a62f3dda93a1681c63adac80e00c6d572c8a991b1cf3acabee3d
diff --git a/dev-perl/Crypt-Curve25519/Crypt-Curve25519-0.60.0.ebuild b/dev-perl/Crypt-Curve25519/Crypt-Curve25519-0.60.0.ebuild
deleted file mode 100644
index 9e48563178dc..000000000000
--- a/dev-perl/Crypt-Curve25519/Crypt-Curve25519-0.60.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=AJGB
-DIST_VERSION=0.06
-inherit perl-module flag-o-matic
-
-DESCRIPTION="Shared secret elliptic-curve Diffie-Hellman generator"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES="${FILESDIR}/${P}-fmul-fixedvar.patch"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Exporter
-	virtual/perl-XSLoader
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-IO
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Crypt-Curve25519/Manifest b/dev-perl/Crypt-Curve25519/Manifest
index 76161d77fb59..69e61ae63190 100644
--- a/dev-perl/Crypt-Curve25519/Manifest
+++ b/dev-perl/Crypt-Curve25519/Manifest
@@ -1,5 +1,4 @@
 AUX Crypt-Curve25519-0.60.0-fmul-fixedvar.patch 6225 BLAKE2B 96227f80b3da21226400d4e94089c18ab630307d1ae172d4b2b42344998f933e5540ba45bde91199735fbc2b0ce42840a9096337c098672981c741bd2339e30f SHA512 e534ee2ca915287c97622cf7b1cca889416a1bf31f6f80c263a7bc02638c95a6f4058665deebeb42f0d5fb5775279902bfb431f31e16f8230e115a712d663c03
 DIST Crypt-Curve25519-0.06.tar.gz 27835 BLAKE2B 39ab90ae4044e897a9cf24c21d5a922520dc1724e0aa4612864ce996b27fe9234111cc8394f60caeac9734cab64f3a378a74b3eaf087ee5e6b3d168fa967f5bf SHA512 e5d351c36c9f60e1b55f45bf9fa871fddf949bd5c0a20b4d065e1eb2d4e24ba43807289591eda854fca28b5909fd6af1b0fc9ede63efbeeaf6e011e7382a4e1d
 EBUILD Crypt-Curve25519-0.60.0-r1.ebuild 696 BLAKE2B 54dad829e0508a03798eb77531a5b1fc938cb0e31f5f03acaf046fc2edd321d1bad4234ea29e620ce11519323a55750636dfc59a65b3792640998aae0cda4257 SHA512 d0f13fcb12f173405e0297843b54f7de661d265e5faa25fa5c8021ba64e96064d665362f17f1e905818da7e27dbe8aef04d01f786c9fc9813278cfeb4935f0e0
-EBUILD Crypt-Curve25519-0.60.0.ebuild 581 BLAKE2B 49f64749f1bedc09de19817bc0db403ebb96b76bd09c3982edf56d83c93408d0160f8d134ce771a97dd1f85417f0849532943adb430281ff647c8c334e7f8d59 SHA512 e622b89758c1aa610abc3299f7b936ebb674a7e9e3f8967482ba9e1e1b7cd89bb13e9cc2ade74f095df8591e6c8a9464a1b7e38864b15b84ef45344e8da675b7
 MISC metadata.xml 405 BLAKE2B acbc215035eb175c5d04100095b9195856c3948213dbd2400c695f3a79a818ff9f26aa9a8ebd02c9e41e9e1b207d84d7be92be814e5dac68c25ca2c7bb7951c7 SHA512 50f58b7c4230afdfb251c9d79475a50e32f0d9985d18d58b17697552b59bdf7cf3feb0056f47ef4edbd8a8c1b6d578e49b125656d34e506de63a50cfe523c473
diff --git a/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r1.ebuild b/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r1.ebuild
deleted file mode 100644
index 2306b61bd051..000000000000
--- a/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DPARIS
-DIST_VERSION=2.07
-inherit perl-module
-
-DESCRIPTION="Perl DES encryption module"
-
-LICENSE="DES"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-perl/Crypt-CBC )"
-
-export OPTIMIZE="${CFLAGS}"
diff --git a/dev-perl/Crypt-DES/Manifest b/dev-perl/Crypt-DES/Manifest
index 995c38a71de7..1fc5e6fa2413 100644
--- a/dev-perl/Crypt-DES/Manifest
+++ b/dev-perl/Crypt-DES/Manifest
@@ -1,4 +1,3 @@
 DIST Crypt-DES-2.07.tar.gz 16720 BLAKE2B d90b919ab493a7f37cd1506b86c459d68087e0dd153e16d0343b8b90fb44d19f57686aacb1c0dd34a3bb48c2d11ae1f910e7e131a3b05b38781d54d2e4d2c05d SHA512 95d40280850290fb2f9b2f26be2f47f2241e0aeeb842bd02c56d667062d65b3b65b9a87c045cbee50604f95f8a0d0b033c92334520de19022decaf77f77c7678
-EBUILD Crypt-DES-2.70.0-r1.ebuild 521 BLAKE2B 5207c1cb13ab8a8c74bf039f35332114ba3b6801033d064f97651087c38277d2c7897a3266f588c55818937c9119da26bd4d1a7a51b7d1764cc516f46b9257ba SHA512 2a8a8ad45812423f8c26272bfa45d1dc05b92465cf2a5233b954a0b3d6f5b5464964f96c49ead8b3fbc5657aeefa04d53f560bd2e28440ecf25e77ea3a5e093c
 EBUILD Crypt-DES-2.70.0-r2.ebuild 608 BLAKE2B 40c715891c564d125f04b9d85fd87a2eaeb7dea71a6b92481650c9ad8292eddc03dfbc4f0a9eea1d3afe0f57be881abd05c0dac9e7b14b9c6fa9621ec26f749a SHA512 3c398ddafc6f14d25b5439132eb2f4e7a1f316cc50164c341380ea42740d054490937d9b61c7729f121147248dd74a38b980bbe370b819fbf8af9d39e6f20480
 MISC metadata.xml 391 BLAKE2B a53200f3eeba6924ee51c961424c7d0a78aa528f790ebede514488a6e382fecd5978c7c957bb9b3ffe3e11fa15db4a2028f2ea634ca3d29da2227885cce5fcc7 SHA512 cf53cee85f25d81fc5835687b6b9efaeea46c77755bdae648536a16f32b53e1fdbbd7d12ad204df4972f7551c32081531586ede88cbe0d3b1d71e78f62867b8c
diff --git a/dev-perl/Crypt-DES_EDE3/Crypt-DES_EDE3-0.10.0-r1.ebuild b/dev-perl/Crypt-DES_EDE3/Crypt-DES_EDE3-0.10.0-r1.ebuild
deleted file mode 100644
index ed8c2d52b229..000000000000
--- a/dev-perl/Crypt-DES_EDE3/Crypt-DES_EDE3-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=BTROTT
-MODULE_VERSION=0.01
-inherit perl-module
-
-DESCRIPTION="Triple-DES EDE encryption/decryption"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-perl/Crypt-DES"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
diff --git a/dev-perl/Crypt-DES_EDE3/Manifest b/dev-perl/Crypt-DES_EDE3/Manifest
index 1ac39ae9410a..f185abcc17cd 100644
--- a/dev-perl/Crypt-DES_EDE3/Manifest
+++ b/dev-perl/Crypt-DES_EDE3/Manifest
@@ -1,4 +1,3 @@
 DIST Crypt-DES_EDE3-0.01.tar.gz 2328 BLAKE2B d5ceafafcaab71305dae592aec93cb4bcd2767122de1398f31d85e3d248ce712a29346a9557caab04d6c9229bb8a572f18c2327de121c2d2980079b518a23f81 SHA512 96a643c5b9128dc34ee93fd5bcad5d2c56c5111a2c40843a7ea352bd62f1430dafc399d9c7e9809c1ba34dddc5e63d731370ae7c8d555b053f55d3de7f7cb7c8
-EBUILD Crypt-DES_EDE3-0.10.0-r1.ebuild 418 BLAKE2B 27d748488c8a5fe95fc7f91643d7d23904ce093ed8eeb470da1f06062c352a247d7262d8260bdda892e50dd14933c73aa0aa634b44799012974331ae31dc8156 SHA512 64d8abe7f9be6759b8b76544cb0c54409913550a13ba81b67515ff4d2b960c0d9ed89cf130ed21c280f7cbce99c95ac96081b808d06a49e6c34a48f829a3b127
 EBUILD Crypt-DES_EDE3-0.10.0-r2.ebuild 393 BLAKE2B 022ac37837a2196021d38a0d09aa6348af173f981cc5c01bd3d9e966e0083413c3b12f10c0b75da71e61c320ab5eea94cdbab2e187af7ec69d6910b14c758ef0 SHA512 013ecd6557cb39f0d56cf18fed55623a5a55f75a5fab2b8313e0fd70a8bf90710070c0b58ea5ca1053775bbdfcc72a62c910829a2e776f7e643ab3c51ba1f2b7
 MISC metadata.xml 401 BLAKE2B 7521f8d6e9acb498fb0388c0c95de9c39e761f2a549fc4aaaf71956a4f2d1bde0f523030ff33e4b9f83fb41c9ca81c24580a27bc88ab96cb047d1a82bd47eb03 SHA512 82dbd3da26d72d7b00c42879e557e51a177b73b6594318066f2e56212d8a384e860cb2e700a26609d186cd85a667888839ee1de39ff54cf154c4f098cb53c50f
diff --git a/dev-perl/Crypt-DH/Crypt-DH-0.70.0-r2.ebuild b/dev-perl/Crypt-DH/Crypt-DH-0.70.0-r2.ebuild
deleted file mode 100644
index ec4fda513a43..000000000000
--- a/dev-perl/Crypt-DH/Crypt-DH-0.70.0-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MITHALDU
-DIST_VERSION=0.07
-inherit perl-module
-
-DESCRIPTION="Diffie-Hellman key exchange system"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/gmp
-	dev-perl/Math-BigInt-GMP
-	>=virtual/perl-Math-BigInt-1.60
-	dev-perl/Crypt-Random
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Crypt-DH/Manifest b/dev-perl/Crypt-DH/Manifest
index 2de974cad64c..24ee01fc085c 100644
--- a/dev-perl/Crypt-DH/Manifest
+++ b/dev-perl/Crypt-DH/Manifest
@@ -1,5 +1,4 @@
 AUX Crypt-DH-0.07-no-dot-inc.patch 454 BLAKE2B b57a50ab898bcee0bf0f75e41db20256b124f22dcc2978e81d7ae90bcf015d1a98b277631f8631d90f1363a0290dcd6e98ea314ddd656d285469548184623820 SHA512 8895aa689646fae98c16824381637e8628d5216e0cc9a09f7c3e10bd66c495f9b19359751c35bbeb0141db553f9fee0b66fa4bea5835655589efdb7422ef7bc0
 DIST Crypt-DH-0.07.tar.gz 43736 BLAKE2B 6631f7610abd44d0f6c8816e1d200a19fcf0d16ea181c3d5d00077b886cbca1b42699e265f1ea9f0d4c414c003944e7d213e67b265007a411be8965d2982422e SHA512 60e58403e513535463290255989e9f2263107aeae6831d51d761e18527b1745baa45c16f655452fd618a0fb0e98413d5ed68f3926247ab2ad2da4032863b8ee7
-EBUILD Crypt-DH-0.70.0-r2.ebuild 592 BLAKE2B aeaec6b9a230da1c0b4391944a19c98b0c1f3f5c51f27d360b1e3dde94bd463efa03e59f9631e01a75fcf945819139ad922561c3fc16a4f5bc75111795466ed3 SHA512 b83ddaa211b0b68cc28f59672c2fd59effecaced3974b35fa78caffab8e49edbeb8dc989bbd8dccbc8291d1190dccbf17c4f31004d58246281523b89c0925561
 EBUILD Crypt-DH-0.70.0-r3.ebuild 517 BLAKE2B b0625491fb322e038e6c0c9c19e1ea6990483f6be1802ca8a320ca018328f998d58f77289dd35d4ac8fb4eb38145e9224d959d4d33c6fa312b5f850646ba84ab SHA512 e968e3ccea96fa05de66eba6cacb1d66989ac247ea1a96bbadfd702cbde1f9a43b02bc1b3f5eb137823af840d45f9c44f756ebf07d8724891b6eac7f25e9c6ea
 MISC metadata.xml 389 BLAKE2B 397c83f55e2bfc2b60d213981ea51d09a04cb58fb3f8c2d7240c3825b0f48a453f7513a970960fce3d8eeba73ed7967b13cdbe317fdafe23ee5654afd04778cc SHA512 a330631fe4e79fa04ff36b774089a5221e5dca815307dda5a57d5994a556a76398aa878b43c4c6843e154de2b63e609d5c225a267e8185d4d5ca990a8c90c725
diff --git a/dev-perl/Crypt-DSA/Crypt-DSA-1.170.0.ebuild b/dev-perl/Crypt-DSA/Crypt-DSA-1.170.0.ebuild
deleted file mode 100644
index 033eebb88ae2..000000000000
--- a/dev-perl/Crypt-DSA/Crypt-DSA-1.170.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=ADAMK
-MODULE_VERSION=1.17
-inherit perl-module
-
-DESCRIPTION="DSA Signatures and Key Generation"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc sparc x86 ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-perl/Data-Buffer
-	dev-perl/Digest-SHA1
-	virtual/perl-File-Spec
-	dev-perl/File-Which
-	virtual/perl-MIME-Base64
-	>=virtual/perl-Math-BigInt-1.78"
-DEPEND="test? ( ${RDEPEND}
-		dev-perl/Math-BigInt-GMP )"
-
-SRC_TEST="do"
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install /use lib q[.]; use inc::Module::Install /' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Crypt-DSA/Manifest b/dev-perl/Crypt-DSA/Manifest
index 8f2aa53e6f49..127e2869bef2 100644
--- a/dev-perl/Crypt-DSA/Manifest
+++ b/dev-perl/Crypt-DSA/Manifest
@@ -1,5 +1,4 @@
 AUX Crypt-DSA-1.17-no-dot-inc.patch 464 BLAKE2B 05c1ae46de3c8f846e6ded435afada8d6522de8b54be7f7679fc72781d3d29ccb310d6c37f5ba12a099c820d318e1790676aa5e91331c4f7cabb33f5fa60a6fd SHA512 f28e726f6fde06e6515b2fa52481352c66792cfdc6fa0cb76a9958227bcc1c9016a92ec34c49ec2a9ae294b2d538ed381ca0dfadff94a027cef06b71c33227b9
 DIST Crypt-DSA-1.17.tar.gz 42930 BLAKE2B 026fea60f2ed9314269f61990107e3069230a796036f21aa02fc50d80b29b94c57510778927c990844165b1317ccc19c47ef1b2041e876148cb04f322942316d SHA512 2eac27cb08439a6d5cfdf1ee5f38412bc1dddb53c1865e5adc4f8c758ba1d221e5d30608bd12178beb15aed28940fa5db547520d57d8714919e20f0588fb1bfc
 EBUILD Crypt-DSA-1.170.0-r1.ebuild 725 BLAKE2B 79aa0849e49819b6cc4091bdd4f71f67716c9d203ac16cd505acd1710868ef72fd7c37109edd5947545213117fcef3e972e906861e88af3d5aa9c0968836e1d2 SHA512 89335a032c9e0d9e94e3826ab6a2db32a961569f67803ace808ccd1ef64a7c668773202a3e900aa092f0476811f47f954c879a717a08696e26887a0cac51a92a
-EBUILD Crypt-DSA-1.170.0.ebuild 751 BLAKE2B 45404e007404650895295975b7eeed1fb84d51b73bdfa0ae3669c2af622dd6051aed8708047d1a9f499e54f6601eef6c5d5a9432b56aeef20fea1e47c45b6aad SHA512 2ade9e8bf4ade464bef9a1fab2d4a1b754de5c7b0a62a6957e4249e2452c9b661495b7e9eec4eae8a2b8b2d078125cf4e0a939bb8d5f1bbe4d9182d87d3091cf
 MISC metadata.xml 846 BLAKE2B 2e243fc8fb7d05e77f3eb999cc3d10ce8c2c2ec9bdd42d7f8d4a2849a595f8145906a2ba203e92dcf134fe5303c331549526d46e2f823c04d82d72aed864ba1c SHA512 1c58c93346d3c6d59ac71327515f2673d8fc24c65b1309dc5dc463646a29422f6042cb01b33ac2bc4fefadadbd0d64c389219d28f4c3bc667bb3707d98b8b18d
diff --git a/dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.120.0-r1.ebuild b/dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.120.0-r1.ebuild
new file mode 100644
index 000000000000..ba5715c0366a
--- /dev/null
+++ b/dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.120.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SROMANOV
+DIST_VERSION=1.12
+inherit perl-module
+
+DESCRIPTION="Pure-Perl OpenPGP-compatible PGP implementation"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+# Note: Don't depend on Alt::, non Alt:: works for now
+RDEPEND="
+	dev-perl/Crypt-RSA
+	dev-perl/Crypt-Blowfish
+	dev-perl/Crypt-CAST5_PP
+	dev-perl/Crypt-DES_EDE3
+	dev-perl/Crypt-DSA
+	dev-perl/Crypt-IDEA
+	dev-perl/Crypt-RIPEMD160
+	dev-perl/Crypt-Rijndael
+	>=dev-perl/Crypt-Twofish-2.00
+	virtual/perl-Digest-MD5
+	virtual/perl-Digest-SHA
+	dev-perl/File-HomeDir
+	virtual/perl-IO-Compress
+	dev-perl/libwww-perl
+	virtual/perl-MIME-Base64
+	virtual/perl-Math-BigInt
+	dev-perl/TermReadKey
+	dev-perl/URI
+	>=dev-perl/Data-Buffer-0.04
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Exception
+		virtual/perl-Test-Simple
+	)"
diff --git a/dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.120.0.ebuild b/dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.120.0.ebuild
deleted file mode 100644
index e1b242a719d9..000000000000
--- a/dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.120.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SROMANOV
-DIST_VERSION=1.12
-inherit perl-module
-
-DESCRIPTION="Pure-Perl OpenPGP-compatible PGP implementation"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Note: Don't depend on Alt::, non Alt:: works for now
-RDEPEND="
-	dev-perl/Crypt-RSA
-
-	dev-perl/Crypt-Blowfish
-	dev-perl/Crypt-CAST5_PP
-	dev-perl/Crypt-DES_EDE3
-	dev-perl/Crypt-DSA
-	dev-perl/Crypt-IDEA
-	dev-perl/Crypt-RIPEMD160
-	dev-perl/Crypt-Rijndael
-	>=dev-perl/Crypt-Twofish-2.00
-	virtual/perl-Digest-MD5
-	virtual/perl-Digest-SHA
-	dev-perl/File-HomeDir
-	virtual/perl-IO-Compress
-	dev-perl/libwww-perl
-	virtual/perl-MIME-Base64
-	virtual/perl-Math-BigInt
-	dev-perl/TermReadKey
-	dev-perl/URI
-	>=dev-perl/Data-Buffer-0.04
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/Test-Exception
-		virtual/perl-Test-Simple
-	)"
diff --git a/dev-perl/Crypt-OpenPGP/Manifest b/dev-perl/Crypt-OpenPGP/Manifest
index 62f2faa8bae5..8c9e3a60cd19 100644
--- a/dev-perl/Crypt-OpenPGP/Manifest
+++ b/dev-perl/Crypt-OpenPGP/Manifest
@@ -1,3 +1,3 @@
 DIST Crypt-OpenPGP-1.12.tar.gz 103125 BLAKE2B 5598a5bef66ef749ff8afe93371ad7655aea24edf5067a3b74e7e0255bffce5e4d85c97d9f6e7f3c5d2fa3202a8ae816589609d25b183bcefa8d7ae85ae0b079 SHA512 7cbdd1e125d686aea6e6de66572e3d2d03f08d048481b757b9fa51f7d3d0b39dce1f4105a18600b4d546001bf39baeefb199c25449be21d038685cb21174caf6
-EBUILD Crypt-OpenPGP-1.120.0.ebuild 948 BLAKE2B 5220247087db6443542bb36ad90265b857564282246464f5835fabfba9aec2aaba1519e9768e5457c035911e1be6caaf487f43be4384158121c9d68e88d7f8cf SHA512 f91ed4de93bfe58eaedebd9f57a938a39450dceb64c32a70a2a7238d6043b12b6789614b49c740c24685fcbb09a137f81dc3fce1f100d3864b8ba8eee04d0010
+EBUILD Crypt-OpenPGP-1.120.0-r1.ebuild 909 BLAKE2B e20a1b0d404249bef862e6bd79378825c62279509232ce39d7d3761d5202f0bcdc27a60430e7b401c8acbd6b0d28ad6e49c34738c9264f207981d7d7a55bdbac SHA512 78f908343e7a2822dd7107a1fe38e7836f8d9d45d64eaeb33bea7b980d08b326d50f64d769b1614ff67085044d39736cd954a7bc489933a77d5eaad93a585ba5
 MISC metadata.xml 4924 BLAKE2B c99a5ca5fcd1be55508b2898b64ed65b8c4d967f105ee67e46b1f75e22dae17a23ef220e2c5699690c2010982cf2e72aba7e6cef8a25020cf95c28e182ae2fe0 SHA512 fbc80f1a0adff3575da3f99d52dc8b6ca00eaf0c6fd6ba4712c67630e88d94a957abde1a6e82e52f2bfb122fe9f30fe29eed6be0abfe41571e2e56865a26e0e1
diff --git a/dev-perl/Crypt-OpenSSL-ECDSA/Crypt-OpenSSL-ECDSA-0.80.0-r4.ebuild b/dev-perl/Crypt-OpenSSL-ECDSA/Crypt-OpenSSL-ECDSA-0.80.0-r4.ebuild
deleted file mode 100644
index 06725ee523b9..000000000000
--- a/dev-perl/Crypt-OpenSSL-ECDSA/Crypt-OpenSSL-ECDSA-0.80.0-r4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=MIKEM
-DIST_VERSION=0.08
-inherit perl-module
-
-DESCRIPTION="OpenSSL ECDSA (Elliptic Curve Digital Signature Algorithm) Perl extension"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-perl/Crypt-OpenSSL-EC-0.50.0
-	dev-libs/openssl:0=
-"
-DEPEND="
-	dev-libs/openssl:0
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-PATCHES=(
-	"${FILESDIR}/${P}-0002-Port-to-OpenSSL-1.1.0.patch"
-)
-src_compile() {
-	mymake=(
-		"OPTIMIZE=${CFLAGS}"
-	)
-	perl-module_src_compile
-}
diff --git a/dev-perl/Crypt-OpenSSL-ECDSA/Manifest b/dev-perl/Crypt-OpenSSL-ECDSA/Manifest
index ee35aa5090fd..131bf7d75eb4 100644
--- a/dev-perl/Crypt-OpenSSL-ECDSA/Manifest
+++ b/dev-perl/Crypt-OpenSSL-ECDSA/Manifest
@@ -1,6 +1,4 @@
 AUX Crypt-OpenSSL-ECDSA-0.80.0-0002-Port-to-OpenSSL-1.1.0.patch 6988 BLAKE2B 5b40ec7a06b81e49271c304380fc227b105872328b1bc077cd7b10eaaeec8aacd4dcae9595aa2db189ae0ef612e87a302b8ec158a7f4442bf01e1deb8500b2d6 SHA512 c9ef31155af0b1fa247aa782909ebfd7af6ea2c1eb05aafd928f3ad04406faf80f460689d5097b5641e8018da81e690099d5f33885c87bc48f08f1bf32d31c67
-DIST Crypt-OpenSSL-ECDSA-0.08.tar.gz 52955 BLAKE2B 014d0d82dde21d8a797f0c498f8534b5c4034c5a5414c358ce5a9da1598fddd4cf03a4187e0acd0272e58d0e21002f426c0e8f41d4f485b7dae168c2facbc24e SHA512 7bccf904819b323ad958dcb59ef3981e3f22813057727cb7d19d4eeab69f57ed7b63e4e586f7494c316e7568d606087099738918eb440947d326ae5a703e9b19
 DIST Crypt-OpenSSL-ECDSA-0.10.tar.gz 53607 BLAKE2B 814739a35713730202008a488df4658371769d12d3908c6750bca2f2aff65658a7efa3ae7d961ec2dd33bfa72627aa280b26da535d7988709dc275fec3cf532e SHA512 d1ec79c02b5f0c7c7ab140e1ab003683aa272c95c4418f3b8258b6504c3bc06adacf3e628e6160f5f0f271e06cd0b90f05c0609cf71bf950a3c87f3668990953
 EBUILD Crypt-OpenSSL-ECDSA-0.100.0.ebuild 527 BLAKE2B 945a7ff5d08fc8c6bf837ec15ac774160e7849b13d8891df13c752cecce9b41093bd1ed09122e156069beee07bfa902cf53fc3e2f5ea03af997760eb1ded71a8 SHA512 5060645fff3a3fb10201c8a8bec884ead891c6bc88b002ea77da91c53a88aa06b3fa70008b2c9dcde3f0e33bf543025f0c58a3beab73679d18e3d984aab25ad0
-EBUILD Crypt-OpenSSL-ECDSA-0.80.0-r4.ebuild 590 BLAKE2B 5bdc2343df3a2ccb6733eb2a1e97ce927fb83e92965e76d4e8f983cf919092004e184fb717de8f8a54add74d5a30f2190ad74921bd39397fbbe6f0f7108122d7 SHA512 ce836389cc53a88eef9405677b7731b412d83a2e02264bc0c3352cd2fec8f8caad6d38418e4371a2bc5423046deb1cddddf73e57af49cc87c5bab2e4af309dd9
 MISC metadata.xml 412 BLAKE2B b3c44548cbf361d8496c3b0884fd07c30d9bb291e8289a91e8958d6920064cad610e7e96f3183e0e4b44e74f11fd89ba777e730cb2396374987126928a1c0c0f SHA512 c53c609076af1f067cf8c24f67c0b67c36a5c5790a858c03f5bbf73eb37f49abfb232c23fbed741cfa1cdd4dbd7a4b7a0c5e49c38e87b6167cd159b82de69a0c
diff --git a/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
deleted file mode 100644
index d3ad4a972686..000000000000
--- a/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=AKIYM
-DIST_VERSION=0.11
-inherit perl-module
-
-DESCRIPTION="Guess OpenSSL include path"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-Exporter-5.570.0
-	virtual/perl-File-Spec
-	dev-libs/openssl:0=
-"
-DEPEND="
-	dev-libs/openssl:0=
-"
-BDEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
-	test? (
-		>=virtual/perl-Test-Simple-0.980.0
-	)
-"
diff --git a/dev-perl/Crypt-OpenSSL-Guess/Manifest b/dev-perl/Crypt-OpenSSL-Guess/Manifest
index 144adb53338b..052e64070a72 100644
--- a/dev-perl/Crypt-OpenSSL-Guess/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Guess/Manifest
@@ -1,5 +1,3 @@
-DIST Crypt-OpenSSL-Guess-0.11.tar.gz 11346 BLAKE2B f22d09e23e91c36c722dc9800391b67a1f912f8af6a13ec95c9074e65559585c77e72596a6dae17db28e11f8449813777423a60d9af0147819dfcb91ba489152 SHA512 cdae7f20a15d24842cf117bfba4f3bc0ec7d1066251e0480cbadd8f0aa28c9c9573905726fc1333ea9fbbb3769a67dbf28043de8487dcce27dab5d14a0848b09
 DIST Crypt-OpenSSL-Guess-0.13.tar.gz 11832 BLAKE2B 4857fd301eb4348f8afe17b1b7780a404c5c2567323b37c36e1be9e0c545aabc78a27d06e86c4f0c34940a33ff43c78be006ef0365c346488646ced6f4d9939c SHA512 1b3286d536bcb7545be636e33b5ff37bf334fbb7f3a99f4fcb32cf1166b1bc7cc179e9d39af1c7ac537630a75066353a1d7a0ab97816757a444dc0068029da97
-EBUILD Crypt-OpenSSL-Guess-0.110.0.ebuild 598 BLAKE2B 837a5fbffe0409842c232df5223a45c4c5bf433cd4d3f61fecbd2201067930aefd27b4d235d14eebcb9579b542796b5a6f65576224d95d1f30eefe060b595a20 SHA512 0933a865287f63583dd02c2b156730a144fd6db79085fce435058245e198eddff389ae79aee3594e344f5ec26136b546d1a9dbf82e03f3afcddf90fcc3097af9
 EBUILD Crypt-OpenSSL-Guess-0.130.0.ebuild 598 BLAKE2B 8626a25dd7de27ebaf9305e09fbb005f73092c706f21ff543b6cacb1e44b237a7fe73bb3b9de74aa7f1e6fe535981b39100e1b6e2f60dd97b7ab9adda87a9db4 SHA512 ec872248028d6daefacb8bcba16eccc44bfee6a8be87b437667d8d203c179b21f11d53e570174d867b8bb27ff2759f787f23e2b0836f77fa59000de7407dc40d
 MISC metadata.xml 412 BLAKE2B 436e78ca42d09e761105dc2ff92db2e46cdb93739d1577e48e9f3add602ada1ade152ca48d5f448b3bd43bc7b61ba337647c392329b3c4356b8f690738bf16ee SHA512 155956a54e94240ac222094fa051f633aaa49916b5bbe55c8e69cd8ab18acda270a756e0c5e3f5ac313904be805caa74f3754ca53905206b39ce9e2ba223e935
diff --git a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.280.0-r3.ebuild b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.280.0-r3.ebuild
deleted file mode 100644
index c6243a0a3b0f..000000000000
--- a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.280.0-r3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=PERLER
-MODULE_VERSION=0.28
-inherit perl-module
-
-DESCRIPTION="Crypt::OpenSSL::RSA module for perl"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-perl/Crypt-OpenSSL-Bignum
-	dev-perl/Crypt-OpenSSL-Random
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-openssl-1.1.0.patch"
-)
-
-SRC_TEST="do"
-
-mydoc="rfc*.txt"
diff --git a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.320.0.ebuild b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.320.0.ebuild
new file mode 100644
index 000000000000..d466a0ecb24a
--- /dev/null
+++ b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.320.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TODDR
+DIST_VERSION=0.32
+inherit perl-module
+
+DESCRIPTION="RSA encoding and decoding using the OpenSSL libraries"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-perl/Crypt-OpenSSL-Bignum
+	dev-perl/Crypt-OpenSSL-Random
+	dev-libs/openssl:0=
+"
+DEPEND="
+	dev-libs/openssl:0=
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Crypt-OpenSSL-Guess-0.110.0
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test
+	)
+"
+
+PERL_RM_FILES=(
+	t/z_kwalitee.t
+	t/z_perl_minimum_version.t
+	t/z_meta.t
+	t/z_pod-coverage.t
+	t/z_pod.t
+)
+mydoc="rfc*.txt"
diff --git a/dev-perl/Crypt-OpenSSL-RSA/Manifest b/dev-perl/Crypt-OpenSSL-RSA/Manifest
index 3c2321882199..663c6b555f54 100644
--- a/dev-perl/Crypt-OpenSSL-RSA/Manifest
+++ b/dev-perl/Crypt-OpenSSL-RSA/Manifest
@@ -1,6 +1,6 @@
 AUX Crypt-OpenSSL-RSA-0.280.0-openssl-1.1.0.patch 7018 BLAKE2B 58b6adac6c8d7fa6e5b7aa5592fa395dbbfab006bf427a6da3a119d2b221946166133c64573c1fda32d9e806a92ab9ebe0e0430b25e2938a7e72c1a8fdd879b5 SHA512 8a56a800496a427448a82c5a3051dc85ace049f7e4c78859a44f62e30c218c28e31dd24bfc2a9ec9cb7f64e14933982f26181792771c54c3e684be738206a310
-DIST Crypt-OpenSSL-RSA-0.28.tar.gz 20035 BLAKE2B 9b98a22e68f2c16a38c0aee6ee9a509cd6c6b1d20b1c6533856b7682aa074c24a2e12e87ebdaf3deb7011cbe257737335646b52be74537533d836cbf6fb6ce6d SHA512 4a20c3f814e80ea15304b2a189001172e72237d703a0f9281e7e46d593c521508abfac3a259701994ec867f160821bec37e4e8234d04b792168db19b065ce324
 DIST Crypt-OpenSSL-RSA-0.31.tar.gz 25856 BLAKE2B 172d48cd6cc0f3df2c1c1684897d8ee376663cb366a1e28c13e4af603b2b985d542f83284112be5e4717a3a13a512926b4413b5a8f08f7ed613cd9929683cce9 SHA512 e00d25fc1d39253ea2d7d6ee478403d2b38bd9125602baf5815672fb9e81674ff58bbb47539e425526db1988ebc1a40837372cf42ffd466cb532efa2e450ccab
-EBUILD Crypt-OpenSSL-RSA-0.280.0-r3.ebuild 623 BLAKE2B ccba4eeec8236293de04b86d907fccde970dd5698ccb1b033b4e969a5d6f238d6f737e6ab29048382e93ae57214ebba7a886e64ea4d775032c59cc3e3bf94562 SHA512 d8871b0883799b80efed8d80538a973f9840045988530e1a05b6087cf3e8840f0b5de05afc6219b24a68e823d7cefa83b815474d1bd97ffdcc11141cb95de845
+DIST Crypt-OpenSSL-RSA-0.32.tar.gz 24805 BLAKE2B 419b6a2e778fa10a6d68a6932d0b816f1c8ea4db0cd283efef4a4e684ea3468bd1133ce8825b388d1e3a4b4a990253aa44af892e4f89d71b46917f0cd7cb1fbb SHA512 2972611a8fa4e9c44fd09c9e7fa32f0abd377230f14dcdfa99edab87bba2199c6a0cab4d1e08bdf3057959c0efd3343eb989e46f4befd572b15540e59f1e3c64
 EBUILD Crypt-OpenSSL-RSA-0.310.0.ebuild 846 BLAKE2B c8940ee931f45736cf7d158154cdde4c76a6c64474f3183bb8cb39dd1164032dfa8d1e73d43b1ad666865a07135842de49b6d4930f9fbff83ad1867a7f437653 SHA512 be73ffbc70a235ab89d273908709fbee87158c49406f958af453e81264f9911eee067621700e3dd5d0193c7b9357942188a790ae73ddb995c03969f4ba3c0b35
+EBUILD Crypt-OpenSSL-RSA-0.320.0.ebuild 735 BLAKE2B 4aea07f241bbd1f28487e6c580fc8f86042eaf9ec965ea30c19ef47b312d5d8e6dc42bb7350a059dc4e51f293552cb7ab0705ee00c40c34258eb0b4eef77730c SHA512 9f31ee283b32efbb2c51dbc275ffcfaea0398fed334fc8e5e5ca25677900c60f4d1e6497aa17e7e518352f0ba185d646178073092413ae7efbffe8a4af584951
 MISC metadata.xml 408 BLAKE2B 73d573041ec5bc601cc948584974012395ff1fb07b74c062266dc356b435b5f57e010a0ad86163f38ff64ed800bfb47ea250de1b82e618ac42d3317e5ea2a3ee SHA512 f59c8e6ab19bf9c047ca6df9c8e8403182117f51add298e9f6a37983fa27a54365f42c7898752bc86800ec2c5016e353458406256d77a7c7373284acf5e9b55b
diff --git a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild
deleted file mode 100644
index 774e8ce5cff9..000000000000
--- a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=RURBAN
-DIST_VERSION=0.11
-inherit perl-module
-
-DESCRIPTION="OpenSSL pseudo-random number generator access"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}"
-
-export OPTIMIZE="${CFLAGS}"
-mydoc="ToDo"
-
-src_test() {
-	perl_rm_files t/z_{kwalitee,manifest,meta,perl-minimum_version}.t \
-		t/z_pod-coverage.t t/z_pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Crypt-OpenSSL-Random/Manifest b/dev-perl/Crypt-OpenSSL-Random/Manifest
index d273d32d644a..78b87832aa17 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Random/Manifest
@@ -1,5 +1,3 @@
-DIST Crypt-OpenSSL-Random-0.11.tar.gz 15161 BLAKE2B 33c491755f210514361f6d97715dee781a3f1b99879b2357002dc6dfc8e6c63df530cbcc1ceb8da407928aa531d0fbe85f43afab3d86995f0ade6c58f8bbd320 SHA512 c579cb2b586dbabd697a9c7c989a360ed4bd8e9b28d7c93ad99a86bd9bd680a89c3fa77f6315a1105fd41bfdfa18087ca4cd51fb320faad7a6be9b90e3e69b95
 DIST Crypt-OpenSSL-Random-0.15.tar.gz 15506 BLAKE2B 4ed167082904f814fb5484e2c95c0ac881530afecf7ff170041261eebcf3f1227ba8cf98b375a0cf2b18376c7f849340f11ae673ff9638a4c5e4f38db995b9b5 SHA512 bba8ce86b97ce2d6271be503efff6e6e0ff60a797282a2b7cb9c6c0592b69cc43344f9738b4790e5fc165a7273ff01e35ada481cf8c4dfde38cb7ad741d97530
-EBUILD Crypt-OpenSSL-Random-0.110.0.ebuild 663 BLAKE2B 333ff400fc351c58a5b19265026b04e34dc6207b6f9ecbe1f45d6e67bf1177ba37ff65997690b86a026067d6a38ca6fe2fee006ed721f9d6f8623a328e4f15bc SHA512 a7eec60baf97d36cea0463343bf964d5503f471a65bd91351515449072f5d3702bb8a0b595bcc4f7651adb25edca02bd1b1460bf8a74f01f67345df28dfea764
 EBUILD Crypt-OpenSSL-Random-0.150.0.ebuild 719 BLAKE2B 677ade72e22667d5d4f1f8a61387d72ff811fce7d8d1638d62e3f173b18a464a8297f2b136eb9010c7e7717804e615db4c6f06b44f7b57aba8b9e4938199d155 SHA512 7e1573cdb7c4c0862c5c0fd63c273a0661b021ee437d270fdbf24b7349f303e3abb5f316bdb6b592d16cbf3bca14028d1b0ce6c8fc303fbeb2864265131a80bb
 MISC metadata.xml 414 BLAKE2B be7f19857edc392c52ae48ea1920fab20783388c4e2f4e5c0f12ed026c491a3fa786b25cdc3b2c0a9bab4eb05e6938297bcbe29e5ea174093b74935561853087 SHA512 207b77107c939cd53b20b791d47f1bee7d7300d932edbe2c4edd795cfd41213dd2aef085afbf50fec4e506b876657e761cc92242b995f49d8c26ca51f1988685
diff --git a/dev-perl/Crypt-RSA/Crypt-RSA-1.990.0-r1.ebuild b/dev-perl/Crypt-RSA/Crypt-RSA-1.990.0-r1.ebuild
deleted file mode 100644
index ea3b7fb992b2..000000000000
--- a/dev-perl/Crypt-RSA/Crypt-RSA-1.990.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=VIPUL
-MODULE_VERSION=1.99
-inherit perl-module
-
-DESCRIPTION="RSA public-key cryptosystem"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa x86 ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-perl/Class-Loader
-	dev-perl/Crypt-Blowfish
-	dev-perl/Convert-ASCII-Armour
-	dev-perl/Crypt-CBC
-	dev-perl/Crypt-Primes
-	dev-perl/Crypt-Random
-	dev-perl/Data-Buffer
-	dev-perl/Digest-MD2
-	virtual/perl-Digest-MD5
-	dev-perl/Digest-SHA1
-	>=dev-perl/Math-Pari-2.010603
-	dev-perl/Sort-Versions
-	dev-perl/Tie-EncryptedHash"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Crypt-RSA/Manifest b/dev-perl/Crypt-RSA/Manifest
index 8f113e221f6b..275bd37ee6f9 100644
--- a/dev-perl/Crypt-RSA/Manifest
+++ b/dev-perl/Crypt-RSA/Manifest
@@ -1,6 +1,5 @@
 AUX Crypt-RSA-1.99-no-dot-inc.patch 519 BLAKE2B c0543ff5b5fb83fcba08b68bf9d8b281fe3a25f54b9ec655d7edbc92cf1f874eee500de4628fde9e4924bcd546c450f3cadb56bac43f658198423be9d204b550 SHA512 53cec9a1674eb504169be77cceec7e848e74c77ee99d70e02052f45dfdc3d7ef30705d3233a4c4ff7ca3c540c6db7512f48de0dd7527a3c36acbab31e16562f2
 AUX Crypt-RSA-1.99-test-segv.patch 889 BLAKE2B 994b35e5bdfaa4825fcd2aa145622b3d32f7ecff730fdbf3d0fac140b53335de80f453116578b7886b8da54f6e342afd8440f545ef206be13331c52d9d72cf4e SHA512 fbca977897359ac23106aae8abbdbe7d44ad90be773de92f352d098ec6e87a570bb68e7729a5179fe2d27fc8f207ab52ceae7b91f40d4a3b88d2049129828ff6
 DIST Crypt-RSA-1.99.tar.gz 52393 BLAKE2B 7231f78611cb57c90e815042bc257ea3be0a319a1d5a711965cf1de0cbba5cf690a7b47a682f8c4d1fd7e7c316a7e0f641683f83eea723b25828d7392b2fa260 SHA512 69426a3bd8b0d803926ac71b78952a4240831ab6202eae1d9cf1ce6f7c921e74442604f397a65f74d567629d3b2d56587aa8ca62700a458174640b02a05cff6b
-EBUILD Crypt-RSA-1.990.0-r1.ebuild 836 BLAKE2B 030c12b06da8cac3d427c9cf382a8ac008013f5b5a95c0d8d8853a48d6a02da70d499cda43484547c0823374ae948d87161a47db0f77c78fd0e664206c61130b SHA512 d5b861c8ef375af1a72f79f995390ad9e57a4ab8efef7d900e2a30b9f26471bf6a153549ab245ef196573b90478ef11f6634485c07573ec0eae34d224d15ec38
 EBUILD Crypt-RSA-1.990.0-r2.ebuild 772 BLAKE2B 0bcbdf13d7c25fa0d19c10a7c46d2bfb53c646b7cabb48b0cd9b0ded5068b96f1141db47a5a1ce29a3060431e7223f2f9f739db623e6949f9bda2f75050014e1 SHA512 ed637070fa82a21664260d724764cea3c8957148f6015868162f9d70d6ac1ddd2ef18297a0b22c2a96949608d2f7c5dfeffb9368a5e97be1b17552f432edb58a
 MISC metadata.xml 1377 BLAKE2B 684de23cd965da98b783b88c5c12489b9566d0259f1622eead350ae0d746a7fa9b20fc38e0c07a8bafcbb82692dc1d5de84391a63b790b5e25d7e86dab032edc SHA512 901a2dfa10f8c5cbecbdedf9ae7ad4c12fae06edc6c11996f87da2a60e7b4f12b37ac5439a0215e46dd8cbcbb2e6a5a714e99ec8b5721c15105155f289e69340
diff --git a/dev-perl/Crypt-Random/Crypt-Random-1.540.0.ebuild b/dev-perl/Crypt-Random/Crypt-Random-1.540.0.ebuild
new file mode 100644
index 000000000000..a311e491736a
--- /dev/null
+++ b/dev-perl/Crypt-Random/Crypt-Random-1.540.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=VIPUL
+DIST_VERSION=1.54
+inherit perl-module
+
+DESCRIPTION="Cryptographically Secure, True Random Number Generator"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-perl/Class-Loader-2.0.0
+	>=dev-perl/Math-Pari-2.1.804
+	>=dev-perl/Statistics-ChiSquare-1.0.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Crypt-Random/Manifest b/dev-perl/Crypt-Random/Manifest
index c569d64e30c4..19ff39d506b5 100644
--- a/dev-perl/Crypt-Random/Manifest
+++ b/dev-perl/Crypt-Random/Manifest
@@ -1,3 +1,5 @@
 DIST Crypt-Random-1.52.tar.gz 9525 BLAKE2B febe32d8b3c4a903220073bd591cbc09f6e6c5e1919e2ae825f5e4d63f68577fccd6e1adf1878b940e8a2af5af044e56cd79e0d49b4717785be0b5ffbe74fefb SHA512 b82252aae6a009b0dc09bf2e6704d114cd4e40b9588269246871d3b1fb66b4abda87e7c324afc30fd9cf19eb0c0502c2af05d8981226513223277f83854b770f
+DIST Crypt-Random-1.54.tar.gz 22368 BLAKE2B 00859c6a39942f6fd5eab56a7ddc1331423acd03b5f3edb150d704f3d9eb304cf017959cd46db830a5895e7b4ad708fda4036386331082bedfe4e34a59f285bb SHA512 cad58c3598efd2c7bd0ea611f31eeec99bbb61029df3f29abcc3ac951b1edc03829f1dd3c5f4d1c09a9914cae9eb171ea467562e3739122f1cf48b1119c42d29
 EBUILD Crypt-Random-1.520.0.ebuild 473 BLAKE2B e002427b2bb60596ac5162659b8a1dc5cf86a1ce053c70db8cabd82538de703c255a8e03dc1781a0bdc284c2aac2dcb388787517ed100355f320a86beb432688 SHA512 9fc16ae49239be7a42fb790589850905e4fc2f74596b357ca23fcab45e768993ef8a907d7f7f8432482cb0b63b586be2d5c79579bb677498ee7c48cee6449a29
+EBUILD Crypt-Random-1.540.0.ebuild 435 BLAKE2B e552746aaa5333939491add0ea61e4dbeff58e74933ff2d6a5edf17cc994ba54efbdb759d30e9578d20c7723882dfd11b51f44eb66ec3a6345f3a329084bb206 SHA512 15ef2dc879fe348b874d69ed8b4ebaf4789abfff488a788437f7815ccec4fc2c6d821518c5b2429736e3e426769066c6d190efb8df67a6eff304be546a358530
 MISC metadata.xml 858 BLAKE2B 0355e3f177f8a6c068013c02cd8879c872078dd82cbdbd4a58efb0ce9c8d42b1b8b21ae727a0d2f0703116554c5008b2579d716cbf2bb27fb33f51c868fbb29d SHA512 4988d18dfdb9470c00b755436baf186b0757ea7e1b3705aea0d463648437330c2341c6964cd502963b7356dc1e5cf562a4e082c22edbff84102f86877b9ddae1
diff --git a/dev-perl/Crypt-Twofish/Crypt-Twofish-2.170.0-r2.ebuild b/dev-perl/Crypt-Twofish/Crypt-Twofish-2.170.0-r2.ebuild
deleted file mode 100644
index 812a6e9c53bc..000000000000
--- a/dev-perl/Crypt-Twofish/Crypt-Twofish-2.170.0-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=AMS
-DIST_VERSION=2.17
-inherit perl-module
-
-DESCRIPTION="The Twofish Encryption Algorithm"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-PATCHES=("${FILESDIR}/no-dot-inc.patch")
-
-src_compile() {
-	mymake=(
-		"OPTIMIZE=${CFLAGS}"
-	)
-	perl-module_src_compile
-}
diff --git a/dev-perl/Crypt-Twofish/Manifest b/dev-perl/Crypt-Twofish/Manifest
index db8bf5aaa1da..63a120c01178 100644
--- a/dev-perl/Crypt-Twofish/Manifest
+++ b/dev-perl/Crypt-Twofish/Manifest
@@ -1,6 +1,4 @@
 AUX no-dot-inc.patch 790 BLAKE2B 71e83b789b58bb0aa3f92db78949f732e45b429b2d4a56b74461af719fa7ab7cd4eb47b5fe4c6150b1a215cb79624c6c56d3558bdd50c12d6d6303f1b13f40d8 SHA512 a5608179bdc33a98c6c070fda3281b7d5c6ceebca3798d26cfe5339e773e46a489dd2f8df02d059d7bea63c0e6d22098dd3f65a264b4e6e9e7575ebbdacb1203
-DIST Crypt-Twofish-2.17.tar.gz 13851 BLAKE2B 4ab615b6af0996bdc6e3c356f84cc65192cff68ed4f5e00b59efcb20d88374a29b2a44f2cd5c8bce0df6a31f8ec366624e6e429d0d72fdb4cf69bca42732d3aa SHA512 c61d07f2fd3d88bff1e41eaa3008c6717fc21e9acf2e45d45c3a39b15500f71b3bc425a3df988bbbd5b6865085866595240f1574424aa70448d6c8b3f38ee2e2
 DIST Crypt-Twofish-2.18.tar.gz 13904 BLAKE2B a153d4a7292ff11b97f8d53ea84b9c51d09ff1585f6bd5150c5ce047e5d515e14725672a0b637c11d1664b16b87fc950aae709d6be8f0e1f99112d562e8f69ee SHA512 e900b066e73237dbad8a9882c28509fcd8516c16478cdc2703883a1801d9ec387c4e43c38f6e50024c47f9fb2812c44f6096f2a2ce298f9d73303a84833b61a2
-EBUILD Crypt-Twofish-2.170.0-r2.ebuild 433 BLAKE2B 185b72d61d4887c9edc0a936a545bddb58e1589e88743774c604c8f277e2babb867ce119ba4800cd7172ae7b1b86d903632de82151ee0a9b9ef309c173edeac2 SHA512 57e9c9c310681e514e4357ffe36c329c07399468d2082e2f6177f81684b4ebbe1e5d3c4d8045c4309c812dc2b6079efb94aa805b1a554401920903d8288258bf
 EBUILD Crypt-Twofish-2.180.0.ebuild 391 BLAKE2B 2260cb3655d4adece2528f600e338d0498d609018ce4cc179e61dca3110f615456d2e7f2e341fc4a83eef7a8bc2a04d0f0d949dd3d0753dd907e63af59af19c3 SHA512 086aa38f36cd1bf815357dadee9bd2c0c91cf77ddfa6b1c621c51cb04f4d5d051b889cf4463a6c6acb62474e3aaf656ec60269e5df78a3e59614f57641d545e6
 MISC metadata.xml 399 BLAKE2B 61b8203de28c78e9376e8f012427e941845745c0a6a8a7d5df47ea8dd6f032d422f3b83492008d55a4d9b21af1889f73e9a60fdd26ba09c970f29391096ac5ae SHA512 ac673ccb9783e512d90b4b8a9376e2a110de0ecb3e7ec52e3383e9bb1643ec3c6c4ec365acad452ea7e6d1f25ea5b3a2c0f81eca6ed769333111ba0b5e55dffa
diff --git a/dev-perl/Crypt-URandom/Crypt-URandom-0.360.0-r1.ebuild b/dev-perl/Crypt-URandom/Crypt-URandom-0.360.0-r1.ebuild
new file mode 100644
index 000000000000..7e5ef6c8a11c
--- /dev/null
+++ b/dev-perl/Crypt-URandom/Crypt-URandom-0.360.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DDICK
+DIST_VERSION=0.36
+inherit perl-module
+
+DESCRIPTION="Provide non blocking randomness"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+
+PERL_RM_FILES=( t/pod.t )
diff --git a/dev-perl/Crypt-URandom/Crypt-URandom-0.360.0.ebuild b/dev-perl/Crypt-URandom/Crypt-URandom-0.360.0.ebuild
deleted file mode 100644
index 0e6eeaf165ba..000000000000
--- a/dev-perl/Crypt-URandom/Crypt-URandom-0.360.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DDICK
-DIST_VERSION=0.36
-inherit perl-module
-
-DESCRIPTION="Provide non blocking randomness"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-
-src_test() {
-	perl_rm_files t/pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Crypt-URandom/Manifest b/dev-perl/Crypt-URandom/Manifest
index 4c425246c893..5c20720d02d8 100644
--- a/dev-perl/Crypt-URandom/Manifest
+++ b/dev-perl/Crypt-URandom/Manifest
@@ -1,3 +1,3 @@
 DIST Crypt-URandom-0.36.tar.gz 6099 BLAKE2B c1fd335411ca4642626bf651e7ea7de4390e6d4a9a894617c7f52ef2287cdbc54aa1911a3067d05c67f32236dfa2aa9a6fac3ea7e2bf019bd3dd4fd4cba3628c SHA512 59e6773d808f34f242f2520ed236faeed804d623fbcf4f1b8e7b39ed215ff1cde9f76ce4a9f5f260dfac42b036229a56cdb49a7f6856d5e943ed4d50e3392adc
-EBUILD Crypt-URandom-0.360.0.ebuild 474 BLAKE2B 766eae04c22a5ecc0f8a25dd7e3dc25031c5798ce3b9af282a325229284eb2c7e84163a4053b23cf5b048ac73228685f0cab5f5a856b8d548dd9a39b190f532b SHA512 34349555ec4e0f1a9906314217646c148fa0e11ac6f313a16498ff251560f112ee93c1d7c0f3b8f62e4ed799616b11cecbd0d588c792e1ae13d0255bf5fa23ea
+EBUILD Crypt-URandom-0.360.0-r1.ebuild 402 BLAKE2B 877956788dc57efcfc5955a786ea9a045690be817314f22b71540eaf7fd8c11a385a4c806c7e2b98471c72aff05079eed9df78838d5724d11933231f80d48a0e SHA512 93601f8d5d97aad874fbb04fcd550f30b533b1ccff318c1cfab634804334667b3e3028d7ad8b2cff123d1571fc0c82b7a7844e0110915d4079657473e96d59b0
 MISC metadata.xml 399 BLAKE2B d9233caadd59dc5845e398d99e50ee6550c112b97ac1b2e9571a0926de5f9eed96e493f94d9f4b05b77a59f5b2ac42493dc93d78dd77d570193d50fe9dadaabd SHA512 418524cf8841c8a96bcfb923b4e4033054ea31b51db09643e9ce56c49ff280d0e6044b0c84acbaf71c9a20cd22ee7bcc5a8f22faa71f151667a61e3c9899c923
diff --git a/dev-perl/Crypt-X509/Crypt-X509-0.530.0.ebuild b/dev-perl/Crypt-X509/Crypt-X509-0.530.0.ebuild
deleted file mode 100644
index 3d6fcfcbfe1c..000000000000
--- a/dev-perl/Crypt-X509/Crypt-X509-0.530.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=MRSCOTTY
-DIST_VERSION=0.53
-inherit perl-module
-
-DESCRIPTION="Parse a X.509 certificate"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Convert-ASN1-0.190.0
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.960.0 )
-"
diff --git a/dev-perl/Crypt-X509/Manifest b/dev-perl/Crypt-X509/Manifest
index 802144ddf676..39ba7bb27956 100644
--- a/dev-perl/Crypt-X509/Manifest
+++ b/dev-perl/Crypt-X509/Manifest
@@ -1,5 +1,3 @@
-DIST Crypt-X509-0.53.tar.gz 22811 BLAKE2B fb086881291b2b5857f4dec2c3c0f78fc827acabe7a2535980622e9e7944488edf5b2db4a51642ebd145619f5ae97a6bb18054e8abbf06278844741a198f3b40 SHA512 316c6147ddcc2ee1e11f951a8c62a14ce723fc2ca6402f141cd1972828f94a3d5ceab29d57b2bca75925261410ca4cc37ee83ca8e158fa66da2ab0ebd29ced0c
 DIST Crypt-X509-0.54.tar.gz 23235 BLAKE2B f2d5c9317833228ffd63ebb0f63a2bbb2e8255ff02c554d6cd201749aaf2e7965f26c86b76445b3d7ac228cc7e3a5afc7ea0d20952837e34304f0dc89a718996 SHA512 df5b155322432e0a9cae2a9ef2408a2692891f1ccb8ca438d38a4671a16df367c860ed549eb307342a5e74b88ea75a4e78386f86092ee87f5b897c11987ee771
-EBUILD Crypt-X509-0.530.0.ebuild 447 BLAKE2B 17950782b903b389e8aa09700114b534927a1a5f83e3c5050468d8eae987bdd02428a71cb84cdaf0ca520ecec18495c1cc94d276c2bb5661a9e99c272b3d0c58 SHA512 fe476454bf4191152718836b5c50513a55a17626f4b33c13b5b8fe72713b1b22848c3e49aaf287e8a779dfc52e533c4abfbcd90e8ac9378c3a1e9e49aa47ba93
 EBUILD Crypt-X509-0.540.0.ebuild 447 BLAKE2B b12c28863e30b5424aa889efb5b693073e81fcc34af07854a237a6cc7e9fff5df4f91cc8b26afb5fc345cb7e5d1a996be5051b49590a9351884a9921274d40ef SHA512 e63a9f8fd3482ca812f10dcf82dbfc5a873600283555bebf3cf8e9a1b41c0b94e3f7a4ca32fb21a434923f94a5e942a2ec68ecbdd1216a5fc503f80057d3a3cb
 MISC metadata.xml 549 BLAKE2B 3ec41b20c57533e0e4b89f12871ed9550e078166511c83c648fccca4d93f322285584678a492668ea710b36a3df75924f9793f71985017a9722247de911fa349 SHA512 0eedf24aed6ae5f317e652a285a1a97379d3da03e7b85ecc310ce5e480bbca30650eabb73035e84093d822dcbca52fb0c96b3a6e0cadd1453d34c3f283bc26b1
diff --git a/dev-perl/CryptX/CryptX-0.73.0.ebuild b/dev-perl/CryptX/CryptX-0.73.0.ebuild
new file mode 100644
index 000000000000..3e54df75c253
--- /dev/null
+++ b/dev-perl/CryptX/CryptX-0.73.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MIK
+DIST_VERSION=0.073
+inherit perl-module
+
+DESCRIPTION="Self-contained crypto toolkit"
+LICENSE="|| ( Artistic GPL-1+ ) public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86"
+IUSE="minimal"
+
+RDEPEND="
+	!minimal? (
+			dev-perl/JSON
+	)
+"
+#	dev-libs/libtommath
+#	dev-libs/libtomcrypt
+
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.880.0
+		!minimal? (
+			>=virtual/perl-Math-BigInt-1.999.715
+			>=virtual/perl-Storable-2.0.0
+		)
+	)
+"
+
+#DEPEND="
+#	dev-libs/libtommath
+#	dev-libs/libtomcrypt
+#"
+
+PERL_RM_FILES=(
+	t/002_all_pm.t
+	t/003_all_pm_pod.t
+	t/004_all_pm_pod_spelling.t
+	t/005_all_pm_pod_coverage.t
+)
+
+#src_configure() {
+#	CRYPTX_LDFLAGS='-ltommath -ltomcrypt' perl-module_src_configure
+#}
+
+src_compile() {
+	mymake=(
+		"OPTIMIZE=${CFLAGS}"
+	)
+	perl-module_src_compile
+}
diff --git a/dev-perl/CryptX/Manifest b/dev-perl/CryptX/Manifest
index 7dc58b0abbdc..036a836a7fda 100644
--- a/dev-perl/CryptX/Manifest
+++ b/dev-perl/CryptX/Manifest
@@ -1,3 +1,5 @@
 DIST CryptX-0.072.tar.gz 1643459 BLAKE2B 28bb06ef870287ccd9f46c2ed5d7b434e33563046598cff5c505c74c68d29b5bf58ad0dd3a5d968c6717ccb6cfdbf1b33982b49a87b9e4f7c85af9ab40d617d5 SHA512 9e51181b14c08f8c0769089f8c9a5feefa7c4f1a8dff2501cf1d1d475ae162f8df35c7cceff9d1742552951e13450cac9d70eb1ead8178e0c95cd1abfea5e03c
+DIST CryptX-0.073.tar.gz 1643681 BLAKE2B 01a8a9082d4abbe6ae17b1fb53f9e0fbcf2aa8124381f11124ee55a23046f2c08aa403ce3a38a14f6bd36b3f61b539d704c913b0bea18d5c90a1b8336c464229 SHA512 592e4d657870785d7d13ba74bdc28c62575c4cf1ed95fb8de4524617ae92d196c5f1bc031ea4a39601ddb6ea8484dc28a4f2ddf53e2348466e9f8307956d0646
 EBUILD CryptX-0.72.0.ebuild 1073 BLAKE2B 042568e0e3454de4ab995e07bd2c3b4102a9969b294e33a0b72eb021c39baab18ce55531668ac185bd0134130e5e2fe8acee09bc9814655ab47d1cfbd0d20833 SHA512 7a7ae730bd760871c48482d19298de53d61b22edfcb15b759097cba820476f4bbb5ba200bcad1d72939e487ca53ae39cea7ea72f5e2bb694187ee073b3f65eb5
+EBUILD CryptX-0.73.0.ebuild 981 BLAKE2B c8ef8362d29fa25df9706227c0e0211c7f0ec90d92b2bdd78a31bf5d23c94d5a0c75986ede262a287e5ba0b6146b34a5e46697f54a9267e917ae3f27121d7b7d SHA512 3f383cbf7348d5dbce5098926a50434f67b9ea88cb06020d98871c244c49c9daa0f6484775972628ef30b98a4143b342cf45862492e05aa4c561bdd5c24c5964
 MISC metadata.xml 7624 BLAKE2B 251fc5b2b4fe7bedd6bd7c7fce63d7793859b0887780f28b252a9eb1692063d6821d02bd3919e8f7a6e917486b15da14989afd794062bca5bd8f31941b22f013 SHA512 2301dd0edb9b5c58ff7f2595af5122c4d8c79ce9197b35260a834f88db630e0381cbab3e4f69d1a32051fe9c70b00626c1fa404c85d2c543e0711dad7957bfab
diff --git a/dev-perl/Curses/Curses-1.360.0-r1.ebuild b/dev-perl/Curses/Curses-1.360.0-r1.ebuild
deleted file mode 100644
index 780e2754fc8b..000000000000
--- a/dev-perl/Curses/Curses-1.360.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=GIRAFFED
-DIST_VERSION=1.36
-DIST_EXAMPLES=("demo" "demo2" "demo.form" "demo.menu" "demo.panel" "gdc")
-inherit perl-module
-
-DESCRIPTION="Curses interface modules for Perl"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~sparc-solaris ~x86-solaris"
-IUSE="+unicode test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/ncurses:=[unicode(+)?]
-	virtual/perl-Data-Dumper
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-
-my_curses_unicode() {
-	echo ncurses$(use unicode && echo w)
-}
-
-my_curses_version() {
-	echo ncurses$(use unicode && echo w)$(has_version '>sys-libs/ncurses-6' && echo 6 || echo 5)
-}
-
-pkg_setup() {
-	myconf="${myconf} FORMS PANELS MENUS"
-	mydoc=HISTORY
-	export CURSES_LIBTYPE=$(my_curses_unicode)
-	export CURSES_LDFLAGS=$($(my_curses_version)-config --libs)
-	export CURSES_CFLAGS=$( $(my_curses_version)-config --cflags)
-}
-
-src_configure() {
-	perl-module_src_configure
-	if ! use unicode ; then
-		sed -i 's:<form.h>:"/usr/include/form.h":' "${S}"/c-config.h || die
-	fi
-}
diff --git a/dev-perl/Curses/Curses-1.380.0.ebuild b/dev-perl/Curses/Curses-1.380.0.ebuild
new file mode 100644
index 000000000000..11531cb659ac
--- /dev/null
+++ b/dev-perl/Curses/Curses-1.380.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=GIRAFFED
+DIST_VERSION=1.38
+DIST_EXAMPLES=("demo" "demo2" "demo.form" "demo.menu" "demo.panel")
+inherit perl-module
+
+DESCRIPTION="Curses interface modules for Perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~x86-solaris"
+IUSE="+unicode"
+
+RDEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	virtual/perl-Data-Dumper
+"
+DEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+src_configure() {
+	myconf="${myconf} FORMS PANELS MENUS"
+	mydoc=HISTORY
+	export CURSES_LIBTYPE="$(usex unicode ncursesw ncurses)"
+	local nc_tool="${CURSES_LIBTYPE}$(has_version 'sys-libs/ncurses:0/6' && echo 6 || echo 5)-config"
+	export CURSES_LDFLAGS=$( ${nc_tool} --libs )
+	export CURSES_CFLAGS=$( ${nc_tool} --cflags )
+	perl-module_src_configure
+	if ! use unicode ; then
+		sed -i 's:<form.h>:"/usr/include/form.h":' "${S}"/c-config.h || die
+	fi
+}
diff --git a/dev-perl/Curses/Manifest b/dev-perl/Curses/Manifest
index e34222b191bd..87968458d822 100644
--- a/dev-perl/Curses/Manifest
+++ b/dev-perl/Curses/Manifest
@@ -1,5 +1,5 @@
-DIST Curses-1.36.tar.gz 135049 BLAKE2B c63d1f8d80db33e184c6d9c49c9ee902b5e3ed2e69e4ccbdd683d7b6109f8025d63838ce20f6e57e95c9a9bcd9e14d6af448e52f1b9d219ab388ab74798d917b SHA512 40ce96bdf7ef4bbd6975363bc27c2c561a81cafbaf147f2655a2c6521e09f6e40441cee06b6f8f27e370ad59eaf6f677ffe8e475030dfa870d25eca37717c58c
 DIST Curses-1.37.tar.gz 135763 BLAKE2B b42f81d5a382b8cf6c8323cc5c13fd39dcc57081ad2e3de9e940f06a0126879d301ccaebc5c34fb5cb4bffd1263b0681243164539c450db50cd3388e6fd35823 SHA512 10886e725b174fdabc0c9b86a9ef9b717949f0fb03561bfc315e8503be689be7945d1ceeea2f950628ce480c2cc8081736d3b8f28042ea677b252298a9eb4827
-EBUILD Curses-1.360.0-r1.ebuild 1177 BLAKE2B ce01b2e67609b4dc8a7da9e4a20fbb20174fb61d425f03b10305df90ceb07f4513e43e990a364a9e2592b34fbff1f024c934c20da8b6a92829e06ad2663e2bd1 SHA512 785981a7c2ebd2a47a38466db84153000369b72f81c2ed3ef9f8ae85c59c30a07932855e3ed0378efd81606d24a0469b906dcdaaed2aaaf39cfdedeade96c9e7
+DIST Curses-1.38.tar.gz 135789 BLAKE2B 68817bfafcfe2b9d9480c12f2490f9281b5e0cc51bbcfd795e2728a21ef24e12362cfc0896d7b5d6678f35f25fb80c0aee4cde5cf06ec8b3871168cd059649d6 SHA512 27999e71f19576c930a794c9f478e8a3b6b3b1d1e68c4ca57b712f20c98a83dba46295c012a6c618d097b661ec30441c8147e26579218ecef977d7c7996c7442
 EBUILD Curses-1.370.0-r1.ebuild 1184 BLAKE2B 7bf8879e0f8668dcec834bf71bda1b4c2ccb1248c3b3abe7c10255a4e18eab3cc257b465c6faad00d7ab0f39f72ac24e36f70faf568ddf7babc91059930e0465 SHA512 0a481baf6361efc965e07c2c2360bee0155656d645dbe717602ed83eb5ff9730ce328c235e568a856acb617f12e71d03761394bfcd733e6258a6a56b34a2fe72
+EBUILD Curses-1.380.0.ebuild 1073 BLAKE2B c95a3b9d9fd09450294f1eca95c796d16f306b4262390612c288da597abbe033b4ee082227f339ecd3f39f1c3d0d8425439db7033f50002daa8d2c9a7b74f00b SHA512 a035dab4ae69195e73edb2f64003e8d82ff5984251759616cb7f9d573fdb1ff46fe86803a1ee2e24c6fdf47873a65ef8ceeaac8cbaaad6ff6cce1e77fffcd2b2
 MISC metadata.xml 803 BLAKE2B e36c77c18bdde1e0f6e748f34ebabd4e6da8f594aec6d2dcebc5c406e9a13a078ae083552b1de65cf90bb0220a105166b505f6969413c2fd2c4d2c6d9d4f6114 SHA512 a30ed2e1e27fcff1ac19f2b8b7650ab7722f3dc322bfb2b6f6f637baaeeb0d411e5814b7d6f0918cafb0b252f276d4e9d8312a7ddeccf2b0b9b8b1f23d3c1929
diff --git a/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0-r1.ebuild b/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0-r1.ebuild
new file mode 100644
index 000000000000..cd3c4151a094
--- /dev/null
+++ b/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=KAZEBURO
+DIST_VERSION=0.05
+inherit perl-module
+
+DESCRIPTION="Temporary changing working directory (chdir)"
+
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
+IUSE="minimal"
+
+RDEPEND="
+	virtual/perl-File-Spec
+	virtual/perl-Exporter
+	virtual/perl-if
+	virtual/perl-parent
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.380.0
+	test? (
+		dev-perl/Test-Requires
+		virtual/perl-Test-Simple
+		!minimal? (
+			dev-perl/File-Copy-Link
+		)
+	)
+"
diff --git a/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild b/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
deleted file mode 100644
index 40eb6dfcde7b..000000000000
--- a/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=KAZEBURO
-DIST_VERSION=0.05
-inherit perl-module
-
-DESCRIPTION="Temporary changing working directory (chdir)"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
-# Cwd -> perl-File-Spec
-RDEPEND="
-	virtual/perl-File-Spec
-	virtual/perl-Exporter
-	virtual/perl-if
-	virtual/perl-parent
-"
-# CPAN::Meta::Prereqs -> perl-CPAN-Meta
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.380.0
-	test? (
-		dev-perl/Test-Requires
-		virtual/perl-Test-Simple
-		!minimal? (
-			dev-perl/File-Copy-Link
-		)
-	)
-"
diff --git a/dev-perl/Cwd-Guard/Manifest b/dev-perl/Cwd-Guard/Manifest
index 7f89e28f4847..7ee444f72fae 100644
--- a/dev-perl/Cwd-Guard/Manifest
+++ b/dev-perl/Cwd-Guard/Manifest
@@ -1,3 +1,3 @@
 DIST Cwd-Guard-0.05.tar.gz 10253 BLAKE2B cd11c91769212a5b77ce267542d6ddc231ff4ee64baa5abf88035d3fedfe005141e571b516b799f611488347d89896f16660c66a58e20729b0cddc6753b89163 SHA512 14aa68e535cec8f7182d5648558c539cbf6eebe2fee9c59d0b06f5b45cca1c6c652104a58f71b5a56f796f03d139e3e74962e45fb127bf038803b05cb9f32b82
-EBUILD Cwd-Guard-0.50.0.ebuild 671 BLAKE2B 895ed8b06df36d4f85476a62e1b263f957912d3de72d9bf9804a45995987ddd1ee026d804f40518728a50f2d044b1bf3aab99926e7497c75f582c51f675ad581 SHA512 cc0cf52d9f8f7923e3a216d52c30e17a1346756bbbd47a693672ed3b41a81b5e39eefc55fa20961d35a5043407183f10fd513d35b091d9bb47704e225a8c682d
+EBUILD Cwd-Guard-0.50.0-r1.ebuild 577 BLAKE2B 73611a67228452edf0e9f5f74b99c2648011598ca7a94f97ab4559bb644664bd4ddb3778fbef8e7c6532ffa0e12ebb710d368693723d2512a69dda5f2618aced SHA512 056b07d30ac5f1c0a0f20b2632e6247e7a0080ce713af63b730d799c46ffb5a431955cb2055bc5665b4701cfae2f506c7b22fc3ff3a574350c9e66d41df88214
 MISC metadata.xml 391 BLAKE2B cc6614f374525ef96fe1c5e13ed638bd4b2003ffa376a22e5356de14d68741cd3eb3ba6e4b1520da2d5af838bfed78103ed385faafe7a099c214be493c9ba6dd SHA512 a7071b513191586f8e8d3cf8ae9d2d394e5dafaf10282739bbb62ad51afd48eefd677453fbc23be864c23fd33ff9e76be533f822380328ef6ef4a97ed073ad35
diff --git a/dev-perl/Daemon-Generic/Daemon-Generic-0.850.0-r1.ebuild b/dev-perl/Daemon-Generic/Daemon-Generic-0.850.0-r1.ebuild
new file mode 100644
index 000000000000..b46e3c5b71ca
--- /dev/null
+++ b/dev-perl/Daemon-Generic/Daemon-Generic-0.850.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MUIR
+DIST_SECTION=modules
+DIST_VERSION=0.85
+inherit perl-module
+
+DESCRIPTION="Framework to provide start/stop/reload for a daemon"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+
+RDEPEND="
+	>=dev-perl/File-Flock-2013.60.0
+	dev-perl/File-Slurp
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Text-Tabs+Wrap
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/AnyEvent
+		dev-perl/Event
+		dev-perl/Eval-LineNumbers
+		virtual/perl-Time-HiRes
+	)
+"
diff --git a/dev-perl/Daemon-Generic/Daemon-Generic-0.850.0.ebuild b/dev-perl/Daemon-Generic/Daemon-Generic-0.850.0.ebuild
deleted file mode 100644
index 5e53ff5955ff..000000000000
--- a/dev-perl/Daemon-Generic/Daemon-Generic-0.850.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MUIR
-DIST_SECTION=modules
-DIST_VERSION=0.85
-inherit perl-module
-
-DESCRIPTION="Framework to provide start/stop/reload for a daemon"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/File-Flock-2013.60.0
-	dev-perl/File-Slurp
-	virtual/perl-File-Spec
-	virtual/perl-Getopt-Long
-	virtual/perl-Text-Tabs+Wrap
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/AnyEvent
-		dev-perl/Event
-		dev-perl/Eval-LineNumbers
-		virtual/perl-Time-HiRes
-	)
-"
diff --git a/dev-perl/Daemon-Generic/Manifest b/dev-perl/Daemon-Generic/Manifest
index d70db4687f59..a9e329ad2185 100644
--- a/dev-perl/Daemon-Generic/Manifest
+++ b/dev-perl/Daemon-Generic/Manifest
@@ -1,3 +1,3 @@
 DIST Daemon-Generic-0.85.tar.gz 15101 BLAKE2B 43c973ae1a9b601467ede6b411872f7824a0476c552b3734e45286f47b6d892d45182afce0815b11b9f555089f7d18f2943938d294f9ee67de7e0fca5e5c214d SHA512 fe23e58d08013f9b10fd741f40636b44e20e7e8278be6ee6f6eecae59f18810c5d485e85fe56ded0ef23c3318b5a994f6821829a9966398a54b70859d827b9c4
-EBUILD Daemon-Generic-0.850.0.ebuild 658 BLAKE2B 07290e95a5e6914d6e6bfe11753b367de42179602f8bc9cb15ac7f8f1972057a96b9751e4fade9b3f193940d04525e71be7a114c4030f4ed474be6d39fe61fd6 SHA512 1f28ebaddc78228a2099e00f23991e2b3653c8ee9dbe204650af62bf3690573b1a40c3c3139ea3c9149698eb7b8dd0a6149913a01deac404a153888308dd1c13
+EBUILD Daemon-Generic-0.850.0-r1.ebuild 620 BLAKE2B 8235379487b2673123cdb30a4846a9f66f18faaba79b64609be37be3ce550e15d877215b052a1cef76f2c6d3526635e6b083867da9d833c7083b9f4e84e181dd SHA512 86d92dcf1eff0165e4fee04d3dbc6f8aac8a93fb36c0015e6f5444cbf21bb2cd912e3e8d0d90caf1753f89b9b11a65f26cb4906b427b59003fd571b0c3e502bd
 MISC metadata.xml 612 BLAKE2B 69c3af8686af4db30ba40d8a07833e2ee34bcdbbd9833054a7ac858a294734ebfc03fc3dca125e525723a01817e042081ea0d547053708cb90b271e8e0101d3c SHA512 a00d3ff2085b2ef8657f256ff80c74878bddd8e9a2c22fe0974d10ba511b2dfa1ce21c4cc98f92161a6ab1ac6facf027d9a612199fb6f258f6d8ff7f80fe75a0
diff --git a/dev-perl/Danga-Socket/Danga-Socket-1.610.0-r1.ebuild b/dev-perl/Danga-Socket/Danga-Socket-1.610.0-r1.ebuild
deleted file mode 100644
index c552ce19b666..000000000000
--- a/dev-perl/Danga-Socket/Danga-Socket-1.610.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=BRADFITZ
-MODULE_VERSION=1.61
-inherit perl-module
-
-DESCRIPTION="A non-blocking socket object; uses epoll()"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="dev-perl/Sys-Syscall"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Danga-Socket/Manifest b/dev-perl/Danga-Socket/Manifest
index 6682d9f7669d..c26d1024d6e7 100644
--- a/dev-perl/Danga-Socket/Manifest
+++ b/dev-perl/Danga-Socket/Manifest
@@ -1,5 +1,3 @@
-DIST Danga-Socket-1.61.tar.gz 20361 BLAKE2B 7ada08569d4927432459ee1769a7b7fbeaae9d58853b4f7689929cb067b26053c5b615e90e0b97b6db12624fc59614dc9511cfe3c9a275838780ad0dcd67a12f SHA512 f3799b56f6b70a2bbf141c2f0d8c1f6f6a1568ba6cf886a685919aa3600767a440f2d56f81c0c498c5234d807e848f31df851fd03e1e8c07145247c1c54e11b3
 DIST Danga-Socket-1.62.tar.gz 21862 BLAKE2B b26704240c9118621c22e4e26f5f3d4a8de50a632b425cd6cc91e89bdd387cc040d439dc4e9096304f193c1a4acd90c35d67f22870f91e520935069e917f0086 SHA512 3354e036ca57f5c2b2eac0106d936316bd44106340458f2e4178caa08e5562524d944b5c402952b223d7dfde81129017a5f287a7e74d902f658ee97e9e1f64b3
-EBUILD Danga-Socket-1.610.0-r1.ebuild 348 BLAKE2B d9c03a5706fd7b03374585ca08afd91a6be39d8353f8296490882335b5cb6a64c394e3ff513f7d484f1a755f59c6fedd51860fe2cd14921e8520c4f0c06b117b SHA512 10ef8678473230294fe87e2335461327d949981abb5cd0aeede446e2ca068826959e49a715fb73cdbbf94fcfaf3fa5a547a061c684acc64b8c66a6beceec8c06
 EBUILD Danga-Socket-1.620.0.ebuild 512 BLAKE2B d18e74f000f12f0c6206f742becbd15cffdd964de45981ff85b66c541690f778443885479b26df91037dc22e99b64c20bb187ab4919035d5fb7420e95ac3664e SHA512 7f1f4e4c6c382691b11575106007d19cf61066fc48f80eaf979d9deac2824c88ad08b1df24f0ff25c50e0c03848b9fb5a8379f5eed801eb60cfd03e49ad8703e
 MISC metadata.xml 547 BLAKE2B 6da9485adf8c02d78193c314323aea5e08c1b1c74150de49dce80c9f45768e6792ad4bf47a04e72b41a073ba8a37b81ff7ac2d27e4cccbe8abfc3f787e180c50 SHA512 836ef5e0bc5c44fe4983db5be16991207371fee5b3f192ab24a785c16bade47f7e177ad838823cfc412d5f1928c28285d0973d6839e495302782d58978311b72
diff --git a/dev-perl/Data-Compare/Data-Compare-1.250.0.ebuild b/dev-perl/Data-Compare/Data-Compare-1.250.0.ebuild
deleted file mode 100644
index 6f9a9526d60b..000000000000
--- a/dev-perl/Data-Compare/Data-Compare-1.250.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DCANTRELL
-MODULE_VERSION=1.25
-inherit perl-module
-
-DESCRIPTION="Compare perl data structures"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/File-Find-Rule-0.100.0
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/Clone
-		dev-perl/Scalar-Properties
-	)
-"
-
-SRC_TEST="do"
-
-src_test() {
-	perl_rm_files t/pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Data-Compare/Manifest b/dev-perl/Data-Compare/Manifest
index b7e4885c76cd..cbab247cc875 100644
--- a/dev-perl/Data-Compare/Manifest
+++ b/dev-perl/Data-Compare/Manifest
@@ -1,5 +1,3 @@
-DIST Data-Compare-1.25.tar.gz 26249 BLAKE2B 7671f063b17b7e531dd06684f44ffd2c8bd80eeb215c57c2af983330cc8bc47c6d887d3556aace6bedbe8985f3e4d6d6f0aa1c70d5164e7d1af5f2bd1ff4d5dd SHA512 6db1235672030aa1afe52de1de9fac1f8a2af9eed99a3143d6c5b30669908125f584638fe06b8b33208f6d7fb734ccec7381c9411408a3f4fde1998707f748c9
 DIST Data-Compare-1.27.tar.gz 27111 BLAKE2B 969291c75a58dd91c6f31572e05d8b7832571e224c7cdfd1246c89c10e496d6452171100e16d9a8a23ad71e384d2d4c3cabf568effdc4b28542f3e091f5343a4 SHA512 29f20ec3fc86402b1006a50adb5417e11ff67cc2d6381afc7a6626696fb1f597dddbd87c505ccb6f3aa68805c0da2b193e13ea0130e40780731e49e530e42c85
-EBUILD Data-Compare-1.250.0.ebuild 617 BLAKE2B ddad8e8b566ac8dbfa72b3c6f2f50d862eeaf0151798b9b094ccd71909897052b3aa179e852002dbe6aeb80b558a15a32a2b6da432dba7c87e2a550e515f76d4 SHA512 e15c119b5c249c72f4ffe41e9ecfd3c7decce5047ae5a017a4f8db17aa5c78a2ab57aaf38696ddf073e86f62b8aa55eea18ae1732346f798345a60b4815d3b2f
 EBUILD Data-Compare-1.270.0-r1.ebuild 613 BLAKE2B 3cab559bfa236889aa1f019d53c6eb7a15c19753ffa2afb8af378f98c43ee3c08b5bd07b13d49715f1704527669e1d0c80da694c1bdcefeea51ac754e1a10c03 SHA512 7fb7ac11a47f566288ce10575d597a794fc1f7ff077213c9065876dbe0645d49bc39927f78067fab6960ad5943fba2d26ccd990c7912b02fc2f01ba1d5d40f23
 MISC metadata.xml 486 BLAKE2B f3040bfe61b55a54c4f7d6edd736986b001182c955525daefb1c07a48b572d1d7c3f835d547a3dcf9260a1a30c662830b3aa84a4d3e03e4a57e7343c2d55956e SHA512 f8173096fe385f031431fcd74e9e87ac30434e68f72df647ff4f66ab869186328bf91b22fee4c522367bb96e22df8680eecd9805b35c0a4d13c11ff01118506c
diff --git a/dev-perl/Data-Dump/Data-Dump-1.250.0.ebuild b/dev-perl/Data-Dump/Data-Dump-1.250.0.ebuild
new file mode 100644
index 000000000000..d92b5fd6bbdd
--- /dev/null
+++ b/dev-perl/Data-Dump/Data-Dump-1.250.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=GARU
+DIST_VERSION=1.25
+inherit perl-module
+
+DESCRIPTION="Pretty printing of data structures"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	virtual/perl-MIME-Base64
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test
+	)
+"
diff --git a/dev-perl/Data-Dump/Manifest b/dev-perl/Data-Dump/Manifest
index 6f3e9c5e9939..fecf8e91cf23 100644
--- a/dev-perl/Data-Dump/Manifest
+++ b/dev-perl/Data-Dump/Manifest
@@ -1,3 +1,5 @@
 DIST Data-Dump-1.23.tar.gz 20771 BLAKE2B 04f28bc08e43a736cb9fc532883aecb85add98651e21f19a68387dd578efacc71ef85b567ed7f3c82a13a9e8ce84b0c4bebb9afffbb43f892f6b1adcd065ef92 SHA512 6fd6c23bb6df7f7396219149dbfd23132fc2ea1dd344c32f62fc27a1afeeb28d7ebf2d429184bb6d1189f412e218f9e62a966b49fdd9ad5564e5152d67a02b96
+DIST Data-Dump-1.25.tar.gz 20912 BLAKE2B c68ba6c3af8d5b963185c2643411afa294e12a0353baa08c12eb784640aa080926a0e6fc13f57071218fc4ac65d5a16ed12b14894319aee6625a0786a714d440 SHA512 fc859b0f02a44a959da3e162606c8fbaefececf8dbd0aa357d68a5a3143b818ae423dd7862063f2f77161ea000fcaa6841c96a2c4a268b889da9588292b157fe
 EBUILD Data-Dump-1.230.0-r1.ebuild 566 BLAKE2B eaa01ad2bb9ceb9536227220b63c136f811caebb0977d70b4b9fbf86e60f4725d4f1d637452f9d715f2fdc8b8696923150b2ad46b982ae91bde383c881107713 SHA512 6f24c2eff0f0c71aa648388bfe5be7c746f516d096a07ca14a7c9e9cc1fa671c9c0fa400aee08db21a6a4d4adccf5c732400af2081c40afaf24d4ad195436968
+EBUILD Data-Dump-1.250.0.ebuild 531 BLAKE2B 6d78bae71cea086e29a68b24cf669dcb4da2a8153f9f37f50995c0d1ab033ab48c726d3a05a1d6cbace44f457874264f21334c8dc4afb91732b3be0e4adcfec0 SHA512 0cafda1e833945dbae5e8066364c2ba69157efda8ecb922cb319170a2f34d503b31cdc1f3a82b0645785f35a8376163556b015c3ca1536719e434ee7bcd95e1b
 MISC metadata.xml 737 BLAKE2B ab23794cd775658046a940cbb6f639a1019a1369c27bbeb19472fcd9e4e2034cf0c9b8d1e48bf73a0eb1d46fb8d60d1d11a413e3ff3ae005334d28e4ab05289b SHA512 bf1fda34977d5b035ea0df37b983a1dc682582a6ab8bef0d59401b999af01c9a89a505d7b23f5cd46e27ca97e22858c0d931654aef99131499f81f1f8e829cf9
diff --git a/dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.23.0-r1.ebuild b/dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.23.0-r1.ebuild
new file mode 100644
index 000000000000..9879673613b9
--- /dev/null
+++ b/dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.23.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=2.023
+inherit perl-module
+
+DESCRIPTION="Less indentation and newlines plus sub deparsing"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-solaris"
+
+RDEPEND="
+	virtual/perl-Data-Dumper
+	virtual/perl-Exporter
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.23.0.ebuild b/dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.23.0.ebuild
deleted file mode 100644
index 53b3c57e08c9..000000000000
--- a/dev-perl/Data-Dumper-Concise/Data-Dumper-Concise-2.23.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ETHER
-DIST_VERSION=2.023
-inherit perl-module
-
-DESCRIPTION="Less indentation and newlines plus sub deparsing"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Data-Dumper
-	virtual/perl-Exporter
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Data-Dumper-Concise/Manifest b/dev-perl/Data-Dumper-Concise/Manifest
index 9ac715c17aef..e48604893e76 100644
--- a/dev-perl/Data-Dumper-Concise/Manifest
+++ b/dev-perl/Data-Dumper-Concise/Manifest
@@ -1,3 +1,3 @@
 DIST Data-Dumper-Concise-2.023.tar.gz 7867 BLAKE2B 9cafbe1709b73c6dc87a520f4f2caa728b650ca37fe06bb13d664282fda4a617122fba7eed6a595af91bae3a5616615a36d4a01673ec97a02baa81ea8fadaaaf SHA512 cc193bc60228dd3bb1c50d4545ee6a507d80ada27548303bb04fd720504746a2d5a4f32d7c33f52dfaf135a2456e019d794a7d693e2c56df9ea9d0ff385e8cd0
-EBUILD Data-Dumper-Concise-2.23.0.ebuild 484 BLAKE2B 7aa8fb7b282c4beb864fe5d0aa804ffa958d004360124818bebe8c9afcf306c7752faa65c36c5bb571207314693d9ea9ca61b8cf68244b850d62eaa836944ff6 SHA512 5ecfc9fea503585d0f49ee8752587adcd9e86df7a14a76f895988bc72bf17bd8b00bf149a4b6b890d88793b66e10a72f53e1c5cb4dfcf3529bcfffcc4ce527d9
+EBUILD Data-Dumper-Concise-2.23.0-r1.ebuild 446 BLAKE2B a268ea756a5b443cf789bdec4db305531615e9f16c65d2a00d7cab4977cd26734c54d6efbd7d0d4c798acf44c5f1a26fc2e809c92fa12fbde8769472b53023e8 SHA512 b2dbff88230e3843f914a1080796447f51129b484881f1694ac812b4f6fb66cd1615fe9c411628cf34dad6fe15f6baf759d470b5ffc9b1052ccb787bd9c7eed4
 MISC metadata.xml 546 BLAKE2B 51aa9ea5a523d05454adf619213429abe3256532ca555fb1ef2d53f07a4278c6c19fda227c3cf434491981f51e11ebaa6a8d87a40057e411faf4512bc11efd77 SHA512 e29a1cb9cbdd45eb0eb619fabe2c6b871df5e22a60da4640fc7f6ec937743b484166a43b1323bd0a4757f64b5799fd1dfaed53475af211abaf5a30e36989059c
diff --git a/dev-perl/Data-Float/Data-Float-0.13.0-r1.ebuild b/dev-perl/Data-Float/Data-Float-0.13.0-r1.ebuild
new file mode 100644
index 000000000000..46adf0a21d20
--- /dev/null
+++ b/dev-perl/Data-Float/Data-Float-0.13.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ZEFRAM
+DIST_VERSION=0.013
+inherit perl-module
+
+DESCRIPTION="details of the floating point data type"
+
+SLOT="0"
+KEYWORDS="~amd64 x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	virtual/perl-parent
+"
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? ( virtual/perl-Test-Simple )
+"
+
+PERL_RM_FILES=( "t/pod_syn.t" "t/pod_cvg.t" )
diff --git a/dev-perl/Data-Float/Data-Float-0.13.0.ebuild b/dev-perl/Data-Float/Data-Float-0.13.0.ebuild
deleted file mode 100644
index 723c7dca5368..000000000000
--- a/dev-perl/Data-Float/Data-Float-0.13.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ZEFRAM
-DIST_VERSION=0.013
-inherit perl-module
-
-DESCRIPTION="details of the floating point data type"
-
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/perl-Carp
-	virtual/perl-Exporter
-	virtual/perl-parent"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? ( virtual/perl-Test-Simple )"
-
-src_test() {
-	perl_rm_files "t/pod_syn.t" "t/pod_cvg.t"
-	perl-module_src_test
-}
diff --git a/dev-perl/Data-Float/Manifest b/dev-perl/Data-Float/Manifest
index c518c2aa8227..f9c77ea52cd0 100644
--- a/dev-perl/Data-Float/Manifest
+++ b/dev-perl/Data-Float/Manifest
@@ -1,3 +1,3 @@
 DIST Data-Float-0.013.tar.gz 25939 BLAKE2B 9b199ed91a2b9ae51ffa62e81fc7ceb5c1c26d462b036fe9e0d3603f0041658fdedd141ef8eb93c9955e05a4fd06bdf6b01c838dd7bc580dea22ca7eb2f28b29 SHA512 7e3be7843df30e581bd8937fde226ac6f24100206a376e1dbed2d4699c95d3f39a25cd1485f5871c46adba88d2fb1899efcd326f908797cdc985ec713cd9a90f
-EBUILD Data-Float-0.13.0.ebuild 530 BLAKE2B 73afb002d560b589cb8e15eafa5b03ba47702859ae4c4202593f18cd1381d32d49b3caa07346ecacc74621f681634fd754d0867d8abd9176806a1709c897723e SHA512 871d7847c771a2e12860638e26cd4a4665ef0b1587dd4295abf6d1ba9166ca96acadda09eac0a9c8019dc310520277010f9ac6016c5c841913d1b833b85eb77a
+EBUILD Data-Float-0.13.0-r1.ebuild 462 BLAKE2B 058fb6ff98a79d41b8296bc4f2a51b6ec77a1f1783f39e596e150fb190d9536f6bc71a28e5249cc321b72038a08e38529a475b737debd32a4bb056f7bf846e4c SHA512 9fb85e2efc98caf0c3694341f7975775fbeaf0be752ded5a19f5e7050bda6eec30b1c8a226bc91d9cfc4d33914118f8d0ac776c6ad0262c32475d2c2bf9e8ee9
 MISC metadata.xml 381 BLAKE2B 22f0ed2454833cd1903ade79fb361fc46d4d2cd8fca102e50c54d5ea3ffe54c033b16541142aac8eafeaddac20d97dd4ca692067fe9d2a0564dc6393ea76a7de SHA512 f254a40c3dbdb0af70db92622fa58e9f8ae87d8661aee829970baa28d7fb2ab03fed45cb05951d36b6b76ac86e00fd22eaaa6c39401a78b620cb935d5d5f169f
diff --git a/dev-perl/Data-FormValidator/Data-FormValidator-4.880.0-r1.ebuild b/dev-perl/Data-FormValidator/Data-FormValidator-4.880.0-r1.ebuild
new file mode 100644
index 000000000000..c6f1b92c787a
--- /dev/null
+++ b/dev-perl/Data-FormValidator/Data-FormValidator-4.880.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DFARRELL
+DIST_VERSION=4.88
+inherit perl-module
+
+DESCRIPTION="Validates user input (usually from an HTML form) based on input profile"
+
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+RDEPEND="
+	dev-perl/Image-Size
+	>=dev-perl/Date-Calc-5.0
+	>=dev-perl/File-MMagic-1.170.0
+	>=dev-perl/MIME-Types-1.5.0
+	>=dev-perl/Regexp-Common-0.30.0
+	dev-perl/Email-Valid
+	virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+PATCHES=( "${FILESDIR}/${P}-skip-readme-pod.patch" )
+
+src_test() {
+	local i;
+	elog "Install the following dependencies for comprehensive tests:"
+	i="$(if has_version '>=dev-perl/CGI-4.350.0'; then echo '[I]'; else echo '[ ]'; fi)"
+	elog " $i >=dev-perl/CGI-4.350.0"
+	elog "     - Test interop with CGI.pm as an input source";
+	i="$(if has_version 'dev-perl/CGI-Simple'; then echo '[I]'; else echo '[ ]'; fi)"
+	elog " $i dev-perl/CGI-Simple"
+	elog "     - Test interop with CGI::Simple as an input source";
+	i="$(if has_version 'dev-perl/Template-Toolkit'; then echo '[I]'; else echo '[ ]'; fi)"
+	elog " $i dev-perl/Template-Toolkit"
+	elog "     - Test Template.pm can format Data::FormValidator objects";
+	elog
+	perl_rm_files t/pod.t
+	local MODULES=(
+		"Data::FormValidator ${DIST_VERSION}"
+		"Data::FormValidator::Constraints ${DIST_VERSION}"
+		"Data::FormValidator::Constraints::Dates ${DIST_VERSION}"
+		"Data::FormValidator::Constraints::Upload ${DIST_VERSION}"
+		"Data::FormValidator::ConstraintsFactory ${DIST_VERSION}"
+		"Data::FormValidator::Filters ${DIST_VERSION}"
+		"Data::FormValidator::Results ${DIST_VERSION}"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	perl-module_src_test
+}
diff --git a/dev-perl/Data-FormValidator/Data-FormValidator-4.880.0.ebuild b/dev-perl/Data-FormValidator/Data-FormValidator-4.880.0.ebuild
deleted file mode 100644
index 8718777f0b26..000000000000
--- a/dev-perl/Data-FormValidator/Data-FormValidator-4.880.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DFARRELL
-DIST_VERSION=4.88
-inherit perl-module
-
-DESCRIPTION="Validates user input (usually from an HTML form) based on input profile"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-perl/Image-Size
-	>=dev-perl/Date-Calc-5.0
-	>=dev-perl/File-MMagic-1.170.0
-	>=dev-perl/MIME-Types-1.5.0
-	>=dev-perl/Regexp-Common-0.30.0
-	dev-perl/Email-Valid
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-PATCHES=( "${FILESDIR}/${P}-skip-readme-pod.patch" )
-src_test() {
-	local i;
-	elog "Install the following dependencies for comprehensive tests:"
-	i="$(if has_version '>=dev-perl/CGI-4.350.0'; then echo '[I]'; else echo '[ ]'; fi)"
-	elog " $i >=dev-perl/CGI-4.350.0"
-	elog "     - Test interop with CGI.pm as an input source";
-	i="$(if has_version 'dev-perl/CGI-Simple'; then echo '[I]'; else echo '[ ]'; fi)"
-	elog " $i dev-perl/CGI-Simple"
-	elog "     - Test interop with CGI::Simple as an input source";
-	i="$(if has_version 'dev-perl/Template-Toolkit'; then echo '[I]'; else echo '[ ]'; fi)"
-	elog " $i dev-perl/Template-Toolkit"
-	elog "     - Test Template.pm can format Data::FormValidator objects";
-	elog
-	perl_rm_files t/pod.t
-	local MODULES=(
-		"Data::FormValidator ${DIST_VERSION}"
-		"Data::FormValidator::Constraints ${DIST_VERSION}"
-		"Data::FormValidator::Constraints::Dates ${DIST_VERSION}"
-		"Data::FormValidator::Constraints::Upload ${DIST_VERSION}"
-		"Data::FormValidator::ConstraintsFactory ${DIST_VERSION}"
-		"Data::FormValidator::Filters ${DIST_VERSION}"
-		"Data::FormValidator::Results ${DIST_VERSION}"
-	)
-	local failed=()
-	for dep in "${MODULES[@]}"; do
-		ebegin "Compile testing ${dep}"
-			perl -Mblib="${S}" -M"${dep} ()" -e1
-		eend $? || failed+=( "$dep" )
-	done
-	if [[ ${failed[@]} ]]; then
-		echo
-		eerror "One or more modules failed compile:";
-		for dep in "${failed[@]}"; do
-			eerror "  ${dep}"
-		done
-		die "Failing due to module compilation errors";
-	fi
-	perl-module_src_test
-}
diff --git a/dev-perl/Data-FormValidator/Manifest b/dev-perl/Data-FormValidator/Manifest
index dfa4bcba32b7..1465665eb9c5 100644
--- a/dev-perl/Data-FormValidator/Manifest
+++ b/dev-perl/Data-FormValidator/Manifest
@@ -1,4 +1,4 @@
 AUX Data-FormValidator-4.880.0-skip-readme-pod.patch 929 BLAKE2B 7b242ff1b4edc37aae285d992506101652546a5b9a12bd14fc14659e3746a3676d2bd49245efc10f00b86c3b8b9ca79bc2d43d5f5570332bdb34fc97656f974d SHA512 379ff29c0269c4b052a2d48b4c084f1d69744a1e61dccd025d649a9d915579c3d81ced95ab2fce42f24ecc6a68e1b96a7a9a81e7583faddd5326c76dbbd897b3
 DIST Data-FormValidator-4.88.tar.gz 99850 BLAKE2B abb72030dd9b6155c83aa95d975643c6ebd4e4b8b15b7cc360d1a2ff81eddc9b210e8bda7408876f27bba9241541f1e3e6289ebb037a50e0a77d5850b281be76 SHA512 f4f9d813a3c9ae3cefdc1795516c955307dbaa23ca464e5a0a31eb4a9f43a3f31da8155b911433d29915d65da5b05d0843b7de45287d977a0c58ba19f3cfc736
-EBUILD Data-FormValidator-4.880.0.ebuild 2143 BLAKE2B d2287e31534a3fb14c81eb162dfafd3f1946f171ccdfd7c4b44f6b19ce73d784ec6a4a5c71e0a56ff9380b53f4e8dfa9cd0c633554ff8d6981855630824346c2 SHA512 2f57a6ef8834cf0b88a7815f71ce1b646ad181d780f2e77272287b70a3fb4e3b7a2ec2a9b838597d070d6b3302ca7d2691eaa108380614e89c44e58d9b84e737
+EBUILD Data-FormValidator-4.880.0-r1.ebuild 2109 BLAKE2B 9240abd05462d802199d74062929bb72c5d92c2afcde22801f97939b57cc8557e5c379b5f0226b78dc92e5f1197aa871ad71fcbfa699d70b9ec492b590080ec5 SHA512 1bda17f88b0265237dfe2cca9689b25eb5c731946ddd04ee7c88b13ab700ea880d9c3ba8ed91fc3e1acfc0463e312d87cbf69b47bdd7e0ebfac546828f19a51c
 MISC metadata.xml 990 BLAKE2B ddc9eae53db6aac1bed5ae3d654a154e97908137f2411e50edc2c4b594ca5f54577d25e8078c1aa93c9cd54fd9a431035b200dafa13298c127175cc6615f382c SHA512 7b7b2107be3b64a6a8593e1e6467cd502101ae59454a3074cdabaf00aebfbcae9016e302749d4caf76902b75e68ef8cb580983049801f64ccf6697b32e038437
diff --git a/dev-perl/Data-GUID/Data-GUID-0.50.0.ebuild b/dev-perl/Data-GUID/Data-GUID-0.50.0.ebuild
new file mode 100644
index 000000000000..6318e6d52c2f
--- /dev/null
+++ b/dev-perl/Data-GUID/Data-GUID-0.50.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.050
+inherit perl-module
+
+DESCRIPTION="Simple interface for generating and using globally unique identifiers"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/Data-UUID-1.148.0
+	>=dev-perl/Sub-Exporter-0.900.0
+	>=dev-perl/Sub-Install-0.30.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Data-GUID/Manifest b/dev-perl/Data-GUID/Manifest
index 791a6ff4d80a..5b462b7e7ae3 100644
--- a/dev-perl/Data-GUID/Manifest
+++ b/dev-perl/Data-GUID/Manifest
@@ -1,3 +1,5 @@
 DIST Data-GUID-0.049.tar.gz 19513 BLAKE2B a7c6039dacffa4faba05a4441012b7262de08917d850437be3efc59778e5802b73300cc90ed71ea8ef54573bb2a98d8ca075b2bb400d4dbe71a0ece85d434b1d SHA512 1404322971af93067e121052a47f796ac77d19dbeb328dc5db0e60df1c4ce24f614679198afb442cc3ff4326e76df84ff762f85b4e129f44e1441c5beb40801e
+DIST Data-GUID-0.050.tar.gz 20226 BLAKE2B 483714a870a3b09eeb30863d4c5265df03e7401c4072fc9b50b31275dd6fc14baf366746e1f81616f19a53b5188f1c04ac02090f53aa77ce0ec865a3494b8083 SHA512 64a081261e740602ea2e1ca833f0a5df9790b69f199c7b9d7936318fa307d2e473610f592499aa5cce48ce150e80601cd1d5238b6186f608b3e794e4d3377532
 EBUILD Data-GUID-0.49.0.ebuild 574 BLAKE2B cabfcb20a9c84172e91dacd4c01efe5195db20fdea8fb8b8344a63bb14d42cb148e733bc0c0fe5bddb73498a0d0db892b1d59333988b35572d8596120a0a7a17 SHA512 8d5a894de1fea1b253bf07bf90bcd8fbd44dc7c818b656babff2ec9f8eaaba8e875401a2da8f8fe63ca124176fa144667f2f8f92a2b8399114221d49dd4f5a97
+EBUILD Data-GUID-0.50.0.ebuild 537 BLAKE2B 5a5cc49c6d82a0a0522650f2045286584b0d5fee3e806382d1520335121e5a5304aab9d9fc71b8eb213add81fb9281cb255b1d6b3364cae95a2cd36c648283fa SHA512 1388cf347fc0b9c4d8d0f28d0b50da3e2f278cfa85149b62c4145f49b71da4e36b94a34af79da5fedd198e4c997b3d40cecbcd0f6f0bc5003392effd6689ba0f
 MISC metadata.xml 547 BLAKE2B 784d61498fee12c6b11b4e9d32664facf49cd88f18458c7edcd337f02d5d81f7c7aa189d1a60c1fd07d72558bb762d8a5cc60083b7578624c1e33a2f602180a5 SHA512 9a0efe7a0d3309b3c0730637f5575bace59fbc36166365e2d9ca421ce4c3c230509e439c7eedf8b109d7aee544ac7d17d6dced3cf4b3e86a81f1cb6d03c26b0a
diff --git a/dev-perl/Data-HexDump/Data-HexDump-0.20.0.ebuild b/dev-perl/Data-HexDump/Data-HexDump-0.20.0.ebuild
deleted file mode 100644
index 31c38c1091c5..000000000000
--- a/dev-perl/Data-HexDump/Data-HexDump-0.20.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=FTASSIN
-DIST_VERSION=0.02
-inherit perl-module
-
-DESCRIPTION="A Simple Hexadecial Dumper"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~sparc x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-hexdump-pl.patch"
-	"${FILESDIR}/${P}-lib-pm.patch"
-	"${FILESDIR}/${P}-signed-c.patch"
-)
diff --git a/dev-perl/Data-HexDump/Manifest b/dev-perl/Data-HexDump/Manifest
index 94342844589d..577c63760530 100644
--- a/dev-perl/Data-HexDump/Manifest
+++ b/dev-perl/Data-HexDump/Manifest
@@ -1,8 +1,6 @@
 AUX Data-HexDump-0.20.0-hexdump-pl.patch 1579 BLAKE2B fb1686f1abd599243393ccd001d683d324d90c2f834daf4959d5275a00d29800265e265f3191745896e15cffc694f95f3aaf1de21f114123c1d7708db8720ef7 SHA512 a46911db10f2d5facc86cc3efc110d5871ab7c6c50893de674b99b7b2c35efa5c699f8f490ed14b71b2d5ef27b6e2cbe4e1f43e0ea960d0f8b2516c1d6fb905c
 AUX Data-HexDump-0.20.0-lib-pm.patch 677 BLAKE2B bd0ed0d2e7ed0ac6f2c79e4a4a568648a72dc2ecc9d8c1dea1c56eef85e1b983fc65ec88b3ee8192d810a25cb8ac81ca1668ecea4543599f2d44b90407da8f7f SHA512 79611868e7c265e18adc2a7169f9122f08318f19e27afcdd90eb8bde69f8c188f3f386ba25766e79deac204120c48c05bb03067ebc6e31ede01fa0a74a15d73a
 AUX Data-HexDump-0.20.0-signed-c.patch 641 BLAKE2B 01b0b688e7a4231941ef742c55fda06a71ba8415c652055f3f913c8429b3553461c17a423bebce97f7f68f6c8dddcfc1b77b8196524b6bee9f586f134c7a2a03 SHA512 ab5939487cc7e3b16337875aed7e6fbb7592520f567bb082414d06562aeaa3a053be2261504ff3b5fc5100e082c13b0544e072c04c0bde6b5b05365c9f620fb4
-DIST Data-HexDump-0.02.tar.gz 3525 BLAKE2B 8b047f0d69a3720736cf1ca2b29bf419066084e76f689818eb1319d1b40e361708b5d9e30e0706370bf08b8f652099d308663d8ea8d07b93d9ac9d0ba6edf7e8 SHA512 71e787cf679237cbddffd3eca2576812dca38216a8caf9282f7d56af4e268810f36ebd57e3e5c369ec393e7f0e9ae2edbcbe7fd5ffbe49ef4d7e8ba302a28e47
 DIST Data-HexDump-0.04.tar.gz 12434 BLAKE2B 22297d588c312e4719d26eaf2e6b9453f556b9f5924fd4475cb319784bb7c10d23c68b09cb114049675aaf26051c87a6bbbdd207728012a65f4da67811d1b120 SHA512 41f95f0a8ebf23372acd1af737785950663c597d9c76aa2342896967c9b5361a9c29e514c1ef9018461c276978b258649c516c33d3037083a2af0add37589b1f
-EBUILD Data-HexDump-0.20.0.ebuild 386 BLAKE2B 2fffd1b36b314e410733908fb98844e6be1c74b30a80851a4ea0d2e85e24b521e68345ea4abaa3aa6d54d62ce43c82b0e61c688aafcf66923e2dd6268bf1f588 SHA512 a03c55ec6031a7728fdc06dcf08acbd17741475fa7ae0410077336254af9dbba408bf9855a0437cb39590fd3d10e98edcb1b9a9547cbbf9c9f7f06130ac4de04
 EBUILD Data-HexDump-0.40.0.ebuild 267 BLAKE2B 5615cdc7dd5f8a184dc080f460a6923ceaa23d35f29535a08ed54101a07cd40b78b73fad21abdae1be19d4620edf0bed5a91e881bfd70f9cbe5e9f7ae8a6a3f1 SHA512 9272f4b3626e59780370ffcef38dc8ba7d53abd0f9e46b585f9880ec11ddeed45b7dbf0ec055cbbf6d4f387462aa01e03fa7328b2ec8a8c70ee5a1f29cb2aa74
 MISC metadata.xml 397 BLAKE2B b3fbd848462d87beb5d64795b4f7d10335d6eacdabd67a9d5a4112fb81c65e2a7c7b5f82939ad7de996136c15b463aaf1f88a20314293ccf479b4c08bf8d4a34 SHA512 a4ad4a2506d1ae10079ce7d2ff067b68d7a85df94672bbafdf7d6b5fede816f24fb12b0de84d822815833e2e44f48b6598dff6833d2f90c1802ec53b1a6ea3b9
diff --git a/dev-perl/Data-OptList/Data-OptList-0.112.0.ebuild b/dev-perl/Data-OptList/Data-OptList-0.112.0.ebuild
new file mode 100644
index 000000000000..71b49cd63557
--- /dev/null
+++ b/dev-perl/Data-OptList/Data-OptList-0.112.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.112
+inherit perl-module
+
+DESCRIPTION="parse and validate simple name/value option pairs"
+
+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"
+
+RDEPEND="
+	>=dev-perl/Sub-Install-0.921.0
+	dev-perl/Params-Util
+	virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.960.0
+	)"
diff --git a/dev-perl/Data-OptList/Manifest b/dev-perl/Data-OptList/Manifest
index 29515386cd23..c850863fbabd 100644
--- a/dev-perl/Data-OptList/Manifest
+++ b/dev-perl/Data-OptList/Manifest
@@ -1,3 +1,5 @@
 DIST Data-OptList-0.110.tar.gz 18846 BLAKE2B 509e12842175d6928805ad58969986fd91f707af9b04ca56bac15658b0ca8ea1de9494500282f8a97ecfb874dcb560b8c14681c80c5d91e7941e44b981a7761f SHA512 68393958a38f509a71cfba61f6dff8303821918ba29ad8492af0c23cfd4f741c6ce98c4f68ad295f27e166287fc546229c430816f0bdd6009d4f60860c967b76
+DIST Data-OptList-0.112.tar.gz 19764 BLAKE2B 2d4ea3f4e9333b04d3eb767aa9f3ab0cc570d127d909b857afdecc50039904433fa8102911e5ae63c4b89e249d8e64c7a708f8e83e5e0130903c73f20b73fb90 SHA512 79198ef244b4e5cb5201f938f228f20158ccdde76ff9d200b706104ddac5dc3ac8da3280ba335a60fd66d16202b803447ac7709a7d84e514d3a3dc59327ddc71
 EBUILD Data-OptList-0.110.0.ebuild 703 BLAKE2B a1b67f5fae1cca53e92f036f36fcf1dd76046515e1a31e2033c918b2426d6b679a3f984af8de874a4131a78c94bc12809197745ad5d96168efa21d42f7bc8fea SHA512 3e83578c33dc0b304df1ca68aa78ef25acaa1dbaf1f8fd30244f4b5fb60819820b626eea7da1b5b9dfd3304a3132ec48126b11fe46e0ac00e9935450cc7de45d
+EBUILD Data-OptList-0.112.0.ebuild 673 BLAKE2B bc9ffb4af23d7c6ffba202180e7fdd53fe6ed52102cd616fd298ae28f020aae5f308c733771357a6230b3ebb18ff1e5c004e5417bf16deb1d3a3dc42947e0ce5 SHA512 83a6dab13f517ad646d52ff705faeeb4819b7b77973cf1df57a3fa94e9a5cbd7694146b304817f3e0575bc0e07a9f27510423984e0bd647a1d3dc28c6fbf204f
 MISC metadata.xml 397 BLAKE2B 9c837d6e740042b702a3e8b7140814dcbc6dafe78c766507eabf62446bc5429617bcf0bb5a449741a20ae4a690407954e94c98fabf0e8863c8c890df87d2f2b7 SHA512 98d0c5aa49b8cbae52af7d890d903874716f83869c8adbcde49f864724f1432c51c8b12e322ad098386def00e3d946f0d6bb4da23d62bce17782b5539369de9e
diff --git a/dev-perl/Data-Page-Pageset/Data-Page-Pageset-1.20.0-r1.ebuild b/dev-perl/Data-Page-Pageset/Data-Page-Pageset-1.20.0-r1.ebuild
deleted file mode 100644
index b44dec0beefd..000000000000
--- a/dev-perl/Data-Page-Pageset/Data-Page-Pageset-1.20.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR="CHUNZI"
-DIST_VERSION="1.02"
-
-inherit perl-module
-
-DESCRIPTION="change long page list to be shorter and well navigate"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Data-Page-2.0.0
-	dev-perl/Class-Accessor
-"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? ( dev-perl/Test-Exception )
-"
-
-src_test() {
-	perl_rm_files t/pod-coverage.t t/pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Data-Page-Pageset/Data-Page-Pageset-1.20.0-r2.ebuild b/dev-perl/Data-Page-Pageset/Data-Page-Pageset-1.20.0-r2.ebuild
new file mode 100644
index 000000000000..9e4afed8d8a5
--- /dev/null
+++ b/dev-perl/Data-Page-Pageset/Data-Page-Pageset-1.20.0-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHUNZI
+DIST_VERSION=1.02
+
+inherit perl-module
+
+DESCRIPTION="change long page list to be shorter and well navigate"
+
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/Data-Page-2.0.0
+	dev-perl/Class-Accessor
+"
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? ( dev-perl/Test-Exception )
+"
+
+PERL_RM_FILES=( t/pod-coverage.t t/pod.t )
diff --git a/dev-perl/Data-Page-Pageset/Manifest b/dev-perl/Data-Page-Pageset/Manifest
index 118f119be3e0..e99bcac69a71 100644
--- a/dev-perl/Data-Page-Pageset/Manifest
+++ b/dev-perl/Data-Page-Pageset/Manifest
@@ -1,3 +1,3 @@
 DIST Data-Page-Pageset-1.02.tar.gz 4220 BLAKE2B 7ea96abe500a81da266e9ec73cf724b3c726a3470335b52fadf8f37139d7dc811768827b21435ac8e3bb2d4db82cb5b7914535acb3834a4637f636016e8a1446 SHA512 d6676511e6b9cb0c110d6f535120e04f110e53a18bf9ce65e6f346d616d9020cea6f7d9514e264fee0220ef100a1bce2e863d276fbaaa113ba8f920cf5bd2610
-EBUILD Data-Page-Pageset-1.20.0-r1.ebuild 538 BLAKE2B f787bf55c9745c90123dfc187321824eded8a3625cf38b1f7d2e55d12b0379c5bfadb46e02f0b49dc4818d55a185f5f959e5280c1e3adf49afd9dade683ec9bf SHA512 3cfb4c8150bde6368d1a35379eb4852349d677e661c81b4815fa30256d6b4f9cef6e05dbe2387547b2cf5d4e1ebc2cdbfaac1cb2ab06c8e69449e5386f588001
+EBUILD Data-Page-Pageset-1.20.0-r2.ebuild 462 BLAKE2B 0454f1b1bdf3390c1c89289078a41abcf0371438e659b7c4304aa439f247bbb0c090d0b835e37a9a3a601213405b87d66794ddb7e4626c0f8309061cace5bac9 SHA512 dae39e58d979735e31e9959f0e8868978d968cfbd65ac3414bd81de6b4455fc78f794558f88a6ec1ff17e3623e6b76ac304ebf2ca6af752a053a38bb93b1ff82
 MISC metadata.xml 481 BLAKE2B 65ed4300197c2a36e751ad62b6606f8ca222dc797da25f52ef64564000eff229a46b202296846d621328b039a035834f485076161b8d1bbf4eb24b32ae6808b0 SHA512 9bc47ca7b7704f7a5462dfc669f4521e3044b9fbbc891c5c817e2075d065d651455ca186fa2936829ef564ab437bc91922109c0a0283952c3e9f2810837d2bf5
diff --git a/dev-perl/Data-Password-passwdqc/Data-Password-passwdqc-0.90.0-r1.ebuild b/dev-perl/Data-Password-passwdqc/Data-Password-passwdqc-0.90.0-r1.ebuild
new file mode 100644
index 000000000000..bdc294294215
--- /dev/null
+++ b/dev-perl/Data-Password-passwdqc/Data-Password-passwdqc-0.90.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SHERWIN
+DIST_VERSION=0.09
+inherit perl-module
+
+DESCRIPTION="Check password strength and generate password using passwdqc"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/List-MoreUtils
+	dev-perl/Moose
+	dev-perl/namespace-autoclean
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	dev-perl/Devel-CheckOS
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+
+PERL_RM_FILES=(
+	t/pod.t
+)
+
+src_prepare() {
+	einfo "Stripping Devel-CheckOS from inc/"
+	rm -rf "${S}/inc/Devel/CheckOS.pm" \
+			"${S}/inc/Devel/AssertOS.pm" \
+			"${S}/inc/Devel/AssertOS" ||
+			die "Can't remove bundled Devel-CheckOS bits"
+	sed -i -e '/^inc\/Devel\/\(Check\|Assert\)OS/d' MANIFEST ||
+		die "Can't remove Devel-CheckOS bits from MANIFEST"
+	perl-module_src_prepare
+}
diff --git a/dev-perl/Data-Password-passwdqc/Data-Password-passwdqc-0.90.0.ebuild b/dev-perl/Data-Password-passwdqc/Data-Password-passwdqc-0.90.0.ebuild
deleted file mode 100644
index 48b88d3924e8..000000000000
--- a/dev-perl/Data-Password-passwdqc/Data-Password-passwdqc-0.90.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=SHERWIN
-DIST_VERSION=0.09
-inherit perl-module
-
-DESCRIPTION="Check password strength and generate password using passwdqc"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	dev-perl/List-MoreUtils
-	dev-perl/Moose
-	dev-perl/namespace-autoclean
-"
-BDEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	dev-perl/Devel-CheckOS
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-PERL_RM_FILES=(
-	t/pod.t
-)
-src_prepare() {
-	ebegin "Stripping Devel-CheckOS from inc/"
-	rm -rf "${S}/inc/Devel/CheckOS.pm" \
-			"${S}/inc/Devel/AssertOS.pm" \
-			"${S}/inc/Devel/AssertOS" ||
-			die "Can't remove bundled Devel-CheckOS bits"
-	sed -i -e '/^inc\/Devel\/\(Check\|Assert\)OS/d' MANIFEST ||
-		die "Can't remove Devel-CheckOS bits from MANIFEST"
-	eend
-	perl-module_src_prepare
-}
-src_compile() {
-	mymake=(
-		"OPTIMIZE=${CFLAGS}"
-	)
-	perl-module_src_compile
-}
diff --git a/dev-perl/Data-Password-passwdqc/Manifest b/dev-perl/Data-Password-passwdqc/Manifest
index 50d493a030ea..651a470e5ea5 100644
--- a/dev-perl/Data-Password-passwdqc/Manifest
+++ b/dev-perl/Data-Password-passwdqc/Manifest
@@ -1,3 +1,3 @@
 DIST Data-Password-passwdqc-0.09.tar.gz 110136 BLAKE2B 57418035d911d63974dd1fee7af013be250e638e4fefae11c4dad6ca0963ce19602d17194f16451fc235f3a62a9fbc71f9e90a21a078bc43ee01dd604aed0696 SHA512 08d15ee99129a33579d5782d2226e896815e1ab7a4259dea03f251d67b2fe08661623c6ba1f9a61a6bcf36bad4a25cd87a2c31570c4d0c64640590a0dfc24eea
-EBUILD Data-Password-passwdqc-0.90.0.ebuild 1011 BLAKE2B f990a9b0c6113b6f8e603c142df5db0936ce51460705a8c32b19bb92d4ba366b1e74e9d053b2589aab05e5f25ffd138c43e4b69bfe6d00dd389cbf9c03b66887 SHA512 a8054e2e14257741eb21d87ec14bf9cc284ebf93cf93974ddc795d85d5b728b6b82ac0e61c355672261dc3c95d395c948862ecf3d363c93e1a296b449332966a
+EBUILD Data-Password-passwdqc-0.90.0-r1.ebuild 893 BLAKE2B 5940eb552f7178eeb84440ec7d20203f8df83e4d8ee4afa34cee8031645f8e59eb02fdff26611d6a46051255540877fec9aaeb1a1c52740a0032a25ce737e08c SHA512 dea982d1c5e1ffe235a78b953b824ffc898ce9bfe03d053c755a71ec6f649544732eb95f0aa52269d725c2f937eb00f95bb0ade0e077c762aa52f6634fe5982c
 MISC metadata.xml 418 BLAKE2B 79046ce364db2e8aa0c81e1ed6993b1c7c3264f34a79313f906677047252d6523ed463a3a56eb3e0732dfeb9d4a8da15a5f3258cf2c8893b1bb3150a85e0ab6c SHA512 02e4fa8ac3fd18cf87cfaa587ac6fb61f39b0e16aa81484a0edf95a742c1a0bcc0bfcbd05945d4b28eb663de3ac6957ec62fd7b2673bafe9e4f1a4a78082c104
diff --git a/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild b/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild
deleted file mode 100644
index 4d2193bbe667..000000000000
--- a/dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MATTP
-DIST_VERSION=0.002009
-inherit perl-module
-
-DESCRIPTION="Base classes wrapping fundamental Perl data types"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Class-Method-Modifiers
-	dev-perl/List-MoreUtils
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Module-Runtime
-	dev-perl/Role-Tiny
-	virtual/perl-parent
-	dev-perl/strictures
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-Fatal
-		dev-perl/Test-Output
-	)
-"
diff --git a/dev-perl/Data-Perl/Manifest b/dev-perl/Data-Perl/Manifest
index a7f86148202a..49bc09a260e3 100644
--- a/dev-perl/Data-Perl/Manifest
+++ b/dev-perl/Data-Perl/Manifest
@@ -1,5 +1,3 @@
-DIST Data-Perl-0.002009.tar.gz 23155 BLAKE2B 1f8c1ba4353c26736b3473be2283df1e0a247150b842333010822f7e1d25ecdddea39ac7874ba79d777e4691eeac7257e40ae366ae0a3fae0747a205166c54de SHA512 872eae53641b7ac19a8bcd4a6522475bf042463fbb8380a45481289c6792fa17cf4d52d146228acf089b9cff091413684fa5b39f67bc28f362a5d2eb85d1d01a
 DIST Data-Perl-0.002011.tar.gz 23235 BLAKE2B 968461f3b23e51a3a0bbb33e0d6b5986e1288f300e511e8f05facfaee0e220424bba71466dff55ba7a4967098fe5f76eba3b6ebfde74610a7f54985cc5806f6d SHA512 c55f0d5ba6141ef2a3fe02fc4258f4dbc9ae041e5b390dc626f297d68f4fafdafe5deef6ee282718927e101f7c2d93e913117fe754d5fc0c28d206b45e61b285
 EBUILD Data-Perl-0.2.11.ebuild 772 BLAKE2B c2434d940955cae32fa423aa01dd9bfd003d75222558e121fbbe640061fe0b31af9ef2ef951284e7f8f54c5ae304f1e59b1ea3c03989e150f161e730fdf99cf5 SHA512 b1642a5b74d25e95b1f363934105d4fedcc605a938bc7bc8fa0e93b3734c52f418755953131ce94b8ca1d1912e4ac6da507f285e93e9cb8920e70f05e223cc64
-EBUILD Data-Perl-0.2.9-r1.ebuild 699 BLAKE2B 74df21eee5aea622d2796a5e5c966114e8d48ef48d2c29aa9ca58129005f87b02bb4144ade9a4708692873390bfb6c8a3355ee8a33eb9d173a0b99904b508e25 SHA512 e8e186e818f0c597dbce01556e8be143b11a58ddf65fbc77ee56e74a57723d7892d5cf6e85e0a45302802443684bbfdc6db4683029d807c9c88308ae64eb8775
 MISC metadata.xml 1379 BLAKE2B dcfb4fbe23c6af3fdf07873494a6844e3b47b140b1a3c8db317d2091985493fee56df44c0b6168505a0eeb63851e4462289c5549aef1b5fcce68d605003c458b SHA512 33ea2567cd04800531fcd1bd6fb4e1ea32c7d5e9a0ce4a64eab645388138b1f6688679473b41a0a81575d2998e87ebc6cc9599708b07845e5fdd508aa7d97189
diff --git a/dev-perl/Data-Printer/Data-Printer-0.400.0.ebuild b/dev-perl/Data-Printer/Data-Printer-0.400.0.ebuild
deleted file mode 100644
index 0fcee5aa2b1e..000000000000
--- a/dev-perl/Data-Printer/Data-Printer-0.400.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=GARU
-DIST_VERSION=0.40
-DIST_EXAMPLES=(
-	"examples/*"
-)
-inherit perl-module
-
-DESCRIPTION="Colored pretty-print of Perl data structures and objects"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	dev-perl/Clone-PP
-	>=dev-perl/File-HomeDir-0.910.0
-	virtual/perl-File-Spec
-	>=dev-perl/Package-Stash-0.300.0
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Sort-Naturally
-	>=virtual/perl-Term-ANSIColor-3
-	>=virtual/perl-version-0.770.0
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Temp
-		>=virtual/perl-Test-Simple-0.880.0
-	)
-"
diff --git a/dev-perl/Data-Printer/Manifest b/dev-perl/Data-Printer/Manifest
index 1a6136259377..7d31924fee52 100644
--- a/dev-perl/Data-Printer/Manifest
+++ b/dev-perl/Data-Printer/Manifest
@@ -1,5 +1,3 @@
-DIST Data-Printer-0.40.tar.gz 58847 BLAKE2B 04e9f7e682e1b38fadea6b3069f0c2c5e011e8703e2ed553bc609635387755b2c1a7179255fe61283363b26770bd369a6e7ee35e85da2d5663f821e106e950a0 SHA512 9aa92013c4d1f43a654f2e40f797a20f2fc5576d9496bc40bfe4b63e3f2c5893ffb4b83aaeca9c27ca09ab248e18ec44c1a0ca5a34cf140f62522f7adf15f446
 DIST Data-Printer-1.000004.tar.gz 114981 BLAKE2B f6cab736d240999837446db02d405226807f7d629c4fe3c371ae31de27843d664719ea28e55f63e6432b8eaa628b5bf6a74b2145486d1e38b4c3020db88f0374 SHA512 a1edce61cef6010aa4bbc90d60b221c0bbb8a88f8808217955b72b5fc51a221c0d10051fd2fb8cbc4b2d5a18c5eea7b81f167b2f85f8ce0e144b5b995a702bb0
-EBUILD Data-Printer-0.400.0.ebuild 731 BLAKE2B 46c74f6d1b87328ed344e101de04295e2cf69311a238948c152e11101262e7392f2780be76c1f3b22cd1e1f0c9ea05ea296775659da5c1b4ef43f2fa1e2db311 SHA512 ba8ba573d5c78f7383dcb44cc81af5b6738ce54fd8508ff734fc8c18f4a6bef7ed992e3e9d02509177f2872edfaaff836a6769fb220e08338ba3b13d2d3aa2ce
 EBUILD Data-Printer-1.0.4.ebuild 577 BLAKE2B b67b51eb7043ed2c6ec074403638e96e5601f06afe1703b02477176be8d9fcbb932b4f5bcb74ffdc89e4eb05219f43baea4a59f04a4ed063266ecf9e0403839b SHA512 0561d16703446d9810da572dac5a711267ce251e41c3ac589fd09df4bae69a1a26890e0ae930cabfb1bfc8c48a8ab7cac16a88ad36c96cb2d2663bf22c7c628c
 MISC metadata.xml 872 BLAKE2B 1d304d797f0b0ab0c56c85aa7862c208ddaaf510578dc957a73c4cd47e0ef7545a5ff56d499efd7435e25b372a119fc8a769b9391c144a80abcb5f651db3022b SHA512 9915849661c6122b54c5a271c64dcfb28eb660b75d513ae68f0a2338332f44e084eaadb7184500bda5c844443d041f05fd678bc15da5bc077486f89ff524b22c
diff --git a/dev-perl/Data-Random/Data-Random-0.120.0.ebuild b/dev-perl/Data-Random/Data-Random-0.120.0.ebuild
deleted file mode 100644
index e3628bf99129..000000000000
--- a/dev-perl/Data-Random/Data-Random-0.120.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=BAREFOOT
-DIST_VERSION=0.12
-inherit perl-module
-
-DESCRIPTION="A module used to generate random data"
-
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=virtual/perl-Time-Piece-1.160.0
-"
-DEPEND="
-	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
-	test? (
-		>=virtual/perl-Test-Simple-0.880.0
-		virtual/perl-File-Temp
-	)
-"
-
-src_prepare() {
-	sed -i -e '/jsonmeta;/d'	\
-			-e '/githubmeta;/d'	\
-				Makefile.PL || die
-
-	sed -i -e 's/use inc::Module::Install;/use lib q[.];\nuse inc::Module::Install;/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-
-	perl-module_src_prepare
-}
-
-src_test() {
-	perl_rm_files t/z0_pod.t t/z1_pod-coverage.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Data-Random/Manifest b/dev-perl/Data-Random/Manifest
index 2d418bba4288..b7912cd8f4de 100644
--- a/dev-perl/Data-Random/Manifest
+++ b/dev-perl/Data-Random/Manifest
@@ -1,5 +1,3 @@
-DIST Data-Random-0.12.tar.gz 166951 BLAKE2B 84df509577687c1de60f675b881f245c944bb81b5fb6455473f4b842c301db3bee3dc9d4bb2e5991d857e19831b4636ec72532dcad2838814087f15a61f370ce SHA512 ae898af42a44576f5b968fb44015339e6db4c8542e6198d87aa4346eba767a81bfdd35c33f10d52adddad9fe38d24475bcc7fa87e8223f1a2756ece1da84ee97
 DIST Data-Random-0.13.tar.gz 158143 BLAKE2B 8a7c7f56c563e149f890d341db89690cc2a4f31ff1f5662cc16f80c47a2b9ca4b615cec89f2a10ad3b472e37614995e2af4487a830d6e71d533c0df263fe7355 SHA512 7cf3811ee26a3b93a8170cc9c863ad2cf03f5997cabe66cd78646a4d93a6568ef247f636782b8c707c3064120b30609f3562d8654b31e5e31890aa302b03cdb5
-EBUILD Data-Random-0.120.0.ebuild 852 BLAKE2B 977a4f2d5ce7a0dd545bec403fcc906752443f938a2fdd828c61b17eddc82c38a2b21431b40bcb225c311e3277788f8a455144be7f133b9a498f93c6d1126967 SHA512 f6ef20c898ab33862b7e8736fcec87f63af7cd37c88c8733cc65d3c2736c9efd108444086d7757e2f23957161d8b7855cda10045ba7d4cfad26113c40803fda2
 EBUILD Data-Random-0.130.0.ebuild 1127 BLAKE2B 422b2adf181bc4a2978a0d6614ac19a866e3550d98667e4f85c4af989c46405ada2dd14501b08c2b18233fa0715e81d665cfcc778eedb852769ff4dfafb1eea8 SHA512 aae193cbddb1344aa98a0976006bfcf0b6238ce3a67ea5528ce871516f77b48d925faf5fe4859cb14b0bff90385191e0e9bc68d264d0a89e41d2426323b71391
 MISC metadata.xml 464 BLAKE2B 937a19faa57669d3ad3933bf7bb96b8ed4391c14746144744b5d06ce38d5fbdbb9325cf6162e2a82d98ea03a7ba8814f4d81a9a06fe2ca20e716d3f659e3c65a SHA512 cf1edf6674216963fbfcc44549ff4deefdcadb936294146125ec65f06933437dc5d1522305649a825e1dcdd444dac50a1fe8816ab4242603a4f387e33f94dcc8
diff --git a/dev-perl/Data-Section/Data-Section-0.200.7-r1.ebuild b/dev-perl/Data-Section/Data-Section-0.200.7-r1.ebuild
new file mode 100644
index 000000000000..3c9ceeba6855
--- /dev/null
+++ b/dev-perl/Data-Section/Data-Section-0.200.7-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.200007
+inherit perl-module
+
+DESCRIPTION="read multiple hunks of data out of your DATA section"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	virtual/perl-Encode
+	>=dev-perl/MRO-Compat-0.90.0
+	>=dev-perl/Sub-Exporter-0.979.0
+"
+
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		dev-perl/Test-FailWarnings
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Data-Section/Data-Section-0.200.7.ebuild b/dev-perl/Data-Section/Data-Section-0.200.7.ebuild
deleted file mode 100644
index 825703a2081e..000000000000
--- a/dev-perl/Data-Section/Data-Section-0.200.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=RJBS
-DIST_VERSION=0.200007
-inherit perl-module
-
-DESCRIPTION="read multiple hunks of data out of your DATA section"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-# r: strict, warnings -> perl
-RDEPEND="
-	virtual/perl-Encode
-	>=dev-perl/MRO-Compat-0.90.0
-	>=dev-perl/Sub-Exporter-0.979.0
-"
-# t: base, lib, utf8 -> perl
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	test? (
-		dev-perl/Test-FailWarnings
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
diff --git a/dev-perl/Data-Section/Manifest b/dev-perl/Data-Section/Manifest
index efac5d458b52..1ad30a95ff32 100644
--- a/dev-perl/Data-Section/Manifest
+++ b/dev-perl/Data-Section/Manifest
@@ -1,3 +1,3 @@
 DIST Data-Section-0.200007.tar.gz 22094 BLAKE2B 8bb0f39abb30ac70f5185d9fbbdd9dba1f2b5947961fef937a2913d12b0694629d9e4ec4a3759603a7217cb4a6b0d244bbac5f11bb2b9963b959506bb8b19b51 SHA512 0c23141ccc2041e8c1c222c95d6eab4b56e2d77a94c68507f67acbb62fa5132e9229e9680c9fff6ebbc6a47a42cf1943d6e5b50a5f0168c66193fb52aaa241f0
-EBUILD Data-Section-0.200.7.ebuild 605 BLAKE2B 4abb4164df3c9beb09ee457a26a1ae5da47da7f0ad9708eca181666e95cd7b919a85b440a97dc4e8b505b611e147fe7d77ae985df71e38c321daf6f6866f24c4 SHA512 101567abddb68454705aebc40b1bc21c046653728210cbead8539d56dd3b38cc9977758cc7566b4a997c0a405b00ddc0e255824394a6aed374030375db50a079
+EBUILD Data-Section-0.200.7-r1.ebuild 511 BLAKE2B 03d74334883d490a4be1b77a47ed127c2a37274a7639921fc12ab86b74d3678a652307c48c20710a2a5e9fd8e79c8a23de556fdaaf035262c21140b605656ef9 SHA512 46a6a802fec58f065d5a5b494786e44817f89137684e612939dd92665283eaffdf3223ad2f4a25936942c507f7a9f6bdf3d4c49832d1d8f8379eb1f16ac7f541
 MISC metadata.xml 397 BLAKE2B 432893bdc65c733f31cb99c449caf9008658f6e1dc9e0883e53dbeef174f5b2480213ed47d6005c2df9308109bd54c420aaca14e2945cca3a857305b3be177a1 SHA512 a099204124f04b16a71e5ed4859f04fbaaf95b68993cbe66b96dcb809067858d9a6373192a33c58b0abaf3fd6944646b46396042340945b30562108d438d7e3a
diff --git a/dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild b/dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild
deleted file mode 100644
index 5607dde48a25..000000000000
--- a/dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=1.221
-inherit perl-module
-
-DESCRIPTION="Generate Globally/Universally Unique Identifiers (GUIDs/UUIDs)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	virtual/perl-Digest-MD5
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Data-UUID/Manifest b/dev-perl/Data-UUID/Manifest
index 49ed1f6e4cb9..a75e5297bdf8 100644
--- a/dev-perl/Data-UUID/Manifest
+++ b/dev-perl/Data-UUID/Manifest
@@ -1,5 +1,3 @@
-DIST Data-UUID-1.221.tar.gz 17041 BLAKE2B f85019f4b93236d6a3f8d2732c1f9570f8452791a95332f1f446565e628413f2b1bac27907a1b0fc9e6a449b77211ceedc4d5168d97f68b58247238ddd68a525 SHA512 fa40219890f9adeb486a7ff636603d8695d81765ee858e396130100aaba96b524d80eef76e0c06eac2086fe3bb2d26114d94459466d29ddc82a7a7fcb2f5adac
 DIST Data-UUID-1.226.tar.gz 17647 BLAKE2B 857eb80ebd514acb608d9d7d9fbbca13638059223be303cf28a1dd002a5beb2570e0eff08d0a98f7863fde753cb4e1c4548229fc275f0f4fac9a1b3c333c4ff4 SHA512 61c13b1aab3263d7bf94ecfde758acbdd986879144adbc436d32e5f5e03d70c8475984458681ab1d73d71bf5169b368c1f21a576ce996e225b6d74b5afd061fe
-EBUILD Data-UUID-1.221.0.ebuild 494 BLAKE2B 97737c0cff4941157300119efe97f3c8a489b4d3e140fee87f0e2dd4955d2613b3a63d253ee8b34df18050e54fbd45356d4ab33d578b1ecad4d16d0fa4b1afa7 SHA512 45344bd98635536552b27c8f5585b00fc3d1250085acd2ec8288c7d5ff3bb789c936f4f8e0509d26591c5821fb370c2807912a87182bb9fbfe065abde050bef6
 EBUILD Data-UUID-1.226.0.ebuild 583 BLAKE2B 964a308541448c8bd7758f83e382c348acf4642477a8bb61dcbfa34a8c931b74893c56e92ab5525a1f12932adf7cdf20882f5edad52a565a67d21575d8f50c77 SHA512 e8d3d236a6a0b0cec620f227626564bae3e74e5ca580a37eb632a09951a83176e7fb51b2644ba2de80e933ce535c7339ac61a930c09cfc8b85176f5ec33b150f
 MISC metadata.xml 391 BLAKE2B ed3449668e32f7185b3067f3a542f60a7ddef71aa558f0f8e35082c697677c3f15f7b970f0576bab70e856f1a3f724ae22b303b3a13adc4a311f68c9169b1a15 SHA512 060f1fa3e28db8ea8c6ba6f9a0ec1a2e49a00e35fe4d38a0e79f8674ee5be700f10f724a341b859ca61945af9e3a129bc46aa8aa4bc14768654b63e5f7f71511
diff --git a/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.150.0.ebuild b/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.150.0.ebuild
new file mode 100644
index 000000000000..762266f5d4fb
--- /dev/null
+++ b/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.150.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=0.15
+
+inherit perl-module
+
+DESCRIPTION="Domain and host name validation"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+
+RDEPEND="
+	virtual/perl-Exporter
+	>=dev-perl/Net-Domain-TLD-1.740.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-1.302.15
+		dev-perl/Test2-Suite
+	)
+"
diff --git a/dev-perl/Data-Validate-Domain/Manifest b/dev-perl/Data-Validate-Domain/Manifest
index 441a0f5abf12..7a5fd96f05f4 100644
--- a/dev-perl/Data-Validate-Domain/Manifest
+++ b/dev-perl/Data-Validate-Domain/Manifest
@@ -1,3 +1,5 @@
 DIST Data-Validate-Domain-0.14.tar.gz 31962 BLAKE2B 63e2415c96b366197d29d938f14c8c7d5ef06fa31a2ed42edcdcf15fc732c1793b52f486edd23d8a5218a26791e5abc7046801c89cb899eca32d7c710f3f931d SHA512 07cc397559bc412c456e3dbe55d792c4a0e93b3bf297565e26cc9c55919b3f643e8aa2c33a2c418de9264c1305448ffc287776eecfe9d125b3dfe369c4a95ed4
+DIST Data-Validate-Domain-0.15.tar.gz 35664 BLAKE2B c2ca1a527c02956daeca323f6b6b4e866b91e45e5dec90e97df66c54242d3d22ae297abc662f947a64b77bbb529d904e864e696a632b1ce31152ffe1bb85ff32 SHA512 76cfae536841e69f3694f2cf88321718ffbafa0376faec6763f295650c67e550c90c640a444616482acf7175337a646f80938255eeb32204f827a891a91d0195
 EBUILD Data-Validate-Domain-0.140.0.ebuild 524 BLAKE2B 3d2c3a39c10e67ac4e5199ce06f047066bc3a4a96dcb6f2c152f8ab900fb586a52f87b9d83385810e2996d442df2a848d97be7556cb1189b51f10c0a690b5916 SHA512 c7d8fafaac979853e62bff55481bc2bb8f4fb1c9f1e42145b7250f91567fdba6202437b38161104519a179d40720ddf054f575dc6afbf9fbb0493a49b0b68266
+EBUILD Data-Validate-Domain-0.150.0.ebuild 489 BLAKE2B 7b0f7b178cbc97b037e6f51ec241bd98e86bc2b57cd38d6ceb9198661d87edde33369ea8dea35169b64e5b9dd0219baf42055257851189abb4f851eeac86bff5 SHA512 5b6b9efae20083b8ecdf67ab28a41198bc3de0f59aa4ab2067a8debf1d7a340021fa65f5dbc2ab1b81bf971f5a1b4bfbabd531638ba0f93a530b37fc2c90e824
 MISC metadata.xml 414 BLAKE2B 588bc3765a01499286c431ba3305122c2e9190be157cc568a47696ca190b33184fdaa0678317e331e1e4c370f382f29dba3b01c9f07179dfc38a5cb646659267 SHA512 c2cac9536a692097c9ad4254b8f8da462db4a507d4317b912824579b7d5021ef5f2a4846f867198129ceab222b812e046d1c8808f93d3baebbfad163c03ea598
diff --git a/dev-perl/Data-Validate-IP/Data-Validate-IP-0.270.0.ebuild b/dev-perl/Data-Validate-IP/Data-Validate-IP-0.270.0.ebuild
deleted file mode 100644
index 8615188b8e55..000000000000
--- a/dev-perl/Data-Validate-IP/Data-Validate-IP-0.270.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DROLSKY
-DIST_VERSION=0.27
-DIST_EXAMPLES=("bench/*")
-
-inherit perl-module
-
-DESCRIPTION="Lightweight IPv4 and IPv6 validation module"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Exporter
-	>=dev-perl/NetAddr-IP-4
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		>=virtual/perl-Test-Simple-0.960.0
-		dev-perl/Test-Requires
-	)
-"
diff --git a/dev-perl/Data-Validate-IP/Manifest b/dev-perl/Data-Validate-IP/Manifest
index 65aeeeaeb8ee..7a5f3098dedf 100644
--- a/dev-perl/Data-Validate-IP/Manifest
+++ b/dev-perl/Data-Validate-IP/Manifest
@@ -1,5 +1,3 @@
-DIST Data-Validate-IP-0.27.tar.gz 38139 BLAKE2B 5fd260fafc3a283bb14bee0b51aad9f829682353e4802cb570fd9f7ecdbfdfaaf2a7bc77ff704dc64c9866c93e054aac4252ed86fff57135c04849b817b06f52 SHA512 5a93f730d53e7adcac4fe5e227b69a44e58cdc94b0081d79978547263095e97c3690c8c6fc6664fc8e4b230ab4c360beda22e6600a3c7abe5e61129ee70553b8
 DIST Data-Validate-IP-0.30.tar.gz 41761 BLAKE2B f80f67fba5086969db4abe7fcc6ac3104135ee37cedb98e12a160b726231e0f8349f373430deece35ab3d5c53046150602767e6d26feb8ea4d72969377deff2c SHA512 ac556445f1eec0440be17263bcffce46d0c3b719d3c64022bcb3fc6d1191ed9de94c0e4d6b2c3c5c1704dc7945b14a5c87abfcf2b7dc43ec4f10a4cc6629b761
-EBUILD Data-Validate-IP-0.270.0.ebuild 618 BLAKE2B 0d01cd5588331ab67fd9d23deb550d2298263b5ffb17e6cd892e54e867884c4a3341a5354dc1348c663308132ad6b50cfafda5f65b84f285c3812f1352996870 SHA512 b2a7c9857f28835ec0b9dfe1f236376110fd2ed7dde2f6c1a94deef9f6eade330e7924a4888f954c9bac25c2e83ba6ecf70759a1869f9b0904c9c63c10e18e58
 EBUILD Data-Validate-IP-0.300.0.ebuild 608 BLAKE2B cd76524a1e48d9b45c339404716feedff6e4ba256de20bac78db1681b427050037deea1290bcb1e42a3c91b8843c63e070f78ecc4c487595b63932c03613701c SHA512 425a968610db12d6742aaa79ab854f076476f03a2d2046e24b7786f6403ed55c2b898067e460d3906455fe5a1353cdd3845ff26ae46a69ddfa3c7ce713df78fb
 MISC metadata.xml 406 BLAKE2B 057b00c84a249629443821c36db515b8bee0d7c46b25e0c8f178be201d795abe77039ca19f60a117be38ec1f0ceeb345c2634bb2c8f31caac9c303bae80436ce SHA512 0a92ba10bbf23796587dcc4b01c471d081c4fd529a4ae1917672807e612eef4ef95cfcee45695043cdbf8c17c976ecf9fa99738b7331def13a8a844f727d40c2
diff --git a/dev-perl/Date-Extract/Date-Extract-0.60.0-r1.ebuild b/dev-perl/Date-Extract/Date-Extract-0.60.0-r1.ebuild
new file mode 100644
index 000000000000..fd110840d8f5
--- /dev/null
+++ b/dev-perl/Date-Extract/Date-Extract-0.60.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ALEXMV
+DIST_VERSION=0.06
+inherit perl-module
+
+DESCRIPTION="Extract probable dates from strings"
+
+SLOT="0"
+KEYWORDS="amd64"
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/Class-Data-Inheritable
+	>=dev-perl/DateTime-Format-Natural-0.600.0
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-parent
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
+	test? (
+		dev-perl/Test-MockTime
+		virtual/perl-Test-Simple
+	)
+"
+
+src_prepare() {
+	sed -i -e 's/use inc::Module::Install;/use lib q[.];\nuse inc::Module::Install;/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}
diff --git a/dev-perl/Date-Extract/Date-Extract-0.60.0.ebuild b/dev-perl/Date-Extract/Date-Extract-0.60.0.ebuild
deleted file mode 100644
index 8bf6f30a00c3..000000000000
--- a/dev-perl/Date-Extract/Date-Extract-0.60.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ALEXMV
-DIST_VERSION=0.06
-inherit perl-module
-
-DESCRIPTION="Extract probable dates from strings"
-
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	dev-perl/Class-Data-Inheritable
-	>=dev-perl/DateTime-Format-Natural-0.600.0
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-parent
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
-	test? (
-		dev-perl/Test-MockTime
-		virtual/perl-Test-Simple
-	)
-"
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install;/use lib q[.];\nuse inc::Module::Install;/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Date-Extract/Manifest b/dev-perl/Date-Extract/Manifest
index d814d21e1901..5e71c58d538d 100644
--- a/dev-perl/Date-Extract/Manifest
+++ b/dev-perl/Date-Extract/Manifest
@@ -1,3 +1,3 @@
 DIST Date-Extract-0.06.tar.gz 32730 BLAKE2B 9559e7c9af77bf26f6c649e90516500e5a5551eeacb4c4fc733b228ec56047f932ad98ac5335de7d3488be869164e039b6c4776f4f7de07663cfb47583fa026d SHA512 f50bb1e968eab9a5ee5bd1383af1599aabc7af9f9c375e3d366857f1cbf6a6912e8eff99eece2096b09a475c9eb671eeaeb8e4b76c0d865cb452ce8b0a85c448
-EBUILD Date-Extract-0.60.0.ebuild 771 BLAKE2B a27138f9605961d4d48f0cf2ac35767742dcaa8ee23cb501c45960acc3c8ed3dfb4e3879b78f86e792bffa02e2141211068a8cd15d6d8735257af0738f615b13 SHA512 8f0a6770906877af69ebc00a7b2a799ce431c46a9bb4f8c6be8198519919211ca05e40b69bce7448942bf131589330b5c974768cb31a29953dda49bf2a10c28f
+EBUILD Date-Extract-0.60.0-r1.ebuild 733 BLAKE2B 6ee2a8a4db482d883cfc735ad82937afcaaafb872ce7b9f7d3f2d49fcd309f244350f642db61650b4a2f5fa67f5e7cf0ee7aa4c4283b6ef97615f05025baab89 SHA512 4471ba1640e3dbd36d23e6fa703f46685bfa4e59bc092941cd8ab7765747078cbe3d1cf4a8d6bbccb053ff6ed70be118fcff4285c8ff4b79e960a44ccc2a8719
 MISC metadata.xml 553 BLAKE2B bd0b1fd53dd810fa3fa6d56bbd3a10d2c4662c234e69624e83182d9acdcf60a5ef465d163dadfbc9e1a17f5862fa3631f8f7cf263fdbbc5f371cbc0d013fc556 SHA512 f7ee31a11ca48ae5ba99bc00fcad15b3d27e86b3ebf2486f5a0d8c02e5d5483e7f8401bfb55cfc6ed4aa97292c0f6adfd9dcb1b35150c7372f2a184ef0a1caab
diff --git a/dev-perl/DateTime-Calendar-Julian/DateTime-Calendar-Julian-0.102.0.ebuild b/dev-perl/DateTime-Calendar-Julian/DateTime-Calendar-Julian-0.102.0.ebuild
deleted file mode 100644
index 370419c4ecc8..000000000000
--- a/dev-perl/DateTime-Calendar-Julian/DateTime-Calendar-Julian-0.102.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=WYANT
-DIST_VERSION=0.102
-inherit perl-module
-
-DESCRIPTION="Dates in the Julian calendar"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/DateTime-0.80.0
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.880.0
-	)
-"
diff --git a/dev-perl/DateTime-Calendar-Julian/DateTime-Calendar-Julian-0.106.0.ebuild b/dev-perl/DateTime-Calendar-Julian/DateTime-Calendar-Julian-0.106.0.ebuild
new file mode 100644
index 000000000000..06da88e298c6
--- /dev/null
+++ b/dev-perl/DateTime-Calendar-Julian/DateTime-Calendar-Julian-0.106.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=WYANT
+DIST_VERSION=0.106
+inherit perl-module
+
+DESCRIPTION="Dates in the Julian calendar"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+RDEPEND="
+	>=dev-perl/DateTime-0.80.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
diff --git a/dev-perl/DateTime-Calendar-Julian/Manifest b/dev-perl/DateTime-Calendar-Julian/Manifest
index c766ca8c7e3c..e4412d778c67 100644
--- a/dev-perl/DateTime-Calendar-Julian/Manifest
+++ b/dev-perl/DateTime-Calendar-Julian/Manifest
@@ -1,5 +1,5 @@
-DIST DateTime-Calendar-Julian-0.102.tar.gz 17643 BLAKE2B b667ae7e9bbc3cfad3bcc721cad78de7525c72483c1b20100c583b57d35a35fca9a9accbcb55e78d383cda599b4d49f881fdf3758257464fa84a5ff276c5a2e2 SHA512 7adb5ab1c6115e9ba62f46a3a925cfd246e4c12ed1688a4fe03930ea3ebf3662886066bc45b25bf9b25095490a47e2d047763fbbdc6454f00a9de67b08fa03cf
 DIST DateTime-Calendar-Julian-0.104.tar.gz 18172 BLAKE2B c4d09c74b9355005ccad71584457f5c3bb586e62a1a7207e39a1ad2fa12107ef16b580aaaa7e782650a97905c47475c74ca15564686858aaf18d5c47b509c67f SHA512 5fa8dd0c2a8e7a3477bee723c3d6870a4c8ba361231b474afabfbb5118cc1d2d55e60035606b789a4700aaa9a35a9a836d0eb2a9bd935eeb23ff93db472e3599
-EBUILD DateTime-Calendar-Julian-0.102.0.ebuild 446 BLAKE2B 6f651b287fb1a0bb0b7ad4a586b93d61a321852a92b31ab79be6d0e892b9841b844a13ac1671f884db7ec12893c47e28deb88e3a7aff350e259328d2d9ec8892 SHA512 535c1bc34dac1f4f2f6842e40dde94b874bccb69ebef2aac28fceaaa349702ff36883f137ec51ffc959e5d7b2fafb207dd3b0bbd882fa4d99c52591645720f3d
+DIST DateTime-Calendar-Julian-0.106.tar.gz 18681 BLAKE2B 0b6901f2e878e5b5679b6caa0baa665463cd4339b5fae792402d1461be743081e28ca4d6810bb69b3801421e106e29b530292b30e2f49d7a1df5b7a5f00d9ba3 SHA512 180955341937d6d809df70006e9ca45ec1c4fc0e3db79d32cd40cb934a7cbe022b893ba4dc2f914d5f502e355214e9ead44ec1846db9b18d649b9222aacce800
 EBUILD DateTime-Calendar-Julian-0.104.0.ebuild 446 BLAKE2B 66700daca32c61724ef96f7cbd74139d36aaca71a4fc35c932c809945f2c47e8d142adfb3866406d6d00f63ffdcb7485213cbb8df363602387ae779fb3c9651c SHA512 f2cb37e35d401c11c1f2f52cca4b6eeb653cab3ecad23f544c8a80989bcbbd14d199b0cbb643e16f5e008250b7541896ee16fd2ebf81788281ae4143a3194cf1
+EBUILD DateTime-Calendar-Julian-0.106.0.ebuild 408 BLAKE2B e23e5ed9c0c3de21cc9afd99fcf27bdb25bde25b21e8c5e9a857c5f4dac72de33be2ba783411f248b6b6a86ab9478e0ccc4575bcdca7b57f8f9d115624be79dc SHA512 21d43eac121d805a045e45d1aca2b8916fd70c9d744a2ef2815b883b66abb26d242961d167646dfe7f4accee4b2917abcc2b4056db5235dfccbfb9a55629aa55
 MISC metadata.xml 422 BLAKE2B 150c590751385d5339fdb802558e6b34a12f06592ccd82b1b9577b8cec9c1aa56fe8ded113fce82d4463c458b63f06643169287d73609ae3ae5c9ba9b4d21a42 SHA512 d671790ccc40e826ac61424a3a6d047faa54b5999c34a266a3d5ac28c64c00a7e65508786da3f12b93894d43c8bde348bd72f303c53e4ff81aa8c8c82706bc2b
diff --git a/dev-perl/DateTime-Event-ICal/DateTime-Event-ICal-0.130.0-r1.ebuild b/dev-perl/DateTime-Event-ICal/DateTime-Event-ICal-0.130.0-r1.ebuild
new file mode 100644
index 000000000000..f216685b5353
--- /dev/null
+++ b/dev-perl/DateTime-Event-ICal/DateTime-Event-ICal-0.130.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=FGLOCK
+DIST_VERSION=0.13
+inherit perl-module
+
+DESCRIPTION="Perl DateTime extension for computing rfc2445 recurrences"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/DateTime
+	>=dev-perl/DateTime-Event-Recurrence-0.110.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/DateTime-Event-ICal/DateTime-Event-ICal-0.130.0.ebuild b/dev-perl/DateTime-Event-ICal/DateTime-Event-ICal-0.130.0.ebuild
deleted file mode 100644
index 90de83747505..000000000000
--- a/dev-perl/DateTime-Event-ICal/DateTime-Event-ICal-0.130.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=FGLOCK
-DIST_VERSION=0.13
-inherit perl-module
-
-DESCRIPTION="Perl DateTime extension for computing rfc2445 recurrences"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-perl/DateTime
-	>=dev-perl/DateTime-Event-Recurrence-0.110.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/DateTime-Event-ICal/Manifest b/dev-perl/DateTime-Event-ICal/Manifest
index 7749b07d1f08..e37e63324960 100644
--- a/dev-perl/DateTime-Event-ICal/Manifest
+++ b/dev-perl/DateTime-Event-ICal/Manifest
@@ -1,3 +1,3 @@
 DIST DateTime-Event-ICal-0.13.tar.gz 25910 BLAKE2B 8ce18df7ade6600fc08c962214bb65bf8c265f2a4cdf7516ed9692f5b0848de8fe69d726242d90dc2bf1b22c151460d1eadc3f5727b9f5d8b328d3a8e539c0e1 SHA512 0b0c21a8e1906c4a6aad2663f8a5f7cb1198a7230998ede3082032aaabf343ee23a5894ca6370c4f5f73a6f342f2e0f72c0d17df645e1715de1c6e900bca42fa
-EBUILD DateTime-Event-ICal-0.130.0.ebuild 419 BLAKE2B ab735f1d5f87599315bf368351a871a3b3543921558c0a38a3a28131c7aed203b836274b255f79fe54b9f60364dfe5ff26358babb507880904f951e10f0c9788 SHA512 04ee35ffb2f8c6e99a5c2be2eca265ddeff34998f37263252a599bf722fcc5c7d9825cf7bd4334f3c278b399223ced12b025aa8053e2a54632671e7f19c25280
+EBUILD DateTime-Event-ICal-0.130.0-r1.ebuild 409 BLAKE2B ef084b8d69c9cbb8ddd4c8cc4b3c76a41aa1b58a7f28fa886e2f750f5579486c9273dc06afaf3c64bb024156bc982e11ba45bfc7a68b477c25399878225aa3cb SHA512 f36b21c08a459edcc45bcce16e4b3e0c4ec672ef416290e2e179dbea16053751b51e0afa74c0d78ed74525dba406ceb24a60f6ed06836ec8a55e2149befc62b3
 MISC metadata.xml 412 BLAKE2B ca6a0becab1fc455939ab9f9fd34161bd64a4b33a88016c21c59b0b148836ebb471cbd75e3f45a97783cf7f7497c9b0bd4f0b6b78950db6fb250a34aba7ca90b SHA512 6e617462aefda264f5bf2b621d1cbd65decde6c152ac57414f9d986c10f6e5ec7c7278ef99f6fd2dd0447bbba16fd20ed032b4b43a9d32c73499a4b6cae79f21
diff --git a/dev-perl/DateTime-Event-Recurrence/DateTime-Event-Recurrence-0.190.0-r1.ebuild b/dev-perl/DateTime-Event-Recurrence/DateTime-Event-Recurrence-0.190.0-r1.ebuild
new file mode 100644
index 000000000000..e1ed7dcb5247
--- /dev/null
+++ b/dev-perl/DateTime-Event-Recurrence/DateTime-Event-Recurrence-0.190.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=FGLOCK
+DIST_VERSION=0.19
+inherit perl-module
+
+DESCRIPTION="DateTime::Set extension for create basic recurrence sets"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=dev-perl/DateTime-0.270.0
+	>=dev-perl/DateTime-Set-0.360.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/DateTime-Event-Recurrence/DateTime-Event-Recurrence-0.190.0.ebuild b/dev-perl/DateTime-Event-Recurrence/DateTime-Event-Recurrence-0.190.0.ebuild
deleted file mode 100644
index 72182c01e58b..000000000000
--- a/dev-perl/DateTime-Event-Recurrence/DateTime-Event-Recurrence-0.190.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=FGLOCK
-DIST_VERSION=0.19
-inherit perl-module
-
-DESCRIPTION="DateTime::Set extension for create basic recurrence sets"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/DateTime-0.270.0
-	>=dev-perl/DateTime-Set-0.360.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/DateTime-Event-Recurrence/Manifest b/dev-perl/DateTime-Event-Recurrence/Manifest
index 98e11c03775f..ee169012f284 100644
--- a/dev-perl/DateTime-Event-Recurrence/Manifest
+++ b/dev-perl/DateTime-Event-Recurrence/Manifest
@@ -1,3 +1,3 @@
 DIST DateTime-Event-Recurrence-0.19.tar.gz 25240 BLAKE2B 72c90cf069cc5728d9553cae06f8cb5f016bfdea059cee70a5e5edd9710011175820485a5f6b1f3fdcf2bc2f2400f8eaa5db0f8377d021b3f254d25f97f72e69 SHA512 a431b69dcdab75deb09efad2e558c429b7456807d0151dca1ae602a1b7dd3f22bd9e6bae510ef039a2cb6f18f31ba92688c00586588aad60528cb461d9d4c9d5
-EBUILD DateTime-Event-Recurrence-0.190.0.ebuild 410 BLAKE2B d8fdcdd14f9bfe33577954e6a155c79d616acdef20f3252ca909f67811a38c9d108c5d04035bf1e616cb4d5de39eddcc0f4bd99e53c57476f5f0cbf6908670ba SHA512 620a9f034f04aac8292d64a3d47149037b82df9eb4fb5465dea6da72e354255305cea97c88dd9d7f71e5892a3da310920e4feadfb575a6c97930194be657bfe1
+EBUILD DateTime-Event-Recurrence-0.190.0-r1.ebuild 403 BLAKE2B ecb166ba33923cb8eec5fe0d7662f3cbb097ce117a0b615db1800b155235ed15666e95a1a2048344869b60565a1fb1f58573cc534bcc58e062d6b42119727cf5 SHA512 fb09340961e62f05bbb4b4733e0bbab993351568addaf95e4eda92d9bcc13355521d2e28b877e1d20bbd29b72a058f837b9e9688e2fa9ad6f0c60928ddd55d42
 MISC metadata.xml 490 BLAKE2B 810a556d80b519dc3bc4e198dbb9a50b6b38f278f93b88c333e79e8aac78e36a870846b57114401557d26f48ec0b65934dad54a707c8751e8553bca3c296d0e5 SHA512 71efe5f49b805899e98aa8ec72860c870f87f13b0be21e8e5c48b80ce21323c8f6e6ffc096d19e0e7414485423e242e1c366f8ada93977449f5af820f42d1892
diff --git a/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0-r1.ebuild b/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0-r1.ebuild
deleted file mode 100644
index fa9ec38dc1dd..000000000000
--- a/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=0.81
-inherit perl-module
-
-DESCRIPTION="Create DateTime parser classes and objects"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-perl/DateTime
-	dev-perl/Class-Factory-Util
-	>=dev-perl/Params-Validate-0.91
-	>=dev-perl/DateTime-Format-Strptime-1.0800"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-"
-
-SRC_TEST=do
-
-src_test() {
-	perl_rm_files t/release-pod-syntax.t t/release-eol.t t/release-pod-linkcheck.t \
-		t/release-cpan-changes.t t/release-no-tabs.t t/990pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.830.0.ebuild b/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.830.0.ebuild
index 42affa3d2477..5cd4693b1b35 100644
--- a/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.830.0.ebuild
+++ b/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.830.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Create DateTime parser classes and objects"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-solaris"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Format-Builder/Manifest b/dev-perl/DateTime-Format-Builder/Manifest
index bf2d1ade0770..b42ca151806a 100644
--- a/dev-perl/DateTime-Format-Builder/Manifest
+++ b/dev-perl/DateTime-Format-Builder/Manifest
@@ -1,5 +1,3 @@
-DIST DateTime-Format-Builder-0.81.tar.gz 39933 BLAKE2B a9e692f584e02bf09609c5a666064de2dcef368a86518b77266bf9176a748f0b009687fb07831196e93adeedcf75123539519e1664a7caaa3e05bb5d46431b27 SHA512 617cf72e900d9bb17fd5c3cfbfa1874bf1c34de144514ea4cabd7b66eb682696b9c9501e66db1073da59c5e8278e6878b893876a1a7f11a9c011dbae44ebdd57
 DIST DateTime-Format-Builder-0.83.tar.gz 63355 BLAKE2B 795a7cab7e837b45d4d509c06f99b7192e85f17dbf57988fa8bf07b0ed5af602135baa9c6b131ce81800ff1144ed3ffbc246119364d162fcfa30bf2956d23c07 SHA512 eb0601dce7bc9adb0b4b6df2058b5f126e36738a9fc1e18c6e09ecf2787fbe7cd9b8ae9a5772590d6fa0df271b5a7fde0f3ab6f2be68e182adaac48ca3ae3837
-EBUILD DateTime-Format-Builder-0.810.0-r1.ebuild 724 BLAKE2B 7affc197093f36a7cda9e41ebcec3db491c17e0abd191eb5a036580cfd8594fceedd792240fc872b87fed8b0aeca05ced52501cb8f74610158dd9df84b7be72d SHA512 dc8426602e9395c13c180dd62852994cf19649273f87e8c9018757ed52798ec24fb109d6ef5be5cc36d3adbc33f600a35437a4b131338a0fac250f5c7f997fe5
-EBUILD DateTime-Format-Builder-0.830.0.ebuild 819 BLAKE2B 26dcfab90d7cd41f1eadbe06eb64dc7cbc1b7cdc086ff2b8c008d1d7d2b913f854181c2a3cda2b419840cd7a0f69eedbe61fe5b12de76509096981e8ce94fa0f SHA512 4adc4b5f9ff65287b35f67d0c802eea200c2be3bd44bb7e0613010be41992573373208bc95998f06e23cf327e98a240d83f00dbb14d8c2d5290a87bd73b8655d
+EBUILD DateTime-Format-Builder-0.830.0.ebuild 818 BLAKE2B 8521280e7b7c4c6010a437aeda6ee677eaf3ebf8033239eeb7ab94bef62b269c865b4516502a6e4b5b43f0c00867e30a39eb43ede0e6ac377ad43a36010a397b SHA512 af8b897d913ea1df363c571fa6d2a6882eaea17e0b33d18a2d95da372621e923946f32150fa0bb90fc72a34e1a2f302e7818f1c990c313845e23e4d1f01fe250
 MISC metadata.xml 943 BLAKE2B 153a33a817b0893545de2d041cdf0502532ad510a61c565c2610f5e7ada66ddbb45ae9384c480df6cf186e8033d830ca4bfd8eed019935a34043cd48b76eefbc SHA512 cdaf3d0767b850be5e8c2f71accaaa16c21b4714aae3bbfb85d6f03fa32abb6222ec8252c900693be85b6a50f745c9129083a48531f1a8991689eeb7f19e6c64
diff --git a/dev-perl/DateTime-Format-Flexible/DateTime-Format-Flexible-0.340.0.ebuild b/dev-perl/DateTime-Format-Flexible/DateTime-Format-Flexible-0.340.0.ebuild
new file mode 100644
index 000000000000..9f0ef2c25864
--- /dev/null
+++ b/dev-perl/DateTime-Format-Flexible/DateTime-Format-Flexible-0.340.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=THINC
+DIST_VERSION=0.34
+DIST_EXAMPLES=( "example/*" )
+inherit perl-module
+
+DESCRIPTION="Flexibly parse strings and turn them into DateTime objects"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/DateTime
+	>=dev-perl/DateTime-Format-Builder-0.740.0
+	dev-perl/DateTime-TimeZone
+	dev-perl/List-MoreUtils
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Exception
+		dev-perl/Test-MockTime
+		dev-perl/Test-NoWarnings
+		>=virtual/perl-Test-Simple-0.440.0
+	)
+"
+
+PERL_RM_FILES=(
+	t/002_pod.t
+	t/003_podcoverage.t
+)
diff --git a/dev-perl/DateTime-Format-Flexible/Manifest b/dev-perl/DateTime-Format-Flexible/Manifest
index afb788d53e7b..e22a377d0a65 100644
--- a/dev-perl/DateTime-Format-Flexible/Manifest
+++ b/dev-perl/DateTime-Format-Flexible/Manifest
@@ -1,3 +1,5 @@
 DIST DateTime-Format-Flexible-0.32.tar.gz 76438 BLAKE2B b7a0f5abdba67e70979c510f13849697a9107eb275d5702ce6eafaa5abed140ee4072778642157f827823badd0f425e861927d5956a4818f6d0ce31c821c28fc SHA512 90e0e83cecff5daab132860c2da2d77c92c0791fe8d0d6aa9275c1e0d603b644a8531848d8fb4bad8e1800c02a4e571ceda1a4bf4b8ee9bd7ac0215898db2882
+DIST DateTime-Format-Flexible-0.34.tar.gz 76347 BLAKE2B e1b2b5506be26ba274a80889c17bd7f5f3073d10e01948c9c3b591476dfd19d048c7d25269802bc071b1c9df1dc1752ab3febe524ca22b997ccbec7674fd0b0b SHA512 2b2d730aaa9c8f6152f57493b8a0b2f9600b06dcdf2776bd1cb3fbf26c3b5ab31351a32fccb5072ed7410b558354fb3f9e3e8fa5af99da846fc623ae25e1f763
 EBUILD DateTime-Format-Flexible-0.320.0.ebuild 735 BLAKE2B a7fba885b17272b5074f1dd759f3eef48b5c545dd0b7b3c22aec4130435d48b1a9ea4750881f005f56367ea945b1ca6bd0634831a73f22cd4bbd9530806be996 SHA512 2d0a7c3ae871bec50d813b5be7b396bce400cff7d18a9b5d2e1e1845a973d0ff240531485a46cc6eece1ae7d61e8609fb7d3f3a26526de8ba9b4111927e1c738
+EBUILD DateTime-Format-Flexible-0.340.0.ebuild 670 BLAKE2B cbede718d6c8012eac7f48a04ff9e3f767df26d76aef4e835f72a7cd80f2f366d6581d27bf0f1695c8a0ae007c92622956ec4808c848e9530ead821aea22b294 SHA512 73dc6f57d306d36609d1bb0c29fcc96b79eff85a88d8c2ea89b797c537317731b4c2562434c587d4145b08ea59f91a81651b099d47dcdab8317e027a78cf9990
 MISC metadata.xml 750 BLAKE2B 74bf2a66a333bc5ee146b3b2b557c1e7ef83b6acbc5413702c84ac6c0e2e78431fb350dac52280c4a56cd39b0fbf44a6be60776500f7753726edea77a86d014d SHA512 86f9cf8ad67d26cbca3da25ce4e12faed3d2d86dffd9f6331350a638a35e82e4eda4de3dfe23626729d863cac856cf068c4130771e8e52de835c8496d616cf92
diff --git a/dev-perl/DateTime-Format-Human-Duration/DateTime-Format-Human-Duration-0.640.0-r1.ebuild b/dev-perl/DateTime-Format-Human-Duration/DateTime-Format-Human-Duration-0.640.0-r1.ebuild
new file mode 100644
index 000000000000..56bd85fd09ff
--- /dev/null
+++ b/dev-perl/DateTime-Format-Human-Duration/DateTime-Format-Human-Duration-0.640.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=MSTRAT
+DIST_VERSION=0.64
+inherit perl-module
+
+DESCRIPTION="Get a locale specific string describing the span of a given duration"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=""
+BDEPEND="dev-perl/Module-Build
+	${RDEPEND}
+"
+
+DIST_TEST="do"
diff --git a/dev-perl/DateTime-Format-Human-Duration/DateTime-Format-Human-Duration-0.640.0.ebuild b/dev-perl/DateTime-Format-Human-Duration/DateTime-Format-Human-Duration-0.640.0.ebuild
deleted file mode 100644
index 84bcabe347fc..000000000000
--- a/dev-perl/DateTime-Format-Human-Duration/DateTime-Format-Human-Duration-0.640.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MSTRAT
-DIST_VERSION=0.64
-inherit perl-module
-
-DESCRIPTION="Get a locale specific string describing the span of a given duration"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-perl/Module-Build
-	${RDEPEND}"
-
-DIST_TEST="do"
diff --git a/dev-perl/DateTime-Format-Human-Duration/Manifest b/dev-perl/DateTime-Format-Human-Duration/Manifest
index 679a9f468a9b..883e7f018f57 100644
--- a/dev-perl/DateTime-Format-Human-Duration/Manifest
+++ b/dev-perl/DateTime-Format-Human-Duration/Manifest
@@ -1,3 +1,3 @@
 DIST DateTime-Format-Human-Duration-0.64.tar.gz 17683 BLAKE2B 4681255fb5609307f87009e60d4309237fe9aa5e5994f4b1d716373396aeec5327db1414184d68cc10faafb80884be973b55d5e2140db2b746c588e95bc8d357 SHA512 2ae94d56e1176adcdb55b2f1291a04e15c50c0116477be18b49f9b95bd3ac0778c0bc280df323df213e3fcd8be25f8d91227be1841ce68b4cfa86be479d34376
-EBUILD DateTime-Format-Human-Duration-0.640.0.ebuild 369 BLAKE2B ab5e98878c691f814c12aac51fe25264810402fe36804c436da4819eab26de66bd94c544f99c1597f433efa26bcdfcd1495013b079a013f3a0f0ad51fc4660d0 SHA512 dc6eaaf28cfb39588f2db3e0e48e4adae4440d3fcd6d00dc115ff7a63606c3451754d9ba318e030b87d16988a70672e7f03c770336841ebe71c49e2baf845187
+EBUILD DateTime-Format-Human-Duration-0.640.0-r1.ebuild 360 BLAKE2B 3585529ac6a931857f95175ea99026bfb46ef48771331ef3da4369963c194ad0ad443552e5fc7a9e418f760b2f5720cd491dd2af0525ddcdef9d58d2854f9da2 SHA512 03eebd5fc3730c0f5355a40f7dc95923ec01d615bc8f74cec5cb39818b793f8f41c2ac4aec3b682b2fc0b2cd5dc7a56d846508475fff908f66572578702e14de
 MISC metadata.xml 1327 BLAKE2B 5582cbd3057ef05976836928cbab8e7e15180296b7f0a861ea048c6f480e1c124bd737f2c42485a7cd6d014f2bd6b70ce55afe5cbcadf9b864d8142f7cbab3bf SHA512 a0cd15c7268e88e058e03790ed167a31d3e1604d413a9f35950dfbf1e5652639a1d4765fe137cc564629c6f8f230e10c537d219bd725e7470723af68a67fed66
diff --git a/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.140.0.ebuild b/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.140.0.ebuild
deleted file mode 100644
index 872a405a5e70..000000000000
--- a/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.140.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=DROLSKY
-DIST_VERSION=0.14
-inherit perl-module
-
-DESCRIPTION="Parses ISO8601 formats"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=dev-perl/DateTime-1.450.0
-	>=dev-perl/DateTime-Format-Builder-0.770.0
-	>=dev-perl/Params-ValidationCompiler-0.260.0
-	>=dev-perl/Specio-0.180.0
-	dev-perl/namespace-autoclean
-	virtual/perl-parent
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-CPAN-Meta-2.120.900
-		virtual/perl-File-Spec
-		>=virtual/perl-Test-Simple-1.302.15
-		>=dev-perl/Test2-Suite-0.0.72
-	)
-"
diff --git a/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.160.0.ebuild b/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.160.0.ebuild
index 1b0d65d46b9c..dd2c7dda1f76 100644
--- a/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.160.0.ebuild
+++ b/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.160.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parses ISO8601 formats"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.80.0-r1.ebuild b/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.80.0-r1.ebuild
deleted file mode 100644
index 3bb525f0d80a..000000000000
--- a/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.80.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=JHOBLITT
-MODULE_VERSION=0.08
-inherit perl-module
-
-DESCRIPTION="Parses ISO8601 formats"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-perl/DateTime
-	dev-perl/DateTime-Format-Builder"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		dev-perl/File-Find-Rule
-	)"
-
-SRC_TEST=do
-
-src_test() {
-	perl_rm_files t/00_distribution.t t/99_pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/DateTime-Format-ISO8601/Manifest b/dev-perl/DateTime-Format-ISO8601/Manifest
index c78a2912a185..57d816023d5c 100644
--- a/dev-perl/DateTime-Format-ISO8601/Manifest
+++ b/dev-perl/DateTime-Format-ISO8601/Manifest
@@ -1,7 +1,3 @@
-DIST DateTime-Format-ISO8601-0.08.tar.gz 21119 BLAKE2B 7967639c2d7ca169f8bf148a9473f8f7a7866bd127ca095f506090ee49a1bd198892dcd396c8f45c594d7f7df42a4714907541df8fa4b88023dff0b3039f72f6 SHA512 88b9c538bf7566cf9857266505e47ea58b72b0cf447bde0b5ca79e9c19ea66118bdb62d4039284e1ab901a0016044613307de654a642761d91989bfb50735979
-DIST DateTime-Format-ISO8601-0.14.tar.gz 44616 BLAKE2B eb5746a5cabea4194d90ed912186d0c59c7c7c665cedd46aa8a0a700d7a23043d29a2f57f888ac5fbbd0b85033a3e73eacd4a241c7d7d965bb5d8d4f3b2303dc SHA512 a5575df8ed275588eebe383c969d9f7f9182b49415da930cd5c6a30197248006ec53fc80d3d8ecdc6c097e16294b8252af77863dd388ef0d3617ee5657937d7f
 DIST DateTime-Format-ISO8601-0.16.tar.gz 46364 BLAKE2B 616eaaa54dde777987e03b705093a7d0967b79bc9c4df6694936272b50460dba43df08b8f0ed74987ef0ab7e709a7fd094a7088d6aa858c2f8182596bde80b03 SHA512 3a8985d06f3953308cb9ebb8f322b5cbf6c3dfba99a71a4e2005ba5b23d9b2f2d3967f76e2d09991b75833dc70a4aa352829648b601e79054da79304904a07e4
-EBUILD DateTime-Format-ISO8601-0.140.0.ebuild 775 BLAKE2B 87e5cfd5dcfe36d043b9fad314f67c23451513de5d2fd2a9159a9c0a5a97b784474a8a2d22e202a67718522a4c0dad1c14f3de6890ebca227960c43972786031 SHA512 eb42ee80f4dce12729a434a3dc67b3649bf0f948e6e24ea14c500179ab3caffc694ef8098cca33ba010971a9f3dbc26ffbeefab4762dcf0e4e95133489d0f85e
-EBUILD DateTime-Format-ISO8601-0.160.0.ebuild 775 BLAKE2B 797eb069526cd181f9d9d10a4f177661ef6a3fc6810a2855727de35b09c6034f87507f977f41ba5b27585ff1dcab2c3c0dc2432d52cd41eb4ed05c34a181d92f SHA512 f419c23552cd4e3bacb69f37d625af149d14426fee5a873c177491e737a7b5b38a70a856b2ef9bf0c8792a62c00d659fc30aff16f12c57dea2694fc6c75fac05
-EBUILD DateTime-Format-ISO8601-0.80.0-r1.ebuild 594 BLAKE2B 5481af8a86facda1e00ea515cb3a5bf0cf2c297e2e539f64038cf3b08db7673d4b7ac6fb6894f8cde01124a142b4541fe447470cb65f54127f7ff0d4d195f92e SHA512 f970693993208f95c3cb2fc1d94000dd113764826040c357ad9525573ad4116dc402c6d2f5f9d67265212adcc4241c28179c949635a4ce623f5f43836e1094c9
+EBUILD DateTime-Format-ISO8601-0.160.0.ebuild 774 BLAKE2B 1065467a370c8ef0ffb8498faa21390316b0c4deee587e3fe6a24335aae270ed7aaefc49ce28ebdf874ca940f26151429c83d7a1bb98f01df012cdb965d21027 SHA512 56ee104584eaa8c12e5b7c15135932fb7d7171dddd8e7a7eb2be5be1d11eecdccc5ab64ebdc1d0a7fc2a50a578ab78a0d2d4c9dd0737971e491204be4605a703
 MISC metadata.xml 499 BLAKE2B 4e626dd59cf1854c4b7f833efc1567849581ebc53d6e2054997832b4c609b8d0764d5eb458f2b290c56573aba2678256a45c476d276cbc409a89b865a52fbfa9 SHA512 02ab75d1adf13e332e6388e03887aa094f562d204e76cbb883e4dd399d69ecd98359e0d034f3d0a3366c56c9503f3cef5f51141c87bd23caa29b483681a39f8b
diff --git a/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0-r1.ebuild b/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0-r1.ebuild
new file mode 100644
index 000000000000..d6d9a2431050
--- /dev/null
+++ b/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=BOOK
+DIST_VERSION=0.403
+inherit perl-module
+
+DESCRIPTION="Convert between DateTime and RFC2822/822 formats"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/DateTime-1.40.0
+	dev-perl/Params-Validate
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-Test-Simple
+	)
+"
+
+src_test() {
+	perl_rm_files t/author-*.t t/release-*.t
+	perl-module_src_test
+}
diff --git a/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0.ebuild b/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0.ebuild
deleted file mode 100644
index e2bf6588fcc8..000000000000
--- a/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.403.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=BOOK
-DIST_VERSION=0.403
-inherit perl-module
-
-DESCRIPTION="Convert between DateTime and RFC2822/822 formats"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=dev-perl/DateTime-1.40.0
-	dev-perl/Params-Validate
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-Test-Simple
-	)
-"
-
-src_test() {
-	perl_rm_files t/author-*.t t/release-*.t
-	perl-module_src_test
-}
diff --git a/dev-perl/DateTime-Format-Mail/Manifest b/dev-perl/DateTime-Format-Mail/Manifest
index e1c343374612..d487bc7504d5 100644
--- a/dev-perl/DateTime-Format-Mail/Manifest
+++ b/dev-perl/DateTime-Format-Mail/Manifest
@@ -1,3 +1,3 @@
 DIST DateTime-Format-Mail-0.403.tar.gz 178292 BLAKE2B 931547f40cab8d135167260783c5622a748f90c4d0b3b002496ec2ca26390adc30b5e8fe1b95a9fdd81fcc65a9fa1166413e2a79d390a652b1f74b4447329b2a SHA512 b5e6f0ffdda3c52aa64b65414f399dcc06f72004c5421f8f0dbf1f9d4cda6e0deb1c3873df62531dc265a44ac66fd110dfc1d4273c97a48b0c472a67b03fd56f
-EBUILD DateTime-Format-Mail-0.403.0.ebuild 692 BLAKE2B 6bc3cc30054a6e6b9939dd83f8d15f2e3657328f0215a11fe5066a4c2621dbbb8e1ead9b619586c0e96b303704e939db4442c07e15962c80f1c31ae303fdb9fa SHA512 5c54cc42fee6265b2186735fece55fe58005a928a806c3ccf746f0a86e208571492273096a051eae4a777b6b6d3bf5f4be8785e07bb6385435fe461065bc1faf
+EBUILD DateTime-Format-Mail-0.403.0-r1.ebuild 654 BLAKE2B 081764d008e0cc0cee28b60db96299e417042fb0234f595b67c0e6c342400cf683784b18dc17d732fea907283acaec2d7ee192dc42d01a7d746cc0083b6e552e SHA512 e25418340535cb154ce74a22e3a2b408f72ea4227f1c9e99bdcad0d377d6f7cc1f766ab0f91dbc281d479dee79e107a64933a5ddef9ccd0f1c173ea2278c3458
 MISC metadata.xml 414 BLAKE2B 3a5f9670c55cb2e74cd2838d6d72f21ec9e15a0a2a9c7ed9263c94ead513f2dafd1163158e44522ad4b9e9a6cf73280073d4a73d7e56106e9330495be7aac6e9 SHA512 d1bee49ab2e557f0ffef5864dab58e753c11b710376870c065a1fd4d7466324dea493d35670a73456a3dc692a551a06477e786b82b591c263a4cc02fc3ad3dde
diff --git a/dev-perl/DateTime-Format-SQLite/DateTime-Format-SQLite-0.110.0-r1.ebuild b/dev-perl/DateTime-Format-SQLite/DateTime-Format-SQLite-0.110.0-r1.ebuild
index 27066ecf5691..62b72a0b6a63 100644
--- a/dev-perl/DateTime-Format-SQLite/DateTime-Format-SQLite-0.110.0-r1.ebuild
+++ b/dev-perl/DateTime-Format-SQLite/DateTime-Format-SQLite-0.110.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse and format SQLite dates and times"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~ppc x86 ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Format-SQLite/Manifest b/dev-perl/DateTime-Format-SQLite/Manifest
index 7c57c5ee9974..0fb21c68837d 100644
--- a/dev-perl/DateTime-Format-SQLite/Manifest
+++ b/dev-perl/DateTime-Format-SQLite/Manifest
@@ -1,3 +1,3 @@
 DIST DateTime-Format-SQLite-0.11.tar.gz 13089 BLAKE2B 6922db57ae3a067dd142815dddcfce968c21fd03a4e21cc1db8ae8c484f745d2a673ad67912e643711ce90aa01debe274761e56d41655a4186db22c6bc8ac731 SHA512 061f831c2a8d653706d315c1cff24ad887e3f8c65afdbd2140066735649c097be921f217e6e2761f8f34604066c618f296d40e9c650c3a1bb085cadbdfa7b7b9
-EBUILD DateTime-Format-SQLite-0.110.0-r1.ebuild 544 BLAKE2B 62b0f5e1440921e7f5366083c893201bea13e81643befa89463845b8b0faa9c36c90d8de20590190bb84ede20b342077d165f54b02eaeea0ea1dbbc183fe42ae SHA512 4fb73c17334932c79d16366d8b799acdef505d0ef5e8543da849cd2ab6176ceed0b2b36fc1ab5f10e98a890199cf9dd8f8be28e9676036ff75452962add09658
+EBUILD DateTime-Format-SQLite-0.110.0-r1.ebuild 543 BLAKE2B b6fd0e64c88b01794e5f76f921237ccf6a34b892dc4d4fa11703264a7bef9e60cde1b9c611dfe5915bcd5fce6bc72ddfa9c97aff0518ae61d251bb1076a84c3e SHA512 d2b313f6217e9bc75e8c3c0a775ad27bc57e24d3e5812039443de587aa95c5ee2ceecd79f0ab8766e05e1c65ff81d9eccfe0494c16af3c78538e94ce1728857d
 MISC metadata.xml 418 BLAKE2B b8967aa50e18a782ea6d45ffa61cbe1013f6febad47e2e8c868db1ba7c4ce7964e6ee67c639397cce0826f39477faf17592bbd969fd7131b2dba9b328c59ac1a SHA512 fde73a3b23a9a3c207fcbdfe8e0e6f162bf4c09fbd6c74c99687538a02679639cec5c36373689b28075a8d5bae700696669d90d2529c01cd47e3e8a57352fd7f
diff --git a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
index 196c83c01af6..3818eace20c2 100644
--- a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
+++ b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Parse and Format DateTimes using Strptime"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Format-Strptime/Manifest b/dev-perl/DateTime-Format-Strptime/Manifest
index 07ffa438441a..c65fe70e46fc 100644
--- a/dev-perl/DateTime-Format-Strptime/Manifest
+++ b/dev-perl/DateTime-Format-Strptime/Manifest
@@ -1,7 +1,7 @@
 DIST DateTime-Format-Strptime-1.74.tar.gz 105317 BLAKE2B 997a76591b710f61e003998fc97ec26a8c5ce43dff83e42dd9cab5b13238c21e40f327afe46a0258b9f8e725abfc35d0d9957cf4e89936aa17cf79b1f7d111d9 SHA512 3b2b640f93956e82aff47f068c596018700615414c9b9ccf8d6bf68ad7b626ec86a831ec2b68807d7f137c10d4b8cfa5d2d50a6304252f3dfecbe9ff94e59617
 DIST DateTime-Format-Strptime-1.77.tar.gz 114321 BLAKE2B e942f79b4d54aac70b922f4c4b0649bef65a4b80a1aeb784409186c74a8e9dc3cf878460a9282ae947ce6a354da964a67403c5f0c2dd83e33ec2f36f07555497 SHA512 d6f997831ffe054b6052dc7d9a783fa64fb2dd90babbd97ea2dd11eacc0e6d1a6718c2dc877c444863be502482f6fc856f02f0feae8abb36220b60f417ee87ec
 DIST DateTime-Format-Strptime-1.79.tar.gz 119122 BLAKE2B 8125e095d6bc9c14b26278bbf2d7b04b783533f75f441637b13c5d5a117bf248b4db6db8da3e8c72e4c39aa45acc38a00816eba21ee29ab13e953021b84086b6 SHA512 842da603c4314e2506f12de2a8ce5e7bf29b183d6064b7f40b663934fba3612e26073835c49c5f58accc9727f1c1883d48deb69e11ceec28f9f47e776c4e2d7c
-EBUILD DateTime-Format-Strptime-1.740.0.ebuild 920 BLAKE2B 2ee15f4f76e84368f3f8ffe3950268cc418e0c1d7b8ef4936ea72f65b163becdefa7911b85ce384a127e53dd0e377ad7d997b0a409dc340ca2724a0bf83b511d SHA512 fa734702329fe9caf2f6aaaa2d6bcfcdabac27630719311c4f14bb450dd9f0614f4fd0e21f305feb6b5a4c1b3220353a53611e52462cab5487ce2d25ee00ddb2
+EBUILD DateTime-Format-Strptime-1.740.0.ebuild 919 BLAKE2B 7e0ff0092a54624d9e725bc657966bccfb0ec6f02797f8f672ec9f2ec418b3b7ec625149e8f8ae8c7ad72544ddcdff417bc083720c356cf0b1cfdf4ecf3b9968 SHA512 a8b5999289b0644266c3f7429daeef10eb3d8432f9eb09b7f9eaab10870afef184e39b1583b582c842c94291849a940e9518133730a13c00641484559feac63f
 EBUILD DateTime-Format-Strptime-1.770.0.ebuild 879 BLAKE2B 0a7b394365c8c728f03c3b1efb6823060d24651deeed05e19a5fcd93ca08f084cf52e6047731310326c3bf7d64285d6bb6d993e5c6b5691d0487e336af5383c9 SHA512 67ac48dcb32edf43dfdd77d96e26b44202925811a3d84b8a4ed464c753906cbe8f0b2384293ab6403bf249ea548f1fa7b312f99b14c126b8e60d234df1ba54e0
 EBUILD DateTime-Format-Strptime-1.790.0.ebuild 877 BLAKE2B 38a7152ecc8f3537dce3b90aa61e740fa35b5518f3f97516801018cb9d3e2276fa70c01911c90f5e84cee6d0e4dfdeff322011ef840cbcf374b4cefbf7067265 SHA512 51570779b7aea05c428ecca7066743200d4d04ece8d3bdc42677380bee298514204a6e5813faeffeefd6324de0ae1e02d6d5140bc1ed73f06a57936b9c9bcdec
 MISC metadata.xml 502 BLAKE2B d97ddac13e97735b35aaac5f209a94a7e7532101d9dd130889d70641d7e6446aa644e3e03a6f7a0790a1a1439bdd85f1255fac2e9fb248c2300ada18010a2666 SHA512 96ed5b2143e555d4b348d894541ada1c3b26d13dbb63ea62959b5a39558cc79d2a0d04520695ef1dc7260015309bde299e77b82cb0260131b8212dbd9583aebb
diff --git a/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0-r1.ebuild b/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0-r1.ebuild
index 41974e30af26..3acb505335ba 100644
--- a/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0-r1.ebuild
+++ b/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Find memory cycles in objects"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~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 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Devel-Cycle/Manifest b/dev-perl/Devel-Cycle/Manifest
index 4a829fd6e644..eddf9ae40bf8 100644
--- a/dev-perl/Devel-Cycle/Manifest
+++ b/dev-perl/Devel-Cycle/Manifest
@@ -1,3 +1,3 @@
 DIST Devel-Cycle-1.12.tar.gz 7276 BLAKE2B 618e5474cdfcd524da340717e0522880ee7e3e6c3e59438188b7eef836c804b9874084a60e31d14104d36d07df26d9ccea733fb8ab99dd19f6d6d8b4e624fa8b SHA512 e2c83829905449d13c86233ad5bfce28e7b4eca61a8ac1e2f73e3c906a2d8580f66ae84d865ef876c38c2d25f0a5a8adeb05f6e94594274d8a5fa1739842d08d
-EBUILD Devel-Cycle-1.120.0-r1.ebuild 588 BLAKE2B 3a04bf7c6db2b3679bab97baba8ef57c295698c8f6f7939c4cbdc36113df467cbc426562157684ac979fa0e70805ade49f5d32c7507abc89f56b25acdf44974e SHA512 e236bf337294b6167d6d2387f50452d587d6ed5718ed7d80863ed06f4b37f2c630c7562cc171ea1b987c4954e0825485132a70852e8304e6eb25de3593b05359
+EBUILD Devel-Cycle-1.120.0-r1.ebuild 587 BLAKE2B 4618fea2917a6335cded7627d7efb44cead7ca674d57650127a00781dd020034edea581baff75f201b1a32373bbc1e2411b9623c3fd096d5295a4ae31d8c544e SHA512 6a2d118be2a656df33dfff3e1ccc9e729dd91897ea560f62b55d3dd5a701ba14cd4d7a0cf5a71accb5f12e3105d568f589fffb9a79ceebdfc7e6c8b584c38cd3
 MISC metadata.xml 395 BLAKE2B 6d97d09cd34ac3c01d1215905a8fcbc8f44c3ac98669a1d8f0e0e2643e0f65b9311e98e2e810687ab6f6a6c47b1a7c1914f0e973030d25b34087784ebae772c0 SHA512 829a6920b0ab21b8abdc69a2671c05884a2ff23634626d95cd1ada76f8d73d2deee14cac561af35ac081940bd9dca1a5587e057b58104418a295264074600f08
diff --git a/dev-perl/Email-Find/Email-Find-0.100.0-r2.ebuild b/dev-perl/Email-Find/Email-Find-0.100.0-r2.ebuild
index a1a2619297b6..cd95d0f1e319 100644
--- a/dev-perl/Email-Find/Email-Find-0.100.0-r2.ebuild
+++ b/dev-perl/Email-Find/Email-Find-0.100.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Find RFC 822 email addresses in plain text"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-Find/Manifest b/dev-perl/Email-Find/Manifest
index 72e0dc91e85d..ee7f51f1e57f 100644
--- a/dev-perl/Email-Find/Manifest
+++ b/dev-perl/Email-Find/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Find-0.10.tar.gz 39511 BLAKE2B 846b6bfa5a02284d36b399ba32f944bba25ea07d3a352aeb9dab5f25039d34a988262c16cc043a60d8f611d8d28c7fe4f15ed07778bb79bb09c6375397a8a89f SHA512 0c31a108de7b146a9b1a35dad15d4a8afb6bf036f228b4997247e1406ea15a8a6c0ba6d79ba36c4262be69970211653b71587771d2d0170ca506a7f531265720
-EBUILD Email-Find-0.100.0-r2.ebuild 547 BLAKE2B 43f74626f907211bd9a7cea6764d3ca3830b23a408055a2208d47432bde8b27ef3e72d3a4fe6178a54ab36483835c8eb0019ceeb1aa1ceaa9cd40e5c5c3b0ab0 SHA512 80bcc59fbdd180f2b88b909fa648f53af6625ff9e5658715a853f1eae01a16554a36c118e23d7bd290581d3b91aba9b17b88f9c5d24eb1bf670ee31516fc9986
+EBUILD Email-Find-0.100.0-r2.ebuild 546 BLAKE2B d98f80a0d6391be55e835283357f64b27c56c9d5813bb60431517b8a1df9cea3371f41b204607d4d6605b7ad056a58a3225ab4aa77a72c2d05bd1d9d888a65d8 SHA512 b825f2f4cb98fdb6c18caa57ca46d6d7431dc9476f8d40cf25fb8ed15fda7313f8ab61684420130f32125bbd347f554529e426f14cd1e6a7a01a27b5c0274582
 MISC metadata.xml 461 BLAKE2B dba3a8732ddfe979e8f3331c8d2389ed566756db7956cadb7f9fdb768711f62a8c97091e94dc6b644ce08856228d582a2e35e4503267125b0042d9f13cf9f94b SHA512 5943c1cb2636ae53f43b33e4f91fdae9fb9d544d24c0a062852a5facc4a61380d2ed622d67fbdf9011ac7048af3586bf524d062f0e78dbf9f5ff6e72648986e8
diff --git a/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild b/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild
index 583c8b0d3bbd..2d0335ddce7f 100644
--- a/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild
+++ b/dev-perl/Email-Valid/Email-Valid-1.202.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Check validity of Internet email addresses"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-Valid/Manifest b/dev-perl/Email-Valid/Manifest
index 35d189ef691c..7a244ccf47ea 100644
--- a/dev-perl/Email-Valid/Manifest
+++ b/dev-perl/Email-Valid/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Valid-1.202.tar.gz 33891 BLAKE2B 439dd466fb9f28242531de30a1b3e6b90ee4db69c8680739fae3d97974eec8ca11f2c5f88a39e266851392bca221a429cd68b7f8ef628c93eb788d164b7200ac SHA512 16605a0f935cb429f83209e0b67a36339c74ce77aea1aefbb338a00d236f57648672bb179e543dcb28b02603ccdc0a9c6a696176eecb5075cbd119d1de7a114c
-EBUILD Email-Valid-1.202.0.ebuild 774 BLAKE2B 8d858cb72e5f2b09582097498f2816d95f443cab7d77e70a368a0e22308db6e26c13bfc5c76ae53a35d639a8976ad0932b27bbca7be64100ac2ed5b382c5e483 SHA512 fd1e951a1884877b1313842585789e032341211ae148f24b31acb44e85697f7e0e2f2bdb78accb4b5c33c3648983ce20f4a63d9d78b935f840a0d765cb26ec9a
+EBUILD Email-Valid-1.202.0.ebuild 773 BLAKE2B 0bf560dcf7d39f3db74e25bb6948076edb61b6c460a1e69c51972fc6a564366a43513bbec80c9c11909014d31e330157b8061d1555227e0033a5f182a9d74589 SHA512 ca3faf6e515ca53e69a78756a8bd0259c48a3bd764d420f0adf9eec07213ac14b00eee9d8a1c9825a62f79297896d71891e2131a4e3736bb82ff4b3a11f242d5
 MISC metadata.xml 395 BLAKE2B 2e428373065910aa57f6eb92335ed77cde46919e13975fba9ca3a7749cf443f8a4ecc1a55445fb11b3e3f9fc98db6549bff6b50dfb20c7fba7c41073167b06cc SHA512 fb4fda7b409c61ba64001b6374cdc4e9e591df1c7e8e505d86830fb42af1c9899a7b710f5cda95ccf3e9e0d505cbb189c89af0a3b94368194f0b5e73524ed4b4
diff --git a/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild b/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild
index cd3621e9c6ca..b055158b5470 100644
--- a/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild
+++ b/dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Check for the presence of a compiler"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/ExtUtils-HasCompiler/Manifest b/dev-perl/ExtUtils-HasCompiler/Manifest
index 4e4dfe2e831e..e4336f25c38c 100644
--- a/dev-perl/ExtUtils-HasCompiler/Manifest
+++ b/dev-perl/ExtUtils-HasCompiler/Manifest
@@ -1,3 +1,3 @@
 DIST ExtUtils-HasCompiler-0.023.tar.gz 15857 BLAKE2B f999cbc13edc4ff9d4fb1f28fc20dc223e2b504a95e44d6a4871c55766ec3fa0cbe6c5a46add40b694a2513604c486d1d98853c17fcce397b21855d6754fa41e SHA512 352e87249eaefcf1cdaa019522849867c2e3dffe60e07c24957072bc27aea39e6855c082b112f326c5a4f86b2174dbb2e03c487b8f7fb2abfd750847f19e7a6b
-EBUILD ExtUtils-HasCompiler-0.23.0.ebuild 449 BLAKE2B eebbb68ac084fba323b60e6c089495cbc293512a67ec1b0ad2875f88e802b213bc66168bfdde0ba2657a13a504b31a4816bd09aa4222c75e893306ce05802363 SHA512 5860bbdfa780296aeea2bb8b01fe08eadd623590cda125628070f1fabaafad68fcff71ca957aa07279cc386aa07cf8a1b9e6f9c38899e3faad45d45c3bf7c926
+EBUILD ExtUtils-HasCompiler-0.23.0.ebuild 446 BLAKE2B d7787f740912488ac85bbacd610252bf7b7747a22e3c45c6e5226cda3ec7944c13d0bb766fcac15f4c6b678529690bc0bbf34f5aad0670d22f9a2f73bbf379d4 SHA512 f47781fcf90a293eef74b1cd3eb139174c8ca250cb9efec7d9d69c9feed95d711abf9e7cb0bc4309eeb67844c8cade2566df56148fb91912c11c7277ea696915
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.380.0-r1.ebuild b/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.380.0-r1.ebuild
deleted file mode 100644
index 39725cdef955..000000000000
--- a/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.380.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DMUEY
-MODULE_VERSION=0.38
-inherit perl-module
-
-DESCRIPTION="uses File::Copy to recursively copy dirs"
-
-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"
-IUSE=""
-SRC_TEST="do"
diff --git a/dev-perl/File-Copy-Recursive/Manifest b/dev-perl/File-Copy-Recursive/Manifest
index c4bf04e52774..747171f4ec81 100644
--- a/dev-perl/File-Copy-Recursive/Manifest
+++ b/dev-perl/File-Copy-Recursive/Manifest
@@ -1,5 +1,3 @@
-DIST File-Copy-Recursive-0.38.tar.gz 10843 BLAKE2B 5bba9545224c919e8de3e3bb48cbbd3b6707022cd4df43358c78582562c29f728688d91168c15e43b0cb6705cf65957c32c45fa2ba3dcfdb7b6a8530ebc70576 SHA512 49e5dbfc5bdbc554ad8a019c25db85ebfa55765a73758d95271b5f3de9550fd68b4d99aa287898d86bc6c11ea8de97469a85c53d4ad8534594b411be1f18eb87
 DIST File-Copy-Recursive-0.45.tar.gz 19256 BLAKE2B 15a6065883d3b53e51c168a3d67eaf0a78d13c354a73bc2e58eda541980c0b709f2ba431b97486c112d74354b98a4d81a30a13db0fe12e5022fe65ff7eaef2e9 SHA512 6d8a6c55bc54bfe5ce3834527776c6b1466d5672f5f8901c27053188bbc78e87dd62bed8d330c04079b02d0967be0a8d0cd779e67973cf79a2c6ff87d5921c60
-EBUILD File-Copy-Recursive-0.380.0-r1.ebuild 456 BLAKE2B 565064fcf9642f64f9c3afa4429f87f8b22275a5e71d650e63593a461ed9150d82d0ea051fddc6326b8c34d58efa3272c03f3dc3925511e0cee8e4cba2ef3851 SHA512 b62908ffb6ee6100e5a43219b70bd9fdb1c8b68783396a626788f808828d199009a51e045807621c394727194da6a126b6bf69d63c7b289e6c83ca42fa682a4a
 EBUILD File-Copy-Recursive-0.450.0.ebuild 652 BLAKE2B 488e8194b6af0355eb6bef2b0ebd37033bfbfa9a836fec4203f18edb7340d2a996b0e029807e7ffde38f03b53ea880ad164f69d37b18bb4f9fe8f617f10e621e SHA512 b50d2c9f3a4a5701c5f38cea27b6da1a01b1034879c6247221823d6d0587bb5589d1ee4118394ed247fe08aa037d15be8660e88c0fdef6a53f2512f26c150b07
 MISC metadata.xml 412 BLAKE2B 9255d6b66ff283ca957baa092ebddcc7f2292b9925581292421ba02fa1f961c2db3f658f217f1a405d5adde13b69c5cd2d44e2d10d753d9dc475c1c9425ab10d SHA512 1694311502ea0769eda65f34db724a2b32177ac660d1e9d2e3cf2c70b6230109869533cf36eb131df6a46f4e7f7858c8ceb7f2e7440da50c630a93ffbac7b348
diff --git a/dev-perl/File-Next/File-Next-1.180.0-r1.ebuild b/dev-perl/File-Next/File-Next-1.180.0-r1.ebuild
index fbbf23586dcf..190651ba17d7 100644
--- a/dev-perl/File-Next/File-Next-1.180.0-r1.ebuild
+++ b/dev-perl/File-Next/File-Next-1.180.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An iterator-based module for finding files"
 
 LICENSE="Artistic-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Next/Manifest b/dev-perl/File-Next/Manifest
index 61426a4c3bde..0fd061179b92 100644
--- a/dev-perl/File-Next/Manifest
+++ b/dev-perl/File-Next/Manifest
@@ -1,3 +1,3 @@
 DIST File-Next-1.18.tar.gz 18286 BLAKE2B bac27a198bb8c8fa887b09fcc9f7473191e236da62097fd93759b34c436676402da3e65c89e18eb30ffc6dae0fda3bc7b4b750c5483442af345b8e89ee3760d7 SHA512 951ad995b40ddda359a10ba2d7e19622059da03e7aaa3411e2e887633fbf7720554dc3f98ad581b245b2ffb51ea79f7c5eedecf6e943359eb407df0f9014e627
-EBUILD File-Next-1.180.0-r1.ebuild 783 BLAKE2B 484296fc7679d1b12a8b25b03c6e388b2d3b5f61ea64d4ae256df51eb65f769eab62a5860b5a8446942e9918562fc4be837b4f63a3b87af9f906d1e4f441bedb SHA512 5530d6dd576290242218522d3636601d593a63e7032a36b0b47b8505e0a88320479501f5f7198ede4f2c0f8f6890a26cb538089da916da440ee44b26b7c06450
+EBUILD File-Next-1.180.0-r1.ebuild 790 BLAKE2B bcea047f4f710fc966be10a66ea7efb23b1d0c5de07c3c40862b1721edc224031d70b9d6f1804156f8ca804a4d6d47f03d5366f3a3c93c3764fb4d6ceebf2ee9 SHA512 55388ee439599e4de796ee123e4da408dd2906fc979044533672ed79b40ce8b9d10796db6f22bc4c9978a6ba06bdc339822133c36c39e937c3a26ecbe748b496
 MISC metadata.xml 391 BLAKE2B 3e90d9cd0ad825171e3ad8fb90c3a9258698f3e251b6ae3bd49e218fc3b23836ce618e7adc2dd869bf67d1369d1de666cf5f8dad91c9ec5f0f3eb8b495945fba SHA512 ddaad86e23f1d9be1f992f1b80d352c567e885eda9e9117d56de638dad70b1f99ddc0fff02ee76a8c09e86245eeca8322a6e08afe297ea4683ae306b582dc4e7
diff --git a/dev-perl/Graphics-ColorNames-HTML/Graphics-ColorNames-HTML-3.3.1.ebuild b/dev-perl/Graphics-ColorNames-HTML/Graphics-ColorNames-HTML-3.3.1.ebuild
new file mode 100644
index 000000000000..a0981948eb7d
--- /dev/null
+++ b/dev-perl/Graphics-ColorNames-HTML/Graphics-ColorNames-HTML-3.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RRWO
+DIST_VERSION=v${PV}
+inherit perl-module
+
+DESCRIPTION="HTML color names and equivalent RGB values"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Graphics-ColorNames
+"
+BDEPEND="${RDEPEND}
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-Module-Metadata
+		virtual/perl-Test-Simple
+		dev-perl/Test-Most
+		>=dev-perl/Type-Tiny-1.4.0
+	)
+"
diff --git a/dev-perl/Graphics-ColorNames-HTML/Manifest b/dev-perl/Graphics-ColorNames-HTML/Manifest
new file mode 100644
index 000000000000..f89ea014fd19
--- /dev/null
+++ b/dev-perl/Graphics-ColorNames-HTML/Manifest
@@ -0,0 +1,3 @@
+DIST Graphics-ColorNames-HTML-v3.3.1.tar.gz 12616 BLAKE2B 1c857d64459d33e15aa2616b533683dc2d99933256259dc2dbfb3ea483a6a963a37e2af0f686e2b7ed0327c552643d822ec76f2a9a88b82007b4707556d7dbac SHA512 da9f0ef38a148872c11271215369c62675be8df1849812eb2cc4b4dc730030953f1e9c3b259d4bd33734f73e8a924a41639221764fa671636be31d84ba79688f
+EBUILD Graphics-ColorNames-HTML-3.3.1.ebuild 471 BLAKE2B 62d2c3f33f7a961b0f4b351feb0652a83cc9231879ff61da1b28e52b05fd8e41ea3e8ab0fd74cb311294e134764f9f08dbd2f2aaf9f75659c7077e2da617b21b SHA512 0b186735f58903d7637d83774e619d7a4922615b7edc18b813826e3c14e39db60541b6e0881ce83dfc12645b89c489d7e50febf48aa685a0c0927814f0720de6
+MISC metadata.xml 270 BLAKE2B 6285c6434a161546ba003451e3cb858a37fb554a1cc76a205596e3306a9ce68524a7cdd781b102fc63ecf75e092d8eb06ee06394efb8a8f7740a4c75251281be SHA512 7e42e585b613c1ddcdc3f99b9531da8f1b9a975aada1bd63acbd98f01dae8f57cdf0f4f042fbe9648d604cd272431a023b791e43ea4298ba6b25c2b73240f04f
diff --git a/dev-perl/Graphics-ColorNames-HTML/metadata.xml b/dev-perl/Graphics-ColorNames-HTML/metadata.xml
new file mode 100644
index 000000000000..2b4a068f541b
--- /dev/null
+++ b/dev-perl/Graphics-ColorNames-HTML/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="project">
+        <email>perl@gentoo.org</email>
+        <name>Gentoo Perl Project</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/dev-perl/Gtk2/Gtk2-1.249.930.ebuild b/dev-perl/Gtk2/Gtk2-1.249.930.ebuild
index 96a0c9b312cf..76bfe9c481b9 100644
--- a/dev-perl/Gtk2/Gtk2-1.249.930.ebuild
+++ b/dev-perl/Gtk2/Gtk2-1.249.930.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Perl bindings for GTK2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -32,6 +32,10 @@ BDEPEND="${RDEPEND}
 	test? ( x11-libs/gdk-pixbuf[jpeg] )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.249.930-skip-pixbuf-test.patch
+)
+
 src_test() {
 	virtx perl-module_src_test
 }
diff --git a/dev-perl/Gtk2/Manifest b/dev-perl/Gtk2/Manifest
index 5a78395a6928..4734d79bb887 100644
--- a/dev-perl/Gtk2/Manifest
+++ b/dev-perl/Gtk2/Manifest
@@ -1,5 +1,6 @@
+AUX Gtk2-1.249.930-skip-pixbuf-test.patch 921 BLAKE2B faf756d8d1129e3f06785789516c96268d4d09660177b8ae712a0b4718c78238714c5588ee0397de74a14b0214fcf8161053f636dc6777ff711540c492e53485 SHA512 7c1853d9e63680382fd72a635d430b4eb896efda07d48b99fa4ad081003cb488a3be739c40ba5ee74f18b3d8a5e0847f8b6ab13488ec233a99b65d4f38322b0d
 DIST Gtk2-1.24992.tar.gz 768646 BLAKE2B b2b63c55d9e1f7e19911bd4a6b268bf27d79339aeef9f8db32fe2fa24666a30e298158a81647ee54d8ce9f04e48d14d21a57971e81383c12d92447af877ae714 SHA512 a3d0ac22ce0f356f1a73c6b7d27161f76573b64cfde54e76d751ce8318eda9410e57d905e03b2562b8d31b80d3dba2bd4a8a7980a331bd5ca0c6f75e61e4e6f7
 DIST Gtk2-1.24993.tar.gz 766708 BLAKE2B e9286d3feaf3b9493fe6a1c45f5c75a4cd1553a06bc1aedfef1ed25fc9d4d793d4da21911f86112a51478533341b470c5e6ad3cd1913dea863c0557902774843 SHA512 320b10803394b196e0833ab998b854c7e184d6f291657c732a1fddb0c049d01ef192c73e6a095a87b18ff8cb9ac846fcb3682a2dd0c9c86076342e3ca7e55eb5
 EBUILD Gtk2-1.249.920.ebuild 707 BLAKE2B 8f5d0cd49994cecf00985b4e663dde45c70c50674860fd3f9f4143507122fa7584550d498665e76a60ba5491002785dd25de6bc2004765d2bff7ee15eb0a04a6 SHA512 89eb54878ca8942ba021a6eb867ab45f5b517d926eed2176cf4b86b1784ba77e504b973467b00750e67b894e3c72fb1b7f270f5c7aaa716929a3bfc0e5d74d83
-EBUILD Gtk2-1.249.930.ebuild 741 BLAKE2B 704ca24cb83a61fd4770d078f18423c07456acaf3bb7b54179a07b58d9445d32a42ab0ecbd5c8687fc78651f840c3316123716282e6dbe36ce3406c7a7394310 SHA512 82aed723edfd800fc6fd892f1dc6ec4a5ebf8564584bf0093efa969cfc851640d17dfc57b8441cd45d0309568ae78261834f539c781251a2550b05004e5d6b93
+EBUILD Gtk2-1.249.930.ebuild 806 BLAKE2B c314df34b2742918fc8cdd0bcb0a96bb36a774e2433f1b1bed37022dd461e496d42f358e084c74cba350b47b69f3f65fd8704a5cfe3eaba9e16e373cb1b5125b SHA512 74c4094f534346c883fb67aa3972e40ba521c872f2c2f37a8de7350fb8c47080624e54d706e72ed8288e5e92dd2f4b3043623c4a404bb12fcc9e0a2bc9ff162b
 MISC metadata.xml 1290 BLAKE2B df7b90c97d8df33633506548a3fb4097e83c2f40444bbc377a5acc196bf55bbb51a41baeaf5c9129cf6e8edf29acbc46003ab064a22aab26aa7ab432026346ae SHA512 900f11881126eba531dc91bebf71e89a1322b79702b818fe2a0a1312d5613d10d1e061b13e6825e2bd83664258ba028a79237c43a506d3abc1e0ec608a806d77
diff --git a/dev-perl/Gtk2/files/Gtk2-1.249.930-skip-pixbuf-test.patch b/dev-perl/Gtk2/files/Gtk2-1.249.930-skip-pixbuf-test.patch
new file mode 100644
index 000000000000..b64d9470a48e
--- /dev/null
+++ b/dev-perl/Gtk2/files/Gtk2-1.249.930-skip-pixbuf-test.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/774396
+https://git.launchpad.net/ubuntu/+source/libgtk2-perl/tree/debian/patches/new_gdk_pixbuf.patch
+
+# Description: skip a test that is made invalid by the new gdk-pixbuf
+# Upstream: https://gitlab.gnome.org/GNOME/perl-gtk2/issues/3
+#
+--- a/t/GdkPixbuf.t
++++ b/t/GdkPixbuf.t
+@@ -123,9 +123,12 @@ my $log = Glib::Log->set_handler ('GdkPi
+ $pixbuf = Gtk2::Gdk::Pixbuf->new_from_xpm_data (@test_xpm[0..2]);
+ ok (! defined ($pixbuf), "Don't crash on broken pixmap data");
+ $pixbuf = Gtk2::Gdk::Pixbuf->new_from_xpm_data (@test_xpm[0..5]);
+-ok (defined $pixbuf, "Don't crash on partial pixmap data");
+-Glib::Log->remove_handler ('GdkPixbuf', $log);
+-
++SKIP: {
++	skip 'new gdk-pixbuf error out on invalid xpm', 1;
++	
++	ok (defined $pixbuf, "Don't crash on partial pixmap data");
++	Glib::Log->remove_handler ('GdkPixbuf', $log);
++}
+ 
+ # raw pixel values to make the xpm above
+ my $rawdata = pack 'C*',
diff --git a/dev-perl/Gtk3-ImageView/Gtk3-ImageView-10.0.0.ebuild b/dev-perl/Gtk3-ImageView/Gtk3-ImageView-10.0.0.ebuild
new file mode 100644
index 000000000000..b9b1a3df6014
--- /dev/null
+++ b/dev-perl/Gtk3-ImageView/Gtk3-ImageView-10.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ASOKOLOV
+DIST_VERSION=10
+DIST_TEST=do
+inherit perl-module virtualx
+
+DESCRIPTION="Image viewer widget for Gtk3"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Cairo
+	>=dev-perl/glib-perl-1.210.0
+	dev-perl/Gtk3
+	dev-perl/Readonly
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Carp-Always
+		dev-perl/Test-Differences
+		dev-perl/Test-MockObject
+		dev-perl/Try-Tiny
+		media-gfx/imagemagick[jpeg,perl,png,svg,X]
+		virtual/perl-Test-Simple
+	)
+"
+
+PERL_RM_FILES=(
+	t/90_MANIFEST.t
+	t/91_critic.t
+)
+
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/Gtk3-ImageView/Manifest b/dev-perl/Gtk3-ImageView/Manifest
index f7380010c2ea..4e60a9dda474 100644
--- a/dev-perl/Gtk3-ImageView/Manifest
+++ b/dev-perl/Gtk3-ImageView/Manifest
@@ -1,3 +1,5 @@
+DIST Gtk3-ImageView-10.tar.gz 28165 BLAKE2B 429490c02e34bbe669b209459fd90937a4148e643b6b4e26bd643cd930f728a400b4d179c7e072a72fced7b06fc9a7f16deb87d33b42b296f07f5dce14abdfb1 SHA512 2548c33c49c27bb4a69d5512c7dfaca096a39ef6d08fa1deb83a045e6c5b7ad075eb8b23b33fb794024c9b9e7fd979a5c31bff075a7ed5412a4a5a4f53824f5a
 DIST Gtk3-ImageView-9.tar.gz 16083 BLAKE2B f64723d2ee468c7ab423292bba8d995a62554877567fdfdd272e527920e037147783fcb9cea99ba1688f09303ee321abaee0e334a67db46bda6b0ed7e1ff9415 SHA512 1a52c53a03b6f9dd6abc69dbb03a8dd80df77e266eb972cb2438bd25d49765b203a70e2dfee1ae3cfdd27b4d987f9573eef3e47968c80550771dd3edbcf831cc
+EBUILD Gtk3-ImageView-10.0.0.ebuild 694 BLAKE2B 7a9e3ac2dc936524867c0d046a8be34a336e86365e6d3874f22a66d076678ebffbbebc2e079769bafb3af3b44f1fa2361c977afae5cd9716635161a280500cc8 SHA512 7adc62eeaae38106f4b0855d1195d74b42c8a923f07bb2182b27a10fcf7b399f41fbe8b33de945f43c414b570891918c34285a1f17a2c79cf57e0b79f3720a96
 EBUILD Gtk3-ImageView-9.0.0.ebuild 691 BLAKE2B 81ea41684762dddf26d7bb212119a45c9adec9dc30aa8885304117acd1d28bf7d3387351285cadc030b374a3e2786bc9df3ea27e604cf2b99469771c8564631b SHA512 021d0dd86d5125bea046f6bef25bbfbf493e8945691516b38ba963b1af9c0ff9adfb9b04180069114d29e3d1e5a4b7f6dcb0039b7889a05f84ab8b2853449e5c
 MISC metadata.xml 1018 BLAKE2B 3b984f34f2b493db7ab1fd89b6edbac39936461826a43de10c6cde112a9e1be83eebd9f6184fe2c39763ecca1c050d44211641049028e8bc5aa7cb00cf3ac1e0 SHA512 eddb5b455c5561f7ccc1f84053c6830af833cde842af7422d0b4907765d3a771a892613c64ab6bb09ee49da53c8c989f4046bc172ccc70a4a3cf9164e337474c
diff --git a/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild b/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
index 40c705fef20a..2d50225b8e78 100644
--- a/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
+++ b/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert plain text to HTML"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTML-FromText/Manifest b/dev-perl/HTML-FromText/Manifest
index c2243d91d590..b59cb74b588b 100644
--- a/dev-perl/HTML-FromText/Manifest
+++ b/dev-perl/HTML-FromText/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-FromText-2.07.tar.gz 23596 BLAKE2B a76f39aff15e4fe622ca3773e36f1c7cf7a8542dd3f084fd392438d569e4bf1a326d3c1b93b3b0de4aab37ae20529d4f2612255927c5b4c26af5a99784b985ac SHA512 4aacb6be9d1c860c1e758201be40a9c966cb43f1593714e65964bce4bf5d72c86028290ec584321365de36909b6e44e8851f5c2a417b6e38da984ec9c5c30112
-EBUILD HTML-FromText-2.70.0.ebuild 903 BLAKE2B 043db931f4ab3b0d0600b54697faee064d2c100a1860af9c5c2055d4e0db426f0cd6554065422cdec256fc5790096093645af3418305d1b782bbd66dcb3899d9 SHA512 7591c07724a966bf906169c48320a80f42c94c977fd5abee1d5a5247fdf1e8064b67f0986995dc10faca9accbf783a329857de04230cb68b98de957caa720ec7
+EBUILD HTML-FromText-2.70.0.ebuild 902 BLAKE2B b14beec0de4bce83001fcada7efe372eb4df7b709b818ad28f5e994f7d5e453620296d74050396c972c5f3dcef6dfcedf132e937d4a7eec5757893591796509d SHA512 7d6b7b4d0b559cabf883000500ce9f4b19cb502a42ac9bf40f9a05b8275cb77df24f1b43b1bad53c5109fcc598ff36b8f896cabf8661ad6e6d255cbb5c2f9f80
 MISC metadata.xml 399 BLAKE2B 9cc75a14df9f59fa0ef679ce6e08081f4482c72b9861e79146c18a4ec3b5f1f8ac9f3807b2d93db46bfd62926a45e73baf8102216c31c7983bd5928e6c8b6f13 SHA512 24649df557debb77653b252324abff44be0f79aad7cee4d475c7a0ec70623a0f160454f6acffd24f237393c6db9260ee528fc4550ff06a34694d55c09e37ca00
diff --git a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
index 5fe11a4e3ea6..64f3bc62d1f5 100644
--- a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
+++ b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Cache the result of http get-requests persistently"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/HTTP-Cache-Transparent/Manifest b/dev-perl/HTTP-Cache-Transparent/Manifest
index 4e299d6bec8b..917c23d25d23 100644
--- a/dev-perl/HTTP-Cache-Transparent/Manifest
+++ b/dev-perl/HTTP-Cache-Transparent/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-Cache-Transparent-1.4.tar.gz 10289 BLAKE2B ccbd8a232cb5ff9ef8354d9613a98546efe4e6bacd5c77b9e36affd3ee8e04dd1f5ffae979e9737cf03f3cdb077158683ca7a310cdb06ac019c661595d7a4b18 SHA512 bd48290de4aeffe64cc4748d2f4b054abef539770dd8679f88fd24d9478819c31d7201918335404ea5ed0251d4c4f7d19926ccdeb6b4da2cecf251d2618589a4
-EBUILD HTTP-Cache-Transparent-1.400.0.ebuild 637 BLAKE2B af2f639c044e4c7738bee2308338e425acfcfd08b64fb08a6e99efd405f47be0c6b0480add5ed632e8469df677d3b9d595d400b784f28cc1ed2f3454b07e9d06 SHA512 47710de6d72189133bcf6ebe08e7d268710eec2b25e754d98086f989830d7a106e8179139b1bf38ac111c9851e1ce930d803c832f0c634c5c20dc398b3e6521d
+EBUILD HTTP-Cache-Transparent-1.400.0.ebuild 636 BLAKE2B 96a209668afed946e055d6189bdb8f82f3705f81d30d2d54797fde0975a6f3c98fade752b94a30931c1bdc7db97688d8ac5d9d1e02612607e72178dc37c77477 SHA512 2522d926cf6692309c291f23a71fe820119a4b6267c152b65d30535e742c9b13d3dd19b47f9ca964c2854d03192ac56a30ce8e3383707b1591ee344e48671ff2
 MISC metadata.xml 418 BLAKE2B eca216ff35c08d6d7e0908dc9b42aed104d16542e399f0f55d14dff39751d5f90ae6057ebc3617942165686eaede5bc8e47b7cd269ab6d0ea1abdc7233c5c29f SHA512 0b7046cdddc54ef135ce71eb2e05759c47a866ba1d1c7d557b2bb569b64b2da17fc4e2b29381c319f3e0b3dd5ce72f13f4e564dd67dd932005b242d77bb24e05
diff --git a/dev-perl/HTTP-Simple/HTTP-Simple-0.4.0.ebuild b/dev-perl/HTTP-Simple/HTTP-Simple-0.4.0.ebuild
index 08210d357396..cfa3a88063bb 100644
--- a/dev-perl/HTTP-Simple/HTTP-Simple-0.4.0.ebuild
+++ b/dev-perl/HTTP-Simple/HTTP-Simple-0.4.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple procedural interface to HTTP::Tiny"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/HTTP-Simple/Manifest b/dev-perl/HTTP-Simple/Manifest
index fc75b9112fae..7b4dc534241e 100644
--- a/dev-perl/HTTP-Simple/Manifest
+++ b/dev-perl/HTTP-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-Simple-0.004.tar.gz 19212 BLAKE2B 04648dc7b73e6f47e60152b0ff0764e14c41f99c33547e9c1722589d43642f790d8df6a96e93eb161cda288b01dd559a5221e22d2d2f71ece0cee1b5b7da47b9 SHA512 9001cf35d1ee15b36d4f62c6da3e714673c53b099462479d3c9eff26de490ce59c248d94b29012eb6c2af18920668773db1fea808be956eaf7a5ec8195956c33
-EBUILD HTTP-Simple-0.4.0.ebuild 463 BLAKE2B 0cc82fc3f6be962d9143162ffd73be24691cfaed20cbb05d966f40c84746cc8998cd8dca512c692066ab72364a68944caaaf085aaf57f2955ff15e2c29c944b4 SHA512 a1e40d31a5be42da5b2812ebd5c63e02a34f04adbfc008e3d9d73f5813f8d02090a2c12f871f1b3187ff628b36e970e17be68b59d78f3030a2eb279b4fdf58e6
+EBUILD HTTP-Simple-0.4.0.ebuild 473 BLAKE2B 2ecd3945311cb8107a0a78cdd3eb224d10b593c675f8e201fba0b52cff2cff2f37e88beb1ecf9ffc4bfcedce1f107f95a24238669d0e655845e75b6b54ddf4f2 SHA512 a5bce74c7f93d53d390c6eb4c8c04e83031f5de890f5996f73cda88a16809649913c33603a666cf557a6510284d0df29729feb88d4b2d3796490ec0f4c236173
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/Hash-Merge/Hash-Merge-0.302.0.ebuild b/dev-perl/Hash-Merge/Hash-Merge-0.302.0.ebuild
index 1cce3dba9363..04353aace1db 100644
--- a/dev-perl/Hash-Merge/Hash-Merge-0.302.0.ebuild
+++ b/dev-perl/Hash-Merge/Hash-Merge-0.302.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Merges arbitrarily deep hashes into a single hash"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Hash-Merge/Manifest b/dev-perl/Hash-Merge/Manifest
index ad6f4e07c9c1..841b77f5d020 100644
--- a/dev-perl/Hash-Merge/Manifest
+++ b/dev-perl/Hash-Merge/Manifest
@@ -1,5 +1,5 @@
 DIST Hash-Merge-0.200.tar.gz 10339 BLAKE2B fd9107148f815c3eb86fc4fffd75eaf1a939e5cfea79f00e373e5f03985cb654ae7c8a9d5cde74bf7fd6bf5866995c9c62c2724b01fd0dcc9e73891efbd18524 SHA512 b04f5229f70630d5a1552dcff83743d4c053bfd8b7b294fb03b21f2e7c12b6540a39e6c93fe016960686e1e9107dc0507d15406247da827fb608bc273e53eeec
 DIST Hash-Merge-0.302.tar.gz 14151 BLAKE2B 04dc202b8ca48cfbd3446f2b1172cd5b5f39b4d19afdda5c2793a1c028a1501bf861aebdf51537b23c4644530c31a0e74fe4f10ba5ebff7d952df38a8cd11df7 SHA512 ac07e1154541b5d9a7fc2f126927a7d86d49ebb2ec4f5439c4f21178d0986d78f2f8f17ab5e6b692cfe8dec63a5c36afbe07b16492a983e13b33247c0789bc47
 EBUILD Hash-Merge-0.200.0.ebuild 367 BLAKE2B 37c6ec8caf4041b5db6e9d78dc395af6ca2e1fcfa3c94616cdd8bbf24eefe64e588bf40b3b4a64d61b4bd842fd789f68cadf3aa589f7b19d542bff37a7d35f72 SHA512 9cbac5a96185c6bbbfd9acec8c9cf6d9e4659a9d55fc1086cffb8f3002c7386f82716ad3be5d82f0c2e197a30f5b6fa94f50dbcd24737abe7f398bc9f5674921
-EBUILD Hash-Merge-0.302.0.ebuild 537 BLAKE2B 9cfe5aa641a2618cbb78e6bf69fd722ec6d5bc63cf37ebb11e3fe0642850e9f3663174a2fce5abb009c03ba2ddcd6d0639be0f1f7f0988418b6f869b73a5b9ab SHA512 5e9da66f98cbd9bcd57fd5539b6923b87718fdb411734f9d98448a585e5dec7f3e4238799fd77194d1a53ba759294cbf30eed38f9a61e18f37528b89074e8b5a
+EBUILD Hash-Merge-0.302.0.ebuild 534 BLAKE2B 123834d6033ebde99e6111b96e8f57fb1a0a10dfd94b59bdcdf895bb1d3caf849fc1690fe4fc42345f689cea00f71abe7922d00b6e336ed805b23cff7d6188ed SHA512 1b50b246fe059910c7dd0a371548a1085fceb16561790200b043060c4eeda7d691d5e600d7af53a25876bc25f91fca9299b3a9e990e72b95c2677f72151ba3c5
 MISC metadata.xml 393 BLAKE2B 7a15cd09aa44ebdaa0b83652b0d14ac8fe9667ecf49b7023341a00b18e51745ef0349d54acca43a4551a9206b4d74c1b3907c05107b90e0bae24c085b6f23d4d SHA512 345258483808141a5e98f78a98a64c0d14aab8227d3b5a38346fcd181d3443f545584ca66502412177d09e46233b05cbf38ba9646e4175d3551f142d5524ab3c
diff --git a/dev-perl/IO-HTML/IO-HTML-1.1.0.ebuild b/dev-perl/IO-HTML/IO-HTML-1.1.0.ebuild
deleted file mode 100644
index 19c6dbe52908..000000000000
--- a/dev-perl/IO-HTML/IO-HTML-1.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=CJM
-MODULE_VERSION=1.001
-inherit perl-module
-
-DESCRIPTION="Open an HTML file with automatic charset detection"
-
-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="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=virtual/perl-Encode-2.100.0
-	>=virtual/perl-Exporter-5.570.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	test? (
-		virtual/perl-Scalar-List-Utils
-		virtual/perl-File-Temp
-		>=virtual/perl-Test-Simple-0.880.0
-	)
-"
-# Scalar::Util
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/IO-HTML/Manifest b/dev-perl/IO-HTML/Manifest
index a2465cc3c9ca..882ee230b18e 100644
--- a/dev-perl/IO-HTML/Manifest
+++ b/dev-perl/IO-HTML/Manifest
@@ -1,5 +1,3 @@
-DIST IO-HTML-1.001.tar.gz 19375 BLAKE2B 252a9d0a0df72fb70e050c9742a13d7365cddee1a24c25dc86611a5eb0e473ee95681767f01e88002d8649018d570f1a97234360085bf9b6c902cc92044f4772 SHA512 fd3780c854e2e4003c80d2399987bbde2ebcc8f110915a74326660036d0860f79123f924c3200bcfa163363d74f53ca742bde973549e5a554e63648ed55dac52
 DIST IO-HTML-1.004.tar.gz 20927 BLAKE2B 633abc5d652bc5fddd8ff6d3b82e5048832bab084e3d8e5dfc3b99fc7221501b5147342bc4ead7b03b8c19a5ca2370deaae52fdafb1b860b7845f27873c629f7 SHA512 564fba7cfb50ef1cc78fa9e2b2200a20e305d098b8ceeb6f8478f0275cc48e4fb069386f5c318bc9deb43a5d590a78a995c04100bd440340f5c990eadc76a70f
-EBUILD IO-HTML-1.1.0.ebuild 799 BLAKE2B fa9fc92f7342ad96d91bee8a5e30e84bae28752f08465fcc8aa92c1a5ec77920148670b33043e3ecac4a81a0d31575a414ecfa16cd35714c6094f5d38936b3af SHA512 ce93f6a26e3dbd29291ec433a1b3a18fef078cabb6879172ea03dee22c5e8449fb4850c82a534e85a1ef4f88e9d4d6ad4d05d33f4aa93d5927af7202a1f55cc6
 EBUILD IO-HTML-1.4.0.ebuild 718 BLAKE2B dad842c5ada9799a80f5dd01ed04a02fb53e5277f7f359a6a5c74be32f8e8edbb243869ebc3e52d50558378fba315901e07e381c5636bc50e217cc1a2da4769f SHA512 375175e70d00edc8b9357ae1148ad2304cce23c48e7ba983db70bc33193e612b0392c1ad11e96cf0a288032179c49f974b3c5ac4d6cb71bcae88356cb89bc274
 MISC metadata.xml 375 BLAKE2B 92d0f7e921b54cbbf5d4f57e80e5cd2ef507065c3a815c25656fc3c9beca0f4a29cbb89382df282189faa0cdbeb06365438d89a2209191defc35c35bb97676c2 SHA512 aa41fdd936df34d7413cfb29d2e68d65c834e6e000833e59f46916d4d9731add6a0f8ec5213a9f045ae0241e61662ad3cd1b56798616ec69481406eb893c0130
diff --git a/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild b/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild
index 003108173925..fde61649f70a 100644
--- a/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild
+++ b/dev-perl/IO-SessionData/IO-SessionData-1.30.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Session data support module for SOAP::Lite"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/IO-SessionData/Manifest b/dev-perl/IO-SessionData/Manifest
index 1b6373b27d6d..f70a04a32d9e 100644
--- a/dev-perl/IO-SessionData/Manifest
+++ b/dev-perl/IO-SessionData/Manifest
@@ -1,3 +1,3 @@
 DIST IO-SessionData-1.03.tar.gz 5377 BLAKE2B ce17897159e8f0753abbbcf7d4bd19adfb20256f7c81257414db5b8edf1af0cc41636eaa7c8731aab69163210726ba5b2c9ce7c1fbfb64f7aab7a62cf9379cff SHA512 3fe6c9c275c64e4250933f6bc377172ed09d123b5aab3ac981b12b42c571be5638728bdd0d16438f973606da5b6a583aeaf6213008f249ccee7e275383eebd6e
-EBUILD IO-SessionData-1.30.0-r1.ebuild 377 BLAKE2B a2d099a869b9cc901783a45944973189ad179d69cab22ee0a51f1b10331d6790d72e4e793ade0a0eee042115f2c148a379a4675f6288310bdf0200b5a3f22b48 SHA512 c69ae53c3a2eaa92a3a1196c2359633affa7f12e46973982e0399b7796053b1fd77d0624c19c76a8d7309f1d92c7da895f72b4c7f5bfb7f45df3ab502d5c0308
+EBUILD IO-SessionData-1.30.0-r1.ebuild 376 BLAKE2B 523981609787f7db4cb7c09c29d343f17188b5f7849182d03c5d9f495468c6adaa41096045674e53e4b97ac53f82fb59eb825bec3541aeca0d9016dffc1e54c8 SHA512 e98f29ce430ced624cfb0d0a5092d3a427740b132bc9489e2ba60a2b0fc32c21641f5412560e0b13085f9ad364b92d1d343fdd4b5993228a2048cb19aa5ae5ce
 MISC metadata.xml 448 BLAKE2B 1f4618b0a655ebf367dc7db0a9dadf3d6069f0bf5117adfee09363438fa71e727b797d7b9c8cee2c2d6acf42f9c2d7f8696f4d6cda5c7991a174db312538b67d SHA512 bef2848a1ca084fb9af9b2a9b2b4928f546ae2b1f72c83b16830a7278114453ad382a70e32ee51742677f3b0b55435cf36eb10ae85ac0588774df87da13e8c0f
diff --git a/dev-perl/IO-stringy/IO-stringy-2.111.0.ebuild b/dev-perl/IO-stringy/IO-stringy-2.111.0.ebuild
deleted file mode 100644
index 66dd4814182f..000000000000
--- a/dev-perl/IO-stringy/IO-stringy-2.111.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DSKOLL
-MODULE_VERSION=2.111
-inherit perl-module
-
-DESCRIPTION="A Perl module for I/O on in-core objects like strings and arrays"
-
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/IO-stringy/Manifest b/dev-perl/IO-stringy/Manifest
index eac609303104..6cdfe0cdfcea 100644
--- a/dev-perl/IO-stringy/Manifest
+++ b/dev-perl/IO-stringy/Manifest
@@ -1,5 +1,3 @@
 DIST IO-Stringy-2.113.tar.gz 47755 BLAKE2B 50c35d93a3466d44854ab338812aca849521aceacb0e9568c54f9cf9e00286563292d9d0b7371d36640f59a016d4daef3407523e95464ec5d95bdc5283bb508d SHA512 5af104766c20b4336649dc4a19554ad204506c2476b4bf7d8ad7c2cfab15f0296efadb9019cd57e770a2a3c5f5686f7f010bddbd6efd51d300c54ca36286f094
-DIST IO-stringy-2.111.tar.gz 41515 BLAKE2B fc98766d2375a91f430397943be1462a2be8f1115f5c386da106b46cc2d20a09fbac5b3ed74f3ea509d51746281b3521e46e8610515ef1b3954c96aae7e30969 SHA512 9da8fb03945bc4a59cea3b3b2e22b15d56b133470e581d1cb03920bda2b4953e3c9e4a25d095ed8a384efb5a4c58db437c92cca6a81d583791191f1a37691a4a
-EBUILD IO-stringy-2.111.0.ebuild 520 BLAKE2B cb0324afc79c218403435fb7ddbcb3d577c810f7c6c7e6ca2860ae1b84c949e96bdf0135386a2e12d4c3cf4bef6ff242a9abede249fbe6b779d64481c403ffe0 SHA512 216d5effbc44e636576de9e3e0d16e6060821fd622a3e48c67717dac33451da28d48461c5029423f7972e83654a0f75d60d9d9a33ecfa0cb81896970eb8b27d6
 EBUILD IO-stringy-2.113.0.ebuild 455 BLAKE2B c2cde0e91518aa0a443ba21183dafade643a72c82485eaf21f7840d3ebaea39bb7ebb0740ad2ce8ad69a3bb97eaab128cdbb2f16fd3d9b80d5b74c14d4e98053 SHA512 3429012c7af33eafc14860d9de0397fe053821670dee24d8acfe1ecdb24dd185627aae5545aafdc31a7296e8dbf90f6cd53e34767180ab4e058936bbbb553227
 MISC metadata.xml 990 BLAKE2B 2f5ce182a0cdfdb5e92d659e84910d20387dfdbdfb34a7d30e8167e64ff2d411485a9cdcc8bd372b430ff147ca7f1b779d491eb0a62e1dcf234bcf2ce572c9ca SHA512 4ac361e5a4e8267697c69c89f4f9b239b8522a8d8a635144a5f2defa3cceef002c5bcf84ba430f3429db907e1bdec00ebed9f27ece9b805de153a42026ae6228
diff --git a/dev-perl/Inline-Files/Inline-Files-0.690.0.ebuild b/dev-perl/Inline-Files/Inline-Files-0.690.0.ebuild
deleted file mode 100644
index 0271a844640f..000000000000
--- a/dev-perl/Inline-Files/Inline-Files-0.690.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=AMBS
-MODULE_VERSION=0.69
-inherit perl-module
-
-DESCRIPTION="Multiple virtual files in a single file"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test )
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Inline-Files/Manifest b/dev-perl/Inline-Files/Manifest
index 95c3f6f81099..a1d2759d84bf 100644
--- a/dev-perl/Inline-Files/Manifest
+++ b/dev-perl/Inline-Files/Manifest
@@ -1,5 +1,3 @@
-DIST Inline-Files-0.69.tar.gz 14804 BLAKE2B 2f2f49b8832ebb8f8e7ac9567c7fdddfe742297c96095061f6daf2098f35e0ad28fd23a8c84b6f1fed7d7cf9337aca2282e8d614e54145c361e2494e828539fd SHA512 87b3d837a6d30eb344e7c80f866297558d3f1f8275d1e9fac0b9a1adfbee83f8452f686dcd39ce7c48bda50f1442b194822ee194da84464d076d2ac629ff289e
 DIST Inline-Files-0.71.tar.gz 15333 BLAKE2B c2bac14a9bac83d3272818b17d92a45372de79983254b42be3ad1c0417b88f2a6ef24c156659362b3c4eccdfd500515290e4cfef5d8e8e7e65c65f0288d96eac SHA512 19497c6f8d56158fa3165edc791ea6e1203be988687ebc068b235e7e71b9a99f15663d4923ef69854b6954141b53fbb524a02f55b66577c29a2c65a23ea15519
-EBUILD Inline-Files-0.690.0.ebuild 427 BLAKE2B f50445f38db3942bf8cb6dd4a2ab0d725abb4c139652f659725c129e735f15e97b8bba00751582bf836f91f14a5ae4fc893604b24df2c30cf45a9a977d157e50 SHA512 230f63cb3bf8b442a1635eb8525b896aa6ac85d5b2e70f6f268cf4ad08d3cc7c61559ea05e3dee82cfa990f9da7399c5e389464fe0f191347bd4b3691d052a5b
 EBUILD Inline-Files-0.710.0.ebuild 388 BLAKE2B df2b8ef756bf2e7bcf879bc4b17bf10998f909dbf8c2faec9612fe4bcf06019bbb8bf83c68be24654b2a78b87bc7b35e23befbfd5562cef39ca15bfb65f76df2 SHA512 11cbc2df32d323fc3cff6581b6d5f60da2aab0eaef74001e18161f4f1fb9568b5603b79778e7d2481c0f2e876dc2cc3a2d63097214ac8902943844b420c7d755
 MISC metadata.xml 532 BLAKE2B efc7564649262726bd8fee380726bf15f7e2fa5c33fa1f38281643d62183a5f393ae428ee6c64f6f7d28f4271e0e9e0483a0771d6305f2124bfc508a4f69c161 SHA512 d7b337597cd3cb1bf8f2fc090ec8b6f1157522f9c927f5b6493939ff863682fd8e850dcb5a30d680767e1caacbd0cce306545671777ab099e8325408eb0895f1
diff --git a/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild b/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
index ee28266aeaa6..e10ba6e98380 100644
--- a/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
+++ b/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Does your process have access to the web"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/LWP-Online/Manifest b/dev-perl/LWP-Online/Manifest
index 21056eddc9f9..b5e9a0ba7bf0 100644
--- a/dev-perl/LWP-Online/Manifest
+++ b/dev-perl/LWP-Online/Manifest
@@ -1,4 +1,4 @@
 AUX 1.08-no-network.patch 1029 BLAKE2B dcd74d51a01bdd61d7ac6ca89f9198c57141168907d51179fe7d4dfb461b3aaa725a0493e25ed807095bab5c7e0cc97b2ec5d49fc6afb01d924dcff1fec57e2f SHA512 1bedc7075021fcf7e8be1fbe972ce26f39af5ac2b46ccad96697ae05ac87f6bb8303e78c4c2b67f096ec22f39265a95ff5d86a64b13f9d364ae608593f0bc0a1
 DIST LWP-Online-1.08.tar.gz 32250 BLAKE2B 4696ef7d50498b5373bd52568afac5876aa7afbe41ca6fed0029274bc0b52e05b005179fa520a63c2e43e9ba78df0dc1e99a2011f4ff13915f2cad829e706064 SHA512 2b255f60ee6521757ce3d49cc0720e3985ff17e3db7b7868ced6a9e1c5444dc067c80b7d34dbe7be9679c134f3de1dbe0e9421a1a20ff388c812aacd1d964497
-EBUILD LWP-Online-1.80.0-r2.ebuild 902 BLAKE2B f8f210109833ddfeb2f176937064659ab8aab73df63671843a6a34f274dabf06ee17c9b1513e653aa00767b82b17fdc4a8ba21101cfa065f26b784f100370657 SHA512 18ca53c762ac0e230b79a515c15a71ab1c082e0e54499982a559a8f7cb10707a267752b74ee4e969ddc971e8e3eb66d35af116afea768a267566756370b25bd4
+EBUILD LWP-Online-1.80.0-r2.ebuild 901 BLAKE2B 9a88e4a2c659faa97b399a15117fa199e99f6296ca527d4310373f821639e316dae20ec8acca467d6b63d7071213b076cb181a240e089e6970b56bb357bb19b7 SHA512 47b05078411aa98a2e803755194dacfc312f69b7da9278d7a87dd225ca8f38985995a0a1bc720fce0de77dc2eca69a6fb3f2761aad7124ff7fa7080cef762dbc
 MISC metadata.xml 393 BLAKE2B ef6b85ce6111c5c4f669077f9db6a0b13ef8f2e5f2ffedae7fd03af402c772957361bbc750b28ec7f17d5dec835560fda6a67e6a0668beb7ad3d5237ff819da1 SHA512 09f55fe2808fa136115fbcde142b556bae3fa7449834e68fc4af2ef4a78efe81e879dfc04ab29498d6483b1f978b3424e86556982df08b99ac0dddfdb5f8a787
diff --git a/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild b/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild
index 1d21ebc7f19c..7c1d31297b42 100644
--- a/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild
+++ b/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A virtual browser that retries errors"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-perl/libwww-perl"
diff --git a/dev-perl/LWP-UserAgent-Determined/Manifest b/dev-perl/LWP-UserAgent-Determined/Manifest
index 67a3b865156b..835005d2ae0f 100644
--- a/dev-perl/LWP-UserAgent-Determined/Manifest
+++ b/dev-perl/LWP-UserAgent-Determined/Manifest
@@ -1,3 +1,3 @@
 DIST LWP-UserAgent-Determined-1.07.tar.gz 6822 BLAKE2B cf4afe4b535c82c70fdd30224a826c84ff47d98541181d4e2c299ffb6463917487995f7a98a67548f507ce6058ab6de6949009f5f0952582f1e5a3a76ade5253 SHA512 bed056468366bf86f0711a23c5bdb502a614efa2fd80d632f8d43d33295309d0ee88e439933cb3eda99192ad7d7025d0a7f6f0a53a45e79e70512771bb58ae7d
-EBUILD LWP-UserAgent-Determined-1.70.0.ebuild 399 BLAKE2B 762a881f459e8b2a1be4564473c902f052dbf68d6f20676eef53eed5346dbbf9e2975d5b27e4c7367621e8021a5f208bba7e19d6abdd0905a1396627dee9462b SHA512 592818d996822bdcc784a0c2dc395782b5c9c6d95d8df08fbe7eca9a0af7c38a627d6c95737f49edd5bdb9477739cecc6cc4497c05a5483b8d4336a0c1ea594a
+EBUILD LWP-UserAgent-Determined-1.70.0.ebuild 398 BLAKE2B 1e1479fdeb54b43f4c84d6c976b39fcdf1ab54657d25052e5b7e9b16801b5088ae97549cebfa6fcad9c17550a8eb939623a9546ab90baf0f0efc1f5e1dda775e SHA512 20669cbe8e9f4d62fd12df538f2f9005ca04862426a04b739b7ec92ca884bb7d9ead4aa9f68327e2e14664f301a46836224a06ee271e3ae55f98242e0b62555c
 MISC metadata.xml 422 BLAKE2B 86310900f1111cc38135dbeec69e6ddccd7c5dae1e4bea8ccb819c1d3d2e9e263ffc2c94fe8e8387690ccac4980ef7a77e3ee3873ee1a6b7cd6c27ceea22626f SHA512 29855f738d37aa4cd016dbb71c77a4e793e44e13feeb857decfd48e202e5e8070467384cd3443ab185d7231e238bc601f3deffdd587254e338405c78eedb573b
diff --git a/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r2.ebuild b/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r2.ebuild
index c35d631cd406..ed350060885a 100644
--- a/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r2.ebuild
+++ b/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Pick a language based on user's preferences"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2+ )"
-KEYWORDS="amd64 ~arm arm64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-perl/Log-TraceMessages"
 BDEPEND="${RDEPEND}"
diff --git a/dev-perl/Lingua-Preferred/Manifest b/dev-perl/Lingua-Preferred/Manifest
index 2bba546d8cee..a2cb7e00b88e 100644
--- a/dev-perl/Lingua-Preferred/Manifest
+++ b/dev-perl/Lingua-Preferred/Manifest
@@ -1,3 +1,3 @@
 DIST Lingua-Preferred-0.2.4.tar.gz 6029 BLAKE2B d13dd3fb6dead2943ba15efcabb62fe7b1004b3dde7a5a7e0fe9ff1bed0e9d617b9f365bdc130278e255ba7ce2d774f8f64f7a14f8df6251cd0736728cfe7fcb SHA512 6946b2b8d5978c516688a63bd2126700f8ab0137d51959f0b8c2565c08f25d20dc3fe5f81c6473c3ef5d1faf94a6bd4510959f730cc104b61671bd9436de6353
-EBUILD Lingua-Preferred-0.2.4-r2.ebuild 373 BLAKE2B 4f667f76b88eebcac7cf4097778bc5c1dadb7a6ecaf3bc3f16a13f019b6f8ea90f5c433bc2fd13911bf340cd5a413888fb7c85be3b903d92f4c6c1608b44c6a6 SHA512 9c538dcc96d4ac36454a40ccc8963ab6b1f7bee6c1221387c2008a4382f1f982c7ab558b6492c96947c925ddfb8ab63cedc38bd623ac40937664926f401aca6c
+EBUILD Lingua-Preferred-0.2.4-r2.ebuild 372 BLAKE2B a85e2ca9d7838a363e0603c63fb63073a578356a29fb9df2d9862b69e869400f3c4f3b4a94216d86ef7e6fb5a676da3f34e5cd7d14ede58fc4ccd93e7543e693 SHA512 34d9a39b50053c2d27dc2ca6543ff99888e72e9df4d975b68a47fe709e76b7b685da3b63fab4a97da57ebae5299f2d5a9a5eecc0cbcb838b233a0dd402843910
 MISC metadata.xml 405 BLAKE2B 63b8180aeb1c0e5438a8880d6554f261b87ab1fe8b0ffae13de7313d09f2cb7ac5a3900b6ce3d07bcf196b408a7def1e5ee0b196e02cee666523c6b51a2aac0a SHA512 8555ab2b944a5363aa08e98e588e7bc25c28d2fa759c6000ee2628c94575d986796dcf7c9cc72f3f235c10d8d0083d467e113dccffbacc8b5c28c1ff651e9ff2
diff --git a/dev-perl/Linux-Smaps/Linux-Smaps-0.140.0.ebuild b/dev-perl/Linux-Smaps/Linux-Smaps-0.140.0.ebuild
index 9ee74b169425..e2a454affa0e 100644
--- a/dev-perl/Linux-Smaps/Linux-Smaps-0.140.0.ebuild
+++ b/dev-perl/Linux-Smaps/Linux-Smaps-0.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module linux-info
 DESCRIPTION="Perl interface to /proc/PID/smaps"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Linux-Smaps/Manifest b/dev-perl/Linux-Smaps/Manifest
index 67bf77e4881f..d895da378ba6 100644
--- a/dev-perl/Linux-Smaps/Manifest
+++ b/dev-perl/Linux-Smaps/Manifest
@@ -1,3 +1,3 @@
 DIST Linux-Smaps-0.14.tar.gz 20760 BLAKE2B 68bb60ff063cd147292028ba28b0e057358bbaf1d0c734bafffde878e4d8e37b8e9b40303a3dc6824d8521aaafa2e5b95142f46a8526bfc96ce6bf54252b7419 SHA512 0a9e7ea770820bc99436e0eb7410ab2b77e201a8980210d69a85c8b6cc5c4be4bef8ef7ce9da56c9d1478e7dd763fb287ea8fff4d6945c09de0a0fd304181eab
-EBUILD Linux-Smaps-0.140.0.ebuild 488 BLAKE2B d6ae391a1c8a735f4cf574291109c5a7fdb6750de4d0d605920da6bc5a9c7d865b6eb780ab2b52b8fa4c8935978f99c770c1de2abef400b89951e21e3feca345 SHA512 ea509c7fcd95fb8421696a41de0ab8622f520dbc674b5e1fe0d31d8fb4ea662c27d4029e74c9be3aa276bbbbfca0287ccf76106cc337db5ab1bca7c53f09c6f2
+EBUILD Linux-Smaps-0.140.0.ebuild 486 BLAKE2B 839f964288e9673c8ce5b25d00fe6c790dc9a4b01847fdca901e56063e74a600fbc665781e1312fd95a233f151b3db82cbe39da67d50e78b3f5c8287ea2b8ed9 SHA512 9641ced31c8ccd057af524af5c63cca0a925fa5d1de9d8a2e693be1234f48a2df1526340fd54c02e5d041c3c4582da2a7d73d51e5d94f5d6e083c71f0df18b11
 MISC metadata.xml 459 BLAKE2B 7f2eb41770f3ce635a6c5f19e3dec8ff51214c40ef0488e2909714a3dee5b583372bd296558be4c1342ed29ba0d682edd54038b21ae192a773741c1a178e7369 SHA512 3903894415448be71492299ecd37c8ba68ab25f052281e898b19c0fcd47cd69fd78c67ebbfd10257d6cf532ec9935d8294334d7a655a43c456f5bba1e14425fc
diff --git a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.430.0.ebuild b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.430.0.ebuild
index d374a9a0f9c1..f9e2084e1c24 100644
--- a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.430.0.ebuild
+++ b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.430.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Compiled List::MoreUtils functions"
 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"
 
 # See XS.pm/LICENSE
 LICENSE="Apache-2.0 || ( Artistic GPL-1+ )"
diff --git a/dev-perl/List-MoreUtils-XS/Manifest b/dev-perl/List-MoreUtils-XS/Manifest
index 230e4ccb32ab..00dcc7aeab85 100644
--- a/dev-perl/List-MoreUtils-XS/Manifest
+++ b/dev-perl/List-MoreUtils-XS/Manifest
@@ -1,5 +1,5 @@
 DIST List-MoreUtils-XS-0.428.tar.gz 159642 BLAKE2B e3f41c4baf14ba54bce0424e818baa603f11804e83e96a9afd61b0f80d3c207f0a45cec8ff61059b70a79abc631d0e074c6654ce6d99e4ad834b40ded21aacb2 SHA512 a608568e3c4a2e160e4f9afa26640be5b97ec83e301a6b81849e37951698b9423c0a969d7e8797a49b4fb6c5123780630a3726c64713922b90b21b947682c3dd
 DIST List-MoreUtils-XS-0.430.tar.gz 163827 BLAKE2B b5f3ecd788d3accf4b3f344da96fba8a5c5c24ba73f292c180932d16b0b95bb02104815b6bfe407df3cee8f96338b2b73600e458dbc02041217b06e9af5c39cd SHA512 98260b81f03a425bf8c2e0b63bc3a8d360a0aa2e198b2b7faaeaa48684936183018afdd1e6a04bd7e99a7e728d809709c6206ea578dfe7d8d40c5a4e3e4bb405
 EBUILD List-MoreUtils-XS-0.428.0.ebuild 851 BLAKE2B 70c7cbbbedd99c7d21758ac70037e463abd897bfbe9e4f2441b654ad52eaf0206a8faafd8109735df95fc9a4bba1f2caca45bceef07978ad8efe94fa160d5f15 SHA512 fc7182fe8bbff16f124794af7186c1ce7224f17e610000b60274876328a9174983c386f99a9f241270abdc7a0f21af6b982601558c861377b217796873750026
-EBUILD List-MoreUtils-XS-0.430.0.ebuild 854 BLAKE2B ee551e385b20568b9bb39057ffcb5e70fb96bfb8c460ca1ab9ecccc15daf0666b99d4cf499ff7a8a7a30f54b547abee6fa93006bc19567dd581df828c965c44a SHA512 252a6a63a887d2292f248c0b2a93a5cb27e6824e2048177d88f9b1532d3987601e9d08ab6c79d321c859cc6c71fbe3d3fd728750b0431cedffc0b206df58c7b9
+EBUILD List-MoreUtils-XS-0.430.0.ebuild 852 BLAKE2B 8da7747ddc8a61a5687d14572dc3e1c0c96f8f5e47a079b04f0a6b8bec3d724b1b36147f4ac627491ac3e1ae0646d539cf46ca4490ef2d7de5ae7aa269c09ae3 SHA512 0f6be3b1cdc29ba5e325c71724acf0687538df1eb03b388f691ed5b2ffe1910872192ecea4c06b57e5d32c279c51a7883ed99261e6616456eaa0db94c60ab6cf
 MISC metadata.xml 408 BLAKE2B 1eff96e502bbeb08734e1e5e6961aad0caead490a96bcea0a0423bbd5f2ac33cc2cbdb66dba1036e5e1f61f97788711f4b4d299839b01a6f68108175e6a2176e SHA512 46292b6a434efc7871fb21a02f9a8ffaf56f2443ada33bc033fbc4aff09b5c068453aefb868ed9fbbb50485d002414cd9804298e02ee4abe108bb4d431d6e579
diff --git a/dev-perl/Locale-Maketext-Lexicon/Locale-Maketext-Lexicon-1.0.0-r1.ebuild b/dev-perl/Locale-Maketext-Lexicon/Locale-Maketext-Lexicon-1.0.0-r1.ebuild
index 8f241d77d757..742e8abbd7de 100644
--- a/dev-perl/Locale-Maketext-Lexicon/Locale-Maketext-Lexicon-1.0.0-r1.ebuild
+++ b/dev-perl/Locale-Maketext-Lexicon/Locale-Maketext-Lexicon-1.0.0-r1.ebuild
@@ -24,3 +24,6 @@ BDEPEND="${RDEPEND}
 "
 
 PERL_RM_FILES=( t/91-pod_test.t t/release-pod-syntax.t t/release-eol.t )
+
+# parallel testing is broken
+DIST_TEST=do
diff --git a/dev-perl/Locale-Maketext-Lexicon/Manifest b/dev-perl/Locale-Maketext-Lexicon/Manifest
index 65e44a91faf3..f917bda9c473 100644
--- a/dev-perl/Locale-Maketext-Lexicon/Manifest
+++ b/dev-perl/Locale-Maketext-Lexicon/Manifest
@@ -1,3 +1,3 @@
 DIST Locale-Maketext-Lexicon-1.00.tar.gz 92130 BLAKE2B 5b36e613179e93eee546b5ce0d567dfa2f7aae845198215f40d56f2a2d2282dc8d4702fde3acf4a8ff0f90d1e35d1477cf856933d7544b75929b178aeed5c1d5 SHA512 b16a4296048aa77809780f6f55e944a67ce3287708bff4fc88d8ee487a6493580a7129a740ee65c6c74fa27e4343964fa8a5269f66fffc308354e723ed4afa60
-EBUILD Locale-Maketext-Lexicon-1.0.0-r1.ebuild 666 BLAKE2B 817104bc1e6331d7062c884b16b040166fd0650550b02b5f3154569e532f7713c3815515b050c21157b4f0f66cc3fa7cb05ba40b7fbfb4d010689479055ee32b SHA512 a53b82cbea62911d0594fe4a602f9272bf36ba6c79bee2cd8420a3bac21585b7730c4571450fa8767bef7b1b23e3c801b23a15935a45e1ab2b2d5633786678e1
+EBUILD Locale-Maketext-Lexicon-1.0.0-r1.ebuild 709 BLAKE2B 9617df9ce2d46ba54ff52b96e698dc0697aa010a228a11225915a7531a775b8857d467bb4b0f8392e7a28f32a03fb2b33527edd3db5ba1dfa13ff17e8df5dcfc SHA512 5fe5bbe7836e9939c73785b02551ff5690251519742036d01034b8d10b924bf4b0a4edc8f94803ca949996f669292c7da807932674f052cd73bcafa642d6fcd4
 MISC metadata.xml 2159 BLAKE2B 8563541db4bb4292c34da15258c9f51f42fe8bf6a54ef28fcc418af081b0f80678fb90c7a5e490af53433d7aa2272f03a6425b832f4b03efe0701b53adb66c11 SHA512 5f394e15948e9b141b26741fb8e638df7ebe045bd073c8774885db1a63a12f604271bf7544403a30e80cd1cbe1555ce4356d3051142618094edb72bbd54b0466
diff --git a/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r2.ebuild b/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r2.ebuild
index 6ddf25873e34..6ce85324ce3e 100644
--- a/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r2.ebuild
+++ b/dev-perl/Log-TraceMessages/Log-TraceMessages-1.400.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Logging/debugging aid"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-perl/HTML-FromText-1.4.0
diff --git a/dev-perl/Log-TraceMessages/Manifest b/dev-perl/Log-TraceMessages/Manifest
index 87a03d9c8388..b822d2c85356 100644
--- a/dev-perl/Log-TraceMessages/Manifest
+++ b/dev-perl/Log-TraceMessages/Manifest
@@ -1,4 +1,4 @@
 AUX Log-TraceMessages-1.400.0-posix-tmpnam.patch 2424 BLAKE2B 23edfdadd5a9652fd6a3d7abacdc5231fe8c85c2bc9a1b0fc6a7693515785fd37574a1fd4009bc234ae403775365a376ba16b0c0f212f1c26f465977800d9725 SHA512 307c6b54a1717664463c7295ea24d5b25bf3ceea0e83b7f6baf74478f273fb23e39b208257f694f2c0786629c1dc7af616a4db3fc40681c133fd4c9a9a888055
 DIST Log-TraceMessages-1.4.tar.gz 5437 BLAKE2B dcce3d5a80ece9fa24d1110c024a02c14eae99d2c7d596ea4a41355317729d12322d677a567f282c35faf0216f14c0a6154e82bbc97da5539689d5ddab1e203c SHA512 ccd298f7ecc0cb7e478812dbbe20b870baa2f87f19b8adfa003818d70e1118f7a3f59a7f50898ac22751d2dc4b96fe9bd1282b30b72cce7334e645b593a01aae
-EBUILD Log-TraceMessages-1.400.0-r2.ebuild 391 BLAKE2B cd4c15c6a31d590d65d6a6ba2ffe0ee4b4c32cfd04247b9659ef3b213eb6fe3c1c6ebfabbfed590e1f5d273eab81e74dcdfea6563ca6b961e83492a8401e169c SHA512 324cd239170897b5103d8bb8807da8ff1f730736d7d6f93d1c71d90ad190044ca4547c79ba8815fd669c0fa8bd0a87582648ac86caca6bf64407d45fb350ae11
+EBUILD Log-TraceMessages-1.400.0-r2.ebuild 390 BLAKE2B 8addf0728b7db27f2d52429672df3116b75069233c6b0e3c1862e089a32900f56f0e18f2615eb966e2b47b64a479ebc86c99e8b71acb384d697ba87eaff65e82 SHA512 fdba14d66bd799f7c4508dd94f19daf5f151f8ccc67d767573504b897e95fa26de57ce508a5e347d5dc2d8ccd8de7a01bee0c7710fc379f298b4622e2cd2b62a
 MISC metadata.xml 407 BLAKE2B 2ab20e28fec6889cd104ee5cecf6dc3d84e887785c7d9e0039bd8b6fd9b50a775b5435dcf0c412d3b51beee229abc916fc35521774268d6482bd6057ae8629cb SHA512 2167d10d8833290ec4b52af030fc2d5cc363492e2e19df73bd65a1769282118e0658450a288504e35b34c5432ce3d2d254eb49c874cb6c612d741359404d12dd
diff --git a/dev-perl/Mail-AuthenticationResults/Mail-AuthenticationResults-2.202.101.120.ebuild b/dev-perl/Mail-AuthenticationResults/Mail-AuthenticationResults-2.202.101.120.ebuild
index 7f1d44832d0b..1fa3a6b5bfbc 100644
--- a/dev-perl/Mail-AuthenticationResults/Mail-AuthenticationResults-2.202.101.120.ebuild
+++ b/dev-perl/Mail-AuthenticationResults/Mail-AuthenticationResults-2.202.101.120.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Object Oriented Authentication-Results Headers"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Mail-AuthenticationResults/Manifest b/dev-perl/Mail-AuthenticationResults/Manifest
index ffd17443c041..ab1cbb29ec28 100644
--- a/dev-perl/Mail-AuthenticationResults/Manifest
+++ b/dev-perl/Mail-AuthenticationResults/Manifest
@@ -1,3 +1,3 @@
 DIST Mail-AuthenticationResults-2.20210112.tar.gz 30919 BLAKE2B a75feb4f72a5ea0415bda1aa1bb39b4a0bf9979a3863458649cb07e9cfe2e8ad258984aee8a4b7fa18924b46a188b27eaf56fe2c8ca1503d86c6c908e5c0910f SHA512 2168e8761947008670840ac1b534e2c374399120197d907b8d5c654bcb00baa5f7075caffa00a06eac5628a7583d96aeb9f077a1103266ad774aaff05f8f0130
-EBUILD Mail-AuthenticationResults-2.202.101.120.ebuild 500 BLAKE2B fce5dc5ea321c180d30d1d452d311a44b8bb50ae2f9f4b12ed7a3818361f87501b3f68da497d3f740e49761a841c36311da2ca47d7a8568ad338be04d4d46a1a SHA512 1bea7cb6add20b9be9c8c5ee1a63c70974c933990c22669ad4bfd038e9c71e50baae8f47764e004d7b05c6d0a3069f03f9f6e466abdce83062c1465c3647bd08
+EBUILD Mail-AuthenticationResults-2.202.101.120.ebuild 493 BLAKE2B 944bffedce029d8efc2325c287fbcf45f0b431ca5e2bbfe212774e21a2a15e3677d42ac224cfe05c45084c6d24ea0593610dc525fe2a164dd7c9e3a0af6a165b SHA512 6021732b881635c862fb4e5b1218bf644c86f8ae77c79ff8bb41e08218e420c2f4f7a54aac691d3f0108989b7a75fd1e2b0aa69e4e563aa834c838c7cf72b2c0
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/Mail-DKIM/Mail-DKIM-1.202.9.070.ebuild b/dev-perl/Mail-DKIM/Mail-DKIM-1.202.9.070.ebuild
index cfcb8b3e383c..fa859bdeb368 100644
--- a/dev-perl/Mail-DKIM/Mail-DKIM-1.202.9.070.ebuild
+++ b/dev-perl/Mail-DKIM/Mail-DKIM-1.202.9.070.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Signs/verifies Internet mail using DKIM message signatures"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Mail-DKIM/Manifest b/dev-perl/Mail-DKIM/Manifest
index 4c5d419f40bf..de49b6652ce2 100644
--- a/dev-perl/Mail-DKIM/Manifest
+++ b/dev-perl/Mail-DKIM/Manifest
@@ -1,5 +1,5 @@
 DIST Mail-DKIM-0.44.tar.gz 155301 BLAKE2B b64877870cb2a51dedd0bba65aaae96379b5477e2d22c6e1e5165badeddbd83eb70df8ecb183730060ba7131d527bc4382519fd6965a290fe35947a1f424fe19 SHA512 08501de43ce775454e90b18e95a5320fc590c82a14e8828f53510163bc73d7e82aaad35e6d79b7fd888b45aacc56bd422151c3c2b6e1e6db80a7ca62b2a469c3
 DIST Mail-DKIM-1.20200907.tar.gz 177877 BLAKE2B a71da80038e9abc8056fb248f7c6da76fdd98427bc18fc1d3c4bdba73dde4a683db10a1b1b61bedf03adbcf349c4be9e82e29b13adaa02007db5b7422ffc27f1 SHA512 1bfdd97ca49abfd3ae6f13bc8ede8706531801e078351ac41a3a6172b9e65249d247e38a95c53eb60781b5f38b971a5acf9c8b98948e9c4d7a427a525ee231cb
 EBUILD Mail-DKIM-0.440.0.ebuild 1006 BLAKE2B bcfe4d2ef16fb8ff42250cdbe3f75f24eb5e8a1296636f3b842e55c39d0a9a57098539e60ce08e7fe638777b1e4da5e6736ac4188d79371fa6b4dcddbf66ef0d SHA512 ff389ab7c1a819cc7af0bd5bb3ab15631b5973ce774dc32120c3b603115e9139bd31810eab67e5eed4caa231a196b41a821ddedc2534887d48845c805e6efe6d
-EBUILD Mail-DKIM-1.202.9.070.ebuild 1053 BLAKE2B a354ed5b779bde0a11f1b9368f208b5268ed99fbee49e241a015f4d387fb4619ca6f68977a47706512250ddad11d64428a5aef6a28aaa513708bb453611cfcd5 SHA512 cdba6871789155e73459e412c34e459e1f6681fae9b1844c8aa0a73166372808dff20ef91ed9c1f8da84994d1f31fae6b38802c0cde75d649194505c7ea5a4ed
+EBUILD Mail-DKIM-1.202.9.070.ebuild 1046 BLAKE2B 8b0ed7c1a40204a6af546a6f1caba28e67fc4535e04a6cc35345829d36e3da47b2cd01faa2dc7f509ab0f6ccaad300d046e9fcca175b73a0739598498d814473 SHA512 40a06bbca635c7633e83533ebd64b0f14cc90e029245a6552136bf472b1485e7cc62dfa86df8abbce90cf0948eca3a2fcbbe3aa2c98c8eef431c532a81a260a2
 MISC metadata.xml 2903 BLAKE2B 00068bb3935dcc5fadec99b748367ec58136406681b15a917fb33d5a3824d5cfb68c72ba2ce7c71ce32ae0a88481d97bbaad6e5ca1219ab3288d54330b4452c7 SHA512 9bc389bb1b36f46bf1e3ff7f2523b87ac3998b0c76e83270bae2550f64629288680a13746c4a4bbf699f920f533c944bfb4c95ace006bc32dfd48e7dc5c4d5dd
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 0edea8b00a31..ce391aa67d4a 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Mouse/Manifest b/dev-perl/Mouse/Manifest
index 76dbc5c0a1fc..4c7bba53f61f 100644
--- a/dev-perl/Mouse/Manifest
+++ b/dev-perl/Mouse/Manifest
@@ -1,6 +1,5 @@
 DIST Mouse-v2.4.10.tar.gz 222745 BLAKE2B 3d0f5d3c6f9183f67db24ec9859bd945080bf5f9f9aa370dfb6803a6d32e7e01e589540d24bdc0a0fe338a08d9f89845bd8ef060d381717ec709877de066f2c5 SHA512 57d797bed24ccea66307d95395bb7d5dd860c0bc41e25a7701cf5a16fdf28776dc7633a6b8bbb1bcf6684b930385da71bf2d44f777a211988a500e30bdf8e9e5
 DIST Mouse-v2.5.10.tar.gz 220349 BLAKE2B beeb21bac24f3a89b3850e8d6b720dccce2142dd32b03a0235f57bc93de76cb5b277d1a38a50e219c0bf9c8924557c7c85d659ce9453f0211c939d0efb78ea37 SHA512 949a2f18257a5afcf4dbbb84094974f4d80e1e4531b4b9d8618cf141252fd11b09b79daafe1de79faa620905988f649627bc2fceac357ea2f180db74cd48f711
 EBUILD Mouse-2.4.10-r1.ebuild 1062 BLAKE2B 7e43f82c5c8375371056bf4c29e13be2508cbb2ac7e0f726b71273fd29c96c3c33c7d2f93da298aaf4838523f957b5aff005d81b8dccff47f7df488f666bc8c0 SHA512 91b5e7f8d4d02d78b1e98135231decf41286af3ddda263b8a3aafa00fbf0e8fd236a7e05b29e78784f1b67a1a3e3e88e349e051cdd8e90adcbb4ba0726226477
-EBUILD Mouse-2.4.10.ebuild 787 BLAKE2B 7957948f8ce74034424c498bb9fc594473c02ce04b2f4f80e9a664e38120b3008bc7f9fb13b921ea95ea0797de93ca55545b8f9180841110d5cdaffa1a9a51df SHA512 488599a620a603448ddcfa40012807c976fb812fc804ab2c1bc20c4a2db2ec0551fa8e70ff04664d0626d69037d3045490384a658a1535b350e38de7d36db478
 EBUILD Mouse-2.5.10.ebuild 1011 BLAKE2B cf89ab4b8ddcd271e00aef65ffb3782b78eb9dc9011e7214bdf9c1d06ec9ebde9c3fd8606536381dc5227dac48bfebc9ac4e6f4aecda3ea8a79993e491b2be86 SHA512 8bf9c5f5841bb8021a126e90afbc53276077e78170ee2375162382e3818594202c09672650b8a1ed94782ad6794e1854526c06af2b61f86a63f5ee6d780de07e
 MISC metadata.xml 2263 BLAKE2B 125a9173f0ef445c3eda10ec00071cfe7904de605c06a57a7a4e5827abf4cafd1183f74c8882d543234c618085046cd0ae1feba582604bda8d425a448c046b6d SHA512 b6177488e3242896aa9d0ec8f3f0fa9f92c1a12ed1802c983669dbd74d6812947963256c362b5e876984280049341b53b87ca492148e8e44fda6d4ef87498a5f
diff --git a/dev-perl/Mouse/Mouse-2.4.10.ebuild b/dev-perl/Mouse/Mouse-2.4.10.ebuild
deleted file mode 100644
index 778702098abc..000000000000
--- a/dev-perl/Mouse/Mouse-2.4.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=GFUJI
-DIST_VERSION=v2.4.10
-DIST_EXAMPLES=("example/*" "benchmarks")
-inherit perl-module
-
-DESCRIPTION="Moose minus the antlers"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-Scalar-List-Utils-1.140.0
-	>=virtual/perl-XSLoader-0.20.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-ParseXS-3.220.0
-	>=virtual/perl-Devel-PPPort-3.220.0
-	>=dev-perl/Module-Build-0.400.500
-	dev-perl/Module-Build-XSUtil
-	test? (
-		dev-perl/Test-Exception
-		dev-perl/Test-Fatal
-		dev-perl/Test-LeakTrace
-		>=virtual/perl-Test-Simple-0.880.0
-		dev-perl/Test-Output
-		dev-perl/Test-Requires
-		dev-perl/Try-Tiny
-	)
-"
diff --git a/dev-perl/Net-Domain-TLD/Manifest b/dev-perl/Net-Domain-TLD/Manifest
index d4299a584737..58f29e8b34b3 100644
--- a/dev-perl/Net-Domain-TLD/Manifest
+++ b/dev-perl/Net-Domain-TLD/Manifest
@@ -1,3 +1,3 @@
 DIST Net-Domain-TLD-1.75.tar.gz 39719 BLAKE2B c6b68374e7d738d4bb73e0a59e291c9adb612b8c1d3ae25db29563e5ff9566757a1fddeaf5a3973cff4f4d890d0038d56f78c267aaf19eb91e6a2e1fde300123 SHA512 88b090f427e7fccd8394059b643f260a83fe9ec3fd6741972ec388325bb8c178d9d89fc8da9b1338441972e6744117c4effe3551c2c3f95d52022496667fa4f1
-EBUILD Net-Domain-TLD-1.750.0-r1.ebuild 540 BLAKE2B 9c7980d5393d3256c08d74bf671034a051e6007f550b9c68fc4663248bdd80093b7a9107451a81da3d76e039615385b9725c3a2d041f6791121f948d6aefdd36 SHA512 f47ec4578f9c9fb25c07b32a30f6c9e7dce86be1610001f0eb69b1c68bddeeb20020c66d0a500137110cd9507198a113e88169344d1c4384dd4ecf9d22a175d3
+EBUILD Net-Domain-TLD-1.750.0-r1.ebuild 539 BLAKE2B f2c76f3d001de74f36d5870112dfe6db3c86d0e4acbaee01c53f7a183d8f93502fedcda0460a03c228c458f172812df2ee1737ad7c85694f40485ef1b3c6e7a3 SHA512 e5578a95176b47cff4eb27d9e9f65b47afaeeb71cc528a5413d51b20eb7c5301b21cb21746497a78a08401cf6a86e6d2bb8635b746cb99ce03c5c53352aa501f
 MISC metadata.xml 402 BLAKE2B a7552fef84574ab6e4d9cb95d3c43e61039406b62806f53fe3154d89b93884c634489d4044eb0272c5ca1aab4137f3d196ab7b4e5602c8e47414cf42a26a1016 SHA512 a681f60b8101ee06402e1fd59f1a127625be3576a60088d360a385315a3c986771d0528eff8ccdff83ba22130d2c72b99bbdfd8b6ed2929345f90d019e15974b
diff --git a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0-r1.ebuild b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0-r1.ebuild
index 3b13c32196d2..f1b0c668d5c3 100644
--- a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0-r1.ebuild
+++ b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Current top level domain names including new ICANN additions and ccTLDs"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Net-Jabber/Manifest b/dev-perl/Net-Jabber/Manifest
index 259350b40e47..ffa0e4546d56 100644
--- a/dev-perl/Net-Jabber/Manifest
+++ b/dev-perl/Net-Jabber/Manifest
@@ -1,5 +1,5 @@
 AUX Net-Jabber-2.0-hash.patch 680 BLAKE2B 869fabdc2d107a8a64d606d2ba4d712fa334bae08b0a32760263b4ee2be7427e51ee0204b6736b44461c56e2d39932656aa3c5ac2491bf957d1bdcb00690889c SHA512 55500cd592d028f3ae211ec441ebb246265bb25d1a34122afcd14bf5b5aee93aad1d07e5b7a787f4d2a717058d95bd41ad5add930c69e3aa9e4bcc7a3bbcf3ee
 AUX Net-Jabber-2.0-no-dot-inc.patch 18091 BLAKE2B c22754f61e5467d0a1464181d529cf3cb57f28e3f2ffff071b8b3a7b71087204e996dbde35087998f04130744b525463ec67bd436b62302e5c64893e9aabec51 SHA512 8c31a256e6c8d638f7f01d8490a2c3c5ea813d55aece342317b114ceaf0c3b5a27779002483005f3d37efe2c95ade2c59f7fb894d5991bf38cabd660efe290a1
 DIST Net-Jabber-2.0.tar.gz 112416 BLAKE2B c8cd86949a934650464ce8dc4e5eb5c12bdd0323caf18773a73df31f72ee6a185d963e43ade22c15d5f7da73f0c5a52ab2e67da478157d7829ab2aa83610fe47 SHA512 2ad275fdef8a7ed17dc464f692b974e71bc3a5df5239943cceaec9509e6454945023e220ddfb42763e18813124f6b7f2d6d43faf3059e0680b753486961a1b4c
-EBUILD Net-Jabber-2.0.0-r2.ebuild 501 BLAKE2B e6cd27acc4ad3d83b72cd2342506141b463ea15e9c90113b32be7ec5099bcd7327033c5167a395d4041fdb1b3406e9046aed98fee305a49183693a06aeb62866 SHA512 51462f720ea4c8b3c3d9a70e3fa6e4451a0fc48e79f6422c605832d8be50178e3d1ec72b5e013806c64d5ff3dc73493387c4d54a945109588ac759cab93fddb1
+EBUILD Net-Jabber-2.0.0-r2.ebuild 500 BLAKE2B 62646234222e26b02efe815dd0d00002975c67918371142fe35ac9d2c32f976a4fdab070578cae48e4775f04ee1bc07bb50c4c80aeba2cba7148d7c6985dedc9 SHA512 dec64544582daeecb2c6a6e6efa44069d49778783507f010608524186298c0f24e12bcc3718127bdb9ab2f200e6f03fec7aec0d0e7aa972fe562ecbe7cbd3254
 MISC metadata.xml 1596 BLAKE2B a49065d37b3b179b0dedb52ae855ec3cde0ad72c1c94305cbbd047f8d228a6a5e8c6e4500602a152c12dccb9bd8184d2752c893753eea2c55eb2a233df907a8e SHA512 c37b042251121c80bdbc6d633606f1a79371046f7e358b720e970816ec3cb53f0a37496da95c3105b56a5eae5ec91e9cc192370b39155830c5e4d7eefdf839f4
diff --git a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r2.ebuild b/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r2.ebuild
index ed15d599fd18..c3d70133dde9 100644
--- a/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r2.ebuild
+++ b/dev-perl/Net-Jabber/Net-Jabber-2.0.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Jabber Perl library"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Net-Netmask/Manifest b/dev-perl/Net-Netmask/Manifest
index c3c99079df94..4c1264b521fd 100644
--- a/dev-perl/Net-Netmask/Manifest
+++ b/dev-perl/Net-Netmask/Manifest
@@ -1,5 +1,3 @@
-DIST Net-Netmask-1.9022.tar.gz 19044 BLAKE2B 1e100feab51d36e67a8fedb9aaa64e36c15a7eda05b0c33679ca15834a78814d9acb3acf177635c7f489136d07e874d430790aa7fee7f5f723666389111f94f3 SHA512 85778356c0eb5047a1f8ce9883fe61dec4f54180571eefff0d08a723f6f8f828b5c6a52015de751bc13fc340275a5bc220668a37086bc4a62f164ed93f6e087f
 DIST Net-Netmask-2.0001.tar.gz 44676 BLAKE2B de1aecb20b9d1230312e84ab4ce4fce2b588905158da1a69d8497018a2e9024a87ec7da5dcc422ff96dfb5690a73082acb39860d2fa733ac7779ccc27905b1b5 SHA512 87f4f875dc1f07968a71d558bb02b8443d63601e8414a109ddfdd47c5d8616ed0678ea950426ec646bf3b06035ff1dabf067dafb18cb66291b882b9364c0de0b
-EBUILD Net-Netmask-1.902.200.ebuild 384 BLAKE2B f195fc77877bf0215fd21ba9162e040aa808c7cc29ee28089c2219528803e57b2c6d62c3556d84d573c2e2a6af8a0425348ef6e75ed1343ccc1576c0014408b9 SHA512 06036b9893a787b9969a418accb0d57d981e50fa5db6c469dda2011f2990123d00141897f4f080235f0e198b0070fabd942dc545b9c716497b95bf7aeeb380c3
 EBUILD Net-Netmask-2.0.100.ebuild 618 BLAKE2B a305006020f4d141e0404293487f334f6a0f9335f1a39cd2e44bc61968a81926e94f34430dff0e3f4e77903bdd17b69d761c526c1f46de558f2cb45d956a8f64 SHA512 0300fed2c29027c2e3928c67cebf2732775218b9d5e10d10b0147a8d3c920d8a80c19f7ed4aac6e7cd86bbd9d37a7b2937fc470b7290d757acde4e27841bb548
 MISC metadata.xml 395 BLAKE2B 6e3806778598ecae18cce94dcf394928164e7e6333ddb187dc214cc6385d9ab60f9edec76370e103798091838de551fb730cf85c95e0634ae27cb7a4303e7e78 SHA512 a824fea547e809f4547289cac4d71625f1b3751fa24b20e1d2a162dad791d7061501bda9a96738a1ed2ba9ad4f3ea018fe566ee84b9dc5dc32662ad04d4bdb9b
diff --git a/dev-perl/Net-Netmask/Net-Netmask-1.902.200.ebuild b/dev-perl/Net-Netmask/Net-Netmask-1.902.200.ebuild
deleted file mode 100644
index 214d4c83ddfd..000000000000
--- a/dev-perl/Net-Netmask/Net-Netmask-1.902.200.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=MUIR
-MODULE_SECTION=modules
-MODULE_VERSION=1.9022
-inherit perl-module
-
-DESCRIPTION="Parse, manipulate and lookup IP network blocks"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-
-SRC_TEST="do"
diff --git a/dev-perl/Net-OpenSSH/Manifest b/dev-perl/Net-OpenSSH/Manifest
index e964f1c5454d..fc941afdffed 100644
--- a/dev-perl/Net-OpenSSH/Manifest
+++ b/dev-perl/Net-OpenSSH/Manifest
@@ -1,5 +1,5 @@
 DIST Net-OpenSSH-0.74.tar.gz 73869 BLAKE2B cc76995765967050806e6fbf064f09107cb13beadcdb9f7ccd95bd7d3b2373b93f3141774c0d62d8f1684133d8734e848463174338dd70e325f3fd55b5874744 SHA512 27b35ed512fe6da160e71264aaf7e1696f8182c5e731a71b95f84736e2dd04b9d3324d3a26549d4426ab6ca470810e5e16c82fbb6a88526015122dee3411a73a
 DIST Net-OpenSSH-0.80.tar.gz 76893 BLAKE2B 48efa393c051d66e08c6ad6e353b998afa8c6b947b36e9e5f683c5341327f969b73c0c0c41902000219341215ef4b0a71968bd5d3cd979f13d93b256c984b466 SHA512 3b68b73b0d5ee5db2096e0ac3ec3c3f12b92ee1865217a81eff0378f416ffdaac252d4ae4de601da7cd4a771bbab6a4768be4cafa0eaa2ff93b31a3cf824875d
 EBUILD Net-OpenSSH-0.740.0.ebuild 496 BLAKE2B 8a2bbd2a009deb32d6d6a5d1589cee17a45e076e832ee824e5902116e17e7dc8a943fdb9c5f5b9362167862730bbb6af3c2051bbcb887cb2c52c08dd7ee65b1a SHA512 502949466dd54458dc3dac03b319398cd1be48f1c13ea8737c8b4ede75f37000f53af1ca90fd4c9d1610316fef0ac0c3d6b18f57911425e292aef1ef197d041c
-EBUILD Net-OpenSSH-0.800.0.ebuild 496 BLAKE2B 45152cd214bbd0c8a07cdfcaf9c3ad37d5a5a846574700464d94cb8cec9efca36640dc8554b537fb9a5c9c844a12d983b1085dc0a6880d9d751100caa92fe924 SHA512 8cd6f0140f4629c6a74ef1b177eff61dc577c8cdebccb9d863fffb301b71e6b3bbff8e3e39534735a5371595730572f306f3dff22e770263be67d4cbd70d251d
+EBUILD Net-OpenSSH-0.800.0.ebuild 496 BLAKE2B 655bd039444f27dd2233d10cebbacfb6ac5b069c912fc9438604f676f7866cfb0dcce88a12f8a4cc583d4d3ffe1989e61c8ff07a1f275c26dbbab86c48119d0d SHA512 b6cbc6fdb123331fcf3f7b3e1992b0835ad410e8b0637bbd462c0e95a538d8b0c00dde1ab949637f2d81056e3fcec951e1cea9f87a257de1f382a60b214772a4
 MISC metadata.xml 1426 BLAKE2B 94397b85dc63d4fd14fa34697231a13a8f52c1777358997b5e75142adeb9525bc282bc7f69a59e5840f87bc620dbc851173c9a03afb6eb63df124f81c1a2f33f SHA512 459d3c11e1c8956bc03577bef6f7dd607e80edf81b6d7c306787fd0a54f71011ba9c42781cb792efe2363a59223b119175ee5ba22e8840b83e97de5dc4af163c
diff --git a/dev-perl/Net-OpenSSH/Net-OpenSSH-0.800.0.ebuild b/dev-perl/Net-OpenSSH/Net-OpenSSH-0.800.0.ebuild
index d7901b84df82..7bd3ee204e99 100644
--- a/dev-perl/Net-OpenSSH/Net-OpenSSH-0.800.0.ebuild
+++ b/dev-perl/Net-OpenSSH/Net-OpenSSH-0.800.0.ebuild
@@ -5,13 +5,13 @@ EAPI=8
 
 DIST_AUTHOR=SALVA
 DIST_VERSION=0.80
-DIST_EXAMPLES=("sample/*")
+DIST_EXAMPLES=("examples/*")
 inherit perl-module
 
 DESCRIPTION="Net::OpenSSH, Perl wrapper for OpenSSH secure shell client"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~sparc x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Net-XMPP/Manifest b/dev-perl/Net-XMPP/Manifest
index 5d981ccf0398..04af6dc0c526 100644
--- a/dev-perl/Net-XMPP/Manifest
+++ b/dev-perl/Net-XMPP/Manifest
@@ -1,5 +1,5 @@
 AUX 1.05-no-dot-inc.patch 3578 BLAKE2B 7fea81108b326bc20a3bb804cad1a75dd6d8ae590bf392612f2745c4e95cdfebc73603a5b3178f74846372e5dce8258974548c63a53a3bbd329e8e38e1e0bbce SHA512 01c8572fdef916ff937d36356d308c441cb2512f34fd1a5e2458b02b9f9c79619addea75b108a5030668bb50f8f086c9f4b51faf1e7e16722d535335634ec405
 AUX 1.05-no-network-tests.patch 1569 BLAKE2B 68d736865c0f727c03b64ef1dc8654a903f8098056fb9d7b1975ebdb5f2b4e0c7493d712d2fe35c1bd5533e60cfee475e321b37b24f3d7d773df0134aa7c2a5b SHA512 a51cbbacd06b94a94881b5b36164d596d5ee2d9818fc1ae544ddc7468cb92f0c7041863cc9aad4eb16c9885bf4b946e8bfc9ef7087280417651b8c5d7f79dc56
 DIST Net-XMPP-1.05.tar.gz 103876 BLAKE2B 5ddc98125b26518c59aa4ab39a974b9cbf1575bd59bb66d5329a43e1d5c3d150f34cc93f545f2cd56846e7b4e46142c47aff7da9b279181a02a57bf95ff1757b SHA512 cdd5474fcbdf7ff6c7d1247f9828f5dfb1828c258af366a831bab8e5faab423b73aa16c34228818526ebcc3180ef0ccc52d6e6cb61e2fe689458b87ec7fab699
-EBUILD Net-XMPP-1.50.0-r1.ebuild 773 BLAKE2B ca7745f833437a41a6b4bd527fc81f905db19e8ccddaf2a80e4cde49082b7c87d3090ccaef12306f8cdc4975c7e004aed9ac3e6666cfe11c2fd23cf4f4d02d06 SHA512 99ab020ed338b77ce7d24d42916181a1653cfe77de9b1d15a3a04a7f5aa98b9e299ba6fd86119a90f9a7c3e884d11096cf659c427acc8f50e4d77ae3bf324a07
+EBUILD Net-XMPP-1.50.0-r1.ebuild 772 BLAKE2B 44b37b5420d8547f1d8894ab475d9726ad953ed04a21c970db19f2fe73eef1cf782b618def010049d5885125419df7ca9c5bcd83b5c97ef4b453608b719912d0 SHA512 2012e95afb3c104bf766a618d01537d6ac8ea1e983095b59fef7f3c79e19503fe341fbee545d7d8700768fe32540a664a356be3e1cf391654976e5d192c3337e
 MISC metadata.xml 1306 BLAKE2B e6a534e3c1c0f1dd475b1684c9f01438376a82da722f083f80aae3c56487f5b8bce13c30536669fa8333e4be4219227be7e2e0c47e6b88ab70023d6d014ea191 SHA512 b20aeee6041818fc8d26ef27917b83ba397a5ff7d851c10deaaeb934d8929a8a95499631303160978a8d2ba07e58e08640bb975c0b955d395624867d24ebd684
diff --git a/dev-perl/Net-XMPP/Net-XMPP-1.50.0-r1.ebuild b/dev-perl/Net-XMPP/Net-XMPP-1.50.0-r1.ebuild
index adb3752731d7..794ca352f633 100644
--- a/dev-perl/Net-XMPP/Net-XMPP-1.50.0-r1.ebuild
+++ b/dev-perl/Net-XMPP/Net-XMPP-1.50.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="XMPP Perl Library"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-perl/Authen-SASL-2.120.0
diff --git a/dev-perl/Number-Fraction/Manifest b/dev-perl/Number-Fraction/Manifest
index 31495201f86e..0478814df4f8 100644
--- a/dev-perl/Number-Fraction/Manifest
+++ b/dev-perl/Number-Fraction/Manifest
@@ -1,5 +1,5 @@
 DIST Number-Fraction-2.00.tar.gz 7771 BLAKE2B 49cd613ebf3c3342160902e09582fed8247c6e1b089d1f68455d2c120a219f7d3e1009e64ff950037b5ba61347818e51b756cde50c25970f2071874ca63a7ec9 SHA512 ce78d42b4d448ae1425f1a6c98a7c8a330d35aa510971748e30b55a235f26e3fae4f1cb498b9014fcee512fd19a72902c5d44b2f00ad6b03111783a757644135
 DIST Number-Fraction-v3.0.4.tar.gz 14891 BLAKE2B a43b82c09f04191d1d251a14c02656d1ad695768a681442a17e85182c13f049bc66582dad1e03d99991966a7c43581211bdf4daba568364daf5022f771f06210 SHA512 c309e4ee95909a8ad570f061387490c49cf11d71b76569dc2b3b98c8c4bc0c2b4936ca6f14dc5818ca3aea34fec06486665269f304ff5141c566acc061522407
 EBUILD Number-Fraction-2.0.0.ebuild 517 BLAKE2B a76661875b5bfef9217a7e65b05d7c3dfa923fb917633070a77a70a69343bcf04e654f07dd067139c4dccfa33cd3f2357c63b5c09c1649622913460581855601 SHA512 e896749aea1d4ef13bab8b549dfcffd8a20c2461ada9e2e8bec18cfab5a308b6eec36f0b7cf69b0b0fd231f549ee62a527c053ee76f43ee8c250d632b1cd57f0
-EBUILD Number-Fraction-3.0.4.ebuild 502 BLAKE2B b1200c830e397be9b2d315ef57e053f96af6f11ba30bce1ddef16d52932d30e31d89a69863da2485b6fd480f9c9e90a710863e3de77f34b8b9df7dcc9da1535d SHA512 ddc2029f77d686978585b3ef7dcc051820d6e46bc2dc9e8ad2a6ae2589639ae3bb5628d92ad335b24cf18d75a2ba7bee98437d6a9cfa6b2d7a6f515070d8672c
+EBUILD Number-Fraction-3.0.4.ebuild 513 BLAKE2B 69ba28a236b9c8a2da8bb50ca1dd4b804992034bd2b38a70be23cc9fa35fe4521c8824febcf1862cf9e7d1d9140862ab398cebe98818f3d2225221c7f58c3f6d SHA512 5c2e4cdc2b7beddf1aff2012c7809bdc96daea99efb258ab729f80167cbba64f6d8d2eb651b90aae458c7f52f472f82caeb60f43454fa390cf4be3f48166faac
 MISC metadata.xml 391 BLAKE2B 618575ef865789972fbf86fcd253fe11b08e3e080a618b7f16a02e508662181cfd3112c07732c35ced9ba93066d3e867a54e404f90bc3b6ec594b0c1111fdf8b SHA512 99b27c2ba714a9ce5588355f03defed4a8fbc06587252e70b4a2ae233f233f9286990be1460efecb2896b7ca8a439a145998cbc8fb7c0c1482aec4cfde58681c
diff --git a/dev-perl/Number-Fraction/Number-Fraction-3.0.4.ebuild b/dev-perl/Number-Fraction/Number-Fraction-3.0.4.ebuild
index cf0e6578eb6f..44a146edd01c 100644
--- a/dev-perl/Number-Fraction/Number-Fraction-3.0.4.ebuild
+++ b/dev-perl/Number-Fraction/Number-Fraction-3.0.4.ebuild
@@ -17,7 +17,8 @@ RDEPEND="
 	dev-perl/Moo
 	dev-perl/MooX-Types-MooseLike
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-perl/Module-Build-0.420.0
 	test? (
 		virtual/perl-Test-Simple
diff --git a/dev-perl/PDL-Transform-Color/Manifest b/dev-perl/PDL-Transform-Color/Manifest
index 70d199757957..2a7b68f4d341 100644
--- a/dev-perl/PDL-Transform-Color/Manifest
+++ b/dev-perl/PDL-Transform-Color/Manifest
@@ -1,5 +1,5 @@
 DIST PDL-Transform-Color-1.003.tar.gz 51299 BLAKE2B a7a8154d3adfbf73405d1ad779021093a939660cddf884909b0f2c57312a9fd0f5ebc84d2266f813f3c432cdf6986b6239b3d08e9f64eb500c621d89d556c5fe SHA512 ab1c0643013a494584a688aaadd275ff361bf2212b2af6ed7718cbe344f87c5ed887a188729ad8f1a1922f2987b25e3816cca3ba9db78a45cc01630d50213b72
 DIST PDL-Transform-Color-1.005.tar.gz 52452 BLAKE2B aa0fa96a566015c22c5652b9a08e74b9efa631c08dc8bda4c5e24f59f214942f3fb9e41e0d9702603c96f5c5d7f512edad7908a8bca1880449e8365a0c45b442 SHA512 aedca2a02d5512a9f8033dfae2d8b3be14c103e94a687f50c4a20c47db95fd0e5d0fc561ec51aa66e19a55affe909fabb2dd7e5bc2aa57cce32a56bc7b22c239
 EBUILD PDL-Transform-Color-1.3.0.ebuild 368 BLAKE2B d681f6fd1ba0c10d1db949711fca6b731dcf9ee1df4b2de6542723bbbd8ef23a15806d67cf34b992c68c7bd80949b3dedb145f311ff74f1b6e50045740fc4bcc SHA512 83f1c47b57d57f6cec4ecdcfe48625d367212ff3db2a43de157b690c06f14f24dfd26d3f0a3feff2234170f9f1b7af8dc2911efcee895bc738e0172813bd117b
-EBUILD PDL-Transform-Color-1.5.0.ebuild 357 BLAKE2B 410aa2e271077f52a1d1fb96e208407cf2ada7a55bafb2c93e8a6b4946ab9153d533618a6352bc386c0c819d68f7f88e113102adc4eda3e3dc8f6931da76e30f SHA512 c8c042f31401c93703817c634166860fd6a1cc706e777977710ec72e863d68c34cd24856aab3851a4e95ac681414d2ad8bcef015b43f3f62b6a3588a6d3a68ea
+EBUILD PDL-Transform-Color-1.5.0.ebuild 356 BLAKE2B b4b5abcdcfd09a74f23affc6ce09737fcdf41a624ab69358a42ea3959f1159e51af606a661507605d1a548807f818c3ffec4cc040962eb7b09500bef48c1b776 SHA512 38e6fec35416a4c4ba2c1d86335dbefa95a7e901227b0edb2f708c027b9b3c6650d559ff79d77de5e08733d10f5a21ad2f4cbdd175373bf784291faf3f1c2a8f
 MISC metadata.xml 484 BLAKE2B 804ab795575dfc82932e2b27e9e6d8c1f1934f2e3e6eb625e1965af4494a3312a7d5ecf48b0863ab9be6f3d1dd8f4a305abbff3bfec46f6698a53e133b3c4a69 SHA512 09f818ce1081eed843933f24aadb7470ebbec6b9402fd8068158b489949ebe45273ebadd081d77e3ab599e065ec930dedaddec59c0c0a0b789752c09236ff284
diff --git a/dev-perl/PDL-Transform-Color/PDL-Transform-Color-1.5.0.ebuild b/dev-perl/PDL-Transform-Color/PDL-Transform-Color-1.5.0.ebuild
index e49d48736edf..bd9daad51a1e 100644
--- a/dev-perl/PDL-Transform-Color/PDL-Transform-Color-1.5.0.ebuild
+++ b/dev-perl/PDL-Transform-Color/PDL-Transform-Color-1.5.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Useful color system conversions for PDL"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-perl/PDL
diff --git a/dev-perl/PDL/Manifest b/dev-perl/PDL/Manifest
index b9907bfb8636..26e8102e6823 100644
--- a/dev-perl/PDL/Manifest
+++ b/dev-perl/PDL/Manifest
@@ -7,5 +7,5 @@ AUX perldl.conf 2716 BLAKE2B 7cea3e06e00636c45d3ffaef5df236668aabdf52675a3447ef0
 DIST PDL-2.017.tar.gz 2889414 BLAKE2B e49e0ee7e7fc3d95dd27098e8008930673cc4067331f2e4d9eecf8584fe717b15d5b4c7198548ea79a4543d94c1078f5e6eedd731b94d7ce062ab2841c32fc8d SHA512 b1c60b45427153928834619a59ef2213a0845564ae997e22fe202dfee281647edceb68bf3bfa6602ee69a7fd0cc69b7b61ccb74407f490d9fa40230f74599411
 DIST PDL-2.054.tar.gz 2848187 BLAKE2B e96598f88b4b3cabda88785881e9651b2984c2850fd1b161f869bb462386509c4fd659324cd5bdd139152a9d3db4857fe6443ac090c8d4740482972bdab893f5 SHA512 56b7c77961e19747a1117b63f35a3667b4b7ed14c991bf673eb1f4df4970d642f37170a6abd55d219897b0e02fcd42d7475f6b1268b810706c6818595682de2a
 EBUILD PDL-2.17.0-r2.ebuild 3387 BLAKE2B a0590614e7f9f8bfc0e91f9019ffb0ee691b710ad71be75c7b9a3ca94a68c95822e3ac18f8b89ff15fe0a2677d541c50a036879216adab700fddd7ebee6de5b4 SHA512 7e3763da6eb4aa92e4e33f5f094423d91a5d2dd929b23d0ae8fbba9668dd762df6cdccf76331ada86a1b62cd25cc27358255128c0f206d3347e0acc0b79e4bed
-EBUILD PDL-2.54.0.ebuild 3541 BLAKE2B ddb152dafca3ddb9f5f1bfaa09830940c84fae38b410d221ea903c0a4e173d8c5d821ec2082c9f54555c35735188c73db22749ee036a644c8badeaa083c2cda3 SHA512 a0bb47c65404144754ca884554c013ac0c69c75462eade575cd17fb3fad892c52b882311693e9217b323ea57c03874cfd2ae54139fc41c4dd6174660e94dffb6
+EBUILD PDL-2.54.0.ebuild 3546 BLAKE2B 2a9fc2274657a94529d7f8e9d1cf9c26588fe6b51833ac15e8889e8439c82e55056964eba861dc8e3d76fe1112f1e781b6e9c607a75a9a4fe81f608443eb3599 SHA512 c79e9ee2d72bdc6d1d70081f003407adbb326e963ea7a925b8615612a30a7ca502491ab1b46c23e4e8d5dbfb7d6b3a3a500eb8a309b67ff0cb6735f0f06f5b4e
 MISC metadata.xml 14071 BLAKE2B 11db01976c0f86eecdb9adabf72db207c37c527c42ab1bbffbb9cbd7ba3e4dea9372805652c138d8e97394d3ce3737b815b95dd4813ad60b91157fbcaa3b631a SHA512 9cdcb8ceef4817769d61bfcfb1c37b7e564eae43fd4d894046b3327164f8c7bdd2c87462a04b7dcbda7c19929847e16d83a06cc393bb78e2c90de77594ebedd0
diff --git a/dev-perl/PDL/PDL-2.54.0.ebuild b/dev-perl/PDL/PDL-2.54.0.ebuild
index 692862730a53..4c8b510c1923 100644
--- a/dev-perl/PDL/PDL-2.54.0.ebuild
+++ b/dev-perl/PDL/PDL-2.54.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Perl Data Language for scientific computing"
 
 LICENSE="|| ( Artistic GPL-1+ ) public-domain PerlDL"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="+badval doc fortran gd gsl hdf netpbm pdl2 pgplot threads test"
 
diff --git a/dev-perl/POSIX-strftime-Compiler/Manifest b/dev-perl/POSIX-strftime-Compiler/Manifest
index e30607046d03..64f43f687641 100644
--- a/dev-perl/POSIX-strftime-Compiler/Manifest
+++ b/dev-perl/POSIX-strftime-Compiler/Manifest
@@ -1,5 +1,5 @@
 DIST POSIX-strftime-Compiler-0.42.tar.gz 17294 BLAKE2B 3c96c8226b4dd06f449a2a6e56785862e98014e8fb8371709fcc6872ec115cff58fc6aa8c98dd5032488917478448b2137749aa3621d7b446a08c923e99de81e SHA512 0c07f1b8589b067533c65a023dd634a29640cb8992aae8047aa1063affe6b30b95930479829982a30a13b87bc7c9ebf82ca4837726bd29658d85d718164e3c76
 DIST POSIX-strftime-Compiler-0.44.tar.gz 17027 BLAKE2B c550c3074def4def71d4c3b22d13464f87080b0e53333f8dae5a7e30df68d1c40bae78021ab83d1324bb8f28a12ae487aa5f220df3bdd413b9d5d62edd02f450 SHA512 34852966a46f55a65e4ee90af3aec6478456d3a7fc8f8b8e8fc4e704a8361f46abfad5fe0f356eb3432fb2e232e65004818b19f298293cc0172d576cfe34c3e1
 EBUILD POSIX-strftime-Compiler-0.420.0.ebuild 678 BLAKE2B bd2756fd5354791feaf65210a3d03ba09607d603f79cbbbaf93b6ee81e0692699be5b5462e7b20fd6e430e5f52bead86155ea22e14a852915fde2e79f8f5f0bb SHA512 61f41175308832084a6f3d7a17b2c041127843eff1f85e804d1874e2c5f6bb9308237e5b477f88db35ed92db9e47351a2374b0c564dfbdc0f360efc9899b152b
-EBUILD POSIX-strftime-Compiler-0.440.0.ebuild 598 BLAKE2B 26b135e7a1efe9c389411bc1eee1230557e2353feacd4b3e3bff9cd1fe661ad36920cd6be917d38e14cbde94b608a269e99d26a7aa958764cbb6458872a8ab5d SHA512 a47afb45ec447afe673f330c5afd4ea179bc542ac068e15b847e09a160bce85e4cd6311ad973401a7cd240f7f82e1960a649e8726d9a9f206a14b494999b429d
+EBUILD POSIX-strftime-Compiler-0.440.0.ebuild 593 BLAKE2B 8291dedf79e7bbec2f34df622a71fb20bd18021cf34f19c06373da008ebb04d22c1a08dbb6697fe16fb22fe858d89753163523073f6a622025bcf7f4a8dc4bff SHA512 89554f2c160a9e055a0e742d3c5a0722dcc55ba1ed40eeec1b90c301fcf9d2c03a63f89efceea76206fd40b84946d8d5dd00456ac5bfafb565b452faa400c038
 MISC metadata.xml 420 BLAKE2B 8f4ce001663577c700035083e0078ae559c94e004716c9fa705950d0be56e95a29d1acbc2ac6bba37f156ddd556f95a1a3379d74ad081f7e88df5535e3a88e9e SHA512 38d89cac1f7d734df9a2182f9a4f51dd959770eae772cd9197a87b58b7a1174f6dac27750928417aee1804d1851e16cdfbc4a026a05db6e9c37312a40040f8b4
diff --git a/dev-perl/POSIX-strftime-Compiler/POSIX-strftime-Compiler-0.440.0.ebuild b/dev-perl/POSIX-strftime-Compiler/POSIX-strftime-Compiler-0.440.0.ebuild
index 02a83a2a3237..d620c61e7a50 100644
--- a/dev-perl/POSIX-strftime-Compiler/POSIX-strftime-Compiler-0.440.0.ebuild
+++ b/dev-perl/POSIX-strftime-Compiler/POSIX-strftime-Compiler-0.440.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="GNU C library compatible strftime for loggers and servers"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/PPIx-Utils/Manifest b/dev-perl/PPIx-Utils/Manifest
index f6ca2021a2b2..e1869f1e1d17 100644
--- a/dev-perl/PPIx-Utils/Manifest
+++ b/dev-perl/PPIx-Utils/Manifest
@@ -1,3 +1,3 @@
 DIST PPIx-Utils-0.003.tar.gz 38028 BLAKE2B d9b26f6df59b5052be6bcf52f0e6948c0647c6e95aeab759c80f2e27ca6a9ef1771bd36a78b9853cf74cdd527dcfbb4fd2057818e82cc187849a0f52dfa27eb0 SHA512 7f56bc2bf2afbf1f6d3c0e5bc0ed21752be809714e32b256feb1ea39125c7671c6ef949e2c122a95a41d3a603f5d5253133886f3700890387ad6cf0732ab87c6
-EBUILD PPIx-Utils-0.3.0.ebuild 518 BLAKE2B 04c0e1256dc3d8c529a409fcb0aac1bdfc2c2c76e4e85f7bad3a927154a08d2fae4d3630d1877a1c20b23ca70c630821d163d8420d76dbb57b17bb71d5e373bb SHA512 8fa57af536f67ffb1582c8708648eade021760c9d8151848e16ea09d66fbfad0db7ad318e8f4cf084d3f6d6046501271a3e1ad49a5fee4c42bc499f6602bc001
+EBUILD PPIx-Utils-0.3.0.ebuild 523 BLAKE2B 1d21b7b35641abf1e96588937a9379cbca59a5567f7b8eb2593bba383eb22f593afcc5002b7465a43fe96a4ef606b4b8c390db6cff3600b3feb593614c21a330 SHA512 7b1a5bf4eb1ac3a1c645182c061383e870a8e1a41d824e7dcb793e84bea98de95b44c93872a868ab7c211dd48f074f23cff0234a59fd093ee4725fe55284b207
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/PPIx-Utils/PPIx-Utils-0.3.0.ebuild b/dev-perl/PPIx-Utils/PPIx-Utils-0.3.0.ebuild
index e35cdcf705d9..1c0226f10063 100644
--- a/dev-perl/PPIx-Utils/PPIx-Utils-0.3.0.ebuild
+++ b/dev-perl/PPIx-Utils/PPIx-Utils-0.3.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Utility functions for PPI"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-perl/B-Keywords-1.90.0
diff --git a/dev-perl/Package-Stash/Manifest b/dev-perl/Package-Stash/Manifest
index f8c426efe10d..4ecbc284c74d 100644
--- a/dev-perl/Package-Stash/Manifest
+++ b/dev-perl/Package-Stash/Manifest
@@ -1,5 +1,5 @@
 DIST Package-Stash-0.37.tar.gz 40309 BLAKE2B 6afb95f87288d1c9081d288c71a77fb5b98dc6ab80ec16db1fbb7a7fcc949afefc249e5a9d33c5835b944ecaa6e9cec771988e2987315bd034764ab977576550 SHA512 d10321903591568d4ac4db91ad9e4dfcffe564ab22a5ecdd8fa103749c9708da082ffb3ca478e98ac120a23e51c0ab0ccf799c0da10fe2be194e9cace1f16b06
 DIST Package-Stash-0.39.tar.gz 55606 BLAKE2B c4e9ff6fe83f2c8a537fba0b8e38456b3b9a9768ee7dc1c8a2b471a42cc4d8b82c5ce74972cc462996718bc84eb7bf4cd651bb21cc870e438481e85d024a32ce SHA512 c5a6cd56c86fb9f6c8585ee7f65d0add8e905c586747763c7841a054f3540b6bc505f57952f44bb90a6bb500d0d60d20ad5df7a40944480abbc9d8d43d64e30f
 EBUILD Package-Stash-0.370.0.ebuild 1040 BLAKE2B 3e7ca230660abbaaba60fec2b677959a826feb6ad8e31eccaf03e683ae472e20adddb0d1649eb4e3a6b9362ab5aac358d58a7f4dcca1717761d40b1a63437f6f SHA512 74ec8cc08c85097d6eadfaac07e209b0cf2859403dbfe873bd92ac6882d6860e729ea4d1cab93cd92f1d706b4e6347319efdc7c4d36e8bada76170b5b96dfa1a
-EBUILD Package-Stash-0.390.0.ebuild 1034 BLAKE2B e80518d23d7bd5f81896cabdcdffac994ba57295afe60b28e020b743802e01528ffe1afc44415bb53b10352725df0236b5db96b03c4e400144a633fac80582c4 SHA512 0180beb4fee3079183a0373cf669b9cfd08915b550292861970bb43038fdc8950a7348048f906d955c91a8e120b4ad76fa4dbe0a4ac552592009959e3bf17473
+EBUILD Package-Stash-0.390.0.ebuild 1031 BLAKE2B e83338018fe2b6c8695b1633ff6b1dc3276df2ec6359459cc230552f757d5505ca72d0716aef402cb6af21d9c4cbe9adbd43ec5a4648a2e6b2b06a16942467bc SHA512 771b32e0d415c8ca4f7d6d1ff9535e898f280e1ddd739a397cb8456e001069cd9422c1526f5ea66d77381759aefa50e183f607f9eea4b2fcd4955533cf59595c
 MISC metadata.xml 464 BLAKE2B a3e46ad9e9fd78e593dd8225f47ac0e49d63893d2e6b32ca463ccee29442ff852b998f2a579b03adb0da00cd59475386b31e7387e0d1720ff2915a07793627b6 SHA512 fd41098b2d27d9ca25928d5c447518dabe8b7281bb91a8f446f4ffcb177d4d24591112faa915a1ec8e4f65980fcf87d017bc8f0979ceff1d4ded8f53189dee57
diff --git a/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild b/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild
index f976b330dc8b..c1a4bbeafa9d 100644
--- a/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild
+++ b/dev-perl/Package-Stash/Package-Stash-0.390.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Routines for manipulating stashes"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Perl-MinimumVersion/Manifest b/dev-perl/Perl-MinimumVersion/Manifest
index 715616cd2f96..36c31ad8c02a 100644
--- a/dev-perl/Perl-MinimumVersion/Manifest
+++ b/dev-perl/Perl-MinimumVersion/Manifest
@@ -1,5 +1,5 @@
 DIST Perl-MinimumVersion-1.38.tar.gz 30629 BLAKE2B add1145b327a2165619d78e4cba9b2417b6650a97b28a6a08e044223e3ee5af6b6f76be877348e50512c6d87661a4bf25e996477a4a225e0cacd2a5c6525d252 SHA512 4a1b5a30c1b2c82ebdd5908b667d012376372890278fb3f1a08ead300b8ce02396f511df5250123689611ad5c0b0ad2b41a4c1ebe76c33109f2226eef95c9d4f
 DIST Perl-MinimumVersion-1.40.tar.gz 37601 BLAKE2B 2186f71418d7279daeb98e76be3adad9dba0d67b204d86ad9538b1a0c30695c3d504ebdc08f06031dd2c9101587798c2825186bb65c7bc5a5e37c6639345bba5 SHA512 9416fbee46008f7745d6d0c8762e1d54e00fb708376a1d0a86c08f375627da3c10feefc0d234f68d422da892f5ac3f5caa9ea1ac6593827e2ff9b262646a6527
 EBUILD Perl-MinimumVersion-1.380.0.ebuild 797 BLAKE2B 0c5d13ad25fa385f6352f4181c9c9505ac8e7ad0801109735320d3427a0941dc531931aa3ab465c840882699f519155e2df9413d440bcfb13851c7b5caa20ed7 SHA512 63c4f326dff6fb2a1501d11a0eb6b99731737f29f92bf520f7928647e9918660c63a59f80ba8b9605b76289488106fab4175ac510fe4a35b334d7cdf88ab43cb
-EBUILD Perl-MinimumVersion-1.400.0.ebuild 744 BLAKE2B e5ac74172e66486e322d1a22a534ed7c81e3318869db5a8e91c04399fc1175e6b6668897c6d16f8b4906c87e919d2ac3940b6d547bb0135608a78f2044ebea54 SHA512 8a12b1fd3429ebf16d998ba57b7431d38d47631fc8e408deb7b367a277afeac05569dc64b491cff26a2ce914eda0c6fee17e755c55513f66453ad0ad0903dc7f
+EBUILD Perl-MinimumVersion-1.400.0.ebuild 749 BLAKE2B 20ce02b3c717b9002f38cb8d024f720175674880a7f827a00382ddeaad3d5fcdcf342b9edbc643dc541ed3d3408d4d440e31359794283c61cbdab0f094c5f870 SHA512 5332cfb40703d596e5c2424a34d6ad81670ebb2c68993e4e68fe3f9b5267e6efceb30672276e3a77a054aa0a8e10cd9d657070eff56ac6342b97354dce1b4bdf
 MISC metadata.xml 540 BLAKE2B 5c1c6495167891a9892db8bf59857c7c2e28d3034ef7a9116b628368251bec27852219f810af0da399869c5b2d824a08a373facbb6981fa7fe887047307005f5 SHA512 81f0766de75906a862dbef684c3673b1d46e4ed2ca8841142d006018334e652be8cc8cd8bae5661a36e507659311d8f8a02f84c84e3413f543287969bb4016c1
diff --git a/dev-perl/Perl-MinimumVersion/Perl-MinimumVersion-1.400.0.ebuild b/dev-perl/Perl-MinimumVersion/Perl-MinimumVersion-1.400.0.ebuild
index 0c6a4e4a71f6..de91ff36fbbf 100644
--- a/dev-perl/Perl-MinimumVersion/Perl-MinimumVersion-1.400.0.ebuild
+++ b/dev-perl/Perl-MinimumVersion/Perl-MinimumVersion-1.400.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Find a minimum required version of perl for Perl code"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Perl-PrereqScanner/Manifest b/dev-perl/Perl-PrereqScanner/Manifest
index cf7b47b3edaa..cf6f3d168919 100644
--- a/dev-perl/Perl-PrereqScanner/Manifest
+++ b/dev-perl/Perl-PrereqScanner/Manifest
@@ -1,5 +1,5 @@
 DIST Perl-PrereqScanner-1.023.tar.gz 28136 BLAKE2B 6ad6052c5efabab782de7191c903f52f4e904687fabe280a7f6980ba9d37c44a0e5d7fc0a1f674704bb7874d5478551e7ba5eca8dc70719348bec752b883fad5 SHA512 9f2b6f7b7f5c7a34405cde8f1a31bedc001a877e04759ecae9529821d00869d2273c35b8c855f12f54ba27cfa99fc4b4ccf464603e2ad1c087f76a9f17856b47
 DIST Perl-PrereqScanner-1.024.tar.gz 28758 BLAKE2B a066e77dd50c96cef6e575ff143798d9ba2dd2807ade12d026522bb990664ea883d24b3bc11c72c8ce3b8086844dfa0562e668025880a223141586a5163be28b SHA512 851cf4a34f3bedc0174a9a34d80cf7de2ead5478a1979356ad43f7cb9bb867c0b8a36ba4bc4341b5e4ecf435e18d04726f1a897232d590e61796b7e34ff14c52
 EBUILD Perl-PrereqScanner-1.23.0.ebuild 1120 BLAKE2B 32c9edfb1998120a5726a2245d158b36e60bce27c0f50bc2a6c7def46c6bcb9b974241739524fcc4dd8e3aa39f8b310b8a10e484bf1603d80c67ebb79eddff45 SHA512 89b86d7f2b27cf05a7dcfaef6c101a0487ad65847faa32548ce428ce0641d06c9bec95c7a9971225f7d2a969e57c694964c69392d4cad4e72433d8c24dc4e03d
-EBUILD Perl-PrereqScanner-1.24.0.ebuild 830 BLAKE2B eab4e55a225781da9217160b3dd6b2786922618f07bc727eb2c5872484bb38193ee7b43945a1da8310d478f29af2ab697699027e0ed8c397be0cbc5b2b2ba5ad SHA512 d0b5f7e618712405c169db9fdc752a945e8b0aa3fda44402a86b896f71567828615afcd38467782ae0d9bea3848c93ccf5bb85e178fda9d1b820bfad933488e8
+EBUILD Perl-PrereqScanner-1.24.0.ebuild 829 BLAKE2B 90eac4c7df952f905f70677871cd0f2e04c4b2c036537ccc3a76c8e88145d0f2f4dd8a9a3b65e4a13fd74b47572b25fa2bb360806f3f75544f861a1047fc4274 SHA512 2b2a23723f35ab54bcfd6149842b3cceb3ac8ac6c124f35f36826371440429184ecee04d627f63bdc3299b5e499c327026cb8ba2c47c8240f93a89f6e87d367f
 MISC metadata.xml 1055 BLAKE2B 00bf648132c32aad20b2f1bef3a806917c29131e11338db5022382c8f845a8786b378b265e8b4311cd67089405153bf3ac3a6a3a36c4b51f9975fd6e30495c38 SHA512 b239a26e8f007690881893e0040baabfeb5f3104f6c04218481923e86d347033a217f30edfead751e8ceca2db0c88cab95f9ab8c38a21e4be2789f2d1684473b
diff --git a/dev-perl/Perl-PrereqScanner/Perl-PrereqScanner-1.24.0.ebuild b/dev-perl/Perl-PrereqScanner/Perl-PrereqScanner-1.24.0.ebuild
index d2b0234868a0..dd533fa13bdd 100644
--- a/dev-perl/Perl-PrereqScanner/Perl-PrereqScanner-1.24.0.ebuild
+++ b/dev-perl/Perl-PrereqScanner/Perl-PrereqScanner-1.24.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="a tool to scan your Perl code for its prerequisites"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Perl-Tidy/Manifest b/dev-perl/Perl-Tidy/Manifest
index f997391d8f49..3a756da9bf26 100644
--- a/dev-perl/Perl-Tidy/Manifest
+++ b/dev-perl/Perl-Tidy/Manifest
@@ -1,5 +1,5 @@
 DIST Perl-Tidy-20190915.tar.gz 599290 BLAKE2B b9a0b1f15e01ed6f6624c804d7833da672fd11a2779baaeb4c4d5f3d7830b2065d01d969fd23514163139bf53831fb3494d2820fe15786244e46cb0efcf722a5 SHA512 553d84bcba8cbe10c0a1e77ef9e31dfdc5957c758efa2bd556ff47a0a354f16eec922842a36c4ccdaed691ffecb6a5dad63dfee2b038f4d2c5882a7e07bad51f
 DIST Perl-Tidy-20210717.tar.gz 814449 BLAKE2B 7fdd3e18e8e6818665e8e75fb6671234840dba15ca7fc20778d97429cac948fb36876cc1d69452bb4a35a1da411e7d440b385efe91c6eb17c5f4939be37e410e SHA512 ccc090cb6ffbd803fbaddde3a99391bd07a97fb47d20515c3f3e58c69a1404824a5bb9aa3cbfea6b2119f7140552fde3bc2361d3ea8904a875973817446578b1
 EBUILD Perl-Tidy-20190915.0.0.ebuild 937 BLAKE2B e27796b166389074c086383e6327f71c2328cc7c79a5819e922b66d8718580a88072dbb8362736bc357c6b5b5fbb04dc1a32492a9ec2e0b7aa36b05f2a5da6c8 SHA512 a2219c15b1482d0915160e721dfb6a734022a78b8252766f3b2f1e84c4d3587e8b45377f1df2799e8b8985ef601dc66fcd1cad2ba22d87ecf973c9998220c663
-EBUILD Perl-Tidy-20210717.0.0.ebuild 939 BLAKE2B 2d58f858be64a8f919b8888fec20e670b4deccd08638938e99b8372fbdef4890cc36c46557d812a3cba7518abf663dab587aa38f2f4f23e9fd9400dfac038050 SHA512 d3c4c285254d89fc62f4c0bf469617b8f281e8ed3d443ca52090c54ed3961734acc77623a101b02fc89b2c48e1006d3fd5353319c90f5a9030da8f52fb82bf49
+EBUILD Perl-Tidy-20210717.0.0.ebuild 931 BLAKE2B dbe56f61d0eea0a5128283376054d70221927d9adfde38eab1ca0eb4ef23a1cbcf8f3d4e06522190b5c92855e027abbad0a3b3e9ba22313ce28e284d5369cf25 SHA512 ba232fd327645c778e3bc8127cb110be048ccac1d6bf83c1c9fef033b4503ae8d57af743f6ac4f78d4b933793ca77a8224d8d79f62cb20d275d92f56bd9439fd
 MISC metadata.xml 1645 BLAKE2B 722e52d99ed6eaaa7162eed276ce9628237d8c69c030e33ee2761f6de9d5670d59a08a270bcd5969074c03b6f6ea3d7eb60c6a9f5501c78fc5a3b2933776d464 SHA512 a07316095afe1b7745dbd7086a220c7514644ddc1ff36ab11465834975faa42ba2523d23cc759469a33053cbb85cd87cc68cb51c93d4fc5c9e454487eee9ce59
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20210717.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20210717.0.0.ebuild
index 75a5c85ba9ea..847158e9fbc1 100644
--- a/dev-perl/Perl-Tidy/Perl-Tidy-20210717.0.0.ebuild
+++ b/dev-perl/Perl-Tidy/Perl-Tidy-20210717.0.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Tid
 
 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"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/PerlIO-eol/Manifest b/dev-perl/PerlIO-eol/Manifest
index b95684ef6def..0d87d66f4057 100644
--- a/dev-perl/PerlIO-eol/Manifest
+++ b/dev-perl/PerlIO-eol/Manifest
@@ -1,5 +1,5 @@
 DIST PerlIO-eol-0.16.tar.gz 18403 BLAKE2B e1dd73c78bb211d28cd42b168b701f5c58c5ba75d44e16c52e0ecd05c1c7ab981058f36728dafb80e88224d81cbcd17ef35313fd8d9492c7caad065ebf1101a4 SHA512 671d0a362eb7d8650adb95bb555851493299607f72f4f88fd3f3c70326825eee0879f6ac837e99f25498d6c32ef14c57f38c8b82de38f1f66a291ab23d733ead
 DIST PerlIO-eol-0.17.tar.gz 16555 BLAKE2B f50752314d303fa5d5e42f10cc54a4e239242a1a613c3ea64a1453420c7f34e8d1f17d2bcaadb29db1d46fd54d800764479a6af98116f623e11825a393c3d512 SHA512 3be4ced8c173fd0dee327264b6ddd586231fb8c8acc3ee92dce4332db97f8a9649f2af07690e9083767f17c7ac21282a300aef89234048e43851be2b61db9da3
 EBUILD PerlIO-eol-0.160.0.ebuild 736 BLAKE2B d9013e203e7a7e86ff6286a5f0f899dc6348b52a68f51becebabf0b24869c1055248b40eb07f26c76c6cee0a937f70a83c4a4beb72bed767eda9d1a0636f5559 SHA512 11aa9b784776120007f90ecb1ff5b91329c6e8bbed924f0b062a24f3202bc359b4920437fc71d4158c0406ebe76a020c548fb5d6a4d2003d7444964951aaf3f5
-EBUILD PerlIO-eol-0.170.0.ebuild 551 BLAKE2B 3557fed360ac5a38baa8449c018ac3431eaa545ef3c499e83f3c7004df01542d375c61e7ed140e9e6724d74daf27a02543ab973be16da182f0791e02c9a4f645 SHA512 c565a7d40b77eda165618915ea86c9b66f5d93238e1a167a60b5baca7f656fa6afee7a26a75d767e86b6346926cdca18a521def5d1b08af2d874a276219b01c3
+EBUILD PerlIO-eol-0.170.0.ebuild 548 BLAKE2B 16fceae287aafc1652cd5248598aace6a33090aea69aba78b69e65a86982f41719dc5b4c378b4f6e35ea42ebc74a8fc08e618d1c66d6899b4b8344a83acb3c07 SHA512 cf292a3f128cc3a12ae096917ca5e84b4a61d6278c5f9b51eb10e61fa33396abb96b03330c606d8cf2be0deaacc2a740fd1c33ce4917aac790b788cd2a9e74ee
 MISC metadata.xml 393 BLAKE2B ed276ef7864093f62f746f1ab7888ef11f77d94d5dd40728546261a5e9b040be14b946921fdc2da9f687c7be0d139d9833fef87772eba635853f9209ef42d8d6 SHA512 5289aef6591bc990568df1912f762e16788742cdb17145b5bcc1f05fd3c538a8d3d65b507ecf98172ce1f5bd18da69e5654061e94ede2c3af5b0d4f51add4878
diff --git a/dev-perl/PerlIO-eol/PerlIO-eol-0.170.0.ebuild b/dev-perl/PerlIO-eol/PerlIO-eol-0.170.0.ebuild
index 65650e83b8da..ffe780112200 100644
--- a/dev-perl/PerlIO-eol/PerlIO-eol-0.170.0.ebuild
+++ b/dev-perl/PerlIO-eol/PerlIO-eol-0.170.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="PerlIO layer for normalizing line endings"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 RDEPEND="
 	virtual/perl-Exporter
diff --git a/dev-perl/PerlIO-utf8_strict/Manifest b/dev-perl/PerlIO-utf8_strict/Manifest
index 042b378cf06d..fce9d7a4203e 100644
--- a/dev-perl/PerlIO-utf8_strict/Manifest
+++ b/dev-perl/PerlIO-utf8_strict/Manifest
@@ -1,5 +1,5 @@
 DIST PerlIO-utf8_strict-0.007.tar.gz 67922 BLAKE2B 4d13dc6e6b4cdf7a4bf3cd51ca1e054d82cab4094894f4cee7503201cc11f80ab27951417778f7e179aee03b75b4bbb30e839a498c83d5afd3881db64973d324 SHA512 0d39be9bcbab4cea087f59c67dc1af6773b6258c5e836590ff58cc18bf3392ba6e95c55a0c7ce94236e0be7053802b4b1d6010130355e1a973a3698aaf49af0f
 DIST PerlIO-utf8_strict-0.008.tar.gz 95180 BLAKE2B 5e041d619036e589cf3d9272be20f2eaf50066700d5b401e923fec4745ecc2f74107f2a57a9b2c22a4b4ccee908a595b7618a2c5f74000635393ef9fcbeb8507 SHA512 5a54c379925880abca7f85a2b08c19d54e222a03e06490ff366ee38e68018b5f6a4ab0bb8df15f9581b6265eac550090a35f3a4f52c748c008c9c575af41c911
 EBUILD PerlIO-utf8_strict-0.7.0.ebuild 852 BLAKE2B da34d11d8f05cb4eeeecd7910887155c59ad10e22fa8609a1e221a2907a34e98c1d1f2abd587d68b5c4ee460119f66b554d217090455a8b5722a005fa9a7cd45 SHA512 462a18bd5bd5679ca689eccca92ef705a14013863fd91f699760e2e981ee4c736009193e12d0e4f2a9aa3dcc4df8f8c887b4ef4b8abc5047fdd9f828769af383
-EBUILD PerlIO-utf8_strict-0.8.0.ebuild 676 BLAKE2B ba4e1329934df872e77228b84cb8b8c14740ce37d2dc9caa37a15178638ef12924f82b0c12a14479de13fc91a2ac324316f6386aeb8f2d5c564f75494a544302 SHA512 a1d96970eda809bc1bc842cd294aac44b4bb2c5f6d7fac9a521d58d6462444ff57cd5cd9ed3155c177e3bca80b4affeed7e63737fedff0730ca93c75a1a94e01
+EBUILD PerlIO-utf8_strict-0.8.0.ebuild 668 BLAKE2B 52a60e9eabeb988296b1e86cebda447478b72d15b7348720300d0e451aa974cf0ca6013e6aa1a781d96b20f279df064fa49cafaaf451287b722d44e33dc5bf4b SHA512 f0012231778009bbd8773409256977c13c716da24fc8a1972a56dc7d9cb4b4d6c0b3c21326a1546ee563ce963d8a8952285f5c8b361d056e0db198c858fffb22
 MISC metadata.xml 409 BLAKE2B b6a325ae526d34544717473754b77c0f60bcc1013dc0a0e67aa352ec53538b590e01252b41569a03dd99edc12827bdd5bc83b109e2c6f62280b850443b6e1250 SHA512 a0e390dbee5df2d5c73564e68a61830b00d111615ee5e3e4f976e3aadff1dabfe578eb66d6394d186aa9027a79fd9b4852ed498af15202ade3339e486a9474b0
diff --git a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.8.0.ebuild b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.8.0.ebuild
index 23904b32c07c..7cb2c16fd1d3 100644
--- a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.8.0.ebuild
+++ b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.8.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Fast and correct UTF-8 IO"
 
 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"
 
 RDEPEND="
 	virtual/perl-XSLoader
diff --git a/dev-perl/Plack/Manifest b/dev-perl/Plack/Manifest
index 4b582675d7a5..0d8d3ca3f04c 100644
--- a/dev-perl/Plack/Manifest
+++ b/dev-perl/Plack/Manifest
@@ -2,5 +2,5 @@ AUX Plack-1.3.900-network-testing.patch 6047 BLAKE2B 2293cc7cd0ae0b429b5923dd2e6
 DIST Plack-1.0044.tar.gz 178730 BLAKE2B 60f6a900b1ebf05c48295ae679e7cda905441d4322929e9280aa87e6fda51a08e3fbaef37e2398fcfef3b39268f115603dcec2529dd135ddc86b79c9118da0c8 SHA512 a0dae77d507d4b4cf4192931470cf87f68f7027b2057ccdf757680f9e6584534ee0da79c508a44f9ea72426497e1dbbdb7acf6d7dfdf31698f4320f2c1f2ac61
 DIST Plack-1.0048.tar.gz 190445 BLAKE2B e9df8f26e2d7c699581e77d3a67fea9ff98a62cbd73e039700f0f06d7dc6b0a99ddf7301bad95765c4302225c5a5f2cad5088306d44467e587d0356455fadb26 SHA512 52168240deaaf613a86a157bde426d22e1e857e0506605f0e7568aa05b968d236ed42843772d7dc187de8f9ebf0329999ac534c04bda8fa739173da45828a5e0
 EBUILD Plack-1.4.400-r1.ebuild 1768 BLAKE2B dc4ecf966e8f46a8abdb1fe0c441df06e61e58d60cd4b4d006cf7b122b6f12eea906725861c0cd5a4a2d6a01dbd426f3f564b2a377be052c126b16dbf8411c59 SHA512 c908c17bb9523dfd8786c8c7610968362e4500b9c3757b6d680f9f54c84eea228e48f3b35a702d6c0ca00a402159415f6a131307642e235d430fe7c4984fd07b
-EBUILD Plack-1.4.800.ebuild 1764 BLAKE2B 42c0f678f379b50aac90f3164c88e3fafaaf53269c586e30dc3a226d7591b93a9e6f47b49ba57f13eab187519f942dbacad7152d0195c57829cb4306da4ad484 SHA512 1094df1642bc8a8340faa3e1429f146234a3625897a8e6f7ab64d3a4c8f52605f28624f3c2bcdaa1ea3271354b84af05a719a8fa6862f18f157ed343751b219a
+EBUILD Plack-1.4.800.ebuild 1759 BLAKE2B c74be8073bdfbb54d1b4f280221fc453596f0b74367d8353d9c9dc5d32f16faa4d6706848d8ffeca5664425c9d3164a2f7e11c33f0ee7e9b3ba837f407dda1c6 SHA512 e3827ce5addb617e707ea9381236c953f6033c641c56600213caad48293853ab7f2065a4238e47ac194252b564e66f307d5a184adf5587735324cc6fa8451eb1
 MISC metadata.xml 5554 BLAKE2B 3f97ec177ff72db69cb11724758ba573709fc2c8c125578d7a7e3b9fd97778b50b55bc40d4037d1fd571c1ff6ff60c05949cadf8c58eff65d90e4afb4f85f3ac SHA512 21299e4222411219b4a63b937d0fd9b5479479934aae60d185f351348c4f93351111abb8b4b68cb7e9238b41de9ad9b3f762b8c3d6ecf4f64ade520baf4d1222
diff --git a/dev-perl/Plack/Plack-1.4.800.ebuild b/dev-perl/Plack/Plack-1.4.800.ebuild
index de2f26e9ed48..11b8286ad134 100644
--- a/dev-perl/Plack/Plack-1.4.800.ebuild
+++ b/dev-perl/Plack/Plack-1.4.800.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="minimal"
 
 PATCHES=(
diff --git a/dev-perl/Pod-Elemental/Manifest b/dev-perl/Pod-Elemental/Manifest
index f33c28042f07..7ce33ee1deb9 100644
--- a/dev-perl/Pod-Elemental/Manifest
+++ b/dev-perl/Pod-Elemental/Manifest
@@ -1,5 +1,5 @@
 DIST Pod-Elemental-0.103004.tar.gz 37215 BLAKE2B d2d8dba34fcc47fbb809674571e6c931dbdd6b30479207f38836b97615b0a76fbbff2b3d78594ba19f9e3c8fbf7c22ebd50d26c28115e53e750ef9814a982491 SHA512 d2cae23f7c4131f74374f72aa52e58840035f2245d290f82594265089400fe669c0c03cf01c5b65688770b1b5eba6f611b60693b245af637711330fe8c617a66
 DIST Pod-Elemental-0.103005.tar.gz 37245 BLAKE2B 2d27f5ded1919584139ac26035380484ac193fddcb3739707ca56e56e1bc352df54ca1b8411329b83a02dbe9f0f656075bdf8dbf71c4abcd2ab9ea657c4613fe SHA512 bd3c6c6d5aef5b0242daddbba7c00b9cabdee4e26111562bb3efcd6032044b581ee8e66877d8ea07baff6b076cd6cccd0f55be210fbb35344a324f93d79ca667
 EBUILD Pod-Elemental-0.103.4.ebuild 820 BLAKE2B 77158c7ca20edce3ce32f905b7f11d995550f6c4355896d87b3f4cd45b2d48f6c15315b20199932c20c7f0f01180cc91461bff4f0f185f133bb6835365714b30 SHA512 970798f16b9e8a3abed1bf68d9d419d3fda98cdccbee60e4fad60a5f2a68c3f95f8c24dbe050b1a93abb50e7227c6380a9fdaf8c3c7156d40744e5a51b954529
-EBUILD Pod-Elemental-0.103.5.ebuild 783 BLAKE2B fff34ca7a0430f0ea3c987fcf68d5c452a951553140b657394858314a160c3bdc7f72a8f12a2417b85ca15281d323e55c2ec5c51517e19465f2d25ba1e282b4f SHA512 32f2690e7734802da692c6cce8e580f57a8830045515617f3906395675cd0116011932f42549c486ee703a2e91daccb43cc773bd4a293ea8e7780a9284ae3dd3
+EBUILD Pod-Elemental-0.103.5.ebuild 782 BLAKE2B 7118d33d27f7f9aa5b1f92e13c5d60ea3fd3c8a9a8a8027371c29640437521af82a9c418eee5bfe6dbaf6413103005f680020a0c10467a79566bbe6db50e85ff SHA512 d28257b5bc6db785016c4a9ac7b607da72059ddbcb168cc9e9aa7f5e5161900a78ea78122ccd60902aa50be3628addc96fe3952a4f586923edfd7864b01cef36
 MISC metadata.xml 2355 BLAKE2B d6366f35439760ac315dca3b7622d1721defdb86ecd68e30b4d33aa2fc7041316d84e44d66e5bd7526d564b4c2b294dc242f503f06dcad304c76db27ef86514a SHA512 905a6cf5a4578205c5a133d08bb2c277d0178bbab39f21ef3794b46222dc2b39138404ee24655932ec326d829ce6632952811069f20c7b5c3bfd93b7f6015f4d
diff --git a/dev-perl/Pod-Elemental/Pod-Elemental-0.103.5.ebuild b/dev-perl/Pod-Elemental/Pod-Elemental-0.103.5.ebuild
index 297c7ac810d5..b38724d8b90a 100644
--- a/dev-perl/Pod-Elemental/Pod-Elemental-0.103.5.ebuild
+++ b/dev-perl/Pod-Elemental/Pod-Elemental-0.103.5.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Work with nestable Pod elements"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-perl/Class-Load
diff --git a/dev-perl/Pod-Eventual/Manifest b/dev-perl/Pod-Eventual/Manifest
index f1db0ba80195..38e335a66de4 100644
--- a/dev-perl/Pod-Eventual/Manifest
+++ b/dev-perl/Pod-Eventual/Manifest
@@ -1,5 +1,5 @@
 DIST Pod-Eventual-0.094001.tar.gz 16640 BLAKE2B e20422427f26d5b80ff89be8682e92b2542c98feaa0ecbe24fb9505627e6a77595568d6d2c0e23d6da6303ea3c45a24c3dc0f83393fecce5061fc33eff00d487 SHA512 f892653f6895381b3f493b44e8c295d02bf78e70e64c23b9c8602e6692517790524cd5996bb6d84aed7b4e8da60eebe99330a53e5f26f75e4ab017d6e8d317e6
 DIST Pod-Eventual-0.094002.tar.gz 20886 BLAKE2B c59637efc78b5b4360e83608220083e95ae73648e7acfc74a49ec1d66372f33d4540d6063c883405eb8a520284d46c52de21c83c38b59de9d9bd53b629f49389 SHA512 4442a079faaf2f1eeae66639a247a3f1b55eecc1d1bf680dd4429bed6fcfc75824d3ecdf28b32a40780881bab9ebef6712291bcbf955b0f97e82340d407be2a4
 EBUILD Pod-Eventual-0.94.1.ebuild 561 BLAKE2B 6612ba4a6f18829bb038bf021aab4d7d431b72b4d0186bc1da3ad9b7681dfa72e41af6c192d3c34630db9433694fd45c213b254a7915916c5ca7b82ba8bdc30e SHA512 02e535e52bb2d5ff231720c0e3efd89f26b210c531d372d2244808faeaad00a6413f94f059373f7205ee967ff5308f2d2057e8dc1703079fcd4f5aac375b7ff6
-EBUILD Pod-Eventual-0.94.2.ebuild 496 BLAKE2B e3290efa52f712a1d822d0994dc4cff78b6de1c8c41509ef0f6ad0113f91c54bad785a5a6090761a96b48ebf6a07dd3c7d8c8870426bf0f3dd13192b9b6e2233 SHA512 264e53260ddc605709402419f0f6c326c42049e8bdafa932aab1087255a1a8858a3de2b23b321d69a7faa2cb28c75ca6459e26264f7af193ab14345b3858dafb
+EBUILD Pod-Eventual-0.94.2.ebuild 495 BLAKE2B ad0d0e107f79b64d5404248f22ebd9fb3fd44aa2eb66b741b6885f9291e7311c93d9f3c4f68dce5dd545fcca39c769d0ea2c224d5c25ee6cb8b5ecb3a94b10b2 SHA512 1cb3e1187ae47c1c297bf51b143a9bdb3e13d0e842ffabc84500b9904a0ad86b8208dee9185774bcc1d0ab7282d89d4643021b6fc11bbd333d9cb7e8a1e213aa
 MISC metadata.xml 465 BLAKE2B 78a21e721cc59fc22327d41ea657fd1d3cc6d5f6911bf61c2b227430cbfe5f08bc905a2f03833978fb27648107b106e3ad3524198efbda26e2ea20c453c9648b SHA512 22f70ba8c6f702f3fe82d155406d8145ddbeb77de60c3f8c9688795aa21c586cbac7e4c71c3076718a867bc4735900c5ba5a7b3070eb74ad072e0304c0afdf7b
diff --git a/dev-perl/Pod-Eventual/Pod-Eventual-0.94.2.ebuild b/dev-perl/Pod-Eventual/Pod-Eventual-0.94.2.ebuild
index b8126e9afe48..a40f8ced9aef 100644
--- a/dev-perl/Pod-Eventual/Pod-Eventual-0.94.2.ebuild
+++ b/dev-perl/Pod-Eventual/Pod-Eventual-0.94.2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="read a POD document as a series of trivial events"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Pod-Markdown/Manifest b/dev-perl/Pod-Markdown/Manifest
index f42ffd8a998d..2b2663c1bdfe 100644
--- a/dev-perl/Pod-Markdown/Manifest
+++ b/dev-perl/Pod-Markdown/Manifest
@@ -1,5 +1,5 @@
 DIST Pod-Markdown-3.005.tar.gz 57716 BLAKE2B 823826c25b0d333941f08af4fa9c9690e9686cd407e8e5084987e2eb7adc63b9027a414fc30f96bf632e89d147e4a1108510e09386d257d7174c412876102548 SHA512 1fb9879913a5f9229267c84bbe97aee624330f3079827f18aa7db31de0b70e0ef0df55ea2ea01655f4b335c7b2338bdc1e5156f49088d6ce048bfa38713ee2c8
 DIST Pod-Markdown-3.300.tar.gz 59370 BLAKE2B 3f78633253368e692e720876b644e6918df5925a7d24995745c9fcda9ec95cf31ce63623ae720eb0cd1ceae64ad54b6c779414115997d3ddc958e63b9f36d375 SHA512 3c4b0d44a94f5542662c45ba03d5fd0852619c9881edf9ca0b006ae05e8a4611ca1b7495dfa32d02fc036e25847146a96b53a4970ae712b5664d328c8d841e88
-EBUILD Pod-Markdown-3.300.0.ebuild 820 BLAKE2B 0c035dbbfaea8cc7311c2cdc092c67191e9abe83c332a690db42fd8c3deed169268a7b34a3961cb89f781d63e9503fd093fc921a91b6b146461a856d1ab06fe9 SHA512 cd648e05affb5f55517467d5e3dfea2a4dc57a432b04faa0dea18d069b7bee8bb471696107f9f9ef2feed7925b7bc3bfbbc4bd94f9ecd156717c297fb08b6c9a
+EBUILD Pod-Markdown-3.300.0.ebuild 818 BLAKE2B 4b60612885b5337314e91533cb649bf6ff2bda751c7d91d8ec5fea282b4ed2be6303b9c714537e153a04de08def223fadccfd8240bc51721f2cf7e6f28986017 SHA512 0ff4d4a6cb468bf420b48d8f0e82dc5310627185e480d9d9f79c2e34724b65300553c6a84bebd4a2604ebf71f490d27a4f4f4bba27bcbb34d48bc881d3a628c0
 EBUILD Pod-Markdown-3.5.0.ebuild 835 BLAKE2B 8d44d6f824a096d1021326b52542005f945436b3f5d0fe1d90cad554522d37f7bbbba65010e0f69508e2cc3551d2bbf5fdd60b0c456fad3f944d2d3656eb9215 SHA512 5cbaa1582f535812a5d899883ff9070e4cff11e76bd29f8993c8af38fb5920e5bbdaeb5a02db7b0715ca48f7dff195b6bc6a4e4f685609386c22d78f9499134c
 MISC metadata.xml 463 BLAKE2B 5c03515e2400c1f908cc0a9ddf6fd16824b829be9e9e6650a6197cd62c47c3a55fe3add09047551c078897f450af6308d93ab4d8a61bdb175af21a9e2c3000f7 SHA512 8debd2db61699f8cce26824b136fdf8cba44e4935b0d696c45e8a0a1fc5792c12e38bd6fcce0ce537d26fcabec72346ea32ecb6f98d436fb315d1458e5fda0a6
diff --git a/dev-perl/Pod-Markdown/Pod-Markdown-3.300.0.ebuild b/dev-perl/Pod-Markdown/Pod-Markdown-3.300.0.ebuild
index 913f89f4d8db..4eaf64899021 100644
--- a/dev-perl/Pod-Markdown/Pod-Markdown-3.300.0.ebuild
+++ b/dev-perl/Pod-Markdown/Pod-Markdown-3.300.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Convert POD to Markdown"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Pod-Tests/Manifest b/dev-perl/Pod-Tests/Manifest
index 67ff03a61e8e..9054dd78dc71 100644
--- a/dev-perl/Pod-Tests/Manifest
+++ b/dev-perl/Pod-Tests/Manifest
@@ -1,5 +1,5 @@
 DIST Pod-Tests-1.19.tar.gz 30157 BLAKE2B 86bf04b1412d0e7337635d347e98a5817ece62941cab2c8c974f007b42b22946586b82eeb0212a7994b60c85c31aed2e4158116a0a4fb19dcf7438dc79ff1db8 SHA512 fb48e912f33bc36b782eaf71797732358288840148bdf69ce3381038c47de31e2e111d16d47351c75169016a8a45dcfdfa6e290f61acc8d130fd6c4d0c7dfb9c
 DIST Pod-Tests-1.20.tar.gz 31109 BLAKE2B 16bcc5dcdffa342b7f70eec7e2fdcd5f484eba6f86a40be678f6477f10ec2003ad3dd96725a1c6d8c70a78f451d096f843883cf64f8bc6f6d56076033d8f59ff SHA512 2be444cfdce172d9f82f8df5235aca966b1e1af4324f6e3bd02bbbf7c3940a6c2329bcaacf8281b8ae58563b82703fc5c3af333dc2d6bced76b9ddd4c3458bf6
 EBUILD Pod-Tests-1.190.0-r1.ebuild 571 BLAKE2B 95cf5725093abaf5ab2b0b966e05d6e2c4caadb90d516f918ace3dac36b98f76ce26e9d5fde70ee7d5158fe3e4e6098940e70550af4032c69c6689c30f10b3b6 SHA512 05b9e48aac55343fe69b503edbf3c8ba7882b8b6120530f0ae68c2b60974fb5efd5fa2c5db0ba9806c9eff98e5f40e699fd2b460fc7febe17fedca18e7375b9e
-EBUILD Pod-Tests-1.200.0.ebuild 378 BLAKE2B 4b58a1e17f671783956938337358dbb48ddc75e684bce98488b14a6a241f9ecdc8ec342a6970746cce5cca1c0a3f85140c610bf9cf620593ecff38d55df58bea SHA512 bd1322e60162cd234309e7727d52c11c65c1ca3cada4a071b1e92cd018f72b473014d2698220340ca508d672a85f93fedaf7511c5fca21fbd27a4e566c33214c
+EBUILD Pod-Tests-1.200.0.ebuild 375 BLAKE2B 9bb575b5e6e4fb1ce608c53acd2b911aee5b2d08e96559709f8d52a4506e12539dc56447bad59bda473000af2eb50e25b753bbe1f24aedcb374f4cb183230fca SHA512 1497e19638d06da51fc60bb9cc2d5484d0d7875e3c6991c971f5570680f84023732059ded58892d66b31ab30e443572abc2bec829f7fb34898e6b4e2c3a5f84e
 MISC metadata.xml 391 BLAKE2B bd2a077d89f74d7b08382f1336dc95a03f30a6b090de330d22f6da4d71f713b9d191fe7d7ecd4ff3160005de205d6855e9a9c708e10fce3fb0da6fbb69c52006 SHA512 77742482cf463ac4f040ef37ffa177941016aea5682f3f72864ec06efc48a83289f7d97f46fcae428b72f91aad964517c39d8f170bd961ca3110b90b364cb432
diff --git a/dev-perl/Pod-Tests/Pod-Tests-1.200.0.ebuild b/dev-perl/Pod-Tests/Pod-Tests-1.200.0.ebuild
index 60bbce92c33d..21c4b2270180 100644
--- a/dev-perl/Pod-Tests/Pod-Tests-1.200.0.ebuild
+++ b/dev-perl/Pod-Tests/Pod-Tests-1.200.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Extracts embedded tests and code examples from POD"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="virtual/perl-File-Spec
 "
diff --git a/dev-perl/Pod-Weaver/Manifest b/dev-perl/Pod-Weaver/Manifest
index 5d2b08794235..82934aaaceda 100644
--- a/dev-perl/Pod-Weaver/Manifest
+++ b/dev-perl/Pod-Weaver/Manifest
@@ -1,5 +1,5 @@
 DIST Pod-Weaver-4.015.tar.gz 40303 BLAKE2B d0f33427a2a01682b7581072ed47ddc5c1cfe33794ce552ad3a70dcd7c73f0a3280a91e28cf5a207cadd4d074600864a389e25eedaa02500d23d46ab45677e17 SHA512 333e29757766b0c2ddd39cde3ef0649a3e79143a611c48c3644807d248c0c7d6a027683ca88158bf59b369b1e329cdd6f3f1c3dda6c3baaa26648f80ecdb4a8d
 DIST Pod-Weaver-4.018.tar.gz 43480 BLAKE2B 8a73914d2de336ce4f1b66665768a9df964e9dc9ff11e412a539395f8aa39fdf9ddf62b85fd06de5a1c076c587b8796e9c8edcb1cb4b0bdb67e93bdadc793bb5 SHA512 fd8d2665866e4fb0606111ddeddfc992077b90419bb21905514590815594b0b918a98ccbfa92fa57a646b52a0a061a02e718926edd3a7dfed52977c00bd18472
 EBUILD Pod-Weaver-4.15.0.ebuild 994 BLAKE2B 6b7e29466d82cbe7dbaa7138af5c2b6b56b549de8c35b9608082e6b472e29d6fdc06e236522684cfa6548b23218acf196ce1a2ec3627025ca285cdc2bb9e5b57 SHA512 05069b048bfcb9420fd2dfabf6f05d851b98c1d00500265194116c1f7134ec8ae0811fd0db556cf02204f9ce87ff62c54e8082e6badc9b924b29039d9e55a78f
-EBUILD Pod-Weaver-4.18.0.ebuild 981 BLAKE2B eee2c3bd32b28e8a02796fb980cd622174f1495dc808d216fbf0d4d90f41c0ceb12c4b32bb39145f153e0bb229b9ab55f6eee0ce820e067b1520a1840d5933ba SHA512 2a4a7a3e3df617dd27f556384865787cc946e5fe490ea8319809cfe9104031b47c3800314097264b1d57917a75108c49a1712a49dd819752601a58448ebc60d7
+EBUILD Pod-Weaver-4.18.0.ebuild 980 BLAKE2B 00883c68b415061ba2e1404c6c33eb3ea5802e7650f2f7366fc7d2aa0118936e3a36d76a99116668d818bc7dcba04235aa50d49a98a454250f34df5f480f7a6f SHA512 5f3a63e7f3b484a56f28fe317e1c204a690ad9bba7ba137db8d6aa8267bdb282a3b06964ef965e27b53de28859d6b650ee2b153ee0c1055b5ff97d838bbac4ba
 MISC metadata.xml 2292 BLAKE2B 93269ff1e5c7ba56c41b01341a70f272183cf60bdfe33c1083ce1e2c72110f9c6156b45dd5df9887fa7a0b674efe069e12fad9f2887c13059dde855f281ce542 SHA512 4348aaf2047b21c2bc20f1392dcbcbb5d4586abba7f8def5968006a14ed6251091b0b0b09ada140037b7343cdbeeba8897d928f2d2df1f89a14eb957e79c6205
diff --git a/dev-perl/Pod-Weaver/Pod-Weaver-4.18.0.ebuild b/dev-perl/Pod-Weaver/Pod-Weaver-4.18.0.ebuild
index b9bed70494d0..a9d864b776d4 100644
--- a/dev-perl/Pod-Weaver/Pod-Weaver-4.18.0.ebuild
+++ b/dev-perl/Pod-Weaver/Pod-Weaver-4.18.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Weave together a Pod document from an outline"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-perl/Config-MVP-2.0.0
diff --git a/dev-perl/Proc-ProcessTable/Manifest b/dev-perl/Proc-ProcessTable/Manifest
index 6d4fd854ae2b..92fd00a2e169 100644
--- a/dev-perl/Proc-ProcessTable/Manifest
+++ b/dev-perl/Proc-ProcessTable/Manifest
@@ -2,5 +2,5 @@ AUX amd64_canonicalize_file_name_definition.patch 396 BLAKE2B a26231fc5009f5763b
 DIST Proc-ProcessTable-0.53.tar.gz 71060 BLAKE2B 86726879160d12fded9cce8f1fb7aabc87817dd5338ed0ab2babd1c5679714a4ae833630cb5b0d35da538307095cc0b085448d8f9291a76f26a284d407959223 SHA512 9eb11963ac2e86fff63b515537c41297af2f3610862fe18525296e18a9abc68e4a61e95ea824e8a91d9e0a4ff0e5d909fa1252a30657e9bc22df129090edb4e6
 DIST Proc-ProcessTable-0.59.tar.gz 75949 BLAKE2B fedcb0d407164492df551d88c1bd57997c3c55d86cac975ce6dd9f21a61479ef86e1bd5c9731a7519fdac4a4be1a06e1a86f8567f961f691b1a6d0bf6cffd7d4 SHA512 25162732cdbfdc151db69d6b225137c60dcd1dc31671119007814b2bb82dd7d7c50f4ec4ef49e0cdf2eb04d6d7b60f4d6d39804ab9acada5f1b0230b387e352c
 EBUILD Proc-ProcessTable-0.530.0.ebuild 786 BLAKE2B af08ad1240f732fced9ca6064b35ea853e60307b7896b540b963600f8734405bffb32d7c55cdca3bf9e7c32edc9852823865f1f6aad40b8277c0f6cad4455f1c SHA512 16904b38e09d8a927b1f5bdd40d62b2b9cb0bd7971ea5ac447c9f9b267b5ab8b748e9079366ee8562bbdcdb4752033eeda84e4cb2b171b4f03986b09d73a05f3
-EBUILD Proc-ProcessTable-0.590.0.ebuild 514 BLAKE2B 609404ef54f0ef20f0c2372726de0344645f6a6f0d39a04f311f96db15bd275c04a7e3c4b89f5627db485e982e390d7ed9fe51ed830fa836021f1b8da15cc20e SHA512 73af3037e64a7b200cb39060b20d8194f53c40c19fdaca10f2724e39871a0e3d30c7f06cd2055f7c8ce4d1d40468f4a7d6faa5e175244496a3752a7c4a195544
+EBUILD Proc-ProcessTable-0.590.0.ebuild 509 BLAKE2B 2cfd5fe2e39bad2bd2baa5289c14e88bc824bdae142e89ad505a7e0d67323cb0760d804ec9f9fbd05308af0aeb2865e5f57a2bbd42ad642503abe0735b757fb5 SHA512 84e5d962bdfac71fd6a5fcc941aafc8e022732042d9bedc66b80943d355a665c8c53b5e57c9bcc7526811cdc9e790cc5427f370503ce76405e36abc73375d7d2
 MISC metadata.xml 601 BLAKE2B 6adbf699222c929e38bea5631af0f964135f59072e8403287bf5f2c26bf7359ca07d18b91601175999c48fdd063a31d4eb4d5c2742d8020428e029c82843e46d SHA512 c7164f478523f7eadc695dbcaee0fb37c068cfc246596173c4f3995a4d31d9bbdccd2e2ba3088658d6f08955e6d80e385cb16eb5a039ffa53cdca72b363c8def
diff --git a/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.590.0.ebuild b/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.590.0.ebuild
index 5d45277db1ac..95f74e6eb2f2 100644
--- a/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.590.0.ebuild
+++ b/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.590.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Unix process table information"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="examples"
 
 PATCHES=(
diff --git a/dev-perl/RPC-XML/Manifest b/dev-perl/RPC-XML/Manifest
index c4de719a67d9..f4daef3ea0a7 100644
--- a/dev-perl/RPC-XML/Manifest
+++ b/dev-perl/RPC-XML/Manifest
@@ -3,5 +3,5 @@ DIST RPC-XML-0.80.tar.gz 211223 BLAKE2B e26ba4f667c227e84362ca8e09d17ee01ef45c25
 DIST RPC-XML-0.82.tar.gz 225690 BLAKE2B 4e16730a5bda313d43b00eaa8617e009a157867f286f17afb58693beb881ac2329ebee93d98c44c8742be2608998c1d2e0cc4f323be83ae9c5e9041c5bf90b3c SHA512 e5d1092a2807c2bd423502dd2ed53a72c57384b67bb4709e86a64a6fe37ce8af580998e62fcfa6a48d66d5308d9dc270c74e4293617b9f23a654e379cde4025f
 EBUILD RPC-XML-0.790.0.ebuild 1491 BLAKE2B a6ba810a160b5964cf51ba2ae95a8c142c38f134d37e8c8f3165488cd0252e1c292e3074123acfe62380e506289c414f9b37eda46aa46d8182cfaba867a08273 SHA512 a229dd41353a69a456f5631af14fdc5d4b2b27f3b5e340bca02457244f1b8a0dfd14e168ee2805c32adb2eca9f917a0f38ebd5a042ee4e6caecb379392380a96
 EBUILD RPC-XML-0.800.0.ebuild 1698 BLAKE2B 21759e1ec59a769ddd3be150959a4ac5cd4602ab5399170b99e7e4fad27500260f466e5d57766d69c161e7ce881eb19d27acb82cede77c208a68783ad89c4092 SHA512 62323e1434fb1368cc899363421bbb08c85cec91b8f785c5585bccb02404c3ef2ff2c996960c9f6ba097f9029105f79dd95153e94fe9635c0c40314628cf9f5a
-EBUILD RPC-XML-0.820.0.ebuild 1737 BLAKE2B 7eec67eaa5172771d58b7825a26ca55a40bd393168b8941b4b10206c699f47120dba28e4880499bf5ec47757abb1909d1e4528c73a3d374f3561007229c4e365 SHA512 6a9cfe0f4782f7ac808f1de70424c2dd7466a217248f38d3e5d86a0777cd3de1e77fc0eade4084ee58c2be52229a7e88b8aa4b603e3cf0a0b49d9ea063eb613b
+EBUILD RPC-XML-0.820.0.ebuild 1801 BLAKE2B 29a45c82fef372bd4931638fa2fcdc3d1df610a3849e26c72ef3d0e25b3565ddfab0b17b1145de75c194a46855f0bc0dcf1dac79a29a9266d33cc2ea2423d8ce SHA512 ede5c9f3a8ce6ba14dfc0887de2b70320a888e1e1990e3c0a8272aa192a9e542b03fce5be448eeda720b12a52ca7d2237ca1dfbe2c13338fbf51bdf4ccdd56d5
 MISC metadata.xml 2133 BLAKE2B 54116c8ead88f2ed2f00d68d97b4090ece7914492e86d3c74d87108ee6536baff458c858c2b072b99bd5791d57bc0ecae586a316cc5dfba6ff053f0e083741e6 SHA512 72f9537a79f1088cb50abbe3992e87cceb2be96cdaa3d154bece08959706fdb495a88877d5fa7cd089e509e706629b8f7ad0c0d36f2813b98184df099d86cdfb
diff --git a/dev-perl/RPC-XML/RPC-XML-0.820.0.ebuild b/dev-perl/RPC-XML/RPC-XML-0.820.0.ebuild
index da44e8ec845e..c6b534d0c768 100644
--- a/dev-perl/RPC-XML/RPC-XML-0.820.0.ebuild
+++ b/dev-perl/RPC-XML/RPC-XML-0.820.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="An implementation of XML-RPC"
 
 SLOT="0"
 LICENSE="|| ( Artistic-2 LGPL-2.1 )"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -29,10 +29,14 @@ BDEPEND="${RDEPEND}
 	>=virtual/perl-ExtUtils-MakeMaker-7.560.0
 	test? (
 		virtual/perl-IO-Socket-IP
+		dev-perl/Net-Server
 		>=virtual/perl-Test-Simple-1.302.183
 	)
 "
 
+# tests seem to be a bit flaky
+DIST_TEST=do
+
 src_compile() {
 	perl-module_src_compile
 	if use examples; then
diff --git a/dev-perl/RRD-Simple/Manifest b/dev-perl/RRD-Simple/Manifest
index 89d26133ccf5..f1b8646742cb 100644
--- a/dev-perl/RRD-Simple/Manifest
+++ b/dev-perl/RRD-Simple/Manifest
@@ -1,4 +1,4 @@
 DIST RRD-Simple-1.44-patches-1.tar.xz 3740 BLAKE2B 164370f9a121efee897b17ae11e7f02f3ea92a69ca05851d8902b1a08ce629c096bd20ee9fe00758ddf7f309d9c1b4470c601e183fc7eb3b38950fb5339661d1 SHA512 d9f28d2da3ef2478c031c29eb80cd89a618391e0cbc7360cbf17281a971b7411761259682ff954af6b968e87d400e84dd125fff90adc248b92cd82903c364372
 DIST RRD-Simple-1.44.tar.gz 303444 BLAKE2B 5f303a809839e389713743737405e6ad70038c4756546be00b6d2e7ea65bd0f887654c286b3ca30306fcde01e143d0b8f882c59b6a26376c30c557285e333dc8 SHA512 3cf11e08ec5ceb6ba81d9a12944a24fad0af644a8ba0f4c5e2dde4dd47fe6fc50db89be36c6a110a90209e5faac143cb5a063dddfb0a13f359a12511a51369a0
-EBUILD RRD-Simple-1.440.0-r2.ebuild 593 BLAKE2B 5b5ae829eeeb4178c30a58bc79e50b4cdd40541dddc4eb378e98ece42b2a295305ec50b3740a4ad1669784ab8b83ad8d19aa0ebe8520efc12ba1cb0d58567efb SHA512 659fea6cb7ff182333e3008ebb21fc6889a3d98426b3f57e3db11215954dbcbe84d87c6d3e160d86d7da0cbb948bd61789d54afd8f0bf621eb8cf0bc79c49b87
+EBUILD RRD-Simple-1.440.0-r3.ebuild 562 BLAKE2B 6e5d71cec17fc6f8a56c887f49cfeb4670bf38bf5c6d0cc613b87c44ede5cff6dba11894bba4ce578b8be42320f98acc35b94aeec23e758e30c526c2ad23c7ac SHA512 459cb705f51a656610c128f49843abb97f3c5f7f030e7c6310430d42ec37e907a3b03027f6ed97130b7363e3c73fb0a853fc81a512c9253541128fe7d59c4250
 MISC metadata.xml 393 BLAKE2B 70c511985a825b88c1f68fe8a0c5f5b4f2616e46a8554c63d2471c2a341869918564e98e6442b72878cefc6ac0604865f793b9f2c97b19deeb4c6346e91f5305 SHA512 e98d8aaee8cc10d102d8365a8dca37020e7c4ce93e2d5b22aa1e92edd02a7b47817094d7883821f85696fbd996dba198eda73ee2240d6734da040999a6f73623
diff --git a/dev-perl/RRD-Simple/RRD-Simple-1.440.0-r2.ebuild b/dev-perl/RRD-Simple/RRD-Simple-1.440.0-r2.ebuild
deleted file mode 100644
index 3ed385ff1bad..000000000000
--- a/dev-perl/RRD-Simple/RRD-Simple-1.440.0-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=NICOLAW
-DIST_VERSION=1.44
-DIST_EXAMPLES=( "examples/*" )
-inherit perl-module
-
-DESCRIPTION="Simple interface to create and store data in RRD files"
-SRC_URI+=" https://dev.gentoo.org/~kentnl/distfiles/${PN}-${DIST_VERSION}-patches-1.tar.xz"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-analyzer/rrdtool[perl]
-"
-DEPEND="
-	${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		>=dev-perl/Test-Deep-0.93.0
-	)
-"
-PATCHES=( "${WORKDIR}/patches" )
diff --git a/dev-perl/RRD-Simple/RRD-Simple-1.440.0-r3.ebuild b/dev-perl/RRD-Simple/RRD-Simple-1.440.0-r3.ebuild
new file mode 100644
index 000000000000..523c400fdd50
--- /dev/null
+++ b/dev-perl/RRD-Simple/RRD-Simple-1.440.0-r3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=NICOLAW
+DIST_VERSION=1.44
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module
+
+DESCRIPTION="Simple interface to create and store data in RRD files"
+SRC_URI+=" https://dev.gentoo.org/~kentnl/distfiles/${PN}-${DIST_VERSION}-patches-1.tar.xz"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	net-analyzer/rrdtool[graph,perl]
+"
+BDEPEND="
+	${RDEPEND}
+	dev-perl/Module-Build
+	test? (
+		>=dev-perl/Test-Deep-0.93.0
+	)
+"
+
+PATCHES=( "${WORKDIR}/patches" )
diff --git a/dev-perl/Ref-Util-XS/Manifest b/dev-perl/Ref-Util-XS/Manifest
index f317fad32122..a3d8d3132555 100644
--- a/dev-perl/Ref-Util-XS/Manifest
+++ b/dev-perl/Ref-Util-XS/Manifest
@@ -1,5 +1,5 @@
 DIST Ref-Util-XS-0.116.tar.gz 71099 BLAKE2B b4e19fd4fb8181116eb8cbc1bf11ecb922e89165fe724301d3c78f2eb4188b90d334c1900300012ec4cc55e1dd7b780360b0fd45a221e3d72a0a552ce3d8bde6 SHA512 1fdb0cfcd76cddb3007262b1535cb099e663b2baf86b94956bd0fcd2e86e76fea0b3fff3056cbe0b6096873c94de11e1ca34f9576b2206e2b1225d294de2a621
 DIST Ref-Util-XS-0.117.tar.gz 71565 BLAKE2B 065a8818ff024b64f518ccea215517b7cdbfb5726f00989d8632d68ba3e0201d3ca1f15fd8bc6a6ec2beed981c415b9088f3b08d13b7314caecd9561ffe6c57b SHA512 5ebcd1bfd6c4b94c17f24c890342d4fba74a7a7c09b3d338208cd5d3fe6b6dd2c504c86ab555c27781b5ede2633d012bb7df819029ce89bec6bc269e21d567a0
 EBUILD Ref-Util-XS-0.116.0.ebuild 710 BLAKE2B ccf95a5af3abbb7e6bfe6f6ab910347b370fac2934a809d82d6712def9d77a9123a098911346b49e454209566835ca1e58c08dd88fa305bc5539c939be89804c SHA512 7e009b3122749b7ac4643290e0265593d737245b6ab17441fa16c954f192302d6fca7d9b0cfa38b2948037c9986b87c897f586a78db240a5f8d77183dd3b086a
-EBUILD Ref-Util-XS-0.117.0.ebuild 680 BLAKE2B b358e6827bb3184953441fbc45d86fce04b2ec8c6e87cdf921f0da6e3a09e6283f1030765551092e94e81b42e217648e2f9027863c8786b91244050282045267 SHA512 006f86374f6ab241d10d706b56c57be485403ff05e0b14f306aa80546c36fe2f0555c187447d2d1ac85232f425343a7821ebb064296731dbb2b08e5c03678258
+EBUILD Ref-Util-XS-0.117.0.ebuild 672 BLAKE2B 056169807aec6ec77e5e1439fbd90b184286ba90e8cd53946300eac57b8a3b852c950a44b60185b6ad9d4ddcc6e3b1191c3b821a986a1fce8da68717fc5c7d81 SHA512 900bb6b0abfea8e7344babdf8fcdd3b018a0fcd8f029d8207316c21e2593407f9f9b9c697cd145dbd2d09621dc3116a441fb91827b1ada8e05cea6018d3b7d82
 MISC metadata.xml 396 BLAKE2B 8d7a16732134ae629f34c21612613817630f26c731deee095e4cc2ccc869726e86d7ad394eb08c74db4e581063610e2a0cbc974fb89100219b7a3e242ddf8845 SHA512 722e4ef9443e07d6935e26816e3d40f98096c188d9c4ec6df5d4b21281ead9348aed790075cf5c0981d305422117bcbd43fce4758d1797c341672f825206ad25
diff --git a/dev-perl/Ref-Util-XS/Ref-Util-XS-0.117.0.ebuild b/dev-perl/Ref-Util-XS/Ref-Util-XS-0.117.0.ebuild
index 0cf1a0da793b..6ff2f9891d7f 100644
--- a/dev-perl/Ref-Util-XS/Ref-Util-XS-0.117.0.ebuild
+++ b/dev-perl/Ref-Util-XS/Ref-Util-XS-0.117.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="XS Implementation for Ref::Util"
 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"
 LICENSE="MIT"
 
 RDEPEND="
diff --git a/dev-perl/Ref-Util/Manifest b/dev-perl/Ref-Util/Manifest
index a8695bb94816..dbed741c83f1 100644
--- a/dev-perl/Ref-Util/Manifest
+++ b/dev-perl/Ref-Util/Manifest
@@ -1,5 +1,5 @@
 DIST Ref-Util-0.203.tar.gz 26937 BLAKE2B 18395f686abd76e90c360b7594ec3decc67288dcaa8c107f35d1666c508126812956d5c955dfd85c42383ffbbc5f9ae91171786a851955a3bb3b70bdc8553011 SHA512 bf0b1cde5adf869377aaee3c6a8fa8f40fc852c70f20dafdb3d7f3b7718eb19738a4d53c243e9809b7cff9e2e49a871f0336b4288b96048e91ae48634d12a392
 DIST Ref-Util-0.204.tar.gz 27509 BLAKE2B 80708bd997925f9cf9518a412dd762ae3357ba303f2f91bcdf7858c963e61c1e68c9da574845679816e326f96df9aa82cee1e570a4ea5036f853bdad81068981 SHA512 12834e13de5578232e40ba308e97786c60fcec4da9dc0b2922506d42645e8b3c3234663cf3b9c1dc374772107de953ed49ba8b52a2bac79183e3860338c0b288
 EBUILD Ref-Util-0.203.0.ebuild 759 BLAKE2B 5cff0e53579dc13f1c97c8a122052a62b48ddd426110e4a06eede27cc329776b4595f39e3a1d3af797b0ec7ea713d65f59b5ff58beac269a96b07476a25f02b6 SHA512 9e73ca53bb65171a3945babf5f32307e3d2d5d3e583b6cd5eeff784f31f6b58f25e8c3c512f8b6ad420c8b2716dd308edac389c3b0b2d66bdf702d2de96c472b
-EBUILD Ref-Util-0.204.0.ebuild 736 BLAKE2B 5046c89564ad6203bb07a9037c64042dc1c6bcabb10284ee7a9ccdfc50626e999a75d2c7864f82120dbddf92382a89f3342e3c5783128462dae78a87dd2571d7 SHA512 e9b3a2a9d60b512bffb7736d04a8cd844708057fcc595a643a95f600da299bb02b70ea4d28d3aa08eb8124f213664b31f62cdd6e0007bc1b63bea3a3d8b244f0
+EBUILD Ref-Util-0.204.0.ebuild 728 BLAKE2B d5610cced32aec62725afa5fefdd006228af928c11ea96732b3929f0c2be952719e15ab6f2432e4073f87c789c4e746c6126f73e1a38d712910b6e4cf601ea50 SHA512 1f1ad703a5de4541f30767c1a70cfc918ac0527b924f96b8eb917ebf02217f27acec3db28b112dfe6e9205954585ea47ed0572835a9b7d1eee14053ff29e1b51
 MISC metadata.xml 569 BLAKE2B cc564ef6e0020390127a367a28839b8c899710f1a258107d280da60e321c12c5dfb5ff2a670f5ea6a8147c8d036055f9591fd920ed1f7454287aa40691409903 SHA512 70eaff96c276b9c8349715c120a4a6594ea7eafe1d050587ed121a56a6caa65cafaa08252a446bd1d47ac7636d7646cc78092dce62c366f042434d8f4a857291
diff --git a/dev-perl/Ref-Util/Ref-Util-0.204.0.ebuild b/dev-perl/Ref-Util/Ref-Util-0.204.0.ebuild
index 31795007ce95..17031a2480f4 100644
--- a/dev-perl/Ref-Util/Ref-Util-0.204.0.ebuild
+++ b/dev-perl/Ref-Util/Ref-Util-0.204.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Utility functions for checking references"
 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"
 LICENSE="MIT"
 IUSE="+xs"
 
diff --git a/dev-perl/Regexp-Util/Manifest b/dev-perl/Regexp-Util/Manifest
index 8383c995b15a..878ef0f46cb9 100644
--- a/dev-perl/Regexp-Util/Manifest
+++ b/dev-perl/Regexp-Util/Manifest
@@ -1,5 +1,5 @@
 DIST Regexp-Util-0.003.tar.gz 61890 BLAKE2B 2740b80448deee7aa37dec3e7b1c46eac347cab6f99c82cc0cc019ad03ce899201b08f1cc0d15985becf8bd2bb19b6cac18e128cecfc6730ff662b3e3de5ce40 SHA512 27501c4e7017e2470cd24f2b8bd8b94cc3acd266500851c5ee1f4bbe3af56285be3eeaacee95b45606bee01cead4f0a30eb7c10260d93b3e98bc432d211be2f0
 DIST Regexp-Util-0.005.tar.gz 61125 BLAKE2B 700649f473e3c3e958567afd380eec543ecbd974456c7a2bf3728864e543923dcc3e587412d50c94fca869a9f0ea215735eaada539d3800bf2f52c59deae9c28 SHA512 83e40a14fa75a4d809af4f39087154332a85cafd144350982b0481f338c598bdccf8c930accf29327246251702239782c58333a54de1a92742999a2b45a19ca1
 EBUILD Regexp-Util-0.3.0.ebuild 635 BLAKE2B 804cb4908add26829c29466b6c323efd63c10f3e78e375dcd0680c3bd11b8c0182d93b14ecffec22613ada8f77150747f754c0e5e311bc7acabbc0e78049bfe3 SHA512 f859012b3eda93c3c9d53982f704766ef4c1a60e03b6660281ae94be7ae5b94b3369d9c6ac3ad9c8c33f9e8337c454d511f1852b6d746811a708b830104db0cc
-EBUILD Regexp-Util-0.5.0.ebuild 595 BLAKE2B 440a5aa7bc076196a32c2ae7ef7b63fd58661a7d04d79d9e4330a895962bfd16dc5908e86cd664528671c9964f50d02eb0a9d1326210175296440c54eee8c5d4 SHA512 27fed30f95764ce2038ad0234af6f2a6a8fb03b9891a45f854906f97f7c7e4cde401e4a58413fb4ad72d3f09e4c7c1d3a383ed90c5750ec4ad53ec9fdb92d650
+EBUILD Regexp-Util-0.5.0.ebuild 590 BLAKE2B 838a10f64e0a1667794abeac823e4e07e16f6120278dcdd60df34eaf73a916a50b275c32e66947da6bebac3018f50f76f965d2547aaa525631128a8e347146dd SHA512 9464d3fa942f049653e67a791012118ea32ee2b6bf08734d1776d919b206b640d5879f6922b0e40eec394fb76d658fc12c8c03747ad146396bf2e761d8532bd5
 MISC metadata.xml 395 BLAKE2B f6409123669b03b90d974f3b086ba411836c6772d2916ac415c7f255ba5ffbb3392ee8603b6be2ac0e4f5b1cdb22586093abdc58b47826573442d669aa8a7a5c SHA512 240612acd7839a6c5ab11cd9088cb923aaa73b77dbfccfd9eea610c4ede658ca1b1b653cd7d87b5c5acbe0f1cc56ef2b91177934679ed579289386f8da223b3a
diff --git a/dev-perl/Regexp-Util/Regexp-Util-0.5.0.ebuild b/dev-perl/Regexp-Util/Regexp-Util-0.5.0.ebuild
index 0fe9728d93dd..12b7cdc578e1 100644
--- a/dev-perl/Regexp-Util/Regexp-Util-0.5.0.ebuild
+++ b/dev-perl/Regexp-Util/Regexp-Util-0.5.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="General purpose utilities for working with Regular Expressions"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-perl/Exporter-Tiny
diff --git a/dev-perl/SDL/Manifest b/dev-perl/SDL/Manifest
index bc8c326de5ce..507804ca492e 100644
--- a/dev-perl/SDL/Manifest
+++ b/dev-perl/SDL/Manifest
@@ -2,5 +2,5 @@ AUX SDL-2.546-pointer.patch 671 BLAKE2B 188280d823e6cffea2e7d33ede63ecb172a8a272
 DIST SDL-2.546.tar.gz 2487053 BLAKE2B c0856c844fd94338f7fe9cd1a20f7e7889cf73ac0c4018bca55b4fc630555b344cebe5158db5fb369ae6cbdaa5471a6681aadd71b788bee044fb367b0b12f9aa SHA512 7f7015c90a277b91951a2357bcdf7c3f2f930270d211657c903240ed4529f408c200337ca79e4971eb3912da28ebf1e950053ce4d763c2599c701444c618c71a
 DIST SDL-2.548.tar.gz 2487708 BLAKE2B 1d17c5ffc8d966fd06b282632de1f504548df9c67754788e5dcbe2144057aa9d463a88e01b33b0f265a821cfb24847bafc1cb1215cdd6282cc29ff3aacea6c3c SHA512 bafc49dddb7e592861f822920915c73bf0c5eea3a6c567623b48a2332c7644caf1451e457545e6666adea5e314b23bcd85a3f3a52c770abfd498c0e4c0feae85
 EBUILD SDL-2.546.ebuild 978 BLAKE2B 260b56b970984c3131c72f44dc79beb2de2d24f7cf8f1110c16953afcf6a34e952ca849d5672a04bf4bfa35210df5d4e85f4341c1683025d958bcdd22929626a SHA512 cf5f5f8398f34f842311fe3e70eb2f5a2e760c368c42a95c9b2d843720c4bead6fbfc59015721273cc58b0b842e4b2d81563c68c0318c003c5d964c6620e7e37
-EBUILD SDL-2.548.0.ebuild 1030 BLAKE2B bbf041d52fc3cb8d9a471c191f82b301e6d7be02916805f517ef29f2aa6a034396243ebd2ce7eb43f0dd0f2d570d6191ed11752889aa1396392b68eff53b61e7 SHA512 febb10ded5cc8358de933610f5286b662179eb8ccb51c06bdb95911e3a6d94c6c7411e2c21785cc40593d39e74261783d9072246f3162848cd7def6c90ebc0b7
+EBUILD SDL-2.548.0.ebuild 1029 BLAKE2B b259ba8b9b387b68dd2ecc9a2804557abdba78ea767ea8cd1dcae5f5dbb62df821b30365f5c3d76f27ac5ecf25b3ac3e33bff2b5e4730eb4f868198e8df4c76a SHA512 cd09a7c84bd37d559db140cd981d44df63de19f4eafe2abdd4f4a296cb2f57b48fe1048aaebec4fd2cccba61f4e65fcfc89eb23e666e7ef75f0a6122ae3ecf08
 MISC metadata.xml 5480 BLAKE2B 85c0374b2a8164223dad73037282a6bbd885f1fd841b0099aa37e12db5c5dadf5126d53352483fa112936e5057ffccd927422aca617f24cd0840e98806c0b82d SHA512 6940b411e173bb673ebdadefd7ddb0b7b6edfb950022400fc2f483027749180ef6026867acfd9906a5d48ec44702e540b43c23f87c11824215fbd1046d6a92ee
diff --git a/dev-perl/SDL/SDL-2.548.0.ebuild b/dev-perl/SDL/SDL-2.548.0.ebuild
index 0b31240e7f77..1fc59835856f 100644
--- a/dev-perl/SDL/SDL-2.548.0.ebuild
+++ b/dev-perl/SDL/SDL-2.548.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://sdl.perl.org/ http://search.cpan.org/dist/SDL/ https://github.c
 
 LICENSE="GPL-2 OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 
 RDEPEND="
 	>=dev-perl/Alien-SDL-1.446
diff --git a/dev-perl/SOAP-Lite/Manifest b/dev-perl/SOAP-Lite/Manifest
index 4b1046b0139a..938c009236a5 100644
--- a/dev-perl/SOAP-Lite/Manifest
+++ b/dev-perl/SOAP-Lite/Manifest
@@ -1,5 +1,5 @@
 DIST SOAP-Lite-1.26.tar.gz 272187 BLAKE2B ec4519c258b2822da74c41e20dc2c0ea3242a7d1936c2e8bf637f6cfa53fc721e4864f0ca0332986f5a1c912babe522c1b409d48dc0c433abd3f85c4aa207cb6 SHA512 b09e320cecbb4859f49dcb144a446af878219f6ba3d2f7999f8656f40989d3ead0707960f561d17a9f800706fcb53020327f9c85313f6dcca34f9699a4c74143
 DIST SOAP-Lite-1.27.tar.gz 271466 BLAKE2B 045edbe5d09a935af6b73df20d3af0d646cfa726c5fc0e050c0cfb557903c2ccd86e40d506114dad7c4c295c934a3a95250fdf9e0c558bf0f948e2ea0af67840 SHA512 38ecd0eb2af3ca415cb82e98a68aabd2cd3eca1625a7850723ae3c9f03f32f1ce3141d2a9382b80e250a88e3007eb7a0aa75f47c7e593c2c2025a29c8c32ee3b
-EBUILD SOAP-Lite-1.260.0.ebuild 1151 BLAKE2B 09f735a920e97fc96e60ec9c4df35e0cf6e3ae8316b245607104031e5aaa37cc636d8dd77affd67f840337c3ded3c1cf65016645894869e68565575b9596c46f SHA512 f5ced7c7d8d95167f8f681bdf9e69b8ce12f755bd07815d6ebc69ccefe7401b092ff24aef2a565e354e35aede45f2db3ff16ab1f962a5aa8442c76a02a5e8317
-EBUILD SOAP-Lite-1.270.0.ebuild 1132 BLAKE2B 402878eb3e622a19bb67688796c38e05efc5c8764daa5753115cc8b9dec904ef57227fab04345cd1ffadff74e21a0d60c786e686346bc49dd0178b60f55d6ba0 SHA512 d3e19af6a326d2d6b5dda954ac3d70f0cb5b923d0983dadf6ddb76287e074e5d567410d37d8c1899982ba09e5772e4c41777f02d8028bdf3a41177b9d015542a
+EBUILD SOAP-Lite-1.260.0.ebuild 1150 BLAKE2B 48a49ae06ee89f1793df0473ede508d2c80134b881617a3a2ae65bb51efef5c688c24c4611fc8705f5c24eb1ef785763a349f8ba251dbb291adc22b7a57e3b90 SHA512 226d50beb45014d94b54827bff45bf03310b31464eb320a6d949f4b7272f7fdd0be8c04c43fc52277e44f1a0bb032aa6ebf722def7d41d29e04a07411ef5e85e
+EBUILD SOAP-Lite-1.270.0.ebuild 1151 BLAKE2B 4789d5e22ad2aede0f415e45e4547eb82034536c3bed2f18a5213c05213b593fff7e863c8b7a3b675405155c89ee4c367d1f56129d6e14ca0634aa609cf1f288 SHA512 250fd77deed17cda2f8982f73d83197cb64d9cd52d299119806c3c92033f1e72d39810e5ae52afa5b2832e5b7bb75689f731c0d2dc2cab651956699963ba310e
 MISC metadata.xml 4475 BLAKE2B 7b8fdc0a058961d01a3c18cfd208b9cf9b3123520f5576ff41d948d1efc961b8ff0cb4f810563212ac7e1e959fb1c1e3fbcd66613ce9ec8c8d2968b8e7f158ab SHA512 fa42528f24ba78651286aabae03033ad92c42f74b6843d256e041d8850160a8dbed4ac75850c0f1985d0bb9b79496ce15a08e11a3db5558c7f78999da5edc40b
diff --git a/dev-perl/SOAP-Lite/SOAP-Lite-1.260.0.ebuild b/dev-perl/SOAP-Lite/SOAP-Lite-1.260.0.ebuild
index 6cabfa455172..6968ca985b20 100644
--- a/dev-perl/SOAP-Lite/SOAP-Lite-1.260.0.ebuild
+++ b/dev-perl/SOAP-Lite/SOAP-Lite-1.260.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Lightweight interface to the SOAP protocol both on client and serve
 IUSE="ssl test xmpp"
 RESTRICT="!test? ( test )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 
 myconf="${myconf} --noprompt"
 
diff --git a/dev-perl/SOAP-Lite/SOAP-Lite-1.270.0.ebuild b/dev-perl/SOAP-Lite/SOAP-Lite-1.270.0.ebuild
index fd408bbedf36..31d653156534 100644
--- a/dev-perl/SOAP-Lite/SOAP-Lite-1.270.0.ebuild
+++ b/dev-perl/SOAP-Lite/SOAP-Lite-1.270.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Lightweight interface to the SOAP protocol both on client and serve
 
 IUSE="ssl test xmpp"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 myconf="${myconf} --noprompt"
 
@@ -36,6 +36,7 @@ RDEPEND="
 BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
+		dev-perl/HTTP-Daemon
 		virtual/perl-IO
 		virtual/perl-Test-Simple
 		dev-perl/Test-Warn
diff --git a/dev-perl/SQL-Statement/Manifest b/dev-perl/SQL-Statement/Manifest
index 022ad396494a..a2536ce023fc 100644
--- a/dev-perl/SQL-Statement/Manifest
+++ b/dev-perl/SQL-Statement/Manifest
@@ -1,5 +1,5 @@
 DIST SQL-Statement-1.412.tar.gz 154608 BLAKE2B 67f967f34b1cf6b987617dc555f867f3f5eaecdfb8eb6e3f27a3466c93b610cd7a100ac486c295120ee476d933e044aa4ad7f138e5f09238fa9ce87e50b0b65c SHA512 73b65cd3d1b1be2ba1e80e2cbdd2aae0aa79a23252f28caf3c3a91c78f31c2f2d698e91ae474d44efc02f608a0ca042bf47cc4e76832864b49c590f54687e3fa
 DIST SQL-Statement-1.414.tar.gz 159512 BLAKE2B 7f0e131a56f3aae7fcd12e3a208452e572314555fc5759e533b4197467e42a2ca0e34fb75e3eb98689b04bb96b02a4bae5673e91f826af7962fbebd880c5942b SHA512 c8a9e93979d3f775b1e8981fff0cb958791f0a513432133bd376a20eca73da27c40d2dd74b27f3f8f7d326897e3a8b776053080eff40221fd525f546bf474c5b
 EBUILD SQL-Statement-1.412.0.ebuild 948 BLAKE2B ce1901ed9d59badef15089ce91e700ed9d9dc69a67cd14ffc8b61d3ec6b8f72ae23cbefac99e3dbda55cf9aa8dd5fe34dd743c0544fe24519fafc07333865613 SHA512 38b05f2c17250c75ea0050fa644a90a89973bf97e932f2a4a571f47dace4dc8a557e93c29960a61a4dcd9c51e41de8a0dd42c858b8d7753b92bc9605e38d6c0e
-EBUILD SQL-Statement-1.414.0.ebuild 929 BLAKE2B 7b63d5d3dd79bc5890fb6f377288f81300141ad09429a6f48045413f9661b7d9461f3eb1c0e5b8408f2403954456019270a76bdc44ac9fb36e156df85ec9877a SHA512 eeb8d5d3aaf5b92fae31996a0e373d4a80e523c3a60e960a75432610c02417d189600586f187de2022e9cda446ff48b2de5cb60ae0e600060a3b70336a9ee3f5
+EBUILD SQL-Statement-1.414.0.ebuild 925 BLAKE2B 4b6c09f72417be6017ee5da25612f3028f3359225585c151be8907bf24c2aacb5b4d49a19eb0bacef332bf8b99f111b740ed0d0af2e05dcbcc23898c9aad07df SHA512 d47747548609d00e83e38b5c4ed134cb179137e120eee94f8caa3c6e41e5e6dc8a11f206334f81ac610fbeaa887f85c77167ae11662f2fe366e34326d71f8e48
 MISC metadata.xml 4179 BLAKE2B c03ce8c60a6380137c96e24b544363ac8bf14af5c63099f6257839d60bb9af639b5b7b76b44ba29a2ea1bb9b242d2f7205b7bc548e846d51064fd6104a9a0ce3 SHA512 474112ea82cd9e4df23785b063e015c17736728b908622d5e1fbe959881e4a538064cbcaeddf2f498c77f2c3b957db76ad57909cc7f1392f7d8293282acffae2
diff --git a/dev-perl/SQL-Statement/SQL-Statement-1.414.0.ebuild b/dev-perl/SQL-Statement/SQL-Statement-1.414.0.ebuild
index 80e569828789..1dc860854bc3 100644
--- a/dev-perl/SQL-Statement/SQL-Statement-1.414.0.ebuild
+++ b/dev-perl/SQL-Statement/SQL-Statement-1.414.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Small SQL parser and engine"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/SUPER/Manifest b/dev-perl/SUPER/Manifest
index 703250da0619..9851d3827756 100644
--- a/dev-perl/SUPER/Manifest
+++ b/dev-perl/SUPER/Manifest
@@ -1,5 +1,5 @@
 DIST SUPER-1.20141117.tar.gz 14477 BLAKE2B c49278dff91a754f69b365f04e9e7c64643a57ae58291ef909f5ba1444c129b7ad0f2e385c4ebaeb252dc488d6442849a1677a2aeedb284cd73a82593cf1452b SHA512 c17fe478fcb9ebc2749c27fc75b839bd77e81c9d0170697b2a697dcebb9f4eef4b954d023b76d33a8b4201b110e5e997b1e0993faf7a04ef2e1191a2f7c516a0
 DIST SUPER-1.20190531.tar.gz 14909 BLAKE2B 2d1127a32f002e40d1490c91f1dbb1fc3fbccb70973d4dc08f5e48b2453512f9dbfd8276d50ddf8a745aaff8331d8bff27efdc35cc5b90222bbc6329a1d3e93e SHA512 fb1072c76aa9d82edb39ec75f0e14c0fa41837b36b7d2ec24482a20338484cba867646f5e3ceb12ff4f8e1a6f333f5243900c2114d772a29d6c0380feabd3565
 EBUILD SUPER-1.201.411.170.ebuild 665 BLAKE2B 7ca7e3e6b2f7e11e430f20b131f9c1f05374590c090264a8abc84065ef9370eb0ef90bf7b87493fddc26f70242ed446cb99fcc2a2f90914bfc74ab25d6683110 SHA512 cfa03ab1228a1bc15a3b57ca174b047d53332a23aeb42c2e499fa0b08783c6f9f993d741d596faad7581032865beed9498314bc31707d111dade7e9f77247d3d
-EBUILD SUPER-1.201.905.310.ebuild 635 BLAKE2B 6fb893268f2d0a6a50f47b864f96addd1b30285ec9db210416db4d77edabf23d9a31c00d5d7329acc7d04a79cb72897875456562872621fe1477ebd33e9b89a9 SHA512 0d7276da6b994983c60cb9b0426787c1082b468f2db3790add59dd9328316dfe8ec4b44d0ef1db7abf3cd17e8f6a5ebe5f06f0259e2a7d0fcf81c7df740e8b1e
+EBUILD SUPER-1.201.905.310.ebuild 627 BLAKE2B 452df6f3c4de85ece58887307dbeb293db55c3816e3f497eae42f7a8a534ae38f37e7568948fccb4c8a31c0d070f98485375220d6225c836a066ee273aa93910 SHA512 92edd87465db6f7ee1f5dbf7fbf70cfc514f6daaa64ef4121c5392cc2de0f8af6abdd41d4d611f201c6cbeddeb3d028236173e7367fee765300169870cc1ec69
 MISC metadata.xml 382 BLAKE2B 1f37153b6cf9882d3ce1d9cd656abdf4dc12a9d305d226662ae92cd90911736471246e7120a5765c9024c4225c9e135ecb88b6510f8a0639d8f5410a2959820f SHA512 ae88903e6a27139c57c171ced634f04fe51cc346b1d8123f917dfcc6d82b1b7c89acbd12607c295e43e3e0cb099ba5b557eaa246ae2c330f8bd64620105f4ff4
diff --git a/dev-perl/SUPER/SUPER-1.201.905.310.ebuild b/dev-perl/SUPER/SUPER-1.201.905.310.ebuild
index 36274a42a78c..f097f9ad5cf1 100644
--- a/dev-perl/SUPER/SUPER-1.201.905.310.ebuild
+++ b/dev-perl/SUPER/SUPER-1.201.905.310.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="control superclass method dispatch"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/SVG/Manifest b/dev-perl/SVG/Manifest
index 9aa8af8774ce..716dc6bb4429 100644
--- a/dev-perl/SVG/Manifest
+++ b/dev-perl/SVG/Manifest
@@ -1,5 +1,5 @@
 DIST SVG-2.82.tar.gz 53717 BLAKE2B eb09b912cc719a53b7aa990ca0d56213c6c3e46f36ff7a0e32e3e643d3a012541f5bdeb4077b3cdb879c19ceec7d7bca9a38d42b78e6d18cdde0a2358ba61f28 SHA512 4241cfdc05758d90b7c2fd8a0fd2df1a8a95bad6859a6e30eb2f05a6c6e15f37ab9739304e956929f48b20a41c2b309fc97854440a4a1350a4badd515c7041a5
 DIST SVG-2.86.tar.gz 57375 BLAKE2B bb9ae8664fab28d3fcc8886dd636ba6944f10a43d4d6811a97a64fba9ed1a3cb0fb8057ead1233654384faa24931817c2f8b7f41358d9674977ecd091b4f2ca0 SHA512 d8f66c3103cf7fabe0902f86c768e04c757b2c95c5b3291a273e3d3da0201042d6cd70f3a5c005fc0e8b3a6c075c212b9d0bc265f80e210fb8ecfca8178473d0
 EBUILD SVG-2.820.0.ebuild 675 BLAKE2B df33cc4063a8c5400fd931a5b58b5d620635bbb19628ff9b200b0359f236f23bc12c9a39511deba55270123a7bebdff9346467361c017f401aa7aec9fa6cba24 SHA512 d1e5896f638b49d51fea6e575938db1941b3b0d3ce164eaff1068ddbd47000768cf6d284218937dfb682fcda1b8bef8b2f331d45266a4eb335694a1307a103ce
-EBUILD SVG-2.860.0.ebuild 641 BLAKE2B 9975907fcecf312565adb2343fea9ff4713c44dff524f714d384a51504d396fdbae7f10a8b5c110187c61f0163fee84c7d754485bd1bae1d302e949c3778512c SHA512 3001c2a7c55d5388be7d5ae34e181aa455e4ddff6a6e225c497ac816e43062bcc1d5ab78204f106e14efffc7265dfc1b0556d74c5160d08cfe241492ca803deb
+EBUILD SVG-2.860.0.ebuild 638 BLAKE2B 1c5b7d9e5403c91c9b08b28e20e079e367974bad88a25f58e8893c60641963c70a9c6fcee319c48449cdb195ccda81f65910237519d75cbe64afdc6092b7a244 SHA512 4c01e121d2ace2545c9549b86101a489398019ef3e1f6327aae42e68c66d03a2b663252e80a48bfac7649d863e84657d1e655be4d568a4779a8c97dd987dea41
 MISC metadata.xml 608 BLAKE2B 88ca00e5361fdc667053dfab3fd31efe6fdd6fe27f3c3c1ff43f75dbbef841fe3c0df588d61b5f85b61d477a2f0581f3a18fd682ce8696afb77eaa3fbefa23db SHA512 b95cd06e3f38adef41b989714f0e789333c7c5d8783174e1ac94cb403411604534cbeff5dc1f5df560fad6c59560e6c2d8cd38344d41bf501803c181b458f02a
diff --git a/dev-perl/SVG/SVG-2.860.0.ebuild b/dev-perl/SVG/SVG-2.860.0.ebuild
index 5b3cccea394f..6eee69da35f1 100644
--- a/dev-perl/SVG/SVG-2.860.0.ebuild
+++ b/dev-perl/SVG/SVG-2.860.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for generating Scalable Vector Graphics (SVG) documents"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	virtual/perl-parent
diff --git a/dev-perl/Safe-Hole/Manifest b/dev-perl/Safe-Hole/Manifest
index c426f197d411..405a56d07a91 100644
--- a/dev-perl/Safe-Hole/Manifest
+++ b/dev-perl/Safe-Hole/Manifest
@@ -1,5 +1,5 @@
 DIST Safe-Hole-0.13.tar.gz 14269 BLAKE2B 34adf7172a7ec69e680f4223c9d0deaa035bf64bf8c9f5cc97d8f3c10b92086990f52e56a9f6522dba26d189115e55b419def4f73c7f14b805c33caeb753eecf SHA512 3acb362f6a7970c083359351f7e9d1005019d715546b9051c0a317adf1d6378537d6da14b01dd26fba05a802560bb79afa1f14d6530f862a3265e0aa12129c0c
 DIST Safe-Hole-0.14.tar.gz 15901 BLAKE2B 3d0bea12075120c520e001c5163acf7ad04d66c6bf675074a31c72f9bafb1b08a8bcd389d760a2b5a0954353717b67d10be373d429401829d94b18fcf596d734 SHA512 29570c5e6c2bf8709b92b62c36d24c643956535ed0cf3fa73cbe9406543f17c96d4bd37a753c02d1f77f962d76788f423816fd63d31f7f56884acefa873f30e7
 EBUILD Safe-Hole-0.130.0-r1.ebuild 344 BLAKE2B eae7a7b4f11f00f7ccfbecd5ee3db9d0a2cb12d646ceaa97549d63360cd1d6077ef6484af162ab42f291b2b42a998b17429cb133d920f27b81dcf687c3027638 SHA512 3430d356b2dd2cf3fe946abf1c97dc1de5121165be78537059883de378501dc85511c9cb91949e27dc9a10b885840ee29a1144973dbd53be3372857b66f2cb92
-EBUILD Safe-Hole-0.140.0.ebuild 360 BLAKE2B 02b213ee57fc2d0fb6531f85f1bceba6af485dacd98873b7b84f89e30edcc39582eaa2f6442d29119ee24c203c7185d2f8726939abd05565d5590feaa9302066 SHA512 32cf07ccbd13831d09b4b945090e8e0a978633081c278a9b4c604535104339838500f9dd0943c823a6b5bce84a39060bc627ae2e4f6a049273c120e9817642ef
+EBUILD Safe-Hole-0.140.0.ebuild 358 BLAKE2B fc356a0ea18a313af264e00b8268f1aafb9023280c74a522b39380019b82159000bb2176be717ce3f5b3f3e6b80b68fcc0564c96b7f3cd3fe06999c4a94ca9f1 SHA512 eb0d514642d0f9af083dcda9a6eb327a42330207a5b6b577797efc3c29f970e1ac1aab762219e885f6d559664a3f4afc6b1bf42874261981b2eed63d60600108
 MISC metadata.xml 391 BLAKE2B 0723053b38111b7dea62d979ba11c849719feb1e7a2712d4d9a416ed901dd07d76c06d57e7fe1b3c70dee98f1d26205025432fe0403a41b13b640096e1cca1e7 SHA512 82b2f53f5f21f5f89ec524594ca037910d250dd102cfd0bce12a704b630755371383a9df32a0eb20545477b1c3815d82fd8ca7dc234705b3f10154f98032b180
diff --git a/dev-perl/Safe-Hole/Safe-Hole-0.140.0.ebuild b/dev-perl/Safe-Hole/Safe-Hole-0.140.0.ebuild
index c1dde2fe1d5e..1ca10d29a056 100644
--- a/dev-perl/Safe-Hole/Safe-Hole-0.140.0.ebuild
+++ b/dev-perl/Safe-Hole/Safe-Hole-0.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Exec subs in the original package from Safe"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Safe-Isa/Manifest b/dev-perl/Safe-Isa/Manifest
index 5f6e774ff1e5..9a5d70d13d7d 100644
--- a/dev-perl/Safe-Isa/Manifest
+++ b/dev-perl/Safe-Isa/Manifest
@@ -1,5 +1,5 @@
 DIST Safe-Isa-1.000008.tar.gz 5994 BLAKE2B 4f1d11f11d8e6b0aec88bc248941f5b1db453dee87230b77ada7b78d76e284bdcf287f81eb2830a6f965f61b776ef76331a3601dab63f35603e128a84e6e579c SHA512 a1dbef2e5e3cf5d154785eb2d9e4ad6652d775f1026144817a54cfeeb3572a2618b01c0b23557080fbaf676878d323c8fec8cd3506f173895ad787efa6c9cf14
 DIST Safe-Isa-1.000010.tar.gz 6546 BLAKE2B 4c68477e569b3327f24c89b86f8d6d8cdeec017a29e7031e02e130b115a1c9d1fd45a066e8aac1d379eb004d5ff1450b42abff2a50771a397fc7e36e75de45da SHA512 121288c7c59d97f4e48c1e50795d835cac0638a1edb1116876813cc2fe955efced9916222f6b16e4c1dbd5149c9d68c19bc77584f999c411e4c22e2f28ea1838
-EBUILD Safe-Isa-1.0.10.ebuild 463 BLAKE2B 27bad8c6bf718cab5633cb57accabdd257e09fd0d405ee5b04625af326f2e8545d5a9dfe2e384271c24ebeabc16c1a9c518e688974f2d9382af24208a3d3336a SHA512 d17ba1dc030a425bf906c6c598df2a9be8830630e28e1680dc97e57b6b2b493dbf09bbe743647786472da05d75b175eb632165111839867fbeab171c80470c71
+EBUILD Safe-Isa-1.0.10.ebuild 462 BLAKE2B 48dab6eff97a199d7cda63066fb9492d65b21b653843b6831173a05e899d81c46c26247fe05e7b71b2dae963f86d65271bef2fb9147ae4415859d8033a9a4c95 SHA512 aabb4025bb56d398a5376382ce2a351f0df6fdbbcec8a03402678364828007de3689300d1b232b51af704d655c905a2f1d47f2bff272bb31ee0cbf8719da2590
 EBUILD Safe-Isa-1.0.8.ebuild 500 BLAKE2B 20d02925717fc95213393a3fbf3789269fe464c96ad9ba6ee3264ceaf4f8c516a918a4baa30f9c2a0a1d53dfa9921390532386c837eaa3de9f31a08e152d6681 SHA512 b418e8ba2a60f311de0147425250aec0199051137f51ede1defeefe1666e1222e0c1a565b175b582e9c4b74d119a96e9a2c8108a1e92d920131b5b2ceb677b73
 MISC metadata.xml 389 BLAKE2B 2d237e0f6ba3b982062a21cdd1dbbb0e2ad845efbf0a07259a1f39fec8e69192649cc1beb7500cabd89f36a802e3ca221142ee621a211ceede0835bc53ef84a4 SHA512 735bac5b7fdfcfa9a3d208b64d5d5da9e44f5fad573098833379d6e8706f8d7b9c28c1f3e3dddfebe4d4230cff22a479e14e43a203003d2395785b6be0d9f352
diff --git a/dev-perl/Safe-Isa/Safe-Isa-1.0.10.ebuild b/dev-perl/Safe-Isa/Safe-Isa-1.0.10.ebuild
index 8871a66d2f9f..9f512b010625 100644
--- a/dev-perl/Safe-Isa/Safe-Isa-1.0.10.ebuild
+++ b/dev-perl/Safe-Isa/Safe-Isa-1.0.10.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Call isa, can, does and DOES safely on things that may not be objects"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/Scope-Upper/Manifest b/dev-perl/Scope-Upper/Manifest
index febd52f558d4..01a49b232e93 100644
--- a/dev-perl/Scope-Upper/Manifest
+++ b/dev-perl/Scope-Upper/Manifest
@@ -1,5 +1,5 @@
 DIST Scope-Upper-0.30.tar.gz 95297 BLAKE2B 99c8f7f8e01dd841928452b23a31765873c69b5fdf7e0b8549d8fff40f164eca3b67ba8a01fc8dad0eb810467622f8efdcf7cbce41b78a2bf48d7ff99b4d1c81 SHA512 ba766f6f257293d8ec7cca72bfd216a5e3d8b052ebf5a6d74626060c847e3f2d2247056ce96ef83f0a170b2db974a66ac22cf54c8fbb785ec9aba8d984163c0a
 DIST Scope-Upper-0.32.tar.gz 95563 BLAKE2B 4c0044023360f9f27c80fa5075f538b5410774de1e2a3f2027fc3e79ee857629209cfc91ec81cfc8fd7e08e65f0a31dd148aca5a6fa1fd200188f5399abcd58b SHA512 92fbc9b2e49bc1f6c66a4f10519c508ede36ba6266781397f93bd48310ae36b454112c59794f0346b8c915cfe106d2a4f673ecf20e7a2b8f11e504539691bda4
 EBUILD Scope-Upper-0.300.0.ebuild 263 BLAKE2B 11ec67eaa88f9bd40bde8f0f1054af8fab61a338cdf1daca9c0aa30dbc2f988a649e5c0cae85b5ecfd73ed12ac45068a6c44694bc5164c9e5c5e17574f5be641 SHA512 1be5d4ba51fef73c1597f97cb87bc7bd641c6853c215b87c001b0a188c29a9d3682a708147d6d28016d8f2ee5edd6de5dbdc277bc0111a5c95581c14982e63b0
-EBUILD Scope-Upper-0.320.0.ebuild 237 BLAKE2B debf7d15746f553447d11413b86c177f25371c5bcc3c9c7316cb3a265594f7387a26c63480622a6024608c7aee05ce0f963087369bc82b6d3d28d347c525e22d SHA512 bd27ee791c2be40223390c5434037dc499d7e45982990105c13593adbe29aaa2e4079fe40c0fbd5864de2fc35ffbaeed4d8d982b2c337a3611e30fb4aac09e7e
+EBUILD Scope-Upper-0.320.0.ebuild 236 BLAKE2B e9466f6f647814f815f15cc8c306f1ed408b9a08c22787e23c9887d4fe7d808683495e078388404490f0040782b56ca91eb46d7ba2e735ff56ba673ba3026862 SHA512 badd56e50cbc2f3c3283986eef8bf56f0706e360774baac93acd23d9d545424d6754b55e295f337ab2fae23431cbbf63b9d08d0580e9d7a0596ecb288ef63138
 MISC metadata.xml 395 BLAKE2B 817efb50611fde61e2139d55bf45dcb70db6e460c93a341ae6bba70d8c77d5295b58afdc6fc3454af792da8e72ae52815583d1ceae33a99e73ad1a4928ca0fe9 SHA512 b760ce92895fffa2d5beb14b2ba7a1be9fe8262b16b29b89e19a2d302858cdf720596700b70b982780f105d66329f4d66fd73602b8a178ffdf1dbe19d79fb50d
diff --git a/dev-perl/Scope-Upper/Scope-Upper-0.320.0.ebuild b/dev-perl/Scope-Upper/Scope-Upper-0.320.0.ebuild
index 796c11ba568f..7e454b3fb61e 100644
--- a/dev-perl/Scope-Upper/Scope-Upper-0.320.0.ebuild
+++ b/dev-perl/Scope-Upper/Scope-Upper-0.320.0.ebuild
@@ -11,4 +11,4 @@ inherit perl-module
 DESCRIPTION="Act on upper scopes"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
diff --git a/dev-perl/Sereal-Encoder/Manifest b/dev-perl/Sereal-Encoder/Manifest
index c77f965653ca..f55b64f4522c 100644
--- a/dev-perl/Sereal-Encoder/Manifest
+++ b/dev-perl/Sereal-Encoder/Manifest
@@ -1,5 +1,5 @@
 DIST Sereal-Encoder-4.004.tar.gz 500922 BLAKE2B da2b6c5961a9b05381957fabb9e02b6ac6cbaa9d44f7da3a4ba7bc07d4b8f38518557e1dbd5c3a85a535ca30a0f6ef96f5ccb32e64c73fad6bd7d3e62ec3bcc1 SHA512 5658348128409cec08c01ed216a22edc1c3cbf8a3eab0574378960211fd38a210dc06160c6fc2836a6d53ae4953b14040c579290cbf43de6d3f68bca13e5c7e2
 DIST Sereal-Encoder-4.018.tar.gz 700306 BLAKE2B 92e2d005b48c9714761dd6abb390de14f31642b05850664ff396e3d92958cb715599e922d7bc5da9912047ebbcae3f7631e585ccb35ff16b15e1e28a15d1fb9a SHA512 021586f02560906fa315cf7eefc877ff029c123550dd2889a90d8e36e2d480bc4c53fa7437728cb73bda6da886af52f1b58661796f78859c7b41f62a2000a070
-EBUILD Sereal-Encoder-4.18.0.ebuild 869 BLAKE2B 5fb064c249687c1ca04edf477b2afd221ba42768e50d68fcd0793fe13f60102453ebc7a416fe7e38c9e7db1ffc2c6cce5b5f3e9e06a6e0ba80205333a6ccc443 SHA512 06ad122c558253657d326cb1a33fb154ca4b1bc7091157d1bde8155490f4eae78c95a9fd1d52863cc8cfff1ae62edfee5b8a7deeeb2accfcc32387c842f6e7db
+EBUILD Sereal-Encoder-4.18.0.ebuild 864 BLAKE2B 922e364f71c8844ae02addf8dcbb7df11da4aff64228bc4fb03bfb428a8c6eb56c3fc832cc5533cfef1b7bed0f5644e89f1f46413084824caa71c13f84045117 SHA512 c4ca2b20559f5eb1e0886c6241502c7a7f457e8462b67294319b85bffa6a41b64611839f8cb6d776f85c2ec0ac4af9f1518549a3498277dbc79ae8817009aa55
 EBUILD Sereal-Encoder-4.4.0.ebuild 901 BLAKE2B 61f8eb3381c6247443f002cc1297823bafa425d5403b90d99eb71bd19671c048782bc84fc334bd59d17339c84a25a36b89d28d589bb8c99cc8904260f7d839db SHA512 58e3f56d2b649ca1331c59082642265695b932791e3b751493e6e60e4ace0a5a9df8d215f5bd1925f4e9f2722242289d7b54e859f0b2ae82491b916a51385f65
 MISC metadata.xml 474 BLAKE2B 8a01a9da3ee29d126a9fc4759eba6f680d320fde4404584ad6a72087097c25207178012522398b6c7eb4cd685858ccfe0bf0c7e193146d805601b40e1b1215bd SHA512 4c80e3456b7bb6f5718a90d6858a7f12da968df593857cf0e27fa529a13f0a0f4ea6626bd24546656134592bd63335015b47a74ddf74d4a68209495f8d35b7bb
diff --git a/dev-perl/Sereal-Encoder/Sereal-Encoder-4.18.0.ebuild b/dev-perl/Sereal-Encoder/Sereal-Encoder-4.18.0.ebuild
index 507c4621c161..88a607948d97 100644
--- a/dev-perl/Sereal-Encoder/Sereal-Encoder-4.18.0.ebuild
+++ b/dev-perl/Sereal-Encoder/Sereal-Encoder-4.18.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Fast, compact, powerful binary serialization"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
 
 # Note: bundled zstd fails compile
 RDEPEND="
diff --git a/dev-perl/Sereal/Manifest b/dev-perl/Sereal/Manifest
index c7522b6f1682..b6d55a804405 100644
--- a/dev-perl/Sereal/Manifest
+++ b/dev-perl/Sereal/Manifest
@@ -1,5 +1,5 @@
 DIST Sereal-4.004.tar.gz 193361 BLAKE2B 3cd08b0e23b9ec4c0e1ce1a72e528373cde9168c9f6c0130162f4ae7c50dd7bdbedda8330b94c1b87a53882aeb3e6875682c72d85cce7336efd5d65b204c028e SHA512 c4fed38af587a852c294bdbe4bc17fc2b5cc55592d0d63deb5c155c974e45befad141d6e655fdb72bf88a50a26cdeb500e0e717b1cf6d936778de49825664f1e
 DIST Sereal-4.018.tar.gz 196147 BLAKE2B 1415b04f48ab0ef60d425d08107fa08537a5f6050d62d62f3399e5402600c52fa06b97076f0cc5342a9215b04401f4ff33307044d5d39d8c12d0f9b0d4ff1250 SHA512 cfa4796efa2231b1f813fe15080c07cc1aac05a137041a74922e66737311b02859b8fd83d80c4f8f2dd79f13bda648dae8cf3a0f723c320aa09df177ddd77eec
-EBUILD Sereal-4.18.0.ebuild 609 BLAKE2B df2ae54b4a93856aa90747b8eabda7786b210dfe8ad5f28ef3288ad7c4c3f728831a953924afa94eee92e1c8a8e3970904f9829def5cfa31fd46575a95996853 SHA512 7191b5bcc52d6cdb7d70cd4c45b2654277d6030310b051358d99beb66360c536d61a0c2ab76f504a9775f2c9fc9af8521db3ff593496f71f98fd3c1c342adfb9
+EBUILD Sereal-4.18.0.ebuild 605 BLAKE2B 923891e9022d70164cde63b7e8980d24da4ab52f88c0cac7a571dcf4bfebb7eb2c02554bcf8ee54d6039f7a66337aa973309ac20af321ee01b882cefa935437e SHA512 d67b358506ffbc351477924136060c0f7f5b47fbf51ac6bb02bac228fcf7358b920270dd7f1d4e3f4eead26ddd50b9028c9d53e238e3fd71fa9937958cd5a3a8
 EBUILD Sereal-4.4.0.ebuild 640 BLAKE2B 0b7bf769cbabe7fbaba8ac0be42d4c6a300e30a91ed3244c6fa03215d783403a674f1b11d16d0f59448fee6d449a7143c62bafacdd53602e65442087de85b701 SHA512 39aa68ff97dec35619ddd8674552184cf153cff1090f6b8d1fe2e810d57cd3956dd6b9fa4d345da91f0ad30a6ea10ea30b2eede7b8ce226252f8a8fbb30c9629
 MISC metadata.xml 384 BLAKE2B 56826505d450d3302fd0977c28e1da1902ffa1fb4cf31090d43b860b2ba50a5673baa6b1d288ef519758e85bc675b0ec796c2247ab04896177eb4d753b72724c SHA512 acf86318e8db1fed22f810a649a5d5edb271260d5c91ce3073a11aad391cc566dae88165ecbb66c9437c7a345ee3b72cec038dbd1540dd98071c4f12ae8d31f8
diff --git a/dev-perl/Sereal/Sereal-4.18.0.ebuild b/dev-perl/Sereal/Sereal-4.18.0.ebuild
index 2e89ad82485c..1ace88bc5088 100644
--- a/dev-perl/Sereal/Sereal-4.18.0.ebuild
+++ b/dev-perl/Sereal/Sereal-4.18.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Fast, compact, powerful binary (de-)serialization"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-perl/Sereal-Encoder-4.18.0
diff --git a/dev-perl/Server-Starter/Manifest b/dev-perl/Server-Starter/Manifest
index 95d474feb72d..0b1bbd2f22ab 100644
--- a/dev-perl/Server-Starter/Manifest
+++ b/dev-perl/Server-Starter/Manifest
@@ -2,5 +2,5 @@ AUX Server-Starter-0.330.0-perl526.patch 338 BLAKE2B e7d213ae195d3f529ab736ba38b
 DIST Server-Starter-0.33.tar.gz 23335 BLAKE2B fc1f715d18d9362930f48410148a4f26b5018d26010c29a0d2822f94d131836bbb1f03c22bcfc7c3d43732cba3b46bcf63461f426d44ef629842ba5189b4cc65 SHA512 1892723ca113cb2c269ce330881dce9010b4ced212f85adefaaa8dfbe90ea6ebcf319c12f0e3384da3a07740a4e2a1d84bb006f44d77fec62d9bc0aeeaa8ccf3
 DIST Server-Starter-0.35.tar.gz 24306 BLAKE2B 0a6a8c8e5b95aeed8dbcaeaae5338b2edc994638d3ce96175b970bd1e8da2333e0eb744307c661c44689f3225abf040d24ec9c4d5cae3fb2180fa3cbcad1dd57 SHA512 d9ba5be08424b1b37ebaa765fbb6318353214cb8d8381227eae2b6445bbd21d853888a72fbcef2ba99dd6ba97bed6217af9e8f44b371bc15ec5d9c97b00c17d2
 EBUILD Server-Starter-0.330.0.ebuild 540 BLAKE2B 5464ce91b87e63deb2a2b3cb736aa3ae1cab873641097afe4554bf0fbf0c9a80647db07846399dc803ea0020c3f8dd596dca79ba80704674be5bc5fa4d1b8885 SHA512 311da4c24473d57c923d7e661bdfd569e9a30814c7ab3b47fa0ec91124d2d48ff2c09d71ec7b0c79832488e48113fc721da06d6708c9c99ac29f164dc9abe5aa
-EBUILD Server-Starter-0.350.0.ebuild 457 BLAKE2B 9741f857c94839c1e9e7cae614104809862826944d4d76da59297d5ec14ef8a0e101590566a89e081bb6ba1d7cdb74e78c203345f5fe6261eae4c59a94642013 SHA512 6881053cb8ec667d8d82f4b4e797a63025accee980f1c3e402e9f7a519a7396c04c26e4a7dee08220aa3f337d856406b3c85d9a856b433a0e6768f3cfc5ed478
+EBUILD Server-Starter-0.350.0.ebuild 470 BLAKE2B 9c3df348db25339464eaa2df0ff43a27c5ad906e9fee43f29cde1bf723021849be62def9260f874e849beb1e77faa0e3ca3e5e2b8860f38d71aa6f71bc118071 SHA512 803d228bcd237916646a196a92c4aa00bcc56d745f105617c186fb315d52a5b380b7c5497549c9c9c827c80cc87a47a11317bdd9eb9bc2c9e0afc76a00c0f38f
 MISC metadata.xml 470 BLAKE2B ad6152624319a084b8ae9f848ff39105a9e9d179dc2379821ca6da8698ca6bf5896193958826319ca2f27c1db7b8ab236c6068ba5cb0d0819763f1a9ba9ce058 SHA512 d436088d86cec7ac3d180b6aecf528090d2cdda892a0c6ad313cf94694500dff0692f9f2682b0426502d9e112e3c234065f367b2deaaea47cc8aaa6a4f92e46b
diff --git a/dev-perl/Server-Starter/Server-Starter-0.350.0.ebuild b/dev-perl/Server-Starter/Server-Starter-0.350.0.ebuild
index f3c6f95fbaa8..0aa63d895461 100644
--- a/dev-perl/Server-Starter/Server-Starter-0.350.0.ebuild
+++ b/dev-perl/Server-Starter/Server-Starter-0.350.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A superdaemon for hot-deploying server programs"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 "
@@ -23,3 +23,5 @@ BDEPEND="${RDEPEND}
 		>=dev-perl/Test-TCP-2.80.0
 	)
 "
+
+DIST_TEST=do
diff --git a/dev-perl/Shell-Config-Generate/Manifest b/dev-perl/Shell-Config-Generate/Manifest
index 41bfd5ddae67..a07e3efbbb57 100644
--- a/dev-perl/Shell-Config-Generate/Manifest
+++ b/dev-perl/Shell-Config-Generate/Manifest
@@ -1,5 +1,5 @@
 DIST Shell-Config-Generate-0.33.tar.gz 28382 BLAKE2B 5bb797e79c0adf5176c1e54cabe2ad2776a7431427601e980942e86a7715b2b08e732d3489203b1fbb64ef3580b5aab1d92a6eca71b068c250346c48c2c751c6 SHA512 57041179a9798ec4dde78c13770fc58499776201891fe865baff4cd00efe6801411eb3bc1f89271cf4a35edf4782de33fdcb8a572c6c5adba188f50a13755bd3
 DIST Shell-Config-Generate-0.34.tar.gz 29424 BLAKE2B 31059d56810661e952eb82f02190b7060dc94bd98a6d347537fa35c5bfcb2483facf9db0f040be220ea927e01281addba63fa96bf3d27b8e82ae38d3631becea SHA512 f78b1613ee26ed6fe7a435f523ac168aaf608f76f1f02470aeb0c540e8bb5c999e4dc86dd4e67230666b5d125ca12a727ab789314c09e1314a5bc5d94534158d
 EBUILD Shell-Config-Generate-0.330.0.ebuild 538 BLAKE2B b348cf95942d964a85a8ee18019f882b034f698622b40df263da030ab6e476f241f4a19b9067f42f953cf4054816e01030163c23208a2ab5f71241c7c024de94 SHA512 ea05538bd447675c8ae9a904154a36e7fc9d6ae2ebae63b6cf7513e6d4326c49c70d41df942d9f08c699f0c6a84947feea2449073e94b06df116ddb2112b51e4
-EBUILD Shell-Config-Generate-0.340.0.ebuild 511 BLAKE2B ed53651a44e1fd9aa342cd861997d1284d7808e3e13ff7d9f47e4530a3cca877020b3fb7830f0cbe01cf057ca43422430d01042cb08eeb86791b6ba36a111df9 SHA512 3807054d8cee482ff37b666b90c50bf696438558d5b0514b093abc05e7b904f51e59796d85530601533f023470956fbb9f97b673db8fe7f893f4085c9c52f949
+EBUILD Shell-Config-Generate-0.340.0.ebuild 503 BLAKE2B a4e7458b4f01bb8bcc086a05384f5e650de042e7cf4cfadea52b173c1b6648f153b0e9036668343a516cb4f04902e07ac6e5f444bece6c2e34c2c85aca1b6704 SHA512 0caae41995bad77a86a893578f1ab2ef3d842bf486a96686d8e48dde70005b1a0706bac94ea4378faf71139da409743fbd957dc4cfcbdbd0b29ae2c1023781fe
 MISC metadata.xml 536 BLAKE2B c108b13e7ca3feccc45ccba647c85dbbe780fa8852bef5b162365c00f9f854b1bc6992e8d3b695933d2e8d509ce0f5e2d678a876f54a3b55e45323cd8d2139aa SHA512 aee0a0ce718e47952af5586a4313732dcdf908cfbe5924bd74183bee96acc590ba2f9c3ebb2bff9a3c94e7676890ee71b710ec97132c73788a737c4f2ab547f1
diff --git a/dev-perl/Shell-Config-Generate/Shell-Config-Generate-0.340.0.ebuild b/dev-perl/Shell-Config-Generate/Shell-Config-Generate-0.340.0.ebuild
index 09393e697bbe..b441e83010cb 100644
--- a/dev-perl/Shell-Config-Generate/Shell-Config-Generate-0.340.0.ebuild
+++ b/dev-perl/Shell-Config-Generate/Shell-Config-Generate-0.340.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Portably generate config for any shell"
 
 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"
 
 RDEPEND="
 	dev-perl/Shell-Guess
diff --git a/dev-perl/Socket6/Manifest b/dev-perl/Socket6/Manifest
index f0b8d731596a..306dbae9c21f 100644
--- a/dev-perl/Socket6/Manifest
+++ b/dev-perl/Socket6/Manifest
@@ -1,5 +1,5 @@
 DIST Socket6-0.28.tar.gz 65567 BLAKE2B 9f8b83bafb9e57f4f26b2e123bda04c9ffeb801487743046f46ed583add67e663a9ce6dfbdd150cb0dcaa606f83198d44c0fa932be19b444d96b86ef2281fb58 SHA512 6f7ea283b0eabbe3051ec6d54e070a0290aa1cec6bb82b949a5a23b38b591766d19d2ae7e085c86cf44dac19784c5df3c2bf25a011b77281d5cb7d025beaafce
 DIST Socket6-0.29.tar.gz 65359 BLAKE2B b3eeed140724d10610b9a3948fd5768eb6961f168b531c2a953960cf73292c6711079408cf1e9299e5dc6c51b58eb1bd8e4dd7f2e76ce82f84829b72d9cea562 SHA512 51d05a04563519010f515a50fb1082c4e72eb4537137ad55f117458c71ec8429a5674083bd68adcbbf2e57632a1cb1bf60693ea98364e7f96c826ff8c9655b33
 EBUILD Socket6-0.280.0.ebuild 552 BLAKE2B 4dd1ca7a28849d5cfa5cbf81878cff5987c318fdaada0d4959a02d10a13eed94707122c362f8bc2ddafb96d5e5ef1490caaee1b17a8acd615c6f1857f39aab71 SHA512 12b73b81eb4b512943ec6bb40a766fa7e59b33eec269ab0bfb4d80c74740051aaea73616642a01ffea615cfd08ad459f884fff1356d8854e7504efa493e3a561
-EBUILD Socket6-0.290.0.ebuild 552 BLAKE2B 4744bf406df45f58167b1282cf6f25770397b526c7e99eb97b7d95b6bd8ef16106d3b33e110947e1478a0a72de2abb92de5eac19f7933d4dea6e6902c8e69fce SHA512 1432add0c4cc5c54d0956607eb84730406dd8b609d4544582443e8e0c207d85ce3eb573430a7cdd082c986d68b2ad214b6cfcf9de26929d183879de4c93d5a11
+EBUILD Socket6-0.290.0.ebuild 544 BLAKE2B fea0d4ba99b538cc6a552b092acb2d3943d7c6f4f6f7505db48c7904c28b859a66a895f76cb8e9317f79906686a68026930807504a381f0ddf127d77ee229006 SHA512 6f9112a2a293076b0f229f7ed2087ed8270208adad156f694ec4799c170d0094d7a693724afb30292bc59f6362bd20a2b7454ff040b9fc68fda83140c80145aa
 MISC metadata.xml 386 BLAKE2B 73a9de32345f39e4a995b906b82246fd6f6550ea0edc486907a4ab970b53ae71c0956397f6dd126b95242efb7c2102bd8c89a73896cb22888bbd27e8807ea01a SHA512 25e487a2c2ed27da0d2ecd58bd0dc3114c6fdf6b60a16459152f48d004671cbf5bad18fbea1e5149ce117a33941a8ef63ccd93e3fecc4b07297f2152aeb42bb3
diff --git a/dev-perl/Socket6/Socket6-0.290.0.ebuild b/dev-perl/Socket6/Socket6-0.290.0.ebuild
index bf16107afd8a..461887fe612d 100644
--- a/dev-perl/Socket6/Socket6-0.290.0.ebuild
+++ b/dev-perl/Socket6/Socket6-0.290.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="IPv6 related part of the C socket.h defines and structure manipulat
 
 LICENSE="BSD"
 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"
+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"
 
 src_unpack() {
 	default
diff --git a/dev-perl/Software-License/Manifest b/dev-perl/Software-License/Manifest
index 6cd562c67a7c..434d7a44ebf7 100644
--- a/dev-perl/Software-License/Manifest
+++ b/dev-perl/Software-License/Manifest
@@ -1,5 +1,5 @@
 DIST Software-License-0.103014.tar.gz 121711 BLAKE2B c898773dc33b94aa02f6092ed49c91e2ab7f9cc8a77a66226a7eb31c826e8b21d921868411d416f5f367fdf3a024de5ca6c8830792a5fc1162568f0c2108e469 SHA512 8012f9d3e8671bdcbaf52f6790f6cd2f6a0510883bb40115c222c8c685aed6697ba33b3f9df8d853841cd2eef0806d919c9038b6ba7b1057f475b3b63457069d
 DIST Software-License-0.104001.tar.gz 131973 BLAKE2B 7d988f33b433a6777bc0049f6b4bb3bed3de09bb1ce992d9273092f4f3328ae326aa1a719f24590d44315dc11c4288d989952e9b7391e08affadd508b02dd7fd SHA512 4ba5e11e8aa34a4f59ad4028e8e4547e22d5d56e04836cf280a0fb52a2fb64c8cf5347f6f6e2c368506c35eeb7e189527e4339d11541aac34c2c28737717e34e
 EBUILD Software-License-0.103.14.ebuild 646 BLAKE2B 0c64d3564218b31779964ce4f18ce3aabd9dc3e7c73b3caa76bef1ea039a873b840c4c1ab1738a93807b6bab0b3c9a34ff2df70aa21ca0d52a1c235c2313c472 SHA512 559602731d76887890914d42a5a3d72600b0ec26962d99aec6e4955d18384a65b19e4ac88b6d960995663495f7b53df0a1abed7ed1875d815d7b75c5e36facca
-EBUILD Software-License-0.104.1.ebuild 559 BLAKE2B 5c82c671d2e30b5c1c7e7858e962dd8e8df5f3edb5c3e5d633b60d426b283441fa222cb9f47d593454c5442ed0c680bf39671d6b7dea8ee36b26aaccbedd3ba1 SHA512 6541ea8f5a00d53b7de788ef38c3aa1a4e8c60fe26bad815ee4815f500a7e54ae6b48a4c8ed6ff1616a84459f994c751d08737cc277c754b789a404905050f7d
+EBUILD Software-License-0.104.1.ebuild 557 BLAKE2B 452b490f195989ea7bba0bae0cf54c6cf3de344920a516dc91bcb19174fbb63dc0bb1274996beb445f80ce438b2e707857ccf436638897b63ca518c193b01521 SHA512 c30a2a7934ae5dc245b6800d57e8a84104f2ed0d50c9ed6c723e1d38054ca2427505a331b165b78061b0237700998510d63bdc7597d4e41f8087f7028b451989
 MISC metadata.xml 2673 BLAKE2B 00c86665b0df52c56fd9875fd133f67bc87ae2204bb55f1e74f14b41489d7869edbae9149feef3a5c504796936194eeb7b9daf8afeca7d493fa7cc9c91f0d295 SHA512 26d0c244bef702914e15ca47d0d1c7a4b628c6406e2f439eea6b196a7d32d270c2622d026e18d31493ac79da6b8a3f35fe58d01bf55a39b52d7e2871de99549a
diff --git a/dev-perl/Software-License/Software-License-0.104.1.ebuild b/dev-perl/Software-License/Software-License-0.104.1.ebuild
index b1364456fc1c..53680da21c01 100644
--- a/dev-perl/Software-License/Software-License-0.104.1.ebuild
+++ b/dev-perl/Software-License/Software-License-0.104.1.ebuild
@@ -8,7 +8,7 @@ inherit perl-module
 
 DESCRIPTION="packages that provide templated software licenses"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Specio/Manifest b/dev-perl/Specio/Manifest
index 6a82a9b321fc..28c50ac87250 100644
--- a/dev-perl/Specio/Manifest
+++ b/dev-perl/Specio/Manifest
@@ -1,5 +1,5 @@
 DIST Specio-0.42.tar.gz 101641 BLAKE2B 9c527cd1b306d1a8394ad5b6757153aa00edcf111a444b3792cf088aec0a00597c655f59971eef7a8a6a7689e9b683ca78789b7adf1c9d19a0b6861cd4b90733 SHA512 7a9ff3e96cf3957d7857cd5f6af5efd9e35fc4c888fcd8177041e34a2388f54269e7a3da84ec60961fb61307beb882ebf54e19ae4346876e06197b1ff57891a0
 DIST Specio-0.47.tar.gz 108288 BLAKE2B 187ecd5ff0db27faeec03bd9cda6500d8e38d60d4c31aedc50d29fe3666fec68343c04294008941d92618622fc27b88623a8e18b29a63812ccddf79174bdc10f SHA512 68cdcf22818b27c38ce92b497adae81f27605aa385e9156d51d5e8e63da121d6bf26b7339a7ee3c9408cc6e3731702b008bc4b2e3c8eab67728f959f03682f44
 EBUILD Specio-0.420.0.ebuild 1013 BLAKE2B 35dd74a3f2c6d1dc04f434f761c30afccd842b2b1eafc9300461bb9b080e50125915f2291b1258c5c15a72d142d03a42839f37efc3e350d57993cde6f1444771 SHA512 bce97616294757c560a95d91d247c5aa4d2f1f4201dd484762be7929bc3b880aa53d493a238287883c8671e1f8f43b9499bf54dd552bfb43a2244360543607f1
-EBUILD Specio-0.470.0.ebuild 895 BLAKE2B 4d793d4a1788574a1bb26434e0a3c513b3831dface7ab1b2a637c67e128804e84dfae496aeb855f162713154d1d47f7413b030f6027a385ec189c43fc23e94cc SHA512 12e78d3fd3e0463630ee5e29e71565dfeb87daf97739cb6399fa4732ae7b95729c7c6462c0c16450ff19f18032e0633041cdce7c2baa917ab43bb44671b4040d
+EBUILD Specio-0.470.0.ebuild 925 BLAKE2B 76f3352b9ccf22eac9a2fcdf5c585f5cc6ab13eb37de51e6cb6371186c428b495b6d24a7fc2c5cf1fbf557a829089609f070b2726e196d3fdb5f3e72a4bbd051 SHA512 665e64f13083c60ad3f609f094906a810e1e6099ee3d681afba340af4ed1aafb587ce8b18e1bda669d5d076e3ac9e26817d2042afe83cbe7eb9a22975bd389bc
 MISC metadata.xml 3182 BLAKE2B 7a2dcca648d380fb70b0ec0c9a88904b7eab40f946bfe6628623a648d48c31da42eb03248c68b95a581657aa6f1cf581df906f2f85aa1114492562a8f47595d7 SHA512 a7c0321adc9ab021d9b3b9095923aca9d1714c1421969e04f7e911861fba3b1b6af95894ed9aa9fb2184eb8488483037355347a0a0926c80bb18e9de707a3c19
diff --git a/dev-perl/Specio/Specio-0.470.0.ebuild b/dev-perl/Specio/Specio-0.470.0.ebuild
index 26d5c5c1b253..ee421b054c76 100644
--- a/dev-perl/Specio/Specio-0.470.0.ebuild
+++ b/dev-perl/Specio/Specio-0.470.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Type constraints and coercions for Perl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~m68k ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Statistics-ChiSquare/Manifest b/dev-perl/Statistics-ChiSquare/Manifest
new file mode 100644
index 000000000000..191ae22bb849
--- /dev/null
+++ b/dev-perl/Statistics-ChiSquare/Manifest
@@ -0,0 +1,3 @@
+DIST Statistics-ChiSquare-1.0000.tar.gz 28821 BLAKE2B e6895291293682850b51c23f7ec15b3abf02836977f17293d152f7ef1efbe6a946c4c767fcac90cb6b006b8031dc6c164d1d797977082938d565fe2b62ae318e SHA512 6523c0e44b53835796c5b3f41cb6281413b79c596601a1971b8cb6fc7b2c76fc53ca60642bc96897083d6504ffc0e5ed35b475df4e9264231a5d602d90b3dd35
+EBUILD Statistics-ChiSquare-1.0.0.ebuild 254 BLAKE2B 1aff64ce2d1da6d34ea54f865f9f5205d73ebbe405780b12ef126f801e8deeacbf8487f783de97153da2e797b1b22d9a7e7d5180a1db4e9ab953502b51913ea7 SHA512 6d7b605c44cac2e086edaff6a045731e2af1170caad6b0811ad15dc0737645af206fa4448e0c285612f174082a897f7f9f232d6a13bc77d545b1b7e839a14dcf
+MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/Statistics-ChiSquare/Statistics-ChiSquare-1.0.0.ebuild b/dev-perl/Statistics-ChiSquare/Statistics-ChiSquare-1.0.0.ebuild
new file mode 100644
index 000000000000..a925d7d5e2aa
--- /dev/null
+++ b/dev-perl/Statistics-ChiSquare/Statistics-ChiSquare-1.0.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=DCANTRELL
+DIST_VERSION=1.0000
+inherit perl-module
+
+DESCRIPTION="How well-distributed is your data?"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc"
diff --git a/dev-perl/Statistics-ChiSquare/metadata.xml b/dev-perl/Statistics-ChiSquare/metadata.xml
new file mode 100644
index 000000000000..e2c9afaca62c
--- /dev/null
+++ b/dev-perl/Statistics-ChiSquare/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-perl/Statistics-Descriptive-Discrete/Manifest b/dev-perl/Statistics-Descriptive-Discrete/Manifest
index 0ab55bdada52..f45a79ecd5b7 100644
--- a/dev-perl/Statistics-Descriptive-Discrete/Manifest
+++ b/dev-perl/Statistics-Descriptive-Discrete/Manifest
@@ -1,5 +1,5 @@
 DIST Statistics-Descriptive-Discrete-0.07.tar.gz 6889 BLAKE2B 73e89cdff3d5e70fe95a579c382a73a7fcef3330345cfbd996a22e25992d88372c9c0d1702a82718ba7e2027a8e518d139ac42a60955cf959bd1ac6c9e9ab6c5 SHA512 a751b25efbf352102af841e0b46966f70a003256167b4f8e281520c971c9aa9c9c87d8f8194febc24f740feb75a61072f80f7bd1d28b6d9d41f5d198b46177a8
 DIST Statistics-Descriptive-Discrete-0.12.tar.gz 25644 BLAKE2B a8ec97bff330d8f0946d294d7ff0277b10d0828c6aa0211c78eaf8eb161b14631d6162f1ac624da5fab43b1e54ba3b6ccda0cbc3941fa21be07b9c25f8ff591c SHA512 08cef28f5111132eb7a7c11e6f63eae4acf2085cbabe279e9a20f06ca3154c9c63f9133429f249cdf16ad347398cd124c34ef827c6f03fc093b2b00b3ab6df08
-EBUILD Statistics-Descriptive-Discrete-0.120.0.ebuild 285 BLAKE2B 3fe051d2357b320f54b58242b2b88dddd61d6665b2dc33ff7408c07e853f2b1e2e624c74a3275c80759c3b1942bc58340158ef03ef0dd8ec6690068dbf9a5a28 SHA512 3bf832201176c75de8dd5deb60fd0653ef2d1b358646d21cddbb8f6e6742723125523af830f41bb63e3c7bc0efa13aff509b033f44cfdc695d30e284213e5a81
+EBUILD Statistics-Descriptive-Discrete-0.120.0.ebuild 282 BLAKE2B a57f92b724a6d62559a2ba060e2fd4c17b55036b907ea8b22ead0c9ff5c30848a503d45577cf53d714b93ea881095d595923c9d198e0f0b020afe718d7dc16f2 SHA512 12da9ebc5556afb1c8fbe87b03eb9a441e81bd475687c772e35ef115fa49592dddb1e96e95606c3444563a7117d38237997f0779fa07687f36488d4a5d33d5f1
 EBUILD Statistics-Descriptive-Discrete-0.70.0-r1.ebuild 307 BLAKE2B c619fd2d4a0eb162a7e3b15b52d33513ea14d2776c4f055131f8a6e37b845fc51f1e41c1ee34378214ae8635dbd1e60c0d592076a817774879a3f1f9101a2f08 SHA512 a839ca33c9df570cd9f62d370df81f03f447e72b1e0e86492b8fffb33d694f0b4b9896874624b1db07b88af23f6e9f059b08768f69d21c40a3bdb2b9adbb0709
 MISC metadata.xml 436 BLAKE2B c59d37d61e1b0d8110b18ede370482ec00437547b9c190c35e55d036970bd77cdba3617aec7df67189e9011a08fb004ec01f03d9c367016e9919e5aa8f86d529 SHA512 3ecccdb5960af9bb982d2b539aa185f76ad91d76614c02714eaa4e2cde8f2b4fceecd040f8af04cebdcc9026c07f1a0a51a6b2ecfb2d64e6789119f913e26301
diff --git a/dev-perl/Statistics-Descriptive-Discrete/Statistics-Descriptive-Discrete-0.120.0.ebuild b/dev-perl/Statistics-Descriptive-Discrete/Statistics-Descriptive-Discrete-0.120.0.ebuild
index e02cd30451e6..9f56a71407e8 100644
--- a/dev-perl/Statistics-Descriptive-Discrete/Statistics-Descriptive-Discrete-0.120.0.ebuild
+++ b/dev-perl/Statistics-Descriptive-Discrete/Statistics-Descriptive-Discrete-0.120.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Statistics-Descriptive-Discrete module"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc sparc x86"
diff --git a/dev-perl/Statistics-Descriptive/Manifest b/dev-perl/Statistics-Descriptive/Manifest
index 327294c1f713..af7b531a7097 100644
--- a/dev-perl/Statistics-Descriptive/Manifest
+++ b/dev-perl/Statistics-Descriptive/Manifest
@@ -1,5 +1,5 @@
 DIST Statistics-Descriptive-3.0612.tar.gz 45929 BLAKE2B db9fd041f1182ac780ec2b803cd8377e04f56a9596da5d7e791a3f0b2f40490333e4f7844356b72464bf1c2169a689f3862306621546cdf4422732129e992eca SHA512 1157c0259a376f44363861c515ef56a25cf5a496d67faea546e225751d39c3529f9aa7d1bd021e2e399d5e884e7f5372df67249fe4f5607a6bdd806235503d46
 DIST Statistics-Descriptive-3.0800.tar.gz 53611 BLAKE2B efefcffbb83b153d7211756b30e5e00447f3aaec768f4849601f3c5b83c4ca60cdb56f15c5ff95f2fff23045764fef31e813b961a8e886506da1d71983ae6f8d SHA512 691a99aca4214149d14c770d71b5d97eaefa2690698b0234b11ed33d7bdbc21e9b478941bb8fa46886ea3362f432eb744a3a3b3607f3d3fe189c4256884efdec
 EBUILD Statistics-Descriptive-3.61.200.ebuild 789 BLAKE2B 269338a9caa1775bf5e9e399725c99ba673ad8eec049ce819ef1f40d47ec492c6dca603cfeb7d5b03b14dab3dd02442dbb23e1c7c7e1fb6f387f4c91256105d1 SHA512 2544784c7ed67b3695fe5d5a7aa7791a727a2105871c416663da3fe7274a512aed0c59e280c214e1d99ff91a5d524a37e6fdbb5f2aa7c7d2e6d5293786db80bd
-EBUILD Statistics-Descriptive-3.80.0.ebuild 639 BLAKE2B 369aaa72f8e8a8fee0b1a09eafe043e5990fb2e06a899f6c1c610bf901136459e4a26934962ad655e7d3c664f9b97fb6ec36bd4f3bbaa5c2bf9693e9c4573df7 SHA512 e25a5e849b0a5630c002a717b7fb096bd0138be788ead15519b614742d64d348fe75a1bf1e38020ad7502abb6a6c17f62eea5b54a1bc63569e07f1a3ae8a3b6b
+EBUILD Statistics-Descriptive-3.80.0.ebuild 637 BLAKE2B bdb5ce8638366c54f4521ea18fdb4bc700f96106c7ceec5e639b6bd442519e60935078d24b5409601aac712bb8019942d2637a6191f4948dd31b3de5c6cb4635 SHA512 e4c4fde3b71c05b908ee19329cc1a9f070d63b3de823867a21709995b669a8e34e321e136612c5c5ba43c84c44df0692ea26ff8e5629e1e949c7f402c4ec6717
 MISC metadata.xml 845 BLAKE2B 4d8b72fd597e6308bfb0629dac49e5034a0801dbef47585001d3c09ee4fe29daffe5113ebd29b1132f8e5b599cce85bf838f9bac545e42cfa4d236b00e9c2f59 SHA512 c747b161d7b32ff9df1124dc4fe963c7ae9209c9f8a6a1296968fe9344ec510ca3d97df94cbb9351fb8b034fcc6b9c85db9f8c3df693bf395b095274fb69daf9
diff --git a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.80.0.ebuild b/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.80.0.ebuild
index 91c6fcf9552f..a7b840cbce90 100644
--- a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.80.0.ebuild
+++ b/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.80.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Module of basic descriptive statistical functions"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/String-CRC32/Manifest b/dev-perl/String-CRC32/Manifest
index f097ed93268e..4a0efbfa5457 100644
--- a/dev-perl/String-CRC32/Manifest
+++ b/dev-perl/String-CRC32/Manifest
@@ -1,5 +1,5 @@
 DIST String-CRC32-1.6.tar.gz 7713 BLAKE2B 9b976be73e7781beccada0c2c0bf535f5d23ada71840fce82f1915bbf0f2c5ddeb9d4ec50b89e396b9ef373826961fc4f78e9a0e5df38823a482d939bf35e769 SHA512 e8915066edca5407de5c42cf6ec6367cfc8662d3c353ee7b9150e372fccbca136946a8e30ec18f4ccba3a08d4864387f3cad01b3b0117e019927b72c9081fe39
 DIST String-CRC32-2.100.tar.gz 7995 BLAKE2B a8434dd8817ae93853cc2fb5fe41b4c86072d2382b1d7e9c94cef6bd9af405c0f2dd333e15a343449c9258505ca7af194e5ffaddf466677ff2378061915656cd SHA512 24e5f69aa02b16c888fa412afd28f907756e344662d66d05759ed212d97ce3f0a05fbf5bdd1137bc31ae37e27d0778fe23d75def368e051ab1cbc4b90c96907d
 EBUILD String-CRC32-1.600.0.ebuild 410 BLAKE2B 718502a596fb2145b7d3c71a63ea61673b675aef11df1e83114d63c6f589c8ed4f5c00c784fac3a8157f4e6d2b564aae9a02709feacaa8f9658f5e3314ad084c SHA512 5f378015a0acb6ec9d7f6b11b4a5302c17336a793b477d28fbc58392e7a5af860b1774ee99143180ffd4f38f786b1949aeb565def8abaaa64943576b3f1af777
-EBUILD String-CRC32-2.100.0.ebuild 411 BLAKE2B af48a1234bafd223a9391fb1898fd9c7be51a7606187b0d2b5bd548f21acb05b586839bf765e073ca8f7c8b8eff6856d263c8c41b43a2a5bba8064ddb6c556f3 SHA512 46d11db6c480da616e33ff7351bde486ec62d6d7adf1b2758572487d3be05c04763a1fcb693322ebd70870c9b313176146f59bce44cfa77f20ee95648a961561
+EBUILD String-CRC32-2.100.0.ebuild 404 BLAKE2B 562980b8f4fe1842f4f089ab9f15c7ec2462cacc4eb3a05ab3643b6471d2c9f36c1abcafd1c85c3483c4744ca9d8157bf0ec3f0e427f3cf36a4541be8135e68d SHA512 8fc1297bd704fa36e99c26e09d74bf05323648e45545057c304bc0fb47c348204e4b2026a6814a1d5528185759b6772b3066297b2764e5531b919bfb4c684169
 MISC metadata.xml 397 BLAKE2B 05638284366cbd6e623f971311b1a64e3672c8ebfdb689852963f964da1a4bfbfa7d2301153bbb6fa5111d05c231e4a55c6d9133a6d8096b551bafe6439478c5 SHA512 6e7d3759d692e63e34bc19739653e705c5dccdcf3f4be84d2971594b94c1794d3453031bc72d4c4bcaff40e7164ac0afeb6c11023602ba3bd7cda26c1ea25d54
diff --git a/dev-perl/String-CRC32/String-CRC32-2.100.0.ebuild b/dev-perl/String-CRC32/String-CRC32-2.100.0.ebuild
index ee2037634f2c..366f63f695b8 100644
--- a/dev-perl/String-CRC32/String-CRC32-2.100.0.ebuild
+++ b/dev-perl/String-CRC32/String-CRC32-2.100.0.ebuild
@@ -11,4 +11,4 @@ DESCRIPTION="Perl interface for cyclic redundancy check generation"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
diff --git a/dev-perl/String-Ediff/Manifest b/dev-perl/String-Ediff/Manifest
index 4029779905ae..96e651c82896 100644
--- a/dev-perl/String-Ediff/Manifest
+++ b/dev-perl/String-Ediff/Manifest
@@ -1,5 +1,5 @@
 DIST String-Ediff-0.09.tar.gz 13195 BLAKE2B 1f5011e452278e3b62a840e61d609f689e4886f0b6d83568257d9d2d924aee39790405c92b4425b8a3a02a8dba500a7ff4dd427e1f155dc15f18a2a2284fa5cb SHA512 865723e47c570d38d180a05ad890d86228368bc381722764dd5e785b13be6c06904221c3ebb7ab583f9e8b9974067b0920a3d8710dddb77015eecd2059d763ec
 DIST String-Ediff-0.90.0-swig.patch.xz 17600 BLAKE2B e3e3808f38a9af8316974975872c3e74f15e54484cdc7f10f42ba2411fa80f8a7367f5097f6aca52c12761965dd7c9f3054e2aa7931796a3b264262ee7b150ae SHA512 acf53641828dd0a3aa60806cb36e5b6ee5724ac9c5a969aa11e0b9bd298b79d6b51864188c4f6403909b9efccb3e2d55e15a201f7d3ddbba04acb0224630ab1c
 EBUILD String-Ediff-0.90.0-r2.ebuild 290 BLAKE2B 7acd54552718c119cb7489a3b86603c98a0d8073dfeb46c85d650fbf833ea866cf777a09d58f210a2550d02ec0b04f7fb73da0037d9a6f1ff0e9084d4c2232d4 SHA512 591ca06a1da0b75c1022049940fc64c2cf7b281dfcfcb20481f49a17158c012dd411aa09880ebb2fda2e50e4a7b9f73da71dc8812f327c65ddf49c152dc5b4e1
-EBUILD String-Ediff-0.90.0-r3.ebuild 411 BLAKE2B fbd879d41c81c3c80e8a4a4f8286b7228eafa514b5cd00a325a9e86512b232e60617ded7127e2bf41f423b0d434a358f23def0049c611f4a5b3690798dbe27b9 SHA512 d838db425c62beb546690d5dbc231552eb426883503b26b759f0fb3ecef1e878421541bc2506ee530f15c94df8c101d9cc2841f4a11b1a296158241fa027d704
+EBUILD String-Ediff-0.90.0-r3.ebuild 408 BLAKE2B c235fcd18abdbe5f5976c76c7235c10d35e31d8400c2bd87a2273fcefddfa06f10fcfe1ca82f3696b771e892b286660d79f40786494d0b4999b42d31b3dfce91 SHA512 b5e27ebb959d856bbe55d48507dba25f6b08aca7b9dc641c9ccecd5693f15e9919d5bdc2f5118c13d505c71773beda066714cac4ec646a7886e6b1d77ad11b3e
 MISC metadata.xml 397 BLAKE2B 00405bdd90c972a67c63f91f88083f7cdde6ab7ed774922513aa5aee3784572fb1c38969ec9f51c90acd5877ea074a7acebe79925683ab75b57432298630780e SHA512 7a6e1c377a7539a60938875c216cafe03e596a7d046a958e77b7bd98264a44ee39a67f368e999286238924ee6da3b2febfd4a5381a64c5a12690bdb194334e89
diff --git a/dev-perl/String-Ediff/String-Ediff-0.90.0-r3.ebuild b/dev-perl/String-Ediff/String-Ediff-0.90.0-r3.ebuild
index ea28cc5c95c2..a316b803016e 100644
--- a/dev-perl/String-Ediff/String-Ediff-0.90.0-r3.ebuild
+++ b/dev-perl/String-Ediff/String-Ediff-0.90.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Produce common sub-string indices for two strings"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc sparc x86"
 
 SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-swig.patch.xz"
 
diff --git a/dev-perl/String-RewritePrefix/Manifest b/dev-perl/String-RewritePrefix/Manifest
index 52613b9f62e9..6b4ae4c81750 100644
--- a/dev-perl/String-RewritePrefix/Manifest
+++ b/dev-perl/String-RewritePrefix/Manifest
@@ -1,5 +1,5 @@
 DIST String-RewritePrefix-0.007.tar.gz 13553 BLAKE2B 3f8ec74cda91415e2c587b30a694a2ed9873ce6d7ce8e67e31df263690f7ffe67b15694275faee924b96b9e65b6596934bdbad760ae8924777020f44340d6115 SHA512 c5f2eb6c7661809b4783378a4a33445dfd91fea22cd0a11c9e8d42683879fd6f95c465f7902db2573d5939dc18b250c1fd787d63e3c8a2e15febfd2c8fbd5a10
 DIST String-RewritePrefix-0.008.tar.gz 16528 BLAKE2B 2facc7f7eabcb6febe0a467f9127ad62095c2a50d48c65c04c837169af978e12fa240c529432bf5da16c0ccf77a559e18099541841a422109d1f55fb79080ff5 SHA512 9aa814c28863453f3e684f96914462bf09d72d909aa41452b08748e6a47a9c1c2aad5b6e56091dae546c62b0d3d9db0b087f8af12c085e86c69ac8e08c610611
 EBUILD String-RewritePrefix-0.7.0.ebuild 525 BLAKE2B 2cb949815d8156bfa45aed88b88bef466797ea52cb730832c4376dcd86c9000086e948e578fa2c3ee1f5fe1a4865a8de3f5948f3ec463359872d5479c6c4ae74 SHA512 43c13bcfba5f355d9d1e2590d2eb0ecc271ce0bc2063c4aaabccd4f61c317b9c0452b303fc83377e7d59191d85f6e2c7428aa3d5c92fd2083ad9aa8c2ef9c6fa
-EBUILD String-RewritePrefix-0.8.0.ebuild 488 BLAKE2B 9b723ab52ab8370c6a142f270ebdaaa583e2ae2e8fe181556d55f54caac3b34e96fa23a09bf32b929731b86a782990665f68e6213907a61286904ccf6397a6d8 SHA512 f93efe9606c21a8fd7425710a2d4dfc86407dd7ffa996d302eec043d6a559a611e199625cef048d334884ea535d5c9d1b9469cfb9ba7ef83dedee73dde52e15d
+EBUILD String-RewritePrefix-0.8.0.ebuild 487 BLAKE2B 9638075ba748f20626adce8ef03bc2c3b4a0037258bac85c1d9c118c9ce29be910d1cc5b453647312535736ea7be41aeea608c255102d0cd64e2f92f401c57bf SHA512 30effa5d6a092edcdc95cfcbf18683b9d04c53e22b9a50b70894032a5328446e5f0e9b684dbfbc06e8179d37872ed0bed5bac22b4d525586c0e4f0ab8bca3556
 MISC metadata.xml 413 BLAKE2B 20241741dbcce08847467b5279594965a75dbf3db495edd6e7b2d1929870a0d732c496aa7ff527cedbb4e1887bc9c13d929388e8c4beef4c300f2268c6ac5da4 SHA512 4a378728f962d8327d03d026f499383d8a052780ec96968ea9948210f2024456a521caedfd8aaf37a4daa9eab64372e1761faf7393356484b39ea3ba11815592
diff --git a/dev-perl/String-RewritePrefix/String-RewritePrefix-0.8.0.ebuild b/dev-perl/String-RewritePrefix/String-RewritePrefix-0.8.0.ebuild
index bf436088cd6b..3c943541169f 100644
--- a/dev-perl/String-RewritePrefix/String-RewritePrefix-0.8.0.ebuild
+++ b/dev-perl/String-RewritePrefix/String-RewritePrefix-0.8.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Rewrite strings based on a set of known prefixes"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/String-Util/Manifest b/dev-perl/String-Util/Manifest
index ac524a38020d..fd383e9f76a1 100644
--- a/dev-perl/String-Util/Manifest
+++ b/dev-perl/String-Util/Manifest
@@ -1,5 +1,5 @@
 DIST String-Util-1.31.tar.gz 23401 BLAKE2B 0a2b3e2157e2ded38a6a8ef1d139a5dad91bf000170644891574fcaff6813c9ed4886d0aad8322c29173302f3f9c107709bc245af6a46660c21f5b6e8836eaef SHA512 75283ea5b8dbf9933c94c96da71ace8380cb74c9848c35c4c5377ae00aeddd0851fbee8f3506ee4110e9f278b725aa0376d261424bd78eec6f6e32e2f3fc8f9b
 DIST String-Util-1.32.tar.gz 23870 BLAKE2B ef6a2b9a7b86fff11fa40d6674812d4ca9f5b1a2bdef09207a1ed29f358c391c56ac28f65fe2f2a9c3ca00f08a8e9a5cd85ccffd235e04d05abeb182f641dac8 SHA512 be4c5922afed8f5f5cb9b4e8cd5f7ba9d08fd2ee322b09a7f22fba6aa410febf89d4bfe5ba9dbcece61b48b4a62f15734d3c29c55e121cf784d8295063cfe14c
 EBUILD String-Util-1.310.0.ebuild 504 BLAKE2B 6e0ba360e8dc624701a90c75181ba50c4d9d6187a05eda1f6627498948286ec18083b07c9fb0a7dcee82990ac7202a99670b3ae45d6d7295abf08f60ca4314f5 SHA512 1ca55e57446ece90c81fdea27170bbd4e77263a9d486d4a7f7e11fba0771df6fd05b7ec784469111695a3d0156017f5dc0af5fd488a620cfe9340851cbbf664c
-EBUILD String-Util-1.320.0.ebuild 423 BLAKE2B 3e625e69ffe821701aa2947f3a0bf360098b1fa588f1233f117a8e05866dec97f85eb5ecfb8663a63e1101c65ea134ce29c2abc6452a567802169ae9e73639fd SHA512 214963cce0bfd1e18ba081e81dee003efe60ce1cf1c2b8f20c6d8888d6db7c93a6f5d673b08f49774a99623f9049abd860da1b705b53a6889d12218a423492b4
+EBUILD String-Util-1.320.0.ebuild 420 BLAKE2B a13a3a409325636610906cda8587081fd5aa83fdf73a348467e2e7c8a571989d8314b194a83a7d94eb2a0444519ec56a33d0e61e4980dc3b57ecefc12b0754b6 SHA512 f153248a187e2bb62181a13aba9653087cf40c67c017c1ce26542f9c325b921b659e1916cc73b2c4d3684098cb7d3e7e8e245d1c60afe97e69da187daf24e37b
 MISC metadata.xml 395 BLAKE2B 947cf98fccc0a50def0b031cdc177bd8074384aec3077b03866c97416f711354ac6c5603e52aadd99922b77a1bdd65ba93c69df1705cdd0f979ed8b26db12b0a SHA512 1aaea83cf76d6b139aa07efbc476e0e88a3d540e1ebe6f3fb74744438c0bc1cbf62ad667e57282d93a1513a63406092ec02244c98564dda7f5083fe03a4a0319
diff --git a/dev-perl/String-Util/String-Util-1.320.0.ebuild b/dev-perl/String-Util/String-Util-1.320.0.ebuild
index f356fff8a3e0..05a10aec27a0 100644
--- a/dev-perl/String-Util/String-Util-1.320.0.ebuild
+++ b/dev-perl/String-Util/String-Util-1.320.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="String processing utility functions"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~ppc64 x86"
 
 BDEPEND="
 	>=dev-perl/Module-Build-Tiny-0.34.0
diff --git a/dev-perl/Sub-Exporter/Manifest b/dev-perl/Sub-Exporter/Manifest
index 8a0b7ea29a4c..9b5a2ee51e68 100644
--- a/dev-perl/Sub-Exporter/Manifest
+++ b/dev-perl/Sub-Exporter/Manifest
@@ -1,5 +1,5 @@
 DIST Sub-Exporter-0.987.tar.gz 45980 BLAKE2B 3d23be5e98084b5de691dc981f2fcb36d443e079705758884dab2d9ef083681b20f25443410ead21c6a62935edfa2146192c44f1afeca51ac89204078cfcf454 SHA512 6b682d27a0df8ce971ea48aeca5162e1c70929c51cf27119b30361477876b0b86ecb15ab13a6c3cbe5bb85be9e600589fb9e3c9c4e94bad3fc05b675d293adad
 DIST Sub-Exporter-0.988.tar.gz 56906 BLAKE2B 9c08968cef2fc915bc8ebd0e9af90283066673cb4137f7fe602a9a034b9325c76a483dfbc1fee651683b6a7803100685d9684c03e16d2f3231e7af874e4449c2 SHA512 e992739097eca3aab0465e33ca60d91e4b08ee40d7cd041be4452873790e438bb1fb293331f919ae1e9b879fc063d17586218a9e97838cf61216172d6bdba273
 EBUILD Sub-Exporter-0.987.0.ebuild 594 BLAKE2B 7d0e055c547199c04d81acd1b0c674e95043542bf3e63d42d3a488b55547ab200b62f3a203cd1a88fe2747d37159807017c0a762ad1a3fde16f9bfb5ec182d1c SHA512 f1b54a39a05c00408fae26948233b65c60c75cabc53ddd22f25855c14f11bcae2300f9b18b403bf24c41dfbb1b69ed2291121f724b8c985f82160daf6aa23630
-EBUILD Sub-Exporter-0.988.0.ebuild 597 BLAKE2B 5647c9a8b82bb43f9bdbcd24d181a1e7b564bbf7b6d54532d6bcf731f725f98164f0a576e395b4ef4384d19132c608fd51c516d27fa6e4d122b7f8787f22c1f9 SHA512 b0f40a667c190494a2aaaec2004be4528d7a1dc82f233620ac33a7a9d66828fe849593db53f23b98d86f7fb106be60ba5bd58244bb26a8e12636c43745e9f0f5
+EBUILD Sub-Exporter-0.988.0.ebuild 589 BLAKE2B cbb10509d768eb4816fafe054707e84c276ca348ccaf036e677bf8955acffe97aaca195f23e1560e60445b5cafdc2f015b1de3334ab91b749b7f8f104a26bcef SHA512 6dde28fa10198d7bba464330b04eb8c45e455c5eedc2afede07c31dd766e5b3698230f91057406e330827e0d58e820593c7466b046a4ea7ae29885eb8215484f
 MISC metadata.xml 463 BLAKE2B 4ec9fe1080a75e71834101e38b2f8fbd31612afee1b445407e0072b6c5d9337a537404af4c478a7e325bf0b617713114d56f10d1c0c639d4fcff5005cdc17b8e SHA512 8415c27df1141f77414cd41afb7fdf09633f98bac57633e334f9cdbb870d2d4d9ec7653bc9315ce38fbb1a4486d75a65586288be92fa1bc4e167575cdadb2cfa
diff --git a/dev-perl/Sub-Exporter/Sub-Exporter-0.988.0.ebuild b/dev-perl/Sub-Exporter/Sub-Exporter-0.988.0.ebuild
index 60a921fcf689..a0060fab642d 100644
--- a/dev-perl/Sub-Exporter/Sub-Exporter-0.988.0.ebuild
+++ b/dev-perl/Sub-Exporter/Sub-Exporter-0.988.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A sophisticated exporter for custom-built routines"
 
 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"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Sub-Name/Manifest b/dev-perl/Sub-Name/Manifest
index 794bd98a6942..53524f032e93 100644
--- a/dev-perl/Sub-Name/Manifest
+++ b/dev-perl/Sub-Name/Manifest
@@ -1,5 +1,5 @@
 DIST Sub-Name-0.21.tar.gz 81155 BLAKE2B 2472cedc9dcfee28fd7f6944ef4b839d8b40e02c165fb00a760e6bc32a2bcb0131438ef1ece617df5f2603e60c033e25641bb8a8bd5826496db6a950c79b277a SHA512 94be57b569f6c434ec3ef4fdff1a9d946067cf6c7ee58f716f4bc188764ee103f9a2579ee0ddf4068ec6889c186d9d447d8252a5dd2a0e882719239ac1102294
 DIST Sub-Name-0.26.tar.gz 84898 BLAKE2B dbb913a43e88ce773593e1fae05ecd5e7ee551d44117f1d133d5cef59ad052d8a935fb733c20cd3f2ad78f98c5ebde7bdcd114761f6464f716d41f0bbfca9196 SHA512 df032823c340500a0cc5e5f4d88688bbed14344a67a1ded462572aebeb39827563c5f69afbc0af1c5aac483013e7083a8aba2e3e47b805007d006818dadd9b5a
 EBUILD Sub-Name-0.210.0.ebuild 744 BLAKE2B 5bce70a77f64ff79611cdd1749c6ec56595ccf1530b7c470ec9e6e43e869ab7b6a6b00151cb0bb2ec6a327945d54f243accefffe0f67fed88bceddbd820ca1fc SHA512 8978289bcd5f59354fa08686cedf5398d9ba382e63f68e5cd7df9d8c069033adddd8ad32551cbba3f0f4bec630d430d8515c2ac3372d8979084d7ee67039342a
-EBUILD Sub-Name-0.260.0.ebuild 721 BLAKE2B fe0d994a0beae80011c091a3a81eb98e07af9ec84cd1371daa5ba7ab725cebb4e2b5c33342ccf5f31e5f1921ae47b5b6b6e87aa85f2274ce298dcd3f9aaae7d3 SHA512 48a0d676df700a2b0c5bbddb4c176c9883eca88edb49e3b3607145c22ff430fef74824e754b7dbf8567482d28818cf45c534ac04c78a019f59637f4bcd02ca88
+EBUILD Sub-Name-0.260.0.ebuild 713 BLAKE2B 79e7da48538ff3ee2407e388ca599560e7987d537082d5a79654789d6f67494302e5017b620902262620576ef55556e84c10b4618bc118ad20feaa80ad08f548 SHA512 ae1d7f2d7b45c90c33de1c8839764f3d4b8b905c6c4a784218359e2d77291c242f006d380b795c3b521e7811f65dae892db6245c580f1194c61ee72f3868d0a1
 MISC metadata.xml 504 BLAKE2B f5a3b60a89ba411f2b4aa6f966d32ac1130137921468bff16cfaf52639216068c98845a41328d8ea1bd2871d18a2dca6f37d354931b53d77fec5f2b6d3f00019 SHA512 d59113c50b0feaf6e9db1b2649690380b34121f857b5e62ecf680db772aed6286ec91ac433ddec541d6c9845caaa69ec4b31e9f0f08a43a061d308c02962805a
diff --git a/dev-perl/Sub-Name/Sub-Name-0.260.0.ebuild b/dev-perl/Sub-Name/Sub-Name-0.260.0.ebuild
index 299ca0f201e3..360a74abc255 100644
--- a/dev-perl/Sub-Name/Sub-Name-0.260.0.ebuild
+++ b/dev-perl/Sub-Name/Sub-Name-0.260.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="(Re)name a sub"
 
 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="suggested"
 
 RDEPEND="
diff --git a/dev-perl/Task-Weaken/Manifest b/dev-perl/Task-Weaken/Manifest
index 5596fe368cc1..8dbd90ed2dd9 100644
--- a/dev-perl/Task-Weaken/Manifest
+++ b/dev-perl/Task-Weaken/Manifest
@@ -1,5 +1,5 @@
 DIST Task-Weaken-1.05.tar.gz 27741 BLAKE2B 7ed4597683817d2a4653a6d70606137ee9213ed44e52694273afa1728c1eb08c6fd66374045415fff3d62a6a051963dd5c93e9a681fd293cf6f23a1c3a72b18f SHA512 c19f3f4355770ef74cf4e26cc34a0d35b203e2561d2cb853915b46d754c49a902b6e62fffc5d6fbffcad7c32bd4c1afa7ded3f268d4d7baf1d375da213b14928
 DIST Task-Weaken-1.06.tar.gz 28404 BLAKE2B d5014c343b4ca938a95d263d024656985df3381bb35c485b7c6b624aaa004b4e5de332e7cac264b08db183052fe43dca78d962fb2b314de8a2764b01191d640b SHA512 2cd723a748c1fb3df12b465ad278070330959c611ed125f54770c2d820202592cc6e46f16ee43671e310abfcf86fe7ffa639db7dd605d69d7d13fca793d59808
-EBUILD Task-Weaken-1.50.0.ebuild 587 BLAKE2B 827eec4b493c4fabd06b3156429d2f5f50c55dd666a0721f57f4ee6a23715ffcbb243550570645bf794435b2b6494465fa753798ef9afa7cc67cc8df1038d64b SHA512 c4b45991d1e38f8abcdd60da2d8dfab6e1c1f677875b125d1e271ac33c8b909a1c7ddcf4ab9fd87069ff4aea581864800a3132bfe2f5e5156a645297f00428d6
-EBUILD Task-Weaken-1.60.0.ebuild 555 BLAKE2B 46813476ea317994e3d39d404c90bce64784c548b931e68c3e3288249664f2e5be0c3f8eae7ab3c37aba1decc313a456484f2fadbdd3717bf6c5b100fc1ceb14 SHA512 1915246c14d79d7bd34d3d8a92ecd91474fbebb4d9a98fc6dfe3eb6d9c08a8d3c20ab3ee19aee98b118887b91f167d4b4e577df66dcde01f01f0bdf400d768f8
+EBUILD Task-Weaken-1.50.0.ebuild 586 BLAKE2B d1d98ae440937063ba124a885c7c43a7669c5fbe16824b5ae11c7b33c4e08ad5a7fbe4e507efa21c8892ba705ed7d794479a121ded46edd56089862a253a0258 SHA512 83d3f58a1b56e12752cc6fe83296b4f239bb83f0a52d663fd5df5243d308a530a2b65361a3d8e357a542b03df358effe46d48203bbb2491ef8a864ba7d69cd72
+EBUILD Task-Weaken-1.60.0.ebuild 549 BLAKE2B f3ead371eeb93244b6c37923c17f99992047c2104259c8597cd975960e2d332a549dfba0d5c64825326e83eef9bdfd52a9db6938b5ccdfc9e116a498fdc0fffa SHA512 c1fa616df9dfc6d649a25ee3b56a6227df35dc477f82f85ddbe3a42e5b3ec70ac9ef764b2067d06e8c492f6fcb63f229d1eb303c43ea2d0c3618df7e3b3b26ae
 MISC metadata.xml 395 BLAKE2B bcc2918204c1b3e9141af259d3cdf534b59c6904a1ca95cd5056d2d6d8536cf66915fca54220ef44e06dbcbe503cf3e1e9c020eb41ed0a199324a217012e8cf5 SHA512 1b0ca9400c203e0f5d5b83a21789d6980c1bb5bb58022671ebbccb98b5507bc92e083be1a9b25d47990e5a028d1d05c8c13d656ffeac8c1a3a5acc12e0599aa1
diff --git a/dev-perl/Task-Weaken/Task-Weaken-1.50.0.ebuild b/dev-perl/Task-Weaken/Task-Weaken-1.50.0.ebuild
index f84cb6b36e20..3a800980fb54 100644
--- a/dev-perl/Task-Weaken/Task-Weaken-1.50.0.ebuild
+++ b/dev-perl/Task-Weaken/Task-Weaken-1.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Ensure that a platform has weaken support"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Task-Weaken/Task-Weaken-1.60.0.ebuild b/dev-perl/Task-Weaken/Task-Weaken-1.60.0.ebuild
index 8c6a4a9ffe3f..24f4d3b3b615 100644
--- a/dev-perl/Task-Weaken/Task-Weaken-1.60.0.ebuild
+++ b/dev-perl/Task-Weaken/Task-Weaken-1.60.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Ensure that a platform has weaken support"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Term-Encoding/Manifest b/dev-perl/Term-Encoding/Manifest
index c1cc26230273..122945c222c1 100644
--- a/dev-perl/Term-Encoding/Manifest
+++ b/dev-perl/Term-Encoding/Manifest
@@ -1,5 +1,5 @@
 DIST Term-Encoding-0.02.tar.gz 11373 BLAKE2B 5bb0f410e75ed8196eb3d4bba3af9d184800be455753621856a37a4bb3704bcf73d50ec37f0ef104164abf83bbad46075bf6a0ff0d2ab5c2ff95b81c99dd80cd SHA512 cd4cee9991d857c40b8e8747a645429dcb1f416552d9bb6bd59da609bc4eb11c295a9b4d4c9b1a6e738af57fbc7179419d07387f3342658bf7ec6da90256efad
 DIST Term-Encoding-0.03.tar.gz 10151 BLAKE2B 1d611baf4b69f8aee6fb7e94993bb05267ed792780b3fb3c8360ba75a776e1523b85674eeb54b2fdcc6069e90cd1f699449fe02ffffe87102178e7acbc92a9e2 SHA512 781be5087b65e90267daa3efa95bd03b3f2b2f8b3c8aac492238159c0dea3dfef7a82acded856b9551d389e2fcf5baf19a4ff9924da35377d28616b49015a0ce
 EBUILD Term-Encoding-0.20.0.ebuild 526 BLAKE2B fb7b7bb33f662ec3c0120de74828c958ec632320903ae5f3119665ecb4c6e4151c689e2e9e1a1b4dd67ae50aa08f90e31b70e7418765b0177c4447ec860702f0 SHA512 d433aba572d7901451a75cf75d242f055aa7698648e7e39a9e7661e0041c49150d171da78564a76307ee7f8feaea561827566616dccfc2e56ce77e2c3d54897c
-EBUILD Term-Encoding-0.30.0.ebuild 260 BLAKE2B eaf1d93b5d7a834b6e3bdd4cd764a22913e1e0e86ecf5315c62ac25146b4eadc3cbc4508dd3b85c04eface76da209586a37bcbbcc9618dbd1bb82a7494699303 SHA512 d6392c7dc4927d234bc737fa143dac8abeaa683fc217abff9c318eb7944a8dcd367051619fdff099f7366d171badef872e71cad3bdff0526ec01ce38ed657c13
+EBUILD Term-Encoding-0.30.0.ebuild 259 BLAKE2B fb20dfc1b97c6f77faadd777446e11c35ad1f928964fa79c0eedf5ad6a777bc36dedbb5cccc669a18c8851daea2edc28934beb893538fbbd76e2d59d92048871 SHA512 7360755b49af38550e00d0888fbf785b71eda3cb88f6048f6ba065dc5af76c50f32172008ec81e5094f40692d52067654c7e02c6851f2ef5cd39a0a07864f62a
 MISC metadata.xml 387 BLAKE2B 92f7adf5d25d3c54f6d3ba76b15c36e2a00a300cc677a57ab1d0ebc42d800b35bea65bfe2325be0b1b7b1f776dbadf3ed2bb336f7144c25c45ceb31a9d326442 SHA512 bc02c1ed5b9c684f879aa6639803a1ea0727eb775cd392db9a7879f9f5102859d191711b5b0f49a25dd970e78c813b64cc9d5e6568b816f399494e57f4cba12b
diff --git a/dev-perl/Term-Encoding/Term-Encoding-0.30.0.ebuild b/dev-perl/Term-Encoding/Term-Encoding-0.30.0.ebuild
index c345ef78632c..51149783de4e 100644
--- a/dev-perl/Term-Encoding/Term-Encoding-0.30.0.ebuild
+++ b/dev-perl/Term-Encoding/Term-Encoding-0.30.0.ebuild
@@ -10,4 +10,4 @@ inherit perl-module
 DESCRIPTION="Detect encoding of the current terminal"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
diff --git a/dev-perl/Term-ProgressBar/Manifest b/dev-perl/Term-ProgressBar/Manifest
index d2401b793db6..627b26403569 100644
--- a/dev-perl/Term-ProgressBar/Manifest
+++ b/dev-perl/Term-ProgressBar/Manifest
@@ -1,5 +1,5 @@
 DIST Term-ProgressBar-2.21.tar.gz 19309 BLAKE2B 0f5997c581f6f31eb82ed552c396c4c64f1f281724888a1b04e70f7339e155742980886a1c0a58f52e2b1a5f2aa2915332eabb06b4f7f93206c66d5d028d6766 SHA512 0d778b86edffe095c8a320b52b4e9f482937e75ef17d0dcb5b3bd6cba8acc8e0fe26c893fa2b48bb5482ae13d4901d26273a796bc77152839eb5b14165b7d617
 DIST Term-ProgressBar-2.22.tar.gz 19506 BLAKE2B 9c1fb861a15d516b915c4d918c9fc2024d68825f13ba2329c9a7c96028f962546c24751e3a687fb8c788a7d75feae61152895301fe6d107ccbf850efe06aeeca SHA512 4274eb837c4d7f978ede2fe6b2705284a43df58cdd2cd0e2a8b96a3b71ef78f60cdb622416ede994a0ea79f3a72efcbaa4cd5b47645918235c8bbed6f9e64ad9
-EBUILD Term-ProgressBar-2.210.0.ebuild 687 BLAKE2B f7649f05dbb03f6ad7293f59d80fdd12e5c8c967b2d6f3d34ee3b2e6869ce1c1a2b1465762eaffdd51f9e2a4f429f328a1744a05aa9380b8256d26f2a4006f2f SHA512 b04414be9026165a884aec1beea98f7e964d6f4f4e77565d6cbf158a51b6c424f8566dba8c8b8e1a38ebd13e5ec2fcb81685c8995b5ba61b8562b84ea6b78a6a
-EBUILD Term-ProgressBar-2.220.0.ebuild 655 BLAKE2B 2efb66844251143af566ff4a6067401543b63a80f426582d24298bf0fc969397344ef2eeec32ba29a28366236888d31615622ace1f49ea5160b98c94131d845b SHA512 b69d55253720c8cd7f0861d250bf3cf94674b713a97ba6ecb1b740bde8f4e58fb9806172764f5dc1934eb091748783deade90865efeb4f0c33277138a0e35e5a
+EBUILD Term-ProgressBar-2.210.0.ebuild 686 BLAKE2B f2feb46ccedae73517b52783213916be0a72271e9412d5e1eba233189be3fb912d783adb3d0ba9de632c5f40ee136b8786e5a41f731e82cad43f7930f7b44e3f SHA512 f819e889cc51ebe239770bdd53b1edd70235041d086232b4f1ee866d65a728ee215f58c77d13683950ff3cd4aea5aaaf864e4d65a76de1a9cef7dc67b2583862
+EBUILD Term-ProgressBar-2.220.0.ebuild 677 BLAKE2B 58d08cf79d0e1179ec793252843a5b3c7c3d0fc3b27d551d04b89968a054e3f891d6737e29dbead9df8374405e4b813ab7ddc96ce8c94b55c16dee3f68a0ba20 SHA512 51df756350bb19869543b65427047a058460166911f667cfaf54b17279cbc7802dc333a75c28f53113de1c515cbfc42b1e97f39f6dac579783532bc6d860bc27
 MISC metadata.xml 473 BLAKE2B 8b8a1ef81b05bf0f639df2b9e1a74f8125f8285cd09d3e533d51a0545323a5fd02636ab153dc61714b61486f1e925b29293087856c60060c9fd952abccfa6829 SHA512 ce0bcc1b834ea79b1582ad12ecc6122a8d22b393c1726379c8711d0db4a56b43b144d9532aed68a2eaac841c1241ae61092fae55811d2ebc47ad8119d64b02dd
diff --git a/dev-perl/Term-ProgressBar/Term-ProgressBar-2.210.0.ebuild b/dev-perl/Term-ProgressBar/Term-ProgressBar-2.210.0.ebuild
index 379f7f4d13ab..089f33fea47b 100644
--- a/dev-perl/Term-ProgressBar/Term-ProgressBar-2.210.0.ebuild
+++ b/dev-perl/Term-ProgressBar/Term-ProgressBar-2.210.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Provide a progress meter on a standard terminal"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Term-ProgressBar/Term-ProgressBar-2.220.0.ebuild b/dev-perl/Term-ProgressBar/Term-ProgressBar-2.220.0.ebuild
index ac86517c2ec7..f6563e23afa5 100644
--- a/dev-perl/Term-ProgressBar/Term-ProgressBar-2.220.0.ebuild
+++ b/dev-perl/Term-ProgressBar/Term-ProgressBar-2.220.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Provide a progress meter on a standard terminal"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-linux"
 
 RDEPEND="
 	virtual/perl-Carp
@@ -25,5 +25,6 @@ BDEPEND="${RDEPEND}
 		>=dev-perl/Test-Exception-0.310.0
 		>=dev-perl/Capture-Tiny-0.130.0
 		>=virtual/perl-Test-Simple-0.800.0
+		dev-perl/Test-Warnings
 	)
 "
diff --git a/dev-perl/Term-UI/Manifest b/dev-perl/Term-UI/Manifest
index 89ca77ee8279..afc686a0c231 100644
--- a/dev-perl/Term-UI/Manifest
+++ b/dev-perl/Term-UI/Manifest
@@ -1,5 +1,5 @@
 DIST Term-UI-0.46.tar.gz 12295 BLAKE2B f8d4541fdbd779327a9b046ab21c9e479834ef2b0665500f1bf556150b1f3602bce061777b15ff6c7b7de1f06359c7693bec0e14cb22a54413e96bbf850231b8 SHA512 7788d651e29e9c7b9c0c2b2074b39f143216a321a5a71c9c4e52fe32e44a246faade8cfdf109bcf7cfe1bac5d9d97fc920c6344a5692e8508361f1c780c41054
 DIST Term-UI-0.50.tar.gz 13363 BLAKE2B de6823a6404dc5ded5c3bb84fde0b11ad105da11b9b5ee87411c66c1368500dd1431f97b4517378245fd9e0b8d0082d625fbdb87e97067165df0dd7746023116 SHA512 338f564a5405804d3f34840dbd26309911b0dfa6de346fc11c0fb4e33e0e2d42915a26b3f9569ccf95333a8cf20bded9830c923c69df48aa72670cdabe05fc98
 EBUILD Term-UI-0.460.0.ebuild 552 BLAKE2B 975dbce1c4ac866573f453a0525b656f6dc4a5d719187f5c732f785a0383c87659a44dce92bc647a202900eccb1611d6d27d8f38ded578d342525d6d254dc028 SHA512 80dbe4530817637b81a5f4144eb32c18277ab6950244f1782a284c06ba420f350df8c35861a35c2de8379bc4b65839c789bfd8507ed2efc3c4cd0bec69109059
-EBUILD Term-UI-0.500.0.ebuild 517 BLAKE2B 78d5f3c8a9589bd131025460fa1a29d53f7ecf37e7cb5f5bab6e3fe51f5418c1a427307c8ca27399c15eaba5c8267dc165caa73724e2ebb679001fe67f2d1bfa SHA512 f464df2d3f6a18a15965cb3759bf3746b3dd4c81911c81ac83d4b1f4c1e2a37e0f61c7c69584ddbdae14539401e359e0169050801cc287da3d054a24e9249bd2
+EBUILD Term-UI-0.500.0.ebuild 516 BLAKE2B d6466d913895e76b0e631b51b99cae27c090f277159dc8bf3725bbe18ff82f20846075e31db2c0c10199886b83aaedeaea05b33c19444b2394e71b7dd9c81955 SHA512 7b5c1b561c21db9417eb68a096d71a8a792f62017675ed28721daaa1bf302d81d59e9a907034631f37298504270ec046657be60b56c0c89cc442666f7b13bb79
 MISC metadata.xml 451 BLAKE2B a37b6c889800abf2a546dcad86ee9bfe137d67efb498de7390fe14ae4827e730ded4898b971eab77e08346f789145405dbfab3217da6f3533159169bdbc48e63 SHA512 9dd7c5f15f4beda58efff4d3f7bde7013360cef65c219a9738fc689318cfb0e9b1de0a4b7425b5e3e0ff07b23bd077552531662f4c01b413e387e19a8cd40dc8
diff --git a/dev-perl/Term-UI/Term-UI-0.500.0.ebuild b/dev-perl/Term-UI/Term-UI-0.500.0.ebuild
index 7c5c283203dd..22457c71f6bb 100644
--- a/dev-perl/Term-UI/Term-UI-0.500.0.ebuild
+++ b/dev-perl/Term-UI/Term-UI-0.500.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="User interfaces via Term::ReadLine made easy"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	virtual/perl-Locale-Maketext-Simple
diff --git a/dev-perl/TermReadKey/Manifest b/dev-perl/TermReadKey/Manifest
index 5e462483cf26..9f101a6d7efe 100644
--- a/dev-perl/TermReadKey/Manifest
+++ b/dev-perl/TermReadKey/Manifest
@@ -1,5 +1,5 @@
 DIST TermReadKey-2.37.tar.gz 85082 BLAKE2B 59c999924455b6c4165897c7650209a98b5097c7fffd1044de005b8823d0867f6b16a835d5188c4a671b58109312ac2aa70012edd84d4a485b1534241f9525ab SHA512 b602d612be17ec4a56fe50742728dae17733f251ef399e8fb69cc8eb22885d7e1c1073c735fb23826137e80be8d3597e60f496ac63180739752d070957880eea
 DIST TermReadKey-2.38.tar.gz 85164 BLAKE2B 7fe1b7af17d66598dd39b81a667e0a16061694fcd37521dccb355295ff2980836e2d5e58cafd22ed370e790b33d39c2232a64785aa01d9c2cc6c30d6bafe9484 SHA512 fb09f013f9f0d8a4397e39f6f3db7a6d023259219af8f76744094e396437a01b19141b3cdb39a158d3b518903fb010088bc37406763bfbeb3fcab810bb0bb157
 EBUILD TermReadKey-2.370.0.ebuild 543 BLAKE2B edaec1faa05334733b161a181bfa38a69605ca7566d0fa99c54c7f4f5872df8f247d8a1cdda1c2c23e71007891627baa53319b1e7676364de23bb82ed349e824 SHA512 3f6f267e1414112667aeb742092bcd90e3a5478e4b7c2844e617fdb5ef6b689d756968e2029414d1e6235cde87325b1d0d1f9250793d7b85f7e0747936e81785
-EBUILD TermReadKey-2.380.0.ebuild 547 BLAKE2B e4c75a2c70ee92ce735adcac1ebac9307d9e34066beb822e2eca8022c2417c98eff79209d7881ef9a74829ba0c8acae9457eeeb69b2f43edb46f2dc3fce9f05f SHA512 9418558e2c485cab32100d1d572b8327bb81db78892dd100d35bb7b3f8a103ebde73610937302394cc7f0c057766fedf109cafba232c07b69a661d0bb5f8a700
+EBUILD TermReadKey-2.380.0.ebuild 539 BLAKE2B 610a37c4a32c657c17d6d71a7f0925194448fc2f8f8f740869ca0e5ec350f5ff7ca8659b9624527bd0a27d426a0405ee078c9bb20baa464559123357d3238ebb SHA512 cd63f14e85eca6e2002a5069ac9b5c0fd340b76bedc160492c0b029364bc34e7e6b4ae99990d47aa23a23c957e18716fa0286e07f3de27b1ea528f5140320186
 MISC metadata.xml 396 BLAKE2B 6abcd7025d5f4d5f838cf1bd6454ff2f3ad76519eb6b70d69adf1f759444a4f125ecab0e54664ecee4e1898edd3b6863ca3b10a64d4f2044b73f4360a84a596c SHA512 e6ba355dd842b2316630a8fe4889840b3bfca17e98752e74b1a9d4e512440687456e4c056b95dd554b00273f6111e9cede6d9fc535644fe09b53f222cc196ab1
diff --git a/dev-perl/TermReadKey/TermReadKey-2.380.0.ebuild b/dev-perl/TermReadKey/TermReadKey-2.380.0.ebuild
index 9347beae8619..c28d027e7577 100644
--- a/dev-perl/TermReadKey/TermReadKey-2.380.0.ebuild
+++ b/dev-perl/TermReadKey/TermReadKey-2.380.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Change terminal modes, and perform non-blocking reads"
 
 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"
+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"
 
 BDEPEND="
 	>=virtual/perl-ExtUtils-MakeMaker-6.580.0
diff --git a/dev-perl/Test-Base/Manifest b/dev-perl/Test-Base/Manifest
index c783e9e4ae07..b6a8e76aee0e 100644
--- a/dev-perl/Test-Base/Manifest
+++ b/dev-perl/Test-Base/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Base-0.88.tar.gz 52032 BLAKE2B dfb117226ba8f2af45c8038d117a6bcc19e107cfe0ce41226fc7267cd2b633f4d39de34be21069e7d7a6bb7af1ed16cbc2745b0700a107ea10a172d776776ab3 SHA512 59725ce38a55a82a336942ea36c0782560d4b3b04fbe6e4550f6e21074f18d622325d87bb2d7db0475b58999d8f9ee55579c4349004a5434b3c1980366dd71df
 DIST Test-Base-0.89.tar.gz 52105 BLAKE2B 2542304c167b0d97553953e0096cc855f29359907cac2db1ec82f6bd5df01895da028db74ac35af89f07a9d55a660acd781632eef80e6747ae0f077d25ed1865 SHA512 c93756455e996622992fd2ec4fff70e6245704db918e087b177b4470cfdf73ef135409cba25bceeb8ef7876ab8e514e95e8c8d59fc74d3c7eafdb0cb79ef14d7
 EBUILD Test-Base-0.880.0.ebuild 715 BLAKE2B c00fddb4251c811651c5e5326009a24b313b2da190d118e3a02a6f3682f6b22338fcf5bfd55ee940e3427a7ef9f5f84c0b55d391b45cc5de1f3f4531dcb20858 SHA512 9f028f5b1a70ce92b013b26d6cf096e7dd11d4780f394e140e0746971a8774d9113cd1267362cf25aff47274838b13bb43742c9c1eb61a0e0cb18c2026cd33ec
-EBUILD Test-Base-0.890.0.ebuild 759 BLAKE2B 34492192f6c5a17ca6ca0b5e5dd3b9ffcd38ca66c5e3c822918cd90f3aeeca13c822afa42f2aaf303e69231d42fb097b793bf8f4c1686f57f9a03dea6b1961af SHA512 d978c551ef9995d72101485b3b485e3f12fa740e415c7392a66c4e7c04dcc96852bd6e745a08830243973bfdf765e108f2132ebdc9fabc6c9f85a888e9795516
+EBUILD Test-Base-0.890.0.ebuild 752 BLAKE2B 4ebca31bc3b13391bd148ec69eea391cf3cd50aaf5f8b5b6b374eb5e72e010b57f3debdea7793b56d4486111dbaa8842483c30764a51eab57b5523a340fdbe45 SHA512 99886603b9ff6c4ba6071f54ae95e3277df29b970a40c3f395ee1654e82656ccb84398bf784ad8fb2968b6d0562ff4fa65f58ccc0a6e88fecd6db819708a056a
 MISC metadata.xml 657 BLAKE2B 753842e54e29e43fe28e3a5e77c67f7b2196bdb654d1ed6fbc05de1d5141bbe124eb0fe970b4972ae000050f4ce0ecd9dea6aa6a96e369e0f896546efacc6902 SHA512 f9644686066effb2cf93801e8f31842b0e07bc037dade5717ca95fbbfd0b9147bedaeff3616e0a026dfd715a08009eb9a3dd7f9b1bb177a452667818d0cd9d23
diff --git a/dev-perl/Test-Base/Test-Base-0.890.0.ebuild b/dev-perl/Test-Base/Test-Base-0.890.0.ebuild
index 9ef6eed72aa2..7d16ffbfae6e 100644
--- a/dev-perl/Test-Base/Test-Base-0.890.0.ebuild
+++ b/dev-perl/Test-Base/Test-Base-0.890.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Data Driven Testing Framework"
 
 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"
 
 RDEPEND="
 	dev-perl/Filter
diff --git a/dev-perl/Test-Class/Manifest b/dev-perl/Test-Class/Manifest
index a5edc8199f9f..7fce792657fa 100644
--- a/dev-perl/Test-Class/Manifest
+++ b/dev-perl/Test-Class/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Class-0.50.tar.gz 60253 BLAKE2B 0e3b0c766379338aff5e09dd10fa62895775b3fe9e855de4b6e89c59c2dfa30b6cc90de9e49e4b03e4da636eee9d7bdb7e9a7060a9e265c5ef22c9d88c3b52ac SHA512 27ae19f60a916f5a23cccdc02ff6168e76d5f1cee5df196df4fe50024f7270ee9eaffdf02e9b6de70565c9b6b30606ad0a30477ac8951164b87c641caf960dcc
 DIST Test-Class-0.52.tar.gz 61103 BLAKE2B 7e0f0a7926d9e95d0442f041c54861796838bb77b95cd84d5745f58349ef80ef0760cfe1faa3719b4911db7c5bcebfc7f4c3055d6a672779c45d0dbb63573887 SHA512 94d38a7cc93b36ea45c0c209afa7fcba01f45006b8ade638e9591be2510ca0d89c04e0dc271ede870e00f834626d4d271d5799b5044060e9f9b670459376b64f
 EBUILD Test-Class-0.500.0.ebuild 776 BLAKE2B c5779f3fce437f61099a5bc46c4065083e8e949c904bb27e9128b6ae99dd9f7d0d4edde3936d8beee412e4db0a9efdae4e68e0d7e565238c636176c19766de00 SHA512 932d794fa1e23885a394f4f3e55610e88e28ce0485733b0c2b4beb038e6da6e57630b4be7f9d798ca86fe52d95095e9f516d80e2034cdf6ac987393f843bb32b
-EBUILD Test-Class-0.520.0.ebuild 727 BLAKE2B 577c3fb819eee01adc13857f2b22fee86558570f72777a035acce36f308a0298ef61d3b84796eb4774b166ca233810889666f8ed9fe00787a701e617816fea53 SHA512 1a8c64ee6dd363dae837ec6918a295b94b09bdf80298916a443ca4a5e4b15284faffdd273b49c64b05ad0fed811adc090f0f417a984dc55fb92d1e88f257859a
+EBUILD Test-Class-0.520.0.ebuild 722 BLAKE2B 73bca3266143525952b9e129f4f58e5cb5f6f704303360338c28d4c2190ad1de602a19ebd5e51cd14d681b453c9b5aca3ce03e57a698d7a7106a38122ac0f0bd SHA512 2a51ded72ab6334c7c90efc0d8dc08a7eae8a5b840bf899cba88b89dcb3925845cab876b7a8b9c2a9583ea05774e4334943cc1d93e8b01cd1686b72dc588165f
 MISC metadata.xml 527 BLAKE2B 960b5d285e895d5cf60202b012d0a98f4614e4291652251199249e0036f2f1a08fae998c516436d60c1eee56f90bd2d93d5a356a1405c06024056459c6f23d64 SHA512 8501ab931dfb5d86963958bbb43bad7770883f158571a97f4221d5268c84b9572d298fa45ae50e4ae588864c078e0e095df9051f307ee868a0887ab3c4f0374e
diff --git a/dev-perl/Test-Class/Test-Class-0.520.0.ebuild b/dev-perl/Test-Class/Test-Class-0.520.0.ebuild
index d16d1bab749d..a5ad728a7a77 100644
--- a/dev-perl/Test-Class/Test-Class-0.520.0.ebuild
+++ b/dev-perl/Test-Class/Test-Class-0.520.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Easily create test classes in an xUnit/JUnit style"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	>=virtual/perl-Attribute-Handlers-0.770.0
diff --git a/dev-perl/Test-Command/Manifest b/dev-perl/Test-Command/Manifest
index b4ef5ece481a..d87eb664fc06 100644
--- a/dev-perl/Test-Command/Manifest
+++ b/dev-perl/Test-Command/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Command-0.11.tar.gz 10811 BLAKE2B 3cef662c064e6256d32c77731870993a37b6411615f27bffb71795ca015802991ce3b755f2ddfa561b77a58dcc7889704d45a159f370c345ffa1e44169dde58a SHA512 79a8f41132b965ad4f6e8b4d97f8fb6181a1e394bcf8825abda2c8ee12dd5f6ef8d7c69df84d306c3841bb516213742c4a0a43c2f3d6b39ce6e163d6d77f45f8
-EBUILD Test-Command-0.110.0-r1.ebuild 465 BLAKE2B 5c50b022585001d023233b96540a2b0534334be719068588c2d534edfdd2d6a28f511aa961b8c4b2cdefbbb45de1711f909518ec4f8f429c0f8a89c49bea556b SHA512 ffed533bd91fe13241b5516257a476ba0b97a9af80de1814c8d3f5f3a76fc4e22a88af22d94a18f6ee668a8610032a32868ecfc5e9523d7f08255ed2615f5666
+EBUILD Test-Command-0.110.0-r1.ebuild 472 BLAKE2B 9621db7f3b2612b882d395b4e317b145f9d97c873183e07e611085a5c55d757419c4167a263946f80534905e9b91f3610f6aaa4470170c41d47201c9ac911062 SHA512 0693b97659cb0212f8b4ea221329efa37862956373dd55241d1fa4b63107f8663609713d2d8ec07f6b03931d3395735b0cfe2fead8fa8e010c5cd980c72dea95
 MISC metadata.xml 397 BLAKE2B cfee91e9980378ebd9a867edfca1660c32406b9132c1119b706343bdb3832fc7828822e24174ed3486828eb34624d112d282e843aee81909b729f8a765eae384 SHA512 a8ebd1b84cff3e7d682617057ae2657658b6671b034b4e2c777d7805749039b8012728dce55d75a3411b2baa7400233fd531ff1c1d93721123417e354a69d896
diff --git a/dev-perl/Test-Command/Test-Command-0.110.0-r1.ebuild b/dev-perl/Test-Command/Test-Command-0.110.0-r1.ebuild
index f7487177a8ca..d51c75a102cc 100644
--- a/dev-perl/Test-Command/Test-Command-0.110.0-r1.ebuild
+++ b/dev-perl/Test-Command/Test-Command-0.110.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test routines for external commands"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=virtual/perl-Test-Simple-0.620.0
diff --git a/dev-perl/Test-Compile/Manifest b/dev-perl/Test-Compile/Manifest
index 52512c669419..38fdde43634f 100644
--- a/dev-perl/Test-Compile/Manifest
+++ b/dev-perl/Test-Compile/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Compile-v2.4.1.tar.gz 18425 BLAKE2B 604626b07772241f0ab306b06de70223a25673fe944e66c1c031dfe0e55610f7ce1cc0222bfc839331b2f10bd63168100b9e07b1013dc8ca96d03bd53848d3dd SHA512 e6878fa16544be75581144d125f547a799cc79210b925b86f07ad236395026bdc197c22af1820e893f5887e53933f0ba827377ae133752f63076cb436b624aee
 DIST Test-Compile-v2.4.2.tar.gz 18842 BLAKE2B 6bc8dbd692087ccbf41b227c417f1cb8a100ea2e845289fae52ce8f375c4f7970f759ab2fffcb19af7670ec93f92115812184d9d71f73db21628b4937b6e84c9 SHA512 3c16249d9cf14c3cc1dae5958c591b9beac320e26c3ef958a76ca74763ce30443ebe55e3e4efacd384252dfe1ef1cfca9c12d4f7a67780e0db20d6462b6d541c
 EBUILD Test-Compile-2.4.1.ebuild 817 BLAKE2B dac73ecef37b46ba6c9063a85131d3e85de449f0101b528b01022ea464a6e77213858e83e65887e73d3878a2e4c78fe4dd6ab2599fdf9b49f5085ef0a328d11c SHA512 723cd97c65465e13f13a97585fb7be9f1af4f2691215081214ec3bfacb9b833e0232a717b30a91743f61a1b7a6de62026e340df327b5c622ac4a2d9a24fbc132
-EBUILD Test-Compile-2.4.2.ebuild 759 BLAKE2B ec49a876798cd8dc4fa7d2a4e2675b86d1171d9c00e800b98bbe348c6cca9c19c322a69d9b9d87a3169337653b46a6f1fe77d464f5ad9827bec9348458d7f3c7 SHA512 fc691159dfebaaa63ae481e2ea189d316837efcdf88b4c26d21bcfaa97f1ca40aa949fcf7e16ca6c954268a0ca4e7c7f2c358b8d1f889bb2f4e6051c2a4b159a
+EBUILD Test-Compile-2.4.2.ebuild 755 BLAKE2B 9e8b352aa90b277a8f6c1c51ffd6ed0a13e91a554b0b8785f7e6ab5c41c64babd5c74029a108f3a2da71f5b0da48221eeee26b6a4c69f2b3589fec5bb5a1f729 SHA512 5028c999c10172fe2fdc0504de156b3807e1b14229fa7def88fe9bc471d1f767ea94173732c168979bada54af7391c730cef6f96970feb0f296048ee738b763b
 MISC metadata.xml 467 BLAKE2B 93dab8b569273f9c80a598098b35504619c1d66ff3f10b5823313ccf6167f10227bc307f5e9271006dc5ba02523161d483453dd523e86a741d72d02c1c3fba7c SHA512 77ce60eb7ec2fd3f7bfabfeb42cb257c044c9567baf163e74fe5802239cfd977ab17c2c6bb681781b1825a8be65c2f7f6edb400a8c8dd2883f1d20f2a5fd1337
diff --git a/dev-perl/Test-Compile/Test-Compile-2.4.2.ebuild b/dev-perl/Test-Compile/Test-Compile-2.4.2.ebuild
index 80add0a69915..cb1d4ecb98a7 100644
--- a/dev-perl/Test-Compile/Test-Compile-2.4.2.ebuild
+++ b/dev-perl/Test-Compile/Test-Compile-2.4.2.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Check whether Perl files compile correctly"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Test-Deep/Manifest b/dev-perl/Test-Deep/Manifest
index 9213ff62c1de..91de81f68004 100644
--- a/dev-perl/Test-Deep/Manifest
+++ b/dev-perl/Test-Deep/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Deep-1.127.tar.gz 41606 BLAKE2B 95349f07f628cd985bf5a9bd9588cfed0472e978025bfbb799e44028580ca4081a766dc8844fc7990eb5ba8145176331cac277303162b6490505bb6f7e6d1303 SHA512 d8cf3c495d62b6cbe01628115daed0a131ba330645a77074867740ffb7420cf261f2da0da62613e4fdbaab40167e6a77668a7f772e885038427518711a0ab4d7
 DIST Test-Deep-1.130.tar.gz 41921 BLAKE2B 0e001de7f07e9f3afc2521648451e32e79d6f198653b1b489056695c38dd49dfb9280d65b3e332f9ff5b6523584a4129db70930c362fd08988ad5321e4184b40 SHA512 de34197c97d44c68dd43372fa5a4d905a2ad636b5503c5f1443476a85b921f42cd07d475af8901dfee9deff1f29deef440c1783cdcc7f93c5f5030c4548ff9cf
 EBUILD Test-Deep-1.127.0.ebuild 1009 BLAKE2B 7638ddc521edc91b1664c1033e24f3df177a976dd231859f7ac0c8440d5c28760fd55da2043eb16e41c2bf826db4b80372e86e89aca05234c1c9e185d190e70e SHA512 2ca1b6a8a43bd46f876be82bb3b8d2df14eb2d07c774ceb6705b47dec8247ff23c1f024a0595e0b0cdba5a4c65b75a4b220d51d8c05ae03c780fb7118041eba1
-EBUILD Test-Deep-1.130.0.ebuild 623 BLAKE2B 0e6b8e88993730cc766eb10c23b8cc44feca2707aae5b49599b239c58e8ad19ac3f3dd7378048e63920778f3a8c656e4a734fca47092fb738a2d0d2fc382a574 SHA512 14fe5afca107eb675081ed3d32d3a580a56adfd471754df977d638443618a92aa29a2535563a64afc4b25f7b732e9463b46c5e306d3a8c9edbc69e1a0df645e8
+EBUILD Test-Deep-1.130.0.ebuild 615 BLAKE2B 29e14d160377297032db416e017687d8f5062e9f8832849cde32f12a1e6bc3b8690f37597733b593dda6bb0f673abcf41c2f35de45028dd718c9960a4b008bad SHA512 19f6df7c90f862148775afd3ce4ba439832e4ed81f4af52b2be6ada7b406a998097dd1b48c18d67e2adb10b8fc660bbfd63d673b0acdc03ca405638ba6cd26c8
 MISC metadata.xml 3761 BLAKE2B 60ba51c77d562180bccc3430131c2cccbeb3316a1b6a6d77362347f157003a1b0639e3ebba3fca645544c86234c8229a3abc94121596e75ccf5b8df9b71b354f SHA512 cb290750cd6c5c54b8aed69ad9153f11cfed84caf6b77094bd82274dc896d50806c88bb32e2adf426c937b37b8fdc35e7ae96601b9efbc56256479fb064a29a2
diff --git a/dev-perl/Test-Deep/Test-Deep-1.130.0.ebuild b/dev-perl/Test-Deep/Test-Deep-1.130.0.ebuild
index e8442ae0cde8..d24c602593ee 100644
--- a/dev-perl/Test-Deep/Test-Deep-1.130.0.ebuild
+++ b/dev-perl/Test-Deep/Test-Deep-1.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Extremely flexible deep comparison testing"
 
 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"
 
 RDEPEND="
 	>=virtual/perl-Scalar-List-Utils-1.90.0
diff --git a/dev-perl/Test-Differences/Manifest b/dev-perl/Test-Differences/Manifest
index a0bfb0656885..2cd7d4f0c71b 100644
--- a/dev-perl/Test-Differences/Manifest
+++ b/dev-perl/Test-Differences/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Differences-0.64.tar.gz 12577 BLAKE2B 8167ea94514c8680f407713677828dee56f56fed3627597e43decc4342d063518a3b3762692595183dece1b3f6641f33caa82fb4f7a541fabd7e7256efe4ab4e SHA512 118a4b8e3f61f64d6676c82913bb605a843a408f3fc5d960b40cc86f10423380a203b2a5604e15ba8d4e0cff96af88b551fba1c7aa2ada3c0ef408a27ee5f069
 DIST Test-Differences-0.68.tar.gz 14518 BLAKE2B ca4be9098d0a1062ed748711bd932e057a4a35e9ffa042ae4c7e6fa993f132a0da93f4aa932f0b6858e32f9e1cdc380a8c4d9531709c9321017eef6781cfe5d7 SHA512 17e5e54d9a67fefdccb383be860ea594ec15563b66a7d93652a93799deeceaf92a4d48d01bfd4d2276c5f1520916d1def654ba53759c7461737e1f9afa754e31
 EBUILD Test-Differences-0.640.0.ebuild 758 BLAKE2B 9a3bb50d1522ed24d479a149e3df484e3b07bd5d0d62bb15ec609a4c92871719f0db7cd0281452909538ed0b165f6634d2f7f5806927f4e0904eb04e2a59d990 SHA512 8a87c3070db97b3e8deb2c76b02deac5ee503e3ec177b37953c36334c9d9ad73a3b212299e8752260abefe39ac765e05f71132b8cb642ae1aff80e92e91d1b74
-EBUILD Test-Differences-0.680.0.ebuild 691 BLAKE2B c8e37fce13282aa72c80612472de4939d4a8fc5330397305890bd4affe7df29103ff1a73f2e97f31b590b8c732ee4102fe34c699337fb3f64e5b47daace75ba2 SHA512 d48533ff99a7fbde68a6f3104005f36575321f7ff7a49ae4ee1b2282da5a3c0da5fe0d979a825ab604b6473aba4d84fdf5fa659fad09716bfa52551408dcf52a
+EBUILD Test-Differences-0.680.0.ebuild 686 BLAKE2B e84a018aaefe19bfa0b7d9a24b56df88d52b470c61aa1db94427d319089cdb40833222e216b4c24263e5c61d1cc3a595a4937f1a633bf2514e423fcd43292403 SHA512 a13a77ce8b696cbc9445dd5d42f1ab9e43f973a9ec55d3f2474f36dc38324d3117252fe126f9c1ceab8cfe78c2e95a559ee2e195e6ce71c6f77b4da3e0073868
 MISC metadata.xml 405 BLAKE2B bf198280cbae14efe62833348ee81e9f0daddd24f1e32b1f2cebe85eb271c7113c9e92f00eda4b55e53f3892da1beef942cc61c0e2cd86a224929805303c6701 SHA512 fd97d946657e5d83d74d2feba7a99d88cbd706dff414f0c7cdd458d11ced9709f56fd07ac41e3eddcceedcc1c99e429a5304fe2ec940fba16534dd57844ec094
diff --git a/dev-perl/Test-Differences/Test-Differences-0.680.0.ebuild b/dev-perl/Test-Differences/Test-Differences-0.680.0.ebuild
index 79b3a69e3de3..b1df15ecd093 100644
--- a/dev-perl/Test-Differences/Test-Differences-0.680.0.ebuild
+++ b/dev-perl/Test-Differences/Test-Differences-0.680.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test strings and data structures and show differences if not ok"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-perl/Capture-Tiny-0.240.0
diff --git a/dev-perl/Test-EOL/Manifest b/dev-perl/Test-EOL/Manifest
index 5e27e277e99f..bc591ba764ce 100644
--- a/dev-perl/Test-EOL/Manifest
+++ b/dev-perl/Test-EOL/Manifest
@@ -1,5 +1,5 @@
 DIST Test-EOL-2.00.tar.gz 29987 BLAKE2B 505eb9a412f0da9a1de7f56cefa2ae076cfcf5adcb056634e5e163c19b1ebfb1fab0de48eb320f0bd0eb9e4638191f1ca943fec336863487ca80e47672c64dc3 SHA512 9f43b88c05915fe722307a313f9149837058e34c8310393e97418f1393f828c2d2f7c6a7537d9ca8caff1b07a19cb2600904319f753b1a76bca09e654637ede2
 DIST Test-EOL-2.02.tar.gz 32739 BLAKE2B f2f041ff282811b2be9e4e41fa2386b6e0a3668bfbde9a87f7c99ca80e99a693fd4e402087ea1dfc160ca921252cf6cc538d05c4155c67537708c0bc43ff7966 SHA512 03f3a60973fde1c0fb9532be957d981bad657fec4db1b77dca865011e1bf39dcbb91a8ee09cc692ab9b372a139371ba66b69c60ae582b687a6ec230fb58a9654
 EBUILD Test-EOL-2.0.0.ebuild 535 BLAKE2B 9a13e5d4772d2a52fe715240e98b31597893aefb58542232cda98f5cf7cc8812bbf74f154299bf8f7e29b581049b929c68a039a750e165c82ca21d7b9c1e7bbb SHA512 d07e05eef1b49c0668727362515fa0bd23eb53b7edee9df1b2deb766efe7522d356c9cc2754e8ba29845038963d568fe5f44059a973281d7a059dc3385c74724
-EBUILD Test-EOL-2.20.0.ebuild 432 BLAKE2B 7360f58e6d420520b7f4ea4e4ba580421ea2071c7cec1195f755f73212ba1fa7ec78eb4bf936761f04cf10acad3e4c04dffa947b21eee071ea1a074f4555f115 SHA512 9a26718ad5f976f68dc0105bc89c841e9add877a46466614cf5d209bb81dd22230beb815a382609b7583661a67c8d48bb6743a6eeb07b1be6bff49319109ca04
+EBUILD Test-EOL-2.20.0.ebuild 428 BLAKE2B dfc8df797f46b6a0b5daac16d97dbb9ecfd9f3d9d21a23b50657f00c1613060cea29400363045031d7cfaa588ae6babe201ebbc73cbbd69f6e380159b55fb716 SHA512 8760d693364e8fe423a7e50861da36cb127cf0727ce8df5740b4e031ec7693790673aa1f052a63405458a2f1a88b39085679e6334d89f5435e8fe09c55200fe4
 MISC metadata.xml 474 BLAKE2B 6669ce8fa92cc5a7ff4b00a7025b74ed1f38618f2f7db34a732328045c9cabc1b8bea1ed611155e645e76600e218daca22eb544e73e7c328553512cc8cc41c0e SHA512 ea5d6b9827f04b9eabe32ad6cf27f384ee4f20d25a6e008d09d4f3ef593a07b6e91f8363c0b10663b55d7fe79315fdbd768c47c1dbccd2dc495c8d45033e76ad
diff --git a/dev-perl/Test-EOL/Test-EOL-2.20.0.ebuild b/dev-perl/Test-EOL/Test-EOL-2.20.0.ebuild
index 9099d952234f..0464742fc2d0 100644
--- a/dev-perl/Test-EOL/Test-EOL-2.20.0.ebuild
+++ b/dev-perl/Test-EOL/Test-EOL-2.20.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Check the correct line endings in your project"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="
 	virtual/perl-File-Spec
diff --git a/dev-perl/Test-Fatal/Manifest b/dev-perl/Test-Fatal/Manifest
index 60a235f0e665..05d885dc94c8 100644
--- a/dev-perl/Test-Fatal/Manifest
+++ b/dev-perl/Test-Fatal/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Fatal-0.014.tar.gz 19685 BLAKE2B 02cfcb6c075bfcdc3ae1213c18132e124126b44d5e923f8ccd09f2df15eda6a1e1bea1c0c41c46ad9439b91a8fdb0db8f7083650b35bf3d69c50b0fe26a1cbaf SHA512 339d9b33231f8c8d93c0f9374a51458d004568a2f3e28471976e954c35d27efd348f68fb56e3cabd11dc47d37e7ce46282eba967c156ba5081811d221c6a7523
 DIST Test-Fatal-0.016.tar.gz 21246 BLAKE2B b6b1ad6407cea9e6b36dcae3ef1136ee7ada43dd6cdd575ddc6882e5c42db7b79f787a2cf3aed538db0fa560d474ef82061fbe27d3ab51f0c9d986fde3148596 SHA512 395d56cfc62fa5888458ec124710b5333f4c7396653e2755a69b08c738ca3d7503e8e413a10c8a55042fba15e90fa5331bb0bf9c59d3677c2ae5e710435120b5
 EBUILD Test-Fatal-0.14.0.ebuild 798 BLAKE2B ed82235d379e62a9497f5e083bcdd3a182733220b47a081d3f91e0da5b388fdd8851ce334ad1a551421e5640794f9b644d046e00fdcbea0a42275b2fc983b317 SHA512 77bd9c32c799015403e31c572a2109fb9480a1ee21ea69afd9085bb5300d54dd6ba59a28669c7302a64ac7d703e33f655d47fc71714da91cc6abcb2672441ca7
-EBUILD Test-Fatal-0.16.0.ebuild 769 BLAKE2B 961dea4641ad796a8a46d08081086e55dbe877e2d0ea85f4b6d4280f249e0144776d91bb9ac015005914646a32ba4181f558d3fd7e1e88beaac7d1d3a25954b3 SHA512 dd7d6bc0f8455cf40e2faa7be3f50279f732a79f9e3f8842b27d016dc4236813cdfc340fe305fab50532e2a2d771499745883aedfc6bcf7d514ac9d71b2cfe01
+EBUILD Test-Fatal-0.16.0.ebuild 761 BLAKE2B 36edbe942384771ce927646c816ea5be49446280c90cefdd1d532bbcd66d6a5631df558d4af22ec492d42b780414de65110c356772bd546905c71c370f4f0d36 SHA512 a501986ab4d0312870c0b87dbfcf58a76b965f81a79e171d79a1fd05c08cc44a888386271819f85e6b0d68059552af5b8f0d12daf1957daf39af11c34b44d3fb
 MISC metadata.xml 393 BLAKE2B 34fc5bd8f31d9aeda21cf5473698fb718faff396477fcd8a75c9b117dee2631e53963f07d760a49b3f694df41fa95d23215387219a1a77170b0a2712fde04566 SHA512 7e2f7c02b51c74c8f1a4e52afa9b18f9490844aa00775807097c870df0fcf57af600e61bfe22312848678b45dd3539e30f39aa9cbaa1c50d3f73e2d7266b9450
diff --git a/dev-perl/Test-Fatal/Test-Fatal-0.16.0.ebuild b/dev-perl/Test-Fatal/Test-Fatal-0.16.0.ebuild
index 4af58e90ed7b..5c1bc341326d 100644
--- a/dev-perl/Test-Fatal/Test-Fatal-0.16.0.ebuild
+++ b/dev-perl/Test-Fatal/Test-Fatal-0.16.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Incredibly simple helpers for testing code with exceptions"
 
 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"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Test-File/Manifest b/dev-perl/Test-File/Manifest
index 6283c5572a5a..c34ed894ac3b 100644
--- a/dev-perl/Test-File/Manifest
+++ b/dev-perl/Test-File/Manifest
@@ -1,5 +1,5 @@
 DIST Test-File-1.443.tar.gz 27065 BLAKE2B 0f1568dbb27aa2aaffd13cc1d8327260e4bfa03fea01a80a810c0c10fdb1a18b3ba6fb5c50212d8956fa14dd0114438dfc7c3523495a20f8f35fdd13734a87c5 SHA512 9ad66b3a9dc1c3752a4ec22934db9139ac010ac3237a3de018d4ec4a65ac047f0152ab9e7979a2615412c1af02a1f2dfa0dbfdf5eba5358628b1b443232c45b2
 DIST Test-File-1.448.tar.gz 29914 BLAKE2B 566a4c2047d94c48e9b89fa9fdcdec84de5fbe15ad0f25eaf9f11b2a658b06cd61ef025caaed5f18d805a81f318fd4a995d01756e21ed5a96956b5e84b3da5b6 SHA512 fea5082cedb03de62dd9b4ee1db891439a14367f746f1fdec4056ac251a607cc281d22708517de4e3e64484b47fb6cc5898c30983a6af9db03412c469b4e9009
 EBUILD Test-File-1.443.0.ebuild 704 BLAKE2B 5ab3c6b1afacb4b566cd475dd5a97bee56a31171d7bd3edb9a8bf141fb4bc9aa3906bf5eef6d2ad0aec631927dd9790093c02587a598b8c7e5e0d01258064544 SHA512 563f96f9a55edf8acda2bc4dba08e6b50843121924f1f253b2a6fb294c6075080f583cf089d989213c975ce084cae18112a60bc91c76d44fb6868bb2273226b1
-EBUILD Test-File-1.448.0.ebuild 674 BLAKE2B 6adb7792328e9a68a0daa63c9239b1fc0f591e53562b98ab45cd7988f4af516fcacf30d6436e4c8d79b596ba2400e76043fce3b37f1076dcbf13688deb9ccc9e SHA512 023d95a2a9f52eefbdc27e20f07a1fc31f768cbac44dbae73a178041e2d58933d8cfcde2ea1285ed572b364ba2404c67c752935afe2b74f99e6e64956f338810
+EBUILD Test-File-1.448.0.ebuild 667 BLAKE2B fefaf045773cc1ff88cb962838236fd542251fab57585f47d8db6e1e71c5e68ffa1e7d63eb58e3bd000c0c90151f73240d16b853048d306ab748b0c58f8b16b5 SHA512 a9a786fa49a834c231c2935d327f43fccc5de0481c470cd0873f93b8a8ab866cd8f016e535f6e65194dfca7d24fdfd5d297257b8e1528ce494937280ec180d9d
 MISC metadata.xml 391 BLAKE2B 1f334c17528acb52ae757b454672a3c8b01b99c374b1363f69db2b46de7ebd715f1d2d8a7c5a062b019e395dca0f42fb37b6a0069e91b1313ade056c34aa7e05 SHA512 83f823533546b42976d35a3f8b6680ce17c54932e38b9da80ae70ab491ddbe1b23df454e8c72df6f7b8eb02145e4b7b92207d6cd56653da9edf55eb4b6235680
diff --git a/dev-perl/Test-File/Test-File-1.448.0.ebuild b/dev-perl/Test-File/Test-File-1.448.0.ebuild
index f5ace48d38ab..3c3cf815d995 100644
--- a/dev-perl/Test-File/Test-File-1.448.0.ebuild
+++ b/dev-perl/Test-File/Test-File-1.448.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test file attributes"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 "
diff --git a/dev-perl/Test-Files/Manifest b/dev-perl/Test-Files/Manifest
index 06a1f090754a..083e1db59e72 100644
--- a/dev-perl/Test-Files/Manifest
+++ b/dev-perl/Test-Files/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Files-0.14.tar.gz 11520 BLAKE2B 5290b9d52fe303b8ea81c1ce75d9eba233be02bf5e491512e1a55e4fd64b892ece8227fde4c73a0821fb08cf8f26d207696f03c898ce1ec5b01e9ee7adae0dce SHA512 fe456e5e99f734ca356e0595f79e66e899e0a92e14ccf32a7deb04537789546e3b9f1fd091e2e50dffdee51d01ee9096ffc36f3a6792eaa8be85e6ec8ab25782
 DIST Test-Files-0.15.tar.gz 11967 BLAKE2B 4fbfdb4166ed8a644811639f7a8346de8579d353a7f7d69c23b0b17198fe8ac8c67bc62472d704d31f79f2f45f9df98e5f64e7adb6c29c2ec93b6d5578dd2685 SHA512 873ac7565cd3fbd11ed908ec3f5c01a41d76605eb3d1cc752226fd7628cf2be30e1a93c2adf80ea00ccaddceefeec6bf74cbde84cbfae0956f405853015f89b6
 EBUILD Test-Files-0.140.0.ebuild 430 BLAKE2B 682609528493735ecf59dd6696fbbcf2d99656717dcb07910c7c4dbc41572bf77e4e46b5e67f8f0f423045416b6b36eca5e4cc7fb58cae06914ac01d4101a543 SHA512 d41b8abd70adecc26a5e4d3f7b04cf1a29b330e8a2029fe88ad89557e33ad1e196b772567199ff6fd984890f09159f62e95282b113c8ab7d875c8bf8cda789a4
-EBUILD Test-Files-0.150.0.ebuild 419 BLAKE2B 7c08654502fb1c36ee0b0cadc53e7b0d8066c5ab285f8c81ad4190f16f8c744fac38fd8c6e9352e503de29f08534dbbd748110f3facc264fefd2c000afd2e659 SHA512 092c27a67aab3e16aa611d70cc36cbf9b4d19253ce45fd4409a34921f4d1d94ee7813c1b41d4ef88c579af0d1a9c6705bd648da137768fbc512835c4ea356592
+EBUILD Test-Files-0.150.0.ebuild 418 BLAKE2B a73c4656f43ba691efbb5ab4cb375d0b703bea695ae15eceeaf2350fff91d52b3260cdbec05d0fa48e1d78abf00bce25617f4db8cf4c069bfa19558900d47166 SHA512 5215e2ca5c73054be54f9748366aea956fe2fdb5ed5699f4da7aaa825e93ce6ffa29988eb70b0e055cdb7cfd2151b2dbf3b0c5d3323ba7e09c8457848ae816d2
 MISC metadata.xml 393 BLAKE2B 36d53803dbe2d2a1c305fa3a2866fea52f65d43c6fd3b9cbd94b062b79b2cd56f147ddc00cd2b8807a66547a362d05b3e3569ee7e4b3529280ea4b03b0282fb2 SHA512 dd4965505eee248f13bba002c9b72106d1eeebd6744d634048c2b90efe3b4c1076a6dc6f96d107df898475ba8a601584eb2fdb12c202a35cbafd4e2f6f909868
diff --git a/dev-perl/Test-Files/Test-Files-0.150.0.ebuild b/dev-perl/Test-Files/Test-Files-0.150.0.ebuild
index 3991724dd182..4281df6e65f2 100644
--- a/dev-perl/Test-Files/Test-Files-0.150.0.ebuild
+++ b/dev-perl/Test-Files/Test-Files-0.150.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Test::Builder based module to ease testing with files and dirs"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-perl/Algorithm-Diff
diff --git a/dev-perl/Test-Inline/Manifest b/dev-perl/Test-Inline/Manifest
index fa87401139ac..ff53c6711037 100644
--- a/dev-perl/Test-Inline/Manifest
+++ b/dev-perl/Test-Inline/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Inline-2.213.tar.gz 61649 BLAKE2B 9d192d3ee9e790d4348ab0efb37457776ca1242a012f3bf1beff14bc51a0917206c1aa64d00a465795c438bb0fe44442020432be2063b65e443dcb7b2a262ef9 SHA512 2d5772b515a0c7260c8591a56f640ebb41ce91e32380ae46636f2e85b3c56656fcbf75a1b859e30bb437b9bdcaaf268b943cb1332365173ff413d15f6761b4a4
 DIST Test-Inline-2.214.tar.gz 60403 BLAKE2B 527d25de1d7aa666ecc8b9633d4cead4acaba4c04d168b2cde82e426bdc422f5b181e735dfb02b6774d2f1706bbcc474cc3e7ffe3fc113402f8ed8579fc2d889 SHA512 25c65bb944d09e5cc17cbd4958e629f0e09209759b4bbbb3ac7cc5b22c6218eb77c724131d465c0df7592f803631c061b1fd02c2d238621f782b732b1d7db2fe
 EBUILD Test-Inline-2.213.0-r2.ebuild 1017 BLAKE2B b2d6f7ae1b2f1a8c0c5718ea48aaa1a3af59c14ad23b590730e7983fb3d7e58f008e687f1bbacbd69231bd0214da48b8adef95541bb66af73745a6ecf406baa2 SHA512 4e62be3450601a50424413f66db360ce7e4ad61b00825bca8458c3489a158a4e5e7c99e552b5cadab26e9ccbe62faca25a452b5987b5d9070a04abe04afb09fd
-EBUILD Test-Inline-2.214.0.ebuild 886 BLAKE2B 3252a4404d2c834a531a0acfa2b2b55534359811a6b96dcc4c710f68e1c5f8453e5aaa0b6b62444db917f0671f6098258896a4e531e3373cabcb1b2f870b6b30 SHA512 d496ed5a445649f61b3e38030eeb56aa5542b87c3c327ee9645405d530152d337f23d62d396bd65a92b753ca0706f62facc1edc2b7e021e1dd7422969694b733
+EBUILD Test-Inline-2.214.0.ebuild 883 BLAKE2B 3a4f47e28378619353c653d2cabdbc018921557129ac390e1953aef364cf5ebac84ff097d27095c5b7b061e98b480f14cdd5ce6e4b3091ef69ae4867336b0252 SHA512 0e735c2cdc5293fba2f063f8b1a750a6a0eed71dd4bc294431211c18b46c47be48fa339452fe1859d99e848629616734e3c6f5be9bf27d47d4469c936e5da84e
 MISC metadata.xml 1029 BLAKE2B c352cd8c9a91f762a5110165ee1597670571444a657144a07a99411745bea5fe20b989699c471e6b879dbb51aa7d1e756755c0ea89cfa7a0461c7583a3227cbe SHA512 be39d16f40e6b94016b67dfeb152562fa447cc68740a0d75dc63a1c2c03596a63648781b13acb112ee9f99a280d5e48672eb0e2d7de56c71aaa8177dba6cd798
diff --git a/dev-perl/Test-Inline/Test-Inline-2.214.0.ebuild b/dev-perl/Test-Inline/Test-Inline-2.214.0.ebuild
index 07413ea50ada..cb7bc721a795 100644
--- a/dev-perl/Test-Inline/Test-Inline-2.214.0.ebuild
+++ b/dev-perl/Test-Inline/Test-Inline-2.214.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Inline test suite support for Perl"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	>=dev-perl/Algorithm-Dependency-1.20.0
diff --git a/dev-perl/Test-LeakTrace/Manifest b/dev-perl/Test-LeakTrace/Manifest
index 0d324e1af405..0d3610d53276 100644
--- a/dev-perl/Test-LeakTrace/Manifest
+++ b/dev-perl/Test-LeakTrace/Manifest
@@ -1,5 +1,5 @@
 DIST Test-LeakTrace-0.16.tar.gz 49435 BLAKE2B b7fcd095f7406083a7dccf21f62de4ec4a1dd8ef72395f90cc9fa4b6fae114800130bea6a9e449835871e356c420bb71cfc1dad090bf50d96f450fe3baf6ecab SHA512 6fa7a5eaae01ca5232f3f297a104553dac5f57e4c6721d7084e5d44b0133206100878c7067b228b1e01b21f7639a97a0ec48ef77198deb0598d94d8861bab049
 DIST Test-LeakTrace-0.17.tar.gz 34126 BLAKE2B f461f440009d45ef4e6f6fbab8501ac2ec9c59d5f76a339ce00200128a7769257dcc7e48bcc1203c0b6bebd6bc1078b02c4ded8ff61b8c28c302b7e701dedb73 SHA512 57ffd8c64ef871427c04419bda239d73e169f3b6ee268e0d4d7a27942c277d4b1f502e82e2e0df415b1050c0aa11944c2c3acb2e9b353855f77c91d1dfcaf00d
 EBUILD Test-LeakTrace-0.160.0.ebuild 604 BLAKE2B 6b9ae00d280a39baf45a299d320b86cf15f9916ace8e7a950d499482af96c720ed55765f3a8f466495bcff4af47a4b6bcd762cbe921907b1650492f0c7cc0c32 SHA512 ac0ef5f64f8fe85537e342327baa5f60aa83dbe2915bde0a4ba3fa8d0dee1a867d5608afe5cf27ccb8776b4b3ebc5b0c13f677bdd7b458b77e057063e8c5abaa
-EBUILD Test-LeakTrace-0.170.0.ebuild 605 BLAKE2B c59dc8bb1201f038e7d11ebad876a0e3e7f4408a25b93e743a5bd6c05a1570c2b7e6741a27102f1cd8247aa6990e172085701072bf0beafd4ef1cd6bfe415c5a SHA512 c19c5f5e8802563b5ee720cd65c32f56026a9973acc1a7da14ec5cf0312111cc6e14d5dfbebbe00736ae13d27662c542a414ab34bace2777c889a69c08c0c755
+EBUILD Test-LeakTrace-0.170.0.ebuild 597 BLAKE2B fa82b21b8cf19139b8129e6cb61bb101b775070735dd7364e7d3009045f2d2e873606df56171d673646575095d59e8cba20787008267c9b0cac92e6a0e788b40 SHA512 6c4dbf399ba0b70a868bf0f1e8e5cd9555365320e9f65b293c146f1e39bb4c0add57c1e64fc2697fd037bee51b1b2adf9a46eb6f598784be9e835f95a1f5e6e0
 MISC metadata.xml 499 BLAKE2B b0c88965ce537fbf296b56e5aa7271c33361e2dc06e56c0576e0aa539008cdf181db74dfcce1621fe4421c36bdcbc139ec2e2680a2523240b7fdacc967c74920 SHA512 6eef982ffc7b7506066637082e6af51800a9cb0ade1717ae80acbf2d1f9f6b58d6fa27e4fe0576f86bb11ce2aa5f443258b1f0181e0ddd93bf4805c1ff4d6e5d
diff --git a/dev-perl/Test-LeakTrace/Test-LeakTrace-0.170.0.ebuild b/dev-perl/Test-LeakTrace/Test-LeakTrace-0.170.0.ebuild
index 7015cfcbe447..0214aa461def 100644
--- a/dev-perl/Test-LeakTrace/Test-LeakTrace-0.170.0.ebuild
+++ b/dev-perl/Test-LeakTrace/Test-LeakTrace-0.170.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Traces memory leaks"
 
 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"
 
 RDEPEND="
 	>=virtual/perl-Exporter-5.570.0
diff --git a/dev-perl/Test-Manifest/Manifest b/dev-perl/Test-Manifest/Manifest
index 0da158116cc0..7ddaca51309f 100644
--- a/dev-perl/Test-Manifest/Manifest
+++ b/dev-perl/Test-Manifest/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Manifest-2.02.tar.gz 9180 BLAKE2B c8f75c906ff15d2c9d087f9d9d619eb7e05807a89976e587505997adf746f71385e17b33166845e28c86d9488ea6be42be5b6657acec31f172c47dacef634624 SHA512 b22a93b1ff9a0cbbd5a7be0d01d7ec1b925f9f5b0a865b283b68891d411e406c57e7459ea34f575ae40701e91f12474b9cf4ae66512bec73609b1066315586b1
 DIST Test-Manifest-2.022.tar.gz 14664 BLAKE2B 34a3f850886b0d0017911dcde3cdcd40cae2b1cfea859928b7c837d3ead104f1b7501ac9f26114011ac2c70bf008e3137db3c767c5d635a1c7047349601d0e33 SHA512 e72f5c7c23bac5453afddb81c9175a3b07b9a8f935c37d0fe5ed7e0f6861742c2e9596396b9cb84d62bf2229bc9956bad26c47d7eaab6777ec7628927e294209
 EBUILD Test-Manifest-2.20.0.ebuild 701 BLAKE2B 06474ef525a86caa0b6b04f4bd4ea4847f2c6254e0ae4601e859cdd8f77807ccd74e2bb4d1d106ddf4917d3e52df9e0fff5f20add898853b71794dc41150a459 SHA512 8150f51b43ea1750e42ac72d24d64442f6fcbd89552c900b16ac8b77449cb275b1577689a62af942accf69746325ee5f198f9634737113a57b0506792dcb13d9
-EBUILD Test-Manifest-2.22.0.ebuild 731 BLAKE2B cb2c44ba32973e77c6034b407875f02ffa0a2365c81c9cd7cd08b0a4ddf8f2b02f102a9167d2e824392e64f8f58ee1e34022801ba9004b700b0ee02cb18e26fe SHA512 31aed768226fd5bb30b5ab775e0273a7e65eb6b9e3c377898815ebb3c0517732e422e5352cc67ad3c87fb5a332f42e89a1cceddd105fe4be5a09468f70ff5f15
+EBUILD Test-Manifest-2.22.0.ebuild 727 BLAKE2B ba31d47ab035f24c94d39ecd7a67e067d1f11860c4ddb0e361526460ae78c6bca19db4f0924bca771771d7773d1df5d1f5f93596fe2dfccaa3df175758f64dbd SHA512 871925642966bd8bf354ffa55d409cd94e4acaec7752ea68598d9778f03b526cbdb93fd23efd81fd633e22817f9d3d2ef19910782445dc81c2cfa948362938f5
 MISC metadata.xml 399 BLAKE2B ff65e6eac927b2a04b3368e2822bc7bad747d94406e19d83656f8ebd48d8b6dc42218d73b1521a86ee8082d29cf9817f205538fd41604c173dbaa55294ad1327 SHA512 ca6a2bb63a80fb0465bd099c5a9d414be7a9a130cba27eb14750f8770fc2023e8c4aa315408164ae97f785e9761aea96d13d139857de2f207797d267390ed592
diff --git a/dev-perl/Test-Manifest/Test-Manifest-2.22.0.ebuild b/dev-perl/Test-Manifest/Test-Manifest-2.22.0.ebuild
index f274d3497bb4..3657eaef7eba 100644
--- a/dev-perl/Test-Manifest/Test-Manifest-2.22.0.ebuild
+++ b/dev-perl/Test-Manifest/Test-Manifest-2.22.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Interact with a t/test_manifest file"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 LICENSE="Artistic-2"
 
 RDEPEND="
diff --git a/dev-perl/Test-Memory-Cycle/Manifest b/dev-perl/Test-Memory-Cycle/Manifest
index b6e5cfd670a8..ef6f7d8d9858 100644
--- a/dev-perl/Test-Memory-Cycle/Manifest
+++ b/dev-perl/Test-Memory-Cycle/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Memory-Cycle-1.06.tar.gz 8928 BLAKE2B ff221bd6ab6b576ec3f534c3dd3a6a6add53840c9985c67a25c690e24b258406101c8f04e7a30e86a0262a214b61b82d11c72ecb10723580ae6e2d41d9626c4e SHA512 d25ffd0439e47e0b57f136489ae200ca24c8434a19473d23f70d0f8a2c8d18a93fe453e9b1b844b5edbd9c788bfe3c83f5413441389dd9b53c780f734afeb804
-EBUILD Test-Memory-Cycle-1.60.0-r1.ebuild 701 BLAKE2B a838d6adc0438314ceb038c4f1ede349b164a6eee6e9b651995d71a609691cca59699f24b81cf725adbc7d69a308c48a6791b4cbe34ef78d5b4ae43bf513b2e5 SHA512 c08b1b9441dde49c58df76ff03ca4002ba3b30fff83033fb7a2925091273706a518be0cd901005a4ad11ccf62c77182b8f65fc2c97108d69a5d2bb7582c395c9
+EBUILD Test-Memory-Cycle-1.60.0-r1.ebuild 700 BLAKE2B 0f31ffafd7999257063dd58e4fe26e153abbcabec94ee022fa4a7238805260e217cf264301b2f47d9b9a987a69c1e0f4b58e258ffddfe0a63de974f8249df0c1 SHA512 06dabd80d197151bcc107b2f9122956fcdeb70dee53531770b939cd597f5a65c83d88a9ac1badc2e5ae4431b38814f6a98009bba7291518cccd6ddb6b0ccff46
 MISC metadata.xml 408 BLAKE2B 3b3955b2fe5c993555689a6e70eb0ce1efc5c71ed0a996c9969975f60441f92887691df56edb3792393516d87070ac100032ab7998db9f3eff9605d15e52266c SHA512 0c54861a976d08b05d7b8c64927e2612231e0efae39cdfb21de961a73c36d0bfa12cb6a41fb8ce21daaed23dde4f2f713b5e1464f5f725c03301a64bf39d1e64
diff --git a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0-r1.ebuild b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0-r1.ebuild
index fb227040387d..f77c6f593c17 100644
--- a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0-r1.ebuild
+++ b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Check for memory leaks and circular memory references"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~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 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-perl/Devel-Cycle-1.70.0
diff --git a/dev-perl/Test-MockModule/Manifest b/dev-perl/Test-MockModule/Manifest
index a6ce464d8325..a9b2a422c1e0 100644
--- a/dev-perl/Test-MockModule/Manifest
+++ b/dev-perl/Test-MockModule/Manifest
@@ -1,5 +1,5 @@
 DIST Test-MockModule-0.13.tar.gz 24561 BLAKE2B 2ae6f41b29d78c88e8632fecc560d0a96cf38c7b25c7dcc63f935fe98a718fdea41997ef9663d8838edab89fa815a0696d49439a7b99304332f1b636bea0be0b SHA512 17c2aa7b67fcae2a333788db74fc94da9a680ad83786705e70417cb78df0cfa32e6fcca44962dcc9d7c2ee27c45d8f142ce03b62691da4940ccc405a0bb26472
 DIST Test-MockModule-v0.176.0.tar.gz 23847 BLAKE2B 600b8fbd166b1abed703ceb86028b866a90d30521bde4ed4ec39464ccb5f910094a921f85418b922363956cc429bbace48bbf5635f03ebc250112fefe2946064 SHA512 6e1ce7b8888e18d71f0e84bd2a761593e3a34e169d34251b5259e6e037796c2e207c50d5689d1ab56aa271e71f3ea2f05cc6a86f0bde080db1caf7205587cc60
 EBUILD Test-MockModule-0.130.0.ebuild 700 BLAKE2B 1ae94f8258190687ae0a886432b652c5e6324a35e3be1acf688edda39312308cbd122c425e29bd8f1a6349772c46252203dc99625d8860871161ce5355c45cd0 SHA512 696abd8fafd584361cae109ab1d148668b9b7a47708d487828c51b6d6c174011bcaf3892740d5f298711d65d23362d6c3df77d2a850affca981f7521a7e0b5fe
-EBUILD Test-MockModule-0.176.0.ebuild 683 BLAKE2B 8d71aed32282ca7f11a9dcbb05678a54bc4f5f1d73e2bd4a3a3fa10b4ac5ee8e7d613ee7816a142536bc2cd7905a1cbc449ae286d619b17e35dbef5934321c55 SHA512 f267bc12519be6dc59667a350c3ff094fd79b9fdb844ab68ec37200cc59622bd0cf2c961febfb54071bc75120a98212d89e21f25113ab51a35d3de3f5761c266
+EBUILD Test-MockModule-0.176.0.ebuild 711 BLAKE2B 204d66c97f276792f15845162793f600b11cbbe5f1f46f0c76b2497c033dd4285daee316d3deeafb4691152b78e0fe054d52f749b65ac9a086d9d4c241186be1 SHA512 6b9be8308377eed66317193bd1f9b6a2d87093bd17d0c4d7b5acc4fce37441b131de6d15727bfaf3939ee06643a2e143a899add329870d04f87b605bd5c6056d
 MISC metadata.xml 403 BLAKE2B 0a5532910128d1c0b57d7405f2ac1f689618052b2de78553a7e2c3f62c9d176068619440052f3d098cd0b097b87f5cd38030fb64a49bbe7437fff10eb2f64a22 SHA512 15e8685f8d53db614e2042327df1c7004eb969695dcc26eca594142871ce2ef226c938930789698d10b964e5e1373d8de43fdeaf0e5906a219b29ff0af9300c4
diff --git a/dev-perl/Test-MockModule/Test-MockModule-0.176.0.ebuild b/dev-perl/Test-MockModule/Test-MockModule-0.176.0.ebuild
index 4bf23d318d1f..8924c6fcffc2 100644
--- a/dev-perl/Test-MockModule/Test-MockModule-0.176.0.ebuild
+++ b/dev-perl/Test-MockModule/Test-MockModule-0.176.0.ebuild
@@ -19,7 +19,10 @@ RDEPEND="
 "
 BDEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.380.0
-	test? ( >=virtual/perl-Test-Simple-0.880.0 )
+	test? (
+		>=virtual/perl-Test-Simple-0.880.0
+		dev-perl/Test-Warnings
+	)
 "
 
 PERL_RM_FILES=( "t/pod_coverage.t" "t/pod.t" )
diff --git a/dev-perl/Test2-Plugin-NoWarnings/Manifest b/dev-perl/Test2-Plugin-NoWarnings/Manifest
index c5e43fb58fad..b29bd6c29211 100644
--- a/dev-perl/Test2-Plugin-NoWarnings/Manifest
+++ b/dev-perl/Test2-Plugin-NoWarnings/Manifest
@@ -1,5 +1,5 @@
 DIST Test2-Plugin-NoWarnings-0.06.tar.gz 23237 BLAKE2B 7c390da923bb355a0e4539dde11c4b52846d1d39cbd474e15e61f6237da3cd8b357044e89e2f5133772fe3e9bda008fa22f5f299f4deb8ce62f67ffa65fc5500 SHA512 aed9a3769085028adffd0aa7cbbe2d7d8b89b5f4768e47ae4155dcc1f4aa8fd47319ae7c87ddbc1ed08ca99e1d703eebb74977e88696ea4dcc1104a53332ade2
 DIST Test2-Plugin-NoWarnings-0.09.tar.gz 26442 BLAKE2B a451a46839640b80bdd182fc56728f9274214b8f09c4aa3bfcda653508290caa1fd070b6bb9612c4b2a697f21f8c05bb579623e9735ac3abc99c52acfb045376 SHA512 3b93d6c4522e913c4bc9d589b650f784327bed1a36a0dc18943dd2ea34654215333753cb532d5ffff6f0ef0af9ce0859e9744637cff89a1a1a5b936149f9b455
 EBUILD Test2-Plugin-NoWarnings-0.60.0.ebuild 680 BLAKE2B 6c24c6dec8265259f969e8c50eb62a1a3ffc5ed36c7ee0dae556c412d781845e91b120cb902587ad71d4ae777e7136502320903cf87c7ea9cb49e2e474c6040f SHA512 f90c214569844fa03ec96cfac4bf2cdb651fb29e16ff035f19ee6c3b7d6a4a610a01751c8dc078f437580534dfd0c43544b19c3fa7684f156f6929cfa8922282
-EBUILD Test2-Plugin-NoWarnings-0.90.0.ebuild 642 BLAKE2B 0286bca2c2d180a74c2fed0e6911355e7ead74992443fad8fe279661029416bfa0a250051a871f0b965aff87e4f4a5778de40afafbd99d6df8e558089a6aefab SHA512 5570c8d2da0d90686f02402393818b587c1e3623a5afbc1dddd5db1104b2aba09a4583770d3d846f7bb62d08fc749d1a736c6494bffbc1fee6d8bd78f55afeb3
+EBUILD Test2-Plugin-NoWarnings-0.90.0.ebuild 634 BLAKE2B 33e8e48b3c99aed0f3e0ac9147f8c9bef838df5d907cebad1fa67e713d759f80dbf7d6c2ff2b8d7ec081b5703a8788590796b69ae6817e1154a92a8285d03a4a SHA512 85a62bcc73af6300d15c6bd22d52d15c6764993719c94466c0fa80574b4c1d634b22a47b623261ae8cd9044ad1106756e10c4f670ae9d55bda6c2e9fb5959110
 MISC metadata.xml 488 BLAKE2B 6a61fc90d9ab0afb20fdf941bd37c554d595418e414958dd122bbbda8cd4e70ff6166130b594b0dda20f777b55a2dc931cc1d96204071dc8cfb4e63282e9c719 SHA512 bf3014ca49092e264433e060ad3a66289a8b084220a28fb37c17c306f0794db776c9f425f18cf81c44e57b537ed2f517a309b1436cd39b877b8a732811effa0c
diff --git a/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.90.0.ebuild b/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.90.0.ebuild
index 7e915b7b2c7a..fd5e3406d786 100644
--- a/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.90.0.ebuild
+++ b/dev-perl/Test2-Plugin-NoWarnings/Test2-Plugin-NoWarnings-0.90.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Fail if tests warn"
 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"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Test2-Suite/Manifest b/dev-perl/Test2-Suite/Manifest
index 025f7c48f1c4..9d7442a7d9bd 100644
--- a/dev-perl/Test2-Suite/Manifest
+++ b/dev-perl/Test2-Suite/Manifest
@@ -2,6 +2,6 @@ DIST Test2-Suite-0.000077.tar.gz 144835 BLAKE2B 5a3db61f48f479f8bd00639a538fada5
 DIST Test2-Suite-0.000140.tar.gz 227561 BLAKE2B 05d3467b65e0669a5cdef590baa21fecf24af0042cb24f70d380a08fc832963674a11abe3f965273592b1b8789066c77b9b561c8c23f0f5403e20ddf5f5f7e9d SHA512 26abec9f0aad7d29f6499d27a107bee915c57632b53147f602f5e3732536aabf6c6f903da989a7ebb7113e5c5c0d22a393ed9dc0438d284c09035b76dee91a91
 DIST Test2-Suite-0.000141.tar.gz 227660 BLAKE2B a7fbb4031046cba44670268d5280b06b814e85dcbc22c086adff7c6f8bbe1ebb571975cbe40096336745dcaf547fbbf75cd1c1f366bce1094e6ce992578abebf SHA512 41d283530a25d1794d4d7836dec37fdaf41c78fd01cc78664f5a6b7c50c4d135f75d712d9a047d406ebf529a5538fecedb4b84886415a68c188b618adb683e91
 EBUILD Test2-Suite-0.0.140.ebuild 858 BLAKE2B ba39eb66aa6f688e17ff4cfd984a2e836b451fcd6310f34bb186e5c92438b17f69da7933ea47130bd8094907f753381d9922f8baf0bfe7cc1cdcbfd2c3f11551 SHA512 7db801e457a58dbcec84f3f0519bc8e91ac36a6e55c93a45d5f61b181baa62d14242d1b51bd72dfc4c9e675e88221bbe360d30ea3f0d47197005c19fc4cabf8b
-EBUILD Test2-Suite-0.0.141.ebuild 827 BLAKE2B 35877be5edd05e56eef8254c20e45048e78c06583c51360663f9e379508fa11b50e54fc924669152e76e33afdd4965a076897b24b94e16b9074766e41ac5f35c SHA512 378bde8eb2bff1dadc48d7777587e168c436baca6d4b74606bc111b0bb6abd452e9015f1e84b97225fdc5e4f100d9af3904b5316e9c6a97e3663f93b22a95783
+EBUILD Test2-Suite-0.0.141.ebuild 819 BLAKE2B 32f08aab3a3d0c2bdd50416d7f8f3ce8ee8cacec7f11725f58a88492f0ee7a84fa2b8bf2d761c35c4b220c6b46fc79b37f3a62b689e8664f9548f62b8d6eca8d SHA512 f709b51f0baa61036734ab16dc999b0173717e3d8dc7871cd27d97d42bc8d2827a4604527acdc1ad2a40de526ec50e4ebd2f1624720cec4f022fb9077bcdee4b
 EBUILD Test2-Suite-0.0.77.ebuild 722 BLAKE2B 6ecc3353b8d36fea7858c67af56ea835301d97f9dabaa81ed05252cf86ac5643f3f7370086225beea8983d032575b48c2e4cccddc86d369d5432915b60d73ea1 SHA512 d66fff90895f5b2eb2332ce675f040e5ac7949ab563bd12c02357a3127c4929a080742c4c6c569504e0684c9cc8326fbca6efb2c1e9e86389706bccd20acd9e4
 MISC metadata.xml 5304 BLAKE2B e52059af4d45d85056323118da775ad7e4168f6f850a6cb7a46c15cf89e3426d81f865f5de839312f4b12a0c8049be1a51699cbb0edbaebaeaed6f709cff7efe SHA512 3c8ca92d562d9a60fd7246ebdd549545113e9329fd3a7afc2eeec57fc4ebe594ee4b853542da55f17b3af927f74207b29e3af2da72950b601f2eddf24f7e8b62
diff --git a/dev-perl/Test2-Suite/Test2-Suite-0.0.141.ebuild b/dev-perl/Test2-Suite/Test2-Suite-0.0.141.ebuild
index 95e508a35c6e..2836f3fcc497 100644
--- a/dev-perl/Test2-Suite/Test2-Suite-0.0.141.ebuild
+++ b/dev-perl/Test2-Suite/Test2-Suite-0.0.141.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="A rich set of tools built upon the Test2 framework"
 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"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Tk-TableMatrix/Manifest b/dev-perl/Tk-TableMatrix/Manifest
index 505f7615d60c..b10c82d5a7d6 100644
--- a/dev-perl/Tk-TableMatrix/Manifest
+++ b/dev-perl/Tk-TableMatrix/Manifest
@@ -2,7 +2,7 @@ AUX Tk-TableMatrix-1.23-makemaker.patch 959 BLAKE2B f5d8eaf4abc648868baf553b880d
 AUX pTk-1.22.patch 558 BLAKE2B c62d921287899aa542a618168f26ff37f1bdf92373c8d72dd98cc52aed15a8d2741968487fab7d4091817517fb01dc541018c0129d7b781e82c8afea0bd30da7 SHA512 c709c5f6baf326389a794764a4b223c0fc154f0f6157e4696ba2e7af6cc029f1e977558be7a16bcdcd40a3e31cfc30bdd23e319ccd5cb33b227a84a55ab82631
 DIST Tk-TableMatrix-1.23.tar.gz 318954 BLAKE2B 9e6380cf0949aaf15861ad9a9209d7fb2cd69c3e1983f26b364aeaaa28143b00a063fc842da48c7d18ba1f9c69a60973519de07fdf91e39532b2347ddbcdd4fb SHA512 115eb2a71c3725392f2bcf5e468bc84844c8a5ad3db221205876d7de6486833a3fd4e98aa32e21f5dcf038a38f9d98721adeebb1f9cd0990359aec7d07f6f32e
 DIST Tk-TableMatrix-1.26.tar.gz 410559 BLAKE2B d0a5763469b5abdd6eba92a6a3de05b1b07f7d09f851f6471d3953ef93b242e65be6bcbc00a72ff61c11a9b42b0cf10678c11efbbff91ca4cb209df9317a0874 SHA512 bd45e3c72e330de3722fe365989f6bd0bd938d72fad166c1a65a3667d07f8c10bf792742bf82a8154b43d3453a79e737788b0a4a288f318c370cc0c5fe94917f
-EBUILD Tk-TableMatrix-1.230.0-r1.ebuild 601 BLAKE2B e7d07dcf8b47fdf8e659e055b9cef1d80ea05b8b0c8e65a01d8f04668a154a9b6a9c83833ca014a54de0919ba4a53be451effded3d7b7b2f9bd7f5fae66534a2 SHA512 5fdadbe8ddcdd948f656e89412f0aff711efb770e86959c2324a1599486add1e3eeb1f855ec772887aa966e956e07f69c95b99e1eed7de3be401892c59250110
+EBUILD Tk-TableMatrix-1.230.0-r1.ebuild 600 BLAKE2B 79819d23e021851851394f08c5208cf125d372a5456aa2ec2674231717f378be2583ab1df8f2312f81dd915c4adb7c14f83aa6e575f9ad48c201ba870c2c5513 SHA512 0ecbd05dd068841b13cb8a1571186fc04346c2ae023652a43d3f4a14faf964ac1918ebfd36f93c69d542b157e4c93744eedb6af88bdf181b16a56cb0c93dd578
 EBUILD Tk-TableMatrix-1.230.0-r2.ebuild 686 BLAKE2B 581ac0a5e85d4733a05cb7d6b6cae34bc945d214db909cd347834dcdba9e7680cfc937fc2ce4adf8497c8b6c36de981c99067992d6f9e673f0b49a5b14ca4874 SHA512 cb170338994051b45c6f150016ca11983e24947045c448bb7abe36d899003f999b7de6ecc34557d556ab3fbf1a60d0b86454482be7a4e47e9501ea4b62916ace
 EBUILD Tk-TableMatrix-1.260.0.ebuild 681 BLAKE2B 3b98186ade4ba57d738734239aab266b2cb7aace936a90c236e6008fe1484946df11ee090107fbcfc8f5a23a37901f0d88cb0a58ae1163685298fcb81dc3f02e SHA512 5a328e8a9d2ee35b7f00bbf64672a3adde278b9da959f2e439196e13935af5e478f39b23fc72bd1c7e6767cadfea788f3ca34f809d8b9dc99b60cc8fd0584d41
 MISC metadata.xml 559 BLAKE2B 992fe97c68e40e1fa7c68c07686375917197a8ee8c63867847765970e74d5820bb2dad84a3fddc5e0e44b851f51660397ef766202767fabf159d718daaf1852b SHA512 0fa6f4decc0d30c9aeba1209615de0ddc5e81a3e839ebae9d92ca6638f297ca8298e1c949f40b65c9889ef9909a742435a9ef75519f3e12b8747c952d817a85d
diff --git a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild
index 84626e0b7e3e..dcf368664ac8 100644
--- a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild
+++ b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Perl module for Tk-TableMatrix"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc sparc x86"
 IUSE=""
 
 DEPEND="dev-perl/Tk"
diff --git a/dev-perl/Type-Tiny/Manifest b/dev-perl/Type-Tiny/Manifest
index f11e7231dae5..8875d00dbd72 100644
--- a/dev-perl/Type-Tiny/Manifest
+++ b/dev-perl/Type-Tiny/Manifest
@@ -1,7 +1,7 @@
 DIST Type-Tiny-1.002001.tar.gz 264950 BLAKE2B 2e5e1303834c6fb3b95855533c219a5a448e711b307532851e24fb9850fd60505ae8bf7a17d5d6630d065004f3bd8e11e7b58f9abad11048058ceb324375779d SHA512 e499c4f113e5a327294012daac9f0cd60a42a6c40b9d0c9c523a229f574a7dd0f672f209d0596d25edcbc39b79cd2ea65791b6a5146345e75fdd1d84ee1cd161
 DIST Type-Tiny-1.012003.tar.gz 464004 BLAKE2B 2fc4f2c9e4be295742309edbc074cd23e9d1a02f7a385808a40f8e7c0885a4b29cee63947b9b008d70d1e66529185ffad56bc7ff4dcf3f617b61ea454733a491 SHA512 d7bd3c416e20a5a951606d05a2fb396a4058cb6f165b401c7662af3d21f416c26ac0df70eaa6d483db3fe2d78e8fb4f02cf5cf71ebc353a744e3195e77f6ea42
 DIST Type-Tiny-1.012004.tar.gz 464170 BLAKE2B fab4788680f62b975a75be7d0d5c6878a1359af0e57b5a74d54bd506553d464a7b0bcee8faba50cb7a6dcef643ffeabdd91e54775be4724c75a12036b8f9dec8 SHA512 26b861f1e9caad5717f14eb0a6c71010f0306b614292fdc5ee95041ebdd2035ac6cfd4a6a186943479de630f3ff143914671111f5cec86bc4c08842cec30d2af
-EBUILD Type-Tiny-1.12.3.ebuild 1006 BLAKE2B f9117821ec1c9845a7f542b29f69bdeb98431255fd0f3ecedd5c4b69daa8d423478c8154c572d6b0164570b699b4154a18a6edf402b534a9db508eeea2f92a08 SHA512 30b9c7fdad942da6511cbc9eefc26489d30d0b34c4c36d37f74967db8df5a3fb78764c0322c7de04661a9f063c305983ecd6f9a81df9d374a11d0ba1dbd95509
+EBUILD Type-Tiny-1.12.3.ebuild 1005 BLAKE2B 947b61003e6e1cee12c5bd28485f4a72aa97bf47cdb52754ef6e97366bbe2476d9b08c1b1cacaf2d7faf6f64f9d84dfb08634483ad67010ed1f832b46db661a6 SHA512 589b32bef5e43dcd96650b5503bd5e3996195b606102f342a1cfb28531323b8e81d60dd4791363e8bb1b51ed50fdbcb289bc4b5fbf993f3e4d498b8a1db7359e
 EBUILD Type-Tiny-1.12.4.ebuild 977 BLAKE2B 95cd00aac6c1035f338b01375540f86d791981f258c360f70f45675600ab59394d30f62d62ddb1ceb505bb54712ba0e90f68a2337c3db4b3dd2777016b571ba0 SHA512 74e3f33f43a0fbad37665ccc18c672d306dffaf16907a92cd7639282813400952801bca8023d3070e265b7b4fe5d9f7a3e207b3810fd9ce314de5179f6b40883
 EBUILD Type-Tiny-1.2.1.ebuild 996 BLAKE2B ba59ba7718d3f4b1e631f667663c34adbd7f683225d028d2aea1c912404753ab86fe67019096b211bf5dd6e5409bb20f2593f7ccbd0ee8f57c692362bbbe8754 SHA512 ec8e7141d39ddfd35333fce53b4a2736a23db750a8f366d39b96b986261740c887802cbf16562b8e179cdacb4d1389155befac08f2a16c55c732740b46aef9e0
 MISC metadata.xml 2673 BLAKE2B a2a28d7c968de4a77105e522db033d487acb5ef8e3a48ef5fc980e20abfa90f2b70927de76c5e3f65fe1f55319b5312ea903d9ba2001fea019240adf9f98b036 SHA512 eeaebaa46d78eaff6ecb06ea0f154270a5ff6b5117106d8fd8df01e9d7cd498661d51a98d54c15f4c6e716254a755a9d2fd2715f36f0bf66498ec3f45335ef72
diff --git a/dev-perl/Type-Tiny/Type-Tiny-1.12.3.ebuild b/dev-perl/Type-Tiny/Type-Tiny-1.12.3.ebuild
index 136395206d00..13d2c75f7df1 100644
--- a/dev-perl/Type-Tiny/Type-Tiny-1.12.3.ebuild
+++ b/dev-perl/Type-Tiny/Type-Tiny-1.12.3.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="tiny, yet Moo(se)-compatible type constraint"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Unicode-Map8/Manifest b/dev-perl/Unicode-Map8/Manifest
index 1efc3ab75da5..066025149c01 100644
--- a/dev-perl/Unicode-Map8/Manifest
+++ b/dev-perl/Unicode-Map8/Manifest
@@ -1,4 +1,4 @@
 DIST Unicode-Map8-0.13.tar.gz 99250 BLAKE2B 675e39d091c41c2e92e279ada53c2b18283aa5416efc931eba67534af02fab196151e55757ebc689fc26840d290fa54ed91a77c588f8534d5ebe2ed0379ce42e SHA512 1e8db5bb1e10f13da4eb2c5de36d38e1cad5eeed2aba7e6bfcfb36cde727d557902ac476f64d28937ff2a53992c67f027d1a42edb005292d1c2ec89d05e18f2a
-EBUILD Unicode-Map8-0.130.0-r2.ebuild 376 BLAKE2B a7184501850d1e9bdf3fc359022d92850f893cc79a56ac1dc679f7617a07b6d7637b52a8b3b6168ccb5a993c6e2c198c1d4301fa5b86fbf078f0398818377ea3 SHA512 abbfd709079b9a1d8eda411cca572bc1d4f747ca110acec1d0e702c54b1cba193a29bf543e669998dcbcf70458815d4c5b2f1dd50c4dadf6f2953d49d5d7751b
+EBUILD Unicode-Map8-0.130.0-r2.ebuild 372 BLAKE2B 09f2bd94b716e5391c7f53a1765f623d3f3561882ddf9d87017b4c3030c10b151051d8939ea3922f121396426705073f61b274eca76252a2cbb9eeca8efd8666 SHA512 ea4617c98c3608cd2f7f9c31661643b12b0aef4268a9fbbc2eb6e4853374c3781917981330cac362feb711a2bad025045a4f2819f0a9ddbc1a1f7cc2d27279c0
 EBUILD Unicode-Map8-0.130.0.ebuild 389 BLAKE2B ca73d79cc1f10e9a1027a0174ffd96ab36b8ad570be38e64d9d922601872a7d9c2405814370064b840633df146a57e2ef00a4eff5d9f77bc41a4a8502ad03de6 SHA512 f61fd306df79a515527a3150543727a8cd7dfc93344f1640784efe50d736721d118ada46d0fcf516ced3059c3297b78bc393da9b5f0c9d47313379c4d165d0ca
 MISC metadata.xml 397 BLAKE2B 35a70d53e492b84efb60b06ea34af4ab513049c619b8e05aaba51a5754a96f90f2dcbe48fb0cab15eb8598c46c4bf2df0d28534042b718cbc194953f529d588e SHA512 e820b1784470ae364ea6bdbbaf29aea3f95bbb12a62c082412086218e5955847d39c206ac1244df8c68774cc0c450c833c14d7cf2b6f212393d40bbf2708b785
diff --git a/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r2.ebuild b/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r2.ebuild
index 7af0bedad0e9..43b9a0468b76 100644
--- a/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r2.ebuild
+++ b/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert between most 8bit encodings"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-perl/Unicode-String-2.60.0
diff --git a/dev-perl/XML-DT/Manifest b/dev-perl/XML-DT/Manifest
index 66edc9af0f65..a2e74c138918 100644
--- a/dev-perl/XML-DT/Manifest
+++ b/dev-perl/XML-DT/Manifest
@@ -1,5 +1,5 @@
 DIST XML-DT-0.68.tar.gz 31150 BLAKE2B 6d5c7174982d1ecf8db6271f3b0882e08c9fe534b057f7dc69bec22a2f9b1b1265e9c715e1cccf41ec11e366d54b1e1f4804fedfa03a33312d21cd40cb907022 SHA512 37108b13a98e23145b87693e8df20b5b6f7fc2aea13c9b19201e78d86d5de36c693d3deeb37769ec87bc78789811aefe146000bf4e836fba6664ceffddf6b326
 DIST XML-DT-0.69.tar.gz 31757 BLAKE2B 2a9dd5285b1f4058b19b43f83fcbf3a7d44754542d375258db7fd970aeafc52acbd83da126f097199ca4cf0ea523e394f164037b57fcbdcd5731c8569a8dc7de SHA512 3facb713ec4177a72b65a6e9574787c8fa5d09b37cabe31f1af6e300db5998670aa57105c833e05a0ce6ba6d9dacfebef870ef4c5da6d607363fd0c648f65c4d
 EBUILD XML-DT-0.680.0.ebuild 646 BLAKE2B e49bbcc2d53ac6588192b6b12be62b0272c2de2d7306148846413cf027162d93e0c81b837193d002a4edd03065f8a5543e9191b710dab10ad33d54e5f407488a SHA512 9844031f87700fb3c0460dd353a021dbb896f0d777e00dde4cae3fbd9f31a74f4f2a853362cd2f46017a111f4a7edd7dcfdd2858e3066897b169cac3f245f5b3
-EBUILD XML-DT-0.690.0.ebuild 610 BLAKE2B 5322ea32250d49c6ef26b07c1f3ee13f3926811638501e054be2ecd7654f381960922d5a096f64f3fe43eb83c03fcbe1686f64eec6eb55681accbad6e4106e10 SHA512 3d771f76e3b82983f746bdd757ae176e45891711d6297074892c2dbfe0aaf38206219843f6a717a5d7c0d11f9fb412f26cf25e924a777531763499463312eda1
+EBUILD XML-DT-0.690.0.ebuild 620 BLAKE2B 9718de71a8fcbf3ec5588332a3583f9828b04d8f54c1ba398219260783467be626b6d8c9b4f646cc3cf5a7c351e3a39b04231ccc11ee7530455e2f03698902e7 SHA512 6b1e381e2fff7c9d106ef303d9527b1a2369d305e5bae66651d17409442a776f3402429bfaf7b7673ca1b946bdf1f1f37ca9a85c8940f5281930327cb7692af2
 MISC metadata.xml 385 BLAKE2B 1ff0e086c75f4b5f08c47a28ecd0f16dd4a8d622f9adeeaa7d8fc2ea996d848ee33ccdca9380b686ea5cb135e4d59519f29fcda5f4f52506f2b0f976fc3b1940 SHA512 a1d8cee9e25d31e3dd04e4cac31ccb7c704714715e1563f9100a422ae85b299533d9a5644f4ae30ddf320c4654c2ab660ba114cfd0d6cdc8442f4c8d2acfe517
diff --git a/dev-perl/XML-DT/XML-DT-0.690.0.ebuild b/dev-perl/XML-DT/XML-DT-0.690.0.ebuild
index b6cdc3456985..899045dc15c9 100644
--- a/dev-perl/XML-DT/XML-DT-0.690.0.ebuild
+++ b/dev-perl/XML-DT/XML-DT-0.690.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="A perl XML down translate module"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	dev-perl/HTTP-Simple
diff --git a/dev-perl/XML-LibXSLT/Manifest b/dev-perl/XML-LibXSLT/Manifest
index dff5db3985d6..9d8621faed0f 100644
--- a/dev-perl/XML-LibXSLT/Manifest
+++ b/dev-perl/XML-LibXSLT/Manifest
@@ -1,6 +1,6 @@
 AUX XML-LibXSLT-1.96-entityexpandtest.patch 791 BLAKE2B 844c61b8fc33a3374de6b2f4066fe301a2122bb2ac5f48ca61a62db4ae5e3371333656a34b73216e12d219c802a6aa5df2db4fed917a1ed02ed2c5afe07c75b7 SHA512 f11d50369bcf0159b58f4ce1c88df02464d1f9c3803b199546b2b276b2f61fa537a4d746d337f80593496bd460b44eee42bbb1cd463224eb969bdb835786187c
 DIST XML-LibXSLT-1.96.tar.gz 114068 BLAKE2B 2225e387e9e877578be51a9a6c8c3612490e79c2cec366dd2fdc64710ce67200f5ab7109742197abcdc311f9a1bf16b42a40c7e7df4d669b638de4ee49782866 SHA512 7b6e22889c538bbd861c6420cd56893d229676d3afc1cf30e17cae48a4714139769a99a48a99f1dff52864f4989e410303007c07941625bf6bd12a24276c35e6
 DIST XML-LibXSLT-1.99.tar.gz 114083 BLAKE2B 2fcb6d1fde354aa58c9ba6d5a5037640d0e585f6bbfb7d81cf18e9f3b9c9ab7dfcdc6c455eef5a397ae310ca45c37fdb0f2f2b43227f7cffe0c652ca25775dec SHA512 d716fe44673c83c5670a8f98cf82057e7df35d43ee452843adb7c605d36e7a42b35bdf26937a2e3d8c55494ac83c23f1421ab4481a4817c011074668bc951739
-EBUILD XML-LibXSLT-1.960.0.ebuild 651 BLAKE2B 4df8b5a2d695df6f593b6a4102948d06d9f4371256338e73102b80fdac0fc7fe8b238fe68dfffc4f0d89c88e9a3d5ecac15587f8a7218469c5856bb891ebc981 SHA512 125126229a83a6918268220bc545cf2e13293c145f9d205d9d543d1a0cf2600e0ce783fbb639d48e26b815fb9265ea2c9e1aa4749cd8c6ef9976a4c51199ee7d
+EBUILD XML-LibXSLT-1.960.0.ebuild 650 BLAKE2B 829813aab0983c687682dd0958fede7293ded473cb4b983089564bd0798dc25b31ab4ad99edfe16dfa6901241f8f590177b4bf84f207825c672d71911cbf3ff0 SHA512 4625a2049bbd828d53f27b82f2328d322b1b489c227c63969051db57e86673f35b3da9064bc89327a9b95e43d3fce7d6aae32ccf42f085420d0c52b725508412
 EBUILD XML-LibXSLT-1.990.0.ebuild 589 BLAKE2B 94a8c47b52bffeece1e348365c4d80f89556194e1a483e97438b9c62fcad5a037ab85e21a22892828f2b2924acb31433146eecf97fe0c6c9519cbbe23244543b SHA512 91733ec5afc798e47fa6bce28d308243a4106c8cd6d1ec2d104a240b0c26e96813e97a0036baa01caf7f3cf56493a3cbb9d03733f8cd76100cf4d8c4cad5a900
 MISC metadata.xml 805 BLAKE2B b7149960e3e9cf53122ae4672713ed33b6fa5f3579e70f4816f42ff7f91314dc40f717d6d983d4ddc24a4f8e67c564af48e3f192a50b514e09b5494ad833ad0d SHA512 c3c8b10d41e8b2a1e4f987d5a3c54f91e0bb79f4d87a4f8d74f44000922e3bedb2826ed62dc442fea2cfb38cd9790eb7ab5a71a7c8fcf40cece13fddba6bea46
diff --git a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.960.0.ebuild b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.960.0.ebuild
index 2b51d53ae302..927349231453 100644
--- a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.960.0.ebuild
+++ b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.960.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl module to parse XSL Transformational sheets using gnome's libXSLT"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/XML-Parser-Lite/Manifest b/dev-perl/XML-Parser-Lite/Manifest
index b4b40777efa1..5533d9903248 100644
--- a/dev-perl/XML-Parser-Lite/Manifest
+++ b/dev-perl/XML-Parser-Lite/Manifest
@@ -1,5 +1,5 @@
 DIST XML-Parser-Lite-0.721.tar.gz 10303 BLAKE2B 80ee6b8afea85dac7bbfdd796d8e7388b99171a137d68177105a91027e263439932673528b7c163193ec7ca77278289bc28a58e303700dad40a8ec4ffefc8894 SHA512 23c0aa9363e87afc885e40bc92643c355a5e7be85a61b8f1d1e829a970538b2f0a9de6dd652387d4612528274da64e8812faa6328be2283a28675a6da09c707f
 DIST XML-Parser-Lite-0.722.tar.gz 9327 BLAKE2B 4bd459d668a4ef32875d78940bd22629dd15946c6e0c43bc95fd24d7e919458243052064144a4a6b889c857c23ff209c0036ad15f738f8f3cb424a38958c566b SHA512 44e70fd9f350fc4276bd0ded1255beea2ca7c46506b5fa38da21ca21d1bafd084f0cdf7671e0bc37edaa283cc1f10f076e70a9ec7fe00a50d3cdc1aa047f189a
-EBUILD XML-Parser-Lite-0.721.0.ebuild 899 BLAKE2B da11b8f49e730748d54263d6d0e93eee2553cb46cd3c664e3d7fd5b6d9dedd90244fa6612f6e568d3c2f3b132198af1bbb282496c482435016fb1f70ea3c34c8 SHA512 066041eead28f73fe442502753bc62f373b73c7892f20144b3398be9884dc29c9c873bdf8897f9fe245b106816923bade7a554252c073d12b5e535fb16a85ff1
+EBUILD XML-Parser-Lite-0.721.0.ebuild 898 BLAKE2B 156f8952e1f135d02302c0868848224303f5506bbda1da192c3a9342c8f150b9dba6663c8434e3132cf57d7d0d4a0ee8629a5e538101a97f8f13898a3d728207 SHA512 6a21dcba6d4951a4177158c6d3c5c3d5e84e54cab4e9ad74ffc6c43670f858b71f51df293e56f1af11b17c4928f8bb1e5d1c82cb3290a21b71a5fc1ddcb36492
 EBUILD XML-Parser-Lite-0.722.0.ebuild 874 BLAKE2B 404d5c70b58ec033604a23c7fd4e256182fe5cdf7b76fa312507fa3f800ddd9c51225d4e3a8358f6fe32a59db0ff9a913a4206aef4c82e09f20782ed6376c168 SHA512 16317cc212197a8f4e76fa33feb840d32ffb34a37e134980fba9c300b5a6e4f8e35383ab147b696146cb7b7c18b2a208ed548ad22abfaf68e52311236878188a
 MISC metadata.xml 392 BLAKE2B 4c67c2d961ae4dfc9c992c8cf92dbecf10ae9d0ba604f3a6abaca7f0caf4fe3c289b9622e5e885bccd792bd8f73eff27e311c829c6575e450b1433ed316eb26a SHA512 f0e744b4d98091a10c888f4bfe09ecec5b94dbc345738e9f6effb7f50b7434e0bafc2b5a8c26ecb6b1e2006142ae0917bed22255d68650e335f240209557fcb7
diff --git a/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.721.0.ebuild b/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.721.0.ebuild
index 61d63e5b7209..910936c3a8ca 100644
--- a/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.721.0.ebuild
+++ b/dev-perl/XML-Parser-Lite/XML-Parser-Lite-0.721.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Lightweight regexp-based XML parser"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/XML-TreePP/Manifest b/dev-perl/XML-TreePP/Manifest
index 8481e460ceab..45ace23c6d8a 100644
--- a/dev-perl/XML-TreePP/Manifest
+++ b/dev-perl/XML-TreePP/Manifest
@@ -1,3 +1,3 @@
 DIST XML-TreePP-0.43.tar.gz 91382 BLAKE2B 2a7d89d6d5e3bcf965b001cf8e18465b1cdfdeb94cd96c77008beb16b559fc072bd24a5c954a12965e2a03d9707c372c779ac7ca1e2938807055e64f9e7ed077 SHA512 4289a0a8100ef15f62f0e303f13094371ac6f1b54d887be1ed7e2ea31d7f1f6fc28d4234cf96458074137f756db3fe452ded170d3ee576f7eb2cfc9996cc31d1
-EBUILD XML-TreePP-0.430.0-r1.ebuild 436 BLAKE2B 675f4eff509c4833770470088a21ba82ceb569809b40c934e3bda1a6d1976fad71b897af20260fd192eaca0332c87206e04b0608ed8d3066e96635a188031d70 SHA512 8993f76538b29dad64de5af2fd731ca7ecca20a7b7d9138cf2d93b73975c6afba8833eccc989494f1ef7cd342cc9c307ccf137d724eb8f12918ab214bc3fa844
+EBUILD XML-TreePP-0.430.0-r1.ebuild 435 BLAKE2B dcf0e9e75e9119ddeabd296ed5a09e976c80078c941277adb4145ed76bb4d0967efa3b0aa5dec85e998103c7baa0560c094f85bfc238aab07f7d81275d27f816 SHA512 2c4af420d9004521f0f01f0fd409e14066f27add0c1c0f4f537454da7e690a291dece4a219bf8861fd6c533ca41aa5b6787ac33cd1a5386e18ef7caf968de247
 MISC metadata.xml 465 BLAKE2B 05369279b4bc061484f0380009e4baa694d454df33f7d4a0f9aa3763de2d0f8c7e186716c9e26088f497d0b71a1b732ff9da372516939bdf9d7aa13e9073e4ba SHA512 617e2997812769baedf14728fbe4d910441d67da3ecf88d1a37760648af5c63c9cec2faf0efa5a135bff647317a5b262b177b76f1e7295ebe5710c4d4592e2ce
diff --git a/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild b/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
index dc0d3c91ce45..18af186f4515 100644
--- a/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
+++ b/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Pure Perl implementation for parsing/writing XML documents"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-perl/libwww-perl
diff --git a/dev-perl/XString/Manifest b/dev-perl/XString/Manifest
index 7003845f86b7..13e219e463c2 100644
--- a/dev-perl/XString/Manifest
+++ b/dev-perl/XString/Manifest
@@ -1,3 +1,3 @@
 DIST XString-0.005.tar.gz 134507 BLAKE2B f660122cb4363dff1912aa69907e003eef7da497ce95e3a377d7dacbde0887049167a98ea82927341337ba3a85e6f048c65018d979e71e6484f594a97f21e352 SHA512 4a6055e9e59169b77e04e8b890944b3a7bc4ff9844ad6b2557f7181f7b1c8576a7aab7ebee351044cbac8f3bff2d37dea2af4bc7ff775fbc3a398c9785c53aaf
-EBUILD XString-0.5.0.ebuild 270 BLAKE2B 4fc71f6a90f2c63111fcb955e60d5c285aaf6de77a03539dd1342a549b3e4a3e485b30661e7ad0aaa9086e28fdfc859540b5752f5fa47a61f30cce3cfcb52146 SHA512 f3357a1f8c59e54fc0f46f1f0a191cd7bd3e878e5ff74edcfa929c5c9c0ae34295f06da55ebc5a19a71818b7ee172aab5a242ad44ab775770f63a43041333e78
+EBUILD XString-0.5.0.ebuild 300 BLAKE2B 72206610124dba2ec24d405d1ff29f0799851235feff345d95abe4580f4601c415466c525f3a4ca579e0e57846f4df16960ad655c4d4f40e9943cb5489432a26 SHA512 248c1762a10a5da057ab4dac784e84535b20a653fec18443d98465c2d2cd59c282160fb81b0d6429a2d8c9567f9525af3d0b52634b5f65b0a4256a595cac3fcc
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/XString/XString-0.5.0.ebuild b/dev-perl/XString/XString-0.5.0.ebuild
index b09f5b42909c..81b1debc57d8 100644
--- a/dev-perl/XString/XString-0.5.0.ebuild
+++ b/dev-perl/XString/XString-0.5.0.ebuild
@@ -9,4 +9,4 @@ inherit perl-module
 
 DESCRIPTION="Isolated String helpers from B"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~m68k ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-perl/aliased/Manifest b/dev-perl/aliased/Manifest
index a84c7accc6b6..2a820d211687 100644
--- a/dev-perl/aliased/Manifest
+++ b/dev-perl/aliased/Manifest
@@ -1,3 +1,3 @@
 DIST aliased-0.34.tar.gz 30464 BLAKE2B 5d17d3ffb7b3fa4f5c143256490874809cf061eee774ae16dc4c48414e24dbdbed11c1356a4b072a4860397ce27b021385ceab2766c4e1174449d68bad101678 SHA512 65bc3f6401a0c2119105261112a3d9612abb98c874cd3409c6a1a9a0974aae902f30b6041121be6a74ee28584cf0c7ef506fe8318ab35ac550f70b4b387744f6
-EBUILD aliased-0.340.0-r1.ebuild 654 BLAKE2B 0a44399b7839ef91d103eb4f11beff81fb9026d3c11fa87dc4707bec29fce41b47bd413271b8258073485a3c7d00a3e54fc579f7121d930b2ca14a57b22fe5d8 SHA512 e67fcb68ec60c11a2258bbe274ad337fd5b7e0989d237d669b67366e5f4d2ff6863e60efd64f45e36014b24089db7cd6bf546fb07bd10c894a8208bc13a506ce
+EBUILD aliased-0.340.0-r2.ebuild 617 BLAKE2B 9105d87d188a8f0a632e3dcd5c108e2f69dc8dd2be3bad3d5eba555e6514d257b3507eafbd1ac539b7299e49c204e815f25015737eaece8ecadc17f92a794dec SHA512 97f8bf5063c2c70fc56dcc06009d3c6637b1ed120d8ecb6612ffb995ac2f672e417e55ee2c53309e44beceefc83f4b578a9810a0126b82fcf2434179119039a3
 MISC metadata.xml 410 BLAKE2B 0ed43b0ea206a622eb63cf1ea286be9ad23e32882b7c1d0d8c2deb0e9a476a94bfef7d5872829be4804fff7e980db9f6670af93350e0d72f9b67b5cd6b0fda19 SHA512 c93b0f9ee526a1914c23a3b2cf91d1f6c35996c7a2c4f3cf87715c2a2056671f1ffbc34d817319e9eadf20430ad65e20997447fafca478a94e5aa10069632556
diff --git a/dev-perl/aliased/aliased-0.340.0-r1.ebuild b/dev-perl/aliased/aliased-0.340.0-r1.ebuild
deleted file mode 100644
index 85f3edceb164..000000000000
--- a/dev-perl/aliased/aliased-0.340.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ETHER
-DIST_VERSION=0.34
-inherit perl-module
-
-DESCRIPTION="Use shorter versions of class names"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Exporter
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-Tiny-0.39.0
-	test? (
-		virtual/perl-ExtUtils-MakeMaker
-		virtual/perl-File-Spec
-		virtual/perl-Test-Simple
-		virtual/perl-if
-	)
-"
-mytargets="install"
diff --git a/dev-perl/aliased/aliased-0.340.0-r2.ebuild b/dev-perl/aliased/aliased-0.340.0-r2.ebuild
new file mode 100644
index 000000000000..7574aa97dca8
--- /dev/null
+++ b/dev-perl/aliased/aliased-0.340.0-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.34
+inherit perl-module
+
+DESCRIPTION="Use shorter versions of class names"
+
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-Tiny-0.39.0
+	test? (
+		virtual/perl-ExtUtils-MakeMaker
+		virtual/perl-File-Spec
+		virtual/perl-Test-Simple
+		virtual/perl-if
+	)
+"
+
+mytargets="install"
diff --git a/dev-perl/boolean/Manifest b/dev-perl/boolean/Manifest
index 6a002fa08b25..82c5c0a3bfc3 100644
--- a/dev-perl/boolean/Manifest
+++ b/dev-perl/boolean/Manifest
@@ -1,3 +1,3 @@
 DIST boolean-0.46.tar.gz 15552 BLAKE2B 285d48e9d3d9e69ff3d51981582362c1836d61e0c3c21da85c9b0f1e05fde311b3333f1521cb1b220f46e9e371375ea111ce3007097d5c0c31f6b283d024fe31 SHA512 910653882f501cbf9420d775a79a000c62632a98643ac5e9f3d99765652e7c8c073f251bc36f0b69c9b259762bebeaeac18376e78494977d912da538939bb296
-EBUILD boolean-0.460.0.ebuild 664 BLAKE2B 6d6061b0a4af7f98facbd16aeaf754aeb37e83468c2e73203ded7a8794c077fa34339ce098743818aac297c9d5c3fceb9307d070921ca8d7d9d65927ce9c1303 SHA512 6d29f904a8b33a7e73f88e6fa5cb488f34a929aefe275c5579e1956e461cbc1c7e7967d91de50b0b0a2222871092b052ab40e27f40d89681310b135afc74d5a2
+EBUILD boolean-0.460.0-r1.ebuild 414 BLAKE2B e0eb7eeb89f6bf385f2fdf33f739f75360251d455f442018ae0b0bd1d72d14bf53bbfd61f659703d4be9d4632733c4ef335bced930ef2a69f54420efe9fff1c2 SHA512 7f1a52d1663cf0afbe6dcfdaac94055909b8fe8782c9a94f6d34034a048fa90bb9bd2d02b8755ddecc1e83c34ae3abdb6afc4906b0d3fe1cb7872e73699e9467
 MISC metadata.xml 386 BLAKE2B b59b2c4b8daadea04402f8c7cddaf3e03dba58b1b174cd215aa4f245ca526afdbc53b61eac188c1f1e6ab2c412c40ca1da633a4f5dd2e320743b907a78f3fa23 SHA512 17a4be7d55e0329fdba7127fb3d95e506677a02fb461109dbd2f3e7a8d14e61af4fc4a4d37c00d438e108746cd8d6165acaf32b11b6f8c358df0c4da6629e59e
diff --git a/dev-perl/boolean/boolean-0.460.0-r1.ebuild b/dev-perl/boolean/boolean-0.460.0-r1.ebuild
new file mode 100644
index 000000000000..67abe487f03a
--- /dev/null
+++ b/dev-perl/boolean/boolean-0.460.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=INGY
+DIST_VERSION=0.46
+inherit perl-module
+
+DESCRIPTION="Boolean support for Perl"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND=""
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( dev-perl/JSON-MaybeXS )
+"
+
+src_test() {
+	perl_rm_files t/author-pod-syntax.t
+	perl-module_src_test
+}
diff --git a/dev-perl/boolean/boolean-0.460.0.ebuild b/dev-perl/boolean/boolean-0.460.0.ebuild
deleted file mode 100644
index 83d189f3cc10..000000000000
--- a/dev-perl/boolean/boolean-0.460.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=INGY
-DIST_VERSION=0.46
-inherit perl-module
-
-DESCRIPTION="Boolean support for Perl"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-src_test() {
-	elog "Install the following dependencies for comprehensive tests:"
-	local i="$(if has_version 'dev-perl/JSON-MaybeXS'; then echo '[I]'; else echo '[ ]'; fi)"
-	elog " $i dev-perl/JSON-MaybeXS - Interop testing with native C JSON Decoders";
-	echo
-	perl_rm_files t/author-pod-syntax.t
-	perl-module_src_test
-}
diff --git a/dev-perl/common-sense/Manifest b/dev-perl/common-sense/Manifest
index 0007f8a3a979..0b2e218a229f 100644
--- a/dev-perl/common-sense/Manifest
+++ b/dev-perl/common-sense/Manifest
@@ -1,5 +1,3 @@
-DIST common-sense-3.74.tar.gz 13002 BLAKE2B 234f86e1d51d650c43be0e79f1e87f24f07c529fc7724084fdb75048e3a7295961131dc108bc573e8d3ca757e6b51c657426adcfb800afdf8ded3d8bf86a352c SHA512 658ad70a2d1bbd0b26f91c4ea5d69b4cc0b632ede9532b88282987002a5e280f0475d63ee846b7bd2d38ef82f2680e20c2093803e4b62a984750ed447f318d60
 DIST common-sense-3.75.tar.gz 13516 BLAKE2B 0b790ff1d9295f2bd0c70ab172f99ede8686012745d12142775c22df8d5c13b62a32f2d947effb87a214398bae816092e73a390118020ccc18e124465d893791 SHA512 cb6034d9ff721a4122e0215db8ad5279ec4b189c3364593d427d70a1e84a1583a0e1447e276aa9a4fcaeb2f9d47a465a5bc4c0f842c803d3ddf91755311f4af4
-EBUILD common-sense-3.740.0-r1.ebuild 486 BLAKE2B 55629e7d923d428d109068d421843bed2a8b7d8d321b147047b416d8cfde123744762c9456a19630b623dc6023a38b313a5fd0000cd217c518ad0cad34d280cc SHA512 70b46ec57e7b8d710ea16266eccdaa2867c7b36fcb6534da3109660b79816e33409a1a3552908dbb9fcabf3df4dde7eb3224af1dca20f70e860cb4fc6c58e420
 EBUILD common-sense-3.750.0.ebuild 479 BLAKE2B b88c0c7e75b9712b2271306e7e7c72b2d3dfc137fb118a26bb4912f510538309ed3c2ca6c16bda20209f70761644ab8708d81f0105426a3eda2ee30bfef8a190 SHA512 02416566de6cc327fb336d6555d3ded242c84033c097cb669ee8d63135050942216a6574063d19d2b206d62ba3346317a1549e20081bf1a32a538011e9c729e8
 MISC metadata.xml 397 BLAKE2B 4541a42c916c19722a97c1df0437a00b0cef84288a4be7326fdc952f130bb6669ee500a0c1bae3ee13b65f157ee5ce06f2b6d07ee09c7ca375ab87e595fe4f82 SHA512 2618a40475e812d00472ab9e4a51518293b1a42bd70a36b4d991eb406c70bbcaff65205a591fdf897851f87fdb46a3ba08127f75e638750085c38f2790bb1ad1
diff --git a/dev-perl/common-sense/common-sense-3.740.0-r1.ebuild b/dev-perl/common-sense/common-sense-3.740.0-r1.ebuild
deleted file mode 100644
index 48364281e566..000000000000
--- a/dev-perl/common-sense/common-sense-3.740.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MLEHMANN
-DIST_VERSION=3.74
-inherit perl-module
-
-DESCRIPTION="Save a tree AND a kitten, use common::sense!"
-
-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"
-IUSE=""
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/gnome2-canvas/Manifest b/dev-perl/gnome2-canvas/Manifest
index 1a1a489d3f7e..2ae88e7f1cb2 100644
--- a/dev-perl/gnome2-canvas/Manifest
+++ b/dev-perl/gnome2-canvas/Manifest
@@ -1,5 +1,3 @@
-DIST Gnome2-Canvas-1.002.tar.gz 62040 BLAKE2B a172b5b23eee3016fa955aabefe715127f5797d6626f37dd59fea14f51d52cf672b9f13413f7b64098d83dc5858f6a9d8fd27c5b3165988063907cbeaf4dd178 SHA512 9ad7e5b5a29b1b90cecca56c63165b92ad607a6f6e260810c597081a77a282910e85d372271d2f4e299e8e0728b79733f39439e3927237a92b16251d7004db89
 DIST Gnome2-Canvas-1.006.tar.gz 63156 BLAKE2B da080e18b75ae275f32dc61421a1d069456ea79c362616d47f4a89e5efe64a9a196f6a7ae5e547d2fc2c40d358adf2ddf8385a4f57ba6264754f5d5e7b95439e SHA512 1de13983f6e64880ebf202ecc6017414882e5f30da2f4de64534bbc9b06c846e60b07a8f61157c547093edc748a5b0d1cd44562401e8cec0d7f429fb5c5e754b
-EBUILD gnome2-canvas-1.2.0-r2.ebuild 629 BLAKE2B 09d290c8081392864e8d847841a7170f25f1df14fe3ed842ba0efe9417af8f2bc8bf8590441984a9495c33158da77186f55b5db8c0c96937c2509bd83a017580 SHA512 c7b88fc8e90c1466e584cec1394682d508a099cfdfffb8f36c5e5c7bd8b7896c8740f7f52488471b0a840f0b7dd329022410c4a0a31744113749c71f233e4fe7
 EBUILD gnome2-canvas-1.6.0.ebuild 651 BLAKE2B bd8fdba5ad5ab9e8a55f64096b237c17cb804005c0b86bba0654347378a8ea15bb294b0a6b99d68603fe0a7779747e0706bc639d2dcdbaf1e31131a329d7e621 SHA512 736f35765d3fb6e96807a6d00bebd21240c5b7944b319960c40503fde60d8c0d0b23c6f39299a96f8147a75da7b75c20e81cb34697ff0b88a172f76b301f3ba3
 MISC metadata.xml 399 BLAKE2B ca74c13922b89baa45c923896debebecb02c23c1146cb346e4d9ff46a19cd77e0bc45bfa44ede00b7eee478d46fbb80de7b154049eb16e4e4ea4f2aa07804624 SHA512 1b7f6fbf7b64d6f73bc91611dfe4870b211a73d6b61f168615d2dafc3c452bddd605f504ad4483bcf413640ff7e5ff95584f302ea0935117b5a0390635325c53
diff --git a/dev-perl/gnome2-canvas/gnome2-canvas-1.2.0-r2.ebuild b/dev-perl/gnome2-canvas/gnome2-canvas-1.2.0-r2.ebuild
deleted file mode 100644
index bd76c78bb5be..000000000000
--- a/dev-perl/gnome2-canvas/gnome2-canvas-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Gnome2-Canvas
-DIST_AUTHOR=TSCH
-DIST_VERSION=1.002
-DIST_EXAMPLES=( "canvas_demo/*" )
-inherit perl-module virtualx
-
-DESCRIPTION="Perl interface to the Gnome Canvas"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	>=gnome-base/libgnomecanvas-2
-	>=dev-perl/glib-perl-1.040
-	>=dev-perl/Gtk2-1.040"
-DEPEND="${RDEPEND}
-	>=dev-perl/ExtUtils-PkgConfig-1.03
-	>=dev-perl/ExtUtils-Depends-0.202
-	virtual/pkgconfig"
-
-src_test() {
-	virtx perl-module_src_test
-}
diff --git a/dev-perl/perl-headers/Manifest b/dev-perl/perl-headers/Manifest
index f1e6a726eccc..40d1c2e3ee62 100644
--- a/dev-perl/perl-headers/Manifest
+++ b/dev-perl/perl-headers/Manifest
@@ -1,4 +1,6 @@
 AUX README.gentoo 1175 BLAKE2B e498f2e1d6412f8c0454081395fcdaf995b9f79e373ab3dae7ed3183622b2db8bc18ea46e29f07a55cae92b0a0c468a24065c66f350292cab1d7b7747a079e35 SHA512 572e519c4f8ff15865c9e42f1df6941ea5c20b86d75e9a5baf9ac5fe42e1e769c3a440c310170c9cdafcdd113d4eeb079e605c22be2bc46bae98d84b5c9caf0f
 DIST perl-headers-0.0.1.tar.gz 2141 BLAKE2B 48f32c486427c30d7eba06d103a9e72d19f817dfb2a55db6aca1e28670cf03d4180dbe6e5b3031133bd517045b827bb76d085dfd786a1263dc1773fdcabb210c SHA512 a9a44a957d863c6d99c0facb324a32e3fee55ec50e34481dbe37c09f6afe103b0cae234ca83d4d591a01d1e620d262b0e9beae53001db1fdde885f9a57234c7f
+DIST perl-headers-0.0.2.tar.gz 2153 BLAKE2B 0d3ded4fa0eb778bb9d0d0ccc8df6b1a94b07ba27879b8ad3dcf28ce8661d6486839fd2c3c2eea93bf2268023cbb9c88b060a4775301560c793627a911183820 SHA512 7524ffea75039d67b1ee9b3b7ea27648de3256102ca433061caf8f41325393e2b69a53486112481d251ea9c10b7a157833dab949522184cdabf0645068c2d6f2
 EBUILD perl-headers-0.0.1-r1.ebuild 909 BLAKE2B 48dbb05f501e086c0054f1d99fc18b0b8b42cd3fbb118514d9a969e6ac79f8370db24e10cbeb19e7bbe05d445d1b8368a52fd0c3ade00dad6942d23c1ed51d8c SHA512 48daa1ca846de96f3653d80f333ac34eb57e89bfea1cb79d327fce494eae000fb353eae5bb8c161eec1170c13c38497f0df957182cf6676ae22748699afb04e5
+EBUILD perl-headers-0.0.2.ebuild 909 BLAKE2B 48dbb05f501e086c0054f1d99fc18b0b8b42cd3fbb118514d9a969e6ac79f8370db24e10cbeb19e7bbe05d445d1b8368a52fd0c3ade00dad6942d23c1ed51d8c SHA512 48daa1ca846de96f3653d80f333ac34eb57e89bfea1cb79d327fce494eae000fb353eae5bb8c161eec1170c13c38497f0df957182cf6676ae22748699afb04e5
 MISC metadata.xml 602 BLAKE2B 9ce6227ebae61f7841bd05fa3d1b647ee1cb91ccec0cf1962f4c0e8b8018ad07ab88a1be9e04bbda14c39ec3581857d85eaed90e5c25addbc4c519e44ae19685 SHA512 18226a112c8b7706e37c1deedb0c9d37bb73ddafce2c6daedf853b59ba8f99b5451e00c1a93eed343bddb15254ffb6221f57b64eadee4f4b0c1ac0bc44a9d727
diff --git a/dev-perl/perl-headers/perl-headers-0.0.2.ebuild b/dev-perl/perl-headers/perl-headers-0.0.2.ebuild
new file mode 100644
index 000000000000..82dc37389170
--- /dev/null
+++ b/dev-perl/perl-headers/perl-headers-0.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-functions flag-o-matic readme.gentoo-r1
+
+MY_GITV="${PV}"
+
+DESCRIPTION="Generated .ph equivalents of system headers"
+HOMEPAGE="https://github.com/gentoo-perl/perl-headers"
+SRC_URI="https://github.com/gentoo-perl/${PN}/archive/${MY_GITV}.tar.gz -> ${PN}-${MY_GITV}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+debug +sizeof-warning"
+
+RDEPEND="dev-lang/perl:="
+BDEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+"
+
+S="${WORKDIR}/${PN}-${MY_GITV}"
+
+src_compile() {
+	use sizeof-warning && append-cppflags "-DSIZEOF_WARNING=1"
+	emake H2PHARGS="$(usex debug " -h" "")"
+}
+
+src_install() {
+	readme.gentoo_create_doc
+	perl_set_version
+	insinto "${ARCH_LIB}"
+	doins -r "${S}/headers/"*
+	doins -r "${S}/appended/"*
+
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/dev-perl/perl-ldap/Manifest b/dev-perl/perl-ldap/Manifest
index c530dba160eb..390e6bb27328 100644
--- a/dev-perl/perl-ldap/Manifest
+++ b/dev-perl/perl-ldap/Manifest
@@ -1,5 +1,5 @@
 DIST perl-ldap-0.65.tar.gz 311145 BLAKE2B 6fe285804a39d6b93aa77b1ece65708e8b79f86667e9ee24bbfcbe12d9f2b3065360e6ca65d2641512226645cdbe4033ba4a20cb400fa44a42245167f83ab8cc SHA512 567de41fc1e659de23b4ae7b6cec5a60df0ad8bc90062158cf83f90d3729ac27a8bacb276b732931fefbf33847fe1baec7a62393aae5978f3c55c6c602f93747
 DIST perl-ldap-0.68.tar.gz 318199 BLAKE2B 1026b50d9c1b0da54205e27b75e76ba34bd89fb173f000784b003f94a6df429ba75105fabbb381f18e2475c0d788834391bbd17fec77ceb6e6c076813e686a40 SHA512 9b6260ac997c3279585745571f7d825aac956f157aef5715f13efb118723379aa9c838fdc123e2932047b28b38ebc2261ebe82ae1ef6a1f383b775d748ff18c6
 EBUILD perl-ldap-0.650.0.ebuild 856 BLAKE2B d4704fc894b6e36178cd7468bbe08a23b9ced2e8505452fd33d3d86f2f61dc1fd7870cbcb4ad6db5d4cc9cd266383ce56a153c89bc9d514cced17bc980c37e89 SHA512 522d78702241198d8950c3162ed97f8efbe61b08c9da20742d5d36a8a329adc147945c70b66fb4a0e4f1fe7cbcef48f65f257cf64c79971db0eb7c8b617d9818
-EBUILD perl-ldap-0.680.0.ebuild 699 BLAKE2B ac5af3a4dda8bd83a757a4d516eb7f07201c4db5f4f4ff7694aff908288d45403b8d0ef80762da34c32e62f70efc586373275b3a5d99ad0ad529f22a2d2cab8d SHA512 3bfcc0ab39decf0f9be58dcb8b1ce97ec6cb238bb2152880947c658c5de82bfb28662c2f554f4c120732ccb231bc1b74b014797dee9b85597fc6961d1a3c2b09
+EBUILD perl-ldap-0.680.0.ebuild 692 BLAKE2B 9caa5e2c92c048341828184154e8db1ca92e04b23534f8d0b14be1e1b0363d383b84f22e2cc3a0dce6cd74b0b587aa5d6089295804f0d9246d7239e4ebc99001 SHA512 912a2fd6c098ad67c8a3232bde1f6fff53fa6e3a19e74ba84a22f418a2cf281ea32f1e06543fee98f80a74832e010e5a3dd22fa21e9572878907421d72141808
 MISC metadata.xml 3956 BLAKE2B 452e7f1f2d4daa3d9095e3e1136cf61cc31bd32fbc266af815f73684d1d419e8ec75bad3d53b314c060629115f506f8819fb992cb260de0c2f1acf612fdef6b7 SHA512 1a19529b399dc98d84a3d7184048c530637b4864edfe358d129b9df2d4a132b573d986e16465decff4a12c7eef9c60dcbf9880e2b418318d59974d81cf80171e
diff --git a/dev-perl/perl-ldap/perl-ldap-0.680.0.ebuild b/dev-perl/perl-ldap/perl-ldap-0.680.0.ebuild
index 8e2f8f6e92ff..a053ff0f7808 100644
--- a/dev-perl/perl-ldap/perl-ldap-0.680.0.ebuild
+++ b/dev-perl/perl-ldap/perl-ldap-0.680.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl modules which provide an object-oriented interface to LDAP servers"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="sasl xml ssl"
 
 RDEPEND="
diff --git a/dev-perl/prefork/Manifest b/dev-perl/prefork/Manifest
index f19c6b37eeb2..68747131bf97 100644
--- a/dev-perl/prefork/Manifest
+++ b/dev-perl/prefork/Manifest
@@ -1,5 +1,5 @@
 DIST prefork-1.04.tar.gz 29059 BLAKE2B ecb9d18c3f06838015209225b6810654b345a5897eaa87cfed4066d17cb227353355926291ba7216d3ee0d27f80e0a7ab838a8461bc9dd8c2035fded3f568679 SHA512 80fd65f9255116cc54421000557369e4d852444d921a1ef4dadf12a7ad4bd06e641787e57df57fc0180be092d3ca546e42e9ec03cf59d0170db1197140613f54
 DIST prefork-1.05.tar.gz 28458 BLAKE2B bb1d7fd7359386ec371c062588f003ff30cd5a042390791ff774ac8f9c7edc1cfc8474679a974de8776a871bba71c73c7f76b2f084fae337624e7c446c331460 SHA512 38185a8ff3016a562b4ef0db8c4d6bb065ca1f2f6f661700aff2727c80b45aaca84b5ab23a8e66ce3b65c9b418e85fb65eec982e27fec847a4d939f4385365c6
 EBUILD prefork-1.40.0-r2.ebuild 776 BLAKE2B c3461a17f7edf611a9f28096972f8336e4cab6515fd8519e649f4fb16207b37a933f0d3ccf300c9ee4149198c04ab0541ac8e52d13dc44838bb9c9803cf37c59 SHA512 31d24f154a03b722d685c8c0d18a1734692c3e28b3b9d81a6de0c9e682395c6b5956fc17628d00756194b0a2c324f9de131fce6ede47c94b1be20465496da04d
-EBUILD prefork-1.50.0.ebuild 547 BLAKE2B b7e3789a67a7b9c5410f8df0cd58039f5570af3af3f27905edddec5d6e3fd0989eb5fb4b39338db3734fcac7c687ddc9b38b8b2dc8c6ccd0c9f2dcfb18d232e0 SHA512 e5ad481e3532bed1f1f8b84de2531e36e5d421eefa98c42567962f044ccc385d2aa6d83cd61aa1f5e5b7a7a771f3e6c2e08c7088cbec90b84d5c5e6eba8d792c
+EBUILD prefork-1.50.0.ebuild 542 BLAKE2B ca920867ade0ebf2f05a9e8f2f878e26952da5b6ae65072e20ce8131eb9bb7d2f643a04e85fbe298f19e7691d8877781df3eebf7b80795af13b4cd3aabd248e3 SHA512 e2475fbb9a92842958df46eba8bc50d3f07dcb5510d697725e8dfa16cd6f8ab7e6f7a710250f5c751a40d39c748df45abe3001db45ce6219d3f8a842ba6dad44
 MISC metadata.xml 386 BLAKE2B c834e42b8b0c5c9f69359223da7280928e70445ac25caba96342969c65fa9b2bf53cecaf1fe58d88759cc29c3df8c314824f833dd648e376c0906c6c3ddd3949 SHA512 d8c71edf0222ef99219135a30a9fb81cc40c5c96badc57537bd96552031639603e6b8b2ebdc8ac2197138b72cd92aa17b9fa947cf7b018098673a7f14c9c93aa
diff --git a/dev-perl/prefork/prefork-1.50.0.ebuild b/dev-perl/prefork/prefork-1.50.0.ebuild
index 1c680f3d037d..8f6b1b2a715d 100644
--- a/dev-perl/prefork/prefork-1.50.0.ebuild
+++ b/dev-perl/prefork/prefork-1.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Optimized module loading for forking or non-forking processes"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/strictures/Manifest b/dev-perl/strictures/Manifest
index ce934f0a2bcc..5bded389bc9b 100644
--- a/dev-perl/strictures/Manifest
+++ b/dev-perl/strictures/Manifest
@@ -1,5 +1,5 @@
 DIST strictures-2.000003.tar.gz 15319 BLAKE2B 3158e92282de5ca2bea5c7f79de3c6cf4e49d3641fcfde91ffedcfd291f102f7a61918136846bd6923abe557c2484db57b5b0692d93231f6f73c7aeb8854dc00 SHA512 c187a32f70c2be97cbe783e700d54d1e7b7ce7a8ea0b5ce72851b1efbe9b64121fb4b626463c4c62fb384893e4e3102afeaa21cd3e500fefc61c5b4b3924d21b
 DIST strictures-2.000006.tar.gz 22508 BLAKE2B e2d4a5aedb415473877838fbc43e176a8671c7be85b2b8090d6143b47cdd6bdd04b6e50e99e089c2459ef75027f9a5263ed4cb2f8a5024824b595e0cc86a397d SHA512 670857a491fa58b85b10ee3bb5c6b7be845798926327ff3a32a9b78cb86bbbb95bfcc358983ece766dc8ef19a1eae12091ec9d9a7fef6d3f5d44ee4f8c04b7d2
 EBUILD strictures-2.0.3.ebuild 666 BLAKE2B 370aa7cb9db7edd0459e911d1e00e0361a78efb6fc12958b17370d1ef61613c0952bc2b1604f0ce50269ff9193f48e527931e6480d3b90599ae05811e73e7710 SHA512 390fb85dda8ebaaa1323c566fc50661c8c09646c361e7056a5958f40771cdd383430d6a1bca23d3172f19c0ef6c0609c9c3f50b97842aea3deb60800ded422fb
-EBUILD strictures-2.0.6.ebuild 640 BLAKE2B 44148d4b1500d5ac1d9b4facb53573c5ac29769a68f5eb9ee8bd4d7632e00956822a1d77f1e583d0e078af134631ff3c7109a39a6b7ee4bd07352fa057add823 SHA512 e8eb52873a0d87172d4c7c0e7b58e04aba369c2055a146820a883fa7fa6bd2acd08c578c2748c1efcd6fba393c4e2e99aeac12ed07000b12dbcca592d3a49260
+EBUILD strictures-2.0.6.ebuild 635 BLAKE2B c0117620c4bad7e0b9642b53536f65646ef2697782aeda39b54ad432135e9527b84b457036764d3edbd32eccc6283991a5679556b86eaa08f71816501d3d7e07 SHA512 b0e5592dac834575231f6cdb8d11bf2f1294328f7c1f9031cf1358b589e00b2c9c2a79789939a7811e3e6d52cccf350082bc56e674c0c7fdae3051971e047be6
 MISC metadata.xml 442 BLAKE2B 6c456c7a0d95c0543931362c942449c1fdbb472c9dc8ab7bf8afb4580c32d223db051a0e6ac8df0251e5369d2521b9497bf690e8616ebd0c6bf836934d9a080f SHA512 341bb487e498d61b9a9ce94ef91e79943e2bf609404b7f2c41be246f07f7007f01ce1e8b4c3d28f8510318ac1d258930fd1949bd8614c29e2e38f092a2eeda29
diff --git a/dev-perl/strictures/strictures-2.0.6.ebuild b/dev-perl/strictures/strictures-2.0.6.ebuild
index baa9f301155f..5ed73283f818 100644
--- a/dev-perl/strictures/strictures-2.0.6.ebuild
+++ b/dev-perl/strictures/strictures-2.0.6.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Turn on strict and make most warnings fatal"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 1d699b84321c..e02c5dae2c29 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PHP_CodeSniffer/Manifest b/dev-php/PHP_CodeSniffer/Manifest
index 5479320aad65..aeb0032354e7 100644
--- a/dev-php/PHP_CodeSniffer/Manifest
+++ b/dev-php/PHP_CodeSniffer/Manifest
@@ -2,8 +2,10 @@ DIST PHP_CodeSniffer-3.5.4.tgz 697668 BLAKE2B f5915bcb73c0db0d8dcab3eda5ab647268
 DIST PHP_CodeSniffer-3.5.6.tgz 706080 BLAKE2B 1d9d097e7c60f520973a0dff16e6b31c9e259599ded3f58ac6dda2f10419969b03c18d1ce7c38f19a0f3474b0d5cf4afc5abb889f820da0d5d9e8f0574a0a354 SHA512 392c162cc8cb8d8fe455990d7f358cc59f486d8083387dc3bf60af6ca7aa0e75b72ed337f624b08948d8060cc96bd2d03373b7508fb9179da6a4e6b83adf06a7
 DIST PHP_CodeSniffer-3.5.8.tgz 716472 BLAKE2B e56efedc07a9db63eb2f135d9fef69bf055cef09c23dd9cd1e0efeed865d559b428e9aec06393b1ec1f58d32add92b2773c3d9ce33377f2441de0145560045a8 SHA512 69ef3d86520f541f492c955bd8158664c78aac6ecd4550f2b996f59d882d91f1bec81da9bbd106edc35c4f1a4c260ef2d9a56ec257fc0b4044047b902403065e
 DIST PHP_CodeSniffer-3.6.0.tgz 762998 BLAKE2B f83626a2a64dbb5c7ae2545368f1efdf74d87630720efe7466d9adfd6591cbcc95f2b74a17f54a935377519c6d909ba17f4056fff6d8f3870cefe782f32675dd SHA512 09c98ac460c6dc70637d2f4d81a1e46bdf742ee14d0b56032e8dbcaf7a0ff03f3fdb1abdf8144f664a33298cf397c732ba62027bcee41f1f4f740d12fa29f6a8
+DIST PHP_CodeSniffer-3.6.1.tgz 773181 BLAKE2B a85a0008fe9788bb48723fdd6a62d646a70bb342099693299def9320ca12971c48d8bc698e001f3249e8bb94963735c57529fe2d3101d53ded5ffd0946e07d4f SHA512 4992a460494cf58e5731e10df216204842168465731c0d002b7913fbaa85370f01077f70c96b4390158fbcf52ee021650ab6f13609ea3133370b89f34c73343c
 EBUILD PHP_CodeSniffer-3.5.4.ebuild 1502 BLAKE2B 02a3242341c9006a02cbaacff2a5f4b4eb6cb0d9b680c8ba3102316503c7bfb0bcc7be7799fcf4134991010f94ced0cd15c7b8e468c84f707b2904fa64a8b57f SHA512 c3cc91615ce68a44868765c66a8b6f45bcf93e8ed79f74ba9909249797b79c18565baac9ee98a0b1941fdd0a081f568c6a64a47d1cc328346585e0896f909b19
 EBUILD PHP_CodeSniffer-3.5.6.ebuild 1445 BLAKE2B a7d29b2211a6db7ba565908923e1bfedf6cf4f97d0f64374a34237ff854f3c7a1f29182c41a1b1199ea6de8337092af01eefba5f760c211e8e8df21ec10f8f6f SHA512 2ba7d933623e6d552c1676ff2a8e3b8cd407be3e365921b24a0cbe56875883d951cda7d9afee7dee044403ca94de6ab2f592c18337e0af4ca16fa950b6b381f3
 EBUILD PHP_CodeSniffer-3.5.8.ebuild 1450 BLAKE2B cf406c2ceb6ee7cc5556cce50962e30cc185f62319d9407264077bffaa357bf9aeb4b5440a8edc85c2bc1496f654f1c8e734e81367b17fb4356e0571dcac90d6 SHA512 5a94e1232ddbc0ecdcce41f016a7167405b8b71c309a18833e429a66939f8dc6fb076842c40a0e407ec2927aa2a106d10ab0bd57bad8d3abeb3619666096d271
 EBUILD PHP_CodeSniffer-3.6.0.ebuild 1450 BLAKE2B cf406c2ceb6ee7cc5556cce50962e30cc185f62319d9407264077bffaa357bf9aeb4b5440a8edc85c2bc1496f654f1c8e734e81367b17fb4356e0571dcac90d6 SHA512 5a94e1232ddbc0ecdcce41f016a7167405b8b71c309a18833e429a66939f8dc6fb076842c40a0e407ec2927aa2a106d10ab0bd57bad8d3abeb3619666096d271
+EBUILD PHP_CodeSniffer-3.6.1.ebuild 1450 BLAKE2B 351eb4e4a1bc7472fd5a2d5176afaf3aea701a7aebc05dd3bed60e3787c69bfce16df7a547afd6496a4102e1d204015d6c780ba25b2f2602ae678b089bb320fc SHA512 d4f797a6b7b1e66111ec7de8e9b59e803a2c658d21979d2daf594a8546dedbc168a5ca75dc3dd4866fac313c1731a5aa9460c07eb65448666440768296eaa098
 MISC metadata.xml 330 BLAKE2B 0a4e2c0281604b3efe374d6992ed4db4f09de41485f4f809a0a24816f912e309b5ffa40b1944cabd02f62c249e33f61bf2a2090ca7c177642ae09c764a8247b3 SHA512 ff907fb6875c3b43e5dca7fa9a0799d66d0993c6232550053b61568abd541c12e6bfbfc6073bd238e77156b8e7029e4767a310793dc1ce5cbe6ceedd424b519b
diff --git a/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.6.1.ebuild b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.6.1.ebuild
new file mode 100644
index 000000000000..f15c9ff98ca6
--- /dev/null
+++ b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.6.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Detect violations of PHP code standards"
+HOMEPAGE="https://github.com/squizlabs/PHP_CodeSniffer"
+
+# The test suite isn't part of the Github tarball at the moment. Keep an
+# eye on https://github.com/squizlabs/PHP_CodeSniffer/issues/548
+SRC_URI="http://download.pear.php.net/package/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/php:*[cli(-),tokenizer(-),xmlwriter(-)]"
+DEPEND="test? (
+		${RDEPEND}
+		<dev-php/phpunit-6
+	)"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_prepare() {
+	sed -i "s~@data_dir@~${EPREFIX}/usr/share/php/data~" src/Config.php || die
+	default
+}
+
+src_test() {
+	# The test suite will fail if date.timezone isn't set in php.ini.
+	phpunit -d date.timezone=UTC tests/AllTests.php \
+		|| die "test suite failed"
+}
+
+src_install() {
+	local MY_PN="PHP/CodeSniffer" script
+	# The PEAR eclass would install everything into the wrong location.
+	insinto "/usr/share/php/${MY_PN}"
+	doins -r src autoload.php
+
+	insinto "/usr/share/php/data/${MY_PN}"
+	doins CodeSniffer.conf.dist
+	# These load code via relative paths, so they have to be symlinked
+	# and not dobin'd.
+	exeinto "/usr/share/php/${MY_PN}/bin"
+	for script in phpcbf phpcs; do
+		doexe "bin/${script}"
+		dosym "../share/php/${MY_PN}/bin/${script}" "/usr/bin/${script}"
+	done
+
+	einstalldocs
+}
diff --git a/dev-php/ca-bundle/Manifest b/dev-php/ca-bundle/Manifest
index a5eb3f385976..5aa07865c53c 100644
--- a/dev-php/ca-bundle/Manifest
+++ b/dev-php/ca-bundle/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 268 BLAKE2B 0b6618f45d1a4e03a317ea55b4af12c60c43f9eb98fe9b3cacc45e5cf505530cc4e332d5289365956abfb3eb882b3447d19919b5116d249d727b0c934f272eb3 SHA512 186ccfc3ae6669722d01948c266a9c0518e1da228095a880695b7de6502c9798203019622cc0c63e30fbf7abe94aa988b7c694bcc98522e04298aa90217b8ed8
 DIST ca-bundle-1.1.3.tar.gz 126613 BLAKE2B 6b1013c2544f8795a4d054c6807cc2a2c51d03547f0d404def311d7edde9891f27ca1a249bef90e10f129a85f0dea489e1fc933b4c5f3bd8213c3428dba588d2 SHA512 b3e1f6bc9196b6c70476a7b656fb3dc4d398cd033d223b436d50676f228b62b561075787df36b880b7b4eb7de677da19d3e597752f88f279279b8569cc865a5f
+DIST ca-bundle-1.2.11.tar.gz 124268 BLAKE2B 537128647522c00a8ab3d445bfcc27648c4257a9f9ed82d489e4a2324d3123db86c1eba311b723f1bfcb6271223c7c36ad43863b5fd7c3f18ce0c92e7e064555 SHA512 96cbeb00a6770ada746288e01359bf2865cf8bbf80bca64d666b6c18b7103185b18a4c343bd170495576d871b37c5b59f334124f827658b6065462f7946554ff
 EBUILD ca-bundle-1.1.3.ebuild 547 BLAKE2B bcaa79c70e881a68b414559da2ef8afbbdf9ccc620205df22f5c80a3f907e09d79f9d7eadf78eac9c77b6ac632536f37c8806f0c5da980da76658f5408088d8d SHA512 b88506a7800d36434b2a9c9f64ecdd4cecaea2f50ee88bb326a4f480da66b8f1e05d4b6bb8befbda22972c80b6981c28186ae12c19562102276de4bfea01b139
+EBUILD ca-bundle-1.2.11.ebuild 547 BLAKE2B 0dd394f704ac0922b8925caec28085e578c184d17af169b83ca06b314dac9ca11d16894c6a48ac85786185d2381c522e8abb6578870dc11d4bbf845e98cdd74d SHA512 b28e4fc2fddd4ca8c90337d47cfeedf54388fd0e409683083540304a382913df966341d3b1167c55c6320ce7ea272f0968f919640b1e38a25d19b7523c324610
 MISC metadata.xml 874 BLAKE2B 7a79033100c420d679ee1bfb5252c78830e946ae4576aca01e67f32bb663277112a16fccb73f24e6e62f60ec7605bda3c1ee0bfd3cee495522adb4d1aac0842a SHA512 b2f3c3c9771a18dfcb71441b061b664f958d86cd561db026ef5b0f50c29f5500956f877056bea19076d8dce75b82808c56dbc1db1ffc0a4497a89edffcef00a0
diff --git a/dev-php/ca-bundle/ca-bundle-1.2.11.ebuild b/dev-php/ca-bundle/ca-bundle-1.2.11.ebuild
new file mode 100644
index 000000000000..d430bcbd1dd5
--- /dev/null
+++ b/dev-php/ca-bundle/ca-bundle-1.2.11.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Find the system CA bundle or fall back to the Mozilla one"
+HOMEPAGE="https://github.com/composer/ca-bundle"
+SRC_URI="https://github.com/composer/ca-bundle/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader"
+
+src_install() {
+	insinto /usr/share/php/Composer/CaBundle
+	doins src/CaBundle.php "${FILESDIR}/autoload.php"
+	dodoc README.md
+}
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index ec161bb7827f..076d112edfbf 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -9,7 +9,8 @@ DIST composer-2.1.3.tar.gz 514147 BLAKE2B 3abf64aceea5b95b72419b60fc74d23e42c652
 DIST composer-2.1.5.tar.gz 515243 BLAKE2B 078b14727aba1d6278e046e0a1a7b90edae6532ae5874093824db39bb10a0f663543944fe0bb17ddad3dbf40736eef1bb1a8049f5e4dd557f6f01e0d854c213b SHA512 cd4f166d3d1ca7edc8b473ac47775caca98dc2a8bc758b34e6fdd4669ffbe0aa71f900a366e40ff73f830aa602377a5ef3f40022006138e216f0127c75120b96
 DIST composer-2.1.6.tar.gz 517576 BLAKE2B 27a7c76d36a0c86110c2e39ba5977b7ea04bd10897dda4b563edad9cdf2b7e134d3545e5efa5eeb1518f1f0d5366c29de7fb1d6e9032b567195676de121bedbd SHA512 244d64c3c1eadb58ea945e8d448c3fdcf83a6bb3c09eede63c36a6e11f7b2131a797a9ca10c5447bf868ea3439681f9f9079933e26953b5387b7e0c3333480e2
 DIST composer-2.1.8.tar.gz 522462 BLAKE2B 12fb95088146e56568b05ad13ae7630b664337ca338d4cb3e8cc126bc90173a21da6f8e4d2cd883ad15a7b67670bae297a6e02518de3dbaf9d980a74afd6c60c SHA512 00816294a2837934a846a672d34ac830ae36b063d6ffb57d883f553b69cf205822d5d9994c3f6fa67e324ff9d47740bb1b843ad68cf911b220f411cc0b0fe1d2
-EBUILD composer-1.10.22.ebuild 1233 BLAKE2B 8ca659735c9256070bdf634a96eb790a23ef4a5f6e9bc1c4d488d2082d97d87a043b8becc944f9e33479516b40c29b2ddd93c7fe4219c1a3b143c333464b160d SHA512 5cf952c3bda93befd1a77ed5330905f3be8bddb254cdb3d52c6ea6c24eba0bfd32cb936fbbbe18e18dcdf1362b5e423b45f47346f1fd5e5192753c66f51e00e6
+DIST composer-2.1.9.tar.gz 523638 BLAKE2B fa5d9ce1d2bc65a8c92f9651f7b4fe4455d16d39798e79f43027f2617bd5d7245399f5a9bb772ff8fc64f055919836a5c575c7d0452657544495da547dbad447 SHA512 38377bde788443df234e2893efec90705dae0d4b7ee3b00f60c156e6471ba4c98c8ee64709ee1a06315702129dd716904f02439206a0a023ac2142359c6765cc
+EBUILD composer-1.10.22-r1.ebuild 1230 BLAKE2B b9ea51fc5272d0cf14c7ac39ab6b116237a8e6407438bd30f93cb19c2a49ba8eb5161ee7b68e94a307ad0aa05d7bec8b761793d71e0125acdef2a337f04beff4 SHA512 a779b007d2656daea61b3522cad20058a7cae19dc2b4588dbb349549906dc2874cebd42c711db487fd29578fead7a80cd7067210be2f3f134f792d6b388d5a66
 EBUILD composer-2.0.13.ebuild 2228 BLAKE2B f12244d8bada90f5ebd47e5c4d4b706c48153e6f56948103bf17e6ebd6fdbc44056e97ad67bd4fd423bcce9fba03584369c9025d3ed936f8ba1c1bca14a79b7a SHA512 8eee72c7edfd358f0dbb69c334d3df62dd3e0c1d74ac17ef49ca53655934ef5ae6e6c1a4d2263e766afcb0204eb72cd886ca9f1a0ad5e825d41a7eb38243d344
 EBUILD composer-2.0.14.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
 EBUILD composer-2.1.1.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
@@ -18,4 +19,5 @@ EBUILD composer-2.1.3.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535c
 EBUILD composer-2.1.5.ebuild 2228 BLAKE2B a0655fea3563734d657745a9fa9c8f785cf234d879033f43a4e98d333dfe51d011401db8fb7d16cad3191c86bb330ddaad759a3600c6dd8668bc4963c0adb253 SHA512 e5490a298b4a5ca5133ace4bf3ca317ea1b35b212b2574d0e8fd1dcc22226cdd32849f57c0a26f0be03586c602c9d3f4b70442bb1b9316984276aaaac120b635
 EBUILD composer-2.1.6.ebuild 2228 BLAKE2B a0655fea3563734d657745a9fa9c8f785cf234d879033f43a4e98d333dfe51d011401db8fb7d16cad3191c86bb330ddaad759a3600c6dd8668bc4963c0adb253 SHA512 e5490a298b4a5ca5133ace4bf3ca317ea1b35b212b2574d0e8fd1dcc22226cdd32849f57c0a26f0be03586c602c9d3f4b70442bb1b9316984276aaaac120b635
 EBUILD composer-2.1.8.ebuild 2228 BLAKE2B ebf3d7fe1a1d890650a861bc5a08878501e7a8994cd12c1e2b55e632293f7e004f28bd490ef40ecbd8268ab625ca56c4caa69791a36dd4549b5106dcf2923dd2 SHA512 62afde69ee98ab14cc9bbb90df16ca70927fa1cbbd0c69ceb3bc2a9bd237aa8a3eb96f2acfdc88244d2e5e5d7c9ee32776764cc4750f1619e7c4296ca57737b8
+EBUILD composer-2.1.9.ebuild 2228 BLAKE2B ebf3d7fe1a1d890650a861bc5a08878501e7a8994cd12c1e2b55e632293f7e004f28bd490ef40ecbd8268ab625ca56c4caa69791a36dd4549b5106dcf2923dd2 SHA512 62afde69ee98ab14cc9bbb90df16ca70927fa1cbbd0c69ceb3bc2a9bd237aa8a3eb96f2acfdc88244d2e5e5d7c9ee32776764cc4750f1619e7c4296ca57737b8
 MISC metadata.xml 805 BLAKE2B bfbb9828e372e477d471698865c97fd36a9287e257b36fbd1d489cad92ad131a6b2d30910379b126d82d3f81b479854da7a50596b1b63e6982c0bc402caae574 SHA512 33cf199e2cc7fd8ddbd46d9782fb5a5e9e655f9fb8c607a68744f4165fc62edfce6bd324bf883d5d5b143963cc3ef986609e22d24809c190b508e814249fe99f
diff --git a/dev-php/composer/composer-1.10.22-r1.ebuild b/dev-php/composer/composer-1.10.22-r1.ebuild
new file mode 100644
index 000000000000..6d92252702fa
--- /dev/null
+++ b/dev-php/composer/composer-1.10.22-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.1.3
+	>=dev-php/psr-log-1.1.0
+	dev-php/fedora-autoloader
+	>=dev-php/json-schema-5.2.10
+	>=dev-php/jsonlint-1.7.1
+	>=dev-php/phar-utils-1.0.1
+	<dev-php/semver-3.0
+	>=dev-php/spdx-licenses-1.5.0
+	>=dev-php/symfony-console-2.8.48
+	>=dev-php/symfony-filesystem-2.8.48
+	>=dev-php/symfony-finder-2.8.49
+	>=dev-php/symfony-process-2.8.48
+	>=dev-php/xdebug-handler-1.3.1"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r src res LICENSE
+
+	insinto "/usr/share/${PN}/vendor"
+	newins "${FILESDIR}"/autoload-r1.php autoload.php
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/composer/composer-1.10.22.ebuild b/dev-php/composer/composer-1.10.22.ebuild
deleted file mode 100644
index d8c51c550e91..000000000000
--- a/dev-php/composer/composer-1.10.22.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.10
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-2.1.9.ebuild b/dev-php/composer/composer-2.1.9.ebuild
new file mode 100644
index 000000000000..1eb058b7a474
--- /dev/null
+++ b/dev-php/composer/composer-2.1.9.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.0
+	dev-php/fedora-autoloader
+	>=dev-php/jsonlint-1.4
+	>=dev-php/json-schema-5.2.11
+	>=dev-php/metadata-minifier-1.0
+	>=dev-php/phar-utils-1.0
+	>=dev-php/psr-log-1.0
+	>=dev-php/reactphp-promise-2.7
+	>=dev-php/semver-3.0
+	>=dev-php/spdx-licenses-1.2
+	>=dev-php/symfony-console-2.8.52
+	>=dev-php/symfony-filesystem-2.8.52
+	>=dev-php/symfony-finder-2.8.52
+	>=dev-php/symfony-process-2.8.52
+	>=dev-php/xdebug-handler-2"
+
+src_prepare() {
+	default
+
+	mkdir vendor || die
+
+	phpab \
+		--output vendor/autoload.php \
+		--template "${FILESDIR}"/autoload.php.tpl \
+		--basedir src \
+		src \
+		|| die
+
+	cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/Composer/CaBundle/autoload.php',
+	'/usr/share/php/Composer/MetadataMinifier/autoload.php',
+	'/usr/share/php/Composer/Semver/autoload.php',
+	'/usr/share/php/Composer/Spdx/autoload.php',
+	'/usr/share/php/Composer/XdebugHandler/autoload.php',
+	'/usr/share/php/JsonSchema/autoload.php',
+	'/usr/share/php/Psr/Log/autoload.php',
+	'/usr/share/php/Seld/JsonLint/autoload.php',
+	'/usr/share/php/Seld/PharUtils/autoload.php',
+	'/usr/share/php/Symfony/Component/Console/autoload.php',
+	'/usr/share/php/Symfony/Component/Filesystem/autoload.php',
+	'/usr/share/php/Symfony/Component/Finder/autoload.php',
+	'/usr/share/php/Symfony/Component/Process/autoload.php',
+	'/usr/share/php/React/Promise/autoload.php'
+]);
+EOF
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r LICENSE res src vendor
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 97ba125c64e8..f9de79a8e1c8 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,5 +1,7 @@
 DIST apcu-5.1.19.tgz 96583 BLAKE2B 330c08a4e557691d0b402111877b3caf56b211256db17cce52a76aeefce7237505eca4ecd71f3770ef3c405182a1604a92cc458cb9bca435b42370fe917e21a7 SHA512 45077e3bd0eac207539e2eafe21968c71f49b8c8920168dbafa87961b041f1d348b6bf1c130104744bc541e1f690854f0a29062e9520db81c04edeee3ef2ed99
 DIST apcu-5.1.20.tgz 96727 BLAKE2B b8223856e0aaa52f90dffa674bbd9b047caa8c91d81b637eafc2f59fbbfdfe0d6ce30e990a87cb4833e895fcfd944f7d57eb6f7356b3e2361d6be5a535bb3a63 SHA512 3e10b7e5dc7481b1250610ef83954875f427b9114d6b232bad9064fc33d8c8906bcc317f94a6cfc9f76c720fa06a44270d259cf2ceef6c1ec9dcadc49254ee1b
+DIST apcu-5.1.21.tgz 92516 BLAKE2B 32d73b89bde9ef4eb01c9ad766930e87300b86776c95929607a8aaefba5043e3a7947d064416ac083ff38876fdb41bb03dab1552ac000082e54f809269b4c925 SHA512 a6ffe8349760d27cde0d86017a59a68e9639bf385e606622d807094f4e5fb305bb25b9ce00077d0856f4d223d44329f7a6314c229b62c78d8e2b085593c92bb3
 EBUILD pecl-apcu-5.1.19.ebuild 1545 BLAKE2B 1c074393bafc9563524a1f1d72271032189adce78b462c698babe9014349db09553d642b5a0978a0600326010cb971f81b16f7be0a2d88cf6d063f86848d2019 SHA512 25fb01fd624396446e0842eeb45b1c29f9526b0f864f55983ce69075454dda61d7148c991552fc4272b3f7ae58a513b56083f31cbe7ca0a5d6f5a03524d99899
 EBUILD pecl-apcu-5.1.20.ebuild 1553 BLAKE2B 015a8869645b8b2d79cee0d91b2eff4df743de8525d88d20b03dc9ba6f40ec377bcf1123d505d61a46c407c170167b1ca7b79a21a767320d401c9492c846018e SHA512 40ddab32f53bf4c7f0fde674c4916e5e385a3cdf8bb760e7e0b25f4303d9de73cb6f882b8f8ae80e4af633d788d48daaed08166afc6da755f50b75976a46403e
+EBUILD pecl-apcu-5.1.21.ebuild 1560 BLAKE2B 1be86a20eb978a8906485287031f2376e285b6c8989a62b203ef1e88b2582964cf055ae87c768c4a22381a402f21244974b1218110f632242349a0fb13607b3b SHA512 e32d20058ebba152466f1964b866cd8012d4ef5846c5c4763f5fe33379ccc198412872fc5db8ba6ffb5f37136f15c2962a38f926ebbac061b1b0e5951b70d4a2
 MISC metadata.xml 541 BLAKE2B 533f563e606b35d23c766aa177ea80b56b17ff352e907f2aed65c82be8bb6b01bcb61d69c6be6560b8e975ac279cf3a00ba5976d4a50c0f3ae68677ae7557cd8 SHA512 5dde6ecb39edb11fc4222cf869449f43fe3923623cea2a8ee4d4a4b8d7bf11bcc6d40f135cb5dc4cc81b161ed50489230bba443274c914d0015046ea44c868d8
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild
new file mode 100644
index 000000000000..525f58c9e981
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( NOTICE README.md TECHNOTES.txt )
+
+USE_PHP="php7-2 php7-3 php7-4 php8-0 php8-1"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="7"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock-${l} "
+done
+
+IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_prepare() {
+	php-ext-source-r3_src_prepare
+	# Remove broken tests from php 7.4 due to trivial output differences
+	if use php_targets_php7-4 ; then
+		php_init_slot_env "php7.4"
+		rm "${PHP_EXT_S}"/tests/apc_entry_00{2,3}.phpt || die
+	fi
+}
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-apcu
+		$(use_enable mmap apcu-mmap)
+		$(use_enable lock-spinlock apcu-spinlocks)
+	)
+	# Broken upstream autoconf test disables if present at all
+	use lock-pthreadrw || PHP_EXT_ECONF_ARGS+=( --disable-apcu-rwlocks )
+
+	php-ext-source-r3_src_configure
+}
+
+src_install() {
+	php-ext-pecl-r3_src_install
+
+	insinto /usr/share/php7/apcu
+	doins apc.php
+}
+
+pkg_postinst() {
+	elog "The apc.php file shipped with this release of pecl-apcu was"
+	elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
+	elog
+	elog "If you depend on the apc_* functions,"
+	elog "please install dev-php/pecl-apcu_bc as this extension no longer"
+	elog "provides backwards compatibility."
+}
diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index aca67ff2d977..b06e5e9f9b87 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -1,3 +1,5 @@
 DIST mailparse-3.1.1.tgz 941192 BLAKE2B 00b5a506031cd03439e3d67172c17aeeb6af3b950694251f7654007642bf80fff3cda900fc97ba177b91ca970e47416132080793ce64d8038e7aecbf2fdaf6c0 SHA512 01ddb8d4d27a74c14f70b02b49322c60fc79affab374205fee91b9da21e5148e08dba024f6bc620e4f26c2c937675e09092c52ca69172d2f7797c3e2bf374bee
+DIST mailparse-3.1.2.tgz 941292 BLAKE2B 855d0b6d34664f090ee3fc6aaa7a260651b9e98b1237c29f66c151ff2b6d8dbbd8cad2757e202fad5a2d0a339fca1e37464a5bcfe7f12b9b1dee975f4330aa1f SHA512 f60671b2bbe09c858a5d9d27fb8ac314d98d0635eeaa682a28171f85bc71d1c9c3ab92c6931883a42619e96bfe96fdf1b43b570c5c2bc1d2b243b541fb533d24
 EBUILD pecl-mailparse-3.1.1.ebuild 492 BLAKE2B a0beb3508e7d216b889015a393d4ce5f11bceb65910306e3bf1bae303c06e18a9b0f8fdf568877a032e1518f1c8274b2695c083ac4b4cc7fa60946537a6be558 SHA512 3b585bd494f72d10fcf2a4e0be4418d531ca6d02a2ebc98bdb4710e49d6251b7f5cfb2bdf946a0b3c329b8ce9f65de8c28b5d6d2023ef24272e6b0f5f8fa5680
+EBUILD pecl-mailparse-3.1.2.ebuild 503 BLAKE2B 2fe64e994a64c33c54360b5a497e3ae01c6370edfe5196d322530078063f10ad9281c534822233c1eab9937e7340fa34fbe8fff52bf45a0ba91e93a2909d019c SHA512 e91d4d842b2136c60927a4f60f4f2295b46bf93a9f710238368baacfdd32dc1864e1f6d27ba4312e1da8cb1f7327a2988128bf3cb6328c9732e037c3de65b771
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.1.2.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.1.2.ebuild
new file mode 100644
index 000000000000..29f9a2bfeb51
--- /dev/null
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WANT_AUTOMAKE="none"
+PHP_EXT_NAME="mailparse"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+USE_PHP="php7-2 php7-3 php7-4 php8-0 php8-1"
+PHP_EXT_NEEDED_USE="unicode"
+DOCS=( README.md )
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
diff --git a/dev-php/pecl-rrd/Manifest b/dev-php/pecl-rrd/Manifest
index b8b96af75161..a93711bf09b4 100644
--- a/dev-php/pecl-rrd/Manifest
+++ b/dev-php/pecl-rrd/Manifest
@@ -1,5 +1,7 @@
 AUX 2.0.1/0001-arginfo.patch 2714 BLAKE2B 23b597baafd80f10abd922d096b94968b54bb4d3b5682242ad66f85d85dd3ab984d9e3623cd03a4f8c38a8798887ceba62e33c177d3ce8c0ebaf6e3cae99a149 SHA512 01ff4826777e30048dd9db3b9589017a39da6e038a113fdc772e1023c85527af146ee5ad7f79cc91976f7991e1b182e20537df38e94ac28307fc26a6708bb290
 AUX 2.0.1/0002-relax-float-test-result.patch 3214 BLAKE2B 28be00e2e4c85baf8f3da4da764d45e9f5f9a232c49e73c9d4f76a94c9eeb9b265ed56feffe3b19f7a5f314907139446e4b6ec837ceabb4f760c08fa0092202f SHA512 fd18c196df8a9fb36acf7f4f5cfbf048f829c00b08f2ad3c371252adbe9f148082026ce7c2e48126cb089e8820b77db8e19f86fe6e97836eac0eec4ca97a2871
 DIST rrd-2.0.1.tgz 18880 BLAKE2B c3fb65e95aece39690085830ec1c43ba173e173591215d6a66145ac71079f8d5ba5b097acd9018c86d2342550001334f8e1c98e22204d94a24aee5cc086295ca SHA512 b6f7173f54fcf49bf014cc6c78263c169cdf53dac66c12f5f88db7e01b49ea74da84a55f61deb25c866e6e2e74275ec48fc4a3d1b46719f66b5b7b7eb000b6b3
+DIST rrd-2.0.3.tgz 19178 BLAKE2B 473fe53e858665372133db9f13d9aeac330da2ca57a8fb59f0eb280f1bdd40d2f0b28179a9b150acdf15d7bbc6fb5416a82dcd670c67ad39050cbd1c5795b62e SHA512 28679ccead54806d1e92accc6f5ebab582a41db802f95797ddb43e3e15690889be3437f22e2a14939d217422ac2700ef90ae0a9b36244ddead3856343b3e09b4
 EBUILD pecl-rrd-2.0.1-r4.ebuild 553 BLAKE2B b7a7c2030a7a8ee0ef20603d94be73a293144ef08b9026fcb365f2a3eca9d9050389cf042b379dadeddb65d62c777b89b4f30f15d3a7db119c37cf981448f052 SHA512 d01b856299b59636fa5a116a94b0a76497a74aadac7bae2149c881880d346dcce02f0dfe8c5f67f74c72602d05adeb0d08dd40c52496a10c4161bf4c41db7dde
+EBUILD pecl-rrd-2.0.3.ebuild 554 BLAKE2B 0ff61efc2b073ece3fb882de4cc85826ffb2c362e92096f48893dcd114f47d2a099f0b914ae7d496875d8967baf5041c23d89b881c6c67a73941016705c772b6 SHA512 76812bf1a131567ed88f68504227249d528c240c2936a6d394465f19b0ecb1944364150972ffe0cf99134299be3c4ffeb5f0dc4dd2b3b670579ccbc1c80518cf
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild
new file mode 100644
index 000000000000..034811552435
--- /dev/null
+++ b/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="RRDtool bindings for PHP"
+LICENSE="BSD"
+SLOT="7"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-analyzer/rrdtool[graph(-)]"
+RDEPEND="${DEPEND}"
+
+#PATCHES=( "${FILESDIR}/${PV}" )
+PHP_EXT_ECONF_ARGS=()
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Prepare test data
+		emake -C tests/data all
+		NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest
index fd3b8669855e..fa2ad18d4c48 100644
--- a/dev-php/pecl-uploadprogress/Manifest
+++ b/dev-php/pecl-uploadprogress/Manifest
@@ -1,5 +1,7 @@
 DIST uploadprogress-1.1.3.tgz 14798 BLAKE2B 5edda3e8672bb0e0829d100284240fcceac26be695386225a18446c742f59edfd906a9ae2f17b594816d3cddea02eb648db01a3352d7f8bd764ad2f6b2e03628 SHA512 2202f419be852a71eadae47eaa83909a032e5a6bbe4ce17ae5d45ea4e9f6d9c9edceb2111630d1f0e277b531d463accf540288ecbcca9bf154fe01754f225686
 DIST uploadprogress-2.0.1.tgz 19459 BLAKE2B 10143285da73a2fe1854c68d5f20ac6543695ccdf47835ff16f39b69e357e2ca32d2560ca1ced9238c6d21fb29379817b8a682d6aa24bf8c83b563127d2745a9 SHA512 81c846ea6e87c7c0621c22ee903b0937d533285bd0e3195de85803321260d4562e4c598332591afc7e985da57ed9422e37ed1c2927090474ddb7ec27314f1ae0
+DIST uploadprogress-2.0.2.tgz 19969 BLAKE2B 148cac83b00eb6b4f23861a04829280346957cdfc5bdbe94d687d0efb5da97b5f48162c59b07e0830a67350c7a2aa9a3085a4575f07b32016b01845301f04843 SHA512 b9ee5a09c3de78d58abd34da2d25d7b0cad38416309a9a69192f07e0c3fe2259de261bb3dee571e64e042753f861738ebcd67fa7fafeb595ec32ed3034c773cd
 EBUILD pecl-uploadprogress-1.1.3-r1.ebuild 465 BLAKE2B 106c1056a3e4351751eb813c6b15f859c66c2b32ee285ac5d6e8fa256418ec7a4bbfa4d4d1793e6998f9ad7d862e36e23ffc3d95965370e7b7e47ef821cff822 SHA512 11ce4c9bde42e1357f11cc2f9fa5e8bf405944ea755c8f09ceb8a3898440c5381b89374ea63298842113bc90ef1837c72bd7fde2f874f46060c2870d67a24a7f
 EBUILD pecl-uploadprogress-2.0.1.ebuild 670 BLAKE2B d75e0c1f4b813f6ea285b9f9faa92d777a6beb7b9b7626fc0f359a5f1b119715e58e8da7db97095a482cc89afb1da4aa994d84ed182018788ea6aa3f51c8d79c SHA512 2fe1826005d5f2958268ab2e3346f30d08fed1b1aba9760a1a8bf0777220a66e36b2b4a7a938e46e44640030782a76dcf668f3eeabc2c3624c98189a4df7716f
+EBUILD pecl-uploadprogress-2.0.2.ebuild 670 BLAKE2B d75e0c1f4b813f6ea285b9f9faa92d777a6beb7b9b7626fc0f359a5f1b119715e58e8da7db97095a482cc89afb1da4aa994d84ed182018788ea6aa3f51c8d79c SHA512 2fe1826005d5f2958268ab2e3346f30d08fed1b1aba9760a1a8bf0777220a66e36b2b4a7a938e46e44640030782a76dcf668f3eeabc2c3624c98189a4df7716f
 MISC metadata.xml 709 BLAKE2B a3e91fd98c74c0f7b7286cd7d3070a495eab7c585f4d9981bedc90734665ba60d1db391a641aa9dfb60fcdb3c5748c9f65016ddf5cd9756c7e5caf021a65e3ff SHA512 eab0d79c1f912399fe60a673e6378f61cd5c4c0842d496c59fd300e2a037bfa1e0cbee0d9c330b81200c52944595d95fcc23c21c171172687330d21a8ff53a33
diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild
new file mode 100644
index 000000000000..6bc6174856b0
--- /dev/null
+++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_PHP="php7-3 php7-4 php8-0"
+PHP_EXT_SAPIS="apache2 fpm"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="An extension to track progress of a file upload"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	php_targets_php7-3? ( || ( dev-lang/php:7.3[apache2(-),fileinfo(-)] dev-lang/php:7.3[fileinfo(-),fpm(-)] ) )
+	php_targets_php7-4? ( || ( dev-lang/php:7.4[apache2(-),fileinfo(-)] dev-lang/php:7.4[fileinfo(-),fpm(-)] ) )
+	php_targets_php8-0? ( || ( dev-lang/php:8.0[apache2(-),fileinfo(-)] dev-lang/php:8.0[fileinfo(-),fpm(-)] ) )
+"
diff --git a/dev-php/phar-io-manifest/Manifest b/dev-php/phar-io-manifest/Manifest
index badfca2dc34f..33973a501c80 100644
--- a/dev-php/phar-io-manifest/Manifest
+++ b/dev-php/phar-io-manifest/Manifest
@@ -1,6 +1,8 @@
 AUX autoload.php 3913 BLAKE2B a3c8a3b75e2b150157892bc8ea168e7c60e5cef95cdee1279579a4b1efd4a4647bb5ec22f272575342d8945674fce048b1a091cd48977cdc77a975668c3a0849 SHA512 d43f3a726eb79ee88e674ac0ec3fb4d175ac0041b96638e4d2a40a47720ebd3a983cd36dd943fff9c0220dda68549361628636e94f595b0601d6eddf2b937fe6
 DIST phar-io-manifest-1.0.3.tar.gz 21903 BLAKE2B 48fb8858ea6c89415e78da399e2d3b6660e1857958094bf5e6c42465cfc32e34122ec1ab6e413f36f48e288ef40af7b85f93c80e6a2cfa547a166557de04ec97 SHA512 f8f9a6d4b761b739ec24a9f94ae5d4ac74f7276621675e3f3c7c3085aa7662c73cc703b1c86531d327199cf42074bb19446c14f78a3c8a888b1d236dc59bed94
 DIST phar-io-manifest-2.0.1.tar.gz 10146 BLAKE2B dad3a04bf63c53c2cf4c715eb752ca57458f936a0872db481e81452b9efc8f10bb3903248cb834c8e25eb88987b68545903e1f68876e284597f54ceef755dfe8 SHA512 5c9772a5a48f17abab3806bbb8f9c07a2f26f3231385fb7dd7dcdc390f925f0f7de2d07d8b0bb4e966de86c3262bb4900cf81c1bf897fb38425aa8d644c74e95
+DIST phar-io-manifest-2.0.3.tar.gz 10249 BLAKE2B 3463a52fac2d0392b9c4a40089b536b0aebdbfe51154dbeab093da386085ead91eb95cdd133eb4464bde3a616b13c5a5772af2d97edfc585b0fa1128ef2a5166 SHA512 c0c646f0770e66909377f5f4b6b755ecfc070c44ac83d58c3ad07d79aa4481092e7c702e62d0ee65b036dd5de8ba45356d85717a733f141248e41f77d54bbe86
 EBUILD phar-io-manifest-1.0.3.ebuild 707 BLAKE2B 43809d8fc3bbd0e6e6937d7fee43c7d33f7ce71a08b215c7008c05a9a02addba0f598eec5136a227a433b8c45ed68ac7be58831586b1cbd52abf41ecd7edd414 SHA512 95db205b5928a1272f816f1fd8ccaf4baf1457b4b6e9e5c9138aaed5533e05cf4b8272dd641ac7e35dd13a35ea223ac8ccb4a47a8fa9cbdb0950c5b0f936f1e9
 EBUILD phar-io-manifest-2.0.1.ebuild 1079 BLAKE2B 47e9c7aa48dee6219ec90f6b106e9518d553c5cfdd4a3a6d5151738ba82c7af6b01ebd659ab2543e94f474902deaa3ea281ecf69c1b0bfd17a1b1f42582cbdb3 SHA512 6938c953c8e02aad408e0faa33aee945339ecc7ffc2b80c245f04a9f867ed96a0c2839fe21be5bdf6aa40287446b08a5e8150a8eb2bc9ad4561e7042123058c8
+EBUILD phar-io-manifest-2.0.3.ebuild 1079 BLAKE2B 47e9c7aa48dee6219ec90f6b106e9518d553c5cfdd4a3a6d5151738ba82c7af6b01ebd659ab2543e94f474902deaa3ea281ecf69c1b0bfd17a1b1f42582cbdb3 SHA512 6938c953c8e02aad408e0faa33aee945339ecc7ffc2b80c245f04a9f867ed96a0c2839fe21be5bdf6aa40287446b08a5e8150a8eb2bc9ad4561e7042123058c8
 MISC metadata.xml 345 BLAKE2B f315866d0a0e6298a4146c625af4a71200a697f0504fe83240a092c1998a09c86c20a7d842ecc790e35ea1048f7676d7ccd00c0bd9d563ee2fa6e9d0fdd9404c SHA512 2768f65be97aa86fd10c3a8541fc6d43262bceb632d9ba194d3e6deb0da217321c11a1063a1aa7206c42d7e12ea105f39974d5fa31f9d93975aa903a6adcd661
diff --git a/dev-php/phar-io-manifest/phar-io-manifest-2.0.3.ebuild b/dev-php/phar-io-manifest/phar-io-manifest-2.0.3.ebuild
new file mode 100644
index 000000000000..25f65d07e8d4
--- /dev/null
+++ b/dev-php/phar-io-manifest/phar-io-manifest-2.0.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Reading phar.io manifest information from a PHP Archive (PHAR)"
+HOMEPAGE="https://github.com/phar-io/manifest"
+SRC_URI="https://github.com/phar-io/manifest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="examples"
+
+CDEPEND="dev-php/fedora-autoloader
+	>=dev-php/phar-io-version-3.0.1
+	>=dev-lang/php-7.2:*[phar,xml(-),xmlwriter(-)]"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/manifest-${PV}"
+
+src_prepare() {
+	default
+
+	phpab \
+		--output src/autoload.php \
+		--template fedora2 \
+		--basedir src \
+		src \
+		|| die
+
+	cat >> src/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/PharIo/Version/autoload.php'
+]);
+EOF
+}
+
+src_install() {
+	insinto /usr/share/php/PharIo/Manifest
+	doins -r src/*
+	dodoc README.md
+	use examples && dodoc -r examples
+}
diff --git a/dev-php/phpspec-prophecy/Manifest b/dev-php/phpspec-prophecy/Manifest
index cb2cc5391635..12e183537379 100644
--- a/dev-php/phpspec-prophecy/Manifest
+++ b/dev-php/phpspec-prophecy/Manifest
@@ -4,6 +4,7 @@ DIST phpspec-prophecy-1.10.0.tar.gz 38663 BLAKE2B 44a292eb24cbef36217c108cc09497
 DIST phpspec-prophecy-1.10.1.tar.gz 38707 BLAKE2B 1eaa3fe0043b0d03341778679683cd388d2cdcc3c386ee5801f22dce453fbc3c276023f1b9dc6f26ee332948f59081e09d0944948feff1a6332195523570e4c9 SHA512 f42d115969894b0c1f4887a2154fe310ddd3c7d5a49abbed3c3cb6ffa86d83b1458b9323203e68a7389f5df3c95b3a25037bed41cb8f3b5e824d45102579b9ca
 DIST phpspec-prophecy-1.10.3.tar.gz 38838 BLAKE2B 05150e31bcb5896768878672a2523499470541409796b6f4f0de2b8b8686cfa097b6a745e467ed3c9693b0498712d04f6f0e1ba0d19e2fa3677ab9f6423608de SHA512 ada5ecf157bcc5979a86c76448f72c8a890f7db4496327ecf2b7b723bdfe901dd53b0225f8ee3ae7cbc38d08933c863224c9661466428fb47da9bfebdb86627c
 DIST phpspec-prophecy-1.13.0.tar.gz 40362 BLAKE2B e99001cfe9fb20cea12b5e109ef36ba087f99ae1bcc922af853eff1bf2d0986017b9b7be03a280de05726480ad75c9d8ee34a27c54b78e22bade9534a75e5c34 SHA512 5d7befb615805243f9602fe78c230c0938186d01c62cc5b90aa279713ba3b653629e91d96acd4e8bb1dc25cded81526934d189ef3f4ef38f75cba04877ccdf70
+DIST phpspec-prophecy-1.14.0.tar.gz 40801 BLAKE2B 8968be07cbc02f76c515c8c6a27e69662e1aa697e5d502329a946a677903b59fc63347b2535b84ebf4e1d59cf6085fa10151ed9caea9f3b50c1897eaeb178636 SHA512 777137784a2235ae638d1b6b42bb67b2fa6eadb2c05e83097e90604aee5e0d7bc4100924fadf8f2e5ccbe09be6d4edf4fb63606f2be4a9c805dc4480d88747ef
 DIST phpspec-prophecy-1.7.0.tar.gz 60338 BLAKE2B 8171120d8407f2e554150d5e3ea1972c54d4e2ce0e6698763f0b3c7e1645340ce22404da7844fed8412579c46f372852b4553c6d8a65c8094ef3065b0dbbd80c SHA512 e8efb3882d869f10fe39dff7c2185e1ec6f044c794fd6a5785e1c1c69c71b91dc3997f61bd2566d3243dde0becce568beba9a18fa0fd152e6ce74ca43a9a0fb0
 DIST phpspec-prophecy-1.8.0.tar.gz 37907 BLAKE2B 4bdd55d7fc14604c9fade23c60bf51f4c03accc182d7c5ad445dc6212a1e41b1bf392fe8f4a29768ecfcb2af479c0db3e29d5787d12e1f3222b032ba7e64dbc8 SHA512 992673f7cd148cf0b8752bbad614bbe34175a761cd4bf8849625794b505342d1bd918212a0f1463d94513f9e805d3dd127ba129d6622bcda29ea2b5c57a5582f
 DIST phpspec-prophecy-1.9.0.tar.gz 38262 BLAKE2B 1642d38afa368be504da73c0bcf34921fe167dff5665651af23142f33979a35d8d10112e3d1c5b1b38448b92b4741ebda2c183dca10473dce833090a603f95f6 SHA512 d0ba1840ca84cf4b0642083858326c593086f35ba3a6d83746956efbe5d538910efc01655eaa14b4e2b7e17e7bd19cd2494cdfad0dd5bdfb43cdee2402a55b05
@@ -11,6 +12,7 @@ EBUILD phpspec-prophecy-1.10.0.ebuild 830 BLAKE2B e9972a363e07fe83f00a282b6c8f14
 EBUILD phpspec-prophecy-1.10.1.ebuild 830 BLAKE2B e9972a363e07fe83f00a282b6c8f1404fcf7d8418c43cab20f72cd4a6b36880fa62e04149b2d82a657feb95719fffd31e58ea40508ab5be27ea10c2df7074f75 SHA512 3e381d989326b6f55ce31738eb4227dab625e1a8c9ddbbb236251ced16f68e103247a47f1ccca89730af2110f164009d5b1468247f0895ba270347d8d8b2d730
 EBUILD phpspec-prophecy-1.10.3-r1.ebuild 825 BLAKE2B 27f538a59e3ff75941022ac9cdc5379bb4b81de9836101a589b7959169951006f1008d4f91a05f7488fc9284f50923c899b41a92e345e897659d4f89a7888a22 SHA512 1ff815f691616b65111c52ef681d075c1ff32e52f0b3baa60ea37ce1bdf50d6e739650e60dccdf0cca1c67fb5cf41e7bf89c17b29c56fee20d3f6199a6b4b68f
 EBUILD phpspec-prophecy-1.13.0.ebuild 840 BLAKE2B 7e0b8b27bfc7aeca65d505faea4731e99dc028c1cc1b36c4a81a654a8e3b2a2885c6083ae874432ebdaab9c2984b56945b59d124b43fd3b97c2d55904ba1b6e6 SHA512 1faecf25ca73b71150d6b713542617ab7a1ff041c87ff3cbca08266439409ce9230ae31746e7f6ffe71f886ab9c205016e985532a44af8eb0d4dfccf1d1f2804
+EBUILD phpspec-prophecy-1.14.0.ebuild 840 BLAKE2B 7e0b8b27bfc7aeca65d505faea4731e99dc028c1cc1b36c4a81a654a8e3b2a2885c6083ae874432ebdaab9c2984b56945b59d124b43fd3b97c2d55904ba1b6e6 SHA512 1faecf25ca73b71150d6b713542617ab7a1ff041c87ff3cbca08266439409ce9230ae31746e7f6ffe71f886ab9c205016e985532a44af8eb0d4dfccf1d1f2804
 EBUILD phpspec-prophecy-1.7.0.ebuild 802 BLAKE2B abfc5f92049c4e71dd79579a4645b161e727f02056baf5117ba6f3a1eb711acca5ab7be3f28bba542451eb9e22d88c6957641f64f66538200341a923f02178b9 SHA512 3fae447e08178a76ef01975982121c5cb487116c3c4e5d92722c0c89bfb73b4df06148a4c5a79f9dfb6acc3a3793c08896128f06be721e2d7feb626e86c3a071
 EBUILD phpspec-prophecy-1.8.0.ebuild 809 BLAKE2B 26753f262d4b9005ef9e5ee2fc0888687023aad9cb7608d22e713270755ee1214f46ae2535e04d2627e10c534b0aacbc1b904f48c6740fa678d2900c9978cd47 SHA512 9484b2eb57540008f72f7b653c6b953ba706ca83b87e041df7f476ed3529fbfbe8c5b8d15fb8b27d7917116c6060df75aa2307bb36756e7c3e5f6013d59bd705
 EBUILD phpspec-prophecy-1.9.0.ebuild 809 BLAKE2B 26753f262d4b9005ef9e5ee2fc0888687023aad9cb7608d22e713270755ee1214f46ae2535e04d2627e10c534b0aacbc1b904f48c6740fa678d2900c9978cd47 SHA512 9484b2eb57540008f72f7b653c6b953ba706ca83b87e041df7f476ed3529fbfbe8c5b8d15fb8b27d7917116c6060df75aa2307bb36756e7c3e5f6013d59bd705
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.14.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.14.0.ebuild
new file mode 100644
index 000000000000..92ee8e7fe54c
--- /dev/null
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.14.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="prophecy"
+MY_VENDOR="phpspec"
+
+DESCRIPTION="Highly opinionated mocking framework"
+HOMEPAGE="https://github.com/phpspec/prophecy"
+SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/prophecy-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+	<dev-php/doctrine-instantiator-2
+	<dev-php/phpdocumentor-reflection-docblock-6
+	<dev-php/sebastian-comparator-4
+	<dev-php/sebastian-recursion-context-4
+	>=dev-lang/php-5.6:*"
+
+src_install() {
+	insinto /usr/share/php/${MY_VENDOR}/Prophecy
+	doins -r src/Prophecy/*
+	newins "${FILESDIR}/autoload-1.10.0.php" autoload.php
+}
diff --git a/dev-php/theseer-Autoload/Manifest b/dev-php/theseer-Autoload/Manifest
index ad9469b97b09..8f4654893d00 100644
--- a/dev-php/theseer-Autoload/Manifest
+++ b/dev-php/theseer-Autoload/Manifest
@@ -4,6 +4,6 @@ AUX fedora2.php.tpl 241 BLAKE2B c7e7dce85f2b7c2f33f9760e7f4c0440fff18ad9679045a7
 AUX theseer-Autoload-1.26.0-autoload.php.patch 273 BLAKE2B 02ef287623dded15446172c54344be51bca15723f9de69aee7c75b4b2b6c1c4fef3d1d3df84bcf2da892c9708e5c5916933648e4cf4421ff62580af594ce9007 SHA512 8f8e6d278b2596dee872c14bc794a21d012f29a2e2cf0b56669796e97ceabbb0efade766492b247817f7c6f77b85a12d1d583717914016501b4007659f813abe
 DIST theseer-Autoload-1.26.0.tar.gz 43119 BLAKE2B 7b2413bc2fb281472cee03010c175aae1c8304ab0629c31f09e11497bd6f46d58bae8625da610f5a513b19fc8aafc45c35be7271ba13188466f576e7b4a7392f SHA512 c8fcb3ad39c140517d695c44e6dea3797ea0135ff64246478e55cbf167e4b9fbb3e5027732c201f66b404039a313952c7125f13fdeb1cd96633dbccfdda6f143
 DIST theseer-Autoload-1.26.3.tar.gz 43810 BLAKE2B b2d7fe33b9663a3c324656abe63e4ae89533b773007362b546cb9401de0a8fd8f0c00f8f385c4a45c39be675d062cf5dd5a739972fc12611331065f244515d63 SHA512 00a6fbf86cc0f5958c5d0d049af0370ef510fe21a05d7dcbeb1b0771f979ea6638f5db74d913c56b10d9212a68b5d918cdfefec241b1383faf0e97b4305895bd
-EBUILD theseer-Autoload-1.26.0-r1.ebuild 1874 BLAKE2B 3714b3b8bff2f1c0b9398bdc99a2ad428c0eff559cebc36ec9c9ee61aa6428fd6d3b06b74478dfbc694a2079cd0fc790bb1202a8cfe8bf932fe56851edef5ae5 SHA512 b418754870a0e68f22c7f05644331c6303b065a183342867a6acbcd0ce5abfdc75045d443dce98e31af9b3bd5ac80ad2ffe4aaaea8f4fbe126583bf1c13a16b1
-EBUILD theseer-Autoload-1.26.3.ebuild 1879 BLAKE2B e7adeb66bc17cde88c77079cba0290cefea5b74b4b211b38e846d934e22af6e3d2c16607b7b7920951da3807d61672d499386608c08d2e2fc5d3389a3024ff1c SHA512 f75e4189a179a9238dbc36035e08fbff7935aaa6fdbc7797e769fedfd18b5da8af9052b51160207b3d6fab18071c6f4f129676c4ade5b839b050ce28eb49dc9d
+EBUILD theseer-Autoload-1.26.0-r2.ebuild 1899 BLAKE2B 86b2bc050608453b82a255fe266c1ea4ae11320fa524bd0fbe7f0bfe96f06d0d277601485ab440f329f504366ccd78cd86605b63dd524512fa96cd81a60df2b0 SHA512 2995417228ae2b27c38c27b3c84fa0b99b822d9314f55e8c0931ff8239d1dfaca1752e78d23427a50878df9e2ab7658c6b65e064a5bd16df152f63c1f8fc069d
+EBUILD theseer-Autoload-1.26.3-r1.ebuild 1904 BLAKE2B 1bb125f2c6ccaec288fb2ca3becd3b774260c8ac94b112893e25ed22fa8867f4ccddbf8ef1eaf9db92ec2623957fa73ae3c92d95360b276ba971b0cb68ad629c SHA512 d1e12bccf23695a7f2573ae3475291cb46998117322249df88544643f8d36e8ca3bc1e3fc23de66be3655d79cd1d01145cd61ff7e046419f3db6f569434e08be
 MISC metadata.xml 345 BLAKE2B e2e404685b07fc6ab5b46ec994c6ebc2abc49478222497f1597694155a82cd95a9178a7d413c19116811fc867b8374559ccf6e8a40d66b8084e487fa5fa66bc4 SHA512 78871e1e73ac6750b628955d2a006663def9b50e79faedc98f1dd4c557d3f16d866278de861ebe727c1f080e510730b909fd0db0948f374401abed7065f44358
diff --git a/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r1.ebuild b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r1.ebuild
deleted file mode 100644
index 0a9d2dbf7b22..000000000000
--- a/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="Autoload"
-
-DESCRIPTION="PHP Autoload Builder"
-HOMEPAGE="https://github.com/theseer/Autoload"
-SRC_URI="https://github.com/theseer/${MY_PN}/archive/1.26.0.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-lang/php:*[cli]
-	>=dev-php/theseer-DirectoryScanner-1.3
-	<dev-php/theseer-DirectoryScanner-2
-	>=dev-php/zetacomponents-Base-1.8
-	<dev-php/zetacomponents-Base-2
-	>=dev-php/zetacomponents-ConsoleTools-1.7.1
-	<dev-php/zetacomponents-ConsoleTools-2"
-
-BDEPEND="${CDEPEND}
-	test? (
-		>=dev-php/phpunit-8
-		<dev-php/phpunit-9
-	)"
-
-RDEPEND="${CDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.26.0-autoload.php.patch )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	# Set version
-	sed -i \
-		-e "s/%development%/${PV}/" \
-		phpab.php \
-		composer/bin/phpab \
-		|| die
-
-	cp --target-directory src/templates/ci \
-		"${FILESDIR}"/fedora.php.tpl \
-		"${FILESDIR}"/fedora2.php.tpl \
-		|| die
-
-	# Mimick layout to bootstrap phpab
-	mkdir --parents \
-		vendor/theseer/directoryscanner \
-		vendor/zetacomponents/base \
-		vendor/zetacomponents/console-tools \
-		|| die
-
-	ln -s /usr/share/php/TheSeer/DirectoryScanner	vendor/theseer/directoryscanner/src || die
-	ln -s /usr/share/php/ezc/Base			vendor/zetacomponents/base/src || die
-	ln -s /usr/share/php/ezc/ConsoleTools		vendor/zetacomponents/console-tools/src  || die
-
-	./phpab.php \
-		--output src/autoload.php \
-		--template "${FILESDIR}"/autoload.php.tpl \
-		--basedir src \
-		src || die
-}
-
-src_test() {
-	phpunit --no-coverage --verbose || die "Unit testing failed!"
-}
-
-src_install() {
-	insinto /usr/share/php/TheSeer/${MY_PN}
-	doins -r src/*
-
-	dobin "${S}"/composer/bin/phpab
-
-	einstalldocs
-}
diff --git a/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r2.ebuild b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r2.ebuild
new file mode 100644
index 000000000000..e93e6a8a10b0
--- /dev/null
+++ b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Autoload"
+
+DESCRIPTION="PHP Autoload Builder"
+HOMEPAGE="https://github.com/theseer/Autoload"
+SRC_URI="https://github.com/theseer/${MY_PN}/archive/1.26.0.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-lang/php:*[cli,fileinfo(-),tokenizer(-)]
+	>=dev-php/theseer-DirectoryScanner-1.3
+	<dev-php/theseer-DirectoryScanner-2
+	>=dev-php/zetacomponents-Base-1.8
+	<dev-php/zetacomponents-Base-2
+	>=dev-php/zetacomponents-ConsoleTools-1.7.1
+	<dev-php/zetacomponents-ConsoleTools-2"
+
+BDEPEND="${CDEPEND}
+	test? (
+		>=dev-php/phpunit-8
+		<dev-php/phpunit-9
+	)"
+
+RDEPEND="${CDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.26.0-autoload.php.patch )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	# Set version
+	sed -i \
+		-e "s/%development%/${PV}/" \
+		phpab.php \
+		composer/bin/phpab \
+		|| die
+
+	cp --target-directory src/templates/ci \
+		"${FILESDIR}"/fedora.php.tpl \
+		"${FILESDIR}"/fedora2.php.tpl \
+		|| die
+
+	# Mimick layout to bootstrap phpab
+	mkdir --parents \
+		vendor/theseer/directoryscanner \
+		vendor/zetacomponents/base \
+		vendor/zetacomponents/console-tools \
+		|| die
+
+	ln -s /usr/share/php/TheSeer/DirectoryScanner	vendor/theseer/directoryscanner/src || die
+	ln -s /usr/share/php/ezc/Base			vendor/zetacomponents/base/src || die
+	ln -s /usr/share/php/ezc/ConsoleTools		vendor/zetacomponents/console-tools/src  || die
+
+	./phpab.php \
+		--output src/autoload.php \
+		--template "${FILESDIR}"/autoload.php.tpl \
+		--basedir src \
+		src || die
+}
+
+src_test() {
+	phpunit --no-coverage --verbose || die "Unit testing failed!"
+}
+
+src_install() {
+	insinto /usr/share/php/TheSeer/${MY_PN}
+	doins -r src/*
+
+	dobin "${S}"/composer/bin/phpab
+
+	einstalldocs
+}
diff --git a/dev-php/theseer-Autoload/theseer-Autoload-1.26.3-r1.ebuild b/dev-php/theseer-Autoload/theseer-Autoload-1.26.3-r1.ebuild
new file mode 100644
index 000000000000..9726fe6bcc73
--- /dev/null
+++ b/dev-php/theseer-Autoload/theseer-Autoload-1.26.3-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="Autoload"
+
+DESCRIPTION="PHP Autoload Builder"
+HOMEPAGE="https://github.com/theseer/Autoload"
+SRC_URI="https://github.com/theseer/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-lang/php:*[cli,fileinfo(-),tokenizer(-)]
+	>=dev-php/theseer-DirectoryScanner-1.3
+	<dev-php/theseer-DirectoryScanner-2
+	>=dev-php/zetacomponents-Base-1.8
+	<dev-php/zetacomponents-Base-2
+	>=dev-php/zetacomponents-ConsoleTools-1.7.1
+	<dev-php/zetacomponents-ConsoleTools-2"
+
+BDEPEND="${CDEPEND}
+	test? (
+		>=dev-php/phpunit-8
+		<dev-php/phpunit-9
+	)"
+
+RDEPEND="${CDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.26.0-autoload.php.patch )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	# Set version
+	sed -i \
+		-e "s/%development%/${PV}/" \
+		phpab.php \
+		composer/bin/phpab \
+		|| die
+
+	cp --target-directory src/templates/ci \
+		"${FILESDIR}"/fedora.php.tpl \
+		"${FILESDIR}"/fedora2.php.tpl \
+		|| die
+
+	# Mimick layout to bootstrap phpab
+	mkdir --parents \
+		vendor/theseer/directoryscanner \
+		vendor/zetacomponents/base \
+		vendor/zetacomponents/console-tools \
+		|| die
+
+	ln -s /usr/share/php/TheSeer/DirectoryScanner	vendor/theseer/directoryscanner/src || die
+	ln -s /usr/share/php/ezc/Base			vendor/zetacomponents/base/src || die
+	ln -s /usr/share/php/ezc/ConsoleTools		vendor/zetacomponents/console-tools/src  || die
+
+	./phpab.php \
+		--output src/autoload.php \
+		--template "${FILESDIR}"/autoload.php.tpl \
+		--basedir src \
+		src || die
+}
+
+src_test() {
+	phpunit --no-coverage --verbose || die "Unit testing failed!"
+}
+
+src_install() {
+	insinto /usr/share/php/TheSeer/${MY_PN}
+	doins -r src/*
+
+	dobin "${S}"/composer/bin/phpab
+
+	einstalldocs
+}
diff --git a/dev-php/theseer-Autoload/theseer-Autoload-1.26.3.ebuild b/dev-php/theseer-Autoload/theseer-Autoload-1.26.3.ebuild
deleted file mode 100644
index f8aad573f6e7..000000000000
--- a/dev-php/theseer-Autoload/theseer-Autoload-1.26.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="Autoload"
-
-DESCRIPTION="PHP Autoload Builder"
-HOMEPAGE="https://github.com/theseer/Autoload"
-SRC_URI="https://github.com/theseer/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-lang/php:*[cli]
-	>=dev-php/theseer-DirectoryScanner-1.3
-	<dev-php/theseer-DirectoryScanner-2
-	>=dev-php/zetacomponents-Base-1.8
-	<dev-php/zetacomponents-Base-2
-	>=dev-php/zetacomponents-ConsoleTools-1.7.1
-	<dev-php/zetacomponents-ConsoleTools-2"
-
-BDEPEND="${CDEPEND}
-	test? (
-		>=dev-php/phpunit-8
-		<dev-php/phpunit-9
-	)"
-
-RDEPEND="${CDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.26.0-autoload.php.patch )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	# Set version
-	sed -i \
-		-e "s/%development%/${PV}/" \
-		phpab.php \
-		composer/bin/phpab \
-		|| die
-
-	cp --target-directory src/templates/ci \
-		"${FILESDIR}"/fedora.php.tpl \
-		"${FILESDIR}"/fedora2.php.tpl \
-		|| die
-
-	# Mimick layout to bootstrap phpab
-	mkdir --parents \
-		vendor/theseer/directoryscanner \
-		vendor/zetacomponents/base \
-		vendor/zetacomponents/console-tools \
-		|| die
-
-	ln -s /usr/share/php/TheSeer/DirectoryScanner	vendor/theseer/directoryscanner/src || die
-	ln -s /usr/share/php/ezc/Base			vendor/zetacomponents/base/src || die
-	ln -s /usr/share/php/ezc/ConsoleTools		vendor/zetacomponents/console-tools/src  || die
-
-	./phpab.php \
-		--output src/autoload.php \
-		--template "${FILESDIR}"/autoload.php.tpl \
-		--basedir src \
-		src || die
-}
-
-src_test() {
-	phpunit --no-coverage --verbose || die "Unit testing failed!"
-}
-
-src_install() {
-	insinto /usr/share/php/TheSeer/${MY_PN}
-	doins -r src/*
-
-	dobin "${S}"/composer/bin/phpab
-
-	einstalldocs
-}
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index b38cc36d541b..c3c21c8703d0 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -5,9 +5,11 @@ DIST xdebug-2.9.8.tar.gz 438295 BLAKE2B 8645052faceb354817ddb448f46af5b849507d31
 DIST xdebug-3.0.2.tar.gz 435761 BLAKE2B 0476d29b3a960d83fd0818098a3d076f48f4d67057a2b6ec79571b011a9f364b18d3319771ad18e7145aa0f0f45fab7ed13d814b863731abe1721aafa8b59408 SHA512 723e00885a49a5626870cc4cb0f7fd49a3173c8d4e9b4022009430fdeaa1b152828de18e6e7fa709be8bb11989c89dc2d9940de9cc3d592174b5dafbc3d2c52d
 DIST xdebug-3.0.3.tar.gz 437261 BLAKE2B 7ccfa8acbbe8b40eb086c9d4f47d363ec52850f5b0b91480bebfa416d7b88edf20deb6ee5fb5514dd1885f7a5b77c4b18caecf958d7dcf463c44c259d0fe2b89 SHA512 2ea5c6e2d6481aeeb5b2d8e39f5c5686d9b7480aea0c159f3da6e830700594b24129c1c4242ff8413b52aa2ed0ea872bf72a17fe23facb69c1cae75a917bde5d
 DIST xdebug-3.0.4.tar.gz 438559 BLAKE2B 0b4dc4a014f2459691bf43bb76d70a4080a6191b5f6cf4998751e73cdfcbecb7a6274e6f398476a2c68d014ddb25662e08e45b68fbc73c9b38c79c94b0682124 SHA512 f7f935903adb18f0920c919c3e5c923b70667dd82772bef7ae73fe40441ad1cb73f030aa206046720d4bfcf8b33f56d454cbb5f65dbdc275b7c1fd1907ff4ddb
+DIST xdebug-3.1.1.tar.gz 468120 BLAKE2B 038774612158c2c9b406e29dd70e2a3e182ce121bc92036eeb3362be0ba513a223cb2da41bdfe914d6861ae9d94ff33c5301cc23725ee771f47876c8095ae0b8 SHA512 b91bca3bac184723b3f6dc0c5db012f2ec0895ed55cd4ff83f73d35462b9cea654476c848f7d61559a4bd8661ce335fc71a45a7cab1165f4197d265e31eccc71
 EBUILD xdebug-2.9.6.ebuild 1194 BLAKE2B 3bc713d7a87b093287f00a41372c72c0245d7a8db887c90110eb047df2a1511d0aa313623c289839668fbc8d79e9a53be4d90ef3de02e8a0b087dcecfd1d066b SHA512 ca1870abca6bf2f68ee42cbd81db5eb65cf91d2fde533f1dd7eb14b5067f830b134716115629270d415e8ec5d0a0653a175a40f36c6f37a3a9ea9e6ad1c8215d
 EBUILD xdebug-2.9.8.ebuild 1198 BLAKE2B c248c825f3437ff09276529712c5baac9d2e8067842cdab6c62779939c9accc53d18e5bd6b650a6a7df98b3fff633686d89a276e001fce3fee45e35d77353d33 SHA512 ea107d25c3d47c2f1b8f62a689d7d796ef7c76b7301f991f3162770a5a4cd9232e392234e9c21342a1aac3a4d2bf3aaa912d58df132ca09ed60d9a1da59fd7f3
 EBUILD xdebug-3.0.2-r1.ebuild 1539 BLAKE2B af6fa2bcce4eb467ce2d27f32d30ab0c6b064869d4dc2ba1409fd6d40fc0cbcf0cffe4679b174f93eb8a0ac657d518ae14f0acd66830d3d9c9996c6d8976ebf3 SHA512 7ba76f4089b5955252daa240ba838340d2d7eefa6223380d7b8df5d4af0e3a38732908517e520da516b63fc68b46d0f845b71d788c617435d575099b9201e2ea
 EBUILD xdebug-3.0.3.ebuild 1539 BLAKE2B af6fa2bcce4eb467ce2d27f32d30ab0c6b064869d4dc2ba1409fd6d40fc0cbcf0cffe4679b174f93eb8a0ac657d518ae14f0acd66830d3d9c9996c6d8976ebf3 SHA512 7ba76f4089b5955252daa240ba838340d2d7eefa6223380d7b8df5d4af0e3a38732908517e520da516b63fc68b46d0f845b71d788c617435d575099b9201e2ea
 EBUILD xdebug-3.0.4.ebuild 1539 BLAKE2B af6fa2bcce4eb467ce2d27f32d30ab0c6b064869d4dc2ba1409fd6d40fc0cbcf0cffe4679b174f93eb8a0ac657d518ae14f0acd66830d3d9c9996c6d8976ebf3 SHA512 7ba76f4089b5955252daa240ba838340d2d7eefa6223380d7b8df5d4af0e3a38732908517e520da516b63fc68b46d0f845b71d788c617435d575099b9201e2ea
+EBUILD xdebug-3.1.1.ebuild 1546 BLAKE2B d56bc1642335887588ce55e0fe95bc3dce1ca6855cc35358013dac6044c99b27748d4d7e01aa3f537abac424064b7479fed7c73268e5aeba384d6ad277d31915 SHA512 7ddf2d464b82f101f482802f4c2e1e1f37b8ad5598107ae74b790681f4522e32b91cf37b4ee562eac4f0e43c94491138d10f60b468cdc550e1e9495a8ac822a1
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/xdebug/xdebug-3.1.1.ebuild b/dev-php/xdebug/xdebug-3.1.1.ebuild
new file mode 100644
index 000000000000..00bf4b8a058b
--- /dev/null
+++ b/dev-php/xdebug/xdebug-3.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+PHP_EXT_INIFILE="3.0-xdebug.ini"
+
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
+PHP_EXT_NEEDED_USE="-threads(-)"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A PHP debugging and profiling extension"
+HOMEPAGE="https://xdebug.org/"
+# Using tarball from GitHub for tests
+#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+# Tests are known to fail
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+DOCS=( README.rst CREDITS )
+PHP_EXT_ECONF_ARGS=()
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		TEST_PHP_EXECUTABLE="${PHPCLI}" \
+		TEST_PHP_CGI_EXECUTABLE="${PHPCGI}" \
+		TEST_PHPDBG_EXECUTABLE="${PHPCLI}dbg" \
+		 "${PHPCLI}" run-xdebug-tests.php
+	done
+}
+
+pkg_postinst() {
+	ewarn "We have set xdebug.mode to off, as xdebug can be"
+	ewarn "installed as a dependency, and not all users will want xdebug to be"
+	ewarn "enabled by default. If you want to enable it, you should edit the"
+	ewarn "ini file and set xdebug.mode to one or more modes e.g. develop,debug,trace"
+	elog ""
+	elog "The 3.0 major release changes many options."
+	elog "Review https://xdebug.org/docs/upgrade_guide for differences from 2.x"
+}
diff --git a/dev-php/xhprof/Manifest b/dev-php/xhprof/Manifest
index b3976bfe7df5..6add44540cb0 100644
--- a/dev-php/xhprof/Manifest
+++ b/dev-php/xhprof/Manifest
@@ -1,5 +1,7 @@
 DIST xhprof-2.1.4.tgz 841444 BLAKE2B 33be85d55f2636af5664aeb017ccaab6ad03962d44b3143c0eb9d9f9cc0fa74048fbca6beae89d02ed47db8ffe1ea77df1f6a41aa62fbc90fea2c52c467a422d SHA512 8777d29c16bce9e7698cf37c7dd631e951a018fa63ab5a4ab0df8e7621643e7fb905cd9bc189b238d76e32408a43f522bbab455caab6b89f7b6c26590b2733a3
 DIST xhprof-2.2.3.tgz 842543 BLAKE2B 5940a5ed8edc334ae2dc09d4621ed7fb4b8b56de6f07dc49e4a84ced33689f242f11ac89dced670f7b54d35fe8c9840fea09e55340174c399fae263760ca35ac SHA512 000468a7fa2a0af25004f0ffd59a8ab111a5cfa4cff275291fcbc54d3283fbf4a904b4aaeb38c2a8c7c81924bc31d9328ccf9fb7de24e20c224e014ed942efaf
+DIST xhprof-2.3.5.tgz 842658 BLAKE2B 4392b521e8b4c10dc745bbd670c351231680e753251b1d1e3c7048e17fa5a88a6c79da39f3c50b8642ca0c1a5b9658e4dafe6ed4af3dc97c71265f021438fda9 SHA512 50ae6fb8d63ac8354b7887daecd1882f33e616cd1ef165b54d51f26fa93d2827f621e89d0d583979c453af5d66a83ddcbf0eb2d462df74ebb422294e601268f4
 EBUILD xhprof-2.1.4.ebuild 376 BLAKE2B f682e1a892a38da3f476f6175a2c2224d7b0e03a1350de4e782a6159b828fe791fd66e6c30a9f1fa957062c6d6fcca06d16017823786ae7ff221f60ad3a3ac07 SHA512 8798ba51484b6aa0cbbd977305155f67697788334e2b13939141e83c79f59c1149a80ac510be3177f5fa15f4de20141e856b8cf4cc8e7667a9ef2aa1900200f6
 EBUILD xhprof-2.2.3.ebuild 383 BLAKE2B dab9fe1621ed7d9acff750e74013a49f69e4b93189c1fa91f644e946d5c17d17ac9bda5f5f2071b7e230a8ad16734e55c19dfdff29214453792ca30d365257dc SHA512 d22827c910a517930484fdc00f64dfdc97b26cae1e0930dc1e4de20c8e64b41dfe661386b219e8c58f8b6125f26227f63e6ab9ffbe9be0ce8adc5e28570af865
+EBUILD xhprof-2.3.5.ebuild 390 BLAKE2B a1fa3102cfd3d13e831173903006a769d2f74bad91293107c16b4667f9f406f65b7b968d9379f56778d77b706c6370f7f5127e051f4443d1676340b58034a17c SHA512 ec44c3114389a063e10d6ce8fddc1c9357866a7bd7ad312008bc552ca55a81e336f3b31db291a42b18bcc5d6d941bc308a5d6262a81979c2f77b9c28319f591e
 MISC metadata.xml 321 BLAKE2B bd5867e37a58414df4f5990d3e88fb87819319e401eb37630e181195417e90b43a4c793fa49b76c280783991b4293431cc9d9aa1d10314df21f33015b63f0d6d SHA512 8abd9b96fd0731bb2b70817539c1785ed4c4fc34f03b8f4f5822bd4e75a68d4b4bdbdd9bb0eb54bc0d9ef616edd01f80b3c1f2954d1f096baf2b66255136e25f
diff --git a/dev-php/xhprof/xhprof-2.3.5.ebuild b/dev-php/xhprof/xhprof-2.3.5.ebuild
new file mode 100644
index 000000000000..e7f6bda6ad82
--- /dev/null
+++ b/dev-php/xhprof/xhprof-2.3.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_S="${S}/extension"
+PHP_EXT_ECONF_ARGS=""
+USE_PHP="php7-2 php7-3 php7-4 php8-0 php8-1"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://pecl.php.net/package/xhprof"
+DESCRIPTION="A Hierarchical Profiler for PHP"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
diff --git a/dev-php/zetacomponents-Base/Manifest b/dev-php/zetacomponents-Base/Manifest
index 9c4b927859e4..8cc328b7b06b 100644
--- a/dev-php/zetacomponents-Base/Manifest
+++ b/dev-php/zetacomponents-Base/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 2999 BLAKE2B 7e178de212e6f26e621509ced47998bdf501df0a7ece33f98b943c5bfcc4ca32a886e0a09cb83975f83148a29736be50298281f302094f6fb32c91a695c97d76 SHA512 70f2f358fffd4b9d7a9af07badf2e000974ddbde9230797ef4cc955a73326c665e947278ebf3967d81b93c97805293ab230aea7aa3bb98a56d7a3c34cf20be94
 DIST zetacomponents-Base-1.9.1.tar.gz 252350 BLAKE2B cc0d82a107fc1190b57b03ce3a594d9ffa5b3a2627cf30d7d31a1018005a8400917cf7bbd1dfeb23f46d118ae56083e147d148b3bbdba5dfea8fde0a8bcf0c46 SHA512 dd56f123c8ed3b8c0116b878120ba7763e402b8364ba404305a9ab483b1c5a341df994517f160c8a959005ab9b75a5a7af74d08b367daa3fd8f852ba4ede5e05
+DIST zetacomponents-Base-1.9.3.tar.gz 253144 BLAKE2B 5e8e5188e67d06da2a4ed0d9cd1df86d15740390109f98028a71cf0aa0cbfaab1a47007095faf7ba8c7fd9b6bb3daae7b3d6fae76cae8b82751b3d67b3680614 SHA512 5718095cbfe657c08b9adf71e4cada49e2edf8518601e235070ac8fb8fc5793bc4ba8a0cb1a4202210fc23884960d06f502288a94cd624c96a53e2fcf395d492
 EBUILD zetacomponents-Base-1.9.1.ebuild 591 BLAKE2B 46742e05fa84bad59fd2634b0c96a646f129a35c7977d4ab8c69269e395106fef81efde3805216364d807a464dd6c5fd4b5e04cb21e77f1ebd2f9801aaa04245 SHA512 b0122d1d9418b572176cf818e4fd41668b54300bc9db66305d4dbe0d5036cd2fbb2c3c7355ae9f862717c4cf3cbdcabc2faeef98fa66c88e4e0a460ae7dfbe58
+EBUILD zetacomponents-Base-1.9.3.ebuild 597 BLAKE2B c3d480e9e300fc01fb19bfe98e72bca9212090956898dad5ca96cf7220e68d3ecb073c907480e5d08aee748c96320129b6c43734e3aa81863f263cc19d378d2e SHA512 8992ed2a572611c301d5442bab26f2bd6e6ec7fec996af4bb8a6a3a78fe7302b4f3108890ef8cc1225787125d582afafe5d51cc080b358a2491335a0fbb12508
 MISC metadata.xml 348 BLAKE2B 602880b1ca0ed2350af0df820eb034e3e731295c6a35fbf111ea4ca7506b93f581560c866a157c977c4202f0ebd35afd0809fc7add1455d6614bc2f7d37d3f03 SHA512 ae024be08f42891568ebf15f3369bd2578a4a1a53d1419cf321b56413bbdbb1efa754baf5c027ffdaa3f2da00e872f1d665777d2624a33a64546719b63232e6e
diff --git a/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.3.ebuild b/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.3.ebuild
new file mode 100644
index 000000000000..03ece24351ac
--- /dev/null
+++ b/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="Base"
+
+DESCRIPTION="Base package for any Zeta component"
+HOMEPAGE="https://github.com/zetacomponents/Base"
+SRC_URI="https://github.com/zetacomponents/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	insinto /usr/share/php/ezc/${MY_PN}
+	doins -r src/*
+	doins "${FILESDIR}"/autoload.php
+
+	einstalldocs
+}
diff --git a/dev-python/Faker/Faker-8.12.1.ebuild b/dev-python/Faker/Faker-8.12.1.ebuild
deleted file mode 100644
index 12e618b6e887..000000000000
--- a/dev-python/Faker/Faker-8.12.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.13.2.ebuild b/dev-python/Faker/Faker-8.13.2.ebuild
deleted file mode 100644
index 12e618b6e887..000000000000
--- a/dev-python/Faker/Faker-8.13.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.14.0.ebuild b/dev-python/Faker/Faker-8.14.0.ebuild
deleted file mode 100644
index 12e618b6e887..000000000000
--- a/dev-python/Faker/Faker-8.14.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.14.1.ebuild b/dev-python/Faker/Faker-8.14.1.ebuild
deleted file mode 100644
index 12e618b6e887..000000000000
--- a/dev-python/Faker/Faker-8.14.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.16.0.ebuild b/dev-python/Faker/Faker-8.16.0.ebuild
deleted file mode 100644
index 12e618b6e887..000000000000
--- a/dev-python/Faker/Faker-8.16.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-9.0.0.ebuild b/dev-python/Faker/Faker-9.0.0.ebuild
deleted file mode 100644
index 12e618b6e887..000000000000
--- a/dev-python/Faker/Faker-9.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-9.2.0.ebuild b/dev-python/Faker/Faker-9.2.0.ebuild
deleted file mode 100644
index 12e618b6e887..000000000000
--- a/dev-python/Faker/Faker-9.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.12.0.ebuild b/dev-python/Faker/Faker-9.3.1.ebuild
index 12e618b6e887..12e618b6e887 100644
--- a/dev-python/Faker/Faker-8.12.0.ebuild
+++ b/dev-python/Faker/Faker-9.3.1.ebuild
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index a6936e5c6a1f..91d13a68c24e 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,17 +1,3 @@
-DIST Faker-8.12.0.tar.gz 1151218 BLAKE2B b55d1b1bac6a580c51fdd3f87919cbcea107aff309bce4d2092ec77046dc40c67650f3c53d176147b6b433008e7487dae9e096eb9ba6c8722ec54ce5d6d39449 SHA512 5df90c0976cb8b5e96f4c6645a984e813130fd22f25b5fb99b7cd28b6e079eec54b19f8ca643b795be15f41b9f5b677e89db1379615479983f0b5519a6dd56b4
-DIST Faker-8.12.1.tar.gz 1151131 BLAKE2B fd59a337ed95429b34b2f9c1530a9db6ef4ec921d1c194e90e794ea6316fd8c79b8f2aa416ad8806cd2f4c31cca8d1d2cf60209a6bb4a75a708345a0bfb0a572 SHA512 e359b015d4908130b12ca6dd8c7e4801011de383eececb62f3ac76cb621cad1c9a873c5de989932405f7a30b33aef8969fb9788a331620db3d6c3ad1e5a657c4
-DIST Faker-8.13.2.tar.gz 1162423 BLAKE2B 595bac7a9a3031a46342ff19cfc1ef89bd7a5267dad3b1a18bda5cb3d96168eb0fda03adab940d35e499771ac1fc78e837631fe048fc374e0dcdcb62ac0a2002 SHA512 7da38c7bcf7b1b7364161092a38a2a9624ede6fed6e0bd9c8aec7acff83d4377bfef3e3ce2af48ea04d37eed0e880357bd40bca6eb81d19cdb876d66de249b04
-DIST Faker-8.14.0.tar.gz 1162580 BLAKE2B e0e5b7134d615b2cf64f9b995d28b931f56f421d6fe48117d78781f0fa03e3d32a9353cadfd27f216f116a30e3d3ef6b905ecdcd79d2630482b514b2841952f9 SHA512 4218a9e97bc3e72e59a2e5887fdeb8e38627cbb733ff270198acaf47fe993424e7819dcdd90856d0bf86f8dba77d7a73eed9bfe9c048f0962f671e2bd43a9c5d
-DIST Faker-8.14.1.tar.gz 1163121 BLAKE2B c4f42696f34872630a5cfc0a5203ef2983ee78229d88c90ade1ca0f180b4c441932c8ecb87088c35f297ea5083b3e0af328912c98c1b2a8aa5505c87e94f1190 SHA512 6e2e0fc182a084ee6c9c78baa323ce3574a89df9f1bf071f7c3210516e052b6428b367c65f7db51e3eb40d6f67eb4d75ec8b1ecd10648e40fd6bb170ab49b6c9
-DIST Faker-8.16.0.tar.gz 1164636 BLAKE2B 162c66e09eeac7c52fd8d289c10b8b9694dca955c17c00d0fd5772da3b68af8a86bd997df0acae1c104a6de4fa3789c95236544725c8094b9abb1432ea2c9044 SHA512 bb74d3d03a8afef8f961a71921f41650d2fb7faebc0be18fc8da341f2cd67746488109a09a2506210a86379eb65423d47054933901de51f33859ab2797f96c2f
-DIST Faker-9.0.0.tar.gz 1164493 BLAKE2B e87a1ccf15ae9db6b263bd229987deb00485a1d43fb20b3c6155ea5a10ef132d1d5def3f66bf00377ecb7db2f9ae24eb259b768d3713257b3c3832cf98f8fc4d SHA512 ba20a218693b14df8cb7d1387695ed8026618b410f0caacc658995ca9235af11d4114a6737aeb5788f0aa8c499e6701acd21983b52da5a5823438c230a5808ef
-DIST Faker-9.2.0.tar.gz 1166874 BLAKE2B 8590431fea1179a2e6459ae9b2d6d55e8b95a91848c26b6f0d9035be2568c5f3ca34708b4bbef7d06b53855c1c1fe800ad723f90ee330f9fab4c13e00530ae60 SHA512 1688bde73002419d73924435fc11b0346cafeae8f3d80d8162c7742859258f1ce34fb3b549d11d92e114fbdbb22c51776a9674f04b4f170a42cb2919ed3b54e4
-EBUILD Faker-8.12.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
-EBUILD Faker-8.12.1.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
-EBUILD Faker-8.13.2.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
-EBUILD Faker-8.14.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
-EBUILD Faker-8.14.1.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
-EBUILD Faker-8.16.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
-EBUILD Faker-9.0.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
-EBUILD Faker-9.2.0.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
+DIST Faker-9.3.1.tar.gz 1169930 BLAKE2B 464f092a5014ebfe2d6c1a83f8d30f13507835a35e8307a22accdd6da92dae02a541ae2f686d724686855ded7b7e0f3c1f3922de0040e22478d9b55b2833b84f SHA512 e7468b4d91b47ad22d300a37dfa21b91f354b46f845854a9fe8b40da61624dafea5fca4f519939fcc16a84e9d9d9f33f715dabf4e231b9950b4a5b3a37cfacd0
+EBUILD Faker-9.3.1.ebuild 723 BLAKE2B ae3fb5bd83c431960a804754b0c50ff925028373c5f40a1e11c7c4caf4fcea02787b7514251151fc92e74c9cb2a90c5d736b24e4e54ded6f619df731b1130039 SHA512 4a865912859241052c5921798bc53e045798ac4008af9c5f1f9b4954a1057ae5ab1afdb58291502bcbe6e6fc2c8370f0a42da1c7433029b0c2775d6bf91d8653
 MISC metadata.xml 474 BLAKE2B 337c8b17b4ca092edc2e59bd61dd847e4b9f2bd7e0651d07dad5b3e3eb4f311de9e27e6cad1f6a4835f618446cfa4cdb95e578a8af11498cf7bed1ec697990ce SHA512 35f4a2a50ad5589ba50e619670d1f1eac423fec920bb9c07b3f8bd7d7f2a0bb4e88dde286b062339b30ba304bd1a834bf3318c0b0ad0552ce9eb45fa72e5f44e
diff --git a/dev-python/GridDataFormats/GridDataFormats-0.5.0.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.5.0.ebuild
deleted file mode 100644
index bae94c0b169b..000000000000
--- a/dev-python/GridDataFormats/GridDataFormats-0.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Reading and writing of data on regular grids in Python"
-HOMEPAGE="https://pypi.org/project/GridDataFormats/ https://github.com/MDAnalysis/GridDataFormats"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# This test needs porting to newer numpy
-	sed -i -e 's/test_resample_factor/_&/' \
-		gridData/tests/test_grid.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/GridDataFormats/GridDataFormats-0.6.0.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.6.0.ebuild
new file mode 100644
index 000000000000..985d8f0eef44
--- /dev/null
+++ b/dev-python/GridDataFormats/GridDataFormats-0.6.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Reading and writing of data on regular grids in Python"
+HOMEPAGE="https://pypi.org/project/GridDataFormats/ https://github.com/MDAnalysis/GridDataFormats"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/GridDataFormats/Manifest b/dev-python/GridDataFormats/Manifest
index 8c25310b858e..e5f6af4d610a 100644
--- a/dev-python/GridDataFormats/Manifest
+++ b/dev-python/GridDataFormats/Manifest
@@ -1,3 +1,3 @@
-DIST GridDataFormats-0.5.0.tar.gz 1982315 BLAKE2B b230fd2843ab6a5826ee425fb3fad9a0d5d75a292aa3b6b150e76fa515b68000efb8e1b4140619c0c489f34ac7e3ce6d979e97526c212caf3e808be07b33afcd SHA512 9cae1fe0f4f27bd966c1563831f8a9257ecbe14a7a6f011753355070449515b9b0ad1f31867c2c199c9703aebd5a3b40a03c1276f3bb6ff51447f7a870fdefe8
-EBUILD GridDataFormats-0.5.0.ebuild 802 BLAKE2B da7d7d3ff639b359bd14787069c167e225a02ffe40e73eb8def5defcca0ee2b169c8943849a43bf57b1b8f719dcede578fb068a83cb29279ceea85b6da144543 SHA512 526ce0f425ca76edb681c804a14cfb44257fa3c0f9a769bbd83beb7bd11fcda18cfa978ca0f907622dc716b34574aadff9882dda3b26494f2191736a4bf640e4
+DIST GridDataFormats-0.6.0.tar.gz 1984859 BLAKE2B b53e6a43a06fdcb42fbef4c10dbdb1b5740fc04fff468b666c687ba5a839b8129b49358d54c6d7e4229ebaa67af01d897fe960f87a868950657bbcbb85ec7487 SHA512 b876eacd7b1d3a7dd6fe35e2092783183fb0ffadf7fbf583773e6a3401bef51bd33ebb2e73f8b4ec9cd404c153c30ce09dfb75d5e4aacba53915d085f090d0ea
+EBUILD GridDataFormats-0.6.0.ebuild 620 BLAKE2B 25c320580183c150d77c9e10a103dd425b1cf005749a8686676c1fa8c1a1cf747df6b437a62783e39f1764a82c73e5c00ca754a076c79231d2b39e0a2edcf078 SHA512 74e25dc0724e53585cc03d7c4726531c9169d86c79dfd2d01faaaf03ec320eab4712cc826aca7e8a02a88e0215484276776d45a1f94e982c5886c80afabb4201
 MISC metadata.xml 507 BLAKE2B 7b2887ff3786b8272b46e764614058601c5ecc9e4322b6db8e206e6cdd9a002006be8ad806a877ebc8ea909de00053357d0a4a91c1ade5cacd232dd59e7b6e33 SHA512 2be6037b50f232ee3f58ffe6b071d737470254b6588a486eaecf4131c0b94fdd52737eb643bf69a0b032a58beaa689d4e14c8785ec1ab097085aeb6e9b0400b7
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 90d88f6d0554..64e11a3edece 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/MechanicalSoup/Manifest b/dev-python/MechanicalSoup/Manifest
index e19c66cea921..e9eb3fcc08be 100644
--- a/dev-python/MechanicalSoup/Manifest
+++ b/dev-python/MechanicalSoup/Manifest
@@ -1,5 +1,3 @@
-DIST MechanicalSoup-1.0.0.tar.gz 47572 BLAKE2B eace6cc4eaf50f01f8a7816d4d87a9345676b6921c8fe46b3280ac83463b241b2e6175b91ee1a5f907635c07ee8cf66324cb2e7938736b81e9a4f849f9159548 SHA512 00e2c5220c065b517301d9381a9bc5019f6f75dc5951a5ab4427fd7939b296b6b33a20b8f8a7e82c6feed2c9100e3481f38a424d63065883d71a6927119ad88c
 DIST MechanicalSoup-1.1.0.tar.gz 49270 BLAKE2B 947b35d819dc69508595adcfe5a0c8e6bd34888c995e9c3931613498ee1ca840ce16a14359aacbf9d40aa4f9ae59d45d14da5a150e3ce39ae7e72f587c94820e SHA512 26eaa54bcd1c0aac26504d7c482ed001830a1c79bf48a3055cef92348e9336887bef86cda68281911032159a3404a1f4ee8de9b6516d7d767cfd6b3b380c4ebe
-EBUILD MechanicalSoup-1.0.0.ebuild 1136 BLAKE2B 0edd9ad86145ea83f41dc23d228a75cb2642aa3e5ab5708f66dfce3c08f6d7d6a1d48c39ecff0145bb6a63fd600f6d8f27b060e6435d768b60b1fcdaacd1af8c SHA512 0f5a50ca4418176d54f241e1690fb5625049e0e2dfc12b2aa57a401fea5b9af6d97e8cf08127b6c903bdbc24c34c258a5b58fc7e362b825eed8a474cc05e77f7
 EBUILD MechanicalSoup-1.1.0.ebuild 1100 BLAKE2B bc8e99ef28493fd75fa1f405af24cc9e51f4e35a1c9ded1b5d1ef44b4b3d1e3e4ba29f6ee8ac07a03015aad17fcd7f1b52c3814a6b917ec35a152dd4694fd60f SHA512 839815b56da7212cd15c803b2abc47611ed9dc0a8f1c6751a8a309d5a840dbcc4ba2160c6e995dd02324d87344247b9e6adcc9d2f191bed8c510e7d56234550b
 MISC metadata.xml 551 BLAKE2B dca0b67c8f618d76be9c14bd4123c1505ad167fc9852112da79d3db4dfc9824ff5dbbd88e250d945bbec08c12aa4cbd91ce87f6fbfe85764ad62ff575b82ed9c SHA512 2e9b6096a8e9824b0619bed3446d24499fd1a41521708c73a1e2c3788d4f924fa07ee9b00abb4b4b96f7d59d068c5e336a88a7c1951f7337bff12e600a49c4da
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-1.0.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-1.0.0.ebuild
deleted file mode 100644
index 898b3da8d112..000000000000
--- a/dev-python/MechanicalSoup/MechanicalSoup-1.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python library for automating interaction with websites"
-HOMEPAGE="https://pypi.org/project/MechanicalSoup/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/beautifulsoup4-4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/requests-mock-1.3.0[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	# Override pytest options to skip coverage and flake8
-	sed -i -e '/^addopts =/d' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index d2b6641f532e..c83c1c1314e7 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt-builder-1.10.3.tar.gz 5725537 BLAKE2B da1abab8fa46da9dee15dedbcf84068b80ce081e87e640fc50642ff6dd15aa3963b9186a32193f3c492c4f141fb7242f13395a539f436575532a5735e3c85720 SHA512 26a01cb2dc4428277cc62da23404433d75f84c61360c35dfd9c440841adbcb1bf39b2211e4e33967ee2730c163dd1585b5fcbd88c6fd7efa2f1f84915a390e2a
-DIST PyQt-builder-1.11.0.tar.gz 5704150 BLAKE2B 4706e8c8663356e7c70b60c19c45db726de6b7b1b05f218aba5a966318cea497219f685f295b9069c0059e88eca053a97717a7a52add7c5ea59820bff2b810ea SHA512 4eeafaa725afeffa5794cc47e733ecfa99887c0f14f461843f4b8c71fbdb2ecf58ba05ca64dbec3e00bb2c192a25e29ee78e93d0bad742becb3379bd357e8e68
+DIST PyQt-builder-1.12.1.tar.gz 5726601 BLAKE2B 6e6dd181078ed126ecf3db7bbf5e7b68b78ec78e2ca198fb4f504495020c8fc7d61280bf844a78de69621049785b0b152f31d0d25779d7bbe330162bb80b68bf SHA512 4f006564f51758cb05da8dce78aead58a23d132405124e92bf79cac39eaa845efa5db15a2abdd43ae95e191d38d81fbc592f75bb68f83b83e25c51f8f84e6182
 EBUILD PyQt-builder-1.10.3.ebuild 946 BLAKE2B 304781da6d7817ccdcd49df6a4051c931f26c82d209ad73599a51a24303fa49f2f609af77f4fcff124ce9fb2c885d0484764dc17aaeea8e5ba2c0752e113b64b SHA512 5a184b3c2224f97b74bba216f5e5a4e3f5b1fa10ee44d3ffccbceb27b0d1ead5d38a9d8a6bdd20e3473649db2bf030ab4d512805b9f6849acd5cc7baf796cbf9
-EBUILD PyQt-builder-1.11.0.ebuild 946 BLAKE2B 304781da6d7817ccdcd49df6a4051c931f26c82d209ad73599a51a24303fa49f2f609af77f4fcff124ce9fb2c885d0484764dc17aaeea8e5ba2c0752e113b64b SHA512 5a184b3c2224f97b74bba216f5e5a4e3f5b1fa10ee44d3ffccbceb27b0d1ead5d38a9d8a6bdd20e3473649db2bf030ab4d512805b9f6849acd5cc7baf796cbf9
+EBUILD PyQt-builder-1.12.1.ebuild 946 BLAKE2B 23157d7b647c5105298392559ece5050a405557d8d5214840d4d3f1bfff19136eeb6fd38367bfbf9484e056ed18dba4b660c9f9023b22e1d562c97d0ab26dd1b SHA512 433c2fe55eddb14748a6274dc3ebcc7875432dd248a4c3c216c122af36ada47e8b3ddd59890ff8bc6030c40c67765869d2ee5c8545a307dec9eaa1de9356c00a
 MISC metadata.xml 666 BLAKE2B 2602886cadc8244466e26c92178552ac1f618ace1dcd6eca9ced2c3e0f7a7777c435f842f1581d93ea7642dbcc278a4aa59a84305f5a825f39edb736e7d29f69 SHA512 42746ac242170047e0a44389c8d2e8eb5be60fbff1f5f1908802e5c3a04a0c740fe338c9b3049fc03bdb45a4182b388aad9b89a573e87d440a9a833443a1470c
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.11.0.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.11.0.ebuild
deleted file mode 100644
index 4d69521c2f08..000000000000
--- a/dev-python/PyQt-builder/PyQt-builder-1.11.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The PEP 517 compliant PyQt build system"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/sip-5.5[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx doc --no-autodoc
-
-python_prepare_all() {
-	# don't install prebuilt Windows DLLs
-	sed -i -e "s:'dlls/\*/\*',::" setup.py || die
-	rm -r "${PN/-/_}.egg-info" || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.12.1.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.12.1.ebuild
new file mode 100644
index 000000000000..45ce770808ff
--- /dev/null
+++ b/dev-python/PyQt-builder/PyQt-builder-1.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The PEP 517 compliant PyQt build system"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc --no-autodoc
+
+python_prepare_all() {
+	# don't install prebuilt Windows DLLs
+	sed -i -e "s:'dlls/\*/\*',::" setup.py || die
+	rm -r "${PN/-/_}.egg-info" || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/PySDL2/Manifest b/dev-python/PySDL2/Manifest
index a2f4941af19c..ac2cb3042d8f 100644
--- a/dev-python/PySDL2/Manifest
+++ b/dev-python/PySDL2/Manifest
@@ -1,8 +1,3 @@
-AUX PySDL2-0.9.7-nameerror.patch 942 BLAKE2B e8f0bb42f4e1ab6ec975a68911a82da2b2bc726dfb88ddde6a6eacdc65cc44acdac1de9aa4c1fd77c4ebd059b5230d267f02730235042dfa4a4a0db7ce26c195 SHA512 e0fa73ab8408384771769a24e016776c7a7878900cf84e622312847243b6c63634a7133599b79d31969c17a6107b692f7a0e927aba6d4275c81587570ba51513
-DIST PySDL2-0.9.7.tar.gz 1079253 BLAKE2B 986a21d8c2f4f45df683d85a8369be7b39f102e59a1b3fd37e2941065a1174d5cd6dd056f78fbc66663e2cf50228ee40abf67352e5ae75176a9c000fb6f672fb SHA512 10d40063762272eaaae1cb6290e007481887806938ba0ba17d28974a3a3c8b36570054587001d00eb9ab4aa2375c616c43a81c7e7308fbb9b61b55b3eb7da5ac
-DIST PySDL2-0.9.8.tar.gz 742279 BLAKE2B 403fba93f446f6eeb8c3b365f02207e5447c4fc16a08835ef81a1846491a4a3745ea1b7694f3b5ec3e7058975f33c20885065a4521f50aaf5c290728dbac9dd0 SHA512 674af175b1c5bd9b4100f94738c41b9b5517d2d536a7d6f7a356aafa81b67bce8349c74c166ae9289b8f746a9a16c785f88595bc48399d834d62af5355c59344
 DIST PySDL2-0.9.9.tar.gz 743302 BLAKE2B 1e9e0eeea48b838227d3fe6ea93311d445b1d3a15588f4b83d075d18306b419ba3512826e44c5e4ecc2aec59ad44da73372ec740ebf6106271fd0b77175b88d7 SHA512 52b469735b1229392ea2f73b2dfcf1e75cedf7582a488461be9b06bc072f82a5c8c559d345a0c3668829c0f8bb2996005d538465ed7d2a45fb8480001fd0ccce
-EBUILD PySDL2-0.9.7.ebuild 1544 BLAKE2B 3ce6adc5e9fbd9e395b908d1cc114535427729d111030be0a9c22cae1720ad9f1f0e16b6ae6442a4bf45e7d85e249f7a9978ca7436edb801b8994ed25b883ac1 SHA512 7113cf7aaa61cd630532e4cc4e2d3545902612629c4d326db8de88e7166f9b4515b0580e0ade8c49a08c0b20ec0da6bb592802e3e827fd05ff1f265db754e60c
-EBUILD PySDL2-0.9.8.ebuild 1470 BLAKE2B 7fc6e28e999dad910cc51c4ba37c016e983ffcd1f5c226b402f824bccde5aecdbee8fe9d446b9d145b2c0a6bd9415536a531f248fd6b7cb91f346aea41e10373 SHA512 d05ed9743dc77ca0c39cba979322c02090b9f5b4e8eb36ea1a7f954a97fe752426862f9f65ae70f6543d4a333bc31616b11e58d24068463932024c7da8c118de
 EBUILD PySDL2-0.9.9.ebuild 1470 BLAKE2B 7fc6e28e999dad910cc51c4ba37c016e983ffcd1f5c226b402f824bccde5aecdbee8fe9d446b9d145b2c0a6bd9415536a531f248fd6b7cb91f346aea41e10373 SHA512 d05ed9743dc77ca0c39cba979322c02090b9f5b4e8eb36ea1a7f954a97fe752426862f9f65ae70f6543d4a333bc31616b11e58d24068463932024c7da8c118de
 MISC metadata.xml 452 BLAKE2B af30151f34ac5bc3eb54885a9bc3d27f2a2aa382b4645304f75e7cae5fecba1861d792b351ebbd3728ab4de19be4dfb5783e70354fe055e0e86611c0a0a7ae16 SHA512 4a64c9e36268fdf570a1b5eb8362f1d3e6c6c9159bf4a7200b37491d6c37ea6da988f569440f53ed62d69efe4ec23d44ba6da0d341abe7457a8b259f089bc5c7
diff --git a/dev-python/PySDL2/PySDL2-0.9.7.ebuild b/dev-python/PySDL2/PySDL2-0.9.7.ebuild
deleted file mode 100644
index 8508908fc726..000000000000
--- a/dev-python/PySDL2/PySDL2-0.9.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Python (ctypes) bindings for SDL2 libraries"
-HOMEPAGE="https://github.com/marcusva/py-sdl2 https://pypi.org/project/PySDL2/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( public-domain CC0-1.0 ZLIB )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Optional deps:
-# - dev-python/numpy,
-# - dev-python/pillow,
-# - media-libs/sdl2-* (loaded dynamically via ctypes).
-#
-# If a reverse dependency needs the specific module, it should
-# explicitly depend on the optional module in question. You also
-# probably need to explicitly require some media-libs/libsdl2 flags.
-RDEPEND="media-libs/libsdl2"
-
-# Require all of SDL2 libraries and at least the most common subsystems
-# for better test coverage.
-DEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		media-libs/libsdl2[joystick,sound,video]
-		media-libs/sdl2-gfx
-		media-libs/sdl2-image
-		media-libs/sdl2-mixer
-		media-libs/sdl2-ttf
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-nameerror.patch
-)
-
-src_prepare() {
-	# tarball uses DOS line endings
-	find '(' -name '*.py' -o -name '*.rst' -o -name '*.txt' ')' \
-		-type f -exec sed -i -e 's/\r$//' {} + || die
-
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	# from .travis.yml
-	local -x SDL_VIDEODRIVER=dummy
-	local -x SDL_AUDIODRIVER=dummy
-	local -x SDL_RENDER_DRIVER=software
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/PySDL2/PySDL2-0.9.8.ebuild b/dev-python/PySDL2/PySDL2-0.9.8.ebuild
deleted file mode 100644
index e3b42a45db2c..000000000000
--- a/dev-python/PySDL2/PySDL2-0.9.8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python (ctypes) bindings for SDL2 libraries"
-HOMEPAGE="https://github.com/marcusva/py-sdl2 https://pypi.org/project/PySDL2/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( public-domain CC0-1.0 ZLIB )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Optional deps:
-# - dev-python/numpy,
-# - dev-python/pillow,
-# - media-libs/sdl2-* (loaded dynamically via ctypes).
-#
-# If a reverse dependency needs the specific module, it should
-# explicitly depend on the optional module in question. You also
-# probably need to explicitly require some media-libs/libsdl2 flags.
-RDEPEND="media-libs/libsdl2"
-
-# Require all of SDL2 libraries and at least the most common subsystems
-# for better test coverage.
-DEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		media-libs/libsdl2[joystick,sound,video]
-		media-libs/sdl2-gfx
-		media-libs/sdl2-image[gif,jpeg,png,tiff,webp]
-		|| (
-			media-libs/sdl2-mixer[flac]
-			media-libs/sdl2-mixer[midi]
-			media-libs/sdl2-mixer[mod]
-			media-libs/sdl2-mixer[mp3]
-			media-libs/sdl2-mixer[opus]
-		)
-		media-libs/sdl2-ttf
-	)"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# from .travis.yml
-	local -x SDL_VIDEODRIVER=dummy
-	local -x SDL_AUDIODRIVER=dummy
-	local -x SDL_RENDER_DRIVER=software
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/PySDL2/files/PySDL2-0.9.7-nameerror.patch b/dev-python/PySDL2/files/PySDL2-0.9.7-nameerror.patch
deleted file mode 100644
index c94d354c576f..000000000000
--- a/dev-python/PySDL2/files/PySDL2-0.9.7-nameerror.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 635048e81402f3dcc9719c060a67f33e6950649c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 12 Jul 2020 08:18:06 +0200
-Subject: [PATCH] Fix NameError when calling SDL_SetColorKey()
-
----
- sdl2/ext/image.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sdl2/ext/image.py b/sdl2/ext/image.py
-index 1a413e1..49d897d 100644
---- a/sdl2/ext/image.py
-+++ b/sdl2/ext/image.py
-@@ -154,6 +154,6 @@ def load_image(fname, enforce=None):
-             # If the image has a single transparent palette index, set
-             # that index as the color key to make blitting correct.
-             if 'transparency' in image.info and isinstance(image.info['transparency'], int):
--                sdl2.SDL_SetColorKey(imgsurface, True, image.info['transparency'])
-+                surface.SDL_SetColorKey(imgsurface, True, image.info['transparency'])
- 
-     return imgsurface
--- 
-2.27.0
-
diff --git a/dev-python/PyUtilib/Manifest b/dev-python/PyUtilib/Manifest
index 1aefa7c0aeb5..b3f0431643d7 100644
--- a/dev-python/PyUtilib/Manifest
+++ b/dev-python/PyUtilib/Manifest
@@ -1,7 +1,4 @@
 AUX PyUtilib-6.0.0-tests.patch 510 BLAKE2B 729853aaeebbb3de8ed7a9a8e466a5df3addcbd755e9951d3745ca46a13c8a4b42844b80392c687acb586d8f4edfb04f43fe158395ad1e7f92ec1df919b93bd9 SHA512 3779c4d0c20b967275e67091500b00d7fae3c5ad655e518a50dc653eb11d17c468a46ff67bb928f1652b4cd95c81cff724f5cde875e1e5fd8667c76312c9ec3d
-AUX pyutilib-5.6.5-tests.patch 1413 BLAKE2B 8cfb6abadbd0c83adccd69cd18dd85aa2c58ad6d8610de0912397e626704ff6921ed54869c0ea2e7dd1567070e5061fa424d7749236cd2e8321d17a6b60ad4a8 SHA512 00d838e4eab285e7eaa1fe802abd1fa22f3a662fd10220cc3811fab6d9025dcb327811e13ee13f2102ff1ff2b8b132a10c32cabfb94080940dec691b6a890298
-DIST PyUtilib-5.7.2.tar.gz 1566034 BLAKE2B 913c6576b39f14c19e2e633c36ade33fe812c77a37374c7c14d2fb4384ca38f68efd55209d70e96d9a78fea2fcf1cf83423680d0787da2d03cab88e59a208b96 SHA512 d9d7d890cdb524bb055885354784f2af01967164ce88cf3b144ccffb0a855ef34243fd518c58193517ecfc50f3c2e3ca333f026951c1ab0b38ce181ecf9e7750
 DIST PyUtilib-6.0.0.tar.gz 1569916 BLAKE2B ee4085b597e928c5d6602b647f122c562f2e05dcaf300217cea9c5bc652f6acb5dbe5a075cbbbc1b81497987ab5c658f86cc3e44e16cae02a37d546b2e925a9b SHA512 7841a84ee8d66d2d7af3db810e4d787030acbd8e3e81c3f61251ea160931feddeab6f4d205977a411964359f1cb7e7e59e846593c113093e01c48b81784f7477
-EBUILD PyUtilib-5.7.2.ebuild 1222 BLAKE2B e0e4ade52f636257729c1af0bc91cb7867409654e81177e63a9a337e7bd39f8d13b57c1a2061f07f5d64a42c06226493d2c937dcf371ce304dbdf8bc7f463a03 SHA512 64d5a8cbd2d7433a460931e32f3d592a12b3aa1610706f4c6267491f46d5839202b887684b02f0b82f697806a97af9f997da01ea72a3e6a49e70f18e15325ea5
 EBUILD PyUtilib-6.0.0.ebuild 1131 BLAKE2B d4f542aa1b38f5d15482a49c9d6f03f95f939d5fc37813cdef0b44d8fc8435ae0f99b8204b2bb00a98e1424b121f6db0e652c1735fde72dc41e16652ae40b4a4 SHA512 b579ef976d91508f6a63a4fbbdf60d60594c1f911bcce638b5749a180c98392ae2e163fb55994e8c302de8e6db8c8178f77fcaaab900776cd1d429444566c8fe
 MISC metadata.xml 424 BLAKE2B b1f7f100094d235fc3d266bc84cf39208b5afd1fbf419fc796ed2884527a641dea52173d607e6d40f0292316695e8ead2d387cf4c427c0983ee32d8620b08f6b SHA512 be42d862d2b6af906fcd65cb073eb7daf1540cdfd41e451fc8a1766875e875e501d7deeaa3410146cd07fe78f94a9fed1d7cfbe935db47e44144844f573af154
diff --git a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
deleted file mode 100644
index e1418c3cb92e..000000000000
--- a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of Python utilities"
-HOMEPAGE="https://github.com/PyUtilib/pyutilib"
-SRC_URI="https://github.com/${PN}/${PN,,}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN,,}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/pyutilib-5.6.5-tests.patch"
-)
-
-python_prepare_all() {
-	# remove some tests that are completely broken
-	rm pyutilib/component/app/tests/test_simple.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-
-	local -x PYTHONPATH="${PWD}:${TEST_DIR}/lib" \
-		COLUMNS=80
-
-	nosetests -v --with-xunit --xunit-file=TEST-pyutilib.xml pyutilib || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${ED}" -name '*.pth' -delete || die
-}
-
-python_install() {
-	distutils-r1_python_install
-}
diff --git a/dev-python/PyUtilib/files/pyutilib-5.6.5-tests.patch b/dev-python/PyUtilib/files/pyutilib-5.6.5-tests.patch
deleted file mode 100644
index 780c586759af..000000000000
--- a/dev-python/PyUtilib/files/pyutilib-5.6.5-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/pyutilib/dev/entry_point.py b/pyutilib/dev/entry_point.py
-index e571cc7..e0200e9 100644
---- a/pyutilib/dev/entry_point.py
-+++ b/pyutilib/dev/entry_point.py
-@@ -23,7 +23,8 @@ def run_entry_point(package, script, args=[], **kwds):
-     script = str(script)
-     assert type(args) is list
-     cmdLine \
--        = "import pkg_resources,sys; "\
-+        = "import pkg_resources,sys,os; "\
-+        "pkg_resources.fixup_namespace_packages(os.path.join(os.getcwd(),'build')); "\
-         "sys.argv=%r; "\
-         "sys.exit(pkg_resources.load_entry_point(%r,'console_scripts',%r)())" \
-         % ( [script]+args, package, script ) 
-diff --git a/pyutilib/enum/tests/test_enum.py b/pyutilib/enum/tests/test_enum.py
-index 52451ef..66313f4 100755
---- a/pyutilib/enum/tests/test_enum.py
-+++ b/pyutilib/enum/tests/test_enum.py
-@@ -11,7 +11,7 @@
- """ Unit test for ‘enum’ module.
-     """
- 
--import unittest
-+import unittest, sys
- 
- import pyutilib.enum.enum as enum
- 
-@@ -355,6 +355,7 @@ class Test_EnumValue(unittest.TestCase):
-         for other_value in self.other_values:
-             self.assertNotEqual(test_value, other_value)
- 
-+    @unittest.skipIf(sys.hexversion > 0x03040000, "can't compare int and tuple on python3")
-     def test_sequence_other_values(self):
-         # An EnumValue should compare sequentially to other values.
-         test_value = enum.EnumValue(self.SimpleEnum, 0, 'test')
diff --git a/dev-python/Pyro4/Manifest b/dev-python/Pyro4/Manifest
index 9cf9adfec318..4bbe2223b74a 100644
--- a/dev-python/Pyro4/Manifest
+++ b/dev-python/Pyro4/Manifest
@@ -1,5 +1,3 @@
-DIST Pyro4-4.80.tar.gz 515103 BLAKE2B 5d2b69ba020117947a36c9c75f884434a3452167fa2e586e3a5b0e6deb1d0c8c54dd06a20b9568b53a0a6c42a847d880636e3abe37090246d5f34ca84e915b36 SHA512 8e41285674edbe5c8d5ac63e33406c5ff7b6366d5dd251a1755eff81611193278a473ed8b15f995bc0ba2775dc5d316eb6a3cafd63626b95820591ea3a0a92e3
 DIST Pyro4-4.81.tar.gz 514678 BLAKE2B ffe9edcb947203b37cf1b13b2380f2b7d76357a5bca36e454fe67f6bd0d34574f5df429dd784ba2c2bc69c0188edd14e4572f12f5c137d87d2898f01ea3e855c SHA512 3848d473acd624ae1356ad3470c669eb0bc30287691ff8b9fc27fb0591ba305812c6be1946d6a2a91377e222a9e114f05ed18170d1b035dec24e436ab8dadc59
-EBUILD Pyro4-4.80.ebuild 1312 BLAKE2B 0dbb9d51095a1f921f23ee0baf4fe00661366f4a6de6c204053b43fa8fc38ecac25364809f175b3c619bb0e62b223e437c02d6d4bb70e4481f3b325986caf925 SHA512 1983aac0919d20cc10228324398f5073f81c08c30377b5cc9067330509c07702b1e01cf38e6a9d3e7adeb8b1ebf26060075bf15b4305e3183ccf683ab4c3d8ad
-EBUILD Pyro4-4.81.ebuild 1245 BLAKE2B ac655f8b73375c262ebf413aeebe199f4dc2829cab3e9c8889062fe839d026cba67b78894386be078c0529bd1b22a4c6869a5b1cfd47947981f90e8c74302445 SHA512 f8c68196e1e156fa122ba4a789d01d3a0dfffa70a1eee2a55e8d9af60275121dc6cd461e1c85328f4458754f0ae2ada55fdd85c7cd6ca680ba3e9ee789a7073a
+EBUILD Pyro4-4.81.ebuild 1242 BLAKE2B b7bb7476f62c689996e6518c19e2d3e4feaf8daf620a63a31832b7b47a9880a83f69f25e28a19ea1ee72c7a64a896057b0643f63c1e31761460a831b898591d6 SHA512 9c8864312719d06cf88b75d9794a399a4d439c65d51a2f48151d781e227132190686e5fe375ecf6a69640833140c501a3eee9d0c42e53031d030e30ac6c5c54a
 MISC metadata.xml 384 BLAKE2B e0dcf58b7db6287f6912e1ce549f52fb269eeac53def37ff75b8c30957c02eaef506a44bc15c3fdfdf01c2607e803b8706cc3be6b50585383f30edcd8c3cebf6 SHA512 9f4ed623a9e07d84fd61b3eccf65d80c883265b3de24d79b888c5d880498325dd268e4e5390f60ed67b19101e072276b1d7eb80724bf7a0cd6713fc20d374e33
diff --git a/dev-python/Pyro4/Pyro4-4.80.ebuild b/dev-python/Pyro4/Pyro4-4.80.ebuild
deleted file mode 100644
index 58699ab81c52..000000000000
--- a/dev-python/Pyro4/Pyro4-4.80.ebuild
+++ /dev/null
@@ -1,59 +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 distutils-r1
-
-MY_PN="Pyro4"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Distributed object middleware for Python (RPC)"
-HOMEPAGE="https://pypi.org/project/Pyro4/
-	https://github.com/irmen/Pyro4"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/serpent-1.27[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/cloudpickle-1.2.1[${PYTHON_USEDEP}]
-		dev-python/dill[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Disable tests requiring network connection.
-	rm tests/PyroTests/test_naming.py || die
-	sed \
-		-e "s/testStartNSfunc/_&/" \
-		-i tests/PyroTests/test_naming2.py || die
-
-	sed \
-		-e "s/testBroadcast/_&/" \
-		-e "s/testGetIP/_&/" \
-		-i tests/PyroTests/test_socket.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/. )
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/Pyro4/Pyro4-4.81.ebuild b/dev-python/Pyro4/Pyro4-4.81.ebuild
index 8027e01d7312..66d4b212b769 100644
--- a/dev-python/Pyro4/Pyro4-4.81.ebuild
+++ b/dev-python/Pyro4/Pyro4-4.81.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ppc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/Rx/Manifest b/dev-python/Rx/Manifest
index e4008096e903..a6ff5f43c2ca 100644
--- a/dev-python/Rx/Manifest
+++ b/dev-python/Rx/Manifest
@@ -1,5 +1,3 @@
-DIST Rx-3.1.0.tar.gz 890293 BLAKE2B 268f6df5450d1235d50f9aee5cd43fe6e229acf7b2ddab5f1f97e80594aeff7beaa280fe272ac9cc8b80dc6874f4bb76e438e94c09712f2c37e72d8d40f9f283 SHA512 1d9f6639ef08dc991326b95fcbf0978adea55b35acab653fc16bd94ccf2ad3a1515e8cb4e8d2ff38d7a506306e310394339a8651a2a02fa22bfb7f17d86297f1
 DIST RxPY-3.2.0.tar.gz 891490 BLAKE2B 9d4e72c20544f1c607fa28963193ca88d7d6f63c0e4a3faa4e3aafba6cce5bb0c1b99ca7a8fb62052adc3dc02b7ca71d4c190704f18819fbb2598a38b2ce86da SHA512 08a53344ea374b025e51ebf3a7de5ea4e83c7062d0c9a3370b795a56156c8aa068f2b3415f6e5e9e2424a11bcef53a412fd0667afb0016b58b7d2a741ea1007a
-EBUILD Rx-3.1.0.ebuild 595 BLAKE2B 748493f5e36892ce9e1851cf8a29601e612a02f8550a1bfe1d393ff59435e20ec6c6c0c4d83d6626873a24eed1fb792e2005188e3076acbc36f050c1d1c9e0f8 SHA512 1cb18881a3c09553095a04c23995e5d2e66cd0d1a4eb6e390c7c67348f5d713e8f8592c04a2a3aa689f1fe5b84937ec5bd7d4866d6c40b232358cb7b96ee6246
 EBUILD Rx-3.2.0.ebuild 584 BLAKE2B 7a0a1213c358dc9d4630cb81993e2b2fc92ed95b4f886f6173ddab6b9db02e4494a68062b0780b11989c8321f9fe94d722e00e8a18f62f791f644da5fa040cb5 SHA512 db84008a1f254378eed449a45f585ab491cc303638deb0127a093e8968782a3a24ba87920b2a97f5eba08f33bf8c71bd313d9798a33635218662d0fc330e6700
 MISC metadata.xml 411 BLAKE2B 89b4b19b080c920f8c311727bf9bc24bf885304a2d20376d9b89c5e1e7ff44517c5c159d71220bcb5f35c03a622e3e53d44cd74a75cbb31b21eb4da7ee94c5a0 SHA512 72d7e845dada768226febee7590c96a6bf1490f54917b22aac6185b481092ecd79310da03270ad1b7145dee8cc51ab58e2c6673feac0f2b671b8051c13ae7749
diff --git a/dev-python/Rx/Rx-3.1.0.ebuild b/dev-python/Rx/Rx-3.1.0.ebuild
deleted file mode 100644
index 9d8a0b9bb0c2..000000000000
--- a/dev-python/Rx/Rx-3.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-
-inherit distutils-r1 virtualx
-
-MY_P="RxPY"
-DESCRIPTION="Reactive Extensions for Python"
-HOMEPAGE="http://reactivex.io/"
-SRC_URI="https://github.com/ReactiveX/${MY_P}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index 356c72e63793..9c2ef73b0e1e 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,5 +1,3 @@
-DIST absl-py-0.10.0.tar.gz 234053 BLAKE2B c7d85d7b351ec5d67ac5e98d5103b91ee7b91d3e01b15fff86ead2e177ba596719af8668f2ec1dd81b278557d902a90705803f5bd6aa7576b302641129eed050 SHA512 92862cc7997f469d7121746d1a8f8fcf99a4983eb033dc936e2ef22bcab896950a5e2bd8ce7fe6660b761cc16a39145104a7e2ba3588f38cde1964505d0265c3
 DIST absl-py-0.12.0.tar.gz 229360 BLAKE2B f913f1eff2d8efc1f5bc06c83d09dbd5c57ba5fdc39953ccbe99750da49676a95112d4dcbcb13e20bd380c7c07f4a3d01e69ae940a19a91dc37e51b2189fb66c SHA512 566cae120779920f8529eb797f9b26a662df0fa2ac853d78424e35d906f487069a945b2ad5a9a292aa90663e8c31c363925aa3114331f0f5f9fb479c79d781ac
-EBUILD absl-py-0.10.0.ebuild 562 BLAKE2B bdd34c24e60cfa203213557a361feba3fb19aac2d1ea6fa701523cc782a4e3880e4a52948d9817b9fdd9cc68491cb9b19dae6e4323ac38b4acbba872eccf9418 SHA512 23525ffdfaadb697bfecbe944c363de72179eb2b08aefb43cacccab93023f05a16cffcf60d0c902fe188010f96f65dc4299198b75c276ce1335e0d737ec6dc65
 EBUILD absl-py-0.12.0.ebuild 564 BLAKE2B c51969eaee5e50113ce341d47cf50e9bcdc434d79798c06fa4a0d11cdb228e9bd640b786f9e1a539692dce4d783ca95bd15343b80893bc36e8ae19fcf6e8d563 SHA512 5221feff8f71a77f42579f6ad212c1c361fbf7c7aab1a1d0310b1a18f34cf2cdb7681bff37ad30cd289b6f256978ad1aaa568986e3514b4e105ef5e617db52ca
 MISC metadata.xml 577 BLAKE2B dd0e02b24bdb42f24bd675cadf13e99f861a6dc9be2879f671b9bc4e9e078ef81759909e81e3063cb54c71ff71d6609624f0cf2645bf6ec055c643fbb0f3ab5c SHA512 7cfa86cac5d38b10aedacdb4bafc7acbd11cf4a98a873a2435ef5761d5186c5128171eb286b2d2568a1a353eb4de815303eae225cf5823a5292ac362633b67c7
diff --git a/dev-python/absl-py/absl-py-0.10.0.ebuild b/dev-python/absl-py/absl-py-0.10.0.ebuild
deleted file mode 100644
index ae6ad2629483..000000000000
--- a/dev-python/absl-py/absl-py-0.10.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Abseil Python Common Libraries"
-HOMEPAGE="https://github.com/abseil/abseil-py"
-SRC_URI="https://github.com/abseil/abseil-py/archive/pypi-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/abseil-py-pypi-v${PV}"
diff --git a/dev-python/adblock/Manifest b/dev-python/adblock/Manifest
index aad2d5f55ce8..e28e29e21461 100644
--- a/dev-python/adblock/Manifest
+++ b/dev-python/adblock/Manifest
@@ -1,11 +1,7 @@
-DIST adblock-0.3.10.crate 7678458 BLAKE2B f15dfe6ecaf1146ab0058afae6bcdc179a9c870c0bb00ea0061ac7726a77c89a44ccabb50eb29a77dcd72eeae6533e505ad34e0d9a75cc4bf9fa3d304e16a1a8 SHA512 fea38d9204d2ac7f8a289d3affad18bf814e9054c2955f8e259454913371d30751c6a090a0a09b844bda46083815c8a9a4326c8f9fa210ce71b5f9adef7b338a
 DIST adblock-0.3.13.crate 7691310 BLAKE2B 0d9958235c123ff09256f6512c04474c4dee10c855b7161e32f3dae517959bb16815adbc22787648a1441e04a0ae94b89369c6bf9e3c61715638a4c452676a1f SHA512 f534c49d60118e170f674415a20075f15a7e45187d9461a0025acaf3fb9a94388ed7f99d15484a0354d8953798dd8ae720ca77f6faa59551e9d99d937a3bdbb4
-DIST adblock-0.4.4.tar.gz 22207 BLAKE2B 8337b41627af07a83586c174c0ac446dc43d8a3031d7cc758dbd987685218983f355155b812c746f3b736a31fd5ab835ab59c37234bf04dad1ab2d3c48b13b2e SHA512 19d24fe79d798825bbe00efc552d7c7357073791e3b4cb591aa040bb44543a9fba3c872cbd5e77e1d7a07e459e2d3c33605cc0fe47466ba210b18dc0aafef395
 DIST adblock-0.5.0.tar.gz 23000 BLAKE2B 4d1e991341e605484df4c96b3ebffdad261a7c90d4aa1e14a8e6258b1a5368fdd3215a9ae3600560a082f91cc34d005b271f5904bb883f938bbe5451d4ad4e64 SHA512 5ae9c979a769fbfc89c26d2c5c40a1712f0573707840b3bf35acf7bd15d2c22f08dfdbd384ab0e886568aee686ef5da3ab5f1cb73bf66491831be24977e6173c
-DIST addr-0.11.8.crate 89500 BLAKE2B 365d96ae27f6e62e09c23362d667d7818b62e2c878ee6e4cde59016e19ee31ba320dca289c02aa0d542e0aab3e828c18d5e78c7f2c9b101ff86a8c370f91e5da SHA512 4ed5cfdd88e9a31b64a950824e2ebcbec8ad33612fbc815e9eb5225af38bd8dd4250b506fd089e8d32cd6e6003b60172b2c06e20228b993d0d11856fa4340fb5
 DIST addr-0.14.0.crate 90210 BLAKE2B a0dcb422d853b76187542aaa2880aafade57716130a38172a91fd4d3d0c51d9e7f2b23eec5af84b188b8b661c48f46fab25797489a3bd5c84e0732b326178877 SHA512 18d6cecbbeb2ea11f2b4f40356d8a2de5aad45e57ac5f13dc9cd98cff4250b7612aadfb73935775c657e728ca10bc8313e601354f239a96e63ef90a8d2f6b870
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
-DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
@@ -28,7 +24,6 @@ DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea
 DIST libc-0.2.93.crate 510944 BLAKE2B 93ca2d32f5c1a1cb00ac75601dc3550de058e6d66c14309eed4c98a56be97aab6512d6b8b7574fdbf5a453f1400c9120eeb12e4f90970819f5c19ee544a975f5 SHA512 e82bd56c282b7473de50ec730646ae64384661e533f78b19bdd737d7a637cc93ca6f4e0b576d901576413a48d274635b917ec4b0c5144b5196155b04015ca94e
 DIST lock_api-0.4.3.crate 20351 BLAKE2B ffec5616daf545ed4d2ed7cd21fa6340b1892b76702a089474b58320b6379767efd249088f8638e087100a09e4610de7652b718b60c992c64a287c2ebc73b3b4 SHA512 4dda8d993138efe0ffc94206c576e52a879a6cc4e90ffc98caabdfe720649a34c0fda206c4a7b6cc3a99140e619de1da05864218cff6f702e5540165d30573c5
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
-DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
@@ -47,9 +42,7 @@ DIST pyo3-macros-0.13.2.crate 5434 BLAKE2B 881b49ad2f6dbf0f60f7d9d648beb1b2f1026
 DIST pyo3-macros-backend-0.13.2.crate 33106 BLAKE2B df7d9cbb06932c7d01f809bb5cc9230a680f0da7f1231a1c509a7338713722a1a35e456faa81a36d21a16612a1c611b6ce5d018c87210b59e4153ba0addab568 SHA512 ee136e214a6f06b6dccec378d6a73a318408cd55795ffb00c18428b40cca1e2f45c3a98e85c82c68f0f2715b8187237f2bb3dd1e94b95288e2bed1bf6a6d042e
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
-DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
-DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST rmp-0.8.10.crate 23541 BLAKE2B f51f12ac191a8cbb4377956bb15d774e464b94fde7abc3f008fd2b6be10ad027ef3a95e854c6461e393b3e1b4c42e43b3a594e9d05283782af8e0893c1d4d629 SHA512 54739648c57e5fd917c60e1f692f5a0e357a95e9b7b1cab08af99f5ac1000b53427a646b6ef019f1e3cbb3861218acf0e8e300133ede4426107045a0abacd87a
 DIST rmp-serde-0.13.7.crate 16676 BLAKE2B d30ee72fa0a1b897c4866ab53e39d673bed1828ca6b09ac9511b8cb34a1092ffcb8b5c34f2e97cbf3ef44b5ccf99a2b68c4e8a202066380fcbe114fc8286df25 SHA512 e2659afd22446e26190008bca8cbf147e09eaeacd0518d81fd26c12e26d9fc06b48844719827cc392a882bb927d62e1d7d946a0426f81eac36cc882d8b0c2d28
@@ -71,6 +64,5 @@ DIST url-2.2.1.crate 65434 BLAKE2B e9180c56afaf9dd781812b3650b28cee14a2330629e70
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD adblock-0.4.4.ebuild 2226 BLAKE2B 6a2acd3a1a33c0ddee363d982d4b99566e555d6f699c573d52feab38f681f48e04c4065f48638c90c5ce15da629cec77a5c4284e939db25e91416d526f61250a SHA512 c95ef87d201e3cf5649dbac9ee55616bdfa6c3cf41811c9b0a0d75e5e1f58971a05ff97fd494a8778f774521ac1e983cc34119f9af4f41d124eed636a820b4cd
-EBUILD adblock-0.5.0.ebuild 2294 BLAKE2B 3272ad30dafb7e7226378de6966b979f14479381515fe672d73f728ff338bd48b9e99ed4b7dde419b9b2676cb1a6a5e95f4c793819495d958c8ce15874c432d3 SHA512 8738a2bf2fd43c0230fab3316a43cb7c9512ddae5bd75d9c8f6bb4fa0ee58bb3e546505774887307082cd47b134967059508992ba2184777683eadad6f825732
-MISC metadata.xml 382 BLAKE2B a0d02a0871d0fa0095ef179bf1f5849bde21107803ecb9705e882465969743ceb589729d03f00f4e5fa6443af554634bf3ae692c7a7ff75d67a0797fbb74f1f5 SHA512 df41f0e0f9e66d24b6dc7a3e9bfa3a96a3171807fcf4d563bcf856c80c0977c24b829a043efb762d6cb3cf2d6528e12d4789af6d67984d23b46b07f90b6ac5e4
+EBUILD adblock-0.5.0.ebuild 2450 BLAKE2B 456f8821c6df89a29e3e07dfecd62d3dcd7868085ddb7b4806f9e97a5436fb2750b89769a76ca0a9fc0c93ebb40bd5ff4949177b126f8e9f59498216f585d9ed SHA512 61a1a8a2804e54602a6ab1d98c6e5d546ebd8884f477ec8f7dabe5438ce8c9258ce3e0d2d94b6dff760e32da9c1280a1d647f3b22c9f2c5eebdc47c3d6530097
+MISC metadata.xml 488 BLAKE2B c6813b6b4c00dc1282ab21a9e37b4c035c9d75cdd1c0bf0a2903e4f40d074eedf5ae972b68aac91f46146e339bcd3cf799c45b96c94e6209d100811c2254daff SHA512 3f62c544ec8f4b2da7f04e3af1a81a702d719a0957a187ace37e638c1f00e0d3dbc67728e6915a05a6cb0bcb46366670c2e0a5837734cd0a51b7c3b021d4ffae
diff --git a/dev-python/adblock/adblock-0.4.4.ebuild b/dev-python/adblock/adblock-0.4.4.ebuild
deleted file mode 100644
index 0d8540825fd7..000000000000
--- a/dev-python/adblock/adblock-0.4.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-adblock-0.3.10
-addr-0.11.8
-adler-1.0.2
-aho-corasick-0.7.15
-autocfg-1.0.1
-base64-0.13.0
-bitflags-1.2.1
-byteorder-1.4.3
-cfg-if-1.0.0
-crc32fast-1.2.1
-ctor-0.1.20
-either-1.6.1
-flate2-1.0.20
-form_urlencoded-1.0.1
-ghost-0.1.2
-idna-0.2.2
-indoc-0.3.6
-indoc-impl-0.3.6
-instant-0.1.9
-inventory-0.1.10
-inventory-impl-0.1.10
-itertools-0.9.0
-libc-0.2.93
-lock_api-0.4.3
-matches-0.1.8
-memchr-2.3.4
-miniz_oxide-0.4.4
-num-traits-0.2.14
-once_cell-1.7.2
-parking_lot-0.11.1
-parking_lot_core-0.8.3
-paste-0.1.18
-paste-impl-0.1.18
-percent-encoding-2.1.0
-proc-macro-hack-0.5.19
-proc-macro2-1.0.26
-psl-2.0.18
-psl-types-2.0.7
-pyo3-0.13.2
-pyo3-macros-0.13.2
-pyo3-macros-backend-0.13.2
-quote-1.0.9
-redox_syscall-0.2.5
-regex-1.4.5
-regex-syntax-0.6.23
-rmp-0.8.10
-rmp-serde-0.13.7
-scopeguard-1.1.0
-seahash-3.0.7
-serde-1.0.125
-serde_derive-1.0.125
-smallvec-1.6.1
-syn-1.0.69
-tinyvec-1.2.0
-tinyvec_macros-0.1.0
-twoway-0.2.1
-unchecked-index-0.2.2
-unicode-bidi-0.3.5
-unicode-normalization-0.1.17
-unicode-xid-0.2.1
-unindent-0.1.7
-url-2.2.1
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit cargo python-r1
-
-DESCRIPTION="Python wrapper for Brave's adblocking library, which is written in Rust"
-HOMEPAGE="https://github.com/ArniDagur/python-adblock"
-SRC_URI="https://github.com/ArniDagur/python-adblock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-S="${WORKDIR}/python-${P}"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
-	dev-util/maturin
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-QA_FLAGS_IGNORED="usr/lib.*/libadblock.so"
-QA_SONAME="${QA_FLAGS_IGNORED}"
-
-src_compile() {
-	maturin build $(usex debug "" --release) || die
-	unzip "target/wheels/${P}-*.whl" adblock/adblock.abi3.so || die
-}
-
-src_install() {
-	python_foreach_impl python_domodule adblock
-	dolib.so target/release/libadblock.so
-	dodoc CHANGELOG.md README.md
-}
-
-src_test() {
-	python_foreach_impl epytest
-}
diff --git a/dev-python/adblock/adblock-0.5.0.ebuild b/dev-python/adblock/adblock-0.5.0.ebuild
index 5ef500a3655d..42b1caa1add8 100644
--- a/dev-python/adblock/adblock-0.5.0.ebuild
+++ b/dev-python/adblock/adblock-0.5.0.ebuild
@@ -1,113 +1,120 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CRATES="
-adblock-0.3.13
-addr-0.14.0
-adler-1.0.2
-aho-corasick-0.7.18
-autocfg-1.0.1
-base64-0.13.0
-bitflags-1.2.1
-byteorder-1.4.3
-cfg-if-1.0.0
-crc32fast-1.2.1
-ctor-0.1.20
-either-1.6.1
-flate2-1.0.20
-form_urlencoded-1.0.1
-ghost-0.1.2
-idna-0.2.2
-indoc-0.3.6
-indoc-impl-0.3.6
-instant-0.1.9
-inventory-0.1.10
-inventory-impl-0.1.10
-itertools-0.9.0
-libc-0.2.93
-lock_api-0.4.3
-matches-0.1.8
-memchr-2.4.0
-miniz_oxide-0.4.4
-num-traits-0.2.14
-once_cell-1.7.2
-parking_lot-0.11.1
-parking_lot_core-0.8.3
-paste-0.1.18
-paste-impl-0.1.18
-percent-encoding-2.1.0
-proc-macro-hack-0.5.19
-proc-macro2-1.0.26
-psl-2.0.18
-psl-types-2.0.7
-pyo3-0.13.2
-pyo3-macros-0.13.2
-pyo3-macros-backend-0.13.2
-quote-1.0.9
-redox_syscall-0.2.5
-regex-1.5.4
-regex-syntax-0.6.25
-rmp-0.8.10
-rmp-serde-0.13.7
-scopeguard-1.1.0
-seahash-3.0.7
-serde-1.0.125
-serde_derive-1.0.125
-smallvec-1.6.1
-syn-1.0.69
-tinyvec-1.2.0
-tinyvec_macros-0.1.0
-twoway-0.2.1
-unchecked-index-0.2.2
-unicode-bidi-0.3.5
-unicode-normalization-0.1.17
-unicode-xid-0.2.1
-unindent-0.1.7
-url-2.2.1
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-PYTHON_COMPAT=( python3_{8,9} )
-
+	adblock-0.3.13
+	addr-0.14.0
+	adler-1.0.2
+	aho-corasick-0.7.18
+	autocfg-1.0.1
+	base64-0.13.0
+	bitflags-1.2.1
+	byteorder-1.4.3
+	cfg-if-1.0.0
+	crc32fast-1.2.1
+	ctor-0.1.20
+	either-1.6.1
+	flate2-1.0.20
+	form_urlencoded-1.0.1
+	ghost-0.1.2
+	idna-0.2.2
+	indoc-0.3.6
+	indoc-impl-0.3.6
+	instant-0.1.9
+	inventory-0.1.10
+	inventory-impl-0.1.10
+	itertools-0.9.0
+	libc-0.2.93
+	lock_api-0.4.3
+	matches-0.1.8
+	memchr-2.4.0
+	miniz_oxide-0.4.4
+	num-traits-0.2.14
+	once_cell-1.7.2
+	parking_lot-0.11.1
+	parking_lot_core-0.8.3
+	paste-0.1.18
+	paste-impl-0.1.18
+	percent-encoding-2.1.0
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.26
+	psl-2.0.18
+	psl-types-2.0.7
+	pyo3-0.13.2
+	pyo3-macros-0.13.2
+	pyo3-macros-backend-0.13.2
+	quote-1.0.9
+	redox_syscall-0.2.5
+	regex-1.5.4
+	regex-syntax-0.6.25
+	rmp-0.8.10
+	rmp-serde-0.13.7
+	scopeguard-1.1.0
+	seahash-3.0.7
+	serde-1.0.125
+	serde_derive-1.0.125
+	smallvec-1.6.1
+	syn-1.0.69
+	tinyvec-1.2.0
+	tinyvec_macros-0.1.0
+	twoway-0.2.1
+	unchecked-index-0.2.2
+	unicode-bidi-0.3.5
+	unicode-normalization-0.1.17
+	unicode-xid-0.2.1
+	unindent-0.1.7
+	url-2.2.1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0"
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cargo python-r1
 
 DESCRIPTION="Python wrapper for Brave's adblocking library, which is written in Rust"
 HOMEPAGE="https://github.com/ArniDagur/python-adblock"
-SRC_URI="https://github.com/ArniDagur/python-adblock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
+SRC_URI="
+	https://github.com/ArniDagur/python-adblock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
 S="${WORKDIR}/python-${P}"
 
-LICENSE="|| ( Apache-2.0 MIT )"
+LICENSE="Apache-2.0 BSD MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug test"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
+BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/maturin
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+	)"
 
-QA_FLAGS_IGNORED="usr/lib.*/libadblock.so
-	usr/lib/python3.*/site-packages/adblock/adblock.abi3.so"
-QA_SONAME="${QA_FLAGS_IGNORED}"
+QA_FLAGS_IGNORED="usr/lib/python3.*/site-packages/adblock/adblock.abi3.so"
 
 src_compile() {
-	maturin build $(usex debug "" --release) --no-sdist || die
-	unzip "target/wheels/${P}-*.whl" adblock/adblock.abi3.so || die
-}
+	maturin build $(usev !debug --release) --no-sdist || die
 
-src_install() {
-	python_foreach_impl python_domodule adblock
-	dolib.so target/release/libadblock.so
-	dodoc CHANGELOG.md README.md
+	mv target/$(usex debug{,} release)/libadblock.so \
+		adblock/adblock.abi3.so || die
 }
 
 src_test() {
+	local EPYTEST_DESELECT=(
+		# tests if python-3.10 >= 3.6, but results in 3.1 < 3.6
+		tests/test_metadata.py::test_required_python_version
+	)
+
 	python_foreach_impl epytest
 }
+
+src_install() {
+	python_foreach_impl python_domodule adblock
+
+	dodoc CHANGELOG.md README.md
+}
diff --git a/dev-python/adblock/metadata.xml b/dev-python/adblock/metadata.xml
index cc85ade15283..64e24f8f95d2 100644
--- a/dev-python/adblock/metadata.xml
+++ b/dev-python/adblock/metadata.xml
@@ -5,6 +5,10 @@
 		<email>steils@gentoo.org</email>
 		<name>Stefan Strogin</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ArniDagur/python-adblock</remote-id>
 		<remote-id type="pypi">adblock</remote-id>
diff --git a/dev-python/agate-dbf/Manifest b/dev-python/agate-dbf/Manifest
index 1d7c8dec0b01..2351dc99d209 100644
--- a/dev-python/agate-dbf/Manifest
+++ b/dev-python/agate-dbf/Manifest
@@ -1,6 +1,3 @@
-DIST agate-dbf-0.2.2.tar.gz 2863 BLAKE2B 112b03e1a02b70e63f77195a999a60a59b4e02af55da2b9d94e9d535f557c4193129dcb8ce3f91d93cbc6e19196705009574e3b9e5073f9934d00636bb4b2abd SHA512 3e99404dfcd521010bc3eb5899871dfc63581e03604f80b0a42d4db48f486137fd48685024decd380d346ac5c2089a0d19dd9229893e8d5337b9bd9d7b4eb3b6
-DIST agate-dbf-0.2.2_examples%2Ftest.dbf 1314 BLAKE2B 81d5507b88fe7f7c3866d8666feff12bf3b14451affd653d76239f8785037c908509de248ac4bc8dbebeba4b1a84d69a48bf97b83716fe489ceb39f8ccf0e935 SHA512 460f9a624a6fed58d1fe0484ff6f7fa081d595d8f1a04f4f449ef6de037e334abb9da0403622e5af8c7914e02cda2fa38c4058ef1bb650e59e50584b9ae73b2e
-DIST agate-dbf-0.2.2_examples%2Ftestdbf_converted.csv 896 BLAKE2B fe535d9b784088118fcd61b5378d49d92bac801be61e7900200625f267c8f9c454729376b292d809d3e6a6ee2a093e2a813524ff9199223cbc89a9a461feed40 SHA512 ddba24038d4500b97ff8b11b03a5260927a299f1732aa0a6bcb4746c52e04825f2f3d5d211141576736008ff7f56d0970b21c06f4afad53a4e4e0a873815516b
-DIST agate-dbf-0.2.2_tests%2Ftest_table.py 574 BLAKE2B 22a744ae20491632795a0b654d8ab1e8adc090d43d0a18352b83cfc1687c57d33f1159d96cb379743d293203412dbbbaae8c33be195ae9d868584671ff0ea74d SHA512 131d8a553bc9c7538959e1ae29b62c47cea3e14365afca4e92e4f36cc8dab7e4b00efa462db5e9ca0f51b5e3eda892cf91881d65bd1302fa80bd5b0f66fa4076
-EBUILD agate-dbf-0.2.2.ebuild 1519 BLAKE2B 9f5635ba118e86976f9498053c21bc0fafa64e465bf8f108836647db425adfa5a8c04cc5e7e61e6ba4cfcbdff8ca2fbcaed40318c7bb3673b83c65a1d5e81610 SHA512 1be17ff2968e9fdfc0e2c72d65dc2355f2ca6944dd55774c918ca4f11e66604aecf69826fca131c153132a15d3972bb104edc74024b2da389ee2b65e886aa358
+DIST agate-dbf-0.2.2.gh.tar.gz 8727 BLAKE2B 1397e87ebecff43380d17628867317e9b66584f4281609717b86c30cfa286e6d9ab32d8250c99c698c887aceae28ad4af311e0f777525283b30b65c15582895d SHA512 a92c19db922cc3f896fbe21f33afacd757a7fa3d6a26545033a898665a87765ddf4af964e4cba315cee0c70da926c965aaf68b64af86cf2aabbb9a68a65a38fe
+EBUILD agate-dbf-0.2.2-r1.ebuild 634 BLAKE2B 9cbded3e40b1c938889b72b1cd6e5e8579902e0f4f76fd881b9202f9b743c1973ea1d9028a63c07455ce803a67c17863b42ff6bf81edd6fd89ec50171dd90dbc SHA512 19e17555971809de87935292ba343735065ecd28bd93f5beb11d6abc6f9e20ae7a4b045b8c2c59e63659c3d8aa35e3bc42da40c943a1ec70f1ba333ea065ea0d
 MISC metadata.xml 537 BLAKE2B e0faf286fb6844ce52469275311bb9c14deac0c0a123d35b3a11600324dd1e49b81214d41603f8533a7ceb73266ca73bd6377d901bea6372acda6358008d1d31 SHA512 82ec0b7d3163deaf88451e468a296174d99e74409ddbe3837c3e0fa5872bf6303e7154fc900a482c1b417943adf981137e460e7bc7d2f1b32967254220e02c04
diff --git a/dev-python/agate-dbf/agate-dbf-0.2.2-r1.ebuild b/dev-python/agate-dbf/agate-dbf-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..387fc82a375f
--- /dev/null
+++ b/dev-python/agate-dbf/agate-dbf-0.2.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds read support for DBF files to agate."
+HOMEPAGE="https://github.com/wireservice/agate-dbf https://pypi.org/project/agate-dbf/"
+SRC_URI="
+	https://github.com/wireservice/agate-dbf/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/agate-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/dbfread-2.0.5[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild b/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
deleted file mode 100644
index 04248032f373..000000000000
--- a/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Adds read support for DBF files to agate."
-HOMEPAGE="https://github.com/wireservice/agate-dbf https://pypi.org/project/agate-dbf/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+xml"
-
-# Other packages have BDEPEND="test? ( dev-python/agate-dbf[xml] )"
-AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
-TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-RDEPEND="
-	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
-	>=dev-python/dbfread-2.0.5[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
-"
-BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-AGATE_DBF_TEST_FILES=(
-	examples/test.dbf
-	examples/testdbf_converted.csv
-	tests/test_table.py
-)
-SRC_URI+=" test? ( "
-for extra_file in "${AGATE_DBF_TEST_FILES[@]}"; do
-	SRC_URI+=" https://raw.githubusercontent.com/wireservice/agate-dbf/${PV}/${extra_file} -> ${P}_${extra_file//\//%2F}"
-done
-SRC_URI+=" )"
-
-agate-dbf_src_prepare() {
-	local extra_file
-	if use test; then
-		for extra_file in "${AGATE_DBF_TEST_FILES[@]}"; do
-			mkdir -p "${extra_file%/*}" || die
-			cp "${DISTDIR}/${P}_${extra_file//\//%2F}" "${extra_file}" || die
-			[[${extra_file} == *.py ]] && { true >> "${extra_file%/*}/__init__.py" || die; }
-		done
-	fi
-}
-
-src_prepare() {
-	agate-dbf_src_prepare
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/agate-excel/Manifest b/dev-python/agate-excel/Manifest
index 03f031001fb7..4dbf73f80caf 100644
--- a/dev-python/agate-excel/Manifest
+++ b/dev-python/agate-excel/Manifest
@@ -1,5 +1,3 @@
-DIST agate-excel-0.2.3.tar.gz 153880 BLAKE2B f090c8bbb75341623545781cbf116b547ebc16249eb0c6814e9fbd51d2688fd2bd0354d187d2f803bde69e563b57836e3d214e287ae62455c59075020588d235 SHA512 3a50bab182391bdadb2e0a82dc28a3cfa1eebbe67744835ab20581a67f7f08f4edb96eebc9a286ac4a6a302996571563ca9e487ea7defdcf07265e9c42436ddf
 DIST agate-excel-0.2.5.tar.gz 161131 BLAKE2B ed7306dabf8b5da722aec9005da9bdba74a9cc585ea72b429eecc4b1fcbdfed698af8e582c464081867c0d4a285b9bc892efc339f0a08c657d87e61fd1174496 SHA512 5686c3faf8b817589a62d9fac558bebe7f47124685be9f8146d74c206023530d0cec2ad88fa4ba7ac049516f5bec6783ce8f0ff47f8eb8b2ed8aad7316f1771b
-EBUILD agate-excel-0.2.3.ebuild 1025 BLAKE2B cacc20dd57b3412c1f218157d0f63aeef6d50f07c031ad411fd2e20d518603437a933add8775f0e884c1b44e2bd6235c85173ab9d70d1787044cf4f4ef723ffd SHA512 99fd7aee5e08b2245589ce1dfd4a1e96e152651b1c6cf29a572995fff4ea0c189db28812dc91785529b2a1a3d637f5ea54a0e401b4e749ecdfe6044d57950168
-EBUILD agate-excel-0.2.5.ebuild 961 BLAKE2B 5c53a36f16c276a20f87240bb443c68a13b7df31412d9a0af3e320b0325556de217c0036a3fadf9973fbc7f3b983ae2c9870638ee0a2dba982ebfed0a5fe7503 SHA512 c95cf90a11b80819af3fce2738724a6ea6866595bd7d761cf6eafeb4a0511741b7b4c0eaac1a065437c67ea054e22f3c52f327d306ae3e945bb4a8a551f168c9
+EBUILD agate-excel-0.2.5-r1.ebuild 728 BLAKE2B ef1b74b6e781143091faba24fedf98c243c9ee1065283e0a969cf17beced9762565c48397840c0ba7f37e1e7d009d83828cd1204568ff256d036cec5db47eb36 SHA512 d20a0a0e3effddfc7075439cda0d9af61afccd1f1dc4cbc20a16d0910f8d1a7768f9e27270cbe5be659d5cc3bc67241a665ff4668cb4cdae870ea2c2fbedb35a
 MISC metadata.xml 545 BLAKE2B 83924355d55c633174a7060cc13fe4d2d06043b3af6f31d63c53943ce6b0a003ef3951a8967a45caec0a416ce6f101334b011602cf3cb4837c696c5f0a698ef7 SHA512 4c3bb8734cd0f4c67a0ab97edfb06d998f10582ae4688c382c66bc0c6c25f5f5c4900f7dfe9abc037fddb380c4f039353b6c19e0a203f47c5f8e52f549a3c623
diff --git a/dev-python/agate-excel/agate-excel-0.2.3.ebuild b/dev-python/agate-excel/agate-excel-0.2.3.ebuild
deleted file mode 100644
index 2aa921d5926e..000000000000
--- a/dev-python/agate-excel/agate-excel-0.2.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Adds read support for Excel files (xls and xlsx) to agate."
-HOMEPAGE="https://github.com/wireservice/agate-excel https://pypi.org/project/agate-excel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+xml"
-
-# Other packages have BDEPEND="test? ( dev-python/agate-excel[xml] )"
-AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
-TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-RDEPEND="
-	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
-	>=dev-python/openpyxl-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/xlrd-0.9.4[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
-"
-BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		tests/test_table_xlsx.py::TestXLSX::test_ambiguous_date
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/agate-excel/agate-excel-0.2.5-r1.ebuild b/dev-python/agate-excel/agate-excel-0.2.5-r1.ebuild
new file mode 100644
index 000000000000..826a51433560
--- /dev/null
+++ b/dev-python/agate-excel/agate-excel-0.2.5-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds read support for Excel files (xls and xlsx) to agate."
+HOMEPAGE="https://github.com/wireservice/agate-excel https://pypi.org/project/agate-excel/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/agate-1.5.0[${PYTHON_USEDEP}]
+	dev-python/olefile[${PYTHON_USEDEP}]
+	>=dev-python/openpyxl-2.3.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-0.9.4[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/agate-excel/agate-excel-0.2.5.ebuild b/dev-python/agate-excel/agate-excel-0.2.5.ebuild
deleted file mode 100644
index 12349af68287..000000000000
--- a/dev-python/agate-excel/agate-excel-0.2.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Adds read support for Excel files (xls and xlsx) to agate."
-HOMEPAGE="https://github.com/wireservice/agate-excel https://pypi.org/project/agate-excel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+xml"
-
-# Other packages have BDEPEND="test? ( dev-python/agate-excel[xml] )"
-AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
-TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-RDEPEND="
-	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
-	dev-python/olefile[${PYTHON_USEDEP}]
-	>=dev-python/openpyxl-2.3.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/xlrd-0.9.4[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
-"
-BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/agate-sql/Manifest b/dev-python/agate-sql/Manifest
index b143b1a8c972..670c236c843d 100644
--- a/dev-python/agate-sql/Manifest
+++ b/dev-python/agate-sql/Manifest
@@ -1,5 +1,3 @@
-DIST agate-sql-0.5.7.tar.gz 14975 BLAKE2B 7890d5c21d89dd216a7a4c906189e1e44111bd96ef3476f0e6dc4c842dc3f25d537ee398f3c8e720d43e64001fa0ea93940d4a54ee31605eea9e8ae9aa4dec37 SHA512 df7e1d5975d9af0722f4bfa67f1e8679ed46759f8aaa5c76614ed5280c8347f727517568ba377c21dd8eb349f93b7a6d308959ae69bfedd125e6d99bd7bd9dcf
 DIST agate-sql-0.5.8.tar.gz 15182 BLAKE2B 4228c5cbb8fd35b9cd97ffb590fa603e290eb2e5ace9676156ff388f653419080691b29caa4a76c16ea585c91d8126bae3dd500e8438b450737ae55309cf77f7 SHA512 1a793a24561061f5100f24834af65dca943c964cf4aed1504336cafed3d52a95b4787f21ba804b0f2265d5670cabfaa40b7f3d02c120486186cf6e03e7a2938e
-EBUILD agate-sql-0.5.7.ebuild 1299 BLAKE2B e872f58baf8ee4de3adee73f69d59de678cc0bf18d1fcb85a53872546183c3179bc0ef2d79a7d94694c32071910eb3e63f2930d7b5c44047efdc153e3ea55c0f SHA512 4590164573b2b97d0139ac6e636709c7a9c6fd568b3ae9e29712cebf4c5b827c1853fd8587f8d1af9025b04821eae64fc633468e606f139ba74c326f93e40ab5
-EBUILD agate-sql-0.5.8.ebuild 937 BLAKE2B 4b4560d250466c0a723d5d7d1bd62483d6e378091d66ab5e0a3e7adbce906c46c8e7fab1800a638d4839b6a46ae981cc958f26b30f5b5950ba8d87b8c6864853 SHA512 75c84e739162800c264d22fb7abf47b78aca67aea5ace88773444eaa8d21e533c0ba4958106f0e4a7b017e25b70eb9b7da31e8a1ca7631b31e0ba8deede6a53e
+EBUILD agate-sql-0.5.8-r1.ebuild 752 BLAKE2B d38f237a2a570c026a58a176b58c76bdd9288c5ce24ee2c66341615c9200a1be190ddb9fee790d3b1a0bd5b301bba4c2ff6522930fe408b11e2ba558b14ef488 SHA512 1e363f391847d6dd0ed115d17298be91c8165d05728edfefe663d734c4734904b24bd4cc68c4cc0a4169af9f70c19160276e82332843872c1ffb2d4e2e3351d8
 MISC metadata.xml 638 BLAKE2B aa62813cba6c3eb26352e63e05a9a5e00817049dec03befd4df97c6f7b1a01bc142440813c8ad5a67cdebc0e3cb72a8d272f96a59758547709bca11131092cee SHA512 916aea41b52015c5d57d052fc9908dc711a3e600b585dbb92f604846af9222243b7acddb04042e67567aefc9d7d976a69bbecf10e328691e04ac028dc58c5a08
diff --git a/dev-python/agate-sql/agate-sql-0.5.7.ebuild b/dev-python/agate-sql/agate-sql-0.5.7.ebuild
deleted file mode 100644
index a5527246e03d..000000000000
--- a/dev-python/agate-sql/agate-sql-0.5.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Adds SQL read/write support to agate."
-HOMEPAGE="https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+xml"
-
-# Other packages have BDEPEND="test? ( dev-python/agate-sql[xml] )"
-AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
-TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-RDEPEND="
-	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.8[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
-"
-BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local sed_args=(
-		-e "/crate/d"
-		-e "/nose/d"
-		-e "/geojson/d"
-		-e "/Sphinx/d"
-		-e "/sphinx_rtd_theme/d"
-	)
-
-	sed "${sed_args[@]}" -i setup.py agate_sql.egg-info/requires.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_dialects
-		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_schema
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/agate-sql/agate-sql-0.5.8-r1.ebuild b/dev-python/agate-sql/agate-sql-0.5.8-r1.ebuild
new file mode 100644
index 000000000000..3dbd46cdce11
--- /dev/null
+++ b/dev-python/agate-sql/agate-sql-0.5.8-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Adds SQL read/write support to agate."
+HOMEPAGE="https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/agate-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.8[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/greenlet[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires crate
+	tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_dialects
+)
diff --git a/dev-python/agate-sql/agate-sql-0.5.8.ebuild b/dev-python/agate-sql/agate-sql-0.5.8.ebuild
deleted file mode 100644
index d72c933f0ab0..000000000000
--- a/dev-python/agate-sql/agate-sql-0.5.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Adds SQL read/write support to agate."
-HOMEPAGE="https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+xml"
-
-# Other packages have BDEPEND="test? ( dev-python/agate-sql[xml] )"
-AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
-TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-RDEPEND="
-	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.8[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
-"
-BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires crate
-	tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_dialects
-)
diff --git a/dev-python/agate/Manifest b/dev-python/agate/Manifest
index 4a20bdf1c412..e97384f87ba9 100644
--- a/dev-python/agate/Manifest
+++ b/dev-python/agate/Manifest
@@ -1,3 +1,3 @@
 DIST agate-1.6.3.tar.gz 202102 BLAKE2B b1a5624b4744b8f3ed266470da580cef2f2e1cf6159e1b33fcd461e4abd235c5e3fe0da35408a42c92fd4abf14a1f841a1ab9eb6cd31545d826a5223e85b4904 SHA512 e83a03c5a3e4b7fa9997030ce0d33e7b59b397e2ae07ee6a723eb7fb708a7fa8b8c4322dd034f42bf664bf2911d89731fd060e4ff33a237f83114a83312ac5ed
-EBUILD agate-1.6.3.ebuild 1436 BLAKE2B a0590109876c89e4d2e77857cde82e9899de21b345e3963e3316dda407d444b6891af2c550cf4cc9a18bed7cb71cc62eb5436d33fd8290f8a4b32f03dad63c0d SHA512 ba12184f663eae53b40ed91b55ad14d68a0868c09d1224f12282dad6b59f4265859ed99050fccfe2ad3afcfb9b64f9aab7976e471db6aee813cf686ef1286803
+EBUILD agate-1.6.3-r1.ebuild 1142 BLAKE2B 7afaf6f760599c3103f6a8c05338a33fa03c552bee2a4557f21bb2313d9cc0fbef5a4f9e66b05009411bd97a798a2d2fa63ac60e00d3e4f1db79c1378dfa4ede SHA512 e58d696533c3b5877d0f1969c9070fb3b7e75a79010ca0e114de99efd87eafceb0d4ceeb71bda5d8b5132537c6e5cd75a2dd6f8f27cdbfa62df06a42566d48af
 MISC metadata.xml 510 BLAKE2B e4f41aa63b508b2d2f0d5d064bb88dfeb8e335bb461d7c97bb4cb646526c3862c4ace62feb201bf8690627a8661d86e9eb3161d5018cc50adc3f19a5bc56a2ca SHA512 de2c8764bf315f86fb630d3d0a5a31a3f78430c47a6723af7c0bec4cb6216349456f062a3fd9ad7ecb400f144ba5b5450670c1edac2d3c85598cc610ecdf59d6
diff --git a/dev-python/agate/agate-1.6.3-r1.ebuild b/dev-python/agate/agate-1.6.3-r1.ebuild
new file mode 100644
index 000000000000..a55081099558
--- /dev/null
+++ b/dev-python/agate/agate-1.6.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python data analysis library that is optimized for humans instead of machines"
+HOMEPAGE="https://github.com/wireservice/agate https://pypi.org/project/agate/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/pytimeparse-1.1.5[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.1[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.0[${PYTHON_USEDEP}]
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/pyicu-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/python-slugify-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/leather-0.3.3-r2[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+
+EPYTEST_DESELECT=(
+	# require specific locales
+	tests/test_data_types.py::TestDate::test_cast_format_locale
+	tests/test_data_types.py::TestDateTime::test_cast_format_locale
+)
diff --git a/dev-python/agate/agate-1.6.3.ebuild b/dev-python/agate/agate-1.6.3.ebuild
deleted file mode 100644
index 92bdd1023bf1..000000000000
--- a/dev-python/agate/agate-1.6.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python data analysis library that is optimized for humans instead of machines"
-HOMEPAGE="https://github.com/wireservice/agate https://pypi.org/project/agate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+xml"
-
-# Other packages have BDEPEND="test? ( dev-python/agate[xml] )"
-LEATHER_VERSION_DEP=">=dev-python/leather-0.3.3-r2"
-TEST_AGAINST_RDEPEND="xml? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/pytimeparse-1.1.5[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-2.1[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.0[${PYTHON_USEDEP}]
-	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/pyicu-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/python-slugify-1.2.1[${PYTHON_USEDEP}]
-	${LEATHER_VERSION_DEP}[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
-"
-BDEPEND="test? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local deselect=(
-		# require specific locales
-		tests/test_data_types.py::TestDate::test_cast_format_locale
-		tests/test_data_types.py::TestDateTime::test_cast_format_locale
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/aiofiles/Manifest b/dev-python/aiofiles/Manifest
index 17079ca251d7..a0d828e7ce3a 100644
--- a/dev-python/aiofiles/Manifest
+++ b/dev-python/aiofiles/Manifest
@@ -1,7 +1,3 @@
-DIST aiofiles-0.5.0.tar.gz 13332 BLAKE2B ccd044ce9fcd74b2a6419b4f0e9e3977086c9685741dbb734a7f9222ab96dca58b5330ad0d0cd9f10fce03ee123add7101825f047451344fc451c40a4352674e SHA512 89eb1af506bdf5f3f2e9c3afe90f17d521ada1cdeb449dcdc800d4faa4edc1c9ca93811915aa059d8c5a1b0a3aaa40231a46b3d041ca745e071628293bddf1b7
-DIST aiofiles-0.6.0.tar.gz 13585 BLAKE2B 4b81e8369f91b0406c9bd5025c4b5da91418dc810065f1979ec862299fd16976105b89282b22a3ae2e0151cc550c927524795d3c5d69c82809faeb4e16179b8d SHA512 2cf9e340eccfef3934bbd86338a235368b99a10e34526e8267232cef14b12e3d79d40350d82874841d5bf7fd0acf779b663288c57d150096f1275586d51583c4
 DIST aiofiles-0.7.0.tar.gz 23245 BLAKE2B 5dcb743912555de9a4c58a37925ca08c4be7065ea78924854d548b32f31f93bdf1b231db840aa9ac822d467ffd8c7f57c506c5f6d550c662013008899da8b716 SHA512 75287266cd86c572db0795074d625dac8b3476c4d8ef9a193ce01ce80a423a4aa39f6e5ec5005fb441375ccb2a2ec84913634919ee5000bfb7623ac77a030b92
-EBUILD aiofiles-0.5.0.ebuild 558 BLAKE2B 887803d5fc7848bd9dedf53d1023a184823ec5e4b70ec2f47b75f39cd86a20d5f3c2843fd3ed5d985c092f4ea94eb29a09f90c68aa22738041141acc8825c56b SHA512 092fabb0391bb5d1f4dafd0e3a73092a2add492de61a6ce8a60dcc8f2e33ca0704982db72db83cf56d5717b9e73a7dbd7e34f5202d4672c407b56b09bc4ffa59
-EBUILD aiofiles-0.6.0.ebuild 490 BLAKE2B bb2a36efd687f42e147783b49d1c5c1dea02541eddbe8c267eb3a98add168a37e1eaf2693be26602a80cd797a17bbe1ee727029b36285b1150d5e4b70ffa661a SHA512 a8e39c7aada13241ac7d2a033015a27add05cff3fbd70f74170e267e0f3ff2343b54f2400e2f5f678fde68aedcc5ec581548418f890163ad182c6552f564a466
 EBUILD aiofiles-0.7.0.ebuild 530 BLAKE2B dcb7b80dfbb8cb5960640eb7ae0abaa8ff9aca1c3452338c3c225698f83bb5223b69cb6510a0e0640f427d04de3f5a59369b6457c43e72f8597ec7118b3610d1 SHA512 e31fd786d21709811ee7ad5fce311e35e23f7f8dad4cec3b0f4cd73ea93a2334e254e7836f7c8903c966d8c596d25389e040a439a14ac1d7709c61583f4e8768
 MISC metadata.xml 611 BLAKE2B 3706fd736912187fc4b261626376983a001202c197bb57b8274cc6eb4c6ae46c736dcb8fe41cffbb67bc06f0fec4b11eb8967c9a2bd04d8093b1c6783639f4e7 SHA512 4148decc79697d55e08b8b57e179f07e376b96cc4ddc57bf49711b149719473ba1b31d49e1534009bdc052b8a8683ac064c54709f2d6da20e95de6c89d1e0f0c
diff --git a/dev-python/aiofiles/aiofiles-0.5.0.ebuild b/dev-python/aiofiles/aiofiles-0.5.0.ebuild
deleted file mode 100644
index a4e699ead854..000000000000
--- a/dev-python/aiofiles/aiofiles-0.5.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="File support for asyncio"
-HOMEPAGE="https://github.com/Tinche/aiofiles"
-SRC_URI="https://github.com/Tinche/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="test? (
-	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
-	dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/aiofiles/aiofiles-0.6.0.ebuild b/dev-python/aiofiles/aiofiles-0.6.0.ebuild
deleted file mode 100644
index abe5dc248060..000000000000
--- a/dev-python/aiofiles/aiofiles-0.6.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="File support for asyncio"
-HOMEPAGE="https://github.com/Tinche/aiofiles"
-SRC_URI="https://github.com/Tinche/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/aiohttp-jinja2/Manifest b/dev-python/aiohttp-jinja2/Manifest
index 856c385a97f2..8a28d431eaf4 100644
--- a/dev-python/aiohttp-jinja2/Manifest
+++ b/dev-python/aiohttp-jinja2/Manifest
@@ -1,5 +1,3 @@
-DIST aiohttp-jinja2-1.4.2.tar.gz 54328 BLAKE2B 3d6aaeb03bbb89516a92fa877ee95a2fd27ab83666a03ca12e78f1744b82797faf2547bf55118618cbd979d80779a9571dfcfe9036bc84142563ede55cfbc1a1 SHA512 7bdaee97efe90a0009cd78a4e46dc80cfeb661c2d5561fdb1b1a1ff098abba8667260bb908e3227edd6601c2412812d0311461942568a8aabf07a164ea2f290e
 DIST aiohttp-jinja2-1.5.tar.gz 54608 BLAKE2B 3271e159f1022023b3d9f96b0f534b04898e0774d6ceefa19bf8958a835d499a1598fd12cabab8206448a0e89a107816577d596bff0c45a4947fcb7289c35e5b SHA512 230fec6e54fa55e22be3bc09ae1896cd12834eda5721c1d698c8482f9529b443ccf13a4db24bd9ccd179c36b9cdc90abbb848f287e7ed79e621d6a2976b1fa32
-EBUILD aiohttp-jinja2-1.4.2.ebuild 841 BLAKE2B 25f59019b996241edc0740c400c7ba158c2db205cbbe2a415d7531b0151cb8261e8786321adf84070476c0c4b2d3a45c103180958992d4bd6b7cb1278fa24b7c SHA512 53fd56354bfb1d76fcf8019822f1aa63e10838ec5441c02754696715e74e0a9b76416fec6b6876bfac4eef909ad3ee08080f212bec504da9968535b7783bab86
 EBUILD aiohttp-jinja2-1.5.ebuild 837 BLAKE2B 740d658be6187f8c392c3af00da6e3e1d12d7099e88a28d4c2bd44b8c144d0e3e448613adadf73ea09d840ba034d64a9831024ea52cd61811e2643ae83685c96 SHA512 991159512eae0b51b42780d8c1bd5f6f2aa60faff0646645cd853f21acbdce99e88dfb11c0bc15d81576d3588380dc3eaebfe7e392ce4b7f89d5758b6f6dcce6
 MISC metadata.xml 409 BLAKE2B 5ffd3d811629e68c72570d84a056b4d48be892097bad6de3ea0af1531d566253a39bc05a2ffcb268d1021b21bfef2843926bb521f97180bf0cf3b6508ac5eeba SHA512 255887232ff8b4b77d91dbed8ab55350233eef180798be610550715d39c43ae9534c81ca33e70aa8d746c92e66eacb66e2607b63c752eafd3392c27a9e111f00
diff --git a/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild b/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild
deleted file mode 100644
index 12b9970dfdaf..000000000000
--- a/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="jinja2 template renderer for aiohttp.web"
-HOMEPAGE="https://github.com/aio-libs/aiohttp-jinja2"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/aiohttp-2.3.9[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( >=dev-python/pytest-aiohttp-0.3.0[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/alabaster
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:--cov=aiohttp_jinja2 --cov-report xml --cov-report html --cov-report term::' \
-		setup.cfg || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/amodem/Manifest b/dev-python/amodem/Manifest
index 087edaf32337..82254867e522 100644
--- a/dev-python/amodem/Manifest
+++ b/dev-python/amodem/Manifest
@@ -1,7 +1,3 @@
-DIST amodem-1.15.1.tar.gz 30482 BLAKE2B 964cb6b6e674044650898d1f9ae67b3b181f836a4c52caad08046841ea222a0b8e7aab23789ca440b5ae98c1b5f20ce6a7f31707032471fe3543397f2818d731 SHA512 16d1ab37146181432da5388f5a387e477979578a656c73efca18d721ba90dc47ced28ef054c589ea693dcf1bf2744317ddc22110cc61b9330ff8665b9f209240
-DIST amodem-1.15.2.tar.gz 30438 BLAKE2B ca8e4d0a1aad5a3c9b10568e7613cba95a7bb356b5ac46cbfb383ce057012ed385abcc7b348ef18090b49fe00f402f79b6ebf719e0b938c960f38593c0acd3e7 SHA512 3d0a366c19fbdaccfb990e875e49935fdb2b6d2a3bac69182ec2c7e51e67901429c968f41edcc2dd98dc74e90958a58a09b24d0d4d36ea7256a4b945881483b6
 DIST amodem-1.15.3.tar.gz 30297 BLAKE2B 7ab9bce50eee0fbd788fc42ca668a187ac14e5c8e9c6d2a8c4fcddf24ec77a5e40c37edf21222d49f984d343adf46ad710973dc689e18e9065b470b4d1e3a5b6 SHA512 72e574bc4ddfbe949763427587ed2afe8baf153188cb2c6abda1c9f0e9e8f483bdda1edff9278519130b1b5d5487527d83cc9307e6f47a7a86404757199e0712
-EBUILD amodem-1.15.1-r1.ebuild 592 BLAKE2B 19bedecc070ca6472177add7cda6ca1c6a166c7dce2f9910e41c837f115a6d4b8d887b9ea50808f34aa97517c15dca6bfb76203c8106e156980a8a80ff00ed00 SHA512 6cb8c9dab01249327c1cdb80fa6b21e7b4a9dc1eca682d6f6bd31c4c98cc497946a88d5576afcfa30a880153f7654d1896e5c68761c5cc1e0b8df250579da115
-EBUILD amodem-1.15.2.ebuild 559 BLAKE2B fce820f054e8fb30172eea22a4d0dce73f38a259cc523ae15f0aa277ef66051ac0984687a8733ba8ee6725653fbce9915b0aa5087328c760c8953acb36dc929f SHA512 da49d508be223cd057eb0767f26fbe5993b9e87c758b8bb41c557d717ae5676d86dc59bcaacebfacb22493173a52a14dc2089997f1b761c477024d51f6a33f0c
 EBUILD amodem-1.15.3.ebuild 525 BLAKE2B 4b3d4534a4ab01b983faaaefce4ee1ff01ed26e5f7a5aae802d44d88ef0f9f075e0af585708331425f16590833ae083d31cac55f06d482a6d1f2d0045d6a8998 SHA512 f722ee4da7f297c5cbe0215aa3ecfa6eec38fd3f33ff31772fe2e56b814cd74c8f24c0aaab9acb94e6d48bccf3af54c4ef7d5f3c909a994cfba0c9b60def4dea
 MISC metadata.xml 570 BLAKE2B 2929f80d0d17f63da0f4b7d6f06ad56ab76c8fcd9fa047bbb7850a1175d5e3d7aaee41ff79a40fff837ffdcb354ba3796e929fd6bb5b544e1b58a92e8ce76ec7 SHA512 ce16eb5ce31b4f909935b1946399a0990c8a383026530f5d2a73bb938c1cec1b3f178150e1f863cbc22b63794ee7c8fe477ed301069a79fdbf9555db8d14a643
diff --git a/dev-python/amodem/amodem-1.15.1-r1.ebuild b/dev-python/amodem/amodem-1.15.1-r1.ebuild
deleted file mode 100644
index 1f05f698121a..000000000000
--- a/dev-python/amodem/amodem-1.15.1-r1.ebuild
+++ /dev/null
@@ -1,25 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Transmit data between two computers using audio"
-HOMEPAGE="https://github.com/romanz/amodem"
-SRC_URI="https://github.com/romanz/amodem/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/amodem/amodem-1.15.2.ebuild b/dev-python/amodem/amodem-1.15.2.ebuild
deleted file mode 100644
index d39040a3afe2..000000000000
--- a/dev-python/amodem/amodem-1.15.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Transmit data between two computers using audio"
-HOMEPAGE="https://github.com/romanz/amodem"
-SRC_URI="https://github.com/romanz/amodem/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 7980d5f2a6fc..e2cec9942aad 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,8 +1,4 @@
 AUX anyio-3.2.1-missing-trio.patch 4024 BLAKE2B 7f53d13f07dc1a8fea86c5b9c44a07cd2f2da61159eacbe4043246ada988ab7a57e894b9dbf58185a20f39ada7794268a65ae6868a5f8501bcb363fdf95f776c SHA512 a53ee1bc475f34eb6be535bcde0ed67ed626e6e0576fcfd51ef700370bca3be8bb9c5f89fd69a9de36ce717b05246564f0204e27038f0d48f2ab6039643aeb1c
-DIST anyio-3.1.0.tar.gz 122097 BLAKE2B 4a16a5d231cc5262dd4138f628b9d210180733bda4b9e81ced0c0e0c7f49e1760c8dd22db0a1db3b7a21f3210072f4e1c543e52a7dc716ad3f0415827da48e38 SHA512 120d8e3e24f542c06caedd0a67d16b3fb69c94f5feaebde5262e54f8ffba3f1cf927c82030d65fa2efb3479ee64abd968b6ce67aee767ea33ccef6b0e3fbd358
-DIST anyio-3.2.0.tar.gz 126210 BLAKE2B cedace636a115ad579ca47b345bb2a9bb32e97fa2ef886a9e6bd19219dcc92c393aaaf480df5e6f48c959590c2d6a3e0770f700ab4901c7a8e576b231597abf1 SHA512 f4e718704225d9cbb8e2592246ac393f96e82fb1898bc0ff89b2d7990c4aac7e7c9b339cb57a594c59a9e5730696122c9e647310c26e00ab152879e0a7e85863
 DIST anyio-3.2.1.tar.gz 126277 BLAKE2B 510980c9251081d5188f7654279753051cd9f8221f2090fb99624612e48b6f5fc1f6d9f1808f1c329c350857f14ceaee0d72615857171de33dc35cc7ba35ab23 SHA512 ef78e5531a917e3a5ddc1106f45ba556ca147e52ab29ed6cb25a3bd287148a15a015942dde6b9535d683fbe5910affed27df6ce5c4049251610f689cd151ee89
-EBUILD anyio-3.1.0.ebuild 1413 BLAKE2B 35471e090dad1e7d2a820c2c1d225e211311f673bf8d4a6d1adf5d0221d293fad3813295b17ddac496f603a1e26737b7bd43135361f4c5cfbfd29b48fd479f21 SHA512 dff8ec2ff5c87f0bea1d083fe62685c4580580e17bcedb14b014396a280e2468cd548b44bb492e5b64b09c61c49a4f86f043dcbd7e4a1bddb58b8bfff5b443de
-EBUILD anyio-3.2.0.ebuild 1418 BLAKE2B 398427069cbee61cf7ae0111c76933c8908760619f4fd6c26622bafbe68e58287af7d916418aea7b06c8c96b928aefc5242bbebfece4ce9e03676b11b1d0510c SHA512 eb3abcab9ad4e5e26dc861508f881e3f96895eb120951be2be685c0727b0efa9a240a57caaf530076bcce8b229514fd1c80fc0f41bdf13a433aaf8ffc97c795d
-EBUILD anyio-3.2.1.ebuild 1107 BLAKE2B 9f5e4c6823511c20c26449787a707b9071ad78a60737a785dad9cc6942cc5c8098c06d5f479c0939f77596c66724305944b299efc5db9bb3225eca09308a8096 SHA512 cbc81c945fd6ffb9bda5894fc3a0584a39dae1e5de172849b1972c8935602b90a278577fcd86a0b5353f31b6f166a4d87ef7846ddbac4fa3f31377971366c9cc
+EBUILD anyio-3.2.1.ebuild 1106 BLAKE2B a46d97ee7eb8b9b13c78d2cdb6a663fa92c203afd2a4a293006c4c5797a694b9ef28b5f5d3ee9354b636ed03d2ca84a818832e6ffed9c7fdefd857307c1b6085 SHA512 55caf659142bdcd572ebf9e9b94b7a30e9d7632f2151f7aa27196524ed05575289d577654e93ca81abec6ea07bbdda0dafa6d06ee8a5e3f048016f29b5e863f5
 MISC metadata.xml 1321 BLAKE2B 22708116b3b04529a83c9e005e421dab21dd5b259df12c3c7e75c74cc3505510b828ebe9808a234ce91d0fc2f17476bf884050561efb18892eb13c35806bbfc1 SHA512 6c1333b6e58faacacf68cd1bd6544c5b28d55ebb75efba1702aa5e2d4f28c29ac86dbbfd45dbb8af1dc2bf69476667d52c7f14bc765d836133e0811c6f2c880e
diff --git a/dev-python/anyio/anyio-3.1.0.ebuild b/dev-python/anyio/anyio-3.1.0.ebuild
deleted file mode 100644
index d4d7d1e46906..000000000000
--- a/dev-python/anyio/anyio-3.1.0.ebuild
+++ /dev/null
@@ -1,54 +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 distutils-r1
-
-DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
-HOMEPAGE="
-	https://github.com/agronholm/anyio
-	https://pypi.org/project/anyio/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-autodoc-typehints
-
-python_prepare_all() {
-	# This will pull in dev-python/trio and a whole bunch of other new things
-	# And trio does not yet have a release compatible with python3.9.
-	rm tests/test_taskgroups.py || die
-	sed -i -e '/trio/d' tests/conftest.py || die
-	sed -i -e 's/test_cancel_scope_in_asyncgen_fixture/_&/' \
-		-e 's/test_autouse_async_fixture/_&/' \
-		-e 's/test_plugin/_&/' \
-		tests/test_pytest_plugin.py || die
-
-	# skip network test
-	sed -i -e 's/test_getaddrinfo/_&/' tests/test_sockets.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/anyio/anyio-3.2.0.ebuild b/dev-python/anyio/anyio-3.2.0.ebuild
deleted file mode 100644
index 370889746426..000000000000
--- a/dev-python/anyio/anyio-3.2.0.ebuild
+++ /dev/null
@@ -1,54 +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 distutils-r1
-
-DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
-HOMEPAGE="
-	https://github.com/agronholm/anyio
-	https://pypi.org/project/anyio/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-
-RDEPEND="
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-autodoc-typehints
-
-python_prepare_all() {
-	# This will pull in dev-python/trio and a whole bunch of other new things
-	# And trio does not yet have a release compatible with python3.9.
-	rm tests/test_taskgroups.py || die
-	sed -i -e '/trio/d' tests/conftest.py || die
-	sed -i -e 's/test_cancel_scope_in_asyncgen_fixture/_&/' \
-		-e 's/test_autouse_async_fixture/_&/' \
-		-e 's/test_plugin/_&/' \
-		tests/test_pytest_plugin.py || die
-
-	# skip network test
-	sed -i -e 's/test_getaddrinfo/_&/' tests/test_sockets.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/anyio/anyio-3.2.1.ebuild b/dev-python/anyio/anyio-3.2.1.ebuild
index a0618bfa54af..17dd6f06bfff 100644
--- a/dev-python/anyio/anyio-3.2.1.ebuild
+++ b/dev-python/anyio/anyio-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/anyqt/Manifest b/dev-python/anyqt/Manifest
index d64b33ce4c56..77878007816d 100644
--- a/dev-python/anyqt/Manifest
+++ b/dev-python/anyqt/Manifest
@@ -1,7 +1,3 @@
-DIST anyqt-0.0.12.tar.gz 45657 BLAKE2B 5b09a31f35f9faa161473c6575a66ac57d0415179f0cc779e95e3ce3e4c25fa2573fb7062dfc031d3eb6500be8866736ffb00dce4fdd6b105c12be3fd6421954 SHA512 bb1bca5c6396512656a7c18775d87e26d003cf84f40dfe23b54ae170e61e99d1bcb88d74eb2e21239030ea69275dfae9ff620330d1e3355d82a71cb7f6335073
 DIST anyqt-0.0.13.tar.gz 46677 BLAKE2B 1b6eeb4a3c0ca6a76504c919e41d749d042668e0c9392616518b3b1741d4db270e5a0f354971ba5757da8f906f46149e996895212dcad2d2614d62a3d53bf554 SHA512 33033c90a945524ea1659de557dff36be06cbdbf8f0b580e57e7c8f386dd3d3007465e236d3865b76af4178b9d83eba51405a3257d0226bd117f7d9804146e41
-DIST anyqt-0.0.8.tar.gz 43519 BLAKE2B cd70564e858fc344d89b85a5e5556cdd35dd584f51bba2bc39b9e015dcacdb8f0964b0d6dd435ba6e219543aafbca2fda0f49309e8df07e790bd75660d8585b0 SHA512 8bff488972703385bb0506fce7b33e2c62a0c6469e0284062b0882dda0842d5488621c722e00c2005aa1f8ff18307e823e146aca92c16f5116d2bc974b194641
-EBUILD anyqt-0.0.12.ebuild 397 BLAKE2B aa255250f278718e0ef0a42ab17065d673e71dff296dfd165e026331557b015735f3c9fe3710fa140e0b8a152f84e6c3df0ad239d5938275a2aef002b28c76ed SHA512 0bfd7b9d03c53c5267fdd6885258be4c30c7c5cdf36e110d3d05b4d2936ae535cc0c4abb774656cd34bd5d44aeddb901aafbf07e8ff29c29f855788ad8cb3e03
 EBUILD anyqt-0.0.13.ebuild 397 BLAKE2B aa255250f278718e0ef0a42ab17065d673e71dff296dfd165e026331557b015735f3c9fe3710fa140e0b8a152f84e6c3df0ad239d5938275a2aef002b28c76ed SHA512 0bfd7b9d03c53c5267fdd6885258be4c30c7c5cdf36e110d3d05b4d2936ae535cc0c4abb774656cd34bd5d44aeddb901aafbf07e8ff29c29f855788ad8cb3e03
-EBUILD anyqt-0.0.8-r1.ebuild 438 BLAKE2B 276ddb5ff1115f7d7d9ab66912acc19b037fdb7c77c905a35e120a5741fe464641dd8f92e6348d13a515eb2acffd362b09b85acf1f544bb084f953bfb6df71b5 SHA512 87c599497ec90a604d5bd5dc07a35cf0c32d7ef82b3e4964748c026aac8aaab0c9fe33a22b1cb6b806aaa4525cc336e3ebf5027ac4ca0a0d0fafeaf37c094d4b
 MISC metadata.xml 286 BLAKE2B 0498e01030909d49b890a4174b0b198548a3cb324b4c85e3cb29108004bcfb71adf01ca64be576bd5a1ac9b36a09a6b600d799e6a0c29152018b4519f18f567b SHA512 0797b1c07ad778e31012eb93070599ddfd687dedf0a073f463c950dd1c213d417708d0a95b26dbf07d4aa11c66c24a22891d285896d87bc2a29728519e5f2cf2
diff --git a/dev-python/anyqt/anyqt-0.0.12.ebuild b/dev-python/anyqt/anyqt-0.0.12.ebuild
deleted file mode 100644
index 8890d4f53405..000000000000
--- a/dev-python/anyqt/anyqt-0.0.12.ebuild
+++ /dev/null
@@ -1,16 +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 distutils-r1
-
-DESCRIPTION="PyQt4/PyQt5 compatibility layer"
-HOMEPAGE="https://github.com/ales-erjavec/anyqt"
-SRC_URI="https://github.com/ales-erjavec/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/anyqt/anyqt-0.0.8-r1.ebuild b/dev-python/anyqt/anyqt-0.0.8-r1.ebuild
deleted file mode 100644
index 21ff1bcf320b..000000000000
--- a/dev-python/anyqt/anyqt-0.0.8-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="PyQt4/PyQt5 compatibility layer"
-HOMEPAGE="https://github.com/ales-erjavec/anyqt"
-SRC_URI="https://github.com/ales-erjavec/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index e31ae86ed20a..cb51c4a23ba8 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -1,5 +1,3 @@
-DIST apispec-5.1.0.gh.tar.gz 69990 BLAKE2B 0fc488abae9657c9996775c460b97b66a782b82012bf3c1bb6a1623600b03c71bc80eb556d60720e00b07551a5c3b44b40f709bffbb05b10603485af9122cd6b SHA512 ebcb6ddc71be541c152f18eaf2462f09c5860b689d34581723dc8f70f4da59966c34ea6f1282be2ea38cb4524af224a96bcfe974f5fcc62bf4939c644aa6df48
 DIST apispec-5.1.1.gh.tar.gz 70296 BLAKE2B 339706890d23c796ea73c23735c5655694315a8a8017eba8f69574ed4e85ddf9a65c3a26482a78f08a118afd19e3c9bbcc9d264bb770941d7affbf7cf85eb925 SHA512 4e0e2959699c735c5242aa1a954392d97ea4809aafbd8d091f608baf7397a31964852588c474acb84e8755a62849837d741eb1e5fdf1cd5304f46c852e346d03
-EBUILD apispec-5.1.0.ebuild 1013 BLAKE2B 9428582a7bb9828da380e83a67fc10c16dfa96991bd9a665dc06cc753456794ee2b2d19ba7a09b2162199f430ebe3f466065839c4a4a67317c249a4f7e0cdd56 SHA512 6edc487cad0b66acb56b7eeffe6869a66de26cfb2f8b29512e4cbfc59bb4cbb6f74dec93d35ea5a3de43297faeea200cb70e4653512a849a8f2478c8a4f058bd
 EBUILD apispec-5.1.1.ebuild 953 BLAKE2B e626574e30ee3443015a95589efe57e9e37b8d26327c828590c56d394e82f97945bd2c3f929284bf1b569bdc4223efac9e9b90f316f7dff6d2715e3a4e4bc486 SHA512 524fb3f50ef48f0167b23fb492ebe1a8d8a4cb3cafbae97a697565485b96a90d5df2b80a40537b4dccfdf38af3598fbcb1e7bec7c48733b3e73364977e4be091
 MISC metadata.xml 504 BLAKE2B d55ae521520ba60a139e83f23aacbb3df76c4c120a54f1b65b185018647c1f363bc88f354abc1810b7a9d9f3cfa264e0303d46cd23b8091dbb365bd84cc04815 SHA512 e0297e941c3c544cbb14044f02451c26cfdec81b2bd49cf225dc9f32d1ccb207e630d838d8928d28ccb35a3cf01493a87ceb2633cc5ede36b62a6d81f164ea32
diff --git a/dev-python/apispec/apispec-5.1.0.ebuild b/dev-python/apispec/apispec-5.1.0.ebuild
deleted file mode 100644
index 9965d2dcdf04..000000000000
--- a/dev-python/apispec/apispec-5.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="
-	https://github.com/marshmallow-code/apispec/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/marshmallow-3.13.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
-
-python_test() {
-	local deselect=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/argparse-manpage/Manifest b/dev-python/argparse-manpage/Manifest
index e576c0be090f..dca96ec2a820 100644
--- a/dev-python/argparse-manpage/Manifest
+++ b/dev-python/argparse-manpage/Manifest
@@ -1,6 +1,4 @@
 AUX argparse-manpage-1.5-remove-six-dep.patch 439 BLAKE2B 24ea98d0519e1ec1079ad3b6bcaa5e361cd2b57a55b72a378c0658f680e7d2878cdd0e6ba57b87450bb60ede705d22e01439384d0d84c54d0e9a5ecb48e79597 SHA512 cac28b8a3a4bc39c3eb5d421cef46c474d25dde1b6bf1ff8af2833e1c9d0f1422118717a8673cd1c1c554ad29967ccbe9b3ae316ac6d645c9ce08176b5dae86a
-DIST argparse-manpage-1.4.tar.gz 33661 BLAKE2B b2f6a0bb7ef3a95470e73c4c94b9fef42f130433d5f91263201d98c0afebd4c3fc38153a172aa86c50a773e3270e1f618083f968bd38a86046362367f2e8c022 SHA512 4756781dbe988541cb0e1fd8a79c4d262c7bf54397fb302ff3ad706e9a896d68f781931e73013cdd7136efc6e46914118b862e0377f49b73fb25b20d0a23744d
 DIST argparse-manpage-1.5.tar.gz 34290 BLAKE2B 598a0eb0d4816a764c1ba4093b18e28d7865c9a113db1910793748eb24394636a9e1caad86fef5416933ae5341026048d1e39ce928131a8796a5d66a40e36853 SHA512 bfdea19fa62ac029754d6df26c4fb51c18f7fee4fae681c1117253627e724cf1ff1db5196ad0690fd436cebbe403536905f157cb7eae7be50d321c663b491fd0
-EBUILD argparse-manpage-1.4.ebuild 530 BLAKE2B a9a24f043bd6aaddc41f02443f7fc86992e22108247cce483abbd481dccf776b28f3edb6339b2686f52ea295fba5fbcf9b4be49a1964b350a5f37a49d1bf826f SHA512 5b0a34ae6dd2b2dbbfc765e86add2db64397142616033576b1e173cf640abdbcfb9e68134b7793dccc67ae422b4488c9ef1bb3ab8c779aa371d67804e59d48f1
 EBUILD argparse-manpage-1.5-r1.ebuild 563 BLAKE2B 8f67b333c2ed21261fc4d5a3eff0de293b1039ca8a79da15a8481e34dbebbccc7a506c98bf51a3c946efd728f57b04a4ffe6c18fe8fe5642d235a8c016e1c8d1 SHA512 fab1ac0f4a279a51d88399b1cc05353ba87359834a588eb29fd5902384b9f30c9105ac168cb33fe22f148f26bc881f106eed660bbdcd0db46bd30416b1f9e14e
 MISC metadata.xml 418 BLAKE2B 532dd384efcc880d73bd757b09aa98af767f74ca3f8a573d0897d2dbc86122db0de0b526834b87a5d76bf958f593a5f89bdad5bdf388e54d4fae227922b86485 SHA512 daabf95331a36e1d40065f7d544b3df75a68aad6a4bbe3bb3890db97898c47c9c0498cd77d62bd86684ee470b35aa68397097324ea83ffb4bdfd606bd786f3cc
diff --git a/dev-python/argparse-manpage/argparse-manpage-1.4.ebuild b/dev-python/argparse-manpage/argparse-manpage-1.4.ebuild
deleted file mode 100644
index f6991edd41ee..000000000000
--- a/dev-python/argparse-manpage/argparse-manpage-1.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Automatically build man-pages for your Python project"
-HOMEPAGE="https://github.com/praiskup/argparse-manpage https://pypi.org/project/argparse-manpage/"
-SRC_URI="https://github.com/praiskup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index e048fe715c4f..23b2a8dc0481 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,3 +1,3 @@
 DIST arrow-1.1.1.tar.gz 113054 BLAKE2B 7f9d205aaba1c8ea4ad433baad03cf2392e5dcb819a95ef8de612f7d6f8cbb8500d224648c61a0f48403878e9b02fa8e90e3e3fb6411fa23eaf1f333205f7c1e SHA512 eaa6cde1083a0ed1204260ae9b9c850ca2dfcc53858e2391def28b2aaefe78671166bfdefa1c725adceb26fa8425885d3a0c3914782203e1c3be593dd9a00349
-EBUILD arrow-1.1.1.ebuild 809 BLAKE2B 75f6ebe3a05276383eff4d14d83bdfa66ed81e687d6ae913a654942a5862d54c4f127bb61c9f1ff585b3697321bffb32ebd0a9787ef27dbee6cbacdc85cc354e SHA512 a45e5a2e24b058cce22639c6a4560762a9036dba3a73f94908fe82066da3d337ee561f19056e826c4885ff5b6f31068bdfaf3a90d76d3faa79d998b353199d8d
+EBUILD arrow-1.1.1.ebuild 827 BLAKE2B d93176d70e67599c2004044ca85d979f07622f8d8ba40507ded185742f3e056e314d1e2ade2f460ae275df4bbd34c7c6ec891245fb9f698023329a2024924bf9 SHA512 aa24a2c5fa401db77eabbe6bed7e4b400bbb3226ec716193e2c0ed4d683e11e09b9a1283a4ce7ed3bd7762f473433a164daf4fb7f18413c4cdfc948b8b7f6ec8
 MISC metadata.xml 387 BLAKE2B e07417bbea7b9b1a8b850dda631d1e626e013a6cac793893deafec648003970a6240833af5ecc3a9b19aff3ea38e26e684a7a151f1138ed9d8597b567d3ca960 SHA512 ea9a24239141a4338c7d3291e2be9dff5d36f33f91ec3fefb62c7fd054b0c7a80ce66b6916f045aa3eaf69cc4f2f3d116a525958fb0f6185b98a10660bc08e50
diff --git a/dev-python/arrow/arrow-1.1.1.ebuild b/dev-python/arrow/arrow-1.1.1.ebuild
index 5c51eec7473d..4a7fe509fb81 100644
--- a/dev-python/arrow/arrow-1.1.1.ebuild
+++ b/dev-python/arrow/arrow-1.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index e6c3df13edac..8ece7c3e8dde 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -2,8 +2,10 @@ DIST astroid-2.6.6.tar.gz 368118 BLAKE2B c5117566579ee6c8ccf973e180b3de3cd389611
 DIST astroid-2.7.3.tar.gz 378876 BLAKE2B 016ab6e798f1a608c0e0ce0bd81865145349c70497d09e336ec8b21eaf01ea365c204f42daf6d55d148f6873ef15e223adc9baf4a09dc8945158e4b5e24f1ebb SHA512 03a886c2daef640cf0a85f38e39b6e12080dc722862cb03386d1355f3f955ea46a7bb7b85c2887f52ba6d0ecb6243c653c7f1cd44d6c7429f2cd29c1dfd2297f
 DIST astroid-2.8.0.tar.gz 384821 BLAKE2B 74150d67fd883b2bd4356c49c9c1b148a5e98b4d219405e745474c536691276d029bf8a0bb9275ab9df3d09a9b3492a147c67676ab1f80c9c7d3ad10f240bec4 SHA512 0f14f094a6dc753f0171b462f856fb1bfb1b979a8853f76da14beb04a5b02662f6b4e63c3241ce2c9a37f63490a86300152cbe9509c43e0209d5ef536d693b08
 DIST astroid-2.8.2.tar.gz 388957 BLAKE2B 0e91b1978d8715f91b24e1d7f817bf7db3c4ca8c2c7af09f5df98b5a40c9307d54ec4051f08aa5062ffe51e5c396ae2e38078e1e124e23855fc207e34638719c SHA512 15b73c24517217ab54157d6568abf2c81c70e47980aece58eaf1d946e9d5d44316467ddaf2153fd8f6278cea80cfd09dc31783b215305c71c09d1e4e6f406862
-EBUILD astroid-2.6.6.ebuild 1230 BLAKE2B 31bd5783bba20a5c1851a2961a8ef2dc8485d24745dd3129b7138380d623a7a65447d6c84a60fc14911efb7b3731e38f266083d08661e1e032034ed9311feb86 SHA512 dfcfc505644d4049757ba68d4921214271ccacbfd4dd52d1321c8c4792fa4e1ac8f5552f412ab1495657bffcd8e0e47f1d376d2d2300b8cb9e03b39b06b0a9ef
-EBUILD astroid-2.7.3.ebuild 1236 BLAKE2B 27aa5cc29d38dbb2e24b244313d813705584113732c03010fe5af060ba83044d1245d97febcdc9515e70ab4353d545ff0d2e19cc2e336bb26fe5299066f2fde7 SHA512 df717fbd058beb502048bf26e51c40794ffb9d8b93996391d8180c4b7520a1368e1e453b01e3cdd424e17eae1aa345d60a417158acb833bffe5fa7aee45c2363
-EBUILD astroid-2.8.0.ebuild 1298 BLAKE2B 718330811ab1e55d1d1eb280f4b4ad0712a5c7d8813fe7f19e3855ce811e5316969d24e941015bb62661472678f0d6a62d263d64f0e0367a7fa3ed9898328314 SHA512 fce4923f9092cfad533c6d05244a8880ce914ff95793881ed0ab27bbd6d0862272d2d3c73514fa17ddba507e1d49034f8933eecb837c4a03475596501254eda2
-EBUILD astroid-2.8.2.ebuild 1298 BLAKE2B 718330811ab1e55d1d1eb280f4b4ad0712a5c7d8813fe7f19e3855ce811e5316969d24e941015bb62661472678f0d6a62d263d64f0e0367a7fa3ed9898328314 SHA512 fce4923f9092cfad533c6d05244a8880ce914ff95793881ed0ab27bbd6d0862272d2d3c73514fa17ddba507e1d49034f8933eecb837c4a03475596501254eda2
+DIST astroid-2.8.3.tar.gz 389855 BLAKE2B 355d6ae4a7c1bc9726e46a6eecf7538ecf91294220b10bcf4af26882b2c928544b6337c7368032587ba31bd0de19ed962d092bf8a783f74720d313b33fc96b90 SHA512 b93aed7a3092b726ef0d3e1b1703bf3e198d6eeea8d6faf40da8616d33a093f7e249dde930b85be7e0c358f5a151de12cad8571daa8cfc346d082670c556db08
+EBUILD astroid-2.6.6-r1.ebuild 1233 BLAKE2B 9500b53d3c8d12e4ff266a691075ae02d6194f58a32573d72f08505595d0a0a68fdba18a52bd861c0736ce94083c647026ab41cbf39e89f1d53f529df70a2f9f SHA512 ff616d891d81f4422054ba16d9986ba39106d5c465e2a1ddd2993beb41fe9dc5f5221344486a02a2d27f360b2aabb3fdde02961b3374b71eb3bc3d30ddfed303
+EBUILD astroid-2.7.3-r1.ebuild 1239 BLAKE2B b95d58488111e9717c4306207187f83c86ba50b157148942cfaa7e92f3c145b51a7d1c2cebba1013226f1e284af0fef8f2ae1879addc3cdf270c40b0be3434e2 SHA512 70d39f0b553116ca5988e7fac9b6a960a27ad7a0b21835b396366820295dab10c49805cd79cea4bbf73cb82e1ad96eed182d03261e108d178987559161bd3721
+EBUILD astroid-2.8.0-r1.ebuild 1295 BLAKE2B c9300afacd56f294ef3e624db9ef333c66f51c20e26c15d608ecb9e7e9fd0d5c64b279f87e875ffcd51c1e376c2c859237422d00b197e4d8bff9ba2a7f6aa371 SHA512 da956f24f580bb8f9d89173e858230a925a8f10387cce819fcf974ddf590ade6efd19f1bb1d2e804a42b6f716f55576d1e1b433d7dbd7bfca33ac8719f2315ee
+EBUILD astroid-2.8.2-r1.ebuild 1307 BLAKE2B 2e20a2e9f7e38e0bc7f0fe66ee709a28e2bc4a598c1605325bbefb365170df15116b2a86d2028ad41fcd9960faa41f2c105f3788c338d9384f8db9af66e08eb1 SHA512 fa6b125aa6474d55ed383f3dae72baaa30a604cb710754057995d1158b9bbf15d08f598b23ef1e083849035e2cd9d585da9366987e7dad490d9ea94177cfbe63
+EBUILD astroid-2.8.3.ebuild 1307 BLAKE2B 513e6157c586c84c4e676044e22fea04809eaccf88fc7fd4346aaa960708828d8905e18e52d0fca04142ba5f43b3094035837a0bc873b78f5174586c39799c62 SHA512 07fdea1691f956c3810e4330aa44c58af683e9483561647da633c8e2e3ef8cefef9e8b2cafa1b1da221a43a90c1b67ad191446cb1548a0eb61a1969f79176c8b
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.6.6-r1.ebuild b/dev-python/astroid/astroid-2.6.6-r1.ebuild
new file mode 100644
index 000000000000..3198d24bb04e
--- /dev/null
+++ b/dev-python/astroid/astroid-2.6.6-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/wrapt-1.13[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/astroid/astroid-2.6.6.ebuild b/dev-python/astroid/astroid-2.6.6.ebuild
deleted file mode 100644
index 5cf0a2860c2e..000000000000
--- a/dev-python/astroid/astroid-2.6.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/astroid/astroid-2.7.3-r1.ebuild b/dev-python/astroid/astroid-2.7.3-r1.ebuild
new file mode 100644
index 000000000000..5dcaee0cf921
--- /dev/null
+++ b/dev-python/astroid/astroid-2.7.3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/wrapt-1.13[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/astroid/astroid-2.7.3.ebuild b/dev-python/astroid/astroid-2.7.3.ebuild
deleted file mode 100644
index ebceef0b5bca..000000000000
--- a/dev-python/astroid/astroid-2.7.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/astroid/astroid-2.8.0-r1.ebuild b/dev-python/astroid/astroid-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..efa44fa60552
--- /dev/null
+++ b/dev-python/astroid/astroid-2.8.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-1.13[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/astroid/astroid-2.8.0.ebuild b/dev-python/astroid/astroid-2.8.0.ebuild
deleted file mode 100644
index a5c9c9f43cf4..000000000000
--- a/dev-python/astroid/astroid-2.8.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/astroid/astroid-2.8.2-r1.ebuild b/dev-python/astroid/astroid-2.8.2-r1.ebuild
new file mode 100644
index 000000000000..a237e80dc627
--- /dev/null
+++ b/dev-python/astroid/astroid-2.8.2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-1.13[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/astroid/astroid-2.8.2.ebuild b/dev-python/astroid/astroid-2.8.2.ebuild
deleted file mode 100644
index a5c9c9f43cf4..000000000000
--- a/dev-python/astroid/astroid-2.8.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/astroid/astroid-2.8.3.ebuild b/dev-python/astroid/astroid-2.8.3.ebuild
new file mode 100644
index 000000000000..a7739e685def
--- /dev/null
+++ b/dev-python/astroid/astroid-2.8.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-1.14[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/astunparse/Manifest b/dev-python/astunparse/Manifest
index 044e2183545f..a5655137a8d1 100644
--- a/dev-python/astunparse/Manifest
+++ b/dev-python/astunparse/Manifest
@@ -1,5 +1,5 @@
 AUX astunparse-1.6.2-tests.patch 707 BLAKE2B 00d45b4b6bfdc70828d173985533345798a5982fa4f345e83c07e39c58dafffbf2a50ae1657df02769351a402e66faec443f7e63604ef457517e570803c50b3b SHA512 d1a86860548e0b904cc70017e0b5fa3a4e8da6bd1c03571e196e01a660d31a3ae03dec77c36945d7b5e53920b2531f0a7a0a5e3edc15b5a61c53ddafe83156d4
 AUX astunparse-1.6.3-py39.patch 2466 BLAKE2B 8779b2a98e801f675f67e2f57b283401aa577f76bfc9633c0f17af9ee9c11f1508c3b23f4bba12040012e9796f887bb7253a40603f1777a1f8cb95c5cd080c4f SHA512 6bd1a46f48e96634f67ffbd49fce4a3e9251f030a1a4298455bbe92f09bdaf1d03ce807b9bd44b8e04218d80df72974570f2c4de00e617dc6557ce537fb2abcf
 DIST astunparse-1.6.3.tar.gz 18290 BLAKE2B d7e6fa3ba58c6e112eb84720832890f4515b1c4ed420587565cdff37da893c07eefd0b9eb00795a3eb08bf56834d65150298a6be65e524b0c267c38e6f9c20d1 SHA512 12e99b32524e551494d3053a57aeb646bca8a96a9aa17b0737e6dace6c11874e2e7633d82197cacc0b55622bea637030344ab45c8db57ef244bd63663799d2e9
-EBUILD astunparse-1.6.3.ebuild 681 BLAKE2B a973a0d0d626cb4d8f0f002f0b4dff2805c3e3a639a16a7db20b3d5c5fe04857f1716e00c39b20e8cfd1387c0a06f5ee7d463298ffa778770933557a57ba56cb SHA512 7e05db2195a4ada4cbaa2ceb98b184e6a7eadc36fe325dde1e60be3c5b3b25abf5750558b1ecfd33a90d8b8765104ff12a14af4473787f0cb40510c351bdfff7
+EBUILD astunparse-1.6.3.ebuild 688 BLAKE2B 7028bf15eec90b0b7d1550e5d25df7f57d9a31324de86b8f0279c317bcffebf190d03bbb51d6bef65763451e98c2dd9bd8fa94aec546c66a512eecf4a6c32cf5 SHA512 389ea906dc83d8dc92c6d9e66a77427b48c9298448854c9a305da6531652a3d91d78b17fc74fd66b3150f4adfdfd2e2b6ce85359bb88e06814b3f7e85f32297c
 MISC metadata.xml 423 BLAKE2B 2c4953145f52c0378af4a7170621e9d4060aaf20ea8a2adb5456cfecb4a6c3c223f1d5b75972a7512c4aac8210e1f62b8c0e07089e09c372e1e8564769aac9dc SHA512 d693f6f76e67227bb63323d8d6564ad3727c193e00aa5bd8ceae1ea99bb6dbd35521d97e332220a3541b0e5369928b491385ec2278279b410504920148a923b1
diff --git a/dev-python/astunparse/astunparse-1.6.3.ebuild b/dev-python/astunparse/astunparse-1.6.3.ebuild
index 9b4e339f3732..eb454d0eccb6 100644
--- a/dev-python/astunparse/astunparse-1.6.3.ebuild
+++ b/dev-python/astunparse/astunparse-1.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/asyncstdlib/Manifest b/dev-python/asyncstdlib/Manifest
index c87007035b79..2bf80b5ef27c 100644
--- a/dev-python/asyncstdlib/Manifest
+++ b/dev-python/asyncstdlib/Manifest
@@ -1,9 +1,3 @@
-DIST asyncstdlib-3.10.0.gh.tar.gz 45242 BLAKE2B 12fb7f96d9c7c6e7ddad67b6c25b805de95812f902e14935a11440c4c55437f550df18c388727d21745b99e6db97917849547fdf726a89c62136ce1d01b8545b SHA512 9e930fa906139d664575d7f41d4e5ddf7da62e02bc946efeadadf6631ae63c15ca2ac1b5793172424f9ad916d32bbd4a741de5844b247c2fa506b63431711933
-DIST asyncstdlib-3.10.1.gh.tar.gz 45230 BLAKE2B daefacbb5712d200dc61d99cbf0deaa50925cfe2e8203f01a8083531d762b838d9603110a07ac1e1a00f17f1bb8ee7dc1a759d35949570fe134d21c4e48993ae SHA512 05e0e64f8262cf3ba6f8e784490597397e0d6a74f2052da80bb531df557dd3143c032589c429a407049ed04b093757c7a09674c66110befd6ab66b0edf883909
-DIST asyncstdlib-3.9.1.gh.tar.gz 40224 BLAKE2B 8d1e564c9f5ac10c7f05dfa3933f695ae458685550fb67401f3bd0d1294ef0b170f5b385cdcf63c0096854538219a0dea77d4d80bd801f1a9b15f5ad3f2c562a SHA512 de7860d84cee7bfdc974a0677cc231323c86238bcb0bfd2f32a62b7356042aad647ee8d627393be35c5a134855d5f76967143ad8347df9d6258f46bc2b43a62a
-DIST asyncstdlib-3.9.2.gh.tar.gz 41963 BLAKE2B da40c23bacc58c1347aca94107e3026829d9b27645eddc47fc46a96cab4be7baa9ed3c31f6f0045b884130d4316394d6a0b6b44818b42b6e6c512c641847d556 SHA512 f5268451325b48b967747b5e1ffe4e773a5aae82c6d481781e6c95f483d972da2b3806c1117067256d22efaba1238787898667a6a50ac4b2512dac4b5343d2a2
-EBUILD asyncstdlib-3.10.0.ebuild 521 BLAKE2B 29f1d54b54ab23d5c364106db4c0bedadbea9a9c5336fc4d799fd1ecd8f55a59a940e832e5c4767290c5e320317d73e788dffee6bbe895bbfb9dec5574dd8a28 SHA512 673c9e2bab7be93ee4d35b2cfc1adbc2275bf9a1b5457f9a68d5df163328daac286887b2af0280e429cdf2a0f67c3475a694c1de3d9c5b526122dd50f322e4cc
-EBUILD asyncstdlib-3.10.1.ebuild 521 BLAKE2B 29f1d54b54ab23d5c364106db4c0bedadbea9a9c5336fc4d799fd1ecd8f55a59a940e832e5c4767290c5e320317d73e788dffee6bbe895bbfb9dec5574dd8a28 SHA512 673c9e2bab7be93ee4d35b2cfc1adbc2275bf9a1b5457f9a68d5df163328daac286887b2af0280e429cdf2a0f67c3475a694c1de3d9c5b526122dd50f322e4cc
-EBUILD asyncstdlib-3.9.1.ebuild 578 BLAKE2B e5da90e813acc96177c6f5b28bcf0d55e3a292f37360d2272ea28c2adb2b9d45b00f5180c826c46d98aebc7821569e830d3b51be7b84855694ca7f89333d2e78 SHA512 4caa12219bf40a7e7d8f6fe9df5b1dd7d8b5b20bc2478e7aed0a7ba5583f7546e27b77aa55062d6491a5cb40fcdbb9019afe4f393d5b8bb801f58546c5b2a2b3
-EBUILD asyncstdlib-3.9.2.ebuild 621 BLAKE2B 646eb2d54be9c4db90eead4fced2cfb2317b0208cf749f8dd0c2b07b731e2863cf4d135af0e669c9f5014500d5c31003ef5e38628f85bd0396aa0989c3375422 SHA512 1da4c0217dbdf12b080748dc15e491c690fdfb9344353069d8e75e79354eddbe12ae892d3e2e6b38ef213dc781d93d1d4842f2fb2266576e078847c74e40f6a4
+DIST asyncstdlib-3.10.2.gh.tar.gz 45697 BLAKE2B 8f9bbee8d2a4e9f6a60a5088ef00940f22c2aec79557070d1b13d8d7256179bddaf1130ace0393e95e06e077824dd862e27a6c5d644ae52dab2d80989bb08027 SHA512 be5a8cbb521b8082ad9898907bce1a888443eafb24e2030f9dfbb2dff293646376ad44ebbc53d12e539ad70af935d833f2f114e383171388b9d724f274eb8421
+EBUILD asyncstdlib-3.10.2.ebuild 521 BLAKE2B 29f1d54b54ab23d5c364106db4c0bedadbea9a9c5336fc4d799fd1ecd8f55a59a940e832e5c4767290c5e320317d73e788dffee6bbe895bbfb9dec5574dd8a28 SHA512 673c9e2bab7be93ee4d35b2cfc1adbc2275bf9a1b5457f9a68d5df163328daac286887b2af0280e429cdf2a0f67c3475a694c1de3d9c5b526122dd50f322e4cc
 MISC metadata.xml 359 BLAKE2B 10bdbf5adba9cefa912d8e1f195f20d4040bc2e8e3efb3fdc6efcb8272bb58160c6d772de3fe9ad9c4cb43e2817139319ffece082c3c043f1d97cb36ed8ac7a8 SHA512 e56f712f7446a3e68137a945a1ab212f6254740ce2f962fc7ab0061f41cb0d314809ad4fe3317fd10d8ebb594fb20d690d06b0a73636b13b5fdb5184cde2e306
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.10.1.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.10.1.ebuild
deleted file mode 100644
index 10f7da0d6a0d..000000000000
--- a/dev-python/asyncstdlib/asyncstdlib-3.10.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The missing async toolbox"
-HOMEPAGE="
-	https://github.com/maxfischer2781/asyncstdlib/
-	https://pypi.org/project/asyncstdlib/"
-SRC_URI="
-	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.10.0.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.10.2.ebuild
index 10f7da0d6a0d..10f7da0d6a0d 100644
--- a/dev-python/asyncstdlib/asyncstdlib-3.10.0.ebuild
+++ b/dev-python/asyncstdlib/asyncstdlib-3.10.2.ebuild
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.9.1.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.9.1.ebuild
deleted file mode 100644
index 9d70f7518c36..000000000000
--- a/dev-python/asyncstdlib/asyncstdlib-3.9.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="The missing async toolbox"
-HOMEPAGE="
-	https://github.com/maxfischer2781/asyncstdlib/
-	https://pypi.org/project/asyncstdlib/"
-SRC_URI="
-	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/typing-extensions[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.9.2.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.9.2.ebuild
deleted file mode 100644
index 65cb15dce8e5..000000000000
--- a/dev-python/asyncstdlib/asyncstdlib-3.9.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="The missing async toolbox"
-HOMEPAGE="
-	https://github.com/maxfischer2781/asyncstdlib/
-	https://pypi.org/project/asyncstdlib/"
-SRC_URI="
-	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/audioread/Manifest b/dev-python/audioread/Manifest
index eb68a7b168fc..23027faaa6ac 100644
--- a/dev-python/audioread/Manifest
+++ b/dev-python/audioread/Manifest
@@ -1,6 +1,3 @@
-AUX audioread-2.1.8-test-deps.patch 691 BLAKE2B 0b43f16dc4ba6a69a3e3477a23312685b2d549b71f0df908c1ab8ee1b07b85e249772cd04915ae9d5481343d2e474c73f754387180f155c289ef4c82b6dd179c SHA512 a2bf5af05718147319d0690afd2ee269aa079a4eb2353a4564e9e4e8eddabcebe843e157dea2e7bf9ed479516b5b52c8526abdb122813beb12a6a1da9c04c845
-DIST audioread-2.1.8.tar.gz 21222 BLAKE2B 78cc55d45dd987fbe0171cd3da9f8441e38b60fa6f1b0ef8b0781abc91e6b447b8cf839437b59bfafdf13ca90bb50a032788e0470250f303122a46ddc24ebd19 SHA512 9db5ad1f8b2047256b5f6b4bbee2366043ed19d35ffd2766ae3ab66bdc5b9f63910bcf449fd42aab074fd8132642bf730c432aa0c8f3c5368cd6ef36d7f4f5a5
 DIST audioread-2.1.9.tar.gz 377500 BLAKE2B a90d1d7531c265a8c2b7933ac0bfc00fbdf298546620fef3ccae0204fc1eedcc584bf2fdb79b1bbda81b29d03346abc236cd0234684ba3cc70642f837033ab99 SHA512 ad2260b6931cfeebb815d48221366a2a5d8095965ff18e94c5eb0809d9a1b02e650a62ad5e895b7f1e003771fa3babf56f59ce4538aca78b678566fd28327290
-EBUILD audioread-2.1.8-r2.ebuild 779 BLAKE2B 9c329f399168dc05aaf954a574256ff4b4c751d59f76faa2f415a513215e5da985bf788ef18157187edcd777a9067aca6bd119576b333d0b3ecb19af3be04d1e SHA512 3a3f9f72c31ed9c315c6a8989b35167d15f36f0ea83dd60e5b654ee04b70f6101ae3ddb0482bbf9815d818164186627bb6e785913e9449b715e9ca6625b54ed4
 EBUILD audioread-2.1.9.ebuild 895 BLAKE2B 4b234d791345367f904e9b0ce30cd2e20d7f77d6a0546779e71db59f862425f3b26cbee9b15edbf82281409aae8edc86ff8b410b6df7ffdc4bf4509cdc3f72a6 SHA512 276a1b0a2ffe4e4652af19de85a367e036cf1ea9b20e609110fcd73418b2531e72ae61594ad49ad50a72fb3d22e17def8501fa30957205ead8777cde5092de0e
 MISC metadata.xml 639 BLAKE2B 13d77444ab3bb26d8fb4c96cd3155e4789a7426fbc5f107598758f299c8d6524730d9f52ec31c99cc2dfb5830f9eaabe7c0632e70a51b6948e1219a87099b39d SHA512 4236cc1a5995a3f38e0067e56d7d3ff35596ff9ca359b9ed06028585a6ca7b20140112b28bb3969fb9b8a4702b09b61ba11b61e168c65ca4fdd4d74cc79e28c0
diff --git a/dev-python/audioread/audioread-2.1.8-r2.ebuild b/dev-python/audioread/audioread-2.1.8-r2.ebuild
deleted file mode 100644
index c0d64fd1ab2f..000000000000
--- a/dev-python/audioread/audioread-2.1.8-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Wrapper for audio file decoding using FFmpeg or GStreamer"
-HOMEPAGE="https://pypi.org/project/audioread/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg gstreamer mad"
-
-RDEPEND="
-	ffmpeg? ( media-video/ffmpeg )
-	gstreamer? (
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		media-libs/gstreamer:1.0
-		media-plugins/gst-plugins-meta:1.0
-	)
-	mad? ( dev-python/pymad )
-"
-
-PATCHES=( "${FILESDIR}/${P}-test-deps.patch" ) # git master
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -e "/'pytest-runner'/d" -i setup.py || die
-}
diff --git a/dev-python/audioread/files/audioread-2.1.8-test-deps.patch b/dev-python/audioread/files/audioread-2.1.8-test-deps.patch
deleted file mode 100644
index 0a67767070b1..000000000000
--- a/dev-python/audioread/files/audioread-2.1.8-test-deps.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5dd6c87a53f3a6c5bfa6ea384598213c49402056 Mon Sep 17 00:00:00 2001
-From: Glen Baker <iepathos@gmail.com>
-Date: Mon, 5 Aug 2019 23:40:27 -0700
-Subject: [PATCH] Correct pytest-runner location in setup.py
-
-Moved pytest-runner from setup_requires to tests_require.  It is the tests that require pytest-runner.
----
- setup.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index bd90605..6041f6e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,11 +36,8 @@ def _read(fn):
- 
-       packages=['audioread'],
- 
--      setup_requires=[
--          'pytest-runner'
--      ],
--
-       tests_require=[
-+          'pytest-runner',
-           'pytest'
-       ],
- 
diff --git a/dev-python/authheaders/Manifest b/dev-python/authheaders/Manifest
index 5cfcc45dbdef..b1506beef6de 100644
--- a/dev-python/authheaders/Manifest
+++ b/dev-python/authheaders/Manifest
@@ -1,3 +1,5 @@
 DIST authheaders-0.13.0.tar.gz 93319 BLAKE2B b4370a9cf3d6a5e9772be97d07ac24d1d4a97e24df07d65f74b22bbe4c85c8cc8d4a0e933b2c84b4b159aa7bd7572530e3784118e17f3b5caf8a4365e2bbdbaa SHA512 dfaccd9dedea8bebc22b831c481c733590e11a3483e42b45f0b6329bdaa98eec0644faf8da8b92c56c2d48a43eec9c52f8ea9a3c67ae841c46a7085cf0572177
+DIST authheaders-0.14.1.tar.gz 101412 BLAKE2B 5ab6ff508123ae6f58eb4297dcd04fe3518244c0f423ecbc292948c437eac4d7ade7eceeaf4f4165625904489d494331d37c18b9dd4052a01e22c799df6c47fe SHA512 842881a6d2c3d192664960a9d1954f6e2c267cc6b07d7567f019869d07c1e40fc12275c381e90ea94559bd43a9d2e183d35e80d0ee9a861e80519a98daf2a699
 EBUILD authheaders-0.13.0.ebuild 650 BLAKE2B d5330777732110fa56b86c65da8213b3c10015aabcd7597eb47e6a087ebfd2b30acfd4c4f3822fc53cec314dcb0d5c686c2213fe34b501710e085202cb0b9cd5 SHA512 289ec4c207f9470c66e5061f9c5b53fae055a3998a9efce11bc5feb929c6bee9878eed35672bb7cc24ae3a96d2ef9529523cf1f74434e67eecd996cb8ad470c5
+EBUILD authheaders-0.14.1.ebuild 650 BLAKE2B b0d23e1a3a2575783c3b1352d1ead4e9fb722626cd08106b548af1f70000ab65325450c94878c7a2b0fa5d3c19119d42f4370f6642eccf1fae32292816ce3bca SHA512 fc46430ee36b454efc9bff9fae3e173440aa2a3297380c12023c144226c2d752d5e35d90ffa9c31f1da20d284cf9c3d06c2105be547daae0f04377cea8246ca8
 MISC metadata.xml 525 BLAKE2B 8022323b7ee89962b9da58b1fc3abd621866b75e6a02fbc52eff289f04a099297c87d979a4cc452ad8fb44fd4a373461a983e60e923d89242d22a86debb80d39 SHA512 ea0cd9010dc915a1a73c5429b4fbb4e68109105b51b7fea9320fade10cef25546a834c2ac4c22ea506455b098cc2c8e867addb2eae76ff7edfd550bc24660a92
diff --git a/dev-python/authheaders/authheaders-0.14.1.ebuild b/dev-python/authheaders/authheaders-0.14.1.ebuild
new file mode 100644
index 000000000000..f5022f6b4a2a
--- /dev/null
+++ b/dev-python/authheaders/authheaders-0.14.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A library wrapping email authentication header verification and generation."
+HOMEPAGE="https://github.com/ValiMail/authentication-headers"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
+	dev-python/dkimpy[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/autopage/Manifest b/dev-python/autopage/Manifest
index 48b115073176..50f205228faf 100644
--- a/dev-python/autopage/Manifest
+++ b/dev-python/autopage/Manifest
@@ -1,3 +1,3 @@
 DIST autopage-0.4.0.gh.tar.gz 14809 BLAKE2B 8b91d76c04f3b6519fe2660cbebb50c9b767346b6313303b757b04bea8e7eb8a48aaeaabe364b1b18cadbd5125c95f77b187f779ef83c913e8db13ca88284311 SHA512 a7573dc5d62559f06b54b4b40ffa916209ab7c3348ac7b0cb20ae840fe841e8f8efab1c1853196b4cad0ce5fbc52b679e651f76f7023af960dd8cc876a6d1f14
-EBUILD autopage-0.4.0.ebuild 729 BLAKE2B b121255ae9ef6ec424c161bb15061399fa8729f0bd816b3b5132244a46f924a530bff9859f5826e6525419cb0c1207cb198618520547a5deebb8594512af736f SHA512 07856995e0a3d99e57e34ff6c8ae514c7bc065f085610a52a33140ffc0b7ad9c8204bd60a751a7ad3edb7a867ef58bce83a48907cc3e4c69345508ac28d61523
+EBUILD autopage-0.4.0.ebuild 745 BLAKE2B 8653da6eecc042f9af3e6d6ccec6aecaab864755ab7ddd386fc061cd417cc6cff6ffd484d0c09476ac61dc99f72ced9c0976de1d0b3587bc9a51a03028471d06 SHA512 b96e5b5d781529a95c1b8e6aa54f06c29ccae8e80576dff61b85c39f9fb851e302546bfe94c1dea9aee728cc801c36cfde3c15f485cd679e79d44bd315920259
 MISC metadata.xml 390 BLAKE2B 6be679e40e58985a6ad622fcb85f130bcc6b8039accd14243e6dcba458a0af721eaf9e7928bfe0d29f62477df6e437143865b68a61820b88dfd61a6e760992ea SHA512 3d76be1ae51467569281305138475733f9ce9b89b7d2a41f496c69bebd86e205019d1e75d1de22267d36aa2822ebe8bf94f5722d46ec27a8a79f349e38dad3b4
diff --git a/dev-python/autopage/autopage-0.4.0.ebuild b/dev-python/autopage/autopage-0.4.0.ebuild
index 2e3e98b7e8bf..d14b9446a9e3 100644
--- a/dev-python/autopage/autopage-0.4.0.ebuild
+++ b/dev-python/autopage/autopage-0.4.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~s390 sparc x86"
 
 BDEPEND="
 	test? ( dev-python/fixtures[${PYTHON_USEDEP}] )"
diff --git a/dev-python/autoprop/Manifest b/dev-python/autoprop/Manifest
index 32daebee9fd6..b8b9cf1f7b7f 100644
--- a/dev-python/autoprop/Manifest
+++ b/dev-python/autoprop/Manifest
@@ -1,7 +1,3 @@
-DIST autoprop-3.0.0.tar.gz 14082 BLAKE2B 9881dd924b8d66e83dccb3e7ca1d753bec924e8f348d96d0522a76e857c85311ef7ada37b0080c1b3a0e719bf84e807d12c7e4dff4bbfc111273b340f92244a5 SHA512 4730155130b98fc02bea991837ee6d875f19ffa14ae542909314264950d20a34cdbff9e21b31431136624de0dac5eb2a50a9cf677da01862b38cae9c10bec92f
-DIST autoprop-4.0.1.tar.gz 19998 BLAKE2B aefff2e8f1d583c45e77a2b0530a07e03be9229977f9f1229cfd832f609d2f31d4cd05ad741189ceb7a01d846e286c85158439952e587dd007526794c6b9a993 SHA512 d77caec360f59f247cd23a1636771808bdcbaa6ba96241cafeabc144e88975b607b604800d2d374c5b6f80b68bf631ab74278c19fe1544112a6c6813190c744f
 DIST autoprop-4.0.2.tar.gz 20050 BLAKE2B 06165a02dfee0755ccf375041487f015e632b56b24766ac3d4bd484caaf1c99a0506994f16ace753f5890b782690b640196ee0cd6fcce0078ef51f8addcfcfe6 SHA512 27c8578e8f023715b07ebe21f4f46e98e606c863d3257bb1c8c31d9f59551d2494ef99e24eed856b308c8c77e1a3276f9e370434aa3e61ebb0b32a9b44fceee7
-EBUILD autoprop-3.0.0.ebuild 527 BLAKE2B 4241223ff54d56bffa53b3e9933517bf69c2584c722dfe502767df49fb2ae3c184e56b01eb6724ecdcfce9c3dbc5ee394e4a54627ad64e4bcfd1415f90850e68 SHA512 bd60366caf728f4161eff68a562b80c048c80396317a64585201420add023619e172491a755fc3f73e4ba2786ec2d2d3f220f613a94b2db6bfbfe107386f33ca
-EBUILD autoprop-4.0.1.ebuild 527 BLAKE2B 14e2a1b95e5d0f12a3e6f7a575091972b1930ea946f4594a097e2ad7f4f5b173715d118149c0b9952e49d782961f3f3b3e70e637117e0d9495d9e0c4c44ec580 SHA512 80258ecdc4b8841d458518f43cf93045d031df7f26818ea05a466e982bcb80123dd73ba00cbd5c666b5d2328eaa95ac5f69209640769f69faf7b6aba97cdf2e3
 EBUILD autoprop-4.0.2.ebuild 535 BLAKE2B 59f062b2146fc21f9f0ba80d227f95ad20fab977f538482383c2f71be2192ba428cbcc77565fab3bba94a1a050eaf1ee088a545d26518a8d02bd1810c338ba58 SHA512 0565366574789d7ddd74369085d78c9d2eea9b5f5a8afec405deacbd6b809b1824695ce804b974e6998666df88815be386d5e87a8698f9e252b0afae47c6466b
 MISC metadata.xml 1376 BLAKE2B 4546775f81e9b3002d39733fceb5b0c505a909c8de9a81159ba6458147c1f7b632464fa55ab43b94c210ec1a2e07a8f4259bf5bd7a07ae3c5f0edee316741648 SHA512 76e109f6d16d5e8de55fa6d613ecaa0c47873ac46b5c5818b7569045eac6108ea6088031a5c9f1c2335dcc3f527cf90443bf5c6346443835c763e7dce07fbd18
diff --git a/dev-python/autoprop/autoprop-3.0.0.ebuild b/dev-python/autoprop/autoprop-3.0.0.ebuild
deleted file mode 100644
index 6a1d42d9b3be..000000000000
--- a/dev-python/autoprop/autoprop-3.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Infer properties from accessor methods"
-HOMEPAGE="
-	https://github.com/kalekundert/autoprop/
-	https://pypi.org/project/autoprop/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	dev-python/signature_dispatch[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/autoprop/autoprop-4.0.1.ebuild b/dev-python/autoprop/autoprop-4.0.1.ebuild
deleted file mode 100644
index 705c1c240973..000000000000
--- a/dev-python/autoprop/autoprop-4.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Infer properties from accessor methods"
-HOMEPAGE="
-	https://github.com/kalekundert/autoprop/
-	https://pypi.org/project/autoprop/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	dev-python/signature_dispatch[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index c56c5323edd3..8ae880fd29ff 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -1,15 +1,3 @@
-DIST awxkit-19.0.0.tar.gz 95820 BLAKE2B eadb3ffbfd5a1bf2835e4a7df788e06676cd7c8132c8527c04c4876e87039b72ed00775ddc342e0b31bb0c4a7036b3ecb0456761b9a6a1a5f40e60656fd06521 SHA512 169531549fd668e9917db55f2d61d8959645659496f249d9bb94432b9d7449aa549a751aa3c0255c38334e24684e4039e581d26aa2c291ede88b623824b78ff9
-DIST awxkit-19.1.0.tar.gz 94839 BLAKE2B 751084164581dd772c4f99b14d3e3526effd758bffda0820be56f0d963903314458c0037df33606bf0329009186ef86df1fa0c41f9ecd377b8c2d2de15bcd9e0 SHA512 a4be398f81f370e62b60605c0add70775eebf78bbd21080a65caa64c5b9f9daf33315516cd3771d434ff86d2bb9ec089545adbc174bd19ef5e52ae69e6cb79db
-DIST awxkit-19.2.0.tar.gz 94870 BLAKE2B becd8819e5d7f495d73a16302389af802db9fc3d9e24e09f93f0e5a730552e676a2f6514a07ea6d90436837c78a32e6a7be9ba541942aae6e8437c30aa4fb2c5 SHA512 3bcae70da26170a8b9cfc49c3ea3391f4fc03c868286499b5d3303da3559927c1fd2c0aeae282831412825e34fb83d8324fe2e58ba11d60598bbbbb26ff661a3
-DIST awxkit-19.2.1.tar.gz 95129 BLAKE2B b68b98da71e835132993395f50b2b2a9dc344dec3534977da8468bd76c9d401bbf1d931878d79e2123e4d9cae1553d08c7132dd3041ed32d6282b778bce65098 SHA512 be46963515877b11f75e63c606de1900e244617480ebe90f4c5057e4b22c9687d6b371581beeb311c9e7bed94173b88d74838256024055b2fd5f1c5be1c4bda3
-DIST awxkit-19.2.2.tar.gz 95096 BLAKE2B dce95f819f2bbbaa60e09a8f25685a0f75b112f9fc27023f8d27acf4230a29477e14020dc838633a9fb20c65928857806c8a672c0666308798a78d2213ff15a0 SHA512 bab28be15011e9be3bd3f0d22ed5d5e67f0c19db08672ee4404ddd49a2686a2d7de790b4d06d8544b30a6b827def3a6974b0ee2960d9959d4c165afef4202995
-DIST awxkit-19.3.0.tar.gz 95520 BLAKE2B f02433b9f82537fb5318ed163c669ae00cb8f2e747368113f9332486d226eb3be7c5110929688cc0492d8cc91bb5800bca04da7d9250015142c6312e4996f4b3 SHA512 133665d3f5fa7cba194f2ef0bf4fd5b52a0a5eacee30041628023b71696efc8a11e76b0731879dde2e703da33e74ec73aa016c1ce486e92655a660e5ad778b09
 DIST awxkit-19.4.0.tar.gz 95558 BLAKE2B fa8f408e310ba819e6d8a326e67dddac44ffe0fec2ff3018e8eeeda269c50257689b221785f27c897f526e6f5180c49aa506be6b85e01602b0d7d1dcd88a6987 SHA512 c6c6cf897128153fbb1dac77d50028a7649b97278394384bf5a549c1583b9c89b694f1ce2c850d0b072a4a7142a9b906edfba8d3a68cb446c73a13e3e33c0a61
-EBUILD awxkit-19.0.0-r1.ebuild 797 BLAKE2B 7ecff34a0436d846d71815c52fe7dc0bc5b02c05e92f7fa0cb726453cd43294d140c3c7bbff1bcf3101fab5adde5b838f091fea9e172dec98cff058de820c6c4 SHA512 a5ab9bf2f37931d183c6f2adb4cdd1a75c573a4cba25ff7b12f2c6df1163c0ada217174ce52da3678f8a8b7cf72954ae3e43f342a90bbf61a61e2a2dc0802ac9
-EBUILD awxkit-19.1.0.ebuild 749 BLAKE2B 385da85decfa2a652ae75f3baaa625d9199266d197586cebbcf8a816657faa07bfdb762934f643f520456eb60acbcde877a75ca61f47e0e622f869a76da70b8e SHA512 d28aff6d2b17fb87efe6b5a4f48a2a8ad54c5153b3c045f2e72d1163fa460aa2167a3857258fcb996ed1f4da0222b9423eccedcdf02f63e4729be662dbc49e8b
-EBUILD awxkit-19.2.0.ebuild 750 BLAKE2B 30b63a533818c0f81ee41a5d3e9b8c11bca3b948e7d5c3293ca33b930efd634b1079a6e722379471b77175ae38e578c27c2e085a6552358f6b277cd3949cb7a7 SHA512 8ae9e13bb0a4fd0cb2834cde5930824b9d2ddac7d2019dc02eb6303b1a01db2b3269cd72efe9efb0edf7f4260ed91290475bc0b38a072c2615c32652eb2ba614
-EBUILD awxkit-19.2.1.ebuild 750 BLAKE2B 13f965813d6e58a28298b278f8e64cd9013f034a1f93c3adec684af42072b6d42cd688f4165d9aea296556945c669b276dde54dd4adc03500a4567155d0394e7 SHA512 1d6eb343227b6c6c289aa67f7b1e6437195c0a304b8308fbca6340f13a2bec6fead8d1f445b855d3e08f28cc2dbd399fd7e662a1b88a9ecb0c2d91b4c3dad611
-EBUILD awxkit-19.2.2.ebuild 750 BLAKE2B 4b8ccda00fe41e68124d8bc22bc74c15c73214230ffb61a058b468aa3d53ad5ac185222a6d4f641bc31faac7ff318defdb7210632f54953ec14a501df9e14941 SHA512 ca1b14d71a46df2e413049cf7945bf5961af2246d32ab0633b23bfd3d8dfd223f42caef4689b05ef6ab25982fa66baa75657811e790c663af7ea335d81b74b54
-EBUILD awxkit-19.3.0.ebuild 750 BLAKE2B 4b8ccda00fe41e68124d8bc22bc74c15c73214230ffb61a058b468aa3d53ad5ac185222a6d4f641bc31faac7ff318defdb7210632f54953ec14a501df9e14941 SHA512 ca1b14d71a46df2e413049cf7945bf5961af2246d32ab0633b23bfd3d8dfd223f42caef4689b05ef6ab25982fa66baa75657811e790c663af7ea335d81b74b54
 EBUILD awxkit-19.4.0.ebuild 750 BLAKE2B 4b8ccda00fe41e68124d8bc22bc74c15c73214230ffb61a058b468aa3d53ad5ac185222a6d4f641bc31faac7ff318defdb7210632f54953ec14a501df9e14941 SHA512 ca1b14d71a46df2e413049cf7945bf5961af2246d32ab0633b23bfd3d8dfd223f42caef4689b05ef6ab25982fa66baa75657811e790c663af7ea335d81b74b54
 MISC metadata.xml 512 BLAKE2B be7f98bdaff6b814e03c9f6c816a0f1f59dc2e8763298f8a48107ea50b0534eddb314bb6d8b8a0f8c1d7c89c381916031544eea4a06068fb9acab4d2c8c48a57 SHA512 7322d992e1d67ea200df0cbf144d08fd387d7cd6ccb72191fc94dd605c9aeecb4b8083917760e2203296d5514fccd7ca621133aef6622658d1ef2c33171c8b7d
diff --git a/dev-python/awxkit/awxkit-19.0.0-r1.ebuild b/dev-python/awxkit/awxkit-19.0.0-r1.ebuild
deleted file mode 100644
index d303ad0f5af2..000000000000
--- a/dev-python/awxkit/awxkit-19.0.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for Ansible AWX"
-HOMEPAGE="https://github.com/ansible/awx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/awxkit/awxkit-19.1.0.ebuild b/dev-python/awxkit/awxkit-19.1.0.ebuild
deleted file mode 100644
index 95c60a9bd9ee..000000000000
--- a/dev-python/awxkit/awxkit-19.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for Ansible AWX"
-HOMEPAGE="https://github.com/ansible/awx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/awxkit/awxkit-19.2.0.ebuild b/dev-python/awxkit/awxkit-19.2.0.ebuild
deleted file mode 100644
index 8045b8749b2a..000000000000
--- a/dev-python/awxkit/awxkit-19.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for Ansible AWX"
-HOMEPAGE="https://github.com/ansible/awx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/awxkit/awxkit-19.2.1.ebuild b/dev-python/awxkit/awxkit-19.2.1.ebuild
deleted file mode 100644
index 3023714031c0..000000000000
--- a/dev-python/awxkit/awxkit-19.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for Ansible AWX"
-HOMEPAGE="https://github.com/ansible/awx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/awxkit/awxkit-19.2.2.ebuild b/dev-python/awxkit/awxkit-19.2.2.ebuild
deleted file mode 100644
index 6a4107d47a51..000000000000
--- a/dev-python/awxkit/awxkit-19.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for Ansible AWX"
-HOMEPAGE="https://github.com/ansible/awx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/awxkit/awxkit-19.3.0.ebuild b/dev-python/awxkit/awxkit-19.3.0.ebuild
deleted file mode 100644
index 6a4107d47a51..000000000000
--- a/dev-python/awxkit/awxkit-19.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for Ansible AWX"
-HOMEPAGE="https://github.com/ansible/awx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/babelfish/Manifest b/dev-python/babelfish/Manifest
index 5aa47bacd824..f3e77a1c4a14 100644
--- a/dev-python/babelfish/Manifest
+++ b/dev-python/babelfish/Manifest
@@ -1,7 +1,4 @@
-AUX babelfish-0.5.5-py310.patch 1777 BLAKE2B 0d3871c4037f159a8e20f96e3005f5984fd9ba4cdc7364047dad74b4388b8a42bf264028f64e73de10903886bc9fb082e8eadc09268c5a2b340e11a940e92faf SHA512 194050cdfc90021d0cfdfbb3fa620f46d3fa96dd601ccd58a0eb62b75d7569952ce7560e8787a7ae51b1d86a305883bf2d13818eac62507ca4284b15a24b23a5
-DIST babelfish-0.5.5.tar.gz 90398 BLAKE2B 3266a92ba5c68d7b801fa9cd13417d04b4a4526ba9fbee34116e356e42857bc36a68b085626a084047d7f9dc512d71d45cebfd06af65ed35bd2478b6957d00d9 SHA512 71504dd0203ad85a6a69107d67df3bd5ae4193515e74c05b346a8bd0aab425fc1534d54d1c74b14e48580ee5e76f04705e35c2d359fbe46254bee37e41cb4bfa
 DIST babelfish-0.6.0.gh.tar.gz 90886 BLAKE2B deee75aef23cbcb7c64f385c303310e5ce1ef0a3180729e47e59b8e85015ff36360a4be74ef32869421c6d90cf185ad427a7d55b9ef3cf20f551233dae3d425f SHA512 9d3309e67815c301578533fdaf8baae946ba87148b458f7b01315203d2d4356dd770c1a0b7a0ffbba14036b77f1463d67e3b5732efa6682cb6afdae1a8fd0a4b
-EBUILD babelfish-0.5.5-r1.ebuild 506 BLAKE2B 34c92e5aec893e8862ee9c9925b7cafeb72566c83ed6ed135a93ff29c002de913c9659d3494b2975c0e786cba84ef208d10eaa844b70e0eeca4fe7a10f190fbf SHA512 c5873af559df194d4eabdc5613c633799e4be5fac487e92eda693e808f252b39ed8ecf2d4fc36863c0c67507b7ed462dac571885643689bbff88dc1ffa3d2a0b
 EBUILD babelfish-0.6.0-r1.ebuild 605 BLAKE2B 4c4eab53a6b43ba273f635eb0638492e7fbce4a8c00ac56e5b236877b382579e5bf7d851e4aeb6ccd626dd43971683b26a6b2deb5a11fa10feebed127cc88810 SHA512 2dea366bc2cdef1042b83bc90fd30ec2d353df2cc40840b0b9e77e0aed825a03aac586b0d483d7de796456c604f08fe24db2f85eeecdc668cb742dd5949cd9cb
 EBUILD babelfish-9999.ebuild 538 BLAKE2B 932b02753c51a35bc7f58ac62922a037d5e60cca52f61e2c1bf2fdffd438147790a4354421a13f2bf4d5668e44b5b90fa3ecb252a4cb1b0e72120978fc9e5a28 SHA512 92a65e161e90509cc7ffe3612b1884955ca44fefd94f9bc5f37bc7c00f8b07512c4b312cfb2a465bd8fcbd1bc1c441e3c9af4a074253fa5a1ef69f5a1b826ee0
 MISC metadata.xml 392 BLAKE2B 8e9836a0468f33555090d4f599f315d74a16d2eae96be0b57c7f2da8eb8c25cb9a40c7955035ff762ee9f7724794bd152641a46644572d12f938ab91c84af900 SHA512 4e969379d2c11505a8a1b59b3d7fb0380bc512059e5051f676c046521693089cec76d13888d266a75ffb2915ddc69a63e7c8e66c2a0b9c1c0d49dc249cb598da
diff --git a/dev-python/babelfish/babelfish-0.5.5-r1.ebuild b/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
deleted file mode 100644
index 5e101e351f9b..000000000000
--- a/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to work with countries and languages"
-HOMEPAGE="https://github.com/Diaoul/babelfish https://pypi.org/project/babelfish/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-distutils_enable_tests setup.py
-
-PATCHES=(
-	"${FILESDIR}/${P}-py310.patch"
-)
diff --git a/dev-python/babelfish/files/babelfish-0.5.5-py310.patch b/dev-python/babelfish/files/babelfish-0.5.5-py310.patch
deleted file mode 100644
index 3acd3c55132e..000000000000
--- a/dev-python/babelfish/files/babelfish-0.5.5-py310.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 7667fb3179e421d4af78821132db8e2557fa2dc6 Mon Sep 17 00:00:00 2001
-From: Hugo <hugovk@users.noreply.github.com>
-Date: Mon, 20 Jan 2020 18:14:46 +0200
-Subject: [PATCH] Fix imports for Python 3.9
-
----
- babelfish/converters/__init__.py | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/babelfish/converters/__init__.py b/babelfish/converters/__init__.py
-index feb687b..d27f849 100644
---- a/babelfish/converters/__init__.py
-+++ b/babelfish/converters/__init__.py
-@@ -2,17 +2,22 @@
- # Use of this source code is governed by the 3-clause BSD license
- # that can be found in the LICENSE file.
- #
--import collections
- from pkg_resources import iter_entry_points, EntryPoint
- from ..exceptions import LanguageConvertError, LanguageReverseError
- 
-+try:
-+    # Python 3.3+
-+    from collections.abc import Mapping, MutableMapping
-+except ImportError:
-+    from collections import Mapping, MutableMapping
-+
- 
- # from https://github.com/kennethreitz/requests/blob/master/requests/structures.py
--class CaseInsensitiveDict(collections.MutableMapping):
-+class CaseInsensitiveDict(MutableMapping):
-     """A case-insensitive ``dict``-like object.
- 
-     Implements all methods and operations of
--    ``collections.MutableMapping`` as well as dict's ``copy``. Also
-+    ``collections.abc.MutableMapping`` as well as dict's ``copy``. Also
-     provides ``lower_items``.
- 
-     All keys are expected to be strings. The structure remembers the
-@@ -63,7 +68,7 @@ class CaseInsensitiveDict(collections.MutableMapping):
-         )
- 
-     def __eq__(self, other):
--        if isinstance(other, collections.Mapping):
-+        if isinstance(other, Mapping):
-             other = CaseInsensitiveDict(other)
-         else:
-             return NotImplemented
--- 
-2.31.1
-
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 9b28f97845bc..833b5514a168 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,7 +1,3 @@
-DIST bandit-1.6.2.tar.gz 498567 BLAKE2B ab7885df634ff8258fc7620523b56995cb2f262f4290193a9063e216f66ba8ecb31ec17f09d0b72a0472923266953c46e47e74fcdfb39784873738c033e00c6c SHA512 9facce98411ceb9e33e5a978ca4aad2dab541ffe215e480806ac921b7f7067572445d8e32e8d473ef30bb57155b72b2ffd4e06d458a3da82e2a9fb1b1d8a4b9f
-DIST bandit-1.6.2_py38-1.patch 3892 BLAKE2B 750160be3d234b0d638307e74fd130921f43f460edca8d0ef0f9a98f34db709e0649b1e481668abd094942fa05ee710b82b3161fd82bc56bb0f5e73d90a6e70f SHA512 dc1e55bdcbf180e70757dd92aa590fe1348d84a2143af73e48c35c62864cf0720f6b055482eb274a4261adff37c84f998c75916b8ab70d99264bd88d09611e06
-DIST bandit-1.6.2_py38-2.patch 3724 BLAKE2B 8ce857419d99b059ce1b28aba7c04218397cad82f0fdb6e7eb3e57f698d6360de7b0f4402c40540e41d510db1aa0b75e006e0e15a20a8c5534b7e5a3cf78a0e8 SHA512 25f73b087b296867556d9b9bb7f789a4df64bd2930509086bc24312c43a3a98209d63a5b00009e31fd2653e89c85e62849c7af6ba044abc10c5789a6e3d9a968
 DIST bandit-1.7.0.tar.gz 506225 BLAKE2B 6e2383576b2091ab98757381bfd5915331fc7b08a251e817a6964d963de60b070f7c4dc7958dd366cf95333f4abc157e80433490ab8b923580cb45d855c13092 SHA512 c51af7ab4c667c376a11f142fa35881a776d420bd3ef41421bd29a713e0b56bbf1622e24cd878e24f57594f03d06b7c2b8258fcf34f57e3a68df4200a34becdc
-EBUILD bandit-1.6.2-r1.ebuild 1782 BLAKE2B 7dd2fffc4376dff537fe9571a4a72d14b5618e9a80f48b772651875c02789a4b13ceb8eef85abef519de736ee80966b19ac63c4d86aef222eb4a769b82870852 SHA512 cec33d9fe23676d35ebe52a580daad40a038b7b81c53d303b5f207a4d9ab9bc2623333b9bcd339a099b70dca1b18703ce2040221a61b9564a8d564dc821343fd
 EBUILD bandit-1.7.0.ebuild 1398 BLAKE2B 0303b1fecf44a680ee826865da2cb3d385d77db103f1f9ccf690bfbbf6e385cb88f47987d0b2db6bf0935c6bcf4f16c75ca5a1ac260404d6fe408d66d03f43b3 SHA512 3022a239ef9b169acd5160f807c353395b789eed770957ac69311af3da9022d94672f4f4ea1bd6f8a4e66c096cad7c4a01402ccda29caaa02029cf6fe3083579
 MISC metadata.xml 685 BLAKE2B 5312eb62f7c19c1e45c23366d84804e731e07194a4b3e00675b7d9002101b59ca6113f910f6c6164995f97c8bb338e2d59ebeb40a2ef69d4efa905558a050791 SHA512 f516aa698ae72ddf53cc3b448ea5a128c77d79364d606aad87f8df87510db7f7776a9ac2cdca04ca62829e872319fc838402dba54775481622a4e1e9e99381fd
diff --git a/dev-python/bandit/bandit-1.6.2-r1.ebuild b/dev-python/bandit/bandit-1.6.2-r1.ebuild
deleted file mode 100644
index c957733f8725..000000000000
--- a/dev-python/bandit/bandit-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A security linter from OpenStack Security"
-HOMEPAGE="https://github.com/PyCQA/bandit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://github.com/PyCQA/bandit/commit/45494c94d59eea5ddbe0204f3781b90108cbde30.patch -> ${P}_py38-1.patch
-	https://github.com/PyCQA/bandit/commit/3d0824676974e7e2e9635c10bc4f12e261f1dbdf.patch -> ${P}_py38-2.patch
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~s390 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/hacking-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-1.0.0
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.4.5[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/GitPython-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
-
-python_prepare() {
-	sed -i 's/yaml.load/yaml.safe_load/g' tests/unit/formatters/test_yaml.py || die
-	eapply "${DISTDIR}/${P}_py38-1.patch"
-	eapply "${DISTDIR}/${P}_py38-2.patch"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	stestr init
-	stestr run || die
-}
diff --git a/dev-python/bashate/Manifest b/dev-python/bashate/Manifest
index 111f56e1e34d..a388b2179ab4 100644
--- a/dev-python/bashate/Manifest
+++ b/dev-python/bashate/Manifest
@@ -1,5 +1,3 @@
-DIST bashate-2.0.0.tar.gz 29579 BLAKE2B 35cd827a9b5846d0319e6de8fc4bdffbace6b0f669e496aaffa12c44349cc5947a14baecf3b21c3bc4f424796f12b38e273f273f4862949bbae11dfc4b787464 SHA512 f6bacddcad1077d034df0de4313b13aa24ba4c60baa456912d1f40511830a58ca118a72193d4cac358963870e097bee4b0e2ae5a7f7aec42f0ba1663180eb401
 DIST bashate-2.1.0.tar.gz 34717 BLAKE2B 6d25c9fe35f976f5ef24d580cb7ee5a30eb79f68f05de2b6784b79ec93ae090ecbc2a2a09b0cabd4a6a997adef6ccb73f8f258044b0443fa231a403115591202 SHA512 6ef17da86113195d8dae093fddb7c17a365b4cd7816ef0ebb98ac6cda61f52526092f7da6c39c11fba9d709a124970e18e93e267f7d0fb38190e313208f66e98
-EBUILD bashate-2.0.0.ebuild 638 BLAKE2B 78b970a00bd9d8daa7ebfe3ec9d5b4828b79707af623aaa1f9e4ee0812d18fa7b22a8875e44bffd05a6d6614565cbc23c700ee032cc43249e09543ac775eb530 SHA512 fd4cd16cf67ccf84b861f2d1039530078c46738d83b865a20bf97381e99b201982efc607f4a2c655b2690e3959b69a079352a0ac5302b562db0d4e9d576c415b
-EBUILD bashate-2.1.0.ebuild 549 BLAKE2B c740501b1fac850111bca31773f6e0f5d6c6af7dc5b31485d01baf02a6dc32a61db242f266981956235a37dc5604a702c4b9b92a6e63bfda905030a80eb395b8 SHA512 11e157fe04175a4cdcf1a8599fdcb2bd21fe059468de38b86c9c5f31acc42e0d39c0835a9aa7bcd71f6135ef314217ed3eb45c8350ba995424f997d61cddff26
+EBUILD bashate-2.1.0.ebuild 547 BLAKE2B 80026742c91d0204411efda36034e9be6b767443b120cbb8d5c619f8575057da0009ea1b7e937459dab81b4de5a6a72a7bce401832e7ff34933c20fe7bafc3e1 SHA512 e8ff4de79e70c12d7de8797bf670746c886cd5be47784bc303b74996432196d1fefcb77d6aa87cefa1a3f01022eabc67a38e2bc9d0c8c1ee37b3ed24a9f84906
 MISC metadata.xml 557 BLAKE2B fcbe8cb654adf3d748269b79f868dda3f6662fe0d2579ec2450e29e95d6a35ba2df0a470a387cc257c4df6af54420e7145562c739a0122fdf2f3963b300b1ed5 SHA512 204325d2ab7037d0425f2054b60f065fb998ca2757814966755ce106bd6e69f7e4844bd148ff619d6afb138359bb0567317c348debd391cf093bb52e29559a9c
diff --git a/dev-python/bashate/bashate-2.0.0.ebuild b/dev-python/bashate/bashate-2.0.0.ebuild
deleted file mode 100644
index 2fb4c511960d..000000000000
--- a/dev-python/bashate/bashate-2.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A pep8 equivalent for bash scripts"
-HOMEPAGE="https://pypi.org/project/bashate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/bashate/bashate-2.1.0.ebuild b/dev-python/bashate/bashate-2.1.0.ebuild
index e38d4d3ab790..d8e9502d73ba 100644
--- a/dev-python/bashate/bashate-2.1.0.ebuild
+++ b/dev-python/bashate/bashate-2.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index c4c2556fe98b..48df1c8a926e 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,5 +1,3 @@
-DIST bcrypt-3.1.7.tar.gz 42512 BLAKE2B 5e762f153a5a69c1426748737956fd370e74fcd02e82b5a634e74dbb50fc9e894bdadb4e87eb9cdc580d0853f73ef348d9523ceaf4236df565e39b714bbd1c60 SHA512 bb9a431c8de97d5615d1a7fb67f868d08d839313fd5f3e17d8db40db1870f8b624594352c24c163c6a03485217de873cd92578040350678888728885c7b749de
 DIST bcrypt-3.2.0.tar.gz 42416 BLAKE2B ff9cca995e38fe27c6f02e9770e9349dfe528a1c9c18f41c72f29dfc01e981373fc0964f3a74161f2a7dddea63c5f48708539221adcd5a8ae99b7c30d7b1afd8 SHA512 aa782aa6a725434e0b0737973e33e6c2bf4e82d39e8dfba0913da5d7dd051d55217adab8004c3eaf896fc3c3e145ba543da1b5162a667a3d82a4eb6b07430b80
-EBUILD bcrypt-3.1.7-r2.ebuild 726 BLAKE2B 2371cae3062df09e199ac94724eef464470d5e80f42a34663a11446b935a191058385754f7e18bedf86f7fe54a0052c8bec6517803774b7370cfc5f2835ed07f SHA512 096160e89cc0f86d9ce23684039065cfa02c390c36cb9d3ffcb52a18af8f7de3ce26a73dcbd276e47ffe80f74568b1778a5cb17bfe6f1b5f6b53ee2f3552d655
 EBUILD bcrypt-3.2.0.ebuild 733 BLAKE2B 8a7e60f04adc81ed3605236e0866259e5485ebd993a54048d7444f34355b9e13d404cb85d7a2dee4e87c99cce854bccca4fc7383373deb8223ef567301a5b393 SHA512 250022370a0d053ca4e61e487763e0ac0fe7541e81aa6e62fe9f82df06b6df84ab5c7cfdac5cae9e2d1ec5e3753870f4bb9047d8cc8de31b5f5120d8a367959c
 MISC metadata.xml 486 BLAKE2B 874ef427438f2a2adc0529010628dd40505fd2597e267b8e51641d95b4c3bd8dab28d0fcd86c23f24c3abc866bd049d5e44438b282a5a13b023320491303a5b5 SHA512 de2e0a2a60b83a660a7c51315816a2762d9ebdb031656b8968da641d4e3897e4f5eb7a3432f828182f733ee4ffd17f11e8fb97d9a72f1a7eec56bb2f46978293
diff --git a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
deleted file mode 100644
index 4869d4555631..000000000000
--- a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Modern password hashing for software and servers"
-HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/beagle/Manifest b/dev-python/beagle/Manifest
index 171e98e326bf..769ac4ac200f 100644
--- a/dev-python/beagle/Manifest
+++ b/dev-python/beagle/Manifest
@@ -1,3 +1,3 @@
 DIST beagle-0.3.0.tar.gz 13830 BLAKE2B fcf3dd0ca2e38aa9c8a737553d86648614be8b5833985d3f3ce2ef608e73884d5e8463a36d157eea1179ae70c6d7ffea19a4191431a0a177962a9bb221aac345 SHA512 a7c685a20e2c431b92bb82891c8d183ada256cb1fe922f13470cad5b436b431232ae4d34826cb04cb5e6862fa5092624b287fc60d401f37f941b255ef55f30c4
-EBUILD beagle-0.3.0.ebuild 676 BLAKE2B d85a89d623b97691ce04e5240e4695f4401c5393ff311b5d8230f74ea1bc62744ece7571053ebc3aaed89446b67636e8fe622dcd9c683a2fc58c9ee84c52c997 SHA512 89efd7e9e230c8ca93a0b65a3b319a5c905b9d00e6798877da3a4506abcab6a1de2a0ee8c30c4adf79fc437787039375f3d5724341cf99cb1843a3fcfce760ff
+EBUILD beagle-0.3.0.ebuild 756 BLAKE2B 927e13e341a874ac3f576149dbd444d46bfedac2bd9b374df2e22de6da2070e82eabdead0e70eb7bf6102b3ef056df65d7d3ad31d9424272aa65b9cf061b18e1 SHA512 1ef65f1ecbe9188df2fc9996117320c3aa7594f4c854d730cf661e39fb6ef73115e0fedb3281b44a34f56b2a6e34bd6bdc9c035780549992687ba4342224d655
 MISC metadata.xml 459 BLAKE2B 6b5c80428d95a9822a683b2d5072209cedb0dd0965ee92abd945e375925048c2d1758fe28b4941ee48a4f41e5e26cb2de4292249b91cf0b72ecb9c04876510d1 SHA512 3ae51eb81d00f1e4c4ae542666dc93ea82fe3b187b0d75d01ffbcfb97fb6f8c3bb8d2f39fbcc7f963daa5b87eefc2c744d5940a21e226c53115195b1087c5b5e
diff --git a/dev-python/beagle/beagle-0.3.0.ebuild b/dev-python/beagle/beagle-0.3.0.ebuild
index cb43007e4195..08451f904513 100644
--- a/dev-python/beagle/beagle-0.3.0.ebuild
+++ b/dev-python/beagle/beagle-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Command line client for Hound, the code search tool."
@@ -14,9 +14,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+# setuptools is needed as rdepend, https://github.com/beaglecli/beagle/pull/14
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/cliff-2.11.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]"
+	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
+"
+BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/beautifulsoup4/Manifest b/dev-python/beautifulsoup4/Manifest
index 5cb865a6cb9d..b22a155df4e6 100644
--- a/dev-python/beautifulsoup4/Manifest
+++ b/dev-python/beautifulsoup4/Manifest
@@ -1,5 +1,3 @@
 DIST beautifulsoup4-4.10.0.tar.gz 399890 BLAKE2B 61f044064a81e94b64a72fd49cca164faa05442bc76f897c8a7fa4481acca039bcb9e4f7a1853a7155504fa25e56c518806d8af016369bc37316ecb95b59d7d3 SHA512 92be99ed0fd479b86519395143516e28f7b80f54a8251223d6e7b88dc98f8dfca9585079f5f1d89bfe68f577de3dff433711642486303203f46bc76754959a18
-DIST beautifulsoup4-4.9.3.tar.gz 376031 BLAKE2B fbe2139f288eee978c3f665c7640f66c6c51b857a186f6a8ace02b36effa1552f1cbea9e3744e0a46a65a06e6cdbd9203832e0ecd86b61406b933f9bd83d37b8 SHA512 e3cb6258bd7c51f12128fa8ee5948fb3566163ae233fac2dda21bab7772ab8dbb384d920b0ea138ef9921307b48f89cee3a9bf6111dfc8903d917ee7af365f34
-EBUILD beautifulsoup4-4.10.0.ebuild 709 BLAKE2B f568c7298eea04839013371db077b3a5228f3e70d60ed51fbb14f82004fd7b61af53735fe2fbc2e3b710fb7d045fe6d8795fbc7e4802dfe72c3e45b99dedbe55 SHA512 73163c2ce55768887057b4f6b0a11646f23b551a26faddb260f57bc3298107737f08a9f586b5daf6f471ed96ab82f73c1ca58c8a8971797bf906c660a0f60886
-EBUILD beautifulsoup4-4.9.3.ebuild 847 BLAKE2B efd71a4c1d8cb5229f7ae59dbc17b54b1e10a4a5a922a1544c8a97b5baa6a9df3c4b6f795b36cb48593e7b2ceaf0ec52e84a5d2f8f3311852acf75dca37c47bf SHA512 46c54efec8bead03640391dc71e58812dd5e5ae91ed63cb3f30f91e8853e3eb8f91528f2b41ebbea1bb0f08694b4e1a53383003bae7bc4840510088249b6ed3f
+EBUILD beautifulsoup4-4.10.0.ebuild 701 BLAKE2B bc8954ced5f76f0eaba96059a2741dd941efdd2d8ece17ef95e9817e6d6e06fa1194882549c2f4aaff72ac65ede2410c3b5376f3cf4f529fe93f00c0d2d9957a SHA512 34cbcc3d86bac3adf0e0d4c7ad5e19668f076efbd02d0d51cc9d61facdd1e1fd6233874b3cf7957cb13e9125e7fbb006c602ca5b079072ed67d1a521eb56f869
 MISC metadata.xml 745 BLAKE2B 16e44221decda568bcfd7fc64384f3c10d6150801bd099fbee3abb0273fa53bc83494cd9a56d43b125e9b2d773f9e1dcd35820bcc26a28048beea287a9fc3e23 SHA512 b332203a23fbeef550ce75c70afcf6eb9decf4e3e0409899d556e4e12449608100e1e6af81f163a879937bea2726195524559aa1151f917cc9facdf2bde559e0
diff --git a/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild b/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild
index fb82ea6ed378..a7ec018849e4 100644
--- a/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild
+++ b/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/soupsieve[${PYTHON_USEDEP}]
diff --git a/dev-python/beautifulsoup4/beautifulsoup4-4.9.3.ebuild b/dev-python/beautifulsoup4/beautifulsoup4-4.9.3.ebuild
deleted file mode 100644
index c9b54e80fbf0..000000000000
--- a/dev-python/beautifulsoup4/beautifulsoup4-4.9.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
-HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/soupsieve[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	<dev-python/setuptools-58[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-distutils_enable_sphinx doc/source
-
-python_test() {
-	nosetests --verbose -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/beniget/Manifest b/dev-python/beniget/Manifest
index fd9d0493dd2b..9d6905dd3128 100644
--- a/dev-python/beniget/Manifest
+++ b/dev-python/beniget/Manifest
@@ -1,5 +1,3 @@
-DIST beniget-0.4.0.gh.tar.gz 16212 BLAKE2B 881b08b40f69950a0689d10c8832d1fe02f3cbcbac3bb5e341084ed59075cb5ca86a22759753036bf65ab2c253e8455c2663b674759f007d49d2ba014a54e400 SHA512 521df94813a086832fe99420815823fe07803350ce8692bb45b793617cd642d0fb590304fe6bf5899073a7ec1c102abf5688ebca23e37803d4576ad86fcf7a96
 DIST beniget-0.4.1.gh.tar.gz 16353 BLAKE2B ef7de5eb15b59de10c56057b22e718ca7284d251a98ff1f8dbe31bad2e1bc7ca3c22c2794b1cae8b4c5fdf2a4b91ac6f9a3a0bef3c3aef51fbe6a93341333e31 SHA512 bd2b7beda41953be9b4052b539ae9812a370702874602175bfca66deebbc569515b9a59c750dc4898a6cb9f4a1d49f8ff15c1288035aaf72940cdd439eaace43
-EBUILD beniget-0.4.0.ebuild 555 BLAKE2B 7d7700112aa737ab87e4abe7c6ed9f05ce7f0f6f0e8b7dd81c100e3460cfc22f83bdc7564bb21c9e2350fabc626f1945debf6c620b1bb57feb8ceedb7b8d865e SHA512 5f258cc0dbd0293337d7b06064fc198cf0f758fbc562facade99ff839c143143e443f0e51c6e9862d4204f429356a8e486209795b5813014f87b5417bc45a815
-EBUILD beniget-0.4.1.ebuild 569 BLAKE2B 452d0c54a1866db490608c6269d8762a914ebfdde6b5a8c7a996e293f40554ada32c62c2ce0374436b7fe97f5d3c391a6e5b023efe43eac968806c37aa117fe3 SHA512 3616924237c66834a03b17339ef37ff2be38357bdb0f9be15eb0773fd5b0abb8540e6c92b4709505f9d39cf53f04c0ef0a68b1389be6533a8f69e6812c138a0e
+EBUILD beniget-0.4.1.ebuild 576 BLAKE2B 3e9b26c072725269ce4adbb218b510ee7dd00df777d8f55df15d9cf17fdad6da4b601a45d0d06c303838dd63704c7c9fa39220cec200d0db25e028517dc4d2fa SHA512 53c8068d40017ecae99e307d5f8d1408c7d5658ebe955b3b3641299fd26aa776feebf05cdc499c7030685cf01a267b5f748ec17df1c1e44610d9924d923a4d6b
 MISC metadata.xml 354 BLAKE2B 07c668c0a7fbbecdbb11f3a7b302ac589ad9af00e5ffca9b10f2542d9cdedf3f16cd5e9b8e04fe2b79a469f38a2083339b49503b90589b7322ec10cc867f9d61 SHA512 5dc1c04d0de4d6150797e91bd7f3224ec6fb5656bba3bcd48e332fcc5758c41b1e02bf74844a92eef5299af953ced75ffcc59cfee062c21c5c5ea6d83fd3472c
diff --git a/dev-python/beniget/beniget-0.4.0.ebuild b/dev-python/beniget/beniget-0.4.0.ebuild
deleted file mode 100644
index e1aeadad6a54..000000000000
--- a/dev-python/beniget/beniget-0.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Extract semantic information about static Python code"
-HOMEPAGE="
-	https://pypi.org/project/beniget/
-	https://github.com/serge-sans-paille/beniget/"
-SRC_URI="
-	https://github.com/serge-sans-paille/beniget/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="=dev-python/gast-0.5*[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/beniget/beniget-0.4.1.ebuild b/dev-python/beniget/beniget-0.4.1.ebuild
index 20664fc78236..589f73ce553b 100644
--- a/dev-python/beniget/beniget-0.4.1.ebuild
+++ b/dev-python/beniget/beniget-0.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~sparc ~x86"
 
 RDEPEND="=dev-python/gast-0.5*[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/berkeleydb/Manifest b/dev-python/berkeleydb/Manifest
index 6f0377c14d93..e6e67f5a10fb 100644
--- a/dev-python/berkeleydb/Manifest
+++ b/dev-python/berkeleydb/Manifest
@@ -1,3 +1,3 @@
 DIST berkeleydb-18.1.4.tar.xz 137160 BLAKE2B c93e7707bf12199c8161112accfedc3b0180b8f6edcf5c928c03f373528bb9ccb23219865344d9ed29d30b0133a2161ba0325257b6f7a2d22a58e8d9b1f82ce2 SHA512 bac2848e82ba5fdd3ca8fbf3a02d04faf270132f4b9fe93096ea57ab99fcc7eba02ff8a9638ea8e028d8bd4f16eebbefb65f33ea67e95c0a14cced05d04b23b8
-EBUILD berkeleydb-18.1.4.ebuild 1719 BLAKE2B 9ad5b562f5011486ccaaa6f0eee1a5a577b4dac95c8f5094819d470877640e2e39cdde87d1514d9268d73c85a282b9aa23e44cab94ee1912d81238aed54dc485 SHA512 1af49936f3198f4a891cad5ed2ec37d2ce888a069e18ba4f996a62ef717b468e15331096ef12228fc102ad02ddf0ec9f260169152a6a9b118eda9d5afb65a784
+EBUILD berkeleydb-18.1.4.ebuild 1738 BLAKE2B 11dbdb57adea34c610fd9717ff8fe9f48c4cf9c248989b86be958f44a4f9a31584855fba2b83299d19ad72e26d2ab2f0129772aa70e9de2d1387c1074b52b9a3 SHA512 a05f841af06c2e9feb2c07ce9ff501cbbcf65b09fcf841a9ef04fe135cb28daf6fae6b64061406ec4b8e0a29f4c63b3c7423e7bcb9ef967735851d98b076b352
 MISC metadata.xml 324 BLAKE2B 0741c4e1875fa2e306979097f6cc2fe13e9dda41f6aa49e54322289776387f97f399caa9ce79778dfeb8f4841a1b0cb3674e5748f556fbd5b116e97277a9a8ad SHA512 8eeeebb33f5cddbf7c841809d61f363f44757960ad5c71c84f1afa45c77d7e7c2ac5af226bfb0bd0348f4fb9167d2e9627b43b76951ca1abbdf514264feb9a56
diff --git a/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild b/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
index 38a111c13063..823bbd81ea54 100644
--- a/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
+++ b/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~arthurzam/distfiles/dev-python/${PN}/${P}.tar.x
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	|| (
diff --git a/dev-python/betamax-matchers/Manifest b/dev-python/betamax-matchers/Manifest
index 87395f0a415a..28bfeddf88fd 100644
--- a/dev-python/betamax-matchers/Manifest
+++ b/dev-python/betamax-matchers/Manifest
@@ -1,3 +1,3 @@
-DIST betamax-matchers-0.4.0.tar.gz 4205 BLAKE2B d9f626b61195135b260b0b4d43e0f62ed18721aef7c03602e117c9efedecb88fc891972b30aceed1fc29502a0982a18f8a57ce264f81fb89906e455b70b9afa0 SHA512 325a8165205c21193b4c136aa4d35a855f9529d6ed5809a1306ae7a3e7a49790928b68104da04a918ff3673ad2ede3e4bd901019bde460a8e42e2c5d96fb8abf
-EBUILD betamax-matchers-0.4.0.ebuild 599 BLAKE2B 80cdda51a8385891455a217fb643262ce2c88ffd1f066ad1884bed467875b4ff19121cf3d7e21064520dfac6ff58fe328f4ec86bb3b5a5455f907357313d25f7 SHA512 26580ef3268641f906ff27cf7079f788a14e3f91bffb8782d686e8d490cdc1751641f7372033ad9be12f282443db7423344de5bc39dc675d970211aa3ce7b047
+DIST betamax-matchers-0.4.0.gh.tar.gz 5228 BLAKE2B ac4f3ed3df559e26eb88068ef39fe7b890bb003881b95dfe6a72d8622773d76e3b3879a74f508e3849064121086868ba183e53c86387d59d1cc0a1640006bea2 SHA512 202255d9895b118d03efa20aa64f5b099045750dcb9a1ad3eda164d3da372207f1bee8a40f63cdf179da90cfc4380e5a004e5f9c94f006a6f3dbc64e29766c86
+EBUILD betamax-matchers-0.4.0.ebuild 610 BLAKE2B cb27bb44a0e0c68e1f690793172e9cf201a0d79b5aa05c62c367a711b6d934b7c8986b9e87aaa19c496ff6ff702514d9d48d93ce55fc89c009cc374d3a437eec SHA512 23e079d41c4950e0d0156753f7b8552af41fc73ff152d55e863324e5a5d29ebc866da0256f87df75369de1dca7b2fc23690119cd633d11ef10f66d34e2a6c72c
 MISC metadata.xml 377 BLAKE2B 8bc379d271673f6ec9cc2a11d6c7603971afdd65abead7e4df4e521d6de0b26978d73748d3eb72cdd595a907dfa461c6c995776bb77593212b1f270dcbdccab2 SHA512 e6a65498610e4bbcb6704f9b30b3afc545c66e66d78699185d502ccb43c947cf55ae8e1c68916145124fe6a3cfbfa6bda0dbfe6451670ef86564b86c699d07de
diff --git a/dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild b/dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
index 32f4b5b91403..979694e6cc4a 100644
--- a/dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
+++ b/dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
@@ -1,26 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="A group of experimental matchers for Betamax"
 HOMEPAGE="https://github.com/betamaxpy/betamax_matchers"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+SRC_URI="
+	https://github.com/betamaxpy/betamax_matchers/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${P/-/_}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	>=dev-python/betamax-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.4.0[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
 
-# No tests
-RESTRICT=test
+distutils_enable_tests pytest
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 3a7172158ec0..e660610e5895 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,7 +1,3 @@
-DIST bitarray-2.3.2.tar.gz 88480 BLAKE2B 0baff242d0450e76d40b6616f394a7c6ab8151c32c65b859e264fc5ddd13c808558ff6cb79723c29d6b33703f474fcd4cb583d62688ec44e9792f1a0f4ae9f13 SHA512 fa615bf411101eb26f3e6317d9b695602f65cd20d7d4037f9520ded8203b8b3cbfc749b95d29e5e21c6aea0b34cfc9dea688ef8e87f3d6ea837197d0965c3fe1
-DIST bitarray-2.3.3.tar.gz 88192 BLAKE2B 1635db26f1c9c5f90f7f858e11d608cb361644f0d7ba3f7830f7e6216ddab485647b8be51c38b8da1e3a0a12fd959f1a8ea138db710e8d9f48782c0afebff205 SHA512 34b7a66c3bffc58fb4ead51f379152ce33f9cd4f56c6251f7d366f5f95786a6afc310ff71b3ac73eb256cece8789bd3227c0924ed94696497721a220532e746a
 DIST bitarray-2.3.4.tar.gz 88229 BLAKE2B adf9c6e0cd1ebab3aa36af82d15fac2d7772289c3969134540154863decb7f58f532ad2a721127774c931b2fdb8f2a9698f990f8778b744a1eb267666140c66d SHA512 ba77ade534044bf19298c886958600cbf90c907ef08fbc70ad0975981942a213622a68a9c7e2708d89f19a8d127d6189cdcf365b27b0ae4c4f553b4febb3fcce
-EBUILD bitarray-2.3.2.ebuild 554 BLAKE2B d4d380693ac4207efd7d9f3a1de6cd09cb4ee3ec03465adb3613d298da5947e9822534cfe1fa3d5bab1e9c886e2a57813551359be719f01f247e440641144f60 SHA512 95ee6a48997190a986a0e97f8b94c38afb8fadc78c18e22629377bd4b2e83ba096278f8af1617a5952cce7db6e9736fe8c30255713ae3e9662c923bd9ec0250d
-EBUILD bitarray-2.3.3.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
-EBUILD bitarray-2.3.4.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
+EBUILD bitarray-2.3.4.ebuild 554 BLAKE2B d4d380693ac4207efd7d9f3a1de6cd09cb4ee3ec03465adb3613d298da5947e9822534cfe1fa3d5bab1e9c886e2a57813551359be719f01f247e440641144f60 SHA512 95ee6a48997190a986a0e97f8b94c38afb8fadc78c18e22629377bd4b2e83ba096278f8af1617a5952cce7db6e9736fe8c30255713ae3e9662c923bd9ec0250d
 MISC metadata.xml 1195 BLAKE2B 4b6e3f2c8304d9a1af4382a876987ea116ae62c369b70468e9791a075c343a6901c0642ca76826577a8ba85480915e7297e1476aff0295188904c016cdeaa5cb SHA512 4943b61fa1dd60662510f27d3ff5d8ef135c327be620c1eb948e8a1e9e4ccbd5e386be7af7e5c7b04614ac9a11e7c14f4a0a8c35a9580d631b41df09b5033f19
diff --git a/dev-python/bitarray/bitarray-2.3.2.ebuild b/dev-python/bitarray/bitarray-2.3.2.ebuild
deleted file mode 100644
index b5ceb188ee8c..000000000000
--- a/dev-python/bitarray/bitarray-2.3.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
-SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.3.3.ebuild b/dev-python/bitarray/bitarray-2.3.3.ebuild
deleted file mode 100644
index 2db993517908..000000000000
--- a/dev-python/bitarray/bitarray-2.3.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
-SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.3.4.ebuild b/dev-python/bitarray/bitarray-2.3.4.ebuild
index 2db993517908..b5ceb188ee8c 100644
--- a/dev-python/bitarray/bitarray-2.3.4.ebuild
+++ b/dev-python/bitarray/bitarray-2.3.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index bbfc2f8fe3ca..49fc062d341e 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -6,5 +6,5 @@ DIST black-21.9b0.tar.gz 1167869 BLAKE2B 31933de69cc34e23e14b0fdba33da844697816c
 EBUILD black-20.8_beta1.ebuild 2242 BLAKE2B cdcf87b20f7d169425bf851b68dc8f393a7fa60837cce59f2ef9445189609291f5e53561c6411587e0b1343075e5bdf84fdda3771db629f856ce94a15adbafc0 SHA512 4a9fd8f011f4d10ef2dd21cb142065d568fd5d3486a00d4932c1f270aec46fe6f9e097667db0356d5c791dc7fad1ff9d88792292d281da69db3ec68dd5b1f14c
 EBUILD black-21.7_beta0.ebuild 1426 BLAKE2B ee3b32c88347adf7b124c310a169b2d44da5f17666f6461f8b649536394295e94637f6f832a613632af0ad28f520e11acab125bf9a4e20362c46efad35255e19 SHA512 36fa3e039be4eb322d8f4beb4524be8308ee01c2c11051005955925bb60cce54c5cc910af8b1c8ca45f30381e6cbe8dc7557f3d8d4771159043404714e267cc3
 EBUILD black-21.8_beta0.ebuild 1621 BLAKE2B 02e0edc7879e1bc8cb5dd75753fbb51144de8f21844c08738a6a77138101457b7f46eacd66f6d38b6c091deda327cd85a30acc162d8093934120ac652f560731 SHA512 14c1ef861ac7a571584c8c2242e4aedb5f869630091ca6041b9917e687c1281c3534346da72510d1fc2d5629671a9c501af4fdabb7e925d7f30c4c1e7071799a
-EBUILD black-21.9_beta0.ebuild 1721 BLAKE2B fc1c34daa04312da7c9f1e1c2bffa1c286d476f35b388e0ee691bf472f10a231e977bba5c090fa20ea9bc5eed70da9a8ad633cd90c811c266e23be0fa916f974 SHA512 8de2184764bde67f3e18e003b773e2462c92e4f320ef62a995985d566531be38a5a1cabd1a7fd348c81fd570f94539be209c8c84b5caf35125f7f76a5ac543fd
+EBUILD black-21.9_beta0.ebuild 1714 BLAKE2B 42ab0af65acc56e18274e3c7fbd0f23ceb61696ed3ab198495ff3b1e4306bb922bd4f1a54194cc9752cd31ca3b01be7c1033b3e1ccff1ad70425307d46dff9c1 SHA512 cd7fba053924154cd37dbd77971d38993405404681f048aba8e29dd7e0be59f99d991bbcfa0fd66c737a606c5a2fcdf58c2db87fca3c75d71f2d83bc0d52ace0
 MISC metadata.xml 397 BLAKE2B 505ed4127741ef8d2fd77c36e6ad2d6168dca8ae5570cf7606a557fad29393c0dd78fe2eb1fe990d9d69abec19fb65d563481160b0bf0a914997b114e73f7c66 SHA512 357189214d3cc2a026b8c29ee5c695a62d73db229ca1f71372bfc5a1120317a4c4ffac942f5a196f20e84ae8988a4e707d4194ebde12ef7c96eb713b398f587c
diff --git a/dev-python/black/black-21.9_beta0.ebuild b/dev-python/black/black-21.9_beta0.ebuild
index 59d306a8d081..963f323948a5 100644
--- a/dev-python/black/black-21.9_beta0.ebuild
+++ b/dev-python/black/black-21.9_beta0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 660455355c2b..d56856595d4b 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,7 +1,4 @@
-AUX bleach-3.2.1-py39.patch 1637 BLAKE2B eeb66b15ad738d07db70bbf4599ef393678ca737d122efb7b0c5b5ae6f153b8989b4efc0bf26bdc34c9391af0e81fae5a0f01bc25e2b11db0c5ca76785d6b848 SHA512 5bffd50d9be425a97d6032ad6a55e2d92826ea9e074ea76039a94377c2b4f53599a740cd7fd5c6f90aa2ba87882d46514d014889b0a09f8273fbd31fa98f5b50
 AUX bleach-4.1.0-py39.patch 1216 BLAKE2B 15bd8b862610ca68b5a2d6d7569bb72a6293c85c0dd0a2b9dda58ab50a25c021fd8306219c47d851a738e57acee3e0ddd43a55dc5a30a789010a3d385cb8ba69 SHA512 10d2aff6c5f62a56589f8f129df1f5f3b514a57a8518669b909491b801d6994b548ec4f7f7c04f161bf06c82aee397a5610787682e07aa40e0d469242bd2c5bd
-DIST bleach-4.0.0.tar.gz 183459 BLAKE2B 380e94163b353e9436748fc6c1f368fb4d261087c2d6bc6fab1262295d597dbe81a67c34b889a29fd6a5180b8b522b517dc234e78b26556a16845f26f83151c8 SHA512 21f2a2dc5fa5e09cc2e38325191d7dc0bff2606cbe68ade54d866e326e712cb00a80b3a7a44f844ad4967ee6fdf453cca07d02c337bf147e4a12237231bcd99f
 DIST bleach-4.1.0.tar.gz 195798 BLAKE2B 68afd58aa099acb5c21f1ff76301c46834f326ea2aa4fe7a6f820c2cf31913e81dc72deecab4272b2a7ceab1ae01bec028a5cf5e6214cddef4cdec5ec05ea4c6 SHA512 34c522dde5126995789e23fd28f7938d025f56e97e30814dc326d33a772d40fc2ad2f25aed0b367fd4352b1e1e8f54b80282b931819203bf60448ffe2f120622
-EBUILD bleach-4.0.0.ebuild 994 BLAKE2B f51f660e8bcac01deea9dc8e4aa45c098d990f6a0637ead10967dace56734067894c9a2e5e0efa26ba7f3c14957c5845f1277c3aeb10b0074a01c78a3344a193 SHA512 6b404eedd2086899f33e2c8972c09eaf300ab40304ad4b5474ee9063920b5d8db4419b5bdd9a318ff1c5f8ff4846fb4d4af9ddc7dca707866152d7bbb532244a
-EBUILD bleach-4.1.0.ebuild 1068 BLAKE2B 97773e6ac97f013b3c5584ede91857cbab560d79a0ee859b2d821512597a7c6e8bae63c79b85d9811a5bbd322a5f4148e3fadb8af30b1ec2491da00296d8f7ab SHA512 28351a1e6acf43eb632c7f5f4d3862a5c1d202af24bf080faf6d31ea09600646079e20403782c311a037d88854f2821edf64ae11acce25df63c9b10660c53871
+EBUILD bleach-4.1.0.ebuild 1060 BLAKE2B c4bf4ba0d613fb8c0052984ad23224fda6fe8b85eeb6db811ded2eb36d0607dae15d37debb8b3f9ee125ea64e323d56761f25cc6c36b8124d0e27f0d34082e1d SHA512 99f6d19b23d11ead8260ba799df38e11b1b44ddd2773d5bc4d41dac698da6a34dc8cf50db0abb9772d32ffcdff9c95e73eaf398f321663ef519fb436e5f37330
 MISC metadata.xml 401 BLAKE2B 9250e95731d3269e92b401f17d066e70838fa4009e9b62e6ec88420ada2b4695179fad49a8b010eab162ed0af2e2398fa987e04cd8ad34813dfb1ed1ad1208e4 SHA512 e5ba74a86efa4450b9181fb5f32dfd63ac5d3e34b8e1c447b21acb4cb615d77711761352a8e1e4807bde17b1b2e688eded99d8a9785cd42a915d470084b98a04
diff --git a/dev-python/bleach/bleach-4.0.0.ebuild b/dev-python/bleach/bleach-4.0.0.ebuild
deleted file mode 100644
index f378247bac78..000000000000
--- a/dev-python/bleach/bleach-4.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="
-	https://github.com/mozilla/bleach/
-	https://pypi.org/project/bleach/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/bleach-3.2.1-py39.patch
-)
-
-src_prepare() {
-	# unbundle unpatched broken html5lib
-	rm -r bleach/_vendor || die
-	sed -i -e 's:bleach\._vendor\.::' \
-		bleach/html5lib_shim.py \
-		bleach/sanitizer.py \
-		tests/test_clean.py || die
-	# indirect html5lib deps
-	sed -i -e '/six/d' -e '/webencodings/d' setup.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/bleach/bleach-4.1.0.ebuild b/dev-python/bleach/bleach-4.1.0.ebuild
index 0dc5d1156b83..ee2ae8a64724 100644
--- a/dev-python/bleach/bleach-4.1.0.ebuild
+++ b/dev-python/bleach/bleach-4.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 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"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/bleach/files/bleach-3.2.1-py39.patch b/dev-python/bleach/files/bleach-3.2.1-py39.patch
deleted file mode 100644
index b281031b3df0..000000000000
--- a/dev-python/bleach/files/bleach-3.2.1-py39.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ccb0d5e98b30577fe27016b5bc774388f02db876 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 19 Sep 2020 08:00:51 +0200
-Subject: [PATCH] Remove tests relying on py<3.9 behavior
-
----
- tests/test_clean.py | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/tests/test_clean.py b/tests/test_clean.py
-index 1cd58df..2b2f7c5 100644
---- a/tests/test_clean.py
-+++ b/tests/test_clean.py
-@@ -499,31 +499,16 @@ def test_attributes_list():
-             {"protocols": ["http"]},
-             '<a href="example.com">valid</a>',
-         ),
--        (
--            '<a href="example.com:8000">valid</a>',
--            {"protocols": ["http"]},
--            '<a href="example.com:8000">valid</a>',
--        ),
-         (
-             '<a href="localhost">valid</a>',
-             {"protocols": ["http"]},
-             '<a href="localhost">valid</a>',
-         ),
--        (
--            '<a href="localhost:8000">valid</a>',
--            {"protocols": ["http"]},
--            '<a href="localhost:8000">valid</a>',
--        ),
-         (
-             '<a href="192.168.100.100">valid</a>',
-             {"protocols": ["http"]},
-             '<a href="192.168.100.100">valid</a>',
-         ),
--        (
--            '<a href="192.168.100.100:8000">valid</a>',
--            {"protocols": ["http"]},
--            '<a href="192.168.100.100:8000">valid</a>',
--        ),
-         # Disallow implicit http if disallowed
-         ('<a href="example.com">foo</a>', {"protocols": []}, "<a>foo</a>"),
-         ('<a href="example.com:8000">foo</a>', {"protocols": []}, "<a>foo</a>"),
--- 
-2.28.0
-
diff --git a/dev-python/blessed/Manifest b/dev-python/blessed/Manifest
index e08008e30c3e..ed9ad53728ba 100644
--- a/dev-python/blessed/Manifest
+++ b/dev-python/blessed/Manifest
@@ -1,9 +1,3 @@
-DIST blessed-1.17.12.tar.gz 6697754 BLAKE2B 0ae89a587a34936b31114e4bdf77effc51e0ad01b31f3b7e037fe96a44bbfecf1e2f64495d09e2627343f8021116ba1a2d6bccdaac7998b978aebc54e60a7a13 SHA512 134bba81793e8e0e33afcd9daa7453f11857b3207d0427f061ccfc0dd1caa17cff32f84883860f69e2a98ecbb5cc609f2a1091ab7ca8ff42322f6e8466ae06da
-DIST blessed-1.18.0.tar.gz 6651519 BLAKE2B e512ae49d19e3db09606e07b6a384683aada3de830e3a8f3e938e088607e4bc33f6b53b3d6477a2b0d4bdeb849fa4cea6eb3b0048294b3a567409a993f46b7dd SHA512 25b0c0c17e82ea975ace3415beb680e7ac917cdd4589ff11f0510067139d2f681316c35a59c7ef9bc5225291cebf6395f0dfc78da8845457ed7cc722ac708bbe
-DIST blessed-1.18.1.tar.gz 6651527 BLAKE2B 50667db4fff2eeeb1a238d0634ae3e67ab2323b988db4435174327a894d60fff4988c45cc55a633666d2ed88a8fae4e0844027a0bdc739e63f319ce19319142a SHA512 6b83ff2949ab3f7c5bf599897734092d305beaa21cb70583fcd1a26a42a7f16888813bd281a18905065a9989dbca29cd5a00cc4c75f4e360ab52209fc6d55a4f
 DIST blessed-1.19.0.tar.gz 6653907 BLAKE2B ba9c1247562baed398d6570fa97deeaefc325c502e0aed5907ffaf9802978933e9a5bd6c08b4d4c4a449533272005e3272f70dac5852da1c45c6c9644aee9a56 SHA512 a64d8d542a1a12b710375592c17d06f28a7c68d76952479738873fb956013f7c65820e797116b6151c2a338cd27cfe91b4ad1a318365357060f38d1ec0adf91e
-EBUILD blessed-1.17.12.ebuild 1314 BLAKE2B a1b546f406873f279efbdc04351e6521413645c5621344f222fa76ce1f90467e18c8465c0f43b90c7f0cb64b22afe30f2db3fa51b9a8ae9fcf45510de26bab8b SHA512 39e94e0eacef7bf98effc3e26eaa37bbf0400c594a33689b94af8b85c095795a3cd2ef01e6dc641a19d4cee3916b1ae5b63ba909edb4ccb285dd7d1ea17f89df
-EBUILD blessed-1.18.0.ebuild 1313 BLAKE2B 4eee722eb3cf629771b4f73ec4fd02431558b1e45b73960559ffd0f10bdb22672314b1ce7156fe9756ac16cdd2b96f182f853b68cc736f1026d272c1b4f61697 SHA512 c8eb2bcebba86762c266a1a64aec3b2b05181d904e95e1f45570cf82249f77c615f46f4bd03014a383b128c083e2ea73713ee23130c1ad455f53c9e5c9fb5d73
-EBUILD blessed-1.18.1.ebuild 1270 BLAKE2B b792310d87df833041eb0b3195197ac1fa447cbc3d5ad8e17df9d7bb29905eafd18f936032e098cf08f705477e3f2d6f635de8bb4b1074066e52a0ec720ca9c1 SHA512 e7aa218f7206b836c70cf5c7741b14737ac6b2da781f2250408d462dac31da005b8b8cb45289b9012ff57610395317d027cc3a24ed8a81b111d09f58a9d7d590
 EBUILD blessed-1.19.0.ebuild 1269 BLAKE2B 0bb8627844503b12f8c120ccbbaf97d2b9b4c9aa3cd5d040928b3aa266a9c559d4853575535afe60483522d0899e1879b875cfd1e011d6b1d774f32148a52bf5 SHA512 d3557b0de43478038aad4a5dd1f6f35a73a97341048880555d97bd0f2ffe0e32de54243420531ef331da718dd121d795337c2e9cfd761cbe051a0f43ea8e9a18
 MISC metadata.xml 432 BLAKE2B 3ef0823861c942f8f960311f194116e0d2fffed5d931c2379c8e51f2a76fd7c6d89e72e10bbebf7433ace63f9723090e3256f28a79a6b174485b920574c09ab2 SHA512 b8a8ff93344c6638b6ef7add15d92e7918802108cdb7191e5fdc54965ef5885c0c4379792dcc22b137f0fb2a0a86bfcee8588f49c462f19c8423a5d7a8c6f476
diff --git a/dev-python/blessed/blessed-1.17.12.ebuild b/dev-python/blessed/blessed-1.17.12.ebuild
deleted file mode 100644
index 0b84727a50ce..000000000000
--- a/dev-python/blessed/blessed-1.17.12.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for making terminal apps using colors, keyboard input and positioning"
-HOMEPAGE="https://github.com/jquast/blessed"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Skip those extensions as they don't have a Gentoo package
-	# Remove calls to scripts that generate rst files because they
-	# are not present in the tarball
-	sed -e '/sphinxcontrib.manpage/d' -e '/sphinx_paramlinks/d' \
-		-e '/^for script in/,/runpy.run_path/d' \
-		-i docs/conf.py || die
-	# Requires pytest-xdist and has no value for us
-	sed -i '/^looponfailroots =/d' tox.ini || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# COLORTERM must not be truecolor
-	# See https://github.com/jquast/blessed/issues/162
-	# Ignore coverage options
-	COLORTERM= pytest -vv --override-ini="addopts=" \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/blessed/blessed-1.18.0.ebuild b/dev-python/blessed/blessed-1.18.0.ebuild
deleted file mode 100644
index da2210a3cac7..000000000000
--- a/dev-python/blessed/blessed-1.18.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for making terminal apps using colors, keyboard input and positioning"
-HOMEPAGE="https://github.com/jquast/blessed"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Skip those extensions as they don't have a Gentoo package
-	# Remove calls to scripts that generate rst files because they
-	# are not present in the tarball
-	sed -e '/sphinxcontrib.manpage/d' -e '/sphinx_paramlinks/d' \
-		-e '/^for script in/,/runpy.run_path/d' \
-		-i docs/conf.py || die
-	# Requires pytest-xdist and has no value for us
-	sed -i '/^looponfailroots =/d' tox.ini || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# COLORTERM must not be truecolor
-	# See https://github.com/jquast/blessed/issues/162
-	# Ignore coverage options
-	COLORTERM= pytest -vv --override-ini="addopts=" ||
-		die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/blessed/blessed-1.18.1.ebuild b/dev-python/blessed/blessed-1.18.1.ebuild
deleted file mode 100644
index 956ad3977da2..000000000000
--- a/dev-python/blessed/blessed-1.18.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for making terminal apps using colors, keyboard input and positioning"
-HOMEPAGE="https://github.com/jquast/blessed"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Skip those extensions as they don't have a Gentoo package
-	# Remove calls to scripts that generate rst files because they
-	# are not present in the tarball
-	sed -e '/sphinxcontrib.manpage/d' -e '/sphinx_paramlinks/d' \
-		-e '/^for script in/,/runpy.run_path/d' \
-		-i docs/conf.py || die
-	# Requires pytest-xdist and has no value for us
-	sed -i '/^looponfailroots =/d' tox.ini || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# COLORTERM must not be truecolor
-	# See https://github.com/jquast/blessed/issues/162
-	# Ignore coverage options
-	COLORTERM= epytest --override-ini="addopts="
-}
diff --git a/dev-python/blurb/Manifest b/dev-python/blurb/Manifest
index 4c66844f3666..fa73bc8546c6 100644
--- a/dev-python/blurb/Manifest
+++ b/dev-python/blurb/Manifest
@@ -1,6 +1,4 @@
 AUX blurb-setuptools.patch 522 BLAKE2B a035fc3282d11845219a442494de83e385210421bcb45edf6780bf93d7cf43c2f3995394f862425f2c0e897357e8f187c07a2ff3b0dbc2aa9c932bfdfd83e69a SHA512 51348af10150ac288df6e4cc2d8c573b43432e18014234b4a68672518f02ef968dd26c4abe8d59dc8d6c64417cc86e770a5295635fa88356c526a580c201c581
-DIST blurb-1.0.7.tar.gz 21248 BLAKE2B 931a0db30447f5a41c956f15dac2bd967efd8a85d4837782e02af24edc31dec03d3fab27f22db1dafe334dcfc79b133cf99092fc28b59c190b1182d1f897e0bb SHA512 d84fdc0a7ecec1207a58a748f6d33343504d0b090166c91b05e9b3c2eb125fff890194539204386bdc7a1e0a595d2cb80d54d873045941491d26ca85cb55ac98
 DIST blurb-1.0.8.tar.gz 21519 BLAKE2B 4e76fad58821662b0a97dbde63e0fe7f3e82676ea1f22a3effdc118a014fff2b17995252bca900f495d66df36712122e7a50e95b3ebfcff7d39f8d005ef8456d SHA512 63bba016cfc293923da1cf7cc5f64e8881bf28237faf9908a484d55ff435df71c30544a751e0f167ed82d1f363dca48f53be67a25adc3ebc728c88b31186abac
-EBUILD blurb-1.0.7.ebuild 563 BLAKE2B f0f27262b2f62df910e80df1295ef96c3a9e88eea82dd4b64ec2b7f2e0245acbc98eafd6f5eefe3ed0b8d59596843d425e777a3f5b9aea5b1cd98681249f4eb9 SHA512 732a1efc2293f5449f34333852ead7c353b911ab5ae816b96f15f5b704916645816dd9c53fa59a20bb4f6ffc675530b71de31dddb2c5eb3075c930bebc173b91
 EBUILD blurb-1.0.8.ebuild 677 BLAKE2B c71ba8d012890379828f40cf96d4b227b0f007fc3336d41e51174b762522d6e9797ad1c48bec3d7b88638894ca03b6fcb603c619066340b1baf593d4070158f3 SHA512 4b0861bd0f1d5705b383cf2ef5799b7ec6523af6bad55aa49b97fdd4befb4af30a616fe202eb93dc4e731ef1ba0380eeec3c0a9d760f7ad3bb050806d7448fa4
 MISC metadata.xml 1039 BLAKE2B e723b7324c373cc1f31235b331f2f7f76e549a8b4e335e7db7a624e1b59c7a664440a28348491f9d176b7138cc4899996d23d2206a82d7660b0c2875e6e74e47 SHA512 7781ff5848693ff7ffa750dfaee88b385ba970803399fd967e98f62544cb196e0fcc1a341ff86c989d6da362921ae364ee8aee1824d0d91412562b00ee23b1d1
diff --git a/dev-python/blurb/blurb-1.0.7.ebuild b/dev-python/blurb/blurb-1.0.7.ebuild
deleted file mode 100644
index 83c04e7684b8..000000000000
--- a/dev-python/blurb/blurb-1.0.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tool to create and manage NEWS blurbs for CPython"
-HOMEPAGE="https://github.com/python/core-workflow/tree/master/blurb"
-SRC_URI="https://files.pythonhosted.org/packages/29/4f/268f9aa095cbcf53253c665fd0f5103f22dccf246fe317ab9c5c481b38f5/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
-	"${FILESDIR}/blurb-setuptools.patch"
-)
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index a98479823a4b..610059ac247a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,18 +1,14 @@
-DIST boto3-1.18.28.tar.gz 406268 BLAKE2B 1379f65f46f287a541b098b3ae183bc7d0a6c40a58f6241d97ce39ffdde4f0655e755fe56890fda767b57c6cf7bd565d95745dbbeb80f42f729f561f6e8d9a82 SHA512 98c0d94dd4971f833677947dbfbdcd495a26fda60592130842cf2f22b8929c6f72f971294d9ddc4923372706bf7f37d3d4cb0ede32afc6955d8253c19ddab63f
-DIST boto3-1.18.40.tar.gz 412065 BLAKE2B c548c6a1f5cfac3d304384b56882943201c45f3515bcd3804b90656966ba5ada0bfd5130fef34d8ad1466aad8a45166a9e35706d4ea53e9eb4ca1fcfae7172f4 SHA512 95e0c6ea5a9741657d801b1feab1ac813b653becba442d83673168d029635928e031386c7147ce28a9407acda4b593fc32b0a4f6ff1761f4b8d903b585220cd5
-DIST boto3-1.18.47.tar.gz 420701 BLAKE2B e58f528d876a29cd992a414e84a807a4fefdeb14b37e0c520f677d61270acd2bd534bd49ccb571d21f41a210946a1897f324a1c41a7e5fd9fe86a8689bc835da SHA512 67075c3d25a99bb3bda44f5108004a672b7f52f00f945f7643063d8c435854d14ffdc98d88d48e80caef850e4d765a7a9a894410398c56518a5cd30e32a7e481
 DIST boto3-1.18.53.tar.gz 422176 BLAKE2B a07155f6be71c049479c1d2e47767bb2c6863075ea0085ca5cc4609e28aa8b0af0e2136754c0ed6fd05dfecab079f76d636e19e1b8af4b68220768cea6125e93 SHA512 ae774e3db52a90a0850b4bd90be105d4ab59b6478ed16e30e2cc5afec0664e2b13438ab7a460e570c680d49be240855b7c9ae30a373c83d50dda5da6b84d01b7
-DIST boto3-1.18.54.tar.gz 422231 BLAKE2B a010a19a801a939421fab0b8b28ca36bfaceb30380d4e7ace262294acebbc12209cb05ee207a2c8ee536735aadf01c4d15f1c92ab86543970cd967d8a5300b3b SHA512 cb4ee30ee2f7c2270b0f0689707d129fbce94a2e740e4d836c41fb1bb641345ac73aefe60a6e1072f3d8ad87709b3411539a7fda8542c98cbb7bb4ae1872ead5
-DIST boto3-1.18.55.tar.gz 422930 BLAKE2B 2e30f585f2a99d30b9683893c706a9d00bcabc15bba7f033753cf8c0463c40227a5c668f29deff78da0cca02321e79a99329fa5acb8a4e6430970c08f1fe851a SHA512 1b885d423f17edcd441c48a3a456c70f823fd65b94ac89011d1dcfee1ba1d67fbe7e9470869d73733876abdaa4d8e13593ceaffd446ff46e4dc2dbd85cb2bc30
-DIST boto3-1.18.56.tar.gz 423262 BLAKE2B 97caee83b3bd074157096383d069427f1a2fae7917927983d5e9f3c1f11cf5d710050a505bdfa047259434b9b8f358f276de54a9e879b31c0eafb3c14f5c172a SHA512 cda79fc07e1f4c37b3aa0644bd1e81e157de19b1b47f4cebd5d7a66e5ca9653649ba9bf84c7d88dce383b592d673b0ee85fa823247517aa24f869af13755ed2d
-DIST boto3-1.18.57.tar.gz 423704 BLAKE2B 8b778a6e5549ed81ae411521e3d1e4792a18a539a3f7896022739ca25a9ee1f266b555f4baee507ac71c5129c6a8e919e6d95255f5c0dd64136d89d6fbe5605a SHA512 cad772acd9c93e61fd3f77c935986e0d50235591c63bcb27bc925292012a66c7d0a4a62e6c5129b8f26978eb9e5802eb80533e24566d8b369951c6c5ea42e28c
-EBUILD boto3-1.18.28.ebuild 1338 BLAKE2B a69e92de424ab1fa0084c97696548757d540cce9caf96a613b072b1932cf1420aafea0b870d1c09fbc597c804fd19faba2079ad018337658663bff714acef154 SHA512 6471431e033a9d8e2f88394b59444503d8c726f31fa550295f6954a5ac4a6ee69e967b6b07216e468c24a518e0f01d7244f9e99ad4ebed010979dec3199e2043
-EBUILD boto3-1.18.40.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.47.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.53.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
-EBUILD boto3-1.18.54.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
-EBUILD boto3-1.18.55.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
-EBUILD boto3-1.18.56.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
-EBUILD boto3-1.18.57.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+DIST boto3-1.18.60.tar.gz 428327 BLAKE2B d559c7512c7ab1160dfec4616741002ce82357d3469747044bf79f90baba5e6e3d2f2ecf32ae4cad7522a341d846d199cf34555376d05d56cdbfccc75d0f9042 SHA512 e013ec97b4379cbd3f21f000974d8078a2710f29a9a7d34532fa06c9011fb566238d38d45abd5ecad5b26ad544f72b86ae191fe475bd0d729d290553cd461ff8
+DIST boto3-1.18.61.tar.gz 428681 BLAKE2B 54aa44e4c1756172b5feada7c32a52d32a7938f284ff4ecad9964f74a340ee0cea5bbf1cae189ce90e3a38902398c10af739ec41da895104b10198e63e0d5cb1 SHA512 361e326d003879e81a9de00d469f5b6910c44ec4a4a2109db96b30f46499cdd07e80bd2ba4aeb7be149d9c5a0ead08c1d574369ddc90e31fb564eaab944c6cde
+DIST boto3-1.18.62.tar.gz 428868 BLAKE2B cb3d5cf5a0b2a15e5d881ce262d9dede08aa56a99cc2f470befb15063395ca761c8715b1b1e853626ae42d6f136c74dd65fe8abe8f1fdf00dca48ac601f1ce0d SHA512 265707cfd9529fc4300c744dbd17a823b32593b8bd1e26ccde5b6e80d7fea61c60b0d0d5e6f3d6606b3c4870c608283b7adddace2d4975367c7e1e4a1d10e003
+DIST boto3-1.18.63.tar.gz 429243 BLAKE2B 67b61ebe0d5a7c4d83922a3ec110e5d4e33c705e2a38031f218d2e059b1f8d9428d7307f0b5a581a60ef23068793e61cf6597827ffbb2a8714aed1e0716ac361 SHA512 d8f83d9edd730d40063f2cda759ad527d811c3f4bc7a8c450c3d426c7842e35481ae138e53dca2ce6ab4a30d06610f454c31a0d3259d56fe553f5b6d1ad58db7
+DIST boto3-1.18.64.tar.gz 429469 BLAKE2B c0e423871631017ef9aa5f1e89ada9c82c4c81762f724f7919005cca7078cfb008fd489cf1498a3011b2de0a4b0ac8da1ab0a5aeb8cd54667f4607d8e9fa1168 SHA512 1d56868fb8d6699aa118d1296ae9535d08143329e1df5281b29f6e4b9b7452846d3988ffb6fb66eace93e605e6bac9e04cf2e67f0a25b2b90dde27b02212587a
+EBUILD boto3-1.18.53.ebuild 1213 BLAKE2B c4458bb3113ba83bc2ee3ca57c264c634f702ca4cfa5d95b193442695bcf13f34adb6a30cbd78de4845a3a9dd033eaf05c4ee590c2fefd1dc9abf5aee45dde99 SHA512 c9c841375522cad6d3fdc6fa89172044d821443b35f5c9a957cbec52e6fd7b7e3e15038e03b67091d24c45d010f79ec152fcda93e534061d2636dc85ed574357
+EBUILD boto3-1.18.60.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+EBUILD boto3-1.18.61.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+EBUILD boto3-1.18.62.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+EBUILD boto3-1.18.63.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+EBUILD boto3-1.18.64.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.18.28.ebuild b/dev-python/boto3/boto3-1.18.28.ebuild
deleted file mode 100644
index 2cd6cb479d70..000000000000
--- a/dev-python/boto3/boto3-1.18.28.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.40.ebuild b/dev-python/boto3/boto3-1.18.40.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.40.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.47.ebuild b/dev-python/boto3/boto3-1.18.47.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.47.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.53.ebuild b/dev-python/boto3/boto3-1.18.53.ebuild
index 450c87d9f8b7..8ff4489a1729 100644
--- a/dev-python/boto3/boto3-1.18.53.ebuild
+++ b/dev-python/boto3/boto3-1.18.53.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.18.54.ebuild b/dev-python/boto3/boto3-1.18.60.ebuild
index 450c87d9f8b7..450c87d9f8b7 100644
--- a/dev-python/boto3/boto3-1.18.54.ebuild
+++ b/dev-python/boto3/boto3-1.18.60.ebuild
diff --git a/dev-python/boto3/boto3-1.18.55.ebuild b/dev-python/boto3/boto3-1.18.61.ebuild
index 450c87d9f8b7..450c87d9f8b7 100644
--- a/dev-python/boto3/boto3-1.18.55.ebuild
+++ b/dev-python/boto3/boto3-1.18.61.ebuild
diff --git a/dev-python/boto3/boto3-1.18.56.ebuild b/dev-python/boto3/boto3-1.18.62.ebuild
index 450c87d9f8b7..450c87d9f8b7 100644
--- a/dev-python/boto3/boto3-1.18.56.ebuild
+++ b/dev-python/boto3/boto3-1.18.62.ebuild
diff --git a/dev-python/boto3/boto3-1.18.57.ebuild b/dev-python/boto3/boto3-1.18.63.ebuild
index 450c87d9f8b7..450c87d9f8b7 100644
--- a/dev-python/boto3/boto3-1.18.57.ebuild
+++ b/dev-python/boto3/boto3-1.18.63.ebuild
diff --git a/dev-python/boto3/boto3-1.18.64.ebuild b/dev-python/boto3/boto3-1.18.64.ebuild
new file mode 100644
index 000000000000..450c87d9f8b7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.64.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 2629e7022f56..045cb0958bd5 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,19 +1,15 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
-DIST botocore-1.21.28.tar.gz 8079306 BLAKE2B 26dce445746a9da1b0cf62b622597396f9b4e735701f9260fd9863410b28b884e70e41b446b8349df39c81696b64632450f4ebb3e3f7865175e538f1b465898c SHA512 29534e51465bc7ac7b6f2e2c48472768c26caa5089f4c7f4a23cc2411fd55fde473388ad181a0b5a36650a6c1252ecb3e2b65e30510adc40f6edd6ce0c89f484
-DIST botocore-1.21.40.tar.gz 8149052 BLAKE2B 0554e2b9caa08b7518f1b51b5a980d98926782f0d4d523fa5c40dc66ecdf2db75719a36a2bf320c8d473119030693e0d1ab6bc7ea34c0574de7488bff5d7e411 SHA512 5466e15f8c09f3b4df13aee951d65219be86ccf1c0e73ed17e50fb7e2418f4694409676804bf6cf3ca638419512d903708e0994cff1f8105a19f0e26f0cabc31
-DIST botocore-1.21.47.tar.gz 8183951 BLAKE2B 930fdccd5d45fb1fb88fec2370e65bff5eb7241ea3a666f1f0bfeb11ee3e1e5bb715d658ac1f340c0565f16bbba48fa57c7460aef0e0595486303f62f79df244 SHA512 705fa363bdd4663f774e349e448666d7bfd47c77b57689d6cc12039419c8a4f820d7edd01de9689cd56fee3d59138ea9bd803b4402c8b5fac95cd2de76fb1558
 DIST botocore-1.21.53.tar.gz 8221904 BLAKE2B 79a87c9678fad9f3b4503740d9857579850eb2e6cf8371e233b9957b031e79aa04f28ce35b96826bfa4ff08c84a7ec646c8cd4302e5eb785530e8f3e2bf9b2f2 SHA512 0a3704d68a09a1afe53d4321d327036f4581d8c6942bc02f594c26d24fa2a60cfbbfab595cc3c4a4e9d3439790835739f7be8c3b572536feb655646c7800cf61
-DIST botocore-1.21.54.tar.gz 8221388 BLAKE2B ea72e84b9ba5cb4d97a3a353f3fdd2fe80859a073c7edce5c0f593b12b90c575ec08aec8596ab0317a99b9cb56551ab222971317b62dadec8b168a9db21a36ac SHA512 bf5086e503b2c4e096597b2434d5ec67e2da9cf173890e5a6d68997b737f03a1f75e3f813251da05cf74d7b757da6b712e2bceab0c8239c1db71818a79dc3792
-DIST botocore-1.21.55.tar.gz 8225756 BLAKE2B 8a0d333802cc196552d905c61716f601e2725c1b19a296a3e07b6f6e4b2deded5dadb68ab9de1aa5c2a07b34ec4c9eb333c2131e6a479998e150810a4b31e75e SHA512 2bd2bae733d2846c41415ddd07431abcd553f8220e87e228b1f91dd7b7af5b8f8918a43bd79a9b8d2b0196098c37b05eed6433859beb74f806bb20717ac41d8e
-DIST botocore-1.21.56.tar.gz 8227172 BLAKE2B 0a783e76c0a4a3ea577661a5995fdb2e53658aa462a6e59a950979c3c35864e94df1848aa5af40270e03833797bcd48c45f633dd8fbb198b2913df975f59069a SHA512 cb4f3e72f8d0bb9451b6b748e3763f6456937938047a2d9a6c5f47c498329b6930bc324e7d6f296952816c96aeb74047f7c2e33044abb551d289d24659a406e5
-DIST botocore-1.21.57.tar.gz 8239528 BLAKE2B d2b98f37468e0faf593d5fd42341dcab32d7ade253c80929722adbe7523ed6efb2b491a12b4335faf779703acc6eabbd3e1c6e0a02994d24dd13cea7d376bf6e SHA512 6bfcd57c7ac77c1098004e5e8a77c14a3718099eda5af00fbcaa0f54fabd93caf0ce66212c5807ae58d565cadfee25dfdcff9dcef8a68e66ba74f03ee28acfb9
-EBUILD botocore-1.21.28.ebuild 1509 BLAKE2B 216976965e11900e4463d04fee34937d1da17543d2d8e8c79bd929fb96b81fd4e9ffcad094b5a7f3ce2c6e3924a26979247a20e9d5e5b7ff87b4dcb22290d4a9 SHA512 9f67abdc284f20ffaee6d7552b71da64b5e0dd3237fb52e938f99e9e248351f78affd8ebeee2798663965d25bf34adb444790903f04131fa46285f51aafc5acb
-EBUILD botocore-1.21.40.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.47.ebuild 1480 BLAKE2B 93e123224013455d0b9c5449f6408b68d3dfdbce1d9d363a503ead237bea224e880dff7cc6cccd1a8064e283dfe398c4b6c293ab318de0e1e29853bef263620d SHA512 6df9ffe84d818de7e7872e52d5bc182821671f2bc3b581d79b6f2340e7300685bb0717f83d7a4274014d5995eb190490fe56556ca84aaffc06c3f86ff3aa9c12
-EBUILD botocore-1.21.53.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
-EBUILD botocore-1.21.54.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
-EBUILD botocore-1.21.55.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
-EBUILD botocore-1.21.56.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
-EBUILD botocore-1.21.57.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+DIST botocore-1.21.60.tar.gz 8253381 BLAKE2B f035a335f8d72c182f6fbd3f2216608bd5683e70ae11fd8646ff81416262ec802aac5b084f0cf96d23fd6767bbe678e35b24377d82186440b3ee55c977b42643 SHA512 7e801f67c670a85ebd0641fe8a51890dcea1a3a6f2253cca1213ee96a20497c1196c16b2576bcd2dc796b501117d609240c59b1077bbdc0f3021cf6659289e21
+DIST botocore-1.21.61.tar.gz 8255275 BLAKE2B 53f5e6c3af455bd92f59152d28ed7a598c1743c9cc648bf28922ce2833f53f7fa01de052109225117cc52126593bf51ca56765d35d1e25ced2a4a2a2f88326c5 SHA512 8cd110f78acb1dfc29f9eda5bcecdecba07e2846faab063c8d86294ae81935783e62c66f7588d505a2f6ca69445eaa80835011ac7b19e975e8dce9f65b28b429
+DIST botocore-1.21.62.tar.gz 8256122 BLAKE2B cf51c1aa4890dd3deb9da8b4c51b89cd4c006ec604d7728304938833c156450829693daa563f59a09f066428348f70f5d8b94172341ac30be072443f6330b612 SHA512 c34e512d1ebc60e7c37d3fb6856e43affbfc77cc21c971547725277df5325d8ae20acbf00fe2e89fc2c564d8a911a6a0db913c9ab6bd769e38596f2d8eba36b4
+DIST botocore-1.21.63.tar.gz 8256427 BLAKE2B 7b6a4d29005cdf127881a88b51ffb3162698df011d7345137537666e92a01a00e44c0fc7edc8ec4c17d3d30ddc5ae801b253b0704e70c37f6de1979cd2fe86fb SHA512 e67b56d3549bd70101f322da04eacca261c2afe9cd2c065ac290b4266fed5342cb8f15a2edc144006c5dc91692a95ac49d9d2fde86db4014511bdc3bd95d9193
+DIST botocore-1.21.64.tar.gz 8258628 BLAKE2B 5a335085224ed86eb2364a67198f1fe8d745102e38ed3cab47821d5bd03c6163ccd7754fc2201384d16d28c9aaf2c0ad447f97374e1b6414739688c788b3b122 SHA512 f40aca854103d97f8d36d178cd5a8fc19e1bde63476c570ae357f2526a82054c3e26a4db26a996df23d66a09bb4ef9354372010b726499cce0021d2dd48c7bb6
+EBUILD botocore-1.21.53.ebuild 1105 BLAKE2B 67442baadc85283cd67ea7877938531c70e59285747e631dbfa9ce1519e646af98169ff4ef538cc6731874a06ee3f2948fcf763abbf889a3e3b2d73ebf1cb69e SHA512 73b94ac5892d16aeecf54be238ca180d909885bfea39653d4aaa9e80dbc89aa3f0b040bff51200eaaf25d3642a43f1341d5dc3c27dd65891c368ada5d0ab3a82
+EBUILD botocore-1.21.60.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.21.61.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.21.62.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.21.63.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.21.64.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
 EBUILD botocore-9999.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.21.28.ebuild b/dev-python/botocore/botocore-1.21.28.ebuild
deleted file mode 100644
index 6b848259897b..000000000000
--- a/dev-python/botocore/botocore-1.21.28.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.21.40.ebuild b/dev-python/botocore/botocore-1.21.40.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.40.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.21.47.ebuild b/dev-python/botocore/botocore-1.21.47.ebuild
deleted file mode 100644
index cb37cb422ac5..000000000000
--- a/dev-python/botocore/botocore-1.21.47.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.21.53.ebuild b/dev-python/botocore/botocore-1.21.53.ebuild
index 638620b2cbc8..67437cea5b1d 100644
--- a/dev-python/botocore/botocore-1.21.53.ebuild
+++ b/dev-python/botocore/botocore-1.21.53.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.21.54.ebuild b/dev-python/botocore/botocore-1.21.60.ebuild
index 638620b2cbc8..638620b2cbc8 100644
--- a/dev-python/botocore/botocore-1.21.54.ebuild
+++ b/dev-python/botocore/botocore-1.21.60.ebuild
diff --git a/dev-python/botocore/botocore-1.21.55.ebuild b/dev-python/botocore/botocore-1.21.61.ebuild
index 638620b2cbc8..638620b2cbc8 100644
--- a/dev-python/botocore/botocore-1.21.55.ebuild
+++ b/dev-python/botocore/botocore-1.21.61.ebuild
diff --git a/dev-python/botocore/botocore-1.21.56.ebuild b/dev-python/botocore/botocore-1.21.62.ebuild
index 638620b2cbc8..638620b2cbc8 100644
--- a/dev-python/botocore/botocore-1.21.56.ebuild
+++ b/dev-python/botocore/botocore-1.21.62.ebuild
diff --git a/dev-python/botocore/botocore-1.21.57.ebuild b/dev-python/botocore/botocore-1.21.63.ebuild
index 638620b2cbc8..638620b2cbc8 100644
--- a/dev-python/botocore/botocore-1.21.57.ebuild
+++ b/dev-python/botocore/botocore-1.21.63.ebuild
diff --git a/dev-python/botocore/botocore-1.21.64.ebuild b/dev-python/botocore/botocore-1.21.64.ebuild
new file mode 100644
index 000000000000..638620b2cbc8
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.64.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/bracex/Manifest b/dev-python/bracex/Manifest
index 7a29d9e2d17c..a30424152eb0 100644
--- a/dev-python/bracex/Manifest
+++ b/dev-python/bracex/Manifest
@@ -1,3 +1,5 @@
 DIST bracex-2.1.1.tar.gz 26078 BLAKE2B 7313aac70d2bdb8473396a651a5d62a399084a0277e8c4665ef79fbe00347b86fc9793066584275f2a77c6c4cc217e6235f2f06ef4977f733039984c562ec529 SHA512 922f627a001c239cf5ace47fb2f295e04200116add01ff969f8de49067098dea43286c3c739d51286b283d354cb6e411b7e2e6cb1c4863ba78edccc7bd461c86
+DIST bracex-2.2.tar.gz 27605 BLAKE2B 18e14711840c02c814c44c0f7f939e69091d34f8e1d25494e802ce5d5ae1debce73bb9cb7cf27ff6e431cc7a71e2fc3f247109c2b24875af5c06aba315028e8f SHA512 386b30b528085569df0a891df3cf7a343aed692efe27f8050373adf39877ffbb191c48574f4d078acdd441ff76ab90912f2337461e36171561209a6608f10546
 EBUILD bracex-2.1.1.ebuild 1054 BLAKE2B c526e51d2454c8e45267b5a99b6c2140dd558ea9bfa99e4d543a798e994ce52cbb742a3b1c0590590e207fe895bb361f92df10504e732c7f3b7f01ec4f84c2c4 SHA512 417c99e3029645e444aa090006ff32cdf4f4eef524234f836afc70b8cd65461a8f6bda448ce400ca0b2b7063279a7b5494f1aa7f0d90bcf11cfebf76ededa814
+EBUILD bracex-2.2.ebuild 1056 BLAKE2B 99de3e2f90d461eff973fa1ffe64832206a503676bbd99c90c2d9bccb43c0193de2702d3594f591172f786eda903b95f7433d74058d787ce61a0b266190c5fd1 SHA512 f2c7ef7d2c8c060b891a11a9f2d35f9e4f7d912b5b9cf7392bc2f8ba0c3390da03dfdfa627b866e167a0a37033800f5de518c71953e2f1afa6cb605e2f145cec
 MISC metadata.xml 1252 BLAKE2B 4bb9a22d0a8a43a0c3ba1323ae61856d75f6457e14248f120ded6b26fa134ec9c74147944a8d313d7d4bfa0428c6bbd1f4ca954575f6feb50371eced46c80a70 SHA512 0ffdb28fc887afd29ab5c7948a41fb212d677413588bbc32343583ec31df042f75a5dda3c366ddfe78d4f42973bf2052e3226b118d71206d885d56cc5891ad0e
diff --git a/dev-python/bracex/bracex-2.2.ebuild b/dev-python/bracex/bracex-2.2.ebuild
new file mode 100644
index 000000000000..befaccde331d
--- /dev/null
+++ b/dev-python/bracex/bracex-2.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-material
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs_pymdownx_material_extras
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Bash style brace expansion for Python"
+HOMEPAGE="
+	https://github.com/facelessuser/bracex/
+	https://pypi.org/project/bracex/
+"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+BDEPEND="test? ( dev-vcs/git )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 52b076be1465..9f941534272e 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,5 +1,3 @@
-DIST breathe-4.30.0.tar.gz 190892 BLAKE2B 19723ed2f979eedcab73a9920c37cf6d3f6e02ff08703d601cc38fe55ecbac28b8ef8d319205723fce75b5e679a75fbd8e712dc134358e1ba6c23dfcb999a472 SHA512 fa09ee687a8e67fa480865a0d33affd9aa0ab48b0cb5b685731ec393045d8c9e1ae0622a1315f805449d712e99e6982ed229bb79314c69f69da0c705d075f7f9
 DIST breathe-4.31.0.tar.gz 193629 BLAKE2B d883f5d8ec339e3bb3db7382e17b27445f4ac05039aaa6ecc29fb38db51e95483c559e78cf642e70bea975c42b1ef2ed48d8804fd9557f7693139b7f5639dc3d SHA512 f6fd7db50ca68cad64d150fcb76227deb282c08109c38b343749f8ce9ee607ccddf767e3020328a61a7570e7a0c1159607148b773bc0b695e87d6b17a6068eac
-EBUILD breathe-4.30.0.ebuild 819 BLAKE2B c62e78d4a3631f0ea7e2358c26523f370eba2973a1a62c901fbd971eb416d6b67911fcdd97a157d3cd8bdfefae419aa7e82eb1549dd401d45616deb4aa3baf89 SHA512 807655cc398fb44f235eb1edc643f9a05b2a5fa7c6988e6452277122c8feba8b26128b8c4d690cabeb5dd94d511e324fd56d2faca471bf66e6fcbfa827bc5a74
-EBUILD breathe-4.31.0.ebuild 825 BLAKE2B aa11a114a723968affaab07c29c8b421046bfd933959c59a8b9d999403526c7b662a677247eebd72582598a6d13bf426783f45d091112a70fc362717c784b504 SHA512 85b58a79681490e01928a3ce205d11b5c1183682d8a2e04dc48617c54267aaaab30c926055277125a9ab61064b8d23cb84e2896a54cc065a6a2e6283765a7b5e
+EBUILD breathe-4.31.0.ebuild 818 BLAKE2B e40b6365b74ce25c90a29cb7dd6954fb684a03da75ebacb96893b2375672366c20fae59be910929c8dc3da40816adc495b300104b565fb54964b07eaf2638716 SHA512 6484e7641237aadc1aaa3871ca6d4f21be2a135af168f201425bb63c2b3f719085bfcdcc42862a46ef6108f2510e463d484621a42e123e57529f84fe5278b5f1
 MISC metadata.xml 822 BLAKE2B a09a68e18fbcceb11eacf09d338bae8d49dd266e09fc6b622e0ababc35f626276b1d9aa7ffcc2724d036617cd3d81b4f6d8dfc04412cd35959a8468a3aa5118f SHA512 29da310d740a06aece98f36892d6f97c10f3f13de5bf8e70c238663a1b85bde5199766169242a786331d9cbe09a6f0207f186e18d6d13aa6e0b1fd9af5eeaa8f
diff --git a/dev-python/breathe/breathe-4.30.0.ebuild b/dev-python/breathe/breathe-4.30.0.ebuild
deleted file mode 100644
index e18fad478984..000000000000
--- a/dev-python/breathe/breathe-4.30.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx Doxygen renderer"
-HOMEPAGE="
-	https://breathe.readthedocs.io/en/latest/
-	https://github.com/michaeljones/breathe/"
-SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-3.0.0[${PYTHON_USEDEP}]
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/breathe/breathe-4.31.0.ebuild b/dev-python/breathe/breathe-4.31.0.ebuild
index b0fbc7e01e85..9953f5f40a0b 100644
--- a/dev-python/breathe/breathe-4.31.0.ebuild
+++ b/dev-python/breathe/breathe-4.31.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-doc/doxygen
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index 2bda8359c555..353f0f9757fb 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,9 +1,5 @@
-DIST cachelib-0.1.1.tar.gz 10192 BLAKE2B ce1ac03498e331c0df405e99b26f24cf38f21243c60d90ca3b0fab599abce5ac8c59ba8c566216d761fea170d64934c63fd74f9733c50aa3ebe382c54b80bcfa SHA512 865dba727427907227b021ecc5962738c85fb74f898acfe1612e48247ada9eda3eddb72c3c29c700fe4275ed699accc5af9526afbaf0dfbfb3a1a1a6370cc3d6
-DIST cachelib-0.2.0.tar.gz 17735 BLAKE2B 737c5083b719b6330df4eab3e256fa64b9bd2292d46a1c0b82c72c6f69f4f2fae6623fd4bc167533101e0ff01b5273a1042f5c1bdf35080a5241358de642cba3 SHA512 4011d9ead4fe27a54508355eba46e91a924ce30ef3d7cdc5a2049f7e0e48f924b64d65f203aebcf9a8729f956b6edde4160cdb7edfa7e63293e2853b94bd6601
 DIST cachelib-0.3.0.tar.gz 18340 BLAKE2B e7f8aef925320c23691721f2f4ee7cfa66ab0ae8bf1e414d7344fc5799fbe66187791ffb9544f27b16dbf56ba8d2ec27a6ed080ccdf154a9b1a8582aa86c0127 SHA512 f9184cf9702c2df77e09d28d6feb8e6f0bc22f17c110a2371e76c4b78163950803e4f013c3746e21b9ac5771f72238ecd8bb041c5a7f44eab6bcb4de6e2ea377
 DIST cachelib-0.4.1.tar.gz 19762 BLAKE2B baadfe920fda339cd8f3241664ae91b2767423ed09bdb6204573b2679e37c2dd3157f3b4d0f16841b1ab859f7c777986c0c251bcbe4bdf1ade69c442ff8ec756 SHA512 051e6f31b6ee58836a1512de4c7eedc718c081389df92605ad065f4bc5e4c861971507af636686d8abf00273a379ff31730bf040a7633a143dc1492263e3a543
-EBUILD cachelib-0.1.1.ebuild 514 BLAKE2B a3d34faaaaa1a3d7d254093f81f7a65382ce0d39849df1459deaa3cf4b97d9e4f120fb1e3ae7aa73b8c79b78a338052ee614cab160e02bfc8584f228aac1f9b5 SHA512 2b2d4a1adcd50421722d41170dade21d406213479de203912023434ac6c2c8a75bdbf57c9e273ec99ed40930b615bc9ebb32f32401d1ffd34bbb05eedbc0291e
-EBUILD cachelib-0.2.0.ebuild 711 BLAKE2B d99fcbb4f6350f3c8ee6c3d6f9a1a51489217e723c518f05011409aac0d10045eb5955dcfd84a39fcceadaf0230e4266cb1c6aa24749b2821f0fb6cfec2da91b SHA512 a3084f3dfac675bb36bd1e5fe811809e5a2d7702c8c0c0ab75b349fca86ce8d8a2fcff127018f9587626bbeb279a92bc54fe1e69dc7858ee2523a473a6bdefa3
-EBUILD cachelib-0.3.0.ebuild 712 BLAKE2B ccbe220e674a264b8402fe8ad6963079ec4232a5bce1a5f86aa0e0c67c2a4131f83ecbc97d91216ac890472f28a76386a7908a3be0708fc8211001f84123747f SHA512 9de72ad0c74186a30899e9cbde117bd2907f5e49c4cbfbd0ecf42b230c30fb46c2c26ccc2ad0cedd67b7ce2809067411f8d76958e480c092658b2f460d1bea7d
-EBUILD cachelib-0.4.1.ebuild 712 BLAKE2B ccbe220e674a264b8402fe8ad6963079ec4232a5bce1a5f86aa0e0c67c2a4131f83ecbc97d91216ac890472f28a76386a7908a3be0708fc8211001f84123747f SHA512 9de72ad0c74186a30899e9cbde117bd2907f5e49c4cbfbd0ecf42b230c30fb46c2c26ccc2ad0cedd67b7ce2809067411f8d76958e480c092658b2f460d1bea7d
+EBUILD cachelib-0.3.0.ebuild 757 BLAKE2B 0cf51dd445db5c250bac45b01238ad154dd3f7d67f7b1922c3bd41c38a66cf5ebdf6f35a059a3c820e64429b7d5edf446101b26a63358048ed73bb5730581bdb SHA512 23411f79d4d6aa3393ac6665ea589493574842038d3c2206b7fe1e6a2141f247830a5cad6b7f384be84d7bb4bbeb5621d5064e6e7568138729c63f159660dd04
+EBUILD cachelib-0.4.1.ebuild 759 BLAKE2B 3507b47bcef100a8d162bbe44340805171bc2995ad3276d26d55cdc335a1b6a6a44cb6ba32b5b3c2e58fb5594f77f3e914422134c9000242c50a1f0f813b5849 SHA512 5a24f4552c9580697e4ae14d0610967cac11fd54235af9a1ce0afba93bdfcf63eccc95b2f1bc98f725f832ad69848fdc017b447f4cdf30a84f3e25a5a39d301b
 MISC metadata.xml 474 BLAKE2B 68232ce6be8604d810b8f8ed5a5a92cfdbd74f61b8c6d5cfb2dfb354cec4336ba9459eb5d41782824aa4a928aaa5f583f06b03f7e1ea6eee521c1b17be80fc10 SHA512 5de03537b7551f96a156476f693359f2222c060384baa54e4a35564377e88a2916eddb486bfadf327d86258ebf1555b2a942f2c993f68a5f7fc5e837e01317e6
diff --git a/dev-python/cachelib/cachelib-0.1.1.ebuild b/dev-python/cachelib/cachelib-0.1.1.ebuild
deleted file mode 100644
index 653df36bc1f9..000000000000
--- a/dev-python/cachelib/cachelib-0.1.1.ebuild
+++ /dev/null
@@ -1,19 +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 distutils-r1
-
-DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
-HOMEPAGE="https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cachelib/cachelib-0.2.0.ebuild b/dev-python/cachelib/cachelib-0.2.0.ebuild
deleted file mode 100644
index 2bbffeec5314..000000000000
--- a/dev-python/cachelib/cachelib-0.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
-HOMEPAGE="https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
-
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pylibmc[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		dev-python/redis-py[${PYTHON_USEDEP}]
-		net-misc/memcached
-		www-servers/uwsgi[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cachelib/cachelib-0.3.0.ebuild b/dev-python/cachelib/cachelib-0.3.0.ebuild
index 3ec6572206d0..8660630f6351 100644
--- a/dev-python/cachelib/cachelib-0.3.0.ebuild
+++ b/dev-python/cachelib/cachelib-0.3.0.ebuild
@@ -13,11 +13,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	test? (
-		dev-db/redis
 		dev-python/pylibmc[${PYTHON_USEDEP}]
 		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
 		dev-python/redis-py[${PYTHON_USEDEP}]
@@ -26,3 +25,8 @@ BDEPEND="
 	)"
 
 distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# bug #818523
+	tests/test_redis_cache.py
+)
diff --git a/dev-python/cachelib/cachelib-0.4.1.ebuild b/dev-python/cachelib/cachelib-0.4.1.ebuild
index 3ec6572206d0..3655d313ef2b 100644
--- a/dev-python/cachelib/cachelib-0.4.1.ebuild
+++ b/dev-python/cachelib/cachelib-0.4.1.ebuild
@@ -17,7 +17,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 BDEPEND="
 	test? (
-		dev-db/redis
 		dev-python/pylibmc[${PYTHON_USEDEP}]
 		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
 		dev-python/redis-py[${PYTHON_USEDEP}]
@@ -26,3 +25,8 @@ BDEPEND="
 	)"
 
 distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# bug #818523
+	tests/test_redis_cache.py
+)
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index 04a320569e23..64d5b4379d54 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -1,8 +1,6 @@
 AUX carbon.confd 119 BLAKE2B 75505b3aedcc65306a1cd16645e349012652a268d838dc1fd32d8a143d18dfca3c9e3233a0bfcdeee22a26592bb49408a3e4708d96796361219f73dc5e32adb4 SHA512 049d2e3c9e9ae9375f485568185b14fb326a85f13a5f40e19a5d26aaecd0b98a61f011dbe4335110b6e3314ec52d308fea8f577df8b29b5d675fd7763a02788f
 AUX carbon.initd 1259 BLAKE2B 06d75128329df6efe82b2d2ac2c35bb5f8726b760fc3e34335bea972a8c74070b6f892825b2b34144e15a41833cbbbb0e64d449f1c3326e7fae7b88349e62c48 SHA512 f6ccd3a3abdd8b8e1eff55aa6a0cd0b26e5cd6789ff6f8f795890e61adfac7369c101788a0db2e7d6fdaeace622cf8313a331aa6e0f54e9dda7ec8194351019a
 AUX carbon.initd2 1329 BLAKE2B 7990f8ee25f2554ce5997075c7fda4cfc69d73ae060657a917498bed4ef237a6e0b43b522ef15b0587d15c71fdb03a26f562d1147212c50f8d838f97522cc9cd SHA512 08d9a7ddc763bb49763b1c873504b0dfb45763ed871f22632885692f41d5d8c86616677c2669b0b8c2160170a7c507c2415571d300e2045675c7002556a4063e
-DIST carbon-1.1.5.tar.gz 72365 BLAKE2B 304e515fd3cae806e141d0a76983d13967885a7e57c310d86c0c83560aa306a573676fb0135fceccf14cc7ed42d8a9dcb7869ab0d6ac3b2fc00c2fb088011873 SHA512 1b3a0a0d4005e2ec8d5bca062b41f0e18329c1bc4d3a4b3eca5e8f7c94c20387281392eefceaca90294e51860eabecca242c487068433119f1f249f8659ed560
 DIST carbon-1.1.7.tar.gz 73380 BLAKE2B 8f9c807bc5e1c6fc020ae31179b6c0c11724b1110def323f92e158c5cf7c88291686bdc7f9078fb9234e5f2877fd745f7ec581533fa9a77e0307bf56f8ba60e0 SHA512 f0c5c64fa02cfd5940a7b23dbb3f2af27f67595e301ae719f4e2e9cdb48d4a5673d36a60adc8d338a55202f8e89873a7539c960cc16649903305191c6b0fc875
-EBUILD carbon-1.1.5.ebuild 1983 BLAKE2B 07c973b2eabdaa73b4968b8345a001b9aa78f9414b47a59315fa2572f200648e374bf3f8542db153868f7dbaaeb019f9d8e35cd3ff814afe9a954aa8bae316e5 SHA512 7c3fb474ecdd54342fc47861311253058d5876f5342cf17366c5ac2e69a59aec61645b0b657f7c2d5533e71c62728c8f93e5a374574d67e102bd719f3b988b27
 EBUILD carbon-1.1.7.ebuild 1976 BLAKE2B 17434aca43a27ee36177698f79d54be23dfeadcd3546f69a79a30143fd48a4ed00d76be114b61dfb6b24ad6dcc8cd5d9d01f525843be1629f0985f9fd1718d13 SHA512 0fc942a5a56ba0dd05311f28ad957602e6e0bc372a439b0e4d195298a2871d8807fec2a075f6f30b793188b29746c75a41b580cc5afe91e74ef991509922c4f0
 MISC metadata.xml 442 BLAKE2B e3ab8eb53738bdacc8fb73e7514c28290609200a34d6d6fc0111e30bd44d7806f91a4c3906cf473f8dc58b6d8012ecdaf320d943f770d05e26f3b0b44d99a57f SHA512 0deb6d56a05c7b0ee70787dad985a0f250d8328c1edd54690092dceeab8ba90e96ec2ddb326202f01eeb702776e448b746a5c92392ea02cba1892155d3eb60ec
diff --git a/dev-python/carbon/carbon-1.1.5.ebuild b/dev-python/carbon/carbon-1.1.5.ebuild
deleted file mode 100644
index 6fedf6f4cfea..000000000000
--- a/dev-python/carbon/carbon-1.1.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="https://graphiteapp.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-# whisper appears to have been missed from listing in install_requires in setup.py
-RDEPEND="
-	dev-python/twisted[${PYTHON_USEDEP}]
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	dev-python/txAMQP[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	=dev-python/whisper-${PV}*[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# Do not install the configuration and data files. We install them
-	# somewhere sensible by hand.
-	sed -i -e '/data_files=install_files,/d' setup.py || die
-	# We want FHS-style paths instead of /opt/graphite
-	export GRAPHITE_NO_PREFIX=yes
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/carbon
-	doins conf/*
-
-	keepdir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
-
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-cache
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-relay
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-aggregator
-
-	newconfd "${FILESDIR}"/carbon.confd carbon-cache
-	newconfd "${FILESDIR}"/carbon.confd carbon-relay
-	newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
-}
-
-pkg_postinst() {
-	einfo 'This ebuild installs carbon into FHS-style paths.'
-	einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
-	einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
-	einfo '(see /etc/carbon/carbon.conf.example).'
-	einfo ' '
-	einfo 'OpenRC init script supports multiple instances !'
-	einfo 'Example to run an instance b of carbon-cache :'
-	einfo '    ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
-	einfo '    cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
-}
diff --git a/dev-python/casttube/Manifest b/dev-python/casttube/Manifest
index d696187c3c46..dae5066ae668 100644
--- a/dev-python/casttube/Manifest
+++ b/dev-python/casttube/Manifest
@@ -1,5 +1,3 @@
-DIST casttube-0.2.0.tar.gz 3760 BLAKE2B d4e37fb0e98f2e9197e7e1a78b45109d0319f9b4337ef86d0dcd5797e703960162432990b9c4d26796ce5cc957179023044b86a9b07c8e581d13373889c6c824 SHA512 0ab69a92d49a9095c0adb70fec95011447d1f2a57e7642504d2ab4f19fc5f93b09db0e5d277bf7876311e5f26067a687bde58e3aa12469dcc6778486fc19c836
 DIST casttube-0.2.1.tar.gz 5182 BLAKE2B 0cd279da67aa59ddaa82913ef40815d28884b078448804742dfa3a6242a666c86cdaecf30cdf1ea913188d61953b5f38e133311d11491db443b55ae78b186558 SHA512 0b077b1f622c1029e9cff949a1d1cd4f380d9110324ca6211eb4d6bc97fbf3aa4d7be47cb692c2a7628ab62b309fd9957ee6392060f27e06d030691ad8cde00f
-EBUILD casttube-0.2.0.ebuild 520 BLAKE2B 0a9fedb88d0f4db921194df1dcb72f178f1974bc10233e4677ab0adac354b6ca8e96792167f84a591a8062c2a6cc6776f0bd533548bf7faf495990830b64aa7f SHA512 be6417192069f77d2196b266132c084e78f4d54fa2fe8428cb0d925ca2b3a29166163b3fafae884db92a52417c6b19a2c5bb20a191b9ad633f5373e530b9792f
 EBUILD casttube-0.2.1.ebuild 530 BLAKE2B 31c902d0010423b160b8c2b68111fe5d888ef6cb7628742a71b4cd41c81cf32774cca3718a585e19226e1c065f2cd373a68b0bd99f8d344aed790d6cbae1fd6d SHA512 0f1d848d03cd5f0921076ad789ddda23fe9ad41db189578cf0800e229ac5985a92eec5645e768d58abf42e30edf66ce71f0566dfc52cedc717901772303643d3
 MISC metadata.xml 405 BLAKE2B 2f7548b83796fc2d972ce9d108a023ec153a82a342a95c3114b671ca5a741ab9c709648d6967a13f3b7e80268f08b4ef84906635e7d07affe1f4533dc97a007b SHA512 2e4d5ea4a9f5f583a451d94aba2c5a842626ccf588e405efae99569f70130ccdab3b61e78d02a85045352e119e19865f30f7aefb0063f0cb455f4abf58ec3427
diff --git a/dev-python/casttube/casttube-0.2.0.ebuild b/dev-python/casttube/casttube-0.2.0.ebuild
deleted file mode 100644
index 20e14e934104..000000000000
--- a/dev-python/casttube/casttube-0.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="casttube provides a way to interact with the Youtube Chromecast api."
-HOMEPAGE="https://github.com/ur1katz/casttube"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND=""
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 79fe79b39ee3..643e4c61414f 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,3 +1,5 @@
 DIST cbor2-5.4.1.tar.gz 85777 BLAKE2B 7e81436c066dc245038fea6c5c8fb25ad87aae4c8b0a4d3e8ffa1a262dd4b08c6b0d8a79214dc13c87dc4ab6902b7762847b75f217a83769ef97783e2a25a6f4 SHA512 40aa8ad631eb6ba9a59a70fea4c6871057401550d7b4b59846e06b8a068458957beac9de1b811c8a9ca377ac06120efefb527e9a280defb55eb5767110ccb62c
+DIST cbor2-5.4.2.tar.gz 85847 BLAKE2B 1ad8b7bf54343ad7e969c797a444653e9cf501139facb98f92727be4d31148acedff29885e99c1535a44bcc9add4e4a1890c8f4605c2b82c9975821ee029d7bb SHA512 86e79ae19120dc39e79aa410b1e75df1d82b40c0523865989310f2d7214bfd824bf86ba158b2f695542ef2f34c76c8c4d5b28dbbb9815ee923444b00e86940d4
 EBUILD cbor2-5.4.1.ebuild 669 BLAKE2B 5bae6f3f157d80b20eda389412be063cafb07a2b15cf02799623be54f727d265d2649732773e7bfb8afc7707b1cc56e0588d6cb49c2f6f945fe663b25387eefe SHA512 4f848249b74d4e30192eeeb66bcdb8c28c6f0c4e952f7740843d7a7ef99ec0b64f264bb9b3e04aa5548e80ad27feeba81425039e0ea746b3ad9d89f2d0ebb4ee
+EBUILD cbor2-5.4.2.ebuild 673 BLAKE2B 8a1bf7da29e826b928b2d3e1a4cd6f8cef99d1d23d2b170d6b9cfca894af0591d34d689849c33766dd2855efd91052ae29c20c30a96756db5a18c2cb3e90c034 SHA512 4851aac5d714324213c11cabca52548d89cfc2f0e178f27e03c9f0bc8de0080e19250a8f59920258a4166b22defea6b77518a8a4d2599dcab997899c6f625159
 MISC metadata.xml 995 BLAKE2B 8b9c668c2628dc12eab5bc42ca90a5c7e1ed64405b3de54ccca8dca90a974e9e2274b8815bc800d5427c6128c2f369eb5fc1fe17b5f6dbcee242239966dcdb98 SHA512 12f4909783b90ac9eef2ef4141f6f0041c2faed7ccb3d08f64fc8cd4e36e5ad8a3a5068267f6dc02c8d2fca5213d26f28ce468ce4487a0b2d44cdb558d4882c8
diff --git a/dev-python/cbor2/cbor2-5.4.2.ebuild b/dev-python/cbor2/cbor2-5.4.2.ebuild
new file mode 100644
index 000000000000..62a624ad6206
--- /dev/null
+++ b/dev-python/cbor2/cbor2-5.4.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
+HOMEPAGE="https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -e "s/pytest-cov//" \
+		-e "s/--cov //" \
+		-i setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 5a198f6b89ee..286ac12f5e51 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,4 +1,6 @@
 AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534df1b881058cf7efdfdecd9df063c27ebd26683edad43e3010e1c01d9d93c5d98785ffbe65a5e3317d96ebb6a3132aecdab SHA512 75335871b8f98223e0247defc3d08f1c10ebed58c79790826c4e39057e6757b8bdc07e2773ad25482ed17c13480b3e72b3667e48697a456ed0cc4a39e7d91b79
 DIST cffi-1.14.6.tar.gz 475744 BLAKE2B 46e3f1f61746f659c066d83fdb07b83c289eda68056c6f9e364ea6f30cd56c190e4fdb35586c064b2402483704a7c1e9399d7f30cb49a78eec21797146da36f2 SHA512 30a8b25b74921a90a1fa96d05de1f25437d0fbbf73b7de0bb9ce22dfcaccbd78376b605525fe970212221d3e598357a9b1da420bfbd1a3e513263ed2b789e813
+DIST cffi-1.15.0.tar.gz 484058 BLAKE2B 0d2d470c7eb11b8a9526be816b153c4483a5cfb529d3d220a804842facae1f06e2a822aa2be9abb1b5648cb36a97033bffc1dd235d83bdf8c075d67a907aa7d9 SHA512 ee83efde6f77f4a0c5889088c4c208ed7b9071fe06dfc16a8d2396de07f78fe859e1e39866760198a9d700f3b7359e8715e8a3e4907feb81d3fc4b8dd0dbaca1
 EBUILD cffi-1.14.6.ebuild 1461 BLAKE2B a6e6a2e745fd9ac2aa2dcfa2de7566981f972746ea00375c3320f90d9f1d9f9b54319e0144bdc1be2477dde83b985ea410838a64ac3431442d56576504669e4a SHA512 c12149dcbc691a4d9856d2d912689ee4e2524cf67eb6cf271c09c75032c500b3c08f4679986594ef42f5934751ab32f7c584b870f54b28efeddc80740baed5d3
+EBUILD cffi-1.15.0.ebuild 1486 BLAKE2B fb22e897a2e3275e7aa13bedc1eb6a699625719a660530062432ef9d5d6f206423c58cd7ce307bcc1a68dc0d37a3afe2a82565c85e67c075c95672bfe5780c51 SHA512 f2f2e3bef5ac37a416cfdf715153b413422e6466cb322eed91f0842d2844b46af7c995db45175cfdbde37bf0958a6f2a2f8805280eac2e5547a5c9eae9aba298
 MISC metadata.xml 318 BLAKE2B f914459fac4ae3d8ac9273fb721c52494513b932676f570f02cc4cfb2283705d8cfc761806ffed23c6f31c95a967398edee01c1536547c1830def5ca4144c003 SHA512 ec451f8c535f0d01dc7bcd248c002745947982cd469a02ac247d0d34f4d7a33374fa10c28d8f074932f0548dc500c3270b499dd08b18acbb9d308777bcc7e4f0
diff --git a/dev-python/cffi/cffi-1.15.0.ebuild b/dev-python/cffi/cffi-1.15.0.ebuild
new file mode 100644
index 000000000000..8bf3a0a6b6ee
--- /dev/null
+++ b/dev-python/cffi/cffi-1.15.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Foreign Function Interface for Python calling C code"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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"
+
+DEPEND="dev-libs/libffi:="
+RDEPEND="${DEPEND}
+	dev-python/pycparser[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+distutils_enable_sphinx doc/source
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/cffi-1.14.0-darwin-no-brew.patch
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *darwin* ]] ; then
+		# Don't obsessively try to find libffi
+		sed -i -e "s/.*\-iwithsysroot\/usr\/include\/ffi.*/\tpass/" setup.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# these tests call pip
+		testing/cffi0/test_zintegration.py
+	)
+
+	"${EPYTHON}" -c "import _cffi_backend as backend" || die
+	epytest \
+		c/ testing/
+}
diff --git a/dev-python/cftime/Manifest b/dev-python/cftime/Manifest
index d023f4580296..39e3ddaac5e4 100644
--- a/dev-python/cftime/Manifest
+++ b/dev-python/cftime/Manifest
@@ -1,7 +1,3 @@
-DIST cftime-1.4.1.tar.gz 46721 BLAKE2B 903f8c042b6f4738893ee54c9d1b862f6f29b42c67b45800d21e1215979c95d985d56eb234dd52493da331c30b2b55c5c1590b51822bb87eaada7dd2879c57b1 SHA512 2d07b8f423e9945b1ced2e89f03965df5c3b25f932b0e7ce893a6cbd4568c93f0abb1d8e6efebe2cafca2ee19259f3c0878fec4fb91f68bf5dde1ccb67bcdef9
-DIST cftime-1.5.0.tar.gz 44972 BLAKE2B 515b5025987373499af4ce7f7e1b3001112c5ce1810a7a4a7825f57163815f7784682e3cfdb97a23507848e64689d2e6433be406ca217beda513050bbc66ea8c SHA512 8607d12ac1333e47de1976b0efc96f0f2a141cff19291974300c23b35ea9e389e698de0dc8fe5303b2686c77750e8d4017670c697de16d989c689391109ec510
 DIST cftime-1.5.1.tar.gz 46036 BLAKE2B 64a4af4bc8bf29624812ca24a8fe0cdc8885f6f46fc63a69587125c88b968f6ab5d40ad332dd6bd6881fbef8b2067c2ff436efb32876b77ab74037ae2900f7f3 SHA512 d75673526d5c831fe32f4b432c943a289491cc2c3af3258c8aa91f9633055d5fe36f4c7b7c2fdb5bbfb02f3a9138b020316fe53509d07116481dee0663e82de7
-EBUILD cftime-1.4.1.ebuild 640 BLAKE2B 210f22b81888505c817c4ce42144fffc9525f63be92b298b7c2a4df85068a8963cbad77eb9535446e0ec0061d1d75559577d09d9b905c3180ae7203e68f701b9 SHA512 a9e5653b73c8d4c931cd7d5909b41f0c6c04252e26ccffbe703a18541f5c38347ad002015ea67cbf71234e3bc9b8b7ea2df6cc895b15aee4792bce9884067d6c
-EBUILD cftime-1.5.0.ebuild 649 BLAKE2B 26555dd260d4e2f6dcc3bf07e77499a78a8ecb3e464021895b1b46e9410b368c660ddf2885049095862a7f822efc47b92baaf6503d6344c6eaa68a53e223f3de SHA512 34a76a7070bcb2f6d36f4e22ddb185e0d37b9248c13d08fb0e18c00c5b9bb3c0386ed9540fa10190f501478f976328d2957b9188a029cb13639262a542a04cac
 EBUILD cftime-1.5.1.ebuild 649 BLAKE2B afecf99fc55296d1c537d83716dcf67549f1ad13714bbdfd84c67cd6dbab7650af8db388d6726837dd44502a08c6ed695b284f83da899c8ed3f96a30f333dca3 SHA512 8cb1eaab3fbfc190ba6dd013a0b3f04d19b9cf841e9cfaf98c4c056ce9b9f6ad76d9f8b5ad8e499c38d390b2f958a8f503478fe7018d130bc5bd2647790e0492
 MISC metadata.xml 478 BLAKE2B 4999918d1667d93d5b8a38bc28b65255734bd11bcb9c56bcdd1920cfa7b3e1e9a5ce6751496e59dd914d1817bb3cf7fbb8a1c7a1a946c916f31dccb320c5a763 SHA512 af6b5275bb79ea316621108ce930d2a6aa3b7a42fa99b722573bcdae2c1488d3d2948c661dcf13cf50a35eb353ef125d47c387761ce1ea57cb6887349b5b0889
diff --git a/dev-python/cftime/cftime-1.4.1.ebuild b/dev-python/cftime/cftime-1.4.1.ebuild
deleted file mode 100644
index bc67e1512a4b..000000000000
--- a/dev-python/cftime/cftime-1.4.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Time-handling functionality from netcdf4-python"
-HOMEPAGE="https://pypi.org/project/cftime"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "/--cov/d" setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cftime/cftime-1.5.0.ebuild b/dev-python/cftime/cftime-1.5.0.ebuild
deleted file mode 100644
index c34b78731df9..000000000000
--- a/dev-python/cftime/cftime-1.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Time-handling functionality from netcdf4-python"
-HOMEPAGE="https://pypi.org/project/cftime/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "/--cov/d" setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
index 66577e88abdf..1e8f9c50416c 100644
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@@ -1,6 +1,3 @@
-AUX chardet-3.0.4-pytest-4.patch 802 BLAKE2B 64992866c2f101b41f525a0f8cf642774850211f434b471dcfa5aaadcabd5ceb573d5b902f6cdecc2f651a71dc8955204f13beb8a5261d4d0ff3aa6703a4266d SHA512 ca99abb30e8e221b43b7467cfa385c0abb16addd4befd149e35208278a25faf07dd99edd20595be4d0d0d0afdf81602b47e0110f4e9335ef90f5b4c41b54b0ab
-DIST chardet-3.0.4.tar.gz 1872214 BLAKE2B b93e2d3e0b5a5c35affa5e3ee661323029f79837a1222d8f69db72911301d9490c9788d2effc577eeeb2a50334cc855afc4bdf4b8dbafb143fcc411d93b824a9 SHA512 b433ea0e15e200df968e6d61c671c42fbd77e519eb033035c4a5c241e1f98e1dfaea6747af632788507583b3ef85b00d510b3f6ef5cf58589ceca1b3a088b357
 DIST chardet-4.0.0.tar.gz 1923933 BLAKE2B 10dce34cbe6f01536a526931510ed625bc5062335e9419e24c9e48d5697ebbe70dcc54ffaa976ec153340cc74c3086627a3b1dd9e34be32c89a9a81e83fd70d0 SHA512 cb0e052fdd9fec251ebc6eb3f31ca95ece017f2bfa99122997f989286988058ed9688e49d00631c63d8e4e52da1050e23f02b28d0e739aee7302b24c8808370e
-EBUILD chardet-3.0.4-r1.ebuild 832 BLAKE2B 7ef13790b3126a4089ff258df0d227f3d10e7bb1f719467876391a90914cf362acb9c317d77de286f2262b0d662d62894e405ac23cda04251c9aeb550764c1e1 SHA512 42931d0e260af8f161d28feb684534adfa5474594377686fe563e306234e8cb619714bc45ac853b8cd9d8b9925453bf34fa49ea70e686fd9e143afb9e12c96d2
 EBUILD chardet-4.0.0.ebuild 652 BLAKE2B 8c753c3694a2c5124427df5bf58fe9dd0fdd033eced871625cd8e1953b347ae2695dce0ebe672c3540f0e46c2ed3c6e34b07e5db1cabeab1411aeef328093b0d SHA512 34b526d8d2fdd272986f0e2af2fbeb8a09eea4805ba1a68ab11dec0f911d401afdcf2adb26f5d31c488ad3c9b384e9bf68692952206dddd456d943d539bfabe3
 MISC metadata.xml 403 BLAKE2B 90447dade87db87cbe60f8a0ff84e0617156551d74869306167a5c196e2f6da7746a9ae9a73624099ef7d593f1f36a476cf3b61251d3ca97daab1eccc963e08e SHA512 ed1030c49899c34998da5ed13f4c6dd297f75f5f9e0a06e51106c93579aeb0b4fe37fbea08e8e182d6480877d28a963f73f4a91402241412a22ee389179d8ef6
diff --git a/dev-python/chardet/chardet-3.0.4-r1.ebuild b/dev-python/chardet/chardet-3.0.4-r1.ebuild
deleted file mode 100644
index 747b00b7e042..000000000000
--- a/dev-python/chardet/chardet-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Universal encoding detector"
-HOMEPAGE="https://github.com/chardet/chardet https://pypi.org/project/chardet/"
-SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-# SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-# PyPI tarball is missing test.py: https://github.com/chardet/chardet/pull/118
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-DEPEND="
-	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pytest-4.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/chardet/files/chardet-3.0.4-pytest-4.patch b/dev-python/chardet/files/chardet-3.0.4-pytest-4.patch
deleted file mode 100644
index eef88e9e9960..000000000000
--- a/dev-python/chardet/files/chardet-3.0.4-pytest-4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Tue, 12 Mar 2019 18:44:36 +0100
-Subject: [PATCH] Support pytest 4, don't apply marks directly to parameters
-
-Fixes https://github.com/chardet/chardet/issues/173
----
- test.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test.py b/test.py
-index 9833307..ad2b753 100644
---- a/test.py
-+++ b/test.py
-@@ -59,7 +59,7 @@ def gen_test_params():
-             full_path = join(path, file_name)
-             test_case = full_path, encoding
-             if full_path in EXPECTED_FAILURES:
--                test_case = pytest.mark.xfail(test_case)
-+                test_case = pytest.param(*test_case, marks=pytest.mark.xfail)
-             yield test_case
- 
- 
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index 15e08d3c4b16..9d2294dcdc26 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,9 +1,5 @@
-DIST charset_normalizer-2.0.3.gh.tar.gz 363159 BLAKE2B f09cd3c9da04123fc7104cfac6829ea23a82173c04469c4d98acf9311f1006f4ecb152992a397a97838f9312ad0fc8bfeea03960650873a9aaa753315245dcc3 SHA512 4fa5507c4c0c61b3722d7423f4b597514a30ad0fea176a77a1e926328003ba6c0f49c95b4f4a64b8dbb32985373706d895bae1c6e3fe1fe224851b8383576923
-DIST charset_normalizer-2.0.4.gh.tar.gz 363800 BLAKE2B 81a0474238fc2fad6792201629286c261af73ed5dc3c7c4da525b356507f53bfb3e53d1ed325647295986a16fdd2a1e4bec00ee0648cb6e44f201196ef778556 SHA512 64fdddf2b6574828cc37dcb310e5e023d994e9cd4f8a7f6fb5796e997542cb1b14d9444994ab2594267361712a125fa476205462f9c7fea95505eef3c9770d5e
-DIST charset_normalizer-2.0.5.gh.tar.gz 368109 BLAKE2B 42e4cdeaf9a4e57c87e9813a6d1f31492aee29e37eb8c42721748b658064b16f0926dc6ffd794bf165718c4caf9484e139ca4024b89651d7ccdcbc6d907cf7f0 SHA512 5be0a72e51b9454e8a1ab670815526d54e03e42a0fd6de6ff5705000b3cb9af1ab2ad7f3457a898274d39c091603cdc8e2a925dd3c8e39a63910a5e480155b0d
 DIST charset_normalizer-2.0.6.gh.tar.gz 368270 BLAKE2B c80304b0e0f949d933fe210184d3892b7cbf52aeaf266834c4c358ee40abe14f660e2ad465aeecb76aebc8d3a12fe897b9cd7bd8ffa9e92fe0cbad07fe1526b2 SHA512 04ea17fb1d61b88b4036f33a4b03df824e246e57590a5b64ded8e44298bb1d07ebf276ed6a2dc189580d7563e267ccadb3280728f1e5ac5f29cedd5b84bd6dc7
-EBUILD charset_normalizer-2.0.3.ebuild 710 BLAKE2B 19d9dfe49c4fc71b3acf10183cc1644b4b349beb5e31c590569b69a39f13480887afa0c97ab2c5b10c4321f4bbcb854e51f8aa3d7a05d0c92e7ebb7dea8a89a1 SHA512 48cbe0bca1c62305ffde8daf2f195cb767fc3336ed1f52315b92030b082e41b196d611481b2fc4600731dd0c52e6f193d8bfc9e7b3c3556c3f7acf259bc842cc
-EBUILD charset_normalizer-2.0.4.ebuild 715 BLAKE2B 02c14b428a2565ff125388501c68a9017eaaa072f6a359f6b8277811ec8838be7ef16fa28f676c92ff6bdf7c33ceff47a0dc90bd3118e4ff7d1997026df249ef SHA512 619982fae47b3bad9066836fa4c1b68b87110bf3d29bc1aab7fb06bc9d98f75321b61c963522b5e74ba4a4b1d68cbd1cad8b3abea300ba369e680108fe66481e
-EBUILD charset_normalizer-2.0.5.ebuild 722 BLAKE2B 977797e4f8afdbeb4e147c9dc056a3b57b94ea1e222f901b14440f689d813416f424bd71a6fee1b2ff58e352ffca2a41903fe84c2b40c2718338dfb06d96b0cc SHA512 c5cd20c2c462dae34f91412d77621345bfb8e12e4e452b75943f5faa4ae7db25d9714ef5b4ddfd37e0cb833248038e2dcf8bc573e9bee9012808caab0fcde911
-EBUILD charset_normalizer-2.0.6.ebuild 722 BLAKE2B 977797e4f8afdbeb4e147c9dc056a3b57b94ea1e222f901b14440f689d813416f424bd71a6fee1b2ff58e352ffca2a41903fe84c2b40c2718338dfb06d96b0cc SHA512 c5cd20c2c462dae34f91412d77621345bfb8e12e4e452b75943f5faa4ae7db25d9714ef5b4ddfd37e0cb833248038e2dcf8bc573e9bee9012808caab0fcde911
-MISC metadata.xml 365 BLAKE2B 9b12ab039ab77e4914c6a7c6a54580d469f080783f43d10a988d0c073614e500570133a330d5312e51b47c9befabd9d993f1ebe8415810c0a4a150d96ba959f4 SHA512 76480c3c58cb1d5032b96a97e300089e419ad4c3ced784e08ddf69ed48af4fec8d0bcc9ebc4c86e39188d4651f70216d63851a7c106cb5b573a6e68ce68c79cc
+DIST charset_normalizer-2.0.7.gh.tar.gz 369094 BLAKE2B c04be56df2eb936fbad26c083d5057a2614c9ec4eca694e9c49c8e6eb63e803f82f97863b857d842204962949894b2e5971dda285c279d00ae61f7e2a5d8b5bc SHA512 a5fbcb03348239254b4e4ce9eefbe676f41aed0248af9f2e3224f8d3a4265af97f044eb1dda5aeb20db2b901d3b656d68bb50d507453cfe0eec6031ac87b86d3
+EBUILD charset_normalizer-2.0.6.ebuild 715 BLAKE2B 02c14b428a2565ff125388501c68a9017eaaa072f6a359f6b8277811ec8838be7ef16fa28f676c92ff6bdf7c33ceff47a0dc90bd3118e4ff7d1997026df249ef SHA512 619982fae47b3bad9066836fa4c1b68b87110bf3d29bc1aab7fb06bc9d98f75321b61c963522b5e74ba4a4b1d68cbd1cad8b3abea300ba369e680108fe66481e
+EBUILD charset_normalizer-2.0.7.ebuild 722 BLAKE2B 977797e4f8afdbeb4e147c9dc056a3b57b94ea1e222f901b14440f689d813416f424bd71a6fee1b2ff58e352ffca2a41903fe84c2b40c2718338dfb06d96b0cc SHA512 c5cd20c2c462dae34f91412d77621345bfb8e12e4e452b75943f5faa4ae7db25d9714ef5b4ddfd37e0cb833248038e2dcf8bc573e9bee9012808caab0fcde911
+MISC metadata.xml 389 BLAKE2B fe6651ec35ff7c5054d923af3f01983ffbdc6c9b47712b511e6b64eac8cfc0879ebfec52400f06ddc20cc582ed5e619883a86581b89c6e4bbd1177869b2d941e SHA512 b3c9c62aca7ff0691a5ea2ba8da2793316145890417dfaf847c9a6031cd7b3b5419b03ace05a4d2a94f8da61e8138f12c0d8998ea460ea2e25a29a2e95063f57
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
deleted file mode 100644
index 68c3ead3e5a5..000000000000
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="The Real First Universal Charset Detector"
-HOMEPAGE="
-	https://pypi.org/project/charset-normalizer/
-	https://github.com/ousret/charset_normalizer/"
-SRC_URI="
-	https://github.com/Ousret/charset_normalizer/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.4.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.4.ebuild
deleted file mode 100644
index 60d37611478f..000000000000
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="The Real First Universal Charset Detector"
-HOMEPAGE="
-	https://pypi.org/project/charset-normalizer/
-	https://github.com/ousret/charset_normalizer/"
-SRC_URI="
-	https://github.com/Ousret/charset_normalizer/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.6.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.6.ebuild
index 610269517031..60d37611478f 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.6.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.5.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.7.ebuild
index 610269517031..610269517031 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.5.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.7.ebuild
diff --git a/dev-python/charset_normalizer/metadata.xml b/dev-python/charset_normalizer/metadata.xml
index 0f779de30aec..3513dc8b2c8a 100644
--- a/dev-python/charset_normalizer/metadata.xml
+++ b/dev-python/charset_normalizer/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">ousret/charset_normalizer</remote-id>
 		<remote-id type="pypi">charset-normalizer</remote-id>
diff --git a/dev-python/citeproc-py/Manifest b/dev-python/citeproc-py/Manifest
index 6d7f536e2d42..f4e1433824b2 100644
--- a/dev-python/citeproc-py/Manifest
+++ b/dev-python/citeproc-py/Manifest
@@ -1,4 +1,8 @@
 AUX b1a5f925527093b0b5c11507f379a908e3354820.patch 1339 BLAKE2B 0dc159ac56179f13c528a13ad617d1ac52e65b4cc9be59bf6374adcb1ce787ffdc960bc70cc5dcd6287bd9bde4157f0ed1bb1511d2021a476ac61ce9428c2dd1 SHA512 477fc02354cacc75bfc341257caaac23501381c1e233a84a1e0973c98eba350c7cfa1a15503130f3059c0a239c20d5bb5fbde40b754785581c287fadc0183701
+AUX stop_test_from_accessing_git-0.6.0.patch 432 BLAKE2B c4b4696acf4619eb30ec3423743a0d3db76f4932c67afecca121f289fe2d144f0bf51e1c62847f09d083e741b4a586ca02adea8bde321edfe5ea3156c673d60b SHA512 79308abf6392436ce528e0a9713ee3d7af7345585e68510a7f5ecd8427e8f6c9a7bcebc7787935ae838e089c94a3f8b7cc472af99c735fb5c0f3626501c35f0e
 DIST citeproc-py-0.4.0.tar.gz 109786 BLAKE2B 8d8520ad10a9db7b7da1a2febcc594750572a562ada3944e41dd42321a3b9384828ad17e671307b5c4affeca2ec4a3f8e97eec650dad7005323ccb2913ef43d5 SHA512 bdc09a6f632a13cdfa757710c0d137ec73fe590bd01e049847fe013569231426bc72b318133fa34c96c5608b7a30058c27f4cd3d5fa2ba4b0760527b877992d5
+DIST citeproc-py-0.6.0.tar.gz 140624 BLAKE2B 169129c6be29a5a5c4678ccc2e2dd0b9ef58248ae66339ac32c6fab887058c7bbd2884d2ce959ce52287a622be4abded7e1ab06cae9c0952be47352671f951c4 SHA512 901a62c59189a652b589e4aa12e489f72f5ea40db1349fcdc0e4ffd6f5be8d364dccdc23cfab1a9003fbc672d75c5bdf06c74b9b5e1fcfb2c12e84df39fe1fb1
+DIST citeproc-py-test-suite-c3db429ab7c6b9b9ccaaa6d3c6bb9e503f0d7b11.tar.gz 990340 BLAKE2B acf02bec956765d0bea794a96ce7b86104c98aa4c0f8620dbfaeb7f16f37fe07e5b45883c04a1c639fad9098e3733339c90deaf8cdd794fadb8db1456972d16b SHA512 8653ea8968fa108c0814f43744f6e569a0a32cf4e82addec667f75a28b9c1fd9c7714c0c75a85e0d6f7f579e554494925ba4ab05e21e4dcb6b727d00b6a16df7
 EBUILD citeproc-py-0.4.0-r1.ebuild 554 BLAKE2B 3308d1c89f85cc30f0cc66927e9b23009022a83189782ea3da2c65c00aa50475a651de467c5907eb6fd0bfe43db14323a08918efa01bd93c01dd2e188acd05b5 SHA512 699f218cbe0c1bd3971ad7fc4d9e8181a9a29f1a956e4c75da6abceb4a2b5229d061f2880b0c73b09d0c1fda5f7ed3d825d65d9bc238fd7d38e6291419fe13f0
+EBUILD citeproc-py-0.6.0.ebuild 1133 BLAKE2B 03adcd47ccd1e738465223956e1ffcf2294b5bdd06f93ac73e6d9e97fe6d4b24eefd8692d43086c6c13d65a649e943d530c86f638750b921debd2384c60e2f48 SHA512 cda31c80454058b33c0ebcdb3ea65e69601f2c3dd853e742650c1fee3dc113ce2d9d0acb77715a4fefe4e3d28b2048bd6d167babfb206d467da214f187e5ed9a
 MISC metadata.xml 382 BLAKE2B 2d84f4b9844043338b0eb9f737dfef0495445b91a66d4b4aed910e87d7742ff5889dcf55fb0beed2f09042ed44415f4587e34a011ce7e4ad424079da3a74fd4f SHA512 de145eb60b314cd6f502b9f9115b5b034f3b72f0d3209c8e368ffcff0f4105ce4a88511d6599d6472092761d6800508a911a0765937aeb9b8782b1621d9488e6
diff --git a/dev-python/citeproc-py/citeproc-py-0.6.0.ebuild b/dev-python/citeproc-py/citeproc-py-0.6.0.ebuild
new file mode 100644
index 000000000000..b71b4ef34c4c
--- /dev/null
+++ b/dev-python/citeproc-py/citeproc-py-0.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+# Keep synced with tests/citeproc-test.py
+TEST_SUITE_COMMIT="c3db429ab7c6b9b9ccaaa6d3c6bb9e503f0d7b11"
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another Python CSL Processor"
+HOMEPAGE="https://pypi.org/project/citeproc-py/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? (
+		https://github.com/citation-style-language/test-suite/archive/${TEST_SUITE_COMMIT}.tar.gz -> ${PN}-test-suite-${TEST_SUITE_COMMIT}.tar.gz
+	)"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND=">=app-text/rnc2rng-2.6.3[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/stop_test_from_accessing_git-${PV}.patch" )
+
+distutils_enable_tests nose
+
+src_prepare() {
+	default
+
+	if use test ; then
+		mv "${WORKDIR}/test-suite-${TEST_SUITE_COMMIT}" "${S}/tests/test-suite" || die
+	fi
+}
+
+python_test() {
+	nosetests -v --ignore-files=citeproc-test.py || die "Tests failed with ${EPYTHON}"
+	${EPYTHON} tests/citeproc-test.py -vs || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/citeproc-py/files/stop_test_from_accessing_git-0.6.0.patch b/dev-python/citeproc-py/files/stop_test_from_accessing_git-0.6.0.patch
new file mode 100644
index 000000000000..e04ff1be1b87
--- /dev/null
+++ b/dev-python/citeproc-py/files/stop_test_from_accessing_git-0.6.0.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/citeproc-test.py b/tests/citeproc-test.py
+index 11bd47d..8934700 100644
+--- a/tests/citeproc-test.py
++++ b/tests/citeproc-test.py
+@@ -288,7 +288,7 @@ if __name__ == '__main__':
+         glob_pattern = '*'
+         run_all_tests = True
+ 
+-    test_repo_has_updates = clone_test_suite()
++    test_repo_has_updates = False
+ 
+     # import the text fixture parser included with citeproc-test
+     try:  # Python 3.3+
diff --git a/dev-python/click-help-colors/Manifest b/dev-python/click-help-colors/Manifest
index d1f372c656d8..c8cdd454d360 100644
--- a/dev-python/click-help-colors/Manifest
+++ b/dev-python/click-help-colors/Manifest
@@ -1,5 +1,3 @@
 DIST click-help-colors-0.9.1.tar.gz 101042 BLAKE2B 0f40d6d15f8e0a4647212f57e071c49b66bcd2b3d7ef582bd7d8a14135e50028f3ceb07987b5b74a868d998c12886a711f40e1d85b541566c63dca39e43a907d SHA512 ac4ce56ab249f7b98f670a6624700109f20a7c666e006b891d5c9fd4977512a0c94d82f6b43915952179abc946899f85fa1d358cd3d59508ef341ba22d8fc745
-DIST click-help-colors-0.9.tar.gz 100701 BLAKE2B 838507658aec9cea962d1f373bd771871837d1fe274c70fe4555efbd4e1825203d8728457c5836a482add26e86d4eed83b962811602864d43bf8174f49bd89cd SHA512 02cca02a5cec6b3b23fdeee4aef921cac1cf83d85bea8eb04dd100955dc27b2e4d098bad2f49694c0aa6548135fb979a1fd054525dcec27077f461a034d62a87
 EBUILD click-help-colors-0.9.1.ebuild 602 BLAKE2B 20b54e68755c6201107ecce9f1b1515cd845ea534bc665b9099dfb7a5901f8102bafcbac37d46278c19d519cf54e3ef4825e92023cdccf9a6469d1311be3cdf0 SHA512 88dfb13846fa12889862e55f927d9fba42b2bb9a9e0a85c59bb416cdd737457922d7233b07e008a3dfa4ad19d16675f09783aa63f5b6fe8fac37c3f225738329
-EBUILD click-help-colors-0.9.ebuild 612 BLAKE2B 093296e1bc0a492edcc6d6c29c1635d63352f2903f48103d1c0012daf5fe6429f7e5612da687810d4ae890542b3c260d9e431908522ffaa6d7859c5069d8e3ac SHA512 49175a08eda7d01d1f6211ac6021862a8b1f9e716b9d2e972530dadecdb225c32fb191906e55e8ea8b952c5392db28904ee40eb4b68ab13ff6778f2d8d422ebd
 MISC metadata.xml 421 BLAKE2B 34c01d517c076bf8009bdcab40a790e910dda2c31dd63ea3b8613b377e626f9d0fe9f1326bdc34f5c2412082ec3109b4cc96e4f8a78e2cf81b59952a8c578b71 SHA512 1ab3f8df4771d02581f42fb3da1f97dcbb2b608b5755230ec1b4cf423173bafaf50922e7d5779becd738e9e07ca28f60c2da267be8ae275c919e706b51e77c59
diff --git a/dev-python/click-help-colors/click-help-colors-0.9.ebuild b/dev-python/click-help-colors/click-help-colors-0.9.ebuild
deleted file mode 100644
index 0f16c35209b3..000000000000
--- a/dev-python/click-help-colors/click-help-colors-0.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Colorization of help messages in Click"
-HOMEPAGE="https://github.com/click-contrib/click-help-colors"
-SRC_URI="https://github.com/click-contrib/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-RDEPEND="<dev-python/click-9[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click-plugins/Manifest b/dev-python/click-plugins/Manifest
index 648cef18d513..907e20fb1a5c 100644
--- a/dev-python/click-plugins/Manifest
+++ b/dev-python/click-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST click-plugins-1.0.3.tar.gz 7950 BLAKE2B 4ed7d15c37b2eb127faac6179c06467507405d4fd3eb55d93e2210df0eae124167e0206fe9996298abbd7ee26edc8849d5c4062875db12ea92937f225408b4e6 SHA512 1eac03d57931bdf8e2f387164490436b3b921738936ee6cd9a58246e05e84133e77c47dd606a00d1b3e238a806bf83ffe7dc7c758a92d789cc229a94ed26e17f
 DIST click-plugins-1.1.1.tar.gz 8164 BLAKE2B 48d75b9445b72dca41516fe81d02c6fad8089630c0d49963f559a847b90c7897c8db64773c4ec5f4c162d0f2f4fdd14fe212d485765d38977145fd32acdd0dcb SHA512 bbd838f50603ac4e76daf3535fd5d27a17e17549addbc8b582df6d6193b4f07d743101ce52f0b71f326995fdfeac159805025770350ca2e7697f212dce0c4b1a
-EBUILD click-plugins-1.0.3.ebuild 510 BLAKE2B e63b33d0247a3c3c26f8a16e2d30905eac38f3acc2f4c45209469c4ba94de8a283c1b24c3f2a8d7667478383c39f402252c24170780642a356c9f80019cb76cb SHA512 71e97d7ba0f48147f701192e90564c4e533b6fc40b2782d4c6c29daa37ae9ee00a90782042388835b1c5b665311771eda4cfa66b531ad44cf9095f1475b222cc
 EBUILD click-plugins-1.1.1.ebuild 543 BLAKE2B 6706cbf20fad1b49db48693caf05ee5510da160886749f1e6b5230ab48fecdfa3a6a3a869454f3c63e8e5d99c7bb63673274a0411a4a97c367bd4b8858ad79eb SHA512 3ff0a846ed78f19a6e37c0b1b6b9c92f811bfac8b505b04c5a96b2d950dd57bbc6cba4aad61fed7c85e2d294d58ab9d1366b1f2c44b48f8ce01dc4d4bbd4ab1b
 MISC metadata.xml 311 BLAKE2B 979e8b892b9771bdac7ffa3a58e165097a70dfde354a5062316850ff72c4192148f053fe0be60ba6aa43434b757d15647c02682fc21f08dc986ef02f15232e59 SHA512 132f8fc7fbe5005f70578d5eab2f43ec62e322df618ce479d22958dcaa4c63d192506a7a9423978b1f850689717e32d2a78b883502cf1f43e24fb7a61bfad578
diff --git a/dev-python/click-plugins/click-plugins-1.0.3.ebuild b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
deleted file mode 100644
index 8e5bf209fdd4..000000000000
--- a/dev-python/click-plugins/click-plugins-1.0.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for click to enable registering CLI commands via setuptools entry-points"
-HOMEPAGE="https://pypi.org/project/click-plugins/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/click-threading/Manifest b/dev-python/click-threading/Manifest
index 619f81ae3344..f090f9367890 100644
--- a/dev-python/click-threading/Manifest
+++ b/dev-python/click-threading/Manifest
@@ -1,5 +1,3 @@
-DIST click-threading-0.4.4-gh.tar.gz 9815 BLAKE2B 57f4cd386c0d1a0ee999ea7ccb91319e8bc2d177e9f52b9979b4a93d68a1c3502f8aa05f163a991a8f78c90692c65d026295a710004035f2c48868453bf2f2a5 SHA512 4a7af23be600cab43dcda267d9d9d3ed0cc885f9829f2412844ac9cd3f0f41d1bea3f157f9e37cc3333c4b0a3d65ab4525edcaeec767850efab5cc037e95e532
 DIST click-threading-0.5.0.gh.tar.gz 9836 BLAKE2B 245c63476e58cd370ec49275a4a8ff8007d71386328c2631970a0bf9ac0b81c14150966a3cab54a7616dfc1fdd5e5b3f601fe1e08d1c9c65ec168b96b6b773d5 SHA512 134daf779a56a18cc36a94cd6818801896f171ad91f0b34995d92de5ccd62ea61b7a4fcb0afe2634e5fe80869a616263952e687c5d8d490f17d1d27d00ab3fe2
-EBUILD click-threading-0.4.4.ebuild 585 BLAKE2B d118e4657b99935841a49ba4640cdddfa5f460e8fc604970859fe2b62eaf9fafb35b43f6962adaad7e85e2b74541d62ec98f83dc7d1b62e34884e723837f6b86 SHA512 ca1b0856b66ac03f7baf0f63efbbcb756f5ac4d448260e209923e094d41c9f4dc60864a053ca6a5881abebdc471ff8f47e8492a3513e42fc6c81d4fde0cc2875
 EBUILD click-threading-0.5.0.ebuild 580 BLAKE2B 0fe80bf462abb6c225373cbc0d4277cb9ebea1da9a29d42c761c575efc2c75a43741984e8553b0599cd212bc7965dbb423fbea578a4caf587ff8cdfff9c2b829 SHA512 86956ca04eee5e728a407689609354dface3245fe5b142a5c8fe4f3a84c57084e9e6c7c9a1936e8fa94efe49cc7fdf19c093479f068658cdd5a0acd4103ca8b7
 MISC metadata.xml 365 BLAKE2B fe300fb1f3cff5b85b4c3f49a6e227783ba0fe86c43ab0da15f2507606468b47aa603d62ed853ff2b2b9e92f262fd60fb4f1e39dbd9c4247f90ca3b74d763af0 SHA512 94a08fc688cda31d99e15cfaa3efb2d662875e69fbf018d66f00652c3b305224eaeac2c29a98d5488ff669eb2227560ffc531912b16fbba1f2784c6cc6c72db7
diff --git a/dev-python/click-threading/click-threading-0.4.4.ebuild b/dev-python/click-threading/click-threading-0.4.4.ebuild
deleted file mode 100644
index 1d127b0acd0b..000000000000
--- a/dev-python/click-threading/click-threading-0.4.4.ebuild
+++ /dev/null
@@ -1,22 +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 distutils-r1
-
-DESCRIPTION="Multithreaded Click apps made easy."
-HOMEPAGE="https://github.com/click-contrib/click-threading https://pypi.org/project/click-threading/"
-SRC_URI="https://github.com/click-contrib/${PN}/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 45f31ff6cd7f..9be90728342e 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,5 +1,9 @@
 DIST click-7.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a71ec65c0a8a144c7a0e244b5bdf0196ffe2150889b82edda20c3f1faa3c84a227fc9ef459a5a9646cff86129 SHA512 d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba
 DIST click-8.0.1.tar.gz 330890 BLAKE2B ae0a29bf1848e92c21ade72fb8ce08991c9edf6d5afb6d70a0dd85cdbfacffeac69a675dc0842566ae23ed8c666deac97879ad4611e8294ee1c6896ea2ddca8a SHA512 d93ec1d070dfa306733ee79893c64de9afcb0c7bf03d3f543dd697ef195f3a750828f77842a22886960a938740b92f0122962076ea52b911b87f7f75941a9032
+DIST click-8.0.2.tar.gz 332870 BLAKE2B b1c623dfa14239b6eda24aa20eb24936954cce7dec4add75cbf1a236a128fcaa2fbb21ce0da181e7d3fe6e13d808ba9ef39166152eebea06ae1a68b08c238e74 SHA512 473184751fde7a09b0730e84db2204fa3bc72d583e0edf5a2897a4bae8f1d2ffdf01c69ae971d9158cc59d22eb852eb83f28428a2635a95c43596abbc9257891
+DIST click-8.0.3.tar.gz 332553 BLAKE2B d0ac16196dd80ca452a5fbab2304cabc2dd6b493789a43c2d69f152c85f247e8512e965683d4d2cab9b59188766ee9950c0d47812b7ca03c30d873f54bc48076 SHA512 73d29b73d5f90132282753fa1b53f42a690ebf713e8e4f2e3ff3c8820ef71ed82c5165bf61563341170a263c4202adb5690540fdeb6501fb9d81d2db06a5e89e
 EBUILD click-7.1.2-r1.ebuild 764 BLAKE2B d1d38b50a150be24f89380cf98233f141ca96c91e6dbc64153c8cfd6326b98098a174fb7ee58fb120957509b85262a056d7837a9e9f61639abb10d6707f6845a SHA512 ac8ba661a0f1664960eaf8748cfa1118e851ee5b2a4cd924b37742d6d09009dc7e4eaef10b08f1d796d47cdce0ba3483fc2809eefe0717111339327b14585c22
 EBUILD click-8.0.1.ebuild 945 BLAKE2B 002ee3d4fe2d6d5398c23e4abdc3ec659ac22b403874f670381c1307a19de4bac5a4da326b5ed1705b9f4b9407b735b8903454ab8d288361f375c843556ba419 SHA512 2caa744ad49905a92362c5e4b0728861899379630eca22999e524c714ffdd17c695a0047413c1098d2b4399ef59f31cd0b00fcd2c91490e8bfde03d59adcfacb
+EBUILD click-8.0.2.ebuild 942 BLAKE2B f8e4f94cfc818e70544ab27bb051194892726aac557cfec9a34a0b702a9e6d6679d443dc1eaa1eec09b9f21484190bdab7aaf42a7c4943fc514720b0c171f783 SHA512 84684b6146aa737b76f84736395d9adcab5f5847fe01924471f58532c539e2bb5a12eb95a66851891a555a8dba2cf80387fbc46b3f6c0b700ca6251e876dee3f
+EBUILD click-8.0.3.ebuild 942 BLAKE2B f8e4f94cfc818e70544ab27bb051194892726aac557cfec9a34a0b702a9e6d6679d443dc1eaa1eec09b9f21484190bdab7aaf42a7c4943fc514720b0c171f783 SHA512 84684b6146aa737b76f84736395d9adcab5f5847fe01924471f58532c539e2bb5a12eb95a66851891a555a8dba2cf80387fbc46b3f6c0b700ca6251e876dee3f
 MISC metadata.xml 386 BLAKE2B e460c7d70bbd848cd239d9e1ba5dc234c7de2a2bc0c77bfefb6aed1fa6d954de18508d4db44e77495f90a141180fa2602b15d3699aaaa99a48520a7e37a098f4 SHA512 ef8dd0545e92bb8fdc107fd6170068d35f44abad698226ea4724c450aebc0f32c76eb90b9fc936f9c85b8a93637f6006e889796e2bb3b7da5f57c1419f6b3794
diff --git a/dev-python/click/click-8.0.2.ebuild b/dev-python/click/click-8.0.2.ebuild
new file mode 100644
index 000000000000..a6c059fdacfc
--- /dev/null
+++ b/dev-python/click/click-8.0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="examples"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)"
+
+distutils_enable_sphinx docs \
+	'>=dev-python/docutils-0.14' \
+	dev-python/pallets-sphinx-themes \
+	dev-python/sphinxcontrib-log_cabinet \
+	dev-python/sphinx-issues
+distutils_enable_tests pytest
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/click/click-8.0.3.ebuild b/dev-python/click/click-8.0.3.ebuild
new file mode 100644
index 000000000000..a6c059fdacfc
--- /dev/null
+++ b/dev-python/click/click-8.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="examples"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)"
+
+distutils_enable_sphinx docs \
+	'>=dev-python/docutils-0.14' \
+	dev-python/pallets-sphinx-themes \
+	dev-python/sphinxcontrib-log_cabinet \
+	dev-python/sphinx-issues
+distutils_enable_tests pytest
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 70572d6f6374..09498b61a96a 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,5 @@
 DIST cliff-3.8.0.tar.gz 81862 BLAKE2B 3a8219f822fdf14e1de56204b0f536a92d27be5a99fb628f3aed5b569a1e703d4711bdded28fa42c0692316454847ba3338baac8efae873540652e46d155227a SHA512 002e3ddfb254c5369582cc28572856a8b4ad05d598a7f8aa690add69f49cabb12ef2ef17b6c1553792aaee785b7c1703b05dd9d4889271cd5eba5629fad3d09b
 DIST cliff-3.9.0.tar.gz 82687 BLAKE2B d49840831e55a205e809abeb54a6c9d45e807a622dc9b02a104311b8a5ddda43415b504f7fd62075cc4cdf89a1b61605ecf32590fbca3d720c07da83d58890a2 SHA512 04b33e14c3b29a02dc04855044184f934919ff92dbc09003f620083e5815597f8dee7201fa33019dd58a3e701d4c3f9966be1f4d23e019a881fee9a9bc1f0dbd
 EBUILD cliff-3.8.0.ebuild 1162 BLAKE2B 437d306a8b53ed989eb8118c33f8216cdbe2643a48f8f444492b50ec96113ff376c7709434eb9017521e2d5f83673f88b440ed2b112fcf67cde91a39d9d3db0e SHA512 61dfc0762c58b4dcc8ee498a5f3f6199786a33d35ff1563edc7af5c2f106af832b60a2dd9dfd080d65cbec0f265174790ee63f5d6bc9022c657d2bd0172d3e7d
-EBUILD cliff-3.9.0.ebuild 1120 BLAKE2B c4d52e40123966406403558b7d99e6aef423b9c8b82b6d136936a524bf870c42c91e819125af00a146c5952bfe10214651797fd7edcce2655e103c544ce0ea62 SHA512 60ef6400fb795ea0d9254a625a5298cc55d2e1c95be0f3c6c280cb5b5fd010feb0d74971ed7b1729ca431d90cfecea490fc34ad8d8ad303104e45663f9b7524b
+EBUILD cliff-3.9.0.ebuild 1136 BLAKE2B 4eab924db7602eed6f25b0fca381ade8e216befeba68c9658ec356d24a422ad3771b9c10df0f5b3ee732245bd78f6cb6d0681472de953bae0e55d6e4f9008770 SHA512 7bd96dcedb96bf427383f6f0eb1876bac054d3e7cbde680aea5e80a0c408fe5657bdfbdcc463bbebf2b20ff21e629a5b9af7e0d3bf28a94043654768ad022cec
 MISC metadata.xml 767 BLAKE2B d9d994960046172167f20f59073011b2defe84e94144386db5465a973050e48e05abccff88d7f84cbe9f20615eddc5b61a46920f8b27c4dc9b2587f762f3e368 SHA512 018a0bfac3f0126341207d16203fab4a666b17d8a5dcf9f101335c396797f2e724e2250910fca39e12cb6616614983a756a42dac03aa215d2a1b51af5246269b
diff --git a/dev-python/cliff/cliff-3.9.0.ebuild b/dev-python/cliff/cliff-3.9.0.ebuild
index 46f2548c2527..d783eb62db71 100644
--- a/dev-python/cliff/cliff-3.9.0.ebuild
+++ b/dev-python/cliff/cliff-3.9.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index d8cbecb6e98a..b64b1f9d7f1a 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,5 +1,3 @@
-DIST cloudpickle-1.6.0.tar.gz 52743 BLAKE2B 9007ebd4464adc0cb203e596cb756176d17ede5cfb90d172e11630df3e0a93dba471d8b20aaf750701cbbf1fdfb4a5faf24a75f8df82aecb4b77bd62c8979027 SHA512 3b663a013d1512b732b13f38bdf2d5d89704a73577c9fee2a6e808882d42ecc1bdb3589b1cc61279ec621b6dac27d8e223b2fd839442e2d5994892f04d015535
 DIST cloudpickle-2.0.0.tar.gz 60038 BLAKE2B 21f3c170c21c5b5c44fbe5317d788e7b09cc4d15789d91227cfcf736807ee11cbbc003ea66dae4fb90de99ea5fd1c6096827efe4d438b92b8b73ec981e12e784 SHA512 4f2c0019a9b6b7ca4c8749b0c2b600ac502450f6fec9c23fe5b9ddece34c77105c86666274e24c6672d405c3e0e800b0a7da055a95ada8fcc060a63214aa9666
-EBUILD cloudpickle-1.6.0.ebuild 773 BLAKE2B 29494cfc6b69f3cdfa09e520adc51b0d758ffa2ba060a503ccb0469cedc1da32789b2dfd63eb9289dc49d2193d4dd771f75922edc0eeba7168ee3e5ea3a35175 SHA512 240bb14db44e14335c33ff8f1b138f4fa724ce5ce2c5a7777eb2f249956d9dffabefd4579e519ffa5758959f4d2ca6e19a05fb35c699ce0ea8fe20e5c5d744d7
-EBUILD cloudpickle-2.0.0.ebuild 777 BLAKE2B 7d3480b3cb018dce9bfd0e875c43eb4597842513a0cff4425268ad8a47631fb03dd1f1a178c1d0288b42a59b00156fb88ec04337e6a5f494c31106392d3ae5b5 SHA512 1fb9559a7912aa7aca03e251bf7a21f6705fdd4da9e117bd03da82107774add70a1e14021a6c9e6f5e729e1c37c0547760c4ccc362d8c8bb6e228f797c7b348e
+EBUILD cloudpickle-2.0.0.ebuild 773 BLAKE2B 3ec5c5b97e1d8eca604665f2a65bd5fb869f202c4b279ca1c99af77f9c471f587d89d0375de97cdcc68fbbd415178c125acbd4d00029ec2f2d74052735d6c510 SHA512 d77b9253eec022dfec2559bf5999966dac6d8db6fa59f3b8948b08f95a444d27717a2f4446f3a205a1d4e319072d584b8f20681bfa4f5e02e273daba79b56341
 MISC metadata.xml 400 BLAKE2B 6b8036e6fee459cd45ff48884ade7ba9471d948ff06e46062584e5953fdaea8197525ec02e2dc44d4daa6326c7a1859680340e616f27d72ea1d98fe5c011a5cd SHA512 70c88c748d18923d3205c9f2ebc683e6b73240d4f8215f1bf3c3c91bb5eaac259066dc735f10806c43375432df581545831c616ab3aa7218981193956e6c0450
diff --git a/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild b/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild
deleted file mode 100644
index 1a44fa5874cc..000000000000
--- a/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Extended pickling support for Python objects"
-HOMEPAGE="
-	https://pypi.org/project/cloudpickle/
-	https://github.com/cloudpipe/cloudpickle/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH=${PYTHONPATH}:tests/cloudpickle_testpkg
-	# -s unbreaks some tests
-	# https://github.com/cloudpipe/cloudpickle/issues/252
-	epytest -s
-}
diff --git a/dev-python/cloudpickle/cloudpickle-2.0.0.ebuild b/dev-python/cloudpickle/cloudpickle-2.0.0.ebuild
index de4718c57339..10667167fdb4 100644
--- a/dev-python/cloudpickle/cloudpickle-2.0.0.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-2.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 49a0aeac7878..b4fdc26a8106 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,5 +1,3 @@
-DIST cmd2-2.1.2.tar.gz 660849 BLAKE2B a8c8db8036badc020b34e6d4cc62a6828a6f3788562d550826369d2ce6ddc41fdd29ab95bd56d35115a1e8c2cfdb6df97e3b25c3f414798aed9a597243b37967 SHA512 3f2edb336ec662e3b2e22abc947ffb669786142d29f0723b0d5bbf898ecff12096a91e08c4890dde79915b413c0f9a70945f1b5795ae12991e85d7ee79331d31
 DIST cmd2-2.2.0.tar.gz 667076 BLAKE2B babdf4034ea45cebce0a9b037e0bef0127c924e358c68ab6a2b95e73ed3be4577dead28d2eebce721432fefe7d2590a3e904ba84dc17bf7c06e3f777dc7b0db0 SHA512 20c204c5e5996e18face62066a179a9833c468724a947042a3b5aaf49940cad0c773ea22e7f40b8c721f7362dcefa9eb72072710072e608c4adab615332bdc22
-EBUILD cmd2-2.1.2.ebuild 1396 BLAKE2B f0db3323872e7458f585c77feca7f96c5e1493ed2ba9657886980d750fe8427310ddd7a5c108f22fc871059838d66bfb936834f524e7f10e5c2981d514822b00 SHA512 3bec60118673c4dd6d7a2390b0c95855bb4a613730417321e34a07d99f2754ced989ffc6cb7698485cfc7db9afc9a427a90d3167f0d36ea12d216e896a6bcaf4
-EBUILD cmd2-2.2.0.ebuild 1401 BLAKE2B 3c79e282225eb4c9624d802f3833194243f3dedcd49b1678ce707112e0d283e105b93ecc49b025d7713a7a7eddb12f404c23d58475977f2f063035ae913bb73f SHA512 809faecf21532bfee68d55a8f25079a41cd931d5992f43fd944f5dff8090d77555154052473b7add563876b07ad029bd57a3ef828ad8d9a3c31ee86debf8dbbb
+EBUILD cmd2-2.2.0.ebuild 1396 BLAKE2B 2a14076f2fb23f65fa8a50330df0c89c90aa33a9feb989f2782c6ec24a56556f28f7233ef0b682cdc9e4a3de1bb3d77fce380598d7cc1af9036aeea272457747 SHA512 e2c80c7bf92acff359ab6399154553d49de4314e5eb6714ec34dd7cb2657bc1c2902d0ac4dab269a9f5d087e0498ae2d51618fa8e4963c307b9c0ab3cd76f4c4
 MISC metadata.xml 522 BLAKE2B 39d319b6a64a7b54568a3fbd3d7db9adf7719b690a8f086018ce41f0595db157b1f7825ce28afb4fb0d748ca0d6dc21d79e480361b69b4bf29c0efc2d2540bba SHA512 57315c23dd64534085502e59f0b8ca01ef8088d5a2b16ed807631a1f36a523768960754b00619e802333552c405e2984e314d91003f7a624da6f1eb8e8e4b98a
diff --git a/dev-python/cmd2/cmd2-2.1.2.ebuild b/dev-python/cmd2/cmd2-2.1.2.ebuild
deleted file mode 100644
index 07dc1c91ef82..000000000000
--- a/dev-python/cmd2/cmd2-2.1.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel) + which(1).
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		sys-apps/which
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e '/--cov/d' setup.cfg || die
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-2.2.0.ebuild b/dev-python/cmd2/cmd2-2.2.0.ebuild
index c892c9da8cf5..6603d301f98e 100644
--- a/dev-python/cmd2/cmd2-2.2.0.ebuild
+++ b/dev-python/cmd2/cmd2-2.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/colorama/Manifest b/dev-python/colorama/Manifest
index 19c4098bfb0f..73534ddd62b3 100644
--- a/dev-python/colorama/Manifest
+++ b/dev-python/colorama/Manifest
@@ -1,5 +1,3 @@
-DIST colorama-0.4.3.github.tar.gz 107251 BLAKE2B e09e92171b6ea4b3db4801feaf794e9aeb4f2b3e57079907911cbb909167b192eb857f0b404fa45673bee3bc02c122326bd05091846755d7dbfd990a74c60a24 SHA512 ab41a2f95fe75de0b280c174c6166b86645e5cc675dcedf784fe15170aae630e831370527c9490342b77c7d088a023a48428a519b52ad1c70be58904742a94c8
 DIST colorama-0.4.4.github.tar.gz 109439 BLAKE2B cbf08d4bd26924e269fd8b2ae6f9c7ecec905907acb296ded52b6b9c473c1a3b88945563cf00d4ddbf01c5bbfc4244997da20b47051594ca86a632a33c29fed2 SHA512 35501915b79bfc5fe46a36f83790ecd79c82150d6b73a57cd55fbe6431ea5ed7a86676504af90147eeb3a963ffd16890e0220099df579a66f2d8f1f7494f862e
-EBUILD colorama-0.4.3-r1.ebuild 1134 BLAKE2B 333351fcc8695dbccc95324bcb8d3935c527dcb3186530f45a40b9956a36a9cc7e8069829719ce987b809784152926da629c56bed9c2c50e9fe9923ff823ce37 SHA512 083148d40fa69d9de121b28e03436d1e996b7e350af9c0899aad1fdf699afc33f307082d6eab72bd193b94f1148598cb33161ac99704b90bdf798ceabfdee9ba
 EBUILD colorama-0.4.4.ebuild 1135 BLAKE2B 7e76787927be5ba37dabb239d09088f7a2b980f9ffc60147a9ef690f6f34b16b3edd8e8ad8e74a982e89656f9021bf09177629611197b3c1fd02b63f924b7ada SHA512 da0e49ab585d58adc5ad0dfecacc7646921c7a15d83b32ea11d8d7f09c382c343a591c85aec1a7102c7e45336d179f162e2da19c8b109a8c0997da713500d77b
 MISC metadata.xml 526 BLAKE2B f8f74b3797df9f8b0ab5ea81b6318d099a041cc3aac741084802272fdc7aaffdabc1269025f5e2b819cfe4608391a0857d208c487cc8f018578610faaad9f401 SHA512 dee4a202781edd36049ee9738dc9e90ffa63aa3874b389b5d0285147fbf86a577c15d55a868c0714ef982f78a2054636f464d6609af0693639d2449ae3d2ea53
diff --git a/dev-python/colorama/colorama-0.4.3-r1.ebuild b/dev-python/colorama/colorama-0.4.3-r1.ebuild
deleted file mode 100644
index f5c3185c5f4f..000000000000
--- a/dev-python/colorama/colorama-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
-HOMEPAGE="
-	https://pypi.org/project/colorama/
-	https://github.com/tartley/colorama
-"
-# https://github.com/tartley/colorama/pull/183
-SRC_URI="https://github.com/tartley/${PN}/archive/${PV}.tar.gz -> ${P}.github.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r demos/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-python_test() {
-	# Some tests require stdout to be a TTY
-	# https://github.com/tartley/colorama/issues/169
-	script -eqc "pytest -vv -s" /dev/null \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
index db8e636ba46f..c93b382bbe07 100644
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@@ -1,6 +1,4 @@
 AUX coloredlogs-14.0-fix-install-prefix.patch 1474 BLAKE2B fbd2751c0a4f0f7a412428839b5bd8891b863f609d0c890887b85737d7cce9480ccbd2c4c6bb4e6e600b5ef850c065862ce7867b352f41e262022e21841cf1a1 SHA512 50063a6c14d1d4baf76d6409fc9776ec366500f7fa9b1b9e1270dac456b174b015b907f067c5641d4e74b75abc62ca4cdc641e55af88216101ddc4916198f1c5
-DIST coloredlogs-14.0.tar.gz 275863 BLAKE2B 0a8c026220955397378ad2b43a69c89c5710a09e2d9ed81a3f25408c60e171f4b8f78239696a0bc1b51fc3dd9bfca80df63e1f1d7afb6bee0046209a089e0d6d SHA512 3434a95f3216d19af5d7a48324e5afd5e975f92d9f6b99f40df2c0a635f1738e0bc6d7277a549a42a0fec5a8601f82908c4b0205ceeb3666f49210f66fe58671
 DIST coloredlogs-15.0.1.tar.gz 278520 BLAKE2B 446aea9adfc8a1ea7f2e5b4a0279d124a3e174feec4a6d9346059fa00fbcb2717d6480392051cc44f0c1f66e022cfc03238acae59b9496e9f70695d99143dfd6 SHA512 577af26af8d27bca3f10e6aaa257245aba608cc3832985ba57bcb2b590b10bf054796a2210749c15ee1b1a17623e007e4ac3ba17bed6af95544f85f5dfafaf21
-EBUILD coloredlogs-14.0.ebuild 1209 BLAKE2B 3b1feaa0e4e2652fe771c9de0f77f59c06f1197029cac5c3515ebed0107d6f16171dbf85dd1571bce56e04d553866dfc20e29ed28d2b3f75e47172acdfdc32a0 SHA512 e6e7d7ebc859c4cdbf1909cbe2b7d4a7048cd465e0d9baa05a06895319d5341f1a920074f95754ceba11cf824af39c07e7abea425363a151f009bdcbb0d33fa9
 EBUILD coloredlogs-15.0.1.ebuild 1164 BLAKE2B 0597a18a441241b9f8fef0958fa99e447103df74f5cc01b603710d35a5b9adc11916e61d476215ae54e9ed7ff20cd4aee0aeb71581058787853fa99c6a758bda SHA512 7980fc0120b203387e250c7e2bf4a41413d18cd11800f2e383a2e663f8a6aa7fe300694867148df6d794c8a3f302b71a9da4817df212d8ea6dc7eab0ef2a9871
 MISC metadata.xml 391 BLAKE2B 23995da8632cec6cc75466238f135357b63b28a1d1701f89ff0b565a9e2f7b2a2a78514627de45d2704b02e2f82f11e4b6894f4a6090c9c3d482de5b4036b577 SHA512 b52d94fabe4466b02a4e81dc773786000a8ca6189a7b928e52beb0dd291186cf4331d0ed4b139f0017e18b6ec48238fcf5104dccc5b4abe3aa7e70e60cc5830a
diff --git a/dev-python/coloredlogs/coloredlogs-14.0.ebuild b/dev-python/coloredlogs/coloredlogs-14.0.ebuild
deleted file mode 100644
index 10619bd8729a..000000000000
--- a/dev-python/coloredlogs/coloredlogs-14.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Colored stream handler for the logging module"
-HOMEPAGE="
-	https://pypi.org/project/coloredlogs/
-	https://github.com/xolox/python-coloredlogs
-	https://coloredlogs.readthedocs.io/en/latest/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/humanfriendly[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/verboselogs[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-install-prefix.patch" )
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_test() {
-	# test_cli_conversion requires the package to be installed
-	distutils_install_for_testing
-	# test_auto_install fails because the pth file isn't being loaded
-	pytest -vv ${PN}/tests.py \
-		--deselect ${PN}/tests.py::ColoredLogsTestCase::test_auto_install \
-		|| die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/colorspacious/Manifest b/dev-python/colorspacious/Manifest
index 4224463e0d7d..1ecf95ddb733 100644
--- a/dev-python/colorspacious/Manifest
+++ b/dev-python/colorspacious/Manifest
@@ -1,3 +1,3 @@
 DIST colorspacious-1.1.2.tar.gz 688573 BLAKE2B 85b4c24a0d0ce42817060be9dfeaa00f1775f656590cc76fd5c0ce0f929b165cd1239b33a54d7d5a4969ecf7240c3b9c3fdf067ab8282052768f4f8ad6f04a02 SHA512 a5c212c82f4a8eb1561f3ff86effeb0c1edb80fca3657dc62336c56de3c8810c44288022223a6089f9eb2cad8d3bcd9c8222014c106b8915c0c6d8b7df0c353a
-EBUILD colorspacious-1.1.2.ebuild 599 BLAKE2B 53fcdcafc9ad2bb1ec64e02d9dc77e1a97382c257ebf6bbb755f29eb3be9b5691a6b60511868053da6f1c1da51c3084e288414ccd246b15e074864e578c3303d SHA512 215c557f71338b71564c1b8bdea2c3967196a04da5a0e1b751c6bbd3094e4342ab528645fa0a3ccc2b3b0ecd17324b63c3c90b379cdcd8b228d7e6e1f14a5a70
-MISC metadata.xml 378 BLAKE2B 9afb9c768c434c54483b963231c2547304ce3252938828cf61d7040b6d6ce70248be760d4a763a907599ad7862d664545fe4f3c6fb2d93ad35fb8cd2f658efed SHA512 a26797e1ee29eaf7eeff91652e7d7b2829ae88163ce4f46270a2e30e04915ba76e4b9373e489b4325d72a31b56dc31088636f22985673ff0e6ba9b6bc149af05
+EBUILD colorspacious-1.1.2.ebuild 599 BLAKE2B f0a493692e10c6fa61fb357d35332ec8873e292725c953a4f4b024e5c44b49c0d565a1b9b6b9c285f0d3ee2bdedcb0416271498555e58ada2bf51d80aeae6dd4 SHA512 8729b60c952973851c260c04bdd53b66353e284028be3ba048f47c47c455deaf14ea59593f596b85537c469a5d091ae84a8aed24899d17eec3f1d950724617fd
+MISC metadata.xml 402 BLAKE2B 2fcc2d890c84f7e30a10fe48dbd5c8d6f8551778d21da6fdc98caf9c67f7bb159504434204718efe0114721a9b339dfed2d0bacf2a675e3eb40c9c916afe2be2 SHA512 329b66127b7b5dd9beccc28b3c098cb9b91742e196557a08ed0f84400aa440115a6f56f67880bca6fb54c893ecabb678b8ae6edfb777395bf31b0033e937ccb1
diff --git a/dev-python/colorspacious/colorspacious-1.1.2.ebuild b/dev-python/colorspacious/colorspacious-1.1.2.ebuild
index 75be81492075..e33f148649c1 100644
--- a/dev-python/colorspacious/colorspacious-1.1.2.ebuild
+++ b/dev-python/colorspacious/colorspacious-1.1.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Powerful, accurate, and easy-to-use Python library for colorspace conversions"
@@ -13,8 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
 
 distutils_enable_tests nose
 
diff --git a/dev-python/colorspacious/metadata.xml b/dev-python/colorspacious/metadata.xml
index 7a4db24d08af..11970e18817f 100644
--- a/dev-python/colorspacious/metadata.xml
+++ b/dev-python/colorspacious/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">colorspacious</remote-id>
 		<remote-id type="github">njsmith/colorspacious</remote-id>
diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
index e7fc43eee167..ef370d47e5e7 100644
--- a/dev-python/configshell-fb/Manifest
+++ b/dev-python/configshell-fb/Manifest
@@ -1,3 +1,5 @@
 DIST configshell-fb-1.1.28.tar.gz 55076 BLAKE2B 8f7ab1b6172412dffd77d1ba89082f815b90167b5bc7e15c26c26a101e2e8a0ab5bc716c040f41124a9d5a5038b751e4cd882124d70fe2fda2b796ef43dc97c8 SHA512 7d05fdfca5646ec05d5f4b2ea499235237f5f3157c1330ed46dcc76ce8dea5cca0e3ec4d4376db2ec8358438737fb54286cb0c712c0f16637128670d2858dd4d
-EBUILD configshell-fb-1.1.28.ebuild 512 BLAKE2B 4112a432bad38003c2b99bc80b507d9d46e500d6b73ba8a07bbb06428e92c43830a2970cc560aae4c1c4b55731174e597441f39c1046a8b3efd24e6bf97b435b SHA512 3782c0a69974caf37b7987f190c1151ddc0169785c6627185ae9e57d77707d23cac0fc4561633f28858283902d437a40f01bfac2af65394aead89335f7b788bf
+DIST configshell-fb-1.1.29.tar.gz 55036 BLAKE2B 4a9a8f2573b43a9c8ddbda837e831c96b221f4499acb1aeeb990a7b1050c5572e9b745857ac9d1de4089d1758dd1284d0555da524def80e0a1caac18bb43a921 SHA512 0d7663cf58431c8b0be5618e5ef454838489e11a3074e5bd63145c3ea965065e37f1a41b5775363a35498a4d5dd86ad5453feb58dd74853cd77ae196b44c658e
+EBUILD configshell-fb-1.1.28.ebuild 514 BLAKE2B c1012e0ee01c6f920b7dc1171d6fa33b1bca89a1d1ff7380194c66be21391d74d1852a7ff52bd431387c395360115d3fcd61622d5298dc0fe9c0f13e7c3c7155 SHA512 8a6d569d9a036fe99e83e461c42b504f45d0907498d1a6974cfff223d0e658bb4d8ff38a36cfec0d04d985724647bb8eeaae3aae3d5b0d681a103dbc5e6ceb43
+EBUILD configshell-fb-1.1.29.ebuild 516 BLAKE2B 18a92ba1b3b172bd892b346aa692478c98511affa8b3f53679217d896025e466bfaf60c893ee0b129d98475c86442c880c4f1de19b492bdc0fc48e2ba237d824 SHA512 b366f8e5a90fea1bdfa6cfb43bfb9769d8962585baf481f752c232154890bbcf794fbd4e71256ef78a5db9593a9b3e52c2cbb38529aaec76189bbc1cad027a47
 MISC metadata.xml 991 BLAKE2B f14b670e9e96acecbd6d1f7d6682c162442816b89b6c7126cebe54af2da0e5ad48d2ed28cff7adc4c7de27c492759a8378f7c0ea44f26e710345252d35f510a1 SHA512 7fc6cc05e7e62e1c20a8ef43d42efc57ae52592b0a51b77e278cb158b6388d10a213fe36dd76ccbacd686be7f014bcc0b17df0d41b3d16e96afa60e07f8da99c
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.28.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.28.ebuild
index 052c55f212a0..3cf06559f03a 100644
--- a/dev-python/configshell-fb/configshell-fb-1.1.28.ebuild
+++ b/dev-python/configshell-fb/configshell-fb-1.1.28.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A Python library for building configuration shells"
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.29.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.29.ebuild
new file mode 100644
index 000000000000..378a56f89e46
--- /dev/null
+++ b/dev-python/configshell-fb/configshell-fb-1.1.29.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python library for building configuration shells"
+HOMEPAGE="https://github.com/open-iscsi/configshell-fb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]"
diff --git a/dev-python/confuse/Manifest b/dev-python/confuse/Manifest
index 33c74ec5f4bd..61a1c7615a4c 100644
--- a/dev-python/confuse/Manifest
+++ b/dev-python/confuse/Manifest
@@ -1,9 +1,3 @@
-DIST confuse-1.0.0.tar.gz 34790 BLAKE2B efa23f59e6d450160af279042ed3d77b3b26bd1fe2fffd90b0ce1c87821b5540048b45644bfff1a8420007cf2a705d388965daa20034bb8f846085dd92b49186 SHA512 f436a400b9b84db1a20409c70d64fdde44903ffba6c3618917fd297e04ecf3dda806e315972f7cf1f786c93639b10b0652a622a579a2cfa47703386a43433c8d
-DIST confuse-1.4.0.tar.gz 36020 BLAKE2B a11becf564c84177f919b4c6936dc9452a2821d9dec190167d8eefc141c424323a2cf1934e608028ac07c7290eb4e139a9051904b13fc4ea00594185db10ec2c SHA512 4a06568f3369d08f177e9f639f59511c565961b15b6a8bc3a7fd244396b47c19c163aa05abab96cce5078b962a98763fc0c5739ff8bbd98a5976696ad6240c2d
-DIST confuse-1.5.0.tar.gz 44193 BLAKE2B 8af065c061c786cf1389a81e10263fe999523e038e41e4403f49a1eeb5ba138c76da745a9be3290f7b8e82d6ec88d18920904c979b5be5dcb4a0bb02f32387c7 SHA512 aed651c7980b0df75f211d9a498b56473c3d23b316569bfafc3008aebb77f86de38912e41a2c073c99c752bfd46092e7ea06ff31281fb79ed3c20c59f5dbcc9c
 DIST confuse-1.6.0.tar.gz 44438 BLAKE2B 0a528cfa2a83cb8ffc47017d61571770a9486585308f5e42531ba1f6356f76b385517a4f3319d3365cd5df41ca49578559fb1ba47edd936d6114fc00a816c736 SHA512 e756771dd93987f9c4ba900a2d95b5d87e99b97789810f2f70aec1fe68a919bd11aff815ca0967b8073ad034ed9b927e55599f5fac590822a7897161869da89b
-EBUILD confuse-1.0.0.ebuild 947 BLAKE2B 7646728aa4896f5b02de27f5e306d7b6abf7a3ad2e498b2873bcaea4bf38aa990da5bd0af75fcc30a56c13502c22fffe95f3adbdd07b72ede9986073274c1e30 SHA512 2dd66790b600af49ceb0c817f305cd57cb31b940fe9ace76abb0665336444f3e7d7eae7162f2db3166a26483ec0199d7aea633a8d798c5b3879c0546452b3bd2
-EBUILD confuse-1.4.0.ebuild 710 BLAKE2B ebab635705b36a72e14154e960ce881be1a3a080c9e694d4a4dcc52ac052c0dfe4588b205f4d4d17c9d21ecc0d48f5899ebba0cb918ba8513e38835b5cdb5647 SHA512 7d89f06d6b4a2890860dc2b8856ef49c137b320afad37694b4a058928a15385a2473ad2fa362547afc2130fd95fde77d3876bbab2591f484a6db9e193a5782c8
-EBUILD confuse-1.5.0.ebuild 608 BLAKE2B efb45b6e5c7f865a575c707039c4e72932f73cc0bf964108132e173bda172eaddf1da7c2a453d00e8fa8d8d116a52441df0b516fdd06fabc894e467c76921719 SHA512 eeea394d705dd8eef002f7eee19dad1e022cac25f68eac4db8e511580234ac8610f2a49a922830b14c2e27e7dbef635dbf86bfda4642e4d959893490e6468ec7
 EBUILD confuse-1.6.0.ebuild 608 BLAKE2B efb45b6e5c7f865a575c707039c4e72932f73cc0bf964108132e173bda172eaddf1da7c2a453d00e8fa8d8d116a52441df0b516fdd06fabc894e467c76921719 SHA512 eeea394d705dd8eef002f7eee19dad1e022cac25f68eac4db8e511580234ac8610f2a49a922830b14c2e27e7dbef635dbf86bfda4642e4d959893490e6468ec7
 MISC metadata.xml 878 BLAKE2B 2c3a52104c43764bd91ab68c7706013373ab30fa0fdb447bd5401f986ac242b1935268ced5fb70657d44ae2539758b81f8956eddcb0656c7dee70be292e240f8 SHA512 64f959d0ce18e4fb412f482712101117f8f824f333c0befce184e736b52897dd105a0d9d71d65eea57bb21d724e2b69661f9efcaffa36536c61d9c6ae2d2a522
diff --git a/dev-python/confuse/confuse-1.0.0.ebuild b/dev-python/confuse/confuse-1.0.0.ebuild
deleted file mode 100644
index 841b45c1474d..000000000000
--- a/dev-python/confuse/confuse-1.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Confuse is a configuration library for Python that uses YAML"
-HOMEPAGE="https://github.com/beetbox/confuse"
-SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		rm -r docs/_build/html/_sources || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	nosetests -v || die "Tests failed"
-	if use doc; then
-		sphinx-build -W -q -b html docs __doctest || die "Doc tests failed"
-	fi
-}
diff --git a/dev-python/confuse/confuse-1.4.0.ebuild b/dev-python/confuse/confuse-1.4.0.ebuild
deleted file mode 100644
index 8bb6290f833a..000000000000
--- a/dev-python/confuse/confuse-1.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Confuse is a configuration library for Python that uses YAML"
-HOMEPAGE="https://github.com/beetbox/confuse"
-SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/pyproject2setuppy[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests nose
-distutils_enable_sphinx docs \
-	'dev-python/sphinx_rtd_theme'
diff --git a/dev-python/confuse/confuse-1.5.0.ebuild b/dev-python/confuse/confuse-1.5.0.ebuild
deleted file mode 100644
index b55f3d873523..000000000000
--- a/dev-python/confuse/confuse-1.5.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Confuse is a configuration library for Python that uses YAML"
-HOMEPAGE="https://github.com/beetbox/confuse"
-SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs \
-	'dev-python/sphinx_rtd_theme'
diff --git a/dev-python/cov-core/Manifest b/dev-python/cov-core/Manifest
index ead5923ad6ef..2689034de1ef 100644
--- a/dev-python/cov-core/Manifest
+++ b/dev-python/cov-core/Manifest
@@ -1,3 +1,4 @@
 DIST cov-core-1.15.0.tar.gz 5890 BLAKE2B bddab94ae47ba19ecdee5aae0198d9086a423673362ac64f0885f773bd8b8ab3f4d6abf1203ee901e272161dfb4b64168f2aa5f2d0f4426ea279d6d7251e921e SHA512 1b962a6a7253c1f6530248f3a71058e7709ee5cca274166807f040163c9cc240e9e85e42820063476c1c0f6dfca81d45277738663ed818fe715b30db151ace16
 EBUILD cov-core-1.15.0-r2.ebuild 528 BLAKE2B e33315012368b053d1dbbeb4bcb4836af4e710afbb169e4bdd5914827e7871e7fe2b7d0836fc0c240d06bc8161861fd86b4313c601f5fbb56e5f3e65723eb697 SHA512 aced872a03cddb1e057e0238a3b0c986457295cee78ef552c1b65fea5f17adbcac19e0904d775d8c2b881db5f2057b6d68171a3193ae0eb747a31dfe0e65744b
+EBUILD cov-core-1.15.0-r3.ebuild 770 BLAKE2B a0d006aa5d535506b6312eba3e42b8ae4dd8e69093d3dc2fc2402c535ec6ac954d78ae2fedb75335ab0c8fd0541fc847face5a9c5b015a762bd6b52d523acbb6 SHA512 6dfa7103fb8af3c79c807c92d1ad8d8dbfa6ae0a5a6346bc0d0fc78e0dd47941268cf397a1d56328638101751449421dcfb23c7b52e8882d72c0a31ffc636965
 MISC metadata.xml 390 BLAKE2B aab827988dd06e159c90e046b5512e3f8c0e5a2fc4ebc151753d6275bcb61f152a27dd77140bca513a45dd99292faf177c57d84bd414fde2cabcbc42d00ce8f3 SHA512 e323cc6408f939b8f49d2ad24f56b96dcf08c01a27cf6aa8e636fe913aa7adfd38de727ea337a1c9498062afb6f5c8d1a5f4cd2d78aec41d14ccb167b8ad41db
diff --git a/dev-python/cov-core/cov-core-1.15.0-r3.ebuild b/dev-python/cov-core/cov-core-1.15.0-r3.ebuild
new file mode 100644
index 000000000000..932a3334d2b7
--- /dev/null
+++ b/dev-python/cov-core/cov-core-1.15.0-r3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="plugin core for use by pytest-cov, nose-cov and nose2-cov"
+HOMEPAGE="https://github.com/schlamar/cov-core"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/coverage-3.6[${PYTHON_USEDEP}]"
+
+python_install() {
+	[[ ${EPYTHON} == pypy* ]] && addpredict "$(python_get_sitedir)/init_cov_core.pth"
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index ae6bc0200bbe..952b497da53d 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,7 +1,9 @@
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
 DIST coverage-5.5.tar.gz 691258 BLAKE2B 66bf340956b760d996ce424f977b407eb74062db56108e4910459dbcb7c271820ca655a648021763aede1c4d87c44524cea0cb34f969f203f630d48cf15b05b4 SHA512 fb78b4920a2f18afb9545a6f13910f491708443965881954fff6ee8553ab3d6bd898f7a95df1091435e8d5627ac850b880a6233e716a6acb934ecc195ec2ee52
+DIST coverage-6.0.2.tar.gz 722511 BLAKE2B 43a860610921fd0df106cbe26ba094e5a11bf1137a795a15bc22d82d0f813e8dc67bfe660757d325f15f719429b480ca625ebe66569489ed8c4c477bac23c393 SHA512 a43a312d4668846b6f72eebac1a289d0a603303cd32624c3308cce8934f693c7d3786b36da5cea3ff1cce60f93110a2ded168304e1ca9a79053f0886b7f1bf17
 DIST coverage-6.0.tar.gz 719495 BLAKE2B fa2768cc34f5c8e5e1b0bd328dda4b83bccae4bcb37b1e2ea8ff9a7fad973239a264f12cea7fae7ed129abe1a7aa86b43e2e32fcfd5c4de2077c8b32f405cd3a SHA512 b9a5dcb2aeb8517a9a52feadfd817727086d88682d9d93d65d9f4d7b6116d8eca1ecceaccc98ff34ca2fb1c2d4dc457d0d58d387465e67970ae4df0f4c9f7ca5
 EBUILD coverage-4.5.4.ebuild 696 BLAKE2B 978145cf86643bcc100bafa81376905733e2da2dc18b049c2113ca157fce6ee9598bfe702ab3a971e625c9e808a49a8deb2975423caab242cb67226342b502f5 SHA512 4aa40ca9b749700ddfae1eb9ed2ab06bf6e2a342d1e54e4cd191caec4d6b25465399fe693d46e7cfef70a27855335e9e02039342a3357344408c663e52dcd463
 EBUILD coverage-5.5.ebuild 1666 BLAKE2B 9d962060ebbfa2d75379d57eeec9add4f3dce4114ecadb794e84dcdb5d4d1bacae224499227199c04a9b3e1b58546ddcae726530294e372ce2e035dd60d4be2b SHA512 f2c4486de9babb1c790acb03ab0524178c0d445351229a642636bb73cd076c14c442fe385a9f6e20a1a4612dc8b58a30938d371bca2253e37dc9d3b5f7ed2de5
+EBUILD coverage-6.0.2.ebuild 1546 BLAKE2B a7616b00526d16b067ed71ea359797b0add0ee8f6a03558a24a422e0f1f4921832c232d20e89d2995aa0b376e010e7176d377162ffb6a72dca91bae6fd2ea3cb SHA512 a8e3fb4b74d439de1ed25db29436d6432f1b7f1f6efc2bc45f890802965bb2802d1450b41795bc19ed5379b6a679a36bae6541fd77110953f1473543e473f440
 EBUILD coverage-6.0.ebuild 1640 BLAKE2B 9d2eb578bda59aef10ad601a4ed098d0d60f79150c3bb26b2d868eade8cbfbf5638c29a1132ea3c204c9a6951ea553106ae6f6aaaeaf33fef4bec4c3aaee8498 SHA512 3c8fc5ab72b7bd11c4cf9f80aa805f9b350c05d2e3993ad6979dfcac8bc17637afc5550037258bbbdc19aa4ebcf1a4b0f86b5489728fa1c365996f7ce63219b9
 MISC metadata.xml 714 BLAKE2B c0d2641f795a21a80b6fa36206973f41421effe055e4c5e41bf752869759eb48e8fe42a0ab00af55b5d5111bfaccd330676d63e263013dc9bd3c344cb038a3a6 SHA512 412d70b7c9c2871bb93ae6ed6ae110a9f29c26957f6e1b24cc531c7d49f292ecb5206df10b409f2e44d2f814b119ef4ed973bca608df999026bda8df2156df24
diff --git a/dev-python/coverage/coverage-6.0.2.ebuild b/dev-python/coverage/coverage-6.0.2.ebuild
new file mode 100644
index 000000000000..4581809c8ea8
--- /dev/null
+++ b/dev-python/coverage/coverage-6.0.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+#IUSE="test"
+# The tests are impossible to appease.  Please run them externally
+# via tox.  Or fix the ebuild if you have hours of time to spend
+# on something utterly useless.
+RESTRICT="test"
+
+#BDEPEND="
+#	test? (
+#		dev-python/PyContracts[${PYTHON_USEDEP}]
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/hypothesis[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+#	)
+#"
+
+src_prepare() {
+	# avoid the dep on xdist, run tests verbosely
+	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	"${EPYTHON}" igor.py zip_mods || die
+	"${EPYTHON}" igor.py test_with_tracer py || die
+
+	# No C extensions under pypy
+	if [[ ${EPYTHON} != pypy* ]]; then
+		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
+		"${EPYTHON}" igor.py test_with_tracer c || die
+	fi
+
+	# clean up leftover "egg1" directory
+	rm -rf build/lib/egg1 || die
+}
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 511a993efb65..951fbb861aa5 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,3 +1,3 @@
 DIST croniter-1.0.15.tar.gz 39164 BLAKE2B daf40bcc7c791dd2a65d2cd132c380dff03353ab6d7920adddff2b1b6a87166050be6ed2b7bac5eb2b9543dcab9a4f2f65738506dc35eff0836cc591e486f885 SHA512 5aebc8a60d278acae3cef7eee6ee0ec223e44ae01b69dae601f76cb14f135547557b1417498d71a84e187dd478605efdf15355f8ad0344e459b6b40d41e994af
-EBUILD croniter-1.0.15.ebuild 611 BLAKE2B 6c31b21fb62dffe4ac035fb644bab20a22c8bf9bc582a818bb43e9a4bb4e870f148138741c11200c354e0869362f8a0b48f0090be04fd4c55d4af4f48c77c94c SHA512 1091b4d2cfccb52c6fe7d1b0e98f744a7ceec8da95e4ec83a0c54ee73117fe57c81b7b6c6d25eb07f3f60ebce23386f061553f4dbf23dd6ebd31b271227b01b3
+EBUILD croniter-1.0.15.ebuild 618 BLAKE2B 629133d99a8f8a7d1f81413651df1a0bc05693736d00da288e6e5de53db0f3ea810eace4633ddbb19d3203116cf77f7737db41d5f5367bab45ec76d2efd1713b SHA512 f4384a9490da5713f2f9aeb8f4bae7832fe52651a6297751469dcff3971f4ea8398d64efe0c5c0d3598159e9be9639047cd19d02029b615502c04564078f788f
 MISC metadata.xml 470 BLAKE2B ee6bfe88287fe27cb8bb33258f6fbb3275daf8294a834e899975e27c34d9103e21dcdef3f43b5df3a9a9e5d741f971d0117ad6e4410c1117306d9b913c8f2bc6 SHA512 e2167dfde1b79b2ec613ad671868a7ad28e64705515534b7911d2bc1f2cfeb6e68e14b1d93e6e29ab2f60c2b49b60454d4b6d9bba2f7bcf9cc3f3a20424fe3a7
diff --git a/dev-python/croniter/croniter-1.0.15.ebuild b/dev-python/croniter/croniter-1.0.15.ebuild
index 277378fe8a2c..88495d75c464 100644
--- a/dev-python/croniter/croniter-1.0.15.ebuild
+++ b/dev-python/croniter/croniter-1.0.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]"
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index 67480a1d353a..2c243f1b6731 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1,6 +1,4 @@
 AUX css-parser-1.0.6-fix-py3.10-test.patch 5335 BLAKE2B c99d96c6fde03b0676521f1586ad60ad8c32f82b27c7fb99054edcff7f61b5450f12600d383c2d5d808643853ba8cfaf9a10eb54677de682d93273f6970eb557 SHA512 6d33f69edd1ef2c8b694e9b8bc34b1dc61be242eb32bbb15006529c6ec7ee9ee8e15566f002ef405d872174df65256dd609d2dbb63f7fbf7d9651fc32c559e11
-DIST css-parser-1.0.4.tar.gz 143977 BLAKE2B 94a42d751a90d306b0dd2d503d8d9c326509b438d1f52b5567e6f6db7d80e7a6d2c37cbfa0db79225cc4d0fd5df612b3e430fa1c62604a2f8990d20678019af0 SHA512 3781128e55c1e72aa00369873e214f683e3f42944ae83d399697adb7d2966f68fb500c39982845ce9cd06078e4021838d82b06f99d90938069371da8a89a0857
 DIST css-parser-1.0.6.tar.gz 336932 BLAKE2B 00cfc4597137c0aa6af3cc8a72fa3e59a1d7b83210668c8421c0703a4a38d05d73f691ff00ffac14025f021a10f85c1d3697778794d23f75db381f5e63e24b7d SHA512 4c623541e1145c91458e7e2028f6a0de652ae2189dc99672fc72f098799d6349edb051bafc0901258481fa3422346303d2ef634392889ee83a29814609cdbd43
-EBUILD css-parser-1.0.4-r1.ebuild 524 BLAKE2B 0871f3d91c624396f30c2521f1ebf02b38fdd9cfab111fad7a876203dbb2f653a9a978f895db359638c7c876e54b8cf70ca62b9d3e34bd186473d2d56b307915 SHA512 ebfb09a3e2d1a4ee2ab8c8c89d2748ad2cd6cb0420c66ddd9e52498781dedf04a5fb61e50e61fff4870d526abaf3009a8130a1f8b1844127e73abeba911c3212
 EBUILD css-parser-1.0.6.ebuild 581 BLAKE2B 110b0ec57e41ede13eef4121da87b9da77b6fd81ca24101ce7604e2d6cd49761a12d596d3a9347a8c659cc4e6f123f6eb26fe0cad45a2c83cfe0554c134665f7 SHA512 d0f585a34ca32d87f4ca166ab06117f876a309e3fb778af57b532722171e4fba1b67031999bfe7fc97226d3964002a7bbe958313a6bc584ca743ae184e370e20
 MISC metadata.xml 378 BLAKE2B 98b17d2e233da83a1f964ca518cac781516b4d426a5cd5e631ea53380fea5ee475b2006c436d8055e471be4a658331d5684a01fd166622641e1b220aba558c3b SHA512 079129be079c49c024a0b3284a1df898bb2d687e1a65727943318e2c3d59f0e816e3298e8e5bc77f9c9e28617ec0674258c70777f1f9c91936aa6dc8d63cfc7b
diff --git a/dev-python/css-parser/css-parser-1.0.4-r1.ebuild b/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
deleted file mode 100644
index c3ab77e55761..000000000000
--- a/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A CSS Cascading Style Sheets library (fork of cssutils)"
-HOMEPAGE="https://pypi.org/project/css-parser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-# Tests fail under network-sandbox.
-RESTRICT+=" test"
-
-python_test() {
-	esetup.py test || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/csvkit/Manifest b/dev-python/csvkit/Manifest
index 5e0b51bc4539..0812fdb40d06 100644
--- a/dev-python/csvkit/Manifest
+++ b/dev-python/csvkit/Manifest
@@ -1,3 +1,3 @@
 DIST csvkit-1.0.6.tar.gz 3784737 BLAKE2B b1e4583443cbfc62f713d3b311bbe313cf4e69b7aa5aa13dc6970375a727a804ba1dbd176b25487027d3bc1a5696f2ce649a460c91ef7c5591c33bb3c6f48c33 SHA512 fb37404405f2f2c0bf803a1df8186aa9e3b11cbf3c4f6e1fe6dc06d53730aa91d462bebcca3917e9a451f1d81df053abd9ceedfaab085ab696f9ba701c873323
-EBUILD csvkit-1.0.6.ebuild 1153 BLAKE2B 951ff2c6dab84db28cf53e5edc0eb7aa761cc965ee9f8a33a64e1ef372d319b2695d4a00ed8db58efb6906b73b1ed8b0f67938683445c5d03ddaeb398c33eb32 SHA512 141018bad52fd5388f515b58e00ab65260e5ba1305525a87e6f400d5c2b00f16e92ae8cda513996792e01ca08e47c0dff8805587691b7a8cd6abd161b8b81aab
+EBUILD csvkit-1.0.6-r1.ebuild 868 BLAKE2B 7063c49525cfd4bdc77377369a08e0d3135dc430df268ff760e51d2fdcba327b8f5230b7390fba571accfba9df109ea45b3cfb874af122de1632591eaeb97329 SHA512 03b82626ab241655a145e6fc5e84595c014520a321cc40dff83437ab9c328b04a13b212fc876d88df3a35e9356a89d4d7b5a3777dec145e4cfe5d4fe104035a3
 MISC metadata.xml 525 BLAKE2B 48931d7544ae9f2ded2274bd07764b352aefb1c89f3e8ea76230b002f8e91b12c9edb489bc960cdc8e883282de5d84f3fd73f38f6d3aab31ccb2648704de64a4 SHA512 f13fed558933dbdffcf2143d0bf23a1301d3511f2a4a989a83122e02e51c2e08a76b85734cfe6e2b0d67f439ce5133afffed4ab8a30491bce3ccce5beb6463a6
diff --git a/dev-python/csvkit/csvkit-1.0.6-r1.ebuild b/dev-python/csvkit/csvkit-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..9c13bf83576a
--- /dev/null
+++ b/dev-python/csvkit/csvkit-1.0.6-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A suite of utilities for converting to and working with CSV."
+HOMEPAGE="https://github.com/wireservice/csvkit https://pypi.org/project/csvkit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/agate-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/agate-excel-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/agate-dbf-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/agate-sql-0.5.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/test_utilities/test_in2csv.py::TestIn2CSV::test_convert_dbf
+)
diff --git a/dev-python/csvkit/csvkit-1.0.6.ebuild b/dev-python/csvkit/csvkit-1.0.6.ebuild
deleted file mode 100644
index 899bb8fae0d8..000000000000
--- a/dev-python/csvkit/csvkit-1.0.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A suite of utilities for converting to and working with CSV."
-HOMEPAGE="https://github.com/wireservice/csvkit https://pypi.org/project/csvkit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+xml"
-
-# Other packages have BDEPEND="test? ( dev-python/csvkit[xml] )"
-AGATE_VERSION_DEP=">=dev-python/agate-1.6.1"
-TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-RDEPEND="
-	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
-	>=dev-python/agate-excel-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/agate-dbf-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/agate-sql-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-
-	${TEST_AGAINST_RDEPEND}
-"
-BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		tests/test_utilities/test_in2csv.py::TestIn2CSV::test_convert_dbf
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index a66bc693e82f..84af17d10e91 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,7 +1,9 @@
+DIST curtsies-0.3.10.tar.gz 53340 BLAKE2B 376258a71c1e89b241c2fb9439b7f094b72cdc19f50c075debfba019effed5b3b5286603b44f11e37420d4e0be0dce0cb69fc6e11dab332c6f1c109c1b7a098a SHA512 59dfae36a43f7cdb272f94900da81bc7a1033a6482df5ac5babb329659e16d740f98b9538146f2fe7c79aa2723ec3db10c8ec658539db7d462b02953a33cb4ca
 DIST curtsies-0.3.5.tar.gz 53472 BLAKE2B 7ff50b8cf4b1b5016f15eee00333a1de38a31d97444f6462c7ec0429a1656bad442126880f770bff575dde8456660169cfadf63fed804b2c7890d700d792cc87 SHA512 e46ab3f79e2385055e4f3f9bc1d2c341605b93c21a0e6c42f4807b1801d37f70cfbdd1006db1ec12257e95d91aedddd95aa31a7de99bbfc09a6f0ee473497747
 DIST curtsies-0.3.6.tar.gz 53259 BLAKE2B 358e4d7a3ad8e5f705041cf8fdab9a26f0829d57dac93d23d1a524cb5bf2ca784aff9ea17d0e1c73ef4112f2b5b826f80d4c8d300ecd4ed53b031b3e81c78052 SHA512 3ba7050a614c992c6117e61758e378c82467f413f507277ddb78e42c03dbefe34c4fc4a60b29a8f8b24e8141b0521c87df81421fce5c7c64c28f6156b5af8207
 DIST curtsies-0.3.7.tar.gz 52487 BLAKE2B b5fdae3a2bc3900aa4221a39244fe3c781e004d378952af82c6275cb23fa53830f7f54ce5430287c8a5131ca220fb4aa7cddf33a4b913b27de35f1e275578b23 SHA512 a3c197a49c85f644fce3507380f6c77b857e2e97141634178b5d7c6b7673e90407fce68550c329dd4267e69e10fda3133522baadd765269b61e3f9fb800b7193
 DIST curtsies-0.3.9.tar.gz 53319 BLAKE2B 91bfb46ba9eb36f76df7a1fea0c0b1a3d7ec38ecabc015624b93b66b8e0c3dc7c9ee757caf591e77258ab46712c2998427bdc5a6749272bfac6c597e9bdb09b8 SHA512 7f0eb56b37db3c9586a95aa9981cc3f21a99f7317d2484d71618d2ed8302ee1e3a6bf931518034e690cff63b2f38c54cc5d2b5baed7036c588279720d3b96a4d
+EBUILD curtsies-0.3.10.ebuild 593 BLAKE2B f1292a6e9b8cf4579a18392c8866ca2f8b046b56589559ebebd99ce81a0a3a995e67a8372fd08c1a9b22d66c939056557f7dca351e47c83925515ca6298428c0 SHA512 a3c8cfb7c8232f13cfc0b8d649bc27a441f927329ef19f45d9c3075c3c82bd457096dff63262f12e3ae199a2090509f94ca7e199dae7f468deef0dd10fb6527f
 EBUILD curtsies-0.3.5.ebuild 592 BLAKE2B e32fd9a8bc11511b0056655bd5ac531ffd4ce8fc14cda8e784689c78c685b1faa3b4ebae4a0eaa913f8777516aadf5f094233e2760b8aa23afb6cbf60fdb60aa SHA512 a01cc46b45aad273aa6daf5d455e11ec8e5c9b004045d3e6e42408d1d3fc1beec7b8329a83a19b4bc2fe909ba0dbe14fe450e11354392c5808464126acd389be
 EBUILD curtsies-0.3.6.ebuild 593 BLAKE2B f1292a6e9b8cf4579a18392c8866ca2f8b046b56589559ebebd99ce81a0a3a995e67a8372fd08c1a9b22d66c939056557f7dca351e47c83925515ca6298428c0 SHA512 a3c8cfb7c8232f13cfc0b8d649bc27a441f927329ef19f45d9c3075c3c82bd457096dff63262f12e3ae199a2090509f94ca7e199dae7f468deef0dd10fb6527f
 EBUILD curtsies-0.3.7.ebuild 593 BLAKE2B f1292a6e9b8cf4579a18392c8866ca2f8b046b56589559ebebd99ce81a0a3a995e67a8372fd08c1a9b22d66c939056557f7dca351e47c83925515ca6298428c0 SHA512 a3c8cfb7c8232f13cfc0b8d649bc27a441f927329ef19f45d9c3075c3c82bd457096dff63262f12e3ae199a2090509f94ca7e199dae7f468deef0dd10fb6527f
diff --git a/dev-python/curtsies/curtsies-0.3.10.ebuild b/dev-python/curtsies/curtsies-0.3.10.ebuild
new file mode 100644
index 000000000000..c29551cdcc4a
--- /dev/null
+++ b/dev-python/curtsies/curtsies-0.3.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Curses-like terminal wrapper, with colored strings"
+HOMEPAGE="https://github.com/bpython/curtsies"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
+	dev-python/cwcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyte[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index 2de78f075237..0335a3b31a2d 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,7 +1,3 @@
-DIST cvxopt-1.2.5.tar.gz 6742389 BLAKE2B 32e872d13624250610e7eecf2a5755b7b2adbf98dd9b7d1b0d6e236d62677fcdef7c08a2365d7b511f755a38b34a29ff78b280fb7e92ec6256a71c63e022e003 SHA512 d21d9977941140e76d1619a1239fab5d93a3467c4cbeacca2003168c96e1bbec9698563dba07107f6e0a84a0af92124d5c868af599bd049b64f47a3cd3753afc
-DIST cvxopt-1.2.6.tar.gz 4114036 BLAKE2B d7516c06c00907a42bbcfa99611febd87fa8480ddb812b7abc0a3b6c5a642c87756fa36d6434b4933797a03d4d94bb2838341da6f00143b9f058710e8f625447 SHA512 7b1c092d970e726b262bb5b07d9c8ca6a7081902707a812a6b196e7cb76523bd67b346024b96087622d39d564f4f095485d4f875c88dcc8921ec2185734b0969
 DIST cvxopt-1.2.7.tar.gz 4115486 BLAKE2B 6db890b271d99709f433269190461291702a95874dd13b218d1529e02da80eee43385397c5dcc31099666441b51207557bc0a91c403c75aa11f04334358eefd4 SHA512 09b92e33eb69dccd4ce1ff8f63eb81973cce15804bbdede91c1f81d146d9a643d8a29315f324774f02fa0f0fed2edfd698ba9a1a7345aeae1f5a25d24b776274
-EBUILD cvxopt-1.2.5-r1.ebuild 5521 BLAKE2B d6573a0b3fdbd74f5c1a8626c84cd6ea23f06c0ce06dd39fa3b0d1fbd9bd552f2d4520b492b791e988756313c42f149fe775c6fb975f8413231d11d4647375ba SHA512 1633d4064ce7d33ac2f52a89e690f9ec11376214c0e1e90bc9df22f04b046863ec1da4e4829b5e20f39e6b18432f12e946294699a54fe4a7435b04dedf572ad8
-EBUILD cvxopt-1.2.6.ebuild 5307 BLAKE2B 1cf25e4029b8dda5dc57cba8eaa4761136efb252c4867052acf4567a640e41be3b2e36d6f70f1b5759b5ecf7d6b3ff7a593fb8aa18b353dab0439ee2e6d90280 SHA512 705c4dde6aab2390827af2325fd2fb473f095ac78364954603211f0c24c9d62c281563330106e6c54b82d9ef94ec65c58ab3761dfc4f77a49b68d84fbd462e8d
 EBUILD cvxopt-1.2.7.ebuild 5308 BLAKE2B 57fdbf06dff84baeaa6b252aa03df34c9b492e0320d78197c481127d42423d990c775e5a596c82b593fc811e714c5e8bcd04d5523a7e361ff2fe617b056d9948 SHA512 86b7a57500849deb727507c0f7be457861f5d85f016bca4705bad0dba81470e680a8f816e2c50744b697ccbd078fd5e8aee1f330ab0d8fb87bbf53a726c017ce
 MISC metadata.xml 836 BLAKE2B fea994c2d1aefd2bef56407cb9a915820c11a118e7f876b016eb2b4e2c405030eeb7bdb20a6174e2144198f766757b321de042363931bd4216d04371431f6a66 SHA512 ce92cb1df5f4983953fd862e876970a39bbb2487d683868d3e9c9922238c53222e61e0f55376d332b33c61dd0d17ce272aa610c449155dd23263dbdffd3bf035
diff --git a/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild b/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
deleted file mode 100644
index 0b3004209507..000000000000
--- a/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Python package for convex optimization"
-HOMEPAGE="https://cvxopt.org/ https://github.com/cvxopt/cvxopt"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc +dsdp examples fftw +glpk gsl test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	virtual/blas
-	virtual/lapack
-	sci-libs/amd:0=
-	sci-libs/cholmod:0=
-	sci-libs/colamd:0=
-	sci-libs/suitesparseconfig:0=
-	sci-libs/umfpack:0=
-	dsdp? ( sci-libs/dsdp:0= )
-	fftw? ( sci-libs/fftw:3.0= )
-	glpk? ( >=sci-mathematics/glpk-4.49:0= )
-	gsl? ( sci-libs/gsl:0= )"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )"
-
-# The BLAS_LIB and LAPACK_LIB variables (among others) in cvxopt's
-# setup.py are passed in as colon-delimited strings. So, for example,
-# if your blas "l" flags are "-lblas -lcblas", then cvxopt wants
-# "blas;cblas" for BLAS_LIB.
-#
-# The following function takes a flag type ("l", "L", or "I") as its
-# first argument and a list of packages as its remaining arguments. It
-# outputs a list of libraries, library paths, or include paths,
-# respectively, for the given packages, retrieved using pkg-config and
-# deduplicated, in the appropriate format.
-#
-cvxopt_output() {
-	local FLAGNAME="${1}"
-	shift
-	local PACKAGES="${@}"
-
-	local PKGCONFIG_MODE
-	case "${FLAGNAME}" in
-	l) PKGCONFIG_MODE="--libs-only-l";;
-	L) PKGCONFIG_MODE="--libs-only-L";;
-	I) PKGCONFIG_MODE="--cflags-only-I";;
-	*) echo "invalid flag name: ${FLAGNAME}"; exit 1;;
-	esac
-
-	local CVXOPT_OUTPUT=""
-	local PKGCONFIG_ITEM
-	for PKGCONFIG_ITEM in $($(tc-getPKG_CONFIG) ${PKGCONFIG_MODE} ${PACKAGES})
-	do
-	# First strip off the leading "-l", "-L", or "-I", and replace
-	# it with a semicolon...
-	PKGCONFIG_ITEM=";${PKGCONFIG_ITEM#-${FLAGNAME}}"
-
-	# Now check to see if this element is already present in the
-	# list, and skip it if it is. This eliminates multiple entries
-	# from winding up in the list when multiple package arguments are
-	# passed to this function.
-	if [[ "${CVXOPT_OUTPUT}" != "${CVXOPT_OUTPUT%${PKGCONFIG_ITEM}}" ]]
-	then
-		# It was already the last entry in the list, so skip it.
-		continue
-	elif [[ "${CVXOPT_OUTPUT}" != "${CVXOPT_OUTPUT%${PKGCONFIG_ITEM};*}" ]]
-	then
-		# It was an earlier entry in the list. These two cases are
-		# separate to ensure that we can e.g. find ";m" at the end
-		# of the list, but that we don't find ";metis" in the process.
-		continue
-	fi
-
-	# It isn't in the list yet, so append it.
-	CVXOPT_OUTPUT+="${PKGCONFIG_ITEM}"
-	done
-
-	# Strip the leading ";" from ";foo;bar" before output.
-	echo "${CVXOPT_OUTPUT#;}"
-}
-
-python_prepare_all() {
-	# Mandatory dependencies.
-	export CVXOPT_BLAS_LIB="$(cvxopt_output l blas)"
-	export CVXOPT_BLAS_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L blas)"
-	export CVXOPT_LAPACK_LIB="$(cvxopt_output l lapack)"
-	export CVXOPT_SUITESPARSE_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L umfpack cholmod amd colamd suitesparseconfig)"
-
-	# Most of these CVXOPT_* variables can be blank or have "empty"
-	# entries and the resulting command-line with e.g. "-L -L/some/path"
-	# won't hurt anything. The INC_DIR variables, however, cause
-	# problems, because at least gcc doesn't like a bare "-I". We
-	# pre-populate these variable with something safe so that setup.py
-	# doesn't look in the wrong place if pkg-config doesn't return any
-	# extra -I directories. This is
-	#
-	#  https://github.com/cvxopt/cvxopt/issues/167
-	#
-	CVXOPT_SUITESPARSE_INC_DIR="${EPREFIX}/usr/include"
-	local SUITESPARSE_LOCAL_INCS="$(cvxopt_output I umfpack cholmod amd colamd suitesparseconfig)"
-	if [[ -n "${SUITESPARSE_LOCAL_INCS}" ]]; then
-		CVXOPT_SUITESPARSE_INC_DIR+=";${SUITESPARSE_LOCAL_INCS}"
-	fi
-	export CVXOPT_SUITESPARSE_INC_DIR
-
-	# optional dependencies
-	if use dsdp; then
-		# no pkg-config file at the moment
-		export CVXOPT_BUILD_DSDP=1
-		export CVXOPT_DSDP_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		export CVXOPT_DSDP_INC_DIR="${EPREFIX}/usr/include"
-	fi
-
-	if use fftw; then
-		export CVXOPT_BUILD_FFTW=1
-		export CVXOPT_FFTW_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L fftw3)"
-		CVXOPT_FFTW_INC_DIR="${EPREFIX}/usr/include"
-		FFTW_LOCAL_INCS="$(cvxopt_output I fftw3)"
-		if [[ -n "${FFTW_LOCAL_INCS}" ]]; then
-			CVXOPT_FFTW_INC_DIR+=";${FFTW_LOCAL_INCS}"
-		fi
-		export CVXOPT_FFTW_INC_DIR
-	fi
-
-	if use glpk; then
-		# no pkg-config file at the moment
-		export CVXOPT_BUILD_GLPK=1
-		export CVXOPT_GLPK_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		export CVXOPT_GLPK_INC_DIR="${EPREFIX}/usr/include"
-	fi
-
-	if use gsl; then
-		export CVXOPT_BUILD_GSL=1
-		export CVXOPT_GSL_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L gsl)"
-		CVXOPT_GSL_INC_DIR="${EPREFIX}/usr/include"
-		GSL_LOCAL_INCS="$(cvxopt_output I gsl)"
-		if [[ -n "${GSL_LOCAL_INCS}" ]]; then
-			CVXOPT_GSL_INC_DIR+=";${GSL_LOCAL_INCS}"
-		fi
-		export CVXOPT_GSL_INC_DIR
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && VARTEXFONTS="${T}/fonts" emake -C doc -B html
-}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}"/lib nosetests -v || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-}
diff --git a/dev-python/cvxopt/cvxopt-1.2.6.ebuild b/dev-python/cvxopt/cvxopt-1.2.6.ebuild
deleted file mode 100644
index e2442f3b8c2d..000000000000
--- a/dev-python/cvxopt/cvxopt-1.2.6.ebuild
+++ /dev/null
@@ -1,164 +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 distutils-r1 toolchain-funcs
-
-DESCRIPTION="Python package for convex optimization"
-HOMEPAGE="https://cvxopt.org/ https://github.com/cvxopt/cvxopt"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+dsdp examples fftw +glpk gsl"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	virtual/blas
-	virtual/lapack
-	sci-libs/amd:0=
-	sci-libs/cholmod:0=
-	sci-libs/colamd:0=
-	sci-libs/suitesparseconfig:0=
-	sci-libs/umfpack:0=
-	dsdp? ( sci-libs/dsdp:0= )
-	fftw? ( sci-libs/fftw:3.0= )
-	glpk? ( >=sci-mathematics/glpk-4.49:0= )
-	gsl? ( sci-libs/gsl:0= )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-distutils_enable_sphinx doc/source --no-autodoc
-distutils_enable_tests pytest
-
-# The BLAS_LIB and LAPACK_LIB variables (among others) in cvxopt's
-# setup.py are passed in as colon-delimited strings. So, for example,
-# if your blas "l" flags are "-lblas -lcblas", then cvxopt wants
-# "blas;cblas" for BLAS_LIB.
-#
-# The following function takes a flag type ("l", "L", or "I") as its
-# first argument and a list of packages as its remaining arguments. It
-# outputs a list of libraries, library paths, or include paths,
-# respectively, for the given packages, retrieved using pkg-config and
-# deduplicated, in the appropriate format.
-#
-cvxopt_output() {
-	local FLAGNAME="${1}"
-	shift
-	local PACKAGES="${@}"
-
-	local PKGCONFIG_MODE
-	case "${FLAGNAME}" in
-	l) PKGCONFIG_MODE="--libs-only-l";;
-	L) PKGCONFIG_MODE="--libs-only-L";;
-	I) PKGCONFIG_MODE="--cflags-only-I";;
-	*) echo "invalid flag name: ${FLAGNAME}"; exit 1;;
-	esac
-
-	local CVXOPT_OUTPUT=""
-	local PKGCONFIG_ITEM
-	for PKGCONFIG_ITEM in $($(tc-getPKG_CONFIG) ${PKGCONFIG_MODE} ${PACKAGES})
-	do
-	# First strip off the leading "-l", "-L", or "-I", and replace
-	# it with a semicolon...
-	PKGCONFIG_ITEM=";${PKGCONFIG_ITEM#-${FLAGNAME}}"
-
-	# Now check to see if this element is already present in the
-	# list, and skip it if it is. This eliminates multiple entries
-	# from winding up in the list when multiple package arguments are
-	# passed to this function.
-	if [[ "${CVXOPT_OUTPUT}" != "${CVXOPT_OUTPUT%${PKGCONFIG_ITEM}}" ]]
-	then
-		# It was already the last entry in the list, so skip it.
-		continue
-	elif [[ "${CVXOPT_OUTPUT}" != "${CVXOPT_OUTPUT%${PKGCONFIG_ITEM};*}" ]]
-	then
-		# It was an earlier entry in the list. These two cases are
-		# separate to ensure that we can e.g. find ";m" at the end
-		# of the list, but that we don't find ";metis" in the process.
-		continue
-	fi
-
-	# It isn't in the list yet, so append it.
-	CVXOPT_OUTPUT+="${PKGCONFIG_ITEM}"
-	done
-
-	# Strip the leading ";" from ";foo;bar" before output.
-	echo "${CVXOPT_OUTPUT#;}"
-}
-
-python_prepare_all() {
-	# Mandatory dependencies.
-	export CVXOPT_BLAS_LIB="$(cvxopt_output l blas)"
-	export CVXOPT_BLAS_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L blas)"
-	export CVXOPT_LAPACK_LIB="$(cvxopt_output l lapack)"
-	export CVXOPT_SUITESPARSE_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L umfpack cholmod amd colamd suitesparseconfig)"
-
-	# Most of these CVXOPT_* variables can be blank or have "empty"
-	# entries and the resulting command-line with e.g. "-L -L/some/path"
-	# won't hurt anything. The INC_DIR variables, however, cause
-	# problems, because at least gcc doesn't like a bare "-I". We
-	# pre-populate these variable with something safe so that setup.py
-	# doesn't look in the wrong place if pkg-config doesn't return any
-	# extra -I directories. This is
-	#
-	#  https://github.com/cvxopt/cvxopt/issues/167
-	#
-	CVXOPT_SUITESPARSE_INC_DIR="${EPREFIX}/usr/include"
-	local SUITESPARSE_LOCAL_INCS="$(cvxopt_output I umfpack cholmod amd colamd suitesparseconfig)"
-	if [[ -n "${SUITESPARSE_LOCAL_INCS}" ]]; then
-		CVXOPT_SUITESPARSE_INC_DIR+=";${SUITESPARSE_LOCAL_INCS}"
-	fi
-	export CVXOPT_SUITESPARSE_INC_DIR
-
-	# optional dependencies
-	if use dsdp; then
-		# no pkg-config file at the moment
-		export CVXOPT_BUILD_DSDP=1
-		export CVXOPT_DSDP_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		export CVXOPT_DSDP_INC_DIR="${EPREFIX}/usr/include"
-	fi
-
-	if use fftw; then
-		export CVXOPT_BUILD_FFTW=1
-		export CVXOPT_FFTW_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L fftw3)"
-		CVXOPT_FFTW_INC_DIR="${EPREFIX}/usr/include"
-		FFTW_LOCAL_INCS="$(cvxopt_output I fftw3)"
-		if [[ -n "${FFTW_LOCAL_INCS}" ]]; then
-			CVXOPT_FFTW_INC_DIR+=";${FFTW_LOCAL_INCS}"
-		fi
-		export CVXOPT_FFTW_INC_DIR
-	fi
-
-	if use glpk; then
-		# no pkg-config file at the moment
-		export CVXOPT_BUILD_GLPK=1
-		export CVXOPT_GLPK_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		export CVXOPT_GLPK_INC_DIR="${EPREFIX}/usr/include"
-	fi
-
-	if use gsl; then
-		export CVXOPT_BUILD_GSL=1
-		export CVXOPT_GSL_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L gsl)"
-		CVXOPT_GSL_INC_DIR="${EPREFIX}/usr/include"
-		GSL_LOCAL_INCS="$(cvxopt_output I gsl)"
-		if [[ -n "${GSL_LOCAL_INCS}" ]]; then
-			CVXOPT_GSL_INC_DIR+=";${GSL_LOCAL_INCS}"
-		fi
-		export CVXOPT_GSL_INC_DIR
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-}
diff --git a/dev-python/cwcwidth/Manifest b/dev-python/cwcwidth/Manifest
index de03b218efaf..e4eee6316ee5 100644
--- a/dev-python/cwcwidth/Manifest
+++ b/dev-python/cwcwidth/Manifest
@@ -1,3 +1,5 @@
 DIST cwcwidth-0.1.4.gh.tar.gz 11488 BLAKE2B 8d71a172f60e7c365917845e4e5b7e4c703868c8b318fbf07bce44e4b34f0512af84b939a91aba8db73ad362c1c514151e74c81461ea856f73f57efbf1676b75 SHA512 e9aaf003b44d30cf8fa2ae015c2b1af4552a84274416e79f1c56d075aa55fb238b8726d9a052ed8db6f3a0e265e5e170431f9815f1b1255e0a9170845f09b7f3
+DIST cwcwidth-0.1.5.gh.tar.gz 11526 BLAKE2B a457a17ad3668b0633c8aebd8b015225a37afdb9f45a9342960716583e57f7e0d6cf80f27d6139f339e4876d9f8fa4b4cb7c03bb92a6d9ade99225900b8d4a36 SHA512 2eac36232f1efbe427290c3c1d356ab1a31c4d855a0755eed71b18e3c93f516890dd592643efa8a59551fb5e997e39afd5aca7bd0dbe24d4552de738fb2e39ba
 EBUILD cwcwidth-0.1.4.ebuild 574 BLAKE2B c8332b5e27d779c30cdeec6346c08646dc36222c54922233afd904fa5e364d3498cd9b17959913b34d273f49245cc914780060cf7b0df3708b53e501357c15c9 SHA512 bc007826803a826f32973552d1dc689181d74a74da0ea37c395eff78e22045b6133a34c45c4fa93d7dfbb4e62e532919df01c8442c10de644d329a54c7fe923f
+EBUILD cwcwidth-0.1.5.ebuild 576 BLAKE2B 0f5b5d0aee20ee3a943549318f94c8ba53d5dd4dc3387ac4f059f2f13264c6ddba4e7c88e28ab52e43c517e3e41b4aceb1349fe8e3af16e80d706f9856277a19 SHA512 598c34cf575ef558cd1105cf4ab400ca03333985a4b609863bd8234cd1cce5d07bb6e5641c3fa3dc10906c8c90fa4a97ccc2efd0a6c9f04892a8a5bbea63f0ee
 MISC metadata.xml 349 BLAKE2B e1564185d34e24bd6070ffe534ded26aee31004f72bdcb85e27b6d42d243e7db1a9db68e75a6678c9da59530457d34a8cf58be54d919d18ddc539461e03992bc SHA512 65af1da9bc2295a6395395a832288b493df2218a85d8289361c05f2b0ee1bba57a3d32edf09a6c29e691dc43e4a92b34bc8980d346e7b860c5562a238731c067
diff --git a/dev-python/cwcwidth/cwcwidth-0.1.5.ebuild b/dev-python/cwcwidth/cwcwidth-0.1.5.ebuild
new file mode 100644
index 000000000000..b66d25a07a2d
--- /dev/null
+++ b/dev-python/cwcwidth/cwcwidth-0.1.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for wc(s)width"
+HOMEPAGE="
+	https://github.com/sebastinas/cwcwidth/
+	https://pypi.org/project/cwcwidth/"
+SRC_URI="
+	https://github.com/sebastinas/cwcwidth/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_test() {
+	cd tests || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 26ee33c7c01b..687f04a74862 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -11,5 +11,5 @@ DIST cython-0.29.23.gh.tar.gz 2093463 BLAKE2B c710b9bc9e05e0030dff3098857b349564
 DIST cython-0.29.24.gh.tar.gz 2097245 BLAKE2B 9f5f2da0aed61d7fda2e14ea0669a2dd187cd053f3b82621342c7be29e26ff581b673a32e43bacd5c0df3e515f250eb23a64b1dae8911132fdca48175910a3dc SHA512 387a827f3cb7428248019744e3ed606a133d98ac882b83624d24ae0fdf8a8f2334978555d7d84e5cc4adaf715c541fef64e45bcbdda85ca33473c21f99360be8
 EBUILD cython-0.29.21.ebuild 1987 BLAKE2B 1df83b6ef7f839622cd73c07384ccf0a6e722fe5ae9f42374ff9df2995e5b624e78a534c078534c341d034f984f73fc5c3abe954166ba8ef0f3fcc6aff2fbf06 SHA512 aa85e5d5ea9a1413686d8903af4c2c310f504ba0fc1ca469253010dae7a2abbb434b5d2e59f18b1a22f1149cfaade4b942466973e9559b913146abdf3b191155
 EBUILD cython-0.29.23.ebuild 1952 BLAKE2B e8d88577efb70db3f75a7c0068bc1b9659132bde1927c3a50a92822020d6d575761ccacd66f2efea021570439c5c052cb352834071d8ef505247ba427d045da9 SHA512 cc6643d4a19a075e0e54184775596251060bcc9b73c6b9d6a26564c5588ab81734d30127c42b723d3c1e62d9afdc5f268dddf1a26df5c138634b9cabc5caca44
-EBUILD cython-0.29.24-r1.ebuild 1935 BLAKE2B 4e0557c5ba8effde7b65fd644264099b545373196357a64c589e50819724dc2e2d3cc1da89284e3dd7f34400e1bcd4303e056f81ccf272f3363ede54a9138979 SHA512 30ac67969dc74479fdaf859bd0127f8f5c83c222f0c6804664eba408eb34cb29cebf1c936aca9dee5f54379bc6ff238be908129ecde053b6d164893ec80b627d
+EBUILD cython-0.29.24-r1.ebuild 1933 BLAKE2B 004bc0e355cb6255d5824d0b896976cd7e748c4ea5fc93f056b36fbe4a7e81ec50b73876c848d1525f9d990e179174fa1403d2fa8b8edfb22ec4d862db5ce2e2 SHA512 9782172edc225c11b25d4de40c0b2288829596b26de9cc8bfe9165815b3e06b4296823269f8714d0ebe5b9ac5fff494286df4200f0d15564f4f880b354af6ff3
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-0.29.24-r1.ebuild b/dev-python/cython/cython-0.29.24-r1.ebuild
index 8aba26fd02cb..464a0d0e6a58 100644
--- a/dev-python/cython/cython-0.29.24-r1.ebuild
+++ b/dev-python/cython/cython-0.29.24-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="Apache-2.0"
 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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 6c2de5654dfa..f509d005360c 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,7 +1,3 @@
-DIST dask-2021.8.1.tar.gz 3786161 BLAKE2B cb47b900e4769113e28e1cea70cb65008debb25431c05792666ca1d9aef9143061d1b0c2ce825ff1a22312c4cc615a2878591fc93236521811c19a35e70446b1 SHA512 aff7b92b66ab5d8858eb28d416c3661e64400a8ddcc9135b74b1bf3cad195a4fc55a00365c5602cb0b66ef8506e73c0f6bd2d3972ce8744d2e77095cdf040d11
-DIST dask-2021.9.0.tar.gz 3792016 BLAKE2B f2538c9df5783f087f555945234b4d31c5f02a539eaf14bffdc05e4d3f62d5ef309289e216434e477a728837e9556b2f50a0aadf8a943380496168c62577c356 SHA512 b821c38faf9cdf6574eab8014d4acb95f37cc260c9c3ad2c19fbdf24c3ed9fa5c9cfa35fdaf53f7b640b3c8a86eb6b60c2e5e9bcb7760870023451c6c383545f
 DIST dask-2021.9.1.tar.gz 3794819 BLAKE2B c3ed5050581f41c4ea82ad9d1d233205f105434e5e6dcc654ba2e999b8cf105033d58ecf045d2063dabcb701cb2af6f092ecfd8435d24e5949ed2d39b54ae19e SHA512 20beca3f68c2e21d54c941049a1f352e19fcce7b5f7ecf84abf60cfb9979551a3e83938ca5439b662d35c0b64b26d726f6fea85641e737d0060c56a2e879755e
-EBUILD dask-2021.8.1.ebuild 1244 BLAKE2B 1dc099954bac2a601ab4495910cb3872391e163d6aae2650b9f795b0c9f14e1feb3143b15ee2b0864e2109b5d1b568ccb751216cbaa39c4de8fe939bd47f3948 SHA512 5e51964457d4d80d7f9dc25f06e6ea18b776e8412bc8dbc2ea0bb0c939032794b52ee7f89ab0c3a6addb314c311b7d8875405029b86aa41eea3b506673ccca20
-EBUILD dask-2021.9.0.ebuild 1378 BLAKE2B d8c6af4f1f46bbf81d02919163cbf2918d1b8cb686c3d28a2f1753f1a3f0c8d79cb7cd897fc5f42cee1d115d27aa14c2d01d703a2992d2fd83c345abad403794 SHA512 512ab2ba1820505b811af7b613a739238ff6b05c4a98e402c0a220572982ecc6c5919d9fc19f922bb7df0f93e3c2792ccc8133848a60d7f99dc0c81814b91b7e
-EBUILD dask-2021.9.1.ebuild 1130 BLAKE2B f536def3a57832e06bfd7a7708e58d80d951b3aa6dea2d3b6b79bbeff6dd1b2e65afbae8b311d22e7cdaf9e1404ee222b5a2b24f7185f4824c8a0e5b50d7b97b SHA512 80e7015fba5d176e8fab978da4c64607a47a22ae3064171f2ab2399b62684ce600b1fef77e462b8ba7114c8ef69ba8f8ff33491a26d5ef64da19288153547403
+EBUILD dask-2021.9.1.ebuild 1128 BLAKE2B ce410c6bcfaae7851628066a708ec30b67f2b053116414510b6d5fb0ea8ba5d63de11fbef5e676a0ed526b8317d8c050f113a98a1e436d229b64ed95af71b1df SHA512 05e2399604f87c34009c22cbef342f2104d0f12a3fa8ef7f1a05855e3056bcb09aaa394b92d85dc454f67fadb9ac40460467fc8264d806537047297e04342f86
 MISC metadata.xml 671 BLAKE2B 9445727611bd11837dbca3520feb00892d112b88fc694eced24573c93eb025a9702b2de84232cc00f53182f5ee4b30c5768b296fb3673bb6a8b4db7d0a093c40 SHA512 90cbb67c807023481b2203b1811f062edabf54cc28e59a37e8ad4db1dffa932b3e82a8ddd35e3daef83c8229352ca69777150c562d823add42b75800f3d5fe4b
diff --git a/dev-python/dask/dask-2021.8.1.ebuild b/dev-python/dask/dask-2021.8.1.ebuild
deleted file mode 100644
index 3389d3987162..000000000000
--- a/dev-python/dask/dask-2021.8.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="https://dask.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# require old sqlalchemy
-		dask/dataframe/io/tests/test_sql.py
-	)
-
-	epytest -p no:flaky -m "not network" ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/dask/dask-2021.9.0.ebuild b/dev-python/dask/dask-2021.9.0.ebuild
deleted file mode 100644
index 2b2b9d4c403f..000000000000
--- a/dev-python/dask/dask-2021.9.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="https://dask.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require old sqlalchemy
-		dask/dataframe/io/tests/test_sql.py
-		# https://github.com/dask/dask/issues/8137
-		# https://github.com/dask/dask/pull/8139
-		dask/dataframe/tests/test_groupby.py::test_groupby_index_array
-	)
-
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2021.9.1.ebuild b/dev-python/dask/dask-2021.9.1.ebuild
index a4142fe932b3..9de7e098be89 100644
--- a/dev-python/dask/dask-2021.9.1.ebuild
+++ b/dev-python/dask/dask-2021.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/dbutils/Manifest b/dev-python/dbutils/Manifest
index a113bbaf1c7b..b9a5d424fac9 100644
--- a/dev-python/dbutils/Manifest
+++ b/dev-python/dbutils/Manifest
@@ -1,9 +1,3 @@
-DIST DBUtils-1.3.tar.gz 91733 BLAKE2B 8fb3fd16208c27fbbbbcbf1e7b9de2d4d2e8008916309256bd2ae5494d0ff60071fd3fa839dc7ccbe8832f333bad52d97dc4d176c822cc1ce3d5ce0bb05d637e SHA512 47aaa63144e6a0f4d020adb54fc5f36af01848a12f8adfcbd9889825980a1479b32041c087992de5f44478cc25729d1c97ed6cb094def2b93165f0120f10c5b6
-DIST DBUtils-2.0.1.tar.gz 91789 BLAKE2B ab231000211b7a704da8cd43862830e3a6cf3e42d8053ac0391ce68b6f51f0faae9172c83db156c1d8efc8fc1e8afad9c05eee89edbe7061cc7102e84ce08683 SHA512 0e3aedce9b659e717d60106cac7c76d6d488b5629a102a714e6fe57ac162a74c787e31e984cdeb3e375b3add6539325576f68f1779b7f7ce558ba00770eeacc8
 DIST DBUtils-2.0.2.tar.gz 92119 BLAKE2B d53dc81000b426e2cfb8dace616d589ec622c7cdb10e1903163eb9901336d300598ef7f54e30aa1efbd5fa72e648f4f63c288a4d3ffcdf6fada89159e8fd3925 SHA512 650be54c4993f6277fc7a2d7cefcb658dec6c793d0ef8554e9e80d70a58c7fbbf69485e8e60684c2dfcb28780bdfa575796455fd12c0cff3b82d8951785d8ba0
-DIST DBUtils-2.0.tar.gz 92911 BLAKE2B 1822f85b9da1bd7936d01f8069deef10e8ab9b7a5c89de718071cf4783f2845357ccca0e85057d430c57f33a2a7c6d239f632032397bb1f0013a40e42383b5f1 SHA512 7818eab572db4798d0a7a2eaed6c4ba91c79c8517da56db21c07525f0097ca80c0beef1c9608b0b80c3a93f1372f37de7c8ec97f2e33dc4dc4a3d464c5981d13
-EBUILD dbutils-1.3.ebuild 1012 BLAKE2B 07f797d18ac9b71d87a21690aeafc8e72446b41cbe2d79726375c32f5feba58fd5d95d9ba038925d4eea5ff52ed5a7cad7e2186b095b54cbe162ce673aac055e SHA512 88c342c551c4e99a7157412bfa6aa1daec371043907c5cc935356e46e9d26f04365f1f85940d51113302cf36a9b6f6eac1d23cc866c6616e6967124599095830
-EBUILD dbutils-2.0.1.ebuild 699 BLAKE2B 2d51aafd400c972708b424eed7c7f36521f65bd2772da5de44a43fc6d64f9013933ad1ec816f023269ac290a5720d3c195604c9907b6f1575eaed4f6419f4ffb SHA512 77921345e4ac21500376166ebfe64edd89154334264161dbfcee24ad9c018c2e2a2af22b7553bca6805481df4d93b6f44cdb38d457f7165f17d3982bc1923536
 EBUILD dbutils-2.0.2.ebuild 697 BLAKE2B a232322d0332a411a540067066069574c29a00f43f771c071ee50d9f17d36891d24840aaa08977310319961849738df387f68c3bcbd5cfdcb10316bb6c4e0ad6 SHA512 acc3f68613bbd6f010900523fcf66226de80623d7cef0bf62ff4a1a1ba3a973768fed8b78ea2189693973fc390ccf13b0ac4f8697aa2e5f96f0c1ecee6403c3f
-EBUILD dbutils-2.0.ebuild 990 BLAKE2B 0bc02f3d9dff4c30bc423bc01710bc5af4da8d14e826d4fb820ed6a3fc875bb7cc7448a7634b7be326b7383b01f6d2d6168fc8c7578d0ac4224db5b671082824 SHA512 e5d04f01b774d745a5704305b39c5adbc527588b545ce87a37ca4459653fa8602bba253ae2e657758228d192f02337004e34e1fcf0f009cc6dd14ad7c889bd8d
 MISC metadata.xml 1005 BLAKE2B e6d13ea0ffdc7d972db2bd8f5f0e2212937e36c1646e900f2eb76cf270ae840db7211d218e6900208bafab3fef0c5226128cebabeb52a51e8204b1981809683c SHA512 ba6884914df60365c4b085b56abcc3e927e780f4f8baa6e2cca745cdc53a1fb18917f1b1532d9e957e515a7d5b8e190d87e556547b98a094062f672b3a1b14cf
diff --git a/dev-python/dbutils/dbutils-1.3.ebuild b/dev-python/dbutils/dbutils-1.3.ebuild
deleted file mode 100644
index 6eeaef98fe7f..000000000000
--- a/dev-python/dbutils/dbutils-1.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-MY_PN="DBUtils"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Database connections for multi-threaded environments"
-HOMEPAGE="
-	https://webwareforpython.github.io/DBUtils/
-	https://github.com/WebwareForPython/DBUtils/
-	https://pypi.org/project/DBUtils/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="OSL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	#prevent tests from being installed
-	#prevent docs being installed outside /usr/share
-	sed -i -e "s/, 'DBUtils.Tests'//" \
-		-e "/package_data=/d" \
-		setup.py || die "sed failed"
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	dodoc "${S}/${MY_PN}"/Docs/*.rst
-	rm "${S}/${MY_PN}"/Docs/*.rst || die
-	local HTML_DOCS=( "${S}/${MY_PN}"/Docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dbutils/dbutils-2.0.1.ebuild b/dev-python/dbutils/dbutils-2.0.1.ebuild
deleted file mode 100644
index 72882396514f..000000000000
--- a/dev-python/dbutils/dbutils-2.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_PN="DBUtils"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Database connections for multi-threaded environments"
-HOMEPAGE="
-	https://webwareforpython.github.io/DBUtils/
-	https://github.com/WebwareForPython/DBUtils/
-	https://pypi.org/project/DBUtils/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="OSL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	dodoc docs/*.rst
-	rm docs/*.rst || die
-	local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dbutils/dbutils-2.0.ebuild b/dev-python/dbutils/dbutils-2.0.ebuild
deleted file mode 100644
index 907f98400ceb..000000000000
--- a/dev-python/dbutils/dbutils-2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-MY_PN="DBUtils"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Database connections for multi-threaded environments"
-HOMEPAGE="
-	https://webwareforpython.github.io/DBUtils/
-	https://github.com/WebwareForPython/DBUtils/
-	https://pypi.org/project/DBUtils/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="OSL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	#prevent tests from being installed
-	#prevent docs being installed outside /usr/share
-	sed -i -e "s/, 'DBUtils.Tests'//" \
-		-e "/package_data=/d" \
-		setup.py || die "sed failed"
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	dodoc "${S}"/docs/*.rst
-	rm "${S}"/docs/*.rst || die
-	local HTML_DOCS=( "${S}"/docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index 8e6082043fb6..6f917a507408 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -1,6 +1,6 @@
 AUX debugpy-1.4.2-unbundle-pydevd.patch 2452 BLAKE2B 44cebbf0b1bd07c1abb5d8ea6489ff241ddd3bab28e8697462466c1d70160a2d7a2a7f51bcb1747fb8129854b16adb8eda7d7598741fe0c72ea6f8217878e569 SHA512 ee7b5a6125e071fe414e481633224a3e77a5f8d0cbf3fcd855932db3154f4371a92058ecb730b8f69c97a4f01601425eaa271aeb04cda5f2ac5c867c90001b95
-DIST debugpy-1.4.1.tar.gz 6687670 BLAKE2B c7761f354700d366d49365b0294ba1f07f357283c7527fc961c702bf99d808835741a899909e37092026c81ff19f6d96ef09c06512c8315ccad158b6e8e47697 SHA512 aef7779cb3a1af76b5cd3d6e8c7e0b78ffe08d1ebe25cf617ca3eb00966d5b3920358809c018f5f1f9eb56b913211134acfdba7d4c0d0174e4d6cfdae058d5f5
-DIST debugpy-1.4.2.tar.gz 6673987 BLAKE2B c61d09bc036f3a12e343be3d81b2e834bd69d33df80a6b9e4111d11a2eaea221feea3ac093ca06ad1a840dcab7d53d7b321276c4103420f34adac7a4a4ac8141 SHA512 7c0908ab9202cebb020ca72c558f3c1abc28b44fb968cce4387750f18e67198ad52dd6743061888610ed733e0f7334f986c2655ec7b0a2631acc4919cd9e6c20
-EBUILD debugpy-1.4.1.ebuild 1082 BLAKE2B b38825f28ea2ca053bfeb38bae603247acf21185a1238aa11d2cefc00a52d3bacb178770c954de4034a56fb910e82f6bc3df1bb3441a3cb80e2ab6a52140d599 SHA512 7f62f46b2adc89e417ece3c386704e3c3531b68adec444feedde30cf8f6412db1f656dc5abaff9521d25ab0e5375178ec16dd68f6b9fa966e36620b711047796
-EBUILD debugpy-1.4.2.ebuild 1083 BLAKE2B b2a4088b34e8b282ff83293478f11a5d96a5a3238e221af5744869546f478dd853becb804e97cec161ede3c1e1b56bfb55d402de18909e21c3b79ce84e2fbc8e SHA512 7bb59468a600dfe0448ecc70a3934f16ef3c98d9483094c08433b91ea0b2c3d0c406482221002e1e6be1605be06d272f0655464c82bd0225ae416cbf1fd74922
+DIST debugpy-1.5.0.gh.tar.gz 6676475 BLAKE2B a8aa0afe7b76beb6ba539e23558d6a0c8babfd55de9a4a0bc9aabbec8a2318e600df62b063a8d674d9402e35fd595b030efca570b4a67ec82dadb98875261e13 SHA512 b5ca216aede744a9b1e067056601470e78b8af1fabb181dc0bf6e87bc166cc8d6cad24f5695986686cac69f8ce41246bb0f074078ef3750f6e65b4d8fe55e869
+DIST debugpy-1.5.1.gh.tar.gz 6675322 BLAKE2B a8e3a07d5dbd1b5ca39301e703b279514653606f98743a396693738c9a89403c73a6b6942e5dc368dd89eb8b74277e1808f9247573f330e3a94596c26af7e5be SHA512 93ee526ca7cb3d44b85106a33d8f930f4f2b307eb26ede3ab6b5653de986a101b10f545f5de12cd8ee6ff9e9a12c5e4b57c4c40b1b3003c2f555676bd34482ce
+EBUILD debugpy-1.5.0.ebuild 1082 BLAKE2B 1b6872ef5807bd04cbade54e856bfd56d87499d4462ca818cc8b399a9183171cc34e102cffb3cbfb53bc1c4b708a4a5e853d5118d1c2ae5d5698912548363f8f SHA512 331ce02ea0ca32f3ae967375fd40ed6efa58128f46ab70a1d1d3c26ec7dec0b758762d5bbeaea57f101bcf857ba972befd7b004847339dbbbb7ac49e9cbf4786
+EBUILD debugpy-1.5.1.ebuild 1082 BLAKE2B 1b6872ef5807bd04cbade54e856bfd56d87499d4462ca818cc8b399a9183171cc34e102cffb3cbfb53bc1c4b708a4a5e853d5118d1c2ae5d5698912548363f8f SHA512 331ce02ea0ca32f3ae967375fd40ed6efa58128f46ab70a1d1d3c26ec7dec0b758762d5bbeaea57f101bcf857ba972befd7b004847339dbbbb7ac49e9cbf4786
 MISC metadata.xml 451 BLAKE2B 671153316362e0394ae59824e67f5ea897615d3853552aa92fb273d4a41a88916cfe03650ab42248ffee557cb95149b21160395e0fcb2f1fd69bb3bc2c97ea55 SHA512 393d4898c3555b425c34dad5f540f42fc8e281f6299360d1192d099e73486467c92ed16ca710e34d2868aec63fca2eab4775b86e95e6dea79b8721ff70e1db87
diff --git a/dev-python/debugpy/debugpy-1.4.1.ebuild b/dev-python/debugpy/debugpy-1.4.1.ebuild
deleted file mode 100644
index 9e2e9b284cd9..000000000000
--- a/dev-python/debugpy/debugpy-1.4.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
-HOMEPAGE="https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/"
-SRC_URI="https://github.com/microsoft/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc"
-
-# There is not enough time in the universe for this test suite
-RESTRICT="test"
-
-# These files are included pre-built in the sources
-# TODO: Investigate what this is and if/how we can compile this properly
-QA_PREBUILT="
-	/usr/lib/python*/site-packages/${PN}/_vendored/pydevd/pydevd_attach_to_process/attach_linux_*.so
-"
-
-python_prepare_all() {
-	# Drop unnecessary and unrecognized option
-	# __main__.py: error: unrecognized arguments: -n8
-	# Do not timeout
-	sed -i \
-		-e 's/-n8//g' \
-		-e '/timeout/d' \
-		pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-distutils_enable_tests pytest
diff --git a/dev-python/debugpy/debugpy-1.4.2.ebuild b/dev-python/debugpy/debugpy-1.4.2.ebuild
deleted file mode 100644
index b4f0af0ccd61..000000000000
--- a/dev-python/debugpy/debugpy-1.4.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
-HOMEPAGE="https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/"
-SRC_URI="https://github.com/microsoft/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc"
-
-# There is not enough time in the universe for this test suite
-RESTRICT="test"
-
-BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
-
-RDEPEND="dev-python/pydevd[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${P}-unbundle-pydevd.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Drop unnecessary and unrecognized option
-	# __main__.py: error: unrecognized arguments: -n8
-	# Do not timeout
-	sed -i \
-		-e 's/-n8//g' \
-		-e '/timeout/d' \
-		pytest.ini || die
-
-	# Unbundle dev-python/pydevd
-	rm -r src/debugpy/_vendored || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/debugpy/debugpy-1.5.0.ebuild b/dev-python/debugpy/debugpy-1.5.0.ebuild
new file mode 100644
index 000000000000..cbb6127cca56
--- /dev/null
+++ b/dev-python/debugpy/debugpy-1.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
+HOMEPAGE="https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/"
+SRC_URI="
+	https://github.com/microsoft/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# There is not enough time in the universe for this test suite
+RESTRICT="test"
+
+RDEPEND="dev-python/pydevd[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.2-unbundle-pydevd.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Drop unnecessary and unrecognized option
+	# __main__.py: error: unrecognized arguments: -n8
+	# Do not timeout
+	sed -e '/addopts/d' -e '/timeout/d' -i pytest.ini || die
+
+	# Unbundle dev-python/pydevd
+	rm -r src/debugpy/_vendored || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/debugpy/debugpy-1.5.1.ebuild b/dev-python/debugpy/debugpy-1.5.1.ebuild
new file mode 100644
index 000000000000..cbb6127cca56
--- /dev/null
+++ b/dev-python/debugpy/debugpy-1.5.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
+HOMEPAGE="https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/"
+SRC_URI="
+	https://github.com/microsoft/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# There is not enough time in the universe for this test suite
+RESTRICT="test"
+
+RDEPEND="dev-python/pydevd[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.2-unbundle-pydevd.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Drop unnecessary and unrecognized option
+	# __main__.py: error: unrecognized arguments: -n8
+	# Do not timeout
+	sed -e '/addopts/d' -e '/timeout/d' -i pytest.ini || die
+
+	# Unbundle dev-python/pydevd
+	rm -r src/debugpy/_vendored || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index c3c312ecf1e0..b54265e004d3 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,7 +1,3 @@
-DIST decorator-4.4.2.tar.gz 33629 BLAKE2B 5b2c6a1b6aba293d4b93444d4613e3c9af16bd9d6d80ae9eb21112a4a16397ff67e1f648e8118beeb7d17755a2f1bd37b867f73129c42ef7f8654d1c1f609e5f SHA512 c068efd4e70764ac447b772c9c29625c2180dad256b2b4e46a50a8479fc1d7de09b114c2ba11bb37dd58774ed9460d2e0ea9fa76061833a2d3c2676ac91a0db1
-DIST decorator-5.0.9.tar.gz 34544 BLAKE2B c7dfafd9d7354d075a154ba9bd3aa2bed52454e3412ce22ed2cd47f4c1ec94f601c754bd270c1a2d9447a087ce114579d3b2b2340721dfd4aaac1e2d1f801b93 SHA512 8b46370bbc9cff5208823af60f31779b0ee02e03c796223ddfeb473f7c36bf7ee7da48c5712eea89ca8a96ef32695ff31c4902a76284caf543cf4937a0bd7aa5
 DIST decorator-5.1.0.tar.gz 34900 BLAKE2B f6f4964411a31ac0904a98ec9b9e172012bd1b769122241bb0220a217da007baabe4f9173fa2283a46e25485c42910283d0e0dfc88b4bc3b68f5683448ddf84a SHA512 4acc0967af79f61c56adea3084c4e9f9de1c34fcbc7906db4bb1b0759e07ffed6eff0e4b21645dda5f37e96662742621f3d043e8c06a401841c7199a915afe18
-EBUILD decorator-4.4.2-r1.ebuild 585 BLAKE2B 5fa35e14878d8acf47afb8e7b78db7b861c66d66637a1b91f86c50bcdfc596b031d75adc0682053323b62a7094fd3ce2baaf71a8e2bc5b2abaed4b725e4a75c7 SHA512 2ef83b5d4d127453ace335df139b19f71b7f3222a6eda49c8caf00c253e870202e7f36f9d4f36f0668e543f8febb5cacd2ab9be54e605b246fdcbe7ff2d8105b
-EBUILD decorator-5.0.9.ebuild 644 BLAKE2B 2be4120a8fd47474e10112dc9f4afc6192399e4865f8332ba506d42ddb68a88b13351539305795c139404705ebcdf02bfbe0f8da5eeb44331904a3b2f3fa0074 SHA512 6198f6cdfd58b4b08f10e38b27365ad003a9bde53bbc469f674738853d695ae2a4195f6f4e1e583ccc6d71fe3b26cbb4d0b0c5a386df9cc0914c6a14cad858bc
-EBUILD decorator-5.1.0.ebuild 652 BLAKE2B 1758ca44c918140ededad7d3d81ba57fec127c6741b83e597a18c4099e16f46cb6a01b6f47a1b8ce54b3b2e218366c75eb147d1bacf44a9550bc5bce429870a9 SHA512 ba1bdeb63007c275c0b4b426b5f59438689ae11d3643e8ae977dc819c5920f5a35c9876b34a9eb4777a7118f1fca08144e2b35b5d5694c3ba948779d17c3c96e
+EBUILD decorator-5.1.0.ebuild 644 BLAKE2B 880225329f8c7e8fde7b6ab747677d99fce669a9f86470bac227c2feab7004f8b0c26bcebe5425d75e751300c764081893ec5b926029648d67fd7564f1441063 SHA512 b12e09620b449240fdf4ca634e524d201ac8c45770bd96608f48a295e18c59fb10f9d2f4201d95c43c820b4534dc3c3a3a6e5fb259ff134607d2bb010ce44c14
 MISC metadata.xml 756 BLAKE2B 231d25578555eda8a5f6d5598dafdebbb3695656eff92178f664eb29eee5d9f18f82235c40d974c58959aa1f4692d4818edca6c640f146520186cf5390cd21d2 SHA512 a9d79d6dd55a349e41d861f1c4b2526c8bc71261fc5ea796675ebed8a9389b3945da86814acbd0a67edd4379dee36b4d99f2cf788fba5d2eadf77e87f6c0dde9
diff --git a/dev-python/decorator/decorator-4.4.2-r1.ebuild b/dev-python/decorator/decorator-4.4.2-r1.ebuild
deleted file mode 100644
index 3a0f60f27c83..000000000000
--- a/dev-python/decorator/decorator-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DOCS=( CHANGES.md )
-
-distutils_enable_tests setup.py
diff --git a/dev-python/decorator/decorator-5.0.9.ebuild b/dev-python/decorator/decorator-5.0.9.ebuild
deleted file mode 100644
index 535b01d398cb..000000000000
--- a/dev-python/decorator/decorator-5.0.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DOCS=( CHANGES.md )
-
-python_test() {
-	"${EPYTHON}" src/tests/test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/decorator/decorator-5.1.0.ebuild b/dev-python/decorator/decorator-5.1.0.ebuild
index b8fbc4bc6550..5ae1838f1745 100644
--- a/dev-python/decorator/decorator-5.1.0.ebuild
+++ b/dev-python/decorator/decorator-5.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DOCS=( CHANGES.md )
 
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 16c400f5d317..3d1740d101d3 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,7 +1,3 @@
-DIST denonavr-0.10.7.tar.gz 148282 BLAKE2B a5168c1b00ce1e8223d619a8e2e7ae663fa913d673b6f62580daf57ff76d8da4306681d92df0e32e612376038255bc52e25a1f59dd5f6a429685c8bd9146d843 SHA512 6667edeb4272ce909f8bc2dfa51b31d78915ae6085064bbf0f53714f8b473e0fad24eb6484a10abb093ef27d59faeaebdffdb55eadb03f8b64e864642364a791
-DIST denonavr-0.10.8.tar.gz 148387 BLAKE2B 1ad6687655abe70e6f83119c893187efe88143521e5c91987ae6b3d393fe7a327bf34941d87a4ba37107ef415493471be0630a1f3c643f94cfb3e22460c80806 SHA512 fea1b2a03d83d520c837323939db503879ec0c973bbf9409087298977f4d07f8ed8b25c2d287c1529786a4e42cd59b0f0708a8a4b7df3d5f630967110d7fe906
 DIST denonavr-0.10.9.tar.gz 152589 BLAKE2B c517e7d2fbdb23f4b684ffbb206528a641ec9d64e48f1d7aa8a4dd1247ca779bb2bda8a9deab1a985d713d275dc68fa6f961205e33b8bcc7749d9cb3c943f752 SHA512 134b940516a312afb03b2c5fa11a5fb68374c6e5d636332e8a7034ee6c94d2baf70b53e979c1c751eaaab6d31822de4450ceddeab12c42dfc9dd74b934593621
-EBUILD denonavr-0.10.7.ebuild 755 BLAKE2B 19509ed35e79c27f4a6f352ff1cc06a06786e0a57806999bd02df983e41b04f62aa522fa96665c0fd875208ceef9b0121c7e4bc7427d5a10e71d7e3642dbae5b SHA512 3a6cb8ab60f3be41cd01d155e6501decf3ab5311f565392eb9b71d20b017ae9d3ea3e33cebb78b54ab7ff31ceb8fda0c570a7bdceda9015fff1b8c0ff1d1e7e7
-EBUILD denonavr-0.10.8.ebuild 756 BLAKE2B bc30fa50f582fcf633f22bc340e215d1f697f0abb36332138bc46f9a14b1becf126dc0af75e7d2c5d15b3435ca7d8db52b4e7f3a0ae63f3496554f87ec4764ed SHA512 1619c4703eb419d9d295a5763fafa2fd94f313236cc2b1112b90d4a702e2a1d2a0119af3f699652520d819b7d77ed90b6e345fa45de033dd813c938168d34478
 EBUILD denonavr-0.10.9.ebuild 756 BLAKE2B 7f11f8e692a473c1b6eacbbc71d1b3db474b0703e4316de7d413887e4f2093e38e73497d493c6a0d80fff1d2f9ca6335ce902f276d15dca3625114916a06e557 SHA512 a1c1c586349818da04f152df8414c6427f8f4bb1d5ca4aaf681120aa084ac1c2be3d6d269fe2effc0a3f2b16b02f187ff8744e7d51379f5837fdf722c817d9bb
 MISC metadata.xml 550 BLAKE2B e7b828fe2f56fae95502d15f5fdfd8bf70d66aec26a082356d797c86ba31e1fb17e7c721e5920c69f4fd80f00af7b0251c497ebe1243e76b688d7a536e6ad79a SHA512 e4c69f9242520c58f3533e8d19d30c31a84856f2d2030643ead0a57094f07995626e15c2ab59756f505dd7849465a1c8e0bb00654a23a1bc8244e27db3e9efb8
diff --git a/dev-python/denonavr/denonavr-0.10.7.ebuild b/dev-python/denonavr/denonavr-0.10.7.ebuild
deleted file mode 100644
index 744cc8df1076..000000000000
--- a/dev-python/denonavr/denonavr-0.10.7.ebuild
+++ /dev/null
@@ -1,33 +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} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automation Library for Denon AVR receivers"
-HOMEPAGE="https://github.com/scarface-4711/denonavr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/asyncstdlib[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpx[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/denonavr/denonavr-0.10.8.ebuild b/dev-python/denonavr/denonavr-0.10.8.ebuild
deleted file mode 100644
index 774d25fb91ba..000000000000
--- a/dev-python/denonavr/denonavr-0.10.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automation Library for Denon AVR receivers"
-HOMEPAGE="https://github.com/scarface-4711/denonavr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/asyncstdlib[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpx[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index 0462d6969aff..ae309ab728f1 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,5 +1,3 @@
-DIST deprecated-1.2.12.gh.tar.gz 2969891 BLAKE2B c5fe02ff2c0588c5c6fb1e9054ad7851943c4574be633aa6ae37a466b3cac9889d8ed119962fcffc2092ab844a6d18a5d72766141e149bba2ba0c2dd4ee5131b SHA512 ff9b03a35b688474b6d5390347c4acdf5e19fcee5f7fcbb61a456c6819adbcda72ce00200d55b92c65873addad5abf9d1d5617bf477f64beb08ca23f10ebaea2
 DIST deprecated-1.2.13.gh.tar.gz 2971610 BLAKE2B 00c1fad34e869b143ad7cada2426f999f1d353d23e33076b0197a7ca6c87b0f2d240d7f4944b7c7669974c89304a6cf04f5d2b4c44e6fee22c27522ec2cc9711 SHA512 c170b086bc4e37462181a0f53edbe745aa4f4924c7fd64d9693de267e070392b74445f9cba935e85c878b755603ca6cada8b4130ac96ab071be284047aa35619
-EBUILD deprecated-1.2.12.ebuild 795 BLAKE2B 6177c25465f7e9c345bf79a3fb6a149d45257c9c83dd3dc07cf309b59aed94e0347a0a8062878f8ead192aa14bb35900c795d2cc4f19dcd73a3f5672648c4400 SHA512 49303c7d8ba2afba688ad68582e21c7baa206b5f5911cfeff3481509ba94cc37fa1b2f397d444a2695c254604742338e35f0628eef1ed9bffd74dc0ae84c2c59
-EBUILD deprecated-1.2.13.ebuild 743 BLAKE2B 9d31b17bf0b3086a9d07818ef218f42b3e33642b6ea01af72bdfed3dd92f5a00dd26048e85c2c8ebee123f8ebc5721d9a7c3a2f8b5343465ecc106c5ba31174b SHA512 920bf76104f924c3b620944b672d24bead3583d95c769925bcd9172f53c2bafefd7214228bd71788fbf2e7181b52c9a71e6e00cc8c63960551422228bc608c99
+EBUILD deprecated-1.2.13.ebuild 741 BLAKE2B 39a6126f4e976f016e980eedf9b57418a377dc9c889b1da5a762bba14a912f09c4d53653c84760684858fe1e1471946a1d8e2bd7488882535833ca9ca5abefc4 SHA512 f52f0ffde2c805daea269d6bba4cb7580e2ebf294a8b2f90587e50b64bcebc1011955887ee6d41dd8fa4e5d6496ed7096d120904a1b77eab3c47b05c729214a1
 MISC metadata.xml 316 BLAKE2B 0275fd3fa62ad50251204b24fa83ede995c3b25ae8547fe507ae5b61812ad760db24cc2fba35d7af629b8e520e5c2c058c412ad0bd71554b3b350dc085f2f35a SHA512 c7237b466a2f0b791713cb36edf731ead6f37757faaf193fc4889ba17e2e25b5ef68ddbabcf0644c7948e23f13248023f84cda9f1c49723cb5221c603ffb1d5b
diff --git a/dev-python/deprecated/deprecated-1.2.12.ebuild b/dev-python/deprecated/deprecated-1.2.12.ebuild
deleted file mode 100644
index a0b370872579..000000000000
--- a/dev-python/deprecated/deprecated-1.2.12.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Python @deprecated decorator to deprecate old API"
-HOMEPAGE="https://github.com/tantale/deprecated"
-SRC_URI="
-	https://github.com/tantale/deprecated/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=()
-
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/test_deprecated.py::test_respect_global_filter
-		tests/test_deprecated_class.py::test_class_respect_global_filter
-	)
-
-	pytest -vv ${deselect[@]/#/--deselect } || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/deprecated/deprecated-1.2.13.ebuild b/dev-python/deprecated/deprecated-1.2.13.ebuild
index 89023d5fda4f..2b29703c6c02 100644
--- a/dev-python/deprecated/deprecated-1.2.13.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/django-allauth/Manifest b/dev-python/django-allauth/Manifest
index 4d13d37a1e87..eeaf2fcdb3b9 100644
--- a/dev-python/django-allauth/Manifest
+++ b/dev-python/django-allauth/Manifest
@@ -1,5 +1,3 @@
-DIST django-allauth-0.42.0.tar.gz 549566 BLAKE2B aa346bcc47b9419776a68c023ab560e5cba0fd97eeaf4cb2f43da4b2c53619c65a3ec9e1313ff3ffa0ed051718d41ccea2d362f56d6bd8dcf4c5a0569ccbb7c9 SHA512 2c31a70dfd3becf0f921b0566204b8b3221b0c85e82cb8a8ad37ab557fc6f302b9c24bfdd6885978157f4ccb9044d1eed9973d066ee59877aee727c60d2a5b46
 DIST django-allauth-0.45.0.tar.gz 581007 BLAKE2B a0f586818e4d17ece5ed009481b71c0213bf265f45d391664d411268d53124c1d5df226ca40d98722691ace5f5ed50026b0a9db3bd34070ff855059bf3e237d6 SHA512 16b166a5f97e62fef3c801af17b6b7569bd27e597cec394032a2644397afc30512f52f0ff77af8036e414086cd207dc9f5d310dbc744627b55938243ba18e50f
-EBUILD django-allauth-0.42.0.ebuild 663 BLAKE2B 792557d0a5b45cd7b712cedbc312df96deb651388205407455ddd6fb637912c588144978eaa0038f3fbec061ba76b51a26ba55eda95b3f69a593f2e633c97694 SHA512 1a08051188196f026a1cfdd73b3f09f3c449cd2d5756bb1597b04554b3816c76645869374ccfecfc1f45fe5c0423e4cc3d9e25105a73a6a1ed3a2eb077f59142
 EBUILD django-allauth-0.45.0.ebuild 1126 BLAKE2B e8ad92eebcc6c680cfa07f3f0e5a60e13cc93d303f4a4535d2479d81fc36cdde7107b7a108d5bfd467723b229558b776fe5ac84a71dc3ab9467df55489d9b960 SHA512 5c2cf7592801fc7b43f6d01b50ed9d90b723479436440ef14215daa9fb8c63363d955e6b9b85393231c25c3f78de4b3e92ed330e7c73e16adb8a7d7ab6ecf716
 MISC metadata.xml 395 BLAKE2B 53ee21b25c65e6326fecf6a7e367173ae31195eb1c0232a67c14c1f961acceab34a8809cfdb6e987c3d160463aff30e1316fd01b5c37133d808835b6bfa2d82d SHA512 8fdb6f6edb4d6aa318c872f03dbac6d21bb448c9fe6bf9dae309aaef9c45336872306b93cd685bfb11ebb866e6360864d2125f5d5f306ebba1ce515400929adc
diff --git a/dev-python/django-allauth/django-allauth-0.42.0.ebuild b/dev-python/django-allauth/django-allauth-0.42.0.ebuild
deleted file mode 100644
index 5acd64c0e52b..000000000000
--- a/dev-python/django-allauth/django-allauth-0.42.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django 3rd party (social) account authentication"
-HOMEPAGE="https://www.intenct.nl/projects/django-allauth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]
-	dev-python/python3-openid[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-
-DOCS=( README.rst AUTHORS ChangeLog.rst )
diff --git a/dev-python/django-appconf/Manifest b/dev-python/django-appconf/Manifest
index 75a9417623f2..4f057407daee 100644
--- a/dev-python/django-appconf/Manifest
+++ b/dev-python/django-appconf/Manifest
@@ -1,5 +1,3 @@
-DIST django-appconf-1.0.4.tar.gz 18733 BLAKE2B 21af3c3913aafe6a7670256bb10e80d0ac286fdeea646f91e8696470be3c1dcfb0b6d04e626f80784de02693583bf0b7a16da658175f8a1d81200a5c837831ee SHA512 0d0a206d43d4c6d7f3dbe5fb6423f5f012dae42bae7459f3ee06501f9c126e73f69a30da5c34c84014e582a7b42f253ebd37ece8b8477963cb5d2357ca095639
 DIST django-appconf-1.0.5.tar.gz 15891 BLAKE2B 4d031a229ab11d55d85887346cf208cbe1136e48b78a4c096ba6d67017d80031d634cbeef82783713e4e005fe8a19f1f8e12193450b04e968b8ea5a94290f2bc SHA512 9d1b01e3f8dac5a9a7f6f4f5c0e9fcf4a2a0177e7702e5f932f238379bd2bb065a698c86d27c2dbab7ba6480abdc25595c8a4f7c6f0524517aeb1c0e34f09864
-EBUILD django-appconf-1.0.4.ebuild 452 BLAKE2B 56c1e10aba88145fae58eed61b8fa559d4e88843e14fe133445d5cc45086979e750eafdd1ac301bbca36765b60fcc6c39e24ef5c3404eba00645a0bf15fa1fac SHA512 f2db9a0b230b3f276026523bf7df60409654d99a4d4da98269ebe7345d7479083dd7c65063de84f7afe4dbdc4ec0eebf91be1ef7caa0445af476c9cc2e992a6e
 EBUILD django-appconf-1.0.5.ebuild 585 BLAKE2B e7f5dbbdffbdf6106043ee67f473e6f80a4227722c78b1dbc617c6079ec5f3643c72db7394058be04f4ea0a3045d50e5f27e37b03c19e0ef4a21ec3669d1fa33 SHA512 5b02128526becc84c0815d2ca14139fea79203972d81aab30c716baa7b2502b91aaf01b0eaa075281e680ae8584907487f858031eb5e5ab705f04a0e6d3c5157
 MISC metadata.xml 390 BLAKE2B eea8508115e3bb1010b73aa9d49c6cd540aab86396314a1ccb7cc084641c017ce57f096c506d1770b5373de438273cfae7a9c3d9c7ca11e75365d6e3b6ca36f8 SHA512 d1a01c208b9af608e3773ac9a1bd3c2a2d97ccd4af95438dc3f0f155fb713b44571c6f3e390f1a6ff31b6a10a8ca65b3725a365b513dcedfe898b1b25e16e2d8
diff --git a/dev-python/django-appconf/django-appconf-1.0.4.ebuild b/dev-python/django-appconf/django-appconf-1.0.4.ebuild
deleted file mode 100644
index 485382d2956c..000000000000
--- a/dev-python/django-appconf/django-appconf-1.0.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="A helper class for handling configuration defaults of packaged apps gracefully."
-HOMEPAGE="https://django-appconf.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-DEPEND="dev-python/django[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index a73d007e64fb..8c83b2149aa9 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -1,5 +1,3 @@
-DIST django-auth-ldap-2.4.0.tar.gz 53523 BLAKE2B a8c49b4a4ecaaf31b3b9e7caca228041e110b5b418bef0a16c0fac423d929b0bc416cb83d8dd54f0f4567503ce9d09f686c936cc9d7e170d2cf93d8c124bb3d8 SHA512 acf85846ebf6bc354f6bf00f14f3436e1701f1d7a7746cc3572310f92ae93fb75ee6eff38558548d270f2e22d64aa7c0108f4cb91457a783aae76adc714b61d1
 DIST django-auth-ldap-3.0.0.tar.gz 52381 BLAKE2B 6964b36d72b365899d4dd3dc96f16b9c1f12c06ad95c7d387ec27ac6dbc38807e16fdb953e172fcde1a0d4042f318d276b780e474d9b810325e97cd601d070b7 SHA512 105885e62fd22aace2cbe291a107046109a91507ba77257b9b428e6d49fb74b6f47116f1d8325c3fc186590b00fb2b46507dc5b73333707e56d84e9a7b926d9e
-EBUILD django-auth-ldap-2.4.0.ebuild 888 BLAKE2B 63e2603e90f39e3a98dfce26142f83a5cfb689ae108e55259b3c3858a271845d2de128d95aba8e0201a94d0c3b13342f4422b52fdf00a1507172d18fdf813a84 SHA512 5e3dff77fa73754acd3d33cca398dd6c35ef7fb871264201bbf2acc9014021d3d504af2af7c0ca04dfd32f4dea2a697c1612f0e3a08032698e039bab2fb849bc
 EBUILD django-auth-ldap-3.0.0.ebuild 886 BLAKE2B 06c81941e067e5f682bbc6487fc20b2c9f18a2dc3d619f6dfdf0a2701ae4aeac80c3e9aa2b09f700728c7e1ad8b15b8354bced9b9c102486c763b7c45a630fe2 SHA512 4e2d74840920b1080027a11fb0dfaba9299e8ab53ead0f5e5b682b8168319d95becf057bf6e52ef7994d9a5366802b1e5c11f28cbf079eb8ac4ea50681bfdf16
 MISC metadata.xml 405 BLAKE2B e9d6f5ca53505cbfa7f9cd1cdc47bd58ba15ea972bdf342874c031ec151a053025b8f63a8d9c96de90ae0798e77d0db019a70d21e8746449543bfa5d91e3fec0 SHA512 453100976204f0b32042a1711d257ae76214452579d3008f403efc11cdf5e080e3663b43c1946b9da91086de580c0a8cf860fc99c00138c9d1bd4a01a5d1dcc3
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-2.4.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-2.4.0.ebuild
deleted file mode 100644
index d87561115bc9..000000000000
--- a/dev-python/django-auth-ldap/django-auth-ldap-2.4.0.ebuild
+++ /dev/null
@@ -1,38 +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 distutils-r1
-
-DESCRIPTION="Django LDAP authentication backend"
-HOMEPAGE="https://github.com/django-auth-ldap/django-auth-ldap
-	https://pypi.org/project/django-auth-ldap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="BSD-2"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/python-ldap-3.1[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		net-nds/openldap[-minimal]
-	)"
-
-distutils_enable_sphinx docs --no-autodoc
-
-python_test() {
-	# for slapd and slapdtest
-	local -x SBIN=/usr/sbin:/usr/$(get_libdir)/openldap
-	django-admin test -v 2 --settings tests.settings \
-		|| die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-compressor/Manifest b/dev-python/django-compressor/Manifest
index 5c4d91f50892..7cd61f8641a1 100644
--- a/dev-python/django-compressor/Manifest
+++ b/dev-python/django-compressor/Manifest
@@ -1,5 +1,3 @@
 DIST django_compressor-2.4.1.tar.gz 123800 BLAKE2B 455938c328c787e6ca48b3c413f005f9ba3cfc186587b821afb804c0de6259702060d4493e34f240bd721e547ce496a1b0de7a478eb8c9b7ac8e4ba49be755fa SHA512 d59fc8b97f9f87b26e53a9822a9b467df77449cc480a7145d7fedf020a85516dee6f3bc04519fc2e2b751134fb10ce4ddbd4ffe394b5817b973db8d90b9ccda7
-DIST django_compressor-2.4.tar.gz 111853 BLAKE2B ace3796d85d654c1c22b51cdd1331e28e735659be6c724a29c722fb9aa5cf0ebeb737a3f5c43abe1f057a015689f39ff5f8ca5a28141cb7369c5ec9edb7447a1 SHA512 b4dd43ab4ad13872138c9b9be3012e2675db2131b384350c5aa13ac7859b1aa93760cc3b9c91393f51bac404eb66ae04f35b187e0b0ebacf5f0da457dd42e727
 EBUILD django-compressor-2.4.1.ebuild 835 BLAKE2B 9b277d0fe7ff922338b6d872984aaccba6e265c5bd61e5dfdbb008884970ce080a2578de829cdedf5e7b14616e87587a4df0f42bba0603b048be3a4eab8448b1 SHA512 f64287a04d3989f53b6e3a2ec8c157d48e2fcbeee232c5aa3a444d63facb832c5ee3876e6b7d715eb0f8e24bb30662325f52ece751f3923ef305228f931df1e4
-EBUILD django-compressor-2.4.ebuild 598 BLAKE2B fb17efe9c83230e9a29577bed25bb920b81ed48e5b809a6a88be69f58c39de87ba9a0f3b834acf5d481a927f61180981faea01dc80a6585cc68783f7f6cae917 SHA512 0d67b2e5b39dd63f82097a38f6af5de1cc84602e7f2a0833cf7dd2eaac11e5720e489f62ee9479fbff03a7dd514209eaee409e60487062cd7a27bb8afef45c37
 MISC metadata.xml 297 BLAKE2B ba3b4ec455bf39f49c28e2c4406e83c12fd580445af876940c1e94495d7625051245a981cc8bf59ad3868ae43f3f893a0c5ad26e305df758d31b8f6b6160c8dd SHA512 084e20a298757300206f3065d2823cc545d075399e0cc84d12f8967e3c6d7c9330c033fd7fc4e217c506270b6327f75c26889748ca7fb5deb10568a0c37bfa87
diff --git a/dev-python/django-compressor/django-compressor-2.4.ebuild b/dev-python/django-compressor/django-compressor-2.4.ebuild
deleted file mode 100644
index 5a203e51a3ad..000000000000
--- a/dev-python/django-compressor/django-compressor-2.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Compresses linked and inline JavaScript or CSS into single cached files."
-HOMEPAGE="https://django-compressor.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-DEPEND="dev-python/django-appconf[${PYTHON_USEDEP}]
-	dev-python/rcssmin[${PYTHON_USEDEP}]
-	dev-python/rjsmin[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${P/-/_}"
diff --git a/dev-python/django-cors-headers/Manifest b/dev-python/django-cors-headers/Manifest
index 41edac63281b..c5984123e691 100644
--- a/dev-python/django-cors-headers/Manifest
+++ b/dev-python/django-cors-headers/Manifest
@@ -1,9 +1,3 @@
 DIST django-cors-headers-3.10.0.gh.tar.gz 30786 BLAKE2B cd4de0b851932d023982fe2df8dbb00f56b863d2932a776e224b3f026ae03174561b1ac39ada9f0ef2e2057f8f05e67314e6ca935aa8beca31588472becadaec SHA512 dbb4925a1818e9e3cc18294ee0636ed193a195f4f6cf337ff01ee295ff7943ed376fa53071ea68f87df83d30dd9028ef75b36181bc128635c6040c8a3720676d
-DIST django-cors-headers-3.7.0.tar.gz 88367 BLAKE2B d8a41a605d4823852cce65ffa8005d1e82598cdd81702d1ecef304c2a117dc553447c0cc7e9c31641165f0ba6975b757365733b349c0f5b1f4e9964095b918c2 SHA512 e1dc9695f99108f0908d8d348d284f1fd4a8ccbb84b3c748c9ae8d81d6f32ac8ef3417b612710e64ea4c63d464d97ac31a199292ebcdaaec3f3e37ad025ed0de
-DIST django-cors-headers-3.8.0.gh.tar.gz 27602 BLAKE2B a6ad81288b57e731f784fa0a5dda396415d6a4bd8166844f8f2f51752af2825b8d8c1241d5fc645b1bc4f963f852c508b8f29993bf1a6567c07b0ba0f1d90025 SHA512 633269faa1e1606607420ebc400d52105fde5beea46b37238658b5a40a25ad96101648c909f6efb6931d9fe138c5e192026797fc5146acecf791f1d82d4aa2ba
-DIST django-cors-headers-3.9.0.gh.tar.gz 28921 BLAKE2B 8ff5ab2035f938652753920f632d73488b568ccc3278d60ff6a7030ca1c6a7bbc36b29749f450ad312cf3e8c12f80c85f9e9841b3b4a26fb84cd06e0cf9f8255 SHA512 b7797c5ae4a9b8f12dadbf4b794da196c89a336469acb541d159f5ab3bff000825ab687f9e49996d3955c5700194eb62e72513efde8ae1ad4f4b84ceacd26a38
 EBUILD django-cors-headers-3.10.0.ebuild 620 BLAKE2B 3e2ed0da95fe010f68b8fddd9b8e008ff3c20d7e6b32edf0aae1b9cf39a09032ae85381db8894fa9a0d91dd00a44a6f14a14aa5ef7fa918cc0142fe9af8e91a2 SHA512 810025ae71caeaaf8b39257a89465104e9382b857d5556f5e14e87b0bd8d495d4e20712dffae6f324c88412341dc66716f4250f5c2933411f2331cd980293679
-EBUILD django-cors-headers-3.7.0.ebuild 572 BLAKE2B a1068113db9527f8a9c28657fe2c444930081efd361d6a6dd55cf890c5d2a3e77d7c60aabc4b9313bd6faf10fa06292694772f45d0db1bc7bfbb072ebda45b85 SHA512 eb1cb24debf50e6e6c8b6d8aabdaa3c6630ed8cd027f5ff4694f3455d5670f962be982b74c3f3258b1169e95651a9f82f09a336261286bef04e77711569a43af
-EBUILD django-cors-headers-3.8.0.ebuild 620 BLAKE2B 3e2ed0da95fe010f68b8fddd9b8e008ff3c20d7e6b32edf0aae1b9cf39a09032ae85381db8894fa9a0d91dd00a44a6f14a14aa5ef7fa918cc0142fe9af8e91a2 SHA512 810025ae71caeaaf8b39257a89465104e9382b857d5556f5e14e87b0bd8d495d4e20712dffae6f324c88412341dc66716f4250f5c2933411f2331cd980293679
-EBUILD django-cors-headers-3.9.0.ebuild 620 BLAKE2B 3e2ed0da95fe010f68b8fddd9b8e008ff3c20d7e6b32edf0aae1b9cf39a09032ae85381db8894fa9a0d91dd00a44a6f14a14aa5ef7fa918cc0142fe9af8e91a2 SHA512 810025ae71caeaaf8b39257a89465104e9382b857d5556f5e14e87b0bd8d495d4e20712dffae6f324c88412341dc66716f4250f5c2933411f2331cd980293679
 MISC metadata.xml 320 BLAKE2B f087ea8018f5302f24a73d32a3621ca22637f94810eb40914deb6a2de38a9522ae48be6485ff65d31c1b860b870120a95ff47e82fb53f5de3c7dd6bd067b1257 SHA512 e36e854a4af0bb40e3105826db61df2589783c03556a1d7f9854a7c920d448e2edf6d00a7a631ee688f6fad4ec672bf0a29d605816f4939a324ec7a1567b5d89
diff --git a/dev-python/django-cors-headers/django-cors-headers-3.7.0.ebuild b/dev-python/django-cors-headers/django-cors-headers-3.7.0.ebuild
deleted file mode 100644
index eecd52c04404..000000000000
--- a/dev-python/django-cors-headers/django-cors-headers-3.7.0.ebuild
+++ /dev/null
@@ -1,22 +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 distutils-r1
-
-DESCRIPTION="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
-HOMEPAGE="https://github.com/adamchainz/django-cors-headers"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-# Tests need a configured database
-RESTRICT="test"
-
-RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/django-cors-headers/django-cors-headers-3.8.0.ebuild b/dev-python/django-cors-headers/django-cors-headers-3.8.0.ebuild
deleted file mode 100644
index 441ad19af723..000000000000
--- a/dev-python/django-cors-headers/django-cors-headers-3.8.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
-HOMEPAGE="https://github.com/adamchainz/django-cors-headers"
-SRC_URI="
-	https://github.com/adamchainz/django-cors-headers/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/django-2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/django-cors-headers/django-cors-headers-3.9.0.ebuild b/dev-python/django-cors-headers/django-cors-headers-3.9.0.ebuild
deleted file mode 100644
index 441ad19af723..000000000000
--- a/dev-python/django-cors-headers/django-cors-headers-3.9.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
-HOMEPAGE="https://github.com/adamchainz/django-cors-headers"
-SRC_URI="
-	https://github.com/adamchainz/django-cors-headers/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/django-2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/django-debug-toolbar/Manifest b/dev-python/django-debug-toolbar/Manifest
index 380777bb9efa..1553ecad9f5a 100644
--- a/dev-python/django-debug-toolbar/Manifest
+++ b/dev-python/django-debug-toolbar/Manifest
@@ -1,5 +1,3 @@
-DIST django-debug-toolbar-3.2.1.tar.gz 231177 BLAKE2B b07ed03a92b5799dafd1b15b41335c5da6994be1001b579c85e0923ccc092e617ce04c9a2f4344716213cdd62425737838a8539ca5b566928bf8b4c133e8451e SHA512 d28e13cc2e3bbb27e9c728037229adac444180e3831b88c9ac1aa0e139bd1e85f9190c7a324afe3292bde4ad0c919bd17fbde4998be266f81314b9b22c4a28e6
 DIST django-debug-toolbar-3.2.2.tar.gz 239313 BLAKE2B 0e53709a3857cefc0ff7a7176ca248891122b2d758264c32171198a22b0c105af414eaba0095b1435b4f071120038f4665bd84438d77a8f65156c056d523f60f SHA512 df1956d63e88d3cf9f831609b6191446a162afbf396cb6d20e5a42aab4276ab385943cc305cad58a9f388382b0dffabc8baedf2150182a4302e7da58ab3d6a5c
-EBUILD django-debug-toolbar-3.2.1.ebuild 962 BLAKE2B 4c19b67f4401317503f3aa38eb4362b04c66be04a3706d5a9f3ba08c2905dbfc6b63e8a324118a4d2762f96e859eb77deaedb6e9cab56157e2d5434469dbda14 SHA512 190e91eac002f1dbbfc195e968642c1b26637038350c54d144f6079708a611b498feccc65dfa69f9d48e2590cc4963b9b122992a02e698f43c5eb8e0fbc9b8e5
 EBUILD django-debug-toolbar-3.2.2.ebuild 981 BLAKE2B 2f1284025104260aab12628d4c4439d5af244effd4ea4e8103535e99e5900ea90c23c0a369f98ae83e427259800568f4710f614ca43c93a2492460a44a49f7a4 SHA512 6866794d7e23eabd6222b8b262e0a562229a6ebe228aeb02da0fdcb8b3ca83dbda0f95eaae5658c4a8eaf54a0ede6f4d1f2c4f723272dcb1cc17875f39f513a0
 MISC metadata.xml 393 BLAKE2B b903eca6ed23f64829c0f7ada77c2cff44aad9031b311dc4a4d085327ff7f894a27144dcb6f8ffc1a60c16a4915871717acb090d5829abc2c030044037c1bb92 SHA512 730834a56e939efd02dcad6edb69ca62f7e9497ef33e9410b007fee00c2f9a61f44221aef97c40b60ffe1e7d462c1cdf6805ae638a58318822f054ebe7befd6b
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-3.2.1.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-3.2.1.ebuild
deleted file mode 100644
index 06f03d13eb93..000000000000
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-3.2.1.ebuild
+++ /dev/null
@@ -1,47 +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 distutils-r1
-
-DESCRIPTION="A configurable set of panels that display debug information"
-HOMEPAGE="
-	https://pypi.org/project/django-debug-toolbar/
-	https://github.com/jazzband/django-debug-toolbar/"
-SRC_URI="https://github.com/jazzband/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-1.11[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	emake TEST_ARGS='-v 2 tests' test
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-filter/Manifest b/dev-python/django-filter/Manifest
index 7bcbd8151c0a..eb36dac5c2bf 100644
--- a/dev-python/django-filter/Manifest
+++ b/dev-python/django-filter/Manifest
@@ -1,6 +1,4 @@
 AUX django-filter-21.1-test-skipIf.patch 1054 BLAKE2B 96b9c5bfd9cb5f530dab0ad8bb5b80507596a5ce28f694a1f84bc954ca9de596063bf9c88850e6c5db2758b362463de0f9ae451d34023918d313617fdf2b2715 SHA512 bb0d05b7ee78ef8e4b95f51ceddde7bb3068688bb4fc6805f73787c6a23b38c4230fef5cbf591738b6069eb897840d791b6f414b1a74ad21f776226ef2bfda38
-DIST django-filter-2.4.0.tar.gz 146904 BLAKE2B 994b07c0f5e511451964f4f1e007ff9906975600d0bc8a02dcbeb86f91bf906490ca394ca95c23c57c1fff25a447f50a40054c0abfe385300f9db87645753978 SHA512 0584222b46add89aa7dd1dfd334fdd19903e0119d455a2c46644c501a66df224f9f51c33394d130bcd1fc0f28c6ede6d6853b9790430040ec7228f9a1dc55264
 DIST django-filter-21.1.tar.gz 154188 BLAKE2B f0ae3119a1dfa466e6630f7da44db1531172991b137fe9420ed533a7b3d4177f689f07fed115566854bd40e5e23f4e9f2f73be32188af2c067a81a95fbccc5a3 SHA512 df2b02bfa93874d9684a26394778203b827c6459ab8cc8c581677e6ccfeedf1323085f53fb52cfc3e0e0a3d27f86de655366bcd4be361502ce86e65b4a4e84d0
-EBUILD django-filter-2.4.0.ebuild 534 BLAKE2B b1f3032964c78d6722f05f711b62ad10a1a871c1e46f3e6ccaa7caf697a11661a60b7832f3b04737a4cf1c424a0b68ebc8b71408c9c518d3eb26ee09f8e59e48 SHA512 32160f83365c53b49991335dfbb4420f943f849354832e38ab914d25434b72cd46beac326aafbea6cab995ac1a7ff530bc07fb6501e6d0e063eaeb7e92d85010
 EBUILD django-filter-21.1-r2.ebuild 817 BLAKE2B d08cb66a3af23d3e6aa72e541b80e453fb47ab7021e13d86b9f345239508968593e69c0cfe05572e035e61e96db2a3263d62dc85fc902f6e26cca26bb50b4d75 SHA512 63f33f5b37eea71c4add1d596b325a6a999e0b14bd8ed7bc7ff23e97859c0a35b9af90b7051435e726a680c0391496312443e049880884039b04ccbf18218ef7
 MISC metadata.xml 384 BLAKE2B d1de931c4e164f99bc55c099b97a44887f5907fa487bb165d5c386458ecca7f18a13803e7be0180cddbc17195c5d5fe3219524f49b30e6c81303d221d6f764b9 SHA512 c316163f5ef1a02754589764a5a585fefc60b9921775d56a558ffcc87896071764d55c6c5cb4dd436eee17b0fee87330a4cca38884cca76521f8098e9fe2e60b
diff --git a/dev-python/django-filter/django-filter-2.4.0.ebuild b/dev-python/django-filter/django-filter-2.4.0.ebuild
deleted file mode 100644
index d79fbac04dc3..000000000000
--- a/dev-python/django-filter/django-filter-2.4.0.ebuild
+++ /dev/null
@@ -1,21 +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 distutils-r1
-
-DESCRIPTION="Django app allowing declarative dynamic QuerySet filtering from URL parameters"
-HOMEPAGE="https://github.com/carltongibson/django-filter"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test"
-
-RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/django-mptt/Manifest b/dev-python/django-mptt/Manifest
index ef4bd99e156e..db0f1f87e018 100644
--- a/dev-python/django-mptt/Manifest
+++ b/dev-python/django-mptt/Manifest
@@ -1,5 +1,3 @@
-DIST django-mptt-0.13.3.gh.tar.gz 303670 BLAKE2B 0185ecf3576ab7fe48ec4d7b2259e7cd88f2c5e3a8c96aa1ee555b7f0adabed4b787db84bcc4b2831746b410f0f58364df8fab9ce1768f1e1b9d1ff8a2869730 SHA512 602f45d4353dca80ec2285366c87eb60ff6a39a09990a041236f737371715166e9a8e360a83b4419c0ded7a206f73e4754de602aabef18f89e7db85ce8c651ea
 DIST django-mptt-0.13.4.gh.tar.gz 303688 BLAKE2B 66ae7a0e15a7ff281af2154f216970a6a9b249a713b3ae987f0fbdb60b95129fdfc96c05924c0285da33f11c59baf6e069830c3079c64164d838d9d34231a4a9 SHA512 86786763db060227b41e2e340df5d52062fb6e8c54f832611bc90d01102411d45dc217e8d84eece84ebbe4fc9727d06e7c368ae15c253aaf02117705dbae8c47
-EBUILD django-mptt-0.13.3.ebuild 657 BLAKE2B 6b08d5f77741b67f41edf92c0a2d8442266ec676d43cd0168522fe1a9627a0b13ae33f142dca1b4276811713049d79eb1a7c8949682a23a8b9ec5c6cc5a1d3c0 SHA512 e11bc2eed74ec36a2b65557c929f1a5d63df07088eb0fa19de0e3d21572c1dbc8369213f1b79601c1e383314f7db35686726abf837bd55b5b9dc6f8bafb4173f
 EBUILD django-mptt-0.13.4.ebuild 657 BLAKE2B 6b08d5f77741b67f41edf92c0a2d8442266ec676d43cd0168522fe1a9627a0b13ae33f142dca1b4276811713049d79eb1a7c8949682a23a8b9ec5c6cc5a1d3c0 SHA512 e11bc2eed74ec36a2b65557c929f1a5d63df07088eb0fa19de0e3d21572c1dbc8369213f1b79601c1e383314f7db35686726abf837bd55b5b9dc6f8bafb4173f
 MISC metadata.xml 242 BLAKE2B fec2ed386ce9cd0b12aa9a319095a55d6744a61c9dfc0fac4a6369267a4b288d9636764eb625a2a23c97967f883b40b31ba9b27baea4f5e4937d19ab1c0d672d SHA512 ed57e316f0dc73592de3ad6e07bb4997ad443bb0fe710279df889039e026ec2d5296f62a531e12eecced9b8cecbb54b07f96296335ab4997013d88f49f932715
diff --git a/dev-python/django-mptt/django-mptt-0.13.3.ebuild b/dev-python/django-mptt/django-mptt-0.13.3.ebuild
deleted file mode 100644
index 10262c58b326..000000000000
--- a/dev-python/django-mptt/django-mptt-0.13.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="utilities for modified preorder tree traversal and trees of model instances"
-HOMEPAGE="https://github.com/django-mptt/django-mptt"
-SRC_URI="
-	https://github.com/django-mptt/django-mptt/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-1.11[${PYTHON_USEDEP}]
-	dev-python/django-js-asset[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	"${EPYTHON}" tests/manage.py test -v2 myapp ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index 3e7eb4f4437b..9ee64de6d5ca 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,7 +1,3 @@
-DIST django-otp-1.0.6.gh.tar.gz 69023 BLAKE2B 82534fb666e27ab654b1587160fd9fd4600d1ecb57f5b506b383c3d7b36a13d6bbff39598603c7c3bc69edc871a6a3ad1aa2531a92ea921ab07798e7e4bb1316 SHA512 ff14a786bc8b3d22c8767fa78d676951c262389dfe00def981c79894d299f393ffc86510c33866482aa246ac1643238a3de5701bb76cf56aea5e3ba0a25cbb97
-DIST django-otp-1.1.0.gh.tar.gz 71399 BLAKE2B 826677582fff6102b3e65750c367607e9641aa629a59f064af7023774017f6e7817f36e51e0fada181fa84054545367689b8b499ef9625729c8434a903911876 SHA512 b23c0e72508c890f7a84b59b7827f093aeaad77e6df7c824894bc789282db6f8a26699c9a3ee9bf755eb8e13c6fe5a80fad263659be7528762a8cc29d4636e11
 DIST django-otp-1.1.1.gh.tar.gz 71526 BLAKE2B d68c0fe99c5437d08a8a0a433b4d6f41f0068047e3899efbb24234696c3494a064982aabc02d2788662d516235413bfc804f76cf5ffa1c608d3aa61927e2fad3 SHA512 5946cd64fd0f52dac5ef9fb192f8ecf78e99c96fe7e3223b41c68d96e249f6727149ef58a2dbf48024452e078f5f93c1f9edb9db2a25def5cbb3992c16aac18c
-EBUILD django-otp-1.0.6.ebuild 880 BLAKE2B b9ff538f687758c5b75c80dc267658b18f8a40ac8cd8c73391cab2d7e71523dcb4f04bf0a6cda0edb0a7270c6b8902de424b32743a7a51e25f18c17a57a20fc4 SHA512 b458d75c64a71018d6b4e7e9596629d901443bd96ccab7b2ef350d0dc75b8965ed2f3359597662786a3aebafcbb39db8ed4eeb898941c9c60598721449c456ac
-EBUILD django-otp-1.1.0.ebuild 879 BLAKE2B edbde8fe955a2916043dc00c3d60eaf329439b71e56aa1c3a6c125c23b83cfefbd2134187214ef543b66d5fd42ee2f6be08fa9b9738e89326b28c2ea78de3eeb SHA512 be93ae1001eba37a7ddbc772466a42d44956bd5357eff20a90d616e5ddab1c1f63e9012a876023c85fb0dcb4164c88433146c73bdf6d1a18b1923df091b6a4ef
 EBUILD django-otp-1.1.1.ebuild 879 BLAKE2B edbde8fe955a2916043dc00c3d60eaf329439b71e56aa1c3a6c125c23b83cfefbd2134187214ef543b66d5fd42ee2f6be08fa9b9738e89326b28c2ea78de3eeb SHA512 be93ae1001eba37a7ddbc772466a42d44956bd5357eff20a90d616e5ddab1c1f63e9012a876023c85fb0dcb4164c88433146c73bdf6d1a18b1923df091b6a4ef
 MISC metadata.xml 387 BLAKE2B f1be13d8af9a4926d7c82442cb939f1030a8234d4f18917cf8b2b8b204d763974b5f08f8597334238733d6446fc1165ba19d454e13105dc16afacf1fa3a98ea0 SHA512 d85060b9982c55057128a0c7b7fd1537e3eb613f9d44e6c40438283d76f6d65c92db78815005ce44b4096d57c62584659d5997491f003ca1ed8c36f88db8623c
diff --git a/dev-python/django-otp/django-otp-1.0.6.ebuild b/dev-python/django-otp/django-otp-1.0.6.ebuild
deleted file mode 100644
index 0468cfa46262..000000000000
--- a/dev-python/django-otp/django-otp-1.0.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
-HOMEPAGE="https://github.com/django-otp/django-otp/"
-SRC_URI="
-	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/qrcode[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-python_test() {
-	local -x PYTHONPATH=test:${PYTHONPATH}
-	local -x DJANGO_SETTINGS_MODULE=test_project.settings
-	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/django-otp/django-otp-1.1.0.ebuild b/dev-python/django-otp/django-otp-1.1.0.ebuild
deleted file mode 100644
index 892604810582..000000000000
--- a/dev-python/django-otp/django-otp-1.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
-HOMEPAGE="https://github.com/django-otp/django-otp/"
-SRC_URI="
-	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/qrcode[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-python_test() {
-	local -x PYTHONPATH=test:${PYTHONPATH}
-	local -x DJANGO_SETTINGS_MODULE=test_project.settings
-	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/django-picklefield/Manifest b/dev-python/django-picklefield/Manifest
index b4836b42c1a5..a7a000645081 100644
--- a/dev-python/django-picklefield/Manifest
+++ b/dev-python/django-picklefield/Manifest
@@ -1,5 +1,3 @@
 DIST django-picklefield-3.0.1.gh.tar.gz 12168 BLAKE2B 44af271ce471b5a327d02312c2717c72dcdba8b2e959ada0793bab0962aa02e29d4eeb58857cf3495d7f161abe13595f0027b7624244b070d9978ab51a434d20 SHA512 0b8fe6cd0851d59b3997f328b977430985c0acf5728ff8cc1d0e2e41f145b7c6ce77de02a2d06b4545b43cd4c02e6277206660b8301eb744b8e3b8ea0aed90e5
-DIST django-picklefield-3.0.1.tar.gz 9506 BLAKE2B 6eda8dca31454a5f8cc8a670a19e25ac0b641bf6b7d31d695e617653cd88c1d84b88c39632f1d915ce8e0fe0dd8432d687559f2037d94ab50758f71a8b4f087f SHA512 7f14b4803dc8bdb1d62fec4063bf6eb7714445f85a13a4fe098154fa2d7f6a4e54308bf2324bc4921eaabf1023bb06b89a4bf52bb0ff89594075e02672d217ba
 EBUILD django-picklefield-3.0.1-r1.ebuild 762 BLAKE2B 4359e4c1681b33bb157ce36eb87d9bae5ba433b1177987d49ca4480f178fa9a22ec830c0c02635dae970830ef6046628dc4c7ee86c19c87cd64788fea8b13d8d SHA512 9989d1ab2b7cb67f418fc474729b777eb16f43347776f52e83fccbf867dcf706a3160d7de94417d1da4982b39f20c5fc9f42782a12f203482f5a619ce66bb5d5
-EBUILD django-picklefield-3.0.1.ebuild 411 BLAKE2B 8ae86034abe6300919ce8716e7d9e0a4e299bd90ad7eee3729708e5348e9cb926ed35273de6c3f276a1f916fde3be7d472fdc0e4830eb46152772d0254b84763 SHA512 6d49e5dd8b9775618d895ca8ed3335b748d47ffcd8daad39f6c570602af3de3e1b16a180c40735a43b1bda02bbfc5da3124079795edbed7ef49a2a5f7e02a085
 MISC metadata.xml 387 BLAKE2B 31bb388a6c49d80199f476ea2a545c8cf5b334c001c3ae8ba7195f4fec4d64ab38583f4948c44f3e7926734c3cc1f491e5a016c3b0b89bfd3175254cfc672c62 SHA512 6abe1268e024d34bf615d3111b677fc505d65a924792615a1bd8f69d4fa66e22bb0f6c343efd7a617f7f2f7be214e8da94ff64a465dc0d22cbb22def906d3bd5
diff --git a/dev-python/django-picklefield/django-picklefield-3.0.1.ebuild b/dev-python/django-picklefield/django-picklefield-3.0.1.ebuild
deleted file mode 100644
index c25d62647957..000000000000
--- a/dev-python/django-picklefield/django-picklefield-3.0.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Pickled object field for Django."
-HOMEPAGE="https://github.com/gintas/django-picklefield"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-DEPEND="dev-python/django[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-redis/Manifest b/dev-python/django-redis/Manifest
index 5d3d70b425fb..08c05f7d04ad 100644
--- a/dev-python/django-redis/Manifest
+++ b/dev-python/django-redis/Manifest
@@ -1,5 +1,3 @@
-DIST django-redis-4.10.0.tar.gz 59208 BLAKE2B 76a6887fdcce7decaeb2c4b76ff0ff58b8b074e902f6ccfc57dbdd21aeac82fbe37367caaf0af1c6facd5b87db6bb053b2fc553ba87b3cca970f2c0b1f99e35c SHA512 39e2d72699ceb2b0887e7048db22a4067001fb5e2c10ae2c5d2d8a0ab71e862773e443ba3a109f7b874b994a842e89772b3e33152aafd2a98e1cd906d5d2e690
 DIST django-redis-5.0.0.tar.gz 47508 BLAKE2B 67d87bcbde16730abd71945fe081d425c1047962ff2ca0c382f65d0588ef72103204f8febfeeda9ea382cf53a5c871c087a85ea817f04fac383961f69324557f SHA512 4516e30122845b49789f04fd079b5bc99a732e814d82deb817f14d105895069defa627f1852ce3fd8464de313a5f01ba81f87272f7a98830f7100dbb0c0bfb12
-EBUILD django-redis-4.10.0.ebuild 495 BLAKE2B 3820d88bc95a84614d5370db8a4d746db09f6dc7323c65878243a2c28e8238a7f644ca99da9dbc9e46c51c5525361f6f3c904ee9a1d69b7fbe48fcf48293576d SHA512 3aa9b03f28c4f177b5b17546185403d8a53c82bbff612eb4cfb5492747b24a841c63feac33cbf587dc01c8b87fd1af54c60717a28dae7b4508c1e1823951cb1a
 EBUILD django-redis-5.0.0.ebuild 1572 BLAKE2B 9ba0eb8f6914320f4e38727c9fffafc88fadbf00212a95436235209c5b7ca5cc75082db9d7573812d9cc3ef3971a851c496263c228de87e0a1b0716aa390331c SHA512 5bfb19cd2efa4c7b702dcc904a2d9fa7ac1735c5ebee385ed4504c7281be0abb890f0ce32860cc0dc16ea3276df7850ddcdadc29e7af2dfd729deada1e460bdb
 MISC metadata.xml 385 BLAKE2B ad211356e7d9bfe2fdb8e5ef04dc1813f4dbeef2bb6fa86e87f26f84efc3a8258a754e946ec74c1e6be2b3b55a48354fb1c4931f7c91e42a8f43ba53a9fbf3ed SHA512 b530500be0f15f7631c611739a4267505147fccd4705c9eca6dd97eba3cf52b75e1eb2cd14336fd6e7a618136e9974bb0e9e00383a21bac3d1d5607964ecf67e
diff --git a/dev-python/django-redis/django-redis-4.10.0.ebuild b/dev-python/django-redis/django-redis-4.10.0.ebuild
deleted file mode 100644
index 58ee6c87a0cd..000000000000
--- a/dev-python/django-redis/django-redis-4.10.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Full featured redis cache backend for Django"
-HOMEPAGE="https://github.com/jazzband/django-redis/"
-SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/django-rq/Manifest b/dev-python/django-rq/Manifest
index 1d64839b7264..6e0397bd8c0a 100644
--- a/dev-python/django-rq/Manifest
+++ b/dev-python/django-rq/Manifest
@@ -1,7 +1,3 @@
-DIST django-rq-2.3.2.tar.gz 41038 BLAKE2B 837a8f819e9a91763b2d4ec961257d429e6d686fbaaa181d7fbe41efd9e08d958c5c340e4e1a4c8f0ef4063e985d3df82d8ea2c6a7cdea872b330dd545660e31 SHA512 8cf59aae163034240bfecda5f332dcc590813445cb2fc14bee15459ec8d4c50a36ab56865b3ce9360968451695e7a6d5eca5da26ef63c29dbc9dd58af8f16b98
-DIST django-rq-2.4.0.tar.gz 42455 BLAKE2B b60268625e8d57f1975c47df1dff72599fcab9eba0b43020196329cfc3c5447ce1bf9082338143f3f1d31434a8407d7a0e00b4dca64f2797ec54983930200798 SHA512 b1eec3f7e906bb4e553501940b9913727c8b21509fa10dd98ab5ad9f5625aaadd3f9c749824ad130005ac2a2ad8d27e8c8834466334f9bc09c438fcbd1cff344
 DIST django-rq-2.4.1.tar.gz 42558 BLAKE2B 8412db96dcc4b600ee7ca00e2a9aa5cfdb00ac517fb94ab256b3c132462f52f4de7408763eb98bc304bfe237fb0d7cb7991bdb9df20fd250780d52600b14df58 SHA512 44d8151847c18fd993242e5a5ff99e3964d5b9702d3dc8b574c3581617658ec0a9393c85b66211c273444f39688f92890a38802a8385bcf351a28d833eef5f19
-EBUILD django-rq-2.3.2.ebuild 525 BLAKE2B 5c1320106a8bfe8978e224c420b3609b2fe836e8c80f28d1bab1287efcc9b46e5ffde5e7cef7f94ea905d2613e0646bb4ea24c7654e39e3e57ab3e2d4e45dc17 SHA512 08c197bfbf308ba690946bb4951175b72c7fbbe2c66b42428cbc258645a1e5159de31401aac8b2278c477bf29170269b9a7186afd02272713c17cf6e7defa063
-EBUILD django-rq-2.4.0.ebuild 525 BLAKE2B d4484a5992cc25bd8a71ba65db18a434048b38a0b8745f74b63aea001f8add6bbc8adf162ff6f04a40d1ff2b28e06e444df4dfb1e78ca7d6ed9c9e012f6a0709 SHA512 8a280e96d341f3954385eb161cc3a4960f880dc96a3351052ad93623d499ac0f6288faf2d1be0068d6368e93538aa679babdfb762bf88109245220d3b6b5f977
 EBUILD django-rq-2.4.1.ebuild 525 BLAKE2B 410d29fd1dde1b228e73e56e9d4c654af9998312950028dac9b54e11016b5ee62e5bcec3ffb45362fd90abf00c431e857eb0dd62fb85b3cd46afd76495e0ebe2 SHA512 1a2edacbd65b88e357334ef74ccbfe6c17769394e8ac302ec6a9072b5ee0c24d19bba694473b5bed307d05045230e1799605d8ded32d4ddc9912c5a45fdc7880
 MISC metadata.xml 316 BLAKE2B f5387b05ac5d04367f7ebd083df1a6a3542e3e7db686acd586448ec9598225908969cb26f6da14da8de015b98e830642e5bc3aea509a72bb77cd86b11fcd8435 SHA512 45e25be4719c078c3e2720edbc7161dcf14be0a50461fd29369a09ffe641f13e82ebdba9e05bd061ef11d62cc3c322ba7872656fb1b0310d95c10f8bb2d9c072
diff --git a/dev-python/django-rq/django-rq-2.3.2.ebuild b/dev-python/django-rq/django-rq-2.3.2.ebuild
deleted file mode 100644
index 96a7c90ccc7c..000000000000
--- a/dev-python/django-rq/django-rq-2.3.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="An app that provides django integration for RQ (Redis Queue)"
-HOMEPAGE="https://github.com/rq/django-rq"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-2.0[${PYTHON_USEDEP}]
-	>=dev-python/rq-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/django-rq/django-rq-2.4.0.ebuild b/dev-python/django-rq/django-rq-2.4.0.ebuild
deleted file mode 100644
index 0f5a386b6fbb..000000000000
--- a/dev-python/django-rq/django-rq-2.4.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="An app that provides django integration for RQ (Redis Queue)"
-HOMEPAGE="https://github.com/rq/django-rq"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-2.0[${PYTHON_USEDEP}]
-	>=dev-python/rq-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/django-sortedm2m/Manifest b/dev-python/django-sortedm2m/Manifest
index 19a09b1aa710..bf4b66a499cb 100644
--- a/dev-python/django-sortedm2m/Manifest
+++ b/dev-python/django-sortedm2m/Manifest
@@ -1,5 +1,3 @@
-DIST django-sortedm2m-3.0.2.gh.tar.gz 44296 BLAKE2B 41dd4a7bc654fef638f7a387b1307ee32ca2d8733f4ba6b9fffc92a9ab4c6af7d64159cd5a24f4305483502609a1730fe12a3072f493251840ba840b98155877 SHA512 4e58ff37cdd798d88c47a8efee2bc783ad7109b30e023127345b6d12b176e452d6125fbcaba5392fc11660df3e8b66be4b23d5ff7ab90020f946cfedc80276a7
 DIST django-sortedm2m-3.1.1.gh.tar.gz 45888 BLAKE2B 878a23d5f5dad114b0b6ef9bd687d4e23620c823a8ad33a66b7c6c1e598db15e5328a46373dd6d7fd9449b4ba533e21664db716cde40150af2451a74f2f28fda SHA512 440c049a1fbe54c0db8edb0a5a737b5d84553afb7305d21a64c2dbac02f143e6f17e7e0499a4d3e687b13f292558d7818c030d78d8cc9443048a95ae6b50204f
-EBUILD django-sortedm2m-3.0.2.ebuild 831 BLAKE2B 5171bee1ec53f3792c3b78ed93290eecfdeacfaaafa09317eaa9b9054607838cbae1e22721d868ea8b2d41ca4b3c9793e049064afbdb56ef39dce6bf1955cb61 SHA512 712eb4730a47e2d95f4c147328f69c43a93928c48adbc52477f89332e06ed5a432b7e6e50f982e438029b4b0f083bc251d356f081bea8bd1a6e35c5963ba14b7
 EBUILD django-sortedm2m-3.1.1.ebuild 888 BLAKE2B 788400d715295fef60ed3bd7411937ada614024c88de29b43c92b69a272ee1db5297904dbef7bb92a674d3e75a51cbced0f6b8b2fbaf33953254e312995b7e56 SHA512 ce336522af4c6da3352e26f896410cc079a8c91ac3985c8880305ca4751fabea8f2e4427102f58765ffd02dbcfdac8036dd727afdda9c4fcbda256660cf7961c
 MISC metadata.xml 385 BLAKE2B be4400699a7c6efbd3ad0a115416e7fa7e7da396e8d5b5c24da131866a747c6b225c753e0a092082a4c0bdf6b067a070a204cbc66f2d573fe075b42013537ef0 SHA512 735bd3eae6c3083743b9ddf5af2a567bbf7a76f5a4c2d44b1bba74017ac9dfd2ed41ad86e448d851533c95cbf49b25d8ca13c7245ff0fd049d949083211d8ace
diff --git a/dev-python/django-sortedm2m/django-sortedm2m-3.0.2.ebuild b/dev-python/django-sortedm2m/django-sortedm2m-3.0.2.ebuild
deleted file mode 100644
index e88a9e197e2f..000000000000
--- a/dev-python/django-sortedm2m/django-sortedm2m-3.0.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Drop-in replacement for django's many to many field with sorted relations"
-HOMEPAGE="https://pypi.org/project/django-sortedm2m/
-	https://github.com/jazzband/django-sortedm2m"
-SRC_URI="
-	https://github.com/jazzband/django-sortedm2m/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-	)"
-
-python_test() {
-	local -x PYTHONPATH=test_project:${PYTHONPATH}
-	django-admin test -v 2 --settings=settings --noinput sortedm2m_tests ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/django-taggit/Manifest b/dev-python/django-taggit/Manifest
index ff269686a387..956af64c2197 100644
--- a/dev-python/django-taggit/Manifest
+++ b/dev-python/django-taggit/Manifest
@@ -1,5 +1,3 @@
-DIST django-taggit-1.3.0.tar.gz 46986 BLAKE2B ebe425bc17b67977d40c56b9072ef471e1239090056667f1a5792f005908cbffc31f9eb863575ff7d3d359ebef7263e085bad5b7b481ed9060720bd59f617bb3 SHA512 bd5a537fc11bc4b434a5dbbc11e583acb3878101fcfa7e24af3aca5f160e2f1ac8defc9454c0814d39eb47bbb8edea8d3cf47627ad4b4dc86b962cd69d415ccd
 DIST django-taggit-1.5.1.tar.gz 52766 BLAKE2B 59892ba591ad5cbc40a7515a6427722d7cb58e2daadec579b1c08dcc3522e24e041cbe06c953c3717cdf3db50aef7ff9fb5b4eac00344e457b61797745638107 SHA512 8e7afefd8f0654340e234f7bd1cc3684b3e5d1f4d94d17c79ed8fb82096c21a809e7f8db2fea9509d45c3f2bdc5e8ed52fb0823779b0a039f87528642803725b
-EBUILD django-taggit-1.3.0.ebuild 429 BLAKE2B 58978a90503dde259fcf0c9b0e7c714276ab1bf3bba34a25fd4adb2927ccb005f3bd46561e336f89d41b06680341651d588b25287570ec4a5600277f753ee128 SHA512 ead14dcc1f7495fe8ff63883e660e9f3bd5b00501649e7aa227a8ab4b955421c915e94bec82311c06c6a3ae4433b377342e5bec1d80129f8c88fb14b736073b8
 EBUILD django-taggit-1.5.1.ebuild 651 BLAKE2B 30cf35983a6d700460559c4a2da3839798407d7b961ffaf1063917c7e24816ed10f42d0fca5d5ea592513cf8a106587c14360e0365c982b94ac508d354f75e36 SHA512 3841045ce523b27828a91d0da10b2deb7e79cb434ce99f40d21dc0eae4a1dd9ce14cf3ffc15410661cf1745072827f051ccafccff98d5288af2cc2931a7dd95e
 MISC metadata.xml 341 BLAKE2B 4cd13e0c8330dc284424e011d573fc640a1af5804063c2a198b5eb95aecabba032936a477af38338f7edfefbc7e9fa3b2761c2bf7d132fa89202b36f24a64eb2 SHA512 6007ed469c39d331f190c107b3e9cff6ff6a80c9c7a7653410ad7b1fbf0f34d948b0a04ef00ff0ab51650d5d18a8dd277bac40c44354345d0f69e4ea45519d50
diff --git a/dev-python/django-taggit/django-taggit-1.3.0.ebuild b/dev-python/django-taggit/django-taggit-1.3.0.ebuild
deleted file mode 100644
index 036c3c00c750..000000000000
--- a/dev-python/django-taggit/django-taggit-1.3.0.ebuild
+++ /dev/null
@@ -1,18 +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 distutils-r1
-
-DESCRIPTION="Simple tagging for Django"
-HOMEPAGE="https://github.com/jazzband/django-taggit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/django-timezone-field/Manifest b/dev-python/django-timezone-field/Manifest
index 6017d4cb096d..9d6da9f8fcfc 100644
--- a/dev-python/django-timezone-field/Manifest
+++ b/dev-python/django-timezone-field/Manifest
@@ -1,5 +1,3 @@
-DIST django-timezone-field-4.1.tar.gz 8286 BLAKE2B 591a3d9a332102fd6b3a3cf865b1b9ca2ef1d7b37f6bc1a01ddc724050468d59ee5b6c14933203b6182a5efddad32e7e76b17980e415562404057b0e25393089 SHA512 3903e19ab66d636a4fa9c0364aa8232958c6b0d33c41253d57322320543e8f4993ff1eac2fdbee319b174e7e85fbb2dece9cd8db910913d4249de9eb862917e2
 DIST django-timezone-field-4.2.1.gh.tar.gz 23457 BLAKE2B 72452a21e6e086363da2ef40389d12b79860f66706e54fb9050ffe48f7fa6ad2908c75d4c7e17a79df339eac76492599dd4533ddca69a5b8757b46a36ed4b0fc SHA512 4c2da420c3aaffa23d8cdb66dbbe4b2ea8638de5a45d9e381bf9af980e52eba77fc03a2b8fee8497662199cdc9436d56543c0f6316e74ae5da68187a305c34a2
-EBUILD django-timezone-field-4.1.ebuild 521 BLAKE2B 9e9fd6e42cb5bfc36f0d5d15db80ccde90be27895e8e25b22f93dfcd8b8b7a89df98724c50645069fb02b89c25506b2647ade3a3ea24b83a5c0e5bc49f491892 SHA512 57c506aae9b717403fca3897c08bf3fd7cc1b319e218aeb4a8f574b7329d79f5fcb6803bbe798b4ed226aec86efc8125159dec408717437a1c6ab8169aad8aaf
 EBUILD django-timezone-field-4.2.1.ebuild 807 BLAKE2B 6b9fe27cf74bf9a38679c8c78cfc92bc8d3b60839a6118546b003d2d33b120010f084fdd785f4fdf0f9932de53e6cdf077476f0fb092461afbb2a5e79ede1d0e SHA512 1f175570d95e3a7fcc0fe3cd0a30f3908bd2bced12c0bda740a5e90347887cd7689ac60bd984c07964822d0ff242d8845b8a567cca2941cc375ce3ef802c4b7c
 MISC metadata.xml 325 BLAKE2B 481e3472db098df8d49a956b8771b6f32a7bfff8d0ab5a5d556a76c1dfbf4d393e566aed3bec7b8da37b72641f01ef34f1eeb4f5862bd7930facf517dff95875 SHA512 878eac6d1101f54284c6a33bc6458e6a9fa272dd3bc3c824f45e3c0b7b51835de2c9b80c312860e5d1dea0ca6fa1ad44b5e32d61cade7b818ffb4aa9427fed20
diff --git a/dev-python/django-timezone-field/django-timezone-field-4.1.ebuild b/dev-python/django-timezone-field/django-timezone-field-4.1.ebuild
deleted file mode 100644
index 28c1051de698..000000000000
--- a/dev-python/django-timezone-field/django-timezone-field-4.1.ebuild
+++ /dev/null
@@ -1,22 +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 distutils-r1
-
-DESCRIPTION="A Django app providing database and form fields for pytz timezone objects"
-HOMEPAGE="https://github.com/mfogel/django-timezone-field"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 100d81c79a04..38baea563187 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,16 +1,12 @@
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
-AUX django-3.2.6-argparse-py310.patch 2001 BLAKE2B 888987392f13643e367a8e0f003ab10e0c143034624dfff7e8ec50b91aa2c3a1569f243a383c533757b55616625a40e3e2569d1b0a5f78ccf7bedcdde7c74c55 SHA512 7070ef00895658d0308ece951a3bb60e325e79d81cd987d9296dc6cc9394ecf9329040b89e35fdb31868aeffb23cba80fa982c9a49495124674361f0d8bf614d
 DIST Django-2.2.24.checksum.txt 2558 BLAKE2B 8a4b1759f0c52f9dfe6eafc2b54d2d6db8c1204be837ef0df362e02afb41faa3fcfef3ee1b5bc10482a200db58c21c3a7a9650b6ed8103c69f196b655af5b239 SHA512 e26d71ed2cded2521837c82ee896b68d765da224a42f34457cb67a0105a72b2b0223655208400baddf7bb70dd51c4902b9ae80d8cb2bc8963c16b23d37bb2d53
 DIST Django-2.2.24.tar.gz 9211396 BLAKE2B 7422019ad8849ae543d7b2ca7f5624b5379c832b5d19511f52df77d95acaa0a45cc61579b0e3a74671c295ffab5e1dfecd1c044e9ec042c46606f888c257e1d0 SHA512 5a3ee79500ad458bfc5220b9b68248bec59bf6d2304d58ca280111854d6a5f7e25784680e949487e8b59c1de0b329a53cf0676d2ee4bb2b88463918c4b0b6085
 DIST Django-3.1.13.checksum.txt 2552 BLAKE2B e82052d952f7dfd15e11b413fe2f106af3d3774073c57538b10f1beeada3128de2cb3d861684599fbf5f337b0ae4eff3a101998da30d8d961f84ac7cb3bb31c5 SHA512 07870c27034f70f335ac35b34317944947f544f63108f21134e81326b4e8f05a7cb3d382d91e7f0a846d51944032efcddca2c3bf980f626627c74c388932e4cf
 DIST Django-3.1.13.tar.gz 9656683 BLAKE2B bb2dd72ba2dfc13c8f487d6b59cd9302160800dca4f63b92e640eddf4aba2e5b1bd67580e56477bced44a5393b5f65a463a9c0c539ba998a20606bffdfafcf74 SHA512 55b1ceb24b6e0ba542a96319f63b138439532cf4b00971a8432baaab4a8ee219cc9fbb31d457ba7da9e932c919df83da9630866d909df4a5d432866b158098d7
-DIST Django-3.2.6.checksum.txt 2551 BLAKE2B 2fae4e3daca01f285f651b76df7402a0c08cdea9a98bdc3be3f9b337732c26b2a3dcb239fc06274b6a30227394047476d454bf34fd7e8b765df047510b08620c SHA512 66b9dff471928be514198e50e62f46d14fbea9c1cfb55e9d82562271795fc3e719e0bb8c43a1f6ff6c903700b648a6a0e19e335ddc50df2a7fa539911b6d44b6
-DIST Django-3.2.6.tar.gz 9821499 BLAKE2B 9f18d308bf15ef16a9fe9d84219bd7ad37833b718ff975344aae5950ef01a7a0e8ef8669936c8908e38e07fb078ce2e2d6392968177400c2357b1d3787e0ce39 SHA512 adf2d2ab3006cc5b389bed8d8e16ee8c98393b20d719c3521068e5cc5d1e679b9f660be90f827ea1cc6a41f975641c32bdb0779ee145e5e31a501ca9e06898a4
 DIST Django-3.2.8.checksum.txt 2552 BLAKE2B e3bbf05bab72cfd71521451620706eb2b66d2f16791cd7897b2606083af91b62af6c6ea1e9f2b2a1437e3ffc1e1688149f9084d134ac6fc233f6285418bdbe5c SHA512 62cef4cc4c9de4be5db763e35957f2e71e9ca9fc5335a35bc51a1e337a91027236f41b84dd1f9eb513cb769174d9375c0a7b52cfc645331a3927c5498849eb56
 DIST Django-3.2.8.tar.gz 9820955 BLAKE2B 5b53c1033babda046c3e3ff8421465d5bf31e92c5c65e6ebf7d4a401a5f85017625efbf227c718877d58f80f9153fc205b817aeb030d0f322c26b10394e71287 SHA512 0d1d745fc7ebc20a2c3c1d18e270210ec57d605aafafb2bc2bee4229727469dfea6fbd510073ee6509b389eff2a7bdb75765aecafc4506d4489c2ce37a97bfbe
 EBUILD django-2.2.24.ebuild 2677 BLAKE2B 51325e634c8aa029d70de52fb128e4b168ca170d5bebee7763d55f3a924b7edf758031a9720ded7ee7e1f1a0f283e183a0cfe6d8bbe83629ba1cc5c1819b3457 SHA512 44812712ca209b8af0c14ee92d3db98d428feda28a8a16be9ec928e6c32c0dc9833a84f058f59d934181f57b658e2a6be2212eabd59f84eff17ee674a9bc19e1
 EBUILD django-3.1.13.ebuild 2772 BLAKE2B fca2574b02e943a7535bfb3ed5e98402a65bc86b5b9ec72a7e814cd7c2da7d0017bcd2127e69e8ed6646ba3905d53deb657818d87435c34747b9296ba662dc0f SHA512 15e9ef76ec559b138f1d49bebdd0c5f2603d2ca48693c4066dfeb0a1e3d2baae598e8c8604e05fceb649f5c6d792ec277599ee257c91248df7db718361a08869
-EBUILD django-3.2.6.ebuild 2985 BLAKE2B ffbffd6dc4038b0db6877960329b09e29f82e5dd45c2d7aaaf41ea18689eb81d87ec5e60244816bee5699687af62fd174712706a443dd71895952b0c7312c5b0 SHA512 93719e5e7d6c60394136ac362ae74399f50f62b86595fd8e1a968d946fee40e12f3df87d340669ec502b8ec21730300ada7b49454c116f17d61b7fa0353d0257
-EBUILD django-3.2.8.ebuild 2901 BLAKE2B fd56aa9bff6a70202113eaddb416a2f8877713f871b1cf22b94d59615b2fff48f2bcb337f0f96ca39cb8b13885fc4e8c1deb2207cc7340490286a1ca9033b443 SHA512 c3ad10ca03c068e188723ce8e65ce744219bccf1450dbf5a00c28d21ef4b9755c91db82e89238b88e6c643fd5b038c947b0806c9270756af66a81c7f0b5babf6
+EBUILD django-3.2.8.ebuild 2897 BLAKE2B 3eb77c93ad333559fae6810321a035a7bd66a21400cb985517523e6656af3409e120af7f3434a2a11ac4e97a1afdc2745a32b5a35928dc5197b2e7097540029b SHA512 7b68975726c94cb166a985d36a31c1380d5e6c54a6b858a3cfa3f50883f22518134de8f89eb322093af45224d2db1c631e413db4d35abae41428448ec1c8da4c
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-3.2.6.ebuild b/dev-python/django/django-3.2.6.ebuild
deleted file mode 100644
index d2d431524014..000000000000
--- a/dev-python/django/django-3.2.6.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-MY_P=${P^}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-		!!<dev-python/ipython-7.21.0-r1
-		!!=dev-python/ipython-7.22.0-r0
-	)
-	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-	# https://github.com/django/django/pull/14732
-	"${FILESDIR}"/${P}-argparse-py310.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-python_prepare_all() {
-	# Fails because of warnings
-	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-3.2.8.ebuild b/dev-python/django/django-3.2.8.ebuild
index 28502c5a9117..c74bf99146af 100644
--- a/dev-python/django/django-3.2.8.ebuild
+++ b/dev-python/django/django-3.2.8.ebuild
@@ -22,7 +22,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/files/django-3.2.6-argparse-py310.patch b/dev-python/django/files/django-3.2.6-argparse-py310.patch
deleted file mode 100644
index 3702a4c58c72..000000000000
--- a/dev-python/django/files/django-3.2.6-argparse-py310.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From dc7d30c03ff72917584952e70b3b25c9a0c59033 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 3 Aug 2021 10:04:22 +0200
-Subject: [PATCH] Refs #32074 -- Update expected argparse error in invalid
- choice test
-
-Python 3.10.0rc1 changed the error messages issued by argparse on
-invalid choice to include the argument name.  Update the expected test
-output to account for that.
----
- django/utils/version.py      | 1 +
- tests/user_commands/tests.py | 5 +++--
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/django/utils/version.py b/django/utils/version.py
-index 4b26586b36..54b10e89d7 100644
---- a/django/utils/version.py
-+++ b/django/utils/version.py
-@@ -13,6 +13,7 @@ PY36 = sys.version_info >= (3, 6)
- PY37 = sys.version_info >= (3, 7)
- PY38 = sys.version_info >= (3, 8)
- PY39 = sys.version_info >= (3, 9)
-+PY310 = sys.version_info >= (3, 10)
- 
- 
- def get_version(version=None):
-diff --git a/tests/user_commands/tests.py b/tests/user_commands/tests.py
-index 9262e2717a..9da0977c38 100644
---- a/tests/user_commands/tests.py
-+++ b/tests/user_commands/tests.py
-@@ -17,7 +17,7 @@ from django.test import SimpleTestCase, override_settings
- from django.test.utils import captured_stderr, extend_sys_path, ignore_warnings
- from django.utils import translation
- from django.utils.deprecation import RemovedInDjango41Warning
--from django.utils.version import PY37
-+from django.utils.version import PY37, PY310
- 
- from .management.commands import dance
- 
-@@ -334,7 +334,8 @@ class CommandTests(SimpleTestCase):
-         self.assertIn('bar', out.getvalue())
- 
-     def test_subparser_invalid_option(self):
--        msg = "Error: invalid choice: 'test' (choose from 'foo')"
-+        msg = "Error: %sinvalid choice: 'test' (choose from 'foo')" % (
-+            'argument {foo}: ' if PY310 else '')
-         with self.assertRaisesMessage(CommandError, msg):
-             management.call_command('subparser', 'test', 12)
-         if PY37:
--- 
-2.32.0
-
diff --git a/dev-python/dns-lexicon/Manifest b/dev-python/dns-lexicon/Manifest
index 874da92b211e..8bdadfd31e98 100644
--- a/dev-python/dns-lexicon/Manifest
+++ b/dev-python/dns-lexicon/Manifest
@@ -1,7 +1,3 @@
-DIST dns-lexicon-3.3.4.tar.gz 147008 BLAKE2B 14e0bbba48b8340ecb274c122363aef6490de539ea2c1ce7a4ba4ef19eaa69271ea22e28afd700dba0a1060b01211f8ac9a1081e21973f07abb9ca057638241c SHA512 274a1a4ffd1d767623723b6e9aee1e9f07022f3985cbc15f75cc410f477e1dcb7a674fa847119bdccab7332d058f77ef85771bd7bcdadbe2dd9483415a365a6d
-DIST dns-lexicon-3.7.0.tar.gz 7826689 BLAKE2B 920bfcd51642c12a0353dbc0ef8476c0def0c1fcf160757ce8ec47ce3516c1a2b203d2e07ef023b502b9a4e52d2fe91e9c0a73fa83337471e7669effc054a441 SHA512 aabfb2460bc2665b57552e6267846a0f2e508661dfdefbd22adca5833f32e8034198d1c3d5c33b2b89fb4a0cf0e9a84ec7d90426a6d8ba78acf2f2d0748c2d65
-DIST dns-lexicon-3.8.0.tar.gz 7830220 BLAKE2B 3e4e2bb6cc557ff75a87e4f32c0e04dc51cdc5552e8c7e0a47e5927a250ff5b564369285e6699b31021a97ac86fe90a42bbfac310c310f97ff2f9499351d6988 SHA512 a730852550eefd3461fd07c441cea65add2f6c0757a09c7f868da4ccdcd7cd2f1cdca96a652d11eeadab5e6dadceaba1dafc5b1d753efc6c6ec7a2fa2a5f342a
-EBUILD dns-lexicon-3.3.4.ebuild 625 BLAKE2B 723c37b38fad26079e87f13fc99833f2f33af22682eb8b25b3f9e4d83c40c8aa1fd312f133e11b15f9c8921c125b599dcbe6bb397e90fa932934c8939d93e2e9 SHA512 0cd5aeff362c83f2ef711ac72dfaed3ffa6ac0488d31e9ec8a4dad8d725d24b4706dee9f1306832174d10266557ec2f873e99b90cbdf620cb609535cbfa3439c
-EBUILD dns-lexicon-3.7.0.ebuild 1615 BLAKE2B c21607e29675f5336dd780a7e477851619a0a6c0a4545eb9156273b6ebb0a6bf062f163980a8f10b14ae3567c2fc5f72eb796962978fbcffa73b4256e0d25ae0 SHA512 75c759d184a933ccb7e06fee971a968dc115272a76abe7b6742bf5d4af926a6377b0c9bfd2dfb3170446bd8101468398b2db212e5af0958596e5909ba2ce801e
-EBUILD dns-lexicon-3.8.0.ebuild 1614 BLAKE2B e4491c94ba6fcd657c124325374c1adf65ed6fd14ffff2362335c9c3821fc640c18454bbc7d817930e6aff2cdb0a43fcfef80685b95ce471b6dc3abb0135ba1e SHA512 ce2f6bb1dd6bdfc1636efc74d98e910364f804f2e7a13955138a0f07bd7aac50ada97ea66bd862cbb93fc1882a3b4bfcc9ed4fc03675588cb44253154413685d
+DIST dns-lexicon-3.8.1.tar.gz 7832379 BLAKE2B 01049b6aaff661e24a39e70b5c04d5d4b18886ba88ccd61072736be5df99b9f880ed8a43b17f4fd9ad5c95ac1ec12d43a1b31ce69b115b7007cd1a95bacccfae SHA512 6826f1c3ceed43f207e4223a1f1ed231a7ada9c930fe61f76e353a20c979ec09dcc754dedc365d01870e74dfd36a3148582a5393dfe6733309e28e495fc495f9
+EBUILD dns-lexicon-3.8.1.ebuild 1614 BLAKE2B e4491c94ba6fcd657c124325374c1adf65ed6fd14ffff2362335c9c3821fc640c18454bbc7d817930e6aff2cdb0a43fcfef80685b95ce471b6dc3abb0135ba1e SHA512 ce2f6bb1dd6bdfc1636efc74d98e910364f804f2e7a13955138a0f07bd7aac50ada97ea66bd862cbb93fc1882a3b4bfcc9ed4fc03675588cb44253154413685d
 MISC metadata.xml 541 BLAKE2B a22266eac0bc7b4c22d9552cf64cbf88bbc1c2953e3ef0daaf059b81519909e0f8808e0d74cec6db3296e43f98082d57b8ae3779d694432e8578112ac18c3ea6 SHA512 79e2b43a685bfcc8dace1faa1c1a08cc648b39a3fef2834a57b6e801f72e7309276604253089db7a2fbe1d5d776b2ba1427c90a9cb9c44a0c1b2812d4e1901db
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
deleted file mode 100644
index 3153960f52da..000000000000
--- a/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
-HOMEPAGE="https://pypi.org/project/dns-lexicon/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/tldextract[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.7.0.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.7.0.ebuild
deleted file mode 100644
index 6d0be009fe35..000000000000
--- a/dev-python/dns-lexicon/dns-lexicon-3.7.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
-HOMEPAGE="https://pypi.org/project/dns-lexicon/"
-SRC_URI="https://github.com/AnalogJ/lexicon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/lexicon-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/tldextract[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/zeep[${PYTHON_USEDEP}]
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Requires the "localzone" module
-	lexicon/tests/providers/test_localzone.py
-	# Requires the "softlayer" module
-	lexicon/tests/providers/test_softlayer.py
-	# Requires the "transip" module
-	lexicon/tests/providers/test_transip.py
-	# Requires the "oci" module
-	lexicon/tests/providers/test_oci.py
-	# Uses tldextract which needs Internet access to download its database
-	lexicon/tests/providers/test_auto.py
-)
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		optfeature_header \
-			"Install the following packages to enable support for additional DNS providers:"
-		optfeature Gransy dev-python/zeep
-		optfeature Route53 dev-python/boto3
-		optfeature DDNS dev-python/dnspython
-	fi
-}
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.8.0.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.8.1.ebuild
index bf5ab2f7ce8d..bf5ab2f7ce8d 100644
--- a/dev-python/dns-lexicon/dns-lexicon-3.8.0.ebuild
+++ b/dev-python/dns-lexicon/dns-lexicon-3.8.1.ebuild
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index 0cdcb0dcfa81..8945f885c0b8 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,7 +1,5 @@
-DIST doc8-0.6.0.tar.gz 21547 BLAKE2B 84908a28e46fa970db7510d5fec7815028b9e65bec3cb5c0352f4ed88560765bde4c76aea3ba803ce737dff1856b702b21cebcf151587f6ae2870d4d1126d0a5 SHA512 1858334d3a0247d4d30c311bd7f13be66a6cdb6131f9d24dc10e38efaed6e08c8c7d11b776ff5dac7d6ae5eeb1cb7ef03523bc3e244794625a8ac1346cc05d75
 DIST doc8-0.9.0.tar.gz 30995 BLAKE2B 9960e223e9ada9646a0e302230714dbeef1525bf9a912ec1b7a8a0c5e4bf2d2307c2303524668d770ddb38d0b30e4a868e5a2280b7c6ffc1b4b80854f2576e75 SHA512 ebff512dfffb7d21d9173f0ff6ca282810334abfbd9c95570dba4e27796e79bc8d14fd2914c029a3cbf235766305dfa37ca565e2e20d32c63ea741f8ce4d1ae2
 DIST doc8-0.9.1.tar.gz 31122 BLAKE2B 84708d05414fe1545558910d0d74ae9612091500efb1880062910b395f1244c6edb1fe1c95ff97a177fcbb4127fcbc4b819a749f90c8384c0c23e9041af12b25 SHA512 058403a808ec2d55cf732c8eb0e28f6902c935a6fe0fd4e3ce1a11088888f32875a416adf478b81192948ebd581548b2d1591581222f1e841e97777980a80d69
-EBUILD doc8-0.6.0.ebuild 863 BLAKE2B 7ffbb2689708c46229de6ec69695fc0ea466eee173e23a3b38183ca1af8e0948ed0e9459f23ec551b5f61b2c3bef60141c8ce4e732aaa79fdab029d6ec8973bd SHA512 ed9a8c5ddb1727ccccba2982b4e34b58dca4c64cda05e7474aed7d07379ab20823b48a448c8d20a9e3fdc6952bf97b0477b36d8d88f3f6bd5c2c896443cfe2ab
 EBUILD doc8-0.9.0.ebuild 956 BLAKE2B dd8560d5039ab6eb66eae7119817335c7971bb47ed6e9f87b13421deb3d1b52fa7912b6e175a296966b016bca9db6f1123d4b40e325532dcb2f00b46226dc2cd SHA512 fe8e223be01c1c9409b100c13ce7d80e2583a678d91c0f94f7648b6faa944aba4a64c532ea11f3337fee64bb13fd73f9f8f67cc78fc16d2e3a2f09955e3f6904
 EBUILD doc8-0.9.1.ebuild 959 BLAKE2B d0399a298bd7a9b80f0180d1db0c5fcc42bed563b073f96fcf4a78af5a7f9b1973bfb41e77a5a7d32f445c3db5e43f605ffad95544a39560146e7864ad184915 SHA512 2fa37711347cc9743a2f847363e02898409f79aaac96d7d4947db0e8d58057641738cfc54982cd3fe9008654ba731e17943857756ef5aff3e7b094fdd15138b3
 MISC metadata.xml 322 BLAKE2B 0dc9c91cdb78ef3c143f7e45ac3ee3754643c676c249a685fdc73ee8f7468e19eecd6463fcb873b4a242789aa6c8f65ef92c45a1a5dc61c21bb070ae055f6553 SHA512 a417cd533ae3ef3b64cd170caa7e84fdf761be3b9b35178357134bcd5ca487fd5d4286cdff4718b345afef06cd63d5e9511431483ff7ba3ce5b5aca4ebe8ef41
diff --git a/dev-python/doc8/doc8-0.6.0.ebuild b/dev-python/doc8/doc8-0.6.0.ebuild
deleted file mode 100644
index 9cc4c17c37b0..000000000000
--- a/dev-python/doc8/doc8-0.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
-HOMEPAGE="http://git.openstack.org/cgit/stackforge/doc8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-DEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/restructuredtext-lint-0.7[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^argparse/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/duecredit/Manifest b/dev-python/duecredit/Manifest
index 91b5a21b41db..b7b4bd02b6ed 100644
--- a/dev-python/duecredit/Manifest
+++ b/dev-python/duecredit/Manifest
@@ -1,7 +1,3 @@
-DIST duecredit-0.7.0.tar.gz 66131 BLAKE2B 3f32c1a4e62d4650d6914f4e124907170a50d63900fbb009b870b3f9c9eace27b76500e655cb74caea0ce22cfadd62f81a84a438c1cb82092502661f1d4e0c03 SHA512 a32ead3e0710323d5ab3283a3b2d1cb03e03bf925f78fdb3b5182079851127b8b674492bd402667e57ec113d1ec05f9c3490642f8d0fba6a8f3ddfd706a052c1
-DIST duecredit-0.8.0.tar.gz 68211 BLAKE2B 4c25bf2284d8be5f92c3f7589b6a787c97618476f60cf4a9dc7a063c2f85208b8d6da84630d63fdc7a3920cf6639940184b6e516eb76a692be72b91bd484001b SHA512 1924c626003f0a97652ff24c29822b872e66ae8cbaeaf93877319c76bd7c2b2a5a85ba659a9485460d56c41bc25ae0e14230e0a30bd028402cb7d814b4aeeea3
 DIST duecredit-0.9.1.tar.gz 81528 BLAKE2B f07eb552682c0d9c8c0763ad3bd9447a1ffd8c4187a26249062db34d42c184d461b3102af30c2f5712175692e18f73e70e75dd047ac728071f409f7e92e42635 SHA512 39b5800545b51b1e4fe5cb3b25162c9398b97f58df1651e4b518db48eca84faf0c4c70806334a619bad1a4ddb0f203a3eac849655a1a6c6e0b070889ec75ea19
-EBUILD duecredit-0.7.0.ebuild 573 BLAKE2B 235563847fd4dfe659a71030ebcd23178866ab79d92f58739de7e7b63e31eaa9584df3c40681235dc687417736a64366fa7e1e721f7c708781106cc9b37d2dbc SHA512 d9ef961daf5eed09efc9165dc0e0869ae3f013d650ef7121a69ca9461b10616d8245ce729a9fc78b7f556b363e90d8d2317609607c2b3e8afa7c9ab7352ab08c
-EBUILD duecredit-0.8.0.ebuild 635 BLAKE2B 815e8e38ff8458cf6be4c9acb12416e831a0ed35a5af940b6ed7e61f01893d938bd938e7225ac98f7bf88457eb5a8694e1989e9c4ab2a4e26fedab47bca88620 SHA512 9c33a609fccad53a99722c5544b6ada2d224d87a84dd421e9663f995a3cd89d54f9f4991121592a4285cce50a2735b3d727a532c70dbdf31924cbf4b2e712fb2
 EBUILD duecredit-0.9.1.ebuild 844 BLAKE2B 6c3d5cb7154e2ebcda1ff54b70ad361cd2462b8cf4c0e25f74195d0c125dba3cc88d790665f45068c3bd24fee0fb53e6f6cda5df209c76022415c730a938fbed SHA512 ecc0442474f63de378c3d4a993f265f13f58fdee0b52215bf4bcc206cdc28e4e0c004980fbd0cd82aac44ce5be6faabaf976a0b86911ecee5e0b44dd155603d5
 MISC metadata.xml 481 BLAKE2B 578f1056df24380b9877d8df10e31f8a00437ebc01f56f62fc45aac3f8ef00441989b511fa4d1d5f52adda1dec4b082e8e55d99e26aa7437900e2be94ea46968 SHA512 d933cbc5565d7c24d0b5e9290eedd6fd13b7b52c42741dc5ff3336151c0b300032401e0e443c2dc3f65dfc9a13e1c4a9bcae0411ba4f4abbfb928245e04cbe3b
diff --git a/dev-python/duecredit/duecredit-0.7.0.ebuild b/dev-python/duecredit/duecredit-0.7.0.ebuild
deleted file mode 100644
index 3d376fb944ad..000000000000
--- a/dev-python/duecredit/duecredit-0.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Publications (and donations) tracer"
-HOMEPAGE="https://github.com/duecredit/duecredit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/citeproc-py-0.4[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}"
diff --git a/dev-python/duecredit/duecredit-0.8.0.ebuild b/dev-python/duecredit/duecredit-0.8.0.ebuild
deleted file mode 100644
index ab651feaeeae..000000000000
--- a/dev-python/duecredit/duecredit-0.8.0.ebuild
+++ /dev/null
@@ -1,27 +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} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Publications (and donations) tracer"
-HOMEPAGE="https://github.com/duecredit/duecredit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/citeproc-py-0.4[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="test? ( dev-python/citeproc-py[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/easy-thumbnails/Manifest b/dev-python/easy-thumbnails/Manifest
index 09d8428ad05c..0beb3a2e23bd 100644
--- a/dev-python/easy-thumbnails/Manifest
+++ b/dev-python/easy-thumbnails/Manifest
@@ -1,5 +1,5 @@
 DIST easy-thumbnails-2.7.1.tar.gz 72763 BLAKE2B 6d62086840114c6a5bd23aef72a884c19825f68423039cc5a8dc630d2d68556212a236100a9c3c302be98d0868e594b545132fae6069ce26d094d5b5b1110284 SHA512 9ee9a0f1bc1fc49eba164dd226b1be3dd4a416a542e3f3ed385e0606d0a776c2217719ffda1e7d342269059f5fbfbb4cdcfd77de2e7a27fbe950628f8bb34d06
-DIST easy-thumbnails-2.7.tar.gz 66841 BLAKE2B e46d65fadb2aed17d6f3808916033b14b7c7ce5387afd8058fa623d9bfde6dc91de16703773a5a015ad3c4d3aa6020fe3d9bfbd3e3a38593877ffd03101d8d3c SHA512 614ed1e7f7cffa3e78fa75b43c14b014244439decf9f192814a5871b06caab4cf92ce6e35aa3a363b56480eef9490872a0b28f217f9293ad7b11d7499e49e3fa
-EBUILD easy-thumbnails-2.7-r1.ebuild 775 BLAKE2B dd6e2228f758ea90606678bc39ff0c6e11a4c299fb5331b406d1608c56d17a2f48b5f0cefa989b293f29f91a8194dd2fa93bd9a2fefdc82a97cd5ee6814fbd6e SHA512 97e2b61d092c28286c6a00409afc092ae51c21b22d28af6812802ca5da3ce6a6668a17532aa01c0c3252e226969885a455e7d458a88ea63d9b1c767ffbfe777e
+DIST easy-thumbnails-2.7.2.tar.gz 73433 BLAKE2B 54a7e540b8a70fc1656f28ef7082ffe25c027053df77c38d7298dfa71523195437b97a0a5b1aec3ec6e73994c3a6faf2a0b6a01126b7dc7a927e8491f2d63658 SHA512 562a45085526294159df5dfa08a6cc1c69b6ae44410bda50d1aad6330aaa756425fe566f447b70e62d15acef529a2fdca7bc1e92f19944e4fcf85ce98b951e84
 EBUILD easy-thumbnails-2.7.1-r1.ebuild 776 BLAKE2B cda66b5f72a9a3cf6b97f54d032853e0c62e204b5fb02de8d9b3aa5311e819eb3ebeff6476c89f6820970f6661e351fc0750aa2473f574d99437faae978d422d SHA512 ac56593ae569b814a1d7eaf4c03ca5867faf12897810341e6b5430b92e5f450ca626a10f1ca77839dafa3df23fcb5c995c4d79fddf31b7d1d7356b023b833e23
+EBUILD easy-thumbnails-2.7.2.ebuild 776 BLAKE2B cda66b5f72a9a3cf6b97f54d032853e0c62e204b5fb02de8d9b3aa5311e819eb3ebeff6476c89f6820970f6661e351fc0750aa2473f574d99437faae978d422d SHA512 ac56593ae569b814a1d7eaf4c03ca5867faf12897810341e6b5430b92e5f450ca626a10f1ca77839dafa3df23fcb5c995c4d79fddf31b7d1d7356b023b833e23
 MISC metadata.xml 329 BLAKE2B 536a9dde0295ceaf8c41282c9ad7703fd44170d075ddcbfbbf291b4df19d3a5b5896e18f57e4dd9680fb3af7cb4a5c18b375d25eaab6c7a22a21b73de8d91df7 SHA512 19340ba2f684d03da8660d77f598873c7c8577590d09862ddd65c544b275030a3fdaa9ce3833627515ce4c9826f9f5eb4d3944b6532d5886da06fdb9ac89e6c2
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.7-r1.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.7-r1.ebuild
deleted file mode 100644
index 50646f686ffa..000000000000
--- a/dev-python/easy-thumbnails/easy-thumbnails-2.7-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy thumbnails for Django"
-HOMEPAGE="https://pypi.org/project/easy-thumbnails/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-1.11[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	local -x DJANGO_SETTINGS_MODULE=easy_thumbnails.tests.settings
-	local -x PYTHONPATH=.
-	django-admin test -v 2 || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.7.2.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.7.2.ebuild
new file mode 100644
index 000000000000..fd34b655c95a
--- /dev/null
+++ b/dev-python/easy-thumbnails/easy-thumbnails-2.7.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Easy thumbnails for Django"
+HOMEPAGE="https://pypi.org/project/easy-thumbnails/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-1.11[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=easy_thumbnails.tests.settings
+	local -x PYTHONPATH=.
+	django-admin test -v 2 || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/easyprocess/Manifest b/dev-python/easyprocess/Manifest
index 4b91a90ad19b..25fabbea7e80 100644
--- a/dev-python/easyprocess/Manifest
+++ b/dev-python/easyprocess/Manifest
@@ -1,3 +1,3 @@
 DIST easyprocess-0.3.tar.gz 11310 BLAKE2B d26405863f213a94687d646f57aed98d0285bd57c0dfe9c40d2f49e5cfe46710e0435ff20eb1d697648e6fd1b63a38adf46a03f0fe970e35d44bfe3ad058d63f SHA512 3a10a02b28139c2d3d53134ac7842dcc7027c855e55b17747be1545cbf77cf86303531b595a54d92d7dc8133aee210388d25f3362b705ee554323c01d742d336
-EBUILD easyprocess-0.3-r1.ebuild 641 BLAKE2B 8b00695ef9eb5eef1ccacb7aed3c75d1d11a07935c6264fa717442152e753571d4b501e95245280eecfa90057066eadffa2195e6002e64c55fed83cdecc4c50a SHA512 e8cb0eeaaedee6c76f534149e48f81c76d554e3e51a304488f65778ff7ce5b3287161e0eb115e9e776d56b217663904f1d0c346a05f0bae57ce8cf7a25641ebe
+EBUILD easyprocess-0.3-r1.ebuild 648 BLAKE2B d6e18e6127d2fe7c27968eef4b62146377ba896f502d8c92069442a2d3bb18f82e2572693b54b11f7e46943a21e9d37418e1dc969c83d4fd7b43661e94e2b2fb SHA512 161180cb17433e16ad7c7c81cba58d3a6cb59fe72af0a6f0bc2ea59131e95486f779cd6ce6f3551cb04275f94c9da6578023c949e5cbd334a5fbd95b2c757c6e
 MISC metadata.xml 414 BLAKE2B cc96af9a5eac716c510f429ee1f47437e23f9a7622975309ef8f6eed0160d12325166919e73af6f15f6af830bfc62b2dbc8a4580c14e001b1a3d305c6b0fedfa SHA512 aa063a7ec44450d83dbc43c6f804f06a04262d6bfe270d61e124c14dbe964c8b2bc926906f826997dcfff054f1d889d6fe8a63e3d653bb37a8287739cbafdbaf
diff --git a/dev-python/easyprocess/easyprocess-0.3-r1.ebuild b/dev-python/easyprocess/easyprocess-0.3-r1.ebuild
index c44accf2bd63..59bb640a2286 100644
--- a/dev-python/easyprocess/easyprocess-0.3-r1.ebuild
+++ b/dev-python/easyprocess/easyprocess-0.3-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/EasyProcess-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="test? (
 	dev-python/pytest-timeout[${PYTHON_USEDEP}]
diff --git a/dev-python/editorconfig-core-py/Manifest b/dev-python/editorconfig-core-py/Manifest
index d22fbf4e8f51..bb583ddbe1a5 100644
--- a/dev-python/editorconfig-core-py/Manifest
+++ b/dev-python/editorconfig-core-py/Manifest
@@ -1,7 +1,4 @@
-AUX editorconfig-core-py-0.12.0-no-cli.patch 503 BLAKE2B 98c71ac5fba08ee58d83dba92c37ce4a1d232d96b5f0648102da5b749f382af93b45a59b73d7a81c322937dfc94566f45b6203bea3b286ed49e81b69fa590667 SHA512 3c8802b4df1799c5456e30cf2f62d8c7d5b939a935bd511e2b1dc4ee681131ea7da114038e67efc1938b2c4c110c11dd4cbee0b77024d311e9b50585c364b591
-DIST editorconfig-core-py-0.12.0.tar.gz 24801 BLAKE2B 10901b1595965139dbc3aa3227f335c2128b2ea83204ed88b0e799021f7c215fd13c3e2246cb9197ecb7c918aca2d6e9269d94298aa0665432ab091630a29dd6 SHA512 29c5f58bd7293052e4b1fbfbadcf4a148eb939558494d599bafd46151a4fb5af9cd07dcef477db9a709a0ea63dec0dd7e9d4071779f8ca6e3bd137268cc22f72
 DIST editorconfig-core-py-0.12.3.tar.gz 19261 BLAKE2B 58cac122cfee19527bc45def7e923da50982de0e2cd443cf67dd824c050fb12352b85a5679815a701bc5b8d88a089a0a98280c364730086d01b80f119ad996a4 SHA512 005d0698c410c8865d177a1e891b5c51b15255f36303b116fddbbbc08e309d1d60ca3003d27e6fd8455e53c5956db0c29e298f22f4b10950e1f7c56c7c6e0ab3
 DIST editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz 7900 BLAKE2B 9ebdb5e522948bc9e86ea84435ccaa11585a8a12f4cd6fe54c64d78917281c913568351767d8077623b1196d84206d1c2d0126a0510f70df484c1b55d829028b SHA512 ae5424b4926d6cb127cb3da473400ced4f7ccf224f7baa8bc5bde0317cc045bb7b99738a56efe5fd0e5a0fbe39b997b9fb1739d24713e7f83b58e987c5e56a32
-EBUILD editorconfig-core-py-0.12.0.ebuild 1253 BLAKE2B 46d06e17a5e991c02c362488a2c6115f990c66e7cb71f7d1d1a7c8b5144cd530e5e11708cbde5098131cd648dd1f17d607376d89329eff1af71264a9c4ca3311 SHA512 079f493c5fdb97b053af9274921f54c0dfa8143222c78700a16b3991419ef2a06d78a14e469467c924ce94631d10b87593b08cafd7c638fae5ead0010a13b1dd
 EBUILD editorconfig-core-py-0.12.3-r1.ebuild 1123 BLAKE2B ad68edaf5141b8422228bad5ba8bcef3844e17860810683db31ea0dac3b0bb3278f1e3da3bd453860fe1de56d928c95ce82f8c4ff883ecf985e108ad3177c7f7 SHA512 c66b67816cc83aa922d69e791a5aee359e21302ed1e2e3c73803ec3e3d58905121774ed53126087f5413a8fffed48f55670f86a1acde0d1de82b3b2401e98748
 MISC metadata.xml 831 BLAKE2B 3eef9346c8fc78e09a5538c3dc7332edf53914bbf042bdb84b4173a3a6c7d00ec1e05054eb32e5641880e65957e1794a15dbcc748caf78e5d648c21b6deecffe SHA512 6de6c0a54227b593460da5c2e77ba739e854eaaf4576df55596d33f18417771d8f911d976fd7605c9ebf2bb332a934a89ef99e01da7940dc1b9603802c2bd949
diff --git a/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild
deleted file mode 100644
index 5927b46a0c4d..000000000000
--- a/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-TESTVER="abb579e00f2deeede91cb485e53512efab9c6474"
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Clone of EditorConfig core written in Python"
-HOMEPAGE="https://editorconfig.org/"
-SRC_URI="https://github.com/${PN%-core-py}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://github.com/${PN%-core-py}/${PN%-core-py}-core-test/archive/${TESTVER}.tar.gz -> ${PN%-core-py}-core-test-${TESTVER}.tar.gz
-	)"
-
-LICENSE="PYTHON BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test cli"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>dev-util/cmake-3.0
-	)
-	!<app-vim/editorconfig-vim-0.3.3-r1"
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}"/${PN%-core-py}-core-test-${TESTVER}/* "${S}"/tests || die
-	fi
-
-	use cli || eapply "${FILESDIR}"/${PN}-0.12.0-no-cli.patch
-
-	default
-	distutils-r1_src_prepare
-}
-
-python_install() {
-	distutils-r1_python_install
-	#use cli || rm -f "${D}/${EPREFIX}"/usr/bin
-}
-
-python_test() {
-	cmake -DPYTHON_EXECUTABLE="${PYTHON}" . ||
-		die "tests failed to build with ${EPYTHON}"
-	ctest . || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/editorconfig-core-py/files/editorconfig-core-py-0.12.0-no-cli.patch b/dev-python/editorconfig-core-py/files/editorconfig-core-py-0.12.0-no-cli.patch
deleted file mode 100644
index 7d6fd31c3cc8..000000000000
--- a/dev-python/editorconfig-core-py/files/editorconfig-core-py-0.12.0-no-cli.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 297e9cf..9702911 100644
---- a/setup.py
-+++ b/setup.py
-@@ -10,11 +10,6 @@ setup(
-     license='LICENSE.txt',
-     description='EditorConfig File Locator and Interpreter for Python',
-     long_description=open('README.rst').read(),
--    entry_points = {
--        'console_scripts': [
--            'editorconfig = editorconfig.main:main',
--        ]
--    },
-     classifiers=[
-         'Operating System :: OS Independent',
-         'Programming Language :: Python',
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 12624d116612..eaf4acd81348 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -2,6 +2,6 @@ DIST elasticsearch-7.14.1-no-jdk-linux-x86_64.tar.gz 191559419 BLAKE2B c4099d2e7
 DIST elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz 73216528 BLAKE2B f0f1a3d3347ea37703e90bd896b24f6e3c58406d9fb20f3607a4d08eee325b5ae293db48d1afdc208468ee775b9085a28f39f2e175b67e4881bfb61d5cb85a9a SHA512 f9b323cff078a0dc856f99efd164775a9cd0718bb0ddb6c4d4817fa53cae71748f1aec5158afa45d4b29076043cbada9743a996e685439436e93d94a9eff2768
 DIST elasticsearch-py-7.14.1.tar.gz 302277 BLAKE2B a4502edbaf1dbca9c687a32f012305fee7520555dd23f05888fcb8b82e2a9ffa3f9c5208320eca4ea8033498cd0a951003b94662b6847da664f302b8c2763004 SHA512 49b4e0cddc210e0d73cb7cb28f38dae4fd0595e22733cf017c41f50731479a1a3672307a119b067a0b5c1de3a138908e337145effd2b66bf930c2d439cd2ce0b
 DIST elasticsearch-py-7.7.0.tar.gz 128862 BLAKE2B 461b7ac3bc6d96bacdc1e8595c05b4dfd3e6bad2d2d11eecaedcb3b7e96c7390fe26c47b7095b3b1e8500872cfef689a749bd7103bef352680a2cf3ef7dad350 SHA512 6da382c5056f61dde2bf509c902a4ca33548ee937d037dc977e8c8864ebc09385f630b5c99ab8b24b69390773a241786495d1c01a5684ea3892d834e7a1550b1
-EBUILD elasticsearch-py-7.14.1.ebuild 9046 BLAKE2B 357fe8cc00a22a49a1fb21ce1bc2587d7348e3599b21c37703e0916e0e06919e7c747e238a84caa9012300ca4d7627155ef0b4f9fafb3e30028ffc54160a5b44 SHA512 9ba8b963769727107777a26c3c99a7e1fe9cdee2499e05c72684b23c501b9489dfd2ffd55a5cea16452909491cd3beace108a9a5cd831d42aafe6aedc859cbee
+EBUILD elasticsearch-py-7.14.1.ebuild 9051 BLAKE2B 289d199f55a746960ff0fd364bf2c1d80515cde0942ff36cd6792b9744c5c383a8d0093d30d925f14f68371a938084eb623e731eb66aa3b89e91b3fb860031ab SHA512 88008402937d80fa7cbf7a400e6213915c87ae85a340db9e162c1dbcbc98d388e621ca47e432e8da65f6e719b556c93b1bb434e7b819fc44ab624b5bfef94684
 EBUILD elasticsearch-py-7.7.0-r1.ebuild 2933 BLAKE2B caf9fe1e4229bc95b9562246f8e7f92bfdb3292f505fb58ad1582b081a93cbabfc521ece39f2333765687342c42b3d4cdc3890b2cc80600e3cd6e3f5e0941a65 SHA512 56d41ed981f93b80a9f2b6f506c2b738ab47f328448cb554580cee7a08292952f170ee0b4f9b909e7d0dae6677098e7deb09864afad2527ddd6373144d9ebbcb
 MISC metadata.xml 601 BLAKE2B 56345ee1f417174399c98b5ed5ce11557b555a5ff8427bde703a455cfb6af71c3e56edf6f778981dd2684d74910f632f7a079a72b005e666fc35577943b4f500 SHA512 546374a9ba457b0f02b142d92daba3dccf39abc53f75bae9ace0a2f05187e6ff7eba7b1c3cd228176006a329e0ec403adbe51d24841c58c47479b000d41941b4
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.14.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.14.1.ebuild
index a164db017028..78adda22d552 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.14.1.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-7.14.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="async doc test"
 
 PROPERTIES="test_network"
diff --git a/dev-python/emcee/Manifest b/dev-python/emcee/Manifest
index 8368b3853335..e2cf0f9e1787 100644
--- a/dev-python/emcee/Manifest
+++ b/dev-python/emcee/Manifest
@@ -1,7 +1,3 @@
-DIST emcee-3.0.2.tar.gz 4054969 BLAKE2B 16b9ebd34b450f8fb92dc50f0652a34f06d20a027ff1cacd73474f4c74ecce7102d5eea54182598fc17175897980131742c0d60ef217b0dc8285c18406ef4d7f SHA512 517c447b9426eb97b72b6e3b21d77720b58a42fc1efe9495cf7ad8a0682841b8d7178a6f070641f68a09aef507e854ceefab9a54afe6baaca8b41f16f34dce9e
-DIST emcee-3.1.0.tar.gz 2868282 BLAKE2B 333bb3dfb1b88bd768dc824763827d7b5f7f6dbef83c98a3934789a52d2989fc09474f628a609b3c0b930f3582bd75240895a4f0fe6e2cab486bc5cdc6947c56 SHA512 45f4ee3a9f6e7f8b4e3cf6eef187facbc1c93dece10a6b0c9c2d55da093f26e159c254818aada3abb1c45985950cd83f286b7f3e5acc467ebd2f292df9f1202b
 DIST emcee-3.1.1.tar.gz 2868516 BLAKE2B 62f3fa2a963a256a9b807d648ca370461f2dce1c186f0fc0f7c191dbd1e1a840c58ad17022c8ef4c80e925c20405ddd2ee87d9f448f20a6f2a3976c3b7584aa2 SHA512 f824831f7a6661d69af3be26a6cccc41d582ec5a9a6301d2bcb0622412832498c047738249087ba9686c430cc7b3d5a8a9c1db3bb78202f7d31ff6f5205f40a8
-EBUILD emcee-3.0.2.ebuild 647 BLAKE2B 09dcb337e04ae0dc70ebd284c41eace4fbc5527ec9ebe64c285f3c14a378f0544f347cc3bb26185fdaeafa94de141b34579a73c040914dd9db62787778156f6c SHA512 d72959fcfa29f2ab984e088242cf31ce3c9d8f3f4215a4f686046b51990da104ce8ec55655c26468c3fa0d6e78b2ccd1777b07ff1263d5c6f701228b0a58b526
-EBUILD emcee-3.1.0.ebuild 795 BLAKE2B 7140d6499017f17cb304072c97192314d839f28f7ed9ac0c3a90dd3fbf3beb1954a52641553b883c46f3778c863403b57538e52729d6e2af3855161c5ea545c7 SHA512 a9ca8ed4df5f17c292bcf1f94d847dfb4f2a3380cb62528911c0056bc5dcbc7cf66be8bb8ed1ee2e5263a647d2e654ac8e073b91226d81f0002ca35d667214c2
 EBUILD emcee-3.1.1.ebuild 794 BLAKE2B 6ceeb5a000b67096cf888209aa364ba0595c8e95eca54531784f8016115ce2be45e61c8addebd788dd0b3a33d19159c13bb3e298a8885664c30cac7823bb6de0 SHA512 0c2501b13335feef98db7348edeb57e4f87c10a0cd0ddad7720b6add080372ff13502c675b40e15ed346eee4ab4a27aaf86262ea991f14d58fc6c668217a3510
 MISC metadata.xml 866 BLAKE2B 3773058b1fe783e641ae4ab53204b5b5d2a89f3a4a6a544ee5ddcc128f5dca7f977d7815dc008348c644afa86d32118a1f28b25a18f88c44ac6fc2bf7bd70420 SHA512 62b43f5c9cbfd2d2cba76c5cacaefd16ea10239a9a681dc42fa90b796750afd6ff5e36b2bb1b054886a51953da7e200e50a12abdbb38cc76dbbe8f84da45db13
diff --git a/dev-python/emcee/emcee-3.0.2.ebuild b/dev-python/emcee/emcee-3.0.2.ebuild
deleted file mode 100644
index 4e0067bfcb55..000000000000
--- a/dev-python/emcee/emcee-3.0.2.ebuild
+++ /dev/null
@@ -1,31 +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 distutils-r1
-
-DESCRIPTION="Python ensemble sampling toolkit for affine-invariant MCMC"
-HOMEPAGE="https://emcee.readthedocs.io/en/stable/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/h5py[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( AUTHORS.rst README.rst )
diff --git a/dev-python/emcee/emcee-3.1.0.ebuild b/dev-python/emcee/emcee-3.1.0.ebuild
deleted file mode 100644
index 4939478f08ba..000000000000
--- a/dev-python/emcee/emcee-3.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python ensemble sampling toolkit for affine-invariant MCMC"
-HOMEPAGE="https://emcee.readthedocs.io/en/stable/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/h5py[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( AUTHORS.rst README.rst )
-
-src_prepare() {
-	# unnecessary dep
-	sed -i -e '/wheel/d' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index 776e6489483a..d351e7d11ec9 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1,7 +1,3 @@
-DIST emoji-1.4.2.tar.gz 222120 BLAKE2B 8771c7289a41fc741c54b3096df4ba6099dfdc3bcdc72282c93c565376e8fdb2e5939949a206cb01bfb1f2d663f840cd958e4d762f9da45639c49e52f3410947 SHA512 abf7fcaa922963c990330ebb6fd26c1613ffbdcbd6cabdf44e977b54df4b9c80c30e70e0ed0a9d9311c2fb95423df052e4e9c22d95510eab10eb3754084622ed
-DIST emoji-1.5.0.tar.gz 222904 BLAKE2B ea4f057f94ba06306d87b102598da5cd0d87038d61a45e7a44db1af107effb912040e9f2e318d7f8ebaa1ac854ef827af7703f0de72174689b5ca5c3c909b597 SHA512 9dc85a0e6ac2cb7e4156d54063380cce3048ad8ab38993a6d6f2608502299a3e5681afac8780cd14c44f7127c7e1805f69c9bb95460620ec0fe2fb0d52d2d87c
-DIST emoji-1.6.0.tar.gz 210598 BLAKE2B 13764d19093e22d3cc62f8b91f87ace3677bca947c15fbdec3df9da8dcdb41975ea111f6e61510342c6f2a029f2390e5274d8cd14ee319a1f83e8405620b5937 SHA512 d39f89dceca0ab040292a237dae81b33b098acac77a6fdcd444c87916224d4a83f4fa51f2e78d3b793cb87d12e78f29102767eb4ae58fa8eed5b69d59e009e31
-EBUILD emoji-1.4.2.ebuild 454 BLAKE2B 8783d79b1d000539bd907857843064e1704919ae9b8bbfb3a4d0de5a0bf738170bd86a3c637def670ed22485c6e313dbf2ba0b8176859fbd07da550743198e18 SHA512 f770e6c666137c5fb52040f329d9156670e442c1760c4f49fccf454703361bf1cc9a3f98f73e0d39d0c2a67eb5d6721610d19ae756616a665b7a25e81f3d0083
-EBUILD emoji-1.5.0.ebuild 414 BLAKE2B 0f4e67d25cba9bedc58c8d0f1dc2826452a693757bd52fd62627ead75714fb62e7fccb5d875c335c6b45506504373c7a750b91d0406d8b5f4a00d616dc799510 SHA512 691116ad35cb26b1b62f9aaebb704730becc6c4851982ddc9272697951e9e012a7654caec96a1d8693793afa4cb6f988cbd1549f43087d66e313cac7bc2a853b
-EBUILD emoji-1.6.0.ebuild 414 BLAKE2B 0f4e67d25cba9bedc58c8d0f1dc2826452a693757bd52fd62627ead75714fb62e7fccb5d875c335c6b45506504373c7a750b91d0406d8b5f4a00d616dc799510 SHA512 691116ad35cb26b1b62f9aaebb704730becc6c4851982ddc9272697951e9e012a7654caec96a1d8693793afa4cb6f988cbd1549f43087d66e313cac7bc2a853b
+DIST emoji-1.6.1.tar.gz 211816 BLAKE2B 5e258d5e7199a1a294cd117605a989939edf01c41a2d2de533baa389adb4cf9cb324550e19df50f9f76af4c402076f24e9db8f17ebb1d5f6f6ff6bfcf31471db SHA512 bd896d8b539224e371835622dd577f2b8b6b3f8cb443f487a2826a0d61e91bdae19570b4d73bf73a8544157dbbbac20dd3212019b0e70cb680e22951333176a6
+EBUILD emoji-1.6.1.ebuild 414 BLAKE2B 0f4e67d25cba9bedc58c8d0f1dc2826452a693757bd52fd62627ead75714fb62e7fccb5d875c335c6b45506504373c7a750b91d0406d8b5f4a00d616dc799510 SHA512 691116ad35cb26b1b62f9aaebb704730becc6c4851982ddc9272697951e9e012a7654caec96a1d8693793afa4cb6f988cbd1549f43087d66e313cac7bc2a853b
 MISC metadata.xml 396 BLAKE2B 65f441554017bf19380e2309b4fa34926968ae4734961ec9c0f551d64e801c2ff05ccf89a35125870df499b63dfb4d04d092f2f236bc91f01eecadc7d0a90f72 SHA512 0c4f1b15a3f1aa4394f7f5d6ee12e48fa10344fe9b97b6253437556e95bb9b938bcf3158e07193fd66d722d38c927cc2013eed4da0a7ea2d50076edbf439bb38
diff --git a/dev-python/emoji/emoji-1.4.2.ebuild b/dev-python/emoji/emoji-1.4.2.ebuild
deleted file mode 100644
index b814c446ac82..000000000000
--- a/dev-python/emoji/emoji-1.4.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Emoji for Python"
-HOMEPAGE="https://github.com/carpedm20/emoji/"
-SRC_URI="https://github.com/carpedm20/emoji/archive/refs/tags/v.${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-v.${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/emoji/emoji-1.6.0.ebuild b/dev-python/emoji/emoji-1.6.0.ebuild
deleted file mode 100644
index d9c3bbe594f7..000000000000
--- a/dev-python/emoji/emoji-1.6.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Emoji for Python"
-HOMEPAGE="https://github.com/carpedm20/emoji/"
-SRC_URI="https://github.com/carpedm20/emoji/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/emoji/emoji-1.5.0.ebuild b/dev-python/emoji/emoji-1.6.1.ebuild
index d9c3bbe594f7..d9c3bbe594f7 100644
--- a/dev-python/emoji/emoji-1.5.0.ebuild
+++ b/dev-python/emoji/emoji-1.6.1.ebuild
diff --git a/dev-python/entrypoint2/Manifest b/dev-python/entrypoint2/Manifest
index e9c456ea9613..866f239ef10e 100644
--- a/dev-python/entrypoint2/Manifest
+++ b/dev-python/entrypoint2/Manifest
@@ -1,3 +1,3 @@
 DIST entrypoint2-0.2.4.tar.gz 10407 BLAKE2B 16335f8e2bc173413f387e581892b1fe03efdb6bdea2e75d20a95258d55c0cb83dc70691cb4b41b07e49881db4e5c08593bba42adf5c1a69785e32c99d68a7fa SHA512 7bf7dea2afc7df3ebe57f89f472e4456fc22d5c66720930a2b15dbe04f708ff4bb00feec79af430620d8cc6d91d5df1770869d23d2282ecc0024ecc7583b360b
-EBUILD entrypoint2-0.2.4.ebuild 548 BLAKE2B 3b566ec3660d38bddb0cb34cc11a32cc0d105dc9e3da0381c694f787156ca7132ddabe9441bd32f400f5d0193304e87a7ec4dfb659186a804334d21f02e7545d SHA512 cb8b64ee814d7736b17ca55e5a744e4722cd588752feacf2dd5dcf15395cfb20e572f02673875a8e38c2aa3bd3399abfd5dc4d22406c50377a8218a5b0e024de
+EBUILD entrypoint2-0.2.4.ebuild 555 BLAKE2B 40b57e01cdee39e58f7233e077d5c013ad32b50c86303f98451ad377d51d7f3301ae7a8ec23bb8b237d35a32c9cb94ab852e722af45186a020e0b607461911d2 SHA512 0be28c208be1be766bdf233613eb0a0776798abf692f52853a37eaa72b291a7ca92f623c2454383007083a00608ffd296245c6a1704b5484946fe31b349a6a31
 MISC metadata.xml 414 BLAKE2B bea9fe2fb1b8a02da23f0595f6ab285004a4984bde5011194d303dedec9e81f0278d1cec0c52615c3d9d53e1c8f26021f57c6efc9b8c2ec7c305b45acb6a0374 SHA512 6bf3e973e157b5d1171029fe63298e22d3ad20d3d7fbc47d66eec28b47da56a307def11223ba8013e016fc3dc07a3f9325976b0c7b9a25ce61611279134445a4
diff --git a/dev-python/entrypoint2/entrypoint2-0.2.4.ebuild b/dev-python/entrypoint2/entrypoint2-0.2.4.ebuild
index 1784e2d9f8f7..982f81761522 100644
--- a/dev-python/entrypoint2/entrypoint2-0.2.4.ebuild
+++ b/dev-python/entrypoint2/entrypoint2-0.2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ponty/entrypoint2/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="test? (
 	dev-python/easyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 5907c2f4d5e9..89d3f9f7f120 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -4,5 +4,5 @@ AUX eventlet-0.30.2-test-timeout.patch 1421 BLAKE2B 11730b1a5827d1b30537eaecb896
 DIST eventlet-0.31.1.tar.gz 412021 BLAKE2B 6358dca8e0a766f0cc2cef37586a8d38f5d87f03d8389a7cc11b3d2d616669825df2a416ae980eed8a980f8e81ce8b2848225921bb4536f5537a7954ed75fb64 SHA512 c240a332aaf8eeb4af429d1b190ae198b4bcb92ae1bc38ade3f824634327872526267c6ff02f7196e3f9dfd17d639af500c28a3ed70a773b1b050d6d967a88a5
 DIST eventlet-0.32.0.tar.gz 412769 BLAKE2B c0b35e1ea0e3353f326f24787f253ef666c34de5a2880c0d78e9541738c47f72787e6ccb3fb861a9f651da7e501443d220809a09d31dbd6e6d75aee509258dc8 SHA512 6a8ca80ef7318114e13690f8d2cd640f1be3c716f01644a7a84cd983ab90ab00ec0962cfc7e85f071e73a6da139bbdf8ad3918f15097e94dfc97db7056d13a9d
 EBUILD eventlet-0.31.1.ebuild 1144 BLAKE2B 0e7ef0278ed4b4cfdd9421dd5a53f2cff4399c0a0aa49cf5d995b79e31c564278bc6ab83bbd9414044267686705d6a5bb63743f083e90d5a3d028668a22dab35 SHA512 c31df5f4b5934eb455c5a5bb4762b44bae47c3860ee8991970649ed77fcdfa82b1f92e25951a7e671c11910d2c2c3974ef35bcc1cf7a72892a333d10d9f49242
-EBUILD eventlet-0.32.0.ebuild 1151 BLAKE2B ee2f60580b1d985ed49ee3b4433db7aa2a975028bd863e538dd0d8d9f510a636b4ecc166b3f9ac66606a88a47aa653216c36af1ec608090410a941d9e6abfe11 SHA512 3d7fe3d2d14a1250f12f6001992e3fafdd17cf57b9aed26d540c2c02fad5a04b27203dd600893fb106ce2d36ed4cf41db1d614137f2fc63d7f000618f43059d8
+EBUILD eventlet-0.32.0.ebuild 1147 BLAKE2B 9d32fe93e932d6993bd08ed032e57d83010569c6e83449ba43534794b588ee0afbe7eaea1d6a01c87049505c4036aa4b7114a10ce74180b0bd8d3b35ed427ffa SHA512 cb9e943ace321d7e8bf639ac4f9223a9bf3a1ecec15a2ad7ed28e458861000fb6834fa597138c1161ea979e44d2c492e8ef4ad2c92b22b386d9c47d521a0b013
 MISC metadata.xml 381 BLAKE2B 13525cba2b71b496ca49573beacbd552a86320d40200747ce991163060aef7746dd568eaf572f19e990eb22ad3791f20a546264109c3a47687b03bbcf25a5115 SHA512 f7be09d2e34f1259e1e9ae685cb591e061452974789b0027878d7514e956a216068dcd139f4e3f57ed50530d828941caec12598e9f8d79e98e820c9683c71c05
diff --git a/dev-python/eventlet/eventlet-0.32.0.ebuild b/dev-python/eventlet/eventlet-0.32.0.ebuild
index 3fc34d0e705d..7709039b68c9 100644
--- a/dev-python/eventlet/eventlet-0.32.0.ebuild
+++ b/dev-python/eventlet/eventlet-0.32.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index f6ce049bc1b6..d446c372f059 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,9 +1,3 @@
-DIST executing-0.7.0.gh.tar.gz 452550 BLAKE2B 9b3bdb49b3b00ca17952db747d3f0f3995e8dffbc170bcb2260e7c34ce9e6b0c8e1620be2e2776445a6114add4e2437eaeae8a308391e2c121b6484b5bc6056c SHA512 08ee347f0bcaf04ca2c6010762a6d2d5b054b3590029c55d18d6efae5a5db7c6c5a0948cce9d9684e4bfbfd9ea19326e4ac2c96be40535c0500c28c28ce81e07
-DIST executing-0.8.0.gh.tar.gz 494306 BLAKE2B 37ce7c743380dcac85e6843e8ee708c8d876c5de883e49786da67d94dc9a7bf983bb36278a823ddb2bc9291e7219125cf870fac8c0c28979a4b49e951410d5e5 SHA512 6f88052f61479c5fe4aba1925e90f3daea3852f636c5c17d94a08dfa4de909fb3187650ff07c1dc66b4b3bec4a04cfdaf4cfe0c37903f67b2d716691d07a93d8
-DIST executing-0.8.1.gh.tar.gz 494735 BLAKE2B db57f01a6501b2c709140d806119a455db2294f410bb1602bbe96d3b45c4301b9517654fcdc00c31b6dcd3365476d29a944e38d340f82338ed1059f0a878753e SHA512 592035eeef74dc83fd72a08910e3cbacebe70f8206c55ba54661d8a11b7aee105de59487a957caf71799b0f3f5239e601a4de5d19553f33d21983c23a199c383
 DIST executing-0.8.2.gh.tar.gz 494836 BLAKE2B d6ade5658c8df656e80bb596f6c19493475d74ea10ddfc60b25eadb4a2f68d8afd2f437a6f82807932bba0469617fdac7a4dd90569623d1c8d7f96220e02ec9a SHA512 9a7fe4d3bae77d49725f35bae9d239bfb2a6e89d893d871d76f26fe4beffe0a07c6cbf50ea7b35b9ced66148d015c48106bc5774b26f201f9b40577f3380f5b3
-EBUILD executing-0.7.0.ebuild 926 BLAKE2B af3a3a46693dab57bbf32ff0513aefa47fe5ba7fc10c55b2e7799b6791b9e43f9346d4d7f013252a056778b6f2fa584f23a831500d23a27a66c5aff8e4c6c27e SHA512 d4358defbc23260b70705e3a1543331e8ba401dfc2a185c8f207d8d4fd65066721f9a4d011ac8bfcb96e6775311f7c41bbbbe1c1ff34171c17e27becd3655223
-EBUILD executing-0.8.0.ebuild 927 BLAKE2B eaccb4d24b7df50e1eb43ccceb657de45618d6f0fe204fe3429c4003baaac0c1617668686ed85fffa5d3670e588a002673caee3362911cd81b2658433698baf7 SHA512 2533cd48a63dc137087447f54329de94ce4a0fa39b2e45f847cc20d640952b059cbbf86fc15b4ce030a7d71a900cde36f3ce191ac4549f42d4d6f9f81762fd5e
-EBUILD executing-0.8.1.ebuild 931 BLAKE2B 62c54b8256b1420dfce5bcec57365fc8250639bff76e69132b5a2156d5d0297809d97ce39ec9d1eef137591dd10edb04a4b051437866451298161a397c3b9503 SHA512 7d5bceced13d74a7341d3e61319687d8f25e4a65bd890fd2305fc4a00477c72e5e9e18fe7b95c056332a25130b2b0c70ba9f704133eddbbdda391fef3c72f8f4
-EBUILD executing-0.8.2.ebuild 931 BLAKE2B 62c54b8256b1420dfce5bcec57365fc8250639bff76e69132b5a2156d5d0297809d97ce39ec9d1eef137591dd10edb04a4b051437866451298161a397c3b9503 SHA512 7d5bceced13d74a7341d3e61319687d8f25e4a65bd890fd2305fc4a00477c72e5e9e18fe7b95c056332a25130b2b0c70ba9f704133eddbbdda391fef3c72f8f4
+EBUILD executing-0.8.2.ebuild 927 BLAKE2B eaccb4d24b7df50e1eb43ccceb657de45618d6f0fe204fe3429c4003baaac0c1617668686ed85fffa5d3670e588a002673caee3362911cd81b2658433698baf7 SHA512 2533cd48a63dc137087447f54329de94ce4a0fa39b2e45f847cc20d640952b059cbbf86fc15b4ce030a7d71a900cde36f3ce191ac4549f42d4d6f9f81762fd5e
 MISC metadata.xml 351 BLAKE2B 3e64042e3da09377bd27bcf09b9984eef77bbbc18e84f1e849571ff628cd15068fa680560cfc6c3650bf545e5869c6e3d6be0b4d2fc00f35c5fc58dcc3194eb1 SHA512 de199443767adf299da6c7d857c182071746b2ccf7b84015e9649675451ff336fdb7ac1df2d15951ae708ddf0529f2f1c9c19a2959f45c0dc30db1f341fb8d0f
diff --git a/dev-python/executing/executing-0.7.0.ebuild b/dev-python/executing/executing-0.7.0.ebuild
deleted file mode 100644
index 42bd4eaab9d9..000000000000
--- a/dev-python/executing/executing-0.7.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Get information about what a Python frame is currently doing"
-HOMEPAGE="
-	https://github.com/alexmojaki/executing/
-	https://pypi.org/project/executing/"
-SRC_URI="
-	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-# asttokens is optional runtime dep
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	# this test explodes when collected by pytest
-	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
-	epytest tests/test_pytest.py
-}
diff --git a/dev-python/executing/executing-0.8.0.ebuild b/dev-python/executing/executing-0.8.0.ebuild
deleted file mode 100644
index a5e893cb9f44..000000000000
--- a/dev-python/executing/executing-0.8.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Get information about what a Python frame is currently doing"
-HOMEPAGE="
-	https://github.com/alexmojaki/executing/
-	https://pypi.org/project/executing/"
-SRC_URI="
-	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-# asttokens is optional runtime dep
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	# this test explodes when collected by pytest
-	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
-	epytest tests/test_pytest.py
-}
diff --git a/dev-python/executing/executing-0.8.1.ebuild b/dev-python/executing/executing-0.8.1.ebuild
deleted file mode 100644
index e01cf6c3100d..000000000000
--- a/dev-python/executing/executing-0.8.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Get information about what a Python frame is currently doing"
-HOMEPAGE="
-	https://github.com/alexmojaki/executing/
-	https://pypi.org/project/executing/"
-SRC_URI="
-	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-# asttokens is optional runtime dep
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	# this test explodes when collected by pytest
-	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
-	epytest tests/test_pytest.py
-}
diff --git a/dev-python/executing/executing-0.8.2.ebuild b/dev-python/executing/executing-0.8.2.ebuild
index e01cf6c3100d..a5e893cb9f44 100644
--- a/dev-python/executing/executing-0.8.2.ebuild
+++ b/dev-python/executing/executing-0.8.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 # asttokens is optional runtime dep
 BDEPEND="
diff --git a/dev-python/falcon/Manifest b/dev-python/falcon/Manifest
index 1a2e88a18b77..f42ef6072329 100644
--- a/dev-python/falcon/Manifest
+++ b/dev-python/falcon/Manifest
@@ -1,5 +1,3 @@
-DIST falcon-2.0.0.tar.gz 1075333 BLAKE2B 338e0b2474d743171fb0bc9dc3a05da428e6d46fc25e7cf1e978f799ed70e76bf265f32ba2cdf16d6eec8ea03b7b6111f70aa5b8f59141b7029d8ba9b03cd0d1 SHA512 d5365f91eb312cd058773d0a3809b5d8631acc188b9ee884e7c7db35664138608998f397d3fd831c568cafaf261cca2734b9dc7fb60590062e316ad1dbc74614
 DIST falcon-3.0.1.tar.gz 1300689 BLAKE2B 76dd59d0274cc2e78052b800e6e5b4c4244e1f5e47169a424882cda5bb59c38cd69c1c0942d506867728da9ddaf5d35b88195a1b003ca5f66549248293b7006d SHA512 c6a5763264b497979129df26d83a04323f53861b6d453a2b642d22208d0dad2ec1fcb88b13a53c2cb2b2988a1c0d19b94021099b458e23d640984b4d03880edc
-EBUILD falcon-2.0.0-r1.ebuild 1034 BLAKE2B 4d8a24e8d9da45a735a7719becc6a6cb4c2c2d2d085dce6f3159c701da6cab0898ac635ce151e4ab7fdacc6aecc95093ad555434c8a10a11320829aee75a1279 SHA512 3f5369e05e28d75c67a537ee37dd86fed6659ea440e26943f1eb4782d7c2287415e0f75da32fec8bb790b337252e874a4509c607b45ff7e6c69e7ac0b1239bd6
 EBUILD falcon-3.0.1-r1.ebuild 1198 BLAKE2B 3da77afa28ba721301f042e26846bcb8f4aa563395bdb57dcc42cdc678f2bfa813a8ab6ab6f71935b7a07a888f745b09b8e89c3b81bd872a5424ad245c23e261 SHA512 c66a86d1ca817b1ed9552b9e95edd579488cd65932cab5a9921b11a3e9d0ee0af758f1723f95003c8836aec211971d264259b2e871b05a98b02f1a33cc7cac74
-MISC metadata.xml 443 BLAKE2B c81643ce2dfca1278e0de53d7dc09e2bf77f8e1a6057c45ed10e04c28be5ff36a8ca695d3285a97a47986e7301f50b3926aa2bc9736c45e10e5ad2caaf4c26e0 SHA512 f78c95844dbecf92688cf1b5a37244bbdbf4e9ca7a1d9b87ac8ca89881121476b752a71cb00d9040449299ef6d9899728a708b6ad494142e4bb078a8abaa9141
+MISC metadata.xml 365 BLAKE2B 8dc08ffa6bcc9e64e2732ecb700dbbf6002e3e3c225baf98d1ec42d14abac3fce82f3cf546f07ff1fe1b0f74689e2d225e6f58c35d254afcc6d5bae2de314313 SHA512 24be56363b9bdbcf093a20ac9f5ec982830ae36c7ceb1305de7ad94ecbb5bc2a0397b38f3feb9588422e961b570459e97c259daef6bdeb7de6123760a69b619d
diff --git a/dev-python/falcon/falcon-2.0.0-r1.ebuild b/dev-python/falcon/falcon-2.0.0-r1.ebuild
deleted file mode 100644
index 1198e6c8fd91..000000000000
--- a/dev-python/falcon/falcon-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="https://falconframework.org/ https://pypi.org/project/falcon/"
-SRC_URI="https://github.com/falconry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cython"
-
-BDEPEND="cython? ( dev-python/cython[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	if ! use cython; then
-		sed -i -e 's/if with_cython:/if False:/' setup.py || die
-	fi
-
-	default
-}
-
-python_test() {
-	local deselect=(
-		# mujson is unpackaged, test-only dep
-		--ignore tests/test_media_handlers.py
-		# uses unsafe serialization (unsafe_load)
-		--deselect tests/test_httperror.py::TestHTTPError::test_custom_error_serializer
-	)
-
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/falcon/metadata.xml b/dev-python/falcon/metadata.xml
index 6d8725acd53f..654149b5c34b 100644
--- a/dev-python/falcon/metadata.xml
+++ b/dev-python/falcon/metadata.xml
@@ -5,9 +5,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<use>
-		<flag name="cython">Build cython-based python modules</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">falconry/falcon</remote-id>
 		<remote-id type="pypi">falcon</remote-id>
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 1100440f682a..edab688fae9e 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -2,6 +2,6 @@ AUX feedparser-5.2.1-sgmllib.patch 2748 BLAKE2B c7b4ce987f0067020e996134379ff0d3
 AUX feedparser-6.0.8-fix-py3.10.patch 555 BLAKE2B 20ff9ae0e540bc2dfbb2d336a12804c444f99f9249e4a4f4aff241cdb3e927aeb8c64ac5eb410b273f7628f5fa4bebd19dc26776ca0ad65a591e493197884c25 SHA512 6a663180a185e5ff915bf5f45220e08ef58c2bc8253e7d943cbb065c202b611dcd1cd6baeef26d9ea6487679d69b3449d2c5f7d6dcc6044e19df52650190c1f9
 DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
 DIST feedparser-6.0.8.tar.gz 252496 BLAKE2B 1a17ef6aa41e0782743d5d331ba26e2d1518475534adcd62457bc6fab00b93e24a3a3b03f4acf8358d321464b985c9d09383dc0373680577c10b742c5e1366fd SHA512 9de702dbebe28b379fd164afed8c408f46301f3ebf91d9f862f12de98a1bcee9f6d38a27c0b8a64e87bc0a20d0ad992ed78b190406649f775e2e8c9ca62b4d8c
-EBUILD feedparser-5.2.1-r1.ebuild 1133 BLAKE2B de711d5a8a89583536f614de0a692c4f65bd0592bfc8ebc0556913c5104ef46c781a32fc8fd58efbebafaf44874279d180668242b4f2c74344bb137b566ebfaa SHA512 56e5dc52b253e94c5effcdbaa00915d5e0d993e39490e98f05e2eabfac93c32d48d815314acbb1255f80f408508f75dac68d173f56a73a78a1c70cb19ad19972
+EBUILD feedparser-5.2.1-r2.ebuild 1180 BLAKE2B bc029efac0f8cf340b348875bd555e38681211bb302f3f240b1d26323e5bc8a93d7bc67ab720c863a1ffeb5c4024889860f8ac495aeafea5cf3238b039573c95 SHA512 d7053065aa68f08cf1d987014676eaf19ed2d1d03bc32e5b2a85e3dcaaa650d4c22ddd46511622a105a92c97ad94288c7940405dfbadc9e09a3740da4f41253a
 EBUILD feedparser-6.0.8.ebuild 976 BLAKE2B 92ebb3d9104bc21a423c121b0a1698183fefdd345566a036efb09f374515d09edf3f35c68597e86dfd29da61108b2cc9b07a61c52a80166a7f7b3dd39cc44179 SHA512 581e945bd95d3172c24d37e42726bdee8f12db85f7f87d348392586ca097a6f364588bc53408c9e80b4e0250f80f2bb1deb1f93c9a5f33780648b5d4671eb02d
 MISC metadata.xml 468 BLAKE2B a0ae044ea5e9b15c43bea0cd38f3641522a2e911193fa8452cb2919e299b40d4410bc23f056a2070e23929610d3c4dedc2b20828e018a031e079281ced62f753 SHA512 a03a6e5a92cf9e18552c9c3a753f4560add583579c6c8bc912732f4c0679a417b195db56e5224927b086f84d9c7eacd8e16ee58f4017dc014f8a902d1a1ea2e7
diff --git a/dev-python/feedparser/feedparser-5.2.1-r1.ebuild b/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
deleted file mode 100644
index c32c70f42190..000000000000
--- a/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
+++ /dev/null
@@ -1,40 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Parse RSS and Atom feeds in Python"
-HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.org/project/feedparser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-# sgmllib is licensed under PSF-2.
-LICENSE="BSD-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-# Tests have issues with chardet installed, and are just kind of buggy.
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-sgmllib.patch"
-)
-
-python_prepare_all() {
-	mv feedparser/sgmllib3.py feedparser/_feedparser_sgmllib.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp feedparser/feedparsertest.py "${BUILD_DIR}" || die
-	ln -s "${S}/feedparser/tests" "${BUILD_DIR}/tests" || die
-	cd "${BUILD_DIR}" || die
-	if [[ ${EPYTHON} == python3* ]]; then
-		2to3 --no-diffs -w -n feedparsertest.py || die
-	fi
-	"${PYTHON}" feedparsertest.py || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/feedparser/feedparser-5.2.1-r2.ebuild b/dev-python/feedparser/feedparser-5.2.1-r2.ebuild
new file mode 100644
index 000000000000..77082cc074aa
--- /dev/null
+++ b/dev-python/feedparser/feedparser-5.2.1-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Parse RSS and Atom feeds in Python"
+HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.org/project/feedparser/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+# sgmllib is licensed under PSF-2.
+LICENSE="BSD-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+# Tests have issues with chardet installed, and are just kind of buggy.
+RESTRICT="test"
+
+BDEPEND="<dev-python/setuptools-58[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${P}-sgmllib.patch"
+)
+
+python_prepare_all() {
+	mv feedparser/sgmllib3.py feedparser/_feedparser_sgmllib.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cp feedparser/feedparsertest.py "${BUILD_DIR}" || die
+	ln -s "${S}/feedparser/tests" "${BUILD_DIR}/tests" || die
+	cd "${BUILD_DIR}" || die
+	if [[ ${EPYTHON} == python3* ]]; then
+		2to3 --no-diffs -w -n feedparsertest.py || die
+	fi
+	"${PYTHON}" feedparsertest.py || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index aed34a2723ce..63836a384f79 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -2,8 +2,10 @@ DIST py-filelock-3.0.12.tar.gz 587613 BLAKE2B 3eb765e4cb251ace50fcaf3b7cf52939e6
 DIST py-filelock-3.1.0.tar.gz 584958 BLAKE2B 29ce6c14ece7a45104ceda46bbb261730f7bf3e7df9d20be783a8e8324ca350e8b02a099f4273aff953281e10d305772c3572a72377f1039d0763c3d87173289 SHA512 cffca48f9e7b39a750bcecdbd4a1c8fd2a57c0eddd41fb735930ecb954550620ab89994cc159b6f0ada2cc0961a097e5e2c2ac380de424b59b111a3290682b86
 DIST py-filelock-3.2.0.tar.gz 584871 BLAKE2B 67c5d85dd030007c12f549e772eac8d028c9f0ee9abac4b5106bbcae91e5447e7c6394938877b718630c22323c53ebc28a8bff8b2e323401f027807f7447017b SHA512 8c2f3980090b798ca0103158731a816443bf461a40d79f337e1c102aee50b3885d2b30113d509a8457df20a2cef196e70b2313fbe3f5b44557b817e5a6154d80
 DIST py-filelock-3.3.0.tar.gz 200781 BLAKE2B b511e6f2780639cddaa0753b1812c44a32720d84af63ad503ea7843ee59f81555569ed828296ba89f0e42b88de3f62c9af9abea970848acb59f2ce59eafb9c64 SHA512 e0a1603f8056788223edb4e0a2b3a83d7dceba385ff14ed04966b47a29c659ef58f782383a3864b6ffa8edeb5be6e85ad3cc70abf3926514eccac5bc747c81ad
+DIST py-filelock-3.3.1.tar.gz 202803 BLAKE2B d8a97d6e5beb8fe8883aa29bb55135f10f40f899232a84a53d66c4f4f50317f0e66a52141eb4285dd23fada276d23f10f43be166c481dc422a606d02eb350146 SHA512 0e8ff074a65f0f8f65fb4f05d94fcaccd37f2f1c489e5ed888e36f722a046cd143596ed1142d0638f2eaabdbfb27e48011bbce9b09e776e11c16b1c13d1467a8
 EBUILD filelock-3.0.12-r1.ebuild 640 BLAKE2B 798ef67b1ee71b99c065b48a8d5b54f9407a32d742a02a8d86e0c5f978662b2370afdc72617af1ec7712882bba3a92afbece905631265c1491a83f28db8971a3 SHA512 027590809537070c19811c080177863b21233728fa8db3c590763600a695898744e777d2a7f3a6a3cd48b04c2d1e6817e44ff59721ba7d254e05d5b90620d922
 EBUILD filelock-3.1.0.ebuild 682 BLAKE2B 15dcf39ee226422f1c84059de265aa5ce6c7a8904dba2eeee5cd935533dec4075984daacc37724c78010f90b03683f59ac3b40cd4ddf0ef74f1e0d9526a9b3d0 SHA512 c823957d1340e507ec6c29a034f43f4c613e8af0b4a557a6f60df297c18b71db76cc81db9868122a5044b131f97f2e28ca87eddf507e1282702c976040378f21
 EBUILD filelock-3.2.0.ebuild 749 BLAKE2B b74df2eee9c8ba9cdf1b8522be33b9108dd98a02e1614019cce1e762e0c2bc7d9270df5236597c760a7180facfd89cd938a175e6f1f55dc5d031648380c42873 SHA512 5d6344e4da56d1e441a02ef209f252e7d372702e638a942d359c07499550d79071e96fa250256bbac5ad61cbc4acbeb350ef9385642cf9ad74e01e5b2f3803f2
 EBUILD filelock-3.3.0.ebuild 749 BLAKE2B b74df2eee9c8ba9cdf1b8522be33b9108dd98a02e1614019cce1e762e0c2bc7d9270df5236597c760a7180facfd89cd938a175e6f1f55dc5d031648380c42873 SHA512 5d6344e4da56d1e441a02ef209f252e7d372702e638a942d359c07499550d79071e96fa250256bbac5ad61cbc4acbeb350ef9385642cf9ad74e01e5b2f3803f2
-MISC metadata.xml 381 BLAKE2B 2a49a48af3a92fe1cdf2c124d1358793a3a54f77c81b1548e06ea4ecc98a8043570ed24786af5d750bd6146f79d5ea75b477c6465d12f1d4a29754002de5bdc0 SHA512 252752e2bf29b3530576ab1e8de05cebffd1ed36ea7b473cb6e51a99c9763f8caeb9851a432dc4e84ce96fa653ac08d087f7f275c89bd8e66f8b91348856bdef
+EBUILD filelock-3.3.1.ebuild 740 BLAKE2B 92350ffb89b35018f445a3a8b8b46da812b8c43bd647173e196b36062e20c0fd21a41fbac2189434ae669351f198f4bf93f369807b2b2bff1ad7566f14a7739b SHA512 4e0a61b93ff0f1fe6bb00626457622c9b1338848c1e1b54ede264189691636bee9762d5055f50c0227a074b7f20a87706b1e345676060c11aa425a10a6be0d3d
+MISC metadata.xml 373 BLAKE2B 8923cea15313a2a4cad1af3e5e6c5623ac9855d3de37b6e43ff5249504d2bf07e1e334ce6ea8d9c397e03e3a05585cec0233e841a0a9f6c30d43eaa26b488933 SHA512 c114595146c326243756d0053476677b8b8c7541a253a0c739827e9b0f93c2a695d7289ee5a17c4a1a79639c02bf1396d2df4d8e20aaac9402c9d80f55be2f7b
diff --git a/dev-python/filelock/filelock-3.3.1.ebuild b/dev-python/filelock/filelock-3.3.1.ebuild
new file mode 100644
index 000000000000..1f2f85c083a5
--- /dev/null
+++ b/dev-python/filelock/filelock-3.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+MY_P=py-filelock-${PV}
+DESCRIPTION="A platform independent file lock for Python"
+HOMEPAGE="
+	https://github.com/tox-dev/py-filelock/
+	https://pypi.org/project/filelock/"
+SRC_URI="
+	https://github.com/tox-dev/py-filelock/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/filelock/metadata.xml b/dev-python/filelock/metadata.xml
index 2289c0939862..855037ce85a8 100644
--- a/dev-python/filelock/metadata.xml
+++ b/dev-python/filelock/metadata.xml
@@ -7,6 +7,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">filelock</remote-id>
-		<remote-id type="github">benediktschmitt/py-filelock</remote-id>
+		<remote-id type="github">tox-dev/py-filelock</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/findimports/Manifest b/dev-python/findimports/Manifest
index 9165f9ad1048..d6b6dd89f975 100644
--- a/dev-python/findimports/Manifest
+++ b/dev-python/findimports/Manifest
@@ -1,7 +1,3 @@
-DIST findimports-1.5.2.gh.tar.gz 32211 BLAKE2B ea3110925085d466df7f95eaa06dce9e331ecba52c1772b76b05e51c633a8adc1ff91295db441049dab39129606e3927f69834376cc5fb864f5f3b62ac68bac2 SHA512 86432d29d180d4299ba789b69601722a6a15eed9badbf2f930e8867be06c64a2f1f8123ae182d7c6b73339287d04c2cdb4a18a31662ea72e86283ee165dc4d45
-DIST findimports-2.0.0.gh.tar.gz 33896 BLAKE2B e457d9e67102018cbd99f907afed33446fe11e3fc8fd9ec44459b2ed9fbe469d825b3f5fb1884b436d0576bcabacc787ef921bb5378e0389ecf789068d439e4a SHA512 c6f5b6aad6fe57f7625592c445286827c0eec74d513e85532c7e650a5f33021f7c204cb6857641a18874c640f0a79d468321875d13fb03ed645554488973294a
 DIST findimports-2.1.0.gh.tar.gz 34252 BLAKE2B 3433945b3c55f5607b5bd9e4694761b0d06c708d7873c8204d2b0bb14e15e0c60bf010e0dd30b336857891199d4ac5f1133a8ec6f3d4c37c1337f85674aa2704 SHA512 5a86d291e5888e15d612d06d4a94c0f08800a26d4ffdff4b485eb8cf1a10ed38883db2d79c6f73e6b2680cc1e5ffc51952c3405dfd4ff95716e0a2b2ac930a95
-EBUILD findimports-1.5.2.ebuild 470 BLAKE2B 23d93fc510c5654b09d52f9bbaf7316d4a9bd8bf6b3ea5c309068bb2a29b2ef48527ff6c3171476ef60b7c6ec6afdc781c2ea9ccf8b89140e140fd8d00b6c2c2 SHA512 ffb7fafdaa2830848083baea0a835f283f9da96d0bdd773c2290b963daaa9889a3c975201d7d9efdce407bbc37991df24281b91eacfa46200c66122cdfc85f05
-EBUILD findimports-2.0.0.ebuild 443 BLAKE2B 6ae8ac13810f5fd3c89f3158ab0ec4498dd80e11c103819f5c0048ad45092f30dcfaca9749e958f673c55588222866fb630b3106f4d788c67df66a5a8944752b SHA512 0c1e87e492c370090fc409f5434c49fbb91507b0f33baa710d7758ae0248a0423cb86d8442b282cd79c0ce72f919f91daac6b0d98e0c1af9e698ff01bd02d001
 EBUILD findimports-2.1.0.ebuild 443 BLAKE2B 6ae8ac13810f5fd3c89f3158ab0ec4498dd80e11c103819f5c0048ad45092f30dcfaca9749e958f673c55588222866fb630b3106f4d788c67df66a5a8944752b SHA512 0c1e87e492c370090fc409f5434c49fbb91507b0f33baa710d7758ae0248a0423cb86d8442b282cd79c0ce72f919f91daac6b0d98e0c1af9e698ff01bd02d001
 MISC metadata.xml 322 BLAKE2B fab9ee7b0dc462a2c034e3cdfc0f5d5b3d6486218515a0e18c8348491f89c5164f8fc7e7878bac35ef15a7aa0483b0064f467ab0bab9ff355f9c7996de97c400 SHA512 df594d456e3f7a5387ce1d3f018dc8467e38cb7820f30c64db7988499d1b35ccb301ad6798796dd7dd7123d1e598c8bea81e84f8fdef662fc8e025cf3cb2fa7f
diff --git a/dev-python/findimports/findimports-1.5.2.ebuild b/dev-python/findimports/findimports-1.5.2.ebuild
deleted file mode 100644
index 39a8903bf95e..000000000000
--- a/dev-python/findimports/findimports-1.5.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Python module import analysis tool"
-HOMEPAGE="https://github.com/mgedmin/findimports"
-SRC_URI="
-	https://github.com/mgedmin/findimports/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/findimports/findimports-2.0.0.ebuild b/dev-python/findimports/findimports-2.0.0.ebuild
deleted file mode 100644
index af4535f46433..000000000000
--- a/dev-python/findimports/findimports-2.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python module import analysis tool"
-HOMEPAGE="https://github.com/mgedmin/findimports"
-SRC_URI="
-	https://github.com/mgedmin/findimports/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/flake8-import-order/Manifest b/dev-python/flake8-import-order/Manifest
deleted file mode 100644
index fd7eca09f545..000000000000
--- a/dev-python/flake8-import-order/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST flake8-import-order-0.18.tar.gz 18507 BLAKE2B 01d9ea712dd5cc4177aec2c1ea2c2dfa72266edfa6b9143657076edab02548058a5bb4642a9a9b7c3dcad36cd76491114cc36a128d57076d09e4cd9e0f1568fe SHA512 8a897d42c81e99d9373fdf03e975b65309700fddf7c38294fe65562ce788e788c9d6c2ec8dd2c8d24e65b4360b3b3577a7a66eb279a5952f8b9d212b06047395
-EBUILD flake8-import-order-0.18.ebuild 804 BLAKE2B f2ec675e13193fee63ec82d56e1db8c49b0c115ef9f7efd161d0d7d199cbdfb2bfea4128a24700a694f4a5d25a1bb69b6354bf3102d99f2117428461a8f26c5e SHA512 6480752c3f4c5f268d4714559a292f75bd82d7055fbd9de7429774315a75872dcc1b8d83cd5af9b4beb3ee5001722375a2922a35dd25c8ace5b7f17ea9f6519c
-MISC metadata.xml 392 BLAKE2B 7b1d070f6d0e4019528aa3735a6897f480d14329ec84097cc6ca890928579c74b50a066508a83d1597915d4de0197afdb2f215f254f36f534d14b0d1974ab222 SHA512 6252178c781106d3eb6ac503df0986b9bc00fca63a342b6852281730beb453e2c25fb04e9ff6b4dbdf7ea0056da5e9fb1a8186c5c3137d87edc8cbbc3ecfc9a3
diff --git a/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild b/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
deleted file mode 100644
index c2d3b7e81c63..000000000000
--- a/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Flake8 plugin that checks import order against various Python Style Guides"
-HOMEPAGE="https://github.com/PyCQA/flake8-import-order"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pycodestyle[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-		dev-python/pylama[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	pytest -vv tests || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/flake8-import-order/metadata.xml b/dev-python/flake8-import-order/metadata.xml
deleted file mode 100644
index 5d3ce61a3bea..000000000000
--- a/dev-python/flake8-import-order/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">flake8-import-order</remote-id>
-		<remote-id type="github">PyCQA/flake8-import-order</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 8091f3e164b4..f3ee85a526f8 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,5 +1,9 @@
 DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0
 DIST flake8-3.9.2.tar.gz 164777 BLAKE2B 1c991296a3e47e4c41f1196fcaf1e7ea059226dfb41657a52fc4f5a9023b54dba21dd99635398e12f37f52f6e498a0a1fb7d87aba0fe7098ebbdfb54dc5598b0 SHA512 618fe1b35070b24395e5d4da9fa1b1f6308abf6f85d8de71b8b553f84d70d9cd7d2a6f616fa1418db9a8b5ad3efab038f4e2d7c6020c0c1bdeb8157e666911fd
+DIST flake8-4.0.0.tar.gz 154732 BLAKE2B 3d469e3e12212051abfeb93943ac8ec310e607c86c06db47b5487544e582f39480e76bc8ea621c5dba6493592eff64b19cb2be9b6b122527c66993415fab15ab SHA512 202b89c9b93f10a09453a215bbcd4260513ee21e4c1b3591088779155a4ca7277a1c274edbb12fcaf33d29ebe9389a3c57ce5aa4e12434f17960dcb0f769680e
+DIST flake8-4.0.1.tar.gz 154905 BLAKE2B b93fea36236881da595ae924b056686e0cd35d2466c1858e3ee83262922df8bc38cf5cd40a910980d287d048572dc94eb8d7c8ee4b11ebd1b4a474dfca02490c SHA512 0bdbf0218ce893df1c3e61f51cd3f371a5c72bb49ef78fec39548b1684e49b024e91cf4e3dcea60ba1efc08727985ef485814c372461e062ff4f810da99a1796
 EBUILD flake8-3.8.4.ebuild 1188 BLAKE2B 7b0c81113db70735cdb5757df5142aaf6a387133cf2a28c6c89cac1d316a3e632a0f3f39408d14e72a096a57040cb104940dda83b6c0c0c315e4cf7c7046f947 SHA512 a3b9b959da19ca3406c355108d3df65d7d17c7a33bf597e86d34b6fa51891fdff8cfb4831cdda6b36f78af19bc2045025205957bdf98c9484ed3d73968c01659
 EBUILD flake8-3.9.2.ebuild 1154 BLAKE2B 496c734bb728f0fca9ddda1323c70a469a910c48907524e2a4f5cb7a59187392fead2d5389bdd5e6afaed83d3e9940dce5fb8c6b2dc80d27a5815f8c4c52f7b7 SHA512 c1aeea77b0c046eb74b5cc8c4b6328cbb6e9037f9c78cfae92a4db7370701505163ea40dd4644de6e22f3035510155c48df818104b202ee5ad6471e17e71aaa8
+EBUILD flake8-4.0.0.ebuild 1244 BLAKE2B 6a0e307e52424fbe33389edf6fc7d76c487229736f326d6fdb4041a604b4ae10360378036dd4bcb65bd3b37be9a94478e0a6e90aaa8dc3094ceaf036af773389 SHA512 60882c084375d3ef22a9c9bb0d0ad4c3cf7157891d53f7c0ce6fbb539ab90311c10c7806188617d922ceac2ae1ea24a370c1d2964d4309ff74025a0096420b8f
+EBUILD flake8-4.0.1.ebuild 1244 BLAKE2B 6a0e307e52424fbe33389edf6fc7d76c487229736f326d6fdb4041a604b4ae10360378036dd4bcb65bd3b37be9a94478e0a6e90aaa8dc3094ceaf036af773389 SHA512 60882c084375d3ef22a9c9bb0d0ad4c3cf7157891d53f7c0ce6fbb539ab90311c10c7806188617d922ceac2ae1ea24a370c1d2964d4309ff74025a0096420b8f
 MISC metadata.xml 399 BLAKE2B 70701bbf00aac5f16ae5bb241b56a69c79abe02eea8695d5cdf71fb427e5ed1f1e19dca0e77904889a99e22026b39d64c309d4072dc4175f7660e414aec3736d SHA512 98ef1cc82925436bd40fe18876be4ba3b8b5aee42e62e73406b46ac49cdd2c689a69e4e685fb5f69f5ea7fbf6335797dc059817f4cf36f51c73404255830acf9
diff --git a/dev-python/flake8/flake8-4.0.0.ebuild b/dev-python/flake8/flake8-4.0.0.ebuild
new file mode 100644
index 000000000000..8bf1116ff1cf
--- /dev/null
+++ b/dev-python/flake8/flake8-4.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3)
+"
+PDEPEND="
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		${PDEPEND}
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	# remove version-limited dep
+	sed -i -e '/importlib-metadata/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/flake8/flake8-4.0.1.ebuild b/dev-python/flake8/flake8-4.0.1.ebuild
new file mode 100644
index 000000000000..8bf1116ff1cf
--- /dev/null
+++ b/dev-python/flake8/flake8-4.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3)
+"
+PDEPEND="
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		${PDEPEND}
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	# remove version-limited dep
+	sed -i -e '/importlib-metadata/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/flask-api/Manifest b/dev-python/flask-api/Manifest
index 4f691e33532b..7c831db74f12 100644
--- a/dev-python/flask-api/Manifest
+++ b/dev-python/flask-api/Manifest
@@ -1,6 +1,3 @@
-AUX flask-api-2.0-fix-pypy-tests.patch 1150 BLAKE2B 571b48be64f135706a010648b667032132d38fafad20fa86220766c3c4a2a4953260cdeb1933936cf0369886f171736b0a55415b73086c2f4492679f3a091b9f SHA512 df0ab5fb20ef9d79ba1c1c3aa9b33b5b7a426039dbd18743297d1c6de484ea94047edd6b4a8b6a18060b8ed494c283f1091f622c11060170a67bd4480e640453
-DIST flask-api-2.0.tar.gz 235593 BLAKE2B fadd746d91cc2c797a2e40ee6b11532eb0184a1289a692f8de844501a6656eaa1e87d10811119f267344185b22ed5c12bca43198d64d50ca8055ce95d0f62f19 SHA512 631e69e5a786598e6b5ef7e02c5c4f293eadd84d86fdf0155771d04fb6e87be5686756db90ab265cc097ae3d623c31dcebf5096a62c660d6f7d6fb1c3f3d4e3f
 DIST flask-api-3.0.tar.gz 249620 BLAKE2B 63ce0ce6a2d4755caf40c020fc6b88f3b585b0c30f5800df62c8e442f629b8b489917ff0f0d1266d941478336f38aa0560c144620f6c11d60cbd9e31870bf984 SHA512 c86b919f8681a73be166ddc50022faecb376b1b6f99bd0d78b2f2fc8b64f82bf82779dbdcfbcaa1c5e321ea2d286b95f1a1aab32864e6c3923417d7828c7c79a
-EBUILD flask-api-2.0.ebuild 760 BLAKE2B 887d1cc647103e5de7db20c092d915c94728e2f06df720344c9115cb292c0282abc8ef63e3f7fb93656524f5aa296e00307460ec198b6f37e361b0fe61f62844 SHA512 9541d4fd66f21049d9588ad72b538b7ad2d9a5361919c14035f60d04fe230f7ec69b478ebf169ebdcff344f450550ddd98c7f239b0bbc3c581a09ace52215c8e
 EBUILD flask-api-3.0.ebuild 681 BLAKE2B 0e9309c4d87138939e05a3ab36b08d9e259ca8ffb1c3a41c016999fd19199039ee5aae5c8e7c47b6975e7c8eb67a9a80774bac1755c808f7b6eb082937892f4d SHA512 b6f3bbe8f8ab7bbc21ac2631c122cf066b40f4f9a1102a11099d84d154d7c4d3ced9b7b06fd54ac8c1dae804d433d8e30241008e8b0b1acfff480c703bc0e927
 MISC metadata.xml 728 BLAKE2B 54f369da75822026ef30c2f16efac1a478b1f42b8bde27710c73fb7b974cf70b5c266c182f6efc6096f4efc0c11645a74fd19ca30ab2dfd48af4e65a731983e6 SHA512 a009d75f162e2775ec5fb1eda9c12af46c76094d64952effe1dd9aa74ae3bfcd3dc40e4523cda464c8cc14eed150d8cef2175acd294574752d79f0ff8c97e8e7
diff --git a/dev-python/flask-api/files/flask-api-2.0-fix-pypy-tests.patch b/dev-python/flask-api/files/flask-api-2.0-fix-pypy-tests.patch
deleted file mode 100644
index 4d30691b60d3..000000000000
--- a/dev-python/flask-api/files/flask-api-2.0-fix-pypy-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit beb6a364de93a429398a9491e16f60a7aa82f51d
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Tue Sep 22 00:46:38 2020 +0200
-
-    Fix tests with PyPy, remove unused Python2-related code
-
-diff --git a/flask_api/tests/test_parsers.py b/flask_api/tests/test_parsers.py
-index 90a6b83..b7968f6 100644
---- a/flask_api/tests/test_parsers.py
-+++ b/flask_api/tests/test_parsers.py
-@@ -36,9 +36,9 @@ class ParserTests(unittest.TestCase):
-         with self.assertRaises(exceptions.ParseError) as context:
-             parser.parse(stream, mediatypes.MediaType('application/json'))
-         detail = str(context.exception)
--        expected_py2 = 'JSON parse error - Expecting property name: line 1 column 1 (char 1)'
-+        expected_pypy = 'JSON parse error - Key name must be string at char: line 1 column 2 (char 1)'
-         expected_py3 = 'JSON parse error - Expecting property name enclosed in double quotes: line 1 column 2 (char 1)'
--        self.assertIn(detail, (expected_py2, expected_py3))
-+        self.assertIn(detail, (expected_pypy, expected_py3))
- 
-     def test_invalid_multipart(self):
-         parser = parsers.MultiPartParser()
diff --git a/dev-python/flask-api/flask-api-2.0.ebuild b/dev-python/flask-api/flask-api-2.0.ebuild
deleted file mode 100644
index 3d030534fe17..000000000000
--- a/dev-python/flask-api/flask-api-2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Browsable web APIs for Flask"
-HOMEPAGE="https://www.flaskapi.org/"
-# pypi mirror don't have docs folder
-SRC_URI="https://github.com/flask-api/flask-api/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-"
-
-# https://github.com/flask-api/flask-api/pull/117
-PATCHES=( "${FILESDIR}/${P}-fix-pypy-tests.patch" )
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc docs/about/* docs/api-guide/* docs/index.md
-}
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index 17ea078e3db9..7f11cc0beeb5 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1,3 +1,5 @@
 DIST Flask-HTMLmin-2.1.0.gh.tar.gz 16395 BLAKE2B 259d3af497343d35fabb60e4aa1a832782de47fa78f2e8c6bdaa47a7e78efa8dfa756e87d0d03b5972f3e051a29dfff53b370cb1f3ee1f8a9e401d06c40894fd SHA512 3d3ea40bc5d802f41b0d3a99fcca59407b3948d9b4fe2300bc597bbfbaa851435276a7dcee4b6cc08cc52b0674a53fd655b7bb1c6504bd53ea9963600626a59a
+DIST Flask-HTMLmin-2.2.0.gh.tar.gz 17637 BLAKE2B 541ae212ba5bfd5e5881adb108d62c994248a7f851512d0fddedb001737620433cb46e267cdd66de73a353c6b357802eb89ea33c771153bc0acf3937c06f83c3 SHA512 24287ef93e99a16e7dde35ba6b7b8fefa06f11ce30fb47969313c3e0e1135ac8a2685aac06bc430d3253162f4f2bc7e8eed90ddda2092bbad092d4e0d09cb4fc
 EBUILD flask-htmlmin-2.1.0.ebuild 686 BLAKE2B 0fa530b64b984afe5d151f9d756094e74d10db39c01b7f7e422fea46260e2ff0412181604e51212ee803e0125ed10ad2e184b0f59415a827afe1e7f7e8069741 SHA512 7e4c58a64154084382eea8e7b10c6880c2df3f98e5a595e18a9ab7bb86c1c6f5790d94d80ee115d2a47d66dfdb7b14e39b4c72a82bc2422666bab5f47316e705
+EBUILD flask-htmlmin-2.2.0.ebuild 709 BLAKE2B 22b35463f3c414acd8490060ab2355a74d9631d49b1e3210999f46b137a3c08ce8036723cbc606d9a91e43cfc39bfdcc01f962322789ecb268ff59a7872347c4 SHA512 c9af225888ad4aabe85cf204fce5196cd1ed3f8b7321b9ee3c454432f2404b8828848396221b81bc7c87479e663550e8800667c9f491bad243bab627158c354a
 MISC metadata.xml 517 BLAKE2B e22522b2f2578e000de4127d3c6cd5d6f08b3974aef72644e51ae39e074eed3d42cba247b2dff4090e930cd9ecb5354f7094a763c116989d425672d109fdd408 SHA512 6393c0fb4084501989d12c24f7e56269780423d675761e48da3ed159db639df3639e5a68cfcfaa8a53d1e111474d05656f227137af2ee7950f4ec88f1393216c
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-2.2.0.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-2.2.0.ebuild
new file mode 100644
index 000000000000..5cdcf795a321
--- /dev/null
+++ b/dev-python/flask-htmlmin/flask-htmlmin-2.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="Flask-HTMLmin-${PV}"
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Minimize your flask rendered html"
+HOMEPAGE="https://github.com/hamidfzm/Flask-HTMLmin"
+SRC_URI="
+	https://github.com/hamidfzm/Flask-HTMLmin/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/cssmin[${PYTHON_USEDEP}]
+	app-text/htmlmin[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/pytest-runner/d' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/flask-nav/Manifest b/dev-python/flask-nav/Manifest
index 7a9cf88ed4cd..636e9d3a7b8e 100644
--- a/dev-python/flask-nav/Manifest
+++ b/dev-python/flask-nav/Manifest
@@ -1,5 +1,4 @@
 AUX flask-nav-0.6-py310.patch 487 BLAKE2B 9526db877a101895fdebc57a435612a97c7f8355ad7664fb01f36965697b785798bc206e050f5b3673335302bd55de80a21215163b92917516868b4202360301 SHA512 dbd5c8e5b3640c15048fc4b432c879535a4373b53a1e3e7d8eb8ca6cf7c3d6f69670407b7bf2b01d42fcb99d19c587e71c5c3e17885f8baf4d3061f9db7fbd55
 DIST flask-nav-0.6.tar.gz 12270 BLAKE2B eff90b6fc08629139012e2d920b4d464ed06954040a5e97636a7aa4d59d11654839460ef52477cfcec967bd774d942028a53675d682e850f08f6359c5cfbb54e SHA512 a7930687425a53fac9ad9a7cb65c2e2a759a0c9660189965bf37ea6e9925dd869074d37a283801631b3e6c3391f9f4167e0a36294104f72970e876b5a7a0930c
-EBUILD flask-nav-0.6-r2.ebuild 737 BLAKE2B fdf1beee98d27435a5fdcae7b5ff2dd54871f0c71115237504015515230eb5105ac9f4463a819cf97950e82cbdab936f5d4c1da53badff34003f0a70b834d4e8 SHA512 2d2e53cb27bda2a46637f22908f6863b5bc7048492b12edf520952297fbec659b9233daa27a00016041cb73c3f1c3d95a480be431d457ef3dc27a2095dfd6f3b
 EBUILD flask-nav-0.6-r4.ebuild 826 BLAKE2B 508b811a9fb5388b83b586f33db3265ad78eee46b0aecc66bc89a9b4f949997c83661c3cec30949a60e9a7e2c4da83033d1e998e06cb0466cf1bf41862b4effe SHA512 21428615813c8f73b7e38da96d96e7a58ea81d7b60dbd9830dd007bc23158d093a70b6f9e5b85c0d3943365f8afb200c9bce668187e163d69872c76987e69238
 MISC metadata.xml 456 BLAKE2B ba8cadced3ab7428295e9ec47c0d92e709897a17d74fc435c660ae74d37e81d3c0d1d10b8d249b7cb765ed37add129d4e5789ecb62763574b126a48d24ae15cc SHA512 f319aacbeca67a5b802c2087bab44dddf7b2863436241f3bc848f504f0068fbd7c1b5f3d94c3be8c9de8ebf370ba5beb184ecc3fa0208f51920bccd1cd305423
diff --git a/dev-python/flask-nav/flask-nav-0.6-r2.ebuild b/dev-python/flask-nav/flask-nav-0.6-r2.ebuild
deleted file mode 100644
index b4065c08eecc..000000000000
--- a/dev-python/flask-nav/flask-nav-0.6-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily create navigation for Flask applications."
-HOMEPAGE="https://pythonhosted.org/flask-nav/"
-# docs are missing from PyPI tarballs
-# https://github.com/mbr/flask-nav/pull/12
-SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/dominate[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/visitor[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/alabaster
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index c30c75c775b8..2ddf9d1103ae 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1,10 +1,6 @@
 AUX flask-security-3.4.3-optional-deps.patch 2287 BLAKE2B 5cd174499a3fc22e0888850332ccd0798927a3127d6b84b19dae2ae1cbb8c998b6e8e5246a76eb84712d932f80c77316201834ee048c05c2de6e190bf9aafed6 SHA512 08b0ebfadbf126d1c4dfbc51d222f5da797c40bafc11c923eb2a98c3f65778f2f5400e0ced37c5fc6318a7941dd036ae780dbc958980620bd075f0212c0ea49d
 DIST flask-security-3.4.5.gh.tar.gz 348928 BLAKE2B 9890227e9775c4a28fc364affb0bf767407463d514f6dc3cd359dd8a026e8325d943a547f294f6363a276f9e7d97336c526dd45f4549c7cfaff2d6ef9ef0316a SHA512 f9ac7f46b2e1ab7dbb44ba925b01e16304e8f8d6d5d56f4e558d07b80dfffa59f04c2597e17c00a7d7ae11be3a97c78ccf8d79993b7451be4a7f75f85bc89f6f
-DIST flask-security-4.1.0.gh.tar.gz 406508 BLAKE2B 84da1a563630e4935fecd616ccb51b2421854b502ce9e5b1c328fef358a2c80946ec1308199cf4dffa4fd07ac65ba104bfb9cdb8956916c5ec3fc39da79472a0 SHA512 b31a48abd2f1ccbc79707b377799adcc8f5530a045437d49d28fa5b47187c98993339a05fac35e4677e46ded99df40b8d8a379f9d36c2b2020456520e99b8de6
-DIST flask-security-4.1.1.gh.tar.gz 407794 BLAKE2B 579d3c9086655c2af9bbecb70cbc33c832ba0765859a1cc32beb5aede3ef17b69eff61251235eddd8f1fb6c5a03a33d0a56c376bdf5b5e0b0d33a03147e385f0 SHA512 41f9511d735e6b80af1b1499fb310414036a644414a8093fe81c429fd9aab20b1b494de55d506325def7bb68ab14a3b53031ad7c136af2ed3e8bd406f93c878f
 DIST flask-security-4.1.2.gh.tar.gz 408120 BLAKE2B a4ec9b0a58368b9c84ee2d5b8b7404adf4a985067fca79e574726efc7cd78f9b713360c7d9d53a29ef6dd2ec7d23b64e50893fd75259a00c2b549a4b2a821936 SHA512 8fd3a0561ccc8dd815483fc8d2863a13fa83dea4cf308972778f99c29f0f7496f95cfac483f1a4cf2f77cd2a728eb09a5f8e8b4147d2749aa0b75f98b752ba36
 EBUILD flask-security-3.4.5.ebuild 2270 BLAKE2B b5e24c6713976774778e8c268b9967614676acdf1d906520889c9245ccd9d2a2960c02130c0135e4a891d3ae5859f20cc076be1fc6df5920df9925d39e5e9a59 SHA512 a07e3396fd9a886dd55b246da398939048e150e28bad6fb0399d2c877ecef399a4a470e603ff084fccd1707cde5c965f1420aa4107064603ad7d8c30f29a5c3e
-EBUILD flask-security-4.1.0.ebuild 2043 BLAKE2B 404e5fbba36b21358c834a845d29d8b290b21d0f1a4d5b2669a5a9a3babd6bb4cdfe9a7b030e3793535a816e1d1984a6535e253d3ff70c4c7e4cffc77553b8f8 SHA512 fac0563f8db3ad719a8ed38694293ddd91f8c9e28f98576e3a59eb8c5105f8cb656196b91ca420500c2934ace5c2ca918847a669ae056b57a7fceb9ba0d5fe77
-EBUILD flask-security-4.1.1.ebuild 2045 BLAKE2B 6d12fc33df38331b60ea7c1707f00aa08516209fd950364ae782205f05034283c20d7f08dce0c732057d17a2941a961ae363f66738b9df11249d46dffcc18f5d SHA512 c8558efc74e7339474beb6af6766da868d493af26e30fa635628993576524aaca5efe87beb914de3bcd7aaaf4864cd1a0ec0c024d3974596d83b8f18bd82825a
-EBUILD flask-security-4.1.2.ebuild 2045 BLAKE2B 6d12fc33df38331b60ea7c1707f00aa08516209fd950364ae782205f05034283c20d7f08dce0c732057d17a2941a961ae363f66738b9df11249d46dffcc18f5d SHA512 c8558efc74e7339474beb6af6766da868d493af26e30fa635628993576524aaca5efe87beb914de3bcd7aaaf4864cd1a0ec0c024d3974596d83b8f18bd82825a
+EBUILD flask-security-4.1.2.ebuild 2043 BLAKE2B 404e5fbba36b21358c834a845d29d8b290b21d0f1a4d5b2669a5a9a3babd6bb4cdfe9a7b030e3793535a816e1d1984a6535e253d3ff70c4c7e4cffc77553b8f8 SHA512 fac0563f8db3ad719a8ed38694293ddd91f8c9e28f98576e3a59eb8c5105f8cb656196b91ca420500c2934ace5c2ca918847a669ae056b57a7fceb9ba0d5fe77
 MISC metadata.xml 417 BLAKE2B d2c9497a88d513e360256445b7d144ab969c40cb11726477e2d9a3b850a7bcda909ba0a5d844a6079ddd597056b4628a6eb309bca8756e15864d151a54f1d1c0 SHA512 3aecbb252d4b6e3675ee221eb485fd80dbe52eabda6c4a6831dfb95110feab3284a6b6f4ea0d42aa6d6d7ced8ff0895ab40529ccabcdb5144481243b2bdf1653
diff --git a/dev-python/flask-security/flask-security-4.1.0.ebuild b/dev-python/flask-security/flask-security-4.1.0.ebuild
deleted file mode 100644
index a3dce632dd5d..000000000000
--- a/dev-python/flask-security/flask-security-4.1.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Simple security for Flask apps"
-HOMEPAGE="
-	https://github.com/Flask-Middleware/flask-security/
-	https://pypi.org/project/Flask-Security-Too/"
-SRC_URI="
-	https://github.com/Flask-Middleware/flask-security/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.3[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
-	>=dev-python/python-email-validator-1.1.1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/argon2-cffi-19.1.0[${PYTHON_USEDEP}]
-		>=dev-python/bcrypt-3.1.5[${PYTHON_USEDEP}]
-		dev-python/bleach[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
-		>=dev-python/mongomock-3.19.0[${PYTHON_USEDEP}]
-		>=dev-python/peewee-3.11.2[${PYTHON_USEDEP}]
-		>=dev-python/phonenumbers-8.11.1[${PYTHON_USEDEP}]
-		>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
-		>=dev-python/psycopg-2.8.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pymysql-0.9.3[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.2[${PYTHON_USEDEP}]
-		>=dev-python/zxcvbn-4.4.28[${PYTHON_USEDEP}]
-		amd64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
-		arm64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's@--cache-clear@-p no:httpbin@' pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	esetup.py compile_catalog
-}
diff --git a/dev-python/flask-security/flask-security-4.1.1.ebuild b/dev-python/flask-security/flask-security-4.1.1.ebuild
deleted file mode 100644
index b9bc75feb4f9..000000000000
--- a/dev-python/flask-security/flask-security-4.1.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Simple security for Flask apps"
-HOMEPAGE="
-	https://github.com/Flask-Middleware/flask-security/
-	https://pypi.org/project/Flask-Security-Too/"
-SRC_URI="
-	https://github.com/Flask-Middleware/flask-security/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.3[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
-	>=dev-python/python-email-validator-1.1.1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/argon2-cffi-19.1.0[${PYTHON_USEDEP}]
-		>=dev-python/bcrypt-3.1.5[${PYTHON_USEDEP}]
-		dev-python/bleach[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
-		>=dev-python/mongomock-3.19.0[${PYTHON_USEDEP}]
-		>=dev-python/peewee-3.11.2[${PYTHON_USEDEP}]
-		>=dev-python/phonenumbers-8.11.1[${PYTHON_USEDEP}]
-		>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
-		>=dev-python/psycopg-2.8.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pymysql-0.9.3[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.2[${PYTHON_USEDEP}]
-		>=dev-python/zxcvbn-4.4.28[${PYTHON_USEDEP}]
-		amd64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
-		arm64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's@--cache-clear@-p no:httpbin@' pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	esetup.py compile_catalog
-}
diff --git a/dev-python/flask-security/flask-security-4.1.2.ebuild b/dev-python/flask-security/flask-security-4.1.2.ebuild
index b9bc75feb4f9..a3dce632dd5d 100644
--- a/dev-python/flask-security/flask-security-4.1.2.ebuild
+++ b/dev-python/flask-security/flask-security-4.1.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index a6dd3a08b0a9..458f737b2df2 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,5 +1,5 @@
 DIST flexmock-0.10.10.tar.gz 49201 BLAKE2B f5d77398ac14a002f78790d4e03f93bcd00c016e6a5eb0be45ce3b59a223159656ab694a1dd1124cbac351680fef25084d69e9533d668177ea73b9e458df5b6f SHA512 211939bf40ecb25981a70d5bfe897ef8127ef38d5adf6a48b086c4b6f49b05e1a04f09afb73f428e3eb21a8090ba33ca86e605c2c1ac70d9fc269fdd640ccb73
 DIST flexmock-0.10.9.tar.gz 48466 BLAKE2B b6c73fdb6d281870806db7b34d43d8f116c29ff28a3753e7873868e66df9a34f8f4cfa0c1a7f1fd620a58a46b4376538a8a64994ed82d500a850f86c24fe54d2 SHA512 6e39e5a88b1d744d348f834f4664fc477412f6f09dd2500ef35a52126ce14f9e8d24a04c1ceb16c24b31bc40c3d8276f2efa75a701ecf284bb2cb5388513a75f
-EBUILD flexmock-0.10.10.ebuild 533 BLAKE2B 6b4cb39684e9e1b6d384edb5387b8d31412867ed389a15fc5ef793e1764001ab08aed4b82b2ad647f9b9d94940a416940d3e8db09f333d01fe5f39049ed33122 SHA512 0495922974681c9690532746384032c30779299b37538ad32f125a6d71a00ff154c5a1294faeb3863285263f3d7a07e920f58e4624a82e9ba437787e9b3d41dc
+EBUILD flexmock-0.10.10.ebuild 540 BLAKE2B 8446c3b6bc9763d9109438fc7f518e5fe4005fabb1adbda238749f22af173dea0b68be0659c07198d8007e12039046b5387c41b31e34933ef7a920e6ec80d046 SHA512 61e8fa6e87f91680a56c888bc56e061733bb8236be090dac1dbaaf47a28ff67974552bccbdf8da61ce1425cd23304e42d6bb277b5cada59ac71b923baad6c22c
 EBUILD flexmock-0.10.9.ebuild 533 BLAKE2B e97351a6ee65337b3a6032e428bada4fa77e017e71f9d9aa77f16177c6365a926336f9ae29833aa009986a68d5ad3335e97801da8f630dbcdb3e2dae70dc17d1 SHA512 e1a15900ae680c915a03a8bc511d49a3661a3fbe94cf0f614dad5302bd42575d8da8e7b7891caa9504899e1198fcadda37db64fcaecf3808a5fd3e791b3a51e6
 MISC metadata.xml 397 BLAKE2B d876f426fea0e14ea3518dcf7cf685ec697bfaa09c83b93ad7bf4ecf97dff87cf1ef491e91d759625ee9c8d7f64c4be8419024ad087acac4779a69c283dfde12 SHA512 f8694424c9fe17611fd882f205df6dbe6085b8214a4f1c26e4d5c216e3e018971f85e643a473efd330d61a7759ab9464f9a7fe6e04e2c0d7e02b1e3ce37aab19
diff --git a/dev-python/flexmock/flexmock-0.10.10.ebuild b/dev-python/flexmock/flexmock-0.10.10.ebuild
index e1cb6fdc9cfd..d1a7411c7657 100644
--- a/dev-python/flexmock/flexmock-0.10.10.ebuild
+++ b/dev-python/flexmock/flexmock-0.10.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
index a1847d7ae4b5..5479bdb6da95 100644
--- a/dev-python/flit/Manifest
+++ b/dev-python/flit/Manifest
@@ -1,9 +1,4 @@
-AUX flit-2.1.0-tests.patch 287 BLAKE2B e2deed39a206096f1c4be29678a93fbfc7dabd7cb26bbf8e1e249bc506e5c8550e5531d3252f93d99cc2bad9e317b61d10f1d87e3094f3dd8c1c2d34a85b9049 SHA512 2e628275e3db217c9d5c1a593d3ea6a8539902737da8ed2d98f96f5fc99e0e25da1d427ea153f8279f3de0d7afde14684a7898c7e01e55ebeab4a5572479724b
 AUX flit-3.2.0-tests.patch 445 BLAKE2B 313f975352b67a1dbc5c582ac854dea1625f1819fb1ae147d3fed254dddf69e416d79fb4d787f9deb48d2992d4deea8bfaad681c8a506959a142b8e065a73adb SHA512 737d97e8d9b2c1d1c9a5ef6d6ddd719245a3550092034097899c1917f99604dcd2c5b183f51a7cce8f70c98df9c679adbf3d29068782687018cf085e3cdf931a
-DIST flit-2.1.0.tar.gz 106459 BLAKE2B db51d8cc119ae8aa5f8d0ac1655cd29390065567391cbdf06ca7dbb98a79e96a6d8f318273c2f9a58aaf549090a903360701a844ac071d15304a21ea54052a91 SHA512 0fcbfaa1e5e83216a5c98cc87b0a8f2aa17e2c184ec3f09c7dd0dd5e695311be62344ac4f101cb71f87390513496f8c1152a2cd8d7363202f7696ee002f07a55
-DIST flit-3.2.0.tar.gz 115192 BLAKE2B dda4b9f5b56b9868d737516841d7fc49c0e97ef8a71f9f0628112f68c3dadae89a87aef56cebfe8ec3762af5970d206fe462add146d52b3893fb8852fd7f9625 SHA512 1db7c4118fe1d70d1e318db3bc282747d6cc3f3b626ad68420fa056e585caad9ff0a3f230e17c919ea260ddeb6330effc4bbed8b30d11ed7b27e78d9d7af0445
-DIST flit-3.3.0.tar.gz 117809 BLAKE2B 8ad74f70406e41b35b44886b145b52d83fc30d0a1395bf711807da2ae3974ae8606113e4bcd556694854c48c8c01c3c03b4a1021c7cc3e33cce0e99a5abbb9ea SHA512 904889298aab581640e8323fd68c83d753ea97af0ed1b8f438f192d84d09ced83718440a03d23864885fcf966de9665c3046f0f3a1b1d4170b2decf8430ff006
-EBUILD flit-2.1.0.ebuild 1417 BLAKE2B 070718c185f263ebd450cee23d6ea7cb08a9c7c35638e07f2725b66f54cb201836ee2c288153baa9b0723c129fb82daa469f0035731e0cb870f897dc449d8a48 SHA512 61ca338e64c5537a25a1fd326acf55d31eb376c61d16af2403e8a77a7709951f4fb77bc63c9264a8ccaa3a68f8a6bc7be470d126994ee0da06c9c79eac6a1b0b
-EBUILD flit-3.2.0.ebuild 1209 BLAKE2B 651d171f9c9b79aaee9b42486fd4840a78a47b04a1e9059eda2523c59cbe24f3e9870438d68cfbc640f3e5d2e4db3415d4d952eb2d68780f150b4a0254028c41 SHA512 1ec0cfaf96533b12d77e76b9a8486699c7ef03e7f936fad09e1e3062a269bd57f070f9c92bc8d0abace09cdb0732bc2d7a6c2efe6d8dbc8df77ee66f747f7be3
-EBUILD flit-3.3.0-r1.ebuild 1043 BLAKE2B d7a503ed102473ed487e132e33732276d508da1b76b387855d5ad8837ca21f0157c3331f5dc313bd2f72b73c851136c7e5ba7e387e4ea1667ab889dbc3761e52 SHA512 c277432f6a225ab1f9eefa86d43e54e6c1d581372e6bd1fd6138f649766ed916815b1ff8bcd85999c5e1bb62ba21fbc6ae9c9ac5d8608d2024f8fe60eb2a655a
+DIST flit-3.4.0.tar.gz 120418 BLAKE2B e99eb67daa9a1d8e738ff9b917117edaf7372bbe267163f8af64967e43c3bed94893849e9752d36d3965e70c798dd3fb3b454131cee2d34697cc389f11aaea69 SHA512 18f1d1cb86508e76b4e37e6c1ca2c414400c86e9163bcc52fd3358220e5b4362da4001da7ce427926c62ad67ee86799ea8d08e858e5e17230941c529b9995ce5
+EBUILD flit-3.4.0.ebuild 1082 BLAKE2B cc125fd9b21f3b781d6b648f034a67f11ea27c242db8b21e6e4e43fedf1c967e0bbd008b8b1ed16210cbab4ac783f0ab20703ef4003b69b61903c6e4c0bc1ecc SHA512 19b373cded16e7c9d5da02d6606bf8b19577d291186547332b55720c16d8be0376822860dfb1369b5f68f8c938dc9ea9301cd868ef6142e3f045016d445fe011
 MISC metadata.xml 472 BLAKE2B 75bd369814d338504d8e2a7980ea720d9b82e5ea9c40ef73c9a1a7748671a6904704d1bd051cd8e2b9316c64af76e23da0d41287c8185dd57fda16abd37246f9 SHA512 3f1dcd9612b74111d25cf74343ef69758d02b54aeee96e3c55b8516ab4cb70307ad804f8d21c749051643fc74d94f5e76ca99f52821a61838dc4025203987ecc
diff --git a/dev-python/flit/files/flit-2.1.0-tests.patch b/dev-python/flit/files/flit-2.1.0-tests.patch
deleted file mode 100644
index 04cf9839dbc4..000000000000
--- a/dev-python/flit/files/flit-2.1.0-tests.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/tests/test_inifile.py b/tests/test_inifile.py
-index 150fa47..53ce597 100644
---- a/tests/test_inifile.py
-+++ b/tests/test_inifile.py
-@@ -7,2 +7,3 @@ samples_dir = Path(__file__).parent / 'samples'
- 
-+@pytest.mark.skip("Needs internet access")
- def test_invalid_classifier():
diff --git a/dev-python/flit/flit-2.1.0.ebuild b/dev-python/flit/flit-2.1.0.ebuild
deleted file mode 100644
index 4dd0cc171729..000000000000
--- a/dev-python/flit/flit-2.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules"
-HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	<dev-python/flit_core-3.0.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests_download[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	sys-apps/grep
-	sys-apps/findutils
-	test? (
-		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/flit-2.1.0-tests.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/pygments-github-lexers \
-
-python_prepare_all() {
-	printf -- "from setuptools import setup, find_packages\nsetup(name='%s',version='%s',%s)" \
-		"${PN}" "${PV}" "packages=find_packages(exclude=['tests'])" > setup.py || die
-
-	# use toml instead of depricated pytoml
-	grep -r -l -Z -F 'pytoml' | xargs -0 \
-		sed -e 's:import pytoml as toml:import toml:' \
-			-e 's:pytoml:toml:' -i || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/flit/flit-3.2.0.ebuild b/dev-python/flit/flit-3.2.0.ebuild
deleted file mode 100644
index 289ae9807716..000000000000
--- a/dev-python/flit/flit-3.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules"
-HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests_download[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	sys-apps/grep
-	sys-apps/findutils
-	test? (
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/flit-3.2.0-tests.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/pygments-github-lexers \
-
-python_prepare_all() {
-	printf -- "from setuptools import setup, find_packages\nsetup(name='%s',version='%s',%s)" \
-		"${PN}" "${PV}" "packages=find_packages(exclude=['tests'])" > setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/flit/flit-3.3.0-r1.ebuild b/dev-python/flit/flit-3.3.0-r1.ebuild
deleted file mode 100644
index d54807828524..000000000000
--- a/dev-python/flit/flit-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules"
-HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests_download[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	sys-apps/grep
-	sys-apps/findutils
-	test? (
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/flit-3.2.0-tests.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/pygments-github-lexers \
diff --git a/dev-python/flit/flit-3.4.0.ebuild b/dev-python/flit/flit-3.4.0.ebuild
new file mode 100644
index 000000000000..1bc9a7f33b5c
--- /dev/null
+++ b/dev-python/flit/flit-3.4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Simplified packaging of Python modules"
+HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
+	dev-python/intreehooks[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests_download[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	sys-apps/grep
+	sys-apps/findutils
+	test? (
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/flit-3.2.0-tests.patch"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/pygments-github-lexers \
diff --git a/dev-python/flit_core/Manifest b/dev-python/flit_core/Manifest
index 16522185d465..01d357497e44 100644
--- a/dev-python/flit_core/Manifest
+++ b/dev-python/flit_core/Manifest
@@ -1,7 +1,3 @@
-DIST flit_core-2.1.0.tar.gz 22978 BLAKE2B 87cb5ced56666eb9ae4963628864b66c77758c823b34712770a61a52cb7916196c0d6f51e7b2ad9804b853f27a257966aabef7dd9c95155af8e76f5100b1c9fa SHA512 dfc11cdd62af367b56773e5e0b28763554cd27a272a040a5dd35c8fae4f1e6695b2e2b15b6e63f6aa52df9854874eccc31f6eaf5b349ed85aa33cc5e1d2e1acd
-DIST flit_core-3.2.0.tar.gz 27417 BLAKE2B 8fe53ee47ce9b850b9200f2c1c4c88e3f7e29257fb1c488e3eefe79121634ef4f272db7e96d9621962de2e576da5b684c64653475ebb702bee313564b7fb41cd SHA512 660b787f0a4fc85d8d893087369b378ba5583e1dad82feb8ca3737e70c8c0a5ab5d95a38b7d3e9edff481d5207e946f6e6c7e60f22f96a1de0d2daeef6f16c2b
-DIST flit_core-3.3.0.tar.gz 26424 BLAKE2B a7237b51f16ed4158d5f09cbe92ccee7cbb3b19e67937028e86f4e1c9d58c9fe9244ea6337bc7c7c5bb29e204d011ee95a6d3fbe596d728ce66f1e00a830fb0c SHA512 5d7b1a43a9d9a7c0cf30b1f73d208963ae51247aec2b9a91aad6412afe781ee927ddd82ecea6057d36ec18af917938500f518845206ec150dd6b604905a1f2f4
-EBUILD flit_core-2.1.0.ebuild 991 BLAKE2B 6802c78f7dc4442fc6ce5fcf7a063c298d45f9355ecf3b682723310535304dd45efcfa72eef7e08a790ac661281312363915ebd193ad7c4416bebc1634dc84ff SHA512 28f8a1dce1600ea80de621ba227d5f1ac434a4c96aded435ccec703537b9584465a9af6bec8ee3991c9ac74552efebd2b82f0b3ba3bf6d5b97a5fad5ba3ff3d1
-EBUILD flit_core-3.2.0.ebuild 673 BLAKE2B 3c799620fe55ed46b8b19bf00201e00eab3cba5b0397d69d046f5682a4c0981a13f2af1668c004af0eec880fda9d113762a9112eb1bc9385ce9611c4ef59d95e SHA512 648bfac710570cc6ae09156999db5ceb71dae0701ba38ec529fe62334b8e1f589a2d747c6c89d3ed6c01eee454a6bafc5b038ad63ba16421156fa8b9aedb6eab
-EBUILD flit_core-3.3.0.ebuild 670 BLAKE2B 40d18af5f94b3fa15c204f56e7c93f289f45ca80722c5a18f0623c7c5443441bfd6328b3b4f1f8d4d9c83eacc6f729380633c2e74716174181055c09691b2c2e SHA512 ecbf9b20ef1568027fb848df46a0e8e9ae997494900c3bded9286a57fae8ac851665b44e605c34a9f0a3768f344f5e5f5d9742a6ca63685c79f58c4cfd6cd62d
+DIST flit_core-3.4.0.tar.gz 27151 BLAKE2B cc31bec47974842d34f62532a9099204aa71c91146758742db111b3eadb395c74de4fc63da0c08b59902cad9130ef16894a680fbc44ecd12d764ad4ae3b388cd SHA512 e391c947b00e023e4ba16043468579c5a1a7f42316d60afeef2eb65d3d7c6980cac1f484f52fea926d8071959fe1cde80d35488f53eec7c3fc6bf54133aee717
+EBUILD flit_core-3.4.0.ebuild 695 BLAKE2B 30c055e65437d462015e99a74bae9f4d29167537361e23a2b962eb31ed8089f05b3657459975a386b4e002b33d609f8894c85be5cca98666fc40d6ebef77e4d6 SHA512 4385f4d2386aedffee95aae541a946450c5fe67cbe40435cc69608938e86d0c28f388422cac26295987445e80af3aa32561755f9db2919290082b82c5d7a7876
 MISC metadata.xml 495 BLAKE2B cdf16a7db7af0f0bda628d564547e06546ea68e2bddc36d7303d97c6ae9d7c27ea7a3e8a46350dd72b328b10072f901bda9f5a9bc295d69acbd2ca57c6c38a72 SHA512 803dfd60f870dc3e248b3f992d33577061ddc9f29f2bc1652e69e5715fd2b8d31d1528b9d9b055e98659ca29cacc27a94ae89796ff8b82227810c40522803b46
diff --git a/dev-python/flit_core/flit_core-2.1.0.ebuild b/dev-python/flit_core/flit_core-2.1.0.ebuild
deleted file mode 100644
index 4a9289a30439..000000000000
--- a/dev-python/flit_core/flit_core-2.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules (core module)"
-HOMEPAGE="https://pypi.org/project/flit-core/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/intreehooks[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	printf -- "from setuptools import setup, find_packages\nsetup(name='${PN//_/-}',version='${PV}',%s)" \
-		"packages=find_packages()" > setup.py || die
-
-	# use toml instead of depricated pytoml
-	sed -e 's:import pytoml as toml:import toml:' \
-		-i flit_core/inifile.py || die
-	sed -e 's:pytoml:toml:' \
-		-i flit_core/build_thyself.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/flit_core/flit_core-3.2.0.ebuild b/dev-python/flit_core/flit_core-3.2.0.ebuild
deleted file mode 100644
index 79bf4d0c2b80..000000000000
--- a/dev-python/flit_core/flit_core-3.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules (core module)"
-HOMEPAGE="https://pypi.org/project/flit-core/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/intreehooks[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	>=dev-python/pyproject2setuppy-11[${PYTHON_USEDEP}]
-	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/flit_core/flit_core-3.3.0.ebuild b/dev-python/flit_core/flit_core-3.3.0.ebuild
deleted file mode 100644
index 32cf63a81fa0..000000000000
--- a/dev-python/flit_core/flit_core-3.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules (core module)"
-HOMEPAGE="https://pypi.org/project/flit-core/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/intreehooks[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pyproject2setuppy-11[${PYTHON_USEDEP}]
-	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/flit_core/flit_core-3.4.0.ebuild b/dev-python/flit_core/flit_core-3.4.0.ebuild
new file mode 100644
index 000000000000..6dad593ab015
--- /dev/null
+++ b/dev-python/flit_core/flit_core-3.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Simplified packaging of Python modules (core module)"
+HOMEPAGE="https://pypi.org/project/flit-core/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/intreehooks[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pyproject2setuppy-11[${PYTHON_USEDEP}]
+	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/flufl-bounce/Manifest b/dev-python/flufl-bounce/Manifest
index f213d923c8bf..d78be53eb7e3 100644
--- a/dev-python/flufl-bounce/Manifest
+++ b/dev-python/flufl-bounce/Manifest
@@ -1,5 +1,3 @@
-DIST flufl-bounce-3.0.1.tar.gz 100217 BLAKE2B d5620d73513a7e5bbfffb212f13bba34ce199a129a217873a8237d8456a7a1854d78cb9b06e4ee763d4dcfdcfdc185e0d67eb3be82ad829c054baced8acfc25c SHA512 9a8d0dec98f8699fd3dff62f5dd831ab5754f11d246b750cfed8ae7ebb771c3c7c1abd4fcceb0f8aa052653802c6e6e5a7bd4711e63b9095ede238817a3cd146
 DIST flufl.bounce-4.0.tar.gz 108623 BLAKE2B 00c9d69d0aab3a4ca6f781dbd32bcc00d33de59371a163589f8be1747144f6cb9f51da57152235cfbc08ded63894402669c0ba4745eeb3c7b60c95cccf6206c7 SHA512 c6dd8cf2f4f0ea7c8698054042dfc9da3bd1a2d9cae082e01a0be9c39018fefba07154e2c9c15b1a00c896e58bb0a6d2063a3c067bec6b464d201bb7b3220e9e
-EBUILD flufl-bounce-3.0.1.ebuild 595 BLAKE2B db5abe0b6553025411292d6246eff47b540fa1b4b0efeb69152e15755d4601af520eed24ab632fac25667a8ab157b44c8a4545ce02e4d65dcc6849f3607abda7 SHA512 5d049adb82ab9f51b07dc9e13c4dcef9a3a12fae7238d9ff4f8c847802080240f5b543d12e54310c54d3ce38d23065f412465f8fa91117b3a416782fba0d7b98
 EBUILD flufl-bounce-4.0.ebuild 657 BLAKE2B d480c459749d316d6b543e1921c1d7ed661448b3b7c784226a37681619db94bd374126729d384afec145d9ed292d2b06265f47f1e3a20e8c56cebe8db4eb4e74 SHA512 4a45d10050eaea825b7ced9773eeec34be6189c5321f2f4f7af66d93609df5bad18f464137a6d69563e502139ee98bcd158faf28db0cdd9d2e7ffd6cd93fdfd5
 MISC metadata.xml 492 BLAKE2B 93522ca100c9b57c8c4f3b3244e0759898f659686fd8cb4f821103ac6806a8b188e7d41614cc05753e5e96f4ed7a9d0e09ad0e0ae9566be0cbc7a4612cfa85c4 SHA512 271532a1ce8c7f12b2014a6371894113ff3c48a765095af389eff5770250a3c34d556d244a6ca6b20e685ec49faec22b8bf2da0db74c36f1e2ef2f4774238a98
diff --git a/dev-python/flufl-bounce/flufl-bounce-3.0.1.ebuild b/dev-python/flufl-bounce/flufl-bounce-3.0.1.ebuild
deleted file mode 100644
index dd0a8e417b7d..000000000000
--- a/dev-python/flufl-bounce/flufl-bounce-3.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Email bounce detectors."
-HOMEPAGE="https://gitlab.com/warsaw/flufl.bounce"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/flufl-i18n/Manifest b/dev-python/flufl-i18n/Manifest
index 5a07852cc373..bf1ddb2ff913 100644
--- a/dev-python/flufl-i18n/Manifest
+++ b/dev-python/flufl-i18n/Manifest
@@ -1,9 +1,3 @@
-DIST flufl-i18n-2.0.2.tar.gz 19106 BLAKE2B 407f69708234e4c24403733c752ed79dfc0ff7d269a325c2d599ac00a0de077dfe63078fd050556f683008296885f397a59ea42b6d0692549856535166e63805 SHA512 05d9283bed456ee8d48704dc595f514e13b0c74096df177ed49bf178987baeee014ddc4331cc7d36edffbee1dcb58fcae152c2cb317b7ce73d9630864b98f1cd
-DIST flufl.i18n-3.1.4.tar.gz 24058 BLAKE2B 1652ea9d0ff7b853298b3647da0fa4c692b9f227f42873194dcff00b119316f425012c534bbd5df87125517bf12cdd7a6d5eaa807f1bacf7c6c82967e8880adb SHA512 02de410e1ca911e2c452b5dd48868c8c409817b867c58dbebdda6aff6dfe4d09b2f7ac4c293cbc1306eb5caa17c1f5a63e9d8c0ee59e8e41058ce0a4517257ea
-DIST flufl.i18n-3.1.5.tar.gz 24116 BLAKE2B 6fef2f6d1cca30ccd21d71fa4f6209fb01f14e576951ba7137326ca18184983adb4825b721f046dd85a39803630c3090d5a29cbda68cf4687aee620cf3afbc63 SHA512 16222e243bdc7527f040bff8e7492fafa15a7c49ef20218d4563a70b885fb497d3b4b7a8a008079b7ca6185fa640105062c0d5e26dfbd11922d7fcccd5c3b786
 DIST flufl.i18n-3.2.tar.gz 24209 BLAKE2B dc827eb4099670c6e5c39ebc8702fcda146b20a3978fa56108ab98a05d2c8911e705b71dacd6b9fc7fae9923d009487f6f047baa0dcd06a5de2e4f4d5fafc465 SHA512 07f329d026f24db623045f3c9857bcaacc1f0982066d4409fc060c4f712716044f96321a4e4909cbc85932f36fc76f71b9d118662ba837fd85b22754ce2d25c7
-EBUILD flufl-i18n-2.0.2.ebuild 569 BLAKE2B 64c1a3388694297adc6a8389cc8ae038b54f2da974b9a3a330169f1fef7583ecd93444bf3e341f7632e33d9114c188adc18c996b2fb4fe4ff6a9b4bdb41cdd69 SHA512 27bdc802c0f90a11c5b8ccd7e7fa89587d754135cbf7de7168bdcb406906a8c6e2a186a67e726d1ff6eae629acbfe26d29c10d05f60a17575e01467aa38dc7c8
-EBUILD flufl-i18n-3.1.4.ebuild 845 BLAKE2B c76d225e4098c499b2b1cd5bd636edd2f1c828cd59b8be80bf3b2ead23df9999cbac29a91929a4efab34339ffabc96c10c0be8de6e55c4bfe8381a6b967b66a9 SHA512 a3d4283c9318130284128d5fe896543f997bb201f30feda517d25bfbc24e15ac5a5539f4b7f7ac18d527355596ff65375b228b9c0aa00fa392686eba99285940
-EBUILD flufl-i18n-3.1.5.ebuild 845 BLAKE2B c76d225e4098c499b2b1cd5bd636edd2f1c828cd59b8be80bf3b2ead23df9999cbac29a91929a4efab34339ffabc96c10c0be8de6e55c4bfe8381a6b967b66a9 SHA512 a3d4283c9318130284128d5fe896543f997bb201f30feda517d25bfbc24e15ac5a5539f4b7f7ac18d527355596ff65375b228b9c0aa00fa392686eba99285940
 EBUILD flufl-i18n-3.2.ebuild 752 BLAKE2B b8399997db0a800c1b3faeb8e0524dcf8c49602e15ebc8ac43aab316f9fbb493bb4c78b9685e4f621bc1066a3d80954c20945fcab7e6a0aa35269be95d2a729c SHA512 e566ae7d3eb337d9230f1cca9612d47c1d71cd3f79caa03e6d04389973db0da9710d444e7bf698c1ba0d46fbfee2ea83431b0ed46f46caac2d1115cc5d5495ee
 MISC metadata.xml 488 BLAKE2B e1dfe22c80f0ca5a7de3f70dfd3bea7c4d90968f572d34433629032cf0a62a6a5906bd977fcb20b26ca8378960ad74fe207e3c294ee9e4e34c22746321531783 SHA512 047efe6af9b2fbff70f85700a2e35d02be1447c530f6f05aea98abb419103533e5b10f47135b52033921a08d534c454a482ce8541c00b40507b1dccc40417bb8
diff --git a/dev-python/flufl-i18n/flufl-i18n-2.0.2.ebuild b/dev-python/flufl-i18n/flufl-i18n-2.0.2.ebuild
deleted file mode 100644
index 28ccb94daf44..000000000000
--- a/dev-python/flufl-i18n/flufl-i18n-2.0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="A high level API for Python internationalization."
-HOMEPAGE="https://gitlab.com/warsaw/flufl.i18n"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/atpublic[${PYTHON_USEDEP}]"
diff --git a/dev-python/flufl-i18n/flufl-i18n-3.1.4.ebuild b/dev-python/flufl-i18n/flufl-i18n-3.1.4.ebuild
deleted file mode 100644
index bc9300e4f4e5..000000000000
--- a/dev-python/flufl-i18n/flufl-i18n-3.1.4.ebuild
+++ /dev/null
@@ -1,37 +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 distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="A high level API for Python internationalization"
-HOMEPAGE="https://gitlab.com/warsaw/flufl.i18n"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-BDEPEND="
-	test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov=flufl::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/flufl-i18n/flufl-i18n-3.1.5.ebuild b/dev-python/flufl-i18n/flufl-i18n-3.1.5.ebuild
deleted file mode 100644
index bc9300e4f4e5..000000000000
--- a/dev-python/flufl-i18n/flufl-i18n-3.1.5.ebuild
+++ /dev/null
@@ -1,37 +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 distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="A high level API for Python internationalization"
-HOMEPAGE="https://gitlab.com/warsaw/flufl.i18n"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-BDEPEND="
-	test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov=flufl::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/flufl-lock/Manifest b/dev-python/flufl-lock/Manifest
index 8dcf955f631c..bed316cfee14 100644
--- a/dev-python/flufl-lock/Manifest
+++ b/dev-python/flufl-lock/Manifest
@@ -1,5 +1,3 @@
-DIST flufl.lock-5.1.tar.gz 29652 BLAKE2B c5b5bbfb284945d2232e8183084e4f9b24518962e2b8bf229bfd10d2e0629f0d248daf8cae544cbf50ec24c57ff2744c3cae4a4de756bdbd11fe51e810ac2eb6 SHA512 fbfc28e4e34e47b92a5b4e6d1771bf2b53ee052947d2f05d3392c3db156c5d14632ad63e0ac5b2934b8dc00176f6ff5b5fe1ff87358056ab9d71c2bb7f2c0498
 DIST flufl.lock-6.0.tar.gz 30762 BLAKE2B 98e259f04aac565271e7918223c1bc8abd528f91fd04490a519b482c0d12bbf954f0c678f89d990bc036df5000fb5587e1689d6fc0cd499ed7fe806a1e3125f5 SHA512 cbd41f1dedb91fc120c3f3e20c15f25a39b0ce5b27a2c4fcedad301e91156d5291b35ff961c38a5a7d43c40fdfa2a879a2ba427f1b17994678fbba797e7a234b
-EBUILD flufl-lock-5.1.ebuild 887 BLAKE2B 1a9d383d6234f7d16dde89e9232288c5a1d9b2989f33d23a1f77bfbc3362ac6ee565cf8c6a272b3aadc2a88fa3d46fca0b1affe6fcf09c1d7ec1aacda9012647 SHA512 cc93d16c153b5b45041dc786f5e407e478662e60e59068b25bc4713dd51e154a47cb58ce7175adf5dd8a2ad591f78147e764d5d779aed27f02988a2518efd626
 EBUILD flufl-lock-6.0.ebuild 839 BLAKE2B ca8214c65942f8a86f48d95d6f80616183a538b3549702b9a09374c4a64ca23457f68d831ff3d792bc47dbc6a4c43b3c36a916fe213f36ee7b41b8ddbe64f268 SHA512 9a9e625c086c5ee9bec28a1a68a4a4fe86b74069ef4146feb910988f739d9e1950ff984a5fe77e6c962b3dd60acac2281c40dac53bc71e2cba45fe8fbcaef443
 MISC metadata.xml 407 BLAKE2B 351ee456a6b36c54e42f4be026d3fad2aa49e4f2be746b43934e4402f594a2fd4eed5a29eb4a1bd22192a141e220523dad77218ac1b1e8a2db10190df97b83a0 SHA512 aa8fa297cc7b996c495542c23628ece8139117ec1da6b2cd0cf7c72bb90258618f8e2368aa1e5e48689540b11a7df7e16fab4da502f5058c1b6cf6e058c309a8
diff --git a/dev-python/flufl-lock/flufl-lock-5.1.ebuild b/dev-python/flufl-lock/flufl-lock-5.1.ebuild
deleted file mode 100644
index 57e4a8b7e444..000000000000
--- a/dev-python/flufl-lock/flufl-lock-5.1.ebuild
+++ /dev/null
@@ -1,38 +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 distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="NFS-safe file locking with timeouts for POSIX systems"
-HOMEPAGE="https://gitlab.com/warsaw/flufl.lock"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-BDEPEND="
-	test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov=flufl::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/fqdn/Manifest b/dev-python/fqdn/Manifest
index 19b305048dfb..8e2fd8a3fc15 100644
--- a/dev-python/fqdn/Manifest
+++ b/dev-python/fqdn/Manifest
@@ -1,3 +1,3 @@
 DIST fqdn-1.5.1.tar.gz 18334 BLAKE2B 24dfd88a8176e67209350fe20e446cfee848c392795cde09725526a52af0a9adc6908a4eb6d5dd3ad6f8a11546acb6b82a7b2ad591997010dfdd0a1d235f57ae SHA512 d9d7d1bb8798c63973534bf45fb9bc0ab57b1600c6597212129debb97a908140401f5477f33b83ea273e3f9a2a852072110245a09596ab9a58a10be8043c57fc
-EBUILD fqdn-1.5.1.ebuild 600 BLAKE2B bf9f60c30f511005cd41d1499eb581e1ffe75a7d177832c195821edbd078b12f4e9f1d1d96dbec871f4eb3acdcc469c7bdba34b8dc43a646372478ee299c4cfd SHA512 18ec13458596281361a9fa05a5c71bf6cbb32c4dede96a37addbadfcc910d2e798cb4f26fd1e1e98b26ecd6d3cfa5c7d9c53f61ea5d106d7ee34458a5e1f76d5
+EBUILD fqdn-1.5.1.ebuild 618 BLAKE2B 65e6a0439fe6040c2444887637497a4f7fdc66689550dc835226df41f72cdf254c6b7a45f339664da0b8478f7056950fcbf7b3ef2a37ff0e62aac7a1cdfd7777 SHA512 a208b51c243303531f3346992d1dd056507b4195d672a3e74ba4b4f352f5f16be08ee26b7316cd2c84277e1d275a3413eed0a9ef707ee38900fbd5828c5954c1
 MISC metadata.xml 652 BLAKE2B 59a8160abd347e18ea95c04143def0b8c0aed88e48fec0383ff973048a3913f43d51b854348ab279a3ce321fcbc0844bff9506e213b8e3936085a49d5ba7943c SHA512 de3fa18cb8d162fdbbbdcab61f9395c2da6c83c004925621b0ead1067ba8ccca25cd72997b00505221c0e5a1c3fc20e0a1c04fc488321bf25b3cd77c91f822e8
diff --git a/dev-python/fqdn/fqdn-1.5.1.ebuild b/dev-python/fqdn/fqdn-1.5.1.ebuild
index 75dd81bf59fd..ea26352f63d7 100644
--- a/dev-python/fqdn/fqdn-1.5.1.ebuild
+++ b/dev-python/fqdn/fqdn-1.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ypcrts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/fritzconnection/Manifest b/dev-python/fritzconnection/Manifest
index 9a6230107ab9..d10bf583e116 100644
--- a/dev-python/fritzconnection/Manifest
+++ b/dev-python/fritzconnection/Manifest
@@ -1,7 +1,3 @@
-DIST fritzconnection-1.5.0.tar.gz 71597 BLAKE2B 2c0d27cf91550a7b7f0d3c56f115dd174995af4293d6dd91ee6bbfaab2f3db7c8e4a2297d83a5d6a5219550ee9397c0b1122260234b6fab4589e15c34a381f21 SHA512 2fcf84c73af146d0422a9e32364562e4cc9d6992f487f40f27eede4a571c4dfa37c92a6bcd5ea49da144585657e382e648e0fd00a15f78646da5abb5060eea3c
-DIST fritzconnection-1.6.0.tar.gz 73672 BLAKE2B 25f6b876026bc70397dca171c90d863b4dd3af81f4f3f26bd9a34bed9241c716e98e1305adcbd87a1aa52a21fd6517eda21db0cd9d02d8df5db143ec0f60f5f4 SHA512 c4517774be0913f71e37e982dd87a7076efd81903036193ff37dc2ffd5530829f5f860b773c2b107ca6734ff1b04009243ccb8b2857261911b5a7bcf6e6a528f
-DIST fritzconnection-1.7.0.tar.gz 77787 BLAKE2B b3f9657153d9529485cf18c6f3c18af74e596f9831b5a57724bef34eb54844b52dd4c417f1e93974e24fa376ae42708708e160ec4ddd0f0fcd9131b6346428b5 SHA512 9df2afe21e5e2f410bb3fde2329c1b354c429b0d23095fe55e53566c7a6dc79f8cbb092666943efceb2949cc2fc904bc473266ab5ab3518da13228193a476f5a
-EBUILD fritzconnection-1.5.0.ebuild 763 BLAKE2B 37f9d065adead3e17392aed91e3ce95149a1cdcbf796f27d26a17acd9a4cc6a447738faeb2d87e113ec60fced37716dadf381f3eb0b4bdb5c28c0ae2ee957891 SHA512 44ad672a74f14714ddce9b6294a1d8a53a84a891a343bbeb850235a3f6ac6b6876cc3ac5a083797ae0cf30584a65bd5f6a40522f33d50421fff41fc2a1157288
-EBUILD fritzconnection-1.6.0.ebuild 709 BLAKE2B cef17e67cea0fa5d19d974311fdaac993e1c30993c47c718fca642350c8cddbfa83effd7696ad789243f58b48eb4724fa5b6f16b6bd0c9faced9b48fd35999ad SHA512 2c30c321a06ad5e52b18cb071736a144051bc074884d12f08e4f704ebacff7fef36a152cbf7070072eb7b04f10ffce8b91af56bba50fb9db96e464520eecedd5
-EBUILD fritzconnection-1.7.0.ebuild 709 BLAKE2B cef17e67cea0fa5d19d974311fdaac993e1c30993c47c718fca642350c8cddbfa83effd7696ad789243f58b48eb4724fa5b6f16b6bd0c9faced9b48fd35999ad SHA512 2c30c321a06ad5e52b18cb071736a144051bc074884d12f08e4f704ebacff7fef36a152cbf7070072eb7b04f10ffce8b91af56bba50fb9db96e464520eecedd5
+DIST fritzconnection-1.7.1.tar.gz 77805 BLAKE2B 4012975205320cc1c65ace64f515e1a934da5e330e9f9090021f20989d300df38f042cc8defd794ab6d4f2935cc2973141b50b1aea74a472d42f2dd5c1b2da57 SHA512 f3ca91b41a6255a743a00d34733e4755f1f675c150414c794bce9c52da292cc267a60520d5bc4e6b0e5ba4dc1ce27b7083fa4e2c226bafa3ca39ee6d63c80ae2
+EBUILD fritzconnection-1.7.1.ebuild 709 BLAKE2B cef17e67cea0fa5d19d974311fdaac993e1c30993c47c718fca642350c8cddbfa83effd7696ad789243f58b48eb4724fa5b6f16b6bd0c9faced9b48fd35999ad SHA512 2c30c321a06ad5e52b18cb071736a144051bc074884d12f08e4f704ebacff7fef36a152cbf7070072eb7b04f10ffce8b91af56bba50fb9db96e464520eecedd5
 MISC metadata.xml 456 BLAKE2B 4dfba055d7915535f8244669fc083d906366209ea857f71e34c6579f8b0c14e31db6cabac34897a8baed2189199c303dc29a1fb06a9a11c0f993513877192e33 SHA512 70692ccf90eb73e8bc884b2b75e580c9b20a91a988387696f76258c183df2623c55aeb02a34389769c34a3fd997f11d5bb7feb93ea1b497f58c6ec60cc60e71f
diff --git a/dev-python/fritzconnection/fritzconnection-1.5.0.ebuild b/dev-python/fritzconnection/fritzconnection-1.5.0.ebuild
deleted file mode 100644
index 558c9ac45bc5..000000000000
--- a/dev-python/fritzconnection/fritzconnection-1.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP"
-HOMEPAGE="https://github.com/kbr/fritzconnection"
-LICENSE="MIT"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/kbr/fritzconnection"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kbr/fritzconnection/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-CDEPEND=">=dev-python/requests-2.22[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="test? ( ${CDEPEND} )"
-
-RDEPEND="${CDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/fritzconnection/fritzconnection-1.7.0.ebuild b/dev-python/fritzconnection/fritzconnection-1.7.0.ebuild
deleted file mode 100644
index 00eeb7787fd3..000000000000
--- a/dev-python/fritzconnection/fritzconnection-1.7.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP"
-HOMEPAGE="https://github.com/kbr/fritzconnection"
-LICENSE="MIT"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/kbr/fritzconnection"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kbr/fritzconnection/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND=">=dev-python/requests-2.22[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/fritzconnection/fritzconnection-1.6.0.ebuild b/dev-python/fritzconnection/fritzconnection-1.7.1.ebuild
index 00eeb7787fd3..00eeb7787fd3 100644
--- a/dev-python/fritzconnection/fritzconnection-1.6.0.ebuild
+++ b/dev-python/fritzconnection/fritzconnection-1.7.1.ebuild
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 09e710dd45f3..fb066cf49f26 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,9 +1,9 @@
-DIST filesystem_spec-2021.07.0.tar.gz 301517 BLAKE2B 84b189e636eaeb4d3724e1afc44795e83b3ac576ab8640b4fee916bb7cf341c5cd6b1b475616225927693d13f204a1750f913f2e6d35b541fb8ff26ee1019400 SHA512 bea483734e6c9773d93ee93b526c8074a28f0671fbee17b39858dc7a75fd71553ca6d8d5c4e2204446bca3e7c23f6d4c8e94b62ff920e546a2b71786d0dcb388
 DIST filesystem_spec-2021.08.1.tar.gz 303969 BLAKE2B bc67e980cb7d5def227feec16d984630703e817fb696fafd53db7c56634e8e101ac8a68ad6d3ea3b0cbed475f431b5847e3e0612cd1f5abc2bd753ef4f6004e0 SHA512 7757480ff8f113715bdf4be400af9b9c5a3f8b52abc8cc8ccc608f2fea0f3c77f074db1aa5e7ce5d0462ae86a702af8058f8a8935b99617e6803bc7344801b8e
 DIST filesystem_spec-2021.09.0.tar.gz 311338 BLAKE2B e448c0e8a0f24f2374bf6b701bb72b10c91b0058b81947fb538ad96412170e6b71ae5e49fb0f679f0a7031f1206f706bbf4f90ecc118d89da621c5cb4f8f4875 SHA512 65ee4f7f7d1dd235dcb6dc6933bb2eb62c91cb50d08703becb0b84640c40efed09cf326478c84316f4edb3cd08650ff1d93e222083463c868e8ca2b8a9fb5f91
 DIST filesystem_spec-2021.10.0.tar.gz 313863 BLAKE2B eaffcbf4b7ef1821406664062961f36e8490ffc36e6b64dbd3be820785c41742f741a8f0e76db5ee0a75e2dfc609000a572ebf5c02dc9118b2a45413a498de32 SHA512 2b478a88c0aa84fb55f8946923f79900350e36395bc6110181966404e6fb6d5fbdb3b6ea19e2e7077c8167f65266a68ac962af25dfb1cfe573f5e74c34329fe8
-EBUILD fsspec-2021.07.0.ebuild 1194 BLAKE2B 86eb9b6315ee7880e7a6eae31016ce27368015355f58b73f90a7a8a6edc48159b8922724194b90f0974d054cdd4bd49501acf190599f8b58db2889ab0524c9c6 SHA512 8c670917ecbebf5bdfd90ec50b35145eb74bf1599867991382036b981d171de1e9b380d276d260aec636fa1d73a501bc72ac60909d3032f52ad2d3697b320e74
-EBUILD fsspec-2021.08.1.ebuild 1161 BLAKE2B c55f5125daa45f12d9c5e33367d7c95822247ab32bb7f2238accdddeaccd94f31f4ded47df151a6eac64a4aa856fcc35e609353dffe974783a1274382d3c03ba SHA512 6424636313181eca15182bc994c67bc82dd4054fda31adb745268edfdf5c0d071d494f257ac3fd4c2a86ce140b3070f25cbfd19f8212874bcd8f405269c39a60
+DIST filesystem_spec-2021.10.1.tar.gz 315068 BLAKE2B c9be13ba8a2821274335fb924e91904640f4505a7e639211c7b6701f63f7dcddae018c15933b291d4f4d9f2ea451136e09ede637d615985889b565a12ac93665 SHA512 2f89a24b5491e15d3b3d9a2e6307c6d4a0db61848ad5e9324f4e234d4204e3a1f78b00a50b26f6fe90d657df6700aa23cb76f5df996b29dd880b7c8677d21382
+EBUILD fsspec-2021.08.1.ebuild 1159 BLAKE2B 4f79c21e2b4327949f1f9760e0bf8cedf624c1c1153f9543e707cf081240928b3bb4b01ae0dba21a64144c3de80318c237f87dc8a4f89188ca4f2c7e434d287e SHA512 ac34673932df6d58a3b2d787e681f9abd2c034cdb053e36906d376d3e05579b3299d9997efcfca947975002b6433c8014494e2f1e4b4fc6a2fdb9de96bb9307f
 EBUILD fsspec-2021.09.0.ebuild 1160 BLAKE2B f09091ed20d567af58f21556a4b99e4515cf724b39bb0a395ed918e80a814ed1050c952123694cb9d7e518ffa776b6c03b7e78216149fc91490eba1ca2f12ed3 SHA512 a0e0399c1e24fd092b188db70a3f35820780119f636b60f35b16f12c254884901fd502aa6bc7f05e429a34d5bc1356ef9a7148eb94421a8da119928e0347c8e2
 EBUILD fsspec-2021.10.0.ebuild 1160 BLAKE2B f09091ed20d567af58f21556a4b99e4515cf724b39bb0a395ed918e80a814ed1050c952123694cb9d7e518ffa776b6c03b7e78216149fc91490eba1ca2f12ed3 SHA512 a0e0399c1e24fd092b188db70a3f35820780119f636b60f35b16f12c254884901fd502aa6bc7f05e429a34d5bc1356ef9a7148eb94421a8da119928e0347c8e2
+EBUILD fsspec-2021.10.1.ebuild 1160 BLAKE2B f09091ed20d567af58f21556a4b99e4515cf724b39bb0a395ed918e80a814ed1050c952123694cb9d7e518ffa776b6c03b7e78216149fc91490eba1ca2f12ed3 SHA512 a0e0399c1e24fd092b188db70a3f35820780119f636b60f35b16f12c254884901fd502aa6bc7f05e429a34d5bc1356ef9a7148eb94421a8da119928e0347c8e2
 MISC metadata.xml 374 BLAKE2B e3c4cc3d3081e0ca2b3d6745d1920f128bae3d07a4bf47d29eaa2143024a9272e4837ee95e2f2829baa000250afde46279e71b031ef7c283fb47753e7e0a9c91 SHA512 c1ef25f5dbc85cad1bc5dec8efd5e0d8b56587d123464fe37f834a30eff03fbf5d605050322f88bfe3e4a2f1179577f63c2bd8b0257202d20f4a40cffe317537
diff --git a/dev-python/fsspec/fsspec-2021.07.0.ebuild b/dev-python/fsspec/fsspec-2021.07.0.ebuild
deleted file mode 100644
index 366a8615eda1..000000000000
--- a/dev-python/fsspec/fsspec-2021.07.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-MY_P=filesystem_spec-${PV}
-
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="https://github.com/intake/filesystem_spec/
-	https://pypi.org/project/fsspec/"
-SRC_URI="
-	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	# sftp and smb require server started via docker
-	epytest \
-		--deselect fsspec/tests/test_spec.py::test_find \
-		--ignore fsspec/implementations/tests/test_dbfs.py \
-		--ignore fsspec/implementations/tests/test_sftp.py \
-		--ignore fsspec/implementations/tests/test_smb.py
-}
diff --git a/dev-python/fsspec/fsspec-2021.08.1.ebuild b/dev-python/fsspec/fsspec-2021.08.1.ebuild
index 925dbfa0cf2c..ff439a478c9b 100644
--- a/dev-python/fsspec/fsspec-2021.08.1.ebuild
+++ b/dev-python/fsspec/fsspec-2021.08.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	dev-python/versioneer[${PYTHON_USEDEP}]
diff --git a/dev-python/fsspec/fsspec-2021.10.1.ebuild b/dev-python/fsspec/fsspec-2021.10.1.ebuild
new file mode 100644
index 000000000000..2f83ce072601
--- /dev/null
+++ b/dev-python/fsspec/fsspec-2021.10.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=filesystem_spec-${PV}
+DESCRIPTION="A specification that python filesystems should adhere to"
+HOMEPAGE="https://github.com/intake/filesystem_spec/
+	https://pypi.org/project/fsspec/"
+SRC_URI="
+	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	distutils-r1_src_test
+}
+
+EPYTEST_DESELECT=(
+	fsspec/tests/test_spec.py::test_find
+)
+
+EPYTEST_IGNORE=(
+	# sftp and smb require server started via docker
+	fsspec/implementations/tests/test_dbfs.py
+	fsspec/implementations/tests/test_sftp.py
+	fsspec/implementations/tests/test_smb.py
+)
diff --git a/dev-python/fudge/Manifest b/dev-python/fudge/Manifest
deleted file mode 100644
index d9cdff4e4799..000000000000
--- a/dev-python/fudge/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fudge-1.1.1.tar.gz 87604 BLAKE2B 2660022089ab50139fd4a63aa212c0f53d04557571fa444cc2fd74dd556475c04d3563359c49f0252d811b93a3d4215dddca32c7db91b81682adae2a7fb7f772 SHA512 4a5043048aef1bc4c7806b7a13e138810295f882739f728115a60f2b0157716d85a7bed8a3641b76213b788c74fe586f57854f96bf7a745d6006ad6e67dca136
-EBUILD fudge-1.1.1.ebuild 577 BLAKE2B 159daea2ca81ae4987229b75b99c8a5259f1a678439f4407d4a0add78827d85428f7d53e90d19189c122fd104d8ddddee5ba41855793f27de9ba33a24f73049e SHA512 9ea75970e6b81e89e8683aedeb802d7db2cd2e7f21506b0b0242c2e96dbf253982c7e3d511625b5eec2b88ccd60b5206820ebebe2fe04417f40efe007997baa2
-MISC metadata.xml 309 BLAKE2B 89baa1c605a88983bc91208157a64618df5a0f8e71da3ad7a6e0907fa7abb01460deeeab55238d0f6b43330db71961129d4da2875d800ad58a8d7248780ac7ca SHA512 9a07c6eb92f2a57e34a0eecba57cf9bdcb937c9a3016a3b03ff185d1dc2a13e275b12558f5395f8454d4c3115b6f40da6ca735f390440e5a795de4920c0b76ae
diff --git a/dev-python/fudge/fudge-1.1.1.ebuild b/dev-python/fudge/fudge-1.1.1.ebuild
deleted file mode 100644
index f35325a13384..000000000000
--- a/dev-python/fudge/fudge-1.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Replace real objects with fakes (mocks, stubs, etc) while testing"
-HOMEPAGE="http://farmdev.com/projects/fudge/ https://pypi.org/project/fudge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-distutils_enable_sphinx docs
-distutils_enable_tests nose
-
-python_test() {
-	nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/fudge/metadata.xml b/dev-python/fudge/metadata.xml
deleted file mode 100644
index 0559f7db54ee..000000000000
--- a/dev-python/fudge/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">fudge</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index b587d126a1a0..25d4e48eb564 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,5 +1,3 @@
-DIST funcparserlib-0.3.6.tar.gz 30401 BLAKE2B cfce97cf08914f67ba3bd743bd3d6e7e7a03599ddc00d58a884aa84118d197d92bcc67a93ff1f7a2ab2074d66704078f5392c1d846004a5cd6eed2a423ba6b61 SHA512 efa52f788aa902b099660cb8bc60a025085a8c383e52bd0824a0c3ae28a6c13804a0659de0c80b4dcd839ee70491805d4eecda6cea221e35c3750ec569098c24
 DIST funcparserlib-0.3.6_p20210809.gh.tar.gz 68069 BLAKE2B 937079952a42f2171af8f6421097eb920d01eae02f870c27a790ae374a1c8c3ac27019eae78d655b80458bf319fd2db7d411404902357ac66eea5daa4472ecf9 SHA512 7d2b6d27e1981d97097c2aafc0730e5b6c6bf98707e997f87f7a9944667ea361db41305099803a43ec04b46ab53e4ab09d0863413d00a39a6fb27c30cceac361
-EBUILD funcparserlib-0.3.6-r1.ebuild 656 BLAKE2B 131b4162943523660582c87739d5de76b30159914063946bc75bb4397c293f4290d0844bc51da4cfbafcaec45993b7f23497e1a8b498baa35a724d45655d1d96 SHA512 6567a69de71db5c4c1aa7ba0f5e616ce2cb8b8ab5d96dd73bb39aa8a3393f98dd7182527fb7e4f0ba7733f38cdf311605aeac93328abfd09e7ff25051ed272d6
-EBUILD funcparserlib-0.3.6_p20210809.ebuild 800 BLAKE2B 1e932fdabb0c33c66694db364617e139a2f77f857caff10895770db8eaa784d092d0944e49396e477e609500c7ed86b5b3856bd469ddc6d3863fd22cf9a27be7 SHA512 7d489f141d42c827e2c1548c474ad5d98cc2a1dfe58ac2296bf679b5d6b7d5bf6f3f2d2238ae9c721cd6e7244ad2a42dc4c60790ea99ff0ef70c75ab1be1fa32
+EBUILD funcparserlib-0.3.6_p20210809.ebuild 793 BLAKE2B 5b46e037ce0e760ecbec5622800ac2dfc3a6e601bf3656a08cf8e39a7cdc59bc8c47354f97b2567cf229c371c9b0e7a852555e8c0510ac3379e88aad1a3ce7d8 SHA512 5e004bf98d1617ea535fc2535d49ee058853ed5128fdcd5ca78de7011745799eea78179eecd2741c3e17f89669e71c34430957841c95b0f7d0b08e19f79992a2
 MISC metadata.xml 406 BLAKE2B 0d7fe946eef963283c35b6cf68e714b4c0e09e0c6c132d568b71ed8f646357dc22af1de032258fef3a013f988a2876a392fbd080b271925de52aa7de0736ec40 SHA512 372cfba71b6342d5eab47086dead58bbe506a8da0d3f32b4538d7e5ad03a6c1916410c5f2f3296a9a07d1b5a7a87a1c93fc109a657a1e94b4a5dc2924fb744d3
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
deleted file mode 100644
index 9b43c23a3057..000000000000
--- a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Recursive descent parsing library based on functional combinators"
-HOMEPAGE="https://pypi.org/project/funcparserlib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( doc/*.md )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6_p20210809.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6_p20210809.ebuild
index 99c1c6f31141..da2ed65d5555 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6_p20210809.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6_p20210809.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="test? ( dev-python/six[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/furo/Manifest b/dev-python/furo/Manifest
new file mode 100644
index 000000000000..1155fe1007a9
--- /dev/null
+++ b/dev-python/furo/Manifest
@@ -0,0 +1,3 @@
+DIST furo-2021.10.9.tar.gz 69755 BLAKE2B d9dec7f2161491c1b9806fe8e1e98bf6d8f405ae17931e86da6edf44121a0bfbfef4db26f35b53cc929e143926bdbfb4f223aa52fdd65912cd49bd423e574a43 SHA512 4100cb08f6f97ffde2527ec5678e94da759323521bf26ba49dfe4c0851aabc59556872b494a7dec26fbf6e4ac2f2dbc4c7d92f7ef47cae7f9d256af38da91f7e
+EBUILD furo-2021.10.9.ebuild 643 BLAKE2B 93f738bb53e0c9d9d396ac5641540b0add29892f9b7dce200fa36e321f3db44ab2bd9eb220f26c9664a691d25d61d938387b00f1ba208db88e1e04e9388420b4 SHA512 a1b81720c4697e3dc862f9cae936a693f55fe4fa74c8f3e7b98579689a8442b4544b48b19e9a8ef3a7880b47838610a3a5139930943e9536918c8438aaa5adca
+MISC metadata.xml 412 BLAKE2B 8152eadd336ba3c73fb48a1ff4bbc236e9857dde77e354811a131794f0b750c0871239fbc2fd773979ec306ca3ddf62166f784559d486e6cd6f5d6b5c3902818 SHA512 fc3918b91916a176ce85d9740caacc70aae03b74339a62c0d77ae1e1f1b92a3db055cf1a1bc655a822ed800178971c39f29c2e45178c5e0ad6ae96f05e42a0cf
diff --git a/dev-python/furo/furo-2021.10.9.ebuild b/dev-python/furo/furo-2021.10.9.ebuild
new file mode 100644
index 000000000000..2bbb7f507943
--- /dev/null
+++ b/dev-python/furo/furo-2021.10.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="Clean customisable Sphinx documentation theme"
+HOMEPAGE="https://pypi.org/project/furo/ https://github.com/pradyunsg/furo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"
+
+src_prepare() {
+	mv src/furo furo || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/furo/metadata.xml b/dev-python/furo/metadata.xml
new file mode 100644
index 000000000000..194404af6f03
--- /dev/null
+++ b/dev-python/furo/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arthurzam@gentoo.org</email>
+		<name>Arthur Zamarin</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">furo</remote-id>
+		<remote-id type="github">pradyunsg/furo</remote-id>
+		<doc>https://pradyunsg.me/furo/</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/fuse-python/Manifest b/dev-python/fuse-python/Manifest
index 0f9af3650a8d..ab0bf28c25a2 100644
--- a/dev-python/fuse-python/Manifest
+++ b/dev-python/fuse-python/Manifest
@@ -1,5 +1,3 @@
-DIST fuse-python-1.0.0.tar.gz 46275 BLAKE2B 109202ed60df82a1a637a02627657c27ef48e55225c099385ec4d74554912d89dfd6238922a7588ff8de27e4c700a3b3832e204455997375dc67f6ca36590ae7 SHA512 d5e91be3e43065988053390d97ca6483ce38924bf9a49f694bf911080b7e75c836224e83d09dcbc6fab8d63781b4cd3ae016d66b65b88dd53106b06f91a6ad5c
 DIST python-fuse-1.0.4.tar.gz 46571 BLAKE2B b839043343e5abda2725545c696afd4da847e33a77647d910bc7ea71d17480536770d99899ae8f949734304ea6b4b591934f34476ea84aad1adbe39ee5897fa7 SHA512 48fffc02aa7125df03cf2a5819449a5e10a772ecc737bc8a19199beca6a2f8181b98c91cf05fedd06fc258d846c8d67d073dc1e8620c336a3ae09320688dc389
-EBUILD fuse-python-1.0.0.ebuild 502 BLAKE2B 2b76caf06d1f71174dbad1ad55d9a27983d6534ee8cc2940569cce070725aba29d187c4c04d7a94b43d43b2663ae476da04d5e222269e12caa58e313872b3390 SHA512 ac1ce9e9fe9103282e1c6404f6a5a22253c716b3a43bcdf76f4015c5caf92da1432c055b7c8abcb15fd5cf89b15c316b8fa22acc665a6ca5ddcd1036ce65f8a7
 EBUILD fuse-python-1.0.4.ebuild 522 BLAKE2B bf694fb9924263cb11d8cd1f6d73b7ff31df83c806d341ee5d83b9aeb4b378af966ba57d3bd6545f65d3b26ea76fdb8a46b10b11e21e494d3ddb24214f8a8060 SHA512 6169fbe023fca8189d5df70330e91cef69f8009f8c75e23b32ccd81d6e2905bb668750b0783bd9cd89bf9ba638994c879665f6f8a1e7cd2fad67b76ea967f3c7
 MISC metadata.xml 364 BLAKE2B df4e5fba243a953fbe10107e8a35989d9ff0d1ef320cf256addf871f6656f04a4be967998db220e88c21e683958c86b8db86b8e535bc1c7123db8d11f3406ba9 SHA512 d553757cb1c8fcd852f2c2533086cb5fe89be481568ced00207e819056a66c10b738e072fef477bb4cbff78d8797fb2d89ffb6fe3beda73ab185c7c21f68af4e
diff --git a/dev-python/fuse-python/fuse-python-1.0.0.ebuild b/dev-python/fuse-python/fuse-python-1.0.0.ebuild
deleted file mode 100644
index a17648067701..000000000000
--- a/dev-python/fuse-python/fuse-python-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python FUSE bindings"
-HOMEPAGE="https://github.com/libfuse/python-fuse"
-SRC_URI="https://github.com/libfuse/python-fuse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-fs/fuse:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/python-fuse-${PV}"
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index b6f195ca57b6..caf17801a673 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,3 +1,3 @@
 DIST gast-0.5.2.tar.gz 14222 BLAKE2B b251f9aa54d8bdba318f0c8aa7fe97221615a22b7dec8da99b15078ce0f482ac8ec931b9c0acba3a405f2ab3c820a1c578ab93583f9f84740571dd85a3fcb45d SHA512 2a06245ba93f2c0715f662e32e0865732828deb672bc70c3d70a4969c8a2e4c518354a4a63760eddeba53932d4f8bf0ae0ffab64f1a1ad3b20d5b2d18285cd6a
-EBUILD gast-0.5.2.ebuild 508 BLAKE2B 10f9f2d7e961eb4fef0554a63cf6f15ec626c24f1742fc669ac2567b847de6153413c1c727976d10ebb584190cb5aa2ea127a2654d467555dd4eb89b4a55842d SHA512 e56fbc5fc12e2048ca19228685d32117c6da904c8e06ac678dfad02f883567421eb38455a30c852ddd8d726de59c1be8a54867dc1f4196514b1b34dd2b7761d0
+EBUILD gast-0.5.2.ebuild 515 BLAKE2B 9b0a1758e7bd59913965b1166be8282a785dfab25cc5431c3821c0b9b43ae88054edd41216eed524a1d9545faaa3e6e092d1613c7459d2e9b92f4095bdfca5c4 SHA512 40a1ccf6074fd4dc78bbe8c0a0e95f72c355174d7f507bc04127406a6258b8e408416014b8845610b1ff7d18d44c408421b6620ad93961b1363536f9e35b55ce
 MISC metadata.xml 677 BLAKE2B 2c536c1a53fd3be71dae57488b28f71af9e27dadf2987ecf3967bd74e30ee688fcd598f995d7e0b1b74694668b92699036a8049c54698e389d71687a06df6587 SHA512 9330e92aebd0ca5ead979f70d86540c5b416b60580d45c6b7f8f02e4753bfab476d9b1a22dd7ba32f1167be5512983d275cfe07f57757c484aeb8619e836e13c
diff --git a/dev-python/gast/gast-0.5.2.ebuild b/dev-python/gast/gast-0.5.2.ebuild
index 9677483225b9..c82c69310df1 100644
--- a/dev-python/gast/gast-0.5.2.ebuild
+++ b/dev-python/gast/gast-0.5.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~sparc x86"
 
 BDEPEND="
 	test? ( dev-python/astunparse[${PYTHON_USEDEP}] )"
diff --git a/dev-python/gcs-oauth2-boto-plugin/Manifest b/dev-python/gcs-oauth2-boto-plugin/Manifest
index 46797f7ecaca..ddfd8cc63642 100644
--- a/dev-python/gcs-oauth2-boto-plugin/Manifest
+++ b/dev-python/gcs-oauth2-boto-plugin/Manifest
@@ -1,6 +1,3 @@
-AUX gcs-oauth2-boto-plugin-1.13-use-friendy-version-checks.patch 347 BLAKE2B 5f0062699487ce5f73a2cbba96a6e8ca30f00a3bdd73b7fd5949eac518e01fbc8912a462951b7307a4da02d6016c869e829040ba530974db579d2d16a8c73197 SHA512 b7354d7b195382213018ac4c6924a042da106affb2b9058f664ab5c57b521f0b7164a5249609ecaccfa343114fb8c47d687a861a17b31700c75ee7ca42432bfe
-DIST gcs-oauth2-boto-plugin-2.5.tar.gz 16739 BLAKE2B a8ef124670063eb19119f7ab6cfd3101f68815a61ec183b3c9ac79ac158e3e47f48349b4f3faa0cf83ce9a203ab2f350e61fdd8a87872962bc1b24a8182f741f SHA512 db6810351c8364c9b217e092aa83803cdc7831136b3fa1be4c54f978f919e2e33bdaf32b8d36db359c5a328eb57f7ad2cee219b94d7f60403f27aaa6a6fd53cc
 DIST gcs-oauth2-boto-plugin-2.7.tar.gz 20929 BLAKE2B 79db6c7bdf76320c2f74ab5edca0dd1cf7967bd38fb9a7a0a34c05fca3cab51317fb3ebd3e9ba195b42af2944cc951d150e3ee90cc93cdeab176f79d027a9800 SHA512 0ea8d4b01a2da79397e06de9dc0279594017e58e3874a2633b32007590efa2e8a29b5d2127d0218663cf7e63042adcc9801dbbb11bdfcb40d0c5d67c47267a09
-EBUILD gcs-oauth2-boto-plugin-2.5-r1.ebuild 1439 BLAKE2B 68f5a5b72320ee2c80cbae066a88b52e78372ce480e85e7ff81732a7633b045c4dc9119888d065a94b819cd5bb8a21ff2e6ff283af11024c78cd550ee99ca88a SHA512 bd0bedcee70366c3474cacbcd4a163117a06bec61941855ce157a5a6b38a7723010d16799849a7f8114336d294e468e5cbb8ed7bf4d34f742c86f56880c41ac4
 EBUILD gcs-oauth2-boto-plugin-2.7.ebuild 1211 BLAKE2B 20ec3d0636161344386f906867c25dacc57acb0628579708edf84d0b1c954a7db9b55517caccdd36899001c63c27c9e7eecb16bfe958d16d27675a9916298f6e SHA512 bc1af718b3f5ce71dbd6bf8679c4bfb587b82f65d30e3c131e2881dbf4cb5623a8553d3dd218517250ab4a60971101522c68ef98d021aecdcb8f10206faace61
 MISC metadata.xml 456 BLAKE2B 5846fe15c17d14329e1f44eea25bd0528750cb92c5b0abb1c2413775f13e4a37470a0d03a8a96af4c05cee69d552e913746cef73c7379fb93511f9a1567e9294 SHA512 13c1f905b7e732be95f44268c176fe4e15c0a7b27d64f7581bafc4c0ce943f66d21f3d025b4001e7284404e354f61a6e08a1a2119295918981f7271cb6f04625
diff --git a/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-use-friendy-version-checks.patch b/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-use-friendy-version-checks.patch
deleted file mode 100644
index 334ee5e90c96..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-use-friendy-version-checks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -36,9 +36,7 @@
-     'httplib2>=0.8',
-     'oauth2client>=1.5.2, !=2.0.*',
-     'pyOpenSSL>=0.13',
--    # Not using 1.02 because of:
--    #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
--    'SocksiPy-branch==1.01',
-+    'SocksiPy-branch>=1.01',
-     'retry_decorator>=1.0.0',
-     'six>=1.6.1'
- ]
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5-r1.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5-r1.ebuild
deleted file mode 100644
index 6095ca1d6823..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.13-use-friendy-version-checks.patch"
-)
-
-# Keep versions in sync with setup.py.
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
-	dev-python/google-reauth-python[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	!=dev-python/oauth2client-2.0*
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -e '/SocksiPy-branch/d' \
-		-i setup.py || die
-	# Make sure the unittests aren't installed.
-	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
-}
-
-python_test() {
-	"${EPYTHON}" "${S}"/test_oauth2_client.py -v \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index 77fc91875331..b5325dd1f267 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,7 +1,7 @@
 DIST geventhttpclient-1.4.5.tar.gz 58183 BLAKE2B 48d44048e7040552824ed19ac49c6dda41536ffded56bae0d942c06f111a327a1d571872f35f388853b479ea1aaa6de518f86e7ee72e362360492530ade65131 SHA512 9ffe00c79b145dab104e1dce336e072060f315d9bee880daf64b5f1f52e661d810dab9a60286320a7d30cf0e794465f201c039cc31fe7ec325cdb3a8350c9f7d
-DIST geventhttpclient-1.5.1.tar.gz 58398 BLAKE2B 9995e14c635b06f729d342b19187d4c4b935f903038950fc05e8d9260a341d3a551750c1cd46798ac2d97603d1dba449d4db3a51a44e49a1720ec23b1526edf8 SHA512 46fa5333149b86f5c4b5d06adfe5d49402d0220266c27507da1645f1da8a50562e142e37435a029bb4184c417e8a4123301a7dfc8769ce419e841afebc11247c
 DIST geventhttpclient-1.5.2.tar.gz 58467 BLAKE2B ea9476038685458cade41150c33226b4355018b8a8c22623e96186ff922d7f6b9518ca4108afff3bcfd18167bf288ef7f6366528050e300d720ef0e7b15ef649 SHA512 1edf153f88b9a7a954f9acc316ac76f06f2599bd3cf11b4a8f1df7b500e884f304601aae6a1dca8cedf24d4f78793176814eadc8b2c60fa90769df649723146e
+DIST geventhttpclient-1.5.3.tar.gz 58447 BLAKE2B a1cf529c6d40ee81ebe17cb066f2d837cf3d5ce2511bb735c1a63503b612c98c17c91f08de99d604c9ff6ebfa7e6502c338e7fbbc86de954ae7e559966aa8006 SHA512 9a0ed907f73f7f5ff8675502ef6fc82bff7b543d0a2d22e1eca5aba3592675a87fe09c48981f496b7f63a660e7eab5f68801ae74da8c33ac9d9bf55a0425eed1
 EBUILD geventhttpclient-1.4.5.ebuild 1477 BLAKE2B 35bfeb29334f743c0bd7ee2ed476f51c056606f14caeaa149ea4d0cae6e66a5868b804528fc60cc542b07474b5598f30e6b007985255e1bc9b2798ab0497cb91 SHA512 68b9ef7dd73a8aa1da5fff02fec0edbce304bd0d3c26dc1be96f06ec3cce39f16a98e636673034d78cbead3a578c7a81fe1350876908bfdf0c23543147813fcf
-EBUILD geventhttpclient-1.5.1.ebuild 1494 BLAKE2B b752e0854872fd9ecf130d8f3ea2d5edc70c9a479363142d3a6901b12ce422339bcf75a69b05e79b599a7b4d7812cc82b0d1a04647c246b2a0f4cbffaa7e5143 SHA512 b1e4a2641a731977a9116cb550df29bc329e72b528e6d7c6b809f95e5de249a985544d2eb58d18291ff46b99b7c35ffc4dc70081306dc69a1b907ac5ced8100b
 EBUILD geventhttpclient-1.5.2.ebuild 1494 BLAKE2B b752e0854872fd9ecf130d8f3ea2d5edc70c9a479363142d3a6901b12ce422339bcf75a69b05e79b599a7b4d7812cc82b0d1a04647c246b2a0f4cbffaa7e5143 SHA512 b1e4a2641a731977a9116cb550df29bc329e72b528e6d7c6b809f95e5de249a985544d2eb58d18291ff46b99b7c35ffc4dc70081306dc69a1b907ac5ced8100b
+EBUILD geventhttpclient-1.5.3.ebuild 1494 BLAKE2B b752e0854872fd9ecf130d8f3ea2d5edc70c9a479363142d3a6901b12ce422339bcf75a69b05e79b599a7b4d7812cc82b0d1a04647c246b2a0f4cbffaa7e5143 SHA512 b1e4a2641a731977a9116cb550df29bc329e72b528e6d7c6b809f95e5de249a985544d2eb58d18291ff46b99b7c35ffc4dc70081306dc69a1b907ac5ced8100b
 MISC metadata.xml 556 BLAKE2B b8a8f2fd8ff23ea4bf828d0dbf673da0345f832124a526f533e4beb36ca168acb13bd4fd92e7842a5361c38d9437960322a0c29f4c11a79696ede0544148d2da SHA512 c7bec846363a0fb54edeb145718d0acf56e6c2d0c1b2eed68f24412a9f328dac86f78e39d636e0b234cd556c334fd413b810bb1e5689651a17e2cd31cae7bd8d
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.5.1.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.5.3.ebuild
index 39d7cf97389c..39d7cf97389c 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.5.1.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.5.3.ebuild
diff --git a/dev-python/git-review/Manifest b/dev-python/git-review/Manifest
index 7968c1cf6c1c..77af9e30b987 100644
--- a/dev-python/git-review/Manifest
+++ b/dev-python/git-review/Manifest
@@ -1,5 +1,3 @@
-DIST git-review-1.28.0.tar.gz 60496 BLAKE2B 19fa2b9a5e2f25d89cf123f277cb0213675e4b99b75a978ee49ee9a394c6f212d5bb58d5e5aee9cc3c20165e9872be159ec81dcf8ea37f509c96bbc79a84bcbd SHA512 c29ad530abcfcf136548daf4865e1fe7c5819f6d4b11424c5c1425312c68fdc0e4073e009667b992e3f3db3396c7db618940c7f6e5be8b26e9d0d1b94fd078a4
 DIST git-review-2.1.0.tar.gz 62873 BLAKE2B 6685e43da07d4be0ffe3202a6a9be172257a8e665091b457318c118d95f571a9b97e555d4afea85fe590f264039bd86815c5a365fbc484a24b5c4ea748a340c2 SHA512 7beda9e704076285459c29ce2b7c0f07ab180212f24f62fa484430dfb323eb4473f9be030706eeca587d5cfb5cdbba6759aeaec6d377717ebf9a0f0157e1a190
-EBUILD git-review-1.28.0.ebuild 609 BLAKE2B 728dfffdd2a051e1c30058c8048f918cb8734dad6bd0f70ca256201482b70997bb520c4c782f8dae7a61766bc440949e24bd7217126e47674d749d32bd6baca2 SHA512 f1b434d7aa51f3c3f663d6d1c8e27508897812fe8c3769a01cb7d158082766246ec2bc7bc21c85b9a5a5dd31106ff3684f6175e267a311001409cedd76fd0958
 EBUILD git-review-2.1.0.ebuild 686 BLAKE2B ac3d85b4b0e085322ffdeb6b3ed63fe55af5035b79a23420187a4ff2e289435c3799da9825147f65a4ab5fc985319c1e6d8df91c2b7cb98e0a276261ff75e717 SHA512 64bd68021f24774e06f6bbf9452228c86e301d0b797cd02643bd5fe3d39e2c33e1100d927e2d01af2a896dd7a745a028bae31b7b8fb157441fc03e48c34ce388
 MISC metadata.xml 338 BLAKE2B b891e2436716d179293d3a1844dc671cb2c4270887260921b04fa3674d999805d4845337b73d3e45a34b2105b900209c7630f85962ea59fa8b472946981b4b6d SHA512 b8e512c07502ddba83bd5012ca036fb364ecf433408e70f036290b4209f0f06bf085de7a7519f47f46f1e68df9e9c97349cc55454b48ccf9dbf57dddc1ec28fd
diff --git a/dev-python/git-review/git-review-1.28.0.ebuild b/dev-python/git-review/git-review-1.28.0.ebuild
deleted file mode 100644
index 3caf102a45e0..000000000000
--- a/dev-python/git-review/git-review-1.28.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Tool to submit code to Gerrit"
-HOMEPAGE="https://git.openstack.org/cgit/openstack-infra/git-review"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/github3/Manifest b/dev-python/github3/Manifest
index eee21b76998e..ac4bff756561 100644
--- a/dev-python/github3/Manifest
+++ b/dev-python/github3/Manifest
@@ -1,3 +1,3 @@
-DIST github3-1.3.0.tar.gz 35345711 BLAKE2B 37d5b574c228b9e3c7ddd60931140679dcfa2a410964d25cfa51d621a0bc72cf4c5340ae3565c0112a3f5373aa064bdc4663dc2d3c4fdf3d0008239bd3498362 SHA512 0568d9730764fb81975da2ba336f1cdb2196de687fe6e68cb3dc2ac432bbcb201f1d78647ac2606a105ea00e6b244cb79b7222f88ebf305a9b7783c2b21e5a1b
-EBUILD github3-1.3.0.ebuild 923 BLAKE2B 66643213673f0c52209854f4756d83caab87718a73caf95a5a6a078e9509847e1c9414aa8bd2d468f8a9b92315eb02b2874c6f56f96524e2b60e2fab6a9e6652 SHA512 da38d9589f40a41581b0b33b6b9841bc9d53f254c006996d61743a1dafa6772ee88f4d75cff0cfb075c62113f2735d27198f1af54045fa915104a85e8272ce1f
+DIST github3-2.0.0.gh.tar.gz 35361555 BLAKE2B eafbabeb1557e55c27b268feaee4a0b49428ede7a419cb36163dc0437baa53a952b026971f07b30be2c33ed63d4c0b855369ee5260d4a3425e86dea101deea8c SHA512 92b044d0f0362c45773f8982043ab4e31cf180a955351fb9b035a8b2ed884330201d0cbb0e5f8f877c30cf6512f2e3864646a1bb1fe47e258a696720172d64b0
+EBUILD github3-2.0.0.ebuild 839 BLAKE2B a048c9b3ca5c836abe5fb155cd88b70369131507c8e869e3d3705c63e5f7de5a24638f5ce6b0fdd70ffa94322c81424ba61425529628cc05a7aa71272842015e SHA512 1cc5c224cb89757b04007dedd0a687b9c4f6646b41c017c232490fd994cd9337efda67b4857503f328f7cee6d46736cb7022dd00031363dbb5059e609cfc7a3b
 MISC metadata.xml 675 BLAKE2B aa0bec874cc285c1d5eb57c128188c8690eb572191465ac193e8df40836b4b27b1994916ee419c2d03e7fd95ad6ee2882d5b603702939663bedc9a0a27f7aeb0 SHA512 cc6cceaf8fb98df0ff61aa8ed7e45af8054cc20ea7e6697ff30d103d2dc5b479486374ad6f99e4de46cc37214701fbfaa4d3fd1a74923b9e7d7dfddae08ebcf8
diff --git a/dev-python/github3/github3-1.3.0.ebuild b/dev-python/github3/github3-1.3.0.ebuild
deleted file mode 100644
index 57ef2469fc55..000000000000
--- a/dev-python/github3/github3-1.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper for the GitHub API written in python"
-HOMEPAGE="https://github3py.readthedocs.io/en/master/"
-SRC_URI="https://github.com/sigmavirus24/${PN}.py/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}.py-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jwcrypto-0.5.0[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/betamax-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/betamax-matchers-0.1.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/github3/github3-2.0.0.ebuild b/dev-python/github3/github3-2.0.0.ebuild
new file mode 100644
index 000000000000..e782c17ddde1
--- /dev/null
+++ b/dev-python/github3/github3-2.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A wrapper for the GitHub API written in python"
+HOMEPAGE="https://github3py.readthedocs.io/en/master/"
+SRC_URI="
+	https://github.com/sigmavirus24/${PN}.py/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}.py-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jwcrypto-0.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/betamax-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/betamax-matchers-0.1.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/glob2/Manifest b/dev-python/glob2/Manifest
new file mode 100644
index 000000000000..77b92b3af0d0
--- /dev/null
+++ b/dev-python/glob2/Manifest
@@ -0,0 +1,3 @@
+DIST glob2-0.7.tar.gz 10697 BLAKE2B bbd813be6ff46d31de0e728d672897a934bd6e4c61b1f7dabf158d3e64021ca1fa1622878333ec70866796dac1d3e3eb1402eda541ed4d89873eddb367668e60 SHA512 6707c33782373cd71b1794ef3a143f6c0ceb5733bec944d16596eb4662df4c788328078b621bdda6096da95ec2f267256fca620dd7691eb02bf0ce940dd4150e
+EBUILD glob2-0.7.ebuild 443 BLAKE2B cb8046bae06d512c4caf1fadf43410f915112b94eee3779fe5aea1c2aad9c8659c857b341e8fdb7e98d2736af3d5c9d0438738e3b35e9d6c95fb4a98ed22137d SHA512 2542bf657c9c839ddf301ff2280d3643e8b181e353d30f7198900d8a54a0997870892da3e523850d04dfc7b82d2da62fecedf441e2935c420d5f0d0f8924b0e3
+MISC metadata.xml 400 BLAKE2B 8bb6dfc44d9fd44c28cd737cdeb426f2d3367bac00331094affc2be83a0f933c479d0c650a70f095461ef9613a711ec900a1313ad46f268b70ef776b964dce91 SHA512 d953ea0d4a10270abcd081660f723ebc46c114f5506828c561ca03608f1492795bf3670bce924dc46cc97103cca36667109fd78c80100688a882515498e6fbec
diff --git a/dev-python/glob2/glob2-0.7.ebuild b/dev-python/glob2/glob2-0.7.ebuild
new file mode 100644
index 000000000000..11eff6e0a41d
--- /dev/null
+++ b/dev-python/glob2/glob2-0.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Extended version of Python's builtin glob module"
+HOMEPAGE="https://pypi.org/project/glob2/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest test.py
+}
diff --git a/dev-python/glob2/metadata.xml b/dev-python/glob2/metadata.xml
new file mode 100644
index 000000000000..31234da7282a
--- /dev/null
+++ b/dev-python/glob2/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">miracle2k/python-glob2</remote-id>
+		<remote-id type="pypi">glob2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 86989a55d683..6ed86dbbd786 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,5 +1,7 @@
 DIST google-api-core-2.0.1.tar.gz 134658 BLAKE2B 0fda61be3b069454b305656f7a5a9243467f4e129e2db661e997fde850d416a50df803af6e7e9d041b8473e5f1abd35f6d5a9b25067133be28bed90ec1cca7e4 SHA512 297af05cba4919423e15844ccddb821fd65076f787bd01f24022d8393fbf45cf276611ab471be17950d7fad4e58f9b823517a8aeeec931df5b1bb37c38fe8ec9
 DIST google-api-core-2.1.0.tar.gz 138173 BLAKE2B 3ba5b5433a8a29ddf180315daed5587d113bde410697eb5f90713573f41b15b89f0a52e387515751c7702008b150ccc8b90cd7480ac0a26a5f9c73f94443915a SHA512 67688f2defa00df8039d964edeb2cb94aeab5124794fe95d1cba8b9e79aa57b7a191a4b51f91c7d7e293c7a550130cac294926552e47545a0f8222003d0ba076
+DIST google-api-core-2.1.1.tar.gz 138720 BLAKE2B 218adf5ce8f796868d165dfc449fa2aec135c4cc13f74342c3f9f5790e56e8661d38409aea68c0e3b3b2d42929ab7079b30832a1be675fe00d5b7a426d84e64b SHA512 38f6f03b9702234b6d0d41f064ae2c01b41d5dc2328bd4da886decf3d437db53fe194284b399dfadebbf4767cfb0aba804ec67911982d24c72f0a2464370f050
 EBUILD google-api-core-2.0.1.ebuild 1433 BLAKE2B bd36019f050f4b5b7ffb15eaae6faa45f67c68a2fbbe5d3770dec31b4ee766f25cdfab0ba735bcacd55681c4b905ffcac829a05393f7d088b02d373f55193a79 SHA512 11a99d229a9a0cc000e04478ccbbbe4da10a3813048ef8474f427e26b0af7caf844d09e268496dde5c0dff54ed17aa74e8669c5c537a75f57ed5f65557debce0
 EBUILD google-api-core-2.1.0.ebuild 1435 BLAKE2B 4ae9ce19c8fce846b37ea13e96e690fc6accd6a7761958f13907fa32d7d4cff77b34d1dff19c1d4ce50817f589bf56262788ab23f1f8143c0e03a35bd6c8d70b SHA512 defab1f7fe70687560687a08a5c71c61877d6e318909019e9f5228170c33632c067bbc7025906cff1b51cb23ecf8be1083adbb9c1d92c47d18aee70e46e23b58
+EBUILD google-api-core-2.1.1.ebuild 1435 BLAKE2B 4ae9ce19c8fce846b37ea13e96e690fc6accd6a7761958f13907fa32d7d4cff77b34d1dff19c1d4ce50817f589bf56262788ab23f1f8143c0e03a35bd6c8d70b SHA512 defab1f7fe70687560687a08a5c71c61877d6e318909019e9f5228170c33632c067bbc7025906cff1b51cb23ecf8be1083adbb9c1d92c47d18aee70e46e23b58
 MISC metadata.xml 453 BLAKE2B b53e834b3c423d8bdceaa2568f38173fc203f92f2340edd42899e4d4a93602118dbdb2283d492e34189155c336ec659d96f907f257b34cbe5557be331169a4f5 SHA512 d26c893b82fa946cab27669148b3dc2dea8b985636209ae49294cb14a7055f6c4a3884b38bce6e4923a54e9872af7e540b33a992eb727caae96e071a8ffe3237
diff --git a/dev-python/google-api-core/google-api-core-2.1.1.ebuild b/dev-python/google-api-core/google-api-core-2.1.1.ebuild
new file mode 100644
index 000000000000..6e1d986b70c6
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-2.1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="https://github.com/googleapis/python-api-core/
+	https://googleapis.dev/python/google-api-core/latest/index.html"
+SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P//google/python}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/grpcio-1.33.2[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+EPYTEST_DESELECT=(
+	# TODO: package proto-plus
+	tests/unit/test_protobuf_helpers.py::test_field_mask_ignore_trailing_underscore
+	tests/unit/test_protobuf_helpers.py::test_field_mask_ignore_trailing_underscore_with_nesting
+)
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 9c3cd06b6ed6..668a2c957215 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,13 +1,11 @@
-DIST google-api-python-client-2.19.1.tar.gz 26659303 BLAKE2B b1b5064c39b7e0d31e7ee01a7556a9ea6feaac1782d6714e50a32f0dfafedcab59628a1ff32774c426136d7ab796a1a6baf1f9ce7fbd1d233149c3a62648f280 SHA512 85272cd0741caed6ff76b930a69a67f1683886df82681b49f3069243dd40ef3f12febc7c1004ecf230d96bae005a8725d502032a9c85eb1bf9e4ee37af7018b9
-DIST google-api-python-client-2.20.0.tar.gz 26723285 BLAKE2B 3c0cb64ea8c58fe20356cd097676bc7741ea454e61d9dc8807689fe2296c3ddd0da1cb208a639e8b47a981437dea39de9a7c26b669c7dc27a79a0c5ca4a6c463 SHA512 bed0b1a0e0c5384c80e337339e9c5526e0cd5b2d39a3bd69fec1c65a3fed5bf26e6f4f983daed7663d2cd6c47b8a2a7ad54395f8e5dada2b49c15d98a9ff04dd
-DIST google-api-python-client-2.21.0.tar.gz 26754841 BLAKE2B e09b48d80d72e56656b366bd60972cde91d0c705ffe94b61d168e808e575a42f1dbbefdaf21ead1e57bab54a1b2453ba39ed5ae1d2ee616a5ba1418acc9f7534 SHA512 c572e5eab313e01ae94b026e32cf40fb479154942168cc09f2b74f184383ff5fc27cc5c0ae48c34d8ddbd8abe8840520a62a43708bd601341d5b32460f5f07df
 DIST google-api-python-client-2.22.0.tar.gz 26831856 BLAKE2B da93f1bca651cc01819c5f5ab43a6c767662db7eb85efb9aa08d2f9b54bc9efcc7622bff3207604ffafea9c88de8a393f5084c225078d896da5fdee1f2e56350 SHA512 427ead4173ed14b2df0560e35c5ff48a98d4abb5d449c26f84d9e7bb169bf46402eaaea0dab7988dbefd5ceee975b19a160cd797d2169030bb5bf1a54accda11
 DIST google-api-python-client-2.23.0.tar.gz 26877979 BLAKE2B 64ae1132f8d380e15b5856c7b7683ceb7bf6f0f65400b2407195be7e30a0982288a0f7892e70b659c0984823d5dd0c3d4115eb781643a584091580ac1ed480b4 SHA512 da8515a0db759cfa4e9b991fd04811e9d213a35c184e993e2439e00860ce86857c2968da75dee3ec755a2f679ab44219d4cc1ed817e7ac24664e667412205566
 DIST google-api-python-client-2.24.0.tar.gz 27072085 BLAKE2B 285da09fff461ffd100a5fe603f970fab6d552197690279e0c0d411700b95109bde523c1cba84a3fbc04cdf7bc13237a4432014912e0c79aec0c1d82e42c8c69 SHA512 84f0e0f95de0bede13e76eac3885b2a40a61d3ad522cb11a59cd3ab1d7bf6a7368a21232f9a9f64905bfaa2bd7a9b359ee3dee2a53e1dc303e8aede14dbdd466
-EBUILD google-api-python-client-2.19.1.ebuild 1520 BLAKE2B c5a616793b25aa16ea7c56fee7e10dc489c9b6df073ad005f84c878f4be03f3aa2226dc81e1daadeb3bee337db1b786ac1afd300e24bb60ec50c208155933464 SHA512 4bb53282f81960a6dc2bb75a271d815113b01f3678e6fbb21760c2520069c6a5107fac50706a34bec4dac0ef94f6e1ae96cbd4872ac8eddbedc3b1ab3a570463
-EBUILD google-api-python-client-2.20.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
-EBUILD google-api-python-client-2.21.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
-EBUILD google-api-python-client-2.22.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
+DIST google-api-python-client-2.25.0.tar.gz 27073397 BLAKE2B 0bc1d2c75cf826cc3326406909ab874b7ac51fc823bf5367fd56abebdfba50c035d4b92e3a0d19b8cebd8d570742e9aa3bdc7745c139624e261bc89fba8c789d SHA512 7940408b1d6ec42e1a9cf5a3ecb20eb3d4c3b35d4b363237c6bed0f32a1fb4be0fda11a0c9039a6cc5cf28ba05d0f183ff7b7bb2f5cb3f1bdf071f328b851035
+DIST google-api-python-client-2.26.1.tar.gz 27174748 BLAKE2B f00b4be7b5f62e0067e588404485d854b876b7e829020d980088be62018698c6f6790db7170faedaa2f419fa3f645443aefc48aeee64883077901adbd62af9fc SHA512 cca0cf4b66fd676feedc8efb75e19379668fe567aa104d7305209da157faf8eb31f718d33fa62c25a44b6aaece4b1a105392163e3395f17b837002c347224f23
+EBUILD google-api-python-client-2.22.0.ebuild 1520 BLAKE2B c5a616793b25aa16ea7c56fee7e10dc489c9b6df073ad005f84c878f4be03f3aa2226dc81e1daadeb3bee337db1b786ac1afd300e24bb60ec50c208155933464 SHA512 4bb53282f81960a6dc2bb75a271d815113b01f3678e6fbb21760c2520069c6a5107fac50706a34bec4dac0ef94f6e1ae96cbd4872ac8eddbedc3b1ab3a570463
 EBUILD google-api-python-client-2.23.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
 EBUILD google-api-python-client-2.24.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
+EBUILD google-api-python-client-2.25.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
+EBUILD google-api-python-client-2.26.1.ebuild 1400 BLAKE2B 5ba0ab24b524c6305db80e3900159cbf0ac529663d4af6569d7111499b788c609f027c6891ce0822e0e1d51a7b022a8890bd5c74198c8c2209c78c66f9320766 SHA512 18088e801ccf750e42fe7eb4883a6f78eecc3f7903284d3646be202224622537349890c553be402ca8d8a10b0478f215664cb2f3427c652c0931b97d90389439
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.19.1.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.19.1.ebuild
deleted file mode 100644
index d5db76b1bdc7..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.19.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	dev-python/google-api-core[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	find tests -name '*.py' -exec \
-		sed -i -e 's:unittest2 as ::' {} + || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local deselect=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	distutils_install_for_testing
-	epytest tests ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.21.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.21.0.ebuild
deleted file mode 100644
index 2bf8009bdc63..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.21.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	dev-python/google-api-core[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	find tests -name '*.py' -exec \
-		sed -i -e 's:unittest2 as ::' {} + || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local deselect=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	distutils_install_for_testing
-	epytest tests ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.22.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.22.0.ebuild
index 2bf8009bdc63..d5db76b1bdc7 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.22.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.22.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.20.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.25.0.ebuild
index 2bf8009bdc63..2bf8009bdc63 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.20.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.25.0.ebuild
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.26.1.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.26.1.ebuild
new file mode 100644
index 000000000000..109aa7546326
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.26.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	local deselect=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	distutils_install_for_testing
+	epytest tests ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index ea82aef24ec8..0fc060b76662 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,11 +1,3 @@
-DIST google-auth-library-python-oauthlib-0.4.3.gh.tar.gz 48020 BLAKE2B bc5e575f3eb7b8b876deb13aaff0d1b900555bcbc609259dc72c9f01f595283feffea6aaaf91acf835b313629fe4c4c76dee8ea877b6ae37c3c01633c63909e4 SHA512 f6fa0e525b0aef6f4359954cb2c8020ee86544862318721d439d153cae3e75527b0e0a312572dc936fab7702da8c6af42ce9242d1e73f48c0a822973e470a4a9
-DIST google-auth-library-python-oauthlib-0.4.4.gh.tar.gz 48322 BLAKE2B f812b43e1e867090aa3ae4fbda7523324a182f6e1eae39fd865d23279b04cde08ee2263b83d1c2eb3555a8db3a9b01869d8148c0e603ba8fe9698dc8d052fc11 SHA512 5b17ceccca24216a0354513ae2a1b14f2aab9760e0ff0f87840a64de85a730a4115f5e44b359093f4ab0a9ec8fea41bfffb7b5aeca833574419ea6021a382240
-DIST google-auth-library-python-oauthlib-0.4.5.gh.tar.gz 50487 BLAKE2B 1ace58a7b3d3aa0c28606c8345ee71550ea6522a07356e6debbdf6097743425c334a1a5bfae5ff60789f8de71b46ecc9ed973737aacca2c025fb7b2d7efbc539 SHA512 0a4bfab32133c3a8ad79ab9b46d087614bf49d4db54a403792396bdc55c378c5df5d31166354925bca6948d409e8a17328c593f892b73430ea7be6bcd8ef1d4c
 DIST google-auth-library-python-oauthlib-0.4.6.gh.tar.gz 50982 BLAKE2B 93980a69777089125bca9f583cae0b64f9facf699da3ac135561a9cf135122d9e22a6c0be3325d366dd77a2240fb16d5c63633a216cfee07b9fceb2239227c86 SHA512 a20a85c073a6208d72c8f6ceb34544241f599e716b1191bfc52bcc367797efc18d0e2b94d4e433cec692282b00428bcb4d7e73ed48a26e66d6005189d5dddb77
-DIST google-auth-oauthlib-0.4.1.tar.gz 18687 BLAKE2B 1c9028f6b4c306bbee51fba5b55950d129d56ff5154645a166998c0c720b125202731f1cfed60837b8103d56fcdeeb818e39491b243a8d761969f73d9f88f67b SHA512 123707139353db8e05c81138af834e35007d323f0e19ae79088ad5ca4be86dda6c0df91e2f7794711475227a60312fab9101c91b49817bf8b84866ea6374c943
-EBUILD google-auth-oauthlib-0.4.1-r1.ebuild 763 BLAKE2B 9831129d76dbb7e468426c9497146d13b2af4b98eb7f18775aaf355b7f478476f60aac5b8daf71003658df719d2068fbc2a2a9c29925d877e6e09b174bdbfca4 SHA512 64f0879d1219a780fdabf99cb7f862eb0466c1a4c0518885d77ad689f23b0d222140867ab41e15fd07f607c1b40a9f3665a8dc3ba043176a216b1a2d5cf6728c
-EBUILD google-auth-oauthlib-0.4.3.ebuild 897 BLAKE2B d27f90b749025c63ee0ccd2e986dc021b21ce0280a2e7779dbbd754a3b68a7d779627459e20f485cd2bb5a41970863e24a84b3e108a216d3185d1806e079e4b6 SHA512 af995c0a3cd0d1ea53895af11fff39bdfd9e10c7b3cc430007332a196b823ba092a73afb210130cfe0523e0d3e42d1bb42800f0e12ade6ccc385f8057ee97b6d
-EBUILD google-auth-oauthlib-0.4.4.ebuild 897 BLAKE2B d27f90b749025c63ee0ccd2e986dc021b21ce0280a2e7779dbbd754a3b68a7d779627459e20f485cd2bb5a41970863e24a84b3e108a216d3185d1806e079e4b6 SHA512 af995c0a3cd0d1ea53895af11fff39bdfd9e10c7b3cc430007332a196b823ba092a73afb210130cfe0523e0d3e42d1bb42800f0e12ade6ccc385f8057ee97b6d
-EBUILD google-auth-oauthlib-0.4.5.ebuild 864 BLAKE2B 10b7813d88167227979f33417164a7b1dec78cc3f239a4ed5975d5057b2d39b94204d897ccd17eed81ee25656468ba5790dce531533d4099d7337b1e02dc59c5 SHA512 96e06c8be123e55b2dd9a0e26b70ea8edc9ecfb73b8e0550b209d1f46e819b06b4df4327ddd6a4b3d3f59441547bf88ce19cb5fcf6dfeb2b455df8c2f625c902
 EBUILD google-auth-oauthlib-0.4.6.ebuild 864 BLAKE2B 10b7813d88167227979f33417164a7b1dec78cc3f239a4ed5975d5057b2d39b94204d897ccd17eed81ee25656468ba5790dce531533d4099d7337b1e02dc59c5 SHA512 96e06c8be123e55b2dd9a0e26b70ea8edc9ecfb73b8e0550b209d1f46e819b06b4df4327ddd6a4b3d3f59441547bf88ce19cb5fcf6dfeb2b455df8c2f625c902
 MISC metadata.xml 410 BLAKE2B 23af42a2aa614f119e10cf5d57c3c37abb69ad8d9b1e16445fb92c9f00bdd78f6b1a6a51dff4ebb98bbb03e0002e73eb68cffcf857372dd94848187637c60219 SHA512 c19dd3af098644d5068ec677be51615885bb1267ba9bfb867609725e2a824a74934e2fe25909ea7406c91ca405d44e4c7191a14d3d1bc7b3a60c29445456d3d1
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1-r1.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1-r1.ebuild
deleted file mode 100644
index a359e8f1ef58..000000000000
--- a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="https://pypi.org/project/google-auth-oauthlib/ https://github.com/googleapis/google-auth-library-python-oauthlib"
-SRC_URI="mirror://pypi/google-auth-oauthlib/google-auth-oauthlib/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/google-auth[${PYTHON_USEDEP}]
-	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-DOCS=( LICENSE README.rst )
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.3.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.3.ebuild
deleted file mode 100644
index 188128c194b9..000000000000
--- a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-MY_P=google-auth-library-python-oauthlib-${PV}
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://pypi.org/project/google-auth-oauthlib/
-	https://github.com/googleapis/google-auth-library-python-oauthlib"
-SRC_URI="
-	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-DOCS=( LICENSE README.rst )
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.4.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.4.ebuild
deleted file mode 100644
index 188128c194b9..000000000000
--- a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-MY_P=google-auth-library-python-oauthlib-${PV}
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://pypi.org/project/google-auth-oauthlib/
-	https://github.com/googleapis/google-auth-library-python-oauthlib"
-SRC_URI="
-	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-DOCS=( LICENSE README.rst )
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.5.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.5.ebuild
deleted file mode 100644
index 93b3e546254e..000000000000
--- a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-MY_P=google-auth-library-python-oauthlib-${PV}
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://pypi.org/project/google-auth-oauthlib/
-	https://github.com/googleapis/google-auth-library-python-oauthlib"
-SRC_URI="
-	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-DOCS=( LICENSE README.rst )
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 24c42b8f45ab..8f93e5b3eee3 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,11 +1,9 @@
-DIST google-auth-2.0.2.tar.gz 180445 BLAKE2B d4e9e7dcfd690f5eedf301e989c4a2dedf509e7c3068e4f547ea43f870979a6001d21849a7102321f6f843196f0a4e0a14f888bd3b43701c301aea3a7f94ed60 SHA512 b8cec2fec4105715edad3242f20ac26b7ab2591903785ed5c31c1af19f7a23e14e93e0d4c3644dca76db5ec0353b8a1baba0224d67987067c5580c75592a04e8
 DIST google-auth-2.1.0.tar.gz 181817 BLAKE2B 806f3541163bd2f66a533730eb0064b4697716ab58595dc678fdef106dd49dd328378710650e77efc962547834808124eda934b69cc4ef18931624822710d90f SHA512 1460ad02c6ac549245433567583f76eea680ea941b2917887f7fda3f2f6d04c5b16e536368a2f2c0016acd2bacf894d1eafa9b26f148f66b212590eb0388d181
 DIST google-auth-2.2.0.tar.gz 183667 BLAKE2B ac71dfe657126f96fd78f4fde110630dd5e1fc2864579a199309725795ba337fa7a2771cccbaba9d12fd35639ef67a78cb71bfd2e1a8e963cfc62507b2513ec3 SHA512 00a2a28f5237bba58a578726ac6d3290eec37486343a0f2c1c1764c14db137cd68db776890cd2556516579b54ddbb7516c08782959f87867a1e30756821e489c
 DIST google-auth-2.2.1.tar.gz 183909 BLAKE2B 4c18f332f068573567af5100828b3902db17e46c47087569386ad3b012e45ecb841709376fae7f14920e3dfdb0124b9fd002b670b565b9c641dc9ff4ef5cc507 SHA512 245e6b8d27ff49e47093dc2f50e97a57031c93090900b5578a91ab335560b7fec1aced1faf822826263a00dfaf282eb147a4e389c13546f2e34d09f1ef1ca285
 DIST google-auth-2.3.0.tar.gz 184993 BLAKE2B ac1392ca61e092e3e53c9e936e2d0bd11aeb8f33cace2458e80055734a96a05294335a9273acfcc3f385f423ed537d544404e41599cb6a75b21a10998fd72562 SHA512 cf0040d238880ea4bbad64f0a47311f2ed3922a7301a0d5287319b39ea8e76dca66dc78fd860cc12386b078bd2147a1cba01de97381420ef94cc44fca0c90ad1
-EBUILD google-auth-2.0.2.ebuild 1402 BLAKE2B bf03a7cb9afde8426698dffd25489e15fcdd7c684399315792af049f6a48bf71847ff6999cf14ceb739f936f90e8419632606877f6810dc05ca1ea0fb82a6c12 SHA512 05b7ae4008dba3220014d345c474eba12be81e707200799e74637b254efa67e7dc6528cdd9f4fc78e4adf83dd262f714346c299bfde0e0bf4f2564fefa4519e1
-EBUILD google-auth-2.1.0.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
+EBUILD google-auth-2.1.0.ebuild 1402 BLAKE2B bf03a7cb9afde8426698dffd25489e15fcdd7c684399315792af049f6a48bf71847ff6999cf14ceb739f936f90e8419632606877f6810dc05ca1ea0fb82a6c12 SHA512 05b7ae4008dba3220014d345c474eba12be81e707200799e74637b254efa67e7dc6528cdd9f4fc78e4adf83dd262f714346c299bfde0e0bf4f2564fefa4519e1
 EBUILD google-auth-2.2.0.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
 EBUILD google-auth-2.2.1.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
-EBUILD google-auth-2.3.0.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
+EBUILD google-auth-2.3.0.ebuild 1511 BLAKE2B dd2d44fef1ae00bc8024c4728a5de48dbeb2e69ebeece7e17b64414808a32b26aef1c9ce947e18027e5c522c69ccbd51c834b6077812a679db4ea3f42f1b1b2f SHA512 efb97e825bbf48719194d35750600f72689fb2c9ea00d6f8cf1aa231ec32b30c67df4b9575942e6a8470c52b90e5e2fa5c507e9a0009cc572e2504f19239c0ed
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.0.2.ebuild b/dev-python/google-auth/google-auth-2.0.2.ebuild
deleted file mode 100644
index 20d8750d0310..000000000000
--- a/dev-python/google-auth/google-auth-2.0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.1.0.ebuild b/dev-python/google-auth/google-auth-2.1.0.ebuild
index cd44f928efdd..20d8750d0310 100644
--- a/dev-python/google-auth/google-auth-2.1.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-2.3.0.ebuild b/dev-python/google-auth/google-auth-2.3.0.ebuild
index cd44f928efdd..a0d95fea9961 100644
--- a/dev-python/google-auth/google-auth-2.3.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.3.0.ebuild
@@ -33,7 +33,6 @@ BDEPEND="
 		dev-python/grpcio[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pytest-localserver[${PYTHON_USEDEP}]
 		dev-python/pyu2f[${PYTHON_USEDEP}]
@@ -44,6 +43,12 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
 python_install_all() {
 	distutils-r1_python_install_all
 	find "${ED}" -name '*.pth' -delete || die
diff --git a/dev-python/google-pasta/Manifest b/dev-python/google-pasta/Manifest
index b400f44953ed..75486468ccb9 100644
--- a/dev-python/google-pasta/Manifest
+++ b/dev-python/google-pasta/Manifest
@@ -1,4 +1,3 @@
 DIST google-pasta-0.2.0.tar.gz 40430 BLAKE2B b3f068c0530149d6e8057a2e7edeb76b1912516a8227a837913783060e30f418159b38c77480248dc7a1586b46c9b5914e93c77a9430d963b3538e2197661922 SHA512 1d75d994a5120109677a58472459a632b31568e6ce79b205688913dc2a94e132fad818c73510b2f7d7adca3c757077543abd8b7f15be035a63fa15d38874c753
 EBUILD google-pasta-0.2.0-r1.ebuild 516 BLAKE2B 90740cfcfeaea7c638d876cdf1da794f20cb51b7b49e7e8dd7890e6d822984c45ff793751caa82c7c7b48d0f825ca4244c33d03dd4ad15cf850e5d8e8b53e358 SHA512 0fd6165cbbbf80ec67e1bb00d237798cc0ce5cad17068c02cad851cee4697c5312d188621fa1b21329cb923fee17e307c34294b5ea1870404f69404604ba4078
-EBUILD google-pasta-0.2.0.ebuild 483 BLAKE2B 441184ba38db59f401471acb789850f979c1e300092388f4e698c232fc05d7fef746de1f379933f9f563b5a2c344639211ba362faae77102612d75753b9173ff SHA512 f3d22898ff4c200d46692848f5749fc579ca464591ba19ed0cc6b7d00c0af2ee1e3939431599fb95f6c715bb7cc2974a2312e47bce3568d009a4150e684a7799
 MISC metadata.xml 323 BLAKE2B 99093ad28d54321b34c32274af29e78790d537b7ebce240caf4b17240ed99a74b824f31c8293bc629e42c5ff43eca16378f0f53ee2717dee29e769a6b58d95d3 SHA512 7c59e2d25ed1ee60fd3624af0df804b71e39f5c9a0c8b91be9320798aa201122cadc27f793fdbe3664bc12a3af0410df929392a84891ff86cb302b15032f951c
diff --git a/dev-python/google-pasta/google-pasta-0.2.0.ebuild b/dev-python/google-pasta/google-pasta-0.2.0.ebuild
deleted file mode 100644
index 821881b20bd3..000000000000
--- a/dev-python/google-pasta/google-pasta-0.2.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-inherit distutils-r1
-
-DESCRIPTION="AST-based Python refactoring library"
-HOMEPAGE="https://pypi.org/project/google-pasta/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/google-reauth-python/Manifest b/dev-python/google-reauth-python/Manifest
index dfb0101178e0..7a9b44e7c5e2 100644
--- a/dev-python/google-reauth-python/Manifest
+++ b/dev-python/google-reauth-python/Manifest
@@ -1,5 +1,3 @@
-DIST google-reauth-python-0.1.0.tar.gz 17720 BLAKE2B c78a43f1062988ada715c9e1bb64c2252a3debd5b9b366df9780200717a006c5e4957bf37d81e645989c6fc74c5e5b4354c88244309bb1a22a936ef74f6172c8 SHA512 b92b822b5c59d74f7ac747e66f35eaa906a0e18ccbb791e0904551c6ecd9b904ac7602ea38333a16396ffa49638a1b4991827429c7f52311b9506f55400bf117
 DIST google-reauth-python-0.1.1.tar.gz 18302 BLAKE2B a21e174f7dffe48810679910bf8d6712fb4176e5608f2a068d575df3643c4db15a74dae92c15f4ffdc344d287c31a8eb58f94b0384e2d9fc808c072dc8f89043 SHA512 81705d4080b3d7fb0a73741f9f498f8014ec94aa165a5b112c8af8fddc8f040dc43809aff6df39354c8d975db0ee8d62d003c11b173bd56fcf9add1b01644930
-EBUILD google-reauth-python-0.1.0-r1.ebuild 1072 BLAKE2B 597b29f6bde4d224be9d9b7a42ebe784fe953bfe042c2dfba954fd53c6d7c7cbeb1b55f0a7ce62096d6cda14584a075f73fc30facff18e838be00dca1fe7f8f7 SHA512 0818ee2d31373f2e6bbe8d58064653c4a38ae18920431394637d68acb1874ba9036986ecd26af24e3073bc9a4bd4a3656539c054f44218ab0426dde1ea8e0206
 EBUILD google-reauth-python-0.1.1.ebuild 1083 BLAKE2B 3cb3b322ac286f50c2962d6bcc29ffd036753b0a4aa932990834ca6c64c89ba478aed20ebdc308d2614cc89e277b2c85ce43c6b863f9ff4b4736cfde96c4e0aa SHA512 1868081cc00f617e0d012357a3ee61a5ab5ddc528da1dd4f7cd5b67a82c5a371c4762409488ee854387952bf942c88be919f276439acf195671517f9c90aa62d
 MISC metadata.xml 388 BLAKE2B a75115224020407fcc3bed17a0148f5aac88944f0a575ca0b0889522d7548e1e7d0bc15c6cdb545ba931c46a7268662df5577096368366178577ed16f0445c4d SHA512 fb16d4f7b91aeb0598881749f529ca3ea289e5dd63d219fbe99942f557e262b2e3f2fc3a78b0fbe408c29eac2ad64e8024f44609c546c45deb0f1b567c1f6287
diff --git a/dev-python/google-reauth-python/google-reauth-python-0.1.0-r1.ebuild b/dev-python/google-reauth-python/google-reauth-python-0.1.0-r1.ebuild
deleted file mode 100644
index ac3f25930b31..000000000000
--- a/dev-python/google-reauth-python/google-reauth-python-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python based U2F host library"
-HOMEPAGE="https://github.com/google/google-reauth-python"
-SRC_URI="https://github.com/google/google-reauth-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/oauth2client[${PYTHON_USEDEP}]
-	dev-python/pyu2f[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGELOG.rst CONTRIBUTING.rst README.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s:'some_origin'.encode('ascii'):'some_origin':" \
-		-e "s:SignResponse('key_handle', 'resp',:SignResponse('key_handle'.encode(), 'resp'.encode(),:" \
-		-i tests/test_reauth.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/gsd/Manifest b/dev-python/gsd/Manifest
index cf4748a141f1..4e1d47deeaa2 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1,5 +1,3 @@
-DIST gsd-v2.4.1.tar.gz 113343 BLAKE2B 5d87fe5dbac037aeccf2ef800fc18accb1888606ed904b15910480032edaaa21bed3adf264e17ea5dc42f6600321c838c15e73617a1d8f49fb9a8e5e79a0bff4 SHA512 47982500160dc2a125ae2d796fccb1fb31fa501f059c8dee9be1342713d62e3d6ce71b534dbc91daedbf6981299efa4b81382afa13283d647c0848bbd3591c91
-DIST gsd-v2.4.2.tar.gz 111622 BLAKE2B a4e08cc03ced2158818cf35e3f827d819b2248de52a21060e06a8d47810e2cf80fc25c9033c8b231b58c723ae794b9066261fdfcc5d19713a916ec9aa31adddc SHA512 8db05903bfcfc45bf1ffc326ffe67ce4d980a2b91596256fa29d006c73f742ac69b829ea2f4b7e1508bf5279c584fd66316e2e0776236bdce791e2cb46093ed3
-EBUILD gsd-2.4.1.ebuild 725 BLAKE2B fe0a4352404737e30530b0bbc680f47796c934913e9af587e8f7efc5c1656438de506a2c08160f0a9694cb817036a54eab62fe24534b7e271da913d0590f5024 SHA512 3608ac504e5a82a057baddad889c1548834c07e3dbe6ce00ec15ae0e229cb589fcf921560274d646b3a6989e54f40f8465d492f0fbad03a702ca1662cf60e2f0
-EBUILD gsd-2.4.2.ebuild 753 BLAKE2B e4147b5e798a95f03b7aab30392ed4793e33525abb11629e1d651649c30922b3f5776a6f8c5c62940c93663736da755b6f6414c5be779c51484307d4a9e38e56 SHA512 ea04fcf5e960f7caa6e1079e398d262ab312186b0fb817bec8d79b9aa7e10a0c2fee1f50f5250a89f06a2f0421f0d937307f33d59339a379ecb54bf53b0babed
+DIST gsd-v2.5.0.tar.gz 105537 BLAKE2B dbd9cef142405bae4e99c180f6b7c65cb60240fe45e200643b8efd388c72830a70d97c649fdb686afeed4eb44386cbe68165ed105bd67424f1cbd3657159c16a SHA512 f5eda751bdfa4d3eae980029fe5594fc5698d68265784f089b0997441c18f58d70d71cf52a0b4fd208708aba0162164d1f640440964b6e211db856f10c7c0c67
+EBUILD gsd-2.5.0.ebuild 680 BLAKE2B 4befac8eab2bdf587fb2b8fe1300ebbf4ed99f5376295399ea09689d73cca562724fc541d01d9d91376641dce1969a557b2751286fcbde0e83c0efb1c1e58617 SHA512 744cda773959368c4fc83ecda1bb68f29e3dec57525bf4144f5e1b5c0fcc58f763a8d23144bf2bbbffdb1d9c063f12693401cfae63445cd141af58d97c2b8428
 MISC metadata.xml 416 BLAKE2B ff2192a940eb2d265ce71841163a524658a8e59f8fe6f2d81fd01fcb0c45b8cb6da92fb178574f61838e22064a096084faafbd77f971753f480ab5d216dcf412 SHA512 81bcc244ebf91346602c1d0de769678fd1f359ca04178613a0473d18da884f210b8e873717db3605c1d74713240d6b1203e9dd1e3f4643bfe702a4015b5cbfd7
diff --git a/dev-python/gsd/gsd-2.4.1.ebuild b/dev-python/gsd/gsd-2.4.1.ebuild
deleted file mode 100644
index 85d4225e06f2..000000000000
--- a/dev-python/gsd/gsd-2.4.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="GSD - file format specification and a library to read and write it"
-HOMEPAGE="https://github.com/glotzerlab/gsd"
-SRC_URI="https://github.com/glotzerlab/gsd/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND=${DEPEND}
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	epytest
-	rm -rf .pytest_cache || die
-}
diff --git a/dev-python/gsd/gsd-2.4.2.ebuild b/dev-python/gsd/gsd-2.4.2.ebuild
deleted file mode 100644
index b121fb8f35c3..000000000000
--- a/dev-python/gsd/gsd-2.4.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-MY_P=${P/-/-v}
-DESCRIPTION="GSD - file format specification and a library to read and write it"
-HOMEPAGE="https://github.com/glotzerlab/gsd"
-SRC_URI="
-	https://github.com/glotzerlab/gsd/releases/download/v${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND=${DEPEND}
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	epytest gsd/test
-	rm -rf .pytest_cache .hypothesis || die
-}
diff --git a/dev-python/gsd/gsd-2.5.0.ebuild b/dev-python/gsd/gsd-2.5.0.ebuild
new file mode 100644
index 000000000000..c74dbc1734f1
--- /dev/null
+++ b/dev-python/gsd/gsd-2.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=${P/-/-v}
+DESCRIPTION="GSD - file format specification and a library to read and write it"
+HOMEPAGE="https://github.com/glotzerlab/gsd"
+SRC_URI="
+	https://github.com/glotzerlab/gsd/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND=${DEPEND}
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	epytest gsd/test
+}
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 46aa20b0aa32..d03c6052444b 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,4 +1,4 @@
 AUX hiredis-2.0.0-system-libs.patch 390 BLAKE2B bf64bb9ad6ca84c5cdabe505dfed0417e71d9585cd60c0fa2bd9627b2cb90f8502f5224d5854a14213a5b4a9e01814e23d2295dba0acc122102181fab955297c SHA512 04521b844c346f86a44608bca76f706ec5f70a35c6ce2678fd7c4b958e6053d56aac0fca0d301ec8bed6aaa369c883370ffb946930d46d0fc8c0f7f9e52f7bed
 DIST hiredis-2.0.0.tar.gz 75807 BLAKE2B dc7535f117c8ecfb2c924fe44a1cba2f02271c544588249de6794ce3aec27f66038ecb9f6364ca87b71f66ba13870a3be192eb79c1f360d2eb6dcb6dcae41caa SHA512 b9a313acdd00676dc046713a81bbf4336959f49f09bd2828997c23ca41259935047c657a4b6f81913715141a75fb6bbe7fc4429c7a5b0f4bc3d5de66b9cfa909
-EBUILD hiredis-2.0.0.ebuild 697 BLAKE2B 8239217f0f3066a215163c04a83acacb1f26ce58f1b285c2801f01030d6e4264dfe3aeb3258a9aa4f732613714f8b167e5f9d1cc33f0ee57a9cd261c8f8fd072 SHA512 3ee411bc74377b579631c8a5d10b9d0a41475fe66dc8a2971e00181cc6afede78d44f4ca49317de259ca070ae080eb9db0fd75798bc12d0aa1e468b0288322a2
+EBUILD hiredis-2.0.0.ebuild 764 BLAKE2B 5366b1a3495a240d9769d65586f23165b64e9bbc4e5fc938e1de74ba6a64b168e454c413d891e80f971988e99f8d95bd1d96c415669d53c420eca8be01a2554b SHA512 8325ba155a2a3cf490848eb7c90f3ec1f7d73769cfc89907f787076788a77c16dfe154e6c264950a29cfb1cc3b584da92ba5508415a456958962156e52523977
 MISC metadata.xml 579 BLAKE2B a625bee5874cd1b4944638094c6f13b7c1aa6c55333e3d0de088e8c2e85c43f212c78ea495470d78e1f143bcd7f1be50c4bf16c616912fbacdcffb90e1cff992 SHA512 db00dee480df0e1c8c553e592c6ef5f931329247cc35842753dbd755a0d825cc6a14b67713fa133a6f3048326e039faede1fba290015f09df3e057ee3949f064
diff --git a/dev-python/hiredis/hiredis-2.0.0.ebuild b/dev-python/hiredis/hiredis-2.0.0.ebuild
index 99cccf890bf0..671e9eb491d3 100644
--- a/dev-python/hiredis/hiredis-2.0.0.ebuild
+++ b/dev-python/hiredis/hiredis-2.0.0.ebuild
@@ -22,6 +22,7 @@ src_prepare() {
 	use system-libs && PATCHES+=(
 		"${FILESDIR}"/${P}-system-libs.patch
 	)
+	sed -i -e 's:description-file:description_file:' setup.cfg || die
 	default
 }
 
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 234bee4cc417..5b2bbdfecdce 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,15 +1,7 @@
-DIST httpcore-0.12.3.tar.gz 57587 BLAKE2B 3c0e7a210b21e54564c4c6077fadf66344b887662c71b05a1ad4a2c0224a4d703eccdf576d4443341176edee03b6776bfd49aaef2ea2f29f02614677e1dfad85 SHA512 b31535231dc2b6a5f1c9c0c538628f75360f04b4747b447ab0a7168ed32d0eabd463335c2f7fa782dcabb4cbc32891a2839ae50e0999d5a791c01b02533d38f0
-DIST httpcore-0.13.0.tar.gz 58310 BLAKE2B 29ed4ad768088c6226ece27cb82e2a1d8df32eba4cf446015b43360c330ec65b433f571ac8e13e4b8f8994ff6e097ce5bf79ae1b9561d940298172c66d539153 SHA512 28ed65d3b3b30a62e3f198d98ae77a3cc26bd80250f10a506851433b5572a6fdcab38bf0d670caea94dec43d5b61de21a3ea967a445041536cad68eb98cc12bc
-DIST httpcore-0.13.1.tar.gz 58538 BLAKE2B 4c0b681f96fd64d17bc1974bdb74486fd336f84b27eda450d7de630c9f5dc2012ca91d10c4d0bcdaa06ff0e60d524993ab784721e4ffb55ff2848d68ea9ebb29 SHA512 ba410bf61e820016b061a8cd5a30b227bb75a78e90465459b2ff67dd76b9de9120d3b2474f6d8bb54698f627bb8801f2da5b3d85a4a41a0c5330d6bba8e10a49
-DIST httpcore-0.13.2.tar.gz 59043 BLAKE2B c534c304b238837486b8a61860553475c87363b43842c9dad2629673c1d30c2f906f31658f6ff75bd9354040c08453c3d4ffe8bdf53077ca993399b93d68a57a SHA512 b032d56bc5bf4049d02ca2ddfaf66615a1ac2f0723291f82f9104a0d7f09d5eec710f9e1ac2082fa1e83ef7fa6fe4f5a6c7c28d660abd6803a990094c952834f
 DIST httpcore-0.13.3.tar.gz 64246 BLAKE2B afc43122a5502770b6efe7052846926e25fa678dcbd5c8ddbcd806df36dcf684d94df12571efaab0ff1b657fef14d5d71dd902be5cbec12c61db13004d7fe5a9 SHA512 7ba6c2cb77c082bcdb8cdfad2bc17646ccc9348f49760150ec1070429f94913b2fb9eae6d3407b404581b48670b866bf11696453325dd70610bd700e94990450
 DIST httpcore-0.13.6.tar.gz 64716 BLAKE2B 6eadcaac626d4561dec2e41bdbde21836727f10870093890469e6b5a4af2aa276361044d08b5e25e3bf760092e5537edff9d0c99acb1ddf6ab0a17343bcd9af2 SHA512 52b6189763755dbbd762ad26fef0107ad50949c1dd4865db788317ce981079cc095161e543f1a455ce84138b51f89806d8c55267378574feced107675f6cde47
 DIST httpcore-0.13.7.tar.gz 64734 BLAKE2B e6c4b1720ce4bf62689995d3e1c648c4702bb416f3b3586eb8dd2f0cfd2155046e64181c4c04e65f721a5f0fcbc23b5ffd01c2930c7c69d37ee4c36e37b7d0d4 SHA512 0cc48828d0710066b3ef89998ec85975285763ac63a8b59106952ef2dac5a02dac71e7e106c4b6ea1022eb4d06a9cb5ee3e634eb564bad49c5508beff75279d6
-EBUILD httpcore-0.12.3.ebuild 2176 BLAKE2B 919e436b249c0f06db0be31c034f416fe5b45822de6236fca8aa463237631c3aa4b887cf6a583185c70a86ef094428b23e0d7a5fb15947608ed643ed3aeea008 SHA512 f0ad494b042433a60ca1475951aa7ef8697906138af616f8ab083fbd179d3bb79e52323e658f36d92172066017f44be640dd73b4880eaf76a4f6383e739d4a25
-EBUILD httpcore-0.13.0.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
-EBUILD httpcore-0.13.1.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
-EBUILD httpcore-0.13.2.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.3.ebuild 2194 BLAKE2B 1986b5ecbc242a10b743e1430a4487a9de1aea662fb0e689f1d831b2664e473b08953284fb9b1607802dcaceda0e7f666e222c767d1b733f2efdd4f2b0a4e8c0 SHA512 063f2ba77c746d22a1c38ff0b3bc2e69140bb75e07cc0a2999d3041ccbb7ce9a2c91b017ad338ea3a56b8418a58d905b980b05988d88ca38163de728a801e526
-EBUILD httpcore-0.13.6.ebuild 2307 BLAKE2B b2e612777e3a11c486cb89d2da96c718c1d5c2a3b56e8645ca822bfe543cf85f4d6bab4cd25a94bcae0875875e937cd4c7dcc3771712395c8107274e2b7af62e SHA512 63db67965b10ec08875d2218a12eef5f4a6e7e93120a75716154b5d9954b78145ee3371aace13018fd9b26e19de4fc0e9c7172779d36e9535e57961bc3b6febe
+EBUILD httpcore-0.13.6.ebuild 2306 BLAKE2B ca2a91a05d472539091d042ec9ad6d4b8730d363c804d38ea36cfb129183dacb2939de197047dd41af9ca7724fccf85066c8363e9af7b8abf00ad7dc3135f9e3 SHA512 fd9d98e8e29ebf86c4d5ed823779d8e1579933ce71b4f3ce3255b1d50df5f4f348a4c9fd066913e560e8b0495fe24b5c91a16f5bb999c21a9299882ddfcc4f66
 EBUILD httpcore-0.13.7.ebuild 2308 BLAKE2B 624dcd9e8dc5ae5a81aea176cd82e4a2b4e0508faf4e0c23af033a7251d15d221573344c756b5a6c363713feffd0aee3efc815a33bd6cfc2cf9e9f219ec7bf23 SHA512 b65207499eba9b2e95f90d5c23ea7bede060d84c9be04b9fd3475ac96d6f642169d4b78ebba9f726df15b79dd8748be1f285ef0cd3eb2e145a4429f2597077b2
 MISC metadata.xml 454 BLAKE2B f8a48d9ab81e5f74623dd0c8490e5de5cc711fda7f4614932e7ac6caa80bd23436037ddf9327d6bddc3d39c8b601b4ee74a85c0a10bacb20514cbf8278e34d1f SHA512 af962141bd55f51b27e0d4b61bcf7d5426e816df4f8c65be257d8fddd597664afe04e78ebe7e11caaebf06ae4fe17b88f568dc440403865ba6b8e3b47d796aa6
diff --git a/dev-python/httpcore/httpcore-0.12.3.ebuild b/dev-python/httpcore/httpcore-0.12.3.ebuild
deleted file mode 100644
index 9d5010440b81..000000000000
--- a/dev-python/httpcore/httpcore-0.12.3.ebuild
+++ /dev/null
@@ -1,64 +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 distutils-r1
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-python/h11-0*[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# anyio and trio are not in the tree
-	sed -i 's/^@pytest.mark.\(anyio\|trio\)/@pytest.mark.skip/' \
-		tests/async_tests/test_*.py || die
-	sed -i '/^import trio/d' tests/utils.py || die
-	# pproxy is not in the tree, the associated fixture
-	# must be disabled to prevent errors during test setup
-	sed -i 's/def proxy_server().*/&\n    pytest.skip()/' \
-		tests/conftest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local skipped_tests=(
-	# Require Internet access or hypercorn (not in the tree)
-		tests/test_threadsafety.py::test_threadsafe_basic
-		tests/sync_tests/test_interfaces.py::test_http_request
-		tests/sync_tests/test_interfaces.py::test_https_request
-		tests/sync_tests/test_interfaces.py::test_http2_request
-		tests/sync_tests/test_interfaces.py::test_closing_http_request
-		tests/sync_tests/test_interfaces.py::test_connection_pool_get_connection_info
-		tests/sync_tests/test_interfaces.py::test_max_keepalive_connections_handled_correctly
-		tests/sync_tests/test_interfaces.py::test_explicit_backend_name
-		tests/sync_tests/test_interfaces.py::test_connection_timeout_tcp
-		tests/sync_tests/test_interfaces.py::test_broken_socket_detection_many_open_files
-		tests/sync_tests/test_retries.py::test_no_retries
-		tests/sync_tests/test_retries.py::test_retries_exceeded
-		tests/sync_tests/test_retries.py::test_retries_enabled
-		# Require hypercorn
-		tests/sync_tests/test_interfaces.py::test_connection_timeout_uds
-	)
-	pytest -vv ${skipped_tests[@]/#/--deselect } \
-		|| die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/httpcore/httpcore-0.13.0.ebuild b/dev-python/httpcore/httpcore-0.13.0.ebuild
deleted file mode 100644
index 65db85718369..000000000000
--- a/dev-python/httpcore/httpcore-0.13.0.ebuild
+++ /dev/null
@@ -1,63 +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 distutils-r1
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-python/h11-0*[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# anyio and trio are not in the tree
-	sed -i 's/^@pytest.mark.\(anyio\|trio\)/@pytest.mark.skip/' \
-		tests/async_tests/test_*.py || die
-	sed -i '/^import trio/d' tests/utils.py || die
-	# pproxy is not in the tree, the associated fixture
-	# must be disabled to prevent errors during test setup
-	sed -i 's/def proxy_server().*/&\n    pytest.skip()/' \
-		tests/conftest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local skipped_tests=(
-		# Require Internet access or hypercorn (not in the tree)
-		tests/test_threadsafety.py::test_threadsafe_basic
-		tests/sync_tests/test_interfaces.py::test_http_request
-		tests/sync_tests/test_interfaces.py::test_https_request
-		tests/sync_tests/test_interfaces.py::test_http2_request
-		tests/sync_tests/test_interfaces.py::test_closing_http_request
-		tests/sync_tests/test_interfaces.py::test_connection_pool_get_connection_info
-		tests/sync_tests/test_interfaces.py::test_max_keepalive_connections_handled_correctly
-		tests/sync_tests/test_interfaces.py::test_explicit_backend_name
-		tests/sync_tests/test_interfaces.py::test_connection_timeout_tcp
-		tests/sync_tests/test_interfaces.py::test_broken_socket_detection_many_open_files
-		tests/sync_tests/test_retries.py::test_no_retries
-		tests/sync_tests/test_retries.py::test_retries_exceeded
-		tests/sync_tests/test_retries.py::test_retries_enabled
-		# Require hypercorn
-		tests/sync_tests/test_interfaces.py::test_connection_timeout_uds
-	)
-	epytest ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/httpcore/httpcore-0.13.1.ebuild b/dev-python/httpcore/httpcore-0.13.1.ebuild
deleted file mode 100644
index 65db85718369..000000000000
--- a/dev-python/httpcore/httpcore-0.13.1.ebuild
+++ /dev/null
@@ -1,63 +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 distutils-r1
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-python/h11-0*[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# anyio and trio are not in the tree
-	sed -i 's/^@pytest.mark.\(anyio\|trio\)/@pytest.mark.skip/' \
-		tests/async_tests/test_*.py || die
-	sed -i '/^import trio/d' tests/utils.py || die
-	# pproxy is not in the tree, the associated fixture
-	# must be disabled to prevent errors during test setup
-	sed -i 's/def proxy_server().*/&\n    pytest.skip()/' \
-		tests/conftest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local skipped_tests=(
-		# Require Internet access or hypercorn (not in the tree)
-		tests/test_threadsafety.py::test_threadsafe_basic
-		tests/sync_tests/test_interfaces.py::test_http_request
-		tests/sync_tests/test_interfaces.py::test_https_request
-		tests/sync_tests/test_interfaces.py::test_http2_request
-		tests/sync_tests/test_interfaces.py::test_closing_http_request
-		tests/sync_tests/test_interfaces.py::test_connection_pool_get_connection_info
-		tests/sync_tests/test_interfaces.py::test_max_keepalive_connections_handled_correctly
-		tests/sync_tests/test_interfaces.py::test_explicit_backend_name
-		tests/sync_tests/test_interfaces.py::test_connection_timeout_tcp
-		tests/sync_tests/test_interfaces.py::test_broken_socket_detection_many_open_files
-		tests/sync_tests/test_retries.py::test_no_retries
-		tests/sync_tests/test_retries.py::test_retries_exceeded
-		tests/sync_tests/test_retries.py::test_retries_enabled
-		# Require hypercorn
-		tests/sync_tests/test_interfaces.py::test_connection_timeout_uds
-	)
-	epytest ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/httpcore/httpcore-0.13.2.ebuild b/dev-python/httpcore/httpcore-0.13.2.ebuild
deleted file mode 100644
index 65db85718369..000000000000
--- a/dev-python/httpcore/httpcore-0.13.2.ebuild
+++ /dev/null
@@ -1,63 +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 distutils-r1
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-python/h11-0*[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# anyio and trio are not in the tree
-	sed -i 's/^@pytest.mark.\(anyio\|trio\)/@pytest.mark.skip/' \
-		tests/async_tests/test_*.py || die
-	sed -i '/^import trio/d' tests/utils.py || die
-	# pproxy is not in the tree, the associated fixture
-	# must be disabled to prevent errors during test setup
-	sed -i 's/def proxy_server().*/&\n    pytest.skip()/' \
-		tests/conftest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local skipped_tests=(
-		# Require Internet access or hypercorn (not in the tree)
-		tests/test_threadsafety.py::test_threadsafe_basic
-		tests/sync_tests/test_interfaces.py::test_http_request
-		tests/sync_tests/test_interfaces.py::test_https_request
-		tests/sync_tests/test_interfaces.py::test_http2_request
-		tests/sync_tests/test_interfaces.py::test_closing_http_request
-		tests/sync_tests/test_interfaces.py::test_connection_pool_get_connection_info
-		tests/sync_tests/test_interfaces.py::test_max_keepalive_connections_handled_correctly
-		tests/sync_tests/test_interfaces.py::test_explicit_backend_name
-		tests/sync_tests/test_interfaces.py::test_connection_timeout_tcp
-		tests/sync_tests/test_interfaces.py::test_broken_socket_detection_many_open_files
-		tests/sync_tests/test_retries.py::test_no_retries
-		tests/sync_tests/test_retries.py::test_retries_exceeded
-		tests/sync_tests/test_retries.py::test_retries_enabled
-		# Require hypercorn
-		tests/sync_tests/test_interfaces.py::test_connection_timeout_uds
-	)
-	epytest ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/httpcore/httpcore-0.13.6.ebuild b/dev-python/httpcore/httpcore-0.13.6.ebuild
index bc75307b013c..b064ccfaebee 100644
--- a/dev-python/httpcore/httpcore-0.13.6.ebuild
+++ b/dev-python/httpcore/httpcore-0.13.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index 770c0b339876..138c3b12385a 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,9 +1,3 @@
 DIST humanfriendly-10.0.tar.gz 360702 BLAKE2B 6db7f2f11bafcdc087c078eae6123046610594b17899678e445baa18c25b2210cc1d84363d858ab7c57fce6d6b7a189be69dea08c1891d3f5b11ff9900c9bef9 SHA512 496700bcea1dabf003c938558bf807fabb41b71192f69622979dd9e243dda9b4b06c5ac8f65cef217df85ebadf99099dc22b50d63216791a569be11081d267d6
-DIST humanfriendly-8.2.tar.gz 358747 BLAKE2B bc5824e94ea94df6ee93ea44d273ccb856f50b69e52ae6293afaedf06c9f00c67e064f0c85edd88be9954bb258334b1b9af4ab88efc5b352f3efe8d322fc55c1 SHA512 123d8592e6613a70421740648bb8998733b118927a0bd6182af848612e46eec8e35cae95168219c9b7672bed8e18e1c4a493a80248eabe47f8a4cb1813c8b591
-DIST humanfriendly-9.1.tar.gz 359616 BLAKE2B c67ca9498ff4a0dac237c8f1c81ae88882a7ab162e2cfd663cd50a066dbcfe045424bdf4dcc1df473f5fc41f0c1b8c0f2aca9883aa21915281618ba332c579a3 SHA512 859a9ff01abe0671a23a63e73c9c09c0f92151e96ec38dd5695c75f99fa436e186835cb8a16f59b82d5216b9c427ea0abd419b470b067f8032fe984776f02a8f
-DIST humanfriendly-9.2.tar.gz 360080 BLAKE2B 39aa17315a87938468f2d6e94b0287f07864476c4179c40504126c65f7042c96113a9d60f481a6a03913ae5c8cfde2c87476e0d403c964aa65abceb0f55633f1 SHA512 2abb8d7d4dfb84d625e82f3475bea5045c32f548a45999dca97d39e5bc0cd704a9ab45e0b6b87c0d419b447680a3e71e2d9c8cb14ba19117c7ac9b2f56297f00
 EBUILD humanfriendly-10.0.ebuild 843 BLAKE2B 859b2c5a28fc7cad99077df64e66fcdd60455778f7305038502dea8ac6fb22c2d58b6b93eb42f0e759c6dba11cb42573692aad42f6e7364579f85495bf82d2ee SHA512 0c9d22a5bb5070e2a01596e53ba2191938e2d4c38f63a5eec324e36ce60f2c52b7af51760042d31d4968454f578be6b25312c89ecd15ad9391b3395c80948928
-EBUILD humanfriendly-8.2.ebuild 898 BLAKE2B 7685970c808a965f3cc87d1d457110b1eba2c6707647299195ac6b8589d4baf1e48a497ad4717b2c3209028157a68211dd413361603eef4b1c39deddff0bd320 SHA512 2c814d9819ea87316a9eb16ad020eb8db578ea715a6927a1840ed07e8b603b083fe8f09cd47637699b10298d43dc63ad9954630c5914e1e7645268ffb80793f6
-EBUILD humanfriendly-9.1.ebuild 897 BLAKE2B aa4f3a4dc7956bbf09e4e3c44e9a697a94e9f9e216440d36c780658dd729a211881dde7cd8a84b602924393605e4b7facfabf0e8e975e0b0e4092115bf8aca94 SHA512 5c68cd3fa187c9107ba02c5120a2af7d8bb8d576472ac518f2098286c4b4525310acee68113a60f4de4a439681582da3efa9bd2dbcda889bcc1aea0233ba680f
-EBUILD humanfriendly-9.2.ebuild 843 BLAKE2B d31dbc387ed7719457d8dd7291b255c563b5c16d66e11e677f9c2be34b2e6a6d65ebbb66fcab9b3e0fa234efef055d520035c168e810e7b89d745e881d278af8 SHA512 284631ad88e6469d54bc217e8ac2834cd68dd158206ce0f82d8d75f1a3c15e0cc52b53f2ba2c0cfc4ab438ce2be9b1f08ef5055158c021e7ad4d7b04c9e6d2bf
 MISC metadata.xml 407 BLAKE2B 7d2146a2514b6d9afb68e6ba104acff4a38c650f678e930242659a96028d734dba0c69deaf3cca06225a2b9324f9e4639ec5e6324a2b845468bc5e180f2ba061 SHA512 57e8f1b2de1594bd97fca291b778b92ed09a26b61f97ca7988fda2b1efff181394bbd7ae20a0a94066c7cf58da553ef4881cff2b79207577c710780b9800baaf
diff --git a/dev-python/humanfriendly/humanfriendly-8.2.ebuild b/dev-python/humanfriendly/humanfriendly-8.2.ebuild
deleted file mode 100644
index 03462a33c378..000000000000
--- a/dev-python/humanfriendly/humanfriendly-8.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.org/project/humanfriendly/
-	https://github.com/xolox/python-humanfriendly/
-	https://humanfriendly.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/coloredlogs[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_test() {
-	pytest -vv ${PN}/tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/humanfriendly/humanfriendly-9.1.ebuild b/dev-python/humanfriendly/humanfriendly-9.1.ebuild
deleted file mode 100644
index 9ba2dcee001c..000000000000
--- a/dev-python/humanfriendly/humanfriendly-9.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.org/project/humanfriendly/
-	https://github.com/xolox/python-humanfriendly/
-	https://humanfriendly.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/coloredlogs[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_test() {
-	pytest -vv ${PN}/tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/humanfriendly/humanfriendly-9.2.ebuild b/dev-python/humanfriendly/humanfriendly-9.2.ebuild
deleted file mode 100644
index 8cf6193e41dc..000000000000
--- a/dev-python/humanfriendly/humanfriendly-9.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.org/project/humanfriendly/
-	https://github.com/xolox/python-humanfriendly/
-	https://humanfriendly.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		>=dev-python/coloredlogs-15.0.1[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_test() {
-	epytest humanfriendly/tests.py
-}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 5a05a8eef6ea..31a03a360efe 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,9 +3,13 @@ DIST hypothesis-python-6.21.6.tar.gz 9166313 BLAKE2B 19ac66c1674be30e14d54faa612
 DIST hypothesis-python-6.22.0.tar.gz 9166539 BLAKE2B 386c7fd4f9ff0d4d199f686f25743793de4de9f2676cf7c36c16519f5fef007f6b677bd5ef84fa975389c5fea9989dffffc8a18923699c05fecc23ef2e4dc5e6 SHA512 92352a7ba13d8a06532c6fcdb965f156c43369f18ba7c46808d9b6dde1ccdd5b4f938c1ce575d5651835bfe981d22e7a68189c93a368420c915f5d1ce9b8a205
 DIST hypothesis-python-6.23.0.tar.gz 9166945 BLAKE2B 89d8a642262dfcbd36d83343c5e632653808711e186f5afae360e870eaacf050b415fd1abeb589b375136f273a53a236da8e4ab6227d94e16c58c8e9d0d3d8a9 SHA512 43d5f1a21d555e2a7942414cfb185e9201d9c5198c12551db7a50f3f118fed4dddc934767a0e7d880dfd044ac1a062b64afc92c5c3f391cedf71b829e177f21d
 DIST hypothesis-python-6.23.1.tar.gz 9167114 BLAKE2B 324df90b9fc09dbaf599905b503119eed22ad32898d118d08cb5a84cbb3a514d0bfea51eca0c9878f3a330702d4822c5c311e9c6e091a6baed51285d8d326c5e SHA512 2d6a10ef6b47e0bc08c90aee62a9f009c5bfe7d64bc6f87fed72232c40a43b86e0ecc744527a611f3cfec571051c4bef3986c4e1970f92526e70bf7f5e523519
+DIST hypothesis-python-6.23.2.tar.gz 9167318 BLAKE2B 0a1ccf0235c64dd69705e48f67c132021898a024e8ae035d2ffc8a416c45443931ffff4a67a13f1c1ee7bbc2201e6f4ca5363568f0ed2ea4743ae46569e45ef1 SHA512 704b8d8c15e1fd510206c8d07f6a0f0bc81249bbc036978e4864e8ce234e35bab89069b0d5a0e958c57fe31fdb63fcc454502ac633d6fd986aaea9841383f36b
+DIST hypothesis-python-6.23.3.tar.gz 9167498 BLAKE2B 04d0111d7ff5516ed25c9dc9e8c9793489b5fbf009688bf97a0c7f84ea241bcb0112eb57ba177a7bf23944e7288b0694a3db0f01b5357901b34eea86c5cf67c2 SHA512 9212076c61175960fd638b9b75b8a0f51b75969c93c6b5b2aedacadfc08860931b8f1bfad21b34ca34c0ee64609b34b3027342bbf093aa0e5c304706f081f60a
 EBUILD hypothesis-6.17.4.ebuild 1754 BLAKE2B afe7c86d0907a4c0500ff94249349431c435567753fba197261ce9bceedb03da6ecab286780b66ac4c83361528fe93ff4422c8615bbc6ef20faf289efaa3dcf6 SHA512 b3199308c4981d523366fb48c5d6bee4e1d0eeaa3e9854627cdd23b5d81d22ba4bde02b2669368a5d8bbcccdfb3941aa692c78b18524e907d70c24470e284385
 EBUILD hypothesis-6.21.6.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
 EBUILD hypothesis-6.22.0.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
 EBUILD hypothesis-6.23.0.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
 EBUILD hypothesis-6.23.1.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
+EBUILD hypothesis-6.23.2.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
+EBUILD hypothesis-6.23.3.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.23.2.ebuild b/dev-python/hypothesis/hypothesis-6.23.2.ebuild
new file mode 100644
index 000000000000..119bf66a0917
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.23.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-p no:pytest-describe \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.23.3.ebuild b/dev-python/hypothesis/hypothesis-6.23.3.ebuild
new file mode 100644
index 000000000000..119bf66a0917
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.23.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-p no:pytest-describe \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index c9ff3b683f57..863e59c00861 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,5 +1,7 @@
 DIST icalendar-4.0.7.tar.gz 78569 BLAKE2B b5d980335b1a9d8135ad9ec037e140f3ae49c3e8db6736b9e469748e3bd51c43f39fc5f9dc443de46d4d4c5856ec74bb548a8d1b47b7e52278fdc2e269be0cbe SHA512 97f7184ddc42ade2a447af5112f5bd18ea9a89ef25ea3983cc2213fefe2c59255102b7babcd49b3e04cbe435d75d2712dd57eebc1bf1c20c54aae7081ba24379
 DIST icalendar-4.0.8.tar.gz 78761 BLAKE2B b1e9aa01319eab769f5b93635e6ff019ed2cf4b7d00bf4a68b9cabe76c70fb18c64fbb8851e0f4920d53dc444fd0ba7518b84f6ca424488a89377f35c133ea12 SHA512 0cc636d7009f808d64cd3255757974d4d52b79139f79db09124ef3e7f9ce1d29eb3e007428e884a58ee3434dbbca8289a05692c593ea3cc68ae10c7c4320a9c3
+DIST icalendar-4.0.9.tar.gz 84254 BLAKE2B c1ca7a7730404f7079e8fac8270f98a60ecd4e657f2b2b3d376d620f12c11a0db6dcd5713f7d2d4935c859d544497fa544b22ffb1a83be9c11ec2ea3923da93b SHA512 2eeb69da89207fe91661dfa6e9c2a623eb3be2fb5a48e999e87a881d7fecc1f339764124601b0610a14ce809f238c6731f30f2071bb4706206de10181365d1dd
 EBUILD icalendar-4.0.7.ebuild 780 BLAKE2B 4af53a4a7097671c7c183b9c8f4ce63d0d4966d2004b1ab94e5d030d4c58430f1474d0d77bd039f59e5f19be769cebac272dd6e15ae92e500e621f5f83588fe8 SHA512 8dd4217823dd431e944f72b52cd8fc5a0037be61041fef3f59c55ba34468046260f5e77403cae3faa5eb4b5a06c746fc4fa4b9cd10b16f115e6261052acc9596
 EBUILD icalendar-4.0.8.ebuild 780 BLAKE2B 63101f89cceb95300c5d6a5b73a51140482e02a85df7942240051427fae9bec94b1aaee2214d8b97ae733a3d2261fe55a88f134aa4841397f875f90160b64a92 SHA512 360e5fc672ea4535a67d2d268716fefb0a491ae6e687ecce0c06fae61164158677335fe2e7683a865d4a830eedbb33e42b02a4f23e6f3b5da1b05dbc2d7106a0
+EBUILD icalendar-4.0.9.ebuild 780 BLAKE2B 63101f89cceb95300c5d6a5b73a51140482e02a85df7942240051427fae9bec94b1aaee2214d8b97ae733a3d2261fe55a88f134aa4841397f875f90160b64a92 SHA512 360e5fc672ea4535a67d2d268716fefb0a491ae6e687ecce0c06fae61164158677335fe2e7683a865d4a830eedbb33e42b02a4f23e6f3b5da1b05dbc2d7106a0
 MISC metadata.xml 503 BLAKE2B 284f63e95eb2d3015979a14774f8ff9df0df701b81f8aa2c7583f52d05973cfede1db8eb7904203b854165e10640cc50a0e3cf14d9aff090d9ff657c53098cee SHA512 d206db3c1255c8e475c4289c548f0224c7fc507aae513d3c15706998892ef8450400a97bd07dc7d52142a03cad4abae3595d5315d8912586440df74096edea67
diff --git a/dev-python/icalendar/icalendar-4.0.9.ebuild b/dev-python/icalendar/icalendar-4.0.9.ebuild
new file mode 100644
index 000000000000..1baac6524fe2
--- /dev/null
+++ b/dev-python/icalendar/icalendar-4.0.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
+HOMEPAGE="https://github.com/collective/icalendar"
+SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# reset conf.py to not read version from an installed instance
+	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 29e50d2676ef..3370a3a32e70 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,9 +1,7 @@
-DIST identify-2.2.13.tar.gz 101136 BLAKE2B b1835ca6b576a15be16de124554cfaf7b6dc55a1dfee70021613d35251135c295c3acf141eb645823add4c260bec9fdcde4799f0b72fbd57bc7a2e8659e416bd SHA512 37764325268c164028b7719f91571c006c9c6db3f4bba5a93d20f3d9ea30712cfe7e5710b175266a3d74f3f85485f16ebf7d21486d4329050b55e5835e8b4197
 DIST identify-2.2.14.tar.gz 101144 BLAKE2B 9a23595173ab2ebfcbbcfc503e9750ef1e9c0c068e9d1a1b2f47dd2e08787f734541a79ae65b4a72a7de076b8f7ab4f877f3bb049560f33b38698729b9d5f3ab SHA512 9dc27e745f30fc1e6ee5135cdb82de004a5c60f17c47ab3e1deffe1c3c04adc47211bde161216be202db2171711a7dfea5f0ba60a56fea0cbc75ec6d55c6203f
 DIST identify-2.2.15.tar.gz 101146 BLAKE2B 1855598314c191a9e4d2f73c2c7a424957a76177df1daf32b4c7de6ddbda4439fac0860ed105e4a2ca4aef0555843157499e9840cbbccf42cf728aef93b13607 SHA512 5b85c07603381174fb4265ad8fc411645dc0cecb68b3fc9b2afa7111f18eae7cf39d5cf1000eda8ded256f441a4bf05d9ded11f31c9aa80f55efaf2dc6745697
 DIST identify-2.3.0.tar.gz 101179 BLAKE2B d51911a69a9845d136c0b5ce50a3ed94c50d80d6d8c89a2c823f1a85cafef373dab68716c5b38907bc920ca5f4d67ef969d598539e59e32bc2c36a0427d37765 SHA512 356e3c983273a771c06863a63fb53bdca9e3df3a50382f47da0d5ef7cee1b83d9279eb0d1e6c28409b2550f6e16eb793901147983582d792cdd39bb4d4c6e9f1
-EBUILD identify-2.2.13.ebuild 522 BLAKE2B 8de988dc140b50cfcd1785f6f44c56aa850f442f96b2461c7379d211c26c266ac81eec594634ce9ec21c034f437d0c7aca68e54849fb311030d0d5d77fddb8aa SHA512 a6cb99f66cae025edc98afffb8158145597943415210704ea7638275a331b448bc0018e6f2ff1d0598acb50da1a33edfd617381801f6cbbcc9d186103cd3fb42
-EBUILD identify-2.2.14.ebuild 523 BLAKE2B 5d84c4a34fa413d2d8b0949d1565442c7e0bbf48dea7d088c23a8e2ef9cac449704115b293a114da1f25e48a4553f81336c28429e18e1e96be12e36f9f9a35b1 SHA512 0bdae8084a8bf3678f911e35fcaa620faa75f366bff3e9b04dc119f9ead31984deaa56dd866e426268a613dc56eac88e066b928539203b1e3375e24ab31ce57b
+EBUILD identify-2.2.14.ebuild 522 BLAKE2B 8de988dc140b50cfcd1785f6f44c56aa850f442f96b2461c7379d211c26c266ac81eec594634ce9ec21c034f437d0c7aca68e54849fb311030d0d5d77fddb8aa SHA512 a6cb99f66cae025edc98afffb8158145597943415210704ea7638275a331b448bc0018e6f2ff1d0598acb50da1a33edfd617381801f6cbbcc9d186103cd3fb42
 EBUILD identify-2.2.15.ebuild 523 BLAKE2B 5d84c4a34fa413d2d8b0949d1565442c7e0bbf48dea7d088c23a8e2ef9cac449704115b293a114da1f25e48a4553f81336c28429e18e1e96be12e36f9f9a35b1 SHA512 0bdae8084a8bf3678f911e35fcaa620faa75f366bff3e9b04dc119f9ead31984deaa56dd866e426268a613dc56eac88e066b928539203b1e3375e24ab31ce57b
 EBUILD identify-2.3.0.ebuild 523 BLAKE2B 5d84c4a34fa413d2d8b0949d1565442c7e0bbf48dea7d088c23a8e2ef9cac449704115b293a114da1f25e48a4553f81336c28429e18e1e96be12e36f9f9a35b1 SHA512 0bdae8084a8bf3678f911e35fcaa620faa75f366bff3e9b04dc119f9ead31984deaa56dd866e426268a613dc56eac88e066b928539203b1e3375e24ab31ce57b
 MISC metadata.xml 477 BLAKE2B 068a0df0204ecc3f2ad9729c0a6b66b0895f94a08852453c4dcafeb784068857a4baaef55eaf0d9b742d4bfad98a2734b11f8647b52182b7ffaaa04656d8e457 SHA512 79798b3778c546a0105fa02b2cb0b682577ed630bfa7a5ff70a188441f6f847a59cf9179eb6284e7159127b180c990ed6265fdd88e78cecd00fff9a8a7461518
diff --git a/dev-python/identify/identify-2.2.13.ebuild b/dev-python/identify/identify-2.2.13.ebuild
deleted file mode 100644
index 0310f5673f98..000000000000
--- a/dev-python/identify/identify-2.2.13.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="File identification library for Python"
-HOMEPAGE="https://github.com/pre-commit/identify"
-SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.2.14.ebuild b/dev-python/identify/identify-2.2.14.ebuild
index c3b147be85a7..0310f5673f98 100644
--- a/dev-python/identify/identify-2.2.14.ebuild
+++ b/dev-python/identify/identify-2.2.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index 502b0669a8c6..e77be39bdcca 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,3 +1,5 @@
 DIST idna-3.2.tar.gz 243962 BLAKE2B c1c53533fd70a705822abf7debcb98d1cdc474df63eea22f0502585f9f2d143c4a35e575081951a8b98325e45ae5af46bba6632b04d40cb7181306e293377884 SHA512 2bc8e37abdc0570e5e13c9064f51630605806c3246a8d292511dad6f971610288212a2d881f9356ecb383f871e1477ccd60c4a5d6d7fd05254ff740d36543f35
+DIST idna-3.3.tar.gz 286689 BLAKE2B b804759b23157ff3d81fcd37f04baf83d7e522e98e8d842e3f228a242bbd9b1f9302ca28b8989a4221512bbbe92839cd593641830a0c6b2e12061b3501b1bd45 SHA512 70b7cc8718e7d7899c75cfe476f044eae5a2fa03801fc9c12e3a092627ca943ffc4a578f9b8a55e181a11564835e125cfaaa577c02a6461dbb97366e620e53ad
 EBUILD idna-3.2.ebuild 689 BLAKE2B 5f8b306b2d41db4181e2ba0c1020faf8ec723e09616fd5ce9612f4d62f72d1410c7861df6f7065bb3728c55921a9b3a8df6010c57d86d28c31ba40fab9a4e31e SHA512 9c2e0760bb7657ff8fbf397965db3fc27df828f17b4ba734a889758c22bb51c12a731b49a47fa58500b176ae2a6bee4d6cb39e9f8d375d506b58283da94c8144
+EBUILD idna-3.3.ebuild 697 BLAKE2B 561bdeffe19669aa2ff8c2e6886789c06034839bfe458dfc226d21422cb5954fad98e2b376b88d10bd977fb0f545b9dc872e67e97ff2483704345e850315c527 SHA512 a7b368639bb79fd3d119c48f764aef1810530ab292741de4393b246eb5f01fb95a0083f3b78c6b21369126260b55679afef8bafa9dc8bf6eebe0f036c8861df2
 MISC metadata.xml 393 BLAKE2B b3d4476896bbd50dbf61021bb6ffd653b72ca62b58c034aeba5119189fce3ee331cd44aa95ef8e680a4ef5f82206cf8b0ca1b902d73b56931b509c10c2a18685 SHA512 bf8a9a9b4e0a7cb67b6d541291e5de201a8ba9e32addcc6be0b60fd2035485775a7862f0def6bca3ec0e24155170fbeb08f3d24f9c517fbb9bd2223d25904a3a
diff --git a/dev-python/idna/idna-3.3.ebuild b/dev-python/idna/idna-3.3.ebuild
new file mode 100644
index 000000000000..781010a1afb9
--- /dev/null
+++ b/dev-python/idna/idna-3.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
+HOMEPAGE="https://github.com/kjd/idna https://pypi.org/project/idna/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+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"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 8e8f5bd678fe..281e5a900ba3 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,5 +1,3 @@
-DIST imageio-2.6.1.tar.gz 302911 BLAKE2B b0ed781b9edcbb93af664ea4e815cf90e56ab2b31abdda88dcd142558efa1c43afb89886f6b3a372fddcd200df802e45c7278fe13067bfeebf119471f573e668 SHA512 e4a4510a9fd0823914a9f511011cb9c191bea1cd78b2c2bba5d559fcdc89c55cd1dbb03a81eaf82c460ebb86cde518f44ff02766a9935d4f463e81a52007fe25
 DIST imageio-2.9.0.gh.tar.gz 298291 BLAKE2B b36b0a5bf74938177353ffce103d7479a2b15442623d400261dac485b5cc7e8743b18e92d938fcfe2b68dfdef1d1417308e5441112ff851481cc768b76ab56d0 SHA512 a325ad4f0913219b87418d4f57fddc3f1e4c1be4102e933aa0c236317044d2a5ded623bbe86b92d3f2004bb9386ccb3f0cc03b7b118f9faa6f320dd147157ed6
-EBUILD imageio-2.6.1.ebuild 523 BLAKE2B eab51a9149b1f48b4518639a59761e9d8289217ff6d3afbc85994e7c965705d3c9c3d1fbeb008d44a4ba1b07ffd95e0bbb3c02c01f9198c876b7e1ec6c2b0168 SHA512 9cad77951c91476a68525aeb8bd78da8c7587e8472438cc84fb28dfb8e6d11c5096485464d789b1c870c966a048e0ec7065210c7191b468b3c02a898a25368e5
 EBUILD imageio-2.9.0.ebuild 840 BLAKE2B 1555c7c7729f5963c3f7e021e965d9d811a360d103088733a0b73debb3290e67c8b1322ab414f3f94679aa2cdfb298c1e9f1351dfd00339de9c4c8e4c676812d SHA512 eca91e14c0201a90290b22ce413651c5572e84c4482e388c572691815d5776b7a6903f7ed6fe5215793fa128c11715d3cee98afa60bb2b253f48a56563927e44
 MISC metadata.xml 858 BLAKE2B 2feed77fc77fc6be127298bee47106f5fb65d9a392a05c61c8255b3e0994fa95658bf72222173a3b4447e8e802e6027989ddc3b475f8c84a998fe8c86ffc30f9 SHA512 f503c9ab1b17123c455f3f0d576b2e337a827acc9bb8d0c9f265bb022c68101dcb807c7bcbe8be86f790fca544910930388845e382e0398ac1f6a3c09d2ddb71
diff --git a/dev-python/imageio/imageio-2.6.1.ebuild b/dev-python/imageio/imageio-2.6.1.ebuild
deleted file mode 100644
index eb6898f02595..000000000000
--- a/dev-python/imageio/imageio-2.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="https://imageio.github.io/"
-SRC_URI="https://github.com/imageio/imageio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index 96e9a78bbf4a..ddd98ebaf605 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -1,9 +1,3 @@
-DIST iminuit-2.7.0.tar.gz 384016 BLAKE2B 857df47e8f4779c41b32e624ce3c5dfe16f39f57441f1f32367c9170bfe6f74fb84eb67a54b773690ce5fdde762d3383adbaf97e81d917a17e2995b9e69623be SHA512 c4f5ba80024e87e57087175b012d043df65079e5b8f0376ff7254ebb256ca845460b3c330043aacd960092178ce8fd4d8bd3cccd93ebe3515f7a9896b756c629
-DIST iminuit-2.8.0.tar.gz 389147 BLAKE2B f54de6fb39d942c39438e82cb38f04974f0e565d31c3bb06ac39f73a28b82207f7590d9039e491c8dc44286e4311ee3f6f0114be94754104e0d0a06af5fa8acd SHA512 89655a5c925d6f02cde3c8a3139a0c93e9a667a6e0a34ec1f99d5b0f91c79671f2b325553359daeed91437d474e31354088b66a58e53e8235dcbbb4bf6da4935
-DIST iminuit-2.8.2.tar.gz 389847 BLAKE2B 0d30e2f3a933c446e985d205b4a5d4289856ff48743486cdaddfd6c655dbbe833a0d0a6aca10ee2d747d51a18f8b20c3e1cdc4cf87717321a2cc9f87726f98d8 SHA512 02a3d3e436bc78840ff48af425449cf8467265d9f95c1a9bdaced664e3f167bb29876d1b3717b1e0fca656dd4108f1526d0be846a6ec0cdfb9f1d7243ccb283b
-DIST iminuit-2.8.3.tar.gz 390386 BLAKE2B bf5d67c92722c5623b9cf19547d934f1c53c5aeae88ef3e4d9d9c9fac00c99a3969e29a2e00d1cf2ada35cac4373b15d6f7831a217e91068b307d2c256854949 SHA512 201844da1cc3c9eb5c06a851f5040370ec57d86ec7e47d531cd49595142d2c5788468f76da4de1ac73ca6691bbddef8c0f23444aa9036a9309c80c1e9d218190
-EBUILD iminuit-2.7.0.ebuild 732 BLAKE2B 0521741646c2a79d9610b8c4426e56774b281946bfe91c012b433467f4b12190360fba7861a96c0043ed6a7e0a6bb39a68e0f326f9576e2a52572ab9ecf65a26 SHA512 72e7506d58939e30f6a87cb0e1de1d9afbb60df03b9497932796fe8cf30aa023728283bf279fc7e217b90096f3372e6516586c761f3c19500a22cb0e8ab844ce
-EBUILD iminuit-2.8.0.ebuild 732 BLAKE2B 0521741646c2a79d9610b8c4426e56774b281946bfe91c012b433467f4b12190360fba7861a96c0043ed6a7e0a6bb39a68e0f326f9576e2a52572ab9ecf65a26 SHA512 72e7506d58939e30f6a87cb0e1de1d9afbb60df03b9497932796fe8cf30aa023728283bf279fc7e217b90096f3372e6516586c761f3c19500a22cb0e8ab844ce
-EBUILD iminuit-2.8.2.ebuild 769 BLAKE2B a8c3a2a6d1f50190946a8e490279d152d95ac04c4f2eeb87b5062095eebf02e80c18db279b09d3e1d9d1958c1337f63210c3aeed668732b8de367d499a150a41 SHA512 5435788b769d0fc617890ef2354b217a844271b585591b05622fe85e174fe07e6b64a77e99d5a5d876cf56d140f7113cdb351ff206d759195e848a54ee80534a
-EBUILD iminuit-2.8.3.ebuild 791 BLAKE2B 8f62074517fdf3c8a6db059d43351763b15cee8ef6dc17ea934f8c20540d2dbaa5eeae27d3288a0a4a1e908447b6bfaf0db7fd0b92d80f850681f3953b1b3a8a SHA512 d20369173c72bfe9b2f4038355819ee610e0a70b8918dd17a712b5759e3630230fd11d15c00fec6ff5ea53a7ba149bdc6edf9d67795eeecd579e2792ad7b867c
+DIST iminuit-2.8.4.tar.gz 391667 BLAKE2B 15d82db308ac361f45399debb342ba350c6ec83e111fca16baed99dc029010284b946292f4236e26ae5cdd60f7a130902bca53669b31e335d706ead77f6603db SHA512 564506921027d6addffb9df6f2ad2aec69981af49e2552f4d093d03fbf79f12a72e6dec58f159810d621a58ddd56dbf1258359d01d56d33a7c30b08eb5b333ed
+EBUILD iminuit-2.8.4.ebuild 791 BLAKE2B 8f62074517fdf3c8a6db059d43351763b15cee8ef6dc17ea934f8c20540d2dbaa5eeae27d3288a0a4a1e908447b6bfaf0db7fd0b92d80f850681f3953b1b3a8a SHA512 d20369173c72bfe9b2f4038355819ee610e0a70b8918dd17a712b5759e3630230fd11d15c00fec6ff5ea53a7ba149bdc6edf9d67795eeecd579e2792ad7b867c
 MISC metadata.xml 494 BLAKE2B c97d7fad530773c29b5e723843f13c8305aa1f011e678ad4e9625181ca633c1dfaa3847cb7b3aa09433b6ce665cbf4eb39fde7f80ead402292bc75bb8442beba SHA512 04413a2cbdc7f6843f89560a519ccdb00bcfcf0c9254e9fff7a8901ed992cd7121ba052191399fd60f76f35e495f84c2297acd0a9a1898d4fbcadb7a60841d99
diff --git a/dev-python/iminuit/iminuit-2.7.0.ebuild b/dev-python/iminuit/iminuit-2.7.0.ebuild
deleted file mode 100644
index 10e6b9207df9..000000000000
--- a/dev-python/iminuit/iminuit-2.7.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-# forced implicitly
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake distutils-r1 virtualx
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="https://github.com/scikit-hep/iminuit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	virtx epytest
-}
diff --git a/dev-python/iminuit/iminuit-2.8.0.ebuild b/dev-python/iminuit/iminuit-2.8.0.ebuild
deleted file mode 100644
index 10e6b9207df9..000000000000
--- a/dev-python/iminuit/iminuit-2.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-# forced implicitly
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake distutils-r1 virtualx
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="https://github.com/scikit-hep/iminuit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	virtx epytest
-}
diff --git a/dev-python/iminuit/iminuit-2.8.2.ebuild b/dev-python/iminuit/iminuit-2.8.2.ebuild
deleted file mode 100644
index 82c92fced6c3..000000000000
--- a/dev-python/iminuit/iminuit-2.8.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-# forced implicitly
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake distutils-r1 virtualx
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="https://github.com/scikit-hep/iminuit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	virtx epytest
-}
diff --git a/dev-python/iminuit/iminuit-2.8.3.ebuild b/dev-python/iminuit/iminuit-2.8.4.ebuild
index cb742073fae3..cb742073fae3 100644
--- a/dev-python/iminuit/iminuit-2.8.3.ebuild
+++ b/dev-python/iminuit/iminuit-2.8.4.ebuild
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index b19e1abaae6f..4c740feb997a 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,7 +1,3 @@
-AUX immutables-0.15-32bit-hash.patch 2439 BLAKE2B 353f5452dbff85a3b08786174a69068b0a9081ddbc8f88ba03b8c73ba5ab753c2e463cb9ab3af3d61604c23f3b58fe9226efda8119cd1420d3b27871ceb8f1e7 SHA512 add8e68ce6be057889a075c2ba1e58e522ade9e49513118e5e2acfd688b2f1ca20634aee546c0ed5e92181d5c777af4cf312368510c65f8267a465bc90a063b2
-DIST immutables-0.15.tar.gz 81297 BLAKE2B cb58142c3b833d529046f09a468b3e3964e3d36e4eaf0825f88b920e6795cd042e2fc837ea6d72000bbc9cbc2fd1de911e08b4f6d189e692748b49e848dfb3fb SHA512 cd0ee20f6d6218eaf13499e40971b6750009ff01a1aefcb7dd45c77ae841296b9d9184013e6e7fe5bdef93587f85cdb8ff459af29424a0077538666260572b8e
 DIST immutables-0.16.tar.gz 84916 BLAKE2B e699aaa1135fa9f7db9589276dc0801a67c5f98bd3c5b247913d8263f9baf02a8772d7715cc3eb2c9392694d48d3808d50f45e9fe8e66c4d507586d0e3fdc319 SHA512 5b883cfe43f8a042b617e719dccd3cbdded3b1d1df160ba26b6bb2f0816a7171698bdd2ba3d450e76f135b236e777052a22c09b8bd1a9183227f1ccc90617cf8
-EBUILD immutables-0.15-r1.ebuild 627 BLAKE2B 6c92546290668c7e174b01d59c9c5519b0661cb80a925e534988a83c2447fc819e0c8bd7fc94e0ec9b1c144d7326b95c50a487bc6bd826fdea3c4b4c84518da9 SHA512 e2b4e3df9e5546c9591ee15ab2eaa21d75d88b9b2e9c17e8f3896c225a5843139d92baa55e44f60bc99c761a22aae680a843601c4e987cb2fa4cf6b0895ada3b
-EBUILD immutables-0.15.ebuild 487 BLAKE2B 6eb8f45620525e4dd42aea5ae122f9c60e4a1ed5c7585967a7866a71d79fde296565b6e6aa7654f7ca6cc1121cc9ad0ae21a96899c80fa7d3ca2b0c9bef29902 SHA512 1b5e71a31832081a6d6537c8e3084ad29e3492cb2b9042000d6ca488a93a4357bd62c1bf7d4b3023786508604d3750c09cfe54148c0663869e5f607297748a22
 EBUILD immutables-0.16.ebuild 799 BLAKE2B 1fba989be6ce9b41b288ced7287bd46ce84877ba6b2831cc466b9ef927e6838af7bbd7c61cd598b639b26fde016bad2e38ca880dad00214d56939ce9002c6657 SHA512 3a23a6cb325515388f4bc41a0118590c64343fa5544a7d95dd5b3befb1a209a75b12210e2375f39f236fca62e8afad4f945d70dd3e9e87efc69d132a6320f591
 MISC metadata.xml 353 BLAKE2B 5ba3a63b6d65aa989535ec78a5e097fb15e6bcb392e846471fb01efd4a4b546a3ba861cc3829d13e71f1f5c31b582a99e1f5e4adf6b60c2b6fb17bdfb9265c99 SHA512 ede81f3aec8f6ee374c8d39d60f4193cfb701f2561858f2ddfadbe68d531849cec13fb8c13cc671e14d8ab1f18b08759d030c562cc496f959517c6ce67ac9781
diff --git a/dev-python/immutables/files/immutables-0.15-32bit-hash.patch b/dev-python/immutables/files/immutables-0.15-32bit-hash.patch
deleted file mode 100644
index 234dfa028c08..000000000000
--- a/dev-python/immutables/files/immutables-0.15-32bit-hash.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From fa355239e70411179c70b16ed4ff7113d8008dad Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@edgedb.com>
-Date: Wed, 4 Aug 2021 19:25:44 -0700
-Subject: [PATCH] Fix test_none_collisions on 32-bit systems (#69)
-
-There are two issues at play here:
-
-1. Python version of `map_hash` unnecessarily performs hash truncation
-   even if the hash is already 32-bit wide, which potentially converts
-   it from signed int to unsigned long.
-
-2. The `test_none_collisions` test generates a collision node with
-   hash greater than 2^32.
-
-Both of these are problematic on 32-bit systems, where `sizeof(Py_hash_t)`
-is 4, and so anything that doesn't fit into `Py_hash_t` gets bit-mangled,
-breaking the `hash(x) != x` invariance that the test relies upon.
-
-Fixes: #53
-Fixes: #50
----
- .github/workflows/tests.yml | 10 +++++++++-
- immutables/map.py           |  5 ++++-
- tests/test_none_keys.py     | 14 +++++++++-----
- 3 files changed, 22 insertions(+), 7 deletions(-)
-
-diff --git a/immutables/map.py b/immutables/map.py
-index 2c1ffa91..0ad28588 100644
---- a/immutables/map.py
-+++ b/immutables/map.py
-@@ -19,7 +19,10 @@
- 
- def map_hash(o):
-     x = hash(o)
--    return (x & 0xffffffff) ^ ((x >> 32) & 0xffffffff)
-+    if sys.hash_info.width > 32:
-+        return (x & 0xffffffff) ^ ((x >> 32) & 0xffffffff)
-+    else:
-+        return x
- 
- 
- def map_mask(hash, shift):
-diff --git a/tests/test_none_keys.py b/tests/test_none_keys.py
-index 8c0bb379..26d4220b 100644
---- a/tests/test_none_keys.py
-+++ b/tests/test_none_keys.py
-@@ -1,3 +1,4 @@
-+import ctypes
- import unittest
- 
- from immutables.map import map_hash, map_mask, Map as PyMap
-@@ -6,16 +7,19 @@
- 
- none_hash = map_hash(None)
- assert(none_hash != 1)
--assert((none_hash >> 32) == 0)
-+assert(none_hash.bit_length() <= 32)
- 
--not_collision = 0xffffffff & (~none_hash)
-+none_hash_u = ctypes.c_size_t(none_hash).value
-+not_collision = 0xffffffff & (~none_hash_u)
- 
- mask = 0x7ffffffff
--none_collisions = [none_hash & (mask >> shift)
-+none_collisions = [none_hash_u & (mask >> shift)
-                    for shift in reversed(range(0, 32, 5))]
- assert(len(none_collisions) == 7)
--none_collisions = [h | (not_collision & (mask << shift))
--                   for shift, h in zip(range(5, 37, 5), none_collisions)]
-+none_collisions = [
-+    ctypes.c_ssize_t(h | (not_collision & (mask << shift))).value
-+    for shift, h in zip(range(5, 37, 5), none_collisions)
-+]
- 
- 
- class NoneCollision(HashKey):
diff --git a/dev-python/immutables/immutables-0.15-r1.ebuild b/dev-python/immutables/immutables-0.15-r1.ebuild
deleted file mode 100644
index 25e5896535f7..000000000000
--- a/dev-python/immutables/immutables-0.15-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A high-performance immutable mapping type for Python"
-HOMEPAGE="https://github.com/MagicStack/immutables"
-SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-
-PATCHES=(
-	# https://github.com/MagicStack/immutables/commit/fa355239e70411179c70b16ed4ff7113d8008dad
-	"${FILESDIR}"/${P}-32bit-hash.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/immutables/immutables-0.15.ebuild b/dev-python/immutables/immutables-0.15.ebuild
deleted file mode 100644
index 2b0a05431a20..000000000000
--- a/dev-python/immutables/immutables-0.15.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A high-performance immutable mapping type for Python"
-HOMEPAGE="https://github.com/MagicStack/immutables"
-SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 1cefe6dcedf1..9c1255b7683d 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,3 +1,7 @@
 DIST importlib_resources-5.2.2.tar.gz 29651 BLAKE2B dde545a3f104c799432d7a2b6dbea6f071b82d0b6e3660384e2e0ab3c36eee8942b9f248a6139c708020c617bf0e0dce7fbbd5e06cb0bd192a0296fac6350b51 SHA512 7af9aceece4dd25ad827310fde100a4b0b5e0aee03dfeba8789db060e4decafc543784046c2e9eee95d8cab61845c50e4bb0543bb20ae7e1e480aaa80c88fa27
+DIST importlib_resources-5.2.3.tar.gz 30055 BLAKE2B 72d4ff3d5ac974e68063673af980d70644477e4cf7e1c56b0a8b4a69009abbb112867d6527310c2ec37b1a51e343283f8ee153728a1e94654cea7181d0b4f2df SHA512 97c4f99c184d82d198e75240bd262c18ec0496e07e8eeec2451da8c427500859a1b6677ab044d2e36e87f0c4da439757e13d00f8aa9955db17111487594852b6
+DIST importlib_resources-5.3.0.tar.gz 30784 BLAKE2B 876d9bdc1360eecc973f53d6d3397db5708dda1b0f30e5a10d372535f0831cc0fcdcc0b361412df8a1f4453f27315e6547096e14ec7bdbcd1d1af41778d5dd39 SHA512 ad5a0d5b72e8e49a158254d7146411a86bacda3d9019867bad92e8209dd924ae0928dfe46b574967975622d0809d4e1693dab4b6bf8d78867b09cac8c424072c
 EBUILD importlib_resources-5.2.2.ebuild 815 BLAKE2B f0f037c3fa00210fe040e0e56e6a8acef484668462c04efca30c5294c001ebb024d3991834fd906b270248e8f0d838f3ac9b1603691b94d8f33fed9e5a1d7f5f SHA512 e0719c05e422fce67c1d7194719fb3b6f24a0d86aa64d759016019eb17517bec0768f182100fdbc519e43a351e41cb85494d2ed3ba47985fcbff1f3701f86e5c
+EBUILD importlib_resources-5.2.3.ebuild 823 BLAKE2B cb588b06d1ec26e6820539b5270b94908a56391b3f3a0b90ba08a2fcfc649cac67c464e2d780c41230c2ef0a883b25e064abac8f2684dc397ec36039ffaf5343 SHA512 491a6f4960b9e844bc7bed6ed14d61874f3bed3851a80be06fdd97aecf92f6c72c5c42bdcda4c30ef2f40d9b46827d60ccadd6daafd5eb3f4661a9b30b4ccf0b
+EBUILD importlib_resources-5.3.0.ebuild 823 BLAKE2B cb588b06d1ec26e6820539b5270b94908a56391b3f3a0b90ba08a2fcfc649cac67c464e2d780c41230c2ef0a883b25e064abac8f2684dc397ec36039ffaf5343 SHA512 491a6f4960b9e844bc7bed6ed14d61874f3bed3851a80be06fdd97aecf92f6c72c5c42bdcda4c30ef2f40d9b46827d60ccadd6daafd5eb3f4661a9b30b4ccf0b
 MISC metadata.xml 945 BLAKE2B 130dc56a13a8416168baf91e804e1fdef0d65978641c3fca5eb663b8accb5b1adc066bc4033751f03a9c729e27d0448925a7b623431922056fb7d282db052734 SHA512 ccb23df48a89f69133469722fb37acf516127b207b946cdea240cf82e2ba5422ee4e2166d1a9419031408a7624a52256e322fe7e478a9a7b8214ab4bc5c9b92b
diff --git a/dev-python/importlib_resources/importlib_resources-5.2.3.ebuild b/dev-python/importlib_resources/importlib_resources-5.2.3.ebuild
new file mode 100644
index 000000000000..e844671db232
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.2.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_8 )
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/importlib_resources/importlib_resources-5.3.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.3.0.ebuild
new file mode 100644
index 000000000000..e844671db232
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_8 )
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/indexed_gzip/Manifest b/dev-python/indexed_gzip/Manifest
index 702bd7456271..da3a53556a86 100644
--- a/dev-python/indexed_gzip/Manifest
+++ b/dev-python/indexed_gzip/Manifest
@@ -1,11 +1,5 @@
-DIST indexed_gzip-0.8.10.tar.gz 79133 BLAKE2B ebb5bc69d92b627b0546c8570ea533a7d6541cffbda6ddbf38d2712e5d7b13f5684a4d962b457cb0beaf8f6d9d6c5bd810c31af18396d7ce2a7d3f9ce0a039d6 SHA512 cd57a0442e95a4760d710227a5d9f69841bef851427c536e5cfde7c9f962c9d403e0b38341ba2e07c5cde668e0f26ff7848d154f6243a2cee1cf6c327a7f4e1e
-DIST indexed_gzip-1.6.0.tar.gz 99260 BLAKE2B 15fff478a275baf59f152040455502f57762889959c4d2989e44b626dad25d381ff73029107c4495b477397ff5dc0763d1934f23bcc85a6296a0eec85a36b421 SHA512 0e01da5e8c527202c1f18148bad2a8ebec9ca0bc1bc49ce4804c6a32397797525cc7bfdfc254139c3c1b037d3f65171c010453ff3fae6e6256304ddf486bc58d
-DIST indexed_gzip-1.6.1.tar.gz 99290 BLAKE2B bbaa0fe55c132fef4e392c4a154cc7f5cb19e25761af298d70a8c9f5d1019701f0f470b9bcff333b02b0ecfc13b823a5cd64c16cfd2d113955f7e59837dcbd7f SHA512 8b508ac7fc161b75ee7ed9cc0ce8828e0f195c3aa676114c54d5b2767b9f2e56b0c203e63f2036245ede9649138d197dffabd67f41b41232e6c66e2ee1336529
-DIST indexed_gzip-1.6.2.tar.gz 100520 BLAKE2B 028fa28330fcb9958338226b47d2b503cb9810c03d4dbba2abb9f352ff575b05f73d660a683b2ff4be96441acbbf67c01203eb749e2b81df0d35ad7d7aed94d3 SHA512 977567074df02bf95aa11b47326458d14d7a33b29e001b67e7a52b2ffc2a0c465e361ab1d6ed6ca45b451d5ae99f81ca29034c7af52a6c5168b3a81e8c348689
 DIST indexed_gzip-1.6.3.tar.gz 101073 BLAKE2B 685a8b1d8d69dce138ba6eab8af31d537e130674ba96f9383cc28b4440c472cbdde58f97bcda2d2145177342ade369bd88c44799ba07900ebd653c30678cc58e SHA512 567a54ca23fea63b2a8b386cace0e5bd52e6cf587c7507a555f727cb549b9ab32b1395e3b1ac94c1f09e680a62bb0c079b7bb4be724994813ad52db774b83e20
-EBUILD indexed_gzip-0.8.10.ebuild 805 BLAKE2B 8a9d1c94f2492934ed0c0208ea1a525707130c21828e0a7cd2db7fa75b2bf6605a8715bedd312d738da6fa722afd7cea63b5fab610113367e9d1be21a49b3fa7 SHA512 85ee0d4b7a0777350647f4bfa2afbd2e4b97874507bdad69c186bbb898802b2255945e956f062f10181bc98f01ec25c385a7abb2fa2ba0291f15b5ce1869f405
-EBUILD indexed_gzip-1.6.0.ebuild 935 BLAKE2B 8f60053b76421add4ce3a11bf33baf5964cedd509348e1a898b8ea9be37da3c2b104f2cbaabfd0d6e7d6383ea0733a149654a540d8b802c950dd0496e6335853 SHA512 bbb7d3514ccbd0885e3b3bc333826eb8ef3b356782e202b519b13bf536a885b10a54a4340c3fdd350aa5caf089b7a14516dfd85e695f521ee2dd5368777ad3c2
-EBUILD indexed_gzip-1.6.1.ebuild 839 BLAKE2B 41902763e34f6baf95e9aa0b01e2dbae4af66556574fe85775da351a758a626d236ea2afc76e929b09b884bcf2ab9265a706b40ce520e992e5ee0bf1a428ba62 SHA512 3b6e23c2c5378058ebefdf0577a0320e1daf7af2ea560213cb22100c5e03537307ecdbf874e3642c7cd5eaa8ce3e861694a8ff46965ddb3759e7647b5620aeb1
-EBUILD indexed_gzip-1.6.2.ebuild 876 BLAKE2B b061efb0eca30f75ae610e6590e723e80ffb53c446ce330450905ec0d92e7b42d80390e6da48181d05b3bbd8677ec2e0db525b51b8f3788534ed78510d5fb07e SHA512 9c1680c54fd50e211c8fc474dd3ecea4877cb07084d5b14254c7db771be9691734cd07979ce2e69533646baf0a8d3a30e339a78699dbb72c16e3d2fb829832ad
+DIST indexed_gzip-1.6.4.tar.gz 101683 BLAKE2B 01d34b33f8d6a623f92bd3f6751303b32f3834e9fb7849b13b82080eeaa91bb29fa38e45287256b6946ecafae7fd000f0cd12f004662eb2e5ad9f31be7378505 SHA512 b7b804c99c560f939a165fdd6d4b881fab2dd2664cecf88f9d9dba46c389efa4839dfbffd19a1a30b801e2fde43580279ea2adab5fd0bbb379ad77c568f8d6b9
 EBUILD indexed_gzip-1.6.3.ebuild 876 BLAKE2B b061efb0eca30f75ae610e6590e723e80ffb53c446ce330450905ec0d92e7b42d80390e6da48181d05b3bbd8677ec2e0db525b51b8f3788534ed78510d5fb07e SHA512 9c1680c54fd50e211c8fc474dd3ecea4877cb07084d5b14254c7db771be9691734cd07979ce2e69533646baf0a8d3a30e339a78699dbb72c16e3d2fb829832ad
+EBUILD indexed_gzip-1.6.4.ebuild 876 BLAKE2B b061efb0eca30f75ae610e6590e723e80ffb53c446ce330450905ec0d92e7b42d80390e6da48181d05b3bbd8677ec2e0db525b51b8f3788534ed78510d5fb07e SHA512 9c1680c54fd50e211c8fc474dd3ecea4877cb07084d5b14254c7db771be9691734cd07979ce2e69533646baf0a8d3a30e339a78699dbb72c16e3d2fb829832ad
 MISC metadata.xml 1028 BLAKE2B 936137cbcbbee70168a4e3514fab4f41b27c7f244f905272bff8bd77f7ee1e9e45a1299f008257c944ef519cce09ced963fc14da02dcbbd9faae803dc5bf7672 SHA512 5e11938d84fc159a02713f357d616bb619881aaac8135cd454a45f9f9c6193ba99340c48c89a04b227a35ad12826d83aad3bb1a90f5e1cbb711fcf8d27d07f6f
diff --git a/dev-python/indexed_gzip/indexed_gzip-0.8.10.ebuild b/dev-python/indexed_gzip/indexed_gzip-0.8.10.ebuild
deleted file mode 100644
index e8c9e2200f20..000000000000
--- a/dev-python/indexed_gzip/indexed_gzip-0.8.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Fast random access of gzip files in Python"
-HOMEPAGE="https://github.com/pauldmccarthy/indexed_gzip"
-SRC_URI="https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	"
-RDEPEND=""
-
-distutils_enable_tests pytest
-
-src_compile() {
-	if use test; then
-		export INDEXED_GZIP_TESTING=1
-	fi
-	distutils-r1_src_compile
-}
-
-python_test() {
-	cp conftest.py "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	pytest -vv --nelems 500000 --niters 250 || die
-}
diff --git a/dev-python/indexed_gzip/indexed_gzip-1.6.0.ebuild b/dev-python/indexed_gzip/indexed_gzip-1.6.0.ebuild
deleted file mode 100644
index 6803e7e7dcc3..000000000000
--- a/dev-python/indexed_gzip/indexed_gzip-1.6.0.ebuild
+++ /dev/null
@@ -1,47 +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 distutils-r1 virtualx
-
-DESCRIPTION="Fast random access of gzip files in Python"
-HOMEPAGE="https://github.com/pauldmccarthy/indexed_gzip"
-SRC_URI="https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov=indexed_gzip::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	if use test; then
-		export INDEXED_GZIP_TESTING=1
-	fi
-	distutils-r1_src_compile
-}
-
-python_test() {
-	local ignore=(
-		# requires nibabel
-		test_nibabel_integration.py
-	)
-
-	cd "${BUILD_DIR}"/lib/indexed_gzip/tests || die
-	epytest ${ignore[@]/#/--ignore }
-}
diff --git a/dev-python/indexed_gzip/indexed_gzip-1.6.1.ebuild b/dev-python/indexed_gzip/indexed_gzip-1.6.1.ebuild
deleted file mode 100644
index 6481acb4f3bb..000000000000
--- a/dev-python/indexed_gzip/indexed_gzip-1.6.1.ebuild
+++ /dev/null
@@ -1,42 +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 distutils-r1 virtualx
-
-DESCRIPTION="Fast random access of gzip files in Python"
-HOMEPAGE="https://github.com/pauldmccarthy/indexed_gzip"
-SRC_URI="https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov=indexed_gzip::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	if use test; then
-		export INDEXED_GZIP_TESTING=1
-	fi
-	distutils-r1_src_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib/indexed_gzip/tests || die
-	epytest
-}
diff --git a/dev-python/indexed_gzip/indexed_gzip-1.6.2.ebuild b/dev-python/indexed_gzip/indexed_gzip-1.6.4.ebuild
index f2cf3667d4c1..f2cf3667d4c1 100644
--- a/dev-python/indexed_gzip/indexed_gzip-1.6.2.ebuild
+++ b/dev-python/indexed_gzip/indexed_gzip-1.6.4.ebuild
diff --git a/dev-python/iniparse/Manifest b/dev-python/iniparse/Manifest
index b4d5aa2eefd6..3558ef728960 100644
--- a/dev-python/iniparse/Manifest
+++ b/dev-python/iniparse/Manifest
@@ -1,7 +1,3 @@
-AUX iniparse-0.4-python3.patch 16919 BLAKE2B bb33df2937755ab4381adcdc17e3ae72eb08f0f7d22d640aae06fbe52f16f90218e298c674a030fcc299dcf7107b1073fe4e3ec8f34683d283b9586316bf9aa5 SHA512 ed292dca5b124da5de1617cb2ad4f743b836607226805e488572b37cb08e9a71595ef2e008a26f99f8dd0acaa1308a77cdf58b48cde231524d034138df26ef7e
-AUX iniparse-0.4-tests.patch 779 BLAKE2B ccda778ea17d34d59fe16e0b63fc140ac12c1e06756e1959327787e8f7cf17dd070857b15ee62e5f6a62401da64aedd8819adc2db54936179b0b7b76001e5692 SHA512 543770491ca075463e4947d7adff0c846e31e03ba7b263c37d9728b93486ff751d8066cb5cdec3a244c30e00f6f1edbd39ec6ea1188340d0a3edf460af147ee3
-DIST iniparse-0.4.tar.gz 31278 BLAKE2B 1d92322cedd115a68f4133f477ca772e4d24b48991c07fecf3d22e86ac39f0626ffa7cebecfa15a200dc9fcbfac205c1e17aefa35e335a1f86f3919a3f9c1d58 SHA512 d59eae7c1ce474c89eddb0b0cbff5973444571728aa0c6ce5b3632984353415f7eec4de63cf007c276df0d1bb914b2ea5dd0acc00f3a261285c8e2e9883fbe9a
 DIST iniparse-0.5.tar.gz 32233 BLAKE2B 3da99f9d828318f78ddb8789afe63a7fdec017eaf41df5f420b0f358a9724eb787f312c9964238d9e42ebecce143d37f72858c7935cafbcf0221229b89033026 SHA512 b3f10d1b36497c3c5c71cb0a1ac73d74d8944f4ad3b7acc4a4b0246c2f1a20c184d9af20bbb3cb8ec4f57fddfb5e103b92688847debb4200ef0583353d7f9556
-EBUILD iniparse-0.4-r2.ebuild 626 BLAKE2B 74dadcf61f92367b3b17ffba8de16789a6e237434d03175de8dd3900271cba73a6494a961069010215a79f48f4f3518b5052d321504155d9c0182a5a13d5c411 SHA512 8d86d7c83ff0784b8111a0e992372a40fd1c6f3f0c0bb4eb95495ac8823ef9540375d3a4302041ea2cfb58a526dacd5320297eb3ca3d76defde0c8b0eb8cc9a6
 EBUILD iniparse-0.5.ebuild 506 BLAKE2B 478ae4558779c9c63352145d0a707cdd9ad2911a0dc98cb8e3d9d5b2b01b2b66c70805d20087adc219e5850efcfbc4c138f62555e80112c4eeb67663644cf5b0 SHA512 af48c2c8fe961ed28a9382420e165d8909b87970593f912a9905a1621bb6c920c933298fcae7be3491280568abb7c023b722d554fe452e653bd1a5fa96a04ad6
 MISC metadata.xml 336 BLAKE2B dfe7c6dd67edf1dda2403035f6540398e5797b261d0cabe768365e3b51a6a1d0a3475aa6066f5fbb53d9ae2fd7de4e13d0f4754554f095cc758fae8ccce52305 SHA512 9a2b6d0733ac64106e9c376dca4b6832de44bea2ec4d96d68b9cf39fb1e13f28bad14065aef33e525d496c1c57a0ab3d31feb643ddb8caa2dc6cff125de2c679
diff --git a/dev-python/iniparse/files/iniparse-0.4-python3.patch b/dev-python/iniparse/files/iniparse-0.4-python3.patch
deleted file mode 100644
index a5ebb73e711c..000000000000
--- a/dev-python/iniparse/files/iniparse-0.4-python3.patch
+++ /dev/null
@@ -1,523 +0,0 @@
-Index: iniparse/__init__.py
-===================================================================
---- a/iniparse/__init__.py	(revision 146)
-+++ b/iniparse/__init__.py	(working copy)
-@@ -3,17 +3,17 @@
- # Copyright (c) 2007 Tim Lauridsen <tla@rasmil.dk>
- # All Rights Reserved.  See LICENSE-PSF & LICENSE for details.
- 
--from ini import INIConfig, change_comment_syntax
--from config import BasicConfig, ConfigNamespace
--from compat import RawConfigParser, ConfigParser, SafeConfigParser
--from utils import tidy
-+from .ini import INIConfig, change_comment_syntax
-+from .config import BasicConfig, ConfigNamespace
-+from .compat import RawConfigParser, ConfigParser, SafeConfigParser
-+from .utils import tidy
- 
--from ConfigParser import DuplicateSectionError,    \
--                  NoSectionError, NoOptionError,   \
--                  InterpolationMissingOptionError, \
--                  InterpolationDepthError,         \
--                  InterpolationSyntaxError,        \
--                  DEFAULTSECT, MAX_INTERPOLATION_DEPTH
-+from .configparser import DuplicateSectionError,    \
-+                   NoSectionError, NoOptionError,   \
-+                   InterpolationMissingOptionError, \
-+                   InterpolationDepthError,         \
-+                   InterpolationSyntaxError,        \
-+                   DEFAULTSECT, MAX_INTERPOLATION_DEPTH
- 
- __all__ = [
-     'BasicConfig', 'ConfigNamespace',
-Index: iniparse/compat.py
-===================================================================
---- a/iniparse/compat.py	(revision 146)
-+++ b/iniparse/compat.py	(working copy)
-@@ -12,20 +12,22 @@
- """
- 
- import re
--from ConfigParser import DuplicateSectionError,    \
--                  NoSectionError, NoOptionError,   \
--                  InterpolationMissingOptionError, \
--                  InterpolationDepthError,         \
--                  InterpolationSyntaxError,        \
--                  DEFAULTSECT, MAX_INTERPOLATION_DEPTH
-+from .configparser import DuplicateSectionError,    \
-+                   NoSectionError, NoOptionError,   \
-+                   InterpolationMissingOptionError, \
-+                   InterpolationDepthError,         \
-+                   InterpolationSyntaxError,        \
-+                   DEFAULTSECT, MAX_INTERPOLATION_DEPTH
- 
- # These are imported only for compatiability.
- # The code below does not reference them directly.
--from ConfigParser import Error, InterpolationError, \
--                  MissingSectionHeaderError, ParsingError
-+from .configparser import Error, InterpolationError, \
-+                   MissingSectionHeaderError, ParsingError
- 
--import ini
-+import six
- 
-+from . import ini
-+
- class RawConfigParser(object):
-     def __init__(self, defaults=None, dict_type=dict):
-         if dict_type != dict:
-@@ -56,7 +58,7 @@
-         # The default section is the only one that gets the case-insensitive
-         # treatment - so it is special-cased here.
-         if section.lower() == "default":
--            raise ValueError, 'Invalid section name: %s' % section
-+            raise ValueError('Invalid section name: %s' % section)
- 
-         if self.has_section(section):
-             raise DuplicateSectionError(section)
-@@ -88,7 +90,7 @@
-         filename may also be given.
-         """
-         files_read = []
--        if isinstance(filenames, basestring):
-+        if isinstance(filenames, six.string_types):
-             filenames = [filenames]
-         for filename in filenames:
-             try:
-@@ -143,7 +145,7 @@
-     def getboolean(self, section, option):
-         v = self.get(section, option)
-         if v.lower() not in self._boolean_states:
--            raise ValueError, 'Not a boolean: %s' % v
-+            raise ValueError('Not a boolean: %s' % v)
-         return self._boolean_states[v.lower()]
- 
-     def has_option(self, section, option):
-@@ -234,7 +236,7 @@
-             if "%(" in value:
-                 try:
-                     value = value % vars
--                except KeyError, e:
-+                except KeyError as e:
-                     raise InterpolationMissingOptionError(
-                         option, section, rawval, e.args[0])
-             else:
-@@ -283,7 +285,7 @@
-     _badpercent_re = re.compile(r"%[^%]|%$")
- 
-     def set(self, section, option, value):
--        if not isinstance(value, basestring):
-+        if not isinstance(value, six.string_types):
-             raise TypeError("option values must be strings")
-         # check for bad percent signs:
-         # first, replace all "good" interpolations
-Index: iniparse/config.py
-===================================================================
---- a/iniparse/config.py	(revision 146)
-+++ b/iniparse/config.py	(working copy)
-@@ -143,7 +143,7 @@
- 
-     >>> n.aaa = 42
-     >>> del n.x
--    >>> print n
-+    >>> print(n)
-     aaa = 42
-     name.first = paramjit
-     name.last = oberoi
-@@ -152,7 +152,7 @@
- 
-     >>> isinstance(n.name, ConfigNamespace)
-     True
--    >>> print n.name
-+    >>> print(n.name)
-     first = paramjit
-     last = oberoi
-     >>> sorted(list(n.name))
-@@ -160,7 +160,7 @@
- 
-     Finally, values can be read from a file as follows:
- 
--    >>> from StringIO import StringIO
-+    >>> from six import StringIO
-     >>> sio = StringIO('''
-     ... # comment
-     ... ui.height = 100
-@@ -171,7 +171,7 @@
-     ... ''')
-     >>> n = BasicConfig()
-     >>> n._readfp(sio)
--    >>> print n
-+    >>> print(n)
-     complexity = medium
-     data.secret.password = goodness=gracious me
-     have_python
-@@ -199,7 +199,7 @@
- 
-     def __str__(self, prefix=''):
-         lines = []
--        keys = self._data.keys()
-+        keys = list(self._data.keys())
-         keys.sort()
-         for name in keys:
-             value = self._data[name]
-@@ -258,7 +258,7 @@
-     >>> n.ui.display_clock = True
-     >>> n.ui.display_qlength = True
-     >>> n.ui.width = 150
--    >>> print n
-+    >>> print(n)
-     playlist.expand_playlist = True
-     ui.display_clock = True
-     ui.display_qlength = True
-@@ -267,7 +267,7 @@
-     >>> from iniparse import ini
-     >>> i = ini.INIConfig()
-     >>> update_config(i, n)
--    >>> print i
-+    >>> print(i)
-     [playlist]
-     expand_playlist = True
-     <BLANKLINE>
-@@ -277,7 +277,7 @@
-     width = 150
- 
-     """
--    for name in source:
-+    for name in sorted(source):
-         value = source[name]
-         if isinstance(value, ConfigNamespace):
-             if name in target:
-Index: iniparse/configparser.py
-===================================================================
---- a/iniparse/configparser.py	(revision 0)
-+++ b/iniparse/configparser.py	(working copy)
-@@ -0,0 +1,7 @@
-+try:
-+    from ConfigParser import *
-+    # not all objects get imported with __all__
-+    from ConfigParser import Error, InterpolationMissingOptionError
-+except ImportError:
-+    from configparser import *
-+    from configparser import Error, InterpolationMissingOptionError
-Index: iniparse/ini.py
-===================================================================
---- a/iniparse/ini.py	(revision 146)
-+++ b/iniparse/ini.py	(working copy)
-@@ -7,7 +7,7 @@
- 
- Example:
- 
--    >>> from StringIO import StringIO
-+    >>> from six import StringIO
-     >>> sio = StringIO('''# configure foo-application
-     ... [foo]
-     ... bar1 = qualia
-@@ -16,14 +16,14 @@
-     ... special = 1''')
- 
-     >>> cfg = INIConfig(sio)
--    >>> print cfg.foo.bar1
-+    >>> print(cfg.foo.bar1)
-     qualia
--    >>> print cfg['foo-ext'].special
-+    >>> print(cfg['foo-ext'].special)
-     1
-     >>> cfg.foo.newopt = 'hi!'
-     >>> cfg.baz.enabled = 0
- 
--    >>> print cfg
-+    >>> print(cfg)
-     # configure foo-application
-     [foo]
-     bar1 = qualia
-@@ -42,10 +42,12 @@
- # Backward-compatiable with ConfigParser
- 
- import re
--from ConfigParser import DEFAULTSECT, ParsingError, MissingSectionHeaderError
-+from .configparser import DEFAULTSECT, ParsingError, MissingSectionHeaderError
- 
--import config
-+import six
- 
-+from . import config
-+
- class LineType(object):
-     line = None
- 
-@@ -278,6 +280,8 @@
-     value = property(get_value, set_value)
- 
-     def __str__(self):
-+        for c in self.contents:
-+            pass#print(c.__str__())
-         s = [x.__str__() for x in self.contents]
-         return '\n'.join(s)
- 
-@@ -465,7 +469,7 @@
-         self._sections = {}
-         if defaults is None: defaults = {}
-         self._defaults = INISection(LineContainer(), optionxformsource=self)
--        for name, value in defaults.iteritems():
-+        for name, value in defaults.items():
-             self._defaults[name] = value
-         if fp is not None:
-             self._readfp(fp)
-@@ -551,7 +555,7 @@
- 
-         for line in readline_iterator(fp):
-             # Check for BOM on first line
--            if linecount == 0 and isinstance(line, unicode):
-+            if linecount == 0 and isinstance(line, six.text_type):
-                 if line[0] == u'\ufeff':
-                     line = line[1:]
-                     self._bom = True
-Index: iniparse/utils.py
-===================================================================
---- a/iniparse/utils.py	(revision 146)
-+++ b/iniparse/utils.py	(working copy)
-@@ -1,5 +1,5 @@
--import compat
--from ini import LineContainer, EmptyLine
-+from . import compat
-+from .ini import LineContainer, EmptyLine
- 
- def tidy(cfg):
-     """Clean up blank lines.
-Index: tests/__init__.py
-===================================================================
---- a/tests/__init__.py	(revision 146)
-+++ b/tests/__init__.py	(working copy)
-@@ -1,12 +1,12 @@
- import unittest, doctest
- 
--import test_ini
--import test_misc
--import test_fuzz
--import test_compat
--import test_unicode
--import test_tidy
--import test_multiprocessing
-+from . import test_ini
-+from . import test_misc
-+from . import test_fuzz
-+from . import test_compat
-+from . import test_unicode
-+from . import test_tidy
-+from . import test_multiprocessing
- from iniparse import config
- from iniparse import ini
- 
-Index: tests/test_compat.py
-===================================================================
---- a/tests/test_compat.py	(revision 146)
-+++ b/tests/test_compat.py	(working copy)
-@@ -1,9 +1,16 @@
- from iniparse import compat as ConfigParser
--import StringIO
-+from six import StringIO
-+try:
-+    import UserDict
-+except ImportError:
-+    import collections as UserDict
- import unittest
--import UserDict
- 
--from test import test_support
-+import sys
-+if sys.version_info[0] < 3:
-+    from test import test_support
-+else:
-+    from test import support as test_support
- 
- class SortedDict(UserDict.UserDict):
-     def items(self):
-@@ -35,7 +42,7 @@
- 
-     def fromstring(self, string, defaults=None):
-         cf = self.newconfig(defaults)
--        sio = StringIO.StringIO(string)
-+        sio = StringIO(string)
-         cf.readfp(sio)
-         return cf
- 
-@@ -161,7 +168,7 @@
-                          "No Section!\n")
- 
-     def parse_error(self, exc, src):
--        sio = StringIO.StringIO(src)
-+        sio = StringIO(src)
-         self.assertRaises(exc, self.cf.readfp, sio)
- 
-     def test_query_errors(self):
-@@ -181,7 +188,7 @@
-     def get_error(self, exc, section, option):
-         try:
-             self.cf.get(section, option)
--        except exc, e:
-+        except exc as e:
-             return e
-         else:
-             self.fail("expected exception type %s.%s"
-@@ -227,7 +234,7 @@
-             "foo: another very\n"
-             " long line"
-             )
--        output = StringIO.StringIO()
-+        output = StringIO()
-         cf.write(output)
-         self.assertEqual(
-             output.getvalue(),
-@@ -465,7 +472,7 @@
-                         "o1=4\n"
-                         "[a]\n"
-                         "k=v\n")
--        output = StringIO.StringIO()
-+        output = StringIO()
-         self.cf.write(output)
-         self.assertEquals(output.getvalue(),
-                           "[a]\n"
-Index: tests/test_fuzz.py
-===================================================================
---- a/tests/test_fuzz.py	(revision 146)
-+++ b/tests/test_fuzz.py	(working copy)
-@@ -1,9 +1,10 @@
- import re
- import os
- import random
-+import sys
- import unittest
--import ConfigParser
--from StringIO import StringIO
-+from six import StringIO
-+from six.moves import configparser
- from iniparse import compat, ini, tidy
- 
- # TODO:
-@@ -96,24 +97,25 @@
-                 s = '\n'.join(good_lines)
-                 cc = compat.RawConfigParser()
-                 cc.readfp(StringIO(s))
--                cc_py = ConfigParser.RawConfigParser()
-+                cc_py = configparser.RawConfigParser()
-                 cc_py.readfp(StringIO(s))
-                 # compare the two configparsers
-                 self.assertEqualConfig(cc_py, cc)
-                 # check that tidy does not change semantics
-                 tidy(cc)
--                cc_tidy = ConfigParser.RawConfigParser()
-+                cc_tidy = configparser.RawConfigParser()
-                 cc_tidy.readfp(StringIO(str(cc.data)))
-                 self.assertEqualConfig(cc_py, cc_tidy)
-             except AssertionError:
-                 fname = 'fuzz-test-iter-%d.ini' % fuzz_iter
--                print 'Fuzz test failed at iteration', fuzz_iter
--                print 'Writing out failing INI file as', fname
-+                print('Fuzz test failed at iteration', fuzz_iter)
-+                print('Writing out failing INI file as', fname)
-                 f = open(fname, 'w')
-                 f.write(s)
-                 f.close()
-                 raise
- 
-+    @unittest.skipIf(sys.version_info[0] > 2, 'http://code.google.com/p/iniparse/issues/detail?id=22#c9')
-     def assertEqualConfig(self, c1, c2):
-         self.assertEqualSorted(c1.sections(), c2.sections())
-         self.assertEqualSorted(c1.defaults().items(), c2.defaults().items())
-@@ -123,9 +125,7 @@
-                 self.assertEqual(c1.get(sec, opt), c2.get(sec, opt))
- 
-     def assertEqualSorted(self, l1, l2):
--        l1.sort()
--        l2.sort()
--        self.assertEqual(l1, l2)
-+        self.assertEqual(sorted(l1), sorted(l2))
- 
- class suite(unittest.TestSuite):
-     def __init__(self):
-Index: tests/test_ini.py
-===================================================================
---- a/tests/test_ini.py	(revision 146)
-+++ b/tests/test_ini.py	(working copy)
-@@ -1,5 +1,5 @@
- import unittest
--from StringIO import StringIO
-+from six import StringIO
- 
- from iniparse import ini
- from iniparse import compat
-@@ -196,13 +196,13 @@
-         self.assertEqual(p._data.find('section2').find('just').value, 'kidding')
- 
-         itr = p._data.finditer('section1')
--        v = itr.next()
-+        v = next(itr)
-         self.assertEqual(v.find('help').value, 'yourself')
-         self.assertEqual(v.find('but').value, 'also me')
--        v = itr.next()
-+        v = next(itr)
-         self.assertEqual(v.find('help').value, 'me')
-         self.assertEqual(v.find('I\'m').value, 'desperate')
--        self.assertRaises(StopIteration, itr.next)
-+        self.assertRaises(StopIteration, next, itr)
- 
-         self.assertRaises(KeyError, p._data.find, 'section')
-         self.assertRaises(KeyError, p._data.find('section2').find, 'ahem')
-Index: tests/test_misc.py
-===================================================================
---- a/tests/test_misc.py	(revision 146)
-+++ b/tests/test_misc.py	(working copy)
-@@ -1,9 +1,9 @@
- import re
- import unittest
- import pickle
--import ConfigParser
-+from six.moves import configparser
-+from six import StringIO
- from textwrap import dedent
--from StringIO import StringIO
- from iniparse import compat, ini
- 
- class CaseSensitiveConfigParser(compat.ConfigParser):
-Index: tests/test_tidy.py
-===================================================================
---- a/tests/test_tidy.py	(revision 146)
-+++ b/tests/test_tidy.py	(working copy)
-@@ -1,6 +1,6 @@
- import unittest
- from textwrap import dedent
--from StringIO import StringIO
-+from six import StringIO
- 
- from iniparse import tidy,INIConfig
- from iniparse.ini import  EmptyLine
-Index: tests/test_unicode.py
-===================================================================
---- a/tests/test_unicode.py	(revision 146)
-+++ b/tests/test_unicode.py	(working copy)
-@@ -1,5 +1,5 @@
- import unittest
--from StringIO import StringIO
-+import six
- from iniparse import compat, ini
- 
- class test_unicode(unittest.TestCase):
-@@ -17,14 +17,14 @@
-     """
- 
-     def basic_tests(self, s, strable):
--        f = StringIO(s)
-+        f = six.StringIO(s)
-         i = ini.INIConfig(f)
--        self.assertEqual(unicode(i), s)
--        self.assertEqual(type(i.foo.bar), unicode)
-+        self.assertEqual(six.text_type(i), s)
-+        self.assertEqual(type(i.foo.bar), six.text_type)
-         if strable:
-             self.assertEqual(str(i), str(s))
-         else:
--            self.assertRaises(UnicodeEncodeError, lambda: str(i))
-+            self.assertRaises(UnicodeEncodeError, lambda: six.text_type(i).encode('ascii'))
-         return i
- 
-     def test_ascii(self):
diff --git a/dev-python/iniparse/files/iniparse-0.4-tests.patch b/dev-python/iniparse/files/iniparse-0.4-tests.patch
deleted file mode 100644
index ca6900ad2ea5..000000000000
--- a/dev-python/iniparse/files/iniparse-0.4-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b3d6ea5ed88b0e6cf9fdb411a14e725665ded92e Mon Sep 17 00:00:00 2001
-From: Tim Lauridsen <timlau@fedoraproject.org>
-Date: Fri, 7 Mar 2014 19:06:40 +0100
-Subject: [PATCH] Fix handling of REM xxxxxxxx as a comment, but REMXXXX is not
- (upstream issue #28)
-
----
- tests/test_ini.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/tests/test_ini.py b/tests/test_ini.py
-index 07d4f4e..6d974f0 100644
---- a/tests/test_ini.py
-+++ b/tests/test_ini.py
-@@ -144,8 +144,7 @@ class test_comment_line(unittest.TestCase):
-         '#this is a comment',
-         ';; this is also a comment',
-         '; so is this   ',
--        'Rem and this',
--        'remthis too!'
-+        'Rem and this'
-     ]
-     def test_parsing(self):
-         for l in self.lines:
--- 
-1.8.5.3
-
diff --git a/dev-python/iniparse/iniparse-0.4-r2.ebuild b/dev-python/iniparse/iniparse-0.4-r2.ebuild
deleted file mode 100644
index 3a7544b389e8..000000000000
--- a/dev-python/iniparse/iniparse-0.4-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Better INI parser for Python"
-HOMEPAGE="https://pypi.org/project/iniparse/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-python3.patch"
-	"${FILESDIR}/${P}-tests.patch"
-)
-
-python_test() {
-	"${EPYTHON}" runtests.py || die
-}
diff --git a/dev-python/intreehooks/Manifest b/dev-python/intreehooks/Manifest
index 36b40c5e8bc8..d370db82404b 100644
--- a/dev-python/intreehooks/Manifest
+++ b/dev-python/intreehooks/Manifest
@@ -1,3 +1,3 @@
 DIST intreehooks-1.0.tar.gz 2701 BLAKE2B 2c82bae05cf3fc3bde13e8dd2ffb9d1ef79edc6711b5038f6f9b3dddd863492be24a425bf848c9868ecf730f813243fb5fa50ebfad52b44341be18e72727f195 SHA512 5a020dd6bd7994eca5f476618f57e2d86567756fae74f6fa50b6fbc96accfe8db910f3175bafa3ce85f37b05edc05ca1042dcec78407a241cfaffc0a0e997f4e
-EBUILD intreehooks-1.0.ebuild 811 BLAKE2B 02ffcd28706a811a4b9f125023c64b266d88c334cd06e7dbadfeb92ac927075bb2b6466a65a5dfe7056c66c9db7c8eeabe5e3036448167e36e6b819bcfc89370 SHA512 eb8cd122cdc862cdc9b4b793370775215d7f226a1120055ccaea9b616baefc55ba2ce71c2f64d9a1ee4a37d99d6f49b94f6f089a872ecfa7a64aa3d39a956e78
+EBUILD intreehooks-1.0.ebuild 835 BLAKE2B ea2188e799e9b55bca386219c626364e828237a31ff3280f44bcf779597f8cf03652baefd1649ce20f84a1d6151c48ef8ca35c1d48328525ce5ebae0b0047b34 SHA512 626ba60ee6176dd5f38802835322478ff9c04100085f2260c78dcb8ee09042206f194ce0b6dcc5eab4caba77882564f15b433c9120b79aa218ae9dc90413afc7
 MISC metadata.xml 504 BLAKE2B 2e9e74ef321c3ddcb614c1f4a3d7870448fca8f407d82ab5a26936df27f367d9203ef00e90f5739cffe200c63ccb1e4814f67d74bf513888a9fd29224988be4a SHA512 a9b8e2c94fa4b4d978a4efcd702ea360aee95a4f4c859bc6e0147b2ae52adf705166e9f052c819f48920abf01c532d2b5cb28d95b9e0623f41c9ccea0021f145
diff --git a/dev-python/intreehooks/intreehooks-1.0.ebuild b/dev-python/intreehooks/intreehooks-1.0.ebuild
index 1b079e153662..45c9332772e4 100644
--- a/dev-python/intreehooks/intreehooks-1.0.ebuild
+++ b/dev-python/intreehooks/intreehooks-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index a6026b94bb2c..f4108bc9549c 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,5 +1,5 @@
 DIST ipykernel-5.5.4.tar.gz 112728 BLAKE2B 489e12d0cbde2f80f2c921f026c7b84554b1fef481164e07f89b063127b01d106fc6b19f830ac321d79285fb9df065352dbc0c2a997b3629a64e766d2e50f347 SHA512 96728321fe71d528435415eda917c623269af734598a78168144d983aa64db4f9ced981fa67c83263da1ed878831669d821b84a769a08a271adafacfcbb75bf9
 DIST ipykernel-6.2.0.tar.gz 110042 BLAKE2B e1e9f140d434142339c36cdf72c9c4224143aeac8ee5938488fefaf0c15b33ddb6a4e4f49e4096431c89ba6bdcf6321f73e61927186d42518cd73e6016a017ed SHA512 7f3203b072cf7a4ca71e56df0c5621f6ac44440ace2ba855b7354971d04e872621650a0351f9d1ace50ea63459290835306e71fb91d414355810fa79968ddf56
 EBUILD ipykernel-5.5.4-r1.ebuild 1533 BLAKE2B 5a3d2bacbd430b1b575370c3901dc507c9e2930e59e141064455dd71114b1d3b58373009b85242480fbc9a93ca4b5d68dadbf0730965a0ccc98ed28b14c1b920 SHA512 3b62c83b0580c3457f9d24471b09172cc56f25cdfcc0348cb8961c269af3caf85a8a4119a11a3c890558b73ec9c09dbfa2d4191035dfad69641e2a9c8f333bb3
-EBUILD ipykernel-6.2.0.ebuild 1376 BLAKE2B aa3e29c9a21223034347fce81267feaca02f8f3825d41f04ef2585f3c8e523b8fdb51aeee59c7728570bfc85ce84f6fa3bf773a7ba6dba87c29d647ed708138a SHA512 2ae9d19becbc05690e0903657d20e4ad8c0f8d7b0a2963a7adc1777b594a72214c58d59d52c4d77a56cbfa1192a27877d8c49ba9329aec2be980267b493d10c2
+EBUILD ipykernel-6.2.0.ebuild 1388 BLAKE2B 08fce461e7ff1da47474b251a2b26a7a1533ab2773a2aa49c4a44d910598813ea107d1c9522e9cf824e8cd5043e3a28c8d9c13f0082fde9b0d1eddf92693043d SHA512 e234b96d0914a211367ca6435ef87be871a94af879d39a27a676132e3cdc190b2633192eb0b9af477250941fd5a203465cadfb0880612b4fb195fc98b0da952f
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.2.0.ebuild b/dev-python/ipykernel/ipykernel-6.2.0.ebuild
index c74ae593e65a..29e76716044f 100644
--- a/dev-python/ipykernel/ipykernel-6.2.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/debugpy-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/isoduration/Manifest b/dev-python/isoduration/Manifest
index 02b0fc27082e..40243ad174fb 100644
--- a/dev-python/isoduration/Manifest
+++ b/dev-python/isoduration/Manifest
@@ -1,3 +1,3 @@
 DIST isoduration-20.11.0.gh.tar.gz 15909 BLAKE2B fb5c3c383aa000c4650490b701fc091c740e45cf782aa929824e3f3e5601d4de82a68a9430f450b42da3658105c87cb293a98b94c77fdf03a1702e6d103a257a SHA512 9b3dd5cc540bba35a73aab01bf1f0274871b93b03ff72f8cc63fa0d2ec43e1f54deb95bad2323aa4cb8066b1b5401f426175792c062cf46449c087601dbe0420
-EBUILD isoduration-20.11.0.ebuild 704 BLAKE2B 8d195917daf8880301cd2b62a77cf2a29f320b2fbd5a19822e70cca0c73a62bc76db1621d5f2ead0852fba926f9d94e8964875aeeedc956fdaa9e239d807e702 SHA512 57ccd984beb2c5bde862bbe7747d8b479df4758d0231fadfafc94da17886b6b8c2ef63f659e33e5b41034b7bdc45ef251f6b4f91ae005c4ed3186644eb8f79b5
+EBUILD isoduration-20.11.0.ebuild 729 BLAKE2B 60074c6ea2ef9e58192d5b4ea5084f535b70accb549385862affb064aaa3e12819f199c08b9815bc38cd26a495379462002035cea8fb8277eab479e9f387dc3b SHA512 477fb24849900c7fb2ab4fbe2462b318688ff1d74611c9f2870c94298b30c07715c5e5ed00c7ed222471381e06111ca705076061e6f95895ae01d17287fee38d
 MISC metadata.xml 397 BLAKE2B 88efa16ab2f656b04592484218f5289838a1e3f6f2f9eaf74f3a836f950d59e25d4d179ad87f6c780b768cd536d3360342c91e3d3082abd417bd398585f409c0 SHA512 ffd673f9fe8cfb45fc4fef014fa2c8de7ebbe0237cc06a6b570f099eea97dbcbc8012c1ba11108b61b0e3ab43077c544db8634775f1675a6e704fe20110e3180
diff --git a/dev-python/isoduration/isoduration-20.11.0.ebuild b/dev-python/isoduration/isoduration-20.11.0.ebuild
index a5807d6ccb45..144caf0ac74b 100644
--- a/dev-python/isoduration/isoduration-20.11.0.ebuild
+++ b/dev-python/isoduration/isoduration-20.11.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND=">=dev-python/arrow-0.15.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 4347151e7e31..b0e230d98e69 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,3 +1,3 @@
 DIST isort-5.9.3.gh.tar.gz 729342 BLAKE2B f40f046c5706ea4fd6daf7dc8eaccaca35e7de3e77bc17fa73681d12c42f7d2a3b19a909384e6b2e2486679a9f9895c2fa944faace4bbc3d0cfd0ec7aff85edd SHA512 96aa9c8bb58c95a41f562d3f0e1cf6e9c0c4158486bca24dfe2293fc86c7c6b74e3e6a84ed755d965b692b1f06d98cdc8ed69080775f8acd9186ac3ae6401570
-EBUILD isort-5.9.3.ebuild 1340 BLAKE2B 1549632d51b77d865abd4f20fd8dfe64210e953cab14f1760a2d093fe3aad3675474ef3668b954eff0b56527461901a1157ec8971f90210226a49056fcbd8c7c SHA512 c5d8b40220d4209c078ae9cdc8eb4fcec3f4678134102af044f06b7fe41a967684713f97513236e6af4ba99fd3a8c19f5e73385349e37c43e91369eb4267ba5b
+EBUILD isort-5.9.3.ebuild 1352 BLAKE2B d3a6bc9feda66134ff8abdd5ff29a818a5994d03e5807f785d7c56a14ef6cd7f709e701196cdb96ff9a9d3824aba856a587912ca66a543524aed9eddf2e399c7 SHA512 ab5fe6b94bcb8bcf195989f817169a7f5eec23b15117caf05312f91f2fb1306d4355903ddb736eab40b869d9ff1a9156284c4c5be17ea3ad46f84370d550b491
 MISC metadata.xml 574 BLAKE2B db8aac55351f15190d9b71508268f26b12a781b3b4f0f6836a30efc954b46b71da496129a9641655db483730435b44a5c5283132521dc3cc93279c57735a1ba4 SHA512 c8116bf66155ffeb7ac8d68822559e18252210dae604b4984aa5e6a3fb7161d785cbd235dc6f656513b5bab326f6e579489245bcef9d0a5dfadc34d7477758fb
diff --git a/dev-python/isort/isort-5.9.3.ebuild b/dev-python/isort/isort-5.9.3.ebuild
index 114bbda1b9c2..d0ba0a87843d 100644
--- a/dev-python/isort/isort-5.9.3.ebuild
+++ b/dev-python/isort/isort-5.9.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]"
diff --git a/dev-python/itypes/Manifest b/dev-python/itypes/Manifest
index caef63d402de..0cfd677484ee 100644
--- a/dev-python/itypes/Manifest
+++ b/dev-python/itypes/Manifest
@@ -1,5 +1,3 @@
-DIST itypes-1.1.0.gh.tar.gz 4403 BLAKE2B 62f7d1a96154f313c43764306ab7ea235e0ed8a60180e56760588f03ffbdb948a56b7bec9c63c861b743f6aa1510b0442d41015b944ef777655e7b152f15bbcb SHA512 2f6dd5d655f1031059df8dcfd0a2f76875796a800144e887fb66cb5585949097edb6b9f5e973de2280f43cfeb25ab99d3ca428372fe239c8cd70f385304bcdd7
 DIST itypes-1.2.0.gh.tar.gz 5578 BLAKE2B c4025c2ad54203c4f3bbcd6f369fc6a86d21bd54a63c42acd68a98b6b44404340c3242e3c7a896483860eaa7f3df156fec79a71974e3cbb7b984fd83aa631eb2 SHA512 94421fa3f9ec7d18989332ca518607f09bd9d674e80bbca4a3c7324c20c3ae4e0679457e6a328e50ffe3d94c6db733f092798293133d42c1f07d959e0f837891
-EBUILD itypes-1.1.0.ebuild 482 BLAKE2B 25bcee343e23378bf8b2c754ade50d2a935a7f973c9d43dcd0a0e5d35eb835c6f5a0af0784d8bbf7f40d7eb46372309847efe63daa1b7022f6026ae22a558c8a SHA512 bbffae692df93f966bf71389dad2cdfff61b24a348fcc16ad5d0aea8bb812ff3786ebbbaea456450abd7ef94f5b9fb5c8fbf6100f06328b536338489982b85ef
 EBUILD itypes-1.2.0.ebuild 483 BLAKE2B ca1de2729b94940a034d84c697338130273b136311fc30a050bafcf12c17fc1569fffbf063826b4c3f3c4b37831f7ddf868e2c0c762c1057400d0992db8c51d2 SHA512 6f584b66342e08b3def1674b89fc748eaf4ee89c55c14e3a28cc656d666d8dbdf5050c9a5f218c63efa18bcd371ac67bfefc995f2b27478bc732c7965a384449
 MISC metadata.xml 371 BLAKE2B f7c9f8281df4a02f1183af152addcfe7edb8dc47470912f9a7edf8efcb09c6996c50baedf013a3c4a0d584a302f72ccc394ddcf6bf7bb4632837e768b22c5c3d SHA512 ae181140183bafd453515b087688891763ca93f9db436a93de72ad27c1460136993c5963bb9996454f9bde4f87751db61f80f9024914a9f07304c2ad0f2b9241
diff --git a/dev-python/itypes/itypes-1.1.0.ebuild b/dev-python/itypes/itypes-1.1.0.ebuild
deleted file mode 100644
index 7c0e5aa22446..000000000000
--- a/dev-python/itypes/itypes-1.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="basic immutable container types for python"
-HOMEPAGE="https://github.com/PavanTatikonda/itypes/"
-SRC_URI="
-	https://github.com/PavanTatikonda/itypes/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest tests.py
-}
diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
index a1b08fe4be9d..f806f3d7327a 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1,7 +1,5 @@
-DIST jaraco.stream-3.0.0.tar.gz 11838 BLAKE2B 9d26ff8f78a3f090d79ccc8cbc41819a8290ebdb7770f56a57938ad9311ca1fd168d633fec78ee102c2c08156c9e0ae6f521dd5cafcb9df22928ba9f3f832734 SHA512 f2ce7e65d9a3bcd81985f45d03f7cd56b2f2939f13a423b8b65714f19eb249493d89cad774460dd08c1345124d3d10f85ce6875b5f7049705f993c0a3146e5d9
 DIST jaraco.stream-3.0.2.tar.gz 12784 BLAKE2B c9a9a1f940cd29cde67b624b0b7ac2dd426888f71d29f4bc4920eab5a7ba15713e5d5e57504e9f4f69f25d08a8cb2e2a1024c91c89b8c3aa8bb16023d84f33c6 SHA512 fce486caa9f27f3cfe7775858892d2865fe1c1656a8d369ef9321057716f25d7a737abf2a28fe7827efbeba2daa3b7992ec4fd18807751bf1fee6f48b238ab01
 DIST jaraco.stream-3.0.3.tar.gz 8877 BLAKE2B 85289efe8e04e93cbceb0053f5025cad3d073deeb113806e25ca06fb88a9b082de6805305de85d1f17b77f61d2d0f4683b2b21f670102b03112b8f7a3fdafd91 SHA512 fe50c21b26e734c9c2d0b7cf8a1c8cc8bab80417adf073a4ae213ba4067aa33e2f6c8886aac996971d2f98aacd295d9999aa3ac7dba24dd952cc27d15bef22e2
-EBUILD jaraco-stream-3.0.0-r1.ebuild 1288 BLAKE2B 68a93e0bf746149b7e0c8c3c9fe591453922e02fd6f988396a8351abafafd4d61afe4b86eaf6a49c6d84145719fac4ce1b363d70270d0c1e2134146619c7d08b SHA512 4f33d6cb1918011727d1e65671aee9f66da9b2aa6846e3764b16c8efe97423f04d16f177a0722df3577ce70e89b3e95f80663f65cb58e9cb2ad0c47336423805
 EBUILD jaraco-stream-3.0.2.ebuild 710 BLAKE2B 8eb07c06ca6d4d9e4396bdf98c6c2c12c8ac4f86538fabba9acad500da0fb166a50bcb510774ed9cef325b4ba8f6b4b0e22b36119d24f278f989621c4f369534 SHA512 9516d8bbbe8dcf80b3643f1eb204bc84140c904d56831fcff298ca7c1a200948a9917dbe2864c80d66e07fd93552cf826bef1e95af2cf3137f82bea72b9f3fc8
 EBUILD jaraco-stream-3.0.3.ebuild 711 BLAKE2B 5802c0a97c0c43c0f447f761dbc0b7c101c4e25127fcefc7aed2d60f333b5c8df56b2d338e9298030ae6a7019e17858b1307b9381fd73282ec558aa38796c6a7 SHA512 682b9bb9bd462f11e8e82877081cf85650d8c0f9d897a20d6c811558a793841be99ba46eeca5ff6218145601cc6ed7eeea0073c17c5f1d6eb060328811b87cb2
 MISC metadata.xml 627 BLAKE2B d7df9690741346d8a29c40010368b230b29fcafc7be80971615ead75459146b385db8a2c1e8aa2dbfbeda0a9d74ddcd18030a3cc541685dc161201fc26d2207b SHA512 5d92fae956277e67da1f399fa0058421a5ae39f3f633ab4ecaf80f8303303e8da2fcd0ba07edeb833784936c580033e3ca614fe5899d459717ce29fcecefd531
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.0-r1.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.0-r1.ebuild
deleted file mode 100644
index 173d7a6205ea..000000000000
--- a/dev-python/jaraco-stream/jaraco-stream-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Routines for handling streaming data"
-HOMEPAGE="https://github.com/jaraco/jaraco.stream"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	# Skip one test which requires network access
-	# Override pytest options to skip flake8
-	PYTHONPATH=. pytest -vv --ignore=jaraco/stream/test_gzip.py \
-		--override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
-python_install() {
-	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
-	# note: eclass may default to --skip-build in the future
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/jikanpy/Manifest b/dev-python/jikanpy/Manifest
index 4032aa95daab..0168c3e6bbc9 100644
--- a/dev-python/jikanpy/Manifest
+++ b/dev-python/jikanpy/Manifest
@@ -1,5 +1,3 @@
-DIST jikanpy-4.3.1.tar.gz 725938 BLAKE2B 5e011ae4b6d267ad6a6a99b2d28a3f11c4b8949cc1682524d966ac441cce9c527465455573ec873360865f9b913bc14b5c4448ee681540a01bbb95f67c38dec2 SHA512 43170c3512393c50fd859e7481cdd6cce874bd54415959c0660d0804f10546bd22b836bf3c27a86946fc771e92192e28dd8ee02c71796f799b4cf748102d5e3f
 DIST jikanpy-4.3.2.tar.gz 726102 BLAKE2B 754a174a5c67852701e94d817ab84462cbd1aff9f18737cdf5c7a1e20c91ca325d7c34dfd9467ff337d24fd7d3896880137f0695afeff5a436b0d40a96d4c89d SHA512 48dcf154f5b438b9381eb7d37a5a603d77793c2e2a7f17b4315e3f44a735c83bec076ee44969002a5ad2cbdd6b5cf83287b961f5d96603ddbd6c534db78ee3a1
-EBUILD jikanpy-4.3.1.ebuild 675 BLAKE2B c8e320f2608a914e8b4a3fd2a9904f7f273e8eecde82c445705248795769c2caab393801f5a50ff44603157ea205457a014ad91151780f3736e3512b1c5efe80 SHA512 652152bba9b93a07d2244da71ed67bec4ca58d22fea4e49732feda3a44af3e4768196bc02fcf352dab16f617d4fe7a0f00d4320924eafafe43d249a67632c9d4
 EBUILD jikanpy-4.3.2.ebuild 708 BLAKE2B a09b5d49fdb55a54bc20e4b992d547f4cee32f9576ac73b1cc26d291224b6bd1430d4a91d12132a94aed3f4b848cadc7cf59039e86d6a28b63d04e2f9d62c4c1 SHA512 fba1493726db5936a9c3cd950cc3f45cd1556ef620fc8cc9b0f18e8886e36af05132069efe527852c8b157835ea494385fe4736a5152c8600354829e9b09a4e8
 MISC metadata.xml 403 BLAKE2B 75ecf66a566e7c250152681708f0c6f7151376979228c0e8da2a653ac769529c99621c4cceb9b4d8ec3162bf5ea636ea5b7ff0192d0b4f3d5e84d3830376a988 SHA512 1c3300afc78056a75cccef0a2c954069753bf804f91031c6e2d7a1b67effa6265e0d652b0686d38fa7e258112d1b2d9cbc557dac20aba43f408b8ffe32d9d3b8
diff --git a/dev-python/jikanpy/jikanpy-4.3.1.ebuild b/dev-python/jikanpy/jikanpy-4.3.1.ebuild
deleted file mode 100644
index 8dac8ee8e239..000000000000
--- a/dev-python/jikanpy/jikanpy-4.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for jikan.moe API."
-HOMEPAGE="https://pypi.org/project/jikanpy/"
-SRC_URI="https://github.com/abhinavk99/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="
-	test? ( dev-python/vcrpy )
-"
-
-RDEPEND="
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-
-	rm "$D"/usr/CHANGELOG.md
-}
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 96004eb8ec1a..97804ba2558f 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,7 +1,3 @@
 DIST josepy-1.10.0.tar.gz 58662 BLAKE2B 367d97a316c3adb33b9e3e2cc8400fc95fef09c5640c9747da852c0c1913dc6db3341e5b40bf1bd54d5f4619ee05642de1a72566f0d41c44aed731da8e341540 SHA512 517476c4b4df35b066f48e20e2c31bf458b998553a740dbfa4a682a94353db1cc9d706cee9429cb34b9347e8d78b97bf4a8f930334b86febfe56f5c9f779b42f
-DIST josepy-1.8.0.tar.gz 57507 BLAKE2B d395f08db9c46d37555f2cc540ab7af79356e32b60763acfa2116cdc08a46e51d75f56e6d393dd28c7dfda5f2012db5f4d5b5cddecf74809a01ca3dfebeb598d SHA512 50cdedfa4cf67055ae65dfeef2328ba7bb369fb8b763b425e4ca73108555c9cd04f12a644309c2f2e1db50e1d227be3bdbd00037e509d2b2d82565c213b81e4e
-DIST josepy-1.9.0.tar.gz 56932 BLAKE2B 0de67823c5015f3665323d33c96a97a8611d333e98a8229e847f41ebb6bb81c948001ecd3cbd46220237f40270dbb0e0418676b3c130f1765fe8d420abbd73b7 SHA512 b3a64a579d23aa87323f01ae3859fcb2cd9a699f160e43ebe58c93e11e5d5c5031cd257af1fd0400d982929eb4c06495c9d4fa09580ffcb4f6a4c09d0f191bd8
-EBUILD josepy-1.10.0.ebuild 794 BLAKE2B 2e0a5334cd9f69780fbb1142ebd535325e17dcd15c31661755344c2ff017e844721518aeaa8824620e0191010c6f978ce1b7aafe63d73131042583f08ad72a91 SHA512 5b0fd8e0dc211ce8d57b1faa520817aeea4217cfc4bb6ac23d70032512dadf892cf94ca00935c30562115cd685f431469ea56e6d06f938ea439906247d407ca2
-EBUILD josepy-1.8.0.ebuild 785 BLAKE2B f6af24b68c94abcd4895914eb09b551ca7c4547144a1b3521b6b16a241e02609a9e33afb36015f63534e2999b500128c0e5890e3a9e8fb08a9ceaf976db671da SHA512 adc17aa849287d6ff8defce9bbfaf29d7d60c642cc2a476d7a1bbbc09d645c3fceda2130ac155c439ddb9f7a422d124952a628704945f7fcead6a620ad85480b
-EBUILD josepy-1.9.0.ebuild 787 BLAKE2B 61162986a2e20ba565ea145ba679afa973e25833a2e5956e5e020006abaa1ff096e8a686c4273d24a62f45efb2ded2529402f6bcc6e1e4b08a0a4415a985766d SHA512 2449d55ff461a3fbf3fa0f05b3a78daf9d17570350e5710e02b5440ccd15bb9a2e7c50c278d973e5ed15c8ff1fe8affd1a8917ddaff9cf92d67472abed42a4ab
+EBUILD josepy-1.10.0.ebuild 792 BLAKE2B bbdbec5420be98fd8132b434703bfb0401ae43eca7299bfb3854ea0cf8757bb6d502298f51f9464dd20faf8e5b838d8c547983a855e432e417330f0cec3dee48 SHA512 e5157eeae1f4806783ffcf908d946f721fa531af5805cacad133e3703eaaf00bebe4c1521873d3e743996a824923c0560ea683b2d96feae55e1f8b3ab781a740
 MISC metadata.xml 720 BLAKE2B bfe4668c6be6fcd57f41af649d31ebe5e4d96db8a0d851ca9c8365f42f1752e820f7dcd04da9ab974f8e9c99ab443bc7b516005ca510f4dac9390616b9135269 SHA512 be0b55bee1d51c91cda3893a2751ac9e8440b61c106daa9223ac6ecb3cd20e06b41dbad892e0e647e899a7a1eef1e985f29ea9a355a8c0d50524f599aec3cc88
diff --git a/dev-python/josepy/josepy-1.10.0.ebuild b/dev-python/josepy/josepy-1.10.0.ebuild
index c74c9cdf5565..99f70fffcf0d 100644
--- a/dev-python/josepy/josepy-1.10.0.ebuild
+++ b/dev-python/josepy/josepy-1.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
diff --git a/dev-python/josepy/josepy-1.8.0.ebuild b/dev-python/josepy/josepy-1.8.0.ebuild
deleted file mode 100644
index 0345e440d015..000000000000
--- a/dev-python/josepy/josepy-1.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="JOSE protocol implementation in Python"
-HOMEPAGE="https://github.com/certbot/josepy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-"
-BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Remove coverage/flake8 options
-	sed -i -e '/^addopts =/d' -e '/^flake8-ignore/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/josepy/josepy-1.9.0.ebuild b/dev-python/josepy/josepy-1.9.0.ebuild
deleted file mode 100644
index 80ada4d0e18a..000000000000
--- a/dev-python/josepy/josepy-1.9.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="JOSE protocol implementation in Python"
-HOMEPAGE="https://github.com/certbot/josepy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-"
-BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Remove coverage/flake8 options
-	sed -i -e '/^addopts =/d' -e '/^flake8-ignore/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jq/Manifest b/dev-python/jq/Manifest
index 10f31e9d907d..c6ef19084507 100644
--- a/dev-python/jq/Manifest
+++ b/dev-python/jq/Manifest
@@ -1,9 +1,5 @@
-DIST jq-1.1.2.tar.gz 70638 BLAKE2B c22db8ebfbe74382c3b4ccda1a13c1758e5aa195c0c9f3192f1220f8948fe4747d3f83b7448089b96a9fa3a2f4167cf50b43901beabf468abb786f2a29b3b984 SHA512 5046bd61135e7547c345f2e89ee2af2f64bd370ee39e301b62c8fd9d299590305e0f9f7f6e0307f59fc6b7eb05659df82eb5bd0a162985e615eaa8d79bef58e2
-DIST jq-1.1.3.tar.gz 71393 BLAKE2B 9cfdced8cad9b13179984d35e98f4094754746f1dbb23c2c0041eed7f6b5c7f348997681de8b07f59a6c6479dd6b31fa2dcdcc2f118e5cb92d5338767ea8fda2 SHA512 4aff64af748bc363917993385c8db762781f1e618a7f17c4de87fd654941c97b25d30819c0ec57695d08013f149ca9bcb58e6239d148dc719f73ecf78c41a5f0
 DIST jq-1.2.1.gh.tar.gz 10321 BLAKE2B 8bc2c88ae553dd53137c11d4f599e01398d21811a02b4f33f81aeeafa9009f58a56074c0bcadcc6382d86d2c7ada792d442f9c660787e131d0e85c95fb7cab32 SHA512 0b6dda04c0b3c63a5bf41f8a73dedc3cd889683f3e89c99cbf258c839f35f66d19a6da5cf4096148cd17a3fb1a58ba0e10d052ce46a1a18af845910e00ff5d86
 DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
 DIST onig-6.9.4.tar.gz 908702 BLAKE2B e6e9939f284569408ba01b8551960bc939bbfdca425f8470499f5bb83ead7b6b09898f6f6a09d5d8c26d74d5416f6e5e9e2f00fbe7aa9eb820edb8aa4a3050cc SHA512 ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b
-EBUILD jq-1.1.2.ebuild 956 BLAKE2B a0c941bacc568bc2d57f3b22129d14d0b615e0376c83eb7eb8ec669bc3f3d569dc376fcc1922b3bcc370bf02d5eedd06d68e5e2a16789932a2243ce63667c900 SHA512 7fcb33f376fb9f6d94cf865d86ae3ee56472fd9d2e82ba5ca0b780c5be8322be4a81c0b4181abd4ed32fc4b12fd4e29e3c9225a30ca7aea93d8e4b092725f680
-EBUILD jq-1.1.3.ebuild 956 BLAKE2B a0c941bacc568bc2d57f3b22129d14d0b615e0376c83eb7eb8ec669bc3f3d569dc376fcc1922b3bcc370bf02d5eedd06d68e5e2a16789932a2243ce63667c900 SHA512 7fcb33f376fb9f6d94cf865d86ae3ee56472fd9d2e82ba5ca0b780c5be8322be4a81c0b4181abd4ed32fc4b12fd4e29e3c9225a30ca7aea93d8e4b092725f680
 EBUILD jq-1.2.1.ebuild 1173 BLAKE2B 863438f733822f86687b30e715179b94b786da59befb85631fb96cae9312e33d3f09c130268904248d12f1d4abab06e58bc715f50e73795810aafd7fc7ad8435 SHA512 c39f0ead6055aaa7aaedbc49692b1bae3ba9face3d1a1b68e3a31480b79a8b9f70085337896e91d906929995665c88671ba48b6e3ec7d76a08165171f47aa5fb
 MISC metadata.xml 367 BLAKE2B b17eb2d9c460774d98ba18faf8a09d1c9c711433d0dfcff08df4f769411db66fdb2241d12ebc706664cdef98d9dbeb290614446112f53ecede571f77aa085174 SHA512 399b63613673deaef747fd380d6bdc086a4e4b57c5509b15fd6e031ea613ccf59641c95064fc7dbbf61f8d879fe03faf7e8298e4e8792a8a0b7a2bb3225e77c9
diff --git a/dev-python/jq/jq-1.1.2.ebuild b/dev-python/jq/jq-1.1.2.ebuild
deleted file mode 100644
index 51f86a3f79aa..000000000000
--- a/dev-python/jq/jq-1.1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for jq"
-HOMEPAGE="https://github.com/mwilliamson/jq.py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz
-	https://github.com/kkos/oniguruma/releases/download/v6.9.4/onig-6.9.4.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -e 's|import requests|#\0|' \
-		-e 's|urlretrieve(source_url, tarball_path)|shutil.copyfile(source_url, tarball_path)|' \
-		-e "s|source_url=.*kkos/oniguruma.*|source_url=\"${DISTDIR}/onig-6.9.4.tar.gz\",|" \
-		-e "s|source_url=.*stedolan/jq.*|source_url=\"${DISTDIR}/jq-1.6.tar.gz\",|" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jq/jq-1.1.3.ebuild b/dev-python/jq/jq-1.1.3.ebuild
deleted file mode 100644
index 51f86a3f79aa..000000000000
--- a/dev-python/jq/jq-1.1.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for jq"
-HOMEPAGE="https://github.com/mwilliamson/jq.py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz
-	https://github.com/kkos/oniguruma/releases/download/v6.9.4/onig-6.9.4.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -e 's|import requests|#\0|' \
-		-e 's|urlretrieve(source_url, tarball_path)|shutil.copyfile(source_url, tarball_path)|' \
-		-e "s|source_url=.*kkos/oniguruma.*|source_url=\"${DISTDIR}/onig-6.9.4.tar.gz\",|" \
-		-e "s|source_url=.*stedolan/jq.*|source_url=\"${DISTDIR}/jq-1.6.tar.gz\",|" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/js2py/Manifest b/dev-python/js2py/Manifest
index 562e5a182741..6a923303b47f 100644
--- a/dev-python/js2py/Manifest
+++ b/dev-python/js2py/Manifest
@@ -1,5 +1,3 @@
-DIST Js2Py-0.70_p20210218.tar.gz 1969615 BLAKE2B 4702b2e771bfd2a5158a3539c33932335816c74f9dbd132679036aa2b7e53796764dd852e92d72a35ecc31efa34b849776c45d8c81e80f85f59308edf0996f00 SHA512 757c895bc0ba933020336a70473ec4455cb93c17040a39f17d645782011ea72273291448f3448ffd34658b48ada45b77facf3d326133f1c0d63e2e26e2cd7f30
 DIST Js2Py-0.71.tar.gz 1969618 BLAKE2B 293a830f4188e66927b23900e8c376bf1a4bfdfa8726e33aa5aa75dcdf735cde89ce463741c142fc7e487ae89c7c11421e459d2fdd09ba88edfe953e4e087e42 SHA512 75bae61619d4766117f3c163d36427f3019825ecb08b745aee7c3b6f2d33a4ea8507ca180b63c0a8e575a5f9491eb64d6963acbb912edc7b934a676b38814597
-EBUILD js2py-0.70_p20210218.ebuild 1174 BLAKE2B 0c29b1ffa0f9807e5ec7b14779aa7b728e6cbb6d7209a38027324c0cc138e6be53dccc0d72c9e1c2404e5ac033a014b62eadb7e0822f46217b1f5076281d91f9 SHA512 c6edd54f7bf75c81610fd20b749535f9a67801ac68f76e411a88c0a48f63acb91e6c694d2f8d8b71b91dc3dd4fd51bd7fd85646d685d22baef9a270ed5394d43
 EBUILD js2py-0.71.ebuild 1121 BLAKE2B da75187fa5e359779515c34c5cb9838f5d7297fc171079e61bf442c9f3c2e57b0d1727856ef2a7555335f7e4ac22beae43bf18ff17e5a407472ef3ea32bc6061 SHA512 95aeada16c29663c2b5cd870bf6c8e9b458ae1a2a68d7abc5415fa88e5c0ed545923b9b83531f43158838c2ba37c2bf0c7c0bae57b35fd0c3b4a9c5fabc14c85
 MISC metadata.xml 573 BLAKE2B 263ced60d5a2ef09b613975199450d19fe5b0472e2280b8f3f539c2e2f9595c2e7a4f397cd5ee0b560c6134a7c56d0a2023011cb96c79166d1113ff5b30803b7 SHA512 a17d19fdba074616db47859fb31cf1d9a560584cc613b552fcd27688d19dd02c372add612b547df44c982b27cf88074b179baacb932b8e1e9692010b2e6eb1e9
diff --git a/dev-python/js2py/js2py-0.70_p20210218.ebuild b/dev-python/js2py/js2py-0.70_p20210218.ebuild
deleted file mode 100644
index 444e9561e4d7..000000000000
--- a/dev-python/js2py/js2py-0.70_p20210218.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_COMMIT="ea16b519a0f72e17416859a57890b8388fce6e39"
-
-MY_PN="Js2Py"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="JavaScript to Python Translator & JavaScript interpreter in Python"
-HOMEPAGE="
-	http://piter.io/projects/js2py/
-	https://github.com/PiotrDabkowski/Js2Py/
-	https://pypi.org/project/Js2Py/
-"
-SRC_URI="https://github.com/PiotrDabkowski/${MY_PN}/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pyjsparser-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="test? ( ${RDEPEND} )"
-
-S="${WORKDIR}/${MY_PN}-${MY_COMMIT}"
-
-python_test() {
-	pushd ./tests >/dev/null || die
-
-	# Tests require "node_failed.txt" file where the logs are kept
-	if [[ -f ./node_failed.txt ]]; then
-		rm ./node_failed.txt || die
-	fi
-
-	touch ./node_failed.txt || die
-	"${EPYTHON}" ./run.py || die "tests failed with ${EPYTHON}"
-
-	popd >/dev/null || die
-}
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
index 12066a0dfd34..cd4ff9218ac3 100644
--- a/dev-python/jsmin/Manifest
+++ b/dev-python/jsmin/Manifest
@@ -1,5 +1,5 @@
 DIST jsmin-2.2.2.tar.gz 12705 BLAKE2B ff14d28c753443c4a17e19b7205b739d5a177eeb8074e4b16c7ae7e5f816758e1f54e07ceddf90dde70cc2752f9dadee0dc71754b2de3343256f3b1695187bba SHA512 e4fea940d7b5e1c0d7dacad70d90a242a8ba178423c886eb60ed7a36b1fba9ca67b5118f26e9a96058b86d3f612d40a21e62cdccd5858a2012a8f222fad3277d
 DIST jsmin-3.0.0.tar.gz 11519 BLAKE2B 192a3c8e325e9c3f56b39be983272a7f5d0c6e241bfff41ce3b064cfb60541d150041ee58e7c033b0afb56252573c3a6f10ff6e74658a9e7647e06672308c86f SHA512 46c42d1306fbda1d37324b514650e1ede50db40219dcb54b9b845bc91c23eeb865b2fcfec70cb44ade61439d1c4f96d35bfb15279ec25e0e39ab6023ef58c4cf
-EBUILD jsmin-2.2.2.ebuild 465 BLAKE2B 9ff8a27d8975c53020f8e5365b960ad933c0f6e6f787c79663245358c48f6529dbfbf1b7b78dd0b925d92a0356cd61c7215a198213c0341b71392845f3a827ec SHA512 8fce447422b0b2e0424d615c02c9cadc37bacbd878a5b0c71c9805761df906a86a0179f37a7300846bf029909fc86eac1615c5d5be03b7bd426a0670d25f041b
+EBUILD jsmin-2.2.2.ebuild 520 BLAKE2B 2d2cc51d0c724850c66e1601237f68a34f099006f134f74631787d1e95fb162544c6da8bc7475b8e7c66f0f10f0a6d42fa7514d4d17616d195712108b4c2f480 SHA512 0a371bc5d5e4aa72f0658bfc06f00a39180169e4493e0b4aa36034320e027a0e1e9077e254268a813511956b94df49c558ab5b3fa4169bbc7811cebeec10d7d1
 EBUILD jsmin-3.0.0.ebuild 517 BLAKE2B 0e905c0d4f13060ef7c94988bd4c8e72898876d43b22764de39f6c975be8ec56c65442919ee6022318939a83193c53f9e96a44f4c98a20daa88460ac97c0cdb2 SHA512 89143d6f9709312147fa85100788d10beca76aaa0e4fa6857f83f747afb3e1058f3ba5005399387e687a6b5c5276d699b20f2ae3e2816b3c311dc69fb896a78f
 MISC metadata.xml 398 BLAKE2B 93a4b03ba0d137ea56bec7154a9313bca465b2ea839a446d1d6ec2a9e9b2254d5dc832374438edcebfe211c7579050319acb9552633c4de82432c760ecb91100 SHA512 dae9577169fcbea94ed427a6218e0b41a8abe17f01e5870e246760381b3d355b75b4985728cce4d88474bef222ca2fb6dd30b84264f7e10fbe077736698e30cd
diff --git a/dev-python/jsmin/jsmin-2.2.2.ebuild b/dev-python/jsmin/jsmin-2.2.2.ebuild
index 40f762f32efb..51ecae515247 100644
--- a/dev-python/jsmin/jsmin-2.2.2.ebuild
+++ b/dev-python/jsmin/jsmin-2.2.2.ebuild
@@ -15,6 +15,8 @@ KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 
+BDEPEND="<dev-python/setuptools-58[${PYTHON_USEDEP}]"
+
 python_test() {
 	"${EPYTHON}" -m jsmin.test -v || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 4df9eac6aa2f..c52bca7120ec 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,6 +1,8 @@
 AUX jsonschema-3.2.0-add-webcolors-1.11-compat.patch 2146 BLAKE2B c9b2e6539e20955fccd4e6c1817ee4b22b645ac98d23be6f1f41ec62a11461546b7ad2e43028d8da22456422638bc08f030dca76a033238a258de11b9d72235e SHA512 ae8dc22aa163bd4e206f42fb450c4a3de78ab448c99dc754e8a97d4034d9ebb5913b85a8de1f365ff2145cbba69c4ca57af1bad7a491565dee86f714f7f40258
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
 DIST jsonschema-4.0.1.tar.gz 290999 BLAKE2B d693a33ef705a401187bdf603aacfd0336eab16afc0e38c5133ff6a74e4f0b323172d5abac0959163e40f546eedb75fe2b71f2ca53e7bbe1bf4f00ad977873b9 SHA512 50a2dd6423e8aca76e0a33e33a63bb7d1500abac891076426112c4577277d1f0322d06ec0ba5a9f47c65e5981f0cce768801e55e2f03ab6b0b6d2f884249b5fb
+DIST jsonschema-4.1.0.tar.gz 306755 BLAKE2B a98f1050943543ac51a2e0a7242a8bab909805d660a21e13909748e847493fd7c1f513beb3dac1126e57ffd23bf6702bae52902a5ac6aa7ab94b39833fc40b0c SHA512 288c28d80dc3540386db8774783bbba67455cacd81232aa41e065a9b22fed85dc1bdddb955f8438735bef0f1eb2b2947ab07c66344adb486ef77b31b345f1182
 EBUILD jsonschema-3.2.0.ebuild 1283 BLAKE2B 213785899c5e9ed46d98791ce02b45eeb96db799b3c26efe2285246bbd7e377a00522c1cba770f4e139736faab06d3aecc850edf2e5da2c561fd55f45f15666e SHA512 ca901919c61d47765752600d2b8390076d9a94a19a73e02e9d6259473e876e0aa84a0c7237b49bdecfef4b0d5ef449303dfa90afee63b910b900183e73823b87
-EBUILD jsonschema-4.0.1.ebuild 1186 BLAKE2B a17535666c010838f512df54d8f8a33825947b6fb4323f1e5cd0e3a72337f9fec50aab0ed48ec3fddab0649f1e31115cf9d15414ffa0a34be18b57c53482ab13 SHA512 c4602d9c81f7b13b0c4018b0756a2c754f85ecfa5ca82480aad2a7a03c64fdbb5637ff0fe4e5f12510779c230e93053c16baaa68f6b6d560e93d74e83d6669a3
+EBUILD jsonschema-4.0.1.ebuild 1193 BLAKE2B 3dc73b69d491147de81bba8f4aafbdbef045b59ae13dccbaa2c49e9c501c068d210040f63f82d5e5435513a8fb2cfa2f3c19cc57867931c74aef0f88fb86829b SHA512 4355e348f7eee3d2409572fce912a16bb1b9da426dfca6eb70940d7e379b45dda0c185fbff360e872949cdd5b14ea83f4d1fee3281be17f859debf70ce4e8ae2
+EBUILD jsonschema-4.1.0.ebuild 1211 BLAKE2B 2fbb0abe4b78b3b7046d4eb26a110eafd7235159b22ba7e25e2a8ce8ae31419f72a7814ab7009c55cac07eac73fae335a673c6bbb7286026fdeca4952d716562 SHA512 541714b48dc7abc571380f07a9813bb5212a86e61ff5fb0b184c0b5bc70710a8f609ff02109dfa3e8ef6f2b3997e1e93c3ccec3bffe47a7b4ac1a35ab0b7a663
 MISC metadata.xml 692 BLAKE2B 16ae14e9b64feca61846e85fc4b7346bcd19e0264fb04fbba4e14aaeb391d43ad230bd148486936744248b1b49627c775dd3b56afbfedb2b6b3b1d8465c8aa4c SHA512 dc301a6bbebb6c0b131db43dfb6c7de88decb1c362ef0097cfea617eeed7935dcf5d5be5a1e8bdf74d60910f2733e45f15805e2a98d8e8693117df9af64ee9e6
diff --git a/dev-python/jsonschema/jsonschema-4.0.1.ebuild b/dev-python/jsonschema/jsonschema-4.0.1.ebuild
index 8c008cd513e4..fad4177993e3 100644
--- a/dev-python/jsonschema/jsonschema-4.0.1.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema/jsonschema-4.1.0.ebuild b/dev-python/jsonschema/jsonschema-4.1.0.ebuild
new file mode 100644
index 000000000000..904fc6ee1ce0
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-4.1.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)
+"
+
+# formatter deps
+RDEPEND+="
+		dev-python/fqdn[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/isoduration[${PYTHON_USEDEP}]
+		>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
+		dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+		dev-python/rfc3986-validator[${PYTHON_USEDEP}]
+		dev-python/rfc3987[${PYTHON_USEDEP}]
+		dev-python/uritemplate[${PYTHON_USEDEP}]
+		>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/twisted[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 9aaab2030722..12a2dc0c77b6 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,15 +1,5 @@
 DIST jupyter_client-6.1.12.tar.gz 301499 BLAKE2B 8041b84ad2e89413ee60d1aee2e49a67a89b5aad1c3118c8fa7d7d719c8ec2acbc72278c9aaea095cdcb89235800d09b1792b2138c09a4aad59ceaaf695af431 SHA512 f31ff1a24b264c32d35d07491785e1d77935cdb463243e90e4aadcb0a093a074cdce75f01662591766588f39b146077639ca697f71157309dc92f12ae04d5cdd
-DIST jupyter_client-7.0.1.tar.gz 317467 BLAKE2B bcaa4f58071e0c90e81afb010a10ad221793a186aba0e7ae233538c810b787e3a0bc734735cd20750500c9d74d6c5f548f7deaf3daa3e989d75b5f9cbb5344ee SHA512 5665018294e87b0ae0fe58a7281e205e1668c3676f7092128f4c6ce8eb13e53983fc888508e913085beb29b13b1aa46307c4bf1c8c25bfe1f9efcfb7254bdf3a
-DIST jupyter_client-7.0.2.tar.gz 317686 BLAKE2B f837d60c1013d6f7db7185112820bc40fe55707403dd179c72c93d7f5a9c752436b8454e0ffb0a133c77a4a11e87ea310d86706145d0501a0ed83d36652cc278 SHA512 24684df13947077add0931fe9e8a2c2b629db120c1554123f36b7c9e736f502f9553c63813de93ff84733eb4a47eb0f5dd48961e3c18527fbd8fece23fbe6440
-DIST jupyter_client-7.0.3.tar.gz 318420 BLAKE2B 151cac17dd965f5a151e0de90cffda35d06943ef7548518f6bac9e977fa3efd02cceb30fc23b252c440541ac74a84396dc7a8787fffbbade8d91dcbc2d51781a SHA512 eae57dd9c2fdd0301cdb53204dfc043a228fa606236ee1eca9e37f4d9d213efd080ec1292567431e24d73899db0833984ed4db933998817d03aff1f674217362
-DIST jupyter_client-7.0.4.tar.gz 319415 BLAKE2B 795e10680b0183e6628978cfe2633eaac9d1acf62ca8f72c17cd9d808e9971ec63a251adb7e2f5faaf98f51b06508b55a27686d5a77020cebd858daf61954de1 SHA512 47d17b1369edfe7cac7f2450299558122d88e341515b46992bee716c4bc23f870c131ca1fe86ec8f48f558c2c3ab5c26b05d473b37fd2dcd19c24bc44ba60c03
-DIST jupyter_client-7.0.5.tar.gz 319487 BLAKE2B d8c4e518fb165fbbe6b2de8bd8623d37c9fda6c002753b8a115d615b0c338a6411c4713b974210af45fc40a021bf687b3bc1e7e4f0717c510f569cb7eaf6d793 SHA512 37eba11585d40f52ca5c7a3bf275ee7cd86b2222049abee4b92b32eb6e667e6e5234b8c1dfeb1f67e8bd0d80ee1be1ccf87ffea9f5b5a5e60f217b07063a085c
 DIST jupyter_client-7.0.6.tar.gz 320572 BLAKE2B 5c853fbdad3bc044ffaba27534d9bc4682797660cdb5d45121ae8f6cbf0fc5511c6a9fad14d26bd82daef17b32be14e51bf86c2ae672ed9b310141b29307ff9c SHA512 c836ba061da0461d6d27eb0405ba295ff67bf2c99011a21c9695da139c0a14513de292cdfff3ee00c2e1029c2a51f95094ad875a5f9cdec2fd99c3c079526e3b
 EBUILD jupyter_client-6.1.12.ebuild 1195 BLAKE2B a0f657674fc053873f7286634f54118c7fd17099871e95a63fb81b118e94841a2902e84568aeb5d9c1ff44dd9602ee9b8ea20c6e86750d0e4474a07a580d8a5e SHA512 b3ad2f9740ce824f6d03f4087a336fd11fc14286d70d6484c3e30ea752068168caccc3f749324155ca4f127e9e6dc73a4a9a1b45fd3b17736135347be0a76211
-EBUILD jupyter_client-7.0.1.ebuild 1344 BLAKE2B 5e51ddf361d64fe3e36259b11fd8e27b31a32569ac33c095f6c5b9e3443be3a6f4dd2e77f7a71e0ad3e9f0c81290c2cd2f129d0a75778eb1328ce207d2014cc7 SHA512 68642247b38a3b421a7ed92af36f85704bd39145c006d0627e674709fe90a4817da598382f06f921137c4f2b9746fe2f23ff69a2586859f19eb431c27d4545cc
-EBUILD jupyter_client-7.0.2.ebuild 1350 BLAKE2B b5b5eb8f9292009e6a9e4aeb1909f056dc8ce03163555388a8e2768b188d324b19eac787b85b6a91b16fef0e64732f30c0a3a4ddd91465fe009eddb992359ba8 SHA512 efc5f8370d5184149ed5c3b4ff45d291c08daff87dbffff464434b6476567b2fa5e33ed6cf9b5daaa9983b6e9a2cb9ffb41fe586e757d557941176c058789dec
-EBUILD jupyter_client-7.0.3.ebuild 1292 BLAKE2B b78b9661b2e7ea7a6fc3f2a639198dddda51d5fd0d8e528232ee6a610138b3cf8e56a175a4c6cccab9d9d56d1e91714ee9fc6ea805ec9c14557f050a2b17209e SHA512 9039b0420b6838e0cd436d381b743b8b7ac079a0a0cadf7dcfe40939e47264729b62aaeee5d271c0b79c94e7b97b1f55af484d30c8af8ab83e4e6278222b4917
-EBUILD jupyter_client-7.0.4.ebuild 1292 BLAKE2B b78b9661b2e7ea7a6fc3f2a639198dddda51d5fd0d8e528232ee6a610138b3cf8e56a175a4c6cccab9d9d56d1e91714ee9fc6ea805ec9c14557f050a2b17209e SHA512 9039b0420b6838e0cd436d381b743b8b7ac079a0a0cadf7dcfe40939e47264729b62aaeee5d271c0b79c94e7b97b1f55af484d30c8af8ab83e4e6278222b4917
-EBUILD jupyter_client-7.0.5.ebuild 1292 BLAKE2B b78b9661b2e7ea7a6fc3f2a639198dddda51d5fd0d8e528232ee6a610138b3cf8e56a175a4c6cccab9d9d56d1e91714ee9fc6ea805ec9c14557f050a2b17209e SHA512 9039b0420b6838e0cd436d381b743b8b7ac079a0a0cadf7dcfe40939e47264729b62aaeee5d271c0b79c94e7b97b1f55af484d30c8af8ab83e4e6278222b4917
 EBUILD jupyter_client-7.0.6.ebuild 1292 BLAKE2B b78b9661b2e7ea7a6fc3f2a639198dddda51d5fd0d8e528232ee6a610138b3cf8e56a175a4c6cccab9d9d56d1e91714ee9fc6ea805ec9c14557f050a2b17209e SHA512 9039b0420b6838e0cd436d381b743b8b7ac079a0a0cadf7dcfe40939e47264729b62aaeee5d271c0b79c94e7b97b1f55af484d30c8af8ab83e4e6278222b4917
 MISC metadata.xml 780 BLAKE2B 98556448199bd8a63d493b16bdde3942dca45b907f3e2da4f94fdf77bedf05c55b08e5b8f05b01c818f6440ebd21552ea8edd7b2a970ff07ce03e88873197df6 SHA512 76411204bca5fef604cbbf1d320eb7de0ba3faf66ce86f4f1a8488de43fb854a21ad8f4137b365b129e6e565dfd276169161e183b18fe9b7b0960beb1b790293
diff --git a/dev-python/jupyter_client/jupyter_client-7.0.1.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.1.ebuild
deleted file mode 100644
index e190dd1ddc2d..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
-		jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/jupyter_client/jupyter_client-7.0.2.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.2.ebuild
deleted file mode 100644
index 491cbc179b60..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
-		jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/jupyter_client/jupyter_client-7.0.3.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.3.ebuild
deleted file mode 100644
index 737c392b7525..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.0.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
-)
diff --git a/dev-python/jupyter_client/jupyter_client-7.0.4.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.4.ebuild
deleted file mode 100644
index 737c392b7525..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
-)
diff --git a/dev-python/jupyter_client/jupyter_client-7.0.5.ebuild b/dev-python/jupyter_client/jupyter_client-7.0.5.ebuild
deleted file mode 100644
index 737c392b7525..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.0.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
-)
diff --git a/dev-python/jupyter_packaging/Manifest b/dev-python/jupyter_packaging/Manifest
index 1ba78aace423..35dd084889b9 100644
--- a/dev-python/jupyter_packaging/Manifest
+++ b/dev-python/jupyter_packaging/Manifest
@@ -1,5 +1,3 @@
-DIST jupyter_packaging-0.10.4.tar.gz 21698 BLAKE2B 5490443e197861a53587fe744d749162e412b88bc5c1e5917cd6c145254e4feecbb8b3e3853bf5a3e360fc9ee20c3345af9c7a245aeb1b03639d99d1d69cb377 SHA512 066abaaa00be8154ea39cc3db0bfa4cfe03864c3e50a741f416606c2f8a2d2e0202943f390905ee46f99414168705b9c3519609c6ea16b3b7d54820631c3ba46
 DIST jupyter_packaging-0.10.6.tar.gz 21836 BLAKE2B 921e763e11c3973442fa819559d921618aab4010ae7cd4ca3314acb53c7fd7be68f10af46b4d0c9888d2648c0e28565c22ad47270a9d9a1c950640b38a2a1078 SHA512 1b59219dc14c3e44c0f100e9a46b614a8c4395fc26937622515e82f4ffa35c29d8101d6f56a3d496da9279e1e7fc58a91af83bca2b50875afaf1745706ce466d
-EBUILD jupyter_packaging-0.10.4.ebuild 1061 BLAKE2B 962d4d9a91f13e93ce9414afea56f3f60b5228c95530ea7cb8343cf5aa8e81a7af444de41654060eace026cdeebd494cc6614b91af630b58839ec1530bf8b8c4 SHA512 3d52dedfd365813d15b06c355eae9be720924498c0ffffc2cc8c2c3eb813d7304815ea61848cccf0d5a593c004e9bff30371d6bc3c5071714ee7b347edfbe81f
 EBUILD jupyter_packaging-0.10.6.ebuild 1061 BLAKE2B 962d4d9a91f13e93ce9414afea56f3f60b5228c95530ea7cb8343cf5aa8e81a7af444de41654060eace026cdeebd494cc6614b91af630b58839ec1530bf8b8c4 SHA512 3d52dedfd365813d15b06c355eae9be720924498c0ffffc2cc8c2c3eb813d7304815ea61848cccf0d5a593c004e9bff30371d6bc3c5071714ee7b347edfbe81f
 MISC metadata.xml 436 BLAKE2B f17433d8ea516577cca652a0bb111cc9879ab5de87e056bb2cf28b3440858c92d8a942672f1d9e8be219c0aa7cbc255ccd603eef1920660366384b642c04430f SHA512 f7bd149e6c92e1164a5fc424a99bf44a1e15fcde8000171ad5d35828221ab38bedafb9460969bdde5151013f80a5197c1c1940d8434fe950104f149e9e8c449d
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.10.4.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.10.4.ebuild
deleted file mode 100644
index 6440233f72bb..000000000000
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.10.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Tools to help build and install Jupyter Python packages"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/deprecation[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# TODO: package "build"
-		tests/test_build_api.py::test_build_package
-		tests/test_build_api.py::test_deprecated_metadata
-
-		# broken by Gentoo pip patch
-		# TODO: retry when we finally make the patch less intrusive
-		tests/test_datafiles_install.py
-		tests/test_install.py
-	)
-
-	distutils_install_for_testing --via-venv
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest
index a56771646b32..a03f3917909a 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -1,7 +1,3 @@
-DIST jupyter_server-1.11.0.tar.gz 419795 BLAKE2B 992bcadfd10cebc9d2c14ecc1489af91c161edc4fd8386d4b3e30c087737b3de723b5fa8d7f2cbb537e6f20568e6ed15f110e70781bc90cdc699fe6374ed3277 SHA512 9c8afb86af3669270e3103485500b635eb2dda35d731fb1adf3db997bb76ac61a769858525aacc6fb32ede7a299f0fc21991d0b64d009f506af232733b47b141
 DIST jupyter_server-1.11.1.tar.gz 420035 BLAKE2B 0676b0e126752ebeaa45e2325c34fe787756265f5ad35e356660485e5e7fd98a9ecaa029badf4c45815f25425e5a8a44133b6595698dca212f871b898c6ef76c SHA512 537bb9dbacabe396761a17be3280ecc0d28d63116a72386a7ff69bd8467f38909b7c2491eeb1f6b8bb7618b7fe661cd583d9efb8597ecbe88941c35096e0b1a8
-DIST jupyter_server-1.8.0.tar.gz 408312 BLAKE2B db385085a1a660d707cc84570627e754dc19105af5157bc42e259822c9e98364ab77a9a16403d9b43757a6e175102632e83dd21466dff3487101771b51fdeb5f SHA512 3c4c9d64b7f0e26a79b38bc95106e062f1c363a13fc3b32c3897bbb15a7d91a64e46926b35c07f8c5bd440f55e3d01ec57c54c8b244969b6af7f7e18347030cd
-EBUILD jupyter_server-1.11.0.ebuild 1879 BLAKE2B 85e16f835227bc659c4368840ad2ffd0cb6f713bf3170641dd0e8bf1f8c4f5deffed566d0bb50b333e5904b2b5a37fa3e725e9ec3b8633b8243de19fe1e06dba SHA512 b0c000cbbe2a0576497c3d8f0ee6243125d84a3728183c4fd8a4ebcd42f396dc2273a5b5e1fc93f2120f650884434d603391b6ccac79708d46a8b0e364212652
 EBUILD jupyter_server-1.11.1.ebuild 1878 BLAKE2B a9986b28f9888fb7a2f14c26985f1aab1765a3dbd6a77045a912256033ce7f407d3abd04241673a398459c4da41a5a6463680a76732009f50ab2ce7a41b55909 SHA512 62e47a7fddaa89fe5238fb24f7bd7145307fdbe7f7faecd76b78bf8368e936d99f51ffff2bc25a59d060e85257edb2a5e446d7310319a5a1f4fa5631423e4d10
-EBUILD jupyter_server-1.8.0.ebuild 1706 BLAKE2B f2cfda244b923780f94ae46b710667ab8ed6df65e839d598709cc6a68189c1415e5fde5586220bc95c9177d94f7770263a467ee91665b601d07c66e570c1968b SHA512 58c51546a0e9b1e81ed99702959c974bfdeafd89d135a5df7ad2566b4c0b627d12fdc656edfad267d0aa1696e391d56bb4877fb4c5d3d29ed4af3b47b27cae3c
 MISC metadata.xml 437 BLAKE2B 8c156ef827979c733d2cc253fb4683f45630c8a94d5c3b0f402ec9f140a4c1295a6cc5d5a51887c73775c6162d616374c6da350ee38af52621a368f2757a2c02 SHA512 6b14cae4ef6d1c7b1b06a3735b87975e7ec4991437829ccfc32706b0d4e531c7c78d02d5d0e754cdb42149eaa09b73f2fdf5d651bd3f444d767654e6ecac4200
diff --git a/dev-python/jupyter_server/jupyter_server-1.11.0.ebuild b/dev-python/jupyter_server/jupyter_server-1.11.0.ebuild
deleted file mode 100644
index 64cc66d8ca73..000000000000
--- a/dev-python/jupyter_server/jupyter_server-1.11.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	dev-python/anyio[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-	dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-	)"
-
-# TODO: Package 'myst_parser'
-# distutils_enable_sphinx docs/source
-# 	dev-python/pydata-sphinx-theme
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv jupyter_server/conftest.py . || die
-
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	sed -i \
-		-e 's:est_terminal_create_with_cwd:_&:' \
-		-e 's:test_culling:_&:' \
-		jupyter_server/tests/test_terminal.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyter_server/jupyter_server-1.8.0.ebuild b/dev-python/jupyter_server/jupyter_server-1.8.0.ebuild
deleted file mode 100644
index 2bd30f3b5c3a..000000000000
--- a/dev-python/jupyter_server/jupyter_server-1.8.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# This appears to require pytest-jupyter, but the GitHub repo for that package
-# is archived and it has been removed from pypi.
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	dev-python/anyio[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-# TODO: Package 'myst_parser'
-# distutils_enable_sphinx docs/source \
-# 	dev-python/pydata-sphinx-theme
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	rm jupyter_server/tests/conftest.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/kafka-python/Manifest b/dev-python/kafka-python/Manifest
index 1008fead7bdc..b72a1405583c 100644
--- a/dev-python/kafka-python/Manifest
+++ b/dev-python/kafka-python/Manifest
@@ -1,5 +1,3 @@
-DIST kafka-python-1.4.7.tar.gz 352844 BLAKE2B 812c185bf19f3398c358722a44feb572693556ec671d07f2d74d63e45473f5b6d35390cc0fa2c95b8c42a15b635237ffa3c3829adde1f60a7611ce4fdf06f587 SHA512 5bbf9f998fba12e8e7c67a48e82b04e745f1ac528684e91b7454e825656e4a68b8c369984308cff575241b7f808f52f16ab02b7effd6d6b4319215f44ae4748e
 DIST kafka-python-2.0.2.tar.gz 327238 BLAKE2B 9d8bdee1cedcc3c7c0bee9d900bb815552b29f50ec45b7db9d1052a26eb772c84d92648ccc0d498189fc44314f5c8c30529fa61cb983481f2e2480e009630f91 SHA512 e193a8fe5852d2134e854749115feba46a0b8ff748336989a27bf56acba1124dbb8a5d841670a67ee26eef030a686d931d03d329f978b2eef7904183e83d2594
-EBUILD kafka-python-1.4.7.ebuild 610 BLAKE2B 82c5eb243dd959e97b0b7efcb3ac8840f7f3c36e5bcff600100979b9b514b1dda3922f34bfa126a02f3204f1f1df776ab3143c676042c2d0fab68882a538251e SHA512 add04f189fa7a36c7361e0668dc015149bf1b15c5f390cc1552ff91789cb2305c88c8c2d665fe1f1affaaa2e8d8d7b62258e3ed1fa74c52a286a08740ffea578
 EBUILD kafka-python-2.0.2.ebuild 1239 BLAKE2B 98db7060b2cafd5bcb26b0314d571353a2a16a20fbee85c1accb98e88b1e859be9f364cff2d6c11542826f3963bbc2929e57aaf73af7ea9606c3f58de2de159e SHA512 9fb90063a8c25736450098eb40db2b67be3844536d9cdda5b78e769515d8a20ed3224ef36e1c0b243bc2af7cf9529851a3917313087068b9036a3e17b8e511c9
 MISC metadata.xml 307 BLAKE2B d5a0188eb0aaf189135a021a211b30e2b641f31c83260999f8e0cc4cd12d78a9db90c5be3e5f958dd2f2ffef3177c1833c8e7d2c1b7624c3ccb0d2d5c7ddb868 SHA512 7452ad3874e6d102ebfe6ffa1a1c0ea37d477c100cfc434f9bc7259d04e08789bd2a926dca92f8e819de337028751b4738f24b9f8d2b9bcb59ef85053177b78a
diff --git a/dev-python/kafka-python/kafka-python-1.4.7.ebuild b/dev-python/kafka-python/kafka-python-1.4.7.ebuild
deleted file mode 100644
index 0a7e9046e9de..000000000000
--- a/dev-python/kafka-python/kafka-python-1.4.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Kafka protocol support in Python"
-HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.org/project/kafka-python/"
-SRC_URI="https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="snappy"
-
-RDEPEND="snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 65824f3d07a1..5b568f1647d1 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,5 +1,3 @@
-DIST keyring-23.1.0.tar.gz 43668 BLAKE2B 7ef9a8858568ef8d0889b693cab55f7d2e61ebc3e6116b1f936c6b841ef3a50838b80d6315e5a04bee44a71b1e3bd1112d627603c8b9d113b12173d3442af776 SHA512 d3bd6c6c224a00f2d2aa0c22ec05a5e78707db37c62ed0e03d444ed94e2eee053f7eb1e4c387073753ca5c9b76a9f51d0bda8294f9ba2a326c84afd913a14293
 DIST keyring-23.2.1.tar.gz 44522 BLAKE2B 79ba1fb530cecad84ba94e9a27f32196367af92952946c07581d68d5e89fac93d9b7a33cad8d1a95ae9ffe1568ddc189cd17decea7113debb022dafba4472bfd SHA512 205f74d9457f65952b1cada1a829bb97318cb80689b410eedb49def3577234f715ec6420d7d12833255ef5098040d0a5186be47fa6b8c6db6036406c3ee2e246
-EBUILD keyring-23.1.0.ebuild 1183 BLAKE2B cb3e159c70bff82170068e461bcabc774eb8d6ae4bac0b8c525ee5d9af0b15f3418fef41aaeb3ac5ad5c90ca57264e3418903a1b5763e53876b2f338dba4025b SHA512 6b6a934fa0b979a87533cd0818ea34ed01e5072f770025b01830550d4c507dfaeacd75a5efd9a1149128bbf160847b44054a8ab11472b4789b9b4da69c198f0c
-EBUILD keyring-23.2.1.ebuild 1238 BLAKE2B e20171b43584911da4ef3ebf3f83a682746ec01ed7dddf8443943496f663e134075ac7f66e31c906452f51b50788da435e2eebba1361a9b7879346f05e485a49 SHA512 48f09195bd1eb57f3d4d543333e73740b228588954d2842ee6654197f498c63f989d367c6e05eceb9fb553fc72f6fbf62ea6ed7f7ee0cfdf7aec796b32cbef97
+EBUILD keyring-23.2.1.ebuild 1230 BLAKE2B 7bc7e3fec3844f458b5509c8fa48b7c0aa477ae01351a8d4d773d671f0a4c3130ce961fe8a63b6ecf36d2ab52f6de3a65fbb0c71f13c094bc191b804697c0047 SHA512 d7942c66f5caaa97cceda62c546b9d91bfe23f686eef52100aecf4e9894b3953ccab90ba8f91e664758949b5fe1ca6a5a295b8663eeb2fbc51e22e86c0c618e1
 MISC metadata.xml 611 BLAKE2B 7f938075d992467e01da200f0c859e9bc6a6128296151b3529b2168b68364605bd7dbadf69f7820d459d5db6950908e0b0acb09a636f1fc45862093df6d08334 SHA512 a0ad1729c53b18fedf227053648b04541f5adcf56bfaa73218e214f8c2409ebe2574a5917442c5218084b38da34691b6566f2c65390ef6487985a123f62f9efb
diff --git a/dev-python/keyring/keyring-23.1.0.ebuild b/dev-python/keyring/keyring-23.1.0.ebuild
deleted file mode 100644
index e3b5d94fb8c4..000000000000
--- a/dev-python/keyring/keyring-23.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/jaraco-packaging \
-	dev-python/rst-linker
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# this test fails if importlib-metadata returns more than one
-		# entry, i.e. when keyring is installed already
-		tests/test_packaging.py::test_entry_point
-	)
-	epytest --ignore tests/backends/test_kwallet.py ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/keyring/keyring-23.2.1.ebuild b/dev-python/keyring/keyring-23.2.1.ebuild
index 8ff091e57b82..33c2f6b01663 100644
--- a/dev-python/keyring/keyring-23.2.1.ebuild
+++ b/dev-python/keyring/keyring-23.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/secretstorage[${PYTHON_USEDEP}]
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 6b91e55bdf3f..5fa163bb9ff8 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,6 +1,4 @@
 AUX kiwisolver-1.3.1-darwin-build.patch 793 BLAKE2B fdcbfd2966f7f5e18859ca02bc85ef2928f053e49d4fa9bf9db5f086b32d74fd6d04488566ca63915cbd57b7a5b5fd0f3a9329c0b79918e40d487fcc3938f365 SHA512 e3031229d0e0ca18d3f0a9abe84aa3e0d8d62e212ea93551cecdd1be11698d2a73db5bc52c49b65a59681b0620f1718fab8c4093951edbffa6891495ec116931
-DIST kiwisolver-1.3.1.tar.gz 86948 BLAKE2B 4e03547842e831424aef5be880021aea8d0fef372900bcb9b55f2367fc89f728250b936702fd737807579be34e4ff7489d5669f5113e95612352a293d9f883ea SHA512 0f5c1e516c334d358b8679313035dd45386381965853005271c73e3f4421fb27e3ca5a43b4f2dc85d693f4151427dae9b34d372fe72fcc1a186abd85a54a225a
 DIST kiwisolver-1.3.2.tar.gz 89075 BLAKE2B 729880e3b18ac8c6c3e48d2fb32f00b4232118eb753f60837c7736c75a0f22e7a259aec46b76bc91286541847929eb4a92fcf9991650dea16d263f4d16beffc1 SHA512 e9ef20756df587b49f7b8e52ff388db6e2e551548ae7d60b6916586fb35249b10bda895a7be7635b300e6100ec1c7daf7d641de6d26d9b2c36055ac6c176302b
-EBUILD kiwisolver-1.3.1.ebuild 644 BLAKE2B f7fa1cbd833655980413fca628497313e7b059759fa6030c6108f5d4dba3b33b7f2bf0032fa796e7a4098f033a249ff1efe895ac46fd024ecb7c4d4b40de2f66 SHA512 6c88d0c5b6514d5f5e69095705b3a4475f240ffd622503a35418b940581fa131f352f3133395ac767e215f3b78266eda470ec70bac5868e305fb8d0b71625612
-EBUILD kiwisolver-1.3.2.ebuild 701 BLAKE2B 10032aad1c6a9e7a501238ec46852bd876d3396e37bc5cc86287cae5bb5d0717567bb4b2100475d7395acf07e481250743c15ed96126ee28968ecd82bec7ac42 SHA512 746d6fdbe9a1d952c5396b8211ec9b01befdbf8de2486c594cdafe9c98f9f9951e88ad93b48503f23b55d4f13f582814e39d5aaff055f39e61e12ab60f47e09c
+EBUILD kiwisolver-1.3.2.ebuild 694 BLAKE2B d130cb23722656bb146cea837e46764c3c1ce7a08dc11c6bd2cc962bd4f18187fa3f1fc17a0797bac352891c8af849ce77ada774e141e210356fbbe1ba75674d SHA512 180ff4b1d74ad996f7ea592d3e3e1004ab659cddc8afb82f31291115ca19f17d91409e1e691e27fc72a11dad874c580ee7788e8b7ca032a8c30120e023003e89
 MISC metadata.xml 366 BLAKE2B d724248e9950219de4990e67822a16781e1a28f41d863fde04b3e1212b982a86819636a621b6e23089b76042ebbb23e0944a88ef9ab4c4abe62103f12197e5c2 SHA512 526fe3a81426edfc4c050631133799d948d1becb016319e954491090b9f3f6d410958db7027b5c2e2386b40c783f8c984b2588cda56e3ac58f3d2b1a5a8af0f0
diff --git a/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild b/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
deleted file mode 100644
index 5213e27a6004..000000000000
--- a/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
-HOMEPAGE="https://github.com/nucleic/kiwi"
-SRC_URI="https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/kiwi-${PV}
-
-LICENSE="Clear-BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/cppy-1.1.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.1-darwin-build.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/kiwisolver/kiwisolver-1.3.2.ebuild b/dev-python/kiwisolver/kiwisolver-1.3.2.ebuild
index a6efd5b965a1..f49c71792caa 100644
--- a/dev-python/kiwisolver/kiwisolver-1.3.2.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.3.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/kiwi-${MY_PV}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/cppy-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/klein/Manifest b/dev-python/klein/Manifest
index 1179ef36dd35..4249472ce187 100644
--- a/dev-python/klein/Manifest
+++ b/dev-python/klein/Manifest
@@ -1,5 +1,3 @@
-DIST klein-20.6.0.tar.gz 125676 BLAKE2B 2ef9e4293cc7a727488ce4e95e2918eb3c5012559ff52699ef7d53d022d7238b33fc59774572ca8487870e8d242dd80659bca15c65c82b0aa76f45f8d8822fd7 SHA512 128b180c51c4457d3ffcd088e127d671d8260c3d62a80129bafbf6e3a2e47945290cd5ec695a64a1795465199e14c8f367445f8d90649f6384fd8338a53bb48e
 DIST klein-21.8.0.tar.gz 100578 BLAKE2B ea2535e93affebe822ff086eb5749481edf7811340a35b11319b7c23b23d3877f6208ac1ef6cc7a4bb9eedd33d087820304f2ee71695413d72308e83c47aa2ee SHA512 cce28865e172effb6044f73c1841875fa5eb55daf20dcea482d0764604ab826ca5063a4679165bb253953d54428a42c2082022fd273e2a1083aefa595a563ccd
-EBUILD klein-20.6.0.ebuild 1392 BLAKE2B 0124161e7e78d3ca95934cc7a68dcae16aa814c309c1022f031e7d04d2b8a768f866a83b91a38a1934df110fb18e0ef2b2c451c388132f93998e8a0ca7922845 SHA512 4a6d01b9a1995e4c5405a414b88615ba70cbe79e8b48e91ecc7a1d324371b9700b750dcd1e3a1c7548e437d326e93ff3a5cfbeacd362f6a1c4bbde69b13cd61e
 EBUILD klein-21.8.0.ebuild 1126 BLAKE2B dc26a8837dc40d162e1bbbfc28820d7822fddc20ed99c1103fcde4d709539d052cbd2f7f28fd32ab22f5b2d56d3e966de7eddc5bbf8bfc76cf357a0d8f9f4905 SHA512 3807b89de102defd80c3e244f26d62ca71c7a03c92ec61efedbdfd26b0a51b7c6a35b0d6eb5fcbbd85be6d5cef5e101cf54817a10d5d0c582b26defa396ae9b0
 MISC metadata.xml 973 BLAKE2B 870f3a89f25a7b230a3b837287ed3c0f96bb2ada0eeaf464b0bbf70c4982be57a783c73671309044053d24c57f9c77d79e72ec65d031d8ddd4e7e406822823fc SHA512 9e81588cbd096d31af040b48e467af6d124d4f4249abf808b4ee4a8f1171b5c02a8e5d87bcb869d8f4d86c3224c9e555a1e5f3d4aba8a1b2a179f3c5aa609726
diff --git a/dev-python/klein/klein-20.6.0.ebuild b/dev-python/klein/klein-20.6.0.ebuild
deleted file mode 100644
index 8a23e937e7ca..000000000000
--- a/dev-python/klein/klein-20.6.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="micro-framework for developing production-ready web services with Python"
-HOMEPAGE="https://pypi.org/project/klein https://github.com/twisted/klein"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/hyperlink[${PYTHON_USEDEP}]
-	dev-python/incremental[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tubes[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	# nuke irreleveant test dep
-	sed -e 's/"typing",//' \
-		-i setup.py || die
-	# known test fail: https://github.com/twisted/klein/issues/339
-	sed -e 's/big world/big+world/' \
-		-e 's/4321)]/4321.0)]/' \
-		-e 's/not a number/not+a+number/' \
-		-i src/klein/test/test_form.py  || die
-
-	distutils-r1_python_prepare_all
-}
-python_test() {
-	distutils_install_for_testing
-
-	pytest -v ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/lark-parser/Manifest b/dev-python/lark-parser/Manifest
index 30ce18d2cf30..eb2156ca973c 100644
--- a/dev-python/lark-parser/Manifest
+++ b/dev-python/lark-parser/Manifest
@@ -1,5 +1,3 @@
-DIST lark-parser-0.11.2.tar.gz 225851 BLAKE2B b4fec8701287237442d8fd3b2519f75f70f153a0d9deba8b39ba3317df358fe1ddda738f320ff689a7a8965ab157fefea7eb121ea980c6a6d8ca1b42d63941c9 SHA512 277be4e6d56d8e2747df434518d6d7918c149a67c3f6af3f978858be86f3fae9248989823c2429dbdff4a1c1615753607f5487fd9d6705cfafec698cb9d47e4b
 DIST lark-parser-0.11.3.tar.gz 229917 BLAKE2B 14bd76f1faaa4fa0aa3fea300d7a4969e0afd70cecd163304047b34a001c012932f37a170d6727a01c93f69ad4c29da70e0b26cee477d81880fa7f97ebd01598 SHA512 34cb6b53dc782a8de57f1f9a0946e7d1f383fad83aaf85102f7d8ca9e5ecd1f83a7666ee1ed8bf556a0d21e1ac5af23964377619882b81dd1033512f544d51c0
-EBUILD lark-parser-0.11.2.ebuild 621 BLAKE2B 13609371418dba6d3a11da93e4dec266ffad5b281e2166f502be645707303926c1d7855bee3176e86240cc2d98a679a66a51198069448796f239a24130686040 SHA512 0008e3e37ba77243a566779a0c69853df389e1dab5957ed68f606b263cb178851d25435fcea3cc4b476e87b78174f4c52effc242c5524727f831e30c6034454b
 EBUILD lark-parser-0.11.3.ebuild 685 BLAKE2B 5414fa93c5dd088798b798dfa43ec583880d601e183fb0824770ba869ac12970dd0b1a06edd70b0dd82b6d686456569885b1692ebc14854bce10ff79e0197fc1 SHA512 9b31b026e8881c665aeddec2cd8f99050e2effbf0760796b68de3885ad2ef859907515fbde29b358ffcc99eb4f76ae1435886d3aee4b6ebd5946da02370328b2
 MISC metadata.xml 635 BLAKE2B aa735f4a11cbb8154dad090bf52fae833c6233de80a95bf073e9097c1cebb83a004423da1a2a824b6cc07a32ac0dc016339229d3e0f3691094baf88c76eb3283 SHA512 e2a0faa9024d00d51ac7ea60cc57e75c0b59e45747777b6cd2182195f35eac0a9324b58a76d6ce3e776686f1f8b7a163cbb154551ebe0c55046372659e083a07
diff --git a/dev-python/lark-parser/lark-parser-0.11.2.ebuild b/dev-python/lark-parser/lark-parser-0.11.2.ebuild
deleted file mode 100644
index ae23cc260e44..000000000000
--- a/dev-python/lark-parser/lark-parser-0.11.2.ebuild
+++ /dev/null
@@ -1,28 +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 distutils-r1
-
-DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
-HOMEPAGE="https://github.com/lark-parser/lark"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-python/js2py[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" -m tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/lazr-config/Manifest b/dev-python/lazr-config/Manifest
index cb23e59672ed..ca4861953c20 100644
--- a/dev-python/lazr-config/Manifest
+++ b/dev-python/lazr-config/Manifest
@@ -1,5 +1,3 @@
-DIST lazr-config-2.2.2.tar.gz 31957 BLAKE2B 5bfee9ae556e6b4109fa43ca36cc2676fb805dc6b9d9f788224ccd29e7836313affa55dd031496c2a252c5e64b150fd8f21c2934da3699ba95e0968ee8022879 SHA512 3427d2be4b4763238bd8378ec5936d38d0b944074d56f6ada55d0e3f232fe0846630a0ef3900c169b58092d029297d7c937ea4ad349aaa2745ed25b71df9c7a0
 DIST lazr-config-2.2.3.tar.gz 34213 BLAKE2B 029bdec3ac4f937f439f833f51e44a58f4604f337979c9f06695e7a243b2cde0af39a46139af5e88052e8585d2729c1b328df89979c9ff100338ec557e841b71 SHA512 cd8edc29a811b658045f314b2de4317bd750a701c2596d89912948fe0e58bdc39ad3d22cdf34bb7e46658af7ac6d32249e454c35bdcf72bc5053094343cd37bb
-EBUILD lazr-config-2.2.2.ebuild 620 BLAKE2B a089a7e1edf28474dd95e060801afae7f345a8702ab43a9488530c23101b703f3162cfa680a6463758332d1acfa09d8b14bf92fa5a9529108799df9d59717c11 SHA512 7dda91ae5eacc5001979056d56d3c8352295affc20946c33075e1ac73ea475f4dc60536725fe9b3ac977c3936f5487439730ca07f753080ba32aecb32bf98db9
 EBUILD lazr-config-2.2.3.ebuild 800 BLAKE2B a4156e455c7b8896457f82696a3f34a0846cfbeb956ad2116308ee3875824c948fb141585f5e2a2adc8e207e92a32814ca93112066f397eb81910529b6c5f882 SHA512 99c7ead7e44f8a836f90624ba2dbb4568a2758450d18fee58bdc8b40b0adf00f0526b2349ba40d0592e61ea033dcb905b4104f29414df8dc29abd5578d406efe
 MISC metadata.xml 432 BLAKE2B 72841fb121bea81e762cb15c526c93b7a33830a179211b95e8925ed5a9dadbf1db2260957e4b15f9ff1b8b6996e1a48b3161d56822b86ad9cac787da67430994 SHA512 b40fa15d3b6e551f12c367cf07e1fac5c4d2e4c4e22c220b2028d264df6a7d54c5fdb7ae565e82950642f1a395daa2a08cb410d586d64b81a039222e4e1e9370
diff --git a/dev-python/lazr-config/lazr-config-2.2.2.ebuild b/dev-python/lazr-config/lazr-config-2.2.2.ebuild
deleted file mode 100644
index 564f2454aa43..000000000000
--- a/dev-python/lazr-config/lazr-config-2.2.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Create configuration schemas, and process and validate configurations."
-HOMEPAGE="https://code.launchpad.net/lazr.config"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	dev-python/lazr-delegates[${PYTHON_USEDEP}]"
diff --git a/dev-python/lcdproc/Manifest b/dev-python/lcdproc/Manifest
deleted file mode 100644
index cf01b0155f7a..000000000000
--- a/dev-python/lcdproc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lcdproc-0.03_p20150508.tar.gz 337211 BLAKE2B 426ddb2e951d096dc8ec149e47dcaa4c31501c9993e27c6a7fd686baa7e0799c92f40bba4eb3250c846625e6f82d6a202dc9f55a7044e6d4edb08437edb9d2e9 SHA512 344a15566587a1f7e3a50314138fb320ee341a41484061cc143498c86e058badefd38589b74a6668e3c082b1cd4ceb3aaa8a9369eb9d8f900af5da0aa7823430
-EBUILD lcdproc-0.03_p20150508.ebuild 741 BLAKE2B 6dc266578b2d29b13c1765c81cbe9d01dd47cac2f448e973558b9e6f6c0c01e4891830f505aed7a279e7a823181cf7be1e82545196c7b648f02e1fba88c44b54 SHA512 b90f2b3918b8bca708d0cf787fb15366b65d5752d526007dc94e52f05cab881b0fdbd31e232db5b4954997eb5419efd1f57eddf5349f99bdcfb1ebd55c5fbb61
-MISC metadata.xml 623 BLAKE2B 494733ecdabc8e970a5fc6179bf10014e909881e0adfe6df11a4c3c5c041db466ea3cd5b83a615e543e909e5db53aca372185412738b122061923acafe56e179 SHA512 2266e6a8f2ab5ee0940bb83baee86bff41b2f06a9a10eee89ddb7125b4b1eedd98ddcaf0da84865b2896a14a5bbb2dbba8f87aaa8c9a972bd2446e64507f1064
diff --git a/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild b/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
deleted file mode 100644
index 91f15979c1a7..000000000000
--- a/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="973628fc326177c9deaf3f2e1a435159eb565ae0"
-MY_PV="$(ver_cut 1-2)"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python OOP wrapper library for LCDproc Telnet API"
-HOMEPAGE="https://github.com/jinglemansweep/lcdproc"
-SRC_URI="https://github.com/jinglemansweep/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="app-misc/lcdproc"
-
-DOCS=( "README.textile" "examples.py" )
-
-src_prepare() {
-	default
-
-	# Fix setuptools version warning
-	sed -e "s/${MY_PV}/${MY_PV:0:(-3)}.${MY_PV:3}/" -i setup.py || die
-}
diff --git a/dev-python/lcdproc/metadata.xml b/dev-python/lcdproc/metadata.xml
deleted file mode 100644
index 9ab39c1e078d..000000000000
--- a/dev-python/lcdproc/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>conikost@gentoo.org</email>
-		<name>Conrad Kostecki</name>
-	</maintainer>
-	<longdescription>
-		This is a python OOP wrapper library for LCDproc Telnet API,
-		which makes it possible to submit own data to the LCDproc server.
-	</longdescription>
-	<upstream>
-		<bugs-to>https://github.com/jinglemansweep/lcdproc/issues</bugs-to>
-		<remote-id type="github">jinglemansweep/lcdproc</remote-id>
-		<remote-id type="pypi">lcdproc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/leather/Manifest b/dev-python/leather/Manifest
index d392d37a0cc1..c8601bfe10a6 100644
--- a/dev-python/leather/Manifest
+++ b/dev-python/leather/Manifest
@@ -1,4 +1,3 @@
-AUX leather-0.3.3-fix-py3.10.patch 1235 BLAKE2B b71bb4d6b541ba55ca3cde388a331b69b8f93589d04e5c33c75033c9bfa63d718cfac16e1298df03ba024251618de72a0699687364daab87cfe1c9d5bbb94a42 SHA512 cfffdd293685cc0cd74b94ddef9458bdb5d63dfbfad976c097413111e336ac879c07e67226c27f5fdf4b121fe23005eb38f2de4f59d07a94c3930b01f7163eeb
-DIST leather-0.3.3-src.tar.gz 40522 BLAKE2B 3c7e6a48615751b310b7f066f2a78a2494e00256cae2ebfb4633c9389cca2477c2265fcf8c68f37733568ef729db1a5daf02ddc640bf2a60f2b39127c9a38d91 SHA512 30ea50ac6f97c55ee695b0e175a27e1e64fd17da7b0686ca8595fe0e5067932e19e59368fe6441f8f291ec52be3e597a80f8e04a3fcc0eeae33b3a5b3030e1d6
-EBUILD leather-0.3.3-r2.ebuild 1240 BLAKE2B 387ecca42ff6558fbc3cbaf99b90850cb9565ad67ac937871f883915dcd633ed69e3a49998485b40080c2a9e9dc8a27d585a8eca3ddb93f598965acadd7fff1f SHA512 bf7064a146d7e5f0efacb420bd104a7f408cc1fa6b85f4cd889b873b2b8d657af59e8e2df7e41d563fc697b1c470b840d3db22002f2b93c58b07b4cafba64eeb
+DIST leather-0.3.4.gh.tar.gz 41368 BLAKE2B a1181da5904234677290134726da33a71e0f37e6f0161beb0ec7a73efca1b2b26e973221f2f42b72fd2640ef503a8adc905273885deef212ee9d1aae6d91f804 SHA512 0547adf5d455afe9397cf9c597cc7edbcdbe25bb56e32d764c67119bfe1329d959834f2a41720adb51ec926065e044feb27f7a5e3f800c8636a22d4f96752212
+EBUILD leather-0.3.4.ebuild 659 BLAKE2B feb742b0c9b99c969c3e2c71c6618267596428158de6016564be9cfc621bbda598d623426eaa5bd29fcefb7141beb534648252c0e69df3f8bac911583eb3bb6f SHA512 55cdeb650156a7b362090837f22ee78a6f181b8f96ae47bf622c2367a56ae743050cc38e626c75050b6aa4e73c4a0147c45f34999a5d18a4eb2dcd2c6e7e9e0a
 MISC metadata.xml 518 BLAKE2B 648219c9f1fc5535618ef0aa644fae01ddd4dbeeaa18abe51d6d3b78294bba210382c27ba9ff7f8ff62a649354663da3d483e46639d50b908a32993e27262ce2 SHA512 62a25d54f7de231344d7a3ddfa38f5ca145f6daa099e2a5666dc15ebee2448b2ee328d349b8a27db8d61fc2348186eae55507194338937f3bd33d1526ee0b33f
diff --git a/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch b/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch
deleted file mode 100644
index 8ec9e1767a4f..000000000000
--- a/dev-python/leather/files/leather-0.3.3-fix-py3.10.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5dd1d3cc82d426388c66db8e3761ca2bf99a3991 Mon Sep 17 00:00:00 2001
-From: Brian <brian@quantrocket.com>
-Date: Fri, 27 Mar 2020 17:08:50 -0400
-Subject: [PATCH] import from collections.abc to suppress python 3.7 warning
-
----
- leather/series/base.py     | 5 ++++-
- leather/series/category.py | 5 ++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/leather/series/base.py b/leather/series/base.py
-index c5790e5..959e827 100644
---- a/leather/series/base.py
-+++ b/leather/series/base.py
-@@ -1,6 +1,9 @@
- #!/usr/bin/env python
- 
--from collections import Iterable, Sequence, Mapping
-+try:
-+    from collections.abc import Iterable, Sequence, Mapping
-+except ImportError:
-+    from collections import Iterable, Sequence, Mapping
- from functools import partial
- 
- import six
-diff --git a/leather/series/category.py b/leather/series/category.py
-index c575308..3678377 100644
---- a/leather/series/category.py
-+++ b/leather/series/category.py
-@@ -1,6 +1,9 @@
- #!/usr/bin/env python
- 
--from collections import Iterable, Sequence, Mapping
-+try:
-+    from collections.abc import Iterable, Sequence, Mapping
-+except ImportError:
-+    from collections import Iterable, Sequence, Mapping
- from functools import partial
- 
- import six
diff --git a/dev-python/leather/leather-0.3.3-r2.ebuild b/dev-python/leather/leather-0.3.3-r2.ebuild
deleted file mode 100644
index e2397fc3ccf7..000000000000
--- a/dev-python/leather/leather-0.3.3-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python charting for 80% of humans."
-HOMEPAGE="https://github.com/wireservice/leather https://pypi.org/project/leather/"
-SRC_URI="https://github.com/wireservice/leather/archive/refs/tags/${PV}.tar.gz -> ${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+xml"
-
-# Other packages have BDEPEND="test? ( dev-python/leather[xml] )"
-TEST_AGAINST_RDEPEND="xml? ( dev-python/lxml[${PYTHON_USEDEP}] )"
-RDEPEND="
-	${TEST_AGAINST_RDEPEND}
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-	local requirements_files sed_args
-
-	sed_args=(
-		-e '/coverage/d'
-		-e '/lxml/d' # lxml is required only when leather is used as a test dependency
-		-e '/nose/d'
-		-e '/tox/d'
-		-e '/Sphinx/d'
-		-e '/sphinx_rtd_theme/d'
-		-e '/unittest2/d'
-	)
-
-	requirements_files+=(requirements*.txt)
-	sed "${sed_args[@]}" -i "${requirements_files[@]}" || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/leather/leather-0.3.4.ebuild b/dev-python/leather/leather-0.3.4.ebuild
new file mode 100644
index 000000000000..0b16ba2fc747
--- /dev/null
+++ b/dev-python/leather/leather-0.3.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python charting for 80% of humans"
+HOMEPAGE="https://github.com/wireservice/leather https://pypi.org/project/leather/"
+SRC_URI="https://github.com/wireservice/leather/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/lesscpy/Manifest b/dev-python/lesscpy/Manifest
index 1d5c07baea85..ede992938800 100644
--- a/dev-python/lesscpy/Manifest
+++ b/dev-python/lesscpy/Manifest
@@ -1,5 +1,3 @@
-DIST lesscpy-0.14.0.tar.gz 186505 BLAKE2B 6c7f4691c352573d081436d5f31ddacbd6b054810f07feafaf654a5c401d98c3274f86f03f68534f661b79bff3d708eb09bfdc0e3b9e800b7e2091060e64c370 SHA512 333015e3d4169fafedf0c295d12d5f0eadb8bea2576d147f1461e5854638b0501ea3038a945924efd81629b66dcc7ffcd3fabd12933529cb5fd4b962e87fe2c3
 DIST lesscpy-0.15.0.tar.gz 176879 BLAKE2B 942775e090d3fbc8af033163186d43650bf20967689459bedd87dba14063c199fa322a17310fde422e3d45370cc7fee3482ff2a388518c49b2b16fb40f241a69 SHA512 3e225dcd435b9fbf9b21ad7cae86612eee923946b0bafd502221a95df4df739bae8df62f33fe77a90ee8a1c12de05ba556b2d76a95b85c9d68d27ce6ae46a747
-EBUILD lesscpy-0.14.0.ebuild 487 BLAKE2B dff6bb39f3afafbe11a70f8dd03b14abdb0e5b6664dfd8f236d3688a88608400aca102083aef456ec4ef39a73b175ded66af81d499a6546f9933d527b6604653 SHA512 d150b3cf373c9cd399be71e1e5616552bacef307e7bffb20f113cabaf32143e1b0bd7ab4c4cf26b0c6fa017d92e6e159d9e39fae24eaabc56a15504d3d8aa280
 EBUILD lesscpy-0.15.0.ebuild 491 BLAKE2B 6bfaac93aa9ea6bfda50ca7439d141098a80993781338bca8ffbb4a0d730338f3d8d722f93337c6ecfb202d1ee3967a11c77f605c71f5bdfad851fe616ed89b3 SHA512 e7259409d3e3a807c6dc572f066dabb356cebcff7e83c3663324ae834c72f5989d3fe4c81b4c4b11341687347b405ccffa72892896998262d88749c8d0882700
 MISC metadata.xml 442 BLAKE2B f5e6eeeea70c675f4952386ca44a9da2d82c26a69d75e07675e7fd5385a9fb35611789b05b1d0bf91a387743968ff80837f424be92e4a2be02be0b26ed123b54 SHA512 c1c65c87a9e3593e28e6e23eb4c2722225b6835de9aa5e59c670fbe39ee5318b559ba4836e829ee32c6f5fc8e62a2a22632e6a2521bab7e61cdfefe9b2789459
diff --git a/dev-python/lesscpy/lesscpy-0.14.0.ebuild b/dev-python/lesscpy/lesscpy-0.14.0.ebuild
deleted file mode 100644
index 06eba5c57e17..000000000000
--- a/dev-python/lesscpy/lesscpy-0.14.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="A compiler written in Python for the LESS language"
-HOMEPAGE="https://pypi.org/project/lesscpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
diff --git a/dev-python/liblarch/Manifest b/dev-python/liblarch/Manifest
index a87fad9cd144..32381632274d 100644
--- a/dev-python/liblarch/Manifest
+++ b/dev-python/liblarch/Manifest
@@ -1,5 +1,3 @@
-DIST liblarch-3.0.1.tar.gz 55564 BLAKE2B bb3b3b67f9a64403e1a57e9b47217aa1a9b066708d70e1387a8b864a81dbdc4202b6b75012365f9c93179bbfcc4304116a33ebd3bd892f24334e0c200ae94b56 SHA512 591854eae54f5e644882f8ba486434f85196115a3c06f249cf7b343bb0e029b78a818610881d9d656f6342748c956cf5a213a22843e95b2ed05246a8013ff8ca
 DIST liblarch-3.1.0.tar.gz 55727 BLAKE2B 531602b43f7729f59f59394aa1dd6d3ee4ad653d4ef8802de2074c9a9746d43da1638941c1e8f2075d9092810ba680f2e01bee360c55b0826bb725d6515b31df SHA512 042a763dd12612d6630c064b5af84011f1fb908626f17f866e103743cdaabb4983f922290287b0138938488a7c9bff33680ef8157f8bbcbc166e4f4f2d008951
-EBUILD liblarch-3.0.1.ebuild 644 BLAKE2B 83a33654e1cab8279bf48206d05717de95e6c2d53e4b74c9a7583d30e1e4b0cfbd8cd8fde8c9c23dc0d52498b2d66b0566c887577f21f4b18e167a8fd0901704 SHA512 3a0547bc2eb9fe13bc3c3e1ebeb4460f95b07159f7f0489d9a6a3d69685eb9c82bbaa852344a8c173dfff02ad328ca790ddd0bfda6fa1732b51af8999d2ea298
 EBUILD liblarch-3.1.0.ebuild 740 BLAKE2B 60c39735fc2be5cbca97d8b5aab985040bd07237efd572cb6aa8f0fbededd6c110410559b63ddb9cd96e8773fdb0b6b693d399de7877fbbd166948bcd37db723 SHA512 3d5f901e8b3c7452f477b2f628385f62497db0064d76d979119d020724cbba48e5b603e6fcb535e68684d3870713fc387c37021033c73c4b2b996a7cb800e3e8
 MISC metadata.xml 817 BLAKE2B cb4a3bf8595de2a98b53b5086eff0623e6eb7639515c13ac236d3b52ea0d6c31e51454d6d92a242e132ac333265a414da29f2ef3a547ca2790819e7440b1a069 SHA512 ed7203c3ab4682a42f52b1ddf5f03a129d7991bc7783545b03399e63c13d0b8a131252212c4a051aaf13a8e914015f68bfbb881035243ac91de32138c9c99eb2
diff --git a/dev-python/liblarch/liblarch-3.0.1.ebuild b/dev-python/liblarch/liblarch-3.0.1.ebuild
deleted file mode 100644
index 52d9404fa7b3..000000000000
--- a/dev-python/liblarch/liblarch-3.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library to handle directed acyclic graphs"
-HOMEPAGE="https://wiki.gnome.org/Projects/liblarch"
-SRC_URI="https://github.com/getting-things-gnome/liblarch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-"
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests nose
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 4a9a590f4681..d338e65f8a67 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -12,12 +12,15 @@ DIST libvirt-python-7.5.0.tar.gz 217284 BLAKE2B 65bae31bc484da061e116c5fe0da68df
 DIST libvirt-python-7.5.0.tar.gz.asc 833 BLAKE2B a6963fe069985a3c4f24007f45dc04b26517dff38ff5f14b00816a65651d83ca5e68cc6e168a318240152da5e20d75176ece9108e50f1e1d3d074dc5d4942f5e SHA512 029ada81b25445df8107651b11299a9ad259c6f990ad5d1aad617e65af49493fe824989fd9ade2703c927c59f1a15ea50c4af2d90ddf3da41aabeccdd399730f
 DIST libvirt-python-7.7.0.tar.gz 217406 BLAKE2B 4e3e887f9778ca817028d9147913618dcbdc83d05ce01b05b80661bb4cc823de6dc0e9d9b0837bf344774e5a8cdbaec7d4a7e55ce902b2867159795b85800cdc SHA512 07aa75a19dc94f3bde49b1af50fa73a6c920059b3b9ca943354c59f174d756aa5d1dca1394844dc3197b6a22c440028d347480a17858bc18fe1b5b19cf7d797f
 DIST libvirt-python-7.7.0.tar.gz.asc 833 BLAKE2B 159f5b5ec60d3b7966f3f99c185eddb8d2d03480b203473ae47e6139b21f8a4ee8bb8ba28ccacb88ad42c7b47d45862ccb48c90151203fb4e2295f355984e538 SHA512 b58579e648b82ec51de5f15e30dee39f7c42edf47ade4ad6f580bef21191f649b03eb05906bf31baa19afb6fadb57662c5326edb53b056a7235308d9c3bd551d
+DIST libvirt-python-7.8.0.tar.gz 218185 BLAKE2B bc975dfacb73517a3c9771d8d692411a6ec1cdfc2e8605d6cae28e8b6e3b74e15e882cd45b8369802b07e4b583795377d2f005cf1462a76e9f98c33591b472fd SHA512 e50dacc8214849dc2fa752e21061826463753b912765c3186948c9d634c18f0be8b579acd7765878aea27b2cd6f65e7113a8f8b90791ad76c69834d4e947b6cd
+DIST libvirt-python-7.8.0.tar.gz.asc 833 BLAKE2B 47a4b7a582caf04a9cf805e530af507733102fc13d952a5107ca9b25e62dd4159fddd9325055b1f647eecb17dd311811325f421a31e76b86e401815e11c65196 SHA512 2b5464b982881bc2927ce3932bb73a7bec2204b549aa3068bdfcf52232bd40141b09064280864a4c1dbcfe7fe31041bbee070d5ce7ce33afccb3d431f7119d4f
 EBUILD libvirt-python-7.0.0.ebuild 1199 BLAKE2B 90e6b26a3a82df9a254faf850171fe9a6c8d308b4e998fba2ed9b82f7c24225efed10d7384e303dfa2e0ad94840cfff66747726980f4fbb2949edfb34833a96b SHA512 40c1542f86cf96bd93d2b3942c9b120b3631abc8ffa97aad5126dfac3a8e5c36c868cae683e1a1e52b6db2d332cda5ef2ab6bbbb0b98709a25132a6288bf775a
 EBUILD libvirt-python-7.1.0.ebuild 1201 BLAKE2B 9607203cb4853e529b4c18f34e7dab261982ed563c54db8c1cd4d084cf5c8f3508580b3dce5a7e6657ae5c8ac9578204e0ce3bfa35f070c9348c4a6eb7b92ad2 SHA512 0a0d6be15d8d0b27ba4eb028c69440f25221d3f1c2572b8f7719c20be60d3eb09f5f944bc28c0accece01b31affa14d7ba102a862e043becf3ab01760da1b40c
 EBUILD libvirt-python-7.2.0.ebuild 1201 BLAKE2B 9607203cb4853e529b4c18f34e7dab261982ed563c54db8c1cd4d084cf5c8f3508580b3dce5a7e6657ae5c8ac9578204e0ce3bfa35f070c9348c4a6eb7b92ad2 SHA512 0a0d6be15d8d0b27ba4eb028c69440f25221d3f1c2572b8f7719c20be60d3eb09f5f944bc28c0accece01b31affa14d7ba102a862e043becf3ab01760da1b40c
 EBUILD libvirt-python-7.3.0.ebuild 1201 BLAKE2B fcf10a3aa000bf307cd5cab33e9e71621488bb7d543ed07a3ccc272258fcd954f860a5130ba7c90b1b0712360b9500fb40936f69294de51e8286cd7b2a685a76 SHA512 344e96d551cef54f0715d5d24edc20644a5f368a22f056790230f7308221a7f275e29be99c9ef9063a49c0ed2f8b298139214a4ec898df99232d342e6a239d8a
 EBUILD libvirt-python-7.4.0.ebuild 1203 BLAKE2B 610e72a4d79c6babd1ebc17ba78e6acb59b91373c589ac34584afb4cc4d38871f56f864f201596a875c6e763adee8696a5321ca4392c653f3a5e9619c9699883 SHA512 cfc23cc7c939d2fb8b566cbbf0d06fdeda87a1f767a501299bf93095212a3dd072186336e7509e6b7e5666c6b4a614a432b13ee251983b1a7141c10cd91031a1
 EBUILD libvirt-python-7.5.0.ebuild 1203 BLAKE2B 610e72a4d79c6babd1ebc17ba78e6acb59b91373c589ac34584afb4cc4d38871f56f864f201596a875c6e763adee8696a5321ca4392c653f3a5e9619c9699883 SHA512 cfc23cc7c939d2fb8b566cbbf0d06fdeda87a1f767a501299bf93095212a3dd072186336e7509e6b7e5666c6b4a614a432b13ee251983b1a7141c10cd91031a1
-EBUILD libvirt-python-7.7.0.ebuild 1203 BLAKE2B 610e72a4d79c6babd1ebc17ba78e6acb59b91373c589ac34584afb4cc4d38871f56f864f201596a875c6e763adee8696a5321ca4392c653f3a5e9619c9699883 SHA512 cfc23cc7c939d2fb8b566cbbf0d06fdeda87a1f767a501299bf93095212a3dd072186336e7509e6b7e5666c6b4a614a432b13ee251983b1a7141c10cd91031a1
+EBUILD libvirt-python-7.7.0.ebuild 1201 BLAKE2B fcf10a3aa000bf307cd5cab33e9e71621488bb7d543ed07a3ccc272258fcd954f860a5130ba7c90b1b0712360b9500fb40936f69294de51e8286cd7b2a685a76 SHA512 344e96d551cef54f0715d5d24edc20644a5f368a22f056790230f7308221a7f275e29be99c9ef9063a49c0ed2f8b298139214a4ec898df99232d342e6a239d8a
+EBUILD libvirt-python-7.8.0.ebuild 1203 BLAKE2B 610e72a4d79c6babd1ebc17ba78e6acb59b91373c589ac34584afb4cc4d38871f56f864f201596a875c6e763adee8696a5321ca4392c653f3a5e9619c9699883 SHA512 cfc23cc7c939d2fb8b566cbbf0d06fdeda87a1f767a501299bf93095212a3dd072186336e7509e6b7e5666c6b4a614a432b13ee251983b1a7141c10cd91031a1
 EBUILD libvirt-python-9999.ebuild 1203 BLAKE2B 610e72a4d79c6babd1ebc17ba78e6acb59b91373c589ac34584afb4cc4d38871f56f864f201596a875c6e763adee8696a5321ca4392c653f3a5e9619c9699883 SHA512 cfc23cc7c939d2fb8b566cbbf0d06fdeda87a1f767a501299bf93095212a3dd072186336e7509e6b7e5666c6b4a614a432b13ee251983b1a7141c10cd91031a1
 MISC metadata.xml 519 BLAKE2B 4c399b54effef6c2a745fc377aeb2bc760603bb3a4f076428402896f407095d8f91eb7b4beb0d74879244851624b6aa79ca42e4bfea3badd29bbe60083c5c30e SHA512 52f7d52c8054239aef7d4b1b37a8760e0242ca83991ea8bc010d8cd8b58dcba67e6c626c0f4c4efbdf6adb3036f5d01e746b85e0d02b53ddf774da6429c3407b
diff --git a/dev-python/libvirt-python/libvirt-python-7.7.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.7.0.ebuild
index 16ff1e5b125e..9342f7c04eed 100644
--- a/dev-python/libvirt-python/libvirt-python-7.7.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.7.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
 		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/libvirt-python/libvirt-python-7.8.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.8.0.ebuild
new file mode 100644
index 000000000000..16ff1e5b125e
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-7.8.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1 verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
+		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	verify-sig? ( app-crypt/openpgp-keys-libvirt )
+"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index 718e99bf3d7b..62ba86f06105 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -1,5 +1,3 @@
-DIST line_profiler-3.3.0.gh.tar.gz 52791 BLAKE2B e3499f5274045d158620fa890df6e725a99c3df019bb4515434213d2c60d52d400d7a7dfce64b153422722ea388f73318818485c9747e6eace2d81c457f93a7f SHA512 37680c55a551c73aed7a3ee2333c523f0617e01cda6db98060f15fe36990c8c8bc08bd5848e569f269bf11590776290ee0980046cce745df8e54268d7991559b
 DIST line_profiler-3.3.1.gh.tar.gz 56700 BLAKE2B 030c0fc742a6773ebb55a54a3c21d3d5e5d6d5d258a2c3cd2071ff93917411b65e100bfc6549d9c60d9a7c361c53b291d8b81538acaf5b83665c04129d25bc02 SHA512 8a3704a6df2abe71283cb2da23b738932c6f4b42aedcdefda0d318fd4b894d56831a855c4be4430657308530a04d1e96b0e15a60edca06621bdd5370c0bf9911
-EBUILD line_profiler-3.3.0.ebuild 1072 BLAKE2B 29ce0340d810abcda5eecf530928180a50223ac4f724a328ff8d477f4ba6a621d67c90d95960d373a643e6c2fb75a61fe2ff5330ca35f318c75a917fe490ef7b SHA512 5ac63f08cbd550a37e99f98bd2df06579a2cf507187b1ec7ca2a1e0bc738443351dcb680a022b083f692570d6300b57a418198c73ea41fda6e7029cecd230cb1
 EBUILD line_profiler-3.3.1.ebuild 1072 BLAKE2B 6b412fbfd938cf1a646c17aed4cf97a308e8d5af97791ffed24ecdabb3b93e3fdf5f7da2b866cb2023dda6bfeddada7bbf79c9f7d408f5369f383b4924926f48 SHA512 12d0eb3477bd386b3394ad9acb65c5dd120fa67fc8928072aa5da84758a72dd4e11e2c7e3dd69873d6a45a2748709cadcd875c7b92747997d8ca18e7367b8a62
 MISC metadata.xml 775 BLAKE2B 6d817146b4f2379141f3def2ab8cb2d69f40e1e7645e714c09ad30a425d14c85c50749ffe2c4d6dec9bf146e294caaf8a1647d2a15d672667932ca7543d0df59 SHA512 745e91051af76df1a7344923dfdfad748fc11bf663c60f3c83a5d434ebfeb218ccc91a314244008bf6a39a4be77b3b3c5457739e1102ba188ddf7c8203b75695
diff --git a/dev-python/line_profiler/line_profiler-3.3.0.ebuild b/dev-python/line_profiler/line_profiler-3.3.0.ebuild
deleted file mode 100644
index 1e0c9050df4c..000000000000
--- a/dev-python/line_profiler/line_profiler-3.3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-# force it to match scikit-build
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake distutils-r1
-
-DESCRIPTION="Line-by-line profiler"
-HOMEPAGE="https://github.com/pyutils/line_profiler/"
-SRC_URI="
-	https://github.com/pyutils/line_profiler/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-# technically, the package claims to support non-scikit-build build
-# but it's clearly unmaintained and broken at the moment
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/scikit-build[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/ubelt[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	cmake_src_prepare
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/lmfit/Manifest b/dev-python/lmfit/Manifest
index 91952f6ab0fc..529438ec6597 100644
--- a/dev-python/lmfit/Manifest
+++ b/dev-python/lmfit/Manifest
@@ -1,3 +1,3 @@
-DIST lmfit-1.0.2.tar.gz 306039 BLAKE2B ab5fcda566f81f00a9d2371f6ae5b3477ed015c70e9b9faf8c5228e3f75f0bf9085d9bd3789042af7b46813d0b6c88f96da37ce295593a5368144d53f5f1799b SHA512 85adeac989117dab3cc9aaf216c37ea5087452351a7978238929216dd9d9be8b6b6790103d4fbbf5211a943c43fb99461750cf58287e2b18c27f66eeacc6ed9a
-EBUILD lmfit-1.0.2.ebuild 1058 BLAKE2B 7c7e4d11c83705cfd493d011b42311877afdd07c1363049464184941dddea7dff0635b44a5733669f5a8a8ed3f04afa2896a58d673c650702429dce9e3ae82ac SHA512 11d169cbaed18fab8e936d1b895f76f72bdc21d6174a1ec41f6cad9ed44ca33e34cbcf72b443f2322e62cf0237af8fb51dd071a99d374ffe625137df9c6a368c
+DIST lmfit-1.0.3.tar.gz 292475 BLAKE2B 6d97fe671b0d5bb7751d0ead97ab83d8100e2bb16b81bed61ff07ee6355bffd99258ab554032c9b8a35bb4376a1efef0ab988b3eb6d5a9e26f52314719e45dae SHA512 33febdd68104bb41ca379a8acd03a8bb985ba8785d607ab110b63bc7b3b39b9d95161a683fe015613bee6d99100ede82d1f3574515a6bfb9160300a5791fcc55
+EBUILD lmfit-1.0.3.ebuild 768 BLAKE2B 5d0242f5f1301ed2247a3515454a52517e32f1fb3b22a3c3a2ff710e4d57f00fb76769518ce613b421d57e87af2a42cee803c7885fd5e248b24a6cccd53bc148 SHA512 a758fc59146d47928ae208709d5bad02c95e02ec803c0037f3350e9598d237226e9dde899104c552c7f743d0e5f1e801044fc64c59ede3546cadb7e582542979
 MISC metadata.xml 386 BLAKE2B 19872fce1464db158a66df58e6458655215ba8f8eac4469046be955a27a761dcabb9b324e3324a81e1bb407fa5bb7d8611371da8844cd75d0b43b44feb8e5bbc SHA512 8de0cbfe89611f458d854f50c59756dbcb386466bd582b5c84ed724546d74ae430ab9ccaaacbb4f7c6f892d3fe211624597dfb39038f01d621c548c11fea4c55
diff --git a/dev-python/lmfit/lmfit-1.0.2.ebuild b/dev-python/lmfit/lmfit-1.0.2.ebuild
deleted file mode 100644
index 33dc0c4bf79e..000000000000
--- a/dev-python/lmfit/lmfit-1.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Non-Linear Least-Squares Minimization and Curve-Fitting for Python"
-HOMEPAGE="https://lmfit.github.io/lmfit-py/ https://github.com/lmfit/lmfit-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/asteval-0.9.16[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
-	>=dev-python/uncertainties-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.2[${PYTHON_USEDEP}]
-"
-# past from future needed for tests, bug #737978
-BDEPEND="${RDEPEND}
-	test? ( dev-python/future[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# numpy warning mismatch
-		tests/test_confidence.py::test_confidence_warnings
-		tests/test_model.py::TestUserDefiniedModel::test_extra_param_issues_warning
-	)
-
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/lmfit/lmfit-1.0.3.ebuild b/dev-python/lmfit/lmfit-1.0.3.ebuild
new file mode 100644
index 000000000000..266f2a8ebaa6
--- /dev/null
+++ b/dev-python/lmfit/lmfit-1.0.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Non-Linear Least-Squares Minimization and Curve-Fitting for Python"
+HOMEPAGE="https://lmfit.github.io/lmfit-py/ https://github.com/lmfit/lmfit-py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/asteval-0.9.22[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.18[${PYTHON_USEDEP}]
+	>=dev-python/uncertainties-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.4[${PYTHON_USEDEP}]
+"
+# past from future needed for tests, bug #737978
+BDEPEND="
+	test? ( dev-python/future[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index aedc41c81fea..4a1ab657b346 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,7 +1,3 @@
-AUX loky-2.9.0-fix-py3.10-tests.patch 1554 BLAKE2B de9edaf32d937cf15f38c40b1c35238eb23602aca47014af6eb8418e1acfc141a6baeb4021a48fede6ae12b31cfc6533ce7f0339dd51f7297ad244f1adbdb007 SHA512 2e236f8c9ffbfb24ce1e646bbee4ef62d9af7472b695beecb1926d20fb467e7a67d01f27cb4c6b8e08a91a93195d68a7b3b778ad5258390bb482ba70cfee5d2c
-AUX loky-2.9.0-libc.patch 956 BLAKE2B a03de811cb32e728c22b2637106ffd3c969e9fbbbd45deb180ac83d9c44e81b7b5eb0744816abd4a1083d9d47c817db5c02f5f5f6c448f944365299dbd97a044 SHA512 c2e74f96a8f70ec9817cc517fb13ecb8414d6a9157d882ba15af05a81ec70df0edcdb6a8a02c96e7ecc4731813cb86932832fe61b5e19653164af9f7c68dc25a
-DIST loky-2.9.0.tar.gz 115019 BLAKE2B 2aa2042e32821b67db8b8de12d4b380d22af93d308bb35878271a4859325d6740a3bdab70b464a2c0d0af143903c8af3da81b4b804605cdae88779fefd7971a6 SHA512 d49354b834251f6f05a689ac44464aafa5a7a5b4a8ef84a308ec3bda138e810fc3dc31aa628307984dc69386a210f442d4c202b9499ae3e3864837b47a5b0cd9
 DIST loky-3.0.0.tar.gz 152463 BLAKE2B 99f0a1fc85e879626d12402dd4fee4b92345eab9520b1afaf95bbf869d2dc9e429f1f9810554e10d97f0ecbc4add28b1cbaee0477de05aa366faeb335eaef7c8 SHA512 ad171bfac031ab4d6749bde416031e905eb29adb97dab9c3348791c9df78b17e1e3eab8a354954d7c16fb2095ccc03d26cf2153fe53a546007a7a89c6046cb36
-EBUILD loky-2.9.0.ebuild 1105 BLAKE2B 78305f2b8c7b8bcdb658f898e50fa24052303500e1139b4e73058677d7e57efc811767167f8fa02be93effc80a9ea07ba4853efb61b507742f576dc820dbb126 SHA512 de676cd867bd345b91aa89d1875b473a60999336cc4f8a7091b598f59bf35475b10746b2cd201908f8b99398f1080086690ce87d2881e1d126328c7539c18d7a
-EBUILD loky-3.0.0.ebuild 1021 BLAKE2B db54c572ced4abe8cbd403aecc9183abc1db9997515404a68a6055222685025e4cbd0f3bbdfa492358e46561bfc4e0fcd15016d247450f9e838f23b3be21b0a0 SHA512 3046e97af37d9e0ed1471822e7c3eefbb26df6861c0b09763146c13726788f6d109f78cd122bfd1c29de6bab4c92d4f690d387bf1e94a34f7421cd3dc8fce658
+EBUILD loky-3.0.0.ebuild 1018 BLAKE2B 83cdb4c6a4baabf372962df394342bf21454b8f399eef21162fe32e419f54dae00194b17797d9bbe3b14be2b0927a723060843ff6bf7f13c2ffff1265c2cca0c SHA512 8ac89a930e757fb6add9d719f0faa731cb7d86ba64bcec4980cf3f49bbc65dbe5714e732c26ce80b32f15911333257ca2f62cee839f797867a1942eef2a93f6b
 MISC metadata.xml 383 BLAKE2B 9d990e2f5b4fbf959925d9d7c1f03ecb3acddcc8564c9362f14741d531d79f3e4c6d98a8c84695d8b1f761fa11a80e768b8e8b48ff8be314732d7f574d767223 SHA512 89d9a1f5c253bf99992d16b974d81175d1ae0d17649ffe1a485430735bec38f45e8e1a35c9ba2d99cb1610db3b200adb5af847b2a161c348e29f0cfa89f8076f
diff --git a/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch b/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch
deleted file mode 100644
index 51cbfb348a51..000000000000
--- a/dev-python/loky/files/loky-2.9.0-fix-py3.10-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0d31dc24ca9688c11d1fe53fa1283728ecc50706 Mon Sep 17 00:00:00 2001
-From: Arthur Zamarin <arthurzam@gmail.com>
-Date: Mon, 2 Aug 2021 18:35:31 +0300
-Subject: [PATCH] Fix no attribute import_module for python 3.10
-
-In python 3.10, the `import_module` has moved from the
-`test.support` module to `test.support.import_helper`.
-
-As fix, try to import the from the new place and if unknown try from
-the old place.
----
- tests/_test_process_executor.py | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/tests/_test_process_executor.py b/tests/_test_process_executor.py
-index 65d9a2c9..3bd0b12d 100644
---- a/tests/_test_process_executor.py
-+++ b/tests/_test_process_executor.py
-@@ -1,15 +1,18 @@
- from __future__ import print_function
- try:
--    import test.support
-+    try:
-+        from test.support.import_helper import import_module
-+    except ImportError:
-+        from test.support import import_module
- 
-     # Skip tests if _multiprocessing wasn't built.
--    test.support.import_module('_multiprocessing')
-+    import_module('_multiprocessing')
-     # Skip tests if sem_open implementation is broken.
--    test.support.import_module('multiprocessing.synchronize')
-+    import_module('multiprocessing.synchronize')
-     # import threading after _multiprocessing to raise a more revelant error
-     # message: "No module named _multiprocessing" if multiprocessing is not
-     # compiled without thread support.
--    test.support.import_module('threading')
-+    import_module('threading')
- except ImportError:
-     pass
- 
diff --git a/dev-python/loky/files/loky-2.9.0-libc.patch b/dev-python/loky/files/loky-2.9.0-libc.patch
deleted file mode 100644
index 58cceab01eb2..000000000000
--- a/dev-python/loky/files/loky-2.9.0-libc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4100bb481dd1599be3deae8539ff9eac2d9b7104 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 8 Mar 2021 10:32:38 +0100
-Subject: [PATCH] FIX load libc correctly in test_reusable_executor
-
-Fix test_reusable_executor to load libc via "c" library rather than
-"libc".  The latter is incorrect, and does not work in the newest
-versions of Python anymore, see https://bugs.python.org/issue42580.
----
- tests/test_reusable_executor.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_reusable_executor.py b/tests/test_reusable_executor.py
-index 1ff5b8b..d24d2de 100644
---- a/tests/test_reusable_executor.py
-+++ b/tests/test_reusable_executor.py
-@@ -32,7 +32,7 @@ if sys.platform == "win32":
- else:
-     from signal import SIGKILL
-     from ctypes.util import find_library
--    libc = ctypes.CDLL(find_library("libc"))
-+    libc = ctypes.CDLL(find_library("c"))
- 
- 
- try:
--- 
-2.30.1
-
diff --git a/dev-python/loky/loky-2.9.0.ebuild b/dev-python/loky/loky-2.9.0.ebuild
deleted file mode 100644
index d1db85d53e51..000000000000
--- a/dev-python/loky/loky-2.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Robust and reusable Executor for joblib"
-HOMEPAGE="https://github.com/joblib/loky"
-SRC_URI="
-	https://github.com/joblib/loky/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libc.patch
-	"${FILESDIR}"/${P}-fix-py3.10-tests.patch
-)
-
-python_test() {
-	local args=(
-		# docker, seriously?
-		--deselect 'tests/test_loky_module.py::test_cpu_count_cfs_limit'
-		# hangs, and even pytest-timeout does not help
-		--deselect 'tests/test_reusable_executor.py::TestExecutorDeadLock::test_deadlock_kill'
-		# one test that uses a lot of memory, also broken on 32-bit
-		# platforms
-		--skip-high-memory
-		# breaks teardown
-		-p no:xvfb
-	)
-
-	epytest "${args[@]}"
-}
diff --git a/dev-python/loky/loky-3.0.0.ebuild b/dev-python/loky/loky-3.0.0.ebuild
index d1c230c8a53f..c7368a937698 100644
--- a/dev-python/loky/loky-3.0.0.ebuild
+++ b/dev-python/loky/loky-3.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/lunr/Manifest b/dev-python/lunr/Manifest
index 583e27fd5d03..0ec98a0b5891 100644
--- a/dev-python/lunr/Manifest
+++ b/dev-python/lunr/Manifest
@@ -1,3 +1,5 @@
 DIST lunr-0.6.0.tar.gz 839533 BLAKE2B fce81bfe0e12138b8ab335ecec828ac18be13f0d9f823218de11d701c4d44f54c06360c4c8f1c96fd36b634094b6f10bd964c9d4e154dc208cad1f36e4b32f47 SHA512 2067c34c12f77ab0fb32c7f800ea3c647a1073c061a14f2b72b2b95fc8d624429aa37e85992eee5d5b24add179eab1d81af52af09f0db67d6cae459a5faa0925
+DIST lunr-0.6.1.tar.gz 853421 BLAKE2B 7cc1624c91d07fa4e30ae789cbdffa1d98c011bd17a314bdb498ecfb7941fca7f0b6f36738377d10c17a7e400f8555be52fee8a1e03d3dfd8d931db88c4e25c9 SHA512 991569b6657c4cba653c999aa7610768303d1b184142c7f82a6c8ab44459b01cf7ae7db9f3bc45512161452b73e3b4cfbac3e8f7a0738e1f4b1429a8d8fe73e1
 EBUILD lunr-0.6.0.ebuild 643 BLAKE2B aee793c9ccf4f4eb86bedce720ea1967e7ac4d13ba8ebf832288a3423ccc9ccc15f215b69ed460def0ae32ce71fb56f9b4660f4dd66d082b117f50acd23a20ab SHA512 c47b0d04386b7486fbe70dc7322a9ac9b9379537665f8dc5f1502e6e3ff30d80536be276ceb41f0599602c68c2c3e1e51a330c1b1b97ffb475eccd1c397ef053
+EBUILD lunr-0.6.1.ebuild 645 BLAKE2B 301b51e285b4fd6dfee4bad83bea0ea39d3d5795f51df389db1477c9d1d7eaf16b04f3a6f61407e87a293cf7824405e6f023a8cd6605cd1f98b67011826e1915 SHA512 2ee8d83bfa5d1687fca7b713b04fc88b16230b20c51099a8229f663d7c72ba1ee37d00ce921fb0ae4b1394cae8360dd8b7ed0fecf4f1cc62c3a53a521f13283d
 MISC metadata.xml 494 BLAKE2B 624c11f3ebd0b13224b99de1573d375584b7a389861c021d252f7faf6ee4a307fb33c2e2daa778828b26f06aebf739b08d1c7534fc8fb2c3a4ca198c0ad64ee5 SHA512 06da66d283dc7f9c6bb970932625f257439c04f6eed3ae5f151b7801e118ecf7dcf75177413967b1367f4601103ab2181e71863475fb29c90f860692cfebbb47
diff --git a/dev-python/lunr/lunr-0.6.1.ebuild b/dev-python/lunr/lunr-0.6.1.ebuild
new file mode 100644
index 000000000000..0aad5e0255cc
--- /dev/null
+++ b/dev-python/lunr/lunr-0.6.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+DOCS_BUILDER="mkdocs"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Python implementation of Lunr.js"
+HOMEPAGE="https://github.com/yeraydiazdiaz/lunr.py"
+SRC_URI="https://github.com/yeraydiazdiaz/lunr.py/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}.py-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/nltk[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/acceptance_tests
+)
diff --git a/dev-python/manuel/Manifest b/dev-python/manuel/Manifest
index 85f781d01757..fedae5a56b8d 100644
--- a/dev-python/manuel/Manifest
+++ b/dev-python/manuel/Manifest
@@ -1,3 +1,3 @@
 DIST manuel-1.10.1.tar.gz 42142 BLAKE2B 91d23d804b3f5a2c6f696a8c7a8701f09ae6e881ac9a1c76004be301ab77f58596d0bdae4b11f484e495ea581d66d55d5bed05f5b36d81951d35923c8bfc163d SHA512 39376852e2ecb8a19b2f565464e53f475577edf68e89b3d267f94374a444714ed38ef63da638a02dcec2df851869d57c0d256dca4b436b37ff36b6b3a822710b
-EBUILD manuel-1.10.1.ebuild 612 BLAKE2B 9e8e17d2fc9e8715d01c678455820e5890e0fca45424d89346c436aeb96f6a0f27124f639fd1b94e4c23c0d35e6bd1ead437a1496c6fe12b42a6e21b93fb891a SHA512 71ae4d7d4168790f8e2e5391c0050507ddaa9a403bdec37b9fa8b6708f80c86701e8e2f9cc9dc61735a8bb617db7e33b66dab8078ae64a558278ae5e0d4c3918
+EBUILD manuel-1.10.1.ebuild 631 BLAKE2B 6cea3be559621245858b32b4bd066b0063fcd45a87525445053e62323d436bf8c9533b9ae3566b89bbf88f80699fc179532a1ce406c02a2f995c6964eab1f3c5 SHA512 b3cbea7d03e672e0018a4db36626b82c6f393e182c36beec32113817df0f4de26309f3dc6887c66aca458183ab589458fdf2db7392fc3e8048611ffb965e6ace
 MISC metadata.xml 391 BLAKE2B 6b95f9d29d8df2b9f0cfd85012a7d751f443c3bc67f6254c376f8cd3c1c66e2972bc165edc8db6b5ef2851edf3e870cc2ca76d3f6f3c06daeb247ee349407f45 SHA512 ace493867fc08487876a55331b619a62b01e269d7b5307b2ae9e016d75ee9058f2e1354bd2e3243ef1b0cfff30cc3f8f661675e03c1ac07fb805f443b31c64ad
diff --git a/dev-python/manuel/manuel-1.10.1.ebuild b/dev-python/manuel/manuel-1.10.1.ebuild
index 96120aee9f88..bcff3eec2461 100644
--- a/dev-python/manuel/manuel-1.10.1.ebuild
+++ b/dev-python/manuel/manuel-1.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 279f11b966d5..c15312a693a6 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,5 +1,3 @@
-DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
 DIST Markdown-3.3.4.tar.gz 322192 BLAKE2B 37122305112440b85d7f0e5e1bf90bafe15a8bcb84e8d8bdd9b4183dcb4be1010d287450062bab7dc9017d8e618f84a8245e6fd35f8204e5e2ece14d302fb13b SHA512 37422619dd8f542bfcf7975c92e76a39e4eeeb42386727d52037869cee1617f8efcb74a382a9c7cb903907ebf3643a27ba0de583bc0dbd327a36e72bbf8520af
-EBUILD markdown-2.6.11.ebuild 822 BLAKE2B b817bff5c3d6d1d62b86b451d49076f2b84fcf1c9e448935258c1b35fd7f3fd59173d26628ce3b6338ec87a8b9c8866e430c5585fd93d186f5b8784e7fa8b31a SHA512 4c15ff73bfdac09321c707cb962c94f106787a0787dd828c86a4629eba6801b63db1ff10ba9ca87a2397a7599b73f4aa71ddf918886d9b3c6270f3c67b735c88
 EBUILD markdown-3.3.4.ebuild 1055 BLAKE2B 1f8447367154aeb53389922fe48d5a03a7c022a6584642bc13c84ab7a8fd02becc0c114da6c53fab32794b228ca8c94544ea8e840c497290be33c3446cb2947c SHA512 13a5b46a701e8debf9d4964389db799c210b2e5e7314b9bfec2f0b7788409e2ba5ae8a96033eefa7d2d6d396a45d15604e6bd6bdd50cbbf844df51179ca22c12
 MISC metadata.xml 400 BLAKE2B 325197e9e700565d94ac477c4acefb1ccad5fea759bcb9bb980122f2a8fd0b7509fbf54768948b28a180392154d26d9a9068b996661a35ec79bb03998ae538f5 SHA512 68bb4ebfe231af6e30c3f8a9fafdab8f1b90fb67d942605d0366bfe504de0ae482da8c4e45279cf7bfae857ed9ccb0729a36f6ea1b18bd459e0dc3e1e3a9f6bf
diff --git a/dev-python/markdown/markdown-2.6.11.ebuild b/dev-python/markdown/markdown-2.6.11.ebuild
deleted file mode 100644
index c52e5e760917..000000000000
--- a/dev-python/markdown/markdown-2.6.11.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 python3_8 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc"
-RESTRICT="test"
-
-S="${WORKDIR}/${P^}"
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_docs
-		HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
-		# remove .txt files
-		find "${BUILD_DIR}"/docs -name '*.txt' -delete || die
-	fi
-}
diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
index 5266127d0540..7262bd16dd4e 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1,5 +1,3 @@
-DIST Markups-3.1.1.tar.gz 20482 BLAKE2B 26fb19e11aaede8eeadc5a3022785dd3663e7002c5fc4b17c3718d68bda55a9cba07fc1c83a78ca4dee06b4e911b74701fe11865e8933a9d385d032fac00eb0d SHA512 9e8e7b3cc86127fed0367faf257d761e0eae4ca5e11a9ddc8e99b2fc88c76ddb218ee371added56e2c19f5772754adc4c01a09503c308220f6a9d35e736220d7
 DIST Markups-3.1.2.tar.gz 20608 BLAKE2B 01f5e740b4d26c4a8c611070b0ffb879009cc241bd320f257d266e57f9f35becd728a45f1bbff98eb066c24abfb21a84c36d07814e0f54550c259c62fd48dbdb SHA512 5374c6c80eb71b4190af4c3ba47ec46fe7a92739d72feb023a571488dde6fdc377e98f2e24bc0c4e6cb7b4aa3b0f8aea90befa93e301cf6b02fcc4856affbceb
-EBUILD markups-3.1.1.ebuild 978 BLAKE2B 5b00c69a8ff4438686d1ae12874b9c1e8628f369b5eb80a7eb10fa336e4308220aeb333144c77b090d2ad14fadd26882269e5735e546e0572b3f81cc18016962 SHA512 370eceb9be0241f38e677dd5b4ae35c9876f54dbad0d36476e136230302cac60079bd70752d92382a321fc72bd73b2559e02702d977c5cf9536a563cbc21380d
-EBUILD markups-3.1.2.ebuild 893 BLAKE2B a94bc52ee841945b09174a55512d4f00b6fb0669c8015cc3e10b69b941bb800f26101b5b2aceca2e3085017b6dc5832a881cd9c5ea097931f3c1b9bfa7d18331 SHA512 621b06b32bb58b751667f2bf46b43b4ac53fe72f6d4555cd5c734b356eef3f530c498b53d61c670003e3cb0f31a6fbde0ddcd25fb493e0420d3fca0866c521e8
+EBUILD markups-3.1.2.ebuild 891 BLAKE2B e64b7bdf6c75adb589e4957d7094397b5fbfe26221ef998d8411a0337eddab7e33a859eaebce7864d0e9da00966d1882356c1850189c341c0aa7b6a8c6c35e27 SHA512 1cf9b2d06b1c28a44e8cbfb862ae653e3c718ff8b4dd37bb09e7876f84dcfedd0ea9d07fbd4063a86b256fc0ea339665117e2b93b22c4b56857fbf5ee10b010e
 MISC metadata.xml 412 BLAKE2B c303b47980b9edf901fb851aad81d526511d15d3ad5cc96ccbf77c6530a3072c32884ff5a108366327cb676d8b3a0585b91ec3c02118ff71c77860306fe44749 SHA512 576bc6802afd05c967db43c2f349825543494bc883d449fa109ecb29ef38fceaa1e822a47cd8bba7319cefad35855a534e98037585a8443797f7e3553be2669f
diff --git a/dev-python/markups/markups-3.1.1.ebuild b/dev-python/markups/markups-3.1.1.ebuild
deleted file mode 100644
index 91e91363b010..000000000000
--- a/dev-python/markups/markups-3.1.1.ebuild
+++ /dev/null
@@ -1,43 +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 distutils-r1
-
-MY_P=${P^}
-
-DESCRIPTION="A wrapper around various text markups"
-HOMEPAGE="
-	https://pymarkups.readthedocs.io/en/latest/
-	https://github.com/retext-project/pymarkups
-	https://pypi.org/project/Markups/
-"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7 pypy3)
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/python-markdown-math[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		app-text/pytextile[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pymdown-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/markups/markups-3.1.2.ebuild b/dev-python/markups/markups-3.1.2.ebuild
index c4c377498dfb..4969cee21581 100644
--- a/dev-python/markups/markups-3.1.2.ebuild
+++ b/dev-python/markups/markups-3.1.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/markdown[${PYTHON_USEDEP}]
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index 09e94af7c3ea..e18325ad6d86 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -1,7 +1,5 @@
 DIST MarkupSafe-1.1.1.tar.gz 19151 BLAKE2B 184ab0bc42f8d254ef4239f700f019c0a380bdf2117dfe1abe2eb4dfa0f037158d181a120d8654a6971e9c8badb078f997e3a8bf231898e0f4bb3e8496d9abd3 SHA512 f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6
-DIST MarkupSafe-2.0.0.tar.gz 18466 BLAKE2B d065eda7f3f2e02abf2d1a9a20c2eb8ed774fa5153cf4c0584de859ac790a7c4dccc2304f7e920a2345877653ffd9be386bfe677e96bcf1cebb5ca6b87ef9d32 SHA512 260121db97178d5903645c9d1fd38c5d7c7a5bcd31a8def1d5a921328ff86ad025bf62d73734434a7920a00024ff8c0898352f7406713af51051e750b5df7cab
 DIST MarkupSafe-2.0.1.tar.gz 18596 BLAKE2B 3f6d576733a0033ca46df5e92892c1f052c1b0c03a92f27926383279f81531981139e5a659a7d21d436643795706480dd9e6aa979f70a81a2b95f2b9d0ac9f8c SHA512 77249bda784111ece15d59eb3de1cbb37a58fb9f22902fe6b73fea9eb0f23857ccbe53dc55463278e3b91f78dc35e2b027fd823ca50d88d8985d5a98ce2327f1
 EBUILD markupsafe-1.1.1-r1.ebuild 639 BLAKE2B 267a221a71d8dc36f34fdfb818298e268a7cd2759d1e0ab49099c6f57d934516e71ecea2b7c529c745c4aefe6124a7d52eab880e3c157f8d40384eb0cd6e59e1 SHA512 ae11b1f75420b8d4f142856ffeeb2e68929243bbaeceb8d08e19523bde4cb659e1b08ccbc68a87cee2bc97225bc35bb73268cf61b6b2c63fbd47bb9ec39209a0
-EBUILD markupsafe-2.0.0.ebuild 647 BLAKE2B 249f78f4628f85d1d5998373544c70c609d403d9f9a572fd8929dc4ecea7495e7efcae42aee361a037368f9706096788825a44bed25b65b68720e85352c09ca5 SHA512 ccf216823b5eae1fb4572f6163381410e59dbe3a194b76e01456f0c787b59560b5b5c8b75379350980c789e81806b98f71c1c84cb5429fe80b5c4d2daaca4ac0
 EBUILD markupsafe-2.0.1.ebuild 645 BLAKE2B 1774cf1a543d05bbdd7c2ba7bf08c151c02a51fc0677ec462dee1cd92880c1e928509387b80368e72a426a8d792a6a6caaa6aebd8f4c4c80f6d6fb32758ee870 SHA512 6313433cd4b4785de1d23aefc6af8e935cae6cece5488eb2175fb4c4c0daab2e9e53ba018d85eed31772b60e34d38a40b6c64339d0bbad70d151f8ac2e2f84c8
 MISC metadata.xml 314 BLAKE2B 88acc343a3395dcf3833ea690d3e5f7992abf67c6ab16a53cb039d253cc17302b24da6751d5706ec3c3495cef37494028de4516a7b3f25c78780d23ace4a0f72 SHA512 f240b32e7c30116769eccc16b6746e29bc28931dfff65bb3020782be3abc7791c7464a3a686ca076ccf371ef6280c2285d97e55b522d88d07babd843a51b4fa9
diff --git a/dev-python/markupsafe/markupsafe-2.0.0.ebuild b/dev-python/markupsafe/markupsafe-2.0.0.ebuild
deleted file mode 100644
index ecf52ba1008f..000000000000
--- a/dev-python/markupsafe/markupsafe-2.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="MarkupSafe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="https://pypi.org/project/MarkupSafe/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index 0ad8631e4e1e..9c706b9a783e 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,11 +1,5 @@
-DIST marshmallow-3.11.1.tar.gz 173844 BLAKE2B edd816ccd254dc52e01a2e067ff3037fa5206ae5badb1e9b46d83d3bdcd926d324c39321e4fa2b4fdf276158d36c2d3634086f76086dececaa24213bbb765e42 SHA512 ebb6b20ffc1b199408ede0c88d1512cada14cf7220315100398137b8374940c03dda2e6449ab9135963598ab321669068a9eca0e1c4cd2f3f2454eba19db04bd
-DIST marshmallow-3.12.0.tar.gz 174790 BLAKE2B 07539540f361137dd2fa2d5c884e279137a82f69e8a9e294d6abe4c566c98f74a1836018618682ac0a08f1e0d1510dbffa6d9c030a98e2cba48230697742b7e3 SHA512 7b91ec42dffbb979bede21fbab17cfb081068eea54d02aaef991b58e884cc5675fb17d5f56278794e5c33960bf29951ba74533abb9a025228a524a4e413bd312
-DIST marshmallow-3.12.1.tar.gz 174784 BLAKE2B d3540ba833950d730db719c8ac7e8d66a54a4b06d0decc161d9b1f82d2012db2df7cc376bf3fb322e8d07e60057409f2e6ab761561e822c942d189418c70b9fa SHA512 aadbf9c3b45a5b435ce7fd7f60a4318f393221f23687be7b48af43deee111f48806489169815122f297539614a81700a435cc579cf5b7d0fffea2a2809368db9
-DIST marshmallow-3.12.2.tar.gz 174529 BLAKE2B 67c8431c1b013f40c3ebbb23631be3060e978a4cb71f3802b810d943bb69fd32bea59b3b7c92df5ea3cbcef28ef7b64f32c9fb1a6a3d5d42e4eabd6ce4b7958e SHA512 d1f5e695564d0df10ec3f74b336b6ade7b247b722beea61a8cf10e30653745d187d26dcda3a2f2d38c04423315d20a67bc883c9e7b0d4686a759e379644cd457
 DIST marshmallow-3.13.0.tar.gz 175134 BLAKE2B fc8ffb87ba31d5bd56c7ebf655824f59c78cea257a1b59de8a97be9f380367d4db428b6f4f93f81140cccd8274fee7946e466f87f7c31b6b9d39d5bb9fba3104 SHA512 e4425bfa26609c80bc581b60be5554effe4a57eafc36338dc672cb0b42fc14d788a1ef3b4506b6429bf8d235e6edb10925173c8414b2abca12a4c7bb5496ed53
-EBUILD marshmallow-3.11.1.ebuild 605 BLAKE2B cc40d04c193df3034b46236a582b51dbe2bd353b7ed73504df7219a548b79311d81f1493c65e047f280a9bde9b491b12fbd8be7e0761e9abfe65f608c51f410d SHA512 759a286be5216563de547e9d2d28b6cc6ea926d6467f5caff41e54f7d1470d56052c9f8848e454a841685c2411cade2b78c0f96a35a9cb0ac75f0dfb5ebb2faa
-EBUILD marshmallow-3.12.0.ebuild 605 BLAKE2B cc40d04c193df3034b46236a582b51dbe2bd353b7ed73504df7219a548b79311d81f1493c65e047f280a9bde9b491b12fbd8be7e0761e9abfe65f608c51f410d SHA512 759a286be5216563de547e9d2d28b6cc6ea926d6467f5caff41e54f7d1470d56052c9f8848e454a841685c2411cade2b78c0f96a35a9cb0ac75f0dfb5ebb2faa
-EBUILD marshmallow-3.12.1.ebuild 606 BLAKE2B 0ab0d2ac445f20b651e9101ea0f4377d4ad568ceb1fe481b7b827d031f834fcc6d08bae97898f0a2a8f00b5c3a9b145f4315d7ce82d2575dd76221bce73f4bd5 SHA512 ea76fea9a0f0b477ddbb2769cce7469f2f484d67d1a4c0c220ebd7e4455d72f80d4f281eb6631a6eed0407f32735b29bb85146601e52756a5dea14c33465c445
-EBUILD marshmallow-3.12.2.ebuild 606 BLAKE2B fd3580272c99e15dbeb8d9531bfb7d49cab2435b77144b5374eac157f03f0ebd6e12012af809239b7fdaac47cd051735d5be42ba65c9cdf0d32833871a7f2aa5 SHA512 85b4867b9bd6900e0515d89700897a7e265c4ed7d9430dc5b36ab0b9f09e05510df8a265302dd4a425bced95392930dcbb542e829148b294dc9b9413c55bd0ed
+DIST marshmallow-3.14.0.tar.gz 175637 BLAKE2B 003bd5ee17d4c3db63fabcd75838f5455576eb8a741a0f1daba8c629ade145593538ba15d3ecd47d5b3cce65573f4ecd765c9badb0dd077c44b6d04537a1332f SHA512 3eed3cb7ba063c6a3503091b46443c6ad96f82e6c21e7ceb047b379dddad4429e59a8e5c828be258433b2743a8231bb338ef96f21767f17ed75fe44138bb0d64
 EBUILD marshmallow-3.13.0.ebuild 606 BLAKE2B fd3580272c99e15dbeb8d9531bfb7d49cab2435b77144b5374eac157f03f0ebd6e12012af809239b7fdaac47cd051735d5be42ba65c9cdf0d32833871a7f2aa5 SHA512 85b4867b9bd6900e0515d89700897a7e265c4ed7d9430dc5b36ab0b9f09e05510df8a265302dd4a425bced95392930dcbb542e829148b294dc9b9413c55bd0ed
+EBUILD marshmallow-3.14.0.ebuild 606 BLAKE2B fd3580272c99e15dbeb8d9531bfb7d49cab2435b77144b5374eac157f03f0ebd6e12012af809239b7fdaac47cd051735d5be42ba65c9cdf0d32833871a7f2aa5 SHA512 85b4867b9bd6900e0515d89700897a7e265c4ed7d9430dc5b36ab0b9f09e05510df8a265302dd4a425bced95392930dcbb542e829148b294dc9b9413c55bd0ed
 MISC metadata.xml 462 BLAKE2B 8092c0a0e4a28fdedd16131788e41c7133a7d114b6603c859a7b75a3e2c1519e51450c6ecd8b8bb42b16feee2b187d61a3241c4af6a4decebe85cd011944271d SHA512 bc243259fe7e0cf4892a8e9d5bc9792cdf9166400e6c5a2bb00dda58a1a4eae672c9b5c9723ba662f583bf47b994134943d6879141472e9ca4395d8700649997
diff --git a/dev-python/marshmallow/marshmallow-3.11.1.ebuild b/dev-python/marshmallow/marshmallow-3.11.1.ebuild
deleted file mode 100644
index 9f52e6654547..000000000000
--- a/dev-python/marshmallow/marshmallow-3.11.1.ebuild
+++ /dev/null
@@ -1,26 +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 distutils-r1
-
-DESCRIPTION="A library for converting to and from native Python datatypes"
-HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/marshmallow/marshmallow-3.12.0.ebuild b/dev-python/marshmallow/marshmallow-3.12.0.ebuild
deleted file mode 100644
index 9f52e6654547..000000000000
--- a/dev-python/marshmallow/marshmallow-3.12.0.ebuild
+++ /dev/null
@@ -1,26 +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 distutils-r1
-
-DESCRIPTION="A library for converting to and from native Python datatypes"
-HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/marshmallow/marshmallow-3.12.1.ebuild b/dev-python/marshmallow/marshmallow-3.12.1.ebuild
deleted file mode 100644
index 97790c85ad17..000000000000
--- a/dev-python/marshmallow/marshmallow-3.12.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for converting to and from native Python datatypes"
-HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/marshmallow/marshmallow-3.12.2.ebuild b/dev-python/marshmallow/marshmallow-3.14.0.ebuild
index 7d3435061f3f..7d3435061f3f 100644
--- a/dev-python/marshmallow/marshmallow-3.12.2.ebuild
+++ b/dev-python/marshmallow/marshmallow-3.14.0.ebuild
diff --git a/dev-python/matplotlib-inline/Manifest b/dev-python/matplotlib-inline/Manifest
index c152abee6fff..41cb9cccd1e1 100644
--- a/dev-python/matplotlib-inline/Manifest
+++ b/dev-python/matplotlib-inline/Manifest
@@ -1,5 +1,3 @@
-DIST matplotlib-inline-0.1.2.gh.tar.gz 7340 BLAKE2B 026c08d8a96d4402a1b70e50f1adce2b620c17b00d9e4dc365540c41b2d8f189a73cf6c65c8946ae45e7e5325321d28918692c2c6b5f81668fa56fedb40fd425 SHA512 e6ac7efe10979afb773b75c4d2ee321c52b1e9788a80703d063b0936b4989946aa35206ff7e8ad4ffaf6c1116d893de9516fc033f53685ad3a55d8f1a9a8fd48
 DIST matplotlib-inline-0.1.3.gh.tar.gz 7337 BLAKE2B 995b6e5ce9068760e701e3b429d2187bdc7e7c5b989d54a9fb1f8b5f385f91c6a3621a54d5a1e62c9000737f5f42d9ceae5be7f36b664b7e06ff9c712e6d76ac SHA512 684821204faa3cb35c46663b8c8cb8f0ba5d4f761d15bc708de69c98753685c89da1d330087bcfa970792de592188768dc068accc471d55360f551e44cf4a79a
-EBUILD matplotlib-inline-0.1.2.ebuild 549 BLAKE2B fb1dee47ea76d56564d39e6f29d254356bcbead6fc15181285cac69851cf8506a4aeb6e135d710989f597c108ab11f173628b23ada8986bd50f37aa7e338cef3 SHA512 3aeaa8783c40cfcb411584eac7fdfc070f0e8ba1d71590e97fc5fca6cfaaa7917f95359c47e6003a32c381274a451b9183ce040a880c8c376217437e3419230a
-EBUILD matplotlib-inline-0.1.3.ebuild 555 BLAKE2B 93b05b2ddc718165f49afb3cb06512c0f7d746b725da64064d92e59b8370f6cc29c6a6448a8f64195043c6ec81522a29343a3bebe037b47b7e734c077344edfe SHA512 dbe629ead7ad50baaf5689288a31343dec095c9d3263a36df1fb75a6dda403a35156e5489f1826400786f05e6af1d0c0ba56e8fc2d3305c7e7365c80675a7440
-MISC metadata.xml 364 BLAKE2B ed49b2fa437a2f09b0299ce20b67f21f6a47598541b5947db5577fce784d08c61e8c87e3ee84da52f6535a076d4ea9ec7acb06071bcca8329064a192fe433d13 SHA512 796577807f86c3568136409adcb92fc0f8eb2259d63f308709c95fa15bad5cdff0e8603a9e2cf705c2f7b61df86c5fed98aef773c571267169d030a9406e69f1
+EBUILD matplotlib-inline-0.1.3.ebuild 549 BLAKE2B fb1dee47ea76d56564d39e6f29d254356bcbead6fc15181285cac69851cf8506a4aeb6e135d710989f597c108ab11f173628b23ada8986bd50f37aa7e338cef3 SHA512 3aeaa8783c40cfcb411584eac7fdfc070f0e8ba1d71590e97fc5fca6cfaaa7917f95359c47e6003a32c381274a451b9183ce040a880c8c376217437e3419230a
+MISC metadata.xml 388 BLAKE2B 2c15ea9d7f572bfd693b7b715ad5d32b0528889b07e7b7d2b58e2f99d1884acf376ed5bcbcf527179b232bc761c3aa31a59b112acd7b3a82f07f19d2592d167d SHA512 a40bc579234e3f6f4cb7cf12c0851ff23be0e9a2af94af099d503214f626d03a26dff3fc5d1aebedb5c3b4adfb13f1b6fb72ec10d62d3fea6bc2772271cea027
diff --git a/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild b/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
deleted file mode 100644
index 33bc090b29a7..000000000000
--- a/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Inline Matplotlib backend for Jupyter"
-HOMEPAGE="https://github.com/ipython/matplotlib-inline/"
-SRC_URI="
-	https://github.com/ipython/matplotlib-inline/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
diff --git a/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild b/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild
index 50c6f3da0068..33bc090b29a7 100644
--- a/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild
+++ b/dev-python/matplotlib-inline/matplotlib-inline-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib-inline/metadata.xml b/dev-python/matplotlib-inline/metadata.xml
index aad2292b4508..db1e0b9d696a 100644
--- a/dev-python/matplotlib-inline/metadata.xml
+++ b/dev-python/matplotlib-inline/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">ipython/matplotlib-inline</remote-id>
 		<remote-id type="pypi">matplotlib-inline</remote-id>
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 8704453461e2..85cf6220ca55 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,10 +1,10 @@
 AUX matplotlib-3.3.3-disable-lto.patch 828 BLAKE2B 2044ef633091f27080d20e3e1b2c74605e13e99c9d044e97accde3b0a7946ef656f10c9bf5c036745f8ec85380e48cfd5e3d6fe8a023fa60e408d270f45a1da5 SHA512 81562749756b0415c6ce333d3cbbc197306dc9c2c425ec761767271c974badd13fe9a497c74231cd1bf9347f03ef0593bceff9b597289a8328e7c0211c7047ed
 AUX matplotlib-3.4.0-test.patch 10105 BLAKE2B 3a084180ec096a99d0b9a25458fd1b422d23599cb6fcbe0d7367df7e5c308675f92e95d008fb80e96125101f8f67c4b3a437209bc4bc032cb779130043827160 SHA512 f6196ded497e6c931f33a50cd82f4c7a5710dbc2dd1d74e3ba4467cf936176ef5a64fc2a9ff5281a0a114041c9751e352e522869ebb28e0e0bc50c4ebf1a8b5a
 AUX matplotlib-3.4.1-xelatex-test.patch 3200 BLAKE2B 0203bf1a3996ecf639d2dfee733f9fb1c664f35d501ca5049e5940b459f707cd4024b665106b62ab769805c4b976566c518a237637b766d97d2cb65abba8a266 SHA512 58c65834645974e56e6484788ed07d5bedaee3f72ff2023a36df9be3be03639eb588f769b7a727a5dc25a125d9df4d351e7fedc15699dd0576afd10718398fef
-AUX matplotlib-3.4.3-test-extra.patch 974 BLAKE2B 5b125219e92be435c26f466252206ca37dd22560c6ffda8311d4fe9f0b184b1f3f84c947cf9cd37f0abfbc5514ebf1999b9ceab6414dd0012bdc6948c51a83b1 SHA512 256657d7b25f4f71c7f01fe75423299f5715df45e7fcb41bc74c543383e5328a2482fdea287ce16212bfa9785fad182f3a91caa4f576687bd121bd6fc6c22dd2
+AUX matplotlib-3.4.3-test-extra.patch 1470 BLAKE2B ff284d58282a4e82bf46d1d6234db4d8a45826e2868de8dcbf40e527a4d10e1114c9a04046ad2d5aa065b18809d42be124c37c63cc104cfd62a5d22c5f9fd739 SHA512 ce332fbbfe4283f8eb90fbd3ab994ce4140f13d5ea648a9c5bc68fce3758f7fd23df2bdc33b44554b7de76bcf89d5b21c8cccbcb71e451297fb8721d60fc5052
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
 DIST matplotlib-3.4.2.tar.gz 37308683 BLAKE2B b769244b3d7a7da9125f6b634e9340676d849322491390d1c9a0cec3dfce59a8b5b5c0b567575ae78212129f7303b6b1fbbf30ce7c8a23c43c1304e83c9c5f5e SHA512 d4798dd2d6c857db0fe6d4ec85ebabc028b78627311bab17f7b9b30f6aa61d5243114b1cfe9d83293ad66ae47df83add5272f032954990dfc04054a792049f2a
 DIST matplotlib-3.4.3.tar.gz 37850796 BLAKE2B 15b40da8f6973ece4a91fffb5caf249cb8642263bfc2a784ec482bfaad250b6d3beffb9d2ba8a03e5fa10abab02b0e35728a8499ccb870aca06df57c5c1f91f4 SHA512 c2fe54e7517a1417aa8e55596e83edd090534c07f22882634d6ba0a07196441b5bbdd15958473805d8e8871b1b73380487aff3224294d472cd6122490c783145
-EBUILD matplotlib-3.4.2.ebuild 6925 BLAKE2B fe6cd0b20cbffbd9d85cfcd858c7f9c60db4f7ac45dc4788238c22531df3774fda6bb9b36ed07a7d0b4be3426033569825f78bfcc6de2efbc2e0f3e122498fd2 SHA512 342f540d80a45aef25187422682f0e4f052842cf9dd0f1234e8dc0eeabcce10913fd960cf122b57a1242a2229b752b9dd82b3f59818d50ac5cf16ccb0378033b
-EBUILD matplotlib-3.4.3.ebuild 6942 BLAKE2B 715a7ebcece65c92a7131b12208a11358116ef5fc449bb2d5cd9b1757f8746ac368f4722539a5e12e14a269808baf47aa04a1f1dc75a0f46db5600b64eed32fe SHA512 4b889c08385cbcecbe43cbe7b1e0c9818c4378e84f755fbd1c47494f63eaaccb7208f87e3328ad11883edf7a3ed17dac3a3d0f32762e3cd7c6141f3e53ec1e72
+EBUILD matplotlib-3.4.2.ebuild 7032 BLAKE2B a571b11cc84485847b71eca8e85fe2c8f17eedf7f2ba20e45f85a33216a7ae56ab7ea35379921b0b5f7dfe644f1bea0968b615c53d86a7a4634b56a69a0245b0 SHA512 995339f6e87e98185fecc372a55cffccc4ac1c660926a028592363b0aba86dd61c108a9d8da3520f1820aac458812b94364233334adbef293355ab36a08087e5
+EBUILD matplotlib-3.4.3-r1.ebuild 7085 BLAKE2B 0f32e43c2bf7cb1796416fea3a9c41d3c7dc28d37051582ff0cee80064442d62cef332aadd5e427fdb2a40b303b05a6d849896507939c00891e0259ef084c9cb SHA512 32b3303ee404cfc3a46a49046aebac24a073b6c2f9563ef6f9ef6f6f8ee686f11711a6039f0adadf5a1805a45869a776533464e192f80630764b6ae98a28c401
 MISC metadata.xml 1014 BLAKE2B 2a8449ab2501a2018362ed1340bac129a68bf56cf977545207dd507e2f9364a8ac3665bdecb598fd8f5bfdd0dcec26011315146e5e0dc5fd45f2c76dbab3b53e SHA512 2356ad2cfd5bb3973e8736181efa8483234054bb1c46acdb85c523ec45b48f03567a2406e2d60b038da11e29d15aade67ecfce5aeac8a76ff3c6a40aac123bb4
diff --git a/dev-python/matplotlib/files/matplotlib-3.4.3-test-extra.patch b/dev-python/matplotlib/files/matplotlib-3.4.3-test-extra.patch
index 3f76705745df..cf641ff753ef 100644
--- a/dev-python/matplotlib/files/matplotlib-3.4.3-test-extra.patch
+++ b/dev-python/matplotlib/files/matplotlib-3.4.3-test-extra.patch
@@ -23,3 +23,16 @@ index 55e375311..684f38fb7 100644
 -- 
 2.32.0
 
+diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
+index c635564..4352942 100644
+--- a/lib/matplotlib/tests/test_image.py
++++ b/lib/matplotlib/tests/test_image.py
+@@ -872,7 +872,7 @@ def test_imshow_endianess():
+ 
+ 
+ @image_comparison(['imshow_masked_interpolation'],
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01,
++                  tol=0.01,
+                   remove_text=True, style='mpl20')
+ def test_imshow_masked_interpolation():
+ 
diff --git a/dev-python/matplotlib/matplotlib-3.4.2.ebuild b/dev-python/matplotlib/matplotlib-3.4.2.ebuild
index fa2b2aa00c9e..e3fa994405b6 100644
--- a/dev-python/matplotlib/matplotlib-3.4.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.4.2.ebuild
@@ -60,6 +60,7 @@ RDEPEND="
 		app-text/poppler[utils]
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
 		dev-texlive/texlive-xetex
 	)
 	qt5? (
@@ -87,9 +88,12 @@ BDEPEND="
 		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
 		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+		virtual/latex-base
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-luatex
+		dev-texlive/texlive-xetex
 		>=media-gfx/graphviz-2.42.3[cairo]
 	)
 	test? (
diff --git a/dev-python/matplotlib/matplotlib-3.4.3-r1.ebuild b/dev-python/matplotlib/matplotlib-3.4.3-r1.ebuild
new file mode 100644
index 000000000000..cdcaa06eb526
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.4.3-r1.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+FT_PV=2.6.1
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="https://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? (
+		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+	)"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013:=
+	virtual/imagemagick-tools[jpeg,tiff]
+	cairo? (
+		dev-python/cairocffi[${PYTHON_USEDEP}]
+	)
+	excel? (
+		dev-python/xlwt[${PYTHON_USEDEP}]
+	)
+	gtk3? (
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+	latex? (
+		virtual/latex-base
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		dev-texlive/texlive-xetex
+	)
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	webagg? (
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+	)
+	wxwidgets? (
+		$(python_gen_cond_dep '
+			dev-python/wxpython:*[${PYTHON_USEDEP}]
+		' python3_{8,9})
+	)
+"
+
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-text/dvipng-1.15-r1
+		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-luatex
+		dev-texlive/texlive-xetex
+		>=media-gfx/graphviz-2.42.3[cairo]
+	)
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_tests pytest
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_supported() {
+	case ${1} in
+		wxwidgets)
+			[[ ${EPYTHON} == python3.[678] ]]
+			;;
+	esac
+
+	return 0
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use_supported "${1}" && use "${1}"; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	local PATCHES=(
+		"${FILESDIR}"/matplotlib-3.4.0-test.patch
+		"${FILESDIR}"/matplotlib-3.4.3-test-extra.patch
+		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
+	)
+
+	# requires jupyter-nbconvert
+	rm lib/matplotlib/tests/test_backend_nbagg.py || die
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
+		-i lib/matplotlib/tests/test_*.py || die
+
+	hprefixify setupext.py
+
+	rm -rf libqhull || die
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[libs]
+		system_freetype = True
+		system_qhull = True
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		gtk = False
+		gtkagg = False
+		macosx = False
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
+		> "${BUILD_DIR}"/test-setup.cfg || die
+	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
+	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
+	distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib
+	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
+
+	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(argv=['-m', 'not network'], verbosity=2))" || die
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/matplotlib/matplotlib-3.4.3.ebuild b/dev-python/matplotlib/matplotlib-3.4.3.ebuild
deleted file mode 100644
index ef5afb63c248..000000000000
--- a/dev-python/matplotlib/matplotlib-3.4.3.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? (
-		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
-	)"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013:=
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-xetex
-	)
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	webagg? (
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
-	)
-	wxwidgets? (
-		$(python_gen_cond_dep '
-			dev-python/wxpython:*[${PYTHON_USEDEP}]
-		' python3_{8,9})
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		>=app-text/dvipng-1.15-r1
-		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
-		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		>=media-gfx/graphviz-2.42.3[cairo]
-	)
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_supported() {
-	case ${1} in
-		wxwidgets)
-			[[ ${EPYTHON} == python3.[678] ]]
-			;;
-	esac
-
-	return 0
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use_supported "${1}" && use "${1}"; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.4.0-test.patch
-		"${FILESDIR}"/matplotlib-3.4.3-test-extra.patch
-		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
-	)
-
-	# requires jupyter-nbconvert
-	rm lib/matplotlib/tests/test_backend_nbagg.py || die
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
-		-i lib/matplotlib/tests/test_*.py || die
-
-	hprefixify setupext.py
-
-	rm -rf libqhull || die
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[libs]
-		system_freetype = True
-		system_qhull = True
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		gtk = False
-		gtkagg = False
-		macosx = False
-		pyside = False
-		pysideagg = False
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup qt5)
-		$(use_setup tk)
-		$(use_setup wxwidgets wx)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-}
-
-wrap_setup() {
-	local MAKEOPTS=-j1
-	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# we need to rebuild mpl against bundled freetype, otherwise
-	# over 1000 tests will fail because of mismatched font rendering
-	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
-		> "${BUILD_DIR}"/test-setup.cfg || die
-	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
-	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
-	distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib
-	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
-
-	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(argv=['-m', 'not network'], verbosity=2))" || die
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/mediafile/Manifest b/dev-python/mediafile/Manifest
index 358732aa9552..eb0d1ccc0427 100644
--- a/dev-python/mediafile/Manifest
+++ b/dev-python/mediafile/Manifest
@@ -1,10 +1,3 @@
-AUX mediafile-0.6.0-wavpacktest-fix.patch 391 BLAKE2B 6ef2b9f82cdb7c261c5c56d86f6087402799ef4fdc0fa8f58c8309de43e9f2b76b8883507b979d5fa7559b16eb3cf32496d0f1a4136ce2ffa9a30fd8aefea4a8 SHA512 76b1600a96d8f2b43cd140b067c12a6846cd8ca83827d5ba2a922fde6412cf4189a0848ec3bbdb14cb94e3f6a73936e17bcaf9b5e95c1f494209391344987e3f
-DIST mediafile-0.6.0.tar.gz 509351 BLAKE2B 5b8d97be6bd7becd44053d2d1b855252161779d5a01e8fea29443db0b3f524ba3b58dfa372b48451da76672ea5fdb521cd8a2a5c6c110d37e637dcfefbc0842b SHA512 7fd7d8a1d53311c22835041c39413d9dc7e1b4d8afc94a8c578aa4de7f65361f6c998062bb1b2804cae1f672c6b8e7c109fcc3e459e2266b8f19a0bde8673945
-DIST mediafile-0.7.0.tar.gz 511379 BLAKE2B 7248d72a45bcea59937d0098fa3ee7458852ab9e4663ed3ba6582b5671531154dc7d3f820a20cf10d1bfe2e594ea202fc2825ac8aba683df08707d2cdb52d9c2 SHA512 5b43aae6066e2122bc37cbdbfda04406d3f4da074df5512a5def9c1ca96ce96163b73d7c7d335518a4a7a41a9d5f195a0e371e908264b6040d3494e9827ccd81
-DIST mediafile-0.8.0.tar.gz 559590 BLAKE2B 21aa22b2369d86fb0b5ec4c7b92c1de65e6d266572d938b92330f391242a87cbadda84157409bca22e8568298f1f15928819f9c929c343de03b4f9ddb0be486a SHA512 772190c719c741a7a0a83c6e04803efaf008624769764b72a92febc13d89da4ad615b344424d2a55a60715e67802935a49aa57d6ee4cfa1d5ea9581851c5ca1b
 DIST mediafile-0.8.1.tar.gz 559592 BLAKE2B 3eaaef6349cf24dc871bee94cedaffe4c6ac713da0a55fef926724697f0e42149d544cd28ee9b8d9d21fa1e117306838f586cad7f085bc359f4ed8e78f6aef1f SHA512 58398ec94ab4865d88fed4c72344599b70fbeeffb538ec23ca84d8a8e19fac82a1d0d52c67867df056458716d5138a1c96e650bdb766c567134b2666cb8c140d
-EBUILD mediafile-0.6.0.ebuild 1078 BLAKE2B dfe51ac82824a5586807f42333279862c2c4104650ac3ca75e32805e3863d95d4ce8c0e2c678c89247d299d562bf36bcdc2ee43bdbb90e52abd170a7be4bddc3 SHA512 57a8e52614eaa79a566abbed0aa13b4a894680dad4a03eeefbf408def11ccbe014145edbf9950d872e81873eeb406b5bd35b68d4f67fb50c7502eef875fa7fcf
-EBUILD mediafile-0.7.0.ebuild 605 BLAKE2B 55f46a2344826282f2df531f7780ac7e6d1ceddbaccc28154f8c1693efd92533330e540fd0657b6747b71c208e7874084e419791e90095b75433520c839f239b SHA512 2c75325e378dd1e3f02e1962fbb954c02ae066a7bd8f19b757cd1a3fc2aeb64ef25091d0111501344b3ba20c909ebe327b04817b078d3b45140f3088518697c3
-EBUILD mediafile-0.8.0.ebuild 605 BLAKE2B 55f46a2344826282f2df531f7780ac7e6d1ceddbaccc28154f8c1693efd92533330e540fd0657b6747b71c208e7874084e419791e90095b75433520c839f239b SHA512 2c75325e378dd1e3f02e1962fbb954c02ae066a7bd8f19b757cd1a3fc2aeb64ef25091d0111501344b3ba20c909ebe327b04817b078d3b45140f3088518697c3
 EBUILD mediafile-0.8.1.ebuild 605 BLAKE2B 55f46a2344826282f2df531f7780ac7e6d1ceddbaccc28154f8c1693efd92533330e540fd0657b6747b71c208e7874084e419791e90095b75433520c839f239b SHA512 2c75325e378dd1e3f02e1962fbb954c02ae066a7bd8f19b757cd1a3fc2aeb64ef25091d0111501344b3ba20c909ebe327b04817b078d3b45140f3088518697c3
 MISC metadata.xml 680 BLAKE2B 0b6b669509378e4377452e3f0020f16f41cb1c162b5596aaca7459c794b7f5c818df76969b5829d3b2e72ca0a4463a5d8b946c133acdbc063e5c4cb6a55ee1b6 SHA512 70109bda3921ac9eb6f0f09f748d3afdb977b6cb6699a457e5ad439d341a88cca2a28c229c0a7c5cbc50937ce7e8b2448156f829b9603f911b5c07807e3eebd1
diff --git a/dev-python/mediafile/files/mediafile-0.6.0-wavpacktest-fix.patch b/dev-python/mediafile/files/mediafile-0.6.0-wavpacktest-fix.patch
deleted file mode 100644
index e1427b1eb914..000000000000
--- a/dev-python/mediafile/files/mediafile-0.6.0-wavpacktest-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://github.com/beetbox/mediafile/commit/d2fc3b59f77c515b02dfe7ad936f89264375d2b4
---- a/test/test_mediafile.py
-+++ b/test/test_mediafile.py
-@@ -907,7 +907,7 @@ class WavpackTest(ReadWriteTestBase, unittest.TestCase):
-         'bitrate': 109312,
-         'format': u'WavPack',
-         'samplerate': 44100,
--        'bitdepth': 0,
-+        'bitdepth': 16,
-         'channels': 1,
-     }
- 
diff --git a/dev-python/mediafile/mediafile-0.6.0.ebuild b/dev-python/mediafile/mediafile-0.6.0.ebuild
deleted file mode 100644
index e011253ea3b5..000000000000
--- a/dev-python/mediafile/mediafile-0.6.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Read and write audio files' tags in Python"
-HOMEPAGE="https://github.com/beetbox/mediafile"
-SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.33.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-wavpacktest-fix.patch"
-)
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		rm -r docs/_build/html/_sources || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	nosetests -v || die "Tests failed"
-	if use doc; then
-		sphinx-build -W -q -b html docs __doctest || die "Doc tests failed"
-	fi
-}
diff --git a/dev-python/mediafile/mediafile-0.7.0.ebuild b/dev-python/mediafile/mediafile-0.7.0.ebuild
deleted file mode 100644
index 2f819917342b..000000000000
--- a/dev-python/mediafile/mediafile-0.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Read and write audio files' tags in Python"
-HOMEPAGE="https://github.com/beetbox/mediafile"
-SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.45.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
diff --git a/dev-python/mediafile/mediafile-0.8.0.ebuild b/dev-python/mediafile/mediafile-0.8.0.ebuild
deleted file mode 100644
index 2f819917342b..000000000000
--- a/dev-python/mediafile/mediafile-0.8.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Read and write audio files' tags in Python"
-HOMEPAGE="https://github.com/beetbox/mediafile"
-SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.45.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index bb4cbd953b4c..cb0ebbca76bf 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1,7 +1,3 @@
 DIST mkdocs-git-revision-date-localized-plugin-0.10.0.tar.gz 368270 BLAKE2B c00956c86394bdfc8b2fe9e51e7588362f6bd7bc3bde174c1d387377418a47f56f01137e597405146280bba195ebf7aa5cadf67e9514734e5874df69e4990857 SHA512 8ce742cd995c180372a9d76a96c19f4f7c7b9fafe5c67f13e2c1d7377dc18e071d379cd741cb5f4a84be9f275b3f3d74d23875e766a7dda86498acb0a08d4344
-DIST mkdocs-git-revision-date-localized-plugin-0.9.2.tar.gz 367301 BLAKE2B ac4d69117dea856a209d144e452cf408ee3d111eaa8a9825602b9f8d604a79143e96a51e67b74e430eecc6ee33335161e409149220a8b216f3b47f22e7a49f12 SHA512 11714323a6e300d0d8d05198f617019158dc48ba43e8a685f52702da7f52558f1358dfce294dcd421ba9d59131c17e4d6ea6ff483397055dee62dffb76032d4c
-DIST mkdocs-git-revision-date-localized-plugin-0.9.3.tar.gz 367885 BLAKE2B 3c7aa4a5cfcb585c022c9a652ff0b5be8c309298f69c69973a9442913ac4d12f14a3f5783627d9574cffc9c438e98678641d58e77f6712e0ddf68ac77ee098fa SHA512 8a345770a6f40bacc0899a7fcf3d056874f3a947ffbd001bd5885ef88e813e4d405ab7d7a06be3adb5ef34d5ef1f449432b0e9594b79a9d4a9350901c692cc10
-EBUILD mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild 1280 BLAKE2B 4e1334db9a2a00f3adcf20ed06d10cd338a5a7b5bc8d8179b9cba2a3336d4f8bcd8b36d82176fb0da54e7105142d608d8cd8a51004d25beba9414361a5d2490b SHA512 5f01f874e002967197e3ce44c6087f9e81682a2247c731a3ec1130faf35924c80ff2809563ae0eb66cf9f5c7942cdc2f9a7d51a8fbb6f8f198a738f87c02281b
-EBUILD mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild 1416 BLAKE2B 8a1f5230ee1befd6ee7faa3b867f4bddd1de2b0d387c5d4875d95b93ab79f1c7a2211a735bdf6f7881d8095ecded6e8b226bab60ab90603ccffc587e7a88b00f SHA512 8ae55c9b5a36010a1918b316f83b9506e722bc4d52c8be57bb6983cb0ec381359dce554f94769206504f6ea6498c90a8a8c08dff5fe373dd64daf06b54321223
-EBUILD mkdocs-git-revision-date-localized-plugin-0.9.3.ebuild 1273 BLAKE2B 807578a8fcaddb8321172fa5f9a02eb2029b5e5fde8f8b2287c515364ab99f772dde9e7b1e85215ecbdcae272f4bc119110189802b89e75eb9249a2b15f90625 SHA512 a7fc75e61e7b568249846092f9e80e0a92b84ff7a19f3425d30c25393f43211c46c74823ced2908ac589a5360380a8fe06b17568e0d044236f36036480a41585
+EBUILD mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild 1278 BLAKE2B 001ece8dcc5772c25b91f72fbda9adf1e5fe4e53b3ca7ed979415d82b3bffdbc21441af35c2f20b2ef1693e70db3b38466609d49fd7b387a0074f1ac9591a1e0 SHA512 4707de75627f5e5222108414edb0710d2af45a05747a71f1749b477112ce68477f3ad74bce5a3d52df34c85d213a10241449b7abafcebaf33ee70f03ed0590c6
 MISC metadata.xml 596 BLAKE2B 9010c7fd37265b6770544a605f918524b75d7b1afea8809075c3b5afb5e56f6848aff4c7fe98367b3dcb3de16f0d21682f9a2fc80f441783f32f904dd8f9a152 SHA512 431dff95204b056afa3a4dab48eec1559d72d0c1ae9a65d89d95fb97454f858c9022578043238a34ce205ac5a16871e6f6d68a3bfe3231c20852437c4fd66254
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild
index eed444ab0237..9a918d947228 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild
deleted file mode 100644
index fbb93162a538..000000000000
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild
+++ /dev/null
@@ -1,55 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="dev-python/mkdocs-material"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Display the localized date of the last git modification of a markdown file"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
-	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-	doc? ( dev-vcs/git )
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin's tests need git repo
-	if use test || use doc; then
-		git init -q || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -qm 'init' || die
-	fi
-
-	# The release tarball is missing some required file
-	# FileNotFoundError: [Errno 2] No such file or directory:
-	rm tests/test_builds.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.3.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.3.ebuild
deleted file mode 100644
index 4a3ee1f62f98..000000000000
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="dev-python/mkdocs-material"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Display the localized date of the last git modification of a markdown file"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
-	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-	doc? ( dev-vcs/git )
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin's tests need git repo
-	if use test || use doc; then
-		git init -q || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -qm 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-material-extensions/Manifest b/dev-python/mkdocs-material-extensions/Manifest
index b0254794c4a2..b836569de71c 100644
--- a/dev-python/mkdocs-material-extensions/Manifest
+++ b/dev-python/mkdocs-material-extensions/Manifest
@@ -1,5 +1,3 @@
-DIST mkdocs-material-extensions-1.0.1.tar.gz 12259 BLAKE2B 464b0856f10f0b9311d5c6fe15def4af9384354ab86e62392052ae1bb7450bd09ac56b5d3e9f40b252b30c924f1cf35597ffc9c898f0cffb2c11a74b45da4090 SHA512 68bfdde71f654a9ae42cb6d4545005eddc235e74f6a4c49707853de9cb30261c77ab8c8534b15019c7030d01b97a32645f5355a9e6511470466bf0e6f17b6890
 DIST mkdocs-material-extensions-1.0.3.tar.gz 11983 BLAKE2B 0a9594c85df0782543275598368497bc5bd902c2e96dd75628b94eefc2f7998b948cc659577db6b27fe2787fe2a6547bdecac823f4a9533bb6b8d781922f9a6a SHA512 af6ec96db5628527d6dbdeb6557276cdf297ab5926cebf5508d6e5c4c5b8493b9f55b967230e2853d28bcbb17129a32778936ccd0264ab75c870be2eecf2e8ef
-EBUILD mkdocs-material-extensions-1.0.1.ebuild 974 BLAKE2B b0995abe000be9ed652c8506070c2f82806bc5fe7451bc3217d7b43f25e68ae32cf665f16cd89f032e71e9f93430d81775d52ea5fc1185a57221b96f07d5b6ba SHA512 b9842cd2c791675d5da3093ee7f79b0860a558804c0253e5a69104567ea6ce01cecf8b4e95f5869c818a61a16fc0ed14e7f48f26d90331836745b58037881f9e
-EBUILD mkdocs-material-extensions-1.0.3.ebuild 846 BLAKE2B a9dc49dee0d2073c8589a7e6f1b686cfc7481390cd6e7ea7cb1e9ec2a55d102f10fda454e939e9da067372bdeb2cd0b920ec303f141a232fe6c6eec6a35a3ba2 SHA512 087bf4534baeb81038ea58f3b2477fb133af7227e8d8267634ef338e8c12a10a83f2153bc39479c3fdc8caf91898f3c0aa278c8b78197c10256d45ec9999d2c4
+EBUILD mkdocs-material-extensions-1.0.3.ebuild 844 BLAKE2B d8615b3ef223237d8cd38d8614e66e245dceee30813a0f08b802612cb7ce0774d6d92f8039a68a476a13806ff3b101dd00e45369607b21a3c7bc41e6c24edab9 SHA512 4f3df244db4233718d023359fdb82d244722f6976b9c4697ba9a185625afc11b7c751629afae8335d9e1ca3df3baca266f3559e5f72f51c8ecb66f9d4f89f32f
 MISC metadata.xml 451 BLAKE2B 3deb46d9e68b98525a9d7d31d2ccc0cf3c142d2988dd01636f037bec1b0ebfb07bd675c402fba89f6c7d171444e693b1c070eaee27c9a0ce94d48a1edd73b58e SHA512 add6b4dc2b6a8032aa3edf9ad22f02edaebf4cfae392c2920db40c201adedb20e6f085de59f2224a3fa037060c7cdb3dc238d3174a97f95aa35bc3bc8618f3da
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild
deleted file mode 100644
index 3c8c66fb5539..000000000000
--- a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension pack for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/mkdocs-material-extensions
-	https://pypi.org/project/mkdocs-material-extensions
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# mkdocs-material depends on this package creating a circular dep
-PDEPEND=">=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]"
-
-# we still need mkdocs-material for test, but the circular dep can be avoided
-# by first emerging with FEATURES="-test"
-BDEPEND="test? ( ${PDEPEND} )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# AssertionError: False is not true
-	sed -i -e 's:test_material_svg_injection:_&:' \
-		tests/extensions/test_emoji.py  || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
index a6e4f2529612..e8608a61b1d6 100644
--- a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
+++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 # mkdocs-material depends on this package creating a circular dep
 PDEPEND=">=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest
index 4a27b321efc3..5a0318f9ded3 100644
--- a/dev-python/mkdocs-redirects/Manifest
+++ b/dev-python/mkdocs-redirects/Manifest
@@ -1,7 +1,5 @@
-DIST mkdocs-redirects-1.0.1.tar.gz 5772 BLAKE2B e48a35b18690c040efcca2e3e6a97650a3f951b89d537537b54b297e61c590099c6891dd1d64f21dd4efcc4a20d3d709a2815280c2846324f9f57b5a953a31bb SHA512 e3eb31ce920aceab2e4c93988853fc0e63ba789db229ac798791061b26252416c5c68b2c221f82e3a08ce7522e6b2aa58ca606b9a31653f782e31c415861f7d0
 DIST mkdocs-redirects-1.0.3.gh.tar.gz 6395 BLAKE2B 6e6b319cacd5039550755b1796d09c5377b65174b9e0f2dab7e47b37626bfdeda4f9c52ecc7eb3adeec31f4c28c408bcbc4f8461b16c8f02cfb60bdf929d776a SHA512 7977e92e1e8e29a7ef3f3644060d1d872bb67c2386d1880799b95e7d505834ff629bf70824301972f10af39ad8c60e8813f28ca3165ddb9b150af359bce361c9
 DIST mkdocs-redirects-1.0.3.tar.gz 5148 BLAKE2B 438e2751b4570e8347b06a67d86b0afbb99c9204cb0732719e3301d09ac70f268b0302dc9876d7dbb11f24a3dd4a6eba94c3fb3c765c21e934d72442a1ea37b2 SHA512 c33837473211e9ad13da23789f23242182c4f07fe662b448c17d3976f8eb6ee9acdd69ecb7836c025471862c3ff27c8e3bf9a7178596ec8abd940912d48ae9a7
-EBUILD mkdocs-redirects-1.0.1.ebuild 544 BLAKE2B df0b1da015351df4ced3ea65d78fbd02edb2301bdba6e8702cf5fdeae28ccf2934d38d5c55436c223081d917e2e1908a84e64e0f462b3bb4201b91b6962aee47 SHA512 f645caa7148922f8911027c0da213410baf6a40ce6211baaf4657966e383fc5244b63248d332e46fc88ba6ae4081653b9017d9702bc9f7cb6546d04372cdffad
-EBUILD mkdocs-redirects-1.0.3-r1.ebuild 780 BLAKE2B fac2ff63058d2a271f2339ae378e9d370d02d06074bbc6e072cedb233c730e372ff285538d1a0ae86c9f39016e4a5ad852fa1204603c2e39f257bce5473e851c SHA512 8fcb471783bcf5ef92363e639c8417c1e74fd7f291c3c524be3075b6eb567a65c9743e55e9e8b229de078e80a057324ec0d69fb34422eaa1d89ff7110ee46d24
+EBUILD mkdocs-redirects-1.0.3-r1.ebuild 778 BLAKE2B 10e9be17001a780c92c0cca14b7545b9b0b8a26bd441ff3244b42f6d81274510bca9e4033559a1b459d1df69192a588fd06b1518a40c37af3ec3bd22a0b15f9a SHA512 1122b2f1a89c27089c0bd5fdc2aad29c4439f8667843df600a595f5d526b0111d867856850148859525f8094340ae77c91df994551e54c208965db343f669b0b
 EBUILD mkdocs-redirects-1.0.3.ebuild 518 BLAKE2B 30e27e8b269ea31a63c2010af094e4621a4d610cdef374c75bf54f24308f00d46b2537ff4380f3b3b1a41bdc85687293f00ab63eff8f13d891f665b7dbdd596e SHA512 c57355b75f2ce3db7d12014621e716bdc07ca1cf56d24153fb53fd88377d9b07772ae456f226f6ca0728e6004f06088d07a291eef7eadb7c24724f05510485c8
 MISC metadata.xml 428 BLAKE2B d25c3a01b0738679986b91e7a1bc3f8b6ba0b2683b616c4301ecb8528590d33168202007eb7defb98b5fca91b4bc032e934bf900559c0dd921dff93799602621 SHA512 c706f8029bdfc42e901bd18d0fc23550ec7dbacade9812fde08c7563ebf0d230d2630ccb1211c1b57185da4b21c37d216c8939149bd86a94a5b9443f25768d41
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.1.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.1.ebuild
deleted file mode 100644
index f71bc6d95211..000000000000
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Plugin for Mkdocs page redirects"
-HOMEPAGE="
-	https://github.com/datarobot/mkdocs-redirects
-	https://pypi.org/project/mkdocs-redirects/
-"
-SRC_URI="https://github.com/datarobot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
-	dev-python/twine[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3-r1.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3-r1.ebuild
index 6bf0e53609f0..385cc47db4fa 100644
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3-r1.ebuild
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index eaca163db9a1..401743321fec 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,7 +1,3 @@
 DIST more-itertools-8.10.0.tar.gz 102929 BLAKE2B ab98e0f94ea50bd4bd1d147bc81947259e77cdcadbbf365d1b3b0a02e97fbcff8712637721b82bdbf8d1f8ced7bea57c2c8b6249b07ecdcd179fd1316dee055e SHA512 a666710426a825e5aca10b52439a973e08ac6ec09fb5375426194d1342af055a8b6aee48b4e3fa17c4606d6d9cc3673afdd789dbbaf373258be6a71bd63178f7
-DIST more-itertools-8.8.0.tar.gz 93660 BLAKE2B 7d26b847c856064b6edfbda661b9e9288ba2069604e687d90713040ec469abab9853f3bff1b4e25b9ded764822a9ba58eccd5be5e9a13094ab4fc0871626289b SHA512 c6efec614a10a2fc72a4bbb7c62ac586e5dd28e04582768e0b3749cbd8307df0b4a609637d427d9c4940874e2aed1432094c09ac249e16a20dc6a09723172f06
-DIST more-itertools-8.9.0.tar.gz 98238 BLAKE2B 16b89c6d1ea4f43afdd69f2c2f0912aa828f5af63ff391efb0c6e05cec190970244800a207804fe03dce0cf87ec4835ab21f05e7fdde4ea826d172399f21fb01 SHA512 7e6480ec594703cb13282a0e81cdcc9513e972433442b9c7fa68fa4e17ea25e523cf8f4b1d16242f2a77b55eeaaae1d428b48c6297a25bb9f36b4f70b96ed7fb
-EBUILD more-itertools-8.10.0.ebuild 636 BLAKE2B 42aab6457961e3f49539cd1d36ef52c0a0257f34264f00830fce170bcc47b632c39b3de134ab3aeb68b8d615d12ab55d7d0afaafd0616b505037114b0dd587eb SHA512 e722cf173031bf75feb5ea42f66ff11a8b147063ac3cd0106bda196667c3118c81013fe38260b729e9c8b59085ca3fe0f140d42dfd96f4aa11acfde42beea868
-EBUILD more-itertools-8.8.0.ebuild 629 BLAKE2B 92e23e9e38a4577c6df424b0716ae99f07df1b83a8f522e44730aa9cc7cc659935757dd52065613fbc29119d0810d13781167438a5d62764f8acd5a6a7009047 SHA512 c2b99fbdd94b9d823cff83f191440232af7cff11a2340e7cbcc032fb8362eec7306b96a1cf4e59d59e7aeb13ae8fe0e02c6d0fbcf246fb38f904b26a2ba8e556
-EBUILD more-itertools-8.9.0.ebuild 636 BLAKE2B 42aab6457961e3f49539cd1d36ef52c0a0257f34264f00830fce170bcc47b632c39b3de134ab3aeb68b8d615d12ab55d7d0afaafd0616b505037114b0dd587eb SHA512 e722cf173031bf75feb5ea42f66ff11a8b147063ac3cd0106bda196667c3118c81013fe38260b729e9c8b59085ca3fe0f140d42dfd96f4aa11acfde42beea868
+EBUILD more-itertools-8.10.0.ebuild 628 BLAKE2B 416b60e71d44ed20d0db3a7a7f873e26c44472336494fbe49a00e930b480c4b1a86928e59693b4d8d085ce93c4c63294c3fcfff960b5fcd1bbf181fb82b7d04a SHA512 6783877a590aa3e6822f715a41d5507d3fbc702ef1d1ab59aa1fcaf58ed6347b8e11d9763b607cc312a3cbbdf8630e611ae146a757d38caacfdfaa6aaf6a7314
 MISC metadata.xml 488 BLAKE2B b2b63c92548ad22348cd8801eacf52c7cb9e7eae7f3db303986891d6aa0e69c28aadf815aab089a199d6238b00da43f609a5e1f0b730bbce6cce7f76bd57e6a6 SHA512 d8ee6881bd90416c5e3aaa68a3158675d3e65fd786f70287d12a2bc6d79e7e5e8e16f291d0c6d673f8c1d182953ccbee0fb4fd80faf9fca6176a16679f334070
diff --git a/dev-python/more-itertools/more-itertools-8.10.0.ebuild b/dev-python/more-itertools/more-itertools-8.10.0.ebuild
index bd17f3f88b05..2c4344c1e70f 100644
--- a/dev-python/more-itertools/more-itertools-8.10.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/more-itertools/more-itertools-8.8.0.ebuild b/dev-python/more-itertools/more-itertools-8.8.0.ebuild
deleted file mode 100644
index dee6dd69a2b9..000000000000
--- a/dev-python/more-itertools/more-itertools-8.8.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
diff --git a/dev-python/more-itertools/more-itertools-8.9.0.ebuild b/dev-python/more-itertools/more-itertools-8.9.0.ebuild
deleted file mode 100644
index bd17f3f88b05..000000000000
--- a/dev-python/more-itertools/more-itertools-8.9.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 9dcd4a3b6924..bf6f546f12c7 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,17 +1,21 @@
 DIST moto-2.0.10.tar.gz 1629239 BLAKE2B 3b1e2272f0a78b90dcf4263fa9e1e7cee17621215d742387bddb518da973fb4d0bf383b78bccec2e312aaa65b41428a78731e458e4f6a04bedf31306430a76a4 SHA512 77db3ec43d9777f469cae18f891ad277b2ae89fe0e69474dd904876ebb275503bb3beefe130d1ede05c7f1370107fcc6db76ef5c8e446a2132ad5dd85fea9ac5
 DIST moto-2.0.5.tar.gz 1551415 BLAKE2B 452cb94443188e1715145bee574f04924d894a3d647673443a8a335bb907f8601098540b032d6c9a8ced3e1fc490c49ad70c877547d905cece05bbb742d05976 SHA512 70e64ab98873d480e776a2139a4d351665c6c2f98faf90e2871c6b9998571d1bd239757bc90bbc6ab6e1ed510598bfce77157ad522953efe40c884068885c57d
 DIST moto-2.2.0.tar.gz 1650655 BLAKE2B 9969de2fb323b2deb272eb47727884054a35827a5db382f83a4177cf6cac5339f89164d05c288a977bc1895a204d13d02069e8b37880ea3d04374f6ed4d6be47 SHA512 7eabb515f94920af9b8f028afaaa51e27983f7bfd73f66c29fc191e2f3dd3e8939ddac67de0127c67c35cbc17c3500a7390103b26c85056780c865aadeb5e1d9
+DIST moto-2.2.10.tar.gz 1894714 BLAKE2B aa1298ed0f067406db3fa4bee8246d8611b867ddd353e8cc80e2e961ebb3f2251f46fbe88b011e8064ef397c9a01b66bd5bf8f57ba915a53d6a939f0f3bc6fde SHA512 57c3c3660fa98bcab5a42c1b853ff73a4c00708f2342e3be57a2c099d7947100836dc15c2dd1aff9388149edf1fb54e8173457f89cfecf93957edb0f056f46b5
 DIST moto-2.2.2.tar.gz 1684678 BLAKE2B ebe1eb08c67ccdb8c484fa8fc75d7ce58750d94620f46b53268d6b6b0732d90160bf7b6837efa492f621e1c001d933f5d59d39c266d65bbb1852f315b3bc03d0 SHA512 a8b192637b701eda0e4a7b11e84f5251386de98590f1d7c33732d8bf12642b39b61f1d360ad39c3e1b0a645268139d9e330d48fbe7029b943094ad317cb45ff6
 DIST moto-2.2.3.tar.gz 1700636 BLAKE2B 926fe245ce457dd79eef6780fc0b984d2ff1cbe95807a3463f0d0080583af2ba356ccfcce22e60927737e1531ec7bc167c5f649e784b191ec821aa56df65277d SHA512 0b46229ae06db7cb2634df3f1b3b1a6b6fc983978a763e8879db0d9e209ccc6b96b28e8e2ee40f6e1a8e39b74d7a2430788126220e3a7dab5e8df217c3c8c005
 DIST moto-2.2.4.tar.gz 1724663 BLAKE2B 3feb39bec246a8157aa542c711289ab0ca257ec510835cd48aa732c3f07903db857971e3d024c1aef35b5a0b55b7c4ecef2b319824c1d76f0076ab8d2d75329e SHA512 8acd8a3156db71af35ad0ac6a5105a6b7739d8ca9881a2cb091637830bc6fbb10d8bf6adfd1a1091556f9269fad737b345d2bdf50e09b54201fe7438674dd906
 DIST moto-2.2.5.tar.gz 1737336 BLAKE2B 450861edc607b9175cd72f29923e3259b81ce3a6e02302eb74486946cd8f6ebe8c15c61f6fd6da66d821b148924a0de1bcaf4e46ce6a5a751f7817d42450ea96 SHA512 27c04690d55647c7b43b342647f9a37f47ec3656c96aad8b6572c57752d555a77ecce3670e3cc5397318423ed179632fd79562a8b3a209049d74bf6e2a4bd51d
 DIST moto-2.2.6.tar.gz 1750177 BLAKE2B 0ea94b8a46e212bbf6556c1fc1ec439ea83f1d1dbbaea2e494d58c3f33e68c8397a243b19de45f4ef500482d510a0f2bf99bd9a85e784b02e7c174be3de4e0c9 SHA512 562e43f0d323a16c6a1fc69775b82c904c8a89df528a5ca4b383288d3749c15482f80befdb261bfd30de978f45ae4b6cbca4ffe33391dfcee8002ea604741b60
+DIST moto-2.2.9.tar.gz 1879730 BLAKE2B 483b25d0ef7d14de351f2b15ec83dc05339897e02611d8c48c49e28453a75a96748d7fe4d522a8372de243151443f1bf4a8eaf1cfe962e795270f58439357db9 SHA512 8aa73b94719d0a4b52d8f467fb2cf7514808c2bf2573b41309cc6e10d2eee1703ab5d62ad9a576ba4190bde0d84d4abb105a3b88c88c93bb1be11cc0f6391ebf
 EBUILD moto-2.0.10-r1.ebuild 2204 BLAKE2B 035213d75689a0c92e51da444befd8c0aebbe4d6984f1c74e8f224b7551f55daff6761132951a59afc7091d6b89a89cfdaeec4b1c05cbeba60977ece33270528 SHA512 ebdbc76753d468eaab43b0448728375f387e92182badb6f30b6ea17206b876ba979c819fc6c679c55c15b0895496ac5d2158972008d722717aec3846d7c4c856
 EBUILD moto-2.0.5-r1.ebuild 2202 BLAKE2B 78dc6466511968204fcca5e6df49b3e696e5e6f143617f4d4544c36281d3b87e04204b7a4074358425b38f0630b0f274eda050064cad953573f2f2318efbbcc5 SHA512 f7d083fe0307870a7da48acf4df2d917db7cb11aceb7a19da62673d1aee3b53530535e74d30b3775fad0807b47beb184eeb83e77474491b936bc99b007384b48
 EBUILD moto-2.2.0-r1.ebuild 2316 BLAKE2B c14f8aa340406517a880e87512ded8800579ea7a4f5e6d1cb50b1137f9c8d5d7831e037467542cdb6511d2883dff75b6dad62e8a7986f026f8e3ca1b8ef8132b SHA512 6da3993c5fc7496ea6adc0c558c286bf0ae0abebd0b2de7a8a4ffe01bd882521fafd504c0ba6b56bb87c53d655366719e90eaf0d38347a35cf95089f9207b701
+EBUILD moto-2.2.10.ebuild 3223 BLAKE2B eb1a1ff6b180bde4d14612a129c753bf4b39e7c6ef7e9f7ea73d1355c14f61d5001a3044ced50cbbd67292c4459e4c4526200b59e7f7c4f1c8065b247e345ae0 SHA512 ed57853561c41febe6935e065e59ecdf2eaddef785c73f2f186845a474b3e0c5459b9d0f996771569bf5613e2f1ad7378121d40a5f085b933444e95b1c9289aa
 EBUILD moto-2.2.2-r1.ebuild 2333 BLAKE2B 66a0d332dba46c093fcc4b50a8dfc36a2b6ea6e2e6d8bd566262eecba9f4261f02408b54e54121bb6a7687782fc0d9c32077b031a413be92dda7c063da02fc8a SHA512 428f6b979986cdafca75494c51c96a1e21913f67c43d12e997a7d061160ceee35735a5cd52dcb6eb938964d76166c822e9cc3f70f5fddeafd1a313d20f7cf13d
 EBUILD moto-2.2.3-r1.ebuild 2333 BLAKE2B 66a0d332dba46c093fcc4b50a8dfc36a2b6ea6e2e6d8bd566262eecba9f4261f02408b54e54121bb6a7687782fc0d9c32077b031a413be92dda7c063da02fc8a SHA512 428f6b979986cdafca75494c51c96a1e21913f67c43d12e997a7d061160ceee35735a5cd52dcb6eb938964d76166c822e9cc3f70f5fddeafd1a313d20f7cf13d
 EBUILD moto-2.2.4-r1.ebuild 2333 BLAKE2B 66a0d332dba46c093fcc4b50a8dfc36a2b6ea6e2e6d8bd566262eecba9f4261f02408b54e54121bb6a7687782fc0d9c32077b031a413be92dda7c063da02fc8a SHA512 428f6b979986cdafca75494c51c96a1e21913f67c43d12e997a7d061160ceee35735a5cd52dcb6eb938964d76166c822e9cc3f70f5fddeafd1a313d20f7cf13d
 EBUILD moto-2.2.5.ebuild 2284 BLAKE2B b83067f48164571d6f3375697a81be2550a072bc8670058e3ede28e0ccb9abf76702070db59426268c51f409135f539e3d8a14d6574df45577847ed922ea6a85 SHA512 efa745ad2cfff47078b591c8812cb7635540357515e90adee8f333fd6836bb3c5b8537ab5f80088f86f1833af6c2fb8590c140728110152b3be10c2f2cab6385
-EBUILD moto-2.2.6.ebuild 2284 BLAKE2B b83067f48164571d6f3375697a81be2550a072bc8670058e3ede28e0ccb9abf76702070db59426268c51f409135f539e3d8a14d6574df45577847ed922ea6a85 SHA512 efa745ad2cfff47078b591c8812cb7635540357515e90adee8f333fd6836bb3c5b8537ab5f80088f86f1833af6c2fb8590c140728110152b3be10c2f2cab6385
+EBUILD moto-2.2.6.ebuild 2791 BLAKE2B c2f799eb071811d78b8ae69b24ffef01435e7761508b23cd091b550889b5322dee37996c6529095fc58d87598396defb426164c9084ff2cf9e436928beae5400 SHA512 adfc3f96427bb1cd3420cb16c1ac8c1555c12a6f49b9d4552821ef1aeda6e844008054b3245bad16641e492d21c29dc94cd867469e765497a730c3388782a286
+EBUILD moto-2.2.9.ebuild 3224 BLAKE2B a64510a16b240e097bad36729dba75034a756720e7ec172a7d61040e28a54f05c39d13a9731801852c7bb594f8260d377fd8b931edf8c5efa4b2202c111b9e06 SHA512 19073b29226249902163078ace68d73f7b0ae48b6b6b45560452c5355e15c6bc9f86795ebbc2fd5cd81b88374e9ec4498d762cf0a342c6c4dba95798adc7d663
 MISC metadata.xml 552 BLAKE2B c0162cc80007c1fda211c105b3e7391e3596ef11deb9257bab489f4b112f79ed115ca3f250bdf1b87aee0af258aa59056c8d062acebca7dec631acf3ec9eb2bb SHA512 3f7b3c5709bca51588e58f9eeb9bb363e2657a7e6483519ec7782eb047a5311d434e2459ccd3b495340f85f72a92da2f7cc6eb3de617e979bade7b8fc7b3c01d
diff --git a/dev-python/moto/moto-2.2.10.ebuild b/dev-python/moto/moto-2.2.10.ebuild
new file mode 100644
index 000000000000..90b1a6e1227e
--- /dev/null
+++ b/dev-python/moto/moto-2.2.10.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/moto/moto-2.2.6.ebuild b/dev-python/moto/moto-2.2.6.ebuild
index 349a06d68b97..c911836feca2 100644
--- a/dev-python/moto/moto-2.2.6.ebuild
+++ b/dev-python/moto/moto-2.2.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
@@ -61,13 +61,24 @@ python_prepare_all() {
 }
 
 python_test() {
-	local ignore=(
+	local EPYTEST_IGNORE=(
 		# incompatible versions?
 		tests/test_core/test_decorator_calls.py
 		tests/test_s3/test_s3_classdecorator.py
 	)
 
+	local EPYTEST_DESELECT=(
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+	)
+
 	# pytest-django causes freezegun try to mangle stuff inside django
 	# which fails when django is not really used
-	epytest -p no:django -m 'not network' ${ignore[@]/#/--ignore }
+	epytest -p no:django -m 'not network'
 }
diff --git a/dev-python/moto/moto-2.2.9.ebuild b/dev-python/moto/moto-2.2.9.ebuild
new file mode 100644
index 000000000000..5369dcc49444
--- /dev/null
+++ b/dev-python/moto/moto-2.2.9.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest
index f7e885e79ece..e4ddd3d773a9 100644
--- a/dev-python/mpi4py/Manifest
+++ b/dev-python/mpi4py/Manifest
@@ -1,5 +1,5 @@
 AUX mpi4py-3.0.3-py38futures.patch 4779 BLAKE2B 0e034da4e2237f15f1f6c559f520dc7ffad5ccb344b0b87f444461132919f26b42b861fd86ed4b785b2de176b726c6ac14d5f69aeb4cdac0b6e182cceacb265b SHA512 1193779d8fc0a26845d9435a55b6fea808785f6d2299c3b0fe6ba16c7c8b846d35041ebabe7f51f67aacbd3d1e4a1d334a36ac2b457941b2467cc0ca8a4b30f3
 AUX mpi4py-3.0.3-py38setup.patch 783 BLAKE2B f92a508e2f8c0749135b79c92656662729434b12c4b1d90587bafc02870c934d2aea135b963660835818c0596d0c0635e02af78e2a2b855259d96d252bf1b19d SHA512 0b35ff4d6ebdb7fe0bb117114d68f9823094429bfdab37d8c8ae404d1357bedbe0c75e46ac4ffbbfdc5197adb24f934ecedbce8eb2b00757c00421e1dad912d9
 DIST mpi4py-3.0.3.tar.gz 1429389 BLAKE2B 1e8c44b857b417237832682d0b3b5c90d1f1046fd8137d2a63972419ff8ec0e1fd2ebba521e2d2d6ba9f773b7c607370b55d8d75c9afeaca172ac06dd838943c SHA512 041768f753c8188b2560fe92711861780f0d77eda3281433520c98bb1e9b4da6a89c364f2d1c4623868ffbbcfde34ef556198b1bef6fc1c4a9c19cd5e71b546c
-EBUILD mpi4py-3.0.3.ebuild 1435 BLAKE2B 52084ce087bc8f544992e34cb156cda3ff15276f59bcdc319184b6984a82f2f6bf251f571a2c87e6684bd4de18570cd77494830ffe0cd2a6014dc18921125d7b SHA512 03d46c049a583c9eba8a4e015c3b4ec622a414db40c31becfd7de592d97a5ba023957d34bc3163c22e92b6e190a98a442fdb1a335365a8937a72dd4d0c700572
+EBUILD mpi4py-3.0.3.ebuild 1571 BLAKE2B 5e3e3424a50fc58c6891776ac221341ba22172a44e58a3e57c5a2ed0eb7eefbbc5c93984aa7a9521703dc5db55b74370cf43f9c4d50ca5246125a2ca9c62570a SHA512 1b4117487d63c2845b88ae301de9ae0ff2bbc5a9bbc7eb636216278cccb8040da13b8509f703d5cbe769c24b0cd720710538da79f29544f8f103fd81c9571e2e
 MISC metadata.xml 1041 BLAKE2B 6f06ebdcd00df3413d6e2c7f1185cdaa18f3d9074e1b1492a5d10bbce2b71eee2a93fb5c65cd6fefd645c950195c63edf830a5182be5d07f8cb297b9e0ee38ce SHA512 377aea52bea6b6d98cd4bf6d10cb837daad2945a882ce6b2bcac9a84765a2cdf1e08f062e869fe0f0bb1c0b8b7d1fc3b9c039b48db99b69cad161d5224386d65
diff --git a/dev-python/mpi4py/mpi4py-3.0.3.ebuild b/dev-python/mpi4py/mpi4py-3.0.3.ebuild
index 15fba5f284a5..2a020662ac41 100644
--- a/dev-python/mpi4py/mpi4py-3.0.3.ebuild
+++ b/dev-python/mpi4py/mpi4py-3.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Message Passing Interface for Python"
@@ -36,6 +36,13 @@ PATCHES=(
 	"${FILESDIR}/${P}-py38futures.patch"
 )
 
+src_prepare() {
+	sed -e 's/++Py_REFCNT/Py_INCREF/' \
+		-e 's/--Py_REFCNT/Py_DECREF/' \
+		-i src/*.c || die
+	distutils-r1_src_prepare
+}
+
 python_prepare_all() {
 	# not needed on install
 	rm -vr docs/source || die
diff --git a/dev-python/mss/Manifest b/dev-python/mss/Manifest
index 6d2b43dd9bfb..394e9f52a1fd 100644
--- a/dev-python/mss/Manifest
+++ b/dev-python/mss/Manifest
@@ -1,3 +1,3 @@
 DIST mss-6.1.0.tar.gz 90421 BLAKE2B c99bc7a1950215402cc4fe3b512951a723fa1f5ffd8ab747fc29ed8d4e51f786ef84b69e3ef2238d7cf9d6ebb5765dcdb4d1d3cc3e9a2caf66cd658fa6753f5f SHA512 2b84fec6e162480cb608c0ff605f528f3122c8397a81bb0cb6cf9223cdf097a633ea2e29a95925297439dc038a0be4cc628d3455827a8548cb3d8e62cd68d9d7
-EBUILD mss-6.1.0.ebuild 763 BLAKE2B 00096e39116c11a02a126e8f9941ae6dcf101883a35ab81fdf514a437de71ccdfdd723c714597c1865dfeda1b060c8bf773708bc52219af9dede00f58fd97e7e SHA512 587b7dd40ee3fa341e3a8b125bc4f039f7f1d40ab5de20c987b8f4116ad24b7e99b238b02e61bbac237ab224187518127b6b5ff8762cabf71f15c2494ed95791
+EBUILD mss-6.1.0.ebuild 770 BLAKE2B 70ef410fc5cca8a079a45964a4314a0100e491122ca958d4e38889eeae4a130f713b6ed65be4b838fa0ff82ff9f09d6653b16c63911d05beb5052279b5ccfb61 SHA512 125e2c9e5f1a09d5ab96fb76e6f7bfd51ceafe4fb4ce5143ee1dcf566bb24637706372d0f2d062f64c4f1e169eb963f8753d53e97b56e08bb7abd534bd5419da
 MISC metadata.xml 349 BLAKE2B 16d2d04e5a562c97025ec77928a0936c3d874630bd6ef8f0860cd413173efab37ddd18b0a2420c64f5c4bed0cfe4b07ba3c52a7ce09355b8e8955ada63934ca0 SHA512 7c8f05dbdf19a484fff37966cd0e41e04bc702f2d7effdb19be0417a5950afe8248360d99306e233da943d3a3ba8bf5acbf1308d1f87aca04e01a24ee0dcd387
diff --git a/dev-python/mss/mss-6.1.0.ebuild b/dev-python/mss/mss-6.1.0.ebuild
index 28e1238e4f9b..a2f56296c328 100644
--- a/dev-python/mss/mss-6.1.0.ebuild
+++ b/dev-python/mss/mss-6.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/BoboTiG/python-mss/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 S="${WORKDIR}/python-${PN}-${PV}"
 
diff --git a/dev-python/munkres/Manifest b/dev-python/munkres/Manifest
index 8a061df04c5a..76c36bdced9c 100644
--- a/dev-python/munkres/Manifest
+++ b/dev-python/munkres/Manifest
@@ -1,5 +1,3 @@
-DIST munkres-1.1.2.tar.gz 11186 BLAKE2B 2ba5ab7ce85fdc06598829123ed334209f37c0fa4f82e863c78220db82e9b8b4c51c7369042bdac6e9b33b4d580145bdd37b5743f0b3f511141782588803cb0e SHA512 4a8b698f53812303f5020b4fc357f859a63d97370fe311d16ae959addd9cacee65667e430cd0d00496e423c1f0c7a3c8d4219ba49600a982de323fadd2c03bec
 DIST munkres-1.1.4.tar.gz 13777 BLAKE2B d783ac7a4fd55826ef3ddddd2ba82cf0499727e605a2414491af7dd9080193c53f1e48ed17dba9a462578bc958d3d9e2e1e413408143b4cfd0305f9cb3b6c517 SHA512 24ae7d04f4a6fe52f7bb9dc79bbee3e33425b85813382e2634e106a5d26d2d728ba8d34fab9390b7c3d651bc0e95214dcf9c94ac436636cd5b487a054b5a2c54
-EBUILD munkres-1.1.2.ebuild 517 BLAKE2B 22eefd75c91e21a10e52f9606ed6a0c66a4931d39cb6712356c7f4f213b425ab7fdd5c1890dc27917a75f042210c6e0e4bd8b62606b50e6bb0cfb4228a26b910 SHA512 15e8d533b4c1c9f37790af7143b20b9524b7e0d995e94d0f6b229ec2ad7bdd6868d86d720607486dca3e8738053ce4d33381bc9e4d26ccffd1e73aaf369098d8
 EBUILD munkres-1.1.4.ebuild 529 BLAKE2B 3b5502867f9c43f3e9d5d5d3182623266ab59755af6d53fba3716d271bb60238b43fe807faf86185fa7ebe92e837be59de2944378fca7f44fa41104f28804814 SHA512 10fa2274a450f4d14dadd939463600098e9389d826bcc2ed8d679b16ed15acf7a333cc7eb67c5fc9862a663a01b814428492ef0572c83732e8b74bd496b94194
 MISC metadata.xml 772 BLAKE2B 476197b5218d2e1b000c16be048dd1ef56b605a93978468b0fc95500032102497777021803c5b6db546ee433aa4b5d1f02f232384a0e4665cea4d2a5b0cf1230 SHA512 5b433e5ab0c97c69680da925ed03362fdbb40ab74c5d8cb851f5b4c3b66f50f9de066657024b230d4d0d8274c6dd1035502b375581ae595c2032f3537035a8a1
diff --git a/dev-python/munkres/munkres-1.1.2.ebuild b/dev-python/munkres/munkres-1.1.2.ebuild
deleted file mode 100644
index f243268ad495..000000000000
--- a/dev-python/munkres/munkres-1.1.2.ebuild
+++ /dev/null
@@ -1,22 +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 distutils-r1
-
-DESCRIPTION="Module implementing munkres algorithm for the Assignment Problem"
-HOMEPAGE="https://pypi.org/project/munkres/"
-SRC_URI="https://github.com/bmc/munkres/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-python_test() {
-	"${EPYTHON}" ${PN}.py || die
-}
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 703a58981803..226aa584f021 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,4 +1,4 @@
 AUX mypy-0.910-py3.10-tests.patch 1821 BLAKE2B fda18540f14b0fcba8d57bb7e072135f7415ecc39750424ee03fca835ab65491fb8966326e7f51b260b7f1b98e9bc408eb04df4a74e6007a5c1c72b28ed8a950 SHA512 64a6b2361260b0ce9bb22e706b2531af4ac2894191c92501274368d92beb159e53b4da6174e7f91ef4b2f7752936d86250b5fe8347beea1bdf223b7abda98414
 DIST mypy-0.910.tar.gz 2551057 BLAKE2B a3c6939c8f0e2ea19a3a3f91031330df2fb25a93cc3f9239535f15c17eedcca5716cc75c5412a1d345d8572d396c3d7128e38989fd694833cb6aec8366ac4afe SHA512 49060c13da8bf17385b6b1db6efa9ac5771f2bac92d26760c4087cf128de22846b8a062f38e83ecff524e7893f8c9cd0647a2ef89e10387138544436a2840459
-EBUILD mypy-0.910.ebuild 1915 BLAKE2B 26d3d52f03366b10d173d689013675ce02f6f4b9f4eef3b1d4fdd50403254bd5fe5db8531599286af49f4d7dd6ec796c077a0385572da3a87909ff0feb55186d SHA512 fe74145b4ae732a102047993f80ee3cfe48477fe4d1b01a3fede3a7dd962806d7db08b00fae7c7430602a9eff605bacbada3a23a8fffd6f8c919d74e397b9249
+EBUILD mypy-0.910.ebuild 1927 BLAKE2B 5263ba882f6e4c59b0fc55b56aa8c6b8c2b2999c140ab9f670d6b0fef8219d43c2349d2d25db4aa17c2e07b39e45600550324040b30d8219dc2a9f49d2e0fcf1 SHA512 19ebe12888713bfe389e9a001cfee4dba576ac16b5877a2e34ec9b486143d9f8a24ecd8517a7975e6148c9af58c801772d741d0dfe908312fc44c69798a1217d
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
diff --git a/dev-python/mypy/mypy-0.910.ebuild b/dev-python/mypy/mypy-0.910.ebuild
index c1cf48585100..e34ce4d6d954 100644
--- a/dev-python/mypy/mypy-0.910.ebuild
+++ b/dev-python/mypy/mypy-0.910.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index bd20633fd96c..bd10bd892a28 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,5 +1,5 @@
 DIST mysqlclient-1.4.6.tar.gz 85517 BLAKE2B f5e604094b06b919b92ecadc8b3f0249dd038149d1182ba882fe6b0ecd34f0bcceeed21b310318ca3291d9483fd3d1ac385c29415e07a8fbabb6cd65ccee8a2d SHA512 11ecb8a0a6f78edb193cd07472579aec1626994a80a584ff74de18774e7db8896de595f3e4d280b78e8636f53323ebcce8aa294ec7b2a54a839742d9699650ab
 DIST mysqlclient-2.0.3.tar.gz 88886 BLAKE2B 2673f2ab46ddff241260b036b14bad84947a37d002cbacd7aa53127fa3dd4fad7a37c9e2f8704d43cab6a2e0289f2542cb36ccb3f1bd66c64d2440f79d26948e SHA512 49c234bc982b373a74d65361a697dfa4f87f06d193d86d7cc40a732f48c9b2494cea21ee3f95d4d6d2a55b3f7476a92eda0c2e294766cb0ff592e1c54353b9cb
 EBUILD mysqlclient-1.4.6-r1.ebuild 882 BLAKE2B cddc4e111d81da2ecb0578ead854950dfa7154a5305ad11d45c0cddeb7460756f276ab2a71b514dc5102397b3def80c6692274e57c6349898218aa9ab70a4a65 SHA512 4474ff3d671bee527ccd47eb78d646b07864db62dbf813d5ecd7378f4110f8e2cac16cfc11a05e8a603122984c24b035fa924c6b4ef5f1c8f3670056d713965f
-EBUILD mysqlclient-2.0.3.ebuild 2095 BLAKE2B 460e66c8f198f82d4cb29ad08281743260bb763af701fa9b498d84cdaee9f80fa19fa1b473b8648c9178e8a4b4c451d56b23291fa412e03b4933884ff4c67619 SHA512 25c4fe04ac9d310490a0326b14ba7ecdffbc5e28bcac879d3ba04e3613bb31025edaa8182b0573de788bb4f72682227c3d2261adc7a105bb1f3ccba7a512a7da
+EBUILD mysqlclient-2.0.3.ebuild 2094 BLAKE2B 9b32939d9adef05778839247cd3e488047bb9adefc21c930d7bb41e10417a6f083ad13093cca1f1e914ca7f30a1f300a38824fd83030581acf9c06f5e70a61ff SHA512 af53eee1eaf193d51aa4a6e9b3198fb13f6fbe071857ebc31c2a7348d23ad131571a78584290eb7a9b51c7804055bb2f360646c5b6856a7fdb7d79d6c02f8469
 MISC metadata.xml 514 BLAKE2B 6c9f1d00d136f60a412e1fc87923ac25e1985843b04d4c5b6ce7cc65521ec23f5070dc4001cb7426cabaeec949e40498e9adeef8bd19cd4bff0761a918d2896c SHA512 01797cf940a6baa96885c2cbc9073e2386f8bbe9c1cec14c2b6b6e5cb12a4da6308a2081d894de3342c69165a4836f6d9e593f9a324712b8dfd30a3874c81223
diff --git a/dev-python/mysqlclient/mysqlclient-2.0.3.ebuild b/dev-python/mysqlclient/mysqlclient-2.0.3.ebuild
index 284c5af7c011..7054c7c82832 100644
--- a/dev-python/mysqlclient/mysqlclient-2.0.3.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-2.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-db/mysql-connector-c:0=
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index b12681cbf419..17eb56c1f141 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,3 +1,3 @@
 DIST natsort-7.1.1.tar.gz 142749 BLAKE2B dffd5b7b18ac49653d4d65ae1335c85d441748903aa983df092778476988cf0ca59c08526ee0da1761fce1afe4849d4c9a9e2f3e0c5400ebca2478781d0986dc SHA512 1903c933c6203ef0cd194ea444d79276b79ec385728a92b6e73d1698abc8e1351e96ed8ea4ae5f9f413ef6daecfd269a4d0de74c45eedff682fe929d8f977f30
-EBUILD natsort-7.1.1.ebuild 539 BLAKE2B 5f9ce11469e8ac667cf1c573111fbd4765b14784d7fedfe1f3e1ee291abcfcb1c6a5e5b6b988e5fa7dee60ce64ee04472807506e252dc77c74f638fe0dd76085 SHA512 f15e47699c043461911ab7f92996d8c51e62c5a3ca7c830fc8601fc05bd696fc099fa2dc1f1ce5fa7f4940cec517811f322edefb5170598fe4b67cb8a7b05373
+EBUILD natsort-7.1.1.ebuild 551 BLAKE2B 25656308733e49588f99321fc6896629093f37e4b779e91efcceb5658bf5d921ae485f17a1a95bb1731dd5d74ee8545f6d7237cfc5f4c9a50f1af22cbe5df1ea SHA512 5cf4c070340557d41fc40c250c0d3b7b0f910cf8ce57bf1237d1f56d64fd5dd3fc1fbcda44e34ee50d02eb3dd2a7017e61880865db63e810d000a575e77615a4
 MISC metadata.xml 407 BLAKE2B 385c6b60eff44662eee4337cbcc1f57cd7f1f30f129cb6a22e284ebc7bcbd2e5ae271c27b1b0405b3b4087df72494e3b447bfa1cf84f116befb2811c362ea4a3 SHA512 0c91866fb63b5b74f00a28dfb6bf1afde8b8a48ca830bd6bce7a2f8fcfd80982c51fb20913c467fc44c11f3a8c7f69e8544d21dbcb941b2e80cd8690561b07aa
diff --git a/dev-python/natsort/natsort-7.1.1.ebuild b/dev-python/natsort/natsort-7.1.1.ebuild
index bc902c2837f8..fb447ee057c5 100644
--- a/dev-python/natsort/natsort-7.1.1.ebuild
+++ b/dev-python/natsort/natsort-7.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index b41f9374bdae..5f525e06c3f5 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,5 +1,5 @@
 DIST nbconvert-6.0.7.tar.gz 896833 BLAKE2B 1b5b39144509aa9f61dc1e9675b112d69ed2e2f9859f3ce7ccfac517d89fff0010062c03ded1c3db571c84dd8d4f8ba12e4851245f370d2e671d24921dd50ab6 SHA512 3c78fa4d777a79a08606a39bb31f6b329dc9d28c1ef2ea9f3253746dce853a295e8fe85b14c65b04762aa5acd5facc879232a375875a2ca6dc9477cc1ab88786
 DIST nbconvert-6.2.0.tar.gz 898501 BLAKE2B 6dfcd33c4bf625a2f68dd4b89cc15d100a2b036e08f3918731f019d171224c218f669e07fd7d6aed712c52448dbf71e6173a49b560faa7d5f13e3cce62df0fff SHA512 ed67cafd23dbe9d8e08292877cae9c889518218659f2ca615fe52fe937f70cdca3e300a28dbda81578ede7784458443bb9fa1994e05c154dd5473015b91c9af3
-EBUILD nbconvert-6.0.7.ebuild 2031 BLAKE2B c84d1e34378401aa950e5fafc01adc04c18681e67b85b9d81c2df703254dc57c714324bb4e132918f89e2eacd368806b6f1ae10f17c9d78a3025b7423841ad4d SHA512 d4c0a034088b69de1b0ff1ec979f9fa0082d0005ac9eb0e6f486bcf4fa2e29786620efe40c6c1a5c6d15b836412ed8cf3c3484534ead9edc6ad4ffd5ba6be350
-EBUILD nbconvert-6.2.0.ebuild 1959 BLAKE2B d5f277d45c70fe80b5f30cc81a4e04bee251ad54d3c4740a5229f989e57584d9b16b2f6ec4c81fb12e749ae106d4f17f8976e5277e9edb94454852778f201d53 SHA512 23f680184368969e6377a95bbecdb27055a354cbe3939e9316917583269bc998163da8524a8cb54162f5d367bba45cf16d4094c5f2badab1dfaba17122b650e8
+EBUILD nbconvert-6.0.7.ebuild 2143 BLAKE2B bc88c3d085fe11d391a34aef297892291e8a3d532b8d291a2b5f078875047e2134dfc5afa0fb7220a4f51a8b9f6dc7df22f106a120fe05fc8a1cf780cd9717f3 SHA512 bc2ff2b1abb209a0b79fc5474da7e2ebe3f54a2c20023a54074386dcffc94f42ca4e9480ff1bf01c4eef7d460ef59164f7cf434fc05e276c4cbd06186e908275
+EBUILD nbconvert-6.2.0.ebuild 2071 BLAKE2B 7ba9aae542b37d5c07ac2824410b6b72b64e709c88946e482cb0eccd545a19da5f4276d4a08cc9196b2fdaba92031bf538fc3019cf23b0366f010d55abd2c072 SHA512 030b3f15a3e51f21bbfdb8ae74a0da2a27a7b5d3919023f32fd41f32c16ee8d54c5d358145f8e0ed13d6dc79ebf4d1171bed780c7467629d4c9d6539885601f5
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-6.0.7.ebuild b/dev-python/nbconvert/nbconvert-6.0.7.ebuild
index 87597d4755db..5dec6fb5196d 100644
--- a/dev-python/nbconvert/nbconvert-6.0.7.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.0.7.ebuild
@@ -30,13 +30,15 @@ RDEPEND="
 	dev-python/testpath[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]
 "
+# Skip inkscape on hppa b/c tests should skip it gracefully if not around
+# It's a heavy dependency.
 BDEPEND="
 	test? (
 		dev-python/pebble[${PYTHON_USEDEP}]
 		dev-python/ipykernel[${PYTHON_USEDEP}]
 		dev-python/ipywidgets[${PYTHON_USEDEP}]
 		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
-		media-gfx/inkscape
+		!hppa? ( media-gfx/inkscape )
 	)
 "
 
diff --git a/dev-python/nbconvert/nbconvert-6.2.0.ebuild b/dev-python/nbconvert/nbconvert-6.2.0.ebuild
index 7278542508d5..b95596254e03 100644
--- a/dev-python/nbconvert/nbconvert-6.2.0.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.2.0.ebuild
@@ -30,13 +30,15 @@ RDEPEND="
 	dev-python/testpath[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]
 "
+# Skip inkscape on hppa b/c tests should skip it gracefully if not around
+# It's a heavy dependency.
 BDEPEND="
 	test? (
 		dev-python/pebble[${PYTHON_USEDEP}]
 		dev-python/ipykernel[${PYTHON_USEDEP}]
 		dev-python/ipywidgets[${PYTHON_USEDEP}]
 		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
-		media-gfx/inkscape
+		!hppa? ( media-gfx/inkscape )
 	)
 "
 
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 6ebd3a2e6152..3c60eb1f5427 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,6 +1,3 @@
-AUX nbdime-2.0.0-remove-bdist_egg-hack.patch 1176 BLAKE2B 49c2d31632b8341f7fd52d70f063d8229d74a65a23058fe24410fac62939bd64adcf9af419d6f7b626d67150e54016323f33c735d7a51e80b35403dee1055979 SHA512 9d8200ebf6c6d76d3efc89ae384586404fa2d9b345c16f63ddc93d76c8ac2e17e34099bc0b2b907723f6fe096f6c56273b423263f328bc5882046488c077bbbe
-DIST nbdime-2.0.0.tar.gz 7768807 BLAKE2B a92ed166ae863185d06e4b3e667df4323b4cd9af9211999109186c1b559522f39ab235b710c7993515aa3c44a55ac3c4b90c424cdc28d04cc013a58add7d61cd SHA512 e68e69e37f6ece701ba8d6e59d8ee321ddaca78d9338e0c52f92b6942bfd3fbf0ec2407e9ae98cb820eb4c26509644a1770f249b815c53265dfdbffbe2b55142
 DIST nbdime-3.1.0.tar.gz 7508382 BLAKE2B 10ca59684df06e922afbba30d5419a20490508af8bb9d4f371b1a06db49df7b665195c9aec21c3a303b3fa0c60e5c0c1e57badaba27ac81599b311f9a5000244 SHA512 be19fc058a918cd2aad38a8f727504a01c7830dfaba7fbf06caa0a6799770824499a70f4efe1ebf0a82847dc79d84896baf9aa86d3e7cd16dd7163023fed3855
-EBUILD nbdime-2.0.0-r1.ebuild 1514 BLAKE2B 117f17e07d1884532145be78e4a483ef95c48a9b93108e91a230dc47b19c568d6942782dfa2a5bb611f275b372be49d8b08a9b03deed9860143f77d014f15602 SHA512 ad682cd164be21c7ba8db6c8abcf61b7a39294fbf5b0815016df2deef35cd107b72198e2eff7dd71817263a28d81033bfa45ea2b2c279de5b7696f41ee3ce9d3
 EBUILD nbdime-3.1.0.ebuild 2508 BLAKE2B 226e7695cbd4609c7aa81a7590cdf07f033fb3c3670ab77bda26697c111f59e30ca2b003d6a3937f061be1284e493fd3a696a938c55301952dd9e8f6eccf0197 SHA512 aa3683566821f5dec4cc311db1677bc34bee6c256897fdf1562a77d42292378756a0736894131411549515ddad4415f88c0f95ab539eaaece41976bf23de18b4
 MISC metadata.xml 514 BLAKE2B c3062055cb710079162f879e3a7ca9cc1009946eba2e3d09f5cdfeb9f3bccbc12a9c6fe86d84f80d88b07eb17d03b55f8d1c6770b97c7a760015e4466e6fa531 SHA512 069589261da9b38841c363712255d55e2203c55af94ce62c3640a90139b6d260d2f1ba6475b9c0264b8c4530207cdb17983ebb2f67565fef9fce891603c1d3a3
diff --git a/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch b/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch
deleted file mode 100644
index ff450f2ce447..000000000000
--- a/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/setupbase.py
-+++ b/setupbase.py
-@@ -129,17 +129,6 @@
-     build_py.finalize_options()

- 

- 

--class bdist_egg_disabled(bdist_egg):

--    """Disabled version of bdist_egg

--

--    Prevents setup.py install performing setuptools' default easy_install,

--    which it should never ever do.

--    """

--    def run(self):

--        sys.exit("Aborting implicit building of eggs. Use `pip install .` "

--                 " to install from source.")

--

--

- def create_cmdclass(prerelease_cmd=None, package_data_spec=None,

-                     data_files_spec=None):

-     """Create a command class with the given optional prerelease class.

-@@ -179,14 +168,9 @@
-     wrapper = functools.partial(_wrap_command, wrapped)

-     handle_files = _get_file_handler(package_data_spec, data_files_spec)

- 

--    if 'bdist_egg' in sys.argv:

--        egg = wrapper(bdist_egg, strict=True)

--    else:

--        egg = bdist_egg_disabled

--

-     cmdclass = dict(

-         build_py=wrapper(build_py, strict=is_repo),

--        bdist_egg=egg,

-+        bdist_egg=wrapper(bdist_egg, strict=True),

-         sdist=wrapper(sdist, strict=True),

-         handle_files=handle_files,

-     )

diff --git a/dev-python/nbdime/nbdime-2.0.0-r1.ebuild b/dev-python/nbdime/nbdime-2.0.0-r1.ebuild
deleted file mode 100644
index 13f592127ee1..000000000000
--- a/dev-python/nbdime/nbdime-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Diff and merge of Jupyter Notebooks"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="webtools"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/notebook[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	webtools? ( net-libs/nodejs[npm] )"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/tabulate[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs/source \
-	dev-python/recommonmark dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.0-remove-bdist_egg-hack.patch )
-
-python_configure_all() {
-	use webtools || mydistutilsargs=( --skip-npm )
-}
-
-python_test() {
-	# user.email and user.name are not configured in the sandbox
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
index f0521a08afb7..7ef7ab737c8d 100644
--- a/dev-python/netcdf4-python/Manifest
+++ b/dev-python/netcdf4-python/Manifest
@@ -1,5 +1,3 @@
-DIST netCDF4-1.5.6.tar.gz 763732 BLAKE2B 0bb08ed81206c7d14817dad0f93683b5c44678869c760467071e2a0a76be76c9d78c0f714a043d77dba9b4535a83d59d8197340c105070a4f0204900b1e50410 SHA512 cc5bdb476fa034576f8e1a19e709dba53ad2db68cd10221df2de46a47fc7e5bacfc90fe8c4458ef45b20bf24a1cf52f275b1891af5574e2a139e95cb0d793a8b
 DIST netCDF4-1.5.7.tar.gz 763928 BLAKE2B e8e1c689747aa2697beeadf1c5164f1530fe76e0fb0d7affb94b506d1632c5242a406cdee72a2a683b75beda649f516ca06f5fd8fcddf5c567327d2420443721 SHA512 dfcc900e4d72f7b0c5c6a7fdaaab221735977306e86856e6d712e8a3c36ff22bd6210cbfb9819b9a26fde647c00aed5fcffe430459f9f2d5208a2cf8865ca853
-EBUILD netcdf4-python-1.5.6.ebuild 1166 BLAKE2B 8d88751857f010e920634200007832ac1ba2e56aed4a4c5ad8f894462cf15d7ef55bab46c790570c960ec2f6fdb1c093db8e238cd2b6c89a89ed813e366683a5 SHA512 0341524cace5849b6f5a1c1d93e0531fa233965a6cbadaa53ddbb6ca4bf8b4f40748a316b4d71f2a37ecd32fd9bd4c2c7fc0ac69cc5b27f0d189ee80893cd1d4
 EBUILD netcdf4-python-1.5.7.ebuild 1133 BLAKE2B f7c9011a87e4baf59fec3aba447fb5b8cc58cf60402fd8e5885e3259f160e773a4e3bdb9ea75ea2bd912c25dd5d6abf41e8bd2376f0d50b69b1481e93be1973c SHA512 8241c0e5fab38c4ab767fef8ce9381085fd7b28a091b1eda9e19cb5ff1f9248ac0ec66bbb3433e2e3bc2585c15f17f08c1d570394295487d728cef1ed0a9de2e
 MISC metadata.xml 681 BLAKE2B a34becf14c53b1f2b7568035f7ab8fa1cdce3e9fb39acf05c8f1151d432057376acde5904e5e63842742061488abe70b84a79d5fe20e2b2b72e160294624da80 SHA512 e6455e3f020069cc843044210c5567e458e784160b6b01d14b753bf29a17d1525a169b5cf4d432abf8d0394c5f0ffd1b14772fb6bdf5ef2913f2f866f08bb23c
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.5.6.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.5.6.ebuild
deleted file mode 100644
index a4688246fcb0..000000000000
--- a/dev-python/netcdf4-python/netcdf4-python-1.5.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1 optfeature
-
-MY_PN="netCDF4"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python/numpy interface to the netCDF C library"
-HOMEPAGE="https://unidata.github.io/netcdf4-python/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sci-libs/hdf5
-	sci-libs/netcdf:=[hdf5]"
-RDEPEND="${DEPEND}
-	dev-python/cftime[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		sci-libs/hdf5
-		sci-libs/netcdf[hdf5,tools]
-		dev-python/cftime[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	local -x NO_NET=1
-	cd test || die
-	"${EPYTHON}" run_all.py || die
-}
-
-pkg_postinst() {
-	optfeature "HDF4 support" sci-libs/hdf "sci-libs/netcdf[hdf]"
-	optfeature "MPI parallel IO support" "sci-libs/hdf5[mpi]" "sci-libs/netcdf[mpi]"
-	optfeature "OPeNDAP support" net-misc/curl "sci-libs/netcdf[dap]"
-}
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index d75777d3cea3..74a252e1d9f6 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,5 +1,3 @@
-DIST networkx-2.6.2.tar.gz 1842077 BLAKE2B 8493e2d6a64d140b012ea443e9b1dc2409f8208dc1678c1d21cfd19bbdc07df6e9051aefe994d5fa6460db48320d563bb3051150782545ab5f671b7aafda4d0a SHA512 7006dcd209cce79f0f6cac4884797775422bd90fd3e8abb2eee70e6e00c9a25a785dd5856fc1657019a2b5c13a6fa5f705ea2e650c15a1f9d7d93580bc299219
 DIST networkx-2.6.3.tar.gz 1844862 BLAKE2B 408f97e334c3e0cec6d40d15d6ba8dc3c07cbd162fb31b301696c53ff1d924fd12f60d34df3f1b56fd036f2a344933a3b5c41a1aa2f91e5d5ca39f922cdfc41b SHA512 709b5126039c4b34a9b2ed60723e8bab3f591203f3ae8d87474e0f49f52b94b9c15568c78cc9e05e2bf997bc65a6177762bc41b0a44093ee59f6eaa0087d0f34
-EBUILD networkx-2.6.2.ebuild 1230 BLAKE2B f1a8c22e8e56a61b57378b3517d30460abaf0fb5db50947028f2a35c116d9d0010130a15a7d25d4478eddadcb22ff1d7a4f23d0fecb0799202eb50deb0f075ca SHA512 a455b0a1e09ed160352a89b38dca4d063b241d763aa59b0f917c1eeedc184085c9043762fd3574291609bce39b436dde1a01447e376fcbf9d0a5d252b2849229
-EBUILD networkx-2.6.3.ebuild 1341 BLAKE2B a2ffdfc539b5f46272c4de1a23253904c3f087327aceaef84edf7d2ebe7765355579d9cbb1b88048f440d94680961f352c320b9f33e69b05b88ee10986ea6c77 SHA512 0bf9843cedd1bbd3f8125445ac2524aaeb1e0ba028789616fb367e91d5bba3157de874109e7d62b9fb39cc98b120f33d3e1ea066eb288a404144a21c5040c419
-MISC metadata.xml 1304 BLAKE2B 006e40e7b37efdddf137d1a1326300d0bbcb71b48d038ff5c8c4818cfa6252c63412c4d8ef9be05d2b5cffb050b2b9cf180e252aa8273368cc054529e3807535 SHA512 251933e83f7b95ea5323d94bfe3b513c69631aa5646095d7d8e52dcff80dd223bcadc1055dba05de6eb9fd9505c5684a1eb7e1c059ad9d4d28a775eb83b61e7a
+EBUILD networkx-2.6.3.ebuild 1339 BLAKE2B 1b32384561a4be8a82007ce8119d29cf0d339f29d7c67081d5e003565d7f1d965d0a77d159bd1276b3f8f23cfc2669b2bde4fa6a781a6a3b48d369fb759adefa SHA512 04e6381ec450fb4fe02897c55151997326b17897c535867ed850fe63d8d3f9839c27dd3cc849fc5c89d7d0aea0839fcffd766e35b166de02258757faa6bac10d
+MISC metadata.xml 1088 BLAKE2B 407d24ca890c5b2a7c49e5eab7f79477f66cb140ed286a7d0c65be075714c671c0185b067f7ced6e9a1cdc17361cfbeb406c306dafb915590abf6b5b1263a4a4 SHA512 2a790d427d6c4391d409f767359a256ee5b8082246811c82949b898e0a2a9f23e7c40bb045ff5eaf17f3cee04d7d24adcdf1ff0ae416ebd7b2572cfdcf04064f
diff --git a/dev-python/networkx/metadata.xml b/dev-python/networkx/metadata.xml
index b32cbe03944e..b0d0d5f8a56f 100644
--- a/dev-python/networkx/metadata.xml
+++ b/dev-python/networkx/metadata.xml
@@ -21,8 +21,4 @@
     <remote-id type="pypi">networkx</remote-id>
     <remote-id type="github">networkx/networkx</remote-id>
   </upstream>
-  <use>
-    <flag name="extras">Provide graph drawing and graph layout algorithms along with shapefile format reading and writing</flag>
-    <flag name="yaml">Provides YAML format reading and writing</flag>
-  </use>
 </pkgmetadata>
diff --git a/dev-python/networkx/networkx-2.6.2.ebuild b/dev-python/networkx/networkx-2.6.2.ebuild
deleted file mode 100644
index 9e0f4791bb22..000000000000
--- a/dev-python/networkx/networkx-2.6.2.ebuild
+++ /dev/null
@@ -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_{8..10} )
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="https://networkx.org/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples extras xml yaml"
-
-RDEPEND="
-	>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.1[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
-	extras? (
-		>=dev-python/pydot-1.4.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pygraphviz-1.7[${PYTHON_USEDEP}]
-			>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-	xml? ( >=dev-python/lxml-4.5[${PYTHON_USEDEP}] )
-	yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=()
-	virtx epytest -p no:django ${deselect[@]/#/--deselect }
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/networkx/networkx-2.6.3.ebuild b/dev-python/networkx/networkx-2.6.3.ebuild
index bf19c4bb996d..7cb20910302a 100644
--- a/dev-python/networkx/networkx-2.6.3.ebuild
+++ b/dev-python/networkx/networkx-2.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index 4c6ea4b947c8..174566e1a305 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -2,7 +2,9 @@ AUX nltk-3.6.2-metadata.patch 1166 BLAKE2B b87a79ec16da57add95b83857c285a1d3e490
 DIST nltk-3.6.2.tar.gz 2819833 BLAKE2B 9796822c35c524432e9790d0890b4388fbaa85b659e5415037422a22e8edbaf20775196b4416f441d62592b387066de9f7741b988c0d463349fc5c906bfd75b2 SHA512 3fd2cba52377613f35f6574f859482de987f969cfc8d4243a859be365ab1bd8300f9013dcedc6caeff7aa7fc035b331a47b557027209ca9a85b0cc7fbde44d6d
 DIST nltk-3.6.3.tar.gz 2824924 BLAKE2B fcab6647f43f4bf139857e9f4202aee688f564851976ed6a183e47361451fae771318346724e41f198b82cebdd5a47f151aaf932099143ef6faa2a77430fbfb4 SHA512 fe7244967df018670501304d1a8aa50a0f4d42bb0c73cc5e202eeab6a0f5da1eaed9b961f6026e3b8ae4b0393d788bcb58b263ba22a3ce6f5644022736035f98
 DIST nltk-3.6.4.tar.gz 2828051 BLAKE2B f757c9c6d0b5ab6105e90e1a46fc6671d5f661f9b1b58026ccb43c00ff4969a98cbc2005670e0a81218ef4d18e45c37bb380c53be4ca60984344b11a0c8dbc54 SHA512 ba9acaa596c7f9246cd2f8da37b58146021dc2c246306fab68a37ef833a5a346b1aa7033d43b9e72b52aeda1cf8e303c7c690d1ca439f6f58dc673aa63a37298
+DIST nltk-3.6.5.tar.gz 2830237 BLAKE2B 9396e916fa847af727f1ca52075aed0bf708266512e62fd3f4c64bb3a5be3f2e7d6820108ab5418f6c6d44626de6fe7be9831a5acd33e6ebb898d910b1d68e91 SHA512 5614eca28576ba8783f847ec7a149ea4b83d57bb8af0f7af79ccdd75234b9f1cf957c63cb4b178f5455e2311da430344d8209b081a7097759959857ffb10005e
 EBUILD nltk-3.6.2-r1.ebuild 1634 BLAKE2B 85e25a760e7c94b0b4cf463d7ab89eb34a7d235a984dbed139da6cc0f151449f670a46edd3831e7866c16a37aa3fd569aac82317ec5b07bea00712f35c83038c SHA512 02a73f3ec7e43072b6200f9b65e28a1bbdc63efa23ee79508c8eb3caa25aa7f265562561ae54bf9e35dcc92e52ba98b698e89f82303949da016186c1fafb9602
 EBUILD nltk-3.6.3.ebuild 1588 BLAKE2B 8f84fa992e8b0c66338d34f070525b0dffb12ee67db46afee7f15e9816bbf543f1545e011b033baca9b21b162d2b1a11d7b9377fd638a92810d899657f51d53d SHA512 a56930b8055184d820bdbcd2a3bcdbe056957d9707319b31b0282514471a41ca539e406da318001b647e2b50daa1ed075eeacee529270c58969ee9570522f0b3
 EBUILD nltk-3.6.4.ebuild 1588 BLAKE2B 8f84fa992e8b0c66338d34f070525b0dffb12ee67db46afee7f15e9816bbf543f1545e011b033baca9b21b162d2b1a11d7b9377fd638a92810d899657f51d53d SHA512 a56930b8055184d820bdbcd2a3bcdbe056957d9707319b31b0282514471a41ca539e406da318001b647e2b50daa1ed075eeacee529270c58969ee9570522f0b3
+EBUILD nltk-3.6.5.ebuild 1588 BLAKE2B 8f84fa992e8b0c66338d34f070525b0dffb12ee67db46afee7f15e9816bbf543f1545e011b033baca9b21b162d2b1a11d7b9377fd638a92810d899657f51d53d SHA512 a56930b8055184d820bdbcd2a3bcdbe056957d9707319b31b0282514471a41ca539e406da318001b647e2b50daa1ed075eeacee529270c58969ee9570522f0b3
 MISC metadata.xml 430 BLAKE2B 9c67c091a126c4af98c56de2d8227c1da65fbfad00671825642daefa117d711475b804bd90d72345e43d519a9219e195c1de1579dd6d60f6663c9813fc9c0d81 SHA512 5707c61031544a51e298d9c4c70685011f06b9d65c2370ecba6ecc23491c92fcc30988b6c0c28cb16f21eddebe412fff978a8f9661e5e95b9cff249f81420018
diff --git a/dev-python/nltk/nltk-3.6.5.ebuild b/dev-python/nltk/nltk-3.6.5.ebuild
new file mode 100644
index 000000000000..11dd1a3283d2
--- /dev/null
+++ b/dev-python/nltk/nltk-3.6.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite,tk?,xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Natural Language Toolkit"
+HOMEPAGE="https://www.nltk.org/ https://github.com/nltk/nltk/"
+SRC_URI="https://github.com/nltk/nltk/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="tk"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/joblib[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/joblib[${PYTHON_USEDEP}]
+		>=dev-python/nltk-data-20200312-r1
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/twython[${PYTHON_USEDEP}]
+		sci-libs/scikit-learn[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)"
+PDEPEND="dev-python/nltk-data"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# requires unpackaged pycrfsuite
+	sed -i -e '/>>>/s@$@ # doctest: +SKIP@' nltk/tag/crf.py || die
+	# replace fetching from network with duplicate file URL
+	sed -e 's@https://raw.githubusercontent.com/nltk/nltk/develop/nltk/test/toy.cfg@nltk:grammars/sample_grammars/toy.cfg@' \
+		-i nltk/test/data.doctest || die
+	# requires X and hangs in Xvfb
+	sed -e 's:test_plot:_&:' \
+		-i nltk/test/unit/test_cfd_mutation.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	cd nltk/test || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 26019f57c49c..c279eae10af1 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -2,5 +2,5 @@ AUX nose-1.3.7-coverage-4.1-support.patch 950 BLAKE2B 451402abfaf917b42584fb2530
 AUX nose-1.3.7-python-3.5-backport.patch 1802 BLAKE2B 8513cd506f7031ec4af1a4acd619b1bc01da05a1a81e95d3d9dfa097b131727229a05228315252a67c57ab15aaf2dc90df59c7ff3c726ae62f4a5ef86776bb87 SHA512 032c4c291edd76bb594329578e57483942ced2a46c3f6cd4e914d905f3894e420cc4da0ba2a63c266c81dd4d8f40b8df180f56ac75cb3c5e83e0309bbac573b2
 AUX nose-1.3.7-python-3.6-test.patch 3289 BLAKE2B 4f19c4f6e4f376cb09896f9e7b054753c339ad371e151f01cc8c54e83ecffee72e4959d827a88d03b4944192b43085b50017ef8b8785222125ce32fac5831717 SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127
 DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
-EBUILD nose-1.3.7-r8.ebuild 2243 BLAKE2B 9e6efa83d458d958f81a4623d3b09c4fd1d85463e865b1ce10009fb6332f9a83816aa48b0cb2506772aaa96a908f3181055c9840249935937515b3273063ec39 SHA512 abc31a83c574dcfdd2108a19cde5e1f8db32a85081f93ddf7533fc4cd6862d7c0a80af4b884a08fc5759200aefd6c1068b1abad9e8b427b45cc02925121a9ca0
+EBUILD nose-1.3.7-r9.ebuild 2288 BLAKE2B cad8b0fe70b07ab20e2c35dbeddee8df9b5a93f0575eabd9dc93fe906aaece6a399ccb05ec3a4051855d1cd7a15e5791ad05545694307d91822daeb7bb431921 SHA512 f2cccee8687a23b6066bbcca2c99dca54b8b9d3847c26337809937ce5c0329f9deea359d538043357577dbef8e77f577dbf762407a1f4dc8a1d87426afd4b59c
 MISC metadata.xml 399 BLAKE2B bccd250e005dc4b4921b8affffa56c918069576663c44671189d40dea344c0fb880fcf41656b1c9c5043cea9a0203b3ad3b980f7920ecebab82b4c71f75214d4 SHA512 15fd9ea9d0c09833f25497e2715a15cb2b2dbcbe042e0a3fa24525455eaeb470d6c799fddcd635a5197c984252649a26352713fcd069123fe2546edc20566fa6
diff --git a/dev-python/nose/nose-1.3.7-r8.ebuild b/dev-python/nose/nose-1.3.7-r8.ebuild
deleted file mode 100644
index fd55e99ba0e6..000000000000
--- a/dev-python/nose/nose-1.3.7-r8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="
-	https://pypi.org/project/nose/
-	https://nose.readthedocs.io/en/latest/
-	https://github.com/nose-devs/nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-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"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			!hppa? ( dev-python/coverage[${PYTHON_USEDEP}] )
-		' python3_{7..9} pypy3)
-		$(python_gen_cond_dep '
-			dev-python/twisted[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python-3.5-backport.patch
-
-	# Patch against master found in an upstream PR, backported:
-	# https://github.com/nose-devs/nose/pull/1004
-	"${FILESDIR}"/${P}-coverage-4.1-support.patch
-
-	"${FILESDIR}"/${P}-python-3.6-test.patch
-)
-
-python_prepare_all() {
-	# Tests need to be converted, and they don't respect BUILD_DIR.
-	use test && DISTUTILS_IN_SOURCE_BUILD=1
-
-	# Disable tests requiring network connection.
-	sed \
-		-e "s/test_resolve/_&/g" \
-		-e "s/test_raises_bad_return/_&/g" \
-		-e "s/test_raises_twisted_error/_&/g" \
-		-i unit_tests/test_twisted.py || die "sed failed"
-	# Disable versioning of nosetests script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
-		-i setup.py || die "sed2 failed"
-
-	# fix manpage install path
-	sed -i -e 's:man/:share/&:' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local add_targets=()
-
-	if use test; then
-		add_targets+=( egg_info )
-		python_is_python3 && add_targets+=( build_tests )
-	fi
-
-	distutils-r1_python_compile "${add_targets[@]}"
-}
-
-python_test() {
-	"${EPYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/nose/nose-1.3.7-r9.ebuild b/dev-python/nose/nose-1.3.7-r9.ebuild
new file mode 100644
index 000000000000..13a7ab23bca7
--- /dev/null
+++ b/dev-python/nose/nose-1.3.7-r9.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
+HOMEPAGE="
+	https://pypi.org/project/nose/
+	https://nose.readthedocs.io/en/latest/
+	https://github.com/nose-devs/nose"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+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"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	<dev-python/setuptools-58[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			!hppa? ( dev-python/coverage[${PYTHON_USEDEP}] )
+		' python3_{7..9} pypy3)
+		$(python_gen_cond_dep '
+			dev-python/twisted[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python-3.5-backport.patch
+
+	# Patch against master found in an upstream PR, backported:
+	# https://github.com/nose-devs/nose/pull/1004
+	"${FILESDIR}"/${P}-coverage-4.1-support.patch
+
+	"${FILESDIR}"/${P}-python-3.6-test.patch
+)
+
+python_prepare_all() {
+	# Tests need to be converted, and they don't respect BUILD_DIR.
+	use test && DISTUTILS_IN_SOURCE_BUILD=1
+
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/test_resolve/_&/g" \
+		-e "s/test_raises_bad_return/_&/g" \
+		-e "s/test_raises_twisted_error/_&/g" \
+		-i unit_tests/test_twisted.py || die "sed failed"
+	# Disable versioning of nosetests script to avoid collision with
+	# versioning performed by the eclass.
+	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
+		-i setup.py || die "sed2 failed"
+
+	# fix manpage install path
+	sed -i -e 's:man/:share/&:' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local add_targets=()
+
+	if use test; then
+		add_targets+=( egg_info )
+		python_is_python3 && add_targets+=( build_tests )
+	fi
+
+	distutils-r1_python_compile "${add_targets[@]}"
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ntplib/Manifest b/dev-python/ntplib/Manifest
index 2aede56f1698..e6bf7094a611 100644
--- a/dev-python/ntplib/Manifest
+++ b/dev-python/ntplib/Manifest
@@ -1,5 +1,3 @@
-DIST ntplib-0.3.3.tar.gz 6808 BLAKE2B 192640fd46a12e6f6829b2e252bc3d8126104a15f6186d2f5164b74d6fd8aaa715c6df7c9d2d896512d82f729f85335d81e44eb86b6a7240595c40c8927c0b7b SHA512 4175ebb78228475b32744a59ad4c404f7b88344859c19874606967c7d83a4680bbc78ff42d13b866b8e6ef939d2f1948b0a0b42819c78a8520856bae48ec907f
 DIST ntplib-0.4.0.gh.tar.gz 7315 BLAKE2B 508936a01e23dcb2ac9446f4ef6a1f8084a250cfb58e456efc25646b8fec49d3317f751fcffc9d397201d7b41c2b9d387afae2e4a75518225eacc4f3fb01c1c9 SHA512 ad735b1bccc4dc149622423b2877dc1d4b461f245dd0bd5b0cf963918ea63806772783e03eb8a66c75934746981fbd28789f19efa339c87b2f83e8218ee4a4c3
-EBUILD ntplib-0.3.3.ebuild 518 BLAKE2B 07906adbd1559ad43ca529a613e3c085e5db141513ec6d39c734296abb365bbc199d20611b07ac80eaf16ebe62de85dcccde3e40f8e79ab94bad28a61eedaca6 SHA512 322f86499b01356009d2cd8cc714bb9406823af85992ee7b5f1ea506bf0b958049e86019ee7e191ec72bc777ab37cf806fa9dd27a0b11b89c29d6305baf157b6
 EBUILD ntplib-0.4.0.ebuild 518 BLAKE2B 915ada90e2fe3fb28ea43ad922b707be0e7787611510d1831dc03b1720090100d179e15cfb776a854d2e72ed8b231f1096b7ef1d9140b3fd318ffb86b5b5c95f SHA512 381ba62cd0d1605f465ca99fa39fd41c5a8212adc67b88e871ff1d2cc294a95f990a8890711703f209986dea36835ac0732be4a2f7b5578d368e900563e6772b
 MISC metadata.xml 288 BLAKE2B e24d5041fb116b3f0c66f01380b243dea5bc1fd87739e4bc993c86021b17385b757023c3ef2c53598a04c1ad007b0a2d1c1e32739161951b6cd78e90604e47d4 SHA512 57e67588f64d70ffc8514d4ae1faf921429e097c4d51c001c4951023b0030cf8fff4be65c4b8691afe55a886223bbb4f0114bd266f85cd404f4233be4009a009
diff --git a/dev-python/ntplib/ntplib-0.3.3.ebuild b/dev-python/ntplib/ntplib-0.3.3.ebuild
deleted file mode 100644
index 38cffbd39d3c..000000000000
--- a/dev-python/ntplib/ntplib-0.3.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Python NTP library"
-HOMEPAGE="https://pypi.org/project/ntplib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# tests fail with network-sandbox
-PROPERTIES="test_network"
-RESTRICT="test"
-
-python_test() {
-	"${EPYTHON}" ./test_ntplib.py -v || die
-}
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 175d001233e9..f38545a6e502 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,11 +1,3 @@
-DIST Nuitka-0.6.16.3.tar.gz 2965278 BLAKE2B fc015f78912688e3d3b0833e7c126833352aeda7ac2599685a007445c43a7099407c4797eba47d5254fb5befde9482c210b920f4c7e38a2d82dbb5331125abee SHA512 a46af040774fd3523b64c1a113f6d0251c8d45108686017dae07429107f5057025bbcfefc7ed2b86da32c69516285d3af55fe234d25d6949562a96b0eb3f5293
-DIST Nuitka-0.6.16.4.tar.gz 2963879 BLAKE2B a6a0029f06aac5ea8fb0fec81ac5b1c5b7bb0ed85bdd0f0308ac74140792360684f42cf79f7ff7e604de3729584b335671ff57f0805aac2154ef1ea88bbbf245 SHA512 e2c73b19e459c31b85adf79270e258ca3c431364ec90b51682a7a324aebfeab1ab7703421e8646e18e0bef62f5f5636bbbda74d0ec0e4666e1571d71d41971b2
-DIST Nuitka-0.6.17.1.tar.gz 3144303 BLAKE2B 999a391830459fbfd20c52b3d640070bf4b69000ffcaaf0e86d1a0ccbd4602ce7cfb3a47658a5a94a8935f0dba4658f2616a2d7c4c176d5553ad3a488cd7645c SHA512 7d121a03539357f480ffd940699bd5df5ebb038f6914820b3185e0bcf8955ab005e2eacd49c837b94a2f5396a751264cf950764482a523e90a32d321e89ea2d2
-DIST Nuitka-0.6.17.2.tar.gz 3144669 BLAKE2B 0b098c9cad1cea08241026f8bf43242fb8a1f1790edafd9b54fb3a49a00590465222898a5edbb403b0d82f30bb6a9baa8a8b5292ed4b40e77cd7de236b44c200 SHA512 99b60bf447bff7203c6f18bc7f98ceab102f74562494244e9e514b076a6f1bf37357b478bc07dd6d800be7903801e6e499d17312bbb47a961924a0b1526ec33d
-DIST Nuitka-0.6.17.tar.gz 3144123 BLAKE2B 07d95a987eb6c772cd58f8bd0bb7aca638c475e4e90b6a58af890e63b5d3bec9125efa54ba54925311a38cc06b3c8e60a86ce18be7f189da111798fe77da3bd5 SHA512 8678cb9cbc30d9a9a139f98ae94d7f881295bbfb5f450faafb335cce7243979ad3dbf81946024a67edea177f2baae9d694d9e93abc5389f34dddd06595158eff
-EBUILD nuitka-0.6.16.3.ebuild 1152 BLAKE2B c9c2553f754f9a417ae2716bc233fd9cedc7a970608c3c778501c9441192c42c0d13e7dfaeaa0e434ebf86f251cc0581df9e205849bf53e888163b89248470b5 SHA512 e8652741f2b8c54dedb68607b3cd94a38e93651f6fad83bed88aff63bff34ea2b17ef43bfef07940eebdf099a7de913157c497ddb6c68feb26c55163288a4a4e
-EBUILD nuitka-0.6.16.4.ebuild 1152 BLAKE2B f1645db003aae150d8f17e2d9697c0315662213de1276e73e0ce84934576a15e230a7d07a5f6aa1cc245c6806daeeb74e85d330c6aaf2812a9c473415e7ced1e SHA512 711c6e15d105e90841a15f700a48e39ba3829d37842811a92fda32f31ca63293aac77ff6cbf45cb2ab807843a6be6474b99ab24d23dddc0fbe4be27d1ac2a66f
-EBUILD nuitka-0.6.17.1.ebuild 1152 BLAKE2B f1645db003aae150d8f17e2d9697c0315662213de1276e73e0ce84934576a15e230a7d07a5f6aa1cc245c6806daeeb74e85d330c6aaf2812a9c473415e7ced1e SHA512 711c6e15d105e90841a15f700a48e39ba3829d37842811a92fda32f31ca63293aac77ff6cbf45cb2ab807843a6be6474b99ab24d23dddc0fbe4be27d1ac2a66f
-EBUILD nuitka-0.6.17.2.ebuild 1152 BLAKE2B f1645db003aae150d8f17e2d9697c0315662213de1276e73e0ce84934576a15e230a7d07a5f6aa1cc245c6806daeeb74e85d330c6aaf2812a9c473415e7ced1e SHA512 711c6e15d105e90841a15f700a48e39ba3829d37842811a92fda32f31ca63293aac77ff6cbf45cb2ab807843a6be6474b99ab24d23dddc0fbe4be27d1ac2a66f
-EBUILD nuitka-0.6.17.ebuild 1152 BLAKE2B f1645db003aae150d8f17e2d9697c0315662213de1276e73e0ce84934576a15e230a7d07a5f6aa1cc245c6806daeeb74e85d330c6aaf2812a9c473415e7ced1e SHA512 711c6e15d105e90841a15f700a48e39ba3829d37842811a92fda32f31ca63293aac77ff6cbf45cb2ab807843a6be6474b99ab24d23dddc0fbe4be27d1ac2a66f
+DIST Nuitka-0.6.17.3.tar.gz 3147197 BLAKE2B fa72985494a362e430dd5eda0b14b5ff0620eb2d5a607cbae58802b92d9cf73d810864f00c366508dd89d8e7989bfbbdbd07b4309839ec36df224d45fa264a4c SHA512 dcda36320e1c9de269f0407869b15f47b960fada87fd6fb60b2e96cdd637f6a773042f0ca30e3d25c8e111a5fe86e69242424e982651af732ca840afd010a909
+EBUILD nuitka-0.6.17.3.ebuild 1152 BLAKE2B f1645db003aae150d8f17e2d9697c0315662213de1276e73e0ce84934576a15e230a7d07a5f6aa1cc245c6806daeeb74e85d330c6aaf2812a9c473415e7ced1e SHA512 711c6e15d105e90841a15f700a48e39ba3829d37842811a92fda32f31ca63293aac77ff6cbf45cb2ab807843a6be6474b99ab24d23dddc0fbe4be27d1ac2a66f
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/nuitka/nuitka-0.6.16.3.ebuild b/dev-python/nuitka/nuitka-0.6.16.3.ebuild
deleted file mode 100644
index 8810e82b4d14..000000000000
--- a/dev-python/nuitka/nuitka-0.6.16.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="https://www.nuitka.net"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-	doman doc/nuitka.1 doc/nuitka3.1 doc/nuitka3-run.1 doc/nuitka-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/nuitka/nuitka-0.6.17.1.ebuild b/dev-python/nuitka/nuitka-0.6.17.1.ebuild
deleted file mode 100644
index 758649696b8e..000000000000
--- a/dev-python/nuitka/nuitka-0.6.17.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="https://www.nuitka.net"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-	doman doc/nuitka.1 doc/nuitka3.1 doc/nuitka3-run.1 doc/nuitka-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/nuitka/nuitka-0.6.17.2.ebuild b/dev-python/nuitka/nuitka-0.6.17.2.ebuild
deleted file mode 100644
index 758649696b8e..000000000000
--- a/dev-python/nuitka/nuitka-0.6.17.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="https://www.nuitka.net"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-	doman doc/nuitka.1 doc/nuitka3.1 doc/nuitka3-run.1 doc/nuitka-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/nuitka/nuitka-0.6.16.4.ebuild b/dev-python/nuitka/nuitka-0.6.17.3.ebuild
index 758649696b8e..758649696b8e 100644
--- a/dev-python/nuitka/nuitka-0.6.16.4.ebuild
+++ b/dev-python/nuitka/nuitka-0.6.17.3.ebuild
diff --git a/dev-python/nuitka/nuitka-0.6.17.ebuild b/dev-python/nuitka/nuitka-0.6.17.ebuild
deleted file mode 100644
index 758649696b8e..000000000000
--- a/dev-python/nuitka/nuitka-0.6.17.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="https://www.nuitka.net"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-	doman doc/nuitka.1 doc/nuitka3.1 doc/nuitka3-run.1 doc/nuitka-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index 2a414b48f93c..605ef8a2ca01 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,3 +1,3 @@
 DIST numpydoc-1.1.0.tar.gz 609482 BLAKE2B 475be835a760dd148b7132a3149a1b79193425b70bbaa51b29a3909c73ed11a933181c917a0f0d0b56d8d30baced2142897e0a931b5eeb6449092d0a2a81632b SHA512 10dfc5e40ca851401be7d7cca3cbf24bf8ded8573c01344976321cd65fe351d985ee0bf48a92a485a43f8fb191c246e4822545a1583c87c1214d819a5fdfc106
-EBUILD numpydoc-1.1.0.ebuild 963 BLAKE2B c2171634684b2f5dc1f141b1a0eaae4c13fbe66566de4f6eda37753cc0f3ec076abb44a72f54be5e8c829af7b1d54996e71158704beefd8cba3d1fcc4acb1b91 SHA512 5e62014fa63d1955c25e7d98299e4d3e348fc4cdf4527f4311d1f182a87b08bb08041113eba4f8f4d94761c8e89b02bb18a77d0ec5277d6f52237697211cfdbd
-MISC metadata.xml 347 BLAKE2B 0d8b6d16795c9087ab8cf511f6fc73a2a4449daedab7968df7f8bbdede9fbe028e71fe2a9f0daec9f5747753cfc5b98ece2e451f185da5bf1b29ca03e95f9b7e SHA512 c4dedfb3ae916c51dd09ec7daeed5cfc55a1d5b0737538a0b06be13eb6092c731b57c712867b773127c4c7da4681a870db6e404a1ef80dd20aff7921fada1ec2
+EBUILD numpydoc-1.1.0.ebuild 941 BLAKE2B 8e9287b0f999c96a453f44dc538b8ae9cf6ab92491001511b8ff7b61e989fb62beee4fdf1aad972e9e903a5cb4720ea184b0488e070e142b21aa9463d9d61f66 SHA512 60181a5ce9e3a030d7602d2fed2d0d6591340ccead8c38f179d0304b83d5027310f86363d8a10a31d9ca58b9ab27a933ecc3a93a76494a085780f9ef1e421481
+MISC metadata.xml 403 BLAKE2B 437fdd3881a5ec60a83b3cb018e57c714a91030be9ab0032b8662e30b7bcd120ee3dd2015be561dd8a65a39833ef777e22f040a6e466c1b56a602a4ac33d4917 SHA512 833d00712cf7dfdc1080181301c03388a3c966436d2d9c9badb609cff66fa49035a6d001d60f205e1c2c49808eda7fad65abda8802f42f7ba36939b3691a8390
diff --git a/dev-python/numpydoc/metadata.xml b/dev-python/numpydoc/metadata.xml
index 378a0d5dd289..19a612c5cf43 100644
--- a/dev-python/numpydoc/metadata.xml
+++ b/dev-python/numpydoc/metadata.xml
@@ -8,5 +8,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">numpydoc</remote-id>
+    <remote-id type="github">numpy/numpydoc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/numpydoc/numpydoc-1.1.0.ebuild b/dev-python/numpydoc/numpydoc-1.1.0.ebuild
index ff3887528405..5693d12146fa 100644
--- a/dev-python/numpydoc/numpydoc-1.1.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -30,14 +30,14 @@ distutils_enable_tests pytest
 src_prepare() {
 	sed -i -e 's:--cov-report= --cov=numpydoc::' setup.cfg || die
 
-	# these require Internet (intersphinx)
-	sed -e 's:test_MyClass:_&:' \
-		-e 's:test_my_function:_&:' \
-		-i numpydoc/tests/test_full.py || die
-
 	distutils-r1_src_prepare
 }
 
 python_test() {
-	pytest -vv --pyargs numpydoc || die "Tests failed with ${EPYTHON}"
+	local EPYTEST_DESELECT=(
+		# these require Internet (intersphinx)
+		numpydoc/tests/test_full.py::test_MyClass
+		numpydoc/tests/test_full.py::test_my_function
+	)
+	epytest --pyargs numpydoc
 }
diff --git a/dev-python/oauth2/Manifest b/dev-python/oauth2/Manifest
deleted file mode 100644
index 3462bbf59d75..000000000000
--- a/dev-python/oauth2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 1.9.0_p1-exclude-tests.patch 332 BLAKE2B 82d468bd3f94baf4e99ddcc17252bad0b71ff2331aaeda3ec3d7b4117017b5a9ac2ab57f4fcdaeeaae9afec4c39e1ca5481e2463e197eba7bae40c6d27e0af05 SHA512 9b4b45d22076517ac6e79ecd74430ee7e53501aea07f0e2c43bae3c119e572d9357dfc32adb036920f4ff15c1344ea3cde20e79ee4c609508feeb9fac3293c57
-DIST oauth2-1.9.0.post1.tar.gz 21306 BLAKE2B 3e61ba6d46b98c594fa31e828885930490f99390f14e0173bdf719cfc1d5e8ad385e56c9654e139279cd95611a7e35b1fe0276679a2a4849b67125f5e6919788 SHA512 a3b64eef331d4c4f59c275f14efb2dfb48ad60de47a59a88106f60d64428a09b76d8bedf08c98c113493968d83708b1478b4b61b2b5528b5b01fa22777daff4c
-EBUILD oauth2-1.9.0_p1-r1.ebuild 952 BLAKE2B fc8a6ace84c2f2d287a85a4cefe5b8f132bc8993b3c937644a589f2305f2e48bc9401fb96d90e9d3aa059a0de7a66c9b7b3fb539f3d5006e97c88ea4a8179f00 SHA512 cebfc71ee966dcb14f2bec7cf6de6383d0e463864bf15c9e91cdadba162afd3ebbe859c7bce1e923e0b88e7d3fb526a0b1f3b56cfa978c07efbd1e203b552332
-MISC metadata.xml 396 BLAKE2B 3cc2a05b3b9e0661e43a0a10831bc8c2b0092042253ccc5b01c739e3e4aa51e493e197b402d806381de1f69975731132b7d8b9e2ab089d1b6e3040d6b5cf2d08 SHA512 45200e36cf44fc5d49c7df40b6c13761ec2f0aa2227ed87e34184903aaf04c33a2735826adbaed21e3758381cc5fa2eead33f20652f914f85a590866dbcd6302
diff --git a/dev-python/oauth2/files/1.9.0_p1-exclude-tests.patch b/dev-python/oauth2/files/1.9.0_p1-exclude-tests.patch
deleted file mode 100644
index 0d3a0fa962af..000000000000
--- a/dev-python/oauth2/files/1.9.0_p1-exclude-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -45,7 +45,7 @@
-         "Natural Language :: English",
-         "License :: OSI Approved :: MIT License"
-       ],
--      packages = find_packages(),
-+      packages = find_packages(exclude=['tests']),
-       install_requires = ['httplib2'],
-       license = "MIT License",
-       keywords="oauth",
diff --git a/dev-python/oauth2/metadata.xml b/dev-python/oauth2/metadata.xml
deleted file mode 100644
index d08b5485d089..000000000000
--- a/dev-python/oauth2/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">oauth2</remote-id>
-		<remote-id type="github">joestump/python-oauth2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
deleted file mode 100644
index dcf5e4e10dd9..000000000000
--- a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P="${P/_p/.post}"
-
-DESCRIPTION="Library for OAuth version 1.0"
-HOMEPAGE="https://pypi.org/project/oauth2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-
-RDEPEND="dev-python/httplib2[${PYTHON_USEDEP}]"
-DEPEND="
-	test? ( ${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-# https://github.com/joestump/python-oauth2/pull/212
-PATCHES=(
-	"${FILESDIR}/${PV}-exclude-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# These tests require network access
-	tests/test_oauth.py::TestClient::test_access_token_get
-	tests/test_oauth.py::TestClient::test_access_token_post
-	tests/test_oauth.py::TestClient::test_two_legged_get
-	tests/test_oauth.py::TestClient::test_two_legged_post
-)
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index e30c16cda74d..89b06b54791c 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,8 +1,3 @@
-AUX openpyxl-3.0.7-metadata.patch 361 BLAKE2B 7a5322e9fd568124bc2271f015fa284300ca7004d286b4f3c4dec35446948941e69c3d0b43d7cd4af59c05a633b73071290d65cc1e83bbaa28eef39cf9f03d58 SHA512 1926f83469f6b869ff5a923b1bfb112b0674b86aadaade6005f3921e6cc67118c771b36cd04af49447e99bbadfbfa0a03d56f1d6ffaa3fd27deb40b4ff2eb5ee
-DIST openpyxl-3.0.7.tar.bz2 2426608 BLAKE2B 5ce0a34ea4ec8f33da2224555f3d681c4cfa2145f4cba10ed182044e6a6d69ce61c500c51a26db7ded2a3a0e778d0d8e2bd996c3852732f565501f233b145db7 SHA512 bd697c353d0a9fe66a7947dc0f51530b8419e39b36833e5322cca544fafcbd6aba36e42e53c1a1672f44b3940de9b91417bc58955c87257b7b82782c480ef738
-DIST openpyxl-3.0.8.tar.bz2 2514689 BLAKE2B a640104c4afcafa5dad8615986a0d3acdac563c60c0ae4b6301978f2257dfbf64eb9413cfdea690600d6c267cc104e3667f51e1ebb23a2c8e74908c1aaeb62ed SHA512 921ee6e37a7242bf807cda3a86ba224edc80c64623b6cf0d3f344217485b53bcddbdd2a81a35bd8e80fe0dc9637d6c08988c191fb4a905287a8af340b97fadf3
 DIST openpyxl-3.0.9.tar.bz2 2428070 BLAKE2B b62133ee8e732142428b4f9eaf158e6f33daf314ed1ad620d921ad10265d1db93e2fcef807a61b3277e96f245392fd19b48da715eb0c560c882683fb1407f7a1 SHA512 33c313c842a43003a6e056b58869652377bef74bcaf267c50cc49f6abb7caa8a1b4e8f3b400a054f7d1776e03763ebebc984d331520bd63411ec4acfa8a03787
-EBUILD openpyxl-3.0.7-r1.ebuild 797 BLAKE2B 48128dbc0eac6f021d57fb05386f136b62d864ee66374f1538fbfdff2650358a4fcddadaac4c1ab13e8d4ea6589e19c001742b9d0c5dafdbaad43eb99c73b03e SHA512 1770a46808e4432cbdd5525bb041abd547c9638b088b94f9ceb219d58278fe2f40805b48ec64d443bb9b8bd4b48e78ef44136e233612843002dcde70e97ac692
-EBUILD openpyxl-3.0.8.ebuild 742 BLAKE2B 284ac817d6641accf668c2014f60f2da37786b865340027dbdf348551e68cc63acf3f6231518e9b78b26a10f9732a5ef37cc83f2793101892bd0caaa99884dd5 SHA512 cfb56bb31a14c37330d90bb4d55a0edf653fc73792fa41947d01fa209e2ed54cb0418fc1d85274715f1b6daf7c8d4b07295c153a5ef7126b4e07f3999d0fa642
-EBUILD openpyxl-3.0.9.ebuild 742 BLAKE2B 284ac817d6641accf668c2014f60f2da37786b865340027dbdf348551e68cc63acf3f6231518e9b78b26a10f9732a5ef37cc83f2793101892bd0caaa99884dd5 SHA512 cfb56bb31a14c37330d90bb4d55a0edf653fc73792fa41947d01fa209e2ed54cb0418fc1d85274715f1b6daf7c8d4b07295c153a5ef7126b4e07f3999d0fa642
+EBUILD openpyxl-3.0.9.ebuild 739 BLAKE2B a858f7bbc837cef3467d8ff4dbd2708e0600ad50830b258fdbe46feb0d6a3777bfcaa5118a59e80f2817101e648eeb8bf684e87c6dae11ae4891f8a2172bbbf6 SHA512 a5007b47f949f7f92bc06966d1cbabb56535a9d411c4a939c6a08986dc36372599d094443debab19fccd0aa47b027cd929b20d34237cf95f333facd567f7a187
 MISC metadata.xml 595 BLAKE2B c843c395f1b6a40fea607fa7f851af887fce236ad6fc5b6b77eea0b208954a3340f49ab66a5503f6951346718ecfaf5d43f1a0bbee9b86f4b11c29b1e4cb6394 SHA512 a0cc42713e9c67438050b44c810f17ab4946f8a1eece0159e71d4abe749047dd44ff430605bf5c34af12de2abe4937955c7aade0c5af708ed7f6b816684c8763
diff --git a/dev-python/openpyxl/files/openpyxl-3.0.7-metadata.patch b/dev-python/openpyxl/files/openpyxl-3.0.7-metadata.patch
deleted file mode 100644
index 08349787e6fc..000000000000
--- a/dev-python/openpyxl/files/openpyxl-3.0.7-metadata.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dupr a/setup.py b/setup.py
---- a/setup.py	2021-05-29 19:21:13.876463476 +0200
-+++ b/setup.py	2021-05-29 19:21:21.986626313 +0200
-@@ -74,7 +74,7 @@ setup(
-     author_email=__author_email__,
-     url=__url__,
-     license=__license__,
--    python_requires=">=3.6, ",
-+    python_requires=">=3.6",
-     install_requires=[
-         'et_xmlfile',
-         ],
diff --git a/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild b/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
deleted file mode 100644
index 83804875c020..000000000000
--- a/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
-# Upstream doesn't want to include tests in PyPI tarballs
-SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 x86"
-
-RDEPEND="
-	dev-python/et_xmlfile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
-	)"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/openpyxl-3.0.7-metadata.patch
-)
diff --git a/dev-python/openpyxl/openpyxl-3.0.8.ebuild b/dev-python/openpyxl/openpyxl-3.0.8.ebuild
deleted file mode 100644
index 23c8e219fb65..000000000000
--- a/dev-python/openpyxl/openpyxl-3.0.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
-# Upstream doesn't want to include tests in PyPI tarballs
-SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86"
-
-RDEPEND="
-	dev-python/et_xmlfile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
-	)"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
diff --git a/dev-python/openpyxl/openpyxl-3.0.9.ebuild b/dev-python/openpyxl/openpyxl-3.0.9.ebuild
index 23c8e219fb65..0986d1be0c7c 100644
--- a/dev-python/openpyxl/openpyxl-3.0.9.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.0.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 x86"
 
 RDEPEND="
 	dev-python/et_xmlfile[${PYTHON_USEDEP}]
diff --git a/dev-python/oset/Manifest b/dev-python/oset/Manifest
deleted file mode 100644
index 388228aea552..000000000000
--- a/dev-python/oset/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX oset-0.1.3-fix-py3.10.patch 318 BLAKE2B 2b731b0e8f8ac917e57823ecca32fc69b719347988e830fbe8a25d81d4be7000b8e0c714424e3f1ccec9f580e12d83fb5cd415241b3bed5cd1378639851e4ebe SHA512 28f2bfd3d560eab9c12708b7e112ddf0059572bad0ae29f1745a85580d0470b11b263bbd1d9c8639aeb2386b9d30e39f8af56e792afbfe5639ef12ef028612e1
-DIST oset-0.1.3.tar.gz 7345 BLAKE2B 1ef3fc6e0acc0bdbabb139a968ada851a0b1f19785b30c1f65bc3205600ae868add111487404b0e71b03cb5c2fce9d3991c32c5b0034ead62da058807efabfe3 SHA512 d34d11e76740c85a41be3d055710fe08afa7de1839ae43d76c152aa5838dad5895f0a0d95c5a2625a94494fc462e08f79a7614756ee5748c35e434176ec21121
-EBUILD oset-0.1.3.ebuild 419 BLAKE2B 6e30d96e4979f751e11c54b28d99b8034785f959721261922738a8628f5a12e3c0b1dd7bdd3a188fbf1db021a103be582c407b98811b6e5f65b8da833cbd8493 SHA512 6b4f8756cd2fc30b5d6b030a752d3b3686381b87a4a6714e1f67530ebffa7c05474c6678cff00a8cf375f273c2380ac32617da03ece556415de3d1962c33e581
-MISC metadata.xml 350 BLAKE2B 872d9280a586fb059d074c9ef32f5d11ec727422bb6eb00682051c2658a6c8560e75c9f7c3b27299e32e4006ba564d54bd17303aa5819f65157b7208a226e325 SHA512 b03230c206a7a93c03d9986d087baab15a3fa5b774b2ddb57576c456c91125be5defe2e12c9d3e499ea94b275311c02b5e3e024503d9821372d4f553f6ebc65d
diff --git a/dev-python/oset/files/oset-0.1.3-fix-py3.10.patch b/dev-python/oset/files/oset-0.1.3-fix-py3.10.patch
deleted file mode 100644
index dbc04b40472f..000000000000
--- a/dev-python/oset/files/oset-0.1.3-fix-py3.10.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/oset/pyoset.py
-+++ b/src/oset/pyoset.py
-@@ -13,7 +13,10 @@
-     def next(it):
-         return it.next()
- else:
--    from collections import MutableSet
-+    try:
-+        from collections.abc import MutableSet
-+    except ImportError:
-+        from collections import MutableSet
-
- KEY, PREV, NEXT = range(3)
-
diff --git a/dev-python/oset/metadata.xml b/dev-python/oset/metadata.xml
deleted file mode 100644
index 75a33318b583..000000000000
--- a/dev-python/oset/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>andrewammerlaan@gentoo.org</email>
-		<name>Andrew Ammerlaan</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">oset</remote-id>
-	</upstream>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/dev-python/oset/oset-0.1.3.ebuild b/dev-python/oset/oset-0.1.3.ebuild
deleted file mode 100644
index 4c6e40f367e3..000000000000
--- a/dev-python/oset/oset-0.1.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Ordered Set"
-HOMEPAGE="https://pypi.org/project/oset/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index f548ff228c28..f6acb71c5cd3 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.i18n-5.0.1.tar.gz 44636 BLAKE2B 69df723bff7a279ace2a8bb2ea795e6beaa626ffc4bb364c513d16d2ce3cb07f6e9957a98d1b633f95154672d118de6fbb71ef5c1a3a53520f4d1f4b8f72748f SHA512 d55238616dc90f85ff458fc6680b3a3b2493d2a640bf5849c19cd7271e7127b535a301ed3085b5e0131b46a635b5a09423f6cba60f9f1b9b0352a0e7115a8057
 DIST oslo.i18n-5.1.0.tar.gz 47423 BLAKE2B 621ec835fc975978fe3da392edda66471cd85fcfbe5af8c7a1704d7422d8f52f3b61c97ac8cfbd2aca94f65c8428cc5f97b095bc116ece605a4dc325a4a0171e SHA512 b2243f22de3ef3e33609c5aff573c4448a42c74d75022e023bea97c5338608e3fcd9da92aa2d262051e6b2ccbd5a88cfb2c91da79b7e3f81420dc24117da9b1d
-EBUILD oslo-i18n-5.0.1-r1.ebuild 750 BLAKE2B cea3aecfa9357b3ae1886be8aada131674733084c89242e7537dbe64d04bc42714e91c7331aaa94f387e68e6a8f1d91dc498a9cfc89ed7eb9d6f00087e041f85 SHA512 926fc45ddd8fba80942f87cd3e60e1c53d391ce15f22ab66ba2edf49faee1146bef21a3a89844a67d7e0ce95ffd7c2c52543c637f67af2cca84d6f6b370deb1e
-EBUILD oslo-i18n-5.1.0.ebuild 712 BLAKE2B 333d0caef3e799a8aaa21293278197934bef86fa30012b890e6074fbc3dbc3461e930621bffe1ddf8da15fda2e19a335eefe55264d8cbea3afaeeb24b9846cd1 SHA512 fdb5d4840c5e38bf2ac395131a9d50cf2f5c6739d8485799497279dc81f5c968e75e6240c5a89f1440163c30060a267f344f3830e3fa89186cbbebffdd2b75a5
+EBUILD oslo-i18n-5.1.0.ebuild 709 BLAKE2B 8f0264bf6b0d3c7da62b0543f714fdeef744b83dc6cb47898cda29f0b2469b42ddd7ac8a44a2cc46bb07ffa77d3be91807df1f5281be44311f75b9208e039187 SHA512 8987898bfb17b699ce9675713502726e3b2f6dfef23b4379e64f21e017a68ae828d12d464d6ced75988c511232802183b712be67668a491484b9c0b65e34384b
 MISC metadata.xml 665 BLAKE2B 8890b37ab4cb0fce66a2e6f8be6da304a0c28d75d203a4413d6c8062a984a52b4c6004145992d3e00dd156ffd64a2bbb6b75eba85954de9fabcd88d24e925cc6 SHA512 b4a5778815e857a638e0ca9c9d228e9c941f9b541d667c7e4fcf6ef4814c8b24cbf0c8d24317ffbc7e65e25326f5043a546f42b7982f355551d1b0d0351472b0
diff --git a/dev-python/oslo-i18n/oslo-i18n-5.0.1-r1.ebuild b/dev-python/oslo-i18n/oslo-i18n-5.0.1-r1.ebuild
deleted file mode 100644
index 29cb1ee5c79f..000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-5.0.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Oslo i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/oslo-i18n/oslo-i18n-5.1.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-5.1.0.ebuild
index b1bb12d3b5a3..1f89bcf3e363 100644
--- a/dev-python/oslo-i18n/oslo-i18n-5.1.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-5.1.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/osrf_pycommon/Manifest b/dev-python/osrf_pycommon/Manifest
index fb78a49dcf09..4b73ab752493 100644
--- a/dev-python/osrf_pycommon/Manifest
+++ b/dev-python/osrf_pycommon/Manifest
@@ -1,8 +1,3 @@
-AUX str.patch 1041 BLAKE2B 35abd358988af1cf45975094758d56648d56cdc302dc507a3e5077e90142d31076d89592a06d1d9eae1dcfdfbc434efbb176990af955c06ce414603cdf7efa62 SHA512 94a8f4d42c3929ca7aa077142c4e5ec91ef2848b6f402b0a9a7beedd96865178ccf431aa8a68cf332927e783e56fdcdf4b8321679c0bdcea4e76564dc7f72d7b
-DIST osrf_pycommon-0.1.10.tar.gz 46303 BLAKE2B 3f18b8683a6363e1f15addfe75b8dee31f64fff7c286379d18355dc1f3467063c2cf1a9eb7978c5f9de5d64cb23d18a3922a416fe24fafa618f50f0ba89cddfe SHA512 5d53ea0c3c410a99964330dc22dcbcb3cd8892a359fee2061acc15ddb46e334ff757e8aa5b776fef381246c58e9834003ac818624da4b8e95552f214f3d9e6bb
-DIST osrf_pycommon-0.2.1.tar.gz 46633 BLAKE2B ba89f8d783446d52a328d126bcdfac721dba0a811007a55e48ebd3626e58b732d4f03cc2a042d517698d6708bc72e0ffede99ba82604d1f4204ef3c1da36601a SHA512 d05e6bcbb8e7b5506ea953d37c895dbca59765e9a26081aff2c4d213c02365a4254580843dd7624fe4a046afdb2d5b8935c1fcd4d60b6b1d71c4d22789d26371
 DIST osrf_pycommon-1.0.0.tar.gz 45084 BLAKE2B 83bfd5393575a5032e72ae93c9c3eec87d2907ce3fbd3e9fe14a94e5470d61594ab75bca394ec4b7960bbdb16c3ec060966bd6bf47f9a4037d530501c7ce947f SHA512 ff7204116c94eef972b7071f8d6c68fd7cdb1a518fd6c77cd47f54e5390815ff4b6a7d265ef3ed0093c1baa20eb332d69e92926e856da0e34b7186100b688d83
-EBUILD osrf_pycommon-0.1.10-r1.ebuild 707 BLAKE2B 97b2fd2436b770dbc707b49e7fd1912d0144a9924c69ae5e97d8cf240bba8bcae3efc6692746200185edaa069a435c3af35bba898ccee46f955c68f387dbd57d SHA512 567c9814646ea221b6792ee4887bb6f3339dafed17984542c7c16bbf2e2575ffefe4cc7a285857a55721a133e252e8a11b3083c829c7c9279fa61fbd78fb70a8
-EBUILD osrf_pycommon-0.2.1.ebuild 730 BLAKE2B aa06c126d0c6371aae091c8f8c8650be796714b6e1b1f8a9d758924787467e0b838e1e47b848f5eae8f151d422a92edff80f12ab1ffe39ef9fbdfb083801fad6 SHA512 691ce22cf7a777a07369890de6a255ff57eb66938ce422be5917b482defdafd0d7945d5e0e3b951f1c4c1227278d0af9fc8cfb6fcf1f50950b91d1e88af63a8d
 EBUILD osrf_pycommon-1.0.0.ebuild 730 BLAKE2B aa06c126d0c6371aae091c8f8c8650be796714b6e1b1f8a9d758924787467e0b838e1e47b848f5eae8f151d422a92edff80f12ab1ffe39ef9fbdfb083801fad6 SHA512 691ce22cf7a777a07369890de6a255ff57eb66938ce422be5917b482defdafd0d7945d5e0e3b951f1c4c1227278d0af9fc8cfb6fcf1f50950b91d1e88af63a8d
 MISC metadata.xml 485 BLAKE2B c4787f4886029b55a7c557caba54277711a229ea61b7b66f21d7e0851f934930f223e0b304c2b46ef2674d1dc7a829263cae991d352a9609304d92768a4eff72 SHA512 8b4f0a9f465e968dd93fea7715ed6efba8eaf0362643174784ac14074709eaae5d4e13f1b4075fe6c61475d106760d7dce3c129cb86404dc540ad14d55c6640d
diff --git a/dev-python/osrf_pycommon/files/str.patch b/dev-python/osrf_pycommon/files/str.patch
deleted file mode 100644
index 336813e416fa..000000000000
--- a/dev-python/osrf_pycommon/files/str.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 515fd938513b8e458ce5fb3c937c100a3bc87745 Mon Sep 17 00:00:00 2001
-From: Chris Lalancette <clalancette@openrobotics.org>
-Date: Fri, 19 Jun 2020 17:48:05 -0400
-Subject: [PATCH] Fix the __str__ method for windows terminal_color. (#65)
-
-Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
----
- osrf_pycommon/terminal_color/windows.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/osrf_pycommon/terminal_color/windows.py b/osrf_pycommon/terminal_color/windows.py
-index f0f6120..21f5e8f 100644
---- a/osrf_pycommon/terminal_color/windows.py
-+++ b/osrf_pycommon/terminal_color/windows.py
-@@ -224,7 +224,7 @@ class CONSOLE_SCREEN_BUFFER_INFO(ctypes.Structure):
- 
-         def __str__(self):
-             return (
--                '({0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0})'
-+                '({0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}, {10})'
-                 .format(
-                     self.dwSize.Y, self.dwSize.X,
-                     self.dwCursorPosition.Y, self.dwCursorPosition.X,
diff --git a/dev-python/osrf_pycommon/osrf_pycommon-0.1.10-r1.ebuild b/dev-python/osrf_pycommon/osrf_pycommon-0.1.10-r1.ebuild
deleted file mode 100644
index 9f8238dc18f6..000000000000
--- a/dev-python/osrf_pycommon/osrf_pycommon-0.1.10-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Commonly needed Python modules used by Python software developed at OSRF"
-HOMEPAGE="https://github.com/osrf/osrf_pycommon"
-SRC_URI="https://github.com/osrf/osrf_pycommon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/mock[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=( "${FILESDIR}/str.patch" )
-
-distutils_enable_tests pytest
diff --git a/dev-python/osrf_pycommon/osrf_pycommon-0.2.1.ebuild b/dev-python/osrf_pycommon/osrf_pycommon-0.2.1.ebuild
deleted file mode 100644
index 76c71e1f7c8c..000000000000
--- a/dev-python/osrf_pycommon/osrf_pycommon-0.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Commonly needed Python modules used by Python software developed at OSRF"
-HOMEPAGE="https://github.com/osrf/osrf_pycommon"
-SRC_URI="https://github.com/osrf/osrf_pycommon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# linting is something upstreams do
-	# for us, it either means unneeded deps or breakage due to changes
-	epytest --ignore tests/test_code_format.py
-}
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index 7bbd973c58bf..1299e6318c63 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,6 +1,6 @@
 AUX owslib-0.20.0-no-privacybreach.patch 1213 BLAKE2B 482a7cbbf12f335aa9367a1d7e311f625069c197b48fda85f063e0f227c2c2300b481b8b71f6572f71a8eb1ac55ff9738c14857d7d99c35423e358394045c628 SHA512 da4955ad7c1175929f3d303dbd7e3f713e26742b270c060b182b158ad4bfafd6e14aaae09f209a12682430655103e6c943ff24a1cb13b6e2bc5aa14a3cc7dfac
 DIST owslib-0.20.0.tar.gz 912319 BLAKE2B 9f6e44f76554d67756839bfad1cdce6e2e7a4db6c3517ed308256745a3ea1df77488718f307bcd59dfcae7bab7801ba1974131f358db1bd070846640ccf08ada SHA512 c30e14d0a310617d2dbcca436f38d4a942b8c5efb96506554e650b20b34580fd0119ae6bf17892bb09ceff7141b9cbfd32deb582d14d81b6518dbbc223116d07
 DIST owslib-0.25.0.tar.gz 936550 BLAKE2B 9cb34a6c7c93dc89a466c13351d457c9372d405055fa3f6cec9c05c231e76762168c6813085523037b3a6439100500c46c1044569bd2bb598c3e2e63757d8b86 SHA512 058108cf77197ce24793608869d56bf0467230f5f231ac9ba48445f2e02d07ea1e26be03ad6967504a1e625008ae2768ed2a663f3b7a49dcea410ee4a8b40cec
-EBUILD owslib-0.20.0.ebuild 1215 BLAKE2B db4ada787d23f0ed22d1464b059214f24321a063e7b9471fbc200fe7af58002097e272b39466462bed241e447b18709ce5ebfe1f206249b000f89d4ddfdd4332 SHA512 f3113321818159c0ec73c9fb6f89fc19d525566e423e102898489758018b3d60ed6e3220923754f9bbec9f3e458c464e0f1f24ef182a805807de19565c0a7991
+EBUILD owslib-0.20.0.ebuild 1216 BLAKE2B d284f5a823909b23b89e6afba0123f3fcded83144ec75555e0f30ddc8294b200a425f215750b9a0bc4fa57cc5987a00205a1a56db0626327275e6dd7dd7e310b SHA512 25c4b5cc5d6c239aa200b2f2ca01c853a712b9a33ebaf41f0131e7bcb636479bfefbd365a538c0e7498aeecb687c7defffb25dbb299ac624e02be0271ee29884
 EBUILD owslib-0.25.0.ebuild 1009 BLAKE2B 9d5fbe2d6c9efe057e908031012cef689f63dc580412fafa26f0dc28f9a7e162871dca634617bb1fb2ed1d102bbfa93be01fa1d4ed1e3f7778a11ab75104985b SHA512 3deb83a78ec54b679c43d82a18c8c842b8e9d6410e0d9477fd792be580db5c869fe87224cfbb59b4b418fa9c2c923ebdb640426acd0e3631e281282697e7e7b0
 MISC metadata.xml 496 BLAKE2B 811407d4cd3ccc73043d31a65b45df685388e853ee89c58fb9202ef2d3589e3240139c242d1c020bd04af8ec161fb7d2f59a095b695c8d913937f8238582e61d SHA512 e5d01c5465033c270d95e97d91d23315b7228e9b8aa82617a7cc86960c1fd001c8f5853e0b9c676c6fb044e32107028db2b21ce0fe08a9ea4e95b7d7fb86e4a9
diff --git a/dev-python/owslib/owslib-0.20.0.ebuild b/dev-python/owslib/owslib-0.20.0.ebuild
index a5f26d6321dc..cbb73ccd6a1a 100644
--- a/dev-python/owslib/owslib-0.20.0.ebuild
+++ b/dev-python/owslib/owslib-0.20.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/OWSLib-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pandas-datareader/Manifest b/dev-python/pandas-datareader/Manifest
index 845162e2a675..be6ed8858ceb 100644
--- a/dev-python/pandas-datareader/Manifest
+++ b/dev-python/pandas-datareader/Manifest
@@ -1,5 +1,3 @@
 DIST pandas-datareader-0.10.0.tar.gz 259641 BLAKE2B b8a5c7aaa76b30abd9297c820638731fc5d81b5ee2cd1a016c1d8d10dc237708b913a4ec505b9a703b02f470413725f58fa4cbf54ba70113bfae5d0ffb0875b9 SHA512 b078122c6c0a614aa5b55151446b830dba64382b0570761ac80baaf362ef8121fac2c4b53b8cacc367bf985ef1ecc16d44041f1d1f4b13fc1024fe6ab74f1d0b
-DIST pandas-datareader-0.9.0.tar.gz 261026 BLAKE2B dc8211ceb718124095896dce9de0d752f2c5c7bce022dd5197a6b3851ad8727e298b34d0657f76c9c40ca31b1cf76d8a467af251aa9131f921990e6f4f9ec25c SHA512 5ef2e06b6d02e2bc213387f8649e02c9ebd6df679da8ce433d4e8dd2c66e8cbc214a9cf9a4bc83ac2c7ad917cf72a9e6b09c9398623718736114efdc2c3e2815
 EBUILD pandas-datareader-0.10.0.ebuild 1138 BLAKE2B 521dc29343e42285a89dfa11cfefe32b63451a4711b7d13727f7270c8327485cdc3609e684b45d54b31d6fc2a14d58cec87aa6e6f7af6edf9b380fa73103003c SHA512 99efb1f1ca2111feb06c482d24dbb6f405c9faf8adafbc4e8166500c65d45348ee1bb24b3959a0b9a53734750a4bb1f5a26685dfc78368622641492ab1c75660
-EBUILD pandas-datareader-0.9.0.ebuild 966 BLAKE2B 4c6f49be7b8b57dd9167046d665109fd45fe96889416460e5fb55e012dd0c4ba03c05a65d87bad462336fd4ac17a7d564869e24cc58c883c3ad85d9a2600ba00 SHA512 1bb64bd7cb35e8f80e3f54a86737fee4222f2052944ab6f31a63a2e5891ff6cdff59ec181ddfa5674cb1535d441f9f72c95002a45b42d05702457986ec314f6e
 MISC metadata.xml 779 BLAKE2B 19493a6cd2565e5d57d94f9d5338bbdf3f83ffca4e9b0c9e661d67ab3ee3df47d3ac5bc39b8c2104ecee651b44e31d492c250c15df72f2783d51f4adf88ef047 SHA512 0fe7810189a7730edb63cc8ba48d398c397cff63a8cc570f2b1db1dbd0bbe06c64d2dc517ec9221ffd85de7736411a72597c940d3a38f18a434b858b00196449
diff --git a/dev-python/pandas-datareader/pandas-datareader-0.9.0.ebuild b/dev-python/pandas-datareader/pandas-datareader-0.9.0.ebuild
deleted file mode 100644
index 30dc4ae56e33..000000000000
--- a/dev-python/pandas-datareader/pandas-datareader-0.9.0.ebuild
+++ /dev/null
@@ -1,35 +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 distutils-r1
-
-DESCRIPTION="Pandas DataFrame extraction from a wide range of Internet sources"
-HOMEPAGE="https://github.com/pydata/pandas-datareader"
-SRC_URI="https://github.com/pydata/pandas-datareader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-# Test suite depends on outbound network connectivity and is unstable
-# https://github.com/pydata/pandas-datareader/issues/586
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.19.2[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? ( dev-python/wrapt[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index d7e21232dca3..40a530af0755 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -5,11 +5,13 @@ DIST pandas-1.3.0.tar.gz 4721119 BLAKE2B f09eedd848686597a755da929683e841be61cce
 DIST pandas-1.3.1.tar.gz 4724471 BLAKE2B 3c645927d25ba5cfd8f2822f07752149cc4a33c0b3b32d1f45986397b877b338a5287170281231058c37e2930152a6bd5f3f50fddf32805f05de49150abd6dd6 SHA512 ec57d123038cd4018dbfbe2da2d10211d507cdbaa849f4752c5770d017c55cf1d2c4b29f7c86e480695205e95622b28cd75319338644302732eb4ac9efef6993
 DIST pandas-1.3.2.tar.gz 4727155 BLAKE2B 0d667a70a4f45d47677af9d9f18ef5bcaad7d52fe780fa0646fbdcedaf426ef6a3ea768886b85a4051419d5965fe316c6162d770297e5dc679234ad99d22908b SHA512 5ba8b7c7f048e13f2493235b941ada34f9416777405fae4040688f88d004564aa6c8eddfb0dc5a78e97e8370a0293a75ba63704fea4e25bc5b003a619016a9c1
 DIST pandas-1.3.3.tar.gz 4730758 BLAKE2B 0ef945b2181329265b93fbdb7f9c35497ef847508cc2166b6e2a12ad1a2faa3940d5c8f375754ec34db4e236934a1f903f1e58e6882c6de0018a16b38f50f136 SHA512 a3a871a9954c7249311b9904e588d85fba4d6aa07463308b08b789b93a1eb63e36dac1b0d4254a5379085c05c5633ef31b615d0c60963c796dd7a33d815a5534
+DIST pandas-1.3.4.tar.gz 4734599 BLAKE2B a71b5b57198defcf4f6d848f445c7112668994f089b62a6bce1028ab4ba8a9bf3adc3c393699332fb0c76818ed80164843114e68e57232c495cee03ec5e88009 SHA512 c821365b1f06d69c61b957c4768a5f86b39d97d74b0732ea0eaade9d21bca8f652e38f91f83adf2fc6488f227c75d4e5e64e8f131456e7f0a93ecfcf237190a6
 EBUILD pandas-1.2.3-r1.ebuild 6192 BLAKE2B a47bf5ef30d6ac5979d6282d35da80d590f8f7cd283d3febe123f9b34fc45ffaf3beb793dc809b783a76c96ae48c8fe03278f0f97dd20a1b819e5f8179cf1494 SHA512 d74a3264169c86036d381d31722c0dace729cc2b89bc530847cff44f29d5f03d2829083ba4f6f7f16f27f0672782b3c347b7a4274a24ef20a150aaeef2975430
 EBUILD pandas-1.2.4.ebuild 6149 BLAKE2B a0e8c74bf270a1c8d2a074aae53cfe231a10c4fa796e3dca1068e4378a05a2e1486b316c8c0caff597b89cca5425aaed1d93eb8660d6c6d380a60a8482c9a95c SHA512 1b909958d1ca99071baf29a40ccdcb76405ef5e32fba47bb160cef363d42c6a7b98d00271d1f69bb7383943910f01dedd4e8d889e5f9357a0b4d25541ae913fa
 EBUILD pandas-1.2.5.ebuild 6175 BLAKE2B d384feaf94326c3e5c48f73ee55a97e81ab008a703c12a9e14f5bbb2f63c0fe25d064037c82b67b10ce525b6950484c70faf979a78e79374b0a038fb88ea86c7 SHA512 829e0a5039902beefdc5cecef2cc883d8e61968ec3e2f79b709a0d020c8cec1d04fe788b168ccbf39085e0a1a0aaa450799f5b477de587caaf220b6ecf1906c3
 EBUILD pandas-1.3.0.ebuild 6406 BLAKE2B f0952945c6cb5cc702e3a220993c05ea22429505aa3559170a417d60e16e917c87e609192968b56831b843bbd7ebbdd7120d74b4ef07319bbc39a81277a8a8d2 SHA512 87fd5f381e512647b038d6de4c5af9317b844c069c502fbef5fd28f815df1aaaf263d7524413984d209c7521860ff30008d50423de7766438c77c814274eac80
 EBUILD pandas-1.3.1.ebuild 6405 BLAKE2B 023e70409effee1c72c78b0759f8282e9a6e1aeed40abce41bedf87a0818c7aa5d4142b615fe4ded77f5e32b3cd92e7ce6b535846eede53777a50ed5d8e6b80d SHA512 243dd3339e8bc5b223ff17c2ff7f9ba3caacab10bd2b825d038d9bd57296f6b3928b8457614bd3aff4929d54112cf88c52c4b1ca5b00e944941a607d75054dac
 EBUILD pandas-1.3.2.ebuild 6423 BLAKE2B 8b167992a2e5426d7311085e5ba1c30fcc2337feceefa1bc2a143adf72cc6927638265343737cd8153f7c19c3b92cc8ff3142e3b6d3219ae02ea3b8439ba930b SHA512 a75790eec03fc3b823dfc176ada1e08eb4b50d92c91d5ff3032e122003542705a254eb60c6a61051104077f344a718df5f67fb64b8f1c59fbaa9a0469faa459d
-EBUILD pandas-1.3.3.ebuild 6411 BLAKE2B ca12bc44db2191b206012770dd88cbae5ae012fae95a58912c8cf66c3c1f0b4a38a077e07aedf379bec085be66f0c2c874bfa22153e775a243f7baa8d4b1c16c SHA512 fd0940269b2debd7b0f95f1fae4217b9576eaf61765ad8f5b798e27182ed7c52ba84e2d1a1b409fb182de3ff479c0b9cf1b71ed28ca5a14c2d5042e99c6dbc0f
+EBUILD pandas-1.3.3.ebuild 6410 BLAKE2B d0d2d30cacc7d65efc43c470c4dcc7a68d076b613f92d3134d410cec6cc5b2d514348f54078988dbb2eb419e252ac4426edcf59316739cd430232da0aebced44 SHA512 7bae5e2c7e0ca99e4e67607cd8b50bbd634ce62ac22758f4d28872228f51c36e7bd6ff30e84cf2c91d27accecef228b806f66a2b9734454b753f335b951fe06d
+EBUILD pandas-1.3.4.ebuild 6411 BLAKE2B ca12bc44db2191b206012770dd88cbae5ae012fae95a58912c8cf66c3c1f0b4a38a077e07aedf379bec085be66f0c2c874bfa22153e775a243f7baa8d4b1c16c SHA512 fd0940269b2debd7b0f95f1fae4217b9576eaf61765ad8f5b798e27182ed7c52ba84e2d1a1b409fb182de3ff479c0b9cf1b71ed28ca5a14c2d5042e99c6dbc0f
 MISC metadata.xml 918 BLAKE2B 09b6ef472cbceaade61bfec8780ba3659838cd73f0a19b277d731db75655ac7e65d396f9fa74c19a2d5e03269c541dfe2af59296c048e77744f00bdb55295d4d SHA512 0b1fd089b0ce35a4e3408cd7224a249d427571a638961a8d63dee73b386d03b5a22e4ff085e2e548749f9fc03e9beb18317010d0b67f608dafe305bb4a87ddb2
diff --git a/dev-python/pandas/pandas-1.3.3.ebuild b/dev-python/pandas/pandas-1.3.3.ebuild
index 4c3b594f00c9..c4d003cc6c01 100644
--- a/dev-python/pandas/pandas-1.3.3.ebuild
+++ b/dev-python/pandas/pandas-1.3.3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pandas/pandas-1.3.4.ebuild b/dev-python/pandas/pandas-1.3.4.ebuild
new file mode 100644
index 000000000000..4c3b594f00c9
--- /dev/null
+++ b/dev-python/pandas/pandas-1.3.4.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 multiprocessing optfeature virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/"
+SRC_URI="
+	https://github.com/pandas-dev/pandas/releases/download/v${PV}/${P}.tar.gz"
+S="${WORKDIR}/${P/_/}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE="doc full-support minimal test X"
+RESTRICT="!test? ( test )"
+
+RECOMMENDED_DEPEND="
+	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.7.0[${PYTHON_USEDEP}]
+"
+
+# TODO: add pandas-gbq to the tree
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	|| (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| (
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+	)
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	>=dev-python/xarray-0.12.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/xlwt-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
+	X? (
+		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+COMMON_DEPEND="
+	>=dev-python/numpy-1.17.3[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1-r3[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2017.3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		app-text/pandoc
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)
+"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="${COMMON_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )
+"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# requires package installed
+	sed -e '/extra_compile_args =/s:"-Werror"::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile -j1
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
+	fi
+}
+
+python_test() {
+	local deselect=(
+		# test for rounding errors, fails if we have better precision
+		# e.g. on amd64 with FMA or on arm64
+		# https://github.com/pandas-dev/pandas/issues/38921
+		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
+
+		# weird issue, doesn't seem very important
+		'pandas/tests/base/test_misc.py::test_memory_usage[series-with-empty-index]'
+
+		# old psycopg2 API
+		pandas/tests/tools/test_to_datetime.py::TestToDatetime::test_to_datetime_tz_psycopg2
+
+		# Internet
+		pandas/tests/io/xml/test_xml.py::test_wrong_url
+
+		# TODO: some data path problems?
+		pandas/tests/io/test_fsspec.py::test_read_csv
+		pandas/tests/io/test_fsspec.py::test_markdown_options
+	)
+
+	local -x LC_ALL=C.UTF-8
+	pushd "${BUILD_DIR}"/lib > /dev/null || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. virtx epytest pandas --skip-slow --skip-network \
+		${deselect[@]/#/--deselect } -m "not single" \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
+		-exec rm -r {} + || die
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.0" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-1.3.0"
+	optfeature "miscellaneous statistical functions" dev-python/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/pandocfilters/Manifest b/dev-python/pandocfilters/Manifest
index f505e7ff0a3c..7477624cec71 100644
--- a/dev-python/pandocfilters/Manifest
+++ b/dev-python/pandocfilters/Manifest
@@ -1,5 +1,3 @@
-DIST pandocfilters-1.4.3.tar.gz 16586 BLAKE2B 975000f96475e8338a54d8a96793a8bcfbf62c5251897a01c185a6708ff7c47f2a1bee617e4e25d3854e7de1d078769bbd887527beb20ebb7e06f0c4da59126c SHA512 9c7ae1329c103ff2baae3488edfcbfaba183bc94146b29e413e7e83ba2ff2dee69823138bf213f5c81a8b0097c2d9329bd05620b10c646662a9617aae7a528a9
 DIST pandocfilters-1.5.0.tar.gz 8405 BLAKE2B 962da4f0e0d469f28f35eb181b10df317cb4130d796f62fe7ef27078d257e52a3554f93c64c303f617bbdd8b517868024686c8fd9f82b83a0ae6a923708c21a5 SHA512 32586d4718fd4b7047d850ca767ffacf8fba60844edf8469458e8549286e571774e7178678c7121be62b9a3c819a25de2d30b8fe58a539553336f322b87e836e
-EBUILD pandocfilters-1.4.3.ebuild 478 BLAKE2B cca94eef0dd5bef50bf7a90da9f7e6d6caaf079a180f98bc9e7954cb6a1ec3fac58e7976667d9d69b232a6c73d2aad175db725529d4bc58a401a6679fef63dbb SHA512 a019e1b89e9eae9587a47bd1d1c3b2decc73169cee8e65ddaf25c95efbedf695825aa6228c3027f3ff610abc8d592160b06f05a32aabac15f29ac259b4d65e0e
-EBUILD pandocfilters-1.5.0.ebuild 451 BLAKE2B 43431e403249e1dd58a348b090cc02e9a54dbf3292a10895206498f4798c9d0fefee2fae2534fcf0263d08e239b095e86f8b08d5486602ac2134c136d2f7b5a2 SHA512 f3181a4a039dce9cccf92121e8bc3ae0335c1eb8adf4fc94391c487add9530ef915a366d9e2dd8bf6a44377b71a1dcd5ee12d6915782306e9f2a79e759063e6f
+EBUILD pandocfilters-1.5.0.ebuild 449 BLAKE2B c9ef94615bef7cc634c51905d88fb9d79613417a2216ee03d7d8b11c07f85a665e86f73a0785171d5f3248cc33567b4f92c5df876af71c0b4e745578bed73b69 SHA512 bbd88c03371f7fbad269514e219243a74248a90b75d1c61f799f6d9deb655d3bbc4a9065c48eff36a384e9e184bc870a6a53e6aa30ad31e616ce4dd4fb8c817f
 MISC metadata.xml 531 BLAKE2B 769bc999250385f7fa2ed52c3e3641264a6dcb0b8aac82f2f3b4fcb8725699c64d6fb5c9aec69a7b04255469b8f50c0500ef746ed2d3ddff928cc304c6d6907c SHA512 6cbca8131719f4be0bca59673a9e269a16adf5cd49c997225a8a50ba75d2897e552c812e16702dd19ad3c0bfe2abffb286cb7a7c0b8d1f0d4b8d09b3598fd10f
diff --git a/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild
deleted file mode 100644
index 7f1a789f2202..000000000000
--- a/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utilities for writing pandoc filters in python"
-HOMEPAGE="https://github.com/jgm/pandocfilters"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild b/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild
index c97b368850c4..ae5de1bf748c 100644
--- a/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.5.0.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index c1169c3bb4b8..786a77854686 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,5 +1,7 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
-AUX paramiko-2.7.1-tests.patch 4618 BLAKE2B 9c1d055e24e360574fdcb63ef01a1669e380da42aa2ca72ba158159a1d618b447936a3c3f746625126a1bf8c945d8000bd09aabc5918d25b3840296b57bb5469 SHA512 6192dadd31c33ccf178cd813b726c5c2cc31a12ac7698377ede19d10b19b4e32b6e203ec2bbf26b486f58151f642c4d44095e9efeabad96e2751fa4631ee11c4
+AUX paramiko-2.7.1-tests.patch 4119 BLAKE2B 516417ae1b3ee7a5d189defaf37a397045ed0172948adf1a09534a697606a2ea1636e849d6d2989f29a287bc307a33530a7fb8135a57040da915047fba1f1d31 SHA512 ecd247dc00898c577b9b1cea0316b29c1be0c5e46865bf4f4508392fc2ca6e2d4c2a1938aa74f07dbe94bfbfa37f80129226ef1f1688a7449fc29ca99264c829
 DIST paramiko-2.7.2.tar.gz 331678 BLAKE2B ff96dfd7b114255c15282f4f73e1f9425ccf77106426ccf3ad3f833b56bd5abfde867cf2d322448dc7b3777af6ab080b4e37ff8871ce17f0db17634b7f101747 SHA512 c9bc569428a0a61814cb73941356de5bae7fea7891ba4fd3f5c00ff1ee5083454bfde7e969fb4aaf5254b909f7f0132f590d67803eda8a67503e5c02ec2bf01a
+DIST paramiko-2.8.0.tar.gz 332217 BLAKE2B fcd691159b0306204064806881f8a42e7310fe23daf22c5de5ce8124d1496d48606247ab03c7657ff01560f801121a35011e0e615c5e142c41d191568f5b2300 SHA512 15f6e1cab9afdf3285804ce09b3af6c20ffc1f8e50d2549272f0ea545d1fdc858e72c7cba085db85c69aad2033655ae2f025e8ed2bd0dff574bcc03156bdb6ed
 EBUILD paramiko-2.7.2.ebuild 1327 BLAKE2B 276a67ef8fa8ada0eb300b15a86bff7300d8a7d6951a10931023da0f6d11445cff81a628cb358f1b04e7ea9eb3a81c59b485bb273df36af943aa099a182c1106 SHA512 cc06e1a2451fdd81b124974c81f92d838f790fda7607246473eb5bfa22e91c03a341eb1f8f3d84f37364cf9da5bcf7223db2ccda4586d29b2b54c06709b4c0f3
+EBUILD paramiko-2.8.0.ebuild 1334 BLAKE2B a388214c9ff9205a5a7d7cdda653c94d9478a93bcd24b76d1b9c160b4b0e5e6d56ae23dd9e54081a73dfc5484857a81711bc0cf618c325b15425390845034922 SHA512 88ec091f633907ad7f4575e1199d34cf81cc903e44481cd73ef6101d23d03378dc3a9eed21f6b22b6c427d2badda8b4ba9385ea89f1a16d495c96d3f41fa02ce
 MISC metadata.xml 1332 BLAKE2B 2254eb59425633af43d092c6cc5ff99de6da52918692f6c23c31627587c956fa4b2cd2117ad899a423d93bb1d321581891f3380301a6b44a498978aa9a710094 SHA512 dcbd15823763fd67164a4d77995a7aa16486cbbd747276991cc805a9e6fa28752c273d373a85b3f52eab10f809cf9af60a3afc1ed7bf1ac3121eebeb071e3e23
diff --git a/dev-python/paramiko/files/paramiko-2.7.1-tests.patch b/dev-python/paramiko/files/paramiko-2.7.1-tests.patch
index 5791afd044ad..a25b7c24ef27 100644
--- a/dev-python/paramiko/files/paramiko-2.7.1-tests.patch
+++ b/dev-python/paramiko/files/paramiko-2.7.1-tests.patch
@@ -27,20 +27,6 @@ index f4f84748..b1b0cdf5 100644
  # pytest-xdist for test dir watching and the inv guard task
  pytest-xdist==1.28.0
  mock==2.0.0
-diff --git a/setup.cfg b/setup.cfg
-index 44d029c4..99159096 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -17,9 +17,6 @@ ignore = E124,E125,E128,E261,E301,E302,E303,E402,E721,W503,E203,E722
- max-line-length = 79
- 
- [tool:pytest]
--# We use pytest-relaxed just for its utils at the moment, so disable it at the
--# plugin level until we adapt test organization to really use it.
--addopts = -p no:relaxed
- # Loop on failure
- looponfailroots = tests paramiko
- # Ignore some warnings we cannot easily handle.
 diff --git a/tests/test_client.py b/tests/test_client.py
 index 60ad310c..88fd1d53 100644
 --- a/tests/test_client.py
diff --git a/dev-python/paramiko/paramiko-2.8.0.ebuild b/dev-python/paramiko/paramiko-2.8.0.ebuild
new file mode 100644
index 000000000000..85abef978302
--- /dev/null
+++ b/dev-python/paramiko/paramiko-2.8.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
+# pypi tarballs are missing test data
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+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"
+IUSE="examples server"
+
+RDEPEND="
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx sites/docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.7.1-tests.patch"
+
+	if ! use server; then
+		eapply "${FILESDIR}/${PN}-2.4.2-disable-server.patch"
+	fi
+
+	eapply_user
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r demos/*
+	fi
+}
diff --git a/dev-python/parse/Manifest b/dev-python/parse/Manifest
new file mode 100644
index 000000000000..8bfbe1d4f6a7
--- /dev/null
+++ b/dev-python/parse/Manifest
@@ -0,0 +1,3 @@
+DIST parse-1.19.0.tar.gz 30884 BLAKE2B 97f0d1fb7f1d2d826f20df592a61bc94e65ea583ba651d4ddf18b3ffb21d977444c2a3a0e75ba9138d2bae48668456d1ac56d50d05d4b8ed7721733f3bda59f2 SHA512 25e183949a78213e699c319f5dcf1b2664ea6cfcfae4b9eb8dcaf1825e55dcb2ce2032f9eb630e962acf2d94588d4f4b8cf340af1075cbab5ab44aed5377ef6f
+EBUILD parse-1.19.0.ebuild 430 BLAKE2B a7f5806ee738d29eb24eb4bc5051a6e05f53e84e23f9071c4dd8930ca9adb839dbe317b8af42d8857b3d2d9d2dd55626af3f46e975f8925dd79a4c1e4f3e0178 SHA512 62be0ef985a56e41a7832f7a224ad48ba928e933f696d82a344a7c078cd008aad8ed128e0c922ffd208fc099f1add7233304f51ffdd0f1710845c7c45aaf0769
+MISC metadata.xml 396 BLAKE2B 42ba6e57fc13212435a73e964b285263bcf59113036917323c9d1f8f9b7a6c2154026023f8f5e5860ea883756f0faf374330eab21492f023aacfcef2e0e59a78 SHA512 b3c05ef4031f719e4349f165a9457d1fefb6bcd39167e99d1ccbe2a7c72b14b1541c16f4cdd334f670fe46c8c5a88ff875e8f57d33cdb6b85cab0fc7fae6b750
diff --git a/dev-python/parse/metadata.xml b/dev-python/parse/metadata.xml
new file mode 100644
index 000000000000..e051d26e9c5b
--- /dev/null
+++ b/dev-python/parse/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">r1chardj0n3s/parse</remote-id>
+		<remote-id type="pypi">parse</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/parse/parse-1.19.0.ebuild b/dev-python/parse/parse-1.19.0.ebuild
new file mode 100644
index 000000000000..d4d0b0e1009b
--- /dev/null
+++ b/dev-python/parse/parse-1.19.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Parse strings using a specification based on the Python format() syntax"
+HOMEPAGE="https://pypi.org/project/parse/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/parse_type/Manifest b/dev-python/parse_type/Manifest
new file mode 100644
index 000000000000..e2e377e8f489
--- /dev/null
+++ b/dev-python/parse_type/Manifest
@@ -0,0 +1,4 @@
+AUX parse_type-0.5.2-setupwarn.patch 330 BLAKE2B cb8063fd700ec1e7138f216b4ca310e08e8444bfb4066920dd3eebe6fc49c34b0ff8de6c2b437c7dfe596b808cf046b78ec88c22e46e782634c8e8bd491e8ea1 SHA512 60c4b9b9dc5e0074cdb0a773a3b64c66f13c24db8ecbcd0501e2b8263bd6d9d1ffc48db56b8a75b254a8e18846d9b98e355e507b55766553b076cb180fe2fff6
+DIST parse_type-0.5.2.tar.gz 272082 BLAKE2B b9d8000e0892e083235a309873b3418df6a9b90dd50f778f36285b65e07768cd52dffa338d908621dbaac75b8bade0febb086be347c92b193d81a6adda124c92 SHA512 c3f586bee000e09ce1c115bd24679ee59d60b51319ee37233e0cdc358db6b30af3700f95f3e2172b3e64b02ede23aea3d3bb0aeab366e9b9fa6249459daf7e06
+EBUILD parse_type-0.5.2.ebuild 647 BLAKE2B 1fbc33b40e9c90b4eec69fc9835ccac0464d7d0a44ca22e438537bd715810dbd3388adee18d2695468b485fe2599bc1a5a519458e9a22393562a2abb3cdf12bd SHA512 da238da55d3338cf75531a3f358af3ce26bb6f65093d4933cf1410169109649eaa857f7cb327806e9f99d110eaeb4a4dda43232e7e19a2acd0a91a691ce53e90
+MISC metadata.xml 401 BLAKE2B 38e88a68d1271796b0e160ca4266b0d35c135aebb3ae4c88ea609ebfc2407a2b8cd7332bcb4adc0ffb2188259d4bd41eaf22d53d0eaf1947078fcb253835e6de SHA512 ead81a56944702a5b717e6c1b909cc81ecc68194a08586a52ef5b46b533dd34ecdce1f8da098f6967e705c74cceb92c026b717f96056ac35f70134c8e1e5bfa3
diff --git a/dev-python/parse_type/files/parse_type-0.5.2-setupwarn.patch b/dev-python/parse_type/files/parse_type-0.5.2-setupwarn.patch
new file mode 100644
index 000000000000..4ac96951cfad
--- /dev/null
+++ b/dev-python/parse_type/files/parse_type-0.5.2-setupwarn.patch
@@ -0,0 +1,19 @@
+2to3: https://github.com/jenisys/parse_type/issues/17
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -12,5 +12,5 @@
+ 
+ [upload_docs]
+-upload-dir = build/docs/html
++upload_dir = build/docs/html
+ 
+ [bdist_wheel]
+--- a/setup.py
++++ b/setup.py
+@@ -40,6 +40,4 @@
+ )
+ 
+-if python_version >= 3.0:
+-    extra["use_2to3"] = True
+ 
+ # -- NICE-TO-HAVE:
diff --git a/dev-python/parse_type/metadata.xml b/dev-python/parse_type/metadata.xml
new file mode 100644
index 000000000000..ccc39e8d1dad
--- /dev/null
+++ b/dev-python/parse_type/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">jenisys/parse_type</remote-id>
+		<remote-id type="pypi">parse-type</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/parse_type/parse_type-0.5.2.ebuild b/dev-python/parse_type/parse_type-0.5.2.ebuild
new file mode 100644
index 000000000000..91706f726e18
--- /dev/null
+++ b/dev-python/parse_type/parse_type-0.5.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Extension to the parse module"
+HOMEPAGE="https://pypi.org/project/parse-type/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/parse[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-setupwarn.patch
+)
+
+DOCS=( CHANGES.txt README.rst )
+
+python_compile() {
+	2to3 -nw --no-diffs ${PN} tests || die
+
+	distutils-r1_python_compile
+}
diff --git a/dev-python/pdoc3/Manifest b/dev-python/pdoc3/Manifest
index 045e77764c24..9961100d1d03 100644
--- a/dev-python/pdoc3/Manifest
+++ b/dev-python/pdoc3/Manifest
@@ -1,5 +1,3 @@
 DIST pdoc3-0.10.0.tar.gz 86133 BLAKE2B 3bada6fb1b048c4eff7556108c29d7f92ee988332d160c4ff765c47bf0cf7a461ed90f93e7be25a7a3251f5d3e70492d23be7230a5ec4abb12612b7e0dd4b5b6 SHA512 646ffb9bceb4456a1ab36c840eb384858aab430443905bc71e62e9c71112a769b69e22cbd18a9d75b7968e2336cbbaa9072103f96dc2d0829ccc7515b057ca85
-DIST pdoc3-0.9.2.tar.gz 84803 BLAKE2B 5ff52a630722b9504d1de83bb236aaaafde95417ac163b79b3585156484a12b71a16de55d00ab7377b9e44eec7902384f1f648a514b8e7392da6f5e79f6f229f SHA512 653231a124239ec189dc5aa4dec59245c6d20e4ff6ca9cb7fa468410b712b766288f4c59f8c0d0b8c1a4190ce84603455ec0ad7c7b1e0dc4f28cd279bb69685f
 EBUILD pdoc3-0.10.0.ebuild 667 BLAKE2B 5b215350bc62d43e2139447af84a9c08e24967abefbb3fac750b52d874d74ed8c78c1e0467f6811dccaab786787d7d8ce4852a7ed06eafe56157a0e83360afb5 SHA512 aae4137c4cf52029631487a0ea7edfd12fbdfaff13a9f797b1dbde8dddb6ad652356cbafc148e9e5deacaa203fbce68610ca43152cdd9994e97cb753269c9f1f
-EBUILD pdoc3-0.9.2.ebuild 706 BLAKE2B 9586d00e4e29f506cb2839c38a63d54ea6ee9ae344ed4e8dcc2f56662aaaba74a4909bf53b02a4a33c8a80d30d541f0b56ea57a49d483b3308dad5affccab4f1 SHA512 f23fe27b116b3a240b489ec93539b626b644665a97d9671829788b3db9a5de4a6d78bfa0ff6d58a0c4b396b7f9fa224edcaecd6a6d35c66a987d84c99aa4241f
 MISC metadata.xml 365 BLAKE2B 3339f5c2a1488984619c510a3f5bd81ca80ee26fb27fc01e0612632a43e57d1a69be9c4dc509d6a88e3f73cad88bbef3230020eeed1d20f1ec8d2010a335a6a9 SHA512 1614ffd6e83e036b288bcce03d2926429d0b5d41c1b7385053de1bcf5656bb6e03878b5c826f474cf4209f9036c533839ee6bce20780dbe626761ee0c295bf48
diff --git a/dev-python/pdoc3/pdoc3-0.9.2.ebuild b/dev-python/pdoc3/pdoc3-0.9.2.ebuild
deleted file mode 100644
index 1e67b6da6769..000000000000
--- a/dev-python/pdoc3/pdoc3-0.9.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Auto-generate API documentation for Python projects"
-HOMEPAGE="https://pdoc3.github.io/pdoc/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="AGPL-3+"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/wheel[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e "/setuptools_git/d" \
-		-e "/setuptools_scm/d" \
-		setup.py || die
-}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 2d140db99140..bbbf563724c1 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,9 @@
 DIST phonenumbers-8.12.31.tar.gz 2258495 BLAKE2B 7b08961cf50382857b5bdbeef640091967e3c14f3949c8975028fef4192c7776a2f7619c6fbe177f4b46de44de9103cc62ddd949f5e1c882f742ab2a80619cb9 SHA512 28b608a81a452638e25eaa1311e42384725c55cb8f438e9ab54006b8b8cebd0ae848449f1ab6758884113b3cecae21729c3b4d8e1bbab1120df0d82c9ebe7f04
 DIST phonenumbers-8.12.33.tar.gz 2268271 BLAKE2B bbf84efe22806357f03f647952a66d58538975a932b290ca8d3f83996868a2320aa0d18b0094167f6e38514cde800163eb2240c89e7a244c3b1596743b20b39f SHA512 d156a501c1950ecd98eaa0515dfa8c8d38ad470344461ea3dd1f579091a60472b5998e98b3d7ba5b02db45bee94b1ee8db7543464677f5d79b36469717997f6e
 DIST phonenumbers-8.12.34.tar.gz 2268424 BLAKE2B c7094d0bdd11ee6d797314efc7d3353acf2711e6f7ac1c2861b611e98b7b7183af14ac8f0252772ccbd50f6b6e135143429cbe6191de85f3900e336ec1534a09 SHA512 9a751ce7748bb5fa19c3b25697599c07e169a136f10eb149e839f97bcb803f6ea79213152b4cc900ad288227b576f1ccaca443a97b06d7c12651cc9134771026
+DIST phonenumbers-8.12.35.tar.gz 2268389 BLAKE2B cd1a8613e8948d2abc1ae74d1be989330623fa6f8d22f0c529a88f0ddf20e70af3ca27300610c75783b71d675f5fd999b5c43bd6306d12f1576a520bbb9d0c65 SHA512 8c8599cafeca26d56ab488da8d9c7f959921527777188b3a9432ce3f47dded2df41fba34968a8c2a1a6dc816097bac8f25c060653d96c0904c2b83185d29fbae
 EBUILD phonenumbers-8.12.31.ebuild 433 BLAKE2B 6a56df6866a0b13825486b809d85c17df719b98a4d265244f45f116dc28770aca60723352c9260595a86e1584803232f22d73e1dc7f01e02fc745a4079ed66fb SHA512 494f26ab2d60d03308289f6fca26d54d2d1f08f3ec00647cbe0db0bc2e1be56a68c8606767db712a1124901cf2f8acf2279a898f4ab1cf6e7db1191cfae81eae
 EBUILD phonenumbers-8.12.33.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
 EBUILD phonenumbers-8.12.34.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
+EBUILD phonenumbers-8.12.35.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.35.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.35.ebuild
new file mode 100644
index 000000000000..4df0c54c7011
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.35.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/picklemagic/Manifest b/dev-python/picklemagic/Manifest
index 27af57a0a507..75b0750413a8 100644
--- a/dev-python/picklemagic/Manifest
+++ b/dev-python/picklemagic/Manifest
@@ -1,3 +1,3 @@
 DIST picklemagic-0.0_pre20160415.tar.xz 23364 BLAKE2B 07104393d41c68fabb26d642b6a78b5b5506322edc1322f6a0957c485c2681aafb388488b4d65d920102fb56839ebdeb82cbde909dae3d982311a3d776ca8aca SHA512 0b0866895df5f5f49462d75ad6a435f93796c60eae2442350ea0768872cc1938406b68f5ecb54e1583c245c6ac6d4feada32469184e24186adf78d002adfcd76
-EBUILD picklemagic-0.0_pre20160415.ebuild 683 BLAKE2B 95f150504d2841df56119a30658272d02808530c481ee03ec96fedf7bc42068fb198473a1049af7fcceb7ebf73f98d99f59499a9a710cabcc7dd7845e45876b3 SHA512 379e6c47a74c516d5a8ec183daebd6c114f8567bab94bfac257e5af3dc1e4eec3629b4ca43e3d78289391e353d144f54a2631b287da933088320a137830ef4d4
+EBUILD picklemagic-0.0_pre20160415.ebuild 667 BLAKE2B 182514f965a21eda444b069e743ca678e17d843cb8cb1e57d3f43bfb03a15c4067aed78b96155ce73c476491f8ed18ba16b7cb726de96a6e627adfbe12930f13 SHA512 66d85ffa601ad1c1871b95dc78ad93717dcd28d11c519953233fc6efeda875b8677fbbfef1e9513366b7fd5e81b2a3336bea4b1845191886989c610d58d7b51e
 MISC metadata.xml 1090 BLAKE2B 1f40f412683b97396e9ff6257d33a9f754b3a3e5e03c409c1f3a6a7640d6fd9bf2688ef6e79603023dfbc283a439ac3a5f4e201a36c9692171e0a58ae60fbfae SHA512 474903af747e9b60d4b5440190045c4a0f0fe54bc8436c40c9c4b2186025d246c173ca6bfe80cc966f5e843d469fea852251d142266661490d6a0f6b8dd84a1c
diff --git a/dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild b/dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
index 4b64bc163b46..604ec09e47d1 100644
--- a/dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
+++ b/dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-r1
 
-SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
 DESCRIPTION="A library for analysing python pickles safely"
 HOMEPAGE="https://github.com/CensoredUsername/picklemagic"
+SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
+
 LICENSE="WTFPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="doc? ( dev-python/sphinx )"
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="${PYTHON_DEPS}"
 
 src_compile() {
 	use doc && emake -C doc html
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index c532f7355ce8..369e61bcf031 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,7 +1,9 @@
 DIST pikepdf-2.16.1.tar.gz 2312177 BLAKE2B a7695ecc71621c1e64ab919e76dabd3a94ff16d401861fe50f29f00832dda8be01f3e67c811756ef89573345b49ec6c880635309f859624b9df42cf6eff7b43b SHA512 d2c73a0a69c6cf0ed22dc2dc949187464abd4194a5d917e5681de033d6a8ce4c089efd49eb110c9fa11f9dead292aa6ab7ed71a01f7cbaadc51d1f37a773c936
 DIST pikepdf-3.1.0.tar.gz 2334496 BLAKE2B f92385a9317e88b00586f6900b4ef2a296e6960e8a587d2b6bf7f12e5354d9de48b537cb5cdd220187860c852e0ee538d533902311d70c7d44e6fe700fc10ca8 SHA512 c3ef18f287ba873d6e35114137228028a81af8ba4d59ffe5c486716b298757fe6f5b5d3d67dcc4230ed10543849a8d6370e43d99527d7cfd1decd4a84b59781f
 DIST pikepdf-3.1.1.tar.gz 2334617 BLAKE2B 2f223b8104df0dae31c09e660d1123c2384daf0d6990f537378773eab260248d5b547ce1bae3583f711e69aa54f370e97a62f0167d89386c965ea21c9f0ce89e SHA512 8a5c0fe92c06ff09fd2a7b08ae94f9f608a71c517482e0457c07b1300c65fe5ba57dd5aec3b60fd9ebaee100591198afdba493e5e53bd5655b4b8dee11475106
+DIST pikepdf-3.2.0.tar.gz 2335339 BLAKE2B 3d294c2c8241bfcfa2b84f4c6af10e4da2e624374af0aed9c4fa597f9d0a789b9d85cb074d945ba521dbdd10f126326bb6d698a97102a93e6de589d89d7fee57 SHA512 307e2289811697b65c021e90496a4d1606e171e557bf5f19e5327be782e59e8683847524eb177ced54612d1e586b070860119a51e74fe25003787b359bf74531
 EBUILD pikepdf-2.16.1.ebuild 1540 BLAKE2B fd8b5c1985b0971583ce83b0400719c33fa87cb7a9d3e3d3321a4c07baddfb681d406ddd579ee17d3ea41fce780d4d291c0977c006ab98fd7b0ab8ea1aad52e7 SHA512 8f9c2b0c5cec84cfd95c331d19d8fc43df526aa37e7e8d4ecb8bf85d91707d66089b3c05428e627b61685bac85426c3c768bd2956e3f69f08bc3f523c5cf5881
 EBUILD pikepdf-3.1.0.ebuild 1535 BLAKE2B 6488385b4ce207e357e2560c74da0c512b94ac51e27e8330e3055cff35bf4410670d36a662d57b92d03a0ce76aa4d3d4c07bef6dd574a39c73d572364ab819b7 SHA512 4298c90140457bd82c79ce40ffd0b306363665b44faa69059545c5e333bd3883e21339dddf33e075e4ce41d02e88f3660bb1c01b8daf2623952d358220ed9c73
 EBUILD pikepdf-3.1.1.ebuild 1535 BLAKE2B 6488385b4ce207e357e2560c74da0c512b94ac51e27e8330e3055cff35bf4410670d36a662d57b92d03a0ce76aa4d3d4c07bef6dd574a39c73d572364ab819b7 SHA512 4298c90140457bd82c79ce40ffd0b306363665b44faa69059545c5e333bd3883e21339dddf33e075e4ce41d02e88f3660bb1c01b8daf2623952d358220ed9c73
+EBUILD pikepdf-3.2.0.ebuild 1535 BLAKE2B 6488385b4ce207e357e2560c74da0c512b94ac51e27e8330e3055cff35bf4410670d36a662d57b92d03a0ce76aa4d3d4c07bef6dd574a39c73d572364ab819b7 SHA512 4298c90140457bd82c79ce40ffd0b306363665b44faa69059545c5e333bd3883e21339dddf33e075e4ce41d02e88f3660bb1c01b8daf2623952d358220ed9c73
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-3.2.0.ebuild b/dev-python/pikepdf/pikepdf-3.2.0.ebuild
new file mode 100644
index 000000000000..80dd3fd26a41
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-3.2.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=app-text/qpdf-10.3.1:0="
+RDEPEND="${DEPEND}
+	>=dev-python/pillow-7[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.7.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/-n auto/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 8c79d64cf14c..39ef56d5c0a9 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -2,8 +2,10 @@ DIST pillow-8.2.0.tar.gz 47898485 BLAKE2B bd8421a101e0be080f2fab238c3c26a4e1e722
 DIST pillow-8.3.0.tar.gz 48543291 BLAKE2B f74f2576e3f906db3c96f0854dcc3d7d5d0248b1e35d32da5f88e41751068012e64fed134f34263e2b244263f655fb2602d00d8d191c04573a93164a2fcc7c22 SHA512 ad0f9c50d1dbaaef56fdc43d6b4fa0960453bb0bf60bcafcc33bdbd8e5b4d698e4690baf1ec6be56651153fdbf5af520e9bbd8367a75fe36a995baac47069b4d
 DIST pillow-8.3.1.tar.gz 48722889 BLAKE2B 4483c3cebda33e57f665a7a73b5898b4f0fb5be895ec05feeb266a99f33c78fd1b550d82225c201ea015d267206f5b47909b4963da9f17d51d0e5bd897332a77 SHA512 22a85a5510c8ec13928af571ec7f329f4728c46ebaadfe338d837f6d3718eedb57b7548fd9a3260a3bb0c0f97b3f3c911e730af01f90ca70c967d44b1e5d3606
 DIST pillow-8.3.2.tar.gz 48783084 BLAKE2B c63930df3af0270bb092841b3c39a1ea75343ee743f9e4b083a2f6f621ad1e58c7c04c5d6cf4b648fbef2d79d7b5258e27d220cd32dbfff592b5ca70d1f28d64 SHA512 668e97abcd36e42dafa433e8814a0106fe742ab093b12748c13dd9f3f872d18f8b9d44c1a8d4115aa87969a98b53c36ae4783cc3804e2d9a1249eef300555c88
+DIST pillow-8.4.0.tar.gz 49364586 BLAKE2B f6a0fbafc0869c952bf88ad96146f27cf70c5680f372763bc9989cc49515bc74886a9d7648114797880ca06defc79e2e50d7ecf36bfa7adbd969450615ac0bd1 SHA512 d395f69ccb37c52a3b6f45836700ffbc3173afae31848cc61d7b47db88ca1594541023beb9a14fd9067aca664e182c7d6e3300ab3e3095c31afe8dcbc6e08233
 EBUILD pillow-8.2.0.ebuild 2623 BLAKE2B 6307e4b40a8df642422c2d10cd4bc7cfa2235e5991e157497a170a1fd2743abc8229ea50d028de3d3e7580610b0242116735854d52bee7548d928f9e924c9ed1 SHA512 d5dd4f530275e37804cc072a1f2de58277cd10a9ae5a5abf4bd59ea560af846cd9b072e1f5fdbc6735ed86e55ce1ac776e5e0ec5c6371ee7099d7477dc342b14
-EBUILD pillow-8.3.0.ebuild 2626 BLAKE2B f30f0079e2d884bb8b8d450d085037feed17d03ce1f481fc3d58d39e05535dfed6134ce2bd13093f139e0d15b044c7e250cb1f0019c99ead4c5dd1e186fdcdcd SHA512 7b7c6c37719d3e09f80f3f5e434cbaceae64b6dd1321a79f884dbfb31fc9978f85ebf06064e305b6ae674f7c9cd22637b6a39c0d70b84e21c8fb1dae1d699fbb
-EBUILD pillow-8.3.1.ebuild 2626 BLAKE2B f30f0079e2d884bb8b8d450d085037feed17d03ce1f481fc3d58d39e05535dfed6134ce2bd13093f139e0d15b044c7e250cb1f0019c99ead4c5dd1e186fdcdcd SHA512 7b7c6c37719d3e09f80f3f5e434cbaceae64b6dd1321a79f884dbfb31fc9978f85ebf06064e305b6ae674f7c9cd22637b6a39c0d70b84e21c8fb1dae1d699fbb
+EBUILD pillow-8.3.0.ebuild 2634 BLAKE2B d5fc3cd4e065cdbd7cdca40b7f5a2eb20883d614de50e160a047bf500518c2c596f82d177b721c0747516cdc08f2b20c175bc139acfba2fe05a190a7e64c6193 SHA512 9412b5fec8af9e6b4c64f935d572d4fa204ec694f2d696b375b840d6ec64c5278f289f5b783f2b5822d1811ad575f47fdb59368fef2aa72b749c833b2c2e3eba
+EBUILD pillow-8.3.1.ebuild 2635 BLAKE2B 23071fd12354330e51878d1f4a98f666b436e3014d471aa2f83cef33cc3ea9d9e4d461d3d45fdb64407a021c46a0851501bb4b8894527e0b166d8374603c877f SHA512 94daecc18a17caa3b2175474a80c4f2b5222d5a2dca459edeafbb99fdc5faef6512b744343b41d313925ee81314c88aa9c619c18ac386e446baccb1a9bea5382
 EBUILD pillow-8.3.2.ebuild 2632 BLAKE2B 2f056c2150720870dbb29f91e928548c8b86629b65836a3f42061429901d379484f1c2d253a892f4096ad483f149f08acbed82ea921634b694ac46a0258df030 SHA512 dd1370ee8d86ceab15ef2393ef32bb0197a1b9a7392b0d43d94e43ccc17c3fe3771b99321c6176fc60edfbeaefaefe1ba8a5e0e68aed0e3790baa4a872e69414
+EBUILD pillow-8.4.0.ebuild 2638 BLAKE2B 106cf436feb09ffddb58fa1afe8b5432e27901b1f8330791b6ab1babd146f376fd6174b756b22c1a9acd08948ed98d27775f7f02f6ad54c9570978975e8239c6 SHA512 c686e01e7df3fafd5b2ff1662c36d4d4598555651319f716bf1a47f8a52fea29a41cfb900cbda38a1404d61f0ab15c1814cbb364b713d0a3e637e8acd2524545
 MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582
diff --git a/dev-python/pillow/pillow-8.3.0.ebuild b/dev-python/pillow/pillow-8.3.0.ebuild
index 2d3f81c0ab9c..75155d5ba118 100644
--- a/dev-python/pillow/pillow-8.3.0.ebuild
+++ b/dev-python/pillow/pillow-8.3.0.ebuild
@@ -18,9 +18,9 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k tiff )"
+REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
diff --git a/dev-python/pillow/pillow-8.3.1.ebuild b/dev-python/pillow/pillow-8.3.1.ebuild
index 2d3f81c0ab9c..b3b3ee316bb4 100644
--- a/dev-python/pillow/pillow-8.3.1.ebuild
+++ b/dev-python/pillow/pillow-8.3.1.ebuild
@@ -20,7 +20,7 @@ LICENSE="HPND"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k tiff )"
+REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
diff --git a/dev-python/pillow/pillow-8.4.0.ebuild b/dev-python/pillow/pillow-8.4.0.ebuild
new file mode 100644
index 000000000000..a8d72ba3d142
--- /dev/null
+++ b/dev-python/pillow/pillow-8.4.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	xcb? ( x11-libs/libxcb )
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${DEPEND}
+	dev-python/olefile[${PYTHON_USEDEP}]"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		|| (
+			media-gfx/imagemagick[png]
+			media-gfx/graphicsmagick[png]
+		)
+	)
+"
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	DISTUTILS_ARGS=(
+		build_ext
+		--disable-platform-guessing
+		$(use_enable truetype freetype)
+		$(use_enable jpeg)
+		$(use_enable jpeg2k jpeg2000)
+		$(use_enable lcms)
+		$(use_enable tiff)
+		$(use_enable imagequant)
+		$(use_enable webp)
+		$(use_enable webp webpmux)
+		$(use_enable xcb)
+		$(use_enable zlib)
+	)
+
+	# setup.py sucks at adding the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but this setup.py does stupid things.
+	export \
+		INCLUDE=${ESYSROOT}/usr/include \
+		LIB=${ESYSROOT}/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	virtx epytest -p no:relaxed
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 88bb74af8a27..8dcf2c599b06 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,8 +1,5 @@
 AUX pipenv-2021-5-29-r2-remove-attr-vendor-import.patch 3064 BLAKE2B a292df872da96e643545dc3c0b8c27d40466f6b4fb76d0c19316021e103ab6ee3b4e18861f286fee96a004e4f8c1fb3889bd7285f790d31b7f81e49579ab13f1 SHA512 4301b2302648dea77809c3afda896f0f38e4fcde503a9810f8c1706e35b553bee8fc3bc803ff958b0afb0cde0b764854647416efadccab3541f284f3efde15ab
 AUX pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch 506 BLAKE2B 30447546cbf87a99d7914340708ef7cb8c60247957f0ee41b2cead21a476e7b9a8238661376d39fc60569478571b365f19c27b489511f744f8387f24f51319fc SHA512 57eee158b006f44a8676bc870f940a1b98a95eee2c50c1ce127d99add129b8bc02a2e4cd98f49912629c376c9119b3234d8bf418b19452ae9c8c4080f4d53682
-DIST pipenv-2020.11.15.tar.gz 11603983 BLAKE2B 552c35c942f9ece0f52419b6090b87c7dce0c49dd9dc12f8c5b3eb311058fc770ec9e2b141e960d357064c66c6de7cd0892d2dd19868e5cdaee0f302f98fb0ff SHA512 d312059b3fefc97d4cd79bf2b75d6bde1d117d92c0a299c30181a60ebea662a6c3dff0ca7b92c610dd8eb0c873509dd23c9a891761d0d47d0bba2cab738c830d
 DIST pipenv-2021.5.29.tar.gz 11607230 BLAKE2B 8eef8e79fbdfaf85a949437d06d9f8b48f7eaa6e4769f6d4ed90b01c0ebf70c282fc90581cce5ffcab0aeb6bc9ad770a8b4425f355a06e0fc4cd56fb221386e2 SHA512 4fa018c13d4babe856bf5671cf5d18a95f4af4b6d4fc64c4919825fe04004ed3d8979ca335b851c6e24dad081475f6fb5b925eeff58c6fb5cffc450b967ed1cd
-EBUILD pipenv-2020.11.15.ebuild 1428 BLAKE2B 154c51236e9875df17d635f17093473227102e830fcf639c0b92577cf36f973525b9251841ea02a3bbafade091673aeefd3a964ba26372a1c95b1ae2cf79c06f SHA512 e71bef8c4f72f4f6e2d35c5d2c59d7a8eed220d5718f9e31d94a8e3608b6e55dbcb42af2d63c5375cdcafba22ba55f7cfc6cf51e83820a7e71c7dda1f216ba7a
 EBUILD pipenv-2021.5.29-r2.ebuild 1680 BLAKE2B d510881c66e8b17e057b1cec72721f603e36c95ed63599ced8456db1aa9b425869aaec34f827b8db1573e00f0c4aca168010749883c7605e034af3a6f4ad70cc SHA512 e65004e4a88165179b4c48acd59c2f4870dbd79809b7d31d82e23e62d0c498e0cf51a9fcc770872a21b1521ce3c2345d7d8163de97e57ce096b3816444c61aab
-EBUILD pipenv-2021.5.29.ebuild 1428 BLAKE2B 154c51236e9875df17d635f17093473227102e830fcf639c0b92577cf36f973525b9251841ea02a3bbafade091673aeefd3a964ba26372a1c95b1ae2cf79c06f SHA512 e71bef8c4f72f4f6e2d35c5d2c59d7a8eed220d5718f9e31d94a8e3608b6e55dbcb42af2d63c5375cdcafba22ba55f7cfc6cf51e83820a7e71c7dda1f216ba7a
 MISC metadata.xml 643 BLAKE2B ff3557d9ae32b553c85455436683e2ca94bc16c6ec7c6d2ceb1113a69dc841b9ac2f0e4b96eec4c6c84ca899ad6a99b0747d7bf3f9289110a8bbdfb80f2cb2eb SHA512 7a611950572c2d700fb1680e0aa307069d80d992528144da781eca9f1fee729defa6f8b28382ddd8f66e58c5f68de9a17815989a4a39473bbf830a7be42ea282
diff --git a/dev-python/pipenv/pipenv-2020.11.15.ebuild b/dev-python/pipenv/pipenv-2020.11.15.ebuild
deleted file mode 100644
index 9028b19d5c26..000000000000
--- a/dev-python/pipenv/pipenv-2020.11.15.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	# remove vendored version of PyYAML that is backported to Python2
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${S}/${PN}/patched/yaml2/" || die
-	# disable running of unittests in parallel with xdist
-	sed -i 's/addopts = -ra -n auto/;&/g' setup.cfg || die
-	sed -i 's/plugins = xdist/;&/g' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vvv -x -m "not cli and not needs_internet" tests/unit/ || die
-}
diff --git a/dev-python/pipenv/pipenv-2021.5.29.ebuild b/dev-python/pipenv/pipenv-2021.5.29.ebuild
deleted file mode 100644
index 9028b19d5c26..000000000000
--- a/dev-python/pipenv/pipenv-2021.5.29.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	# remove vendored version of PyYAML that is backported to Python2
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${S}/${PN}/patched/yaml2/" || die
-	# disable running of unittests in parallel with xdist
-	sed -i 's/addopts = -ra -n auto/;&/g' setup.cfg || die
-	sed -i 's/plugins = xdist/;&/g' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vvv -x -m "not cli and not needs_internet" tests/unit/ || die
-}
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index 05f09efdfc9a..cdcdc6524f32 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,5 +1,5 @@
 DIST platformdirs-2.3.0.gh.tar.gz 18338 BLAKE2B c7d2b1b7ea65794507153b5c8d4d2e5a0668e4f9ef78024ab08c724e5cc5e91d0b6d7ec115a1ddab8a6fd7d34b4cb84cf3ebec64079d866344d2a7d18ca617e6 SHA512 3d20476d5064b6e300cddb5dcc9ba15346b1a8c3f5bfad869edda05cdd123a00a0c6c18b15af49a74f55fded5e11d69112b77239fe6f8f7da97c9a43ff442d8a
 DIST platformdirs-2.4.0.gh.tar.gz 19482 BLAKE2B 81ebc4424bd2845ae3b28d95428f95c7920300193ff98159263089b3db0d104a3a59af616bf6b815c0c8b1453d3f05d85120573c71b16b0a5104cc2532c472d4 SHA512 76b492f9d1a5c666c3c6957c775055bbd74db93f2a66f0651a74e1914626d757ab8110df87281cd31ad65abbd89f02906fdf8f0854a44f8500487685993fb8af
-EBUILD platformdirs-2.3.0.ebuild 796 BLAKE2B 0092e91de4510e7a7e52dd83499495d6952bd57ed0a2fb6e16ca107ae615a86e213d2c7b4234fefb7fcd53bc91e62317bbef03b9c9e829d6c38790eedf0cc9a6 SHA512 55f13de709aac862227b259d5be80bad005aabf260ee58fbc85b7a11fc6f3baef7c2e03211e28fcb5fde5e9381a3b89aa72af5894b08487c75a8f7a3e2315977
+EBUILD platformdirs-2.3.0.ebuild 795 BLAKE2B 8b7da01e8aa80ee1f1e00371a92933323a79e679f69d88add7f605ff3986a4957ce5945ff827239b08c1a81ae28f25060250f6927aa4471350d6b80f5d10112e SHA512 2f8ab22cda1121989638f7c58451d8391bd74b6b5011f1b6fccb8237c60af6131435c47fe2874c53e516fe1032bf21708afb1910ab900b4f5e2b6165d1ef39d6
 EBUILD platformdirs-2.4.0.ebuild 803 BLAKE2B c767e7b83c0df2330bacbd45fca203c331d4abd71d54231fa40af88ad15ba7ab5b1ba787daa9fd7950137f0b77917aa711ca4cbd7c1a2318e37798296acb5809 SHA512 fec658124062fe60fa5d7ba8d92b68774506b88f49fb3f8bd8c988439b2a1a0a8ba3f3cedef4f5abf4ba65be9a8a1cf864264d9225c78d09560c034abddd1fae
 MISC metadata.xml 383 BLAKE2B b8c8c1593d154e7a38ca4bc450c14ca21f2411ea1d71f67e9631c1def0acace43ebb6e67adc0c4a1f5f14aadfbce44d0d815fc3696410bef66c826fd5fb00a45 SHA512 f4ba6722e1cf661b3febe10bb15755a9cbc30226a08bdcabfa3d80be87b42d662d6a1edb3412ad79e8f36836a6dd4fd91a83dae29725ec47041056dc1f1f9b75
diff --git a/dev-python/platformdirs/platformdirs-2.3.0.ebuild b/dev-python/platformdirs/platformdirs-2.3.0.ebuild
index 2f9f2e8a02cd..1004ce027626 100644
--- a/dev-python/platformdirs/platformdirs-2.3.0.ebuild
+++ b/dev-python/platformdirs/platformdirs-2.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index 5493e91e11d3..45c8f6392662 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1,7 +1,3 @@
-DIST plotly-4.14.1.tar.gz 6373585 BLAKE2B 8e8d15a7f68bbef835fcbc0048c2457916aad1b10e06c903222030b2b2e1b902e2d42080f8ac2c19928dabd7e1623210930b9f33dededa71dbbb28b2f41f848c SHA512 e052680d0e7344b9f53f1b917dd0b9bc87b0c34300d93b8958ccb35b38f9dc5e7fb4db016d1113df4bae78c419f3d378112c59c3470723ce1349eaadbc5011f8
-DIST plotly-4.14.3.tar.gz 6374650 BLAKE2B 91d950b6365876b03b2b0393c642275c37fc352fda90ce010310f5dae046c3cdd835de438036c5d92fd35d3afcd2c7b8548a87b1354d4a33cd2cfe10838ae94d SHA512 7d8db7a0f6c1abeda1b222f9bd25e4395dd8d14d246ad986960868a8083e4f1d1f600d84f44416eb1d089640d190192e931b5a5f6ae24e01cf8146c4cf8e80eb
 DIST plotly-5.2.2.tar.gz 7293292 BLAKE2B baef3accf8f5a3085908fcea558f8003687e18a1f97471c620c378c10d23d4222ef87dc47d64f45199b594414890db5b8ca5e3d7867c871d926c2ae441128c4a SHA512 4d6d79f7cc2063e73e7c17ff90a7d13324497ea8034d8ce62d79ec62b0530a59b2eaec8913fb05efb804cf5be8387b6f96d1710f41b9993233b5a13cf64dd310
-EBUILD plotly-4.14.1.ebuild 613 BLAKE2B 5f45698653121c6f20f3f933c236fccb8a4f152806795e24686425afc75e57dc1337736a63e60c982587d4b30e315c21fce0cdab78075e5cfbab1539a03be3f0 SHA512 18a4ed69b6b3983ce8b6cb1ced62bd11502569b0a8f381ba479ff69fb926c8892798ffbc7315872ee0ab24f071806f95a785712bf22eb83d8365bed4288faa21
-EBUILD plotly-4.14.3.ebuild 614 BLAKE2B bbc53aaad602a5e0f0609f06e1372fb1c36b5a778e27af9d19c1a5624702d31ab9a8b8e368ce79abc0638f3553bfa8178918bc303710132564c8d3a9ba4b4eda SHA512 b2b432fff00ea557662fd43f91eb37c45ad37940f1a6cffc39bf025d087e6413da139a5edbea569bdf1c8db4ffd62ff0ca70131616414b2894590a9de2f521ed
 EBUILD plotly-5.2.2.ebuild 795 BLAKE2B e609d220f61b73ca3c11255e0fc28cf9c3a2ed316be1f39044cab25679683300d6281e80ce2f5ead3be391b3c537be7531c9148ec1a1bb069a04ba621ba1784d SHA512 a1bac18949480f19c68891497effdfe60cc3ca474ca24ce27134f2a1da5cd894426fca9b00ad8d6d24138da141fafefd09a40723b1314197068422cd988574cb
 MISC metadata.xml 725 BLAKE2B 8e9c1a8183de0c1b008f075f2493a1368c875d3e302cb8e2305680c01c4b43aa46bb10c0b8a6f27d5608407d1a80d519a3ff6b3ba00a2c0fc663f2cab8a14e13 SHA512 38f1e83296a668c68032c8c11e0981b5b1e098cae2f5f6c8dbfdd01e419d42fa24060fc4433cf8cc4e3b4c44d851d345b931d674419067b0fecec7c39fd1076a
diff --git a/dev-python/plotly/plotly-4.14.1.ebuild b/dev-python/plotly/plotly-4.14.1.ebuild
deleted file mode 100644
index c1273fd5def5..000000000000
--- a/dev-python/plotly/plotly-4.14.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Browser-based graphing library for Python"
-HOMEPAGE="https://plot.ly/python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/retrying[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	mkdir -p "${ED}"/etc/ || die
-	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
-	rmdir "${ED}"/usr/etc || die
-}
diff --git a/dev-python/plotly/plotly-4.14.3.ebuild b/dev-python/plotly/plotly-4.14.3.ebuild
deleted file mode 100644
index a042ff17b547..000000000000
--- a/dev-python/plotly/plotly-4.14.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Browser-based graphing library for Python"
-HOMEPAGE="https://plot.ly/python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/retrying[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	mkdir -p "${ED}"/etc/ || die
-	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
-	rmdir "${ED}"/usr/etc || die
-}
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index f41121b60336..11acffe66b3f 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -2,5 +2,5 @@ AUX pluggy-0.12.0-strip-setuptools_scm.patch 1186 BLAKE2B 443f5af807826baaca7e95
 DIST pluggy-0.13.1.tar.gz 57962 BLAKE2B aa0a3eec06c988a727bc15511313f12a08bde65da55bcc5e7547a654e3ca8a34c12dfa72166b6a37b524972730f08454b6a0446e071d2710396e868ae3a77151 SHA512 eb747ff341cedacbd90eb20e22ad3d1ddf5588056f14d069f56331f4141a15b7eccaee23ea196d2f4906964ddb77a79b156bbf3ef8c8083e9952c55d13d55f3e
 DIST pluggy-1.0.0.tar.gz 51510 BLAKE2B 8107df9a91a843166a602e7518dd1d4167304464a8cc80180b60b03a2ac803be9b1ba190df9189907addd34a92b93a6b271d3d6b7485aa563203ce733c6a656c SHA512 cf0bcbb4330c24ce473614befa19548f33fb39fa0ad094e1eae786202d7adadc28e16499f80ab96b630091765404ca5c5b6f9a55bc605e03514d8ab50cf9ae00
 EBUILD pluggy-0.13.1-r1.ebuild 745 BLAKE2B 1fad71bed4d8bf1387763ec11a68085d7b06a8ef3b795b92848f3d2485c3010333faf6c3d4969aa1cbc554cad94937067c1b5d1aa4fc9f204d3d3ce3fc5fa406 SHA512 33eca15334d5cf080f1846a43ed371145ed4eb964a2f1ec15a07e152aa712913083dcc6e9a8b6ee4b85b159ae176e19eb58cb17ebbb717c32a7af0e943f45552
-EBUILD pluggy-1.0.0.ebuild 706 BLAKE2B 390541237c2bce438b6a931dc72b8ebd0b4a8e276bc97b00d0ce5a79b955937b36ac9820e51816fe43297e7d9737f54e7ff304c324d48099230862dcd450350c SHA512 859b59664c6c0d70e80528539a4b321e4c37838ce6ba618850207f185231b73b13ca3e4ce48604fb88fcdeea6312b039a531800bcbd9e2d8ce8a124eabd06dce
-MISC metadata.xml 482 BLAKE2B dc5208a3cebab580dba3e991dca209ef9b73041116512857c8e0f5f8ec77b38f01497e3b5886a61df9c47d1d180229501f2bf6c17341960ee97e042a64885463 SHA512 21aeab147cba9a5348c1dc386bca81784b5f17f44f55c4c5d26189c936cbe411005070fb93ffa25ad4d0af6ee5117d02e4f36f0ebc298f4464fa5d6ddfdda6a0
+EBUILD pluggy-1.0.0.ebuild 703 BLAKE2B 6f9a46950c7558f469951478f625e9a34d60cd3885580988f543dd2426b6b1045c3168050ab82eee334d44a5690477bdea225cfdcd1d250823dc5ffd381bca93 SHA512 937193f0ddf5344bab94ca3d8b5f63fab61ed82a14cebda8d362a18eb5795b2b6b77195472013786eb2f61eb0813c14fe03dc15c81c4907a00a187ec40a42d55
+MISC metadata.xml 506 BLAKE2B cdc1c868281f0140baf75a407eeea26276d7b8f8f0bcafee6393fa144fc054ecf58a812b055d7b48b7d5ab4aa5bc504d6dc567acf4336bb363c9854292d9926b SHA512 5fc4f019e2a518c815662db23bc44920558193cf639c093ec365ba120c113929bcbd9b611d6b2cb7e6057c0bd9d50dc5d1479840a6d379c4610b3ac8aa3ea1d3
diff --git a/dev-python/pluggy/metadata.xml b/dev-python/pluggy/metadata.xml
index 106c4daa87dc..1507ff7d0857 100644
--- a/dev-python/pluggy/metadata.xml
+++ b/dev-python/pluggy/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer status="unknown">
 			<email>holger@merlinux.eu</email>
diff --git a/dev-python/pluggy/pluggy-1.0.0.ebuild b/dev-python/pluggy/pluggy-1.0.0.ebuild
index 2688ee3f8d2b..b1be2a4200c4 100644
--- a/dev-python/pluggy/pluggy-1.0.0.ebuild
+++ b/dev-python/pluggy/pluggy-1.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="$(python_gen_cond_dep \
 	'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3)"
diff --git a/dev-python/pluginbase/Manifest b/dev-python/pluginbase/Manifest
index 7065e6de124e..a3866032d714 100644
--- a/dev-python/pluginbase/Manifest
+++ b/dev-python/pluginbase/Manifest
@@ -1,6 +1,3 @@
-AUX pluginbase-1.0.0-python3.9.patch 3324 BLAKE2B 4614baca44f897f16660e8dc0a8531627a896e3e15641103b958e744c07bfa9c9c1b729feb7a72d381cdc0d2af3deae8e5d4215dae3f9b4234fadb36ed84acd0 SHA512 159edb0608a432273fc1331f7229b3cfcd218a050ef5b58b230d92ab72f858c1a14ba2603d40d391fdf61140a0a21d3fdd1df92b19d8cc35b4ee40c7a33d3e15
-DIST pluginbase-1.0.0.tar.gz 41795 BLAKE2B 68d7704b52db39af4f0c2e1f790802eb5f2fd15d91726752605901b3e8a3c736204fad93d96b5dd1a4199586b4d9b42895cbe8290acaed1b4051e8103efb43f9 SHA512 95c3b770980fa5ec745b8d788df29c6219ed6e5af7666f9830d56c6acae01f90831655127bcef69b2dfc423d09429373ae7d4c8b45c76c62a41f909d0747c0a0
 DIST pluginbase-1.0.1.tar.gz 43588 BLAKE2B 8d72dc0afcf4e4e65670902bd3f28a1a36de7f7cc11fd56c624f871ced39e8b989bc6ac74d64e4f96b3bf32f0f4e187ae8b517f9a09cac94b7a735ffb08ec55b SHA512 20844fb78daf3e03a7a8013f82a059bf6b0723a184e89061ce5cb674b5a978900623f2eceed56fc9f9a34410e7e6ca8d41a5ac0a21e374b1b3ce32d4e522348e
-EBUILD pluginbase-1.0.0.ebuild 974 BLAKE2B d10c0fd2c11255202fff5b0d43dfc8159b632adf9e992c9e7ee951fdf928364a602d6709cfa7942a251e5c1dacc88f80f06663bc23cd5b1ae1362f6ed80d96b0 SHA512 68fbec4a9d72ccb09351eb02141f93f748aed1cbf21ee1086422df0aa8cf09fc5d68e143d4d65eb4760c816edc2442a40a0e9fb63712dc89d180cf38922c3780
 EBUILD pluginbase-1.0.1.ebuild 504 BLAKE2B 59abd779cae7dd3498ac47f4eca4c13943b8a7f5c7785ee729913761e53f480fb6f30ee17f732214bf89c1ed4b75e147253cdb1c110c0afc599f80b9d3c5fba2 SHA512 9cf3bbde8019c9e8e47ce3178547a8659f4fa3a22e34b9a0582610903360199cd7290c80474598f774c2fe5574b6abf779e87b0f9f5dccb5a4c256c61043e316
 MISC metadata.xml 374 BLAKE2B 2cbfa086bf9a21226b2d2f1ad29c80c32a99ab8f1519badca3cafb2255e307096d07df1d39ce12db888301e5c336b908cc680b80f8b00f43a7bcee0f783106a5 SHA512 bb83860ccf6e9d30d86d7406b89fa56f121e7b466164a476c802060a8f6bb63898fcfb3b22253ea2700cc99095f6754745d67fb2a611792802cba20179698051
diff --git a/dev-python/pluginbase/files/pluginbase-1.0.0-python3.9.patch b/dev-python/pluginbase/files/pluginbase-1.0.0-python3.9.patch
deleted file mode 100644
index 8c83198dae3c..000000000000
--- a/dev-python/pluginbase/files/pluginbase-1.0.0-python3.9.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From ad876a1282423c5e677392814eec09d826fd311e Mon Sep 17 00:00:00 2001
-From: Matthew Bakhtiari <dev@mtbk.me>
-Date: Mon, 10 May 2021 05:47:33 +0200
-Subject: [PATCH 1/5] Add python 3.8 and 3.9 support
-
----
- setup.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/setup.py b/setup.py
-index 012827f..ef63b70 100644
---- a/setup.py
-+++ b/setup.py
-@@ -37,6 +37,8 @@
-         'Programming Language :: Python :: 3.5',
-         'Programming Language :: Python :: 3.6',
-         'Programming Language :: Python :: 3.7',
-+        'Programming Language :: Python :: 3.8',
-+        'Programming Language :: Python :: 3.9',
-         'Programming Language :: Python :: Implementation :: PyPy',
-         'Environment :: Plugins',
-         'Intended Audience :: Developers',
-
-From 28d1baa81ac17c2281c8ca439ca0444910740ae5 Mon Sep 17 00:00:00 2001
-From: Matthew Bakhtiari <dev@mtbk.me>
-Date: Mon, 10 May 2021 05:49:53 +0200
-Subject: [PATCH 2/5] Remove deprecated yield_fixture
-
----
- tests/conftest.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index a43b8cf..e20513b 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -20,7 +20,7 @@ def source(base):
-                                    identifier='demo')
- 
- 
--@pytest.yield_fixture(scope='function', autouse=True)
-+@pytest.fixture(scope='function', autouse=True)
- def run_garbage_collection():
-     gc.collect()
-     try:
-
-From 95edc820811dac75a5f8d11697cbe197b4024efb Mon Sep 17 00:00:00 2001
-From: Matthew Bakhtiari <dev@mtbk.me>
-Date: Mon, 10 May 2021 06:26:32 +0200
-Subject: [PATCH 3/5] Remove deprecated tests
-
----
- tox.ini | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tox.ini b/tox.ini
-index dbea2bd..678eff6 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -1,5 +1,5 @@
- [tox]
--envlist = py26,py27,py33,py34,py35,py36,pypy
-+envlist = py27,py34,py35,py36,py37,py38,py39,pypy
- 
- [testenv]
- commands = make test
-
-From 06ab2ca2ee843e62a1a6bf26ef2d118995a4f210 Mon Sep 17 00:00:00 2001
-From: Matthew Bakhtiari <dev@mtbk.me>
-Date: Mon, 10 May 2021 06:32:07 +0200
-Subject: [PATCH 4/5] Remove old versions from travis.yml
-
----
- .travis.yml | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index 743a38a..739db3e 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -1,11 +1,12 @@
- language: python
- python:
--  - "2.6"
-   - "2.7"
--  - "3.3"
-   - "3.4"
-   - "3.5"
-   - "3.6"
-+  - "3.7"
-+  - "3.8"
-+  - "3.9"
-   - "pypy"
- 
- install:
-
-From 382037ce6cd81e2767143db744d1049081051ce3 Mon Sep 17 00:00:00 2001
-From: Matthew Bakhtiari <dev@mtbk.me>
-Date: Mon, 10 May 2021 06:37:02 +0200
-Subject: [PATCH 5/5] Remove old versions from setup.py
-
----
- setup.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index ef63b70..8f9f4e6 100644
---- a/setup.py
-+++ b/setup.py
-@@ -29,10 +29,8 @@
-     classifiers=[
-         'License :: OSI Approved :: BSD License',
-         'Programming Language :: Python',
--        'Programming Language :: Python :: 2.6',
-         'Programming Language :: Python :: 2.7',
-         'Programming Language :: Python :: 3',
--        'Programming Language :: Python :: 3.3',
-         'Programming Language :: Python :: 3.4',
-         'Programming Language :: Python :: 3.5',
-         'Programming Language :: Python :: 3.6',
diff --git a/dev-python/pluginbase/pluginbase-1.0.0.ebuild b/dev-python/pluginbase/pluginbase-1.0.0.ebuild
deleted file mode 100644
index 4a3320d7185e..000000000000
--- a/dev-python/pluginbase/pluginbase-1.0.0.ebuild
+++ /dev/null
@@ -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 distutils-r1
-
-DESCRIPTION="Support library for building plugins sytems in Python"
-HOMEPAGE="https://github.com/mitsuhiko/pluginbase"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-PATCHES="${FILESDIR}/${P}-python3.9.patch"
-
-python_prepare_all() {
-	sed -e "s/, 'sphinx.ext.intersphinx'//" \
-		-i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	cd tests && PYTHONPATH=.. py.test --tb=native || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/podman-py/Manifest b/dev-python/podman-py/Manifest
index 282ef5117cd7..b4855f0eb512 100644
--- a/dev-python/podman-py/Manifest
+++ b/dev-python/podman-py/Manifest
@@ -1,5 +1,3 @@
-DIST podman-py-3.2.0.tar.gz 165514 BLAKE2B 7e25d160b98e45cc147069249d850b3a3d6dac5227942d90ed99b8313befd9db04a6423015ae56959a53eeeb49958d9067eb6fb7127ee55bf50ebfcea617a220 SHA512 8ef165847de5fecd81e7b5564baeaa0298efd4d2e6f12e1dfe958eed77f945d9375d90ba93a8ebab4b090b228d451e96ce49d08288dc3daae1255a05127b25c7
 DIST podman-py-3.2.1.tar.gz 181095 BLAKE2B 5075a37d3ef20004424536bc1f9e6e08c842248fcb8d8235ebc354e832e78125fb19bd0001f7fd237ebc642e348368da90b634f0db8c84e23ef77e8cf99b71ad SHA512 656a5e61d9809e2866a071ff5b4792fb71fbe0f8cc05467b498718b74898acc39a970ba64fc08ffe70d9c34a9caeabc3d8ea07dcce856fec308b6ebd268b2fb0
-EBUILD podman-py-3.2.0.ebuild 999 BLAKE2B 5a1830cbb64f6a9347c23dbba167a95c31c9325fd8ccb09d5acaac8111ef457f4e2cf509358341e57470d2fe73bebbafe5f89a968255685c21f4d6a0aa347737 SHA512 ab6d6c50cd59da65c9c2d41b45d988c91a8001c8c857291e26c2929ef00f896bcb34b28a83b16a703e9c1da27c6f820ebaa3ea37bc4c331c4f5f4a5405ab74df
 EBUILD podman-py-3.2.1.ebuild 1010 BLAKE2B 51c9140975adf5ff1058d8c202a79eb0d3ef276bc200a147485a6a24d4b6e1ad41b4e1f5e27c9591dbd62ebbb3c511f06afbc34e8f511353cfd315a7bd127186 SHA512 63e850654d60e3e7d5c42a1dd11ea1d5a6f0cc3aaecea552c7897828a2be184c975c3a840b6715d7de527a45cc5669c469e30a5f5e8704fbe822f4a8e6e95291
 MISC metadata.xml 475 BLAKE2B 42fc2c044df94ebf8a4eb5088a39ad3075089cd5a007473db0964df4efb8c7a437c94db9c161d6ba81d2c017377919861f17b7fe3e133aa597312cad2df012f4 SHA512 017f54ebf56fc59c14ff0e9c2f15b899556ff3d512d22ed2abc35227c079ec64c8eb855f60e65299abd7f8b5433b2268dc7c2e428476efc334e24f0d90181bc8
diff --git a/dev-python/podman-py/podman-py-3.2.0.ebuild b/dev-python/podman-py/podman-py-3.2.0.ebuild
deleted file mode 100644
index ae42159d3f28..000000000000
--- a/dev-python/podman-py/podman-py-3.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="A library to interact with a Podman server"
-HOMEPAGE="
-	https://github.com/containers/podman-py/
-	https://pypi.org/project/podman/"
-SRC_URI="
-	https://github.com/containers/podman-py/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# TODO
-		podman/tests/unit/test_volumesmanager.py::VolumesManagerTestCase::test_get_404
-	)
-
-	# integration tests require a workable podman server,
-	# and it doesn't seem to work in ebuild env
-	epytest podman/tests/unit ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/pooch/Manifest b/dev-python/pooch/Manifest
index 19a8025e9307..b0ef224ae5e6 100644
--- a/dev-python/pooch/Manifest
+++ b/dev-python/pooch/Manifest
@@ -1,3 +1,3 @@
-DIST pooch-1.4.0.tar.gz 57097 BLAKE2B c891387011c99edbb78d84a8301e18fbfce36ecf6e87372ab384921d7e608abc2db2d3b3b37229ba193f3dcebb03f8df546c266075a0a35f18856ff38b3f94e2 SHA512 f883ecbb8831a179338ad497376ced25afa812ba3fdce7db4eb85aca00368aaf7c9c9f4dd58348b24f182b59e5de52bf490f03b6d4b6a807c4dcc182ac89627b
-EBUILD pooch-1.4.0.ebuild 870 BLAKE2B 0b76b07ec095ba22810c8e2ef3313413366a9a539609a309ca3c0a482cdf3382829fdb2ebb706d415a5ab53b98ca9d563ce183e186c8a66ec882eb680df9a8d2 SHA512 9d029105eed7472bec52f3c0c0de98568c6f621811dd5ca71d547f2ce5b8f28b0990828d5bd2abfe3e2027157db77a483619e2fb9f8838a5e142bdfb05d32a79
+DIST pooch-1.5.2.tar.gz 61167 BLAKE2B 36c3ac00ae1d05b688fabc31ae9eb88536d717a3dd179a02bf76f9c8066520bc165af0a71d5cd514e7c9f2422c4a3ee189cf93215bc9a9189bf9f20a77f95e61 SHA512 acb1a48e94a97f79503125f0cf1312d715719ec32817771d2e19d2bd89b2cfd34b50221d67d1854cd93818140d8536f6f5b3db1ae0bbb185fffa2cf9886f98da
+EBUILD pooch-1.5.2.ebuild 869 BLAKE2B 0e66597ce6cdab4fde09a65971d4514962bdc15b67dc34e53c23ab8a89160afacb56fc4b8caeaf49ea2b6247189dd7f8cb417136e6e53c3630c743c7bf72d60c SHA512 2ad52337ce41334682264fa2b98efa6f7d4aa410d2120931d8b8e322a4cf8a90398ddb61926a7a301d51e645a61e47cd66318e53db46d29040bc7ff00b32e8c9
 MISC metadata.xml 770 BLAKE2B 21bde2b2becbd42587960b3801f19dd9213e1c45fe787f91a2df417afa032d08c427145943cf9fb7b8d54b23fd3d4097e013265262d613037bee507411113465 SHA512 d85ecdb7876761f0eddb4491868e1f717a815b43fae15f3b511a9e15a4a9156a6ae99a95acb18a1027bbf8894dc02998ca478bddcbcd58b880f35f5bfe9d1534
diff --git a/dev-python/pooch/pooch-1.4.0.ebuild b/dev-python/pooch/pooch-1.4.0.ebuild
deleted file mode 100644
index 9108a6a076af..000000000000
--- a/dev-python/pooch/pooch-1.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=(python3_{7..9})
-
-inherit distutils-r1
-
-DESCRIPTION="manages your Python library's sample data files"
-HOMEPAGE="https://github.com/fatiando/pooch"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-
-BDEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-python/pytest-localftpserver[${PYTHON_USEDEP}]
-		dev-python/tqdm[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pooch/pooch-1.5.2.ebuild b/dev-python/pooch/pooch-1.5.2.ebuild
new file mode 100644
index 000000000000..a8c0c03f2fed
--- /dev/null
+++ b/dev-python/pooch/pooch-1.5.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Manage your Python library's sample data files"
+HOMEPAGE="https://github.com/fatiando/pooch"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pytest-localftpserver[${PYTHON_USEDEP}]
+		dev-python/tqdm[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pretty-yaml/Manifest b/dev-python/pretty-yaml/Manifest
index 41bf85466ce1..9d3c9da7e91b 100644
--- a/dev-python/pretty-yaml/Manifest
+++ b/dev-python/pretty-yaml/Manifest
@@ -1,3 +1,5 @@
+DIST pyaml-21.10.1.tar.gz 20466 BLAKE2B c90adb2023c9555f55a6fafe4e82fa8c50795a9f798250f640d9db6511584f3715a0a8fa4ee3cb26148967c75d59665b05915dd6ef1d4f807bfc7a68f2818482 SHA512 3a98a021856446584f079bfb7427c63feaf6fdd1bd0d809d46aa0c646b2cb9533c393ed0167240be587aad7b94209b6e5bfe2c09918b45ec9a86ad9781bdf9f2
 DIST pyaml-21.8.3.tar.gz 20269 BLAKE2B 8b829ce374efe13007bb924393a8cde26914cc443999906b7bb4db610b614964170a80b8dd381eeaa9137026c60d98140b3b0d601a6af816c32d1ce9708e33be SHA512 69b1181511f7d3ac1263b710fa49b18a162e096e28414d83300bc2e9038222363cef995a0d3248387560e7066973736f9cee06b67042ee957427b4790c269653
+EBUILD pretty-yaml-21.10.1.ebuild 660 BLAKE2B 92ca07da3f1dbfe73b5c7cb6b6321439bdfe4f1cea30eb584be4b04987fb8227d8c7d86c8c1fcd3a5611f538634ae28665285b82673acd6d9ed332fac585a032 SHA512 c53cc3b789a46460a3f54fd5cdb82064d61625270eac6bf05bb94b14e03fdbd1ea062f5ffccd782775e23c52f7e66a676f473966904af62eee0d4e7488438e91
 EBUILD pretty-yaml-21.8.3.ebuild 721 BLAKE2B 7aa79dfe521a5090a16ad11de2c1792c68657269bafd17bce8b62c2977369f5a79034a20f8d1b9f9702e297e82b2bd7160757117951aa9162b0a5b6a5d232df7 SHA512 b57d643f4f6ca0072f95728a6d4e63ebb1f474871136f695eef16d4ec9c6a1701138fe405d8e2ad5d383b036913eac0c4b659d6b7a922265c71c019349267cef
 MISC metadata.xml 470 BLAKE2B 725657a34cdcbddf146ea3163af81fd22f78b895281e7dc2192b8c1f49fa9ec868e41a38bc371ce61160535ad0c5c1d8741109858cb8e3eafb40a77d623c3ecf SHA512 c64f440d674396b0a750780cbc5ab1a5003be1d3357b39a792cb9490870c768ab740266575cf6780f173252a893f6fa93fe9d4f414647274e520c4bd4b579c67
diff --git a/dev-python/pretty-yaml/pretty-yaml-21.10.1.ebuild b/dev-python/pretty-yaml/pretty-yaml-21.10.1.ebuild
new file mode 100644
index 000000000000..6d353d96ab32
--- /dev/null
+++ b/dev-python/pretty-yaml/pretty-yaml-21.10.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=pyaml-${PV}
+DESCRIPTION="PyYAML-based module to produce pretty and readable YAML-serialized data"
+HOMEPAGE="https://github.com/mk-fg/pretty-yaml"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_P%-*}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/unidecode[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index 4c1391dd4e5b..49aa5680ac95 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -1,5 +1,7 @@
-DIST progressbar2-3.53.1.tar.gz 44741 BLAKE2B 80f406adf42c5c57ecad87002426115e1254339d5cd310dd42f560f48a1123702dffbba8f26114a01f2bd5be75a29cb12cc1c091d5554509b6282ceb2b66fb76 SHA512 4817bbb45d0f51ee2b3feceec56b3177ed5d0561894a13eea53a30e8b9aad5805483b5b669af93f3fd0cc958984b8a5c2a14ba3591e0a85be12180d057bc2f81
 DIST progressbar2-3.53.3.tar.gz 240718 BLAKE2B 01f0d0cf6c546855d2cac10cc1164fb68308b60e1095499f8838d7c82127860235f65d742a137db5acdce6ac50e65aff7580a6f6a344942d4c78375cc23085b4 SHA512 6399d8fa8270fc0241969d94ce284161516b42c0fdc3fbf2dfe8a0dfcca72933d23ec9b99c4118cebbca376f5821337aacd11fcee6eee5988d6caf73d1f3112d
-EBUILD progressbar2-3.53.1.ebuild 709 BLAKE2B e94d7955407d1a1909aded633a2b8cadb5a83fae24c87b68875e1b18354583b83b6bffff6022c2ec10f4f1f67f12efc4f77113e13c1846e0a75b9478099ba77c SHA512 99507009a42edc4c970be2edde4d14b2cad3eae2cc4184397c99c34fd08c94e0858552c2e40bddbfd7bf2957675fbc56303836f29ec4474183c87cff275f1c57
-EBUILD progressbar2-3.53.3.ebuild 710 BLAKE2B 1bcce3334eac729e2e12b414b44adbf17b949d8bff5d554699fa10950f515767703bf0e74c3de61b9105ae9bf1f8f56562ae87e998fe4ce6b54c3c482c953cb8 SHA512 17f5bd65eb5c042303b78a54815b93c66309d8035c7a1a94fddbbe59fc5eb3e3df2293c6a7ebb993187435a2b0ad33b5ba9bbff8ae12f483aa428bda8633aa30
+DIST progressbar2-3.54.0.tar.gz 365257 BLAKE2B b36c7b795a9afa5f35f447e325f217a0d6ff092081265f43654fb093c67bf94fe8ffcb2d8d2a51ed50036ccdc535afac69b5a1b1ead4515b636105edbe927f55 SHA512 d8a896aea4eed5e65347227417e691156890c202f40a792a111a86fb9ea788a9d85e1e6923a2227160dbb890f9767dd9156d396fe7d1307cb9445fd057c0342a
+DIST progressbar2-3.55.0.tar.gz 371356 BLAKE2B 89034af2cc623063e98c9de1683f159c2eeb491354c66357d9c3fb5a7ac0503b5c9d2dd6ebf36d3e2803558f3841820188eaf6dc931e992c352e0e02fa020f87 SHA512 16dcdffeba6e9cb6696ac41c16701874c5f314432332d7ae2d898d1040e603c428240a8ca5718789d0d431750e2ae923a6f63fe75785213e80494bcc5825aab5
+EBUILD progressbar2-3.53.3.ebuild 709 BLAKE2B b04c08e13b2ec81cee1e32f86d6929c86d8757b98a6271b147c7da895cce35311d104622a59576d3759aa0a35af5a7587b6ba37d030464b1cef0ea4b8fc3f430 SHA512 97cc45d693dd4524e009b0ef6329bef0bbb6d47163625a88c60eeb5ec1ec9f01832a737a4b47c5967438f49e7186abba0b7965d97f1a00a0a16e7a2fbf04ef1c
+EBUILD progressbar2-3.54.0.ebuild 711 BLAKE2B bac2f747b263e9baf640e2bf7a535335036956b9e6151579e8242ca06471a9276dedf9371a6d95af55ee763de322642ca54500ed856a2d10a981491a20db3a07 SHA512 6975a0ef55ae558e10b5bfe2da6e8856f794607dca87655152c55d94973ab602f3cd4ec2a9603054a4bd5ff15eaba5268989d89abb4f8cde6ef7df0d84f1ce78
+EBUILD progressbar2-3.55.0.ebuild 711 BLAKE2B bac2f747b263e9baf640e2bf7a535335036956b9e6151579e8242ca06471a9276dedf9371a6d95af55ee763de322642ca54500ed856a2d10a981491a20db3a07 SHA512 6975a0ef55ae558e10b5bfe2da6e8856f794607dca87655152c55d94973ab602f3cd4ec2a9603054a4bd5ff15eaba5268989d89abb4f8cde6ef7df0d84f1ce78
 MISC metadata.xml 331 BLAKE2B d2dac5a8c7f9c61da26e79aa470a02db594999812eaec2915c46039eb2b616d4575fc24aa40b6526201782d5fcc66c4558629636f584276f6087280c74da450d SHA512 bc73b6b943bd29892d00a18b0018ed79f8eb727f4f359234920adfb35db95b6becd79735ee10b473932a63f37e869fa0379414b9532f7360caddfa057b609446
diff --git a/dev-python/progressbar2/progressbar2-3.53.1.ebuild b/dev-python/progressbar2/progressbar2-3.53.1.ebuild
deleted file mode 100644
index 8e572770470d..000000000000
--- a/dev-python/progressbar2/progressbar2-3.53.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3)
-inherit distutils-r1
-
-DESCRIPTION="Text progressbar library for python"
-HOMEPAGE="https://progressbar-2.readthedocs.io/ https://pypi.org/project/progressbar2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	dev-python/python-utils[${PYTHON_USEDEP}]
-	!dev-python/progressbar
-"
-BDEPEND="
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/cov/d' pytest.ini || die
-	default
-}
-
-python_test() {
-	PYTHONDONTWRITEBYTECODE=1 epytest tests
-}
diff --git a/dev-python/progressbar2/progressbar2-3.53.3.ebuild b/dev-python/progressbar2/progressbar2-3.53.3.ebuild
index 3ef7e67ff9f9..acd53f160210 100644
--- a/dev-python/progressbar2/progressbar2-3.53.3.ebuild
+++ b/dev-python/progressbar2/progressbar2-3.53.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-python/python-utils[${PYTHON_USEDEP}]
diff --git a/dev-python/progressbar2/progressbar2-3.54.0.ebuild b/dev-python/progressbar2/progressbar2-3.54.0.ebuild
new file mode 100644
index 000000000000..511a1bafb990
--- /dev/null
+++ b/dev-python/progressbar2/progressbar2-3.54.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Text progressbar library for python"
+HOMEPAGE="https://progressbar-2.readthedocs.io/ https://pypi.org/project/progressbar2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/python-utils[${PYTHON_USEDEP}]
+	!dev-python/progressbar
+"
+BDEPEND="
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/cov/d' pytest.ini || die
+	default
+}
+
+python_test() {
+	PYTHONDONTWRITEBYTECODE=1 epytest tests
+}
diff --git a/dev-python/progressbar2/progressbar2-3.55.0.ebuild b/dev-python/progressbar2/progressbar2-3.55.0.ebuild
new file mode 100644
index 000000000000..511a1bafb990
--- /dev/null
+++ b/dev-python/progressbar2/progressbar2-3.55.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Text progressbar library for python"
+HOMEPAGE="https://progressbar-2.readthedocs.io/ https://pypi.org/project/progressbar2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/python-utils[${PYTHON_USEDEP}]
+	!dev-python/progressbar
+"
+BDEPEND="
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/cov/d' pytest.ini || die
+	default
+}
+
+python_test() {
+	PYTHONDONTWRITEBYTECODE=1 epytest tests
+}
diff --git a/dev-python/ptvsd/Manifest b/dev-python/ptvsd/Manifest
index 6a7108d0ca1d..4bbc66a2a21a 100644
--- a/dev-python/ptvsd/Manifest
+++ b/dev-python/ptvsd/Manifest
@@ -1,3 +1,3 @@
 DIST ptvsd-4.3.2.tar.gz 7399976 BLAKE2B bd697773fcb504316e827ab0a25c029c77183f9a9ac8295060046bb6af92dcd9f30cd0edcf78dc6fd4c28b7af84054d75143e2734e6f7f19fa93f242800d0c4b SHA512 5d4fc0e37ade9ae5a8d88348102d150f77c49ee5fac657083e094e9f4bec80c36dcc5cfc89649b9b088a6ac2a899071ded3571ebb1bc9bb46e92d4a14dd5d7e0
 EBUILD ptvsd-4.3.2.ebuild 472 BLAKE2B 65247ed9660f461c79a42830632316095264f64c95f4995d4a6189bd99f34a83ee05254252c68ae50a7877b3e175afcdbcdeb2fd6cbb8e2486001ea3fa866f13 SHA512 1451d7ecf0524aa7616b6e1d343098f223cc8fbc92a62cdcac1ecd932b4438c90cd5cd09b561f5dc5919550322a21fb8ca980fe814fb632dcbac05af5a721a15
-MISC metadata.xml 342 BLAKE2B c97f527745d7c25e0f94573dddb3f31a91c598f832d4c699bf71b93f56f90343bd779dfc95999528b83edfb09624066106d06482d6a408bb52b55e4da0ffd487 SHA512 07d6be028240b5b037f5423516175a45be8d861ca13456c0e494532a262ff65db8fdae3bdd59643d456463cd3bd3ae8cd76e5708b57af6f817db8339a51cd211
+MISC metadata.xml 291 BLAKE2B 60922fdbc276d7d794fa063a75b6c1845dcf815e39b744b2e9347810255aaf1aaa2be263bee5346e689c090a1acde369f3a1420bb93a63632a33c9e7a8f0dd63 SHA512 59561bb4b4ce7f1f8465596b49179f17df418d0755826c708359c726f9111516e7512e7e9e183f654f3a62e7cd997b674af1d7f67c86e348c542a25c34d5343b
diff --git a/dev-python/ptvsd/metadata.xml b/dev-python/ptvsd/metadata.xml
index 7917ffe2937f..d18cc8893c70 100644
--- a/dev-python/ptvsd/metadata.xml
+++ b/dev-python/ptvsd/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">ptvsd</remote-id>
 		<remote-id type="github">Microsoft/ptvsd</remote-id>
diff --git a/dev-python/pudb/Manifest b/dev-python/pudb/Manifest
index 59d9f7832cfe..7f286949a985 100644
--- a/dev-python/pudb/Manifest
+++ b/dev-python/pudb/Manifest
@@ -1,5 +1,3 @@
-DIST pudb-2020.1.tar.gz 70838 BLAKE2B c0f9ebf88851ebd859876e3e9b29239c72e308d7a544aee26baeb44a47ec3de75aed031ca10ef67c32d0262ffa690bfc063122524e64afa7d5763afb9a5baccf SHA512 4878c3f375d96130ca9a1afe668227b6f08e876e618bcffb47b1507be6bf7a393d88ab5f65f33c6497c98e645a188d5f3eaabb4f6a1e49d8d09b0f8b6b17ba14
 DIST pudb-2021.1.tar.gz 216707 BLAKE2B 1287fa48607e9b73dd0bed063b29933dd4de6ab598ad99217ab13a719a6b9654765bc44c28150962ba22703733a4e956c39e843414444c3b7fff67cefe70d7d8 SHA512 54d62f1342ab461e58a382c0eb654ecc9d3bd759844bab2f0a339e91ba805670e4dc7ccd84e8188f34e06a07ac770f1c0cddd4a4ef916885af0bdc638db81fcf
-EBUILD pudb-2020.1.ebuild 518 BLAKE2B e4a2bfbc320647077c74c07a3ec1273e2322b7b83a5971f6eae2d9bb7fe12b5dde58b4423dd6bdd14d873a702e4d83b3b3ef63b1f100caa2177b5fcab0ccde49 SHA512 0a601875bd616cd79ba2dfa381ed45ecf31c28e90579d5369630a849e9040724a8d01187a87345dc91d803e2349236f4c59f7bfa98e9f0a2c29d95478af5095f
 EBUILD pudb-2021.1.ebuild 584 BLAKE2B a18c48f12cf4aa2110e4e8c05ded78ab9daf439f3bdeed7b28c5aa1b58184b409d8f8e65c567200bedc2429a664553eb0d40c2537428679c15461d11ffa25b58 SHA512 daf65f67d1a4d6d36a7b81bee844c73a080b8e0691098b1fce75b17f7b6dfdf7a4ff696ae5081c50e27956b6d74647e1cbbdd9135919ad69a41dc2b13708268a
 MISC metadata.xml 415 BLAKE2B e36096d9569f60ef1e2f1c412a4e17007880c5b3433545f3f7486532968a7502532f0ae614368d8bbc62f3f6550f08a63890d81a5ccf509db2047c0cdd9e6b27 SHA512 1c1de7a23e74095aa20edc4fe5de9c8c88eb5f3537d0bb0fcce345287170d77bf1f1b13fe17d5f100d71782c34940836f27a1778530af58312f3e22f21460dd6
diff --git a/dev-python/pudb/pudb-2020.1.ebuild b/dev-python/pudb/pudb-2020.1.ebuild
deleted file mode 100644
index 85b6a8ab92ca..000000000000
--- a/dev-python/pudb/pudb-2020.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="A full-screen, console-based Python debugger"
-HOMEPAGE="https://pypi.org/project/pudb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pulsectl/Manifest b/dev-python/pulsectl/Manifest
index f3680be9c6e8..81414de4a786 100644
--- a/dev-python/pulsectl/Manifest
+++ b/dev-python/pulsectl/Manifest
@@ -1,7 +1,3 @@
-DIST pulsectl-21.5.17.tar.gz 41487 BLAKE2B d4e547a140a9843107bac70a0a98ab230018b6457875b395528c3c1c1e7f20df4c4e6db569334c98f62be549930ab8e8f07927a54396554f1aaabc9a6eb46d7a SHA512 fdfceea8833955880326c04c536e6b2d63a260a851b98d7a76bb3637f30f414c2b2f4bd50c493f86edde76983e0a0f83c39839fa39646d8f1f2a4e93229d42fe
-DIST pulsectl-21.5.18.tar.gz 41636 BLAKE2B 1949f14c12a9d39f2ef6db798c7e8c8ca6dfb4fd3a3825af9f165e03fe1a3b2650bf369a4dc031528974db594740c0d990ebbb20d54aaa5c79a8859b9bcb605c SHA512 33dd4ca0daac4be1af510f6b4ac102f5b4b555bf2c72a446b2b498a80f972e4a970953812fd06ecf1e780bcfb61037e5a1245a8a047a592d73a7f4bd14790033
-DIST pulsectl-21.9.1.tar.gz 40432 BLAKE2B 531f2a6f750e1b1c0b8cc63899b3753af6d7a83999242e74f42147932d78a3416dab1ec4379fa6b9b981b9b0859d7b52102ec935b5695dd730858c4476f0ae5e SHA512 5fc1469acf0e1878d8fa73b7dc25f2579b42fcc4d9e0aa36ac3a806a5ad792ae2398cc86c6310439014d8ba0100abab988c32913a37f1aab9773acb2d19cecd0
-EBUILD pulsectl-21.5.17.ebuild 493 BLAKE2B a984073010318e8f72422fa6b20ebc11471b8a8deb0069357f94af4516ddb8afd30066b52ce457f4a69d6939ba57893ac847b0a4448c9c1ddf0843715f111bc5 SHA512 ddec663104131c9ac1eb143d130c801908af5721cb0de38a3e12026c318d792e149a5a9caf84f9e3a339dee6307fc2c4ee6dee7ad24040f224ef98005860ceea
-EBUILD pulsectl-21.5.18.ebuild 493 BLAKE2B a984073010318e8f72422fa6b20ebc11471b8a8deb0069357f94af4516ddb8afd30066b52ce457f4a69d6939ba57893ac847b0a4448c9c1ddf0843715f111bc5 SHA512 ddec663104131c9ac1eb143d130c801908af5721cb0de38a3e12026c318d792e149a5a9caf84f9e3a339dee6307fc2c4ee6dee7ad24040f224ef98005860ceea
-EBUILD pulsectl-21.9.1.ebuild 492 BLAKE2B 40f2cd35e4e7e18a7e2b994001604634ae5451bf64803d173b7780f1cf900efe32a791d02ecee81b093c274248a5a2a7e37d7aeeffc4c1c2a6fccedd32095b87 SHA512 c78a114e5fc8e07b16383efd11f9af7a24b957ccc6fdf48c18f6d80f004269624d246bc111a11d2f9396137921170c63197e0ed3fa1d6da73818a5ecc173aa60
+DIST pulsectl-21.10.5.tar.gz 40769 BLAKE2B 8346717714b4e9fd017ca917388d2ddff9c7b5a5a74a33e03e3fd5fc02048ba3d1873fb1bd10a12410dc44d88c253a4afc71f1f2542e70f36f4985659fcd9fb5 SHA512 353af9d33bb6e9f070e46a934f0933935631ca5d254430ece8b9aa9a25dd31607a45718a45c71f35f2e3801c78d7eea18c5e34f69e5a983cfc0115a8fcd05334
+EBUILD pulsectl-21.10.5.ebuild 492 BLAKE2B 40f2cd35e4e7e18a7e2b994001604634ae5451bf64803d173b7780f1cf900efe32a791d02ecee81b093c274248a5a2a7e37d7aeeffc4c1c2a6fccedd32095b87 SHA512 c78a114e5fc8e07b16383efd11f9af7a24b957ccc6fdf48c18f6d80f004269624d246bc111a11d2f9396137921170c63197e0ed3fa1d6da73818a5ecc173aa60
 MISC metadata.xml 558 BLAKE2B 6cdebbc1f507bbab92256bbac867a86468b733b40dacfdb71090738f5505ea6ac33b24cbeb06835e10d9845e3fd9189a6c34625176f12c9dc7f4a1511069e8fe SHA512 b15eaa0564bc6dadf8d46eab154d028b4cbde26fa099793aa23df8f82eba86a4125d173eca8a8d2d73359dc67171dca9d8716e1495168c7b6c8ff5c701a21577
diff --git a/dev-python/pulsectl/pulsectl-21.9.1.ebuild b/dev-python/pulsectl/pulsectl-21.10.5.ebuild
index fcc1db8926fe..fcc1db8926fe 100644
--- a/dev-python/pulsectl/pulsectl-21.9.1.ebuild
+++ b/dev-python/pulsectl/pulsectl-21.10.5.ebuild
diff --git a/dev-python/pulsectl/pulsectl-21.5.17.ebuild b/dev-python/pulsectl/pulsectl-21.5.17.ebuild
deleted file mode 100644
index faa621fb11f8..000000000000
--- a/dev-python/pulsectl/pulsectl-21.5.17.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)"
-HOMEPAGE="https://github.com/mk-fg/python-pulse-control"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="media-sound/pulseaudio"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pulsectl/pulsectl-21.5.18.ebuild b/dev-python/pulsectl/pulsectl-21.5.18.ebuild
deleted file mode 100644
index faa621fb11f8..000000000000
--- a/dev-python/pulsectl/pulsectl-21.5.18.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)"
-HOMEPAGE="https://github.com/mk-fg/python-pulse-control"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="media-sound/pulseaudio"
-
-distutils_enable_tests unittest
diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
index 17d5743c23a1..f0dd7fe3ae5d 100644
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@@ -1,7 +1,3 @@
-DIST py-cpuinfo-6.0.0.tar.gz 145260 BLAKE2B 58cfeb698619f2f51dada63b236969393e387f6e66fffe853ab633e438b4b893489c097211a20ece597a06d3c0cf89d285b5ab34e80029510e86b1a322ff1f06 SHA512 4941a5193cc376a44e99bc82644ec9d7e8f9f11b4e5fb1ad22a71c959959dde7f67290b436dfad2f26c68ef17d08e33538cf80443f763268c503af17b8479438
-DIST py-cpuinfo-7.0.0.tar.gz 95887 BLAKE2B 8f5764db94faf41dc554353ac2a21416998efd602b6228f21db6e5b3257563b4f7352221eb7f354ebe431910b0b8dadd52558233261df557c6a7943b7ec138c4 SHA512 fd291533dc5e78d75851e61ef2a754d9bdb62cbb5e04c86db0d6ea2d074a1e920b1ff50c136df3dd640cb64deaccd4f187c5af02c586a3d28b8c74dfe4143893
 DIST py-cpuinfo-8.0.0.tar.gz 99791 BLAKE2B 95024b488142e3bbb2eaa69ffef229ac27f1cb55e297fb8de050ec4c410c1b13dbf674936365d84c5c473158338dd047f6dfba58c2a7dde4e21232af356ab20c SHA512 77351f9f2fd33b09d0ee998dd2b3eb971bbe9094bee5636356d5a5a2747ebba3c112cccfdf929f77e3b7de3c745f98ecfac8edeb0d84fede100b637b554d4fd9
-EBUILD py-cpuinfo-6.0.0.ebuild 528 BLAKE2B d600632563dda508e9de69ef4120651646b82a9c919051261faa6b2e303f6a1ace445a431e7540eb8f3fd9c76eb0588bd1840bce67a626527e96c22a1f1b79fc SHA512 d3a4fa095d1460c345b1b3046c3ab08bce7059d3b6a7256dc52ef5cd321fa93fdeefaa77afc475ee3d4a49fd5a5b979629552add27fe5defe84d31e4df58eb86
-EBUILD py-cpuinfo-7.0.0.ebuild 502 BLAKE2B 8da0ce27db88039ea6c7e12f015433a466e440006b6e24a0d14c8a047b8abaade732757e3a276419b24844b156b4052abf67a3e4f5fc56355ea0eee63a9182a7 SHA512 884577429bf5fb17eec88d51836945657cc6ddb14fb4d693d9a5d40b181ca98e47c20a98d1a9dfcc9fa057a49e7639c8e0c59560fed396c5e51234482d812a00
 EBUILD py-cpuinfo-8.0.0.ebuild 479 BLAKE2B 42b5bba08824cc62f278a9045f6e8db6b33f04abfbbe9fe47ebf04b51fc2face05a23577e1bb89200c50aa51ab4ec669e7ee60de06b188ea6defcf292e29827b SHA512 30164a051144fcc2d4f5878b1a789459414fb4341d4d567126cc1725004a42618650ebc7aa7388a25f005ae7882650e2e72895210551947e5c1fdd93f835eb5f
 MISC metadata.xml 532 BLAKE2B 32c0f690bf91102b46b486db560e99ee94400c0c1bfa5ae00d4dff415d92d9c57931571d6f4c233221c1a8ea82c1f16629ba68dfa76abd462d953152643d098a SHA512 88a5a900b83df3680f1f437329758489d0de63da450921397b4c3256decd455ad134da5a1311fddee4bf9843b3466a6c6e70b0e6bad6bb7d90de9b73c8e67dcb
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-6.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-6.0.0.ebuild
deleted file mode 100644
index 11b0f808436a..000000000000
--- a/dev-python/py-cpuinfo/py-cpuinfo-6.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Get CPU info with pure Python 2 & 3"
-HOMEPAGE="https://github.com/workhorsy/py-cpuinfo https://pypi.org/project/py-cpuinfo/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-distutils_enable_tests setup.py
-
-DOCS=( ChangeLog )
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-7.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-7.0.0.ebuild
deleted file mode 100644
index 54134f814a62..000000000000
--- a/dev-python/py-cpuinfo/py-cpuinfo-7.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Get CPU info with pure Python 2 & 3"
-HOMEPAGE="https://github.com/workhorsy/py-cpuinfo https://pypi.org/project/py-cpuinfo/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/py-gfm/Manifest b/dev-python/py-gfm/Manifest
deleted file mode 100644
index 2904196ddd7d..000000000000
--- a/dev-python/py-gfm/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST py-gfm-0.1.4.tar.gz 21015 BLAKE2B a3060453ce9b2c0a4c3112f003439527c03b7b0be439b63620575e95265d8a65c1053546f9cacf19b6006ef2cbcfe5d8dae762740ce6e6aa035706a94bc611d1 SHA512 4730035b8a6168b6d2987a4a5f9a0ca70564e6797b7c88ec43f04152fa77c5a396f204b6143fc0bb3a53ab364b6d11b2274663b8b64d4640afba2a21cd1e3c6a
-DIST py-gfm-1.0.2.tar.gz 15134 BLAKE2B 9aefb7a804f6b857ccaf55f006b9e7317e7a45de285a95ce65664361f5f644be630c912824d09de959df2962ddfa64efe8b77738a59b1679150c63649a1d116a SHA512 a1c3a39c86f0588744690811503d35596d83a5fdfe725295c9ba0820364c586bd7ab9a2beb2379122ca13dcbb1fb9aa2ab0c8c7348d4a483d8ffc8686631a8f5
-EBUILD py-gfm-0.1.4.ebuild 524 BLAKE2B ce558b3c698a7428eb70ecc3358b526c2ca0f34e833e4c125e658e25eebec27bfdd0911518cb50fa24b54ff24495387983e03bc586cee7b767cf18a5d4ddaa25 SHA512 1001617a5326ca6e00e748393326e0c71bbb96a08297e365c3575511fda9a9a682157ccdf23064979749449b93c92127d9e001fb7d9d882b485d9c34f3a04873
-EBUILD py-gfm-1.0.2.ebuild 457 BLAKE2B 32a337681f187bad6bf594342632e4c91c6777a340dd55ca05518296c43efb02d2fa44c7b9f52af4258d54b10ce504db2dd4e732b17d04bfec7e6a02b2062042 SHA512 e8d28d8e3900d62399a2796fafe79b8e02471ea8eb344a43cf42dec400bf7a1757d8ed72ddc1c59a258865e92864a7f2a60d5a7d420562677a87cf1fc2f05c00
-MISC metadata.xml 388 BLAKE2B f73648ac62e41ee6139dc0f0c13cd07797c1e4d9d9afcaed86bffe8da8934134c5214ab5f737e1224ead18d5eaca57312657beb55cbf386f01aeb1c13be349bf SHA512 7557d2fb1b4bf8543ff6a3cd548ff0db508cc6778024b5cd75f11f9b852f93f886c57a362c0508b711a855c705e2e3d4911d2bb92dabea5644afe1b8b3de04c9
diff --git a/dev-python/py-gfm/metadata.xml b/dev-python/py-gfm/metadata.xml
deleted file mode 100644
index 2d4570cd25b0..000000000000
--- a/dev-python/py-gfm/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">Zopieux/py-gfm</remote-id>
-		<remote-id type="pypi">py-gfm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/py-gfm/py-gfm-0.1.4.ebuild b/dev-python/py-gfm/py-gfm-0.1.4.ebuild
deleted file mode 100644
index 60d400dcb27b..000000000000
--- a/dev-python/py-gfm/py-gfm-0.1.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Github-Flavored Markdown for Python-Markdown"
-HOMEPAGE="https://github.com/Zopieux/py-gfm"
-SRC_URI="https://github.com/Zopieux/py-gfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/py-gfm/py-gfm-1.0.2.ebuild b/dev-python/py-gfm/py-gfm-1.0.2.ebuild
deleted file mode 100644
index b43c33d2ce17..000000000000
--- a/dev-python/py-gfm/py-gfm-1.0.2.ebuild
+++ /dev/null
@@ -1,20 +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 distutils-r1
-
-DESCRIPTION="Github-Flavored Markdown for Python-Markdown"
-HOMEPAGE="https://github.com/Zopieux/py-gfm"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pybluez/Manifest b/dev-python/pybluez/Manifest
deleted file mode 100644
index 9159eb83fad9..000000000000
--- a/dev-python/pybluez/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PyBluez-0.23.tar.gz 97562 BLAKE2B 6a234d5c41dc0bb9f08559431eafcf1d1fb1c881d2cb912cc048e2717bfe8a06f09aae045d2961c9ba5e087422cfc8249a1907368eb6dc45942175bcf97b1841 SHA512 78ce2c014d0055d0220163e7df94de5b6e891aa528ecf4f106f9dd0bdeb94244d18c752f93e62a133f3cec7053cb4646599e7588cf7ce5994ae7abe74ed05d47
-EBUILD pybluez-0.23.ebuild 648 BLAKE2B 72ef813d5642ae1f0bd035667510af59b0fae7cb2395e3256ff02667628a852fecb58fa3b0d8d72b221e3f03a395b3e1bbd89aa7c5f95d0a7d55116d18a65fa3 SHA512 304232d5c76839c4c0c1a6abc83fd29d6c250c69518f42ba54f0646cb2619841e5a4da215b3de2248b0153f272a8519c9f33265e1188e846bc88eddba9e5a517
-MISC metadata.xml 540 BLAKE2B 892d197a9f26b6dddc4372f231fc6398d0c690367f8d3622efb6c76cdfc702e561182ae7d88e9672f6aac9cb9d63470a5cc1bf14df5eccacde30c868af3cc28c SHA512 83c5e00970908b652dbf175c3ac5adb47401dbbca6e16b2672329c09e533e03683894dbfc61963b0b19d9ea8aeeedb26b9fcd5616b0802ec69693a21d53c4b54
diff --git a/dev-python/pybluez/metadata.xml b/dev-python/pybluez/metadata.xml
deleted file mode 100644
index 1336a869ab10..000000000000
--- a/dev-python/pybluez/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<longdescription>PyBluez is an effort to create Python wrappers around bluez to allow Python
-developers to use system bluetooth resources. It works on machines running the
-GNU/Linux operating system and the bluez bluetooth stack.</longdescription>
-	<upstream>
-		<remote-id type="pypi">PyBluez</remote-id>
-		<remote-id type="github">pybluez/pybluez</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pybluez/pybluez-0.23.ebuild b/dev-python/pybluez/pybluez-0.23.ebuild
deleted file mode 100644
index f865c30c8ecd..000000000000
--- a/dev-python/pybluez/pybluez-0.23.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-MY_P="PyBluez-${PV}"
-
-DESCRIPTION="Python bindings for Bluez Bluetooth Stack"
-HOMEPAGE="https://github.com/pybluez/pybluez"
-SRC_URI="mirror://pypi/P/PyBluez/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="examples"
-
-RDEPEND="net-wireless/bluez"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/pybtex-docutils/Manifest b/dev-python/pybtex-docutils/Manifest
index 513a92011622..170de3f9ed0a 100644
--- a/dev-python/pybtex-docutils/Manifest
+++ b/dev-python/pybtex-docutils/Manifest
@@ -1,5 +1,3 @@
-DIST pybtex-docutils-1.0.0.tar.gz 13627 BLAKE2B 5a18c29fb64f9b19deb4699017de17b1d4a112e0739d84066c4eb0df9d51005fe3b0132a7d1e46e3dad5b9b8e41340cf1a4da094ab20dd140cc83a3a53d82ca8 SHA512 d0054c5ed27a8c57b85963c5f3443d53fe8edab8ce2cf924eeac73240d662a6ac3cf74b2e38601d708809ddbf0984b3c7f24f177c67f77039bc236360474fa38
 DIST pybtex-docutils-1.0.1.tar.gz 14234 BLAKE2B 3c3946309ad19acb19703c0ecd7fce048808580df27ba39ce7acadbc0db154bee1f1e31d448015a8ebbbe034812e2f76fbed6f47a687c035750fc2908ca940c2 SHA512 8f84a822287e78a09b935a0f358b48e8a02be21303907fdce352515a844fe22dadb44646ca1abc44c8a8e7523c4f7074f3673fd6d565b178c862589cf58e9a48
-EBUILD pybtex-docutils-1.0.0.ebuild 520 BLAKE2B 35d03debc750b593faeef4fe364db5d62c7904d07047e0ea276419b20916a327227fb6c2cfa4ae1c01a0f6e003f981cd6e451704b52137fee4f4c775f53ad04d SHA512 1cf47850d12c4f4804b5f884650162219305ca68d49833791955c4353e8c2938c9c75216390642bd5b8701cae1ffb5ac89a149fb60ed6ea7588b10aa8c672eb3
 EBUILD pybtex-docutils-1.0.1.ebuild 529 BLAKE2B cf6bdac0501820a591e2fa424e9fc29d69ea2e3a0e09fc667a3e3c59fa43d77fc5f8e50efa0109511d9b5a1538805ce0f0004880b41beb7052997981d99ec7d3 SHA512 7ad018471351e33e13c2e6c388634686d82dfb1537ac6fe325a371864e9919a053b3ef7409ddbb87a4c06c3e86a7bbfe3d6f3fdec40f7d90bac4b8c1d8e9cf89
 MISC metadata.xml 428 BLAKE2B 876a8f74ae3520e45e2ea1e7ce1dabb7891738453e6bc4757c3e4d9228a0c8d6407e350dc902f1e8f2485366968e25fab8d8921ff4207076622cfb3218bee221 SHA512 85e0ffb9a24ef252898df540f4fe0b80626f623faf06e3650d1cc5473c986c79785b330420eda2c966ec985c12800a97552c659b32b91bff2ea2f39c5f36366c
diff --git a/dev-python/pybtex-docutils/pybtex-docutils-1.0.0.ebuild b/dev-python/pybtex-docutils/pybtex-docutils-1.0.0.ebuild
deleted file mode 100644
index 180da6ee766f..000000000000
--- a/dev-python/pybtex-docutils/pybtex-docutils-1.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A docutils backend for pybtex"
-HOMEPAGE="https://github.com/mcmtroffaes/pybtex-docutils"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pybtex[${PYTHON_USEDEP}]
-
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
diff --git a/dev-python/pybtex/Manifest b/dev-python/pybtex/Manifest
index 226876f964b9..eb0cdd78dd56 100644
--- a/dev-python/pybtex/Manifest
+++ b/dev-python/pybtex/Manifest
@@ -1,6 +1,4 @@
 AUX pybtex-0.22.2-fix-test-installation.patch 410 BLAKE2B 6c9addde727e5e1c0001a92ad39c307399331e6ff6e1b5aa9cd691e4c8d6381f0d911fc8e622e8a2dd76736fbeb24513751651886a9db0b5e790a509b9043755 SHA512 d357f3f0566fb67b1ce2abb8669429b344f8d6f4bc8651ea913fba3337bfb33a1a7f6a6e1361b42b42cdf92ec09f60c42262f5c41f12da6b34593a1033c732db
-DIST pybtex-0.23.0.tar.gz 400649 BLAKE2B ae841eb98588fea55dea59a90be4ea5489b115b5594aa2ba7da140d529371c9275d28896d2b3b1d7fdbfe6a4bc7f1a99a8a73505f5d141f7affc0f22e5b08ceb SHA512 11b4c8141f237a25c320726b18fb254df077f4b644ac26fa2bf9f3d85c4301ab839f3544a3c1849243e75bbcbf194b25642b0ef11d354e3711578a4e19565bde
 DIST pybtex-0.24.0.tar.gz 402879 BLAKE2B 0cbb74360ebb4e9598543b17a46f21fab037d83a50ee46eae50dd385b981789d72c8cfb0b6c9983a3721565cdefb0df7ca15c120683e33204c591863be79d23e SHA512 caa3480b82012d1db5e44ca7fb5a4082e9aa27e892364de22bd05b0b589da3b1bd41eacd3cda8f86ce567b32ab9a22765d2d8d89c21936d4149d4511349c556e
-EBUILD pybtex-0.23.0.ebuild 763 BLAKE2B cbe7bcc848e40e2b55b9dc8e63ed0dba479accca9538676cb0fc23a40fa35d03c02be31796acda8ac2f8528af18ec74256989e48f9dde98c65a342238302a8eb SHA512 5bb9b9d14091f6aae1f246eac11460b33b9e4061ff159b52fef7ed7a5ec05aceaaa96fe8d2f7b79611725c2b216b8e0ff990b81c9b918394017c920114f42540
 EBUILD pybtex-0.24.0.ebuild 671 BLAKE2B 0c6a53ab7569a53da34e19922ee2d2034d6a0d52ebd19ad878fe58f70f8e7f8ffbab5b7d49575a797aab531409318cf5dbbe210ab905a7133d28554c9f4fb559 SHA512 746490efbc2a75014c16496d6ffbc1810910f47b21c6627864212e8de8d545007e33fb2652a99b667c82d82939d6afe82c0c50e2eb4d5755c7e7b55581a3dc7b
 MISC metadata.xml 553 BLAKE2B b0dd3fe280a5909fa264d22ab6f1e2ac8fd6812db7b590959c7ab2a5c5290fa42cff896dd85a089e2925f9fc2c2662e690013d31423b663eafa48cd382cf8208 SHA512 c8c93d21c8d121139145d6e394e92076153599150ad2b7d12bfd746f070565bba8375b1220839cceb4b7172831ed915160cedaddd36ca50e3cca2b08621a3a60
diff --git a/dev-python/pybtex/pybtex-0.23.0.ebuild b/dev-python/pybtex/pybtex-0.23.0.ebuild
deleted file mode 100644
index 1368c0360217..000000000000
--- a/dev-python/pybtex/pybtex-0.23.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="BibTeX-compatible bibliography processor"
-HOMEPAGE="https://pybtex.org https://pypi.org/project/pybtex/"
-SRC_URI="https://files.pythonhosted.org/packages/source/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/latexcodec[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-BDEPEND="test?  (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/${PN}-0.22.2-fix-test-installation.patch" )
diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index aa9609aa4ab7..b65edcd52d6a 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -1,3 +1,5 @@
 DIST pycares-4.0.0.tar.gz 43512 BLAKE2B cccfd5738582da570a2b9b17e6e31764ff2fffe4306f08c09374707a8e1c997ca7bdf0c867252c6ec66712622c927989c4d8bcad42075c48cb2af0a5364908e8 SHA512 796f14fb13c5e848b98459287d9658e8d81a48b2b6e08793f794bf9bcf7381bd400f43a07b50b23c4578579098dab5954beae09f8d35da7b809552f701d03b05
+DIST pycares-4.1.2.tar.gz 43668 BLAKE2B 4b26f8643ff5ce297981b0b60b3afb34b249138e8f702dd4aa0a38935e9e5338d048f3be1b4fb64d6d8b2259a279a8881dbd44b412c10427dbd7eee664e70495 SHA512 6fb2d24fb5f2638c55424608b02ebe9f630866d644decfb663ab9d8e2bb7a42629748fa220054747f9c36ce3dcb42f3b8e457c5c39009f94b564ff07efde0c84
 EBUILD pycares-4.0.0.ebuild 726 BLAKE2B fb25f94b2d75866eae37be6e8d6b3634cb185a9fb96181dbfb6ab6f504e757d154c8aa5343c76f3042c2aecdec83b1d1a4540d0a54217314a703da001ec9edad SHA512 70cfe97a92e1c142754cb95d53cc017a02cfd8afc18440453790f970706e830149057bd230923b2a7aa5867918b617f15b8bbc6934651d8fa4be68a00bbdb87d
+EBUILD pycares-4.1.2.ebuild 831 BLAKE2B 1d2f9bef253be90d5e67fe352f2c358ee381f9f162e74923439379991536ed5419d489cdbe6a9cae569f400f61ff9d73a86723520d87d157d1341a8a9edb2418 SHA512 ffcf3c56bcbaf7bffce6b5ac3c611b552c14e1e51451d208e89b46741da25f6a6012db756bab511ca5dbb72794fca6f401f63c7174e6e41fac8dbd90bcc20bcd
 MISC metadata.xml 444 BLAKE2B a68f545c6f704176b98ebb3665e2f56e4879016ea4ffa4f342954d568d6fe76ad67bcf9d521f694b8fc0f199bff50969eb646554fff4a78f8644ac44edda0cdf SHA512 fe893795f2031639d9fa27efcb8afbb5a3e0ac2eb2a05f0465391813d60fba07372633e40136ce38eb429bae95d1ae5dccecd0aba228537553524343133dd202
diff --git a/dev-python/pycares/pycares-4.1.2.ebuild b/dev-python/pycares/pycares-4.1.2.ebuild
new file mode 100644
index 000000000000..c24fe865ba50
--- /dev/null
+++ b/dev-python/pycares/pycares-4.1.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for c-ares"
+HOMEPAGE="https://github.com/saghul/pycares/"
+SRC_URI="https://github.com/saghul/pycares/archive/${P/_p/-fix}.tar.gz"
+S=${WORKDIR}/${PN}-${P/_p/-fix}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+# Tests fail with network-sandbox, since they try to resolve google.com
+PROPERTIES="test_network"
+RESTRICT="test"
+
+DEPEND="net-dns/c-ares"
+BDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/idna[${PYTHON_USEDEP}]
+	${DEPEND}
+	${BDEPEND}"
+BDEPEND+="
+	test? ( dev-python/idna[${PYTHON_USEDEP}] )"
+
+export PYCARES_USE_SYSTEM_LIB=1
+
+python_test() {
+	"${EPYTHON}" tests/tests.py -v || die
+}
diff --git a/dev-python/pycdio/Manifest b/dev-python/pycdio/Manifest
index ebe0f105c744..9cb4a89d501c 100644
--- a/dev-python/pycdio/Manifest
+++ b/dev-python/pycdio/Manifest
@@ -1,5 +1,3 @@
-DIST pycdio-2.1.0.tar.gz 241434 BLAKE2B eb981fdf52b205e14c6dd353ac4aca9a9e82dba6967a53b9059f8a265ef80832fe7236d68b2af7a6e408665fce0f5ed3541289e0b7d282834c4feb8e6b428fc4 SHA512 dc18fbd212f7040b8b06efaf263b17568e9c2d089cff7dfc4dda50a7225059e44c9c86e2d81ade92cf09c823f7189b5723fb601cb12f0884dc04e9f5418c5927
 DIST pycdio-2.1.1.tar.gz 246562 BLAKE2B 7dbbf384f9d70aade922172c6dd070229c1ffc65a76a491c45f91ec176bced9af0dc0e08f50f8ad78828273de14166eae886b402f282a10bdad3f8302276ef01 SHA512 4c756b1c2f39332add86e01af129ccb608178306be42c9719c163b6bad0ba4de3916ac477c6866450890e094b14a2689a24e7d19bcf13846330555c2bb1feaa7
-EBUILD pycdio-2.1.0.ebuild 1089 BLAKE2B d50db41fa7d845782e0f22972c7888362bb7fd52192445685499ec131b0d7c35e109ae2fe061a67fdb0be1019d15d0478fbdfd4f1eec37209b6902e1650a744a SHA512 8725ca8e1de99a411a78b88a0a58f23af4c8da843f79c0c0d39312326d0190c88a7925c8badbd2d2ae3c5f332b0fd79a8b596223690bd8b7f93b3761bf15870d
 EBUILD pycdio-2.1.1.ebuild 948 BLAKE2B 8649bda8abe1d245b80abd9a4058d36fd0ce40fc7187768f16a86527b22b1ed8b7faee778cb4ab33644a9eff0d1ea7f5179eb31637d13ee454ee93eb320e5695 SHA512 6cf9dcd99dcc0a5dfa48b916f75bc01daaf1081a523e0961db38c7d2aa9e41933e65ce0f3edb71a92121985e148eb650f93ce56bd33c979766bb631603a8fc5f
 MISC metadata.xml 604 BLAKE2B 960c29cc25612bc44d4a307046be46a341f4a3998dc8fd9f478863f83b4a90a29cfd0555f6116cd99512b08078e520582466608cfc05be52caca8b27102d13de SHA512 aecea12390bcfa9143cb51049dd357b25772ca6f4b0c0e5694f387a75433db55f0068ed9191534a1ac07224f4dbd1db25a6b4918635dd854a5a87ca5529b3378
diff --git a/dev-python/pycdio/pycdio-2.1.0.ebuild b/dev-python/pycdio/pycdio-2.1.0.ebuild
deleted file mode 100644
index 5652e3e6c98c..000000000000
--- a/dev-python/pycdio/pycdio-2.1.0.ebuild
+++ /dev/null
@@ -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..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python OO interface to libcdio (CD Input and Control library)"
-HOMEPAGE="https://savannah.gnu.org/projects/libcdio/ https://pypi.org/project/pycdio/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-BDEPEND="dev-lang/swig"
-RDEPEND=">=dev-libs/libcdio-2.0.0"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# Remove obsolete sys.path and adjust 'data' paths in examples.
-	sed -i \
-		-e "s:^sys.path.insert.*::" \
-		-e "s:\.\./data:./data:g" \
-		example/*.py || die
-
-	# Disable failing tests.
-	sed -i -e "s/test_get_set/_&/" test/test-cdtext.py || die
-	sed -i -e "s/test_fs/_&/" test/test-isocopy.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/pychromecast/Manifest b/dev-python/pychromecast/Manifest
index 3f4503355fa0..8f7fd48e58d7 100644
--- a/dev-python/pychromecast/Manifest
+++ b/dev-python/pychromecast/Manifest
@@ -1,3 +1,5 @@
 DIST PyChromecast-8.1.0.tar.gz 50867 BLAKE2B c5d3e07f1644d0a83ba25826e27ee62f36b80f594f6851714c2d17ab6e8bb9e982bfa72731715bba15b6b587967461bb5def3cc49569d43b5186ceebc4a360c0 SHA512 882ab5987a7ddbf61a177ff867986461bc21bb5560a7de1bafb3a873173981139897ca36336e5b21b0e013f0100d437d1077038f35676998d3eccf353d684f9b
+DIST PyChromecast-9.3.1.tar.gz 53253 BLAKE2B f246a38c79ececa17721ba2d8397da691310462ce9b19aab2ad525d82ff8c4db213fbc8fa3e9205bac3ffbde72f7bd75eab26c6b5430921bd2fb561a49808110 SHA512 ee4ad719a1142e1a4c67b99b6ceadfd076cb8b818474c5a5b9bc9dd2d03f13feddcece4983459013192f85bdc73339749d0b2f2c1881ac879d211dbe2e578605
 EBUILD pychromecast-8.1.0.ebuild 595 BLAKE2B 49afa36e52f9d0820e46a7ef8fb5f6fe6c02a783394b1a429d25ad8cfc1f6bdf880a4899ea606c2e1f5cbb70dc14bc1885f563b44e04b86e60fbc65679af870d SHA512 d3afbf7c524d0fae0919fdae98ff0f71242cae41a943dacf00c379aea4fb963ab3a9347e52b3b625c57d374ab03ee463c715cff582e0dd9182f90c3afd06a907
+EBUILD pychromecast-9.3.1.ebuild 595 BLAKE2B f66b0503496872d706d5baa34e1249e50135244364bfac6a5fac202f886a1c0d1808f5675f29118549c09992d128ae5a802af05d0ba078a07f9ec2c41453ed2c SHA512 5a847a531e8b43efe719c612080276314bd29409fb65f701cd869f8c81bdcb3ea22b0dab5e06b1bf2b7464108573969ea30c162dc22c50fbf350c47d64e147de
 MISC metadata.xml 354 BLAKE2B 20ef68373d5cb62e00da147728ff8f59faed7dcb88315c4460e1a6ff7cb31d40d56e639974d8494ab085c6b7faefffef6c51e4494b0b3604dbe9e3ab909adef4 SHA512 79684ace1b10ffce070e3fc83073b110e31fe2efdcfbd56b84c961716843f48d1df7defd330ded7862e006cb3f8d665de16481a16742922da450ef40bbf1209b
diff --git a/dev-python/pychromecast/pychromecast-9.3.1.ebuild b/dev-python/pychromecast/pychromecast-9.3.1.ebuild
new file mode 100644
index 000000000000..da95c8815f5d
--- /dev/null
+++ b/dev-python/pychromecast/pychromecast-9.3.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python module to talk to Google Chromecast"
+HOMEPAGE="https://github.com/home-assistant-libs/pychromecast"
+S="${WORKDIR}/PyChromecast-${PV}"
+SRC_URI="mirror://pypi/P/PyChromecast/PyChromecast-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/casttube-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/zeroconf-0.25.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 105ddeb40718..595785933fe4 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,5 +1,7 @@
 DIST pycodestyle-2.6.0.tar.gz 100213 BLAKE2B 484cad34de86ae50f8efaffe590e79fa52ca7f13a3a9d5c9d52f52aef7a940a9eee8cff74b3bd1f711c3a01155f0ce6794196817d1b0e941b8afc77de4804387 SHA512 3bf9904752170135ca399a1b25470a531adb5b85dfd8df7ffbbc86b5875bc3a507cd8732158bc9cb7fd5b44b48c9a32d63d621856d55a15bc3104a99ca4bd271
 DIST pycodestyle-2.7.0.tar.gz 103640 BLAKE2B 5b1ad351aadff101732748fd4d3a4d34c3eabc058dd9d0c7551afde0dbb169ddce82ccc539e71b72ea2df0dc199b3c2213d259910a18b5acd892782e1314cc19 SHA512 26502480e5855f0fd9378664ec813bb38dc2f8ac22e01767fc8bf75e52fa7a7691382fd4f6f1edaeb5f41d150ed71ee87e0d7f525bf06acbf4b3034cec3a227a
+DIST pycodestyle-2.8.0.tar.gz 102299 BLAKE2B ac4708a513582bb0f27f1abfcc983319e6c7b853c53971d5f026f297f897b25a6c8a651a4d2441b19ab37e6df6f7a38a472aad0757fec59e0438263d76ccfdb2 SHA512 0098be44451bc173507e2b396aaf342ccf7f25a6a1f5d5c1f802079a76a66e6bedf9f358b5e07b27bee66e3b279c72a6b72f63e5984f58ae83b7fc5806880fc1
 EBUILD pycodestyle-2.6.0.ebuild 864 BLAKE2B 97507cc28662b2cab48505c4036c79a45c1b56b17a059bb78b74c4f9e04a8296f7dd8d5f7d877f48916ec9f27c9c866e5015252efccfcb73ad262392b5e50309 SHA512 33ed296fb2e286f8dc79845f416b3a9e309f908a2eccec959746301deedd0dd8dd3cfd7f3dae705386bd1325b207fd222ac890dfb20ab2154f1d7bcaa5d85ce9
 EBUILD pycodestyle-2.7.0.ebuild 844 BLAKE2B 3892da1bf698b18ee7e58228b73853bc28adde65ffed6cbe02c61276992acf62cbe9580dcf08155276af526aade2d3558b3694c2b786a1fba161dab23f96e863 SHA512 0474dedb6169e5971dbb3a01343657c4c48ede5a49a532bc77efa9834fa7c4026f08a8e063553123031ae327bf843ab85b5f321474372312dfdd16dfe47974ce
+EBUILD pycodestyle-2.8.0.ebuild 851 BLAKE2B df409240ff1706537098d1eee9d7b3e3769ee0eeb6364d80d8bcd42ee38ec1ecef4d2081e70e8ee9aee427942b8db76cf9b392e1cb70e8a0448bef72dcd9e9c8 SHA512 8b3f24273c73fc00c4bff4b48d2fbdd8e7dc4a9a263c75dbbefca1ffc36620e32dc26768db99a9e792676cb3cde80feae7c71cd18f201f5a4742e6e416a99b78
 MISC metadata.xml 361 BLAKE2B b3f0256eba2adb55c6ea6945ebb2d8e6989895de1f733aff02ffec03812451cbb5684d9fa365d5a79675c7eee165501ea473f776dd99c3c6380aa4e8d1bc43c0 SHA512 2fa3d38366696d19479f11a443fa488e95a9805a1663e112d518d4f84cd7cd00e06cb06dabc5760b41478199b767ad3165cabec6907c5037effa70b623e0c5b7
diff --git a/dev-python/pycodestyle/pycodestyle-2.8.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.8.0.ebuild
new file mode 100644
index 000000000000..6396cfc0e67b
--- /dev/null
+++ b/dev-python/pycodestyle/pycodestyle-2.8.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker (fka pep8)"
+HOMEPAGE="https://pypi.org/project/pycodestyle/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+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"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --max-doc-length=72 --testsuite=testsuite || die
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
+}
diff --git a/dev-python/pycollada/Manifest b/dev-python/pycollada/Manifest
index 7f8ae66761fb..5fc0a6b18509 100644
--- a/dev-python/pycollada/Manifest
+++ b/dev-python/pycollada/Manifest
@@ -1,3 +1,3 @@
 DIST pycollada-0.7.1.tar.gz 3526373 BLAKE2B 9adcbff206bc856fce1eef1784734c5604800cff350d32a83d53a4eaf965673adac797f510662dffc70fcfd76a7102fdb9321ead89d765954ffccc9338df446a SHA512 ac4d88b2398bf0364beaaf3e2e468be9131dc0f8088bfce8be18d9eb5a7c093db84a364931884fa7c493dfae81036ec63bc7c689ebf49e961eefc0c4853a0131
-EBUILD pycollada-0.7.1.ebuild 987 BLAKE2B 768cc873e5fc12023099d48e6bed940caa672ab0546c20d2d27d8dd176dc5dda3def3920864565f9326370ca49088ba3743e1275c061dd8af645b7beae19e612 SHA512 694a70674bbdf57d0d30c4a64ac0d64ace7e87f737ab53f4aa1b3a8d615d1c355ee8913333c784e9e6370cf155e7fe3f9290224004b410228fe98101bce4a24d
+EBUILD pycollada-0.7.1.ebuild 985 BLAKE2B cef7291afc8841bef3251ae0205af740a4aa2798f80a20f315ab28a2442a82836f041421b4719395caab427e40fc3bead7a4ff318552c4e9a06c57ed1ce0e050 SHA512 fc0015fee93458f25f6f728e56f7a972306f55ef7af753f6284137b8583de16647b52227e0a7532f2b49e2701de90ab3b7f2a3ba95624e05f5d16e8263664a1b
 MISC metadata.xml 798 BLAKE2B 2316e4dfff5e2f1c3ebbf58022828e155a94b6266dc1717988246e2e9c14d946c73323c73cd94f4e834bf199af20cad162529fec2d6798d78fa6a3de047f2ec8 SHA512 cca0d6eea8477c99b838b9f28b5fceb86ae72b2b90096d5a3019b38ece45be97e4267f320d9d9d6abe325091ed0646bdf2e84fe68cbd19b887ddd9318877f394
diff --git a/dev-python/pycollada/pycollada-0.7.1.ebuild b/dev-python/pycollada/pycollada-0.7.1.ebuild
index 95554b5dbc4d..895b64d55b5d 100644
--- a/dev-python/pycollada/pycollada-0.7.1.ebuild
+++ b/dev-python/pycollada/pycollada-0.7.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycurl-requests/Manifest b/dev-python/pycurl-requests/Manifest
index cf270eee6e38..bcdee05c8c39 100644
--- a/dev-python/pycurl-requests/Manifest
+++ b/dev-python/pycurl-requests/Manifest
@@ -1,6 +1,3 @@
-AUX pycurl-requests-0.2.0-test.patch 1603 BLAKE2B 7f0a8964aaac2e73e5198e8e54f7ef4521c06118002950c58f214f95539f9b1be59a9cbeca7f5a790b05b877cb1d537ff59544ced47954dfebc32c4cd23088fe SHA512 6c9e4d89124ebad203847d1b905572a089faaa1e61bba8ac0105da78a0d906c2c7f602df120009775b3ffd21b522fbc999c521780972fea41c74f65a66cf328b
-DIST pycurl-requests-0.2.0.tar.gz 22962 BLAKE2B 9e28422e910ab88f2f6ace1684cd35a89eccde9eed9d63f48cb2d6f0caa30811016365fbbffc2bdd2dd8b05a3b248142a5822c092c9d40ebaabeed4ef068c659 SHA512 3bf091ff47e376a23f9046dbcc5631199da9434911d4140f5d09e5091b81f05c8cd8094528b7ac7d74f7a4b085a6dfd40bec81c66fde020a0680e2237b7af5b2
 DIST pycurl-requests-0.2.1.tar.gz 24133 BLAKE2B b5994985621096edb4ea16859fe80e2c83221e32145d2ab0a6cb414084de9966df8ff2fbd7b38250b0ee096fb2c7cf98d4632eca814365bcecc5f9d69462fe6a SHA512 83b1052c8f007282aa5a8763ec44b3434604dd0b0b025d2bad0e45117438afdc6d05c2cf94516bbe993eb65bd1dbfac182954c1ff3a641cdb767e8f22c505574
-EBUILD pycurl-requests-0.2.0.ebuild 598 BLAKE2B 36b01ae377faa61ab4af1f4251712f2eca435d6c16dcdc26961fbefb05811c64f9c6887bf3e509f49f63aa4211aef25fbc49c7af60765f061f51d27e9ec13c21 SHA512 9d77670c3bc07c50bb812cc9378346fe159b91ec32f3e607ead5b3e061ac82e64319b77c255bd00a84740fca9333d12ba0013eb504ace1aa6fd6b801e19d1620
 EBUILD pycurl-requests-0.2.1.ebuild 779 BLAKE2B 12e963ba6f233a9165e345ed0a41ba8e30803c386048af10987c9788be41e06bc2562ce260e4eb5300bd606f3a467b67f28a38731f00f59ce9c02bb0eb7df5a7 SHA512 0069742f7ad88c206ec01b0f8ca450e5ecb66bcd43a5b050b4865d5c0aca19e60dcfdcb0556dfd57f4553c25ff9af80d4461f38f8b0bbeaad0621e6fc8a0f0ed
 MISC metadata.xml 375 BLAKE2B 1f54b7146c7f6231b4fbcea2e1096beaaf008a26da3468b9c68dbb875fa83ec167c0f7a890fe7e81570e3742d630304f1dd712198ebe0f671921cc87c2494303 SHA512 93ae27addae5a55763f31c261cd5a2a275654f8de3f5579e4071c1d10beb63e23def3552ab871af95739b67bc6d37ef7f577bdd5cfaa4b689105fc0634eccbc7
diff --git a/dev-python/pycurl-requests/files/pycurl-requests-0.2.0-test.patch b/dev-python/pycurl-requests/files/pycurl-requests-0.2.0-test.patch
deleted file mode 100644
index 2bed5e3c93c2..000000000000
--- a/dev-python/pycurl-requests/files/pycurl-requests-0.2.0-test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/pycurl_requests/tests/test_exceptions.py b/pycurl_requests/tests/test_exceptions.py
-index 2415ba8..6960615 100644
---- a/pycurl_requests/tests/test_exceptions.py
-+++ b/pycurl_requests/tests/test_exceptions.py
-@@ -32,7 +32,7 @@ def test_connecterror_resolve():
-     if IS_PYCURL_REQUESTS:
-         assert isinstance(exception.__cause__, pycurl.error)
-         assert exception.curl_code == pycurl.E_COULDNT_RESOLVE_HOST
--        assert 'Could not resolve host' in exception.curl_message
-+        assert 't resolve host' in exception.curl_message
- 
- 
- def test_toomanyredirects(http_server):
-diff --git a/pycurl_requests/tests/test_requests.py b/pycurl_requests/tests/test_requests.py
-index 7d2c627..850d530 100644
---- a/pycurl_requests/tests/test_requests.py
-+++ b/pycurl_requests/tests/test_requests.py
-@@ -160,6 +160,7 @@ def test_get_timeout_urllib3(http_server, timeout):
-         requests.get(http_server.base_url + '/slow', timeout=timeout)
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- @pytest.mark.parametrize('timeout', [0.1, (0.1, None)])
- def test_get_connect_timeout(http_server, timeout):
-     with pytest.raises(requests.Timeout):
-@@ -168,6 +169,7 @@ def test_get_connect_timeout(http_server, timeout):
-         requests.get(http_server.base_url + '/slow', timeout=timeout)
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- @pytest.mark.skipif('urllib3' not in sys.modules, reason='urllib3 not available')
- @pytest.mark.parametrize('timeout', [Timeout(connect=0.1), Timeout(total=0.1)])
- def test_get_connect_timeout_urllib3(http_server, timeout):
diff --git a/dev-python/pycurl-requests/pycurl-requests-0.2.0.ebuild b/dev-python/pycurl-requests/pycurl-requests-0.2.0.ebuild
deleted file mode 100644
index 479af0c574d3..000000000000
--- a/dev-python/pycurl-requests/pycurl-requests-0.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Requests-compatible interface for PycURL"
-HOMEPAGE="https://github.com/dcoles/pycurl-requests"
-SRC_URI="https://github.com/dcoles/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/pycurl-requests-0.2.0-test.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 7eb7268173d4..0f920aa947ed 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,6 +1,4 @@
 AUX pydantic-1.8.2_p20210719-update-py3.10rc1.patch 5461 BLAKE2B 991dc2438ebe9db73313761c59a1fc854a11990cf32b08cb98f07857a21a4123642ce280b7054071659ac3dad7c6400be83d62c990ce53dafba028d42389d84b SHA512 77dd1770c194c94dd27a9bd4ab044e02cd3f6716febd95b66b78ea043ea1b519beb896a2452c6281723cd8aef3d32f6f3db48fa08f83d6380ab7f602a74bdf16
-DIST pydantic-1.8.2.tar.gz 301802 BLAKE2B f02fca273c356dd0ab177de73d21da7749e1a9ea1ead92f4e82b44285b97e8b8431961b2c30d230cbec817698791e4b0cdf8498615b7a0639fa739b09f1b58e8 SHA512 0a28c64b97678b932092e546da877a4a6d104fc7d3b7cb043b3494f0b7c6900cdc1ab8a83bdbd1879956a81da1b28ca27578b1a003bdca3e08f0f107e5690e06
 DIST pydantic-1.8.2_p20210719.tar.gz 310729 BLAKE2B 1905ddd100e3a40b48eadc7beb75542f4a59ff8ef55115105041b0c06249ee67df1ca91003bc01f828c543c757ec8931ff2d31663d33ca16f356f62f71a61474 SHA512 c9d91788b3143b211755806e533ae0ccafa2ab101159f98eeba921ec9370956e8f8b0f210e6ddddcef2345ea391d2e1011ea5498d2f7985bd711f48d025e30d5
-EBUILD pydantic-1.8.2.ebuild 1013 BLAKE2B 54ae89c0eb96fb0b4691f5cbcc5cf7d9825a27ebe839f2e5555f54345c48b3cfe0b814d7d69b88d64a4dfc8dc95e20b0d6ba0ad10102fea040ee66e78cccf255 SHA512 821f5466d0dd21d98dbb9bd32ae96e3aacb3b390ecb3f6b541c9a1e0f1953ebd784e2a2516473fa9fd7f3238d29cacf06a9038f451a0068955a2c397492354d6
-EBUILD pydantic-1.8.2_p20210719.ebuild 1036 BLAKE2B b05d9a54f856c719aa437bd5405454630ea4f16aef1e984ddffbeb9748e9e3d1e8d57ff1c6dba1b62ff4a34d97bf94562128b8e5e6e39cd50fb0e0c5f55f72e2 SHA512 3a9d283eaaba1268708a4512a343768f3b8bfd5d52be79d29aac6bca5394d15682bfec5ce375cd6a31a4521b0916c8e3900125ef734d138eeec29ad4b7ff93fb
+EBUILD pydantic-1.8.2_p20210719.ebuild 1067 BLAKE2B 895c4a05368a5d809a53f0d5ff841654238330d5f14ce074f2ef80a6d28b616e939d6f17b47f2673d30037ff65ec21aba0f5e68510580ac4d59af6155ae9fc97 SHA512 615f0d8e166b788e27d04fc417c480072e9cc5fef9a9380d7d11c8acac121b585c8c68434ffea570b59d1bf2d6f97345d98b9115fb1544f1aaad644684fb925e
 MISC metadata.xml 492 BLAKE2B e21bc5a40669b2b321ba310df9dd4c6ff424e77d9d961b3aebc1f62b579444c7f505c19dae02590de999cfd8168ac522034275583fb4835e97e8db9b153fefda SHA512 bfb9c7a069a79735543dc12101af7cca16acc5fd93cae01515dc35a106c16a419c0e0e3a97a6bc8426c3db776417f7d29231022cb6ac27020f97e5dcfe0d0cbb
diff --git a/dev-python/pydantic/pydantic-1.8.2.ebuild b/dev-python/pydantic/pydantic-1.8.2.ebuild
deleted file mode 100644
index 40c0a3ad124d..000000000000
--- a/dev-python/pydantic/pydantic-1.8.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="https://github.com/samuelcolvin/pydantic"
-# No tests on PyPI: https://github.com/samuelcolvin/pydantic/pull/1976
-SRC_URI="https://github.com/samuelcolvin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-email-validator[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# seriously?
-	sed -i -e '/CFLAGS/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local ignore=(
-		# mypy results depend on version
-		tests/mypy/test_mypy.py
-		# TODO
-		tests/test_hypothesis_plugin.py
-	)
-	epytest ${ignore[@]/#/--ignore }
-}
diff --git a/dev-python/pydantic/pydantic-1.8.2_p20210719.ebuild b/dev-python/pydantic/pydantic-1.8.2_p20210719.ebuild
index 5ea79549742d..3c2373fe96d0 100644
--- a/dev-python/pydantic/pydantic-1.8.2_p20210719.ebuild
+++ b/dev-python/pydantic/pydantic-1.8.2_p20210719.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
diff --git a/dev-python/pydevd/Manifest b/dev-python/pydevd/Manifest
index 4609ddc6eda9..94a15a4f4ccd 100644
--- a/dev-python/pydevd/Manifest
+++ b/dev-python/pydevd/Manifest
@@ -1,3 +1,3 @@
-DIST pydev_debugger_2_5_0.tar.gz 4140556 BLAKE2B 8630fc35138b3bb768b8a62a2f1388a1144baa9207aec49717c3c04843a393b130dfaef3266ad8fce5a5aa3af4e25d4441b075da0aa36ec1a8716db5ba5ac56c SHA512 7ebf1a5405a376fb19fb4bab0f4874e6be273d3c095338d8a2bfad433b0ec306918b2c650bd20dc5ffd835dd01e7398da2b66607a66dad931f98764f572e0be8
-EBUILD pydevd-2.5.0-r1.ebuild 2501 BLAKE2B 65e0dafee3eeef8c4f189b435e5a824789ed6ae09190d5ff7dae6237f39215b294437cf25b227bc32568b776b789ef04a1b9786d453a8fe59a93eb192f8f81ea SHA512 7b90e5839a2264ced18b4840a93baf31c15b5b1a49559300f834a01b30bf122d55d68409dca40a514fe4fa4e6beb083430e8b80dcaee87d44571fecc0d1209e5
+DIST pydev_debugger_2_6_0.tar.gz 4142790 BLAKE2B 46776e261e77a745867423488f97c6584c9497d883d8e2b19f4f82c58472f410f1b5f287ce24b8c20e9cdaa2202cbc78235ea4a7e9aa2981aa520e0b58e4fcd3 SHA512 5e7703f2eec53fe7b4d78d59894cfbb14a35a62ad20431242477f66e72344d88d5538ebe2007526e4ff250e8bcf41702acc71692239693dd9cb788ced70d7aaa
+EBUILD pydevd-2.6.0.ebuild 2495 BLAKE2B 39b1574a0c6628f0c74b0e19d5df3d9011c0a1afb1d90a595f79ddddf1f80ca16417b751a11a0047812b37c7ee393bb93a690fcee16d9461b86a7f7e0d5cbc33 SHA512 37d05fde51b263f6bb3ede61553e08db751185d97a660c0318abf20ce1c9944d97796fd48dbfd078ed093237d882dbf4f30e9844481770941bfe75911ba3885a
 MISC metadata.xml 384 BLAKE2B 37a4caa01a28f98ec8d141129c08754e6ba4dee5910a81c26f3eafcd7ac832962e91d3e39783e4859ac7e5ae5754837c89e496c4c2c205d12626359adf7dddae SHA512 5cf80b2e0eaf21e900c83341e9bef5c74a36d3c0a7354e3b6a832184cc60c42eeef6a22236e4fd9d484dc8834e5d4f98facd2578c223da2cc187dd76f91db764
diff --git a/dev-python/pydevd/pydevd-2.5.0-r1.ebuild b/dev-python/pydevd/pydevd-2.5.0-r1.ebuild
deleted file mode 100644
index ed72a1482018..000000000000
--- a/dev-python/pydevd/pydevd-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
-HOMEPAGE="https://github.com/fabioz/PyDev.Debugger/"
-SRC_URI="https://github.com/fabioz/PyDev.Debugger/archive/refs/tags/pydev_debugger_${PV//./_}.tar.gz"
-S="${WORKDIR}/PyDev.Debugger-pydev_debugger_${PV//./_}"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc"
-
-# After removing and recompiling the prebuilt lib the tests fail?
-# For some reason the test suite is executing a slightly different gdb command
-# then before, which is lacking the file name of the lib that was pre built:
-# gdb: No symbol table is loaded. Use the "file" command
-# This also happens outside of portage so it is not related to any *FLAGS
-RESTRICT="test"
-
-BDEPEND="
-	test? (
-		dev-python/untangle[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-# Block against the version of debugpy that still bundles pydevd
-RDEPEND="
-	!<dev-python/debugpy-1.4.2
-	sys-devel/gdb
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Drop -O3 and -flto compiler args
-	sed -i \
-		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
-		-e '/extra_compile_args/d' \
-		setup.py || die
-
-	# Clean up some prebuilt files
-	rm -r third_party || die
-	cd pydevd_attach_to_process || die
-
-	# Remove these Windows files
-	rm attach_{amd64,x86}.dll || die
-	rm inject_dll_{amd64,x86}.exe || die
-	rm run_code_on_dllmain_{amd64,x86}.dll || die
-	rm -r windows winappdbg || die
-
-	# Remove these MacOS files
-	rm attach_x86_64.dylib || die
-
-	# Remove these prebuilt linux files
-	rm attach_linux_{amd64,x86}.so || die
-
-	cd linux_and_mac || die
-	rm compile_mac.sh || die
-}
-
-src_compile() {
-	pushd pydevd_attach_to_process/linux_and_mac || die
-	# recompile removed file (extracted from compile_linux.sh)
-	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CFLAGS} -o "attach_linux_${ARCH}.so" \
-		-ldl ${LDFLAGS} -nostartfiles attach.cpp || die
-	mv "attach_linux_${ARCH}.so" ../ || die
-	popd || die
-	python_foreach_impl distutils-r1_python_compile
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# Remove this duplicate that is installed directly to /usr/
-	# These files are also correctly installed to the python site-packages dir
-	rm -r "${ED}/usr/pydevd_attach_to_process" || die
-}
diff --git a/dev-python/pydevd/pydevd-2.6.0.ebuild b/dev-python/pydevd/pydevd-2.6.0.ebuild
new file mode 100644
index 000000000000..2682f0672a48
--- /dev/null
+++ b/dev-python/pydevd/pydevd-2.6.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 toolchain-funcs
+
+MY_P="pydev_debugger_${PV//./_}"
+
+DESCRIPTION="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
+HOMEPAGE="https://github.com/fabioz/PyDev.Debugger/"
+SRC_URI="https://github.com/fabioz/PyDev.Debugger/archive/${MY_P}.tar.gz"
+S="${WORKDIR}/PyDev.Debugger-${MY_P}"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# After removing and recompiling the prebuilt lib the tests fail?
+# For some reason the test suite is executing a slightly different gdb command
+# then before, which is lacking the file name of the lib that was pre built:
+# gdb: No symbol table is loaded. Use the "file" command
+# This also happens outside of portage so it is not related to any *FLAGS
+RESTRICT="test"
+
+BDEPEND="
+	test? (
+		dev-python/untangle[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+# Block against the version of debugpy that still bundles pydevd
+RDEPEND="
+	!<dev-python/debugpy-1.4.2
+	sys-devel/gdb
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Drop -O3 and -flto compiler args
+	sed -i \
+		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
+		-e '/extra_compile_args/d' \
+		setup.py || die
+
+	# Clean up some prebuilt files
+	rm -r third_party || die
+	cd pydevd_attach_to_process || die
+
+	# Remove these Windows files
+	rm attach_{amd64,x86}.dll || die
+	rm inject_dll_{amd64,x86}.exe || die
+	rm run_code_on_dllmain_{amd64,x86}.dll || die
+	rm -r windows winappdbg || die
+
+	# Remove these MacOS files
+	rm attach_x86_64.dylib || die
+
+	# Remove these prebuilt linux files
+	rm attach_linux_{amd64,x86}.so || die
+
+	cd linux_and_mac || die
+	rm compile_mac.sh || die
+}
+
+src_compile() {
+	pushd pydevd_attach_to_process/linux_and_mac || die
+	# recompile removed file (extracted from compile_linux.sh)
+	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CFLAGS} -o "attach_linux_${ARCH}.so" \
+		-ldl ${LDFLAGS} -nostartfiles attach.cpp || die
+	mv "attach_linux_${ARCH}.so" ../ || die
+	popd || die
+	python_foreach_impl distutils-r1_python_compile
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# Remove this duplicate that is installed directly to /usr/
+	# These files are also correctly installed to the python site-packages dir
+	rm -r "${ED}/usr/pydevd_attach_to_process" || die
+}
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index 904b084a8861..3b26140560f2 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,4 +1,4 @@
 AUX pydocstyle-6.1.1-disarm-pip-install.patch 1001 BLAKE2B d82d9b358cdd6b517cf64f5b620e767342ba6230ebda715e039be2b5bdbef639ad5d0e715f033658887bede3ee330da79f2a6ca3e1a597466f3bbffdd617d371 SHA512 434a576cad8fe6a2c8086893982887306ad6b4797c1ed0c3682782a3a9ec1109fc48d94ad469cd11128232d773d5beaef2cfc1c9a68c0386581e4864d43371fa
 DIST pydocstyle-6.1.1.tar.gz 73982 BLAKE2B 6a896221fdcd257f0475472e1cf87ef892d8292a4c0faf661595adb17e2d18f4a8277cda498197309d34597c448203856c272256277a7e35fba20e2e5ba47f2b SHA512 ce4932a6601c80d05a46600f5af7df54798025a5f3dc41ab8cf1bc0d63e7f78b70cccb17dc99ddab25eda9abd639f91468fca1b1ceb4539708350212e481a156
-EBUILD pydocstyle-6.1.1.ebuild 809 BLAKE2B 5baae4dba5e849452a65bb7838b72b2c6438c86294a658113ceeb5a203abb8ce2306cfe97d722993ca8d2090cad33578fa8a4fe22e4e8e73d239b1d5e3b685a7 SHA512 b780272d6457efb7cc65c5ddcccf0900b354c5448fbdb8068c0aa0c3c69e3be8cd19f7f0acb5a570d21ed5f6f0cb660c2703c0ba05748d2377f169b4ef25952e
+EBUILD pydocstyle-6.1.1.ebuild 821 BLAKE2B 3d933c740e8af405c3fb1ce3ce51a7bb766ad6fd5b4095abc66da9e340e822321e00c070d6354b4dbaaa993c5b1279efaf72e935e9dfa9b917afbe78af173146 SHA512 46f4ba6477fdca48629b820b4a14be11aab8a6138fc27e1d3ebd289718cb614d089473b144e6e760df982b2dab2ffde3e4d648c07682acc860e7ab41524a6893
 MISC metadata.xml 665 BLAKE2B ac358d1ac5d68d11710048ccd4050f45cee96788829ee806bc5f4364c0f6b03707dcf15dd0cb9e7e3870cd9feebcead3c44b8f6bbff6738aa593079685c2a3c0 SHA512 7642d1384de3ec4bd55f7afc69ce67ad018eb9294f104234c5f3eb23a2c7a5ab36bda890a440fb5a7af8045d215048caf4b15bb3d965f414b755b51a269337cc
diff --git a/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
index b1d27548c2dd..402d34e01b13 100644
--- a/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pydyf/Manifest b/dev-python/pydyf/Manifest
index 1a42a6b93fa6..d0d4c9977710 100644
--- a/dev-python/pydyf/Manifest
+++ b/dev-python/pydyf/Manifest
@@ -1,7 +1,3 @@
-DIST pydyf-0.0.3.gh.tar.gz 25610 BLAKE2B c236896e56163bb64267e28106a2058f0c6e85e918bd441537df9a494bd7b75c39dda247a0c4b99a918bb439f88a412763975d2d64ab4d8d7cfd0dab2d142f8e SHA512 bc72d5bf93bd4aff653b6496a07278c5ef8b22629f137f9a3dc8713dce4851d2772d4b1ae13d59fa0203c962405f93842e7d5159be1b276632419d6642add149
-DIST pydyf-0.1.0.gh.tar.gz 13906 BLAKE2B c0bedd82e363ee3ebef16151ce48da2dc7a7a26ba0c8e92f2ba1b6f2d33833e648fce008eeca4b748e682eeaa8626486eb7a22ac1ecc22714efe046436447857 SHA512 942d786a8091c8a57516c104a17b3089cbe814767c330a352e5f1601d9673e37392aa6679ca0d3eae8e0c5053c1418cac1ccde2a8b886e09577a18c4482f39d6
 DIST pydyf-0.1.1.gh.tar.gz 14014 BLAKE2B ca95861914d34df1f3e6b805550d9ec620633036ed4413d3e1598a463270ad59d79781923b79b00d36c863452f9726b7f05d39e17362cc75ab6667b6826179e6 SHA512 65b4c6a05bcdc7ed356d4936e2972348508446e3481feb3a736b7353f652edad177ed0c9f88e27c981d593067e1aa46795c3b3d2e857af06eaf0dcde23f4c236
-EBUILD pydyf-0.0.3.ebuild 681 BLAKE2B b4d4cf0189e83502b333ee80d819255b5bcff3c29db9cda7050bc3ca395f2c1f453a9a57962b748e323fe656674b67a77ad09d5e35b3f79fed9ddfa6c0a0528e SHA512 27f34e058ccb48b64974ab898e37a1df85f3cdb1f8e48e47d19597a5023b4d2162eced02a1c239c3c5facf74e7b80bbdc7dc480062e7065fc9f6f8e19ef716a5
-EBUILD pydyf-0.1.0.ebuild 681 BLAKE2B b4d4cf0189e83502b333ee80d819255b5bcff3c29db9cda7050bc3ca395f2c1f453a9a57962b748e323fe656674b67a77ad09d5e35b3f79fed9ddfa6c0a0528e SHA512 27f34e058ccb48b64974ab898e37a1df85f3cdb1f8e48e47d19597a5023b4d2162eced02a1c239c3c5facf74e7b80bbdc7dc480062e7065fc9f6f8e19ef716a5
 EBUILD pydyf-0.1.1.ebuild 681 BLAKE2B b4d4cf0189e83502b333ee80d819255b5bcff3c29db9cda7050bc3ca395f2c1f453a9a57962b748e323fe656674b67a77ad09d5e35b3f79fed9ddfa6c0a0528e SHA512 27f34e058ccb48b64974ab898e37a1df85f3cdb1f8e48e47d19597a5023b4d2162eced02a1c239c3c5facf74e7b80bbdc7dc480062e7065fc9f6f8e19ef716a5
 MISC metadata.xml 346 BLAKE2B 1019f43890db1484163da244f781505c1193dc5516cbeb8921540dc298d4cf61903a9a0151e23cc22b7db7fd677f4424c74b5a051b95eb75e38f3546501096b3 SHA512 420175bcf83c3fe2fc1bcebfd88f07e3c56272b999f9693a82b76a703ea5d94d6e144683a67eca871bc6d2723ceb8f70c4d29e354df20d273587a7be6a369904
diff --git a/dev-python/pydyf/pydyf-0.0.3.ebuild b/dev-python/pydyf/pydyf-0.0.3.ebuild
deleted file mode 100644
index 0ecfdfd4412d..000000000000
--- a/dev-python/pydyf/pydyf-0.0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A low-level PDF generator"
-HOMEPAGE="
-	https://pypi.org/project/pydyf/
-	https://github.com/CourtBouillon/pydyf/"
-SRC_URI="
-	https://github.com/CourtBouillon/pydyf/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		app-text/ghostscript-gpl
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pydyf/pydyf-0.1.0.ebuild b/dev-python/pydyf/pydyf-0.1.0.ebuild
deleted file mode 100644
index 0ecfdfd4412d..000000000000
--- a/dev-python/pydyf/pydyf-0.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A low-level PDF generator"
-HOMEPAGE="
-	https://pypi.org/project/pydyf/
-	https://github.com/CourtBouillon/pydyf/"
-SRC_URI="
-	https://github.com/CourtBouillon/pydyf/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		app-text/ghostscript-gpl
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 8558aa52b10e..1c6008c6e218 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -3,9 +3,11 @@ DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f
 DIST pygame-2.0.0.dev10.tar.gz 5567274 BLAKE2B 7d78f260318cfabeb33f1073ae210f890d2f772e3ef302f243cca67724c6012355644ba60d4cae6de72db6dd61d320177deff6ee83dd355ec4cc33e841b565f7 SHA512 4cee7599fd8a6d31ddd66bfaad3bbb67cb167c1ae339f37e83322d810fea8746e81a191c224a0eeb6cc43a64bf1730ff0886c82f1a4f642e2e656ca9a837bf9e
 DIST pygame-2.0.0.tar.gz 5522621 BLAKE2B 49773979af53595d3ff2db1a18e4bcd217e26db3ec28d6129d2a588f23a1bd5326fa79fab32c25aa796738cde0e68f5741bee58f62432e86f89cd49ee17a8f14 SHA512 3f65924d0e1d2863b84118a4e468b521a289e2cf174405c6f3ee2b2a2ed399cde7f9f310d57c4166351f84caaea02dd7408ee852dbcee7c205bb2955b6078fda
 DIST pygame-2.0.1.tar.gz 5536907 BLAKE2B b27cb9001499a00da62dac0486a72079ff4e60ca609be444b04f547cb2372090da91d2670307ce7068b964458e6ac1284402439bb7809c9735135d5e93a71d78 SHA512 1535a872c43e5f75acdfa7d325fcfa0f0f826e18602b28b228cfdbe068a382678c21568d80873f7af4f0b318e693adb38afa4d632f8294f716a47188abe5245a
+DIST pygame-2.0.2.tar.gz 6309459 BLAKE2B 0cb23b4226d8d86f938cba08b67ab3bd847c9e4122f5f6cce4d8810b239df672ab282e1b77dd7d71423f805c7c0418e54050347dfb9e506b799eb8e0b4f16856 SHA512 2cef4669e5bd81759c9886293ebc1b82e1ed3b4576a3632437f66cb353af330e15dd39e7378f2be8fd25838f202529dc550208a031aec77e1d05443a070638c8
 EBUILD pygame-1.9.6-r1.ebuild 2293 BLAKE2B 32d2a0539d064892d65ded4f4977c6c1e52f632ddf32d4e138a3a5a1a29a293a5762608e394d236bc0aeee71b041f184f2b05f86760c16d67dc07c0a230b5a16 SHA512 e39987d08942f0cfd5c26f482e28fa2ba39210a4acba7ff7f8b409bffcaeacb8937152e4d4aca1c807d7c4b05d8aa9c2b0a57f54296f9933fdddbf95e094fd71
 EBUILD pygame-2.0.0.ebuild 2073 BLAKE2B 9723b5c5d486de169bd7b8d5e6012eadfced27bedb7e2bb61ebe9cfb73f6e54ba64d6acdc866eee561979ff41edda6d31b337a98c2c15a3328520a91c3eebd07 SHA512 d4615ac5efb8935073c791aa9510a5f61965ff3fb71a8a0b0b2a9d49d99e95e6a2863375665b3e8e2272c4289c44d7e01323c3ecde055018c13e5ceae505167e
 EBUILD pygame-2.0.0_pre10.ebuild 1910 BLAKE2B 8fc8454b4e198d0c8862a7c4338792076799e8a13c82827c062ca1a5a6f3b61d0260b367cdbf8590632600d99ac7fe2d8699b95631417e5ed5bab5e7bfbcded6 SHA512 eda538cb1d14f9f2e88ada1497ac816b12ef27805a3d6d85a37f349e2b3891e82594817ff178d9902e2066b1f595a59915d4d0d42e570534fb132fb81b9619c2
 EBUILD pygame-2.0.1-r1.ebuild 2202 BLAKE2B 6b7ec8d20bc629a07d200958f5a4d09f1330933c60ca0ad191b673ef78e950cc27ba4ff456df4b31f50b3b326f42bd020e38d8801ee9e663ce4fa7acfc7645ca SHA512 8b7298c8b5cf5b6635008caac567d0331d7b614535cef88a5aa6813e2df1d97aded32e112275188924bcd3b6f53d52d7fb3f009c164074d0870d579de4119f87
+EBUILD pygame-2.0.2.ebuild 2082 BLAKE2B a1d8318800491adc2448d4a6bc2d5ebf206ce83ab1d71487b6324c51cc77a73f928af85e1291110dd42905acb03d45d8a102ed01fabc92ac15d5b5e16d98ec26 SHA512 5132770e079ac5bc49336c96cad820181522a5fd44bb16d9f12bebb7318d31cb9fb38c7f3a2282ed94880bd4c4cabaae7d2f515cbe060a55996dd7e705b78bfa
 EBUILD pygame-9999.ebuild 1739 BLAKE2B b5e8dea0169ba2ebf0bcfc3f7fa9f140b9c6a95fbec59c82442403c89f35f7416888d736c1ef1d98c4f434b83682cacae507037fc33cdeeb3fc570d2c9855983 SHA512 0e378c44353b0165c452561643fee5c9d6622de4e79b1fddd6ad554e1a9fa39bec18c84907a6c2e9868d0c75d1568f0935660c838f2921c7e5ce0df87c157946
 MISC metadata.xml 462 BLAKE2B 398db1c050bbf14a65ac770e980ca91269277ecb00d94457502532ef7c407145cc2438ead46d370d1195331fd3d2f9602ecbb381c9f178240d031d1c665a9324 SHA512 2e95b731a4cb49372e6af00bb059bd179dc167aaac07f412c51970cf27b0fdddda616fb59bbbd62101c1b6f272cc0263123e334df01ebf6d1697ef8b55b62fef
diff --git a/dev-python/pygame/pygame-2.0.2.ebuild b/dev-python/pygame/pygame-2.0.2.ebuild
new file mode 100644
index 000000000000..1ee94dd33f0e
--- /dev/null
+++ b/dev-python/pygame/pygame-2.0.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV=${PV/_pre/.dev}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="https://www.pygame.org/"
+SRC_URI="
+	https://github.com/pygame/pygame/releases/download/${MY_PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples midi opengl test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freetype
+	media-libs/libpng:0=
+	>=media-libs/sdl2-image-1.2.2
+	>=media-libs/sdl2-mixer-1.2.4
+	>=media-libs/sdl2-ttf-2.0.6
+	>=media-libs/smpeg2-0.4.4-r1
+	virtual/jpeg
+	midi? ( media-libs/portmidi )
+	X? ( >=media-libs/libsdl2-1.2.5[opengl?,threads,video,X] )
+	!X? ( >=media-libs/libsdl2-1.2.5[threads] )"
+DEPEND="${RDEPEND}
+	test? (
+		media-libs/sdl2-image[gif,jpeg,png]
+		media-libs/sdl2-mixer[mp3,vorbis,wav]
+	)"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig"
+# util-linux provides script
+BDEPEND="
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)"
+
+src_prepare() {
+	if ! use midi; then
+		rm test/midi_test.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+		"${EPYTHON}" "${S}"/buildconfig/config.py -auto || die
+
+	# Disable automagic dependency on PortMidi.
+	if ! use midi; then
+		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
+	fi
+}
+
+python_test() {
+	local -x PYTHONPATH=${BUILD_DIR}/install/lib
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=disk
+	distutils_install_for_testing --via-root
+	script -eqc "${EPYTHON} -m pygame.tests" || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Bug #497720
+	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index 2a284cfe4063..23cc4c177f94 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -1,7 +1,3 @@
-AUX pygame_sdl2-6.99.12.4-mixer.patch 1513 BLAKE2B fa0134e7e4c458caf720169bdb655793e2caebe746e04c5204c210b3535830afa56e8cacf2972fb27953500c4e82dbcc5554fbcbbc20a098d7a325b4b30e08d3 SHA512 4c7fb5b9f55e8f4bfde5ac911bda4f83be535a101eeec80595f70a290228cbdddf2686595901aca25c429beac34ed4ee906c92ddb0522b4c73ce48c1e1556b31
-DIST pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz 2294620 BLAKE2B 14da5e955ca6b9f6a08be1a3ae929db63e358c53b7a05a16cda73d6e3625a7d522dd5dfc972be978f330f26bb30dc70f4657501cd5e5a6d44c1f6b81eebe3fa4 SHA512 eacce553d6729b937c13420d826f2fe327bc7aba499a06bea7f1ceedba3327a9456c023878290ace39e1a8e417f54957345b8b78500ffc9ed3d2ec9952397754
 DIST pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz 2678274 BLAKE2B 537e63a7e4755f6fea20f4ceec065272b83879958a0a794780b8976877aa083a2a9bc1b8b4a4592accaeb59dbeeac480d75965291ddbff324aea5c90d7dbcfc0 SHA512 b58a57d70efdfcea066735e3681047bec4fc89a9b75e423f5f889cd29f89a25bd0b96fcbca17578958b677e44858aafc9c6b17aad54dae640640bb7eb54cddbd
-EBUILD pygame_sdl2-6.99.12.4-r5.ebuild 1105 BLAKE2B 05de20bc6dcaca60524f02ff98fed995d165cc8ba40894b04e0877908f955c086017fe648fb5d7ffc52f1a146c43eb4b75c9b95c7b3516079f701f2cc5aefa1a SHA512 849149b4ad71f67a695dcd33cd1c13b34236cde1ff8f74da9e2a58004309e6f7705985a46859519e25a181d01bbee65f923b8b9ae1d388a3aba3d704963dd261
-EBUILD pygame_sdl2-7.3.5-r1.ebuild 1042 BLAKE2B a8a4acd01af1dc1ac931b18d8a050d87cd562e0b142c748e45b28c5d656830486e6c81e9f4d8856b74a82dd6a0a977b68a5a76d6711315479076c8a2b7290d55 SHA512 7a08f398dcee9ec59a0eb1d3a5a9259f11fcaa4de48df57a087103581328dc1beda7b391d09fe1e2e2d5d3cac7ef2db3f6e3a8525f66df29853a0ff04cdea598
 EBUILD pygame_sdl2-7.3.5-r2.ebuild 932 BLAKE2B 8953eb98d8032c79b4c46b7c0c8262d07f29457c7e8006e85295e9be33b2e499940029fb9260c00392dffddb058039e42d92bde06de3c8fab46bc9e4ed0703a2 SHA512 aa4ad5a5ce673e894b966ce778f362d6e6b53a2e6ec8695054afb229d917ae143f8eb6908bd7fe2c649a0efe25a37d4e6d34cc720ee75a63a2b6e6c1cc1fa42a
 MISC metadata.xml 382 BLAKE2B 0456a0211bf9f5497ae588dcb47ed34d99f08b7600d135a4591e10c8ce8a7349c816c53ea4e800070afd065821aabf22a70e7482402947f2d1801c3250d62d12 SHA512 dd3d1bfe08a30dedf0da22a02e2a3f3e8d38ebd59b2c122b26486b6891ac7459a06368fc55bbce6b243880367110b1b908bd796a17feededf3b1d8b4c9363278
diff --git a/dev-python/pygame_sdl2/files/pygame_sdl2-6.99.12.4-mixer.patch b/dev-python/pygame_sdl2/files/pygame_sdl2-6.99.12.4-mixer.patch
deleted file mode 100644
index 1c3964afaa9a..000000000000
--- a/dev-python/pygame_sdl2/files/pygame_sdl2-6.99.12.4-mixer.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ced6051f4a4559a725804cc58c079e1efea0a573 Mon Sep 17 00:00:00 2001
-From: Markus Koschany <apo@debian.org>
-Date: Sat, 11 Nov 2017 23:00:25 +0100
-Subject: [PATCH] Fix build failure due to the removal of MIX_INIT_MODPLUG and
- the replacement of
-
-MIX_INIT_FLUIDSYNTH with MIX_INIT_MID.
----
- include/sdl2_mixer.pxd    | 3 +--
- src/pygame_sdl2/mixer.pyx | 4 ++--
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/include/sdl2_mixer.pxd b/include/sdl2_mixer.pxd
-index 0cea395..4bb0187 100644
---- a/include/sdl2_mixer.pxd
-+++ b/include/sdl2_mixer.pxd
-@@ -18,10 +18,9 @@ cdef extern from "SDL_mixer.h" nogil:
-     ctypedef enum MIX_InitFlags:
-         MIX_INIT_FLAC
-         MIX_INIT_MOD
--        MIX_INIT_MODPLUG
-         MIX_INIT_MP3
-         MIX_INIT_OGG
--        MIX_INIT_FLUIDSYNTH
-+        MIX_INIT_MID
- 
-     int Mix_Init(int flags)
-     void Mix_Quit()
-diff --git a/src/pygame_sdl2/mixer.pyx b/src/pygame_sdl2/mixer.pyx
-index 3c5e185..bea5cbf 100644
---- a/src/pygame_sdl2/mixer.pyx
-+++ b/src/pygame_sdl2/mixer.pyx
-@@ -81,8 +81,8 @@ def init(frequency=22050, size=MIX_DEFAULT_FORMAT, channels=2, buffer=4096):
-     if get_init() is not None:
-         return
- 
--    for flag in (MIX_INIT_FLAC, MIX_INIT_MOD, MIX_INIT_MODPLUG,
--                 MIX_INIT_MP3, MIX_INIT_OGG, MIX_INIT_FLUIDSYNTH):
-+    for flag in (MIX_INIT_FLAC, MIX_INIT_MOD,
-+                 MIX_INIT_MP3, MIX_INIT_OGG, MIX_INIT_MID):
- 
-         if Mix_Init(flag) != flag:
-             errors.append("{}\n".format(SDL_GetError()))
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild
deleted file mode 100644
index 8040d7a0a1f0..000000000000
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-inherit distutils-r1
-
-PYSDL="${PN}-2.1.0"
-
-DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
-HOMEPAGE="https://github.com/renpy/pygame_sdl2"
-SRC_URI="https://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]"
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-	' -3)
-	$(python_gen_cond_dep '
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-	' -2)
-	media-libs/libpng:0=
-	media-libs/libsdl2:=[video]
-	media-libs/sdl2-image:=[png,jpeg]
-	>=media-libs/sdl2-mixer-2.0.2:=
-	media-libs/sdl2-ttf:=
-	virtual/jpeg:0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
-
-PATCHES=( "${FILESDIR}/pygame_sdl2-6.99.12.4-mixer.patch" )
-
-# PyGame distribution for this version has some pregenerated files;
-# we need to remove them
-python_prepare_all() {
-	rm -r gen{,3} || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild
deleted file mode 100644
index 4c3cac2456c5..000000000000
--- a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild
+++ /dev/null
@@ -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,8,9} )
-inherit distutils-r1
-
-PYSDL="${PN}-2.1.0"
-
-DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
-HOMEPAGE="https://github.com/renpy/pygame_sdl2"
-SRC_URI="https://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]"
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-	' -3)
-	$(python_gen_cond_dep '
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-	' -2)
-	media-libs/libpng:0=
-	media-libs/libsdl2:=[video]
-	media-libs/sdl2-image:=[png,jpeg]
-	>=media-libs/sdl2-mixer-2.0.2:=
-	media-libs/sdl2-ttf:=
-	virtual/jpeg:0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
-
-# PyGame distribution for this version has some pregenerated files;
-# we need to remove them
-python_prepare_all() {
-	rm -r gen{,3} || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index ed3ceba3e917..60a5cad7365e 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,8 +1,6 @@
 AUX pyilmbase-2.5.7-0001-disable-py2-for-boost.patch 578 BLAKE2B c9aff2ec269ea894e046bb265c6a69418c128f0d9dd54afc924138b6060d55b1ff1da6e8a9fc512b3097b8ff8acce0c03012748cdf10263945ce6f42dcec3424 SHA512 969c3d5bd676a471739feca443a938584a78b8903b71d75f51abdcd87e48a5ecaaab3132258905bad063165e9a4861ea9e6ce0d6b21844462e2adbbaea37fcff
 AUX pyilmbase-2.5.7-0002-install-imathnumpy.so.patch 643 BLAKE2B c46db3334236826e6f36343cefba88813427d1f18f12eae4692ebc33d765d44c600846840129ee2f2d79e9c1fa8b0c4489dbe292bab38be952009cb8b7e92222 SHA512 193142fe50a69568bad5c7034d5d6cf45c1a36cd517f1c71875a651fb7629263c53769050a9e5e7ddec699a9bd08f84d32d1dc3a8c29c5b3576c2741deaf2986
 AUX pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch 1214 BLAKE2B 45b03a70c2a24889bf1614d5a86aeaff1edf41f508b9622497603cff81fa7f04bc29037763568dfc569bd26c079ca75e3b6ebcec9cebe9e184fe650a9007f013 SHA512 6df211523617ff9e9561c9de7c853b11082a5633a4fda63fc59c2d03d251881aa8dfb9cf6bf0bba67b8c9d584a8d3512509bc2c0f5c3af2a79a70948552f6918
-DIST pyilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
 DIST pyilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
-EBUILD pyilmbase-2.5.6.ebuild 1518 BLAKE2B 984aef1e772200117345cb174c1f46f24c3bb3414d863a86d89d5968f586d3528a5097f9e49583dd982657edd3e8b7259c5a69bbb044da1d436224890e2548e1 SHA512 fb4afe446f8ec3a0de3579ea0a776d70a3b4562046a025d849eb93cf6df33a4a7675dfa63bf28b33ece467dc1cee8dbabfba1d924e521ba638e0e1a68d5f4915
 EBUILD pyilmbase-2.5.7.ebuild 1386 BLAKE2B 3ed4549ec313be8031285379f41f93eba037c3e6bbbd9cd173fe083a4ae7ec37b865cc4da47b289d8c7bb11c4fdd8d4cbbaf0da0c288454fc9fecd719e68f128 SHA512 4a62d97e0de989561e4ca3206e2e6d49c95253d032851a742e972846e0fec1b18baaea525d87dbb49e97430d9f8a812e0d4a3fcf58b0263d80805c5c5f7530c7
-MISC metadata.xml 691 BLAKE2B 1da8ad6642cd9bae2a1a476975209315718b7c8e85a7bc52aecaaea968d5ecadfbb6d46287f95d94773b1a28ff9ca74202fce1d136de868545fb02f1cc47840e SHA512 0bee5aa7651204c11a732c7302f844e973d91c1e71613f7bd42a84aed40249a3459e4766a2de7ebacbeac7dd1af716f65efe11c2d0a65fede2f0e8ebd4616ca8
+MISC metadata.xml 606 BLAKE2B 0821a88eab729f251daaf08ade6383df3d8fa17aa9b322d5a7061e6f11765f8f1ea18a151832e29c7d82fb3d9cc442796dfcb548bb24694aef60b3334d1dbf4f SHA512 60e9e24c8fc0838707471603d214a21213810ec23bae5c8f4ce6c42d6f5459c2cc528e605cd556409eed4aad0316acf57e063e9dba53aaea05bb8f0fe0af1c8d
diff --git a/dev-python/pyilmbase/metadata.xml b/dev-python/pyilmbase/metadata.xml
index c0fc302d4358..2b6000f11bf4 100644
--- a/dev-python/pyilmbase/metadata.xml
+++ b/dev-python/pyilmbase/metadata.xml
@@ -13,9 +13,6 @@
 		<flag name="exceptions">
 			Enable runtime floating point exceptions in PyIMath.
 		</flag>
-		<flag name="numpy">
-			Add bindings for <pkg>dev-python/numpy</pkg> use.
-		</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">AcademySoftwareFoundation/openexr</remote-id>
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.6.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.6.ebuild
deleted file mode 100644
index b479afdf553a..000000000000
--- a/dev-python/pyilmbase/pyilmbase-2.5.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit cmake python-single-r1
-
-DESCRIPTION="IlmBase Python bindings"
-HOMEPAGE="https://www.openexr.com"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/openexr-${PV}/PyIlmBase"
-
-LICENSE="BSD"
-SLOT="0/25"
-KEYWORDS="amd64 ~x86"
-IUSE="exceptions +numpy test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~media-libs/ilmbase-${PV}:=
-	sys-libs/zlib
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_USEDEP}]
-		numpy? ( >=dev-python/numpy-1.10.4[${PYTHON_USEDEP}] )
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-admin/chrpath
-	virtual/pkgconfig
-"
-
-#PATCHES=(
-#	"${FILESDIR}"/${PN}-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch
-#)
-
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
-		-DPYILMBASE_INSTALL_PKG_CONFIG=ON
-		-DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DPython3_INCLUDE_DIR=$(python_get_includedir)
-		-DPython3_LIBRARY=$(python_get_library_path)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	if use numpy; then
-		python_domodule "${BUILD_DIR}/${EPYTHON/./_}/imathnumpy.so"
-		chmod +x "${D}/$(python_get_sitedir)/imathnumpy.so" || die
-		chrpath -d "${D}/$(python_get_sitedir)/imathnumpy.so" || die
-	fi
-}
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index 71eb2b99226f..18121094a725 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -2,7 +2,9 @@ AUX pyjwt-1.7.1-ecdsa-fix.patch 1179 BLAKE2B 79fcaf69d6021f04fb624fc36314135c970
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
 DIST PyJWT-2.1.0.tar.gz 60092 BLAKE2B 59bde5f73558c74c964136ce0e8e9b5db6b76d226805fdb8aa8f201f00dceed0036693aa9295fa0ebac03c8fdac29a28f2aa79c697155c0ca744d1549e9bb47a SHA512 d701919c6cf06acb45cb0762a4ab7cc5e6ea247fbc0de80d0efdd1fc4b966c0d27c7400869858bbdc457b200586635aeefa8a38b85db818df6a8713f9bda8ab8
 DIST PyJWT-2.2.0.tar.gz 62200 BLAKE2B d527442cfafb8b540062f879e7c4a4f15acd9d88ff472764cfc077a220f42bd56e13d2aca9660008a118a9232071a45157c684f95987771c38cc631ee4745961 SHA512 e1cd8ba4fbde2adc906e18b04a925101f28091b4b23e39a1335ca6b933ab63132d07b2a4865399216ada17285b09f03bcf7fd1a12c238e7d4f15e7c9c1e32c75
+DIST PyJWT-2.3.0.tar.gz 62279 BLAKE2B 0f4cea0cee2461e5f829b2bba40fb6d2646d5bccaa8e6b2d26ba7379386a64dc9f5204ea607edec98fc0102facf3cc5595e5e97523e9a567e0cf0b072542a3f5 SHA512 c6a1d8c3ce87d2122aa4ce4e19c5d2683aeffae6fb29b20fa17e2dfb1a07faf721beb8ca390d3acdeb85a1476025ca5af4fcdb1019f84c8c1bf229246a7aafe3
 EBUILD pyjwt-1.7.1-r1.ebuild 1370 BLAKE2B 51dea191f279f4758ea5aa6529ac60aa4ece061aa18438c1c6ac0874efe5262a0a979eed1c5ffbcb2df0b866a73032d60e5c2519dfb90d41e5dc8900cdc0b941 SHA512 21007fe2955e747c2185abb48327b21a7a397bc95c289f0acc4951230b5a17b3cbc22784d4bf413e3dbf4054ac1df878e187d383b7a9fea118a9dbc0ada7abca
 EBUILD pyjwt-2.1.0.ebuild 740 BLAKE2B 0c7fe5da929b1b6bfc1b3e87b918ca8ea7e89c26c6a21527c411cd036f0bbabdfd90d0f23e94092b5cfe4453215e08634083cbc61e517570fc78b42f76e614b4 SHA512 52f4a644f4e87fcb29faa993d7d035ebe52fa9b19f5410c3e58dfeee2cb9b02b1276ae80746389688a4d6ddf94f9fcc84eb862d0bde855c1db13d9bf93910bab
 EBUILD pyjwt-2.2.0.ebuild 744 BLAKE2B ac66e823786dc9c27789cfa608d58af934fbcfa41cdcc0a6fad3f6b633166b6972abe85820752e1a4b8aad5ebd498a1516d2f761f00522fd2ca3332fb9e818e2 SHA512 77039a65f25102ce9f7b923b459872f94e9dfbc4bd64484ed3617387f800eccaa0b2b26a64452f73cc13ba0fdc54cd6843541c48a70952504232c2696d6bea82
+EBUILD pyjwt-2.3.0.ebuild 744 BLAKE2B ac66e823786dc9c27789cfa608d58af934fbcfa41cdcc0a6fad3f6b633166b6972abe85820752e1a4b8aad5ebd498a1516d2f761f00522fd2ca3332fb9e818e2 SHA512 77039a65f25102ce9f7b923b459872f94e9dfbc4bd64484ed3617387f800eccaa0b2b26a64452f73cc13ba0fdc54cd6843541c48a70952504232c2696d6bea82
 MISC metadata.xml 450 BLAKE2B e0a5244140aed7eb1dbc7d1bedf41b64f999ada11a82d5a7c3720501d824c789590e5339d5855fa4d0f96ff1b572e86af41859f8f14105f2f9b1a715d9d71d87 SHA512 83bce7997e724867cf1962ce75d8bb8e7a4e7a8dcdb42b95d9d323ca3a3ea4584020d4b700885e1afcb753d4fcacee23ec7b25066e93c0ac5eb614f65d140f29
diff --git a/dev-python/pyjwt/pyjwt-2.3.0.ebuild b/dev-python/pyjwt/pyjwt-2.3.0.ebuild
new file mode 100644
index 000000000000..df78ba88b34c
--- /dev/null
+++ b/dev-python/pyjwt/pyjwt-2.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+MY_PN="PyJWT"
+DESCRIPTION="JSON Web Token implementation in Python"
+HOMEPAGE="https://github.com/jpadilla/pyjwt/ https://pypi.org/project/PyJWT/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="!dev-python/python-jwt"
+BDEPEND="
+	test? (
+		>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "cryptography" dev-python/cryptography
+}
diff --git a/dev-python/pykka/Manifest b/dev-python/pykka/Manifest
index 543b55c87b78..2eb55ed71a43 100644
--- a/dev-python/pykka/Manifest
+++ b/dev-python/pykka/Manifest
@@ -1,9 +1,3 @@
-DIST Pykka-2.0.2.tar.gz 51858 BLAKE2B 62132a3ded257d44d9504258418abc73ec9cc09353ab8e1948c9910fc11f67f770510b2dc7cf122db9af9ff62091757b648dce69cbdab0ffc17567169749d0d2 SHA512 98b2e6122dc5158da489265cf7cf9e358bfa432d0a0eaab9f50a07c0050083afb19aad494e4cd27347c376947eafb7d9796909c18e3648ef1bf0685bd6384e5b
-DIST Pykka-2.0.3.tar.gz 55749 BLAKE2B 5da98dcc786c2bb7728485e16090b8dad7a96858aa86f024564286bb03d3faa93673ed3db87882e3dc6555a5b64c9c62433ab782ceb94e89965fa870bbb78d2f SHA512 0f4d6d9e0c92a7e7cafb340f343afa1e78bcefdd0454341d3f457fa202acdd3de979881689cb3cd5f2cbd3a08f80177f6470db4fb895b20d9c1b4d0b9ef627ee
-DIST pykka-3.0.1.gh.tar.gz 59252 BLAKE2B fd0ca0742f3c372a5983d01929b34587390929fae28b70e0ee939f651f7655bb924ae08fac039225a8040c9bf523177af7bf3fa7c1db6ea1f04ec460cc3a1c6a SHA512 c96503019a190663cd4054c2488668143ff5d0d92b0c2d1ab3df577ab9fc9f0f2f575677a9f955a7b940e725d588c0caa6097515f1236df9a453fb3b0a2cb8c8
 DIST pykka-3.0.2.gh.tar.gz 44440 BLAKE2B 8649e4b5134d902a459cd7f43ced59fb88bf6e9f7435aaf89a3c68fd349b941eea8154703107611a027c39b9eaca374d39497dd4f0dea72a1edfc4df99153539 SHA512 0e10366739839d792ac8866b2dc5f7a2d352b04f896ffa1c1922b215e8907f6fb9300ec955d5ed5f8c19d0714720b7f20569177cd1a9f2c98fbd27e42a9bd3f5
-EBUILD pykka-2.0.2.ebuild 615 BLAKE2B fc167ffc58b0f34729e86b20a9018229f0bc15b966931dbc8391a80584c5ddc32dfde4b77046d9fef4986207ab85b118b8c19d78236b848aea0ff6309baf7f58 SHA512 1cb8b7d4082a9b66f785d4b82d0aee100ca7ae7a4c6176bf8b9b7cf59d6cc430728607e035f62f9987dbc547fe0333f7b69d88f5a8228358c57320ff090e59ab
-EBUILD pykka-2.0.3.ebuild 648 BLAKE2B 295853a8ab55210e57732149f4dacf8073cfd9a20e56a97f39ff123255e295c1bac7fec93cfd676f50aaf360a25a80947c1e9dfbf00fa88ee61de78b6766fa8a SHA512 45c948675e006893b27369c8f308b537a6c287482de3608cc2882535b844b46ce2a3b149d520f69a2e159bea82d02761705d55c5a44a088537cfdf43d784925b
-EBUILD pykka-3.0.1.ebuild 678 BLAKE2B 1c0f1d8f6edf2e12dba53a00976bca7000a755e5ca16f1e727acf4808a35cb44dbacf5f1eb7923df0a4b506e1b245fcc7e2a72ad6e4e7d65cd8a7ebe2dd04d4e SHA512 b461bce6d611983e1323db1013ec44370c8a34c9fdef285f88788a87d0a4cca166a48b4883c83a901fcf8ea9ea74ce335b480bb6a22419cb4d84c980461aed39
 EBUILD pykka-3.0.2.ebuild 578 BLAKE2B 0121c6c643470a953c255bd4ef29b3e32965aa0ee3f8367433b83e8e0407048e5752e20cd92eede3ab642a887a00fa7fc3fd0c7d026c374407e0f625bca9a5c2 SHA512 7310b5513d859cfdc3885f3a0b74dcea3ce5e522961915c24b226f70110475ccc3e7c5630161d154f527b938b1c430762f5c702da7584624cd53d45aaaa05fb0
 MISC metadata.xml 360 BLAKE2B 41f09dcec8c459e443b0dcb907f2997b5a2a558c897bed152978530429f6493d44a720dc61b23840d489037769f797da9295faffab86be143e2e8f5224fde226 SHA512 13717275dbab6fe660af9c44f6462b33d1122f60b954b18bd99efa83320820c166e3f2c6e0d81825819d3232945cc0d1d755e7ba24e1a046d78e658c1b2a02d2
diff --git a/dev-python/pykka/pykka-2.0.2.ebuild b/dev-python/pykka/pykka-2.0.2.ebuild
deleted file mode 100644
index e49a92a4f2b1..000000000000
--- a/dev-python/pykka/pykka-2.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_P=${P^}
-DESCRIPTION="A Python implementation of the actor model"
-HOMEPAGE="https://www.pykka.org/en/latest/ https://github.com/jodal/pykka"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	test? (
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pykka/pykka-2.0.3.ebuild b/dev-python/pykka/pykka-2.0.3.ebuild
deleted file mode 100644
index ce52dd6a8682..000000000000
--- a/dev-python/pykka/pykka-2.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_P=${P^}
-DESCRIPTION="A Python implementation of the actor model"
-HOMEPAGE="https://www.pykka.org/en/latest/ https://github.com/jodal/pykka"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	test? (
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pykka/pykka-3.0.1.ebuild b/dev-python/pykka/pykka-3.0.1.ebuild
deleted file mode 100644
index 36646a3910c6..000000000000
--- a/dev-python/pykka/pykka-3.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python implementation of the actor model"
-HOMEPAGE="
-	https://www.pykka.org/en/latest/
-	https://github.com/jodal/pykka/"
-SRC_URI="
-	https://github.com/jodal/pykka/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7)"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index f59a78092cd0..523f4f8afb6e 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -1,3 +1,3 @@
 DIST pylama-7.7.1.tar.gz 34740 BLAKE2B a4bd5aed40c2c4e7bdb9f9968030f0954f0309cff80567b2252ee9576fdb4598714286bda63c22676789d4919662430ef2729089faa70b5cb590784eb47ef1f0 SHA512 298fabffcdf38e3e868e3965de87a0e761bc9dfcfe33320b53057c4e05598bcc22045481ec16ccb8df27f49ea41d6fef82b69fe7327905f93ce74d9350682cf0
-EBUILD pylama-7.7.1-r1.ebuild 1254 BLAKE2B 1d649e036e3646784b3c719a099c85793320f5b85d7ea4e6d1d436b447ade1c8d40664cfc00aa475695389d8bf550222ba08f51c67199f374c0af134c2274a86 SHA512 5dec83afa56c7c64defd42c446a7527dd2058329265e475b25dd9468c9bb06594e98a9c687b4928db2e0f4ad51d2be37366964471718e651a87211d09dd108ba
+EBUILD pylama-7.7.1-r1.ebuild 1266 BLAKE2B 84921e54496c1c77388e81b596530b6a63904e0ac9c1d0fdf698bfb4130aafd17c1c05a49b38f936dce86860bfdd33de556f1423b30da4e0a3ec248725e618ac SHA512 feebbcf1d48ce1a75cd58aa0a6a5ce99f8f749fea1e0d45328a5124eed0c4f5ec7ea10adb1f6c735b13c9205bc310a1b91f8f5cc26315651fe12a8e26760070f
 MISC metadata.xml 389 BLAKE2B 4320ff9500cf2ec3d896d0ae766fd5c850b72c773a1626df243904f779db7ab9c28c2db462ab90f72e99b1da96b1131d8da207f9e3d14766ef9c33fe92c4ca76 SHA512 024823ccef87858b76df67e12452882ba523cc05a09fc128d8fe943ac92dc45abd9f3912cf6232fe411874555eec205b2623419d9e0d3247bae7663fa3775894
diff --git a/dev-python/pylama/pylama-7.7.1-r1.ebuild b/dev-python/pylama/pylama-7.7.1-r1.ebuild
index a7fb5370fb22..0b583268e84f 100644
--- a/dev-python/pylama/pylama-7.7.1-r1.ebuild
+++ b/dev-python/pylama/pylama-7.7.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/mccabe-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index d7d3b90d4017..cca11cafe194 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,6 +1,6 @@
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
 DIST pylint-2.10.2.gh.tar.gz 813391 BLAKE2B 109f8817e32ddf8d93c9120518e77a1d2f7e61cd1a6362eb1cf9e6d242db72fa1a9271588a3abb28efca54bcc449dce623ae5d5fd63153ec2bc367e008aab465 SHA512 5d694587956c4f11eb4afaec26cefb66ccbe14dc2aacf378a0362326506d80eb2633e0d351c0a20715a3359a9bc438092d77b2e46f7f787210c7ab0555f2722f
 DIST pylint-2.9.6.gh.tar.gz 779390 BLAKE2B b1d8794e1e7ccdde87919eb943f83287c0a7b85b67f3722cbbe68887f2c61ab30b354548e25b70c661234647e35f79beb6aaad5f6be6bfde8c2475cf03676922 SHA512 a23ff089853398df2e4232767ca87c21e4ab4fc6805de80db796c78c56e0da1ade9b0586f5c14a98524bf607e0d240c354cf63287eec7dfdce263188eb19ddce
-EBUILD pylint-2.10.2.ebuild 1444 BLAKE2B b42a90326d85c9d3534b66f619b297c4255e04ecbd4f008d185ef1f35854f01381d040619227c71663be534a59f6cd5b606d47b4231afd1812bc5eb18c240c6d SHA512 0f5f4be70bca93f12c4ccf6e0dfdab0b5886dd3fe22c2a82f4c2f412a5439f969c60d4b6bd34d085183eb296e462a224e8c3097b9f55295fc33c532927415900
+EBUILD pylint-2.10.2.ebuild 1456 BLAKE2B b5d8d7533dab7b062e3407bf8e50ab4105a305e7180aac685b64f5cc16c9526eedaff5fe5d9689f8cdb855ef4f30bb599a1f4ff7bc5f3619b1425b125cb72ce8 SHA512 c8be16b5d86389ffe545d349ffae6f17bfe9351bf772c4aa2767b6b9e04552843552d6c390c85a964e9e7d749b5b07b93bf29cf6febfc44cac4ec49dd88fbc35
 EBUILD pylint-2.9.6.ebuild 1417 BLAKE2B 5949b36afe3130c030a608e7e2854ad4264fea065082794463870e2801a13c992952de59d83d2dcefa25a489cf6faae5ea4e441545429380e63298f9aa5d3297 SHA512 1d600f96bfd5c34a7f7c96e3451f71d8b7eb81cd06f475fb1a244ab6c2ff2f0e9e593470dd797a126fa9ea1080872d6c23e9427d74f919b7dbff838ab5927576
 MISC metadata.xml 1100 BLAKE2B 98ac44b343a44471afed50ea76c658142056bba3e3e0a75e7a3854c6e196eb55eeb466611c4d2976787fe4e5d4c13c1f434cad8afaece76f3ba04cd94197906f SHA512 78b52b43ebc944c60d037adb4874fcbe72a2ac713b713ac3b9a226966db2fabf0b31a11e16dcf26243cc19c62841928ac4bb32f5eef69f9d6ef9cb0222362bbf
diff --git a/dev-python/pylint/pylint-2.10.2.ebuild b/dev-python/pylint/pylint-2.10.2.ebuild
index 458edd00d90a..b24b55526163 100644
--- a/dev-python/pylint/pylint-2.10.2.ebuild
+++ b/dev-python/pylint/pylint-2.10.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pymetar/Manifest b/dev-python/pymetar/Manifest
index 2e845629c01f..f554183cbe15 100644
--- a/dev-python/pymetar/Manifest
+++ b/dev-python/pymetar/Manifest
@@ -1,3 +1,3 @@
-DIST pymetar-1.3.tar.gz 3162924 BLAKE2B 65327935cfcd78b56855fc0dd24cabeff315e75a9262ca586df0ad20e246ff1b7781a806e62e1f51e250761d26afa14f6fb911cc1994047001f9dc20dedccfe6 SHA512 255086913de89915afc0cd9284bd1036ced9a0d02493d3eb8e2e53bcff7f14d7b9d453f3f687fe32103ce6c0587ac604b671f271013e27ea09a5062f7a7a79af
-EBUILD pymetar-1.3.ebuild 584 BLAKE2B 33ff4940decdb60e07aac80e53a72821e1220d5d8124c1052078776fe14d416e01ae3596a7efdc279d9fd2fbbea7c299bf1f3ea008253a3000c0869e7e056bd6 SHA512 2818639d2bd71c7a8702f6b31ec3c27f4f0bd8380f20d2c4ca8bb182394cd64a79e3e557c145ee0d52c7bdb4a5c709188d2d3d0642e84b5a9095e5bdc4c71607
+DIST pymetar-1.4.tar.gz 3162928 BLAKE2B b92686204e84070722b3351ce04c1e65e3b47c7802767fbdb95027bcaea566518e61ac4c3e02dd0345c6672a87e2d50239a679dd7db426f7fa183023357763d3 SHA512 d5c5d382c68ffacefe07d63239f3b56984bf2becef922c945b0014a210ddf9ce1f96f99028e0ec9e649f70f6262925a836dbeb83309407aa2c4ddb4769db3dbd
+EBUILD pymetar-1.4.ebuild 584 BLAKE2B 33ff4940decdb60e07aac80e53a72821e1220d5d8124c1052078776fe14d416e01ae3596a7efdc279d9fd2fbbea7c299bf1f3ea008253a3000c0869e7e056bd6 SHA512 2818639d2bd71c7a8702f6b31ec3c27f4f0bd8380f20d2c4ca8bb182394cd64a79e3e557c145ee0d52c7bdb4a5c709188d2d3d0642e84b5a9095e5bdc4c71607
 MISC metadata.xml 1147 BLAKE2B 78d064c2dc37e9e9897c85a21a8a75642c7872480174224720e94a88d7a4ff1a557b75e9267c29adb8aba68c21619ed23de52fd35fc188d2b6dc9b6059a2b854 SHA512 d110dd1e9a77f823cbc77d8df281cbd4e822c8028501cb4b8341848171b093b52971725aec49c54cab73fdad92dac22fa203b8defcfbb4ea4d1e3a54f351ae57
diff --git a/dev-python/pymetar/pymetar-1.3.ebuild b/dev-python/pymetar/pymetar-1.4.ebuild
index 51894f79ee8d..51894f79ee8d 100644
--- a/dev-python/pymetar/pymetar-1.3.ebuild
+++ b/dev-python/pymetar/pymetar-1.4.ebuild
diff --git a/dev-python/pynput/Manifest b/dev-python/pynput/Manifest
index 7303086d1884..d66b8a877465 100644
--- a/dev-python/pynput/Manifest
+++ b/dev-python/pynput/Manifest
@@ -1,6 +1,4 @@
-DIST pynput-1.6.8.tar.gz 94483 BLAKE2B c04714fb9cdda9527ed6d3c0e7c25214a7678ee908f1a638023b95c2f63242fa7dc28f193b2055338a9cce10c26399eb4f4af0ec69a6ffaa1be0b7e85481ecc4 SHA512 23cf2e47e0a284aeb2e294529a1f47a01a42bccae146500eee2ff74704cb5ef7ff33327cca5d6ebec338369b1341c489431891d9f034801cc6be9aac2af90442
 DIST pynput-1.7.3.gh.tar.gz 101244 BLAKE2B 9f0468b4f94c825e4a093cbfab1ede6988352c4fa3f04f7cc29948d353e0aaaac8bd446f758d79916c2801c7d30ac8f04060e6b27ee29af705a61627ce0c6a5b SHA512 ee8d4439716ddd34765114ca111292d6ec6aca133c18256b378afa4efaae9146280f146dfa9ebb40f0371cb13d449ac5cb87b8fde1f6a2d7fcab456718dae683
-EBUILD pynput-1.6.8.ebuild 751 BLAKE2B e3a5e858c195d43fd409c4bb47ed808521f450aa3434717b01b9cdaaa0cb9e0cb671144627ebc0733fa4a57e95a09eae991938d012d34ccc5e0d0f8999fbbc5f SHA512 e30ff662f684e992638e5df506e450f96ad4c88c52451091c9e3171755eb9771777623c1fd804b8d1d70ec2207d36c9c7fe1690139bdc4adb1c585e9cf3b5bf9
 EBUILD pynput-1.7.3.ebuild 713 BLAKE2B 6ea70c3b18b8a9098d557f37b66766533e241b405f8972855fdf876db801adaf55770a55d8c64ad08c507b1e5652001b92238f2ee6c2b6a3a44e357606cc07ad SHA512 997ebc16b3fdbb64d7f8f55bb6e0f607c6a84b42156e838fb083521e39f68f39821fe9d53b5366425acc619811295e95c939db1cf557b3caa136dbfcde798217
 EBUILD pynput-9999.ebuild 751 BLAKE2B e3a5e858c195d43fd409c4bb47ed808521f450aa3434717b01b9cdaaa0cb9e0cb671144627ebc0733fa4a57e95a09eae991938d012d34ccc5e0d0f8999fbbc5f SHA512 e30ff662f684e992638e5df506e450f96ad4c88c52451091c9e3171755eb9771777623c1fd804b8d1d70ec2207d36c9c7fe1690139bdc4adb1c585e9cf3b5bf9
 MISC metadata.xml 317 BLAKE2B 638786df37c0c7f94ec16e16cb4770c1c1b5cfb6ac7ed492cd1c38bcb22ead3a07717574fa945fb8cf73afb3d5625716acbde6e27fa78326791759aa7c39d64e SHA512 f201385820099d3d37f4637a3b2ec8b2229db5201324a0cd6652030cd18bf101cd8c68ab8f9787afe3b1e85826621942990095448c2182ceb75f3565d84aa7b1
diff --git a/dev-python/pynput/pynput-1.6.8.ebuild b/dev-python/pynput/pynput-1.6.8.ebuild
deleted file mode 100644
index 132e0b5bbe49..000000000000
--- a/dev-python/pynput/pynput-1.6.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sends virtual input commands"
-HOMEPAGE="https://github.com/moses-palmer/pynput"
-LICENSE="GPL-3"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/moses-palmer/pynput.git"
-else
-	SRC_URI="https://github.com/moses-palmer/pynput/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/python-xlib[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	sed -i "s/ + SETUP_PACKAGES,/,/g" setup.py
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest
index 00ff41da4d9c..457f6a1f3f98 100644
--- a/dev-python/pyocr/Manifest
+++ b/dev-python/pyocr/Manifest
@@ -1,5 +1,3 @@
-DIST pyocr-0.7.2.tar.gz 65376 BLAKE2B 065084c19c7722e590c5f20abe5248b2be0c76dab864b4a4e2c457770ff61dec84df7254f19e4926753f39a5d1ed0618ed87827b85773ab96a51e3f7798c656f SHA512 002c3302ed20e19e06dc6fd995ce30150fb95650824df9e0a3d6b2bdcb4c0ae3f2295342c2df44e0d5a9c9bbf5432f47a9d7562e4866b87738ac3436a8c0dec9
 DIST pyocr-0.8.tar.gz 65454 BLAKE2B 881353eebce22cf316cd4375cc8971e740a9a463216a5b49c07c7813340cfa1a9bdd869b84b4c26566deab1551884179ae2fe0184dec73880b716118367803cd SHA512 c8d811001b460a9004a80fbf570df3fe9a6af11e8ca0e90f23e5f3be54f6a54d859f4ad3db126a5216ea557ecb38ebd5dbece91810df2bf3e95f514c39649bce
-EBUILD pyocr-0.7.2.ebuild 717 BLAKE2B da197daa370f03c412eeb2edae6bf73bd3e50fe399171906d6b9ae4544c8a86d8ce351ecb7c971e5c7a18e409b83d3a3988fb1a6c1801bf4f23c2ecdd04c6ed1 SHA512 4abf1da38d88058f4d922b6ceeebc4664ab19e39e09f58ef6d22d9fe8064f4897b44f70f5a99d72c44098f282dacb8f57f554b10de9a0fb32a78b9edbf06d08b
 EBUILD pyocr-0.8.ebuild 804 BLAKE2B b0f48b6c0d42f8626d06730fbd5400b9bb3d4b5fc16683b8e99ed5f73f9ef1c4cd1af8ecccd820d43ef5036369c487e9d17e6fa4905bc6136ed597e2961c7778 SHA512 cef145c69319ff438fb778ae7a264e5582e70393df33d39a3a5e14ea082323ac8b8a18d6775ef00ff042ef39bc92a612405f77d4287984797e7460ccf2f4e8c5
 MISC metadata.xml 1132 BLAKE2B 77ed8febe8322997eab2442bec13f5f4f7f101ecc3c410b62756687e8a24665388ecdc35a03a1728185f421e8dca3fb83eb3673807a9c7b600db27e7e30086cc SHA512 3307c040d15ee0ca37cae959e9824f0046f487a120b7b2b4c19fd1fc33b4bf1689796cbd0c6a6a2ff5f580910857abb7a3bcbe990d1384628445dc427a2c6500
diff --git a/dev-python/pyocr/pyocr-0.7.2.ebuild b/dev-python/pyocr/pyocr-0.7.2.ebuild
deleted file mode 100644
index cb90fdf8da04..000000000000
--- a/dev-python/pyocr/pyocr-0.7.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/pyocr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-IUSE="cuneiform +tesseract"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="cuneiform? ( app-text/cuneiform )
-	tesseract? ( app-text/tesseract )
-	dev-python/pillow
-	dev-python/six"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]"
-
-REQUIRED_USE="|| ( cuneiform tesseract )"
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 05bdbffd07b2..a98da1282351 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,9 +1,3 @@
-DIST pyproj-3.0.1.tar.gz 168962 BLAKE2B 3271d604148c122f4dfdd68c4237e1911f30da7cc858128d644b6b6807c3e49450e0b42c385d37bbe1cfa5ab80d635e7f620d41bf5089af6b49a542eb9b3fcd0 SHA512 f5ae0ede1deaa93757cb98cc680d6e47a19b9f5c0ce5e357c2ecfe96f764ff59ec7285c606162da38573123d21f12f1df82354f1d2205149970af2d7d63c2689
-DIST pyproj-3.1.0.tar.gz 182603 BLAKE2B d4e95f62b10b282e7bbfcb7a2059a11a489e53402cbb1760b7da73248dfc05de6be8ca820e55d34c9270eea38178f1fb934bd5ffc389833b3734b87b79991187 SHA512 21a5d08207676d8d9722cb5e3b13ed68f03b1a2aa034c20c61bb8dab5d204dd968ba9a3df1b0c43ed174e082725c7624efb75a0c9c3df920808cbcb44f4d170a
-DIST pyproj-3.2.0.tar.gz 212708 BLAKE2B f880b8aade716e6137bcd4cc4c2d96946e2c7c735077f8707e37b3f174b2613f0281a48140a0154a21615423cd2e1ed70cea79916a04f4b9d84e958b6fe31795 SHA512 67eedd839d625f57accbabadee719030184a79f74185765da2b5610d73b8341435edc56d70d42d5a5d0ece0e22421742a327fe746761ec4f782a72d977306a74
 DIST pyproj-3.2.1.tar.gz 213342 BLAKE2B 141f64f33f399e1089009f8047b2541516dc84f2b2133f5e0de5cbaf5d5bef30197f556f630076725a4d78c4244011bf1a7c9a54114d6e166cbb9c10c468da05 SHA512 4ba5bd2d2356c06b711e53581665bdcad3faeb420258c7d4bbb5639784948842a3a6ee0f1f0f50363878c183c38a27063071f25594576eccca146ceb33107761
-EBUILD pyproj-3.0.1.ebuild 1454 BLAKE2B baa1dd99d0e3c02662f1ea337583912d1d1978f4577dd548f1c7d12c6d7d539098324525d63bcaecc7eed9e2cbcc87bd0c80df36430e28d071897f5cf8b7a455 SHA512 45244a36fb061eb99c8fd56ab3e44aa047689e48e9279c2df2e26ad1f10271d2e67ed5eaf335d61e108e8e0ad86d9ad92ce2fc8cb7f8d2fead5f1f6e4faa750c
-EBUILD pyproj-3.1.0.ebuild 1439 BLAKE2B aff436fb0e36addbdef3ab39834b4db2acd560f66e4743e9304076e8d599e83e413b44f9b5dd60236f24afe38c8bd71214a38aea0c828174521f3a527475fcee SHA512 8b7a1714ee9df21959093a83edb5783ffa6a8fe2300c45c897472946b479a036ef82c38a193ac984c9c3b8f895363dec473580586235794481d16d6e75739f97
-EBUILD pyproj-3.2.0.ebuild 1377 BLAKE2B ee70c2410a392d3fcda1651d3d54797b909d074ca4021274e0becaa8254df487fc3e2f4e6393568438604a23cd8bf6618f5b3e157391f8636d937e8fa9116d8c SHA512 b98c0234a9c2176e113e91b4a741ca8aedb638668d38e06cac8b3b4a314188908a7192f6d13576b559218d7883345c93c66c316468f75e08af817bc8e46f7905
-EBUILD pyproj-3.2.1.ebuild 1368 BLAKE2B 1cf20ae2965180458d04b95bee43626e7634c0bfc6f638f041ba5d0371dca35832ea97f03d8d5a144d4952c5a55659644918dcd345378cefd3381e2e1522d110 SHA512 9747e35b47153c7136c140a45b59ae8638cb592c3df865cd7bdfec59d52844f9be59421f5f2dbdb82afdee4c174df39421960bec77bf0177c1b8816037d50c27
+EBUILD pyproj-3.2.1.ebuild 1367 BLAKE2B 56504981f9cd39d2209316a1df38036a869b2e5d471917aadc73fef5da8da18636bd3af7f0da741f9689e7b026452b6b46dbc80b3e9e8f62a02d56ad97c62de0 SHA512 51a3ea87ebbe308831a8f45a5066e4baa272749bf1858057ad900939ee249ed12bff3fa80508dc1564e9186cabc2e74bcf917ac9e091b83664d8865b541d98a8
 MISC metadata.xml 415 BLAKE2B 4f3ab70bc72ca97a428c357257d3a59591b410f12276a42e141cd0a43072b79107529c95c6a313906129e8893c75b63a6ef11ddc2f3842a7f5e5e7f7349ec38e SHA512 7ca8a01534471dff67c42a96c524d166278e26da309b2c4d766045e38086cc0e52ccc990881ebed7ca81219d705d9e4a9c16e86b052a50867bb032457e354903
diff --git a/dev-python/pyproj/pyproj-3.0.1.ebuild b/dev-python/pyproj/pyproj-3.0.1.ebuild
deleted file mode 100644
index 23672a0d5ffc..000000000000
--- a/dev-python/pyproj/pyproj-3.0.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Python interface to the PROJ library"
-HOMEPAGE="https://github.com/pyproj4/pyproj"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_p/.post}.tar.gz"
-S="${WORKDIR}/${P/_p/.post}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-
-RDEPEND=">=sci-libs/proj-7.2.0:="
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests --install pytest
-
-python_test() {
-	local deselect=(
-		# TODO
-		test/test_datum.py
-		test/test_transformer.py::test_transform_wgs84_to_alaska
-		test/test_transformer.py::test_repr__conditional
-		test/test_transformer.py::test_transformer_group__unavailable
-		test/test_transformer.py::test_transformer_group__network_disabled
-		test/test_transformer.py::test_transformer_group__download_grids__directory
-		test/crs/test_crs.py::test_coordinate_operation_grids__alternative_grid_name
-	)
-
-	distutils_install_for_testing
-	pytest -vv --import-mode=append -m "not network" \
-		${deselect[@]/#/--deselect } test ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pyproj/pyproj-3.1.0.ebuild b/dev-python/pyproj/pyproj-3.1.0.ebuild
deleted file mode 100644
index 4ae225d10ca6..000000000000
--- a/dev-python/pyproj/pyproj-3.1.0.ebuild
+++ /dev/null
@@ -1,49 +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 distutils-r1
-
-DESCRIPTION="Python interface to the PROJ library"
-HOMEPAGE="https://github.com/pyproj4/pyproj"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_p/.post}.tar.gz"
-S="${WORKDIR}/${P/_p/.post}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
-
-RDEPEND=">=sci-libs/proj-7.2.0:="
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests --install pytest
-
-python_test() {
-	local deselect=(
-		# TODO
-		test/test_datum.py
-		test/test_transformer.py::test_transform_wgs84_to_alaska
-		test/test_transformer.py::test_repr__conditional
-		test/test_transformer.py::test_transformer_group__unavailable
-		test/test_transformer.py::test_transformer_group__network_disabled
-		test/test_transformer.py::test_transformer_group__download_grids__directory
-		test/crs/test_crs.py::test_coordinate_operation_grids__alternative_grid_name
-	)
-
-	distutils_install_for_testing
-	cp -r test "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	epytest --import-mode=append -m "not network" \
-		${deselect[@]/#/--deselect } test
-}
diff --git a/dev-python/pyproj/pyproj-3.2.0.ebuild b/dev-python/pyproj/pyproj-3.2.0.ebuild
deleted file mode 100644
index 264aa18088e4..000000000000
--- a/dev-python/pyproj/pyproj-3.2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Python interface to the PROJ library"
-HOMEPAGE="https://github.com/pyproj4/pyproj"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-
-RDEPEND=">=sci-libs/proj-7.2.0:="
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests --install pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/test_datum.py
-		test/test_transformer.py::test_transform_wgs84_to_alaska
-		test/test_transformer.py::test_repr__conditional
-		test/test_transformer.py::test_transformer_group__unavailable
-		test/test_transformer.py::test_transformer_group__network_disabled
-		test/test_transformer.py::test_transformer_group__download_grids__directory
-		test/crs/test_crs.py::test_coordinate_operation_grids__alternative_grid_name
-	)
-
-	distutils_install_for_testing
-	cp -r test "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	epytest --import-mode=append -m "not network" test
-}
diff --git a/dev-python/pyproj/pyproj-3.2.1.ebuild b/dev-python/pyproj/pyproj-3.2.1.ebuild
index 64f2ad256bfa..7f3e2a508ab3 100644
--- a/dev-python/pyproj/pyproj-3.2.1.ebuild
+++ b/dev-python/pyproj/pyproj-3.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 
 RDEPEND=">=sci-libs/proj-7.2.0:="
 BDEPEND="
diff --git a/dev-python/pypugjs/Manifest b/dev-python/pypugjs/Manifest
index 2a91f91b4a91..449bd5ce7d2f 100644
--- a/dev-python/pypugjs/Manifest
+++ b/dev-python/pypugjs/Manifest
@@ -1,7 +1,3 @@
-DIST pypugjs-5.9.5.tar.gz 48925 BLAKE2B 4487799759e5090a9ef20da5af2d94d6f2d0139409cb5b963153ca949160bdf3f8f5ec8a3dd2949913b80f77b454ce4aeca00d9df10716c7202e105823db8f8b SHA512 f38ced5a908a4353aa1e48df605ebd80da418ecd2f5f554bf8e7788275a13ed82bc5b420656e5ba88862e033e339c5118d097d0ca7c1237aadd5049a15976aa8
-DIST pypugjs-5.9.8.tar.gz 49012 BLAKE2B c072f834127011edd81eab3d141a107592ee305739bee3bf116c9e0782009ecfbbfbb0cf5c10a04b6abdd303c18f79a0fb167f4dbfa2a4ca39664faef66d9f31 SHA512 5f02b2fd4355a489badb0ff09053438d5cd4a2a1d21da84fc276efe496492e384e55aea33d7ba715cc68437a1292ea30e39700e5f7bbff9dfe174d1cedca9fef
 DIST pypugjs-5.9.9.tar.gz 49022 BLAKE2B 26bdad4bd951eb8e515a0c181a56f68a8fdf8131dbd9e61c32c266bd91575143006f3cb6c2f477a2406110b22ed279a1167821a1b1f403a73bb333013173db2a SHA512 f34fab60e4f9d0680a36e5d2a28c5f99668c13b296a1bb70778dced235d223c592d49adbadc2f70b1a7e350f28a2f29dbce8febe2b8e99d60a0e050254180c71
-EBUILD pypugjs-5.9.5.ebuild 549 BLAKE2B 482ba5b61a6e5cf504cb7f2bb9b262fea370b54f1eded29fd424a0fbeda279a870eae287412f11698f8ea3477e47040494b8de94213351905224bda6f4d7d6d7 SHA512 9ee129d5c4a23abedbb24e81701573632cda1dc5e5e6acfb3d1c68251b9853e8cc0417eb66a171f8bc9dd8fc7e057f58957af4d3fd2ae23f8d7a3af4f614ff1f
-EBUILD pypugjs-5.9.8.ebuild 549 BLAKE2B 482ba5b61a6e5cf504cb7f2bb9b262fea370b54f1eded29fd424a0fbeda279a870eae287412f11698f8ea3477e47040494b8de94213351905224bda6f4d7d6d7 SHA512 9ee129d5c4a23abedbb24e81701573632cda1dc5e5e6acfb3d1c68251b9853e8cc0417eb66a171f8bc9dd8fc7e057f58957af4d3fd2ae23f8d7a3af4f614ff1f
 EBUILD pypugjs-5.9.9.ebuild 1117 BLAKE2B 81d4c83a00f438b23a5e3e969291309d61185b5c7559f626c5d53746a0c6161d84fb5451321bf533bae5b94cabfae48fbb1ee48867f8c5ede4ccbd8e0cfd81da SHA512 1e3894ecafdaa82d6af1c928f026e3711186e2344def94c791bd5022163935fa0dbed8ab6040986ce3640bf6f8b29b7f3d22bd8c36989d24f1d69a2b69157080
 MISC metadata.xml 755 BLAKE2B 9ff779edea415203b9433d398d03a465465e53dd1cf767914d870b1e0388f691d40e30eab978485373835a959d2104e41d1918c99bceb09063b671566149e4c1 SHA512 a8b75ce0bfa50bdfa05ed7744e1600c1e427f5b850fadcb2631d041d78beb48291726e87c981cc0594e8d56ef7a53255db4a32cb32c4965a4f9ba6f558c49618
diff --git a/dev-python/pypugjs/pypugjs-5.9.5.ebuild b/dev-python/pypugjs/pypugjs-5.9.5.ebuild
deleted file mode 100644
index 5301bcefc4e1..000000000000
--- a/dev-python/pypugjs/pypugjs-5.9.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Pug (Jade) syntax adapter for Django, Jinja2 and Mako templates"
-HOMEPAGE="https://github.com/kakulukia/pypugjs"
-SRC_URI="https://github.com/kakulukia/pypugjs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/chardet
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/pypugjs/pypugjs-5.9.8.ebuild b/dev-python/pypugjs/pypugjs-5.9.8.ebuild
deleted file mode 100644
index 5301bcefc4e1..000000000000
--- a/dev-python/pypugjs/pypugjs-5.9.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Pug (Jade) syntax adapter for Django, Jinja2 and Mako templates"
-HOMEPAGE="https://github.com/kakulukia/pypugjs"
-SRC_URI="https://github.com/kakulukia/pypugjs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/chardet
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 7c6c64463cbb..b0838409d7bc 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,10 +1,13 @@
 DIST pypy-exe-7.3.5-1.amd64.xpak 13646862 BLAKE2B ac2aecdb15d5b73cbd27b8a295ef5f11895ed7f897cda93cdff96c72ad727ab7998332231a1166100126ec2252b7c5b69e6b5bbfcb3e7fcb7738f5967809f5d8 SHA512 346f7b47d0e48799edd0e00b6bf683053ccaf20e6663ddd01e5753703082035cb4079a3539981813fc54abd7f83456353c38bd733dacf782e59a6548f861d1a7
 DIST pypy-exe-7.3.5-1.x86.xpak 10297092 BLAKE2B 149672f5714959deeb790b575e7980c1281b1cf37c0853e3ddf8c150104b2da0b8d32736eacc31f67d4d522902599e64bec7427727e560d8d54bbe7c5bd9a06e SHA512 48e4858489e928d44dd8570b783623eb33ce7a1fb62b2a054cd2841ca2be8ab7dd3bbd00c3aff770c1f8dc42ef52f52da3d18c5c27ebd08d19e78bdf56081e96
+DIST pypy-exe-7.3.6-1.amd64.xpak 13698534 BLAKE2B d47e70f5d982b273b31da94f4f9e35597ba79389caffb06df1b397b4de91b90fe23183afde609225155debd80acbc827ad8a7a6d52e2f2192f9fe80cc86d6af3 SHA512 500ba779dd0bb0a525bab520f5eb7155d81d386ae785b7a23d369c20345719f280b0f639d444807bd82a8a9cdadd8c85cb4ce3b31abc74e377796aa8e88c260a
+DIST pypy-exe-7.3.6-1.x86.xpak 10322051 BLAKE2B d15ce84560a4e0f56446b7b514c3a20ecf84de48b89e15bed4a261946f1f3b39cfd49323e600c5c186d9bdd75a900a3688c124daa5d9dba7bf0bdb82873cc3f6 SHA512 4ac83e5334666efccc7c5d59be7838032f9082055d320fa3b44b58c18c4349c4a5ebead0c9ae11b24069f80f82081f8119ec4c00287f16b80b83b21db429cddd
 DIST pypy-exe-7.3.6_rc1-1.amd64.xpak 13661837 BLAKE2B ff1b886fd963691acd063c6a1f0336b48af15cf2f59dd5236be9985f6d5c417e935ea59aca3f7d30cb1ec11f18912dcb5c43b40fb05c6a1ff71f51a8e0d05f35 SHA512 1273b355d6a76504f156f6602f12ce01a9f02aa5bb8e18dc85c7690a4aebb683942bde05347e0f1cd735a35ffef5b69268abcf17209dfb2c70fe6da7ab76370f
 DIST pypy-exe-7.3.6_rc1-1.x86.xpak 10314897 BLAKE2B 70343d0ebddf72784435c164e99a8ea484eb6302f2522e84770055b1e12e50db92fb1e65af1642f473e47edf71b1739b4bd07e5d1437611411ef878fd8dbff8f SHA512 7c387be4687fad42b6e3d8bf86a551c323011a894b3d7d3e6d70e52e92e02902425dc5b4c84fbf283fb305751d8277c9fce009489bcbc3abfa71a71bc3c3114a
 DIST pypy-exe-7.3.6_rc2-1.amd64.xpak 13690548 BLAKE2B c23513c41880f1c44af91f6aba233119cbf6e273b43c35d060fc01b89f36a3df8161c8a07b7c50289a65128a2a87db367632388ddf30ed4d4c3b08e3c2ccca18 SHA512 7b7755d9f63fc85b16284ffb320d4f39e452327bf6d22328208e23fcab5cbc1e23df072c7b54b63210bb69b827dd3264653451e5af84f8e60dfe7e6da2f5cc1c
 DIST pypy-exe-7.3.6_rc2-1.x86.xpak 10299348 BLAKE2B 5ac603f3f7dded12f5bb0d60d8c7d6cb674299a4bd0a0819f64ce76dc69d5864d945650b1935549734abca1ac848ca91ebd5558e83b23595108367aa2aa3d4be SHA512 f700a85db2af89092056f98aa08b1a5194ecd2118dc4c36bdc9bc0b0e0bbbdea4f98f5485a52da7e5c4fda97bd61cd0c229accd402f117eac2cbc50bcde2f530
 EBUILD pypy-exe-bin-7.3.5.ebuild 1126 BLAKE2B bd04e885a90a599f9e64d86460ec8f74abf622d83cd8eefccfcde349ed06f67ecc956770133af99fb48533fd2b8235e54bcef2a719fcab696759213a009c950e SHA512 eb58e00a86ede3626a7c8410ea2e6edcd7bd074f6095d44ad3cac985f9fd94ebc575606fbf31aba375cbeede04f2f8adc2d0aabb3019bae74ec362fa0d26f0b6
+EBUILD pypy-exe-bin-7.3.6.ebuild 1128 BLAKE2B 0507740d1a55e866814928a0d02f62293870caf4bdd0e6dc2639ffed421698f7277521bef8cf67ddef37864574e082d13198396b338d7b67cf8bab32cb988f70 SHA512 98a8fabf20ec50ddd8213eba6d1d5f0015a2543657dc330ec9d62e3fbb806ffd76d07ece7eccc5cea01b495bed6a9fcf05481151c33ccbfc793ef02502ec9c5e
 EBUILD pypy-exe-bin-7.3.6_rc1.ebuild 1117 BLAKE2B 3245da9497a9489f3b737c97290c3b5eaf050dd942182da56760fc2ce05826504a9cdcae6c4f9ff6302613311976d993b157ec7277dd4364e24f3292d1d0b782 SHA512 e45616d1e90e70bdd2a9cabca8ddf5e4eaa64acdc33c3e16df70e5cd89e3a3eda4cad43d5b98dc9f4fa9b603d36aef4f1407a718d71f96bade7dd031bca5762e
 EBUILD pypy-exe-bin-7.3.6_rc2.ebuild 1117 BLAKE2B 3245da9497a9489f3b737c97290c3b5eaf050dd942182da56760fc2ce05826504a9cdcae6c4f9ff6302613311976d993b157ec7277dd4364e24f3292d1d0b782 SHA512 e45616d1e90e70bdd2a9cabca8ddf5e4eaa64acdc33c3e16df70e5cd89e3a3eda4cad43d5b98dc9f4fa9b603d36aef4f1407a718d71f96bade7dd031bca5762e
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.6.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.6.ebuild
new file mode 100644
index 000000000000..9b5d5b8367c4
--- /dev/null
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy-exe-${PV}-1
+DESCRIPTION="PyPy executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	|| (
+		dev-libs/libffi-compat:7
+		dev-libs/libffi:0/7
+	)
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${SLOT}"
+
+QA_PREBUILT="
+	usr/lib/pypy2.7/pypy-c-${SLOT}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
+}
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 35adc122166d..ff48eac6efd6 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,10 +1,13 @@
 DIST pypy2.7-gentoo-patches-7.3.5.tar.xz 6928 BLAKE2B 41aff14411882e60102866a41de6a2c13983d5489c9ed928e2823714883b5cca289c093426fdec35b6df8d17de7a96528d799e10412a0f2f02563e152acf24ea SHA512 f12c1a414cf40e86e9d2a7d1cdfaaacc1045f8043da479b5270ef983ffcf01418a70bbd21ae740abf544091cdc5026bffe467d631242d5e9e0863a64fa8d026b
+DIST pypy2.7-gentoo-patches-7.3.6.tar.xz 7904 BLAKE2B 6a809f8f1fd59c18627abaf81b47fa5948d39d5ece86fa416944c1c6585ec5d43b56f4228479a6afdca9788a0ecfdc83fceb4eeea25f289c1dc0b2dbda79b882 SHA512 01fe42cdf94b559ed787e253325f7df0add62e30e77c6b6e4c0301c81ff624a31167d95b39d24d72f28441468d571112f424957de38e7f26ecdbfe0f33617296
 DIST pypy2.7-gentoo-patches-7.3.6rc1.tar.xz 7904 BLAKE2B 3a5b8efaa67d5a1b4f65a56c6256a3b1efa765079e0fb2c2d380b325175f2e8f3a7d7c4886f734374b6069b3ebf3ac63483f90ada0ece72ff5d8e5c82940c875 SHA512 820d6155e3451b22076719eb3ffc29fab74965761faeade52013d3928fd63cd00b8c5d045f0da0bc1f303a9d2998cd210cd6bec05b2ca01c8b281a61c9a4a73c
 DIST pypy2.7-gentoo-patches-7.3.6rc2.tar.xz 7900 BLAKE2B 66861532418a35f0f926fdd85dbf701ed06f6edef0dd82313302f899bd7c0049572ae069bafe1b927053f342f965341b28eeef913e9342af3c592721fd2c8fb5 SHA512 f727d73fa51737685eff9ea933c7bb3684a942abddd891e7c4d90f3185556954aefb0a04f543578c79f2fe2fea275b98e6e7857ac5d7c8774f9fd6ff893fa3e9
 DIST pypy2.7-v7.3.5-src.tar.bz2 21572184 BLAKE2B 388b8623c2c5de839dea0e60acc5e11a6a774b4a6cdc051691053a97fe13ec12c6735a4be64015653ef420c0d8af2c79d8faa90a7dfc3042e29f35f4e1ded6c3 SHA512 a30c666c29eec7cca7e2e52f26480958b5885cd59c6b2e3d3c0d8c1cc55c298e878fc95f88e38a4297bb3d7d1cc1f77470de958e5acfd317e1fc8bdd5d013dcb
+DIST pypy2.7-v7.3.6-src.tar.bz2 21621891 BLAKE2B a2d18ae9d455747484de491df228e7f26af46fc3bc1fd1c16ceba79eba5a3a3272d48312c9da112ae9310722b5af33098f28a7dc15d7ff4760886a8c974692a2 SHA512 df914f5e1a1f5ae5c1ea11cd8e29482309af4dce041cf2ae6d7b35a35717fec903be70f56e5f1ddbc9fd370cbe29f6896d25eb2cd10c493c352c80b279070ba3
 DIST pypy2.7-v7.3.6rc1-src.tar.bz2 21617621 BLAKE2B 659dd16920b157dae94c5d1f7a9346c7b933ec8c6a3019e36aaa6911bd01d5c9d064a75baa3d8f3df423db4d5a1de5d4f3c8fb63c8d5188d23401b07cc7611be SHA512 f8b949488c3af8acc5533d92238b7bca9ce59c24e93413e0db88094eaf58af5f92a9c9a941f3b7184d2761af2c2c4775891353df053a0762519606a4ce7ca544
 DIST pypy2.7-v7.3.6rc2-src.tar.bz2 21621430 BLAKE2B 2e8f5c41b4c79bd47a43c5ad38a4478ee6e7df7a20929e9be1315534a3b55c28d29bde5b46ff728aeba5cc05a0ed332045a4c114864d8b34746341a0023d1984 SHA512 e6354261f949cd042ba63988dff6a52dbc15c9a86be098b014c146218eaca9caffd76697134a5d4e4a18319b45229dfa73a617588f914dbee649b11197f296a0
 EBUILD pypy-exe-7.3.5.ebuild 4304 BLAKE2B 23387e2cabe080c84c97fddd49d750c173d0e4f73206c1bd5da7b5bab2f18d52b4ec02e01f79da17a5d6b01ad98a3933df996659f126e07143a06d9dd08da76f SHA512 7f3ab03fb5d0631079244afaff23064d84d02f4409fa0000a36b570ad6a63f438381cb4a5e94320e794725c31dbc4d614f6e8de71217ff01533f3caf67d3d529
+EBUILD pypy-exe-7.3.6.ebuild 4306 BLAKE2B 30adcd90824e7293533efa1595bf1a1efeeffeffb18b96c636036f40b0467e3ab31c803e309f5a3a18123d95b67453ee1c206f5a5092bc85861a0c2f30a7a27a SHA512 eb34559e6ab17373963f6521f5f5c8fbbf939262c5afd734c539f1e522bc7cb921add5076ab961bd45147f8acb5a70b18206991d7b3fca12fe3a26a0b1b34a94
 EBUILD pypy-exe-7.3.6_rc1.ebuild 4257 BLAKE2B 0c273f183edf602621563fc02647daa8de8414783915e2562703395120e457bdd33a655b338b5b3957717448a9fd3341570a4f24279145a9cc144de52722827a SHA512 4beeb8723fd9c4a9956eb5ac93b6d8d836d73c6e6b4808a25f255661f883a24d103de063bf5c50feff2c49dbb473e37f421ceff4022d386c3cb32ddc18b51109
 EBUILD pypy-exe-7.3.6_rc2.ebuild 4257 BLAKE2B 0c273f183edf602621563fc02647daa8de8414783915e2562703395120e457bdd33a655b338b5b3957717448a9fd3341570a4f24279145a9cc144de52722827a SHA512 4beeb8723fd9c4a9956eb5ac93b6d8d836d73c6e6b4808a25f255661f883a24d103de063bf5c50feff2c49dbb473e37f421ceff4022d386c3cb32ddc18b51109
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.6.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.6.ebuild
new file mode 100644
index 000000000000..51c5d0651a41
--- /dev/null
+++ b/dev-python/pypy-exe/pypy-exe-7.3.6.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
+
+DESCRIPTION="PyPy executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy-exe-bin:${PYPY_PV}"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
+DEPEND="${RDEPEND}"
+BDEPEND="
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		if ! has_version -b dev-python/pypy &&
+				! has_version -b dev-python/pypy-bin
+		then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
+			die "dev-python/pypy needs to be installed for USE=low-memory"
+		fi
+
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using already-installed PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please unset"
+			einfo "the EPYTHON variable."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
+	insinto "${dest}"/include/${PYPY_PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 561fb3f33922..589ecd4f33b1 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,10 +1,13 @@
 DIST pypy2.7-gentoo-patches-7.3.5_p2.tar.xz 8976 BLAKE2B 4bd12fa964da45a516b6d8cee8f2b9b1cd4cac9ee2e6369de1e8be5be2abab77e60a0fdc9416a76624b22f385135659b84edf7c64aa98f59a1c94f837c7e0d20 SHA512 ab47d5a0199997501f246399c3650919cc20423cc7e9517f16d1640e1863819016a944659e10af3e8ca803060f983546603feaba7c8f4cc3fb4996506fe59919
+DIST pypy2.7-gentoo-patches-7.3.6.tar.xz 7904 BLAKE2B 6a809f8f1fd59c18627abaf81b47fa5948d39d5ece86fa416944c1c6585ec5d43b56f4228479a6afdca9788a0ecfdc83fceb4eeea25f289c1dc0b2dbda79b882 SHA512 01fe42cdf94b559ed787e253325f7df0add62e30e77c6b6e4c0301c81ff624a31167d95b39d24d72f28441468d571112f424957de38e7f26ecdbfe0f33617296
 DIST pypy2.7-gentoo-patches-7.3.6rc1.tar.xz 7904 BLAKE2B 3a5b8efaa67d5a1b4f65a56c6256a3b1efa765079e0fb2c2d380b325175f2e8f3a7d7c4886f734374b6069b3ebf3ac63483f90ada0ece72ff5d8e5c82940c875 SHA512 820d6155e3451b22076719eb3ffc29fab74965761faeade52013d3928fd63cd00b8c5d045f0da0bc1f303a9d2998cd210cd6bec05b2ca01c8b281a61c9a4a73c
 DIST pypy2.7-gentoo-patches-7.3.6rc2.tar.xz 7900 BLAKE2B 66861532418a35f0f926fdd85dbf701ed06f6edef0dd82313302f899bd7c0049572ae069bafe1b927053f342f965341b28eeef913e9342af3c592721fd2c8fb5 SHA512 f727d73fa51737685eff9ea933c7bb3684a942abddd891e7c4d90f3185556954aefb0a04f543578c79f2fe2fea275b98e6e7857ac5d7c8774f9fd6ff893fa3e9
 DIST pypy2.7-v7.3.5-src.tar.bz2 21572184 BLAKE2B 388b8623c2c5de839dea0e60acc5e11a6a774b4a6cdc051691053a97fe13ec12c6735a4be64015653ef420c0d8af2c79d8faa90a7dfc3042e29f35f4e1ded6c3 SHA512 a30c666c29eec7cca7e2e52f26480958b5885cd59c6b2e3d3c0d8c1cc55c298e878fc95f88e38a4297bb3d7d1cc1f77470de958e5acfd317e1fc8bdd5d013dcb
+DIST pypy2.7-v7.3.6-src.tar.bz2 21621891 BLAKE2B a2d18ae9d455747484de491df228e7f26af46fc3bc1fd1c16ceba79eba5a3a3272d48312c9da112ae9310722b5af33098f28a7dc15d7ff4760886a8c974692a2 SHA512 df914f5e1a1f5ae5c1ea11cd8e29482309af4dce041cf2ae6d7b35a35717fec903be70f56e5f1ddbc9fd370cbe29f6896d25eb2cd10c493c352c80b279070ba3
 DIST pypy2.7-v7.3.6rc1-src.tar.bz2 21617621 BLAKE2B 659dd16920b157dae94c5d1f7a9346c7b933ec8c6a3019e36aaa6911bd01d5c9d064a75baa3d8f3df423db4d5a1de5d4f3c8fb63c8d5188d23401b07cc7611be SHA512 f8b949488c3af8acc5533d92238b7bca9ce59c24e93413e0db88094eaf58af5f92a9c9a941f3b7184d2761af2c2c4775891353df053a0762519606a4ce7ca544
 DIST pypy2.7-v7.3.6rc2-src.tar.bz2 21621430 BLAKE2B 2e8f5c41b4c79bd47a43c5ad38a4478ee6e7df7a20929e9be1315534a3b55c28d29bde5b46ff728aeba5cc05a0ed332045a4c114864d8b34746341a0023d1984 SHA512 e6354261f949cd042ba63988dff6a52dbc15c9a86be098b014c146218eaca9caffd76697134a5d4e4a18319b45229dfa73a617588f914dbee649b11197f296a0
 EBUILD pypy-7.3.5_p2.ebuild 4832 BLAKE2B 862e40dcfbab64b8cec4c44fbdafacafc2411037ae74e0601fc0d71dda70c376d868f71b19ceecc21bd2556d0cd02a6d009ae30454e85d5be5a2af7df007dde5 SHA512 835173f9ea59e57ceb7162d320ab38372c0d9feb3548c5e2d0c7fab54c129d53f5fbe0c7ed5599e95e1301634fb04cb23da306ca7762f116dc1016f081f52f40
+EBUILD pypy-7.3.6.ebuild 4891 BLAKE2B 4867f3bd85bfcf775f249e496f2361f0862a495616a4fd87df46a807e68b309f79c3d5f3ecce83938f16f813ad024e68ffa422b5e082d67de9087967222fdec0 SHA512 d777989f9845a95c14c24915d3cd65e38582769c565246a63400c553eb9e5bf6a73be66f5edff5002f421d73c0146ab9cb6a2dda4c68f95a4a26662a108e0ad5
 EBUILD pypy-7.3.6_rc1.ebuild 4975 BLAKE2B 029e4bf65279cf79ac5ef4f26c68e124da1c2388bf5f5a9cabbf40d0069b18a5e55411ba20ef176db076caf860b42757f84ec27fd8968eef951a79f92bcb790e SHA512 99498536a6b1d0ddcde0241354728932059cedc74ce69240921d96a5b8c0e8aa4e2ba37b224e2576317a729d573b176668bf873dab1ea903e9e4908c4a841a4f
 EBUILD pypy-7.3.6_rc2.ebuild 4985 BLAKE2B 4a5d2b818a7ae4c3d7d710f187b8df68d624b21f661ffbc697f89796ad0a9234061e28d898b04d12fb0e660d7ec10a078ca15a5dec4a97533029fb0b4d2d5b7c SHA512 d1fab937e08da6d0953bc892ba093db79554f2f401cfcecc01caa071a51ddf4b2d3d50cd3ba076cee598f42e3e1c85b639c7a0f48b95007575d0e5488e1a0390
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy/pypy-7.3.6.ebuild b/dev-python/pypy/pypy-7.3.6.ebuild
new file mode 100644
index 000000000000..63cde1b09a03
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.6.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils python-utils-r1
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit ncurses sqlite tk"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-libs/openssl:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy-bin-7.3.0:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy-c
+
+	# verify the subslot
+	local soabi=$(./pypy-c -c 'import sysconfig; print sysconfig.get_config_var("SOABI")')
+	[[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+	cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Verify that CFFI module list is up-to-date
+	local expected_cksum=2d3acf18
+	local local_cksum=$(../pypy-c -c '
+from pypy_tools.build_cffi_imports import cffi_build_scripts as x;
+import binascii, json;
+print("%08x" % (binascii.crc32(json.dumps(x)),))')
+	if [[ ${local_cksum} != ${expected_cksum} ]]; then
+		die "Please verify cffi_targets and update checksum to ${local_cksum}"
+	fi
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	einfo "Installing PyPy ..."
+	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy
+	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy2.7/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index d0d4cee744aa..c9b67b493949 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -1,10 +1,16 @@
 DIST pypy3-exe-7.3.5-1.amd64.xpak 12030139 BLAKE2B f9a76a2304b3a29985209910b2082aeb07f08a22fce771aa7d548af6e662b88563f61b66582fe0ded21a00463725d4b21cb943c6dedba090cdcfcbf2754433f6 SHA512 d223095cc28f5fceb10196a172ddc2e363dd7e0c5e55b79c959d2ff3f84cb96c652e44bf8c2f7b4555d90289fa0768b18cc26a9212264ab397dd7308a14a93df
 DIST pypy3-exe-7.3.5-1.x86.xpak 9156096 BLAKE2B c3a3a329c2f8bd843fc4c882bbddc1ad124dc797d4915818769e79663e53e787b991b04b8006e8b8548249e4e76d8b68545b9d7470d8cf41bece2cd8e085066c SHA512 b58d48e1fde3ec12b497a30035b719a64a16de1292fb34df6a8e3ecddc277a477641d7781a3440ef2b73dfb1b50ca34cbdca702f27d6a5e00ad25e88bd8ebf34
+DIST pypy3-exe-7.3.6-1.amd64.xpak 12196367 BLAKE2B ceae84849b3748482c3980a85f6d5428ad298dea942a672640187f0dacae7a3c425e625b32891c1dc3e824e8c43d50969171956823b309f19a29e052ead4c555 SHA512 606544cdb464307a43f516413ad368c2a9d92330f55600dadf958bb10a21ceee47d054057e07d6098b7ccb0f7ed21ee82a3f7aa1b07c08db7decec9a7104c929
+DIST pypy3-exe-7.3.6-1.x86.xpak 9215873 BLAKE2B 1606788ab6cab4790f86bbd457de70cb44b0ebdfdf378fe6f2b224648cb5cc49a564a877adf81f132691f9aa0e347329851960936fac20129d8c229a33e2947f SHA512 b128b74d604b20453252928ebe0f379bf0e99d24179edaafb95d9a11cedb22f4f526bc57f91332de648d68c64717ba7441167d7f824f12a06a1a0446d6f5fb5e
 DIST pypy3-exe-7.3.6_rc1-1.amd64.xpak 12163491 BLAKE2B 0cdf8b2a4b7c740a9f8770a33df40969d8c1711e92b7673e7cd4c6916df59637740c80be0412b3c11ac3388c1d381d5e289e0d805c8e4e9933637fb1a0767d6c SHA512 fa471617e31b84601b94f40fc887a1f3870c18184a9d561dfc88e6f2bd694af1abaf48b9709c446720dd22a47801bb9b741bf6a7e16f603145e301b245ae532a
 DIST pypy3-exe-7.3.6_rc1-1.x86.xpak 9228355 BLAKE2B 4669af53c163a979e76ebbbae20897dde14f43bc261c67cfd43516c3f342cdd5c61f503599fadb8f2e7a1849d18d1d98d59030cf190cb70903bb741138cceb7d SHA512 a02ab10b18562b864d4b08e5891cad66aa5ec085edb22e5fb19ff5f7e1e863d3ac99041362c9bcdf46a62977e658c2d3aaf853f4dbf6eaf3eafd241edd6cad4e
 DIST pypy3-exe-7.3.6_rc2-1.amd64.xpak 12176943 BLAKE2B 79c13618136f1b47f38c5b29367ed72705716cd5f86a7b415c68ac838950eef6c43f2eb941cbba93a592929c325e0d107f6dcdad79015c82f0c765408e863aa5 SHA512 11966b96a9a164b8ffea64fd2bff0c46437a1ba24d085eeac3a818907fdfe27de0d530d6bfc00722be1d34102703d2672290d61ccbf86d9b60b1821172cf6cf5
 DIST pypy3-exe-7.3.6_rc2-1.x86.xpak 9214814 BLAKE2B 28965e43f62bb838006dd0c5085e3be2a16a70e6f0153b1f5b90fcacdf9bcb0ba86e28cfa44fe484063d27bcca06d4a724f393269ff78fc2951a690527b17565 SHA512 dab254a1f78058fecbf09bd522de978481ac1af774c06abd0a211e9ba9872c4f9a22f212b02e12f32c015fed63fef37f093cc41921e167ac01b46e47a9d6b22e
+DIST pypy3-exe-7.3.6_rc3-1.amd64.xpak 12182691 BLAKE2B 39102cf565282b66000a2488123bb0f8976b93bb1e05a9e6a7f7b2f088a837f1ed5c2c636402e9edd485bca8f95835e56798495d2af8568839102fb32fc94534 SHA512 5fb3e20ee40f913d6a2d17b38f4e83daffb12d5578d5bc8bce72fb1a8656a0f5ff5abc2cacb64df49702ac5bde342ba35f3ee500c270bd8f177366f6a5c1b352
+DIST pypy3-exe-7.3.6_rc3-1.x86.xpak 9214943 BLAKE2B 87624a2cd93bdb63d295d94da75b0166fb83b9bb43abb32e399426c999b8f6df2f3c9a36c2afdcd0ffe6391bf6261e8dace4e3e5463259cfe838e9429334acb3 SHA512 719ac784523506e4cf6b187156f189af7d2f4793f0d0d75509623f6f1be5fe6cf54a73da56591bbca600f6352c7bcb5293c99f9b2dfa5c5606215af4481c38fe
 EBUILD pypy3-exe-bin-7.3.5.ebuild 1162 BLAKE2B 5b49c04df2ba2eed082c45fc9976bb7a02ff9b5fcedb41b25806b012afabd5150ea69e864126193d072dc248540940078a6fedbb9cab1287cf4fb3a95297650c SHA512 272007a6ed553f258a4c12cf7860363620b19b3acc0f74a21b12008bc7efbcbb387f97fe52d690b2d7efe911b9a3e2fee5cfc9afe0edbcfae61c2011093b4ff4
+EBUILD pypy3-exe-bin-7.3.6.ebuild 1140 BLAKE2B 307437a33e0da7f5a122ba8112f6e30bd7c86ec956e31b0c82431e7ac964e832115264ade1cdf3181b2acc0ea95f5b87bcb217d19068d79c56286ca37dbd0f04 SHA512 862d549b6fbf6f37a3fb29299cabbe95368ba3c0f46eeccd3f081082346b61158215ff89176d3e14951a93f4ffebf5fc3fbbfd0cef95fe31ae2ccda8393402df
 EBUILD pypy3-exe-bin-7.3.6_rc1.ebuild 1129 BLAKE2B fe4617965ebc360982e0c2206afa6c5e74ea4fea698f0096f259c57225df141cab18d2c97d79c8cbf1ac28f0ee856fef2a195a9623d2f0566aa407a5edd8edce SHA512 fa85190bcdef93361aabedf2dd4da8a585f09d4d4e8cc4b8d45c7f406cf4be383fe8421766d8b21b0ea0994ff43e1ac1ffe034e0360a5d8db5bdc50f76878724
 EBUILD pypy3-exe-bin-7.3.6_rc2.ebuild 1129 BLAKE2B fe4617965ebc360982e0c2206afa6c5e74ea4fea698f0096f259c57225df141cab18d2c97d79c8cbf1ac28f0ee856fef2a195a9623d2f0566aa407a5edd8edce SHA512 fa85190bcdef93361aabedf2dd4da8a585f09d4d4e8cc4b8d45c7f406cf4be383fe8421766d8b21b0ea0994ff43e1ac1ffe034e0360a5d8db5bdc50f76878724
+EBUILD pypy3-exe-bin-7.3.6_rc3.ebuild 1129 BLAKE2B fe4617965ebc360982e0c2206afa6c5e74ea4fea698f0096f259c57225df141cab18d2c97d79c8cbf1ac28f0ee856fef2a195a9623d2f0566aa407a5edd8edce SHA512 fa85190bcdef93361aabedf2dd4da8a585f09d4d4e8cc4b8d45c7f406cf4be383fe8421766d8b21b0ea0994ff43e1ac1ffe034e0360a5d8db5bdc50f76878724
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.6.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.6.ebuild
new file mode 100644
index 000000000000..650659cf58c5
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy3-exe-${PV}-1
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	|| (
+		dev-libs/libffi-compat:7
+		dev-libs/libffi:0/7
+	)
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${SLOT}"
+
+PYPY_PV=${SLOT%_p*}
+QA_PREBUILT="
+	usr/bin/pypy3-c-${PYPY_PV}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/bin/pypy3-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/bin/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.6_rc3.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.6_rc3.ebuild
new file mode 100644
index 000000000000..869d5d6e4790
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.6_rc3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy3-exe-${PV}-1
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS=""
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	|| (
+		dev-libs/libffi-compat:7
+		dev-libs/libffi:0/7
+	)
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${SLOT}"
+
+PYPY_PV=${SLOT%_p*}
+QA_PREBUILT="
+	usr/bin/pypy3-c-${PYPY_PV}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/bin/pypy3-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/bin/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index 5bccb5c7abb5..dcfbee027552 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,10 +1,16 @@
 DIST pypy3.7-gentoo-patches-7.3.5.tar.xz 8164 BLAKE2B 0f8707fda16c0358c1d3a2a60d83046bc5c6186906e07d0e2441d26da4c5d2e7978aa9013be211daf0a1bfddbb10f96745ba4be84b61903e177f4d906045ed67 SHA512 95d3acb11c811e4342ba3a56e925433614c5affb6a1fc873ecd2f2cfd55459424088b928f46bcb9a6f0e467fb77905af387ad04bad45a37b928fe0ea320ac33e
 DIST pypy3.7-v7.3.5-src.tar.bz2 25350766 BLAKE2B 34d5c83284271b184f71492dbd65b8760cc0fcdec71e41ef48b9561280dd67ef4c37fdd70759d0b95114d127446fc0ea5d04feb99022c1a725233862b2028834 SHA512 253d2efc81d55fb392ab810741e3a633f664e1908b2c26db7a8830c971655cca6be1b8d34581d13aa2d738a4a4c8ba23c2c90333b6e03d4608372e8013ea723b
+DIST pypy3.8-gentoo-patches-7.3.6.tar.xz 4392 BLAKE2B 757581efb1cd0e44279177a4a3d69ba2d34991c702247794cbfd8ee7a31dc6ad70ca41175689fbd31990286a3c60aec9bb5ce189cee1224f20d1f3452fbb958a SHA512 2ee6bc687a50fc1fb9ec5700fdfc4313c5f9b76a8e4da627cc8265e11cdbe8af2c92681207a1c9d869e89e1922c765410dd7790d0a39eadd00a6c2339bc1cfbe
 DIST pypy3.8-gentoo-patches-7.3.6rc1.tar.xz 4660 BLAKE2B 2a1fff331707a29dfb232ce4c2c6d3cada127b4452036172c3aac7579d89b8e0d4ea41300ffcadf0ec04b9cde32044371d55d225a477f2178dddb03642aa569b SHA512 bb781369d4e0dd387659fc474c7a23d8c54ab88477fdd007d3552c95e870a1896a0628dbba876e870956c5a1efeb52efbfd343a08f8a70a4515f41b1dc8ed60d
 DIST pypy3.8-gentoo-patches-7.3.6rc2.tar.xz 4380 BLAKE2B 1ad68c088d4888d3579c0b48789be3a95413ab8f11d971f9f616a1701ceed2b8eba595612e28dbbdbc1732e4f8a7cd08cbbb89cdc413d1a3e9eabbcd78fdde76 SHA512 c2d68610b78ed33aaa67ce5244d289409256f66f2505ac19f0a679c0c10e6024993bbc7d37a59547daac38d321653b8b1a63c55e3f52d1409969f0961842fdd7
+DIST pypy3.8-gentoo-patches-7.3.6rc3.tar.xz 4380 BLAKE2B 03159baf9fb33b65406df47272940cf6adfe2891994787b057d6925edd74063c4f1e4ac115b17d7a41a5d220e9ba27a68f4138792624cc50c2c6aee3a6d385ff SHA512 d88b3f97880735d84746970ef6ac05babde9d88ae6740411a646cec8618816d982a99ccf0628b73690cacc5a4ac9485160242c85756adad75ab7e3ad860b4e42
+DIST pypy3.8-v7.3.6-src.tar.bz2 24377230 BLAKE2B ca5890ded9b3d3bd4ee25911594bafec13b4226dee7f3464ad4386f01011870fac823ddbc1aebf7a813e3ad158baac24df631baf86a7e44ef6efdc7ae2763555 SHA512 2617e444f5ff73bb8ddea58b18849bedcc007feaeb748e9006a3c36401ab26d1c4aaf51eb148654d6bb8221f2e6624c45d3a75124c8912ca59756dfaa14a7068
 DIST pypy3.8-v7.3.6rc1-src.tar.bz2 24320127 BLAKE2B 920738d1d9a346dca8e76602fc5a1502ff6f610897e1f5b841b5207a32f82c52770684ba4ea076209e18b664cb9ba5df555a21f838ae581b436cbff9e2adb506 SHA512 334baf973397f8068137382c29632afd1288b76b57f21047bef59397d2718d8c420ba68acc2f1082501aadf7fbf8ee6a9fa86405c2a54d720a9a02dd7a7371aa
 DIST pypy3.8-v7.3.6rc2-src.tar.bz2 24350986 BLAKE2B fe167b7e1f4f81e1737220bb679874a1e0faa8605b0ec7d10db275c08226e12f8fcff5b958a5a2c42efba5125d88dea150b707441af13bd9b7ef0c9ef36d9c1b SHA512 98715c4053d995a442877f93b32ecb976ffc4160df869d35843718bacfd97d2bbd697f85b5961c420f8130d22e64d740d8d180a4f9ff802250897b4b8c216a6a
+DIST pypy3.8-v7.3.6rc3-src.tar.bz2 24374611 BLAKE2B 5b04bf5fa2f3f2f25a837add74ad716146681e1203ccdb915eed6d1f7f70cd9cb73426f63d310fd76fef2daf6537137d99fa14483886b2cf9946e979243de26f SHA512 872252ff8f090523d79c8d9acec07390587ab38075f35d25f2010ed5ea85537aaa9acb14d049a0a8059757f6c2c1411e9b5e23fec0b1ec2cfcca70e82e6e1c8f
 EBUILD pypy3-exe-7.3.5.ebuild 3871 BLAKE2B 40feb5472c324bb18ee06fba12a267f7374a9fe584b79665ade45873b3d4469a9ee8a415abc99d778e0ee21505a99f26a057280eb911995caf6b2c8fa505dc73 SHA512 39d6bace7b222097c756e33f4ef41a37d9c6565dda1595e6c8761bc45fb21e62b5b3b63127b00a938770707cb59cdb10504c61607845400f14b7b799e5346b9a
+EBUILD pypy3-exe-7.3.6.ebuild 3834 BLAKE2B 14881f98c63ddc5de14452cf7d92ab197a1d6201a5d07ddca86ed34f742395346926e524a369d6954cb90e54d87f44845aa4ef90ea9a37f303ca1a382bbce506 SHA512 48f95a485bcce59eb06ffd2416792ebe02344f3a5c8765aac90646e214edb3f7eb26a0c71906fa9c55bba3910e913371441f177de6efed1397950d91dd529651
 EBUILD pypy3-exe-7.3.6_rc1.ebuild 3785 BLAKE2B aa2255d151055023901a7fbc0045d439743c24ab9d8350c93d7760de64ec044b4c41d066de94e63957f402a151cb6def4d01e9927a8c7459722d518e4e4bacc4 SHA512 048e760d7e563c72b6bef73510358c1b2b416951d3e48f9f823f7a8279ac9b773b9c38f8fcadeb8dac3003e3fbf35ae93337c4aa475144a77c2bb07567d8ad6b
 EBUILD pypy3-exe-7.3.6_rc2.ebuild 3785 BLAKE2B aa2255d151055023901a7fbc0045d439743c24ab9d8350c93d7760de64ec044b4c41d066de94e63957f402a151cb6def4d01e9927a8c7459722d518e4e4bacc4 SHA512 048e760d7e563c72b6bef73510358c1b2b416951d3e48f9f823f7a8279ac9b773b9c38f8fcadeb8dac3003e3fbf35ae93337c4aa475144a77c2bb07567d8ad6b
+EBUILD pypy3-exe-7.3.6_rc3.ebuild 3785 BLAKE2B aa2255d151055023901a7fbc0045d439743c24ab9d8350c93d7760de64ec044b4c41d066de94e63957f402a151cb6def4d01e9927a8c7459722d518e4e4bacc4 SHA512 048e760d7e563c72b6bef73510358c1b2b416951d3e48f9f823f7a8279ac9b773b9c38f8fcadeb8dac3003e3fbf35ae93337c4aa475144a77c2bb07567d8ad6b
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.6.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.6.ebuild
new file mode 100644
index 000000000000..c8cc24bbcba0
--- /dev/null
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.6.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.8-v${PYPY_PV/_}
+PATCHSET="pypy3.8-gentoo-patches-${PV/_}"
+
+DESCRIPTION="PyPy3 executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${PYPY_PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	low-memory? ( dev-python/pypy )
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		# unset to allow forcing pypy below :)
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	cd "${T}"/usession*-0 || die
+	newbin testing_1/pypy3-c pypy3-c-${PYPY_PV}
+	insinto /usr/include/pypy3.8/${PYPY_PV}
+	doins pypy_*.h
+	pax-mark m "${ED}/usr/bin/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.6_rc3.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.6_rc3.ebuild
new file mode 100644
index 000000000000..89b01acb0ce7
--- /dev/null
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.6_rc3.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.8-v${PYPY_PV/_}
+PATCHSET="pypy3.8-gentoo-patches-${PV/_}"
+
+DESCRIPTION="PyPy3 executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS=""
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${PYPY_PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	low-memory? ( dev-python/pypy )
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		# unset to allow forcing pypy below :)
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	cd "${T}"/usession*-0 || die
+	newbin testing_1/pypy3-c pypy3-c-${PYPY_PV}
+	insinto /usr/include/pypy3.8/${PYPY_PV}
+	doins pypy_*.h
+	pax-mark m "${ED}/usr/bin/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index af1670327428..0c65b2f4316a 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,10 +1,16 @@
 DIST pypy3.7-gentoo-patches-7.3.5_p1.tar.xz 9792 BLAKE2B c82869393c8a63462fa03c58822f95628093a64d2bb421aaa486ad8217d944ace641d9ea13f2b2a2c56ab16498824709fa35cf0a9704b728bac06646d8f2c15f SHA512 18643e28f137f62406ce4f2d448acb86329fd8566a31b90340c573e4205091ff5b15b77ac14796022968814f940cd9881fe4db9010609937b2a0a71d557531f2
 DIST pypy3.7-v7.3.5-src.tar.bz2 25350766 BLAKE2B 34d5c83284271b184f71492dbd65b8760cc0fcdec71e41ef48b9561280dd67ef4c37fdd70759d0b95114d127446fc0ea5d04feb99022c1a725233862b2028834 SHA512 253d2efc81d55fb392ab810741e3a633f664e1908b2c26db7a8830c971655cca6be1b8d34581d13aa2d738a4a4c8ba23c2c90333b6e03d4608372e8013ea723b
+DIST pypy3.8-gentoo-patches-7.3.6.tar.xz 4392 BLAKE2B 757581efb1cd0e44279177a4a3d69ba2d34991c702247794cbfd8ee7a31dc6ad70ca41175689fbd31990286a3c60aec9bb5ce189cee1224f20d1f3452fbb958a SHA512 2ee6bc687a50fc1fb9ec5700fdfc4313c5f9b76a8e4da627cc8265e11cdbe8af2c92681207a1c9d869e89e1922c765410dd7790d0a39eadd00a6c2339bc1cfbe
 DIST pypy3.8-gentoo-patches-7.3.6rc1.tar.xz 4660 BLAKE2B 2a1fff331707a29dfb232ce4c2c6d3cada127b4452036172c3aac7579d89b8e0d4ea41300ffcadf0ec04b9cde32044371d55d225a477f2178dddb03642aa569b SHA512 bb781369d4e0dd387659fc474c7a23d8c54ab88477fdd007d3552c95e870a1896a0628dbba876e870956c5a1efeb52efbfd343a08f8a70a4515f41b1dc8ed60d
 DIST pypy3.8-gentoo-patches-7.3.6rc2.tar.xz 4380 BLAKE2B 1ad68c088d4888d3579c0b48789be3a95413ab8f11d971f9f616a1701ceed2b8eba595612e28dbbdbc1732e4f8a7cd08cbbb89cdc413d1a3e9eabbcd78fdde76 SHA512 c2d68610b78ed33aaa67ce5244d289409256f66f2505ac19f0a679c0c10e6024993bbc7d37a59547daac38d321653b8b1a63c55e3f52d1409969f0961842fdd7
+DIST pypy3.8-gentoo-patches-7.3.6rc3.tar.xz 4380 BLAKE2B 03159baf9fb33b65406df47272940cf6adfe2891994787b057d6925edd74063c4f1e4ac115b17d7a41a5d220e9ba27a68f4138792624cc50c2c6aee3a6d385ff SHA512 d88b3f97880735d84746970ef6ac05babde9d88ae6740411a646cec8618816d982a99ccf0628b73690cacc5a4ac9485160242c85756adad75ab7e3ad860b4e42
+DIST pypy3.8-v7.3.6-src.tar.bz2 24377230 BLAKE2B ca5890ded9b3d3bd4ee25911594bafec13b4226dee7f3464ad4386f01011870fac823ddbc1aebf7a813e3ad158baac24df631baf86a7e44ef6efdc7ae2763555 SHA512 2617e444f5ff73bb8ddea58b18849bedcc007feaeb748e9006a3c36401ab26d1c4aaf51eb148654d6bb8221f2e6624c45d3a75124c8912ca59756dfaa14a7068
 DIST pypy3.8-v7.3.6rc1-src.tar.bz2 24320127 BLAKE2B 920738d1d9a346dca8e76602fc5a1502ff6f610897e1f5b841b5207a32f82c52770684ba4ea076209e18b664cb9ba5df555a21f838ae581b436cbff9e2adb506 SHA512 334baf973397f8068137382c29632afd1288b76b57f21047bef59397d2718d8c420ba68acc2f1082501aadf7fbf8ee6a9fa86405c2a54d720a9a02dd7a7371aa
 DIST pypy3.8-v7.3.6rc2-src.tar.bz2 24350986 BLAKE2B fe167b7e1f4f81e1737220bb679874a1e0faa8605b0ec7d10db275c08226e12f8fcff5b958a5a2c42efba5125d88dea150b707441af13bd9b7ef0c9ef36d9c1b SHA512 98715c4053d995a442877f93b32ecb976ffc4160df869d35843718bacfd97d2bbd697f85b5961c420f8130d22e64d740d8d180a4f9ff802250897b4b8c216a6a
+DIST pypy3.8-v7.3.6rc3-src.tar.bz2 24374611 BLAKE2B 5b04bf5fa2f3f2f25a837add74ad716146681e1203ccdb915eed6d1f7f70cd9cb73426f63d310fd76fef2daf6537137d99fa14483886b2cf9946e979243de26f SHA512 872252ff8f090523d79c8d9acec07390587ab38075f35d25f2010ed5ea85537aaa9acb14d049a0a8059757f6c2c1411e9b5e23fec0b1ec2cfcca70e82e6e1c8f
 EBUILD pypy3-7.3.5_p1.ebuild 5273 BLAKE2B 1bd37ba70540a4c6be9a836c2126531ad80ccf414e6c4efedd9be76678405325a7dda8993f5698b4d56fbebf000fb7a61e071f0c76490ce65b6783fd273c3cc5 SHA512 34de7096ec5b30dc0fa6e2b22c69a16b6f111c1322ea0f916bb168924be7bf5ab52f3d328ca691275b9dd76aecdb2173efae69c95fafbd81fafd0e3030162e57
+EBUILD pypy3-7.3.6.ebuild 5287 BLAKE2B 9b35658c40ad82a587ecf1d3bb686a96847586ee95371abe6317e580e7a99925ae978d44639675ce08269965a960095211f7193d8dc766f43888de61ee328d9d SHA512 ab69ae3227035afe4ddf3751893139d1b7527947c76d59fb92410890a3a06c8b4ea4bc87883275118d9445e9777977948abd99681e3d1ff2456162d11096e4a4
 EBUILD pypy3-7.3.6_rc1.ebuild 5800 BLAKE2B a5b0063de9493347d08662ee10dda34ab19a6b60c134d023be4151423a840cf1c94529af2cb9754d6e7f9bbe699df78e9b51cde053b63e88948a91d4e7fcfd8d SHA512 6e4ce1d9d0b260e29e26dcd9c5b5016e5927b3df804402d8eb87245a97dea6b47aee188399fb26c36b407d744b6af897850d0ca0bb709f300c21263f80b65abf
 EBUILD pypy3-7.3.6_rc2.ebuild 5784 BLAKE2B 196433d8ce17fa1af73d4ddee6ed41d5419fdc5ceccf222edee0c94afe63bdc74daae5ad6aacd980b5fdd033e6bff42a3df40f1a1dc5df50dc50e55455e35d14 SHA512 9b7425c36580da2b280c25a209ca5f89d0284b8d998d2be9226c6903fe0539f3c0165879c68a494cc33cfa42eeaed89821b5230a3c3303adc0cfdffa69b9e57a
+EBUILD pypy3-7.3.6_rc3.ebuild 5784 BLAKE2B 196433d8ce17fa1af73d4ddee6ed41d5419fdc5ceccf222edee0c94afe63bdc74daae5ad6aacd980b5fdd033e6bff42a3df40f1a1dc5df50dc50e55455e35d14 SHA512 9b7425c36580da2b280c25a209ca5f89d0284b8d998d2be9226c6903fe0539f3c0165879c68a494cc33cfa42eeaed89821b5230a3c3303adc0cfdffa69b9e57a
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3/pypy3-7.3.6.ebuild b/dev-python/pypy3/pypy3-7.3.6.ebuild
new file mode 100644
index 000000000000..b572f8d6e2bb
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.6.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.8-v${PYPY_PV/_rc/rc}
+PATCHSET="pypy3.8-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.8) language"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy38-pp73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
+# pypy3.8 is in alpha state and many tests are failing
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy3-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy3-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-libs/openssl:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	mkdir bin || die
+	# switch to the layout expected for cffi module builds
+	mkdir include/pypy3.8 || die
+	cp include/*.h include/pypy3.8/ || die
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/bin/pypy3-c-${PYPY_PV} pypy3-c || die
+	cp -p "${BROOT}"/usr/include/pypy3.8/${PYPY_PV}/* include/pypy3.8/ || die
+	# (not installed by pypy-exe)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/pypy3.8/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy3.8/ || die
+	pax-mark m pypy3-c
+
+	# verify the subslot
+	local soabi=$(./pypy3-c -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))')
+	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+	# (NB: we build CFFI modules first to avoid error log when importing
+	# build_cffi_imports).
+	cffi_targets=( pypy_util blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma posixshmem )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Verify that CFFI module list is up-to-date
+	local expected_cksum=63d4659f
+	local local_cksum=$(../pypy3-c -c '
+from pypy_tools.build_cffi_imports import cffi_build_scripts as x;
+import binascii, json;
+print("%08x" % (binascii.crc32(json.dumps(x).encode()),))')
+	if [[ ${local_cksum} != ${expected_cksum} ]]; then
+		die "Please verify cffi_targets and update checksum to ${local_cksum}"
+	fi
+
+	# Cleanup temporary objects
+	find -name "*_cffi.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	# (--deselect for failing doctests)
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	dodir /usr/bin
+	dosym pypy3-c-${PYPY_PV} /usr/bin/pypy3
+	insinto /usr/lib/pypy3.8
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r lib-python/3/. lib_pypy/.
+	insinto /usr/include
+	doins -r include/pypy3.8
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/include/pypy3.8/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy3.8/${x##*/}"
+	done
+
+	dodoc README.rst
+
+	local dest=/usr/lib/pypy3.8
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/sqlite3 \
+			"${ED}${dest}"/_sqlite3* \
+			"${ED}${dest}"/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/{idlelib,tkinter} \
+			"${ED}${dest}"/_tkinter \
+			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}/usr/bin/pypy3-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}/usr/bin/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto "${dest}"/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3/pypy3-7.3.6_rc3.ebuild b/dev-python/pypy3/pypy3-7.3.6_rc3.ebuild
new file mode 100644
index 000000000000..35693dd577fd
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.6_rc3.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.8-v${PYPY_PV/_rc/rc}
+PATCHSET="pypy3.8-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.8) language"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy38-pp73"
+KEYWORDS=""
+IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
+# pypy3.8 is in alpha state and many tests are failing
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy3-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy3-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-libs/openssl:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	mkdir bin || die
+	# switch to the layout expected for cffi module builds
+	mkdir include/pypy3.8 || die
+	cp include/*.h include/pypy3.8/ || die
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/bin/pypy3-c-${PYPY_PV} pypy3-c || die
+	cp -p "${BROOT}"/usr/include/pypy3.8/${PYPY_PV}/* include/pypy3.8/ || die
+	# (not installed by pypy-exe)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/pypy3.8/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy3.8/ || die
+	pax-mark m pypy3-c
+
+	# verify the subslot
+	local soabi=$(./pypy3-c -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))')
+	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+	#cffi_build_scripts = collections.OrderedDict([
+	#    ("_ctypes._ctypes_cffi",
+	#     "_ctypes/_ctypes_build.py" if sys.platform == 'darwin' else None),
+	#    ("_blake2", "_blake2/_blake2_build.py"),
+	#    ("_ssl", "_ssl_build.py"),
+	#    ("sqlite3", "_sqlite3_build.py"),
+	#    ("audioop", "_audioop_build.py"),
+	#    ("_tkinter", "_tkinter/tklib_build.py"),
+	#    ("curses", "_curses_build.py" if sys.platform != "win32" else None),
+	#    ("syslog", "_syslog_build.py" if sys.platform != "win32" else None),
+	#    ("_gdbm", "_gdbm_build.py"  if sys.platform != "win32" else None),
+	#    ("grp", "_pwdgrp_build.py" if sys.platform != "win32" else None),
+	#    ("resource", "_resource_build.py" if sys.platform != "win32" else None),
+	#    ("lzma", "_lzma_build.py"),
+	#    # ("_decimal", "_decimal_build.py"),  # issue 3024
+	#    ("_sha3", "_sha3/_sha3_build.py"),
+	#    ("xx", None),    # for testing: 'None' should be completely ignored
+	#    ("_posixshmem", "_posixshmem_build.py" if sys.platform != "win32" else None),
+	#    ])
+	cffi_targets=( pypy_util blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma posixshmem )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "*_cffi.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	# (--deselect for failing doctests)
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	dodir /usr/bin
+	dosym pypy3-c-${PYPY_PV} /usr/bin/pypy3
+	insinto /usr/lib/pypy3.8
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r lib-python/3/. lib_pypy/.
+	insinto /usr/include
+	doins -r include/pypy3.8
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/include/pypy3.8/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy3.8/${x##*/}"
+	done
+
+	dodoc README.rst
+
+	local dest=/usr/lib/pypy3.8
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/sqlite3 \
+			"${ED}${dest}"/_sqlite3* \
+			"${ED}${dest}"/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/{idlelib,tkinter} \
+			"${ED}${dest}"/_tkinter \
+			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}/usr/bin/pypy3-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}/usr/bin/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto "${dest}"/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index 08107e01f692..d9195d553077 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,4 +1,7 @@
+AUX pyqtgraph-0.12.2-fix-py3.10.patch 1784 BLAKE2B b79bf8e8e80eb6b223d5a2788118393a62336e0870f01c50b9a7c58c5f161b11c13ed37911e7fd2abedf42ef9ba3a574dc8536d8ec10ea7b59271ea0993f12ca SHA512 b012bab35bf964ee3db73af7ee8a242c37085d40d6c6ab4820794fbe48ae26175c5c865d714e807d1fc8302e9943b59b510c32cd1b6ed8022141c2e4462271f6
 DIST pyqtgraph-0.12.2.tar.gz 1292676 BLAKE2B af5e61bbc7f55cda669825a9742a3f2424638d35e3a10b85b7fc635a5e40b630848bed1e88bc84383cbd3e85de538b1b1fa051d6d761b368209c1d8167f55a2a SHA512 8a7f0e1e78cf147568ee6e393a07f07301632765d1bdb50328fcf1f815dda76f3e89808cef945409dcd9142407f864f205778a76cf804d4cbce544c60bcf5042
+DIST pyqtgraph-0.12.3.tar.gz 1317230 BLAKE2B d9a7a86f976fd7d778b0f038b24e80d6cbbdb98f6cda7de0461d1e3bbac0a99745dc3cccc63f38c24128018a2f41f3a0da7437bf9ddbd3f4091fd826ae4ea915 SHA512 13f1ff4bcce7ab8c133ebb99101d300bb3abcd6ea8b7321f3aa646d6992b6988db17d478dcec52339dd380f7c6e487f47b95b9f9de616b7ff2dab35ca5f0cc30
 DIST pyqtgraph-test-data-8.tar.gz 306068 BLAKE2B f3aa418dfaf2e74950fa880da4b6dfb4ef5dbd46346b78065d885c1f9fc06fc3de86756af17e27035d4cd47d98cc7ce58c036b493837b568086a4ebceb230c78 SHA512 07ef414f2b57e00589f8c18459e88ab16001c7cc3766164cdfcd69faa26cbc90ed64611fd0c5e3b401dc6a3f1a6e9e4ce6a7d9fa96ebcc4360e03fa9fbb856d2
-EBUILD pyqtgraph-0.12.2.ebuild 2448 BLAKE2B 4ce693ffec4c109bf20367ac3d0d9524ccadb4c4d357420b18bac88dc18d830cc5337d683fb3aa1cf11f088d42da23e6d9adab10d359ead8098c28f318bbf113 SHA512 a1af7760bfb2756c3539101fd45cd7fbb3de8e83fcd6adaf661eac569f243fadede2012900d2c775c3733f265eba56e18fc7e7e9780db1c8893e42b744636089
+EBUILD pyqtgraph-0.12.2.ebuild 2490 BLAKE2B 9d19a3a0842d2ff7dbf1c586f32fd02f5ffe121d14a17831c9c0506e76000d4952589bcb9717de5034bb4044c98b62e90d26b4f942dfce9d8f54c6d607e4227a SHA512 7b5bd1384f7c2dea878f57d325d45009aa661d783576b44125e43bb6397c306e866eef1ad80558bd856080a2d7c35fc96e6e76f72c78946359a7947ea0463f8e
+EBUILD pyqtgraph-0.12.3.ebuild 2442 BLAKE2B 6576676b442c82e9ecc82d30b5c0dfc57e2666e3abe9edd99387a5b29830549eb36e3c72dcf44d486f4026116e43cc84f0a8d6eb977d70443668b5d93ad2a7dc SHA512 19cada260fe97705f9f337ec337503d8498c991281564a823ed19b80ae7f1a2a08d74390b393ee1c97a7bd11e70b35d144b04eec187c96ce32a059a7a9a83706
 MISC metadata.xml 775 BLAKE2B 08f1417793ef0b57d978cab5b4c03e43e756a43625d8e6173a8b74d3c9dcce0547934485d192546cf81b8da03bdf21e4c800bb25e0bec452fe092ab3772a518f SHA512 b03a0aa3f6e6183ef2d81b9d0bb22f576661b353986a802f01cb670f9ae0487d84d3e91fd0a4add41e3dd830dbbc0414f4d556bc05bb89a768be9e5c2cee4ce4
diff --git a/dev-python/pyqtgraph/files/pyqtgraph-0.12.2-fix-py3.10.patch b/dev-python/pyqtgraph/files/pyqtgraph-0.12.2-fix-py3.10.patch
new file mode 100644
index 000000000000..bb1e4a8a766a
--- /dev/null
+++ b/dev-python/pyqtgraph/files/pyqtgraph-0.12.2-fix-py3.10.patch
@@ -0,0 +1,46 @@
+From db8180d88ed37425467d030bebf7792c86691b83 Mon Sep 17 00:00:00 2001
+From: Scott Talbert <swt@techie.net>
+Date: Sun, 11 Jul 2021 22:04:00 -0400
+Subject: [PATCH] Fix GLTextItem with Python 3.10
+
+drawText() expects int arguments and Python 3.10 does not allow for
+implicit rounding.
+
+--- a/pyqtgraph/opengl/items/GLTextItem.py
++++ b/pyqtgraph/opengl/items/GLTextItem.py
+@@ -68,15 +68,15 @@ def paint(self):
+         viewport = glGetIntegerv(GL_VIEWPORT)
+
+         text_pos = self.__project(self.pos, modelview, projection, viewport)
+-        text_pos[1] = viewport[3] - text_pos[1]
+
++        text_pos.setY(viewport[3] - text_pos.y())
+         text_pos /= self.view().devicePixelRatio()
+
+         painter = QtGui.QPainter(self.view())
+         painter.setPen(self.color)
+         painter.setFont(self.font)
+         painter.setRenderHints(QtGui.QPainter.RenderHint.Antialiasing | QtGui.QPainter.RenderHint.TextAntialiasing)
+-        painter.drawText(text_pos[0], text_pos[1], self.text)
++        painter.drawText(text_pos, self.text)
+         painter.end()
+
+     def __project(self, obj_pos, modelview, projection, viewport):
+@@ -86,12 +86,11 @@ def __project(self, obj_pos, modelview, projection, viewport):
+         proj_vec = np.matmul(projection.T, view_vec)
+
+         if proj_vec[3] == 0.0:
+-            return
++            return QtCore.QPointF(0, 0)
+
+         proj_vec[0:3] /= proj_vec[3]
+
+-        return np.array([
+-            viewport[0] + (1.0 + proj_vec[0]) * viewport[2] / 2.0,
+-            viewport[1] + (1.0 + proj_vec[1]) * viewport[3] / 2.0,
+-            (1.0 + proj_vec[2]) / 2.0
+-        ])
++        return QtCore.QPointF(
++            viewport[0] + (1.0 + proj_vec[0]) * viewport[2] / 2,
++            viewport[1] + (1.0 + proj_vec[1]) * viewport[3] / 2
++        )
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.12.2.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.12.2.ebuild
index 3bc55a927f18..c6366f824b79 100644
--- a/dev-python/pyqtgraph/pyqtgraph-0.12.2.ebuild
+++ b/dev-python/pyqtgraph/pyqtgraph-0.12.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 multiprocessing
 
 TEST_DATA_TAG=test-data-8
@@ -21,6 +21,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="examples opengl svg"
+REQUIRED_USE="test? ( opengl svg )"
 
 RDEPEND="
 	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
@@ -30,57 +31,61 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/h5py[${PYTHON_USEDEP}]
-		dev-python/PyQt5[svg,testlib,${PYTHON_USEDEP}]
+		dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
 distutils_enable_sphinx doc/source
 distutils_enable_tests pytest
 
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
-	if use test; then
-		mkdir "${HOME}"/.pyqtgraph || die
-		mv "${WORKDIR}/test-data-${TEST_DATA_TAG}" \
-			"${HOME}"/.pyqtgraph/test-data || die
-		cd "${HOME}"/.pyqtgraph/test-data || die
-		# we need to fake a git repo
-		git config --global user.email "you@example.com"
-		git config --global user.name "Your Name"
-		git init -q || die
-		git commit -q --allow-empty -m "dummy commit" || die
-		git tag "${TEST_DATA_TAG}" || die
-		cd - >/dev/null || die
-	fi
 	if ! use opengl; then
 		rm -r pyqtgraph/opengl || die
 	fi
 }
 
 python_test() {
-	local deselect=(
+	local EPYTEST_DESELECT=(
 		# apparently fragile
-		--deselect tests/test_reload.py::test_reload
+		tests/test_reload.py::test_reload
 
 		# TODO
-		--deselect tests/graphicsItems/test_ROI.py::test_PolyLineROI
+		tests/graphicsItems/test_ROI.py::test_PolyLineROI
 
 		# pyside2 is normally skipped if not installed but these two
 		# fail if it is installed
 		# TODO: this could be due to USE flags, revisit when pyside2
 		# gains py3.9
-		--deselect
 		'examples/test_examples.py::testExamples[ DateAxisItem_QtDesigner.py - PySide2 ]'
-		--deselect
 		'examples/test_examples.py::testExamples[ designerExample.py - PySide2 ]'
 	)
 
 	distutils_install_for_testing
-	epytest "${deselect[@]}" \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+src_test() {
+	mkdir "${HOME}"/.pyqtgraph || die
+	mv "${WORKDIR}/test-data-${TEST_DATA_TAG}" \
+		"${HOME}"/.pyqtgraph/test-data || die
+	cd "${HOME}"/.pyqtgraph/test-data || die
+	# we need to fake a git repo
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	git init -q || die
+	git commit -q --allow-empty -m "dummy commit" || die
+	git tag "${TEST_DATA_TAG}" || die
+	cd - >/dev/null || die
+
+	distutils-r1_src_test
 }
 
 python_install_all() {
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.12.3.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.12.3.ebuild
new file mode 100644
index 000000000000..2d46c69243c3
--- /dev/null
+++ b/dev-python/pyqtgraph/pyqtgraph-0.12.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 multiprocessing
+
+TEST_DATA_TAG=test-data-8
+DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
+HOMEPAGE="https://www.pyqtgraph.org/ https://pypi.org/project/pyqtgraph/"
+SRC_URI="
+	https://github.com/pyqtgraph/pyqtgraph/archive/${P}.tar.gz
+	test? (
+		https://github.com/pyqtgraph/test-data/archive/${TEST_DATA_TAG}.tar.gz
+			-> ${PN}-${TEST_DATA_TAG}.tar.gz
+	)"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples opengl svg"
+REQUIRED_USE="test? ( opengl svg )"
+
+RDEPEND="
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
+BDEPEND="
+	test? (
+		dev-python/h5py[${PYTHON_USEDEP}]
+		dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_sphinx doc/source
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if ! use opengl; then
+		rm -r pyqtgraph/opengl || die
+	fi
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# apparently fragile
+		tests/test_reload.py::test_reload
+
+		# TODO
+		tests/graphicsItems/test_ROI.py::test_PolyLineROI
+
+		# pyside2 is normally skipped if not installed but these two
+		# fail if it is installed
+		# TODO: this could be due to USE flags, revisit when pyside2
+		# gains py3.9
+		'examples/test_examples.py::testExamples[ DateAxisItem_QtDesigner.py - PySide2 ]'
+		'examples/test_examples.py::testExamples[ designerExample.py - PySide2 ]'
+	)
+
+	distutils_install_for_testing
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+src_test() {
+	mkdir "${HOME}"/.pyqtgraph || die
+	mv "${WORKDIR}/test-data-${TEST_DATA_TAG}" \
+		"${HOME}"/.pyqtgraph/test-data || die
+	cd "${HOME}"/.pyqtgraph/test-data || die
+	# we need to fake a git repo
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	git init -q || die
+	git commit -q --allow-empty -m "dummy commit" || die
+	git tag "${TEST_DATA_TAG}" || die
+	cd - >/dev/null || die
+
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	use examples && DOCS+=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyrqlite/Manifest b/dev-python/pyrqlite/Manifest
index 104d6e8be96f..483fb6ae345f 100644
--- a/dev-python/pyrqlite/Manifest
+++ b/dev-python/pyrqlite/Manifest
@@ -1,3 +1,4 @@
+DIST pyrqlite-2.1-python3.10-test_support.patch 1017 BLAKE2B 50353be2d15d1a468328c3f7f40c4d8512975b0c8e8e458aac219b4d207cd8819bcd98417585b81322eb9c241adb1d389b7b161c775734db396bcd16dce2886a SHA512 b88a220af27fbedc259f10d6d8af436f2b6d5533f17550c8f90b3bd4a64c81319b4922d748d3b0baa9ae1e1bd1390349fd8b21fc1f8e48b707ee074f93b830f4
 DIST pyrqlite-2.1.tar.gz 19069 BLAKE2B f5ce9c1201632e81ba6f7f41e3ef54bd5fff354c869e73879e8b324ad12aea6476eb197119a22ba15d58c9ab3503435b0110ce9bfe2c21d16fe10b44afbe486a SHA512 6a63860378021b29ec0e8d81cf2c3534c97cec2c65d60e8ac2ec9b0a7900efb9a9a63546da44d8be89570eae2fd47eca4004167d11438b2dd9eb6bc68e646bad
-EBUILD pyrqlite-2.1.ebuild 617 BLAKE2B ba86110b3847c6897d49b1fdaa48d14d4d22ccb544d0a9e58f28de009bac0eff4f44a9068182bf42e6b1652e318894577bc0aab93f9cdbd9816611501ef11d83 SHA512 38c5a41d77d6c6842240540bd3000b77601e275999fe810ed51d8992438173a7d9d8b56dd7dc86c2fc15ee5271d5a784becbd6fdfbec023d24569976b456444c
+EBUILD pyrqlite-2.1.ebuild 727 BLAKE2B c9682020d102fc61b8948f7045a84882b203fca62779d2d12f4c4f2260265bc1a4d34ac57285f6cd8540e56c581563ca13f93d8c7c4ade51bd1923691d079924 SHA512 3568f753bc97d4fe44414d1a8cdbf57ee505f9a64e7802af84bd6c8edc855f6f2b9b141762426f05c486e92e96761a82a1f8098cbcbd65ecf547a1de0c5325f0
 MISC metadata.xml 307 BLAKE2B ecfc0d8bc8bba30ef1c7364632705614c62fa51b2158576ff344997163fd0509f396a518e22091006b9c08d90e7ddfd635290e81d171ab26295bcd42f6d50b5e SHA512 adc659745324a0b86427c72b8821969256198170fbd70fde0daf84e57645370e983b78724c840ffa3827f48d7e00cfcdfeabe1afd0924bd8847f9639e256ebe7
diff --git a/dev-python/pyrqlite/pyrqlite-2.1.ebuild b/dev-python/pyrqlite/pyrqlite-2.1.ebuild
index c1ae5f7ad52d..c3171044ea3d 100644
--- a/dev-python/pyrqlite/pyrqlite-2.1.ebuild
+++ b/dev-python/pyrqlite/pyrqlite-2.1.ebuild
@@ -2,21 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for rqlite"
 HOMEPAGE="https://github.com/rqlite/pyrqlite"
-SRC_URI="https://github.com/rqlite/pyrqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/rqlite/pyrqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/rqlite/pyrqlite/pull/36.patch -> ${P}-python3.10-test_support.patch"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+
 BDEPEND="test? ( dev-db/rqlite )"
 
+PATCHES=("${DISTDIR}/${P}-python3.10-test_support.patch")
+
 distutils_enable_tests pytest
 
 src_prepare() {
diff --git a/dev-python/pyscreenshot/Manifest b/dev-python/pyscreenshot/Manifest
index c86c67561321..515112a4d0a3 100644
--- a/dev-python/pyscreenshot/Manifest
+++ b/dev-python/pyscreenshot/Manifest
@@ -1,3 +1,3 @@
 DIST pyscreenshot-3.0.tar.gz 32865 BLAKE2B b39d338be4f1dc23fc30fe84a6f8ee6b6346761b023222438e8ff33e01beafc347d34118332efb053057c54383f5468e73049041889a6140a70c0f928c655661 SHA512 f8070941ade2bc710157238f47c9575df1504ef63152980b2bc0edd1f69c9ca4aeec3f738929de1c81a51fed79838053674626981ec61d95dafa7b9998004606
-EBUILD pyscreenshot-3.0.ebuild 973 BLAKE2B 9b8f73c1005679e5b0d46d16aca44ad497b3ef1f9657c708ecf23e27b9bdb6fae0d0b6e3f8f8f3a86b3827457858836b72f7d711d3623d9325ee6fe4f03e47d8 SHA512 bcc0fb1983b7567cbd9c0dd71c84ff4cba02c7399dbcbc004c222dbba6d703322efef9463d902a9d6136a3e855010cf5adbfb496059d272d61c010d15e39b202
+EBUILD pyscreenshot-3.0.ebuild 980 BLAKE2B 39ed92785b2e03db21bd52a81263f0c374503a0d688cc328a214e1493dc427b9c28a74068e675ad1f83de06fd8bf988eb42da7df65c78cd6168d61ff5ad8a104 SHA512 937d6c9e7e3482026bd0e709b28c0aac885755f9a2b8c7936cff511adbf90e66777c49136d0dbfa167b393a32bc361b7e349e3630f97323f46e7f6dbacd80322
 MISC metadata.xml 517 BLAKE2B d76772ddeef8328b34da232460ea50b4d5028c4bb4a10249bc505d41260e2d99ddf6cd75b4c3a757d3184cf95a283f69cbef7823715848119c118cc6dbcecbbd SHA512 55968d60cdb0a300a5a733a3d1e1ae1ccaa828691cadf2c36cd0e4e7c56c665f16e3ab82c3c22e7d39419ae2e1ef1d83e754567b576d160bba1384ae0e3c820e
diff --git a/dev-python/pyscreenshot/pyscreenshot-3.0.ebuild b/dev-python/pyscreenshot/pyscreenshot-3.0.ebuild
index 86364470ae3e..4c4a98f0a439 100644
--- a/dev-python/pyscreenshot/pyscreenshot-3.0.ebuild
+++ b/dev-python/pyscreenshot/pyscreenshot-3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ponty/pyscreenshot/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/easyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index 8095a07a1845..6cc8e7dd34e2 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,5 +1,3 @@
-DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
-EBUILD pyside2-5.15.1-r1.ebuild 8512 BLAKE2B 94d89cdaa2c7fe821c4dd5934025a234c0cc688851e5b1213eadeef13b8bee28f85847f6aef4d3546a33520f5563c43d6cfeea124be6c3bea20a6dada345141e SHA512 b688cb53c7539232886f5fa35e3c52ebd4c625480e8918aff8183d35d87323fb364119232f544f990576fcce7daa3dcb2945b01122254db7c1a87786c3a08740
 EBUILD pyside2-5.15.2-r1.ebuild 8511 BLAKE2B c7f4dc45cc9f5afd9e5ad774f1bbae88ab6132d435074ed5d0901f02c0b4b1fe15ec62014ccdfc56e2e14407309c8d282d48054fe899bf3b9d82f242a9bf85b2 SHA512 6cdd1b9a29f37502a23abbe5b27fea3a19509661b2af4fcdb3d49500efb765768000c7ed818d855f27fd130bc1b9a10e2ac37e96a4d43e77422721ca8aefa9df
 MISC metadata.xml 2101 BLAKE2B b18d57879c7f15ab78282788d1467eb0c29194e41ab5bd0578393f53d9f0739901286b3bf83e5d52570b753783cb9763636217cec71a5f355d3850b0c26f9b95 SHA512 72db4d6abbbdd35d4527d869d7eeda79290f8a7c105407741397d073a673e45fcd6950320ca5159fcfe696d87929a6ebc74891b3f85c05300a4e737d163b04c8
diff --git a/dev-python/pyside2/pyside2-5.15.1-r1.ebuild b/dev-python/pyside2/pyside2-5.15.1-r1.ebuild
deleted file mode 100644
index 3319d947f55f..000000000000
--- a/dev-python/pyside2/pyside2-5.15.1-r1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake python-r1 virtualx
-
-# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
-# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
-# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
-# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
-# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
-# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
-# that the "PySide2/QtGui/CMakeLists.txt" and
-# "PySide2/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
-# testing whether the "Qt5::Gui" list property defined by
-# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
-# time contains the substring "opengles2". Since cmake does not permit
-# properties to be overridden from the command line, these files must instead
-# be conditionally patched to avoid these tests. An issue should be filed with
-# upstream requesting a CLI-settable variable to control this.
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-
-# See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="
-	3d charts concurrent datavis designer gles2-only +gui help location
-	multimedia +network positioning printsupport qml quick script scripttools
-	scxml sensors speech sql svg test testlib webchannel webengine websockets
-	+widgets x11extras xml xmlpatterns
-"
-
-# Manually reextract these requirements on version bumps by running the
-# following one-liner from within "${S}":
-#     $ grep 'set\(.*_deps' PySide2/Qt*/CMakeLists.txt
-# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	3d? ( gui network )
-	charts? ( widgets )
-	datavis? ( gui )
-	designer? ( widgets xml )
-	gles2-only? ( gui )
-	help? ( widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	printsupport? ( widgets )
-	qml? ( gui network )
-	quick? ( qml )
-	scripttools? ( gui script widgets )
-	speech? ( multimedia )
-	sql? ( widgets )
-	svg? ( widgets )
-	testlib? ( widgets )
-	webengine? (
-		location quick
-		widgets? ( gui network printsupport webchannel )
-	)
-	websockets? ( network )
-	widgets? ( gui )
-	x11extras? ( gui )
-"
-
-#tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2):5"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/shiboken2-${PV}[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtopengl:5=
-	dev-qt/qtserialport:5=
-	3d? ( >=dev-qt/qt3d-${QT_PV}[qml?] )
-	charts? ( >=dev-qt/qtcharts-${QT_PV}[qml?] )
-	concurrent? ( >=dev-qt/qtconcurrent-${QT_PV} )
-	datavis? ( >=dev-qt/qtdatavis3d-${QT_PV}[qml?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[jpeg,gles2-only?] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[qml?,widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV}[qml?] )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	script? ( >=dev-qt/qtscript-${QT_PV} )
-	scxml? ( >=dev-qt/qtscxml-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV}[qml?] )
-	speech? ( >=dev-qt/qtspeech-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV}[qml?] )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV}[qml?] )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xml? ( >=dev-qt/qtxml-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV}[qml?] )
-"
-DEPEND="${RDEPEND}
-	test? ( x11-misc/xvfb-run )
-"
-
-S=${WORKDIR}/${MY_P}/sources/pyside2
-
-src_configure() {
-	# See COLLECT_MODULE_IF_FOUND macros in CMakeLists.txt
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DAnimation=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DCore=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DExtras=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DInput=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DLogic=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt53DRender=$(usex !3d)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Charts=$(usex !charts)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DataVisualization=$(usex !datavis)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Gui=$(usex !gui)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Location=$(usex !location)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=$(usex !positioning)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !qml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !quick)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !quick yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=$(usex !script)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=$(usex !scripttools)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=$(usex !sensors)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=$(usex !speech)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sql=$(usex !sql)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !testlib)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebChannel=$(usex !webchannel)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineCore=$(usex !webengine)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebSockets=$(usex !websockets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=$(usex !widgets)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=$(usex !x11extras)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Xml=$(usex !xml)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=$(usex !xmlpatterns)
-	)
-
-	pyside2_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
-			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
-		)
-		cmake_src_configure
-	}
-	python_foreach_impl pyside2_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE
-	python_foreach_impl virtx cmake_src_test
-}
-
-src_install() {
-	pyside2_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the shiboken2 pkgconfig dependency in the PySide2 pkgconfig
-		# file for the current Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		sed -i -e 's~^Requires: shiboken2$~&-'${EPYTHON}'~' \
-			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
-
-		# Uniquify the PySide2 pkgconfig file for the current Python target,
-		# preserving an unversioned "pyside2.pc" file arbitrarily associated
-		# with the last Python target. (See the previously linked issue.)
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl pyside2_install
-
-	# CMakeLists.txt installs a "PySide2Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., pyside2-tools) to target one
-	# "libpyside2-*.so" library linked to one Python interpreter. See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i -e 's~pyside2-python[[:digit:]]\+\.[[:digit:]]\+~pyside2${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)/cmake/PySide2-${PV}/PySide2Targets-gentoo.cmake" || die
-}
diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest
index 338260636d78..d0850e8856f6 100644
--- a/dev-python/pyspelling/Manifest
+++ b/dev-python/pyspelling/Manifest
@@ -1,5 +1,3 @@
-DIST pyspelling-2.7.2.tar.gz 150911 BLAKE2B 813eca2c4bdf377fd7babec376dd2991713db59c66b509c656cb24a314776c2cc360ec9ff884baec6607f27cae3169672746580d3c58abad35dbfe9f605fc51e SHA512 2937c1985ec6f27713275d9f31d3529e35f219df211be0ac9f1ae89d5c92a1e52c51b982291be7bd25375eb6404f52ac0ad893afbe73aada1fb03923dc09f721
 DIST pyspelling-2.7.3.tar.gz 151244 BLAKE2B bdfb40c6f39dc5adcc31691ef75b2582e78e8d0ed800ef0e263f8f98987ce3911650cb08085315c617c185e6ef183a11508fde4608349d0dad435b9f4fe1da98 SHA512 6903b620993933e80dfef320c0218c6372ee37f1db958b489d273aca24dd91bcc86fd12967848b8e31c2d7d458fb5fbfb521f41328c5955a1914f7d552ae7341
-EBUILD pyspelling-2.7.2.ebuild 1338 BLAKE2B e391f4fca032ef16798e460d4f79c8f3e4b617dfddff7c072af4be0bf0d28af031aa6ab5a293d3c97653e9b0dfd18e52d5dc6be2d8d6045021b4a427bb5ccc1e SHA512 932d21a498a92808df0c9fa19daabff8891dcb261b1c16d0b233ecaccac4c26b9fd526741f54b84be5c036dcf2481457170c34274373954803e34a66bd3986c3
-EBUILD pyspelling-2.7.3.ebuild 1313 BLAKE2B 894ed92c548de6a437af46a0f95b9dd49f33fef97b27d898fd91953bac0946ba875a6d64cebb2f563e21903673b0d68ef109888ef1d8e1cc2675114cc2b5cb88 SHA512 c8c687f259446847942d9211f5fc619b02ae4ed50409836fe5a9b2ce270a4a6df43bd2715993fed17fce3e0892a9dce2e62dd99c6c262b1df17e3fc6a73ada1d
+EBUILD pyspelling-2.7.3.ebuild 1311 BLAKE2B 03ae67c78a43d9ac3584cdf4f1ba0dd6134fb35629488eebfc945de9617a993d59156ac154bc040d4f6b8a3fc5b65d41ed96916f269dc3def5cbae832437c29a SHA512 c7a7233335fdd98f42c8fbc2f0a6e134c67fa141187aed4403e014f3f6230c75f52b0b766f8132569da3e8f856c7a0d120b5e907357aa11e1374fed3ee7560c1
 MISC metadata.xml 1923 BLAKE2B d82f0be825f6bd90b0a20c49de49490b8efbeeaf30a2715cfcec0412e7ca0b15fbfa830a11e83e22e691d14b48ae1c21cca046d6e44b3c025cd23cc71a5a39d4 SHA512 c4e89e70fc837a9feb201adbcbbc61320fde0ecccd5a44d4db4c244d879d1648c2a9f10928e94c32952c99237160e7cc36bc77de69bde2acd6a6fabb69f1f92b
diff --git a/dev-python/pyspelling/pyspelling-2.7.2.ebuild b/dev-python/pyspelling/pyspelling-2.7.2.ebuild
deleted file mode 100644
index ad241ebe9e03..000000000000
--- a/dev-python/pyspelling/pyspelling-2.7.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.1.3
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Spell checker automation tool"
-HOMEPAGE="https://github.com/facelessuser/pyspelling"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	|| ( app-text/aspell app-text/hunspell )
-
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/soupsieve-1.8[${PYTHON_USEDEP}]
-	>=dev-python/wcmatch-6.0.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? ( dev-vcs/git )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyspelling/pyspelling-2.7.3.ebuild b/dev-python/pyspelling/pyspelling-2.7.3.ebuild
index 409cf76eca5e..9a2227b6667c 100644
--- a/dev-python/pyspelling/pyspelling-2.7.3.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.7.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	|| ( app-text/aspell app-text/hunspell )
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index df2d81973a42..5611fa28362f 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -1,6 +1,3 @@
-AUX pysvn-1.9.13-respect-flags.patch 5843 BLAKE2B 0759be0ccdcdd96fb2d33591772ac399baf46b37186835ecc1f13cf51cbff85d552270afc30240299a1c27cca5df99e9d97a578b0b70c18f9227bec8fbfb245a SHA512 23c7f16f3e1fa9d1ae99360903736232d09ad66591e6c49ae342d33dbd0d27f5a85584d2a4652023425963480773a3b9c0d604905d91192f399c573b06f67fa0
-DIST pysvn-1.9.13.tar.gz 666722 BLAKE2B 4ada83f474026976309b8fc7876dd860fb68eb73dd0a4db0dd0c2838cc029976d5886462705c8b6aa85c5a6f8081f94df61bcbc1698879537fbeb3125154c1a0 SHA512 26ce9af363efb1aee25f8ed73e5bab56208523cb3e7cbe657a5f1145bc3500b2f370b4dfebf4eaace9f566f5676b053c41acb4d01458e4d6b79bd852ac260aa7
 DIST pysvn-1.9.15.tar.gz 667161 BLAKE2B 35e9e0967d5c0b4cebf546e40df17b66c66406d0f8100c32e6e840220f60b0083c0ed3f3af5f54e2264d06905ea90970d6b7cbfad2bab872a14d5d4aea5900df SHA512 0809507134fd31f6bcc90217e7840eb166e2eb2ed56316010a549dd70f6f855599f596942574343cdefd5997947b12c847df2cd145669f50aa93f603e46a5ee0
-EBUILD pysvn-1.9.13.ebuild 1747 BLAKE2B 0f4d909740999fabc7782f6c4f1cb302d28387c3d176ad9dfd7961935aeb374e5e445be4b5c9af80f2280d9409426ef4bd6430cb98a4171e3e0038b5d5d41a24 SHA512 c5239333af3d09c63c1156359fcb2d07c5820a73a61e0f41af087e0bb0772186daecffa5dfafb96dd441ec323d47c82b10839b59788bf2f4600522bce97e745a
 EBUILD pysvn-1.9.15.ebuild 1272 BLAKE2B 0102cbd80681f495c9ebce636dbb417a2655a3ea3bba6f34298d82a5fb8ca3e0ed15ecb9a6d51a10fb5dd1b89c00a57b35d7f3375d16bd84ea84fffc86398bcc SHA512 1e847b4f98454ab1fa96eda0719dc80d18064271a6c02914851d3fc5e646eeff53764153908673c955639cc6868da6aa1815db0c140280be7e2f182326c4b068
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-python/pysvn/files/pysvn-1.9.13-respect-flags.patch b/dev-python/pysvn/files/pysvn-1.9.13-respect-flags.patch
deleted file mode 100644
index 4070ba6487ad..000000000000
--- a/dev-python/pysvn/files/pysvn-1.9.13-respect-flags.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 9f1d90d7b6ece865af2a23fa412e205cedba4fd4 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 3 Jul 2021 11:48:09 +0200
-Subject: [PATCH] Respect CC, CXX, LDFLAGS
-
----
- Patches/test_proplist.mak |  4 ++--
- Source/setup_configure.py | 24 ++++++++++--------------
- 2 files changed, 12 insertions(+), 16 deletions(-)
-
-diff --git a/Patches/test_proplist.mak b/Patches/test_proplist.mak
-index 9d9a58a..02e7a68 100644
---- a/Patches/test_proplist.mak
-+++ b/Patches/test_proplist.mak
-@@ -2,7 +2,7 @@ CCCFLAGS=-fPIC -fexceptions -frtti -I$(SVN_INC) -I$(APR_INC)
- LDLIBS=-L$(SVN_LIB) -lsvn_client-1 -lapr-0
- 
- test_proplist: test_proplist.o
--	g++ -g -o test_proplist test_proplist.o $(LDLIBS)
-+	$(CXX) $(LDFLAGS) -o test_proplist test_proplist.o $(LDLIBS)
- 
- test_proplist.o: test_proplist.cpp
--	g++ -c -g $(CCCFLAGS) -o $@ $<
-+	$(CXX) -c $(LDFLAGS) $(CCCFLAGS) -o $@ $<
-diff --git a/Source/setup_configure.py b/Source/setup_configure.py
-index 72c2c8e..fbe6936 100644
---- a/Source/setup_configure.py
-+++ b/Source/setup_configure.py
-@@ -891,8 +891,8 @@ class CompilerGCC(Compiler):
-     def __init__( self, setup ):
-         Compiler.__init__( self, setup )
- 
--        self._addVar( 'CCC',            'g++' )
--        self._addVar( 'CC',             'gcc' )
-+        self._addVar( 'CCC',            '$(CXX)' )
-+        self._addVar( 'CC',             '$(CC)' )
- 
-     def getPythonExtensionFileExt( self ):
-         return '.so'
-@@ -1034,8 +1034,8 @@ class MacOsxCompilerGCC(CompilerGCC):
-         else:
-             arch_options = ''
- 
--        self._addVar( 'CCC',            'g++ %s -mmacosx-version-min=%s' % (arch_options, self.macosx_deployment_target) )
--        self._addVar( 'CC',             'gcc %s -mmacosx-version-min=%s' % (arch_options, self.macosx_deployment_target) )
-+        self._addVar( 'CCC',            '$(CXX) %s -mmacosx-version-min=%s' % (arch_options, self.macosx_deployment_target) )
-+        self._addVar( 'CC',             '$(CC) %s -mmacosx-version-min=%s' % (arch_options, self.macosx_deployment_target) )
- 
-         self._find_paths_pycxx_dir = [
-                         '../Import/pycxx-%d.%d.%d' % min_pycxx_version,
-@@ -1101,11 +1101,10 @@ class MacOsxCompilerGCC(CompilerGCC):
- 
-     def setupUtilities( self ):
-         self._addVar( 'CCCFLAGS',
--                                        '-g  '
-                                         '-Wall -fPIC -fexceptions -frtti '
-                                         '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
-                                         '-D%(DEBUG)s' )
--        self._addVar( 'LDEXE',          '%(CCC)s -g' )
-+        self._addVar( 'LDEXE',          '%(CCC)s $(LDFLAGS)' )
- 
-     def setupPySvn( self ):
-         # Support building in a virtualenv.
-@@ -1129,7 +1128,6 @@ class MacOsxCompilerGCC(CompilerGCC):
-         self._addVar( 'PYTHON_INC',         distutils.sysconfig.get_python_inc() )
- 
-         py_cflags_list = [
--                    '-g',
-                     '-Wall -fPIC',
-                     '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
-                     '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
-@@ -1159,7 +1157,7 @@ class MacOsxCompilerGCC(CompilerGCC):
- 
-         if self.options.hasOption( '--link-python-framework-via-dynamic-lookup' ):
-             # preferred link method on homebrew for pysvn
--            self._addVar( 'LDSHARED',   '%(CCC)s -bundle -g '
-+            self._addVar( 'LDSHARED',   '%(CCC)s -bundle $(LDFLAGS) '
-                                         '-framework System '
-                                         '-framework CoreFoundation '
-                                         '-framework Kerberos '
-@@ -1167,7 +1165,7 @@ class MacOsxCompilerGCC(CompilerGCC):
-                                         '-undefined dynamic_lookup '
-                                         '%(LDLIBS)s' )
-         else:
--            self._addVar( 'LDSHARED',   '%(CCC)s -bundle -g '
-+            self._addVar( 'LDSHARED',   '%(CCC)s -bundle $(LDFLAGS) '
-                                         '-framework System '
-                                         '%(PYTHON_FRAMEWORK)s '
-                                         '-framework CoreFoundation '
-@@ -1240,11 +1238,10 @@ class UnixCompilerGCC(CompilerGCC):
- 
-     def setupUtilities( self ):
-         self._addVar( 'CCCFLAGS',
--                                        '-g  '
-                                         '-Wall -fPIC -fexceptions -frtti '
-                                         '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
-                                         '-D%(DEBUG)s' )
--        self._addVar( 'LDEXE',          '%(CCC)s -g' )
-+        self._addVar( 'LDEXE',          '%(CCC)s $(LDFLAGS)' )
- 
-     def setupPySvn( self ):
-         self._pysvnModuleSetup()
-@@ -1272,8 +1269,7 @@ class UnixCompilerGCC(CompilerGCC):
-         py_cflags_list.extend( self._getDefines( '-D%s' ) )
- 
-         if self.options.hasOption( '--enable-debug' ):
--            print( 'Info: Debug enabled' )
--            py_cflags_list.append( '-g' )
-+            print( 'Info: --enable-debug ignored' )
- 
-         if self.options.hasOption( '--disable-deprecated-functions-warnings' ):
-             print( 'Info: Disable deprecated functions warnings' )
-@@ -1282,7 +1278,7 @@ class UnixCompilerGCC(CompilerGCC):
-         self._addVar( 'CCFLAGS',    ' '.join( py_cflags_list ) )
-         self._addVar( 'CCCFLAGS',   ' '.join( py_cflags_list+['-fexceptions -frtti'] ) )
-         self._addVar( 'LDLIBS',     ' '.join( self._getLdLibs() ) )
--        self._addVar( 'LDSHARED',   '%(CCC)s -shared -g' )
-+        self._addVar( 'LDSHARED',   '%(CCC)s -shared $(LDFLAGS)' )
- 
- #--------------------------------------------------------------------------------
- class LinuxCompilerGCC(UnixCompilerGCC):
--- 
-2.32.0
-
diff --git a/dev-python/pysvn/pysvn-1.9.13.ebuild b/dev-python/pysvn/pysvn-1.9.13.ebuild
deleted file mode 100644
index 062d488acd68..000000000000
--- a/dev-python/pysvn/pysvn-1.9.13.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_IN_SOURCE_BUILD=true
-DISTUTILS_USE_SETUPTOOLS=bdepend  # see setup.py
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Object-oriented python bindings for subversion"
-HOMEPAGE="https://pysvn.sourceforge.io/"
-SRC_URI="mirror://sourceforge/project/pysvn/pysvn/V${PV}/${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc examples"
-
-DEPEND="
-	>=dev-python/pycxx-7.0.2[${PYTHON_USEDEP}]
-	>=dev-vcs/subversion-1.9"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-respect-flags.patch )
-
-python_prepare_all() {
-	# Don't use internal copy of dev-python/pycxx.
-	rm -r Import || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	cd Source || die
-	# all config options from 1.7.6 are all already set
-	esetup.py configure
-
-	# Build system mis-assumes that we have a local SVN checkout
-	# that we can query using command "svnversion -c ..".
-	# Revision 2061 is release 1.9.13 according to
-	# https://sourceforge.net/p/pysvn/code/2061/
-	echo $'#! /bin/sh\necho 2061' > "${T}"/fake_svnversion.sh || die
-	chmod a+x "${T}"/fake_svnversion.sh || die
-}
-
-python_compile() {
-	cd Source || die
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		WC_SVNVERSION="${T}/fake_svnversion.sh"
-}
-
-python_test() {
-	cd Tests || die
-	emake
-}
-
-python_install() {
-	cd Source || die
-	python_domodule pysvn
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( Docs/. )
-	if use examples; then
-		docinto examples
-		dodoc -r Examples/Client/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 15ec0954d88f..a1da6adc9835 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,4 +1,6 @@
 AUX pytest-asyncio-0.15.1-310-test-warnings.patch 297 BLAKE2B c8144f2ac331d5bd0bd793a1f66b6dda89e2a8c5e027c92e73806d111d144c70fce4adb044a65f7f0ec8e540e673562f608111a21ddef691a7275fdde3bb0cf3 SHA512 aca66133f76031b7ac7e6daae427184cf6e480fc8b66324751eecfd968073d8e3302cdaa978293f9459d6233c6503483e699b98d0addc53b7c1c36dd31c2e7bb
 DIST pytest-asyncio-0.15.1.tar.gz 15653 BLAKE2B 8f10c46672a18d6992248482f9e3eb68ca9d3bae5163d5924e6363a15bc97dbfdc8b9dfc21a8a89ee4a6e21d76b083b1aa5a077fe581f0f2f0bd4c5a7b519cc9 SHA512 1813d49e0dd55f563d9bf058e009da61a17f61e081cc53626b5f1db623ba04905b6bea3ecba423dc931668053310176b634339d6526c7ea729d9aad87e4f044d
+DIST pytest-asyncio-0.16.0.tar.gz 15819 BLAKE2B c999b8680a45704bcb6f4690a910aa3d2edd9965e53cf4eb59dc8119696add4553d6b3e1b010c3cac52c8fd8563be8c86afe0616132a274e73df673630b032a7 SHA512 f0059a6d05bf0c4e208f0058e30d5baf8284e630b8b91fa217f52eec18abe6b057dabfdadce2c5282e02bd4ea4cdb27f9ef62c4c308375cce1795d75a036db22
 EBUILD pytest-asyncio-0.15.1.ebuild 772 BLAKE2B 7a74f9dfdc9fc582c7eb8283ee7af2c655021dce0886d3ee629fa4d024a998f575247f27657dab57f28730a45485f063d040165816887d463b956623518d6a92 SHA512 6c0b1ba3cf825df35dc89f391d942ea0bdf95719b8d9322dd670700b8009a4cdb39419b7d19d2e328970603ce358fe7fc2e56a02572d1f5af2811e4672569b8a
+EBUILD pytest-asyncio-0.16.0.ebuild 723 BLAKE2B 67b117d99f72235de2aa4bb110ab59de226c16ec02e00a9f457364ba04f5b482c9cef1dc245f75c5bc51abfb5332194ba4ae86e0613184ecb993af84ceb8dd18 SHA512 7b5d599ac9e98e2e8ce9cefa5a94a752dddaa462ffee6c54cb7f2c4c1f30185a0ea22612f5d6269f9050a93fdb00c338a79e06b67c68120d3b3b8cb472627bf1
 MISC metadata.xml 385 BLAKE2B 3d8faba48e1b3e531ea338f08f2de4b7bf637190e65fc61df2bd4d994cc97707016f83927f4a5181ac27d412a8c91255e90caba15f2d687f2339bc8ea61b18f2 SHA512 71178d3fba362e7532c87cb519f3661b25018771b86c302660de11f1bc7817b8352a2c8fcf60084a5e62b15148307a360267381ac38e8c856784034d80327d4d
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.16.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.16.0.ebuild
new file mode 100644
index 000000000000..c6de120f92c7
--- /dev/null
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.16.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for testing asyncio code with pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
+	https://pypi.org/project/pytest-asyncio/"
+SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-bdd/Manifest b/dev-python/pytest-bdd/Manifest
new file mode 100644
index 000000000000..8b9e387c8ca3
--- /dev/null
+++ b/dev-python/pytest-bdd/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-bdd-4.1.0.tar.gz 61079 BLAKE2B 3bf7863b7244e0fa02de48f3c8d113427c9a9d546d1a5d95dbc025bcdf0bd60931fac55d7328c96a3b29b8b15da833c85c089cee19ee4f8a2bc639dd1b3c4e59 SHA512 54ce5ae2f7b3deff7d436d42f80fc47892707eb1e6e76469dda9753ff0b2d727bb47b5be300eadccadd87838aee43130fec5dff6441353eb07c0787c84d55afa
+EBUILD pytest-bdd-4.1.0.ebuild 939 BLAKE2B f67df4703d0c974a691cf40b227022bcad97f011632c9fc47f8d2248c4780d09632779475cc6b965db403a4f7bb2ea38d7ea08c3fea348345b38e3e129b5d31b SHA512 e8192818e056a3e7f3d38780549ad62c6a68bddf349421b36f5be726f890b5397c81e869034bac6a61e1212951cbc5d6dac9b33f359149900416e98477938bd0
+MISC metadata.xml 404 BLAKE2B b5bdea28ab998a54bd0b76e38c37a77af74d4ae149bfc5af47e7466b7c13ae6a5784be0ecc3e6cd8ccbbd5164dea02d704f596b7e00d22b0d640c4ad3dd13b41 SHA512 97800a5877bd8f3aa880a0cdff19cc89de983ec1a0cd9fbe2c74178b6fc214a0ca7fbb013b2ac490e1c4109f03ded7055e1517a3b57f6da0d79c9f5ea5864e77
diff --git a/dev-python/pytest-bdd/metadata.xml b/dev-python/pytest-bdd/metadata.xml
new file mode 100644
index 000000000000..e5bcfe846403
--- /dev/null
+++ b/dev-python/pytest-bdd/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">pytest-dev/pytest-bdd</remote-id>
+		<remote-id type="pypi">pytest-bdd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-bdd/pytest-bdd-4.1.0.ebuild b/dev-python/pytest-bdd/pytest-bdd-4.1.0.ebuild
new file mode 100644
index 000000000000..dd0a77e782fc
--- /dev/null
+++ b/dev-python/pytest-bdd/pytest-bdd-4.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="BDD library for the pytest runner"
+HOMEPAGE="https://pypi.org/project/pytest-bdd/"
+SRC_URI="https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/glob2[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/parse[${PYTHON_USEDEP}]
+	dev-python/parse_type[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
+
+distutils_enable_tests --install pytest
+
+DOCS=( AUTHORS.rst CHANGES.rst README.rst )
+
+EPYTEST_DESELECT=(
+	# result varies depending on current output terminal width
+	tests/feature/test_gherkin_terminal_reporter.py::test_verbose_mode_should_preserve_displaying_regular_tests_as_usual
+)
diff --git a/dev-python/pytest-check/Manifest b/dev-python/pytest-check/Manifest
index 38e3dc58f8b7..63a0c661854a 100644
--- a/dev-python/pytest-check/Manifest
+++ b/dev-python/pytest-check/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-check-1.0.4.gh.tar.gz 7738 BLAKE2B 179575dfd4f9e50715fd5a664039fe882b0e14c9369afb6f7aca65e9ab276147b2a0b7fe580d2a249721152d891c12cedfa06ae7e26027c6b7d3b34da17d4a53 SHA512 ca71295fc5a831df295c8ce40c6a57cde9a1b98ca25354a3954fc44c9094096ea0c9c6a49139659d4c9aa4e3d3d81d80893edb657bfd3f4d988c75864e843447
-EBUILD pytest-check-1.0.4.ebuild 708 BLAKE2B 1e68b9f74aaa64e7a281bb304036117cf99ac9c8ae0f42bc13a79af810b3b8034fe1fafe62e6561ddd929b2e1d2e345ecd47229165f3474207e49859c3863be0 SHA512 4dcc656f1620d44973c0016354aed1bbf677c40770840141af6f974510a34f6bae84f758aced5d4782e982872195210152503cccebf7d3fdcd4815239e8f24bd
+EBUILD pytest-check-1.0.4.ebuild 732 BLAKE2B f3f647d1199adbc3514764afc1fd7b62b984368c039a210fa134643fccfb996c9135297067a2135066f631ebdc03ba1a37f9a4d0f25223a65ad1f372f832cadf SHA512 c69f483a84c763ae5f40d90b1644991aa3441895f8cfd672b0d10535ea4a6cd8eeccf4bbf06db9ad91518934b547fc15452017e4125e61b271dc900f28aaef92
 MISC metadata.xml 408 BLAKE2B 3f2a2f62298e5b17ecbb0c11d87eed1d6b841cbc832438951ebc6a1f7b4c530be4744bd655752b5b659aa271094949075032b239d47b459cc68753a2a94e22d9 SHA512 8404e883e6d145b26cba45c3344a41f7622fe6cbe77a2b36f4c8c08fad8d71c30e09b93067977f01324759214b7943e903ad9d4ca1b27ba9c6335993d5bf51d8
diff --git a/dev-python/pytest-check/pytest-check-1.0.4.ebuild b/dev-python/pytest-check/pytest-check-1.0.4.ebuild
index a1cf5186cc03..3488974459be 100644
--- a/dev-python/pytest-check/pytest-check-1.0.4.ebuild
+++ b/dev-python/pytest-check/pytest-check-1.0.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=">=dev-python/pytest-6[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/flit_core[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-flakes/Manifest b/dev-python/pytest-flakes/Manifest
index b8a7c654de3a..45be87cbdd8d 100644
--- a/dev-python/pytest-flakes/Manifest
+++ b/dev-python/pytest-flakes/Manifest
@@ -1,6 +1,4 @@
 AUX pytest-flakes-4.0.3-fix-py3.10.patch 573 BLAKE2B e956207230016083962085749a698d10d5ae7435daf49472b9543c09cf4c7430ea49715432c396675b9f86c65b5ac429abb8dee2df4ab16b6d13c103bfedf7ea SHA512 fdfab1fb712b8b880ea6e0aa32d82dd247dd78381d5ac11031fe06218835f9cded48d08d675f69a834273e84aa7ab3e2bb36c697f79a39d086cb6d1a9e629c4a
-DIST pytest-flakes-4.0.2.tar.gz 7225 BLAKE2B 3a5ec59e3df90b6bf90daf5cf4abdf2946852a8e62a98ed08e5ba93c2e3f9e93699b2a4b571df45edac83e4c1791a5828b0bcca2a26a37b71f01d81bf3f0342f SHA512 bb1fc432e2494367849acedecba80495ede34c18dcf3ada09ef3dec8567d55f8dd6ba427bc3d9e47cfe3c0bb2aba80576612282d5a71858ccb45bce458f8656c
 DIST pytest-flakes-4.0.3.tar.gz 7312 BLAKE2B cf62d7e11a0521592325492c76e67cd51384b31d8a6191f10940230014c9a8797b3603e24664c022add5cec18ff7c3b558cd7507af47e8c90a9e90499f39e583 SHA512 ca63d68063cf48789d86dee3707b3ea7c5076fc1f636e17f408ad6f444303fb3a701af8d1e464d49af745e350272bffe8596853a52c01baa0bdb0b6b0c0bb303
-EBUILD pytest-flakes-4.0.2-r1.ebuild 504 BLAKE2B 0f13610f981bb55bbf3bf835cc0a8e5cc10736b6db315b816285d177b8fb74daf28e9eefd10275ab22d0d8f005c7beadd5cfa68ba662e799f4fc6f73a7d0a1df SHA512 f0d6a0861840cc0a53c4f2b672ea05aa2b87d0c7563e100cd913d24c97ae0f0edda4afa0f9ecdf5b8f1c00530f0ed281847079fbc14a44fc4b8bf6773f32693b
 EBUILD pytest-flakes-4.0.3.ebuild 555 BLAKE2B 28f67239209928440a341b8d1171bccb85b60c47b46119af7f1320810598575b597ef85d6376a2f5c00d761178996d0d7dccab2848ee1ad567813d1bb5389069 SHA512 17decf5f132434923a17534af13c7597dcb6ee2e13803d8d916cf17c7ded539581c2f5a59a69ea9b2a7796899d7199067186d0aadbef6414bfea52d74193ef41
 MISC metadata.xml 330 BLAKE2B 27326dd6d6687ac291c21cabc5599cc765cd3e42fe3394497b0888c49ccc56cb92f82136f76655ac89e9aef270b9810e0afd5357f306cdc9e217a160f7affa7d SHA512 6728a8a8ae3432c021a9f599aa97a8a4d1ce3ab4aa035b179386f29e80dc98aa6345d3ee2e230bc437a2496feb8823868094c6b1b0444294023af244c35dd6b0
diff --git a/dev-python/pytest-flakes/pytest-flakes-4.0.2-r1.ebuild b/dev-python/pytest-flakes/pytest-flakes-4.0.2-r1.ebuild
deleted file mode 100644
index de3e22f95c44..000000000000
--- a/dev-python/pytest-flakes/pytest-flakes-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,21 +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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="https://pypi.org/project/pytest-flakes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-html/Manifest b/dev-python/pytest-html/Manifest
index 8ed0ac89b21e..332574360184 100644
--- a/dev-python/pytest-html/Manifest
+++ b/dev-python/pytest-html/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-html-1.22.1.tar.gz 28183 BLAKE2B bf6d2aecda8fd3117a7b58307f1246e2d6f31f8939812c402d541c13dc329d7e7a0ab1f72ea70583d39614599d70dd0f4ffcc00b0d481ae4bbfce968f016adb3 SHA512 8adf1b1a27ea9f635226acdcd9d429bf78dc57ef9a67cf6616868c60b921c0cef117a63f4ef4c258350900759b607baa71d2a6b73cc8f9f718b405a7fba0d5e4
 DIST pytest-html-3.1.1.tar.gz 38548 BLAKE2B d2491280ceb4524a10a46891448bb63fe997a4be82062e727fb1d79ef6154a0b4229bbec27c6601372776f7c8dd124aab5d4968482fc24ad24330db5d2520187 SHA512 78091b485d153b54cd76abb8cfeb6494830b1b51a10dc0c00c73eccf67962d2805e3f83972c7ccfd1f877a939b582f80d5ddd5273fd1ddcac2a1a9c2eb121300
-EBUILD pytest-html-1.22.1.ebuild 766 BLAKE2B 0fc51c4a08707ac42a044419a616facf129da938ffbe5878e2bda023b84f336a49ddd807001a230f081b58626c91554445ce24a3cd18e223f7c4edcef8da5055 SHA512 7e7324e09222c1a8b85336093dd0be956180112398e1a990a9e70b08e1742a3f9505fa1a5d74e0c8029ddd7312b3c2e4f2be9ed4b7f338c3d98251846c39a6f3
 EBUILD pytest-html-3.1.1.ebuild 766 BLAKE2B aa4daa33743fb37f34c08a1ba0d168941f11867710768d37e4c7b4fbb32c30ba8e29253662c6aa0a8898476c64e94df9dfbf6ee750f2454fac5be211b3a3f9b3 SHA512 e8bf10971acbe3f24fe63eb678ff79d12a1bf2e1fed01aec3fa9fe58695940164c48c7d53699f7bd2c4e6517263e9b09d6da48b7fd1544ced9353a2aee4bd7f3
 MISC metadata.xml 355 BLAKE2B 5446d5fe85ef69fa4a60a8fb32cfa805d61cd958cf2676c1c6727ce229aac8b115eb4a98d6865e8a4e7474517471b2dfbb28e72dee75796d5b119c98cd7e163b SHA512 ef1ac38e97a25941605ef44f6d872d30a8bcebf2997cd732b5dee2aef948be2346eaa9ae360953ce02c7b1223b454470c1d4328f24b0fa8c6a3d61bd0af8590a
diff --git a/dev-python/pytest-html/pytest-html-1.22.1.ebuild b/dev-python/pytest-html/pytest-html-1.22.1.ebuild
deleted file mode 100644
index 46e90071e9a8..000000000000
--- a/dev-python/pytest-html/pytest-html-1.22.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Plugin for generating HTML reports for py.test results"
-HOMEPAGE="https://github.com/pytest-dev/pytest-html/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Lots of test failures...
-RESTRICT="test"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pytest-metadata[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-python_test() {
-	PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH} \
-		py.test -v -r a testing/test_pytest_html.py || die
-}
diff --git a/dev-python/pytest-metadata/Manifest b/dev-python/pytest-metadata/Manifest
index 195bc2bdaf67..24c5d8db413e 100644
--- a/dev-python/pytest-metadata/Manifest
+++ b/dev-python/pytest-metadata/Manifest
@@ -1,5 +1,3 @@
 DIST pytest-metadata-1.11.0.tar.gz 14135 BLAKE2B 1de1c47b1d7775040075de479722fd07cb187f14cd37c5fe73458fb54ce01653295288fd11add8066170b8dc39f80c8749e739deb01ac8d579ef5e6f4339478d SHA512 09867df6158ba66f55a0a812b3731b4372f874b6bdc91301ed0c4d4c38f6fe9a4f936006d4e27f8c68d4a2d6b0fe5fedee3c6269bc6867eb1c7d73a42bda0361
-DIST pytest-metadata-1.8.0.tar.gz 9227 BLAKE2B ccc8d1ffa1f10540bb312bdc3a2e0342829935a108adaafd562efd75497768653a5eb452393b56eb97c624f4622a0b6ef5cbf860057d28ae340c28aeb5d7de2d SHA512 04871fe0c4c30bc23eba80a58919841cf45045b91d501e67630426cbac88a16005657eaccb1d2587263d4fcd940d37382f3a5649f142b1aab327f1f1c5d61963
 EBUILD pytest-metadata-1.11.0.ebuild 548 BLAKE2B 2565f81c140adb4a9e66c369115800afcb4812e017557b6bcba37790e6951d35c0a5928c6854ed679c5811158066a4d763cff8a477589a308d1a590180f2674e SHA512 0ba35808b470c5adcb6a76eaa5f7381ba97d6eb2328f122bf41ee5a08b9a6b66596190fdcc622be2e777b3f513f338d0adeaff3ee44e9c73383bf764d6ac3fcc
-EBUILD pytest-metadata-1.8.0.ebuild 554 BLAKE2B a1c2bf62a9b6da202abe88fd0f0dac27ed310aa5d4f91c80f7a1cb35fffbdbd2e7759ee441e3084ca3ed03593af874c504c6b439bc60e280623ef9e48b8885d7 SHA512 cc6dd4f0ff2cb6ac2d0a8f951d89e21803ce0e6d6f5f936f459c741d273f96091eb2e1c1f2fb1743cc28398379374101eaf48a2d001c9c412e4573f2fce11cdc
 MISC metadata.xml 385 BLAKE2B a888886c89fe52cd8e209fc9638fc3cdbf9b7dde0114c46d57b4f9b91f1ef49ebdb3f967e913036109054547d3840c8bd5ca24e5b80ac541889c48ef63748233 SHA512 20094512c77c3ea6f5501aaff0fc9b6ef07aa0580c555e3da5d6ad25e1ecf2f9f42443b7a43256f3fb99aab029a83a2d2696e9a0c8b2ce81e95ef15ab0c33b23
diff --git a/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
deleted file mode 100644
index 6adcd9c3bbed..000000000000
--- a/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A plugin for pytest that provides access to test session metadata"
-HOMEPAGE="https://github.com/pytest-dev/pytest-metadata/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/pytest-3.0[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-pylint/Manifest b/dev-python/pytest-pylint/Manifest
index 11c10a4cc414..dccf21883796 100644
--- a/dev-python/pytest-pylint/Manifest
+++ b/dev-python/pytest-pylint/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-pylint-0.17.0.tar.gz 11660 BLAKE2B b536dcaaf0ac652dcbe66018fa22e120782496de58f74003c523eb003ff0556f9b738e528a85724a1e589e18bb0024d99fbeb581b7f5b36ec349ad07da8d26d0 SHA512 a23937ec191ef14829530ac6bf31b882bc250f312e2ba6e3b8cc1187c888511e4b67ffaf5bce176556a621fbf80239b30c43c635898d458bb8d819e92a9f8142
 DIST pytest-pylint-0.18.0.tar.gz 12448 BLAKE2B 9d0cecb08fc87d7e2aade47af3f2677431776a425726c281e9abc5fdeebb84f38ab4a97e405ed407b1cd241eb97a8cd90e878af61f818b46cab5f9fba5ca3d5f SHA512 a0716104d288774d4c3ab596f30a33cf439df5031647912574c31eefc3a84e69e82fc362f77e73b437c7566a596d2ff8bf51a332626a7fa7468cea3b916e9ad9
-EBUILD pytest-pylint-0.17.0.ebuild 1118 BLAKE2B 2afc692f96d558d956eee04d70b2a516babfff606a858117efeb3f5efd0631823f3a99706dd10441d682101ff994f732f8dee84a2367390245f28cc85bd25086 SHA512 9047a6777d0ea48b040b4249531b2e5254dd535202a3bba2745614286f4d2d628e9a99aaf950515374cb2d4dfee17595a3b61c0da109e63479b4fb580fbb5626
 EBUILD pytest-pylint-0.18.0.ebuild 828 BLAKE2B a21b8e989827bbe4447a82c70e956cd19860b44f5e14329812d801a40fd1626fa7a530c21bb5132b1e0ef355713fa8cfd5999b4c02170850f736440b8a369387 SHA512 f2a4961a484bcedbdd5794c46bdd78185f1872d5686a9c6cdea9d5fd6296bfa4608178aaf781af014a9fbf76c6da704762989aa7c71a3ccc90131e5e78aedf4b
 MISC metadata.xml 475 BLAKE2B de0705d225f09df06d9a42516c17f4f4bfdaef5900f905a8631f6abbbc8f97d4745b2a6bce73763a827ca87ac7d5ed03e334546daa613a30b8749dd4de76009d SHA512 7b6e5a04ff56019fd87cfeb3a24c5f2a0d660d635c0163a4cdf8febee6279149417a624332c081008b923474b16ac0a4f41f31a8060e7170e9a38c21f247f142
diff --git a/dev-python/pytest-pylint/pytest-pylint-0.17.0.ebuild b/dev-python/pytest-pylint/pytest-pylint-0.17.0.ebuild
deleted file mode 100644
index d08f66d86c87..000000000000
--- a/dev-python/pytest-pylint/pytest-pylint-0.17.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin to check source code with pylint"
-HOMEPAGE="https://github.com/carsongee/pytest-pylint"
-# Tests should be included in PyPI tarballs by the next release:
-# https://github.com/carsongee/pytest-pylint/commit/4e7f06701ca06697a22a029db9857fa2fdf7c033
-SRC_URI="https://github.com/carsongee/pytest-pylint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pylint-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Disable flake8 and pep8 options
-	sed -i -e '/^addopts =/d' tox.ini || die
-	# Remove pytest-runner requirement
-	sed -i -e "s/'pytest-runner'//" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Required to load the pytest-pylint plugin
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index 3e31a547826f..2e87a2d082b3 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -3,5 +3,5 @@ AUX pytest-qt-3.3.0-skip-show-window-test.patch 1318 BLAKE2B 7e1c628c13f02d6219d
 DIST pytest-qt-3.3.0.tar.gz 113439 BLAKE2B 1eb486d2d44825058577306ed3b9ade34e6cbad0d90038fe314114bb22c82ae069c9fe66c170591de6c97bad99f5f9e0021c8b3dc38c858b8293a22c448bed74 SHA512 8b3ce7b62621c55fb319966b162cb60663c5ef290f34e62e6a9329e67f530c2bde1329ae0b045b15c99ae14f5f6a5fef9ee930475fa700922c50ee725adf7983
 DIST pytest-qt-4.0.2.tar.gz 113466 BLAKE2B 73ba6571958f3f4cd76c3e891eaa014d464b94a7965afac6cee5b43bafdc63d4d640f84c7bfa1666146ab5139f79c760bd9f5a2a44f788b6384df200ac48ad0d SHA512 7f59c499e1395460c2ff20a969cec16ca104f742c648faa0d7eb1528c04d8ee52c04c52798478bc01c5467bee33d3389b141424491ba5442f9df4e82f0dff173
 EBUILD pytest-qt-3.3.0.ebuild 1661 BLAKE2B 8af76902d54c81283ed1627278746fd874a0bf91eede889ec3de5a0be397e8b9cc5633abd67466e6bc9508bd56c84da0b5c069d3dc9bf339dc11b7cecb51ee37 SHA512 f39627d2dd504df4601390d1a310302d3e132db8d27a8e1d801560c921a87754691798bdbe60cc7b9337417cef993229f2c7673f9c91da8f9ffd4eac8aa9540f
-EBUILD pytest-qt-4.0.2.ebuild 1615 BLAKE2B e3be1b939455910f79f6077eed1057a3974b8ab28da64a5c3909dc977e5bee17589fb8a00882df7fdb566b0684800afa36c243bfd237f777d3279739ba9aee0b SHA512 af3e1665de75692a2d2671d42d3472580730a86348039a56f7f2901c862cfb5cf1779e58cea34b01ecc333028734c179a0062230d0c44a4fcf7eb59b923778c5
+EBUILD pytest-qt-4.0.2.ebuild 1622 BLAKE2B 52321c17d49d841030a2d4a30d5c9abcab1342e1c5b472f58608be477eef37b465cf628932c2f08ce7311f7064ecf1101e355a3c07969bc4eebf4f1763ff3453 SHA512 45dc99e261ad00befc6ba38a69f23c2fd35997ffc87784ec482578699e334b07744a8c32b2b9f17a15cdc1844baf5e09eea61a4e81b3751b01ea1790fd39a77f
 MISC metadata.xml 415 BLAKE2B cdd4a6d1caeeb482ab19ea6c7442dfc7fe67c3f48504c9daf90df45ebc9e8b5d3d940e510a337545e8746b849995b126f274cf7245b708971c0225dd2947e753 SHA512 2677bd9a735a1a07a30ec8cfc2072e90a94ec144c1f1c95748f8fa8f2aeecd1c5a639048ecea10740911ab14406944e2245a8a6f2f5027999d03b43b6d4c8692
diff --git a/dev-python/pytest-qt/pytest-qt-4.0.2.ebuild b/dev-python/pytest-qt/pytest-qt-4.0.2.ebuild
index 900afcbe9854..f2e45a6dfdb4 100644
--- a/dev-python/pytest-qt/pytest-qt-4.0.2.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-4.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="dev-python/QtPy[gui,testlib,widgets(+),${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pytest-subtesthack/Manifest b/dev-python/pytest-subtesthack/Manifest
index 2b975e5b19fc..51a2e628db2e 100644
--- a/dev-python/pytest-subtesthack/Manifest
+++ b/dev-python/pytest-subtesthack/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-subtesthack-0.1.2.tar.gz 2669 BLAKE2B f1f5a052f9418732de4a97ff438d280d177860439e667e29ff0d0503740e009c88046b5ba859884e5fa9e958ea1be7388d7fc6838c19e44075ab0ef757ee41c7 SHA512 ddb7b0c27f912bec31e58ddc54930e229755df8980d146c861f7f1c766ae742b4f1552117d89638bdbd443f22890262320a56565954ebc6deeae6184f459a5a8
 EBUILD pytest-subtesthack-0.1.2-r1.ebuild 650 BLAKE2B 0e17dac60f907c0508d5ba779180b948fb0dca1ef81a9111335b712291ae9e9ab06a7910066f3065afe9eb67216e8f6999817c5f4d9919b1b3e3ce8a1bebe556 SHA512 ce816758341d5e6e203a3843a2672f35ebef923ab85598fa2f277918726d6a17534e5e5b6ae62f23b4d41ea6ab55a06c22d1f114da0ea2fb5ae02979e5012e86
-EBUILD pytest-subtesthack-0.1.2.ebuild 650 BLAKE2B ccaf07bf6317a08febee92a9097a1aee13114846b207580727d384da63440f7c733b37db0ca3d2c297063d9847dc4c24db378384b698714ce40fca681b753b60 SHA512 4d133b464c064a03df1294333e5cb3b1642b3a34e34381218b6e7c076dd5fc411654deb7037c2692f166e449338b68790167341e50314343a14f8bce0a279a10
 MISC metadata.xml 414 BLAKE2B 75bea5f93518f1e9b08ed1ad9f772c670bcf565f28b4a67c511fe919513741257fc5917f180ef31ed3e6d43b7986e8e1357ec456f9ddae4603baee1801dd6cc7 SHA512 5b4440d54b4ceb803ba5d9e4ea97fa38b777dbd1af02275f59011f727d9cb166427e8ed63b164b1891f6313349d49d31f4d7762e679439945a6ed4c24add6f46
diff --git a/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2.ebuild b/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2.ebuild
deleted file mode 100644
index 9738c6bb61a2..000000000000
--- a/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A hack for test fixtures, needed for hypothesis inside py.test"
-HOMEPAGE="https://github.com/untitaker/pytest-subtesthack/"
-# pypi tarball misses tests
-SRC_URI="https://github.com/untitaker/pytest-subtesthack/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-testinfra/Manifest b/dev-python/pytest-testinfra/Manifest
index f1150747c62b..aabdc6f91dae 100644
--- a/dev-python/pytest-testinfra/Manifest
+++ b/dev-python/pytest-testinfra/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-testinfra-6.3.0.tar.gz 76309 BLAKE2B 95b4a6ac5ea3c3db2afdd537209bfeb2c188ec7c7935b73e831733fbbf2540b8769d1187338b3b9c9da997cd653e800004e7199537d95530967cd73a15cb2c2e SHA512 ff0add6bdadac92f6f997a94734d69d39598bc8d1f7689a6b269e59bc886825fcf8a42968c2d34a9ad7e77ed0112bf4044afede8e0dca2bbddc76c9c5612ae92
 DIST pytest-testinfra-6.4.0.tar.gz 77516 BLAKE2B 2baf5940e8736cbe78d8017a82b3a8fdb6df95b89acccd49ecd354447b7ea88079f48211e0acea46a0d8702b67609fe6f85f730c66e781a99d8a92b52b3c99b9 SHA512 acd2c7f9daeb391815a32c972a3542c0d643a716f3cffcb66f4203435ebac789333edb91c83d2778ae8da93b676b245fd47821bca9218faa3e7b50e6764087f4
-EBUILD pytest-testinfra-6.3.0.ebuild 894 BLAKE2B 3a4b17c1d33bd23982f78a4797c21e23aa2b54d33f9feba4a19a071954cc69a3143a544b60aa07c46c7a08aa2529cbabf6ef19f083357ab28928a18623ad9a4b SHA512 d58c5fd2fef7b6dea76b52c807c370bf64abdaccef78b6bc401d567d8c257f3f49f06f3d3f79dc89d47031f9da0fd879b5e97070449a2bfe9cb2675cb17b5528
 EBUILD pytest-testinfra-6.4.0.ebuild 894 BLAKE2B 1027b8c0a4d13d2db3612bd989f32414316fef63fb7a265682ae8dc5b992f886e6c2592f2645789abdf70bad3a4a12742c584645bbce974fe513b680cc5890cc SHA512 2b957be685f8e7961aa05093dfaa14783e79107becf42c6668a7b3c0d75b660bff45c05ac9f7f9c50e4c2cf068cefb8d3e4d6f78477ac5f9553ae8478c0438e0
 MISC metadata.xml 680 BLAKE2B feb779de8bbaf041a3aa00046c4b17fcad0e863ebd365732c9f1e0bbdf6c68edf7ec2b7d546c2bdf458c134f7cb17a65ba07fe6edb5af7675d4bb79af75a23a6 SHA512 386a4877ca43ef6a1408ecc0871ba40c40b4654ee3824b4a99f5ff6f4769284d54c9377cebcd5456815fc5470110a337d83f8016a6598cef8ce29d93cd3645fc
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-6.3.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-6.3.0.ebuild
deleted file mode 100644
index 3f037acb055c..000000000000
--- a/dev-python/pytest-testinfra/pytest-testinfra-6.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Write unit tests in Python to test actual state of your servers"
-HOMEPAGE="https://github.com/pytest-dev/pytest-testinfra"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-# Ansible is called via its CLI
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		app-admin/ansible
-		app-admin/salt[${PYTHON_USEDEP}]
-		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-python/pywinrm[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	elog "For the list of available connection back-ends and their dependencies,"
-	elog "please consult https://testinfra.readthedocs.io/en/latest/backends.html"
-}
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index f352b84080c0..626d27923c72 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,4 +1,6 @@
 AUX pytest-timeout-1.4.2-optional-cov.patch 839 BLAKE2B adc39941d090788666a5fa74d602fc7c2d7252622d5d213f8308728df7f198faf82edd9d56b3bb3cc277e62608cc6f59909ddce881e1a5931dde1f21f3671d32 SHA512 adb234da8272cf1b61d80db6d9c2b99cb0297044a962f3f54c7d9991ec8a142e6df3eb95fb29ee56326b3bd89e8af6d754f3c92f21a9fce934cd5d0af7fe4d05
 DIST pytest-timeout-1.4.2.tar.gz 15424 BLAKE2B b7ab91833e59af56ae50c066c14bb9b8ae9995d1586f35b29f107665d7da124828d7accc1b0149702f2973c61f18024739c68de736ae8aae6f55e8a10bf5d4ff SHA512 3446ecdb5aaad5fbca12df4e7f4f40c6c1a12895d3ed9f3a3ee24800ce36deed3cb8c09a4cc72220c962b06f821cfd55bf7eebbca23664c56abf2d0e5bc8fbea
+DIST pytest-timeout-2.0.0.tar.gz 16210 BLAKE2B 8e3c0436147b6cc680540329daabd7269d301c95663599f7e9c64313bc3a45fde5cc5ea297d5b8c85f43d1a80c2db44b8e150877c3c7b29eef5e38426dfd4efc SHA512 96e9b545b4ac1e4a615863f69d190e0265e85f23dc12df51e9035b8e6bceff23279bb042eed83aa0ddd6d06b0e02a2dcc29ee352fd44cc86f0682fb328264645
 EBUILD pytest-timeout-1.4.2-r1.ebuild 845 BLAKE2B 4012f45527042dfe78e888647feda657e447176b638049c73a557b30208a3204057fe5a21813ee2648b5a3833dc9634f6c51cbb1f414c80cb6b912a1ef1e474d SHA512 a0f3e201c15cb22929223e63ce6cdd56fdc31229bce3292b5713fc3a45ce541816ef5f3125405e2823f08eb3116223d95aefe342542d466affd915130ac110cf
+EBUILD pytest-timeout-2.0.0.ebuild 741 BLAKE2B 6de6780693c9093002057a80b2115d666c3d0f8d4d3f7490555f94fbbc780cd12ef23628b21162e3b8e41f99ac5762e5756c4b64d2dfeb8e5a1ca1c75e5a29f1 SHA512 70e729b6a241a24defbc03b78fee26a832b740e47424d4de86a3f2134b2eb155285355e9382bbd516b5fd865544294ea648e63f77ed4e70e75a4ab188b0aecca
 MISC metadata.xml 353 BLAKE2B 4865119ec7c91f6d9ac1ab4ce5b1cb73b784f29f7efd669c629062cca2d433eaabb51af1d0ddb3275d414a99413eb8aa76c8639d484c7846ea33c4f53a013bad SHA512 764118890125a80df18e5d9a1bbf6bb35261c0cbcc04e6c9c67ee7b307cdbc31979b831910022a1caef97deee6830d7236f258f524a95a9494229dcd4a14c8ad
diff --git a/dev-python/pytest-timeout/pytest-timeout-2.0.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-2.0.0.ebuild
new file mode 100644
index 000000000000..5be23064f839
--- /dev/null
+++ b/dev-python/pytest-timeout/pytest-timeout-2.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin to abort hanging tests"
+HOMEPAGE="https://pypi.org/project/pytest-timeout/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# do not rdepend on pytest, it won't be used without it anyway
+# pytest-cov used to test compatibility
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		!hppa? (
+			dev-python/pytest-cov[${PYTHON_USEDEP}]
+		)
+	)"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-toolbox/Manifest b/dev-python/pytest-toolbox/Manifest
index 6934d94c77c8..a670aaa64a54 100644
--- a/dev-python/pytest-toolbox/Manifest
+++ b/dev-python/pytest-toolbox/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-toolbox-0.4.gh.tar.gz 8594 BLAKE2B fb1f19513e9e4b191c3eb995cc5e9445bc9f19affef87350d925c5465210c4de945b91120f86664c1dcf02a638595a7725cf88e3244e377ae77558c70d65643a SHA512 ed27700ff77cd607be808142cc310cd2b7461e55b3f8352d304ef8ca6c5e6c060c67a63238a1025407868ab8e229c4a16eaaa56aa75000159762001accb67752
-EBUILD pytest-toolbox-0.4.ebuild 644 BLAKE2B bab42f604b99b980948880f47618e8fa2d357ca19b316cb861eaf16404bbbc250a1f1550e0a5cc909d3a08cc03b1d2de36d61bfd842881fdb671a2adc57081c8 SHA512 8fa8f50c2c609030c6733385531461a42bdb114c3d9812a66a250a9600e35a51500e0f848722a216f0fa828b8648323150ad95f47fd47eba5f3fd2a594cce76a
+EBUILD pytest-toolbox-0.4.ebuild 675 BLAKE2B bf4160e0f7dbefcfa1360b7790eddfc28bedc342ce221d3d0d62274627a315cfc2e9c40b36f37ee52420911e51f27426063e456242e50b8895587b4fc605f412 SHA512 66f7a41574da9d0f84edbd7d785c6439f339fc48bd595353665b9e4a6d7cd15db55b10892abe9eca5f48deea6333fe414507ea094bd858cc5d41daf1623c7f66
 MISC metadata.xml 395 BLAKE2B 5d6c5c889169be1f1e05eadc0cefcbe90d51c4c7400aef7d1c653c4a018f5288384c30b7f58d8502d0c1ffb2c07aa08a81cca7e4d12b5df7ef344fabd13ee7a5 SHA512 bfcf70da768f5a66edc1ed98211ced383bac3ea1ca2313efc7caac197aeeba1c988fbd738b7118afdc775ed30b43ee8af42c9c39da82eefadb88e87802f6f8e4
diff --git a/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild b/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild
index ffff5bfb4ec7..b575a6fafbda 100644
--- a/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild
+++ b/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 36cb255aeea9..eafddeaf3f83 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,6 +1,6 @@
 AUX pytest-xdist-2.2.0-services-conflict.patch 1097 BLAKE2B edc3ecb79578f89e9ce5515e194dc16df34abc2685d9fb78cc5930f29893dbd9e145c95e5b1f58bf252710c57964ea00dc8b71e20fd0aa713e9b9ab2d8d29a93 SHA512 50155aa39d0a87be7a22d0ccf6c9d8eacc8ce4342baa3fd67839b3c5b4d05b31fef5786a60e15051de3000b3ee3494ddb48feba43850d677484e239ee4be8b02
 DIST pytest-xdist-2.3.0.tar.gz 66072 BLAKE2B 367ff15cd46b8594668ccd9710a2fc7665295d41e268b464b81d5e740a580d70621a1ab5ab590788e44887b7aa3049a83853ea097c0cff54e22c3422c8f11b24 SHA512 bf49a1684b29f0ae21621b9d293f530cf2fa3d88b33f631fb803aef872c0d5ef6b3bbf2e16d01be8a6c1872fe3e6cff86ab842e3000b9e642fb46c2a170627f6
 DIST pytest-xdist-2.4.0.tar.gz 67199 BLAKE2B bba867bfbd1e161ada2157fdb5a10f929fefed959b64afef74453206d91e5014abaaa1363ac9adbc89ed476a841607f6830781817842b9be119a09bda7278b91 SHA512 2d2da6aaa8da07a28d7c6c81a0044493b7d0d1a68921e7ec94cfd2f698eaa5594b6da4d82524804637d5cc061fbe19034f3c65a07ee5a0c906170856edc3d383
-EBUILD pytest-xdist-2.3.0.ebuild 930 BLAKE2B 6a6d05f009e539a9bce4749c6cd6cb3de3414470f47654c15b11cccecb319bd60a11ccbd755f5699f1c0124c860bd887e3d38d0053992a5d5b28a2dc553be144 SHA512 6629403b5e92ac75b51ba53453e51d0c2e2e22c89e99cd6e686610857cffcccea92593729a0d16f5e1450141a8b0f18c1c20295bb509594e9b3c17622d42f9eb
+EBUILD pytest-xdist-2.3.0.ebuild 1222 BLAKE2B 992fc3c3b303c0daba5b069a3b0e035f4691bc94b9beb3a13392bd23d8587e0f24e7ecd372397ae2b0e3941d3bcff7d29a9313db534bf1995acc49c17377fde8 SHA512 41829f38ed70631266ac821d0fb3ce066b6f59d3ce7bde8df3424c0209058741b5baf28cf1c78760445327fff1efb8aee2cf33f9b907587b7c342eba318c6bb8
 EBUILD pytest-xdist-2.4.0.ebuild 1166 BLAKE2B 44c93dac1e0cdc5a46243f236f223a68aa2ccd3e285743130448a175dca80fefbad0683b1087f66990ed36bce2ae174cc0d27cc6f208b17627731737669d63be SHA512 dab48191ac867caff2c55d2ef1f566ef767baa1c5e166c0403107f92274ae76af07d559ac5f8de162c6f645a487597cd0756af6b052ef25f43c5d22b5df60963
 MISC metadata.xml 403 BLAKE2B 0aef0787ad01d8e5e5a0588b95740ca54527c1f425d17cc6655308ca478597ebdbfc35165e88864163929104aba9820848b63c17c3d77b238c4f0e17d9b98261 SHA512 c12b3e2a13b6497f748b373753410df996955ddcb9631b310104f2ae31a1427d983462c242692c1b6f9a9b9cd36b7f4aaef58e408543572c040e3dbeb38848fe
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.3.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.3.0.ebuild
index c151147a967d..883e7c88dcea 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.3.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.3.0.ebuild
@@ -35,3 +35,13 @@ PATCHES=(
 )
 
 distutils_enable_tests --install pytest
+
+python_test() {
+	# disable autoloading plugins in nested pytest calls
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# since we disabled autoloading, force loading necessary plugins
+	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
+
+	distutils_install_for_testing
+	epytest
+}
diff --git a/dev-python/pytest-xvfb/Manifest b/dev-python/pytest-xvfb/Manifest
index 63d15970708d..79b6ca509bc6 100644
--- a/dev-python/pytest-xvfb/Manifest
+++ b/dev-python/pytest-xvfb/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-xvfb-2.0.0.tar.gz 6855 BLAKE2B 338802ccbf5fc0c9ab3fccd7c172b31867cc86869dfc50dbb30daf396ecd9865e71c6486cc96c2485e2d5b6195dc2eff83a033864f88e1b2c64a3937b6b48c84 SHA512 42c2119b2c529a45b5de9f8ac2781306cfb9f00c1d0e0e9045ed40ccb7260cb6f400683802ab845ce2481dcadfcef007c8417a481e9c04f14ee1bdc68244d391
-EBUILD pytest-xvfb-2.0.0-r1.ebuild 607 BLAKE2B 270655578cc49a31144363408216e0afeb62825a8edf80cbef9acba1cc40a72b374e9108806caec2e5745ff6d6a229a58d3c730199903bd562c7493bb1f7d047 SHA512 3ef15100a6469cfb3b4124ba3ffde09fff10c97c5854e980e1783c00cf82e19d3975578adadc61aae8615b1ccc09252beef72fb873920602867c7c141eab1b0a
+EBUILD pytest-xvfb-2.0.0-r1.ebuild 614 BLAKE2B 330a82c9f4f6a65ab4284a69cb3827e92165a37d4ca0ca1d3c0909762005d5cf87fa51f80882666f1dd5a00e1f32dd15476b77444e8c0e4805fb61a49526594e SHA512 a9beeefdb251390f11413d524bc0a4598242e127675a5bedca38127b7ed2022b88471b008bd06896d1d187911326bca8086b4d3804e50bff1f58e341f2d434b4
 MISC metadata.xml 421 BLAKE2B 8d985c910db94ed9c8af91591415be5dcd6b1f95ad007cec26c4ad463a23e45c1767e5f477d12fd9a951c165a1df6b63abb87ea7f14534bc89ed9ebcf5afc69b SHA512 45c25b600fedf96a778623b6397c5122e57189a38723fadd2fd9d1ae9a62a42a66231679a7fc1b2674c7dd51f20ce1bd0297f7d6a2b80ab98ec2102eaa673cd4
diff --git a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r1.ebuild b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r1.ebuild
index efd50e3c0ec1..3817ad6ac44a 100644
--- a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r1.ebuild
+++ b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/The-Compiler/pytest-xvfb/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index c278f965cfa4..09e8f1d77f7c 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,6 +1,4 @@
-DIST python-cinderclient-7.2.1.tar.gz 251082 BLAKE2B 20b1ae9ecce0161e225b510363be74f7197075bd2247d3f5386894040582a61379faa1825197728bf9981fb9c6d66cc020483a07c0781e30e43f6bdadcb33185 SHA512 c434a353185d8e47d5849f08e7c9418454a5f643292837f0890f9aaccbf939be4528ae75851164068a2bc2ea39a4c841965be664bae4e7d37fec54a55c8332dc
 DIST python-cinderclient-8.0.0.tar.gz 236611 BLAKE2B 818279d06b597a00a66c34cf3b468e8293aaf1e90fd04c996e118ea206d475e598d7c8b9ca78542bd07ada1db5d7a2c7ea9a3748fe85ad787d283c8d8073ecc6 SHA512 ae0c5e1d6f0c173382f57f95ac05ec8872a8ed548b145c1f91d96ab7b9e4602cba11a7205c26c81027ca4ad07cbb69f675244e3606ae5dca00c22eeb8bedc126
-EBUILD python-cinderclient-7.2.1.ebuild 1057 BLAKE2B 2837e9d8d4bd6bc52595ba4e71fc9a6d11532b3274339e7678cdb7f4f627783dbae43d226bf743c99a8f19f04bb0afe7ec1398801c3c6380dc828fcc84d5eaa2 SHA512 64ed43f46c4e462bda547204c09ffdd469e2f1d50d65ea57b00779bb3a5958f91091705de80c2f1c079b22650b4d05eb90e4052cd5fa9a6be1dfbe25cec5068b
 EBUILD python-cinderclient-8.0.0-r1.ebuild 1297 BLAKE2B 05335aed3f1b230dcb8f746bbdcc63f155af0948b82e837329709eb599225db02d023e2360d713c21b5bca49d7ec4a61a9f78a20e2b215904e565b535ba1f0aa SHA512 ee80b0376d92be4c8eed9b329f3f2840603571436f29db882fb8647e80217ddf1b45116ec2ba715921a1b9ee3dbde1bf29a7dcf9b455e21dbce8d910ea50782d
 EBUILD python-cinderclient-8.0.0-r2.ebuild 1272 BLAKE2B d2996af242fd2264f537e6011f2f532ca30559109ac0a76485046a5930c27cb50a05b21e239c58899639eb87a9941894e4b09020e5ff58ccfd8ddc712a156e44 SHA512 279cd940250393f9ba70d09fd8533f61e46a64bfab2186bfc924d589af98717c92f455274fefc0362255c830226f776844df43b862ab4cab9eb602e96c69a210
 MISC metadata.xml 620 BLAKE2B 0ae868352f45097f3cf441ccf11551a05c6264d441f7b42452ed40e8ae9b6f68a5413b4e2cf91e20eb7bbf8bef7cc8f1dcf203e0378e42b9d27f04f96dfceca3 SHA512 cae62ef195e410efe40d9b693c2526c6c966790701006a773c931ea02cf5f2f6cefc1c08f27ddc07d3306794130fe99a87e4e2fc49f573741b599145e1017915
diff --git a/dev-python/python-cinderclient/python-cinderclient-7.2.1.ebuild b/dev-python/python-cinderclient/python-cinderclient-7.2.1.ebuild
deleted file mode 100644
index 37042effcb7c..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-7.2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python-cstruct/Manifest b/dev-python/python-cstruct/Manifest
index 7ca9d83a0fdb..183e97890f91 100644
--- a/dev-python/python-cstruct/Manifest
+++ b/dev-python/python-cstruct/Manifest
@@ -1,3 +1,3 @@
-DIST python-cstruct-1.8.tar.gz 9911 BLAKE2B 88e091274495034c05d66e4ac808b3884a766017da92bb661cb6c90111cdb5e0d11f93a83e59be74acba9ba408c37b8cbaac88a1bb4fbbed120a2d0aaccd0979 SHA512 9ca9abf388965af06be6ab455652c60aaf2738a08bd7fcc32a8be57c19b2d705784618fd108bfa727a1c05c5749f761d698adc6550bffa1ebcaaedadd7d56a62
-EBUILD python-cstruct-1.8.ebuild 481 BLAKE2B f3c5d2f6265999fc2e062927c9edffae52197138df77d9182e69ae959c3d9af86bf120a074bbb8591fb1b0025a3d3bc51a86b784f071d97084b692250325d6b8 SHA512 cfc3660c03a80bf1d8e67609b31cabe74cd484d0b8fd7b7bf60fae1aba420e1a030fcb65fcc09c5a13e61cfb38f6bfc73566fbbe6366e0ea4b9da441c353547b
-MISC metadata.xml 353 BLAKE2B a5f07040a6d4cd015af11129548ba98bd63e66845647477a9327eceede3b0f66ebf503dab421ad72ac93ab7944eba141983cf3c69da07d7acd8b10c035fda5e9 SHA512 165fbc46aa7e400a661aabbcdc195013f193c045a2e3ebc5444980c0c91d5010b5a9005a9629eeee65223fed384c1f0d7ef2eeeefc90ecb4eeca618b3f506465
+DIST python-cstruct-2.1.tar.gz 17298 BLAKE2B 9acc10f0d386c4413634945fc94b3e44210617c408ee18cf6533f70e7d64c609d463e9beceeea7c79b125e0bf0ab67a720d9ff98f45b4e7ce1f51d9280b55733 SHA512 c56c87d291c4aa2afcfdbcbbc19c03ec634b6fb0dcde9d516ef2a9079be2fea52a053c47cd20dfc0fe6537ac90939364da659d8eb4763069a9990681207d432c
+EBUILD python-cstruct-2.1.ebuild 479 BLAKE2B 29cecfe02f3aff90a7d9cf8ce888fda2b28edaed9a81463d7b15fc0b16c35d1aedd1da6cd88054353691e4d101e4034832c4f3f776ae4dc696b7e4da0ac0cb1f SHA512 1928a9f672f070c5093651b2cfdb0804ceffd70689a637b5154d6009ad2df4030773bada4c420a610ef7247713e0a95c24bb9b40c00d66eab40670c04ef62577
+MISC metadata.xml 454 BLAKE2B 5138bc275b0b9e18cab52fb309283c6b6dab8be5dcc3c86dd6526f350b216c68bc94dd2aabc7a33a4879c23165924563396c6d5991f5c702a12e184067d25cdb SHA512 bb259a25444029d8ea63577f0576ab283282298d27987e276bf4eb6d4ef00853ed019ad199830e9bb4e738f9a151feb55d53e76917508f1033c2b3ecd246276f
diff --git a/dev-python/python-cstruct/metadata.xml b/dev-python/python-cstruct/metadata.xml
index 44b8a2c02287..d1468dcb4ec3 100644
--- a/dev-python/python-cstruct/metadata.xml
+++ b/dev-python/python-cstruct/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">andreax79/python-cstruct</remote-id>
 		<remote-id type="pypi">cstruct</remote-id>
diff --git a/dev-python/python-cstruct/python-cstruct-1.8.ebuild b/dev-python/python-cstruct/python-cstruct-1.8.ebuild
deleted file mode 100644
index 91bfd95f8251..000000000000
--- a/dev-python/python-cstruct/python-cstruct-1.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="C-style structs for Python"
-HOMEPAGE="https://github.com/andreax79/python-cstruct https://pypi.org/project/cstruct/"
-SRC_URI="https://github.com/andreax79/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( README.md )
-
-distutils_enable_tests setup.py
diff --git a/dev-python/python-cstruct/python-cstruct-2.1.ebuild b/dev-python/python-cstruct/python-cstruct-2.1.ebuild
new file mode 100644
index 000000000000..ccdcbbfbf89e
--- /dev/null
+++ b/dev-python/python-cstruct/python-cstruct-2.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="C-style structs for Python"
+HOMEPAGE="https://github.com/andreax79/python-cstruct https://pypi.org/project/cstruct/"
+SRC_URI="https://github.com/andreax79/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 4f92822d9698..16c600938394 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,4 +1,6 @@
 AUX 0.1.39-disable-apt-pkg.patch 6815 BLAKE2B 443dfc1c0c60d47709f31f1d3f0196c703490a9491e8de61ea9a093a80e5d87fdf17e1b1ebd5b885a1e2c0104c243aef2dee4a8f1902b9b5f747ec1b797c93a9 SHA512 ffb0659feaaa1538bc7a40b896e6bfc53f51032aadf0c0642a3609d10a13a043c2bbea97e43fddd315fe5aa174a94c9fb3fbb9832bfebdf2acebd7a30cea3717
 DIST python-debian_0.1.40.tar.xz 319952 BLAKE2B 4d5c2d3202ef09fc8eba4e0c4f9a5861d0662f288768cb9026e1ab43309a57fb21c0b8e87734c9310f39646e071947b31b17bd48b71510e7d783af9f337c3ed1 SHA512 73ed735a3c7bb43208aa26ea9fd64fc658e111dc201ae8c1947a4e5835ebd675e37b78d2895d72bd5ed2b6afa491e77b50bd5f10d62ea8299fbdda6c0b9e5095
+DIST python-debian_0.1.42.tar.xz 173928 BLAKE2B 615be084cba8ff11eaaefc1b40335b73a16604b864600dbeb717ba65ee94f1d3a62f845a59c3db5b915346de4211fdde811593db989b143f4d60e7b425b98d2d SHA512 923831077d0a42dafd22277579e714af33b99612e5282f5d95bc884b2faec05321f8caaad20b72b25ce88d8c2449a6a23913c5377ed0bdc30d4ef87e39341ff7
 EBUILD python-debian-0.1.40.ebuild 766 BLAKE2B 8fea06408430f15b62504d839772ca7ad173dacca896c02cf58690f345fdf9cca791ed1c9f359e7e1ddfb235e23ce309612c87e3a0e1694d3980612081121c13 SHA512 de70852ff43ba2cc9d1e4773d6ff1abc46b7b29f51a1ceb8d3fcd9fcb41380f407763cab6cc27585c9454b298bba3387122129e397e389403ba29940d3b9d1fb
+EBUILD python-debian-0.1.42.ebuild 879 BLAKE2B afc292d7698e968c6ec4e6fb7a13064acff0c263f7ee020b2a0ae2619fb27491f3987d8366d442bd22252b2999a95af039b00419c32f946cbdf416fe456cb99a SHA512 36a4b9ec9306c5702a1adc81af42ddd1dfa20da0f17e68682c2f89001470b5a1c28e9a9cdd04ebe58d8f7633bd0f7809ef4df218f8a9688a02796a192d9ad2c5
 MISC metadata.xml 448 BLAKE2B bccb39bdfb24e81bc05028fc92033468f5256be096cb409b4413f69444d59d3d9a3469047337a7fec79ac707ddf4d269b44b20c725f7fc4935bd10335e1f9374 SHA512 8e3fb6ca4bf305e23a51ff56cf84648aad1e96d36aa7a4fb138f7136ea77a6a76a8985557ecb1c9da962479c8c9e36c253655d6e6602c1833f2a2230b44540aa
diff --git a/dev-python/python-debian/python-debian-0.1.42.ebuild b/dev-python/python-debian/python-debian-0.1.42.ebuild
new file mode 100644
index 000000000000..0064ad2018ff
--- /dev/null
+++ b/dev-python/python-debian/python-debian-0.1.42.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python modules to work with Debian-related data formats"
+HOMEPAGE="https://salsa.debian.org/python-debian-team/python-debian"
+SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? ( app-arch/dpkg )
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# See debian/rules.
+	sed -e "s/__CHANGELOG_VERSION__/${PV}/" lib/debian/_version.py.in > lib/debian/_version.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# See debian/rules.
+	${EPYTHON} lib/debian/doc-debtags > README.debtags || die
+}
+
+python_test() {
+	eunittest lib
+}
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index e278bebd77a8..9b2c46d42bb7 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -1,4 +1,6 @@
 AUX python-dotenv-0.18.0-second-entrypoint.patch 582 BLAKE2B 48921b086c2d4dcf86aafa743d78767a1dce50b447f429232614e9e61cb222d0190f0b1e65bf98044b286746f6ad3c3706a987fdbbb51bdfef6a9baa721bafb0 SHA512 bc7c5e35823730ff520b1862af1807dd4f0f21152bd9ae5df7d79020894df0ecf9bf785ff157b99ff668e1e23c227f8a461e13be0fb842ce06d2b1ebc1752e0b
 DIST python-dotenv-0.19.0.tar.gz 32016 BLAKE2B c9f499abf99b3af8aafe7285347e08e61e770b1a5ca9d9b0cdf9dc306367c3f0492dae814835b637c9fd3c25d81006f78cbcf8d2de18bf7dc917e1bcdb0cb544 SHA512 6207f30e79ce13ccacc00ab1a95a1613317c2cc6bd735060ddca558b498c9d5c1c46ba76d97cdbb282c0f2695aed9346159ecbe08aa8a7c4f143a65708182806
+DIST python-dotenv-0.19.1.tar.gz 31301 BLAKE2B 665e7299d97a651663a1497d00cbbbe95c18d6b8b180c0a75dcbb693fcf8e35467e0e6433a94fdb6840766cce5ffe0a1b2d3cb434e91c243e88bcd6d2160dc9a SHA512 3f82082fa619ea8bb6eec110f8926d8e28fd86f25ab9bf39e4b7263cd3074bda21f8159e2c3822d22c791e488f4f21f089afb990a3f4877e2bca087eccb634cc
 EBUILD python-dotenv-0.19.0.ebuild 847 BLAKE2B 9152045d572bef167b27d573b28f1e040355178a59a9a3a4bee3c7c3f981dd0eb0c902cd2865f8e86add075722e552cc6441e14e3be5f7e4313e853fcbb68b75 SHA512 63155e8b65be2f94fa68268f06d771e18d63fde3d3dc40deddb73a1cfa6329905089be47ef883ac4dfbbbc6aa955e8a6932cf4bd954bc9838079b36e9dae8fb0
+EBUILD python-dotenv-0.19.1.ebuild 851 BLAKE2B fdf867444d77b6d539ea9ec3ab6ce2c68a68fecb56684618b0bff2b47f5e9ed0909724c8d702ed8f538bb8e5842e2ab72c0817845259d1e7e70e525f5e6958bb SHA512 ef2dfe38353a398071152d8de0fe67a117cee921a89f3cbf32d1c709d4bbcf147f3962e94d5dc36f812240cb05f94e98282af92be1d08d32584eb8829cc09709
 MISC metadata.xml 466 BLAKE2B 2e6368e01f6c9d9ab8e69a62196a10765ebc30365a3c2fab3e171386c7f26adcb93e7e4d0796696e531db66236c2c7f31b6c948a76682ff385993cc5504eba00 SHA512 45b35de8b5108267b28a1d6975824440d821cfe3e3a1c99dcadbe8d64b4ef78feadb9b0b7434c7292250e7f4615c13f2f37d5b5d41956d136f9bf25d175c356a
diff --git a/dev-python/python-dotenv/python-dotenv-0.19.1.ebuild b/dev-python/python-dotenv/python-dotenv-0.19.1.ebuild
new file mode 100644
index 000000000000..30bf49aa59a2
--- /dev/null
+++ b/dev-python/python-dotenv/python-dotenv-0.19.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Manage .env files"
+HOMEPAGE="https://github.com/theskumar/python-dotenv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	test? (
+		>=dev-python/click-5[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( CHANGELOG.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.0-second-entrypoint.patch  # bug 798648
+)
+
+distutils_enable_tests --install pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	# Avoid collision with dev-ruby/dotenv (bug #798648)
+	rm "${D}"/usr/bin/dotenv || die
+}
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index 269d54a9e80c..581bbfd6ce3b 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -1,3 +1,3 @@
 DIST python-email-validator-1.1.3.tar.gz 19863 BLAKE2B 10700b4c6a48c50095045b6e3c9218cd565776b26e17c1c043633e208b9fbd346162cedaa4a1116ec2fccf63b4383438c7e1aef6faf9d2ead5512af7f934675c SHA512 d9087bf56783daf389909e13652a9db8f0408badf454f6239aa20f6a5e9510619d3662cf1567a03d0b14c4bbe81644509cd12975b2aa1b544d644b6c2b2854f4
-EBUILD python-email-validator-1.1.3.ebuild 1179 BLAKE2B a1752adc16e7dd3ef05006fd6a65540ddb4337ad90a2c3ab417944949d3c25961f4d20e921319547dc7c48137b88df794ca392e0f9a9672e60f7609f4aa50725 SHA512 eb7891776bf7c6f17362cc13dc214aca310cd0bd0190c84b1a89beb0250f73f80efc0ca20b4a60850eb2879c12960c7eb57bb3465a157f9ec9c743bd8f0c49c9
+EBUILD python-email-validator-1.1.3.ebuild 1203 BLAKE2B 0d5c5b7eedb17798ae201a9c84c81998d65049c493a3f5f7a5db0260b53ad2cfb447c75d5a44ca17e9b92ee681eac696906c43750a10396c033feeeb38630e09 SHA512 aa610893436be39359d9078d1135fd1ac4222453514d2e25f2f198f1d2434639723b6f56afd6bfc7ae4c3bf9e506e1bbd910b6d14b977632c43ef9fb721aad9d
 MISC metadata.xml 792 BLAKE2B 8655d15948883c5b7ad17e943028e0ab70e09d17fe7591c5e094bb46cee2595db382a008fe9d20121cee7473f1cf66efb1b71cdd345828be125c36fe67f376c6 SHA512 9065dee947add0fa203dd9a092910c165944dfc7ecee69c17092526fccfdccfa7864d4402314d9c25389f26b161251dfa58eaf2b21113da0642a62976abd50d7
diff --git a/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild b/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild
index d2f0895679f6..dc5b6c618422 100644
--- a/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild
+++ b/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/JoshData/python-email-validator"
 SRC_URI="https://github.com/JoshData/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
-KEYWORDS="amd64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index cd9b2a795870..3faba366ff85 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,11 +1,3 @@
-DIST python-engineio-3.12.1.tar.gz 37158 BLAKE2B a3f75b0ec197248029a2a257eee7694298d916bc444705df7a941e8106d09e5bc802cd612c88e526883083730797e4835e13db93121714a701af17d894ac53cf SHA512 f81012e264025dc24845986e67c7d19d46048e072a409483a130630e07efb84e831e188d3f277dd0f7d26351015009afcef0d2058bb19dacee68d6c56837fa1d
-DIST python-engineio-4.0.1.gh.tar.gz 296000 BLAKE2B dc3b2c3f25ebbfb9d795e3c08e82b2e001fbc785dfb1666f137d8b261b65a90a15af7527917bdd9c636f076f75e01c65b498145ae5051649e1264eb9339d9f7e SHA512 83886ed1a60465127b7eb42a8437196cd68f4c538076237e4f64ff36f6fb02d1e45bd6730d4bb6209c931e05b4c2e10bae60451d1d4644071178ff44a73805e9
-DIST python-engineio-4.1.0.gh.tar.gz 296431 BLAKE2B 5ab267aba4dc6e49d26166b661da5b40961d328efb92dbcb653a405f62956f33b28dbf48cd891d0e74314da998be477f917dd6eabdf154877cd80077e4172c9f SHA512 5dea0ffc24138664216eefd6f917280d6199e4c2661a2e41622bb7f4cf03467d60d555e5c28ba23c35f59ae8b549902d235308242bbc5607ac91fd61580e0c4f
-DIST python-engineio-4.2.0.gh.tar.gz 297410 BLAKE2B 140dd21e779fd89f4d94ee3d191f0b661fa9dab2fac86c1023039afbe83d5136206add52ad412148eff69e79c84b7a8ad1744b3b2c69e02a270373c8c4a38488 SHA512 02eaa5b03045ac1ba73dbcd8c7c7853526234afb61dee6de45ee18bdf3663a2f82f9a5c969fb679e3eb8ccfe5a959434d574c59648b23d3e8e876d22f90e0591
 DIST python-engineio-4.2.1.gh.tar.gz 297657 BLAKE2B 0a634cec9f71a3b8659e5b07cc326fb3d7801c8a834248d6f2ea5a48bcd058f8d0b86c2e43c110ea18ef641e3ace273a2ebd20f350aec9360d38ffe0f32f2778 SHA512 f0ea7cb0a34f49d2e3de58dc1038f41cda099fba0033af7020b9ccacd34fbf44fd1613ef14d4d05013dd99a2d35330769e6c3d2f532556fd39262229e40714f6
-EBUILD python-engineio-3.12.1.ebuild 737 BLAKE2B f8ee47b26152d15b8bee1b25743ac1a4a98e725f7426124f5c7783bd3fb1a67926f099e72823a56c04b846fa994c21a0d6535e08d7a778139d725e00d8c68887 SHA512 8fb54dc01b1df87fc841245f986b8548207329c1d6cbaf74929d1417d4b21db6032d88ddbbf7b6c24c3d01feb6b3c4a8f7699510cd8dd6cc67a6814070a902a7
-EBUILD python-engineio-4.0.1.ebuild 808 BLAKE2B 9b97a4531a5bcb3308f93d6b8a165856a602c210350f6f66d7ae24278bf6e42c1f4df02a611f4f89081992952982b536f48796b7bab1aa1db609ad9848560cb4 SHA512 f57984d627b39e7e5beca8b4256df87d2e4234bff1891c2d34703c36850171de6a0c43be1461f374be0cebd6436f9cc4b3f18075299005337b5612b9d9e320c4
-EBUILD python-engineio-4.1.0.ebuild 807 BLAKE2B 691d02082918708a0ba6528a59e8bdfb568e57d63cb6ffa27258cab98c64a76f55ad1fd6aa512415465ce4c82d378e7e7bf641041c0e7bf4d7963cfcb9f62a81 SHA512 bd636c0c9495e25a2dc88ff154109c406133eca6c1adfd45878a32a821c403312f5c7a26dd26f9dff125e7ccea75476ca5edf473b4769dc44bf1c0ebda8757fc
-EBUILD python-engineio-4.2.0.ebuild 807 BLAKE2B 691d02082918708a0ba6528a59e8bdfb568e57d63cb6ffa27258cab98c64a76f55ad1fd6aa512415465ce4c82d378e7e7bf641041c0e7bf4d7963cfcb9f62a81 SHA512 bd636c0c9495e25a2dc88ff154109c406133eca6c1adfd45878a32a821c403312f5c7a26dd26f9dff125e7ccea75476ca5edf473b4769dc44bf1c0ebda8757fc
 EBUILD python-engineio-4.2.1.ebuild 807 BLAKE2B 212977b70608d0b322fe88498362ca449e47444aa27132658fb177f7b6913827b85d90affce8cd3a08e5b479a6a69012ad0b6bbd02a0fc7a7a57f5e4f2b32579 SHA512 bcd943f8c5e7b098508ee143951ac56f477e6ac256467716f70d125f35b491ce8a9879f0e70dab5884f3d468993c361cb643f24fdec0bf0f1a11495034a6aeff
 MISC metadata.xml 518 BLAKE2B 7325d24cc26b1a3b4e2dec04159cdd4ebcceaf0384fccbee11205f9c000b1e9f84f97c742a6181dbad419e2527c6f874bc3f89760daa6b6dd2feb9b1f874b515 SHA512 40fe9ac96224019d28206f75ae6249c75dbcb759918c03826af4f8a394586bd5df445ef475cd009e8af93ea5c7424abebbbfd65ac2e2eb7bdd9e8a29f2dcb34f
diff --git a/dev-python/python-engineio/python-engineio-3.12.1.ebuild b/dev-python/python-engineio/python-engineio-3.12.1.ebuild
deleted file mode 100644
index 4a1a14896bc0..000000000000
--- a/dev-python/python-engineio/python-engineio-3.12.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=""
-DESCRIPTION="Python implementation of the Engine.IO realtime server."
-HOMEPAGE="https://python-engineio.readthedocs.org/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# pypi tarball does not contain tests
-RESTRICT="test"
-
-python_test() {
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/python-engineio/python-engineio-4.0.1.ebuild b/dev-python/python-engineio/python-engineio-4.0.1.ebuild
deleted file mode 100644
index 4b15e29d3ee9..000000000000
--- a/dev-python/python-engineio/python-engineio-4.0.1.ebuild
+++ /dev/null
@@ -1,32 +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 distutils-r1
-
-DESCRIPTION="Python implementation of the Engine.IO realtime server."
-HOMEPAGE="
-	https://python-engineio.readthedocs.org/
-	https://github.com/miguelgrinberg/python-engineio/
-	https://pypi.org/project/python-engineio/"
-SRC_URI="
-	https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-engineio/python-engineio-4.1.0.ebuild b/dev-python/python-engineio/python-engineio-4.1.0.ebuild
deleted file mode 100644
index 789212fa520e..000000000000
--- a/dev-python/python-engineio/python-engineio-4.1.0.ebuild
+++ /dev/null
@@ -1,32 +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 distutils-r1
-
-DESCRIPTION="Python implementation of the Engine.IO realtime server."
-HOMEPAGE="
-	https://python-engineio.readthedocs.io/
-	https://github.com/miguelgrinberg/python-engineio/
-	https://pypi.org/project/python-engineio/"
-SRC_URI="
-	https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-engineio/python-engineio-4.2.0.ebuild b/dev-python/python-engineio/python-engineio-4.2.0.ebuild
deleted file mode 100644
index 789212fa520e..000000000000
--- a/dev-python/python-engineio/python-engineio-4.2.0.ebuild
+++ /dev/null
@@ -1,32 +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 distutils-r1
-
-DESCRIPTION="Python implementation of the Engine.IO realtime server."
-HOMEPAGE="
-	https://python-engineio.readthedocs.io/
-	https://github.com/miguelgrinberg/python-engineio/
-	https://pypi.org/project/python-engineio/"
-SRC_URI="
-	https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-fcl/Manifest b/dev-python/python-fcl/Manifest
index 6a469dc100f1..cb4f45dc9c44 100644
--- a/dev-python/python-fcl/Manifest
+++ b/dev-python/python-fcl/Manifest
@@ -1,4 +1,4 @@
 AUX python-fcl-0.0.12-fix-compiling-on-lld.patch 400 BLAKE2B d50568d13ad303c9c56a604d5ff8bcfaa537298cbda7b48628c07637ae7364aedf88fb57a04c601765ef1ff5280d609fc50dd06270d9cce32085f19d3c3b1e08 SHA512 4e668d7ac21a0fd326db170d64a3ac0cd931dfd5657546682033c30ad86d7d29ad845a5be4110b8cae2cdfd5ad1a784f3792eb7a8b0fd665f17614dab30a0c9b
 DIST python-fcl-0.0.12.tar.gz 17204 BLAKE2B 594d466270160e71e67d99f1745b382c3b1f7754adeb9ba58443e4370e14496e45f4a7619eb7d41db22766f75fe841e088609014bf5a9ff5a6b7ee526b34eca2 SHA512 3b5462206e63e17c646edeeedb268474cc6df1ff12d64d4de0c46bcc281787a42b6306778d2fe5d4d3b2e23bc0ed86e092c9a39b74d019638c771ac5c9d9f8ce
-EBUILD python-fcl-0.0.12-r1.ebuild 704 BLAKE2B 2802f12c54504eb8fd1aaf60309859d869ea14e5c98f0c0fa4a58b54af430d2b48a1154d181f625f5b29ffecfa25ff14d624d68dd569ce16d9d8a11d970be3a7 SHA512 04bb1edb36e3cb905ecd298850825aae356f6c32df0fb3af226ede26dabcb9cb0c5df20b13db76a70bc8c97a6be43b41303ffec9cae2df7baf82167a9af7dc0a
+EBUILD python-fcl-0.0.12-r1.ebuild 743 BLAKE2B c1f7cd3b68853d806dc95730036b4c163b8ea16d137b940b328b2eeb799d13fb17db80dcb93145ada550a535a9ecde5d131f04ea86c3c0a781c7b54609ebf2e4 SHA512 62d9dc89a180fe0b6abeb63b1f7fa71e33597885bd076a9afc21ede14777e4bb1946b34a2ad1d2d1c2e47310e3badd9e552ab67b53d0349c8ee69bde9f9c039e
 MISC metadata.xml 774 BLAKE2B f58f3c075dc4b116c38d8d579049a6ec9ecd9fea47540187104638fc77b59dd96cf4d3cc8a8b42cd64ffe2c8321a2e85e8728542066524965e19237cde1c51b8 SHA512 b431353aac5536f6f884533b798e35227e0d56d66f635f7d096b29e7e3b7a7c0573fa93469a4d540f29b121c064e84fab094e6344e29f8b583bedbf7efa2a814
diff --git a/dev-python/python-fcl/python-fcl-0.0.12-r1.ebuild b/dev-python/python-fcl/python-fcl-0.0.12-r1.ebuild
index 950a9e71cccf..d8396eb3e0df 100644
--- a/dev-python/python-fcl/python-fcl-0.0.12-r1.ebuild
+++ b/dev-python/python-fcl/python-fcl-0.0.12-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -14,13 +14,13 @@ LICENSE="BSD"
 
 KEYWORDS="~amd64"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	~sci-libs/fcl-0.5.0
 	sci-libs/octomap
 "
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
 PATCHES=( "${FILESDIR}"/${P}-fix-compiling-on-lld.patch )
 
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index ece7aed0b090..4ffe5d3a59a9 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,4 +1,3 @@
 DIST python-glanceclient-3.2.2.tar.gz 191501 BLAKE2B 0ccafb81aa01f35313a6d312496538b0a3c7f2b8df9f0523b244fdcaf55eedb48a7b9beb750b56df2303bf0e4f32e6cd85bdb998618584bae05f36db606b0eed SHA512 900c8120f2a06f2bf5016ea22883b78926c5b8b27782692f3e44a473985e31cd8c6285371ef16f61dfac79828add8d841363f043453cd68ca6ddb31c8c126606
 EBUILD python-glanceclient-3.2.2-r1.ebuild 1390 BLAKE2B 311a5f52816ee70aba0dcb7da63a2a75db7659c2e9d8e3239c4926791c119f6b847f00b130dac007ac693ed0634b6372811587f27afd5b874d6c83b347316077 SHA512 d8f35a50158a4eb2536f83fa43fde8b238c02559d4245ac836f86360081239c1d7ea82d0095bcdc5fb1977a4e213cd40ca88d3ec06e8a5c7b4450863bee49b33
-EBUILD python-glanceclient-3.2.2.ebuild 1055 BLAKE2B c85d385b2a7a50545fb9d0b43962d4e37807d58c4912408a06fa9151ea2777693380dcb19df84308255c3e45adae24213bfa9c77413c98cf4ccae6747816b5eb SHA512 5085edc18ab762512491fd1ce665f86bf5251ff985eb02a7ada5ec54a38b5825ab72d79f3490261916bed89266ca0038a66e19d4904e876fcbbe45e57b95e017
 MISC metadata.xml 556 BLAKE2B 1007f5d86b8a7a5feb6018997ad5126f31c10d619d480adaf28db855ae9745c1395632b1d0fb9c915106e7678b7148487c3a2de800e8bf19e1abe55b00df7ecd SHA512 43aa944c6c8a91dfe59aa8261718fe144c852f0e036cddbf4453cfcfde21816e619388de98713de965d03c63ae242ee4fc27be103263cd1d44a5985b3c905fd0
diff --git a/dev-python/python-glanceclient/python-glanceclient-3.2.2.ebuild b/dev-python/python-glanceclient/python-glanceclient-3.2.2.ebuild
deleted file mode 100644
index 083df77ba689..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-3.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Glance API"
-HOMEPAGE="https://github.com/openstack/python-glanceclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.6.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index bd91f294e9d3..7ac6043637df 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,5 +1,7 @@
 DIST python-ironicclient-4.4.0.tar.gz 205165 BLAKE2B eac0eea383890d9d9d70594300df5d8771217e0ba226a38da38544e715487c12d3fcace07651b84e180ee0601ae6bb3c17b6ed47130bd009ed351f1e4d270d64 SHA512 8d9325e464804503a504bbcc3211f0e6f50d4a1cccf652960d1020e1cd0141f8ac67ebcbab37ba7af417679fef3f25d5aa48b9e8134fffbc971cff34446fec3c
 DIST python-ironicclient-4.8.0.tar.gz 217915 BLAKE2B 6ef8636a063eaa344bd414aa5a75b08dc4ba4c615835defba522233127baa2454f9c54de40874cd5fde9de1748887ad0c1a002da31176059a5d8562a8ffeda87 SHA512 c784124e59ee836c3349e17f347b59bb96e28afd067b7de2d948563293c16d2f641c15d3312c56c9fed476e1c8c9de65949bfdc139cd9267cb210c5cc70ccbb3
+DIST python-ironicclient-4.9.0.tar.gz 219045 BLAKE2B 75caa9e12a8ecc63ee49313e619d931a194b9db1df6a09f102bb6730cc6a14fdccf369ba04eb436505d7dd5e04a38e5fce6e584e1f3810a2407cda4648de5a10 SHA512 ebcbed362099b465f0e7602ef1db29fdc6bc6c163f50bfb32a5130fc33e0e99339ba0e2c6cc4c86f7aa4b525015051629b3c55c5a544145b2ddb72fc233b4663
 EBUILD python-ironicclient-4.4.0.ebuild 1247 BLAKE2B 220da8c65fcb58606a9d5a803d193d5c07c67c105330cd4c3cd1a3da4bd968770fd3dd208ea234f07da1d3a2e6c1e797974ce114b7c02fd6d81bacdc4f015827 SHA512 f890583c05a168285168d2753274f9b3e47df4728cb81a4a6e154163b036d84b7d5536d3ad228c3a1421be865c001cb69aaef2e5135d9d541bfa60f243ec0f29
 EBUILD python-ironicclient-4.8.0.ebuild 1403 BLAKE2B 861e0e278decacdfb65cb358d260d1b1552421a0ff5721196f2ef0c2451a00121472a6913cdb7b2a8e6450155100675e84805bec0d3256d23566b9a8fbb26090 SHA512 5bf97cfd3791733d1996e33bf2f9c9440014ff2c47c9123da10e7f8a68721a52a61a9bee72c1b6161ae347593709f1a01d12fc20933db6fadf0b78590e977dc9
+EBUILD python-ironicclient-4.9.0.ebuild 1403 BLAKE2B eabb18d6b8930243608aedd47d6dd8bc19c215f98a1b5c84659d0df11bd2bdb7f64784ce84cbf3e18abb95d60bcd6e8c419b163d5b658bb1ce3f7761b5c8a3ea SHA512 fd7b5261eb10b5f89bd9d88d4c60a138c2ad0fbf14f2f3054bdf1ff7473cef7f8afc442b4f540e5aaaa6d299e20030d846751fc90ca936cc2c67015f73fd85b4
 MISC metadata.xml 337 BLAKE2B 15cacc055a0d30f7e002d10388af0533f089c7b694b70a8bd2d9be2b74b093b87268e710b7c6be7a88cce3946882eef807203090f1c7484c895c8254b7ef959c SHA512 739d5e13560065dc8e4931a15e0a6af7c650209675b660d2571ee904184bef9fa7d5e27e0d73ea9976742b188b109d8634687e6d9b6b6acabc4dc3950ae995a6
diff --git a/dev-python/python-ironicclient/python-ironicclient-4.9.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-4.9.0.ebuild
new file mode 100644
index 000000000000..30f9e07a5940
--- /dev/null
+++ b/dev-python/python-ironicclient/python-ironicclient-4.9.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Ironic API"
+HOMEPAGE="https://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.18.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/python-keyutils/Manifest b/dev-python/python-keyutils/Manifest
index beb6c841eeb7..f85430b3d000 100644
--- a/dev-python/python-keyutils/Manifest
+++ b/dev-python/python-keyutils/Manifest
@@ -1,3 +1,3 @@
 DIST python-keyutils-0.6.tar.gz 45427 BLAKE2B b62a1194bad87fe42c658c0603ff236e8e5594e8d19dbf8b29bac5b2ef5b3c6a6d19eae3d529c9408e06802c883fad365d41d27c656776a4994b58a43b8bf1fc SHA512 e282d553a644d9b38c6256e027ee553a123bf21e4222491e22699ca5bc5041dedc4e9a9a8c1bafa44985f3b1d5fafd85ded9ed5332b6d94d6c62f3fa6bcb6d0d
-EBUILD python-keyutils-0.6.ebuild 703 BLAKE2B aa0847246a0e2a527865ba06e02051dc2c3b4c9d3bf2e838947960a9b40a037646938c74c19ba72c1a0565b5f941bb7697deadaf4855bc349cb99d26de24a694 SHA512 da1fb4c3bbb7e5501803b273a5c0b0fdd04e1b01ff75ec6a1fb5e59a7217732f60144f63d17ec05e64cc84dd6ae5f2ae2e29cc0b5e0dddc307b01d9eca1a54a0
+EBUILD python-keyutils-0.6.ebuild 708 BLAKE2B df2360c3c56253fd3c077a4672af103b708818cc593c97d455a97a6c610e412d890987176e15e2adcb26ed7f16d69980ea06cbaa2d5703d2c687cb5f814ec3a1 SHA512 e8e734f4587bdd7c9364a094e14189a3436b23cdb77e73cc90c934d999668bfbfb8c80154fc0ed169927fcd89fd2500706aec58fc17f51856dd154638645341d
 MISC metadata.xml 383 BLAKE2B c88a0df9232a36db1f568579905d43c26fbdf5e2bd119e6ae9e7e4ff54f85bf7e247d57edaa6f9a364a938ccd6401f7e617515381f3fb4f9ad1f739f93d016ae SHA512 769de9462b430f810c33781b059d24da4d006b1e47ce1e57ca529a8a240442120fbe8b03c38f4e189e045593192b23cb0f4c5e0e1e63b4e43051da64129f63e4
diff --git a/dev-python/python-keyutils/python-keyutils-0.6.ebuild b/dev-python/python-keyutils/python-keyutils-0.6.ebuild
index 3934da52194c..c8240c335eaf 100644
--- a/dev-python/python-keyutils/python-keyutils-0.6.ebuild
+++ b/dev-python/python-keyutils/python-keyutils-0.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sassoftware/python-keyutils/archive/refs/tags/${PV}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 DEPEND="sys-apps/keyutils"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/python-levenshtein/Manifest b/dev-python/python-levenshtein/Manifest
index b30dde9510e1..46f72c084c43 100644
--- a/dev-python/python-levenshtein/Manifest
+++ b/dev-python/python-levenshtein/Manifest
@@ -1,5 +1,3 @@
-DIST python-Levenshtein-0.12.1.tar.gz 50567 BLAKE2B 795c377a29045caecee245b23138ef5499691177e2d50f1729f3145c667818b34a2c05e86e5fe8317357570347e7b21188fb64a84e85cb9645513e19f1438509 SHA512 e5b9dfda4ebe1f1111e2ac86219be5659a763368759d13393bd32c6c5d78d9b183c757c7e8ff1bd8a2f73450f0a255cc78664f03d899e1e5af2e58d871843722
 DIST python-Levenshtein-0.12.2.tar.gz 50502 BLAKE2B d8992d30639e36aac1b85fada8f5273ed867aa3019208ffeb9972e999dad783d4ee16e1f6988c9306eb80f622b61fcf3a0a937b380c7a5acf50223268ed8de1d SHA512 97eac9d19121758af7620ad3963846e48434ceabb5376a83f28452015adf1a620620bfb53edb1c4f60b0fc8ec2b0faf35a105d7e2a0fc5df7a45fce81ba0dcdb
-EBUILD python-levenshtein-0.12.1.ebuild 658 BLAKE2B c1694d4684f562c147490e72fbdb27e9d107ec2332e2b695cceb5f7174592cde70ce22955969060d888c847ad86b65b427114c9210d17699da355c6eed9310c4 SHA512 10025ac0abac1c7aa16025eb53817f4224f8238cf7cf9de039ff1ff99dc57fab9a627da31381c67d84f9edad76a5df8e77537589756fb937b0848e608a4b5831
-EBUILD python-levenshtein-0.12.2.ebuild 618 BLAKE2B 555d422c6628a06e5cb7f5df541461235aa26e7aba7286917ebca71a3a27b7ec3d9a221f01a1c48d10fa74970106f51b9b1b58b1485f69f30ee3ca95725ab5f0 SHA512 6389257e65da82ef8fa3075d01f88e77d27f51bfc552355ec977307093a63a3cc3f8f4384e79ab80c8d59fe75cc55ae47a4dc02f3ee2408ed2986d0bd0159790
+EBUILD python-levenshtein-0.12.2.ebuild 614 BLAKE2B 6ae69415a70eae9904bfd0864ec08238aad549c0100934ff1144efa0cc390e7d098d83fe39e0a7f19f02c82d86222b36baa2a138110c8660b546438e7d0ab7b0 SHA512 1e597509b713529e6c75ce6a90aa5749dc17437fc03e40ac4f748cbf23d1174f1b13c1d803bd94391567af6c880fa9b322e65b819d13c38f6a95b53df821544b
 MISC metadata.xml 386 BLAKE2B 9c0dc72d1e563ec5833073032b22ee87d001bef49607c37dec69db4283ed2f7e0dc9da40dacf6e42ee6969474d3ecbe9ff6584b2e0b48f1b7d8d3bd9893dea67 SHA512 9f742e94267ca9054fb569b7a2923e00371157993d7b9da86dbe505f6a198742f564e14913ac2078fbce86d11d77d7eaa9c6e11b4f1d2f97c748f931926f0b48
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild
deleted file mode 100644
index b7e3efb90977..000000000000
--- a/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-MY_PN="python-Levenshtein"
-MY_P="${MY_PN}-${PV}"
-inherit distutils-r1
-
-DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
-HOMEPAGE="https://pypi.org/project/python-Levenshtein/
-	https://github.com/ztane/python-Levenshtein/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild
index a5d858417916..8075f1dfb122 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild
+++ b/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild
@@ -18,4 +18,4 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
diff --git a/dev-python/python-lhafile/Manifest b/dev-python/python-lhafile/Manifest
index dec19c66e62e..eb0331da0ae4 100644
--- a/dev-python/python-lhafile/Manifest
+++ b/dev-python/python-lhafile/Manifest
@@ -1,3 +1,3 @@
 DIST python-lhafile-0.3.0.tar.gz 267965 BLAKE2B 1331f21059f84f5e517339ac26546d73bc9dc125578840bf24483c274b651d8f0e2494b1b7e140bede07412b5c44e499269ea23dd1180bb955b1044b06d82ee8 SHA512 bb4db2767a702d30f2e713e5f7890d619de312d609761ade2ff8f4e99ffede8e35a72cd116abf3b8ea29b0885ebe2c993dc37f44722c8e5fe346be93dfdbbf81
-EBUILD python-lhafile-0.3.0.ebuild 489 BLAKE2B 0c3a2e2651d4b6ad3dac1e97d798650d7ff4ee9771b618735067f71a4bf7bc20ed4716acfaeadb86b6101b1b737f8f7bc1d4a0d5f8225e3c9c9f5cb559454bcc SHA512 08407ec660de26f4beb235273651ceb97873a3a3677f125de1b0d27faf38bceabf66c99d3cbb320e6f6e40a47c34060861da23ed844e21978222a1e28332a57d
+EBUILD python-lhafile-0.3.0.ebuild 456 BLAKE2B a2d62d3cd3f9a187776c941c2842eac82cfbf84e779b6d515d72fa0129eea2320effe5126475e7cc69b54715597a7594cabf74411b86c47b81f16035d9c300af SHA512 d38c6179218bf1b63629340279f004362dbb27ea4297a4b3c54436947ed619c52247d5477da4f9453c60f65306179b6f6b1032460586a0f15f8112ad03306d18
 MISC metadata.xml 385 BLAKE2B 80db4c058b52ca27106f3193c72d6878eea325a47425c65445d4e237739c297591bc1b70c188d98d5b717b5170cb69b01670fd2db00f62a5b8e84f1a627cf513 SHA512 a30340cd6218bb020e8529200c92eb245c43fd3c0f6d53f544f444c443b54d178a2c715a846a41a534799fb6cb52966eb970938297a1871676564085acf041bc
diff --git a/dev-python/python-lhafile/python-lhafile-0.3.0.ebuild b/dev-python/python-lhafile/python-lhafile-0.3.0.ebuild
index 1e871b03c263..d5a1218ffcbe 100644
--- a/dev-python/python-lhafile/python-lhafile-0.3.0.ebuild
+++ b/dev-python/python-lhafile/python-lhafile-0.3.0.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="LHA archive support for Python"
 HOMEPAGE="https://fengestad.no/python-lhafile/"
 SRC_URI="https://github.com/FrodeSolheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
diff --git a/dev-python/python-libevdev/Manifest b/dev-python/python-libevdev/Manifest
index ff6ab0bc627f..ace4ef36889e 100644
--- a/dev-python/python-libevdev/Manifest
+++ b/dev-python/python-libevdev/Manifest
@@ -1,3 +1,3 @@
 DIST python-libevdev-0.9.tar.bz2 31496 BLAKE2B 4802f1528c104b0717f3f3a450e6e704232d5045ac285b96eb3eb690f120969ea0f23eae1da6013b260627f18b3e58e55a5017401928149e9cc581d9a84fad70 SHA512 77dcb18c393fd7962887d477292ec359c65404ae126624dc5ab201528e53b9fab565d5c6acfe2908f4a03a29e09fad862220246b91a92cc5f69768a31d1ca808
-EBUILD python-libevdev-0.9.ebuild 626 BLAKE2B e224a55076a7ca36ead5c19774aac3981d995a9526abea0ad31a325bc9a2717e753219444e5d3d8beab39f5116897235db5bfa32f2e40ce162f2136763786793 SHA512 62677ada4ca75c3f306d8dcc7fcf16d95854e3cebf05017a09100af8a9f0e3ce3270d3d42aabf44a307e4922ff6779b277fd9e8531813ead59c0c5799732c3cd
-MISC metadata.xml 306 BLAKE2B b1af76cb52b46b6f5e72cb22a0534ce2d83b4042ea893ebc02c9423dd95511612a2e062f5fdee93f1f6f6450154f17235ef6c78f64b8482b0463aeaba1339eb5 SHA512 3eef2cf3e13cdd56a8eb36ef4c93335c64b3dc5ac9ba35865d93389b190b5314aba0be43645c9031ecb24f15987d52a4bf00301a400748e41ee9b601a60c59a2
+EBUILD python-libevdev-0.9.ebuild 650 BLAKE2B 84206ea091779513315264901daf0f6eb4068941544e6218385556160504e8ccf2674e546dd11a74dc9e23233ec53d862e440fdf86394f6cb91ad8a9f8f134d3 SHA512 4a66a17a59c8da0432284517c783431dd9836a90fa02e06fb241c52c75f5f17d51d94926ebcc97e34ab6c3f73eb43ca81bbd3480e845256d1a18e2d50ff25322
+MISC metadata.xml 330 BLAKE2B 5e5d0c798e9cda51a5339cc535ed4095ce88aa6b8e22f50301fa5eb766635411729a8f1568727249b38623974b9eeb027d81b9515262b12c74fcb720680ccca1 SHA512 7eefac30ab962d4e53a7e8e1e1630f891c0f985d70579ff53bbff9acead6e324747d3771bdaef274abed608c3c983fc2cac92acb7970511b45612a63b3be95ec
diff --git a/dev-python/python-libevdev/metadata.xml b/dev-python/python-libevdev/metadata.xml
index 46fb181de753..b9ff935d2324 100644
--- a/dev-python/python-libevdev/metadata.xml
+++ b/dev-python/python-libevdev/metadata.xml
@@ -5,6 +5,7 @@
 		<email>x11@gentoo.org</email>
 		<name>X11</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">libevdev</remote-id>
 	</upstream>
diff --git a/dev-python/python-libevdev/python-libevdev-0.9.ebuild b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
index a01db655c3fb..b2931b3ecaa7 100644
--- a/dev-python/python-libevdev/python-libevdev-0.9.ebuild
+++ b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python wrappers for the libevdev library"
@@ -13,14 +13,10 @@ SRC_URI="https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="
-	test? ( dev-libs/libevdev )
-"
+BDEPEND="test? ( dev-libs/libevdev )"
 PDEPEND="dev-libs/libevdev"
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests unittest
+distutils_enable_sphinx doc/source \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 37fd4c23d807..bedecc2b5936 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,3 +1,5 @@
 DIST python-nbxmpp-nbxmpp-2.0.3.tar.bz2 122433 BLAKE2B 9543a93c2ea372fbe8412c410252907eeaa00e2576bbe4a614141d521d03ef997481b482e9990376cd5b8139e5daa01e51f946fd9792fb26bc0084e04f3b1de0 SHA512 6ba1dc045a7f6d761e8d9d5da9f4799aaff96155fa7260c76820bbe9c11d95a11777fe73b9f405ee9e4b93be2167dd575fae4cb880f0690bb6a99d091a5eadfc
+DIST python-nbxmpp-nbxmpp-2.0.4.tar.bz2 122568 BLAKE2B 3ca2213018ee561e9778ca6107e3a55ef6635a1f859d7cec6f08ac7ac6b3e3a7b4dd2dc38e3305fdcfca94b2003aef5525efc2f992b25fe5d5e44090c199fad4 SHA512 52e819019abaec8fb3fdf7c64bc7bf29d94d77d8b3c550fd8c05223eef81e50d8a992fb12b56198f389860f1bd55f915b781ae5a1d66b40bcbe17fec3fa0d540
 EBUILD python-nbxmpp-2.0.3.ebuild 721 BLAKE2B 937344a647bb03fa3774a0464373bcf5225cf319cd636f6fb92d5d38bbdb1c312e77211e3066eee9a44fb0968481670df20ae43234ad6969307c17e3a21c1f9c SHA512 14cf28fd0c90d20333cbb3f896abb2f17a85a80db699ab5947e5ed926ab2601fcf1ff6a7f2af5aaa215dd576255172412e3b6a4e077b7bffa16a0bb143507a58
+EBUILD python-nbxmpp-2.0.4.ebuild 722 BLAKE2B ae150443f4791daf2b50babf73ec6d977770a48466917b26d4506cd599800a33b7473615ad27f5555de4205fb0ceeb0a76691ef1475f5d36a723faec25ec5e5e SHA512 b9b520197d1e154f5e1249393c63f03146a6d8f6cbfd6cd7090835c5eb431547b4416a31ac1ac8910c64a1b5c56fa5ba43773102e578e40600e5c5366252bcbe
 MISC metadata.xml 426 BLAKE2B 2772501445c7b3f8db801d5d6c52c6004cc6c67527b30cfcd5f48b54c3e483f1ace9307632f0da179cc4462e3ffde741b66af38c76e248004ff7238a591a15bf SHA512 0f456e67e255e045d97f969ed16c7e304d07a6b9a60d938dded30e78235a2ef984f5883c08f655e14084a8d76f54cd578c3d1eb387f0cc4d8502a5188dac987d
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-2.0.4.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-2.0.4.ebuild
new file mode 100644
index 000000000000..8579e8f853a3
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-2.0.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=python-nbxmpp-nbxmpp-${PV}
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="https://dev.gajim.org/gajim/python-nbxmpp/"
+SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/${MY_P}.tar.bz2"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	net-libs/libsoup[introspection]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/precis-i18n[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 574c659a4ca9..610176ef5559 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,3 +1,3 @@
 DIST python-xlib-0.31.tar.bz2 211425 BLAKE2B c0a15b11c264942479c86088d8d5bdc0c759ae71df8939feee200ff58ec30d3b2c0a99a119cc56e5c32279b26517e7925cf9124a367dc7d32fcaf0be4f7cd41e SHA512 f98978cd0058ae18f08f9da71b4ff31cd7811040ec1eb03ce065c187f312259d674dd76aad447752c8f508e585838948c90182eef5d5240e6c06b0a5dd1fbd33
-EBUILD python-xlib-0.31.ebuild 877 BLAKE2B 2db4e699d74e87921d1d4ed271c27388b13a8dd19d98ca4ad8f1b187dedd78031630e1657ebe555a749f7f68395ffbc5696cc6c9dc350e30b56404d973f98c0f SHA512 84c87436d20cf305bf077a34f6557022a9cf4544efac3ae228c5efda69213219e156e8944e43b62cf38c5ff52d42d24ce2c37fa8967f88f5f2048e13b305688a
+EBUILD python-xlib-0.31.ebuild 891 BLAKE2B 4047fe5708424f0ebeedcdc94bb307218fe3e6faf494e15015a1adc6217fad84589e9451f4c95331523ebcae404e7bcc92e5cd19da7d299d058cca3b6eac770d SHA512 345e6deec4c0146fad01d9b004bb0629a58dc189424273e95f4a4c9d24201d9813fb04f27271bacee726b2e76381c0290760b931e6c2947026122e2b99772753
 MISC metadata.xml 434 BLAKE2B 3fa5d4e6b3b0347d1872805cf074795e486fe64a6b5b3edf326e9a8f81c1f5b86472ec6d906e85ef11493e9aeff9ef8ecfbece69103df037c8237fee3bbbaac9 SHA512 38738c99171d5351a797b12384a0f29b38250bb62cb17ff6250e3215a580500eec3210e22ee9605356c71477b8574b9fde34c5dee944b8437b901adc9b417218
diff --git a/dev-python/python-xlib/python-xlib-0.31.ebuild b/dev-python/python-xlib/python-xlib-0.31.ebuild
index fe876ce77b66..abe871e44760 100644
--- a/dev-python/python-xlib/python-xlib-0.31.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.31.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index d2556079af48..6615026fb68d 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -1,5 +1,3 @@
 DIST pythran-0.10.0.gh.tar.gz 3614984 BLAKE2B 82686479d475c6814392eb6c34e2d765ba36c88f9de3119f38c81b3f09d07acce8f5ab11b31114c13a1aa3bebd3699c540edcc6203401a007caf02c960a4733b SHA512 3d48d6f12fcd0317cb756eee18ad359057e4daee1a496023253b26febd2acf0fd22c3b4976bc8552a137d25052e4feaacf1917c5dc84414e9fbed66dff5c1614
-DIST pythran-0.9.12.post1.gh.tar.gz 3612135 BLAKE2B 1c0650d249a0834a488aba6f48d1130b8897b4b220523d3aaa0f7557609f9cfcc208563980b6855132199fd394b45404c4c15c961380ea2089121c5c9eea65b2 SHA512 71a9dec2ca9eca85a2b3e52022e262135b4f1642d646bfc66323bd8b7545a11351d70aaec0fd90d82dc0ba23ec6733a30c8d807e5d90ff5c208d2995a6ac6f83
-EBUILD pythran-0.10.0.ebuild 1119 BLAKE2B 9d5b29d81e994b29b5463d6b9a3cd1dedd732bd2a15315c0fbbe3489873d1e8cf53d2abf1a0a8a7a1960da57bb79fcdadf12eb5aac08b05805a6b25734dfd850 SHA512 cc528373ec1f9d0cf50256422dd8f074b4f9066b578004e45a0a25fc99ffa9224591897d50f2cfce6266d83cda5e239b2a93f1c01d83105c970dcd999230e8e5
-EBUILD pythran-0.9.12_p1.ebuild 1119 BLAKE2B 9d5b29d81e994b29b5463d6b9a3cd1dedd732bd2a15315c0fbbe3489873d1e8cf53d2abf1a0a8a7a1960da57bb79fcdadf12eb5aac08b05805a6b25734dfd850 SHA512 cc528373ec1f9d0cf50256422dd8f074b4f9066b578004e45a0a25fc99ffa9224591897d50f2cfce6266d83cda5e239b2a93f1c01d83105c970dcd999230e8e5
+EBUILD pythran-0.10.0.ebuild 1133 BLAKE2B 357974cfd1bf983d98b25b8c7bbfd1707bea51fa24befd290c8c895d72767bf18cae768cc7d19473140500a1655a7c96958924f1ef54198aab290366abfc07d5 SHA512 8503342f1152543cbb71078f90a2ae4455a6d26434c07919806090342910d2c1af23ba7f52281750997496cb3fa9c47596b32840e0d71c71dbac462411c94de9
 MISC metadata.xml 354 BLAKE2B e7ec71fae294f6f697b0fd99b0ccef24049af7999866344e8da2ebc40bc2988a21f2cb0374b52b781a5f8b55f26ebca364dc93f4e69d957a3ff6bd3c32cd988d SHA512 9008d270ea6757557482edb55c5848aea9a29abfbbad65d93000660a1e51ad2456a2b7ccfcacb80da23b3dd38cee2c4da9645aed48a35edb4a497bbe3a80dd7f
diff --git a/dev-python/pythran/pythran-0.10.0.ebuild b/dev-python/pythran/pythran-0.10.0.ebuild
index 6cf9f49801e9..7b1b66240e45 100644
--- a/dev-python/pythran/pythran-0.10.0.ebuild
+++ b/dev-python/pythran/pythran-0.10.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	=dev-python/beniget-0.4*[${PYTHON_USEDEP}]
diff --git a/dev-python/pythran/pythran-0.9.12_p1.ebuild b/dev-python/pythran/pythran-0.9.12_p1.ebuild
deleted file mode 100644
index 6cf9f49801e9..000000000000
--- a/dev-python/pythran/pythran-0.9.12_p1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 multiprocessing
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Ahead of Time compiler for numeric kernels"
-HOMEPAGE="
-	https://pypi.org/project/pythran/
-	https://github.com/serge-sans-paille/pythran/"
-SRC_URI="
-	https://github.com/serge-sans-paille/pythran/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-python/beniget-0.4*[${PYTHON_USEDEP}]
-	=dev-python/gast-0.5*[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		virtual/cblas
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/pytest-runner/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x COLUMNS=80
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/pytz_deprecation_shim/Manifest b/dev-python/pytz_deprecation_shim/Manifest
new file mode 100644
index 000000000000..f994705dcfe5
--- /dev/null
+++ b/dev-python/pytz_deprecation_shim/Manifest
@@ -0,0 +1,3 @@
+DIST pytz_deprecation_shim-0.1.0.post0.tar.gz 60190 BLAKE2B a6d186ca6fff17a3fb787ad6164fcf45fbac272e6123491a6822699cf54a115c9941f2b1ee3d227f531a0ab1d11846300dc24974611cc1671c77405606704754 SHA512 201eea777f4da9def1b060911da5eaa89652f6716d5608278fdc94a2f67af5ea23a8b667cb181e03d5edd7f0a07f4954047621668f4c2e7bb325dd07f454d0b6
+EBUILD pytz_deprecation_shim-0.1.0_p0.ebuild 896 BLAKE2B c2d81913165a7292f90834ff7e830c265c103abded56f64ec1a6d0f2119e0129846b5a9c716c9352fe38bfc87652c79b5fa76a1d85c2ea42ff395a26b45d1e3f SHA512 5f12024b2a804a4e65ab2fc9b7172c927b70f9749d839655f60234844baf35a2ed4116e7eebff27ec6dd4c93ed16a58007154188a993e1f3d6992792e3e098b7
+MISC metadata.xml 419 BLAKE2B 2840524ff112ed60eeca8162297a1d4c0c3ecb47a5abaa440d237832f90a823789f07400200d2a0d31b25f6d2484a85d448549f32ccd7b4a1d755ff263c7df7b SHA512 3c75ed2c66ae13d4f67d50f07eb5e17fea8d4f8a3252d3a4d52ebe0c688c9253c61dc065ac6cda6120909e625fc1b6eb74a6f2d7dfc8cf25c8aed075a4f75bbc
diff --git a/dev-python/pytz_deprecation_shim/metadata.xml b/dev-python/pytz_deprecation_shim/metadata.xml
new file mode 100644
index 000000000000..12126b02ffe2
--- /dev/null
+++ b/dev-python/pytz_deprecation_shim/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pytz-deprecation-shim</remote-id>
+		<remote-id type="github">pganssle/pytz-deprecation-shim</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0.ebuild b/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0.ebuild
new file mode 100644
index 000000000000..28c95ccfeac2
--- /dev/null
+++ b/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+
+DESCRIPTION="Shims to make deprecation of pytz easier"
+HOMEPAGE="https://pypi.org/project/pytz-deprecation-shim/ https://github.com/pganssle/pytz-deprecation-shim"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/pytzdata[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' python3_8 pypy3)
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/pyvirtualdisplay/Manifest b/dev-python/pyvirtualdisplay/Manifest
index 416c33e75249..a61c12e5ef35 100644
--- a/dev-python/pyvirtualdisplay/Manifest
+++ b/dev-python/pyvirtualdisplay/Manifest
@@ -1,3 +1,3 @@
 DIST PyVirtualDisplay-2.2.tar.gz 40882 BLAKE2B 8fb2227928c8475994e4e54a42dada2b1921678adcec562d9658e01edc0e356aea714cc9a507c93be66d9c61dceeaadde4f22cc636504f4403e985ac2df96248 SHA512 33567d12fc63359869e4baa2413794e9caacd147a5b6ffe2ca79e1292f6174ff7e04371fac5737002fccc6654d0a5dd44907fac774b666ca10588185c5c5f7cc
-EBUILD pyvirtualdisplay-2.2.ebuild 1124 BLAKE2B df37a5829c49097b0eca917e72858e9fd3b855381b70daee0d6072672d35c165494aa5963a2bba7aa7493b3fc9094cdb69c70966da3b5a364b19539ffb8d6ceb SHA512 da8bf860bc88325a9c10c154d57dfdb8282df8b8ac7010e4e5e17bdc13edc7eb24903cb146e9cac4fc925ac398df440af0ff89795909e9584b263bec52bacd78
+EBUILD pyvirtualdisplay-2.2.ebuild 1131 BLAKE2B 3a0b4d17153cce81eef3c4e7a315d64fb47a31ffef9ba3fbaa981fc1d196cf974ee48b1e42a5a45e0a666784fc2bf66b29facc9877bad9f67690b4bdb00567af SHA512 d5405e5f6f9a2b26c3f1e1f69be7fe18c0d1dd84bac721df6fbbec3817b5ed311001d4c6472692f861076b342b643caa58c81cb9dca495f7b1c2f896d60eaa00
 MISC metadata.xml 525 BLAKE2B 2c11e097aaa0db0d64946dd2feefaa78675bac0109666fba72d8e29169c8639930dd56a7338fec96b4ef500f7aac2ec3097ae0aa6e67945e0bcc8c95a89b5812 SHA512 18c2811672dbf7ddab4230074108a43c8206066478c8aa768269ea58d6a3840ad1a858948b192eaadb6e720792d2c0c57a9e3484c2b1e22080b7991fb2b32f4f
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.2.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.2.ebuild
index d7ba582ae838..634e5abb9120 100644
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.2.ebuild
+++ b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # pyvirtualdisplay.smartdisplay.DisplayTimeoutError: Timeout! elapsed time:60.3 timeout:60
 # tests hang in xvfb
diff --git a/dev-python/pywavelets/Manifest b/dev-python/pywavelets/Manifest
index c08f862b7751..1610490d8cda 100644
--- a/dev-python/pywavelets/Manifest
+++ b/dev-python/pywavelets/Manifest
@@ -1,3 +1,3 @@
 DIST PyWavelets-1.1.1.tar.gz 4578294 BLAKE2B 1d3c9118739f831a3a198ab4461daa337b7952e16693d8ab15498ac26897a813d0adc02ae339a6a3ebfd3810db13ed297714c36ba67af559835af58c2ab243e1 SHA512 3e70625dad27822165e79b7d240c34072684ba340e8d314a026d2e47e81b04945d9ed9c6a5f0730eab285d3d5ebb1b311aaec5d6d06bced1eea80000bef5e787
-EBUILD pywavelets-1.1.1.ebuild 1167 BLAKE2B 62552030b609be69006a3742b8f3f63e62d4089e0369f8f966d3c44ddf7376c9c6ee5623367fed4d43487515dd63a02565061e1321fedbfb142fcd64a4372e81 SHA512 af2d562914a98c3d69928355fd44c13c78f4b3c812e089d144802f206207b92ab948d49a3bf5ba4e97827c344e76aa637ed6c294d3dcae875260d4e32d1df57a
+EBUILD pywavelets-1.1.1.ebuild 991 BLAKE2B 3d2531a27aa3e1a0e7749cb32ac0fcebfdd39c8d064af9259a215ca0ec27637386389be1010367ee056e05e5022ae17df4b8e68bee5da1b1f70be05dbd4246c4 SHA512 6c6cfe37540133f2419f92914ba60e25d47237dea33e729de5520953364e1e53f35eb0fa189efd7752859cba58ba9b8c59276e4a04a4396fdcf047a619b95885
 MISC metadata.xml 805 BLAKE2B ed7a8e670ccab1e38e43540cf439a3488e7684d2a2951f3bc7cd2eca5d294bd2e0ed3fd01f44c674297c15aae4ce4d07536882669692dfdeb279e460f6b0e6f4 SHA512 eee1c53a3b3c9579ff6960b763825001fd9aca8da7720dbd36658a2967c3b6c4bd77892449f15677a84b983b58811c831023bc1c152bc8f84f44412d49178199
diff --git a/dev-python/pywavelets/pywavelets-1.1.1.ebuild b/dev-python/pywavelets/pywavelets-1.1.1.ebuild
index ac3571d385b5..1852f244e8be 100644
--- a/dev-python/pywavelets/pywavelets-1.1.1.ebuild
+++ b/dev-python/pywavelets/pywavelets-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -14,15 +14,14 @@ DESCRIPTION="Discrete Wavelet Transforms in Python"
 HOMEPAGE="https://pywavelets.readthedocs.io/en/latest/
 	https://github.com/PyWavelets/pywt"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
+IUSE="examples"
 
 RDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}] )
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 "
@@ -31,19 +30,14 @@ BDEPEND="${RDEPEND}
 "
 
 distutils_enable_tests pytest
-
-S="${WORKDIR}/${MY_P}"
+distutils_enable_sphinx doc/source \
+	dev-python/numpydoc
 
 python_test() {
-	pytest -vv --pyargs ${BUILD_DIR}"/lib" || die "Tests fail with ${EPYTHON}"
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
+	epytest --pyargs ${BUILD_DIR}"/lib"
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
 	distutils-r1_python_install_all
 	if use examples; then
 		docinto examples
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index 7447127da175..f683ef85d866 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,6 +1,6 @@
 AUX pyyaml-5.1-cve-2017-18342.patch 1420 BLAKE2B bf053ed121355aea1e44f9bd29b22c9afbca7b99b68e59a6e213d2723531044049964dcb20dbc036ee27ae8bcc2c26e317cf080637e611fa0105a9d451496125 SHA512 8e7737761555d851b21ca61128d2ced4163d446acb87510b6962a20dc217923bcf835d70224c9e721486351e0aeb57f9f3c570b57086a0a00c3e8ac656a458c5
-DIST pyyaml-5.3.1.gh.tar.gz 168044 BLAKE2B 2acc62ecc7448925eb340c2555001c8a74bd883d720b992d6deaea890b4eac435e4ae02eb129db3a6778c0be21a231fa9d96ee8ae59a4a39bc49961e5fb0d6ab SHA512 27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556
 DIST pyyaml-5.4.1.gh.tar.gz 173319 BLAKE2B b81cdec32588a419840dd536a2d8addb41eec3e20897f6c464a00a5badb4d6eed9b34b4f95146695187e7d9bcf2d03b81e884290c6dc47927be6192dfdb21eab SHA512 691e54fd9ca01fdc0dcb7de03ddd1970614d92a716c2437032999f9001f90a2ebbcc195a49bfdbe54da0f7a63178c83b02b05b18b5b1024127013f004d1f5997
-EBUILD pyyaml-5.3.1-r1.ebuild 1142 BLAKE2B 0fb7ffcdf9e7e7357c55bb939d866e11122931c6acc0dd22180271a0a967aa677d592de64bc154a0bfa36aed156523091f7c57345c7d1f4ab8ecac86ff9b8e96 SHA512 8bef7ced134dd3f84f069b602f33156eb6e6d61bbc5a9f99f7bacff46249951c85164605e27b34f104e5cd229d18a03ec8abe118461105340c25010fbf3a5585
+DIST pyyaml-6.0.gh.tar.gz 119855 BLAKE2B 286678ac81f2e6c252d285d2f98dab98894787e3aa164a29a697986f56200c7b71b0a768edf6d50e61065efcd054078673270872162a4975409928d7dd67aacc SHA512 cbcacc3560a035e2082867e93a9733f8660ea4c7f60573d07642f33a5453dcdc88d67299c3bcb97c27b843202a45d40de7444eb5e815bd4955129c9fc8ae04ad
 EBUILD pyyaml-5.4.1.ebuild 1125 BLAKE2B cd03ce8beb70c2e1be3bfe00bbce4387fb98d331217e988aea8678054e5c9f1c98b73563bfb53e3a93f2122da2cfdf899bc39fd0a603b56cd4ab9b535e856367 SHA512 75ed7274f0b8ea11ba1fb50ccfadba104f5fe2fad0aa45c8f8c1a30ead7868e140903b90c25f39a35af665edcad1fd9038810a4ec1cd75b40c03d31122cbf5b8
+EBUILD pyyaml-6.0.ebuild 1324 BLAKE2B 5f501853e9e37b5af49e463b4e0fbac99f1a82253364e831751a7c315f3f8488e183409e54632a62a9cb120826c8172e8f01b28d125c5e182968516e53cc6719 SHA512 2f65827f4d25cba956ad883c2ec35c38a4f91458841f7f372f0e99ef0f80f216bb7aefe7de2724ac2eb9e6965e328e674af411dd3893da93800d0f910b86d157
 MISC metadata.xml 521 BLAKE2B c10b7a0c805b705894457b699d5f352d45a41c025abc307d19068de5ba27a9360bda7ea60343bb12c798626c27b30156e3f749af8ae33ee768ea3698631ef64e SHA512 702a2308f05cb6d8fa0ef2bcf281392edfda73d18a03f8180a5c3647e5211df7422857c1e0ab14bbc4547a1d78f2eefbae73f7ddeb811345aa33d4692a402025
diff --git a/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild b/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
deleted file mode 100644
index a3e461f6d8c3..000000000000
--- a/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="YAML parser and emitter for Python"
-HOMEPAGE="https://pyyaml.org/wiki/PyYAML
-	https://pypi.org/project/PyYAML/
-	https://github.com/yaml/pyyaml"
-SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-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 ~x64-solaris ~x86-solaris"
-IUSE="examples +libyaml"
-
-RDEPEND="libyaml? ( dev-libs/libyaml:= )"
-DEPEND="${RDEPEND}
-	libyaml? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_USEDEP}]
-		' 'python*')
-	)"
-
-PATCHES=(
-	# bug #659348
-	"${FILESDIR}/pyyaml-5.1-cve-2017-18342.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_configure_all() {
-	mydistutilsargs=( $(use_with libyaml) )
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-python/pyyaml/pyyaml-6.0.ebuild b/dev-python/pyyaml/pyyaml-6.0.ebuild
new file mode 100644
index 000000000000..0448b8d0f038
--- /dev/null
+++ b/dev-python/pyyaml/pyyaml-6.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="YAML parser and emitter for Python"
+HOMEPAGE="
+	https://pyyaml.org/wiki/PyYAML
+	https://pypi.org/project/PyYAML/
+	https://github.com/yaml/pyyaml/"
+SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+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 ~x64-solaris ~x86-solaris"
+IUSE="examples"
+
+RDEPEND="dev-libs/libyaml:="
+DEPEND="${RDEPEND}"
+# bundled distutils is broken w/ pypy3 in setuptools < 58
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-58.2.0[${PYTHON_USEDEP}]
+	' pypy3)
+"
+
+distutils_enable_tests setup.py
+
+src_configure() {
+	export PYYAML_FORCE_CYTHON=1
+	DISTUTILS_ARGS=(
+		# --without-libyaml doesn't disable trying to use libyaml
+		# and results in automagic dep; --with-libyaml guarantees that
+		# the build fails if the C extension fails to build
+		--with-libyaml
+	)
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
+}
diff --git a/dev-python/pyzotero/Manifest b/dev-python/pyzotero/Manifest
index 2b589c4d1d4e..447a356e2693 100644
--- a/dev-python/pyzotero/Manifest
+++ b/dev-python/pyzotero/Manifest
@@ -1,3 +1,3 @@
-DIST pyzotero-1.4.25.tar.gz 521569 BLAKE2B ce4e3587667078d295c0d2b7d0695aba0b9da22d40caa3aff405a6ed88b3061693d0d9d0db5bfdde074a3003b088705ed5c9443f3fa0f156d803114b25288b2b SHA512 d00d30da57d7f988b9e301d496a26bd983933567ffeb87d6d494dd7c93290315ad7fda8e791c4be382bedfda51ab5928ed37230f6649f60ce731f6b2f8ddfd39
-EBUILD pyzotero-1.4.25.ebuild 936 BLAKE2B ce906d059bf84d6a54a973c9df4e4f1a6bce7355cb391a9afa4afc3ed91788784085bb40ac3327201dd10fc829550d9941d43cd18d3dd487cb12a92d5f21d8bc SHA512 7d503a5a2439adbb3b256e0b94985be642966e590d6fde5c0a6acb1dfc88f1a4fe35e1c6a1729c48df99e4919ec7d1d19c31e512ac9d7b998653f9908fc3a387
+DIST pyzotero-1.4.26.tar.gz 520629 BLAKE2B 7ddcd55a1c21d6dcc4b610a9a29bc86ff002afdf2e2a90513219b9fd13b3d5b504736e122850fc81acf7a4bbca0b8c5da3a92c8eb3a6f07392e3d17a9dc7d73c SHA512 a0b0bf92458746b0dd0c01511efb05dd8fb471434c9e813c9d6dab7741a2eb1a10af2b9c5f68daa4c681353ba8c93cab140ec2da5962d06c76e8a229d4742009
+EBUILD pyzotero-1.4.26.ebuild 933 BLAKE2B 73759c7ebfbfaad3b70185ec45499c8f8eb2882c4e500b05cdbb33accd8020e7ce7b929cff7d8508a099b582fd0c8d1455ac79207f88b79d1861ba3172c36881 SHA512 28ab689d092ff4b4734782744fee68466437869dfcd278654e9c12a1692c9855c0f9dc41998e5a1de573eea8997d9ffcc2c0357e2e7462d460a9f3ce277a0f66
 MISC metadata.xml 512 BLAKE2B 3369ec5041d7c1819a6a871b5b84733165166c5d32dcf0a271bc431198f2989710e0e3d1d334c3d44840a7fc786530d91beb1d3727ffa4bfb2a235afa05dcb3d SHA512 b6ca7abf0757b75bf25a3e53a5686c17722db174f741144ddc4897a1f3fb864af0d5defa356dec5a65aa324f19cf44847eca44f4b31c0677d01dccda938e089b
diff --git a/dev-python/pyzotero/pyzotero-1.4.25.ebuild b/dev-python/pyzotero/pyzotero-1.4.25.ebuild
deleted file mode 100644
index 03077463c22c..000000000000
--- a/dev-python/pyzotero/pyzotero-1.4.25.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="A Python client for the Zotero API"
-HOMEPAGE="https://github.com/urschrei/pyzotero"
-SRC_URI="https://github.com/urschrei/pyzotero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	app-text/zotero-bin
-	dev-python/bibtexparser[${PYTHON_USEDEP}]
-	<dev-python/feedparser-6[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/httpretty[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# do not install tests
-	sed -i "s/find_packages(),/find_packages(exclude=('test*',)),/g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyzotero/pyzotero-1.4.26.ebuild b/dev-python/pyzotero/pyzotero-1.4.26.ebuild
new file mode 100644
index 000000000000..25b514829a2c
--- /dev/null
+++ b/dev-python/pyzotero/pyzotero-1.4.26.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="A Python client for the Zotero API"
+HOMEPAGE="https://github.com/urschrei/pyzotero"
+SRC_URI="https://github.com/urschrei/pyzotero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-text/zotero-bin
+	dev-python/bibtexparser[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/httpretty[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# do not install tests
+	sed -i "s/find_packages(),/find_packages(exclude=('test*',)),/g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/qstylizer/Manifest b/dev-python/qstylizer/Manifest
index 28d2a1cea2a0..f1bd95263e75 100644
--- a/dev-python/qstylizer/Manifest
+++ b/dev-python/qstylizer/Manifest
@@ -1,7 +1,3 @@
-DIST qstylizer-0.1.10.tar.gz 20683 BLAKE2B aa12addac6cbe1ebf043d70189683feda87db3a8c2aa3604a04a969f638647ba32eaf7d156559b8af151136aaca784f26025746d9f3e574ad6eb777801bcf44a SHA512 1a747c2a0d5ce0acd220f528bc54c84c723f50bf39fc8d818f6a5475105319f46700d2f00bc5c0f14de8f0caaee0ab8904a379a3e697ca68d00ef62ec3408b2b
-DIST qstylizer-0.2.0.tar.gz 20710 BLAKE2B 1d751efd74e36e665823b64cfd51760bea489ac3916b7ab206d9c9f1fe9adbc0df2dfd9666a79e20c805dabcaa6f3cf4d11074943e0a54b7a6aa93a815c796cf SHA512 094d9c9c14d2000c2c2f2b428cd82a57424507c6df83aa21af3ab7b90e9006761ed131262a2e70a1c4aa4dcea87ac6d07f9137bc224967139467b3f4796ab158
 DIST qstylizer-0.2.1.tar.gz 20687 BLAKE2B ad158ac0f88c4a0a7c6d9fe9adc611f69cb946c28be8c414dbb40532901b53faee281e7c0a798c9f680d8e5cd8a04179b16df796041133a8dd65d117964e9905 SHA512 c5e4a4194b4282a6d2782c0636ed74e9885409570466765c6e2aee0a176175bb688854244828c56ffbd00e76d297a33de211dedae8d984021c816522ea2b6085
-EBUILD qstylizer-0.1.10.ebuild 1533 BLAKE2B 19a49fb724a3db8d99b89c19c8746f661b96ca424443f11e0b32fa8832298f5b037dd2709aac75f0da11f3a398d76417d8fe1a8ecf314d9bd6bb4dfbd1deeee9 SHA512 a0df706d4da862a15cb23f5d8250464421df6e018dfc8808941f493efe5ade7ccc455e96dc033de44fecae34bb9aff7ea602a1c83936660f97105fe3b278f690
-EBUILD qstylizer-0.2.0.ebuild 1538 BLAKE2B 665a15cce089ecb2f79a9bfff29d55007fd4caaa82babef57c915695d557a5e40483d64233697f85cc70205fa6b20fd45fa40df31670e1c1941dba57b492c6ca SHA512 ddda558e5299d7c21ef33b2c4117b1f50bab2552c4640c6a211ef433443c70d64e18fbd779e6ba7047936fd1ad5251e31190c5d379e8ac5a70ef6e36d83e9435
 EBUILD qstylizer-0.2.1.ebuild 1538 BLAKE2B 28e0c24e1d3423098180b33d83eadb428ba79bf20a65563cd1e1fbc670c95a955d4dba45c0ccad31fe74283ce39de98d558bb79e443c38634b7b8a45437e8490 SHA512 5b81b311255aa5aedfe2c42d4d945a7481fab161aceb63ee7fa7a1164b9073cd47fd1d6e7b0c6b24d33bced9952cf01ed7e25878d3557660e2a2f881a0a35521
 MISC metadata.xml 355 BLAKE2B bbd0a92b969f24330e934a3fb9db82c99d4e0f4daeb6a4fadaa5cefa0caa2d4eab393f2743664ea7bf685df3deed81ffd3e4eb8f12089d395c4c6b231bec9d58 SHA512 504b904577a9f891df117d1ca79a0041463cef7fcadb8c2dbfcf2f88abf2c26bc08a976dff5d8e51a563d6a6070b354fa2c1918051aeccf3ea5a359a3ea04694
diff --git a/dev-python/qstylizer/qstylizer-0.1.10.ebuild b/dev-python/qstylizer/qstylizer-0.1.10.ebuild
deleted file mode 100644
index 7c48860646b7..000000000000
--- a/dev-python/qstylizer/qstylizer-0.1.10.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Stylesheet Generator for PyQt5/PySide2"
-HOMEPAGE="https://github.com/blambright/qstylizer"
-SRC_URI="https://github.com/blambright/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/tinycss-0.4[${PYTHON_USEDEP}]
-	<dev-python/tinycss-1[${PYTHON_USEDEP}]
-	>=dev-python/inflection-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/inflection-1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	dev-vcs/git
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-autoprogram
-
-python_prepare_all() {
-	# Exception: Versioning for this project requires either an sdist tarball, or access to an
-	# upstream git repository. It's also possible that there is a mismatch between the package
-	# name in setup.cfg and the argument given to pbr.version.VersionInfo. Project name qstylizer
-	# was given, but was not able to be found.
-	#
-	# There are no tarballs on PyPI, so we do this as a workaround
-	git init || die
-	git config user.email "larry@gentoo.org" || die
-	git config user.name "Larry the Cow" || die
-	git add . || die
-	git commit -m "init" || die
-	git tag -a "${PV}" -m "${PV}" || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/qstylizer/qstylizer-0.2.0.ebuild b/dev-python/qstylizer/qstylizer-0.2.0.ebuild
deleted file mode 100644
index 13bb8dcfaf50..000000000000
--- a/dev-python/qstylizer/qstylizer-0.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Stylesheet Generator for PyQt5/PySide2"
-HOMEPAGE="https://github.com/blambright/qstylizer"
-SRC_URI="https://github.com/blambright/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/tinycss2-0.5[${PYTHON_USEDEP}]
-	<dev-python/tinycss2-2[${PYTHON_USEDEP}]
-	>=dev-python/inflection-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/inflection-1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	dev-vcs/git
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-autoprogram
-
-python_prepare_all() {
-	# Exception: Versioning for this project requires either an sdist tarball, or access to an
-	# upstream git repository. It's also possible that there is a mismatch between the package
-	# name in setup.cfg and the argument given to pbr.version.VersionInfo. Project name qstylizer
-	# was given, but was not able to be found.
-	#
-	# There are no tarballs on PyPI, so we do this as a workaround
-	git init -q || die
-	git config user.email "larry@gentoo.org" || die
-	git config user.name "Larry the Cow" || die
-	git add . || die
-	git commit -m "init" || die
-	git tag -a "${PV}" -m "${PV}" || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/radon/Manifest b/dev-python/radon/Manifest
index bab7e4171e85..e68bcaf09f39 100644
--- a/dev-python/radon/Manifest
+++ b/dev-python/radon/Manifest
@@ -1,7 +1,3 @@
-DIST radon-4.5.2.tar.gz 1873164 BLAKE2B 64a6def2be3505e247625b11deaaf75520781f98748cd8fec07c0d525905605deaf7f17c0103c6d41361ac0c6f62f489aeb418b5bd592dbd5b12755ec73e0116 SHA512 247fcd715ed3dfb889a73889fb5be8dc159673beb3abe1e1ba5170b8caadb85ad405ebd05f6a9080a6097f1c731b83b9dbe8b7f564f2a39b1b7cb0239f445813
-DIST radon-5.0.1.tar.gz 1873494 BLAKE2B 5a4e1db727b0ce5c7f368ca7fa710deb2034febd7fde4bccedcad6c935c57e3c73191173395f637000ebeeae6146a6eae19e0759d430dab2b7245f67eaf08ca8 SHA512 022a2209b5ac37c30a2a9e7a6ec567d4ab6edcf627cfe0e38547ec502bfa348f0131e27f41ccfe8a924c30cda879dfdc6a13011cdf6e0d19803bfd9d8949fcdf
 DIST radon-5.1.0.tar.gz 1873643 BLAKE2B 475c140fa3f9350b2376a66d3cf0dddd7f0ab1b3a4f397e82b65d175dc20ece38da1cdc7a83ef2f9e65d7d735dd589fa7ccbb5d966ca07cc7950430dd33642b9 SHA512 98e1c3dbf419ff0a791f01ea5376177c5be47c9cf1afdd9ae53014e8869dd10c7a7661a69bace48adb880173a8a176d4a13534711fcf53408b3f495f4579f7c5
-EBUILD radon-4.5.2.ebuild 619 BLAKE2B 073a57adc35f4a4227023046d113067323dfbcd4a4e69b0499df60ce0dd554e2a88a7e7f971a8c81f92d421f03412051614b6d0d224dacda470d8c1518f9148e SHA512 6d552f0ba4649b0bba3768a5d0113d70ce0f2026d3773f858e366f0aabc25dcc5d12e5a52781ee68c0d90f0619ab2c853df55e5b71f3deb236ceff5bb2bb209a
-EBUILD radon-5.0.1.ebuild 572 BLAKE2B cb589ae81ecf16413145367c036be3386385d95283da6e5655141070cd18dc5e3f8535e327d0250f7033f79081f6d838a8f73027bf45fee5d0f946604497260c SHA512 fa0db9c1512d1ee5ea0a91c15966f249e9cc6d8fd811abad740a8fa1d09fef8c3570ec5cc8701999dca48fc60c425cfef8d5bfb9444b174607168f7aae854277
 EBUILD radon-5.1.0.ebuild 572 BLAKE2B 1225cec3c832cc5a70bb5f1ce83175adc3872ee0a759ef104266c286f24c1f29e19476e172bedc29f8248500e379fa26e27ddb7fdc9b7585f176820046e5c5cd SHA512 06d7fa3b8c53eaf372dba43a8711d96acca3221a045b131ed060c2212889f2aecdcb2cd6a1199570e660f90604f4009d2a923c64538f619d8657f9b906382731
 MISC metadata.xml 384 BLAKE2B 9c13838aaec4e01a6152498eb4f0e3bfbbb8cffe0cebc53ae7602c6ef1009852b8568f33e6c0299619a2a2df234abc6e06726ca145b09470b2798ea500dde731 SHA512 5c1a2d23ef8a2450f6d2540d125c9edea2e512e2df03a6d8501a41e238902afe4283c9f455b178e80626cf266aa472391c342d6128683f534f37db60eab38720
diff --git a/dev-python/radon/radon-4.5.2.ebuild b/dev-python/radon/radon-4.5.2.ebuild
deleted file mode 100644
index 8d67d979920e..000000000000
--- a/dev-python/radon/radon-4.5.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Code Metrics in Python"
-HOMEPAGE="https://radon.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-	dev-python/flake8-polyfill[${PYTHON_USEDEP}]
-	dev-python/mando[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/radon/radon-5.0.1.ebuild b/dev-python/radon/radon-5.0.1.ebuild
deleted file mode 100644
index b8530c91e8ec..000000000000
--- a/dev-python/radon/radon-5.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Code Metrics in Python"
-HOMEPAGE="https://radon.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-	dev-python/mando[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index d25eedd5b115..17ef7a99d75a 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,5 +1,7 @@
 DIST rdflib-5.0.0.tar.gz 818586 BLAKE2B d0046590b00211ccb4f0f586dc829c061a5f426b1cefed44a63d21d46396354b9012dbe0a63c8f9de138b25ca7d73ba624c49da6fb305ececd983c62c917fd8a SHA512 ba98ab6a7bb9d993d11c559a739761f297282eb9307f3e333db8dd1c6b365b408a59b701d823bef9be774a59b3f44f64c9444e3bb0115c0c549cb00945385dab
 DIST rdflib-6.0.1.tar.gz 1245483 BLAKE2B fd1c9837c25c8110bb44bd280803ec987ba865f8fea8187a1fca6173786deea65f462cf9f55f3c3c69d4fc18b01d37fc77b7b425e618c7b2e80324d7f5531f3e SHA512 d78c61a949a9c88297368820de386d289ef1722f5b2c4dad25a453c6bc9919fb98be23e682f739de6485f81746a1c338e4045c24ca058ed0b2848b81c0d34f52
+DIST rdflib-6.0.2.tar.gz 1273100 BLAKE2B aefd98c480710ece6fc5e621ebc0526eb24c61d36872280aa369baa2ce5bf90173190fa01d592861d2d6a9700fe9fc43a9ebe6d0b1f68851442e860ca702bf31 SHA512 0d14902d24582aad01289f5265feba3c533bbf5a0928b2e1032ba0af16d16cce46a92bde0f01ec2980351c1c13fe2cf4113445d2731e04400f0c20de73efa050
 EBUILD rdflib-5.0.0.ebuild 1209 BLAKE2B 8c7608e445a10f5ee8cdf04d44d0055ae1eca18b6af29bb7eec75fe1ada154510439818822cc2470976628e9f226a6ebfa4a0c0f564dc894f77a6c6196fd2671 SHA512 d45fe4ca9a55f56d9622bbd0193216907796e4b91e4d949df0a93ba8eed8b58f30995fe74d8eee96da7bdf3aaa52f4bb681cdc4b4b3799b7029825eec8660e5e
-EBUILD rdflib-6.0.1.ebuild 1286 BLAKE2B c52c111bd158068abf694f730e77ad980803d1d89782358a9f36d8fbdc170f1b2a86640d929ca71999b662c602f4600f9d73e41dbda5d2b1c4392f8802416f86 SHA512 b14888a227bf488e3734cd36dc7c3473cd4a3ec1c75934461daaf303b23820ea87b92fb191cda17a0a4dde5fbda9b4e67099f21f7594b5a4ffef3eaae798867b
+EBUILD rdflib-6.0.1.ebuild 1305 BLAKE2B 06d7ac0764159cdc25d5984ae123df995f7b015b64d5e5034a6cd902631bda0b168f11d0316b6fb3a6889d9d30bce63b5ab829a49d305f20d5232cf10b2d8abf SHA512 b04eb2ce5c7ab0ef402892c28eb49edc366075475b42b4d4aad824ac8ed76454a24cb3470ee9ad76a65808114195feba7a3067d1ac340cd99426121186229e21
+EBUILD rdflib-6.0.2.ebuild 1305 BLAKE2B 06d7ac0764159cdc25d5984ae123df995f7b015b64d5e5034a6cd902631bda0b168f11d0316b6fb3a6889d9d30bce63b5ab829a49d305f20d5232cf10b2d8abf SHA512 b04eb2ce5c7ab0ef402892c28eb49edc366075475b42b4d4aad824ac8ed76454a24cb3470ee9ad76a65808114195feba7a3067d1ac340cd99426121186229e21
 MISC metadata.xml 400 BLAKE2B eea3d3a69375a70a1c4a93cebf48169032f9d7cc6ba5df0422bad8c0f4e1caa10721a42b66cfb0dad2ab85aff38f826a0790b4d2dbac90be16e88ecf507d9025 SHA512 d8b94c9c8c037f40db80a44d235ada552851c3b979f496462e19a909eb2b46f606c23458b20869060b596969015616d065b2df0f5b24d2b3d7224afa6089e8e7
diff --git a/dev-python/rdflib/rdflib-6.0.1.ebuild b/dev-python/rdflib/rdflib-6.0.1.ebuild
index 43be31292b78..ee10e05cea5a 100644
--- a/dev-python/rdflib/rdflib-6.0.1.ebuild
+++ b/dev-python/rdflib/rdflib-6.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="examples sqlite"
 
 RDEPEND="
diff --git a/dev-python/rdflib/rdflib-6.0.2.ebuild b/dev-python/rdflib/rdflib-6.0.2.ebuild
new file mode 100644
index 000000000000..ee10e05cea5a
--- /dev/null
+++ b/dev-python/rdflib/rdflib-6.0.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite?,threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature
+
+DESCRIPTION="RDF library containing a triple store and parser/serializer"
+HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="examples sqlite"
+
+RDEPEND="
+	dev-python/isodate[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/berkeleydb[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+python_prepare_all() {
+	# these tests require internet access
+	sed -e '/doctest/d' -i setup.cfg || die
+	rm test/{test_sparql_service.py,test_graph.py,jsonld/test_onedotone.py} || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "support for sys-libs/db (Berkeley DB for MySQL)" dev-python/berkeleydb
+}
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 7c1e8ebec440..591c38c883bc 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,9 +1,9 @@
 AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fcb99653a40bfbb9a1009519a79244fa3193ca43b9b8b3ef714f066fdac68f32d7f24c275690cb24bd1deca6b30120519b99a3402db7b4d4d48 SHA512 d55643d7ca251f465d14d8cffab60e6f2c8fb18ec6f9032a5318fab17a8b8e5ae5c98d22e0eff28aacd5bb8ec2ff606022921f73f3c9f7e54ee0853de262cfa7
 AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
+DIST regex-2021.10.8.tar.gz 703541 BLAKE2B da2a35c0f95c208fe2a9951d4c8cf756cd9eecb3ff27c5d729e9b5702256cc12bdde896019abf2aa12d206cbaace0fa693be332ff8d8baa5e6e628866eb64dea SHA512 395fbef61d54fad539bbd1e51c9100cba02bcd3a147e95a32ff8c32cb7fca66df98bade638e24f9a5c6e5d6c7becca033f925c4fa675b4e6689cba8316a8b46d
 DIST regex-2021.8.28.tar.gz 694689 BLAKE2B 1aeceeb77df3c67e3ac14811000dc0f0cccf2a4994fd349f01f3a4e793f265dc9a73ea685202c6a7af8f507f0db94d6b74b1ae448ce58dd985ca4122c3454cba SHA512 da95f8ce03200f45b6be8730b65d01170847d074202e9b5f311688e22e3d59c32a8ff93768e2ac0105bac02936cbcde49eb114b762e89e6ebf895d8b799b4bf9
-DIST regex-2021.8.3.tar.gz 693937 BLAKE2B 886dfe1a312bb34d83a3fe9442231215be7e263cbd123da24c454cdceac1055cb4dacfe4a3104699b6b97f86b14e2b723ea1267a13c2395ce2baad4ca367d77e SHA512 3ac33421ca15e47a1d8beeb3841b6e698d492e96965955afe69529dc71cc7d522e5e8236e4f577c934a3fd27036340a8084c84055bcfff0a9572e8fb56ba272b
 DIST regex-2021.9.30.tar.gz 703504 BLAKE2B d958fa97aabb4c25c424591cfc9b6006c72e72d33029902a00e705c0db6786dcca92b006c4d77f98b0dd183405f63e282f33af75361d20d2b61f65d70da40da6 SHA512 3ce87e01a6e90a2519046595548f9ce38fb177db0d5c2359c57df857a2a9f14be1c6d228b7bd724d5bd66f723e33fd6056180fb45c50931bb0ec5e723df2f16a
-EBUILD regex-2021.8.28.ebuild 859 BLAKE2B 77a0bafb82852650fecd29f1d0d9d380029dc15aa117d496b4fc6a5025fb263a6da0bf6ca8baaac886ffb6f920e9372851b9ca629c89d88ec6b27b04483131b2 SHA512 e5cdc1b24844d406d3c79141b9e318e7ff42e04e7d23709382ecededb8421babd288a5aa12725e3d05b244f3f8cd31f2cefb11a6f1c9551665019cfc22fb0179
-EBUILD regex-2021.8.3.ebuild 858 BLAKE2B caaeb0db90154588d00da89b05f0d7310cf8c9990ee7172b47f3c166daa56559d81b83811960174a9134dcc6f7d481e1271986f7ed94a3d7039a81080837564f SHA512 e4b91c910d1684786ab453f47ea5f3939ab1d5d18ba7383a7108a086b1bdc256abe05fd096212b186f658658589d04459f0a4b581b7e421b262c9e13ffe4d5b1
+EBUILD regex-2021.10.8.ebuild 866 BLAKE2B 5bd86b6308e96a7e9ae6fc3d3a131fa43accdbca68f89f0f139abc2c3157ece63b0b9dc174741b5f27162c8cd4ef2c72617b38e935e3a036af17123474dac7a4 SHA512 38d6645f1d715ef347065e7352d29b305e46bbcec26cac2f1982431db01f5cb0dffce9af233b8aad725f9aa4f08c0c848c3dde8459d43faf95472c5610a4d308
+EBUILD regex-2021.8.28.ebuild 858 BLAKE2B caaeb0db90154588d00da89b05f0d7310cf8c9990ee7172b47f3c166daa56559d81b83811960174a9134dcc6f7d481e1271986f7ed94a3d7039a81080837564f SHA512 e4b91c910d1684786ab453f47ea5f3939ab1d5d18ba7383a7108a086b1bdc256abe05fd096212b186f658658589d04459f0a4b581b7e421b262c9e13ffe4d5b1
 EBUILD regex-2021.9.30.ebuild 866 BLAKE2B 5bd86b6308e96a7e9ae6fc3d3a131fa43accdbca68f89f0f139abc2c3157ece63b0b9dc174741b5f27162c8cd4ef2c72617b38e935e3a036af17123474dac7a4 SHA512 38d6645f1d715ef347065e7352d29b305e46bbcec26cac2f1982431db01f5cb0dffce9af233b8aad725f9aa4f08c0c848c3dde8459d43faf95472c5610a4d308
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2021.10.8.ebuild b/dev-python/regex/regex-2021.10.8.ebuild
new file mode 100644
index 000000000000..67c833d04b54
--- /dev/null
+++ b/dev-python/regex/regex-2021.10.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -s "${BUILD_DIR}"/lib
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/regex/regex-2021.8.28.ebuild b/dev-python/regex/regex-2021.8.28.ebuild
index 4a336d826c82..950e8b9bcee9 100644
--- a/dev-python/regex/regex-2021.8.28.ebuild
+++ b/dev-python/regex/regex-2021.8.28.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 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"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/regex/regex-2021.8.3.ebuild b/dev-python/regex/regex-2021.8.3.ebuild
deleted file mode 100644
index 950e8b9bcee9..000000000000
--- a/dev-python/regex/regex-2021.8.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
-)
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest -s "${BUILD_DIR}"/lib
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 51b39b75ff0c..af81b90b1b3b 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,5 +1,7 @@
 AUX reportlab-3.5.48-usr-lib-LLD.patch 1601 BLAKE2B 34ff1ce6b0cc2fa8ea3b2bec79ccab0eb7ccc28ed306b524b0fced1a37605c0c957090c39c5a0b71dd6d3c47c60cb7b714142a2f339170b7dcd965363ff2df66 SHA512 32fbd4410846ba4d0a3a8a5521f21f445f76ee75d0adde6ade210816901f1bcffc511efe3822c9b473d71b3541a716f9b2a3aa39181afb21de3aad9d13026476
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.6.1.tar.gz 4511585 BLAKE2B 7f435f0f4bd7ef57f6ae54dd1efad339165ae9aff72e5bb5b852f46f766f6e50cb9bda3fcde88489323ec430c76ab59ad69e29b9068e541e76e84a270598d238 SHA512 ecccfb8300493eb0a8b6d1ed51ec8eb0501e74597c62ab498ac6766984d2ee9d1ecb2ce3dcd4ca2d47f5aacce08ff757afd01df995f0aef14ed088ce937616bc
+DIST reportlab-3.6.2.tar.gz 4501397 BLAKE2B 725b1142b54f2968d01f788949b9bd4a9208353710724bb7e647be5652b4bb01c37d344db1975f906e83c1265b9dd294fbbfbbb5c1960d25503a255ea32269de SHA512 5a8f22c50bbfcd1e76671e3337df5a740f6451ae42795288c0a0855167d0369543983e895317f1f6cbd14231bc664cea62e5a3b8ccd99775c423074b8c347b68
 EBUILD reportlab-3.6.1.ebuild 1246 BLAKE2B 8aaa26e4c69f43636b92070713c7e1f03333ced548f95d5a68b9bed9788ad68ee2bfcc47dece3dfb5f23c53afc6ecf1d6ac83c6a9b7caf86bd20e3054070e38c SHA512 94ef6d8033aa8faf853dc259628fa8d1805438d7c0b3b72ee677faad55fd99c4d9a60de5431e3b5555de033ca6e4df942551ce0c320e966ef7bb8921d6c33172
+EBUILD reportlab-3.6.2.ebuild 1253 BLAKE2B 68b575f2e4d583bcb6173e386ee033d5dfe57f7824e0588f8670ade5019ba419f046d632ce364d702a011ff0404fbb5d88e123423486fd39a7b654ecacde0303 SHA512 ed501876784e08205f5ff8a7be225c4d72ec617e26a4a77c16c068495a52277157072f36b9461355835a07b3129a593ea87e9dd8ba88591e08822862ac758498
 MISC metadata.xml 1974 BLAKE2B bfccbbc451ae8cc0a7eae60e9b6134e01a8eb9be40506c51b2b8fc23845daaf4bf6e0c97d854b5e58f1ede8ee32a97280f526949e772e06288f0a237bd32baf6 SHA512 0c46c2bb1021b7b098446fb4005b524104f3a28e0a8a497c0f60e3f89668e9198eb57be2d2b01aef36896a519244ba32ebd1a63f3840161390fc901dac6d9daf
diff --git a/dev-python/reportlab/reportlab-3.6.2.ebuild b/dev-python/reportlab/reportlab-3.6.2.ebuild
new file mode 100644
index 000000000000..b7688f2391ae
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.6.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests unittest
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+src_configure() {
+	DISTUTILS_ARGS=(
+		--no-download-t1-files
+		--use-system-libart
+	)
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 1e38bad14b9b..ac6838780ae4 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,17 +1,3 @@
-DIST requests-cache-0.6.4.gh.tar.gz 50322 BLAKE2B c9a6cae957604bdfa6057621e028fad83476e5d918bbf9c58e73f09f8615398946f3cf6e3737c9ff916cba68d82ed66a674557fb733c74b874b0f68e2430d9a0 SHA512 31e2217e54892d8ec5fc9fcf60f650960621b1f97029c90deca925b9a1be9eb5a3ddb6ae68e581c805f20136f93eefa70d51e7e9f086ecbae76f8e550bbe3f1a
-DIST requests-cache-0.7.1.gh.tar.gz 959455 BLAKE2B ce41514f21dc0708e437f70b92eb9d84f47433d04a11476cd5afefd050089e2d138213fa0b2f6bac200bd6d59db996187481ef3544d289a5117f3fe7160027b5 SHA512 cd83134ce9500c20c63fa92546cca41772ba3582a669914cd0885ec5aadf6ae4a6c4fc6a83dce73d2d5b24a80db2fde65cdb0a89b4b5703ddeac1d710404a05d
-DIST requests-cache-0.7.2.gh.tar.gz 962215 BLAKE2B 0f66548b4c37c14347021a4675d0165b9f9648dc9842f1d94c9507c096f6ef359f7109f88ac369de2de263673542f42d6e4a7402449354aee900970331f87cea SHA512 1712f3568ec4c8c41988c9d2ca07e72b1a66efceb596d814219b5eb9bb0c05448ee33b4634ec39fb03634032a6bfaaf877b297be7f92f540788dba40b4c202df
-DIST requests-cache-0.7.3.gh.tar.gz 1182825 BLAKE2B bc2b936f3b13388c23c344119a0ae2dc8efae3ba243e3a176ac27a7affb9b1c691e99ee88dfa61823a5c517ea898f144c7a9450867ea611c8518a0ecb3d77287 SHA512 fca494438001d14b0edce2cf93f51f65a0bf363d31bf1c70d1a4b2f214fe7bfc6f6f6fc97d21357fcfb9ab38c83d76cabe9c0ff4703171679ce509bd9f55753f
-DIST requests-cache-0.7.4.gh.tar.gz 1254975 BLAKE2B f0df6ac156665f8eed8850e153bfa3738d8c6677ff1613a54fcbf3208861c590e5e0ede3d5c30eeda36dcd709390402a020e03a0180e701e0751c5c982903a35 SHA512 684a3182135b6a31816629c8b4a174b52a629e964a5862573df1ac6e9e9b5cb807d1661a3a6daf8cc4b2a0f6778bd780d822a2f6c409242aa090c6565adf0aab
-DIST requests-cache-0.7.5.gh.tar.gz 1254930 BLAKE2B 7dec609d8e5d5570247bc45c33763bc35006104082235575feb336d1d386a36d18ef1e4403703aa532bc5c8e1f7cf4f741aa91bb94be4bd1fd85fe7cc9adb9b1 SHA512 656791e54f7c8dfd6518054434aa4dd03e5ce027fb36b38675d99284536abefb11883f53c6ec2f11e3f8efb473f0d1e9cede100eac82005ee023b7778848f588
-DIST requests-cache-0.8.0.gh.tar.gz 1642151 BLAKE2B e341707b2473438a8c4155350bce3e0fc712537692991e23965aa6504e8eed735caae8b103896bd324882a8f73f13f36b23b329c3c155864c1b7665c6bcc4e2a SHA512 b9f1769f70b33f128aacf05a2251f9d2511649a4e80cb702c14ac3fcbfaf72d1049a5792a295286b6969985320a0d5a87ef81bfe3bacbbc200042ba51889b7ea
 DIST requests-cache-0.8.1.gh.tar.gz 1540290 BLAKE2B ac9d7cdaa553400484776236b13f356e4e80a7c3aa5e63563dad860302cb421b7ceeb61e80af436cf9559467c4b2cd5e8363ae05e703661b88bf3ac04601ee30 SHA512 245ee7059afab50f32af9c8831fe11c14d5bd53fe6bbf02e5844974e0e5ea6c33e005f234485f245ee418ae03277c6e2cc41046a385ff138e58785cf37b119ea
-EBUILD requests-cache-0.6.4.ebuild 1141 BLAKE2B 5d2037be26cba0679666805ce783f1d9aa8452b1d8da78e443e47d3990fb212dde552d44e228ab21834fac51cf0f39e6db8dca1c2f075ce809614e4b91fdf0db SHA512 3fd54f8b358d1cdf7f5f2a4d46baa4432111b2c8f641b91b77fc141c300d3bd0467ec0600a85be138c0bbec55a4e33b891f5d8acbb9ab5fc5ca6a2b28d76c4a4
-EBUILD requests-cache-0.7.1.ebuild 1306 BLAKE2B faa714931e3f76561f06cc4d96389357cb2443f14ef22fafeb18f1705d2abdf4b855f3d728dc16b265a2e19a36b17746e16d5cc28e777649ff7c15dc5f2ffc44 SHA512 aa000ced99bda3ca2c0bb57da746ed6ab82a599f5add0a3f241153225cc0451539a77d21c8240ad760409212924d2afa457c7027302362eaceedd291c8d20c2a
-EBUILD requests-cache-0.7.2.ebuild 1306 BLAKE2B faa714931e3f76561f06cc4d96389357cb2443f14ef22fafeb18f1705d2abdf4b855f3d728dc16b265a2e19a36b17746e16d5cc28e777649ff7c15dc5f2ffc44 SHA512 aa000ced99bda3ca2c0bb57da746ed6ab82a599f5add0a3f241153225cc0451539a77d21c8240ad760409212924d2afa457c7027302362eaceedd291c8d20c2a
-EBUILD requests-cache-0.7.3.ebuild 1381 BLAKE2B 4d94dea5ad279bbfc023e63ce465c0a73a7500b5f2e509f022eaa7920252270afa23cf50fd3e653c45da168390589cb4af16d17f5b8bf83850713906600bd20e SHA512 66b726a60c236dca80c8d69403993e667667a394ba8c0a355cc8b864b7b32280ee5fe8ff4a8fae58ebfee808b0b409cb7474c32588f0acd7dd66f377e80196eb
-EBUILD requests-cache-0.7.4.ebuild 1417 BLAKE2B 91a9076dca334281c2e1bd93fb4833c0bda261a5cf2ded726b3cb6d6927b3d5649c139f6672f1fdfade46335d451d00a41a7c06a80420145b85641212837ab75 SHA512 dcf597190926ca495d186a303740d15e9c8da072a92f9bc2e1296195140f583400371c97613bdbe0eaef3cb95aa2489905b19e28e983b2f8d27ad5f83d7af275
-EBUILD requests-cache-0.7.5.ebuild 1381 BLAKE2B 000016412bcc86893998e299e13e63054c56711436cdb26bdd07a7a0a3db19a4884b2c8f13d7c35fc49d2569d86dd85eb54209c2b6589df49ab928498ada44b4 SHA512 9b94b94e3db8583fe49c7e212af6face7623bcf8d5caba9ad925b89e716c851ccc1b860e60dc0c13cf819d16a0143c63358355205deb435518dca9e1a1d5dd89
-EBUILD requests-cache-0.8.0.ebuild 1344 BLAKE2B 0c18397d9bdb8b545257c975d92bbea0cc9f5daec075099bb735b953f977410937cd15e897dc3a057a67c0955944c1f6f8ad58fe06fec8ef38c164b99abf22c7 SHA512 4a40c89dc7d608e83735281f6acdfa9b151209990f9ef7733e9b10f05e11f8550247bd26f5dea60df8a54deff57313066979ae9457e5e44c232f4e33d27de576
-EBUILD requests-cache-0.8.1-r1.ebuild 1796 BLAKE2B f23ddb9186b8f0b33e628a8ad7a0ef23f07cc4f070a52247ff0e2fb33e4f3bfa2cbfa9b6795ab4626692d1d644b3f15387b2c736873d5420c65df0273e51b01a SHA512 98b2fecbbb8d59100d6dd9d7f830fd5887527368a4579c1172dc3ca8deee7bc8ccc01da4571f3af8dd091a19e2362c293150f8e2d6c0414a254d3948884a92a8
+EBUILD requests-cache-0.8.1-r1.ebuild 1794 BLAKE2B 04abb4fb246fa326a2c7fe2a0de21dc2afc63013dbf63feec008e0a881bb01395922e0f428089a89de3b32514f5f51776e0ecbb3e39622e143a5a61de205b4b9 SHA512 fa3fcf504be9b36dc985238380e60b239c35c6d8eec87150b3928bea01354380d803c30b417f38f5a7acfa384a91a6dc2f632c903a713075307a38c60ad0d97e
 MISC metadata.xml 470 BLAKE2B 83ea1b65050486c1ff410664b87a19e514102ec030ea0f3d4076d435503f6ad2dd16caf8ff0c947d064c93955a743fe45d14c4d64471613c9de65c33f6708b93 SHA512 54160c5daeea03d90c896e30f35ed6ce8e7a29280a5e1bb1d1b0c04b5899a48ed3261d400762bf9c92bb73ddb554bcaa533b620ecda691e43fe89c1d943b7b54
diff --git a/dev-python/requests-cache/requests-cache-0.6.4.ebuild b/dev-python/requests-cache/requests-cache-0.6.4.ebuild
deleted file mode 100644
index 2a55fc474fba..000000000000
--- a/dev-python/requests-cache/requests-cache-0.6.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/requests-cache/requests-cache-0.7.1.ebuild b/dev-python/requests-cache/requests-cache-0.7.1.ebuild
deleted file mode 100644
index 32b48e1d7368..000000000000
--- a/dev-python/requests-cache/requests-cache-0.7.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cattrs[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-		# Requires Internet access
-		tests/integration/test_compat.py::test_version_upgrade
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/requests-cache/requests-cache-0.7.2.ebuild b/dev-python/requests-cache/requests-cache-0.7.2.ebuild
deleted file mode 100644
index 32b48e1d7368..000000000000
--- a/dev-python/requests-cache/requests-cache-0.7.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cattrs[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-		# Requires Internet access
-		tests/integration/test_compat.py::test_version_upgrade
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/requests-cache/requests-cache-0.7.3.ebuild b/dev-python/requests-cache/requests-cache-0.7.3.ebuild
deleted file mode 100644
index db97940e2622..000000000000
--- a/dev-python/requests-cache/requests-cache-0.7.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-
-RDEPEND="
-	dev-python/cattrs[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local ignore=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-	)
-	local deselect=(
-		# Requires Internet access
-		tests/integration/test_compat.py::test_version_upgrade
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest ${deselect[@]/#/--deselect } ${ignore[@]/#/--ignore }
-}
diff --git a/dev-python/requests-cache/requests-cache-0.7.4.ebuild b/dev-python/requests-cache/requests-cache-0.7.4.ebuild
deleted file mode 100644
index b59956b8c452..000000000000
--- a/dev-python/requests-cache/requests-cache-0.7.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/cattrs[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local ignore=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-	)
-	local deselect=(
-		# Requires Internet access
-		tests/integration/test_compat.py::test_version_upgrade
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest ${deselect[@]/#/--deselect } ${ignore[@]/#/--ignore }
-}
diff --git a/dev-python/requests-cache/requests-cache-0.7.5.ebuild b/dev-python/requests-cache/requests-cache-0.7.5.ebuild
deleted file mode 100644
index 81056830ae09..000000000000
--- a/dev-python/requests-cache/requests-cache-0.7.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cattrs[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-	)
-	local EPYTEST_DESELECT=(
-		# Requires Internet access
-		tests/integration/test_compat.py::test_version_upgrade
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest
-}
diff --git a/dev-python/requests-cache/requests-cache-0.8.0.ebuild b/dev-python/requests-cache/requests-cache-0.8.0.ebuild
deleted file mode 100644
index 61afa9af0454..000000000000
--- a/dev-python/requests-cache/requests-cache-0.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cattrs[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-	)
-	local EPYTEST_DESELECT=(
-		# Requires Internet access
-		tests/integration/test_compat.py::test_version_upgrade
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest
-}
diff --git a/dev-python/requests-cache/requests-cache-0.8.1-r1.ebuild b/dev-python/requests-cache/requests-cache-0.8.1-r1.ebuild
index b5921df49217..1a1b69910761 100644
--- a/dev-python/requests-cache/requests-cache-0.8.1-r1.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.8.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-file/Manifest b/dev-python/requests-file/Manifest
index ec46e337bcf1..a34c4487c50c 100644
--- a/dev-python/requests-file/Manifest
+++ b/dev-python/requests-file/Manifest
@@ -1,5 +1,3 @@
-DIST requests-file-1.4.3.tar.gz 5252 BLAKE2B 18b533a7619f46c1d01d0cabca2137592ff614c2a33ccbe227d4f3ea2e4854b7ecc7973d56b15c72d980d03df7cee38fe4216eae35f5803bbbdb7845f8e3e5ec SHA512 b92294a11c9cc13beb5df598b636d999e0fcd46d05b775bbb69667f066d24ccf55b5af2135aec8d69c0096ca64e13bab3c3da64bee00f0c12edd05f43430d80c
 DIST requests-file-1.5.1.tar.gz 5668 BLAKE2B 4060ab3728e32d87252d1bb25e310937dad0a6e790a9633f8932d45c1d791343ea6813509d15a24c9787736ef6b9992d236b06a504efce6c3d5fcfc04176ae87 SHA512 e671bba8de63d3fa5665f928734f1a152d95ac9973c99f3a09d2dcbb9c9c16334c54a4f0824a5ebe63e262a4cc5d4990f08244ff0b84af11fa475dd416b1e2bc
-EBUILD requests-file-1.4.3.ebuild 504 BLAKE2B be19d49a1e83e9bdf88ee353501517bf203445eb626a8596e92044a5f2f80342cf73758dd90ebf2a997bf0248ab22a333ebbe8eddf12a2348db7fcc3a69dddc5 SHA512 517cd9da9fecb560f2e17823e41332441dcee631d9ad70d44d12ed5f9ede68a85dc7938224ed3291e58168a51a89a6f99a1180e44fb13a4ce3d3ca744535d38e
-EBUILD requests-file-1.5.1-r1.ebuild 492 BLAKE2B ceeb2b2b6a6d6da6156f958810e0bff26afc44667170840fdd7ac40718e07814442c764ac7412776f2a92979f1ac40fe0bbfdb948e4bda31e96687eb3094dfe0 SHA512 2f62230bd176607611d29ddf300c610919643620b814297d40bd9324423447f941ffe31fb345c245116d020e444ff460865c9285492210b4cc65a41cc0e0a98e
+EBUILD requests-file-1.5.1-r1.ebuild 499 BLAKE2B 4c305298a94e0fde0994abb126f8667f7434ab00e0395ff185c0cc979a879ee1bf02c7d5321e438af8bfc326ab343113d6813ae60d2c39aeed379ab3b43b793d SHA512 b64fce5cdf9fa321e49ede55a55a3112b31851496e92159396638e04210a6fd31f1612191e7a3f47e63ffc5e033508b660cc701537e59cfb04249f6ed8f89883
 MISC metadata.xml 452 BLAKE2B 18888177e7a3de72dde3461c1400e4a250f30c68f948c3f0dd3f84c8cd7cfc768ff00e09bc75a936b377e1a2b4e6d8eb5ad704e3194cec74356d1ad1c141ced3 SHA512 efc7c2c991afd404f394057204a0a3450911b466b07f9b123edbeddbf5ce0f54634240e0a91193cb657fefe238483d6f3cd1a97c545ffb62b2701d2edf8cdc0e
diff --git a/dev-python/requests-file/requests-file-1.4.3.ebuild b/dev-python/requests-file/requests-file-1.4.3.ebuild
deleted file mode 100644
index 638fd50bc926..000000000000
--- a/dev-python/requests-file/requests-file-1.4.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="File transport adapter for Requests"
-HOMEPAGE="https://pypi.org/project/requests-file/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/requests-file/requests-file-1.5.1-r1.ebuild b/dev-python/requests-file/requests-file-1.5.1-r1.ebuild
index 64b3b87dd7f0..887739b3d06a 100644
--- a/dev-python/requests-file/requests-file-1.5.1-r1.ebuild
+++ b/dev-python/requests-file/requests-file-1.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/requests_pkcs12/Manifest b/dev-python/requests_pkcs12/Manifest
index ca87e51268c9..c8e9d9772424 100644
--- a/dev-python/requests_pkcs12/Manifest
+++ b/dev-python/requests_pkcs12/Manifest
@@ -1,5 +1,3 @@
 DIST requests_pkcs12-1.10.tar.gz 4284 BLAKE2B 46ebbb00921f356ccf5793fe486d3e0d71b9b1688cb49d1c846c2ef808087bb51b71c18e89539946bf4b0c8d47df5ae7acda342b0e1293bf8a031eba5ba0ace5 SHA512 139d1b1ae740db7667bb079f955610ebbe6327dd6f050d59a0e6603f21a9fe0afde8dcb2ec666bc83f6b4205de05948dacf39bdec2d9f26bf3eaa7d6998f2fbb
-DIST requests_pkcs12-1.7.tar.gz 3914 BLAKE2B f91c7d1677964cfe903b4c0f688e25b5b3b7eb921fdeb4e794cbea24ceafe4e44f7587df48c0ad56ff20114641f6897ab4ef26a64b53e6fcb7d713ecf36bb1c0 SHA512 be3fe00ef405b44d9f160ff35c072b86da511a68380e2737e9316a0d1dd89c3d8ba7adbaaf9865ca01cfbbdb85c477364780cbe3e77e2963dcd7b54519a95356
 EBUILD requests_pkcs12-1.10.ebuild 540 BLAKE2B b74f2f720ce1cda280375b882e4583c130707ad8603d3790ed05b62c8d780ebfb713e6cf53df6f3f3416c570f4ce2e523aa0b50f0b568389a42a5a9a5ca407a2 SHA512 425166d2c5b3aa786c572df8a45ffd8e439490c43f0c976aa8d494477edfaa30b3f6c3f3817a8239adcf838e76bf5847a94fa9eb04fb867669de4fb0cab3e3b4
-EBUILD requests_pkcs12-1.7.ebuild 572 BLAKE2B 72e1aca4d10601cf9c7079c0ee6a98c7f93c010da44a1c1d578be1798678a6008d583ea2871a41ff7f54b7ceea5ed876003a3c15d55d5e4be937684a026e28c0 SHA512 8f018686a9d66f9dcd91f0b8d58157b78a4b9c933d8501f1ee16e4fcd08d8a325e6610e0419604affa78a78208fd4288ae58e12a2d85512de0b4e4bb5edfd882
 MISC metadata.xml 657 BLAKE2B 2050f6406bf1e4976c51f84b60f7e26d297d21d0d84c7d88ea809bb86916414d63cbd822c255a0f685fac194bdafd63fc1da6150cac58872fea4d9371ceb56e2 SHA512 aafcd6db53d6aa99f0e19a78a29154fb150e29a5732cdedcc785b00c16bd0c5502ed7d10ee2b556b6dc966e47096243e80629496df02626e84614e033040b47c
diff --git a/dev-python/requests_pkcs12/requests_pkcs12-1.7.ebuild b/dev-python/requests_pkcs12/requests_pkcs12-1.7.ebuild
deleted file mode 100644
index 8eba6ee25358..000000000000
--- a/dev-python/requests_pkcs12/requests_pkcs12-1.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Adds PKCS#12 support to the Python requests library in a clean way"
-HOMEPAGE="https://github.com/m-click/requests_pkcs12"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DEPEND=""
-
-RDEPEND="
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/resolvelib/Manifest b/dev-python/resolvelib/Manifest
index b7bf8abedd06..6d102f964346 100644
--- a/dev-python/resolvelib/Manifest
+++ b/dev-python/resolvelib/Manifest
@@ -1,7 +1,9 @@
 DIST resolvelib-0.5.4.tar.gz 14474 BLAKE2B d1424bf6a019e16e9b662741b6c089258bfef26d5bffcfc9e0c8d9ba105b689654fdce7bf9068f71c49a2ce590f05c16b93c53bbe468fc1a339e7fa489adece2 SHA512 cb027c5478c217f6f8288b42a933665aaf6e59280e7aa88a25f6594e589e34ac2b75734764e331d0889ad9cf0c60b8cbdfa14b01dce023a76870bb21cfc4d926
 DIST resolvelib-0.7.1.gh.tar.gz 764630 BLAKE2B 32c50ef0a16e07716f18994efe4b2bd212a2ee5068ff155526e17358e3bbe4c92c4d59817c17de152882a738c924c7f5ba389d2a7d13ee1b2dc0de54e8175c3b SHA512 de5c1c29790ce1eb4393021f17f1a19a0f2de29e5d8688fc307e412d80052319b822bb24fceca47fe550e21393ee38d58fa6e6cfefd207b7a88b632b9670d282
 DIST resolvelib-0.8.0.gh.tar.gz 765655 BLAKE2B cf10ebb01a01a5601091c5374da87ad55a057144d928106d7e9c19cb348277fd5f4d455acfb49ee1979842a68ecdb1f682a1d0948339533074a540a04294c226 SHA512 6cca8be16c36e5d8d60d41fab3ab9bb3aa82e1bb4d1887b5bcae3b21db90af9799676032c566a52e2026f14b19480c000f20482c87af326d8440d2c826eb5b1a
+DIST resolvelib-0.8.1.gh.tar.gz 766632 BLAKE2B 59bb02a08cf0f9bc6070cd5c5109826a7cacc5bda07479358fd591ff018bad761b53ed48f0a330e5ef60b8fa8d5db14ef044b662423e372aad7fc477df5b97ef SHA512 bc99d0661f3605d97074066df3c57edec8db40f66111f0d7a23ad88097ba4a162368ab396ef75632d09cd8a76417fbee2554d0cdb2f797795c246d16e7e3b955
 EBUILD resolvelib-0.5.4.ebuild 504 BLAKE2B 509dc31e1d1946f599ebefa4f4099453911675de1127028b8a5da901e5777901b34cf14cb18552ea350ab9a9434efdde7f28be43c4eb0a246c8f26283bd1cad9 SHA512 ac1db9908009d7e50953ae916e1d4dadee14e41e823ef6172f92fb2561d29533872e5c627f03d2700da4dc169dc010bce24d798691acc197fc2a9314f710dc8d
 EBUILD resolvelib-0.7.1.ebuild 591 BLAKE2B d6f5fa848615a372e8cd31d8b4c3235167e0bdc03e5cf0bcff62d13d30fb85d52cbdc04bd61ac8735431610f2f2d09103319e9df03f07f7eb1f2f5a0d1028f52 SHA512 712efca5a988fe3ed234d8b5ceedc6111f98e8ffbdf4cf6ac3b8fe562391df3cd4898793f48892ba7812717b53ffee9e9234771e68c6a30cc286c19b0550948b
 EBUILD resolvelib-0.8.0.ebuild 594 BLAKE2B e71ebbc791091f1759801084a90e4f6e892551278a37ec46911f6df7de5a9427a6604bae91ecc0fc237b1b8914fb39f03a0f2d5d98af321a5a60680b740f08c6 SHA512 381f3b2a8a9cfa76bb2b19813fa5694284cb327c415524891ce0d8aa5732b588702cbc4660fddfcabe68389661b0720bdb6ab3e20dbac9fabc18902af2eed005
+EBUILD resolvelib-0.8.1.ebuild 594 BLAKE2B e71ebbc791091f1759801084a90e4f6e892551278a37ec46911f6df7de5a9427a6604bae91ecc0fc237b1b8914fb39f03a0f2d5d98af321a5a60680b740f08c6 SHA512 381f3b2a8a9cfa76bb2b19813fa5694284cb327c415524891ce0d8aa5732b588702cbc4660fddfcabe68389661b0720bdb6ab3e20dbac9fabc18902af2eed005
 MISC metadata.xml 854 BLAKE2B 133e7ab6d1721cdfc1cbaabaeaea73ab98fc159e6ffd2bc33e3688e2216a98b9ca48026fc90e36d0bebe06e1e44dde6d3b1fb5287bfa85bd101de67e30ca4dc5 SHA512 5924544364d9a846cde1181886eb83e1fb2feb049a3ccfd543a2e25993b84ffa3013e9b2cb6106caee21d5bb06520bb99eb09b330f32fdfb32026e5c71be3bdb
diff --git a/dev-python/resolvelib/resolvelib-0.8.1.ebuild b/dev-python/resolvelib/resolvelib-0.8.1.ebuild
new file mode 100644
index 000000000000..8e2ef9274528
--- /dev/null
+++ b/dev-python/resolvelib/resolvelib-0.8.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="provides a Resolver class that includes dependency resolution logic"
+HOMEPAGE="https://github.com/sarugaku/resolvelib/"
+SRC_URI="
+	https://github.com/sarugaku/resolvelib/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/commentjson[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 82c926d708f3..6b846f573e3d 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,7 +1,3 @@
-DIST rich-10.10.0.tar.gz 16264680 BLAKE2B 5f57b7ea7a091b3478ddc17dfe29309f558f36e8795a66ea918141f42f2a9e5a655667a1db8420193f3f44ba070413ebb512601751a6a5663a87db775576ce65 SHA512 8b9f1348b0f55db90c17042a83e8317d4f00b5446a77334a12379676ef1fe526f40dc92425e4bafce22ee5f65bcb2fae2422b903c6f958feb5734c254813826e
-DIST rich-10.11.0.tar.gz 16266050 BLAKE2B 34081a127eacbc875fb5af1b00a195df4718eacb4e0371ac1367950fc8e102bc2a611d970364a1b02cb400137cb838aa30d9bcd757a4d4644ed976c49c9603c8 SHA512 34cdcad401dbda0763dfaa6f46e19e498b2da96ed9423a00a957d55f9e2833fabc6b2e6d65e411dcb5814c869a8670b5242e1a891835d6b6675d4da86b28f33d
 DIST rich-10.12.0.tar.gz 16265099 BLAKE2B c2249be5a5008e3e9fd5c301b10d7bc544e4805d4762e87481aa31716e38eb3cb2b81ce80f201fc0d3961574136f47b7b374d6bc7d18e4f55f1f757a7e17e5a2 SHA512 bb42ff24c9eeeae548a6e222ecc03f8b46d763c4b022964bd8fb11517f1a23a7aaa82a2155d5cd3d29cdd1af5fab6cc4f26840a84ce5e26dd740f8706961ce1f
-EBUILD rich-10.10.0.ebuild 742 BLAKE2B bfeb1e7979e03274aa699630c82ec5f4deeaa45d282a81ec2c764f0cfd48a724c1f248112fee45f68ea2375f49af029f543e028fd103aa2375f2a23b939ba2c8 SHA512 80cd65aac4b0bf470f552b030c26b5047860ae27292381e727d475498294d8f8ee32492a7f1cd6974f2a6125e4a2534b6990982e72f849cafe2d5d2b98039a9c
-EBUILD rich-10.11.0.ebuild 742 BLAKE2B bfeb1e7979e03274aa699630c82ec5f4deeaa45d282a81ec2c764f0cfd48a724c1f248112fee45f68ea2375f49af029f543e028fd103aa2375f2a23b939ba2c8 SHA512 80cd65aac4b0bf470f552b030c26b5047860ae27292381e727d475498294d8f8ee32492a7f1cd6974f2a6125e4a2534b6990982e72f849cafe2d5d2b98039a9c
 EBUILD rich-10.12.0.ebuild 743 BLAKE2B 3f9b348de8da37dae056fdb7ac0284fda112d940a3b8e8a91cef075567f9d3243be1869d17eaeb570b64b113a5e3dbd523423c852971f464de55ff948a1b3687 SHA512 c9a18a846ec538dc6cf9f8763084d17e1c560b2ec9e62845c29ed85156362e497e79b447850e7a2b04a5ab67f732534aa037aca441d6be6b43a3b0bbf7f3004e
 MISC metadata.xml 388 BLAKE2B 9d57523a8babbcd81afad320ed91201aa1235a19bcd305b3102888f17d24666fbf94df2eae06af746a62e167c139258088d7116d52064ec022294c7ad4a9cb48 SHA512 a2a11fa0ab987f8b661176e88980dcf7335298d80a3cbe7c910accb9ecd9ee33e3add0389b23224fee88467092298db9176adde09935fd466ebbf97bdc58b8db
diff --git a/dev-python/rich/rich-10.10.0.ebuild b/dev-python/rich/rich-10.10.0.ebuild
deleted file mode 100644
index a18af32f8dc0..000000000000
--- a/dev-python/rich/rich-10.10.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/willmcgugan/rich"
-SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-10.11.0.ebuild b/dev-python/rich/rich-10.11.0.ebuild
deleted file mode 100644
index a18af32f8dc0..000000000000
--- a/dev-python/rich/rich-10.11.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/willmcgugan/rich"
-SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/robot-detection/Manifest b/dev-python/robot-detection/Manifest
index 94eb0d9af22d..04121329b6bd 100644
--- a/dev-python/robot-detection/Manifest
+++ b/dev-python/robot-detection/Manifest
@@ -1,3 +1,3 @@
 DIST robot-detection-0.4.0.tar.gz 81090 BLAKE2B d8422567119a633e1f97586895191a5f331e7800db596b204cc6e7a0b44efee1ffbc0e4941911a1410be329126997f59eebb63441e12196feaf5ac8000b1434b SHA512 10b1fbd2307c375e3cd067e43bee1bc0ff71f4b83ede9b92d2fb8d60edfd6d4a8d1a4d06d74e3c0653056f2e2b2cb81a7e997047093e925bd79bf4626d33d85f
-EBUILD robot-detection-0.4.0.ebuild 427 BLAKE2B 02f9a8faabe7e47d9f1eade15b7cf51e8c5dff4862f04c7247f6db01e95ee73c6308b32a9e38b2cd9730f0d6e2abcb54f4c40445a4c84843ae4037fc5c7933cd SHA512 0a5a9397772301ff31b7fcf2335ba896b73c5a35aecaf56ceb2ef318b0164b8a364a088f28823bfe3d9569c1f0a134382cf611f66d29530f0c1e0bf925a041be
-MISC metadata.xml 355 BLAKE2B 59004a315be944b2cfe6dc508547e2c94ebb125d68aa3944ffaf7fda940d6a81a6dbf5a03b4d04e757e3a0e45d41f340d73293c67729467a5931a55c4400a767 SHA512 bfffbc5958c8ab8954dd4b1e48b16e90107307c39abdf88141d13a92a038a15872f5f69a16a547d33f711373539bde816df72f744bd7be283f70be61f39d469a
+EBUILD robot-detection-0.4.0-r1.ebuild 504 BLAKE2B 52bfa0064a88a1ceedb45b0127aa8271e414fd81fcca6d9ac23193a1e8605852fdecb17c32b885b3e45c1280a96184ef8dd0ef7338e2102f893017d35afe7fb2 SHA512 ddbb33d1611a2d707b2b88c39131cfd4ebda74050e0987e1fb5a07eb50102f473a3bbc73c408c587abade16caeda2c28f51c71ddf5e085600c38bccd6da0c7de
+MISC metadata.xml 379 BLAKE2B a9f17ae015f87e65d2c91e6f998381471dae4fcf2888fad8575e8139b164db457e832b2b5d73a25da17e11db2e7772c3226bb51d6daf13f2640fb65c3c6a5574 SHA512 626339e312e88aabbbc30b382c5dceb0b8db29813b8d64750eb4ed921d15e5327401d97f7a1e35b0c30a4b4693d5ac52c737f868e1872c23d157364c3c8fa934
diff --git a/dev-python/robot-detection/metadata.xml b/dev-python/robot-detection/metadata.xml
index 3586f94478b0..77b8155fb3c3 100644
--- a/dev-python/robot-detection/metadata.xml
+++ b/dev-python/robot-detection/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">robot-detection</remote-id>
 		<remote-id type="github">rory/robot-detection</remote-id>
diff --git a/dev-python/robot-detection/robot-detection-0.4.0-r1.ebuild b/dev-python/robot-detection/robot-detection-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..1e1542c360f1
--- /dev/null
+++ b/dev-python/robot-detection/robot-detection-0.4.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Module to detect if a given HTTP User Agent is a web crawler."
+HOMEPAGE="https://github.com/rory/robot-detection"
+SRC_URI="https://github.com/rory/robot-detection/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/robot-detection/robot-detection-0.4.0.ebuild b/dev-python/robot-detection/robot-detection-0.4.0.ebuild
deleted file mode 100644
index a581ad559595..000000000000
--- a/dev-python/robot-detection/robot-detection-0.4.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Module to detect if a given HTTP User Agent is a web crawler."
-HOMEPAGE="https://github.com/rory/robot-detection"
-SRC_URI="https://github.com/rory/robot-detection/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 99277c24c3f3..570075036d0b 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,7 +1,9 @@
 DIST rope-0.19.0.tar.gz 252902 BLAKE2B 41760dc29d26558bdf5f296238b7d59ca949530826953fe5592b763b8d24fb49a90a56b9c7d0e3475daf145185987116a7dd0cbfba74829abfa4bf6a57c79937 SHA512 fd41777d76861837479bf0777ea42cc052eed7ba396bc4531a0c7f101b05b1c5a57c300950b7a3c8a2902e28ff049d146646f83f8a8a447ab9ccd7cd8aa48110
 DIST rope-0.20.0.tar.gz 257356 BLAKE2B 054ab1fd1b8ede2576c83eada588fb04827cfef570b2cd30461e1b12b3a42d601aa1e60bf1428a54b4d74127a561fce3f34f064b8018943fd1e6fe5c03764a5a SHA512 d84e2da66712da927b6dcf0ea40c50627002baebfd93585dbecda32e6ce0682fdf13577769b12890d31c4f1022795ab98c2dba25aa23a8b434762dbbcab974b8
 DIST rope-0.20.1.tar.gz 257811 BLAKE2B 58f11c02e68e08c532d08a4b36c08316afb42329f10ca67f7f73f0e19ef6b09aaf4b4e4fb1e90cf0af61c9779efc067e42945f9f10cf0abe4ff82b8cb3c8b5f6 SHA512 328016e711a7d684fa316b3eb8ebc233bcdf579d2545d038dedc703be82e6d5b4a8af8a9fba96569c84b9cab4450a139013ec25ae16a082c699920ea9096ce7f
+DIST rope-0.21.0.tar.gz 256456 BLAKE2B f9ed997933794caaeaee7c9951ea46c1fc50983f93433b227151366f720198f96966faa28993d2a8a54e667a34cc318c322068bc47fd38789c9604aea9586c53 SHA512 b1b882087b235849b04beeb85c253eecdcc06e0d75ba54975db9c4e60e68178f7acb87a58a9a24dc942994cfbfc3662e05000d00965278697b0db412411b4c44
 EBUILD rope-0.19.0.ebuild 933 BLAKE2B 3c8766ae480e454a83e23feab1f65c60d3b9e3c0313272d29841a7cbab264077bc0011465c9646d28cb7f92adb4d2aa28a66050656ff60a42d5c2f539ab17c10 SHA512 4d78f475501069670e67bedab9dc837a42da9f3fb0acafd1593f6cb926d656f398b59deb860aebda8f764a2bb71a8d52ae291b1a5c8ddabc3be5ad8fb20eea12
 EBUILD rope-0.20.0.ebuild 992 BLAKE2B 1b7e18423c23a88800d7018b0bac2516c78ad1b383cfaccdd5a3547696f81d45c55fc4860a647318e69b0994de5cd855466ba616afee2114131870bca722588f SHA512 059f1854f520dcf4a481d4accf6e467b6925bf5bdce8aa97865ace5afd498a504add877843b090fde0be70ebc7de6a79e2543048bce01ba196facd940af1e877
 EBUILD rope-0.20.1.ebuild 992 BLAKE2B 1b7e18423c23a88800d7018b0bac2516c78ad1b383cfaccdd5a3547696f81d45c55fc4860a647318e69b0994de5cd855466ba616afee2114131870bca722588f SHA512 059f1854f520dcf4a481d4accf6e467b6925bf5bdce8aa97865ace5afd498a504add877843b090fde0be70ebc7de6a79e2543048bce01ba196facd940af1e877
+EBUILD rope-0.21.0.ebuild 992 BLAKE2B 1b7e18423c23a88800d7018b0bac2516c78ad1b383cfaccdd5a3547696f81d45c55fc4860a647318e69b0994de5cd855466ba616afee2114131870bca722588f SHA512 059f1854f520dcf4a481d4accf6e467b6925bf5bdce8aa97865ace5afd498a504add877843b090fde0be70ebc7de6a79e2543048bce01ba196facd940af1e877
 MISC metadata.xml 452 BLAKE2B 6bee424d801bad8728f10ec3a1618e3a48776a7b0af2a04efafd07e6ae5ac8e0b88253ebc35e457c791e820f8c3b1dabde73aabbfd3636cac5e169e8aca75aa7 SHA512 4f88e1157e4838f321b6f208ba6b89fbf2b7a72ea6e038cdd6cf3e9e211c2788dda137e3adf76072c1d52026c554750193d9938054670dd995a91db24ea8da76
diff --git a/dev-python/rope/rope-0.21.0.ebuild b/dev-python/rope/rope-0.21.0.ebuild
new file mode 100644
index 000000000000..b734b2e0002c
--- /dev/null
+++ b/dev-python/rope/rope-0.21.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python refactoring library"
+HOMEPAGE="https://github.com/python-rope/rope"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+# Dependency for docbuild documentation which is not noted in
+# setup.py, using standard docutils builds docs successfully.
+BDEPEND="
+	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_compile_all() {
+	if use doc; then
+		pushd docs > /dev/null || die
+		mkdir build || die
+		local i
+		for i in ./*.rst; do
+			rst2html.py $i > ./build/${i/rst/html} || die
+		done
+		popd > /dev/null || die
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index db3698eb8dd0..57d9df8cd23d 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,5 +1,3 @@
 DIST rq-1.10.tar.gz 598643 BLAKE2B 503c2e45d134434373eb89ce205dc1a82f16e0281c1f872046d51538b3352b0ffeeef72f64991d093f271c276c1a8a3be92fdda4d7db3e083549f69ea7a04560 SHA512 7e2de3e36309eb3c095d34c28d9cba340d0699b8b4b457491d12420bfc1370e0336dc10f4f1115e83ac0ea8884500750895417f8b5c2090105d3c9e32d1b5bec
-DIST rq-1.9.0.tar.gz 592217 BLAKE2B 831fbc7a3fe23ead59041e2556d37e4aa885a21bffa9aeeb0765382e84b56a2ee6d34a864cb03a9a12274c8ac80b714f10a7752d0bae7a79b8e2e7149be4aea7 SHA512 a2ec7b05fe1dda983cfb30182401c6e5367c54b7649ddcb1d3c6d0f0a5f6583665b39ed7c1cb6bc37d067926f089e3fd80ea7558856233edc1bca8234aa728aa
-EBUILD rq-1.10.ebuild 1369 BLAKE2B 98a7ab255f22cf5d5f4f11df45f6a494783b28fe56978c394d6091e668d9cee3c810c07ed357158a3442be1c5e6d5e6edb0fbe87b6e73807d3dcc550525dbc06 SHA512 9535651198d5c58beae27b1b11d676715044148d4ef2bdab31909bb81094084c6144cc429ed857be511177e4715122a3ac41a44026cb6ddcc086452d82a81505
-EBUILD rq-1.9.0.ebuild 1365 BLAKE2B 7de1a6f06cbead680e3ac63c3dd2a318a4e539757c4fb09120cdf04b3c7118d5c01686accf23ac4d29b038e637047acd8a5e1f02d4bfd4700c0e587c0262461a SHA512 9f2ea36361e71c986f033df05739836d8653a103131d6839a62b1212d07ef2ad4ded188c63c592d97def8a73b1fec7ae1715f7884e40a792d1a059a5937720e7
+EBUILD rq-1.10.ebuild 1365 BLAKE2B 0f65cd076e87bd75f20ce156741081fc6d586ad11a4e5f6b1fdbc8cf72e0c7a5fd07aeabf7a0f4225cdd24ebb73b266cfc6cdcd8b975a618119634a752bc3495 SHA512 71f26da6d8b968188a815934a7b3f4917e1758842bb9d9e11f381aa25d876eb248bffad7a0cd71663e18d1cccf6663fbf2fd8fe34b1d31ff3e39cfbfa1c21ebe
 MISC metadata.xml 453 BLAKE2B 6a46d43b524fded1ad4749fb9669ea07f8b3e23940d0bf2a4db5d92564316b01fdfbe220771e30b1a110ef72c613ad683cdcb7940682ea32198a5b6f027e4db3 SHA512 104ef96c34b55a9fda377c1304ff85781219fdbccef1a83d1bef30cb2fbd0ef816cfe82715af8937f452499135f7ed65c65a29c34919a09b6144ada367c26af5
diff --git a/dev-python/rq/rq-1.10.ebuild b/dev-python/rq/rq-1.10.ebuild
index 165a441d99e5..c21155fc3464 100644
--- a/dev-python/rq/rq-1.10.ebuild
+++ b/dev-python/rq/rq-1.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/rq/rq-1.9.0.ebuild b/dev-python/rq/rq-1.9.0.ebuild
deleted file mode 100644
index 2e4b2930dc94..000000000000
--- a/dev-python/rq/rq-1.9.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
-SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	elog "Spawning Redis"
-	elog "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index b7bc6093c620..df780d03ba0d 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -1,4 +1,4 @@
 AUX target.service 330 BLAKE2B 81d01885925feeef2a1fe9214b520d0d4035b971fea22f4efcbe295a7316568cc6b6e152aa53a7e7defa602e55df61c3a06f3c028ef20301bb0032a4c919a43a SHA512 3c634f1c466d0a8c3dd2b57a230438aaeeb0e66324863a2ded57dd69a2ca5946f83c4ab511766f510f3e63b43aedcf7e368bcf5bc325ee69c016bb0bb2612de5
 DIST rtslib-fb-2.1.74.tar.gz 73919 BLAKE2B d16527ed1efae379aa976929d8e6dd8a13cb1d47eb8efe8897ee495b0864225f520b42bd27fe502a1fad11369d20690b9751e54ae7a328c60917144114358d24 SHA512 b0b0722a5a7e10af698ae0570a65b51d7f091bfcc370850dacb3087471ca98bd229b4a5ed73760b7ed5bbee1b53dae4781cc2b3d5e7a1ff8ce37c5c144477852
-EBUILD rtslib-fb-2.1.74.ebuild 619 BLAKE2B 20a9a7ab18d34c033d3e25025e38b0d3e262241c31b46779a190857f2c6b927083dcd7c12b7d5eeb8da83fbbd7902e2f2d0a8423835698c234f221cac7e989d2 SHA512 07791f380e0ab25e931a77270e09eca4201705e7b56f3430f5f7bedecbf324088045e62235f8872f20a94d901288523ad8f42754d4955c2a279cc465d7051d2a
+EBUILD rtslib-fb-2.1.74.ebuild 620 BLAKE2B 241f8592c90e6a617cd2a4684e890484e8b4835b7d314067eadb855c5f80b1d7bd988febff9c4b86c00a5e1371e5c1b400e136a24f11da0276e624aa06213902 SHA512 0c31d7fa55e427b8f2cdcef8841d3b4267ce106d890c146287e73c5b57dc2c7f8e16cd4c1d38532a89d822e62c2de48554a38681ca331176deb1e602c22e681a
 MISC metadata.xml 736 BLAKE2B 64b99b472db20ec267f4aa40915fe347e1e74d18ff8914707714cf73cadf7999bb81521b4a801b17bfd4bb4463c63419792e1b9c869deed9181de540a9c8e30b SHA512 fdec71348b4f944de9f009571f8097a1758ef0a6072571b3fac21b6dea7330626a06cc9e72447a8efe0425bbf7a24d08fe10b193653cffef9195c1acdc997a42
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
index 10152c46a1c4..e56087cc7806 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1 systemd
 
diff --git a/dev-python/ruamel-std-pathlib/Manifest b/dev-python/ruamel-std-pathlib/Manifest
index ced694899bef..b6cd8faa63f9 100644
--- a/dev-python/ruamel-std-pathlib/Manifest
+++ b/dev-python/ruamel-std-pathlib/Manifest
@@ -1,3 +1,5 @@
 DIST ruamel-std-pathlib-0.8.0.tar.xz 19068 BLAKE2B e1709bf5af17a843a7f5aec8009c4ec337cd1a4a526315e8834924909613eb5cc50c2ae1a1acc74c97a876fa347767dce627f2dba1fb874032f0989f7ee6599e SHA512 eecbb43e3867d8ccb166a0d528b3d7cfc04ed6f2df5e2048ccec4d7fd36117ac4a3984d4143025f6b7fd51867de879fe02e5dcbc4b275fd40cab1609bcf69536
+DIST ruamel-std-pathlib-0.9.0.tar.xz 19340 BLAKE2B 1ab661f3dc4cb75eed20426256f5c14fd9c3b44894c343dd55bd53dbb811eb90ea90ff8c1056b0eb4a5d186521786e22e42f8db48d8dde42885c72f34f8e3782 SHA512 ba551b3b07db87e46e059ddf17b0768283e8da49c7ea5bb252fba6ca611bb69d160fd6a3d3557eac0606b8aece5ee21aced2889609d95cfeb6f59473d72a261e
 EBUILD ruamel-std-pathlib-0.8.0.ebuild 834 BLAKE2B 8b3946828fd31a9c348419957799201daa50ea231dc992f95cf493e54b265a3e220deeefe73cf6e632c4a8668642084a05120c60401e4de52ba5656f638cf350 SHA512 02e60efaf48c4c183e6f669f8d1ade848db61d874202f3cf3898fda8fa3c0710d61dcd93563f42057926708e6e8983c3f5c5f1fdb139a2a298293da1e834ebac
+EBUILD ruamel-std-pathlib-0.9.0.ebuild 839 BLAKE2B b6f22a4f98e71e7010044583ed0e445444a82aa86ea305b9e0d24477049a12c505aa6521f115648611a4ece700f2bef0739f44e0606f95aff404552c248b0b35 SHA512 c21631ac0c4c917f3f379c1961aa480feae33c89785f9a87a5c557ff93e70b1aae851d35ea16c8e280406bf9fa67d85ad83fd8f2587a62d5fe325af6d0948eb9
 MISC metadata.xml 784 BLAKE2B 9e97233748925bef8e9a6a3021ce349d1467e671d6fcc6dc29c336e06d962387bb2b3ae8d437c0ba7f5bc8b34115dc3bdb83b31d75df65385651e16f8dfe1f72 SHA512 8aca36faf20dccd2c56f28d019d9d2181a2165d0143ef319fe1f43b1a877fceb03e19b720938d89d957ebb1c35f590ed8b145f3c650727686820ab68bcea8e9b
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.0.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.0.ebuild
new file mode 100644
index 000000000000..4fd8a14ac317
--- /dev/null
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Ruamel enhancements to pathlib and pathlib2"
+HOMEPAGE="https://pypi.org/project/ruamel.std.pathlib/ https://sourceforge.net/p/ruamel-std-pathlib/"
+# PyPI tarballs do not include tests
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="dev-python/namespace-ruamel[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sarge/Manifest b/dev-python/sarge/Manifest
index 8f5dedb1474f..fc5d522648a9 100644
--- a/dev-python/sarge/Manifest
+++ b/dev-python/sarge/Manifest
@@ -1,5 +1,3 @@
-DIST sarge-0.1.5.post0.tar.gz 17860 BLAKE2B 484a5498a34a1e5ffa313ba012271898fd7634faf42a4574fad86c8252005ee91511f7c7e2c34c8836daa4e07f5558afcf88473ef7cb8d90c3a8e2b03ff32e30 SHA512 b2bef7bc3d5b4f5540f77cd3ed26342106557498b556ffbcac6aa74e69b719bc2f132ebc6f99d6539c1ce539ca3c7c45bf0735960b8a25ea6237a4a1a8d65a72
 DIST sarge-0.1.6.bb.tar.gz 55320 BLAKE2B 2a641f43ea57ee3b22668dedcfa15fa5e07e8b8d8630e3764739254fb109d61eaedfe8e6e059c43bd22760d822a8cf251616108a6662e9daa2e79a0e35443cb4 SHA512 8cf77141f516297cfc029b6255618f497ab94453214e61ef280dd571019a40f461d81ab9bb793b08de2dae89832e50aaf687205814b22c305e03883b9dc3bfea
-EBUILD sarge-0.1.5.ebuild 506 BLAKE2B 9c68da046480b70ffbd175f667d9a11bfda9c977c1961b417911ab5c04068e88d6bdf332b821c26107fa78b53f7484ef3f06d319165a15370274742750b27d0c SHA512 974ae6a1f750a053ef38454a3613baa5c7e9ee96109b7dcff12b0f909651a9306e160b94c049db67d6cd447a9dfbe4286c2b9752590edee17176e9e6c72c593a
 EBUILD sarge-0.1.6.ebuild 625 BLAKE2B 8ee081368b78c4a9f72ed6bfe53d4d45b2d0a0e6c0115ea87ef6e904a9cb257dc0bec4ca31b288dd595eab18c4964b34454cd2d1c68ccd92efbf88ae95c14416 SHA512 6f981030d848e1ced990340c49a43f3295be310be3e9f913c9423b92dc64977dad6e72e6eaf1d70250bf18686549e6ea6d06af764870514c13468d5c0e520dc7
 MISC metadata.xml 317 BLAKE2B c9f25de58008d813f0738c052a2cf19c7941642d2ceecd4b2ce9ee5420a8ca43b342336ec4886c2f19d3defacdd6f874328e30679e4a7c606c4fc184a79414e1 SHA512 82f7baceb451ed047db986f58acbca45e6c1562cc59d19df91c79589e5791293146e3ad2753478702381b74df55b38f30baf83c10ad8400952b1fba3e17eca4b
diff --git a/dev-python/sarge/sarge-0.1.5.ebuild b/dev-python/sarge/sarge-0.1.5.ebuild
deleted file mode 100644
index a568169d55f3..000000000000
--- a/dev-python/sarge/sarge-0.1.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-MY_PN="${PN}"
-MY_P="${MY_PN}-${PV}.post0"
-
-DESCRIPTION="wrapper for subprocess which provides command pipeline functionality"
-HOMEPAGE="https://sarge.readthedocs.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 214e9322bca5..93d173f84244 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -7,5 +7,5 @@ DIST scipy-ref-1.6.1.pdf 34594740 BLAKE2B 905ddcd7a3d462b09ded688f0818204d7684fa
 DIST scipy-ref-1.6.2.pdf 34599668 BLAKE2B 9ae3221c814eb0d1b1e9191e08000955af503f6448cf8b5841e400fad106c658670339219f4838bd312023601776fe0b0d123ebbd41460c478145da2ac3e9989 SHA512 9aecb7ca760805c470c41121268281c9547aef35ddf078816c5e48f7cf4912a67cf622e267152c6cc823df9d82be1f3a875d97469169d0d91d6219164c130c88
 EBUILD scipy-1.6.2.ebuild 4145 BLAKE2B ad4da15044f02436a9b736ecc41761b4700f2c35b57bbbb4c82cc78219c3bdee7024e4370b4c2627c484b0cc29bca26d6b6178abe19c6320532632966b451fa7 SHA512 eeeaa9bfb5312992d7d9528d60ac0831c5502b051783b85455c230a01fc889baa24ab44bac272c44e7dfc4072fd083fb5fb18c525c58c58c1657be5db9e37c5e
 EBUILD scipy-1.6.3.ebuild 4365 BLAKE2B 5b632315b3c539e3d859341bfaf1aa0dd7d5e8a7f5ff346255bca3a734830d9eea5df453ea61fc5778ae270c07c266883e2853ad6fd6fce9f47d6fbb55663b63 SHA512 d4cf1798cdc8bba3e4d95520be7418f7db158b485f6092c440930e1602f2d1c3a253acf338498e8ecb70d5ed7d02a4d22dbe9c53ac51f19401f977f3cf7c0e2b
-EBUILD scipy-1.7.1.ebuild 4250 BLAKE2B 988a2ae9c25b5a03dacd481ad6feea17bb861b816dbcf27a1cb96d510ae487ceb4aee14f6e408a5c4f9c985b7ca360308d94ba625e3967fd6356f4d7b1d23f93 SHA512 209c8efb61f632794f33291b5b75c48bfc584a17676fbf15a0891b09ce1d3de1eca6a22bcfea49fc7f552775ab4cd013543ce5c7bed2cef746401d0ef42a6f92
+EBUILD scipy-1.7.1.ebuild 4264 BLAKE2B 8e3154cd9e27f288678c5e6596e70213d87bd33986cbc354fca83bc135f9437174f8920bfa40b8462ff92d63fcaeeea731ccf6842ff97008e6913319d0678b5b SHA512 ef4b2a84c08c587bf70da636211b43ecfe6cb187b9356e12493a3a10b50dca66b2e2a1c636953b9ee036746e56d849a8a194821ed8e353670a049e15a909b9d3
 MISC metadata.xml 1039 BLAKE2B 74d7919c947e4efbeb597dba51ce74b9e2ef995a1e06c0db7fc7c13dcfd0c175afd0b9bce04907274e4eeab2dfcc49f0eca81ab71f76873817f3b9a1ca8ca196 SHA512 c0024d9accbb563f13ba22b32c95881118fec0ec0a68ce498a39d6bc63e13cf2c7db903132481e3b4d085757c5aba8bb4959780d67fd33db5b161a149e18c643
diff --git a/dev-python/scipy/scipy-1.7.1.ebuild b/dev-python/scipy/scipy-1.7.1.ebuild
index aa46f916dca3..d2dc22464cf4 100644
--- a/dev-python/scipy/scipy-1.7.1.ebuild
+++ b/dev-python/scipy/scipy-1.7.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="doc sparse"
 
 DEPEND="
diff --git a/dev-python/serverfiles/Manifest b/dev-python/serverfiles/Manifest
index 4c0fe9ff22b8..559e713b374b 100644
--- a/dev-python/serverfiles/Manifest
+++ b/dev-python/serverfiles/Manifest
@@ -1,5 +1,3 @@
-DIST serverfiles-0.2.1.tar.gz 10506 BLAKE2B b653248261f05b20fa65a566e29065e97679383e44d3e8c05d10d1601376de2c39e1690a7ec1b1b3c680f407086294ea0769e030702fd01bff8833cc32889b8e SHA512 80512dfd8381f12aa143a88fb656bc7dca99fbc3c07a0b6cd9c7be8477de984a5121ffdb2f4cfe0f2150b83100b68ee478cfa7f26ea2f29e4a6fb7fe4eb0c18e
 DIST serverfiles-0.3.1.tar.gz 11726 BLAKE2B 5e075a816d510301af38642175530bed7fb785da4ada682b1249f993a5e8974a89f301e63ed307b4882df867641fa123065ae249dc6e48b1210665fac283d3c5 SHA512 424b99e3f0bcf97120aaab5ffcb6e08284d9a5f5caf614f4dbc41871b6aa637e39bcb5696ea593a09387c41621617079da939b6ebb183e64f878656b4d8071a9
-EBUILD serverfiles-0.2.1.ebuild 613 BLAKE2B f597d2eab4fc4c1184d916740a70926d593c480ea664c3cfb214d9100e8f9e092716f87248945b01dbcaccfa4cb12d90c5152a137f33b4b501cfcf86d8f1de72 SHA512 47dd8d4271ae3d65ad687ddf2e094a2b8db1b18697163b94f49bfc799642a90a608eae5462c52b6134338160cd0798b68ad43f4bc3bcbaae05e66358d0742c9b
 EBUILD serverfiles-0.3.1.ebuild 546 BLAKE2B e91b147197932e78498967e144c72a806a4b077a176d8b634c78a9183ef2b317ca960ddd3559527059d52f5a7be7724bf2157d7c5df648b71d43a24fc93dd60a SHA512 e1bb59a76199444264f6b9734c98cb4447ea027c2b8e57271b1b3154f7de27d78b1f6360d4595313857041d18a653280e433ffa53977e2f31a45496650b9e7dd
 MISC metadata.xml 417 BLAKE2B 18c672c3f26977a59fe0dbb70da8e1261ec044ee25c4bc703baeea41675f1b5040171093797249e8235dff3d1c6e8269a2acb76f44dc4abb7314db50db93add5 SHA512 bb6ef62f259df7f40869a959eaf979662a20718eb2c9ec700ec242f96a19b4b009d5e16183b2083f005e390786ec3a58d7e507370446fc44fee8fc7cd3fa7cfa
diff --git a/dev-python/serverfiles/serverfiles-0.2.1.ebuild b/dev-python/serverfiles/serverfiles-0.2.1.ebuild
deleted file mode 100644
index debdc443f0a8..000000000000
--- a/dev-python/serverfiles/serverfiles-0.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Utility for accessing HTTP server and storing files locally for reuse"
-HOMEPAGE="https://github.com/biolab/serverfiles"
-SRC_URI="https://github.com/biolab/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/requests-2.11.1[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 1c424535e125..3dadc9e83464 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,7 +1,7 @@
 AUX setuptools-57.5.0-syntaxerror.patch 1364 BLAKE2B ce5928c3ed54bb2f2211f5bc6c57b35e7baeefa634e008ed84c48022dd74f4db663cfc588743b4ba217e4bf33e1467f4010994a8f89029ff193182658158dacf SHA512 2c126cecc92550b15b990e7eb44c584cd141a5a60f1b96783af72889ed7fed5d6de16ccd53970eef945114d530c6544e71b2e69dc2218f6ad32ffe8942bebb6e
 DIST python-gentoo-patches-3.10.0rc1.tar.xz 8112 BLAKE2B d6f9b44c5a231f447ffe3533afbcaffe0f3b8bdd5a6690f1854bd7e1199d036d11a4cf4abfae345a88c42740ccbd4b72e53cbe28aea1a5db39dda1e5bfd47229 SHA512 bba7045f56369ca0354a539f8478a1afed77dc89a9faf548a0cf8959d644360b0afc4f84b95151ebfc2a6553078322c7445073f7a4104e9cd639ccc86ad0f792
-DIST setuptools-57.4.0.tar.gz 2141309 BLAKE2B 89b386b6d5bbac61df400f60c91a0a9b9ee381aec7d2f65a856c317c7b0b5512c5e9aa8844c0e64f1840a8e954ae22ed542ad97a104d5416b1df2ac02351809b SHA512 7fcc297ea3e6310f2ec8ba5bf0d509e3f4acbce6bde7e5f0fe1b022c147cf88a047471bd4aa278724e86ebc6be800015fb935c7a31dbb6a0801a2d380ddd89f2
 DIST setuptools-57.5.0.tar.gz 2141727 BLAKE2B 54c065e0bdcb0c3a0a76026d78ab26615e07ee013e684ef18c3731757a38efe38d21d4c99b687595873679d77ab8381cccc483847467c98eb7086d9cac5bd8ec SHA512 9dae7cbddcca0859d128f528232c2ab6baca2b4447bba129a7bbc014c98a8ecc866cc71c7e93900bb93ea4bbbe5e398c1c3b4a4867afb2caf2c38a2d5a46d67c
-EBUILD setuptools-57.4.0-r2.ebuild 2909 BLAKE2B 13033ebb349f763c7901dd8f87268b54e54692acb244e3fa54a0abc0d7e2c0f54c36f58172a8985542e4f1cc35adb500c0c3fc8c5f456f760ec0cc9a078e5f54 SHA512 55889a71314f4748fdc6266111475bea568438da1f173d57761d569b5841c9c26ce4a85e105dc64d1f751f341c5a18f7468de2380ae3b77ed9d7c1b63b23ca57
-EBUILD setuptools-57.5.0.ebuild 2981 BLAKE2B 42149e1d1d273654b7b6c7c2a7da4904f294f28bd28c37358112c7d54a019ef9f05b5642407817f7b3e440020a8aad80d38b7ab37bba47c6b68cad5f44e871e9 SHA512 fe208e8166fb17a092f565eaafd63bb8a17470864aab03f5c077396c687f40e9ee4c2ccbb341f6668a9aa0172825a75abef76fe8f1ad3584e0033246fbd89f74
+DIST setuptools-58.2.0.tar.gz 2268140 BLAKE2B 13281c3b2ed664fdcec77117cded285fb5b608036c19715c7c786734bb04cc02bc0f300a28e7c49967f695a6b706f9413baa33d99ac4f1f957522136ee5857e0 SHA512 028c9d9533f5493ff89c80c705ea002661a70e0e43afecb0c7546029990ae599e16fad7248ffc29573c18c6aeb33f1bba1fde09f25fe04b74717ad9308ce9cfc
+EBUILD setuptools-57.5.0.ebuild 2973 BLAKE2B 3442ccf93ba5569395c7798e24b891c1260aa71117e684daf82ac7768eae617476867b90d548d9a537a1ed4127a9e7b42931318be71d66ae9b8d0d81e078e11d SHA512 89a2e9ccdbd3671e4ecf1a6f93934c729e761e956ac5e30265afed687a364145dbf79193b16e8f846f8bda5523e22ba4b4bf5277b2d9b3fdb1eea2346eec2789
+EBUILD setuptools-58.2.0.ebuild 2888 BLAKE2B 44a2275c680e522e300006dbbb0caedfb93262f7ef37288af55f63f86f92b26ecf8a0fc032461561d96bd50e698f7e2741acfc6c2fa3a504b5b71dffb023c186 SHA512 2fceb8e1e5f3f80be236d8379b6b8608ccf740d9a9ae07fa7d86522863335bb7b0057f6240af13c57162438a662e62f8d65a18be3e0e5c6080d13723c07b2bb1
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-57.4.0-r2.ebuild b/dev-python/setuptools/setuptools-57.4.0-r2.ebuild
deleted file mode 100644
index c27ab3194b75..000000000000
--- a/dev-python/setuptools/setuptools-57.4.0-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.0rc1"
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz"
-
-LICENSE="MIT"
-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="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/jaraco-envs[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{8..10} pypy3)
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# apply distutils patches to the bundled distutils
-	pushd setuptools/_distutils >/dev/null || die
-	# TODO: distutils C++ patch?
-	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
-	popd >/dev/null || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# keep in sync with python_gen_cond_dep above!
-	has "${EPYTHON}" python3.{8..10} pypy3 || continue
-
-	distutils_install_for_testing
-	local deselect=(
-		# network
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		setuptools/tests/test_distutils_adoption.py
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		setuptools/tests/test_develop.py::TestDevelop::test_2to3_user_mode
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest ${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		setuptools
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-57.5.0.ebuild b/dev-python/setuptools/setuptools-57.5.0.ebuild
index ebe5023e2357..27e68a3d4830 100644
--- a/dev-python/setuptools/setuptools-57.5.0.ebuild
+++ b/dev-python/setuptools/setuptools-57.5.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 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"
+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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools/setuptools-58.2.0.ebuild b/dev-python/setuptools/setuptools-58.2.0.ebuild
new file mode 100644
index 000000000000..13e77de865de
--- /dev/null
+++ b/dev-python/setuptools/setuptools-58.2.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.0rc1"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz"
+
+LICENSE="MIT"
+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="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/jaraco-envs[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{8..10} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# apply distutils patches to the bundled distutils
+	pushd setuptools/_distutils >/dev/null || die
+	# TODO: distutils C++ patch?
+	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
+	popd >/dev/null || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	distutils_install_for_testing
+	local EPYTEST_DESELECT=(
+		# network
+		setuptools/tests/test_distutils_adoption.py
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		# unhappy with pytest-xdist?
+		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 26bbc16989f5..78affc58dbee 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,7 +1,5 @@
 DIST setuptools_scm-6.0.1.tar.gz 51433 BLAKE2B 7045eec0c1a43d6c93c94e0b2799f0d000cda509fa0df9ee9a638b95383f07fe430b07c3bf72fdc4809563ac289521976956f728a4b2984921fa31532bb7ed8b SHA512 db27653c57f674ec62689247680adace3779216249f1b09a35e8a0233a1ec1acb9ae89b52acd439f7062da2ba1a45b8c0d6d81333ddda0764447c30698ddb314
-DIST setuptools_scm-6.3.0.tar.gz 57117 BLAKE2B c0190e4d8f10f05fb6413d651ca15133cef4474bd460ab3bdda4b81d3410078cf9cf20e40de042bda29fe0b99c409b6d934c3d6a648350688f5b4496eabecefc SHA512 c3751d27345b9423b9fe7eec15fbf6c3e3bc19679b7960a589bdcb729a53b5dba40be27878f87dc0d908fae190ef8db76ee19379e0d6dd5cb00b44950cae3896
 DIST setuptools_scm-6.3.2.tar.gz 57207 BLAKE2B 4291f3810dc5ea111a6bad1bf37c8704a7eb6cdd112ea476d629d6175c43cc7d8f78d450181c0e588a5f3fc0fc092fedb41fcb6e198a42f730f9fc6b8d96e343 SHA512 9a16552803ef92367ad71007cf322737b5baa58b924083f04c860875bf6cb2e2bb4f43a7f89778b040c2eb55c5d32de479a918056519339820c6d0f1a6a386f0
 EBUILD setuptools_scm-6.0.1-r1.ebuild 1127 BLAKE2B 886f94979ac7cf4a2b00b43c84f07678a9e4d9f843594548feea98b14a3409fdf8ef7e3c3475e0766455ac8eba2f14f9d03120010fb26a64ee7f644f6aafa113 SHA512 28b1b9e84181120331a6288893423c36cf00febb5ab439bc3927e5be702d372e89a23ec8dc22e3a78ca547a1fba581c12431dcf3baf5c3d828b0ae565b0b7446
-EBUILD setuptools_scm-6.3.0-r1.ebuild 1120 BLAKE2B 352f0e4d4f8d03c4d4bd1dc6923f3a360ac06259bd5bce48b56db5f9c3b555043eec98c7f5821929742f10f5eb1510737ff0b47110ac427a674f132dc7e78700 SHA512 0b2b6aa0de8bad2aa9fd8723394286f73cd84fe4958bcacb38226a5a242a8b492f77439b277daf57a6407c1fd56fc4fc61f5cf12eb765a19c4c8ded49743bef7
-EBUILD setuptools_scm-6.3.2.ebuild 1120 BLAKE2B 352f0e4d4f8d03c4d4bd1dc6923f3a360ac06259bd5bce48b56db5f9c3b555043eec98c7f5821929742f10f5eb1510737ff0b47110ac427a674f132dc7e78700 SHA512 0b2b6aa0de8bad2aa9fd8723394286f73cd84fe4958bcacb38226a5a242a8b492f77439b277daf57a6407c1fd56fc4fc61f5cf12eb765a19c4c8ded49743bef7
+EBUILD setuptools_scm-6.3.2.ebuild 1112 BLAKE2B 10dfe6ae791d4b743107fa95c3a2b99313a92f1c3048f70fa55b7050b88659913f035cf634f2cf61cb7a0e75c78c5fd04c8da38c7b5818960502c38fd0c042a1 SHA512 3cb125a79041f94afc94f876d3d604e38a6c139290cc246aad7d13450224c2bf9a3bae0be9f02625a16be11a2b0a57cbb6503d7528e9db6b328d31dd637658d0
 MISC metadata.xml 401 BLAKE2B 288e77f725debab548d96fa06738fb8262a93deb6df1ecc6c0a77e4a30cd65c4e76e38e86f8101112db95dd67a11ada6c0659e1ac13cf3c0e65dcce44e19bf8a SHA512 61b009eacedf191242659d6be6f62d17f9335674c651cfbdcc88abd074e320ddd79e1610de44e7c8105503f6d8d058ed5910f63b2e740492a982a69c52b30730
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.3.0-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.3.0-r1.ebuild
deleted file mode 100644
index 11ac1212f1e3..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-6.3.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage versions by scm tags via setuptools"
-HOMEPAGE="
-	https://github.com/pypa/setuptools_scm/
-	https://pypi.org/project/setuptools-scm/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-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"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	!!<dev-python/setuptools_scm-2
-	test? (
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-vcs/git
-		!sparc? ( dev-vcs/mercurial )
-	)"
-
-distutils_enable_tests --install pytest
-
-EPYTEST_DESELECT=(
-	# fetching from the Internet
-	testing/test_regressions.py::test_pip_download
-	testing/test_setuptools_support.py
-)
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.3.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.3.2.ebuild
index 11ac1212f1e3..122373658933 100644
--- a/dev-python/setuptools_scm/setuptools_scm-6.3.2.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-6.3.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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"
+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"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index 35690300c561..6bc060dd6184 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -1,5 +1,3 @@
-DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
-EBUILD shiboken2-5.15.1-r1.ebuild 6611 BLAKE2B ade01e37bc0c199ed35eeeb176c87f76e9f1add46d9512f692947cc3b220da32a0e143881bd9fc2059dde0ffbaeacb70c0faacf7c75b80d3b0f7904710f96a68 SHA512 25fbcdc1e64ce80a0bae5fbe3eb44943e06289602a4d3032440cc62f5f6562eb622fcc8dd29f146094ab9fa8ff59e31952981d35998057be75de2860cbcdea04
 EBUILD shiboken2-5.15.2-r1.ebuild 6457 BLAKE2B 0ee4261ebd65c2e4e7770f7c97cf5e86bbad0843b2f0af39d54d977816b0b62026fc61c7505a759dc3c5b63acffa6182b79062e716ad22875743c1d0ef5de315 SHA512 a791464f458931c58ff9f41a436c1406e3555fac5a35eca02bf19047fd4d8f1f64f8699cdb2df5751563736ea4e263ddcaddb26d8498664872aa16136296f729
 MISC metadata.xml 576 BLAKE2B 567c84dbf819c5944e5b35146e3dff7b1581aa0275a732e8f2cb6df4b32001e2020eca2469ee422bd6fdd53b34c1453db4ecbdec6e85fe5ee3e4eea4a2283336 SHA512 f1c5964cb99b61c1913b7c031b994b71948e7b26f18d4119b7b3a536bbf7e659cecf539ec54992e157170159186ede2af3b31dfa03fbc1170bc7e12c25814a31
diff --git a/dev-python/shiboken2/shiboken2-5.15.1-r1.ebuild b/dev-python/shiboken2/shiboken2-5.15.1-r1.ebuild
deleted file mode 100644
index de2845464e89..000000000000
--- a/dev-python/shiboken2/shiboken2-5.15.1-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO: Split the "/usr/bin/shiboken2" binding generator from the
-# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former
-# requires everything (including Clang) at runtime; the latter only requires
-# Qt and Python at runtime. Note that "pip" separates these two as well. See:
-# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
-# Once split, the PySide2 ebuild should be revised to require
-# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime.
-# TODO: Add PyPy once officially supported. See also:
-#     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake llvm python-r1 toolchain-funcs
-
-MY_P=pyside-setup-opensource-src-${PV}
-
-DESCRIPTION="Python binding generator for C++ libraries"
-HOMEPAGE="https://wiki.qt.io/PySide2"
-SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
-
-# The "sources/shiboken2/libshiboken" directory is triple-licensed under the
-# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
-# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be
-# arbitrarily relicensed. (TODO)
-LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+docstrings numpy test vulkan"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-#tests fail pretty bad and I'm not fixing them right now
-RESTRICT="test"
-
-# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2):5"
-
-# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtcore-${QT_PV}
-	sys-devel/clang:=
-	sys-devel/clang-runtime:=
-	docstrings? (
-		>=dev-libs/libxml2-2.6.32
-		>=dev-libs/libxslt-1.1.19
-		>=dev-qt/qtxml-${QT_PV}
-		>=dev-qt/qtxmlpatterns-${QT_PV}
-	)
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vulkan? ( dev-util/vulkan-headers )
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qttest-${QT_PV} )
-"
-
-S=${WORKDIR}/${MY_P}/sources/shiboken2
-DOCS=( AUTHORS )
-
-# Ensure the path returned by get_llvm_prefix() contains clang as well.
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_prepare() {
-	# TODO: File upstream issue requesting a sane way to disable NumPy support.
-	if ! use numpy; then
-		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
-			libshiboken/CMakeLists.txt || die
-	fi
-
-	# Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include"
-	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
-	if use vulkan; then
-		sed -i -e 's~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral("'${EPREFIX}'/usr/include/vulkan"), HeaderType::System});~' \
-			ApiExtractor/clangparser/compilersupport.cpp || die
-	fi
-
-	# Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
-	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
-	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
-	# the largest version specifier that exists under the "/usr/lib/clang/"
-	# subdirectory. This assumption is false in edge cases, including when
-	# users downgrade from newer Clang versions but fail to remove those
-	# versions with "emerge --depclean". See also:
-	#     https://github.com/leycec/raiagent/issues/85
-	#
-	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
-	# eclass are defective, returning nonsensical placeholder strings if the
-	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
-	# PySide2 does *NOT* care whether the end user has done so or not, as
-	# PySide2 unconditionally requires Clang in either case. This requires us
-	# to temporarily coerce the "${CPP}" environment variable identifying the
-	# current C++ compiler to "clang" immediately *BEFORE* calling such a
-	# function and then restoring that variable to its prior state immediately
-	# *AFTER* returning from that function call merely to force the
-	# clang-fullversion() function called below to return sanity. See also:
-	#     https://bugs.gentoo.org/619490
-	_CPP_old="$(tc-getCPP)"
-	CPP=clang
-	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'${EPREFIX}'/usr/lib/clang/'$(clang-fullversion)'/include"))~' \
-		ApiExtractor/clangparser/compilersupport.cpp || die
-	CPP="${_CPP_old}"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
-	)
-
-	shiboken2_configure() {
-		local mycmakeargs=(
-			"${mycmakeargs[@]}"
-			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
-		)
-		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
-		LLVM_INSTALL_DIR="$(get_llvm_prefix)" cmake_src_configure
-	}
-	python_foreach_impl shiboken2_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake_src_test
-}
-
-src_install() {
-	shiboken2_install() {
-		cmake_src_install
-		python_optimize
-
-		# Uniquify the "shiboken2" executable for the current Python target,
-		# preserving an unversioned "shiboken2" file arbitrarily associated
-		# with the last Python target.
-		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
-
-		# Uniquify the Shiboken2 pkgconfig file for the current Python target,
-		# preserving an unversioned "shiboken2.pc" file arbitrarily associated
-		# with the last Python target. See also:
-		#     https://github.com/leycec/raiagent/issues/73
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
-	}
-	python_foreach_impl shiboken2_install
-
-	# CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing
-	# downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so"
-	# library and one "shiboken2" executable linked to one Python interpreter.
-	# See also:
-	#     https://bugreports.qt.io/browse/PYSIDE-1053
-	#     https://github.com/leycec/raiagent/issues/74
-	sed -i \
-		-e 's~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
-		-e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \
-		"${ED}/usr/$(get_libdir)"/cmake/Shiboken2-${PV}/Shiboken2Targets-gentoo.cmake || die
-
-	# Remove the broken "shiboken_tool.py" script. By inspection, this script
-	# reduces to a noop. Moreover, this script raises the following exception:
-	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
-	rm "${ED}"/usr/bin/shiboken_tool.py
-}
diff --git a/dev-python/signature_dispatch/Manifest b/dev-python/signature_dispatch/Manifest
index 869cefff09cb..c6e08cd99e6a 100644
--- a/dev-python/signature_dispatch/Manifest
+++ b/dev-python/signature_dispatch/Manifest
@@ -1,7 +1,3 @@
-DIST signature_dispatch-0.1.0.tar.gz 8715 BLAKE2B c62f5d0b0b263e50215d588e83bab4b5ca6dff82f856ad6265a0bb2dd64e2a3a8dfd0b8989ec17424828575607bd4dccc5802ef072af271eddb88c2479e6b8e7 SHA512 687a1de540a61d274e93510d2c5a93c736a52587b0215aef91364e34ad8932b880361b53fb84e68f9c2083652fa97c759705b4d61bc74caeba73a4ff37b42785
-DIST signature_dispatch-0.2.0.tar.gz 11422 BLAKE2B 3e3297ef34bb4f7352fe867edd2c804d627d5f8e854b1551c88dcdea2f83a6e2cde9c0f088d263e405f29ccd7114717c9348dc59d60ccd00a4ebb84db800d398 SHA512 e2fedfe3260be641c319364a8f79b2d1444179c824e409fb8304352cc9f73fc2cfb8fbdab6788c14d08e716d4655cda72bc15b406596d43520f959973fc612c5
 DIST signature_dispatch-1.0.0.tar.gz 15102 BLAKE2B d0fe384551136d23f815129849ec70c0d1bd8616dab571122b7407578f3cc0d614fc5c44f3de5d9541bed9e9e3a0887517fff1183fd6c782bde603d774fe09f1 SHA512 c13ac92f50a8bd7a9fcd0b231f74a14539fd9c0303fdb29860a93116512a20113708c3207c4b2d8f61a48a9632e8cd21f7ea3fcb49ae3a4b1c79eb6a71df4eab
-EBUILD signature_dispatch-0.1.0.ebuild 505 BLAKE2B fc8de8b0ace0179bb7618f53b02d82f7b82cb8c3467085b43095319bdcaf7fbba7c871c956251693cc48d9b40833567d98953361c626901dca6bd173b6163b4b SHA512 66c425ebbf62950d3d5c1f85534aba0369164f0f72e9f063dc7f9016f960f8096a31cf0157071eab0a8009c1c0b0921a2646c3af7ad09a92c9c7b97ba1cf3d98
-EBUILD signature_dispatch-0.2.0.ebuild 557 BLAKE2B 9a60e0db2cdc6294a7c2eec151edbd74bfce2ead92e3fd5fce7f3baa93dbd9bd0818969213d344546f880f2c436427a7e6a423e1f2fbeaec3b99862fbeb4b53a SHA512 a58c1c204e8f23dbae1111e9e3bdc51e12a6eab4f64605d5e5a6e1038091b6cce9f178bc6011904ca7256a03bb6c7edaf5b9ad0e81d9fc32401c9015ced85cc8
 EBUILD signature_dispatch-1.0.0.ebuild 557 BLAKE2B 9a60e0db2cdc6294a7c2eec151edbd74bfce2ead92e3fd5fce7f3baa93dbd9bd0818969213d344546f880f2c436427a7e6a423e1f2fbeaec3b99862fbeb4b53a SHA512 a58c1c204e8f23dbae1111e9e3bdc51e12a6eab4f64605d5e5a6e1038091b6cce9f178bc6011904ca7256a03bb6c7edaf5b9ad0e81d9fc32401c9015ced85cc8
 MISC metadata.xml 394 BLAKE2B 8edd4cb637f99bc844dd55e0475c74887f04e272a1238985692cc40e89e45dec82599139c419b894a7ca7f9f35bd2603e78cec838cdbf870da80fed27b7b67d8 SHA512 ed7aa29b9c0407e8b786b75020032040fd127946429ee239a142a6cef313c46af2ba67e7c8d631e5fe3dd733318b0a4a0603ec2fda39de95df861f68084f2369
diff --git a/dev-python/signature_dispatch/signature_dispatch-0.1.0.ebuild b/dev-python/signature_dispatch/signature_dispatch-0.1.0.ebuild
deleted file mode 100644
index 2f025368e570..000000000000
--- a/dev-python/signature_dispatch/signature_dispatch-0.1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Execute the first function that matches the given arguments"
-HOMEPAGE="
-	https://github.com/kalekundert/signature_dispatch/
-	https://pypi.org/project/signature-dispatch/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/signature_dispatch/signature_dispatch-0.2.0.ebuild b/dev-python/signature_dispatch/signature_dispatch-0.2.0.ebuild
deleted file mode 100644
index 73c2bc0b51b2..000000000000
--- a/dev-python/signature_dispatch/signature_dispatch-0.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Execute the first function that matches the given arguments"
-HOMEPAGE="
-	https://github.com/kalekundert/signature_dispatch/
-	https://pypi.org/project/signature-dispatch/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-RDEPEND="
-	dev-python/typeguard[${PYTHON_USEDEP}]"
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index d9046f9d3798..9708a163507b 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,5 +1,3 @@
-DIST simplejson-3.17.3.tar.gz 82434 BLAKE2B ae6f303a204f0c5a6bc7a10aa8da3dadbd4fc3a257abb15e330d13299dcbd5bc6be97506f6d5b48f3a3fe24570ac28b331644870d03aa30f80d40e69f4d2ec15 SHA512 b4ccdff3df2c87ed6f5119e93560ea7ddf60fcc64f996efeef1f6077f3a559c8f9ea77fd217348c1cba2de50e40523714899de110614953baf8385bb78d10af6
 DIST simplejson-3.17.5.tar.gz 83182 BLAKE2B 8fbaa83c81a7478b3c62c6625e717874f6dd3bef236b85504788a66d2b820dbf601e65edbcc7056528e67a66b806b3847b8efcc522464604bd4987dce9870643 SHA512 f5af32e4f9b4575323f9c0eb8163e794270a8607710d08a72cece953f57861e3619038798369ea049d82b9b53f293b9d9eefdeb4dd94ab4f043506bc3f1ddfad
-EBUILD simplejson-3.17.3.ebuild 622 BLAKE2B 5477f8ddb16abdb4f4902dec056dd52b0794c5d45a207211666d5644b4ada9dd021576a3fd5a1586bf4f4c5e3099a7a21bb5baf59dc9a36f237e97f5cf774f6e SHA512 fef504464ee8d265e47cf01f4ff5110d7800c2dae7a9cf82750e3c06a0997a1b7041807e0d16d2b8f1bdf46333ea4291d63c3876097dd1ee88ee7e6f79a97c42
-EBUILD simplejson-3.17.5.ebuild 623 BLAKE2B 2b53a3e442396a72f77d04ea23bb2bdfb59f253dcd9a0705c03a3bd8c4d571b2af8d93ee71af27b704135fddcfe3115f2d26d83ca94d89d2223e47561aa58f40 SHA512 249725a1eeb220ab4edad29a6ef7299d70c76a61f6a0ec581e10dca23582bcd23085443598707f07b219381df3de556b6dc60f977143160dd31844b0aa068e69
+EBUILD simplejson-3.17.5.ebuild 622 BLAKE2B 5477f8ddb16abdb4f4902dec056dd52b0794c5d45a207211666d5644b4ada9dd021576a3fd5a1586bf4f4c5e3099a7a21bb5baf59dc9a36f237e97f5cf774f6e SHA512 fef504464ee8d265e47cf01f4ff5110d7800c2dae7a9cf82750e3c06a0997a1b7041807e0d16d2b8f1bdf46333ea4291d63c3876097dd1ee88ee7e6f79a97c42
 MISC metadata.xml 375 BLAKE2B 2c3a0f98ee3f6c9ba41edf3e8e4d6536ac518a59234e6c602d46cbfcb8a5c760c71997b3c169dd2c0b3f9c5dcbea1cb36967e4d050933bd5e31d6f609a835e83 SHA512 6ad418641e64295566aa5418b9bead66e7ea84e0ca7aa454bfedf613cde7ed4d1cd17dff962963c3dda62ad9050e6348f9f53da21ba25b53cdeba2d91b8c551d
diff --git a/dev-python/simplejson/simplejson-3.17.3.ebuild b/dev-python/simplejson/simplejson-3.17.3.ebuild
deleted file mode 100644
index fb051159e269..000000000000
--- a/dev-python/simplejson/simplejson-3.17.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MIT AFL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-DOCS=( README.rst CHANGES.txt )
-
-distutils_enable_tests unittest
diff --git a/dev-python/simplejson/simplejson-3.17.5.ebuild b/dev-python/simplejson/simplejson-3.17.5.ebuild
index 24e18dc9313f..fb051159e269 100644
--- a/dev-python/simplejson/simplejson-3.17.5.ebuild
+++ b/dev-python/simplejson/simplejson-3.17.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DOCS=( README.rst CHANGES.txt )
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index b4e2ca65cab3..01569da7b48e 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -2,7 +2,9 @@ AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3b
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911 SHA512 0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
 DIST sip-6.2.0.tar.gz 1181661 BLAKE2B 7f5638005a01fc1bd60ef6156027db625faa393d5ee9155c88c88aea88e4c5ce63c30a2542cd89aea7c7e066cbbf77aab9ee9d2a45210dcad964e38052cb06d3 SHA512 88e4447aaa574a312bdfbb6ef78fdb95824f33d79988cdf5c824952b7f3535973eed6d8eece7b8c9ce8b442aaa2235e252d438f2316d13272a35c484dd4fda42
+DIST sip-6.3.1.tar.gz 1200906 BLAKE2B 2dcce853a1f3912138a2830b2370db518400119c5819070fd0cfc6ffebee06bf6629ae521cca535f5873859b141831dcfad7b077321356ce2ae69ec15ee28d6a SHA512 69705c2552a87d451ea989b99bb7e3fb15163447a3a5b3625e9e6509ce9e59d52fbfbb19ab911a2efe35219a50c08f0dcb25e16b222e0c8e1094dee0fc4b3b97
 EBUILD sip-4.19.25-r1.ebuild 2275 BLAKE2B 89ea240194120bff7b9b3d9b2026f2343fde3bbd8063bb2070ca12c624db79e4d2582a9024cc011705a8f3dd78468ba3849dfd9f806706a20cd1d3c3c0f21b79 SHA512 9cfcd1c771a10205695e66316168e3b29cf4b2fe48212b6918152b988571ce944ee86c6b55f3d9531e7a624a1c7554beff403d76addc6645e4f92e73fb904439
 EBUILD sip-5.5.0-r2.ebuild 873 BLAKE2B 6056c5ce42dfc77adfef3e38413eb91d150edfd33704dbd0434d4bebb6481b34376768e6b106c26e606094983a548155d5d62315f9cd9483ac49f6ba506a1eac SHA512 b7e8751fd35c0447502819f21600ce4fd7a62adb24c28510368fff1c5d1e21b1d6993aafe2c4b9bc863e44b4999b7ce42ccd67f06203a3aeb25d8e508ac80f39
 EBUILD sip-6.2.0.ebuild 906 BLAKE2B 983e093fda49cbb8ef2d9b99fbe27caa76c19348fef6b1133240c771dc69ac971a7d7e62a313ff6959bf226d09e0670a49616736c2a5791459d5733e851c9413 SHA512 b46a02396fe76b9ef983ca0f41e9c60ba7ce575a9bf58cdae25f425c7d4780e9f6eb0f58aa82f814820f5eb53404ec92e78da58b8ba1cbf948fd9df8f8705fa6
+EBUILD sip-6.3.1.ebuild 906 BLAKE2B 983e093fda49cbb8ef2d9b99fbe27caa76c19348fef6b1133240c771dc69ac971a7d7e62a313ff6959bf226d09e0670a49616736c2a5791459d5733e851c9413 SHA512 b46a02396fe76b9ef983ca0f41e9c60ba7ce575a9bf58cdae25f425c7d4780e9f6eb0f58aa82f814820f5eb53404ec92e78da58b8ba1cbf948fd9df8f8705fa6
 MISC metadata.xml 639 BLAKE2B deb4a3e534eaa966db932dc17bf7df6a04ed41ce707dc7f1befb272c362be06f222f976c4b0d526a6190d4954f1fa0e2c94ccc2e6cfceff6e8db5959e653fed1 SHA512 8c8e45d32587e346d4df067950aacbc767618418d42f4a5bf48a62706c9612007915ec643dc9fe7b7d083696b26795abb76d9cc475481c26782874f5116863a1
diff --git a/dev-python/sip/sip-6.3.1.ebuild b/dev-python/sip/sip-6.3.1.ebuild
new file mode 100644
index 000000000000..f917fbbbb011
--- /dev/null
+++ b/dev-python/sip/sip-6.3.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Python bindings generator for C/C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	!<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
+	!=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc --no-autodoc
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index c3cd12242f81..f870283199a9 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,3 +1,5 @@
 DIST smmap-4.0.0.tar.gz 22524 BLAKE2B 2edd07925d9511879cb816f1e80d5fe7920ef91635f085b8d0ca81fa8d46bf0a1dfce7eab6f70250b93602a5a10e8170045f0720cf9fe3b26911d4e8b419f4cf SHA512 fae59fd4e8ccc95cbc07be3ece208e862948c2b537850376b169acc15b9f0b1d94d412fde88647c245dda117dbbdab4db6426e1d95f3f9779bdd40c2d9c7d2cd
+DIST smmap-5.0.0.tar.gz 22437 BLAKE2B 2ff55ff412b10fe6c431df5f1589deb9f6f1c3277ee1ac651513e302d31b4f7ff986bfc548c5fefd66775f0eb7aef11dd8f2821f0e50a2e76d9bfcfaa9c047bd SHA512 03ae478bc83d02416f57bb3f6afc9c80bcb2d4249f3169390ac139b88be94258463dee7744fdf0fd54a7cfe109795a110c43f2b81ffd8546601de274667d353d
 EBUILD smmap-4.0.0.ebuild 500 BLAKE2B d90c05cac09da45c1c6bc1276002cf7cd704c65fa0826a6c5a18dfefac384f2bf38ec65c6cfbd138748cc2aeda76f0be792771d58b8bd510d4592fc11256ae0e SHA512 f9c610e158af79c275c8ba3b9b9e2d93306094f10636688b9c9173208b1b82212012e3afe150e6226535e970108ab3d2cbe040bd079efa3c775512c65e9b1b33
+EBUILD smmap-5.0.0.ebuild 502 BLAKE2B 0ac2743d0e81dbf01cb9a9349f900f0ac80d3c8816135f66853317fd55ab0156b4e7b8f40708af5c7f652ce78260d7cc2653cf5215f74454bc5c503f19133f6d SHA512 22b0bcb13ab4b96968d8497db72e678430c6bd778838002616d52176b54675aa0aa94bbd1387e0b0d77242635a153e4eddc6de8e945ad16ebc02ecb80788b551
 MISC metadata.xml 412 BLAKE2B d2178c6214bed671ee1ed50e3d2f098f8091af04f475867685a618df09f91d4340a28557d050ddc0849eea20e16662dccf62d015d565e1ed560e7c3144fbe0cb SHA512 57cfbc2aff045b2b9da66046c29d33523f0ba708861d98cf7c87e3363673dfa9b3d26bbddf794664faaf12c6efb38eb937299158199ab0fc989841cf5e4707fc
diff --git a/dev-python/smmap/smmap-5.0.0.ebuild b/dev-python/smmap/smmap-5.0.0.ebuild
new file mode 100644
index 000000000000..ca18803bed80
--- /dev/null
+++ b/dev-python/smmap/smmap-5.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A pure Python implementation of a sliding window memory map manager"
+HOMEPAGE="
+	https://pypi.org/project/smmap/
+	https://github.com/gitpython-developers/smmap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+SLOT="0"
+
+distutils_enable_tests unittest
diff --git a/dev-python/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest
deleted file mode 100644
index afa84756e724..000000000000
--- a/dev-python/sparql-wrapper/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SPARQLWrapper-1.8.5.tar.gz 89117 BLAKE2B e36f90b0bc8adc789750e7db588ada22e369d10e1ae94777b627680070f4ac8da3e7575c7858121386287034061b6fcfbfbb529f9d8de020ae65a7c6bdb2ef80 SHA512 b0cbe9f7f13a8a0a1c88a17b5966b46e7811acada2712ee03be97808dcb17ba4a71990c07df5d213d21815d7deaf3526381a2cc864d839e561e242be797b6bb2
-EBUILD sparql-wrapper-1.8.5.ebuild 1381 BLAKE2B 58c7c4fe24d44d874461ed066490cdbde7ce60836283bc9a95523494835ed8c76f8545e0eb975ce6d88ac56e07c353673b0d0b3d019eb5d6542e3128a49908a1 SHA512 f8cb387318f052ca39641c42ecacf9f2fe79fc493ebdfbe524aeda458c29ea066a25d7ece2bacb79db0750a17bffd0d8ac7ec9f724e2f70ef65557237c08a62b
-MISC metadata.xml 352 BLAKE2B 987b15910c1993b45efca3534f5249f8fbdd0405538f856f1cba6ee76dd9bb90209cb5f7ae97ab5d489d161d47e3ac5a2a4daaec6d5b139ed82ec9c1da78769e SHA512 7ec961183a772b4ac261f628a784a7810ef843f6a2815c7adf6a21ff546aaadc6da58c100a64625ac94e4db036abaeda008af3e7731656077fac8ef3d1351c93
diff --git a/dev-python/sparql-wrapper/metadata.xml b/dev-python/sparql-wrapper/metadata.xml
deleted file mode 100644
index 7ef821202c0b..000000000000
--- a/dev-python/sparql-wrapper/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">SPARQLWrapper</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.5.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.5.ebuild
deleted file mode 100644
index e99ce6be5980..000000000000
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_PN=SPARQLWrapper
-DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.org/project/SPARQLWrapper/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-# the vast majority of tests access random Internet sites
-RESTRICT="test"
-
-RDEPEND=">=dev-python/rdflib-4[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# disable sys.path hack
-	sed -i -e '/^# prefer local/,/^# end of hack/d' test/*.py || die
-
-	# urllib2
-	rm test/wrapper_test.py || die
-	# connection timeout
-	rm test/fuseki2__v3_6_0__agrovoc__test.py || die
-	# HTTP 401
-	rm test/graphdbEnterprise__v8_9_0__rs__test.py || die
-	# returns some HTML page
-	rm test/stardog__lindas__test.py || die
-
-	# require rdflib-jsonld, apparently
-	sed -i -e 's:test.*JSONLD:_&:' \
-		test/*.py || die
-	# some plugin error, probably the same
-	sed -e 's:testConstruct.*JSON:_&:' \
-		-e 's:testDescribe.*JSON:_&:' \
-		-i test/fuseki2__v3_8_0__stw__test.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	cd test || die
-	2to3 -n -w --no-diffs *.py || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/sphinx-bootstrap-theme/Manifest b/dev-python/sphinx-bootstrap-theme/Manifest
index f8e99ea75428..4eb3de2202bf 100644
--- a/dev-python/sphinx-bootstrap-theme/Manifest
+++ b/dev-python/sphinx-bootstrap-theme/Manifest
@@ -1,5 +1,3 @@
 DIST sphinx-bootstrap-theme-0.8.0.gh.tar.gz 1229005 BLAKE2B c3d7c000007d1f8328c972f0aa4417d54b7c3ee239a094432770d09d955c97d5c9e001748a07b9f88525b97481218a1e6df24d16aa1c1045feb7c0fcb1496cd2 SHA512 471519ecf46c359a9c036b1ba15245b4a5d499263560dde7a7217a1a17a62e8f559359fd66de9c1f35c150314a68d62e3b9bcff8ff018bff909ece9284bb948f
-DIST sphinx-bootstrap-theme-a6dfc6f9054f6b4cf3eb1acadf715a679ed53a7b.tar.gz 1227985 BLAKE2B 787d5975c8585a1fc428344e2788d92c75c0ea0b91671ab57ef3d636522feee4428e79f73f150792f83557765cd1192b863d92941dbb1e1e3bca17668988ab3a SHA512 eb8dd8e11cbf6cedf9487b6ff220550a24501df134fd1f0c3b680bbf5b573beda2a3bd7e023d6faab82b55bf08a6b66855efe554a3102cf0131c4c8ab7559cf9
-EBUILD sphinx-bootstrap-theme-0.8.0-r1.ebuild 654 BLAKE2B d78930947c281aca78fe9204cc6e86524e44db1b60210d965247dea727982b230a6f88c4dab4175c8516855506906dc6d6c5cde716abcc84f549e2ae3fe12d0d SHA512 9e397799eb2737ed6d29988045105b19059dfb231ab6cd4bdb613a713d5692c56cb0b59f5133f24463520b7a7ded6fda172add0573f747036b9973dc9d7bc2c1
-EBUILD sphinx-bootstrap-theme-0.8.0.ebuild 883 BLAKE2B 6e1ac2e4a6bcc717b68ded564f2a09a53f5087c1f8c11138b4f77ba6f7952192065ee467ff775490ecbdc382e970709bf4d3572990d41622f8090ad7e1db5bf9 SHA512 426af0afad0aa266bb7b14ec7c83b8918ea13bb4d310674aafd34820988fd699439947b3410521659a918d87d6f7278a9de043e5e51020e792fde145594d8bb9
+EBUILD sphinx-bootstrap-theme-0.8.0-r1.ebuild 647 BLAKE2B 1c537cd5721f58fc243b0da4e1d50a832ae8d823ca95d5100f7eacdc53a330f70ef0f77f42d39ba678788635d9fd8e8f7ade75dc5d3eb84ccfba1c83b7f69ef4 SHA512 639c7bdb18b9e4dc142094f9ccfa6cb20916da43f8f8aeb8a038ed091c87d0dcccf9f8840fc59ca18676a5193d414766f539ca91088afe2ed84b094d12a7fabe
 MISC metadata.xml 521 BLAKE2B 2748af332700ea3f04ea592b42e5b6e2b099efdac4385ad10672e3e0633b8625ced940d7f94e5c64d4798e29acff17c6e23a71c3d638d3be054fe872aa5409c8 SHA512 6e85d7ca107611051edff6f6f6187656de9d2d6d0faf90df838766a0068d0fa756f8afab992bd7c8de77f44b5f83a6c7b4cd03cbb7a434aabaf1bb8295019e6f
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0-r1.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0-r1.ebuild
index 08c68fe5d464..ef8303a8f342 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0-r1.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0-r1.ebuild
@@ -17,4 +17,4 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
deleted file mode 100644
index 9570c550b559..000000000000
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-# Upstream decided to move the v0.8.0 tag to another commit
-# Restore the same git commit for old v0.8.0
-MY_COMMIT="a6dfc6f9054f6b4cf3eb1acadf715a679ed53a7b"
-
-DESCRIPTION="Sphinx theme integrates the Bootstrap CSS / JavaScript framework"
-HOMEPAGE="https://ryan-roemer.github.io/sphinx-bootstrap-theme/README.html"
-# Latest version isn't on PyPI
-# https://github.com/ryan-roemer/sphinx-bootstrap-theme/issues/210
-SRC_URI="
-	https://github.com/ryan-roemer/${PN}/archive/${MY_COMMIT}.tar.gz
-		-> ${PN}-${MY_COMMIT}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/sphinx-jinja/Manifest b/dev-python/sphinx-jinja/Manifest
index 3d3156fd91ce..d7a123b90ecd 100644
--- a/dev-python/sphinx-jinja/Manifest
+++ b/dev-python/sphinx-jinja/Manifest
@@ -1,5 +1,3 @@
-DIST sphinx-jinja-0.3.0.tar.gz 7035 BLAKE2B a43c2ab6c1f0178987ccf9f69acbf0b50974573b83d0503e7888a56bf024e519ad69e3ac6ec9b8d27d7e01e9482008b6579c6892ce114124c0ef12ef456c887c SHA512 b39211a0013db020112c865335811317699e7ade734bfd9bb24f51934df4652f0560b81f5e253fc663fbd8a269fd962ef2bfd6dc96eab12a397a538e758cddfd
 DIST sphinx-jinja-1.1.0.tar.gz 7306 BLAKE2B 17b8df65f32e0b39eeed406b9bd71974a2b4399154b6d3bf13d9011c0d415b856345ec2fffff8fed39f893b7adb5fa1c012ebf80319ac6af74739e7fe9372229 SHA512 acbe1c2f2044b8e202db60a9964c509a33206c113ca2833dc43bb4849bc91e26b0c84959d8c8f2e5331c33c2e9de73c0348a3841740a5b7d260a43bf4876949f
-EBUILD sphinx-jinja-0.3.0.ebuild 765 BLAKE2B 37b547a9e56edb4e858c82ae137644d1000203d5e6e0d8a746c2bfd04b18fa6c3fcd9ae993097d292842b2c0a2e958cdc75b70a9ee240aa1de43ed495acf0364 SHA512 62c4d0c4258d5cc788582797ca20ccb61b5628897385a2c94e6cd6672dcbe24ada9b438e8a28a77e89e28333b55af0da113b5746f8dd6eb8571183f68a3c0cfe
 EBUILD sphinx-jinja-1.1.0.ebuild 858 BLAKE2B 489745ed965b4bcb5aa4c447aeac73bf6ff21e1599786aa21b3c0cb9a311c160860351c0f088dfc71cf78b7b041a46649908016d3441b0b4c0705383b656442e SHA512 794118f3a62fc7cfba94b1af47a1c5c332ade37ab555abf45d5922624fe764988fb080976774c4e80ad3e1650774286997226fcebdbf66b05879ff26d80c6177
 MISC metadata.xml 421 BLAKE2B 99ffa81ad81b8ae46f1dc4eba44492940d1097ea09e3d6fe171249756b35114b6becdd5eff3ed4d81154e63a7ded579b37728cd88e5e3dfb659a17c79921df02 SHA512 c60a68b7c6b7c89bc2707f8f5972d7680541e3f27c7f1ee8c963b7efdae606e5df031cb759d58a55bd02fda07df3e94e35a50e99a4a8bf9eebec66ab33eb7333
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
deleted file mode 100644
index 5489dcac303d..000000000000
--- a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
+++ /dev/null
@@ -1,34 +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 distutils-r1
-
-DESCRIPTION="A sphinx extension to include jinja based templates into a sphinx doc"
-HOMEPAGE="https://github.com/tardyp/sphinx-jinja https://pypi.org/project/sphinx-jinja/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -e "s/import urllib/import urllib.request as urllib/" \
-		-i sphinxcontrib/jinja.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 8d8227f8032c..93ca88f1d7bc 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,9 +1,6 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
-AUX sphinx-4.1.2-py310.patch 2404 BLAKE2B 9768ede1a7272497ec5f266ed676fe114d6b72d54d8369b28c98a2af20094050a04f70c0e5df93580ed7e3655a0bfb81a4ebf79bab1f658b121f97c8d8cf7d71 SHA512 f49567b0acebfd1187db7f9a4fc5d20bfa9a2d250a8a987ff7ac49bc29d1877755fd74d60c8318d82be34c50d4bddf427e764417366509abdbb43ff3d119b82f
 DIST Sphinx-3.5.4.tar.gz 5911093 BLAKE2B 8740714dfaf3733bf57d0b277315b4e7b5cad86247ea30dcbc4f5dadf5f5169329050b7be43ec8625c47df9dcc19afcc6c4d782725c7007f8178b7eb7be7dc05 SHA512 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125
-DIST Sphinx-4.1.2.tar.gz 6373677 BLAKE2B a78df4302520898c8708a75129baf28dd2dcde2dcbb4147d8246a2dd7907ae2af2ed8cf1d259ff1065dbe987fd918a7153831a9f5c16e79834c41f86b6031e41 SHA512 1fe998de7b8fc47989e186835748b7fb5d0b523db95434515b6af29b56d28372f2f92ab917c27cbed51aa0cad13175eda8bf4fc93a8726eb5e93e9bc6995e457
 DIST Sphinx-4.2.0.tar.gz 6503692 BLAKE2B a3cc73c215be6859f285b92d651f2fe60f731340e7c003d3b275247593d1e641a25618817f67e7f3d8767724d6e98a6d63493bea340c7171e4e3da384da776e2 SHA512 6c6a2424362805b758c43136a9293dcfb02d45af6e6dc2dd7ed9382f6ae04ecfbd416efeecb42219b67d026a4a0b007500e87b20d81847ab48e2ccfcdca52e75
 EBUILD sphinx-3.5.4.ebuild 4147 BLAKE2B 71424a28d134dbd1eb18babe105a5b98bb27c1dd92f64844121c3b0f465ed1c73f10b2cc8e9d49952a49eabc1d58ec748f3c207f60dce9b5ef8b1be71f9718ba SHA512 c83535c4082e426930df4bbbc4eea476ed50e109323b89f3baeaa2a27bd0aa61f48f3f09f9b2030f4335fb65b5ef7256640233d2183db36352e2cbce60044661
-EBUILD sphinx-4.1.2.ebuild 4471 BLAKE2B a371b3fc15df849200f39d3ec4a99fb4edbf2ca7a809529d6041e4ad43fa208fb91a05ec51799d5abda49b5ebe5698c2f0c6b2d042ee3a404c47f38ea345064e SHA512 5e4910cba1a5441802ef54aa0e1f95b8e78967aa89924e31e1df6196f1c6d9dc690113acd4b46939c928b8eb90bdcc656f42e977e71ff12795f0334cd48a1824
-EBUILD sphinx-4.2.0.ebuild 4264 BLAKE2B 7b1c505c316e4d5d20cec6026011714e2b8afaa9ab2de627e438530a41b6bcfe14bf94f2f09b95bee41415c908b763497405bf0618e85b0deac365eac7bb1af3 SHA512 fc7b2200ca07e67d0b98d625afba62e40f76a7d490994ed16985def06eff42154bc9ae2eddd33f3b51b457360388a2c19fc62977dfdb37ddb0f1b0ab07e5f697
+EBUILD sphinx-4.2.0.ebuild 4256 BLAKE2B d8745129ad938bc336ca52ff0931c3d88809280a1d452d907edca1e05064668b601248cb85a049d40a5dff79d8e91ca41d89d75285ff54d75c032a18a1ec403f SHA512 ba9ae1638031845f35eab34b53be582e8e6440ba540b47f4d593f14323e3c2c4ab6fbf873a08ffce007bdec4e24c3f450cfe3b4a223a7acb8cee8e2d6a9b553e
 MISC metadata.xml 568 BLAKE2B ddb7175070df6da4088813cc6b66f25bb4364e2619b1e7da94370f7ce8e73b68b12f618412f81e6be57fcb0c60c10e3913f26a6a578b0f9defa7b9ee8091fcde SHA512 d32b37cbe88f5e3db0c6968bc7aa22c7edfb3794bf7c62facd17e7ae1f4f0fbfc7c9f5512230cce16ed32e2ebb70c23dfe9b36ce38785c5f5b76585410313214
diff --git a/dev-python/sphinx/files/sphinx-4.1.2-py310.patch b/dev-python/sphinx/files/sphinx-4.1.2-py310.patch
deleted file mode 100644
index 8c03d1f66721..000000000000
--- a/dev-python/sphinx/files/sphinx-4.1.2-py310.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 1fd5f746539d3e02886032fae8d53af0c2f6ecdd Mon Sep 17 00:00:00 2001
-From: Takeshi KOMIYA <i.tkomiya@gmail.com>
-Date: Fri, 30 Jul 2021 01:27:38 +0900
-Subject: [PATCH] Fix #9512: sphinx-build: crashed with the HEAD of Python 3.10
-
-Recently, `types.Union` was renamed to `types.UnionType` on the HEAD
-of 3.10 (refs: python/cpython#27342). After this change, sphinx-build
-has been crashed because of ImportError.
----
- CHANGES               |  2 ++
- sphinx/util/typing.py | 12 ++++++------
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/CHANGES b/CHANGES
-index a643bfe841..70eb8db93a 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -16,6 +16,8 @@ Features added
- Bugs fixed
- ----------
- 
-+* #9512: sphinx-build: crashed with the HEAD of Python 3.10
-+
- Testing
- --------
- 
-diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py
-index f1723c035a..012d32e524 100644
---- a/sphinx/util/typing.py
-+++ b/sphinx/util/typing.py
-@@ -33,10 +33,10 @@ def _evaluate(self, globalns: Dict, localns: Dict) -> Any:
-             ref = _ForwardRef(self.arg)
-             return ref._eval_type(globalns, localns)
- 
--if sys.version_info > (3, 10):
--    from types import Union as types_Union
--else:
--    types_Union = None
-+try:
-+    from types import UnionType  # type: ignore  # python 3.10 or above
-+except ImportError:
-+    UnionType = None
- 
- if False:
-     # For type annotation
-@@ -114,7 +114,7 @@ def restify(cls: Optional[Type]) -> str:
-             return ':class:`%s`' % INVALID_BUILTIN_CLASSES[cls]
-         elif inspect.isNewType(cls):
-             return ':class:`%s`' % cls.__name__
--        elif types_Union and isinstance(cls, types_Union):
-+        elif UnionType and isinstance(cls, UnionType):
-             if len(cls.__args__) > 1 and None in cls.__args__:
-                 args = ' | '.join(restify(a) for a in cls.__args__ if a)
-                 return 'Optional[%s]' % args
-@@ -337,7 +337,7 @@ def _stringify_py37(annotation: Any) -> str:
-     elif hasattr(annotation, '__origin__'):
-         # instantiated generic provided by a user
-         qualname = stringify(annotation.__origin__)
--    elif types_Union and isinstance(annotation, types_Union):  # types.Union (for py3.10+)
-+    elif UnionType and isinstance(annotation, UnionType):  # types.Union (for py3.10+)
-         qualname = 'types.Union'
-     else:
-         # we weren't able to extract the base type, appending arguments would
diff --git a/dev-python/sphinx/sphinx-4.1.2.ebuild b/dev-python/sphinx/sphinx-4.1.2.ebuild
deleted file mode 100644
index 03135e278977..000000000000
--- a/dev-python/sphinx/sphinx-4.1.2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="BSD"
-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 ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
-	# https://github.com/sphinx-doc/sphinx/commit/1fd5f746539d3e02886032fae8d53af0c2f6ecdd
-	"${FILESDIR}/${P}-py310.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	# remove unnecessary upper bounds
-	sed -e '/Jinja2/s:,<3.0::' \
-		-e '/MarkupSafe/s:<2.0::' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local deselect=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-	)
-	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
-		tests/test_ext_autodoc.py::test_enum_class
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
-		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
-		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_pycode_parser.py::test_annotated_assignment
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/sphinx/sphinx-4.2.0.ebuild b/dev-python/sphinx/sphinx-4.2.0.ebuild
index 2395e15eb80a..3bebfedd66bc 100644
--- a/dev-python/sphinx/sphinx-4.2.0.ebuild
+++ b/dev-python/sphinx/sphinx-4.2.0.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${P^}
 
 LICENSE="BSD"
 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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc latex"
 
 RDEPEND="
diff --git a/dev-python/sphinx_ansible_theme/Manifest b/dev-python/sphinx_ansible_theme/Manifest
index 5cc2faa95775..4d569036bb10 100644
--- a/dev-python/sphinx_ansible_theme/Manifest
+++ b/dev-python/sphinx_ansible_theme/Manifest
@@ -1,5 +1,3 @@
 DIST sphinx-ansible-theme-0.8.0.tar.gz 34401 BLAKE2B 493663331e593da8d56683991762452419fd5fdb48e2c59ee3a38b6242216bccf56e047e59294ae73cccfb48a66606e55fac6c9a19d91e6ea778920f9919dbd1 SHA512 399af992428dd3212681efa66036af9ae7dbd9a9dd507452686cc76aa3e365aabee0ba7b599fbbed85f1f252075d5158ade9a816a9aad17b4e5ed696be1c962e
-DIST sphinx_ansible_theme-0.7.0.tar.gz 34120 BLAKE2B ce116d0392fd5feaf389bfc3c1934aa72eef4fe55d8307df0035e6d73824e2ebe0da48175a29703c5643c297ce5628f680089624046f10612ca6995a3f2b46b5 SHA512 4cb395eb02c5ea1bfb743af9fb71732b65d155d87064128b134b0561c6eaaa3239ad65be12cd90d704b7f80c32f97c544493f67027ccd03865dfa4a3c88e816e
-EBUILD sphinx_ansible_theme-0.7.0.ebuild 547 BLAKE2B a1a5a84d9c18f7448101cdda4ff3f43913fd218dfb450b6d38f53ae3dce21751f7d0857b7c7f781dc786e329eb9fd773c5b403b50315cfdbab4bb5cd4dec0067 SHA512 3e00e28cb7cbcb25cb29bcd73a460b0cc478a1286ecddf5c714c66fb5480dda1886ee92cea8f9ee9498655417a50636c0e9e9d43cb43cf9ec617e7ad6dff43e3
 EBUILD sphinx_ansible_theme-0.8.0.ebuild 746 BLAKE2B 3a42d0e2c5df94b96941b931c8432af452c9e5f4efd436f68a9d21b76c6126e4772b4f644b489de7216fcc7982d45acf870200d8ef0acddfeb9ecbb3fc46a218 SHA512 433b01f1077e8b2fedb24acfb71d2f70f7dd8ca0546240c461a7e6503bac0cd0e363728ad6caf1a93e84c7d4b823df5917de3240e2a0c3a7825639c8ce38ec74
 MISC metadata.xml 431 BLAKE2B 67a8ecd46eb70f203dbe1d988f4533cc8973b0c92958fb6c6795730c8662a714f0d4a8ca847c9ddb83df100767e6e2108e29fa512b109ecce8ed04724aad8473 SHA512 5689d031e76d4f2387ad0bed91d367a3f180b57f200ed74fdcafac600f0a3284946ba6bc722cf1cb3be66514c56c81d2eaed50c49497bc83feb6b4eeb903d4f3
diff --git a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.7.0.ebuild b/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.7.0.ebuild
deleted file mode 100644
index e0a219d71f37..000000000000
--- a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.7.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A reusable Ansible Sphinx theme"
-HOMEPAGE="https://github.com/ansible-community/sphinx_ansible_theme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index dd690714a9fc..94045f9d52a7 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,9 +1,5 @@
 DIST sphinxcontrib-doxylink-1.10.tar.gz 20217 BLAKE2B b5b1128d8b60e91b655b2efb093afc77f10e39912c841d2241576c0ed7f1c6d23c92272ee988435958155b9506d22dd5a8b0373bda7059040b38869aea37f9ef SHA512 08beb65cb22b02ae253bd526da00cee322cc72fc00214818f3d5fa503d36725a08f67c6b46f13fec10b1d9963cd7c7ecf57109342d7a2ba991cdba0fa6ef8125
 DIST sphinxcontrib-doxylink-1.11.tar.gz 22043 BLAKE2B 73d137d2c7df594c71def4d422040eb46028192c13a38b7f765dcbda82034936e3985309254b536d9ba49a32e2d9df9c8eb7886b7a365bbc0440e901cb0250c9 SHA512 14a3511c6958d05f6209c292563068e58410e6833821c8339fa95c511ac2c8987b05097a423313345f2c7e9c1dfd17136bd8684520341160fdaefae1bcc2dcc2
-DIST sphinxcontrib-doxylink-1.8.tar.gz 20005 BLAKE2B e435a65f3931c91e0d7d44d1cb4ebc8e7683ab906864e37a0ac31fc6655dba60cf53ef3d91b9e0ce440e86319ec45e0d81cf43459e02ac7e45c8d1ecbc2a9881 SHA512 1c53af2502fbb493a5834ae3eb05428dd296300f8027b5dd8d93cd67a03ea572ac81a0c3c8e6ddc9017a0b7a0859757d61ea67b73b3ed69fb1db76244ffd6874
-DIST sphinxcontrib-doxylink-1.9.tar.gz 20175 BLAKE2B ebff920929c29ecdff9ecb02ca3d7d4992b0da8a34497d9e2dc4b3cd66a5996264e0ab459f69c0ec83bfe60681beac56f981ecc72e128a08f095b4b0296061c5 SHA512 78ffc2d2babe6502bc8818116cca7da079f6ea9ab3f43efa587dbe5efe15d2492be6e763850c9a01e6053332871277dbbd7998803d0ab54616e93878d51c92b1
-EBUILD sphinxcontrib-doxylink-1.10.ebuild 1006 BLAKE2B fe65507b178058c3c271ebf17bd698d634698ffe18edb7c22125fbd616048f1817eca1ef2357982ba09de2b7083cde0809e1804acdbe79f211567c5e79c3502b SHA512 9204fc1524ac37166febc1065a416c8d5044a4661ddcd0c2b7e9788ba5f7accdbc2e7531973be844e1ad37c5eaa85ccf0975bb9811e1b69a50426549be8e3744
+EBUILD sphinxcontrib-doxylink-1.10.ebuild 1004 BLAKE2B 85348b89cf7e84fd855f7336bbf354fd5757978f701fe8b670f04650a80fb1ba7c8c24e0791a543cb98cbb193421f1d4d1358b75bd0f741193f9b8333087a500 SHA512 3a0b09fa82cb7be8b762e22882701b1d24620cc106aa63c9af6fb42370a391e0142c6156b8f76d64c2eb46ae839fe45ce45ce3bfffc7ef5f4be9f33317a94b2e
 EBUILD sphinxcontrib-doxylink-1.11.ebuild 1050 BLAKE2B 203774a4a223ece1d027e6e3b92eb48e0cb4a1f7185a6438878cec6093282e73a9a5087afc8ebd27f1bd7065a6ab7269d179d0256386870c3f495d6633e09e14 SHA512 dfc9f172233546010608a3c3aa6364de03022e125861b9f96c0b3f7f2c4ce43c0b4084e4d022dc803410917549838756c83c86450e3218a01288cb611ce7b3ec
-EBUILD sphinxcontrib-doxylink-1.8.ebuild 1005 BLAKE2B 1e279cb31ee0e39b0a7d311841b557052898e47e6cd2da4950b6646e40bccba6a4567c3c50faeca472eeba882098692dcfd8137291dc1c127f3e3671d907dd0f SHA512 5fb0a084d169d3f23aaadd408ef5302a4ec1baf9f8a08f51b91dbc37e1ea6a10146dca827abccaa58806d38df562ea82e2cdd8b7cb6cd571e0363fdcd4a68c00
-EBUILD sphinxcontrib-doxylink-1.9.ebuild 1006 BLAKE2B fe65507b178058c3c271ebf17bd698d634698ffe18edb7c22125fbd616048f1817eca1ef2357982ba09de2b7083cde0809e1804acdbe79f211567c5e79c3502b SHA512 9204fc1524ac37166febc1065a416c8d5044a4661ddcd0c2b7e9788ba5f7accdbc2e7531973be844e1ad37c5eaa85ccf0975bb9811e1b69a50426549be8e3744
 MISC metadata.xml 620 BLAKE2B e76f6c16f0f8280d0d7a99975a0dad33a76f93a634d99114df5eacf047e434c7356cb501c4021cdee1b17c3e7dd00e7ce4720d70c1ddddcf561c4e622b528549 SHA512 89afb14c72168f5a919347726c1445a205d5839925ead8b3969cc84f062caca0a666cc141f541c21d642f95c3c40fdfe677e3f1cce78aa1a5f6445e140ae7978
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.10.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.10.ebuild
index e389fda10840..e0fddf7d0108 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.10.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.10.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/doxylink-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.8.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.8.ebuild
deleted file mode 100644
index f7526485a60e..000000000000
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension to link to external Doxygen API documentation"
-HOMEPAGE="https://pypi.org/project/sphinxcontrib-doxylink/ https://pythonhosted.org/sphinxcontrib-doxylink/ https://github.com/sphinx-contrib/doxylink"
-SRC_URI="https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/doxylink-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-doc/doxygen
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.9.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.9.ebuild
deleted file mode 100644
index e389fda10840..000000000000
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Extension to link to external Doxygen API documentation"
-HOMEPAGE="https://pypi.org/project/sphinxcontrib-doxylink/ https://pythonhosted.org/sphinxcontrib-doxylink/ https://github.com/sphinx-contrib/doxylink"
-SRC_URI="https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/doxylink-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-doc/doxygen
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index ecdd641787dc..18980c565fc8 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-github-alt-1.1.tar.gz 3312 BLAKE2B 4665c873bff44a65b0aaac4ea853ac4edc3447850f6c18a8c7b717a84e158c6cf0c16116bbfdff8f3419b8448272a180c57283c324ab5052359da4522937abbf SHA512 b7af74e3762d51663bcc8a33d10bb63ae5fd24e220919719de5ff9421ec2ae854b84bb9f17f379fa174996edc2160580fb49b0030bab4cadbdfbcbf0a0cd509d
 DIST sphinxcontrib-github-alt-1.2.tar.gz 3680 BLAKE2B afd5a20d073e58bcb657fbf100b28fab9d8cda2e1ae7e488dab42e8d4b12e4668185657673a56e9c410aa81cb65dbf4b706740511a8ed9d6c49482ea014c2fc0 SHA512 08f6738206232a5f37446ecac7b804178a57173efee58886623c7d2b43678c8acfd5a7527bacfe7c8f004fd531be9606f24a99c5665b78f97a5676398d2d2857
-EBUILD sphinxcontrib-github-alt-1.1-r2.ebuild 641 BLAKE2B 1568d98697a52f5f6500f1305be52917d466a7e0f77f7cd21821c5fbf28339cfc1cedcfaea55316410ba21bdafc147e619f17e607b272f517390db21ef6bc993 SHA512 8b2d87209af9d86def3dc27dad6bdda84b15bee627f3e88fa53bd510faf8c79c8ad88d530b1ffbe1831fb1593b92d07ce2645e222443535dadcb901de5c330c6
 EBUILD sphinxcontrib-github-alt-1.2.ebuild 673 BLAKE2B 0df55e4995d6176c942c08d49e16e8d890b3347d04c1ffafd24b772cf94f93989e054f68376d08aaa341a9f0a85902bdf1032c1fc7395e6bc8d7211079635dd5 SHA512 ed75f161e4bcedaabfa079a94e1b782dc6de90741837a82ffefe13791e82aa0adb74778e40d3d6398e98f323cd0a2637719d9633e1a1d4285a15f7aaf86a741e
 MISC metadata.xml 437 BLAKE2B 74c212e371aeaf70f1ad5d4b4a2afb0cb6cb1f3ecd5f45934675d711e4b01a878656ad154f517bd4100663ec7da232443625c8dfb79a6b0779a00abce35528b1 SHA512 5fafca03639f467b05a5f7cf1ab5a019817b505504b3d4e4fbc711ddd0cd679f9416e5773f032760b089398e8518291d179e8146c405e5e189e9c26f0a2de642
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
deleted file mode 100644
index 09fee57340aa..000000000000
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-MY_PN="sphinxcontrib_github_alt"
-
-DESCRIPTION="Link to GitHub issues, pull requests, commits and users from Sphinx docs"
-HOMEPAGE="https://github.com/jupyter/sphinxcontrib_github_alt"
-SRC_URI="https://github.com/jupyter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~s390 x86"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-BDEPEND=${RDEPEND}
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/sphinxcontrib-programoutput/Manifest b/dev-python/sphinxcontrib-programoutput/Manifest
index 580d6f437f6e..36533321a9c0 100644
--- a/dev-python/sphinxcontrib-programoutput/Manifest
+++ b/dev-python/sphinxcontrib-programoutput/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-programoutput-0.17.tar.gz 24067 BLAKE2B 07687a221aa9be1e02629b2961b49eace217631a1298337f77a01986c3c6444a50069a8a8b9c96ca224895ae0f9490158a720519fdf3fb544e9d3e513282eb36 SHA512 cbb564830b8a627de6ecfa83fcc235d7dd7981e191ab3cada66a74d79a5bb2ec0a993eb8ae6249db553dc1814eae98891ea285f2c3cf5e745eabce7b8647b0c4
-EBUILD sphinxcontrib-programoutput-0.17.ebuild 835 BLAKE2B 53076ed17d82d56e7cb5b1f09e7234b6907263d3b23a7274ebc1207d44ee9b3d5083e8a8f88c3e92e8e0e3fe5479ba63b6f6da3e2082474e61b5b54d0605d911 SHA512 3a359be66660d8263b64728c7798c7a03be3f27b81bab3a7a4a8437edd06cfcf09b4fc5770643800b4f19a9e8819a63b777200be633aa908b050329d7164f68b
+EBUILD sphinxcontrib-programoutput-0.17.ebuild 834 BLAKE2B f549011ddd1446f427cc3c094c2e9c69773f6d146ab799ad1e8d76db806fd8a9aee5586a86b8201e1107837f36da2923fa49e9c782b6215625be5494fb46b539 SHA512 0341f1a33a203a34f0ddf354f65311004114645b83b35f317e29f3c78fc68d0fb1842bb1c01691d342b5013abc8b8212bb7f58359995dadf6852b3e949dc78af
 MISC metadata.xml 1357 BLAKE2B 13a41cea509aa50edcd189aea0226c07f730d2b19a42d213a9d6fbd35acfedcd2eb656960f8ba40796e8e4a86fccc8e7c1cb578f568e4af6eb43225dc108a122 SHA512 6e6c8761033586ae3847b9d290df186200ae38e552b7dfe59d1a9ec8c4c4fa6ddd2b10f1c9c9dc3b6d77d0f7791c01cd88f6e8b7971be487ba2f6b144d9348b6
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
index 9721801da7c8..9f8470a82176 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphobjinv/Manifest b/dev-python/sphobjinv/Manifest
index 3aff17afa980..26f3212adf6c 100644
--- a/dev-python/sphobjinv/Manifest
+++ b/dev-python/sphobjinv/Manifest
@@ -1,4 +1,4 @@
 DIST sphobjinv-2.1.tar.gz 1144017 BLAKE2B 71878e1bac5202ab74298b56cd6172236ea524050323e0d6b8bbc0c89f1937d75f10d40b4071cfbe8c9031641e9a0ecb283da908c40840a61c12a7c892438241 SHA512 cde77d73b09b72358b0ac5b0d8f1a748e78dce6664d1b849ba68f5ff70dc43cbcff4581374d0151be29c4d97efe2920c5c00ff68918371243be158031e9554fa
-EBUILD sphobjinv-2.1-r1.ebuild 1363 BLAKE2B 77b597267459fee07588a91f4d1bf374bedb8f21b1f4c814c2f2217739527a3293cdf63a4dde0aaa0238de9264cb15e2f4d2baa7d6136e69cda82b057fb9b0c7 SHA512 50c5c7f668c8fed92f43bdfd95ffd369252e10f73de234684a9b55238cf14c497731917f18d7d2c3d5187862244c74f53870a1969596fe7fd61f985ae300245f
+EBUILD sphobjinv-2.1-r1.ebuild 1387 BLAKE2B e0a7676af0846223b430e85f51bf3fc4d910feae0920c80246e067a2a1bc55150296987d80117fff957a445347789f095a1d075a03cc984d70e89f6477d63ec4 SHA512 8a1b0ddc260c6651b36fa7e6f27908880f64f00a815796727380fe25b320e18b8451a2a8ebfd4f6af2e376ad79d0467f7db6b39646a2eb01ba60058ac7bbb7b1
 EBUILD sphobjinv-2.1.ebuild 1407 BLAKE2B 8695c5392eb2d5440024befdca08563838dedfe1aca714dfb84d276c7bc75ac4150e4d5d98774734f51ffc0790b9c35e90d21e9e81b6333e64e1d6e40dd4c91c SHA512 df353ad06369be41d9dd815ab5abb5c24daea166931a563005425f83687d724368ad4bf5f5be7b3104b0f440269038726ea696cd9d830aadc15a3df1b1e7f6a4
 MISC metadata.xml 894 BLAKE2B 9e3b9ad864c23cd1cf346de1c06bf25035de4566733c1716846267aeba3aa09c025e04b15b67369e74f703e4b3205d89e35fd6614627d9f5630fd233320843eb SHA512 f5407da0c6c12279317b17d7174627d1fc3a42f249c1e63acd73c0367c526aab6b62fd358a34760c4986d3d487839905e2ddf5e40c62668933280c5278fefd9e
diff --git a/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild b/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
index e5d408e9b3af..b23d5730c3d4 100644
--- a/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/spyder-terminal/Manifest b/dev-python/spyder-terminal/Manifest
index 8d7a9a41daf0..ee53e2e49393 100644
--- a/dev-python/spyder-terminal/Manifest
+++ b/dev-python/spyder-terminal/Manifest
@@ -1,5 +1,3 @@
-DIST spyder-terminal-1.0.0.tar.gz 10098665 BLAKE2B a81e4cd2b1194cd750aff7d5a4d2c587ab60264b89e6e4264352b5f8ba850b66f278245fffed176dc36c2d5912e6f676ba2701d0a09bb384810230f631534059 SHA512 aa426e037dce6c2c7010fbf924ace27fa5dce9f736cd3b6b55d8ba3935e02ba4f6dab8815930c8686525c6e74f4119f781afaf9432f22f5436abec2c5a14c570
 DIST spyder-terminal-1.1.0.tar.gz 10097302 BLAKE2B efcdec7614534b8d3b5cf8b5aad0d6bd2d8358fdc0b0095be02dbac1c68fef63d1a325dc1005be18b4a679861e256aacad20f847c4c12eec603e605705b0982b SHA512 05d1850b01a6c3ae8607450f965dbebf4589026f318dbe599fe3c74d585fc093f4fc6cdd35ed26a9a052c11353d511d0602933fddc52f4cc94983d8a7cd75f32
-EBUILD spyder-terminal-1.0.0-r1.ebuild 691 BLAKE2B 7d7e6e7d56c287a646b3b9f711022f1477ac41c84f987e47d9af415184149d64514f5116fd2f43b7c5460abef88974e19f327996029de79b563ff8b5e29c54b4 SHA512 51ddc8aa4df35e0193bf2566f07e1f084add0ada67c0e6ebd877111d178db54cc8a892b6f1590020d11647137b6ac896821c911c1bde9c90235b162011944d71
 EBUILD spyder-terminal-1.1.0.ebuild 649 BLAKE2B f7f4770a725ebd8d9a68e50c6faf439546b3e52555de19cbe670c7fc9a50dea4d5c88f468f530286d028a9cd6e6cd1b04007049d216b60f22b565a5984eac68b SHA512 1589719dd69767a85176bbd2d3055df19d96254c1dc46e86228156bd7b8c1a15b17d0c428032d58757e084df63e2dd63047f9bbbeb0ab9f96d13bec032332205
 MISC metadata.xml 361 BLAKE2B 3c50e1e63c16e0423ebdfc0a862920dd2efc2c47c2a88d6e5568fe8950434c7dd8219bde8a31cfe3046b480c217172705b1fca29562e10524fb644bba59680ba SHA512 73cb744181ea407855879710431ec23f4bc3ec09419bcd129b3ab9c89b2d9a26d619ae00018f5eb3a59afacaa1605de302cfb3e5739ed688e466f6463901c103
diff --git a/dev-python/spyder-terminal/spyder-terminal-1.0.0-r1.ebuild b/dev-python/spyder-terminal/spyder-terminal-1.0.0-r1.ebuild
deleted file mode 100644
index 4fe4f635ea10..000000000000
--- a/dev-python/spyder-terminal/spyder-terminal-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Run system terminals inside Spyder"
-HOMEPAGE="https://github.com/spyder-ide/spyder-terminal"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT BSD Apache-2.0 BSD-2 ISC CC-BY-4.0 ZLIB WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/coloredlogs[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/spyder-5.0.5[${PYTHON_USEDEP}]
-	<dev-python/spyder-5.1[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.10.0[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index 40d876255b3e..f740bd1c0874 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,7 +1,5 @@
-DIST stestr-2.1.0.tar.gz 103501 BLAKE2B 6b000b8e3d0a27a18f19510dd8d5de8641223c18ad22a3f90b73619aa41bbe1a51bcedba604ec448282fa41e2ae93b61fdd0e72e603a39730a59400fc15ef007 SHA512 a99d0659da0ca2b86703529df9ef6d135578bd8374a2afcbd10bd96f24f5e6dd1dacd5929d96a083881f1db2a930b039d9045348a0298d84d2480c6c9a75d1f7
 DIST stestr-3.2.0.tar.gz 118000 BLAKE2B 901654b53fdc9e5ab287b77b0a26ce531e3a167b2f5d0aa0765de170341bac8ebfbc4efcae39f672ca6dc6f7518913cb5e56d87faaef35c0b06287652c06edb1 SHA512 4f5e41c92518104b06f5b9717d59c214a8d87efe47fee199a602e71efd64e29c98711ffcf3b88cd00209946d0ab123c7ec5aa842e1d54bc65d83c8d70fa4898c
 DIST stestr-3.2.1.tar.gz 118139 BLAKE2B dedb63767adfab26d837ce92762dcc44a482b1772aecbc31d12beb22f2c3c08368475cd110de7376f4df7fa8ce03c5b8e3b04436296ad4bd11c2fc3a4243695b SHA512 43187ca0d81e3b31e16ed60a1db561dc49c34f679594d11cad8cb0e658bf790af0b3d606bf99233a5767e2511675d3aedb6a476046d2f5483ffab05eaae393ed
-EBUILD stestr-2.1.0-r1.ebuild 962 BLAKE2B d0387ce2d488ff93dafbcc1a0ef2f92c6b9440b40baaa905d560a8e5591c3981e8433319ad7ee71aeec2429f2d949b02f71341b18c143872fdd77ebd4f230383 SHA512 1f46b2bf824b3782b72f2fdda92241497ec4d8145e9564d42931d6559a68b8c1160fc810ffef3e6ca7f23e79af4a7df332fa3aca5b5da2a82da7973d91d17941
 EBUILD stestr-3.2.0.ebuild 1132 BLAKE2B 3377ce534d0d8ee6c83c061d1c509356147ed06b0cfe3be215a2269bff093cc0bc259f2c93351f8c205dd29c5e6f83c9a707b748dbe4a2e7d2ae6f58a89bfdeb SHA512 43d147a1c513240fd5daf25e516ce6f8d449f7b9f15a31d6eec2ae29169c9af43c96fe2d463e6315877fe72f83c59fe26b4a8bf8ec0668030894697dd2000076
 EBUILD stestr-3.2.1.ebuild 1103 BLAKE2B 3c68765a4b0cd63786054a1c915206a9620125ccd32e64cec3c04c78e45b704ec2030d7e32fa6c9d746dc06fe15bc1403fd9f9fe5a14b566bb9d3cc22ef8bfbf SHA512 466f839725515af222ab610b00ec3a235940a7b1b3d2b665d18beec90a126564617365a628ac8f3eda996ac7618a2fbd34f0e01b418f0491e3e8b8e445cf20e6
 MISC metadata.xml 640 BLAKE2B 2f6a2d6b549da3bdde1994544d2ed3a5a96ba08e1675394112643544d6afbb64162fd0bf8c72d39f1fbc43c3e120577e9d23506d9b51e1889308e670aa7d0775 SHA512 5fa6c1132aab62f72ff471ee8b551852e6ce84d66ca50c71f11c25f228b2c6de65e9d6dfcf464a7b826d9f0ce8768109cc4e475842c39bb7a6647fed662821a1
diff --git a/dev-python/stestr/stestr-2.1.0-r1.ebuild b/dev-python/stestr/stestr-2.1.0-r1.ebuild
deleted file mode 100644
index 1de050c25a05..000000000000
--- a/dev-python/stestr/stestr-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,28 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="A parallel Python test runner built around subunit"
-HOMEPAGE="https://github.com/mtreinish/stestr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]"
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 7bea1a3aa905..358921b2bd5d 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,3 +1,5 @@
 DIST stripe-2.60.0.tar.gz 219649 BLAKE2B 208826e62560f6e9acb5016cecae4f3128106d562f8b5de6caa106179f6991376bacd679ab4cd61a973a60f68a84aebb673d17c1ca8d10541c2ab4a1e761da0e SHA512 eaae2356ed83285713be6396c071b8f5761ad0ff651691b1560b06bca190a5c5df3659182e5a25e8d286257046162f32755854f0e382a280cb63180478114502
+DIST stripe-2.61.0.tar.gz 231302 BLAKE2B e971c3393e255d09eb84bcdf24b5eb32ca42d7d04332cc6fac7685606164c1b95f2b5bffeadb39f11be8c50360da03feca2dce1b4f5f84a3a95cfe4458ff1970 SHA512 5b331d862ea832a821a9dff9bb7569aa2b94726c2d36ec5f304a5a41b3fcdda1096f85f444500f0826fd3e349c47b5ef18ab91b8ec5cb67d966346a0cbd1a7ef
 EBUILD stripe-2.60.0.ebuild 1709 BLAKE2B 0252864a6b72cfb200c448e32f2aace2642c618c41f63b7b5aedc1076a1a7200a1dcc7d5e8edd7df5b09c14d32ddd5ee621414fe32b5de437ea5093e0612ba83 SHA512 5806d44b9c1efd6ba68f23c8fe217c036be9e65e56eda1ae860c7b079c96f6781d14a42970b2e190c45575677dd5800f50b8a993acb18aa210ba7a800840ce92
+EBUILD stripe-2.61.0.ebuild 1711 BLAKE2B b57be9cbb62c1a360c3bbc0dde7f2b6dd6da83425e2af42e1e385311c1ad5510326c0da61f329e7626d04e92dd1274731ef6162e441c07b06fa39cdbfe17a5a8 SHA512 be1a9c0ac20b87cc8cdfa7d34857786de215d4c52f1fc889a183708215de5f6e30e46fdd4a2fc3417bbea0ed452ba3e494ed927305bdf3e39153ec1ba1716fb3
 MISC metadata.xml 372 BLAKE2B e6a38fdec6fc016068e7a0522ba15e83bf358ba1475e54a9630b1e86c75bc14b790c59716317bd81438a1c770e4d31afbe04400ddcd5dd272715c251fd6cb1a2 SHA512 2d9672b242f2d38654f7906097e597dfbdf75afa3583ea331f61772db95d19a802e83ed523c67a6cf3da18411036055c0996fd04d99199618d5205be8a61bd77
diff --git a/dev-python/stripe/stripe-2.61.0.ebuild b/dev-python/stripe/stripe-2.61.0.ebuild
new file mode 100644
index 000000000000..090678079606
--- /dev/null
+++ b/dev-python/stripe/stripe-2.61.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="https://github.com/stripe/stripe-python"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-util/stripe-mock-0.112.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=(LONG_DESCRIPTION.rst CHANGELOG.md README.md)
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=$!
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
+		eend $? "Port ${stripe_mock_port} unavailable"
+		if [[ $? -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
diff --git a/dev-python/subprocess-tee/Manifest b/dev-python/subprocess-tee/Manifest
index 481c588c2c15..37a31e197956 100644
--- a/dev-python/subprocess-tee/Manifest
+++ b/dev-python/subprocess-tee/Manifest
@@ -1,7 +1,3 @@
-DIST subprocess-tee-0.3.2.tar.gz 14975 BLAKE2B 3198832f4c8bbf90e83038e39017cff1efc61ede84aded8220214e388a088777bdb861c044cddbf4b07c7b3172f8164e8bbf82b33de68d1fefea0f81bbacdfc9 SHA512 e681abc27623a3e05031bc05dc15e34f82c9cb544cd16742855411a9edb11fe8e38f9d11f8e651681d04081f121a47c38ebd172d70d282c8110a62699ef687d6
-DIST subprocess-tee-0.3.4.tar.gz 16013 BLAKE2B 6a98caa111a73ef7062f26796dd3e919d05103ae4de88e2c5ce3acc04d9fbde6b31e39a1cee1984fd8d59b8168ab33faf7ff15c916d52a226ff2cb760fd8c796 SHA512 6a97ddc75b7e7954bb7f5f3bf05807e8dd892869cc13e60344c5f40363bdff4ec5441f829cfbcb8c3c4ab7f7b2697c0b1d4a871be8164acd7cfb6fea5032ae4b
 DIST subprocess-tee-0.3.5.tar.gz 16887 BLAKE2B 6eb25085eb2b2ee4557efd556d8035ab8f6b781b47783f24f227db04b3f82fffcfa29d69f0e3588c3fa6188446a3d96d4421e6b1ea5b3292f42635e19a404bab SHA512 47de075e7b6c75598dac0ad1899e1cce9dc1131b49c35ccade2b67c8d2a2d0248ce22a20c336519ff00bfd57269613bc663012e48cf0afa087c93ee74e18e4d4
-EBUILD subprocess-tee-0.3.2.ebuild 938 BLAKE2B 576413423fb1feacc51935ff572e77779f2b066b9fc453913bc39a5b4fa55573752e6e55f2c3b24044424faf6c7fe0ee576b7027ba45dd01e874b17266a9aa91 SHA512 68f45c038995b3141a6e8347f33cabcac27a6ee7493cb84836fde0cb5d2ca105e5b7382ec2635f9fe3c2a1e308db3ff967ffddb02bb19643d33ac0755df85601
-EBUILD subprocess-tee-0.3.4.ebuild 1223 BLAKE2B 5f9d6ad8551e43c838e1cc7e54bba2b4cce1c3865500d5642413eac01ead4115208932fcd9558166b24d05fbf44c1fa65096e497f005d3e3bafc9266061ce06f SHA512 eabc6f04f3788554ba4ecf656cec819b2540659750ccc651c2cd4540ed9fa1eabbb04153f714908004c150b30d15ce59c516d894b4bed9cf6924ed8eb9f4d06d
 EBUILD subprocess-tee-0.3.5.ebuild 905 BLAKE2B de2686e446d4b33872fd24c684efa8ec1267d4e3249b2f2b7277886d73199656ae1d2b5900f3b8c9ccb54e3b335f4c021da5d05daf1f7d493f3071ef283e9a05 SHA512 1ab63e698a0ecf79eca1fa1d11dd836790a4af3f7a513e68b194d368d0ecff784b8504d05a8978cc84b2930cd08cf9d065e23cb4b70829a56980069c3d835014
 MISC metadata.xml 632 BLAKE2B 5764da49dca8c701e0fc0c3446d82bc24b361450df134cf5abe1c72af30d124da17186bda4a775b101e9ff7def515b45a42936ffeb8baf25dec69dd5f6b887a3 SHA512 4d71f7ced279578327551ca7913f02c8a88be17a841c7adb8e2c3e931a879560e12b54f387a714dd8bb327181549c94fb0fd00028aecd7eb4dc6e4f35c4ad4c0
diff --git a/dev-python/subprocess-tee/subprocess-tee-0.3.2.ebuild b/dev-python/subprocess-tee/subprocess-tee-0.3.2.ebuild
deleted file mode 100644
index 6fe160cd6d1f..000000000000
--- a/dev-python/subprocess-tee/subprocess-tee-0.3.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="subprocess.run replacement with tee(1)-like output"
-HOMEPAGE="https://github.com/pycontribs/subprocess-tee"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/enrich[${PYTHON_USEDEP}]
-		' python3_{8,9})
-	)"
-
-distutils_enable_tests pytest
-
-# dev-python/{,en}rich ebuilds do not support python3_10 yet
-# We test fine (modulo some deprecation warnings) against 3.10 under tox, though.
-python_test() {
-	if [[ ${EPYTHON} == "python3.10" ]]; then
-		ewarn "Skipping tests for ${EPYTHON} due to missing dependencies"
-		return 0
-	fi
-	distutils-r1_python_test
-}
diff --git a/dev-python/subprocess-tee/subprocess-tee-0.3.4.ebuild b/dev-python/subprocess-tee/subprocess-tee-0.3.4.ebuild
deleted file mode 100644
index c17411cbabe9..000000000000
--- a/dev-python/subprocess-tee/subprocess-tee-0.3.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="subprocess.run replacement with tee(1)-like output"
-HOMEPAGE="https://github.com/pycontribs/subprocess-tee"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test-full"
-
-REQUIRED_USE="test-full? ( test )"
-
-# ansible-molecule is invoked as an executable so no need for PYTHON_USEDEP
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/enrich[${PYTHON_USEDEP}]
-		' python3_{8,9})
-		test-full? ( app-admin/ansible-molecule )
-	)"
-
-distutils_enable_tests pytest
-
-# dev-python/{,en}rich ebuilds do not support python3_10 yet.
-# We test fine (modulo some deprecation warnings) against 3.10 under tox, though.
-python_test() {
-	if [[ ${EPYTHON} == "python3.10" ]]; then
-		ewarn "Skipping tests for ${EPYTHON} due to missing dependencies"
-		return 0
-	fi
-	if ! use test-full; then
-		local -x EPYTEST_DESELECT=( "src/${PN/-/_}/test/test_func.py::test_molecule" )
-	fi
-	distutils-r1_python_test
-}
diff --git a/dev-python/suds/Manifest b/dev-python/suds/Manifest
index 88038a609079..c82bba760a1b 100644
--- a/dev-python/suds/Manifest
+++ b/dev-python/suds/Manifest
@@ -1,4 +1,4 @@
 AUX suds-0.8.4-fix-optimization.patch 180 BLAKE2B 5f26d711214c3100f59d3f094f6b589af6c33083fc9449dad6259eaffa51f5d00a9c5c03fe088157d7437eb29d8a44f78915d85524fa969ea5b62dd356243c2a SHA512 7a8d24268f3c72cacc6c54cc2aa08048247cec7ae2e9e9bd2affef79e0f38001fb3270f8f3ef4a69c490cc3ae6c7209072e958a4084c02edeb0432a440890075
 DIST suds-community-0.8.4.tar.gz 279775 BLAKE2B 985dbe386219d7a5cf8b9edb5a30eea2bc974fce5158a1f6e9c7ad3b437efdf0e4d8ff2bddeaf5b5ebc7f0a594adaea3b2db3e47b6dab8143f6cefae248dd061 SHA512 316e67fb2b87ac31cb9397a1620b279e608dc0abead61fa548730fce5b5e29fb2da937c6213f3de6bd06f1e97031f27351938da686fa2f9ce9f4399b9944e0d2
-EBUILD suds-0.8.4.ebuild 670 BLAKE2B 8a3ffce98067b560c832da48853567fb386791dd4a3c2f3354ff8892ffa4861d7aa97e4237f25a16004a79843e54207c33c97332d3181ef582aeaeeafc4efc2d SHA512 043671f62fbb24ec4e8c0f3f4a11c5d03e81e8f210a13c067294bf773543a17c9c337883208fe70340f493a0280c8d9a0c004ecc45cba06edfc5799ba0726a8d
+EBUILD suds-0.8.4-r1.ebuild 725 BLAKE2B 0f87044e071236ea6f34f34790aa91cbc51e13453c85d8b55da46331d2937fff2de6aa9d7f33b598fce34b80732775c23b28b976f28665734effac17368e1df9 SHA512 0f785c0b03dfe9f5d89a13600c46f12f13724186f902a74e7502f7c3cad0d973253899277af8f41df65e2429af36767310b46f30535d457d653558229d365b75
 MISC metadata.xml 482 BLAKE2B 1f28806bd8daff7ef29aa2d75a15ec29a754c86d31e968ffd49d6bde35bd8d831d2596efa17612229b74fd9fc4f915eda48a43573e90cec77cbaef252d19297e SHA512 efbe52042096dc0efb0e8f6904cb043ac11880c0a751f9fc79e9f22962b9aa6ae2dd54315d9c52b79bc3adf393c75ec65446ec64e4b28eceb86221b94c53d30e
diff --git a/dev-python/suds/suds-0.8.4-r1.ebuild b/dev-python/suds/suds-0.8.4-r1.ebuild
new file mode 100644
index 000000000000..6c77c8462bd8
--- /dev/null
+++ b/dev-python/suds/suds-0.8.4-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="xml(+)"
+# Tests fail with PyPy3
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+MY_PN="${PN}-community"
+DESCRIPTION="Lightweight SOAP client"
+HOMEPAGE="https://github.com/suds-community/suds"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="<dev-python/setuptools-58[${PYTHON_USEDEP}]"
+
+# https://github.com/suds-community/suds/pull/40
+PATCHES=( "${FILESDIR}/${P}-fix-optimization.patch" )
+
+DOCS=( README.md notes/. )
+
+distutils_enable_tests pytest
diff --git a/dev-python/suds/suds-0.8.4.ebuild b/dev-python/suds/suds-0.8.4.ebuild
deleted file mode 100644
index fc96739b1fdc..000000000000
--- a/dev-python/suds/suds-0.8.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="xml(+)"
-# Tests fail with PyPy3
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN}-community"
-DESCRIPTION="Lightweight SOAP client"
-HOMEPAGE="https://github.com/suds-community/suds"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-# https://github.com/suds-community/suds/pull/40
-PATCHES=( "${FILESDIR}/${P}-fix-optimization.patch" )
-
-DOCS=( README.md notes/. )
-
-distutils_enable_tests pytest
diff --git a/dev-python/svgwrite/Manifest b/dev-python/svgwrite/Manifest
index 64742257dd12..5db2baebc953 100644
--- a/dev-python/svgwrite/Manifest
+++ b/dev-python/svgwrite/Manifest
@@ -1,5 +1,3 @@
 DIST svgwrite-1.4.1.tar.gz 251446 BLAKE2B 21ca55911f6ac1be949c1a714bb61ac58b4b1c04397b1e9076a626080a8420c18a63afb5989c48c7ba6cb843f73bccebd9bd00ae0b032894096135c0ad366cd8 SHA512 74015ed4a72cd781a577ab8c2f38a30a1f6561ca0379e62ecaac8136f40998c926597d97a0c1006fdab69ac4a23ce1841bda296881ede511f3f1b4a2e8dea06f
-DIST svgwrite-1.4.tar.gz 251138 BLAKE2B b105fa60ed75628c59b3ad4d0ea32dddf83f618e213ce6974b5db0e93d519e563eb5a9ff5e37012f71c7ce79579ca927acfb8709d2f8e8ad316b04bae8abafcb SHA512 b722fc51c6b3755064942bb6c7ea199ba5902ee37e426962ed24e0b67659e72e8da36cd2516193e2348a939ab2ccd2c5114349ac72d7b9ea52a7b7d68ad1ce74
 EBUILD svgwrite-1.4.1.ebuild 572 BLAKE2B 5ab2a54c34e83de9b89799b3617ff99072a05e5ab196045291b1f16122eec847c36d783ffd1fc7cd1006657230f29c55e36f89acf65079e62266f21fbf88a6cf SHA512 49856f2fb7f0ce5eddabc80e74dc6a8fa25042062da52f2eabeb9e7ebeb766dea21096586a838031e848cf077a07f457ff5221f3910983110aea2de5e0248049
-EBUILD svgwrite-1.4.ebuild 572 BLAKE2B c117f111cd77172547f0da93cc8374a61aaef1de67de00d556733fa599151724e4fa22eb08a33a5c8c10e683bf6496c20c1bfc5da048edcaa58b73816c02a3f1 SHA512 001170e4fa91827fc95c1973921193bda4c7b7316be991403edb904cc787f6eb7670db47590cfa6f673d23a2e966640c7e5a68bdaafcc6d7a5320f3139f4ac08
 MISC metadata.xml 336 BLAKE2B 7a98647cc502e0dfb0b956344c4987632a27b20c855b787c6cc3bcb204e2cc1b33b51e3d752fe65ca39feee2660c921de36f5a4e6986933ccdd54d2331709c6f SHA512 a82063fce426a8818e0ec7b902e97fcf37a0f10ab81743074fb610a90af612954dbaa091370abbce489b5e4dcde3b97f35086aa2b64b0700c02085b12463ce08
diff --git a/dev-python/svgwrite/svgwrite-1.4.ebuild b/dev-python/svgwrite/svgwrite-1.4.ebuild
deleted file mode 100644
index cd4261420871..000000000000
--- a/dev-python/svgwrite/svgwrite-1.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Package to write SVG files"
-HOMEPAGE="https://github.com/mozman/svgwrite"
-SRC_URI="https://github.com/mozman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# fetches from the Internet
-	sed -i -e 's:test_embed_google_web_font:_&:' \
-		tests/test_style.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/tekore/Manifest b/dev-python/tekore/Manifest
index 7f509094e140..df2b232d11ab 100644
--- a/dev-python/tekore/Manifest
+++ b/dev-python/tekore/Manifest
@@ -1,5 +1,3 @@
-DIST tekore-3.7.1.tar.gz 258235 BLAKE2B e04edfab294ac3dac1fb086f296bf3fcc463cdad981d435fdd19ec812f1bb2ff79cacaa94d5105dc1070dd56602cc9a502537c68020cb27b2eb5b3c93788f193 SHA512 ed315a0b5b071265d2ba12d996bedafdea87286fd1beecc14d247176f2bdd2245e0220fb186ce4bd6eec2bc13a764f74b067ce1e546d8c30e618a4bdc3bf02e0
 DIST tekore-4.0.0.tar.gz 259755 BLAKE2B 5c4c990c14187c20ef3566d1bc0cf32e50fe108d90b59126e2d56105b6fe053ca02c98e7ad7a4fa09345792106e956873a0f42b8492420bd74898557c6d97f23 SHA512 7e5cf6044a6a7045257b9b9830fe4bdb6fb175240b295da3f93cb0557150536655ddf44ab551b52182815fc517b8e43ee704b1061db1284426574e741f7d9a56
-EBUILD tekore-3.7.1.ebuild 928 BLAKE2B 24c1613982da97fb6aaba582e31a54c63a82010a1bf93704062b27b34c7b1983de8b7a7558bd7efe343ff1f6caad7f0dea48d722ceeface3248c2588415de137 SHA512 a586fd636b83b061ef04a2c3300ed4eb26524a5de0deabd7b60cfe513ec034f841940faa3edb42a83d6f0688a3027fde2b93d9b3484acb16bce2fc3720d0150f
 EBUILD tekore-4.0.0.ebuild 819 BLAKE2B 0e1b60ca9b536a4b33c9d3769bd03fcfbfdf0e8787d1f16faad6ad99a7cac701210d36a23816baa9890677eeae8ce3e642c4d140975d534778a975f5cd88bcc8 SHA512 89470324287fb1c85294a89e1b5fb50ba2302e2cc7dbc2b493470a744a86cee5f24c84130e7fab41600bc7112cf706a126dfc3f5e038b2772c2fa950050189ea
 MISC metadata.xml 513 BLAKE2B c6af854b6f684809ccdf1fbf573013580f9d56ab644913d3a095734867f654ec42b4d694e4197418a20e5fa7291737e14c3189bfad9e5cbe0aa9182db2197af6 SHA512 4d7fa6932a8d832226a080294177e08f7891e39fbd5f379f269268b1c21a8e28129c91f7f2c3b32e56de49c0a2d0a3365a5f57dd7445dd3ce09eae01b21409d9
diff --git a/dev-python/tekore/tekore-3.7.1.ebuild b/dev-python/tekore/tekore-3.7.1.ebuild
deleted file mode 100644
index dff9f1b6b404..000000000000
--- a/dev-python/tekore/tekore-3.7.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Spotify Web API client"
-HOMEPAGE="
-	https://tekore.readthedocs.io
-	https://github.com/felix-hilden/tekore
-"
-SRC_URI="https://github.com/felix-hilden/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/httpx-0.11[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pytest-asyncio-0.11[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS="readme.rst"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/src \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-autodoc-typehints
-
-python_prepare_all() {
-	# requires network
-	sed -i -e 's:test_bad_arguments_raises_error:_&:' \
-			tests/auth/expiring.py || die
-	# unpin
-	sed -i -e '/httpx/s:,<0[.]18::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index 0fc043437945..4878fca8bc91 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,5 +1,3 @@
-DIST terminado-0.11.1.tar.gz 14451 BLAKE2B 02650bb272d2f11a5a4fa24d1d67f6fb7e35aa2b55e24abec0016c190d6af705079f2e4f56ca4cfb65eb801b7db02950daa8834c8f8768c15ec7637bb8d1a21a SHA512 55b44e8153a54ab43eff35ce8e1fcc0a3ec9189d5fc14cba6953fa03a7584b1be24ba53bcd8a5ca6e17da1fdc8e4f34c5c74417842bdad54a6c913a083d9487a
 DIST terminado-0.12.1.tar.gz 14513 BLAKE2B 97537851a2284c4cae2d9cdc42ad2714c9368f4318ac14c35197d6691404bec205b7b589c35302ff9d3fa99e4a15e24e713f70cc319e26788631134ff4b77cb1 SHA512 770a41b8fa6b43a577c077e8239a43b654f8e4423564ca38d66428ed6c322edea64c98225cb94ae182add9757b6d4e52796edd332443fe7ac643677a8d133674
-EBUILD terminado-0.11.1.ebuild 822 BLAKE2B b9b8138ed7f380f8f54214a123313238cd291ffd77aa17f82972994069ad8f7fd0b3d06f22985fd1abb192caa80f6038ebb562c02b0b2e93325368aa5553430d SHA512 8a08de2bb4d62680606cdf798ef8a64d9e8c0a346b39adae452e4fb23ab6d1b3b2c9bc443b97f4c93fe18b3ae79b11524b53f3d13c9853068b7e9c3469cc606e
-EBUILD terminado-0.12.1.ebuild 824 BLAKE2B c47e09d0202312c9afd444f37967c1bc84ec0acb4dc033f7b246c5d7e7523c401e0ed0f55db69ab3ac096f32a0022549aae2ed35ae12c37e7a50cac77c1a23d5 SHA512 5b05468f861528b2c1fccce4105d36094b10bcf510229b9661f5c877477a894a03f12758a2e11ddd7ad731c0df714c86b4bc6fe47645bed2649916fb5fb20621
+EBUILD terminado-0.12.1.ebuild 822 BLAKE2B b9b8138ed7f380f8f54214a123313238cd291ffd77aa17f82972994069ad8f7fd0b3d06f22985fd1abb192caa80f6038ebb562c02b0b2e93325368aa5553430d SHA512 8a08de2bb4d62680606cdf798ef8a64d9e8c0a346b39adae452e4fb23ab6d1b3b2c9bc443b97f4c93fe18b3ae79b11524b53f3d13c9853068b7e9c3469cc606e
 MISC metadata.xml 407 BLAKE2B 11da32addf98212561629b99650880eca0a6c057414d8a97f535f40b046c6587d326e3193eab264f439caf38e5d6d8f3f5d1a5891746262494ced39effb2651f SHA512 6c993bf16c0413aea33e06efef79dc6189d3b62b71574fffb2bdce7ddb27b4b12f1d5c0d2a3a80a51ae8894c60efb83a9966cabd53662d358f3f1ec52d27590b
diff --git a/dev-python/terminado/terminado-0.11.1.ebuild b/dev-python/terminado/terminado-0.11.1.ebuild
deleted file mode 100644
index bd491020dfe7..000000000000
--- a/dev-python/terminado/terminado-0.11.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
diff --git a/dev-python/terminado/terminado-0.12.1.ebuild b/dev-python/terminado/terminado-0.12.1.ebuild
index c4b306ce1319..bd491020dfe7 100644
--- a/dev-python/terminado/terminado-0.12.1.ebuild
+++ b/dev-python/terminado/terminado-0.12.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
index e73da17b008a..c478672c347e 100644
--- a/dev-python/tikzplotlib/Manifest
+++ b/dev-python/tikzplotlib/Manifest
@@ -1,9 +1,5 @@
-DIST tikzplotlib-0.9.11.gh.tar.gz 97761 BLAKE2B 95454a9181b219e99970d06a0e40d518284ff62c7b06d9cbf5b3125b11a711e67f9df1676dc1bd73a9ec632fa01786890e3eef030f8a52ffe809835e3890359c SHA512 05fa8285f4912f2593a00ec5961f4ca94964c2ff8271158c6c1e0447f1f2b54088a76192bcda4f893adc2ad78b9240742962eee1e56043777b0df145808f42ba
-DIST tikzplotlib-0.9.12.gh.tar.gz 97773 BLAKE2B 85d85445e313a41ede8c2d61d8db0d92a8f4fbb0722f716845f0fff3204e603e8b21998a588137eb67bdbc4d8f31bc5bfc82e29fc803b3c54c416191b6e5310b SHA512 4754707727eda29796a49809473b840c07b2cb7de606089d79aeb05daa6ded95a3f110deffb13ca2640e44d91c43b53520d6f29b175e200862492cb986b6c574
 DIST tikzplotlib-0.9.13.gh.tar.gz 97787 BLAKE2B ef767737b8d222773f2d5e02dbf80ac8a48ea8a00077eb245e5817337805deb5b9be27e7ed76354808647ea1ed6b17d3bbca9b33799d294bd924c18b224e3621 SHA512 f9b4c46b3179626222713dd771dccfa6b0c34ff55658838aba74867c7cd5b91dddfaefdcd2c41824c9f13a795cadd6720240beaf3d504a7f735a2169c441b449
-DIST tikzplotlib-0.9.9.tar.gz 591659 BLAKE2B c8ed8069387aedc154ea1541c7e4f97cd43a74c384be4810029acf2dd1de348d732c004850b3248ba6a892451afec56fc4de0c6b05c3f4edc7b72b741e46b558 SHA512 3b6bc8b23693b1817b7f8969352bfe45f81762f86d30b9329c3c57fb1897ee5965f5759e357bbe68d21b84ac3e53e5ce80ffafccfac22d9a4a36ce104d5a2966
-EBUILD tikzplotlib-0.9.11.ebuild 1082 BLAKE2B 5efb22bd6a05ef85456cbcc639b3f49850d64fec4bb5102027a07fb99ebf179e6b93ff6fe72ac1ff8951e0d09ba4f7cd327480380da1e09ef1b520917d644b1c SHA512 46f28ad8596c02820f0103aa20be699f8599d8c957e9597e6199fd11865ded29f5ccc77f9cc7bb6542259de83f12fb31102998e53f45a24009045ab6c01a3424
-EBUILD tikzplotlib-0.9.12.ebuild 1082 BLAKE2B 5efb22bd6a05ef85456cbcc639b3f49850d64fec4bb5102027a07fb99ebf179e6b93ff6fe72ac1ff8951e0d09ba4f7cd327480380da1e09ef1b520917d644b1c SHA512 46f28ad8596c02820f0103aa20be699f8599d8c957e9597e6199fd11865ded29f5ccc77f9cc7bb6542259de83f12fb31102998e53f45a24009045ab6c01a3424
+DIST tikzplotlib-0.9.15.gh.tar.gz 97906 BLAKE2B 6ceac71ff62eea1990ed1820c1c6b2bc7891787fb6604e2e32c4a512a6ca6ddb66800a0208145eaa36c3c8c646a84907b08e747b1d081189a49fde25649419e5 SHA512 cf42bca0be45e6e79e425d0e2da4ffd42868f081186d91dfbec8de20fbff9ab4a071267bb290240b080f9d86bab15e08d757e905690c37f43c0dac7e724ab609
 EBUILD tikzplotlib-0.9.13.ebuild 1026 BLAKE2B dc8f843202329d079d0aa5a2b045ba3695d04ca58add84a0dd74c0729baff04f0d17d5d5d304cb2da7702cc11701bc46a0b233e5845159e3c68cc2fdcdb3bbbe SHA512 f00b13a59a7bf5e5e0ba96b669d8c827ca368b0f0f479db6cebde982519800fb53aa1576e13537ad9416eded1b23e6e8caff5e96952c961844483d8f843c3374
-EBUILD tikzplotlib-0.9.9.ebuild 922 BLAKE2B b4815d76979b0b54774c1907b447482c512e5aa56c3d92eac67b204580fcb157ed1b2d63039c6e67c578d31cd75cc300208e99c233c910214177d25830577928 SHA512 87cb7ac58c25c67c1337e0122aedd405aa29a0515cc55c9a6b833e11b0d00e21a6397a9e9f6bdbf427c4b2c2921925305b9de21bf6c35e52b3978de243fc4110
+EBUILD tikzplotlib-0.9.15.ebuild 891 BLAKE2B 7b984cda440ae7f2d3f37bfa79b6ca31a3bb138055ba39d2efb75e9979f8cf26d9d58b8a00ac0e12ce79bd40c5f1ebf512285bc704c7a0232562d2d165a4314b SHA512 3fbf455b282f744ba8c193ba42e713815ca56b8bf10668639afd5ba7736f779affc2c457f82a3a43b65e50ebf67c89dac7f441f61f7ebc1090cb48895c14b26d
 MISC metadata.xml 972 BLAKE2B 58a15fb4ff395c481a755bb9d25c08cb149d4e6fd3db47cafdc4a477dfbb610f78eeb1334bb5742696a8e5e9ceab4f1653a668b93664baa8aa36d11cdf350e31 SHA512 2c363093ad18d3fac9413548e628b153540b4283ec5900cd6f375219408c00176ea9abdb54d576dc764aa713fb33bf8f0dbfc6c54a355f1c2d3dc7e6b5f089d3
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.11.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.11.ebuild
deleted file mode 100644
index be7409c6cc0e..000000000000
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.11.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
-HOMEPAGE="https://github.com/nschloe/tikzplotlib"
-SRC_URI="
-	https://github.com/nschloe/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-text/texlive[extra]
-	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/exdown[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/mock
-
-python_test() {
-	local -x MPLBACKEND=Agg
-	local deselect=(
-		tests/test_barchart_errorbars.py::test
-		tests/test_colorbars.py::test
-		tests/test_fillstyle.py::test
-	)
-
-	virtx epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.12.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.12.ebuild
deleted file mode 100644
index be7409c6cc0e..000000000000
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.12.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
-HOMEPAGE="https://github.com/nschloe/tikzplotlib"
-SRC_URI="
-	https://github.com/nschloe/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-text/texlive[extra]
-	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/exdown[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/mock
-
-python_test() {
-	local -x MPLBACKEND=Agg
-	local deselect=(
-		tests/test_barchart_errorbars.py::test
-		tests/test_colorbars.py::test
-		tests/test_fillstyle.py::test
-	)
-
-	virtx epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.15.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.15.ebuild
new file mode 100644
index 000000000000..adfccd0097b4
--- /dev/null
+++ b/dev-python/tikzplotlib/tikzplotlib-0.9.15.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
+HOMEPAGE="https://github.com/nschloe/tikzplotlib"
+SRC_URI="
+	https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/texlive[extra]
+	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/exdown[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/mock
+
+python_test() {
+	local -x MPLBACKEND=Agg
+	virtx epytest
+}
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.9.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.9.ebuild
deleted file mode 100644
index 7a307bf1c63f..000000000000
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
-HOMEPAGE="https://github.com/nschloe/tikzplotlib"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-text/texlive[extra]
-	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/exdown[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/mock
-
-python_test() {
-	local -x MPLBACKEND=Agg
-	virtx pytest -vv
-}
diff --git a/dev-python/tld/Manifest b/dev-python/tld/Manifest
index ac285cbd005d..9d3588e3fbeb 100644
--- a/dev-python/tld/Manifest
+++ b/dev-python/tld/Manifest
@@ -1,10 +1,3 @@
-AUX tld-0.12.5-names_cli_test.patch 731 BLAKE2B 6e670b04f8bd8b84862fd054ec8196208fad70e9adddebd71ed7262189ce3ed0c9a257d55524eca206e878da9888822e21d89a23f9571f86af1b0305abf0d97d SHA512 527b83faa10afab2e295973b4999a7a2e6344b8b0d5cf2bf920868b0346d1dc3668d5290fa3f93ad4617b9b2f1f435cf27b96eb4c9c8bda0ebe91543d09290f9
-DIST tld-0.12.2.tar.gz 1347015 BLAKE2B d284581917a9ddee026d316961f2cdc6efc8a3c8dee8112c7266d55a9493f1aca831db0635db02b737bb3e02b3910a8822e121a5317ab02f5078075839e02c91 SHA512 b997bd3cdf22f65862c9b3e7d446014325d9538dd06eeed86f4b9b6c6ba440829b5d611cc19fed9bf8bf039ef01c4258c71b5c765bbecdfc345dd00e73c7fca1
-DIST tld-0.12.3.tar.gz 1498596 BLAKE2B 7a1d33c3527bc1dfeb18bfcc5af4d153f9cc39b52e858f4ac5907d0edece67da6bb6f900d028937bafb468b31534ed284a54effae6d97397dd33e27261af3730 SHA512 fe33bb18bceea6e1eb4ba3ca46dc54c81a8d3a1f4187078488676b951e6734a885a44525f6f5c4dc8c2fea1b0f4ffd8060244fbf33f9b1bd9dfafbec12876711
-DIST tld-0.12.5.tar.gz 1500013 BLAKE2B d6b51e144f9c1305212ccb537b3488b7643190598674103e8fc7772c34f1e5a6eefb09d957a6ecd1ffa3e9ab0cc41b07dd97ef70f031259393c7410cd05e0b29 SHA512 90fa3911f64368e3c75d034b5854d4460ac41b603b431ef94bb0b49bbd37f5fadb0a084f24849aa8fa2a74608ea9555eec2d4372641bc4d135e1cb4fd3ad23ed
 DIST tld-0.12.6.tar.gz 358405 BLAKE2B cf7bd68f26507cd4ac1c681705d8c495131a8b3aa64115e0259f7ef33f61c5db4911cc8cb1493e901237d401bd4eff4bda9cd687d19d9e1e275c3d87980069ae SHA512 ff10041178976af97c920a519ce3bb5a0a46f4299c24419db9a0502e89296e2bd66885dac5927e940c3abc22d6b390336916622cab771a57ba1c8f0960de2583
-EBUILD tld-0.12.2.ebuild 490 BLAKE2B 354bdf41df04dd5a27e14b3efdbf1cbd156e41b6579a2c935b4314221fe259c5eb92d1e6ac622de92e20eb51da822a2752dc3db50ce15258e94db46458345d80 SHA512 60c451052622785ac4ca5afeff3c327950b6a962bbfb5a7bec2126dfd052084ffc5c358b178621c30e862a9498077d9c3326ddf90dc48799ca18e2fcfaabc66d
-EBUILD tld-0.12.3.ebuild 461 BLAKE2B 630553c09b2f1f6035f1f204c82dd43abbdcb99e33a2d6a476064ad31b80434a46c55d08af95f38002ab71e55968b64793cffecd25a73074568221384c3bff3a SHA512 00c3f5d42d752af7d910a2ae59b284177fb78fd13b8b79b9a78b9a60d37f2a8eb8cadd9f9b03e5ba18b04283aa1e8b221e226cb170a693c2519ba23dc30b8004
-EBUILD tld-0.12.5.ebuild 716 BLAKE2B b2679852d1a62e875e89af34be66e4cd94ab748bfc4d3dbc3f252b5077ff7e69d6bf083f6b9ffcd56ee4b856f5807e6ade34ec0f069bfd766be84ac53638605b SHA512 b3a60e15619fe923b0adb979f93e09ccca0211d6d155a4765aff697ddce9dbc2f37724bafcd7d392529fd84004df8f5680a160efa130310153960bc4b0f3a308
 EBUILD tld-0.12.6.ebuild 610 BLAKE2B e738daf9a15e5a9b9f7f6196099ae7f91a4a61f42d852e5848f669bdcf44c50593b63ca4d23a715c4ee3f871100eddebc558a27f31c0bb455bac80ed582e88ce SHA512 ee432d82a3c30c16e3b4a2061ddfc317a147d13baba2a18363a91a17c4a7cb0e0c15445a25f8b473877d49869f8e76319a152add66fdc25f120ee5a7a18392b4
 MISC metadata.xml 479 BLAKE2B 980df3b99d6ace9a30fa47b81979a0ca82cce1dff5f7fac8bbf8f2657bd01927e713c1de97ae6554aba5f48a8800db262910c4f3497d4c2ae51b2dc098463828 SHA512 04c7d683636d486839f2b5876ab83aa37a30a7c57edbef6b0a82952ff53f21ca38c25f132f2b57659573622ca710b3176478ca3cd9336f41e9fa85648301d3ed
diff --git a/dev-python/tld/files/tld-0.12.5-names_cli_test.patch b/dev-python/tld/files/tld-0.12.5-names_cli_test.patch
deleted file mode 100644
index 05af5236b1e2..000000000000
--- a/dev-python/tld/files/tld-0.12.5-names_cli_test.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur tld-0.12.5.orig/src/tld/tests/test_core.py tld-0.12.5/src/tld/tests/test_core.py
---- tld-0.12.5.orig/src/tld/tests/test_core.py	2021-01-11 22:28:08.000000000 +0100
-+++ tld-0.12.5/src/tld/tests/test_core.py	2021-01-12 22:27:47.286114741 +0100
-@@ -710,14 +710,6 @@
-                 )
-             )
- 
--    @internet_available_only
--    @log_info
--    def test_19_update_tld_names_cli(self):
--        """Test the return code of the CLI version of `update_tld_names`."""
--        reset_tld_names()
--        res = update_tld_names_cli()
--        self.assertEqual(res, 0)
--
-     @log_info
-     def test_20_parse_tld_custom_tld_names_good_patterns(self):
-         """Test `parse_tld` good URL patterns for custom tld names."""
diff --git a/dev-python/tld/tld-0.12.2.ebuild b/dev-python/tld/tld-0.12.2.ebuild
deleted file mode 100644
index 50f4a678d975..000000000000
--- a/dev-python/tld/tld-0.12.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Extract the top level domain (TLD) from the URL given"
-HOMEPAGE="https://github.com/barseghyanartur/tld"
-SRC_URI="https://github.com/barseghyanartur/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/tld/tld-0.12.3.ebuild b/dev-python/tld/tld-0.12.3.ebuild
deleted file mode 100644
index aeeb2bfd8188..000000000000
--- a/dev-python/tld/tld-0.12.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Extract the top level domain (TLD) from the URL given"
-HOMEPAGE="https://github.com/barseghyanartur/tld"
-SRC_URI="https://github.com/barseghyanartur/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-python/tld/tld-0.12.5.ebuild b/dev-python/tld/tld-0.12.5.ebuild
deleted file mode 100644
index 3e041e70310d..000000000000
--- a/dev-python/tld/tld-0.12.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Extract the top level domain (TLD) from the URL given"
-HOMEPAGE="https://github.com/barseghyanartur/tld"
-SRC_URI="https://github.com/barseghyanartur/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? (
-	dev-python/Faker[${PYTHON_USEDEP}]
-	dev-python/pytest-cov[${PYTHON_USEDEP}]
-	)"
-
-# Calls system binary directly
-PATCHES=( "${FILESDIR}"/${PN}-0.12.5-names_cli_test.patch )
-
-distutils_enable_tests pytest
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index 65dae9fce9d6..ac0d6a6afba4 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,10 +1,3 @@
-AUX tldextract-3.1.0-skip-pylint.patch 539 BLAKE2B 94b0055259e6220d0aa2fec49af146b596377c493f950b27e4f2f578f153ca659e5dfdb2549932e0cf8a2ffbef844df773b279b715d86b5b6582b9464c849229 SHA512 961578dcd641c651a7ed52de99cc448d53178f03222bfda8f849a26f46c8b95c0e2351981f10bff6fc6adad2e16510fe30c879af117a7246398164ca7ed95945
-DIST tldextract-2.2.1.tar.gz 54538 BLAKE2B 0abfb1982d0b9e9cd767bc64db289da8bf2f58b599eaea7e703adf36934dae0d052170fa9a8205b8ac0b441d8f1ac75648ccc108515586b0bcacf2ecb43fef52 SHA512 db4f14e514c0e68f85f28226343d7ec91ceea2843ee01c9a2950f0972f365bf343640e07cfb118aff52bab975719be71d179fc6b3bd4da7eb62a47b62747cc0b
-DIST tldextract-3.1.0.tar.gz 101874 BLAKE2B 105f34699de2118126dc0f9d68f25999f99211aa8529c2640dd21d303cfb18cd5388819986881e235b8111a21b74d99c6424ad469a66a0ac45c25a0e7c31a21f SHA512 c6c67598b7dd2c8e85008c5061693182eb075e16390b001eb696fd12a0f5666d0a327667a0fd61e4f270003a8cfc97a8fbf7b53a246bab6f9e9ad95943dac9d8
-DIST tldextract-3.1.1.tar.gz 103195 BLAKE2B e0cdf85e22d58bf68705e9c37cfffaa8a9508316e734adf682b14daa50f02b408cbeda9f4554674f0f582b3246e750bbc46c70d7528c1a4af30b55f05e4bf595 SHA512 caec65beca0b2ba8f294043cf2f64839aef9fe472d1a76619bef1ec6b33ac99ccd08c24601c7fd97fef215621c9ec71a34911d3832febdb36d3f8ac9561b1175
 DIST tldextract-3.1.2.tar.gz 103248 BLAKE2B 5612016be7e8cd9b75dc5225f87ebc28635d66a7cacee54af2bd8db6ed6bb26ffe6ee5b4ab9b24473f19f0ad8d9d536e24236106288cd82cf635abef81f9babd SHA512 2c2340a9142d49aa7c0db71b5a7fb1a63e19354a5da8edd7de923e55c8ec03d8a8551f4710c66d6d1aece1d0d78701229ef5ed2ed49bcce44972b7b96747bd77
-EBUILD tldextract-2.2.1.ebuild 624 BLAKE2B 0a93652157e06ed51fa4862c4674dbe15b5ca349f50a1f3105d58add7fe00324794cf6004b2b50da90aa5ec211c47e180f151ed47d0e71a809245e940969949a SHA512 314957d9b89deb7a7e8618c81e5654259ab0f520170a44abe316f2ba629959b86b3eeb592374b97235817d391a86b33b9d5934715bcd96aaff95be240616c939
-EBUILD tldextract-3.1.0.ebuild 873 BLAKE2B 70683c219a32c2d559dc0af01c8f2a005ca45a46b9586c46b7f6705a97fd47f86982ba900a62ac0100179888746a7cc0a99bb918200114a42b117a2bebe7c1a1 SHA512 99d0d575cd4d39809f51e93cb8b3968b4ed18be5a4edecf0a28fce31c6c87a46fc47f21e18da062f33ea1bd1b1d291cfe096f28fef6c53084ce59930ac63d5a7
-EBUILD tldextract-3.1.1.ebuild 854 BLAKE2B 6f0199472e0a664f589c340271ee64fa4643a2db60d44cfd684430d132dcc9779f09ee8b2f66343f4964e11f4dc67bf89c67f950673ccf02e31d0a705e58fb48 SHA512 4f2062c18c84dcc5e3e892d1b3b5d8e541ae477b7d308307542bc6ee937966ec1ef7dec15c6e1458ba594d965fe843344358e81c4cf050b90f27c8ebc3c54013
-EBUILD tldextract-3.1.2.ebuild 764 BLAKE2B 1f1d4b707df76e07d4aecbfcada59d9f3f42282b3cd6ff644872225463e911aadaa9fbd3206f9c4b8133edf64de470823f17f240ed97feca3f5ffb3e23032a3c SHA512 149379f455b6fc865426785af800f00159e12a0cc382f50c0adb116b5fad4d5668e23233c910834ffc4a454c424d5e0917fd4e256f79a4455a3b34d805ae9d50
+EBUILD tldextract-3.1.2.ebuild 771 BLAKE2B deb8d4c38e27ccc025313c2431f6ea3005fcda34da9e57afdceb74eab70e373e168c0ee4da40c1a2becde0970841de62978f26ddf0099576e5733d9ab0e75d2c SHA512 b9f05b5de278149d50ec10b2fde7ea0dfa8ea702a771de35bb4516308b0a5ad9caa81b469db8e6a7ddc277a5915576f3096070f6a6171575a797db4291a04322
 MISC metadata.xml 560 BLAKE2B 4d6e6aa7507ce4734371e8b8442e8d4840db0d2896f7e7430438bc9b700edf6c8546fc3beb1e17d489013b6cc49d1daf805581d6fda29f51109e7a643b0e8965 SHA512 4e7ed8a1876afc62954ee58937557182099ea2289633d2d279a2982bb32a8de261163f0b83ba44c257b8c087c007b1bb462ecad69df1115a024a3a9c8ea1fe9e
diff --git a/dev-python/tldextract/files/tldextract-3.1.0-skip-pylint.patch b/dev-python/tldextract/files/tldextract-3.1.0-skip-pylint.patch
deleted file mode 100644
index c80541d79ce3..000000000000
--- a/dev-python/tldextract/files/tldextract-3.1.0-skip-pylint.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From f189ebb3ecf60b9764852021988112df5c9e25c7 Mon Sep 17 00:00:00 2001
-From: Louis Sautier <sautier.louis@gmail.com>
-Date: Thu, 12 Aug 2021 13:34:52 +0200
-Subject: [PATCH] tests: do not run pylint by default
-
-There is already a separate tox environment to run pylint tests.
----
- pytest.ini | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pytest.ini b/pytest.ini
-index 6d94ff5..df3eb51 100644
---- a/pytest.ini
-+++ b/pytest.ini
-@@ -1,2 +1,2 @@
- [pytest]
--addopts = --doctest-modules --pylint
-+addopts = --doctest-modules
diff --git a/dev-python/tldextract/tldextract-2.2.1.ebuild b/dev-python/tldextract/tldextract-2.2.1.ebuild
deleted file mode 100644
index 28690d11e5c2..000000000000
--- a/dev-python/tldextract/tldextract-2.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL."
-HOMEPAGE="https://pypi.org/project/tldextract/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/tldextract/tldextract-3.1.0.ebuild b/dev-python/tldextract/tldextract-3.1.0.ebuild
deleted file mode 100644
index bbd890ed877c..000000000000
--- a/dev-python/tldextract/tldextract-3.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL."
-HOMEPAGE="https://pypi.org/project/tldextract/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/john-kurkowski/tldextract/pull/230
-	"${FILESDIR}/${P}-skip-pylint.patch"
-)
diff --git a/dev-python/tldextract/tldextract-3.1.1.ebuild b/dev-python/tldextract/tldextract-3.1.1.ebuild
deleted file mode 100644
index fe0c1f271c53..000000000000
--- a/dev-python/tldextract/tldextract-3.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL."
-HOMEPAGE="https://pypi.org/project/tldextract/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--pylint::' pytest.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/tldextract/tldextract-3.1.2.ebuild b/dev-python/tldextract/tldextract-3.1.2.ebuild
index 4c780be125f2..235416ec6276 100644
--- a/dev-python/tldextract/tldextract-3.1.2.ebuild
+++ b/dev-python/tldextract/tldextract-3.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
diff --git a/dev-python/tomli-w/Manifest b/dev-python/tomli-w/Manifest
new file mode 100644
index 000000000000..b81fdfac72ab
--- /dev/null
+++ b/dev-python/tomli-w/Manifest
@@ -0,0 +1,3 @@
+DIST tomli-w-0.3.0.gh.tar.gz 61366 BLAKE2B 1ca3d50237d41fb22e8d506d2d8af3c5d9f690161a44439d3a79038bda7a67a6af9ad62b077169b5c2bdaee2110a3be5e3eec652aa8866a20c5841662f18a7e1 SHA512 618b93f2d98eee4fafe502e25f8770dc58558b25d9ec548fa5d0a6bdd8914e487fb1d16b68d138e0f8a48a6e5713c23e4d1a6daf70c8eafa27630fee05dfe8df
+EBUILD tomli-w-0.3.0.ebuild 550 BLAKE2B b04e0d74af91b4d9ecd25b9709b6423d267cbf8e2e0b94e68ceebd3ab14a1077c058268b9b71228eb3bd6b21f44b7fd6e78acfdc6844dd6b3da2de1e1ee736ef SHA512 dc680e42111bc4a14db145d9bee7fd2c153a46984cc752121384967108d2f8dc0d9fc4931f9bf43662a74fe75434ec3e459d1b7eae9ae85a5dc69d131b38dfe1
+MISC metadata.xml 367 BLAKE2B 03ee20d3019b6e8c8644f8237b6adabe1b6eea7badeede4ee2ff0ca01617c708882b6ee9a57e2f6010f3a939251244099dd2c8c3072a9570b569f833f1dd1e22 SHA512 138eb7c21f92505f08e882e4371f0025748ce722f86442d2c6cd6483620124645bf01e6af3d2c5e383bbe4647c7f97843b0fd4e298486dd0c972a2da64624aeb
diff --git a/dev-python/tomli-w/metadata.xml b/dev-python/tomli-w/metadata.xml
new file mode 100644
index 000000000000..499f307591cc
--- /dev/null
+++ b/dev-python/tomli-w/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">hukkin/tomli-w</remote-id>
+		<remote-id type="pypi">tomli_w</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/tomli-w/tomli-w-0.3.0.ebuild b/dev-python/tomli-w/tomli-w-0.3.0.ebuild
new file mode 100644
index 000000000000..48aa3a6e56e9
--- /dev/null
+++ b/dev-python/tomli-w/tomli-w-0.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A lil' TOML writer"
+HOMEPAGE="
+	https://pypi.org/project/tomli_w/
+	https://github.com/hukkin/tomli-w/"
+SRC_URI="
+	https://github.com/hukkin/tomli-w/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/tomli[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tomli/Manifest b/dev-python/tomli/Manifest
index c3a96ddf31cf..60d56e9babd1 100644
--- a/dev-python/tomli/Manifest
+++ b/dev-python/tomli/Manifest
@@ -1,5 +1,3 @@
-DIST tomli-1.0.4.gh.tar.gz 120508 BLAKE2B bd75568315b405598578b395ec0e20b7f37e9ceee58f145cda8adaf58a3fa549cd35902650f5b2aa84b764ab32eac8a21d3ffd94c0c4c43eab3c3a0b49203a71 SHA512 e30e06ea805c94359596c3d6db82464ccafcdde0172cae12d62c889c70986159b3198cf465183854bef1b048c21e487c2b0dad2825e2477d363885e749b238ee
 DIST tomli-1.2.1.gh.tar.gz 122701 BLAKE2B d0280bb81a6e931a175c6ef2c58b4f36b1237f99a73331cbb95f98b9e68a98a4c6a635aa12751ac46492c2b1a06a821f1ae70cd0c36f268998488e824f3e577c SHA512 34f9529b137331b0ae03ac99170b3f6509847356594be14166bae306ea4fbbddff808ffe0c48d05434f72d223a2f35b511675217053029d287725b7142fbd089
-EBUILD tomli-1.0.4.ebuild 824 BLAKE2B 7355a32afbdf50eac4dbda5801647dd2bd160b3390fe20660dc73ee2f4e633dcba3b0342dd2d9e92fd9c9b5e50eff56d31afcfa77079cfc53e2b3826c2bf8572 SHA512 3fa25d4bfc1b2e7b209689fa58d6bd55fdd07ca4e937d811d5e0ac41573456f4f1b776ec068c754d3b00a6c8d79e07d5ec76fe7de53c5ba144f8848bbc156cd6
-EBUILD tomli-1.2.1.ebuild 904 BLAKE2B 6420df7ae50f1a42d7332c0037db6254af264b8e3e691ff7929b7c7aee0f4e48a39f7f72d822685c3fea4f21705586da8ee3fd6742a9b7c6aaf86ba664918c21 SHA512 b6a596eded3f4990389226beac44216025b2a9f4bec2e2dd149a232132ecd3dda808e3278d78ef7678aabef7bd024467bdabbe67e6d386fd894f7df364f8cf14
-MISC metadata.xml 339 BLAKE2B b08685e6617443fa9014550136bc6c5a94980e9c067c7a37a90b573d00621364d5484843fc5c5ad73c361807d59dd65c95893fa984be3fe6da9e630529afa3e4 SHA512 b20def328a2eda3374034e9c597a746e396d8cfee2b0915946c349dbf19174821362fd5e1e8722319d63677ed7a14441a0e1afb6fa1876d2040db823eefb09c2
+EBUILD tomli-1.2.1.ebuild 896 BLAKE2B 7ee772f1b4f8e1f331b5851f347c911c0d305a3147a7220d7dc15a8d49e9d6fd8ce024f601af1b1d13bdd9b51442f03a930e8751083953d6a13226a9d3fa9adc SHA512 339bc21a22fdd8628d16084421748425a7e3e526fd1161008a21ae5c480f5282c6f9bf06201db6dbba5996d383995a16910fff11b1793ab8a96f724ed0c97e11
+MISC metadata.xml 363 BLAKE2B 2c80a2c2a8959a93e392da0e03303ffdae0a3291624c284f91d747d13983cbc188d8a64f8763ea484f792d5a42e355381034f69fa0acde382779e4ae53ac2154 SHA512 42e8d4b4d1ec773b53e8e119ce6afb74acd64de998c372c6f6ab64f70713dd825420d1e1af83b5f647dc03a917b1904d65f0cd06cbddea47a33a558be2c89562
diff --git a/dev-python/tomli/metadata.xml b/dev-python/tomli/metadata.xml
index 17587c01a2ec..ce50c1b44726 100644
--- a/dev-python/tomli/metadata.xml
+++ b/dev-python/tomli/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">hukkin/tomli</remote-id>
 		<remote-id type="pypi">tomli</remote-id>
diff --git a/dev-python/tomli/tomli-1.0.4.ebuild b/dev-python/tomli/tomli-1.0.4.ebuild
deleted file mode 100644
index 169eb9c1465d..000000000000
--- a/dev-python/tomli/tomli-1.0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A lil' TOML parser"
-HOMEPAGE="
-	https://pypi.org/project/tomli/
-	https://github.com/hukkin/tomli/"
-SRC_URI="
-	https://github.com/hukkin/tomli/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# we don't use pyproject.toml to avoid circular deps
-	cat > setup.py <<-EOF || die
-		from setuptools import setup
-		setup(name="tomli", version="${PV}", packages=["tomli"], package_data={"": ["*"]})
-	EOF
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/tomli/tomli-1.2.1.ebuild b/dev-python/tomli/tomli-1.2.1.ebuild
index f682c45cb222..a70cf1f97ff8 100644
--- a/dev-python/tomli/tomli-1.2.1.ebuild
+++ b/dev-python/tomli/tomli-1.2.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )"
diff --git a/dev-python/toposort/Manifest b/dev-python/toposort/Manifest
index 50966618de55..b95245d0a522 100644
--- a/dev-python/toposort/Manifest
+++ b/dev-python/toposort/Manifest
@@ -1,5 +1,3 @@
-DIST toposort-1.6.tar.gz 11690 BLAKE2B a9a57fd182a3324d43112c3f84a20039f032d99bf2c35c6678a6a08c23b123f18610f460529dd39c769b935d98270a25ded2f1a483e4e6f06d3ccc501b340cb8 SHA512 8dc30b5d5a6f476756520236bc93840243690779783ec8f0b5ef0f72c64d774177b25d10d2e024cda968f81352abbc4f89f3069760fc3a86bd5ee387e7951928
 DIST toposort-1.7.tar.gz 10671 BLAKE2B 89da22e803c334cec77d5ac8ad6a9ab8013f7516555c2822bd6d511edf28230c85c2eaeabad3dc4a24a58ae3ce3850d407ad957d0e28491574557140a286843a SHA512 a585d1c103b2162fa3f37f6b0ef60a8709f08d9543d7fab619af3718bf9f752a293e50061d370fd08872b2d8a8db504cb9d9c1cce5446885b46fe8e833813833
-EBUILD toposort-1.6.ebuild 413 BLAKE2B f9f0958847ba209b9d07593b17b8f0d802fb2c1d95da6bf3465b782015c8bcab0ec6bcb11f1397c844e941c3f8dc8d51b6929d1bf31de95655cbf7b66ed7ffbc SHA512 56af58526ebaed5cd44ee0e1cc50dd1e09df469699a2c0277d0bc328dc9a5caaf9fa71ba6dea7856f36e9cca09fb0f6027154d63134a0e170ed7ed9978c250b1
 EBUILD toposort-1.7.ebuild 521 BLAKE2B 4d6875baf0dc19305bab782173d709fb144efc181bacc452bb6ae45ae78513ba088e75e05a2854bce4089b0a16851b6c342a5edbbd96e30a7857294d708d18af SHA512 b0e5dd3058eaf010a22d2337ad1c9a9fc3169e1410e5e207e0511864524e3b07ea08387d8ed666f338be4eb6650b59275785f52b78ffe2bc594941fc7c8fbc71
 MISC metadata.xml 551 BLAKE2B a8d8483b1a725bfdbb0c5ed3688bcd15093f0a51fc56cf8cdf30a836c98818a5ca5e7732e8045bd9cba76dde69aa05f2be45f9765f48b2177e9e8aa67a726880 SHA512 f2b0b6fb5f95c0f946149c1d959affa926452acfc21e46dda6f34448c8799df4fb8ddefc3856cb09420bed26f41c945ff309514bdc3fe87c77465784f3c57cf5
diff --git a/dev-python/toposort/toposort-1.6.ebuild b/dev-python/toposort/toposort-1.6.ebuild
deleted file mode 100644
index ae4eca4b79e4..000000000000
--- a/dev-python/toposort/toposort-1.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements a topological sort algorithm"
-HOMEPAGE="https://gitlab.com/ericvsmith/toposort"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index c20d6406e1de..ce6035e0e348 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,9 +1,7 @@
 AUX traitlets-5.0.5-python3_10.patch 1221 BLAKE2B a3f8617f09ae6a5def19d319d2e4886f95f3935a3165d9b88395273235b510ccf0853520634abfb05385167f8c4fdbcadf258b9b3fbdf4847eefe7b6932453af SHA512 6885806a75d8c64bd4a88d665c09291b13871a2009b381569782240d0c9a10552e4f988c92775b3f83b1977c13094afd96c14b9f88a1744b11792dba688bb028
 AUX traitlets-5.1.0-py310.patch 1440 BLAKE2B 1bceaa7cf0077aad5bb5c91f1e2845c4e966448f64e4e0420fd670d6b14b4de5dd35fdf63492d20167cab3da5b8f2f5f25e023b984ea1d7463176e0e915e5700 SHA512 86a47087f2e13fec563257a333b1c38e45b0114de044da8ab975e36be65770900ab49bf6f8c4a9f8aa01d7a664e141ebe345d3190446cc4ae4fac2e88e77feaf
-DIST traitlets-4.3.3.tar.gz 89838 BLAKE2B 04b50fabdc312c427f0cff6d4e8be0a5afcafe6d5a7a5804fb37e6f92b867e6a9c6401c23b7cdd7b0a6372eadaf3e8350018db5d21c5cbc546390138932a2820 SHA512 a7ae0276e5234d6d428908e1ec74c0b92f2b1b73e37402ad154151c41ef6e4aaaad53e8990d4233d8023c31d919e4ea66f100a82324abcb0e6ffb92283fd3c9e
 DIST traitlets-5.0.5.tar.gz 128856 BLAKE2B ad3e5d6dbdf3f118a86be0106e0243146ff833c40300c5fd4c5704db323fcfa4b30d87a88e66608e3a54672c9a7cd6ce07bd9596827fa7ce08625626c9610f7e SHA512 ec5901bab493949f656269a6f7a9211f919a29510d22a6ed440f1e3577dfcb73a6aeca8a0e7d2a6e23192b9ab4844beef1012a847ef08180e64cfb1e2cd40bfa
 DIST traitlets-5.1.0.tar.gz 135161 BLAKE2B adb948cd07a961196c3b02cd28c7dac274ba9152ddae0fab1d706d78643ff1f60e4478731d960e583eb6ad5088b2730efa31c6b3a806497ac5c8aa7b05e51502 SHA512 2b7aa7db355ddb5fa5dcdc091324b933cf7f8b189c033d43408af1bcda40cb242cd787f82098e042f1c65f07bf94b89d7d9f10019374388c47390565e7e3a467
-EBUILD traitlets-4.3.3.ebuild 623 BLAKE2B e54fc9f3aadf2e16e61f0cab8639bee2202492eda146f39a76c8575a0b4a7656aab292c50d0f728697fa146c1db60c9baa0baa57902a05557213dd7cc1f516aa SHA512 7cd01dff3e9e707475a77f6018f71d1a20010820b46e9aa1e27c80bfb9d3bbd5bfe6fa3dbc1cb3049571722404281882ad135dd1202af4e85c1ca1e93fbd652f
 EBUILD traitlets-5.0.5.ebuild 679 BLAKE2B 443af87c2d14ca5fc2c0169a91c2a76dc6157b4daf7bae0723b88a8d2404d1f46babaa6887687b5918272081c4032ccdd5c525c09ec3856eb2df9d5c82bc14fb SHA512 c9f2b48c195c833e61c2f9d3ea99fe5b2be2c887750bde3c2378f37d8e7d0783573646e673763c0985ad299bbde1a3bcf065aab7bcb16918887281fc12fe21b1
 EBUILD traitlets-5.1.0.ebuild 622 BLAKE2B ab5eba327954713550a1ffd4c625c7d2b59094075d70a8d2cd95df6c3feb1338027fb8da5bc257ddbdb5f5e9230a894861da610bc888fff50612a63e5bb8bcf1 SHA512 d5551fe0e6edfc8394af6eed663cae10416314931ee147bad69319a0f52b57cbdc7f70cb606fa3bc9e67736b58fa384141639d52949235da4fbc659ff53af9c5
 MISC metadata.xml 737 BLAKE2B dadf9c19ed06cc70940023c180cb2256534ccba2881b4a0b5d7673ae9959838c129f82b1a5d2b9c13e408442ef2f9ec906484b01baa4408417143a712f4bfa56 SHA512 3a9e54cabaac875c27747642794f54b90216ee103e5de336d6e4e76d3a08c045ec08eabebe59c47b6fab2dabdeb43f16a8579a9448cbc19ab169ceb08740508d
diff --git a/dev-python/traitlets/traitlets-4.3.3.ebuild b/dev-python/traitlets/traitlets-4.3.3.ebuild
deleted file mode 100644
index 6c190e010c38..000000000000
--- a/dev-python/traitlets/traitlets-4.3.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A configuration system for Python applications"
-HOMEPAGE="https://github.com/ipython/traitlets"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	"
-
-distutils_enable_sphinx docs \
-	dev-python/ipython_genutils
-distutils_enable_tests pytest
diff --git a/dev-python/treq/Manifest b/dev-python/treq/Manifest
index 46a35ad1c5ed..a95c41809465 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -1,7 +1,3 @@
-DIST treq-20.9.0.tar.gz 60142 BLAKE2B a495b73221ee86163a5fefd03c8019f4b671a1f32d2ab304b89566339a36aaec7245d33b738b646fa48c42f4db9744938637ece058e067ee3f747e53ce442ab8 SHA512 c595ad69d5a9c688ca966cc897db669a57d14027e0bdc345d550f791390099743749be4a41294e61428cdc7bc0fa197474be780323b00f17a712505e081e7073
-DIST treq-21.1.0.tar.gz 71018 BLAKE2B 44223c0ad618f4a57283db60063ee2fd263f958ff18d90b055733fc3bb24c87483a7b833e2210197a4edd003cb3f86647bbb636a9692e5535908b19e0186dba8 SHA512 b68ded90021cb801b276d6310e729a985205bb0701b1d0576b00c6c4efd97400625efffa35763ceef8f0f8d94172cae6fc1abdd3de1c0a4871223d4f06758d89
 DIST treq-21.5.0.tar.gz 71323 BLAKE2B 1e1f0f4c885c1d197fdf9c1a88c9ee486c3fcc4d126498f4ce10e59d62e2445e4935e3f4cabed5de2f2663c3049ab6b49e47a0bad29380a4bb901e30d6723f49 SHA512 81ccfaa90513f0ef53c60f69ff7c60e066c6f0669ab82cf361e0720e5fd3098eb88e9b205f5bb590f1e0cde6083e5e2dfbacb6086986f0dd91fc2b3038da3093
-EBUILD treq-20.9.0.ebuild 1552 BLAKE2B e96643e5db58330b4ae89681821d17d2907662d09f86d291157b36f7072172e162c0bf8387ed0be11e8edbd83ea43ee7ace004050f7179fbc7ebee731759d323 SHA512 2f08bdea0941edaa8359a7ba9e549c796461195179c9eef3c3e6f3df6890f46671f72fe6423416e480315660789b8437559faab798b7a0c3b2adfcbe2eed98c2
-EBUILD treq-21.1.0.ebuild 1563 BLAKE2B f8c7f22fd8231617ffd1e00c84a9b84a60d834180a034674cc19d044667ec20f4329dada4f1bd5344137c7bf1286fd530b18064426739f4826b8e7ee9df529bd SHA512 3c32cea95537342362e8cbe56c810c373173bc83f96629bbebef31f409ec2a3f2c08afd0689c864072d4435ad8af52bd509dbe8b28b65147f0f3aef9f908f250
 EBUILD treq-21.5.0.ebuild 1059 BLAKE2B b27a7f9e6f5f8f07e60673b9604d21462b8e7121fd24787dde811e05e46d7dea0406a41d9ba8f1ef74666487fe696af263077d3521203d8ce0d23c4ac3e95bb6 SHA512 1ec6b023e1709f350a5b61a036a7ab60f7d09b65f58fe4ab2c76c9941e636da83c497f82ee93eb12f6520c8976bb33adef126222b4f53d55a342f21a9c1656fa
 MISC metadata.xml 781 BLAKE2B a50fa9d74c53d5c948cfd940ff1e454a2aa9c44bf29c8e39495007ddab02e212a979f757335fae531ceae43743342a02a4ae049b5b12425ba779293c6977eb07 SHA512 1d45744f461efe3cd03802e3886dee60a19eb508b681e3235817f478dd98ca164c822194f03b05891e0000e3d09af4790e8b10e07f3e303abf9ad308712ca9b6
diff --git a/dev-python/treq/treq-20.9.0.ebuild b/dev-python/treq/treq-20.9.0.ebuild
deleted file mode 100644
index 7b1c82412801..000000000000
--- a/dev-python/treq/treq-20.9.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
-HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-python/incremental[${PYTHON_USEDEP}]
-	dev-python/hyperlink[${PYTHON_USEDEP}]
-"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-18.7.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx
-		${RDEPEND} )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/httpbin[${PYTHON_USEDEP}]
-	)"
-
-python_compile_all() {
-	use doc && emake -C "${S}/docs" html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/ )
-
-	distutils-r1_python_install_all
-}
-
-test_instructions() {
-	ewarn "The 'test' USE flag and FEATURE only ensures that the correct"
-	ewarn "dependenciess are installed for this package."
-	ewarn "Please run eg:"
-	ewarn "$ python3.7 /usr/bin/trial treq"
-	ewarn "as a user for each of the python versions it is installed to"
-	ewarn "to correctly test this package."
-}
-
-python_test() {
-	# Tests fail when run via emerge
-	# they need proper network access
-	test_instructions
-}
diff --git a/dev-python/treq/treq-21.1.0.ebuild b/dev-python/treq/treq-21.1.0.ebuild
deleted file mode 100644
index b5f62bffd38c..000000000000
--- a/dev-python/treq/treq-21.1.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
-HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-python/incremental[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
-"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-18.7.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx
-		${RDEPEND} )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/httpbin[${PYTHON_USEDEP}]
-	)"
-
-python_compile_all() {
-	use doc && emake -C "${S}/docs" html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/ )
-
-	distutils-r1_python_install_all
-}
-
-test_instructions() {
-	ewarn "The 'test' USE flag and FEATURE only ensures that the correct"
-	ewarn "dependenciess are installed for this package."
-	ewarn "Please run eg:"
-	ewarn "$ python3.7 /usr/bin/trial treq"
-	ewarn "as a user for each of the python versions it is installed to"
-	ewarn "to correctly test this package."
-}
-
-python_test() {
-	# Tests fail when run via emerge
-	# they need proper network access
-	test_instructions
-}
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 7df274e3ab17..65ad0c4c51d9 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,12 +1,7 @@
 AUX twistd.conf 277 BLAKE2B 78ca35b410a6597c9afe6a9c8d3dfb1de113411634901f936794e8a59c0644233d0673e710bd0870ecf4312d079c46f62f43928605700559134f1fb62490559a SHA512 76d44caebab8404f16937c2515ad9ae8236732a48c7127366f7fa22c6ed3d88ace2d33b832a6d95f775973d41b7caf75344805fe5b01e964c04eb710bf3c89fb
 AUX twistd.init 563 BLAKE2B 24488118b025bf2068bbf07af900064ff6a7ee99106c3da30f15f2b3f85af7443212afebc6b52a12645488b85656f87b653df9263fc2be6bd09707917899f252 SHA512 7860601beba1efda2b0a045b2a044ec33caff9ee915d45225c05e281760a68da349b4c45080600177aab32aa806714327acf3cf5dda92be0874f781f129bb129
-AUX twisted-21.2.0-force-gtk3.patch 1619 BLAKE2B d167c6e3177a345c03e68d37d596e743af0eb5b7acbc055df032bba26b38acced190baa6b44b3ae8f750fa06d4670a5e85146b95508bfb9acb93980e5a0bdbf4 SHA512 3b359d98c747a3d10e5e16fd3de5f00eb56fa64bef7fdbac07f569ad49033c63092703584ff7127e6af8394fc1b4e94846a0556bd7db38b473a473e4d833f7db
-AUX twisted-21.2.0-incremental-21.patch 2303 BLAKE2B 34bd2eef6b7bc9810466bb5daa97736eb8aba88ed6e9e1bec78a9547d7068a330685eacaaf8b5eb16a33733792a0bff8a78b08f5ff5c6766763e687a98e1295e SHA512 0f2aabc82233dd43a418de38d6b46284e5f7c136e27eaecd423d25908c9a652c7725ea0318bcbee906b2d3cdf8b9cdf44e4ee496ed33aad60f609a3980bbb115
-AUX twisted-21.2.0-int-from-bytes.patch 485 BLAKE2B c436bcfdacc124a1f6d24d1a9500940e18efb2136dbd35f86575495ee1b4afb6ae4e0eaf262167c4d4dacdda28c8ec2b951fadd2570e9894d90f0bf09ddeee6a SHA512 3794ea978ebe82103aedf284a57215a69a68804d43f2def9dba58f600f8af190ae2fd6ddcc064ece35dec85661830eb386c1ce799aefb78f60e530fe23cdcb22
 AUX twisted-21.7.0-force-gtk3.patch 2759 BLAKE2B 65be4e948865a8de6cda3fbb9e90032d8c90b4db2e6b60d5861868273837c2ce846ab1452ca468f2e65be27882ca17ba842a9010607cc0e3969aeb70490e9ab1 SHA512 f4424f2b1f785c459263b4cdd3f906543e99ad6956130dcf3f6b589386a84637ca52d1346dc3465ef23fc82c701751e6053d145a0ca5225b846d6a7c20991f73
-DIST twisted-21.2.0.tar.gz 3882978 BLAKE2B ba37572b0f9eadf2962a2730e4c2c0ed65f582b11b3350034660a2c53c5cd0892b19867d19e0201d4808c09fca621dbe540d153dc6c7d5827d45d2423d19d28b SHA512 fa743dcf22f3c17dfd17f39b7df0cc31fb8ce3e989478ada9a026424ec2de35e6a403ef35acdef5905eed008d42e3c2fee6b7ccdda433e6c250f1feaa83ea8a4
 DIST twisted-21.7.0.tar.gz 3895345 BLAKE2B 510165ad2933f07005e508df5a8bdf2863a7988c0f18fcc089e948d190c65aab32fc876d3120e311e91d6989f1ea2d8b3b5f5db4a9dfc63c38da56213f718728 SHA512 a946769a6bc6c72af26e7763b9e0675788f134b4d005ea89d935da1b1d5f60d92c84fdb2615e442e7da2b98291ee8a63d5236ec7ba72ef04ad3f847b092feecb
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-21.2.0-r1.ebuild 5147 BLAKE2B 5e6b209a28d64fa65300d589ba162045aa9bd4caf72b3a5c887ba10680327900c91583fb4d16333bf38d9e5745ab4f70a4317ceec8d91bf6e5893e615bc0513c SHA512 83194e572d84783471362c29951e0c0f900136cf5b2f049daf3112d6e185a19ec1b8a16d33c9c54ce3e38bfb0ff42864ea4524f899488f3c725e575c201aec09
-EBUILD twisted-21.7.0.ebuild 4956 BLAKE2B 732dca1b98ffab5339c76a4b5ee1950ec027ba21b65c4299ae2e295e9bc4b991c6f9526dcaaa7ed289e62b2922128b95de2ccf8c90802d20b4d13ad62e5217de SHA512 d76eecf1a98de89be9e65fab05c29cd9db350fb3d96f936750db027cff406d5657c935ba9000a6d79762af8bde2f0b8d949b32ba27b5c2064f25a0f635d998fc
+EBUILD twisted-21.7.0.ebuild 4955 BLAKE2B 2ddbe9dbed3e910af8fcea03de1002e6948f5f05dc4a2cdfda5fdd256e24a2de43ae708964bc772dfaf73a607228cc58a9de975f6f82d5719f4502b9f73eafb7 SHA512 d0a020dde92f76e52cda1704c5759bef1fc72d82cac6bc80d54c6329198476537d129689ab0153201f9eb5f85978ab426b1d3c39023053e379fb7fbc0ec9326c
 MISC metadata.xml 1352 BLAKE2B da3eecfbfd73709ff8fb48b985d64fa80d134c38a0c04d8c7b08e0ebd936cb2179f579deb6f91f38fd08b74e9454b693b4a89c9ab194296104c519e6f80ddc8a SHA512 f244db7eb7a13e35f8825e2b16cf3cb953c47e68be234efc9d922462cc7ee66e1748e09bf4735bee59cd1016eb38c64ca23f70a25da5bb7311f869cebbb45569
diff --git a/dev-python/twisted/files/twisted-21.2.0-force-gtk3.patch b/dev-python/twisted/files/twisted-21.2.0-force-gtk3.patch
deleted file mode 100644
index bed31bcf611c..000000000000
--- a/dev-python/twisted/files/twisted-21.2.0-force-gtk3.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/src/twisted/internet/gireactor.py b/src/twisted/internet/gireactor.py
-index 92596db1da2..a577825a87e 100644
---- a/src/twisted/internet/gireactor.py
-+++ b/src/twisted/internet/gireactor.py
-@@ -24,6 +24,7 @@
- from twisted.internet.error import ReactorAlreadyRunning
- from twisted.internet import _glibbase
- from twisted.python import runtime
-+import gi
- import gi.pygtkcompat
- from gi.repository import GLib
- 
-@@ -68,6 +69,7 @@ class GIReactor(_glibbase.GlibReactorBase):
-     def __init__(self, useGtk=False):
-         _gtk = None
-         if useGtk is True:
-+            gi.require_version("Gtk", "3.0")
-             from gi.repository import Gtk as _gtk
- 
-         _glibbase.GlibReactorBase.__init__(self, GLib, _gtk, useGtk=useGtk)
-@@ -112,6 +114,7 @@ class PortableGIReactor(_glibbase.PortableGlibReactorBase):
-     def __init__(self, useGtk=False):
-         _gtk = None
-         if useGtk is True:
-+            gi.require_version("Gtk", "3.0")
-             from gi.repository import Gtk as _gtk
- 
-         _glibbase.PortableGlibReactorBase.__init__(self, GLib, _gtk, useGtk=useGtk)
-diff --git a/src/twisted/internet/test/test_gireactor.py b/src/twisted/internet/test/test_gireactor.py
-index d15a9262248..af5092a3614 100644
---- a/src/twisted/internet/test/test_gireactor.py
-+++ b/src/twisted/internet/test/test_gireactor.py
-@@ -25,6 +25,9 @@
-         gtk3reactor = None
-     else:
-         gtk3reactor = _gtk3reactor
-+        import gi  # type: ignore[import]
-+
-+        gi.require_version("Gtk", "3.0")
-         from gi.repository import Gtk
- 
- from twisted.internet.error import ReactorAlreadyRunning
diff --git a/dev-python/twisted/files/twisted-21.2.0-incremental-21.patch b/dev-python/twisted/files/twisted-21.2.0-incremental-21.patch
deleted file mode 100644
index c726d32cb89d..000000000000
--- a/dev-python/twisted/files/twisted-21.2.0-incremental-21.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From ab934c065177422a7121e44c792c56c32962c4e4 Mon Sep 17 00:00:00 2001
-From: Thomas Grainger <tagrain@gmail.com>
-Date: Tue, 2 Mar 2021 11:27:56 +0000
-Subject: [PATCH] update tests for incremental >= 21.3.0
-
----
- pyproject.toml                           | 2 +-
- setup.cfg                                | 2 +-
- src/twisted/python/test/test_versions.py | 6 +++---
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index a7d531b003d..ca12b3ef7e0 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -2,7 +2,7 @@
- requires = [
-     "setuptools >= 35.0.2",
-     "wheel >= 0.29.0",
--    "incremental >= 16.10.1",
-+    "incremental >= 21.3.0",
- ]
- build-backend = "setuptools.build_meta"
- 
-diff --git a/setup.cfg b/setup.cfg
-index 17501b91ecf..07094f7ea6b 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -28,7 +28,7 @@ python_requires = >=3.6.7
- install_requires =
-     zope.interface >= 4.4.2
-     constantly >= 15.1
--    incremental >= 16.10.1
-+    incremental >= 21.3.0
-     Automat >= 0.8.0
-     hyperlink >= 17.1.1
-     attrs >= 19.2.0
-diff --git a/src/twisted/python/test/test_versions.py b/src/twisted/python/test/test_versions.py
-index 022010a6eec..6707169b1f8 100644
---- a/src/twisted/python/test/test_versions.py
-+++ b/src/twisted/python/test/test_versions.py
-@@ -126,7 +126,7 @@ def test_strWithPrerelease(self):
-         Calling C{str} on a version with a prerelease includes the prerelease.
-         """
-         self.assertEqual(
--            str(Version("dummy", 1, 0, 0, prerelease=1)), "[dummy, version 1.0.0rc1]"
-+            str(Version("dummy", 1, 0, 0, prerelease=1)), "[dummy, version 1.0.0.rc1]"
-         )
- 
-     def testShort(self):
-@@ -145,7 +145,7 @@ def test_getVersionStringWithPrerelease(self):
-         """
-         self.assertEqual(
-             getVersionString(Version("whatever", 8, 0, 0, prerelease=1)),
--            "whatever 8.0.0rc1",
-+            "whatever 8.0.0.rc1",
-         )
- 
-     def test_base(self):
-@@ -158,4 +158,4 @@ def test_baseWithPrerelease(self):
-         """
-         The base version includes 'preX' for versions with prereleases.
-         """
--        self.assertEqual(Version("foo", 1, 0, 0, prerelease=8).base(), "1.0.0rc8")
-+        self.assertEqual(Version("foo", 1, 0, 0, prerelease=8).base(), "1.0.0.rc8")
diff --git a/dev-python/twisted/files/twisted-21.2.0-int-from-bytes.patch b/dev-python/twisted/files/twisted-21.2.0-int-from-bytes.patch
deleted file mode 100644
index ef9bd777ac7c..000000000000
--- a/dev-python/twisted/files/twisted-21.2.0-int-from-bytes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/twisted/conch/ssh/common.py b/src/twisted/conch/ssh/common.py
-index 3e4f8cdc7..ee3d63143 100644
---- a/src/twisted/conch/ssh/common.py
-+++ b/src/twisted/conch/ssh/common.py
-@@ -11,7 +11,8 @@ Maintainer: Paul Swartz
- 
- import struct
- 
--from cryptography.utils import int_from_bytes, int_to_bytes
-+from cryptography.utils import int_to_bytes
-+int_from_bytes = int.from_bytes
- 
- from twisted.python.deprecate import deprecated
- from twisted.python.versions import Version
diff --git a/dev-python/twisted/twisted-21.2.0-r1.ebuild b/dev-python/twisted/twisted-21.2.0-r1.ebuild
deleted file mode 100644
index 89ae1e3b8929..000000000000
--- a/dev-python/twisted/twisted-21.2.0-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="
-	https://github.com/twisted/twisted/archive/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="conch crypt http2 serial test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	conch? (
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
-	http2? (
-		>=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/h2-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-	!dev-python/twisted-core
-	!dev-python/twisted-conch
-	!dev-python/twisted-lore
-	!dev-python/twisted-mail
-	!dev-python/twisted-names
-	!dev-python/twisted-news
-	!dev-python/twisted-pair
-	!dev-python/twisted-runner
-	!dev-python/twisted-words
-	!dev-python/twisted-web
-"
-BDEPEND="
-	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		dev-python/cython-test-exception-raiser[${PYTHON_USEDEP}]
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		net-misc/openssh
-	)
-"
-
-PATCHES=(
-	# https://twistedmatrix.com/trac/ticket/10200
-	"${FILESDIR}/${P}-force-gtk3.patch"
-	# int_from_bytes is deprecated
-	"${FILESDIR}/${P}-int-from-bytes.patch"
-)
-
-python_prepare_all() {
-	eapply "${FILESDIR}"/${P}-incremental-21.patch
-
-	# upstream test for making releases; not very useful and requires
-	# sphinx (including on py2)
-	rm src/twisted/python/test/test_release.py || die
-
-	# puts system in EMFILE state, then the exception handler may fail
-	# trying to open more files due to some gi magic
-	sed -e '/SKIP_EMFILE/s:False:True:' \
-		-i src/twisted/internet/test/test_tcp.py || die
-
-	# multicast tests fail within network-sandbox
-	sed -e 's:test_joinLeave:_&:' \
-		-e 's:test_loopback:_&:' \
-		-e 's:test_multiListen:_&:' \
-		-e 's:test_multicast:_&:' \
-		-i src/twisted/test/test_udp.py || die
-
-	# accesses /dev/net/tun
-	sed -e '/class RealDeviceTestsMixin/a\
-    skip = "Requires extra permissions"' \
-		-i src/twisted/pair/test/test_tuntap.py || die
-
-	# These tests rely on warnings which seems work unreliably between python versions
-	sed -e 's:test_currentEUID:_&:' \
-		-e 's:test_currentUID:_&:' -i src/twisted/python/test/test_util.py || die
-
-	# relies on the pre-CVE parse_qs() behavior in Python
-	sed -e '/d=c;+=f/d' \
-		-i src/twisted/web/test/test_http.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# TODO: upstream seems to override our build paths
-	distutils_install_for_testing
-
-	"${EPYTHON}" -m twisted.trial twisted ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D}$(python_get_sitedir)" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl python_postinst
-
-	einfo "Install complete"
-	if use test ; then
-		einfo ""
-		einfo "Some tests have been disabled during testing due to"
-		einfo "known incompatibilities with the emerge sandboxes and/or"
-		einfo "not runnable as the root user."
-		einfo "For a complete test suite run on the code."
-		einfo "Run the tests as a normal user for each python it is installed to."
-		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm() {
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twisted/twisted-21.7.0.ebuild b/dev-python/twisted/twisted-21.7.0.ebuild
index 3fc0dfad45de..12bb706747a7 100644
--- a/dev-python/twisted/twisted-21.7.0.ebuild
+++ b/dev-python/twisted/twisted-21.7.0.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="conch crypt http2 serial test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/txAMQP/Manifest b/dev-python/txAMQP/Manifest
index d4c9994687a9..4da7cd8cd333 100644
--- a/dev-python/txAMQP/Manifest
+++ b/dev-python/txAMQP/Manifest
@@ -1,3 +1,3 @@
 DIST txamqp-0.8.2.tar.gz 118560 BLAKE2B 6e60cc0785462b92d046a620cc09eda8b7783bd09186a60299eba11c8f6f5780fc38b094ea974e4f1e443d3d30ee1428f30ad25fdb43554d25db17f36d323527 SHA512 4a5e468482433e684dc690abddeba3e0a6c77630055afe44487de72feecad9c750d179c43dee4e781d09c9c21259cecd615dc9f6eaa7d9ff7ca0796248ad5a02
-EBUILD txAMQP-0.8.2.ebuild 1244 BLAKE2B 9e4cbed5af85442899771df4b930ff95414fd4bf78c53416a1307bc9ea180ed51d987a37ff1470416e5a71f6dffe166908d64b1da522763d0d3f0c0613faca07 SHA512 aa3a8f781990c5387b267550f60d5d48e3b33af31e462e2a6bdfe082929b47d5d91139a7866a4cc642d42ddeade1bd631acb168ed0713edaf8a339fa95e809ca
+EBUILD txAMQP-0.8.2.ebuild 1792 BLAKE2B 1fb07bdf7e9cc7e54086971cf0dffb5c465b18302d4e447f0062197507304183013432a22660c1894093aec0487baf98918bb320119f5d1906a1a380da8ba7d4 SHA512 9244021dac62da5ffe44c58ce076a8066a3048a76bfe404e7424c1ec5bc33261d587d3e76ea66c476cbfb343e8d594963dd5ee37876ec3385a1793db56c61445
 MISC metadata.xml 349 BLAKE2B 6384cbbfd96d59a37c42da7e3f36c03e154033ebc4c2f666ebf517157889059474e0597b4a75315d61be2faf0781bed46c47eadb123aa6376f01ae353ecfb4a6 SHA512 7f2976c5db1eb88248ab361b3a8c15b62fad0551d94d01fd9bbf53531d72bf467e0fe52c097a704c11917b803a38cabadca400f1b01a107384314af1636da3e5
diff --git a/dev-python/txAMQP/txAMQP-0.8.2.ebuild b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
index 31f1d27c9d08..b5cd02193b9a 100644
--- a/dev-python/txAMQP/txAMQP-0.8.2.ebuild
+++ b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
@@ -3,23 +3,25 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
 
-MY_P=${PN,,}-${PV}
+MY_P="${PN,,}-${PV}"
+
 DESCRIPTION="Python library for communicating with AMQP peers using Twisted"
 HOMEPAGE="https://github.com/txamqp/txamqp"
 # pypi tarball misses doc files
 # https://github.com/txamqp/txamqp/pull/10
 SRC_URI="https://github.com/txamqp/txamqp/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~x64-solaris"
 SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/twisted[${PYTHON_USEDEP}]
@@ -31,16 +33,12 @@ BDEPEND="
 		net-misc/rabbitmq-server
 	)"
 
-# Tests connect to the system rabbitmq server
-# TODO: figure out how to start an isolated instance
-RESTRICT="test"
-
 python_test() {
 	cd src || die
 	# tests look for those files relatively to modules
 	cp -r specs "${BUILD_DIR}"/lib || die
 
-	TXAMQP_BROKER=RABBITMQ trial txamqp
+	TXAMQP_BROKER=RABBITMQ "${EPYTHON}" -m twisted.trial txamqp
 	local ret=${?}
 
 	# avoid installing spec files
@@ -49,6 +47,27 @@ python_test() {
 	[[ ${ret} == 0 ]] || die "Tests failed with ${EPYTHON}"
 }
 
+src_test() {
+	einfo "Starting rabbitmq"
+	local -x RABBITMQ_LOG_BASE="${T}/rabbitmq/log"
+	local -x RABBITMQ_MNESIA_BASE="${T}/rabbitmq/mnesia"
+	local -x RABBITMQ_LOGS="${T}/rabbitmq.log"
+	local -x RABBITMQ_PID_FILE="${T}/rabbitmq.pid"
+	local -x RABBITMQ_ENABLED_PLUGINS_FILE="${T}/rabbitmq/enabled_plugins"
+	/usr/libexec/rabbitmq/rabbitmq-server -p 5672:5672 &
+
+	einfo "Waiting for rabbitmq to fully load"
+	while ! { echo >/dev/tcp/localhost/5672 ; } &> /dev/null; do
+		sleep 1
+	done
+	einfo "rabbitmq is ready"
+
+	distutils-r1_src_test
+
+	einfo "Stopping rabbitmq"
+	kill "$(<"${RABBITMQ_PID_FILE}")" || die
+}
+
 python_install_all() {
 	local DOCS=( doc/* )
 
diff --git a/dev-python/txgithub/Manifest b/dev-python/txgithub/Manifest
deleted file mode 100644
index 2ac5766f483a..000000000000
--- a/dev-python/txgithub/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST txgithub-15.0.0.tar.gz 9871 BLAKE2B a5105132274cb878a0723cabebc17b4b6694d86e02325f6f29285b8bf939eb94ffa713283732634fbc0ea002490b05e7686adc6f98016e0c52300953b25d7f9d SHA512 40449089c7c82e901f738935e915a2a6e250600f46ceea7011ef48357851513dccd0fe0f45539cff6de8a45acfe3e34082156e2b70e54dec695633be01d03510
-EBUILD txgithub-15.0.0-r1.ebuild 701 BLAKE2B 74377776abb5cc387cc24ea82c13c4cec4736a7222ddffd2824bd9bb53dad6e7f0de670b6860c1d822a31b14ba1b3627266122a6cf924c76e5349d6fbfb861eb SHA512 66ca13d3272d8fe88b5388ca169206cc6626c577bba826669330fe74e4a5f9c8cfc996dd554e04077347489076152f07940b2a0153257be21cd09c9cbc8b590f
-MISC metadata.xml 395 BLAKE2B e47eaf8eb81c8480c70c3a3a3a62188cf982570fe0c38ddab464984df24c7048d3a248cb50cb2c44f1a6b78846ec85699e17d055d8b99895b549603245c888db SHA512 68b4a207a31da83d0e1b393b0704832092426f92793acc61af1bd168774b0f6fc3b89d4854c6d282fdb47b02e41b7b9362b67b8ad3c001d77cfdb908a19739e9
diff --git a/dev-python/txgithub/metadata.xml b/dev-python/txgithub/metadata.xml
deleted file mode 100644
index 24e58b8786b0..000000000000
--- a/dev-python/txgithub/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<maintainer>
-			<email>tom.prince@ualberta.net</email>
-			<name>Tom Prince</name>
-		</maintainer>
-		<remote-id type="pypi">txgithub</remote-id>
-		<remote-id type="github">tomprince/txgithub</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
deleted file mode 100644
index 2c29e0fe21d4..000000000000
--- a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="GitHub API client implemented using Twisted"
-HOMEPAGE="https://github.com/tomprince/txgithub https://pypi.org/project/txgithub/"
-SRC_URI="https://github.com/tomprince/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/typeguard/Manifest b/dev-python/typeguard/Manifest
index aca62db6ddeb..1864f0aaa55a 100644
--- a/dev-python/typeguard/Manifest
+++ b/dev-python/typeguard/Manifest
@@ -1,3 +1,3 @@
-DIST typeguard-2.12.1.gh.tar.gz 35894 BLAKE2B 309b5fd906ae5122fbd2134ff30f6f2908a5d64fc8510dd054a9f47feef5f1674ea6133156fb6649c85a6fc8a98609387f742e7f9588db8ab008ef2caec0c740 SHA512 ea91140ba0ebfe7cc83bf212ae20aca777279fc88ff806bf6a1f4208581bb726c6091d0777371d487e7422887814d81c84ebac9f06bfacc5a929f5a2657312a8
-EBUILD typeguard-2.12.1.ebuild 981 BLAKE2B 3306b30332ad9d8f9943206995afca09ab34fa33f07e2836ab9a62621a0ba7f67b3018c1329ebff995d4ec362da06b82e2d59c7cf6701160a0977c048dd0cd44 SHA512 44a09aea91107a9eee9f24ecc1c63e6774ea00cd056728590e2995637bdbcb6cc5dd7bbbf53609adb2a30c2c58599ae508244fbfdbd159230b6073b8e31951cd
+DIST typeguard-2.13.0.gh.tar.gz 36849 BLAKE2B ef9b724bdd5ef127b6ede4ff4cb1d4f4794b0e921512d2cbf474145bf64de0cae85b7f5283dfc7f0b750e79e1c44c03ce6b4c0f24a33ae961c428aa57f3b6ae5 SHA512 48df7a9d6ee2cc11b5118432afcda5e0939712ff66d67f3945e26047c0880a05c133b505869ebcef59ce438260b9f6d1806121d0d4828853bc3b9c3468769f39
+EBUILD typeguard-2.13.0.ebuild 787 BLAKE2B 24994432b4544aa4a498917ab12f641451b99ba673714e437b3b203176345c0e557546c55de4bcb223e42a63cfa836cff510a2a9979d24e2c62aa578d5a139fd SHA512 44fad13c13e574b9ee8225400e58b1512828980650ed877d9497b20a07ea73d48cd8bd8e4cbd30ff8fcb6b1e10ba75c296b197c63c8f54226917ee4333963ba2
 MISC metadata.xml 350 BLAKE2B 78dc7293e08dae7974b38d84ce457ceddc5888a7278c1b149b8ba3057f07130b2e002dd78a9df91fd09d85b7ebc26272b4c78dd96c6cdd3938cff67b9c451366 SHA512 1fe4c4164b0732bd294815dacdd46a70ace6e8886343491232fb59b6b3697316c3eac5dd72e2e4758d87fd093d845f4453b8f278009be640ca1555413f47e869
diff --git a/dev-python/typeguard/typeguard-2.12.1.ebuild b/dev-python/typeguard/typeguard-2.12.1.ebuild
deleted file mode 100644
index 92dfba2742ea..000000000000
--- a/dev-python/typeguard/typeguard-2.12.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Run-time type checker for Python"
-HOMEPAGE="
-	https://pypi.org/project/typeguard/
-	https://github.com/agronholm/typeguard/"
-SRC_URI="
-	https://github.com/agronholm/typeguard/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	local deselect=()
-	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
-		# https://github.com/agronholm/typeguard/issues/199
-		tests/test_typeguard.py::TestCheckArgumentTypes::test_newtype
-	)
-	# mypy changes results from version to version
-	epytest --ignore tests/mypy ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/typeguard/typeguard-2.13.0.ebuild b/dev-python/typeguard/typeguard-2.13.0.ebuild
new file mode 100644
index 000000000000..9ea46fa44506
--- /dev/null
+++ b/dev-python/typeguard/typeguard-2.13.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Run-time type checker for Python"
+HOMEPAGE="
+	https://pypi.org/project/typeguard/
+	https://github.com/agronholm/typeguard/"
+SRC_URI="
+	https://github.com/agronholm/typeguard/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# mypy changes results from version to version
+		tests/mypy
+	)
+
+	local -x PYTHONDONTWRITEBYTECODE=
+	epytest
+}
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index ff1ccddbdbf1..6f7f2c9f1d1d 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,5 +1,7 @@
 DIST tzlocal-2.1.gh.tar.gz 18463 BLAKE2B 73e886cfb6d13bebc1a15a222da60f368a15dc5a097acac74990b1d76bdaa229be8f12ff735d1828ccd78c4c8d06eb5bc0a07da695d70251af1e67e4fb71037e SHA512 2679cebdc2692d9e0e1c9b714994ad881896f53e75ef407229a67c9fee9d27617638a2919865cb67e21e2bbd6e3bc13f2568343037e06603236f25a96aa6863d
 DIST tzlocal-3.0.gh.tar.gz 18924 BLAKE2B 340739015ce0fae245ddcb2d3f6250886261a81a49c9db7960515e178090183d3a826ee494763503023c033d3d9c19771aad865d4c1150350a118250aab23362 SHA512 9060eb325783d183bfaf7038476031a2ea22fd4ba50f6b5caf3d8eda15d9c90e557c64a0218c7e3c3df51f385378fe8a17f10871abb038012e1d05a9547918c3
+DIST tzlocal-4.0.gh.tar.gz 22582 BLAKE2B 35ef0b9f64e0b2758ecda19669957666ffcd807197cfef74583d94a3e2ca01811e55b27228522723dec140dd4ede69e30585d850f03f55db084d975e871d2f63 SHA512 8bb31f3d85256aaab2a803c34ea35677a25ae2bf339d54a1fb4466d035631d9f22ea465448d7905d607a17c6b1180cbc619ce06b39c3ebe724270bc048bd96ed
 EBUILD tzlocal-2.1.ebuild 553 BLAKE2B 8a04de4cdf378cfcb94e876d8547e7b23e039004692e59901db1ca32cee2c2cd93735d814724d87189bc6ba43c39222d2b4303e3c7c84f561331988125000c17 SHA512 f1bbe5e0b0a4ac64d8261570aa3e587f9c98f3af5d81eb73e2bffe0947c2b2279608eb1f4c66a0b9c856c4007e1c745a46c8fd1d6b650064e2e1cfa25048518a
 EBUILD tzlocal-3.0.ebuild 632 BLAKE2B 2eba582041d313df61854f303d4a474da1f7e820e327060e5f8a51d39e09c884dd2b7162710919c6d09326e34f5135a4fb3342b571a4242acadef867c0ce0d13 SHA512 ee7407e7b790e4d6cd5046582e68615c6d23a30331d92163cdc8919e3ffd88a9d8a9e65b7e20a236f0867377d3cd14bd7cc3337d6fbee6ecdebf7b45fbb0a4aa
+EBUILD tzlocal-4.0.ebuild 653 BLAKE2B 987406360b9c9b1e9759faa27616c86da6cb7ae5db28211fdca75591bfc5b6c7b0230fea8181c8d02412840c4b3a2c51df7a8763235e206b6e5c302e9a02c1b2 SHA512 db4a738b1f3e9d17d3563785174c73c85982b53314745a34cfe9f9f5e7db4e6f17136f53c2d15782b44877978521a3145c0be61bcd58979b92773fa846b3ec56
 MISC metadata.xml 403 BLAKE2B c2fbd81151ee69075c53b7c7d353ac2eb207e92b5bee234591f839c751c54e20abfeb10a8ef1c7cf074d5b94c4745dd23ca1e935b41619dfdc551d2fbb955ac5 SHA512 73c29b14ace10a0b23ef59f9a10abf5f9367dfecc89743cd29a01ece71689c08f83a14612fd3a4779fcbe5382e4e33f6ffbae183c498cba8ba7776d2afbea8ab
diff --git a/dev-python/tzlocal/tzlocal-4.0.ebuild b/dev-python/tzlocal/tzlocal-4.0.ebuild
new file mode 100644
index 000000000000..a6fc123e49fa
--- /dev/null
+++ b/dev-python/tzlocal/tzlocal-4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="tzinfo object for the local timezone"
+HOMEPAGE="https://github.com/regebro/tzlocal"
+SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/pytz_deprecation_shim[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' python3_8 pypy3)"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index b35d0a790663..57a2dcc1e11e 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,7 +1,3 @@
-DIST ubelt-0.10.0.tar.gz 213813 BLAKE2B f44798dee470ebbdaedba4af6ef03c663f47e171258877c70c99b4dceabb991d2b142815965cdf873aceb9d34e248e341fd88e6b8d2c2554309f6d8d1302e2bd SHA512 dc6b1193838c7def5e3ab8f64b2708cb857bca52c2debe7b32f4fb80453904fe2dd6060383b73ae09b4ef6cc63bd45be1ff3d64bb4db72149046c89b39243a1e
 DIST ubelt-0.10.1.tar.gz 216033 BLAKE2B e481b2cf61788b50038ad69f0e2b637dfa0259d24ecca1a5587fe283d2270de205cb085112b9285cf57f664ce8a9d107f08b9b6735c8bea6fb97f6f48935dba9 SHA512 c15af249e6b94f69050703a4004307d91854e2ac7e25c5ac8d467b5b5f3363989f93bf2917eaf3c0f2485258b3530d7317f39449d5ac7ad5ed9b4615d916decb
-DIST ubelt-0.9.5.tar.gz 193739 BLAKE2B 90597750c9ae1c1a4aa9d3180119665a6d1bf9fddb57f220d8ab6d8d0daf521d4e2648247753446e0e285b9f24f57c35d10abdcdd06e566fdd3415c77f10e50d SHA512 fbe17001c03da513238ab2ae101a9ac8c334943e88bf3037243c8ad4998e42a38e2907a408866a8acf2f7e2061c86a186b7955429564a6245ffca2bed25b8e54
-EBUILD ubelt-0.10.0.ebuild 775 BLAKE2B 5e7006b75c8b72ca38c30dc33a724ff3c2fcb542082751d2ad2d3afe4fbf6c5b8bc8792789cfa5bf5cc1baab341e4473eafa74bcc5914b3da7d686525190943f SHA512 8bcbecaa55aa653608069d2274307338aa9765cdb5030598b9cd6553bcdabcba3cb09eba97c93ef54aae483e2b122f3d6c742ffe0a0b9b775b1a1847936e7bff
 EBUILD ubelt-0.10.1.ebuild 775 BLAKE2B 5e7006b75c8b72ca38c30dc33a724ff3c2fcb542082751d2ad2d3afe4fbf6c5b8bc8792789cfa5bf5cc1baab341e4473eafa74bcc5914b3da7d686525190943f SHA512 8bcbecaa55aa653608069d2274307338aa9765cdb5030598b9cd6553bcdabcba3cb09eba97c93ef54aae483e2b122f3d6c742ffe0a0b9b775b1a1847936e7bff
-EBUILD ubelt-0.9.5.ebuild 776 BLAKE2B 2b81bb522dc0523e362221f3048a4b68d4139ff66361e97825425c571fb2f916637d9a43914a2869ddef62dd9dcf513cc22f4a66873c37d04f2d96d2288306e4 SHA512 677336d086985942cbc5f47b64a31b1172eaf9ce7a5c474e534b19201e364e11b0a5bc11b76fec4f0add76efbea875655263bd81e983ecef0cb6ba5f5b140e26
 MISC metadata.xml 322 BLAKE2B 99d2f0199fb7c359744ebc7cc3e285843c34c405c1a0e057ab9be81b8c662d01043f3ec0dd46903765b41bb8a69925b89fcbd91edfffb7f8872984ac4d59cd6b SHA512 ccc60ab6a64bf6cf92cc805f14df5ff46aa3af8024f32e764d6e98121ad6d96e506cc29e8ebde9696caa80d019a72e6f1f14803aba2eeb95dde5f9114bb34845
diff --git a/dev-python/ubelt/ubelt-0.10.0.ebuild b/dev-python/ubelt/ubelt-0.10.0.ebuild
deleted file mode 100644
index aad8e9f06c5c..000000000000
--- a/dev-python/ubelt/ubelt-0.10.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
-HOMEPAGE="https://github.com/Erotemic/ubelt"
-SRC_URI="https://github.com/Erotemic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/ordered-set[${PYTHON_USEDEP}]"
-
-DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# relies on passwd being equal to ${HOME}
-		ubelt/util_path.py::userhome:0
-	)
-
-	epytest ${deselect[@]/#/--deselect } tests
-}
diff --git a/dev-python/ubelt/ubelt-0.9.5.ebuild b/dev-python/ubelt/ubelt-0.9.5.ebuild
deleted file mode 100644
index e906563da37c..000000000000
--- a/dev-python/ubelt/ubelt-0.9.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
-HOMEPAGE="https://github.com/Erotemic/ubelt"
-SRC_URI="https://github.com/Erotemic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/ordered-set[${PYTHON_USEDEP}]"
-
-DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# relies on passwd being equal to ${HOME}
-		ubelt/util_path.py::userhome:0
-	)
-
-	epytest ${deselect[@]/#/--deselect } tests
-}
diff --git a/dev-python/unasync/Manifest b/dev-python/unasync/Manifest
index 0329b7e330b4..6d5e8ce48c38 100644
--- a/dev-python/unasync/Manifest
+++ b/dev-python/unasync/Manifest
@@ -1,3 +1,3 @@
 DIST unasync-0.5.0.tar.gz 19060 BLAKE2B aa7a955aed98ab33cc1a12aa88a02ab38ef90f9494f04c3e032b66e56e033404e9b59a89834a1e07b224fb865af5d139c27ff91ae5fec8ad01b1e407d9c5c181 SHA512 5b68e9a70f487b2b0fcaf9a5c4240b366428154fda99d53120315382dc29d2cffbbed72e277cee1764f7b91158db3d8b394d4f4969cec1fd7e49f27f01c39440
-EBUILD unasync-0.5.0.ebuild 720 BLAKE2B cc561b982139da44aaa95152ff849189abf89dfa487bac16a53e799c514f71baeaaade6744fe13ee094b29f0e27d3fffa4ea488aff6a64dcd4953def45f16aef SHA512 fb8c9d88e105fc0c4d9e877ed5c802a29639923d98d6d0327e6a7082cc5cd485f1c88f5552f5bd73e611aafe636b57cd851fd6c413d3b57a36f17fb6092ac143
+EBUILD unasync-0.5.0.ebuild 725 BLAKE2B 67fff88d45f43a3731e735d441993c9e380a38d573f7b7d9d5d0eb03bdd6a8d29b0a2ae3b70e4f36f44245f1e27b24b2beba0997c567af185394807e87911170 SHA512 f1d4540f104f15d95ffaceff323b56bef60479f88e2debd5740c96a4000f88d8a149c2d9da41a1580211104120433b7f03e0f8f9ec9920a73c5f5e94269cb3f2
 MISC metadata.xml 398 BLAKE2B a026d901c5516e4cc96b2c27301f5645cda800ee33f28ad3be49aa97f0b8f7801519efc6abdaa902e805b08fceb7d8e1d197b278faa766957f4ef7013928aec2 SHA512 38e4b5c7d490ae36b8936064681b0549e12d56fbcf2fad4363c53c896f35bda9b23477009bea2a67b1d074b81cdb592243d714046bd04ccff6b47c288931f6da
diff --git a/dev-python/unasync/unasync-0.5.0.ebuild b/dev-python/unasync/unasync-0.5.0.ebuild
index 2d1854f67f00..2b7d2ba38240 100644
--- a/dev-python/unasync/unasync-0.5.0.ebuild
+++ b/dev-python/unasync/unasync-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-trio/unasync/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 src_prepare() {
 	# Stop test from breaking itself
diff --git a/dev-python/uncertainties/Manifest b/dev-python/uncertainties/Manifest
index 57de497110a8..7b780e6960f6 100644
--- a/dev-python/uncertainties/Manifest
+++ b/dev-python/uncertainties/Manifest
@@ -1,5 +1,3 @@
-DIST uncertainties-3.1.4.tar.gz 148897 BLAKE2B 3e94b61ff6aac42a7910cafebee5b440541a020c58bc2ce402d0a056b5d278205f4a6556bf49073f5ded305cfa73ba7e9095e71d3963fd9b73e2e9e19ec360b5 SHA512 209ebbed1f9cf99e3263f6470b04fc737c6d34d878f7eb1d2a7df7e63d4d42b0460391a08f99d8fe09df8f7f0e1de8a8e6c2cbecaedc7f0373ab06d05fbeb955
 DIST uncertainties-3.1.6.tar.gz 158419 BLAKE2B 09582936a9b982efeee6cf3c99de568ebc820940ca2bfa1e4fd10edbcbd9447e7711158f8b98567a506d6c5a9ecf63b6e21d296c7f8d8dcbbaf4c2fb6a571355 SHA512 8835ed851d00bbe830770e57bc89ce57acf291e6cef2fca59897adb75e1e2de456da3631f73242ade20f567358b1d727b2b7f5df02e2f3e0cd8d861e81a6a211
-EBUILD uncertainties-3.1.4-r1.ebuild 794 BLAKE2B 3b880adc7f3f46c37a4b22253978397d653c609fb01cb38dc1405ac61ccfd476e2954e0cc0e0d699feae47145fbb105e7b26b3fcaf06184621d76d170aedb8b7 SHA512 e67922cf772593baf0b094ef05f46b4858f929f35b2443f0165a392a1a24990f7f7b8f4ae56d3ecab8928aa94285f671333c8048117783be3d3e846f09feaa4b
 EBUILD uncertainties-3.1.6.ebuild 668 BLAKE2B 0b387a85d90f1747c800cfd635fcac300c131322028424ad6aec80fdd296add92c5c0ea48ef2b4acaf38dddb3fc0b4161f130c3c781fe8825abce91c1026d524 SHA512 85b3879624d8ea6baec85c6ef2dba6e7e409dd11bcd788584bcbd443fe3e19700f650f447352bd138f66b3e7274404268ec609dcf834cdc037cf37d4c9efc303
 MISC metadata.xml 860 BLAKE2B 4877fe2c68a733a741d7b4cc3d0543695939de825a1a5311b38a9c82d3fe2693607d34d431894da96316040bd5b619d95ee7c87b9fb036744b33860e10a2b0c0 SHA512 a26dcc38b7e2a8ddfe26052615032409ccd8b8a83b767f3477e08e41d4f215f07ba784652af6b49ea18c8bbcea24853566af3103848e7be8131ddaa81537f20f
diff --git a/dev-python/uncertainties/uncertainties-3.1.4-r1.ebuild b/dev-python/uncertainties/uncertainties-3.1.4-r1.ebuild
deleted file mode 100644
index 1efd35b52aac..000000000000
--- a/dev-python/uncertainties/uncertainties-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for calculations with uncertainties"
-HOMEPAGE="https://pythonhosted.org/uncertainties/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests nose
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( build/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index d767041ff189..264ba7e01f63 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,5 +1,3 @@
-DIST Unidecode-1.2.0.tar.gz 216042 BLAKE2B c63a192bfa726a9e91224e73a42236088de0b39f34f3f6404eec1c3adfe6512e843ce1f75dab32456ce6be4d938b0b8acfc1e6243c394dffff7d4d47d07d0905 SHA512 aedc16be1b676dbde7e45444e297be916b1ca2874a76f07316e2df3aff9687dcf73def24b2441e147c94641f4407cc745ac35937508e09c670f8aa1473977859
 DIST Unidecode-1.3.0.tar.gz 191814 BLAKE2B ca995b91d802eff3dc07b78359f73a5b44d0197ba522d43c7cbe36c85682c20e943214d671ac2203829196d472456f853ad0988d21fa2e568b13ef865932bed6 SHA512 98682ce5c844bfb74466d0c4c16cb74b358f50ce7fc8ca8dd56836d1b8745cb5c78692b8027ff9caf59394df6050ae2f36f888bb95ef8fc7c84cabe2a596b185
-EBUILD unidecode-1.2.0.ebuild 583 BLAKE2B d9deab82ba3702b84725c613064cd3f595c9a0fafeeeb73458e0db4e4e82351315595c77b0a3359bf462ae1a8e528815fab1fb2c76e4ebbeb59c19e5a50cc3a4 SHA512 c6e18e7c21b1150197a8a671e671054095ed67e7ca6fc030afa1ff3f21a13379835fa0ad9803248f843ab24fed6830619628e6c24af887dc8ff680f860d027ac
-EBUILD unidecode-1.3.0.ebuild 522 BLAKE2B a78887b0b24d8deaf83642a329cb0cec7e1264b488543a3214647dc09ed3efab31528c96f264192848fedc655d836a66021fa3acd3495f6859c122ab0ed1186f SHA512 f41c7f51bd8f22cf73a01495669fdf7a6ab0d3d6843d965b68ddf6ac389e8e4e176b3f634143681d77f3820dc9793bc396b80b5144dd3f6775ee06c648d2b51c
+EBUILD unidecode-1.3.0.ebuild 515 BLAKE2B dbb555741daae5f8bc5fafd6510a0a2f2da99564c73b40fe70e37142b08a73ea1635401a3ba23d326c3730b3d4fadb963746698937eec14e602ac86a0b492ce8 SHA512 d5751c839fb6d599f02e9a7c7270b2f74eec50e1ec242722c5be93aa3f69518891fd8d583bacd4c7502bb7bc29d10a5d4032337d641843db119869beb51feb4a
 MISC metadata.xml 457 BLAKE2B 43e1b676ecfc82f845bfc1b3dd2409756ca419086ccb693b39f73e2598b5de9a463fecb3dbda76d7e375b23a6ba06589231d6184a92872bd4f3c16080bef6353 SHA512 7cded888473c7a7829aaba7d63d5a54bc22f5e9829733d961d520a7d3f0ff57ee00e16c42811a6b63c0d02f9e3f93a1d0f539c8c79242038bcdfd594ab7d07c6
diff --git a/dev-python/unidecode/unidecode-1.2.0.ebuild b/dev-python/unidecode/unidecode-1.2.0.ebuild
deleted file mode 100644
index 27f57a6cc0ae..000000000000
--- a/dev-python/unidecode/unidecode-1.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="wide-unicode(+)"
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-MY_P=Unidecode-${PV}
-DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.org/project/Unidecode/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/unidecode/unidecode-1.3.0.ebuild b/dev-python/unidecode/unidecode-1.3.0.ebuild
index 49e9bce9e96c..f92859c93a41 100644
--- a/dev-python/unidecode/unidecode-1.3.0.ebuild
+++ b/dev-python/unidecode/unidecode-1.3.0.ebuild
@@ -15,6 +15,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/unidiff/Manifest b/dev-python/unidiff/Manifest
index 9d54608973a7..50e66dde7021 100644
--- a/dev-python/unidiff/Manifest
+++ b/dev-python/unidiff/Manifest
@@ -1,5 +1,3 @@
-DIST unidiff-0.6.0.tar.gz 17734 BLAKE2B 4268553c31209ac1e125aee1db3808250cf9a605d7e0a0a6db257588e3c2dada3044a800a2fa0cb590ff6d388881babd3a3a34c637a4360f54b22f26ed9f5563 SHA512 2e4d30221a3f3230c3559936e7423bdb32d36127eac5c1c7b3c3dc9946ea7276c5074d7fb962e80117052830f98b4dfa1af9bfdea8369293ba77ccef86303f87
 DIST unidiff-0.7.0.tar.gz 18883 BLAKE2B 815c578ea02fb9e8a9a6f79e02ba8c35981f49d93b615d198bf5365df11552da84519a6b732986867dca3c329e7b43e9c79e7b158e17ec6921611a8d80aa3af6 SHA512 4f6f249219e4f36d7f753bb117123c508420ecbe6ef4f78936ceea10a5df00a4177ae45d8a56c62d824ee17ddfbc5a41ffc1f45ce1a7add9692b9c86813c2aac
-EBUILD unidiff-0.6.0.ebuild 448 BLAKE2B 0ab99570e05e091d65732a602b43d5afb6994c9b30dc8fced23ab389d7860cf8a97c14bce194c5f5d4e7b2bdda650eb3dd8eaa2770e188ecff76a49623bc26cd SHA512 73a02a9f6ded7792a4bf0d19977e6c555d4608c411ae1670a1c68968d2a3347560d5220773e8066ab4dd8e4187fcd644ce3a0a874d61f99e8f03173497f80792
 EBUILD unidiff-0.7.0.ebuild 453 BLAKE2B 3f53de61b5699c7550cb46d5f1ef345fdcda17d1528fcd34638928c956f75c31de9b22d18839e8abb81eba52a4d44902fcc2697e5768cc5b788aa80b150a49ca SHA512 08e842ba30a89412292b73ba8ccdf0893a79d0b68f2937d03cc276259dece59cdf9db35ba53900c5b6bfd9f44c6a838def2df95157a85679fb64e3059b6a278d
 MISC metadata.xml 501 BLAKE2B 489c8ee78b4a2631b57441474c919904239406f9e9096dad4667c7b6d19470bf9eae727d2bf3ab1293b50db40e9d5f7ceac94bb60b04e7ee7bae24e47eefc5fc SHA512 9da7cfdbcff40439edd325ecc8813b682a9c7eeaedc850d6605c21b87614a12048168f74bca3f4a7821f7e58715954570051ce6d2a3c426d6a0898632b4468e7
diff --git a/dev-python/unidiff/unidiff-0.6.0.ebuild b/dev-python/unidiff/unidiff-0.6.0.ebuild
deleted file mode 100644
index 7eebb102d50a..000000000000
--- a/dev-python/unidiff/unidiff-0.6.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Unified diff parsing/metadata extraction library"
-HOMEPAGE="https://github.com/matiasb/python-unidiff https://pypi.org/project/unidiff/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-distutils_enable_tests unittest
diff --git a/dev-python/untangle/Manifest b/dev-python/untangle/Manifest
index 7116cec96428..0c9f4a41284d 100644
--- a/dev-python/untangle/Manifest
+++ b/dev-python/untangle/Manifest
@@ -1,3 +1,3 @@
 DIST untangle-1.1.1.tar.gz 3089 BLAKE2B d8b8ffe1adb2acbcdcde8e6f67231315b9f318c9e8e1496dfa23b0ac6dd68651e75e2d2e67f6d7d521002ad6b0e9c4cc30c155685b9df60b6b223d137add0632 SHA512 252c3d0ed8d004660adad8f37a179a4d1b2b46e9d7127aee59b596eac3f65684a7a8b5b881bec97ddaf5470aa678df407b903209eaa069a40f53dc2dde9a94b2
-EBUILD untangle-1.1.1.ebuild 405 BLAKE2B 61bce286373ff3cff6fc1debe1ed2d889a6c3d2269790ecbd3a35ae8c5a52e043d0e022c2e8b19a52223718e595bee552a406af1d5bc5d2c007453f82821ff94 SHA512 6bfbdedfac2b152e5d616bb7368a03cc086c5885e77aaae6f322f15e7896ef8f793e66182fa069be689dbc324f0513108a9ad78a5714b7448dad2e1431998872
+EBUILD untangle-1.1.1.ebuild 410 BLAKE2B 16a3af18906d481a3b955281f8c9cad775ae529763df23d93dbf6c6d34a2f33af362e7d0dc9d0d1923067b7ba190ca62d4bf7c189e32003353c13600db62f8eb SHA512 ad1adcb2cfcc78568254c379da7c380b858bb802562da1dcf68b7336cc0a501b90892f72a7e19d25628d14bbf680210fd9b3e9b7ec756d468cd57d96a6c84805
 MISC metadata.xml 405 BLAKE2B cd3f424ecb68f2eb04d98d92282d7b1b486fac1b341d2febbf8f493d7f503b2831a4f1c6f9796d052676388d3a9b283de48893403477f05da6e96cc488ef2b37 SHA512 e7f7e07b58ac27d0b540220b43b0127ce626a3cf4c9a6524587437cac797f292a33a6cf10e56bc2db68b3835df42a7f5051981dc984d2cccbfa6d151f004b13c
diff --git a/dev-python/untangle/untangle-1.1.1.ebuild b/dev-python/untangle/untangle-1.1.1.ebuild
index 25ac46f18411..017a1efdc1ef 100644
--- a/dev-python/untangle/untangle-1.1.1.ebuild
+++ b/dev-python/untangle/untangle-1.1.1.ebuild
@@ -13,4 +13,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
diff --git a/dev-python/uritemplate/Manifest b/dev-python/uritemplate/Manifest
index b7f9292be4e1..63461c9a6e0e 100644
--- a/dev-python/uritemplate/Manifest
+++ b/dev-python/uritemplate/Manifest
@@ -1,3 +1,7 @@
 DIST uritemplate-3.0.1.tar.gz 32806 BLAKE2B 71fb7ef9fbdd61f3a3f67c5615cfb65ab261b5f9ce1c5a534e155a9723990599bf50e9ee0934d870161f7f26fc3d0fbcc07fefa558fc55bca29e96259bba767a SHA512 260da5901d28ca2354d972e00ed468c9bcf2901f948cb7759ff3e9d3a7b67da90ba754e555d6695c5095801b106ffd422459f0860b901a75e01575e159eb8f48
-EBUILD uritemplate-3.0.1-r1.ebuild 678 BLAKE2B 6ec19c68e7d5ee824f4e8c5e919f0db6943722e38da56dcbbb93f329288a4f7f48accc096885fbfd827d43e4330752d68a8d678d09911670b916c19d02f82b0d SHA512 9c96b47e67670a01e2b14b193ebedc9c7b889a554563f2dddda58dfdcb51875661b91d6fde8cc5433e230cdb626fda2b31489d0e73138cad136d3762098b69d9
+DIST uritemplate-4.0.0.tar.gz 31879 BLAKE2B b363864782240b6ccd7ecdb84142246d75800b7a173631c741d10a793817a32755d0ba35e529579663af3efd01c75e5838187f547757f9fbb38050e4af283193 SHA512 1428967387c7f157f0c512f044deccce93770fd50c6d1427393cddf835137588ba7c9253ac4a838866c0c3c128c5e96189a54d7a772210b740de50474afbc58a
+DIST uritemplate-4.1.0.tar.gz 273924 BLAKE2B b21115c6db8f94c635dda1033b4650dd7d2d54b6f52f51bff31ae8cf89e0b3dbcfc1bd029eadc68f5f94eecbd167eabc652c24be6f0bb807beecb5f254520626 SHA512 e62812a4e9ff315a1b06ba9e88f3dd47aea8353cae4ead9ce7bf59b65c83cd6ae7c973cb29b8ddc25266c264f229df8f2d9e982ab489f2f37a5dbd460b87a5e0
+EBUILD uritemplate-3.0.1-r1.ebuild 696 BLAKE2B 95fb1a38ce5336a442c1ccf3c9a9904b7325fe0192f22f304f4e61c610fcf64ec36e5e0526459933e80d469df7fb554987face154f520f8e999d4a18f34b21e0 SHA512 8a8a386d13b2a8993d8bb3b2d8066021d0c0b37c5ec74f626624cecf634fdfaf4136c3582c36506e452e249bc0efa6db5bf5f4f1e937fcea39153e2705d5f8f0
+EBUILD uritemplate-4.0.0.ebuild 490 BLAKE2B dc3d03ee496682d23ff2d350eb01229bef3c3e4fd1dfef644f32afa7d931797d4723144378c843d3358d204e05c300662f25e9b59420d0c927c3f0b4517e0969 SHA512 43177e37129f3ec01e032f5bef171243bccdb252831dcc99c60a7b158e14925df73e82661129ad27896c784d3b00e33c7b1c58a955c630db591eef4084db21b5
+EBUILD uritemplate-4.1.0.ebuild 490 BLAKE2B dc3d03ee496682d23ff2d350eb01229bef3c3e4fd1dfef644f32afa7d931797d4723144378c843d3358d204e05c300662f25e9b59420d0c927c3f0b4517e0969 SHA512 43177e37129f3ec01e032f5bef171243bccdb252831dcc99c60a7b158e14925df73e82661129ad27896c784d3b00e33c7b1c58a955c630db591eef4084db21b5
 MISC metadata.xml 325 BLAKE2B 3f78902faa0347b112f36292a5da4d27915ea6d415c76feffbab8b7fb8361fcd8c9cd7045cd7155f6a7749a9d86335d600e094c2c326885f69ac5615a0be1b39 SHA512 908711f5d93c2c9cea94bdcdb072db8a47406e8c44459252d7166741dddebed2693f67ab5bbe6a6064b6fbb015d39b4be42a9bb7477cb931c6033569fcdcf37d
diff --git a/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild b/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
index bde32369e96c..e7efda51e1b1 100644
--- a/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
+++ b/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm ~arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/uritemplate/uritemplate-4.0.0.ebuild b/dev-python/uritemplate/uritemplate-4.0.0.ebuild
new file mode 100644
index 000000000000..b9ff89a61c9a
--- /dev/null
+++ b/dev-python/uritemplate/uritemplate-4.0.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of RFC6570, URI Template"
+HOMEPAGE="https://pypi.org/project/uritemplate/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/uritemplate/uritemplate-4.1.0.ebuild b/dev-python/uritemplate/uritemplate-4.1.0.ebuild
new file mode 100644
index 000000000000..b9ff89a61c9a
--- /dev/null
+++ b/dev-python/uritemplate/uritemplate-4.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of RFC6570, URI Template"
+HOMEPAGE="https://pypi.org/project/uritemplate/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/utidylib/Manifest b/dev-python/utidylib/Manifest
index 0dd653444e50..b8eb24e0b792 100644
--- a/dev-python/utidylib/Manifest
+++ b/dev-python/utidylib/Manifest
@@ -1,5 +1,5 @@
 DIST uTidylib-0.6.tar.gz 15771 BLAKE2B 9d4fe57d985ea6e52680bd528862d3236137221227a23fe05b886d01d240e21d7159dbf7d6da3af8020009ca45c60c2297e374bb7aa05cb6b5a8eaf444710c58 SHA512 a85506ef8824f66ee326ad651020dc3b4e00190e20dcd3814984fa27ff319f492fe5bac781b7c43c8694cbfc63409e3abda18981969c9be2c3cd023fe7a4f2f8
 DIST utidylib-0.7.gh.tar.gz 15203 BLAKE2B c32f23ab3a94191423655f9b6a99bd85aca7072fcfea7507c5d4efb19c4ee22114afe136c6299e8322e15195c4f938094e49483b1a40d05522f2d232dd9a6acd SHA512 69b22671223cc9e1888a1be19b418e883baa79401bcf3856fa48cca441ae7fa414047c296f8fc9ff35aa7407901fa64cd8ddfcc56657a98e8e188073dfc72172
 EBUILD utidylib-0.6-r2.ebuild 974 BLAKE2B 0c526c1eeb5223e8018cb20c1419ccd95f135d34887108f3a065e6cb1379bc160289de98151295e79295b7f9b12706cbba473c1e50c9592b807bf8db882bf52b SHA512 76b59cd44d58ca0f025aa6e1dc623c48cfbfea482c0854ad21ce8f8ceee1a70d7ccb2ae19946107cd0d262e74561c992309cb0245d6b45907638c01d75e046e4
-EBUILD utidylib-0.7-r2.ebuild 713 BLAKE2B 1e4aef9353f0c255e997d34c06afcd8cea1b7448db3c6e2f8211ef438a3867240577dd21db1f16e764d6534b01158cfc2d39d804c2e2a94fbc7bbc57f79990a6 SHA512 1a7dcab1d840d6d82d5589285ac68987b21ce1e35358df3c961d84c6e4480d7808d489046d20f784dc3309db798c8532503f66b89405ac17ca2b082bd7b3e8ac
+EBUILD utidylib-0.7-r2.ebuild 710 BLAKE2B fd7ada56795ac6dfd7b06914dc0904cdf1e0d78f350c68aa64b692c71a6af2524245039d99b1702f99e81acf730fdda93827db31a000f67a159792aae30b926c SHA512 f5ba63ec4ba4dbb43ecccea69c20144f56f0e3639cc2cd3625b421097fabd963f71eb7fda1e66fe7e507dcbabda87e73aea9bb85b7e454f6f90f075dd90d7f98
 MISC metadata.xml 366 BLAKE2B bc4aba05448508a1d0a5e6972d253a3389a445627679c7946350ddf7e210b5b1232301e2b5c36822d946c1deb6669a763957982eed3440ab1c517747005d27af SHA512 7a68b5c21f50d81401bc5f0eb1d334679b71891d6aad08c7f1001140e15392482077b554a19e82f0ef451bc0c082b48300d54c32160f07bfb0d9ef0ab700c29a
diff --git a/dev-python/utidylib/utidylib-0.7-r2.ebuild b/dev-python/utidylib/utidylib-0.7-r2.ebuild
index 183abd11b74b..3dce86df644a 100644
--- a/dev-python/utidylib/utidylib-0.7-r2.ebuild
+++ b/dev-python/utidylib/utidylib-0.7-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/nijel/utidylib/archive/v${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~riscv x86"
 
 RDEPEND="|| ( app-text/tidy-html5 >=app-text/htmltidy-5.0.0 )"
 
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index c02bdc460669..f40509068811 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,9 +1,7 @@
 AUX uvicorn-0.13.4-fix-wsproto-1.0.patch 1122 BLAKE2B 4190a5e61af991e77271aef8bea17f137258944ff0c9a1384255a11c1f5ceb879746b47331247a6a24a5a45706c22fc70e19e2d5d1b8ea9cce6cc2e483df6150 SHA512 909ef4494cf395adbaedbaa7e6fa0561f44392126f19e08192842eb3148f0c19639007b3e54014758e1f00e6b8ba8fa5a06d9dc14f87e63face47e0759ac2bb1
-DIST uvicorn-0.13.4.tar.gz 505858 BLAKE2B 486436c0b4c717741c11b7da6a979dc9fe977baa2dbc3e2538ce28551d2dee593076b670b16c099056165624c149f96974f64d2847e38234122ec93b65b31cda SHA512 5332494e0b43b4e87f9d6742be679527b1ec2bc4d2e061768594d44b1fd1d6961a2bd1fa23469fca6c530ef36d6123e453306c2bb664cb27b0cd6145b9a70fd7
 DIST uvicorn-0.14.0.tar.gz 511593 BLAKE2B 9f7aee0001874c128e44d31945aaa0ca92237e594debb6fea3c6c6d0f283c96cfad5248578b0e1c170fe2fde96a6b17c56ecf2436783fcae135b8eab1997b701 SHA512 f41a7f01ac6893ceaf4d1f06a4bccd7355e319eee11d6aa290b0d316fb356eb807c926941157ec64f1fc6b7c4601930cfbe271075d6c4cf684bd7e175617390f
 DIST uvicorn-0.15.0_p20210913.gh.tar.gz 542385 BLAKE2B 1e551ffccac6f92981b0ef62cc80fb494b57dc19bddf8430c54b8a06801ee81cdc31a3167a56e90dd8e0f318cc84dfc71443f74beb39dc68ccc252bc6d6c1042 SHA512 865fe148900c8c00847017bab3ef17a9514e7ef7878ad6220633e2bd6d89b2e65a79a82fdabb8beec83841346a175f0c20807bea07536071a06a884c74418e0d
-EBUILD uvicorn-0.13.4.ebuild 1297 BLAKE2B e2e429e266084c92acf6965e86220494101135001bf656ce9ed1ee08b8ea07b61a8cb844bd416ddfa77ae9c8dd0d3618a8438b3dd1b08d12857efce9e6fbcbbc SHA512 3fd28de46cea2f2b8a2a7aa688155127d1a6d8e7f79137443606019e05825a1f4ab1c1ecd1dd8f4a04c8dc8e6851b59136fdcc68d5d4344be98fe70f97714dc0
 EBUILD uvicorn-0.14.0-r1.ebuild 1278 BLAKE2B 2ea6efb964012ed977b132f0d9a56cd4d57ce4f88cf09a9761962c32e0ec0b76e7bbc1aeb545c102c20481b72a97219dc0074f79b537144079a574106c7ae6fc SHA512 26ba815edb28f854b0de52c5d2fb8dc6e4b2d2b817be191ad49bc7cd31a7745663123d8ac9049408b44aa1effce4bcc3c8964a6c08e3af0f82d58977a5452657
 EBUILD uvicorn-0.14.0.ebuild 1426 BLAKE2B 7051151bdae8ad61fe11b8b209f2895cc37b0d0998dfdc110210cbcc5774082e8a5d0b21e6265d7b9a9c2437784e3c499750b48c5b0271691e5a1092c6083037 SHA512 982224e58b7cd8cf7a9596b921b226bebb6d8463b7c844b691be1c284598586d8ffaf70f911644e85f5518d2a21aa1c54eaa6741e5d9227b05b8b3d42709353e
-EBUILD uvicorn-0.15.0_p20210913.ebuild 1328 BLAKE2B 7c94d7dd6cc6ebbfd3e738ddd5aa6d595f41079555d9d52e81cd9c609c689a8d31025dc251efee7de33ae52bc8a05b007aa332cf7fa727a079587259524779ab SHA512 9e4c356b9b2df6d40dc8f05a3edba2f8e63e9c79a032dc5f890bb819d6ba3114528f65bf5ca3a6adc34ad5e8b3925390d536d8650dee07ce25cfca55c86f2123
+EBUILD uvicorn-0.15.0_p20210913.ebuild 1359 BLAKE2B 46065bb9747217d8feb3cb6b64f3b806b06b8bda50500e0415919088c97dec7fd2e9ddd6488f67a588c6c0148f04893e8dad157a41b053f092144a177342048c SHA512 2342c81770bf9079c6d7bae1ba06a8fb47f2dcda731a799445acdf4b4086a77ec24b2731404daa0961ec165a8f298cfbb6c5ee498eef9efb41339ea650b2aeb3
 MISC metadata.xml 451 BLAKE2B af9be617c95128297e3455b503e198e13c373244094f6aa9c80837945c3f9f023f1874efa28d4ffa8b241feb9a4e8c7f3d3534e96966733bd5593bffb90904a5 SHA512 4d76bab5c20f7cad81fa56a28c9be07bf2c2ebc412fc647f073215d437a2550eca247b8419df71d04200d0fdf545520684db0b6f4953e73848f69a4f4ad6931e
diff --git a/dev-python/uvicorn/uvicorn-0.13.4.ebuild b/dev-python/uvicorn/uvicorn-0.13.4.ebuild
deleted file mode 100644
index 76720a26ef6b..000000000000
--- a/dev-python/uvicorn/uvicorn-0.13.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-# entry points are used
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="https://www.uvicorn.org/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	=dev-python/click-7*[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_7)
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/websockets[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-wsproto-1.0.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# watchgod is not in the tree
-	sed -e '/^from uvicorn.supervisors.watchgodreload/d' \
-		-e 's/, WatchGodReload//' \
-		-i tests/supervisors/test_reload.py
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/uvicorn/uvicorn-0.15.0_p20210913.ebuild b/dev-python/uvicorn/uvicorn-0.15.0_p20210913.ebuild
index 96cceb3f9ce3..ce22f3609e8f 100644
--- a/dev-python/uvicorn/uvicorn-0.15.0_p20210913.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.15.0_p20210913.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 5c2eaa5b2a2b..c736fba5d0b2 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,7 +1,7 @@
 AUX uvloop-0.15.3-uint64-thread-id.patch 1548 BLAKE2B 2d1af0cd42f1911e2296db843bace2c3281e9defff1b174a7ca3c2bf651af2b9149b4066e9e252b216a33751591e0e15afec035142c35dac2bce7683c52a48e7 SHA512 0ae9fd1210d80f8efdf1d29b84450c60578848467b49616e9c5e71476779972e94ccebe13d99e74cef99ea59cf50617a8152a1768a0c14b812036310b403a55c
 DIST uvloop-0.15.3.tar.gz 2094066 BLAKE2B 77ae4634ee31211dba13f41aede4480d70271e042a30a1268e9ad18f5de2b296b84931fb6b2022d2351f33521a84264f74cbc30caa5ff84b0f429bc9f1d426a0 SHA512 5687371a13509bdac0ef7a5ca0f7c78b54d0d9225cbf68cebc6d4fdf3807c2e3346579f5440eb0ff6578088780cc5efb09fba114da0bc0e60ad3f607d9df652f
 DIST uvloop-0.16.0.tar.gz 2129067 BLAKE2B 8a5a5c760b1036428483d2cf1f509784aa61cb69388720775c9555bdb0ce19341cb58fc051ab6f92066a3478acf729513dafafd79f31115b064bf1d3660479de SHA512 dd6dcec38f7f94dc0cf0123302fd6fe404428196b452a80a8258a207654e3f67e210233be3d649668c22b48390232d0347706b1d87fb50016287142c742b806d
-EBUILD uvloop-0.15.3-r1.ebuild 1406 BLAKE2B ba8d047185aa66f1048ff6fb5f31247e964f48ee39786ce3962177b4b503b12563342020501312e90011b88e265fc4681474a3153548afe225dd9b572284d204 SHA512 6fb3967147daa33b6c9aa00cfd7c37faa2aaac9fdc1554d2be1b21b5c71aada4c2df83723079f3ee4a69eabfadb0491ccd4702f60dc6c6bb8ae8a3daf116d47a
+EBUILD uvloop-0.15.3-r1.ebuild 1405 BLAKE2B f24ac778087139ddb7c5ea4365a39673f8d7047b0f0f7b06443f0ab8b319ed5356495cf0271ef9ae4ae3d2b6ca3f293cfecf0095bdf1303e191006d6a151cc4d SHA512 918cd650137703ad2a5f9470b949e72be1b487696dd4dfa578db6c1778fa9b6a352ee5396c26a32bb8a7d9591e5e4d980f674ebdfe6b81c97b03ff870be9ff4e
 EBUILD uvloop-0.15.3.ebuild 1193 BLAKE2B fc992ae7c17888c29828b7cd7b56c77c8465e914b85b62935e1b2392448a9c5bd6ba19b59d10168ab7255761aea277922d56522007ba8212e4b774072d3124a0 SHA512 779c79417e4b2ef607e96619600c2a4f996957408e0ebebb9fa900e144aa20f409ae72ea9b9c05ab3dd90711a67edf3f424187551eedafdbd77ebae6e950c62c
-EBUILD uvloop-0.16.0.ebuild 1424 BLAKE2B 1b1b05b997d4a9cc11a85e5b282235996306a574a2124c942955ad7a7d10bccf470ef7d45500143876a01e03658b38816594df0fb8e7493ea0637bf13245e7e0 SHA512 55464c13ade2ac05ce2c97c784fdbc48bc59ec0414c7012d81d49d24698f081b9ddee364cc46caa5bc9df81fa3f4c94ae86691217b00bc55e7011d4662eff459
+EBUILD uvloop-0.16.0.ebuild 1429 BLAKE2B 17ac76f235a982b25518bacc01e4041149fc6df9556f21d138deb671db3264820af794a85d519efb9980932484559d59c8e8dde5939ea0ac83f60b7d84ba5e2e SHA512 90b2b9edec91d05fec80b7cb614fdea70eb01bf73566b1200688ae326ced9a2b2a99379f1cfd8dd12e7fb64463828e397fcd9db70748881d3a6269c602b957e7
 MISC metadata.xml 527 BLAKE2B 2db44bdfb681fcce35ef35f13155293ac3fdffa12a695b654ed8acc608cf1f769243136e66b6b2c1afd57caa7e59a66a60d34631c37a4b98a474bd0635fcbaa3 SHA512 02540835a23405c467293395fa7984741e02ca1aca75f527edd3b988d307b41db0f729d5cc0b3a826a652fb7104dec7be86a9a57f4d5646d2af87255cc2d90de
diff --git a/dev-python/uvloop/uvloop-0.15.3-r1.ebuild b/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
index ca1f98ca45b5..18e6468834b5 100644
--- a/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
+++ b/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
 HOMEPAGE="https://github.com/magicstack/uvloop"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv sparc"
 LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples"
diff --git a/dev-python/uvloop/uvloop-0.16.0.ebuild b/dev-python/uvloop/uvloop-0.16.0.ebuild
index 5c62d7d83df7..70bc3e57c741 100644
--- a/dev-python/uvloop/uvloop-0.16.0.ebuild
+++ b/dev-python/uvloop/uvloop-0.16.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
 HOMEPAGE="https://github.com/magicstack/uvloop"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples"
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index 91fb587eeb3b..d6c8e1e73d34 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,8 +1,4 @@
-AUX vdirsyncer-0.16.8-click-7-compat.patch 1192 BLAKE2B 33dd29de4c8497977a11052e4dc98290a981f470bdcd936f7dfc57e61a408332317805edbb0ecf50fdeb6256b91ece21f3b9582748cc5dc63cc687a68e9ecae1 SHA512 3de4131b447f789da4ae0da99f7f9f2d62dfb37b01b68db5b1c2ea68477425038681b4428024c3d743e18e2f0c3a069552066ff8743b85d2ce9bb31a4e850e9f
 AUX vdirsyncer-0.18.0-no-cov.patch 533 BLAKE2B 08f6d9dd09aeeb057bfa17fcd8a590ccef68bb9bed8c84c6682471ba53886bc80011990086c9b51673e272ce15fd9096847dab6bb9a6087670e5b01417cbc981 SHA512 00d4f334e1def6295f2b1aacfc2a7fd33f250a0bee39957288fe83a5179c0461f71273051687b53435b0cdd78a3ece618b1dec5a8e253cec3f3c3733528dba10
-DIST vdirsyncer-0.16.8.tar.gz 115819 BLAKE2B e0140718a1b41875421a7094e02cdeb865c500935e0c97bc18a614551586d79682641726df1a96e17a158604ed309f713f4caf4a484025eca5fbc6acbbe18f97 SHA512 12cb50f592085af37bd9c4207c0d31fdd38fc2a44712eb6288b12e7e7ee9af82070d1d405fa9579e935e545e6c92aafb6f8334ebde4976c4eb9412e78e7c5ada
 DIST vdirsyncer-0.18.0.tar.gz 115125 BLAKE2B d81bb9b51658d16a3b9ea044846561a1ce2dac3a839d7e0a165f0136069fcd0716525ab2b908be7cafed60846a1aed6fd72aa1d31fc2a38dbe6de8d0e6585226 SHA512 7fb3d0f7d982d8390d278de1a620231e6ead1ec64057c5dbac98dcff491fa3e6b9ed8ba953995458e393aab73b0b9ab8ba14010e06f90a04d8ee2c28c7c7fbfd
-EBUILD vdirsyncer-0.16.8-r1.ebuild 1665 BLAKE2B 174aa65ac2b9177810b81bb22c7411e93599f91f2c624aa12fa2279e645280c800bc1b847dc7c096a67cfd4fb118788195905fa8a39c6588fe5803c553ad92ad SHA512 b3f8a0a58a3020f3870709c12f3125f87f2812c0883944204b065f1137a97f7ded95bfa9a33f887588404ab8e71f2bd7c0ce305a85590df978cd8b5722227cfa
 EBUILD vdirsyncer-0.18.0-r2.ebuild 1664 BLAKE2B 8fe1cc11994e6041efc716a7a09a0964496a1e0dc6ced3063196243f893bfbbbe2f3a4b903d26c582c55f9b637b00eda7c4396917c26d99b1c56b578a7a719e7 SHA512 10388b153f0415962b204ac238c01f89b6bba06c30aece50cb93ab48144548c099a6660ae0020a16759fbf7f6dd928fc4e5c593013959c28a17233af04d5a5eb
-EBUILD vdirsyncer-0.18.0.ebuild 1502 BLAKE2B 4934fee920fc9aa7c9f54fc2afb7c96654009e2baae8a05629d45b44955e86ea57892ceced4109b4bf1ab1c29aba03785f5eb530e4522f13d47f7599ef6650dd SHA512 74781a7582a99b4731a15143cdd15b90c70b4aef609984561705e9558c4824e39846727103a5345966decbfa6a4b7f42a8cb89a6c529e26c38b5b592509ea985
 MISC metadata.xml 475 BLAKE2B 368524aa96e63a09f0bb25a2d2cfd0a20fd80a7723faa3c076e0a3a10f4fc0e06be1c0521afedbcfd39fc99e2e726627c7ad13622ceefa2fd90d317756386e3e SHA512 5a4150a6e7f0ad92c1b80291e5700f875e619b6b155903189a97ca7f820fff2b656309a27fcd7bae94d5fe6a7cd36cb93633ff0cc0ae7fcaac1399a3f132bb99
diff --git a/dev-python/vdirsyncer/files/vdirsyncer-0.16.8-click-7-compat.patch b/dev-python/vdirsyncer/files/vdirsyncer-0.16.8-click-7-compat.patch
deleted file mode 100644
index c0ee62f959f9..000000000000
--- a/dev-python/vdirsyncer/files/vdirsyncer-0.16.8-click-7-compat.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 3eb9ce5ae4320d52e6c876874511ff96a8a45f51
-Author: Hugo Osvaldo Barrera <hugo@barrera.io>
-Date:   Tue Jun 9 14:45:02 2020 +0200
-
-    Add compatibility with latest click
-
-diff --git a/setup.py b/setup.py
-index 59549f16842a..d584b95dd297 100644
---- a/setup.py
-+++ b/setup.py
-@@ -11,7 +11,7 @@ from setuptools import setup
- 
- requirements = [
-     # https://github.com/mitsuhiko/click/issues/200
--    'click>=5.0,<6.0',
-+    'click>=5.0',
-     'click-log>=0.3.0, <0.4.0',
- 
-     # https://github.com/pimutils/vdirsyncer/issues/478
-diff --git a/tests/system/cli/test_sync.py b/tests/system/cli/test_sync.py
-index f242376417f3..43d35dd8541e 100644
---- a/tests/system/cli/test_sync.py
-+++ b/tests/system/cli/test_sync.py
-@@ -123,7 +123,10 @@ def test_verbosity(tmpdir, runner):
-     runner.write_with_general('')
-     result = runner.invoke(['--verbosity=HAHA', 'sync'])
-     assert result.exception
--    assert 'invalid value for "--verbosity"' in result.output.lower()
-+    assert (
-+        'invalid value for "--verbosity"' in result.output.lower()
-+        or "invalid value for '--verbosity'" in result.output.lower()
-+    )
- 
- 
- def test_collections_cache_invalidation(tmpdir, runner):
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.16.8-r1.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.16.8-r1.ebuild
deleted file mode 100644
index 8888f31e1aa8..000000000000
--- a/dev-python/vdirsyncer/vdirsyncer-0.16.8-r1.ebuild
+++ /dev/null
@@ -1,58 +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} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Synchronize calendars and contacts"
-HOMEPAGE="https://github.com/pimutils/vdirsyncer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-SLOT="0"
-
-PATCHES=( "${FILESDIR}/${PN}-0.16.8-click-7-compat.patch" )
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/click-log-0.4.0[${PYTHON_USEDEP}]
-	dev-python/click-threading[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	dev-python/atomicwrites[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	# Replace getiterator with iter for python3.9.
-	# See https://github.com/pimutils/vdirsyncer/issues/880.
-	sed -i "s/rv.extend(item.getiterator())/rv.extend(iter(item))/" \
-		vdirsyncer/storage/dav.py || die
-}
-
-python_test() {
-	# skip tests needing servers running
-	local -x DAV_SERVER=skip
-	local -x REMOTESTORAGE_SERVER=skip
-	# pytest dies hard if the envvars do not have any value...
-	local -x CI=false
-	local -x DETERMINISTIC_TESTS=false
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0.ebuild
deleted file mode 100644
index d902fe2f289b..000000000000
--- a/dev-python/vdirsyncer/vdirsyncer-0.18.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Synchronize calendars and contacts"
-HOMEPAGE="https://github.com/pimutils/vdirsyncer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-SLOT="0"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/click-log-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-threading-0.5[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	dev-python/atomicwrites[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
-
-distutils_enable_tests pytest
-
-python_test() {
-	# skip tests needing servers running
-	local -x DAV_SERVER=skip
-	local -x REMOTESTORAGE_SERVER=skip
-	# pytest dies hard if the envvars do not have any value...
-	local -x CI=false
-	local -x DETERMINISTIC_TESTS=false
-
-	local deselect=(
-		# test CA is too weak for modern python
-		tests/system/utils/test_main.py::test_request_ssl
-		tests/system/utils/test_main.py::test_request_ssl_fingerprints
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index 9aa34ad54c5e..6bb976d8cc76 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,3 +1,5 @@
 DIST versioneer-0.20.tar.gz 50634 BLAKE2B 4a64f311b5b7028f15a20c8111f462399bf49340b6ac42272af20427fe5ce722c9d589c04dcb66fe66782ad3ce3491f5fd4807ca06b3caa2342fe3750bedc1be SHA512 7751af838639f06f1f87224b3f87e5d466cf11f32e4da35646a1ea84ba8d21901d47137fab6bde2632f5aaecc2f90f9bbf5968d3fcd3b074e5145762bdde1ae7
+DIST versioneer-0.21.tar.gz 50072 BLAKE2B 83b56dc61b7ba6dd1fb274f08b08e501ab0e209d915785c3a62d733524270a8bd1f60fb09dd3d97c2030fa4e8e154e8351de51beb17774189ae68c12fca1e12a SHA512 a75e68cf1d11ddca220e8e617cd4c2e17b20d8d683c9e6ab94e8470695eee8fa00f7b5a9cb5cfeabd984446dffab70cb7acc749296c235a6a6f1c815f1729583
 EBUILD versioneer-0.20.ebuild 863 BLAKE2B a3c8a366332610b9a29e9a6f2e32e0a3bc3b28b577da5265c6216eb324121cf336e2bb0e62817ac6e56fc0be7159aead02fe42e486035ac5e3c579b20ad22c5a SHA512 9986afd8b26e8a0b60d5632fd4f99a819a7200e0cdb9ce1fad0a0b6213142d63ddf34efbbc37d7ea213c70333259252565367eb3026edf1280870bdf52ea6da5
+EBUILD versioneer-0.21.ebuild 870 BLAKE2B bcc4a2cbf24a280f0f6b67fb33b972efddf75eeb21a6eb08a921c3c33aa0a93e04242fc3c8967f15649c82f14ff8a347c3a11b87fdc865479de4b4133da2e3c2 SHA512 9a9c17d977aa87fa43b467f5f28d546bd1011d1f7fa17c6e7f13c9ad7eb961cfacb9a96b36f35acc9b41a732b3eaae435accbb09b463fe0c8b733b1bfdab3f5b
 MISC metadata.xml 426 BLAKE2B 050a6c51f12ce466d0149041e103227c176f792326f859474c996a38f510544f09a594b6a70036b3cdad78013ff9982316c671e77be6ed2e7f0fa643bf89d320 SHA512 da99aef0b58491715dca230579ecba68bfe357909dd8bd122e790d7f0300e0b1d11cf224ea3a3c76763d593f45013cca6cfe27cc774c6eb90dd6da562a061c38
diff --git a/dev-python/versioneer/versioneer-0.21.ebuild b/dev-python/versioneer/versioneer-0.21.ebuild
new file mode 100644
index 000000000000..299d280fc6b3
--- /dev/null
+++ b/dev-python/versioneer/versioneer-0.21.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Easy VCS-based management of project version strings"
+HOMEPAGE="
+	https://pypi.org/project/versioneer/
+	https://github.com/python-versioneer/python-versioneer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+python_test() {
+	esetup.py make_versioneer
+
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+
+	"${EPYTHON}" test/git/test_git.py -v || die
+}
diff --git a/dev-python/vncdotool/Manifest b/dev-python/vncdotool/Manifest
index 9200eda1c546..ed3be53901e5 100644
--- a/dev-python/vncdotool/Manifest
+++ b/dev-python/vncdotool/Manifest
@@ -1,5 +1,5 @@
 DIST vncdotool-0.13.0.tar.gz 72780 BLAKE2B 6a27565c5410148f569bd5a8e212327d734f9fd044549683bafcbbaed0df56e0a4853b4750eadc74e2186463313cd510c5290a8c4de69eba5ecbc42ea5d94c32 SHA512 65e275c53dbc805114801b149bff86743cdcb2b8d69b038425fd7dd6f911b113e332246178080c71314d58624137152205057c00b451a3ec6b46541f1b294b98
 DIST vncdotool-1.0.0.tar.gz 62580 BLAKE2B d09b26e81496055f17e96fa5b60ea006ddd210fa8b0044785c107582af18a61fb5beec83f577222b32cc8f446694235cd3ab468cfa917ec3ef4b00b6fbc1a8bc SHA512 45fba9ba3549ad575923bcfb3ab62c53b3c2d85882c87ca2b656795314b9c32aa989a1fdae280f904cb4d79f509622810ffd4d1e2977beac917f0289d6ff24a4
-EBUILD vncdotool-0.13.0.ebuild 1146 BLAKE2B 3f1c74bbd0f315b6c9a33e9e9d9ceda86bce9c79f938b662adca6c25a48729682ac6ecfd3063a34e14bc5f02be4211b1111c01d07bdffc0bc3dd5c050ef59329 SHA512 1faa9de9784eb5b64e4c681de97bdde21f6b23be7934947513f3b1b6aa07b75b073f920dc3703dcc7f9ead67f484b4dd7aa353cbad82027658b3e90cfe938749
+EBUILD vncdotool-0.13.0.ebuild 1153 BLAKE2B 57a12db59df8d3cecf77ab04ad9e7b15bb0093d5ba9bbc8a1225c57daa0092bf7d6a52848749866f5a9efb5cd44511a4812628aaea9a00dfd170a4f2c2624a0d SHA512 7105ba13d3aa170ccf54417efb13b9479e0622f872a04d694006d7e0a79cc8fda807a3547f535ff42de9b0214c8d74533a04ad45db9b1b2ebacaa50ef5a2bec5
 EBUILD vncdotool-1.0.0.ebuild 1146 BLAKE2B 3f1c74bbd0f315b6c9a33e9e9d9ceda86bce9c79f938b662adca6c25a48729682ac6ecfd3063a34e14bc5f02be4211b1111c01d07bdffc0bc3dd5c050ef59329 SHA512 1faa9de9784eb5b64e4c681de97bdde21f6b23be7934947513f3b1b6aa07b75b073f920dc3703dcc7f9ead67f484b4dd7aa353cbad82027658b3e90cfe938749
 MISC metadata.xml 411 BLAKE2B f56300952068ded2038b9366bc314e31f9f4b8d576a73b022403330be66f7068bbff1c7da0f71dda79088d1364a60ad008b7183ea652b76578c52484b2ce18f7 SHA512 4738b4949de46df665517f4cd639e630cee8ce1eb13b03c547b9b6193aad09bebdd9dc05e1e2282d8ce17b31e14e0734c879d44ed290b6eec46654ccd97dc8aa
diff --git a/dev-python/vncdotool/vncdotool-0.13.0.ebuild b/dev-python/vncdotool/vncdotool-0.13.0.ebuild
index 122de63db2a3..c5b105fa566e 100644
--- a/dev-python/vncdotool/vncdotool-0.13.0.ebuild
+++ b/dev-python/vncdotool/vncdotool-0.13.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sibson/vncdotool/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # A lot of errors such as the following appear
 # pexpect.exceptions.ExceptionPexpect: The command was not found or was not executable: vncev.
diff --git a/dev-python/wand/Manifest b/dev-python/wand/Manifest
index 36a90a5a4d82..340abd132504 100644
--- a/dev-python/wand/Manifest
+++ b/dev-python/wand/Manifest
@@ -1,7 +1,3 @@
-DIST Wand-0.6.5.tar.gz 11477141 BLAKE2B 7257dbee8642d619d69d773aa5e0f70c27e32eb5ca4168746efb191ce6d2a49b000aee07127aa51e1906e52e7bc7f2375f39482edf6a841933e4eb2711217fed SHA512 7355888da6ea604759d4af8548d4c2e08d529c88d2720400bbfc6a19bdb03049f3faa5abcd5f3a9c69b705754e86ad4f511a76a0a310d5dece5c2774d74e543b
-DIST Wand-0.6.6.tar.gz 11477246 BLAKE2B e4e908da487994c50b02fb25c7a19a70865fc021e00a36170562dd546ac0d0b9c6eb6d622fc50e0160feb48d52828617d8cf83b1ef0f2f449fdc32f174880917 SHA512 618a8678031b57382d008062ffa21168aeb7afd7a5b82675020b11c756f1542f9a2d2d656d7d683cbf47e4d8be118bf0aac005b4aa1a6e5ae9dc417edea0bd79
 DIST Wand-0.6.7.tar.gz 11686093 BLAKE2B 58abbdc22eb1603ed42e2e2473c0ed2b9026c9c0a499bb885512b56ecf01fb4ffe450979808bba2b4c4466994f86bea9a9c0ced216f8338c845b96a755f39c9f SHA512 e79ecb909f6ad7b3ddae217bb7b27f3c010d22a40eb99866e2a6eb07346000acbead280176e3352da13c20b68a341c751c55d6203bef7968522c8dbcfcab0b06
-EBUILD wand-0.6.5.ebuild 732 BLAKE2B ee7f49fdfcf8bb9380c6f176e7c04798cf3f9684de9ed1808cf57e9a6cdd17df56085cfa12400ed7510137cdcd2e1dd037453defda17ea26c6f0a073f19b97a9 SHA512 fd9f0074f4235248f9dcc4e0ed16c74503d2bb4344e8ffbe9e5977282b0913faadf4a98aca85631591db723175dc4e7429622f9eaded227b414c3e766b378f1e
-EBUILD wand-0.6.6.ebuild 733 BLAKE2B 82678b3194eed835eb879d4baebfb7eb9c1b10c7171cc6d74c8596f6a3e04d2cd7af84b41163c2221007fed434c86f2e6fe7e91891ea795b99f9c616b48a2c74 SHA512 aa3e4f9b6949ebb4eded6d2ae6f977535b341ee01af4071ed1aa7fd06c0120429d61b75d59078f8e488369161cd4526a34034d86e7ca21ab89ec94814443b396
 EBUILD wand-0.6.7.ebuild 693 BLAKE2B 2fb65a5aafa6af1e39919bde33b704d3dd06f3974b472b8bd2eddb13a8d267a4541afc46d857adc6cc6100f81247e12defa0119320216e2a8bc2d5dd78e5e7e6 SHA512 ce87a3e330c250fcf8a5e02f02db6532e93958288fd26904921ae8ca370690871ec6c1a6f0c2d72e7400a4b5b12dd1cfe0a6d393033f55dbb93e9af187bed7f0
 MISC metadata.xml 534 BLAKE2B 0c2295ce9b9805ceff22c9549adfa46578a5d5d1d4f13b7af416ad23f305ee24275deb7204a68076901e6060d41a3935580e24578d2fe56a2c32817ab83165b5 SHA512 68f30bc7ad8cf6a451acf550c02b76e1f71a8c66c9ffc8832995bd292bd460d16c9526e5bb2daaed9cabece9591499f9dd3b0f11d748af247c78654d6104ee13
diff --git a/dev-python/wand/wand-0.6.5.ebuild b/dev-python/wand/wand-0.6.5.ebuild
deleted file mode 100644
index e31b06bc29fe..000000000000
--- a/dev-python/wand/wand-0.6.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-MY_P="${PN^}-${PV}"
-DESCRIPTION="Ctypes-based simple ImageMagick binding for Python"
-HOMEPAGE="http://wand-py.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="media-gfx/imagemagick"
-BDEPEND="
-	test? (
-		media-gfx/imagemagick[fftw,jpeg,png,truetype,xml]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_test() {
-	# PDF support is blocked by the default ImageMagick security policy
-	pytest -vv --skip-pdf || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/wand/wand-0.6.6.ebuild b/dev-python/wand/wand-0.6.6.ebuild
deleted file mode 100644
index 7c69ca333813..000000000000
--- a/dev-python/wand/wand-0.6.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-MY_P="${PN^}-${PV}"
-DESCRIPTION="Ctypes-based simple ImageMagick binding for Python"
-HOMEPAGE="http://wand-py.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="media-gfx/imagemagick"
-BDEPEND="
-	test? (
-		media-gfx/imagemagick[fftw,jpeg,png,truetype,xml]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_test() {
-	# PDF support is blocked by the default ImageMagick security policy
-	pytest -vv --skip-pdf || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/watchgod/Manifest b/dev-python/watchgod/Manifest
index d4d37f4e1769..d339425638ff 100644
--- a/dev-python/watchgod/Manifest
+++ b/dev-python/watchgod/Manifest
@@ -1,3 +1,3 @@
 DIST watchgod-0.7.gh.tar.gz 14362 BLAKE2B 0c16b7ef2a7e1d0ca2c9d27b1503a9710662364318d5021e916aabf90c8f917b0bf69559a545658f839953832edc579b0014a0736b3b155f097d1d29c2e4b4f7 SHA512 afa225b30cf796ce95861c61fbe8eb22ed72011522de53d53c41148311793db10e41b66e9eb1237c4372f142edaec992de79715c568e435ddb1695666be1cdd8
-EBUILD watchgod-0.7.ebuild 657 BLAKE2B f2da1475b5774ff4b5030ca31e23365760dc475d5fb09afd6692c6bf6e4942d92875fcaf11e086b0f13bb5f47b14fe76ff1d5408662039ef1d805d650d9503f2 SHA512 4b90656881e80a52beea3d1c0bf5c459927872115d5299902ed98de839817abdd0ef7923ba2521208d84230fa7b2163d822e2dd1f2ab672f673f12e27be7c232
+EBUILD watchgod-0.7.ebuild 688 BLAKE2B c8cd5e620411f732a276dca86f7772c60e908afb7f5774cc66f7260ab96d97ac77a84ddecdc2cfeedea08c54e068e0595517f73981ef810b8046edba20fbfbfd SHA512 37da3a894244da32dab327f3f91df52d9f63944df019385218e13cf9b01eeb881084aa1e661b667b991640f6f0f1fcc63680c4a14c4bc45cc1c7ba5987e77016
 MISC metadata.xml 350 BLAKE2B a13e5a3a9299cb914851645a4ba2a3c5c63b7c55a478fb2b73472355a3b126c0fb82d7c1f21e61f44ef698bc19f2c351e29114d26afee9459069174ea1e53255 SHA512 a7b7f0f64ed2ffc26479e0f82b2ef30f29cd2cc71b38768478309aa61031dbb76e63528d03f136256e96d81469336e40999244c3ff0cef1e480102f298f582d3
diff --git a/dev-python/watchgod/watchgod-0.7.ebuild b/dev-python/watchgod/watchgod-0.7.ebuild
index 66b254733fc1..ab970887f3f8 100644
--- a/dev-python/watchgod/watchgod-0.7.ebuild
+++ b/dev-python/watchgod/watchgod-0.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index 2590dbc6b8fe..0e6a7a06cf0a 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,5 +1,3 @@
-DIST wcmatch-8.1.2.tar.gz 112726 BLAKE2B 4d91425f30e81f1ff3449b364b74f242b7393b7a4a162538e57406f9d5cc05d24277d6c0119c40266d4474c9c99919ade8d0450b1999abb39077ffc64f495719 SHA512 f96fc646db334407229ee9885b308eb2b27967d9b4e4245df33641605af678f3edfb54f53c5c8722b946029d39779fcd775299963530036c723cfa860dcfff38
 DIST wcmatch-8.2.tar.gz 113537 BLAKE2B d1fe53f7d2394af31750c0b98451749201b1adbd8d00a734418afd8e208a9480b913059f78f62016be2fc2109813406c096f8ab60973a716b6ca275377551281 SHA512 d56d868ec0578ae59eb5f39ff17005faed13162141e3ced15c60d8de5f8e8b1a16eaf66e7c73cffdbd288b94db57843112624de8e5b588d26a5e46d4edb72168
-EBUILD wcmatch-8.1.2.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
 EBUILD wcmatch-8.2.ebuild 1298 BLAKE2B a407e9dc3878ce0d0ee1b14600156b77d5a04de131d21cde63f5761601d9432f2f8e5db3e4a9809b7a429d168df6ea7cbb27656d73ffe0e544cd460315acfd10 SHA512 9435d1e43aa0608eef47e96add8dcd8f45b5c52303ab3eb58e8ba7eeebc27fdc92909a1c08684013715594c1167c9a3391526d729bee951aa2d2b0d6f2881a01
 MISC metadata.xml 3087 BLAKE2B c15652b6011b559ecaddfa76231050204a857839e3520dd77a626580d753225389f4484e22aadcd58e0e61558836655ae29adc01349484774b27142bd633a9b8 SHA512 68361ca29cbebb9a9fc9a456d485b64796b0fffc09201ff1c09e7ed913526923dca179c7e21b0420e50a55e53ab3bd01e6ecea204b38995c81cff36c49059f16
diff --git a/dev-python/wcmatch/wcmatch-8.1.2.ebuild b/dev-python/wcmatch/wcmatch-8.1.2.ebuild
deleted file mode 100644
index fdc416d52454..000000000000
--- a/dev-python/wcmatch/wcmatch-8.1.2.ebuild
+++ /dev/null
@@ -1,61 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
-	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-vcs/git
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# this test makes a really wrong assumption that basename of $HOME
-	# will be a username
-	sed -i -e 's:test_tilde_user:_&:' \
-		tests/test_glob.py || die
-
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index fe69d79ba672..430e673bd61f 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,7 +1,3 @@
-DIST weasyprint-53.0.tar.gz 386339 BLAKE2B 6d8e30a02d54061557e549a685944de7cbc61f4c1b46b23dbaef66e87232325f630fd5a34cf5c846599612914f9306b5235fad65a008e19a7c200af2f4c7d9da SHA512 de34ee5654ee90aec82b67c1bc7d9496fe3a4247b2a649ab110d1613c4780fd9ae611c9da177de07e5287749978af9a4a7d5c102d0940e5fd970e5aa8586c47e
-DIST weasyprint-53.2.tar.gz 387220 BLAKE2B 820c3ef386c86ab927a02153e68ba085817d18c9658539233c283b2ee2e58a190420a88d3d1b4282d7e46eefbd89d9c5fbd94ccefaa6ef7c304d893579739482 SHA512 c4e1a831a9ac5b3adf1241b8c53c90330e3960cf7a5ab8307bbeb89e8e17a7e5a5d50fd676961ce45deda606b82eaa2b05d37f7dd5a1506bd0d78f8e4276328a
 DIST weasyprint-53.3.tar.gz 387448 BLAKE2B bc575a150ce3af4b33dc36b1d4148d5059c8a61c2576b9305735ae192314d7df61bd9c92defaa65159933be489c262e8ac343090a840d1cf49ed5af1e5e669ad SHA512 28efd97c06572de3e82763400efee3d2415da03feafcb38158c35465823d6ee8df9be4e11b813beeb2e851a6affae668ee9eea8859ec5de6c4da9347d9f4216a
-EBUILD weasyprint-53.0.ebuild 1077 BLAKE2B 3921ee1d9975cdb5e384118122fd7416e139138a190178ce5bad6209fb4dc8c67722015816229119438a8a0f85046d83465bba65ee32d7a265e3622f875b3d5b SHA512 9be92a78f9151511482ed4ab7b4fc5d4818416d5d6e0bf5d72bc3d6275f3c6fb6f8d354fb75cf1be88bf1909c315395ebc1e6b1ff8a85f881fd1f2a2619ce19b
-EBUILD weasyprint-53.2.ebuild 1077 BLAKE2B 3921ee1d9975cdb5e384118122fd7416e139138a190178ce5bad6209fb4dc8c67722015816229119438a8a0f85046d83465bba65ee32d7a265e3622f875b3d5b SHA512 9be92a78f9151511482ed4ab7b4fc5d4818416d5d6e0bf5d72bc3d6275f3c6fb6f8d354fb75cf1be88bf1909c315395ebc1e6b1ff8a85f881fd1f2a2619ce19b
 EBUILD weasyprint-53.3.ebuild 1077 BLAKE2B 3921ee1d9975cdb5e384118122fd7416e139138a190178ce5bad6209fb4dc8c67722015816229119438a8a0f85046d83465bba65ee32d7a265e3622f875b3d5b SHA512 9be92a78f9151511482ed4ab7b4fc5d4818416d5d6e0bf5d72bc3d6275f3c6fb6f8d354fb75cf1be88bf1909c315395ebc1e6b1ff8a85f881fd1f2a2619ce19b
 MISC metadata.xml 382 BLAKE2B 3e5d142b055354e1ea440d9efd4bf92458b1da3f777dd90929ce2041ca6e0969fa6e58aacfb4a5a93ff90805e0d8ec4c9c6253559ca54698f5029639ce35ac8a SHA512 43415064a6f56eaca974031e51d63118d1c65b33e4399302fc72cc2cd6f15e0a47cf411b18d3c5136e866115855deb19b6a9e058a18049151959ce5ee29ececf
diff --git a/dev-python/weasyprint/weasyprint-53.0.ebuild b/dev-python/weasyprint/weasyprint-53.0.ebuild
deleted file mode 100644
index f201ef75f8ef..000000000000
--- a/dev-python/weasyprint/weasyprint-53.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
-HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
-	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
-	>=dev-python/pydyf-0.0.3[${PYTHON_USEDEP}]
-	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
-	x11-libs/pango
-"
-
-BDEPEND="
-	test? (
-		app-text/ghostscript-gpl
-		media-fonts/ahem
-		media-fonts/dejavu
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/weasyprint/weasyprint-53.2.ebuild b/dev-python/weasyprint/weasyprint-53.2.ebuild
deleted file mode 100644
index f201ef75f8ef..000000000000
--- a/dev-python/weasyprint/weasyprint-53.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
-HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
-	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
-	>=dev-python/pydyf-0.0.3[${PYTHON_USEDEP}]
-	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
-	x11-libs/pango
-"
-
-BDEPEND="
-	test? (
-		app-text/ghostscript-gpl
-		media-fonts/ahem
-		media-fonts/dejavu
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 3b1eed585af2..8e26d9ba4ae1 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -2,6 +2,6 @@ AUX websockets-10.0-py3.9-fix-deprecation.patch 1822 BLAKE2B ccbde169be0d9c21803
 DIST websockets-10.0-src.tar.gz 276231 BLAKE2B 6170f0540bc33be3d9a71f596ffee58e6e43c2173239a8fffe4f0c2a7555f8ce26849d85ed7865a5df6a4401f01bb0c928a341598916487cc79152a5031e9bbc SHA512 532289dc411d11cffc6e5aa07013cdad9655f124fbbd5dbdfe92985caf554644976a521466b1d3cbe124de11809e395b5e83195eac87495585779591b189c4d7
 DIST websockets-9.1-python-3.10-support.patch.gz 6940 BLAKE2B e4835c7d5efaf956d07b884c85e0b95f26674bf36164fa8362d1c1a564a959bde761d25e747333c58864f74a5ea1b199f228a46ec6a1647c5495ea032020c179 SHA512 7fb4b298a9167c8d913e293fa7549b21d5acb333a5b97e0624a22cb83548ef548b819ac23750c40295140b6f83a701c73a81fdcaed3ab8e704dbee8e17d22f1d
 DIST websockets-9.1-src.tar.gz 191813 BLAKE2B cb3807f01e1a4c22a40bf5150d1e8b21ca786dc5bc4da8f3e6602971f3f7c79b57092f5ddfe3ee52ec00e7fd15f3a992fdbb94b5e26599f2621a7f51434ba6dd SHA512 ff2907a913ff0b8ced6dda72b6fc6512a2ece3ffded2e2dcb8ff6805de9ad504430cc1871c1f6e02ab8069e7b96b2e7609afaf3c9c25f9271b28e2daa72bd3ac
-EBUILD websockets-10.0.ebuild 862 BLAKE2B defa9b15e0de07aa1608e2e15c3b170ad0b780f62e8bf6ce08dd597e9e1abecfdf22f013e594e47743895788380fbb01b7bd6738ebdff34e84ac992d21967e5c SHA512 a6969e66094d3536946b7427385e8a9e8e8b2faeaf0b0ba900c363542eb42eb97ea3889b636ae804f7315d4970fc21e4f72161bf8fece6995cb65ea53d1d2a55
+EBUILD websockets-10.0.ebuild 859 BLAKE2B 84116c49e71643efca8f5266aa6c3b1a2e4afd4373061217802155225863603343d38d440d1f54b237f9389661e4b6a0d57b7677910854b1b655742d8e8c5077 SHA512 bd6927af4ce3a4d7fa55cccd40242115d00291e718a0b17acec60192b5dccf66946e39d48a4de31734df23fe3090ede393a5fb1729bcfbda01d8bd2c35b5603e
 EBUILD websockets-9.1-r1.ebuild 936 BLAKE2B a1c0c1796d62c5afd1bb4ad63402f5505577ffff9bf8cd0c4c466a03563fcc9773b2f677766761a54a17d4635afd642ee37a1548a198a656d4b02e9458aa5294 SHA512 dbd6b52719b1acfa9ad7990a70d60846b5077e49a5d0f063db2628136e6e83bfd0826e08a43cee560c2ce745c2fcd1e237ba3dddb6431d7256bf66c12b86ac95
 MISC metadata.xml 488 BLAKE2B 06ed81aa4ffa49d1951a8ef639752bc701d798fa531737d4cb367ca198e65178f430d6b1e7f3b24ffcc332343dd58a0cc8ff5f2632a225e6c0f36ee50148aebd SHA512 8335bde47d396c018b32db406e18636edd7f3fe5704c901888d56690ec726aeb7d6f9e42fb7dbb1869c78b494c9cbc17ded3ca78b7576d6fdc0a8097bf996f60
diff --git a/dev-python/websockets/websockets-10.0.ebuild b/dev-python/websockets/websockets-10.0.ebuild
index a03d8206adea..ac82499ce323 100644
--- a/dev-python/websockets/websockets-10.0.ebuild
+++ b/dev-python/websockets/websockets-10.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/whisper/Manifest b/dev-python/whisper/Manifest
index c86dcd2e076f..41213ba5ffbc 100644
--- a/dev-python/whisper/Manifest
+++ b/dev-python/whisper/Manifest
@@ -1,5 +1,3 @@
-DIST whisper-1.1.5.tar.gz 38104 BLAKE2B ab36c91c00dd8e8e26b24c0c2967c661f0bd69f3dcb0e52763f6527a233f656a984c738be720c0b5f2d27fff08daa164db87f0ab693d360bd0c087cf6a408340 SHA512 dee42adf1824c876cf15e9e55101d90d08889fd6e267a89c18fdb4a7d4c5a3a0d4f6f24bb0fdeb974fd194046c17e00f71033ddb72c74c4d4ded0a937e82c8a9
 DIST whisper-1.1.7.tar.gz 38289 BLAKE2B 05c5ed972c6dbe8ecc29731d206a44e4db2605aa1270d0eba63c90390062f3cee81a6076a571e6b18cc54f8b1a0ffbc9800c91e9aa7cf3cab862d7e6bb8217c0 SHA512 2dc4f15a91b518495da120af4ad2af4b5f81d04fae6028ca1d7505046b93082a9294452a703c8de87dc89629c35dca0809c4ee7c0df1a7a6bd5ec527f3126df2
-EBUILD whisper-1.1.5.ebuild 737 BLAKE2B 08b593ea9a48939ab2771096b6fb36146d1ac8fbc275bd531905dd5686688f2583deb1ae0112090bbc0d191c6ba657dab803b6f90667b80d42e0b196632f9e5d SHA512 ff614261d5af75ba659550633cf6a3a31230158810c9eae3846f82ef25965f0ae7fc164a07561329639fe48d11a3ec1e1073160c8c3022f64475959073ab7331
 EBUILD whisper-1.1.7.ebuild 590 BLAKE2B f960bdc65f64aa267d41bd61ef2bb721f0656e3bcb37cc463d8606e59b3a9fbc19bb2c0cd5f10c35a51716bbe9deff3d9daa16c622779f8678ca68eba91a0f6d SHA512 cd7480680c22d7a64c0a80fb9550f0bd3afd1236b9b33790b910eeb635e4bc958ad70aa370a32a2bdd7f6d7d6977add282ddee2b1868019bb67443117a7802a0
 MISC metadata.xml 680 BLAKE2B 070ec3c5c71cea8d95302162acda73a61d7c0fbd195ec4edb8cc34c496be8e89d8254be122dbb2797de2fc5255fcc69a26f308aaf5058088b9df14f06a8e1e95 SHA512 3de2424fa3cf4c2482fc5ce743b37b53cd354424b0c11823918f64be6ab2ff5195794d73a0504a4e119e861d3f5f0f6a0dbb385cf37641e7acbf96812d752702
diff --git a/dev-python/whisper/whisper-1.1.5.ebuild b/dev-python/whisper/whisper-1.1.5.ebuild
deleted file mode 100644
index 458aeab983c1..000000000000
--- a/dev-python/whisper/whisper-1.1.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fixed size round-robin style database"
-HOMEPAGE="https://github.com/graphite-project/whisper"
-# PyPI tarballs don't contain tests
-# https://github.com/graphite-project/whisper/pull/253
-SRC_URI="https://github.com/graphite-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index 71884df1cc4f..685aa491498a 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,6 +1,8 @@
 AUX wrapt-1.12.1-py39.patch 8250 BLAKE2B d3f40b0ef14dc61a12b4e386d1b14b5f5d7f944ea991c7efb70c535b5f77c489feb31f9b162c9aa6fb68236bd0775ceed6c6582247ca0aacbb79255c90b10d57 SHA512 e157e40e720a173762ca227a1daa0acc7fc437f632943c5b5158cb776b32457d592571ff7dadc4f0069b5ace9cb1fd2ebb51807d78d62ca94d8148a4d5be48aa
 DIST wrapt-1.12.1.tar.gz 126750 BLAKE2B 92aba2d400aa626445be68fdda2831132e1c341a2f20065b3d7071a2ebc174cb9de7e6a20a8375360cf7df181881fd20b7b2f70dbfdf533e8823982eeaa722f5 SHA512 33e964cb3aa2437bc7d084a98f622f7c5c8c719d97806796ae0317d35130bdb2679a9dd87be7077e2cae1eb32b65d152349fa7cc138cb392d5999cbfdcecc9ac
 DIST wrapt-1.13.1.tar.gz 130138 BLAKE2B bc9a0238a4e16f36e83a6fd81e94d5a257e27e0d5864dc98ba4036f16c3cd92b971e9eddf8193afd13b5afe82ac4f83d50e66f8bedfcd0068ce53f162f4f7ac5 SHA512 a5d7d9013e975261608563fc86b92dd9d455b9efe5f5a79800d317438317f86d59b5678cd4c053832aad2e35dfc08d75b16ed456564cfcbb6541a12a1741352f
+DIST wrapt-1.13.2.tar.gz 130624 BLAKE2B 7ad74653208042326630ae4464494fcdd5299b35a42d495a16a3cbd68bb60fe5ea17f3e95eac85d98142fe339a593a8cda7e3182ce2a6e96f6ba2bb204a1fc46 SHA512 14648465745af7972ffd449783a24a4b5bf8187cbee517d3427825409bd5d073e3153a0c61f5583b84fc6ca2c48479ebf112977ce340369019a617559d09dfc0
 EBUILD wrapt-1.12.1.ebuild 765 BLAKE2B 54e2d2d3ce53c7c234f48b305bcfd1c0b1c2a4ea00697816871580dc5347f428af4729ba5f7c280e31420ea88221a640430b8e98472ebf2ab85da2ed882e6253 SHA512 0ec5d5a96394877bc7a29b7feedf13a203d7d0c8282d3f452c70a9026234f6888187756232a98e94bb90c459c2d9c90de9000722bb692fa70e826bea8518d640
 EBUILD wrapt-1.13.1.ebuild 700 BLAKE2B 57f46f61c3f869b7e7cbb83447db0e9903079019f44ebf34144720584703843a43b9c5fb9f244e5b604daad6673ff9d3a405f7814eb51a1b30fbe4f71d394efb SHA512 aaed5b5ba473d52598f08c83744da901f98220058c7312943190b5792690e93e4fba44abc1543fc906df0dc6c7ffd7354364338c6740f2f09b979d00a178fd65
+EBUILD wrapt-1.13.2.ebuild 700 BLAKE2B 57f46f61c3f869b7e7cbb83447db0e9903079019f44ebf34144720584703843a43b9c5fb9f244e5b604daad6673ff9d3a405f7814eb51a1b30fbe4f71d394efb SHA512 aaed5b5ba473d52598f08c83744da901f98220058c7312943190b5792690e93e4fba44abc1543fc906df0dc6c7ffd7354364338c6740f2f09b979d00a178fd65
 MISC metadata.xml 370 BLAKE2B 251d8c90cd2a0a1b9fbc714b624c7113e9791f268130211160655f4e4e32aadaddaf98a95bb6d9fff5a5df128da9d551b1281a28e4bd7fa6e3c9db7d35b10829 SHA512 31b369317f4a44d593d9fb72bcb9fcb792809323862866da7c3464ca2282e29a65cd353909c05782b85b162cff363b0ad8ea4750d89c942d442034b9a6eb7dba
diff --git a/dev-python/wrapt/wrapt-1.13.2.ebuild b/dev-python/wrapt/wrapt-1.13.2.ebuild
new file mode 100644
index 000000000000..01eb043f35e0
--- /dev/null
+++ b/dev-python/wrapt/wrapt-1.13.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Module for decorators, wrappers and monkey patching"
+HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+python_compile() {
+	local WRAPT_EXTENSIONS=true
+
+	distutils-r1_python_compile
+}
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index 260c0536128e..a3cfce0683c5 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,5 +1,3 @@
-DIST wsproto-0.15.0.tar.gz 51765 BLAKE2B 6eae2d2ceeb2d1e870c1ca70db22708fc2e5d10aac6b1d1a44ab00f4b31e18f21fd324c7e8c95e28769f4642601b775dc687eb28b419c5698ed68e617d054599 SHA512 c9666ec65374181da762f460f0c394a5bb599f8a0666989fb2d53e5e8822f5ebdd28eae3098e115d5bbacf6d6e1dd33a9cfeb808d569e1a01025eefaff18c531
 DIST wsproto-1.0.0.tar.gz 53423 BLAKE2B b4cc8c1ef0ccf324821b893b57fc86ab744c639dd07604618485004ef56ca105b5515e1f34a08ccc93de941b1a93eb76ef0d1946f11e05f80d40b98bfe7e4c56 SHA512 36f8c4eebf84bfe869f7124330898d22416b423f47396f2e3f72069e14f1763514e1df700c3e8ee81467cf973197e10143e088978d0688930fa98518af8773fb
-EBUILD wsproto-0.15.0.ebuild 507 BLAKE2B a010d403ef7e818dc7577d45898ed3ccba0879182f935c1cab9f55549ad9721413c7828f769562bb0f52dbe5c74a6822980b3b5d329acf5e9859f8046f75d6f3 SHA512 5b57c2fe1a79e68e245e58415071cc73cad18a8124b72d58af71307d3633d7aa1fc90f7f0e0eb6076fc97307ee2b5e4f5e0c3a1b36d5b0a7d56fe5f5d8c871d9
 EBUILD wsproto-1.0.0.ebuild 532 BLAKE2B b39eff2ad82384e1880240f7cd489d6700a4c8c0ff1abfc1a13af7da4e22e86d76a93af17b09015177b055ab98796bfdee6b7da37249670d19b4e49c2fa494ed SHA512 80d128d5cda2c6a5f4586191528852f077e41162b2a5977145099606d40f58e05b849bd2b2fb41381e21f5709e87fe638080feacf6e518659126af0058f3bbf1
 MISC metadata.xml 494 BLAKE2B 144d8a2efbedf70327d0f862e9e1b9d70d8ec72939cea4239e877f183485c9d4075cbadb9423f74b08e8c0ae806b8786467363ff0aae0845be227059e33304ba SHA512 c5818f8c26a0aa8b88b54259ed81c570bee27ca44a20a2f487109477608724f857a306c2b9b82a2a8a03d5852edbfe4ec27f81b60ccf743e58dade14ab992da0
diff --git a/dev-python/wsproto/wsproto-0.15.0.ebuild b/dev-python/wsproto/wsproto-0.15.0.ebuild
deleted file mode 100644
index e7dbbeb8b3a3..000000000000
--- a/dev-python/wsproto/wsproto-0.15.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSockets state-machine based protocol implementation"
-HOMEPAGE="https://github.com/python-hyper/wsproto https://pypi.python.org/pypi/wsproto"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/h11-0.8[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index 11055c43d5d4..3494e5ccaee6 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1,8 +1,3 @@
-AUX xdoctest-0.15.8-pytest-flaky.patch 1126 BLAKE2B a96a688165b8781ce189f8963df89e6ee61b6f53508c78de0b95ab8c519ab5d618a835a78c21abe23d79d34cdd9c7b677430ff3bacb05d26c439afbaf886288d SHA512 20749730d000d50a80c660e536be465463d08162788c470f51721fd793e9cee9eb0138e1c82979dbed67976aec6041adc55c33f8d518ec9cd9eff2652ad8f56c
 DIST xdoctest-0.15.10.gh.tar.gz 191579 BLAKE2B 4836b773c3cf664c825433199b13ab7d3fe2c68538517bf5594797ad3f2f894d0132034fdafbc4502a00ec7393c19473fafe15fcf0257e3565592dc9907e3d71 SHA512 18c1a2774ae9331582610e3459a02f4e4de838218e7250af071570b2318f4c14330084b9fb903d88651fc40a4ba12b686ee6f2ca165edd8155e908ae4992a840
-DIST xdoctest-0.15.8.gh.tar.gz 185463 BLAKE2B a16578e6d50398ac80d950bcc9a05131880816e2ff3a15bd1489474e532f9b495d099dcea204d8375c884c6957aaaba9b276fbcb65b5717b2850314453f787f7 SHA512 ab4f991ba6e312bf6cf675c3bbeeae87c0666b96c911ee7727f64b8e4c13420bb91e0a7a955ebce73b3fb15625b52bbf1b67c6edfe91234655501060b17723d5
-DIST xdoctest-0.15.9.gh.tar.gz 190313 BLAKE2B 9980752ad5742a7c4a73418a3ace408c38a6bef6cd43ee5cd1893d6cb195a7c387c5062735b2c903725898ea670e3e6d8e683d4341dcf2dc9e17a2c723107910 SHA512 6a49fbe7f2535ab86ac7047406fbcc9f7e98c964664a95a115c3d945ba8157e4e70ab8c31edae6faee932cfd5e90201d883d9b4b10e2cea9cdc8ff14b5d52d54
 EBUILD xdoctest-0.15.10.ebuild 765 BLAKE2B 76106ed120b3af56642290aa67371e3390daee4881b9d64f4b376a365a3723c57981327108b8e37bf80a2b875ae2981e2f5c4e531e581c9952c000d141fa7aa6 SHA512 226ade6502c30804020c18ac7707105cf0aeee16a0e08382d4dcafaf8590da738880f7e391edf64ea1ed8da7b6affdd1c6c280fad26c978bee0d4d9d97b65805
-EBUILD xdoctest-0.15.8.ebuild 816 BLAKE2B 12f0e5958db5867207f0d971788601d0e8354fb29e5f4e1b908fd55ada84c0946d61e94152a99b5832453c580e1898e36af677da0eecb72a2cccc98c37cc7931 SHA512 651a24d1ebcbd6168ae4f50c7e5283f654c048a8106b40a416e24d7c9863d600e181f69eb97f2db91122bee99c0ed1b65aa4190820f5a0a9cb772f17afea936e
-EBUILD xdoctest-0.15.9.ebuild 764 BLAKE2B ba6b768d79fc4a40ce81421c6dfa93900a96e924ed2326a67c281cd49bb5f9cbc82b5f80298ffda49d58dac76748ffa27d21af0cf65e32567467386a4b282da7 SHA512 a0e7c30ca728b68c79e1fec5cbd5079365a369ea44a087e1602e419cb045de5b800b254af017e15d859f104f9b35b468cad6ef8381df40f28fca72653c0fb586
 MISC metadata.xml 426 BLAKE2B c5bbac93c627fdf15490b4867f0bd1e4d1fde469552cb8c7140c83e13130a4190f0dbfb3b67608ae454683630b937e3e8dc38ddf37b344aabff20ac4dc04e9d8 SHA512 0cb726bc6ef7d28b3ab744da3e3e770287826c8d4b1ef87fa404d9aa4b8d1e8fa3c8a2191cf2679bbc16335fbd50e5d887a1759c2866ac9b1cc48c2189b16637
diff --git a/dev-python/xdoctest/files/xdoctest-0.15.8-pytest-flaky.patch b/dev-python/xdoctest/files/xdoctest-0.15.8-pytest-flaky.patch
deleted file mode 100644
index 193b3f51bbac..000000000000
--- a/dev-python/xdoctest/files/xdoctest-0.15.8-pytest-flaky.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ec14218904fdd1c06597277deb11c8d3bb33c675 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 3 Sep 2021 07:27:22 +0200
-Subject: [PATCH] Fix test failure if pytest's flaky plugin is installed
-
-Disable pytest's flaky plugin in test_simple_pytest_import_error_cli
-in order to fix a test failure due to it mangling pytest's return code
-on import error.
----
- testing/test_pytest_cli.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testing/test_pytest_cli.py b/testing/test_pytest_cli.py
-index 25c8363..8ef9251 100644
---- a/testing/test_pytest_cli.py
-+++ b/testing/test_pytest_cli.py
-@@ -67,7 +67,7 @@ def test_simple_pytest_import_error_cli():
-             """
-         ''')
-     temp_module = util_misc.TempModule(module_text, modname='imperr_test_mod')
--    command = sys.executable + ' -m pytest -v -s --xdoctest-verbose=3 --xdoctest ' + temp_module.dpath
-+    command = sys.executable + ' -m pytest -p no:flaky -v -s --xdoctest-verbose=3 --xdoctest ' + temp_module.dpath
-     print(command)
-     info = cmd(command)
-     print(info['out'])
--- 
-2.33.0
-
diff --git a/dev-python/xdoctest/xdoctest-0.15.8.ebuild b/dev-python/xdoctest/xdoctest-0.15.8.ebuild
deleted file mode 100644
index 2fca586c7c28..000000000000
--- a/dev-python/xdoctest/xdoctest-0.15.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A rewrite of Python's builtin doctest module but without all the weirdness"
-HOMEPAGE="https://github.com/Erotemic/xdoctest/"
-SRC_URI="
-	https://github.com/Erotemic/xdoctest/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-# dev-python/nbformat-5.1.{0..2} did not install package data
-BDEPEND="
-	test? (
-		>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-#distutils_enable_sphinx docs/source \
-#	dev-python/autoapi \
-#	dev-python/sphinx_rtd_theme
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pytest-flaky.patch
-)
diff --git a/dev-python/xdoctest/xdoctest-0.15.9.ebuild b/dev-python/xdoctest/xdoctest-0.15.9.ebuild
deleted file mode 100644
index 3f8b3416a702..000000000000
--- a/dev-python/xdoctest/xdoctest-0.15.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A rewrite of Python's builtin doctest module but without all the weirdness"
-HOMEPAGE="https://github.com/Erotemic/xdoctest/"
-SRC_URI="
-	https://github.com/Erotemic/xdoctest/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-# dev-python/nbformat-5.1.{0..2} did not install package data
-BDEPEND="
-	test? (
-		>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-#distutils_enable_sphinx docs/source \
-#	dev-python/autoapi \
-#	dev-python/sphinx_rtd_theme
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 43af1a506263..26fe4709030d 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,7 +1,5 @@
-DIST xmlschema-1.7.0.tar.gz 370433 BLAKE2B 0270151705ca65d4b0f587e2ac75f7273a20242a0a315b4b954a6ccad6d46d7d093330a4c40d74a44c0c55af021da1c4ddde85f8431e0779d30e2164a599a335 SHA512 c4620f205cbdccef95a38eab6e6a5d6082681e3ff71708376f0ddeecd75a5c53f686fd740a41e98afd2ec5ec0f14be913b6c65bce80fab0143fa5fe1cc8a2ab6
 DIST xmlschema-1.7.1.tar.gz 372165 BLAKE2B a534c42d5405eefdfd0c595f1ea02a703c8f5a225f9a46ea4fe9885d09de4b87bc5ddb470fabaf3e01093012346247d34fd56495641815fe04f4fa1919f9f53f SHA512 4ad8ef9d91aa2e0b06d64aa06cc380898976c8c1b4efe049b67948b4534bb8edc3a3450cf5e242a004a039e8e29b23954138a0192ac6355fdeecb77e6284c3d9
 DIST xmlschema-1.8.0.tar.gz 379305 BLAKE2B dcc3fc5860dede681912f578b548bfe39feb5fda3dd7c5f0ed7f85fce247489d492b062b789acce6679cab835b31c1f77eb82ae43b83c5af5b749a4e93c991d1 SHA512 b4622030e959383729074554e80606dce6e731b9c4e3393c60a02d592acf66f07e50f12d65867fad31e18494e04a8bb1bdadcf22f110d91708e8a0fa89848e2e
-EBUILD xmlschema-1.7.0.ebuild 785 BLAKE2B 7aa3e9128a4b1d03602515a04dffc8d9e8e83c9a32733668bf4c42c921b23ec4bc8dc97e8ffb10e3377b79319e0929945ae8b5d3536ffa92da558413d8c319bf SHA512 2381069dbc8c3ff7c9a7a1c1ca50e1ead544ee8a81eb9bdff9869da3021420da50cb2cca72266142ee4f7a629f7090fd05e2347aa570dedaa08f302cb5cae796
-EBUILD xmlschema-1.7.1.ebuild 793 BLAKE2B a30244fe7c4063b7573351a7190ab44124f5eeb96cd8dbf3fc56e408f84a0b601db1e0dc7cbcdd6f221f48c0937a84643e8482cc893490f834bb0a01c90c6c90 SHA512 52417d911c4f7a3738422db216e0c0f28901a26595512ac47e300ef7f3396619808535b94db4679c069c8bdb9c3f06ba30157952291b0984b67405161a46ff29
+EBUILD xmlschema-1.7.1.ebuild 785 BLAKE2B 7aa3e9128a4b1d03602515a04dffc8d9e8e83c9a32733668bf4c42c921b23ec4bc8dc97e8ffb10e3377b79319e0929945ae8b5d3536ffa92da558413d8c319bf SHA512 2381069dbc8c3ff7c9a7a1c1ca50e1ead544ee8a81eb9bdff9869da3021420da50cb2cca72266142ee4f7a629f7090fd05e2347aa570dedaa08f302cb5cae796
 EBUILD xmlschema-1.8.0.ebuild 793 BLAKE2B a30244fe7c4063b7573351a7190ab44124f5eeb96cd8dbf3fc56e408f84a0b601db1e0dc7cbcdd6f221f48c0937a84643e8482cc893490f834bb0a01c90c6c90 SHA512 52417d911c4f7a3738422db216e0c0f28901a26595512ac47e300ef7f3396619808535b94db4679c069c8bdb9c3f06ba30157952291b0984b67405161a46ff29
 MISC metadata.xml 376 BLAKE2B 6aa6c0ef38b17f49452a3db71c7f449dfda8951e2196b904235592921620b6a2064021aae7a1a30639e637c3b9bdb46bcaebec1903a081a41832bd0c5199dde9 SHA512 b814209cd4b87ad5cb8bc447f1d485043d8386339607f39575faf2d26c19b69befa9fd7b7eb2d3fca4b5e60499091a59c1466cfc2f0d9651430949893e2edaeb
diff --git a/dev-python/xmlschema/xmlschema-1.7.0.ebuild b/dev-python/xmlschema/xmlschema-1.7.0.ebuild
deleted file mode 100644
index 8b02ffde71f2..000000000000
--- a/dev-python/xmlschema/xmlschema-1.7.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.7.1.ebuild b/dev-python/xmlschema/xmlschema-1.7.1.ebuild
index 19b2c2736c27..8b02ffde71f2 100644
--- a/dev-python/xmlschema/xmlschema-1.7.1.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index c09f5e0ca6a7..0831d466f70e 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -3,9 +3,11 @@ DIST python-zeroconf-0.36.4.gh.tar.gz 128860 BLAKE2B ee6d02b583933404b6a1945235c
 DIST python-zeroconf-0.36.5.gh.tar.gz 129395 BLAKE2B 3e62da5f38bd0648ed300c2ecea712121cc3b8707871cf3de325cce0348b5972e538e70d74acfccb8540fa8253db992670902c13ac4b81928a47df4fa27d248e SHA512 ef51541da2c8d6703644750572d55093230ccf776b1a5bd67e0a6fa0f5f9762056b4cd7124e88efbee27ca768bbdf3e54fd051432d252f45376b7354bab4c50d
 DIST python-zeroconf-0.36.6.gh.tar.gz 129469 BLAKE2B f52348d8fb5a2ed865bc946ad52ea0df474fd59ca5735411381366f08b2a5e1b673916256871128cc9f3a7fef1e72e2ea35fc113e5e41fe63f67659b3cc8f0ba SHA512 fe8d9026e9a19d267c7e734df51253bf69d5ca38b79b00b752886d59288073e8a4b9de40bbd2324064a574f40bec147c8b44d4f3395e480794600c440f2d7c9c
 DIST python-zeroconf-0.36.7.gh.tar.gz 129775 BLAKE2B 9b8ea59e2e62de4476c6b014b925b000b3c47cd9f965a23dd1c6a15b3a4f1ac7a4473eb6b9953d8893a445ffefcd1167c1e32b87b210ed3777fb046b3bd584f4 SHA512 c589c58c92d649c42f9a752d080c2b36a1fcc0c892ab6868cc79a3727087dd95f3e7b779ffd8b040d649453b8c70de4214d76d0f6c16c46a67628545c2472a54
+DIST python-zeroconf-0.36.8.gh.tar.gz 129890 BLAKE2B dafd1a660e611afcac0367b6f4618dd488161d30337fa1d8bd7f43af06446785e86125ae50781b341549fb9b1c70070e6b86ba271a98e5544f5d0e3287640e00 SHA512 928a78a59a5e23182c5f0af8cc8bda477b8225ffaf50e25bdd746ce7b40f7e215e5f23d7a4a282f802c9a4b7b53cbc60c38f547f382b8eff5eb14d1a21f108c1
 EBUILD zeroconf-0.35.1.ebuild 1163 BLAKE2B 128ee4afa146f073b96fa6b4fa6e961319cc38997f0bada936b05d325c175ecc2063cca7e247a40292c41be35b22a7ff4f69813694655c96c8a3f35e8b065a89 SHA512 cff5c5f655f74230da9a2ab05d0cb2e767e78627ffd65e1f310f2aef54319f9216cfbb5d0fcb12707255a24b1e6c05272ce35e3771b1dd6c986f083fd16101fd
 EBUILD zeroconf-0.36.4.ebuild 1101 BLAKE2B 623d7b2b618f89bc9c1b503245f0a5e000fdf8410457abeb50415c70aba1880141bc0d00bbfcb952b0934bbab37ba5bbde5db31709f36c18c9301dbf7b46032d SHA512 c060542566c6e77ab8b020da607300bf61ce39899b013e94a738c02e9d333fec7423d53796904998a2dafd1417ebe0136c238b34ee40c98881209ef01f6baf69
 EBUILD zeroconf-0.36.5.ebuild 1101 BLAKE2B 623d7b2b618f89bc9c1b503245f0a5e000fdf8410457abeb50415c70aba1880141bc0d00bbfcb952b0934bbab37ba5bbde5db31709f36c18c9301dbf7b46032d SHA512 c060542566c6e77ab8b020da607300bf61ce39899b013e94a738c02e9d333fec7423d53796904998a2dafd1417ebe0136c238b34ee40c98881209ef01f6baf69
 EBUILD zeroconf-0.36.6.ebuild 1101 BLAKE2B 623d7b2b618f89bc9c1b503245f0a5e000fdf8410457abeb50415c70aba1880141bc0d00bbfcb952b0934bbab37ba5bbde5db31709f36c18c9301dbf7b46032d SHA512 c060542566c6e77ab8b020da607300bf61ce39899b013e94a738c02e9d333fec7423d53796904998a2dafd1417ebe0136c238b34ee40c98881209ef01f6baf69
 EBUILD zeroconf-0.36.7.ebuild 1101 BLAKE2B 623d7b2b618f89bc9c1b503245f0a5e000fdf8410457abeb50415c70aba1880141bc0d00bbfcb952b0934bbab37ba5bbde5db31709f36c18c9301dbf7b46032d SHA512 c060542566c6e77ab8b020da607300bf61ce39899b013e94a738c02e9d333fec7423d53796904998a2dafd1417ebe0136c238b34ee40c98881209ef01f6baf69
+EBUILD zeroconf-0.36.8.ebuild 1101 BLAKE2B 623d7b2b618f89bc9c1b503245f0a5e000fdf8410457abeb50415c70aba1880141bc0d00bbfcb952b0934bbab37ba5bbde5db31709f36c18c9301dbf7b46032d SHA512 c060542566c6e77ab8b020da607300bf61ce39899b013e94a738c02e9d333fec7423d53796904998a2dafd1417ebe0136c238b34ee40c98881209ef01f6baf69
 MISC metadata.xml 413 BLAKE2B f93eceda07029400d2fd7ab38f234e5a1747e3d86f228adc973bbd6cdc71456778a7d926457f976cb2c6f55678b2c671d2415e5c7a480306582f1e70f6f733dc SHA512 d228e198b2f495dd02cd3d9d948aae123461c70c8e0185a47b133000f0316a84ff33d9b6f4cc0196bca5cf638e53ae58a3cd746338c33729d957a1170a5f08dd
diff --git a/dev-python/zeroconf/zeroconf-0.36.8.ebuild b/dev-python/zeroconf/zeroconf-0.36.8.ebuild
new file mode 100644
index 000000000000..b416d399c1d2
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.36.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# network
+	tests/test_core.py::Framework::test_close_multiple_times
+	tests/test_core.py::Framework::test_launch_and_close
+	tests/test_core.py::Framework::test_launch_and_close_context_manager
+	tests/test_core.py::Framework::test_launch_and_close_v4_v6
+	tests/test_core.py::Framework::test_launch_and_close_v6_only
+	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+)
diff --git a/dev-python/zope-configuration/Manifest b/dev-python/zope-configuration/Manifest
index 479e5cc8e6b2..6328fb01047c 100644
--- a/dev-python/zope-configuration/Manifest
+++ b/dev-python/zope-configuration/Manifest
@@ -1,4 +1,3 @@
 DIST zope.configuration-4.4.0.tar.gz 83230 BLAKE2B c33dd8cc8192965e3555f8063dbd55b47376696964248583c7479098d00339ec0a7caec8c11e66b9ce133880ba6c04dc8b790f03e18864dc361d3b5d5ed0ddfe SHA512 6383c8e19ddbde098a545b6f22b21eadc860980e8248d05c2e29832971c2060fcde6f5092425d12198e97851f0b7b5edb0b83cc6725cda433867762778c896f9
-EBUILD zope-configuration-4.4.0-r1.ebuild 1014 BLAKE2B 9c792c098ed2b414042e796dfa524c9efd1d44e2d49d0150e9442622a613f28671cad3575f19a5433bf893f7f0f97a0f974295dd92edf6458d051ea6d3e2cdbc SHA512 43e69c9e3c40596321b6c28502b42408455128ee7ff74070db0a135ba99c6c136ddf3ff7708ce45f7cac342d89d8dc90bd1228badf7f76382fe0e2cd61a9bd4b
-EBUILD zope-configuration-4.4.0.ebuild 871 BLAKE2B ecd10d860abe3acf81185c337bad36e5bf9130c5ceedcdc392196b18267e1f07844b77054c9c3ecae25d2c0d85976e3a829716fb75a9a223c7c26f123d27a54d SHA512 aecaf445c6b422184641d4aba881000c7d986b4a8a15ef7447caa560ffa04d3d9921d01a77be2bc56b5237e73674ad093187f97737813059dfaa6027644d3e44
+EBUILD zope-configuration-4.4.0-r1.ebuild 1033 BLAKE2B 385893224aec02124785868bbdc51550c1613734b183ee14b44fceedb79b6887c6f6eba4e70b878a01014b73359d930a1d49c96193f918d49a8b0b062436c3d0 SHA512 a911da6108b4c4d30fa24437d968bd37cdf20506247071407a16892a4ddaf4546f6fdec2f66eef817f3786f6b0b1b7e37f572b869981c0258faa52896b3f3493
 MISC metadata.xml 671 BLAKE2B ebe65df9424a7f5e93a1095224dcbed784cdcef2f463dd9ee6e9580883ff93ea11e72463a897d5a1756c7f5c4f6c9fff562ba5d30dd8de8913aec58547ce3280 SHA512 e72a1d422e9c322fd92bd53f4bd8a5d9f0e5505fdb18dec30b9605d8ef5b943c1893f0fa78398fb8610fd7f3b9bcee5a602a3ce1cef8821239cd9681a340dbeb
diff --git a/dev-python/zope-configuration/zope-configuration-4.4.0-r1.ebuild b/dev-python/zope-configuration/zope-configuration-4.4.0-r1.ebuild
index 843acb2a6151..5657afef002d 100644
--- a/dev-python/zope-configuration/zope-configuration-4.4.0-r1.ebuild
+++ b/dev-python/zope-configuration/zope-configuration-4.4.0-r1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-configuration/zope-configuration-4.4.0.ebuild b/dev-python/zope-configuration/zope-configuration-4.4.0.ebuild
deleted file mode 100644
index b3fee42f6d04..000000000000
--- a/dev-python/zope-configuration/zope-configuration-4.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_PN=zope.configuration
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope Configuration Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.configuration
-	https://docs.zope.org/zope.configuration/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	>=dev-python/zope-schema-4.9[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-schema/Manifest b/dev-python/zope-schema/Manifest
index 9bb1ea44f4ac..bd861d97bccc 100644
--- a/dev-python/zope-schema/Manifest
+++ b/dev-python/zope-schema/Manifest
@@ -1,3 +1,5 @@
-DIST zope.schema-6.1.0.tar.gz 103042 BLAKE2B 1892e5724b6f947cda40567f0694821d49ee66239af51d13d331dbb55b8251352670a7b37ff77ad6b36da7c18a8614338364e43f1fcf92464121d6b5daf65985 SHA512 a832bc779195dc3f1ce812610adc97205a4074c9523d70ee4019e03285f7d94df24f165a834e65cf26b06fc48754b76189299e58af5d4888a4abb15dc0d64ec0
-EBUILD zope-schema-6.1.0.ebuild 983 BLAKE2B 9684366f58049c978f5635cb1b3315eed86ed6271132b1bddfac157c550916a28c83098b8b8432ce97c80ae6ef59941d28ef8d125ccf9ebacaac5c9631f19077 SHA512 d035f6e1599d78ce0a125432f5e5a30597434415caf6c818bd740b7b5c63e2d64c2ca455308022a9a3cf7426dd23c3abfb4aba51ee0fb76883ed875e1db6939e
+DIST zope.schema-6.1.1.tar.gz 108603 BLAKE2B 9e2d4c48431408fd66c236fad44627f15443e29ff0c4af0a0734c3a1a9dfaee6c772463a7a121112b151699c184d39e307485a981ddb3e13f2f81c7c71543500 SHA512 af51f02818509eacdd558ee04c15bcf4e80321069b8c4a33636d520a8af7509e8d01b391fc1d327fc980ac27388f4e303a870afc5c4f9b5ff0770311a4f26978
+DIST zope.schema-6.2.0.tar.gz 104068 BLAKE2B 10d300b925f57a028b40bbcdfd7b0eb330815b63c86d6ded60fb594d549b1459cb67a99bd19e6d1782104a8bab204d8033ce422b5f9ebddb00e2fdfc1ab7d529 SHA512 f3083e4fc1dc54160c38cf7033519f9f37fef3e39f2f15b53fc4475d0989932448a018d77f8562870f4df85c5bf35bc756aec97868cd35ca07b733cf5796f00f
+EBUILD zope-schema-6.1.1.ebuild 983 BLAKE2B 4fc9c55a7c6fbf14c6abdf26a5e265be26a4fd4cd9ae3ccab76bf3efc0b18938140051a25ea804fd2b17a737153d78fbd4c1dd13b325389117226ae4f1f8df44 SHA512 d1d85052e09a1b8529175eaaedc3a445f089f494a10cd28de69f2d73fb795de0a2fc46a336ef286c772a03904aa67d38136d5701c762d67b502e784fca270fc0
+EBUILD zope-schema-6.2.0.ebuild 983 BLAKE2B 4fc9c55a7c6fbf14c6abdf26a5e265be26a4fd4cd9ae3ccab76bf3efc0b18938140051a25ea804fd2b17a737153d78fbd4c1dd13b325389117226ae4f1f8df44 SHA512 d1d85052e09a1b8529175eaaedc3a445f089f494a10cd28de69f2d73fb795de0a2fc46a336ef286c772a03904aa67d38136d5701c762d67b502e784fca270fc0
 MISC metadata.xml 498 BLAKE2B d5386b7a400de71c5c02d2b9788682d35dd34eaa6a132aea45432aa2d53ec47e54fee9f880cf6cc5abd8184e28cef0795fe2f58dfd47f619b4120ce914bd7c45 SHA512 5a8021ec0348af5929d3284f172f5b5fb26007df9064f5571a0cdb07c1259c24b9b352eb048811f5e4f68ab75b9fabeba49c93a0cdd6e8655b509a248447b794
diff --git a/dev-python/zope-schema/zope-schema-6.1.0.ebuild b/dev-python/zope-schema/zope-schema-6.1.0.ebuild
deleted file mode 100644
index 26909a7d20b4..000000000000
--- a/dev-python/zope-schema/zope-schema-6.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope schema Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.schema http://docs.zope.org/zope.schema/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest src
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-schema/zope-schema-6.1.1.ebuild b/dev-python/zope-schema/zope-schema-6.1.1.ebuild
new file mode 100644
index 000000000000..4f5e20c9cfe1
--- /dev/null
+++ b/dev-python/zope-schema/zope-schema-6.1.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope schema Architecture"
+HOMEPAGE="https://github.com/zopefoundation/zope.schema http://docs.zope.org/zope.schema/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest src
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-schema/zope-schema-6.2.0.ebuild b/dev-python/zope-schema/zope-schema-6.2.0.ebuild
new file mode 100644
index 000000000000..4f5e20c9cfe1
--- /dev/null
+++ b/dev-python/zope-schema/zope-schema-6.2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope schema Architecture"
+HOMEPAGE="https://github.com/zopefoundation/zope.schema http://docs.zope.org/zope.schema/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest src
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zope-testrunner/Manifest b/dev-python/zope-testrunner/Manifest
index 299bf6378969..6b4976f0b868 100644
--- a/dev-python/zope-testrunner/Manifest
+++ b/dev-python/zope-testrunner/Manifest
@@ -1,6 +1,4 @@
 AUX zope-testrunner-5.3.0-fix-test-py3.10.patch 3160 BLAKE2B 6ed60d4ec2e34fb36dacb81cc1b55d37e71546ac8b4f9ba9d1bff53f207a90699c4a3782952155ebccb233a22ef4f47fd0d2feab3b9d4fdf33aa88fefd9d6c01 SHA512 e47a8da060bbd402fdbaa0a5ff5c5682404702f10f7a17953a6fa12e350bd4413c22df926c05f9f16b640e08de58777e362c58ff775b7bd3811cf7885574f937
-DIST zope.testrunner-5.2.tar.gz 141836 BLAKE2B 4a29a2377ece929658afbcf279f51cee445db46432d3ff15be43cb4c1d58b4b809b9077905aeeb5c970cda98bd867258091afe58b525a1716faa2c83e6502ea8 SHA512 8b5bb942f3ca42b6fa4de7db5b7149562aa1047128bbd3498a385f8537335cb0cab1a10934faedcd0a1492a14d57accdeefcb95a57d827ad80fff4e20ffd26ef
 DIST zope.testrunner-5.3.0.tar.gz 141406 BLAKE2B f3434e9f22514fffe912385f61d163e42ba1dcd9e9d3f2b3f1d504b608c73804fa38b14a5ed1bf288b75b98ef106024a27de925c404ad67be6acc6c1d6c8f06d SHA512 6fd9375c7b58847868aaf04e85722fcc2b1fe7a8e4ae2ec9103dcb091e6f837d649557ba014146876f814345240b20863bf1584f32212b0b1b28c38ed343b87a
-EBUILD zope-testrunner-5.2.ebuild 979 BLAKE2B d276c1fe01844f1c157def257119706ed0b241171f62b53deea2e70569f2d62fcdf6d754d274610a78c55020c670ca1797a61bc3b2ca3769aabf47abbb636c14 SHA512 89c2233d5caa6b8adf7eb5d4b909e554bc7d57e10051e53e18e97d3759cc5570423ec98fb6e6e381e1a6839fe45dc71799da443df4c01f73d22454ef9b211493
 EBUILD zope-testrunner-5.3.0.ebuild 1039 BLAKE2B 105bfed4a0ddd0a7c43f21cea8d06516e2c6c7f270605bbcd8e7c3b04bd4e63b1778ae6f180e6ca3cbd188b4c03d2c94d77795f02bd2537835e8944e3aa94028 SHA512 5a436976e50600d2aa77aa11e12b11aa9ebe55e42c69defc17b29525533cafc4009411fcf25f34483b8c6e59f2d48f2a07bd94d42f2e157c6be5a4667fe27494
 MISC metadata.xml 413 BLAKE2B 3dcd5d3fed00c5fb5fd4f5ba446e74063668602cd698ad00cc9c467e52c0b311d43f10e9463116c8eff4f964e05597ef4123745c4164d4e3e9897cb97cb2dedf SHA512 748ea71915a0646b880d21fc47f7edfee91712b18b0b7e75c8c61d01616da498eca7eea0ce83948e8cbd320c8351d2d2e08740acc56e053062e49527da849fdd
diff --git a/dev-python/zope-testrunner/zope-testrunner-5.2.ebuild b/dev-python/zope-testrunner/zope-testrunner-5.2.ebuild
deleted file mode 100644
index 552eea89e8c4..000000000000
--- a/dev-python/zope-testrunner/zope-testrunner-5.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope testrunner script"
-HOMEPAGE="https://pypi.org/project/zope.testrunner/ https://github.com/zopefoundation/zope.testrunner"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-BDEPEND="test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/zope-exceptions[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index 62bf8c986fa4..4f2371989cc6 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,3 +1,5 @@
 DIST zstandard-0.15.2.tar.gz 1012864 BLAKE2B 3239a7003d8869182becbaf952b43da8923518e4b5202b115d59fc1492d26bf9703c1ea2dcf525459da023470c134c70525bd040a2d728d24861f7bc1e3a8948 SHA512 0102f3522145c80ec096e9dfac34a5bdd2a98b43b50b8c1e99bcfb0057904c551ababeeb82ced5f8b65945d42b39479cbc29472058679af1f8f91b68ae79f70f
+DIST zstandard-0.16.0.tar.gz 563633 BLAKE2B 8d896dcbd8ef9f9b28825d35792d02c3c447fa82ccef067deb925394c21da8f19a7faa4fbe84700fe5a0871af6d33d218c6134829d08eed93fd5ef43c3d0058c SHA512 f528cace58c1f1ec0fbea96e1646d92b05077ab6f5919eec07dc7b4fcfadf97dc848238928276fdb4333fb2cd035509af472ee352608661c3de681bc8dbed318
 EBUILD zstandard-0.15.2-r1.ebuild 1178 BLAKE2B 5a574795e1bbea6c546e9cd3a19a0b902667eeb246672f4ab21f26fe4bda43df3ac953b3e1445dd7dffc6bee4c67f711d075d26417cbcbc76d55779f5f635246 SHA512 0ea43c62a4a05b0ad7251fb9db8b96af430ba77e65992ebe1efcc252036fddc767812fa58c0af154f5c8c39bd7f60ca7fb9572cd0c980136a5944eb8fa6498ff
+EBUILD zstandard-0.16.0.ebuild 1183 BLAKE2B ee1624687485eca3015cb400e7896de487ee65813f61dca6568274e7ae0d80be11e0dbe063a78c0399b155d5a6bcaa063489564d69ff13f475bd35b0fc011b18 SHA512 faabaac641748594e1c79ec7aaa9755660fabf4bb43288bf27f6ba935c27ed4b8499a1def29b5549ce67e2849e1a85f53490c616990acf0a45b869858a926731
 MISC metadata.xml 378 BLAKE2B dd5834c84bb375812b3a3cfcc00d29aa43ac8954b044e188e8f38bdca93fdf1ce98fe78b78dbeccd935c83ca10f3ce18f893e5720dd8991118b6c69149a4ac61 SHA512 06554d973b525d53c680c3e43041f33125dad222339e645294fbc22670a7eadb0e9bf8a3b0771d2b2fb8f136d958eadb32c295179d1547c50ae26754360609f3
diff --git a/dev-python/zstandard/zstandard-0.16.0.ebuild b/dev-python/zstandard/zstandard-0.16.0.ebuild
new file mode 100644
index 000000000000..6d5db05fa39d
--- /dev/null
+++ b/dev-python/zstandard/zstandard-0.16.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Zstandard Bindings for Python"
+HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	app-arch/zstd:="
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '>=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]' 'python*')
+"
+BDEPEND="
+	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+	# the C backend is repeatedly broken, so force CFFI instead
+	sed -e '/PYTHON_ZSTANDARD_IMPORT_POLICY/s:default:cffi:' \
+		-i zstandard/__init__.py || die
+	# unreliable, fails on x86
+	sed -e 's:test_estimated_compression_context_size:_&:' \
+		-i tests/test_data_structures.py || die
+
+	distutils-r1_src_prepare
+
+	DISTUTILS_ARGS=(
+		--no-c-backend
+		--system-zstd
+	)
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 3761ba07697b..62cf771c3487 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index e6b5e353c447..445713de5f6c 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,5 +1,3 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD assistant-5.15.2-r11.ebuild 1269 BLAKE2B ef32a30011891811c4dc896d917759a3dc01c992175cdda3413aa66cd55808596b19d7c553377a25988a25f416fa0b04e865f116992b104170badc3f0df8eb79 SHA512 f592f2790cee0b0dccbbd555e7a24234f9f94f3ee4e819eb906b5751adafb6f10c3e49f7ea1595338e756f56aed48cf6c14f93fecf53081f6879f35849eada18
-EBUILD assistant-5.15.2.ebuild 1172 BLAKE2B 279c9a3c861bae74c79d52a8549b06167a7ca4adc3e4da5b2de0eada3414702adf36f0055790221e3cf725e9dcd1a959a6a507dbb823ddef061c7ffaff34ff8c SHA512 65a1a15cc074952f79a15adf8f57dca1283d246c34367e467e591af4c3ae3284539592efcf10edbf035bf8e450688205d5c3ab9ce3c909c60e7b83f0691ea067
+EBUILD assistant-5.15.2-r11.ebuild 1268 BLAKE2B 544f6db99e16de4974069f3dae1587da31357870d86244c186ac498e55360a752740944a8fc8ddf4abeef94d8be74954cc918b54e78f4f0c1d33daf44f8498b4 SHA512 282e2a2d22fb092567909e25b754150213cc637c37dd632fd56d9634fe3ad4c483b3f90bd608721c647a32a7d98a4c96485807bcf8175b34a9eb0e6ce911e036
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/assistant/assistant-5.15.2-r11.ebuild b/dev-qt/assistant/assistant-5.15.2-r11.ebuild
index 7f52c026f468..4fb7695223e1 100644
--- a/dev-qt/assistant/assistant-5.15.2-r11.ebuild
+++ b/dev-qt/assistant/assistant-5.15.2-r11.ebuild
@@ -10,7 +10,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/assistant/assistant-5.15.2.ebuild b/dev-qt/assistant/assistant-5.15.2.ebuild
deleted file mode 100644
index da691bbbaefe..000000000000
--- a/dev-qt/assistant/assistant-5.15.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qthelp-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/assistant
-)
-
-src_prepare() {
-	sed -e "s/qtHaveModule(webkitwidgets)/false/g" \
-		-i src/assistant/assistant/assistant.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-
-	doicon -s 32 src/assistant/assistant/images/assistant.png
-	newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
-	make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 31695defecf4..1763a4e8011a 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,5 +1,3 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD designer-5.15.2-r11.ebuild 1324 BLAKE2B a9e5c78b5689b1f129a627d14f84a4e0a71e9e2ba18dca32cf95964ce220f219522909387f311a92b82c02749243daacef3e585e29305b8105d7de895657570f SHA512 d9fb5b0025c455141c44ae3740b14b0474c74777db81e715cffe0446cf7264b84fd4f346a26223faabf155c2e521ea48bec717c9f82335ac78869b07b61dabf9
-EBUILD designer-5.15.2.ebuild 1207 BLAKE2B 164db9e578cf8ec76a9b319c0a40abf63dc318e9f8b697920f2123cc10ab07b2fdd85245fff218a09e70f9e69726c29f1c2e7327c59a040639845f5df9580895 SHA512 89f7f89384daf7d88afdea95ce93552f3430f79f75bfcc4b233c20cf700c2c1db25fedd722183eb13e80fdcbc04dddcdeea999a8cc6524259f8d10ace7fd952e
+EBUILD designer-5.15.2-r11.ebuild 1322 BLAKE2B 96e2f9396e6fa9a85c0e7428f126424fd1eb02d1906fcc64aa287dae9a03705de71c1c5a3c81348d24a2bb4c2967be9663f211691bb7a6a82cf06f3c6b0e7ce5 SHA512 41f3fc586ec362e271c5aee7eaa4c829b2e3454fb014df418e464e992a40ef0597c959aa7e5a71b811144f535530d7a2486c3b495fcb15880060e44d3798de9b
 MISC metadata.xml 565 BLAKE2B ff18f784bf09ba4add0fe5a9966a07ba2694dd84046bc528b22bcfd643a7e57be99235bd98eca4e58f68636f9fe6c8e274aabf82ed2055c6a4c70d10c60864ed SHA512 357d80b857e508aeceefcb45ab3757ce24d6ec3e1fd67642f2cbedf496748f89ab5a9726eb974bea8d5b1693601a965571913f79b1325aeaf9020183882ba16d
diff --git a/dev-qt/designer/designer-5.15.2-r11.ebuild b/dev-qt/designer/designer-5.15.2-r11.ebuild
index b6d8f4d22af1..0d41f6d0c413 100644
--- a/dev-qt/designer/designer-5.15.2-r11.ebuild
+++ b/dev-qt/designer/designer-5.15.2-r11.ebuild
@@ -10,7 +10,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
 fi
 
 IUSE="declarative"
diff --git a/dev-qt/designer/designer-5.15.2.ebuild b/dev-qt/designer/designer-5.15.2.ebuild
deleted file mode 100644
index 72ca74544f78..000000000000
--- a/dev-qt/designer/designer-5.15.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
-fi
-
-IUSE="declarative"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}:5=
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-	declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtchooser
-"
-
-src_prepare() {
-	qt_use_disable_mod declarative quickwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	sed -e "s/qtHaveModule(webkitwidgets)/false/g" \
-		-i src/designer/src/plugins/plugins.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-
-	doicon -s 128 src/designer/src/designer/images/designer.png
-	make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index cdda59cbc0b7..839aee2a66e9 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,5 +1,3 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD linguist-tools-5.15.2-r10.ebuild 763 BLAKE2B 12ed0c804c055985d923f87564fc85747051cd85e3b04be62af7e58766aaf6defc339b277fa81ffcd5494f36a1d2464c19696f78435adc6bef0a712d5dbb2a3d SHA512 58b8b8298280bb3ac50692a1631c85d7f8f1990bf755cf34c2d06c96f1b3022ec83811d1306058bc36bdb934062a8ac346359b71d3062dd2d53b79125acbd288
-EBUILD linguist-tools-5.15.2.ebuild 1022 BLAKE2B ceaefee8134e4ec654d8eaf3dde8ae085332b72a4e6efc61e31e71cbb3ab1bd593bb286beab9bb444329bd1c2bdc09c282dbe15fde7ca5fb1552e42f7771140c SHA512 597c04f3ebc80a32a601beeb9a760b0dfb1cced4fa5e74f0fd4687b775196fde21a26ed42182ce4b1ea3c409503de674dcec60142ce39ed09db522cdef4e2a7e
+EBUILD linguist-tools-5.15.2-r10.ebuild 761 BLAKE2B 0a0a92dd4c3ea44dd16f21dfc172c28dea25cd70c932ef4122a65b535738cd0602e11ee3edf38a9f2b93db0f5fee71e6a0fe22e9fb6c222ff7460566fd75658b SHA512 cb25ea547ae2dbdab01cbca18fc5e2f06bc56c1aefc6b503ce2a7396eca9a2815a9dcc0f16b1fffaff727376e435655253e2357899a0abb5de4d671142c5de56
 MISC metadata.xml 553 BLAKE2B 0306175072e5a0abff04f61eca76aa56daba272d1308419efd9ab80c4693eb795012b4e45a4cc102f6a9ec842105a805d9c5e75f84ae8007508a4d7d807d444b SHA512 d1edc09cbb7d757cd72b9b3dce980e0fede2cf69a83b78a072d81aea97692cb235227213cf02aa8207f33bc4a510a63baee359d5e8669ea7e0e5268dcd522e79
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild
index 639bf1ae2cad..b41bec103407 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Tools for working with Qt translation data files"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild
deleted file mode 100644
index 9d680f58c928..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.15.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tools for working with Qt translation data files"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtxml-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtchooser
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist
-)
-
-src_prepare() {
-	sed -i -e '/SUBDIRS += linguist/d' \
-		src/linguist/linguist.pro || die
-
-	qt_use_disable_mod qml qmldevtools-private \
-		src/linguist/lupdate/lupdate.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	# Most of qttools require files that are only generated when qmake is
-	# run in the root directory.
-	# Related bugs: 633776, 676948, and 716514.
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 35c3f57b6d9f..868d0045cde0 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,5 +1,3 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD linguist-5.15.2-r11.ebuild 1070 BLAKE2B 6d9ed2aab0e45b4adfa776de921e87caf616ba38ee3d0602e12fddcf47074a0dec2bd97e3d8c51275171a5ad1bab97de56b1ea302c3783a497c7806a57bda646 SHA512 3acc87a9c1ff8c0e5367b39784b9721348c0bb4df53ca8e6eecec109f5b75d8d494ed4ceef1d1636683dfc7b176ba77ffc7c1ca2ec3ab11f5d9b06844cc6af26
-EBUILD linguist-5.15.2.ebuild 978 BLAKE2B 9a0597ccbbe503e80793cb39ea06f12f98f9ea30119eefc569f01cc7540eec38c7088230133ea44792e34b66c60c71f1a26afe3ae2ad33e7c726127fa5c3ce0a SHA512 3cdb00dd950edc643b8c60d7f33600e76c059e36b7bad8c549f08ab504bdba58641ab9ec81e7b4d084ddccc71593ef984716e52a63a9a84f98692696b7304306
+EBUILD linguist-5.15.2-r11.ebuild 1069 BLAKE2B 16a610b157e34327a9a45d8377823646ad3d0cc98e5aaacfe34ff00b44b285e5d9644da3ecf05c02aeaaa7b2172e5ca94e6c0bfee3d7be0f757e42089f01a345 SHA512 b3570d4edfe75427b23ceb1e2b049018cfae3441c66413f5c0479e354652ac45edc7432562a9d984637cddc0649d2324d218acc0a225e8e9b68427056308c316
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/linguist/linguist-5.15.2-r11.ebuild b/dev-qt/linguist/linguist-5.15.2-r11.ebuild
index adbeaf678947..686904fe227f 100644
--- a/dev-qt/linguist/linguist-5.15.2-r11.ebuild
+++ b/dev-qt/linguist/linguist-5.15.2-r11.ebuild
@@ -10,7 +10,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/linguist/linguist-5.15.2.ebuild b/dev-qt/linguist/linguist-5.15.2.ebuild
deleted file mode 100644
index 23446cbce0c2..000000000000
--- a/dev-qt/linguist/linguist-5.15.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Graphical tool for translating Qt applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/designer-${PV}
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}:5=
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist/linguist
-)
-
-src_install() {
-	qt5-build_src_install
-
-	local size
-	for size in 16 32 48 64 128; do
-		newicon -s ${size} src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png
-	done
-	make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist 'Qt;Development;Translation'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index f5c8691b4934..a544be8e93d9 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,5 +1,3 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD pixeltool-5.15.2-r11.ebuild 518 BLAKE2B 2f0e3ffc946464b8d05f9226c0997e54d7d425a70276e60e76aa79e66f6d0bccbf4a648042335854d7950c5d7e71bb2275a189173d42198bbaa9363e0e676a58 SHA512 ea6618607cad3523e3b113e6b9d647fa628a6b989f43c48b75b6dc2db14b696cb9241b2a97eae69fad92ad21c43aa5cbc4dfb9c5c16be6792fc5f23f544f29a5
-EBUILD pixeltool-5.15.2.ebuild 421 BLAKE2B 4e1e63db67d042bf03d2ee606682fa210e7c48ab314a4f78e71c198e3b920c45a930826054c7f9ba6af5b12f7e881c4fa9a605c96910f0317b7d88e37dcddf58 SHA512 6e8c19d9cfe7e5b8a651817499a72b5e8cb4a538cdd865a68fdf0c388ed093379297143916aa6fd3e55fe9ec25345554e072917a8096fc6a05fec241da329a89
+EBUILD pixeltool-5.15.2-r11.ebuild 517 BLAKE2B e985bd5d8d3ed90835a90ac58e6a7751fb01dcffe2b26d0cfc8ebe3a702a46db596ef5fc04c76095ae582a567a1642845f0bf14075bcc43c44f18753d0f4320d SHA512 83148b3fe154b1961da83e4583558ba52659ac7e32b494ada961f64d7519bb51b5dd2828d044c5525bb0501f21bb8b971a39382b85e51f46d4cfcd16f1eb16ef
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild b/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild
index 15694f09c002..3e456b213ccf 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Qt screen magnifier"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-5.15.2.ebuild b/dev-qt/pixeltool/pixeltool-5.15.2.ebuild
deleted file mode 100644
index c90103ced4e4..000000000000
--- a/dev-qt/pixeltool/pixeltool-5.15.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt screen magnifier"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}:5=
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtchooser
-"
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index 41592a18bc89..206fd5213e8f 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,5 +1,3 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD qdbus-5.15.2-r10.ebuild 552 BLAKE2B da2c253446a5346f185ab7b45d110478abe0c0fd114198dafbb36fa9184ca37c78700d83de0ab33bcafef1a2feec9117783ad1a5916fa44ea5b3a17394fa52c0 SHA512 98721df33c67dd0787c8e381a7d93cc93011569327b2466b378fa192d972a1ef1785c229c9bde18994caf52291bbdbfe981290dc8728d606a45e86bda7d1b23f
-EBUILD qdbus-5.15.2.ebuild 479 BLAKE2B 1bbd1e7fabca5b7fe69348b35f043c8b405a3531d4376cde7014b325175507a3cdc1f7957caa83b467845b72296c7d4dc583ab577cfd4e5065633baa8d721651 SHA512 a67672a40c2673e507842372972a9fc5fb74f6cfede0a60f1c1d8c1d3d6285e1de7ae73c82bb699111b7f9e753b1ff0694bb40d8e953bb1ca777283a3369dcda
+EBUILD qdbus-5.15.2-r10.ebuild 550 BLAKE2B 61c2e4a3de7631511a6ecb2f5d1cc5b05cb72ae547c9bcb3b16d93180ad59283ce07c37a05b3d712f418752f04c2dc26ecbebaed4d058933456cadfebb1a6ab9 SHA512 7c031f9e9a702d622b2d13a86bf39cff64263c29dc21662ea0d7d5793bcb746c2a944008394df51eda40c703fcfcfe7872607804a8e8ffccd7c8a10027752a1a
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild b/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild
index 3819a6b0caea..2c7623dbaf80 100644
--- a/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild
+++ b/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Interface to Qt applications communicating over D-Bus"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbus/qdbus-5.15.2.ebuild b/dev-qt/qdbus/qdbus-5.15.2.ebuild
deleted file mode 100644
index 42552e0fb275..000000000000
--- a/dev-qt/qdbus/qdbus-5.15.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Interface to Qt applications communicating over D-Bus"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbus
-)
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 0b4268cb3e34..460d1f9c9c5f 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,5 +1,3 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD qdbusviewer-5.15.2-r10.ebuild 1042 BLAKE2B 6bbeee3455096dd33047db64ae66caf764f35672b9ca9cc311700e888b1b0faa0aaa8fb3e694aa328eb1b0770b132a2d5ee84c5cdca72eafd35178b6f6763913 SHA512 178563ee4a2f52a1aa9325157cfad66c62c9c82e5efb478624e59ca1c8a118d2bd25ca73c4ce990630517ec1a4b1a008450be020ee9a797a525c34e78554f610
-EBUILD qdbusviewer-5.15.2.ebuild 960 BLAKE2B 1d2910182ed9b6830230106d2596c393aae23544651cec3fa4e9ed1b65aa3eab3a2a25c8080d034c6988aa1366d3e56c98eb70cac7f946ff7cbed96aff89324f SHA512 9091c3d7a17e3481458b9dcb4116f7e973ca4e43ae0d47aa0f28e8595f16b100c843c11b7779867150d5159e9b0cfa140d94e0a6995c4c65962f0538a6a3ca62
+EBUILD qdbusviewer-5.15.2-r10.ebuild 1041 BLAKE2B b967aba8b225e5e9a9bd36d1350445b48a153342a96828771e86f23b8063878681413ab63799d7fba07850691d03644027c222331503d3da35c06f00ea986564 SHA512 0014aebe0181579b471539204c98ca991163fc6dadaddf798a74d4f47d955713388c200861f091ce9a902a4fa1a651fe23e168f9485a4229adc938cdf7ca1e7a
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild
index 09d3b0f1cd86..11f5c9a1d50a 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild
@@ -10,7 +10,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.2.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.2.ebuild
deleted file mode 100644
index a9976bf60249..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbusviewer
-)
-
-src_install() {
-	qt5-build_src_install
-
-	doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
-	newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
-	make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 602682a19cec..767a8ed69388 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,5 +1,3 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
 EBUILD qdoc-5.15.2-r10.ebuild 884 BLAKE2B 9e2fbd20d3e8e17452f25dccf0ac0118e2658a9a71d9ce38bbda5edcd9284daff970419d1b836e1c06e26dfbe61f4317aad2b829709f0f8c34a7cd5d9746938e SHA512 a6ad4bfc07d7a8d1a7a739ba2a4e9a088744e2cb2fa4af4b3035ece210a00d22cbfe4b15d556ff6e704906a09fcd587d4af65483922d7541a71f99869f59d4a5
-EBUILD qdoc-5.15.2.ebuild 543 BLAKE2B 049d072f3fe6f36d4703150ebe4326f0ade72c2e415743da40bd2015dfe9818595f606ecd4e7ed543fd9175b2f1df77da811c3a655dae4112f816f901e3771f8 SHA512 4de93172b553430ff0507f32519b22e4668e024ada835c938defec5037f95f9752dc6f58951f6d3a3167586083f20679ba1eadf5927abcd6b3e2ab15de7824b8
 MISC metadata.xml 553 BLAKE2B 6512e790088d4b7a76a22edfb8e278399315d3136239d5ea1e37ba5fcdd761fec2a1a30504882e7660b5ced6d582ad37cb9cfc68775e8593d638a4594f693339 SHA512 40075da7d634cc291dcc15c00d1fc63debc6704443fcc0c5d3d06d227b8cf86f89884ea43eb3a1cf8a722a6b260cf9cb6cd7f88c0b14babe301e4344533d472e
diff --git a/dev-qt/qdoc/qdoc-5.15.2.ebuild b/dev-qt/qdoc/qdoc-5.15.2.ebuild
deleted file mode 100644
index 5af64b53d743..000000000000
--- a/dev-qt/qdoc/qdoc-5.15.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt documentation generator"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	sys-devel/clang:=
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtchooser
-"
-
-src_prepare() {
-	qt_use_disable_mod qml qmldevtools-private \
-		src/qdoc/qdoc.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index d93fd667cc35..12cc27fd44ce 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,5 +1,3 @@
 DIST qt3d-5.15.2-7edec6e0.tar.gz 86196121 BLAKE2B c6009fa8b94da1a498e14f61680be40cbc5e32e390d89911b5a7b7d19bae7c66e048101e6f3b6c1f7e5cc4e64da7ea801f4bf95c346b35d28a49866d9541e146 SHA512 73941c2052aeb9611cf24bbb7b3ba317e53207c080070bb5d602c9f2725d2ab305674e0f29b737ea62ff7a285b362ec53b3588b31c18635e250bc90081d9b5e7
-DIST qt3d-everywhere-src-5.15.2.tar.xz 81925416 BLAKE2B 358a071f775d460d794ce3451ea6904f9d1ac0a388176ba62f7d6c7c574621cdcd3db8f7af3aaa361e5ac172056e8e8a32b894b401720e93ae2a2cfad4282da3 SHA512 38da6886b887f6d315dcb17192322efe184950716fdd0030df6c7d7c454ea43dc0250a201285da27683ce29768da6be41d4168e4f63c20adb0b5f26ae0934c1b
 EBUILD qt3d-5.15.2-r10.ebuild 1000 BLAKE2B d6b708dcc748e395b5cb6cf74d36627f54322b46b237b52fbbc6dd87cc691c6b4dbd9fcfd1919f794f2caf460a8b59d8a299a9659ea75378c65e89f0da136cd1 SHA512 df4376ab76ca598655911d686aec0784291a89a14f59638a4eb239835d56a422651458765bfdf3c020d01125cef6e8444ec2f41d460cd71aecb72cc6451a721d
-EBUILD qt3d-5.15.2.ebuild 880 BLAKE2B bcd097060dbb5e6673b7f5c4fd314a58c0f4d3412ece2b8542f83565d9ee0a0ad0df189e7af927bf836f8c200ccdfa689c366408720c069e21d093ab33fdf4ca SHA512 77f8a1f095598e798479a1e7d62e6b40188bbcc662da7948898364b0b5cd61bbf8b560a271969ae15e7a9f4fa4c49edc064a85cea1e1ae04a0a2778b7bd43d4b
 MISC metadata.xml 700 BLAKE2B 3f7d01ca331e1f43b3333f86f10901e6fdb6fb8482d9d0cebbd9c5d498b2a5971c7a17fe78aefe23d31eccfcf64eaee8b581f8f749ecb6c0eba286608d6c75e0 SHA512 3f6c2d8f227760e9e14f873147fc79bc5027cac6d5dc134c9ac071fd30c7fba39afad272829f8ae446682c3a1a5ba80b056b263963dcbdf308b0f55337563394
diff --git a/dev-qt/qt3d/qt3d-5.15.2.ebuild b/dev-qt/qt3d/qt3d-5.15.2.ebuild
deleted file mode 100644
index 6a12fcf3062a..000000000000
--- a/dev-qt/qt3d/qt3d-5.15.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qt5-build
-
-DESCRIPTION="3D rendering module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-# TODO: tools
-IUSE="gamepad gles2-only qml vulkan"
-
-COMMON_DEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}:5=[vulkan=]
-	~dev-qt/qtnetwork-${PV}
-	>=media-libs/assimp-4.0.0
-	gamepad? ( ~dev-qt/qtgamepad-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
-"
-DEPEND="${COMMON_DEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-qt/qtchooser
-"
-
-src_prepare() {
-	rm -r src/3rdparty/assimp/{code,contrib,include} || die
-
-	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtchooser/Manifest b/dev-qt/qtchooser/Manifest
index 5297eb264a52..f5b83bb7949b 100644
--- a/dev-qt/qtchooser/Manifest
+++ b/dev-qt/qtchooser/Manifest
@@ -1,4 +1,3 @@
 DIST qtchooser-66.tar.xz 32008 BLAKE2B 1faf4a44406655621e65132289af6a8b0d23f0c1027a3b99017c3951705378bebcfbc3cb32aa59975a101f21294ff701ca6eb6ec18ce977b714a426be0fbcd6d SHA512 0c7d3588ddd7b21e6e9d799204924e06e0b0950c898dfd23088f1e7657b7f821a35579aa062658499809f9d9757e82c3c592591aa2e5ec453463929bf2b33bac
-EBUILD qtchooser-66-r1.ebuild 1471 BLAKE2B b5950833cea37935e202268272817e1bd6d8f4dc80dc88220d592f8536b2f101d4ef6ee6a552f158b969e837b51f658a0d97da2feb257a1784d0c64608562955 SHA512 a280f54b1c41068929d993cb973d07f4f836b14164f51fd884f3689c1ad2fb19621ba80253e2fdbd78355ba25f7d582f742446e3fdf3db0f4e2606463c8e0c40
-EBUILD qtchooser-66.ebuild 977 BLAKE2B a28e55c2c6f55082c93f8d7ba3e1e0d4b5cc378663ae94cd0026a46745625e1f7240cba603458ab756ced69950c3059a8bb63b94b7b45f96f0d783d542f9c823 SHA512 a10663af25e02e9f59bf3d9bf93ce5662bce5dd489382916e7396350d7dd738cea432ae8aaede433bee6a3db378e79d23ce0a8af063d7d5c2f99c5c6887c1765
+EBUILD qtchooser-66-r1.ebuild 1469 BLAKE2B ed5257a4134828f864229b04020171fa471bbfa6b4e9ac874b59027df4dbc2e6ad794a80a758cb2a7031d8a3754f1c867138dcf7959eb7ef271bf43920c004df SHA512 9bc54b406129e04df48a2bff185024c559622d1c793c4842c4ce8d64ec0af210ea18f1e6d6ac730bbeb5c1e8968823dfb0aa7ec69da1bafeb667a5e4e034c95f
 MISC metadata.xml 248 BLAKE2B 51adf67bdc3e6c30f18cb7c177694882c71c1207bf4e6b88aa0eb8d5f6fdbaea0c364777967125219ba8ea4be4a9ad3eb41269a7139cb211ce26f2985ac103ac SHA512 c2976d1256f14d4dcf6ea53ed248a43e9b76530c19eefb0e586d64b1080b75d1f4ac17171c6c27a491ce6623d34e9318fcba5ce3f78039f21ccaabbebf209345
diff --git a/dev-qt/qtchooser/qtchooser-66-r1.ebuild b/dev-qt/qtchooser/qtchooser-66-r1.ebuild
index 69b3acc84d7e..e25d60437642 100644
--- a/dev-qt/qtchooser/qtchooser-66-r1.ebuild
+++ b/dev-qt/qtchooser/qtchooser-66-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
diff --git a/dev-qt/qtchooser/qtchooser-66.ebuild b/dev-qt/qtchooser/qtchooser-66.ebuild
deleted file mode 100644
index 50298a23a94b..000000000000
--- a/dev-qt/qtchooser/qtchooser-66.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils toolchain-funcs
-
-DESCRIPTION="Tool to quickly switch between multiple Qt installations"
-HOMEPAGE="https://code.qt.io/cgit/qtsdk/qtchooser.git/"
-SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-		dev-qt/qtcore:5
-		dev-qt/qttest:5
-	)"
-RDEPEND=""
-
-qtchooser_make() {
-	emake \
-		CXX="$(tc-getCXX)" \
-		LFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		"$@"
-}
-
-src_compile() {
-	qtchooser_make
-}
-
-src_test() {
-	pushd tests/auto >/dev/null || die
-	eqmake5
-	popd >/dev/null || die
-
-	qtchooser_make check
-}
-
-src_install() {
-	qtchooser_make INSTALL_ROOT="${D}" install
-
-	keepdir /etc/xdg/qtchooser
-
-	# TODO: bash and zsh completion
-	# newbashcomp scripts/${PN}.bash ${PN}
-}
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index a710c4dd2e37..3b8bba0341e8 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,8 +1,3 @@
-AUX qtconcurrent-5.15.2-gcc11.patch 1709 BLAKE2B ee8a0a0a591fcbd242406bc37a5b29959d4a82cba78dd5650b60e0526316a1ac511c2f4e053db29d365394f38cf481772e659f194576f58aa2cb4d50ba240c51 SHA512 895c35ee745ff34cc939463c1d0b433d4bcf53c78af3b6c14304608ff282cb77ef292c63a1368885c7b3db5ec7c4acbff1827a014f08a768fdc50fc87dc64222
 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtconcurrent-5.15.2-r1.ebuild 640 BLAKE2B 6b92535edb473b634658302c1863569c147b9271e016a77c88bed6bec845612f520fb68f426476600e3473ff66c87ffb1420015aba12ccb606d8dd330639022a SHA512 01ad79d9fd101c42eba17851270ef6058f167204e515016b47bbf8001fffce94c23ee909c496ac73d5d38c0a71ac03c1ccf0dc006082516114343164b4e2d2bb
-EBUILD qtconcurrent-5.15.2-r10.ebuild 511 BLAKE2B eca734f370dec9b2af186cc480c05c952b92b7e44712f68c2bd05dfdce39a8fa0bbdd864e9f0881f29f60e2b1b3eac222da920ffd9993c611e3e5b0c0d1cbf05 SHA512 b77595336baf696b0f9c6678b55f0b5eea3ea8bea7e944a43e46edcd292f5194901df4048a12306dbe23b03dde49782b2e6b37c62b7a4f58556dab17c85d9f78
-EBUILD qtconcurrent-5.15.2.ebuild 593 BLAKE2B 44f6a1c8dac390908bb2d5d8f9ffaabd96333ffc07a680ec4ae65a0d4ddd737c24eb376d99afb9cffef954d7b0daa2fa4436c80ea839a43db71f4fc6edf30f7e SHA512 abca397ab254a2d3fcecf6d7ba04814f15184a1589c3fa2e26c8c4bb2fa965f2b9437ad2a0874fea44ea97490320e8589f596b26c91a0af17a10cbd30f16b296
+EBUILD qtconcurrent-5.15.2-r10.ebuild 509 BLAKE2B f6aff87eb8b0aa86ed93a9ada769ccc04db6cd4c5379db1bd601f6370db0b1fb9d3d88073cf4a126d571ceeee0e4ca4adba9a0368f5aaaa294dc6729dfbbef71 SHA512 f9f067dde6879342839e5e4ecae4c0e5e8bf99abc8aff547d3137a18257452124203ba27040394edb7d5314b162b854dc1a0b3de0afc047842166a0ef268ab64
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch b/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch
deleted file mode 100644
index b27ac767b064..000000000000
--- a/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.gentoo.org/764977
-https://invent.kde.org/qt/qt/qtbase/-/commit/c9543da6998b0827fb75ffe22327c99e2da7d364
-
-From c9543da6998b0827fb75ffe22327c99e2da7d364 Mon Sep 17 00:00:00 2001
-From: Sona Kurazyan <sona.kurazyan@qt.io>
-Date: Wed, 17 Mar 2021 16:04:00 +0100
-Subject: [PATCH] Remove the unnecessary template parameter from the class
- specialization
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This seems to cause errors when compiling with gcc-11. Although this is
-most likely a compiler bug, specifiying the template parameter type in
-this case isn't necessary.
-
-Fixes: QTBUG-91909
-Fixes: QTBUG-90568
-Change-Id: Ib231257ccb2e16cc533f23ca5840d31e26a66d53
-Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
-(cherry picked from commit 659f7a06e91c04b239e3f4c0bcfccbe3581af1c3)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-(cherry picked from commit 049e14870c13235cd066758f29c42dc96c1ccdf8)
----
- src/concurrent/qtconcurrentthreadengine.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h
-index af413707e4..a4c8548cc4 100644
---- a/src/concurrent/qtconcurrentthreadengine.h
-+++ b/src/concurrent/qtconcurrentthreadengine.h
-@@ -247,8 +247,8 @@ template <>
- class ThreadEngineStarter<void> : public ThreadEngineStarterBase<void>
- {
- public:
--    ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine)
--    :ThreadEngineStarterBase<void>(_threadEngine) {}
-+    ThreadEngineStarter(ThreadEngine<void> *_threadEngine)
-+        : ThreadEngineStarterBase<void>(_threadEngine) {}
- 
-     void startBlocking()
-     {
--- 
-GitLab
-
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild
deleted file mode 100644
index f0ecb6cd1f63..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/concurrent
-)
-
-PATCHES=(
-	"${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012
-	"${FILESDIR}"/${P}-gcc11.patch # bug #764977
-)
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild
index 7488ab63fecd..f226909ed339 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild
deleted file mode 100644
index 346697ad3187..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/concurrent
-)
-
-PATCHES=( "${WORKDIR}"/qtbase-${PV}-gcc11.patch ) # bug 752012
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index a51fde7df472..f124a0ce2dff 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,12 +1,6 @@
 AUX qtcore-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
 AUX qtcore-5.15.1-timezone-1.patch 9484 BLAKE2B aa36362fcc6ea1ab144e97dfa1e023e4fbad64f8702e817ee2431ac271aefd637609d14a265c2d6e58bedbdb3f635b4b979c9bf1463a29370ae05bb2610e131b SHA512 1edfe267827225279b0ecad60a5a350b825ed9bd84574d0e5470e71bac75668c0655aa0db2f001e26e331f85e0cf0a68412ba5a9541581bf39a0e954313672b2
 AUX qtcore-5.15.1-timezone-2.patch 1933 BLAKE2B 479f82c90d2132291bc298491d61d7144e08a6db8b36d7d1a89f368c894e41902ae964aaa2819010c485dc5aedd937f2dd00b4efa99d3393d11368e0ea258481 SHA512 c978ffadf15629ab562a53cc24d31e33f4df861962b927ea37061747cb74a7b677d7ae3a617b526c4f48085fe73ebb89fbf5a44748433426dd74e5691a238097
-AUX qtcore-5.15.2-fix-UB-in-QDateTime.patch 3707 BLAKE2B 7b1ed1b539d04e299b3148acf85d69c014a8a76882a682910b323117e176c68dab8b48de12c0a5c885508dd6d97a4ae9da4a27162323ba743d25f9a83319b367 SHA512 62beec1be070ff6136f1b52c1789e31f877bf728ca12c54c90de6302f6c35008d0d9e939f99a92465ca14ee977faed507b2acdea553d8904eb201aed41a97805
-AUX qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch 1944 BLAKE2B 71f3a02d89e3604cec0f021fe28bddc0ab43e242742d0f5af17a46bbfdc444f7d3244fe995195ef0c1c9119313a472bd7e64a6fd02986f7cb6cb544553fbd36d SHA512 6f9f57eb2b374b56576fe0046518810e07482aae1a74f45c9692ffbd797ad1653aedfcd896d89909ade4572564164e92698de64da9f98ce876952c2c96b15aa3
-AUX qtcore-5.15.2-gcc11.patch 1002 BLAKE2B 5104165920881f0ec960a96b5e82430acf32eaf2a3b2a1724844c18a2b0661d71820401d4f6c8d25e56b3a5dfb99cc47f024a96c8fc48f9ddcb1fb8dacc8a90d SHA512 658169f8d7fa42d492f69b44feadd369bccf9a76d01989fd8b14991f97cdf3c8291ff316e195a05a8bb015bae477d5c49d495eefcfc4f3e25dbc58f33688854e
 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtcore-5.15.2-r10.ebuild 2327 BLAKE2B a5535fa9f65e6f99df0e964896594f063dc4730312b6262b8aa2cbe80cf47d0705593724f5fbe6df0501f574a77e0c1ebf62f17e3b24303515a2f7bf22b2eb00 SHA512 3851c850f13eb28edf4a0dd06b628b2675803eaf7419b7338a726a3a500c42764fc7c0146f3bae718cdf1de191f030ee0c9e07d32a0e2ad8c3362cee72fe9ca6
-EBUILD qtcore-5.15.2-r3.ebuild 2609 BLAKE2B 5ba2d7be01a791bfc9afcbe4d7cb7589df58b8ce5d343e9c35c7b69ff1ec2f80d701209e18bc2966fb154314e397b7577759b2bfa9271bb576558e6fa5ec2b49 SHA512 f4b64260fb2c66fdd106db7f464b212b7f63b506d4c3026cdbb15402a88f89f95742bc616f86bd6d92cfa4900b98e85dd50b9cfe9d49f3965c8df8fdeee42c51
+EBUILD qtcore-5.15.2-r10.ebuild 2325 BLAKE2B 14b93476a682c92c918445bdb3d8e66c097c60e90065050b13240c990c5cebed882fb0dc9be85a5ca2de487d4f20ba45c53a553f85ec217897c0ea6b7281c85a SHA512 1edc816208a111a4efbbcb2ab229c24e3ec8ed1ecd72961d42f1df17318a1d81dcb28f8ca61526a1c4cd0a6da3b19d962e5c06b2b7e46b6969fe870d18f951bf
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch b/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch
deleted file mode 100644
index b131b7af3657..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.2-fix-UB-in-QDateTime.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From d2c0fc2b5f1c07c1e0acb1c0127578066b6f9b8e Mon Sep 17 00:00:00 2001
-From: Edward Welbourne <edward.welbourne@qt.io>
-Date: Tue, 24 Nov 2020 12:45:11 +0100
-Subject: [PATCH] Bounds-check time-zone offsets when parsing
-
-Parsing of time-zone offsets should check the offset string conforms
-to the expected format and has valid values in its fields. The
-QDateTime parser, fromOffsetString(), neglected the bounds check on
-hours; the QTzTimeZonePrivate parser, parsePosixTime(), neglected all
-upper bounds checks, only checking against negative valus.
-
-Drive-by - refined phrasing of a comment.
-
-Fixes: QTBUG-88656
-Change-Id: If04cdbe65064108eaa87c42310527783ad21b4c0
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-(cherry picked from commit 380d97e1bd15e753907c378a070bdf7f1c1cf06e)
-Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
----
- src/corelib/time/qdatetime.cpp           |  2 +-
- src/corelib/time/qtimezoneprivate_tz.cpp | 27 ++++++++++++++++-----------
- 2 files changed, 17 insertions(+), 12 deletions(-)
-
-diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp
-index e824787880c..a2816e87f4a 100644
---- a/src/corelib/time/qdatetime.cpp
-+++ b/src/corelib/time/qdatetime.cpp
-@@ -240,7 +240,7 @@ static int fromOffsetString(QStringView offsetString, bool *valid) noexcept
-     const QStringView hhRef = time.left(qMin(hhLen, time.size()));
-     bool ok = false;
-     const int hour = C.toInt(hhRef, &ok);
--    if (!ok)
-+    if (!ok || hour > 23) // More generous than QTimeZone::MaxUtcOffsetSecs
-         return 0;
- 
-     const QStringView mmRef = time.mid(qMin(mmIndex, time.size()));
-diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
-index b816b4ecff2..adc590878d7 100644
---- a/src/corelib/time/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
-@@ -394,29 +394,34 @@ static int parsePosixTime(const char *begin, const char *end)
-     // Format "hh[:mm[:ss]]"
-     int hour, min = 0, sec = 0;
- 
--    // Note that the calls to qstrtoll do *not* check the end pointer, which
--    // means they proceed until they find a non-digit. We check that we're
--    // still in range at the end, but we may have read from past end. It's the
--    // caller's responsibility to ensure that begin is part of a
--    // null-terminated string.
-+    // Note that the calls to qstrtoll do *not* check against the end pointer,
-+    // which means they proceed until they find a non-digit. We check that we're
-+    // still in range at the end, but we may have read past end. It's the
-+    // caller's responsibility to ensure that begin is part of a null-terminated
-+    // string.
- 
-+    const int maxHour = QTimeZone::MaxUtcOffsetSecs / 3600;
-     bool ok = false;
--    hour = qstrtoll(begin, &begin, 10, &ok);
--    if (!ok || hour < 0)
-+    const char *cut = begin;
-+    hour = qstrtoll(begin, &cut, 10, &ok);
-+    if (!ok || hour < 0 || hour > maxHour || cut > begin + 2)
-         return INT_MIN;
-+    begin = cut;
-     if (begin < end && *begin == ':') {
-         // minutes
-         ++begin;
--        min = qstrtoll(begin, &begin, 10, &ok);
--        if (!ok || min < 0)
-+        min = qstrtoll(begin, &cut, 10, &ok);
-+        if (!ok || min < 0 || min > 59 || cut > begin + 2)
-             return INT_MIN;
- 
-+        begin = cut;
-         if (begin < end && *begin == ':') {
-             // seconds
-             ++begin;
--            sec = qstrtoll(begin, &begin, 10, &ok);
--            if (!ok || sec < 0)
-+            sec = qstrtoll(begin, &cut, 10, &ok);
-+            if (!ok || sec < 0 || sec > 59 || cut > begin + 2)
-                 return INT_MIN;
-+            begin = cut;
-         }
-     }
- 
--- 
-2.16.3
diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch b/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch
deleted file mode 100644
index 892d89d2948c..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 6485b6d45ad165cf976138cf8ab683c42515e794 Mon Sep 17 00:00:00 2001
-From: Kai Koehne <kai.koehne@qt.io>
-Date: Tue, 13 Oct 2020 15:47:31 +0200
-Subject: [PATCH] Fix allocated memory of QByteArray returned by
- QIODevice::readLine
-
-If the maxSize argument is 0 (the default), QIODevice::readLine will
-allocate a QByteArray with the size of the next chunk of data, which
-may be quite large. Before returning, it then resizes the byte array
-to the actual size that was read.
-
-But since change 6b884d2aa129, QByteArray::resize() does no
-longer shrink the capacity. This means that the returned QByteArray
-keeps it's maximum size as allocated memory. This can lead to
-excessive memory consumption, especially if the returned QByteArray's
-are stored for further processing in the client code.
-
-Fix this by explicitly calling QByteArray::squeeze() before returning.
-
-[ChangeLog][QtCore][QIODevice] Fixes a regression in Qt 5.15 causing
-QByteArray's that are returned by QIODevice::readLine() to
-consume large amounts of memory.
-
-Fixes: QTBUG-87010
-Change-Id: I1f95fc4098849e900680fc945238bfeda881022c
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-(cherry picked from commit 263b29eedb223dec1ecaee193302070af87a1852,
-limited squeeze() call if bytes are actually read to preserve retVal.isNull()
-behavior in 5.15)
----
- src/corelib/io/qiodevice.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
-index cc1d1102522..0f11c2e805c 100644
---- a/src/corelib/io/qiodevice.cpp
-+++ b/src/corelib/io/qiodevice.cpp
-@@ -1480,10 +1480,12 @@ QByteArray QIODevice::readLine(qint64 maxSize)
-     } else
-         readBytes = readLine(result.data(), result.size());
- 
--    if (readBytes <= 0)
-+    if (readBytes <= 0) {
-         result.clear();
--    else
-+    } else {
-         result.resize(readBytes);
-+        result.squeeze();
-+    }
- 
-     return result;
- }
--- 
-2.16.3
diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch b/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch
deleted file mode 100644
index 9d391311c345..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.2-gcc11.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: include <limits> to fix some GCC 11 build issues
-Origin: upstream, commits:
- https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986
- https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8
-Last-Update: 2021-01-26
-
---- a/src/corelib/global/qendian.h
-+++ b/src/corelib/global/qendian.h
-@@ -44,6 +44,8 @@
- #include <QtCore/qfloat16.h>
- #include <QtCore/qglobal.h>
- 
-+#include <limits>
-+
- // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
- #include <stdlib.h>
- #include <string.h>
---- a/src/corelib/global/qfloat16.h
-+++ b/src/corelib/global/qfloat16.h
-@@ -43,6 +43,7 @@
- 
- #include <QtCore/qglobal.h>
- #include <QtCore/qmetatype.h>
-+#include <limits>
- #include <string.h>
- 
- #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
---- a/src/corelib/text/qbytearraymatcher.h
-+++ b/src/corelib/text/qbytearraymatcher.h
-@@ -42,6 +42,8 @@
- 
- #include <QtCore/qbytearray.h>
- 
-+#include <limits>
-+
- QT_BEGIN_NAMESPACE
- 
- 
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
index 44e955e9f6e0..ee99b42e8112 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
 SLOT=5/${QT5_PV}
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="icu old-kernel systemd"
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r3.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r3.ebuild
deleted file mode 100644
index dadcd5585a58..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.2-r3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit linux-info qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-SLOT=5/$(ver_cut 1-3)
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="icu old-kernel systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtcore-4.8.7-r4:4
-	dev-qt/qtchooser
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306
-	"${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
-	"${FILESDIR}"/${P}-fix-UB-in-QDateTime.patch # QTBUG-88656
-	"${FILESDIR}"/${P}-fix-alloc-mem-of-QByteArray.patch # QTBUG-87010
-	"${FILESDIR}"/${P}-gcc11.patch # bug 768342, 768354
-	"${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012
-)
-
-pkg_pretend() {
-	use kernel_linux || return
-	get_running_version
-	if kernel_is -lt 4 11 && ! use old-kernel; then
-		ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
-		ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
-	fi
-}
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
-
-	# fix missing qt_version_tag symbol w/ LTO, bug 674382
-	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	use old-kernel && myconf+=(
-		-no-feature-renameat2 # needs Linux 3.16, bug 669994
-		-no-feature-getentropy # needs Linux 3.17, bug 669994
-		-no-feature-statx # needs Linux 4.11, bug 672856
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	local flags=(
-		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
-		OPENGL OPENSSL SSL WIDGETS
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 042af408bed6..b711a9010d6d 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,6 +1,3 @@
 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtdbus-5.15.2-r1.ebuild 856 BLAKE2B 3a6ba7d726b81e51b26b27a542b583fd7a539bfff572d1a2a4ac8679efadc7e2b7316afa92d43ae9950a31df07a543d124d58c55f1600fb8e08d0553bc52acb5 SHA512 01ac379102445c5150cb0d74314eed7f8dc805103ae7e71907451fad5211baee5b9cd70e9f0061ad297f728dc13cc51ec99dbf29f011442db026fdb2ee80e383
-EBUILD qtdbus-5.15.2-r10.ebuild 755 BLAKE2B 28fbd65e1ad97a4e49221497793e9143ee77c91eeef8a7f013a8a146806f7bc80d78d743e1a390e9e144c19daa407227f2ff5a36cd3dfc761ec05e50baffc81c SHA512 a7983c283c9fe4f713ba4129af9d69213c8e2a288f181f61cfa8af85050b298b841468d8496a17052a2aefeed4e3c72588bad0cc1d6a31ee3ec0d0252d6b9c98
+EBUILD qtdbus-5.15.2-r10.ebuild 753 BLAKE2B e785955ed4907a22f7df6f1395318ce790b63e720b3b7b3d344e30edb24355dfd32835cc570c90e5998350c540e43fc16519eed2a3b7572e662ff4fac73ac883 SHA512 bdceaa9884ba7a9483dd0e1f8542b20c01c9dbc0de7d3b5050b4acf25cea8eff71143d32943b27d155acef204c943188f4b288e6c0940e430ec6b8169016d45e
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtdbus/qtdbus-5.15.2-r1.ebuild b/dev-qt/qtdbus/qtdbus-5.15.2-r1.ebuild
deleted file mode 100644
index 3cc9ecda38d2..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	>=sys-apps/dbus-1.4.20
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtchooser
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/dbus
-	src/tools/qdbusxml2cpp
-	src/tools/qdbuscpp2xml
-)
-
-QT5_GENTOO_CONFIG=(
-	:dbus
-	:dbus-linked:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:dbus
-	:dbus-linked
-)
-
-PATCHES=( "${WORKDIR}"/qtbase-${PV}-gcc11.patch ) # bug 752012
-
-src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild b/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild
index 6ebb1d4d1577..0d2d952579e1 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 0c96b39ead41..35cd362c8331 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,9 +1,6 @@
 AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3
-AUX qtdeclarative-5.15.2-gcc11.patch 950 BLAKE2B 06677d7c96c045eef941279f7bd263ad27fee355ce0c394c9c50a0609a024be3da546e38ac44345202845d151da16b119bbf2c99cbc5feff4062f7973f844e94 SHA512 8c6cc7314f4976f84a3232ab006592136fafe94100c4cd463a5ca94c36705072a7fcf7963ba3d316304bd1085b5b8abfe5af028591a6f95dd9b715083db67ebd
 AUX qtdeclarative-5.15.2-riscv-atomic.patch 426 BLAKE2B 163aecf69229482ca4909ff8e618324388f80314520671a254a265e102cdaf3ae25ab9ed64cac25bb4d04377fb110fce3f38f00660efabab5d2ee0b463edd81c SHA512 3450a3e7676b7e56a97771ecbd6c835bdb2f77e4fd0802927b90d5fecc4c55abe5d9ea2d7a576e3668d8f23d838cf7a5dd25ca77cbdad789056c0fe37b9b5a8f
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
 DIST qtdeclarative-5.15.2-1c33a9d0.tar.gz 24342460 BLAKE2B f83d01c9bd28842f53b5bf9e95d1b83738792ae6969309ef702fef2e943a4e886313445c7332a2a5cb72cd99aa5db7520a04a054b16d8065bc03b95cbe14026d SHA512 a1b6ae66c83cc7385c51845f1cbafb55cadd69c121196cd138abc92e964d0bb594ce20267244e4202a9108d92b9bf0f107536774f2a76da71b434692559c1fb4
-DIST qtdeclarative-everywhere-src-5.15.2.tar.xz 21559880 BLAKE2B 07fa82a55f79c081cf3cb713e6b90274f2b2c420eba958042f58989502e2ae572294c4cd02eb73767e87d84c9173fb154e45370c043f6adfc7fb1a93377e2edc SHA512 a084e4ace0d6868668c95f1b62598a7dd0f455bfb0943ac8956802d7041436686f20c7ccdde7d6fd6c4b8173c936dd8600cf3b87bf8575f55514edfbb51111d3
-EBUILD qtdeclarative-5.15.2-r1.ebuild 1369 BLAKE2B fb3857c567472d259b15bdfb2cdf15f9d2b36cf237a8839051e5dcb1d64310a5760ee180c90b3880e68c6f74b38911f7f9aa7cadbfa596a6d88dfbf9f7d8766d SHA512 fe359a279c42693905970ebbacacd69a246b7710e443b82ec12f781ca667fcdc5b4173887fb19c5c1882cd56a4adac98b444216e320a1af1654eb3b312271ae3
-EBUILD qtdeclarative-5.15.2-r12.ebuild 1426 BLAKE2B 1a89658f717f47c0d89bdfe910b11a110209739e40e2386f470c59ae5367bac79ea9b31c966c59055de5bffc30e703dacb0da64a19119a4249a508358ae76df9 SHA512 a9844c3d223afc4dda2bdf2e0b010b52d4f8b16e754fe75bbf2d6400161354637b5bf57ff67234815b7a6ed7de65b71e7507fc521ea56b5d7eb1d8f1fe3983b3
+EBUILD qtdeclarative-5.15.2-r12.ebuild 1424 BLAKE2B 7c22e422e9f11505017285947604fc663e05639b64f839cee4916a3687741233ed8601a922158b0919f2b9ab2836413fb58a2c7ff52a856f9cc963e26cba18f6 SHA512 e5d64299648370cd10502e6da09582cd259d7b82688bd4658eba9033a4dd50c34c984895591a56cfbf527865599459ddc9dd8cc87ed557433db3747434241916
 MISC metadata.xml 701 BLAKE2B f28878770fe3d7abe7d61ef71306a00ea53f3428c4002a76b484f8d99924567a640f8d091e33485bc46b9644ab1dbf34a19a3329e53040419c402ea70a6f33d2 SHA512 31d0a0f10002da589a2130c16548b36a67bc763aee5b3dbcf6b4ef815a2f0a64ee40b185867adbbc910ae99c2916e83104a91a90e0dba0e0a219e20c24674eb9
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch
deleted file mode 100644
index c5dd916912d1..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 543594243ad0006bf4d98998ecfa52b46242f0ed Mon Sep 17 00:00:00 2001
-From: Jeff Law <law@redhat.com>
-Date: Oct 16 2020 21:12:18 +0000
-Subject: Fix missing #include for gcc-11
-
-
-diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp
-index 76daead8..4f707703 100644
---- a/src/qml/jsruntime/qv4regexp.cpp
-+++ b/src/qml/jsruntime/qv4regexp.cpp
-@@ -37,6 +37,7 @@
- **
- ****************************************************************************/
- 
-+#include <limits>
- #include "qv4regexp_p.h"
- #include "qv4engine_p.h"
- #include "qv4scopedvalue_p.h"
-diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h
-index a7e37d19..21c3b465 100644
---- a/src/qmldebug/qqmlprofilerevent_p.h
-+++ b/src/qmldebug/qqmlprofilerevent_p.h
-@@ -40,6 +40,8 @@
- #ifndef QQMLPROFILEREVENT_P_H
- #define QQMLPROFILEREVENT_P_H
- 
-+#include <limits>
-+
- #include "qqmlprofilerclientdefinitions_p.h"
- 
- #include <QtCore/qstring.h>
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r1.ebuild
deleted file mode 100644
index 643829a93cc1..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2009-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="gles2-only +jit localstorage vulkan +widgets"
-
-BDEPEND="${PYTHON_DEPS}"
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=]
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qttest-${PV}
-	localstorage? ( ~dev-qt/qtsql-${PV} )
-	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtchooser
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
-	"${FILESDIR}/${P}-gcc11.patch" # bug 752093
-	"${FILESDIR}/${P}-riscv-atomic.patch" #bug 790689
-)
-
-src_prepare() {
-	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
-
-	qt_use_disable_mod localstorage sql \
-		src/imports/imports.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/qmltest/qmltest.pro \
-		tests/auto/auto.pro \
-		tools/tools.pro \
-		tools/qmlscene/qmlscene.pro \
-		tools/qml/qml.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		-qml-debug
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild
index 6e86ee6070b2..7987361ecfdd 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r12.ebuild
@@ -10,7 +10,7 @@ inherit python-any-r1 qt5-build
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="gles2-only +jit localstorage vulkan +widgets"
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index 0fb8bd7b5005..45bff7df9050 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,5 +1,3 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
 EBUILD qtdiag-5.15.2-r10.ebuild 801 BLAKE2B 3b8ab840db0c237141f5bd01259871bc6771a71b28af609881839ca9c0a1c0f5ce6fedb4d2c764d2f797596ed622ef537932c6b567de5179c12ebe7ad86be1c1 SHA512 b348fcecb778227671c879937ce0da9b62cbb5c8588b44a9d6ddb3e87bdb8109a31a99f3a63fd1f8556d1ba5ad5aa3609457ee9b7430bef208e24f7047d991e1
-EBUILD qtdiag-5.15.2.ebuild 844 BLAKE2B b2fc4783c2910ef62aee3d66404b2c2974afcd0323dba3611c18649bf376e4560531c5d2b209acf9492c179865035939302d2e941dc52712db938dcd162c7891 SHA512 e421c1d18d168e132a99c6ecebd2a8004f1faa3eb9414470ce262995f177c5ce87e4315ef50cac38e39ac9e5f518db72ac39e41880dc30fbd9c841fb216d359d
 MISC metadata.xml 616 BLAKE2B c2e815f14a4c3967140cfeed9d4266b668217994cbdbc58300e3736b428f05449d83ae6ed746bb29debaaa1ab8371a37c054d03395be1f7b66e23c3209449a20 SHA512 8747ad7226372dc06c7e6b44afa0c5cf20a7fb877974c67bf4f599b6ffafff292f3c8a2a80243f6243dcc4c158034dc731451e3af9af8790a302c43ae83907fa
diff --git a/dev-qt/qtdiag/qtdiag-5.15.2.ebuild b/dev-qt/qtdiag/qtdiag-5.15.2.ebuild
deleted file mode 100644
index b0713c09732f..000000000000
--- a/dev-qt/qtdiag/qtdiag-5.15.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
-fi
-
-IUSE="+network +widgets"
-
-COMMON_DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}:5=
-	network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-# TODO: we know it is bogus, figure out how to disable checks, bug 728278
-DEPEND="${COMMON_DEPEND}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-qt/qtchooser
-"
-
-src_prepare() {
-	qt_use_disable_mod network network \
-		src/qtdiag/qtdiag.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/qtdiag/qtdiag.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest
index 6aafea17a342..f831464e29de 100644
--- a/dev-qt/qtgamepad/Manifest
+++ b/dev-qt/qtgamepad/Manifest
@@ -1,4 +1,3 @@
 DIST qtgamepad-everywhere-src-5.15.2.tar.xz 387084 BLAKE2B bced25244afb2f97adb7b05dbe68021923c45083abaeec92ff405a8c65b89910803dcfe28f4982f9d54dacab616b9917c7cd04b475ac7c36e8002bb6cbbc9b6a SHA512 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1
 EBUILD qtgamepad-5.15.2-r1.ebuild 711 BLAKE2B a41760d44e6661082277b38aad6d26b2f8ba489060b58d83b5a68dc4de11dca5cf97a708984e227296cc392e793bf25d790400439cd7351e589bd80aa30b89d2 SHA512 4761581eae4b40756f472e1da1f5e1c9c25eec51896c2d1974d25ee3249f4c25f1d98c56af81ef45cfaaf5162a121d408010808073c64eb19a0783e832a12674
-EBUILD qtgamepad-5.15.2.ebuild 694 BLAKE2B 5dd4717b94e9f59004d45ebbd1874c9efc179cf2bd5f3795aaef22b60265d7588b21a18ef34de0feb430982051dbd42cfdcdc43613f5d5184d6e66a07765f347 SHA512 6832fc14111778b914d687cb4986ef682eeb5c2d8d47d1b2f98c9485260c3e2a5c22ec78b90ee5c9f863e292298b1f46b6f7176b1e9919adbf8bfe3c25e8e48c
 MISC metadata.xml 613 BLAKE2B 02cac703ee9a9083829e963e9bc97424b58a36949b8237157976d9628f9623f806dee434e5eea3b63a1f2a4ac06509a3d0f0cd094590f12cb3b97ee09f9d6cf1 SHA512 9304973708ee729dc06cef8ac5b206a21ada747ca4efb36e2fc21007da61bfaf43947319be20b0ce73411f5eda2d13a4b226503c12b1d094d5f9180e84579432
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.2.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.2.ebuild
deleted file mode 100644
index 4da7b8c4a69c..000000000000
--- a/dev-qt/qtgamepad/qtgamepad-5.15.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Qt module to support gamepad hardware"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-IUSE="evdev qml sdl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[evdev?]
-	evdev? ( virtual/libudev:= )
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-	sdl? ( media-libs/libsdl )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt_use_disable_config evdev evdev \
-		src/plugins/gamepads/gamepads.pro
-
-	qt_use_disable_config sdl sdl2 \
-		src/plugins/gamepads/gamepads.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 22fe147ff09d..e6b3b5cb80f4 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,9 +1,5 @@
 AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff
 AUX qtgui-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
-AUX qtgui-5.15.2-bogus-xcb-util-dep.patch 2685 BLAKE2B d281ae95f88f853cf902438680c73b1660aa0e4df384c1b5b96fcf63d5ccef8f97acda57a077ec1bdf20fef64eca7be8bc1e329f90fd4d59e40b746c394725b4 SHA512 b4a7c65cdca80ec3ea9ee17db2bc07b69cee5da82b11ab6ae32cb7e05b6288e3d3ec8a82d91887e86a96286bea2c5918796131c71c5c5a076577dedd4b82189a
 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtgui-5.15.2-r13.ebuild 3980 BLAKE2B 9182562e9014fc9a9f23aeef08e8bc75445886e8aabff1cb026cce1889de06dfb73478bb500e6396e4283ca16ba7f1252414bc0467339e01d669871bc2e30266 SHA512 bb5ab3d1b598ab09bc979f4f061edbdb96a2122a4be8470f8598de1c152e275153533195977db699cebd91812384a9fc3e61055d824aacc72ca502baf36aeb1a
-EBUILD qtgui-5.15.2-r2.ebuild 4248 BLAKE2B 245ccc465ffa0a68ef3e0811072052511b28ec7b864567545f3bf2c35437a680d260c3f7fc9e44cb770186937fcb9e7641516efa3f485f4c18d486295b6afb56 SHA512 b3ec9c89421bbe6605c1f0b9f97706879274e675306d218975dd24352044850cd543df73c15e85f2e50462bd5c4205fddf45dc2a3bb265c53f4272a0b3521101
+EBUILD qtgui-5.15.2-r13.ebuild 3978 BLAKE2B 7f38984ac52889d62394dc89d9ca9430ae59bc375e14fae9b4865d0e30caf0da36fce27c5af8b436de9a97896d5e53783f46938009f17a08bf04516bacd6fe0b SHA512 e2726a1fa299ae6d09997f49f256ef4346b431eb2eebbaf496094613b448468fd886b6efcb734c089f92945ecdab6e31f2ff92898fd8e74293a7c8cbe1b38f1f
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch b/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch
deleted file mode 100644
index b7f65483fb1b..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 61b07d75f96d4dfb07b485b2a9bd7aed099df987 Mon Sep 17 00:00:00 2001
-From: Liang Qi <liang.qi@qt.io>
-Date: Tue, 1 Dec 2020 08:43:28 +0100
-Subject: [PATCH] Revert "xcb: add xcb-util dependency for xcb-image"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit adc42bebcac764ca8de78578e3a4ac39b621bd09.
-
-adc42beb is wrong, the bug is for static build of qt with static
-xcb. It adds the explicit dependency of xcb-util 0.3.9, which is
-not available on Debian yet.
-
-Task-number: QTBUG-86287
-Fixes: QTBUG-88688
-Change-Id: Iffc821f49bdfcad3f2556951d3677c35a7682266
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-(adapted from commit 92a57e0b016f811876ec1d62328ca8edfe452a3a)
----
- src/gui/configure.json | 14 ++------------
- 1 file changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/src/gui/configure.json b/src/gui/configure.json
-index c8c4864eca6..1f08795c57b 100644
---- a/src/gui/configure.json
-+++ b/src/gui/configure.json
-@@ -601,15 +601,6 @@
-             ],
-             "use": "xcb"
-         },
--        "xcb_util": {
--            "label": "XCB Util >= 0.3.9",
--            "headers": "xcb/xcb_util.h",
--            "sources": [
--                { "type": "pkgConfig", "args": "xcb-util >= 0.3.9" },
--                "-lxcb-util"
--            ],
--            "use": "xcb"
--        },
-         "xcb_image": {
-             "label": "XCB Image >= 0.3.9",
-             "headers": "xcb/xcb_image.h",
-@@ -617,7 +608,7 @@
-                 { "type": "pkgConfig", "args": "xcb-image >= 0.3.9" },
-                 "-lxcb-image"
-             ],
--            "use": "xcb_shm xcb_util xcb"
-+            "use": "xcb_shm xcb"
-         },
-         "xcb_keysyms": {
-             "label": "XCB Keysyms >= 0.3.9",
-@@ -1065,7 +1056,6 @@
-                 "tail": "#undef explicit",
-                 "include": [
-                     "xcb/xcb.h",
--                    "xcb/xcb_util.h",
-                     "xcb/xcb_image.h",
-                     "xcb/xcb_keysyms.h",
-                     "xcb/randr.h",
-@@ -1097,7 +1087,7 @@
-                     "xcb_xkb_get_kbd_by_name_replies_key_names_value_list_sizeof(nullptr, 0, 0, 0, 0, 0, 0, 0, 0);"
-                 ]
-             },
--            "use": "xcb_icccm xcb_util xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xcb"
-+            "use": "xcb_icccm xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xcb"
-         },
-         "x11prefix": {
-             "label": "X11 prefix",
--- 
-2.16.3
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
index 6504f3385425..f7f9b5e7c58a 100644
--- a/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 SLOT=5/${QT5_PV} # bug 707658
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r2.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r2.ebuild
deleted file mode 100644
index 34d58b305ba0..000000000000
--- a/dev-qt/qtgui/qtgui-5.15.2-r2.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-SLOT=5/$(ver_cut 1-3) # bug 707658
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-# TODO: linuxfb
-IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
-	+libinput +png tslib tuio +udev vnc vulkan wayland +X"
-REQUIRED_USE="
-	|| ( eglfs X )
-	accessibility? ( dbus X )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	X? ( gles2-only? ( egl ) )
-"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}:5=
-	dev-util/gtk-update-icon-cache
-	media-libs/fontconfig
-	>=media-libs/freetype-2.6.1:2
-	>=media-libs/harfbuzz-1.6.0:=
-	sys-libs/zlib:=
-	dbus? ( ~dev-qt/qtdbus-${PV} )
-	egl? ( media-libs/mesa[egl] )
-	eglfs? (
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	jpeg? ( virtual/jpeg:0 )
-	libinput? (
-		dev-libs/libinput:=
-		>=x11-libs/libxkbcommon-0.5.0
-	)
-	png? ( media-libs/libpng:0= )
-	tslib? ( >=x11-libs/tslib-1.21 )
-	tuio? ( ~dev-qt/qtnetwork-${PV} )
-	udev? ( virtual/libudev:= )
-	vnc? ( ~dev-qt/qtnetwork-${PV} )
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		>=x11-libs/libxcb-1.12:=[xkb]
-		>=x11-libs/libxkbcommon-0.5.0[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-qt/qtchooser
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-	wayland? ( ~dev-qt/qtwayland-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/qvkgen
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl:egl:
-	eglfs:eglfs:
-	eglfs:eglfs_egldevice:
-	eglfs:eglfs_gbm:
-	evdev:evdev:
-	evdev:mtdev:
-	:fontconfig:
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	!gif:no-gif:
-	gles2-only::OPENGL_ES
-	gles2-only:opengles2:OPENGL_ES_2
-	!:no-gui:
-	:system-harfbuzz:
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib:tslib:
-	udev:libudev:
-	vulkan:vulkan:
-	X:xcb:
-	X:xcb-glx:
-	X:xcb-plugin:
-	X:xcb-render:
-	X:xcb-sm:
-	X:xcb-xlib:
-	X:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-PATCHES=(
-	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
-	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
-	"${FILESDIR}/${P}-bogus-xcb-util-dep.patch" # QTBUG-86287, QTBUG-88688
-	"${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 764038
-)
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
-
-	# egl_x11 is activated when both egl and X are enabled
-	use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
-
-	qt_use_disable_config dbus dbus \
-		src/platformsupport/themes/genericunix/genericunix.pri
-
-	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
-		src/plugins/platforms/platforms.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usex dbus -dbus-linked '')
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(usex eglfs '-gbm -kms' '')
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		$(usex gif '' -no-gif)
-		-gui
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use vulkan)
-		$(qt_use X xcb)
-		$(usex X '-xcb-xlib' '')
-	)
-	if use libinput || use X; then
-		myconf+=( -xkbcommon )
-	fi
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index bd383ba6c1a7..2a47f2157616 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,5 +1,3 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD qthelp-5.15.2-r10.ebuild 702 BLAKE2B 5e546ad17673780e6ffac79da89b37c80011ace1c6b31b3103387bfeddc4576e65825a54d4184cc0f963a2995155842abca19f4d7d35f0862b404ab4cc0743aa SHA512 792ffe7e225c6dce59436f2954b6c682a9741f5204457948a2e223a25b533f2f72a8166eea4da4cfdd775a273cae8440fac35211ba4487faafe6180908f4ad25
-EBUILD qthelp-5.15.2.ebuild 638 BLAKE2B 8333b21d25d777f2e7e2ebec3eda8c9ee440cf3fc7763b16d4246748e4bd937ef0edde019e0b104f86b8087ebb05186922f006b50bb4544afbb7fe5333ba4951 SHA512 6eebcd2844c14d5f9cb2b55f44cfeb8da425829fb7ebad7312d4ef9afaab3522ae1a082411a822c7d77b9dce120518dbd6d39f10e98b3857198c929cbf195720
+EBUILD qthelp-5.15.2-r10.ebuild 700 BLAKE2B 6f0c190fe49227e969e536444e4a431601918e7f01fa0fb551883386b37662fea6b9f3181300b1e5458c9343b9dfd9bc6dbb669d190e3da8f4dc9780bdb8c857 SHA512 fc900fcef47f69b07cb1c49d1180140539370bc6dfb545ce6dc7ac45a008ffb4d8e757f7ce1aaa44d540c7cb494a2fa8ee56540d888f6f398d1792196bf43eb0
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild b/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild
index 752358908948..94ca49f56430 100644
--- a/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qthelp/qthelp-5.15.2.ebuild b/dev-qt/qthelp/qthelp-5.15.2.ebuild
deleted file mode 100644
index c6f472aab2bd..000000000000
--- a/dev-qt/qthelp/qthelp-5.15.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating online documentation into applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtchooser
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/help
-	src/assistant/qcollectiongenerator
-	src/assistant/qhelpgenerator
-)
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index fa2f5632459b..1ebe15e34ec5 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,5 +1,3 @@
 DIST qtimageformats-5.15.2-cb82c743.tar.gz 2366626 BLAKE2B 76edd4d0fc2908d466e4b7f9af1e93c50cae086c1da1144d4b8230d19163e2c43704365e396769d9ba10d48f46b42a1ce793e49686d6757790c32a1c0ff4db2b SHA512 f202f3abcdea0b49ae4f286fd50c1855c8b84d502b89f8350666828c6e29c4fa0bafd72b891513330e2541dc407d298076ffb519a030b4bb50517b5196ff9a3f
-DIST qtimageformats-everywhere-src-5.15.2.tar.xz 1806740 BLAKE2B 11da7926a50c17d5a36259d15a5c7e6af68f9f2e7e26626b7e04a031ae428a8d220daa8fa4461efd4b8db85bcbaa1ccf24b72271f3599c7298a4d1a49c25f9c3 SHA512 3c821fac83b8d6177af256dc1d68aca14ae6d5cbdedb8d8665158ebcec0f6e6fb790b5d210a1aa8b0679ecff60fafd4e5d1387c6954498b41409ea44177e0d7e
-EBUILD qtimageformats-5.15.2-r10.ebuild 745 BLAKE2B 4eed2aec2b17fea3009fe4dc945178f642d58066819dc0291889200be87d68bb680938c959f8982ced16d445ba333e6fa4a2ff162d5ce4252e777af8210929ef SHA512 15b2a3d075ea013d2655c30421bfda58905f12cd1ce5a8fa54bea335af5159dc8cfec7961e939fffba13946df8185bc04b5a0a805b5ecadc3e7c1241d7de37cf
-EBUILD qtimageformats-5.15.2.ebuild 677 BLAKE2B c4c31cdf56a20dc88b7af4040528090da9cd7a5a15b89756037e800c2029ccb869c6effd57afddf039a16e65ad3b2abd348fef90dea165be2078f8fa29fbf439 SHA512 2ad09118bcf970992efc7881429074fa4128af92ca8008cd14242bf09109a78712e5330ed03c494cfc2f8789e7997f57dc3cd09e8dbdb626c0213e4f27db4bef
+EBUILD qtimageformats-5.15.2-r10.ebuild 744 BLAKE2B aa7b49d667c1bc5c9ed3172d461d356d45d889e5aea131b46b10bf7b0c73be6556b0c6609b0df63ddd90040f0d9c2e763158334721b58cdd8fa8fe2fef8edc05 SHA512 71f01383629cdfe6c9181c7c018b7aa6b648529cf9f35cc04bdb18d5c65dcb2e712818b56d17f7fd879989a9ae24adf9abb8819761ca58f16dec08f57b86fa3c
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild
index 2abdd63fcca8..5d58b6ffc55b 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.2.ebuild
deleted file mode 100644
index dc39e71a9b7c..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.15.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="mng"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	media-libs/libwebp:=
-	media-libs/tiff:0
-	mng? ( media-libs/libmng:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	sed -e 's/qtConfig(jasper)/false:/' \
-		-i src/plugins/imageformats/imageformats.pro || die
-	qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 0788150a19fa..2f006e2812de 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,8 +1,4 @@
-AUX qtlocation-5.15.2-qsg-render-thread-crash-1.patch 2445 BLAKE2B 17e043da1710ee64979310b1b37ed1364d9688c62e4a61b68b0f5cb92b0a19b7f00266a571fdfbe164c2d7cd7e9d2aa89424a67af4276b0a9f07a541003399ee SHA512 45124a3607a69d01f63cff705d1ce19e5e996f2b0aa39dc23bb65337c77889775e2d885a39e6fdded7604c4018cbfd3bb3a74b2d46c889f6917dd5aa0b6e753f
-AUX qtlocation-5.15.2-qsg-render-thread-crash-2.patch 5154 BLAKE2B f93fab080a63bbdd3e0fc78667291d4201ca1f93668185adf73f2fd918df02e210cdc367b006dea0275b8f38c1a34372efe796ec3bf11f161f62b421d4a6ec87 SHA512 344660f52eb13981832cbc384beafce79627e0d4c7d54920ec04a302915848a0e069d483f9f6a2005beaba40bf5e540822ecbc96542fccb9fa29f399cc02d3fd
 DIST qtlocation-5.15.2-861e372b.tar.gz 5431120 BLAKE2B c66e81f7e726b53000a0f8a4eafa9a4a6168aa08c89d4d0e2ef11b02e3598fd0b3f30dbd21e6c5436814bb88fa69c96d141b0d0d79f13239ec61396269af089a SHA512 b7cac8cd42185504c6140f1dcd4e8c0c749e3d8f22bf9977e97268e0ad6fbd3733e571a255ab7824eba31e30e707e804b07317f2ec9b7be15a4a5756c78c9e41
-DIST qtlocation-everywhere-src-5.15.2.tar.xz 6556764 BLAKE2B a322f35ece266fff6428da9090f02c0d5749a4750ff0655ef09695f147d88d667b5917335e44d0f8721cc56f425c171fb11d0f34342aff005327518e9c1d6db8 SHA512 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f
 DIST qtlocation-mapboxgl-5.15.2-d3101bbc.tar.gz 3726244 BLAKE2B e571a72e041b80b155eae7d171cee7f996fbe223c8d3337f549ea2a40472fc2da9dd8abf54238f22c1828d467aaf01307a61acecd3aedc4f5f7cabc06f48d830 SHA512 6e38e5ca0b9e17de690af79f4702278bdc933a74561aa135b3e82245df7d795602403048bcc5bce00237f774ce3957540a8bded1a71f8730a08da05dec1f039f
-EBUILD qtlocation-5.15.2-r1.ebuild 1177 BLAKE2B e9c5790ce4fc44188864161a0b7847a7ed3ea644bc63bb68d251a34b23735ee7bf84e66fe7dfd59dbee214c8137d766622920b130b5653fb760378ece611344e SHA512 4b35636ef302f41210086bf92c55db50fd0e93b04f00688b558462b1f2d5bcd81b3e426b18b2e170c4b1b6bb3cfc91014aae6d79a5d5cd609045d4630b7229a2
 EBUILD qtlocation-5.15.2-r10.ebuild 1604 BLAKE2B e03e24a09ce4047332cdc6d65da88ee88d078283867523bde64b8ada59077b65e59cb22cb477065b3766b5fe5fad3f3fb01741e08f745ae54f5b0fd02d720649 SHA512 a34e5276f3a6ac15a20bfb8a5ebc7fbb7bf14d48a085d5a840a126130723c49877f97e3d6690fd734253c41adf8e8fd534a62c760abb9a87a4cdd901b99569c3
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-1.patch b/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-1.patch
deleted file mode 100644
index d4cd0188d1a1..000000000000
--- a/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-1.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 4fe9e0ed027134a833b2243597a2ccd00987b559 Mon Sep 17 00:00:00 2001
-From: Piotr Mikolajczyk <piotr.mikolajczyk@qt.io>
-Date: Tue, 29 Sep 2020 10:41:23 +0200
-Subject: [PATCH] Fix crash when showing Map QML comp. for 2nd+ time
-
-Crash caused by storing pointer to a node that could be deleted elsewhere
-
-Fixes: QTBUG-85260
-Change-Id: I871123322fac84b8bf91e9bab8ecad08e75c2854
-Reviewed-by: Paolo Angelelli <paolo.angelelli.qt@gmail.com>
----
- src/location/labs/qsg/qgeomapobjectqsgsupport.cpp | 29 ++++++++++++++++++++++-
- 1 file changed, 28 insertions(+), 1 deletion(-)
-
-diff --git a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
-index 0e1df8f6c..cd1801305 100644
---- a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
-+++ b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
-@@ -48,7 +48,32 @@ static int findMapObject(QGeoMapObject *o, const QList<MapObject> &list)
-     }
-     return -1;
- }
-+namespace  {
-+bool findNodeInStructure(QSGNode *root, QSGNode *item)
-+{
-+    if (root == nullptr || item == nullptr)
-+        return false;
-+    if (root == item)
-+        return true;
-+    auto currentChild = root->firstChild();
-+    // First check the direct child nodes and if not found let's dive deeper
-+    bool bFound = (item == currentChild);
-+
-+    while (!bFound && currentChild) {
-+        currentChild = currentChild->nextSibling();
-+        bFound = (item == currentChild);
-+    }
- 
-+    if (!bFound) {
-+        currentChild = root->firstChild();
-+        while (!bFound && currentChild) {
-+            bFound = findNodeInStructure(currentChild, item);
-+            currentChild = currentChild->nextSibling();
-+        }
-+    }
-+    return bFound;
-+}
-+}
- bool QGeoMapObjectQSGSupport::createMapObjectImplementation(QGeoMapObject *obj, QGeoMapPrivate *d)
- {
-     QExplicitlySharedDataPointer<QGeoMapObjectPrivate> pimpl =
-@@ -157,9 +182,11 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind
- {
-     if (!root)
-         return;
-+    if (!findNodeInStructure(root, m_mapObjectsRootNode))
-+         m_mapObjectsRootNode = nullptr;
-     if (!m_mapObjectsRootNode) {
-         m_mapObjectsRootNode = new QDeclarativePolygonMapItemPrivateOpenGL::RootNode();
--        root->appendChildNode(m_mapObjectsRootNode);
-+        root->appendChildNode(m_mapObjectsRootNode); // PASSING OWNERSHIP!
-     }
- 
-     m_mapObjectsRootNode->removeAllChildNodes();
--- 
-2.16.3
diff --git a/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-2.patch b/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-2.patch
deleted file mode 100644
index 4bd70b99abbf..000000000000
--- a/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-2.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 861e372b6ad81570d4f496e42fb25a6699b72f2f Mon Sep 17 00:00:00 2001
-From: Piotr Mikolajczyk <piotr.mikolajczyk@qt.io>
-Date: Tue, 3 Nov 2020 11:43:22 +0100
-Subject: [PATCH] Simpler fix to crashing Qml Map appearing 2nd+ time
-
-Previous solution did not take advantage of the QSGNode::OwnedByParent
-flag. Setting this flag to false allows to use parent() property
-to determine if the node has been removed from node tree.
-This amends 4fe9e0ed027134a833b2243597a2ccd00987b559
-
-Fixes: QTBUG-85260
-Change-Id: I705848483d7dc2639dffffa0ff66c682b3fffca0
-Reviewed-by: Andy Shaw <andy.shaw@qt.io>
----
- src/location/labs/qsg/qgeomapobjectqsgsupport.cpp | 40 +++++------------------
- src/location/labs/qsg/qgeomapobjectqsgsupport_p.h |  3 +-
- 2 files changed, 11 insertions(+), 32 deletions(-)
-
-diff --git a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
-index cd1801305..a978573d6 100644
---- a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
-+++ b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
-@@ -48,32 +48,7 @@ static int findMapObject(QGeoMapObject *o, const QList<MapObject> &list)
-     }
-     return -1;
- }
--namespace  {
--bool findNodeInStructure(QSGNode *root, QSGNode *item)
--{
--    if (root == nullptr || item == nullptr)
--        return false;
--    if (root == item)
--        return true;
--    auto currentChild = root->firstChild();
--    // First check the direct child nodes and if not found let's dive deeper
--    bool bFound = (item == currentChild);
--
--    while (!bFound && currentChild) {
--        currentChild = currentChild->nextSibling();
--        bFound = (item == currentChild);
--    }
- 
--    if (!bFound) {
--        currentChild = root->firstChild();
--        while (!bFound && currentChild) {
--            bFound = findNodeInStructure(currentChild, item);
--            currentChild = currentChild->nextSibling();
--        }
--    }
--    return bFound;
--}
--}
- bool QGeoMapObjectQSGSupport::createMapObjectImplementation(QGeoMapObject *obj, QGeoMapPrivate *d)
- {
-     QExplicitlySharedDataPointer<QGeoMapObjectPrivate> pimpl =
-@@ -182,11 +157,14 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind
- {
-     if (!root)
-         return;
--    if (!findNodeInStructure(root, m_mapObjectsRootNode))
--         m_mapObjectsRootNode = nullptr;
-+
-+    if (m_mapObjectsRootNode && m_mapObjectsRootNode->parent())
-+        root->appendChildNode(m_mapObjectsRootNode.get());
-+
-     if (!m_mapObjectsRootNode) {
--        m_mapObjectsRootNode = new QDeclarativePolygonMapItemPrivateOpenGL::RootNode();
--        root->appendChildNode(m_mapObjectsRootNode); // PASSING OWNERSHIP!
-+        m_mapObjectsRootNode = std::make_unique<QDeclarativePolygonMapItemPrivateOpenGL::RootNode>();
-+        root->appendChildNode(m_mapObjectsRootNode.get());
-+        m_mapObjectsRootNode->setFlag(QSGNode::OwnedByParent, false);
-     }
- 
-     m_mapObjectsRootNode->removeAllChildNodes();
-@@ -211,7 +189,7 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind
-         MapObject &mo = m_mapObjects[i];
-         QQSGMapObject *sgo = mo.sgObject;
-         QSGNode *oldNode = mo.qsgNode;
--        mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode, window);
-+        mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode.get(), window);
-         if (Q_UNLIKELY(!mo.qsgNode)) {
-             qWarning() << "updateMapObjectNode for "<<mo.object->type() << " returned NULL";
-         } else if (mo.visibleNode && (mo.visibleNode->visible() != mo.object->visible())) {
-@@ -227,7 +205,7 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind
-         QQSGMapObject *sgo = mo.sgObject;
-         QSGNode *oldNode = mo.qsgNode;
-         sgo->updateGeometry(); // or subtree will be blocked
--        mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode, window);
-+        mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode.get(), window);
-         if (mo.qsgNode) {
-             if (mo.visibleNode && (mo.visibleNode->visible() != mo.object->visible())) {
-                 mo.visibleNode->setVisible(mo.object->visible());
-diff --git a/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h b/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h
-index 1ec966fa9..cbbc09691 100644
---- a/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h
-+++ b/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h
-@@ -59,6 +59,7 @@
- #include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
- #include <QtLocation/private/qdeclarativepolygonmapitem_p_p.h>
- #include <QtCore/qpointer.h>
-+#include <memory>
- 
- QT_BEGIN_NAMESPACE
- struct Q_LOCATION_PRIVATE_EXPORT MapObject {
-@@ -85,7 +86,7 @@ public:
-     QList<MapObject> m_pendingMapObjects;
-     QList<MapObject> m_removedMapObjects;
-     QGeoMap *m_map = nullptr;
--    QDeclarativePolygonMapItemPrivateOpenGL::RootNode *m_mapObjectsRootNode = nullptr;
-+    std::unique_ptr<QDeclarativePolygonMapItemPrivateOpenGL::RootNode> m_mapObjectsRootNode;
- };
- 
- QT_END_NAMESPACE
--- 
-2.16.3
diff --git a/dev-qt/qtlocation/qtlocation-5.15.2-r1.ebuild b/dev-qt/qtlocation/qtlocation-5.15.2-r1.ebuild
deleted file mode 100644
index f1ee8b34f188..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qt5-build
-
-DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~riscv x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	dev-libs/icu:=
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtpositioning-${PV}[qml]
-	~dev-qt/qtsql-${PV}
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	~dev-qt/qtconcurrent-${PV}
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/3rdparty/clipper
-	src/3rdparty/poly2tri
-	src/3rdparty/clip2tri
-	src/3rdparty/mapbox-gl-native
-	src/location
-	src/imports/location
-	src/imports/locationlabs
-	src/plugins/geoservices
-)
-
-PATCHES=( "${FILESDIR}"/${P}-qsg-render-thread-crash-{1,2}.patch ) # QTBUG-85260
-
-src_configure() {
-	# src/plugins/geoservices requires files that are only generated when
-	# qmake is run in the root directory. Bug 633776.
-	mkdir -p "${QT5_BUILD_DIR}"/src/location || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp "${S}"/src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 9dbe86ab140f..dd6fec07efc5 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,5 +1,4 @@
 AUX qtmultimedia-5.15.2-no-qtopengl.patch 445 BLAKE2B 9224c90ef5a57b0da8c5ea5a51eb03d4702824fbb435101d5d9d559bdc4d30ece2de7457ed1bb80ca7f028a0b1a5abfa7436501d5d30c87680fb46707de17f53 SHA512 2f3dbb4dcbcedd01e3d911cf1f665e78dc08b383a5c8f2e17f96072330242e7463e6e403159f90f60b799110371ca923f502619548d5db3fd264af4298e4b587
 DIST qtmultimedia-everywhere-src-5.15.2.tar.xz 3828172 BLAKE2B 6d492abdd563788e601eba8183197863f5ddf0697c8f72939f8d6de8043d0575333bc6effd17182a2b5e2e0a93d6f431054282ad34f4ea0f0a0a67e1502a948d SHA512 be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd
-EBUILD qtmultimedia-5.15.2-r1.ebuild 1505 BLAKE2B 7e9049970a904dbec7accd0db053faa8e6755f93296cc3f2a67ab15b28c35814ab31f218abbbe1f21c0be7bbcee6b13731fa962137ca80597517c0088245586d SHA512 fd943e28d689fea3af9cc1dbbb66fc1c5a101201e2b79bf7be72491038c3e5c33b8628c99334d75a7b2714ca7c0b3de76100023d41eca95ceba3af6b3eab9414
-EBUILD qtmultimedia-5.15.2-r2.ebuild 1557 BLAKE2B 3ccfa55e403dbb4bc31883480fe6b3b1624c0cdc7cb8952e919a5d9c5f88d66efebe68194d52ae6b955fb6f277b7c6ab0112e20306ea69c6edf48888aaa17255 SHA512 5dd6a7ae6693f1e1c86874ece1746497d76ebf69ed7c7b413de7d6d0e0e2509f9457615024ab92f508876b6cd0dfe3ef3695c867d35eee1c8870af118ba3abef
+EBUILD qtmultimedia-5.15.2-r2.ebuild 1555 BLAKE2B 47ef551cb098b7cf6156b4366b1b6d06d316a1e56a3f24a67bd69973d55b272c4ea8d5b68bffdd6c1427440b633ecd640af24bf87a59510922ddbbb8b7bdc0f7 SHA512 bd74236fa946d731b2232c80795f63c939bb19f7543594cdc56b00de82fa790b2bc9f0a88871b486857da8c0c4611fbfe28d2071ed67560184263ae6d94cf46a
 MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r1.ebuild
deleted file mode 100644
index 2ed94944ea31..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	pulseaudio? ( media-sound/pulseaudio[glib] )
-	qml? (
-		=dev-qt/qtdeclarative-${QT5_PV}*
-		gles2-only? ( =dev-qt/qtgui-${QT5_PV}*[egl] )
-		openal? ( media-libs/openal )
-	)
-	widgets? (
-		=dev-qt/qtopengl-${QT5_PV}*
-		=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
-	)
-"
-DEPEND="${RDEPEND}
-	gstreamer? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
-	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
-		src/multimedia/multimedia.pro || die
-
-	qt_use_disable_config openal openal \
-		src/imports/imports.pro
-
-	qt_use_disable_mod qml quick \
-		src/src.pro \
-		src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/gsttools/gsttools.pro \
-		src/plugins/gstreamer/common.pri
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use alsa)
-		$(qt_use gstreamer)
-		$(qt_use pulseaudio)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild
index 08b9b1a9521c..54ae53fe2eed 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index f02663a15713..e4e03f7d449a 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,7 +1,3 @@
-AUX qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch 2104 BLAKE2B 2fdeae57b0751f68273e79edb602b90c96d9a3287dec43c1fb3cf1e3b5cf17ae1570e62bc59b330748938cd1ca2b9326062ee61415114d1f08211235dcdae7a6 SHA512 880cab4279a663e4709f93aedf875f2fd3c17dcfd45fe57aa9b75887fbee981b13ff899d9223a37186f2c93493823ca36d4128500f2943b7ca67e409e6523ed3
 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtnetwork-5.15.2-r11.ebuild 1663 BLAKE2B b4a6516dadb1b9127cf709bc25211459edf322120200e8e31b7bfba17d80ec2f8f92aaf48bdc443f120430bca1d5e68be8b0881f8c592e8ea6449bff30aca971 SHA512 a38ca5907ca1ba04e1cd327ec78540a8e65326e8fbc880340ba1fe9f8b82f4cefcf9ade6f12bf17b525a00b1ee0b44e9dcd23edba473b2ad3444771e2181c89e
-EBUILD qtnetwork-5.15.2-r2.ebuild 1835 BLAKE2B 683c4b2d419a041c89c08975db612d0e2c40d6c1969c7ce77640fd1c3259b39772485d89114fe71ceb7f3232ccb4b9cda9d3e2aded1b62ea8bd191116ef28e39 SHA512 2c58ed1f755b4a2b982534644aab38f0d59017ebc0168b79e77e1b3f6450f922edeff12a54f7701952baff278e02569b5cd41ae960b49b6fe0292b773109d6e4
+EBUILD qtnetwork-5.15.2-r11.ebuild 1661 BLAKE2B 72d1089771b6546c2425872e547420e7c4326af64b21f92b7008633fa36e7cbd0f064a339f486ad7ebcfefac76e136242273b9b902aacac92cd2fc1933a1af15 SHA512 e08756281594e069079dcb3fa2688c93a42a30f3efec0f7cfa1662edfc2bd5b444db75be2f47ac341192d44fef3610692eb76f2cbe048c2a2cb48756c52daa25
 MISC metadata.xml 958 BLAKE2B 7d9b64c45710ec4b80132463178d63563b09fdb7c79f527a84017faa524f6f45f5ff566abea92f8cee5f9c62c7d6bb505d3789520559fd3864f402c18c35f771 SHA512 11948c91b244c607f2cd84c8165db6794be18d0f465ae27ed02086fcc1f8b3755e451b8203f447a05f53437cb04c8e4859de8e077f85360fe87ce846939408c1
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch
deleted file mode 100644
index be2c1f6e1a04..000000000000
--- a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0807f16eb407eaf8a5b34b67602d0a97778d945d Mon Sep 17 00:00:00 2001
-From: =?utf8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
-Date: Fri, 6 Nov 2020 12:51:42 +0100
-Subject: [PATCH] QNAM: Work around QObject finicky orphan cleanup details
-
-Details described in a comment.
-
-Task-number: QTBUG-88063
-Change-Id: I763ecfedf518de97615e04a8eaae0fe1fd784f52
-Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
-(cherry picked from commit 1c6d6cbb62c5e93cbcad2d740c3b0ed01095618c)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- src/network/access/qnetworkreplyhttpimpl.cpp | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
-index 21916f53f15..727c1a0316d 100644
---- a/src/network/access/qnetworkreplyhttpimpl.cpp
-+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
-@@ -808,7 +808,17 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq
- 
-     // For the synchronous HTTP, this is the normal way the delegate gets deleted
-     // For the asynchronous HTTP this is a safety measure, the delegate deletes itself when HTTP is finished
--    QObject::connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater()));
-+    QMetaObject::Connection threadFinishedConnection =
-+            QObject::connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater()));
-+
-+    // QTBUG-88063: When 'delegate' is deleted the connection will be added to 'thread''s orphaned
-+    // connections list. This orphaned list will be cleaned up next time 'thread' emits a signal,
-+    // unfortunately that's the finished signal. It leads to a soft-leak so we do this to disconnect
-+    // it on deletion so that it cleans up the orphan immediately.
-+    QObject::connect(delegate, &QObject::destroyed, delegate, [threadFinishedConnection]() {
-+        if (bool(threadFinishedConnection))
-+            QObject::disconnect(threadFinishedConnection);
-+    });
- 
-     // Set the properties it needs
-     delegate->httpRequest = httpRequest;
--- 
-2.16.3
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
index bc183a01e728..babaf742b4c9 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild
deleted file mode 100644
index 23709c175e8b..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	sys-libs/zlib:=
-	connman? ( ~dev-qt/qtdbus-${PV} )
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	networkmanager? ( ~dev-qt/qtdbus-${PV} )
-	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
-	ssl? (
-		>=dev-libs/openssl-1.1.1:0=[bindist(-)=]
-	)
-"
-RDEPEND="${DEPEND}
-	connman? ( net-misc/connman )
-	networkmanager? ( net-misc/networkmanager )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/network
-	src/plugins/bearer/generic
-)
-
-QT5_GENTOO_CONFIG=(
-	libproxy:libproxy:
-	ssl::SSL
-	ssl::OPENSSL
-	ssl:openssl-linked:LINKED_OPENSSL
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:network
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-QNetworkAccessManager-memleak.patch # QTBUG-88063
-	"${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012
-)
-
-pkg_setup() {
-	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
-	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
-	local myconf=(
-		$(usex connman -dbus-linked '')
-		$(usex gssapi -feature-gssapi -no-feature-gssapi)
-		$(qt_use libproxy)
-		$(usex networkmanager -dbus-linked '')
-		$(qt_use sctp)
-		$(usex ssl -openssl-linked '')
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	# workaround for bug 652650
-	if use ssl; then
-		sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \
-			-i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die
-	fi
-}
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 8dcbc2d7d4a3..cc653433a286 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,6 +1,3 @@
 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtopengl-5.15.2-r1.ebuild 827 BLAKE2B f0cdf498740c5fa109d2700284f5476c85c9dee0bee3708c8777360bab704b88b0d04387523a5a31f246acd40178caca6a17faf60e01c1ce05d19f95ca6e11e5 SHA512 8df750310b2f177a529d36061589756e36cd387fd935174c94e47af5bab79ceec631a3bf7b2d94ec8f3c82048d2b11dcbd47e9c8d9d1ebc873eb0d6f96a2e00d
-EBUILD qtopengl-5.15.2-r11.ebuild 722 BLAKE2B cb6b4fae1d80bdcb46ea24bc1853a8b4de373a6dca3649b32eadabd20c70521e9b9931bd9e2fae71e83c9f79f9db7d22cca94f42233344c3024bde2def8a12e9 SHA512 1d5f8a5c85213699983d03e817a6e0a932d8a758189051fe1bd4d0f3066783e1bca056a866fe7b0f8d263fe628080a4dd91ff39448641249a2ccd98fa612250a
+EBUILD qtopengl-5.15.2-r11.ebuild 720 BLAKE2B 8239d955e885c821f56afab690a27d01dd49313b2df705bc61b6aeaf8fb921d925c7d6c7255a7dd4cf0a667c92204ae659792802bb904a7661da8331d644b5c9 SHA512 0545b133c3a5362300467c59f1094fc74cd70688d6a1b02a797e522f33cb6bc5ea2d36202d8414c7f4e806872e337c821e0ff09a9cd712430aae57ea5eb3b80c
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtopengl/qtopengl-5.15.2-r1.ebuild b/dev-qt/qtopengl/qtopengl-5.15.2-r1.ebuild
deleted file mode 100644
index 916bc3174710..000000000000
--- a/dev-qt/qtopengl/qtopengl-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="gles2-only"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~dev-qt/qtwidgets-${PV}[gles2-only=]
-	!gles2-only? ( virtual/opengl )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/opengl
-)
-
-PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild b/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild
index 340303cebc41..e665ed8dace0 100644
--- a/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild
@@ -11,7 +11,7 @@ inherit qt5-build
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="gles2-only"
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index b9e4b768ea6f..e3e82d20d8c2 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,5 +1,3 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
-EBUILD qtpaths-5.15.2-r10.ebuild 479 BLAKE2B f4ff192c537ae3e38c832386d0f4b9ed79657f2fa0c40e61b112328de6d47eaf2696ff491a19d8083b9ee609333643fc87ca0180e4f53ac2eeb965f03013a0ac SHA512 0c00c1e345f550940d3176c85ded9c9d24ad02bb3d84a2d132bf58840ff43cbd1469963e19e82749f96fe45a78cf3341eff67e99b85106795236353e73286155
-EBUILD qtpaths-5.15.2.ebuild 397 BLAKE2B 2cda259a7a23d11676c72137944b339813b064ad8e61f93b717e276f28d244674c5494046746e4a60cfee876dc85b10067cea3711c56418f231bb77cec53a982 SHA512 47df5c78a84e07d26ad708c300cb2c02cd0cef90b5fc79471be652537dc58cbe9f324b3fbc3c09ce6e384abca73b465abb5919b0bd9a75937eaf709df444a9e2
+EBUILD qtpaths-5.15.2-r10.ebuild 477 BLAKE2B 1c37b6d6dd530f11de42903f7b263f4998e94a89005a128de29cb11e805a0feecd95db1b514945b6c2e3fef3f0b06633e56fb394d8c7dbbb9db3eb2fc2fb02c4 SHA512 f7b8f09e193a234dba405f060447d2e9052f5b6cd28793c6b50c8ee07ace08bb8e08d84231d0a34f447a6ee5a43feab15f220c1da42adfdd047d98369d355d65
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild b/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild
index f1221627b894..1d79d126f610 100644
--- a/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Command line client to QStandardPaths"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtpaths/qtpaths-5.15.2.ebuild b/dev-qt/qtpaths/qtpaths-5.15.2.ebuild
deleted file mode 100644
index ab89b1b991ed..000000000000
--- a/dev-qt/qtpaths/qtpaths-5.15.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Command line client to QStandardPaths"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtchooser
-"
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index 608e0c689a4c..770b84494f25 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,5 +1,3 @@
 DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
-DIST qttools-everywhere-src-5.15.2.tar.xz 8894728 BLAKE2B bbc57c58a43f827cfa04031f12d46d4d660456e4a5feabe17fdbb42126da06ed7031807fe963883d452fd1916330e94fcc66b9e9bb69ee4455a38bf3cbd80f5a SHA512 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b
 EBUILD qtplugininfo-5.15.2-r10.ebuild 432 BLAKE2B ee87e66ebc299d7348a1af578483339ad35dc53cb66cdffc7b380af96b30724631c5b12642f95d7fa9d1de4fba5f4d914e8db1ae237ccf834e99b928671b49d1 SHA512 44c7621a2658a1cb0e4101aba4978ffcd2fa4fa784449ad802b5bbb971407b077a1b58601c94518c24b93a1efcf76080c2a3afccaffa4907389a8052e17381f8
-EBUILD qtplugininfo-5.15.2.ebuild 347 BLAKE2B 27ff111ca6151127fd562c56bfb79b374f2d19137106b703b925ff0925749ff5a18eb411d5905766aef55761235c4dfc08ddfb8f3dae73306cfa3d26e1fef0d4 SHA512 35fb6f758b7aafbcf3c30fda07afdfdd7f25da0ad6d872fc8047074dd532b07553b2a460d1fd966ced4a44569b9db77e071d85a8a0993a4e07b78a6164d47154
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.2.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.2.ebuild
deleted file mode 100644
index 69fcef78f572..000000000000
--- a/dev-qt/qtplugininfo/qtplugininfo-5.15.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 plugin metadata dumper"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtchooser
-"
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 51b12f33703d..e2f9d7dd3eb0 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,6 +1,3 @@
 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtprintsupport-5.15.2-r1.ebuild 935 BLAKE2B 9e0b3c43b40a0613178bf7f982af94fe26bbfbb9206991c302d9de1bcd393cf23184b459630a78f8cd0807c28fee37d32761146c1305037012cb7839cc46253f SHA512 359e813b072edd78d404f0d889120a9b571cdfbd2f34a0b5b194e62da3d262f2769b81503965e83aa22dd6b81821fce60fd880b21d7a45033b451ada58f0ebad
-EBUILD qtprintsupport-5.15.2-r10.ebuild 868 BLAKE2B fe65c7641902c6c1301b807b07e79a7e38c3642e046fed7933d9c1386681ddc3e8314d8bc3d79e000bf27fb598e4f422ceb4bb60d7c227397ab7a8d1f68442b9 SHA512 7262240e023eff99dc75c3ae77f436632159daed144f4a7dd6ca09a0b0ed783bbec673fc78c923b7f9f0806c79fe92ade719ce37ffaf9ea5e5fb6f247a48ef48
+EBUILD qtprintsupport-5.15.2-r10.ebuild 866 BLAKE2B 433f157b58c633db7a96bf6799575b92cfc4b463aa0eef3756adf9e3682500cf2ba187f7d8686420815b61723a39405aacb32a2dd3216364a5841c3d98b79242 SHA512 ef1c0f1e1af368cbafb5fa3d1c15796d24eb9cdddd6dd486c7282e3cd27509a9100f23e6de54979e84ac09e283559a8839bcabd1f4079dfb93653c12261e10aa
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r1.ebuild
deleted file mode 100644
index 6442c1d07e48..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="cups gles2-only"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~dev-qt/qtwidgets-${PV}[gles2-only=]
-	cups? ( >=net-print/cups-1.4 )
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/printsupport
-	src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
-	cups
-)
-
-PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012
-
-src_configure() {
-	local myconf=(
-		$(qt_use cups)
-		-opengl $(usex gles2-only es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild
index eb51bc0eae2b..39e464926b22 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild
@@ -11,7 +11,7 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="cups gles2-only"
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index d0ccfae31222..93acee6204ab 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,5 +1,3 @@
 DIST qtquickcontrols2-5.15.2-be66bf9a.tar.gz 9243427 BLAKE2B 7fcb46a69b8ea5a149f489b8ef6302185976fcf2a1afbcc19a05156647e00e037c9b447d763f0e1055464ece9bef0daa12e1b094d91d61c1a20f06727c232ae2 SHA512 7edfacbab302e3e0492d7bdf2b2b761818104452be95e20d52e2bc2649ca684ffb7e6ce709ed47ef6072b965cd63e7943746b193ec3a959dbb9a5540cc5a7567
-DIST qtquickcontrols2-everywhere-src-5.15.2.tar.xz 8284692 BLAKE2B c5c4550ff75bf655969b8601f36c38a0d5a6c9dbe406bc03d431c133f8f0b83a89098c3a64afa4073e4810ee73016a19e11fde1685732c3a9124ddaa2b21393f SHA512 5af506fd5842c505ae5fbd04fdd2a467c5b6a9547b4cea80c9cf051e9dea49bbf17843d8bc12e69e95810e70119c2843c24171c84e0f5df62dd2f59a39903c8f
 EBUILD qtquickcontrols2-5.15.2-r11.ebuild 695 BLAKE2B 7ec9449ac8f30acd8f8f464909e50101fb9fd15b3535dab61d9739419d1335172fda8791a9bc1a2eca30a497b6e9937f3534ef5bd099bea1a3d8ad3297c97cc4 SHA512 c0317dd97c14333bea2b83970d1b03aec02aa3c7be0a5b64e958f7d33166cf54d8c9b0e496bb0a255f7bc8f98373e4ca3b7235dab8396948785915d36a07cb52
-EBUILD qtquickcontrols2-5.15.2.ebuild 613 BLAKE2B da66e8d09b01a0818ad23e32fd627b955c8cde3a86130c349da5f1ce301036eb2339b48aed95545275b290df55fce18c23598d7ee08e8b7db3cfa3c380e46532 SHA512 d272f73610dd55378ae08e9df01a3ecf59903924ef01c2e05c7d33976ad2655cbf747ca7ff70d8ddbb5b27561be7a37fa1548a536e9103a1068c62b46859b4ef
 MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2.ebuild
deleted file mode 100644
index 10f200644e51..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-
-IUSE="widgets"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}
-	~dev-qt/qtgraphicaleffects-${PV}
-"
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/imports/platform/platform.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 5722412337b3..2e4e4e840233 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,4 +1,3 @@
 DIST qtspeech-everywhere-src-5.15.2.tar.xz 101940 BLAKE2B 0b100fddac7bc880b79914be54a8618e3e31e9a2486e8cd4ab9f65eabaec605d9aba7c66f71569466798b9cc94e97a2e136868a6f8eda3208f9d0a9515e71ac9 SHA512 78a13218a639276c9b253566a1df52e2363847eac76df3962ba2a7178800206beb57859d22c7c99fa1579cb3aa7ab94baed1a6319ba946d4a64cba9e3bf52b05
 EBUILD qtspeech-5.15.2-r1.ebuild 714 BLAKE2B 3dab8c2615c3d412fe02525b2db6831efbc544740c142a487caa09b161c7ae7f33229d325b2806c9bf8d57bec98dc3a6d49971c52cb0f5c24126d584d7e52a3d SHA512 16a689b9ee743e826f518ccd69ea6bc2adbbeac764fe247fe00808e733a78e804c0dcbea1109ca208fbddcfcccaee41a09acab1032738d1acfd228fddfae58bd
-EBUILD qtspeech-5.15.2.ebuild 446 BLAKE2B d8cf7215bbd9c6b02a30ffe0bf0a9ebb13a2a75b5abab9a3ebd73be44284a4a64ada8c752ead883eeb45319a12a325b84ef51a28e4970c10cf78b94fb64c396f SHA512 677c652115cd8bfc1d6a538330900d0da041ebfa4c331687a6ab70457d3055eed85e831da31602ab29c569e9c2aa7b5028b01a82952810e21c01b8411162c52b
 MISC metadata.xml 614 BLAKE2B 93e681cc8d9a330c55a86b22fd190c98c9d834cdf85755c4e61365e288f51fa31854788df2ed2a73aab1736b47f0e7e79f8cb6ec504d74614a0e068d8b783365 SHA512 780dc74110dc359d3764fa7f3a1e4c60f1e05f51cfeb377de8ab043d95c8154535657e46e5f026b66dcc612a1f36e007ae2d531622766518a108bd58407dc2f9
diff --git a/dev-qt/qtspeech/qtspeech-5.15.2.ebuild b/dev-qt/qtspeech/qtspeech-5.15.2.ebuild
deleted file mode 100644
index 8acecdbb1d38..000000000000
--- a/dev-qt/qtspeech/qtspeech-5.15.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Text-to-speech library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-fi
-
-# TODO: flite plugin - needs 2.0.0 (not yet in tree)
-IUSE=""
-
-RDEPEND="
-	>=app-accessibility/speech-dispatcher-0.8.7
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index c2febd9cd28c..d727c52282bc 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,6 +1,3 @@
 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtsql-5.15.2-r1.ebuild 1393 BLAKE2B 36b8a1f0d9aeac4b52438806b083313ac05085a08c05587e968e51a6fa22c42b70b02a20dc0bb358755cd241e080c95cb906df071c0ebc8fb67e649e68622bcd SHA512 bec25ca39a193fcfaf39fc14e98c18623ca12fd35b3eeead00a4dff8664a51af3408c913b988481f68ccd1003c0e718b7dd06125f8808271cf9fb842fc2dbcee
-EBUILD qtsql-5.15.2-r10.ebuild 1302 BLAKE2B 2cf33e12878c1313f8e4f3efef74da46284f914b439ab91bbfe45bee704c23e2d8b45bda306180d7f4047d72a5114784f545ef3cafcba9b4ed8969b4aecd2344 SHA512 698ad4109aa5ec355943c9c9b00b36b538fe265484ba7033b92336db2d8b093705857f55d68d00691e83b60b2ddc3b5ff34fb2a856d70d7f706cad34a80f3f94
+EBUILD qtsql-5.15.2-r10.ebuild 1300 BLAKE2B 7eab82ffaa7105af8a96f41703a436eddd1c4842f82658ab2f2760b375d551623d213f4180d7e365929a5a9ba38381edbcea9d160527955684a96f566d52eaef SHA512 e0145ff510741ca9f94e5396ff4cb26ccd97ae6ac7a4498a04045dbcbddd324741dd48de39a510d20a9cc79d86cf6b8a08483ce84794df7606ea5ba0dd289cee
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsql/qtsql-5.15.2-r1.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r1.ebuild
deleted file mode 100644
index f94643be7b4b..000000000000
--- a/dev-qt/qtsql/qtsql-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-SLOT=5/$(ver_cut 1-3) # bug 639140
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	freetds? ( dev-db/freetds )
-	mysql? ( dev-db/mysql-connector-c:= )
-	oci8? ( dev-db/oracle-instantclient:=[sdk] )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/sql
-	src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:sql
-)
-
-PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012
-
-src_configure() {
-	local myconf=(
-		$(qt_use freetds  sql-tds    plugin)
-		$(qt_use mysql    sql-mysql  plugin)
-		$(qt_use oci8     sql-oci    plugin)
-		$(qt_use odbc     sql-odbc   plugin)
-		$(qt_use postgres sql-psql   plugin)
-		$(qt_use sqlite   sql-sqlite plugin)
-		$(usex sqlite -system-sqlite '')
-	)
-
-	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild
index 20503946883f..7d2229ef0738 100644
--- a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
 SLOT=5/${QT5_PV} # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index bac552eab653..28c7a180a246 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,5 +1,3 @@
 DIST qtsvg-5.15.2-cfc61697.tar.gz 2779382 BLAKE2B cd75575741b05cb1ec1b206d1d338c011c718923339d1cb169f0f537f21931e32042f10574e70b5c64d4fc352dfa56adc8b852dafa5131198630afe6bb806580 SHA512 1f8b52c713b4c6d4974af46ebe6519ea597f72ac0c4b80e061f714ff30449e6fdae94eb9705f3c1b857c5ad0647e5875260ee40051cec78321caf7b944fd3d70
-DIST qtsvg-everywhere-src-5.15.2.tar.xz 1886268 BLAKE2B fee60a9d769e4c8962d084e98cd4c1a958ba926c8b4482f5b60b596a34944576cddfb46c4e04bd4a67cba7dfbdc7e29e61d8b5025cc7d2a1ae063f81eb31a114 SHA512 101e9c8fc05b1bb9c4e869564bff8e5723dd35f0ef557185e56e9dc12fdce74c531522c9642cdff639900eccf7ed0e04bfa48142741259697dded990fb481730
-EBUILD qtsvg-5.15.2-r10.ebuild 537 BLAKE2B f94dbeb0c65d7fec400a5565096cac785d70206aca66dff3ea22a6e317822e60fa567c2585d48409b4d2fc116dd6af9c601a29b85c8e21218d7f57f79354e000 SHA512 70145de58764407eb7baa55a003264b6f67e49b428aeabcdceda380cf4a5ca6215c27a2fa23d0fcaa83427b73df8b6a3f71acc8fc0f0195ed6a677aee20126c9
-EBUILD qtsvg-5.15.2.ebuild 458 BLAKE2B 3fa6e46aac4007ea9782431d2d2e617c759dfad9f213547498491040aec9e02dea2950579a30cdc6dd11c4ecf7cf7917e2adde85cf5acf93ba2c1ab8d9340fcf SHA512 64a55df0f387cfdc90783c82b99de271fbf7daf8e26a6c41f083a0f222b6099c28d2341aee009568f985653fe656c462a0bca2e695bf27be13a8b4edbf74a6a0
+EBUILD qtsvg-5.15.2-r10.ebuild 535 BLAKE2B 142a81cf6475a721e6cc68a2a501acb796b396f09de5b536e792162dce25bea51673adbae48ebbd6c81e7a23d89277b7bb81e2a15b53e5fd924fedcf0e7d7c65 SHA512 e48177a7bfdff31871912304518a6547af3150741157283e040585002a585d9eb14413f3b8efe988d53f54fb869f377c14c81b637f194883c353e6ddd77094db
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild
index 926ce9db4bc3..63798ecf7608 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="SVG rendering library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtsvg/qtsvg-5.15.2.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2.ebuild
deleted file mode 100644
index a93ff6224076..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.15.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtxml-${PV} )
-"
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index a385c4411a6b..3c3da4838072 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,6 +1,3 @@
 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qttest-5.15.2-r1.ebuild 691 BLAKE2B 3852d081c2279581918d42ca0642e73665b33614e8c5b77f779495c2699aad9f6ea433cc9fb7e5b6fc264f19df633d5dcb420c7d11d3a7712ad2c476be86d035 SHA512 ac8cb0afbbac1ebb7be0767d6dc298ae555d2ea4f8a4b7fc49035e7c6d935ce37ab29ad424e17280db95d55b285736210f2ff501cac8bef0458d2f5f338b8419
-EBUILD qttest-5.15.2-r10.ebuild 619 BLAKE2B d913c51170711f5e5c4970ea39fd98b480c7811ab509ca73cbebb496bfb9272c73992109af0c3bd82000c7561caa79a0d6059f53c1c7912fc5d83b9a502eb82f SHA512 1b8739892e13a4e5dcc53a462974381fc35ffbcd8c7f75cf1a08804e047c3ba656a8c8c4374a87407232b29d395c682343a95079e7c1231f9a3adaeb98b146d8
+EBUILD qttest-5.15.2-r10.ebuild 617 BLAKE2B a79896ed74c27f62a712e16c2f8b30af3a3f4aa7c3cfadb019961ae60f0e38d902f822a1d3efb25b891e42e95d46252b199903605f976773b5ad30744b650df2 SHA512 3c377225f31f8873583f49386441723282c8968d1fc1742098bdc96b6ef061940c84ff4f318f233bb4dc9365136de14f01fa54f3876a080b00f3405cf8729dff
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qttest/qttest-5.15.2-r1.ebuild b/dev-qt/qttest/qttest-5.15.2-r1.ebuild
deleted file mode 100644
index dc827fd108a5..000000000000
--- a/dev-qt/qttest/qttest-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Unit testing library for the Qt5 framework"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
-"
-DEPEND="${RDEPEND}
-	test? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtxml-${PV}
-	)
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/testlib
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:testlib
-)
-
-PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012
diff --git a/dev-qt/qttest/qttest-5.15.2-r10.ebuild b/dev-qt/qttest/qttest-5.15.2-r10.ebuild
index 4aedbfe45bbb..8489fbe36c74 100644
--- a/dev-qt/qttest/qttest-5.15.2-r10.ebuild
+++ b/dev-qt/qttest/qttest-5.15.2-r10.ebuild
@@ -11,7 +11,7 @@ inherit qt5-build
 DESCRIPTION="Unit testing library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index c952857f0d21..2ff962b81e8b 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,5 +1,3 @@
 DIST qttranslations-5.15.2-68f420eb.tar.gz 2994506 BLAKE2B a0cdc69f6fc9b455b98658ee386d15346c1c23eeedeb4b7ca9d7cd7b60e7ee06a537a68530d017797683d60485dc38b02144f35f3e3e94c280a00b65a690bf97 SHA512 012e83971a8064d87d0d7ea50e6a9579916974fdaef195f1eea1639673085512bd421ced7abc2550c5b07dad264c861a75cd8ae6d48ac1c5e78f5359ceaa61b4
-DIST qttranslations-everywhere-src-5.15.2.tar.xz 1419504 BLAKE2B 3dd5a007bb42492e8a0e81004c99aaf10d97d3c7a77e952240d1d15c607cf34a246271776ff3bf01ad77fcbfb3966366131f23cba162414b02bbfd6da85505b1 SHA512 483b5d919f43c96a032e610cf6316989e7b859ab177cb2f7cb9bb10ebcddf8c9be8e04ff12db38a317c618d13f88455a4d434c7a1133f453882da4e026dd8cbe
-EBUILD qttranslations-5.15.2-r10.ebuild 443 BLAKE2B 89dad765b4e783f91faf89295f5bc9ea0ab5362ed731427e5e2e7a69ca3b46d71e6f669fdb5863892f8c22dab28831ef65a547bbdd838b3d847be13f069218b9 SHA512 17ba8d9cca9b5a74d9b72271db5f9e7c5f738ab62543b7f43b6a69510f4aa1a9ae73db39ee5e344873d0a69c4e6dda1d1773577be2a6e3cf30629d9c08fd65b3
-EBUILD qttranslations-5.15.2.ebuild 379 BLAKE2B 7f9bc811a3f5669b63609c8ad81039049ac860a79f27378e176a8206e67bdf118754d6ff27a09621a2c951ca9b634234dcd1a8ee13508f1bffd8aa6278d8d6fe SHA512 b1e2c9b0af9d09683b6ffa9e4cafa8b13fb55ed2c14316aa2e8de5836ee8ae1007c23455c8f6a39474668ccb02b788e184184276fc565612415e8b37e47d7db3
+EBUILD qttranslations-5.15.2-r10.ebuild 441 BLAKE2B aa97439b4b527c2d7f8eeb3241ecc1649ce73012cbc6878de3f4af14b0e9c8bed736a7a493610f3e36d2706bb6ef05b62b2c91637eada4c39cb4d89a7aff018e SHA512 86658b6e379b3c1e1fc588629cceda4e77e196cf9b36a12a092e1f3f9872d8d6b607628113405a9aa809d800485f88077291ca2f02171ec3dbb7f71833ccc1e3
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild b/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild
index 5cde6f916d9d..95a06c5982b4 100644
--- a/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Translation files for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-5.15.2.ebuild b/dev-qt/qttranslations/qttranslations-5.15.2.ebuild
deleted file mode 100644
index f7dd842fe29d..000000000000
--- a/dev-qt/qttranslations/qttranslations-5.15.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Translation files for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/linguist-tools-${PV}
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND=""
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index 21c632cc0c99..be1b27c76da1 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,5 +1,3 @@
 DIST qtvirtualkeyboard-5.15.2-353b75b2.tar.gz 13693438 BLAKE2B fc803496c2b56967e6b5d192805fa577072561cc55a891957e47985cec6d4971aa055e2d9d9b2e585d182426ec835f604279f7bf9882fd50ead9c65d29f91e5b SHA512 0152ad3848dd856ca4d3551e4296a68ed3bc7cd8d8dd45655232ca64586c1ce936ee819dff0dc3e2f6779a70f1faf5ae3d3fd2183a69f9313d943c506391b167
-DIST qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz 10955076 BLAKE2B 629068b92f58e825060410c84906edbcb9d83f942f1d4acfc1aab9404eb69e0ffeca0b5ca69a3d4b07033efb80ef161f23474e0a19ae6d9c4efb7698ba0a0d75 SHA512 3ba04d171756a5434424833c5198a23e0df53eeebe9ea542047e094f83f38492d93f901cac67cf7e55aca6a71289ce3c6f5d8ac10a8d051b291155ebb8432016
 EBUILD qtvirtualkeyboard-5.15.2-r11.ebuild 1277 BLAKE2B b07b01567cc68de87595489556fd2ab46a37ecf9f9c7235f742d40c7124bab595dabfe1b981bd165b04bdfabbcc0e6af6f2f7037ea59f7ecfa99fcaa9858ac7b SHA512 dd1787e5a12752a83be8822baa9c5072292f1d51b723ec21201d183e429f3c28c04bc6bd2d186565a5c78a18e0e4e41f453816c492fb2b89514ec1200b86c38f
-EBUILD qtvirtualkeyboard-5.15.2.ebuild 1208 BLAKE2B 9dd8f4af6e11c38e20eed246826c773dc39627d1c94841586124a89002a1fbe89aa948806b1462c0c283d6bdd46d472200ddf87e701da58fb5537bda67cafc22 SHA512 1551e08535a9e02bbd7beac31f6c73ff153f68dba53e4681432962d6a7e4cc2114e3515757fe34f209c1cb14337415ea80acf131751c585d575a5550a7d68723
 MISC metadata.xml 580 BLAKE2B 18223136bcc07b46ab272ff282bcdce54dad6e6d97fe39b5431850a8960992a16eed32a580980748368ff120ea50ada55be823ba1e16950856462979835562fb SHA512 e865c0a030aeffbf270300806f99d1b2ff4ca148b3e1a3a901df25d1193e84d63a99b643da033a469dfbdbc99e559f71addc7671487c92d94e9019e742977020
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2.ebuild
deleted file mode 100644
index ae8a6eafc7ea..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qt5-build
-
-DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-
-# TODO: unbudle libraries for more layouts
-IUSE="handwriting +spell +X"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtsvg-${PV}
-	spell? ( app-text/hunspell:= )
-	X? ( x11-libs/libxcb:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myqmakeargs=(
-		$(usex handwriting CONFIG+=lipi-toolkit '')
-		$(usex spell '' CONFIG+=disable-hunspell)
-		$(usex X '' CONFIG+=disable-desktop)
-		CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \
-			lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \
-			lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \
-			lang-he_IL lang-hi_IN lang-hr_HR lang-hu_HU lang-id_ID \
-			lang-it_IT lang-ms_MY lang-nb_NO lang-nl_NL lang-pl_PL \
-			lang-pt_BR lang-pt_PT lang-ro_RO lang-ru_RU lang-sk_SK \
-			lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \
-			lang-uk_UA lang-vi_VN"
-	)
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 1ba8c0b9ab16..210b16fc1ac5 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,6 +1,3 @@
-AUX qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch 1650 BLAKE2B 37091d2be8194d023af6463130879d6d4649f802539d77b897bca222bfae13761f82213118d41d8dbaef91b63c05ca4ab140cd071e749baf78852287ff522508 SHA512 5a4f287731231fe11e755648aff54bc99f25e3d4bc274eac94511497af9d2d0e287760d52a5f103554e505450ad304f378a5f53ebde9bbf742c8bbc2beab1f09
 DIST qtwayland-5.15.2-efe6edca.tar.gz 829293 BLAKE2B 6ccc5a4e111818cc65855eb4570727f30932bec9a749069550d07332df719eaeec0baf472c025150a32c9c380294f5e9496ad3babd181887a02fc37d1bfd5f2a SHA512 87190cd1ade57c98da972a2f5d48aa0376ccc4bfa589f5832b8a62a63b3eafa6acf88d812ae98c484d4b02878ae2c1986c3759c0ba3f46894c76af713d7b8346
-DIST qtwayland-everywhere-src-5.15.2.tar.xz 564884 BLAKE2B 472effd3e9f3fd5470e0449703a52d45f2fd823770880b5ad15d8bf99196eee5d8511ca2bc9e23df6e27c933551d1853928ba79b4b1e5fa6e53334c54c04a463 SHA512 e8657ed676873da7b949e6a1605d025918a03336af9c68f32741945ec3c71a604def55bb00737ba4d97b91c00d0e2df1a83cdcedcf5795c6b2a1ef2caa21c91c
-EBUILD qtwayland-5.15.2-r1.ebuild 916 BLAKE2B c319d05e9293595a50613e687f2242da18a8b49af854f9c4f46356642472762cd7659d6ec0f3b3c41eedc5d40a631001c88dd6435aae9eb94c32d7ee4233d322 SHA512 ed27a404fe9fa2a9d2ca5216cd017c9fcd2ba40f7d55758a5337ddc9040d3df9d5cc0c3610561551e0b640cd5902cefd2cb978f7e2003fa77aab4e0b57ae59e8
-EBUILD qtwayland-5.15.2-r14.ebuild 949 BLAKE2B c4703e9203a697ae698596120581a8257328ff482b1c667db8d411b92cc4d5d0f1d0f0c6ca2e61d3bec3dcba25c04056d7e1e58e4b11019dc9f5000113e3af4d SHA512 0a0497d18b97a9bd275f1a8dfb66ba9f4c90d5bac83fb386332a67972854c9b8d25dd9ea4eb33608c1ec06cac9953f82f9b07036698d4f0d96620d9ec2298c18
+EBUILD qtwayland-5.15.2-r14.ebuild 947 BLAKE2B 070d7d6ca6b8dde6e64bb8c582b3a946b04a3e308dd63befced14f781fb6b9c0d372ba052ca95451f3ebf9287c238f22302e9e8c254eaeb0044e950721835d78 SHA512 5d688eab3936bf5e83c42343ec0e80b01c390c78026752c53edb3352d5904cd691908748d7a1555e6c5e87aed9d419c4e13bc8e974f4f93441a53f86542c5cbf
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch b/dev-qt/qtwayland/files/qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch
deleted file mode 100644
index 0799cb1a2023..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.15.2-qtwaylandscanner-avoid-dangling-pointers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 735164b5c2a2637a8d53a8803a2401e4ef477ff0 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Fri, 30 Oct 2020 16:55:30 +0200
-Subject: [PATCH] Scanner: Avoid accessing dangling pointers in destroy_func()
-
-Usually, the object associated with the resource gets destroyed in the
-destroy_resource() function.
-
-Therefore, we need to double-check that the object is still alive before
-trying to reset its m_resource.
-
-Pick-to: 5.15
-Change-Id: I26408228f58919db17eb29584a1cbd4a9427d25c
-Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
----
- src/qtwaylandscanner/qtwaylandscanner.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp
-index 1a1f8bf16..450ef519d 100644
---- a/src/qtwaylandscanner/qtwaylandscanner.cpp
-+++ b/src/qtwaylandscanner/qtwaylandscanner.cpp
-@@ -814,7 +814,9 @@ bool Scanner::process()
-             printf("        if (Q_LIKELY(that)) {\n");
-             printf("            that->m_resource_map.remove(resource->client(), resource);\n");
-             printf("            that->%s_destroy_resource(resource);\n", interfaceNameStripped);
--            printf("            if (that->m_resource == resource)\n");
-+            printf("\n");
-+            printf("            that = resource->%s_object;\n", interfaceNameStripped);
-+            printf("            if (that && that->m_resource == resource)\n");
-             printf("                that->m_resource = nullptr;\n");
-             printf("        }\n");
-             printf("        delete resource;\n");
--- 
-2.16.3
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild
deleted file mode 100644
index d042284d7177..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="vulkan X"
-
-DEPEND="
-	>=dev-libs/wayland-1.6.0
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl,libinput,vulkan=]
-	media-libs/mesa[egl]
-	>=x11-libs/libxkbcommon-0.2.0
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		~dev-qt/qtgui-${PV}[-gles2-only]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-qtwaylandscanner-avoid-dangling-pointers.patch )
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
-		$(qt_use X feature-xcomposite-egl)
-		$(qt_use X feature-xcomposite-glx)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild
index 013c7c42593d..3fa36666cf6f 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.2-r14.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wayland platform plugin for Qt"
 SLOT=5/${QT5_PV} # bug 815646
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="vulkan X"
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 0508bdd0437b..9866b3de6757 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -7,7 +7,11 @@ AUX qtwebengine-5.15.2_p20210406-glibc-2.33.patch 5361 BLAKE2B 92ead1bfe2be883e7
 AUX qtwebengine-5.15.2_p20210521-gcc11.patch 3642 BLAKE2B 9b5085dbb201b12c3476bb9fb340a65021718802da545bb34a3bc03a02d11e95cf677497588711ff7f3f297ea4a6b4a882c865f87158e69582f8875bba0b0931 SHA512 fdd8da9d4353ce78f6b2c789422a3deee80e74feed5fcce4c8929b0814a9f21734e31fdbb0388a3f152d380b2eb14508be6f4f9ffeaee5913d299873a94135c2
 AUX qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch 7642 BLAKE2B 3650865736f4fdaa3fcb6146da8607710612a7652053f314ddf21e6a1f9c9acfd48bc26e048091ecb3096705c91529b264198812ceca774754c19911ccbef23e SHA512 f2168d125f5c4e3cb7e1c33924cbef687291e0f172b0f079fb8f8ecf8790247437bdedbb58c3f916ef93e8b991485cc3a14611500212b7b7f5d56c7b55e83941
 AUX qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch 8346 BLAKE2B d305461d127bd95b7bd3be58cb1488212f9af8d934f2519b82416f8a4237238b02f4ed2a7cb9cba7145ae44e48725a28f6f41f9250d052e2a58670724050e825 SHA512 1e99d95459509c58fe185d3b39f9b46b19d5052ea5927254f283de1dacb02cd94a208a72f4bd85517254c933c9990b570fe40e23b4e6ed2067f16be3bc30996c
+AUX qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch 1862 BLAKE2B 023f267ce14a8bbf06faeabd3a1a0b3381a4c5ef823f149d8d4c66e042c5505866f2a22a53e52bea9ccc95b61bbc5080a4743bd6c1c46122d03dda89eedb7088 SHA512 e2f8a516b1db982e7e6b26d52fed94d04b16ab4ce8a3f9dd924790a51ca282cb8d3487c08e47ac3af940581444fe37798420a6c2f8ac65a9ab252d9186a4e7d1
+AUX qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch 2182 BLAKE2B cc19cc0c1242f7193f62a550ceb6358e43fcbdf6f95ddee373a3a775448908d6d0a661c6406e6c7578013a32ae280198263a94804e76c87e99db064dc972db7c SHA512 8890ab95300c148e21315a201ac56d04aca1ccc402e464b6ec1b90a69127a4fa02398893007f98eb40ea78d0abe56d459c34eba3c5cdd1521d4ab567225bced1
 DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
 DIST qtwebengine-5.15.2_p20210824.tar.xz 320214264 BLAKE2B fe611805107822f495e0921de4fc9a8737bd3238a332e03d27421a3fd14dc1417c1d69e9ec5e9f6bf922f98045cbdf9ee2c76621db988c8b1e6e0e90b2c6dc7e SHA512 3a5f9ef45ba488aee601e092d1c4a5f707a854d5b9f0a5e62cb88dcdf280163182abc98b0a55b28591e81e18b5147142d404dcdc92feb61414ce2d4ce0d2dca6
-EBUILD qtwebengine-5.15.2_p20210824-r1.ebuild 7329 BLAKE2B 195c450f0a1fb24cc9ccda3d527944866e5507d9b9eeedb0f5d7d27e477eb1283be4254d931de133b1763704fee5d100d1ec8680ebdcf70425c47e13615374f5 SHA512 2793f9052fc3eb4a8a278486efb5219f50efd615965b6b25cec9656936cfc90e2e37e82df5ac3299981e22d1ec3be7342048834d5df74360d88f5eb94d01fb36
+DIST qtwebengine-5.15.2_p20211015.tar.xz 319006520 BLAKE2B 12224fdbbfbf45bae795bea1b3f1aef51ce016f08cdcd022cb96264de4ee438146d5ad19dbed668abd24ceddfca9f57f6af5ac76c7d81dd867142d3691e8f992 SHA512 b41022d1bc60729b035c8ffde55b3e1d3535b8639f0752749b05625fd1ceb640c4c610722e81f82313237c2b7fa7105a5624da15ef5d88058f8d5b9a642faa67
+EBUILD qtwebengine-5.15.2_p20210824-r1.ebuild 7611 BLAKE2B 6185eeec3020bd8840a3de41b4ac3355e36fac7179c94c0d3bd00af3e858ad0a80fb178e8910c42734fb7977153cb0e93f36826c3f276db2884d9a4abc0c8fa2 SHA512 76b5e299f01ffd7330698137bca10206161f6935b471e7e6149bc5e45d2f26ad39fdae07ca18ebd4a33d978a9af8690ee867e385c06f982b706b0e7aa516eedf
+EBUILD qtwebengine-5.15.2_p20211015.ebuild 7372 BLAKE2B 2cfc948705455426f61e93b8fb4b99952f0534001c2350cd6f17eb2e540fb68161acb7b3a0ad54150d856c02df3b657bd79d0705b219b8180f2cf5678b39de51 SHA512 e1978bf4a50ae2550e2880585ac7727f4ffd1a524f510a3c8d586039bb9e7c4620e2cf0412932085f026ff09b2097c66a505f18a7fbb2af6eeadd165b0d1fe9b
 MISC metadata.xml 1270 BLAKE2B 6ac8693b4a994904a8d7dd5728a0f47679b2b7553750a17fa64a7b8fd8cd74abd54ffbcb7da00d5b43622a67dedb3e3bcc93029bef2872e921e333a24892ca47 SHA512 4675ec29c3d6ac329b177f10b920dcf75ea5ed18a21aee1c500ee28430d85fcaaeac6df28a942c4bdcdf8692196017b1ea456e9f66d129afd1254d7931083eda
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch
new file mode 100644
index 000000000000..61e56d5ae4f5
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch
@@ -0,0 +1,32 @@
+https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/rawhide/f/qtwebengine-harfbuzz.patch
+--- a/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
++++ b/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
+@@ -71,9 +71,9 @@ sk_sp<SkData> SubsetFont(SkTypeface* typeface, const GlyphUsage& usage) {
+   hb_set_t* glyphs =
+       hb_subset_input_glyph_set(input.get());  // Owned by |input|.
+   usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs)));
+-  hb_subset_input_set_retain_gids(input.get(), true);
++  hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS);
+ 
+-  HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get()));
++  HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get()));
+   HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get()));
+   if (!subset_blob)
+     return nullptr;
+--- a/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
+@@ -71,11 +71,10 @@ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData,
+     hb_set_t* glyphs = hb_subset_input_glyph_set(input.get());
+     glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);});
+ 
+-    hb_subset_input_set_retain_gids(input.get(), true);
+     // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
+     // If it isn't known if a font is 'tricky', retain the hints.
+-    hb_subset_input_set_drop_hints(input.get(), false);
+-    HBFace subset(hb_subset(face.get(), input.get()));
++    hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS | HB_SUBSET_FLAGS_NO_HINTING);
++    HBFace subset(hb_subset_or_fail(face.get(), input.get()));
+     HBBlob result(hb_face_reference_blob(subset.get()));
+     return to_data(std::move(result));
+ }
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
new file mode 100644
index 000000000000..b3c2ffb315a5
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
@@ -0,0 +1,79 @@
+Description: Use system lcms2
+Author: Sandro Knauß <hefee@debian.org>
+Origin: Debian
+Forwarded: https://bugreports.qt.io/browse/QTBUG-61746
+Reviewed-by: Sandro Knauß <hefee@debian.org>
+Last-Update: 2021-03-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
+@@ -239,58 +239,19 @@ if (!pdf_use_skia && !pdf_use_skia_paths
+   }
+ }
+ 
+-config("fx_lcms2_warnings") {
+-  visibility = [ ":*" ]
+-  if (is_clang) {
+-    cflags = [
+-      # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this
+-      # library doesn't appear to have this problem.
+-      "-Wno-missing-braces",
+-    ]
+-  }
++import("//build/shim_headers.gni")
++
++shim_headers("lcms2_shim") {
++  root_path = "lcms/include"
++  headers = [
++    "lcms2.h",
++    "lcms2_plugin.h",
++  ]
+ }
+ 
+ source_set("fx_lcms2") {
+-  configs -= [ "//build/config/compiler:chromium_code" ]
+-  configs += [
+-    "//build/config/compiler:no_chromium_code",
+-    "//build/config/sanitizers:cfi_icall_generalize_pointers",
+-    ":pdfium_third_party_config",
+-
+-    # Must be after no_chromium_code for warning flags to be ordered correctly.
+-    ":fx_lcms2_warnings",
+-  ]
+-  sources = [
+-    "lcms/include/lcms2.h",
+-    "lcms/include/lcms2_plugin.h",
+-    "lcms/src/cmsalpha.c",
+-    "lcms/src/cmscam02.c",
+-    "lcms/src/cmscgats.c",
+-    "lcms/src/cmscnvrt.c",
+-    "lcms/src/cmserr.c",
+-    "lcms/src/cmsgamma.c",
+-    "lcms/src/cmsgmt.c",
+-    "lcms/src/cmshalf.c",
+-    "lcms/src/cmsintrp.c",
+-    "lcms/src/cmsio0.c",
+-    "lcms/src/cmsio1.c",
+-    "lcms/src/cmslut.c",
+-    "lcms/src/cmsmd5.c",
+-    "lcms/src/cmsmtrx.c",
+-    "lcms/src/cmsnamed.c",
+-    "lcms/src/cmsopt.c",
+-    "lcms/src/cmspack.c",
+-    "lcms/src/cmspcs.c",
+-    "lcms/src/cmsplugin.c",
+-    "lcms/src/cmsps2.c",
+-    "lcms/src/cmssamp.c",
+-    "lcms/src/cmssm.c",
+-    "lcms/src/cmstypes.c",
+-    "lcms/src/cmsvirt.c",
+-    "lcms/src/cmswtpnt.c",
+-    "lcms/src/cmsxform.c",
+-  ]
+-  deps = [ "../core/fxcrt" ]
++  deps = [ ":lcms2_shim" ]
++  libs = ["lcms2"]
+ }
+ 
+ if (!build_with_chromium) {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
index e3f9df28c79c..b06e54bda94f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
@@ -169,6 +169,13 @@ src_prepare() {
 		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
 	fi
 
+	if has_version ">=media-libs/harfbuzz-3.0.0-r1"; then
+		# We can get away with conditionally applying this with has_version
+		# because we have a := dep on harfbuzz and the subslot changed
+		# at 3.0.0.
+		eapply "${FILESDIR}/qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch"
+	fi
+
 	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
 	qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
 
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211015.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211015.ebuild
new file mode 100644
index 000000000000..af29c22fe435
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211015.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml(+)"
+inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+HOMEPAGE="https://www.qt.io/"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+#	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	if [[ ${PV} == ${QT5_PV}_p* ]]; then
+		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/${P}"
+		QT5_BUILD_DIR="${S}_build"
+	fi
+else
+	EGIT_BRANCH="5.15"
+	EGIT_REPO_URI=(
+		"https://code.qt.io/qt/${QT5_MODULE}.git"
+		"https://github.com/qt/${QT5_MODULE}.git"
+	)
+	inherit git-r3
+fi
+
+# patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"
+
+IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
+REQUIRED_USE="designer? ( widgets )"
+
+RDEPEND="
+	app-arch/snappy:=
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/expat
+	dev-libs/libevent:=
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/re2:=
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtdeclarative-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
+	=dev-qt/qtnetwork-${QT5_PV}*
+	=dev-qt/qtprintsupport-${QT5_PV}*
+	=dev-qt/qtwebchannel-${QT5_PV}*[qml]
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/harfbuzz:=
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libvpx-1.5:=[svc(+)]
+	media-libs/libwebp:=
+	media-libs/opus
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-libs/zlib[minizip]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	alsa? ( media-libs/alsa-lib )
+	designer? ( =dev-qt/designer-${QT5_PV}* )
+	geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
+	kerberos? ( virtual/krb5 )
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( media-video/ffmpeg:0= )
+	system-icu? ( >=dev-libs/icu-69.1:= )
+	widgets? (
+		=dev-qt/qtdeclarative-${QT5_PV}*[widgets]
+		=dev-qt/qtwidgets-${QT5_PV}*
+	)
+"
+DEPEND="${RDEPEND}
+	media-libs/libglvnd
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-util/gperf
+	dev-util/ninja
+	dev-util/re2c
+	net-libs/nodejs[ssl]
+	sys-devel/bison
+	sys-devel/flex
+	ppc64? ( >=dev-util/gn-0.1807 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
+	"${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
+	"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
+	"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
+	"${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
+	"${FILESDIR}/${PN}-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch" # bug 811312
+	"${FILESDIR}/${PN}-5.15.2_p20210824-breakpad-glibc-2.34.patch" # bug 811312
+)
+
+pkg_preinst() {
+	elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
+	elog "additional security fixes from newer versions. Extensive as it is, the"
+	elog "list of backports is impossible to evaluate, but always bound to be behind"
+	elog "Chromium's release schedule."
+	elog "In addition, various online services may deny service based on an outdated"
+	elog "user agent version (and/or other checks). Google is already known to do so."
+	elog
+	elog "tldr: Your web browsing experience will be compromised."
+}
+
+src_unpack() {
+	# bug 307861
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		ewarn
+		ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+		ewarn "You may experience really long compilation times and/or increased memory usage."
+		ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+		ewarn
+	fi
+	eshopts_pop
+
+	case ${QT5_BUILD_TYPE} in
+		live)    git-r3_src_unpack ;&
+		release) default ;;
+	esac
+}
+
+src_prepare() {
+	if [[ ${PV} == ${QT5_PV}_p* ]]; then
+		# This is made from git, and for some reason will fail w/o .git directories.
+		mkdir -p .git src/3rdparty/chromium/.git || die
+	fi
+	# We need to make sure this integrates well into Qt 5.15.2 installation.
+	# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
+	# See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
+	sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die
+
+	# QTBUG-88657 - jumbo-build could still make trouble
+	if ! use jumbo-build; then
+		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
+			src/buildtools/config/common.pri || die
+	fi
+
+	# bug 620444 - ensure local headers are used
+	find "${S}" -type f -name "*.pr[fio]" | \
+		xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
+
+	if use system-icu; then
+		# Sanity check to ensure that bundled copy of ICU is not used.
+		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
+		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
+		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
+		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
+		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
+		local file
+		while read file; do
+			echo "#error This file should not be used!" > "${file}" || die
+		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
+	fi
+
+	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
+	qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
+
+	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
+	qt_use_disable_mod widgets widgets src/src.pro
+
+	qt5-build_src_prepare
+
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	if use ppc64; then
+		einfo "Patching for ppc64le and generating build files"
+		eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
+		pushd src/3rdparty/chromium > /dev/null || die
+		eapply -p0 "${WORKDIR}/${PN}-ppc64le"
+		popd > /dev/null || die
+		pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
+		mkdir -vp source/config/linux/ppc64 || die
+		mkdir -p source/libvpx/test || die
+		touch source/libvpx/test/test.mk || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+	fi
+}
+
+src_configure() {
+	export NINJA_PATH=/usr/bin/ninja
+	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+	local myqmakeargs=(
+		--
+		-no-build-qtpdf
+		-printing-and-pdf
+		-system-opus
+		-system-webp
+		$(qt_use alsa)
+		$(qt_use !bindist proprietary-codecs)
+		$(qt_use geolocation webengine-geolocation)
+		$(qt_use kerberos webengine-kerberos)
+		$(qt_use pulseaudio)
+		$(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
+		$(qt_use system-icu webengine-icu)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	# bug 601472
+	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
+		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+	fi
+}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index c7ea449014a8..eef60c0627ad 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,5 +1,3 @@
 DIST qtwebsockets-5.15.2-e7883bc6.tar.gz 434705 BLAKE2B f8c8fbb0e369ad5ceed40ca62c2a7d6d2cdb3cb74037e9ecb487b0ec31757aae10ed6f61790c566e4431b59585fee423047c4687b41cdfc08e96dd46c2f964b6 SHA512 35b1caed6462083014bbb83c6aa81b441f67da7f0e3813fc47997ca4fecfe5423eaef5dd4ed3c37f42dd311eded0e6b36cce6725c7028047ca21b454ded9257f
-DIST qtwebsockets-everywhere-src-5.15.2.tar.xz 259000 BLAKE2B 1bbc4d5451e70a94b6fb8377a60e43e2fa1aeb0d1224dd04486fcafd7821c3918a887297860e7cfcd18f3afd8dd02a903cf16fb69aeb48a52557af539c79458e SHA512 1b23b79bff4289e785daf51441daaecf6de66ca5a3febfdd8fdb8ce871471bca4faf7663d68b23aaf562b1ebd6e9c8c27b3074f4b93bc9fcd3a0c54f7f79a9c4
-EBUILD qtwebsockets-5.15.2-r10.ebuild 618 BLAKE2B 993d2330acd21c8b20739e8a1fabe5ed419387f9605ad125d73b34020fa544fb68bced4b39e82a2d3ba57d0aa294a8243537fc53b175c37df03ca7bc4cd1a4c6 SHA512 8bee6a4053591699486b1c71806389f319ad81eb139107f4b4f8348d804c7ef84b21cff3e24615be976d2398b7bf8de95dca5848aa0a5cb68af83125d85e0058
-EBUILD qtwebsockets-5.15.2.ebuild 545 BLAKE2B 048aa5d3965f2b03d73cfc0dac6d183419c2dc422f3cc6f8f7e88ce9d916a0995b0aefa1606c3876ee12fc74721fb7bbb60b6e81858042df7fa176c6177ac9d7 SHA512 bf768df2dafbdfe3b866596c5e12d3ab47da1248413e92cd46f032499f5bd2af4911f5d6b2ff8aa7a6fe338304d165a31cc4b27035d925747a85f4002995ee67
+EBUILD qtwebsockets-5.15.2-r10.ebuild 617 BLAKE2B 05ab06a8995f01708e58edbed2cbc158363e226bc04810423bd39fe9538760617da2385d446be907dd98f3a1297a651219259627ecc3667e72183e5a0e9b2918 SHA512 829ca1981fc2b589fc3ea5f9efed6a13fcfcbe0e34d2bfe3bb82246c0d25d24a0113bd9fbe8907657ef9ae656313f88bef761c871077862d54fb76f885250b1b
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild
index 5b6000dbc97c..3430a52d80fd 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.2.ebuild
deleted file mode 100644
index c47cd625b4a2..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="qml +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}[ssl=]
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 671cf8148247..948d58659159 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,6 +1,3 @@
 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtwidgets-5.15.2-r1.ebuild 1188 BLAKE2B 9c2992011433a9f903dc6380f012f07ae16359e6eeb8b765ca2023c8fe46cf7c4e7d83a9959d0e652c8e75555e76abd17a8e1fe3fbc26a5562ff821fce0ec1b9 SHA512 fb7d0ef11ae6a8a1306c1ff86f47946049280a0de772eca84aab5c003eb5adfba9fd1a65881c2645bcf6ced24910646e67fe8ba199d1020b7964ec6e06e75fc9
-EBUILD qtwidgets-5.15.2-r11.ebuild 1231 BLAKE2B 1d24a8a4455c67fd1e26f5941b0bb3fed9213a0e01b51545e6aade9cfdde40a3de8b213842c7221409cf5c7881de257e1cd7e7d3c2c9d1d0e69cc803eadbeed9 SHA512 0d450aebc38408781387c4094e1dbd36bf4e1b1508f9d043e020a249ee0c062342fc0a6f5e8219e1e5b7af70d6aefae4336d8820fb73ea7201bcd5bb521a90b3
+EBUILD qtwidgets-5.15.2-r11.ebuild 1229 BLAKE2B db15e8e2fc22312f35cd0d0fb6645b19fddaaf34f7ad1cc5ce2931e7af8048034da1a58c6942d8a4657fe593b37472478914f92d25557fcab109385d36b8c3da SHA512 5e871f057f18ac4731c7a07033ed6620ae720de346657933b3617275276ad5b65c996560370907993e27775b74cc252b1c9a0e195fe8df22ee5dea223049d0c6
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r1.ebuild
deleted file mode 100644
index 3332a278e385..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2-only gtk +png +X"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}[gles2-only=,png=,X?]
-	gtk? (
-		~dev-qt/qtgui-${PV}[dbus]
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtchooser
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/uic
-	src/widgets
-	src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
-	gtk:gtk3:
-	::widgets
-	!:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:widgets
-)
-
-PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use gtk)
-		-gui
-		$(qt_use png libpng system)
-		-widgets
-		$(qt_use X xcb)
-		$(usex X '-xcb-xlib -xkbcommon' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
index c7862b854eb7..90eb44f61245 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 643c9b79c282..ee100975d8e3 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,6 +1,3 @@
 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtxml-5.15.2-r1.ebuild 646 BLAKE2B 97826addb6a8226423dffb1e2cbbb9ee05e8f036e5969f122cf451f7642822609974d9478106a1e338672658473c746699f5f52ccd3ff6c979b618ecfba3c916 SHA512 bde3c112a69299b9e5f0588f6909b0364b34940b31ef2104d2ee4187f0cc7f7d999724108170d2fc705cabf631eae00145547081c28eefc425a69d992934de91
-EBUILD qtxml-5.15.2-r10.ebuild 569 BLAKE2B a6e6bc471e73d20603a276824a08f6dcac8454a10fd9de2240b2644eee46f632dd4aa7eb91dae3abe6cde0b1e44529f1792985b352aa8462fcd0722af1203470 SHA512 311d2107abad7de950fc17d74fea64989888e3529033fbb16945634ffcc0cd4012242c14fea13b6b855f1caa9c74e35737aab6a19de3f522b79f2d01e4806735
+EBUILD qtxml-5.15.2-r10.ebuild 567 BLAKE2B 72c6b122c77c7fb5e02125cdcdf6e8820b6813cbc6c096afcc52d819b0141a4a8b2238e151209a360931740746bebcbeb75109a36eca04cd579bb9785db48f12 SHA512 c0a87047c69cc6d11a66792697dd3487054882440f08c063c44f474a626e5304ead7adaca096b4ba45b5935d8c2df7a8c250de5d9c1f02094513d2e66415a82f
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtxml/qtxml-5.15.2-r1.ebuild b/dev-qt/qtxml/qtxml-5.15.2-r1.ebuild
deleted file mode 100644
index 16d360c85c55..000000000000
--- a/dev-qt/qtxml/qtxml-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/xml
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:xml
-)
-
-PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012
diff --git a/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild b/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild
index 268662f96c95..23f2c1e9e280 100644
--- a/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild
+++ b/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index e88d0bdf0bfb..7ea0822b2625 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/ament_xmllint/Manifest b/dev-ros/ament_xmllint/Manifest
index 496945f52e01..ffe505282298 100644
--- a/dev-ros/ament_xmllint/Manifest
+++ b/dev-ros/ament_xmllint/Manifest
@@ -5,6 +5,6 @@ DIST ament_lint-0.11.2.tar.gz 265435 BLAKE2B 09545bd029dc692e5393983a3fc9210600c
 EBUILD ament_xmllint-0.10.0.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
 EBUILD ament_xmllint-0.10.1.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
 EBUILD ament_xmllint-0.10.4.ebuild 1086 BLAKE2B 1aa1586f23b93239b69be21b1cca02453b921f28bb635bcffe173b7d5a3c868ddc366841421f906680799692d48e5d3a5763aee6b31120e19b145f115f169301 SHA512 bde5d7c87301bfe9110faa376623048ec98474fcb35ff5a6eb970196149895725d231e47457e4dbd7d1da40fb912b340f44944be83703b3e80b2ecb62b0b258e
-EBUILD ament_xmllint-0.11.2.ebuild 960 BLAKE2B 52e1b8d5670a4e66a148d3388ff51af51b52182a326e658370b0921a3579ee1a838e215e79ab6cc4957510a3477a105116ebf6ca20215e83f19d2a31f795ac3b SHA512 b2b36a86b3e792eed2c0c56302b4ab8cea618b8f4ea5d1571e6e7b7901fc117a3f105f6e00d6eb84127c4aa589247dba87dbe33c6a917adae5ff3d4e3466e0f0
-EBUILD ament_xmllint-9999.ebuild 960 BLAKE2B 52e1b8d5670a4e66a148d3388ff51af51b52182a326e658370b0921a3579ee1a838e215e79ab6cc4957510a3477a105116ebf6ca20215e83f19d2a31f795ac3b SHA512 b2b36a86b3e792eed2c0c56302b4ab8cea618b8f4ea5d1571e6e7b7901fc117a3f105f6e00d6eb84127c4aa589247dba87dbe33c6a917adae5ff3d4e3466e0f0
+EBUILD ament_xmllint-0.11.2.ebuild 961 BLAKE2B f4d6ab40dbf83a55e09daebc96dc2044bb6daa14412bc121b110b8d56b169d79e72081a467b92ef33f4c2dc2589ccfb8c42d4f3d0a5b83ce05aa591a64af5602 SHA512 85a1c8c6d57bacabba8d83d8ffd6890770e7acb29b55e1833bbc8f3ed439bba834c9d76c782edb9f56be31e254e7240693f7e6cf66297176cf817ffb87bd9f9c
+EBUILD ament_xmllint-9999.ebuild 961 BLAKE2B f4d6ab40dbf83a55e09daebc96dc2044bb6daa14412bc121b110b8d56b169d79e72081a467b92ef33f4c2dc2589ccfb8c42d4f3d0a5b83ce05aa591a64af5602 SHA512 85a1c8c6d57bacabba8d83d8ffd6890770e7acb29b55e1833bbc8f3ed439bba834c9d76c782edb9f56be31e254e7240693f7e6cf66297176cf817ffb87bd9f9c
 MISC metadata.xml 331 BLAKE2B ef826875ff734a0a5781b15d3db3ab6876ab5df6b2d3fa600009c0fe533b7d006b0dc61a5ad0b2760a09b3c1c8f7bd57cd5cb61c73a3ce1789fa426806bd712f SHA512 2b5b3a1e5621d206063d1d60c7b824479b20e786f48a857b13a7db789f6b9d590a55f6a17694b4ad20b6d6474c34ffa40d286d6a99bda08a3326b2ffcc41cec5
diff --git a/dev-ros/ament_xmllint/ament_xmllint-0.11.2.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.11.2.ebuild
index 1cd644ad005b..5858bc5b618d 100644
--- a/dev-ros/ament_xmllint/ament_xmllint-0.11.2.ebuild
+++ b/dev-ros/ament_xmllint/ament_xmllint-0.11.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild b/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild
index 1cd644ad005b..5858bc5b618d 100644
--- a/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild
+++ b/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index e79e1d231b27..9ca3bacfa333 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/amq-client/Manifest b/dev-ruby/amq-client/Manifest
index a9b024f6fc7e..e26d653e64da 100644
--- a/dev-ruby/amq-client/Manifest
+++ b/dev-ruby/amq-client/Manifest
@@ -1,3 +1,3 @@
 DIST amq-client-1.0.4.gem 75776 BLAKE2B 10e0b3bb0e1512fbb5a1603c102f4d0ce7745b0a883016ce4f645e0f1468fa0554738e3fc3ac22d695ee77f1b372765bcc19149c47335e766bb90749d8c92b8c SHA512 d0c2acb3c223496f56e75070b6ac5d68317e3cffbe554b0f80c64250de7afe6e62f59b23a2dd634af4c5e17a1927cf09fe8d586541fef9d3dbc66da7779f3467
-EBUILD amq-client-1.0.4.ebuild 979 BLAKE2B d11aa04182b0cc6decda52c0259236950ffa47b4943ac6e8954e4c63094f4ad2797f1ce63ad9e7fe4d0467b6edf3e051713f870828eaebb5355f0b9fdd72ebfe SHA512 f36813ee4df514a876d18b4d5d757b1ec7e20f25c274919d75106616f75a908f88d8eda6fed679f66f0723f075b8d505441b5a3648113e6901c46099de8f5b4d
+EBUILD amq-client-1.0.4-r1.ebuild 953 BLAKE2B 86df6699961e41f8b35ec9ef1c521bd0b4cc15eec84f1abc2a7f82606dfdac064cece8b6ecfa9e3e2e940eec697b5f5ac942ef7dbd6026a0ec85371cd66e0cb0 SHA512 898c8f4a9ea162eea6d60908c93466971878b7be5f0fbd55b4057c58135b189e1c3b74c87236ce5e728b6a72f87b397cfa6a7cb015db1ff2f1d9409569ac27b6
 MISC metadata.xml 347 BLAKE2B d1dfb3b74b878ab417ca41ba08db18dde15c383a779af958ccda62b96c3b5cb37e873195484d47aa2d12c45bd74e16cc351a4a6604a144fdea805ee581fd9104 SHA512 3f32930ae1c4530721660849c4bde2d8836ce2f071de11bba9eb37a288ae9be58ec9df653d6375f86f54a1b7e43036fd72781895fa50824c1bceac686c5447a0
diff --git a/dev-ruby/amq-client/amq-client-1.0.4-r1.ebuild b/dev-ruby/amq-client/amq-client-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..34a9498d3994
--- /dev/null
+++ b/dev-ruby/amq-client/amq-client-1.0.4-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.textile"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fully-featured, low-level AMQP 0.9.1 client"
+HOMEPAGE="https://github.com/ruby-amqp/amq-client"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/amq-protocol-1.2.0 dev-ruby/eventmachine"
+
+ruby_add_bdepend "test? ( dev-ruby/evented-spec )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '7i require "evented-spec"' spec/spec_helper.rb || die
+
+	# Drop integration tests since these require a running AMQP server.
+	rm -rf spec/integration spec/regression/bad_frame_slicing_in_adapters_spec.rb spec/unit/client_spec.rb || die
+}
diff --git a/dev-ruby/amq-client/amq-client-1.0.4.ebuild b/dev-ruby/amq-client/amq-client-1.0.4.ebuild
deleted file mode 100644
index f067e6b6b734..000000000000
--- a/dev-ruby/amq-client/amq-client-1.0.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.textile"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit versionator ruby-fakegem
-
-DESCRIPTION="A fully-featured, low-level AMQP 0.9.1 client"
-HOMEPAGE="https://github.com/ruby-amqp/amq-client"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/amq-protocol-1.2.0 dev-ruby/eventmachine"
-
-ruby_add_bdepend "test? ( dev-ruby/evented-spec )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '7i require "evented-spec"' spec/spec_helper.rb || die
-
-	# Drop integration tests since these require a running AMQP server.
-	rm -rf spec/integration spec/regression/bad_frame_slicing_in_adapters_spec.rb spec/unit/client_spec.rb || die
-}
diff --git a/dev-ruby/amqp/Manifest b/dev-ruby/amqp/Manifest
index e4eb5866673b..b117d5dd1253 100644
--- a/dev-ruby/amqp/Manifest
+++ b/dev-ruby/amqp/Manifest
@@ -1,3 +1,3 @@
 DIST amqp-1.8.0.gem 1175040 BLAKE2B 5c623201a378ecbd501d0f30d31873cfdc47088659d79a89eab21b510cbacad220df0122b3164f543f00a5587b74aab4ffb5d6879f0c30fc06ee17bd55600dcd SHA512 8575b3704cbaab5937a5880858bcc4610ecab4be66b9ef8633c1d49858a95fbb48b1245ba71ebce1b0d31e319cb6f133640097aaa779b8a32282f6d442098e7f
-EBUILD amqp-1.8.0.ebuild 981 BLAKE2B 978e0380e7d9cdfda6ac1ba32c1ae79343c51dd3fcb37650c6387b80dce9638fbcb2615d8866091784da9601d2c21198f31686d939361d174e73637ca1e30a89 SHA512 1e27f05280724b699f7fae7e7f9d1677774a923cfd3962091faa9357893ef81552c03be97d14c851c98d756fb9a0de51e1cb9de4e2f3b36acd8bd4262fdc724e
+EBUILD amqp-1.8.0-r1.ebuild 955 BLAKE2B e7fc4c22d2ec26c86254048a75127dbfc2d6c08bb1c5e30d0dba468373a98ceabd599b284d50236a8a99ffa6a5af5161ad92bd693ac67d237e5a7ffb2fff1478 SHA512 d690b4340baaf2125ac71bd4c8f4bfbd22bf998d05096afd7fec92ea51afe3b2f9d4c8a646fcc11d97dd54b3e13e8096766050bf36d40e555af13a34dc4cf6b9
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/amqp/amqp-1.8.0-r1.ebuild b/dev-ruby/amqp/amqp-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..8dd9260cbc0a
--- /dev/null
+++ b/dev-ruby/amqp/amqp-1.8.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="AMQP client implementation in Ruby/EventMachine"
+HOMEPAGE="http://rubyamqp.info/"
+
+LICENSE="Ruby"
+SLOT="1.4"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/multi_json dev-ruby/evented-spec )"
+ruby_add_rdepend ">=dev-ruby/eventmachine-0.12.4
+	>=dev-ruby/amq-protocol-2.2.0:2"
+
+all_ruby_prepare() {
+	#rm Gemfile || die
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
+
+	# Many specs require a live rabbit server, but only root can start
+	# an instance. Skip these specs for now.
+	rm -rf spec/integration spec/unit/amqp/connection_spec.rb || die
+}
+
+all_ruby_install() {
+	dodoc -r docs examples
+}
diff --git a/dev-ruby/amqp/amqp-1.8.0.ebuild b/dev-ruby/amqp/amqp-1.8.0.ebuild
deleted file mode 100644
index 46e55977b62b..000000000000
--- a/dev-ruby/amqp/amqp-1.8.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit versionator ruby-fakegem
-
-DESCRIPTION="AMQP client implementation in Ruby/EventMachine"
-HOMEPAGE="http://rubyamqp.info/"
-
-LICENSE="Ruby"
-SLOT="1.4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/multi_json dev-ruby/evented-spec )"
-ruby_add_rdepend ">=dev-ruby/eventmachine-0.12.4
-	>=dev-ruby/amq-protocol-2.2.0:2"
-
-all_ruby_prepare() {
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
-
-	# Many specs require a live rabbit server, but only root can start
-	# an instance. Skip these specs for now.
-	rm -rf spec/integration spec/unit/amqp/connection_spec.rb || die
-}
-
-all_ruby_install() {
-	dodoc -r docs examples
-}
diff --git a/dev-ruby/async_sinatra/Manifest b/dev-ruby/async_sinatra/Manifest
index ae7c4fb751c8..59df9df616ae 100644
--- a/dev-ruby/async_sinatra/Manifest
+++ b/dev-ruby/async_sinatra/Manifest
@@ -1,3 +1,3 @@
 DIST async_sinatra-1.3.0-git.tgz 8657 BLAKE2B ba41b01a9ad00794f19273d41cceaf80ae5159e38f93c1907db5fae78d5d2f5d6d583f31ff495722b3a241f7e0d2d91c5b3202fe5a8ff39f500e6ab0e1e0030b SHA512 2975e41557da539e1b6427a43d41811f4e17315c01da8d1141dbdafad68702395bfce011844b8b1db2c24bbf19d09b5e680cd10e039ceaab1263ea66bcb8f9f6
-EBUILD async_sinatra-1.3.0.ebuild 892 BLAKE2B e9d5ca36fd5da96720368cb02768fa4f17d796ce9be5af134cf31b6a1ec6296c7aa221a4b17a38fd8772773f8db2201bc1abf2141acb9adedd1f63cdede42105 SHA512 5acf6e8ae9d8d23081fb8684753ecb43f74836460a97527521b18377158c221001fc14872296b358b3b616e88d39e9e5ffaf962bb89dfd706c669e8e96dd7bc3
+EBUILD async_sinatra-1.3.0-r1.ebuild 862 BLAKE2B 03b2cc6825a55ab878b185396e84d18fea4ba9bec18a11cc73a06d75dc95434b08a3904529870d1cb362a0366073bfc74004cb9f21fc8f77ae4e8bd5bef78214 SHA512 6cf2d71910248eb2183dcccbccddde763e79f2af8f5d6c791907c85dfc471cd7ae5c4a7fb57edec5f9ce7c90638fa4ab7a491f78d8826282c2ad743e9e5bcd43
 MISC metadata.xml 346 BLAKE2B ccbcd131a949f1f04a900dd30d2a33a4076ae335bc1b1fc056e57ed78bcd32f08dbbd5874570bee60b1617bb8b900a872b6b749acae397ffed46e101a7d0b8a8 SHA512 e900b0cf90aba2855d7ea9c5ac63c3a037a24feed5b22ed015b495e1c393f5ccbbfc9a2e57b0bd068307585e6d5d4ab445a07ecb4b46f18ef3225aed24f307ae
diff --git a/dev-ruby/async_sinatra/async_sinatra-1.3.0-r1.ebuild b/dev-ruby/async_sinatra/async_sinatra-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..92ab4d1a64a7
--- /dev/null
+++ b/dev-ruby/async_sinatra/async_sinatra-1.3.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="async_sinatra.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Asynchronous response API for Sinatra and Thin"
+HOMEPAGE="https://github.com/raggi/async_sinatra"
+SRC_URI="https://github.com/raggi/async_sinatra/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/hoe-3.13
+	>=dev-ruby/minitest-5.6:5
+	>=dev-ruby/eventmachine-0.12.11
+	dev-ruby/rake
+	dev-ruby/rack-test
+	)"
+
+ruby_add_rdepend ">=dev-ruby/sinatra-1.3.2
+	>=dev-ruby/rack-1.4.1:*"
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true ${RUBY} -S rake test || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r examples
+}
diff --git a/dev-ruby/async_sinatra/async_sinatra-1.3.0.ebuild b/dev-ruby/async_sinatra/async_sinatra-1.3.0.ebuild
deleted file mode 100644
index ba6570972e51..000000000000
--- a/dev-ruby/async_sinatra/async_sinatra-1.3.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Asynchronous response API for Sinatra and Thin"
-HOMEPAGE="https://github.com/raggi/async_sinatra"
-SRC_URI="https://github.com/raggi/async_sinatra/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/hoe-3.13
-	>=dev-ruby/minitest-5.6:5
-	>=dev-ruby/eventmachine-0.12.11
-	dev-ruby/rake
-	dev-ruby/rack-test
-	)"
-
-ruby_add_rdepend ">=dev-ruby/sinatra-1.3.2
-	>=dev-ruby/rack-1.4.1:*"
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true ${RUBY} -S rake test || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}/
-	doins -r examples
-}
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index efe96210dd50..76d3b8659205 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,9 +1,5 @@
-DIST autoprefixer-rails-10.2.5.0.tar.gz 705265 BLAKE2B e6619cb2498eed46af1e92855e960e74f443c364d5d9c11b839e114bbd97797b90c2f6c6180ae68ba291b0035c1ef24f85d7dadfe07f236c6a611e0fe602bcca SHA512 8b3e80c61735d509e4448887272f2b9304ad1431ad4728a524fc87f096822bd10b6855bd1184943037ba2d10920a0fb1b16d09c8124d023b4edb7e9d1b9fb269
-DIST autoprefixer-rails-10.2.5.1.tar.gz 705267 BLAKE2B 089e4bbd8a2acadd7f07a2b3ea5bfdf77b6e83a35a1fdaf55deadf26a8a2e6ca0777c834c300d75877a38cdb10542dab4661dfcb0008c0cbe54c14741a6390be SHA512 97388b55fa0d3df72525c82c105307cd1bd9009e6bcfe161b218f40e1a6508f9c470b990164cbdb2b3c2cac13dc88628c24c3620f814eccbc5de0407536c84f6
 DIST autoprefixer-rails-10.3.1.0.tar.gz 1357327 BLAKE2B 2071b3a9c5848e06695e32445224f6e101481fac0ca73a23b86d138bfada9f7339bd51031f121ab8b0f614d2ea1ec386cb81dbbcf8f728075b12ff2393c0c8b5 SHA512 fff90cad950228e9d3b61259f26bee26b2fe3cd87557ed81f1235630357204e3cf9ce6cc9439551727d4d62d27f3510c8c2683ab12b05ad11549945f741e5db5
 DIST autoprefixer-rails-9.8.6.5.gem 231936 BLAKE2B 7c702f5484f9aa2318408fb8c5c8866ccf9d3565d3282e43279b9bea875ac3610b26c0ec302b2bed0779dcd46eca12badaa16faba1046585cddcfa3e8b22b51c SHA512 6b7281661fcaf0c17ee258a321f8d18664f2f305172719f76fe1f3ef6b04fa1460c7102946e95153df7ecf5c3ade3bfc8c22d302927f2e2183ef3b0f3ef8d623
-EBUILD autoprefixer-rails-10.2.5.0.ebuild 965 BLAKE2B 1ee9621734150b62a10e40aea20505b164354b87890559d80d15ed0c79eba1239b315b963b4085d36b96f3b881fca9e879626fc1bb1a45e1cc1747b42a14c693 SHA512 c0aae0ed51f6c44dd5f90621ba12214d4215816d782e2697c96b7180108e495bf3193a79d148e341aef8cc28af52797c55820adb526a2e079cc46a6ff76ba8f5
-EBUILD autoprefixer-rails-10.2.5.1.ebuild 963 BLAKE2B b8d133591b1118d2022281c64090dc440f24335e451a6bb550580c5a71f7e5214b030b23f0d0f88868bfcbb9ea124cb259966e5e4d7f866361e1f8f105181cbc SHA512 e832eb928120a75a234637f25b28f7be7f61ba08f25ee90724c0bfca10136dae3d2304468b66d571731b33fc0d5276d415383e67e499dddae82982b74b8fade9
 EBUILD autoprefixer-rails-10.3.1.0.ebuild 956 BLAKE2B ab61a2cd608d5d8f64bfbd4e52903556ee80d5b83277b717e5fd853ea0a163cf46a83934b022dfd5394dae296076019d2b6ba1156711220dd027bf01955ac04d SHA512 b4541812a6e97072489608f041e54e992b65476a44f56e9a9eb71340214ff891bea9c6e4f45a9ae694fdd0221f85311d4797c1c8d9bf89432923e0e79d29ffbe
 EBUILD autoprefixer-rails-9.8.6.5.ebuild 884 BLAKE2B 9cab1081148382ce4444ffcf206d53028180b2562f02e913459ec7ee4710592a0c0360532251884e1e7a0d702cb4dfdf46f097acb9ef4bac9345b92f5318180a SHA512 8e3ec03aeddfced88c758094c3d45f83c2f4e76f12e3e3883e7edcf7933d3ee8219753305a6c46cdba608b4bbbff004905fc41c6c68aa43d1d2ef0f400182491
 MISC metadata.xml 348 BLAKE2B 12e9c7a355924818b5a7325556728b401a1f54ebc3482f9087ed959976038fcc946d976b2a664440cee124fe0962c476c0c1fb34946b040fbe5cbabcd9d63f78 SHA512 cf6112194ed7aa00fbda32165cc0829d338d86cbba4d099147b5b21531a1f6a5acec58647a0960ac9c5540086c1c2ea14a4e8aadb4eb5482431f68b3116ef6e6
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.2.5.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.2.5.0.ebuild
deleted file mode 100644
index 7fa873708685..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.2.5.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-RUBY_FAKEGEM_GEMSPEC="autoprefixer-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-SRC_URI="https://github.com/ai/autoprefixer-rails/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/execjs-2.8.0:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/rails-5.0.0
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/ s:^:#:" \
-		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
-	rm -f spec/rails_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.2.5.1.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.2.5.1.ebuild
deleted file mode 100644
index d0e26f1eaa74..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.2.5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-RUBY_FAKEGEM_GEMSPEC="autoprefixer-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-SRC_URI="https://github.com/ai/autoprefixer-rails/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/rails-5.0.0
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/ s:^:#:" \
-		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
-	rm -f spec/rails_spec.rb || die
-}
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index c525f4b364a6..4bd9c46934d9 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -8,7 +8,7 @@ DIST bundler-2.2.24.gem 391168 BLAKE2B 2b70c476d2f0e400f52bf5d6caf2ad06394c3d7bf
 DIST bundler-2.2.25.gem 391168 BLAKE2B 73a5872a978ed85f39e188c31b051776b8364b69d23fcb6e77a97104199aeaf2cf183702a7145d9db7ce29d93d782b29ca9a3da0d925885a2ce21b240bdd0fb2 SHA512 b52d97ef86164e44e9f02b178ecda5934c459258c55bb2e804e1d053818a1283c260e4c35e872b084e43e5f7d8bc71f13df7154d8d279d6f3aafe347514b1474
 EBUILD bundler-2.1.4.ebuild 930 BLAKE2B d544c059292750ec7a8b094c0070db97757046fef2f966b929eb28669ff297a4e9012560199d313aa7b0090f60ab7a05746eb0f72feb24f0d9248547ef0bee52 SHA512 59bb513b6dbd329255ff208b1fce606ac1f812672c21e92f7c962b5334dd2d3b124ddc9e0dc2d2b3e70fc1d1a8fa659389cdbcb59edaae145f7d25f6a0aa7420
 EBUILD bundler-2.2.17.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
-EBUILD bundler-2.2.18.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
+EBUILD bundler-2.2.18.ebuild 904 BLAKE2B 5dc132ff96e618068a474a08c11a7eab6d4f0f645c0b390ebae293c5c5175b97e11a6d49e9c26da5a7478176e8a60c80c4d2817fcaee97438b16947aa8ab501b SHA512 18d89b36b2c5dd6230bfa11a81de23571a11597e28f233c99418a0e69f92c511222a6b2bdc37086643e6476e4049e5cb4ce16e6e1c1d649237768b29d6265423
 EBUILD bundler-2.2.19.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.20.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.21.ebuild 912 BLAKE2B 4174d8c35153e8ecf844cc7492b9c1680a2ed1baaba0d63f4b120ca516b9962c94bdf6a8b203d7a04704a860c1f24548296fd95c0ba6d0a6d848e5fafe68c7f2 SHA512 2c267c6a6017b2ff21f63b17186479748d5abba28f1291879d998b0e3031f258cfdfb6a752417208a60efeb49dcdd7c0133d090add733e3eaea1722d6718443c
diff --git a/dev-ruby/bundler/bundler-2.2.18.ebuild b/dev-ruby/bundler/bundler-2.2.18.ebuild
index 8256c6960865..d489e8c8abfe 100644
--- a/dev-ruby/bundler/bundler-2.2.18.ebuild
+++ b/dev-ruby/bundler/bundler-2.2.18.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~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 ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/combustion/Manifest b/dev-ruby/combustion/Manifest
index f8522f34ad04..caffa02112a7 100644
--- a/dev-ruby/combustion/Manifest
+++ b/dev-ruby/combustion/Manifest
@@ -1,7 +1,9 @@
 DIST combustion-1.3.0.gem 18944 BLAKE2B 5a6f6f2ffd67ae180d3f34be0501ebb05f5a7e3a008b2588fa7c746c69760201b533fdbbab93df6c97fbeb642b6c3f190605b35fae4cb3c31b0b7b7c16d1fa77 SHA512 32ec2c2ab9b1c6a834cf334b3f41e60e495a9c366e57830fa27bc8554b6eff72e8998d76f4c8e8e2e6d81e6c3574db46edf12a1bff05329cd3bacbea8eeb2a46
 DIST combustion-1.3.1.gem 36864 BLAKE2B 08b0651d33b15ffbf9ee01186f90e7247623a06af3bd9e535f82495d3beb7fb7f0a570bd0f9a2a62233b98fb1f9c91ea1527f59fd747300fc68a8f0054b78ffd SHA512 59f456d29cf0b014b1a87a8996bc596cfc8a7d57a8ca514c726eb26264f35c3075d86b712bc1efa1d154a068afa4d389fd1a3efab44b050f07db5c334d7300f7
 DIST combustion-1.3.2.gem 16384 BLAKE2B 28f0ef03236df58d234739736eeae10d2c310f9598d62c4fc4d29baeb4036f2df8b945be4d7eb362c00fbfdf584004e9d75df013e03cb69dfb3db6fc58b72139 SHA512 e86c3ef6d6b18575b6fe187013f5146f1b6e0cf81b7fbded52b800f21a5488cc0d1b3f78a08b14fe9b61928cc100a6b37cb539289a166164459704ccdb3cbba1
+DIST combustion-1.3.3.gem 16384 BLAKE2B c3af239b8558d17521b9c084cbc9d9fa5fb241f8a618688dd715eae91b89278e2192a72c0a201855461fdd077fb0f2add74817ba0b4e87de1030eb4069372709 SHA512 4a244b70b883ce7ee2f91315a63288f08b667f395b3fca4146a7720bcbf7cd0937f2609d37aaf01ed45359833fe9735e8657f2a7578d068ba4f05b986e834450
 EBUILD combustion-1.3.0.ebuild 477 BLAKE2B 74214bd4490e5335c3a028b5079c241c99b2b6f7ca7b4fc5fe1ca3804939407090c859b2ea1b184a9425e45cdf25c6cfda0cc4c2f3a2f636549c27faa41bfcbe SHA512 890a94d824ab522ed7d9f0db88e1260495ba545866b2b47bc7d175e3f6f910d6a3549d73a404d459c225478f00b2c3897a36176ed4c944e90d5e9ee04671f0ef
 EBUILD combustion-1.3.1.ebuild 477 BLAKE2B 74214bd4490e5335c3a028b5079c241c99b2b6f7ca7b4fc5fe1ca3804939407090c859b2ea1b184a9425e45cdf25c6cfda0cc4c2f3a2f636549c27faa41bfcbe SHA512 890a94d824ab522ed7d9f0db88e1260495ba545866b2b47bc7d175e3f6f910d6a3549d73a404d459c225478f00b2c3897a36176ed4c944e90d5e9ee04671f0ef
 EBUILD combustion-1.3.2.ebuild 470 BLAKE2B d42781755eef439d85d2c798fbcd7b59c1de5d3535bc79bf430e2139b5dfba95d5eb3bf699493f866f847476503001af9e29e74ff65df5d993329115305c077e SHA512 2d3d9550623cb1c8bdd425f3ea8c1f72c883a9360ab43fefdad845ea1f9b49084f477bf715c3525601cb4f72e1b5c238180f0726306d50e6d08b830520330db7
+EBUILD combustion-1.3.3.ebuild 470 BLAKE2B d42781755eef439d85d2c798fbcd7b59c1de5d3535bc79bf430e2139b5dfba95d5eb3bf699493f866f847476503001af9e29e74ff65df5d993329115305c077e SHA512 2d3d9550623cb1c8bdd425f3ea8c1f72c883a9360ab43fefdad845ea1f9b49084f477bf715c3525601cb4f72e1b5c238180f0726306d50e6d08b830520330db7
 MISC metadata.xml 341 BLAKE2B 24a8a04770346789e2cddb31acfe79c81df0f6f3efd65ad78de5e6fbcd12e78f7d1c7568b356ba07b4540545f1a69ccddae1e9e5c6b89056022321f5c62b6bfd SHA512 74bf933e7faf3e48c548d3b46599722a919d2f8a45aa9db59837228d01e252bec5353046b3dda981486ac2e4ad3c6be77cbda9a2ccfa1262c7f7993994697f3d
diff --git a/dev-ruby/combustion/combustion-1.3.3.ebuild b/dev-ruby/combustion/combustion-1.3.3.ebuild
new file mode 100644
index 000000000000..7098a4162651
--- /dev/null
+++ b/dev-ruby/combustion/combustion-1.3.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Elegant Rails Engine Testing"
+HOMEPAGE="https://github.com/pat/combustion"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-3.0.0:*
+	>=dev-ruby/railties-3.0.0:*
+	>=dev-ruby/thor-0.14.6:*
+"
diff --git a/dev-ruby/crack/Manifest b/dev-ruby/crack/Manifest
index e2429bd812fc..93d3c81de935 100644
--- a/dev-ruby/crack/Manifest
+++ b/dev-ruby/crack/Manifest
@@ -1,5 +1,3 @@
-DIST crack-0.4.3.gem 574976 BLAKE2B 4b6f23277ec17a516d06e6e6785889996172b3ec077f022d1a52ab4b8e938b2735abbaecc71288b55654ff09a428c33eb944b627cfdc827ea1f4ddc6289461d9 SHA512 c6577bd86fe2e36b2a37693729da9fc35c5d4deb860ac1873265ccb6fb38056fd76d8c17bb4f779b39f4bc13b9db37c1768433f518c17090ccbb0872a103b386
 DIST crack-0.4.4.tar.gz 586633 BLAKE2B 26e2cda6e9447fb3c9fe02092a6e9d6a8097c7bca6a483a3af42aa8ba491b737bc0dc3ae1936ef8ffb5c5d5cbbed3fde69c9641f05b9e3eb3beab87c375f68fd SHA512 3f86c76718a3c2a65ee11b15434035396c2355a8562bdb642432a659b52c3e811e930318e0dc2df3ff06bd53ac14d0694471e425420ae3b7971f5d4f818bba87
-EBUILD crack-0.4.3-r2.ebuild 1050 BLAKE2B 8406da2d2e30471bce4caf53d77c34b9154cd935b2a3ce23d6ef9bded067fc03e7e11404843ff7b216c06fa2cfca801f311eaede86ec5c7604bdb46156bd93d7 SHA512 e97ebfbf3557a6f51af09bd026a77cddef73322622c258798ddd791eacb9e670ac768b0245c507b989e2436246045879eec1b0ebf6dfbd6f94ed3e7a565fbd6d
 EBUILD crack-0.4.4.ebuild 1098 BLAKE2B 2613611746edd87f9987357e75ae1ff6b9a5db35941980da275d430897a3183d7bfe23d0e9690d7b9fd5466d5f0071357e9f87ed665a403a33c5441712398865 SHA512 9b1020f90c8376af7d02235558ef61bc03eec4a9478c83f4c1540026a14d3ca60830853a107c1a4b3337d3ec14684912004bf8e772c0fd89c30719d86353d98a
 MISC metadata.xml 343 BLAKE2B e98d01493c40195b22fa423e30e512b5f4b5ef08676138f4c5c3b7d18aae166fdc5fbb11ea465370de681fc85ded672dabefe34546f2b3140379984a187399f0 SHA512 44de19ae2a745da9ef90d7300e56efc80f892f0a7173ea6967c1bd079a24d0b50fa5de6eb1565254d7db84b5875679c9e70d2f3a87a60c31c9aa33f7bb4d6616
diff --git a/dev-ruby/crack/crack-0.4.3-r2.ebuild b/dev-ruby/crack/crack-0.4.3-r2.ebuild
deleted file mode 100644
index 23441eda7a0a..000000000000
--- a/dev-ruby/crack/crack-0.4.3-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md History"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Really simple JSON and XML parsing, ripped from Merb and Rails"
-HOMEPAGE="https://github.com/jnunemaker/crack"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-ruby_add_rdepend ">=dev-ruby/safe_yaml-1.0.4-r4"
-
-each_ruby_prepare() {
-	# Remove tests which fail when run by portage but pass when run by hand
-	sed -i -e '/{"regex": \/foo.*\/}/d' test/json_test.rb || die
-	sed -i -e '/{"regex": \/foo.*\/i}/d' test/json_test.rb || die
-	sed -i -e '/{"regex": \/foo.*\/mix}/d' test/json_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Itest -Ilib -e 'Dir["test/*_test.rb"].each { |f| load f }' || die
-}
diff --git a/dev-ruby/delayer-deferred/Manifest b/dev-ruby/delayer-deferred/Manifest
index ecbfef04cfe8..e892f044d65b 100644
--- a/dev-ruby/delayer-deferred/Manifest
+++ b/dev-ruby/delayer-deferred/Manifest
@@ -1,5 +1,3 @@
-DIST delayer-deferred-2.1.3.gem 21504 BLAKE2B c8f44cbb89fd249b6ab708efd923b2cdf3d336a836f75882cced00c3413bf7e0592e19f5e05e327c45b1f5e40f606e07496e09c71e7ac79a479bbf84034971df SHA512 9337a6d9e36cfac58f14e4a08ee97aa675e721a290c4f2ca53c082193470a7303d7256e964a99c4f4729163949c2e054be58bde0b2ee3be397c36f49e2ae6d1f
 DIST delayer-deferred-2.2.0.gem 22016 BLAKE2B 992005fcdd3cb7d7b131e676a1e73f56b64c3316c4c66e984cb8c80c655e98f2fa1a72be34979c11e9f3b7def7de71a74a922e06b6ec8699fc1bc03f2cedf627 SHA512 f285183556d8414db6467cf51a6bb123b2b5db3b517295464e8d0205f25b7bad61ee9364277916e30f0bde4453a7bf4666bd71f0a54faa4506ed8d339507418d
-EBUILD delayer-deferred-2.1.3.ebuild 583 BLAKE2B 77acd6ed64a77a96b35610779ea780960b161daa1ea1b653f76285e2c60d5eb41f7ee2cb9289f5e7dc61cb469d76ed53201275df9f8e2b9893bf06f31861bfdc SHA512 80b50c96c692d9cebe734447c9524567e1d9b1b70133a77b1b8a10c8e36504a5d355d67c2734befe400b2264ea3dfef8f1f9d3cc4922164c2ee082ac3a4ccf9f
-EBUILD delayer-deferred-2.2.0.ebuild 635 BLAKE2B f7270fc3c06dc1be6ca471952503400348f74cf2c6266240259330a927956c32bb88e33749e34c7ae35a8982792eebf13d1447adaf9b0347509029151afdaa7e SHA512 603784a7d627aecfebad6b8339f2868555624d2be3f92c66640fa9c5d36d3f848284eb24e74f0aad309396a2a3136148539c4b71f393109dc5a8fc9efc8eaa92
+EBUILD delayer-deferred-2.2.0.ebuild 628 BLAKE2B d9acfec2658355d52b50d09f748c29399c17f89000747b081484d59976d1cc665b899a76a511facbfb5e14f712a60562fecefdaa1483b411de74efbb39dce09b SHA512 0a66f235a0760f804942f3081a2f4d1264c84f4c7504957726c47919f735fbff1846e36793c4c58edc1cb518596df76fc0cdee4ac83433912d4e8c0404820e4c
 MISC metadata.xml 475 BLAKE2B f56d9541e0c6ad9cc1abb916a66c4fa52db43606331406620b3e2bf667668cd7fa8ab845194655f383ab7ef1e327af6c14df9e645d3fc8f3ba2bd1274542a16e SHA512 3c8dc7a5ffe38fae39d3a97ebb9bfe1407becf36f5d1516fb18e5dd60dfd5c3c8c1b8acb6fa3180cf2b595590d15ba40795ee2b412ba8b2f05e98932b73abede
diff --git a/dev-ruby/delayer-deferred/delayer-deferred-2.1.3.ebuild b/dev-ruby/delayer-deferred/delayer-deferred-2.1.3.ebuild
deleted file mode 100644
index 0c793ee5ecce..000000000000
--- a/dev-ruby/delayer-deferred/delayer-deferred-2.1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby implementation of JSDeferred"
-HOMEPAGE="https://github.com/toshia/delayer-deferred"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/delayer:1"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/helper.rb || die
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/helper.rb || die
-}
diff --git a/dev-ruby/delayer-deferred/delayer-deferred-2.2.0.ebuild b/dev-ruby/delayer-deferred/delayer-deferred-2.2.0.ebuild
index 1010d675f3c4..d41478ccd059 100644
--- a/dev-ruby/delayer-deferred/delayer-deferred-2.2.0.ebuild
+++ b/dev-ruby/delayer-deferred/delayer-deferred-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/diva/Manifest b/dev-ruby/diva/Manifest
index 7993622d57c7..da6133432564 100644
--- a/dev-ruby/diva/Manifest
+++ b/dev-ruby/diva/Manifest
@@ -1,3 +1,5 @@
 DIST diva-1.0.2.tar.gz 13638 BLAKE2B 461e8487e06749d0482b86fd30945dc83d53daea06750628839c899b6f8d419599c9cc322b62f58d3eb956a2a99a3674dd591c4bb2fc5483bd1853bc40154634 SHA512 b60d80ca55c98a2f6fcf269aa4a2188f2239b871b0e77f328490d5924a6d0e6801c67d0eef4de28b584303f38bed3752a3ceb2c1e4f2c7d17be13dad03c643b5
+DIST diva-1.1.0.tar.gz 15859 BLAKE2B 58e9ca4d9f1b8f4fb3a75cb16437d565fc99a358ce20017a6b6a6a3c505fcc07347141b51b450c8d6eb34869ad5e1040f62e8e92188736799e4d96280194cb05 SHA512 1d53618b11ab49e8c4837ea23326a8c428f1c098e1c3b6e3c3850d7d978dd5fde5a5e23287fa3eb890fbc5c9f0c5609fe92c0368ac72c6fdfbe30dca4df68de9
 EBUILD diva-1.0.2-r2.ebuild 750 BLAKE2B e1deda7cfbf138cc7c0b327b9e3bf0c658643cb215acf707cae29748a5f298925fc6ae626222f3dc2cd89f2ec5b2c0cfccbbf0e790ee496f266a455d3b05d066 SHA512 15a00e0f5c345774e5104f4c1e2e3712abe1b39ce96c90de7e5352583fb732750caf6127b8d581f0b6c13e2f77df7b134e855fade714caca277f5d85cb5da93b
+EBUILD diva-1.1.0.ebuild 800 BLAKE2B 7c9070213d20e1e279efc2661e76b71fe10a7ac17305211684b6e34465f589c05e6a66dfced8e54c4d58080facc6a30e957d43c66df8b5206afafb86472f2b89 SHA512 939a5ac6bb4d41c7cef6a2773f3eaf523ed360b3f886b4c2f70f3c627799d85cecfa204260111339c6d088a349cfb623c0cbd334f0d73f9cc923bdc485e71977
 MISC metadata.xml 400 BLAKE2B e0de077552a499762abecd6f5cec04bb3db90f8ed1ac57917cdc4851c73e09e42fadd1b313406a9d9eb7540e96ee2dedfdf19e5b2235f3c2ff17ca9bc3012012 SHA512 cd4c433ac7030c35b32e0b5a6e40d44eaa84fd6535c6da52399f762ef644903fc651e91c040525e5a5715c80a9e2ce54f245dd7b93783eb90d29b28a8c4b9ab1
diff --git a/dev-ruby/diva/diva-1.1.0.ebuild b/dev-ruby/diva/diva-1.1.0.ebuild
new file mode 100644
index 000000000000..6aa6cce3d0a3
--- /dev/null
+++ b/dev-ruby/diva/diva-1.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implementation of expression for handling things."
+HOMEPAGE="https://github.com/toshia/diva https://rubygems.org/gems/diva"
+SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/addressable-2.9"
+ruby_add_bdepend "test? ( dev-ruby/simplecov )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/addressable/ s/2.8/2.9/' -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest
index 77de7ce674cf..aa8618ca2ec9 100644
--- a/dev-ruby/dnsruby/Manifest
+++ b/dev-ruby/dnsruby/Manifest
@@ -1,5 +1,5 @@
 DIST dnsruby-1.61.3.gem 259584 BLAKE2B 578d6f2b693de5007d4d15350a4fc6cb948f9e16ee9b0bb511e6b6dc92cf828d30e645522b834a6d42af5dd94b85f0675332b2363e0c2ba3b97c9b35b73bd82f SHA512 4cdf6d83c39c3209873e9bbd15ba33f851f3fb878cf746de98cf615b0f547dfc5af8b4be7d505f87f581755ff73de079b6ea3f6f8c5a11074c1c46d5bc9e8c07
 DIST dnsruby-1.61.7.gem 261632 BLAKE2B 28accc37bc8ca99ca348acea3ead30079f72deeff39d31b323344b758b874fca23f65ea7b6f8f8c780d74de491875b0e4a11354af14b5064cf7aa329a7a94a4f SHA512 454378b7eca03483533ca1c1e01a86361c20ce88971ecc6adc72e11bb9ef03709ea1332d2549eefc1c41ed13d5a752b1a7f76e2117ffc9076776663ab6e02d1f
 EBUILD dnsruby-1.61.3.ebuild 846 BLAKE2B 83d74ee2270400ce80dab80080347ac666fa93e7e09daedcde22c11454feae702f2fcfbd70d9eeed7a5c47152e5dae16d431165cc5c334ed7e4b8a500433bb69 SHA512 9296d7e6206d0d3fd93ea534be6a9514744067c2b05c1ea957ef15ec9de2fe0d2966dcf570f9ba4a028a5cd8497e27bc9e3bab22b2b8c55e720890e4178000d7
-EBUILD dnsruby-1.61.7.ebuild 839 BLAKE2B 3327168be71319baa6c6397aa6e1cab35c3fe123f6361331ea0cf818bd3e6e21846f8fe3692cc918d6a200b33e1eadb533da69a9ec3b9945e3fd7faf56c3ee99 SHA512 dadb080f7f6366d88b9ec67a3f9330854a908989b5d13d60ac58f5d5ac3f1c941b16720ffb8981b8b402150d9ccb578ae20d8776f0269dc3a6f34b3125b647e4
+EBUILD dnsruby-1.61.7.ebuild 844 BLAKE2B c7717b55905d00df0e0d8c11d4334db6699a0becdc233f1d5c8896d875ae28673e1c3ac535458c70334bde64c9fc06fbbde49355f178026d83107eabb6dd13d6 SHA512 547d5f4c4227f519366142e6321bf147c7ed606dff7f3f5e3885ee630020712dee1652a86b636bead2b0cc66bb1279dcb5d763f2dbd447274ccb3294e09ee8d6
 MISC metadata.xml 414 BLAKE2B c4ccb95f7844c4f0ec41dda18d5b80f8972d3f81fc571fea8feeb15ed8c0284358fa180248f2536ee0cb518bc6d48a992305eb9b1c032dcde79d25f13b6ecdc1 SHA512 e4fae933534b8a4988d008dbf8be50cd2675eb9142108c85b4c0fe4b0a06b5f553827773e08f58a09371a0cd44623c7c86c7c93fda34899614ff5b513cc33e54
diff --git a/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild b/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild
index 93a08659a392..838329b05dfa 100644
--- a/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild
+++ b/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild
@@ -13,7 +13,7 @@ inherit ruby-fakegem
 DESCRIPTION="A pure Ruby DNS client library"
 HOMEPAGE="https://github.com/alexdalitz/dnsruby"
 
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/domain_name/Manifest b/dev-ruby/domain_name/Manifest
index d7429ceef8b6..17f17dbd8867 100644
--- a/dev-ruby/domain_name/Manifest
+++ b/dev-ruby/domain_name/Manifest
@@ -1,3 +1,3 @@
 DIST domain_name-0.5.20190701.gem 131072 BLAKE2B 86ee60824d9480e71535312fb72c192f3d88326c72539b833132872ff15298842f09bac612e9c3d8b87a3ef6a60459b14e777105613fd76da79757d6a30abcbc SHA512 445f0e8a377bb700f8a3b926970f4351d28759e237947d6c755afff52726141c6b821b43b2a761d4d0d6237969304ef749404a5f383f69710b04803410dc70aa
-EBUILD domain_name-0.5.20190701.ebuild 1085 BLAKE2B 16f17520a54cff4f06c5384167d3c92eab5119c9648272b2d2e48c2bc7a4dab90df6d328e89ef0082ce6aaec1e362aec2c92ce6234d6f91086511d097cd8448b SHA512 3b2420fed82ffa8f6c3e0946adbbe85f7b80c8b54f29e39e39aa09f46666f7dc30e2919ee1fb4e7b93912f1bb04f639d33875d506e667b40783ddb80fb85aa1c
+EBUILD domain_name-0.5.20190701.ebuild 1085 BLAKE2B d9f86fa95e9f04c08f66aa26c529de89cdf1182cbb93e8bf2fe4fdf700e280e5ab3adc07c2ee83e5f7ea31ad74f547eccd7c073de0aad3e4a454f9038cd8e1c2 SHA512 ad88efa15a2c47550a42cf8de12b551329c7460fdc6893874477e23b83153074f1ef5815e38c7d4b7a0f11fe90211f0f218c534b57c9dd921b3e01c8426994ff
 MISC metadata.xml 347 BLAKE2B 3317da08cd7700ed10004bff1dbf71a979dfe0894bb39c67af80d0b83d5fe19fd0f8be96d855adfad6ee39e331c8d6600872dc9be3ce526d05065a1446b7f7ef SHA512 bb716928ee6cfc1b3e1c6e5d06b1271a728085b1556430014d47d0129881c6740c64f0c3f76835dc672d53eec1cfe6866d8400b32ce6879f610be00b76bfe534
diff --git a/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild b/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
index e42b34d3b96e..dcc7ab1c61ba 100644
--- a/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/em-websocket/Manifest b/dev-ruby/em-websocket/Manifest
index 863a5412a1e1..40fc6b6d8338 100644
--- a/dev-ruby/em-websocket/Manifest
+++ b/dev-ruby/em-websocket/Manifest
@@ -1,3 +1,3 @@
 DIST em-websocket-0.5.2.tar.gz 29367 BLAKE2B 91d41044e20f1f8277527205e3ee6671de2a1fb9b433c18d5b48a166c7cfa53c6553e32b726326f126981f0e014625075bc918b71e00bd8a6919670c370b6cab SHA512 46df705e2af93082884c7ca521df4f6cf33309c441eb3ba96be609b2cf280e3b72c689810d55279db6dbbc178ed843d64ccdaf9d4b39d52ddac7d84956065b06
-EBUILD em-websocket-0.5.2.ebuild 1143 BLAKE2B 634717168adfcc2fa53f2a009cfdd8982d585b1eb64505ce972e38be87faa7af0617af624910ed1a2f2c65e06a119d93c8f22cc39ca4d55dce9ac973bbe9b5f2 SHA512 ead1b15f00bff35b981e1ffbe29edef22bade03fe782f0317fa91ccff0c4aedd467bf3de1817f2ce0954193c359f54d181d830fed858743c9823472857e81ee2
+EBUILD em-websocket-0.5.2.ebuild 1150 BLAKE2B 02ea4a3386c5b3ed12cce77a69b0952a27c27bcf69c97b2e786f899b97e93e37e390f64acff91c2662c5d2482e3f49023823207f226dc3bc4fb355e71c76fe38 SHA512 70327eba0d64d86b4c47c664799bd2f9b5a141a0e2ec3872c718138f49c57804db6efcfc08a148e14684acf4433729d46c97d02a1902f0d0cc6962235a565e20
 MISC metadata.xml 459 BLAKE2B 1d0b797e6702af57fae4cbedb6a33347bfeef5182c7ade87357502303931a78bc08c01a3a534b3b121d8483ec50232e1f3edcf51b15bdc36a9099ccb13e2f5f2 SHA512 e7307e0e6811ae07aec354812606184d8f2b7f44c5a9ea03b41525f8bdca4742c6570d763fa6ec1c12180e7cc7f30ed5ec0553bf53dee2fbdcbeadb83a2ecee0
diff --git a/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild b/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild
index eb230e2b9e03..4e6a751ea511 100644
--- a/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild
+++ b/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/excon/Manifest b/dev-ruby/excon/Manifest
index 4b5a42f24b63..ad5b1a131f5d 100644
--- a/dev-ruby/excon/Manifest
+++ b/dev-ruby/excon/Manifest
@@ -1,3 +1,5 @@
 DIST excon-0.73.0.tar.gz 216100 BLAKE2B 7830ac608c25ac42dd5fac85d2e4fa7a06713ba49340693f23886aa2e7bb5f29cde956eac99a13f17c1f7ef987f00d0cfb3bd306c5bffd16c1bdb469be4baa60 SHA512 a58556510d8c53c7d4f71dd4846497ee8ab17bd087d5ac9248784fcd1f1dc2e46bf4dbccd22ad8e467614428fdeacc7af6768380922749f92c7d78b849e08eff
+DIST excon-0.87.0.tar.gz 207823 BLAKE2B 1affb1b566afb18ad563806362f75b43704e7753f1aab1e356a38058f1cbb79d89e09d271e4f6f49f9e8ed775592fe78bc262979ecc73285deda056a1fd5fba4 SHA512 34149831783a51f792dcdad500691343e675c84d7d45766eebbb590080111dc790928455b7c885f731e01fa5637f531f7736e42496d9f77bb0337110aeb531f9
 EBUILD excon-0.73.0.ebuild 887 BLAKE2B 5c09388ff51ba837541aa865729b4100d70a055ba109b1f590da2c77ca1f5ba6284e9d6738b342b6170c9c3e4d21414a281af73b4674ecd4e40f6c72c9464f9e SHA512 f052fc3de96f0ea9209226aaf4c503419af2c788982a03e6231c6548612e9f5dd960842a152671213bc2a00833bab814d0b1c43cf4bfe29430b1a17ab1fe172e
+EBUILD excon-0.87.0.ebuild 870 BLAKE2B 391d30ba6c340f34e7dada411c881b54450f68d7267c154051aa8ce5dcad0a60b30cbc357737277465de8a37feb361acb2aca4c293f26983d1abe4c9f8cba64f SHA512 99e808e7cd8f09c0e308c746805972f33270c2e49790fb30a3dc817299330f30905716d1631a996f1a5f0f67d527aec88297dd54c4344ca497dd2293e0a278f9
 MISC metadata.xml 448 BLAKE2B d571a600d11154abf3426b7b33e338035ffad7cab94fb848b33bc60e0ea1997bb3b24b8b01c5bd7dd112614045e0ca6ffb09ff9e8891137dee7d8e31a73a7e6b SHA512 6721ab6317c97ea10eb08a0de3a3b19ccd5bf2933532fbd9bf6d7df0b7d236083d01303500f8c3ed1485cadc11e2c8548326d4fb167cbd6e511d7fb4fd5c134a
diff --git a/dev-ruby/excon/excon-0.87.0.ebuild b/dev-ruby/excon/excon-0.87.0.ebuild
new file mode 100644
index 000000000000..44a58d833344
--- /dev/null
+++ b/dev-ruby/excon/excon-0.87.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="changelog.txt README.md"
+RUBY_FAKEGEM_GEMSPEC="excon.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="EXtended http(s) CONnections"
+HOMEPAGE="https://github.com/excon/excon"
+SRC_URI="https://github.com/excon/excon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "
+	dev-ruby/rake
+	test? (
+		dev-ruby/activesupport
+		>=dev-ruby/eventmachine-1.0.4
+		>=dev-ruby/json-1.8.5
+		dev-ruby/open4
+		dev-ruby/rdoc
+		dev-ruby/sinatra
+	)
+"
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# test that need network
+	rm -f spec/excon/test/server_spec.rb || die
+}
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index bee5288a2344..de1e95d85361 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -1,5 +1,7 @@
 DIST fakefs-0.19.2.tar.gz 53405 BLAKE2B c9841f7f2aee5135d149187d03f7f3034d3c6cbce6d33d3710fcdbd936b4599561c857dfac81f13262da6f067a843d0c3159abca0e8be7f77c95ff20e8bd123a SHA512 e27eedff44c3ff556b0e7a22e434205e54847a6f6b03a8ab7604c2f2e9abf8be7d5b8d29bd51e24cc032dfb3aaf7940060c3dae5532b0921e363d2213b12ed90
 DIST fakefs-1.2.3.tar.gz 54054 BLAKE2B ae8202b7f28d4d1b326e016d96382b7cfaf012fb842d63150bb09b6ddb5de96bb6d548635877d2d057137bbc23c46c30340ebae3641d70d7955f609bb4cc4af2 SHA512 5051a3b81ba5919cdb6cd4a92f4e6af6ed5140afb35247b1775f4602083e23f903c582e038596a3bb27ab3f69128ef3d9fc2635d015fdb23babf21ff200c4692
+DIST fakefs-1.3.2.tar.gz 54762 BLAKE2B b5b8c00ffbd8974b2eb024deca4a2e48791fb542e2ad47d06d1c56ad1caab1433b240ea6af4a6836638c84bb79869dcd9d74194768d380173efe54f6765b7f7e SHA512 939dc7f28b266d8ef0cd5b4d33c6abc4a766143895d226b6a32af05f2f6e9eded63d86cf39d607094435a1b428297ad11366f645f4bf6789048b7e03357bacc6
 EBUILD fakefs-0.19.2.ebuild 1062 BLAKE2B 92c1f1feb018629ab6bb310d1fe11387a9f5a5eb549b0d6c00d5edde95db4ec4f01653c316292246710e713746ba1ff35be062af3a3a01d28224a907881f78fa SHA512 0b86d994e4451ed4d8ea85d05c475dd9e3c40441a251c30c8beb8a638847965b6889c4c126921a44a7c347fc90ba2e19e20a4865a25d7ca211eeed1c62227fb8
 EBUILD fakefs-1.2.3.ebuild 1136 BLAKE2B 46769de8301a23b4237ad9f9657d9d07cc75f6eee1c82f43241e6d021da34ddee8004e849e47692169a2d7c532ea15534a93bfda0d4269c72f320c9f35298511 SHA512 45f34cf31d76e80e80bd9357be59773c47fa91a4d38bb01c230eb160614978efa2a920a49d1e24a0904c1f3affe1fc2ba8bebb9614e823bc3fbd25851e3fde92
+EBUILD fakefs-1.3.2.ebuild 1138 BLAKE2B db470d34bb8415b49848818ebb7658eceef1d13a42ce2ebaf51fb97e51724e7eb7d1728817e92cd09017294bda1030ad5688b78198d095c1a33d895c9c30f18c SHA512 7546676030661db5fcab1b86cbcdf07cf6c16b41a93518f10fc668e6336fbe25893f9f71145bff82981bbddf421161e5b9ed7630892c7c411f5690abbc9a257a
 MISC metadata.xml 341 BLAKE2B e6dfc98fa1e5de6bb68479d5d65373885b346fead7ea66fc0cb5d6560bf1d2eaf31417c04a2fd3c203e8ed8a679a64413e9b866cacbca2fb17b081f507f6dc95 SHA512 761ace4ce03d41e9fc3e0b0c62274f2aac01c4a3bb17c8f1009292773c5e5d9aa10b8c92d8aea0d03e7c91f4fb88dde607cbf856ab70286e6cfde4e265fd36ba
diff --git a/dev-ruby/fakefs/fakefs-1.3.2.ebuild b/dev-ruby/fakefs/fakefs-1.3.2.ebuild
new file mode 100644
index 000000000000..2cdfdb532bc8
--- /dev/null
+++ b/dev-ruby/fakefs/fakefs-1.3.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
+
+RUBY_FAKEGEM_GEMSPEC="fakefs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fake filesystem. Use it in your tests"
+HOMEPAGE="https://github.com/defunkt/fakefs"
+SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-3.1:3
+		>=dev-ruby/maxitest-3.6:1
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler
+	rm Gemfile || die
+
+	# Avoid unneeded minitest-rg dependency.
+	sed -i -e '1igem "minitest", "~>5.5"' \
+		-e '/bundler/ s:^:#:' \
+		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
+
+	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/faker/Manifest b/dev-ruby/faker/Manifest
index feda58f98e52..bb817032a448 100644
--- a/dev-ruby/faker/Manifest
+++ b/dev-ruby/faker/Manifest
@@ -1,5 +1,7 @@
 DIST faker-2.16.0.tar.gz 1234511 BLAKE2B 99c53c85094022b33f2213af20b642fafb885ae9cb99169aa2684697e3af9d393b73476ebcd4e7e0541777d0648a53570cd93c352316a7f86c7a2026bf02b47c SHA512 b33054414ad57dd34ce0448d3b8a411d71a14bdbd66fd969007267d1969b40dc37b8d1b6622f81dfe1ed9d38b95cdd9dec699e3233195cfcdb9289d309c0a6f8
 DIST faker-2.17.0.tar.gz 1268170 BLAKE2B 560fe5ebe8384121e720b540d0375aa50cfb40717e2ea4d438cce1918a7996fa3414a01344c26c65e2e0ac6115b3694985355543290b89500359ddc523e47304 SHA512 fd5e3726d881d6378c21932d97c5d92c23e8cf0e36289f6707d76474dc5ee843a731ea6c6a29bfe33564bd7521c91e1a90adff0c205c19a77b0a944766b1d159
+DIST faker-2.19.0.tar.gz 1674687 BLAKE2B d96f30e1ab1febc4f31f4a0709b838978aa2e6ff2e218be25075cb93a19cfef40182ba71a4f7e8bcf1793ff7737a1fa9178d2b847928e40249fb546791841740 SHA512 28d0bfafafb7a2679cd0ec476d14ef79e60f85f6dad2c8ce78002a530474106b0b29191f483a7c4a8f9c1262811fbb6488badae1a400bd520c8c863902e078b6
 EBUILD faker-2.16.0.ebuild 800 BLAKE2B 48abf91e902c8827ce02aaf335a2b00b3be49a46be0c5f2d99b0b41102ca91c038b1f66a07c0d2ce9ce954c4b3d1aa511b492729423dceeabeeae4518faf5c15 SHA512 012926c832369b208e0011dbbe61ef176686db5d580953063618a8c4ded8729d81388c260f081a8a70e4015cb62310bb5afeb1d293166fbf9a0139c4e8b7c150
 EBUILD faker-2.17.0.ebuild 800 BLAKE2B 48abf91e902c8827ce02aaf335a2b00b3be49a46be0c5f2d99b0b41102ca91c038b1f66a07c0d2ce9ce954c4b3d1aa511b492729423dceeabeeae4518faf5c15 SHA512 012926c832369b208e0011dbbe61ef176686db5d580953063618a8c4ded8729d81388c260f081a8a70e4015cb62310bb5afeb1d293166fbf9a0139c4e8b7c150
+EBUILD faker-2.19.0.ebuild 793 BLAKE2B 3e44175077efdf2f8ce99701bee63f4598553f07261e8997cb7943d56d7beb250b833e5a2a2bfcf10593bb06dd941bb904f728e652657504103d3e3767466ddb SHA512 de7eef3ac2206d8e14626fee9df1fe93e11e8a890db3f194a578d04be262f0dd067490755f40b14691728f7b4bc50ed455173a3b375b52e3a5f065327d104985
 MISC metadata.xml 453 BLAKE2B 2d7e81fa25c65a66ff1fc43c8d79ccb2d4a3e401740a22675835c60f85e875fecdc0efbab61a85d9799f2478c34cdedd454cada332f07e15b40b1903863a6cd8 SHA512 008f56df63fa03a5f620bd169828802c7f9bab423bc22dbd78bcca2ef329f73fbe0673fcd48442474756ede864af3c4a7a8746b278b2167b03423886c9182079
diff --git a/dev-ruby/faker/faker-2.19.0.ebuild b/dev-ruby/faker/faker-2.19.0.ebuild
new file mode 100644
index 000000000000..82e8579cf790
--- /dev/null
+++ b/dev-ruby/faker/faker-2.19.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
+HOMEPAGE="https://github.com/stympy/faker"
+SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/i18n-1.6:1 !!<dev-ruby/faker-1.9.6-r1"
+
+ruby_add_bdepend "test? ( dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|rubocop\|yard\)/I s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/faraday_middleware-multi_json/Manifest b/dev-ruby/faraday_middleware-multi_json/Manifest
index 91f098b756aa..634c36df3663 100644
--- a/dev-ruby/faraday_middleware-multi_json/Manifest
+++ b/dev-ruby/faraday_middleware-multi_json/Manifest
@@ -1,4 +1,3 @@
 DIST faraday_middleware-multi_json-0.0.6.tar.gz 3455 BLAKE2B 3fcdf69d90fe2da5cfe16851b5a5050429593c39c3d56eeab3e687ee89d036822197273fda44370878fb4087c29d6e2357b3220526c9adb8566a83f8d50bbac4 SHA512 4abc794a06725d4a584af08a58874162f1bea6424569f0fa6683ac0df7882708d3872e6a42024d7fa764d08688ceccbdf61d9870f23b71ea3c842440b495cc61
-EBUILD faraday_middleware-multi_json-0.0.6-r1.ebuild 889 BLAKE2B 0e1da545a766360827156ea53bc3349c0be8810be913dedd20328c8f44264e374c797f092a45ad5a41219eb75bff96626cf9732cb3bf3ddee7c21c0fa7bbc693 SHA512 f1e8e1b879ed78b7b2a1ab3eae0b5c5b500933cd29c0529f75af9b342c05d7c59d69af93cf39172be5c162703344ad72c28df1c9a9517b4c2e4246340ea283e8
 EBUILD faraday_middleware-multi_json-0.0.6-r2.ebuild 844 BLAKE2B d2e23997e306c0833703fb7abef250f7c500374a71010509cdc7ca32f2c80532ddd140ae2e836d1aa7678d8499144b66b58fab255692be0d998b6eca095c51c3 SHA512 7cfafeaa666a7f2a0acf158dd3a94ea42d94eea41058fcd4c23c2b20471240e4ce659c0a8152e03eba5743eb2405844cfe36cf4f498ca0d3ec202ce5c25ea034
 MISC metadata.xml 624 BLAKE2B c9f41eea651a2f9bae1cce62426ee93a03f95d8314e70ec8e4b9f63ec905bf4a035b275b8f847c0f9b53865a2aac863690c1bc522294bcb2f88ad779108b6c26 SHA512 cee53cdfaea552192caa36773500e6636d432e10473358a0f6a4d4c974f9816aff0bb9e039f2be3fe3d60884c36d053e7658e8942f4e66abc49666bf3ef278ff
diff --git a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild
deleted file mode 100644
index 8a361475fdc2..000000000000
--- a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Response JSON parser using MultiJson and FaradayMiddleware"
-HOMEPAGE="https://github.com/denro/faraday_middleware-multi_json"
-SRC_URI="https://github.com/denro/faraday_middleware-multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/faraday_middleware:*
-	dev-ruby/multi_json"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm -f Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index 7d6993e5bff9..2b935f0efd38 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,5 +1,7 @@
 DIST faraday_middleware-0.14.0.tar.gz 26313 BLAKE2B 2d925f0bd9e4a10505bcdd3b483ac7b8ed2c42dc1187e04069505216dc739af3f10f5c7f2252e3f474e5ddaf972a7b8fe009be9957e66ab625fe49c364a0d217 SHA512 d8e86da166022c04c12acc37981de446ba30050330dc0320eec0414157bdd6c8e92ff49ce92b390a2f5d457c396144dbde698d61993302c0ac416559e7078a8d
 DIST faraday_middleware-1.0.0.tar.gz 28279 BLAKE2B d881f59e106a695e2d41936d552fe6cb16465964fcb2107806123ea1b34ee6db8e82bb1e6fe3a0135af04da70b56a3e8c933e44591b3f75901642a1fe7a3ea1a SHA512 478dd04840c27120c162e5d9c764a210d4cc55ac54f2d44935942ab5195ee5a0f198a4cc0c98805029f3eab4596cc3963a763cda1fcc1ce6daf1811186e0b5a7
+DIST faraday_middleware-1.1.0.tar.gz 28104 BLAKE2B be490abc57a11c64331c45f1529e55b38df699fe20e81f3783ca92ba7c5c573c1ba2494086f40bdcc7080581ffb2df89093bbabadf8c46721dcca2cb6a0310c1 SHA512 e9c3ada418e47c397272b52706bbcbfa1c98b7b467c148c0094b1dfe47d28fc57e397461e6e7446c5bb8d71ed968e74e1b7e67e793e30d3f47e9fb1aae549912
 EBUILD faraday_middleware-0.14.0.ebuild 1759 BLAKE2B aa619b492a17e2b4361d0e4f28a2d10c5c18b9f5628620e74639f5cf77ab53ac222dbe4cc3633577770f29bff53ce851aa4953572d4118e001ecdfc4bb915d9d SHA512 b0059c01e7f72f5910664fe1d826e87b80c741a876ac3ab23e0f5247a0f3028f5b4bb38bf6f33fc3adf4908a342a5463f45ef953d97ce04a1876868da0aa58ae
 EBUILD faraday_middleware-1.0.0.ebuild 1695 BLAKE2B 494f0688de5319c53547112c920575b87c6a24bce6e61698f6c8aea0890359e6dddd04d1a5cbaf749497a4896231836472ed9323b49dc75895aec5c2f9427dc8 SHA512 344daac4c69f0f2afd180744e4d229b6294670802995fd6c8c08d124350b3c9bb752b88638e436d0678ea5e37e783575de930a7113973cc9b913c315ce703a8f
+EBUILD faraday_middleware-1.1.0.ebuild 1694 BLAKE2B 5c72148f44baf0c9bf4cddaddb806be325a2b1a24e9dede08bf47e93c73db7db3b7196dbed80ff24e7a189498c803b77c41efe32f83777ddf3d1c5c16e191b33 SHA512 710546f9fe4655299ad0c5d390a7f9dd942bbe4179abbd3eeebde94571d84b3a824a373c1b297d0c482b84a981c0e35cb8ff8cca22bb239ff56649c02ab6c961
 MISC metadata.xml 730 BLAKE2B 64f366662ab812afd769d94c56eb3829c55803a968afc445cf2e43f16f3c02b6c25541459fa10a93adfacf7064c0fe136321d64e546e8a570365ad002ccc5397 SHA512 9ea2039688d9139404e6d0bd1322f399ce4019e5e36e6d4941296559ce64bc9ca99807d7e0f10c776c4b597e0839a49698d6240c432be4102bfbdaac09b46e2a
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-1.1.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-1.1.0.ebuild
new file mode 100644
index 000000000000..a522ef25f01e
--- /dev/null
+++ b/dev-ruby/faraday_middleware/faraday_middleware-1.1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Various middleware for Faraday"
+HOMEPAGE="https://github.com/lostisland/faraday_middleware"
+SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="+parsexml +oauth +mashify +rashify"
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
+	oauth? ( >=dev-ruby/simple_oauth-0.1 )
+	mashify? ( >=dev-ruby/hashie-1.2:* )
+	rashify? ( >=dev-ruby/rash_alt-0.4.3 )"
+
+# Bundler must be used because the optional dependencies have different
+# version requirements that must be resolved.
+ruby_add_bdepend "test? (
+	>=dev-ruby/brotli-0.1.8
+	dev-ruby/bundler
+	dev-ruby/addressable
+	>=dev-ruby/rake-12.3.3
+	dev-ruby/webmock:3
+	dev-ruby/json
+	>=dev-ruby/multi_xml-0.5.3
+	>=dev-ruby/rack-cache-1.1
+	>=dev-ruby/simple_oauth-0.1
+	>=dev-ruby/hashie-1.2
+	>=dev-ruby/rash_alt-0.4.3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(cane\|parallel\|rubocop\|simplecov\)/ s:^:#:' \
+		-e '/rspec/ s/>=/~>/' \
+		-e "/addressable/ s/, '< 2.4'//" \
+		-e "/rack/ s/< 2/< 2.1/" \
+		-e "/rack-cache/ s/, '< 1.3'//" \
+		-e "/simple_oauth/ s/, '< 0.3'//" \
+		-e "/webmock/ s/2.3/3.0/" Gemfile || die
+
+	# Avoid unneeded dependency on git
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '1irequire "fileutils"' spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rspec-3 spec || die
+}
diff --git a/dev-ruby/ffaker/Manifest b/dev-ruby/ffaker/Manifest
index d6e3ecf04b72..a4c79496aff6 100644
--- a/dev-ruby/ffaker/Manifest
+++ b/dev-ruby/ffaker/Manifest
@@ -1,7 +1,9 @@
 DIST ffaker-2.17.0.gem 438272 BLAKE2B 620abe73efeb7f076804b17129d18eef491969e13833308468faffc86fbbf5dff358ea159219b8bf78c1ad69f57e4c2d3248759be4dec7ad96de6da41f52e734 SHA512 af6a04d6e960af23962c5596d58c097b078eb43ab72fc61997b4e4c30a459ef959508e13b1bc0a7cbfa2d83dddf7b684d6bf97b69cbed1fbb0994890a3e6dd6c
 DIST ffaker-2.18.0.gem 445952 BLAKE2B 3a0d9bc201810f6055417283e821655e70d45916282e6b01530c3221826ce555ad3670ab81cc21e14739c53b3fbb2940d9eb0d45b7613e9374f10d15df138515 SHA512 d57f1baa5fa40ab8d7ac7aec21d18a2ae2611f960b2e59f2deb41c2d1319f546ed18eda0f3ba02f58c34dc80f00da2487c7ec7940cb213f55dc6c900e44ff934
 DIST ffaker-2.19.0.gem 461312 BLAKE2B d80ae70604fcd579ad42b268e6139e3395dcc10aa90e828d4ac8b402624b6391e88d25ed233db699c953feb279348de95e9f731455e10b58970069feebd72bdf SHA512 2de34cdfae50bcb460dc8fb6eb7cd5ee69034de4b66e97a408e5c6265efd9370eb3c38e5a61eefdc42b67e5e569e6ba3a1f7621ffe1a8cf6beb76fad40bf5d6e
+DIST ffaker-2.20.0.gem 461312 BLAKE2B 1e0f38b83c957407e44a25e955ffa58b848a5a88e7200087e874d8998bbe65f49be28eb428fd28796c9f1f0663da97f0970763e767e38aed9f541edd62440b63 SHA512 aa908505c771636b307f1309511f9eb489dc14b07022960ae58f25321ebae46dc6e0406ea91863acd82b02402d5ee70aa71d77fd4aa753918c6d79c690764eb8
 EBUILD ffaker-2.17.0.ebuild 527 BLAKE2B ef36a197ea7715596a160dadb13e3f1c92ab0b7aa7abb565872bf8aec0605cfc6759eaaecf7d542e2492a3df3793b72f2fe2d5cbd244c325002e5536bcbd4fe2 SHA512 e2c7e88d226893ef8e9a4b054f5e99b13de034fcaaee45da5baa08ad801860521d9f70bb473d3b67fe5a8da6d66b03ac2bda55f68c8496c8fe613a04a1d55595
 EBUILD ffaker-2.18.0.ebuild 527 BLAKE2B 99007936ee18a985435ba157a82d79cb6c5406f2d10b55895e4b4a818d9d3f1c14b3e738fe43eb9681a2eb108f65de408fa17a71edfcdc9178a7689cf242539e SHA512 eee17304c6fc80e3b44fae6d58cccff4f1db15728828263f2f6c056ef16f0f5e75870dc1a11f2773772b272f7026633ec217c899c4340fb3c23cc9f2d91b7b9e
 EBUILD ffaker-2.19.0.ebuild 527 BLAKE2B 912549da872e6c71a5c21cc166889c56ba2d5202c761d8d4a366d390fb9190f4f4447829d5db754b217eb236e30fd0285466a6e2b87715c4571ccaef13de0df5 SHA512 01e332d8b52f720486125f4bf9d805872f84f3a864324b7aad9282dddb7913929f5ae28722a985d3c0eea4ed195ad2832600faee551f021536751f26aafa385d
+EBUILD ffaker-2.20.0.ebuild 527 BLAKE2B 912549da872e6c71a5c21cc166889c56ba2d5202c761d8d4a366d390fb9190f4f4447829d5db754b217eb236e30fd0285466a6e2b87715c4571ccaef13de0df5 SHA512 01e332d8b52f720486125f4bf9d805872f84f3a864324b7aad9282dddb7913929f5ae28722a985d3c0eea4ed195ad2832600faee551f021536751f26aafa385d
 MISC metadata.xml 345 BLAKE2B 2800fe3f1d57e8647e5372158763dc1889bace409b761b76602dcf196eee0be685f3247997e1e76809314c28f2c4c4ce68d3db264c268c6090078f23efd8648b SHA512 6f9206b94abc4e6e40afc7db09fdf6a6e73fa31b2c9b6a784c5dcd70cf46ef66424ecb0e7396335be8645d2c029ff2c28d8d1d92c1e14c5bf6e0ebecccf9b0bd
diff --git a/dev-ruby/ffaker/ffaker-2.20.0.ebuild b/dev-ruby/ffaker/ffaker-2.20.0.ebuild
new file mode 100644
index 000000000000..d2dfeeaaf3a1
--- /dev/null
+++ b/dev-ruby/ffaker/ffaker-2.20.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faster Faker, generates dummy data"
+HOMEPAGE="https://github.com/emmanueloga/ffaker"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/test_image_file/aomit "network"' test/test_image.rb || die
+}
diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest
index c89d4074ca28..bc70cdf85c99 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -1,7 +1,5 @@
-DIST gruff-0.13.0.tar.gz 20027648 BLAKE2B 53a21a99df834d68ba3100111bb7141bc8aa4fd861e5ca2bd963882fc15c1778315b63297ce12ecef19548791c2d573254eb8e38fd47b55092889f82646a9ed4 SHA512 6c2e1c484c081f67797a073d33e4774f484d2e2c27f9cced2ebccb377e806669470f2be23070b9d151a8a5cb1af01ea92dbfcefa5f79bc269a18f6523807b1da
 DIST gruff-0.14.0.tar.gz 20193671 BLAKE2B b8cdaaca71c5b034206c4f88b1e50e09f8d9c5a3227eaa59a5c66718468ffa643509acfe8bd6919fd012a50daa27709569c210b030e25207c17a0ce13b60616f SHA512 e3c3acbce0888698e2aa92b8e86d2ada5499f394d100209b94ac4284f05a6a4f64c2bdcce91f76be7cec860d0546ebf5fa24aab73b51c0ca9763dc07855c8a68
 DIST gruff-0.7.0.gem 318464 BLAKE2B bcc51f524089f53b89778143b444c70d4e168983edda247cdb4c9c84c288450154ce6e5234bbf7a0a8ae7251df611333c8bb411a8fd3765ccc5fe9650c3efc38 SHA512 b9842213ab3da7b4eccf8bd06e18d62aea14a6a15d7c45ebe7e51a76acd456ce140f094a9419d4c0bd1774e7d203bea49f9c39aca36c75d744f2732bcde9f688
-EBUILD gruff-0.13.0.ebuild 1608 BLAKE2B 500779630786842908dca5c04da966577ae3894636fbb61d65269ae84e80b63caf338e17b16a856404aa66f1fff0ec9a914c89464c0c879d3753c774f13409ed SHA512 db58b519acdc8e9d51b19b25de60e3fc72f4e8318543a4deef6e07471701687d4c8da6c3924abd7694096fce62dd2042816bc5bdbb502e55b81a8531ac3db73d
-EBUILD gruff-0.14.0.ebuild 1601 BLAKE2B 8822890956ca790928e7ab0720c59b1650a9124ea35925219e5c36d3db0a57540068a542dbb238594c48e4b4bf01e51f87157b6a48c5fea39378591264506562 SHA512 5d12bc356c34e36641cca36a84a70e619c1d809c9102e2676a0ed1ed13d4e5f7677d053a9b3c206bf1b8afc36d8a598dcd8ce41ba0b66deb0838ef8faf3dede3
+EBUILD gruff-0.14.0.ebuild 1599 BLAKE2B 5e5439740be12d01d3e86691bfc1c359e9fdc3fe13e412d3d27fbcfc6e73b31f81696d0a2da597cdc484dd42779d4ceabd74cd5d6681b8fe486cfa0d36bf3765 SHA512 2fd1fb7b239fe48ddaa6d990531a18cae93e01b365d445c6bd9d8815a98b229ac18586af797585a7e4f1d57aa5bda37c193f866bbd6117d0cf78ade274f36fc2
 EBUILD gruff-0.7.0-r2.ebuild 1448 BLAKE2B a177b6d58f8fb977308f86fa0372919d90cbff9be96d1a1ffcb362c1faad11aa0d423d7894ed8aab312bdd22f6dac58506401de873ffa18de704111fdb08092e SHA512 4790cde6289b55df95aa2ea410c7aff604b45b5056d1251c130e87939d0a06f6ba2c15c808c1920246fd5af6af5559a903e569a12c5858a2476bb155aafbfee6
 MISC metadata.xml 341 BLAKE2B d27e2cd08a5540fee57b4633b95cfe34569da56bca5e4638fa799aacfdfa8ccd4f3f195ebbca6782da97734bea84ba4adb8f49f08c8ec5b6757a3867ca70dd80 SHA512 ebf3fc986abccac99d46c2d66a1480ec3d9748660c314615b180e390bc5a55d7780c28ff85280390ef0e0f219aee626cae775d44f2c2ec1cfe047157055f20f9
diff --git a/dev-ruby/gruff/gruff-0.13.0.ebuild b/dev-ruby/gruff/gruff-0.13.0.ebuild
deleted file mode 100644
index 66c4f93f1b47..000000000000
--- a/dev-ruby/gruff/gruff-0.13.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
-
-RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Beautiful graphs for one or multiple datasets"
-HOMEPAGE="https://github.com/topfunky/gruff"
-SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# imagemagick is an indirect dependency through rmagick. However, for
-# gruff to work properly imagemagick needs to be compiled with truetype
-# support and this cannot be expressed in the rmagick dependency. Tests
-# also require imagemagick to have jpeg and png support.
-DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
-RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
-
-ruby_add_rdepend "dev-ruby/histogram dev-ruby/rmagick:*"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/\(reporters\|simplecov\)/I s:^:#:' test/gruff_test_case.rb || die
-	sed -i -e '2irequire "date"' test/test_scatter.rb || die
-
-	sed -e 's/git ls-files/find . -print/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	# Skip the image comparison checks since the images are not
-	# pixel-perfect identical, most likely due to the use of a slightly
-	# different font.
-	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/gruff/gruff-0.14.0.ebuild b/dev-ruby/gruff/gruff-0.14.0.ebuild
index d8acdd3d1de3..07e87c0e3d04 100644
--- a/dev-ruby/gruff/gruff-0.14.0.ebuild
+++ b/dev-ruby/gruff/gruff-0.14.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # imagemagick is an indirect dependency through rmagick. However, for
diff --git a/dev-ruby/hiredis/Manifest b/dev-ruby/hiredis/Manifest
index 39a1b440ee17..a127351c48ab 100644
--- a/dev-ruby/hiredis/Manifest
+++ b/dev-ruby/hiredis/Manifest
@@ -1,4 +1,5 @@
 AUX hiredis-0.6.1-unvendor-hiredis.patch 599 BLAKE2B 941d7f370c1dc85de07334b77e89180285fc57e604ffb904eb03fbb9c810d28c2c2e229f1589b98f58c80f68f3a21fa881ea78805361b67032a3006605428c1f SHA512 34d527c1182bd5bbc17e0a4e08b29bfeb15a55c02d1cfde75e5bb2b1589ee3dec622d87ed00cc3d7db390f4cb0ddc9c60e2344ef28c48b725eb37262cb349c55
 DIST hiredis-rb-0.6.3.tar.gz 19106 BLAKE2B 2892fd28bf7e7edfc3563a0c321fd781baeca9eb31a64dd559a6c828bb9c4fe37c995748782c5222db46b5b35a4d17f5b8b4d8e5306209a0e374ec7096d3cd4b SHA512 3e081d46aeb128789fa41fe9422186dd30e88c5a7a3c16dfcf1a92fe7faf99cced352ea39a885785fc12f0a974625be329d9ff2a5936a786febe8a2c81f5e139
+EBUILD hiredis-0.6.3-r1.ebuild 1036 BLAKE2B 8fb65afb45e448ecb5c5bd5ae6278f359f309ad0ff5d13656fbb4e920623071335c9573c32b6eb62290aac594fd67a68054760b7af012ec0b6ddfd5d787e6a76 SHA512 2de02a6eef243c5c638a362bab63e17b019a1307020a6672d9d60caf374f0121828a2f111774ad65f0258a31e7e199f3a02fb5c2a50c152df5d274c94b4721e0
 EBUILD hiredis-0.6.3.ebuild 1177 BLAKE2B 3fa66c7317abd22be66df5ffd3aa7169f9ac62e2f0688a56af77473d247d71787497aa150cffbd580ef89e6675e2e1174594a2f9f1dca25ab653eddf5d3ca010 SHA512 fb0d3dd060e9700696a3eb6e50a23de134134c0bfd3398c65dca871ed2dd73f1e15c4f15e7593bbc8b1ebb04c4cabe6a7a2c7697750e8679d5451becb2a9ef88
 MISC metadata.xml 343 BLAKE2B 816ce03a7c4a846888ea2410f1def09d8c56b2f11e6637e0c74fd58eec1117c6ad363411bc4bca45a462320ebbae34785db0b56b9a7bb66de65d4bb316ea70bb SHA512 7cc1565a72c805d327fc2df68c813c5191e6e50dab1901dcc04a4c7f19145ede350dbad584a0bb37387d3a28d9ee0aa93b0918b20adc0d612c751c7730f3b813
diff --git a/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild b/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..ec852faec264
--- /dev/null
+++ b/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+MY_P="hiredis-rb-${PV}"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/hiredis_ext/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/hiredis/ext"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Wrapper for hiredis (protocol serialization/deserialization and blocking I/O)"
+HOMEPAGE="https://github.com/redis/hiredis-rb"
+SRC_URI="https://github.com/redis/hiredis-rb/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND+=" =dev-libs/hiredis-0.14*:="
+DEPEND+=" dev-libs/hiredis:= test? ( dev-ruby/test-unit:2 )"
+DEPEND+=" virtual/pkgconfig"
+
+RUBY_S="${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.6.1-unvendor-hiredis.patch" )
+
+all_ruby_prepare() {
+	sed -i -e 's:/tmp/:'${T}'/:' test/connection_test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/histogram/Manifest b/dev-ruby/histogram/Manifest
index 0a44ef3d36f4..7d73dff398ce 100644
--- a/dev-ruby/histogram/Manifest
+++ b/dev-ruby/histogram/Manifest
@@ -1,3 +1,3 @@
 DIST histogram-0.2.4.1.gem 15872 BLAKE2B 4c416b32e348564e9a938138ac22697acc480dd88e4a879cde6485acab481690cca5d8f61c1c026635a000ee45386e78169143ebca282ae3577e83da66c3e88c SHA512 b2358c648f528e42419b52155273613e6da560ee839458a888d47588a442effec3ee78ad18c33de2b2eed8c6a9f84fbc5b97f7d23ff3675871e9e58770dae36b
-EBUILD histogram-0.2.4.1.ebuild 549 BLAKE2B 961d94bf2480281ff88dc7fe2cd805a194034038382b81f419bfb2e7d210cd44cab8153f2e72668ecddeede77101ed5b300651cf6ca75b4a872d44183d5b607a SHA512 b7a8e1c3dcf92809cddb8c149550bcb0c1eedb40e07b310deaae8278ee9ebbf7a7931ee1a9be493a0d7b41839424947c5676d20c454193c2abef70e83feba6cc
+EBUILD histogram-0.2.4.1.ebuild 554 BLAKE2B 3adcb5ceff3e617e8e83bd7b02ccafe525d449cee9e33acb396b0ee79620364965da2bf1d5ec93f0c7889c2d3b5184488c4ebea674780dec8b71c22059ca89dd SHA512 161a77003b7edbf8213d8ea15d7b144a0b6a157922cb3abf2a73fd4bba61e61a4fd6d26d6bdd3a89c758135681bcedf896297ca6cd1995ded80700c19d1eb827
 MISC metadata.xml 345 BLAKE2B 3975ba83a6035f96b6d32dccf43af94094a9e03482d0fa6f5ab1a701ae34eb3a5950c89c55d3ed2b0d8de46effac5aa85215e12f6b972aa786abe4f685bba612 SHA512 7b3ca22baa6bc62e8ae8698ad2ec362d884babe3579a5de4723202ad8f019bbd8f2f7801ea659f13c3eaea82c139a95a4586bf9812a0e2e833f81f7def60847f
diff --git a/dev-ruby/histogram/histogram-0.2.4.1.ebuild b/dev-ruby/histogram/histogram-0.2.4.1.ebuild
index c101fea6a6a9..1ea58acebb05 100644
--- a/dev-ruby/histogram/histogram-0.2.4.1.ebuild
+++ b/dev-ruby/histogram/histogram-0.2.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/jtprince/histogram"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/narray )"
diff --git a/dev-ruby/http-cookie/Manifest b/dev-ruby/http-cookie/Manifest
index 813badd3cd30..abc27939f1ac 100644
--- a/dev-ruby/http-cookie/Manifest
+++ b/dev-ruby/http-cookie/Manifest
@@ -1,5 +1,5 @@
 DIST http-cookie-1.0.3.gem 38400 BLAKE2B 6b7292b2a5d7c37b6769cdd38f01d8cf78aa9557b4a204d736dffeae5d31768c57ac58f00577df78252f9a8bdb12a7faecf5e1be64c8ee29aaf67cc9307d0a35 SHA512 43ac1218e98dd47ee22e33e72e20bc5b55f65e60aadd417641f8a4221eba88995d418c7738a4c35dfba132e05c0c4b0df2b2bedd56c22e82c062d1f03de0052f
 DIST http-cookie-1.0.4.gem 39424 BLAKE2B 06ac0e667340ac17827a8eb4ed320efe77ad97509fcd444f7e77d887a77643a6b34e84486db78eba52245891d1719e750d9a446c40a4ab7804f2304b600029bd SHA512 788fdaa642e6b596e7a91c57a7942a832c09a84fed88b30fdd8e5a8ad66d72780afc1246e6c83c4dfd5af8018c278750866dd05d804aef793aa067b09519af8d
 EBUILD http-cookie-1.0.3.ebuild 692 BLAKE2B 3ec06e785b3a87a4d0a46abddfa876bd48ca3bdbd496396beaf17b0633d3d1488e990e57ea923dad6dd60717bc510d38d48e8cbc38d733da9b7dc054fc4b6983 SHA512 54a88bf86a64dd16444442d97872692cc25964fcc4febdab2a2efe4fdc86b2b9ff49ad6a5779087d274a3bf90b7a3af1e76d9a1a6a7368c9d3b6b79421f3c05e
-EBUILD http-cookie-1.0.4.ebuild 673 BLAKE2B e157ca0d22527e466a7813347421a27f79daccb3cd3e07950465c75dcf4896186afb982d8097d4b08636141005469397b6118ff2c13568b750b8d8fde249b246 SHA512 776389e8e87ef0964a4822f962f42d93657451475d6cc895e0b72cedc704d6f0768a6e6b06105e5b308c297380569cc6a55f9d13783054a49abc869b0d2aa380
+EBUILD http-cookie-1.0.4.ebuild 673 BLAKE2B 671ce614a3d844527cd316e77d0532d04cd0a6cd29e77c0b56f6b26eafc8b959e6f9622dd349ca897a05ebc9f81d1ed3149661dd8ea9ff47009470f25846885d SHA512 432406a9c18138470bc6fd747c6e234b21ac2ca5366de9badad81422a00b4a4aadb99530681f949bbb5aca9950ced1daeb039139e00c35c7c960e45e289a8abb
 MISC metadata.xml 352 BLAKE2B 0e1cc1e4cc97d4d773c64a068d2f7246c863fae1c17504f83275d1ab15e59a9bc6535c22fdf0c02d89d778079d100b74e29170b0fbe6fc1ad5464e221751a56d SHA512 821e08b75914f51a4a341149db588c8e3b17fc401a14de9abd44918b9f6bf88bc1d9c76b460a10c1b312669db478759aab90d0bb08bc04129bc8c964e7b3a314
diff --git a/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild b/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
index d4887d3654f5..e69df5321d5d 100644
--- a/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
+++ b/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
diff --git a/dev-ruby/httpclient/Manifest b/dev-ruby/httpclient/Manifest
index 133d0ad1da67..4629e0991d2d 100644
--- a/dev-ruby/httpclient/Manifest
+++ b/dev-ruby/httpclient/Manifest
@@ -1,3 +1,4 @@
 DIST httpclient-2.8.3.tgz 464624 BLAKE2B ce8ed523a24acce219027a4f1985caf2b4dae29bdba038ca2397e5f4d4b36c90b35cedfb62faa7faf426c3ce8589906df7832968c81b64bc9100eff6f4fe9745 SHA512 b65b5adb97af069d7ff6b6f4cccd6a42c6d9c88b797e9495768fe1f36a6bd93defe50190edc201de5e39c4e306ba0bd17a8ff2f8eba4d636dacafa06c172967d
-EBUILD httpclient-2.8.3.ebuild 1969 BLAKE2B abb0da2b4338c47829d642a1a10e4c84b6093c890f5f2718bf264492dd73cc3623790a4ec109468dce9b3de2aa3fe8ff4d45719e92e70a1ca7194549a3310961 SHA512 bc84b1da002d33a060fe8348842e5bf2d2dd0cf728e03bbfb6a129d83a70232744cc6024a10d7a85405606457153a4bae0ad8c788db152ebc22b80c59d3a3aaa
+EBUILD httpclient-2.8.3-r1.ebuild 2733 BLAKE2B b2f688eb6f4fdb2794a3a8ee14da83d02d1e3cc77de9e4b5fa999ff918e3beb0d095ac27026be352d181010a6365cfb4f55f4ee10e2282e732ca2612842d4b6f SHA512 e21c465bafdd12ec37651adb865c78b90a0e2032185f303ae7e6e9d9745fd9476b2c94dd08371d2b0610c8fb027654ccabbabf0cdd878f8f80e5766149376d06
+EBUILD httpclient-2.8.3.ebuild 1969 BLAKE2B a10ed12b97cc24a02346b21fe2bfadaecc49085455193434d9885aec83de029e1a00aab57332ceb32061bbe483842fba7af1b62f6e39ee8286743774e5b32cc8 SHA512 7c41c093baf46568dffaa43f44cd8d2dc0e264fea00bd04b885586711ef6756a0647f93076f5e068b593fbbebd0559729be7f088d60f53bec1e88426dc49e4d4
 MISC metadata.xml 342 BLAKE2B 357371edae972dc4bf17bef8a0ddf752bd81a3936a4ba6cc83ec7a253346e3d236bb0930fc71f14c1c42a486f3202bcd08352260aef38676f57b31f852dcca27 SHA512 3c3e6861463a129c5679658a044b956f1d8a4ad086c5fc77029037ad88b391af06cfbe26127127ae0b909d602c9a3b02929c48d7a26059ebd29e06c394d7b4c4
diff --git a/dev-ruby/httpclient/httpclient-2.8.3-r1.ebuild b/dev-ruby/httpclient/httpclient-2.8.3-r1.ebuild
new file mode 100644
index 000000000000..36a0fd386fbc
--- /dev/null
+++ b/dev-ruby/httpclient/httpclient-2.8.3-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST="-Ilib test"
+RUBY_FAKEGEM_TASK_DOC="doc"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="httpclient.gemspec"
+
+inherit ruby-fakegem eapi8-dosym
+
+DESCRIPTION="'httpclient' gives something like the functionality of libwww-perl (LWP) in Ruby"
+HOMEPAGE="https://github.com/nahi/httpclient"
+SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="Ruby"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/http-cookie )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[bB]undler/s:^:#:' Rakefile || die
+
+	# Fix documentation task
+	sed -i -e 's/README.txt/README.md/' Rakefile || die
+
+	# Remove mandatory CI reports since we don't need this for testing.
+	sed -i -e '/reporter/s:^:#:' Rakefile || die
+
+	# Remove mandatory simplecov dependency
+	sed -i -e '/[Ss]imple[Cc]ov/ s:^:#:' test/helper.rb || die
+
+	# Comment out test requiring network access that makes assumptions
+	# about the environment, bug 395155
+	sed -i -e '/test_async_error/,/^  end/ s:^:#:' test/test_httpclient.rb || die
+
+	# Skip tests using rack-ntlm which is not packaged. Weirdly these
+	# only fail on jruby.
+	rm test/test_auth.rb || die
+
+	# Skip test failing due to hard-coded expired certificate
+	sed -i -e '/test_verification_without_httpclient/,/^  end/ s:^:#:' test/test_ssl.rb || die
+
+	# Skip test depending on obsolete and vulnerable SSLv3
+	sed -i -e '/test_no_sslv3/,/^  end/ s:^:#:' test/test_ssl.rb || die
+
+	# Do not use 11-year-old bundled certificates!
+	# fix this copy so it doesn't fail tests
+	ln -sf "${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ./dist_key/cacerts.pem
+	ln -sf "${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ./lib/httpclient/cacert.pem
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'gem "test-unit"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	# Do not use 11-year-old bundled certificates!
+	# fix this copy for production systems
+	# do not ship the cacert1024.pem at all anymore, nobody should use RSA1024 certs!
+	rm -f "${ED}/$(ruby_fakegem_gemsdir)/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/lib/httpclient/"{cacert.pem,cacert1024}.pem
+	dosym8 -r /etc/ssl/certs/ca-certificates.crt $(ruby_fakegem_gemsdir)/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/lib/httpclient/cacert.pem
+}
diff --git a/dev-ruby/httpclient/httpclient-2.8.3.ebuild b/dev-ruby/httpclient/httpclient-2.8.3.ebuild
index f5e7bf53b506..160c1d9af9dd 100644
--- a/dev-ruby/httpclient/httpclient-2.8.3.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.8.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_TEST="-Ilib test"
 RUBY_FAKEGEM_TASK_DOC="doc"
diff --git a/dev-ruby/ice_nine/Manifest b/dev-ruby/ice_nine/Manifest
index 4114ece3e99b..0348c2a95ef8 100644
--- a/dev-ruby/ice_nine/Manifest
+++ b/dev-ruby/ice_nine/Manifest
@@ -1,4 +1,4 @@
 DIST ice_nine-0.11.2.gem 17920 BLAKE2B d70aee3ba5d82719936e355bacd0c157fae262abb494c8d584e8530928218fb3c8a736e15903cdef2acd421fa5d08eafda11a0544651389e8b4b791299f1afca SHA512 e75237d901235dadeea159279b324982c6288d7c200ef3363eaa09340a480d5d94b8977915341218e6e2e6e439d40364f8569d757cdf47175bdc69ddb8d959ac
-EBUILD ice_nine-0.11.2-r1.ebuild 526 BLAKE2B b28e3740c4b95cc76e793bef10cba4a3270b2ea8dbccf8e18b059e1632fcf730093b1d1666f0598868952476580fc1f1ce409139c463ec21b643f61c6a13a957 SHA512 22dfe5a8b3311de6e3b3be79ca065049bfca562128cabbb3f0d0c8957d0afba7ea9e5d7dc0c4fa384ca3cbb3a1e2cad968ab9a0a250ad484862eca3f42dd1f21
+EBUILD ice_nine-0.11.2-r1.ebuild 531 BLAKE2B 4d059c4d32bffab9fdc81b892248ee1654d2014426567ade92389a83c3cae247c5377fd03686fa4af757e274e7d2b539f0c20bf6298e1c374c0db2ce0bbdc401 SHA512 6b91af933408ca51afdcbede05d4d40ecda7c75fac2529c667f3cc3f9429ae2f4b6377ef20067907df7d3023170298c50050a77f61f237e8b55db9aabd8d0c19
 EBUILD ice_nine-0.11.2.ebuild 482 BLAKE2B f82c6d3f77d67f3625d762095f13d41b2286bd5dfee0524dfae92c5e8ba9480868b10589316f5c27e97f652a2bdf7a8642231cf5cfdf925f362816585d914cd0 SHA512 375acc105766abd661058257f73b0a1d7e1389c7e6babc722f7cbf5ffc4574f0d85a82942dbdd989e4e7ea3dd4008cfc8808a59ac0cb3d0fdfe598fdf08f6d61
 MISC metadata.xml 393 BLAKE2B f9829d62ac9b4f388605f4646b8f65bf1182d79831b345a5f5b01777b71bdcceea124dd16325f268ad105cf01b0e0650681d5f3a3820220ea2521e51a2262ee7 SHA512 225f8bd9ab69b89c073285981240ca9b666fb55dfb20e05e6154393fa521540e4a440e910d9d5fdc73a3345b3fdbbc8049d5b719591b7ec83872d5556a459695
diff --git a/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild b/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
index afa69fc35056..4f161f44eddc 100644
--- a/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
+++ b/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://rubygems.org/gems/ice_nine https://github.com/dkubb/ice_nine"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 RESTRICT="test"
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 02574cca58f3..2d2a8f021959 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,8 +1,5 @@
 DIST json-2.3.0.gem 114176 BLAKE2B 329f1305a0cae3d44c74cc7475c7340e86b8447d5e4ffdd5854620669ee4ef5bba0ed7dbc617b0beffb7bfd8b3d79d46ce26feef37685413a4a5a9c230d0ce0c SHA512 9086a64b664f2d774439c0c9f10c2c1cd897684050eb60f8e3ad9256e0b9541deec3bd22fab0bdcf66e3d5bc795720c6923d514b6edb824c9962fc22f162b332
-DIST json-2.3.1.gem 118784 BLAKE2B 6852f5d1733fd5d596b44d095c37d11a129b02fc61dc81afa90aef3623eefdb5515f6755dce42f055954baf2ac45e87620940ccd7c2c839501945923dbe62d18 SHA512 a9a0c54ac1faacc412ad708b630c8bad8c6f99db6862e8fc80c46207f0f0972433fbfe51d0c93a5d91b91c59b1fef5ad8e64e36cc49e32b3e51ff390a380a2a9
 DIST json-2.5.1.tar.gz 131183 BLAKE2B 2ccdf5921ef476b66cb1dbf72cc01763636c82b0eb5d0a5cfc029e14177c7c6766464e7852b11c2424db401f5b931cb64c01d3952929236c9979378a7928ea59 SHA512 4df7ec9b86692376e89c2019c2c1ab3ae9af28fb4742864acc6f985c0551fc10795742cc1124d6435e820617c00d4c5f4aa6c83b21d2fff43ed05cd9d0a89087
 EBUILD json-2.3.0.ebuild 2010 BLAKE2B 6ef2f9402a1ba2e54467f832f1b133c298c16c3664433ea459d0f8bc7d28141eeb9ac1ed11d9b8263fe469c8837b1849ed3859be23d5f44b7fbdf32a79a14abb SHA512 b45f896a497fbdd248152abe45a56b1b81c36a043db82e5d93661432bf6fe9061aaefe378c08e2e160a2d9c87510627aba66920f7e75405bc0b0c505c1fd8c7e
-EBUILD json-2.3.1.ebuild 2011 BLAKE2B c84cc2365edb9c5d5bdbe10e685633bd6686d2010b251bae57cb1b0eb03ffe1f2836dee1d3709d0f28d34c5f92ef46aac6b88603e1420baa05cc961b30fd4771 SHA512 2365221d5f20d97fec7f091ceaa4b5629f3caf8fc1e2f2000cae41815c13ea889fe0ad8430e17605d737576cc95bf98c4a2415cc753be9ba6220d3d92f31f419
-EBUILD json-2.5.1-r1.ebuild 1950 BLAKE2B 9fda187e857a00ee7b04258a4a2cc30b28678b1658de9ccac5859d7edd59d0fecff9368d7125e26675c9e25928284740f9c59e638bb4ace1afd0557e70cf5311 SHA512 41ebb8bc69c7c97a6ff2cdbe9ffb553956d7e3451ec1dc2b70c33328403690ae607c4ca8ac48c05fd07e2a16b95aa9534aa672cfce54f92b69f0d3f32cbbc4e6
-EBUILD json-2.5.1.ebuild 1995 BLAKE2B 74ca3a0ad79c798925abb2ccf15d0f57284ad7e3c2909b3680695f75cffe8326a7f15ca1673edb6c78a261da946692f21b54a263c1ce778656d1b90aacdca05f SHA512 1905491e97d2672b588e0ed8bc45a89eea6e0798121d3626f81a440dd4447a324b085f1d13b1baed51be7a6fea15bae71387cc0f82bf7ef9e426e342aaf423b1
+EBUILD json-2.5.1-r1.ebuild 1943 BLAKE2B 1f6d91db9dc67ba301f40ee890bdf3cf895edaf1f8510f42ed3c45ed9f87e8f8141148d5a0e71483ea1cc43659990ea7ea0b632d63c81550d3150827b2b5e2dd SHA512 aaacdfd48c1f57c35756611d97566952609c3d914b99cfd54128d4b3f817704ec98b54a92f719ce96a7874a5b6c8f7c06c179bb477f8d9d34c8ce072291a7496
 MISC metadata.xml 337 BLAKE2B 6b424567109cd8947377b5f955a9b32d3c12a25001e8d68cf62ac753264a0d8785f0fc60fc2ffbe5ad4e7a16ebd763add075820e4e559b50f6a230ef2f7a61a5 SHA512 e6900f34ad0c2a8310286eae9942432533dd78a14a04fb5d2551be21437cacc1a2d83b40ec93e885b30626cf49491f7db8a19b6e16009b6931cb0fd0c8ca8d5d
diff --git a/dev-ruby/json/json-2.3.1.ebuild b/dev-ruby/json/json-2.3.1.ebuild
deleted file mode 100644
index a71902f0775f..000000000000
--- a/dev-ruby/json/json-2.3.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="json.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension"
-HOMEPAGE="https://github.com/flori/json"
-LICENSE="Ruby"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="2"
-IUSE=""
-
-RDEPEND="${RDEPEND}"
-DEPEND="${DEPEND}
-	dev-util/ragel"
-
-ruby_add_bdepend "dev-ruby/rake
-	doc? ( dev-ruby/rdoc )
-	test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	# And don't call git to list files. We're using the pregenerated spec anyway.
-	sed -i \
-		-e '/task :test/ s|:compile,||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		-e 's|`git ls-files`|""|' \
-		Rakefile || die "rakefile fix failed"
-
-	# Remove hardcoded and broken -O setting.
-	sed -i -e '/^  \(if\|unless\)/,/^  end/ s:^:#:' \
-		-e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die
-
-	# Avoid setting gem since it will not be available yet when installing
-	sed -i -e '/gem/ s:^:#:' tests/test_helper.rb || die
-}
-
-each_ruby_configure() {
-	for ext in parser generator ; do
-		${RUBY} -Cext/json/ext/${ext} extconf.rb || die
-	done
-}
-
-each_ruby_compile() {
-	for ext in parser generator ; do
-		emake V=1 -Cext/json/ext/${ext}
-		cp ext/json/ext/${ext}/${ext}$(get_modname) ext/json/ext/ || die
-	done
-}
-
-each_ruby_test() {
-	for t in pure ext ; do
-		JSON=${T} ${RUBY} -S rake do_test_${t} || die
-	done
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
-	ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
-}
diff --git a/dev-ruby/json/json-2.5.1-r1.ebuild b/dev-ruby/json/json-2.5.1-r1.ebuild
index 96cfc9286d23..3efecff8b3ca 100644
--- a/dev-ruby/json/json-2.5.1-r1.ebuild
+++ b/dev-ruby/json/json-2.5.1-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/flori/json"
 SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/json/json-2.5.1.ebuild b/dev-ruby/json/json-2.5.1.ebuild
deleted file mode 100644
index ad69f8dec5de..000000000000
--- a/dev-ruby/json/json-2.5.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="json.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension"
-HOMEPAGE="https://github.com/flori/json"
-SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Ruby"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="2"
-IUSE=""
-
-RDEPEND="${RDEPEND}"
-DEPEND="${DEPEND}
-	dev-util/ragel"
-
-ruby_add_bdepend "dev-ruby/rake
-	doc? ( dev-ruby/rdoc )
-	test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	# And don't call git to list files. We're using the pregenerated spec anyway.
-	sed -i \
-		-e '/task :test/ s|:compile,||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		-e 's|`git ls-files`|""|' \
-		Rakefile || die "rakefile fix failed"
-
-	# Remove hardcoded and broken -O setting.
-	sed -i -e '/^  \(if\|unless\)/,/^  end/ s:^:#:' \
-		-e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die
-
-	# Avoid setting gem since it will not be available yet when installing
-	sed -i -e '/gem/ s:^:#:' tests/test_helper.rb || die
-}
-
-each_ruby_configure() {
-	for ext in parser generator ; do
-		${RUBY} -Cext/json/ext/${ext} extconf.rb || die
-	done
-}
-
-each_ruby_compile() {
-	for ext in parser generator ; do
-		emake V=1 -Cext/json/ext/${ext}
-		cp ext/json/ext/${ext}/${ext}$(get_modname) ext/json/ext/ || die
-	done
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
-	ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
-}
diff --git a/dev-ruby/jwt/Manifest b/dev-ruby/jwt/Manifest
index 0fb2ae7d715b..04e476df91bf 100644
--- a/dev-ruby/jwt/Manifest
+++ b/dev-ruby/jwt/Manifest
@@ -1,6 +1,6 @@
 AUX jwt-2.2.3-ec-test.patch 852 BLAKE2B fd489a9c7153da73ff21cd9a2f627285bd072e3557f52cee1ee8a7a7dd6112ce68a5e0c331bb395145dea8c5083cfc3bc02146597826164371cebb506eb62773 SHA512 c6a02444b12beeb6d357edef7f7d0352f48638ebcee4795561c3fae0a829268b46324c968291e53bf5cc0a074218d8e8a5adf4e9005751590c4cd387850d5f9d
-DIST jwt-2.2.2.tar.gz 43084 BLAKE2B 998c2770e50cc65b5cb687f99f76b64a6a8d58a5c4312c32b642c7280abcf268f43588f7a8421d05c892072f7e39a6b48c1eb57dde950e92372f2bfe5eda9083 SHA512 04ac42afb09ad8648e2c428cb7493f738b1944e5fd273723cd2fc2550d6ab3486c2f3be5ae5bac7e36664e58d2fa913e5b38ba34361a98ebe1259d18008341b9
 DIST jwt-2.2.3.tar.gz 50675 BLAKE2B 904a2b9be80ece10cc046d35df784ecc4991c3b09a79c2e2e461003596e9212409ed5840282ce632d3ff499754c505cd899ca95945f562883869ff3c50c4399a SHA512 ebefbf8f825afc1a78329088012118ed681a61bdf9e1c6a3fa125d46105092f1f26a4bc88791788c0290009dbc0427128d655a301c034ac07caf14216744962c
-EBUILD jwt-2.2.2.ebuild 777 BLAKE2B 392b81dba214db80fea2276c86d8a8ea2c92f55e4f96a138c1b1abc38cb84af81b11be686e3c5de33563f5fc84bda7e467bc3c4815b01ebad3d1fff5b0cd6281 SHA512 305b51f60e0f496771402a401d2ad2207fdbf4ce9e64aeed8fe7e4089e465a7cef9a2d3a25408a93388ba32b20ec7d92d35817ff66a649d7af4ec03f227732e0
+DIST jwt-2.3.0.tar.gz 53312 BLAKE2B 4653a786d0f5da0d7c7e160f5b0c189f0eab78d045d5af441561c953d6d42fc74d6baff95e54dd9bfd47b3245f3b628e25f99e37016631ef282d95564a08cb1d SHA512 a4dfbb119575d9b5f883c2789734180f092adc75e05310de2e523e352f47469243868480e06f9bfabfa2a48e174ea669e69bd73e0fd002c4f66134462ffe2653
 EBUILD jwt-2.2.3.ebuild 849 BLAKE2B 34447bb74c1c066e60365a371c254c9ac7c23f4fad60f246e6be2b3edf91fdf0eb7862401e59118c9e63adebb0c3f49ce57c402c909970492af3831abc18d8b6 SHA512 ebf4384b52ec03620adf4b141ffe9533ac0f8cade3222d9926c2417e40e0d6b67e17cda12d619629c195d1082a1d77ad10c976c7a90b139fae4711baa4d5515e
+EBUILD jwt-2.3.0.ebuild 803 BLAKE2B 4c3c01e0d2ab4a59e28d4a959845320a24ddb9dd299ffcc69c2eabf47735059ab833e07577b3eedd1debe4d1d9fff1ac2b73a60f21edb59fb0c30eabc5a34be0 SHA512 b0e68fc816db26ce200eb32d881eca68b0e6e12428e516dc95933f902fd01e29c6444c2e239879bd115fcbeb40a28f9be8e3e1b95176c64d9dba3558f04b1012
 MISC metadata.xml 339 BLAKE2B f797d6d373de253b9c14671570c04706d02d9ce5c931b54984eb89fb13dc29090123b6b30a8d3cacca6bb5e2819b294e0acb86b337a649dee292d8b579640b68 SHA512 2a3235a78045ad0be735dae3f33d3b946f162c837e6d903da889780879c370c586315300cb9b4dc5ee7ca73a545ece43ea949cc0f94f20c3430a8090f491aa70
diff --git a/dev-ruby/jwt/jwt-2.2.2.ebuild b/dev-ruby/jwt/jwt-2.2.2.ebuild
deleted file mode 100644
index 36bd96cb600e..000000000000
--- a/dev-ruby/jwt/jwt-2.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
-HOMEPAGE="https://github.com/jwt/ruby-jwt"
-SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="ruby-jwt-${PV}"
-
-ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
-
-all_ruby_prepare() {
-	sed -i -e "/simplecov/ s:^:#:" \
-		-e '/^SimpleCov.configure/,/^end/ s:^:#:' \
-		-e '/codeclimate/I s:^:#:' \
-		-e '/codacy/I s:^:#:' \
-		spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/jwt/jwt-2.3.0.ebuild b/dev-ruby/jwt/jwt-2.3.0.ebuild
new file mode 100644
index 000000000000..62bb08bb5f03
--- /dev/null
+++ b/dev-ruby/jwt/jwt-2.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="ruby-jwt.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
+HOMEPAGE="https://github.com/jwt/ruby-jwt"
+SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="ruby-jwt-${PV}"
+
+ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/ s:^:#:" \
+		-e '/^SimpleCov.start/,/^end/ s:^:#:' \
+		spec/spec_helper.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/launchy/Manifest b/dev-ruby/launchy/Manifest
index a7855cac4909..1a33ef72cada 100644
--- a/dev-ruby/launchy/Manifest
+++ b/dev-ruby/launchy/Manifest
@@ -1,6 +1,4 @@
 AUX launchy-2.4.2-drop-failing-test.patch 1033 BLAKE2B 77de99bf447ca68eb16bc10300f9e8f37ecb65720d3726a423b4554e76599992fdb3396933ea689e52348780fddbdf1d9d4fa0c7e22d92efc6a72ac029bae168 SHA512 395fb705f490d06867eea7ee89fdd72b5b7c9dd472bb06b268804d0bd100aa08b99a840024a976bacf120776b44a878bd5b08e7a3fa18f6f2abe1ec2c58da649
-DIST launchy-2.4.3.gem 29184 BLAKE2B d6e8e26f37a811fc994ee762791ea9ddb424dc99d23790905f80416734677535aa8b2087eab233dc1535556c240f260c5995185e10642cd682bbe508e3e30654 SHA512 7c3e0377c9a310b2e7a4d1544b4790f6f959d24b6aba91660e979eb943f4bee641e0b5a44687b693ffe99304ceb96a9a6cf9fed142e231af01135bd2b73321d6
 DIST launchy-2.5.0.gem 30208 BLAKE2B 30719f97fdf1bca8a66eb113992c8714103a7fe87262c3677a0fa64b58070593bcbdba7357b81e5bada9e8a143e6601e28ef2d2730f0028fdaecefad23156fd8 SHA512 d80811009155d9cea6a2e69b5f7482aaec7d0bf23ecca4cbe72e440fb4eae1c38bc5904e863998f1966c7a99b98bad1f4456cec1cb076f96f5a99b835448b39f
-EBUILD launchy-2.4.3-r2.ebuild 1098 BLAKE2B 75dd785ed55971e0184afa0128dd38ef722fd3d30cb11ad0d490f370ea39ba0bc2153fc91c91c97ee21a6f19052b0e5ce89b6bb7a44381c2ba1f20325e508a64 SHA512 c954f1f045b0c18e25a204ddaa15e1f6e137b80cf1e0b7db0c91b87ddb5a8bc53aca0f0b919a8f6854520851187535329ffeb6f21544c05f147bad6155808c3a
-EBUILD launchy-2.5.0.ebuild 989 BLAKE2B f774b55182abe23ad9f612075d1891b0d023d086c90cb42874a8816eeb1b9801cbc707c9c4ad7d666ac339a4cbd2fa589d7338cca7c84362388490e9f80fb269 SHA512 ac815e763a77cc91a4f7d2100b234bcd0eb0d4cdef5aa34f90dbba0a6528f9bd26fcf5a9b9e0d17225582e317a7b63e36efe1990573ee918bd153ceb623abf9b
+EBUILD launchy-2.5.0.ebuild 989 BLAKE2B c9b7b7b7d409e237d5c5a00cce25163cb12674336519f3f98602324e81cbeb5fead33d6dfd9672dc97e3a24b6d1bd9603dea3229f6fbc50730b7eebb311a6df5 SHA512 ec6f74205feb50db2df117365d6b3ab06e848d016d7d95afddb1ba9588572bc36a7c2a12419917a855c60e205fbecb4899ce159befcdd5533429bf90568cf987
 MISC metadata.xml 340 BLAKE2B 2f7acbbbb97f4e02c4a6618277ff6e496971537b9da6273551bce546024e732123047735d29ecc7323eccacc7f8bb4b1244909c9017747c5ddf659851b53a864 SHA512 9e7f6f6e89a5992b20e3ee519bd0cc66947751dd021a367a9ab99252db1a3d1fc3d8dc0868e60b3db05a0fc493bbdc1764d1abc68e7861e3614b5c40391c4fcd
diff --git a/dev-ruby/launchy/launchy-2.4.3-r2.ebuild b/dev-ruby/launchy/launchy-2.4.3-r2.ebuild
deleted file mode 100644
index 061b8cfc357f..000000000000
--- a/dev-ruby/launchy/launchy-2.4.3-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Helper class for launching cross-platform applications"
-HOMEPAGE="https://github.com/copiousfreetime/launchy"
-
-LICENSE="ISC"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-# File collision conflict with x11-misc/launchy, bug 545170
-ruby_add_rdepend ">=dev-ruby/addressable-2.3 !!x11-misc/launchy"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.0:5 )"
-
-# This test is expected to fail on linux, drop it
-RUBY_PATCHES=( "${FILESDIR}"/${PN}-2.4.2-drop-failing-test.patch )
-
-all_ruby_prepare() {
-	sed -i -e "/[Ss]implecov/d" spec/spec_helper.rb || die
-
-	# Avoid tests depending on the current user's desktop environment.
-	sed -e '/returns NotFound if it cannot determine/askip "gentoo"' \
-		-i spec/detect/nix_desktop_environment_spec.rb || die
-	sed -e '/asssumes we open a local file if we have an exception/askip "gentoo"' \
-		-i spec/launchy_spec.rb || die
-}
diff --git a/dev-ruby/launchy/launchy-2.5.0.ebuild b/dev-ruby/launchy/launchy-2.5.0.ebuild
index 4ec867d948c5..ab526694d306 100644
--- a/dev-ruby/launchy/launchy-2.5.0.ebuild
+++ b/dev-ruby/launchy/launchy-2.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
 
diff --git a/dev-ruby/middleware/Manifest b/dev-ruby/middleware/Manifest
index 018b229666b6..0b44ca74b7ec 100644
--- a/dev-ruby/middleware/Manifest
+++ b/dev-ruby/middleware/Manifest
@@ -1,3 +1,3 @@
 DIST middleware-0.1.0.gem 11264 BLAKE2B 27d8db46ef95f30a751c26aade2331285887abf8360a07a99bce02ad1193650edf1d9dab30078ae9a6e56d8e1f3384f7c357d5a01d9a5ed52fedc9d3c4f559d3 SHA512 a485c254accefb915a56a6aaebb0bf5fa8520e5aefb1dca9945f4402fd6fb28cd69b34692d5d276f2f025c6f919d983acba44ef0ad9d8966fc571f7cfd64da12
-EBUILD middleware-0.1.0.ebuild 664 BLAKE2B ff948b171e3c0b2896c0757a205f915cded0b41d46717e34f96f6b3d51992f53f9be320c4e9c5976a27ddb4013ad32b76b1092872d94ec523ab1fa487a386508 SHA512 3eec3664867cac4507698e963f42f7a1b85b756499c733ab7b22aaac19f6d7cdd5d12e39befb235ca7fd2fc56f15bd84d4b311dabaf45c6b7ea56811ee81f14f
+EBUILD middleware-0.1.0.ebuild 680 BLAKE2B d28f6f5611ab6a2b8139370843aa04043db9dcb37f48f5d6001010257457d72bb679d980efdfb62485bbe7a18aa8a23eaeaf3d418633c3ad67774a68ee6d95b4 SHA512 380a7e5738e8a39950a3b1046113c1fc011ba88199f92fc2a409471693e8e2d00b5fadc96900a87db54894fb91af8101478a3a3861d5be249e33f154c0a29ea4
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/middleware/middleware-0.1.0.ebuild b/dev-ruby/middleware/middleware-0.1.0.ebuild
index 544330db00c9..26d63aa73db9 100644
--- a/dev-ruby/middleware/middleware-0.1.0.ebuild
+++ b/dev-ruby/middleware/middleware-0.1.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Generalized implementation of the middleware abstraction for Ruby"
 HOMEPAGE="https://github.com/mitchellh/middleware"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/mime-types-data/Manifest b/dev-ruby/mime-types-data/Manifest
index f14cf3e5dc63..0adfdae7eade 100644
--- a/dev-ruby/mime-types-data/Manifest
+++ b/dev-ruby/mime-types-data/Manifest
@@ -1,7 +1,5 @@
-DIST mime-types-data-3.2021.0225.gem 167936 BLAKE2B 59d4b3a347fc19537c4e94bced938f8fd0412653863702529c443f26bd47f63c1ab7232137cd1efc38be5335a179f5e9e50915c7c16599fa016e8a97e0ab9048 SHA512 348ccd1cbf0336dd512dca48d706fdc7b3c66eaa5d24da16eb0c823c69888c9af03837aefb3fb7449c6fc084167c12eeabb8fddedabbc24a42a72c2cc23d3c6c
 DIST mime-types-data-3.2021.0704.gem 169984 BLAKE2B d5179c3ae38215eaab5244b59d8935800d05b3b79d496f765633e5a799f5d46cbf59b53682ef793a340ddc69f89302285c081d535c7d211e9eb458cbf64d07ed SHA512 0d0b4787bb39d7cacc202e2eba3c3e5e04efe1cd053332dbe1f0daeb9a58d533bceb01711a0d392ecca83f8d00f8fe7cc55f586060c3633b42749d7cb25246a3
 DIST mime-types-data-3.2021.0901.gem 170496 BLAKE2B 549bddb921941f15599db71dd76ed1502341101386c10550372796d5de8591575f4525276e196bfafe246132ce6a67007cd8afb0634013e5690eef06439af84a SHA512 382cfe97d19e516925dfa04220516ea6f2c4002e92831d6bb112c11a5378bf8af5b373763841ed84e6fa1bca4d72d4fe9ccde94ad0a9f6f7ce9930270574d8db
-EBUILD mime-types-data-3.2021.0225.ebuild 620 BLAKE2B b247c690ae342767e30398baebd7c4a9ee1ad3d5a652294526bcc529a5b3d0346d0de3d8926e2b9056f14075976d36a5beee1f4a12d1f8865caa04f4622b96bf SHA512 4c22b456f0239421f4877a361df7a05f5f849b2c9ebedce15ddc468d28bb7f1659b807a21e88eb4f7db2c842db71aa7b388ba1cf22c07cd1e21a7493b321b264
 EBUILD mime-types-data-3.2021.0704.ebuild 627 BLAKE2B a858ff3d050f80dc05a55e5a882c8b1ca7ba489f6be1c80de91b30d82948701e997bf33e19398a442b0d8c73fcc04febc4862d27cb6c3ff8120fe9c5c1c2f895 SHA512 0c845812ee86800bd4a0b575202edbaf88906e270dd7f1d44dcac2c054018f020faecdf0f463f27fffe2ebece2c3c5605599157791ba295ec20547b65edf0947
-EBUILD mime-types-data-3.2021.0901.ebuild 621 BLAKE2B 721c9086925e7b18cf72528451c35e409ecc237460ba5ff0bd646bbeb6fd66cd9b39f0b10c2b5893e8188f191f6d4b2dc4e409c5f04ca5aa105bc5c723f5039e SHA512 3c7399bef269d48c58bef801a3fd11676433e0e159a70630c5e9d430ab0605134eeaddd479fdeacc2561bab6332763b915593493a8a8f739c1c91bc5651f7581
+EBUILD mime-types-data-3.2021.0901.ebuild 620 BLAKE2B f509b804b32fdd23703a1f826bc9e8e43c870d2a2e6825df9c46b5214abdc16dbed443b3789d7bea8e6b6522a3f5f7d78210991b718c23696503f85764d03c99 SHA512 d6c44e96d3ab902221f6053132b4a3a13418a4e51249841e55d8afc9c66bc1dc79645fbcbf2dd42f9ee6a085e8b311726dcf5883fd4dbd6ab7fb402d97914a03
 MISC metadata.xml 353 BLAKE2B 8cfdcb1624b48ec3419ebaca31fe8045773377232977772d5445558947c2c0272c8777b5949fa9a30fc41275082fc284d6110ce640d465d9f6ee4c6f70e7f470 SHA512 072336e2f6abae82b5d66bd077d0b3651b6d8a3c1846d1e6e84974e0cb275881a986ec4fbabde731aeab59eb956514c44adfe5b67b185660f20eb1a286b22a26
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2021.0225.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2021.0225.ebuild
deleted file mode 100644
index f1df36cdb856..000000000000
--- a/dev-ruby/mime-types-data/mime-types-data-3.2021.0225.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Registry for information about MIME media type definitions"
-HOMEPAGE="https://github.com/mime-types/mime-types-data"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild
index 177ccbaec43f..0e3f539b679d 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index c1919ae838c6..6deaadfbe476 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -1,5 +1,5 @@
 DIST mime-types-2.99.2.gem 149504 BLAKE2B d2088d606b0210a8607d351ce7b7e3b7f25c3d518eaa3cb32ccfbf56a16eea104c908614f315317cece175003261d240f43bbf203619b54da35702abb94be8ce SHA512 46b3add451c3a6879f0f5df5f1e09c41d78d5a5b3872c2fcae7c8b097008cb04a9f5606360af9cc9880d7d659fe2dad19a118e6dfca1774ec3f5a5b852e31720
 DIST mime-types-3.3.1.gem 36352 BLAKE2B 66b97cc51d157d445d05823a3059efb6684a59d6b976945df77beb6497979a83d3ada4832cc36a42b6fad2353d1b5f2d7d1271a7947a0264978f30b857c0c7c3 SHA512 48646c5d3cc1b65ad0418bd765c86102d5dd7d0196f1b2b4b92acd350d6927e0c0fec3d30d04bf8b073d342f56b38663dee791f2c87f82b5743c6508265692ec
 EBUILD mime-types-2.99.2.ebuild 954 BLAKE2B f7b0ef6ce92e3ec23fa286d55e645864ee517a13deda8ad78b94addcbffd61f1ad9887a87ca912882b8e03b3336f08d0e4e4617e50808bad3fad2881f86655f3 SHA512 cff676037784df55c8da8e171d3efbc0c6a16567b1b52f938c45964cf8e7e1ff50cbcc098c90434e0468cb3a82e24c3ecc6612e9125ff86105140a69cf27d147
-EBUILD mime-types-3.3.1.ebuild 884 BLAKE2B 67066d635c05a69c5b92c1312638ee00d709095bf428f2e33ff530a640973d05f72a4fcefbfbb9bdafd54521e899e0180bfa7d52b304fe715a95425aec8baf68 SHA512 343ef943022f3007d4b038bc82fe3196b3b51ecfca7f8bffcc1f35632b8002f1ef84cc224658f03c1cc7ff8f3ae6cf5f8900f2acb40a087d6b5cc2ea62f957f2
+EBUILD mime-types-3.3.1.ebuild 883 BLAKE2B e7def86853ef408c7f97a606f28c26a892a76ed908144d6c4ce3e495335e9671691a168e6c0df4026dc40a41ac414c59dee8e6f73d86be01827495233bfd7557 SHA512 8c2bd498f2b17e8d927b4f2b561ef6eec7754e79a226a524954787dc4cfcb5b85e896076b4e2751c17bb1c81d08ff1892e38f14cb8533a71dede5f0244e82f59
 MISC metadata.xml 353 BLAKE2B d3a674bfa5b4ee14e4ae29722f8b03c7fe30f8978bf40654bf3dad99d67d09a34fd2b01c1f347cb014f2d306ffd31fdcb1f8d1f68844d5005742a979c6308618 SHA512 ec6b59001e875f74e73e645b69828d9498e39e0820016eb453341f0f0a14b7d50e4fb188d959a1893f438fb4f8f8c8b0f5422b31bc1e9ed08ca8bfc33d78a50f
diff --git a/dev-ruby/mime-types/mime-types-3.3.1.ebuild b/dev-ruby/mime-types/mime-types-3.3.1.ebuild
index 84d2493d89f6..1667d3883c70 100644
--- a/dev-ruby/mime-types/mime-types-3.3.1.ebuild
+++ b/dev-ruby/mime-types/mime-types-3.3.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/minitest-bonus-assertions:2 dev-ruby/minitest-hooks:1 )"
diff --git a/dev-ruby/mini_mime/Manifest b/dev-ruby/mini_mime/Manifest
index 6217e0866dea..eced4ac7ff8f 100644
--- a/dev-ruby/mini_mime/Manifest
+++ b/dev-ruby/mini_mime/Manifest
@@ -1,9 +1,7 @@
-DIST mini_mime-1.0.2.tar.gz 31971 BLAKE2B b2783f9376d5299ba77d1cab0326f706cc671a96aac58e8c65879f9180cf3f1f359eba1b8ed4028c775728d4d633d6e8cce06acee90cfe9b60cde2e53f9a2360 SHA512 644eefdc9277642b8b94ce8071826ec993f7da1a5bc8903bd17ece05a374f286014d05b5765ec5a5f7f0fa9252b56d3bdd03109a3702075f6e8ccb68a4cef98d
 DIST mini_mime-1.0.3.tar.gz 33554 BLAKE2B 7be4a7b8ee066a1106a42ff28ab57684460d061dc9205a992af471f5e9024be080388451f6f0d171c09b96f53c4748c9490afcfa23a82f478c5e96b559c8c97d SHA512 d8259b81821d35ddb8f9038ad2f672816f20e098ff74d8245fdc2a8a6e4be6918b865a25372348ef8dd777483883238919293a683df064d15ac7045f9b40bb0e
-DIST mini_mime-1.1.0.tar.gz 33748 BLAKE2B b804cb6c9c321dcb43a56fecaa04202a88a6233399ca0343c2e101bc3e583071ba5c0ae68bf5f89b220ce338ce6995c41c11ff7e05dd2dd657686ecdba107a88 SHA512 14f369a8a0d35c474691abf71b58597b31ed82d29083173b2c03e6e36d7b20cccf3e3f653c6d53b8abf21aec7d7f3198115238dd27b0e49e1bc9c65426d0dfb4
 DIST mini_mime-1.1.1.tar.gz 33747 BLAKE2B 2b18012d611157c1ace9211e99f2c6b41931a932ed9161b24367def3bf70d5780287a0b855ac32aae202e32a1158d08c7004515841e3baa1a2789d296bdf928e SHA512 b59e5d5a94b80eae62c9be2722e2fa8306620e8b4f54e3c7d020961a89b3d796e26b18a92b6da29677c3822ab68783874486cd1080ca552c9c2fcd3acb13811f
-EBUILD mini_mime-1.0.2.ebuild 1077 BLAKE2B e5350813078cead7f195cc419a44fe18c00423043ddd21b57943e02481b038ce7eb704e9aee5001f201ca7e3abf5d6f17c11e3bec344c197d19c8bde27d5c05c SHA512 97e4af23d1f278e58060e21e8e72f4df6039ae62ca24ef2e5349fa3f3200db539ec5f274be8120dd5d38a0b6d299ef5f6c46476c36e40e0de65e7ff3593b7682
+DIST mini_mime-1.1.2.tar.gz 33779 BLAKE2B acf4fc7bbaf4bb9df9a35aa8f093f3f607b0f57296f29511aa4d0cc8770af3c959f6c2b4e49d0e879dea6145e42a33f02d98a1f54af5f48cb248b95b3f6fa410 SHA512 696d0ddf69ba58671ff8a378e6d8bd302aa5b402f791f090b4d5413f48b90cf19de447d68942a4cdc329f4d42210bd62bf4757c1f226df5129cb269c0004a332
 EBUILD mini_mime-1.0.3.ebuild 1046 BLAKE2B e33497a70f7b14d03d7b243c66feb00732747df3b20a29308d090f5753a561572c4c99f9b7b7747db0f9f8507939b2b4ea55e8df6cceef5ab1aae784986e7053 SHA512 b5aace95732949cf447da4fa1ef44edae876dd58e8b809351c101d17f961b3a0967221c4cd3ba46f757ec41f9bd73362176a98f4e81cf357ff41fb012ac1d9ee
-EBUILD mini_mime-1.1.0.ebuild 1047 BLAKE2B 1f8901cd09e28c20ec0695e373f0c78b4851d3c4563702ef91c7c996c42df19baf9ac189b4b3dd26963512de32fa203f10731757ffd4cba47147f16153238718 SHA512 bea01071f5a8e1b9fa4ff6a668408f345c142c79d2a67585ba0d1d140ebd92981b93b18c1fa3ce8597edd70e3dc9b40bf1f78da63ded495d180c3442aadd78a6
 EBUILD mini_mime-1.1.1.ebuild 1047 BLAKE2B c02b7f7eb3794d22a985d85bdb78463636d4c93b0d50e77751e48c006f5c571a0947940643804b625abb3a35f6ae6122d867fc0026d4fb33c17c77dc8e79fa36 SHA512 3b9c751bf8898f6c6a91753756358bd4ee04500eda39949aaa29426c55c1168eb32773cfc86e2b93da8fcdda785c4274a7aa37a770ebb1fdb465807d3d8fdb99
+EBUILD mini_mime-1.1.2.ebuild 1047 BLAKE2B c02b7f7eb3794d22a985d85bdb78463636d4c93b0d50e77751e48c006f5c571a0947940643804b625abb3a35f6ae6122d867fc0026d4fb33c17c77dc8e79fa36 SHA512 3b9c751bf8898f6c6a91753756358bd4ee04500eda39949aaa29426c55c1168eb32773cfc86e2b93da8fcdda785c4274a7aa37a770ebb1fdb465807d3d8fdb99
 MISC metadata.xml 346 BLAKE2B bb121fb3666076fb31b24ae41abc0070e662ac4937121db5514acf8aed87745384ae11778464f6d0433138b38681ed4dcab62bce0ec125eb14c7ae3d411a6eb3 SHA512 8d1419c4178db23f7204cd1d1b219239fadadbe1b33e5aeac8d08d92f8c0b41f6648b6c062814dc00d8a518d2230e91518977ad4243b69d7c3fec706e0e12028
diff --git a/dev-ruby/mini_mime/mini_mime-1.0.2.ebuild b/dev-ruby/mini_mime/mini_mime-1.0.2.ebuild
deleted file mode 100644
index 4c8e30b4ec07..000000000000
--- a/dev-ruby/mini_mime/mini_mime-1.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="mini_mime.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A lightweight mime type lookup toy"
-HOMEPAGE="https://github.com/discourse/mini_mime"
-SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid comparison with MIME::Types because types may vary over time
-	# as they get reclassified leading to random harmless failures.
-	sed -i -e '/test_full_parity_with_mime_types/askip "gentoo"' test/mini_mime_test.rb || die
-}
diff --git a/dev-ruby/mini_mime/mini_mime-1.1.0.ebuild b/dev-ruby/mini_mime/mini_mime-1.1.0.ebuild
deleted file mode 100644
index 806ae30061f1..000000000000
--- a/dev-ruby/mini_mime/mini_mime-1.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="mini_mime.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A lightweight mime type lookup toy"
-HOMEPAGE="https://github.com/discourse/mini_mime"
-SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid comparison with MIME::Types because types may vary over time
-	# as they get reclassified leading to random harmless failures.
-	sed -i -e '/test_full_parity_with_mime_types/askip "gentoo"' test/mini_mime_test.rb || die
-}
diff --git a/dev-ruby/mini_mime/mini_mime-1.1.2.ebuild b/dev-ruby/mini_mime/mini_mime-1.1.2.ebuild
new file mode 100644
index 000000000000..e63c0445e32c
--- /dev/null
+++ b/dev-ruby/mini_mime/mini_mime-1.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="mini_mime.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A lightweight mime type lookup toy"
+HOMEPAGE="https://github.com/discourse/mini_mime"
+SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid comparison with MIME::Types because types may vary over time
+	# as they get reclassified leading to random harmless failures.
+	sed -i -e '/test_full_parity_with_mime_types/askip "gentoo"' test/mini_mime_test.rb || die
+}
diff --git a/dev-ruby/mini_portile2/Manifest b/dev-ruby/mini_portile2/Manifest
index b3e463224c6c..a157a1a1a365 100644
--- a/dev-ruby/mini_portile2/Manifest
+++ b/dev-ruby/mini_portile2/Manifest
@@ -1,3 +1,3 @@
 DIST mini_portile2-2.6.1.gem 27136 BLAKE2B 762b538c2d57cffe8a8ef570469b7796442f51a7a813a2e4f1dae5bd9a3ca62220c6dad1fc9d9157cbb8e93f940afce4b1e5b2b4d4f9edf01d54ce48d99dd6ca SHA512 d1cda6b7bb6b10187360717fc8ae6812d8f6625f6d302d4f76b7a829213f7938c7f0b68cdad7d7433186513542acfadd30100f4c641693e19ff82c5d6dc78859
-EBUILD mini_portile2-2.6.1.ebuild 549 BLAKE2B a783fbb799269991fd79db64aeac52af7345b7deced459d8c2cb6f431ac0e28b0f31a6d9b88a2f3ebbda2b7243f8cfc324b8581c660c86501520d30a003033c3 SHA512 1506256b34811b614d2b3572e456b8f3b12499d8a76c2f5b57f52a7d7e055d21d509c7688bcd591c0f8f11eb6f0edda98bb92343ff94c36f1a68c0d13a877726
+EBUILD mini_portile2-2.6.1.ebuild 586 BLAKE2B 27a2e762ba89d3ecea9558b7edcc5aa91b6490bc6025bd48cd827be40aea79a17e8cae2c77b5b56f99a30306c5d64b1e23349b7fb3080fd556c4ed0d8b7e2649 SHA512 d3f0bc7bedf03dbe5ee4983f180be9c2075c50fa124eeb9358f9a4da7062a77013c0b1827913fcd0b11555dae37cc60fa16a0a5c166d6e36c41d4490e0438b23
 MISC metadata.xml 351 BLAKE2B 1089816679cc238435b30f4a2365c7d1fe7a15837602f266924604629bf4300462b1ded28a537b9337c9fe13e4b397fcb1e97672bcf901eb65162090a514751d SHA512 80f58025f07a49376e4fab08a8396ccbc5e09ea76eea09263c3388666b14cea9dae84bfadff887aca2468c8651666d5e907911782968b76b7c1f3289036586e0
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.6.1.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.6.1.ebuild
index 1ab9cfaa4ead..2f76f0ccabe9 100644
--- a/dev-ruby/mini_portile2/mini_portile2-2.6.1.ebuild
+++ b/dev-ruby/mini_portile2/mini_portile2-2.6.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/flavorjones/mini_portile"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/minitar/Manifest b/dev-ruby/minitar/Manifest
index b7a531d39938..2776565c2cf4 100644
--- a/dev-ruby/minitar/Manifest
+++ b/dev-ruby/minitar/Manifest
@@ -1,3 +1,3 @@
 DIST minitar-0.9.tar.gz 33873 BLAKE2B 6d285c181510c96f173d850a9411da8a214459da14895e2d186ce712387d390c8ac95e27e4e768005540fdfb7463f32206085a72faf4de6b24c31cb732234260 SHA512 e3aaf0e664a985704cf9dccb72250ea2a7ebb2db9b6120590fb8d5525fe2717e0a90b3020f461ae0c4dfb19dc8728b4eeb6ba2e24ab75d12fbd7f5d98b269c79
-EBUILD minitar-0.9.ebuild 877 BLAKE2B 37a7e45651bdc27524c9340748dc7d5e0a09d6a8a24d503ba76f674ed223ee4e0c15e0dda0a82e678425bd82d26be9c2bd736f20b5c647e1ec4be9fc0f2fde0c SHA512 601d6a3e8606d29dec8997d29d18ba05e67cac76c87fb7e8863261a8ec8bf94e0ccbd569ab21532b28f3ec04afe10c44c76543ed6c59f3aed2c4ee99a479c189
+EBUILD minitar-0.9.ebuild 890 BLAKE2B 76b6876acda405824fd7e1362cdfeaa3a78c87ee9d4f29e600dd9262865080aff0b372d9d7b15787d63221299d6d084ccfd8474e63f4d3cfe3e3d6463170542d SHA512 f76271c97b3954761bf9014beb3470c2deec2f6faa318c49ccd5a6133600543f929125ca654176baa91a703a3ee7db4a393a91de960523745a32864e47c4c145
 MISC metadata.xml 345 BLAKE2B a46be73631fb9e5d1a47518c20dd0fbf2eb23c106f53c8f2b4bb3dfb2478246c2e764310c02ac1176e602ac0bf73a4daca80c10703a59f1ac861124df41905ca SHA512 8107541ada060cd98c15f57dfb1106cda2f0c5bfc6b4907b90abd7e5e5d8cbd93b2398b057a56af221cc4adb52d063ebb70b7e41c623d5936c720008a24d5b33
diff --git a/dev-ruby/minitar/minitar-0.9.ebuild b/dev-ruby/minitar/minitar-0.9.ebuild
index caeb476fbc53..113a71c59695 100644
--- a/dev-ruby/minitar/minitar-0.9.ebuild
+++ b/dev-ruby/minitar/minitar-0.9.ebuild
@@ -20,7 +20,7 @@ RUBY_S="minitar-${PV}"
 
 LICENSE="|| ( BSD-2 Ruby )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
diff --git a/dev-ruby/minitest-around/Manifest b/dev-ruby/minitest-around/Manifest
index 1d69136cdc8f..59d6c16f0ab6 100644
--- a/dev-ruby/minitest-around/Manifest
+++ b/dev-ruby/minitest-around/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-around-0.5.0.gem 11776 BLAKE2B 1b1bacc229252e41412380d95e50ad05f918c13d37e7939f96fa19e4254c7f5222482d0f080355e5a900ff8ef89f768cc527c9b1c2644817e4d46842cbf83140 SHA512 8e57d436d39a41c5a08df6006a5cd46f92550844f01f9b6662918b9ba9536b74f6c83fcaea64180c7e025a1a14d4e037e1b17b84ae395a2b745e58f21ba5c752
-EBUILD minitest-around-0.5.0.ebuild 760 BLAKE2B 2442acdeec2ecbe7b3feb5a71d22b1b476b0c2a562d2a532aeaf3de2aa4b07e1d4077eb9d9cf4507e072333cd0e70635211b4b4a7ec35249ca2b9b2e3a66f2d9 SHA512 eee19851d1b904a56ba8317e027b96e588525fabab0ee68d52d69ea930be0ba6f76a83bd8e56650125762b262370df4e74759a28c90fa49024a5355d410b4b80
+EBUILD minitest-around-0.5.0.ebuild 782 BLAKE2B 6e1de6ee17a6c4957897475decd79c8a44254ca131c880abcee65587d4de7cc231edd54c9613a75170ab539415ae278bdc204f7dfa269693936ca4a99d5d4f2b SHA512 cbf7a969ac283fb9d85117f3f413285a36f8727733f96fc6dac25862cf08b905005100f0bd013481a523746670d7fa7faf225b966f4ac2d816475de7f375260e
 MISC metadata.xml 352 BLAKE2B 299495959553f3851c1ad79b58f388357c9ad37d442d77e1ccf8cb857750ba81ccf1d0e87e7387b3fc70d8bdf63027a4356ac0827aac5d8ef47bf7e944e107fb SHA512 85dbb782b3bfddb799c94a0e03f5dd6c75282b25bce995791cf2a383d6324ffa9f36f1a6e99c1807a0cc5f7c14de93924c0534ca40f0fe003a8742aaee0f04d8
diff --git a/dev-ruby/minitest-around/minitest-around-0.5.0.ebuild b/dev-ruby/minitest-around/minitest-around-0.5.0.ebuild
index f10bc3cb786f..6bcd63803835 100644
--- a/dev-ruby/minitest-around/minitest-around-0.5.0.ebuild
+++ b/dev-ruby/minitest-around/minitest-around-0.5.0.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=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/splattael/minitest-around"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/minitest:5"
diff --git a/dev-ruby/minitest-bonus-assertions/Manifest b/dev-ruby/minitest-bonus-assertions/Manifest
index d932cf05bc34..8f8b4fae8fdb 100644
--- a/dev-ruby/minitest-bonus-assertions/Manifest
+++ b/dev-ruby/minitest-bonus-assertions/Manifest
@@ -1,4 +1,4 @@
 DIST minitest-bonus-assertions-3.0.gem 13824 BLAKE2B 415f8b48875b8335ded9fc21b5430b575d3d104179066de19aa58d1602da7ff9994c8ceb49b1cf34fd4c8553c76999bf1b638d2c44761af84d510ca1e276cec1 SHA512 8b07e5d3be7cf68be53b06f6b545445efd9021ff5423bb67c4b0e8e40aa004d75f34eef3fc23ebe83bceaaa064c57a5ac1b9969a28f48203a6ae4c34092c5621
-EBUILD minitest-bonus-assertions-3.0-r1.ebuild 1118 BLAKE2B b00f54dfe03765d354e7f6781ec1554126cf914d47fc7b064be86a96fd01b25351a535e2276bc263c33895e1362a2c83990964f863df79c9b102e4565cbc7fd4 SHA512 c935e8931c738553d302a25dcc15d4d03cc0062b4493790c12d9ac9aa9d8480d3f0d111538f8fcc5b8ec6111097790114f25a6068ee9e70af6edfc12a57652ac
+EBUILD minitest-bonus-assertions-3.0-r1.ebuild 1117 BLAKE2B e7b896be2b7aafd978a89d5c4991931246ba0d8cb39a753fb199b9333eb93d8e3673c5c81151b3ba1f15a0b6e4300df09a135f81f7a34ba755c40b1ad7c480df SHA512 ababf958369a42dfa55446f623f93c6d1e855faf49a1e2c67da44d18e7b147eac0415d73ae9e8a7a55512493591b254b1c54a2052e6af4d3daaadb08d6695cb8
 EBUILD minitest-bonus-assertions-3.0.ebuild 846 BLAKE2B dfc1e69788e12e01bddf68bdf1eb141910a44e5138db82f1151856306961b182bbc623ab791fd409c7c4366b214b17d468a249b2857153e13d697456085c7bf8 SHA512 bf0058400ce0d284e62785e80ffb03a352923d0234eb2ddfc15e49a377251fd3314833baa9f09ccadebab4a24ffb557de8a43912bd85d31f71f81fb1af1184dc
 MISC metadata.xml 363 BLAKE2B cddd328941ca6a61a46b11a35faf87fd00642046213292f0fdccc30e0a57ea9ad0fe1a17209e0ed0f5732d0f87b85d39f56606b9da689cffd17f420f2bd0b073 SHA512 ff5752a50512efa89159daaf2006aa36f69deb9d354db36996834ce5e61d0776dc6202bedb0610eef0abc0ec175d45db9811fc7f83f534325bafc3daee00fafc
diff --git a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
index 704a67c3b0b0..0f487e76c3ec 100644
--- a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
+++ b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/halostatue/minitest-bonus-assertions"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-pretty_diff )"
diff --git a/dev-ruby/minitest-hooks/Manifest b/dev-ruby/minitest-hooks/Manifest
index dfdb28d59601..319d929b175e 100644
--- a/dev-ruby/minitest-hooks/Manifest
+++ b/dev-ruby/minitest-hooks/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-hooks-1.5.0.gem 11264 BLAKE2B 740df3b75ade3372fbf75ed7bd861c70af6f11d8cd1f37819272b98bc8cd1fad6ea09375856cd48a75499e0a692411c6da4f5aec212ebae91b47531c4bedda54 SHA512 4e7c969485c6e8d3414710b787c8880ad26b71de9f0b4a93ca1bf343deba426feee1cc06fcc51eee05c4880d851664fff045026d44728e217607e4cb32aa8f4b
-EBUILD minitest-hooks-1.5.0.ebuild 531 BLAKE2B 0d4f94cf1156e54f3651d034cc1c8c04c3690e45a719b22eef37bed20655cb6c2bed3aa7eeceba80da8ee27611dd49b919b849ecc1edc4343ae0df02829c4868 SHA512 6e59765eed55f3777b24dbb2e56ca72f4bf627d95d1bf84cd992a45ac10db5f9514d658c2f3c70cac72092e8b777113e6dfce21935cafcb25b3ce71d2220c743
+EBUILD minitest-hooks-1.5.0.ebuild 530 BLAKE2B b753a596a9fb89d5c299e99d1fa58b2fa116e18215fa7260f51c0b051f563df6e62eae2bce2c0e4bf54f8be5e73c3a1896e259608e3b814a90a39c49043773d2 SHA512 faf53fdc73c7a7a7a5552461c2eec27122e12c89435d70e97d5f71781a5c0491b5aba2680aa81a86afecceca1ce57c2852b556fa8da0b4ba8825a3ca4d695236
 MISC metadata.xml 353 BLAKE2B 56f918c9b37553f0d6a8a1d2be23fb574be145b5d4bfb159746333d9995bb689701b0f7056bd69f9721c5d3d296a2374d9134f8bf07efe172c8e97f9e8d93a72 SHA512 ccaa8d13d5ffc19a6f52dde413e8f3950c13e5b1ce81f3b67794a53678713c34b5d0723533c2da78bb95808129d76a07e74f3fe4305bf1f1b84cb99bf1e5b9ff
diff --git a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
index 4ed2bfe1bc3f..2da0cf79558b 100644
--- a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
+++ b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/jeremyevans/minitest-hooks"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86"
 IUSE=""
diff --git a/dev-ruby/minitest-pretty_diff/Manifest b/dev-ruby/minitest-pretty_diff/Manifest
index a9e02ea0e3ae..450416e4594c 100644
--- a/dev-ruby/minitest-pretty_diff/Manifest
+++ b/dev-ruby/minitest-pretty_diff/Manifest
@@ -1,4 +1,4 @@
 DIST minitest-pretty_diff-0.1.gem 4608 BLAKE2B 4002f4f2df03885a0c1f13c5561bbf48ccd707f44af44f4e91d4f6337a31791754b3e38160f088abb7aee8ec6d9abb6734d3305dec808033697611864559efa1 SHA512 e04cbbdb9cd12f2b60824dc0e20f5f3ee3e97b6cf3c8b290da941f26af120fd8eb47e33cb501380954ebfd84db817095f2f8a205ea8ee2095868befd443172b6
-EBUILD minitest-pretty_diff-0.1-r1.ebuild 642 BLAKE2B 75449d436221c3a3588a2dd6460af4d6a94c5d187148f6120bd9c6f1c67f73dd3378da76bcc601c2ba3fdc4a8c494f75c40f74bab3c2180c52e0ae3453b525c7 SHA512 7d665e8a9f64f67ecffd4cecccf880596e5b867ff40f7e8344cc31059d4bc889eef7ead9a60db8ea94ab4eff4010fcc1af1625c802e4f17585f3ad14e92f7053
+EBUILD minitest-pretty_diff-0.1-r1.ebuild 641 BLAKE2B 222ff46e31100f17088d139c8c6862b82203d9e55ed29bd29fa26860320e84d01594da6778593230c4b8433026122d5ef804f15fbde9afa0c5dff52de6f24582 SHA512 b7fe08968bb7816b325d7b482c75040a27fb55ee58b7e4e6b33e7c5acaefc35b820e986bafb50bf1136463f97ff10b0ab01a9428ba342c6a6e37cb7a98ab7e11
 EBUILD minitest-pretty_diff-0.1.ebuild 666 BLAKE2B bbb218d4b6c16949ad76ff6844440ef1c57e31601b7b168ed7fc5ea722b3e2315ef96fccd6aa277e34cb5e965996abc523333fc3376701dbeee1143cfa7a78dd SHA512 353a933a435bb24292898e1d356381c5072fd6091bfe65f50783225beec8e4120d2cda6bf6853198066cfb9d269c64734d7512f084baed79a1cc933c27f15258
 MISC metadata.xml 355 BLAKE2B 71048e6e7841c99f5b2839218dfa55c624dd65c5d1eeee78b052e5454673654b32d32ac83d16fdfe7d35a627ada679b2e12b6054da095ca1be8f0edc462c074a SHA512 963e6f989b1d1de6c99b247ae05b7494c08f498b5dfb2bf32ec1146cea08b0942941f3bd8f9aad050bf4997f6fc86bec9e3b74fa94ab58e0b3125bfcdf5749f6
diff --git a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
index ade5492f1ed1..1b66be79afcb 100644
--- a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
+++ b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/adammck/minitest-pretty_diff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 each_ruby_test() {
diff --git a/dev-ruby/moneta/Manifest b/dev-ruby/moneta/Manifest
index 1c2ac2f60e1e..cf6f680244b1 100644
--- a/dev-ruby/moneta/Manifest
+++ b/dev-ruby/moneta/Manifest
@@ -3,5 +3,5 @@ DIST moneta-1.4.0.tar.gz 129069 BLAKE2B 86b3eaa875483acb5931eb5583f56a0484851df5
 DIST moneta-1.4.1.tar.gz 129056 BLAKE2B b5a7a9fdb1817c88c942ce8cc3353974d556f14e6362722ae4b44c40311241aa5dd7354054e4edaca84edcc3a76b3d43230dc0a376d48911409721137cbf8d01 SHA512 7ff8fec2047a7df7e110480ff87eadc8e33b776176350279dd933b456cc7def0e92b74eb5dfb7ac2b2233232959acd839ede80d491bba0f134c31414d3f7786b
 EBUILD moneta-1.3.0.ebuild 787 BLAKE2B e82d67649e98c63ec6a1f823f9eb0dd77f6b1bde4aa0b1ddf6b7be6564d79ec9f4ede2123f69e0722b8323edb6e8dc7cc761ba3ed86b9685ab09ea8f71b5e2cc SHA512 26efe595bfbc650b29d27281e19d2e4a5523449b286f82c9f07dfac14aded294228b3abdf9646f38cfeb397ef01669707f3d8eff828da1ca2b62849fdac7ab76
 EBUILD moneta-1.4.0.ebuild 787 BLAKE2B e82d67649e98c63ec6a1f823f9eb0dd77f6b1bde4aa0b1ddf6b7be6564d79ec9f4ede2123f69e0722b8323edb6e8dc7cc761ba3ed86b9685ab09ea8f71b5e2cc SHA512 26efe595bfbc650b29d27281e19d2e4a5523449b286f82c9f07dfac14aded294228b3abdf9646f38cfeb397ef01669707f3d8eff828da1ca2b62849fdac7ab76
-EBUILD moneta-1.4.1.ebuild 787 BLAKE2B 19f7fda4319aa8c6e7b9c76f2aea9cdb857ee2267608f51b6a055f87158547a99c46c54b306cd23ee801db0796344df49a88545a953a499c7b38635648971800 SHA512 a986b62b8efaadeb25198315f7bc90cb48a62431242b480798847fd43e87adc3511e45b5406a8f5e1997e704202ded4c8ad8f2ec62024db327657c7d17704c86
+EBUILD moneta-1.4.1.ebuild 787 BLAKE2B e02b64d63a17b165a3eebef1b79ccf70da10c3edf72bcf60814983eab3af2bc6d64cbcbcc556171abb805440ae4484791f061faf797702e4cf2c99c583550f10 SHA512 d46887f75a6748c366df99351f11e777b82fcbaf774be1f67fffba65a01000168948eb55a49f41a377e5b12fedf9b762a76eab5f33b4b1bb2ab86d34187d493d
 MISC metadata.xml 339 BLAKE2B 21f9c4d9f4a62da269fa46aee7673be44d39ccdc286a7e2fce487405afc0468db93c14d186d99088a3004616ff825e5ef9e735e9eecbaecbd879a459f41784b9 SHA512 6335c7aca4de92722c5df1661c2b36e5c0080f189f7749ded437a2f50fcbf174b6ec8aadb47705bccee4ffed27d13163d67f307ccbb384d0c9c75d5600158aee
diff --git a/dev-ruby/moneta/moneta-1.4.1.ebuild b/dev-ruby/moneta/moneta-1.4.1.ebuild
index 0403894ac099..c0b1e01a65bb 100644
--- a/dev-ruby/moneta/moneta-1.4.1.ebuild
+++ b/dev-ruby/moneta/moneta-1.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/narray/Manifest b/dev-ruby/narray/Manifest
index c5b4486f2acc..36562f0dd0fc 100644
--- a/dev-ruby/narray/Manifest
+++ b/dev-ruby/narray/Manifest
@@ -1,3 +1,4 @@
 DIST narray-0.6.1.2.tar.gz 68621 BLAKE2B c4e48b81fb0d79cc49e32ed8204d9cac3f483eb44e1207f422f5b272bb8891836d81cd83c090f4d643677b1159801c13d15580504e6ca244a2a75d4b6dfb3204 SHA512 51e9bec0b711e79e268b73496ad742b80bb46a6e9ea6aab9a2535a700b6efc8f7ae2e854f5772d434e3d385d81275744dbc796ebec4d3de73f2ec0546bd2339a
+EBUILD narray-0.6.1.2-r1.ebuild 1382 BLAKE2B 4ab04e3588beb88070f127e54c8bcb5c32bb32bfbebe83b518b3d99e4f961de429334dbe948cbfb87f9f831991e45b2cb7fb44d3eae0478c0d5cb6d62d5eb5f4 SHA512 f17e23f6e2ebd1de1bef373a02b23e30c714c077d51566f73f67e6183b97162c8444064db2fd95778e5f61fdc4a35faee403101dc2803e66bbcf3bf59c587ed1
 EBUILD narray-0.6.1.2.ebuild 1278 BLAKE2B 589c8fc8f27e997a1e4dbb5d88087c71b5656b2288664377917142cd1686c1d2eb0f03acbc07431106cf2bcd08301ec16a302ec9d3cd77d734ab0c6652c78638 SHA512 5981c8a4b94c95eb7d3f14755713b52bb5f913598ff63a80fc3cee08e93f75c90188b69deec71309e4d55f44b11b1d1f40a06e78f4182a31cf5e2f8030b7afa9
 MISC metadata.xml 340 BLAKE2B 6c255c48b2c01b92dea7b9f2ab2e6f2d119d0624650d1354fa2335db7ca2200e63bfc5f0dc383ebafe99ab3830d570a89b4fb04fa1a7fee913f25f7cfde3852e SHA512 4f57e3d54e985f412d93d434f6ea0ac1b72a136cb8b9b6476950e7e567542cb8eeebe1fc5b8fd2d9c2c9bb9351a1e744dc01c1b0bb8f32d1d8c9d21a3c134e83
diff --git a/dev-ruby/narray/narray-0.6.1.2-r1.ebuild b/dev-ruby/narray/narray-0.6.1.2-r1.ebuild
new file mode 100644
index 000000000000..009d7058af8e
--- /dev/null
+++ b/dev-ruby/narray/narray-0.6.1.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md README.ja.md SPEC.en.txt SPEC.ja.txt"
+
+RUBY_FAKEGEM_GEMSPEC="narray.gemspec"
+RUBY_FAKEGEM_VERSION="${PV/_p/.}"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Numerical N-dimensional Array class"
+HOMEPAGE="https://masa16.github.io/narray/"
+SRC_URI="https://github.com/masa16/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+
+IUSE=""
+
+all_ruby_prepare() {
+	# the tests aren't really written to be a testsuite, so the
+	# failure cases will literally fail; ignore all of those and
+	# instead expect that the rest won't fail.
+	sed -i -e '/[fF]ollowing will fail/,$ s:^:#:' \
+		-e '/next will fail/,$ s:^:#:' \
+		test/*.rb || die "sed failed"
+
+	sed -i -e 's:src/narray.h:narray.h:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	${RUBY} extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
+	cp -l ${PN}$(get_modname) ${PN}.h ${PN}_config.h lib/ || die "copy of ${PN}$(get_modname) failed"
+}
+
+each_ruby_test() {
+	for unit in test/*; do
+		${RUBY} -Ilib ${unit} || die "test ${unit} failed"
+	done
+}
diff --git a/dev-ruby/net-http-persistent/Manifest b/dev-ruby/net-http-persistent/Manifest
index 4b2b550cd915..7f174f5d0156 100644
--- a/dev-ruby/net-http-persistent/Manifest
+++ b/dev-ruby/net-http-persistent/Manifest
@@ -1,9 +1,5 @@
-DIST net-http-persistent-3.0.0.gem 30208 BLAKE2B 2bbd87d66e65081c76bc9cddaeb38f3ffd8a92b5b64f7717f77c7a927e2032fa732c2e82e220a75a63ddc10dfaa6a0f24e4fa7e0964e2ebd3d0729127f1fb452 SHA512 a601d3abde43b196406e3cdd6b704796ed70db67dfb67c9b510e0164ce7355cc925cac37fbf4c5889f41b069890ba2e2c15440fb40294ed21891fd08d9f87894
 DIST net-http-persistent-3.1.0.gem 31744 BLAKE2B fdd9c36ab5216c1cd1fe358207a689276e109845ac374ea16011469b6cb2b165115e78e701cce98c280e7f878c23d8016e75cac4508c7e579209012671b64101 SHA512 65b5afc4ad0729ec14b642e0e36363cecfff3dc25b26308d632866e93fed3eccfb83ce85da78f631553c6a1fe3ee834fcbc9d3681c85db6387463abbc30e60fa
-DIST net-http-persistent-4.0.0.gem 30720 BLAKE2B 5955cd60c86ae74c1f9d3415bf0257542718fc83d2b82cbc6ce31b5013edd1c0c3202757ccaf23a33c70d90fcb04e6bdfd2cdddfb82a45733ae3d15a5c526301 SHA512 eccc6cacfdd1dfb99bd0dcb7fe1c13cb1c21eae0104357156888bd0a5b2ee0b0d8ed5687860670c2dc54ccc1cfc7a090592bee160458427f44c255c1b99938d2
 DIST net-http-persistent-4.0.1.gem 27136 BLAKE2B b88151498c401cc20983c86859d7ef7ae3688ee12a5fcc69544d9716c3aeed55f4339d35ec08e9c0a6a16b4b4ab807d7155425c3056b9634185c255472ad93c5 SHA512 d3c86c9c58affac8cde1513dd899527406c0baafd3a620b80011e3babf51a4bfd6fb2bd8998fd9c4696d49aad2d014bdf666b9626e06fe4413cb4010f94e5e91
-EBUILD net-http-persistent-3.0.0.ebuild 874 BLAKE2B a3015ff9e4532090626746a238b180ea045c34fd882edbd8fbcc30d7969d65e78ff1dcd24160ae812531b5851b62f86e3fe9bb3a7650d22614b07016a4828b79 SHA512 9d18e19de760d5a2a3eafcd362f7f5f6fff3768d74b7bedc981f17fd015e3b229d5cb15ba0fe198f898816cd6f2117569f19f0708a00f8b32f53512addfe4213
 EBUILD net-http-persistent-3.1.0.ebuild 867 BLAKE2B ad7768aff4ddfab8295fd4256aedc83284e923b5d3f548029f079673914da92d6b27a2d089abf20ee62ed2cc5ba358373b35b4b2c7e1f3c3d48e575daa0ef3bc SHA512 26f88aac2cfeaa317cc1727031a418e91bb9d8bc54a9df03431338aa67ec60ed049ad3ed4c9d161d5a3951cd11033be1aecc1316d067e68b3e298b850ac7db0b
-EBUILD net-http-persistent-4.0.0.ebuild 855 BLAKE2B 7ffed8c7fe63f3d2018fc69e4c5e3c7b23f1a3a5902d0033352ab9b0b90e205ec1ebbdff050da1a5bc10b17e454ce8436a89d878fec1e75a2241732714d37881 SHA512 47aa38d2cd60879e4beadf084c133c7223a32165316b29da0ec1e893796cd153c90b954ff1b3304d539453107d103ba6df819deb6605bf1a7f59fe6bd9aca355
 EBUILD net-http-persistent-4.0.1.ebuild 855 BLAKE2B 9dc20f415926236c8319a050187d5c8039b341cf0ae1c8d5f431a4495d9247e9800dc6ce78b7284f0fb95d9cdbcd3a4d35018576f7401d773ef7afdc38c71dd3 SHA512 7bf93b5cbeae932cf22958138fd891cf1adf73732bfa1c3b5c494b1003637cdb1ecfd744f9a1ee27917db8c3c7f9690a92521b6b368c3544fcf8a26731f99523
 MISC metadata.xml 354 BLAKE2B 003bf0e8c6c7665a205d4dc3c58aa7982877e0d3dcad6706d16cea61a2b53381cb10f4bfdc8a482a8d10c7a1279dc42e542f283dd880e8c258eb7e066eebeca8 SHA512 71adf8afebb39564bd527c758e35f048af6066f4e75db8e1a4b8921af94bdd3f017bf9dd092ecf38ed79de63940dd9f0b89020687092db4a919de5d7dc493ccd
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild
deleted file mode 100644
index 1a3b0067b692..000000000000
--- a/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8"
-HOMEPAGE="https://github.com/drbrain/net-http-persistent"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend ">=dev-ruby/connection_pool-2.2:0"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/hoe dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# avoid test with implicit dependency on net-http-pipeline which
-	# fails and is not tested upstream
-	sed -i -e '/net-http-pipeline not installed/ s/unless.*$//' test/test_net_http_persistent.rb || die
-}
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-4.0.0.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-4.0.0.ebuild
deleted file mode 100644
index 7fd3e977522e..000000000000
--- a/dev-ruby/net-http-persistent/net-http-persistent-4.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8"
-HOMEPAGE="https://github.com/drbrain/net-http-persistent"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend ">=dev-ruby/connection_pool-2.2:0"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/hoe dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# avoid test with implicit dependency on net-http-pipeline which
-	# fails and is not tested upstream
-	sed -i -e '/net-http-pipeline not installed/ s/unless.*$//' test/test_net_http_persistent.rb || die
-}
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 90bf3c35c588..2713a0531d19 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,5 +1,5 @@
 DIST nokogiri-1.11.7-git.tgz 5871407 BLAKE2B c0449b5cb8210d22be31f1f9a43c0c13c7ab21feae2d731bf30475fc21c69a3928395109936b9ff242a89da424a5192c8a8cb0ede9d05d6d9ac16c1d6e5a7f63 SHA512 f355185f490e0ce73fdfb496f49e36b39c89835ebef2cbe3aecbfc5aceb5a9757dc07738a709059c3e22b5808fac11e7b340b7ebbb3b2c1b5ea3df8aff0db131
 DIST nokogiri-1.12.5-git.tgz 6158880 BLAKE2B 994fd89c5163d92110de40e2dc654698b11d5a18524cc4b7b668ec1475e7167014e1c7604932686e6ad888f352b04ac26a7fbe526d814b20e686c5d9da95c5df SHA512 36d233df250213c4614c34d045c4fbea099e81e991a6da49067c165bc95f36b281c58cc79deb3b6a8aaccc50743a79efa27969e067cc2b546bef7615b139d79b
 EBUILD nokogiri-1.11.7.ebuild 3147 BLAKE2B 020c0670608a63e9126d98e30a423aad9937e698fe3b3d55ccbade79d7cce323253a528db4eee0b3bcd86ec746e8be38b71e0316548f948e60f3d9b8ec0b7efc SHA512 017ce68216111061f5056dae14eff11c27a3665bf20e8f104f388a694fe1971d6548650d31d354fb99b0e6b8a5d45d20657e2b2d4bb88241aba059cdf8d50f4c
-EBUILD nokogiri-1.12.5.ebuild 2642 BLAKE2B fe4203accab0093d0c8bb01473ad48400737b7cba1c3f476fc4a6b226f62877fce54d9b0d7435c822c20ee9eaa08391f73057e7ba100134b6b235df802400852 SHA512 6a34e891eb6c74ba396473d5f20fa8753c088bb70d2eef5a959b3b5dfc160f6be403d1165d969a07554546f0cf1a05686da057af0affd371654d503cdd322570
+EBUILD nokogiri-1.12.5.ebuild 2679 BLAKE2B e10fd2c880049beb0e7c5e19fdf2294a7fb8ade1fefcf97209d76ef2e05ff67efd090ed7d00e439ee85457939f134ae883763ecad98cdf89753b5dd70024d87e SHA512 3448101d81467a15a23eb8441f91380f50b7d8bb4ab4fda9694a4e930498c52d2fdd7f7eef45d2ecdd3c0e88d404c9649005a00edc21efac6737402e419a354d
 MISC metadata.xml 349 BLAKE2B 824094b81182da6ed2c43f55f8697dbf614662e1e032ed62bcf8ec4ef8fb6e6a1bf346f90863a8cb7d6cfaf2696f0be70fd3027d6d01e583bba0c1334252447d SHA512 9ab17ab504279d8d1ea584f7a6f411fe778b89564016dc0d596ec7f714cf9ad80ed5e30c179ec6aa190bafe8a8b72bfdc5a964d213a8024783da246bbb817629
diff --git a/dev-ruby/nokogiri/nokogiri-1.12.5.ebuild b/dev-ruby/nokogiri/nokogiri-1.12.5.ebuild
index 35fbe47af261..078a97adc248 100644
--- a/dev-ruby/nokogiri/nokogiri-1.12.5.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.12.5.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~amd64 ~arm ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/pastel/Manifest b/dev-ruby/pastel/Manifest
index 6084349307c3..06e47507848d 100644
--- a/dev-ruby/pastel/Manifest
+++ b/dev-ruby/pastel/Manifest
@@ -1,5 +1,5 @@
 DIST pastel-0.7.4.tar.gz 48176 BLAKE2B 3564aba28f9315d2f988dabdd0686e6c7a53c1b200e6e03519c1ebcde917503760d4f0d790e456c7a732b47535f692d7f5b88cf786e5b4236e9b2e8b5eee66d7 SHA512 a1ad8487babd1e788282e141538855370e09bb2745731670b814cb4572c54e0568955108f7657809b98f92b94d9d94cdd555e2db8146b20f80db98bbab3512ea
 DIST pastel-0.8.0.tar.gz 49560 BLAKE2B 646cdf5f7cd1e62e83d87cdcdbbdc2cb2619fd570b4715191825344346053b7bf8f8f18b177a8bad6416c13858ab007d94ccf5c16b71c123e4a3d2fd03cd0720 SHA512 8066b372f08e1d6312b87744309692e3e6fd5e2737374bce53087af45141ea4f14e67ead6dccb11df70f73cbb0611ab9e20f7fb553d87a349996bda0f7a3862d
 EBUILD pastel-0.7.4.ebuild 770 BLAKE2B eb2478af74a467d8a9590019cf5e32fdb85021c80628759909872cbed943b5aa2dd1ebf19df6d9d82908cee489ec8995bea4333050ddb06e02bd4460eff9cd9e SHA512 fc0ba91e34d06dc2ccc92a4745a2c2edb9451dbca2a8f7644c1522fb5e9fb85d39b0a4bf74b5399ff6449a565b6f19f60309a075e667b7cc3a60d15578266153
-EBUILD pastel-0.8.0.ebuild 742 BLAKE2B 9667ed7e498f6900ce261c5ce23aa765b857614c96a31e9110611e0f757f743f8ac9a09bc5cf1b611ad9d8ebeb9802823e86c7546ed936f42c88019e483c019b SHA512 e7ffce16fe0f28888384404c87c580a19696ab6733f8447f7170a46959c5858bf903f5ab6c9a0714df7940d14558065dbd551c0937b34750a4fac560beee48f3
+EBUILD pastel-0.8.0.ebuild 754 BLAKE2B cfed4a329e99599b347a121c2ab2026cfed5898790c6cc2b94a524923894b475deb1f3bf898f11a87a994eb7cba05514bbab4ae4d756192f47f793786f83b723 SHA512 f05211c7f17d3f48cbe4e5f4c304c8ec8001450ca6dd847acb46082586b2b48285978d639deace443d91553de6ed53c55973599c420132eecf7224440b8188d1
 MISC metadata.xml 335 BLAKE2B e64ac8fab5af3884ede2cc3ffea05ce1f1921b6ae57f31610cedb99538d5f8dd52d0a2b90aa7ffd1d967a4cdd39fa8fdda6e3c3b67d21c59e10f8fc79439c5b5 SHA512 8f1f6b4be2e1a720b11d3e0e4bae20116df2560aa9a04e0e913751ac8f6ac878a7175069f5c928e1eb0284563b5e84c60bfbab67e06f1161c21c2402ee8c6a63
diff --git a/dev-ruby/pastel/pastel-0.8.0.ebuild b/dev-ruby/pastel/pastel-0.8.0.ebuild
index 91d40df6842c..f02d83de148b 100644
--- a/dev-ruby/pastel/pastel-0.8.0.ebuild
+++ b/dev-ruby/pastel/pastel-0.8.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/piotrmurach/pastel/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/patron/Manifest b/dev-ruby/patron/Manifest
index dcc7717a356f..94dc7a25ebbf 100644
--- a/dev-ruby/patron/Manifest
+++ b/dev-ruby/patron/Manifest
@@ -1,5 +1,5 @@
 DIST patron-0.13.1.gem 64512 BLAKE2B 14f691cb0fd1c863a1ef634ba8aee94751095138e940f13bf09860e9e0061872fe14fa33416f59f82d4adc53963721d653936a3f058b27654ea7593d6068d0b7 SHA512 7b082ff7442c2635c38b37132cd61f6cd18d4792d41cbf3bed1201fb7371b75bb628a295f4e3dd173c23e086d3c1f54f0217df3f7d1a30c1031fcca86269e1e7
 DIST patron-0.13.3.gem 65024 BLAKE2B 87aa69aab49978d14a80ed9e09d74d7853da3512875cc3aecd3f387d1523b85c84625b57a5826e5f5f999cec4feaae58c1aaae96582144a5c9dc537c9d5a4224 SHA512 afbbbd9570e338a5d1b97b4ebeda76ac95a22c29d908629723d345a47400183c2ccee67ebcaf5b6f9ecb032eb3b847e70ec9eebff75b33045a3665c215abfbd0
 EBUILD patron-0.13.1-r1.ebuild 1239 BLAKE2B 613bcfaf54076838f6a7d291844e45dcfac06b734f541fbe997bc035e24704ea87078336f5347e97fce5ce372bff059bdf3d8f166172accf93abea87b466fdfa SHA512 12dd83689bd12377f3a7c985be9d10a44eaa08f5cef2425cf747551e8312165f40a3c619a1e3c0edfb3bd8fae46db711ee06a6924a38b9ff777de75f0d49b171
-EBUILD patron-0.13.3-r1.ebuild 1080 BLAKE2B 585993a678221d13e90cfe26a67d60b590481caa89626cb5e30205fa2fd5423a3ec7f26af0229c38ec9aa88886517b6216eb2a649f3f5da4ac56b8fd58a9bf48 SHA512 f452088be24c7fbb29f020a0074ad6e46a012f2173772c72ddc52aca389b036c016fa5e3a57bd85af2387a1e1863ca296bb0055582f17945fd7fd58db70aa913
+EBUILD patron-0.13.3-r1.ebuild 1085 BLAKE2B bc276e5e41c03c9869b28993c92af4ec0e73b00175facb8bd8b6321c3c5e26d018721eb457ccb6d25bdc0c24e32fec7a45d0b6001b60b91039d6978d75e2726e SHA512 030d7dea9c8211b05149f7442026be9e56509ac85256462d2da741b79f3f7dd95201cf1cd0baedcef18e994485c87db3704b433792a99b9a1999c1ff3bd52e75
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/patron/patron-0.13.3-r1.ebuild b/dev-ruby/patron/patron-0.13.3-r1.ebuild
index 08c165ff73fb..c9c2afa0dd53 100644
--- a/dev-ruby/patron/patron-0.13.3-r1.ebuild
+++ b/dev-ruby/patron/patron-0.13.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -17,7 +17,7 @@ HOMEPAGE="https://toland.github.com/patron/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND+=" net-misc/curl"
diff --git a/dev-ruby/pg_array_parser/Manifest b/dev-ruby/pg_array_parser/Manifest
index 3d557f8853d6..6a06e6077ddb 100644
--- a/dev-ruby/pg_array_parser/Manifest
+++ b/dev-ruby/pg_array_parser/Manifest
@@ -1,3 +1,4 @@
 DIST pg_array_parser-0.0.9.gem 8192 BLAKE2B 5b647cb3bca2b965348cfb5c442f4bf9c58d03f66c422768b22836d8a9cf73d9b2b242a055df0bea708b617d0a3ca84abe8100007ca259eeea4dd089385db860 SHA512 a1503d9598e1658eb63b6294ce1cf6f8d2e7e5c59382407946ec10d25a46b029b4bb8a8c634b190b42bef4954c4aeea60b6ffa16c596e0c3bea2df4c882896ae
 EBUILD pg_array_parser-0.0.9-r2.ebuild 1425 BLAKE2B c587054af8f820e1093fe371a7ac4b84bb4044c6447c745fe95a623c3465d1cec12d214ae0b3a7c7e892f31d16c3b615500431c8d335333e4f035366fce4dab8 SHA512 99fc8a1fe4f68c299d7a30b01132e0954ce12d910224dd8ca3df1677aa8d223decb0e6e1b1e47c6fd382dcc8fcfe824d5f3577ca6c0bc3f62e8e1bcbcf1b987d
+EBUILD pg_array_parser-0.0.9-r3.ebuild 1055 BLAKE2B 28ec529dd6a0402b115d801c70152885aaf523d4f7ebf2ef1bd9bf27af72ad1fa1a6f76e6796f07151a9989fecf4edfb5f630decd9b193182d49c630d8d70dc6 SHA512 745bd0044900965bef7f561bba8b259ba754ace556c6c36764019271a0589695858b81a1dbe6f88b68d4e1db9d8be7392abc15bb37812c4faefefd47b815523d
 MISC metadata.xml 347 BLAKE2B 7e1e8010f3be064e5bd3c8373a073292668fa7dad5fdb2ab5d413b0401e80dd108832cef4ec73ce0bbf22c739f1fb9e16ed80be41270f51c5db32766f994b842 SHA512 247ecfc8a886a812a527e6e8546af7a92e925303e9b6d5befc91cdb8e3aa51830703360fa4ef70a6b14ed4da98b1f08dde582261621b5658457a1e8cef9aeee0
diff --git a/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r3.ebuild b/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r3.ebuild
new file mode 100644
index 000000000000..eaf4ea21c240
--- /dev/null
+++ b/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/pg_array_parser/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple library to parse PostgreSQL arrays into a array of strings"
+HOMEPAGE="https://github.com/dockyard/pg_array_parser"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/bundler"
+
+all_ruby_prepare() {
+	[ -f Gemfile.lock ] && rm Gemfile.lock
+	#if ! use development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
+		sed -i -e "/gem.add_development_dependency/d" "${PN}".gemspec || die
+	#fi
+	#if ! use test; then
+		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
+	#fi
+	#if ! use test && ! use development; then
+		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
+	#fi
+}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 9872fff78240..1c49ba81900b 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,5 +1,7 @@
 DIST puppetdb-termini_7.5.0-1stretch_all.deb 21542 BLAKE2B 903a3290f3f10a199d53e5721fdac58aa771b2f9843037250be223df1f4db8328f4164c9f9756013bb5eba81d03fc13ef95b6806f64f6ecd70b7af8aa7336277 SHA512 d6179dbb4192ecfc1d082d32a978bb4d0c89f47db9c335ff70fc75bc81f41e3b0e78fa9fcd80ed3254ce57600e82f75ebefc217069dca8e0ea4014041878052b
 DIST puppetdb-termini_7.6.0-1stretch_all.deb 22010 BLAKE2B 535315b0b710fbd0aea5d4fb6964a38300d8da1c723a38153ac011bc326b75eaf9a8abc4804d60d20a078f8aabb01dc674112a0513f90b327dcd13d946cdd4a1 SHA512 cb3ebd4ff35b4b3be57c8a488e66faae1f44d130843cce95033baf3aac70a8519b0f775b3b41991cb5377cc78338141310662ba76a3985d19bcaacf2f7ea9038
+DIST puppetdb-termini_7.7.0-1stretch_all.deb 22018 BLAKE2B 38716d2fe7bbe14656e4f274096ae93d4dc316cbdca49a0da33061df87666caea2bb8fa855de7539be8355805cb5055f74339b12660fe4f8020dbc0f92b79fdf SHA512 61c70aa919a6cee85a36e50c122ed7570e996fb74f68f70733d3f2233dcbbce8623090e9d856722c0da8583836457ded11cd97d1492019a84df00855fe79d462
 EBUILD puppetdb-termini-7.5.0.ebuild 670 BLAKE2B 39d3c3e8ec65d40e3807cfd36658711dfb27cde4b55f8848708bb40b85ee07b69de9a61bc29350d4bad1298179676fec40870a32e45ab3d831eac3d462715d66 SHA512 72fdb6d39a682c8228e2fb6141ef6af93d6773bf3bec50bb468499266e60f9a36fd8f5f2f26626aeb47ff5791de8e4c16f1cee93ccfca16c5ea78d46e6a2fbc2
-EBUILD puppetdb-termini-7.6.0.ebuild 672 BLAKE2B 6f9b12dd3d6dc426e0a3a067f864087010c3fc001cb66dad08317eedda34e493441b1ecb4767373d84bf30d12f6e2d108ee93a19c6dc431ed6dfb59c76f8b793 SHA512 197da62a5fb778b148cb32282953173b6bed803cce7b526b4ba1b89406d4c1ed9369e3644afc0886dbe519d70a592ff8062c6b879940f2c316fef9b27564d8a6
+EBUILD puppetdb-termini-7.6.0.ebuild 670 BLAKE2B 39d3c3e8ec65d40e3807cfd36658711dfb27cde4b55f8848708bb40b85ee07b69de9a61bc29350d4bad1298179676fec40870a32e45ab3d831eac3d462715d66 SHA512 72fdb6d39a682c8228e2fb6141ef6af93d6773bf3bec50bb468499266e60f9a36fd8f5f2f26626aeb47ff5791de8e4c16f1cee93ccfca16c5ea78d46e6a2fbc2
+EBUILD puppetdb-termini-7.7.0.ebuild 672 BLAKE2B 6f9b12dd3d6dc426e0a3a067f864087010c3fc001cb66dad08317eedda34e493441b1ecb4767373d84bf30d12f6e2d108ee93a19c6dc431ed6dfb59c76f8b793 SHA512 197da62a5fb778b148cb32282953173b6bed803cce7b526b4ba1b89406d4c1ed9369e3644afc0886dbe519d70a592ff8062c6b879940f2c316fef9b27564d8a6
 MISC metadata.xml 367 BLAKE2B 46ba9e83a3422a65265eba357896709907ac39b394d1d02ab02d70a0252a0470944a2fc23a44bf6c76b3562f90d8f6d9f6c28055d8458ce3cecfd2e3d2c347a4 SHA512 1fbf96c090522cccba0daa607ee8edadf107ebc38abaa66ce9a8465a1e0cd1e92f748e95ed5e7e490350191b2cc03460e8e9632a7de7550662e83a098dd47335
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.6.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.6.0.ebuild
index a7cef96b4b13..759e7aabae62 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.6.0.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.6.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.7.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.7.0.ebuild
new file mode 100644
index 000000000000..a7cef96b4b13
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.7.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+inherit unpacker
+
+DESCRIPTION="Library needed to connect puppet to puppetdb"
+HOMEPAGE="https://puppet.com/docs/puppetdb/latest/index.html"
+SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND+=""
+DEPEND+=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
+	doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
+}
diff --git a/dev-ruby/rbnacl/Manifest b/dev-ruby/rbnacl/Manifest
index 2402c3d662d8..ed8b9b39654b 100644
--- a/dev-ruby/rbnacl/Manifest
+++ b/dev-ruby/rbnacl/Manifest
@@ -2,5 +2,5 @@ AUX rbnacl-buffer-size.patch 765 BLAKE2B 0865380f35748adeddda7a9a880df0c1be81994
 DIST rbnacl-4.0.2.gem 220160 BLAKE2B a4a3a7b0346bdc3d0e1930bf9b1c6c05182456837c53c8a56f5d8eec831df8768589affb00450088c4ccc3de37f474a359e9ea362655ea66ada63467936abcbe SHA512 d13d36e4248d5e40bb5d9496e08823438d312c16d14e3068be89a62dd7f80ec7f99fa5995752b183656b6ae863af77645b16ce45d05a74ad0dfbd4a93c8854d4
 DIST rbnacl-7.1.1.gem 226304 BLAKE2B 4c7c356cc3414c1b49302ff16af701bffbeaaa18b49bcdb4c9d0c10fe2e1f693e7917f8031c90d5c4362d95ffe5a8d471a48476788f64f97092adbcdce0d9f72 SHA512 da7e406bd2b5112e51d2c15cab35d955b65091ed745fbd027750eaca8ff1d11d982c82f497fc15b9ee9aa6536dbd21ff9ac285bb2a2d1fb39c3374fd0f3dca5a
 EBUILD rbnacl-4.0.2-r1.ebuild 794 BLAKE2B 674c9c4ca5ced2f9216ba1aa14e4e6fbe08df35f6af28c91541e26ff5a14e9024afd7b936ad38dd2aa748b7866c8a8a167326f99f7525f3f944a8c771a2086fe SHA512 7eaba4f90b7b832720e2a7fb3ad226811ad678d6002c5db83ca4bdd15f121f25943e15651111695c447ad1fda70dff37d39a2056ffbb9347dd85b902f83ceaaf
-EBUILD rbnacl-7.1.1.ebuild 715 BLAKE2B 6006519a90d29f2225667784a2a05a8930f7d4e6637f8c456c2fdf99b6b34feadef38cb935ccd4d4ad3a05eb58409488c9da3dd3ea7e05b29963850b04e94839 SHA512 2c991f7a9a75429c2259d5ec7bbc3a2c222a81671847d0c6db3ca5fc6ec06f14aed3199843d493be459d482c510088799e2678a26ac62c69060629521e678333
+EBUILD rbnacl-7.1.1.ebuild 712 BLAKE2B 24a8ade617d41464f1eee776f5129f4ba523b32d32196beaa1538554c3275f8add794b0a573d268bd4011fd55fdcde20e64a0b33fb335ed50fcdb1becf2f01c6 SHA512 d6b41496f28f0e3dbd3d137df4b0e4e9be475203fcedd06a079adb97049d699ca02a9c27f146ff32f520283ce1388d9ac922099f11c0335551ae7fc021b4955e
 MISC metadata.xml 346 BLAKE2B 95c47eeadcf87f4b0bc7d9404752205fbd51e6cb33ba5183c9cdc6684f6be94a4773dc005ea047a94379a0e09d9a7f513f5c08436ab495318bd803b3b1fe411b SHA512 bdb485b5d1df9dc9e578fdc52b5979cba9a25af669ca1407b15516ba8f4a658b60e648126387cd011b6f55f4ed6f2227d083ceedd9a5258f973e8d5e8a19cb9b
diff --git a/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild b/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild
index 2d6b8d9ae9d6..75a630b8bdea 100644
--- a/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild
+++ b/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/cryptosphere/rbnacl"
 
 LICENSE="MIT"
 SLOT="6"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
 IUSE=""
 
 RDEPEND+=" dev-libs/libsodium"
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index 5ddcb033c002..92e2a2ca9e41 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -3,6 +3,6 @@ DIST regexp_parser-1.8.2.tar.gz 85592 BLAKE2B 55333dbf59606d1f203c84cc3e712ddba9
 DIST regexp_parser-2.1.1.tar.gz 89399 BLAKE2B 7632b1e65e929f610e6bedc7954f81ca080f4f290794da617dbaeaae324186581a6e0ab78fb8d7311c33876b8cce090fdb6d4b868eeb80b82fa8461da5d82bfe SHA512 809b8c5f7bcceb0c31e97256d5a40a04bb7919cfa0a139e972e90a72ba15eee6dce8ac1f8e65f5e8f7a5f992a2fab91d6ae19f27a1f5ec7795fcc082ff037e13
 EBUILD regexp_parser-0.5.0.ebuild 878 BLAKE2B 065940af48ce7c93836019f0a9325e04db4e0ff31f0e9af6a13a637e86ced811bb38cd9c70b971e244df857e1d40b2ed2049fc0321a82141c43478822cac8b04 SHA512 c91492b8ea59137258d941e79659f1f511621c0d7da8af6e6c13aefa39f5473c2881e0893b68a56b428ce8da9a135e20371e4d5e0c6d5fc6996e6a77af5c22e6
 EBUILD regexp_parser-1.8.2.ebuild 888 BLAKE2B 5908b7be2be373462cd50b9445e1b111490dc0291dd4b050c2e0015ab6c77ee845b5b8dc0e34c4b223737e983a259dfa46a5c43cc0b10f825f8bb170e5e3168b SHA512 6ae591ed9ffa40bb8440cd05cec581a9a5126a2fe85768a0805d2c2e5b152aef482426a18836d2076e5cef313ce96484c686ab982ddaeb7f2a6f038ff55498d5
-EBUILD regexp_parser-2.1.1-r1.ebuild 941 BLAKE2B 7d20b76790711969c52dd811d991b8741523c1fac3ff7ea4330cebf10ac0eefaf164649e48c4e3ee262a8b5778d5729fc7cc6aa17b31dee465fad3f934ae4bfd SHA512 7251caca050476e43d85e55747594a724a4a6f3656ce4a31d41688b55dd85753153afe8d9030bb7fe98b1c35210f8425c0f32b0722dea5efac5097dc8d4d4b8a
+EBUILD regexp_parser-2.1.1-r1.ebuild 946 BLAKE2B 683f0d77bbee02522fd168211a25560bed02b1e33f423398563fff723cdd7f3fb5c5a9adf0a19dbf4c9e7d9b8b2a9483720811d57e6ca884786af06cb39c359f SHA512 a49ec1f818d626acaa4a845a0d40425952fb9cffc76db4d8459c60c63dd218820b96eee2488b318477c190d9326d98c8cafe53617451f8a9f123c49228043387
 EBUILD regexp_parser-2.1.1.ebuild 907 BLAKE2B 6bd68f31925a8eaca632e9e15c2863a080d0b0c81cf2ee09f6a96f30f8b54e6ce41b3a0be4ce45b7bc01713d952028245e9b08aa42cd197d710677cd6b4ecd85 SHA512 a9d499694fb8da3f72c5e306c266d43d55e12fb6e093c93917fa46ec624ad2d4ce8c9e1487f3d3b6b61b2f479d8a1426620c179efcb212b4e22b228b1382c1e3
 MISC metadata.xml 346 BLAKE2B 91c8aefa1a1d1f9f8b70a36b65524b8e9bc41fb22d7e411e1501d74dde8abdf1fec981340832046edce885ee296cf1beea48fa57678bb5af2c39f957670a5f82 SHA512 15b3c9a8a7fdbbd2f782308687f6551cb626732c0858c2cc88640b8ac2246e453667dfe6e12ff3547c2d7e267304cfdf70fe913ade8d802c321a3df12b699a6a
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild
index f94e4e82101e..747700c45c47 100644
--- a/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index b0a72289f6c2..553de0642a0e 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,5 +1,7 @@
 DIST rmagick-3.2.0.gem 1950208 BLAKE2B 5d4255fec8fcfb8ec2f6f361fd54a3371935dbae323918b2fe1aea47645f160024a8dd16582acf5c930639a50f702b2062e475d231c3bb0acc0bd83ac9ea00ed SHA512 f6f15b013699da5c61e83ecf4ca16d64e7e2f447dc721c7db55cad6b880f9805eb8bdcbf70aef3e30a82f38bbab8ca093d8c6d2ce761cde4f47209e3f99a9f16
 DIST rmagick-4.2.2.tar.gz 1984143 BLAKE2B 8b8119a0002c48f3a289f72d4bbea6ac86cbecb287b34ddc14ca126fd2d951a34aefa39d68603dc4c9de674d346e47ef9e3b2c8ed96a5bc081373a4184a3ec40 SHA512 0a6a30a631786ea310d2c8add297abd527588be755d021143d6c64fbb597006aefef859c374604f8d26b0f8b1f6cd8a5f1cdd6489772ee713c71681f3980c7fd
+DIST rmagick-4.2.3.tar.gz 1984440 BLAKE2B 32dea4b8ed7d2385537ac5d67d48e3431e3f398c146b01308cc44ab6b4ad5e851292c22e373307bd2193a299f94a2a2f91b0a7d534825990cc5e1458a9efff7d SHA512 3465afc5c9a93e45511463b1f7eda00fd243f17041cf52b5cb54ceb05ff22cb6e23ea2b15d080ae31bca5daebdd92c28364ada73ea0cf6ea56cb1ec5fe1aa184
 EBUILD rmagick-3.2.0.ebuild 1571 BLAKE2B 64042d8dca87fbb45cbbda5027238f514e3b318e8411bbc5533d69c1f363a29929059a3ece5feaae36addc9e2da64ea18329315a6b9dd2ccf3fc2c4d1b8818dd SHA512 bae5e087c94971cb2e5c5b1e60e72fbbfde68e134166d1ecd8b2f75deb61d2adcba6a43bc345f8395cc699c798e68ebc5b6d9402fc18ba9a4ba768de7551a5e7
 EBUILD rmagick-4.2.2.ebuild 2350 BLAKE2B 2fabcd5effb838935edaa22c252a54ea267c26e68b7fad78967346d55e80e79a89d428312d4b7b7d0a203021031d9f237dc8079652b19528bbbfd54fc94b5dbb SHA512 f428cb34408b52bec1439c1d90028e9a33b19d9836d511fac9ef2bc9b4282de50626680afe99dafee75a1d6ab7c0c2ea227baef89721483327e21b3e16d1baef
+EBUILD rmagick-4.2.3.ebuild 2340 BLAKE2B 1bac92c24b306db87e398e2afe4c484323be64c498b020204b97bb2caeec09acbbf2d214e8f418835182c8aa41871b6f35959c289a9814056629011241d15fd2 SHA512 d60a5c78b45c2693f645d54b2174b58f50f9eb6e41aa6d936dd812cc6103e5726cd51ede59f36623d91ecf53e92188c01a65e86a44afdcc98484f5a72cb314ad
 MISC metadata.xml 342 BLAKE2B cb38f3f9a158134520f82cef13b3322af5ebbe3b638bf695077e17406d754643ced9878aa304424057f0fd63da296efb787b40f5249d02e0d5993e2815256c00 SHA512 014d14485664346a449dff7c9a0c01bd1f6c549a6842da456bcb10c4f0b38111ccb025a8507f222e756cd4d136de6a217689e0ac807cf7fd0e3f806a6069fd28
diff --git a/dev-ruby/rmagick/rmagick-4.2.3.ebuild b/dev-ruby/rmagick/rmagick-4.2.3.ebuild
new file mode 100644
index 000000000000..77076de599c9
--- /dev/null
+++ b/dev-ruby/rmagick/rmagick-4.2.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/RMagick/extconf.rb)
+
+MY_PV=RMagick_${PV//\./-}
+
+inherit ruby-fakegem
+
+DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
+HOMEPAGE="https://github.com/rmagick/rmagick"
+SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="rmagick-${MY_PV}"
+
+LICENSE="Artistic"
+SLOT="4"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
+DEPEND+=" test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp] )"
+
+all_ruby_prepare() {
+	# Avoid unused dependency on rake-compiler. This also avoids an
+	# extra compile during tests.
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' \
+		-e '/compile/ s:^:#:' Rakefile || die
+	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Squelch harmless warning about imagemagick installation.
+	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
+
+	# Reading PDFs is not allowed by the default Gentoo security policy for imagemagick
+	#sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die
+
+	# Update version number hardcoded in tests
+	sed -i -e 's/"7.0"/"7.1"/' spec/rmagick/image/channel_mean_spec.rb || die
+
+	# Create directory used for a test
+	mkdir tmp
+}
+
+each_ruby_test() {
+	# Borrowed from media-gfx/gscan2pdf
+	# Needed to avoid test failures on e.g. ppc, bug #815856
+	# (Unclear why it doesn't manifest on amd64 here at least)
+	local confdir="${HOME}/.config/ImageMagick"
+	mkdir -p "${confdir}" || die
+	cat > "${confdir}/policy.xml" <<-EOT || die
+		<policymap>
+			<policy domain="coder" rights="read|write" pattern="PDF" />
+			<policy domain="coder" rights="read" pattern="PS" />
+		</policymap>
+	EOT
+
+	RSPEC_VERSION="3" ruby-ng_rspec
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+
+	if use doc ; then
+		docinto .
+		dodoc -r doc
+	fi
+}
diff --git a/dev-ruby/rr/Manifest b/dev-ruby/rr/Manifest
index 199e5a91f46e..f62999ad508a 100644
--- a/dev-ruby/rr/Manifest
+++ b/dev-ruby/rr/Manifest
@@ -1,13 +1,9 @@
 DIST rr-1.2.1.tar.gz 137497 BLAKE2B 3db6751d15e54da6ee6777fb7d383c1bfea2e68482dda03ceda9a70f66382cf9aa7c39f27fca9f0ce92b19858b5324bdbb5811809b3ae146e213bb03ddca0772 SHA512 df2d05ff732908da55878cb89cb7d1c4442a18c19f71940244f5bd7dc55632467a1824f55d7fade4b5122486a61277090d7ad05df9f99098030c21aa45b36dd2
-DIST rr-3.0.0.tar.gz 137978 BLAKE2B 707678362370173c3cb088db9003a5acb54f42b579955239317738027ede63d19217c9e76dd693d09226bac85b41cf9422ac7a580f502c1cbc338b0d4ccb34c9 SHA512 4d162a88868dde9a300a0783869d7c7edae840960c26697e20db3858cc3cc9db942a52c22e79584d3e7371da59156ff4f026ca9052d9d4b203159223f78b1030
-DIST rr-3.0.2.tar.gz 138641 BLAKE2B 5b28722a4fab8fa83fac349e1f57fa968adfef3f007b55ccf0fe673a538a3992334c373b52c0e219b0a8bb43eae2105957c3e7569909b6f85bdc5933e97f7358 SHA512 d421d652b388c9ae533dc6d26f59c6327c9438a9318e17473133e4acbdd378bb38c676e08fefb221227e3aeb6f3a469d03ece5ae5102d3f04f800922b533d5f0
-DIST rr-3.0.5.tar.gz 139168 BLAKE2B bab1274fde8362e591702d94b9faeb136360e707b41e2c3d95a1bd12da451540a5f9cb8d9f808b80fa5b842f0d407f9f47ff15448fc3b0d0cdd9bef72131183f SHA512 6bfa6426a0675c9dba88c10cd50a70cc480bf88d3b485164baf5db53ffbd312a32fe9e1ea73ac209c4cae61689ae3f5f1959f23320625d37d457c3f53c320ed0
 DIST rr-3.0.6.tar.gz 139275 BLAKE2B 5388312320958a03cdd48363470e32911d46080d38e02e29891a9a0bcd2ebe18e0c6dcfb5188631cb607452ad66d708e6fc36b9ed1571031eb433949e4546cf6 SHA512 f80baee790efa5b43c280cb70ed4d1d9202e1d1c3ce653680e4b433d595278b4180dd681c30df75a78466ac687851f3e15d0a08110def1868ce724d07e025abb
 DIST rr-3.0.7.tar.gz 139473 BLAKE2B cf12f792cc851aea2a0281ac0a46a1fef5d8df616fc47b630f509336208b2b443e3cfddaf9329b105b2a121b6aca002c407d7123c9b0e9606bc0d5f1f08b01be SHA512 54b5393d5618310dedf68946a3d3387d738f0f78e03fdd2ec1491f5e7d8f0d4288599930bc3b7dc01b57399afd9cb094d9f11f5371cb5128aad74fe761445731
+DIST rr-3.0.8.tar.gz 140003 BLAKE2B 7bb039803556f30f487a129b92e737e9d70cf73c423cfecfc653ee3793e3fb1f576c11dcdade9ad4f15853ae1ad8c2a60535de47ade9617e37c0ca849ff06c26 SHA512 c1d156b7f663a09d39b064f80d9c59a3256fff3236ca48667ebee7eb3d846b8fda7fc042dfd7da01d9bed8dcc677ea5fea315d6be45f219a8f3719972ef01f5d
 EBUILD rr-1.2.1.ebuild 1094 BLAKE2B 49caf7ccb853a9545414c8bd7dc82a7fa0ac3124b5f3e9029cc8b7428df9a53b278495fb0ea2458df358853881ed010ad0826e1c76230c46891aa93057670241 SHA512 26d86571134dfe9e89746f3f65907d6ffff218d6790e6aa1205c705765098ec6b8f22e8b6d6b1196ade5d955b30a715be901bf5abae5bba451db99ebfc986358
-EBUILD rr-3.0.0.ebuild 1127 BLAKE2B b8d68170ee3930b4c2376f3e2d6678636aeb42e6f902687740626ae96daa0638f76305384a8ec42dce01fe46016dbb258fb8c28b57273a213587b8b03759a214 SHA512 cbb783f8dc81e92d45ae3eafda05b743fc9af1a28824b87b0fce0b97c606718e837edfbf3dd991c50f4c038a3aaa546c314aaf05da2cb107897474479bfea9fa
-EBUILD rr-3.0.2.ebuild 824 BLAKE2B 9ead7ed073a5a9ffcb0ac0214b3691d33985aaa7581682d20f8c0c272b19a55935841c16e3ed89fad0f60b1ae6adbe88a1f53a9ff08de4a4a407bfdf5c52515b SHA512 d9ae19e08292e48f49dd15bb264262849f5f27f07accbd8aed11bcb827187fbc4385d01f6e8abe5f497cc3ec457ecb6704838066809fdcae4803d62da553cbde
-EBUILD rr-3.0.5.ebuild 824 BLAKE2B 9ead7ed073a5a9ffcb0ac0214b3691d33985aaa7581682d20f8c0c272b19a55935841c16e3ed89fad0f60b1ae6adbe88a1f53a9ff08de4a4a407bfdf5c52515b SHA512 d9ae19e08292e48f49dd15bb264262849f5f27f07accbd8aed11bcb827187fbc4385d01f6e8abe5f497cc3ec457ecb6704838066809fdcae4803d62da553cbde
 EBUILD rr-3.0.6.ebuild 817 BLAKE2B 4ec1248283c2d625e69dada4114495b3464d6637f488fa8ec25bdf5445da754708445f49f1cf5a1c54a5692b8053907b5128b9f29ab29304c2cee3e1f9a661c3 SHA512 830afc03abb424465f89988b4d2dac384800c74e221f1542f49915d656e5304e21798a77fe3894ba040c95b0cb43c9c946d6220368d857821cb5d60fda542b7e
 EBUILD rr-3.0.7.ebuild 824 BLAKE2B f1cefbaec278f17d0c01075fa4fad95bab9df683ed3a2687a5186dbe9ef4652a74907ef9c619d5a11db64b8989ff6e3728746b60dc56fb46c73e971784bb031b SHA512 3c42e6c23776ee23c51168c3ab97a77e095b5031d253621ea1f616903ffb3241d7dc3be690ca423940fb53767989b3ac667d24dc47036fe58ab287b76685d827
+EBUILD rr-3.0.8.ebuild 824 BLAKE2B f1cefbaec278f17d0c01075fa4fad95bab9df683ed3a2687a5186dbe9ef4652a74907ef9c619d5a11db64b8989ff6e3728746b60dc56fb46c73e971784bb031b SHA512 3c42e6c23776ee23c51168c3ab97a77e095b5031d253621ea1f616903ffb3241d7dc3be690ca423940fb53767989b3ac667d24dc47036fe58ab287b76685d827
 MISC metadata.xml 332 BLAKE2B bd48ab9bc20270067f37efd109aca31b1ab136d04f3ee8d3f63ba1f88e85736991d2c584a4143a0d6d0ea1ca198b5b2d040556d48f5884f90f8fe0821a82cbbe SHA512 381259b905f2509b530d2474a09accc4c52e4e45adf96f23115756b2be71a1c9c2e36d4eb239dc4c333d5e1d6e7adaff575f4c1fba96a00d6242867235552177
diff --git a/dev-ruby/rr/rr-3.0.0.ebuild b/dev-ruby/rr/rr-3.0.0.ebuild
deleted file mode 100644
index 85b47d8658f8..000000000000
--- a/dev-ruby/rr/rr-3.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC=rr.gemspec
-
-inherit ruby-fakegem
-
-DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
-HOMEPAGE="https://rr.github.io/rr"
-SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? (
-		dev-ruby/rspec:2
-		dev-ruby/minitest
-		dev-ruby/diff-lcs )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '1,2 s:^:#:' spec/suites/rspec_2/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	# Only run the rspec 2 case since we don't have appraisals. Setting
-	# up everything correctly without it seems very complicated.
-	ruby-ng_rspec --format progress spec/suites/rspec_2/unit || die
-}
diff --git a/dev-ruby/rr/rr-3.0.2.ebuild b/dev-ruby/rr/rr-3.0.2.ebuild
deleted file mode 100644
index 5cec9bb3a296..000000000000
--- a/dev-ruby/rr/rr-3.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC=rr.gemspec
-
-inherit ruby-fakegem
-
-DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
-HOMEPAGE="https://rr.github.io/rr"
-SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? (
-		dev-ruby/minitest
-		dev-ruby/diff-lcs
-		dev-ruby/test-unit-rr )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-}
diff --git a/dev-ruby/rr/rr-3.0.5.ebuild b/dev-ruby/rr/rr-3.0.5.ebuild
deleted file mode 100644
index 5cec9bb3a296..000000000000
--- a/dev-ruby/rr/rr-3.0.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC=rr.gemspec
-
-inherit ruby-fakegem
-
-DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
-HOMEPAGE="https://rr.github.io/rr"
-SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? (
-		dev-ruby/minitest
-		dev-ruby/diff-lcs
-		dev-ruby/test-unit-rr )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-}
diff --git a/dev-ruby/rr/rr-3.0.8.ebuild b/dev-ruby/rr/rr-3.0.8.ebuild
new file mode 100644
index 000000000000..0ebc522df87e
--- /dev/null
+++ b/dev-ruby/rr/rr-3.0.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC=rr.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
+HOMEPAGE="https://rr.github.io/rr"
+SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? (
+		dev-ruby/minitest
+		dev-ruby/diff-lcs
+		dev-ruby/test-unit-rr )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+}
diff --git a/dev-ruby/ruby-shout/Manifest b/dev-ruby/ruby-shout/Manifest
index d485e1813ac0..53dbfcf43b62 100644
--- a/dev-ruby/ruby-shout/Manifest
+++ b/dev-ruby/ruby-shout/Manifest
@@ -1,4 +1,3 @@
 DIST ruby-shout-2.2.2.gem 13312 BLAKE2B da84e8ca777e5c5e60f4319f030467cbbb0709f8e94c08d3b7c8bb30c4db2861d27852930a01f4a0625ca8cf71ed849fd39f0398708b838c3b6bdcf85c12609d SHA512 2553518d3cef655e9cd59a734860d290928171600676dd0fa4b65d84421286eb9d79cc897cfa5544570e3731c4f761e97e8cd1dd3488d9b62246af840a1d126d
 EBUILD ruby-shout-2.2.2-r1.ebuild 519 BLAKE2B a3e7a464ef5d892bb85670a014900d460ae3d26b8ce4ba7cdc3cb7402d18d5802682f89e6521026d84ecfcde1c35dfaac5a4cac74c8fe5688684109b6e39bfb0 SHA512 87c95508d86bef5527857b8a4c74d2a09fb490e33edc8030234330d2ec86f164f74b89329d7f7fc0d880a6b7801f510afa47533ae254163eb60acbb15b03ecf5
-EBUILD ruby-shout-2.2.2.ebuild 759 BLAKE2B b398c1001db4a4fb12a5a9874d88febc32e388240c0b71803cbdea8927d1eadc75a56f100f0506a5fa77f5f28671c920ab27eeca57f8c7aa0fb481e238b605b5 SHA512 ca863f2c5e3cef05f7630c5b0482cad4f2ec2a1fce0cf1e006aa0099a56e3fb4c4197ff128c455349ffa3b9276780f0e5213be3155e94038f510c49b00ed1ee9
 MISC metadata.xml 332 BLAKE2B f559791770574b95a70d4a2c94c4a9d732c07c06afb6521134ca4d19851fe00482d57c506c9d6b0fd0f4ef32c1f2a1af723053fd0da7f524668ecaa3a5f58b31 SHA512 63f80f9fadbef51e6484e659e27fd63be7e34a16ef9ae45e888735780452047bca5acdc7be87523bae08dcb93f07b3164ba3b0b3923bfe1e59806c05b3ed4399
diff --git a/dev-ruby/ruby-shout/ruby-shout-2.2.2.ebuild b/dev-ruby/ruby-shout/ruby-shout-2.2.2.ebuild
deleted file mode 100644
index ebdd1067bb67..000000000000
--- a/dev-ruby/ruby-shout/ruby-shout-2.2.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.textile"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby interface to libshout2"
-HOMEPAGE="https://github.com/niko/ruby-shout"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND+=" >=media-libs/libshout-2.0"
-DEPEND+=" >=media-libs/libshout-2.0"
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die "extconf failed"
-}
-
-each_ruby_compile() {
-	emake -C ext V=1
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	ruby_fakegem_newins ext/${PN#ruby-}_ext$(get_modname) lib/${PN#ruby-}_ext$(get_modname)
-}
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 6cdc12040226..16d4a27de60f 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -13,7 +13,7 @@ DIST rubygems-3.2.13.tgz 987809 BLAKE2B 20243f6b81592d62f033ec96485f8b6af6693c28
 DIST rubygems-3.2.14.tgz 987419 BLAKE2B cfd1545f022194f8b7a99b1698a38d4cfae08b8fe25c45fc7b7c935953ec7a66b0b00f21f77eefe757226d80f19a2093f2b85767e5caabfe13f445fbf6dc5508 SHA512 de28bdfdc239cd49bb5a1f78f0a9e3ec432fb70c8326c7899f7ef0a088f60becd99ba81285b20388296f96afb46ca3ca359208621d88a6be68b7388d155a2383
 EBUILD rubygems-3.0.3.ebuild 4646 BLAKE2B 42f400a5286dea3ff7aa5f3739f7d259ba56bb147d8fdcc5644ec583d0ea98fc7337bc3e9def844a293d09a8bb9745184822b09f7d7c6dc71ec0689e3bf44166 SHA512 4d86e443da752f2422437e9426cbdd32cf32db2ddc7bc36a20f382c4756c9251c96e79e581b93ba2764bece593c95a0c79b7a1063c2c202aec4afd58f0840752
 EBUILD rubygems-3.0.9.ebuild 2635 BLAKE2B 45c6fa75ffd962eebe61fa8fca8a7867dd0cacd5a0503d3ba946cb1f13b0f00f54a90adaf0d069c2550d510e912fa2619cbcbb6b1f65421075062270fc7bb367 SHA512 e2c67911e5a521cb630bdd071d0dadab5a775e965918cf73fa3f3f8cfabfaa81a64d2f189c063d72689d9f6a1453f61a95044c52d9f3f4e36d3b91f3e97225b0
-EBUILD rubygems-3.1.6.ebuild 2847 BLAKE2B 661f1e1035c989668cb24642cab1cc444af53595b77ace9e9977a502316deb71b5f5d61521b4480390d8fed1066ca3d0ccd920b21c98251020d50645235ee1b0 SHA512 30aeb16df265eb4e627600071b5057d1e831fa2af1a005db6da2c741385bc6646f4eeea809c0c879f068b7d48b61642f3e4abd50812cf170dbc787fa5c1da328
+EBUILD rubygems-3.1.6.ebuild 2840 BLAKE2B 9eb42781875fd10d93ef6c558e00e54be7bead46148643e793dc2a87f2e5f1d54d86bb7705e4096cbe04041fc1b68936fd49d6d75d6e93a8b93fac610325050c SHA512 075ddd980adeee58625c1c5eed99f9411f29f1ddb45400c622fe94118c9bca227a1101732e5ef8fbfe37f957f963d270c215b7912868e8a3108055a728a69f51
 EBUILD rubygems-3.2.11.ebuild 3147 BLAKE2B 665c7552d0999b82d851b3c1a38ccf582c3d981e6dc28b19c04f1035d48b771454610772cec750b675f6ed0e0dcb728a7f0f07fe637efb158fa8951847774d28 SHA512 6facf0eb322be5de42e30aea3a32f4d9e0b94b5cec0646c6f8108b991d92212045dd711804b70b7d050f4bb001e134f6afc525d40b7ff83ad8e0b826f9de0358
 EBUILD rubygems-3.2.13.ebuild 3147 BLAKE2B 665c7552d0999b82d851b3c1a38ccf582c3d981e6dc28b19c04f1035d48b771454610772cec750b675f6ed0e0dcb728a7f0f07fe637efb158fa8951847774d28 SHA512 6facf0eb322be5de42e30aea3a32f4d9e0b94b5cec0646c6f8108b991d92212045dd711804b70b7d050f4bb001e134f6afc525d40b7ff83ad8e0b826f9de0358
 EBUILD rubygems-3.2.14.ebuild 3154 BLAKE2B 12e440bb8a187063330c58307299c10119258238741af575582fa13e15802266e0fbec31f1b07ba9736b785925f622ac56e0a13034c9f89faca59083d84fbf09 SHA512 ab894afb51c0114f355b7189739c34de8e0718c08fad6566dc48ea6e8e7f648958da55e71d5e8efc4a09cb40aa9915705a9fe61cef0f483d02a26c96c89b3ad7
diff --git a/dev-ruby/rubygems/rubygems-3.1.6.ebuild b/dev-ruby/rubygems/rubygems-3.1.6.ebuild
index 9601cea1f6a7..fd64d2265196 100644
--- a/dev-ruby/rubygems/rubygems-3.1.6.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.1.6.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
 
 SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubypants/Manifest b/dev-ruby/rubypants/Manifest
index a1a566819732..b454f0eff80c 100644
--- a/dev-ruby/rubypants/Manifest
+++ b/dev-ruby/rubypants/Manifest
@@ -1,5 +1,5 @@
 DIST rubypants-0.7.0.gem 13824 BLAKE2B c132b3c60390b712c08ec54b10a14255e21d9622399b9ddba8d2359915411c604052569e5713fdb4b1a3fefcc3416f4d5af16baca19063a0b79203838b8f3066 SHA512 cacd05e0cc87389b5513c83fe085db39202c2789b882b564caaded6b84b1ecb1acbde8232462dadf501c68c1c881ee7b7f4e640feec47c9c0f7a08758b5f5724
 DIST rubypants-0.7.1.gem 14336 BLAKE2B 6a2fd50f07e6eca0ee76a3f653fd378b9c389349a23bfa98cbf1be42e46a58cb76769e4f653bf83d72faa318be81b60920d0dbd900053f85489fe2c6a1a69a23 SHA512 48f04e621cefecb9911ee346ea9b4f185ee52a603f9a307d5424d314d3be88d0efda959a5654b5f532dfdd5af9ce2c0c6baceca4e09ad6d1471bf31c990e79bb
 EBUILD rubypants-0.7.0.ebuild 593 BLAKE2B b9ce136b628fbe76fabb94f80329dae2b81eb293370df237f9ddf19e475504e24e060559f9e3b26e3506da0f56d4cd1124d668aff03387945c3a2bc924bd7bf1 SHA512 98d4c98dcb820a9da65a1af9f69a2f89252f3b3a19c288e3ebaab4647989f427f7ae43b0c41b3890476f3af65cc4e999d6cec235a09da93cd83ac2f3347bfd3f
-EBUILD rubypants-0.7.1.ebuild 567 BLAKE2B 5f4892b5c2f544d6dd3a7bb3e66858b7b84dcefdc864f7e7827685e60c9cfb5c490f9f7894e76c728a0f706c7d13598a491793cc19671cfb29beb84d21454c34 SHA512 44b24a15c0d46e51541a906d4eeffa2438477272e2820c0485ae2ec3f5cc428778acd232c631aa4ac45ed298945849acce6ecf52f33c0afefaa6cb09fb9e9558
+EBUILD rubypants-0.7.1.ebuild 567 BLAKE2B 8a8570a78846c033dcdb1877b4a459eac0d5a8904a7b2e3697edb451eee9e1ba6f52d29fa9e020d8556e7f719180536025bed6a701b56a944d8af85b035272a4 SHA512 4316bb14643e787105aeba7a3494997f5c624164f6d45a19110df7989a6fb5d3b7c1f72c267795f4c13c0063b3dde400d128032bc39beb136be0f8de4529b0a3
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/rubypants/rubypants-0.7.1.ebuild b/dev-ruby/rubypants/rubypants-0.7.1.ebuild
index 9f766aea0c21..76d6c9c80cba 100644
--- a/dev-ruby/rubypants/rubypants-0.7.1.ebuild
+++ b/dev-ruby/rubypants/rubypants-0.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/sanitize/Manifest b/dev-ruby/sanitize/Manifest
index 9b8e51fcdc12..023093cda6f0 100644
--- a/dev-ruby/sanitize/Manifest
+++ b/dev-ruby/sanitize/Manifest
@@ -5,5 +5,5 @@ DIST sanitize-6.0.0.tar.gz 1353309 BLAKE2B 3056b79ee9611797cb8058f37a694f029e760
 EBUILD sanitize-5.2.1.ebuild 837 BLAKE2B 8fca5c6e6760f10ba5e5d5bb54d15657123b9ac946a214bb560bdca089bd1ed48650df2285dbd7b4f7270a416ecfd69dd81d9cbdb1cc2d0015623657cefa5346 SHA512 61c6cc7f500c39b528fffd9cf5ad011d34a21bf08ab2a3401823d22045c8f828aa5d66483f9b187b6eb49b12829b0ac0363fe1ca0364e974d22d501eaad69f28
 EBUILD sanitize-5.2.2.ebuild 837 BLAKE2B 8fca5c6e6760f10ba5e5d5bb54d15657123b9ac946a214bb560bdca089bd1ed48650df2285dbd7b4f7270a416ecfd69dd81d9cbdb1cc2d0015623657cefa5346 SHA512 61c6cc7f500c39b528fffd9cf5ad011d34a21bf08ab2a3401823d22045c8f828aa5d66483f9b187b6eb49b12829b0ac0363fe1ca0364e974d22d501eaad69f28
 EBUILD sanitize-5.2.3.ebuild 837 BLAKE2B 8fca5c6e6760f10ba5e5d5bb54d15657123b9ac946a214bb560bdca089bd1ed48650df2285dbd7b4f7270a416ecfd69dd81d9cbdb1cc2d0015623657cefa5346 SHA512 61c6cc7f500c39b528fffd9cf5ad011d34a21bf08ab2a3401823d22045c8f828aa5d66483f9b187b6eb49b12829b0ac0363fe1ca0364e974d22d501eaad69f28
-EBUILD sanitize-6.0.0.ebuild 750 BLAKE2B 37b2f6f9d5717a5ffb8a0468c044d4a2eb6f066ba9f76eea7fcdfc1bccc258965c3c25fb38709cb60b10ab8800df9bcd2e89f73acab8a54f7152109417560b9c SHA512 d366274ace665820f87e333ad0b7e2347138f77535f3750610d13d3113bfea9bdd2d6bc861e22e18a8e8829d969e0aac782d8896435c2dd354333947d8868c62
+EBUILD sanitize-6.0.0.ebuild 755 BLAKE2B 791fd418da825a29cc0f1a52a9a05787a29a94abe2deecf3f27b6f114587126b109ffe0c654a37af71d5d0d55a6ce7fea9af16c97a41194df82573296d1f633f SHA512 d7b9e5b334ea4b77a8f9eeb6c344b4b301eb6266d721784df15f7f52500b8dd673d60fee34eafae1fdb57a615d5f0359debcde77a4dbbc9de40ada422d4b55ee
 MISC metadata.xml 342 BLAKE2B 56d8c8d3467a7284a795dbe938e591403576e6e3d4fe675471e2b24b6c2f8520bec8cdea8d7e3182fe6fe8187a6dfb2889befbf5272f76b8f87acc4942a36e9d SHA512 e4257fbb18383d391d7962b3869db25b6875721cad7100dd42f7e10ac72254720c67e1028c13e4fe7517fda833677c1a542e12ff81ba0632b878b851a974c00c
diff --git a/dev-ruby/sanitize/sanitize-6.0.0.ebuild b/dev-ruby/sanitize/sanitize-6.0.0.ebuild
index f30bc4795e7c..9c6afc0816cf 100644
--- a/dev-ruby/sanitize/sanitize-6.0.0.ebuild
+++ b/dev-ruby/sanitize/sanitize-6.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/sass-listen/Manifest b/dev-ruby/sass-listen/Manifest
index 1ae17a8d2360..090b859368e1 100644
--- a/dev-ruby/sass-listen/Manifest
+++ b/dev-ruby/sass-listen/Manifest
@@ -1,4 +1,5 @@
 AUX listen-3.1.5-ruby26.patch 1069 BLAKE2B f2b661959f36f919116568fce83c867aea45eb219f63c7549855936ff818ab5d3a22fbb76595ea3e1fed995a436521acb621475b3562f09bed640ab40698d692 SHA512 4828b97d0a970fd7a8432d999f566f89a817775c77a3c4f7261e90b146d50fc0f4791fbcd343fae84fc56bcac4ea2616d1ce46c5cb65fb0e149175b02f74b5c9
 DIST sass-listen-4.0.0.tar.gz 49449 BLAKE2B bb44a91a6fbdca1b6d1b8b2253efd1709fb89713631d9772ce91dab9bc701b197a6551391699f5566d3a75ae42f9958d5d6d8346de9f74b45d7b60d88cca5ee7 SHA512 799e1e70f86b4be671c3286ae860cbcec83d8a1311d67fb37956dc527e2961888094439fd8377d50c78798c494f19ddbed3a412f02e76e429dcc1717c93b7e19
+EBUILD sass-listen-4.0.0-r1.ebuild 1155 BLAKE2B 4504dafa05474a6b2dc547c98ce5c80793678234d2641b3fdee9b10fd27648c36f125555afb6c887cfb1c583ac03d596a1ab0183e9f8e0201f692728271eea87 SHA512 6ba2f76f8a9e0c7206ecf1d1f29b83caddfb76231b9d2bbea7bd642c8746eb631f6e2b31dd0ed7768abd0be8ca2b86483096bf3f48bde5bcc329a505e99289a6
 EBUILD sass-listen-4.0.0.ebuild 1162 BLAKE2B 6d03af0873bd858821b9654efc314cfc6c2e6597543fabe57d4eb83a54274a9781395b8d76ad8a6411aafacdb5d07027119a2fade884664391ba15b3c04e24b8 SHA512 cb708b9882bfbf17bf06c20eae83136c8674dd083947c80aa28dd4d35046ed168895f6dc029d1e6aab6620c1b6da1dce4eba9ec476fa6a2848553ecad1eed709
 MISC metadata.xml 338 BLAKE2B 4738ef39880093b707248a925b33a9762b3e8ab637550448bd828088c9ff0350792f58f26928f2aecaefc940130ebbcbc16e65a25f2cddd010cf7727138bc705 SHA512 ca4455498c345f1e0121807fd0a256668bbd0cbf07b20c21bc4fe97025e3be828ffba7afa19ebe2adc461f774cfe341d8f48137270862637a57e22c47441f212
diff --git a/dev-ruby/sass-listen/sass-listen-4.0.0-r1.ebuild b/dev-ruby/sass-listen/sass-listen-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..341d0a1db1ba
--- /dev/null
+++ b/dev-ruby/sass-listen/sass-listen-4.0.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/sass/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Fork of guard/listen provides a stable API for users of the ruby Sass CLI"
+HOMEPAGE="https://github.com/guard/listen"
+RUBY_S="listen-${PV}"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+PATCHES=( "${FILESDIR}/listen-3.1.5-ruby26.patch" )
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.7"
+
+ruby_add_bdepend "test? ( dev-ruby/thor )"
+
+all_ruby_prepare() {
+	rm -f Gemfile || die
+	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
+	sed -i -e "/rb-fsevent/d"  lib/sass-listen/adapter/darwin.rb || die
+	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir spec/.fixtures || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	rm -rf spec/.fixtures || die
+}
diff --git a/dev-ruby/sassc/Manifest b/dev-ruby/sassc/Manifest
index 1ac96da3bb52..2d3d74fca354 100644
--- a/dev-ruby/sassc/Manifest
+++ b/dev-ruby/sassc/Manifest
@@ -1,3 +1,3 @@
 DIST sassc-2.4.0.gem 304640 BLAKE2B a4cd96859855cfd26e78a35becba30af8b7ee52d8ba67f7dcbc6354786f26e60a312be4e773f515f6edda6623142249a4a470f418d9fae3db734f8ae11498dc8 SHA512 835ba03d0fc5a791b2d620367f63202973f778bd8ebaa87c27f6a1de75b5895270205e8746fbb242d2739c9830a27d72453a75c1b536090840de581c52caade6
-EBUILD sassc-2.4.0.ebuild 1048 BLAKE2B 8c48e20062edfbefd711bd25e824d18c23b57015b3a45e813d149a3d65f7267c0834fd0d68a66c557983e4d2a1dd77c8cd1986bc1af35f271f4f3f5d3324d3f9 SHA512 12909cacf82d0ce4bb059024a17464143fe37f902bae472f3aed317dc720eb79c12cf948199c24922ad5e2e42d65e84e93b1db68eaaf3212b62b9c67bf7eee51
+EBUILD sassc-2.4.0.ebuild 1070 BLAKE2B 13be0bc5b8c721ed3960643e3d43449a85d893eaaed3e417c75ee7b6ef2d39659b485714a990f57826dd2598dfc091c286a8f4277a64a3c817504415afc906ce SHA512 18c7a919303b1ca02d50d1b7cb54314a6e7e3a52f95f48dbd9184e95ff2a0f5408a83b3668b8a18326512688993e1e9fa159361ee85d4d179d6dd71728097d69
 MISC metadata.xml 342 BLAKE2B e142db9aa3fbeca45133f091bff39a3452a51917779f21f78928295cd69bed7e12fb68de1e1d432d5765fe1560b5841a6c12be62487375b206170052c8aacd2e SHA512 39e8f3ff146ac9ee2b06246a6277b9abf3b5466dde0820ffe309f0303923310610dced252f33ed5ac342bea64f8bc3941d71d5d57b7c36bd8d302f415b32e10d
diff --git a/dev-ruby/sassc/sassc-2.4.0.ebuild b/dev-ruby/sassc/sassc-2.4.0.ebuild
index 3040ccc0c12f..0ab3fe4130e3 100644
--- a/dev-ruby/sassc/sassc-2.4.0.ebuild
+++ b/dev-ruby/sassc/sassc-2.4.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Use libsass with Ruby"
 HOMEPAGE="https://github.com/sass/sassc-ruby"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index 4c5ea35e024a..007944c1a358 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -1,3 +1,5 @@
 DIST selenium-webdriver-3.142.7.gem 865280 BLAKE2B 650011848afaa3ea4fab7c8172828c7562df212383a8fbea9615a5136e3382aba0fcf17952d941c7b514e5229c0aafe3dbc320386698eb8756f567eff67722bd SHA512 0e7891c19b8a0b20441d85bc17032ecf03cba7ca435846e03abc50b62b0c53c075dc70456796c9bfcd1ecd28ecc517f907a3d6868346a07617fd1d0c1b9437c0
+DIST selenium-webdriver-4.0.0.gem 152576 BLAKE2B 8a1394fb1c9cc3603081454c4946f0ad5207d113bb37c488207baaaaaff69f2848b2b5bc9b9221177d01c86b635dd222933be3561eacfa164539c99c8cf149a6 SHA512 db8fd0a05fc38e7f55c2b9a779462416b937d3b8e732dee6b7bcf2b3f8914417a79e8649e320e348359ab133cef20a75e2033385e8b125e5dfc52645b086045b
 EBUILD selenium-webdriver-3.142.7-r1.ebuild 1105 BLAKE2B fbd7aec91d8f5eae4a45a29c01309d7facc0e3a73ffeae3fc3a5c81b3ed551d2fbe70f61ec52225f07fa709c80eea8bec13153ac7a1484d6334b8df752c2e74c SHA512 fcc13f25d587994c569c9f7ae6da5430d50a032a7ee13fdd5010d4c9de0da97cbb188760adc059bdc2e15ba6568ee4ac18c0a82af61053b7d425f26300f2f8b9
+EBUILD selenium-webdriver-4.0.0.ebuild 1015 BLAKE2B df6b7d93c12ab49c58fd76b561597beac3452d7e41075a04fac82ac1282e43846924232015f73506ddd6c11856cca27fee8eb8e51f4587dc19f8eeb4ae941207 SHA512 2a272f961e101c996dcc4b7cacbac94dc5257e95fa6d07ac9fd4f6815273873a376482b09079dbaedbcf50e5cfd6bc59c75c2a35fe152ceffdebf6daa1cbae5b
 MISC metadata.xml 336 BLAKE2B 2133927d6a27b7422141ed649e46efc069300160b5fecb9fb5bdbf575461fde2b12411696be46cc673d6996c8711f50a46e92e1cdda5ff1f7c57ae298ff76406 SHA512 d1f80b8bf35f2fd08e4689292ce535ece939a64b94123780206d4ee3ab7a20b6d9c3a2d9f5248eaa2d0d35bb32bc5707e14c09b60881d856a180435b8f656bea
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-4.0.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-4.0.0.ebuild
new file mode 100644
index 000000000000..48a9afa6621d
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-4.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+# NOTE: this package contains precompiled code. It appears that all
+# source code can be found at https://code.google.com/p/selenium/ but the
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_GEMSPEC="selenium-webdriver.gemspec"
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+QA_PREBUILT="*/x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="https://github.com/seleniumhq/selenium"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/childprocess-0.5:2
+	>=dev-ruby/rexml-3.2.5:3
+	>=dev-ruby/rubyzip-1.2.2:*"
diff --git a/dev-ruby/serverengine/Manifest b/dev-ruby/serverengine/Manifest
index d02242427f89..a79aeaeb35c9 100644
--- a/dev-ruby/serverengine/Manifest
+++ b/dev-ruby/serverengine/Manifest
@@ -1,7 +1,9 @@
 DIST serverengine-2.2.1.gem 39424 BLAKE2B 0c68bfd59c0f6abbb294ecd8003c80853413b38b05ba1553230a2a49ffbf56dad43428eafbac4e77a012d66fdc30d4445249aed53e6eead11f52f5aeffd91c1e SHA512 920dd828561b44525dbef2a45144a40f456a5fbc2a56366a7831b42e9f6e115895a0156adc10114a007c2487d1bd1488f73c9c00373fd90648ee272c9c872111
 DIST serverengine-2.2.2.gem 39424 BLAKE2B 113ffaa6dd1c35ba0796aaec30c4b3bbc71d63abb7214bd0ed30c7d38195bb2caf4e12d79968ca2750fb522600ac9494848984248fe1645ae3d7c1e97fd6a608 SHA512 ec34af108017468e3981861b4a4ae84d071dd31aaca78d458512bf430a1c7075deb64134f899dbde14e8f18a0e163f0f61236a7b3678173030c093d3362eecf2
 DIST serverengine-2.2.3.gem 39936 BLAKE2B 20f36d60b3f9a01c3768c490db89b8adaade75fc16c1ba738135d24bb858f44c10ab5ff1d0b31f0a287b2ddb3a69f958eaa155e7a54a26bbe5b6a480e52c4325 SHA512 4f95dd9559e7ea79e1f276554a94459b0ef250c639d2ecd17509651a5585dc1688936048b636a3d9f09f84eed3d4b16aa5bf50537cd14ebbb7f0e289600b6e60
+DIST serverengine-2.2.4.gem 40960 BLAKE2B 66e3b10c4396b4613b734d3d2764293de2935b0e99bc33c9ba0e79f69c2af6fbb53dee8e356ab351d65195124e139ec4b0aa7976594387432b88a3875e985ef9 SHA512 39f5abe2e15bf1ea6524563a7f86e441f93479160976421d41aa092e04a0fca8d4beda3b20487c45b6cd3bdffdb175d98fbebdd36ef9a85fa242ef3cf356a9c8
 EBUILD serverengine-2.2.1.ebuild 787 BLAKE2B 89e0c43add0b47e665869c0b044333721a7f8e4247fb5cec3b5746c94f768139f51299a1bb4eaa6671bd084b5e975d05c8c90e898358f53c81d5e90230c8c558 SHA512 9bc7cdb7a98cc45f022e7d32127b6d3572febdf2292e3e91737f0d8114f3b99ac84b60a81ec0d69eb2ee6e4a6b8bccc9df5e9f734eab2db142760a74f8a1f262
 EBUILD serverengine-2.2.2.ebuild 780 BLAKE2B ea88557e63b858eefa3f78df226437bf60a2c98b8f7e74f76c7a7f37400a2b9a3c4419db5a7bf8c09bdd7172f0f83cf238bd3c4f813d9681d55a8c02215559b6 SHA512 b52559dd5d8e2a43a7d30cc27665d1920ca7d1e5683b9db7e2adf604c2ae5ee4b21355ce3e1b0ed4afbe51d60be4f73ec093687b03678542ddc67e2c878a1b7f
 EBUILD serverengine-2.2.3.ebuild 781 BLAKE2B a89e232904b8f266c280f9bcfd20933119dfceff9b6e41d12dc4426b657df06826a3fb95b737d67546a56e9592bfed90c92dfbf7d54614436873aa43ed2c4396 SHA512 4dab95efd9bbf456f7143bae49099344e693c75a1daf34821042276fc718215ef67ed048f4d7c49214165bed43ae9406b21313e0d04faa93299067738742de18
+EBUILD serverengine-2.2.4.ebuild 773 BLAKE2B a9cb0a38c1c904e0f0bfbbbd02d1dc3f1128241a9a308cdb2fa62f374dd8b4e3e5b180c44a64bb5936a41971723ccf82e8d8839c9796ef746c3ae703e91eb0b2 SHA512 1d0f1f4d7ede7f52cd9adccda8633e76d599ad96b819e043634fc1ae89fdc13dc35ea933f60a5a019cd8288473a81e17315a0818dae09a7309cc5056b99bcd1a
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/serverengine/serverengine-2.2.4.ebuild b/dev-ruby/serverengine/serverengine-2.2.4.ebuild
new file mode 100644
index 000000000000..511a0437825e
--- /dev/null
+++ b/dev-ruby/serverengine/serverengine-2.2.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A framework to implement robust multiprocess servers"
+HOMEPAGE="https://github.com/fluent/serverengine"
+LICENSE="Apache-2.0"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sigdump-0.2.2:0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	sed -i -e '/rake/ s/~>/>=/' \
+		-e '/rspec/ s/2.13.0/2.13/' \
+		-e '/rake-compiler/ s:^:#:' serverengine.gemspec || die
+}
+
+each_ruby_test() {
+	# The specs spawn ruby processes with bundler support
+	${RUBY} -S bundle exec rspec-2 spec || die
+}
diff --git a/dev-ruby/simplecov-html/Manifest b/dev-ruby/simplecov-html/Manifest
index a2de4171020a..bc437ecd0afa 100644
--- a/dev-ruby/simplecov-html/Manifest
+++ b/dev-ruby/simplecov-html/Manifest
@@ -4,10 +4,10 @@ DIST simplecov-html-0.12.0.gem 336896 BLAKE2B 03172ebaf3320e34937dd9715bc15e4bdb
 DIST simplecov-html-0.12.1.gem 336896 BLAKE2B ef068de799698c92b1a2cc9e54c7a85a08b763af43c8e013ca409283ee77ddbbea37b92fe691270fe3fb1675c9e4d9e79264dbb232a1aeaa23bab6e4358f17cf SHA512 9f85694d283588f5be3794edd37af94d22c914bb1659da5b8f846af8a988fc82935441fe60dc61c0345b7991ad3e85673e8aa345a8f8c3337e5fd2ab327ca5c9
 DIST simplecov-html-0.12.2.gem 336896 BLAKE2B dbd735855216b395280a3d3b34493bde8fc63594543abb6a2600a4bf87165b06dd3bddd7b161aa82d18b87ef62da51599eae366e5dfb4b85163380062fd4fb77 SHA512 5f89cdaba272b841446ae68d40daacbd551f3fcf7750c2491f14b79a3e61c6c32c066305eb2f1862f8cbd2ecc1b020cc9a907a977ef567653276d8d78d584efb
 DIST simplecov-html-0.12.3.gem 336896 BLAKE2B 94cfbae7085163ba714b2bdf14b7c5eb1a4bc5fcf39d7e99689d74bb1e693d5b534ca067ba5609f6cfecdba64667dc514b4f5dede020aea176ae2328d1806ea0 SHA512 7fd6dad02b16f512d7fb859f62e5e8bd0a277af103c7829143795ccae60a9a057c323728ac36a1c42dbd143a2f0d175648f6e223e6e7e3e6394a52491d3733af
-EBUILD simplecov-html-0.10.2.ebuild 525 BLAKE2B af432d2da72a1f2185b31adb1394a51362b1850950baac7a5cefb20b8bdda93942f4c6170de4ff5f81f04158c04540ff5479d935d8120179ae4a2101411fc2f5 SHA512 e739ca874f3d3a2fb06d56157ad44ec15fb5147cf2fb99beaa0aa2480bc0567f8a21cbf9c2f82f9d6e31bd294b9784f9f632cdf476c0a39f690d2995afe3f8ce
-EBUILD simplecov-html-0.11.0.ebuild 535 BLAKE2B f8074766912c6750f609ea0318e32017cdda3b64fd15662c3d6f9ad4147fe89ab4f0c00aa6c0fb2788c2fd46ac9c302e0f75e8cd121915cf1a391ad401f66608 SHA512 3da416b2adbcb8b8d87fd6cbeb30e07174c9acec6fe6b9509673aeebdf303ee1a11e221370dc8c9bedf86a749af266af969c8113c3ae292d765725efbf99785f
-EBUILD simplecov-html-0.12.0.ebuild 535 BLAKE2B f8074766912c6750f609ea0318e32017cdda3b64fd15662c3d6f9ad4147fe89ab4f0c00aa6c0fb2788c2fd46ac9c302e0f75e8cd121915cf1a391ad401f66608 SHA512 3da416b2adbcb8b8d87fd6cbeb30e07174c9acec6fe6b9509673aeebdf303ee1a11e221370dc8c9bedf86a749af266af969c8113c3ae292d765725efbf99785f
-EBUILD simplecov-html-0.12.1.ebuild 535 BLAKE2B f8074766912c6750f609ea0318e32017cdda3b64fd15662c3d6f9ad4147fe89ab4f0c00aa6c0fb2788c2fd46ac9c302e0f75e8cd121915cf1a391ad401f66608 SHA512 3da416b2adbcb8b8d87fd6cbeb30e07174c9acec6fe6b9509673aeebdf303ee1a11e221370dc8c9bedf86a749af266af969c8113c3ae292d765725efbf99785f
-EBUILD simplecov-html-0.12.2.ebuild 535 BLAKE2B f8074766912c6750f609ea0318e32017cdda3b64fd15662c3d6f9ad4147fe89ab4f0c00aa6c0fb2788c2fd46ac9c302e0f75e8cd121915cf1a391ad401f66608 SHA512 3da416b2adbcb8b8d87fd6cbeb30e07174c9acec6fe6b9509673aeebdf303ee1a11e221370dc8c9bedf86a749af266af969c8113c3ae292d765725efbf99785f
-EBUILD simplecov-html-0.12.3.ebuild 528 BLAKE2B 8d61c8a5d5ff788291695c72e9db6d8d4fe6b6cf8d9ae4851ab59a16aba2cb5b946c49020d90d6a558c69caa78bd903624a9dc629d97f5fda55c5d7dc7cc0e68 SHA512 18f7d01142c420a4dfcc14cb30bc2d297830f0c6a45ae6de36455acf3f2aa2fc931b0397b5b12e0f8af24fc61cdb1afe302cb12b6cc70842ae27be2309b1de4c
+EBUILD simplecov-html-0.10.2.ebuild 511 BLAKE2B f6a8c7f9dd6c26ab9652ab623da9c4190cc822cbdd8566bcfd36fe6530c0066482b3791a96fed1e098c4d896c2ed1dc0f07023ed70133931b3e58dae8e75aa91 SHA512 a72f84c970021218bdbda2a34533967a65e2013468f1133e76824cd9b7c821320f1733e672618aec80bccca104757f2a7f09f7ff580cb1792106b0f3226923b4
+EBUILD simplecov-html-0.11.0.ebuild 521 BLAKE2B f294f3df42d4a50f850bf90b5ebde12e22fd30112568296295e02cfd5178a1bdd0b8634b64493d792726efca68731773cdf1b96f17ee81ad163160c4d5db61e7 SHA512 751d79c858147fe6acfd2a5834cec5735b946257bab7fe7ec37cffeb73fb691f1b8645359e18ffe107f4fd52aeaf8a53549302d4b373d78f3b16b1a7fe1d9031
+EBUILD simplecov-html-0.12.0.ebuild 521 BLAKE2B f294f3df42d4a50f850bf90b5ebde12e22fd30112568296295e02cfd5178a1bdd0b8634b64493d792726efca68731773cdf1b96f17ee81ad163160c4d5db61e7 SHA512 751d79c858147fe6acfd2a5834cec5735b946257bab7fe7ec37cffeb73fb691f1b8645359e18ffe107f4fd52aeaf8a53549302d4b373d78f3b16b1a7fe1d9031
+EBUILD simplecov-html-0.12.1.ebuild 521 BLAKE2B f294f3df42d4a50f850bf90b5ebde12e22fd30112568296295e02cfd5178a1bdd0b8634b64493d792726efca68731773cdf1b96f17ee81ad163160c4d5db61e7 SHA512 751d79c858147fe6acfd2a5834cec5735b946257bab7fe7ec37cffeb73fb691f1b8645359e18ffe107f4fd52aeaf8a53549302d4b373d78f3b16b1a7fe1d9031
+EBUILD simplecov-html-0.12.2.ebuild 521 BLAKE2B f294f3df42d4a50f850bf90b5ebde12e22fd30112568296295e02cfd5178a1bdd0b8634b64493d792726efca68731773cdf1b96f17ee81ad163160c4d5db61e7 SHA512 751d79c858147fe6acfd2a5834cec5735b946257bab7fe7ec37cffeb73fb691f1b8645359e18ffe107f4fd52aeaf8a53549302d4b373d78f3b16b1a7fe1d9031
+EBUILD simplecov-html-0.12.3.ebuild 528 BLAKE2B a66dfd8c30250d1ca2bd1fd6c8a7115f21cb2e33edc35e0becb494c30cff8b454b23e083ad8d1888f6c1353ba87596d3be661b263816fe4c348fc1a71a48d28f SHA512 565a0c453cfa53455eacbed81dd2678e91fa41c84328c4f6809b2a81a36ef05d579bd910257c653bdc8443059217180a37e25c5ec315697c6eae50e5b4d26dad
 MISC metadata.xml 346 BLAKE2B 511f4e5e1982b2f9111acfd3dc3a85cbef39f4b428a9e8205fb537612f61aca987d02af1fa080160263b216bb25fdf2e00885410c5c56c3efc4486de0e20a578 SHA512 303107a7c72cb198c829031055ad5a7a68f0e0a286f2a77b9e19aac6d2c6441117393ddc4af6336d6c3809596a9743e575c72668c56883621ed74d4f2c4563ff
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.10.2.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.10.2.ebuild
index b975509dbec3..b0863b436354 100644
--- a/dev-ruby/simplecov-html/simplecov-html-0.10.2.ebuild
+++ b/dev-ruby/simplecov-html/simplecov-html-0.10.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.11.0.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.11.0.ebuild
index 9f00e25ece36..6e974d8d79eb 100644
--- a/dev-ruby/simplecov-html/simplecov-html-0.11.0.ebuild
+++ b/dev-ruby/simplecov-html/simplecov-html-0.11.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.12.0.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.12.0.ebuild
index 9f00e25ece36..6e974d8d79eb 100644
--- a/dev-ruby/simplecov-html/simplecov-html-0.12.0.ebuild
+++ b/dev-ruby/simplecov-html/simplecov-html-0.12.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.12.1.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.12.1.ebuild
index 9f00e25ece36..6e974d8d79eb 100644
--- a/dev-ruby/simplecov-html/simplecov-html-0.12.1.ebuild
+++ b/dev-ruby/simplecov-html/simplecov-html-0.12.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.12.2.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.12.2.ebuild
index 9f00e25ece36..6e974d8d79eb 100644
--- a/dev-ruby/simplecov-html/simplecov-html-0.12.2.ebuild
+++ b/dev-ruby/simplecov-html/simplecov-html-0.12.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.12.3.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.12.3.ebuild
index 880e2e67726e..d705ee81a73f 100644
--- a/dev-ruby/simplecov-html/simplecov-html-0.12.3.ebuild
+++ b/dev-ruby/simplecov-html/simplecov-html-0.12.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/simplecov/Manifest b/dev-ruby/simplecov/Manifest
index 54247200bfbc..4b3a530d72b4 100644
--- a/dev-ruby/simplecov/Manifest
+++ b/dev-ruby/simplecov/Manifest
@@ -1,7 +1,7 @@
 DIST simplecov-0.18.5.tar.gz 100495 BLAKE2B b92ebac7983e33c36aacad29ac499dbdcbae9f2bcf9d3ffb0cc07eabff112e74ba0489ada7b923453a69cf3a1487c8ea3c7af8b973242fa52671b0ba96b2a2f4 SHA512 05c452138997f4dcbf4b8cb053871591c291229e3f1fa152d128b1ea87668582ac4d72fa412c59f30fa29dbed1a4ca07fbfe8e1a1fe9470a22b2d1e931171874
 DIST simplecov-0.19.0.tar.gz 107240 BLAKE2B 64c82c4e2c89717f0fd4d24c95352a8ef435e0c7f2e968d5611c67ee275195cd5d89753f6c009338891464eb400ac87535f6bd800c2e79b9be548d75057b8e49 SHA512 81ee7a3d84346d05f4fb78b85b70a65232a1b13fc5cfec17e6bd7be567bd64fda621721bb287f756c079b2b10a11d30c9ae308270db8d9865e01e7d5f77f2352
 DIST simplecov-0.19.1.tar.gz 107430 BLAKE2B 0f18cd4c8ddfd324f4e3326ad8503530862f0ae67658865183984b81a59ad9aa5fcf650fa9f64fa6841ea23afa07d25e38443a79ad0be26b966fa99b6805a090 SHA512 2d781008769abd79020be96f7c1f91cfb9f27d51d00436f737c408a9b9d57a82955cbe5ba5ee5a628b9a7e8835d9b3e1542b67499355373c4f9b2638bee83235
-EBUILD simplecov-0.18.5.ebuild 1248 BLAKE2B 4bb5082594786d192ea860089f9bc1c855c04c3f12d231d6116245547ad3f4a424e0c076f94bdbd8227ee469968b8cef5ad4661b32e45bab8c87f70ae1497265 SHA512 6b5a326ffaae5ef9b4deddc8c41a742f04116da8e11528f880b0fa169c21ec1f4e65d355546b6756ecbcea9eadc347f6b07805051451551bb0798beea6d8827e
-EBUILD simplecov-0.19.0.ebuild 1203 BLAKE2B eab03770d9dec22b287ea053db8c3646bc8180d96090e10de1d01cf68079643aeeb5c9581da6be0dd9bb5a7d928f0872e17de60508e5d4ce5dd94ca1aeba07f6 SHA512 c11b911308d04a3bcdc0ce73c5528686a685da80b62f6d40ad5f399455196487f37f665153351f86160e2bf3eee97f56da97c7d1f8ff998671fee9a79b5a6cdf
-EBUILD simplecov-0.19.1.ebuild 1203 BLAKE2B eab03770d9dec22b287ea053db8c3646bc8180d96090e10de1d01cf68079643aeeb5c9581da6be0dd9bb5a7d928f0872e17de60508e5d4ce5dd94ca1aeba07f6 SHA512 c11b911308d04a3bcdc0ce73c5528686a685da80b62f6d40ad5f399455196487f37f665153351f86160e2bf3eee97f56da97c7d1f8ff998671fee9a79b5a6cdf
+EBUILD simplecov-0.18.5.ebuild 1234 BLAKE2B da6db0a5f167613299194ec4ee80dec45a5b355695a0d567a248c21944551072a4b24ca82bd03f3aa52f0d615850d5033e023c1962e82b7ff3bd647606547327 SHA512 d374fd89e990d3a32422d2f1b096b3879379eaada9e982774dc000aa126828097057b2d7972985ff0c0a87cc32343ae53a0d2b6989dcd6c244fab2979620f927
+EBUILD simplecov-0.19.0.ebuild 1196 BLAKE2B e82f58f8ee2915582d5ce3b0acc3b963b055cebe2e7d9daeed1a9575754453faec1789f27174a1509ac6d9de214275817008a204827e1daae40b4fd1aee15881 SHA512 3db78bb56d7c531bcc7a15fa5313e46e63bec6d8b16d5f09efcc1c7b3c987e0ba2a5cb5a8714bb80008c56d56dcee6ea6944c9fe6f61861f919babb9088a5f49
+EBUILD simplecov-0.19.1.ebuild 1203 BLAKE2B 8d94c9dc4e99cecf8f5a7027ce9add4aa4c361a9d4eacde5bc93d30da49088bbcc67be6ed48ded54758c189abb548baca9bb04623c83bc54237391421b2f6f97 SHA512 0259a72708017a8ecb34b461532ea6015bde28d15637fd51644c02003aace3713789c8a2672127aaf9590b25be10aed69adc95f36a8ad2df8c286f63052f5889
 MISC metadata.xml 351 BLAKE2B deddbf1938c6ddb07d6e018eea6972ef42c29cbd593f830363da799cf521f90dbb286fdccd0b01ec0d50392589f7ee40275ee67b871c827b24c4ccfa46b0889c SHA512 2cb0486e6184c2e1f27275c09434035a88209adba52b677dd436d422b4efc838b430dc436a67507b85ddfa4c98e1fde1f0475f6b0d1d42aae22bd984f7934c55
diff --git a/dev-ruby/simplecov/simplecov-0.18.5.ebuild b/dev-ruby/simplecov/simplecov-0.18.5.ebuild
index 99d480b4b2ae..e00e76b1cb13 100644
--- a/dev-ruby/simplecov/simplecov-0.18.5.ebuild
+++ b/dev-ruby/simplecov/simplecov-0.18.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
diff --git a/dev-ruby/simplecov/simplecov-0.19.0.ebuild b/dev-ruby/simplecov/simplecov-0.19.0.ebuild
index dd634e2f601c..c6d5bd67d875 100644
--- a/dev-ruby/simplecov/simplecov-0.19.0.ebuild
+++ b/dev-ruby/simplecov/simplecov-0.19.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
diff --git a/dev-ruby/simplecov/simplecov-0.19.1.ebuild b/dev-ruby/simplecov/simplecov-0.19.1.ebuild
index dd634e2f601c..f19ff100acbc 100644
--- a/dev-ruby/simplecov/simplecov-0.19.1.ebuild
+++ b/dev-ruby/simplecov/simplecov-0.19.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
diff --git a/dev-ruby/simpleidn/Manifest b/dev-ruby/simpleidn/Manifest
index 2ed63bc20b1f..ee552364ab11 100644
--- a/dev-ruby/simpleidn/Manifest
+++ b/dev-ruby/simpleidn/Manifest
@@ -1,3 +1,3 @@
 DIST simpleidn-0.2.1.tar.gz 204644 BLAKE2B 4c7f82af2ddaa753c8df91f80776b2b00d3a8a8dfda95c9012ebc3e5eea6503fbb0f20a7f79f8c624612e433b0e61cec79bc6a147ef6a04d418cbff72c31c867 SHA512 20a81ea5bca503b167cd2183f762993454a5f7fe082639b70234521f8cb9e4533b1f5f22dfcac18108c90a461185b13fea55f6197ab4c5996116ac359adf5033
-EBUILD simpleidn-0.2.1.ebuild 826 BLAKE2B 4a1a2a4d970a3b8b2167bb0a6486b31eccec4fa1657d607ceba846a7532619fc78d3281e948031b32d7d295956164363c6ebc690480e3c62e327e450e957e2ae SHA512 d2d424ba6277b6f78568ffc0ac7d3cb5d98d3ee4d619cca73b9145dda63ca969823afbd1bc0154851a420ea058978c73d0142614a3d22bff07fb4294d61de37a
+EBUILD simpleidn-0.2.1.ebuild 831 BLAKE2B 6f1e8d2a81f5c580515a30cfb470fa8f3a49a9c3f164770e08b4d395de4fb5d63ea7b466bde83bbf69e413684f96866c8a7731fd0e8bdc41b4835d8ba83eb3d1 SHA512 86545e237cf1b6cc1913a49b0904bc4c03033ffea5d1582216a8fe84b71b17d5718f505868fc1b0df44b5161994cc96367158715099ab5b6b77fd3a115d453fc
 MISC metadata.xml 333 BLAKE2B 5e0406b0968db1bc76f4dde0fd0f676a23324ed5b431e7c378cac3c19da91248a8d9831d8d92033a77fbe1a61c9a276a42f816c6a8691a8332d4477dfc7677ca SHA512 9938dda4d73b0f54c161e1ac0b42f20e7cded4f2611f1d4d26edfaa92452b323f079c73e192845144b75c5bf6d656fbfe058d0f45d65f46712102196c1efdf44
diff --git a/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild b/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild
index 5b3359f39dd6..417a85ea58ae 100644
--- a/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild
+++ b/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="Allows easy conversion from punycode ACE to unicode UTF-8 strings a
 HOMEPAGE="https://github.com/mmriis/simpleidn"
 SRC_URI="https://github.com/mmriis/simpleidn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index adb500b3eb67..af9af8aa4a2e 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,6 +1,6 @@
 DIST slim-3.0.9.gem 99840 BLAKE2B e449585fe5642c1980b4d8fb0c93979d8c16020c331f1bc2993c6f7b5bb3e55c1b85595711bf3acdc369c6a3fbfdc6873a8208c59aedaa49dead1cd9166347d4 SHA512 220dbcde230aab05e294022924346fbb02a1bf813a7c97910c2f60d7b3a7dd498d04f6f4f2883b895d2a3e6e9f526331914e3ab4560e748de2bd991358cca90d
 DIST slim-4.1.0.gem 103424 BLAKE2B 87de8411d6284569ac56366d4e2f3ee351c6908001cbda2926312f25c1c39520662371e826493d1346722bb507348bd8c117f3b0447b433bdb406435b80a70e2 SHA512 a929edcd1b194bc6abddf5757e0e942835f6c5e1555aa7bf021b0e850d74c9777637a2a0eafbdf2de7f0f0574eb03866c562826c656adcc0517cc4bfcb5ca897
 EBUILD slim-3.0.9-r1.ebuild 1622 BLAKE2B a21f9c749739126147c9c8594e3212f061dec057aff4256a2adedd701cc5f31ac7b5cc3ef65bc6b4730e57842c3cb4dcd7f1d6f6d7fed77dc10c208dcc214520 SHA512 2ea75bcd6076502b53ee4804ba5dca49b88585f712030bcf58e37f74ca1dbf93c5aa3fd318fb6d5a30128707bf2abc70e9156e8a143cf25d7a724abb1e6d3635
-EBUILD slim-4.1.0-r1.ebuild 1756 BLAKE2B 810a241d007f01f4c5c841ce1ce38f7c835c9ac0b007a8ff613ae2b15e7599cd8b8b79ac52d8e387fb7249370b312e3be6aa63030288ec2f99baac46dd00ec70 SHA512 cc53128575e0f8e649aac1761706daeb2a777bebca4b03ac4a18eb01b36a3ad4ea432c7cb208fa7c4c6d3c39e0a186e257f7f827f9a56111046107eaee3c8c05
+EBUILD slim-4.1.0-r1.ebuild 1778 BLAKE2B 304b2469f940d00275382d5101c089b24a5db1549f675f947d996dc3713c9d882fa5e87891b2942a39ac39c36e04368d1720b27ef62e1d7a0d993fadcd6d8f15 SHA512 f546a0f15b790e2d8c9725251eb724297b182468518657acb1446e34abfb2051e5d0c1e0bead3df334a0f0a69988511f70e2c552497bec055497dd9684ce51ab
 EBUILD slim-4.1.0.ebuild 1653 BLAKE2B c706e322135b0a78d2bc2fcbeb0fbaadf8c44bf4635850043b3281c560f7075ef1e8692cac6ca7df3a28f88bc176b068d1ee9e745fe88a50f89ae7f8dab62bc4 SHA512 2be3514f16ee6fd78dc2a28f2b88c737011acc7a8abaf9281cd36e2ceb3eaabdb579bf0d230cd67a88401bc2486b22037d7a31b77b5564dd1e4cee1eeb369624
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/slim/slim-4.1.0-r1.ebuild b/dev-ruby/slim/slim-4.1.0-r1.ebuild
index d1f1920d1e35..5205096f53b7 100644
--- a/dev-ruby/slim/slim-4.1.0-r1.ebuild
+++ b/dev-ruby/slim/slim-4.1.0-r1.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="A template language aiming to reduce the syntax to the essential pa
 HOMEPAGE="http://slim-lang.com/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 SLOT="$(ver_cut 1)"
 IUSE="doc"
 
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index dab970e6798e..e6890c0e3d33 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -3,5 +3,5 @@ DIST sshkit-1.21.1.gem 144384 BLAKE2B 961a3646b4401b1e4548b484143f12a9bc21644f71
 DIST sshkit-1.21.2.gem 144896 BLAKE2B ea72b1d0df7252f9c4ffe010721a957b5a86cc43697acf4dfd065a74cca5317deeb15692449d573a2e5590ef3a23ee666196b7b661d6986a2f270d16e2dc8d89 SHA512 37515726b67ae0e2ac9dff42cf7b71a32832ebe144aa192332780e4d9aead1a9e4c3cf7f6f0b994804175a5befd896b32908a82ba2e4f4a1d4e4b0f5bf01c3b3
 EBUILD sshkit-1.21.0.ebuild 1167 BLAKE2B b79a936b31ae0f50cf33806253ad81e1dffe2931cc93d0a0a8b0f5512d76f68c1e455512f308d9708ec153cd43324bff591a02118d1f5d4e7684dc983e6cd1cb SHA512 927d673fb96100b59387fd45e65c1f91781a947f1a6aa4dcca1d485304c995c9dbae1c48008ebf3f8b26a38aa02b08493a53d95348ce75b0fcf0b9fe2690b8dc
 EBUILD sshkit-1.21.1.ebuild 1161 BLAKE2B 416b0ee8d20b4d8f162bdac3e3dcc683a8b2763f4ee7c57347b0191e63d4de384b7acbcb2865ddb06ba62bd97a3a52fbcaabdf7edc62f6310529247747aec052 SHA512 e485b70ba01292fd1e54a9a6c32f68b5734e7f6f5416e638986d315a8c9fffc1d73e9a16645c3b703430b6fcc0c5e2afa0b145df0d89fa9f7542f607c825cc47
-EBUILD sshkit-1.21.2.ebuild 1161 BLAKE2B 31b1b239dc398a2ea7f7b74d1a5531d240b1b0805dbc3af03999da8e45ccf6dbf2ac9fb709dcc5ed88c7a7305b0c70b3b3456560aa27b5b425664042645867b0 SHA512 ece47cde0972fbda3f7fdab4bff478050a13e3508484aae013e9d87656afee4325c1649282cd3837f8e50075cf9e17cb939f1bdb21ef3173eee41b3fc916fcde
+EBUILD sshkit-1.21.2.ebuild 1160 BLAKE2B b0d69d820919831c8cb42392a7c8c730149d5a15d91803bca127956135627f1c5046aab3d50acdc3dd62c6913c28a0381a9207b2c48090223884e6050f339f49 SHA512 d70f00cb48074fae7f43d2a001cf5ff8a013fec465a0c7bc1e65ea36d0c5bee171d1bdd4c48816858d1907cf5020930f59fdad6b4b46cdc147ef43e831d13049
 MISC metadata.xml 344 BLAKE2B 16679900db0e4f70c9afc7fee058f72fd4df86453f5870666a329d1af1380894b7e592b89e02a4b23a07307765778f302cbd3166e45da66bcabe66b97b450d08 SHA512 afe79f300e02bfbcff4e984092bde60d4a8c6c528a0fd2816456bb5bb12c03aff61512e94e4ecbd6e76a947c2e5e22a433bb32fd052e7e0ac6e78814803f20a1
diff --git a/dev-ruby/sshkit/sshkit-1.21.2.ebuild b/dev-ruby/sshkit/sshkit-1.21.2.ebuild
index 37bf47f7d5d8..08eaca39db62 100644
--- a/dev-ruby/sshkit/sshkit-1.21.2.ebuild
+++ b/dev-ruby/sshkit/sshkit-1.21.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/capistrano/sshkit"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/test_construct/Manifest b/dev-ruby/test_construct/Manifest
index c5a139fc649b..b1dc3861a042 100644
--- a/dev-ruby/test_construct/Manifest
+++ b/dev-ruby/test_construct/Manifest
@@ -1,3 +1,3 @@
 DIST test_construct-2.0.2.gem 13312 BLAKE2B e1a5068e8133f739dfc407e943b0486c0c2bb2a8f18943a23b366205b206a56b792630daad7a92a021ea367d490b117aec1313faa0e5360bf6b984df3b82c16c SHA512 d73e2daf5c5974c79aedfcd7e1cd6681a3f1f6fe3f2c68bcde26690a18be920ea53b648407e4ee33444364b2a02f1517362c876e703abad02fc528a47de092ff
-EBUILD test_construct-2.0.2.ebuild 612 BLAKE2B b649d6428b6bd58d4835c8c4fb266aec7a2aedadca50419b415797e1bc5835623aee3f9f9bfcd3cae17bf0e8cebb37641ae2d1d78f683b82d952c339b9cda32f SHA512 03ba9d31bd4765c0a0ac853aa158d0263180550912b85190ca92b1c2a054addf8c9465ab429df4d1da03d4d8c7d39e9bc3fde34ce7162c66081898737b9e7420
+EBUILD test_construct-2.0.2.ebuild 617 BLAKE2B c40506223f60e3520f0fe6591a48bc17f7eb0a115961602b3dd391096ef1ea5db55ad576adb3677dfff5dce4fb1f03bdb1d98f191444b334088cf836fce03afc SHA512 9fb95a514dda8229decf92ca74577a191a6579d87e94b0e709295fd504ec76a5b5ac80a4836871fa1eaa5045d7fb76cef099f6dc42283195bf79756495df8c2f
 MISC metadata.xml 345 BLAKE2B 3a2ff96a2f7474b98c3ccf65f06c38925248cf2ac769468e1d861a5c13379d35cb562cb5f55e1018bf11aff8bc2dfae94cb4c19461384f9e7cbcab06f7a37589 SHA512 d10509328b3445fc3eb9713c4f527365cc5491f8ec8415662a8fdf06a93049bccd63ab9da13512e7573fb25e3e9497f13969faaf0734cc01cd4ce1fc574c73b3
diff --git a/dev-ruby/test_construct/test_construct-2.0.2.ebuild b/dev-ruby/test_construct/test_construct-2.0.2.ebuild
index c3b98c578632..ab64f8376d38 100644
--- a/dev-ruby/test_construct/test_construct-2.0.2.ebuild
+++ b/dev-ruby/test_construct/test_construct-2.0.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=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/bhb/test_construct"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/tty-color/Manifest b/dev-ruby/tty-color/Manifest
index 719c4810b0fb..ba0b97bce8ea 100644
--- a/dev-ruby/tty-color/Manifest
+++ b/dev-ruby/tty-color/Manifest
@@ -1,3 +1,3 @@
 DIST tty-color-0.6.0.tar.gz 12298 BLAKE2B c6d86666cbc8b46f2e5ef37556457bcffd4a92c65ae6a281ad989ded3d89ded8e3e3f5a1a3f91b009b7acdad9f2697d7100239c13eece4d2222c1fe1e8c2c2d0 SHA512 ab4f550ccf8fdc2cd0ad9368948819e4b77473a087510a4853036f18cfb21bab89e36631372cc5f2ee4f5d44c8c84954d14956d7cb7c3050e58d1ce19d11754f
-EBUILD tty-color-0.6.0.ebuild 725 BLAKE2B 50edf9f593cc3c985a0d8641cdf64d658d8d96a8cc9bf52b77b8a034ba9fba947a13b97d146d24e2843c9ef3a1272e6a0852f3f299c6c9102e023d4f2e8f9f0b SHA512 cd6530673fc3e131431a4db38ec89e05335c41560430dbdca2e696b430a6d43def3af2d0bc25572fa7ca07153d79be287f2835e01308ae0fd246d73ada9bd0e4
+EBUILD tty-color-0.6.0.ebuild 737 BLAKE2B 302f0f19ab2f1108381f530446ffe513c92a6e69a138f2b8b20402decacc9e3be8a014149c50bcb60d834561bd0b2cd2d45b6bc5bd5eebe8972c8d80b3308b4f SHA512 3f5f3fc7e5a688214e0b5c0a1861857bc713f19de237314dd4e6903b8c18d3d909a4ac3de090a60ce008f9e369937233f9234c826515f9881efa8808c6f6865b
 MISC metadata.xml 338 BLAKE2B b5af92054df120ea06a7a65f578595bc74e561bcfe17d8ba4ef02c18506a420f5a0804a7661ed6357ccc2ea6b4730528e8014327ed2cd7ef997d7d7f0cfa6dbf SHA512 f54e668c43bfa8aa103feeec8af8513240a5204139c88b40b4845e1bc5b535f299900c8861a7325efae7583f39e6a4625907f9a2b9e5f000a6f85f4ce1e4ae7a
diff --git a/dev-ruby/tty-color/tty-color-0.6.0.ebuild b/dev-ruby/tty-color/tty-color-0.6.0.ebuild
index a28299e6386b..0efbf80700cd 100644
--- a/dev-ruby/tty-color/tty-color-0.6.0.ebuild
+++ b/dev-ruby/tty-color/tty-color-0.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/piotrmurach/tty-color/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/tty-cursor/Manifest b/dev-ruby/tty-cursor/Manifest
index 02245b1eb078..ab2d94a6037b 100644
--- a/dev-ruby/tty-cursor/Manifest
+++ b/dev-ruby/tty-cursor/Manifest
@@ -1,3 +1,3 @@
 DIST tty-cursor-0.7.1.tar.gz 11015 BLAKE2B 222602d7dd3ef2372555913dc59bdd4b4965ac5c3601268d0f77060835d4ae9bc9fa23d54f811e7c0a453b80786d4ef07e0bd26cc8d76f6b963787a04b17569b SHA512 7c1f664bfb3c8c46aab08cb3806b8a00d92b45195fae47e851967f88040cc64d598bdd80e37f782be83fa60dff82c607d93026ffbf003125fea8230f4e18639e
-EBUILD tty-cursor-0.7.1.ebuild 770 BLAKE2B 80ea5ce07cb666c79fd884bc4409ebe9c4f0a738fdde11c6051eb8b4d4b21f3a818f32e08c684db41e8a82ed3be2ede6476535ddb1e58f3817404b86cc685c4b SHA512 df48ce0608f9bcdb72581d0f634eef7f1156cfdd35d122030984b866bc8873d23cc7673aeaea6b838a43edf65c731cb7361711a1e935e338135e600ef6fe2602
+EBUILD tty-cursor-0.7.1.ebuild 782 BLAKE2B 1191f1c5944a650621b1640125cde6adc7be1ec0d77a4c8a82380edda758ee5d87b75ab3650e7b109a978d9ae0aa4ee54f6df7b2de5a7574e4ad2b75d26d4010 SHA512 be3d9d57c9c8e50a391dd5e9c387460e64fc11bff45fbf6262db4582e00b6dd13f1ebb3b3db6636be1254ce7f319a366b0acf7ad1f25d027de4eec977aa1c45b
 MISC metadata.xml 339 BLAKE2B fe18cce74818bb40c2414d8e9c2ffc6642133ffb1852b7003a4d8cb84098a26662ec7284dd991d1ab525378ab9af81303cc5c2c6f1f79811a3fc49d867610d88 SHA512 f489e49c37ba066bb3586fc50ed7deceff038d684f15e34a545de37e487cb55961d88d10d8b05b009e049f215b21287acdf080790ba15c78e9a2442897637192
diff --git a/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild b/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild
index fa2f0e21e8fc..aa8301985634 100644
--- a/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild
+++ b/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/piotrmurach/tty-cursor/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/tty-editor/Manifest b/dev-ruby/tty-editor/Manifest
index 8faa3ddcf146..3fd00dc655e0 100644
--- a/dev-ruby/tty-editor/Manifest
+++ b/dev-ruby/tty-editor/Manifest
@@ -1,3 +1,3 @@
 DIST tty-editor-0.7.0.tar.gz 18140 BLAKE2B 917ea287b30588ffdf705d4ea06c711884b4dc7ba348f9acd08f0cf4e71c854ebcec6f7b8285e9fc1d45225f8ccb295dcb23b9493fcea2ac831c352cd7cc3680 SHA512 c5d6a781b0be00ee14e6fa30ff0bbb26fd9548726ff0e101163a8b4206bec9c7ffb520679041c1f174c2f65d76ea71177718a6fc5e06e8191dc5510aafd33175
-EBUILD tty-editor-0.7.0.ebuild 782 BLAKE2B 8147142a06296491cda023dfe62c025d87421dc2c5aa5a65c52270903050fdb5e03545749aac2dff3015048c4b65a1656deb42512256005aa5616e53edaa33ed SHA512 e6c1099a38ce1a6396b70537633bca47762f71fc46aeeac3e93bf7493f982f4cb07f1306fabc63e7a3af763477c6fb49abb6fee9d8dbb5f0453d14cc996e2742
+EBUILD tty-editor-0.7.0.ebuild 794 BLAKE2B 6a3cefaf1953750e04668de00c973101f299576647d3e4546a83a62923cdc25e80ee0d769799499a0101a9f7c318ed0560e1c59b1dd7bc36b293ffc1cd47b1aa SHA512 d5edba0f28906de118d6aff608bdffd5dbf4af47c408775513e7473bbb0ca682b692f0c0419783a6055806b62f9c4b48eb171a66c8da85313cd63e2d23036b9f
 MISC metadata.xml 445 BLAKE2B 9570fbd3b58099e60ab39f3b448ff667610cc8c24c364b4b9eb0ed219800bc760ad3fa5bab18f692212b4830066ecd0b56dc295640c1fdad54ef5410613406f7 SHA512 665f2e4c590b25ac1649906832153f17bfbed365633c1440cb3745c468b870e4ffa5d2cef824ce211c92bc3caf10060bd560c0dec87bfa833521172a985e7da9
diff --git a/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild b/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild
index b87eb7c22a6e..97fc51b902ee 100644
--- a/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild
+++ b/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/piotrmurach/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc"
 
 ruby_add_rdepend ">=dev-ruby/tty-prompt-0.22"
 
diff --git a/dev-ruby/tty-prompt/Manifest b/dev-ruby/tty-prompt/Manifest
index 22fc3bc54497..d93d0ce22d31 100644
--- a/dev-ruby/tty-prompt/Manifest
+++ b/dev-ruby/tty-prompt/Manifest
@@ -1,3 +1,3 @@
 DIST tty-prompt-0.23.1.tar.gz 554471 BLAKE2B ae39444b80781ee5c85df87f4ec2b2231b4551a23202070c4570d0e4807a3e4465bb026299dd775de9abf2b8cefe3157cb3fc5297cce4d248f6f8e2aca8c572d SHA512 5e2762d2b229f0aadde7fa09e43ccd317dbda057d829c9003fc6b18f9aaacda1416357af733c4e4f308041c8119ef344b3adc1954a6d31abf801cffdb1848a61
-EBUILD tty-prompt-0.23.1.ebuild 797 BLAKE2B 93c10545b8846fcf7a3d83e848b78f4c54c2ab1567e6b2db41683ff1d2c580e5469c54ba5308ea6606b6a3ef8faaea5a86f821acb770c2ab68bfe70a55ffc4be SHA512 5a302da968d389183501c9be8f1c3de44ff1eb3898553c38b85d28727b344f134c71906e9cf9af30d8fe06257c968cc62c15bc08872f13953f933542ca00ce3d
+EBUILD tty-prompt-0.23.1.ebuild 809 BLAKE2B a7a89643cb45a88afad7a21b087e9783fafcd1616c1c15a914df8ab5b93a710404b1b269a2fa341c1183a6b621498567ff37aa66f016ce9ca84c72a12ddfbe7c SHA512 a15dac2a2586ffe6f484f751e8f087ba262cca8db242d2249890fcf1791c1380a35482167e6e7e636acddc83e070d4d8e02c41f2bcd648f4de57719cf9ca2575
 MISC metadata.xml 339 BLAKE2B bc595203d2c93cddf7ed31e92cdd0ee86ed74ee4d40fb2d36a14a50accb24871a493b15351e3b00876abf47833611c71f6e2c0ea22b68093f7b8140203876327 SHA512 42289de16764b35a85485d581debbd4896dcad29c6c57a0a0f897602d06708e2c25c42e811c2fc8caa000f8daf30b1dddee781e8f4909968e52bd51535d44e66
diff --git a/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild b/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild
index 2c855c1bce84..e43d71b2c088 100644
--- a/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild
+++ b/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/piotrmurach/tty-prompt/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/tty-reader/Manifest b/dev-ruby/tty-reader/Manifest
index 72a2a4068ebc..1fed7e089bf8 100644
--- a/dev-ruby/tty-reader/Manifest
+++ b/dev-ruby/tty-reader/Manifest
@@ -1,3 +1,3 @@
 DIST tty-reader-0.9.0.tar.gz 461051 BLAKE2B f2a48a929fc7ec0f6f98e4508ed50638e041939ae2eadf96cb8d04e4a771304e63648d5c3a85581fef3ae4740a570114e8d427637c6b3a05ece400f7963a26cb SHA512 2480f480a6ab0fa0854386ba0c31b5e78ff53a2d65b23825b13e50929337f56f8e38d1277f61509139cb43eddd8a933fadcd9d3c916c9dbaacf4dac1ec38dbaf
-EBUILD tty-reader-0.9.0.ebuild 872 BLAKE2B 3313a43a838a0062772307a7436ab322124b1069b254a2d04a52aa3441874b63244f3ae10f6ef5b1368a074bcd8067aa0cd74940a624d477f9238231ce7b9e60 SHA512 cec807cdd5a3a0c6e0f5eadfd6052b1174241e700e984183c0c08e7ef71679c9898807e07026f973278ba57ce0366e9192b86a40b4b7ae96f8d88c7ff461ff7f
+EBUILD tty-reader-0.9.0.ebuild 884 BLAKE2B 59bec002fccd5cd1ca351a6146577ed9f7c46c1afc3f50df039ca19b00f34fcfef303b739007a2c41989e91e66cd5260cfe2b1c529c59c3b0b6804836a9a058f SHA512 9990853bb1ea5bc4daa4549010b4ce06ace0512f8773b55977fc32cf6ceeb56cbda9c4007e86f725e85bf8b5d1652137bfc88ce424aa06939357b46910c622d3
 MISC metadata.xml 339 BLAKE2B a3e0cc05713c588e4b26fce8a5975467daee7d90d9e01afede501fb829c7898fc137b76747e00252559da605607b4eceaa9e44721710a5c2d21782f05fde8eb9 SHA512 83bf2cee20f0dd32baffaac2f46fba0656834de410d743cd476c5800126a3d767a136114b0ae200938a7c9c73f452fbeebcc14228ff4e788f393b50856a9e320
diff --git a/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild b/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild
index 326f0d7163fc..c5c60102ca51 100644
--- a/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild
+++ b/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/piotrmurach/tty-reader/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/tty-screen/Manifest b/dev-ruby/tty-screen/Manifest
index da16d9c688f3..6361f3fadcd8 100644
--- a/dev-ruby/tty-screen/Manifest
+++ b/dev-ruby/tty-screen/Manifest
@@ -2,5 +2,5 @@ AUX tty-screen-0.8.1-ioctl-test.patch 1650 BLAKE2B e7e6e59a494d4e450ff5c7e4c6f0a
 DIST tty-screen-0.7.1.tar.gz 11377 BLAKE2B 485b5610bc81524cfe525f8a837e99d13788da499dd8fa0f7c3be3f580ada63861f04652031e84817ef6ee49ce099c5fa97104b6634fc306d9ee0bbed0828ac3 SHA512 1ef5ce12cdd6337c47f09e5b6ae116985a80efe9f493d52c404496319f1377d4308cd829343d84f5c653b70327c033955232ca62fc8a134503a87a33a264130a
 DIST tty-screen-0.8.1.tar.gz 13019 BLAKE2B 9c9ccb49ae323ebc67c5bca918303586fb749813539aed32a892f3135aa392f6c77b078bab2c7bd116d9f152ee2745d72aae38a91cf4292d1f360085d88060ba SHA512 b0a01c49bb0c56f23c8b384a2d4f4b5c7168863a35c3ab7160d0f34c7d63a2b10b3b9f0f54c6d56e2424a8b16e6ba74268ac81af631976876fb37eb9c347c393
 EBUILD tty-screen-0.7.1.ebuild 735 BLAKE2B 60f62ca1543f4d20e1ba4531de9bed610e43d3021c1f8a75605c38e3e61fed8499dd8eeffadbe35137ef2ffc7a8522fd981959ee03bfa82bf8ea6ed1b76af657 SHA512 26715c2e8d7cd957a81b3651b85006f428b28ab90011cc34a73790d15c8a161a34eca8d69731e2aca67eee30b97233f1c8407f71a137b391e3bd0388d79c96b2
-EBUILD tty-screen-0.8.1.ebuild 852 BLAKE2B 90d7382f7edc2048160a2373600e9173d15ba52ad4e56141f6c80fa69726ca78e761a1982211cb7fd10384f49141ac376b3acc93abff9f5e1f411ac4015ed242 SHA512 b49d736b771a888df4a6f5ccd47aa73aed787ea61bbab253468f8a374087abf6a025efee01296c5481e25268ac8d187387b227c08e97e222a4ce1497b23ca5c2
+EBUILD tty-screen-0.8.1.ebuild 864 BLAKE2B 9b2407f75a7d60fc80afec8101c8d31363f23e3eaa032bb3238d8904528ba0a472ed86cf28805526bab6e0cec0d78d37f0a3897ecd853861b2408a08ffbe8802 SHA512 b35228a1c72e207a3cf4e5ecf250d5ed717ec68590d56c25e3f455af2458a99189574adf80988bb6014404a9552226ce2ef340572558c6764dabc69888a3fd53
 MISC metadata.xml 339 BLAKE2B 9f3e4ed8b89e91c69c11551c7b61384934543cd9b56cf389fb6f423722ae5e00f6c269cef8fc8b413d31da1b2967656504c21128da60055878ca20406196e52d SHA512 1a82d0b0fc5c7f3f3a8924289d3c957c3f956f01e36434ca654dea5f469a149b8a8324c4709bafb1707400dc57413ec42e5a4d74f9454cb0792b6ea45873e6b4
diff --git a/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild b/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
index 14a4e759c105..43af99e590b3 100644
--- a/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
+++ b/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/piotrmurach/tty-screen/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-ioctl-test.patch" )
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index 2ca8ebf1a40a..a5c3bd3042d4 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,3 +1,3 @@
 DIST webmock-3.14.0.gem 126976 BLAKE2B 20dd463c8b784869d4379aeabf892a6b4602091a4cc01a4002161d88f24781bb2bae1e50bd0ce8077c40aab73a2243835d99551bd04d808ffdf019df071c2b01 SHA512 0c9ea5b29446de7619c45d0fb72ab305bf68150c9d657ddc223d0d258a400dc730e3fe401b46c994a5c8eb450db5ee8f7021fe8d2d6c85bc4723c657799c5ccc
-EBUILD webmock-3.14.0.ebuild 2219 BLAKE2B 48b0fad981181e8805072819fbee69dbbfd39c732e21096ead6a2bdddfbbc10c21cdc882c4a5f0c176afa430e0ca19b65014ea6446f59d2f18e0d0f7bd910549 SHA512 a933fe80cd76b05ac090ba64b26dc8e1457b9574579a2d0570cfcf0c4a3fd8bde9499ed6a69248c291b957a902ef22be191c3213dccec6ac343db20c08935294
+EBUILD webmock-3.14.0.ebuild 2226 BLAKE2B 9c46eae3d499465f7a20f6020c9ada515e35df01afb823b80199e759529e182d9f3ec899db273ef1c78d3f980566da86c1420cd23e8bd2e97997f143bca0ad75 SHA512 b9d14ff5f7452c0571144f75a111bac87040ac778eab71e8b5cee70417d01da8482c59d7601922a011f2043cb0b9a1203caf2de901316fda2d3109de94d9e02a
 MISC metadata.xml 342 BLAKE2B 0f0b9d59bb3519e6da06fe5d57cc9ce3cc1f3a1f516006a3d43a6cd3c416b3b5d9d2955a7800a588010b9672f3a03fb6a74bc62c3ead8b2e0f0b3ce0f5af5456 SHA512 0c4f9ce8deb018a77c7ec77417a22d3b95d0701263acc1ff07081e4e7ef995051ad2eba387962ee06b4bd810db5da7e2294e1ca7bb9a50704f7d7265b8462997
diff --git a/dev-ruby/webmock/webmock-3.14.0.ebuild b/dev-ruby/webmock/webmock-3.14.0.ebuild
index 13090d6562fc..4d2540f5d07d 100644
--- a/dev-ruby/webmock/webmock-3.14.0.ebuild
+++ b/dev-ruby/webmock/webmock-3.14.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
 
diff --git a/dev-ruby/windows_error/Manifest b/dev-ruby/windows_error/Manifest
index fc1a3165c499..578209f1b241 100644
--- a/dev-ruby/windows_error/Manifest
+++ b/dev-ruby/windows_error/Manifest
@@ -1,3 +1,3 @@
 DIST windows_error-0.1.2.gem 227328 BLAKE2B 99cd75d66f3e3322d62daea39a8e217dfeda89141ec3d78c61a29306b78206a40c4bd7867d59a783752da20007b43c45577ec3afe53b7037b850d4983f482e4b SHA512 32e94e561f53f77c5efff5457068e31e66b1d3c73531870b52af00297f69341e390b6d8419a0c0b78ec05f6b65be6456128b9055c143e7b65663520baeac90ad
-EBUILD windows_error-0.1.2.ebuild 537 BLAKE2B 56b06aacafd1c3f18c69d5da9d7ba4eaa0d983628297328264618ab6863aa96649e1cc64e3afa5ed8d4128f3ae0563bda7e082eea393a402e1653db8700e06d9 SHA512 f717c7528a9db0e7af4cccf6ea89dbd488ced39add058915ef72ebd8e9a237d9ff4670b600ad47b5852ac6d373e59dba38cde755f144e9e26c0c33df7061801f
+EBUILD windows_error-0.1.2-r1.ebuild 467 BLAKE2B aa348a793a5383ca0ff03f676a9aa030c2c25b7f708f1f9ef17dcbbf458658deff73d584ab0fe78b55da10ee860a0d110aeba8d15f5ab7b87d0d6dc064ca3bde SHA512 82735d75a14b6ff4e6608ef6029024b8607b9ea325aae7d3f05c9ade3b83527a4eda341fe2314ebb1616f8c13c15710dd3d27fcaa42ab133fba086bad3f79d4e
 MISC metadata.xml 333 BLAKE2B 5e692ccfa70b1bbf9e2ede9947d7925c278e1ab0af36df615deaf6c5d89e91d4acfecf303880e1e32864e3fae2b506487a22870719cd753443333df71b9fca03 SHA512 b2f9ca68fe8ebb639a863b88d4899d97665a7dc8765048d2a5a0fc52e41e39b93cc5ebebafbd4cacd7f317cb5e730d39e1eedcee4c9ae7ebae723cfeccfdd8a2
diff --git a/dev-ruby/windows_error/windows_error-0.1.2-r1.ebuild b/dev-ruby/windows_error/windows_error-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..4f9c1ea42e17
--- /dev/null
+++ b/dev-ruby/windows_error/windows_error-0.1.2-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="reference for standard Windows API Error Codes"
+HOMEPAGE="https://github.com/rapid7/windows_error"
+
+LICENSE="BSD"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	rm -f .rspec || die
+}
diff --git a/dev-ruby/windows_error/windows_error-0.1.2.ebuild b/dev-ruby/windows_error/windows_error-0.1.2.ebuild
deleted file mode 100644
index c910f5d16f0f..000000000000
--- a/dev-ruby/windows_error/windows_error-0.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="reference for standard Windows API Error Codes"
-HOMEPAGE="https://github.com/rapid7/windows_error"
-
-LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	rm -f .rspec || die
-}
diff --git a/dev-ruby/wisper/Manifest b/dev-ruby/wisper/Manifest
index 484322889363..13e5d0ed4714 100644
--- a/dev-ruby/wisper/Manifest
+++ b/dev-ruby/wisper/Manifest
@@ -1,3 +1,3 @@
 DIST wisper-2.0.1.gem 26112 BLAKE2B 3dc78cecb80e052ec8bc308d02e5093ca55fc7d26a1dd98614907707d62d15e0cea1a20c7843ca7e6ee175800d320c3ef5854396505aaf0648161153b0e61368 SHA512 3518c218c0cb4ceb5d96260f7ac8845fb2f35d4a77c478cb56f1251fc29910a655ce070ebf3c17eaffd7d144ac54b436420bd2b2c4f72a8743f68dfdd72a514c
-EBUILD wisper-2.0.1.ebuild 564 BLAKE2B bc79c10bb4d04433882ea184806e75d6eb4b86ace851004ad27db6ee7a133252cdd2abd9135c957b5fbd1fe3f80afd4cf50c95434509613f5ca60f3dd686be73 SHA512 075957efe7b661a65c9b55c0e2d4a01f896f1c92377773646a2ac2fa318502684f3b3b5f2f1672499a40007a9c8f796f354643b71db3ea3c5b5ab568e20480a2
+EBUILD wisper-2.0.1.ebuild 576 BLAKE2B 7e631da5a57d875e3ee35cf4de1a3c7e95930d952678ff93d994de4b40c2d9f7003cbb4663d393566af9d1a6e1e2843fe9f62f4680ae5a77641272ca63ff937d SHA512 499dbc1270b95e0e6444b365095ccba1d3172d1835eb51d0a40cc619899c95194c1ee5c2cf1b066c962a09a9540a23ca7ad456e4a168d63d2784702c139f3622
 MISC metadata.xml 333 BLAKE2B e762b1f26553851cd58f0fd7a87870bab5ac26592ab5fad0bd2c9fc1addd229bbc4e6b05cad225d115577f3f59ca633c65a00a52c348dc7ceeafd062557a470f SHA512 7caf69e35a8ea5ccd4ad8c4f9e455dc060ed2377a8a95d548c80823296a95b7562fc272bbafcc9adcb66430b5ec82ea732a1fbfc935fbe70292e6096f9c31f3f
diff --git a/dev-ruby/wisper/wisper-2.0.1.ebuild b/dev-ruby/wisper/wisper-2.0.1.ebuild
index 2c32dfb28df6..b587d5cec374 100644
--- a/dev-ruby/wisper/wisper-2.0.1.ebuild
+++ b/dev-ruby/wisper/wisper-2.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/krisleech/wisper"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/x25519/Manifest b/dev-ruby/x25519/Manifest
index 8872ffbb315f..14a85f1499d7 100644
--- a/dev-ruby/x25519/Manifest
+++ b/dev-ruby/x25519/Manifest
@@ -1,3 +1,3 @@
 DIST x25519-1.0.8.tar.gz 44313 BLAKE2B 844408f6bb77b55a2ca0222c46d4d09688838d7fc86517636a465da7fb225d9de2f14fda3d38d593f0feddb5e4aeab28ec900766a190759139bf05f6e0e6bd56 SHA512 42a9a2f1c470ea82c070435e4d85317c69fbd6e994f765c46b3aa4b544a5557559ff36194e37100bd8f581711156d185117535aeb3da9f5b6b5523e5a4b347b6
-EBUILD x25519-1.0.8.ebuild 1396 BLAKE2B c85adb8b841a43e33ae204f67bff3344f9e3e197d7660fb11eefa2d26f0bc528cb6a51ae3907842767563863331acfa54a50949a399ddf8b9bdeb46219e33cf6 SHA512 5d2021cea86a820dc4408c05f7ea18d8d3cd8e42d8551de073b3ca44c801ba1e177d9bda30af918da007982fe42f996c4f12974102d8d1a1565c355c0669acbd
+EBUILD x25519-1.0.8.ebuild 1396 BLAKE2B 36c57be28b57147fe2d73330bd7b502ebfa9f209ad769fe98dfa12a6d42850e60d9ab01e4720dbb93c2f10a8cac7e25fb0f60c6cb4d63aacb9f2a6b3678fc6bd SHA512 1206ce1efeae57bcae7d2d499597a667104904278eddb76baa6d65e337df497b7fbd00ca766dd4b22aa86e235d69399f055e354d4f4443d6ecdf92434a74242b
 MISC metadata.xml 343 BLAKE2B 631f98e650ab9501279546967a0b1370ffef39804a457f6c1a212c3c266390b14e29f36b7ccf83821511eb5b37d14e0fbc59f6111603ce12915898aa93b47668 SHA512 d488f02aff4b6c4e860e65782a7bafe647b84288076a4ca4bd8c8ec537151fd26b4baa7fa34e4ac34c46199d4a3416658c0c638996a15967ccd41cd6dce27bf5
diff --git a/dev-ruby/x25519/x25519-1.0.8.ebuild b/dev-ruby/x25519/x25519-1.0.8.ebuild
index 3220c03c3432..fb8db353268f 100644
--- a/dev-ruby/x25519/x25519-1.0.8.ebuild
+++ b/dev-ruby/x25519/x25519-1.0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
 
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index e0625fc39ec1..6d9f934d7dac 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 206d844db51b..c9c37dae8dd3 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -1,13 +1,10 @@
 AUX gauche-0.9.10-srfi-134.patch 2281 BLAKE2B 5854b345162f319092090578afa8899d129e865ed75e5902d3518cd736e7268453dc4f4043fbdac5d90073026e8fcd28e2a42b911021da0dc44047dfd7cd9e18 SHA512 797267d2276b90736c0824566b1c9218399d0e68e972fa53830dfb85ad6946b2a6ad2a19aaabbba9aa63c1c36b5628856318a4d3b328b1cbed0ca3ac5f73c8b5
-AUX gauche-0.9.9-xz-info.patch 1322 BLAKE2B f73447a306ec54ff372520c603adf2da46e1b71225a27d09af5c3ae8770431c5fef4d974cbf6e08fa1159807719c798680b18c7f624ec83b33d5ddf8688946f0 SHA512 22b6a37ea23bcba7e4ea4d09f26b069225cc36ef32dc0fbc865cfa4052765d0363811f693d6cc5cc8f3fdf355b93eec7c58934d18b2cb8079cadfd3b0cd4ffa4
 AUX gauche-ext-ldflags.patch 384 BLAKE2B 57b7463086c0763413b8fda3d7688c6a61bd4456b3209a80b6eabed088e0c71eb5ae4c53b18fb0e6b7468ac03fe33f7884f265ab1ea998e8457b0ef126e6e841 SHA512 df42c5f25adc5a67ad049ab78aeaa4f565d18818dd6dfff5a64a78e9e3101595a4279d72e8f946e4f7da7be30f9f11c089c7f4a65d2eb2135980414c3d6e9cbb
 AUX gauche-gauche.m4.patch 964 BLAKE2B f02f2a1fad5d2ce923d1f9a8af4506908afea5b24c65d30ac2dbc6402c826f1ee374bfbb0ac7e9896a980fa352620f7ef8d2d79fe1b0ccb4915e3ceb86dfd90d SHA512 81bd71285f9f7f7f6b310347905fa2b0c7b708a0bb8bfa33414b14591d5849f0b42d9a6f01f22abb307417778181c292d8ff7e42be259b7d4de09356ea1692ab
 AUX gauche-info.patch 3580 BLAKE2B e2563129f965c14c051f08ec5a2556b925cb0611f53a05b86a255f394be296db242ea77e7928947d5ecc56e34e22eebf45175f3bae51303d0dd8d341504cabef SHA512 393505178660b046971ba7090a57cce879561e2bd8d2005c771173e65d522bc8b9c7677a19cb49b3b5b94ba265dc0da6137d5999d743d6ae781eaa185ea86e89
 AUX gauche-rfc.tls.patch 277 BLAKE2B 91e745207e64ba3c83a1252be6fa63c486a3ebf148149b5772720a862299fa9bbf122a75ed8a537a29b78d75cf785ccc72de3194969931c62b52a7c1b7007208 SHA512 6aceaf321a1593765c91a83b14e057b2ee514e768299fa43c71bbe5f04b8b60a0537fd68cb8b4b5a61b091d5c4f50dc227bde2637d6be33956089dc0e40ab968
 AUX gauche-xz-info.patch 1248 BLAKE2B 8c87339d3739da774da858f43345bb6063fe2fafdfda3e791a67aee7773be4c1312c11aa37f1532203a7e1d4805cf3fa0ec80ce28f52d05c43df8536efa199a2 SHA512 7cbbfc17ef28aaa29dffe03d2d8afa01cc92897f5c08c9ba1ddd7926d45207100a44ccb8efd745f2f98c8d9a83ca0ca20a6c611329c3a80dea5692002467c52b
 DIST Gauche-0.9.10.tgz 7701616 BLAKE2B ecffc8cbffdbbea53a52468bcc190c57eede51ade78ccafd323299458f333794cc613bbfa11090d261993908020ccf8d42c2142da5996e1e55188f28e03cc28b SHA512 f014ec00903fc91b90da8dbdaace04a64d12695c631e923d5cdca3574aaf6701374f5adbed20c395881b047bb5a448352614d4ce7f16b6e38f69382bf8e66ed0
-DIST Gauche-0.9.9.tgz 7244347 BLAKE2B 843fe0c7341c7020ad9130edfc41f02eeda0bc2e1f8983f83faf443f69073e132a9a2f37e6a6260334ab9aacc3e976a2df68d4c43f17f6ea07531c14e783efec SHA512 ff6fdc80bd14c4a5dc57b5a6ac9558078a557cd30c2efe98146c3817a7830ef2b3f5bb6184ce6b8ac9b1b9cb636f041643fa761b2f99e6dd0602e13e7928e210
 DIST gauche-0.9.10-sys-ctermid.patch.xz 10328 BLAKE2B f4cde73528624d07a8c7d820b8cf10a0b96e5f13394df3113b8d40ddb43996afc5e519a34fa1de72529e42e1fb6e1feec60213bbf5df97e7725f4c0cd2c621e3 SHA512 7d16a9e6097d458bcad9db68fbedd2f694afade681bf9b876e0a2f6c232be85fb58e3d7dca6b208117b300e2bf529027b736b381d8eca29c688628725c0466ed
-EBUILD gauche-0.9.10-r1.ebuild 1459 BLAKE2B 33c286bf6e4570a0b6697121bf139b43e569419d7c3d34881a848ee2c4c97edf6344821686df602090b3b20f65aeb28a38e5c9c6c171f6f4c718aee48cdb914f SHA512 21df43f60357dd9cefdc94f2d229496445e88d5f2c0f27a9f6919b106dd83e41e8d01529e94b58c2ba49f2b5f308d92cfb0b7f0d0a7465b7c4bf47747f2a3619
-EBUILD gauche-0.9.9-r1.ebuild 1316 BLAKE2B de13080f72dcd6b2b177febd87de0962325f40e8742a4ad772bebe7e60a5e7211740b4ea8d67946881adb5c548fd7632b67243693c61be683186d3ad16563236 SHA512 f5f5cf91fb8a55d3b16d70cd916c242deac31958f4c9e11ceba160a2939c1b93e39211167a9b1b3bf3a739e50e84a86f76ab681d757b69bbb9d7297aca3d66a5
+EBUILD gauche-0.9.10-r1.ebuild 1457 BLAKE2B d1e08267cb94f5b45041af19a97ef6132d4aed73e2c07ad90d8a42817bef0aca0ebcc3aabcdce978efa2c0d86bb11bf02cfadb7c9bc240ba602307d56f9acdff SHA512 ddbea54c152b3d02473fb804000cc01f8e569e158a662555b89e8b4da6e82049dba8e7a532153e15a88dc668af4ea64004322df6fbf1a87cc23bc2d40790cb10
 MISC metadata.xml 910 BLAKE2B e521ff4a434554441bb94b2c2246a02f5f1d976b77cde7fd8f8364108cb6c000c794f8413d636b8b13bbb89ec03b3042d3ccb0599a25c6894aef4e5282544c50 SHA512 6a3d126f858bd4b8eb9cf2475fb5d25f9f23c5caf62406941ef3646a5b36c7c8143f83d8dfabb6aa36abd2cce31e65a11a5451ec2f33964c3d51662e09bd37a0
diff --git a/dev-scheme/gauche/files/gauche-0.9.9-xz-info.patch b/dev-scheme/gauche/files/gauche-0.9.9-xz-info.patch
deleted file mode 100644
index e55f53606005..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9.9-xz-info.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/lib/gauche/interactive/info.scm
-+++ b/lib/gauche/interactive/info.scm
-@@ -137,7 +137,8 @@
-                             :paths paths
-                             :pred (^p (or (file-is-readable? p)
-                                           (file-is-readable? #"~|p|.gz")
--                                          (file-is-readable? #"~|p|.bz2"))))
-+                                          (file-is-readable? #"~|p|.bz2")
-+                                          (file-is-readable? #"~|p|.xz"))))
-         (errorf "couldn't find info file ~s in paths: ~s" *info-file* paths))
-     ))
- 
---- a/lib/text/info.scm
-+++ b/lib/text/info.scm
-@@ -64,6 +64,7 @@
- 
- ;; Find bzip2 location
- (define bzip2  (find-file-in-paths "bzip2"))
-+(define xz     (find-file-in-paths "xz"))
- 
- ;; Read an info file FILE, and returns a list of strings splitted by ^_ (#\u001f)
- ;; If FILE is not found, look for compressed one.
-@@ -78,6 +79,8 @@
-                      (close-input-port zp)))))]
-           [(and bzip2 (file-exists? #"~|file|.bz2"))
-            (with-input-from-process #"~bzip2 -c -d ~|file|.bz2" thunk)]
-+          [(and xz (file-exists? #"~|file|.xz"))
-+           (with-input-from-process #"~xz -c -d ~|file|.xz" thunk)]
-           [else (error "can't find info file" file)]))
-   (with-input-from-info
-    (lambda ()
diff --git a/dev-scheme/gauche/gauche-0.9.10-r1.ebuild b/dev-scheme/gauche/gauche-0.9.10-r1.ebuild
index 0b07cfba042a..06bbf39e6e53 100644
--- a/dev-scheme/gauche/gauche-0.9.10-r1.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.10-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)7"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 mbedtls test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-scheme/gauche/gauche-0.9.9-r1.ebuild b/dev-scheme/gauche/gauche-0.9.9-r1.ebuild
deleted file mode 100644
index f352c5b1acad..000000000000
--- a/dev-scheme/gauche/gauche-0.9.9-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-MY_P="${P^g}"
-
-DESCRIPTION="A Unix system friendly Scheme Interpreter"
-HOMEPAGE="http://practical-scheme.net/gauche/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)7"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 mbedtls test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/gdbm
-	virtual/libcrypt:=
-	mbedtls? ( net-libs/mbedtls:= )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/openssl:0
-	)"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-ext-ldflags.patch
-	"${FILESDIR}"/${PN}-gauche.m4.patch
-	"${FILESDIR}"/${PN}-info.patch
-	"${FILESDIR}"/${PN}-rfc.tls.patch
-	"${FILESDIR}"/${P}-xz-info.patch
-)
-DOCS=( AUTHORS ChangeLog HACKING.adoc README.adoc )
-
-src_prepare() {
-	default
-	use ipv6 && sed -i "s/ -4//" ext/tls/ssltest-mod.scm
-
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		--with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
-		--with-libatomic-ops=no \
-		--with-slib="${EPREFIX}"/usr/share/slib \
-		--with-tls=axtls$(usex mbedtls ',mbedtls' '')
-}
-
-src_test() {
-	emake -j1 -s check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-pkg install-doc
-	einstalldocs
-}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 69e4ebf5b2cb..34e4ea8420d2 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/tth/Manifest b/dev-tex/tth/Manifest
index d2d73804fd83..3bb6ed5a5bf4 100644
--- a/dev-tex/tth/Manifest
+++ b/dev-tex/tth/Manifest
@@ -1,3 +1,3 @@
 DIST tth4.08.tar.gz 1085293 BLAKE2B 260613fb9aa1e2acac5daf69db0ea5d3b6495dcb13f8eb3439a8774cf285fccf009dcdb77e33f265051bc9e9d35dda027212042678302b028efee7e4e1019e32 SHA512 c287cece1219155a5a23684b59f9c88459d7bbe7f029bfd6ca26562fa7a8f38699b4e5ce8a85a5f3544c081b5d1483f9533807b026dc85d130cf2e3eae507c05
-EBUILD tth-4.08.ebuild 666 BLAKE2B 2a9d67d5e06c6f327d6a2625ee5295b489b46826ee48fecbfcb94bbcbdb5922f490f1e27e5f38ee7db2236c82029e73e98fd0700f7b6a55cbec362d3340a87b9 SHA512 d72867fc1519fa7714c1c28a76d71f6fa8ff5c12ef92a68f3d57e92402d117f4a8fe57e4c2fb60ab2e2b5578067f83553138a714d222cf65e2c000a575d0b7ca
+EBUILD tth-4.08.ebuild 673 BLAKE2B b0e9ab66490c955217e771d39825b3225cbe3a7e826177a4a753dee598ad451e86c62121e8edb3ca1212b68c72832b6d495e4835c008920d483b7fa73688a2db SHA512 c031344b8f522c6c0da025ae3a56d70ce444dcdd535ffd10bd47fc0f49ee618d41101d5b097e8bb56de522a8fb47ed4350bab4582a38253804f7648b5559845d
 MISC metadata.xml 323 BLAKE2B 4a7798d20c979074662a346e4a3cee901452d4512cb8eb7f10fbe4d584ebb3bc572fca2f4ce459c9589284de3a9f9b7f36d7af910b0388c563891f18eb8b0e21 SHA512 998f6fbf80157132b153bc9180316ab8f46c793aabc44da08a31f95eaf65bd6d5836f4d2a743b7fb9cb8c0f257283a9f1baf8c4eb2b931e328cf876e6770ff45
diff --git a/dev-tex/tth/tth-4.08.ebuild b/dev-tex/tth/tth-4.08.ebuild
index 38d5c11ab229..f01424998597 100644
--- a/dev-tex/tth/tth-4.08.ebuild
+++ b/dev-tex/tth/tth-4.08.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,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
 
 DEPEND=""
 RDEPEND="
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b385cbfb5a46..6078f11d5afc 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 7b795e3fa908..16364d5eadf2 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,5 +1,5 @@
 DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
 DIST bear-3.0.16.tar.gz 122948 BLAKE2B bb720170488968e79d26b7022859a3a55f191661a65d8c5c1ce6120911919ffcd74a32035eebb419e4fe9a616f6dec1c66804445d9e8b243c7d26a87284f7776 SHA512 3906011aa01f42c7841046614e9f1972a39288749cbdeab4b55e517d48a05cb02a48be2b055b4ce65300ffa0a940609e713f55bd1a47ce4fc9a8cb2702487f07
 EBUILD bear-2.4.4.ebuild 1638 BLAKE2B 26435a94e41a295c629ca64a62f726a1ec58be5e85bcfbc312a2f6cd75d3232aae1e6854ad3415e99dfc369ce0e4a1ed0ff9e1b413332d24102015a2d1592d24 SHA512 c7d5cd603d219d8a1f764c728fdfb476b79b500b3db6c5513bb91397f88d4b5f46d4b16903834b93fff38f1fad243bca7c0c10d8893f2ce6238ac24847402e94
-EBUILD bear-3.0.16.ebuild 2095 BLAKE2B 515d7147414212b1edba08ef6a63c58f2e85de1908103b4308d6eaa13ca23c4e058025181f3a5ee0fa0c25712950f6130513d47bd073abbfd03343903eac8985 SHA512 480fa8af0fde9f09bb70a14021fad6d0766c9831590c2c46db6e6a1331f3d24dc0b3a6202051fe9975567047c86dddc2f89e3324113586c6c84042659d69b81e
+EBUILD bear-3.0.16-r2.ebuild 2095 BLAKE2B 515d7147414212b1edba08ef6a63c58f2e85de1908103b4308d6eaa13ca23c4e058025181f3a5ee0fa0c25712950f6130513d47bd073abbfd03343903eac8985 SHA512 480fa8af0fde9f09bb70a14021fad6d0766c9831590c2c46db6e6a1331f3d24dc0b3a6202051fe9975567047c86dddc2f89e3324113586c6c84042659d69b81e
 MISC metadata.xml 915 BLAKE2B 74d981eed24b95353d225061c11b11e3f7aedddd6fb3b79a96bc98f2d348d64ea4598337f5b946d94ac64278eaa9bce5a3ade0f9564d9e3f3b4031574569f20c SHA512 010b17d6da15e7b5a4079864c7c2f3f11c8531faddee1ab226c1d6c3f646079c52ef4495e4685bae6eeec8702801ddbd41c4bd2e1aaa82400c1265e2ecad1957
diff --git a/dev-util/bear/bear-3.0.16.ebuild b/dev-util/bear/bear-3.0.16-r2.ebuild
index ce27dec8b196..ce27dec8b196 100644
--- a/dev-util/bear/bear-3.0.16.ebuild
+++ b/dev-util/bear/bear-3.0.16-r2.ebuild
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 6b6cb546f637..142b0ed81ad1 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,4 +1,4 @@
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
-DIST patch-5.14.6.xz 262092 BLAKE2B 06c3b6c194d67e5a2c39c9b97799fb2f4e76071e058d62f29c1d2aa049980719bcc27deba445081b0e3d5fc6fc476ac722945214baf60fed672c417bd837a31c SHA512 9270e911d2a71dc9c284f95217c10fc3b3666d7e6c54ce3bb1b1d4f3c081d7ea5449e7ac645c60c18986531b4675291ba3808367f5630eb15adaee3de4e63d46
-EBUILD bpftool-5.14.6.ebuild 2826 BLAKE2B 75caba7a4cb73dba40a6e3c08751327e97f32f618d7240b694434371ba63722626565fcf9fe6ffe0961929e1f6736bf80cda3c196c3aa6160404521ea20628fa SHA512 5c02dcd3f55e406955fbbdb4199ff89572665a1c09f443217e415e0a0b19df8865d7a75342ce3305e93254066f4f49670ad34b879aacd1d68a36fcd0db696829
+DIST patch-5.14.11.xz 447048 BLAKE2B 4d399284a42b14686f49596820fb86128d22fd585f0242b4787f550b7f43eb34a5eaaefa9258109f8e04b46c6946ab2ac23220a287f2bbd10aca9cf5ae2e8d4f SHA512 c85a9bb1a8e1eb5ab3e182fcbdc964f216111c89f2bdfa1855ff7522aac63ccad5d30a48ca3ce833643ff7fb3709992567270ee614988a6150803af43faccbfe
+EBUILD bpftool-5.14.11.ebuild 2826 BLAKE2B 75caba7a4cb73dba40a6e3c08751327e97f32f618d7240b694434371ba63722626565fcf9fe6ffe0961929e1f6736bf80cda3c196c3aa6160404521ea20628fa SHA512 5c02dcd3f55e406955fbbdb4199ff89572665a1c09f443217e415e0a0b19df8865d7a75342ce3305e93254066f4f49670ad34b879aacd1d68a36fcd0db696829
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-5.14.6.ebuild b/dev-util/bpftool/bpftool-5.14.11.ebuild
index e3fa3487cfe7..e3fa3487cfe7 100644
--- a/dev-util/bpftool/bpftool-5.14.6.ebuild
+++ b/dev-util/bpftool/bpftool-5.14.11.ebuild
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index c14336755be8..8fe6c253a91a 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -2,6 +2,6 @@ AUX clazy-1.9-llvm12.patch 3056 BLAKE2B 7c090b17a3a598075fdcaec04df4efc0fb6c2a8d
 AUX clazy-1.9-llvm13.patch 1098 BLAKE2B 6933e7f9e159e4e4d10bcacf67a7f384ca1782d84606e2cde85e4f2bc5007f25e1fef96129de366c9be013ef2f602f7e34a4388576b404c0a913625de99992bf SHA512 a8d4c59236b9329ad1a0db4fc3a21eebc16faa19888c21f6fdf53a3d242dfc955f0902ba95e38f1f0666524d926611b353925e4519e60cca7d6e5d69a3f107f4
 DIST clazy-1.10.tar.xz 398920 BLAKE2B 1cdc160de21363c7dc9c93ea7e780412a4971b18e97c7ec6e06f1c7450c56e0fbbdb7592d6b92ae53e4c161f6d9abca205984f83b68646f04ea11d63e3c45fa6 SHA512 59dd8c6903bcc239dfc356804cab265597a771de3858a6add4877149e0e7875b3c9ddae9aeec889c9102fb9ec6b0125bb8a786344e47872b01ba87425ba021eb
 DIST clazy-1.9.tar.xz 394856 BLAKE2B 641ca46a31475cf7bd03ba921e390cb2712362dc97b960a519e05c47049927f805d3ef6f1c756b96d3483e8f4b75e2dc41a2419a462ed2e45cbd08c88c07f933 SHA512 2e8bec44a027366263de23c50d14192e310fd38fa2b369afb21413da9cb78da9882b2153daf1784c4c9076cc62e2867b5211c75ff9a1eabcb583e405f20f5912
-EBUILD clazy-1.10.ebuild 984 BLAKE2B 6cde06f05ae2f8d1521d84f925e549c35ee622c941ccf65306dacedf94eea6e1ba0bbb540f5cf1ea07a31cff1bf533f48f58f0933fd112836146261fbbcdab2d SHA512 68d1cf5bb74852ea22466ca36697273bc4d17d574f2b7ca8b83ed1b76b6b10430b0cec046bc23fcf39dff2100e76f63e2514fdc28149a9de494db71882f6b2e3
+EBUILD clazy-1.10.ebuild 1145 BLAKE2B 5a3a15546ed60b967f430fdc877ba639c9cc5dfa3fc06cdf2146ebeb0dc8e0f38a3093c30063000d37ffe479fef5c2cc1035acf7c4f74909327722a2d5187634 SHA512 9579e8dbda318f019ee1216cc79659cc668cd022b77d7c53f305e6d108af24ce129ff3cca1bdf05d159f9c4067bcfddc0737fa05f82e94201af1387744ba5b83
 EBUILD clazy-1.9.ebuild 1048 BLAKE2B 19aab05c1a0ea51e60164834cd1d18c22537a35224258d5e37bee821b384efa90bbfe98b38362ebed62c667c8ec3e0947cd1ea5ebb2517f1d8ca4f621a135859 SHA512 5a1adc300ca1fd975e07b97b4fb5bce068c2b99afbbdb5701df327060bea1f2afbb77d00bb2ba5d9be795c84641ee235ab076c1a83f1075ad0ecddce260705dd
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/clazy/clazy-1.10.ebuild b/dev-util/clazy/clazy-1.10.ebuild
index 7f7ef80b9200..160c50c5c641 100644
--- a/dev-util/clazy/clazy-1.10.ebuild
+++ b/dev-util/clazy/clazy-1.10.ebuild
@@ -36,3 +36,9 @@ src_configure() {
 	export LLVM_ROOT="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
 	cmake_src_configure
 }
+
+src_test() {
+	# Run tests against built copy, not installed
+	# bug #811723
+	PATH="${BUILD_DIR}/bin:${PATH}" LD_LIBRARY_PATH="${BUILD_DIR}/lib" cmake_src_test
+}
diff --git a/dev-util/clippy/Manifest b/dev-util/clippy/Manifest
index 5a2d06fea695..5bc4188214a4 100644
--- a/dev-util/clippy/Manifest
+++ b/dev-util/clippy/Manifest
@@ -1,3 +1,3 @@
 DIST clippy-8.0.1.tar.gz 8206852 BLAKE2B ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a SHA512 d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f
-EBUILD clippy-8.0.1.ebuild 808 BLAKE2B be962344e52a02f9afa7f360d93b28527c4634f3ff0c3045fe04fd17dab721575b07a6b8b64c0843ddae6742a04ef8b50c35723e2d451b1b1fd367c48804fd78 SHA512 9f0e779fcf28a8516a760a5027584f522e9a1513a5ff492b4a16116158ba7fa786c707aa90bd763a5448f67fd1d1c54b60edf8ffd202b29ff1b707c985eb7e90
+EBUILD clippy-8.0.1.ebuild 806 BLAKE2B 3a12042685e907d89c81a1115036b37279915e728b73c48b171684fd07380730295b8606da97b0525fa9ce73215477dddfc531ba39061acf48dd7ab8cfc2ba66 SHA512 133b754ba54cc5b160fc8c53d989770cf23fe31b4e5e7c828305a69c8ce7207e5627df8a8b6865356ae2c3699da0137270a2a6a44fdecde826a44253c38d2f0e
 MISC metadata.xml 326 BLAKE2B b909c2525951476b2905e143974e734364023b9ac622f01ddae1e16427359ea47af02af11a3bb6ac5c51ef519c9c66995c8cba31d9ca41f1e48f33106a0678b3 SHA512 ee570ffd0054e2c132d637b41921bb25f3172fdfb0bcbc5d2214eaa3bb95c109ca58a5e6cd7ebd386de497ef3e20cf3696243dcc5e82fc4cfae25bba51be4db9
diff --git a/dev-util/clippy/clippy-8.0.1.ebuild b/dev-util/clippy/clippy-8.0.1.ebuild
index 9fefa0ae3fc6..9497111deab2 100644
--- a/dev-util/clippy/clippy-8.0.1.ebuild
+++ b/dev-util/clippy/clippy-8.0.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # standalone clippy does not have any tests
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 17f683d06ee0..c27e66d1e542 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -3,16 +3,15 @@ AUX cmake-2.8.10.2-FindPythonLibs.patch 990 BLAKE2B af80335e802c198287315da4ebce
 AUX cmake-3.14.0_rc3-prefix-dirs.patch 4791 BLAKE2B bd5dece28a5900c8dbd994701712b65d2c366c61cb01dfadc2a6f941c4cee9bdf9d390291fe08f76bea68e0e0078b116c73682516fa62d6064e10c4a063b4bf5 SHA512 b53055ab0a72051dbc11ab91944e484a493e421a724a6ee60433484b9734280e1d1ab51114afef14ecdae67a78a9734a277a18d8d5e1a272e8a558c849a36809
 AUX cmake-3.16.0_rc4-darwin-bundle.patch 1388 BLAKE2B bcb6c3d8e4f64ccc3e6ebf9ae906960075b3fb1f432925e07a711ac27321023033013e7a2e1d0ffc60dd464b775fa2537a49c73089861a2ce8f6316ddaa3d03e SHA512 7e0f598fe1cbb2c44b345091c102fb42ebff510ea7eeccdbe1fe0d65251127d823c37f2d37b073305679ed86fd48923566f1d62a7c9fb55df475d48891b4b861
 AUX cmake-3.17.0_rc1-FindBLAS.patch 1087 BLAKE2B 5e549db39f0e8c5f821a70121551ccea132e11dd8b468cfc7439e61763b5406860d952787d5957ea719dd48ec32ac8313d3209bed2a3423f5e40b8a2fcf04ae4 SHA512 1ea5e5e44c6a97cced30ef38424e24a3551d58c828d71d3b5994c265f099a3aa19174febfc2778eb688930432073e012557a79550d38b6b716e6b619d74a298c
-AUX cmake-3.17.0_rc1-FindLAPACK.patch 1973 BLAKE2B d4f10694b55fcea047f364f3dd383ba12fb5c3ce4369bd527c286e23260b551a915fa5257f0351bce00a4332c987c047c246812f2a713b0d1db312c7d03edee4 SHA512 20baafcda95ba219ae4e186a8878aa75e2e27f766ab3afaa14ce316cd2c2bc85debfc6be4ed1b6c17c3c1532b3a6868d0b4ee7cc47145cb788838f023b624303
 AUX cmake-3.18.0-filter_distcc_warning.patch 842 BLAKE2B 8c9b02a251d118f2ac31fe417e10750e3f4b911891723b0edacea83bf2b6220f121e02c299655cd49ae5a019af8a747218f81d6ece6cda41aeb57d24f9385277 SHA512 91b795225313270449d6da12baa818382da4f6937795303c5cc894f3f38f03cb88d8fb3b774fb0b8ab9cf5cd344ebeda3d83f48ef8474093a8a0268d8f342828
 AUX cmake-3.19.1-darwin-gcc.patch 433 BLAKE2B 72fb716af3d24d2723a06f0c2351d16af215cb64effa46bf404d8e00106ec80297b34b3d7f787b191e3fc08e1d35c515b6d2d527213285de91cb1f4b81272cb2 SHA512 a732f6f22e4eaab747cf80eaebb4fe5624aec893fc2bbb782f86d8377d3eda365568f091dd2505e18798fa8147f13adda0fa5cb0687c5c427a65bdc7cb957ff0
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a SHA512 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008
-DIST cmake-3.21.2.tar.gz 9630492 BLAKE2B 7c73cad02ee9dbadd8cbf60994856ccb6fd3721cbb7a58d66638169cf99426d8ad732de912ee5c736466d64c145a68a102db93cb5d4d0dbde001681edbf7a200 SHA512 75649404564aaa6175a8c66ab19a10318066dbb667806c287e3cb125ac4c16c1629c160e355bcc50864a38d5488b1f7d1bc77acc602f5f3edd5f68691ae5080d
 DIST cmake-3.21.3.tar.gz 9630442 BLAKE2B dccf4878745f6ddb87ea5fd1a0b6c728e32778afd15e3074d057234dc898e399133343bb10826f8882323bfc9d53f22c98b51ab6e39af29da58c54ed0b9d14c1 SHA512 0571b78443906c5ad51fb0fafbd32d565caf628cc150b1190802cb819e8497c108ea6b7ecaa03133df2dbbceb730696d24b4df38468c92088c769ce4076d9e9f
+DIST cmake-3.22.0-rc1.tar.gz 9769355 BLAKE2B 03398d2aca8c7f354d1b0d4f6447780cf8699ab388f342dea9266f0d2ecb0eeb38d5e51df9f6a9509d62db8b78b8774c76c82976cf1d263b1c572a00e96e698f SHA512 ed2a7c0832fd6fef5909745b6d540d1eee4b7f6681dca6e2b5cd22ea1a2be795fc1cb3b25792719211d7fe94871aa12253f4ce088985652496b3fdcbf0000e20
 EBUILD cmake-3.20.5.ebuild 7034 BLAKE2B ec62fb9ae6b4cf3b2e28142a571c217bfed6d9c1489d5d7ced9250690df058ca3ff5dda3b3a59800b770c7afea56b200b309a2bb8eb7763da2fdfc6a45794407 SHA512 1155e55439ff5f46d78e447a74a7f7a5600e8a4eb123f233861675462caeeffbdc1cfa38ea44d5ecb1a77f3db302017c750399f645d78e37adbe9649e8b21978
-EBUILD cmake-3.21.2.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
 EBUILD cmake-3.21.3.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
+EBUILD cmake-3.22.0_rc1.ebuild 7042 BLAKE2B 351fa7dcc56444e75a914a17cdecc1c1f910a00bcf809969449ecffadf1b2800a196f228e9307f6422c8ffed248541fa2b573cf4af6a658546ff949bb71a4b0c SHA512 e72af310d008431e2e7356d37996cc7afa4b6680bfb283a8a1a025abcfcaa818a53bc2406c5659c12d4d6cdf2d0ae45b3c107a874a07be6314e8f947a2cf9937
 MISC metadata.xml 338 BLAKE2B c3ace8da183f0d5e1a12d79d1b77a58fc2fb5700c045ebc899f4aad3854c418169fd4eea525cc91dffef54e4d7a3244d4c74f76285aa8975a469c49b46b79762 SHA512 fd24e8861001d9baf86816ffd22e919f92c3a7635690d7257fdcb20f4115921c304d6bc9fd34deda27b89b5e173b0a80c30ec985c066f2a343594d4dc022bcab
diff --git a/dev-util/cmake/cmake-3.21.2.ebuild b/dev-util/cmake/cmake-3.21.2.ebuild
deleted file mode 100644
index b1cc1455ac6c..000000000000
--- a/dev-util/cmake/cmake-3.21.2.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-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="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actually bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
-	#    TestUpload: requires network access
-	"${BUILD_DIR}"/bin/ctest \
-		-j "$(makeopts_jobs)" \
-		--test-load "$(makeopts_loadavg)" \
-		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|ConfigSources|CMakeOnly.AllFindModules|CPackComponentsDEB-components-depend2|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-		# disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.22.0_rc1.ebuild b/dev-util/cmake/cmake-3.22.0_rc1.ebuild
new file mode 100644
index 000000000000..a9b3de7323d6
--- /dev/null
+++ b/dev-util/cmake/cmake-3.22.0_rc1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+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="doc emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+	test? ( app-arch/libarchive[zstd] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+	# Next patch needs to be reworked
+	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actually bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
+	#    TestUpload: requires network access
+	"${BUILD_DIR}"/bin/ctest \
+		-j "$(makeopts_jobs)" \
+		--test-load "$(makeopts_loadavg)" \
+		${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|ConfigSources|CMakeOnly.AllFindModules|CPackComponentsDEB-components-depend2|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# disable Xcode hooks, bug #652134
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
+		# disable isysroot usage with GCC, we've properly instructed
+		# where things are via GCC configuration and ldwrapper
+		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
+		# don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/cmake/files/cmake-3.17.0_rc1-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.17.0_rc1-FindLAPACK.patch
deleted file mode 100644
index 29eefcbd5156..000000000000
--- a/dev-util/cmake/files/cmake-3.17.0_rc1-FindLAPACK.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 7459f27dd4bb9b60067ac49ee2c6be93d20c2c1e Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Thu, 13 Feb 2020 13:16:16 +0100
-Subject: [PATCH] Prefer pkgconfig in FindLAPACK
-
----
- Modules/FindLAPACK.cmake | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
-index c9629769f0..de852d562c 100644
---- a/Modules/FindLAPACK.cmake
-+++ b/Modules/FindLAPACK.cmake
-@@ -7,6 +7,10 @@ FindLAPACK
- 
- Find Linear Algebra PACKage (LAPACK) library
- 
-+Version modified for Gentoo Linux.
-+If a valid PkgConfig configuration is found, this overrides and cancels
-+all further checks.
-+
- This module finds an installed Fortran library that implements the
- LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
- 
-@@ -186,6 +190,22 @@ macro(CHECK_LAPACK_LIBRARIES LIBRARIES _prefix _name _flags _list _threadlibs _a
-   #message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}")
- endmacro()
- 
-+# first, try PkgConfig
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PC_LAPACK lapack)
-+if(PC_LAPACK_FOUND)
-+  foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
-+    find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
-+    if (NOT ${PC_LIB}_LIBRARY)
-+      message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
-+    endif (NOT ${PC_LIB}_LIBRARY)
-+    list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
-+  endforeach(PC_LIB)
-+  find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
-+  mark_as_advanced(LAPACK_LIBRARIES)
-+else(PC_LAPACK_FOUND)
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
-+
- set(LAPACK_LINKER_FLAGS)
- set(LAPACK_LIBRARIES)
- set(LAPACK95_LIBRARIES)
-@@ -494,3 +514,5 @@ endif()
- 
- cmake_pop_check_state()
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(PC_LAPACK_FOUND)
--- 
-2.25.0
-
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 98f07be4456d..7b08e2869c5c 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -4,7 +4,9 @@ AUX codeblocks-20.03-env.patch 1365 BLAKE2B 550b86319823c8453000d0a3a5e1c9a0845b
 AUX codeblocks-20.03_gcc11_compatibility.patch 797 BLAKE2B fae449efb5ea599e32fac23b67a11635a7c3ccab4d499676f922c95e25211093382b8cee0a7f78e90508613cd8b009350944df83188ac0b3bb106f86fe567298 SHA512 7d6c058212566e6a9bf329e585b29d261acdcb06061292ad900fe6c054b60ed1fb71168c092d62e15382dd582d0a3464ef44519ecbe708f5399aa91ef1d16d5c
 DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224 SHA512 78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
 DIST codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz 3712 BLAKE2B 4a5f75c18b365030a08196dcb2808d8f42d8adf9442552d372cb3923629d9d5b74c98c77557f0af46965bb875543cc6f221a5197fa2b4dba12409225c6cc61d9 SHA512 b216f2659b8ce2a22fd2f9af456af71328b40428510b75f0bb36cec4695d28bbd3133b7385614a84862c2ab5c560d314cc8153ddab09019410e179f5d337669b
+DIST codeblocks-20.03-codecompletion-symbolbrowser-update.tar.xz 52572 BLAKE2B 4752a84f5471f68f2c1044df6c6c3c25dd61f03e916bfcff1d091fe66aec8911cd02c7d824431dd307267d00af209cfd0b614528fe091a2d3c4bccbc688e83ef SHA512 acd79ffeed03023ac5e33fd685942f5593d0f7bc488b1d53e6c502618b980d565b1f2bc479da4de869ad2e839e263ddbff2a8847ef39b822aab69b87d5cd01a8
 DIST codeblocks-20.03-fortran-update-v1.7.tar.xz 12092 BLAKE2B df59ca9e00765f39f64d889ed22af61db8c2bb5f217dbda64d325327be8ef1ce318bc0b2538dd19ee911d84fccb6693f6e287f4d084e8243b34777f464ba5e61 SHA512 aec8062bbf0cd524b683ba9f2f6befec0bfb9f9b1f8ea61ffb679cf449f4ece20502f4fda101ab559151616fc7d7826e308a6468634502930f09ea3a8590c359
+DIST codeblocks-20.03-fortran-update-v1.8.tar.xz 43672 BLAKE2B c30f64a7211debd72ee0274067f7443c71ce25e348bfb1474a6dbd1cb86b330537ceb56e96eebdd02f88a93dc0526fb7bced678be799bc8d2437c00f5effd1e8 SHA512 0651d1abb08bfd9eb42f9eca0b9b4c702180b31fac2c08240d2447940c9b21601c3baadc3933ac4080e49c834aaacad716375aa4a40c06d336f000e0d59f962a
 DIST codeblocks-20.03-fortran.tar.xz 15828 BLAKE2B 3ad1be0ecdc61759edcbb12065a0d8065e5c4571bfdd99bcf6ad8cbda82f64def8ad7121770fe780c1837d06d58edb0209d2ab3b966ecd133c5d46f79c0cbb4e SHA512 06a9a87e560914ae49895843321c26581409e9213265d20476c9c4a8ad2dd9ff63cffdb416e7494bd74ce4a11578f11ef387dd851b1394a50baade8491caaa17
 DIST codeblocks-20.03.tar.xz 11799264 BLAKE2B cdaca38e26e0f1bf12e774cf737e0b6647f070d07f0ca5bec97926528a3511ecb8b3306fb6af473729384a5fe22d4870db8ca988895d619a1e7e2a1d9de2a41f SHA512 f97c1a02d31f0be4dc08b1f19b57bd0d3cba375ab5f33ab91b2a2df7817018f5b3e3063ed07199a3970644f1caa7c7e511db2034c73264f5f4963046d65b0097
 DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
@@ -12,5 +14,6 @@ EBUILD codeblocks-17.12-r303.ebuild 2375 BLAKE2B 5cfbe24e5b2514baa89cbac19771d7d
 EBUILD codeblocks-17.12-r304.ebuild 2294 BLAKE2B f6f79076b52eea3a1c1230e3fcee4220215b3c3b09f2c533e359d51cf52d6433851634a7e94a30d1b467904760bc085ef9bbb449e61a33b9a724814c6ea128ac SHA512 24f38636a6945a7fcdcecdaf5e25a72fa4a8d035d974ff90117ec39f866583ef493aaf359acee65b3b4f839fb121657cc73cfd9d3260dce8a8c2388aa832bf8c
 EBUILD codeblocks-20.03-r1.ebuild 1811 BLAKE2B 9a62643660fa3a3f365fb66cab17a0f9bed43aecf0472809bdc968c7d6950819020e1f21d1d4d377c1717c34c547814b941b19ab12f37138d17158ff4ad83b84 SHA512 adbf6c9798619695333751ce85e43affe2d74eb923728895ec58acdd268513d05db10a96718ed69af91ce1ab8318148cd717308776c307533fac02c3b740ddbf
 EBUILD codeblocks-20.03-r2.ebuild 1855 BLAKE2B d6c4104baa3bacde4ec517e18dc168d75c2a023b087e1496727501aa3bcecdb23f9e9168dff7a0f0662a32a58418454c5b836d24c80d6ae85713a557ca35d46c SHA512 da341a5f98a4d92016acb6ad996e894044926c2ec1eb77fd535b9463f823f99c3952798a0c8b4c59479efba4676fb51eeb364f76f02a31f54658355fa83eff6e
+EBUILD codeblocks-20.03-r3.ebuild 1819 BLAKE2B ac5eacadd466c160cc2fcbd82b8e95c1bbafd0f7b10477202506cc0e92b6e70fa4fa2028968ed6f05cc906c89c594d6c0bf98e49df6b9dd3a0e11c47c62ca609 SHA512 01e91fd11037868e1e60198f1979248099b02c16a58eb624dc09bf8ab4f3bf443a16aa9b4d96baf75b05964fb8b00ecdce5f6813de7b81a2b42067aae0cb0baf
 EBUILD codeblocks-9999.ebuild 1459 BLAKE2B 3add391f132cde04b2e936cd9b014d7ee091f0ce6105356ae1716d1a2a026bbd689c3959e5925c5add922e4d22878bd921fa44688b7aeae7e589911edee482a7 SHA512 0e00e64f4d3c7045b21015970e0c30551865d34439129ddaa3c41221d1414e45e68626d9a686b5e36fe6f46df2483bcb978aaaecb49a64d38da5853cb0c70ed5
-MISC metadata.xml 690 BLAKE2B a653c106cc780ce5da57bcb4c87754f7b71fbc33f85d98065e7b6757dcdcccdb9038ae60878a1f54ccfd4e6b9042e045e342b459ebae15578825836daf4d458f SHA512 8828c8d4590024f13784f9459034cdc3651cd57713246c2930a0e20355fcba4f3f833f77297761237dc9d3083746e701d0fc8b2b2eb832a484b52facdfa2a225
+MISC metadata.xml 845 BLAKE2B f7b882b01dd425c6eb56c164a95e7e635ba59591ec1839a9b925496e4c40bf03497ec4134eb38b47f9eb54b765773890896ba243b5936cf7bc3b71f7e7ce41d4 SHA512 ae0650c5218f8e18422926bb11daa9cc89804221b9958963da484464668e99f6049ef099fc6a63f3a0800fa15238ecf0607da0a495c42d5029a94ed15ef4c985
diff --git a/dev-util/codeblocks/codeblocks-20.03-r3.ebuild b/dev-util/codeblocks/codeblocks-20.03-r3.ebuild
new file mode 100644
index 000000000000..cfdd776089d2
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets xdg
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://codeblocks.org/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.8.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-codecompletion-symbolbrowser-update.tar.xz
+"
+
+# USE="fortran" enables FortranProject plugin (updated to v1.8 2021-05-29 [r230])
+# that is delivered with Code::Blocks 20.03 source code.
+# https://sourceforge.net/projects/fortranproject
+# https://cbfortran.sourceforge.io
+
+IUSE="contrib debug fortran pch"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="app-arch/zip
+	>=dev-libs/tinyxml-2.6.2-r3
+	>=dev-util/astyle-3.1-r2:0/3.1
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	contrib? (
+		app-admin/gamin
+		app-text/hunspell
+		dev-libs/boost:=
+	)"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-env.patch
+	"${WORKDIR}"/patches/
+	)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	# USE="contrib -fortran" setup:
+	use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject)
+	# USE="contrib fortran" setup:
+	use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+	# USE="-contrib fortran" setup:
+	use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject)
+
+	econf \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable pch) \
+		${CONF_WITH_LST}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
index 2c1b8b4c92fe..0e17c4313d1a 100644
--- a/dev-util/codeblocks/metadata.xml
+++ b/dev-util/codeblocks/metadata.xml
@@ -5,7 +5,11 @@
     <email>torokhov-s-a@yandex.ru</email>
     <name>Sergey Torokhov</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
     <email>wxwidgets@gentoo.org</email>
     <name>Gentoo wxWidgets Project</name>
   </maintainer>
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index ca88195b608a..03af4bf4a0d0 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -6,5 +6,5 @@ DIST cppcheck-2.2.tar.gz 3561406 BLAKE2B e436de4bec5412a18f013c8557a966c28c14edc
 DIST cppcheck-2.4.1.tar.gz 3761646 BLAKE2B 4c791088621f989e2529c92de38a73676fc3394e8cac72822596f7a75594283d0983693d693aa903a3ffb80bc0e1e20e71b55db5682d4d01c135ed77b2fc2e3c SHA512 8fb1ed5faa0071fc69405b7eb5b41e9f94b77d097158ea0d4f5e4da8a5087b9d1ab7bf37f8dc73d00096d3d2494aeb431af8029f0d4f1e2085f5b9b72bdc2d09
 EBUILD cppcheck-1.88.ebuild 2355 BLAKE2B 1d7c21225df4b3af7621842680af021da76f3b456d57f0ca28d00a6ef76b5be33da435839b1282fb33686de88897f2c4ac6f4a839d2e926fab04e45fa42c41f2 SHA512 7a6ab26533ae9f26abc95893460c6dd634bc9a12a871c745a0fc1ca8d2f4d1fa72d5924eda57a97d626a1015f3d38d755516c424d7b9e5cc613c9cc3e74e3070
 EBUILD cppcheck-2.2.ebuild 1701 BLAKE2B 989310dbe5d76b981327a4c6c0a581bd150c8dc30712e275b2bf1eb5869c8a97b42ce7989387a129e131f4d494880b88364f08db9dec8c5e6b20a0d8b60ec2b2 SHA512 c438b70fe8d172eeb1e9aceb300b0826dacc6fe1129d0d3328652e7a602201b479c0b57ce3fcfa3f60ad4d7ac12a9a892f62afe9f05b30b9027a28ac6f30f5af
-EBUILD cppcheck-2.4.1.ebuild 1767 BLAKE2B d00753321c8fdd0ca9be2ecbc97b0a1cf802395fd084b1c5eda17b27193f26e241d2398aa32988e809e4e8c8cb00d09bfbff2c157b7aa96b92fe85aceab4114d SHA512 d981a44eccdbb90891f7d7b409f46b2b2e586e196dc6d88aa8038e497691a7d6c9fa2bbc611e7dc25c6c6d4b26cc876df3f71dcb96977a2436677f6991198081
+EBUILD cppcheck-2.4.1.ebuild 1763 BLAKE2B bab2a339284ad16718284d9678c4a4e86a1571827705ed8c96edf03d442e6adefe7b9b011e82157ae32dc8581fa743a9e8fdb022c49b6ae01632fc7fbeaf253e SHA512 afee27069cf89942a8084301ea31b1399e05725172468ade746960b01689da87f8c1913eda367d63bb66e7b6ff4b28fb7735e4f234d31e930e949d91599c3c8c
 MISC metadata.xml 491 BLAKE2B 614ff2cfa86224be3c758dc12d61d6bd7b6609652eee3917a97fe0ee54accee769d0c5227458e38152083d1b8f555bda2f3d23cd918eda59bd28b7c24ae07dd3 SHA512 3f4519bcce00dd2d9a05c05959db1a961d44fb899bf083600d9ba4a3af24fd9e52da4a8a6127fc1597103fe10427eeb2dcee5e227307cb564fe3fd14b33f3a07
diff --git a/dev-util/cppcheck/cppcheck-2.4.1.ebuild b/dev-util/cppcheck/cppcheck-2.4.1.ebuild
index 8ee6ca9778e5..9130c7d88401 100644
--- a/dev-util/cppcheck/cppcheck-2.4.1.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 sparc x86"
 IUSE="htmlreport pcre qt5 +z3"
 
 RDEPEND="
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index cfa25175b050..36c362d69da7 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,6 +1,8 @@
 DIST ctags-20190331.tar.gz 1537104 BLAKE2B 354ddf48cdc9421e70d9d37ec7251e51f7f78564dc4f6236d12e2e18519369c39c22585830fd301b7eff4898d550b824776541198b8c4a31425711776b14fde4 SHA512 414faef7628ecaa66fcd5f172781a32194e1d58637dded1f7e55c138239ad777796bb1510bd447af3ad8243b7178e6f4859139305b0c0efe298182408f34524c
-DIST p5.9.20210321.0.tar.gz 2096441 BLAKE2B 44fcbde5953ac192f8ccb43cbb598b63a99d421feda8fe019bd2ac915fe235a769250bbb2f0f00eb353ce883a7f3556af4dbfc9871fe7fd5fa8edce5f8441af8 SHA512 62d9744bac089106cfa2a477f113ca7924831f768ee0de01577cd11d14f1cd926a246d08a53e7537d1d39c9e8aa06a58b7a10f79d8532326bf0e4af74d70c4ae
+DIST ctags-20210321.0.tar.gz 2096441 BLAKE2B 44fcbde5953ac192f8ccb43cbb598b63a99d421feda8fe019bd2ac915fe235a769250bbb2f0f00eb353ce883a7f3556af4dbfc9871fe7fd5fa8edce5f8441af8 SHA512 62d9744bac089106cfa2a477f113ca7924831f768ee0de01577cd11d14f1cd926a246d08a53e7537d1d39c9e8aa06a58b7a10f79d8532326bf0e4af74d70c4ae
+DIST ctags-20211017.0.tar.gz 2542128 BLAKE2B cade7149cb2fd0645f9b7ecd37c8b9acdeae7037fde2bb74aa94d67f04963327429b83dcf5cd658f082bd8ce4c407f69f4924da5f768bec029b4075997bbd882 SHA512 85bfb4d40c1d9045b4ba4dc280ee7108ee2fd4572c92794d5bdc854f3511dad1ecf282428e61161773f7bfaca725d774593a0e83fc767a1bb2e12b229a19bec0
 EBUILD ctags-20190331-r1.ebuild 1797 BLAKE2B c7ec6c31a22292ba12294a35749d31b8f36b9ca125a88e1f39db750d2a943c416ff2c7aa675f03d260b0d772c1d9970d5442baa49d390d761d1610af4a9a3d50 SHA512 b6aa285fa71b532584b992bd420b82e3b0bc707691964848b905bcdfba8688544cf8177644ba38a0317bd629d49f80b5bead255b74518c9790f48bac706a6373
-EBUILD ctags-20210321.0-r1.ebuild 1834 BLAKE2B 3e482f989b51faf1d6112d2f89e766531917fa570b9542a9e8185944c98c219dddc48438b80a521936340fa59c9049d13c0a66d142f236a92d0d3b945f5c9ddb SHA512 e7be1cd84e146ac88c02e0d178eab24ae40f96ff8a7464ff25b6ac27ee261a83edfe5f40ab383415612c0aeb028c7757035edd1c189f0a172f6943a22ce09558
-EBUILD ctags-99999999.ebuild 1827 BLAKE2B 80f19b0ca0d3efcb63255bc0d297c4457adf4ca62a722162c4e5c22989a0ee7332070230672172888c25b85b1bf7118c7b22e56ca476a3f436d4d5922ae6253b SHA512 c08c5bdd0908bb9f1d6ebf7ebfaaff05c502307c66e8658d69088378b2f9e26468a27f462b9747f56963d82d6d3b0895144a84222c20fd43bf059751a1b6afba
+EBUILD ctags-20210321.0-r1.ebuild 1849 BLAKE2B adb99905d2287b779048f3401c62c72f9fffe8fd8a251c4d670c41ab4a184c92c181b0d9d526297c2c4a7083e87658c7b8a8bd267368272e3b389391ecd323d1 SHA512 b709302f59eff89fedf04affb0aa08a1fc56e0d681abd675ed492ef09a0b652f0ae3e7b12745af8e05629bf1f608674ccc39033541f930ce317c373aec72949c
+EBUILD ctags-20211017.0.ebuild 1982 BLAKE2B ebd632cb7092de1a21ad6b55537ddc81d4afd2b1a8c5227ff395d8cbfe1af25ab340be5e6df4b6005fc8090e1d48a047c0c5b3d959132eb604f461a5093c63a7 SHA512 305f7f0d340c88ce7c632d7fcc81af22d95d3ea9c839e2ce7027af4df630ca2c34afecd10da0d06f40574e340472779114219c2b8c0a5c06f7d749c1cfa0a245
+EBUILD ctags-99999999.ebuild 1982 BLAKE2B ebd632cb7092de1a21ad6b55537ddc81d4afd2b1a8c5227ff395d8cbfe1af25ab340be5e6df4b6005fc8090e1d48a047c0c5b3d959132eb604f461a5093c63a7 SHA512 305f7f0d340c88ce7c632d7fcc81af22d95d3ea9c839e2ce7027af4df630ca2c34afecd10da0d06f40574e340472779114219c2b8c0a5c06f7d749c1cfa0a245
 MISC metadata.xml 584 BLAKE2B 13de5ebe8bea2b413552eb85af3d3a42c453ad8d7f808b21a5b016bbd3e7890ceabdb924e817c4d841ed2862b7f9dcecad03f7f22c7b738db1c4f88d784fc80d SHA512 c4930de987c3d846c4761d66a191ae2b2800b32234f63ebafee140920faa408cec1b22032c72da01ade807a4187f482bedad3e22058fdffc0af56aabd1deea8f
diff --git a/dev-util/ctags/ctags-20210321.0-r1.ebuild b/dev-util/ctags/ctags-20210321.0-r1.ebuild
index 471c4110d1bf..c63787072afc 100644
--- a/dev-util/ctags/ctags-20210321.0-r1.ebuild
+++ b/dev-util/ctags/ctags-20210321.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *99999999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
 else
-	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz"
+	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-p5.9.${PV}"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
diff --git a/dev-util/ctags/ctags-20211017.0.ebuild b/dev-util/ctags/ctags-20211017.0.ebuild
new file mode 100644
index 000000000000..3b3948787072
--- /dev/null
+++ b/dev-util/ctags/ctags-20211017.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
+HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
+if [[ ${PV} == *99999999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
+else
+	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-p5.9.${PV}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="json xml yaml"
+
+DEPEND="
+	json? ( dev-libs/jansson:= )
+	xml? ( dev-libs/libxml2:2 )
+	yaml? ( dev-libs/libyaml )
+"
+RDEPEND="
+	${DEPEND}
+	app-eselect/eselect-ctags
+"
+BDEPEND="
+	dev-python/docutils
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Ignore check-genfile test (calls git which errors out)
+	sed -i 's/man-test check-genfile/man-test/' makefiles/testing.mak || die
+
+	default
+
+	#./misc/dist-test-cases > makefiles/test-cases.mak || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable json) \
+		$(use_enable xml) \
+		$(use_enable yaml) \
+		--disable-etags \
+		--enable-tmpdir="${EPREFIX}"/tmp
+}
+
+src_install() {
+	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
+
+	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
+	# rename ctags to exuberant-ctags (Mandrake does this also).
+	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
+	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
+}
+
+pkg_postinst() {
+	eselect ctags update
+
+	if [[ -z "$REPLACING_VERSIONS" ]]; then
+		elog "You can set the version to be started by /usr/bin/ctags through"
+		elog "the ctags eselect module. \"man ctags.eselect\" for details."
+	fi
+}
+
+pkg_postrm() {
+	eselect ctags update
+}
diff --git a/dev-util/ctags/ctags-99999999.ebuild b/dev-util/ctags/ctags-99999999.ebuild
index 1d3b06d128c0..3b3948787072 100644
--- a/dev-util/ctags/ctags-99999999.ebuild
+++ b/dev-util/ctags/ctags-99999999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -11,9 +11,9 @@ if [[ ${PV} == *99999999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
 else
-	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz"
+	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-p5.9.${PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2+"
@@ -35,6 +35,9 @@ BDEPEND="
 "
 
 src_prepare() {
+	# Ignore check-genfile test (calls git which errors out)
+	sed -i 's/man-test check-genfile/man-test/' makefiles/testing.mak || die
+
 	default
 
 	#./misc/dist-test-cases > makefiles/test-cases.mak || die
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index ad6cd31cb6a2..af0b13c486a4 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,9 +1,11 @@
 DIST cucumber-core-10.0.0.tar.gz 47173 BLAKE2B 3ce81c4ae9de1dafe444fcae4b2609b786e34d8efdf16e02c05ceaf7f077c13289bea23f6fc22616cb8ce16598ffd3f07cbc51751b3151455d65ecf396ac0e92 SHA512 7ed559ae5e9071f1697da74aa067fcbc42858d51c9d470280c0695df0ab0836b069be2e1ae8948ff01a674ca45be7eb2ac63c37d666d40c7ac333a0a5315c65a
 DIST cucumber-core-10.0.1.tar.gz 47196 BLAKE2B d048c36e3d28871e603b2092062af1e9a754ce642c365c5f71696f450c2f8fbccd27e3d809980c96929f75a2afb11c216a3b1ce40a0b7f81dfff7495d46f531e SHA512 c7ff950f7fd81824822de0ec485c1890808126c36be4c25ed15048c35491e8891851cf7438ef806bb1456b68281853ac3a0b1f7a598414f794793db83530406b
+DIST cucumber-core-10.1.0.tar.gz 202704 BLAKE2B 22aebd78e27ee1f8062128007c42ae6bbcfcf63dfb3dc94618db6bf1803511a08305289105e33e78ebd48e881bd7e93721bf8b654e28c7309b381ae4aaba659b SHA512 6f3973ca69f13dd85b7ecca54064562b80812d5517ca0c64cacf18e0ca0c2ef47ca6f0182d3aacdb385bb16ffc9d98f065e30d9f1bc556554535c0d027dbc39b
 DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d57559b790d77a191d7147a987e27893ce89076716f82fa2048632e1b033ad607c748fe29f6b8fc600abd523290c4a9f50 SHA512 ba45e804d8454a6ef306eb90f32e6cdf3ee25fdd6613e9ba8308ecfce4044f27ee3dc012ad7f9ca481e94fe5e1d9deb9e0c46ca811a8e25bb27981a78c528ddb
 DIST cucumber-core-9.0.1.tar.gz 47009 BLAKE2B 2c78956643dfb08319732af24c08d5df811574891b582ba7ab51281c9a5299a3063c6c607af5cd9659aa0e160c0f3cab1d54b9cbd57d3dbf2768e97bb8f79e8e SHA512 0ac61797cda1d62d2b452d3d843be855f84b12fc9c435e8b5261700a981d94c9c88e36e309d8c2dc637ff195032768d363ffd9e7424c842d5b0ba98c3c678752
 EBUILD cucumber-core-10.0.0.ebuild 910 BLAKE2B 28832d630b2905fad9f86991b168d4f1908dcda685b8ec16c994eb318394aa7c91430ce5ce1e642327c608a193a51f142e26e59dcabaa85453b1c5501a6c5a10 SHA512 bdfcc8db9b12195dd030623d088501ce8cc6d878e6fd31d844ae8335d785901767cb87f6ae785dfa02ba373c7cb764240f8552d0a0044ccf373a5dced436c52b
 EBUILD cucumber-core-10.0.1.ebuild 936 BLAKE2B a5c0960ebc8c4dc7ba5145219723f9ab582c65a68389a6e2873264756bd046972339e5cc79af21df6555b849eaee9b84bb234385a93b46267d79c209fdfbedc7 SHA512 afd48389461d1733a621180f865fa60c1bb51ec876bbc9de23edfb2fa9d1347f9f9535587ac19a8defeaf19bac65993497fe85da0f9bce9824687aed19e50f8f
+EBUILD cucumber-core-10.1.0.ebuild 936 BLAKE2B 0ed4ca97116cbe8b69bd17b5ace32ad2b8dc7017fd9fc39e8428c8d920ebb8147b1f2360bad2e5131f8b08ff84dab53349339538fda4586863eeadf85815b821 SHA512 1be3e76cc1cbe57bbce4de3e1cf9c4cad07dfc21d6a18fc0d6fe6993af5a87a1fa7b1c67721bf5b9fcda3160639c02938f951ebad12d844b27ac3630c48205e4
 EBUILD cucumber-core-3.2.1.ebuild 1036 BLAKE2B 5974f4b5f2e4b10fc89b934e92917e95f500c07334d2d25ff06000f7cb626ff5412446765dee220def380ba8c17beede6778feff8471d80a70af0ded394a5110 SHA512 0063cd60aff9789447e75df8af18e6c1f736505aa124489617811f57a1dbd96387ade525d3273da06987e5596e5ca917e75dc5ed5e28d3a3953da02ac077475f
-EBUILD cucumber-core-9.0.1.ebuild 1106 BLAKE2B 4d96152c96654bb09378888d4737b4b8c9fff618bc4f67a4af0fcd5f0ce124f5bf782cd577693fa3e8b79e0c1876b80dbd63376c8900543a9700ad270023b3c1 SHA512 e020b4060c6c685039fd6be41399cb99450b39b92527cfa978d112045dc764b4653840a75516ba2dd4cc895bfd79ec41df3ee4044824cd07e7daf67216763dc5
+EBUILD cucumber-core-9.0.1.ebuild 1129 BLAKE2B 114cc3bc18361939116a50831d286116b4f0d1705013a9f758d7bf8b6c7199a5af214d596ea06a72074a8a58600aef42e6a5a48157632be3ab6be26cf37bb7c5 SHA512 e855bc10d119461a353f33173786d05fabb9d5c6838e2fa7293d8ff93781abce53ca9eb5e820ace821d8e112b1e8e880f80814faf6b5bd82e7e5b5feccacc3ff
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-core/cucumber-core-10.1.0.ebuild b/dev-util/cucumber-core/cucumber-core-10.1.0.ebuild
new file mode 100644
index 000000000000..0eeade95577d
--- /dev/null
+++ b/dev-util/cucumber-core/cucumber-core-10.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://cucumber.io/"
+SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-core-${PV}"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/unindent-1.0
+	)"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-gherkin-22.0.0:22
+	>=dev-util/cucumber-messages-17.1.1:17
+	>=dev-util/cucumber-tag-expressions-4.0.2:4
+"
+
+all_ruby_prepare() {
+	# Avoid dependency on kramdown to keep dependency list manageable for all arches.
+	rm -f spec/readme_spec.rb || die
+}
diff --git a/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild b/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild
index 61b69c5ce0f3..75c2a2ec62ef 100644
--- a/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz ->
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-create-meta/Manifest b/dev-util/cucumber-create-meta/Manifest
index c51e8f7b8a94..9a3095fa4553 100644
--- a/dev-util/cucumber-create-meta/Manifest
+++ b/dev-util/cucumber-create-meta/Manifest
@@ -1,5 +1,7 @@
 DIST cucumber-create-meta-4.0.0.gem 8192 BLAKE2B 4809b0f9ec7f922af374ac46bd9d0cb9797f48738596f00c08bf3d861a19141160032421715d4d141b1b1854e77f3798d09308f626188c3ef6b30a491fadcd29 SHA512 0103b8277741d4eb2e590e1d7f9231187482d32f9a2c19c837baab759b3c48c11a39ac7af686d56fefb7b79120110e930c9af25fb895294529a3b5b0612a5b63
 DIST cucumber-create-meta-6.0.1.gem 8704 BLAKE2B 6e438871ffea3723d5466d24a0ccf1d672b05222de5063a6d9587b951357e631a938eac3b93dfc5f01155ace5dafafbf9d4a08f828b972c7f8b3e35f74ece26e SHA512 6e61bf4163a3575a2988c5a8fc351ad360d3b55e5bd615ee915f0f66064675514777868311d53f40d1fbfcdf7ffae2795c0d84c4f90c710f7d27a56009463b1c
-EBUILD cucumber-create-meta-4.0.0.ebuild 560 BLAKE2B b7259ad1746e8a479c54ac45e5c8f27f8b73a73f05c92263ca1be0c080515dfdd738368dc2902e10f64c5a2a69f6b4bfa84afcd632dc0d291403e78029520bd7 SHA512 acc849845cdb8cb65a444d303019b873871bf422335e640fa2dd40226a0361196da85e7d074459910cd7404b5b9d86007872712468f82150bb0418a70af37071
+DIST cucumber-create-meta-6.0.2.gem 8704 BLAKE2B c7c2d64937da00c6d9cd7161eba3d86089900d348fa8c3b3ee9c25912b09045d20e14f0e0d941a6dabb80cec1f69df0601993e90e575526737dd2159a75e73b2 SHA512 aaf61052475c855cf837b87d845e5b03686e1dba0fae3a83028ab89f434116d948d2d235c502310c14315446a9dadb1eb86dcf6441419e5983430192a9c6d448
+EBUILD cucumber-create-meta-4.0.0.ebuild 583 BLAKE2B 624ec8bcde8b3948a65e5c91b9d55f492780e21c2ff2d06568fdf2e1109791077aff4e521937f217415860e0809670ad1ddeba8d9ae25114af78b98d1b638f6f SHA512 f80efba51ed2a40fae2846759e3b714c150265b93c815d664b1abbdb86882970683b1de30ceb725c5364f00769ad92b6b71fbfb6c1aead107416552516c7ecfe
 EBUILD cucumber-create-meta-6.0.1.ebuild 574 BLAKE2B baec08d0cb383101fd0f3839541eb8d6fffb05a24cbc20ae1e1b99b78068cfc95b9aa1d3c81091b097849b59894b495c4c4fdfc8e610d81b7583392aee2e06e1 SHA512 5a2e8a205a6aaa7d0d189ccab34cce93fcfba21888c5330d46b35c9123707fdd7e88b1432624ae387fbe76f179c4e1d53c0f48e1b0e0e00e8af050fd8da71560
+EBUILD cucumber-create-meta-6.0.2.ebuild 574 BLAKE2B 201b6692ff7ea28cc90b2d27cbeb7fb04b8f2230a293f8dd5f9233c0bc9ab77584a0c2a42033a1d4a91e32406384cb45b7ae596af0eafc8f6b7ea465c9528f6c SHA512 42e3ca41a4c15fa5e9230d106e012c6b97ef0dda76746f378fe0d347d3d60e8c254ae36d9f077ef1573d413e002a4e425efb100d2f5886f0ee7ca9f5008e1c18
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-create-meta/cucumber-create-meta-4.0.0.ebuild b/dev-util/cucumber-create-meta/cucumber-create-meta-4.0.0.ebuild
index cf6d76d58543..868f46efab3c 100644
--- a/dev-util/cucumber-create-meta/cucumber-create-meta-4.0.0.ebuild
+++ b/dev-util/cucumber-create-meta/cucumber-create-meta-4.0.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="HTML formatter for Cucumber"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-create-meta/cucumber-create-meta-6.0.2.ebuild b/dev-util/cucumber-create-meta/cucumber-create-meta-6.0.2.ebuild
new file mode 100644
index 000000000000..4080e9dc8bae
--- /dev/null
+++ b/dev-util/cucumber-create-meta/cucumber-create-meta-6.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTML formatter for Cucumber"
+HOMEPAGE="https://cucumber.io/"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-messages-17.1.1:17
+	>=dev-ruby/sys-uname-1.2.2:1
+"
+
+all_ruby_prepare() {
+	sed -i -e '1igem "cucumber-messages", "~>17.0"' spec/cucumber/create_meta_spec.rb || die
+}
diff --git a/dev-util/cucumber-cucumber-expressions/Manifest b/dev-util/cucumber-cucumber-expressions/Manifest
index 4626f86e830e..c0f3c3d7be89 100644
--- a/dev-util/cucumber-cucumber-expressions/Manifest
+++ b/dev-util/cucumber-cucumber-expressions/Manifest
@@ -1,9 +1,7 @@
 DIST cucumber-cucumber-expressions-10.3.0.gem 23552 BLAKE2B 6aab081690081e991a1c1dfdaac93e114165dc1b2a39a1825e6424304765c96836cec9dcb8635e9f97ef0c07a6b58cfe7fc587c651dc73bab0670f4230828640 SHA512 d560c62f625f6b284a94974cef5227a3623fead9c8c4f45ea9fed2300b37c405ba69161d6c6f5e159b2a36be5eeb05b122789cafcafec0dc84efbb366bd0166f
-DIST cucumber-cucumber-expressions-12.1.1.gem 32768 BLAKE2B 3b885771889349b84ab4a83537d720eef63c44297217a5b06ec78a9759d5617437ee7e1dc98d7dc692a3afbcfbbf1c315b76f2685577e861214b8ca943e6eb00 SHA512 6d931a589e4959d6e2647a3ae2a16fdc57e6de04d3e875277da55a60278548cb789d00216c2cb1374c56bcdc58d2e39228dc03f047d1a3a12774c8c03429c149
-DIST cucumber-cucumber-expressions-12.1.2.gem 32768 BLAKE2B 2af2d4f89239a55baebd55b562a1a6289066681bca13636f51893a7a968aa64c31778cb068a2b4c1fcae2a06095cfe2aafed10307f654f8af43270d492ae6336 SHA512 bd6391180a855f8a1ee0b609b071de8d181178f19b17e176857c24a505a6493a8f2017f3834ff4c22bd257e68a682d9f534b8870dbd293bf521fe073096e5d6f
 DIST cucumber-cucumber-expressions-12.1.3.gem 32768 BLAKE2B e873ba0ac58982c2a975935351bdbaa0e2d5fac5128386cbab347330d5ee920eb7c90d7670e9cd68a9294eb09828d7640e6fcdc69da6d819935f8faec9bce2e4 SHA512 57e8b322b7451967d177e291e9649cb7d9e2668dcdfc2453b9b2ed9c8f84f4c3c5b7905d246dbfc5382a8c515a3d031acfcec93e5ce568da23dd1d42e6d31fb1
+DIST cucumber-cucumber-expressions-14.0.0.gem 24064 BLAKE2B 45b811bb1c1fba8fb2b4819998b92b827ef80c7bb654d899b717f2438b5c6485447ce5e25e5d97e7d7d323fbc576d98334cefb825687b3791387df0cbc7669d6 SHA512 c5b3b840e04722b516a8cf57ce8f55f835f84efd73b133f9d6f842d1ae5612108e1100dd970d52cd349bf4c606ed1922b4730a0b2e4a2d31abdf2f6f51768a80
 EBUILD cucumber-cucumber-expressions-10.3.0.ebuild 435 BLAKE2B a3fb096924926c58f912bd465834ecf529e8808f1d33d8dc39028f76c3d634a01bce87c3c89bac7cf1252359f41c01e41c01fa10a38e90fd260ebd1157b35391 SHA512 ebb5527b73b4d7d90f0e1746d116f409480bb1cd2035e749086df000705b1c97f91d7d83c87fc04f3326357e22370bf99c063d0bf7271c91d24abd262c392e09
-EBUILD cucumber-cucumber-expressions-12.1.1.ebuild 442 BLAKE2B edf1cdeff711ed691bd45db3853b786b66a9ba4eafbf05285b0b65a810e2a6f5684452378e9dce71162decc56986210b58dee25b51f5ab84ce168afc47eb8ac5 SHA512 1a1e2b91e32c6cca007ffcac42513add43209d1106254d5e28001d2dd4020a4d36b6db775860badf9381e6e8f735860bf4c2fc88ed3512d2715fbf571668f553
-EBUILD cucumber-cucumber-expressions-12.1.2.ebuild 442 BLAKE2B 4f1d7e7900a38a912a4ae1d1e42236b9ee854a81fb55d0a4873cc24c1c8d6dca90882ebd017a1eb31995dd0abad261883891f16e793dca83d69c30e85b08b3f5 SHA512 9bcd00b42922069b814dbcfad4bf40d8c5003f38f9f0c2b884e60921ab3313f00ab8c891f737816e1e04c1e3acb65d5507ab67140e2fe17a5c8c61f6853050c2
 EBUILD cucumber-cucumber-expressions-12.1.3.ebuild 442 BLAKE2B 4f1d7e7900a38a912a4ae1d1e42236b9ee854a81fb55d0a4873cc24c1c8d6dca90882ebd017a1eb31995dd0abad261883891f16e793dca83d69c30e85b08b3f5 SHA512 9bcd00b42922069b814dbcfad4bf40d8c5003f38f9f0c2b884e60921ab3313f00ab8c891f737816e1e04c1e3acb65d5507ab67140e2fe17a5c8c61f6853050c2
+EBUILD cucumber-cucumber-expressions-14.0.0.ebuild 442 BLAKE2B 4f1d7e7900a38a912a4ae1d1e42236b9ee854a81fb55d0a4873cc24c1c8d6dca90882ebd017a1eb31995dd0abad261883891f16e793dca83d69c30e85b08b3f5 SHA512 9bcd00b42922069b814dbcfad4bf40d8c5003f38f9f0c2b884e60921ab3313f00ab8c891f737816e1e04c1e3acb65d5507ab67140e2fe17a5c8c61f6853050c2
 MISC metadata.xml 300 BLAKE2B a639d71f26516f07d45281d1036eed4e67653b41ad4644ebee63601681a288f8de93effc46f684df4d152eb2914abfaeb745045b075127d36c1bcc6bdc67d1c7 SHA512 27af0d39315115a4483da0c3d2d84ee4c7fba5891ef61ba06c776b86bf068c4a60e3766fc8c1c522402480543919434910decee43b3847bbdcce556cd91f8473
diff --git a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-12.1.1.ebuild b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-12.1.1.ebuild
deleted file mode 100644
index a877dd490f7c..000000000000
--- a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-12.1.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="MIT"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-12.1.2.ebuild b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-14.0.0.ebuild
index bbc09a06178f..bbc09a06178f 100644
--- a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-12.1.2.ebuild
+++ b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-14.0.0.ebuild
diff --git a/dev-util/cucumber-gherkin/Manifest b/dev-util/cucumber-gherkin/Manifest
index b7c79e034124..e0573cf903a8 100644
--- a/dev-util/cucumber-gherkin/Manifest
+++ b/dev-util/cucumber-gherkin/Manifest
@@ -1,7 +1,7 @@
 DIST cucumber-gherkin-18.1.1.tar.gz 12436812 BLAKE2B 5434d3133f35156d131283dff7cbdebb6523911ffca481ec61b6cb7fc41288e8deaa9afadfb4f34afc57729e92212c513fa203b279a54e5f09a389fe9bdef1dd SHA512 c6f329ea2f46e224b802a1a4062b8d66314c2ee124fd261cfeed390775acf184e1098879c17cae4838ef361ffcd0cf43b1eb77978da7376a87afc09576d25085
-DIST cucumber-gherkin-20.0.0.tar.gz 9238574 BLAKE2B 40dd7f31e234740528301ed20be59c6b550e256fdfc21b50883c7d6acf9aca75f61c6f87c86f6ab72ef8e6f9672814dd23ce2ba093bb0fe9a447027c2469ab6f SHA512 25a3180482166a1e6e7d63946b2ed8618558b62c5506c366c5a18b59064259473ea34b3169b666a366a271ddab08bc235a16bdedd34e184157cbd6f12068b1cb
 DIST cucumber-gherkin-20.0.1.tar.gz 9410066 BLAKE2B 2c34b1eec9d74b96bbf21ea20b479d9a1ab42669bce08eeac9c9f0c97b86c64e9119423eb8ed3c42897c8730d1dae9c0a75e32e407a63b6c1955e773d35fa16f SHA512 0a53a7110fde39ed921c3a883b2aa00f8599e7dda87cdf1766d606a696ba6f9e350d176edb9cf849567a9f4733d5e0653944d738fe9a9451ecf0763b8687706b
-EBUILD cucumber-gherkin-18.1.1.ebuild 936 BLAKE2B 0fce62bf64809a0545da8460dd5a7be80d79249885823272df072e5c980acc5678b13305c5da8b654ca5e2172c8caae1bd3a63855e96568aa99f2f4ab3d1fe42 SHA512 d582198a8394678e29418e9c957573c745d45a640ce041f34949e0be4610356351ef8db11a8ce2cb6d0f446970e1b4cd7ecf5edb142767e7745958d6fe6b2161
-EBUILD cucumber-gherkin-20.0.0.ebuild 726 BLAKE2B b5473261c531bcc08b8516dc36fd44d3389745924bc6a510c075a8efe4e7589abe8ce0d64610785dd468f4ef7e12e4b985298cc58982e26f73b310dcc4772959 SHA512 05187e0c9421f6b4e6a39137642b174ddba92196cfe4f4a46ce8bb06811bc4daad11b57b176a4b9a23ccef0e0da8840c7a6aa02721ab4f776777e44c83415d6b
+DIST cucumber-gherkin-22.0.0.tar.gz 9601890 BLAKE2B 71ad3b4c9917cb6c9e4e8d7769bc76f49f1e33d5aa46ad835eea01297d9e69c60c1249075aabfb529daa10996703e45dbb8dec4eebd149ae8637708f666a00f5 SHA512 ef5aca1bd0e30aac850c2e93fd6d30bb5e7a9504f4d1ad1f4072001abeb16aa7cbbc0bb2200dd9001080ed8d89a3f91eb5206874cf535e3ea4756e6e809a6c20
+EBUILD cucumber-gherkin-18.1.1.ebuild 959 BLAKE2B 2db8b04c5aa0bb226e26c79def868d7053ef43ecba6d8fa8f056a9dc02be3fc4a6ae83f79499dccedd3ec632487d5f7e938e26e9f83dca99928b76afcb823d77 SHA512 814798f56d1ebd888b04d7b86918a29ad34dcf87bf0105f3c2b21fdbd8e0832b41492e2c6babaa1901de15711180181b3c534550bcc9b1fe6a6fe6d224607c92
 EBUILD cucumber-gherkin-20.0.1.ebuild 752 BLAKE2B 97d59d4f98c55ff939692b6ab67e34de85f1c3dccf39daac69a922e77524d5d58f9ecf339356e4a60919d0468c06e0dbece663b865be8fc7ba1d8160126852ff SHA512 da97d7cd58d83bb8af86bda2ba0679c33bf031709fffeb177499b14ea3bbcc35f60b6d939b39ac8be3a04171da7cf586bfdef9d4c7da5000d68980ef56c3683f
+EBUILD cucumber-gherkin-22.0.0.ebuild 752 BLAKE2B eea0f819a3a16db9bb714afd156223b325d656bf74739955dea1ba2c65914d9d921a050e3f41883676bf540e12d8ab2738888434dc2c890863238c1c93471fd0 SHA512 be92206038a0671b4d2b7e12dd0b5d2850912ae118453234adff0bc345d8217160c432a745b7247d76c922b5738cafe0e72fb08bc6173112058d92787f20bc12
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-gherkin/cucumber-gherkin-18.1.1.ebuild b/dev-util/cucumber-gherkin/cucumber-gherkin-18.1.1.ebuild
index d7a9f611c679..0bb8cc035e23 100644
--- a/dev-util/cucumber-gherkin/cucumber-gherkin-18.1.1.ebuild
+++ b/dev-util/cucumber-gherkin/cucumber-gherkin-18.1.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/cucumber/common/archive/gherkin/v${PV}.tar.gz -> ${P
 RUBY_S="common-gherkin-v${PV}/gherkin/ruby"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
diff --git a/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.0.ebuild b/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.0.ebuild
deleted file mode 100644
index d27ef5a8f778..000000000000
--- a/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-# Don't install support scripts to avoid slot collisions.
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-gherkin.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Fast Gherkin lexer and parser"
-HOMEPAGE="https://cucumber.io/"
-SRC_URI="https://github.com/cucumber/common/archive/gherkin/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="common-gherkin-v${PV}/gherkin/ruby"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend ">=dev-util/cucumber-messages-17.0.0:17"
diff --git a/dev-util/cucumber-gherkin/cucumber-gherkin-22.0.0.ebuild b/dev-util/cucumber-gherkin/cucumber-gherkin-22.0.0.ebuild
new file mode 100644
index 000000000000..fa0bf8444760
--- /dev/null
+++ b/dev-util/cucumber-gherkin/cucumber-gherkin-22.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+# Don't install support scripts to avoid slot collisions.
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-gherkin.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Fast Gherkin lexer and parser"
+HOMEPAGE="https://cucumber.io/"
+SRC_URI="https://github.com/cucumber/common/archive/gherkin/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="common-gherkin-v${PV}/gherkin/ruby"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend ">=dev-util/cucumber-messages-17.1.1:17"
diff --git a/dev-util/cucumber-html-formatter/Manifest b/dev-util/cucumber-html-formatter/Manifest
index f9594a4e7f6c..1084d57e1d9f 100644
--- a/dev-util/cucumber-html-formatter/Manifest
+++ b/dev-util/cucumber-html-formatter/Manifest
@@ -1,7 +1,8 @@
 DIST cucumber-html-formatter-13.0.0.gem 436224 BLAKE2B ce3f58995560f6d78e855e95af83128e426817c749f64de8c8b2c475893a0da02ee72ea00ccf2d5d5745d94f93924ef52e9a1c01bebaca9cde889cba49f32270 SHA512 687ccb9245213ff9e59b85cf729fad05de385c94a31ae70cb770ba515c57309107fea16756853d93b1af39c68c3f936f7975540070b4b45bbdd79baf94513dc4
 DIST cucumber-html-formatter-16.0.1.gem 432128 BLAKE2B b1b53566d15573f6f4fa87a9a87ce5c1844d9bd6f43715aee1a08ab45d66baa211631a612aedd59f97c24364ce9b6b607697763744906ec78f96adf0c5ca260d SHA512 2bcdd55e0d3dfebc60c25e2a64a0d2b132e561fdb0f77ca0a491464c9b338cffad5a436123d3ed5e85816d509caa60badda958d7b435a42d89ed27a17f97edbc
-EBUILD cucumber-html-formatter-13.0.0-r1.ebuild 560 BLAKE2B 832ad6722d23d43c276dba57ca62e46a6685cf6a4ef49dae1b361b1e5be59dd412e3f5509ac27d318130c4a97b9b46e50154e9442e7b6233a7e7341fcceb0587 SHA512 b63b1576e0def4b6c00388e4bf4284aae4c3e053bc4af691a77d533de66838dbb1cf1ed5b23a27f543ddb9735e138b51c866a19fdec60e33effbb5259da2b87e
-EBUILD cucumber-html-formatter-13.0.0-r2.ebuild 585 BLAKE2B a824bca37a52cdcfe65e3deab5bf4199b308fa5e5c7a81b6d1d62a1cdade0ddcbef9fe71fe0f6afac1a6ec223af1467a4e242952554b098607a261b2b2d7e91d SHA512 5e335a3824c233b2087d8e4bcadace8f90ce9af165fb9caf4c889e86a52cec50e06f873696aa325899eac00c466657e7945698c4a51a0779dbe8c7f0371b75c6
+DIST cucumber-html-formatter-17.0.0.gem 434176 BLAKE2B 9bab7b11d2a17b6bb7fb1a81275a7db9221c5848779e870e95b9fee939d93d8df43faa29b1b85a3ac170763ffd8bb75abef8bdcfa2a7392cbfa7ae96737a0fdd SHA512 7be1e8805f45ab78a80997ff556856289f715d59f6ee4f01ccc95452b0cc898bcd0b97d029a70cfaa1f292069f913b99517aa1cd7f2cf45f7cdc9152520ae670
+EBUILD cucumber-html-formatter-13.0.0-r2.ebuild 608 BLAKE2B b7c50fbeb74e8abe9e9743e73d9b8a607c685231829ae2241b17f54588b89684eed7e42358805819833e5d4a6cdc3217df2d9b779955f0418925c8656112aa74 SHA512 294634406ae69fa45688fb4a0feb2e020084ac37e43a2f239519970788d17d8567a78b7a61b2eaafa573086b2f1b8b5f4b334a83dedd815b4e9c75f973dd31fc
 EBUILD cucumber-html-formatter-16.0.1-r1.ebuild 620 BLAKE2B de7237cfad709d374815a67f1ecf2a05e0a7def0033b395ad4096ec931f2bffaf62d86bedcc2e40431ae76eaca9b5ae83f819f1b4e9cdf8208048f2ec5cf98be SHA512 aea00c0116db5074f833694b32d1f3786fc5ac1a240dd2df1c753c16bc7c4c25d95761578f2e2fa02601326bde75b3b58be249ad5a3649b13e0c46b5cc4eabdd
-EBUILD cucumber-html-formatter-16.0.1.ebuild 548 BLAKE2B 9726a4c2398928feefb92b8be7d0a70a3ecbe16dfc8f7f4bdf7dc5d467bd164e1d4b3de837453ece67d07e413d58607d332c6640afab5028ce2225a8119ebb8c SHA512 7e0d7e0e62cf29cf95a12b9c58cff5eae018a12bee207e1ec6c82ce49f3bfdaf36cc0aa61adc340dcd43e5c21f1ded114bac2a00293eb82eb09a36b10c382051
+EBUILD cucumber-html-formatter-16.0.1-r2.ebuild 645 BLAKE2B 8f5285a93fa7476ec120179507704fcafdc79944365d7c92a3223b27952c0eebf2347ea41dd643de2684e6d6b2761097632b5dfb4c6e6972cbfb61ad3cdc7a75 SHA512 0222ed1b2f80b274a6d1bc100b9e187ff53f74047515d9a963be2a1614fbd36ecddcc67fdaa00e2c38e7adade1536ad7984768d6fc470b00d8fd6aec8fd17399
+EBUILD cucumber-html-formatter-17.0.0.ebuild 668 BLAKE2B 471d8a17def2679a35cc36c39651933ee9b63d716926b692b5f01785f9ca77d367ebf9f7f0625f9dab38c8b99dd794778a7082f429c57e5cc676859d132afab8 SHA512 bbcc60b1769609eb4b0b18bbf6a794495868b3ec7e34b09dc8b1f7901b76f015c86b915d9432005e90162bd44e815563cedc63fb70a43c1ed0f1b4245e02f606
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r1.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r1.ebuild
deleted file mode 100644
index eef342651536..000000000000
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTML formatter for Cucumber"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-messages-15.0.0:15
-"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "cucumber-messages", "~>15.0"' spec/html_formatter_spec.rb || die
-}
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r2.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r2.ebuild
index 1217af0a6833..b408f5e1384b 100644
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r2.ebuild
+++ b/dev-util/cucumber-html-formatter/cucumber-html-formatter-13.0.0-r2.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="HTML formatter for Cucumber"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r2.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r2.ebuild
new file mode 100644
index 000000000000..9d9cc748042e
--- /dev/null
+++ b/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTML formatter for Cucumber"
+HOMEPAGE="https://cucumber.io/"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-messages-17.0.1:17
+	!<dev-util/cucumber-html-formatter-13.0.0-r2
+"
+
+all_ruby_prepare() {
+	sed -i -e '1igem "cucumber-messages", "~>17.0"' spec/html_formatter_spec.rb || die
+}
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1.ebuild
deleted file mode 100644
index d62ce4899168..000000000000
--- a/dev-util/cucumber-html-formatter/cucumber-html-formatter-16.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTML formatter for Cucumber"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-messages-17.0.1:17
-"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "cucumber-messages", "~>17.0"' spec/html_formatter_spec.rb || die
-}
diff --git a/dev-util/cucumber-html-formatter/cucumber-html-formatter-17.0.0.ebuild b/dev-util/cucumber-html-formatter/cucumber-html-formatter-17.0.0.ebuild
new file mode 100644
index 000000000000..fe9815ec6c9e
--- /dev/null
+++ b/dev-util/cucumber-html-formatter/cucumber-html-formatter-17.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTML formatter for Cucumber"
+HOMEPAGE="https://cucumber.io/"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-messages-17.1.0.1:17
+	!<dev-util/cucumber-html-formatter-13.0.0-r2
+	!<dev-util/cucumber-html-formatter-16.0.1-r2
+"
+
+all_ruby_prepare() {
+	sed -i -e '1igem "cucumber-messages", "~>17.1"' spec/html_formatter_spec.rb || die
+}
diff --git a/dev-util/cucumber-messages/Manifest b/dev-util/cucumber-messages/Manifest
index e40dffb15675..235045e3c4fd 100644
--- a/dev-util/cucumber-messages/Manifest
+++ b/dev-util/cucumber-messages/Manifest
@@ -7,7 +7,7 @@ DIST cucumber-messages-17.1.0.gem 21504 BLAKE2B 1e7d0bf18c54310f0a16ae62b58bf5c4
 DIST cucumber-messages-17.1.1.gem 21504 BLAKE2B 343bdb916c1e1a8cfa0aaaa4837d11064d51268a283b9c79b0ff249abe8066ef6a3d56d021d3b9d9b1d8a2dfc1495b08263dc325f6ac8a0e2dbd46281089cee7 SHA512 32d4740bd6aae8bf4273aac9974e181d32c4bd0be5883722ea38aa62df8b915504fd21a655111c03527d3fe1f31f0ec41ac637cb7293b753c7ec4eb6a97e7db9
 EBUILD cucumber-messages-13.2.1.ebuild 498 BLAKE2B 5f1b07a54fd92218910d0dc08591979bd9b868b482ae678c2c6e34691ee9516b6c7afafcef9bae31ecd654905bb28e581adff9bd270eda52ab4e92e4fa09f050 SHA512 c4ef586d85ae9d0f38dd751bfbd2093cb61119dcb4d4030bc24404f3320d5d09666ce0e2358083cb0ad70440c237007f5730fac1038a1e01a2db675f5599aaa7
 EBUILD cucumber-messages-14.0.1.ebuild 498 BLAKE2B 5f1b07a54fd92218910d0dc08591979bd9b868b482ae678c2c6e34691ee9516b6c7afafcef9bae31ecd654905bb28e581adff9bd270eda52ab4e92e4fa09f050 SHA512 c4ef586d85ae9d0f38dd751bfbd2093cb61119dcb4d4030bc24404f3320d5d09666ce0e2358083cb0ad70440c237007f5730fac1038a1e01a2db675f5599aaa7
-EBUILD cucumber-messages-15.0.0.ebuild 510 BLAKE2B 984178b531645027cff462ad8812aa3dba34297b5cbdffcd23d541c544860db4b765a230ecb589afb6bd69ed575c6950f8b4adf93206c8e6b4ef067f0dbe2865 SHA512 46497d2707319760fb1dbb6332df234831a100352192ddb78316d8d0667d79baff0095c7e119a2a782cc3a9302c2b9bd96e1310223a410072f3a452163b9f96e
+EBUILD cucumber-messages-15.0.0.ebuild 533 BLAKE2B 5d216c4613edb8f5f39ce5bec9d06bcd3719258d28b36faff3894696a2431aba060bb7c6f0b2ff23380d9cbb501887c5425ca35f2ab59b00f44b9726bde80bb9 SHA512 0895d084499d113e040ad56f2605551aed66c722eae77d83896a72b721fb906789603e20fcdddb7238d1a4851af6288684d7e61c8732f500085633ffe51682c4
 EBUILD cucumber-messages-17.0.0.ebuild 440 BLAKE2B b1df26553661d947995e30bf7e93bcc84699906a3674a403d3fbe8c2a9e1f8600fc8691526d6fffe9d036e6639e1dd16f0edfc81a9465120e8c56bd370aaca82 SHA512 6f58f6c51ecf570a425758b32369ae31b76a5a14a2c3f56901215732968bb279d253ee08422293444cd2f2fe11848288bc90943bd440f19cc4a2fa04d65e89a8
 EBUILD cucumber-messages-17.0.1.ebuild 466 BLAKE2B f6e551b6c322efb3c03e71114750a5da5a5cf05c33e962e97e6f45f2e16ce5e1eb88fdbbf7ae5ff92c10fd1aa862fc5dc7e8a48c1b848c5db931afd67a43e2ef SHA512 7fcb5a829401bdf1c30a9aea230004f4c0d3baae768fba50c3690f7b425cc23b64128bc63cde22080194e21ef210845063eca3fb019d3c1eb93c641bbdfbbef7
 EBUILD cucumber-messages-17.1.0.ebuild 466 BLAKE2B f6e551b6c322efb3c03e71114750a5da5a5cf05c33e962e97e6f45f2e16ce5e1eb88fdbbf7ae5ff92c10fd1aa862fc5dc7e8a48c1b848c5db931afd67a43e2ef SHA512 7fcb5a829401bdf1c30a9aea230004f4c0d3baae768fba50c3690f7b425cc23b64128bc63cde22080194e21ef210845063eca3fb019d3c1eb93c641bbdfbbef7
diff --git a/dev-util/cucumber-messages/cucumber-messages-15.0.0.ebuild b/dev-util/cucumber-messages/cucumber-messages-15.0.0.ebuild
index 8d0ba59011ad..ce476e86815f 100644
--- a/dev-util/cucumber-messages/cucumber-messages-15.0.0.ebuild
+++ b/dev-util/cucumber-messages/cucumber-messages-15.0.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication
 HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="$(ver_cut 1)"
 
 ruby_add_rdepend ">=dev-util/protobuf-cucumber-3.10.8:3"
diff --git a/dev-util/cucumber-tag-expressions/Manifest b/dev-util/cucumber-tag-expressions/Manifest
index 528f9380c5ae..70eac10d5bff 100644
--- a/dev-util/cucumber-tag-expressions/Manifest
+++ b/dev-util/cucumber-tag-expressions/Manifest
@@ -1,5 +1,7 @@
 DIST cucumber-tag-expressions-2.0.4.gem 8192 BLAKE2B 1ca07c8b1c018aa0011e6b31fd2b1a6085f5de9aa5a9abd4cfcc2bf0feb9fd3018a1fd07b7a3026e62b32aa629718ca1acb7c4b2e9d19a118ed500e2d60d0c87 SHA512 d52d07f4415c69db54e3d37e5627e8587386aa777e1816b8c8d6dd284388a5ebfe48f7ab3c8f8ff3f4c3e6b3dfa6a1136460f501504b1dc71554f2878e81756e
 DIST cucumber-tag-expressions-3.0.1.gem 7680 BLAKE2B 83d89259c5451886e9d699a3a7bfe4b0d09ae6164fe2b3d271e62cc8185876cdd1173cf1223b8eb07f898ae43bd599efddc7e589eb353342548b376ed7aa670c SHA512 699cac80ec0fa41d55f5600e84772d471e9268cc46382813ccdf1aae99f2d50c9e89b7b60baf79c9dc9d5d17189056212726aeb7dec3a4e18c2e982191078fb5
+DIST cucumber-tag-expressions-4.1.0.gem 8192 BLAKE2B f4ce3377f3d67be1d58fee6f082ac8b25a301ae2aea2f862cc8faa0b7b36daba9754512cfb046c932c93ef6d10b50ff8a4cd2187b4a3516f740b9d9db865b95b SHA512 15704a604496a26fa87775cf05b6998236e7903e0770782804ce8bb9e3093178d686e1bba146d1453b853f529f30220054ac33ef18ba1d45894fb1aac7fc3dab
 EBUILD cucumber-tag-expressions-2.0.4.ebuild 431 BLAKE2B 3173cb5f7660f88f4d2a26f941657216f33e9efe352acf845e9947dfe715a877aff8ff116d03e8460ba46be60e4b1f45c81833e56b3c6a7e1ad194431d8fa3fa SHA512 cc8c92daf0004a23e854a8272140f53f6dbf3be7dac9aab2114915161bbcc13d200de1c71d85860e61090d97b444a4d0dfdc9f5a637219486882bc1a7ffc08ef
 EBUILD cucumber-tag-expressions-3.0.1.ebuild 431 BLAKE2B 352ecb5dba6965e52a9b4b07958b16095c75dc4a6402424722d177ff26ecb576fbe8cb89a484c3221ae7f0273d1da8cd69832e374e7003f1924703ac8982ef54 SHA512 3a52a049567f3373f679b54b3c076cbc281cbf71e026cfa35666d7f61d374882ac225aca9515bd95103fa0d04e6a2b962ba3b09347806d8ca0963d9432a9ee77
+EBUILD cucumber-tag-expressions-4.1.0.ebuild 431 BLAKE2B c24db9b43e6ee6987220a3c0efdf7f0051df3e65e8b0a16da25d8d1317b54fb87a7e4ecdd34b1751b155a811f6bbe308d06ef138df63c40d0b36608d568f699a SHA512 7e599c1b5850f4c58f95b6aa8ccf9ffcb2b21a40616f6cf8b73dfccd4b347d59f170433e1e672b609d6efd32aa2e3cd704c0b6acc1de8537f9e1783c0dbe332f
 MISC metadata.xml 300 BLAKE2B a639d71f26516f07d45281d1036eed4e67653b41ad4644ebee63601681a288f8de93effc46f684df4d152eb2914abfaeb745045b075127d36c1bcc6bdc67d1c7 SHA512 27af0d39315115a4483da0c3d2d84ee4c7fba5891ef61ba06c776b86bf068c4a60e3766fc8c1c522402480543919434910decee43b3847bbdcce556cd91f8473
diff --git a/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-4.1.0.ebuild b/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-4.1.0.ebuild
new file mode 100644
index 000000000000..1c32ac8b2488
--- /dev/null
+++ b/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-4.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber tag expressions for ruby"
+HOMEPAGE="https://cucumber.io/"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index 39cde08c7c53..9b03a1ba23fe 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -1,11 +1,9 @@
 DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087bcadd5f494b807fa530d20b7e14f327ca2ab377c3f9abc28df60c7986576b59a246e5fb7537daadb016bb21420b7 SHA512 c6bae727814f6a2d1dfa8cfee9bc9e63e3bfa755f6bb070f907a24d52009dd29652ab21ea7719527a5423ddf4471208f91a388ec53555d7021abac7769b2109a
 DIST cucumber-wire-5.0.1.gem 12288 BLAKE2B cbbf593d43cbbc003ea247d41db2cebaed14d232ae2bc52eebe34c8316c58b679be7c6802c7ffae7dd3e8c14d367803e3baba7b2f79326434821693e71fbd9f5 SHA512 deda0bb93b51b9d27074242bd0c371b7465c06e302d2aa608201898a1eb3b1736c9955baa9360f047a29793871fedc9feb25bf3430020e5b1f5630a2c982da73
-DIST cucumber-wire-6.0.1.gem 12288 BLAKE2B f7d371e186a27ee1a6ce489c8663c456c29b1e8dcf3788032c799575ad42b4658110b50bff6e4a446bca7227bcd12eafb117782675ff2ff7e1d0ce67eccc6c48 SHA512 b056dd78b0e715771ec591578fa3d4a29297a1ba1abf3a0d009cc90e36b44ae20578a20198f463a0c8760b70722a0655612f286c34224849db675ae2110c0bd7
-DIST cucumber-wire-6.1.0.gem 12800 BLAKE2B e03e120b1beeab52b2650df8f0e55eb01edb58162d2a31b41e7634b9d8d4b5277a499faf80ba9a179a73a1e92bd660fbe5d71202f39a7ed29e171cb58da268ee SHA512 a7931b90c3eabfca0c762ee8f30e9a9b2e44a649ff8eed11e52ccd187045768678eaf7570e58f4f1fba07ceb1e1c66bdcb8cf02f8fd04a264c89ff874815fabe
 DIST cucumber-wire-6.1.1.gem 12800 BLAKE2B 7e32aeae15bbc02884100f58eab9eb39df2ecb2d7a8fe58dd81c17eefcdb8d080dba6ca84dafcf2584351ce88132d73479a1dd48bec7ad53be7806019940106d SHA512 2f08d14170707930c2b6321232fe9398350ec1cc9e9a00ee174db058053fef4ec568f8a04247bf753c89d1e3430474a7ff25f84472d2dcd1ba3084f88c59d555
+DIST cucumber-wire-6.2.0.gem 12800 BLAKE2B 783e434a747a70e338a10f7a505d6f2d9f65cc76e574f6e29d3822090446e041dcda34ed2dbccc0659a4048dcc9208b468919458f9dcf285006428717ee9eac0 SHA512 ae2dd0652705a900de0d873c492b255bae7dd89a3c8da610890e73f69e714d3112f023bb988a1621cc7c0c1b2d2607385bc7673ec57678c032c32bcef604f8b5
 EBUILD cucumber-wire-0.0.1-r1.ebuild 493 BLAKE2B 3b26c3323530d510aec5a5071a20fd5e379f63c998f5a3fb608832c2fda89910e07b77f5f7e690954b3600d314e1a238073d123aabcc2248e91b4d64dee431e0 SHA512 2867c63cf53b26a4b6644bbaf6437f351efe4c9b6309353e502cf615fdac732bf9d39d8e216cd12fe664c38a65ea34b466922ca639d389a2f110610f3ed38d0f
-EBUILD cucumber-wire-5.0.1.ebuild 537 BLAKE2B 9c7a6a8df4ac51f1e319c0d2fd376d98f7e13ddebf9e957b1f54c4662fce5b142b9c77c89ff4a64aa4686c22a56d905d9177373b52fc67a7a689ead16863a85b SHA512 9544e7fe0bcfa75d62a8a9f6510eca2e3b712c2c4628d2d8d8d14f6a39a7b34b152467ab28a90a82a4267d9c9f7b05f451a802fb24f275ee76d73abd2c87021e
-EBUILD cucumber-wire-6.0.1.ebuild 594 BLAKE2B 7caaad08bf11594af90ffa5472662414a7196accddda25f53fd2914264752f11209190d4e603dd2d46e405ad7c3593600abf24c760589d3f41419354e9da5643 SHA512 60ace6d7cd19d6835df4e629a5a308259084d04855f847e85e83110c601b8d70f65b7befe2045ed040c478db71dabb568909b3f63a039b4927c5a3eaab63c12b
-EBUILD cucumber-wire-6.1.0.ebuild 594 BLAKE2B 7caaad08bf11594af90ffa5472662414a7196accddda25f53fd2914264752f11209190d4e603dd2d46e405ad7c3593600abf24c760589d3f41419354e9da5643 SHA512 60ace6d7cd19d6835df4e629a5a308259084d04855f847e85e83110c601b8d70f65b7befe2045ed040c478db71dabb568909b3f63a039b4927c5a3eaab63c12b
+EBUILD cucumber-wire-5.0.1.ebuild 560 BLAKE2B b9b72a03a750f69c304120576a8a01ed3618792215927cad5e88d2cf5e1473c1f1c2e42f74b8b00f209a8072252da44558fa02b6f3b32708aef038b9d387a7f0 SHA512 0c49f07d84de17e6961736eeebb1d20aeb1f5cc7abd8c2c6c473292bef6417d124b6ff828847a5d9cbd1c2d26f333fd0bb642b9feed21d6018bea54471714477
 EBUILD cucumber-wire-6.1.1.ebuild 594 BLAKE2B 7caaad08bf11594af90ffa5472662414a7196accddda25f53fd2914264752f11209190d4e603dd2d46e405ad7c3593600abf24c760589d3f41419354e9da5643 SHA512 60ace6d7cd19d6835df4e629a5a308259084d04855f847e85e83110c601b8d70f65b7befe2045ed040c478db71dabb568909b3f63a039b4927c5a3eaab63c12b
+EBUILD cucumber-wire-6.2.0.ebuild 594 BLAKE2B 8cc88ffde00eca1542357aab58a2c0d69e45952fc6e6783ce0d666fa3b479f52f931b1ff5cbca3cae34d07128baf3755b47671dde482c738d2ce0727dc713bfa SHA512 83e40b283b5360e350d6fa285579047ae145dad2f969a7c8f08b50f8e3517a44c00124ab35b429235932ece070b854a8fd4809c717e964189f0ad0d01de775a1
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-wire/cucumber-wire-5.0.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-5.0.1.ebuild
index 3f593689b7aa..3e3d45f68c9e 100644
--- a/dev-util/cucumber-wire/cucumber-wire-5.0.1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-5.0.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="$(ver_cut 1)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild
deleted file mode 100644
index ec6f09281efd..000000000000
--- a/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-core-10.0.1:10
-	>=dev-util/cucumber-cucumber-expressions-12.1.1:12
-	>=dev-util/cucumber-messages-17.0.1:17
-"
-
-ruby_add_bdepend "test? ( dev-util/cucumber )"
diff --git a/dev-util/cucumber-wire/cucumber-wire-6.1.0.ebuild b/dev-util/cucumber-wire/cucumber-wire-6.1.0.ebuild
deleted file mode 100644
index ec6f09281efd..000000000000
--- a/dev-util/cucumber-wire/cucumber-wire-6.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-core-10.0.1:10
-	>=dev-util/cucumber-cucumber-expressions-12.1.1:12
-	>=dev-util/cucumber-messages-17.0.1:17
-"
-
-ruby_add_bdepend "test? ( dev-util/cucumber )"
diff --git a/dev-util/cucumber-wire/cucumber-wire-6.2.0.ebuild b/dev-util/cucumber-wire/cucumber-wire-6.2.0.ebuild
new file mode 100644
index 000000000000..7f20f64975ca
--- /dev/null
+++ b/dev-util/cucumber-wire/cucumber-wire-6.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://cucumber.io/"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-core-10.1.0:10
+	>=dev-util/cucumber-cucumber-expressions-14.0.0:14
+	>=dev-util/cucumber-messages-17.1.1:17
+"
+
+ruby_add_bdepend "test? ( dev-util/cucumber )"
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index f2e152779e97..52c6c1b7aa07 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,8 +1,10 @@
 DIST cucumber-3.2.0.tar.gz 271886 BLAKE2B 0945336e2a4d14c21d22b3af18fb140663fa0c5acd7d29540cb6755fcc50b020640ffc573f4d4ed17af2758df3df410f93cf5067b736cb8005d9a6ae7fa4d397 SHA512 927ca314c56f83e270284921131ec62aa05053d29a77b230799bd1949751f64c964c0f87525c776d7fe260506ddb632b5cc8939df841d131f6a0af8a82110441
 DIST cucumber-6.1.0.tar.gz 250437 BLAKE2B 64b2adfe5b9b78e70bdf6eea5bad4fe96b5598b686e27aee8635c84070c2e20bd8051217db9c79c9f0de62b6a8eed85c327f2adb9965d39f58f74359b935c013 SHA512 45b455f1c1728463a3e0dd9061d30e6438710e137e923d56cee90be4aac4b9f940a79aac60eca8cee3c4800831e7f57c1893276449e18a9f58c3f3664d810b08
 DIST cucumber-7.0.0.tar.gz 406986 BLAKE2B 6d06d40e7b7029f3f5fea782b5060cf8985cd65334c722744132f40048d1d261963dd4baaa80a8fd44b18d66b63b08960350abedfbfd4d95e0a033a22192d010 SHA512 ca083c2de895f11d7cfd955c216e1e2c52ea9e5ed0034aacbec44e5daf1809e6a67a4621a64a5f236c6a0be9d8057beb917fd00a5f03191fe3d9d2c8814fa22b
+DIST cucumber-7.1.0.tar.gz 410595 BLAKE2B ee1fbca606479f1f07d64a5434051d8466d7056a326424a0235a6e4f860ed3cdc7862495156874b38631e6a0a1b70bda40deb6f5310f7bd6bdafe72c5faa8f2b SHA512 7c124110634259e83ba1986efacf85a73e9a6f36a7c262ba9842e85e73e359a50b5090489f656e5b503cac68e3db9905dd1834db1bfae9ee55e3a4d1b31a4adb
 EBUILD cucumber-3.2.0.ebuild 2837 BLAKE2B 8d76d4476b2e1c8d7bdd16c4c89f8d45eb04af571d7438a057ffb28f3b818388cc346b30b53606e8e96ce75b65fb59e9333433c343817e9a57c805128267cd24 SHA512 f0a0a344b0190d7751f9de8aebb8c5d2c93dec6ba41f6df288c67b1629649c2a0f510394b65e9d53074c8f9ce27dafaa6a469b97b03b69309fbcf17f0ac2b689
-EBUILD cucumber-6.1.0.ebuild 2527 BLAKE2B 5001b462e33a2b308e8e9fb4e9e00893027ed3421980539dbad0e15cd10cd27913f8024731e6df37f1a50760bbca6e508ea87d864be2857ff90b15afb8b9a07a SHA512 3d541dbf42e8fd458ae6bd9b15aa5bc94aa2f3fdb9d05ac344a81c3cb4b4475d1450966682154fd9532ab7bdea573feb665a96be3bc6758932084d3a4de76828
+EBUILD cucumber-6.1.0.ebuild 2550 BLAKE2B 4ab17f62675852eab10bd8c743417f69eaf7199f7e790a688d7a4a4dbbf1e0a533f8517af4fd11bf414970dfce4b00127463c1114ee345e26196b40ea00f53d2 SHA512 623be0b69bd8248726973a16d38366a910e110bd9c33de4da39fec2e5d16e1e9e5f5f0f474b779742ec65ca3849a090e6578cf828fb3e322f30c2901df8a9a22
 EBUILD cucumber-7.0.0-r1.ebuild 2532 BLAKE2B c9ec9fbbad74dc110136d9fa4cea41de5b5016b231838daa65f684f8fd108e8ac05f7a79931e1fec44b0605795c5ea5d304a8d67173ad18f6925d98f4d916d1a SHA512 3e0edd81641d2665f613dc8ebeeaf04214f9e1956bab4717dc92d5e1089371795895de7f98bdbfe49a48f94a1fdeb39606d23e20f4b36b5771c7814f5036837f
 EBUILD cucumber-7.0.0.ebuild 2544 BLAKE2B cc361b5e344ce7b6416e4bac97a231270e708a99211693ffa24c7260f2615e9d49370c96dc969f6d55300dd3f95115767b4a6b18e926e708f1825a2d487ca972 SHA512 c62b6773a40fcbc6acc956a2211de3f1cba13c5817fc6633281cc6359dd2461a2af65daa429f96ccad65447d81513ddcf21a3a4b44ff3f663d4074fa902e8d50
+EBUILD cucumber-7.1.0.ebuild 2500 BLAKE2B cc4ee8fb86293ea1413d1f975144c322dd56f82101c2d92224f8b45311c2901434c85adbcba28fe03252dce8481a486ac84ae7447084b82b8fde1a8a3e761cbd SHA512 8da9770cc954afc8991e9f77eb02c32146b8e39ecc20a12ee97c196e0baf0439920805b1c5ef15a9b1e91e7c8641e8b5c92d646dea622f7152b70d9123a7723b
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber/cucumber-6.1.0.ebuild b/dev-util/cucumber/cucumber-6.1.0.ebuild
index 0d8c4801a6b3..97932e11cf08 100644
--- a/dev-util/cucumber/cucumber-6.1.0.ebuild
+++ b/dev-util/cucumber/cucumber-6.1.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/cucumber/cucumber-7.1.0.ebuild b/dev-util/cucumber/cucumber-7.1.0.ebuild
new file mode 100644
index 000000000000..f12a14cfbeec
--- /dev/null
+++ b/dev-util/cucumber/cucumber-7.1.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP="cucumber"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://cucumber.io/"
+SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-${PV}"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		dev-ruby/rspec:3
+		>=dev-ruby/nokogiri-1.12.5
+		>=dev-ruby/syntax-1.0.0
+		dev-ruby/json
+		>=dev-util/cucumber-3
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/builder-3.2.4:3.2
+	>=dev-util/cucumber-core-10.1.0:10
+	>=dev-util/cucumber-create-meta-6.0.1:6
+	>=dev-util/cucumber-cucumber-expressions-14.0.0:14
+	>=dev-util/cucumber-gherkin-22.0.0:22
+	>=dev-util/cucumber-html-formatter-17.0.0:17
+	>=dev-util/cucumber-messages-17.1.1:17
+	>=dev-util/cucumber-wire-6.2.0:6
+	>=dev-ruby/diff-lcs-1.4.4:0
+	>=dev-ruby/mime-types-3.3.1:3
+	>=dev-ruby/multi_test-0.1.2:0
+	>=dev-ruby/sys-uname-1.2.2:1
+"
+
+all_ruby_prepare() {
+	# Remove development dependencies from the gemspec that we don't
+	# need or can't satisfy.
+	sed -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|rubyzip\)/d' \
+		-e "/json/ s/, '~> 1.8.6'//" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on unpackaged packages
+	sed -i -e '/\(cucumber-pro\|webrick\)/ s:^:#:' Gemfile || die
+
+	# Avoid specs failing due to differing deprecation message
+	rm -f spec/cucumber/deprecate_spec.rb || die
+
+	# Avoid failing features on new delegate and forwardable behavior in ruby
+#	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
+
+	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
+
+	rm -f Gemfile.lock || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index d7d4573c37d9..1f19998b3a36 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,6 +1,4 @@
-DIST cutter-2.0.2.tar.gz 2696029 BLAKE2B 9bc101137a1e479e137d9638ffa6892fa1fd7b3393462a305d0c92bd02b0486b1d2d071770be135de9493b23fa563421ac1d25bc890d9b2ed21d302601afb333 SHA512 17ec58fddbbceb4ab06b367f2f795ac0a2d8876c454159f20b7b1c6448bda330445ff922c2dd125ca42b77c729f5c65bafbf1c98eecc29c0bc1081c78f052141
 DIST cutter-2.0.3.tar.gz 2720129 BLAKE2B 1fbd20c8e190e422fdc64db5a008b7a8a2b15349e9d2f7056a970e0c924bb97d5bf0f9f25d77b220a560429881120466bce1ed3aab6cf4c7ec34453b35ddec53 SHA512 892df9fb166a3160b857d2becb61689d2eca340d7c2cf1a1f81a7a6ac6c414c5205220a7282de8a2823fa8fb54b03580b376c65239d7740cb429d499a16f8924
 DIST cutter-translations-974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz 595073 BLAKE2B 4445c4c16c47a05c74816d88a68fda97037c45caf7508fc1162f4978a0b3cb194653e879b77f6fc5be2f264a929ac11c4fc2aee68ceed6a23447094d0b249cdd SHA512 11450631602e7bd81132650b3edd028d56b2f6343a9561fe8bf3281427d8d22b0296651414756236b8544f719c8d4fc11be44a843532c8c32fe21dd7a82066d2
-EBUILD cutter-2.0.2.ebuild 1598 BLAKE2B b26ed5d1c12aed59ca3632bbdacd95cefae09d1a6105bd56ad1d3d5bd19be3f95b35727b08ab6d5860b2dff98e2df8d1277d761fd656ec804d44796c5fda6c8b SHA512 3d2fbe30c9b7ed34f5d82d8502a58e392352b6a2dfc40ef12a57b438e54ef16b9e107d5a1febcdbaf5acfb5c37231ead88b94f130f07dbc5b94b2eb8f90124f3
-EBUILD cutter-2.0.3.ebuild 1594 BLAKE2B 1eae5b2b4ed9f17899a9b184452a8ec4b99264f956420f7fbff95457ac8df7bff9b044874c8c8b18ea8849958a97b94fa01329224ebe894e8e79bf1a0451d4ab SHA512 54854aaff227c42ee993c0e781470fa5f76c0bd08aa45aa94f3f4fe1c22e1dde13e9103f6b187ca4bbd91ba06a1910807c6078a084ab4d886757c530ee61869d
+EBUILD cutter-2.0.3-r1.ebuild 1602 BLAKE2B 2a88a2371f0890c842bdb925e0e2068ca933abf148386d19e49d3a590e737d75fb44f76595509721a35fbbe6610e0346b86a75bf3a738be0749b98acd44b1cd7 SHA512 02c8848bbf691b96eaec4408ca95a58b76865330e314709d9a11f1281bb42a3bdde1e12c238212739362f440047ce7c7ad1c858b9293bd6745cce19b8015830e
 MISC metadata.xml 329 BLAKE2B ccc11908a8ba66fdc15f6fe8ea45e62e797050488dc82de159525338cb4ffc4d52609bd815dd0a2ad3ad23a915e5bf631dc3db640a0e7c314fb5fa66cfe5b2b7 SHA512 208b070fdb02df4825d364ee5d86c3be7658fb6c84420d53b5e4f72427de0a2b8c201e46a6bae9d923eb5e9b0f195fb639336452c89dd4affc5527908cd152fb
diff --git a/dev-util/cutter/cutter-2.0.2.ebuild b/dev-util/cutter/cutter-2.0.2.ebuild
deleted file mode 100644
index 68cbba5c987b..000000000000
--- a/dev-util/cutter/cutter-2.0.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-TRANS_COMMIT="974298653ba71b958e1b6c83f6011f5fefff6236"
-
-inherit cmake toolchain-funcs xdg-utils python-single-r1
-
-DESCRIPTION="A Qt and C++ GUI for rizin reverse engineering framework"
-HOMEPAGE="https://cutter.re https://github.com/rizinorg/cutter/"
-SRC_URI="https://github.com/rizinorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/rizinorg/cutter-translations/archive/${TRANS_COMMIT}.tar.gz -> cutter-translations-${TRANS_COMMIT}.tar.gz"
-
-LICENSE="CC-BY-SA-3.0 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphviz"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-util/rizin
-	graphviz? ( media-gfx/graphviz )"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	rmdir "${S}/src/translations" || die
-	mv "${WORKDIR}/cutter-translations-${TRANS_COMMIT}" \
-	   "${S}/src/translations" || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
-		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCUTTER_ENABLE_GRAPHVIZ="$(usex graphviz)"
-		-DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=OFF
-		-DCUTTER_ENABLE_PYTHON=ON
-		-DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
-		-DCUTTER_USE_BUNDLED_RIZIN=OFF
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-util/cutter/cutter-2.0.3-r1.ebuild b/dev-util/cutter/cutter-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..7698ae9bf4b1
--- /dev/null
+++ b/dev-util/cutter/cutter-2.0.3-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9,10} )
+TRANS_COMMIT="974298653ba71b958e1b6c83f6011f5fefff6236"
+
+inherit cmake toolchain-funcs xdg-utils python-single-r1
+
+DESCRIPTION="A Qt and C++ GUI for rizin reverse engineering framework"
+HOMEPAGE="https://cutter.re https://github.com/rizinorg/cutter/"
+SRC_URI="https://github.com/rizinorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/rizinorg/cutter-translations/archive/${TRANS_COMMIT}.tar.gz -> cutter-translations-${TRANS_COMMIT}.tar.gz"
+
+LICENSE="CC-BY-SA-3.0 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=dev-util/rizin-0.3.0
+	graphviz? ( media-gfx/graphviz )"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	rmdir "${S}/src/translations" || die
+	mv "${WORKDIR}/cutter-translations-${TRANS_COMMIT}" \
+	   "${S}/src/translations" || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
+		-DCMAKE_C_COMPILER="$(tc-getCC)"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCUTTER_ENABLE_GRAPHVIZ="$(usex graphviz)"
+		-DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=OFF
+		-DCUTTER_ENABLE_PYTHON=ON
+		-DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
+		-DCUTTER_USE_BUNDLED_RIZIN=OFF
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-util/cutter/cutter-2.0.3.ebuild b/dev-util/cutter/cutter-2.0.3.ebuild
deleted file mode 100644
index 0c181e99be20..000000000000
--- a/dev-util/cutter/cutter-2.0.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} )
-TRANS_COMMIT="974298653ba71b958e1b6c83f6011f5fefff6236"
-
-inherit cmake toolchain-funcs xdg-utils python-single-r1
-
-DESCRIPTION="A Qt and C++ GUI for rizin reverse engineering framework"
-HOMEPAGE="https://cutter.re https://github.com/rizinorg/cutter/"
-SRC_URI="https://github.com/rizinorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/rizinorg/cutter-translations/archive/${TRANS_COMMIT}.tar.gz -> cutter-translations-${TRANS_COMMIT}.tar.gz"
-
-LICENSE="CC-BY-SA-3.0 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphviz"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-util/rizin
-	graphviz? ( media-gfx/graphviz )"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	rmdir "${S}/src/translations" || die
-	mv "${WORKDIR}/cutter-translations-${TRANS_COMMIT}" \
-	   "${S}/src/translations" || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
-		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCUTTER_ENABLE_GRAPHVIZ="$(usex graphviz)"
-		-DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=OFF
-		-DCUTTER_ENABLE_PYTHON=ON
-		-DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
-		-DCUTTER_USE_BUNDLED_RIZIN=OFF
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index 005d56136559..fd44775e7dd8 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,3 +1,5 @@
 DIST cvise-2.3.0.tar.gz 250283 BLAKE2B 361bcafd2ec9caf42c77abd2a5bbd145cd350d9693178a59720a2a2d1d726e85860d92725a00ce3dae7041e8b47b584bf4c3a5e8b5c0c0a8283a15f8117125f3 SHA512 6c65b1462b20974d76e54b76e15e592a76445da2b8627a29a98ae295417239171267ed163d04a11eeaae25d068b44548cdad0b642e7024c49a5a15f3c0894b1b
+DIST cvise-2.4.0.tar.gz 252810 BLAKE2B a95d1645192886d8871dcdf7f9cdfa5a2ac615a3bbc24782c0966d1872fe5f3ade7ddb82afabecfcdebfdac257e2e13e6cb99ab7320baee1a4b43ab360e6a0b2 SHA512 073e53039d2b077fed43b948e0c01dc662ef4f75b92d7f49d1786a35c36412fed02e1931c6a39ce902452056fe5c7d70daa35a9cae18b44009778837261cae19
 EBUILD cvise-2.3.0.ebuild 1288 BLAKE2B 17fc3205790db4333a22b06c0532d11ccf7d4a3a107c88f3fb79b3e1dbcbd7aafe8d12a1708f28988db53b8e5ee96ff47819ea648f701b2122d053b31101c19a SHA512 7f5f23be91dff53487a03d2ff4b347e8aef8be6ea3b3f7228e9b18fcb42b311b1b4b1a47f57dcf7b54cd20e50c5fc6f4a38658866758f623e9adc64cfc9eb931
+EBUILD cvise-2.4.0.ebuild 1350 BLAKE2B 644a82226e75728668684ef877b4428c70c122aeb6c52cb2b0b5dd6936b635e7a20455a4c72b7af90687f94db7efa73631d99c69bc328f903f2047f354e8d1eb SHA512 425c8c70351c011961573df2ec8b38929b4946e1ec2861f6c2ce25ee3bda7a59583d8e110c606446b78e722200ea718df4e858b16dfd1c29efa52393db8e7116
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/dev-util/cvise/cvise-2.4.0.ebuild b/dev-util/cvise/cvise-2.4.0.ebuild
new file mode 100644
index 000000000000..1b9a8e8963b6
--- /dev/null
+++ b/dev-util/cvise/cvise-2.4.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+: ${CMAKE_MAKEFILE_GENERATOR=ninja}
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm python-single-r1
+
+DESCRIPTION="Super-parallel Python port of the C-Reduce"
+HOMEPAGE="https://github.com/marxin/cvise/"
+SRC_URI="
+	https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+LLVM_MAX_SLOT=13
+DEPEND="
+	|| (
+		sys-devel/clang:13
+		sys-devel/clang:12
+		sys-devel/clang:11
+		sys-devel/clang:10
+	)
+	<sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):="
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	')
+	dev-util/unifdef
+	sys-devel/flex"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/flex
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pebble[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)"
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	llvm_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-n auto::' -e 's:--flake8::' setup.cfg || die
+	cmake_src_prepare
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	epytest
+}
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 7ca76598b127..8864e1f57501 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -5,6 +5,6 @@ DIST devhelp-40.0.tar.xz 318076 BLAKE2B 05345f422e0ec906855c139306020165277daefe
 DIST devhelp-40.1.tar.xz 318172 BLAKE2B 83f71b66538b700790961e3dd3c7c7a75199f499a1fb32eb01e62fd5d11e72ae4e860bcfab2615bd4d417d5c57b89dad7eb2f1de4930e39e544d42b57a193b97 SHA512 4c541db9a2222dce4064f401c1d0a9f3233e2dbab17206358dfcce360286f69698248d08172fb236a692b125d8cd3a5bb76b6377b01b52c3d096fa4528400acd
 DIST devhelp-41.2.tar.xz 1455736 BLAKE2B c531af6cded6c9624581e4d14fb4d7713afbdcf173ec2a82e49789af1752568790dc346cc0293eddc68c0943fec4f742de726953de34441771711a938ba858fa SHA512 99a75ff19bf1b4613c312921452f190334e3e2036c28cda070169e3d1d352a5d2e7a56a393326efd679076257412e281dc94b628429119fcad58060d1a88ea98
 EBUILD devhelp-40.0.ebuild 1781 BLAKE2B ed190ff0984a757e3a3cfcbc7d9ac3fbd5eb97d516bbfa1c21931f91334364148fdb76bb436af362f1424a0981861497946fa77a1871db735a8bdc5ede77b52a SHA512 fe83470f41a3530c4ef091a63cd0de81cb8b9536a6f3f702427867e099e76a32ba977e4287e77647331fa1e30518990bd7a47496f87ef1d9d8d8f4692f166bef
-EBUILD devhelp-40.1.ebuild 1782 BLAKE2B 38202c75264b5e6a4fed56f708be60cadb9360c4a3c6faaefeada22b6f16cde941b7c36a9c4788fa97c4ce94e7da9ca7d80b50dcecd01dddd765420a5ac6a5df SHA512 75a3b1a684f8439980e8ea4bd69ecd8f5c65dde227cc71d64ccbd281ce91c35c3f21f90e0f58df7a83aa03560f9a66fe16445908fb83523a7243d3c12468cd96
-EBUILD devhelp-41.2.ebuild 1949 BLAKE2B fd25bc35c116abf0e656848468a436692ff5a33699b4300bffa383fd04fc2b8aea2f13531d33f9fb00b4e8f80ae7c86eb80bd1f1c955cbb025e29248e9020278 SHA512 d417f767f6ea2c2a8fc96320ea165820a144608befaa0a5d7eaab969d5247b50e4c7db44ad8895a545d8865ae3e154da82bdfca54bb1f5d5345ce9e43f3673b0
+EBUILD devhelp-40.1.ebuild 1783 BLAKE2B f30fcb56ccdd27e2457cc772bb053d379a67b624ce192261bbe07e504f1a1f7f46cff15d60971fe6cb3102068f891ba5f256d4ced83bdbabf7c5c319a67d2c33 SHA512 1b1291e8ff363711ec70f7436f9bbab10d0b9a58f75563eb26e8b4586d398616bd7eb745e2d673a4af45b4ccaf60023bf4d13a2b63f3237cb37f2eaa73995320
+EBUILD devhelp-41.2.ebuild 1950 BLAKE2B 707e82f453d1959713c344f411d4b81898b30e1abc403658f5345911acfc66d15f3014f7fbdc0f06f6627bfc2b7e2338859306258f823577d7adad6cc10e19e1 SHA512 b93484e9b1002c34a219af0ff774340a3d932cddfbf3dafcf3fef81c3f53c7a070ad82234a48294fa2c01f19b178b177986678d801f0dc8662840fbec135b61d
 MISC metadata.xml 338 BLAKE2B 50e6d39aa8a020fad15ddf7fe529f56c440696730b7400135d5ce97694d15feb64a1bd02bb156b21faf7e6fb1772e10f5c90ddaf0cf62dd19bbe8cf8af8462fa SHA512 5a00a79928fadab11128ec6d73fa4f119c9a93b69ddc0ac4832d94a1d72b6e1eb1e5c128839281c4ec272b5fe6ec6608ef1b344d6a7f8b46ea59989bca5dc8a6
diff --git a/dev-util/devhelp/devhelp-40.1.ebuild b/dev-util/devhelp/devhelp-40.1.ebuild
index bc2c2139331c..777e0daeb1ba 100644
--- a/dev-util/devhelp/devhelp-40.1.ebuild
+++ b/dev-util/devhelp/devhelp-40.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
diff --git a/dev-util/devhelp/devhelp-41.2.ebuild b/dev-util/devhelp/devhelp-41.2.ebuild
index 4657f906fe7b..0d4bb96937b5 100644
--- a/dev-util/devhelp/devhelp-41.2.ebuild
+++ b/dev-util/devhelp/devhelp-41.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 54bc79af2971..4225fbc8927a 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,11 +1,7 @@
-DIST diffoscope-177.tar.gz 1590984 BLAKE2B 94daf9528c8fd0ad6ed89bdbee7b21352bf33dcef2ae7e526ea3b1036d92b6fecefcb0da46b7eedf7af1c8bd7995e73b8f0a5104c02f4db534f7bcc465c803aa SHA512 674a5cc364927437a79420b0965eb6958bd09df58a1238ea4d953bb2bc0fbdde75e42817370dd3cdab0bcc59551e1cff70db72298087af551d5dfaee57995811
 DIST diffoscope-180.tar.gz 1600542 BLAKE2B 0cc34106f039e0682b32de284b3ce1be90e8629fb4ba18cffa31d7c970a9d18392060f37b201d4ee9ab3f4f65401684c72edf2d00d56827cbaacbfde0ce81d11 SHA512 abf2c514b9f3b074a5b9a6e19f09a474a8ba58e00974a48ebd860cc31547204fb4690224cb752b4248a0674d979bd20c6d4c77ffb912f2b85499d48d90affeb4
-DIST diffoscope-184.tar.gz 2684969 BLAKE2B 8b7fd3e4e85f372f2c45cd1f9ed82d5c6c2771044535063398e23b94a069c73d4fbc89fe0fa7393ea188a107cd4912d189a3566cc0701b1f3253761480b40080 SHA512 ae4f1e929ada57706b8ed28b03be264fb65e6b1692da9e212bf60ac40a56fb5f488bb5dd162d3436e832ba245edd0a7383f794ce38541cb4295d10f2cc1de50e
-DIST diffoscope-185.tar.gz 2684950 BLAKE2B 53ae0ec8b3402811639de7a6ed3dd6b436c6a4d75ce2c415c66b28fd32ceb136766ee42711bca47578e5303be354c514e6f9d82843f11b266a05b77f1196fb13 SHA512 ce66cdb64c23434671e40f4c51ac6c9f1da524e92618792d2cd8e2e7fb044340e03c9438b3450cc2a66e2dc327a25850a421b32c0aad493781291645e65eb775
 DIST diffoscope-186.tar.gz 2685030 BLAKE2B b9fcb05fbdd939ece3727f232777c56119aa5df837699dcdc752a816bb656aa09c4cce99e225425e09d55914523a6456587bf232877fa22924c623f854016712 SHA512 13d42ba600cc9c5e716162a73f42d8453358f689f4148b138121e1f2190b1334a66a01fd0e227bc9e7190d3229c286be91d6ccbdd21c13694fc2edab8e5019cd
-EBUILD diffoscope-177-r1.ebuild 3325 BLAKE2B b11da425c3c3f5cbf6b6c654bc203c3d6bf56908e2dbdf35d9262a1e5b969655a62aab9aadf7501d6ffcf5c51a7c27a088dca858e81d6b041b72c52d53323da0 SHA512 137eee2580e2693c71fdc72c6cad6499c8be5bc5bb9c3eb302ae95578cbcd15b91a003357eca753392c69aa726797a8e550d7665811370b76fa54dc67bf3a55e
+DIST diffoscope-187.tar.gz 2699208 BLAKE2B 193eb0575814df7ee1d0a0e989a936782a52d4c8dc3e56d47db7ff5d631776559a604755e1d1be6687c1168ef7bb9d899f3b5ea8cab9506ef5b2da195485d7e0 SHA512 b3ba6743c9c4e0460f56a0830801f72e00bf7500c54dd9392e6e1de470a3b7348d900a8b9012f17b509abbc59575c7b9ee8e1048b3b23e5813a5ddabeadb1be4
 EBUILD diffoscope-180.ebuild 3300 BLAKE2B 772740c2ff3ace8fe0d25181eacd6b5dd6e5a10c19d450a95771cc1f7d93b8c4427d3d683d3a92a62db593a011d3788a9f8e14a782391352d06b689a7d7eb086 SHA512 c7a2f2a21037214cb024524966ac0e30fb21297e12ef93fa440a69d86a931f9f8272340e4861ec5cbbabc3b1178724299d5870cf9e2668161ddffd37bd217036
-EBUILD diffoscope-184.ebuild 3259 BLAKE2B c37f83432809a3f68eadd09f916a8f89602555600f2139f56bb0d20cee66b4823b4ab53b3b23d57423bab6ff07453eaaf99d70a4277f445b83f6e13a8a50caeb SHA512 d880e78e3dd9619cb8b1f614a1ed0163bef10489707468f5223e9c89517a18862a9f08c8dfb00ffd4fca170db492d1ae43448a26aaab72347b451dcb1ac172fc
-EBUILD diffoscope-185.ebuild 3259 BLAKE2B c37f83432809a3f68eadd09f916a8f89602555600f2139f56bb0d20cee66b4823b4ab53b3b23d57423bab6ff07453eaaf99d70a4277f445b83f6e13a8a50caeb SHA512 d880e78e3dd9619cb8b1f614a1ed0163bef10489707468f5223e9c89517a18862a9f08c8dfb00ffd4fca170db492d1ae43448a26aaab72347b451dcb1ac172fc
-EBUILD diffoscope-186.ebuild 3259 BLAKE2B c37f83432809a3f68eadd09f916a8f89602555600f2139f56bb0d20cee66b4823b4ab53b3b23d57423bab6ff07453eaaf99d70a4277f445b83f6e13a8a50caeb SHA512 d880e78e3dd9619cb8b1f614a1ed0163bef10489707468f5223e9c89517a18862a9f08c8dfb00ffd4fca170db492d1ae43448a26aaab72347b451dcb1ac172fc
+EBUILD diffoscope-186.ebuild 3257 BLAKE2B d555e26e75a60536d7f029202cfd37da1748a6a6c54c7413a2f6cfbead22073d15c4b121009e17f981ab714418dc1c48004ebb7f6124f640aff26e659345be13 SHA512 3a7755c5559b806d70e5c89e356ea2515ea517c22a7bfe5d681799b9445002bc22a3fc66b488db00210a7fc6c372776be95a8546757dc8453d00b9005d86ad27
+EBUILD diffoscope-187.ebuild 3259 BLAKE2B c37f83432809a3f68eadd09f916a8f89602555600f2139f56bb0d20cee66b4823b4ab53b3b23d57423bab6ff07453eaaf99d70a4277f445b83f6e13a8a50caeb SHA512 d880e78e3dd9619cb8b1f614a1ed0163bef10489707468f5223e9c89517a18862a9f08c8dfb00ffd4fca170db492d1ae43448a26aaab72347b451dcb1ac172fc
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-177-r1.ebuild b/dev-util/diffoscope/diffoscope-177-r1.ebuild
deleted file mode 100644
index 93a178abbdcc..000000000000
--- a/dev-util/diffoscope/diffoscope-177-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="ncurses"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-
-RESTRICT="!test? ( test )"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-text/docx2txt
-		media-libs/libcaca
-	)
-"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local exclude=(
-		# test seems to use different tarball
-		tests/test_presenters.py::test_text_proper_indentation
-
-		# needs triage
-		tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-
-		# needs triage
-		tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-
-		# img2txt based failures, bug #797688
-		tests/comparators/test_ico_image.py::test_diff
-		tests/comparators/test_ico_image.py::test_diff_meta
-		tests/comparators/test_ico_image.py::test_diff_meta2
-		tests/comparators/test_ico_image.py::test_has_visuals
-		tests/comparators/test_jpeg_image.py::test_diff
-		tests/comparators/test_jpeg_image.py::test_compare_non_existing
-		tests/comparators/test_jpeg_image.py::test_diff_meta
-		tests/comparators/test_jpeg_image.py::test_has_visuals
-
-		# docx2txt based falures, bug #797688
-		tests/comparators/test_docx.py::test_diff
-	)
-	epytest ${exclude[@]/#/--deselect }
-}
diff --git a/dev-util/diffoscope/diffoscope-185.ebuild b/dev-util/diffoscope/diffoscope-185.ebuild
deleted file mode 100644
index de3d809fe6a8..000000000000
--- a/dev-util/diffoscope/diffoscope-185.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-
-RESTRICT="!test? ( test )"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="test? (
-		app-text/docx2txt
-		media-libs/libcaca
-	)"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local exclude=(
-		# test seems to use different tarball
-		tests/test_presenters.py::test_text_proper_indentation
-
-		# needs triage
-		tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-
-		# needs triage
-		tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-
-		# img2txt based failures, bug #797688
-		tests/comparators/test_ico_image.py::test_diff
-		tests/comparators/test_ico_image.py::test_diff_meta
-		tests/comparators/test_ico_image.py::test_diff_meta2
-		tests/comparators/test_ico_image.py::test_has_visuals
-		tests/comparators/test_jpeg_image.py::test_diff
-		tests/comparators/test_jpeg_image.py::test_compare_non_existing
-		tests/comparators/test_jpeg_image.py::test_diff_meta
-		tests/comparators/test_jpeg_image.py::test_has_visuals
-
-		# docx2txt based falures, bug #797688
-		tests/comparators/test_docx.py::test_diff
-	)
-	epytest ${exclude[@]/#/--deselect }
-}
diff --git a/dev-util/diffoscope/diffoscope-186.ebuild b/dev-util/diffoscope/diffoscope-186.ebuild
index de3d809fe6a8..268a539b1b50 100644
--- a/dev-util/diffoscope/diffoscope-186.ebuild
+++ b/dev-util/diffoscope/diffoscope-186.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
diff --git a/dev-util/diffoscope/diffoscope-184.ebuild b/dev-util/diffoscope/diffoscope-187.ebuild
index de3d809fe6a8..de3d809fe6a8 100644
--- a/dev-util/diffoscope/diffoscope-184.ebuild
+++ b/dev-util/diffoscope/diffoscope-187.ebuild
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 1882dc55c700..15fe588159ff 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,8 +1,8 @@
 DIST geany-1.36.tar.bz2 4644521 BLAKE2B 80eeceee31a49e9728a358904ad40e353d3407a22492340e6aa9a82091d32fa004f4494d3ae027732174e7cf7f6fae620b511680e06e58c5b71dd259125900c4 SHA512 15005772b64e8321d7fa8552363df425eb25e9d7b0760c561c8fb3f34d7acae2bf25da8e04fda38a2a1b64cc31ff613b7ff2786d432ff014050c138c7473c810
 DIST geany-1.37.1.tar.bz2 4689173 BLAKE2B fe17674294e314204b490d0586bc360229a95348236f48a9d25bb49b0d1face415a11e60925501f22018ad047061521258d90af55d8d250499bbf6a09b02028a SHA512 9dafaa540ba4d37ae66f3cc1c4d9670aa8ea30e74e960f0ad010dcbcd1647d1dc2eea4ae7454f589fc6ec0ded0da2de98d85fecc92d8d1ff36cd62d3255a47f4
-DIST geany-1.37.tar.bz2 4689385 BLAKE2B b726fffc18cc780fb399472a93a1787ec06ec47caf5dfe9a89f88e5939f071bdb90f337c7dbb9f8681c8383a89fa9d4a8c42d9361771a3e8bb7103cab4629f21 SHA512 ffaa906eaa6198d24e91e21dafc4acc0811c8d90f714a36f646d70aa9f4eee7c53c29a063c39db41857de3c7729282ca7f88419ddc6b67b73ac35e91a376ea62
+DIST geany-1.38.tar.bz2 4860717 BLAKE2B 3dda3a7454f96be18de95f8dfeb7a6ee2627ffe370879fa3ee7aee851e21fa46076de6b9741b6e83af94b66afa245a0f69237db4582858bc40f819d8a3c78e6e SHA512 5aff0643d0d9e667d0fb526e9c8426cb80c89decf92110683086c2a7a18e0d3d55ab514fdd68aa0c4431c98ae0c4685607b49c620525184c89e21b26fca06699
 EBUILD geany-1.36.ebuild 1661 BLAKE2B 050200ef740ec521ea5992702753d2effe2fdca33d8aa623390c9c2abb795fa3859da43c61da6c3a866adbad8fa8b03771036ee67d1ed7d59ef87e3bcbb0a9b4 SHA512 d2fdc3157b4ee473685caef1160041c2ca52b96bee490ec206710809f9047dc21fac4da83c7e4d3b82c1b1c09871f68469f9f4b10c78437d6a7fbf7e820dcdcd
 EBUILD geany-1.37.1.ebuild 1680 BLAKE2B 565a642939279f39f7ac3894da598afc08c0ec4c68535664f52c7625be8197638d2158f683617d034d32d6ba06bcaa79fff5e770bbe05df7d2c49faa1a87b30f SHA512 a44a768db04b6f1e2f94eaf6e6fc7e9391330ea85bf18741a34efff72c823f5a180d49afe92e040cc7116ecb2c3b773d902fa853fad33cf16c98584cfc5c55a9
-EBUILD geany-1.37.ebuild 1685 BLAKE2B 4fa377b259bd92628a91a0a96f7f915f506822115829defa51a7145bba1e15855077b257c51c5527f7a230841169b927212bbdb036a170d643002d2159f58cb7 SHA512 a7265449b86ff353577ae281192e2011da648d049a742ca7bfff742255f6d11a33610eb4cdc1a18c05b78d574977b4139dcf2e716681406369a2b7c5284e98ab
-EBUILD geany-9999.ebuild 1685 BLAKE2B 4fa377b259bd92628a91a0a96f7f915f506822115829defa51a7145bba1e15855077b257c51c5527f7a230841169b927212bbdb036a170d643002d2159f58cb7 SHA512 a7265449b86ff353577ae281192e2011da648d049a742ca7bfff742255f6d11a33610eb4cdc1a18c05b78d574977b4139dcf2e716681406369a2b7c5284e98ab
+EBUILD geany-1.38.ebuild 1610 BLAKE2B 6abc84159775826a0e5b6ee85986fbae208b2c0a83ad3c5f711a92681b716713873f7564abb2dd4fcc929ab337e15a0a5bb9d75bd323986b38261d26aa765a6a SHA512 2d9eb564a87d1a7d797cc8f0ad580c9c4e0db548d0d30599313896628dc694e671aa6bab1189d98e4e260443890f3f7ec3dd4cfecf0238920495e01c09d8595f
+EBUILD geany-9999.ebuild 1610 BLAKE2B 6abc84159775826a0e5b6ee85986fbae208b2c0a83ad3c5f711a92681b716713873f7564abb2dd4fcc929ab337e15a0a5bb9d75bd323986b38261d26aa765a6a SHA512 2d9eb564a87d1a7d797cc8f0ad580c9c4e0db548d0d30599313896628dc694e671aa6bab1189d98e4e260443890f3f7ec3dd4cfecf0238920495e01c09d8595f
 MISC metadata.xml 2033 BLAKE2B 1e4e6b279c25d089da60902117b40cf6aa937c7d24c90ab4cdcc2c9c1b3b3fa053fb6545ec558c41e1f824fd1b18497f4d2aa020f7e39ffa3bbdba77a8403bea SHA512 2787bfde6a370fd7bf22267e6e0442b8045d4a9bb36b7c8145dc318ab0cacf1dd18d22169aff202f8371efdc9b9d8e273a12e74c1e230f2a126165df3df318c6
diff --git a/dev-util/geany/geany-1.37.ebuild b/dev-util/geany/geany-1.37.ebuild
deleted file mode 100644
index 9a342036c796..000000000000
--- a/dev-util/geany/geany-1.37.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit strip-linguas xdg
-
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko ku lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
-NOSHORTLANGS="en_GB zh_CN zh_TW"
-
-DESCRIPTION="GTK+ based fast and lightweight IDE"
-HOMEPAGE="https://www.geany.org"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/geany/geany.git"
-else
-	[[ "${PV}" == *_pre* ]] && inherit autotools
-	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-2+ HPND"
-SLOT="0"
-
-IUSE="gtk2 +vte"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND=">=dev-libs/glib-2.32:2
-	gtk2? (
-		>=x11-libs/gtk+-2.24:2
-		vte? ( x11-libs/vte:0 )
-	)
-	!gtk2? (
-		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.91 )
-	)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	strip-linguas ${LANGS}
-}
-
-src_prepare() {
-	xdg_src_prepare #588570
-
-	# Syntax highlighting for Portage
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		data/filetype_extensions.conf || die
-
-	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-html-docs
-		--disable-pdf-docs
-		--disable-static
-		$(use_enable gtk2)
-		$(use_enable vte)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/dev-util/geany/geany-1.38.ebuild b/dev-util/geany/geany-1.38.ebuild
new file mode 100644
index 000000000000..067b8c015b22
--- /dev/null
+++ b/dev-util/geany/geany-1.38.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit strip-linguas xdg
+
+LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko ku lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
+NOSHORTLANGS="en_GB zh_CN zh_TW"
+
+DESCRIPTION="GTK+ based fast and lightweight IDE"
+HOMEPAGE="https://www.geany.org"
+if [[ "${PV}" = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/geany/geany.git"
+else
+	[[ "${PV}" == *_pre* ]] && inherit autotools
+	SRC_URI="https://download.geany.org/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2+ HPND"
+SLOT="0"
+
+IUSE="+vte"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.0:3
+	vte? ( x11-libs/vte:2.91 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+pkg_setup() {
+	strip-linguas ${LANGS}
+}
+
+src_prepare() {
+	xdg_environment_reset #588570
+	default
+
+	# Syntax highlighting for Portage
+	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
+		data/filetype_extensions.conf || die
+
+	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-html-docs
+		--disable-pdf-docs
+		--disable-static
+		$(use_enable vte)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/dev-util/geany/geany-9999.ebuild b/dev-util/geany/geany-9999.ebuild
index 9a342036c796..067b8c015b22 100644
--- a/dev-util/geany/geany-9999.ebuild
+++ b/dev-util/geany/geany-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit strip-linguas xdg
 
@@ -21,28 +21,27 @@ fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
 
-IUSE="gtk2 +vte"
+IUSE="+vte"
 
 BDEPEND="virtual/pkgconfig"
-RDEPEND=">=dev-libs/glib-2.32:2
-	gtk2? (
-		>=x11-libs/gtk+-2.24:2
-		vte? ( x11-libs/vte:0 )
-	)
-	!gtk2? (
-		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.91 )
-	)"
-DEPEND="${RDEPEND}
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.0:3
+	vte? ( x11-libs/vte:2.91 )
+"
+DEPEND="
+	${RDEPEND}
 	dev-util/intltool
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 
 pkg_setup() {
 	strip-linguas ${LANGS}
 }
 
 src_prepare() {
-	xdg_src_prepare #588570
+	xdg_environment_reset #588570
+	default
 
 	# Syntax highlighting for Portage
 	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
@@ -58,7 +57,6 @@ src_configure() {
 		--disable-html-docs
 		--disable-pdf-docs
 		--disable-static
-		$(use_enable gtk2)
 		$(use_enable vte)
 	)
 	econf "${myeconfargs[@]}"
@@ -66,7 +64,7 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
 }
 
 pkg_preinst() {
diff --git a/dev-util/gertty/Manifest b/dev-util/gertty/Manifest
index f32d3654f686..06860052483d 100644
--- a/dev-util/gertty/Manifest
+++ b/dev-util/gertty/Manifest
@@ -1,4 +1,4 @@
 DIST gertty-1.6.0.tar.gz 122570 BLAKE2B 8c3628f9b0b56aaff30f183a1ab0d852b8ee487927833f41b8aa61f94f8d14eaf3a8d515d5edcb3fa7dd18ca36f42a977d12790c52d6c629a720b4f29252b030 SHA512 0fe5224f5b4b06910bba0d19453ea0f273f6ea0688b9aa092e11f929b71801581f6d7cead1d64c00912ee3363b98d4b36e903fa992a7ce36f190a4f3c09375d2
-EBUILD gertty-1.6.0-r1.ebuild 1194 BLAKE2B 2007c18861cedf2305d6466a0986126b976b5418594a0176de59568e948135534786c9500fa823d1927c3198471f008638b8a21b82987e049b594ea5462de695 SHA512 4cbacba7b64e5b9bc244db6442a5ed2468bf69b826f6b97310d79f382cb7056afc50b0219d511fcbd65c5b314535027dc7844e37c73536d5cc4fa702ae64482b
-EBUILD gertty-9999.ebuild 1196 BLAKE2B 2fe895aa51ba1b53964b658ca56ffc14371cc2b201be878edb2d57c69457b2c2511eb1d4cb6c0654516a1f4feb02cd9a688da30835cca7670f214de991599d55 SHA512 14b94e68963f502cd95518337e3c5e732235477fcc128b85dccaf7d5e4be99bc94d4e40614797a7a316bbf8be039c0d8517fbd6dd27ee50ded40288921e7b74d
+EBUILD gertty-1.6.0-r1.ebuild 1171 BLAKE2B 23a996decd0b1a67181f17a1d567502307a9f6471de3a3198a1de5f8b94e74d2ecb84e3ec2fa3b58cf05fb03deca75ab158bfb8c53b04cdf95017cdc45ca7ec0 SHA512 0094bb6953b31f412a428506a5c2ae3e4a8c15001d0b8e6a6a81480d9deb85b61bf8b9bd518c4c1ed0d9b0f52693a373bcfb2c0ea65d3c3dca9cc9b29919d6b5
+EBUILD gertty-9999.ebuild 1173 BLAKE2B 326c8bfdf898602c515fc6dae94c75fbb4c261658b924738b71ff57db4f2a639a169f3e460c784375ceb32912415f00dcfc5664ef08869cedb877caf56585e88 SHA512 9e0270ed3cfca4dc48e74c6265f8a8fa32d35909c15f8cc917a5470afda5a70ae43fdbb253c6ba8623053c71cecde7de184d7a4deb0bcc4e033e45bfa2a32af5
 MISC metadata.xml 380 BLAKE2B ad29f16ddaf80c092a0ade8008f0234b4c2d61b0676e3eb8ffff7055f0da28a3065de464c912b6345a94e0c189452f7826f70a924ca198a4eed8caa0c0b1dbc9 SHA512 30c0a68fffbedf4900a00bab11299c45dd65994b7e77bfa83ab7dd75f2bc0056b63e63ff2632d30b8c7bffbd4427c8a9b59ebaad3c854e1d4bdac48ffe6b330e
diff --git a/dev-util/gertty/gertty-1.6.0-r1.ebuild b/dev-util/gertty/gertty-1.6.0-r1.ebuild
index 420946d2f2c2..1c7c40458d66 100644
--- a/dev-util/gertty/gertty-1.6.0-r1.ebuild
+++ b/dev-util/gertty/gertty-1.6.0-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
 
 inherit distutils-r1
 
diff --git a/dev-util/gertty/gertty-9999.ebuild b/dev-util/gertty/gertty-9999.ebuild
index 3b0c0eca20ca..31488d532f1c 100644
--- a/dev-util/gertty/gertty-9999.ebuild
+++ b/dev-util/gertty/gertty-9999.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
 
 inherit distutils-r1
 
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index bb360100d87b..3682247dd994 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-builder-3.40.2.tar.xz 12083992 BLAKE2B 136c3e89378221116b5252a8472768888f11bd580cf9d1d524504f9000b8123ee479e19073630bb678cc7392b716e45d122b406dc7d44b13ba0ba77b435077e0 SHA512 e0d1f0f21fe0f681f87d1ad672cb5bf60df3ef16541fffd8ca62d447339371bdb5cbc10d8fc83496822d6eb35ad8078b095ff97d950d940d862d6fd7968147a4
-EBUILD gnome-builder-3.40.2.ebuild 7004 BLAKE2B a7fb002294915dd0e303621d8fbbbcf122ea9d67fa48da7cca056f53fccf128f8017dd635c41b0544edd3faf8824be5c1a4d7308c1d0ff3916fc48a99b026491 SHA512 2c873efe3f77f3df3ecc5f7958c2cb80f78bb0209a00a03775c6fab858823aa48fc61214ed262286991acffd18959bf7cb083d2d8068c02d655dfea97d011f48
+EBUILD gnome-builder-3.40.2.ebuild 7005 BLAKE2B 06a4fa62ad0417098178938189e193d178b9fff05857f8285c5b2417865b5152f9ec7b915695e5fab752f111a667d14906ef7b0ad982ab2fe61cd429c6ae5aeb SHA512 05d00f5e523f823c1bd51279496dc7487661edc45c2870b0325a0a726a47e905a76eb7e35c8eaf308bd89d07625834e5b7f52beae4dec943eefaeb4287a1475d
 MISC metadata.xml 977 BLAKE2B 444873b91381ec812c993369814d74adacd2ea85deecf99a41b428959196b29f65957c4edf5f1204ef129ae4029c24a5db1a82a9ee30fb75997ab9ed148afb00 SHA512 cb6f84f250b28e7fc5cd4543b996db5eab18cce0e73fe9fdb85354e8c354facc43e8e25a54f9c48259103b24323c05ad8d2495686e1f6f07a4cc56b2dbe63220
diff --git a/dev-util/gnome-builder/gnome-builder-3.40.2.ebuild b/dev-util/gnome-builder/gnome-builder-3.40.2.ebuild
index 13087e7d6c33..69885d53160f 100644
--- a/dev-util/gnome-builder/gnome-builder-3.40.2.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.40.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISABLE_AUTOFORMATTING=1
 FORCE_PRINT_ELOG=1
 
diff --git a/dev-util/gprof2dot/Manifest b/dev-util/gprof2dot/Manifest
index a4e3fb7f88c5..61cdce77eb17 100644
--- a/dev-util/gprof2dot/Manifest
+++ b/dev-util/gprof2dot/Manifest
@@ -1,5 +1,6 @@
 DIST gprof2dot-2019.11.30.tar.gz 31388 BLAKE2B 1781f59e5daa8315d3fd9defb6e28290272c4ddca01312e9af4acac494f3c7b29a437e3411b0bbb218f2eedbb2acf83d4dfa9c1d47f20b2eedc0fd607f1e4a02 SHA512 06fa8feed23e21d7827bbac19c887f65b9ca6a0cfd5b54c4da373ca33ecf0f11835b961dd1c2237ac2bf9764a8122d3ed9c7f9981c127a14ae74a733fc1275b1
 DIST gprof2dot-2021.2.21.tar.gz 31709 BLAKE2B 49cba606603e3951adad3c1d8f7741750ef958d5df02df5d8a1aeff2ff7407d2fd9eab9628d58244aa20799bf04c9d0e8bafb380d96de1d6b20a3aa54ad3c211 SHA512 e95a5a00d2cfbf31e260e29c22e85aec03d8aea32ed9b05613dd0a33f296df61745a78d1f7311b514a7798f0774e96ad829cf3495ab0c1bdbed61a9bf31975fe
 EBUILD gprof2dot-2019.11.30.ebuild 503 BLAKE2B 7a58899fa9bb90e695f00c841dc049369ad7c7d57a434c2d4f5150a13e43a014101a72f41b7e5181e8720d8d0c0b231e90cbc973235e67903017663d1d2db58a SHA512 11039a3c5dea078cb1ab84012a5b613b944b9989423925d470f695a1367666a82348034686daa020c1ea2be353c7bae503fa57e875ecd9d0008c70bde680f980
+EBUILD gprof2dot-2021.02.21-r1.ebuild 471 BLAKE2B b9dcaf06998f12f29ba3239ebb5852f90fb61efb3ffc48f6b8f6f296b86289f95618d7c30f12da43d13ad5c7f3ae0ae24c80b4be6209cc7b6d305b35f1100dd5 SHA512 b1a92ad7183c75725f9aec7a7f918c57fff9c175842234a03a1d9c41fcc20f1d9831c6f94406f3f924ba0282f3021b252ea9fbb874a4305c2329219d8b1ac1c4
 EBUILD gprof2dot-2021.02.21.ebuild 503 BLAKE2B 620b91d76d9fbfe50b9fc1dd5630831676174bfa6d8e22d1de834c10121d51dee8fbe0d083c664a508c2b77bb64bec215ca084fa09e15ce6a80ee50b05bf7eb3 SHA512 8c5c7f5706f50e747393b06fbfbbb1c528881575c87ae3d8e7ac4d0bda6acf12ef1b3026ee1329c3ff74d2e834e8f558c4db224cf5c39f3b0172498b7ee9f7a7
 MISC metadata.xml 334 BLAKE2B ff8e238ea00e5fb439ba67694e07856c153933bbe5bdf784eaae06057e0cf8e3a559f94a97555ccbcb542c6c6b574f6185436f95e2e967b418c8c4c431f498f4 SHA512 c39ee4bccc93b7d4ad6b18cf7ad637a262c5aef5accd616c5c0cd331e447741151d56f30293a4d16963491d9b609983e9f832c0376e40157fa9065a8ba7f776b
diff --git a/dev-util/gprof2dot/gprof2dot-2021.02.21-r1.ebuild b/dev-util/gprof2dot/gprof2dot-2021.02.21-r1.ebuild
new file mode 100644
index 000000000000..877e56b88b78
--- /dev/null
+++ b/dev-util/gprof2dot/gprof2dot-2021.02.21-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE='xml'
+
+inherit distutils-r1
+
+MY_PV=${PV//.0/.}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="Converts profiling output to dot graphs"
+HOMEPAGE="https://github.com/jrfonseca/gprof2dot"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_P}
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 3ca3cfec9da0..fd51c5632e0a 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,5 +1,5 @@
 AUX idea-community-jdk.patch 379 BLAKE2B ac892a7e52d5c592b193d80a7933529f15e21982feb4c4a4b5c8286c7479a342a0121e5b464922cac68e9b7c8e3f7a4293df42d30e6907365116e736d9c862b6 SHA512 f984855440d2d4b495d8bf1b1c3172c9842c096e8fda148d8b2d1980bc3d03061954db06f73513998e52bc161c35abdcec2b88e3b31b4e36605714cb85a66fa4
-DIST ideaIC-2.2.212.5284.40.tar.gz 666837939 BLAKE2B e109534f0b5d7d81659c11c27b8c70bdbb9dfd0a1443c3e0ade9e472a833913d2368613b5e98797dbbc81ae905af769b6dc7ece95600abc6d799fc4fe4df8531 SHA512 f064d96c5ee9f2f75771b1cf24de09c3fa7113cc25434fbe5542d9cfae9918fd9e310f3d177a2dc886315855d99879576967f4e08d57c9fcf4a1e7b85474cce4
-DIST jbr-11_0_11-linux-x64-b1504.12.tar.gz 294383766 BLAKE2B e34675acc196352ece761906ad4d3dbf4ead00f0e008f9da6cc27ee057384ed418ac914e521d3db1e61ab7d62e9187674aa188da447957124276e3ace7f2f37c SHA512 3e0e464090af6f3ddb9e7b0f3711a950488b3e9b98c13761d92de2b8e29850208fa389589316300606887ff943511f8efe6bff0d6b478ce8c548984b811b1968
-EBUILD idea-community-2021.2.2.212.5284.40.ebuild 4272 BLAKE2B 3e3c5055f1c6667c8ebd690c02cf488e4921b41066034f05b9536e515b29d310476dd70bfbf5834bf7a26ce509a50236c2e197366a042ed1b9a0a098804bfa44 SHA512 28aa54601b0b351b038a42c45d427010f7c324642fa9b6ddc64895f368c456b61fac209b9184829e13ca69128ad86d1273eed1021194ceb84d29959f572558fc
+DIST ideaIC-2.3.212.5457.46.tar.gz 667318583 BLAKE2B 95b6961ef620947a3c9466eee14dce7532d1286e0e489019b460c51ac2c42c09aeb7e90c5c12dac9ee3cf054cf4d00952d6eb4094c5caadd6d531a38a6ca86ad SHA512 172ac71064f4db1cf0983620477d9a86ce1a5652eb5af498c9177cff8b2f0c4fa3318a901c31a1b19c262efe7564982f6057880d8bb4696424d05ac3cebb11b6
+DIST jbr-11_0_11-linux-x64-b1504.5.tar.gz 294397271 BLAKE2B a6c5ef54fc859bf1effb6759704924fb93b2d56f42cac4a56b2ff9f1f29f847448f46dac3215a277e4c272dcfab65edc21b8ed92d9b32290a0360a1586ac0868 SHA512 918a856d26fc3197ba1cc813c05cde119e7fbe8fbbd79e740e759e3b1af01e568032491dad2420f41f3c221c63b04ed3366b6acea2cc33d0e70aff947a1a0462
+EBUILD idea-community-2021.2.3.212.5457.46.ebuild 4234 BLAKE2B 4f7539698113d842129b514ee5e07ee870a2c35a427ea655b0562b38a3e5bd7428e1827d49e166fc9151be6f7c67f60874f984ce7bd8ef5f6845eecaf94ee525 SHA512 6fa2aec203fe5b7e21fd469ef0dd9f3260d5a4ec58b78bbd1652cb584e417aec4dc8d079fe59583b6c3bc1e9c9c58e04a8ecb0c180d01c11be889c5823162263
 MISC metadata.xml 454 BLAKE2B 297cfd8c543bf216cd45b66b5284f310659422e91f12af3d0bbe2ff689d94c96988d4c125c75a95526135b2c0f54a004ee43e1c1c4dfe4d1d68e86af5f75ab0d SHA512 5ca382bcbc51ea5400cbaeb067bccfcb4a245e208a2769d800cbd80fc7151310f895d410e5828c9a32223ab93345716ba4a2ebce521092631a4b7c0858519ef2
diff --git a/dev-util/idea-community/idea-community-2021.2.2.212.5284.40.ebuild b/dev-util/idea-community/idea-community-2021.2.2.212.5284.40.ebuild
deleted file mode 100644
index 64e642093054..000000000000
--- a/dev-util/idea-community/idea-community-2021.2.2.212.5284.40.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-3)"
-
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# ( jre 11.0.10 build 1304.4  )
-JRE11_BASE="11_0_11"
-JRE11_VER="1504.12"
-IDEA_VER="2.28899775.2679204.1629809316-850001349.1629809316"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz?_ga=${IDEA_VER}"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~arm64"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz?_ga=${IDEA_VER} -> ${MY_PN}IC-${PV_STRING}.tar.gz
-		amd64? ( https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
-	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
-	GPL-2 GPL-2-with-classpath-exception ISC
-	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
-	MPL-1.0 MPL-1.1 OFL ZLIB"
-
-DEPEND="
-	|| (
-		>=dev-java/openjdk-11.0.11_p9-r1:11
-		>=dev-java/openjdk-bin-11.0.11_p9-r1:11
-	)"
-RDEPEND="${DEPEND}
-	dev-java/jansi-native
-	dev-libs/libdbusmenu
-	media-libs/harfbuzz
-	=dev-util/lldb-10*"
-
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-jdk.patch"
-)
-
-src_unpack() {
-	default_src_unpack
-	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-}
-
-src_prepare() {
-
-	default_src_prepare
-
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-
-	rm -vf ${PLUGIN_DIR}/libavplugin*
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
-	rm -vf "${S}"/bin/libdbm64*
-	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
-
-	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
-		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
-		do
-			if [[ -f "$file" ]]; then
-			  patchelf --set-rpath '$ORIGIN' $file || die
-			fi
-		done
-	fi
-
-	patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
-	if use arm64; then
-		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
-	else
-		rm -vf "${S}"/lib/pty4j-native/linux/{aarch64,arm,x86}/libpty.so
-		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/x86-64/libpty.so || die "Unable to patch libpty for libc"
-	fi
-
-	sed -i \
-		-e "\$a\\\\" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
-		-e "\$a# package manager. See bug #704494" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
-
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier}
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	if [[ -d ${JRE_DIR} ]]; then
-		for jrebin in $JRE_BINARIES; do
-			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-		done
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-
-	# remove bundled harfbuzz
-	rm -f "${D}"/lib/libharfbuzz.so || die
-}
diff --git a/dev-util/idea-community/idea-community-2021.2.3.212.5457.46.ebuild b/dev-util/idea-community/idea-community-2021.2.3.212.5457.46.ebuild
new file mode 100644
index 000000000000..36309d5c05c1
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2021.2.3.212.5457.46.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-3)"
+
+MY_PN="idea"
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# ( jre 11.0.10 build 1304.4  )
+JRE11_BASE="11_0_11"
+JRE11_VER="1504.5"
+IDEA_VER="2.157861308.704681908.1634561297-1608238442.1631355834"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz?_ga=${IDEA_VER}"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~arm64"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz?_ga=${IDEA_VER} -> ${MY_PN}IC-${PV_STRING}.tar.gz
+		amd64? ( https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
+	GPL-2 GPL-2-with-classpath-exception ISC
+	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+	MPL-1.0 MPL-1.1 OFL ZLIB"
+
+DEPEND="
+	|| (
+		>=dev-java/openjdk-11.0.11_p9-r1:11
+		>=dev-java/openjdk-bin-11.0.11_p9-r1:11
+	)"
+RDEPEND="${DEPEND}
+	dev-java/jansi-native
+	dev-libs/libdbusmenu
+	media-libs/harfbuzz"
+
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-jdk.patch"
+)
+
+src_unpack() {
+	default_src_unpack
+	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+}
+
+src_prepare() {
+
+	default_src_prepare
+
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+
+	# rm LLDBFrontEnd after licensing questions with Gentoo License Team
+	rm -vf "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend
+	rm -vf ${PLUGIN_DIR}/libavplugin*
+	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+	rm -vf "${S}"/bin/libdbm64*
+	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
+
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+		do
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
+		done
+	fi
+
+	if use arm64; then
+		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
+	else
+		rm -vf "${S}"/lib/pty4j-native/linux/{aarch64,arm,x86}/libpty.so
+		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/x86-64/libpty.so || die "Unable to patch libpty for libc"
+	fi
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
+
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier}
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	if [[ -d ${JRE_DIR} ]]; then
+		for jrebin in $JRE_BINARIES; do
+			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+		done
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+
+	# remove bundled harfbuzz
+	rm -f "${D}"/lib/libharfbuzz.so || die
+}
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 9fa5afc8ece9..e45839c3b300 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -5,11 +5,9 @@ AUX intel-graphics-compiler-1.0.8365-cmake-project.patch 774 BLAKE2B 7b117f1acec
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
 AUX intel-graphics-compiler-1.0.8517-fix-missing-limits.patch 661 BLAKE2B bcfdbe8442511cc6b0c6458da9728c64dc740c1e67673e2a8c29288b6f6c51b3d48ad9134e39e386aa6302333dcddf30a6dce3f6f20d476bd7a32041ed31d617 SHA512 a1ae9d3c4d8bbcb5977d150dbf1ba3686870d959d7cadfd0c487bd724ba02369e09c1efb8d8cd55179c37791500aecf889f7a4368e54ad1f89c538f56744ddaa
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-DIST intel-graphics-compiler-1.0.8365.tar.gz 7509633 BLAKE2B ffe18d18b409db36bd24215d841daaa36d5055d61b9021e385fe9178351b6a92383839e271a12d1e5017150b9697060fe37f803c5153d2f107813aeb2e7a74cf SHA512 6597afbab2c101d69e6a991b5b065ebbded7ccc6227c0ed82b6b0bd33fec26489c30a0a7a9558617578a767ca6d7382a6ab36144f4c64df742c6bd545ce991e9
 DIST intel-graphics-compiler-1.0.8517.tar.gz 7539946 BLAKE2B 034d2e3dcfc25186e29eebfabffbca7b8a5adab1f766c7515b4a3206c9c52eca3dd766e17320ea0c40067385fc6235d92eec13f1d12909915b86fb42a7862825 SHA512 35f09d1f6b117e78814cc235d03b1f1164f11a2d2a5d188b6658677c4b759422048764e765f7690f4789dc8b8c068714a68642c2d956ccc84b387a959f9af07f
 DIST intel-graphics-compiler-1.0.8708.tar.gz 7574517 BLAKE2B 578b29a103d3d0b7f481971a801fa11bc14430b7ecd00c99492f5d80ce713b84d00d278726a425edf5884ac15f4877c96a39a3f3f3f1c22bc972db039be28dc2 SHA512 3685c2fe0750d860facd7f378a1de4ac21127e7720d7a8889ac0ae8ab9e58dfacfc50b5bbe37d5744c9a17958b057512871125b58784a8c62ddffc2997f80ba8
 DIST intel-graphics-compiler-1.0.8744.tar.gz 7586378 BLAKE2B 0f20f99a2659f733521af35c1dd63c2b1398bf4fc5745a217b96ad62cfa53f105d4c9a34eba09651d0f0679d6957820011446f5657170f5ad07d110372b8b1f3 SHA512 dbbe6c08f32b80be305add570187df883aacefbf90b252c70b5705ecc7732f25873732a85558f0aed2ee8db5bcd1a59aec4d7ba110774922dbb19d4d3522a539
-EBUILD intel-graphics-compiler-1.0.8365-r1.ebuild 2166 BLAKE2B 61d3f255586dd52ac42e75da5e5f68183418d95483c40ce13207d227735d84e2959c556dc9518a02a47aeb9247fe6137cc7ce266412a9eb809b2bae04e42775f SHA512 c5ab29f8188144402d97405e4ae114e8851fe94a0431a73c6e8ce1b6f0e4c323b9f1b444ff7ada65a82f50ca99c4f70664daec8cdc626cf7fb3dfd370031d50a
 EBUILD intel-graphics-compiler-1.0.8517-r1.ebuild 2318 BLAKE2B aba7063f8d157c725b96e0ba9b70a477b118b6dafc38297b504441ada084c47b5cde1b257e22d17544305117b240f692a90001c19087ed5b7f41ec2563b399f7 SHA512 1c4379d581c748b8f33f7cb0c2800207d5ad9ca078758d4df9dabd49cb4347ef5764a2ab4ea2647950cc214a4078f82084a41923934945c2687a11a8fbaa368b
 EBUILD intel-graphics-compiler-1.0.8708.ebuild 2151 BLAKE2B da55de9cac3423aebbd2351da31b893e0dc88c66db6cd55d2b7e0910436ee61e602903f793933103f6b8b1020e6d751dc2fd3ac2c701b115c8a983adbbdd1d2f SHA512 eddacd9ca77a9327b01b160c8e7d15201707e027f237f99d8fb1382d9e81764cbde555ec7a36eb822eb013f351f1367ddf775521ffada6ba412de35b8551f5e7
 EBUILD intel-graphics-compiler-1.0.8744.ebuild 2151 BLAKE2B da55de9cac3423aebbd2351da31b893e0dc88c66db6cd55d2b7e0910436ee61e602903f793933103f6b8b1020e6d751dc2fd3ac2c701b115c8a983adbbdd1d2f SHA512 eddacd9ca77a9327b01b160c8e7d15201707e027f237f99d8fb1382d9e81764cbde555ec7a36eb822eb013f351f1367ddf775521ffada6ba412de35b8551f5e7
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild
deleted file mode 100644
index 768df3bdabce..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8365-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="10"
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake flag-o-matic llvm python-any-r1
-
-DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug"
-
-DEPEND="
-	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
-	sys-devel/llvm:${LLVM_MAX_SLOT}=
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=sys-devel/lld-${LLVM_MAX_SLOT}
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
-	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
-	"${FILESDIR}/${PN}-1.0.8173-fix-missing-limits.patch"
-	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
-	"${FILESDIR}/${PN}-1.0.8365-cmake-project.patch"
-	"${FILESDIR}/${PN}-1.0.8365-cmake-minimum-version.patch"
-)
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# Since late March 2020 cmake.eclass does not set -DNDEBUG any more,
-	# and the way IGC uses this definition causes problems for some users.
-	# See bug #718824 for more information.
-	! use debug && append-cppflags -DNDEBUG
-
-	local mycmakeargs=(
-		# Those options are ensuring, that we are using
-		# the system LLVM with the correct slot.
-		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
-		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
-		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
-		-DIGC_OPTION__CLANG_MODE="Prebuilds"
-		-DIGC_OPTION__LLD_MODE="Prebuilds"
-		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
-		-DIGC_OPTION__LLVM_MODE="Prebuilds"
-		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${LLVM_MAX_SLOT}"
-
-		# VectorCompiler needs work, as at the moment upstream
-		# only supports building vc-intrinsics in place.
-		-DIGC_BUILD__VC_ENABLED="NO"
-
-		# This will suspress some CMake warnings,
-		# which cannot be fixed at the moment.
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 6d35af61dafa..6f752dd29fa1 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -9,6 +9,6 @@ AUX kbuild-0.1.9998_pre20120806-qa.patch 292 BLAKE2B 628ee52d1c147864dba48e37ae2
 DIST kbuild-0.1.9998.3407-src.tar.xz 2351596 BLAKE2B ed562a739831c465ba66b2c357b1ab52cb072e61fa597d96d9e66e1b57a7f790c7e37fc82ef7ff49114b0cb4cb623e558d96864e98ca36bd42fe16e58e863dc7 SHA512 0a1fddff595f7ccfdb65a1a660c82860f132796b42149b8b40808d0df489312dcd96402236150c8ec5ec32c1cc142ce7af1150e10fdb83bf798e4d690dd64314
 DIST kbuild-0.1.9998.3499-src.tar.xz 2371580 BLAKE2B 847c5c67ded37ca87228ff7164d6c7f2f670a57f2fd94d6d0bf4f8896266e7fe5442666c03dbda016564a52dc91d10be83f0d4b0ef5093db0f5210ac8d5f3aaa SHA512 eebdcd1d2fa71313edd764d45a4aa3580078af22d7c5fed32d3d139a4f41c4e028282fdfdda0ee9b617ed0e8e63b8f5d065b3cf6647f08fe446560938b7577fc
 EBUILD kbuild-0.1.9998.3407.ebuild 1780 BLAKE2B 52b4b1e13d6049fddc6e11edcbb3d881ba8abb1af48dfa6853331b5eec5a0d346d435f0a3e4e6ea747d1a27fcf6df190bbdfb950b12845c7192fbddd0fae6f16 SHA512 59976d3b48a2b65c2ac1d9e28e4a216bc641b1b0a6b64c0107ea864a57a95dee41d813cc5433e626b9223cee92151e7c361fee37bd7420fc20f03c7a74f49c8b
-EBUILD kbuild-0.1.9998.3499.ebuild 1861 BLAKE2B eb486e38f6aba3fc8ba7720dcb61e5cc57dff157b9fdf6a667e42e4f4fe91d2b6f50913fee503e06b806ef74dc1b41b2ff957b2f42f4de57b94e7c8f8a433c08 SHA512 e1169d7823d609b56bcfdfffcb6afbac8dea6211a63d480b42b8eff886ad389365392f742823b5da93392f8d2af2c1e5175ea4200104ebec0039945da055db2e
-EBUILD kbuild-9999.ebuild 1879 BLAKE2B 6bf91d0a78367e10cac290e72c3311a47b5ff4b6d147f231aa8e27ecfc7b507e12782dcf57a8824751abbc73de64709ebda1d250a4927c757886801c605c13de SHA512 beee49f9b3528eb2e69af67736b7ff6a3f1608517ce4821d3c0d2dede2df774206d892c6ae70c149eac718de4c6dec98d2d9228af1a9a55ad0ed616aaf1763bd
+EBUILD kbuild-0.1.9998.3499.ebuild 2482 BLAKE2B 2fe292cb15b169c1d96d8bd56293c88b946d0c147816acac41c4baabb3234320a261464b0e1ebef89d6176b82526fd90bea0fa67de36b83eafd183fc329dc5bd SHA512 4eab16d45ee87d399c26a9a8825acb192e1c43e01b8a3d68298db86c3dc576e0c0e40e4fc3456c442b0a032dd444b68c8240925beeab9fcc00f59475a129bcc2
+EBUILD kbuild-9999.ebuild 2496 BLAKE2B 6f281f51a26449a6e7996e735d7a6ef542bdac79706b003a1ec7326b18e34b9b55f648c755656704bbd22628086b41c6c4e5812cf7b0a7a9610e5935356e2059 SHA512 91470baceec88b442caa17802c1728ed14de9986f224706c780686387f2d6d2ed586216a6822e6957e5e752f1e853e7622ac980d19fffc82ffce02dcdd1fb84d
 MISC metadata.xml 252 BLAKE2B 5dd8d0c83d6c9c396753f4e6674725483e0c7a005b4c529d3bd1fba5de36cee7f2b33e53aec48aa75f35ec663173677c2c964fb73f7f954b20631cc9c59533ca SHA512 afee4a606f4b70f265eb14178037c0459e32ddd98378c6c2978b829e906f83dc3607385173bd8f84ad988d307f8e44e1320310c92c070c802a4ccba93a96ae18
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild
index 574abc5324a7..ef85feb53592 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild
@@ -65,7 +65,26 @@ src_prepare() {
 }
 
 src_compile() {
-	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
+	if [[ -z ${YACC} ]] ; then
+		# If the user hasn't picked one, let's prefer byacc > yacc > old bison for now.
+		# See bug #734354 - bison doesn't work here.
+		# We can remove this once Bison works again!
+		if has_version -b "dev-util/byacc" ; then
+			export YACC=byacc
+		elif has_version -b "dev-util/yacc" ; then
+			export YACC=yacc
+		elif has_version -b "<sys-devel/bison-3.7" ; then
+			export YACC=bison
+		else
+			die "This case shouldn't be possible; no suitable YACC impl installed."
+		fi
+
+		einfo "Chosen YACC=${YACC} for build..."
+	else
+		einfo "Chosen user-provided YACC=${YACC} for build..."
+	fi
+
+	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" YACC="${YACC}" \
 		|| die "bootstrap failed"
 }
 
diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild
index 92a4a2a25437..b4bfd88222e3 100644
--- a/dev-util/kbuild/kbuild-9999.ebuild
+++ b/dev-util/kbuild/kbuild-9999.ebuild
@@ -67,8 +67,26 @@ src_prepare() {
 }
 
 src_compile() {
-	kBuild/env.sh --full \
-		emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
+	if [[ -z ${YACC} ]] ; then
+		# If the user hasn't picked one, let's prefer byacc > yacc > old bison for now.
+		# See bug #734354 - bison doesn't work here.
+		# We can remove this once Bison works again!
+		if has_version -b "dev-util/byacc" ; then
+			export YACC=byacc
+		elif has_version -b "dev-util/yacc" ; then
+			export YACC=yacc
+		elif has_version -b "<sys-devel/bison-3.7" ; then
+			export YACC=bison
+		else
+			die "This case shouldn't be possible; no suitable YACC impl installed."
+		fi
+
+		einfo "Chosen YACC=${YACC} for build..."
+	else
+		einfo "Chosen user-provided YACC=${YACC} for build..."
+	fi
+
+	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" YACC="${YACC}" \
 		|| die "bootstrap failed"
 }
 
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index c71574c7fb6e..4152e49d245b 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -1,175 +1,181 @@
-DIST addr2line-0.15.1.crate 32936 BLAKE2B 5dc101a84434607a2432346440324b35e829fb7843d3a76a918516929867e6186ea004aed8b939d216822d29115a9f8f11b4e86844ca50ffa5598ad6c84a53ba SHA512 beb2c7683e350c98538cd7a83aa4aec86fb95bfd079ccdce27fae84f988a58f9e59ff5a2e3c431436f8ab033d53232732731da52f5d7fbb5d80f24fac2f76041
 DIST addr2line-0.15.2.crate 32966 BLAKE2B 471658962dc1ce9dbc44a6e44173114eea110c3ef5673d90d4e12935263ce99f7dcd9bf474e5e7d8d1bb458b914d1ab50ed3a55a17cfc3afc990d05c7a5c6d0f SHA512 9c36be4a476a54da90cff00ddc1621e827c995bacc04e3e382a6d22e724e6e03abc5228d24e13073c5cde63ffc2ed4f26a66c3814e8d183cc062ba6c6cb178d7
+DIST addr2line-0.16.0.crate 33440 BLAKE2B b59a006ba732935d408d0574799037ef0a424ad3c27b894fbd7a9c91664460972a8c464aaad4e9b82b94e4cc35ee9016490bd469fa21358e11e6d78126378038 SHA512 7ea8fffcdff7f8f25c0a588fe2ee652053988ab2e1d39ac740f5199d6e7d30beed0272403d04b86ec5de6ad5459698cdf28f8efd5caab7b6693102df7ec4889c
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aes-0.6.0.crate 86774 BLAKE2B e687f2839b53adc3ef990da8221705a462015aa0ea004a6e15dba7e7ecc008d9d13cad6222b03244dc48bd1717a442e7aa5aaab6e97bba1d3be28c1d914e464e SHA512 65349285e429f9b8815743d86b3ebdececd48ce556a08b6ec5ec89bf966bc9b187a7df4fbe1f3b25172db3aab219b23f8040c1160359868e9f71d67a767c90c9
 DIST aes-soft-0.6.4.crate 99980 BLAKE2B a4b3838e0348ed3d7468f9d0e19d8dd45071ec54d54d538943d5afabd3f88db139c459574e6694e7fa86e4d77eaa3f75c11e3a9376f45429848c91889530980b SHA512 620b38b2a6437caf393e84625beb27afdf448acb52d7adbc9cba1152ea385bdf05a68795eee0f48fd90b5edfc25fd9cc3d42a0f2593dfa2f90d4f4f9cc893ebe
 DIST aesni-0.10.0.crate 100248 BLAKE2B 2dba6f1004495a725acf171eeae5a6e393475323e8974eff2e4667194ac147dc3a52a9bed1b00cf7735d3671b6a2bd135cbb4dbde822d7c8c21af23692d3e71f SHA512 726e5213a81ea021d4be7c5220d952cb6f0cb0ecb6cc840b542e9f75539e37fc5d6378ad4f4d6a2bc7e7642ea07a18202ed32d3b6a212777bd7abca735c6707c
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST anyhow-1.0.40.crate 34534 BLAKE2B 79a3731153f8e3ace906b9a360521147fd055f7401a99ea2373501ade7e49ecdb280dd59b6a3b9b2f88e90857302e71f772c767e62cb702e32c8343fd4b0f741 SHA512 5efc7347a7fa72abce9a8b3b76649abb00d73c16c5125aa4b6faaa7040eb5138d7d9470b66c186825c9651272f5c359578503d0866ce7242ea7ca9dc05087165
 DIST anyhow-1.0.42.crate 34827 BLAKE2B adf276a869889819c78dc10cf9ceb310d57fc64dd00b603a16e7b6f111d446ca8ed43439c3f18f590c28c1e59a67cbe39fafb00c510d03b65eb8ba15a18d2b0d SHA512 7bbafa2fc5d78a6d8e68b44b104fd8d6a7882fc127b39e04c5a76240ee24ccf311004b754d93836d6daf1918be9c33fdb68a6baf55eab8f1e921b7aec3a35455
-DIST ascii-0.9.3.crate 28283 BLAKE2B fce32863fd75ef1badd496db55387f1abfce5eac7a7a61ea07e1475f555fcfaeb2726ca80e69577c4cd05c366f8c46842f064fd9325955eacb8ad38d0cee990e SHA512 ee8ad37b0a3db9524db22a9abe0c348e30364f108039bf761aea8e3eed07c08849924a0a287fb17c019e14b654d2c6db3848112047a1fa8db58247c9e138dca8
+DIST anyhow-1.0.44.crate 35067 BLAKE2B 19dd53abcbf5ade698f3bf5b1522fa8c1c55b777d91fd05f6c43a7a32691d00da756c7af9d991ebfc71b02fa4e8e2e257c78ce3e29f8c3034066ca43eea4c07d SHA512 d8ec44c64cf4b06121421c99157573b59e2078ab1aba7d949aad9ddd5ec4a1b585a07d0ca06807ed2349c6becaed1cba69f10f9affa2da25f749b615a70aa9ff
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST backtrace-0.3.59.crate 70925 BLAKE2B e518263adcbe0f352ae2b7032f231649b6259665403041f301dc7de208b4eaecdae63501e367ea28029a2854d6802ae833ded52e881c198879a71f27a8a746e1 SHA512 298ca370d46993d499a836c425c3fb5a9a4bdf2fccbb22a2f7fc174041d77cd6997abe5867da251a3e58fa1f06ecac8afa3c1bab436b290f785a8a7d8fb0056e
 DIST backtrace-0.3.60.crate 70983 BLAKE2B d47ad8fecb2a200e1d0e0cbad54df070186bddba33a6115aa2223db5ad0d458ec6608224d5f5311cfccc911f1cb35235dcee79a203480240e280ec89428559cb SHA512 f8b39daeff3ad26b2c66dd0712d177ee8ee2e1007377af9abec7e5197780aaee2d3a7e89ba311f4dc38185cf2a20e45e2ac4502e862e6d9aa6498493df522f46
+DIST backtrace-0.3.61.crate 74284 BLAKE2B 3e66726d5ed8130963a988dbb751828447073467bb6ab4bfa1c385d74f991b52a0f3ccf00823b74a48de3d043e6dfcb474644f7a81ea9cca7242b272cf715aca SHA512 209105f135720b54d584c7ccecdb16b49381cc7531c94b81ff7279a44752ee11075cd85960f86f809a22ecb3dac6728afa05903c1d355df3ad8abf4503eec861
 DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
 DIST block-modes-0.7.0.crate 13464 BLAKE2B 70b4b199607925e338b22e04d48fffa4591942c6d8321c684cd34ab4ca28e6ae16a75b36845867fe99fffc47af62ed5b27e5c17ee860e1b87fc5d3526f34a9df SHA512 255475599706befd36756100abe350520076aafc3eb069beb5a5daad4c017f3c547a9699e7152b935d09a59f9a8762e0b23e5e3eec5a09ee2377978d272232b6
 DIST block-padding-0.2.1.crate 7672 BLAKE2B 26f682717c908886fc54606950697a01e999c8d725e39cd5ca9148b089d5b32981daf717db21128b551287d5e818363db4c34123a8d8dfa3405f940eb284c01a SHA512 d0bad6ca76cd491446f17c00986aa8caab36a78b4ee4f881a14b316074a96940566ed90460aade765f2e7ce04b359cfe21f6c323200637f50e8b5adf567017af
-DIST bumpalo-3.6.1.crate 133836 BLAKE2B d67f19bd68e87c1c1360c77df2cd9b11e66f4db3ed5468463d266d2ce187006f2b2117f647a9c331838b8ce6c50519db2f9645fbce190ade2c10a0284b29fa06 SHA512 0d923bda2c98bae60d8ca09d63dc12b67c8fb5addd4a675e27b619bb41b36d3dfc0742696fb53e5fa538790814cf2401d15b110216daf49e5a2ce046bd540866
 DIST bumpalo-3.7.0.crate 134261 BLAKE2B 15c4944abc803537c57076dfa8f5fb4b59949909450edd9e043a6cd438ddd227820e20e95236324c06e40cb27ec1e4d958bebf3d38df90f0723b8e30df79b6ef SHA512 0b570e1baee530b5c3f775330ead7cf5f8878eab75e5a6a61b5d3f64d4d82912cb26de1c098ec9492c29c7a04fc49565db97a54373c546d8ef58aab276d77c59
+DIST bumpalo-3.7.1.crate 78573 BLAKE2B 2bd6c041a703033e0214746c087f3f505853596ff37b5abc04323b45721346c66f6b867387adb000b3cad80eec3661afb008f75d7cdd4e7328e730ed36e926c8 SHA512 879bc0993d8ac18cc7af87276aaf7aa042bdaca338c8cc766d5a1822c5675c1852b97467da0f6d5f4721213e3781a195e143b73d21e02ce11600e13e147e943b
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST bytes-1.0.1.crate 48142 BLAKE2B 3ffe07c5429d7d2df821c04325b8dc84b343c634b4699e9c08b07181e741c06233a0501d987b95f513be57ac169537bd0812defd118305e0648ef41f6802d19a SHA512 885d3229e51c0deffe06824e81e8a016e3244106e7ed382a721a938cd2e69fcad7f5e757f95cb07ee1be83de04fcf98f9774f8f2e07aaa9a1ff068eaabf2fe87
+DIST bytes-1.1.0.crate 49640 BLAKE2B b3140dd49dc222cd0405e405da9629038eb7d71dd4c22c8d6419ade041dc1118aa46df38f3426a36a44d8e5591c368ae32a89e71850dca7e810bbfff4441c37d SHA512 d34441ea146ccaf55da4d5c645f8ffbd008eeb3204dafd5961771abc85df52751dfd1af3975fb5c91eb83d9a43da4f3589bc3aa07c8d715906d8158f3092af2d
 DIST bytesize-1.0.1.crate 7629 BLAKE2B c1f969f809abf5ac432e8590158781c26d11448ff0590647f2d60ad62d416a9f93e8bf1d5a650a40cac21bda90310c02f323bcc4fd1e2ee122de1588aff29352 SHA512 99a11059c27ed3c0279acafff1c0fa27fb7e5021876d2ad3a79ff8f31030fdc8a1b5969063ec6578499412804564cd3cb325c9198196bd4a078225a47179f605
-DIST bzip2-0.3.3.crate 15346 BLAKE2B b3e5178400a2235f500c3f77ad538fa3c271e261cbb4a4128d89371fac0f117a12c6a84696cc8ae9462a9a1a8712ed5a2086c94af14ffc575e0ee1676fb2207a SHA512 f2a844655fbd9abc866e691b57ddad166f09a183b8bd33cc6ff5952fe7f11141b1843728c6ad23fdf88a181fd40a3599df3e716c5f004ef097af6b99162a55d2
+DIST bytesize-1.1.0.crate 9370 BLAKE2B 38fcddbdb862e82a076b7ae1339b48c776f704d25be78935d08637351ade725e86e00e07e62868e76a1a2db894f223e1f8309f8b362a46405ec6c06f6e421a96 SHA512 36f35cf53c468cf011b231d3fc5d00c5224fa3d917854e347daeaaae53ae7ee36c4d8ba26788460d56c922c9ffb0eeebc60655fef7366ae42e221950d03f6715
 DIST bzip2-0.4.3.crate 34195 BLAKE2B 946ff5824531de8b82241fa042638cd33e708c4b517fa40c99e49f77ac7fd7aabe614e4b560ed8f5484ef8fd06bf19041cb20b7a622f4f1dea9ba26c5b821c5e SHA512 2d4622c336f204ab28970ccb369ba55829bfea426bfe96f15da376f2375c441a9bfb03c46f5da210990f23115740250cc15e9036309034b39a1c960dca542da2
-DIST bzip2-sys-0.1.10+1.0.8.crate 633563 BLAKE2B cef12d8992e9b5b8c82d2aa0274bb9d755368fa584eb8d87259e4358f38ab02fa6e319a8cd64ed2a3079d691ba54d5f4b023834b9364df481b2cea32abef0d5a SHA512 1f730176812669fdd9fb79e36c03db2e6270f107fcc4f63f84cfc1084cb78a5c0ee3f0659397e5b42b626629a42c0da7805fb3f5311719e45422ec8b0745851b
 DIST bzip2-sys-0.1.11+1.0.8.crate 633444 BLAKE2B 01578c512443134fc786669bea4f2ec4b9c457b9936c907315299d8b67ed78045d458c83ccc119f0fad511529fb5af5feff5fa2d983fdae832d2fcc1b343e102 SHA512 d0a86b9f03acb1e4e309d5739dc2e88cab582757d467a433afe0017017f0e5d2c0282529e3a117160958ed170d8d695ecae739805888305df0e35e4dc440582b
 DIST camino-1.0.4.crate 29586 BLAKE2B a0f4591d5f68632cc23e9fbb0eef8cf37bcad4db1c80fde0f64df81b457e7bfedf961d32df849bca5b00997b2fdf4cb34b4ce8d9c5fa698071cbbc249e577bb6 SHA512 d095e5d35920647a2b03f8fa5a1a699bb25b2f2368c47a60457e65cfc87ca1a0447e574e0894f57bb2705148e1deb480893b3fd92ae7f2745ac6edcff6217ea6
+DIST camino-1.0.5.crate 29642 BLAKE2B c345be490622b50f3a744f9c42392d12e02e286d75e09f4eaa8a1c6f86cc849c5a752aa7cb5fb1f697ed8beb741c7d9cea951f4f5ce7049dcaf6de5ec69a60d7 SHA512 1131997ca090426a25daf3be2fcd6e559d980078dd71fbf3f16b4d593531a24c0f030aa6c9652080fdc02b5420da98991b9c93115ce1c0cad8c0fad4437b1d59
 DIST cargo-platform-0.1.1.crate 7409 BLAKE2B 503bc17f9cf08cecdc02371cfb69c70b0f61203153fee4ad4e5b8adb995e1f84e6a6cbb12565607fdb1606372b744fd3d4519f2605f05eb83078c1fc14d789a3 SHA512 b8758e002ac6c4c4440707a27cd747c90e2b128f51bc80464be93bf8677aaa26bec28cc1f730cfba639fb022bb030fae5c06c41773c5692bf3a12167d04f0d57
-DIST cargo_metadata-0.13.1.crate 16917 BLAKE2B da9f09bf8a0267ab3c6993a4802dc38f1b6de34b75d750f4472aa5b48106a327050221c10dd89453d02ad3020b0b9e4a3edef64e1c999ba7f07314fbb8435b46 SHA512 107e47e3f26fd129a13015b71b00e51029e76881b90a18c0a591a2b0c476f45ad33661392e64feb2a17159b5a9c5c6f986020d6aadef5148fbb9e575efe7beb5
+DIST cargo-platform-0.1.2.crate 11645 BLAKE2B 7770acb90e299f71c60bbadceaf894a3100916b7f7458f9c949b683b39157d3e1ec17d850f16dfb04017b01d7734d41872d48cf9f4e1ea7414439cd7031c2330 SHA512 c716bf3a4e0942160dbf7be114d1621e1fccc23511e7b0a2b99852b99a851910bfcf8640c2d0d0a03d5a324e1a59fb5d4264ca81bca24e3f1a1ca653bdf2956f
 DIST cargo_metadata-0.14.0.crate 17008 BLAKE2B 00fd6841170d5dae463a60daf442eb3033d616ab171dfb7efc201596196571b06df83f6ab23e88397c77baf3135745bc3ac6051557ebad2c3ea96440f00e1d2b SHA512 d33f691d56df56bdea260363cd29864b17f0326b90b4b9688781c37d3eba4437b93b48e6448dc1d012a8542d7d2495f0acb73322340269db9cc4a4aa955f9605
 DIST cbindgen-0.19.0.crate 181286 BLAKE2B e09931704cfe0f0f777e67c66fdfd08820e8185a7ad475521eca2d6819d1d0a92791d5cd5dfb2b2199e911da9e8a92dfa09ec20d2912f1073d456f7932944438 SHA512 dc31896c75d43fa7efb6256b861b7d4a51b9b0e4dc605bcaf769b32cba2dc0b7a5c49b01f0ff48ada08488ad8c020c3bbb645d6796046caf0bd7d9eaae25a962
-DIST cc-1.0.67.crate 53486 BLAKE2B 42fd02a5886df50857075c909819c8afcf091cee6b7bc517848786f287f4559e70a07f0a0f42a742baa2665465dfdb2139ecac7e93f1a41b16eab30556eb0259 SHA512 f1ad4abdaad2667b190d1f8df8515f603107be1f69bdbdc02b5159764a6ed18b3f672d6b06af50c7f2fd3e6e3dad5df0fcd0dda762d909ba0922c769f1efbe05
+DIST cbindgen-0.20.0.crate 183277 BLAKE2B 51529b21879e3a3212fbb951b3bdd5c8c396dce53e9dbe568bfe1e752caf3060bc784909cb4b37a6e6e80d357d5a8e2bab8d10d4470563358407bceb814bb7fc SHA512 83c2b0da580f0a2fc9a74922f3c44d0e73ce0d1de8b5a3f5819c7fcf1c481df1ff0346e84c5b4c199a9364542c85fb81ece4e1deca3a6f12231a4478f76a7c02
 DIST cc-1.0.68.crate 55936 BLAKE2B 9bbbeda78b8c3aca487e770cddbe11bf4686424bd33d023ad66e1fbdfc8dcbc17fd85c15905e0edbed8745202c01aea13d4f03a7f8f655e5806da152565419aa SHA512 faca9aa91488808f920f1d88422cc8a69790aa6dbd7bd2cc5d08a579d248faafd0fd675e8499e56aef6715398c278db1fa2079511d211d41aa65741de5d5ac8c
+DIST cc-1.0.71.crate 57452 BLAKE2B e49f68bb602b0649ee3c4e7b22b7a49eebc4501a1105961ad361f00718de1f2f2f998cd93b9984d8d50d4418a86348fbabbb3bcefd7d0fa3acf812f32cf654c8 SHA512 c3c94bdba52f97ccc18ef6f71b0c70e30d89ea981541bdaf19758b765732ab572161534fe944d3ec6a9d5aa72e21583245554be86251c9ba236cc7d1aed19383
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST charset-0.1.2.crate 14490 BLAKE2B 78e776003334cb5a7c8980b8f6f5563b0eb3da8b9c039106347b6ce47f9f0147647c7c643acc18ba3fd9b2a7c897974e2433cfeb3725b5287362ad73ed80a7f1 SHA512 8a740dbd4f7088653addb6fa4293a7d62b8f6a9f727413e2ee46289179b36d6c18ad48b1f3d548f9c153166e16937d9c60b79fcb0ecb5412a635bc6fad11b54a
-DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST cipher-0.2.5.crate 13099 BLAKE2B a728a53007340dcc55da52cc170e5b801c8ad20c4e159d31200d5ab7f8bf4407af9a60713b4385ef0d65c06cc81692cfbd7339cb7449367d1eaf7c529ca34373 SHA512 e55627f5424d9b566dfb0787eebb1fb17ae98b4016c9091e87040ed37b36e0256b7681958a0d90aaf06c125c71123270bf986128ca1e0dc125f3162a868848b9
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
-DIST combine-3.8.1.crate 103773 BLAKE2B c8ecccda28eb7253e14ef112707166f14892fec858941adb302a866eb0495878d091592c770307948fc040fe459a525af643db9798a601aaa331ca7959ebadd9 SHA512 12cf00c23fa6ce6a73d562214456799a9aa98eaf2defe9e4884dc729cdaca26efe2965ada3390892940644e6cae4644363a65ff5aca1bf1a1a684cfd4a8d7f60
-DIST configparser-2.0.1.crate 17742 BLAKE2B d90e04ef3579cf6ce6e0863c4c116c3d6402dbdafca4f9730614f08fdb563024e8625bff7a0e9bf4c0314e12be230c0a619994a4e22f22bb127713d2261db057 SHA512 272850e6a87860da6ff1cd95983cfb41f042148f3b6fa9d66da471e4210f7db986c6a0e8adcc1bfdeeceaf826988d0ef91324902e23c8e4de0ff5f0e4e9cd95b
 DIST configparser-2.1.0.crate 20039 BLAKE2B 708fb01160097215d3cbd449bb89f8ecb8dab09dc4b675ab410e8e636ffb96f7623bfc7e8c55621915652140e2ae4379dcfad61efaf7386c8d9f0ed99de13c4c SHA512 af459b2a3c228ebff981b1b6a158ab84af44a2037b499abc45c43234ba1014c826407a6212a9c36fc6a7acb6bf6407cfcbf52b72a35176cf7dfec94d0515fd6a
 DIST core-foundation-0.7.0.crate 25384 BLAKE2B fde852b7673cc972da8d2f8663c2c8372fda36fd577d19c9536f9df929f649ccf94150e1e23a57013bee3cd8cbb6fb894c4fb3a5744171bc6be607cb27e2757e SHA512 919041f431e21783193c0661b82cbd15946a56e24e5100a6a9dc02476ddc714595fb0416ae182981ebf6a8b27181e3178135c27388b41ec848423d739a265da6
 DIST core-foundation-sys-0.7.0.crate 17033 BLAKE2B 26d190931c7462ed8c13de82e86d4417e0d130f97295c8435ec666be08c7bdc37894ef25647043970fa40eae1c63503d2ad7660c2ac17ef35d7d35698652e18b SHA512 b77566aed2b572bdbce6f71ca9dcc942ef96b628a7ed9680c4d3e3ada4a9dce90c1b439a8c7c7f22d68e51becf1d22b3262e227cafdf8cfe5f42db0ffb9dadc7
-DIST cpufeatures-0.1.4.crate 10129 BLAKE2B a497cb23661b52c8627ec7a794a6ded37277ecc6aa3a405258e712cca4194811645947368ac5db4e22360f52a98205d9420de2288879635e5269e3de3aa684ea SHA512 8d6fbdf934359f4fa5f65df30801fef2ef1d011107884060b542a8f521c86ad3ce808f39bd78e971794a888d53df8dc045efc00e208df8c26ccaa9d951e5570c
 DIST cpufeatures-0.1.5.crate 10419 BLAKE2B 77e0eb2c8b1b638b9812ebb3a1ac5c48b9c2f7690fa9ef7a9c14a49a880958c2a39afc00e981115078bec98725e4f76eb338465935017958caf5922f3f124933 SHA512 700c31a677867df05c69ab098575c66d4d9f2de077431f938c1e0036492e00e876e6c563b705e22cc82c937fa01049b42d577c9b4c84ede4fee774ac30362478
+DIST cpufeatures-0.2.1.crate 10500 BLAKE2B 92e676cd9a8901cdb344340dc7cd7b6d66114a15bd72cdaf600283c79c2339fc8f89b57ac38808141037ea45ae32628e9485cb825c7bcc25abd94c41b6549407 SHA512 0db2486beb0f287b2b4f8543f0f02c4e6d00f66e65c9785a1ecd2868c460553f016b33426c24d0b0ade1417906f5853cfbdeed98ad85cfb73b4f7ad3af85a613
 DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
 DIST crypto-mac-0.10.0.crate 9476 BLAKE2B c9d2507012f3e88cc6a8933db4b879f90a93f8cc16a573436a200a386c67434fd8e33b1cd6aed1298a50681de554b7b3f9ffbbaf46d411ecd3323a12218c0bcf SHA512 8b406db46a08f64d899eb26597fac99576b3fa892eb83bbe089eeef7e6452f43dd138232ed4fe75cdbac2966f94b71f92910c14c53b39e5501990a9976ed1b59
+DIST crypto-mac-0.10.1.crate 9531 BLAKE2B 6a26505762d8d466275fe7674de1c4f95686b7a5fe107442361c892ba3123213e3f7cfb8d5516219e84c44496ef342ab534ebca724732e509d33fb9300027ef4 SHA512 39b7d966ef2df4f01a6b6f43838ec30c9df4a51106ee42d8d349f2d826722834ad5f7875bf68d7359799015d53ed45942d71a10f701fd080e264b21a89879dfe
 DIST ctor-0.1.19.crate 9307 BLAKE2B e1f4a431956afab00475f42c59a05a0004a87440ff6f97713c8ae3af99b621124f47447d0c9504eb7f69a60ea056b5ee449ec331609a6fa6e278b9eab799b953 SHA512 3e0cae34b23bea47935ce5a2df3004c0e77eb08e94978cf23586e6cb839168c67a4ba1d732bf0ecab8264dad60829886ae0946fd3b8355cf03a4b7462f7dc76d
 DIST ctor-0.1.20.crate 9328 BLAKE2B bc2f4ce53f6b7d6a2fb441317a3f91b8852c541261f95f0b7d12adb35ec1c943810242ce71e514445479c5d225b735cd50fa4dfb514e6b121be753555ab3c30c SHA512 877f4663f8079a368d198a3351e98551c6d8123dd5e53b812529b77b09f1c08296e6df817d7429e4c70a73a6203fd98bce5ec2ce7b09baabe4f348bd54a9c0dd
 DIST dbus-0.2.3.crate 36325 BLAKE2B 8ab6cf46f4e139a91ce7e4068362a150f4041ce7a2db4db604203d65a122bba7d0311b430bf569555b48258017603b0540754868c0babbde867bfc4a90c7d9a1 SHA512 31398900fd3b388c02eaec0eed568add3c26ab862f04c391598709ff35d851cc8833b6332864973096257f27f8d405b617beb83cb5c2090900bb8061119e4c1d
-DIST derivative-2.2.0.crate 48076 BLAKE2B 56d27e27493c3b818ad45703efda607a0a0d9a48b0d43785b6a013443b8b964b67bb5b5284d242358415c5fb81b86b02079ee7c0595ec07bc658240eb114b887 SHA512 3c65ecdabd2dc202be3d83b06f96b6f68504fe542ede7e2285093c6d360a33ec76a3787c436c6e5ff8f59d430436a4b8ce2f908cf7b2b08cd8b0045de4e5d1da
 DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
 DIST dirs-3.0.2.crate 12184 BLAKE2B 414fa4734fd9e108dbc887210e71c8be9834c1764ca35af66781a8108af9fc704f4e7d420ffbb2adeb2a14ca5658e53cb5da4b486e093b3de010c542f7ce7c7a SHA512 97dc343d580ecda68aebe87bcbe8c13a00078943771e3f1dc3101d8d450d2ccdd0d74283870eac1d88255a99e887166d42533ba8e70d15b9cdaddb57e3a27c55
+DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b
 DIST dirs-sys-0.3.6.crate 10626 BLAKE2B 6da8e4a1e51a4e06ab742ce5eb75155ff9b7cbe83f06947a0bfcda711ae1e0dbe51f9a1e1733ba771f2daddb2b8b14e343b9615608c1d9a8fb927b033c161b15 SHA512 79b6bfda14aafa3839365496e1b1926f763d3569e4e138a59f4acae15c38ec9a3bdcaa64293b03b536141c897c2bf68a67d7ae5670d86215080aa313e53d39e5
-DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST encoding_rs-0.8.28.crate 1368577 BLAKE2B bc10eff55063286b48590c3100841c7319268cf17e10176aec7adb39f3d2106e80e25d8ca68e5b4e568083be75d596eaff53807385c4e8d1b59d4aed7ed08ca0 SHA512 8b3f7450789e33f1ad9306d152f1bd230e66c7e799de52046acd5b11f903e8c86cbe2f0aa2cfb0f0e60bd64b194250defe05ef2a171b707e129a2324de47a9b0
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
-DIST fat-macho-0.4.3.crate 19126 BLAKE2B e4f70c15f8c01bd405c7bde898e8ae74fa66edb68e7bc83bbe6e793619ee436e7605ef99fd47e8b96e1cf3a5bb4e134d5df59723287ef32b0322e1b8a0acdc4b SHA512 ffc7a015cfbd72aab00f907537e401afd29938429fc5622f848ca679c0bec75d1232527f2407f8f84fa0ca0cd9881b14924cd20474de90c472249b5ab921b05f
 DIST fat-macho-0.4.4.crate 19004 BLAKE2B b367700a9fca6f0772cced25691a63d7f8be1cd89dcf7aa41e3f1567365a3469eec50898cd89b8006c448c9c1ebe19190f34613d4c7a2cea37ffc198066946a2 SHA512 7f0438439b09455832cc3d2a00399cd1c4e7abb4330a712b4d8e1fb44b4fa41e08cac59e7539ab987eb608af1a2fcaaf2d818c82ebf997634c0c0dfe7e8cb942
 DIST filetime-0.2.14.crate 14358 BLAKE2B 7d50e71b5a556bc24a6bcf737ec07f185c6d6a2ba2717d91aaba71ec15d1981c47dd6010e5a4278f8996e05bd49d04f3481f0b9e3156a8ad1da1cf39a84796d6 SHA512 f2e6e41b8b705c510e1f1932451ab8a0acc6a4f84a7a21880c7e69639a6aace7c5ed4f694ebf47d04ae6ff227f8d6c6733f2c4bcb953088531dd91b37262e45b
+DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
 DIST flate2-1.0.20.crate 74036 BLAKE2B c5a1270debdb42f8612c0db9b684d339dfb668dfa3b06f6dcef94b43c115daee99c3558562d605da5ba1a554930030083baa8128036e9999d47907f29687ee0e SHA512 1415cba53183b7ae0f3396859186b92001060a78fbee10dd0dd4c8a93119aeb78bd8d782735c292badc1ae6d369badc6fa1a0105835614a6f70e82b080d8549b
+DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 DIST fs-err-2.6.0.crate 14311 BLAKE2B a637cab75430655a1bec0145a0a8ca30413daec111ab7f11a78424dd147f098060c510ea6b9dc82fe4c72969c1635291f1de18f7d6de54194af6cad388f96042 SHA512 ce8234b9b12990bf5d322c537f1bc1dfe2927dc9cd6797eb009a42ffde1379e8194a0320e75ef032deefcbafbea79510982c5ae4c668ad8f8d5a87caba5d16e0
 DIST futures-channel-0.3.15.crate 31867 BLAKE2B 4dfffcba38e26f7805b55e09413e114976e205507f21454eda084ac975034183ca1083f4d9df624bf17c05d98d1e3a84e0b6cfbb99521792d56cd2e1d3dce997 SHA512 d612c1425286eaa1a713e073edfae8ab8fb4e0b7c82ffdade57bc5dd06c54de6de46119b1cd87d7686cd4efbec38228c4a82d250ac693daa39dcfbf365b7ad25
+DIST futures-channel-0.3.17.crate 31765 BLAKE2B a1055de0a6b8812546442acd8acf8251168015b5f6be7bb7e223b7c61841a1a15ec1fbca3e4d40e0a552d5c3fc89ed2306a29c9ef33b1665f828ab9c8c0aa142 SHA512 884fed34839c9f73551a90fdbcdc542f88623c0d74d506febd6fb0308429e0d7df879f378b6d0bc818ce8c948da495a9dc210ca55331f4760273d51f627cc416
 DIST futures-core-0.3.15.crate 14514 BLAKE2B c24ac1060c981887896b73ddaf85007a8a56c4fe03c6ea731d3e8389294bc7d97cc478d8ba7ff5d0e7a2cb17f54d1c7b2bbb2a2a0646c44fe1f5bff670495cea SHA512 e8c6710882e7328493e7975fecc360f2071ae39d1ea88a04a38e4228c48f9af4c545c6aead868d13689cfe33f4c98c5b5bff2f9cfdb0105368b11ab2d652efb4
+DIST futures-core-0.3.17.crate 14478 BLAKE2B bad5d1fccef7e823d52eff0db7522545c6dcc6ba94bc0cad33c013b6abe624ebc6c8ddc6a6f5a4ede5982e175eeac48113ef929cc6633a22a18bbbd4cb1cb114 SHA512 6f290620b5051a3f3a317acade5a077f502fa3ab7fdb230b6ecd4d007c63685bf343ddcb8b8d1170b5ebeb94fbf1c495dab36918490b14885361d6e53c45bf22
 DIST futures-io-0.3.15.crate 9058 BLAKE2B ab496ea8852ac74edf96f7c91bf074739bf3972d22c2dfa1ba3138244910e39098c99994679b0f4211ed9e49542523bce2caf7bbe972da6a550dd6169a69df50 SHA512 9e8787d8066636351de2958169d6ad21d02a3b871cb242dd4fef64b97dcfc14397740107f13d1e48c27640b768fada821fb433187b5d0f0a03e7555d15eb5917
+DIST futures-io-0.3.17.crate 9050 BLAKE2B 729fd0c2bbf5a665640fe9e8dbb9d803474cbbf4385188d1cd906f526a2b75cecfe55f75aeb0a491057af319a19fb0117420af75425375af41622c8c68567cc4 SHA512 a2b65e07bfea15b78e988c5a9d330ef51a396cd22475f171b342cc8a6520749335af851ae11d44c91f54ab06f425b0dbfb716a959c625d3c52db5765d0407e0d
 DIST futures-macro-0.3.15.crate 10872 BLAKE2B 82cc8ee228b31fff8d4663c4a3ca02cf67a77f53730f20e4d153614ef3bfca5fb3be81cc25b233a75ab4630887c19ef52f3f5751844f1199377ce59aa426b4be SHA512 68aaf9a5f53d93a24ed080021ecc07de04f88443829e244e4926fdfb440cf9a57f0853b3b071ce7444a755463a34140e0368a8f8b185bdd031915d01c843ef17
+DIST futures-macro-0.3.17.crate 11830 BLAKE2B bca68c3c1ddca764ff86d36667c3da3805b8aa730b300f97d5e77dfc695d33484b4b8ee7d3b415479852e02a126c14f092ee9724d3d91a8793bc91a165dd5381 SHA512 518969498808bcb63cc797934ed7d699f776588dd7fc9f9c41c63874a05d03781b5c0241ce20cfffc8db569f01fc82da433b7ea7772f24dfc2df5eca35b5146a
 DIST futures-sink-0.3.15.crate 7672 BLAKE2B 10386b796da43d3c2c18a53ce0e0f0db862ebc45f71bf277e2e0912d2fbe04ffe8411ac1f0f4b530fbcd1e37258df46640db7e68d84c5fe8863508ae530eeff4 SHA512 319a8367c2ad4f9410a3eba4a345ab2d49a896d9b9b2ef2a888918ff0289491283afd17a29e618eb4e064b7c76008e28d5b16f00e888fd5a506b65d5b79a2dc7
+DIST futures-sink-0.3.17.crate 7663 BLAKE2B 598e864fb6f2f34cd72c67e5ced93d0e54d2e508319ba191a2779377d9565799226783b2009190cd6eea63c75562e209a526c724ea8616d22a1c7b4ae543ddd7 SHA512 39996fd6bf1fb5ebb0dbd5c0d18f9a34f21e65dfe998237c2e047d836a380ebfb9a2fea05a2c11e447e9a27dff0bffe4a9762e83df2f17aa90a717fc98ba5803
 DIST futures-task-0.3.15.crate 11811 BLAKE2B 65c6fbbc9f3b2f39765550f673d5e21eb455521db8b9251645b173fdd898bde9ba69f8efa8597e1ffb051e7c8f2749f2141affa5a5c64c92604992410aaba199 SHA512 66529a849c924ac08603f5ade52954bbcfc3e1796f20dd49eb0289d2ad9cab34e31f07e942736b635d6c1903dba299a7d9a36defbd4902c019ca382c4a376040
+DIST futures-task-0.3.17.crate 11712 BLAKE2B ca42fc54c3a3795e59b423fbd1235b10b4ae1903256fa61e80dc9318f35fb59fbc15ca8a3be3fed67e17809ed2d5f594f939d3f51d0d718b0dff5be069200361 SHA512 2f12d8d9d404f147b601ddc6fb9b6869e2e68a4bc55cd3851cb9f7aa8ebe6519c5cd0fa14da92e564d2003ded2ac2202f5e09e1a83e81129d1600d01ecf86844
 DIST futures-util-0.3.15.crate 141962 BLAKE2B f31ef9a97f05807c995aa73d181050a0ab6af4369058f548c9a6ea6f7e055ecfd5e3c6efadccea2c3d39982cda280ca6a6b7f9a404e8c6bf19df64206598b851 SHA512 a89ffe93d277a93e9c825cdeccfe50dd797d9de6360a1ba44748a46bff6238261e60c9eea9659a0c7e13294973c0976595b20b0740c36c1f9204144102e204ca
+DIST futures-util-0.3.17.crate 147679 BLAKE2B e29d07117a7285fc52a390821299f55da901573a5d3df6a1845b852488f98b359ef35de0aa3fe05e613dc662247318cf3df5aebcb00149012c6a3ff24c171a57 SHA512 6a87b0510c3f8214ce14b7f333d212558647c523b5eb7da36dfe4f694e0ca4be3cbf97fdd7bfff5e0c7015644742d74d6184221482d644653a106d5564722fba
 DIST generic-array-0.14.4.crate 28916 BLAKE2B 41adcb738bb316d17967e029a829dcf7377427977309b010c2f2e365f16306b44991eb5f65698782497f614b129b14cad11bfeba2ae19b45efd117114492517e SHA512 34ac71fee2cd50ff786d39b4abacd9e090a8598baf4dc36ba5fecfb7171cd8e4f58e5360cbb0baf02a87eea26b7dca85b35555b82bbefe06635d2fd38f7b8b40
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST ghost-0.1.2.crate 12777 BLAKE2B 34293c1ec8412ef207627ca2a041f2dd8822c2d8990df8e0f17ffdfc865a1662991a80680c484ddef505758578177d358c2e56003003a2cb685f07a41d6a9feb SHA512 4258fdfab59946a4955f053cf0b73f964d5bdf25ac9357ef8f4cb21948299fb749bf0c0e89a9c1e95a8606e74c6b3a3630fb4f6316815d83882a9531e3b78b5a
 DIST gimli-0.24.0.crate 703534 BLAKE2B a0103b03d3ab369f3dad8d8aee3e36dd8db402b700c5b5b6ecec568e8579dba8f5d9c09c21381ec9de51988d9121873cbdb66f8e1fae7d8643ea1ca73f4ae1b3 SHA512 b4d088b25f177975a1a301b742e38acab5151f510771c4c276d9cfbb27b3c1421c4bc09ad789ecc64a9764ef95ea50c2d4b7a3cf1ed8042270d5652991ea494e
+DIST gimli-0.25.0.crate 705238 BLAKE2B 61b3da99b6cfa732b35d1fd71eb5bf5003b0caa5464e6da8daeb31486d8066443eeeb693b1e84d49f390a0c33f24fd3c0332aec01986127ffe26f7e770a94614 SHA512 f4e90703b8b7d83c36a63ca7a3d4ee48eec2b0762419780670558c4496ee840489b6a275eb2b635676ba25a010c0e378bae429b54aa4591b9d9868b48e0f0beb
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
-DIST goblin-0.4.0.crate 159039 BLAKE2B 4dfa518da4c084813d68640ecc459cf683597487106a7c8461d89d6df3256f97b88c98e25780058d53820ad1e2d5ecba61b4629cc6d5159e32f20f27c6df301f SHA512 fc1dad036a25e69af7b6228f38cf67ddbaf2589cf59484494856acf206793a543f72bedf50a0588b0b1a4f9344e5cb4dd68030c76fdc1abc3488bf7502bd3197
 DIST goblin-0.4.2.crate 159808 BLAKE2B 01cd850662769b3674e25947dee191a9b56fa94e7dc5548c669f614aa84bf100f675a224a0b3db5b214ba0464bcd45e1c9a278ebb9ddeaa29fada6963f555efe SHA512 92e17f3e12342a93f59cf864c62e3b4e96b93e44a2730b3ab8bd8903ccc469f1e6b988296d2c01ec3b21eb3af4f0a707fdb3c9fa968d7ca225046d2e0c9ddf06
+DIST goblin-0.4.3.crate 153973 BLAKE2B 4c7670d2b4153a203d01be79db7f3748396eed815bc55245e30af4774f2fe1bb842b101748ddd1a33dbb5f8b7065eb5db8340b8d086ae003f46744e215a9fffb SHA512 bcd0088ef4cf4c9f89f6335d4eefa9643585b0c421c3401ed7e4f3bb7dc16c2f6e3eb31625851c32fd9d34133b2870d50b36d4f668ee71bbff54c5a6dbbc44ef
 DIST h2-0.3.3.crate 158845 BLAKE2B 4c9d0f9ebc34a3aeafd7492876b90f43e49adee4f99d031de53245e87f8fb0b2cdbf1aa98db5beb27bb8e852218241f8fd2f8a50631e68839c2fbd98a9aebf97 SHA512 7f7ac1d513b6c6068700b41c19cdf74a57ddb6090b5457ed247df93f0a4bb877fc44f9081c962692adb4731c82e0802a0d2151d69c59cc5af754102e83613a42
+DIST h2-0.3.6.crate 158838 BLAKE2B 1632be354612c3de7206ef9abb379a63648fb2e8bdfec31bd7a013b27f4310f66834cd0b57f17405344a54e0bfda7b986353f9725c651390364aa0a1e81bf7be SHA512 8994b43c6fd93240b62d4dcc824dd004a0a2788b51c448c2350a067c23dc98272002f61c138c86c9637d8be9111079ecc499a5d86ab29ab103d7426bfe613eac
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
-DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
-DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
 DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
-DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST hkdf-0.10.0.crate 13966 BLAKE2B d808517dbee7340d10baa994dae118135ff3907b204ec6f92ecbeac8796946969e1ef54532594bec0669834dfe2b80108ecb30b9d8906202182e5e30f8995b64 SHA512 c75ea5b79953d28a793ddef5eabae8754ba74b5e57bd7953be6e4e8f9ebbc3b62d29e06b1e15eb101b849d51f91df61f45766d4ccecffddad33c39ec5d5668ef
 DIST hmac-0.10.1.crate 11120 BLAKE2B eabb92f1f276f2397f7e28d306f4bc3ef0928f83b4b622f120dcf1203cdd420c331ecbe430e8f8424e6709523118fe01d425712cb8e520aebee620144f666834 SHA512 ab61133d280fb1b149ad097e29f6028a1998475d2f1995e3ed4f354a8fc91eaff01cf9437a13da637ff433fa05b43d7b144b5726c1edba1130c7004bf18b1c3d
 DIST http-0.2.4.crate 105489 BLAKE2B 07acee6b91b6a316f3277ad324df6da1d2ac804a409983384d2fc027ab63ed05390278b21867c0096730c91a00b8f8971ab6a66d17b9764f119d245592a1cfb6 SHA512 0b5c609c12ae4020801a184dd6c751919bfd4db985844c55b53368afbe2b9f641cf9aa523ae49a0b25a251cd8f19ed634fa28990d4582cf7a27f10c4304eb465
+DIST http-0.2.5.crate 106297 BLAKE2B 02917ea704475510cf9d71739b4cf3cf8f87a013fdd7b9ebbc21c702642bbfc9e33d7c7ba47e084c86cbae4d95a72a51b7f7d3c00ed5652931c9286d83f5b980 SHA512 ec56bea9a6329c82053a757b6d537834985284f22dd677f9bdd335785e8ae71acefce0e07a7fff57c6648d0fae54a8039d71d74936f10a9b5547fd90d2fdf7d0
 DIST http-body-0.4.2.crate 7603 BLAKE2B cb3739c4207e678dace73889a621d56ce85cb87c32df8174112bd3812e1d804454694679a38c268d13bfe49de4f364ffca3c279317beeb26e89949c86b335b58 SHA512 69bd0a9324626953d2114ef4dddb69da8bb9f90236529e6d40cde0ed92c210f6b6849fe4558fcae50a578dff74e70c57fe8853bac4980101404fffc0b0cfb6fe
+DIST http-body-0.4.3.crate 7660 BLAKE2B ef56f26e844f1f234a5fd96f29aed91897617ce126e6f143ee29fda2183858b3439570ee980469fd092ae8d7fab00ce7d4300e0f2506a9348876df766d80ed50 SHA512 2d72e11cbb072dde536c5187f22d88dd9aca0768e7b0191003e463900d50ba73e01ec6dd8c98d348c0fc5651ec022b859daedb5194c71fd787af4f2dfb97650c
 DIST httparse-1.4.1.crate 25592 BLAKE2B 4527521876c4c44306819336bb4b53ca92b427b1b7e6d41f7b1c284812d6c5256870f074bf5273e63922da50297fbeead19c451816f76d9b9b500a5a4316dfb3 SHA512 0dd0f41076009616a80e6b43b317e8560918f5ffffa7467d58fc9885bcfec758ee521beecd665e75d1ee6fcf7dc7c9bf8aa560c2eb885b4e42b84e24bf2ed9a4
-DIST httpdate-1.0.0.crate 10219 BLAKE2B 52c267f813d63446e9ae80a13375b150782659ae9b98204558695166714c79a60ae194f3f90f106232a23ec3ffc402b5f4fb83045e874d7e8fd6979b698d54d2 SHA512 0acbc19020546293ed8f05019b31d9bf73c13bc11612b06d1ce1ba1b6f3329ae6551e090840a54905492a4eeffe1b012caf44bcaa8e3e2e85225db6b1f1b0ab5
+DIST httparse-1.5.1.crate 26758 BLAKE2B c2f17a601b54032c1898b88feb836ec380465b5305e240d9466760aea85bc709ed873d1677714acba0d493d27fa5f5288931cb7d62f240e50e2d6b84d4e72046 SHA512 70eec6bec5927e272d7cbd09472a14b0f33d153498d5e1894c0853bfd35981c0d249a799c3f4acc01b8499c29519a49d81efb755bdbce124e55f73eb75cf8592
 DIST httpdate-1.0.1.crate 10293 BLAKE2B f25b69244fd82beeb0c9c8f4691d1d057df6f835883f6cde069a4eb28bdbd7808b5f02c8a48b88ca4f60e14c2e0dcc84f4cadd733edea2f8f3d061bb485fff1a SHA512 1a63f11759e331e5938697d181c7f021e953e3616741116437253eaf6da862b6cdb08a0fef5808042d8367de9fac31b63ebcc917cfb81b0244b4d238f95538ab
 DIST human-panic-1.0.3.crate 18064 BLAKE2B 5dbf7c696da12f912a86ff886dbbd6801320520450a8c735da9f99166a4e534aa79e51f6a498626d40ec4309c1676b20b1e7881f341070522c3dc37cb7ead030 SHA512 3de653521aa3ba9180768e04dee8be4f0f52849f1051e8bfd21c80361836603bcf7a5292fe325e2f556446cb176a5bf0eaed1e7bb218cc1fe6c7258cb3f92497
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST hyper-0.14.10.crate 168209 BLAKE2B 516ac859336c08b72b20e18144d353bbfb6b932adaf2799e420eb682eefa34b8518921fc90dc86f00c920d10a8d50b6fc2cb22647441e82c74f5dc03cde6c390 SHA512 6b7a610563836b6fab4a90c3a2e64657929d38aead05dc4573a37cd7a54dc11f8e76e2d304343401b112b1ca1709df104d91ac2a834041538a75a31b753b6af7
-DIST hyper-0.14.7.crate 162955 BLAKE2B 00e514d9267a8283529cfc3048dda14229bcc1a3ed0cf8c4001d6ac441cc56832a916df833e707aa8c669b812242851ad787b6bc20686e12dac4f82af1f3f2d9 SHA512 30289b175cfc45c76fbc4a7908b88df23af85eb71171c2b5d608e9cd8cbff8b5fc49ce55910dbf23a3037459a518af60cde11000c8a1fb3dc2aec2d877c39dc1
+DIST hyper-0.14.13.crate 171435 BLAKE2B d37893df6abbf06a9b91ed845368742b0e33499b6626ddf09bf9d2ea0dd4e8e689e1a395068a8243f9a4fd3474b47ee3ff3516982a4bedbca74e535388414e91 SHA512 a0db865c26a95ecb0921f9941359d26bd41daa026836796b8576d89e4ce76bf23177d6f61d0c7d9e9cac51d02559bfffa11eae84d36d7afbc0c03a448a8b85bd
 DIST hyper-rustls-0.22.1.crate 26718 BLAKE2B 69bdc6de6ee9058a3d782be27147f4856421f7e0ac6509d9e94bc955f4f392e0c9e904d2745868a6cddea060dec7b33f230d0eff17432ea513e1c8049d1f2cb6 SHA512 90c9b430276b553bfb771fd67f81eb5b782b7c5ab009eaf862c26ca330befa75e61f8d890078a9e5510ee6e1774d7f8def146d0a9ae92141951a59e1d94ebf41
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
-DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
 DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
 DIST indoc-0.3.6.crate 9663 BLAKE2B ca7a1f4d3cbedbee0ba0a3f19c4b3352ff90927eef744b7e4f1d60855d4dc4265202972e81e0fc06d1222d8d5fb322efc4ef669af7396b251248a1e45c91def2 SHA512 e900aa3b001df0fdbf1f543d8b679af317e85a1f95e26fc556213f2826a4f6c82d8c4f3f82de435e3591f8bc14e78eb22668d901dcbe2287f46740e0291afacd
 DIST indoc-1.0.3.crate 13137 BLAKE2B ac50bb2bbeb989d78ea583595b9b4518c6a71c0a3b3fdd07581dae0c56525d55d631a81151e4592cb632c1821a0fe4166471246fbe542f16e747895a6d564cd7 SHA512 7567c260678386226a3fa6839a7a4d603091096a8df19039584c296b4953cc333ec1dca0a13d1192ea6433743d5ff44ab78b4e8a89414f6ae93d5401d3d2e3f1
 DIST indoc-impl-0.3.6.crate 7933 BLAKE2B 93e232e360e8f02943ef9a9cabf16bc863d792d8096b8d9a13a07f0b7b396db590abf83b5444f082317059dad7578ffae974dbc8a7e56fbdbab817b7d2534725 SHA512 18406587ee56a09dd2062cee456af697efa903343de42c0ff618a64ddf2bf7efed5da02e7220fed2636c555a6ae18059018f5c3c9b44ba8d3e5a34ea5b53c806
+DIST instant-0.1.11.crate 5408 BLAKE2B ea26c11694002f667b5c42a93feb9acacaf7824a7f618809c56d0916dd8f9b045a544fdb793aa5a64b1cef00a648bbf71e6addaff69829563bf09a7525c62bf2 SHA512 659eefd86f9aae74c96bb3f1359b92052c43a4d589b3a591d76c0d4298adb53a013a0a811b0fb5caf588aa093a51589aa63bcfb7450b8cd6edc0d73a4ed169b3
 DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b934ad45ffb0c9e44df5ef7e8189ba2fa12452f1c8a6416d6f7c0655365ba959bedf2b78228613944be8278 SHA512 3915f67c3629ec93296d56c4cda0cf97b29b1a70930a9d546abb9518139d4c2f35062563a5094e84841ddb1f00b0f3df9dc00801d96c01994765221edf03ef7c
 DIST inventory-0.1.10.crate 11572 BLAKE2B 8b5044c9996fd53f726652617ad7f25e3c57e5c54aac12edf0c2b41ec7d4d9388e37d8613a7e39301130d9ce4f3412b48380fa9e04bba8229d5ed2ce383a8879 SHA512 5c5f34ab3ef5b89b27a353ac5c570b9f2970288f10ae3dcaf7356ef48affcba8ae7d17406206c88e319a95f133ae69a33d43b219814b682df34219bd0cfd5eae
 DIST inventory-impl-0.1.10.crate 6228 BLAKE2B 4aa7cddfc306e192ca635e5d32fa9cc61d59824f24bbc67ad6b6996578ca0fecf8e7d04e970720b9261eaef2977dd0773ac1eed35ddffe6c075a6d92007fc276 SHA512 860cb40c77d269b8f8c71db96ee71917a33f8d9b7ed5f24e06e38d0adc5e93dad73ee6688627798cabc7536c42c519788d74ee3bc8abb13b754f7e70be663a32
-DIST ipnet-2.3.0.crate 25031 BLAKE2B 064888a6e37ec67f70baa4d571708a9173cc788921260511d8092a0e32982a0de4cabfbd28e17da812e1a50249e2106e82f95981163a0bbe71158b1bbca4158b SHA512 ff77e4ca8ae0fe1a8e9969e8e131081a092b258f64a7211d550d3338ece61dbbed499786b5e97a8515c33797e8cf41b4e38d7832e0d1b18584b0e5231c75a22c
 DIST ipnet-2.3.1.crate 24932 BLAKE2B 26be72376dd7f62d3d01cb9d3287f9aa19e7f52e01f3b47ba8dca1734f959683f17506d4ce071072b8f288e7c494b3daba9054770b9f5f9959e9a450b82a0baf SHA512 db74ad4850e61b20b5280d0637a33a0a1dc2e3388bda38efbbdc221c04dfe04d304d57c3704fa68a824e65e8a3bdea2e743b2d0c2d06b1a8710c192cec1b6100
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
+DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
 DIST js-sys-0.3.51.crate 67124 BLAKE2B 4f4c28c1ea1a490551ff759ccc494536b099fee6d2eaa597f6ef5ab22e7dbcb72ee870df5550205efbee181aea8cf6623abdb6ecc35418eb17ebd2bf3f56877b SHA512 e352238ec085a9381c27fbd849000c8a26d71d947b75ccabecf941612a87e446c45f793eaa152062e7c699cdae74512a016d44ed06f3298b4cc7d32ae5139f5e
+DIST js-sys-0.3.55.crate 70499 BLAKE2B 6108d6bf4be72dc93db5c2f45d59dcbd7b94edc02ccb368a05bdc0e259768be4708e449647b254bc3c542a366492a02f0569d08e69c00249f58b07a566cdf97a SHA512 bd51d61684b3683d5b80df42eb80cb2e4688096bf14fcbd30234503709b1730ab25c7b58112516aeb5d7f44ae20e0ba08bdfddb0518a20603bbb4ca74544d4ac
 DIST keyring-0.10.1.crate 20169 BLAKE2B 0509c3a512124e08cced67c227373a3817f70c78e065f2d391609b4801905fd774e7524688470a5c9eee23cf64e0158f8ffef545d25a88859df76f37c29c416d SHA512 a133d3908906d7b48c2986eba7525018bcf52d9e0690a2b1342580f9d4b9ab5165b800a853c57d7a7f41fca26487fd42b01eb7b75f5c4f0b623fb9f564ffd011
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.103.crate 540563 BLAKE2B cc99ae88783e6f3044ecec5154e0de81a7f792b89415cc2736eb4a436edd316277d690971c4aa0eff7935b5a355c8966805c4ee72c5fec8caecf65a29c13caf9 SHA512 79e1c99bfeb30283f85742cf17867000301bbe022c6b2ace415b4a767068dd64b09581bcc802d42150e45849f5adf8ee2720a0c695324d87d3d96a5c554a216d
 DIST libc-0.2.86.crate 522986 BLAKE2B 2643f7e71952c3c806ba02d3d9160963433115ce53fbb22189c6368813380a0403c7fb51ede36b4781ad0a609e02c57f2622062bdd536725a5c65a6f7aac5fd0 SHA512 b5a0c94b3717a620cb47b27d2f3bbfe04fce475c3e2feaab8bc4b14c8aaee190d47a61f0dabf26ed9e525e96e6aa611f4dd29b16e13b678898f88352d86c1b74
 DIST libc-0.2.90.crate 521685 BLAKE2B 31442f5a69f888980051fc8877be252277934088690df84924215dc09a4a4bb5d2dd222b8bfb1bec070fa291f8fb4b7cc96c69f40b21c912a7102231f0eb482c SHA512 c05c409c5afb55aca064db78a79b197081ec38a57989f0eb8c3f3095a400f1f298cccbb8132030e3532058e40aa32d1fdabbe2fcfd3437a0e5bc2c9122f88f0f
 DIST libc-0.2.92.crate 522480 BLAKE2B 4390c54531fc908b8d8e200fe271cd8536660b907dab3da07056b650f13fab0dda83969518438eac7ee75761bc1913ffd056a7cf98b58ab31d4ef98676193220 SHA512 bee1495a75cce8d117d5a565dcd9e2050b9b308aeef40dffe5b970cec4a0840eef07e8d65a64558cb75494a77a6b0023923ee451b29288e02573b54121fc7b34
-DIST libc-0.2.94.crate 511713 BLAKE2B 6ad3fe9aa5ea5fb06a7b2beeb68fa245e5ed7d19aa7e4b21c9e2ab73da11a9249913e604f0f87fbcc82676cceee16f14403cd2f27ae462730e1682c539666283 SHA512 316717d2e46b57c200d67d0ebb4fb162cb1f0b688895b9eb6075924cda3be8ba7fae85319692682178b6fc5cb2764e8b3a9d3e7ce234fd8a21a0a9c453ca174c
 DIST libc-0.2.98.crate 522087 BLAKE2B 950686d7cde31322e1cdf82ae189192091b8543d14d0da0dcf3892910f4216e8e46bb1d5e7e8fcb1693a372577c57a6eb6538a0fef997c1c1a0466c3a1f7acb8 SHA512 2e730b8d46c42608c7da5ff4c5475667171b552b485c2684d3821310ac0f55c1a7a12d9a2cf68a05608cdd2a0928da5e290275c70a519a379d0ed25350689689
-DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
-DIST llvm-bitcode-0.1.2.crate 13096 BLAKE2B c010fbf089d7e921717112d9bb5674022d4adbf16abbb2c1088d8bbd0d90197b389080078741ea9b311a0957f73d0351e028252688b6ba90120bd4a1afeee840 SHA512 1afa9c8e5cae38bf9d8c26c847e48d76bff31a940df8c538f758a3676f68a5de60a8277b6de7c37c582c051432f093bf2d3f74a4b975b5a06fe0dea3c13db96e
 DIST lock_api-0.4.2.crate 20375 BLAKE2B 0b24bdf98aaee9870f558971f437e728c8e52a853cc886a0de30cb9a84c2733175e6152a2d7ff1f28a83df5443091b16ac5410cb67d05ce464e01db64ba98cb0 SHA512 815de5198ba4a952490fbc7e08e899ce855588d794c22890839ad55caa81642745fa6bf81a2a2fc8f6713575f0d1b801a2f2107ed7c405101011927b6b40be31
 DIST lock_api-0.4.3.crate 20351 BLAKE2B ffec5616daf545ed4d2ed7cd21fa6340b1892b76702a089474b58320b6379767efd249088f8638e087100a09e4610de7652b718b60c992c64a287c2ebc73b3b4 SHA512 4dda8d993138efe0ffc94206c576e52a879a6cc4e90ffc98caabdfe720649a34c0fda206c4a7b6cc3a99140e619de1da05864218cff6f702e5540165d30573c5
+DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST mailparse-0.13.4.crate 31832 BLAKE2B 0ff6a27bb185a3c389381019c3382bd53e1262ffb2824806e9273085e87d7b96ce7f53643662b05d05bdd96726340b9b53acefa92c8a4b115c65d8b27d091907 SHA512 18df5cccb44e749d91507f708f1d8f639d712dab96363f9fd09b95cfa7518cab06964e6cae41b4f7941f99340818b42797c68c07e0ed0966eea24335c5e32ed2
+DIST mailparse-0.13.6.crate 34804 BLAKE2B d3e88b5ef7d97e06f0b75cf14f2134c5dbc9516a002c099210f2ad1912a9a5e86765fef5eb61131882a70eaef1ef44a57a0f10c3d88cfe8eedc4dfff2cb77881 SHA512 35abe8fdd944f931462b95b55081aae2b3c986bae342baaa0fb1bc179c1f31f68202648426c3dd8ce3c6839d733803dc09fa67684c165125c60c7fbf26cbded2
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
-DIST maturin-0.10.6.tar.gz 217409 BLAKE2B 395caeead99c1bb7e8c21e76e15d5650fa609f6126dfe25e4658102d7417b9e5c9b6f2109256cf2c995206c929c748e991c395d4123d21bb97cca5760fa70874 SHA512 967c9275b2dca7ca0ebc597686680d2d33e7271b0beb0f477aac3776a3592e939ae9b155466a2cb5c8684e427217cc7d7e69b86c959ae8e6cbbd5f4cc8987501
+DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST maturin-0.11.1.tar.gz 221500 BLAKE2B 3c3078bf5c503f296d9bdebebbc1a8610a036e476ec706e351850f9b45ae4e9029bb33ebdd8f5f51eec449745c0cf86e52e30e2dafda2f5f5295562b536cb7f7 SHA512 a24fe5780db63bd9e50eb9b93d81087b5b557ee656b928fdd86ebe040aa8d3c67023b78addf444b16742ad1db7b9414a404ce9164bb39637debfc8a9dbca6785
+DIST maturin-0.11.5.tar.gz 584266 BLAKE2B be92b8b3f94e7b5e5225a57118219cb854ea072a03b92b5811a135f54c634b89dd52c3c6bb50be539b7578e3748a34fdf4552bb46544500b061743c7dbd92ba0 SHA512 31c32849fe424393351c6f895eaf76852647fcd6b5bf77d1244147315c4e730762c03d49d898bc76805dcd0a6ed8004e8eaf26a2f78af2228f8cfd3cb2201c7b
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
+DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST mime_guess-2.0.3.crate 27437 BLAKE2B 6f9176749241dc9b8c08eea3285ac1aeb40ab079f8184d93c436c00b205ab754d9c2b5c481774837bd1c4522b33338fb7ecabe88ee2da471478cdc1391d9281c SHA512 b08013ce235e66eaf49a88ab4c5cf4d1f1b95846c1bbdc1a73efea9052058860c7dbe2b028fe1b33c713621862fe9af2ed097558cbf5e08903ee406a44af162d
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
-DIST mio-0.7.11.crate 86660 BLAKE2B c55020ecb53cfbff143314d0adfce7e5124f66004711df9dd5f95d18d89b994a13e61b4a12b19a482cc0232393690ac87fc7d56d7d431d85e6826c2f5822b56d SHA512 abcb2d29868ba749ffbf2f4eadd5c24ea80bdc7d62aa09fa0a70d9963e73fd5f603fb9b73410db5f72a051a153e0ef5526992aaaf1b212ff0e961bc31d107c63
 DIST mio-0.7.13.crate 87027 BLAKE2B fa1b8287981c3a96c0b6f29de221241d12bbda1c19a95e315f5e026e130e2bff6199774524d5c178718bba47710cc50dc632e942a590f5d5af598e4d59fad269 SHA512 3f9adb95db494dd39041ec1abda0d476b308296024347f28bfaf5883d7896ee052edda026c25a9ccea9a31cbc5431d95c0e13948e90fc8ca7b1a91a19748a45c
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
 DIST num-0.3.1.crate 9414 BLAKE2B b3b4ab10882c481cc2a8777eb44fb268a5ae1e76768df4f16b7c4f76bacfb6974a9ffa9d0b510c9763af49aa30b3cdfdc344a919700e65da5402d90c3d5ad083 SHA512 38eaf591bdd1a8f758f80f6fcd815f32c064738ba21fd97078200945cc5a2025f88b79efb36538e425df43441adb33144e20e68dc351101845074260d10ab85c
 DIST num-bigint-0.3.2.crate 89374 BLAKE2B 3195b284f5b7743d988078e12a7ca54133feede08964194dff3590f77e41373106c537e2f8220fd247d05c2087536df29d4a2243d6804380696a2d488a4ac153 SHA512 1471b43642d7bec07ba79b08c227a7512debb0a556842fb8e54a41fff2db6948ac3ecaf0cfc05209433db3b3888cf45a4b61e42d6a0c97137582c72a3c7a8abd
+DIST num-bigint-0.3.3.crate 89493 BLAKE2B 015b680a0311e0c4fc248e51872bb69999e70c7a9ee64a649189eaf3b7125c1e48b0df0af5e996ca46585a1f9197b1eefea1bfa2598ad7296530e027557d2e49 SHA512 c4e3ef01b4da24eb3676d6716fcda84418e8bfb0e64aaa4cfc9ae67e08a032f564780a8c03ed1403b68cd7194cb29dacc778e11bc821e8c9fe7372a1a95186f0
 DIST num-complex-0.3.1.crate 24541 BLAKE2B 10777a6df568fb94740a2bf2a84d68c5612efae200f99be1c20114d0adb0672f08b512f499ea4f86e19e3f20e98a7213fe116509651071b979e59515fb9958f8 SHA512 d24d613f20e04dcfdee68e95b2d4b06ba99db637a96e41a55c4f599626951a44cc5f8adf8e8c86003d42c316aaea0c27739e812fcd4d4bb6efca5b2d9cecdd71
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-iter-0.1.42.crate 10450 BLAKE2B 8ef03f8f84bbac51a11d22ad79d745c74c4092bdd6e65b91c472967c006fb3cd6b944c4bef913465e39e6a2fd734ac2b1ce1f21b332b2faece823fe410b54340 SHA512 46b0e05c4f4587121ec300da51cbf02e04ee8f8441eb4dcaab5a2ccee3b40210f1badde56addf053fb876aed3749dfb5f01e757042573fdf99defc77fb265f3e
 DIST num-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd7594e0a398f448930c60c338cc5b42f73e92dbca51a71d9017eedab20e6f564504cefc7a21018d1ff029846498e3af SHA512 31141c147ace16505cf63023d399ec7d6824b1cf3a31160419cc8ed8c9e4392993910419ac113b23913f710eff13f730d04328e66328375c61c28010718fb837
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
-DIST num_enum-0.5.1.crate 8210 BLAKE2B 45d15065b7baa1ecae1860315865e502038dce1bd79631bf8e659dd5346ad1e7ec61df0aef1ad64caa73fc615b3aadd894f490adb34c9227c671c079b11d154d SHA512 96e31e53697e70a91afc49f5474dadb88e6fcf772dc9f14d39a153aaed7e12500500c6a9395b1fd4870be29ea13d13818b30cd5b1d59844773bf2edbc76d7677
-DIST num_enum_derive-0.5.1.crate 7579 BLAKE2B 0bfbaeef5f7b565254c4a3017ce38ca462142accfedeae5ee03f4110ad987255445209ca9a3883dd37f1ae0254755badde9daf251b74739c436573191729bc40 SHA512 fce1142f78ccad3cef1de504a0c89d38e057849abc5ad0c8e27d284c599b39b521cecf3ec70e055ed82871657e6aacbdc6e7b38d637a5d151aa9956e9ca9df09
-DIST object-0.24.0.crate 223436 BLAKE2B df92c1565dccd221df4a38a38d66061c0adaee8ce915b4a4b696c831ae90812cb6df02c270897ffee397a18c93e6dc7a81c3d39e392846226c4d8bb03bded7ef SHA512 5f1c21bbff324bc3117dcf26a04cc4ca6bcd86f43bb5a075f4637fc9e2d9ac5771fe5e9b52c26bb135f1059aeaa46301622bd570b626980e0fc43639c4a2904b
 DIST object-0.25.3.crate 230711 BLAKE2B aee91423c1e5da1c2221c6fc2048b1764fcced2853e7e2f3d9ce4b86b13fceb4f5f909ffb03981c1131b79fadc1bc7fc5756c7ebecfd4a9af0b4b4442446e378 SHA512 33e6394962a7b566554e4aeb71826e344646a41601ef9e28875582d4fd5b64ac6eb6a99944273dda0d5d2e1401c3ed4be299b3bc7e446cec2638cbd82535dd01
-DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
+DIST object-0.26.2.crate 238067 BLAKE2B d7731f530dbbbfebc506dcd12bcf33e1421785d9711864d6d824360aa249b85985f4db69ad4036bd7f8fa22d5909f973a0f58a03021289a611ed5290d2fa68b6 SHA512 42882e3b1063ad8326bedd3f402831d6206603f8736c5aecc3c16d296007d25360ce9143bb3f859a6d52f1a530809df1f1117d321f0d22f0b43c1831366eec6d
 DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
 DIST os_type-2.3.0.crate 7931 BLAKE2B b046f8752e2c55718d604c516fc585e874bd704d8fb5b64f6e85182642174699d2f3d0af1804f9d708760ccd36b6f326e059ac13909a9c65de54e0460e2923b4 SHA512 1b482b77a6d30673e1c2917faffdac92636873101207fc8f097464b44943b17e350441709ce8ddcaafeab1f0fec8bd95c5e2c992dd9d3c39590f2f5ed332e920
 DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
+DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
 DIST parking_lot_core-0.8.3.crate 32147 BLAKE2B 5218cfbff706c4388fef31c885c7a5d53566005775a3c440c6a2890efb189a4edfe8e99f6499cac36038846628a915ac988c15e1ebab1b3a3ffb53a64631dc19 SHA512 1dba5a7e68ee007918fb210ff308f7382ed1c54d2fe6db36a8246453434246b71e6795db107c83ca39c2bddf5e4a27da7978a464b53d41e150e744d81e75b341
+DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
 DIST paste-0.1.18.crate 12259 BLAKE2B ed72b93a27166b0989743c2528d4a41f4b87ffdd0c588557d11a5f37f85d5b8f03ced86150af6209f9fa8d0f6efee705769b26a2f4dc3363f35cc3ac12c0e6ad SHA512 a4d9c75f6f358d6c86eb0a66cdf22eedec180db37358ca2870a992e215d5b389b7991837d8f2769742ac1b093674cb4352ef9d6754a249253472fbcb3a81c001
 DIST paste-impl-0.1.18.crate 9451 BLAKE2B e465c4c7eef44d02eb1b61b5290090513607b452f4adc11487947b7047ddc44905d7a02df827feb2142f0e74583afdd9648c1c66086f10e1bd861b663200bf8c SHA512 c635efee46cb251b76ee9427432f81a0d944cdf1d0a95693d824c6085e7dea7e1e3f48c692ae27946f69e4e78d8080220058acf98e5c8a78482007349f8a7a4b
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
-DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
-DIST pin-project-1.0.7.crate 54847 BLAKE2B d902d2bd9008ffb0f254adbf0fff3c55614abec67db5a5814707f00ce50690e47890c2ab89ac488e12661c59db7692502eb7003cffafb4a57a66959a01f139b4 SHA512 e3903b508abb9a1412d8fe31f04d01c2bf634c770b1d6f697da1ec4eaee023ed95d5488e1fb4f3aca62afe145b52730c40781eb6d52deb55d5f9820503a92f86
-DIST pin-project-internal-1.0.7.crate 27884 BLAKE2B 52ef94e6c2fb44ee36d7d5bcda09fe65dc69386f6df6e4573674c6e796ce506ba672c1421603ca7501a7b3747f7277cd8f4e9c121e4068d5e857232de08cb1be SHA512 14d96d6cc73c7b86151f206383d24e1c7d79d70f586ff59f1bc47fccf271bef4a0561eecf86f7b03cd14520040f80ec00c266df79b2eeb04506582d80cd2ef97
-DIST pin-project-lite-0.2.6.crate 25494 BLAKE2B 851a8388c3837d8516d98b561a3ae95b584e7b0e56cb04a300b45e5a97b4c81bde991a9625f42a596244f3f8638c26d6ddf46cdc7697aa24c823e991d0c107db SHA512 21b298896a10c2b21e481f5769a9ce557ec376819681599699f0881769d2dd378bd0bfdf7c43cc16eb521c48c67207e63373622fff84ff26da88703a57461461
 DIST pin-project-lite-0.2.7.crate 27212 BLAKE2B 71997c66fe24bbded0030acf9d460c8ecdd07f7a047007413ad5daee06ade30ce487e7f921d610f9e0bc7aa036391f6c595493d9b7d95c17e9195f5a2b23441a SHA512 c948201981269f6f54da069470c56c5b9c4c6f52e349dc7970ad828d412facfbb66a09745c0565b4320fbfd1aa7983f3664604f7ade37a30cf25ce253afe8749
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
+DIST pkg-config-0.3.20.crate 15395 BLAKE2B d2727edcd04135783de0c1f27fe1cb052bd9255be88c935bdc2ca04f09694b7986cf66325761f2742a34c4b851ae3c48d3e01030c8ea1c19642de064d78ad574 SHA512 6c69010f122d0f7dcbeb6301aee9175617294fe7eea384201ef0dfcf83124b00d0727fc0460da797882e91153b677cc5b16eba98d19484c3a3ce4dbb06c7dd6d
 DIST plain-0.2.3.crate 10664 BLAKE2B b0ea38fcf6d4f4e3ff91d572b5639f01eac4f19b2c451d27bca49d994a07c6f46118cd58a1b86b3d2a61b7ac9e17e8236f1cc98414738d8c86086d37e0fe4d35 SHA512 6909e4b4b4a0a49e6a226d7393b121ec04beb8a13b1652c23337eb09b3c2e5f202b53a7663dfe7828dcb32c3d18135b514e9a982967c188e127a63b6cbeda252
 DIST platform-info-0.1.0.crate 11170 BLAKE2B 5cd76a9170efa332d17fa4b1a58bdafa533216d6d178054b932814bcdfc4056471231bfeb0e1cd68c63d47e4de5cdc98695b3e36a9b0fa3d794e38e70110b2ad SHA512 d40e8d1ceae829f9d61f393b5fa73ff10cd97333ef471f16a898d34b21bd5367fe88efa05b725299062c1029e1ca13fcbe24e8789bfdfc87fb3e56e66489d690
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
 DIST pretty_env_logger-0.4.0.crate 8690 BLAKE2B bd6cff07f3a9ad860378cd0bc7d44c1fe9ea346aba2970adfc1f23e6fbd3613f11cf8fb19a401f006ea69e8f05f687636d0ef870c25ccdc97c8b60505e2e0447 SHA512 770de8e256cedfb21fc89cc1ecc564ae1a8e67263705b4234b91867996c4db77ec703b70a46aef6b018c6ce09aab6a232fd1eedf8324c39f119a6807daa534f9
-DIST proc-macro-crate-0.1.5.crate 8096 BLAKE2B 0a992f7aecf05335008731adc40e8ce6c4ef5e114228b51ea856112f850a24e995e4682c8d2ffbc703b9b5cfddad68342cc9d0f7d13b13a96961287bdc22c4a0 SHA512 b2922ea8beb762f42f7646398eff9d03a5fe3d942f1d0cce564eff8af41ed14f175986d07ac5bab75e7634f964b8ad24a6f05f597c90b83761bb4c1d2b2fed59
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
@@ -177,43 +183,46 @@ DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
 DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
 DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
-DIST pyo3-0.13.2.crate 281372 BLAKE2B 22ffcd9fa239efc205e5efcefb6ffbe99a979209aca357174e461826ae8edc1824da820df04bd8af4d07afd550b6a03fce75bc24e83970e7d2ec8cdc0aa17dca SHA512 3d4198a60e9c3abc619e5cac7198288bde294a789b6f84ec87a411d5eaad93d5d55043e8ec218cb0aa09a7289be7fd5bfa0b74be188e2b67c6c646cc2aec66d3
+DIST proc-macro2-1.0.29.crate 38772 BLAKE2B 742c2602afc4beddc96b688d105fd93b1dbdb3cfced724aaf542e97120d374d334e90cfbf02ab62741dd052a272dc583b7d2e1992da3d1b8ff260414c65ac89e SHA512 b3b3b7c6988afeb92209c7e0362f45f9c207611a74bb63bc7746b86fb9ab0d74fea9e7a2d9bc8ac943225ea439540726ffc13711dc5bcb056c1821fc99e8dc63
+DIST proc-macro2-1.0.30.crate 39155 BLAKE2B dd0ec47a3a54fed6cb3b03e5edb5c3e065e5644f631560595eaca028926f283ae20b3e9fe699b0b968e00d3bec6ec95437be2693ccdf22f1524dd5e4ba3f7886 SHA512 d07ddc18dcfcc163bd243c22ffa4735bc300f304c7e70bfa7caba91047b1313bfe1f18aa4707a65a40fa18115c4b32c57b23699f9a4d9b4a09fec3c8aafb1d34
 DIST pyo3-0.14.0.crate 311988 BLAKE2B d678be98f550c0aa9a36c362b24402dfadf442d06b1462fe65c068fae32907c954a5006f1a104f0836b05ed6fa615343869bf6af9f33196bfeb1bef54ea14b65 SHA512 88ac5b34ebbee5b3f6098a7283cfbf221ac19ed70bb2825234f0869be8403e709ba19e97785a83434093891a41477672790a19a8bdbfc3861877ff8ed622fd46
+DIST pyo3-0.14.5.crate 330805 BLAKE2B 6ab0b487da4986a91c4360b2f5783fe77514d99ab79aa4fac18c4889e1f0077cf3d58ada0762d96c1cb7c93a6f2f0ebbe852ea881a23b1b5b39f6b974cc965b7 SHA512 050cf757cf3d07dad46af1bfb0a0fc4b4b7ef677af15d2119ef3eb83cf0bcaa02540c7e5c04a0c0653813e6041221754d3af6b6ac6041e9287fb9d50121c5b35
 DIST pyo3-build-config-0.14.0.crate 15392 BLAKE2B 93057db500e4d08bf5745ef7ff85406f025f307888c6fd3e01ad1d76c6280754ee676c3ffd280693dd1c24db6792f83ac4de9dd8520b56523ef97e4093e2a9ee SHA512 e9f79efda01404835952f9b322c610c9e078d635cc63af0c39b62c51299b673dfad4f612e08ce54b8c68de91c39bdaa89984066b57502c92cd029bea51162476
-DIST pyo3-macros-0.13.2.crate 5434 BLAKE2B 881b49ad2f6dbf0f60f7d9d648beb1b2f10266ede0f2d893e4bf0fa574563933f3540f93eabfa31ff2a73970e1a86d0ec1103ce7c0dc565670ad16bd99d10986 SHA512 3847c60f9e3f7150f46e68164fd35582994597eefcc70542ecf95afc7411785cea5b0eedd978b1c4baf2067ff8f2cdd93778affc82e11dcb264c09ba6ea0d788
+DIST pyo3-build-config-0.14.5.crate 21440 BLAKE2B 8f0529a38b35893f82461d18c456eea1791c410c3af391443df892b897fb3f98d06bc802fd5a3c4750464fc91b532e703322c6637960e8c5bafd6f21ca0de61f SHA512 d955296d122219f5b06e29c23ec9f384e0f3aba2c5300d355fe755472de855e1ccb0393aafaae31288676d6fe85a936e61ce5f9232fcdda2366e865f28eacdea
 DIST pyo3-macros-0.14.0.crate 7646 BLAKE2B f179d2371db62cec1f4876ccc929b3006c4604223a25ae8375c5c4d86832d16dc2dc976a05a48bf88b5c5b3f01ebce7b05d7815b5a63fac841af87301306a59a SHA512 7fc2203fc8bb59231931c08f21020254112fe12b2039ead43e3c0331bc7b9773ae0e447452aa4f4bf53b881f63adf56e64807145747551761e53f2ab7f6d29dc
-DIST pyo3-macros-backend-0.13.2.crate 33106 BLAKE2B df7d9cbb06932c7d01f809bb5cc9230a680f0da7f1231a1c509a7338713722a1a35e456faa81a36d21a16612a1c611b6ce5d018c87210b59e4153ba0addab568 SHA512 ee136e214a6f06b6dccec378d6a73a318408cd55795ffb00c18428b40cca1e2f45c3a98e85c82c68f0f2715b8187237f2bb3dd1e94b95288e2bed1bf6a6d042e
+DIST pyo3-macros-0.14.5.crate 7658 BLAKE2B 7ebadd9c391b4171768df6493ba7ab6e70d2a34ab0d728f1b3b91caa6a0a0fae2274c613bc4c231673a7e37fc33b12a9d2da109e894d44761e61d37d76b6fb33 SHA512 6a4870f7a5fa0ad156a08999395136430dfaa2253fb73089ca3a37094f548c01e2989aab47738fe3705033df8ec4fc76de4242465b0a842974d66471ca152b2a
 DIST pyo3-macros-backend-0.14.0.crate 38804 BLAKE2B 268d59807cb1dc9adf1e389dfc6d051cb140e6c7ac41c628a2450b634306ffa5ede6ded4033139ace203fe13d514d966ef203e39a6fed18249acaa2bcf2505c3 SHA512 ad944b91e8a63945b59423ac47f574d7aeeda3198c229e9f728b8593577b3514e56e5b0974987a952ea030f8dc661a9ea0052b70929ee87064be7809cef4389a
+DIST pyo3-macros-backend-0.14.5.crate 39447 BLAKE2B f7ff78088d490f95d77537a15954c90faf444a275091fdb081677c4890323e2822ef9f5bb7125f2e08c2362bd66ce6b74dd74f8c9e828cda18fec20d24c517e5 SHA512 8ae85d7846c06b6b68c74309b79c0edf5b608f443b1ece7a30a56df62f1d74c0910ccc1cfa460ef1954c7f978772b94827f50dca6165760acf76b0015d357011
 DIST pyproject-toml-0.1.1.crate 4442 BLAKE2B 1eaa1dd5ae188825a0e2329591ff144655d69fe20dbcabe6f07645a7838a7868d7b72a3531d88117c576ed57c15b32a781cbabb71666da272db5d3c6784695bf SHA512 e21e93061964d3de4a0f8eba14b5cc1ccbf80d3a057c5984bc8de1f8cf8d570847acaebdb933e30083cfad9425521125129017c9fd3c529d265a43faafa86d0a
+DIST pyproject-toml-0.2.0.crate 4532 BLAKE2B f0d8adfde370f935db893ca00acc5502e33cfaa0e379bcec99b284537256bbdee8438374a4cbfcd1f68da47129cb93ad88fcfa55c77d178c30c7397a7ef53d78 SHA512 b6f4d5e16e5104f7340bb3068503668a933608f55795d78491bdd41a218c4e0f2b89a27d3d7cf0584b5ce35a42624ff2f597ba5c5557a91e9ed10777f10ce13f
 DIST python-pkginfo-0.4.0.crate 106646 BLAKE2B 8c4bcc68819b1b7c5c05140161ee874c0ef40bf267fe90f63aeadebffa316002e5942812080be233804e3b876842546454c3b78a000f9c0c65d2310576bd7d67 SHA512 7ba053effd37b147eb2225fe274f0a9c426ecafa358961ce7938c736dfed22fffaa07361b292e04301c65e81e155eb93ceea2f97239b75aded74db8ba8642876
+DIST python-pkginfo-0.5.0.crate 106900 BLAKE2B 02d570df809a620adf32f113f9cd47ce0774d26dd6edf49e9beaa4cea2bd4d313edc5f8bb43d8c70144984c84c6f109196b70e23d2ffe7ab8d5e45d3596b31e5 SHA512 25e685d870b99c94f374059fc734b5fb137fd120331b82cfc196002b9315d441bfa6f9e9f9c15ab4f90f294708a0aae706d397641828aff4e5bdc86709b2539f
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
+DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST quoted_printable-0.4.3.crate 6141 BLAKE2B 77a3d6b5ecf43336316baa72df3bed2485c014d56aa26c461ab5c699a8756acb62a157818db1fe2fafa7e5a3808791f2778e738c15e32e9362735f86fe87df2a SHA512 95542a68a88b81b59f937d7cee9c13459f92c4c1c88f8901b656e7eecdbd705b79e511908731cfbeb797cecfb3acdfb9b18bddd43c7d2dc115a3c93ec56458f5
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
-DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
 DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
-DIST rand_chacha-0.3.0.crate 13920 BLAKE2B 9e329831b46c4d6cf2bc6755024588df907f87145adf35e156bc1c2b7068b583b652f90ba35094a1bba26e0449d32d2877fa52cea012ab50429ee526264caf7c SHA512 631f32a5b0bb42ca87ee8381795402f8c5a80202700b786655537f981c0e210e41eaa42ad4247a25bce1260c29caa8ba3b03f92e520ac331403fd8e76fbbfe93
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
-DIST rand_core-0.6.2.crate 21708 BLAKE2B 745aab7160c4d9b52e7d0ab0fab257bcead4dfca1242d820d760bade713822b7b8e283852a2e337a6d33b40ddbd95f86c36bfc4c418ef0ded86f59ae4a4df56a SHA512 f1f21dd6306d6f4b5666d1ef4994d0d68f10a7a94fe628a5aa8ba28ae0376cb34b7c091f82e2db8f2555eec4f35088f6c4df42ed84de7467d5780e284b397115
 DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
-DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
 DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
+DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
 DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
-DIST redox_syscall-0.2.8.crate 23697 BLAKE2B 5a084a48e06ab0dc69f64b05058b78d994040da6c42f04c8b615b1977fa3e813cd5a531ab33402402914362301670709679aaaa321e8904424c38d35c284b7ec SHA512 250556a7683254c9daf22887b39abb010eb9d4fe08b944e52bc6595ef6d8acfed76e5f43931fe20c84bdb3743772fb62a0be154ecfb6e66c2facb4c73546eacf
 DIST redox_syscall-0.2.9.crate 23533 BLAKE2B edff38a41e57f40f9285d43deaacea32d518f5d87382d535b0349f123569613d50e7b45a70e4013f35632485951967a5157146593811102f3c0a7d9177f07fed SHA512 4f3c9dcb925c57253fa27f6355482d4f984fe31c4f562f2cd22e953c6f1f475e0687003e495167f400f77d2594ffb9a69548454db8086da5913c00643ecd337f
 DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST reqwest-0.11.3.crate 129367 BLAKE2B 7f64ec4095f1c01391b17bbeb041043c7f6fb7535d2108b3a174ea97c2e5d26806ffa11fc442f53a502c487a43f641649783094b5a7b11512c8638a17375b006 SHA512 140751c42180a20e3302a0bf266f2b3c19a720764ed7114b57a4310756f343b41c9935cc47d232e0946a0dceb3a21cc6c21681121c9f2e351c93980cb198b8c8
 DIST reqwest-0.11.4.crate 132776 BLAKE2B 2cd8e0a1e2256c93fd03c4676210dab24980fa87d0575e5c8a9fbb5428547c4bea1059449809472bc53f3d6adb3ca8bff086e1c5a48ebffcffb9bf7593e94ab7 SHA512 89bc5ce3658d90b090dbc7952faffc0045304a7d4e1f59a0f7b0c266d2dcae0bc8c5174f4b3b74ceab7b5b8638b5f10ed2b60831ce91972360d849328647e1e1
+DIST reqwest-0.11.5.crate 136526 BLAKE2B 23ed54d3bd88a1c545727283b1090ef2eb8806537cd1f0e584fb899b9db1c0850d25a471ac57f92dea464e121879c28f199774b1400616ab877e147a4bfb9d09 SHA512 59f624e7018fbbd9eb47b448356178196d315792e2418428ea1371a3c2b87417be4aa27d3c75e992bac525cbe95976a6ff481fd2a7661d56aaad3a8c3052cf84
+DIST rfc2047-decoder-0.1.2.crate 6023 BLAKE2B 75d98aadeaed734cca80e21fe8d94e8a4a87f6eabc7cfee63052c51d257058f5589d87c757d2e40f223ef8c4bdd6f5c8335160f67e8f5367b80807ca8c7486c3 SHA512 302893aba05b32dc8262fa9b034fee2f760a09f7af860f99e2e5463bb7f3ee8f9b984d8f9b41b0acbd0703b38373ed7722923b85dee766d7c5f25571b2d842e6
 DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
 DIST rpassword-5.0.1.crate 11109 BLAKE2B 4d040a920673de6ad2f2cd55104a7c2dfdd7425368c77aa3c8a1f3f99e51cba4d86b2afb16ee51637d948e444ddf060f7a0c82de5d6f0696023c527e630eeb56 SHA512 bcd20c2920734a2f281b9ff924138605ea409d0bea9721ee96100f45eed14dffe65a8bdc8feed7c36d3564c8d902e78e0d2306b3736d03b8f195a9d212792feb
-DIST rustc-demangle-0.1.19.crate 20667 BLAKE2B 060b68f4d9f66badc33cae692a5ac3e76f9d8605dd9d729eedee1882026465ddb42f88e3770bfacf644176fa2e02eb3450f9f987cb4fe7db6607266a9db46afb SHA512 ac43c87f4ef0015923114160be64649f07ab82eb6b63538e7e6307ed35681c3232d05f75e37ffc6db9de7d5ea56e7ff3be3685533f2a8848f2a1336f8d7a55b7
 DIST rustc-demangle-0.1.20.crate 23298 BLAKE2B 74479b2724130d67a934176be4b667b9db38603bc093ac547ddcaa9263dedd6e52a5ee690349d75519c173e74a098a20dee234c8fbe14b003cc77109a0efa16b SHA512 edb31174340fc3956eb225c2175a9e8868a8b70f30991531bdbdde77e5924e7a778a7a5ef44ebaca776def262c9045d82c046a83e0ba407431744e1259add001
+DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
 DIST rustls-0.19.1.crate 208143 BLAKE2B 2ec02f40bac911d85db013cd99fc859fc4815f98114abe7041cee61bc106e83334378711d0acda916d9cb72a78f8d1a7237bd5d0a51ceb928d98bbe75cab93f6 SHA512 c86b0809f7cb2b31cf9c87d7744334ea3a0c743e26303026ab48194435289b1face6a7009aa4971f719cf31d7f84bb0e56e923cfd326ce0bc4ed990b8c9aeab9
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
@@ -224,83 +233,103 @@ DIST sct-0.6.1.crate 26825 BLAKE2B 162c72a8e370237f846125de358f773560d94acae2675
 DIST secret-service-1.1.3.crate 23126 BLAKE2B 6ed10ca8a8e458c45b67475fecab18559cc359b0cd9af0be724bb63b8bfed53ff0f1cce6d0f6c0ffe505f3caaffd83384ce1c415c20814dea2b3fca162db9be6 SHA512 031a715fa18af39d24a4a12331d59d9b3ccf4656849efc77840bd9288a9cc01c9e666bb6aef67a2b9c3033bf4b1de7f176e31a42072a6a06fa76ab7204afd4a2
 DIST security-framework-0.4.4.crate 54841 BLAKE2B 75cc13b6053b491564b9e5329cf56c2da8800e61980a7030d51b09cabe2275a33844a4eb8b030dc96292c54211a37c2e638ec7c2dc4b1f650d57b4eb782b7413 SHA512 d17788d1300ce6d6a552f78b278f50056800aeeaadf7039576ce75e975aa371c2c9b86de2aa2c96e8b208d9240d246e0230f8788372f0e0f800d55a7ae8b7955
 DIST security-framework-sys-0.4.3.crate 10508 BLAKE2B fc49b876d89f479c8654059163566d4b7db870dcc21d7e1061ed92fb6e9e1e8751b292b726020f73cd931797436f7fac02ec26ae7306fc826e8c4063cacbc5f8 SHA512 a849f53a0d222299a83b38c55dec7d1282027c7dcd962c8e638afb9aa2f96bc961e93ca2bd34bce424f408d239e09b7baaacde8c2ab53e78860dc31f6bd76746
-DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
 DIST semver-1.0.3.crate 28918 BLAKE2B 81a737f6d13d14f9cbab939829d514dc85c14f8e1efac5a3274d6965ca3b7b07d94a5c2faa1a3913cc9b46c4506d988104aea26341e2f903bf5b4be4d8625e1a SHA512 8af01b90d00873587f113b30d750bc5af89ad0e24ca6c2d71d2afd7244023e321effd6aa25b6cbfffaf173ae646ff8a701148e6bfd3a625f9d14e37baec65c19
-DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
+DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
 DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
+DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
 DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
+DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
 DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
+DIST serde_json-1.0.68.crate 114986 BLAKE2B a588a87ac9fe2b3635d7bf72c185801e3866101020a0afb8f714d37939c2dc7b5b32e2177910df7221df197e4e8a92d92187968efdb5e9f1f1616647c10d81d3 SHA512 54a0345029016873883dbdcd2094615f509759f61b04d9a496dfdbc1e27ee5361dfb3d129f209a9ad66984cc1f4c82751adfe1a564198649ecc939e8c3dd1ac5
 DIST serde_urlencoded-0.7.0.crate 12489 BLAKE2B ef64d92d79b80521ffe90f18534d0a0f20834e692c708e3126d3486b1585aa228e3140be81984256f0adc71c764d5c2bb66b755b9475eebefcff67c952d42372 SHA512 2e49d1113a863a45235e4c5df3de1221398091c33b9eb5a806ea496902090f82d6dcf4f478f897ea54eea44f553fc20aeb2c1c124b81806b0704dd33d5650a13
 DIST sha2-0.9.5.crate 19912 BLAKE2B f2afa14bce588a73477672f439a397be38445932f921edfb35934b15bac634a1ccb5da49597fa22361d09ab3968f79cb53f747ea155f382036bc78ce650fc52f SHA512 c4149abf96d9ba5bf18a29c45dbc0e7d44bb5eadbed26fe2915a7e3b9f253381d090d880a96e9d79eb6399bfdd9d27550961ae07a96d1cf8070ad77d09a1fe52
+DIST sha2-0.9.8.crate 22132 BLAKE2B 233c2160961729590a2ee2b150715327fb09a1a38ca13b07c2c690ee6ed6eb7d180c54d84e9b3ca2e92e48d7ec923543e893786aa81b5942ecbca27b40ca12a6 SHA512 4bd858f67a3ee5a22769aaf4161d823884e112f99911d5461cafe746a19fafd2d8946eb3aa234953efa06a4dcf7becda70db6721c0d4a9b6f1fb670f31f6343d
 DIST shlex-1.0.0.crate 4555 BLAKE2B c39f219b68e7a85fc0a0bb2df38d3b232a80815f5e541a03173d308c0274f55c61e54887c95c22d51b2e62339365bf5deac5b0d0ab3bb5d40fb70b8f75f1755b SHA512 aea9827adb630b9ed71423fb216113ee20dba31e5f1e7d078445e8bd77e7e9bfe64ea2e73f3be0fcaa472023b724793f86c06ff8efb9e4cc133f805bcf11c560
+DIST shlex-1.1.0.crate 5199 BLAKE2B 325536bab9c9707566a099a161e7bc8448c7369cd9d7b2f144ed71543d551038ef1fd764376491e8076ccdcc928b5c4e177764a68584267a91386b8d542264c3 SHA512 e51892298dd79dc7cf04d7e6f0a03e4850a57b15cd75e6e3b56e2a0b15d4cb85ee8afcc14e3727d193c8b91baec8c2864a9c800834ee4d18a1be584f17591752
 DIST slab-0.4.3.crate 15681 BLAKE2B d7e3eb0374de081d1870d2b46c9137e5ec75950a8fec217e3b120e455fe847e9245884990fbff4d01d512ea297c2012cb1a64f9b169264168081f5f7d6b20b39 SHA512 8649f32f26c1354b3281534fa0e062a145b62813c46f9ff5989ae688154221b00ed1b8c044c67a4b78c00a2e3478a8eb9c1c96fb424c24cd6cefd4df875fbb15
+DIST slab-0.4.4.crate 15725 BLAKE2B 54f3d5e4e76aee03d52f25e2927c03c10d89fb7ff62d83ba6f56003daf8a98e63ec220f564107f3282e96bdf3bd525b68e71511ba367db2550d3aed18b4bc59d SHA512 a8232c85d9693c2a417201768a5b2ecd82e3a721fee39ec80e44c769c66f8cb3ddf00a157f376ebe4c168082550ec48e63af23de2da4f30ed343b4e3bd13c3d1
 DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
+DIST smallvec-1.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
+DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
 DIST socket2-0.4.0.crate 37949 BLAKE2B 10cad25fc39a2141913c82eb1d33c14cc7cf54ef7323c0031558aac89b1045f7433a81a8bba83f21523a3ed0ec793189d6333ed19ad06cfc1b70c28d730aa9a6 SHA512 7731bf377bc2f6f06b95d563452bdf1405aafebabc9211f4bd3a13847cc154ae9cff0951130e630fad9f7a53eadd30dfb92b918ae239d7cdec57c327f2cc464d
+DIST socket2-0.4.2.crate 41721 BLAKE2B 453dd4071889bb0f27b8f99cc00230214a51c6855832401e85fefcc66cb6e4599d22fb64e50c805622d438271e80b7c90c349396721a49aca60c927fa9c2d4d8 SHA512 af4641d98737bbc4d14e82d91791af4705f9dbbec4d8b3a25e7e990a5c7ac25b48eea6c4a743b09db52a037c67a7b676147087688f4e29d6541dd1ad7ff9688b
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
 DIST structopt-0.3.22.crate 51665 BLAKE2B 310597cd82596b8a63501d122b20d845d5f9bdef0f3babcc53e9e6f93f9cc11f2aa4702bf2c20cb0b2105b4cda4ca0dcaf79c67454261424c3e5d90da4261a48 SHA512 fcd37107dc6cff85e30345c816ec6ef9bca57f05e9b67d8dce196a94fa18d79d33e953036b394521e76534fd5cc9e4fbbe14588d7cd4ccb01076f4c8ae8f5739
-DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
+DIST structopt-0.3.23.crate 52029 BLAKE2B ad87f3d2da5a4a972b2ed0dbd49830038ab6b46243561cabcbc06013d7088e7a44acf1a29137af11a53ee8720aa8cd69cd7200a388b0ec626a0c513b6390ce2f SHA512 6f6cb5e2ecb7bc2e1e7c58d98e3e9f54dd4ff4698d22aa32e2fe7ab6c51a8e9e8c418260321a3f4aaae1808a68eebcc40f619de28433949aa846c27f06ff5cef
 DIST structopt-derive-0.4.15.crate 20861 BLAKE2B 3c97e31f8f3c549af548a3c75eef06b50039e513171251162af08eb7a70d900e0fc533d5bc711fed489252e5102e5245d343197eb03161c2d03e4464c6319fed SHA512 a241cd02ee91195548759e6143f4c08eac70466d6e13fc5af59a09c15dec27816cfb766c7f2024d4a678a1a1fc8fe5d78b858b3ac0f53fda914ec9ec1d8abc8d
+DIST structopt-derive-0.4.16.crate 20996 BLAKE2B 3410095fd88bafba6d08d0aacdca295cf86f4d8f028103934c03cb16da334955c1334039d000ef7eed471eb8020046c56cafb00dbc7713ecc1f76585cdc6f22f SHA512 11c5fa7a0fdc35a02fba22c940260a4a5bb26ec431d92e032789731afd97576cfe63c988ca614747ac477433cad640c972b48f5c90cb9893be28ffc9774c247c
 DIST subtle-2.4.0.crate 12411 BLAKE2B 32968997d71c6eab4bf2736090469afdb1adab3d2064afd1ab34a2711294bed1f00a715c2c748b25412ef9732c96bd132e20384019ca6bcc0a01ab602ec24117 SHA512 ffa173d6678879c382d9165ed8ac4480bfda2f03a451ff120767d90b2fa17ecaf234af15c2d153be0d96c8363de82f0be1fffb7770f3bd417e2567d146b61c86
+DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
 DIST syn-1.0.60.crate 231087 BLAKE2B c37be0cac1d9a5bdb7622fcf716cf2d7f3bbc1594f978ed98c84dcefce618c87bc8709ee491c0b9d01feba37d6db641eadf60d814df22cf80adc33279ce1ec94 SHA512 8474c40ce4257e3ee7eacd6f993745237181f2463067a9227bb62851d4a542657cd3811fd925c4e06c25909a5f69d9d8865a34fa479cbf3d5efabb1818e64d24
 DIST syn-1.0.64.crate 231549 BLAKE2B c039cdfb1701a2ed88aaa14fdb983f614266c006380c197a85c46fcdd20d7319bf864013ef84810aec73dfc6a586229dce601a4ce829ab66536e890247ca0cff SHA512 b43574c8d48743697bc46c17593347d0e98062b0086582f835281b6c52a8f3eac8cb59c212c77fee7f0a2be8525b5e0d8a807ff532a922f6dbd13ef7efc7fc22
 DIST syn-1.0.68.crate 231887 BLAKE2B 2e2547391fcd7a9854cfb888448eb89cdfd19ac20e9d909782ff11eb5bbd0b00717b3892199c2c88d005b8fda358ed10828a3f5a123a8d6416910d3b78971d5b SHA512 3023baeacb0164db641e809ac46fa48bdb8ff725e6c767764fa23552d53605dcad3d629f9c7a976a01ad7dd423595575d41c338223df5f7b72c417a97793414e
-DIST syn-1.0.72.crate 232500 BLAKE2B 8f71f7fb66426f78eec3439688b0468fbef582c8ca912781f19607acd9e8371f2230b305a96f613c16f7299e66fdb2395dc037e1093d3897864bd2bf50ab3d7e SHA512 f01e2ef74fc3f84a753c1c379c24e3c63f3c575d72ab865f8e7d51f4dee4293ac8197b4e123ebaa942e9199bf0a0d8194e57a5aa6314bee6951d3d458dfc3da9
 DIST syn-1.0.73.crate 232706 BLAKE2B c580f9ab914c54e731c8503c9b9d577d05032edb6bd12d7a183a3c0e3532fcf24196479a9ee40d09cb7e09ba6d94add36e338331affc2625058ce54419621ee4 SHA512 b37beb1b6d483cfdbc44d806af9955cdf52c4b0d5f918782019b089d06e107c7e23ced343a3bece20235a24752783795ebba8e603b61a6302e82ee7027843d8b
-DIST tar-0.4.33.crate 45448 BLAKE2B 380f20835bf04624c87201f54f575ce6f94a2ddcee4e58917777ce069fcc822101994d8b9f1f3a249d25e62d59527001807842e650edc9fbf7cdf55f65615da9 SHA512 69c5932790c2448d6d754a622066564027414ceff5b555c928f55f627c9e5e7c192e0c13f93af48d64d37d4f9f56c0cf8feeb3fe17d3861b277c66bcb8b1d9ec
+DIST syn-1.0.80.crate 234102 BLAKE2B 97e13bdf99f9d50b352eaf87ceb1cf27f74e59df7e40ef28508cc387f78c8472111aaeb5902e1e577e157cd16c7f431c2faf461cdf2554876a3d0ad7662d34f9 SHA512 3eb437757f25c1a10db8f9b10f21cc4de77be1aabd910f1618edd43ad309ef9142ef08def4cf6b2d7470165a7dd0783b28da54847678e22f2b2dcb2b4dad3c2d
 DIST tar-0.4.35.crate 46219 BLAKE2B f8bcdf4d92c66bf8ff1fe68ea8eef07ef919eaba16755a2783fbd2658e42d0c342efc8e64d4fa08e8beeac1e0d0d209e78478a17fd70ab5987f37598a26c936b SHA512 5e6f1030d4042704ae166fdc32fb6397d9e8bd588ca6d9526583909fbb3df3d09aa2a5da673b769acb0a9020e4f2bfd59f7e68f84b055d32574331ff5a224f2e
+DIST tar-0.4.37.crate 47381 BLAKE2B e1114952758457ece466afecd083344f52ef6893d5eda0faa57957a4fe6625ea63500717533bf45f1f50c9cff4476f756d78ea1afb3cdf7397b8d4ac91f79816 SHA512 ca0df9922fab708c8a03912010421dea8d8eb3281108f822e9edc4c4bb7a0f5f800aa2d971ddedb8a4c24ba22308ec07e7a04febdd53665c948f3b8ca0be7fb1
 DIST target-lexicon-0.12.0.crate 22025 BLAKE2B bf92692a45effcd4459cd2e70bd46eef7e43fea24b1e53f8f837498c9372465ae2dac63d142278b9a11892f1fbf574880c3aeae7a5aee7fec74941c4cc2eb7d0 SHA512 d2845086ae62b12a64f424c0255a389e3e3eb158fa73da1c8d3fa571a21b895c92115aa111750ed307cc2a4b6eae7f1b9e3aee59c195046a07fd6ee7f88fc184
+DIST target-lexicon-0.12.2.crate 22269 BLAKE2B fa47a88a8d96bfde1264a4fb0f05ddfb0453d0b69211d2b064cb1ad7b0a5e608725ca3e72aad61ab8281041cc17c50583117c02664f978f01bf6061a74dee75d SHA512 4301577316d939d23e7b71da0ccee3c7153fa4aa0910ec4fab070083cd25ebfbbc28c4254d5ff69a1c3451cf38fa10b2556e13dc99467f0c53b901018555e263
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thiserror-1.0.24.crate 16580 BLAKE2B 5cda4153e32ea4cf2f4f45fb60f18230dca61bc8d9b76aa598f7336babba8d6615d929ae325c84976ac60f4e8afa803f96d1b2afb6369445934e1e657bd9c846 SHA512 38ff620f1d33041600faaf3162ca0c1cfbe191100b6442513e4076a35296e97e28dedfda25dd0d7613f6a81b6b72816c11ac37424d94baa295142b1002d0e962
+DIST textwrap-0.14.2.crate 52016 BLAKE2B db80b15ba23db718064ef0214578ea6aa4f0ee3b76723adaca131be26b770324205f2ead13c8f5c1e438ae1b5c9476cf1ede8f4ed82426c9d99d9406f2b83191 SHA512 521ab37e03aae8fcce5b909541399fc90a23020e353f95102c658fa94ffc56b9bdff43f47fb3da6e30f5c9cc9447fab72fe21d7276dfa21fe5a1a5a1c874e371
 DIST thiserror-1.0.26.crate 16711 BLAKE2B 4524c3ef351eaa1266cbbbafec6082695d5c1485cec7bcfdffd64719fd57efb4e40f119435eae5c6f574a80f59a68bd8c868e2493ddf36f4882e7de65fd4bf93 SHA512 bfe93a14006a3d9e0e996b310718223f8442802a384a1b999c15dd1a25f642c5cb2db7a50a69cbb097ec50ee3b0129b509f19225ca714a5c459d4dfc8255d84b
-DIST thiserror-impl-1.0.24.crate 13361 BLAKE2B 4ae667e69d3dbe755cfb07083649c6d41bd5bddcfbe1d8954980e93390fb8eb51ffce6fb2d24c51fb676b6e75051ac66cff8c0cb3ad6683275581749f7c9f9f5 SHA512 4309506b8cf939e6a400542dce772b951d40faff3b2fb765ef87299547615fe18dfb877844b5ce892c594623a2de941a32629e53e2d59b03f611cfefeb169db5
+DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
 DIST thiserror-impl-1.0.26.crate 13431 BLAKE2B dc753a4cc1e7b8b3eb44bd9462b6b19ee983fefbfe1f60a974195a536fdbc68395942a229a1d2ec7a8594669a439a6efd3cd22573a647a7fb7a371e793fba645 SHA512 43eea818b72469bc4d5c28e449c2e284c1e11b2674b9e67b1788af7ab66bd64afabfd8f5861938a7f9547a9c13387e0ce400419c6283bbe1e899d18d998cd921
+DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
 DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
+DIST tinyvec-1.5.0.crate 42745 BLAKE2B 24d6f60d08b53e067ef783db4f6e51a9edd9f73fa9e3511791c1c00a861c6676f18043127351ecfc49771a760eeb7db53b584ee882dee6bdaefe5e6ba5053cda SHA512 b4d1624965ed6b7e8ea45d80fd7332b5733d7b5e78f8167d13c9b9e8eaf3c586268c2f88ea0c51211808def997f8e751214e3de757b19076807adf7aca8aba82
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
-DIST tokio-1.6.0.crate 463953 BLAKE2B 7c99d6c254fd3ab11b5b0d81bd648ddba72d1ca4e600a4e35bc2974dde69dd02b0ca060a90995ccb12e5705ea3638d9143116e3cccdf535e0ed536fcb463467b SHA512 bbc560a01e108155e2f6d30f3301acc09a67ef2cb3af88e62d46fe81433686c80e4a0b05041f2b88a811090d654d782c59baee069e7e82eaa4458449f0411753
+DIST tokio-1.12.0.crate 522732 BLAKE2B 5506c495c4a35c14144bf677ba4626cdcc0ddaf0a0e902beeff50dbf05161392d0a5c0d7f4c49478b8180d104dce60f43ddc3c2f1ab0f3b908520bda59a5caa2 SHA512 c6bc29623bc41816578a2e74c2793830b5fbce701ac5fa98033d5e5ba96ea081c744c690686c39db6837893a200d7d55cc5bb2270e66e1d7ac5cb7103fa44384
 DIST tokio-1.8.1.crate 491381 BLAKE2B 69969959b035a22f83e755978686a515ba4d1afe206d7a7958bb46aafde28c9e162bfd5549e250b5efd7e0892820b6ae1e8ccd5031e404e33f54600498e5c114 SHA512 c82f55c511041a46953e99d5d1bbd7b067b01f1c89f111c5a6981f2b2a2e9c33a4cab2ef267717eebb3b070b84b7ef6ad6a8375d980f11ae568cf770e84297a7
 DIST tokio-rustls-0.22.0.crate 22706 BLAKE2B 9ef76b96aaa10f49692581f7b4f04063729baaf3998b7e0a3d5700cd7613822efdc7fec334ec9d3718c700fbcbf572ee974e96bc3f79eabc774a801501b08ef8 SHA512 cac6c5ebbdb751721f881f6e4c21e1b34ff8aea84256e25f92cecbeb30b6db3a6b2d78b7eeca253179b78a94c9226aff23492b0311d81ce27470ce939e675d0a
 DIST tokio-util-0.6.7.crate 73201 BLAKE2B 4bed0bdc343b9fce03c12c0ab442cd7eaf3681232090547a0269bef5f362e1d96d2a10cf78708c6775234e23e8e2e00697333dc861df56136a29583d7a2401d2 SHA512 f6d81191a1caffd2cf78175bf0de3432bec684c739378072cf23daa1280b54d1781cf43d663a49b0cb34662043c1747073c97291414cf0407581325cb091b263
+DIST tokio-util-0.6.8.crate 74116 BLAKE2B f47f61a1566b721ef5294526f6b0fc08a5662eee2b12def6b699de38e6888e3cb61623a76a52a71843449a5657ce3829bd5fdf2826428e370b6d912320c5863c SHA512 b81ee8086a069de580bb2769145a77d12d3ae2c4d8a689d979c58988c64b221ffeeeb0f159181f92f402011931eda8549ff173b227433d6597492dc7f024b7bd
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
-DIST toml_edit-0.2.0.crate 46438 BLAKE2B d1e4f75c8268048e782504f0da33841da39a016442ee4ff8fe4fb01d724328ef526b452bebb1c7ad5ed1625daa9fa4f0a2838856bae62a0ecaa4e6d11532d8fc SHA512 79407bedb0557e95cb770c81b867f9be61a4e0fe5b71ed1197986ecdef39bd3f337a2b05eed5fb106a548857e5839cddf66abfdcb9a3a6bc38a444d6ad848418
 DIST tower-service-0.3.1.crate 6299 BLAKE2B f56562faebe3a933f39f8e2093af65378bd307c59f9695408510ea9ca2230c68228c6726a0a2c7c42943002837dd9d86ce0a1d4b7849ba5c61df28df7632d909 SHA512 d23f9db2d6632f561970b55eaeaac22a20c8b9af18931cd564db193688eb2a2973127b440e175cfd7358f3d0ead53f7a759e34b7b86c293751079af9c2181ba7
 DIST tracing-0.1.26.crate 68583 BLAKE2B dbdeb4081dddb777d52afd1afb043e018e72f99ce6c4fbb16cb14e618da9c794ee594252cdd7a6d4a7c149a8ea86d63f6e4f1d75ad3bd76590d70af107616eac SHA512 19ddccaebb2d3b2230a6ceda5f72af29200ae760e8d411c2073e7338a6ca2231c8b2b14180eabec78dd521ab7b48996966b0419725adf8c67a03d1775ec834be
+DIST tracing-0.1.29.crate 72444 BLAKE2B 637f52a1890ee8b2ce20eabb8491b100de680088792be87008107455e5404c9efdb2d2e97129fbed6ce29296a880ecfca370535ccefdea2fea49d9457ad6b683 SHA512 8b9c58aa6d236485cbd8e6c3b39a1cc05d30169dd9ddb377ba464ba72c774af69b0eecce1551660d26fa6735e5483f45463cfcd196513c0b4c351c900cf4c7d8
 DIST tracing-core-0.1.18.crate 48381 BLAKE2B f175efd5481bbc9e881a36dad6c29eeb4b39400dd117e178d9e7a0e765cfdd3f36abe7e3fc2a537c79c5af544c764a0273a382cae907f5e79b6c140ffd2b9a91 SHA512 a5fddcc04651d05e61c2422d028a399cca260672f7a8e5c072126d9d4e21ef7a38911fca09e32c6da287a0f1cb6d1297d30e0f6fbb951fc190d2a67281a115b7
+DIST tracing-core-0.1.21.crate 50683 BLAKE2B dc48e0fd6586b8ac0059469a26049c6746b44a06a4e7768d129822bbd2f6ce719c63964ee3e4f9543ce278566efda8fd957c8b4be8b696ef12724f899b2830dc SHA512 2c3e00674c02023ee3e9a114878ad8941253a9489312082b2cf9a163b04fb8d23767f00892874645f59f30b6f620dfb83dab8680c64db5510208678b52f2db9c
 DIST try-lock-0.2.3.crate 4158 BLAKE2B d8bb2fd8ba10285871ac3dee069474d4225e312c0a13b6bc238604c5207fe33437541abfdb507a6b400fc3359b78d39a7e9a5bebca426692b5dab4622b09c192 SHA512 ebae7ba9227e6fc20499b48ab85169943765342d4790bb4a31ac33a2be0af9401e2854c8e00b9d3b7e225d16875c90700b1c3fa99af07833d3b7a91b7a414fc3
 DIST typenum-1.13.0.crate 40238 BLAKE2B 5e5f9c8c60a4406c5a9a487033ddf7e8fd835bc255547e8b3f94c966e0f661f9b8a2f4a844661c00ee3c7e01f9fa109ac79c6bf53a064335c317dc9d9f8b0923 SHA512 0cd0b884509a5b4a252bed10309139350fce24b5d4bb887f4c0757ed18cb2481e331d7dc32fc81f4cabeeb5849e89ea5d92ea9815cb2985e5df4a022ac703de1
-DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
+DIST typenum-1.14.0.crate 40518 BLAKE2B ff6d77c28e41cddc1956619bca522f4ae5680cedf313d4a12a4d40f191f85ed10d673a32bdd811d7774a01a1b9b5adf9990269ae230737237249faad16ba7070 SHA512 e9739a24936563e9471213060d53d970f8cbbdd163892a22e98f1972d10861009ca1eb568c3bb5d1d78299482372fbe7e6bf42ec8f4f5f30df0a7446933a312c
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad
-DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
+DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
+DIST unicode-linebreak-0.1.2.crate 69293 BLAKE2B 825dc2a29d86314cff3492cac71add2cd48948284d9e9b684580186f4c021c8ce1e288d21cc47493eb19a158385ec602f0cd5608a7618e38667c1cc7445a302d SHA512 170db67d6d74df913dffc921986b92df8a2ba68776ddb17c8ffca51d0d4bee597a5460591e7ba593c1eaec8b6227956f4e0f9b11d217aed4ee85cf46f1be5277
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
-DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
 DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
+DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST unindent-0.1.7.crate 8346 BLAKE2B cbf76fd18e49332e61275ab204cef1fc4dee58091307f8cbe2107d3a8441551055541583f1d643d4d15f9cc17a8405f540f0c53548f5b2379dd70791a03640cb SHA512 d3f4543f97f1386f63306a206074de1d10077ae968ea6eb6638545eeaf8cef662e1c84a15788e9df640eeb6af4cbc187721ec01af43984e4eeb2dfb0423c6d70
-DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
 DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa0282af4faaf2cfb15718421ff26abc56021c546f6aebb411f5abd27020273ba0f785e012a4b0089e96c2db4faa6 SHA512 5ebe3266912e4e78fdfdd13f9fcc07e9cf489d19d5e9ff346486f47aa58a0aca35278d561612c49eb3cab5a6759ac974d3b92bfabc399e1bc0808428dc347be0
 DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
 DIST uuid-0.8.2.crate 37909 BLAKE2B e6ede5f8ae05572d4c55909eb3fe6946de6f10ad9bf71bd357739bc01201bf93f59ccbb3dabcbfd7b3e54b0c98c3b52d21f1bf1877b7283c6df623e9b2b3f33f SHA512 5a1f5ead9a920b9bbc120c02049c24b62ec215765e486d3a15c5015ef49fa506206efb737e6f6555cf6e2eddddfe55f0ca1d7dcfa9aa8bcf3e0ef570a54fa2d8
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
-DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST wasm-bindgen-0.2.74.crate 158439 BLAKE2B 28a0be539d0bdec4e23d4c5a613ec0727c00112d1da1948c050d4ce6f5f42a07fce6d1f2fafa7a66ecee9183fee9a7c23845e12eb50d206f760bfc76dad41491 SHA512 21ac04c54be9f3d3f32edbcffcd24cb9401418e0a398a3f00b6d4a0302bb32b7b044b513163a12952b09b9465b07ec7e4c26a83ad88f8ae39ac5fdc9439a1af5
+DIST wasm-bindgen-0.2.78.crate 162111 BLAKE2B a3311e67900961b35a59ead7a8972dcee37671921c0f524895c821658a7b1246403d4674bee1735f1b2b94aa789d5376edd02afe4c8ebda110f4344ef58c9225 SHA512 bedeb2828d1e74b1e373bdf34dc2eaec70dd523e9ed96a341da1ab3729a7cf8470a828ddb9cfd4cf15af6e2fff75b4368553ab4f6f02c8dec9419dcdd7578de9
 DIST wasm-bindgen-backend-0.2.74.crate 25434 BLAKE2B 211365a4407865646376bc40fbfd9865715b137aadc18f267a9d32be8e0e585d05286f8a40cba20060e3591e3a5afa49f678bac6546cde7ef88c2bde36909724 SHA512 df9fdca6c48ecf1926552c4fe06a5936f7ea0523d62e0c62f104ce5eeae7ced1fa33875e2d3ef43d58a6395f77dd37e4882850443eb1d6aa59f0ec0bcf537cfb
+DIST wasm-bindgen-backend-0.2.78.crate 25576 BLAKE2B 03dc6b255ab9e30f9eb54f81638eb02a05a0b994ddd51f47852bca376a02080fcce596453d688f5e8e7b5a814fd081b9709c1215f7e9f9fec0e4a7a6cba1000c SHA512 00a0ec9afb65c084b64cf9d25f778ab03bf2368a1e0ff213e07b8fe742a125ddae00c7b4d693225d6d798618b0441d4dea3c175cacdb37fdd75b0a46ba3a287b
 DIST wasm-bindgen-futures-0.4.24.crate 14759 BLAKE2B 608e230509509508130e955d839cb1cef0b3f4c2ce4b69ec61e6357397b9d476e63b69335510f18289de74d63dd007486b5bb74020b9e79344d4c2bb91db0825 SHA512 a1b2220c7760300fe07937b039eb6dbb86e0110f5600d366a6a365ab74ca7894ff251902a78bf5aa3757cdc55a9de316e24fa26c68bbfda4ecabdc42e273a385
+DIST wasm-bindgen-futures-0.4.28.crate 14734 BLAKE2B a8db494634c36c1e2201ef8a73c3233be5b5e0ffd68212e071c82756295bc48f7a7e68fe1f592a1e7cca9f7e831e1372f599667e72ad739ffb80baac07a56db2 SHA512 16914f3218dc523522bab90dbeaa969de300b500d3669efec14e0fc5718b867a6cc849323119b1b80079a61a0656904237af78d8bae1514cf7c19dadd6a7f29e
 DIST wasm-bindgen-macro-0.2.74.crate 11536 BLAKE2B 65cd4b6206cc3f8303f89a76628cf54f7e31b31857eac3cc2c377b4a11f7c32548faf6a87f4a821e4ac6f66ca8d36427f4563eac8cc84e2612d5a9438b8df861 SHA512 34c7f3703ee1ee2060ba6ae638bc69193d32ced9e30c40d75bae1431efdd76b4f3adca8f9a72fb7c75f894de42a478556828e1a3854e436427bbd5dc6dc7b838
+DIST wasm-bindgen-macro-0.2.78.crate 11700 BLAKE2B 9f1538d79a39555f643b9ac6bfe026c259dfd129c45fdcc33cfbeeba2acb2a26ff4c9df83a3d11674c5ef8e9393af7a4d0cd7e3bd08b7eca0fa55986c893c5e3 SHA512 3389922198b0d5c19163f4de345e0cd7a3c0609d48ff933bd5af0cfb205463632878b5d60bfeeb8dd8f8a98f28f23c5185dd6d8389f599f31176297c944b595d
 DIST wasm-bindgen-macro-support-0.2.74.crate 17831 BLAKE2B 29f3828f58b0e8eaae04e1d73bbf0b4cea7b75c1a5ae4348938a5f77d9eb1a1ee13dd137f9750f4c8defa6f2f5444d66b6715bc5052c57a603bf3a94cb05a428 SHA512 feab4a3661a879d5fdef852531e3261060db46f1d80106926bc8a8294a19adb104a9cfb59f3fead693abf3707118084a063906248d3f4c566b43e9aa9c2983b4
+DIST wasm-bindgen-macro-support-0.2.78.crate 17858 BLAKE2B 8378f639a94797d2d149f2cd836f56143a498d3be5fc30eced6fe4fc2e1bfe14a70f3165cdc5cc1c88f0162efec75b64e56aa9819596984afa97003601b933ce SHA512 84d9867407a7caa942ab11f0ad1c343839bf51793930cdc3ebc5279ca370062eda006540448cc401f6afa078dbb1523b348ae69f4c6d7ccc9a7b8fa1ff895236
 DIST wasm-bindgen-shared-0.2.74.crate 7163 BLAKE2B 076464004d12495342a4b24f1dedc629f0ebb49993fce74271a5e59cd39e9a38ceea9a287716c65c2e61744c829388f7cdd7597a541da22b4f794b8bc3d44094 SHA512 4613c677d04abcabe6132f8f2a5a24f622cb1cb0c084f535e2f97584acba7a0faa12fd0636186b58756a7e4a82f364b04ea73330d7841940917f5e3324d0e60a
+DIST wasm-bindgen-shared-0.2.78.crate 7206 BLAKE2B ee60946d3a90a2760d8cb045657de659c6367aed2d98efd60074cb57f6b06aedf9ac44fed3d41c20299c5edc095cac5537a365fdb01183f3e60b6323da581935 SHA512 a808b7a7909e4a287ccced1b251ad4c1230399c84c05e246127b6a91fa4ed328d6a24316dbdc1843db71a5bd78cfd80113424f9984e0777323d74e3125607134
 DIST web-sys-0.3.51.crate 651133 BLAKE2B 330aaa7323a516eb840b2a6ff0ee2e076ed70990c04679dca328d5eeae9aac01fb07a4e2852615715f14abe368989f84f159ac72a4c320c01437056dd7dec706 SHA512 fd0e1ec156d88699adc271d092dd1adf4d41cd554b2b49e2c53423eabbc2215b539a435d1b9146dccc40282339d766565ccdedef82febcafca43cb6e1437e5fc
+DIST web-sys-0.3.55.crate 664827 BLAKE2B 1864f320e6c9b80c6b4b4fd8941d66cf9368a9b0cebcb86d3486b99f65456748b46c507a1bb761611c4825d412986f5bd8c8fc38c3bda3dad2e9de213467ee51 SHA512 ddf191f009d49388bf60ee31650eff1ff884f01822989a226c559b9560aebd90681fadd34e7437f555d627a0a3139ebe267375618eadac8c17ace5fd47650764
 DIST webpki-0.21.4.crate 58505 BLAKE2B 29a5fae21d885e90be8fa0b78a9b164f925e881431e79e9ea9702e8458242559c3f5b5535e04ff3ffb2018c1831b7dd685b5cdb5b9aa9942f6b9038c403da363 SHA512 667c9dc1c50a3d99aab53b6a9974f503e5c88f79012b3c94386a321761b96a74cc743a4e3b85d8314c36cef5ef01c2a2faffa80c773be1ba9680af4f21af3119
 DIST webpki-roots-0.21.1.crate 223591 BLAKE2B 9f3a2720a1b65112fbf8661216195598de9da59b0bc028f0666077150b02dd873cd6f7ed820f47877b4a37a1840dcaaddfdce91cce02473ac14d3b864677f332 SHA512 12563743c86a908c9f56c25234e08d810de418d80714bc8d2eb36c8500b5bb02f28f50ba2d53fb162cdce8ab35db0103d9f63f064d44ed8c17523a93418ea72a
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
@@ -309,8 +338,7 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST winreg-0.7.0.crate 21225 BLAKE2B 5841db683dc0aa8b92de8ec43100403b029c8d3e544adcaab030d998e5af4644ea176ac0bcd97141d137450a7bd761a5291405202c445a326da7d4f240686230 SHA512 a0b7a2d239e30cea89a863b879831bc32b5f2988ef3f0586ddadda48827cafc82d3602d2f8df3c47dc1e80537149a1ca1dc1506f9fbf960d9ba081dff1bac731
 DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c1f3980c65f26adbe177efaa6c93e0c6ecac4ee0687609a932c957efb11678c9176d44010eebee651fc84c SHA512 a89d34313c35ab02d6ea25675c99f9c9650dee40a76223d62941edda43b3d2db83ed223bada129625b3cf8487c293646ce9980afc6dba8888fa078d5aa035cab
-DIST zip-0.5.12.crate 43857 BLAKE2B 9b1b0dcd5f04300efd3c7e480eb0d14e7c36f2819a187c9b435da99f61c4ee93ca469fa4810a1bd52624138e51ac276a68e9d05df75bea5bbfe89d845f1c2662 SHA512 8ead1f24eb7c8c7624c80f8fdc17d85c397686b2cb45174bdc8cfab44417738e1d1a49ae3f776dc0fbb698b20b7de71e94afe1526f8814061289f229891d95f0
 DIST zip-0.5.13.crate 48237 BLAKE2B 0ffd9c41535f3e49d091b831925e8b639f3128702deafc75e0ea712b67df6f0900ec79628dd2640eb9b91fba7e828abd8b5c9edad87fbe7b22e042ef9909b07f SHA512 b30950ede91cdb1d4ef4f9d6aee8f62a3aa5a1a6422bd10507dfd76edc02c1bd24d41c7bf2ac416a5ee045562cacda0d17cd04938ec02b8be0a0d64acbaf7e01
-EBUILD maturin-0.10.6.ebuild 5504 BLAKE2B 7d0a8021900294b36c10575624bc87f7f1ecc9b25b8048bec94aeaa4fa75834f68ad8106325da8d3d431b88e71278ebec9b966b0727dd0607941d90a839b6e0d SHA512 3634ff3687b1397214cfbb1a89a65dcba9dbb50837c91158e7b2601ae3e08ee1e0723cd7b0fada0826a6d07fd1ffd74147ac7a83c25edccee4d928079d78391a
 EBUILD maturin-0.11.1.ebuild 5275 BLAKE2B 9f97bf1e93b11e3835e9b3b971a3b84c581e386f931c40a32932d838a84d431e9df70e1af00cf15850e91eff081121c49cd4a81bec96a7cd551c7adf0a18338c SHA512 94f9ea78018432bea6a102f7019cb81e695df088182a4e5eb03a0515fa091fcdeda15ce199915fd7319ec5b1c6ee8a07a7975e2158ba1702391eaa384afdd329
-MISC metadata.xml 353 BLAKE2B 5ae7ff28ad7be585a5e3a6486efae362181132f2a89c257834c702403aee5e4e822d8cef12cfb63d5a17ea72cfacc07f4fa660e3946e7a5e4bd3ab8c50a1ee75 SHA512 0a417a4e8b71fd87af611df11e4deecdde0dde38cd2526b4c3f7de5bc470915192f65dcd1af51fe122a919e39fe24a9f3a933873ab9be79a527440af1207cd3b
+EBUILD maturin-0.11.5.ebuild 5436 BLAKE2B 371050840f00457fca54a64ddee726e9a58fa64bfb362ed87ef0ea682deaea707c0147f26e898b0c5b8a5605b23b6fcdce08869b5707294f6cd69541c4a74027 SHA512 d11769cb7b1954f30a1d8f8397345fab96c6c9caaa4d5ec91c942f4f1b2bdf58b8b6d16df3c7fe455a404b14a3dad0ec291870ed5cb356d9e8fcec8e2a90b939
+MISC metadata.xml 536 BLAKE2B a94fef48d69a1f23ab4cb0c676c47c8b3b3337f78f2095384e9ef73fcf04a9c117766b633cca82c8bde782e70051a944d7508863e36e69f821de7399ea4afab8 SHA512 b66a31403684e70656c7cc25cb0654ac04e4e5c79f822ef3c4ae8aa9ff44fbd13914a90290c922e98c2e55e90a06f9250b93d71fdab51a7d2a727c33d872f247
diff --git a/dev-util/maturin/maturin-0.10.6.ebuild b/dev-util/maturin/maturin-0.10.6.ebuild
deleted file mode 100644
index fa5aa9ad9a15..000000000000
--- a/dev-util/maturin/maturin-0.10.6.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-addr2line-0.15.1
-adler-1.0.2
-aes-0.6.0
-aes-soft-0.6.4
-aesni-0.10.0
-aho-corasick-0.7.18
-ansi_term-0.11.0
-anyhow-1.0.40
-ascii-0.9.3
-atty-0.2.14
-autocfg-1.0.1
-backtrace-0.3.59
-base64-0.10.1
-base64-0.13.0
-bitflags-1.2.1
-block-buffer-0.9.0
-block-modes-0.7.0
-block-padding-0.2.1
-bumpalo-3.6.1
-byteorder-1.4.3
-bytes-1.0.1
-bytesize-1.0.1
-bzip2-0.3.3
-bzip2-sys-0.1.10+1.0.8
-camino-1.0.4
-cargo-platform-0.1.1
-cargo_metadata-0.13.1
-cbindgen-0.19.0
-cc-1.0.67
-cfg-if-1.0.0
-charset-0.1.2
-chrono-0.4.19
-cipher-0.2.5
-clap-2.33.3
-combine-3.8.1
-configparser-2.0.1
-core-foundation-0.7.0
-core-foundation-sys-0.7.0
-cpufeatures-0.1.4
-crc32fast-1.2.1
-crypto-mac-0.10.0
-dbus-0.2.3
-derivative-2.2.0
-digest-0.9.0
-dirs-3.0.2
-dirs-sys-0.3.6
-either-1.6.1
-encoding_rs-0.8.28
-env_logger-0.7.1
-fat-macho-0.4.3
-filetime-0.2.14
-flate2-1.0.20
-fnv-1.0.7
-form_urlencoded-1.0.1
-fs-err-2.6.0
-futures-channel-0.3.15
-futures-core-0.3.15
-futures-io-0.3.15
-futures-macro-0.3.15
-futures-sink-0.3.15
-futures-task-0.3.15
-futures-util-0.3.15
-generic-array-0.14.4
-getrandom-0.1.16
-getrandom-0.2.3
-gimli-0.24.0
-glob-0.3.0
-goblin-0.4.0
-h2-0.3.3
-hashbrown-0.9.1
-heck-0.3.2
-hermit-abi-0.1.18
-hkdf-0.10.0
-hmac-0.10.1
-http-0.2.4
-http-body-0.4.2
-httparse-1.4.1
-httpdate-1.0.0
-human-panic-1.0.3
-humantime-1.3.0
-hyper-0.14.7
-hyper-rustls-0.22.1
-idna-0.2.3
-indexmap-1.6.2
-indoc-1.0.3
-ipnet-2.3.0
-itoa-0.4.7
-js-sys-0.3.51
-keyring-0.10.1
-lazy_static-1.4.0
-libc-0.2.94
-linked-hash-map-0.5.4
-llvm-bitcode-0.1.2
-log-0.4.14
-mailparse-0.13.4
-matches-0.1.8
-memchr-2.4.0
-mime-0.3.16
-mime_guess-2.0.3
-miniz_oxide-0.4.4
-mio-0.7.11
-miow-0.3.7
-ntapi-0.3.6
-num-0.3.1
-num-bigint-0.3.2
-num-complex-0.3.1
-num-integer-0.1.44
-num-iter-0.1.42
-num-rational-0.3.2
-num-traits-0.2.14
-num_cpus-1.13.0
-num_enum-0.5.1
-num_enum_derive-0.5.1
-object-0.24.0
-once_cell-1.7.2
-opaque-debug-0.3.0
-os_type-2.3.0
-percent-encoding-2.1.0
-pest-2.1.3
-pin-project-1.0.7
-pin-project-internal-1.0.7
-pin-project-lite-0.2.6
-pin-utils-0.1.0
-pkg-config-0.3.19
-plain-0.2.3
-platform-info-0.1.0
-ppv-lite86-0.2.10
-pretty_env_logger-0.4.0
-proc-macro-crate-0.1.5
-proc-macro-error-1.0.4
-proc-macro-error-attr-1.0.4
-proc-macro-hack-0.5.19
-proc-macro-nested-0.1.7
-proc-macro2-1.0.27
-quick-error-1.2.3
-quote-1.0.9
-quoted_printable-0.4.3
-rand-0.7.3
-rand-0.8.3
-rand_chacha-0.2.2
-rand_chacha-0.3.0
-rand_core-0.5.1
-rand_core-0.6.2
-rand_hc-0.2.0
-rand_hc-0.3.0
-redox_syscall-0.2.8
-redox_users-0.4.0
-regex-1.5.4
-regex-syntax-0.6.25
-remove_dir_all-0.5.3
-reqwest-0.11.3
-ring-0.16.20
-rpassword-5.0.1
-rustc-demangle-0.1.19
-rustls-0.19.1
-ryu-1.0.5
-same-file-1.0.6
-scroll-0.10.2
-scroll_derive-0.10.5
-sct-0.6.1
-secret-service-1.1.3
-security-framework-0.4.4
-security-framework-sys-0.4.3
-semver-0.11.0
-semver-parser-0.10.2
-serde-1.0.126
-serde_derive-1.0.126
-serde_json-1.0.64
-serde_urlencoded-0.7.0
-sha2-0.9.5
-shlex-1.0.0
-slab-0.4.3
-socket2-0.4.0
-spin-0.5.2
-strsim-0.8.0
-structopt-0.3.21
-structopt-derive-0.4.14
-subtle-2.4.0
-syn-1.0.72
-tar-0.4.33
-target-lexicon-0.12.0
-tempfile-3.2.0
-termcolor-1.1.2
-textwrap-0.11.0
-thiserror-1.0.24
-thiserror-impl-1.0.24
-time-0.1.43
-tinyvec-1.2.0
-tinyvec_macros-0.1.0
-tokio-1.6.0
-tokio-rustls-0.22.0
-tokio-util-0.6.7
-toml-0.5.8
-toml_edit-0.2.0
-tower-service-0.3.1
-tracing-0.1.26
-tracing-core-0.1.18
-try-lock-0.2.3
-typenum-1.13.0
-ucd-trie-0.1.3
-unicase-2.6.0
-unicode-bidi-0.3.5
-unicode-normalization-0.1.17
-unicode-segmentation-1.7.1
-unicode-width-0.1.8
-unicode-xid-0.2.2
-unindent-0.1.7
-unreachable-1.0.0
-untrusted-0.7.1
-url-2.2.2
-uuid-0.8.2
-vec_map-0.8.2
-version_check-0.9.3
-void-1.0.2
-walkdir-2.3.2
-want-0.3.0
-wasi-0.9.0+wasi-snapshot-preview1
-wasi-0.10.2+wasi-snapshot-preview1
-wasm-bindgen-0.2.74
-wasm-bindgen-backend-0.2.74
-wasm-bindgen-futures-0.4.24
-wasm-bindgen-macro-0.2.74
-wasm-bindgen-macro-support-0.2.74
-wasm-bindgen-shared-0.2.74
-web-sys-0.3.51
-webpki-0.21.4
-webpki-roots-0.21.1
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.5
-winapi-x86_64-pc-windows-gnu-0.4.0
-winreg-0.7.0
-xattr-0.2.2
-zip-0.5.12
-"
-CRATES_TEST="
-ctor-0.1.19
-ctor-0.1.20
-ghost-0.1.2
-indoc-0.3.6
-indoc-impl-0.3.6
-instant-0.1.9
-inventory-0.1.10
-inventory-impl-0.1.10
-libc-0.2.86
-libc-0.2.90
-libc-0.2.92
-lock_api-0.4.2
-lock_api-0.4.3
-parking_lot-0.11.1
-parking_lot_core-0.8.3
-paste-0.1.18
-paste-impl-0.1.18
-proc-macro2-1.0.24
-proc-macro2-1.0.26
-pyo3-0.13.2
-pyo3-macros-0.13.2
-pyo3-macros-backend-0.13.2
-redox_syscall-0.2.5
-scopeguard-1.1.0
-smallvec-1.6.1
-syn-1.0.60
-syn-1.0.64
-syn-1.0.68
-unicode-xid-0.2.1
-"
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit cargo python-any-r1
-
-DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
-HOMEPAGE="https://github.com/PyO3/maturin"
-SRC_URI="https://github.com/PyO3/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="test? (
-		$(python_gen_any_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-			dev-python/pycparser[${PYTHON_USEDEP}]
-		')
-	)"
-BDEPEND=""
-
-QA_FLAGS_IGNORED="usr/bin/maturin"
-
-python_check_deps() {
-	has_version -d "dev-python/cffi[${PYTHON_USEDEP}]" &&
-	has_version -d "dev-python/pycparser[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_install() {
-	cargo_src_install
-	dodoc Readme.md
-}
-
-src_test() {
-	cargo_src_test -- --skip locked_doesnt_build_without_cargo_lock
-}
diff --git a/dev-util/maturin/maturin-0.11.5.ebuild b/dev-util/maturin/maturin-0.11.5.ebuild
new file mode 100644
index 000000000000..e4c63d8660ab
--- /dev/null
+++ b/dev-util/maturin/maturin-0.11.5.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	addr2line-0.16.0
+	adler-1.0.2
+	aes-0.6.0
+	aes-soft-0.6.4
+	aesni-0.10.0
+	aho-corasick-0.7.18
+	ansi_term-0.11.0
+	anyhow-1.0.44
+	atty-0.2.14
+	autocfg-1.0.1
+	backtrace-0.3.61
+	base64-0.10.1
+	base64-0.13.0
+	bitflags-1.3.2
+	block-buffer-0.9.0
+	block-modes-0.7.0
+	block-padding-0.2.1
+	bumpalo-3.7.1
+	byteorder-1.4.3
+	bytes-1.1.0
+	bytesize-1.1.0
+	bzip2-0.4.3
+	bzip2-sys-0.1.11+1.0.8
+	camino-1.0.5
+	cargo-platform-0.1.2
+	cargo_metadata-0.14.0
+	cbindgen-0.20.0
+	cc-1.0.71
+	cfg-if-1.0.0
+	charset-0.1.2
+	cipher-0.2.5
+	clap-2.33.3
+	configparser-2.1.0
+	core-foundation-0.7.0
+	core-foundation-sys-0.7.0
+	cpufeatures-0.2.1
+	crc32fast-1.2.1
+	crypto-mac-0.10.1
+	dbus-0.2.3
+	digest-0.9.0
+	dirs-4.0.0
+	dirs-sys-0.3.6
+	encoding_rs-0.8.28
+	env_logger-0.7.1
+	fat-macho-0.4.4
+	filetime-0.2.15
+	flate2-1.0.22
+	fnv-1.0.7
+	form_urlencoded-1.0.1
+	fs-err-2.6.0
+	futures-channel-0.3.17
+	futures-core-0.3.17
+	futures-io-0.3.17
+	futures-macro-0.3.17
+	futures-sink-0.3.17
+	futures-task-0.3.17
+	futures-util-0.3.17
+	generic-array-0.14.4
+	getrandom-0.1.16
+	getrandom-0.2.3
+	gimli-0.25.0
+	glob-0.3.0
+	goblin-0.4.3
+	h2-0.3.6
+	hashbrown-0.11.2
+	heck-0.3.3
+	hermit-abi-0.1.19
+	hkdf-0.10.0
+	hmac-0.10.1
+	http-0.2.5
+	http-body-0.4.3
+	httparse-1.5.1
+	httpdate-1.0.1
+	human-panic-1.0.3
+	humantime-1.3.0
+	hyper-0.14.13
+	hyper-rustls-0.22.1
+	idna-0.2.3
+	indexmap-1.7.0
+	indoc-1.0.3
+	ipnet-2.3.1
+	itoa-0.4.8
+	js-sys-0.3.55
+	keyring-0.10.1
+	lazy_static-1.4.0
+	libc-0.2.103
+	log-0.4.14
+	mailparse-0.13.6
+	matches-0.1.9
+	memchr-2.4.1
+	mime-0.3.16
+	mime_guess-2.0.3
+	miniz_oxide-0.4.4
+	mio-0.7.13
+	miow-0.3.7
+	ntapi-0.3.6
+	num-0.3.1
+	num-bigint-0.3.3
+	num-complex-0.3.1
+	num-integer-0.1.44
+	num-iter-0.1.42
+	num-rational-0.3.2
+	num-traits-0.2.14
+	num_cpus-1.13.0
+	object-0.26.2
+	once_cell-1.8.0
+	opaque-debug-0.3.0
+	os_type-2.3.0
+	percent-encoding-2.1.0
+	pin-project-lite-0.2.7
+	pin-utils-0.1.0
+	pkg-config-0.3.20
+	plain-0.2.3
+	platform-info-0.1.0
+	ppv-lite86-0.2.10
+	pretty_env_logger-0.4.0
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro-hack-0.5.19
+	proc-macro-nested-0.1.7
+	proc-macro2-1.0.30
+	pyproject-toml-0.2.0
+	python-pkginfo-0.5.0
+	quick-error-1.2.3
+	quote-1.0.10
+	quoted_printable-0.4.3
+	rand-0.7.3
+	rand-0.8.4
+	rand_chacha-0.2.2
+	rand_chacha-0.3.1
+	rand_core-0.5.1
+	rand_core-0.6.3
+	rand_hc-0.2.0
+	rand_hc-0.3.1
+	redox_syscall-0.2.10
+	redox_users-0.4.0
+	regex-1.5.4
+	regex-syntax-0.6.25
+	remove_dir_all-0.5.3
+	reqwest-0.11.5
+	rfc2047-decoder-0.1.2
+	ring-0.16.20
+	rpassword-5.0.1
+	rustc-demangle-0.1.21
+	rustls-0.19.1
+	ryu-1.0.5
+	same-file-1.0.6
+	scroll-0.10.2
+	scroll_derive-0.10.5
+	sct-0.6.1
+	secret-service-1.1.3
+	security-framework-0.4.4
+	security-framework-sys-0.4.3
+	semver-1.0.4
+	serde-1.0.130
+	serde_derive-1.0.130
+	serde_json-1.0.68
+	serde_urlencoded-0.7.0
+	sha2-0.9.8
+	shlex-1.1.0
+	slab-0.4.4
+	smawk-0.3.1
+	socket2-0.4.2
+	spin-0.5.2
+	strsim-0.8.0
+	structopt-0.3.23
+	structopt-derive-0.4.16
+	subtle-2.4.1
+	syn-1.0.80
+	tar-0.4.37
+	target-lexicon-0.12.2
+	tempfile-3.2.0
+	termcolor-1.1.2
+	textwrap-0.11.0
+	textwrap-0.14.2
+	thiserror-1.0.30
+	thiserror-impl-1.0.30
+	time-0.1.43
+	tinyvec-1.5.0
+	tinyvec_macros-0.1.0
+	tokio-1.12.0
+	tokio-rustls-0.22.0
+	tokio-util-0.6.8
+	toml-0.5.8
+	tower-service-0.3.1
+	tracing-0.1.29
+	tracing-core-0.1.21
+	try-lock-0.2.3
+	typenum-1.14.0
+	unicase-2.6.0
+	unicode-bidi-0.3.7
+	unicode-linebreak-0.1.2
+	unicode-normalization-0.1.19
+	unicode-segmentation-1.8.0
+	unicode-width-0.1.9
+	unicode-xid-0.2.2
+	unindent-0.1.7
+	untrusted-0.7.1
+	url-2.2.2
+	uuid-0.8.2
+	vec_map-0.8.2
+	version_check-0.9.3
+	walkdir-2.3.2
+	want-0.3.0
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasi-0.9.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.78
+	wasm-bindgen-backend-0.2.78
+	wasm-bindgen-futures-0.4.28
+	wasm-bindgen-macro-0.2.78
+	wasm-bindgen-macro-support-0.2.78
+	wasm-bindgen-shared-0.2.78
+	web-sys-0.3.55
+	webpki-0.21.4
+	webpki-roots-0.21.1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	winreg-0.7.0
+	xattr-0.2.2
+	zip-0.5.13"
+CRATES_TEST="
+	indoc-0.3.6
+	indoc-impl-0.3.6
+	instant-0.1.11
+	lock_api-0.4.5
+	parking_lot-0.11.2
+	parking_lot_core-0.8.5
+	paste-0.1.18
+	paste-impl-0.1.18
+	proc-macro2-1.0.29
+	pyo3-0.14.5
+	pyo3-build-config-0.14.5
+	pyo3-macros-0.14.5
+	pyo3-macros-backend-0.14.5
+	scopeguard-1.1.0
+	smallvec-1.7.0"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cargo python-any-r1
+
+DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
+HOMEPAGE="https://github.com/pyo3/maturin"
+SRC_URI="
+	https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)
+	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0 openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+PROPERTIES="test_network"
+RESTRICT="test" # uses venv+pip
+
+BDEPEND="
+	test? (
+		$(python_gen_any_dep '
+			dev-python/cffi[${PYTHON_USEDEP}]
+			dev-python/virtualenv[${PYTHON_USEDEP}]
+		')
+	)"
+
+QA_FLAGS_IGNORED="usr/bin/maturin"
+
+python_check_deps() {
+	has_version -b "dev-python/cffi[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/virtualenv[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_test() {
+	cargo_src_test -- --skip locked_doesnt_build_without_cargo_lock
+}
+
+src_install() {
+	cargo_src_install
+
+	dodoc Changelog.md Readme.md
+}
diff --git a/dev-util/maturin/metadata.xml b/dev-util/maturin/metadata.xml
index 9bf533f70f9f..0a1aa95948fc 100644
--- a/dev-util/maturin/metadata.xml
+++ b/dev-util/maturin/metadata.xml
@@ -5,8 +5,15 @@
 		<email>steils@gentoo.org</email>
 		<name>Stefan Strogin</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>rust@gentoo.org</email>
 		<name>Rust Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">PyO3/maturin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 0befb52fd484..610918d10084 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -4,7 +4,7 @@ DIST meson-0.58.2.tar.gz 1899464 BLAKE2B 48c4c0cec2cb1c55e51cd56e08461ad7d95211d
 DIST meson-0.59.1.tar.gz 1944678 BLAKE2B 08dee8ada7824faf93b730bd8cf86113fe85ecf57c53a7ee4be89371004e13b99e14933761398e6db5a359c5aad07a96f99c0b5be144a75c749e40d153cefa7f SHA512 c45e29869dc681675b2643c37c892e7fff365c051edce4f2ec278fc6cee25bac6818add819e4db69d2fe3c1ba9572fc55bb8f67fe791cdc9c187627c71b01963
 DIST meson-0.59.2.tar.gz 1952115 BLAKE2B f3946976e793540c78c54de367c6576bb35c1217fdc45c1e6f62e12edb9f755d6bceb850fecd313ec71e49e59fc3ab856d68af8874333b787d302c4f41784543 SHA512 910e4a8c9828506b576dc8ae0b5765efec24f44a34a5694f782c8a533d75053b10b4167564c06456d05f7a32c5fd9bd657faa62329e1e4ed24bfc4c9ac1ef73e
 EBUILD meson-0.58.2-r1.ebuild 2757 BLAKE2B b64fd553319824c0c05059a41b639b4b8260196f17c4bca32cb587ff9775d11d97cf75e5634b1880105920169a950abc777946182a6c54da04d7f108cb406d1e SHA512 d43bb51ac9853a6820b40c2e683882982aea1ed8334d000459c7fa46607d56c8737651e48f313062345c68f1ceba66197e46f6d7d5bddfc08693ad242403ba54
-EBUILD meson-0.59.1-r1.ebuild 2805 BLAKE2B c00b90b40ae80a5f7e7d544838308f64b505d3a010b1e6134cdf89523bd9c2fdb13fc181be8fda16cbb0e23c191a61103af9e40611449075a8f3ea38411dde5d SHA512 49de321eed3ad8d3f7905073da446e417d4e49024a41410dd70f5535102012f03390d002e1808f177435c3309b725ac11e7b8326ffeabb2cdb9d908641c6798a
+EBUILD meson-0.59.1-r1.ebuild 2804 BLAKE2B 8ea60235201c73c667985ea4cb48d45ced5453e2da646352cb52368a6b28a4fba4d664c1405254205a1697dcf4e94885a1028c28faefa35f93ecb715197a3b32 SHA512 bdebf4f3646e6d32318647d9edf5a1845edcc0e23ce36fb2d498c3d53260d68a7b89050d8371153c8394da7d89ec5aec5d9aff8df878ce03311979f086b9d61d
 EBUILD meson-0.59.2.ebuild 2812 BLAKE2B 67d7f42cfadfc3152a4a1b2f95be694439b34040c20d56b1d533d30668ec58ffd89305438a38dcd0c1f3d1afe4ca817ee8eca5d05ec36cb88ebeafd1851412a0 SHA512 90f775a4130d9570e01d8db6e35f7ba94371062735837e18f77f9b2b3ccff7e35ed6fe4342d0b132a8b7b157562e39fb3da1ebe19d8037280582c55e31317662
 EBUILD meson-9999.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
 MISC metadata.xml 424 BLAKE2B 9e8cee51a5a6699950f1f4fc203732032afa7b36229bd4117a2b2164761ba0375bbc2c6001a81b48b67171f4b9850e948f6da229cffb9649acc0f514a675c922 SHA512 266b94131a352512bfac11c3db7ff840a6d050eb71c814a5223c9d3bb6f1be30506c9188ef1725a2b435c0b44923aa3efcea5f3d041f0acce0141dfe37ba66c4
diff --git a/dev-util/meson/meson-0.59.1-r1.ebuild b/dev-util/meson/meson-0.59.1-r1.ebuild
index b370927ef086..f5024d59f182 100644
--- a/dev-util/meson/meson-0.59.1-r1.ebuild
+++ b/dev-util/meson/meson-0.59.1-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 0fdd993640e3..7f421f7e47d5 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -5,7 +5,7 @@ DIST ninja-1.10.1.tar.gz 211216 BLAKE2B cb27beeef903ff7c5a00f2ac85b36e66d9c41bcb
 DIST ninja-1.10.2.tar.gz 213959 BLAKE2B b8160ca6d58cfa0edb93d16b7dfb9776d290c42e54b33b78cd925f167c80f8794e4cc30af984a526b8263c7904a734cf0770d3c27283d21d02f18d3e2eb70032 SHA512 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496
 EBUILD ninja-1.10.0.ebuild 2675 BLAKE2B f8958f60c6c20dd27a3870d298e7ff858e8fa13c1cdc0a2196a6bdc40f8c8916e64f58b477a96c039589adabdbc5f32ac13341b369a3d46df2074856ff2ccec8 SHA512 a041b7a8ed0af8d2baecb24eb65ccb733a8e8b470c797a928ad19d4b60c69dd602a70f72e0cdc3e629ccd00babdb5d28c905095d4afc2f35527c42e8a2447775
 EBUILD ninja-1.10.1.ebuild 2636 BLAKE2B 4690234896f3da8077c563cd9de1aa116e2d7f0574a35d29cb0ec199643666033a69de8d391fa50d80ff1f7f908dd634492c9ba21bc246efec97e38b916dd65f SHA512 f8b0f36e19ba2d8da5928daa752ff81d8d39ae39a0ce88b48298839726b166007df76caa64942fe48029b367b52d38b724b4f870dda50c050583cb262a8abb45
-EBUILD ninja-1.10.2-r1.ebuild 2799 BLAKE2B 11c3f618ea222e118a5f1e44dad59258c1af2b270d4aad8a8234d7901dd89ac433bc0ffe144b9a31e8549ab5a19266cc1da8d4dd419f08cc137850fd554ad6a8 SHA512 c3a70370082af3ad38ae83c6f065335dfb1a17d4868de82551e13637fb0d3cc6f5f0d0a003a498f1f96664a270c7ff153e3be7afc1dc8e5d110d8fc21ec8a3e5
+EBUILD ninja-1.10.2-r1.ebuild 2799 BLAKE2B 8777858962770af9fe0cce82dfa63a6ddb9adf6e5e28e8cc53062625e0744f3edd889c56c428419c075aee96391ea9baf987f902d78203aa9dace7ff7800e2cf SHA512 bfd668d97732c8d273752449954746a95bb443c3e4feb05f6b2cd434429d5a392593a032a2fef219fffabd78c985043ea49527e45aa4830058119539370b85d9
 EBUILD ninja-1.10.2.ebuild 2644 BLAKE2B e81698718e910451373000b38961579120228c39d0e586275423591975bee009731e7c8eb66d246a44acaf307c8a9976caa130a71c952db73c6c31bb451fe2ae SHA512 edfcd252fe80865c573e0f0f85aca151a3152bd46d06dc5bf7d162d56c1ab637e5d942437ba40cdd4d27f29402b6acf71dd0be4b5a3955b25134a84b31786abe
-EBUILD ninja-9999.ebuild 2593 BLAKE2B c008d830a3d0c18e911efd88e3a3925339735a4f757e40af8cba7c9cee6cb3ffa849ea91b813bb4d9e7b732973fd36cf8b1b5c7f38a38d6143198908228ccb0d SHA512 79aa00235ec14f4bec63613cda05315d0ecc290eb3139855504ea487700146190069ecfa472bc424de24d6c5dcd796fbed471fdb179c9f6d431877f940a71543
+EBUILD ninja-9999.ebuild 2593 BLAKE2B 7dc734e7ff64046e9eb0bf73b5e7455f3452bc35c9dc5288cd70c290211649956e7dbb0654b72aecbae9e0413a2e24716c362282a2ebf22db7e94bc7f9cdb1a8 SHA512 ba8bc261502d3395d3f1a8c8f136565365d1731fa94c15664a1accaaa68c7ec36ae7f2c971a1344c2256c0e73329d2625a0043f0695eb24d43c648bb935ce99e
 MISC metadata.xml 341 BLAKE2B 4bceedc688b9b13ad2abb63a709c72d4f814ce502342d2b6059143d0bc9672dfd7a0734eba4fdbc6efd1859adf2f2c9f654d756af73ab22b0d8c51329a42388b SHA512 f440b2242abf1fe2e41be8fd80542899bbfa5265c2b424058f0ed89ffedf6c6ea890a2ca3bec5f1313ba4222b21a82aedde9fbd0870a6348dcae8d7013e537a6
diff --git a/dev-util/ninja/ninja-1.10.2-r1.ebuild b/dev-util/ninja/ninja-1.10.2-r1.ebuild
index fcc3b630d939..161254c56f7d 100644
--- a/dev-util/ninja/ninja-1.10.2-r1.ebuild
+++ b/dev-util/ninja/ninja-1.10.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 786d229b8a5c..72b8e4d9e83e 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 9824f8eb5486..4b8805cc7fb4 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,13 +1,5 @@
-DIST ostree-2019.5.tar.xz 1972452 BLAKE2B a8b015118855b8b0097f535ac074aeffc599c3f6f654967043e8e4de339d2a51e85ad1b4b3f3b22e18d39235e6ad9c1973334a2c4fc9b5c694f2ff40d68ae703 SHA512 27150802ed9af16e698ed163f6ad235f0f99a1410df52b4b1e266585fe665880c0b9490bf245b5593cb277007b7229d808be7403dd964c58aded6e567349c912
-DIST ostree-2020.6.tar.xz 2014456 BLAKE2B 97d84c6838993edfbabb598bce800332ab1c8b22c0431839f7129f2f57afdd71c1b8ea8b8d6c1dc2cbf8d7f6828d624394b5e8c533f7a98eb1b1c3aeedff92cf SHA512 1d8f8ccaa3e543a6f494d3be2a3651ad340846f0c314e003955260b7bd1d8c0421acf102ec2ca6580379c354bf4cfac0940e4e95b724b7aaf9dc8116085aa538
-DIST ostree-2020.7.tar.xz 2022004 BLAKE2B 2113117ce8553b7ffcfea17e1cb3a9c697d39b4933b48c30729af72fc833bb00f39e7e3a327efeebaac1df307b1f62ccf16a7772e12ad77737e2219c87623824 SHA512 f42dca3c9e1810c0421ab99588f27c625733b71ef811534b66e0c0c4afafbad5bf475e08feaf87c2f8414c38f127fd344adbb57a4b75001077aedbfe92af3706
-DIST ostree-2020.8.tar.xz 2081080 BLAKE2B e856f9642db9fd16e96d6bdc9b3f3be93989458d72258c4586e5a49e67c197d0b7b20cefd0b5a28d77dee986db42ae5584d2894005ede654b8320402aa3af367 SHA512 2523f5742c4472f8e64614bb99edc5aec1a8f8a837b54f67efba9760aefc3385014e1296c9246ac81b361f4588deb4794768a231bf8f338c24a14255ab63da04
 DIST ostree-2021.3.tar.xz 2089804 BLAKE2B 5df33b676173b1ec08ac7592d4ddf8e3bfdcd84df1b3ce19e2f24c85780fed1f210b8adce1baf4ec87869c72984502276bf6e5a72268daaae6ce9b3d6dc6f88b SHA512 0df0d8f9bd82b16562dd5146997eddfb7cb6cffc1886601307d97a1cb1dc926bda7d0c899db26c974ed0dff1012dee11937e47c11c4d03307fa3d2d430adc60e
 DIST ostree-2021.4.tar.xz 2048424 BLAKE2B 386ed38f6dc8035a429505d8392682f739bc9a57a8cf9d7960942cd0ff0b61eee314116866c3b520d802a3f16f6dfecd1ea45a7b1d44cac8d065ad56a1ed2c2f SHA512 9bde7281afa456b30253149639854f579c1f1bdf6c429059eeb69042515b5ebfdf6426b4c9780ca8e700a11f0ec05cfc03e48baa8d0858ddbca7d3942aab9bbd
-EBUILD ostree-2019.5-r2.ebuild 2229 BLAKE2B e1aa655c086f760ca74bd102581f9aee1cc758b6b9ac7dd82dcc37cdcd3a0c4bfdf1aefd622ae31af78391250dc6a38f683a3f57bee318dc0ebcd9f371beb2a2 SHA512 ea90e1f44e4215298b8a1b4f0b111f2b5b65c611e3af1cdc160a47ae3b399d2277f05dcb8e5faef437e8438bd44b170b3b7dc748622fb3b01769bfd26a08c420
-EBUILD ostree-2020.6-r2.ebuild 2257 BLAKE2B c27ee95a5a16ebfdd0ad395c0886b2e733f8239f80a6f1d7a96a8c1c25f57a13ef12e7403c193c16a5375669cce7f912478e4a0087afc1d12aa75d11630a8aab SHA512 ee940fa51cb60205aac9184b7d6f642cb8bd13fd54a2f9f77f0de4c510e39cb175cb6d94004bc9426907f790d976bccf1247ac915198194a530ef65d22fe5e6b
-EBUILD ostree-2020.7-r2.ebuild 2544 BLAKE2B 93bcd93a98b886f93a656f80c033d5fafde5620d96393c119b6351f600a74955d9281a3c27faddecefe5450ea5552f6db8aac928a13e15d765dd662cf68dc243 SHA512 cf0d5f369511bc69752c0a157c02441d4c0d91c81487ce3fb58128e1e3426d05f5013fca14db2124b6c6f28fb1c9d56099172ee126d10e4977c0e531f51cb547
-EBUILD ostree-2020.8-r2.ebuild 2541 BLAKE2B 73b731cd2951acaa4ecebbcaf777d13e89dc08527ce912d65105f6f75bd89692c87b8b00398b665dbc34758e6dcf792b6c8ffcbd19efc45d6944ba8d297ef696 SHA512 57e3d431b7ff2204f19544dec0f449f2fbb7eddb206a650d123b3b421ff153407df1b64c441472ebf0cf5de652ad179a250436ee368c3594ca8184d3b2aeba0a
-EBUILD ostree-2021.3-r2.ebuild 2548 BLAKE2B bb6a02cb5be96caef8c03846028386ad29ea1cdeda0001470a6a0741f7fbaf43a4223c08781d778c5ce9d132a577c4423ff7cf3d1c85dd7ded12dbeda2fb9768 SHA512 a307358c5b6810527e40081da0d44ae7c9d11074c296e7ad616cad9c1d0b9baf793508c9b59e20e2921f17061e2f1a08832d76989916a317cbbc2e713c40f8d5
-EBUILD ostree-2021.4.ebuild 2577 BLAKE2B e74b508978d51c2c9053af79130fa3078e5c63ea75b78a6fb5322f8442412fe25930202145e06cf71a8f51919bb3a82650db3c2fc48895198d4c98b790532f06 SHA512 f65318dde4fd5ddf0a4ed35845839db7bfd25602d7c5c936ce1b6605e1d23a5fe949ae74bcbae2d28297e39b604009a8d5d74162dfa0b221b2c9b20d01be5494
+EBUILD ostree-2021.3-r2.ebuild 2572 BLAKE2B b8f71329ad5cb45ed8997eb3c95f595d49cf1c58dc86053b3ef1a8d7514c98e92e710b622013b3dba85affbcc6b249d97188a4dab9168062567a23ccdd5cc269 SHA512 db3f9b89e381d468032a66c4e3878dadb33b43e03ddf2cffcdf6fa825adb36527be119e0fc90e2caed7fb5071e544e5bda46c8684b1876c2fad6da48e211e609
+EBUILD ostree-2021.4-r1.ebuild 2626 BLAKE2B 8fbfe226dc7dc402afd4ad81de474359683e70f9b1f7ef7ac34b1f5a351d250531c985da12f317b16ef868e1abe2b8fb0a9827fe6606ec7d0f20852bf425fd75 SHA512 0848d822f107fd485661ce9d60aea8c8a06ff5e9193f815bc3f4fc120c7c78cac4b5bfdeac86f08b573b86110612be114405ab5191b979eb1652d3f4f3bd618d
 MISC metadata.xml 1990 BLAKE2B 1c3e6400d24f0701211c0b8dcfba8d31c06b7c493cbe6eb2c5432ea818d0a0fbe863f8f1661eb386d179bb186cb7c970f7d7a3f8c9c42ea4b03b3d4ea0472a57 SHA512 04e37ddcd7348d43d475e04c996ee8b2e94c64143325dcfb21c5738b75f71ecd2c2ec64c8f91fbd06f5a6228671e90fdf10a939d4457abe4d0f88492435b4601
diff --git a/dev-util/ostree/ostree-2019.5-r2.ebuild b/dev-util/ostree/ostree-2019.5-r2.ebuild
deleted file mode 100644
index 0f4c12a8a972..000000000000
--- a/dev-util/ostree/ostree-2019.5-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="Operating system and container binary deployment and upgrades"
-HOMEPAGE="https://ostree.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl +soup systemd zeroconf"
-RESTRICT="test"
-REQUIRED_USE="httpd? ( || ( curl soup ) )"
-
-COMMON_DEPEND="
-	archive? ( app-arch/libarchive:= )
-	app-crypt/gpgme
-	app-arch/xz-utils
-	curl? ( net-misc/curl )
-	soup? ( net-libs/libsoup:2.4 )
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	dev-libs/glib:2
-	dracut? ( sys-kernel/dracut )
-	grub? ( sys-boot/grub:2= )
-	introspection? ( dev-libs/gobject-introspection )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:0= ) )
-	>=sys-fs/fuse-2.9.2:0
-	sys-libs/zlib
-	libmount? ( sys-apps/util-linux )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	doc? ( dev-util/gtk-doc )"
-
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig"
-
-S="${WORKDIR}/lib${P}"
-
-src_prepare() {
-	sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
-		-i Makefile.in Makefile-man.am || die
-
-	eautoreconf
-	default
-}
-
-src_configure() {
-	local econfargs=(
-		--enable-man
-		--enable-shared
-		$(use_with archive libarchive)
-		$(use_with curl)
-		$(use_with dracut)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable http2)
-		$(use_enable httpd trivial-httpd-cmdline)
-		$(use_with selinux )
-		$(use_with soup)
-		$(use_with libmount)
-		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
-		$(use_with systemd libsystemd)
-		$(use_with zeroconf avahi)
-	)
-
-	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
-	econf ${econfargs[*]}
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/ostree/ostree-2020.6-r2.ebuild b/dev-util/ostree/ostree-2020.6-r2.ebuild
deleted file mode 100644
index e4712c26f214..000000000000
--- a/dev-util/ostree/ostree-2020.6-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="Operating system and container binary deployment and upgrades"
-HOMEPAGE="https://ostree.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl +soup systemd zeroconf"
-RESTRICT="test"
-REQUIRED_USE="httpd? ( || ( curl soup ) )"
-
-COMMON_DEPEND="
-	archive? ( app-arch/libarchive:= )
-	app-crypt/gpgme
-	app-arch/xz-utils
-	curl? ( net-misc/curl )
-	soup? ( net-libs/libsoup:2.4 )
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	dev-libs/glib:2
-	dracut? ( sys-kernel/dracut )
-	grub? ( sys-boot/grub:2= )
-	introspection? ( dev-libs/gobject-introspection )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:0= ) )
-	>=sys-fs/fuse-2.9.2:0
-	sys-libs/zlib
-	libmount? ( sys-apps/util-linux )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	doc? ( dev-util/gtk-doc )"
-
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig"
-
-S="${WORKDIR}/lib${P}"
-
-src_prepare() {
-	sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
-		-i Makefile.in Makefile-man.am || die
-
-	eautoreconf
-	default
-}
-
-src_configure() {
-	local econfargs=(
-		--enable-man
-		--enable-shared
-		$(use_with archive libarchive)
-		$(use_with curl)
-		$(use_with dracut)
-		$(use_enable doc gtk-doc)
-		$(usex introspection --enable-introspection={,} yes no)
-		$(use_enable http2)
-		$(use_enable httpd trivial-httpd-cmdline)
-		$(use_with selinux )
-		$(use_with soup)
-		$(use_with libmount)
-		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
-		$(use_with systemd libsystemd)
-		$(use_with zeroconf avahi)
-	)
-
-	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
-	econf ${econfargs[*]}
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/ostree/ostree-2020.7-r2.ebuild b/dev-util/ostree/ostree-2020.7-r2.ebuild
deleted file mode 100644
index e9c911c8403c..000000000000
--- a/dev-util/ostree/ostree-2020.7-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="Operating system and container binary deployment and upgrades"
-HOMEPAGE="https://ostreedev.github.io/ostree/"
-SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
-RESTRICT="test"
-REQUIRED_USE="httpd? ( || ( curl soup ) )"
-
-COMMON_DEPEND="
-	archive? ( app-arch/libarchive:= )
-	app-arch/xz-utils
-	curl? ( net-misc/curl )
-	soup? ( net-libs/libsoup:2.4 )
-	dev-libs/libassuan
-	dev-libs/glib:2
-	dracut? ( sys-kernel/dracut )
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	grub? ( sys-boot/grub:2= )
-	introspection? ( dev-libs/gobject-introspection )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	>=sys-fs/fuse-2.9.2:0
-	sys-libs/zlib
-	libmount? ( sys-apps/util-linux )
-	selinux? ( sys-libs/libselinux )
-	sodium? ( >=dev-libs/libsodium-1.0.14:= )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	doc? ( dev-util/gtk-doc )"
-
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig"
-
-S="${WORKDIR}/lib${P}"
-
-src_prepare() {
-	sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
-		-i Makefile.in Makefile-man.am || die
-	eautoreconf
-	default
-}
-
-src_configure() {
-	local econfargs=(
-		--enable-man
-		--enable-shared
-		$(use_with archive libarchive)
-		$(use_with curl)
-		$(use_with dracut)
-		$(use_enable doc gtk-doc)
-		$(usex introspection --enable-introspection={,} yes no)
-		$(use_with gpg gpgme)
-		$(use_enable http2)
-		$(use_enable httpd trivial-httpd-cmdline)
-		$(use_with selinux )
-		$(use_with soup)
-		$(use_with libmount)
-		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
-		$(use_with sodium ed25519-libsodium)
-		$(use_with systemd libsystemd)
-		$(use_with zeroconf avahi)
-	)
-
-	if use systemd; then
-		econfargs+=(--with-systemdsystemunitdir="$(systemd_get_systemunitdir)")
-	fi
-
-	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
-	econf ${econfargs[*]}
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	rm -f "${ED}/etc/grub.d/15_ostree"
-}
diff --git a/dev-util/ostree/ostree-2020.8-r2.ebuild b/dev-util/ostree/ostree-2020.8-r2.ebuild
deleted file mode 100644
index a6fef69b818b..000000000000
--- a/dev-util/ostree/ostree-2020.8-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="Operating system and container binary deployment and upgrades"
-HOMEPAGE="https://ostreedev.github.io/ostree/"
-SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
-RESTRICT="test"
-REQUIRED_USE="httpd? ( || ( curl soup ) )"
-
-COMMON_DEPEND="
-	archive? ( app-arch/libarchive:= )
-	app-arch/xz-utils
-	curl? ( net-misc/curl )
-	soup? ( net-libs/libsoup:2.4 )
-	dev-libs/libassuan
-	dev-libs/glib:2
-	dracut? ( sys-kernel/dracut )
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	grub? ( sys-boot/grub:2= )
-	introspection? ( dev-libs/gobject-introspection )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	>=sys-fs/fuse-2.9.2:0
-	sys-libs/zlib
-	libmount? ( sys-apps/util-linux )
-	selinux? ( sys-libs/libselinux )
-	sodium? ( >=dev-libs/libsodium-1.0.14:= )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	doc? ( dev-util/gtk-doc )"
-
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig"
-
-S="${WORKDIR}/lib${P}"
-
-src_prepare() {
-	sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
-		-i Makefile.in Makefile-man.am || die
-	eautoreconf
-	default
-}
-
-src_configure() {
-	local econfargs=(
-		--enable-man
-		--enable-shared
-		$(use_with archive libarchive)
-		$(use_with curl)
-		$(use_with dracut)
-		$(use_enable doc gtk-doc)
-		$(usex introspection --enable-introspection={,} yes no)
-		$(use_with gpg gpgme)
-		$(use_enable http2)
-		$(use_enable httpd trivial-httpd-cmdline)
-		$(use_with selinux )
-		$(use_with soup)
-		$(use_with libmount)
-		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
-		$(use_with sodium ed25519-libsodium)
-		$(use_with systemd libsystemd)
-		$(use_with zeroconf avahi)
-	)
-
-	if use systemd; then
-		econfargs+=(--with-systemdsystemunitdir="$(systemd_get_systemunitdir)")
-	fi
-
-	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
-	econf ${econfargs[*]}
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	rm -f "${ED}/etc/grub.d/15_ostree"
-}
diff --git a/dev-util/ostree/ostree-2021.3-r2.ebuild b/dev-util/ostree/ostree-2021.3-r2.ebuild
index 770b54e43d5a..a131a22630ec 100644
--- a/dev-util/ostree/ostree-2021.3-r2.ebuild
+++ b/dev-util/ostree/ostree-2021.3-r2.ebuild
@@ -15,7 +15,10 @@ SLOT="0"
 
 IUSE="archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
 RESTRICT="test"
-REQUIRED_USE="httpd? ( || ( curl soup ) )"
+REQUIRED_USE="
+	dracut? ( systemd )
+	httpd? ( || ( curl soup ) )
+"
 
 COMMON_DEPEND="
 	archive? ( app-arch/libarchive:= )
diff --git a/dev-util/ostree/ostree-2021.4-r1.ebuild b/dev-util/ostree/ostree-2021.4-r1.ebuild
new file mode 100644
index 000000000000..4c74aecc1d45
--- /dev/null
+++ b/dev-util/ostree/ostree-2021.4-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Operating system and container binary deployment and upgrades"
+HOMEPAGE="https://ostreedev.github.io/ostree/"
+SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
+RESTRICT+=" test"
+REQUIRED_USE="
+	dracut? ( systemd )
+	http2? ( curl )
+	httpd? ( || ( curl soup ) )
+"
+
+COMMON_DEPEND="
+	app-arch/xz-utils
+	dev-libs/libassuan
+	dev-libs/glib:2
+	>=sys-fs/fuse-2.9.2:0
+	sys-libs/zlib
+	archive? ( app-arch/libarchive:= )
+	curl? ( net-misc/curl )
+	dracut? ( sys-kernel/dracut )
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	grub? ( sys-boot/grub:2= )
+	introspection? ( dev-libs/gobject-introspection )
+	libmount? ( sys-apps/util-linux )
+	selinux? ( sys-libs/libselinux )
+	sodium? ( >=dev-libs/libsodium-1.0.14:= )
+	soup? ( net-libs/libsoup:2.4 )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( dev-util/gtk-doc )"
+
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig"
+
+S="${WORKDIR}/lib${P}"
+
+src_prepare() {
+	sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
+		-i Makefile.in Makefile-man.am || die
+	eautoreconf
+	default
+}
+
+src_configure() {
+	local econfargs=(
+		--enable-man
+		--enable-shared
+		$(use_with archive libarchive)
+		$(use_with curl)
+		$(use_with dracut dracut yesbutnoconf) #816867
+		$(use_enable doc gtk-doc)
+		$(usex introspection --enable-introspection={,} yes no)
+		$(use_with gpg gpgme)
+		$(use_enable http2)
+		$(use_enable httpd trivial-httpd-cmdline)
+		$(use_with selinux )
+		$(use_with soup)
+		$(use_with libmount)
+		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
+		$(use_with sodium ed25519-libsodium)
+		$(use_with systemd libsystemd)
+		$(use_with zeroconf avahi)
+	)
+
+	if use systemd; then
+		econfargs+=(--with-systemdsystemunitdir="$(systemd_get_systemunitdir)")
+	fi
+
+	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm -f "${ED}/etc/grub.d/15_ostree"
+}
diff --git a/dev-util/ostree/ostree-2021.4.ebuild b/dev-util/ostree/ostree-2021.4.ebuild
deleted file mode 100644
index 4914f0692b9e..000000000000
--- a/dev-util/ostree/ostree-2021.4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="Operating system and container binary deployment and upgrades"
-HOMEPAGE="https://ostreedev.github.io/ostree/"
-SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf"
-RESTRICT+=" test"
-REQUIRED_USE="
-	http2? ( curl )
-	httpd? ( || ( curl soup ) )
-"
-
-COMMON_DEPEND="
-	app-arch/xz-utils
-	dev-libs/libassuan
-	dev-libs/glib:2
-	>=sys-fs/fuse-2.9.2:0
-	sys-libs/zlib
-	archive? ( app-arch/libarchive:= )
-	curl? ( net-misc/curl )
-	dracut? ( sys-kernel/dracut )
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	grub? ( sys-boot/grub:2= )
-	introspection? ( dev-libs/gobject-introspection )
-	libmount? ( sys-apps/util-linux )
-	selinux? ( sys-libs/libselinux )
-	sodium? ( >=dev-libs/libsodium-1.0.14:= )
-	soup? ( net-libs/libsoup:2.4 )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	doc? ( dev-util/gtk-doc )"
-
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig"
-
-S="${WORKDIR}/lib${P}"
-
-src_prepare() {
-	sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
-		-i Makefile.in Makefile-man.am || die
-	eautoreconf
-	default
-}
-
-src_configure() {
-	local econfargs=(
-		--enable-man
-		--enable-shared
-		$(use_with archive libarchive)
-		$(use_with curl)
-		$(use_with dracut)
-		$(use_enable doc gtk-doc)
-		$(usex introspection --enable-introspection={,} yes no)
-		$(use_with gpg gpgme)
-		$(use_enable http2)
-		$(use_enable httpd trivial-httpd-cmdline)
-		$(use_with selinux )
-		$(use_with soup)
-		$(use_with libmount)
-		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
-		$(use_with sodium ed25519-libsodium)
-		$(use_with systemd libsystemd)
-		$(use_with zeroconf avahi)
-	)
-
-	if use systemd; then
-		econfargs+=(--with-systemdsystemunitdir="$(systemd_get_systemunitdir)")
-	fi
-
-	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	rm -f "${ED}/etc/grub.d/15_ostree"
-}
diff --git a/dev-util/patdiff/Manifest b/dev-util/patdiff/Manifest
index 5ff9d8accc9e..afc49a24ec06 100644
--- a/dev-util/patdiff/Manifest
+++ b/dev-util/patdiff/Manifest
@@ -1,3 +1,3 @@
 DIST patdiff-0.14.0.tar.gz 220013 BLAKE2B 274d3590fc2ce8b72eb80d5c2dd07578729e9d1bcbdf7d4f94f35248f854a6a242cd0298dce4574ed53e4cdf279e3586fb8a1b543e84c2c6b682f604dc3cb468 SHA512 2f326cbd4c2d153b3e64dd1bc4b514a9ca00292bf80835290fbe7d74e211261c043c002ff929971d65cf24825a42e0c1662fe5c5a1c8acbb8babad796f339601
-EBUILD patdiff-0.14.0.ebuild 566 BLAKE2B 10bd9f29aba98323cdf0860b0832bcf9f2c73a5e83eb0276b8e64d3bd373e42fcd25ee70cb93be03b5ccc1c096f5a76deb40ce553f00b7947f0a78ad750c6bb6 SHA512 f38569f05de86c2e3d06f8f5c6326a396c663febc701538a0c5ab6587a082ac07504e0b257409ec3bf1343b9f88d9aac557f096fb22e8767b55bb89c3197c933
+EBUILD patdiff-0.14.0-r1.ebuild 588 BLAKE2B ed5acf9dc7183ed28db538891538c78df273a00e1b73b78d4a0ad0d4dc0c467fb96ab54faea32fe044ffc9c52793e244a7648273c19fd237a2cc0f7172bd7569 SHA512 0aa5139ac67a226db63ffc3f7765d936af7f6088c3ec9b32864da289f95d9972beff29a8df8d7b6f6a3cf79e1cee731c1e52b507d7cc57acd667f4465148a319
 MISC metadata.xml 316 BLAKE2B bc8a138519832163ad938dccce7225738b19ac893e077c245ee0f921f6f476ca153a1eb3026d5f69b5960fd4e746b1150ca514728625ef4eac151bcd4ed5798b SHA512 554123d49add147becf9ac14260c0400fd368a4cf7800a2e9732a71fe0f6b309acbf3d3256e2598d289f2616de294cbe159a8818ae59b24acebb7299feee0914
diff --git a/dev-util/patdiff/patdiff-0.14.0-r1.ebuild b/dev-util/patdiff/patdiff-0.14.0-r1.ebuild
new file mode 100644
index 000000000000..30a2be625868
--- /dev/null
+++ b/dev-util/patdiff/patdiff-0.14.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Colored patience diffs with word-level refinement"
+HOMEPAGE="https://github.com/janestreet/patdiff"
+SRC_URI="https://github.com/janestreet/patdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.08.0:=
+	dev-ml/core:=
+	dev-ml/core_kernel:=
+	dev-ml/patience_diff:0/$(ver_cut 1-2)
+	dev-ml/ppx_jane:=
+	dev-ml/pcre-ocaml:=
+	>=dev-ml/re-1.8.0:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-util/patdiff/patdiff-0.14.0.ebuild b/dev-util/patdiff/patdiff-0.14.0.ebuild
deleted file mode 100644
index 0f0971167379..000000000000
--- a/dev-util/patdiff/patdiff-0.14.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Colored patience diffs with word-level refinement"
-HOMEPAGE="https://github.com/janestreet/patdiff"
-SRC_URI="https://github.com/janestreet/patdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.08.0:=
-	dev-ml/core:=
-	dev-ml/core_kernel:=
-	dev-ml/patience_diff:0/$(ver_cut 1-2)
-	dev-ml/ppx_jane:=
-	dev-ml/pcre-ocaml:=
-	>=dev-ml/re-1.8.0
-"
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index c484bf800727..0bfef2531e3a 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,4 +1,4 @@
 DIST pkgdev-0.1.9.tar.gz 57093 BLAKE2B 5f5d9b4956cdc949d5e37c24160c692c32cf7e5d9fe90c167adc364993370dc42291edca048db3b0a2f17b199003aea61bd6b541bc58de1c1a084365ce517660 SHA512 78c117163549cb021e8cb9bd65e9a7752633506f3db825133fc3c4c515549c6e10dc974164489c06f94c1a1e25acb8fe050a57754353b907d6026892ef034cb2
-EBUILD pkgdev-0.1.9.ebuild 1583 BLAKE2B 458349205c3a21cab036eadbef5a36ac78a43e5221d14dac71eafe34b2678035cd94f0bffa7ebd380b10aaa6aefbef04e22b90c6fb99ef0f6771384bc51965e6 SHA512 fc6d8803c9a37977220dc3d29c7e1cca2e3a730049ff3763cf0ec9f15d3f9f6e228f53761a0bef2fae8664bab2959ad4dd6807fedb743663e00c76ee5e2ff724
+EBUILD pkgdev-0.1.9.ebuild 1588 BLAKE2B 58366a1f80f5e73be362f870b9be356f6edc1486eeeddb21cae3befc9d4b2b362c35eee16de70d17c9d9d3f097b53ecfb8ae8fce48482e433ad885ee36f51cce SHA512 a74ba7ee473f078a073be44d1cd1e158e8501465601270a7f8897be02d979840786525690f5f7424fb64eea4457aa446d02fdac2146cf739fdccc012b752b84f
 EBUILD pkgdev-9999.ebuild 1574 BLAKE2B dab1ff6de45f7b63c8907ec5f64e36ef67d0f5e3d9560917f7ffda2ec9051a46ec1e425c1eaf6b1ab6e0e771b2562902adb6ab0260026746773441a4591c36c1 SHA512 e055493097823f7a837db0b33524c1cdc93ae9a755f0755c7ffadce3740c76a6e95882570bd53a75c8fb64bd68404a32f0e718e81fdf21b0c98b3db4fc7f7448
 MISC metadata.xml 427 BLAKE2B cfc5af84db1d37fb76a89d107ff022c011ff6aa65d6a0b98cd36b5c0134a0f1ba05ef63866425834393bca03e3a02bc3dea5a0429e83558ce726c3f199e569bd SHA512 eeb4debf1083db5d37ff042a448b7220d5384101b477cc3afdf471195cd17fc3bc76c7a1cd6540609c96a9cd56d48221cef72342e643113b4060f168040501b5
diff --git a/dev-util/pkgdev/pkgdev-0.1.9.ebuild b/dev-util/pkgdev/pkgdev-0.1.9.ebuild
index cfbc73195ab0..f7998a8b7fa6 100644
--- a/dev-util/pkgdev/pkgdev-0.1.9.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.1.9.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x64-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
diff --git a/dev-util/protobuf-cucumber/Manifest b/dev-util/protobuf-cucumber/Manifest
index fbbfa4634e9a..9973ed5bc71c 100644
--- a/dev-util/protobuf-cucumber/Manifest
+++ b/dev-util/protobuf-cucumber/Manifest
@@ -1,3 +1,3 @@
 DIST protobuf-cucumber-3.10.8.gem 236544 BLAKE2B e81636fc06fbed54dc67def3d4d1c445a971d861e3dcd99aa406e137b858734d995100c76d33a6d00b6ec9584d8dbb8f1d05424e73d0f35a3d196cfb70ffc561 SHA512 904b3b6f0564a9db61c1b8e3aef10fe666dd602cf09c43c32241e908695b2f144be5e9ee094a21a07c43354ecaa3c9006ff62aa0e6f6ad2688b72bb9a40538a9
-EBUILD protobuf-cucumber-3.10.8-r1.ebuild 985 BLAKE2B 578caf5656acffe7c80620ca5d6894915670c0e177c2f3c6ac9643b13e23e84700f63edc59aeff7f111d723920738f3d87885e099a2f4f1df0b17f83ac031d11 SHA512 7d705be9d54078a7b3abe6de02b41c8a53abf713946f0c3ebb27728bbe2167cdf7930dd145fc8286cee06fee10f89dadd64ccf1bd0d3e376c14e5eeb124f906e
+EBUILD protobuf-cucumber-3.10.8-r1.ebuild 1008 BLAKE2B 858b21a6f58df35552e24d45df318bdc3f4d8eac3c23b7e0268ae695248a0c46d4b2a450e05873393e2a300543cafa9328e33257dd43c5d62ce1251c16f221cd SHA512 16632f50e0c26869146861b767dbb42d0987eba06e2bce75f8eaa36c962511d094c9d00df08effcf0b7cc55030d841a75e7924ed1814bebfb603bd011b6396ec
 MISC metadata.xml 305 BLAKE2B bb7ab120fe337a703088786a7e00a58896ba13b13ea3282e1f6e86a5d5d02d7769294d22a4f4f855ca498a7aaddd6f72afa059bb85f2630415455f329376db9c SHA512 c21190b85d3d2b1e439597ce04115c2bbe1e1baec66885c445e9987eec0648182cd488701760565bd4e6bda23b89e7942a6ee323ac34786d9f9a05db378573eb
diff --git a/dev-util/protobuf-cucumber/protobuf-cucumber-3.10.8-r1.ebuild b/dev-util/protobuf-cucumber/protobuf-cucumber-3.10.8-r1.ebuild
index 2b31d2a56819..c002e181726f 100644
--- a/dev-util/protobuf-cucumber/protobuf-cucumber-3.10.8-r1.ebuild
+++ b/dev-util/protobuf-cucumber/protobuf-cucumber-3.10.8-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ruby-protobuf/protobuf"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-util/rebar-bin/Manifest b/dev-util/rebar-bin/Manifest
index 086a0dc58150..21589fbd362d 100644
--- a/dev-util/rebar-bin/Manifest
+++ b/dev-util/rebar-bin/Manifest
@@ -1,5 +1,5 @@
 DIST rebar-bin-3.16.1 942316 BLAKE2B c3296d54f85c146a58ff24a9b337f7d26e2beb3287257ecca6344c082b84295d9daf042b7bcb422df7c5dd29dd681f0c81064c1ef5b7b30ed8be8328ca694bc4 SHA512 be9e4ffdf654f8038ff14cd4b53328bdbc8b26e0f1306a16220f4d5d4b13bc36ac2f302d52a799424ffc3835e41ce326a4fd8e422ececf70ab8c0f951e3e4b24
 DIST rebar-bin-3.17.0 944741 BLAKE2B 2ae670b36019afcc6e595bcbb7d9db7286bd0ea44ad095e7bd0b45be579f6b45d0cc4bbb11478e13adbeb68231f3a888ff231ca4ee4881cb30a26dd68eb8b60e SHA512 908ed9018e456cb4a8f6c9b2737ead58f632bbcac4960834de841b814a97f8fac2181b8630e2ae9e8e9680c4965488b2a736c54baa561a089489987615f6405e
 EBUILD rebar-bin-3.16.1.ebuild 610 BLAKE2B f8b801213ff3d41987f7b54747d200ccab01f11e21be2a8fc540a5a3b6da7976f5c767d5b1752ac0328834f34c187719e501e5ab9ad841fbc34147a834c2a2a5 SHA512 6d794157feffbc22160e67569a536073711412d81c34af0f429496940e0c9c55098c92742b65bb43bdee326fd2defa730073a359801885e67328f43a69bf4bdb
-EBUILD rebar-bin-3.17.0.ebuild 525 BLAKE2B adecfbeb588afea1b54aa68edfc0d573fde5149db29509721bb84794256a8d158168d56ba18c5afcd393a034c3bbd650434df42433b9f02de679367349fe8e68 SHA512 b21a60e136183af5a5be1b4201942de79ca0bec6d383d6d06af56108bba7626d351fb2eb08bf06003bc4365b3393bf82299812496b206dac1452a65dfdb2dd21
+EBUILD rebar-bin-3.17.0.ebuild 524 BLAKE2B ee1ed99e3544b940c774524b9a6a75913cb604799fa874fea5acca264f87b72e1ec195dbf6459cf271e0210bfd6ee99ab315f9a29234ae13eb186ca96119e7a5 SHA512 73445a2015b24ca8eb4b73ae4bd7790bfc92c7fe7859b33d78db541c9e436cb6eb6f20ee145b02ed3d40c4c939b560e3bab17ed889114fb5bbaa5a1f5c5bcf3b
 MISC metadata.xml 1187 BLAKE2B eda5aa3b730fd7b60fb73d0e8aa3fff5e1d67996cb7abebfdd4de568eae0c02fa6a9a1980a1e1d85a6f0581f26d8f8d94b25b5a486489457e6b7319120dcd1ea SHA512 6f86d6ed8df338c5c2807c9ff4a8f2fbb2f68f4ef1f139a97e4712c5365cdbb686f117a18b3abc87f54273eace33a9863c34b7c3765597cb39da4e413d6264f1
diff --git a/dev-util/rebar-bin/rebar-bin-3.17.0.ebuild b/dev-util/rebar-bin/rebar-bin-3.17.0.ebuild
index 46ed763d7724..7522fbc1d2aa 100644
--- a/dev-util/rebar-bin/rebar-bin-3.17.0.ebuild
+++ b/dev-util/rebar-bin/rebar-bin-3.17.0.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="dev-lang/erlang"
 
diff --git a/dev-util/regexxer/Manifest b/dev-util/regexxer/Manifest
index f5f16b59dea1..85199a0fae28 100644
--- a/dev-util/regexxer/Manifest
+++ b/dev-util/regexxer/Manifest
@@ -1,5 +1,5 @@
 AUX regexxer-0.10-glib-2.32.patch 864 BLAKE2B 330dbfaad5752ba94bfcdcd669550ab3b7f2e2f72b8f7160a1621fa586e62f0505f259b79d7476744005c2097d3b41a840eece4203c43e33dc1d2775e340af0c SHA512 99e25b974a6be678169a57f8f5e728f60c470e7d2290e365f7b9c0c326d8e7867af0a093f6b0a7505ea7068e01770cdc565cf33e2db8cc6695bd5bd269a56a8b
 AUX regexxer-0.10-sandbox.patch 412 BLAKE2B 9d1e1d6f5b9e73ca6d8250bcaea5f2dab5b1843c5a0df01c0da16bdebdbf7b73b56b392d9e0368e3b2e6df5b7b87046d905ffe86ea38a84e5837c99daec265f8 SHA512 2e895d2686e243ce1ada04dc9fe4db846b59dd076252e992349442658c96cba6ce62499fb056c77d0aa19329794545ea313c538c61efab147a44fe85b2c40534
 DIST regexxer-0.10.tar.xz 251544 BLAKE2B a6ec17e27754de86de60eb44e1b945f09bd66b5755a558c9934eea7b52854ea86b64fc7742d5adfd227514df7565e37b78a567a0a9b83fa421c0140fa8ae0e02 SHA512 0b18c8f167595984a042403c7e91c8b65c1348870c47d664c6cfc825b74e047f657190f30830ce6e2098867bbd8e1b042e1adc2798aedb86a59299583340f920
-EBUILD regexxer-0.10-r1.ebuild 723 BLAKE2B 6fa2f9814606a6a0f7526a321c06a1713f120ac92c9528213aaa43aae607759922a310da2ec61986febf29a610ac6e7b7f17d483c01c57b902eddeae530895df SHA512 06bc92526420f23fddd8b0363903c8076541bcf675862889110be1d3dd41d470f62037272ee30b95e8ee119269d314053dd181cbfdf1ac7a62d90dc7a422f780
+EBUILD regexxer-0.10-r1.ebuild 653 BLAKE2B 082ab141a6bd911a93e0330853355160f7acdf752c099eb34b541fa7cd1248b513b5dc9f996e520bdf0c9d3949dc659c95cee139ae2625d4bb631c26d6f6ead2 SHA512 30a7d116c45bb371e1da9cc54491a8569eb53ca87bcf14c34b3cff42e3aa57af0704582da87dfc141b02b358892d27e6852351b7413da7aefdf8f7302b643f11
 MISC metadata.xml 246 BLAKE2B 9f95fd9806e51d9c5815cf5ae281b41d2564d0d173c132c42d8dddf7f45e88df53cf11043b591075d105a6a76396053ca22775bb98272ad79c832b9a10cbde8b SHA512 ad63b04bf9d7a98851c72949c144b81698c91c949a3f012cc441327e483843de620f27ecba5e0167ea02cdb8dccb93adefa61e3b29ecea367e1b0abe8972f6af
diff --git a/dev-util/regexxer/regexxer-0.10-r1.ebuild b/dev-util/regexxer/regexxer-0.10-r1.ebuild
index 21acdbac8c55..c4f07a75c43e 100644
--- a/dev-util/regexxer/regexxer-0.10-r1.ebuild
+++ b/dev-util/regexxer/regexxer-0.10-r1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG=no
+EAPI=7
 
-inherit autotools epatch flag-o-matic gnome2
+inherit autotools gnome2
 
 DESCRIPTION="An interactive tool for performing search and replace operations"
 HOMEPAGE="http://regexxer.sourceforge.net/"
@@ -14,19 +13,22 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
-RDEPEND=">=dev-cpp/glibmm-2.28:2
+RDEPEND="
+	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:3.0
 	dev-cpp/gtksourceviewmm:3.0"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
 	virtual/pkgconfig
 	sys-devel/gettext"
 
-src_prepare() {
-	append-cxxflags -std=c++11
+PATCHES=(
+	"${FILESDIR}"/${P}-glib-2.32.patch
+	"${FILESDIR}"/${P}-sandbox.patch
+)
 
-	epatch "${FILESDIR}"/${P}-glib-2.32.patch
-	epatch "${FILESDIR}"/${P}-sandbox.patch
+src_prepare() {
+	default
 	eautoreconf
-	gnome2_src_prepare
 }
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 79421dbfb938..37ea4be5cf26 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,9 +1,5 @@
-AUX rizin-0.2.1-no-rzpipe.patch 432 BLAKE2B 77e959797f22ea6d32e6742651710ecb042bfa6bf00efccaedcd3d60a6f75c0bdb42128261ffe068d8cfaeb6d7abacef6ea114ffb9061ca365533a1fe2120c34 SHA512 7a03664ed99ea7f9cb214b566e2a74a0aee1ebfa643552ce90f4e7fb60e779628ba75c4cf34ffc3cc45b65d1dd8959d400a9af16bc49d7cc26f1499670ddbaa6
 AUX rizin-0.3.0-md4-openssl.patch 3410 BLAKE2B 06f5f270abd2351b044c3d2178fe74a43a320d5fef1ee672762cb2ca31729786364953d412274b4064927f63f92e32202487ba523ea16160721fa4c1306f25a7 SHA512 d079f6ab1c1e4e4b0d50fb04cda3fecc64bddd14ae775a1b2e818d42b1199bed7ebae78e81a550608d1f976cc03e4b6262ffa08c145a27b7db4e2d8ff3f798eb
 AUX rizin-0.3.0-typedb-prefix.patch 5175 BLAKE2B 08fea1ba6297f17d42f518c1739875c0964f6f00c1bcd01cba51a56e6626fe50c6ad2c36bece4db326f7b128d6ea5786970eb454832e32f9d837458f92f2a596 SHA512 241a72a7f1c3ec8ba831ca696faf0cfc09a58207c6d3db7005b09b9016a71ed9238bcb9441a389116083557538a0ff1a6adf55e78e1aa35d67aa206f30774391
-DIST rizin-src-v0.2.1.tar.xz 51439132 BLAKE2B 3ce048c5e93afa43b33bb7c36e7f7a96734886a44a67339c18b36de84b6e3dd015aa49fd048815bc7cb26a39bd3c44ebd00227fdb0c3dc9d9f07ff2ff1f1948d SHA512 4d0a68971a8fe1de3860f8ee18197606f59c22d4c24f3fcce691c73b45c8fe8c356a9b411604e9c3d4e5bb01f695b6ead32cdc217134eb4ddfec76867c16c327
 DIST rizin-src-v0.3.0.tar.xz 64097204 BLAKE2B 308037ce60ec6523f337580221ea265c912ff92032fc5e1c2ab37430eae5a16cc2e8efa74447a79735c7814a35d3b08e5fc2f548612a1553c5edc2f314d22df5 SHA512 68f71e612bd4df90c79ebd4cb26c3e09bb370ccd9e51f574f2687f940b3934d9bf417108f3f7e678cabc6ddba7402e0420aab569c24316e07b2b56ed33153ed3
-DIST rizin-testbins-a80fd0d56d538d07a05ef01e29c8cb430a4f9d72.tar.gz 119214206 BLAKE2B 33916d466d77aaa0aeb6b221529a570a2bd2ad07b59b45967d75a84e3efbbc8ca3b8fff9cd88d61598b4e785ead2f8bc58eb7c1cb31007c27e497d80f36e4d2d SHA512 9b01a63ff281ac19b427e715d669e6080c4afdfd777ae762c30537c59bd2cdc2865adc1b34ccb61430b172e54995375b48bb35fd88f098b6a9839e9f3669fde4
-EBUILD rizin-0.2.1.ebuild 2009 BLAKE2B 335a2af33e2a4f4a503f1d5f07a692103e713c9196cd54063c6c2c2b247a160a14507bf681adf06055a87e79a699dedf37c717a042c10f98fbc65885c596e0b2 SHA512 e8c5d35259d78403b86414dce4c9fdf71112e908bb6a31ca1137d0a77b6789097be0b193fca18d5a7a2768c4d2125d85eeb697454dd3f110e478b73436afa6fc
 EBUILD rizin-0.3.0.ebuild 2908 BLAKE2B ef7f12a5ca9813776c1ee6acae4cab4c36d7a9608cd2dedec81d09d5eabc5c9fd7c3603606380d1ea5fca51bdbb01c869abf0e8fbeeb34f04f48e650c91b03aa SHA512 ad810f425164ee8c82585a790154653e8f89a3c6aa5a38152e953ed079d0d299f1a715e45b80a570a3513ac2de7d58ac85bca9e4e1df9e03a248d6dcafb609fc
 MISC metadata.xml 348 BLAKE2B eea14d9f2e713f2f272a46bd754e500b28ec3958f0f4295e6fe6e73c9dcfa1e180fa62901bdb591fdb43ec8ead23a63f20416e52605e6ae186532e651e0eb1a3 SHA512 db41ccd0ce1493387c47eb707dd303c556ad784ffab2ffe03509a4ff7b0c1b650b0f0999edb5e4e040f95f1f550e9a11ead273ec74ebedb97e645e40c6ad37d5
diff --git a/dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch b/dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch
deleted file mode 100644
index 3e7a6cc70c17..000000000000
--- a/dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/rizinorg/rizin/issues/1192
---- a/test/unit/test_rzpipe.c
-+++ b/test/unit/test_rzpipe.c
-@@ -30,7 +30,9 @@ static bool test_rzpipe_404(void) {
- }
- 
- static int all_tests() {
--	mu_run_test(test_rzpipe);
-+	// Disabled in Genoo, relies on `rizin` binary in $PATH:
-+	//   https://github.com/rizinorg/rizin/issues/1192
-+	//mu_run_test(test_rzpipe);
- 	mu_run_test(test_rzpipe_404);
- 	return tests_passed != tests_run;
- }
diff --git a/dev-util/rizin/rizin-0.2.1.ebuild b/dev-util/rizin/rizin-0.2.1.ebuild
deleted file mode 100644
index 056670c878d3..000000000000
--- a/dev-util/rizin/rizin-0.2.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6,7,8,9,10})
-
-# This is the commit that the CI for the release commit used
-BINS_COMMIT="a80fd0d56d538d07a05ef01e29c8cb430a4f9d72"
-
-inherit meson python-any-r1
-
-DESCRIPTION="reverse engineering framework for binary analysis"
-HOMEPAGE="https://rizin.re/"
-
-SRC_URI="https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz
-	test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-apps/file
-	app-arch/lz4:0=
-	dev-libs/capstone:0=
-	dev-libs/libuv:0=
-	dev-libs/libzip:0=
-	dev-libs/openssl:0=
-	>=dev-libs/tree-sitter-0.19.0
-	dev-libs/xxhash
-	sys-libs/zlib:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=("${FILESDIR}"/${PN}-0.2.1-no-rzpipe.patch)
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_prepare() {
-	default
-
-	local py_to_mangle=(
-		librz/core/cmd_descs/cmd_descs_generate.py
-		subprojects/lz4-1.9.3/contrib/meson/meson/GetLz4LibraryVersion.py
-		subprojects/lz4-1.9.3/contrib/meson/meson/InstallSymlink.py
-		subprojects/lz4-1.9.3/tests/test-lz4-list.py
-		subprojects/lz4-1.9.3/tests/test-lz4-speed.py
-		subprojects/lz4-1.9.3/tests/test-lz4-versions.py
-		sys/clang-format.py
-		test/fuzz/scripts/fuzz_rz_asm.py
-		test/scripts/gdbserver.py
-	)
-
-	python_fix_shebang "${py_to_mangle[@]}"
-
-	if use test; then
-		mv "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcli=enabled
-		-Duse_sys_capstone=enabled
-		-Duse_sys_magic=enabled
-		-Duse_sys_libzip=enabled
-		-Duse_sys_zlib=enabled
-		-Duse_sys_lz4=enabled
-		-Duse_sys_xxhash=enabled
-		-Duse_sys_openssl=enabled
-		-Duse_sys_tree_sitter=enabled
-
-		$(meson_use test enable_tests)
-		$(meson_use test enable_rz_test)
-	)
-	meson_src_configure
-}
diff --git a/dev-util/sccache/Manifest b/dev-util/sccache/Manifest
index b13d1232abd1..62e53eae282d 100644
--- a/dev-util/sccache/Manifest
+++ b/dev-util/sccache/Manifest
@@ -1,3 +1,4 @@
+AUX reqwest-azure.patch 564 BLAKE2B fbbf8e883d4e219bcc1a2b3790dce55abd4a6600f6c97429f6821629c61577ed738146e76bab79390aee157cf30bd83a82c7a1fa1dcc3107c0df27ec5fef0c2f SHA512 e819e7135d1682a73f3101dd1e8e066be391350e40007579d300112343ac16890127995e715b514ee37ff2ca3a1ae6be2a6bdad73b9325121095055743ba7b38
 AUX scheduler.confd 438 BLAKE2B 3e047418c6953dc5e21f1caa4770f1c95d58f59dae58938d4d4440dcc149c352967ed25ff2a196cb7b26e871ba6271ccf29b887ecf906faac6ad081f45d1686c SHA512 256cb811d69ffb148bc01e06cc69cd406d4309606c71cc4d8595b3ee140037b882cdb513871c32278b4e58fab8f2778ded202dd1c2d297797a393069f8f6b2ca
 AUX scheduler.initd 525 BLAKE2B 8992cca3a4592585ecd465c6cdd7b7d5d3771bb10ca31d4d404919552b28dfe3862dd05fea453b5aab043d05de5d2f4b46011c4ee6992cdf658a41f32812c526 SHA512 05a973d61f952fd16f84698821624837f6d0f073c826b7ee4ba0f95c0d251ddb6ba84508deb413e96dfd4de28a637e4bd93a5791acd59a4ba75dc28155f21292
 AUX server.confd 420 BLAKE2B 0cdb51dbf3c7d06285d02dfaa39e92a480e0d9ba1ed27473ee6df876c5d60ff5a0ce0ce61c0e60790bda901fe955315665c44fafa207aa94ea7baed0b9ab19d5 SHA512 74be100f820aa89df203097f92c82370c02386980763a47248ffd3c6a3d8ada313ea2e9989e224eb0ffcbd728ba41cc76eebd233c9eedcc8784b8fef78aa8ae5
@@ -385,6 +386,6 @@ DIST zip-0.5.9.crate 44079 BLAKE2B becb13fbf137f598358289cd9f65cd03a64ec799289f4
 DIST zstd-0.6.0+zstd.1.4.8.crate 26159 BLAKE2B cd4323d0a9c30f73a35e6fc5d168973a3340203ab58a5c0f4224b392a455d6d8727dd694836f266fa25a6f5d5e244ef6706b3a9e2f5155d9e426aeb4b2492ae5 SHA512 0362e7aa4d1205dad9f9037b36b5678e9bd49a202822f53a7a4b34135cefa018e6590954b08fd3ffcbd0c607c85f00228aae8b82c03defca46229501ec376a12
 DIST zstd-safe-3.0.0+zstd.1.4.8.crate 10200 BLAKE2B 26a6689ac2bfc101f826e6668a1c9dd588c610fd3fac088e69262cb4adae66108c85515380c0cf079628dea46369dbbc07800bedaf67255b8e12f41f75c0f2e7 SHA512 294e9527890fa0f74b6659e20436e67e81740ddc201a879a0ca9ec77964b543c50227db3be809b197ec9dbe7c31befef79867d698fa4e9966e6a0d1ad1b56bf9
 DIST zstd-sys-1.4.19+zstd.1.4.8.crate 1881914 BLAKE2B 1c3ca362f0d63ac0ef234fa1722b0e786d67c528c4edabb0bfabc48b651d9b10d60f8a0999df1adf627c147eb2d0b25c7ab78de10e35ef79c2c7e5b17cfbd812 SHA512 6e096e5d2bb47e57c4553aa2b587698c88cf67f6cae4724fd85ca53450ec4bb414e3495c9354af1f363f8d22f9c9c7e0ebee62bd7f37dd321b7667c6d7721c30
-EBUILD sccache-0.2.15.ebuild 8516 BLAKE2B 0ce00e0a18e481a713fa6a5825ccd67c18cf0aae8265b459812b54bfebfc33cce3ef69dd47cdaf7ba0ba047be14803621325f848e9033149373e1bd327642d54 SHA512 76565733d4a04c67815bf93f76d7d55d6bf242c0dd5adca09317e41e0f11eb09a736e23c80010cdb3172565803f424d7a6dc5861c38490504986590ac06f0b24
+EBUILD sccache-0.2.15.ebuild 8563 BLAKE2B 20696f76dd02dc1124b6fc060d358dacce54e920be29d00e12ccc656c4006b2f34062cc03e4c853d1e179587098b1f36eca6927f3a698e224c4d71ec3a20f7f6 SHA512 5d18b13bb37c90f7ee2f5112c1ce94e748ec963cbb2c6b86608fe64d8148bc44bdc6dd13ee30d884797ba2e0698e283c247bbe6fc46b318ba2b7b76d90af31de
 EBUILD sccache-9999.ebuild 1950 BLAKE2B e549faa89541f1b11e0bfba334f9c2667aa2d5e5323df56f1a159d72b7d9f4be5267796c72b132469d278dc0cdc80fa2d258c345cc57827c88b49292ce0b6481 SHA512 0f097c3ae4638e5aa6896ecb304e0816d6658038d43d9cd7d9c77f094b266ed8e447ddfc8565e869a0432a604756b2221de00579eb943d094130d293088b7370
 MISC metadata.xml 1055 BLAKE2B c220faa8254399d21347304d1489d0cdb68c1ba1792c5faed9138c6f9a1777d3de5335fcbd8c59154e06f4a416f63a65a3f6c876e1e829cfd31c4c54374881e7 SHA512 135768cda69cbec264bbfc0b89cf33db44fd4734aa482a83322e915686bd77e36f80214612cce449d17bf56be13fe20224a16090f9d12b7eff14342e7d9ff9ba
diff --git a/dev-util/sccache/files/reqwest-azure.patch b/dev-util/sccache/files/reqwest-azure.patch
new file mode 100644
index 000000000000..70b4b9d1252a
--- /dev/null
+++ b/dev-util/sccache/files/reqwest-azure.patch
@@ -0,0 +1,11 @@
+--- a/Cargo.toml	2021-01-12 14:25:51.000000000 -0800
++++ b/Cargo.toml	2021-10-18 10:52:26.206057993 -0700
+@@ -122,7 +122,7 @@
+ [features]
+ default = ["all"]
+ all = ["dist-client", "redis", "s3", "memcached", "gcs", "azure"]
+-azure = ["chrono", "hyper", "hyperx", "url", "hmac", "md-5", "sha2"]
++azure = ["chrono", "hyper", "hyperx", "reqwest", "url", "hmac", "md-5", "sha2"]
+ s3 = ["chrono", "hyper", "hyperx", "reqwest", "simple-s3", "hmac", "sha-1"]
+ simple-s3 = []
+ gcs = ["chrono", "hyper", "hyperx", "percent-encoding", "reqwest", "ring", "untrusted", "url"]
diff --git a/dev-util/sccache/sccache-0.2.15.ebuild b/dev-util/sccache/sccache-0.2.15.ebuild
index 2716995b2bea..b1e5c6f04f76 100644
--- a/dev-util/sccache/sccache-0.2.15.ebuild
+++ b/dev-util/sccache/sccache-0.2.15.ebuild
@@ -421,6 +421,8 @@ RDEPEND="${DEPEND}
 
 QA_FLAGS_IGNORED="usr/bin/sccache*"
 
+PATCHES=( "${FILESDIR}/reqwest-azure.patch" )
+
 src_unpack() {
 	if [[ "${PV}" == *9999* ]]; then
 		git-r3_src_unpack
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index f6021a473765..3b071a489b1a 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -10,5 +10,5 @@ DIST scons-4.2.0-user.pdf 2813567 BLAKE2B 2787c9dbecaefccc5f4df2bcccc474ee69e988
 DIST scons-4.2.0.gh.tar.gz 5677165 BLAKE2B c298152db937810ab73afc304a9dc480c185ef0d6e86be5ec7f2022a7d1ed4d3df6ecc18148c3143d4e76a7ea0e50790db1224e66db68bace0759daba7f36a91 SHA512 138573f7203b52fad0527d8d88ceabe182273eff7e4b74125e0d7eda51c44408b07e2c702ee63214519392101d8bbb30013e6d34000eaeb530a816c17396de97
 DIST scons-4.2.0.tar.gz 3043008 BLAKE2B 3e69189e45b8ecc956419d3b7d4d36a78ffe219ff87a18d17c511434cf4306635c245107e7978d8f6b86f65bd2ac028fa3c76ab1212806a692d355d7d8036645 SHA512 91d77c858a888621d41432f39970547830997c8e28a851bbab7c0f181afda564abef321befaa33cbe6fd5fc4ac85fa80f2349994956edcc99c027cf7f526bbf0
 EBUILD scons-4.1.0-r1.ebuild 2764 BLAKE2B 0add0564bc259cee0d3dc5b4121577e329257d62c02c9811f1df5df680402563cdbab7fd118c585c5b4dde333d1a96c69dc4f04b4785b92b4852e40136fd0409 SHA512 cbcc1e83478eb60778e7512dd3268d064fc1e96acfc47ee598b68064acd9b44e262c2d675d5c0383d632014174036bd9b9886f8e320464d9fbcbe2572dd1f494
-EBUILD scons-4.2.0-r1.ebuild 3540 BLAKE2B df5ca824bfab688ea4159bf7ed34d59e8dc02b548e0b8184b3dc344d5bdc0bd33fd278b570f42ade797ef2290ed1e321c16427654f4c385d76624e4afed0cb4e SHA512 351390df8c5042c0cce46daee1c75d585dd742e410378445ec23ec2dca5167d224b552c888d9cbfa9e78145e766269e827c396e317c21ad51a2950256dcdcb5c
+EBUILD scons-4.2.0-r1.ebuild 3539 BLAKE2B 7d2475bafd606da3d117dbd4536e2457ef9382dfae899cf9e4cc67c25036a110992c7e87f2c794db9ca6ef777af8509e43e9a991b8a7e6309a6d636b025e0e43 SHA512 760a75e966b14920844dbff8372581cc375b38910fab0d29e350cd173c2bc63bb66bfb97fdb68b6e5ec8371daa256ec4e6a88dbc609d84c337c5cdf84fd66aa0
 MISC metadata.xml 705 BLAKE2B c2c0722d7a0a382c218f101c0219deac4b335d1dc0a0038f27b7e920b37e4fdad2c7524f0463182a2495c04f9679f511b8a2b92982ee7ffc3cad985cfabf1e80 SHA512 5b127afcc07795487bb4856d942e0a34402c609147256dc457f5919d75a8fbf3f0bfca0c3a5f61d78a1152ee56967d1f48eac670dc12ce292ae964d692c497dd
diff --git a/dev-util/scons/scons-4.2.0-r1.ebuild b/dev-util/scons/scons-4.2.0-r1.ebuild
index 5a28706a03d0..ed23a9f7e196 100644
--- a/dev-util/scons/scons-4.2.0-r1.ebuild
+++ b/dev-util/scons/scons-4.2.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 2ef56f1b98aa..a911a4207b0d 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,12 +1,6 @@
 AUX spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch 533 BLAKE2B 4d0d1b4c605681b2dbfc4c52730c9f20f8290f11a2be9c37db78e533a996c22140faafc2691c732b49b9de28a59644bd5e39a2b7d4209eb44486cdeee1338de8 SHA512 db4786a10e4380f4575d52cf861a82d0aa9f69cec7d47d574f453d159396e993527ba4e469fab75fabc36b977ee4b61abb9e3787ee2af45af8f5865b3b06e10c
-DIST spirv-llvm-translator-10.0.0.tar.gz 535828 BLAKE2B 0bce2f663b2f70a2db2b1ef0665d627716d63baa6cb47ced532ac2e30e8b0424934d273135581655445ea87f5c84c9df876da0490d7a302a6d00c86b78e05c22 SHA512 d6400bb3e4df780358b5d6d0af889e7654b7dfd472c8d41b77ff98e7ff1bd017c289ecacb59a3dd7bfddb1a5108e21028aa770bf645e06178610bb322de905be
-DIST spirv-llvm-translator-10.0.0_p20200909.tar.gz 599696 BLAKE2B 9407d0b3ea9f812a06d08b8fec6cecd73fcab5ebd8aaf10c38c7693207f161b4f1eb822e60b42521e3879cd34b95da7d37cec71fb891f8df13dc60783e655c49 SHA512 fe3e4a00d1ae3fd2324379bb92244399b18a4a31b1a2ec6b9bc60eec471a8ce2da7fbe2ea5a0d247590dd7ffb6e620072197a36631f384357e808fc9b96192f5
-DIST spirv-llvm-translator-11.0.0.tar.gz 665804 BLAKE2B 826d13107efc28fc72e90761e3f4d5b718d4dda9376ce45a7db7a71494adfd293387ebd1fe473d177fb249ef7aca5b10394e200bf60b5de700ba6699e4199ce6 SHA512 e0f4c2f41d686cb574e1fc56fdebbbf4b40602219a9f941fab4c44cc86347e6f651d2fde2ea0fba81c871826f1e8ee92f07bdac5a7532f66fca25b9ed8354b05
 DIST spirv-llvm-translator-11.1.0_pre20210212.tar.gz 702962 BLAKE2B 0c46b898e2d6c293b1db7b4aa65af7830869329cebc35e930b73f98dc038ae50d6adbdd9c6951e2ad427982d2a565c0925ecd056105cc37222b0d8ce7eb2e43b SHA512 3b8503be3ad65422f59ddbfd715a913dd6dab9416a14aea9e6a6793b2c959edaaab5433a3e253ee84c0b3644024a1f8a6b563af65e7aaad209c5f51e524cc96b
 DIST spirv-llvm-translator-12.0.0.tar.gz 1378222 BLAKE2B 059409364403316f84521e231bc14cade2875c2b914acea95619b0920ae4f13babb26411b20fead1d7a028320fa3aea637d087d869759cb23e3266753b5b2f46 SHA512 c23ef81802d2bf743564762815d7375a804bdf8029efd7430faea0b48b5e30a9778c1175f52309b522a07aadf8ff77461b912c1fb3b95af9b09273a483eac82a
-EBUILD spirv-llvm-translator-10.0.0.ebuild 1266 BLAKE2B be273ccb5a212aae3dbed3bff6b31001e106aefe6cf829b82c2705f462b3d758d6170174c6644ce6bcb1240772a49fd59ed92701366fe98684dc68b51ca4a086 SHA512 dadf2527303877c0fe74e8535b49699a6531c496df7220d887dd6a033faf641eedfff5ce31555f5a56523497e9493e8721d2c2aec1f069b4a1f01d2c1632fa79
-EBUILD spirv-llvm-translator-10.0.0_p20200909.ebuild 1555 BLAKE2B 12befee30e2c709c9e709195bb37d9149542ea0abcea4b2fe94a6174c5262a991ca80bc74cd32437b410b0afb43adb7a7e69cd5bb623c2599863c282c03821d0 SHA512 f5a0144d7ecdbd13e263e972774ddf0b08de7ebe4e8cbd450a6c58d1f535b725556f323018433838d4df15620fbc458461f2edab76c605344be5380605e91f2b
-EBUILD spirv-llvm-translator-11.0.0.ebuild 1555 BLAKE2B e2140c932905dfe3f53507cdfca04572fcf9c68a7c16e3f09de02426e9b1af71ff1056e5a9aca39d248653a4561ed686eecd76f7f9d2e5b3082ef7c9f3d6ea57 SHA512 0650a432c75a86437bb94ce30ba569bf5c39117e3eff5efca26e3bef9bc1047f20c3209f4b0347bd734e49c32fbec5531fa27e0b141f6e752b593a130169cb6b
 EBUILD spirv-llvm-translator-11.1.0_pre20210212.ebuild 1554 BLAKE2B 028258811c5e19b7c5b77c5eb878efc63dfad70552f30aa83b2159e8a5a01ce995850cf6155ae52fc62e7873ea4428d7688b207692ff19661c6f6970ab0d0743 SHA512 d40f447de191a6b04bbae96966558a6975cf84d1e15265b3f7d5406467cb57fbfd2b8ef839a64efcd7ba2ce95b16ed149978d9b6f694dd43e8add24c0a391800
 EBUILD spirv-llvm-translator-12.0.0.ebuild 1200 BLAKE2B 18bb217dc6c28b57fce2439389dcd2d2e8205e05e6ced8f85c3db76341dde15a497688c871038d8b2b8e210578007a25db694239f476ee1988255bf467993792 SHA512 2f1d78eec685a1c8fa4196a1c3443cdae4d541e3657b0ff0cae1a2d8c68c9d20184412415824f8e64124c32f2e93371e9cb775b3be5aa85c14b5950bd2bdbbc1
 MISC metadata.xml 585 BLAKE2B 0fc156f0d89b54e7341c053bbf1bbb1f1ebec639561fc30e0e49b5ed6147d6483e79f0a0461c46414deb5527d19df36288284ee263ce8bf50c34433b76bae748 SHA512 c34da54f0025f0da625f33f0d305c17d8a56e50345e8fe5e6db0138dd4f00322f2df8203d29f023d9ee70f2a1e399114153be70e5d97ec673c36e7a463b6c89a
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0.ebuild
deleted file mode 100644
index e4ea0dd13f8c..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib flag-o-matic llvm
-
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="10"
-KEYWORDS="amd64"
-IUSE="test tools"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON="sys-devel/clang:10=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-BDEPEND="test? ( dev-python/lit )"
-
-REQUIRED_USE="test? ( tools )"
-
-LLVM_MAX_SLOT=10
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
-)
-
-src_prepare() {
-	append-flags -fPIC
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
-		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# Some tests fail on amd64 when ABI==x86
-	if multilib_is_native_abi; then
-		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
-	fi
-}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0_p20200909.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0_p20200909.ebuild
deleted file mode 100644
index ab9d37786360..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0_p20200909.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib flag-o-matic llvm
-
-EGIT_COMMIT="4f1a3270f2431aa98f1bff30d1a32c9d8f4729bf"
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${EGIT_COMMIT}"
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="10"
-KEYWORDS="~amd64"
-IUSE="test tools"
-
-# I have yet to see a non-release spirv-llvm-translator ebuild pass ANY tests.
-# This is probably something silly like the test suite expecting different
-# directory names but I really can't be bothered to debug VCS snapshots.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON="sys-devel/clang:10=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-BDEPEND="test? ( dev-python/lit )"
-
-REQUIRED_USE="test? ( tools )"
-
-LLVM_MAX_SLOT=10
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
-)
-
-src_prepare() {
-	append-flags -fPIC
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
-		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# Some tests fail on amd64 when ABI==x86
-	if multilib_is_native_abi; then
-		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
-	fi
-}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0.ebuild
deleted file mode 100644
index 473d07748b25..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib flag-o-matic llvm
-
-EGIT_COMMIT="d6dc999eee381158a26f048a333467c9ce7e77f2"
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${EGIT_COMMIT}"
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="11"
-KEYWORDS="~amd64"
-IUSE="test tools"
-
-# I have yet to see a non-release spirv-llvm-translator ebuild pass ANY tests.
-# This is probably something silly like the test suite expecting different
-# directory names but I really can't be bothered to debug VCS snapshots.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON="sys-devel/clang:11=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-BDEPEND="test? ( dev-python/lit )"
-
-REQUIRED_USE="test? ( tools )"
-
-LLVM_MAX_SLOT=11
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
-)
-
-src_prepare() {
-	append-flags -fPIC
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
-		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# Some tests fail on amd64 when ABI==x86
-	if multilib_is_native_abi; then
-		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
-	fi
-}
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index 9259901ba4aa..55a2ab1303f2 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,17 +1,7 @@
-DIST stripe-mock-0.103.0.tar.gz 567107 BLAKE2B 76dbc6bbb1d62ea68c30291fea894e563a426790c8928e7bc5a444eca8d48c8bcc23067459c1a249449af305a6809c70168918543087a1ef5e38cf7609421a7c SHA512 65ec61ccf94d1931389c4a16288dfac4d820a6fdf641cad1028347dfcb298aa4370d97d2dd4e468e17b8a702ce6b7611213b0707f1d5e37cd20aec46772e6a9c
-DIST stripe-mock-0.104.0.tar.gz 574936 BLAKE2B 681dcc2b02f5d4ca946024d1c049e499ce1c05c5a00653ca5a1af25325ce66b651e307df12ac0137fb38478332a8a04fb09ced39afa697a81a4afcc69a1cf314 SHA512 6d9c5fe5e5e83e8721ae441ae15e16594c690360a62934e825627add8acf6d58b0c4f52bd2c6d787c934fe0e974790b35b7c63d02f097647744549626b1708c5
-DIST stripe-mock-0.105.0.tar.gz 583483 BLAKE2B 8015699be4cd7a0c6e81c8f89cebe23fadb02904a175fef15c5e1fe156b01b001a03ba4b42ddffd453203142b1108d5981782d23e1369bab61181e0ef3964734 SHA512 539c3315c3e4896584a656fa3157ac69331bdaf2c77b6a7433b8709971e3b248fe89f1df3eab3f3178580847109460b86f975f0a378aef48ca3c29466b076f52
-DIST stripe-mock-0.106.0.tar.gz 592320 BLAKE2B 2154898ecb13516d11fe5188012829af5618a0520b19d6c3899c976ef719e5ddfe0a1bfe0c6787b9e51c695734d90e2297b8df6abc7d055a8d4df8e747d16b08 SHA512 30d5db6ace639435f0c97ce2ff38c02acdb464a09d5cf59a90ea3892b5f277e05ffb67d068b74739c2cdca3e73b2db74054079335bb28536c57457b46251bd6d
-DIST stripe-mock-0.107.0.tar.gz 592857 BLAKE2B 6fb58e6c38a04e443adf68bd30dbe16531abede29c104c617bd16f7fd9ce19b38bcd43df2b3fc21e9f8f5cf58a9e6413158f09a0e4746721e29180bfa8e5a26c SHA512 c455f18c242d15e20022fa17a99d4fb33ba93932d6983eb589b4e084b1bd2739a1db837ae70c4043cc4333a5a13ff4f4b16785a9ab014e556901fa975380e90b
-DIST stripe-mock-0.109.0.tar.gz 604488 BLAKE2B de84bb5c549628a642c7612b86a5d3266d920e14ba76d7a03055569718cdf05a5ce1d022c645423c11f1ea82849879444c779156bbd59cd91ba89d00176af5eb SHA512 a14d0feb1bd3d191dd184218bb23bb8f7f8fa582a4b66f8dbb8d8c0c028e8757a914cf82ae7b8eaa43be246a3af4fd19744b69d8496816caacb91672fe9b8538
 DIST stripe-mock-0.110.0.tar.gz 604856 BLAKE2B ce8b83ce4787d56752ce47f919c049a32ad0addf67db0461a70fba2380406e5dbaf0e096011a3a371d897d9bd3ef6c573cdec1b66607b0d4b99c3fc11a931d19 SHA512 8501a8d41d0dbba77064abbf083162393453b884bcc9077793d7a75948a925fb056ff37ef74d5d789598d9081639f74016f06980954d3be84a9131ceb21539b2
 DIST stripe-mock-0.111.0.tar.gz 604494 BLAKE2B c9aad7c4b939a49c6a947cc3a2b2506b0c2b7e2c0e1f8841f92b7d53e1138a4e6333eaecf6f2a984861df6fb67800acd8d29b3774b8970e5e482f58fed4e9c53 SHA512 1b01136bb52543052bd66b1c7112181dc0834d5e17ff0590fd2dfad8fdc593eb21967e7ecc3ecac8ae7882e44410e752ddd203b9a87b34d6f4c1fea1cd3ebbb2
-EBUILD stripe-mock-0.103.0.ebuild 582 BLAKE2B 3e5f302fe8efdfa19c81b51aa1f733c8695650a2ab7982ac737f67bf0005c4d94ecbe47c59c41ee81377d9e02671119e19e084ff37be10a555ea031d1951f6f8 SHA512 25771845d4987ba1fd2e4f49ec69825c59a36d0ad967ef258b149de7f53edc7ef7cd3198095b2684e7364e0f46d8a62beb653e6b088f14184ee5a6efed72d53c
-EBUILD stripe-mock-0.104.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
-EBUILD stripe-mock-0.105.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
-EBUILD stripe-mock-0.106.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
-EBUILD stripe-mock-0.107.0.ebuild 582 BLAKE2B 3e5f302fe8efdfa19c81b51aa1f733c8695650a2ab7982ac737f67bf0005c4d94ecbe47c59c41ee81377d9e02671119e19e084ff37be10a555ea031d1951f6f8 SHA512 25771845d4987ba1fd2e4f49ec69825c59a36d0ad967ef258b149de7f53edc7ef7cd3198095b2684e7364e0f46d8a62beb653e6b088f14184ee5a6efed72d53c
-EBUILD stripe-mock-0.109.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
+DIST stripe-mock-0.112.0.tar.gz 627738 BLAKE2B 7ce44762596de04edda1e544a6bc77c36f68dabbebb280881d9e992b3f08054c9a3dc6805fc6060cabed5c9fcf185ccdf89835c123c9145cd2dccbd57fdf4461 SHA512 8d78712e99c95ab07514406f850d4255ff69bcca804b030a23ec9cb6a19408ade26836a2b4be6262868bc57ad68542112816edf3c6508c01a9bcbc4202922a27
 EBUILD stripe-mock-0.110.0.ebuild 582 BLAKE2B 3e5f302fe8efdfa19c81b51aa1f733c8695650a2ab7982ac737f67bf0005c4d94ecbe47c59c41ee81377d9e02671119e19e084ff37be10a555ea031d1951f6f8 SHA512 25771845d4987ba1fd2e4f49ec69825c59a36d0ad967ef258b149de7f53edc7ef7cd3198095b2684e7364e0f46d8a62beb653e6b088f14184ee5a6efed72d53c
 EBUILD stripe-mock-0.111.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
+EBUILD stripe-mock-0.112.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
 MISC metadata.xml 643 BLAKE2B 6a45b4c6f7e3372850e8947db71b028a32f6fc63d202b912a0fed600dd7f426984828af2f80dbfbdafb69a15a3b58b82c2b738b424727b28704aefb43f43e361 SHA512 3a1d0724f14ca0885c6dde06b9c0fed1dcf7a9dcbfb32de75682cee9ad2b29fc94f9544319a2fe5d5fe3c25afb01e0f6492616e13e3d01640af7defd0ba9c098
diff --git a/dev-util/stripe-mock/stripe-mock-0.103.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.103.0.ebuild
deleted file mode 100644
index 07a1e00de87f..000000000000
--- a/dev-util/stripe-mock/stripe-mock-0.103.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_SRC="github.com/stripe/stripe-mock"
-EGO_PN=${EGO_SRC}/...
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
-HOMEPAGE="https://github.com/stripe/stripe-mock"
-SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 x86"
-
-LICENSE="MIT ISC BSD-2"
-SLOT="0"
-
-src_install() {
-	golang-build_src_install
-	dobin bin/stripe-mock
-	rm -rf "${D}$(get_golibdir_gopath)" || die
-}
diff --git a/dev-util/stripe-mock/stripe-mock-0.105.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.105.0.ebuild
deleted file mode 100644
index 05a7220e34b0..000000000000
--- a/dev-util/stripe-mock/stripe-mock-0.105.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_SRC="github.com/stripe/stripe-mock"
-EGO_PN=${EGO_SRC}/...
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
-HOMEPAGE="https://github.com/stripe/stripe-mock"
-SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT ISC BSD-2"
-SLOT="0"
-
-src_install() {
-	golang-build_src_install
-	dobin bin/stripe-mock
-	rm -rf "${D}$(get_golibdir_gopath)" || die
-}
diff --git a/dev-util/stripe-mock/stripe-mock-0.106.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.106.0.ebuild
deleted file mode 100644
index 05a7220e34b0..000000000000
--- a/dev-util/stripe-mock/stripe-mock-0.106.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_SRC="github.com/stripe/stripe-mock"
-EGO_PN=${EGO_SRC}/...
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
-HOMEPAGE="https://github.com/stripe/stripe-mock"
-SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT ISC BSD-2"
-SLOT="0"
-
-src_install() {
-	golang-build_src_install
-	dobin bin/stripe-mock
-	rm -rf "${D}$(get_golibdir_gopath)" || die
-}
diff --git a/dev-util/stripe-mock/stripe-mock-0.107.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.107.0.ebuild
deleted file mode 100644
index 07a1e00de87f..000000000000
--- a/dev-util/stripe-mock/stripe-mock-0.107.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_SRC="github.com/stripe/stripe-mock"
-EGO_PN=${EGO_SRC}/...
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
-HOMEPAGE="https://github.com/stripe/stripe-mock"
-SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 x86"
-
-LICENSE="MIT ISC BSD-2"
-SLOT="0"
-
-src_install() {
-	golang-build_src_install
-	dobin bin/stripe-mock
-	rm -rf "${D}$(get_golibdir_gopath)" || die
-}
diff --git a/dev-util/stripe-mock/stripe-mock-0.109.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.109.0.ebuild
deleted file mode 100644
index 05a7220e34b0..000000000000
--- a/dev-util/stripe-mock/stripe-mock-0.109.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_SRC="github.com/stripe/stripe-mock"
-EGO_PN=${EGO_SRC}/...
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
-HOMEPAGE="https://github.com/stripe/stripe-mock"
-SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT ISC BSD-2"
-SLOT="0"
-
-src_install() {
-	golang-build_src_install
-	dobin bin/stripe-mock
-	rm -rf "${D}$(get_golibdir_gopath)" || die
-}
diff --git a/dev-util/stripe-mock/stripe-mock-0.104.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.112.0.ebuild
index 05a7220e34b0..05a7220e34b0 100644
--- a/dev-util/stripe-mock/stripe-mock-0.104.0.ebuild
+++ b/dev-util/stripe-mock/stripe-mock-0.112.0.ebuild
diff --git a/dev-util/uftrace/Manifest b/dev-util/uftrace/Manifest
index 10f2faf6538c..4d9bcf606cbe 100644
--- a/dev-util/uftrace/Manifest
+++ b/dev-util/uftrace/Manifest
@@ -1,3 +1,5 @@
 DIST uftrace-0.10.tar.gz 1111530 BLAKE2B 29388523e1009276ba4609d85e5979e823d028ff647239aa02ec2cac5ae21c7812c7699d47c09c0b9289a0debb39a2f502615547c8e658a821d5078e3b12c6fe SHA512 788234e4156974a70f06d02527e56e5fac821e8b66363dc5fc55d68797c374043c0b66b18b4ab1488b9647e08969e8dc94a64d6bb1a38ccad4cf98eaecc6e919
+DIST uftrace-0.11.tar.gz 1120956 BLAKE2B e3bda84a7323cc50780950e502856e28a380249a0f518ad3f7950c4147f0ab635e84b978395eb9025e6b47ecf7eefddcde59356a22f1c8a1d60ddf9820dc3d41 SHA512 519ca13665ba97cea4c349d81b4b5cacd8d3d9b2188ef5edb447f6b783cb7a92356bc0f9e63b67427a896d8df671f58091113e1de3fffd8d8000417a9fdb6e46
 EBUILD uftrace-0.10-r1.ebuild 1202 BLAKE2B f9349c41687cc23c67ec8a1664074e5df3f2a9bef8cf869490a19d6f2c0c52cab466a8c25074c0eae8374171cb0da8d73daed54ad9a947912dd6562c4409257f SHA512 db312bbf04ae6e25a4a4bd4bb4634c0f824d129acf64224459182e40318475cbed0c9110e5b037f0902001aa808ac6c12a0b45f52ca109e74d7c651b4155e55e
+EBUILD uftrace-0.11.ebuild 1408 BLAKE2B 870b9a39ee078a2db5797f69e4d8f9b0412a45c81996f6e95f7b5a403dbed15dc8c0e275f75c894474f089d7f706f7d7035b88d604365a101caed81bb1cae48e SHA512 e6bda676db054afc9bd718552b4953c1a10bd442f0db9a959c26b1c440b60ec10da2942a4775fad8df851fc92195ccd5f9f9d08bf8d020831a6e7baddcd14a80
 MISC metadata.xml 439 BLAKE2B 5164074d22c56fcba8f0677446484c392c347058c444e3f2760cc1e6d17e07406741f80a525ba99b575dca2d9347fe3b13b82fe5aa79bc734add9806695a5fe2 SHA512 d6e0f7ab729d6088748d5efe5c88910355f5ab7e70308b3b24f8cd27956b0ee21f8ff8bce18f9969694bd4677c229fe80317735de63e9a80b4dca638738dbe5d
diff --git a/dev-util/uftrace/uftrace-0.11.ebuild b/dev-util/uftrace/uftrace-0.11.ebuild
new file mode 100644
index 000000000000..31a949ddbd3f
--- /dev/null
+++ b/dev-util/uftrace/uftrace-0.11.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 lua-single python-single-r1 toolchain-funcs
+
+DESCRIPTION="Function (graph) tracer for user-space"
+HOMEPAGE="https://github.com/namhyung/uftrace"
+SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="capstone lua python unwind"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RESTRICT="test"
+
+RDEPEND="
+	sys-libs/ncurses:=
+	virtual/libelf:=
+	capstone? ( dev-libs/capstone:0= )
+	lua? ( ${LUA_DEPS} )
+	python? ( ${PYTHON_DEPS} )
+	unwind? ( sys-libs/libunwind:= )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e "s/ARCH/MYARCH/g" -e "/ldconfig/d" -e "/bash.completion/d" Makefile || die
+}
+
+src_configure() {
+	local myconf=(
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/uftrace
+		$(use_with capstone)
+		$(use_with unwind libunwind)
+		$(use_with python libpython)
+	)
+	if use lua && use lua_single_target_luajit; then
+		myconf+=(
+			--with-libluajit
+		)
+	else
+		myconf+=(
+			--without-libluajit
+		)
+	fi
+	CC=$(tc-getCC) LD=$(tc-getLD) econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	default
+
+	dodoc doc/*.{md,gif,png}
+	newbashcomp misc/bash-completion.sh uftrace
+}
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 89a198f08e54..15b0cd3c736e 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -4,6 +4,6 @@ DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6
 DIST umockdev-0.16.1.tar.xz 478308 BLAKE2B 3d49ca1d9c9b7573ac63f5f7ecd81071041597732b507619c333379095434ac55eb26f16bdf5897b94bbeb5c307a34b703accd220cd6202482e172dd3a6d1983 SHA512 baeaf05cc6b8d8e2a5cae16b808db759a18a969cea0f2ceed5f6c2521edc0c4c07dc16265a4821051de51f4314fd39d63ebf2da124fcd3e103ec743dadfedaa8
 DIST umockdev-0.16.2.tar.xz 478388 BLAKE2B 8fb2116ec7d48b238898052d959c596f4f91a65cf7b8292de8b8731e6fe50600282cb56093b8d6ca1afdc082a12c9af3c4a4f443283538ffb2aeae4c2b775596 SHA512 82020c068d5a158a762f865f4b25d1ee8596785a5b379c316c652004e1b1b9c533d4dad87818a490f89983a4c065f34e4ff5ca91360bac6d79b141dfa2139eea
 EBUILD umockdev-0.12.1.ebuild 1304 BLAKE2B 35be39188381c08265e988b7dfc58b6b1f48b57ddb9b8d253513b37e592239d53e0e3b3a7561767336a4910505c47d4db2bba5bcb9d8472b63395d748275e8f6 SHA512 68943daec6ca268b1cc2069286fd4432cdb036c161e4b6a19c1de935a8f28414db30edc854fa87cfc04523c494886d4dc2c86f296f6e8209eee9deb13faf0dbe
-EBUILD umockdev-0.16.1-r1.ebuild 1191 BLAKE2B 5a6175029f0b47cd08004ecc6c43fcd58008db5fb523cc1ef66d7149655b28354b8a156e15179a8416ec88699bce8e43cd9dd40707ede158a8d6c23077c16ca1 SHA512 17cac11468cd57c3c8697f9e4bba664243ae02d4db8212ca51b6d6a0387f4ddb3712b02fe532fbb4a79a0b2cfe941ec45c8fe689cce87e27d3d0e78dec9b472c
+EBUILD umockdev-0.16.1-r1.ebuild 1190 BLAKE2B 900ca5190eb654654643c76ea29e066ebfe8859a183f80108e12da90588ca333929f2b22c64048bff9bc167988c45f6fcce615314203331588b08c4f5c9df42b SHA512 4ed435f6ecd9561a097d1778e7777446766955bb3a47d1587596866888bb8c0d2a7f2414582e3435f7318f6c7ed282e63b75332603fefabc282670528a23da17
 EBUILD umockdev-0.16.2.ebuild 1202 BLAKE2B 03560e8632ed2b0d403ad5ceb1455f723dcf96c5b08ca0bf4cb3fbb0ec6cf30ee8655a434f1f206a26a0a6c6c8b34a870c109f8cfb0ca1bcc47a5bbeacfbe770 SHA512 26f1c5b1db1df7b71886d2eb7ef8fdb79bbddc1d40c30e6f124422948be028e045bf9b98dfa9f0cb061e659fa833c52b13e0b8aab141457c931111aa96a0f678
 MISC metadata.xml 389 BLAKE2B 83313795741d7a5ece22e39de4d8b138c484a7f298f64d7e87bf44a9c04b6733c80f407ca15eb2b4bd71205eaa51b6b814227f4df730ba77e3b54a27735e7484 SHA512 6aff7de0eb974f8ddc4a7190b06b8e3ad406a410f618935cb0b757fa2bc22b6a33ecf33510ae9fc2d4a03f676905faa5561d030fb5e5065f8dc3e7320820cda1
diff --git a/dev-util/umockdev/umockdev-0.16.1-r1.ebuild b/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
index e88606a1ccab..a831885e1ba7 100644
--- a/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
+++ b/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index db1ef6d5dc8d..87e1ecaf926b 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -3,7 +3,7 @@ AUX valgrind-3.17.0-lld.patch 2837 BLAKE2B 331c5eb91f476271a82d6730b5aa628ecf3a9
 AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3
 DIST valgrind-3.16.1.tar.bz2 16262776 BLAKE2B 1c333c26827f7a8356869e8758da9dd6a7444642ac4f6377c84fdab8349b9cee1e9bf2cf2eb86043c4feffab342dd97da20e76d7566d0296189e6ea8483a8c65 SHA512 2a4173efe1b6facdd2f5c5ee8ed006704168eba1813736fccc8191d60363afd96197512cf42037e65f18d4ddd49adc74a54c47210df216fba3c46bf68ef0f950
 DIST valgrind-3.17.0.tar.bz2 16459075 BLAKE2B 96569db9bc3c25ca195a4caa64da6e96b9bff7edd82727fccccaa8307162e29f4e150386c7c9611152fc1afde609d0922aa84067957b72dff03810ee23045e9c SHA512 94de78942a7059e1ab84d1c0c0b8f3efd1c2d15c70b97bc7edc8136812778adb6f8187149d53a60a8c6a7c8b40534f9be5cfed0eb3c0c314545b681f950b108f
-EBUILD valgrind-3.16.1.ebuild 3700 BLAKE2B d9cafee6c49c3055d3dae53ca9702ead5c6c6380fd7ec4954d97e00b938616c4734cad17bdbabefc7d053e7606cc7350b79b1920eff960023ec507168f24cb74 SHA512 a1fa319bbe947b54676e7603d56c42b4af808bf93149e1b3a14ca837c33b747dc07161a41833c377b948099fed8ad8bb8f2ba664a3e9c3841a0f7171f0acef00
-EBUILD valgrind-3.17.0.ebuild 3746 BLAKE2B 9b9e00a73a16c65d92d05bc3156dba11fcb1fe74dd2f200590b69c4767ab6d4780fe95ef22e57607739530704a97280dd431332eff1a940fd754e0942b08860e SHA512 24f0717d06e297aa8e25d368f92e471aa3435ca8fb40266596498d163ec69d99721e456435996a1f00bb75d4c7beb52372ca63509f2391c01f154bb26eb2aebe
-EBUILD valgrind-9999.ebuild 3706 BLAKE2B cd2e4f588afd417b9c70042304e5a6db83baa2d4b1f182f5bfb7636d4455e027366c3047f7f639ede0a9cef446cadf1893b9784eaeb734692fddc55dbc6fc7d3 SHA512 c04f648a07d6cca1dd196c7523338ee295ab504d561c84ef8154391fc5e6b6a72a43b132cd3615525937609bbb917df46d79c586c6195d99da22d9a3381476f8
+EBUILD valgrind-3.16.1.ebuild 3702 BLAKE2B 606e290548a4dc97c07e0de746a8cf2bbc770b2235acff42862118c924c89486925d6074ce74428942999c6b5fb5682d8a9e18c05edcbdb894044e17fecb6ac4 SHA512 feadc6b2c6958bd9a873740e33fdd514cfc71715ae0d786cf6d03be733bea663889d05f6d282d78c76e1ca53d828138aeaed4ea0dff7f10a35ebe33a9333da52
+EBUILD valgrind-3.17.0.ebuild 3748 BLAKE2B 7323bfbd62cff9b57c3d7f61c182f579890fdfc9a2f8ed5748e834fabf29cba0cc81eb9492095c7f89c20875848cbef124860268bb01ddb16a7781ac903ccb0f SHA512 883440bcce991fa03a659a9e29838345b4531db773ad8ddc7ee63d421bf8bafabef747acaf5b4e3c773c5cbd929bd70443f0c2e56fdeeb6a9934e46c6f06bf1b
+EBUILD valgrind-9999.ebuild 3708 BLAKE2B 9061d6fc5afc28e07e64315e237be661a7f44aa1c1a4c85059caad534ca4b3ef87e1f89b5227287da255408c2ca7df62ba36a2acfe49497db08878a5c5379f72 SHA512 dc8d35a72e7b4bf46557ba710b4e42a54707dd547a58bfcbf404fffa5a78213a2a31a59206137d2af824eaa836763ab4edf5eb8dce73400c0d60dc8c4778fb66
 MISC metadata.xml 1028 BLAKE2B 5e6d52b6a5e657f56dc8da70f83d340c8ad8ff1448b109916d77a51b62f9018dafaf20586684d9d5c0984647df9fb3886b9fc0fabcfd62bcd13ef8d5e1de223e SHA512 1b9bd9d815de416b73e03bb13f88b662b14b4c135a36549ea5ad69a59c9395a240b80c30e6847eaecc2318ca88a2081e71fed41af2e9eed5162dfca78c7af920
diff --git a/dev-util/valgrind/valgrind-3.16.1.ebuild b/dev-util/valgrind/valgrind-3.16.1.ebuild
index 890f41044529..7594d5e1682f 100644
--- a/dev-util/valgrind/valgrind-3.16.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.16.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
+	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
 	KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
diff --git a/dev-util/valgrind/valgrind-3.17.0.ebuild b/dev-util/valgrind/valgrind-3.17.0.ebuild
index 148f504a5702..589e08e8b7d6 100644
--- a/dev-util/valgrind/valgrind-3.17.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.17.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
+	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
 	KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index 10a17a63d2e6..ff86af7c1d94 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
+	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
 	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index b096f9eaa9df..c3e9bc6f71f5 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,9 +1,5 @@
-DIST xfce4-dev-tools-4.14.0.tar.bz2 292275 BLAKE2B 18f28394ded038a7bcf0e754ebb359464358df245903a0c4441df2845e57c9059de6e6775a90c0e6c3cde4936a847ddf26ae88ff61fe7612fc2626b00f1d56a7 SHA512 e22b139ff7516ec0e510f882cc6a9e8e8b2b7bd41093c8e67e5ef11eb6c2c2848637513369d652f7238f10b5005c5483a938d3348020b48a4c1fadadd6d635f8
-DIST xfce4-dev-tools-4.15.1.tar.bz2 340738 BLAKE2B 73c08f27011ce0d2144eaa1672209669a382695bc9fc9c0a7b9966398df09cf4813afdde9f809354b48d8ddc06644b6e8d4f45ed758dfca24c92e557f5536c8e SHA512 e24fb63774b36f5b3cd901394b75b36e891a68fe7a46a1503a1fc3cfe901bd267e2d8d4aa35a2c760226524079617059e5344b93ef98b3f97dce85e765e5c5dc
 DIST xfce4-dev-tools-4.16.0.tar.bz2 340107 BLAKE2B 93919e1b705858770f5c98cab080ba86785d524dc7371f09fba065f2bdf549d9a3ada66cdef3e1bbd344fb62cecb70661a1b6ce8c8bb51ada0be9459604d4d4f SHA512 54d9b45535c174ab0d13a3061ba2ff247c788a1190a6622b0adb4242d12e1fe42715256a18168d42fd5e425bbc7e9e81de30aa507da04f3e8d9b6f1ae5a5a7a7
 DIST xfce4-dev-tools-4.17.0.tar.bz2 341014 BLAKE2B cb9588a200176cae5031b50e51baea1d2c4051b0a68e6886766986f1883f00e3cb13d662ebe1aa0e72892b83eb9dda114f545d1a8883fd7bdef8fd030e60ab4e SHA512 73423bb5cc55ab8816d734ac24c3f005bdb7db370d9a2e5e820cda1e6385730cab1f2fc8af715caa961e571ddb234c2b46b9cd26636142b9ab5d18c3a26efc00
-EBUILD xfce4-dev-tools-4.14.0.ebuild 578 BLAKE2B ee9471d511f0f61bebc4458fafd29ec7c246ede52b393404d055058f8453149fb13a0c5e83504aa15465ac4549ec67a8bc693d59f44cb268e61ab313de3b0aac SHA512 de4981b2dd476a6582654f5bc09b3e6008d0f96b310737e0797c66bf3e469783a7dbef58445ff20d5e9d8ea02539d334e6c5047f78ecbb82290deab39a9aa83a
-EBUILD xfce4-dev-tools-4.15.1.ebuild 584 BLAKE2B 6b2f6fcd2f8ed91d4a09138a3ea90c1ecb1e5cf8236dc7e16bbf4889d0aabb9a08d822b7cca7b0888ee586837e41a5c055d71836cb2255ac82c99af875a58cf7 SHA512 35e950fba2c4de9b286afa8d9af5560c8c1ec72c8df70ab2fafc67015005bee23f5e7b59e79e8d631e668cb1ceb423106c4a1fddfdbd39e8e7741e6fb9fe1c9e
 EBUILD xfce4-dev-tools-4.16.0.ebuild 598 BLAKE2B 13b4bfa02960605265c996d8d2e1976c4e5dd645026ce5fe4c7812f12b5f63891d481b22b0e06cbbbc9290fb1178a85afd3e124d31a033c92827e63e4b3e1d56 SHA512 9a17075362771d9af7d4aafba81d9e5a2f61c8be4c595c46feedb96fe8b5f7bf185d310352bcd24fd6024b66e2f76f921c3d58c20e30041bfaf89089d2e91d0f
 EBUILD xfce4-dev-tools-4.17.0.ebuild 604 BLAKE2B 1af6af763ea82c4ced52491f80e59cbc78fe12613b9d383fd43e579cab6dc61ee32773fa57c1f43facc34c37a1670677cd0a5aa9d661900241adef0c646637aa SHA512 ca601687131a0b2f4c5d5cfca0a9aaeeead9fe7f2868b2cee163b5a4da298d2aaf6976b69cddd62286ffef2058a991d5156a8c4bb2be4295f1f707fbc7ab243a
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
deleted file mode 100644
index f68bf7c7a78a..000000000000
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
-HOMEPAGE="https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.42"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.1.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.1.ebuild
deleted file mode 100644
index 665633a8f721..000000000000
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
-HOMEPAGE="https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.42"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 299103cc72f9..781e24492208 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index ae41e0c172af..5820fa913f2d 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -21,6 +21,7 @@ DIST git-2.30.2.tar.xz 6329820 BLAKE2B 1c553c183d5426c524852bfba38b39196d9f0fb83
 DIST git-2.31.1.tar.xz 6413368 BLAKE2B 2d40aa3e5336e57b3cab42c36dd07698be7a811e2890f4c9ecaaa375f985313bb8e14fe7a70c1beff3009a9102b935e4a6065019ab3b2520f09339e2a0fcdb93 SHA512 9aa334a3e8519700ff5d112153ec42677722980094caa9d22aa91afdb65166bd9a98fa445c0d327c428ebfa73bf4832e9b3836109a1d9319feafe3191cfd170e
 DIST git-2.32.0.tar.xz 6551348 BLAKE2B 546203ce3f749ba806866a9e9767bc807794cec435fd0b60306ae6cd2b1b17a0159ef9774c79c4f59d0dba45b36941085b55f103e1820450d560bffa41d1058f SHA512 1ab3e7022ccee411d14a7da5c37d6259ef5c0f85ebed8f49698e25c65cbc7a46f8096919fcb6568360bfe284dd7475b596eee1a167db966096255a405853837c
 DIST git-2.33.0.tar.xz 6548308 BLAKE2B 52310a54a059ca1926ed14326bad5430f0bc8b19601c640fcaf6be58e2f9e9b2c0b7b34c4a3b80e84bb52cbd7c8c6a1b8b53c977af11f6714d32c34121221a63 SHA512 1abbcdf9ff640c95934b6a78341baa76ac3a5838c4751f513f334fdf5a3760c730e309f05ad16ffec115896e3e0c750c116683f6a787d92757ee9d916a346bfd
+DIST git-2.33.1.tar.xz 6558636 BLAKE2B f4959d5309f85e063448673a3f06f1d3cdd65ced5f5173cfe5a38df3b5547cae1c08275bda02e48307e8290628735e2ea1ff49222262e7cd29b252a6aa4d4a15 SHA512 16d417183232e1057bea754d59cdf4bbacc5f1527d1de6ee04cdd293a2512bfa7208e20f6130816605528b59cb1bc3188c5bddf1a42c1413095ee74e44dd2f91
 DIST git-htmldocs-2.26.3.tar.xz 1305208 BLAKE2B d5bb834b00a9d0cd3cdcd671e33142595e4ac28be8eab2326263f548718d52cf141b7fa6afee8da05a15ac75252455945dd34d60ffe5cda6cf1d612b7ee35953 SHA512 ff6c912572d32a1f32ec4c73e07e1404155ccbf81509a741e25e9dbcf42e5348dce59c40b0bb5d64993d8a981e2afd773393b2aeacde457870aa1f03feb9a1a6
 DIST git-htmldocs-2.28.1.tar.xz 1348296 BLAKE2B 6bbaf94a963204d85100554578fb2520c44b74332e6dfd0f468fa3217efad2a484ef427359411569ca503a809aec00edde21ab577ee9ddc9779f0b702402ed4c SHA512 9e672673f271a136f9c2d1ed827dbc76656b40315cb5d11d95aa18c006fad8ea2c2535f2092f1b6514a6ae7f88589178fc90299b496f446debb673e8f36f8909
 DIST git-htmldocs-2.29.3.tar.xz 1365468 BLAKE2B b8b2d46a5b35f6962f06bd9837ddc613aa5f4096dcdabea4308fcc52bf4f639fbdade2f91e01738cce6befb8b63faf57f8ecab1200048794d873f12055f04bdd SHA512 217a313636b5e7470e58d21428c81262f9d9909227f6a47c8445eb301bb20dd8393d0e600b8e7dad04b030a688561f93cdce317ad714cecd0505c198e1fe44a2
@@ -28,6 +29,7 @@ DIST git-htmldocs-2.30.2.tar.xz 1342648 BLAKE2B a81b2111a79b7b211f99c0ac2b3d397d
 DIST git-htmldocs-2.31.1.tar.xz 1357592 BLAKE2B 54b48cfe2bb8e5dad9fdff862aa91e5805b0cd331b459d51a71ed913ca68d1aea6c6c69cfadbe8b6101b4d7be63c3811027a2ed42f9d2b0d3509664726b8ad78 SHA512 d243f4e3047c0e29bdd9127ff529c7fab5ebf40a4afaa04c3a9261ae398aa61c16a4413b7bf580c7f874d632b866908d92322ea0502141d811b78b7636c8d28b
 DIST git-htmldocs-2.32.0.tar.xz 1381664 BLAKE2B d1b47aa99d32a252fd20df26eff44a558044f3a389379b161bb43621eb28375eb0621969849a31938ba7fc9fc58b140d27d703559ea5735d0a0ffd2e93cd9692 SHA512 12b84e342f0d19afe385ab8a685ae625e86c3295d1555992e0c427b361aa2cdfc89a679e7dbc468d3568a325dafbf699468aadcdb02f93e372eff3dd96a7cf7f
 DIST git-htmldocs-2.33.0.tar.xz 1393260 BLAKE2B 4a43ce9d184a9c69d27a4c80e93ed5e138bb9d043272fbbda5399af00e089e138bd6d68d3f77b1907ae5edfe4d8a83a33ce0b8c38e20e0b363f5ac6367d16f7f SHA512 8cb2210be8022f9152045f72d0be30eb45134ec78edb47f99c83fa47d9fe7247fa918692d30bdefb24b246c143f3f987930c14a0a06b45448bb230c12036e0bc
+DIST git-htmldocs-2.33.1.tar.xz 1396744 BLAKE2B cbd65cf08fc7ea466fcd72820ba3e2135ade37f69c436a4ee7276dc71fb62f6270b71e2f46d981f5681a0fd3c30613d61680c2ef2460d0d7d292f7455e114128 SHA512 5b856b919067e1f644539d43a85aab6f602537ea0970b6248b471e3fa6756a8494f0525a69d22ad3795fcf9e106ff8439e0f6716ba0b8c895d7aad8c59e5bd74
 DIST git-manpages-2.26.3.tar.xz 462116 BLAKE2B 3191f719c5f2f0df34a66a041ab8590cbb43ed8df6d4b430df04e4255544048a982c00dbcbc7d7d9057830d5354c595d853e9f7558efdd6049be74e81d61a20d SHA512 8f9b64b0554867a56a647ac4f76351858342f84a38fd9977c606612c034dcad552afba8489a81ce227ed48a90d78f23d203452086175e218efb3f0fe8429f9f9
 DIST git-manpages-2.28.1.tar.xz 472404 BLAKE2B d6b411dee47439b91e61f93fdca24fc5a707807c9445b69df81be8cdf6b78e24ea8424c0a36a3b4bd7db82e303b4139449a3fdc7de43d65d50f8b9e936e73669 SHA512 b543934fb9a91636033a2a7262180bf62b5493be3c222fb882aa992fe15f9fc0b9cc6723f3afa65fe8c60b8909af4337139bc0c355df0ac063f9e915d4b574bd
 DIST git-manpages-2.29.3.tar.xz 478456 BLAKE2B e568b92badda851be5d5c0524455d1eb728e4633dd88144edc8e22d84c64ad195538d906ae3443789ea14607be536d1de0f30b448ab0860d605b65a6476455fb SHA512 5d1a26c1342c31ca3501f2e40ec55c6e5dddd1ee2de909ec65425dea92455f00ca23a10e7475dcfe5b9a60dc4c2012778e86797cc8922de20638fcc07c60d941
@@ -35,6 +37,7 @@ DIST git-manpages-2.30.2.tar.xz 482180 BLAKE2B 97180d13ba73f229d205b662ca16d497b
 DIST git-manpages-2.31.1.tar.xz 487784 BLAKE2B 9fe67839cca51f18b0aca16678eadb9ee8e609cbbae26bf1804c39b8bf5415e1069cb50162b75f9f8ec69bd6511f271d3116ac33016af2e57e65b88ad6c4b165 SHA512 a5fb8a1c3f08707d4d2d835a55b295677559856984ffeeb650827b433625a74f22ef4aac10e1b14eba5860e11567543b146d52dd055b2613e5a510e0f4f3c3fd
 DIST git-manpages-2.32.0.tar.xz 491868 BLAKE2B 7598a864246aed771371924604ee13d3f51b839b10b254bb1159dd47266513f5cd6484aab200a7b4ed427edc76538a98e39a040a17201483965175f5e1c5f484 SHA512 5c9950bd5d6904972cddf4afad534197d843c0dee8198d14ec5a3448873cab37dac88295b2a4df3658749f048bda4800b54fdc850517be7208906c911832c66e
 DIST git-manpages-2.33.0.tar.xz 492900 BLAKE2B 3f5e5cc8e9b493b272f2c9bd8b43a3bfd2f571bbcea8552471386cf8275d184d1559f61565bf33230cbba4ad9d36165173f016f53bf7240ca5e69bc5f5dd5cc3 SHA512 82b1e76cb457bd740dcc9614e0523064c1f6ef44654caa159efda555d201c8febf094f19cda0cdb3a828fefff30419a323976e64279eb361c1a6370e96245ed5
+DIST git-manpages-2.33.1.tar.xz 494288 BLAKE2B 1f8bd4f23de31a285d3f4327e562dddafdf9f28e8b36334e54f5e280c81fc8170e8b153ca42baa642d02d8e6fdfcac9a8fdd3cee1e32c29bcd53f689d1a6c463 SHA512 d465a7b491046b7a5da6ad1fc6c62b351c69905932e0672263de5a1d3abe1113660cff9fe30c7be1d1695c6170ceca5a11b3f65e9b2d1545f35cc653e4c6ad62
 EBUILD git-2.26.3.ebuild 19110 BLAKE2B ab185603ed965942ab60b3625386f13fa9d155b1c010e97704d77317ea568792667d8ad15c067fd5e4907e13b56aed636289fc2dbb68c486d3c139acd311630e SHA512 e13bf874a1518e669bfcfea73e87852bc2a9c568948d83b498d271948934b1a98e402bb18d8abe4ac8dd1f001312d89c9edf783f5ea8a35f2c07f337e4e8e20b
 EBUILD git-2.28.1.ebuild 19118 BLAKE2B c71bfb6eda842ceaf6e752e911e09c602997987d5374bda2408bcfb2cad24b3eaa69ab0c1fd5522ae224b87279727fcf2840c096a91f57696a2d2b32ff73c2ef SHA512 bdca277daae10c52f72e721a0680d5f4508b696566ecfc128ecc10049aefd857fbfe03148452a8b05e932d76ce7fa9e9dd339fa83c3ed3f8890df4a588604388
 EBUILD git-2.29.3.ebuild 18175 BLAKE2B badfec96e42d4cfbf8327298313c381ae526efbaff3b145abe8c8aa4afdab824175b6db015f28f8f9bd8d3bf4cad99c46a3594901ebaf3859df367dc73804c62 SHA512 825c386bfbae0b51358924c7ee1d232a59e45155e792c485b543e9ecde77fea6870de66f2144d0787c5a084166756e01666db27cbc1055de10a093c781a8f1a5
@@ -42,8 +45,9 @@ EBUILD git-2.30.2.ebuild 18176 BLAKE2B 693b6d1f83be107234f2922a55993b66b41fb987c
 EBUILD git-2.31.1.ebuild 18058 BLAKE2B 9c9c7530527ace419f1191e6aa671dfb0d4dcf25760ad30658ebd83889ac0df396021030d0e0499b497340c47a1a3e8b7b12575f2817fb9231c11dd5652d7bc6 SHA512 e5ae923aed189506a97512be5e87492098cdd876645f837f28035875c46745a2b2a03e7374e8d05276b7d0a76a9d47df117329dbae175386cb5ce5d0d96e4c51
 EBUILD git-2.32.0-r1.ebuild 18175 BLAKE2B d1ad748f2352b377dadad657fc7259df0e14829949e76975cd85264ceaf8cacca56298401346719d4848204489909e47d26f03034add34aefeccea3ffe46f87e SHA512 afe87968de6d6956a265ae693a2ebe6ff91d2cdf5fa0486b7735a8feb39b8eb4126e9d87fd1a0cee1fb9784ad43875913eff9494d3075d5c9070dd5ffd30e494
 EBUILD git-2.33.0-r1.ebuild 18188 BLAKE2B d919e980b85e905b7c593a3946f992e7125a294e42481af2601fc8b64a0d3ba9b4f0d17b1a7a0dc6addcb6bd851251ad71fae35c3ec5800930ef328e6c87e87d SHA512 8bd82321e7aeeb46eccd55ba0c8ca229b8b41434d2d5500f8bc3a5a453225f6485ce15897b95aa9626a04f655d7f344ea2bc45284bb36ebd66fae7d9080f2e65
-EBUILD git-9999-r1.ebuild 18041 BLAKE2B 3f44b8a8b41778e9673e3e0597ce758dbfefdb5786b3a70836de72148e2cbd641a66a9861a380bfe6b4456a5ef9eb3f89eb14fc908e2ddee407c4068daa76f59 SHA512 346e28ce1c418b2e2b89e402ba050f4b0f6847ba37614f3847b4a58eebc4e9fa8b6a8b122b4f45907568aeb3ccd5cd0000415a37a27686b0dc05dfbc50479c43
-EBUILD git-9999-r2.ebuild 18041 BLAKE2B 3f44b8a8b41778e9673e3e0597ce758dbfefdb5786b3a70836de72148e2cbd641a66a9861a380bfe6b4456a5ef9eb3f89eb14fc908e2ddee407c4068daa76f59 SHA512 346e28ce1c418b2e2b89e402ba050f4b0f6847ba37614f3847b4a58eebc4e9fa8b6a8b122b4f45907568aeb3ccd5cd0000415a37a27686b0dc05dfbc50479c43
-EBUILD git-9999-r3.ebuild 18071 BLAKE2B 4f7571d39e8cd836fd71117a34df82a092417f9543f6d165121359230e1f2b6fce8b925345d205512d372e56459c7ad4983a79da2785139b99dacba6bbac0a3f SHA512 901412cd7d3d71e67f66e0a37d2e5f9032cede4c944a04455de962fb6f681cad941839d0e60a77dc6959fbd616aac7afa556a2aab24aaaf9cd7f95802c5dcbd3
-EBUILD git-9999.ebuild 18041 BLAKE2B 4a70bb78ff763c56aa807d7eb48d7a32e0e582535d9c85702aea795d4b4510edd00b98302a1e0a291551dfc3c4fe7c76b3cedb9997923e7ca39ae8a26653af11 SHA512 d725ee00065414aad03132045b933de85840288a4ac415614dbdafc1a141ef4b45dded1bfa7d1f751bebaecf4bb91b40942c5d21888c6d6c162b42b6b7433fdd
+EBUILD git-2.33.1.ebuild 18077 BLAKE2B d694efa1cf729cf370184fdb3bf9725bcb1fb2e0ed2679ab06c26a3e819ffacd055d49550dcf8ef34b4654bd67c3158525666a3426fb5e9df83041c745fa097a SHA512 79c60936b9d4ed040cbdf0c8a830a27967160579b5cab8515622170b10af6d1784647784c4c5b0d2a960e105a60ca40e532e6d9b06b50f43f6b8d1061af9d6e8
+EBUILD git-9999-r1.ebuild 18077 BLAKE2B d694efa1cf729cf370184fdb3bf9725bcb1fb2e0ed2679ab06c26a3e819ffacd055d49550dcf8ef34b4654bd67c3158525666a3426fb5e9df83041c745fa097a SHA512 79c60936b9d4ed040cbdf0c8a830a27967160579b5cab8515622170b10af6d1784647784c4c5b0d2a960e105a60ca40e532e6d9b06b50f43f6b8d1061af9d6e8
+EBUILD git-9999-r2.ebuild 18077 BLAKE2B d694efa1cf729cf370184fdb3bf9725bcb1fb2e0ed2679ab06c26a3e819ffacd055d49550dcf8ef34b4654bd67c3158525666a3426fb5e9df83041c745fa097a SHA512 79c60936b9d4ed040cbdf0c8a830a27967160579b5cab8515622170b10af6d1784647784c4c5b0d2a960e105a60ca40e532e6d9b06b50f43f6b8d1061af9d6e8
+EBUILD git-9999-r3.ebuild 18077 BLAKE2B d694efa1cf729cf370184fdb3bf9725bcb1fb2e0ed2679ab06c26a3e819ffacd055d49550dcf8ef34b4654bd67c3158525666a3426fb5e9df83041c745fa097a SHA512 79c60936b9d4ed040cbdf0c8a830a27967160579b5cab8515622170b10af6d1784647784c4c5b0d2a960e105a60ca40e532e6d9b06b50f43f6b8d1061af9d6e8
+EBUILD git-9999.ebuild 18077 BLAKE2B d694efa1cf729cf370184fdb3bf9725bcb1fb2e0ed2679ab06c26a3e819ffacd055d49550dcf8ef34b4654bd67c3158525666a3426fb5e9df83041c745fa097a SHA512 79c60936b9d4ed040cbdf0c8a830a27967160579b5cab8515622170b10af6d1784647784c4c5b0d2a960e105a60ca40e532e6d9b06b50f43f6b8d1061af9d6e8
 MISC metadata.xml 2278 BLAKE2B d92ca2ae6012ff68dbe6478421e057d977b5a5c35ee8910fb022f7acb742cc30134d1842fe99fd18ba451eca160a8cf1aa594469568b792ec5bcadf01c314f58 SHA512 297031af669235f9a5e9845c1e3874accd26583efce65312bdb9f98c340d5c547da2eedd95fb16e6fa9614e3a56e70a84b5563a01398ee071141637c6ab3fa46
diff --git a/dev-vcs/git/git-2.33.1.ebuild b/dev-vcs/git/git-2.33.1.ebuild
new file mode 100644
index 000000000000..6af4b971bc56
--- /dev/null
+++ b/dev-vcs/git/git-2.33.1.ebuild
@@ -0,0 +1,668 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: seen
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=seen ;;
+	esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	[[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	gnome-keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre2:= )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	iconv? ( virtual/libiconv )
+"
+
+RDEPEND="${DEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
+		cgi? (
+			dev-perl/CGI
+			highlight? ( app-text/highlight )
+		)
+		cvs? (
+			>=dev-vcs/cvsps-2.1:0
+			dev-perl/DBI
+			dev-perl/DBD-SQLite
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		subversion? (
+			dev-vcs/subversion[-dso(-),perl]
+			dev-perl/libwww-perl
+			dev-perl/TermReadKey
+		)
+	)
+	perforce? ( ${PYTHON_DEPS} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		app-text/xmlto
+		sys-apps/texinfo
+	)
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gnome-keyring? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND="${BDEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
+
+	# Make submodule output quiet
+	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+
+	if use perforce ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local extlibs myopts
+
+	myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex perforce '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads '' NO_PTHREADS=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	elif use ppcsha1 ; then
+		myopts+=( PPC_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+		if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then
+			myopts+=( HAVE_GETDELIM=1 )
+		fi
+	fi
+
+	if has_version '>=app-text/asciidoc-8.0' ; then
+		myopts+=( ASCIIDOC8=YesPlease )
+	fi
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	if [[ "${CHOST}" == *-uclibc* ]] ; then
+		myopts+=( NO_NSEC=YesPlease )
+		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
+	fi
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs[@]}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]] ; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	if use prefix ; then
+		# bug #757309
+		eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
+	fi
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use perforce && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		DESTDIR="${D}" \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake gitweb || die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man || die "emake man failed"
+		if use doc ; then
+			git_emake info html || die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info || die "emake info html failed"
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake git-subtree || die
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake git-subtree.html git-subtree.1
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake || die
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake || die
+		popd &>/dev/null || die
+
+	fi
+}
+
+src_install() {
+	git_emake install || die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	local d
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake install || die "Failed to emake install for git-subtree"
+	if use doc ; then
+		# Do not move git subtree install-man outside USE=doc!
+		git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake install
+		popd &>/dev/null || die
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	local i
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym ../gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+			if [[ -d "${d}" ]] ; then
+				find "${d}" -name .packlist -delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if ! use prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
+			"git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	plocale_for_each_disabled_locale rm_loc
+}
+
+src_test() {
+	local disabled=()
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]] ; then
+		if [[ ${cvs} -eq 1 ]] ; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		[[ ${cvs} -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=${cvs}+1
+		[[ ${cvs} -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=${cvs}+1
+		if [[ ${cvs} -lt 3 ]] ; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		if [[ -f "${i}" ]] ; then
+			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+		fi
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+	elog "completion."
+	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	elog "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 252c3e3bc1bb..6af4b971bc56 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GENTOO_DEPEND_ON_PERL=no
 
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -141,7 +141,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.31.0_rc0-optional-cvs.patch
+	"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
 
 	# Make submodule output quiet
 	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
@@ -319,7 +319,7 @@ src_compile() {
 		git_emake gitweb || die "emake gitweb (cgi) failed"
 	fi
 
-	if [[ ${CHOST} == *-darwin* ]]; then
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		pushd contrib/credential/osxkeychain &>/dev/null || die
 		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
 			|| die "emake credential-osxkeychain"
@@ -366,7 +366,7 @@ src_compile() {
 src_install() {
 	git_emake install || die "make install failed"
 
-	if [[ ${CHOST} == *-darwin* ]]; then
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 252c3e3bc1bb..6af4b971bc56 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GENTOO_DEPEND_ON_PERL=no
 
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -141,7 +141,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.31.0_rc0-optional-cvs.patch
+	"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
 
 	# Make submodule output quiet
 	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
@@ -319,7 +319,7 @@ src_compile() {
 		git_emake gitweb || die "emake gitweb (cgi) failed"
 	fi
 
-	if [[ ${CHOST} == *-darwin* ]]; then
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		pushd contrib/credential/osxkeychain &>/dev/null || die
 		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
 			|| die "emake credential-osxkeychain"
@@ -366,7 +366,7 @@ src_compile() {
 src_install() {
 	git_emake install || die "make install failed"
 
-	if [[ ${CHOST} == *-darwin* ]]; then
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 40a7dede3c1d..6af4b971bc56 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GENTOO_DEPEND_ON_PERL=no
 
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -141,7 +141,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.31.0_rc0-optional-cvs.patch
+	"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
 
 	# Make submodule output quiet
 	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 4a1d6a07b908..6af4b971bc56 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GENTOO_DEPEND_ON_PERL=no
 
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -141,7 +141,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
+	"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
 
 	# Make submodule output quiet
 	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
@@ -319,7 +319,7 @@ src_compile() {
 		git_emake gitweb || die "emake gitweb (cgi) failed"
 	fi
 
-	if [[ ${CHOST} == *-darwin* ]]; then
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		pushd contrib/credential/osxkeychain &>/dev/null || die
 		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
 			|| die "emake credential-osxkeychain"
@@ -366,7 +366,7 @@ src_compile() {
 src_install() {
 	git_emake install || die "make install failed"
 
-	if [[ ${CHOST} == *-darwin* ]]; then
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 
diff --git a/dev-vcs/gti/Manifest b/dev-vcs/gti/Manifest
index 7f0507abddfd..42012b01e839 100644
--- a/dev-vcs/gti/Manifest
+++ b/dev-vcs/gti/Manifest
@@ -1,2 +1,2 @@
 EBUILD gti-9999.ebuild 648 BLAKE2B 27bd8d5e0231f6a16a3cf216412d6fa917b69200fc519fbefa20c7d8206e0829d39df06aa55d618f792d1e26be31913cde1a3d05512650c55c9a1229c7698f0e SHA512 e8931f6c2bd46a0a6a96c6ff1c15a7990630e0d216f6b4f94ef23973f59be1a2ad802a2d0c9e22316df723deb3bfc270477135ce36522abba9734a4260a3d2a8
-MISC metadata.xml 246 BLAKE2B 9ee65595d2ce7d0c82f8bfa5110c981e55be2592e0ab8beb2abf163268dcbbe4ac2c1825bc1f3619c26fd447ef95a3153ce7ca7f627ca806030c217493fd51f0 SHA512 79818ad9d4436efa7bbeb3c302aee6b3c72ceadb118aab6d390fc4431110d2fdbc6cfe2d2c3c4e360688449279001e52acc9ace257b5ac401eb5c401e299bec1
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-vcs/gti/metadata.xml b/dev-vcs/gti/metadata.xml
index be2af7044308..115e9d64a669 100644
--- a/dev-vcs/gti/metadata.xml
+++ b/dev-vcs/gti/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-vcs/python-gitlab/Manifest b/dev-vcs/python-gitlab/Manifest
index dc3782fc29cb..2352c8229770 100644
--- a/dev-vcs/python-gitlab/Manifest
+++ b/dev-vcs/python-gitlab/Manifest
@@ -1,5 +1,8 @@
+AUX python-gitlab-2.10.1-do-not-package-tests.patch 735 BLAKE2B dc0db2642e84bf4a1cda3228f6004916fab65c65e10db4bbf1b20b639753489d6b14479dbf1b21429323f4c2c5c10c9bfda4664f3fa44f093d62a463174f7ad6 SHA512 4d0d493ca1e9806e6d0f3b0ad4e3381918dbebe3f31c2061bb4dc1db9e945ff9de5e3feb75af5ae7e596808ffa95668ec4c142f66565cfb5d87d6a71972dc05c
+DIST python-gitlab-2.10.1.tar.gz 178899 BLAKE2B 5b0fd1552fca15827d9fa12745d035288c4796abbf3b7aeb9f9191a50800641ce0205f551724d8af9ed572b6ebc98052a2411f07b45c23a762fc1b9f713b3b31 SHA512 ab3ca0039ca5fa0b025ffbbe9ee65b1041d02c869f86e8656f6616d4e1dbc3d20898d5cfffcdf0557ad545c40837e4517bffefdbee9948fb366aba7e22d7eb41
 DIST python-gitlab-2.5.0.tar.gz 148916 BLAKE2B f870833a01adac08b71dc402bc11ba9c1be19c920735faf04de9bfca3b1a154706da4bc0475437997e3b03d8c9a56977a6691df05b750d64a1f8b964ecd05612 SHA512 7382f9ea2388c6916f3c7e63df137d73f0fdfb3890a8bbb47e766f3476b6febecd1dcbc588445ae1af1b5f17c9a3e6ed9a931fd9fff010c2c37967eab5440824
 DIST python-gitlab-2.6.0.tar.gz 153577 BLAKE2B 4fa0206faa601061fde257988362eca962c9e20f50e5ad57d602a76618581db646f26b035d4d86b9c460ef75f241fcbcdf360419b2e62ec6f95a664ab237d7d2 SHA512 b63dd4657b44fb484d114ceddc1d67465c17560978a8e6b09a9b14634ae6d80bf864b9b4583ddfc102c27c1082f4a015958c30944a734ec635761af524956fbe
+EBUILD python-gitlab-2.10.1.ebuild 898 BLAKE2B 0873b32963f081894899b90fde2a155c21c50052099d6ba0afc31142b8378bc9b61dbd15a7a1bbc3581a23a9f0ec3a82b2c886f39f53db11235e2b90f1ef0c90 SHA512 bc980b4ae5373a818deadc45b6db3ddd7bff03ef94a9485d8fadb89ad83ead0dcff9e7d4bf711ab4c6c5a368f9d4dcd8298db91a2a9c88c7576992ce2af0297d
 EBUILD python-gitlab-2.5.0.ebuild 804 BLAKE2B 6f5ebdb0b2aa68916406be761995a4ef0c02ac4d62a9790f60a7a03a007c5d22a596cd937f98b1b613c48cbcfeafd640d83688760287ad63ca1fa02b90f9b72e SHA512 796675f445b95e875facf3e35d90847cd36b111e57b264df058bc5debec35a3a358840921497d467da0e7b37dc8c1f7c0b96b00fd3a45b141a77d5442a3df803
 EBUILD python-gitlab-2.6.0.ebuild 871 BLAKE2B 32f482401fe23f7ede34d0c356af982281ef73192f9bc0eb0e088f5be0dea91cecb5bc8f9b565765d4c57a72f28523440549c1180c03a1515ef39d7ec5352c53 SHA512 2dcfb1ca31adf2106b37a8d4844af4d3db75b5ed324985064f5a08658b460b8ac091235ce5b51c656bced170abb3f035971a26d121447d74075f477b5d6ae3ca
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/dev-vcs/python-gitlab/files/python-gitlab-2.10.1-do-not-package-tests.patch b/dev-vcs/python-gitlab/files/python-gitlab-2.10.1-do-not-package-tests.patch
new file mode 100644
index 000000000000..f1f0c6ca8d3d
--- /dev/null
+++ b/dev-vcs/python-gitlab/files/python-gitlab-2.10.1-do-not-package-tests.patch
@@ -0,0 +1,25 @@
+From 969dccc084e833331fcd26c2a12ddaf448575ab4 Mon Sep 17 00:00:00 2001
+From: Nejc Habjan <hab.nejc@gmail.com>
+Date: Fri, 3 Sep 2021 00:28:18 +0200
+Subject: [PATCH] fix(build): do not package tests in wheel
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 6a05a72..589f9a4 100644
+--- a/setup.py
++++ b/setup.py
+@@ -24,7 +24,7 @@ setup(
+     author_email="gauvain@pocentek.net",
+     license="LGPLv3",
+     url="https://github.com/python-gitlab/python-gitlab",
+-    packages=find_packages(),
++    packages=find_packages(exclude=["tests*"]),
+     install_requires=["requests>=2.25.0", "requests-toolbelt>=0.9.1"],
+     package_data={
+         "gitlab": ["py.typed"],
+-- 
+2.32.0
+
diff --git a/dev-vcs/python-gitlab/python-gitlab-2.10.1.ebuild b/dev-vcs/python-gitlab/python-gitlab-2.10.1.ebuild
new file mode 100644
index 000000000000..5067288cbfbf
--- /dev/null
+++ b/dev-vcs/python-gitlab/python-gitlab-2.10.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Python command line interface to gitlab API"
+HOMEPAGE="https://github.com/python-gitlab/python-gitlab/"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/python-gitlab/python-gitlab"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="test"
+
+BDEPEND="test? (
+		dev-python/httmock[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}] )"
+
+RDEPEND=">=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-do-not-package-tests.patch
+)
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r *.rst docs
+}
diff --git a/dev-vcs/topgit/Manifest b/dev-vcs/topgit/Manifest
index e99f43d0c5c3..152f86e81e3a 100644
--- a/dev-vcs/topgit/Manifest
+++ b/dev-vcs/topgit/Manifest
@@ -1,6 +1,6 @@
 AUX topgit-0.19.12-Rename-T-to-TESTSUITE.patch 2339 BLAKE2B a1a23b807bc76880123acb51949eb948b9398bf2c39a22c4223aa029e67225ef493fe2b7fd1bf934e8652c833d39e9ecc504352020f5b1d1899442c875baf77c SHA512 c447a7d18e7486dd5fd4b6173389603177fb9986293cd1bf46035f786fb689b112659cf170e0c431f6c09aaf4415d3d4e3e520c26610afba56281efa9e35d43f
 DIST topgit-0.19.12.tar.gz 302492 BLAKE2B 5691823e58774883d33bc96e5d10b871a40224c97e3deb90f4fef051dbcecd6a7d3c979fe6b7e6c9aac64d485b9c4324b4d666a7ae64cb82cd325498d33e0cae SHA512 cb9245fbec7a4a15822a5b70d7052be200aa8b574b528dd929121597eb7dcec97532b0fd4d6a4d6bb63676194ed0ab2129e106fb88f63561187620ec431f9efb
-DIST topgit-0.9.tar.gz 37025 BLAKE2B e28b0fd4cdf4cf063bad939c712fc9354ffc2d9c5e431f637e8306454d7a871268902253a1d2c59afa94406223b1fdc1627f3dda04586c88c0b609a72a1eaa87 SHA512 15b4ec44fb1711273155350924806f9ddce330251d3f300f5d2ecf445f4822c40b5c7309429876746ed8226c00f74292956f51f9126c8c359c3f4d589c73791c
+DIST topgit-0.19.13.tar.gz 355721 BLAKE2B 0f70d7720d0ca2f7724fe5fa3bb100c7f812c0bb18fd9acb4897487d90f31da957bc0b4e47e9dcdd08594366fb31c4f46447cf78989f828f337edd8f8f231bf3 SHA512 8e477504c5f873651854c9412864c9dcb0ee35d0349b65e7c5d618a0add0fad3f749381edbe17195981bae3ff9f0e7323286abf7a5c6b744721ba2cc2a5d40d4
 EBUILD topgit-0.19.12.ebuild 846 BLAKE2B cff23a51c81250e59d2b9f1bd62da9ad8737bf4adb2368ce058ebe83f83a18ba8101fc7c8e0440e20e5ba89da948abfd16e05133896835d0b6d7d6254a6f0cd4 SHA512 8ed16a345ad0bb066366d0cc6fb0e442dcfc8c40bfe1816db7b7de0343e9b2e0a0ce44bac061cfc8b6a5f53fb079c03a6c47f4d50662f99ef2fb334da90d6575
-EBUILD topgit-0.9-r1.ebuild 692 BLAKE2B d604f1d2800d5953d2d7f296b5596fee898b95d51eedb80dda8d121dbad3c3611f4ecb40a2e5f22e8143981961639f68d5086539fe08a9d0e8e67940fc5df08d SHA512 2984e19bb3c22e8d83b0c8ad85b8c9939c3dddec3844ffeffd5e5cb6b2d857c3da9e214a3e89fe16acaede8aecf20c820b68c5793080d87476bb3bf40d90f996
+EBUILD topgit-0.19.13.ebuild 877 BLAKE2B 1e6f37bb0347333027ccf767b8ba1ed507cd6fdd97a0a787fa584ed8f4fcdf221343ebafbd98b077cf6853e46aabea12b5b961b8c9fe40426c92aae8a0dc966e SHA512 0db18249df626c09087e5edcdce3b0bbd7870460a2c8baecf71cc6e532d0b715116ad72a6b1091d06c6ff25fd89737feabfe6ddb043dadd6f08e894a41d7a3ac
 MISC metadata.xml 486 BLAKE2B 44790d7afe48d2d2f36bd2b2c946d842a71ea76fcfa5297541f036531e82059e8d1f0e712402cbab4c45fdeaebfe7841e418da3a6655e4fefb2d994cf439ca62 SHA512 0336f1e67faf3a7d3645e72cec0329ea3fdcd293a44b1808abffaf87b381d80509988a7fa26e29d3c50510d110bd01373e279547fac400782d3c1b9eba20dbdb
diff --git a/dev-vcs/topgit/topgit-0.19.13.ebuild b/dev-vcs/topgit/topgit-0.19.13.ebuild
new file mode 100644
index 000000000000..ffbf4291c89c
--- /dev/null
+++ b/dev-vcs/topgit/topgit-0.19.13.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="A different patch queue manager"
+HOMEPAGE="https://mackyle.github.io/topgit/topgit.html https://github.com/mackyle/topgit"
+SRC_URI="https://github.com/mackyle/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-lang/perl
+	sys-apps/sed
+	virtual/awk"
+RDEPEND=">=dev-vcs/git-2.10.0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_compile() {
+	# Needed because of "hardcoded" paths
+	emake prefix="/usr" sharedir="/usr/share/doc/${PF}"
+}
+
+src_test() {
+	# Needed to run tests properly (#739088)
+	emake T="" test
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="/usr" sharedir="/usr/share/doc/${PF}" install
+
+	newbashcomp contrib/tg-completion.bash tg
+	dodoc README
+}
diff --git a/dev-vcs/topgit/topgit-0.9-r1.ebuild b/dev-vcs/topgit/topgit-0.9-r1.ebuild
deleted file mode 100644
index 47d2195cda74..000000000000
--- a/dev-vcs/topgit/topgit-0.9-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="A different patch queue manager"
-HOMEPAGE="https://github.com/greenrd/topgit"
-SRC_URI="https://github.com/greenrd/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="sys-apps/sed
-	virtual/awk"
-RDEPEND="dev-vcs/git"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_compile() {
-	# Needed because of "hardcoded" paths
-	emake prefix="/usr" sharedir="/usr/share/doc/${PF}"
-}
-
-src_install() {
-	emake prefix="${D}/usr" sharedir="${D}/usr/share/doc/${PF}" install
-
-	newbashcomp contrib/tg-completion.bash tg
-	dodoc README
-}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 68860d4a2b3e..b5be586d1c5d 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 9eae5ad589bb..568f7a1a2832 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -208,7 +208,7 @@ getfilevar() {
 		# Pass dot-config=0 to avoid the config check in kernels prior to 5.4.
 		[[ ${EAPI:-0} == [0123] ]] && nonfatal() { "$@"; }
 		echo -e "e:\\n\\t@echo \$(${1})\\ninclude ${basefname}" | \
-			nonfatal emake -C "${basedname}" M="${T}" dot-config=0 need-config= ${BUILD_FIXES} -s -f - 2>/dev/null
+			nonfatal emake -C "${basedname}" --no-print-directory M="${T}" dot-config=0 need-config= ${BUILD_FIXES} -s -f - 2>/dev/null
 
 		ARCH=${myARCH}
 	fi
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a0895e27abd9..8756d6e58497 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -6,7 +6,7 @@
 # qt@gentoo.org
 # @AUTHOR:
 # Davide Pesavento <pesa@gentoo.org>
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 8
 # @BLURB: Eclass for Qt5 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.
@@ -16,7 +16,7 @@ if [[ ${CATEGORY} != dev-qt ]]; then
 fi
 
 case ${EAPI} in
-	7|8) ;;
+	8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -105,9 +105,9 @@ SLOT=5/$(ver_cut 1-2)
 IUSE="debug test"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	RESTRICT+=" test" # bug 457182
+	RESTRICT="test" # bug 457182
 else
-	RESTRICT+=" !test? ( test )"
+	RESTRICT="!test? ( test )"
 fi
 
 BDEPEND="
@@ -175,9 +175,7 @@ qt5-build_src_configure() {
 		qt5_base_configure
 	fi
 	if [[ ${QT5_MODULE} == qttools ]]; then
-		if [[ ${EAPI} != 7 || -z ${QT5_TARGET_SUBDIRS[@]} ]]; then
-			qt5_tools_configure
-		fi
+		qt5_tools_configure
 	fi
 
 	qt5_foreach_target_subdir qt5_qmake
@@ -684,11 +682,9 @@ qt5_tools_configure() {
 	# allow the ebuild to override what we set here
 	myqmakeargs=( "${qmakeargs[@]}" "${myqmakeargs[@]}" )
 
-	if [[ ${EAPI} != 7 ]]; then
-		mkdir -p "${QT5_BUILD_DIR}" || die
-		qt5_qmake "${QT5_BUILD_DIR}"
-		cp qttools-config.pri "${QT5_BUILD_DIR}" || die
-	fi
+	mkdir -p "${QT5_BUILD_DIR}" || die
+	qt5_qmake "${QT5_BUILD_DIR}"
+	cp qttools-config.pri "${QT5_BUILD_DIR}" || die
 }
 
 # @FUNCTION: qt5_qmake_args
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index d999ace34286..573e3511daf7 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -402,6 +402,7 @@ EOF
 # @DESCRIPTION:
 # Configure extensions defined in RUBY_FAKEGEM_EXTENSIONS, if any.
 each_fakegem_configure() {
+	tc-export PKG_CONFIG
 	for extension in "${RUBY_FAKEGEM_EXTENSIONS[@]}" ; do
 		${RUBY} --disable=did_you_mean -C ${extension%/*} ${extension##*/} || die
 	done
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index b68ac30e89fd..5a272a209361 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -291,7 +291,7 @@ S=$(
 gentoo_urls() {
 	local devspace="HTTP~vapier/dist/URI HTTP~rhill/dist/URI
 	HTTP~zorry/patches/gcc/URI HTTP~blueness/dist/URI
-	HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/URI"
+	HTTP~tamiko/distfiles/URI HTTP~sam/distfiles/URI HTTP~slyfox/distfiles/URI"
 	devspace=${devspace//HTTP/https:\/\/dev.gentoo.org\/}
 	echo mirror://gentoo/$1 ${devspace//URI/$1}
 }
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index c4f81329f9c9..403360010bbd 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/descent1-data/Manifest b/games-action/descent1-data/Manifest
index 3165a80e5a95..e664429516bf 100644
--- a/games-action/descent1-data/Manifest
+++ b/games-action/descent1-data/Manifest
@@ -1,4 +1,4 @@
 DIST descent-game-content-10to14a-patch.zip 439853 BLAKE2B 75f90bbbf664237bbbfbe1aed3ff500c24b72b45beee1361b7823c6758c5dd5daf2693de8c4f3bc8deb77e915811237f28464628caf17c58478cfb111524354c SHA512 b71ec888509c77dc8ebc94d5a172a27ab0b16ddfdcb47ac243cefe33b87bbca82df843d9a4bffad8c6f345bfefd89e9e3564353922b00c81ef993e409950eb59
 DIST setup_descent_1.4a_(16596).exe 25744576 BLAKE2B aede0627394210a39bdb052608fd6822cb6ceb901a6476829ef98ad21b17ce9311b1878d5eb055ff0fb6d2511699c000b56e28f8e1ef89c2a2b664cbf7c25b7c SHA512 1ac19caa04ee64991c6c4291934e5db684615a0b7616782605c4557611090f6132135b8a1b96474b40135fa39d844cb9f6f14a98995f1bf1a596e66f0de80263
-EBUILD descent1-data-1.4a.ebuild 2701 BLAKE2B 04f2b82034c1755755381dab5d42a83ac44e50922b41e82dd4c3aef9a108d6043424d374dec6e6c445c38ba084fce87e0441cea08fcef744bd8ed08b5c2c321d SHA512 81300e25f1256ce45c78587daa2756be1476b50f9ea23f0e72accab5f08d654a83087ab608bfd6e7ac2b3ba159d47c363dfdd6682583ab9f0d1d252f242c92e8
+EBUILD descent1-data-1.4a.ebuild 2708 BLAKE2B 2acf1fe4b09be05138535210ccde4cfb3b66053779f25b3e1e3087b4252543958cf70b4bd04bacd956e61bd831e1d15cd20e7f1c6f1ac965726ab442cb7c0dcc SHA512 103daea4ea6049848b7e67bdcd56cffae7e38f04e87684724576fd7bcd831b78ae8eca79c9a04972e10990f1c87cce52332a12a54f30cb6b3b31804191cbf0b5
 MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/games-action/descent1-data/descent1-data-1.4a.ebuild b/games-action/descent1-data/descent1-data-1.4a.ebuild
index 6be067078e99..8f0ed4523025 100644
--- a/games-action/descent1-data/descent1-data-1.4a.ebuild
+++ b/games-action/descent1-data/descent1-data-1.4a.ebuild
@@ -15,7 +15,7 @@ SRC_URI="cdinstall? ( http://www.dxx-rebirth.com/download/dxx/misc/descent-game-
 	!cdinstall? ( ${MY_EXE} )"
 LICENSE="descent-data"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc"
 RESTRICT="bindist !cdinstall? ( fetch )"
 
diff --git a/games-action/descent1-demodata/Manifest b/games-action/descent1-demodata/Manifest
index 99c84a5cdd92..bb70fdbf21c5 100644
--- a/games-action/descent1-demodata/Manifest
+++ b/games-action/descent1-demodata/Manifest
@@ -1,3 +1,3 @@
 DIST desc14sw.exe 2892216 BLAKE2B c07751c6e8b59c0980f409d1fe8a5cee68bb0a4ff83d3a18723185c7228f43546f8dba90da1cdce1e698badcea4f29d06c1d0be5e6732f25fcc2a0587cadf0d4 SHA512 121bd909285138eef3009af4a46174a4af241b139230eda5c232fe710b17419e385ffeb97e13678c253390e6393615006c739a8dd4b0e14b375678491629ab3e
-EBUILD descent1-demodata-1.4-r1.ebuild 803 BLAKE2B c8c2fd8a52ddb406f08c65299247456a6ecf17c84c827a80e83dc99ce5677f1586d05ed006e0f4ff60ab541d2fbbadf40dc6d8738c9c73bdd1212ed462e63c9d SHA512 87e255608a401a804edb1ed630b75f912fc52de61ca2f6c6220d5b48e575690b7d1e891b9d1cad383eb3f182ddbf75590d19e880a8c0bb4ddfb7ed9f20b96c41
+EBUILD descent1-demodata-1.4-r1.ebuild 810 BLAKE2B b607276f9c4bad31aa8d9c6cad0addb980639eaaf29d24e64e5fb19e7bfa9cb88a6741cffe43c0d06d763f85ecd692fc36f1282b0e76a8e197fd60669b60ab43 SHA512 6400ddeef747e288432580a81f5bfb0e1678b49cbfb9e733b50365003201c8b48073dd712b730a52ee086f8fd9ff18a4d33cc97bb580695c42a1fc9c6b3e6ec7
 MISC metadata.xml 561 BLAKE2B 6819d05e822d0afc081af1a2c05f8ad4a1dded09935b9f57470ac3fc6f8e93128a6483f78ed4eaf464af1d38f5c628d18620f26669d5f953cc2763cca457bfab SHA512 bce18fea6866fe0d99e1e7ab5972e5a941938061b3716b27d87accd8c373b0330b3ebe5f5058224930f250611bd24391514c406f95097c5aec4af0627ea51e3b
diff --git a/games-action/descent1-demodata/descent1-demodata-1.4-r1.ebuild b/games-action/descent1-demodata/descent1-demodata-1.4-r1.ebuild
index 700a2496decb..c768600426bb 100644
--- a/games-action/descent1-demodata/descent1-demodata-1.4-r1.ebuild
+++ b/games-action/descent1-demodata/descent1-demodata-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://icculus.org/d2x/data/${DEMO}
 	ftp://ftp.funet.fi/pub/msdos/games/interplay/${DEMO}"
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="!games-action/descent1-data"
 
diff --git a/games-action/descent1-freedata/Manifest b/games-action/descent1-freedata/Manifest
index 58af59cbc614..29cbba98b24e 100644
--- a/games-action/descent1-freedata/Manifest
+++ b/games-action/descent1-freedata/Manifest
@@ -2,5 +2,5 @@ DIST d1xr-briefings-ger.dxa 16798 BLAKE2B f5e1f4f91cb3464b3d356fab1e3993700cc19f
 DIST d1xr-hires.dxa 1426884 BLAKE2B c4d9b950353fc450c64568779bc3d2e93a46e17980c8df08a2ef06bff5b9709869fdbbaf4fb6698be994b3faae7a75036a53357743d47b728bb3ef9df126afd8 SHA512 3fc84d5610ba40ee383c1720f80513a21b4644ff8b6da4b84ebca13b11c1131deb4897ded6324b54845b6c847dfc0f16700535e16afdd7ebe83bfff042892302
 DIST d1xr-opl3-music.dxa 81503503 BLAKE2B b560597e0f08139109a6dc4ee7996c05010561686029d1fd754375278b8a11e6df0f6106c797d524e92d4998683d6e1e07b6cfc982ea3ff167a0b9ca92ba0dc2 SHA512 4ac82c4bc2ddb02e2941746921443e38b698c6e54cfcab317fc9108f84ada7b868ec2ee3c70b28c1dfe9f41e2aadab4124c8daa65a409905cba5d674f0aab8a8
 DIST d1xr-sc55-music.dxa 72803408 BLAKE2B eb52491f5c43e9f04aea5715cffc0a47d029dda0b8e5ae1a79ec36122a17c01e3b2a731f369d72fe0e069e1188bdaf03f82d0845b574d76b6798be33481e3b84 SHA512 3cdce5b6535e28397b3216cc9ca05cccf7194349c62d64c54300f02f39248b98598d170599e5c61b6900d780e4917f905c3c31eb814fbb8429221c804cbd8bf9
-EBUILD descent1-freedata-1.ebuild 1622 BLAKE2B 808e79156dd58f22551cac31507492da43faba36c67024d264ac350f213820ee5e595f40748de2fe8c710bfe2dc21ede8366eac53f872d084dbb41a905355da8 SHA512 7043d6d954d7f2a90dcaf00a2890211f52066ab2a4ab3dc85a58c6a08ccea5ae88e74387bdef31ad34a2eaf5e193ef8e029a76f1d9ef85c18aa57e72998f1e2c
+EBUILD descent1-freedata-1.ebuild 1629 BLAKE2B fd21421777c26da1edfb22abeab913043b1e76c36fbf19a20bd5f7c6848c13d3369e2b8a6f97e2d6d86d25f29d672d96014471480f7599a4c0f4e652f7c542aa SHA512 de7344a4a36462c827c69cfba6205bd26e2b86ff6920aa52c284a856847f6a33601ffb451b61ec7c71d2293781dc9c7ff922f4db72d0e3183b7b56a01442bad2
 MISC metadata.xml 1786 BLAKE2B 7b218258978771d069902ff7561e33151986fb4224c665832a109e816f06261d67e7b56a5e395a2de8b6e9f21421f299dfed221f9f10720157322f3286d78df6 SHA512 8d35a3c3d19ca20b4bc3f1e5c784bd39be7fd5430a9813ddd530a1d6ce1dbaa2e7a4926a29df7d8cf7a93416b70cb12b83e694d886d130cdab34d01bb47f081b
diff --git a/games-action/descent1-freedata/descent1-freedata-1.ebuild b/games-action/descent1-freedata/descent1-freedata-1.ebuild
index 7700ddcff5e0..091a89c40fd3 100644
--- a/games-action/descent1-freedata/descent1-freedata-1.ebuild
+++ b/games-action/descent1-freedata/descent1-freedata-1.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 S="${WORKDIR}"
 
 # If all USE flags are unset, this ebuild installs zero files.  Require
diff --git a/games-action/descent2-data/Manifest b/games-action/descent2-data/Manifest
index 5de15e43c49b..a4b97d863547 100644
--- a/games-action/descent2-data/Manifest
+++ b/games-action/descent2-data/Manifest
@@ -1,4 +1,4 @@
 DIST d2xptch12.tgz 158419 BLAKE2B e4bd0d33fa8912b87f8018673c2f9fa9d965f96787b7af76da5473e0c6b06ca78303977cdb6e1f85affefe187b2f1e947eb477313b379bf2464e2a0ba95b74bf SHA512 14d59280e685a9c3d5e23e1d535f37f89768e022b795067793a994c5150685addfcacbd2dc52231804240d01d17d57b1db04335d41bc5930e3c8a845ebbb396b
 DIST setup_descent_2_1.1_(16596).exe 563071744 BLAKE2B f4c81daf5f3fe752687630bf4d9f10076e6f343161ea9675e3ab5698034fd8066727d939263db7a388d1e7e89834b8cea6e58e65433fd83a1d732b5439a693e5 SHA512 baf4577409c011f668d10a1a43385a916b951457b43b90883cef73af6622bed31a717f3d50d5a85698237fc4160281f3e2f4e07c9a261d63f52024ca05839fbd
-EBUILD descent2-data-1.2.ebuild 2897 BLAKE2B 454170a094bbaf73ff7ceea9f95562ec9e4012d1245763e53c014fc3215352f9a08994eb932d9ac277dda7ddd98a474eef6c59341edccd1038f1def0ed53256d SHA512 81ebb14da94ce60e95814bbc43d807d539ea7ebd049d5e894eced2ad582814954a731f84894a33349d00b28f2fb4d3cdc36427d7651eb03f52968c53f965e665
+EBUILD descent2-data-1.2.ebuild 2904 BLAKE2B 8c1891463a90a0f19f43745f7e649edb2125a6ecc9190a84d9771ab8c334c2e5ae5aa6027e7da6bff2dfd26e9f038c7e085e163d24de4cb976cadf0983574767 SHA512 12037e3a25fa85c96c4fbd89dcda2f05a3f15a1afe643b8dbd53da16533a6a653faf8cc5b5822bcf7450c34c2a71f565df7b5a2272d1cbc397f552b1c428dae0
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-action/descent2-data/descent2-data-1.2.ebuild b/games-action/descent2-data/descent2-data-1.2.ebuild
index aa325c48be28..c1c1430af8fe 100644
--- a/games-action/descent2-data/descent2-data-1.2.ebuild
+++ b/games-action/descent2-data/descent2-data-1.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="cdinstall? ( ${MY_PATCH} )
 	!cdinstall? ( ${MY_EXE} )"
 LICENSE="descent-data"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc videos"
 RESTRICT="bindist !cdinstall? ( fetch )"
 
diff --git a/games-action/descent2-demodata/Manifest b/games-action/descent2-demodata/Manifest
index abb9a73722e7..093b70c25c7b 100644
--- a/games-action/descent2-demodata/Manifest
+++ b/games-action/descent2-demodata/Manifest
@@ -1,3 +1,3 @@
 DIST d2demo10.zip 4306833 BLAKE2B ae075d0c3d46fc262696e9ec0a7c70cb676295e5fa95c357f81235f46bc00e686de0cf2f611571f215601683a72fc4c41d5abd525e3de46e208c5fe4c34b2c87 SHA512 a4229be701a4b2fc28d3c71591a477d242c1c784dc233c1e9ca6b798b3774de9744d8a91b0b80904b3fe63e1285b79234bf48681cddaeca702b3d9ce4c2b6fab
-EBUILD descent2-demodata-1.0-r1.ebuild 888 BLAKE2B 859e5e9fb5114bbc6a1ce8aaf36598354f1bd2bcf4d8dd7b1d037a104424399a2e552276027c3f5f2c73fe7f45f4c935f6d66ecf68f3532baa9068b1d3ac778c SHA512 fc8689e710512c758814a1e9d2de99c6747acb81d63d6900b4edcbee03033b761ab57d822fb1e0b796c339b2a009e30305c57a362a095055035bb9fd9c2845b0
+EBUILD descent2-demodata-1.0-r1.ebuild 895 BLAKE2B 87aef50bace92b3e1ea98688e2f4be3e01f3b46892e48c131b5a3e5bc342c5617e6f684d239379e50c75d23277f2a351fc521a2edaf112529b08bc2741d8c77c SHA512 c983f2a5da3035c2a16c4ced0d9d7fd5fdb7508a46ecde50aab4cedf99eb6ec8d5ff59c8eb940dade439ee18af417ad9304eaf576aadbe68b8bfb8d3cd7356c4
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild b/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild
index 2faad49ef878..1fc7971ebcaf 100644
--- a/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild
+++ b/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.interplay.com/games/descent.php"
 SRC_URI="ftp://ftp.funet.fi/pub/msdos/games/interplay/${DEMO}"
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 # <d2x-0.2.5-r3 may include the data.
 RDEPEND="!<games-action/d2x-0.2.5-r3
diff --git a/games-action/descent2-freedata/Manifest b/games-action/descent2-freedata/Manifest
index dea699feb9d7..7124808331be 100644
--- a/games-action/descent2-freedata/Manifest
+++ b/games-action/descent2-freedata/Manifest
@@ -1,5 +1,5 @@
 DIST d2xr-briefings-ger.dxa 11717 BLAKE2B 27af93656ac91bf5490195d2aebc9c9f252cb730094cccb53298b07f2e2031935033b8db765b40fdad93fb55b157a2be07906ea45185b754e5ec7c205803cc92 SHA512 479aa577dc65271c705e80404ec46e6c59ee3a5122d6e9705dbdd16b71b16c0d3447426e3e74937aa20eb7026f67a3896c5e814fbfcede9164bd557b6eb8423c
 DIST d2xr-opl3-music.dxa 22710919 BLAKE2B 82bdf29b6afe88305d4c7b69bb8b094efcf33ad23becec223311775cd50600ed399c207ee3a05da3800bcc5e123d00f9f8fa7d2d4f4d4be57bbf71e1c2482a9c SHA512 876321a9a16403f6e9d12e10bb73c9cdc57e1a106fa64833a1be8cc17b74f6f13e57e40f051a1b40e7bc88b95bfe86cff181c93c8619383dfdeb74f36f5cce86
 DIST d2xr-sc55-music.dxa 19579531 BLAKE2B 16091e24477a49319f2685884a7538a3597a9132707ac1d59405fa08ce7492158075df4ee680a5c7ba44aa0bd0b16170057f6a8956eab4b56913d00ee2f1f339 SHA512 290713b05627bf65bdc55fc6631a0c86e50f484a167f3fd20b3fe2bc5b772437939b5bf32eea852874dd983fbd47f160cae2412a2d6c5319f0d1583a33d28da6
-EBUILD descent2-freedata-1.ebuild 1622 BLAKE2B 808e79156dd58f22551cac31507492da43faba36c67024d264ac350f213820ee5e595f40748de2fe8c710bfe2dc21ede8366eac53f872d084dbb41a905355da8 SHA512 7043d6d954d7f2a90dcaf00a2890211f52066ab2a4ab3dc85a58c6a08ccea5ae88e74387bdef31ad34a2eaf5e193ef8e029a76f1d9ef85c18aa57e72998f1e2c
+EBUILD descent2-freedata-1.ebuild 1629 BLAKE2B fd21421777c26da1edfb22abeab913043b1e76c36fbf19a20bd5f7c6848c13d3369e2b8a6f97e2d6d86d25f29d672d96014471480f7599a4c0f4e652f7c542aa SHA512 de7344a4a36462c827c69cfba6205bd26e2b86ff6920aa52c284a856847f6a33601ffb451b61ec7c71d2293781dc9c7ff922f4db72d0e3183b7b56a01442bad2
 MISC metadata.xml 1670 BLAKE2B 60f31aa4a2c7e1d35621731193c3a49e2dcb1833865fb685204a094879a3994e64c3dc0ceaeab2faa607f9cc7eceee8d0dccf88aa85cbec2a4a91f62d22d25df SHA512 94377b97f7050168a330ed65091be4ac1e98b83d561c51d5054f37bac4d0754cebbd6bad92c5c75c4ccb83122663d27a331f4a3a36617acfb933ae7c39fed942
diff --git a/games-action/descent2-freedata/descent2-freedata-1.ebuild b/games-action/descent2-freedata/descent2-freedata-1.ebuild
index 7700ddcff5e0..091a89c40fd3 100644
--- a/games-action/descent2-freedata/descent2-freedata-1.ebuild
+++ b/games-action/descent2-freedata/descent2-freedata-1.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 S="${WORKDIR}"
 
 # If all USE flags are unset, this ebuild installs zero files.  Require
diff --git a/games-action/dxx-rebirth/Manifest b/games-action/dxx-rebirth/Manifest
index 025d12cd6e8c..533bfedcd08e 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1,4 +1,4 @@
 DIST dxx-rebirth_20210623-src.tar.xz 1340044 BLAKE2B f16a8904d777559e789d719bc0d6d2dbb7d26c1128984117b6c64a334ae589dd5806439cc51e458a583e1b6cc831dae7c51bf7bd3fbc972989b0ce4e5b932a4e SHA512 150d873fa045df6fb2f9bb70334d08eeae0cc7a639e825f1352fed28501ab9541a27bf3395fc1929bc8d76ed9126b038eed67c5a01657f43116da4663e929821
-EBUILD dxx-rebirth-0.61.0_pre20210623.ebuild 8452 BLAKE2B 36d9632ef4c366d7a791a76dbe8508989417097da2ddaf0fb9550cfdbe50f68dc4ebf73e656104e36d48d8de4a393a3107798b9e6457c27f8b8112e4d6d4a364 SHA512 0ded70b8153025ff0ecabe0d8b8b4afe9cc0e00bd04d15a858a24109d67f65176ef640c4b461fe6364a4eba4928366e151554ff376b6e4e35a0a2ddf35889282
+EBUILD dxx-rebirth-0.61.0_pre20210623.ebuild 8459 BLAKE2B 6e060891494e94277063f859fdfba480f075c978e15d7efc3b0ad9c99735416f4bb83ce3b6da8cad7ab6f063721debdd559a3df47981d1f3a5e0a4aec51cf985 SHA512 5238166c421c14324b66d09a49767966a8cc08a4e1748edd6489d565a247cfd46ea3e484cd5c163c6eb3e31088d3868454b9bf983ea6a409157f06d6362a979d
 EBUILD dxx-rebirth-9999.ebuild 8495 BLAKE2B 909fdfbe780bf8c7bc3c06068ab4bfb854dfa95980787fce953dfcfc5dc21812f99a0cd2f5e5d02f31b4d2ef1bd3ca39e74fd6117a6549b1fcfc097dc352624d SHA512 f13b26f24a28d996a4fbf44ab4c7dd0aadb07bfe0ee22fe82540a0a20aa5907859d3c15f70e4b589145ae96348385c92ced92031e39a2b0a9348d1315549e541
 MISC metadata.xml 2538 BLAKE2B fd07b7eed8d0b484312d4ee54a6b13834b823ee2cd23eb8e5cef93a5b44b4311c2eee97946fed8d303883142b65243dbbefab921a7e01a111bc5126334230113 SHA512 9d07f6718f74adddcd9e3041758e29e456d62c8808c30f2e6963872a9d647491dea380134951973eeaad63dea0fb88710a5b6fc8e37461f011e6d8aea0e69693
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
index f2aeb8f86f45..b941cf320c02 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
@@ -23,7 +23,7 @@ else
 	# fixes are merged into the main source by upstream.
 	#
 	# Cross-compilation to Windows is also supported.
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
diff --git a/games-action/extreme-tuxracer/Manifest b/games-action/extreme-tuxracer/Manifest
index b6536206b926..2e1ebb368623 100644
--- a/games-action/extreme-tuxracer/Manifest
+++ b/games-action/extreme-tuxracer/Manifest
@@ -1,3 +1,3 @@
 DIST extreme-tuxracer-0.8.0.tar.xz 40817900 BLAKE2B 79462dddfc531d1c17f2b9ce8e5bc4a250cb7ea48ff6f37ceb9eb7f0bcbf97f3a0ae9b09a8c09fa36bc71f8982dbeb2b1e67cddd967252fe0c9af013781546c7 SHA512 ff1e4dab4d2e72960eb8dd9643f0150255fe4196c2b25e67dd0d266a89f0b247ce76f818927cda35bbd669972f31f79b1461ccb1b2c7aeeb8d70aa39ed7bfd6d
-EBUILD extreme-tuxracer-0.8.0.ebuild 998 BLAKE2B 8f0604e42a0e146d36dd80e050b09f013527646ba8500e9b490ccfb2d530712c13e3310545e12ff7552472d627a33954701360374f77e1c0126225c5ad639f0e SHA512 b786116cd755a1be85e8d555393cacabb42e7414b754b7742d5262ecdd7deefe881dbe3a6ba5d08f019b84997eb9ce7f50b2c7c3cc81e8bb0c6242719078f730
+EBUILD extreme-tuxracer-0.8.0.ebuild 1005 BLAKE2B cec760b7d7fc709dc036bf3fd0f9f5313ab17325ae9758af7cd027216c3882cd03f7b453070aa646847bcfd8b86adee5cfbd7aecf93e39e55baf793bf625a2e1 SHA512 d10b884aaeb4021f64f37756232e6661f10960155bb5fccbef846dabea566cef5abc84a2b9f53b1c5b686b7e1433b77a4e9f84cb75506b54fa95f999c18c5a46
 MISC metadata.xml 528 BLAKE2B 5aa885f1e030f3c75ba7d2cddcf41796f4d10d2cc0c3d9d5781c0b61710c59e6cdebea55d4d6f41212f052b1ae1e897b2a0f0267b3dcd57af84d20df7c7371c1 SHA512 0e1b42c8617ffac11383794718915cdbdf0ac557d054899316baa85a869c9c2fcf6664a9fa22006902a815310e11d94779f401bbbac03dff3c2ad26631fd554e
diff --git a/games-action/extreme-tuxracer/extreme-tuxracer-0.8.0.ebuild b/games-action/extreme-tuxracer/extreme-tuxracer-0.8.0.ebuild
index ccbd7f7d9d68..850e45b239d1 100644
--- a/games-action/extreme-tuxracer/extreme-tuxracer-0.8.0.ebuild
+++ b/games-action/extreme-tuxracer/extreme-tuxracer-0.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/extremetuxracer/etr-${PV}.tar.xz -> ${
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-action/minecraft-launcher/Manifest b/games-action/minecraft-launcher/Manifest
index fe4f3333b467..baac1445f9ec 100644
--- a/games-action/minecraft-launcher/Manifest
+++ b/games-action/minecraft-launcher/Manifest
@@ -1,6 +1,6 @@
 DIST minecraft-launcher-1.6.93.jar 4481683 BLAKE2B 29597977cc70f831bff7f77cb2493d8c8f8138518c79f5e92f91ed6440ae2224b4140546c37645370173c668d9db894ca6b548b6cfd41da40c4e1ff51f0d820b SHA512 85739c0c0828af5b901b9933173f08229175aef1e8dec40c83981fb6fc330285b4c3a206cdf4405408106eff56ce1e516368d18bf44f631446ebac45e9aba125
-DIST minecraft-launcher-928.tar.gz 547096 BLAKE2B 8a47c62b5aa313a476cb6fb95e2993f609d3d1adde67802f3ef95df6385938dca424a3037ddb3303615323d10d0cd395807182ac75bae839502f13eb3faf2287 SHA512 57deacc588e8d90c90259841045a3df3b2b4861cb2d95b38e417daa34eee6aad4eebb601c2160627d5d5cd34f309aed854fb78872379cecfc8b976f3e14c8f91
+DIST minecraft-launcher-1035 1639888 BLAKE2B 20f48d909d7b5f56f61508447cb57b94789df7a2f1fc33f3ca3d37a0609cfbb31d7be4b3becdc465652a2d4071a80209118d53f9eade5c6554d4289fc9dd9c46 SHA512 a75fc0003c72a3dbab4fb907a30f025cfad671a8e797fc2809a67f8c9ba8c98f0a8e2e275c928016739f474207dc17d1144e4c357abe76d409f99d75752c59fb
 DIST minecraft-launcher.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a
 EBUILD minecraft-launcher-1.6.93.ebuild 917 BLAKE2B 2d9bdc8209022a0bf140dd38cc0c7afbe063596d9d62f17207f37fce79d3ac8ebf5b30ddec9f7f98695bfe8376d5ba9e21b9522b26e8b19647d30e11c1c55e99 SHA512 c219bdc9fa912a9ddf30da207dd9fcdd998a0c16fe93d88a759298a5541693246fd8ebfd6a34c52d5a88b98b84abc1ec1ff2e53284888579c192ed8ff41f03dc
-EBUILD minecraft-launcher-928-r4.ebuild 1249 BLAKE2B e977b05d61113f518ceeca8781b37a38b7eff9b702742b49f3e87065f46e58125753a410a872cfd8691bc411090b3519a10f6c44a6bc63eb0eddf2fe9d3c39c8 SHA512 76edbd597ca03636220608ed2d7b5f70c28f529ad98252e09211563adcd83ea03885cfe48423a3fff7ee25be275c1dea40de5798859205ffd15ec76ad283a879
+EBUILD minecraft-launcher-1035.ebuild 1428 BLAKE2B d4d33104a307e612abb8e2043e55162637b8c93dfa433c1b747f00e21bd53ee11bedce92e4eba96899aa71eb252ae54d3aaced21feecf271f2c3ae7fb9462bb3 SHA512 93168d00f3e74cd114dcbd5a676c3af840fb58f38eab429abb77e0206c8ee6b868a66ddbdd39f74db82071eb63d938b48c70638878518cf206a767af01e12b8d
 MISC metadata.xml 259 BLAKE2B 3bd5fecaefa4296413fd08aac88185d04771439afd26b516016a83ad674ca42d886412f99424be93e997431c64d5601ae89ae6478784cffb44e400d3fa4889b8 SHA512 d73de9f4636e5d93e57d9a781e5292e8d3bc270f8fb3b90c246cf3a2ba4a9ac9f36a9aea5a7f08aa6c608e61c836275bb1eb4b5c079b3db0da938efd10cdff9f
diff --git a/games-action/minecraft-launcher/minecraft-launcher-1035.ebuild b/games-action/minecraft-launcher/minecraft-launcher-1035.ebuild
new file mode 100644
index 000000000000..9728bdd18df1
--- /dev/null
+++ b/games-action/minecraft-launcher/minecraft-launcher-1035.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+# We can find which url we need for the latest release here:
+# https://launchermeta.mojang.com/v1/products/launcher/6f083b80d5e6fabbc4236f81d0d8f8a350c665a9/linux.json
+
+DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://launcher.mojang.com/v1/objects/ce9e6169550628003e22de8086e9fe1186c2285e/minecraft-launcher -> ${P}
+	https://launcher.mojang.com/download/minecraft-launcher.svg"
+
+KEYWORDS="-* ~amd64"
+LICENSE="Mojang"
+SLOT="0"
+
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.24.32-r1[X(+)]
+	app-crypt/libsecret
+	dev-libs/nss
+	dev-libs/libbsd
+	|| ( dev-libs/libffi-compat:7 dev-libs/libffi:0/7 )
+	dev-libs/libpcre
+	media-libs/alsa-lib
+	media-libs/openal
+	net-libs/gnutls[idn]
+	net-misc/curl[adns]
+	net-print/cups
+	sys-apps/dbus
+	virtual/jre:1.8
+	virtual/opengl
+	x11-apps/xrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util
+"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	/usr/bin/minecraft-launcher
+"
+
+src_install() {
+	newbin "${DISTDIR}/${P}" ${PN}
+
+	doicon -s scalable "${DISTDIR}/${PN}.svg"
+	make_desktop_entry ${PN} "Minecraft" ${PN} Game
+}
diff --git a/games-action/minecraft-launcher/minecraft-launcher-928-r4.ebuild b/games-action/minecraft-launcher/minecraft-launcher-928-r4.ebuild
deleted file mode 100644
index 17acf52bc03c..000000000000
--- a/games-action/minecraft-launcher/minecraft-launcher-928-r4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop xdg
-
-DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${PV}.tar.gz -> ${P}.tar.gz
-	https://launcher.mojang.com/download/minecraft-launcher.svg"
-
-KEYWORDS="-* ~amd64"
-LICENSE="Mojang"
-SLOT="0"
-
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.24.32-r1[X(+)]
-	app-crypt/libsecret
-	dev-libs/nss
-	dev-libs/libbsd
-	|| ( dev-libs/libffi-compat:7 dev-libs/libffi:0/7 )
-	dev-libs/libpcre
-	media-libs/alsa-lib
-	media-libs/openal
-	net-libs/gnutls[idn]
-	net-misc/curl[adns]
-	net-print/cups
-	sys-apps/dbus
-	virtual/jre:1.8
-	virtual/opengl
-	x11-apps/xrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-"
-
-S="${WORKDIR}/${PN}"
-
-QA_PREBUILT="
-	/usr/bin/minecraft-launcher
-"
-
-src_install() {
-	dobin minecraft-launcher
-
-	doicon -s scalable "${DISTDIR}/${PN}.svg"
-	make_desktop_entry ${PN} "Minecraft" ${PN} Game
-}
diff --git a/games-action/multimc/Manifest b/games-action/multimc/Manifest
index 5a4e28ba7cbe..ed27f527d478 100644
--- a/games-action/multimc/Manifest
+++ b/games-action/multimc/Manifest
@@ -1,4 +1,3 @@
-AUX multimc-0.6.12-gcc11.patch 443 BLAKE2B 866a6219c2a5ddc21cbe84ed4158174afced6b8689dddcd65c372678cc81fc13105e5416e27a41c69fef41a8b9b3cca6d73860a8e41721f8b09f56b72c16a7f4 SHA512 a97879fbc807e805d55c19007774f1698f717c021be1ba2ba9084a87341d9588be72d5b07779a57b2ea2d15015c100801289d782f2c0d27fe7a0da4ccd97f5d8
 DIST libnbtplusplus-multimc-0.6.1.tar.gz 47171 BLAKE2B e0e4d2593554dc59605114fcae86c59877da67d3f0888145b9ec2fe3d08decec7345a92c7d37310e021b5719f1371a58a22dc796e719028a478877e6d08982ed SHA512 81a1640a069d88df7ba0abf72089aecbe1e9d791c88acaaa7e70c8f0bcd0512cf8698178342657e363524ce8488dd072368a0aa8cc091a24912d6f8b6b0f4f2d
 DIST multimc-0.6.13.tar.gz 2493423 BLAKE2B 8dd64f3b07ff2faeda25bba14f1b19fd0854534e50d589325c19386c96ac3e4b04af8b2262fbf9796e67a869a8d98bf828617dadf2e270801970bc182a6d7175 SHA512 c897f75d01c0e7f73a860166bce3b4efccb3e3f8ec8b811c7e465ac97986c67c0d1149130429fcccb4bdd9af323d01e687f3d7afb5cb7d2c0299e61c0298cad9
 DIST quazip-multimc-3.tar.gz 103519 BLAKE2B 7a636f9e76cae61cee42131093b56d2a577814b2eb04bdc3c3a7614cf307bbdabe533c66a9f07848bbd929a62b7043dc53f2f85e2e487bfcc820170112f1114b SHA512 2e9074203c67bc7ad98621c551047e5367f06e54cacfecc755a5bf2c9f99266eab42ad972f86ae28ed7e1507f6d27d8d2680a87ce9fd5b1e93a18bcb627ec3f0
diff --git a/games-action/multimc/files/multimc-0.6.12-gcc11.patch b/games-action/multimc/files/multimc-0.6.12-gcc11.patch
deleted file mode 100644
index b523fa7c5554..000000000000
--- a/games-action/multimc/files/multimc-0.6.12-gcc11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur MultiMC5-0.6.12.orig/libraries/systeminfo/src/sys_unix.cpp MultiMC5-0.6.12/libraries/systeminfo/src/sys_unix.cpp
---- MultiMC5-0.6.12.orig/libraries/systeminfo/src/sys_unix.cpp	2021-03-22 04:45:06.000000000 +0900
-+++ MultiMC5-0.6.12/libraries/systeminfo/src/sys_unix.cpp	2021-04-29 06:41:55.269952475 +0900
-@@ -4,6 +4,7 @@
- 
- #include <sys/utsname.h>
- #include <fstream>
-+#include <limits>
- 
- Sys::KernelInfo Sys::getKernelInfo()
- {
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 4d79ff0bd102..28b919d83f74 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/cdogs-sdl/Manifest b/games-arcade/cdogs-sdl/Manifest
index 767d3dadd62a..2ee7ff7dc84b 100644
--- a/games-arcade/cdogs-sdl/Manifest
+++ b/games-arcade/cdogs-sdl/Manifest
@@ -1,5 +1,8 @@
 AUX cdogs-sdl-0.10.1-Add-BUILD_EDITOR-option.patch 2734 BLAKE2B baea5a27e417584630dd6254356aeaa77c79b8bdb743c37ca0473782c60fdb4ef892d012849504411c3f81e414b316f9f2ca923a625407d988310cea27bc2969 SHA512 f8143d41ce1ff16aee12d26989d5c6a9b3db146d720053331842eaac16b3b68661cf27e626b95a9ca6acf75e40262b864c546a061e78e61c6b8a91d34d04c488
 AUX cdogs-sdl-0.10.1-Remove-Winline-and-Werror-definitions.patch 571 BLAKE2B 644258160cbef3bb76e90f53e737a44482e73ba94a53e95704dbf683c6ce34c2ef51863580d7b0b274772e3f2a49c2cabf5d9b8c844aa4e5f71e2641c1cdc490 SHA512 db814155c0dc25132fd92c0ffb18390b824bc6ca914ae888511777b5183738463c59f42294a04732c97b1d6c7b8802687216e5ad0a2b55c310483ade1cfe4af2
+AUX cdogs-sdl-1.1.1-cmake.patch 410 BLAKE2B b2a36bf3644e885dcf05147f63c4c72e5936acc7727fc37daf9f1732ab3edd699d7a990f63f1977e9e2e9e775b8102429fbba6ffdaf77834a9e7acd3e1933023 SHA512 dd2ffe17f21640d50dec2021fa133baed11f93eba53686792116f15d21d37aed144cc03708baf633d0e0b1c74999202fe58a92eae9f15b81f61bb1b215d39ac4
 DIST cdogs-sdl-0.10.1.tar.gz 25035447 BLAKE2B 7f1ab1c210daaa44080cfca335cbcf0cd3ae069ef0638bd34c437e7b08833dfecfdf010ccdf9d5a4d3ede66cb75fd6258d3e8b7d907425fc0b73a792568ed205 SHA512 97bc23848536e98207afeaf74c172fe138dd0425dde6bb888b5c64f244b3c6ecea16245630628ab7aa4277da16c25c623574e8d123993bc9e840a3c26c1edce7
+DIST cdogs-sdl-1.1.1.tar.gz 35073687 BLAKE2B e4bcdbcafd281cfe127fc8b90bda479055042bf541ea7be7eaf2d0959e6d596565c8fca16bc703ca8263281d18372d89fa8ffa787592f3c01c0b048504df10fa SHA512 2d1357ba4a9892a7309d60b98aacf242b6d2b76f07f9f0a13fe0d97713b97507d1f163dfc63c1ac73c06b52590cda93bc212731bf201d5221ade8fa8b2e64598
 EBUILD cdogs-sdl-0.10.1.ebuild 1006 BLAKE2B b6bbfb721eb0fa72c70a1208ed319667007a72573d44dd55c44cc8ea792428039fd0d28fc77ded5d7682414d671f19203a892d94d8282351c19e8c9bab59a701 SHA512 f577adca8646759ea0a7e9609d82ebb8e047b1e8e88a31fde45194afdd3e7b3cdd3589d7a8222b4139fe63f8a0239bc571192d2e4e4bc71de979e5ae1ac3ad15
+EBUILD cdogs-sdl-1.1.1.ebuild 1186 BLAKE2B 334faa6b3ecd1aa8f04680151bafa15e088b86c3c03c1f7eb92bc28c9dc17b102276228e12ba64be748ee494e7ebd588e940d6572993c498e47f2e73cf7d18ce SHA512 98694df3a1b461ba98367d0d88f3bbe2feec44efc32a8a6cfc98357011e0acd0bda4b937a552a2bdf8b95540fb648025e2cb7708f20e15db449e8a8445f2c9b5
 MISC metadata.xml 738 BLAKE2B d88ddca3d0f022c5dc03aa79cd3e64bc11e3328c53e75ec0ce719edb389ee4d119e044ded0c1c3fa7de058c62a6614459f2d3927d745cb3cb3a3e55e32ddac39 SHA512 49e02eb89ad38a8b2e8375940a9e30e2368d970c01a88095dd679e828ba91a6054c9db264a0af038648cf42f8da99800f682a6394db77c0278d98a87dc6648cb
diff --git a/games-arcade/cdogs-sdl/cdogs-sdl-1.1.1.ebuild b/games-arcade/cdogs-sdl/cdogs-sdl-1.1.1.ebuild
new file mode 100644
index 000000000000..58afa1925c78
--- /dev/null
+++ b/games-arcade/cdogs-sdl/cdogs-sdl-1.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="Classic overhead run-and-gun game"
+HOMEPAGE="https://cxong.github.io/cdogs-sdl/"
+SRC_URI="https://github.com/cxong/cdogs-sdl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ BSD-2 CC0-1.0 CC-BY-3.0 CC-BY-SA-3.0 XMAME"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl2[haptic,opengl]
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-mixer[vorbis,wav]
+	net-libs/enet:1.3="
+DEPEND="${RDEPEND}"
+BDEPEND="$(python_gen_any_dep 'dev-python/protobuf-python[${PYTHON_USEDEP}]')"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake.patch
+)
+
+python_check_deps() {
+	has_version -b "dev-python/protobuf-python[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCDOGS_DATA_DIR="${EPREFIX}"/usr/share/${PN}/
+		-DBUILD_EDITOR=OFF
+		-DUSE_SHARED_ENET=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc doc/{AUTHORS,original_readme.txt}
+
+	# CREDITS is used at runtime, rest is licenses or duplicates
+	find "${ED}"/usr/share/${PN}/doc -type f ! -name CREDITS -delete || die
+}
diff --git a/games-arcade/cdogs-sdl/files/cdogs-sdl-1.1.1-cmake.patch b/games-arcade/cdogs-sdl/files/cdogs-sdl-1.1.1-cmake.patch
new file mode 100644
index 000000000000..92ce17bcbc39
--- /dev/null
+++ b/games-arcade/cdogs-sdl/files/cdogs-sdl-1.1.1-cmake.patch
@@ -0,0 +1,14 @@
+Remove -Werror and install data to CDOGS_DATA_DIR rather
+than directly under CMAKE_INSTALL_PREFIX.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -128,3 +128,3 @@
+ 	if(NOT BEOS AND NOT HAIKU)
+-		add_definitions(-Winline -Werror)
++		add_definitions(-Winline)
+ 		set(EXTRA_LIBRARIES "m")
+@@ -195,3 +195,3 @@
+ 	set(LIB_EXTENSION ".so")
+-	set(DATA_INSTALL_DIR ".")
++	set(DATA_INSTALL_DIR ${CDOGS_DATA_DIR})
+ endif()
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index d69abb6e146d..21c0276667c4 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/caps/Manifest b/games-emulation/caps/Manifest
deleted file mode 100644
index 871b4835745a..000000000000
--- a/games-emulation/caps/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST config_uae_ocs13_512c-512s.zip 1613 BLAKE2B 75262e48802d9dbfa95d9fc18aeb032176e98be86aeae65e893b9d8db57f6d6fb089df35273f27abcbbcd568d5dc96fec25281034f752862e06a8e22dcf38450 SHA512 38aa65030f874756780239191e08c7dbf41a241b44a82a58d8adef8dd94879d3db221c26e860d980a602fd89734f4ce8053e7c7037a8889e9a6f69a1d2dc4d8e
-DIST ipfdevlib_linux-20060612.tgz 60265 BLAKE2B 8ab649aef5be48287d88777e8ae94ea784922174f6a127ac5e8bfd906bb852caa9ffd624fbd51d062971c6b13ea0ae7089c0ad9356a10697cad425c348599b9a SHA512 6d01b35850af9f5f4a45f8ee7f9c9b7a02ffaf3830588c46cf718c5007316baac49c1c7c928f0fc78e9014e3f094cb6a2d6e842c1440a7b8e34e6c31899699d7
-DIST ipfdoc102a.zip 264258 BLAKE2B 07af5bd9e466d588472171694f778f6416d6cbad157782ab60ce0e7b764e6d5b9b1b3107d837edeee3253cba4332f182751894c0e897433124f6e6f1dd9ddf3d SHA512 f4b34349c65a5cffc6fad8370959ea0c2516087f46cbb43770b45cf14c573062e03abd77350cf4c8f690dc6a1d461dd0613a03ab70c1f8a72a3a43b9085730f0
-DIST ipflib_linux-amd64-20071115.tgz 24278 BLAKE2B 37cfa092dfaeb190de02233e021923c55d74a0445e850d35aeb2333a04a29c863769d770fd71a1110a112b719bcf5cecdc0d74f35546de51711b62da86077bbc SHA512 f306503a0aed7fd781bb6aea22a94fe72a5de952e3e26bb923d551ec5f165aa3fced4014df6a50f20b0f4526710b7e8643aa47a4de85f09bb2f3fe040d0b0f70
-EBUILD caps-20071115.ebuild 1528 BLAKE2B c114276bf49c4d30e2e63aec8fe5801e658e1d88d1e6d1d49efec04bd3287c9c430af29f4da4798e21c966b5a2539d5f5072625bfb528a6625deb71bfad16621 SHA512 34b4235b94791716cf99c36bdb187761c1eccb4cb486cf040c5367be72f8ba3157185e4a39717aa79ad69c560959bb5a4057a5b18fb9700cad9883f226b1331c
-MISC metadata.xml 604 BLAKE2B 74a3a5e27eaa0958da0e3311c9114923fc902c4b6969314dfb12b21ca9f8a63e0367af53a0b1621e6b3ae15b8c9d736ccf80c081ea37ac4a9a43f235812b2add SHA512 9491064bbd4b75dadcadc6608cb40825a1f8bdbd39b1325a24993d891b3f06e890c1a41980ee0f82346cf6a8015a5fe184b33d07e850631d57bc680d0b799616
diff --git a/games-emulation/caps/caps-20071115.ebuild b/games-emulation/caps/caps-20071115.ebuild
deleted file mode 100644
index af23de72f397..000000000000
--- a/games-emulation/caps/caps-20071115.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Support library for accessing and using C.A.P.S. images"
-HOMEPAGE="http://www.softpres.org/"
-SRC_URI="mirror://gentoo/ipfdevlib_linux-20060612.tgz
-	amd64? ( mirror://gentoo/ipflib_linux-amd64-${PV}.tgz )
-	doc? ( mirror://gentoo/ipfdoc102a.zip )
-	mirror://gentoo/config_uae_ocs13_512c-512s.zip"
-
-LICENSE="CAPS"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-RESTRICT="strip"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-QA_PREBUILT="usr/lib*/libcapsimage.so* usr/bin/ipfinfo"
-
-src_install() {
-	insinto /usr/include/caps
-	doins ipfdevlib_linux/include/caps/capsimage.h
-
-	case ${ARCH} in
-		ppc)
-			dolib.so ipfdevlib_linux/lib/ppc/libcapsimage.so.2.0
-			dobin ipfdevlib_linux/examples/ppc/ipfinfo
-			;;
-		x86)
-			dolib.so ipfdevlib_linux/lib/i686/libcapsimage.so.2.0
-			dobin ipfdevlib_linux/examples/i686/ipfinfo
-			;;
-		amd64)
-			dolib.so ipflib_linux-amd64/libcapsimage.so.2.3
-			dobin ipflib_linux-amd64/ipfinfo
-			;;
-		*)
-			eerror "Unsupported platform"
-			;;
-	esac
-
-	case ${ARCH} in
-		ppc|x86)
-			dosym libcapsimage.so.2.0 \
-				/usr/$(get_libdir)/libcapsimage.so.2
-			dodoc ipfdevlib_linux/{HISTORY,README}
-			;;
-		amd64)
-			dosym libcapsimage.so.2.3 \
-				/usr/$(get_libdir)/libcapsimage.so.2
-			dodoc ipflib_linux-amd64/{HISTORY,README}
-			;;
-	esac
-
-	insinto /usr/share/${PN}
-	doins OCS_13_1Mb_800_600.uae
-	doins ipfdevlib_linux/examples/ipfinfo.c
-
-	use doc && dodoc CAPSLib102a-40.pdf
-}
diff --git a/games-emulation/caps/metadata.xml b/games-emulation/caps/metadata.xml
deleted file mode 100644
index 6b20ebeae303..000000000000
--- a/games-emulation/caps/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		C.A.P.S., the Classic Amiga Preservation Society, as the name implies,
-		dedicates itself to the preservation of classic Amiga software for the
-		future, namely classic Amiga games. This is the C.A.P.S. support
-		library that allows third party applications access to and use of 
-		C.A.P.S. images.
-	</longdescription>
-</pkgmetadata>
diff --git a/games-emulation/dosbox-staging/Manifest b/games-emulation/dosbox-staging/Manifest
index c9ab8cac3bf3..0666749d9ddd 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -3,5 +3,5 @@ DIST dosbox-staging-0.77.0.tar.gz 2579927 BLAKE2B 2a8381451ec110ca5350afc70c45f1
 DIST dosbox-staging-0.77.1.tar.gz 2622418 BLAKE2B c56020d263ceac199266a5c458c192441f836ea2e71e1564da175b7ae522286ca1b6a07062498ccea795bbf330beecb5ef99a0130637b1df26603315d48ea6ff SHA512 fe5d6150a88f5c276aee5672f98c15b5ffee702fe9934919d3e78068efd1a85f08a8f04352bc6a8fe850324e33f3227340c59242db6cbae0475b12a58b749cac
 EBUILD dosbox-staging-0.76.0.ebuild 1431 BLAKE2B d6fefe9c171bd48de4246e239d95ebc78bbc02cf1aa138712cc3a2ed76fa9a5a5a181770e8d3f2173079770ef56b4adb83f8843d2fbfcfa6996c8806936912c6 SHA512 3fa322c2f91c97d0f86befc97c93d0e4dd4dcdba56055a97a8dd0fe85907e7319353cf85790dfc790fe811a9ba8990eaece8d86040255cf55f99ea8b502b5ea5
 EBUILD dosbox-staging-0.77.0-r1.ebuild 1458 BLAKE2B 0e0f6a28fe7851bded45749a2322b9b9225335c14923ed4ce1aeeb915f0a5a2eb21daba8b7862d8fdffc267210354053c10b0e038a7c5e41beb0020490c05c7b SHA512 88e4b4aa99fd3c25475aca2e522a23300b9af2628c7f64b9a8832105a350d99f451d6634b5336b11fdee173374d34975f41f46df25840c09178fb3286bf1f4a5
-EBUILD dosbox-staging-0.77.1.ebuild 1458 BLAKE2B 0e0f6a28fe7851bded45749a2322b9b9225335c14923ed4ce1aeeb915f0a5a2eb21daba8b7862d8fdffc267210354053c10b0e038a7c5e41beb0020490c05c7b SHA512 88e4b4aa99fd3c25475aca2e522a23300b9af2628c7f64b9a8832105a350d99f451d6634b5336b11fdee173374d34975f41f46df25840c09178fb3286bf1f4a5
+EBUILD dosbox-staging-0.77.1.ebuild 1465 BLAKE2B e554e0c27ed574b521cb610cfa8767af31bd9e3a1d1932c16116d72c6a96113a7745adc24b946d367a7e46578083ee37ee80d93d56ad24e97816460b615660a7 SHA512 79a9e5b949ce5ef28b15bfa0867711673a09cd6b5ffda4f477c457205e3ab120f6e7ca7306dbeb8405b2690be48bce0c72d1e3f4d0829b76e3c1f19d3a1c3810
 MISC metadata.xml 798 BLAKE2B e8e6368cfb116669c3359a665d5709c9bdc0eb778275599946e208a16909901ed23d852e7d45feaf6fd3897f786e1400d7eb46b19dcca45886df4872055b4577 SHA512 f513b215767cb39d8b92e8ece09110075d3c81ecb5d293b225e85d3e9368c2f10075435db6e31c758db89635ef9d99008d15430a0f7b891c0ae9278b7d97475e
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
index 5815a612b2b1..1cb6c2e10ce3 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
diff --git a/games-emulation/nestra/Manifest b/games-emulation/nestra/Manifest
deleted file mode 100644
index 7c7b06096d94..000000000000
--- a/games-emulation/nestra/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX nestra-0.66-exec-stack.patch 239 BLAKE2B 47255490442da874ddea390664928aa77734c67d2dbe84cfe8be82e5fe6042408ca5650164f3c1e8aa396db71be9234933cc18a423b2c08f3c311f589675ec95 SHA512 a65ca4225707a496fcb3fbc968ba301b654c9357b33a6153cb19905080cf1f5ee76bbf6b5510e1886de8a2cfb2c5ebaed3a166d518db50aecfb5953c36ee9a43
-AUX nestra-0.66-include.patch 1297 BLAKE2B 98a52017fc1919fde5125771b267f0ef2b0c73ef29f81f3e2bac3672c6bab5be005028310d031486d143568efbd8ccf7c2d58c4d9bee9d5532e3ac872465fe83 SHA512 f95568a3433094555067a89c59a38519ee2bef6cdce8a0ba962976c5df6be3332fa18c0c4b6635c807ed2b22a40a75e22b9a26282b5e8190659f59c64f212389
-DIST nestra-0.66.tar.gz 49757 BLAKE2B 0ec8603cd9afc33a1b194e1c39cdc8d3173d1ad4c7c76e6e00214883cdfcd8f2cf35bfb4b74e131822aaf8c7864a50980d642bc87aca26372f06b8fab145a7cf SHA512 25f9d0c0359b46ddcd451552e7737b0f955a18e7a4ebd30d5494b12f787b9c45a49579207328c06c10efc7f8283bc688eb2061c538523ed257825b2394d978ce
-DIST nestra_0.66-10.diff.gz 2414 BLAKE2B 5b83ac9eee4d8c141dc473000b5f713ab4eb0a38707334d4fd044b9617f01b83c4a19670ef27874f6511f1f9b1d578ba35d5ba9ac244621b19ca3b9c00d5a30d SHA512 4ea1ad97f6c2eca0434dee4031e0486cc1c7c25237a467d4bf33bd0656b52441143855e07b29e1bdcf95514e19fe68ecb8f73d0972d17d9e3b6fd7a92d2db8c6
-EBUILD nestra-0.66-r3.ebuild 1029 BLAKE2B 42d9c2dd752ec37c39f3b4d819af573a0cffadb675b8122bceee5b1acea1f0b37e8f6e69d1cda0c246fca01cd13727414ef9f990c4f013d44e29a40c36641556 SHA512 4d6400b7aa07ad17356429c9d436a150f2a3befdf59db308c6a175f4fab27d02388eedec0791d88ca07d5e9b83d2764fda815b5fe03ec8a0d9c28fb97ef4b63b
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-emulation/nestra/files/nestra-0.66-exec-stack.patch b/games-emulation/nestra/files/nestra-0.66-exec-stack.patch
deleted file mode 100644
index d9e9b3c61147..000000000000
--- a/games-emulation/nestra/files/nestra-0.66-exec-stack.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/x86.S.orig	2006-01-09 20:02:58.000000000 -0500
-+++ b/x86.S	2006-01-09 20:03:38.000000000 -0500
-@@ -1458,3 +1458,7 @@
-  leal   0x1(%eax),%ebx
-  popl   %eax
-  jmp i_next
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/games-emulation/nestra/files/nestra-0.66-include.patch b/games-emulation/nestra/files/nestra-0.66-include.patch
deleted file mode 100644
index 096fd18af47f..000000000000
--- a/games-emulation/nestra/files/nestra-0.66-include.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- a/comptbl.c
-+++ b/comptbl.c
-@@ -9,6 +9,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <errno.h>
-+#include <stdlib.h>
- 
- #define ALLOC_SIZE 0x400000 /* 4MB */
- #define TBL_BASE ((unsigned char *)0x10000000)
---- a/d6502.c
-+++ b/d6502.c
-@@ -1,6 +1,7 @@
- /* 6502 disassembler */
- /* Public Domain */
- 
-+#include <stdio.h>
- #include "globals.h"
- 
- char Opcodes_6502[256][4]={
---- a/emu.c
-+++ b/emu.c
-@@ -12,6 +12,7 @@
- #include <sys/mman.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "mapper.h"
- #include "io.h"
---- a/fb.c
-+++ b/fb.c
-@@ -2,6 +2,8 @@
- /* Framebuffer/pixmap rendering */
- /* Public Domain */
- 
-+#include <stdlib.h>
-+#include <string.h>
- #include <stdio.h>
- #include "mapper.h"
- #include "globals.h"
---- a/io.c
-+++ b/io.c
-@@ -5,6 +5,7 @@
-    to do I/O operations. */
- 
- #include <stdio.h>
-+#include <string.h>
- #include "mapper.h"
- #include "io.h"
- #include "globals.h"
---- a/mapper.c
-+++ b/mapper.c
-@@ -1,6 +1,7 @@
- /* Nestra mapper.c */
- /* Public Domain */
- 
-+#include <string.h>
- #include "mapper.h"
- #include "consts.h"
- 
---- a/x11.c
-+++ b/x11.c
-@@ -1,6 +1,9 @@
- /* Nestra x11.c */
- /* Public Domain */
- 
-+#include <stdlib.h>
-+#include <string.h>
-+#include <stdio.h>
- #include <X11/Xlib.h>
- #include <X11/keysym.h>
- #include <X11/Xutil.h>
diff --git a/games-emulation/nestra/metadata.xml b/games-emulation/nestra/metadata.xml
deleted file mode 100644
index 1c3ba213c494..000000000000
--- a/games-emulation/nestra/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/nestra/nestra-0.66-r3.ebuild b/games-emulation/nestra/nestra-0.66-r3.ebuild
deleted file mode 100644
index 73ec6ac19483..000000000000
--- a/games-emulation/nestra/nestra-0.66-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-PATCH="${P/-/_}-10.diff"
-DESCRIPTION="NES emulation for Linux/x86"
-HOMEPAGE="http://nestra.linuxgames.com/"
-SRC_URI="http://nestra.linuxgames.com/${P}.tar.gz
-	mirror://debian/pool/contrib/n/nestra/${PATCH}.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="x11-libs/libX11[abi_x86_32(-)]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	eapply "${WORKDIR}"/${PATCH}
-	eapply "${FILESDIR}"/${P}-exec-stack.patch
-	eapply "${FILESDIR}"/${P}-include.patch
-
-	append-ldflags -Wl,-z,noexecstack
-	use amd64 && multilib_toolchain_setup x86
-
-	sed -i \
-		-e "s:-L/usr/X11R6/lib:${LDFLAGS}:" \
-		-e 's:-O2 ::' \
-		-e "s:gcc:$(tc-getCC) ${CFLAGS}:" \
-		-e "s:ld:$(tc-getLD) -m elf_i386 $(raw-ldflags):" \
-		Makefile || die
-}
-
-src_compile() {
-	use amd64 && multilib_toolchain_setup x86
-	default
-}
-
-src_install() {
-	dobin nestra
-	einstalldocs
-	doman nestra.6
-}
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 49a3f389b177..2f8c8116a3fc 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/box2d/Manifest b/games-engines/box2d/Manifest
index 13e7b434e3b2..840345eb1c50 100644
--- a/games-engines/box2d/Manifest
+++ b/games-engines/box2d/Manifest
@@ -1,3 +1,3 @@
 DIST box2d-2.4.1.tar.gz 1224516 BLAKE2B 4f268c082d6c51d574fe6974351a64e98693e7eb71aa36626561fe23cb5fa890c77946e34d91fce92298af7e723c34306dfc6a934251a8566f431821397d1b82 SHA512 d900f925b77906777719c91488bdc5e2df1ad1f4a8ca39a574229f5e57070e3a843bdd7530e817112605fde6d82145c872d8afdfc65b84531a73199098c81162
-EBUILD box2d-2.4.1.ebuild 709 BLAKE2B 1684eeffdba3be8ee32938b408ee2d75d6d2b0501bd7050ea25ee9b760462e5b126f50603e243ec1b2b4f846d99317ce1234598c76ee467f8d889b45048569a6 SHA512 b48c285bc8871acc99d770b3b85c5ed290a747bbaea6d1d393c60d97df2098697d79e8d9d7f5f30a654eb78f9fa9df02faaf3b2d2061c3070520c4f951c8ad04
+EBUILD box2d-2.4.1.ebuild 903 BLAKE2B 60359b545e6467a259a1bfdbd4e10885fbddcd520dd71bdff50bb07ee7124fc48867c650270ef93c018918440cbe057834367b69ae7329c8af18b041a9e31de2 SHA512 36772e0c80b447e898ca349a9c5384125ba8c426ae6f5c30f628f7b8c66c21b417f3b58f9fa332a5c4dc6c5a6f67756e5f33db7dcbf572d6b49b4b5f046b26a4
 MISC metadata.xml 334 BLAKE2B dfc66d58b4c54e7f04ac51ad4669e282dcd91ddca795be323bb47b0088a89bbb765a39bdc1d998a7f5afd77e5450c94ac6ba48f5b3f77d8a9a769d2e44f35533 SHA512 0d809e8099f314755b04431e40ad01a8f91ef2246a4129f64dfb413251b2b259e694999c7f7489c5d87795ab197464c27651cd3c404b62b3d270913da385a09c
diff --git a/games-engines/box2d/box2d-2.4.1.ebuild b/games-engines/box2d/box2d-2.4.1.ebuild
index 0fe84b500b23..aa15726dd78e 100644
--- a/games-engines/box2d/box2d-2.4.1.ebuild
+++ b/games-engines/box2d/box2d-2.4.1.ebuild
@@ -15,8 +15,17 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
+DEPEND="test? ( dev-cpp/doctest )"
 BDEPEND="doc? ( app-doc/doxygen )"
 
+src_prepare() {
+	cmake_src_prepare
+
+	# unbundle doctest
+	rm unit-test/doctest.h || die
+	ln -s "${ESYSROOT}"/usr/include/doctest/doctest.h unit-test/ || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBOX2D_BUILD_TESTBED=OFF # bundled libs, broken anyway right now
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index 253187341e20..da8481d68e72 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -9,6 +9,8 @@ AUX openmw-0.46.0-recastnavigation.patch 988 BLAKE2B 3d9dd71a02070268fe21006fda2
 AUX openmw-0.47.0-mygui-license.patch 728 BLAKE2B 036156d52e609fcbce3b219174e9def640457bcc8ce9df842e4423e8fe9634f7069a820602710fe4315d06801159aff53520843f92155865d294234f4712fed7 SHA512 fb156f963aa103fc04b515faec0ef536e47da78da9ee5fbc2cc4ccaa51d382a229d3ee8a07b007d34442200834a9aba41489cea85e90c73f9acc6943e2274079
 DIST openmw-0.46.0-floattest.patch 43168 BLAKE2B 060b529fd4cd01f0fc723bb5a00a256b9c1ae4413c7b22581467cce75416e01041c3af22f0215ad9b1c475965a988065e0860c01c1e71d97454b022eec4779ea SHA512 0e165417e9ae047231fdc27b62251b33867f3782c1753f81705c886d6d3a433c8bbc3b4653a2555bc644bad11db9769d4bc2abcc84ca3ab23fabb6b80347bc32
 DIST openmw-0.46.0.tar.gz 5155004 BLAKE2B 8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c SHA512 da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486
+DIST openmw-0.47.0.tar.gz 5156857 BLAKE2B 40e8b9670423259fa0cc03ef000c17ebe06d1d58c2527b51b25cea3b54978b8a698984371eac14ff212f9550253ab17d41b83d37426371f12f5ce2d30b240d3d SHA512 517e650d0054cdba8d38de05ed3975b0fcf8de32fda59c8df7c34b973e5390efa0dd9ec79babdfdaa79dee7aa8a75009776f62fad91b9aa9aa28016c5032652b
 EBUILD openmw-0.46.0-r2.ebuild 4328 BLAKE2B d8a1286c1d414f7c8cfe7f1341e15fcb1034694cdddfbf4af64aed41a35c1e946e6c95597b7e63e2b15b7aa81a16766a4973d238514e010390507e877bd7dec4 SHA512 fce808ce7de850286b0d748f367b4465098c0eeed249f551ff2d2fcd0eaf803c810da502b460aa99cb838f082bd05caf84bbb57a1e434040fe790a3b9e83c595
-EBUILD openmw-9999.ebuild 4125 BLAKE2B 73515500ce259aeaf3115db761f1b4d03f779e1c82e9c18d3037d53eca25def6b25b0a17a785ce77cbe5d1e15c2f85d75fbf6dc005b1747473447b5b815ecfbc SHA512 263987258fb94202c981fd93b28313d54c8b7cb20c82ba353a99501b10a304b33e5547d195fa805c849934bfa06dd3bce3893f4da73548dcc930290fd17b4605
+EBUILD openmw-0.47.0.ebuild 3559 BLAKE2B c024f1fcbea83c266babeba9140c544f4061726433dcb63522b454dbc3a9ac31778bc6a6d6aadcedecda0e5f257008f5352b5e65eeaf1052cc663eb345acc809 SHA512 dc3efa8a516b0d6424f9643b069664ab2cf123e8a2401e7d2f59d4742ef003264a9cd5eb629fdb5480f657ac7fd8617327a633d06be6ae3bd9e7734e44d4db1e
+EBUILD openmw-9999.ebuild 4004 BLAKE2B ce9554f2cd1afdda34a34b0aeee704e15c3f4653d7d70ceebed54ae41dfa8cd4937ee4260d77b558dc6239dddc07d2c7d2c6bd25649c89440d047edfc68ea9d3 SHA512 3fd47b8d9f3a1cbff2a62d966153e10398ac7c2aaa52985e7119a7142f751899b6e24465cd8a06ab0e9061d424c203d71ed20f7e6fe2044509106a33a89cff24
 MISC metadata.xml 1454 BLAKE2B f0cfc77e752bbd3b7a4cd1bee5d7e76aa913e402525928980f728273807be80555fb03e8b9891d28fea8b941c3e632395322536f006b94dea5a00d74bced610b SHA512 9aa67b87fd886d8c3fe29f5eb3f5fbd943a7d690c1dca21a34746a286d0b193e36ec8c96b75554ca3f98c4d149dcd7e072aa702b09c6670d63739a3c8b766df3
diff --git a/games-engines/openmw/openmw-0.47.0.ebuild b/games-engines/openmw/openmw-0.47.0.ebuild
new file mode 100644
index 000000000000..2ee105fb1152
--- /dev/null
+++ b/games-engines/openmw/openmw-0.47.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake readme.gentoo-r1 xdg
+
+DESCRIPTION="Open source reimplementation of TES III: Morrowind"
+HOMEPAGE="https://openmw.org/ https://gitlab.com/OpenMW/openmw"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OpenMW/openmw.git"
+else
+	SRC_URI="https://github.com/OpenMW/openmw/archive/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="GPL-3 MIT BitstreamVera ZLIB"
+SLOT="0"
+IUSE="doc devtools +osg-fork test +qt5"
+RESTRICT="!test? ( test )"
+
+# FIXME: Unbundle dev-games/openscenegraph-qt in extern/osgQt directory,
+# used when BUILD_OPENCS flag is enabled. See bug #676266.
+
+RDEPEND="
+	app-arch/lz4:=
+	dev-games/mygui
+	dev-games/recastnavigation:=
+	dev-libs/boost:=[threads(+),zlib]
+	dev-libs/tinyxml[stl]
+	media-libs/libsdl2[joystick,opengl,video]
+	media-libs/openal
+	media-video/ffmpeg:=
+	>=sci-physics/bullet-2.86:=[double-precision]
+	virtual/opengl
+	osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
+	!osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
+	qt5? (
+		app-arch/unshield
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx
+	)
+	test? (
+		dev-cpp/gtest
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/openmw-0.47.0-mygui-license.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Use the system tinyxml headers
+	rm -v extern/oics/tiny{str,xml}* || die
+}
+
+src_configure() {
+	use devtools && ! use qt5 &&
+		elog "'qt5' USE flag is disabled, 'openmw-cs' will not be installed"
+
+	local mycmakeargs=(
+		-DBUILD_BSATOOL=$(usex devtools)
+		-DBUILD_DOCS=$(usex doc)
+		-DBUILD_ESMTOOL=$(usex devtools)
+		-DBUILD_LAUNCHER=$(usex qt5)
+		-DBUILD_NIFTEST=$(usex devtools)
+		-DBUILD_OPENCS=$(usex devtools $(usex qt5))
+		-DBUILD_WIZARD=$(usex qt5)
+		-DBUILD_UNITTESTS=$(usex test)
+		-DGLOBAL_DATA_PATH="${EPREFIX}/usr/share"
+		-DICONDIR="${EPREFIX}/usr/share/icons/hicolor/256x256/apps"
+		-DMORROWIND_DATA_FILES="${EPREFIX}/usr/share/morrowind-data"
+		-DUSE_SYSTEM_TINYXML=ON
+		-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		cmake_src_compile doc
+		find "${BUILD_DIR}"/docs/Doxygen/html \
+			-name '*.md5' -type f -delete || die
+		HTML_DOCS=( "${BUILD_DIR}"/docs/Doxygen/html/. )
+	fi
+}
+
+src_test() {
+	"${BUILD_DIR}/openmw_test_suite" || die
+}
+
+src_install() {
+	cmake_src_install
+
+	local DOC_CONTENTS="
+	You need the original Morrowind data files. If you haven't
+	installed them yet, you can install them straight via the
+	installation wizard which is the officially supported method
+	(either by using the launcher or by calling 'openmw-wizard'
+	directly).\n"
+
+	if ! use qt5; then
+		DOC_CONTENTS+="\n\n
+		USE flag 'qt5' is disabled, 'openmw-launcher' and
+		'openmw-wizard' are not available. You are on your own for
+		making the Morrowind data files available and pointing
+		openmw at them.\n\n
+		Additionally; you must import the Morrowind.ini file before
+		running openmw with the Morrowind data files for the first
+		time. Typically this can be done like so:\n\n
+		\t mkdir -p ~/.config/openmw\n
+		\t openmw-iniimporter /path/to/Morrowind.ini ~/.config/openmw/openmw.cfg"
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index a716d898ad5c..0bad76f57453 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1,3,4} luajit )
-inherit cmake lua-single xdg-utils readme.gentoo-r1
+inherit cmake lua-single readme.gentoo-r1 xdg
 
 DESCRIPTION="Open source reimplementation of TES III: Morrowind"
 HOMEPAGE="https://openmw.org/ https://gitlab.com/OpenMW/openmw"
@@ -28,11 +28,11 @@ RESTRICT="!test? ( test )"
 # used when BUILD_OPENCS flag is enabled. See bug #676266.
 
 RDEPEND="${LUA_DEPS}
-	app-arch/lz4
+	app-arch/lz4:=
 	dev-games/mygui
-	dev-games/recastnavigation
+	dev-games/recastnavigation:=
 	dev-libs/boost:=[threads(+),zlib]
-	dev-libs/tinyxml:=[stl]
+	dev-libs/tinyxml[stl]
 	media-libs/libsdl2[joystick,opengl,video]
 	media-libs/openal
 	media-video/ffmpeg:=
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	virtual/pkgconfig
 	doc? (
-		app-doc/doxygen[doc]
+		app-doc/doxygen[dot]
 		dev-python/sphinx
 	)
 	test? (
@@ -78,7 +78,7 @@ src_prepare() {
 }
 
 src_configure() {
-	use devtools && ! use qt5 && \
+	use devtools && ! use qt5 &&
 		elog "'qt5' USE flag is disabled, 'openmw-cs' will not be installed"
 
 	local mycmakeargs=(
@@ -95,8 +95,6 @@ src_configure() {
 		-DMORROWIND_DATA_FILES="${EPREFIX}/usr/share/morrowind-data"
 		-DUSE_SYSTEM_TINYXML=ON
 		-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON
-		-DDESIRED_QT_VERSION=5
-		-DBULLET_USE_DOUBLES=ON
 	)
 
 	if [[ ${ELUA} == luajit ]]; then
@@ -121,9 +119,9 @@ src_compile() {
 
 	if use doc ; then
 		cmake_src_compile doc
-		find "${CMAKE_BUILD_DIR}"/docs/Doxygen/html \
+		find "${BUILD_DIR}"/docs/Doxygen/html \
 			-name '*.md5' -type f -delete || die
-		HTML_DOCS=( "${CMAKE_BUILD_DIR}"/docs/Doxygen/html/. )
+		HTML_DOCS=( "${BUILD_DIR}"/docs/Doxygen/html/. )
 	fi
 }
 
@@ -142,7 +140,7 @@ src_install() {
 	directly).\n"
 
 	if ! use qt5; then
-		local DOC_CONTENTS+="\n\n
+		DOC_CONTENTS+="\n\n
 		USE flag 'qt5' is disabled, 'openmw-launcher' and
 		'openmw-wizard' are not available. You are on your own for
 		making the Morrowind data files available and pointing
@@ -158,10 +156,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_icon_cache_update
+	xdg_pkg_postinst
 	readme.gentoo_print_elog
 }
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 8453ae5ac682..247b77ce1892 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 2ffc41f09fa2..f8f6017203c7 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,7 +1,7 @@
 AUX gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch 1215 BLAKE2B b2b24d2c1eaff1b9c5de6d2fdd614fb3f6c21b676b1c56283bc3b376bbf31e29c6eed27112c03d8738564215824583338acbfa84289fe69cb78ab8ee613643b4 SHA512 55fecbdbda330ae0e95a3ac99f8780d37ca386704f115680204da5403ad380eec14559f0522f7d2b55e1340aeebb9ecd1cbc41fe61e519689e7bd2feed5745a1
-DIST gzdoom-4.6.0.tar.gz 13921655 BLAKE2B acf3273d53f24a1d65a1d7cd1614589699926211370e84570062464d989adc7a0427423ea3444db37a9c6393d3fee971db84c9a2c4346b5677906dd89d926af4 SHA512 d7c1f5155c1262e79c812983cac3856b917f5861f9ead0b9a307040f99802a489c3f836ed23baae245122971fa4fed872202131c8c8cf17724cf4e9b2b4efea5
 DIST gzdoom-4.6.1.tar.gz 13937864 BLAKE2B 59ea057b42058944566a66c21f441752bd014235ac4644f9b50182673856fedc33414cbe12505a294842e46c93faaf120d844ccd49fb9afeede67640feab3764 SHA512 cec64f4f6a3be3693b35d716a44930cfa9fd10b794b380cf0ea624e7901f78f3e5211b17a0905b65de367fa62046cd6ebd099f5300c7f49e1c020faaae15dd41
+DIST gzdoom-4.7.0.tar.gz 14070204 BLAKE2B 4cf0555e7d1e34f71057502bce0973d49ffca6bccd2396faee6360832511b90450008c4ec22a0cdadfa3edcd13ec73bf412c0af7c6298c560c087f8a3d5f0bdb SHA512 539d1de85b3e2313e57fc8fcb0fa4b7a5110107f5436ee3412342c1140cebbe4ccec45efa3211b43aba8bc3715ce0e7819dd593f55d8ee906f2382573435361f
 DIST widepix-d458411.tar.gz 2542783 BLAKE2B 622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f SHA512 fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543
-EBUILD gzdoom-4.6.0.ebuild 2229 BLAKE2B 6f0f0014c4c6736aa39b99ec4b34b1c406beeb0b5ef13f3dec728e4b3958bc257c564f9264b6e7a03f7e61e6572781d88b460a2901aa9faad36682b9d2dbed22 SHA512 c9d266fc0a8026b848f31fdf97ac91646affb075209ac9c83c11b60e4688d7ef4923dc523bfb72972a3ea35eeecafdbc1bc59bff4e423b49734343a224e66258
 EBUILD gzdoom-4.6.1.ebuild 2229 BLAKE2B 6f0f0014c4c6736aa39b99ec4b34b1c406beeb0b5ef13f3dec728e4b3958bc257c564f9264b6e7a03f7e61e6572781d88b460a2901aa9faad36682b9d2dbed22 SHA512 c9d266fc0a8026b848f31fdf97ac91646affb075209ac9c83c11b60e4688d7ef4923dc523bfb72972a3ea35eeecafdbc1bc59bff4e423b49734343a224e66258
-MISC metadata.xml 780 BLAKE2B eacdbeffde51aa2ff7d8fab5c9a3ac4e76e78c94d9c27c4fc151ecbd66c8cad80cfc2cee82654cf243197c9e12137821fa6560856071ead47647359eb96b0d82 SHA512 2bf0928276cc4f87c6dfe15d2785d5219972d0b281293928403265eaf858b7ad584faca1d171f44ba1aac761274fb12e11a07ac1e9d60aa8d1ae8f79cb7a0d02
+EBUILD gzdoom-4.7.0.ebuild 2381 BLAKE2B a100216fe53583cbf3313cf845ca2bcffedd22333e48e68cc317000a502ea3cd95984cca3392817781af526e6720ec1deb090fe97678f0ec358d5213d4b01667 SHA512 5636b6c17f47b8a5cd38040278d0bac30711527b0c8413750b6344a1603e8ecccb4aec913e3c7018c0db3175764d781087769ef6a3e87dd8ef95463c6bf40ae9
+MISC metadata.xml 880 BLAKE2B 9e2c6bea13a2821469d6f6ac4d21c4b2313f42594257a78a574bf893ec70f94bf0c0208e53401e24cdd06aa0bdb2fedb18374d2785abea393688d62ea4427951 SHA512 2bbe5df923e586acb967be69648fc5ccd604254fc2c9eebfc1cee2ca5448fe16b68b639ca21c9225af1ca7e0ca745dfde7b427166c1482145105dcc2f52a1751
diff --git a/games-fps/gzdoom/gzdoom-4.6.0.ebuild b/games-fps/gzdoom/gzdoom-4.6.0.ebuild
deleted file mode 100644
index 7d3705e66a45..000000000000
--- a/games-fps/gzdoom/gzdoom-4.6.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg flag-o-matic
-
-WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
-DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
-HOMEPAGE="https://zdoom.org"
-SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
-	non-free? ( https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )"
-
-LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
-	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug gtk +non-free openmp"
-
-DEPEND="
-	app-arch/bzip2
-	media-libs/libsdl2[opengl]
-	media-libs/openal
-	media-libs/zmusic
-	sys-libs/zlib
-	virtual/jpeg:0
-	gtk? ( x11-libs/gtk+:3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.patch"
-)
-
-src_prepare() {
-	rm -rf docs/licenses || die
-	rm -rf libraries/{bzip2,jpeg,zlib} || die
-	if ! use non-free ; then
-		rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
-	else
-		mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" wadsrc_widescreen/static/ || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
-		-DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
-		-DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
-		-DDYN_OPENAL=OFF
-		-DNO_GTK="$(usex !gtk)"
-		-DNO_OPENAL=OFF
-		-DNO_OPENMP="$(usex !openmp)"
-		-DBUILD_NONFREE="$(usex non-free)"
-	)
-
-	use debug || append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
-
-src_install() {
-	newicon src/posix/zdoom.xpm "${PN}.xpm"
-	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-	cmake_src_install
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use non-free ; then
-		ewarn
-		ewarn "GZDoom installed without non-free components."
-		ewarn "Note: The non-free game_support.pk3 file is needed to play"
-		ewarn "      games natively supported by GZDoom."
-		ewarn "A list of games natively supported by GZDoom is available"
-		ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD"
-		ewarn
-	fi
-}
diff --git a/games-fps/gzdoom/gzdoom-4.7.0.ebuild b/games-fps/gzdoom/gzdoom-4.7.0.ebuild
new file mode 100644
index 000000000000..52da570e32f4
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.7.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg flag-o-matic
+
+WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
+DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
+HOMEPAGE="https://zdoom.org"
+SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
+	non-free? ( https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )"
+
+LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
+	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug gles2 gtk +non-free openmp telemetry vulkan"
+
+DEPEND="
+	app-arch/bzip2
+	media-libs/libsdl2[gles2?,opengl,vulkan?]
+	media-libs/openal
+	media-libs/zmusic
+	sys-libs/zlib
+	virtual/jpeg:0
+	gtk? ( x11-libs/gtk+:3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.patch"
+)
+
+src_prepare() {
+	rm -rf docs/licenses || die
+	rm -rf libraries/{bzip2,jpeg,zlib} || die
+	if ! use non-free ; then
+		rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
+	else
+		mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" wadsrc_widescreen/static/ || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
+		-DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+		-DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
+		-DDYN_OPENAL=OFF
+		-DNO_GTK="$(usex !gtk)"
+		-DNO_OPENAL=OFF
+		-DHAVE_VULKAN="$(usex vulkan)"
+		-DHAVE_GLES2="$(usex gles2)"
+		-DNO_OPENMP="$(usex !openmp)"
+		-DBUILD_NONFREE="$(usex non-free)"
+	)
+
+	use debug || append-cppflags -DNDEBUG
+	use telemetry || append-cppflags -DNO_SEND_STATS
+
+	cmake_src_configure
+}
+
+src_install() {
+	newicon src/posix/zdoom.xpm "${PN}.xpm"
+	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
+	cmake_src_install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use non-free ; then
+		ewarn
+		ewarn "GZDoom installed without non-free components."
+		ewarn "Note: The non-free game_support.pk3 file is needed to play"
+		ewarn "      games natively supported by GZDoom."
+		ewarn "A list of games natively supported by GZDoom is available"
+		ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD"
+		ewarn
+	fi
+}
diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index ae171bd27d9d..5bd8c339a086 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -14,7 +14,9 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
+		<flag name="gles2">Enable GLES2 backend</flag>
 		<flag name="non-free">Enable non-free components</flag>
+		<flag name="vulkan">Enable Vulkan support</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://forum.zdoom.org/viewforum.php?f=2</bugs-to>
diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild
new file mode 100644
index 000000000000..5d9e67d4a9fb
--- /dev/null
+++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="A spaceship bridge simulator game."
+HOMEPAGE="https://daid.github.io/EmptyEpsilon/"
+# This bundles SeriousProton as the build system does not support using
+# a separate SeriousProton instance (and currently EmptyEpsilon seems to
+# be the only consumer).
+SRC_URI="https://github.com/daid/EmptyEpsilon/archive/EE-${PV}.tar.gz -> EmptyEpsilon-${PV}.tar.gz
+	https://github.com/daid/SeriousProton/archive/EE-${PV}.tar.gz -> SeriousProton-${PV}.tar.gz"
+
+# EmptyEpsilon is mostly licensed under GPL, however the art ressources
+# use Creative Commons and the bundled SeriousProton is MIT-licensed.
+LICENSE="GPL-2 CC-BY-SA-3.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-cpp/json11-1.0.0
+	media-libs/libglvnd
+	media-libs/libsfml
+	>=media-libs/glm-0.9.9.8
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/EmptyEpsilon-EE-${PV}"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} == "binary" ]]; then
+		return
+	fi
+
+	if tc-is-gcc; then
+		if [[ $(gcc-major-version) -lt 11 ]]; then
+			# ld: /usr/lib64/libsfml-audio.so: undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.a4.29'
+			eerror "${PN} requires GCC >= 11. Run gcc-config to switch your default compiler."
+			die "Need at least GCC >= 11"
+		fi
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-Make-CMake-call-find_package-glm.patch"
+	eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \
+		   "${FILESDIR}/SeriousProton-Unbundle-json11.patch"
+
+	eapply_user
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local version=( $(ver_rs 1- ' ') )
+	local mycmakeargs=(
+		-DSERIOUS_PROTON_DIR="${WORKDIR}/SeriousProton-EE-${PV}/"
+		-DOpenGL_GL_PREFERENCE=GLVND
+		-DCPACK_PACKAGE_VERSION="${PV}"
+		-DCPACK_PACKAGE_VERSION_MAJOR="${version[0]}"
+		-DCPACK_PACKAGE_VERSION_MINOR="${version[1]}"
+		-DCPACK_PACKAGE_VERSION_PATCH="${version[2]}"
+	)
+
+	cmake_src_configure
+}
diff --git a/games-simulation/EmptyEpsilon/Manifest b/games-simulation/EmptyEpsilon/Manifest
new file mode 100644
index 000000000000..1cd180e3724e
--- /dev/null
+++ b/games-simulation/EmptyEpsilon/Manifest
@@ -0,0 +1,6 @@
+AUX EmptyEpsilon-Make-CMake-call-find_package-glm.patch 1056 BLAKE2B 9522b7e2b45531ebd82e1f454a889ccd4c688adcbcdb753ca3c0c23ee2f0b94ed9537956bbbd8faca8305065017daf178278d5c14661d68de24d9c008339d6f2 SHA512 c6ccddf2a9f6fc7342428d5c197bec6fc01f24e3c9c9aa19bbccedba3c16bd825f59566fb0239b64bdd3914abfd584382742544f79c4266eef6e4ee7aabf3238
+AUX SeriousProton-Unbundle-json11.patch 722 BLAKE2B ab12cf044d38bc78eac3d4fdd7f3c9db062784177e848ca62135b356fec88be9876fa98f23d1195e3c3a2ef791166cb3c0fe220bce9c53a667b628a2e3602eb4 SHA512 da912f148738a409dd1eee4a8a926930ed31220c9b6477eb8a89da797dd659e2a576ca44875410cbc46c86f7d5b6e44037ed3f44c8d7ecd5a4680f12f626f013
+DIST EmptyEpsilon-2021.06.23.tar.gz 285211647 BLAKE2B 813b7e02ff7f046b7f28139063441eb421861b720c7b55d25930d3a418211fefdce7ac0e6ab705b4afe52df58f85a9298ff3e6be883a841e6eb9f7037eca297b SHA512 209ea68d99ef5ef53f1e3484d6471cafc01d4cb6505609a5b41d468387147127b4b4bbc20af75404d2cdef3d3cfb37bbb7f6fb3ae336d2f7e264e9c470ad7764
+DIST SeriousProton-2021.06.23.tar.gz 1181117 BLAKE2B 433280b7f6994bed0b86ffc4135a1e91bd9521c508b875332d17dc041da6b77a4260de784b6b75e79aab072d6bc68108a8b6b4949d674670f1d13ed1abe90d7e SHA512 4519801c30cd87436704023090ce39299573b02637a86b0d5c6ac0f4e99b4bddc6724b2b660edfd29d33a908b67268409a8c47dab7b5d59958a5abd52d5610bf
+EBUILD EmptyEpsilon-2021.06.23.ebuild 1957 BLAKE2B 9c88c669ee835bbf244392a85c334cac0cb9470605af2f196f9141476ebc6f7ca918a51025206b5b9bac3ee3ff93bb1e7250e1911bda3ccc213f1849fa6a17ee SHA512 bad61aca9a503fb24c47fdcdf7ce008e2c6ba6f92de4c8546dd1218e4991a365bf617db3f2bab9a0ebf366a8ef263cc91c7073705da9283c236701e8ce378de3
+MISC metadata.xml 246 BLAKE2B e270b04a529da44d267eaf5bfd160569fc99a3521dfc6495e0a4db19c98e5b9badf77774cc80c7be905f3e97b1c75784bc7b4cb6bfe659d726a47c7ae70e7bfb SHA512 7e2151bbca24beeefd585e18d6c1108442b2d9197679876bb180da3d4896602e83ea701432ff67fc61cccfa9bf642a01a62d87bacf32c55e0a54336c7c5a2c53
diff --git a/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Make-CMake-call-find_package-glm.patch b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Make-CMake-call-find_package-glm.patch
new file mode 100644
index 000000000000..da52f0267f77
--- /dev/null
+++ b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Make-CMake-call-find_package-glm.patch
@@ -0,0 +1,35 @@
+From 7efb73d1a964f04646dba692323c1affcb25d16e Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flow@gentoo.org>
+Date: Fri, 8 Oct 2021 11:07:20 +0200
+Subject: [PATCH] Make CMake call find_package(glm)
+
+---
+ CMakeLists.txt | 12 +-----------
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6fb5c88f6614..9d65d1ef2653 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -106,17 +106,7 @@ if(WITH_DISCORD)
+ endif()
+ 
+ # GLM
+-set(GLM_BASE_PATH "${EXTERNALS_DIR}")
+-
+-if(NOT EXISTS "${GLM_BASE_PATH}/glm/CMakeLists.txt")
+-  set(GLM_ZIP "${DOWNLOADS_DIR}/glm.zip")
+-  file(DOWNLOAD "https://github.com/g-truc/glm/releases/download/0.9.9.8/glm-0.9.9.8.zip" "${GLM_ZIP}" TIMEOUT 60 TLS_VERIFY ON)
+-
+-  file(MAKE_DIRECTORY "${GLM_BASE_PATH}/glm")
+-  execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf "${GLM_ZIP}" WORKING_DIRECTORY "${GLM_BASE_PATH}")
+-endif()
+-
+-add_subdirectory("${GLM_BASE_PATH}/glm" "${PROJECT_BINARY_DIR}/glm" EXCLUDE_FROM_ALL)
++find_package(glm)
+ 
+ set(SOURCES
+     src/main.cpp
+-- 
+2.32.0
+
diff --git a/games-simulation/EmptyEpsilon/files/SeriousProton-Unbundle-json11.patch b/games-simulation/EmptyEpsilon/files/SeriousProton-Unbundle-json11.patch
new file mode 100644
index 000000000000..deb44e9aee00
--- /dev/null
+++ b/games-simulation/EmptyEpsilon/files/SeriousProton-Unbundle-json11.patch
@@ -0,0 +1,27 @@
+From ae5ea143e6a9f57c797a96b9024c8acc60f05828 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@gentoo.org>
+Date: Fri, 8 Oct 2021 13:26:27 +0200
+Subject: [PATCH] Unbundle json11
+
+---
+ CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4b57a4f6631a..0a06c3186ff5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -86,10 +86,6 @@ add_subdirectory(src/lua)
+ add_subdirectory(src/GL)
+ add_subdirectory(src/libopus)
+ 
+-if(SERIOUSPROTON_WITH_JSON)
+-    add_subdirectory(src/json11)
+-endif()
+-
+ #---------------------------------File lists-----------------------------------
+ set(source_files #All SeriousProton's objects to compile
+     src/clipboard.cpp
+-- 
+2.32.0
+
diff --git a/games-simulation/EmptyEpsilon/metadata.xml b/games-simulation/EmptyEpsilon/metadata.xml
new file mode 100644
index 000000000000..87a759d410cf
--- /dev/null
+++ b/games-simulation/EmptyEpsilon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 75c895d58e4f..56b2e2ee24f9 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/corsix-th/Manifest b/games-simulation/corsix-th/Manifest
index 23268ef749d2..808ea87a15d1 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -2,5 +2,5 @@ AUX corsix-th-0.64-cmake_lua_detection.patch 288 BLAKE2B 90673498871c16f48c752c5
 DIST corsix-th-0.64.tar.gz 4062048 BLAKE2B 2b807a5c712a19cac80bae613065dd8c9e1219573a3c288c1433b6fa857c3a93632e9c51ba126a70626b4044d469ca1ebc815257f291fa9f86ea94491aae35fe SHA512 c02d07ae4fb9a1ce008f32c4b9ea12a949316feddca4e2a29e860e0d88efdfa0440d372b00b9d3eda5e5c3ca739085510ebe8650790d06a7e91255b7d0990e6c
 DIST corsix-th-0.65.1.tar.gz 4163922 BLAKE2B c1d9255e41521876716b377579642ed46b9fc54823816dc431f7b56ffa532af7091ae0b1e291bb1c4fb74165ca07786e0991a990c90bc3a13e234ba31c6fa706 SHA512 b7e964c22517b94cb1dafb0529368c87a2e58cf1f784062b9f2f72749ba69523b63d4f846ebd582c71cf5ca7e7c437a34717ca3877ad3737139ba2fd6a316577
 EBUILD corsix-th-0.64-r100.ebuild 1952 BLAKE2B 02649e3c0f2de55cb02e036e330080f36aa07dd4e170ac18ea391adbaf041e3cac9d02abee22541442ec5c4dc0649f881b558c18f4af4f488b4525a823682486 SHA512 8e0708ae6c2fc61a59c3951a556e9ce38ae24c24903cc282e4712f47f5f44892e34c02ff52134be5136c6e5809cfc0bd9796ae550826bdda69ae683f7480d22f
-EBUILD corsix-th-0.65.1.ebuild 1923 BLAKE2B a7a1da03327d47ae76baca6f6db3d31595d4797209e9fcd63456e391071bf6ce930ac5b920addc0110825345cd24415133f5cb4bc33a82644ef648d0037bb834 SHA512 a16e7f70f62a92ffcca948d6c6c74a33b2d8e3b8b3cd38de95daf378dccb16852e8012a2a607f9eef9ca94cd00ec4f60f3607b8b63c691118eaec52d447beba6
+EBUILD corsix-th-0.65.1.ebuild 1930 BLAKE2B 03c8ea8fe8c05ce95ac543412c70e2d63ceb1bfebd3369f94ff566ea723466f744a485436adf31d270c40172f49a37dff1f1bcc407f3b730e0486cbc1173f39a SHA512 0c901db2b7f5bcfc5c846fea06654d0580357137e06ff27b3140db4b7b41c13303d72361980b0792a29d140cefe4b36600e3a6bac247fc481a38d31961d6983f
 MISC metadata.xml 717 BLAKE2B c32582188f6a89239fbec43977d4d126075de2d599c8496ebf01e0a7d919550739913d0290afb24544cc8ea4ff2177a89bbcdaa14ba5e4654d8a7f7db07be294 SHA512 3b3387491e7c51efcc777675e9b996c5648b8e0f5fc7319345a500e60aad08c2a5ca5a9fc0d46928fc60346151232daaf719e7a5ed5fb8a1bc03c40313652ca5
diff --git a/games-simulation/corsix-th/corsix-th-0.65.1.ebuild b/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
index 96f236c3d3d4..3ac363b27b5e 100644
--- a/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
+++ b/games-simulation/corsix-th/corsix-th-0.65.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc +midi +sound +truetype +videos"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index dc6638f2bf34..f5090c13378a 100644
--- a/games-sports/Manifest.gz
+++ b/games-sports/Manifest.gz
diff --git a/games-sports/dustrac/Manifest b/games-sports/dustrac/Manifest
index 9fa62473815c..3850ea4b31ed 100644
--- a/games-sports/dustrac/Manifest
+++ b/games-sports/dustrac/Manifest
@@ -4,5 +4,5 @@ AUX dustrac-1.13.0-cmake.patch 2506 BLAKE2B 76ed0ef500da88c1ca0e27b157e885585345
 AUX dustrac-1.13.0-gcc10.patch 1266 BLAKE2B d122c6de670e23f18547fcb014ba86f781b186dbf6732dfeba033a039bc1bc3537ab5605540da7a9449e69c7ede80e5458a475e5b23d5322df5998642f1ba1e6 SHA512 53b7cdf27cac11eb7cb4d80ed704034c9ba9973dfe7ad36f3592c2b993cd2092cc4b1656646cbbbac2faca7b8e09888aa86616ad1c98d03cfd6b3b61f6ba09b5
 AUX dustrac-1.13.0-opengl.patch 2922 BLAKE2B a6918529793ae7db347162f0fdd3037e39471d06221cabf4c300762add09b03bd63939975327bcac2783ad4722572ac32f03c4c0251608ef538d00de5f853d62 SHA512 2822a90c6bf5277218451d1e9eff32c18a75d43322180ab15d68f470df80b4645284ff693985d91dc740fb8163f54a51030f5447b1c4f85c6b63145f7401815c
 DIST dustrac-1.13.0.tar.gz 18466297 BLAKE2B 694b879755125f273864f16ebb889d39d1dc690aa0f79e6cc3f8b5e64eec64209f32065dd2c88eb7b82e246837a0217ee284fb529b9e1e3149f2adeb5e54d2d1 SHA512 afb7a361771e5c19ef6ef26dd273a4b5df2b0ae7d7dd8292d2c875ac6a3109d2ff50f37f83006505c68486c50b4f6b371ba1f76cdedbe99652637508d86d7b49
-EBUILD dustrac-1.13.0.ebuild 1707 BLAKE2B 7e6ec56c71aed076b26b28675ed6c78c64bde955935aea2cf59880259c9a32db3b7d8f23763b3709ac5e36c9ae5c68ee5df8cb8b6c63978dee906a3e308ca48b SHA512 94c460bcae6c9508567744ab2bf934433f9347cb7e7bc9e7ef8d20daffa1acb93f0c96109d0b0013475b4d585f89f91e297e199d2c661bec70c9e5c768214019
+EBUILD dustrac-1.13.0.ebuild 1714 BLAKE2B 2b7ce30cb7d21e166e5c377af27a850788057bd1bb8e10ec2ea971ad7beb39d9598d0be440e420add94dbced69ca78bfd55e9c6effaf23f227dc62c5d0dc5c83 SHA512 7f9b766efeed96453313b287c4ae859edf4fd2899e00404d3060ca8dd4919e16348f00eadbf18e6ac85e2fe0e2271689d0768df066458d615094c6c73ec80b3e
 MISC metadata.xml 683 BLAKE2B 27ae8cdc2ef368da49bc78ce7b2b993c16e867fec451fd2c2afdac9d5ff4c19b953457928927fbd2a6c761fb33839cfccdd0481d3c8d305b83a26d57c204044d SHA512 7e4abd1ca306328b09fa59c364cdbf374d0f04fee99afc52253aa7d7b71f1f534bc5c701d3b384a2ff22a1838abadcd71b6d264371e7dc08c40c58d1677816ba
diff --git a/games-sports/dustrac/dustrac-1.13.0.ebuild b/games-sports/dustrac/dustrac-1.13.0.ebuild
index 051ce9898659..93e1bcf4e61a 100644
--- a/games-sports/dustrac/dustrac-1.13.0.ebuild
+++ b/games-sports/dustrac/dustrac-1.13.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/DustRacing2D-${PV}"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index f22309c7c635..3003667a4563 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index e749db4731ec..ae8ab51fd2f8 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -6,7 +6,10 @@ AUX gdm-40.0-meson-allow-building-with-elogind.patch 8801 BLAKE2B 358abc6b4a8152
 AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff78e09cd6f00fe34a8bfdb2499b252a1f15e17d9e4ed315e02260357b57cd31cf8ada5a2705ba1ef4ee0 SHA512 4d2d65741a5bfd1dc686dc986708526161d15ace2d5396bef281a2192d95458a072764483e1422ed1f6eb594fc0caa6baa381371618f907a97f75566209fab7b
 DIST gdm-40.0.tar.xz 800296 BLAKE2B 9c2038758cec09f13c18bd79d431e82a29fb1a2b8ab099498a0b8d920cb93896abceab9157edae8cc15312e03d21eb36b649c2cc8761f9af5fec387c5f28a261 SHA512 b20d02f8a80f6aff8909a69c6c621c20c5aa1b25cfedd68bf95faaaa56d5f7cd5d607d1a7388b97aa06510684f1e9e474248042a00203f496c39930e001bb64c
 DIST gdm-40.1.tar.xz 803488 BLAKE2B a0f5349c15c281b666e2e1eb35b81bd4fe3561d7dfa48e43fab7b6ac5c6f9f187f3907fc88eb169ef5e7951c815dec849f64ff2a2b630742b47521bc5c33f618 SHA512 34e3d905195c9d44f3681fcf8170b67e739cef60fe3987802b7006e5063b9cdf5ca047470d0aebd6e9b47dbbb660040648a647ed8d3186a3099b8c6532c5ded7
+DIST gdm-41.0-patchset.tar.xz 12076 BLAKE2B 900ad267bdbb0c189ba36c215aa4bd18f170efd4df02341b1b6f98bdb09b4bbcfcf795ec5a63b5364f47486767a347f60193168749f10823fa816f9500cd3073 SHA512 6c7940ec9c91d0e28f5e9d728abd49814d4d9c7b964e753436f0ceaa11f6c58a559ac3ef0d2e14bf5410a097abdf72cf16dad191017c9ee5c59e6f68de8f2ca8
+DIST gdm-41.0.tar.xz 806668 BLAKE2B 12bd10ff4c5799683665127e5ff543e07f13cffde1d668213b43d6471812c727cb18e93c3305923019c3f522aa0484779dd861afc7ac939115b5f169657722e8 SHA512 b1dd99beb8339c6cf93f10e0aec1c946c615b4efaf1724392585985fb32cee156a9e44fd3041ab87ab9ba6a6bd6c9a9d0ecf8b40dc9c098b3c7ee47f7a7e9a97
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gdm-40.0-r1.ebuild 5887 BLAKE2B 59186d40fa446dcf0d51d767c9820fe99393746b2445323977f98227e2e7ce6b07e969a2eef2beb788fb87ee219ce1493bce0968a29ff04f1242684b418ac4a4 SHA512 c2c913b76e7f4fed0a7cff852e2e139a2195fbabc0ed56c96477fdb25de4efa8062fe00f0be2bad88601dc47c2ff4570a1d50e58da94b4656d8dfffb50468684
 EBUILD gdm-40.1.ebuild 5845 BLAKE2B ba21b057cc56faa241968f6413dfbac93f5645c5e51fcc337a93c341c2e225b0e1af74129c38091b5abd13434fddf75d40fbce44649d3e938d94b8a0fcfcdd5e SHA512 7b2b52af1cc4e08a13c4611596324f9c4c873b51e04d27a26623147173b28cf9bebc7293f3d82fdaaf636cdc5845ce573eac9a6cdb20fecfe85b51cf890edbf2
+EBUILD gdm-41.0.ebuild 5934 BLAKE2B 48ca9e06ec9f5050561b494bb7baad03fad4714b4eb85cc2d30f7a1851f8669449cfda9eb0ee7d0ffdc6663046c259c2b61b914c58a5ae2eaebfd5b9024a7d40 SHA512 d6d348448103dadc866ce344ef5ed4f56c3286189abfcc929b67415360688c3f9329d42d845f6b60d9ba50bdeafb26d84e50ae97dd6ff4232f76ac48c5476d70
 MISC metadata.xml 760 BLAKE2B ed67837e4caac485dd97f9b2b392c4aa26cb0515a5147a258e197531123f1c92b96900d073e85dca0ffc661aad3efb0d2328434e4554bf3b681ecf3a61eb797a SHA512 40979ee3950ee2cb3c3d67eff9c100f6fb1bc19215daaf4d8e65b8f300f05b71c74e542312780979d7ee31d0234be351496dd2dd7a7ebf3519da2fbb3acbc8dd
diff --git a/gnome-base/gdm/gdm-41.0.ebuild b/gnome-base/gdm/gdm-41.0.ebuild
new file mode 100644
index 000000000000..26502e302869
--- /dev/null
+++ b/gnome-base/gdm/gdm-41.0.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop gnome2 meson pam readme.gentoo-r1 systemd toolchain-funcs udev
+
+DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
+HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
+
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz
+	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
+
+LICENSE="
+	GPL-2+
+	branding? ( CC-BY-SA-4.0 )
+"
+
+SLOT="0"
+
+IUSE="accessibility audit bluetooth-sound branding elogind fprint ipv6 plymouth selinux systemd tcpd test wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="^^ ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# dconf, dbus and g-s-d are needed at install time for dconf update
+# keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring)
+# dbus-run-session used at runtime
+COMMON_DEPEND="
+	virtual/udev
+	>=dev-libs/glib-2.56:2
+	>=x11-libs/gtk+-2.91.1:3
+	>=media-libs/libcanberra-0.4[gtk3]
+	>=sys-apps/accountsservice-0.6.35
+	x11-libs/libxcb
+	sys-apps/keyutils:=
+	selinux? ( sys-libs/libselinux )
+
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-base/xorg-server[-minimal]
+	x11-libs/libXdmcp
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+
+	systemd? ( >=sys-apps/systemd-186:0=[pam] )
+	elogind? ( >=sys-auth/elogind-239.3[pam] )
+
+	plymouth? ( sys-boot/plymouth )
+	audit? ( sys-process/audit )
+
+	sys-libs/pam
+	sys-auth/pambase[elogind?,systemd?]
+
+	>=gnome-base/dconf-0.20
+	>=gnome-base/gnome-settings-daemon-3.1.4
+	gnome-base/gsettings-desktop-schemas
+	sys-apps/dbus
+
+	>=x11-misc/xdg-utils-1.0.2-r3
+
+	>=dev-libs/gobject-introspection-0.9.12:=
+"
+# XXX: These deps are from session and desktop files in data/ directory
+# fprintd is used via dbus by gdm-fingerprint-extension
+RDEPEND="${COMMON_DEPEND}
+	acct-group/gdm
+	acct-user/gdm
+	>=gnome-base/gnome-session-3.6
+	>=gnome-base/gnome-shell-3.1.90
+	x11-apps/xhost
+
+	accessibility? (
+		>=app-accessibility/orca-3.10
+		gnome-extra/mousetweaks
+	)
+	fprint? ( sys-auth/fprintd[pam] )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=gnome-base/dconf-0.20
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( >=dev-libs/check-0.9.4 )
+	app-text/yelp-tools
+"
+
+DOC_CONTENTS="
+	To make GDM start at boot with systemd, run:\n
+	# systemctl enable gdm.service\n
+	\n
+	To make GDM start at boot with OpenRC, edit /etc/conf.d to have
+	DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n
+	# rc-update add xdm
+	\n
+	For passwordless login to unlock your keyring, you need to install
+	sys-auth/pambase with USE=gnome-keyring and set an empty password
+	on your keyring. Use app-crypt/seahorse for that.\n
+	\n
+	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
+	for smartcard support
+"
+
+PATCHES=(
+	"${WORKDIR}"/patches/
+
+	# Gentoo does not have a fingerprint-auth pam stack
+	"${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
+
+	# Add elogind support
+	"${FILESDIR}/${PN}-40.0-meson-allow-building-with-elogind.patch"
+
+	# Support pam_elogind.so in gdm-launch-environment.pam
+	"${FILESDIR}/pam-elogind.patch"
+)
+
+src_prepare() {
+	default
+
+	# Show logo when branding is enabled
+	use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch"
+}
+
+src_configure() {
+	# --with-initial-vt=7 conflicts with plymouth, bug #453392
+	# gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which
+	# saves on memory. However this means if we don't start on VT1, gdm doesn't start up
+	# before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1,
+	# so lets try always having it in VT1 and see if that is an issue for people before
+	# hacking up workarounds for the initial start case.
+	local emesonargs=(
+		--localstatedir /var
+
+		-Ddefault-pam-config=exherbo
+		-Dgdm-xsession=true
+		-Dgroup=gdm
+		$(meson_use ipv6)
+		$(meson_feature audit libaudit)
+		-Dlogind-provider=$(usex systemd systemd elogind)
+		-Dpam-mod-dir=$(getpam_mod_dir)
+		$(meson_feature plymouth)
+		-Drun-dir=/run/gdm
+		$(meson_feature selinux)
+		$(meson_use systemd systemd-journal)
+		$(meson_use tcpd tcp-wrappers)
+		-Dudev-dir=$(get_udevdir)/rules.d
+		-Duser=gdm
+		-Duser-display-server=true
+		$(meson_use wayland wayland-support)
+		-Dxdmcp=enabled
+	)
+
+	if use elogind; then
+		emesonargs+=(
+			-Dinitial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
+			-Dsystemdsystemunitdir=no
+			-Dsystemduserunitdir=no
+		)
+	else
+		emesonargs+=(
+			-Dinitial-vt=1
+			-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+			-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use accessibility ; then
+		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
+	fi
+
+	if ! use bluetooth-sound ; then
+		# Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10
+		# bug #679526
+		insinto /var/lib/gdm/.config/pulse
+		doins "${FILESDIR}"/default.pa
+	fi
+
+	# install XDG_DATA_DIRS gdm changes
+	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
+	doenvd 99xdg-gdm
+
+	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	local d ret
+
+	# bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
+	ret=0
+	ebegin "Fixing "${EROOT}"/var/lib/gdm ownership"
+	chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1
+	for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
+		[[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1
+	done
+	eend ${ret}
+
+	systemd_reenable gdm.service
+	readme.gentoo_print_elog
+}
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index adc148b6677e..1e041d11ec9b 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,6 +1,3 @@
-DIST gnome-applets-3.36.4.tar.xz 8638044 BLAKE2B 1ccf045c568ca2d4280eeeebbaec67b63f9c2f1edd3248ef89ff93ef7d468e6a581f3c678e93ff45662368b9ecd189aa38da2ca91a7b14ed3e7b2bd6aac8971f SHA512 6fd8f891358f02f40c8d6548b1680139f18cbbcd20d773798a998246b6431692ce8550e8652eaff09bde3651a4e5449779a0dc85b897345a22c17be2e386d2c7
 DIST gnome-applets-3.40.0.tar.xz 9390340 BLAKE2B 0d8e76086e444789b7a327623db9b21ef0a51f071b67aa5d99dc3e7988be40ec353ced795aaa1acbbe8d1b303d3878e2a0589214dac10f35ab2e40381ee64978 SHA512 909a1e9ecbe6904537b7408239a17aad265890cf179c4b8929968fa4d8ba6f1ac1f6e98612eb9c54266d3abacaaa7ed0e218f41b081b7539532527a3234fc037
-EBUILD gnome-applets-3.36.4.ebuild 1441 BLAKE2B 67e91aee32ed9150486f1752191491ceb569807cc111a953c88e87af7b6875e64906a1a1e033839422ce2ec033d8673863dc6c01d7d0499f68e41b3d50a7d6a9 SHA512 19f95d6aa983f7ed091ae0715a5198919a3630fef2400b3adb52e8be8fc85096a8a277b6e6265e4b4ac42ce437a898ea0444110ee1e3abd60ea9413cee28b784
-EBUILD gnome-applets-3.40.0-r1.ebuild 1299 BLAKE2B 555cb2edd080416a03731ea682bd3f0dcd71b13546f8a7cd042cd279dfc3503ae04a8552c71cf336361e7f5ba6802490e572310d405046ae89ea8dd40e15982c SHA512 e6891d1f7171f94affe00ab28eed166a7407934949bad70338fee14d190ea6e95674f2cd962280ffab362d296eef7a09fed3e22a4f3242abb1c8e77a9d46d929
-EBUILD gnome-applets-3.40.0.ebuild 1303 BLAKE2B 2edfb5561e7cf8ab3b493b86f13ce210900e22f56e85177690e7afa79202448a500aabaf4b0e0dc4d8a91213c5e4afbe1aa560430249cd96e2fa69045ac8bcf8 SHA512 d34397b78d5f6fbb53221714e8953436d3f8bb832d6e2aaf473b235b473f7b2f2bb1d4a4ca9034aefcfcdfc477aa8250545ab6e4711f315825c1038570882e0d
+EBUILD gnome-applets-3.40.0-r2.ebuild 1262 BLAKE2B 957ed6f2b3ee5a42e4a7e0bf945eefdfc3b474faae5ae5414059444b7b91e03c498e5620a4bc54dc1f8597fed038c73966d0bd265e8994cea59bebf0e6023494 SHA512 3d3c4a091d6134cbdec2f96f710e6327803d1139072779046d75ce400376714ad7a457cbb2ff96e1fee6b107561d21c96efb3e47348e69feec60bd3f4ebbac77
 MISC metadata.xml 328 BLAKE2B 23e54626993373e58fbb0718c51e2b9c4eafcd7a0f2cd3968d05b72bc6a3cebeec386d96ab317cc92a17f08d17f8cb9091d6c47d4e6af49993451dd98b8aa04c SHA512 b4936e6332bbd5de094ec96060c84aa6eecc737260a093dc01da4687f68994a5a622eec0b3fce353abfb851b90c31ce7b0ee93e330d6ae2f4b288ab104655463
diff --git a/gnome-base/gnome-applets/gnome-applets-3.36.4.ebuild b/gnome-base/gnome-applets/gnome-applets-3.36.4.ebuild
deleted file mode 100644
index 91a8bbf9357f..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-3.36.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Applets for the GNOME Flashback Panel"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-applets/"
-
-LICENSE="GPL-2+ FDL-1.1"
-SLOT="0"
-IUSE="ipv6 tracker upower"
-KEYWORDS="~amd64"
-
-# FIXME: automagic wireless-tools
-# TODO: gucharmap could be optional, but no knob
-# TODO: libgweather could be optional, but no knob
-RDEPEND="
-	>=x11-libs/gtk+-3.20.0:3[X]
-	>=dev-libs/glib-2.44.0:2
-	>=gnome-base/gnome-panel-3.24.1
-	>=gnome-base/libgtop-2.11.92:=
-	>=x11-libs/libwnck-3.14.1:3
-	>=x11-libs/libnotify-0.7
-	upower? ( >=sys-power/upower-0.99.8:= )
-	>=x11-themes/adwaita-icon-theme-3.14.0
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/libgweather-3.28.0:2=
-	>=gnome-extra/gucharmap-2.33.0:2.90
-	>=sys-auth/polkit-0.97
-	x11-libs/libX11
-	tracker? ( app-misc/tracker:0/2.0 )
-"
-# app-text/docbook-sgml-utils for jw binary
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-utils
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.0
-	dev-util/itstool
-	sys-devel/gettext
-	x11-base/xorg-proto
-	virtual/pkgconfig
-" # yelp-tools and autoconf-archive for eautoreconf
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_with upower) \
-		--disable-battstat \
-		--disable-cpufreq \
-		$(use_enable tracker tracker-search-bar) \
-		$(use_enable ipv6)
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-3.40.0-r1.ebuild b/gnome-base/gnome-applets/gnome-applets-3.40.0-r1.ebuild
deleted file mode 100644
index 4320fd2e92f1..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-3.40.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2
-
-DESCRIPTION="Applets for the GNOME Flashback Panel"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-applets/"
-
-LICENSE="GPL-2+ FDL-1.1"
-SLOT="0"
-IUSE="tracker"
-KEYWORDS="~amd64"
-
-# FIXME: automagic wireless-tools
-# TODO: gucharmap could be optional, but no knob
-# TODO: libgweather could be optional, but no knob
-RDEPEND="
-	>=x11-libs/gtk+-3.20.0:3[X]
-	>=dev-libs/glib-2.44.0:2
-	>=gnome-base/gnome-panel-3.37.0
-	>=gnome-base/libgtop-2.11.92:=
-	>=x11-libs/libwnck-3.14.1:3
-	>=x11-libs/libnotify-0.7
-	>=x11-themes/adwaita-icon-theme-3.14.0
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/libgweather-3.28.0:2=
-	>=gnome-extra/gucharmap-2.33.0:2.90
-	>=sys-auth/polkit-0.97
-	x11-libs/libX11
-	tracker? ( app-misc/tracker:3 )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-# app-text/docbook-sgml-utils for jw binary
-BDEPEND="
-	app-text/docbook-sgml-utils
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-" # yelp-tools and autoconf-archive for eautoreconf
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-cpufreq \
-		$(use_enable tracker tracker-search-bar)
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-3.40.0-r2.ebuild b/gnome-base/gnome-applets/gnome-applets-3.40.0-r2.ebuild
new file mode 100644
index 000000000000..0f434b492bc0
--- /dev/null
+++ b/gnome-base/gnome-applets/gnome-applets-3.40.0-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2
+
+DESCRIPTION="Applets for the GNOME Flashback Panel"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-applets/"
+
+LICENSE="GPL-2+ FDL-1.1"
+SLOT="0"
+IUSE="tracker"
+KEYWORDS="~amd64"
+
+# FIXME: automagic wireless-tools
+# TODO: gucharmap could be optional, but no knob
+# TODO: libgweather could be optional, but no knob
+RDEPEND="
+	>=x11-libs/gtk+-3.20.0:3[X]
+	>=dev-libs/glib-2.44.0:2
+	>=gnome-base/gnome-panel-3.37.0
+	>=gnome-base/libgtop-2.11.92:=
+	>=x11-libs/libwnck-3.14.1:3
+	>=x11-libs/libnotify-0.7
+	>=sys-power/upower-0.99.8:=
+	>=x11-themes/adwaita-icon-theme-3.14.0
+	>=dev-libs/libxml2-2.5.0:2
+	>=dev-libs/libgweather-40.0:2=
+	>=gnome-extra/gucharmap-2.33.0:2.90
+	>=sys-auth/polkit-0.97
+	x11-libs/libX11
+	tracker? ( app-misc/tracker:3 )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+" # yelp-tools and autoconf-archive for eautoreconf
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--disable-cpufreq \
+		$(use_enable tracker tracker-search-bar)
+}
diff --git a/gnome-base/gnome-applets/gnome-applets-3.40.0.ebuild b/gnome-base/gnome-applets/gnome-applets-3.40.0.ebuild
deleted file mode 100644
index 52182b3d367b..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-3.40.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2
-
-DESCRIPTION="Applets for the GNOME Flashback Panel"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-applets/"
-
-LICENSE="GPL-2+ FDL-1.1"
-SLOT="0"
-IUSE="tracker"
-KEYWORDS="~amd64"
-
-# FIXME: automagic wireless-tools
-# TODO: gucharmap could be optional, but no knob
-# TODO: libgweather could be optional, but no knob
-RDEPEND="
-	>=x11-libs/gtk+-3.20.0:3[X]
-	>=dev-libs/glib-2.44.0:2
-	>=gnome-base/gnome-panel-3.37.0
-	>=gnome-base/libgtop-2.11.92:=
-	>=x11-libs/libwnck-3.14.1:3
-	>=x11-libs/libnotify-0.7
-	>=x11-themes/adwaita-icon-theme-3.14.0
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/libgweather-3.28.0:2=
-	>=gnome-extra/gucharmap-2.33.0:2.90
-	>=sys-auth/polkit-0.97
-	x11-libs/libX11
-	tracker? ( app-misc/tracker:0/2.0 )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-# app-text/docbook-sgml-utils for jw binary
-BDEPEND="
-	app-text/docbook-sgml-utils
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-" # yelp-tools and autoconf-archive for eautoreconf
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-cpufreq \
-		$(use_enable tracker tracker-search-bar)
-}
diff --git a/gnome-base/gnome-flashback/Manifest b/gnome-base/gnome-flashback/Manifest
index 1d7740ec87b7..be1271e83e9a 100644
--- a/gnome-base/gnome-flashback/Manifest
+++ b/gnome-base/gnome-flashback/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-flashback-3.36.4.tar.xz 826568 BLAKE2B 6625b3a2d90649b9476d6340295b3cf8960f76908c23d75fe7b2a886d1a5c6a587bc8cb31ab866a40f2250b67d154a080f27534aaa11e822d901fc1cac0687af SHA512 6c1b910872530a86d6fb477ad55c8c44cbe5ef958073e2c675d95b9b4dbf9aab0d0a3b3cdae2daebbe3dad8a83c53ffe0604e12282864bfdee33402e119eff32
 DIST gnome-flashback-3.40.0.tar.xz 857104 BLAKE2B 41711edc4687682dd48134e452297bef7d0c4db93532bfd4bd49f19f2f01eab7c887b584f412384057e8a2b65a937446a108df0c4cfd811085c161a212e19355 SHA512 b938d12c437926e64567388b1a97350b76883cf91c009c1f57d4963321497ebdf69b094c7d88a86e5bf805930b88ff2637e522ac4f9981a391206a03d23a521e
-EBUILD gnome-flashback-3.36.4.ebuild 2567 BLAKE2B 3d848b1a5e6891450d5768248bdfa4672361fa7a9433445436022ca1e53329c915f5be492bfd319114c7d2ca625beae40de572169a7247bf8ce380ae6974c9f2 SHA512 0f1bd9f57c01938119ee76ff449405b9bdc9ed03432ceb304ddec45ff81cba8deb06d35d86ac5d8e59e749c3415d772b3da96c5f01ca1c15783ff4cffa4c46cb
 EBUILD gnome-flashback-3.40.0.ebuild 2579 BLAKE2B 681757a0a505e44cfe6086c8beb31a816fa2226a6cd7eb39345e7c7ebcaf40749f9fcd5e1763f49cfa7565f3a6b7f7a3a07836a8c72610bb8aca06c8a98f35c8 SHA512 5829c12033c3cdc6af0996cbca083dbe9b12ee8a6be75be6b79bdabf9fbeef6aaae388a30b2af6951ddf97357b2c5ab3c129aaf7b761dd41c679809b9bd33e47
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild
deleted file mode 100644
index b0eb921b5595..000000000000
--- a/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 toolchain-funcs
-
-DESCRIPTION="GNOME Flashback session"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-flashback/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="elogind systemd"
-REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=x11-libs/gdk-pixbuf-2.32.2:2
-	>=x11-libs/gtk+-3.22.0:3[X]
-	>=gnome-base/gnome-desktop-3.12.0:3=
-	>=gnome-base/gnome-panel-3.35.2
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=dev-libs/glib-2.44.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.31.0
-	>=sys-auth/polkit-0.97
-	>=app-i18n/ibus-1.5.2
-	>=sys-power/upower-0.99.0:=
-	>=x11-libs/libXrandr-1.5.0
-	>=x11-libs/libXxf86vm-1.1.4
-	x11-libs/libxcb
-	x11-libs/libX11
-	gnome-base/gdm
-	elogind? ( >=sys-auth/elogind-230 )
-	systemd? ( >=sys-apps/systemd-230:= )
-	net-wireless/gnome-bluetooth
-	x11-libs/libXext
-	>=x11-libs/libXi-1.6.0
-	x11-libs/pango
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	x11-libs/libXfixes
-	media-sound/pulseaudio[glib]
-	sys-libs/pam
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
-	virtual/pkgconfig
-" # autoconf-archive for eautoreconf
-RDEPEND="${RDEPEND}
-	x11-wm/metacity
-	gnome-base/gnome-panel
-	gnome-base/gnome-settings-daemon
-"
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--without-compiz-session
-		$(use_enable systemd systemd-session)
-	)
-
-	# Below elogind DESKTOP_* and SCREENSAVER_* pkg-config calls need to match up with
-	# what upstream has each version (libsystemd replaced with libelogind). Explicit
-	# per-version die to force a manual recheck. Only update the explicit version if the
-	# "PKG_CHECK_MODULES([MENU/SCREENSAVER], ...)" blocks did not change; otherwise adjust
-	# elogind conditional block below accordingly first.
-	if ver_test ${PV} -ne 3.36.4; then
-		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
-	fi
-
-	if use elogind; then
-		local pkgconfig="$(tc-getPKG_CONFIG)"
-		myconf+=(
-			DESKTOP_CFLAGS="$(${pkgconfig} --cflags glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)"
-			DESKTOP_LIBS="$(${pkgconfig} --libs glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)"
-			SCREENSAVER_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)"
-			SCREENSAVER_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)"
-		)
-	fi
-
-	gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 19d5713057e0..70b5fb352188 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-panel-3.36.2.tar.xz 3033016 BLAKE2B faf5b81c07eccca9d78ed56be9e124e8f909bb577739810a059135cd6afc9cd293b5a023a129063c48168029a1f9a2dd6fd9c714f80e0c566f820291dd15217f SHA512 cbd7eaf1778dd3f6751c020540c243b02787feb5781195fd5db008fc66683ea5330d89ab0f2c740020695c4da7856b5678491ec3e711d6ce41e884a0374e937b
 DIST gnome-panel-3.40.0.tar.xz 2924776 BLAKE2B fb7d3b85c0eb7509810b1c3730f27479516b104ded31127c9fb2d2852277e62270b300d238b0e2de944d571c68db9ac2b35ed323ddd709e6a4b669089f09bae2 SHA512 49d8fde009ccf139dcc1412863432e642c11e3c149c6f39ab8f51d8027880654625a997f58efe03234ea2716ad0316f7d5f60fb493e7e6cea366611b975effe6
-EBUILD gnome-panel-3.36.2.ebuild 2053 BLAKE2B bc14c03bd53b0ff8a3c9ffb14795838c9f784797118fb173d86dff3572fbd199050ecd5c4d9f00da867255f057d288e26714f193463ebe8192d7d3b3171760c8 SHA512 8db0499f87613f019eaddea531f90c29ceb6e983ae327d6f120ec9aea8b197efd186943a0192de84c8bde6c7ce3b22c7c3da8a48b21316a1128b7074ec7aeb62
 EBUILD gnome-panel-3.40.0.ebuild 2052 BLAKE2B 702debc8809c746c868ae41d187b648a38227cd3f641c29b3c8cd1e062e86941b761501d7df78cf3d28b95e94468e3d04a8f9b35718f9a76d409d26b2229e5d6 SHA512 a56ce1bf16ad9b70df00ac1626ea4603f7f87c00a9fffbf576ec42ff4bbac3287fcd5ba5150008f40801f2e5c7afda89d42fbb360300c65447bbd8f14c28658e
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild b/gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild
deleted file mode 100644
index c33ffe3fbb7c..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eapi7-ver gnome2 toolchain-funcs
-
-DESCRIPTION="The GNOME Flashback Panel"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-panel/"
-
-LICENSE="GPL-2+ FDL-1.1 LGPL-2.1+"
-SLOT="0"
-IUSE="eds elogind systemd"
-REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=gnome-base/gnome-desktop-2.91.0:3=
-	>=x11-libs/gdk-pixbuf-2.26.0:2
-	>=x11-libs/pango-1.15.4
-	>=dev-libs/glib-2.45.3:2
-	>=x11-libs/gtk+-3.22.0:3[X]
-	>=x11-libs/libwnck-3.4.6:3
-	>=gnome-base/gnome-menus-3.7.90:3
-	eds? ( >=gnome-extra/evolution-data-server-3.33.2:=
-	)
-	elogind? ( >=sys-auth/elogind-230 )
-	systemd? ( >=sys-apps/systemd-230:= )
-	>=x11-libs/cairo-1.0.0[X,glib]
-	>=dev-libs/libgweather-3.28.0:2=
-	>=gnome-base/dconf-0.13.4
-	>=x11-libs/libXrandr-1.3.0
-	gnome-base/gdm
-	x11-libs/libX11
-	x11-libs/libXi
-	sys-auth/polkit
-	x11-libs/libXi
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-" # yelp-tools and autoconf-archive for eautoreconf
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		$(use_enable eds)
-	)
-
-	# Below elogind MENU_* pkg-config calls need to match up with what upstream has
-	# each version (libsystemd replaced with libelogind). Explicit per-version die
-	# to force a manual recheck. Only update the explicit version if the
-	# "PKG_CHECK_MODULES([MENU], ...)" block did not change; otherwise adjust
-	# elogind conditional block below accordingly first.
-	if ver_test ${PV} -ne 3.36.2; then
-		die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
-	fi
-
-	if use elogind; then
-		local pkgconfig="$(tc-getPKG_CONFIG)"
-		myconf+=(
-			MENU_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
-			MENU_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
-		)
-	fi
-
-	gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 17021b6bff9b..2f7dc6b2ea30 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -3,7 +3,10 @@ AUX 40.0-optional-bluetooth.patch 2034 BLAKE2B 9df252dbef229d372bae87ab017d49086
 DIST gnome-shell-40.3.tar.xz 1869724 BLAKE2B b6a663c97f5ad9239e608e16805074f9695f90b110514d202cc799818321d258417ce4e7841fa3256ae664e2bcba12201ac035737720a37f4eb3e84a26418ad9 SHA512 05d47e1b0f8ec27f0ae7564476012f21dcb2ec8e6da61a589b7fe17df1a23035cb6e261805250a410737502b9bdbb25f56432a618de88881d7e15b6432e52770
 DIST gnome-shell-40.4.tar.xz 1870468 BLAKE2B 78b0a749850e5df18beabd25cc35214b2d1f9a254dd095b9e783b2acdc9bac30edd7ffae3e6b15dd14d5b0877e8453c17548298e29b57642353e80ed505e556d SHA512 305d12cc7273f23e4a0c294f532cbf951816fd2de81959bef769048f4d5717e9e1886b64fe17b2f5ef6ee216ea67a6b913293a8903ec5dc5214bd29fbb1d3b32
 DIST gnome-shell-40.5.tar.xz 1871284 BLAKE2B 39c7392541af8a043627fb7aa19b723ee3b36e3d8001a64f34b14a6f23d68d3b160a0abe0f90659c55b99bf898cfdf30d88f62b8e113fc47814a55ef37c58725 SHA512 98bb0321aa9bc9da10ff6262cac802f575e2958600f429d446f3f87ec1ea40c837dd6e2fecae9dab0c2e224d2bf8b434a188ade84d4f480260102dcc80fdc5c9
+DIST gnome-shell-41.0-r1-patchset.tar.xz 46860 BLAKE2B 7c2204855ceb41a455cf4e92af81cb7f8d1eff027c1f70b5171218a6ec880332902f34bc96fcdaefba48daf4dc2e9f8a2486abfefba574aba408dc45ff73d228 SHA512 72c91ba7913f0e64f9babcbea7f438260ae3795b5f82ef9a5158de50d3c54d31d47492df8539663d611dfa3dc4ead640164f5f26d671a18b3946472688926920
+DIST gnome-shell-41.0.tar.xz 1893676 BLAKE2B 500c22a2eafb86a5717794f8da9de49c633c568e917b7116a8ecae0e62a3769a21e0b591d1147d6bed59b8350394e8ff157c184486c4f97e59e0f9dc202492b8 SHA512 2d2a2dd4ecf315776c10949b00f10dbbd77f495542bb7ca8cdb95047998942433c5c4cad818fe729681f888f74038d51c3d5903f1a0861a66147dbf668231824
 EBUILD gnome-shell-40.3.ebuild 6359 BLAKE2B d4f2d72dacd2c4a67eb6ce37ff199ac890e097e807f3a2c921b664f8d76c22c55ae4dc73b9b7461ac38ae818fe034941de3e208fac15a95210b0254dcde95aff SHA512 aba29d2394572b63f55c9e9e694483de3c8a413114ee8d6bd2c1080e9086fea4297f268e572bbccf84c07896ec242397520414c58a67175cd73c0517d8379dc1
 EBUILD gnome-shell-40.4.ebuild 7084 BLAKE2B 7484a611ca7e2ba016ed353a0ea5003b81a5d26e8e174e3cef686fbe69060a3c062756b957b74f84f0b49bc44f5ca43b24400f1e171ab2dd62cb67f561bd2876 SHA512 c98450e8f0bef479ecb147d3371a42f987a250646282eb6dc42a7bf5365ab4b2d9e461c6075c8b74b2ac6b66b1a43f4e20bc8446ffd42d6325870558cf95dd19
 EBUILD gnome-shell-40.5.ebuild 7085 BLAKE2B a6fabc3b6a1e5c97342faf2127c59ca3a9e0bd0c9bfe1f40532caae186ec7db1470b95b92b55340ac15b45a48da244f720a5224e87fb981582c564d21db5bbd8 SHA512 b3176278331c66b1f076c3654ebad9696dad03b2ecd21293aa993840b9beb1bb471c9bd6562658aad4ed0d4989ce2e9aea7fe719f14a5a1882d7096a3e99743f
+EBUILD gnome-shell-41.0-r1.ebuild 7403 BLAKE2B 8c878baddb8d6d3205182a86f1216c961d2d73fb0aafcb1d94a9709fc3c72e649a76f6c7e9b48f5a58d72c466d9dc0ef521abbe051b1a70e0b5ee9c206123ccc SHA512 9ce135c81b4b804a967a5fff54a7d90cd5d04c818196a1b4582bc544b322fc093a3ae6e5e50572679e9a404a110a878f967f4dedc714e5fc90bddb39c146427a
 MISC metadata.xml 1051 BLAKE2B 86f9156deb6546719e6bcd09ad609b2837901743dd390f430521226df6b9e8f54387d2c93411d63d0099261ee0463428fb8854ce2c47463b999827b377807d84 SHA512 f6a3efe242c1726508a56506a7817c3beea3cb17fbe37d2d38403bc6f4f1d11fd366b68b5c9c6ce44f200a21d48da6ccfcf07c9758369481376b5882ea872129
diff --git a/gnome-base/gnome-shell/gnome-shell-41.0-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-41.0-r1.ebuild
new file mode 100644
index 000000000000..23f7b697c685
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-41.0-r1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+	>=gnome-extra/evolution-data-server-3.33.1:=
+	>=app-crypt/gcr-3.7.5[introspection]
+	>=dev-libs/glib-2.68:2
+	>=dev-libs/gobject-introspection-1.49.1:=
+	>=dev-libs/gjs-1.69.2
+	>=x11-libs/gtk+-3.15.0:3[introspection]
+	>=x11-wm/mutter-41.0:0/9[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=gnome-base/gsettings-desktop-schemas-41_alpha[introspection]
+	>=x11-libs/startup-notification-0.11
+	>=app-i18n/ibus-1.5.19
+	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+	>=media-libs/gstreamer-0.11.92:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-video/pipewire-0.3.0:0/0.3
+	networkmanager? (
+		>=net-misc/networkmanager-1.10.4:=[introspection]
+		net-libs/libnma[introspection]
+		>=app-crypt/libsecret-0.18
+		dev-libs/dbus-glib )
+	systemd? ( >=sys-apps/systemd-242
+		>=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+	elogind? ( >=sys-auth/elogind-237 )
+
+	app-arch/gnome-autoar
+	dev-libs/json-glib
+
+	>=app-accessibility/at-spi2-atk-2.5.3
+	x11-libs/gdk-pixbuf:2[introspection]
+	dev-libs/libxml2:2
+	x11-libs/libX11
+
+	>=media-sound/pulseaudio-2[glib]
+	>=dev-libs/atk-2[introspection]
+	dev-libs/libical:=
+	>=x11-libs/libXfixes-5.0
+
+	gui-libs/gtk:4[introspection]
+
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	media-libs/mesa[X(+)]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated from inspection of the output of:
+#  for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
+# or
+#  rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
+# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
+# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
+# Each block:
+# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
+# 3. Control shell settings
+# 4. xdg-utils needed for xdg-open, used by extension tool
+# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
+# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
+# 7. IBus is needed for nls integration
+# 8. Optional telepathy chat integration
+# 9. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
+# 10. xdg-desktop-portal-gtk for various integration, e.g. #764632
+# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+RDEPEND="${DEPEND}
+	>=sys-apps/accountsservice-0.6.14[introspection]
+	app-accessibility/at-spi2-core:2[introspection]
+	app-misc/geoclue[introspection]
+	media-libs/graphene[introspection]
+	>=dev-libs/libgweather-3.26:2[introspection]
+	x11-libs/pango[introspection]
+	net-libs/libsoup:2.4[introspection]
+	>=sys-power/upower-0.99:=[introspection]
+	gnome-base/librsvg:2[introspection]
+
+	>=gnome-base/gnome-session-2.91.91
+	>=gnome-base/gnome-settings-daemon-3.8.3
+
+	x11-misc/xdg-utils
+
+	>=x11-themes/adwaita-icon-theme-3.26
+
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
+	telepathy? (
+		>=net-im/telepathy-logger-0.2.4[introspection]
+		>=net-libs/telepathy-glib-0.19[introspection] )
+	media-fonts/cantarell
+
+	sys-apps/xdg-desktop-portal-gtk
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+	>=gnome-base/gdm-3.5[introspection(+)]
+	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
+	browser-extension? ( gnome-extra/chrome-gnome-shell )
+"
+BDEPEND="
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.45.3
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.17
+		app-text/docbook-xml-dtd:4.5 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
+# dev-lang/sassc
+# app-text/asciidoc
+
+PATCHES=(
+	"${WORKDIR}"/patches/
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	"${FILESDIR}"/40.0-optional-bluetooth.patch
+	# Change favorites defaults, bug #479918
+	"${FILESDIR}"/40.0-defaults.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# Hack in correct python shebang
+	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth)
+		-Dextensions_tool=true
+		-Dextensions_app=true
+		$(meson_use gtk-doc gtk_doc)
+		-Dman=true
+		$(meson_use test tests)
+		$(meson_use networkmanager)
+		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
+		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
+		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
+		-Dsoup2=true # libslot SLOT needs to match with what libgweather is using
+	)
+	meson_src_configure
+}
+
+src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version "media-libs/mesa[llvm]"; then
+		elog "llvmpipe is used as fallback when no 3D acceleration"
+		elog "is available. You will need to enable llvm USE for"
+		elog "media-libs/mesa if you do not have hardware 3D setup."
+	fi
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=563084
+	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
+	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
+		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
+		ewarn "otherwise Gnome will fail to start"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 6fb3451cd2b8..385739b8c806 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,6 +1,8 @@
 AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705
 DIST gsettings-desktop-schemas-3.38.0.tar.xz 685868 BLAKE2B a5fe8baf6d7178cfba74c82974dfb854fbc2accfb9c98db2edbf46271b54626150a570fb3b578cdd86acfd1b21b432da0947e273c3ab94ec3f416c4a51b44e4a SHA512 5af7da90b8e7eec1c98e9e44653955f2882961dd9b5e2bf00e4eeb9f4f1149ae5171c600d457c6ab9c7482471c1a0e98f92f645a7ee7298e1b843c608f660756
 DIST gsettings-desktop-schemas-40.0.tar.xz 700672 BLAKE2B 5cc19d23e31a8ca7bd2344fa9392f11588b84c2641a6c0c2f184e733248d22c5603978408ccb13e58efac241beac8780c4a4f8c527b59fa3646cc18a18b09b90 SHA512 6b7f9b3095706b287254bd21d54311d6048e87340462e75848f05f7d7ded09da766cec7159fb6d889405ecfb4fdfe2243197989afeb21678fe4048783ae16424
+DIST gsettings-desktop-schemas-41.0.tar.xz 705240 BLAKE2B 2f2eb797fbdb7317666839a4ddffd65405ddcca80724a480bd1decfc164acc4c0db193ca6a3e3bcd71fbeb479fe51c5262c0bcf40fe85cfb2d6bda5b47d5b6e5 SHA512 58f9f60d818f0ddce20ad70e6ca64d3e1fb5a5dfd45b737cc055901f7dd5f1625902451e765a26969bdd72e3b37300dacbd3555a4bc3f33c6667dbf9b1869739
 EBUILD gsettings-desktop-schemas-3.38.0.ebuild 971 BLAKE2B 6e54977b6256f9972a4cbe8e32bd2bf89e3a4b0e1efa8f9481fa8efc05d8a3acdc95118069b3bacb5c405e0c8caa3556c552e2eefad28bd491d3b6667f8d9e3a SHA512 3bb0df1caabe286e4d568288e72a0bfc3d73900ec4a1e50a815e8a174affa0c5fed003905bceabff6500ac5e844c878fe6fed34b5a34bcf0d21a632070e6f294
 EBUILD gsettings-desktop-schemas-40.0.ebuild 1121 BLAKE2B 24f96c7803adb937027c34502db58081fdd0edcca38f6a64efc64c77c7d3d43d106621ba7efaf7e86baf4b8608f28d9848b26c01da4ad6329c0b1e5601359da5 SHA512 d6a51c91e2bbc5a8504776bcc2cf4619cb8ece2fccf32c0b7efdc9fc0e2954f4c39aca41fb01eec50c308fde6bd29ed99cc20480df980157bf400d67357017a9
+EBUILD gsettings-desktop-schemas-41.0.ebuild 1128 BLAKE2B 731fa20624c8a488cc5bee85c255d5874b2c21962db01e17498fbfd1854562724dc0dbc186680c5a135d72ed2d7dcbe56e2f84065eccdd22245f68208d22a0e4 SHA512 9bda7ba55f31b9940c0da19809583671cce7b58ab094b0541c00bfdd6359a2dd49b8fa0aed71c1ea662a85ee81d29973722f74cb8f3b790011032d8441bd4332
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.0.ebuild
new file mode 100644
index 000000000000..a5545f400e75
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..9})
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+
+BDEPEND="
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	# Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases
+	"${FILESDIR}"/3.32.0-default-fonts.patch
+)
+
+src_prepare() {
+	default
+
+	python_fix_shebang build-aux/meson/post-install.py
+}
+
+src_configure() {
+	meson_src_configure $(meson_use introspection)
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index dc1772620a6b..ef8b12c62537 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index e4d60e7f81e7..87a7e1d42fa3 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,5 +1,5 @@
 DIST cinnamon-screensaver-4.8.1.tar.gz 141996 BLAKE2B 73a61e28210efc58a205357abd7b1ca5efce85c542a14ba0de1688ca3c6c86cc81cf02b7eee7d7a13d015d43b6084a0e5a5a0f417a3be77771ff969381c24726 SHA512 5f165cddf5cd3f079192179f2308e015d7d70ce52f5214a56f8fc4318fdc6d6fc2b522b1c8eca31b4799074e58bd93bdce282d9774d1a552616c9ae1a0b46cae
-DIST cinnamon-screensaver-5.0.6.tar.gz 154189 BLAKE2B b7bb32c3986f662e8ff9ff857ef8c8f2fb1945abbf6af39b6dd9e4f915dfb47be5b177d474a8199e07d31c8394d6fc1dcf3087cf30a9196d85380e195b8ee0ef SHA512 fce753d4805ad8e0e6767238b5b24b741a8e6b974fb0739cbe76105dfcd33621330257cdbfc34d5a33256659f5b2f9ef457cca9351ff6f73802fbffd6c0828b6
+DIST cinnamon-screensaver-5.0.7.tar.gz 154480 BLAKE2B 38b89e2d4729ea2806903e9bd27024b274248325720d233485ab756477625bc07832582bbe99c599b7a7d4dbcf76d22b59df179ac8617a81b584b9f5684cb6d2 SHA512 ec5990e1f73983e96eb07f0d4d1a66076d067df28d56c68cce987dc7fce35871650273d2d4a64058d73c7daff2326722e3c1a2fd86afc761d81d1a6b2e7f9370
 EBUILD cinnamon-screensaver-4.8.1.ebuild 1627 BLAKE2B 7c70e371cda0b6de480e1f16ca781dd4b0df12ee6662e0b7ff59cd3aeba7ba225ebbd66c68ef3f12423ae5443dec4a565ccf989dfb1f6d66f97effb5c33d6de3 SHA512 974d19a75d0040350abb5584ec3a3d7cf28887d9711aaa8d5022b4acea68ec72a848633f353054fe34f2b32dccb8a27cdf93446e17cf8ce5c4497ae0a27d0a32
-EBUILD cinnamon-screensaver-5.0.6.ebuild 1637 BLAKE2B 51c491398aa684ce26e9c23bfc355016d7091f34a5525bc60cc0ec02a3fa5f0c3214649d8dd8ab65457504c0447a59f0e9fff5d49a9389457d66f432ea333da7 SHA512 fc0abc121eacd96015d922b64ddf1d0985783035d888519b6a76d730ceddbbb01d1ba1261db2bdd6c33d635f4f56d54c8234ac6c4137cab611cf2f809c2dafc7
+EBUILD cinnamon-screensaver-5.0.7.ebuild 1637 BLAKE2B 51c491398aa684ce26e9c23bfc355016d7091f34a5525bc60cc0ec02a3fa5f0c3214649d8dd8ab65457504c0447a59f0e9fff5d49a9389457d66f432ea333da7 SHA512 fc0abc121eacd96015d922b64ddf1d0985783035d888519b6a76d730ceddbbb01d1ba1261db2bdd6c33d635f4f56d54c8234ac6c4137cab611cf2f809c2dafc7
 MISC metadata.xml 500 BLAKE2B 92b85c1d68491b0e4f88203070760f1e8d2b51b3bf9d3615e18a26cdaf6466eadaa700f18f1668a9b214a540fe01639a49a8535cd43435ddba192fef0267ce98 SHA512 35fc95aac49117f0bd643ccd17d2e461ad1cc5dc744256f6cf83f4248c087b33f66eb4352aeae8105983789e7f8ca74727fc48557f462edfba658d411bb536f7
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.6.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.7.ebuild
index c0d4a43f7ae8..c0d4a43f7ae8 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.6.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.7.ebuild
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index a7f45a7fe148..5d06a8cd21c9 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -3,7 +3,7 @@ AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03
 AUX cinnamon-4.8.6-build-fixes.patch 981 BLAKE2B 735028024dfe3b0d280875411d03a2a005efb6344650e2278778621e655818c074c894f0988c1f5974ee73e341f8a4304c9834e205701fb2fe0646fbf9b7c9a4 SHA512 6a9de0e477bec8cdddf302c0878dd213f02047a71cdd6b6090cf8ed6616d185880fa18033c24c13bed6e0e651224ddd9c779320c3f441398d6c36b2741a6bd4d
 AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360
 DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
-DIST cinnamon-5.0.5.tar.gz 2397561 BLAKE2B c7f523bde1b36564155e90735a719de7d6d125dfd41c0559c68aaf02c2a3f963e7b039cabf3b47e88a527aaf333b1ad154cad04497752b3b75370dbd4491a9c4 SHA512 a54437a3b76748612e4ce3c357e94be6911087616d08cab1c20e37e9a97813eea29db2513bbc384489b223375fd02dbdb61a130f87a40fd8f353b7ca46df26eb
+DIST cinnamon-5.0.6.tar.gz 2397950 BLAKE2B e54f8ed02fc36c121d15d30aaed4633f7db30bcf3e0179fb5fa0b9f12b42f0a29b341f531eed7ba19f849c0400ee9887ee59b5218f4558586a360d173798aeea SHA512 3ed835b1c41a34dfd1e2eac7746bfa01fe48359c6c3e8085877a4c18b895ea065efc343a855cbdee3fcbfb63aa40166bbe40fa19154ae1544be675411d49a962
 EBUILD cinnamon-4.8.6.ebuild 5028 BLAKE2B 3afddcd102ded05641665b6b0ba2571119296a4d58aba59bea55824fcbf3e0eef53f84e0a3ed88d168ad4cb06b9169771819d75d46270a01503e0c0aed84ffc2 SHA512 398060a0c4e903a8ebccfc7995ac823f14518fcedf81a1ab771996e7e9314accadb84def76b557d72aaf56c4f43dbd4ca8c09fe1111526f0eb5b8c0c93cca2af
-EBUILD cinnamon-5.0.5.ebuild 5042 BLAKE2B 68b000501ff91f7653413b8e881464d1daeaca7b75547f4bd29bb31a70664c44403cf3153abd39ce22d17b04f8900da22ed138d018ece3d1fcf7960230892646 SHA512 ff516335673112f848b4fd04c4c60d11c9deb705c8bfeca6dd45b9219fca9880ab9b9a590dcb43fdb4b7c11bb6fbc176a233afda4640c18b5848d6f86a4d7d91
+EBUILD cinnamon-5.0.6.ebuild 5042 BLAKE2B 68b000501ff91f7653413b8e881464d1daeaca7b75547f4bd29bb31a70664c44403cf3153abd39ce22d17b04f8900da22ed138d018ece3d1fcf7960230892646 SHA512 ff516335673112f848b4fd04c4c60d11c9deb705c8bfeca6dd45b9219fca9880ab9b9a590dcb43fdb4b7c11bb6fbc176a233afda4640c18b5848d6f86a4d7d91
 MISC metadata.xml 488 BLAKE2B 422b0fe2eb6afbe708925e9fb6fa7f038497b11d51e06165e69e43515a27cf4a77c74a1a10156bbcfd6084704bbfa7f24d4e8a8409970c5d365aa6ba80ab5bd8 SHA512 5952deb426e8adcceb83a9bcaf94bbe96e4f065fbdfd6fa17b08988989f79c3f1de55e58ca13a26a6146b5cef90d8e3853d614d390c7afe0d2494d78ea3df744
diff --git a/gnome-extra/cinnamon/cinnamon-5.0.5.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
index 521a040ceb66..521a040ceb66 100644
--- a/gnome-extra/cinnamon/cinnamon-5.0.5.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 9d3dcb5f44c0..3dde8c01498e 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,6 +1,5 @@
-AUX cjs-5.0.0-fix-test.patch 903 BLAKE2B d559a60ac73aa8ca4c77ef5b96321dc95edf87c6891257220e20814a827db3a1e7e5eafa5d2217867f24cb4e9cbeaf2231de5563695814c9440fb0e59ba1fb98 SHA512 bcd207a060dbcfa9f50bfd609cc8528c8121b029c547a148c90e1a976e6b99936c88ac742cd12595243acf162d4862be9c92479d244dcbf1476d2195e3438d00
 DIST cjs-4.8.2.tar.gz 600711 BLAKE2B d1506e599c05301083479df4145d3177c9cbb057d3ed260e9744994da70fe392eb2cd872dc00b1ef6269efe9442e32e16878ba975f57f1abc35851cb15e7bb97 SHA512 c607198847a3229443bbfa6906b05036295b6d7f95d3b355780b28e69382407a8f6ef5f637f411fbf2ae474c4c7c5f68f64fec6dd7a2e7f944945927f5efac91
-DIST cjs-5.0.0.tar.gz 601928 BLAKE2B b8d4e64472eefe15678fd2ebcd270161b779e5081b1f9fdff61c4410fdef601cff9bc948b423308059aa73de0b960d430711e8741c10511f758b41da8d96892f SHA512 32524de39e17ffc3e70f83188aed5d6bcb39e9ac4d4a1aa980a1f45dfc7970c103868f270775fcd290de0a6c70035b61b04dc575c6bcc1375972aaa0abdd8e59
+DIST cjs-5.0.1.tar.gz 602005 BLAKE2B 7592b5b0be8fed1efc9fe1c7baca081515b8010935e24ba0cb1e30ce78890941f5c3b2384ee3846a02c3ba5a50c6d6ce5df232f02507743cf15ac089e29d7f23 SHA512 a341e8deae33baf51ed21ea0b03484ba459d83be8689f3928acbd286ebe878719cdd6b4c576907b08b117b3c5738a11f95d0e37ae21f94ae6b88631fad5d3375
 EBUILD cjs-4.8.2-r1.ebuild 1500 BLAKE2B 98ddb93f7a2821d36c85711294e7c5980a93e5acbfcb85e664a40cd612c692306c5c49b145c77c264015383671340b53a1a6ad3ef7fb052a2f985ca567539c2e SHA512 a0f6e4494134d72a9f04d291c4d79557c9fee193c3fb07aa757724e6df6bcaef04e43837bad39c2c8e273ae9e9bf158d365b381a82369f707e8f129efd266fa7
-EBUILD cjs-5.0.0-r1.ebuild 1557 BLAKE2B 297b2f1e0899ed36d8457f95147883056ae0be15d63169d2a56b2e4168711657a32c248748c5320b842e90fae448d7a01833d3b37b7cd2bbfd4209966bf2b533 SHA512 13b54829b9092ab8cd5fd7646a080126ce606d823bc9b8fc54242382e296df18730a1797b486ad8900cd5dbd8bb1948e828730e9a7725011d137fee23fec1abd
+EBUILD cjs-5.0.1.ebuild 1502 BLAKE2B 35c813d361cb0a6ab7b008f82a9ea38096e7a379f4edc845f2504a14896012edb8cbed09d046a75c020f0b12029d272390fabd0362796db2ba2582eeed65263c SHA512 364ab7f279c5766e3343cf9cf49e8ef9b9510467b68dab38af842c2eb07003d8fec3a36fa49bd0786f7a121a7b2ca07f342c70de3a016d65a231d7ca9e68767d
 MISC metadata.xml 608 BLAKE2B 7cc55145357fc7b4b46e1a77f19570b60f5dc6207c81efc3b92adf7d5fdb025296d4e6b8b927f193ed7bd0a929274e61c9bdddad2371ca78a497b94fdbe87737 SHA512 672923005e936fd3d08367a8db65318f63217841e6f841623d469c21ce354724f6c2cea853ecca928280b21011d6aa0e133a7830841c9fa44dd8c36402b28066
diff --git a/gnome-extra/cjs/cjs-5.0.0-r1.ebuild b/gnome-extra/cjs/cjs-5.0.0-r1.ebuild
deleted file mode 100644
index 1cd6bfb71f44..000000000000
--- a/gnome-extra/cjs/cjs-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson pax-utils python-any-r1 virtualx
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cjs"
-SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-lang/spidermonkey:78
-	>=dev-libs/glib-2.58.0:2
-	>=dev-libs/gobject-introspection-1.58.3:=
-	>=dev-libs/libffi-3.2.1:0=
-
-	cairo? ( x11-libs/cairo[glib,X] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="
-	${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	test? (
-		sys-apps/dbus
-
-		gtk? ( x11-libs/gtk+:3[introspection] )
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.0-fix-test.patch"
-)
-
-src_prepare() {
-	default
-	python_fix_shebang build
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature cairo)
-		$(meson_feature readline)
-		$(meson_feature sysprof profiler)
-		-Dinstalled_tests=false
-		$(meson_use !test skip_dbus_tests)
-		$(meson_use !test skip_gtk_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	if use examples; then
-		docinto examples
-		dodoc "${S}"/examples/*
-	fi
-
-	# Required for cjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/cjs-console"
-}
diff --git a/gnome-extra/cjs/cjs-5.0.1.ebuild b/gnome-extra/cjs/cjs-5.0.1.ebuild
new file mode 100644
index 000000000000..eb80b3ccf840
--- /dev/null
+++ b/gnome-extra/cjs/cjs-5.0.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson pax-utils python-any-r1 virtualx
+
+DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cjs"
+SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk readline sysprof test"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-lang/spidermonkey:78
+	>=dev-libs/glib-2.58.0:2
+	>=dev-libs/gobject-introspection-1.58.3:=
+	>=dev-libs/libffi-3.2.1:0=
+
+	cairo? ( x11-libs/cairo[glib,X] )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="
+	${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	test? (
+		sys-apps/dbus
+
+		gtk? ( x11-libs/gtk+:3[introspection] )
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	python_fix_shebang build
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature cairo)
+		$(meson_feature readline)
+		$(meson_feature sysprof profiler)
+		-Dinstalled_tests=false
+		$(meson_use !test skip_dbus_tests)
+		$(meson_use !test skip_gtk_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	if use examples; then
+		docinto examples
+		dodoc "${S}"/examples/*
+	fi
+
+	# Required for cjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/cjs-console"
+}
diff --git a/gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch b/gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch
deleted file mode 100644
index 347ca090782d..000000000000
--- a/gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ac2737f524b4d667a7700b8ff077cd603ee21c59 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Thu, 3 Jun 2021 05:21:51 -0400
-Subject: [PATCH] fix failing test checking for version number (#94)
-
----
- installed-tests/js/testSystem.js | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/installed-tests/js/testSystem.js b/installed-tests/js/testSystem.js
-index a4c098c0..8ae8c74a 100644
---- a/installed-tests/js/testSystem.js
-+++ b/installed-tests/js/testSystem.js
-@@ -11,8 +11,8 @@ describe('System.addressOf()', function () {
- 
- describe('System.version', function () {
-     it('gives a plausible number', function () {
--        expect(System.version).not.toBeLessThan(14700);
--        expect(System.version).toBeLessThan(50000);
-+        expect(System.version).not.toBeLessThan(40802);
-+        expect(System.version).toBeLessThan(60000);
-     });
- });
- 
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index f63f0e29f0f1..6907b86cf064 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -2,6 +2,8 @@ AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aa
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.40.3.tar.xz 4625980 BLAKE2B 7b344c1bb279367c9eca136b9f4689f049ba126b9ffd6ba1a1a819c5f86db66bae4082ebab83c8895831e97a4ed4384bb923584146b6081ffbbc24c327d5f3d4 SHA512 ba5db9850d68c23ddc77e53ccb2500f613dcdc5689234b3365edbc97eb6e73c4f15c13df5dee0b2aab1d0af5a22d543c6aeb814c4abfe1dc652b46712c0e2e79
 DIST evolution-data-server-3.40.4.tar.xz 4622640 BLAKE2B 93a4570da53fb34b496cd471e5daff07fa044ed5c230f7de85276ab9aacd0f2e6c6f749a0d63d076fc192e695f68a0c451a7a6573621ff5092cd5ea6a9302ee2 SHA512 664c2d41b6f212e6ddef554767ca651e4179ce861898cb11ed373f30473c2a1a3a47191ae504be7d38beb0e721782564b70f5f519a3184216a02be1bd89678b5
+DIST evolution-data-server-3.42.0.tar.xz 4614616 BLAKE2B 801e1a71c10af4f7c8b2e8478631ed76269170b01bb30dca296da7b151041981e0f45f9a69fe4873f503d0d38b7e6fdf50c6a7006d001af7d16663478a102b6e SHA512 44e4a45ac7779fd5a336aa84b8e23926cc861c1a3d1ca5629a4997a8783415eca1f6bdcef4fa6ed10e5417a64eef31dbe9edbf027954a653f4c22e25c90f16c1
 EBUILD evolution-data-server-3.40.3.ebuild 4237 BLAKE2B 7f3f06fc021957a494ea0667a42df74aa086a1ff6bbd80ca74e0e5b2dd0eb3082581c9a1af99436e4b42b89210ef1b673c4c0ccc243de89ca55b8f546ec11b5c SHA512 d26011bdd56fa5f51254313d820975aaf93c209bd158f3420e71c450f556da0706a0e999c80684ebaed8a32de9096329bd69938335288b43153fcbe535b7dcae
 EBUILD evolution-data-server-3.40.4.ebuild 4328 BLAKE2B 94969988e72439a72bbde14775a3c809bdfef54c3569011594ce43e09f1ef0d4853c6a2b66755381c64240d293328ba0d61a24813016e2f1003f4ae6c6bac271 SHA512 75c27da1f69617516e79ce9ce5dda66002b11a8be6df992774841707dd50787d96a23a4f81bf4cb30e2403b916027fc5cd68d8e8f22977b45f718347426d0197
+EBUILD evolution-data-server-3.42.0.ebuild 4387 BLAKE2B 1f8c25701df8fd5de3a19d62ce7e9c24fd6cb247145c3df9c40f88348f08688c5e060eabcd20780e653b1322eaddfb59ccb162dc47c9e6a79d445af4d6d3987c SHA512 4440e08b1614e8408f1aaa99299feeb44ec3eda9ee0acdbec963fa9ac7270d5c705637bd4d0412a8b727fffabeb1d1db35d73732df6a0d3dd8fb06f8a6f6a36b
 MISC metadata.xml 850 BLAKE2B f3e730c63794d5890e76c1f2c7e388b1d6320fc6ef64fa405365a27e7d3883fd09b9cfd875ef0d774bdd51eae5237fff0fd7bd1e6be81a2e0d9252e0b1263afe SHA512 8657f87116f9ad70c24711f270f7b71a57e48bb4f9a8780900f9f6d3da550d0f7b6ae2da453ff6bb76ffd948935f534fdb4b3545a46b0129fbae68a8d1fcecdb
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.42.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.42.0.ebuild
new file mode 100644
index 000000000000..42b2525574f3
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.42.0.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake db-use flag-o-matic gnome2 systemd vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/63-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
+
+IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
+# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
+# glib-2.70 for build-time optional GPowerProfileMonitor
+gdata_depend=">=dev-libs/libgdata-0.17.7:="
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17:=
+	>=dev-libs/glib-2.70:2
+	>=dev-libs/libical-3.0.8:=[glib,introspection?]
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	>=net-libs/libsoup-2.58:2.4
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	berkdb? ( >=sys-libs/db-4:= )
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.16:3
+		>=media-libs/libcanberra-0.25[gtk3]
+	)
+	oauth? (
+		>=dev-libs/json-glib-1.0.4
+		>=net-libs/webkit-gtk-2.28.0:4
+		${gdata_depend}
+	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.8:=
+		${gdata_depend} )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend)
+		net-libs/libsoup:2.4[vala]
+		dev-libs/libical[vala]
+		oauth? ( dev-libs/libgdata[vala] )
+		gnome-online-accounts? ( dev-libs/libgdata[vala] )
+	)
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gperf
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+# Some tests fail due to missing locales.
+# Also, dbus tests are flaky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+	use vala && vala_src_prepare
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
+
+	# Make CMakeLists versioned vala enabled
+	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+		-e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+		-i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	local google_enable
+	if use oauth || use gnome-online-accounts; then
+		google_enable="ON"
+	else
+		google_enable="OFF"
+	fi
+
+	# phonenumber does not exist in tree
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DWITH_KRB5=$(usex kerberos)
+		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PHONENUMBER=OFF
+		-DENABLE_SMIME=ON
+		-DENABLE_GTK=$(usex gtk)
+		-DENABLE_CANBERRA=$(usex gtk)
+		-DENABLE_OAUTH2=$(usex oauth)
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_GOA=$(usex gnome-online-accounts)
+		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+		# ENABLE_BACKTRACES requires libdwarf ?
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_GOOGLE=${google_enable}
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_VALA_BINDINGS=$(usex vala)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 1927c7cc3f03..1bace50c4bde 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,7 @@
 DIST evolution-ews-3.40.3.tar.xz 673800 BLAKE2B 4d8cbce33552a40551db08f25bb784ec1b54df0672bab95cd278de6a761a0ed05d5d21754107043fcfde1b533edfbce6a25b2d7fc3c6e885bc7618efd8c89763 SHA512 c35da74f1c52dabf1d3373654a70a7fa005cbc8ebb30a64c3315cffae222221a049918eb9821773020a7178c64caac0b9360ea562eda748b1e26911fcb4fcb90
 DIST evolution-ews-3.40.4.tar.xz 673888 BLAKE2B 532b708795db3ffdff69b44d31c49ff9c4800b527b09d4440b383a16f6ad283cea5ebdfae5cf104e08d8f2166d7269d6810d4ae6ead2c55af7f77633292d7376 SHA512 7f89e8cebf5931bd7d2f636b1780d914f069fb62ac4e14ad0ab2c9759e4553bc5d58a53b65a635c7b5be298fc017f375f9ca4d1c96002804093b9f47107455f2
+DIST evolution-ews-3.42.0.tar.xz 682796 BLAKE2B 6b9fe9d2cae4be586d0cc96188a9e4b10c2fdc3ba0044b19daac70039019f2422416899a7c020c633d473372d424c826aa3a78b5d4b6f0d091364d9db6786ce2 SHA512 62e912827a31b6cf23b572206f27981b255d27cccd252209b1927eb99e39ad6a9a3db7e0c410664c81ff6dfa2156cf0853ea211de3e8fdb4c26db22b19f9ddd9
 EBUILD evolution-ews-3.40.3.ebuild 1406 BLAKE2B 3f9e641161aed979aeb855552dca3675183ca22390d3d1016e280416b227ba571b8af864ef02d5628f757ad33c6f523f50e269e6637958f36f7fe2375c777ffb SHA512 05b7067ab291bb6e126a2cdcaa28309ebc22669bd4a870762df1b292c0d0b34f0263f56fa652702606036c7816ea1ceb98d95d1bb9a41749259510244d594b2b
 EBUILD evolution-ews-3.40.4.ebuild 1407 BLAKE2B 70dfd526bf8f3585dfc751583838b0412627b035574ec88f10de97f083240115c8fa7dda508e13284d40db806fc29ac7c4b803ccacf2abf2578908561fe1d9b6 SHA512 447828c9cdfb56d07339bc6ec977e9903a79fbb2ad8dfd43fe54e5212e866077582d98141e452371e5292702acd24ec69d5cab6a706ae1ae545efb83e5917325
+EBUILD evolution-ews-3.42.0.ebuild 1408 BLAKE2B 1d9a1cada17b2ccddf741b59f1b9171249f7ed899a469c2ab93c4d11c36c21ab9d30a73c811c64ac2432ef1083f7d57be78f6c4fd9b7ec7f9776781f157dcd6f SHA512 d89043f8af284e90ab7692eb25be59413af3f8c36534eddfbd81b021bb22439b8346a17213314c7b881fd33d795e752d29e3656a26dab064c1cd27a86dfd6b42
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.42.0.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.42.0.ebuild
new file mode 100644
index 000000000000..2088827c2022
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.42.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# libical-glib currently (2020-02-29) oddly behind USE=introspection
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.62:2
+	>=dev-libs/libical-3.0.5:0=[introspection(-)]
+	>=dev-libs/json-glib-1.0.4
+	>=dev-libs/libmspack-0.4
+	dev-libs/libxml2:2
+	>=gnome-extra/evolution-data-server-${PV}:0=
+	>=mail-client/evolution-${PV}:2.0
+	>=net-libs/libsoup-2.58:2.4
+	>=x11-libs/gtk+-3.10:3
+"
+DEPEND="${RDEPEND}
+	test? ( net-libs/uhttpmock )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+# Unittests fail to find libevolution-ews.so
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake_src_prepare call, if that works
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_MSPACK=ON
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+}
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 091c2bc4db8f..7cc12f783b1b 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-calendar-40.2.tar.xz 553344 BLAKE2B a144d94d16502ce6d864b66405f07f8115ef9705859d4e54025dfabcb8e99add6d1b25ba84152850378a79db858c4c7eb35b30c8e9ce80cac9384fb4876b0676 SHA512 1697eedfebd72fbd946024998246f7636c724550583ddc04d1c333b0824d38b2a806db0838a9ea5f39b64802c83fcb97cac792aeb4dc344e955e9c811dabd9b7
+DIST gnome-calendar-41.0.tar.xz 576612 BLAKE2B b9544e9402edb25fae5b0598621116ac6c3215b2092675ef48b1b686cceebc43422a54b963ad6639b104833e6c07b58e57d86c5c514b7c025da0374d915a13ac SHA512 ba57af23f967a0900fd64399d9358c2dd131be86120e01d68cd4eee436e8a0bac6f4a3b154ffcfbb2d307ae632cfed7de29f79f843e4692cc1a81a82dadc5e4a
 EBUILD gnome-calendar-40.2.ebuild 1156 BLAKE2B a47dc8bdc46a5ff301f19df1b29b0cd80f197920a5bde87e533062c727b6fef02b6068f5f2621cce7e9ba6296e48e86edb3d3ca3ac9d3227112fae891ac5d267 SHA512 a87ec1383bcdb7a2be0f4e5bb06d6dc341731a6a55ba005cf270eb46f08a81beea2c85641d8df75370d963a4842b5a36b301c663842e0ada22dae72ceca50b31
+EBUILD gnome-calendar-41.0.ebuild 1158 BLAKE2B 37d5212888d98a3896fc2e5cfdf3276be1a6aaa441d4a894e1f94dc6aaed404af07ed7707ac611693707bde532484aed68c25767453273b1d3a73b4b5f691315 SHA512 24c472057fb19b6fd6fb30f8b000df3f3481264ab485ed637de7e9ac28e35ca35a38a2f496c32be1d150967fbe7e078593a6557e5f9a3eba98a0ba9abb16fc30
 MISC metadata.xml 523 BLAKE2B ac729de842a6c4af26151fe8a6325fd880715ef5bdba87af11d3fa8b39673c13a32d9cfcaf8c13c246640bd63af8391eed13d775840a337b4e5cf85acc779df0 SHA512 0e87a27fdbccd8d5b71a2b0c57a0b1af281f8f4c64da1a7d091825d03ed3bc4897995f705bb2210800c549aee7d038742edcb3874db0fabe2be1e918483f91b2
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-41.0.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-41.0.ebuild
new file mode 100644
index 000000000000..ac5e1d4c4c46
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-41.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+DEPEND="
+	>=dev-libs/libical-1.0.1:0=
+	>=gnome-base/gsettings-desktop-schemas-3.21.2
+	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
+	net-libs/libsoup:2.4
+	>=dev-libs/libdazzle-3.33.1
+	>=gui-libs/libhandy-1.0.0:1=
+	>=dev-libs/glib-2.67.5:2
+	>=x11-libs/gtk+-3.22.0:3
+	>=net-libs/gnome-online-accounts-3.2.0:=
+	>=dev-libs/libgweather-40.0:=
+	>=app-misc/geoclue-2.4:2.0
+	>=sci-geosciences/geocode-glib-3.23
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 1eefe1eaece9..e9daf075905c 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-contacts-40.0.tar.xz 270412 BLAKE2B 4d7970ac5417dfbd9b0acf51efd8ce1310cee51f90de8d8afa0239d918269642869e35befb64cbfb5acf1bde17ac738192d5ef802d27df47936165b03ed20b51 SHA512 5f9bb7e805cc67a379fd1ab5945774f5067be64d6577bc9cf0514c4ca6b53937555dc96591244d8be418b2b07f7c5401e8186dca5baff3a2b6c5a2ae459a676f
+DIST gnome-contacts-41.0.tar.xz 275248 BLAKE2B c0611a131ce1ebb74b96e96e2e1b9370526b56c49ee43876273fdf5b2f3b333ad2aad85c50ddcebaac85ee8c996037fec3209c6765cab7b37b49ced04a82a7a8 SHA512 310f333c0863d8e58c2280b994071b2655eee7224ab80a468ffc7acc61834d3f6dbb794bbdc5b8d4428226bab96f3ea65b8bed39df79d88704e38b51a8f4b05f
 EBUILD gnome-contacts-40.0.ebuild 1701 BLAKE2B 3eb51627bb2f6c0553f2826082ac53cd53996f438e0dba18d3519dcb1b7872ad9858e6523015d5ad3ac643b0bacb66f64034dd29ceb430756b9ca4c3fc7b21a3 SHA512 61be9e976af8f3dca5ba758d8617ecdc5260a3c18ce7ddb8aa41f1189dfa64eea5c70a73ca1d9d5b12672dc9b33251dc9235aaede657d6f9e80029289abc723e
+EBUILD gnome-contacts-41.0.ebuild 1703 BLAKE2B fe91ca45d0e6e629eb77f802f880ae0e74bc5a3b5e6c5d2787ad2f18060a1c78ead87143ad0728c3a75b8cca9623f07fe9810edc0a47a74e48e88246f5b04494 SHA512 81747627e73d7da2c7c8c3da6a5ab82def82d67af5adbf5ed9a2a74118e67dc6276291c4d28264e5efb9dac11769de972d710e6b5002fb4e1815dca395d1f0e8
 MISC metadata.xml 326 BLAKE2B 2a56fccc6957b8379b65dafdc5e0893083d0f454785fbd96f3c7695fb16bdbc75db3ece95320549158e227a9e82d84f0ad2144d4ed716647b6433081d36c56d1 SHA512 077fb36f1482d3da1c655d653d693368ba35494429a6c28a64f41f8c37705a5e5a5e49acc3caee6207dd6511cb105d020cc6f17a8b89f8fb4d54a7b26feac1f9
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-41.0.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-41.0.ebuild
new file mode 100644
index 000000000000..7cf6f2b6d3a1
--- /dev/null
+++ b/gnome-extra/gnome-contacts/gnome-contacts-41.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="GNOME contact management application"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="telepathy v4l"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+VALA_DEPEND="
+	$(vala_depend)
+	>=dev-libs/gobject-introspection-1.54
+	dev-libs/folks[vala(+)]
+	net-libs/gnome-online-accounts[vala]
+	gnome-extra/evolution-data-server[gtk,vala]
+	telepathy? ( net-libs/telepathy-glib[vala] )
+	>=gui-libs/libhandy-1.1.0:1[vala]
+"
+# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
+RDEPEND="
+	>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts]
+	>=dev-libs/folks-0.11.4:=[eds,telepathy?]
+	>=dev-libs/glib-2.58:2
+	>=dev-libs/libgee-0.10:0.8
+	>=gnome-base/gnome-desktop-3.0:3=
+	net-libs/gnome-online-accounts:=
+	>=x11-libs/gtk+-3.23.1:3
+	v4l? ( >=media-video/cheese-3.5.91:= )
+	telepathy? ( >=net-libs/telepathy-glib-0.22 )
+	>=gui-libs/libhandy-1.0.0:1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	${VALA_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature v4l cheese)
+		$(meson_use telepathy)
+		-Dmanpage=true
+		-Ddocs=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index ddf09a68cb1a..eceb91de87e7 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -1,6 +1,8 @@
 AUX gnome-shell-extension-bing-wallpaper-34-blur-enable-check.patch 1659 BLAKE2B af3da54697f7b9101fc81f442c5d2d3712866b1da81c56ed24478d21551ca0553d3bf259e54162c04e0a5c2e06cc0c460c23ce0dc47fed493340fb9960fa82b9 SHA512 c5adb0101fb7a834a10316d1bca48a0215cb3cf1c00beb17b9c2c2005c07c9753dbcaa6b4ee5deadae6aa6595b7a3b8cdaef9cd537b2bf236b955b9ac5ef53b2
 DIST gnome-shell-extension-bing-wallpaper-34.tar.gz 4308799 BLAKE2B 5c14895fbb42fb726e1b6d93924eebfd7b93ccea893075bfd698476579962a88f8e0008d7e935304d56caba1db1f8afc8fee3498f63044e4a9da13f568025e84 SHA512 7e1e26b5494a9e66d74c3d1045827445935d1a0ed20b095cb72b3b06b622ae5fda7980313dcddedf25c5ed3b40717a8e322bc80764f502c5eb7fe7155ec84ca7
 DIST gnome-shell-extension-bing-wallpaper-35.tar.gz 6060072 BLAKE2B cc37ccfc193b10d7e9e96bae7684ba4c247fc625876b2ffaedb56f7212bf211a4ebe5b33b6a1d072ddcda0a5be7ce026d1e05549f6d7d40f38b02bc0aa69fdd9 SHA512 65cafd6da9788e705d3a52c4e461fcd199455b2a90e431cf455cf2460f772eef54fcc6be78397f34f34d710f20e3fce1f18cde9312aba56efdb438e47e417958
+DIST gnome-shell-extension-bing-wallpaper-36.tar.gz 6060192 BLAKE2B 0daec2bdc94e25032b8ab04e63a673177edae9fe181ad02bcd9ceee7597d8c3f44187dcdb0bded5477be515dfea3cf81adc08e306a33b8c444e3e2c8295c5fab SHA512 335c1e9f5dd1d93ec60f15eef2d0127be6f0149bb29b98f4751c9ea820fd0b28e119d0d2c9fab4444ace4b8d2a5c0523b06bbbd337093ceafc1421a9d665eaa5
 EBUILD gnome-shell-extension-bing-wallpaper-34.ebuild 1230 BLAKE2B 8b539ff6e099f97b6b0352765338667ccf7cb670d2d95c59e603624fbd85058235a1679429eba59423ab74b38277554c7ada57d1c25e05387c214a5ddf543396 SHA512 0627ac6dda7303c0772b24c687618c34398c60bbc32e7ff06ebee13391b4f159404f3ffb22e1bab477483c68afb47a175b30d50bc8eee83ffbf15ed7fef7fab6
 EBUILD gnome-shell-extension-bing-wallpaper-35.ebuild 1105 BLAKE2B 9d0ed7edea8b098da017ee6d201d59a6353ac8d9ba20c7b2ce7921c62f9e4321976ef016082b7185b4b65be5e149b8d1965df477299c01b957f2ff03afc6165a SHA512 44a4fcc8a00a1a2b4339f2d96ed960b7099b55234f2c6bcf7443042b207324e5b6aace0d6f8fc381f333d14b2de78496e5bac5d6645464be7b937fe5a813db6c
+EBUILD gnome-shell-extension-bing-wallpaper-36.ebuild 1105 BLAKE2B 9d0ed7edea8b098da017ee6d201d59a6353ac8d9ba20c7b2ce7921c62f9e4321976ef016082b7185b4b65be5e149b8d1965df477299c01b957f2ff03afc6165a SHA512 44a4fcc8a00a1a2b4339f2d96ed960b7099b55234f2c6bcf7443042b207324e5b6aace0d6f8fc381f333d14b2de78496e5bac5d6645464be7b937fe5a813db6c
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-36.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-36.ebuild
new file mode 100644
index 000000000000..c31bdf512404
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-36.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+DESCRIPTION="Changes your wallpaper daily to the bing.com background image"
+HOMEPAGE="https://github.com/neffo/bing-wallpaper-gnome-extension"
+SRC_URI="https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.28
+"
+DEPEND=""
+BDEPEND=""
+
+S="${WORKDIR}/bing-wallpaper-gnome-extension-${PV}"
+extension_uuid="BingWallpaper@ineffable-gmail.com"
+
+src_install() {
+	einstalldocs
+	rm -f README.md LICENSE || die
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf schemas
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
+	doins -r *
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 096789ff9ca8..f29a1f4c5052 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-shell-extension-gsconnect-47.tar.gz 737392 BLAKE2B d2f09ae4650c17cf9f5ef90c18beb2ff46c3c077d27e4ea11fdb5f41522cb231aea47b168848c5da2c0ae35fbd1df734fa11f13c38abbde2ccab585137b7e116 SHA512 c1e900b225cda8edbcc1b3a16883b58d09a110b67cb503f3e7e71f8e0abafb565081528958cbd44e5685a1de2d7f54cee88a87a8e35f2344571eab8935b80c91
+DIST gnome-shell-extension-gsconnect-48.tar.gz 795292 BLAKE2B d7885d5a29c2a71d5180baed0da201b921ea9058c284b110becbc84594610f6b5ffd539b598c091113f3ad2e12f9adb486d216d4b37064ef1b6218edc547ec82 SHA512 309e4fdb3f13d4c14f744316f7904aa7c4d5c2c712187625ac1db6de7f1a03fe156754468ba4b982ebed9042006701c3f7eb7114d1e84a7051332edf58c5b21b
 EBUILD gnome-shell-extension-gsconnect-47.ebuild 1613 BLAKE2B edc2b6614b2c3a69f1046b19b8de629b8bd35114cc1950ae2479b71d46d076407c63b96f9239945bda69b25ec6c190313b7d21d44ac5237c841d74adec754fca SHA512 f6485927888161e1ddf82a17941e91947486b96eb80f492bed6928e6771201aaf4985357bb9e22087b8dda402e2f13a72f7f3168eaa1372a48c6da543dcf4441
+EBUILD gnome-shell-extension-gsconnect-48.ebuild 1615 BLAKE2B 67df849a26b7a5551cc90c0f2d83692de52d1917b78652d59091168b9ba156e761a4f325351fa42ba3bfc05ed2837370acfc6c2131cd37342ed5b5265a82770b SHA512 4c59d4c62b9b90a7e20602079df2511a2dfac8601607695bf56a5b3952893468d8ae28a1779777faae9cc0c45aab371fceddeccbba1434c66956dbdf4551732c
 MISC metadata.xml 346 BLAKE2B d1e2c79cae69a58f7af962316046f4620238b88d42e0f211a28ba271633993bae4df79956ab9dde4f4e94e7e77233288657d5b3c1876c9192118a11ee5ee678f SHA512 00b2e45892280f1a042b3ec03d66c3fcc7a2b95f94534d22fb8df936976384bb78433337b339ae023ae9850f2e4c0cfb8b12fae28ae7863d2ebe93a47784a77a
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-48.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-48.ebuild
new file mode 100644
index 000000000000..0a71c76c18eb
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-48.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils meson readme.gentoo-r1 xdg
+
+DESCRIPTION="KDE Connect implementation for Gnome Shell"
+HOMEPAGE="https://github.com/GSConnect/gnome-shell-extension-gsconnect"
+SRC_URI="https://github.com/GSConnect/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nautilus"
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.68
+	=gnome-base/gnome-shell-41*
+	gnome-base/gvfs
+	gnome-extra/evolution-data-server
+	|| ( media-libs/libcanberra media-libs/gsound )
+	nautilus? (
+		dev-python/nautilus-python
+		gnome-base/nautilus[introspection] )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="For knowing more about how to do the setup, please visit:
+https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
+
+src_configure() {
+	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
+	# https://bugs.gentoo.org/694388
+	meson_src_configure \
+		-Dinstalled_tests=false \
+		-Dnemo=false \
+		$(meson_use nautilus)
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_pkg_postinst
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index f99307a2cc18..48ce803eced7 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -2,6 +2,8 @@ AUX 40.3-drive-menu-hide-items.patch 1756 BLAKE2B 9eba68c0d09b066ea3f06a59a15df2
 AUX 40.3-drive-menu-indicator-visibility.patch 1132 BLAKE2B 2b8580182ace34e99fece58e20fc4b01bf08b988592743c7e4c844cc4713cee3df7dfafe8d6ab2bd318d453b039dfeec04511ad81ab1533cd4c8cdae8c6581ec SHA512 fb74eb7796a06e5bbd103d7c0806845364fc35da6b933af287b68efeaec1e5f73699d98f38fca764aab9f44eb23e7e4365dc0f1e1e8514d9d5bbb709a110c478
 DIST gnome-shell-extensions-40.3.tar.xz 218108 BLAKE2B 33174ef4c80caf375d48f11b7678ec78bfbe60a9d4456e21856b09a0a83e99ee7b68598c719a6913a29d9686317015fbc8d8bfae856e433414889e59e82e5ca3 SHA512 3773b0a5ec81b6663a3b2c5f5d1f8e7619fdba49ce67b25ee0f5555d17ea7c9740c3698b7a4e4f7fa78241c8738663c602cb5ed1ff9874b8ad2321fec0dbc737
 DIST gnome-shell-extensions-40.4.tar.xz 218088 BLAKE2B f992c98fa5ceec84c774881468e0c9736d24f1834b9d6976f7cddc2dce455393fad0ad055c1e02b308135914029874c4d87d3a09733a7b4686308e9052cef21a SHA512 79f087c9fbc7764241751441190819b3e768530257ffe3a7b39b1004f8997de9c8ea381338ec0544a39b8cc6866137d315e56f3f058c9b66a9ed566ec40712ef
+DIST gnome-shell-extensions-41.0.tar.xz 219664 BLAKE2B 1d73d9f1255f93740d2effad48420b2992872b89df12e0baaf99c3344c356de5f92f76300c30cac32230c7a97a4a9ce6bb74308078fb6844fa3051f24594eaf7 SHA512 4332821044029020404c0ed5d040b7d5e5548a67447517424a54ed4c586bad3461ab1e25f0dcb37c24ea2a1496d1cbf2b95f24de0eda79f0c6921b6b1f085f83
 EBUILD gnome-shell-extensions-40.3-r1.ebuild 1868 BLAKE2B d2b5894c719e76dcc05fef97ef9115058ee80924c2c35125f97614897658f6b11729721c2f7e0e460f26019791b182b6dea8b702774921ab2b91f39a22e28c94 SHA512 adada7db70e8ef7b36d45c257a1b04ef427f63723d64e3788aa0fa907fbb794a1898b9215ba752c37188a780bbc0bf5b4e21d778be80cd0ea08cf1cbced4eb0c
 EBUILD gnome-shell-extensions-40.4-r1.ebuild 1747 BLAKE2B 228b21c4d8549e3c45db83dadcaaa0dad2269f73ea97762bd5f24f1aabf6f1f8f68963049e58734a316e6ddb21b1eb5ca0f9317d39ca6a6a31c220c3ea1a62d0 SHA512 7ca0d1488294056c3123445ddcd434a8997a03e75ac2e5a84afac8ae2f81e27923546be605c577b994ad2dde523be2a53004ed608c72b3ed1be0a8c1064f83b4
+EBUILD gnome-shell-extensions-41.0.ebuild 1763 BLAKE2B 28cf1f4d8fa43e655954d5e32a72ef7d546b1e1645e8c026430380e0c0553bc2aa439076bf6602b3df0878c005b8c8b3cd2613e7fa49d16a5223baffec443740 SHA512 88dfc426ac303d7fc2da7e4db185219b006a55db9978d4da81403e6425ae1ca11ce206998b6305b3c35bcc7efafbf5b3fb959bc72720aba5cb849801e9561da1
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.0.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.0.ebuild
new file mode 100644
index 000000000000..d9aef6246858
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org readme.gentoo-r1 meson xdg
+
+DESCRIPTION="JavaScript extensions for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.26:2
+	>=gnome-base/libgtop-2.28.3[introspection]
+	>=app-eselect/eselect-gnome-shell-extensions-20111211
+"
+RDEPEND="${DEPEND}
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	dev-libs/atk[introspection]
+	gnome-base/gnome-menus:3[introspection]
+	=gnome-base/gnome-shell-$(ver_cut 1)*
+	media-libs/clutter:1.0[introspection]
+	net-libs/telepathy-glib[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-themes/adwaita-icon-theme
+	>=x11-wm/mutter-3.32[introspection]
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Installed extensions installed are initially disabled by default.
+To change the system default and enable some extensions, you can use
+# eselect gnome-shell-extensions
+
+Alternatively, to enable/disable extensions on a per-user basis,
+you can use the gnome-extensions-app (included with gnome-shell),
+https://extensions.gnome.org/ web interface, or modify the
+org.gnome.shell enabled-extensions gsettings key from the command
+line or a script."
+
+src_configure() {
+	meson_src_configure \
+		-Dextension_set=all \
+		-Dclassic_mode=true
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
index 2ce86e719de1..6bcada01cd6f 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-shell-frippery-40.2.tgz 82612 BLAKE2B 9bb92df42ca3702743d4e5a497d1de610e4909dedf7c96ac74eb374d6d9cbcbb13d9aded266602cab10a73bfbc018dee84fc07e1ec44184c2ad89b60c8880d9b SHA512 d6136dbaf798d87a2c4c3e8a1e09875759a877e77904f3f96843e0d86720213453139a9376aafa4c13a3defb0457f0ed6a659e47afed2f30a244e31266c69dda
-EBUILD gnome-shell-frippery-40.2.ebuild 899 BLAKE2B dd7fe842626638a83d5506b14d932fdd68984a79afd82989f442d1961957aa40a6b3e0e79fe27b8f1451ac6d910ac882ffa96ac3c2d2b99842d0c5f55f38dd51 SHA512 aa13dbcdb7558e727329fbd69e829c2f231863f11f4caffa24fa042e0a531b4c78836d4d06d40e21dfa7809b727ad3b0a379ae1f75a5ce20c98d11e928656913
+DIST gnome-shell-frippery-41.1.tgz 82583 BLAKE2B 74d08c904712d51e53609f50b581cd60ef8fb62af8122ed3101896c8c6bf0c8fa8e69152c51496365011a98a2ed91ee2bb7b49d0ea58d3c231505e0a94c393c6 SHA512 769bb336b4abc2557b451401ac66050b3a6a9b33b9a80643e1e4054dd804b94b13a94ad576706570c1cd1da3c4912841d9fe4d011e834fe22ce7343f7a240a27
+EBUILD gnome-shell-frippery-40.2.ebuild 983 BLAKE2B 889eb440aee336e20f6d260142b5ad38ef6e214a758d965addb8b0b2b2b77d3c0aca3ff0194c0460aa46dd86dba83283278b1cf292dde1d6f60817cc9d763e90 SHA512 22c455b87a28a60e01791116fd0bbed0fb4b8dbd8c3f1f76536e0534aed4b0e579402463737f825b6979b358fa4b95589a081af77b29db41dc811f5a0e9856f2
+EBUILD gnome-shell-frippery-41.1.ebuild 970 BLAKE2B 84c0f9145b7de6119601099428d590f9c57c9840346ad69622b02790c491df98159ba17f5cc77bdc6fceac452f83afacfe6c55fa4d91009f2b9a6031c032fe08 SHA512 5671ecfe88f8a9d2cb0fd77c2bb5d7952bfc5e217993f74f9e296596666d5937f1928394f58360a40027e6d52a8410e27990355437bb320283407113733b7032
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.2.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.2.ebuild
index cb1d739a4bd0..985601cff4bc 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.2.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.2.ebuild
@@ -16,8 +16,10 @@ RDEPEND="
 	app-eselect/eselect-gnome-shell-extensions
 	>=dev-libs/gjs-1.29
 	dev-libs/gobject-introspection:=
+	gui-libs/gtk:4[introspection]
 	gnome-base/gnome-menus:3[introspection]
-	>=gnome-base/gnome-shell-3.38
+	=x11-wm/mutter-$(ver_cut 1)*[introspection]
+	=gnome-base/gnome-shell-$(ver_cut 1)*
 	media-libs/clutter:1.0[introspection]
 	x11-libs/pango[introspection]
 "
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-41.1.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-41.1.ebuild
new file mode 100644
index 000000000000..2fcaa73149ba
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-41.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Unofficial extension pack providing GNOME 2-like features"
+HOMEPAGE="http://frippery.org/extensions/index.html"
+SRC_URI="http://frippery.org/extensions/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	gui-libs/gtk:4[introspection]
+	gnome-base/gnome-menus:3[introspection]
+	|| (
+		=gnome-base/gnome-shell-41*
+		=gnome-base/gnome-shell-40*
+	)
+	media-libs/clutter:1.0[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND=""
+
+S="${WORKDIR}/.local/share/gnome-shell"
+
+src_install() {
+	insinto /usr/share/gnome-shell/extensions
+	doins -r extensions/*@*
+	dodoc gnome-shell-frippery/{CHANGELOG,README}
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 9a55b341c390..5f5606c843e3 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,7 +1,7 @@
 AUX nemo-4.6-captions-fix.patch 1113 BLAKE2B 1b6abccebfcf3719559cdf7c077e71c1b20b53fad0538d15012cbf026933ad1708394d709b39b9109c6f6d880a4bcc54d528b840cfc46f05bb46515796a159c8 SHA512 444f4274af3d332efb0c3764beed5027114415dc5a6a79c644a51b440bd476c876a9efa35e9563a5848750949845d481e99e268a564bfc305d6700d454ce7fbe
 AUX nemo-5.0.3-use-detex.patch 252 BLAKE2B 24c27845065f64a58411a8d719fbc1ca41362001f08d469bc336f55601e49358c02ba3aba423c521a261955a5da9832d8ae2df49f3d372270e63256a45fafcda SHA512 142bd88c7843fa40fb30cab01f8f7dd23b2b5c338eae2ac5971c7e392f9f24a8a820ef4b17b1c4afea729cc85a66cb7ddb06ecd417ff6ad494118fe8d88f1498
 DIST nemo-4.8.4.tar.gz 1464683 BLAKE2B 10945a385defdf1bdc7fac9432306e31476ec015489a5150a5b4f9d5f31977b93da6e92241ce153cd5435c789c7a6ce16d2a86002758f26fc587a33dc5343e63 SHA512 b63ee2bd85f67e7d18271032ac3d95c7446b5110b71a3236f7e8c4ccb31e2baf11912060dde36f12ed4b90491c3bb1215a0de38c419130d692c775031cc0e11e
-DIST nemo-5.0.3.tar.gz 1486979 BLAKE2B 10a08aead870cc4d3b4600478038829bc55c5a3f934ac401e2471d2a5abb085439518eb869e3f35d67c58a669cce968438f4b604e90b48344e275d05b1792177 SHA512 f2f2c01338afe5ac50cc2babff323b2920c347d7b9c4d56bec005e90b517464d59f63ae0c4ce69ceab8689f6e762c20f6bd04ead4879b42c686270b82b2bb8d2
+DIST nemo-5.0.4.tar.gz 1487156 BLAKE2B 4ecafb315673c0939dfb2585e97957ee9d76e9621fbbece2b93d9ed10b24ec86d2c49cdd8d18ac7c8607184752fe2541508a1b626fdce763fdc8ac1b6e713e49 SHA512 e03558d336785d77c1a57d2d100906263d2015330a00d54e2cc0161d9d822740ef5c314062f90a877cee5b031b4b5caf9ebf59f22fb5e15f2e91c75bb239e488
 EBUILD nemo-4.8.4-r1.ebuild 2143 BLAKE2B cb5a7f52f156f396fede37d330153257c3f577fb4f21395d1025e02ec092a8eadd96fb9cb3d1730603f5d0e4490e5a6c81636414cec465b760f0548047b4cf4a SHA512 6ccd7e6d7b9fd97cca59bdb39dced70ac7f38982b58cb1c2818dc67eb099019513f5131f0be0dca8d58784020c94eff580a37d6fbe0bd7ee1d89763d0ba47256
-EBUILD nemo-5.0.3.ebuild 2828 BLAKE2B ebd35692cda1cf3b48213a8705b94cbdf25ff24a56e86b52d091437483c3ef3b2a34b48d314336cba213b62a3b90abb9e28b45b5761430e077fb6fac7c7b84d3 SHA512 5dfede6673d1afdaed30306ddb02329045ad9dc087c59e7f0046ff496f05ae40159027bf8393903a96530a935a2f24b68a44ff3c885da2f07c3ac64bef8f2b00
+EBUILD nemo-5.0.4.ebuild 2828 BLAKE2B ebd35692cda1cf3b48213a8705b94cbdf25ff24a56e86b52d091437483c3ef3b2a34b48d314336cba213b62a3b90abb9e28b45b5761430e077fb6fac7c7b84d3 SHA512 5dfede6673d1afdaed30306ddb02329045ad9dc087c59e7f0046ff496f05ae40159027bf8393903a96530a935a2f24b68a44ff3c885da2f07c3ac64bef8f2b00
 MISC metadata.xml 580 BLAKE2B da0ac9cd13730b5c1727a6d0431f3289af829b77781baf4d3512c78139bca7b9a7d136563de8e2f5abf914520de8a5a092b1e0f2505558e5e61813fa5f9c09ad SHA512 d38cebfe673764a4a96d66a66afe55f6f04c74bf1d06d8fddc319a2eb9ed351b205e3a48c47bfeff7f3da85c89ad0512e11a420f82c228a548fc7553147b927e
diff --git a/gnome-extra/nemo/nemo-5.0.3.ebuild b/gnome-extra/nemo/nemo-5.0.4.ebuild
index c4d2e7c96806..c4d2e7c96806 100644
--- a/gnome-extra/nemo/nemo-5.0.3.ebuild
+++ b/gnome-extra/nemo/nemo-5.0.4.ebuild
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index 635f3c3061d5..02f050914a60 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/simpleagenda/Manifest b/gnustep-apps/simpleagenda/Manifest
index bd003bee43c3..97a8345b5ffb 100644
--- a/gnustep-apps/simpleagenda/Manifest
+++ b/gnustep-apps/simpleagenda/Manifest
@@ -1,3 +1,5 @@
 DIST simpleagenda-0.44.tar.gz 153485 BLAKE2B 94e7e7646e2ad5987d242b12c4c7e66307cf4e85d994e2a63f09853e9d9787ce6f3d5fb43f8fd8e9ccbc3f58b98c3d45c5f59bdbe8991b8aa69794bd9b4afa7f SHA512 11c702844a21bef72e9d7f6d873a1550125fd3eb5d0bcf69c6f2f6a8fd2a654c8e41ef653b8bf53cbd3a6318cddf562c3a7987dad2b0c39d8f87801619ff5183
+DIST simpleagenda-0.46.tar.gz 156586 BLAKE2B a21c2617172911c58993e08130a035a5814a2ea19802e639ed0c5920b61feb9d70aeee5df510e502525be26afa9d02f0c2f2830e6c27e905db3f5b439e6ac990 SHA512 054ff9e68390035d66fde5a6b5ab74fd14ab6fad823fbb8c606930c969aa999360ebcb3cc896c1571e762dc0be3b8e4ef85295e8b2748da4e8e962462397a594
 EBUILD simpleagenda-0.44.ebuild 577 BLAKE2B d440c93b69fda26ca90f4ee724c1f02dd21e851c992aec28cc556b2aaff9db57019137f84bea244d841e80f3ee9420699770512d2dd5d560f5b3c97c1e30a786 SHA512 b6b4e8bfbbfb3215159aed2eedc0a42c07b538188333b649299fb32bd988c1d34dbb23e1051313115234ecd6abe287435636fa466b1acd95359371af6837809a
+EBUILD simpleagenda-0.46.ebuild 580 BLAKE2B cb556c67752c6549dee3ed60382e9e4802a6c86bd79cdac14cfc06e12f59f734ce21aeb00885797fc0fd1d86a0819ec81b695b7246c8e52e2aa073fdc83d1adf SHA512 c9861a11f8fc43c052c01d9c553f631ce1c5027f37f29a9bf675077e95a505d7363d13f5888cbfc76f96bd8c05db61cf344d43b06a167d959b43d4183068c1d3
 MISC metadata.xml 345 BLAKE2B 35646bcc42a98648ee2efa60a9c727f9103e96c9694921f5180b6f7c40ebfef8a1f1935cf20fec083fd3ff526b9cc19c7d90fd8fa8806ebe856181c18e02f235 SHA512 94cc6b6c7b4921cb2345ad710bcca0b4210c8ff823b397e1f1ca2733bb5eee5645dff556551efb96a1e5e9e9b963e6b7a1cffa9e29f695038c50a0e993c1fdfa
diff --git a/gnustep-apps/simpleagenda/simpleagenda-0.46.ebuild b/gnustep-apps/simpleagenda/simpleagenda-0.46.ebuild
new file mode 100644
index 000000000000..99479a8426d4
--- /dev/null
+++ b/gnustep-apps/simpleagenda/simpleagenda-0.46.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnustep-2
+
+DESCRIPTION="a simple calendar and agenda application"
+HOMEPAGE="https://github.com/poroussel/simpleagenda"
+SRC_URI="https://github.com/poroussel/simpleagenda/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbus"
+
+DEPEND=">=dev-libs/libical-0.27
+	>=virtual/gnustep-back-0.20.0
+	dbus? ( gnustep-libs/dbuskit )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	egnustep_env
+	econf $(use_enable dbus dbuskit)
+}
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index db5b76f4f891..54e753f58616 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/swayidle/Manifest b/gui-apps/swayidle/Manifest
index b6dbcee13cb0..0c2ed016f899 100644
--- a/gui-apps/swayidle/Manifest
+++ b/gui-apps/swayidle/Manifest
@@ -1,6 +1,4 @@
-DIST swayidle-1.6.tar.gz 10131 BLAKE2B c0391d288c780c61b72b7a5ac612efc18c359cc7d622faa308e22b1e4359c064bc2824e7cb8fc14143ddde54fc6980bdc5d449d1f16a867b54aef9dfbaa4ff17 SHA512 c82b0d2aee06f87fd71e9e2208e917c0dc7afe80ab0b782c3165127519445021d8cf363292eee99f939165eb813909f2a4ee74153e776557c6d06672de2c1c82
 DIST swayidle-1.7.tar.gz 12458 BLAKE2B 06462d286e4786173d26241056c2b0c71a9253eac31e0b33bd70c5729ff172c3b8ab2c6377c3bc4a6f53cf580adbaac792d90f46da7f944bcc5a4055b642fe5a SHA512 26a48c510caaadb1ad694426e82880ab1547b7b0ef8ac62a2c2ee41c7b8cc0554f4925b0abdc6dc37f2501a171c0b6ae53c56b045b5c545093f3b0463aefcf24
-EBUILD swayidle-1.6.ebuild 1208 BLAKE2B 9904a6e271977f041607b3c9eae2d8697591414e956fe320c158fdbfd24a149dbf06dd84905eae892fa116bb2b434e6780bbe407196e1a51d0ef9d8408e5ee32 SHA512 cf32470d3a57457e54903ce797ef3c3d1dd529efa1831fdbe06f790e39018808e991321fbc72c06a2c39d7e1755cdc0cae6a63879fba8892bacc15dfd61e5af2
-EBUILD swayidle-1.7.ebuild 1200 BLAKE2B 8bcfe23fc751e7f8828f61d5751e286f10e7b2021b75c650005dfb1327e48ba517f01211e6c1f01e4ac0632f400c3ef3c1055d83dae7e33267c000a39e7dd66b SHA512 82e9eb88fdebbdcaa57fbf78a772502203f23a0d182b319427fc96022f01a160cef12390e5e3de5469436478f776df9fd36eb1894ac6953ac77fd8cf0a6631a4
-EBUILD swayidle-9999.ebuild 1203 BLAKE2B d6b2927c46ce1edc2775740dc7e3dfa67980927406ec249e8356a1d1cc3a0955be6b2d275147cc3673e13ca71b135116c176235bc4dfb1c5acf3a1365594efe3 SHA512 ee9c7c81cbcbd6259867490f14ec943d4f60e851b22d583e05d1bc56fe8eaf9763221c159afeb43fab53760d355f2835a1b0360b24e2ff774ef30bd7c42e3526
+EBUILD swayidle-1.7.ebuild 1207 BLAKE2B e8d39b249e4b6333ee3ec3e38f0b71e3a5df39fa905c47cb1f01a58647862280b46773a1dd5ef2f0ab71088af93906a8dfb7d1c584c55e58400880a4c18a7d91 SHA512 686547da179458d1c126765f1d43832a0eb19ceeaa864727d98e26ded0098dd8ed31b90278df3d17a89771d82c0076f4da09ca49e62434c2eab58a687bb2eec3
+EBUILD swayidle-9999.ebuild 1210 BLAKE2B 9540d7e0a422d10c2eab5de2469b505d5d3c9ec3a3bc15e4f2d01692770fcbf964f526289cfdacb0a60a3ac9e252db5ea97e05d9822b404c5686b56e83eb1271 SHA512 5eab61f320978fda892ddac1d41c13a49067ce5de606541920dd5b71b7b4e47cb33316645d0f0cc2e75c7613e31ba4d75792e7b53254164ecbb30d9e6868422e
 MISC metadata.xml 959 BLAKE2B ed555644c99e03baa56ca2c152a6542747e0c473e9b063aeba5fab314161eea758919dff2d9aa635b63d520b7a9843b3d67b547043629619fee37a203e00ae3a SHA512 c5e82c2893b0da74e1994b998d6a8597ed3eb778125069fb416023cef4a1c693c69be6096a0d76d897572905040805863cd34e730ecd818e35e0db8942fd15ce
diff --git a/gui-apps/swayidle/swayidle-1.6.ebuild b/gui-apps/swayidle/swayidle-1.6.ebuild
deleted file mode 100644
index 94194af2e4ae..000000000000
--- a/gui-apps/swayidle/swayidle-1.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Idle management daemon for Wayland"
-HOMEPAGE="https://github.com/swaywm/swayidle"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind +man systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	dev-libs/wayland
-	elogind? ( >=sys-auth/elogind-237[policykit] )
-	systemd? ( >=sys-apps/systemd-237[policykit] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	virtual/pkgconfig
-	man? ( app-text/scdoc )
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		"-Dfish-completions=true"
-		"-Dzsh-completions=true"
-		"-Dbash-completions=true"
-		"-Dwerror=false"
-	)
-
-	if use systemd; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
-	elif use elogind; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
-	else
-		emesonargs+=("-Dlogind=disabled")
-	fi
-
-	meson_src_configure
-}
diff --git a/gui-apps/swayidle/swayidle-1.7.ebuild b/gui-apps/swayidle/swayidle-1.7.ebuild
index d504c8c88d5c..75d3ae4d6448 100644
--- a/gui-apps/swayidle/swayidle-1.7.ebuild
+++ b/gui-apps/swayidle/swayidle-1.7.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/swayidle/swayidle-9999.ebuild b/gui-apps/swayidle/swayidle-9999.ebuild
index f6abc2bf7237..ca9a351efc36 100644
--- a/gui-apps/swayidle/swayidle-9999.ebuild
+++ b/gui-apps/swayidle/swayidle-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/wl-clipboard/Manifest b/gui-apps/wl-clipboard/Manifest
index bbb9648698e3..ec64d1f5f898 100644
--- a/gui-apps/wl-clipboard/Manifest
+++ b/gui-apps/wl-clipboard/Manifest
@@ -1,6 +1,6 @@
 DIST wl-clipboard-1.0.0.tar.gz 25442 BLAKE2B 02e2e99287e1376f26f73a546654e66ddb9d0a85caf457e4a023f0a02cb4d7a9cb3c8ab5840982bf014afb9fc3601722dd4c2fc4239b74a05d309a0a16d20299 SHA512 328c18a9eb2ccfc788e7ab785077ab8d663c75f2ce8f6f434799575fc76ccc89238faf930948bced216d22bee0adfc810af5e84ffc63bc82c4e1d02da4286296
 DIST wl-clipboard-2.0.0.tar.gz 41922 BLAKE2B 6c133f4fc1d70871942cc8ab8ed709a300b9f1370b14869840ed620d866aedc18df8955fcade78affa9317aaee2a1f5c57d04e2e735c94c96049e29e019aadf8 SHA512 a719b7197b0dec247ef50d800d8f10f3c377e41ff6d79ebfb4da50f2581d24a25ff987985e7a8f68842fdf8e706527d0b9ee3545c0044673110963b3ba8b55f1
 EBUILD wl-clipboard-1.0.0.ebuild 527 BLAKE2B d87f1e30fea02987694b1b18f687a2c878de9487503890f0d2af5a49aa2f8f1125c8bf6d111b87bf38f2daabaf300cde98db2e2d23c4c7fc21311a5b9de0c744 SHA512 5f3c2054f621b3509acf97bd54a51941833bb9d56921d9f5699c8cfc0cbb4761c26839b0c773b084b38c65d62818974f31ef8dd3262123796673ccc144623fa0
-EBUILD wl-clipboard-2.0.0.ebuild 544 BLAKE2B 97ba4b53829b3024c35eb923b523b38a52bae362c66f946d1f4c28d132bb0f41b6344ee5e9ebdbb6b66fa9b9a013f6761b77377ae57d251a6319ceb4e5858096 SHA512 7abe84294b5e5512ea89a82433cecf6b9209e0a044a98f111d8cde920f981e357bc32d4b4960bb830f21e0ab8059bf27d787cda618e52b6b761958bf615ae10f
+EBUILD wl-clipboard-2.0.0.ebuild 551 BLAKE2B f00fba838c8eada991437326ff52296887272a9442ffad824bec70d6971baa0bd9bdee44be973ee6731e964b48a86c2efbef04cb5605d44776dbe9a4e80b1d05 SHA512 c234d482300c345becd7969cbfccb8aea9e0b072a7348d48b40e4a08d5c9ffa5e3e1d8c3014ac9aae7c665377a62cc5a8c6a2b660342ae816d8a23b7aa6a2641
 EBUILD wl-clipboard-9999.ebuild 529 BLAKE2B 6c7e2ea8d53f0808cfe26393b509228d500d4e482df59ace44676cb724ed37512bfb6bad615d83d425d92935e887a07d435550fa5c69aadb6cda2395bfb3d614 SHA512 633d31e5ceb47eb82e94928099b4e65fe9fde0b77ed0849952ff5bb5a5262daf5ddafba4787f97b9fa8288a3ac60f709ab1b9b14775f146b129b1fa20fea783f
 MISC metadata.xml 468 BLAKE2B 4831c7406109ae1ccdd7af9cbd780f91cfbf23153de38b8bf3280fed440e90b38724a64b21570dbfd64795109495902999f5a28788aaf7d627264f9c811b9865 SHA512 753d3918a25a5a416758bf37b9c1d5c15961d62a876e67263d3a3c9391dc49cc4bd6cdf4816ca855f5e49d93ad308a319f9fe007e37f3e88480c2ed2a996ed41
diff --git a/gui-apps/wl-clipboard/wl-clipboard-2.0.0.ebuild b/gui-apps/wl-clipboard/wl-clipboard-2.0.0.ebuild
index d73f0f2bcd05..abb7b4591d7e 100644
--- a/gui-apps/wl-clipboard/wl-clipboard-2.0.0.ebuild
+++ b/gui-apps/wl-clipboard/wl-clipboard-2.0.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/bugaevc/${PN}.git"
 else
 	SRC_URI="https://github.com/bugaevc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 8f064ca71761..1696ea557032 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/amtk/Manifest b/gui-libs/amtk/Manifest
index a7d957a4368a..ec285d4b6099 100644
--- a/gui-libs/amtk/Manifest
+++ b/gui-libs/amtk/Manifest
@@ -1,3 +1,3 @@
 DIST amtk-5.2.0.tar.xz 381328 BLAKE2B b97a4b27d33bf49a97d585ecbecad04c3f2ea4e08e378d02218be5bf4aed2fe26f260ed1fd1eaa09a5b9f0e30e49901ddf860087fc630794aaa25ecda353b118 SHA512 520c9e762bdef96907320ec8dd4d3a005f262064ee402527c1087652af91c61657868189be8aedb7c0bd17758cf6d7e976da4ce941eb8a54e2d3e10ce55dc9eb
-EBUILD amtk-5.2.0.ebuild 761 BLAKE2B 76d9cae7926b31dc7788e4042125155251692ca4ca9abf3c8d8b9f1b9bdcabd02cc95e51f7652bb0f6ffdd96c86221cce6843b46e4b89ef2029e6e019292c6e4 SHA512 b82a5173d9f39c2ab2230b06c802ad34f5e894a9b4cb14f9f3e1e12fa06e14d59a1b938446f46ccbdc2437caa45827364f598b6804f907480ff966315521bfd1
+EBUILD amtk-5.2.0.ebuild 761 BLAKE2B dcc2e97b3b1ac478de4e5b031a2d5105900aea8bf01d4502cb0c24c9e068de9b3972eefa4704e6ed93ba32416946e3774855c3c9bf9ba3cc8ea9e3739f6251d6 SHA512 d06255fe7887c6175a9c96e4ecc21b4636467a1cba9815422a4c1fa26b4743003bbc521cb521aa4caff1484a107cd2135d08d5f5507a183232f83ccf3c59c81d
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gui-libs/amtk/amtk-5.2.0.ebuild b/gui-libs/amtk/amtk-5.2.0.ebuild
index 543cc8fbb456..defa4d1a7d28 100644
--- a/gui-libs/amtk/amtk-5.2.0.ebuild
+++ b/gui-libs/amtk/amtk-5.2.0.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
-	>=dev-libs/glib-2.52:2
+	>=dev-libs/glib-2.56:2
 	>=x11-libs/gtk+-3.22:3
 	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 "
diff --git a/gui-libs/egl-wayland/Manifest b/gui-libs/egl-wayland/Manifest
index 08d04af09325..95972ef0473a 100644
--- a/gui-libs/egl-wayland/Manifest
+++ b/gui-libs/egl-wayland/Manifest
@@ -2,6 +2,8 @@ AUX 10_nvidia_wayland.json 115 BLAKE2B b10206c742e8966d1192b9b0604137e6b296d2be7
 AUX egl-wayland-1.1.6-remove-werror.patch 251 BLAKE2B 12a14b185f9b1cb3a42226708642f5b57c2b0eb64d81c96438ee24ac45b950ba588591194648fc8e64e3aa8d2fda9ba2dba63a2f78fc22c00a14d56403bf6839 SHA512 c6c3c4d4f776f44d642d51ab2eed44a0388558b43f2c4c894b6d19bdef40b8a646be43b6b356a3ffa0297e36a48122ef057265db68a8717020abe30906bc8f28
 DIST egl-wayland-1.1.7.tar.gz 48681 BLAKE2B eebbd0e36045c50b39ef70292156f5cd137a51af2169b56a35d318d90ade3d4a5b94206d86246d52fda0c6c093ff25e389b1a3ccbe60595dc9661d199e30f33b SHA512 edc81d9f2c617587044d5f9d35b3e355db8544e8fa1d861c1b92a5a11bc1af7d994ca8abd49ce6f462a1971f20296b4c757bdf1df0d2bfc981cdafaa839f12af
 DIST egl-wayland-1.1.8.tar.gz 53776 BLAKE2B 452f56a54abb2db11e9041b8c21bc0cd57e1583449bcbc7c4fed90c1f7504102598d72d5bf4c1582392f609579bd84cec5b42d078c6b12843f15d56484982c04 SHA512 2308789f68447e8993acca88b86d21787b235de4c457aa66d1b49005ac7b159a07c4d6666b9e1beb490572b06da6b83283cd936e7beed140844955edca6f2338
+DIST egl-wayland-1.1.9.tar.gz 57069 BLAKE2B 64cc1d91c5dab5d070ea23211ffac47a5e5ddde31dfd18bc2a31f24b4cd0b85510752a5d2219e8a919690645426914a1dae325f47dbf46ec0487e0042b392d8f SHA512 3125f4130a5a738f8ecb2acf4d1a7936ca44958a78ade29118222fcd0b5d46f6edf6e18f4e992f541294e08e88c54a8dc231eb2bdcfcd7d56ac543f4e1ed3f8c
 EBUILD egl-wayland-1.1.7-r1.ebuild 1132 BLAKE2B 8e4b03714a6ca4b8b46713becd2aa60863712bceff60078ebbef97d1c5ffcbcc7fd7cb6e1d16f44830310b731fc5d068df9debeaf2f26cd1052f4183f5be6a44 SHA512 01dece299473c23b5f0b4f7982a8fd413a327284bce7254f22d5753878f2d10b2fb6a3bdf3d40f565fabb781cba0a24392befae9056d78ef84331b2d60146522
 EBUILD egl-wayland-1.1.8.ebuild 1010 BLAKE2B eb43d1c7e03ce15c954eecab525226f36c837089eb7028c517da9934ecfbd93300f067255496043eef9ffddb8d7a6e4e8ba0af4e7270bdd16edb22817a8d9499 SHA512 7094d7188399bdd4a8b1d5b43293036fb6db4f7a4fb6331f7615eadebb34e520e75ecf2d19e3ef83d170b6c9a926e827384a662a81428900a0559afb13d41afd
+EBUILD egl-wayland-1.1.9.ebuild 1010 BLAKE2B eb43d1c7e03ce15c954eecab525226f36c837089eb7028c517da9934ecfbd93300f067255496043eef9ffddb8d7a6e4e8ba0af4e7270bdd16edb22817a8d9499 SHA512 7094d7188399bdd4a8b1d5b43293036fb6db4f7a4fb6331f7615eadebb34e520e75ecf2d19e3ef83d170b6c9a926e827384a662a81428900a0559afb13d41afd
 MISC metadata.xml 329 BLAKE2B 9763d8fac09a9b4902a2a5d61f0f109659ad580117b52d7f844785e449623480752356d31507d86be1198b56a6e38fa6a6fa20aa2151421f79f3ce94f98865a5 SHA512 ae3d6edba2229abebf7f87b448a3f1eacd592d28f6ff3bf80e50e14d8718f15e5a67ec8496cdf03f86532f9525638c3dab5020ba9f62d2a9a4495a16a617d4d4
diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.9.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.9.ebuild
new file mode 100644
index 000000000000..5a213c283b8b
--- /dev/null
+++ b/gui-libs/egl-wayland/egl-wayland-1.1.9.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="EGLStream-based Wayland external platform"
+HOMEPAGE="https://github.com/NVIDIA/egl-wayland"
+SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/wayland
+	!<x11-drivers/nvidia-drivers-470.57.02[wayland(-)]"
+DEPEND="
+	${RDEPEND}
+	dev-libs/wayland-protocols
+	gui-libs/eglexternalplatform
+	>=media-libs/libglvnd-1.3.4"
+BDEPEND="dev-util/wayland-scanner"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.6-remove-werror.patch
+)
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/egl/egl_external_platform.d
+	doins "${FILESDIR}"/10_nvidia_wayland.json
+}
+
+pkg_postinst() {
+	if has_version "<x11-drivers/nvidia-drivers-391"; then
+		ewarn "<=nvidia-drivers-390.xx may not work properly with this version of"
+		ewarn "egl-wayland, it is recommended to use nouveau drivers for wayland."
+	fi
+}
diff --git a/gui-libs/tepl/Manifest b/gui-libs/tepl/Manifest
index ebb027b64807..208b11c26f0f 100644
--- a/gui-libs/tepl/Manifest
+++ b/gui-libs/tepl/Manifest
@@ -1,5 +1,5 @@
 DIST tepl-5.0.1.tar.xz 126068 BLAKE2B 2c3038326660f6326c5030cb944f8cee885b794a481f6d8f1b5d87a8ea7121ded381d28b36246a99b57bbea5fd9e6d2d4f65f9dfc54d8154ee8aabbccd7e3cb5 SHA512 f363d182185976447d235cf1201148e5201cdabd1fa8b88d7a763a965896f87bd222a0161c11e93662afaf4e474bbd0308643d28559aadc27b9d48974f4c458d
 DIST tepl-6.00.0.tar.xz 141908 BLAKE2B 200693a8cf760d18e1c53647abb8156f7e067557b4cefbd05b03c5a3ec83c3c5807ab93e0464178b68fc9f2572c3175fbf9355f4131df1fe7f79b5e2deb3961e SHA512 e36877b9f33943715a50546d82ed61e65fc07b71dca2c85ff350a305767e96eda74dc14f30b2a430e14deacd4ee8d49697fe01df1f5023afab3747e5e9c95e2e
-EBUILD tepl-5.0.1-r1.ebuild 927 BLAKE2B 2dfcfb346650914ac2496bd26a9da3c9ec3d5eca68bd2a99ce91e11672c832821bc8fcd9b351824c4d0b5f2a0b96886268fe84b91f35aa713c85f22670464fd9 SHA512 dd545be1bd92fa38a5d1239866ec06b1d4f6f0b4fcfdb4e0c12fa59ff40ad8de94141ad190b41bede8d9ff2ccbe94b562389bbb1f96ad0071e5110e37a96de71
-EBUILD tepl-6.00.0-r1.ebuild 927 BLAKE2B 2f6d76da2ead400eb18263d9538e7f25d05af50e4fcda0e576471801450df27d44bf814fe2405546261a77fa665138dca6c4ded61bde6e6046bf16118d5eb809 SHA512 0a6162b132accd754f822888656e71355c3afcb5b6f610a2bfa28ea57baf2ba79607e65583560a727e2a9ade7fc47db2a21e9f974f08d835d0047a64b5de7133
+EBUILD tepl-5.0.1-r1.ebuild 922 BLAKE2B b431d649b2defdb6acd41d8af4fe94e02d38c6d2291856511a28b8c439c83b74751a1126771177648808b819113aefdc61ec203c3e77203a019c3fa8165c73de SHA512 bee15d76a67153525d425eba788b096dbddbf627b1f2d11cfab02cbd73be22e95efdcdb22d23b2899eb31b9133fb6f9c1103a6a35d492e671a0c6f8028d31bdf
+EBUILD tepl-6.00.0-r1.ebuild 922 BLAKE2B 3a97d0144dcbc2c4ec0da55fe21465d61ce499b9fe3f1c6e3bd68449d26089a857ecfb9c68f1e257c6310b3d67eed0e10f975e0072fd1205a488098dad9a51fa SHA512 461ff841e1c758cbd7e4a6336580db891d37a15f06622dccec250e5cd8629c275ba93d50ea67de53cc0ac2552d38b50ce8bc58ec3faebd5f175dd38795302295
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gui-libs/tepl/tepl-5.0.1-r1.ebuild b/gui-libs/tepl/tepl-5.0.1-r1.ebuild
index fdadce47c51a..d349046587b2 100644
--- a/gui-libs/tepl/tepl-5.0.1-r1.ebuild
+++ b/gui-libs/tepl/tepl-5.0.1-r1.ebuild
@@ -8,26 +8,26 @@ inherit gnome.org meson virtualx
 DESCRIPTION="GtkSourceView-based text editors and IDE helper library"
 HOMEPAGE="https://wiki.gnome.org/Projects/Tepl"
 
-LICENSE="LGPL-2.1+"
+LICENSE="LGPL-3+"
 SLOT="5"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk-doc"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	app-i18n/uchardet
 	>=dev-libs/glib-2.64:2
-	>=dev-libs/gobject-introspection-1.42:=
-	dev-libs/icu:=
-	>=dev-libs/libxml2-2.5:2
-	>=gui-libs/amtk-5.0:5[introspection]
 	>=x11-libs/gtk+-3.22:3[introspection]
 	>=x11-libs/gtksourceview-4.0:4[introspection]
+	>=gui-libs/amtk-5.0:5[introspection]
+	dev-libs/icu:=
+	>=dev-libs/gobject-introspection-1.42:=
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
+	gtk-doc? ( >=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3
+	)
 	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
 "
diff --git a/gui-libs/tepl/tepl-6.00.0-r1.ebuild b/gui-libs/tepl/tepl-6.00.0-r1.ebuild
index 08aea215fb0a..bac8581fb8d2 100644
--- a/gui-libs/tepl/tepl-6.00.0-r1.ebuild
+++ b/gui-libs/tepl/tepl-6.00.0-r1.ebuild
@@ -8,26 +8,26 @@ inherit gnome.org meson virtualx
 DESCRIPTION="GtkSourceView-based text editors and IDE helper library"
 HOMEPAGE="https://wiki.gnome.org/Projects/Tepl"
 
-LICENSE="LGPL-2.1+"
+LICENSE="LGPL-3+"
 SLOT="6"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk-doc"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	app-i18n/uchardet
 	>=dev-libs/glib-2.64:2
-	>=dev-libs/gobject-introspection-1.42:=
-	dev-libs/icu:=
-	>=dev-libs/libxml2-2.5:2
-	>=gui-libs/amtk-5.0:5[introspection]
 	>=x11-libs/gtk+-3.22:3[introspection]
 	>=x11-libs/gtksourceview-4.0:4[introspection]
+	>=gui-libs/amtk-5.0:5[introspection]
+	dev-libs/icu:=
+	>=dev-libs/gobject-introspection-1.42:=
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
+	gtk-doc? ( >=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3
+	)
 	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
 "
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index 6413befe2138..1dad93538243 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -5,5 +5,5 @@ EBUILD wlroots-0.13.0.ebuild 1950 BLAKE2B 680b6a39783806291c950dae086800ead41f33
 EBUILD wlroots-0.14.0-r1.ebuild 1494 BLAKE2B a6279c9bc36a7569a63ca4b4a74c72f8bb223923bf5e7aab6b58136a7dbfe87c0bb17c1ca72518e39a3aaf4b7dbbea20aaba3680ff0e30d1c101a36a0ecb89cc SHA512 cc06ee5e250be6cd332bd2829f86766597006e7769aee64afa6ae4fe5ed78c875f47def60ab3d40c4ce4f84b9406686beb86a8f7c2061aa97c2ce596fe6355ad
 EBUILD wlroots-0.14.0.ebuild 1506 BLAKE2B d67c5855d2fb9ea65a419177f1963153385e681f5ea0912018685782f4106d59fe2fcd9d17699bc291616ec05c1c4fa8d74f55067847ba8d4dab7b920b552d83 SHA512 db4304a09f07cb28fc3ac723e5b4147f0226697b3168ed90e92c32a0d50abeddede51a5ed6f715ec0c6d0eed3b0198def3106bc20529125aa6f69ad7294a8e5d
 EBUILD wlroots-0.14.1.ebuild 1497 BLAKE2B 32863ba14c6cd9ebddaacda70d96d07c4843b4ae61f4c03bbdcf272bbf68c6262567bbcf6db48387f0a537fde62d4c0f2006b2efc9ef67b474c3f44957c7c4c1 SHA512 f46165d4cb9defbc53f2b3f7b607618d3323e7b03e7440864e36a5c24f5f3ee601ebe5b29dc0a22042e555236d367ab85673af814d7fc5df9631f3d271775f30
-EBUILD wlroots-9999.ebuild 1495 BLAKE2B c788c4eec5099909c0a380db0714f4eaede3bd87305a570643f30dbd8128c581c7a90a72fcfce8c5c79abab20a5f628885eec83a9ce8388976a44064c3dcf3ba SHA512 a8a1f081269fbc86070a5bb6b510235d90a61507892570bcb2d340efd922c90bcf7f6bbcd6b46776cdda30bf2626470385c727dac52e8646b18fdebce5153305
+EBUILD wlroots-9999.ebuild 1442 BLAKE2B 596cc38dfb8d31b1a52f63873610a7e391e70763c40b1d87a226ad8a640ef23e49d6498a7924d97fb1ab88655f2c131e104773f0e03598e6f8abdff9e1f55420 SHA512 5a45a11ffd8ba92abf66b64ad0d6cf675c2fa30157b1b49422dbd5b6f9d83695a48b89735b10ecc9452e0736145d4c705775bd6ee145a4daa0794c616dc62949
 MISC metadata.xml 1720 BLAKE2B df45f5bc064958bceb955275e58182747f5a20adad765ea5b517c500159ee1c3827e6d781265a93b54697128f5939581adba8f1f8ecf7a666c4b30452c3a7768 SHA512 8f75b1efd2d7f53624bba068b6c153b2964963a264120b0ad02af1d735dd1ae31f4a800a7e99cd8278e252c95c438607a42cdfa91c5e868eef64f7e77a136b2f
diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index fb102820e420..468d72e78ead 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -24,7 +24,7 @@ IUSE="x11-backend X"
 DEPEND="
 	>=dev-libs/libinput-1.14.0:0=
 	>=dev-libs/wayland-1.19.0
-	>=dev-libs/wayland-protocols-1.22
+	>=dev-libs/wayland-protocols-1.23
 	media-libs/mesa[egl,gles2,gbm]
 	sys-auth/seatd:=
 	virtual/libudev
@@ -43,7 +43,7 @@ RDEPEND="
 	${DEPEND}
 "
 BDEPEND="
-	>=dev-libs/wayland-protocols-1.17
+	>=dev-libs/wayland-protocols-1.23
 	>=dev-util/meson-0.58.1
 	virtual/pkgconfig
 "
@@ -56,7 +56,6 @@ src_configure() {
 		"-Dwerror=false"
 		"-Drenderers=gles2"
 		-Dxwayland=$(usex X enabled disabled)
-		-Dx11-backend=$(usex x11-backend enabled disabled)
 	)
 
 	meson_src_configure
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 155b71cc8d89..c4b2c390f07a 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 3d5629d99135..c3c362b2427e 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,4 +1,4 @@
 DIST sway-1.6.1.tar.gz 5550126 BLAKE2B a4ecc93df0eb16fcd9037ce62dd39c63e1712b3bc9e8ae36331a815759b18576f4a2c1b78a26545922038974f226f02e2d91f78d6e3933125d9b808871b7a887 SHA512 7f37fea99970db42c5485277df06d69bef5225fa03d25be179893b14d73c1d681f0355a1bc74091b4173bbccc88994a63ad0f9322e070811ba963648cf68cdeb
 EBUILD sway-1.6.1-r1.ebuild 2344 BLAKE2B 68447972210cbecf79dbc7fcffdf70296d574c94ca9ccb7270c3f416f41cba7d430c8a0b8655dc52625d3906351c7fa6fe7b3f7ce982d08b04e122f27455707e SHA512 89b0e797a827702c60e4f9c7f81bf283e71803138c4e69230e73bf60979c36b17319475897a48921a80938b54c5dba1106b7674c7dd1a9fd54f263261c97cc76
-EBUILD sway-9999.ebuild 2340 BLAKE2B 57e417902e201901b1b983e3e7ac9e6da4c314cfd43cd676037c689427b88e5e766dce5a75a136230a0bde42e6d1fe2279da2d7cab972b278b1353514f0d3f2a SHA512 a83c7d868f6653d2e15deae9bfc4de6041bb31bfd160e1886572c4d0432956a6e93200d4bf0101b29c8e81178935286943584b4af834ca974ffe9aa7d50d34b0
+EBUILD sway-9999.ebuild 1824 BLAKE2B 1a6c704d1d7f74cf505becb9fee46db0fbe66751756a9de2b7f2d38cc3e66525b830daf55b46796df287e27a4c637490fa65ce29ad008f39c74bc8ae1f900203 SHA512 02a3b36e9ae0bfa0c65e59be0b9aedeb106bc0f0c6b7ab37cfa230e539cb669826603c8141da1574e0201c4cb5295f920b24f8efa320950133b707edf7d492d4
 MISC metadata.xml 2188 BLAKE2B 5e8eb1e6cb3ef8e7398972a8a38556674469008a1531a5c44a35e2eb6c4a43ef01d1fe5f39d560c467b300aa3d9237268ae6a7768beccf4fa268563ac7bdd485 SHA512 a59f659d2b575d7db284dae3fe1c784c0ff2824365d8a96455e5cdc9850d20bf0ae66d3129884b15c8fb8a0fdd88316998a504558fa938c0403e1de64b922783
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index cfaa40e09859..799f71a6a9dc 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -44,8 +44,8 @@ if [[ ${PV} == 9999 ]]; then
 	DEPEND+="~gui-libs/wlroots-9999:=[X=]"
 else
 	DEPEND+="
-		>=gui-libs/wlroots-0.14:=[X=]
-		<gui-libs/wlroots-0.15:=[X=]
+		>=gui-libs/wlroots-0.15:=[X=]
+		<gui-libs/wlroots-0.16:=[X=]
 	"
 fi
 RDEPEND="
@@ -54,7 +54,7 @@ RDEPEND="
 "
 BDEPEND="
 	>=dev-libs/wayland-protocols-1.14
-	>=dev-util/meson-0.53.0
+	>=dev-util/meson-0.59.0
 	virtual/pkgconfig
 "
 if [[ ${PV} == 9999 ]]; then
@@ -63,22 +63,14 @@ else
 	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
 fi
 
-src_prepare() {
-	default
-
-	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
-	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
-	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
-}
-
 src_configure() {
 	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		-Dtray=$(usex tray enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
+		$(meson_feature man man-pages)
+		$(meson_feature tray)
+		$(meson_feature X xwayland)
+		$(meson_feature swaybar gdk-pixbuf)
+		$(meson_use swaynag)
+		$(meson_use swaybar)
 		$(meson_use wallpapers default-wallpaper)
 		-Dfish-completions=true
 		-Dzsh-completions=true
@@ -86,11 +78,5 @@ src_configure() {
 		-Dwerror=false
 	)
 
-	if use swaybar; then
-		emesonargs+=( -Dgdk-pixbuf=enabled )
-	else
-		emesonargs+=( -Dgdk-pixbuf=disabled )
-	fi
-
 	meson_src_configure
 }
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 4c957cb53f14..da435a1f8372 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kdeaccessibility-meta/Manifest b/kde-apps/kdeaccessibility-meta/Manifest
index c8e680913bb9..e98ff8b3baab 100644
--- a/kde-apps/kdeaccessibility-meta/Manifest
+++ b/kde-apps/kdeaccessibility-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeaccessibility-meta-21.04.3.ebuild 458 BLAKE2B d406ec105431b43460050a5ded74658ec77b0fa3ecdfb5dcc8555f82ad0c064a457180f66fffee415ae5eecfab1bdf0501134998b33ec57dc2ba8eb03e090e1b SHA512 f87d0076f181a680f054b2cb05ef311eb4b3dc32643a7963bc81d3b6b848dea1678dc0d91446500c7090edbba5f5542115c17631351737ecf5262c707c8ac4e9
-EBUILD kdeaccessibility-meta-21.08.2.ebuild 461 BLAKE2B 93c5a76a8428e88e8a27b3673404cbf7a652cec1cf2733eca86138cc4ef21277a59e90b923ceabb51adb12aad434be0a27666281b6ad6a27b71536a693d21098 SHA512 616e4ea2965871daf241dbed2e81c3ece6554b2c4542e811fbfe64b23fac885c5069d7d114b938fd101c42e82b3388644aa0f125f07343a0e909e933b1c0cedc
+EBUILD kdeaccessibility-meta-21.08.2.ebuild 468 BLAKE2B 4f9b6ebb0da286d54481cae05c4d6f585baa7c28c1f5084af8a4a3bf1272dba767ba79ac1e52a99688dce2c4c8e4967448f79c43248de6a7a53a430f9588e84c SHA512 7e22925b7730c09aeb3d31ebbcb59b4e4368ae7005381206acc76f0b7ee9c4c9d3a1fde1cd8271d0c4ab5e2ac36265ac40a0a35864e9675ce6d01f4212d09af1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.08.2.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.08.2.ebuild
index 1e46290dbd8b..5df0d3d2149d 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.08.2.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-21.08.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index a3ba3884b5e8..4452daa2c64a 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeadmin-meta-21.04.3.ebuild 405 BLAKE2B c82262c889d94bdcad917f43d818a389607beedb3be7f0eea60dd645ad4e0230967e3edacbfd9655284ed19583a04149b82ad13aa99aeb24a51d0c30f68a3893 SHA512 d03f901b4d8a2b41aa6a758cad59d04a59886e960e495700ae4cb223df2404d09e6fa6f3934f80b52a90c5148ad7dac1953709757eb73d59da7f942f7ca44c57
-EBUILD kdeadmin-meta-21.08.2.ebuild 408 BLAKE2B e325c76de6473415ee2e6ada4db5acfcad2f7615dad0134d44778200a71cc80c30bb11aaa6bf42d2073ce27eec6b33d174c073a13a681753d3558ba8f43bce17 SHA512 22d09524b75977e4cbb7c2f332c9a65d36fd9737d58c911b88f26e64424eb60fdac339527f60b89f78effcb0501b90ee956b777a2e1fedcb0858fd5864cb6f2f
+EBUILD kdeadmin-meta-21.08.2.ebuild 415 BLAKE2B 5c591eee3fe6ece1c489560b6504247a9c659c422fe8f6f2a8f975ce22a519e57083f31ab6bd8b5c758c212fbf54a38a18d7e96d29514da003b1851aede52f40 SHA512 328b6914fa60928b656cd966f445d86cfe61f79389dd3a782ac744f084585f46580cb96c2e11235f939651f0373f5a26ea52f43a82b0e2489dae4186ed7578c1
 MISC metadata.xml 427 BLAKE2B 0a3a1f3fcb5983cea786182bb60fae6f769a8c8c1c008acd3857814bedf317e6a1b5309a7c8bdde9575ff0bd4a426bacd1f3b9e75cf12bd5b161a33a562f4eb4 SHA512 bf9cc9414fd8ca26ac16d0edb84ab353a279b6d04071a34226fa962afba14bfd3e72afee80eb963d849c31818dd6e10542353ffb057d0a295000e5351e4ae2a1
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-21.08.2.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-21.08.2.ebuild
index 36100f354bf7..4b0cd72ba05d 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-21.08.2.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-21.08.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+cron"
 
 RDEPEND="
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index a4036e2db2c8..ff24a9678cbc 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,5 +1,5 @@
 DIST kdebugsettings-21.04.3.tar.xz 88104 BLAKE2B 86acbab14797946f6561e3b08e8880f51d78201cc4fec6e71c6f47a01da149eced6a73ce9e5f2fc5c5278e74975636f6476fef46fbc5a9194b396362600bf77d SHA512 371f07e896381a21233c4967c9b0f9b7380356edbfceb491017ddc7d985de4c8e685e508762abdaa394adf3796ca734af047411da276bc578f0512b4b633c5d8
 DIST kdebugsettings-21.08.2.tar.xz 90316 BLAKE2B 2aea72522ec8afd4b193bf8eb03725bc4174db76917335cd268aacaccebcc8b5e0240474b07a62a2ebb03157c2a98c6424259a0cdf978d221dc548a88a44edfc SHA512 6fe0a4b87a411533a7de4ac065ae317b19965223fec950c7def707fe5973ed453d6e04e3d6aa982fe3f8b13caf3c8016f4f6ff69413f3963c3a4cc41e4308068
 EBUILD kdebugsettings-21.04.3.ebuild 780 BLAKE2B 6696769007aed493bb56da49cccd1d50c71b67440c58268fa68b966daf8b09d79a602ae3a7b5df7b80f03d34eb722e273fd157f348dfc90574d1e0331a2c1459 SHA512 719b93c545d48b012b9d600cd39af888eeb02bfb663ae308cba23570db1269d67418eeb4eab21114bd80ee8d670e600f819f93104d5b681bf4370ede867751eb
-EBUILD kdebugsettings-21.08.2.ebuild 772 BLAKE2B fcc813e369f90680c15d3caf0026405c3760a18a2fbb8d7ab9da28ab4d09f3b59a556bba953942b5f1ec9624d0a0dde48124dfb837d34120cccc00ff80f537e2 SHA512 f404424332e1fcc57a36f098790f6f1d462870466b3215292330cededddfd797f7c5a9919bc62895800c36b9b696780bfc9f280720bb0736dd943a08d774637c
+EBUILD kdebugsettings-21.08.2.ebuild 779 BLAKE2B 7e09d6304216458c15345c4635b451d2cda0889be96af0806306371a6f375326bde96005358425b1c2ba3ce0536530eca0290a59514a35414a487b2a80c1006d SHA512 bbb037540ad620f18951a75eba0738c66920f9071c35b83b48b2244aa6b487157cdd0f6ed25ec97075a7971fb36b55c8ec0930de13d37a758c489dcdf928c7db
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdebugsettings/kdebugsettings-21.08.2.ebuild b/kde-apps/kdebugsettings/kdebugsettings-21.08.2.ebuild
index 148500543123..7e73ac50353b 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-21.08.2.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-21.08.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kdebugsettings/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test"
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index 0412b845ee0f..764942334f92 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-mobipocket-21.04.3.tar.xz 17092 BLAKE2B ff2f227b31e2fa491b61f85fe38b2a9017c59cca9a649e79dc15ffb0cc7168aed77f4adde4d6621a796f2a00ed189cf1d0385131ddb8bd9a043f45ba9d84f8e0 SHA512 112b7b176ebf2631dbec5b621b34a1df7eff1ad0836ad4349039a539684aa7a7496ded50fd5d15fd3b3c6807bf2c3a6b9ad7483b2ab8758e72f4cd0bb6488224
 DIST kdegraphics-mobipocket-21.08.2.tar.xz 17112 BLAKE2B 7dc2ebd4d1b9070e6d72bae3fbcc0dc8a5c3bb328d4e435eedcdede4094df76b2bfc2d59cf0c2b199e415843e9b985ae113ab9c98113c0f18835f5694a60a9f0 SHA512 d580467a5d2a80400d30a27eac305d476e56aae5a58e79cfb5644d1dffe4543b2c6e3dc1b67605a62787d9fa8cabf1bd49b9b14c7972fcebffe2facac099e050
 EBUILD kdegraphics-mobipocket-21.04.3.ebuild 516 BLAKE2B bc2a1df12876a586b4610c9596fb9309e0943776a6d507481612b2509f6dd1183e684d1164d6b351a2d22099e2b053518414dd88ea71529a5f8c65413c66754e SHA512 400d960a4ec5f13e3ac773087d509025e3d631c2616cc85b251b69a6771beaa74b897c42b9556e236dfbf99073ba413708cd68152902a65423cce5e2d3ea88da
-EBUILD kdegraphics-mobipocket-21.08.2.ebuild 519 BLAKE2B 6112d4ddf75b5a7e80aaf8fccfa4189c93ca0168b2d165348708dda872e214a561b2d05195c89a5dede8d9fbe8dfe02300c69149d814b3448de528f5b739acbb SHA512 b6d3e9fdbdbb0ea2e05e94e66b78ac8f72a30ce84f0b877ec724c9ca8e144dcadf837ae68686e9a726ae7ca59cadafc033dec4945e94de61c43736f2537dea02
+EBUILD kdegraphics-mobipocket-21.08.2.ebuild 526 BLAKE2B 88cf78de799baab61106755ac34a3334be9c50fbcfbf3a1e8b568544900ec557a1055199486417f70a6933b434aff6ed463c6b46bb4717f871756e7533e3f863 SHA512 7888e557d3c1c0063b799e4a55c3dfb096fcbc848530b8165143eb8a788f16cc8f679db0f78afd77c70438f1a1dba47a77173c6805e30c73d91a2c52f92853dd
 MISC metadata.xml 394 BLAKE2B 0a2bb8cb27c7f1bde68f8c46cf132c18ec1844707fee62c6f4a6b9b1d6b58d81960d7ab5c3e6d968c4595ba7c9b7ca8b49736c0d5256e2d7ae61a2024a3f7a19 SHA512 355eb6a3a5dfec643b735648fd0481acb8b005a6db808e67eecdf905c7271be1f8da26fb3e6900fa33b5979b62f647c00054c6db518dd209d4ecb4c0f5ef592c
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.08.2.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.08.2.ebuild
index 8065e38da0a8..cb96d7a5d25a 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.08.2.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-21.08.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Library to support mobipocket ebooks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+thumbnail"
 
 DEPEND="
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index d441ea0ec3c1..95d97c436bce 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,5 +1,5 @@
 DIST kdenetwork-filesharing-21.04.3.tar.xz 378280 BLAKE2B 345ef38b120de2f1ca6dd256d579995a60c4e5d41b2b2e53aa6de1c051c1deec251cd3943770640445b7c3074105a4584d8144b864bc2c9544ed55a638f4edf3 SHA512 7b8b0d0118829d64d46acfea666a4c274d5c6e7f825624cf02cf7e74558af1f2f2d152cca676ce0da56ed01cb74511c1b20c3940118f2dda129b40551e2ce4c7
 DIST kdenetwork-filesharing-21.08.2.tar.xz 378676 BLAKE2B 187370b177b3278f99944de9d5895d14100496da93ac3d07d737a93843e201797f7aad559f6b43ca8ce3e9dba67d771603a05e71dea640121eb9da74ef73b3e2 SHA512 7270974838c3bd5b333d3c3c86f2d07f63aee041131e4d618e21530d09e2300cb11145f56a0520da2aab5c9c7d8d65dfa8373c6aaf61fb41a6437d480edb4ece
 EBUILD kdenetwork-filesharing-21.04.3.ebuild 922 BLAKE2B 20627251aa4946bf2fc4fc5ebe37f9a991dd9f89bb9e7f344f86f7d481b033ea20ddc9140b975af7e8c92f135acb934198a56b3a9117afec2da21ddbfd0181e3 SHA512 d4dd75dfb9339746e575a9395b2c71a97aee74b15b5371e93b886b130712ae395b2e37675a9504770c1a0d7331e6d97efa2ad3b76aaba3398aca8878630e40cb
-EBUILD kdenetwork-filesharing-21.08.2.ebuild 925 BLAKE2B 87ad083650f0636390749c65298a613768b04543547c69d7a6e8ca0fc3c5159c8ddff3c4c3edb937398163307e1c61bd19576b368924629de395f3a3adfbb3b8 SHA512 1daee101dee5d2b6c33fb6a3052755fc356fee2b35ffdafe923e2e4fc559ccd0d83187509079d3d5a3d71c0dd962d32a78a760bf0eb26eca7627ac3fa686b03d
+EBUILD kdenetwork-filesharing-21.08.2.ebuild 932 BLAKE2B c56ef0bf1ceabb3746e489fd4a03075f56e22833846fd5cb4cdb9da2f3acb00f6d6ffd247e4e91ff5d6d116593b503a302378934759dfbebaa7b44b105971d4c SHA512 4b875ac763981fae01165d5c8ae1e982f9d09ecfe70fbc86d30876363f7664fe85ce07ebb40fb606e66b609030d53aa7f54dd4197679e490a1aa468631bbf51c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.08.2.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.08.2.ebuild
index b5ee6e9b61a1..71bcd0617034 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.08.2.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-21.08.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kdenetwork_filesharing/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index 7c547907a85a..c580ddb6b53c 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-kioslaves-21.04.3.tar.xz 38424 BLAKE2B 02e24505e22e8e5cbe965302ba51ea3d174f1220b5d779416f267dbebd2c2b0207dc06fd0602669845d803d657c985b8662ba67dab4e434599fe7c2b61525058 SHA512 f0e6354b1bf5fa0dc851e7a90b71a548790903484dcbb7b31b419d33e203ba7f6e8a632ba96c3131a4996b0553bce66d5ba945ade6820c78d7ae6a7495460a3f
 DIST kdesdk-kioslaves-21.08.2.tar.xz 39148 BLAKE2B eeeed93cb5fe777943435dc7acc23e0b87ac00d76eb9ef341640819aa064822ac8518fce0af8a6b55f404bd07461726f0c136f39316e8e0b9a71978dc47df696 SHA512 0b9d1f2d2d65dd4c2b9ce0ecd9110c7b8657e251db153282669676982b0f4648971bfd73915c996ed42fc35073dede8c10f80bbb2cf58277ee1b57499ed8c591
 EBUILD kdesdk-kioslaves-21.04.3.ebuild 422 BLAKE2B 1f4d40b2a3eb684e934eede233879089380f968d0135c444830ce0d339cba237113ba09b8487fee3e945f2b70e357f8d7f2f8440326039a778a1c008cfcda52f SHA512 568d2afdbb252413edfb6f19b7cd445a8f9827c01bef2848cc010e3f70b787b8456a938056fc782e34f53c5de20fb6f82c99633f427464a942a363fe1b07119e
-EBUILD kdesdk-kioslaves-21.08.2.ebuild 425 BLAKE2B ae27330afe1d54589d919f6e455ff66d132649769acc3c7a3982cbd58ab941ecdedf8eec8116ada53402348c6cac079b70aafb6763097fe0eca92aff6c5e4d72 SHA512 74518f2b8902d2c93c4380b55cbc71d72dbf0791f17f8c5aa64379047502d6dba468bbb3bac09e766902edf37a53413fde44fd84f9bf4c2bf9f6d6a38507a6ed
+EBUILD kdesdk-kioslaves-21.08.2.ebuild 432 BLAKE2B d0ad02f596b6521bac4290b5909b1042ebf5f4494351a2caac947260e6632766f8b76c2f8183c4b2b0a0eac03773eaddf53ff8dbce5ca864f2038c180f8f2ecb SHA512 586747817ffea96569d7b58c1b36a0419d95ca7cabb5e0448e0b40c95428d28d9c52fba3afa0ceda1150fbd2bc9185ee413bf3267849526cc36fa385545894c3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.08.2.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.08.2.ebuild
index e926ac329956..78fc5dba3ce3 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.08.2.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.08.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="kioslaves from kdesdk package"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index 06e2b2996d17..2bb1b5d24f6f 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-thumbnailers-21.04.3.tar.xz 17872 BLAKE2B 88b7a166855708e0ca70460d4c2886cb2f8dadf3d4bbd7caa7947987764a5830e43aa473c43d7a540efa10eb1ef8600e034178d53902e68437c72199118ce130 SHA512 bb23b8ba412919e926d07bb3ad0546d8b9828617de01e1922c694e1886f9cc7ace096367beaca1487c1f91b178ab2503955d985debbd98c0fa388fe29326789e
 DIST kdesdk-thumbnailers-21.08.2.tar.xz 26088 BLAKE2B c92dfd598611d4c018545c28ccecca42668a083e3aecfac940c31b91085dd2cedbbceab165e297623ef43a90f9dfe093998ca046dd199446768a6402d5548020 SHA512 20fa19e494cfba2905fc77c1997fb2679915c90ccd822613c720b495e58d7ae1d92597248b290c12ae8f6ff2c5a8faee6198ce4173a48afbe9026b862e3820c9
 EBUILD kdesdk-thumbnailers-21.04.3.ebuild 540 BLAKE2B 61e01ee4f62b86f3ea0cdf08177409475aa894076424a7fd4e179865855f96cd8db6168f453bf20203c47c7cbd17f14beee3f38a6f6453b3b74be035c71808dd SHA512 da0ad9755b59c9b64ef6fc35412ede18c2cf0f8bf7335e1cc986745671795c632dd65d3dd01e9ad0ed972f52333524e193cc1077553cc69352880b41d1cc7fd9
-EBUILD kdesdk-thumbnailers-21.08.2.ebuild 543 BLAKE2B 17ce6f687b32fe1f32148d62807efa0673d00da7bc30a57336f1fdf824e95e1a7cb7c1745118dc462e22f3700a0b64398661398777dd180406d8946b10a7a394 SHA512 e8459997cdbe9c4a73f7a9388ee78f1c5401d5f6aa59fa61307bc64ee3d3a245344876acf92bc21c591a19cbcf4a521a9e3cbfec94d1de286d08a7eaca9cefc7
+EBUILD kdesdk-thumbnailers-21.08.2.ebuild 550 BLAKE2B 7a49987b2222b3692e12df214c34af7d15c990147f883cbaa8f24ae0027525ef873110bebdd34f36123014f9151e923f3ae5f2074c216810fd47b861b35419f5 SHA512 cda9d2be598cb2a65b25a284a7884456510b6e1ce271cc25e023a429ef11ee920158840a036d0c5dbac07e88e22cc4bca8f70e6a04436ebcbf05a99d797b9309
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.08.2.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.08.2.ebuild
index 0e246206e453..8e346c2a2b56 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.08.2.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-21.08.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Thumbnail generator for PO files"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index fc311bdf4329..a172cd9d37ad 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,5 +1,5 @@
 DIST kdf-21.04.3.tar.xz 472424 BLAKE2B a11b644ed4b4cd3ce841412d0b1d65eb2d5a863936b0b7d6cecb42beb1d1e2db2dbbe7d029a75cd72b81451040471b74cf526c4c657668a75b78f5bb28d2fa23 SHA512 985ec37fade53297e8bbe03aae78a560ec1f69e0c1b093c431e249de340e14e0f372bfe51d15dfdb4c7e0f4fadf3e81aa0b53a6649ce5ce891a837f96fe9e755
 DIST kdf-21.08.2.tar.xz 473060 BLAKE2B bbacd3ee6b4e6651d150d1d74d7004f534e20bdcf483c6b4163e1a8e89a173fcd4adac05fcffe6f62b44806b4f1106f657181aa890443c74496cd67a8a6008aa SHA512 01845ac865de39957b9e209b0d4a269d12df6ac7adede01c26ba52c243285d1041e63f41d8a85180c83f3a42bdd7d257299c3f3aeefef382076e9230ba8b1345
 EBUILD kdf-21.04.3.ebuild 911 BLAKE2B b319dce8fc413605fc509292675ba1536be6c0a8c60d6be33a01062a8d5e899e71e55c7bb3e466ae1f62c606416155957e960160999cd013ad06fb6f2278d784 SHA512 5bc08a1ec0f9d81deb3e9fb72a1a6536c6e7220ae9928f99e69b51e01c748de32150d6bb5547add4321befaa23da2cbeceac93998b8f337ff30d49b6d23238dc
-EBUILD kdf-21.08.2.ebuild 914 BLAKE2B a199adfd1a1e4a6721073f024cbbec79ccc17263999a90d75f87579b9e1ca3832af30a629a4c754e0dfc84af35499b4456982522d8a10cfdfda6e111eba4b72f SHA512 07e6b38f91876acd3c69295f844f1c7fa17329c0c2208ce1797f732533eea247c3b344de58dfccd7c3d83bb274a00f1ec146dba9741d3fdd79e816eecdf3478b
+EBUILD kdf-21.08.2.ebuild 921 BLAKE2B 6728ea3458570cd0152cd6597c340617dd1c63a2438799a8ab179db70a473be19610aa8f5f13dde0cd719119137e26ad4299157c0ec4cd0f34e3cc64d84db00d SHA512 1e0a0bfece7cdbc70ff4074668f58d9a9dfaa09d03b8919182af7d4e79674ea441c56e11fef7d877a6c1a39c0a83939db4e73916f645b5729962adbdceb981d4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdf/kdf-21.08.2.ebuild b/kde-apps/kdf/kdf-21.08.2.ebuild
index 6947fbf4badb..68193da5f072 100644
--- a/kde-apps/kdf/kdf-21.08.2.ebuild
+++ b/kde-apps/kdf/kdf-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kdf/ https://utils.kde.org/projects/kdf/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index 272df2c41a38..753dc5083f25 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,5 +1,5 @@
 DIST kdialog-21.04.3.tar.xz 114572 BLAKE2B c983944e77e92b6a2f4794294533e8276460fd229b64321fed49b45e69622eb2f11c5eb2a212e6882dd72ea656a476f37573c31e146843298b485bcd36beee50 SHA512 019dd95dd56881eb84f3187fe623e55df947f2ec61eccd57bf2731001f7e7594234b2a800cbc09526bafafc8b2fa78c29a445b578e52c7405936f2eb1bc4dfb2
 DIST kdialog-21.08.2.tar.xz 115468 BLAKE2B e322cffb3d95f8abedb24433f1309cead7ae4b8fa53e1c3543b0ef3719d22ca75be07928496d945de5000f715224f62f270a84b8f2c5554461a59cedd62d8ee9 SHA512 f538b5957b2e63f89805a8fd2c56fed29cdae6f873e4e1b6d817edfef7125b2fea533aab857e57b2db56e2e318649780c152f2e73a53a0413b7d54c70dd7d236
 EBUILD kdialog-21.04.3.ebuild 1036 BLAKE2B 4cf4bf0fb51a2c1fb6bb79f7a5fe0aa1b5066bbbfa0197e48c3cc9e49f6fc7356a970aa7b74fcd907d709ce33b72c9280cd3a3014ced16ba15974dd73a9d8fb5 SHA512 8053eeb38e00b80e05a4e3ce6ffd1002d7e814c50f97e6936b623eb2c76851c10443f73f0bfff82422231a030f20653fccd317db09417a208337313dda955f39
-EBUILD kdialog-21.08.2.ebuild 1039 BLAKE2B 813569adf891b3110c316090823f00c234b50c305fcc0a51588b2a4423f9b9c80415a3fa3890f3a0f18c9e20386cb3d386f8b2ed181f0d53e3c91c0c16e11534 SHA512 4cfc3b2370a738e8f6c7fa921ac45530dd08269a67dece2960d0654f4153947e3479b2d49af7c502040b37b06c096b85e187cb42f66210b34f0c95845a9665e0
+EBUILD kdialog-21.08.2.ebuild 1046 BLAKE2B baee83252efdc392b110ef31968ad7c22d557b57819998d96363ecb92b022f54792c134c9d9036fdd25beba18eea9502f9c4f5425d69db733b7588330469f2c5 SHA512 0d78e7a6086ec53c87f50977c5d3edfdd5d5c7789fb364519598e2828ff89131873e7d0d02f5b0c01773065ec1128bbb1ac3d4b61c0c2c01fa6fbdcfea99ec38
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdialog/kdialog-21.08.2.ebuild b/kde-apps/kdialog/kdialog-21.08.2.ebuild
index 846167d3ce76..0ffc9c5756fa 100644
--- a/kde-apps/kdialog/kdialog-21.08.2.ebuild
+++ b/kde-apps/kdialog/kdialog-21.08.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kdialog/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 48d80acda3d3..6643e0da947d 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST keditbookmarks-21.04.3.tar.xz 200720 BLAKE2B a8e5ba51e7c602a3792f13a999e353875577553a3844f3871cb40f89f0c0b35d3d32bc84b9b1bfbbf16743d32ce05cb50a87ddcbcab6bf7b6e24e5d597a259bf SHA512 1467e909cabeec95e235317333b601731daf44866df4106e06dca02c41b647527552e7307bd8ec0762fc2cf31d21a40dd7592ce9f64f8628cd89a886ee292b13
 DIST keditbookmarks-21.08.2.tar.xz 202412 BLAKE2B c66e1b758790e8282878db4d437b997f899d347661d2d18d00e0b8b2a90b2bae0bb5342ae9df5fdd781bb9549394737650a3cc16f47fdc76ae0c940b21d8722c SHA512 ff000d42d44e66ad1fee68e6ca3065884c5af416ee06b0665186aa569a48bd488be84d9167a88b04ba1f44b31ac405629665d5f58a27d38b8c9ab06f5251d878
 EBUILD keditbookmarks-21.04.3.ebuild 1162 BLAKE2B 4d3a7647dbdb9bd2393339c9311a2660d974d0f911e61222cc1f90d9d9ee4ce682422dbcd6d058168ea4ecc298b208024830cdb46ad9a32edd66defb46d4c794 SHA512 8c5be01dfde4d91d43c36ac886aee2a7272c7462667a2fb334e9e8d9b1e4c54cf8d196e2c3f601c5274b5743a02215aba7ed1410a05e540c52288d24f78b8c88
-EBUILD keditbookmarks-21.08.2.ebuild 1165 BLAKE2B ee4201e560178964622ee6246951eb5418a6d60a84a73a6e3684e06995fec68c1bab6e42139e8b20f07b6d4891537bd4a39f04bb9b79d8ec74acf1ba0efaaf27 SHA512 4de943917c4fc6dffdc5447a24bad37a47c74daa0de372cb3bc69bb854129ff3cfc79b68c3b669489d779430304205b64621fbcc0a92b1019234510e6fd80c6f
+EBUILD keditbookmarks-21.08.2.ebuild 1172 BLAKE2B e690548fb864c0d406d8a21809a5572512c414d85f13e04d2d4c68ffd00bfb8ea32fa01d53edfbe2d7a762c2fea11a1590d6df9f96b85aaa7350df028c4d8e34 SHA512 2af38b274b41cc718641ee0d6912e023bb2379ca35d3be3e4436aceaff7cad88d6dde77ec944ec6b735e2c9c89af80e2149ccad57b0dd7740aa172900e993aab
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/keditbookmarks/keditbookmarks-21.08.2.ebuild b/kde-apps/keditbookmarks/keditbookmarks-21.08.2.ebuild
index 0854694a4f37..020b658b1e53 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-21.08.2.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-21.08.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Bookmarks editor based on KDE Frameworks"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+man"
 
 DEPEND="
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index f47d8b4a6ff2..b9bff1fa4f39 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,5 +1,5 @@
 DIST kfloppy-21.04.3.tar.xz 210652 BLAKE2B 0523382affe56fc7fa114222a4594d819fe613b7c80d0a6b80abc8ebe4c961dee830363cd9a6d20f32a435fd4e507d57936a5653338749a8f588771dcbb7a9f0 SHA512 daba93610e07a49487d1570b270846a942a4ddda363aa12ef93697816f08e8a60d66830cc8b520a86d27d45a8e8a951422c099dd6454cabacad305b5cc2664c3
 DIST kfloppy-21.08.2.tar.xz 210976 BLAKE2B 2c330a5284caf7d69e24f38fc116f4763be4d5e16b1531694defa55adb45fb414e350822f9aad71eff88ed7c82cfce60554f086d6e0964b9518ba985c40ffd38 SHA512 b0eb775dbf199a5e8cf86cec72e02557c631c46def86923e6e9e533436d34c85eb0731495a17649142324346e2604712715338ed9580c3ec158cfa76d6b131b2
 EBUILD kfloppy-21.04.3.ebuild 871 BLAKE2B d73688c489f37efb5ae89f9aec3e69b4e44c10c0135963f2583bc92813c7543ae605bc13e4dd65d9d3947b7d77275d9a07da6cf8ee1b3b5ef13258414b47dd24 SHA512 7668922ea41f0e125ab110a140e21a5f877993624a27a966f04bf90e414afcb9147d90320b83ab5fe1fe4db5875f2366b2b7aa04a2ac00b8c651d5c6f1a52214
-EBUILD kfloppy-21.08.2.ebuild 874 BLAKE2B ea5baa0e1d3b5daddc2fc7da97a797471f8618e8d1dc58dc4be6cd4081dfff167952b8ff4a0a3672aa384e488b14e91fd9849b277c64d671ef83180df080555d SHA512 77b5575fa5bfc1695cf90b82c5ad4e5e05c99cbf472122ba9e3a1f52e2c1a90feadc79c7fbb8b68a2db7bee84a743b6e807ddb60169948380f8472a1e32ecb35
+EBUILD kfloppy-21.08.2.ebuild 881 BLAKE2B 6ea734a495c8e97b3b6a76df3d4623a236294c92b0e13f466f79fe496b01d64dedbe9028a855fcd3a2c6e3c74149d0ac3a8298ae56c295b876ce2d76ef0be285 SHA512 b02f13991d375c52fe3daf87c27bc3663b077347b66a5dd24c17ae423411379f0f868860d5c692371e0729b37b6a942ad58cc78e8092c7f3ad3cc5efc3a95761
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kfloppy/kfloppy-21.08.2.ebuild b/kde-apps/kfloppy/kfloppy-21.08.2.ebuild
index e1db6db80fee..09df0748eaee 100644
--- a/kde-apps/kfloppy/kfloppy-21.08.2.ebuild
+++ b/kde-apps/kfloppy/kfloppy-21.08.2.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/kfloppy/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index ce10747a87f2..6fa984f06712 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,5 +1,5 @@
 DIST kgeography-21.04.3.tar.xz 11001764 BLAKE2B d8836df12e469c5e3ffe8ce32956eb17bb51d4f6d0d9df4173e944edc7c0d1e0ce41b8ac67d5a0675d8b3244aab063adf91a193b8a27be909a2201215fbc811d SHA512 92be1d653d4b7019bff9018cc9bfe4550326ff4aebf1d63d5b5752cc6b0169d34a8613837ed7e8c27dca827cfa27ae1035de96a2dd1cf0346a3bd2aa4f0126f3
 DIST kgeography-21.08.2.tar.xz 11001844 BLAKE2B e62b2218213258308b021f83a1994b4c4d3768df7f42a0279e82cdb7e0d5ff0cd1c2d36127198b7457af7616da0f969b458314412953007b8d4202a0890e59ed SHA512 213c4da9f5df9f1c2e0bd1cdd8fcd428894cdd5507b4b3e3049bf96bf7c09c00159ccc9522401fc1591322d5e2398d704a84ca4abc2ba82ba97ac8ea64e76246
 EBUILD kgeography-21.04.3.ebuild 818 BLAKE2B e4d48800c3632d0781876dfc9b7f2d859ae4c8d0f31629985fee8b8926ed82838cfe765610eb6ebf1a87d9954e3cf78b906d06c156e566c9c234dc34d78f5c38 SHA512 2896c9ea08b2bd9d4da32c4a8caaf1571ab4fe205ca061fdd768d1da8cbb215734b2b877236b57800e00609feb2eedc1f391123989dac30ab5efa6ff22781664
-EBUILD kgeography-21.08.2.ebuild 821 BLAKE2B 68950ff1cdca7243e74e7d89f66c9c45a10e837ee132ad9761a78eb461013c01546c62cc9026a422c43d8505bf91c76ca91316f466043a9f93a796b65d85f7b9 SHA512 3e61bc47d987413583f9cbb90ffa67f6d61ddee2ed9e1e6a0d00b628081ba06ce290919d3b2a4912d420cce01808e5ff32eaa0bbb49e51c46cdb6ef8b2026ab7
+EBUILD kgeography-21.08.2.ebuild 828 BLAKE2B 89f72d8dc5dc96bd92a2d2cc75b73b527e43b9ef55dd76f65204fbe11713c4c2dc5d7e6ca6c7119ee8c79e9de62745b0bca9f4c54813b4c3cd16603604a862f5 SHA512 b871c2fdceddcbd590fb466f8616d9f088585a36d3e025c349abd218c46e46e0d385002eb8b25fe263d4611e1effbd811b84ef192d4dc09f93d13d5f0c7c58aa
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kgeography/kgeography-21.08.2.ebuild b/kde-apps/kgeography/kgeography-21.08.2.ebuild
index 70d790fc22c7..30ffea4f111c 100644
--- a/kde-apps/kgeography/kgeography-21.08.2.ebuild
+++ b/kde-apps/kgeography/kgeography-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kgeography/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index 28d216c81b85..75e6e6371d7e 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,5 +1,5 @@
 DIST kget-21.04.3.tar.xz 5636204 BLAKE2B d0f5576ab4dd755825f4482de1ce3362197f24181e1e8c922acf039c6b72eb65f205658e34320645cc8a2f40e8e4f19cad09202bbdb478ffeb38ebbacc1c2a28 SHA512 58d2a18d7f918ac161cd19438a4aeeec86e0df85245903cc00fac1cdebe2dca6bf471d12f54301ff9b60899471726c3e410b870ef3aa251f3994e3ee1fb6d30d
 DIST kget-21.08.2.tar.xz 5634792 BLAKE2B 318fde7d60f2641ada0d65e7330431023486bef6aa7fa9b10d979507f1d678b1899d8c823e2a9c8036423b8f60e7dab0de21ee028f67768171c3843820e6ce4d SHA512 c7309946cbaa7f315b68f825cadabc264077cff3b414dfa0a05c8dbb407dd9bdfb0cf8fe69c90719957c43afba0ee0dbf947c2e5c1e6e99f56e5b57cb55f0afb
 EBUILD kget-21.04.3.ebuild 2153 BLAKE2B 73938ee4a23987d5bf6d9b38a5e6116fe19b20e1bd3920c27e4dc001a77fb20d6700916479ae852925119275d69cd1447e9d78abfcbef426a00513841e7535e1 SHA512 f1f68145a3cb793f967fa23f9081cbbb7658ef5124b8352bd2ec99b93bd988f54a66ef26d545d68698f39ff9b81ec0c27d8f0dc5110063dd4d65b0fb320204d1
-EBUILD kget-21.08.2.ebuild 2167 BLAKE2B 343bbfcea43772f2c53b40717dfcd3d0d8038d92214e41782c1ef4411b9c67ee8d181acd1ce2c49546d742f03a4c7d9cc81eccf7cdd6db798f2f9a6b19fc1719 SHA512 2e1a454ef7ea42b1821b66a5b91a4c63c018468319d59b9f625389b56a9e16b2719fbf6be1fbd947a9b55d65d6202f61356abcabb4b02ed4ff6f43b47187dea0
+EBUILD kget-21.08.2.ebuild 2174 BLAKE2B 15dfea689cd3669abc8ff899c9150b0d32091286ee0bb13b4f6e023ee15e77c31dcac88bf463c031a96e7be3eab5d76aab93aee99f5098fabf87e230c04694e2 SHA512 2c1bb3432da34f11cbd5a47796dd2ad2e67af4deee365a02a4e2e34f1cc3e943217943f44e3f27958b5f34b2fd26986581c5c6cb54b3419259edf258fa21a2a4
 MISC metadata.xml 644 BLAKE2B 1035e680d0837bafcb6d4fc1e3663d9f59e5804e9c42ded3bdb0669847dbb272f8505271335249b6539c93de0b4f8cc0de39fa2541724117106d78c5000db1bd SHA512 08cce2553d94bbc5094fcac0c9a6e0e188656732af8c8c787bea3bd775c3402d07f1ec21512ae91cf3b7bc4f579f731b9a0fcf9e1db63b0fe6e9d41f28a207fa
diff --git a/kde-apps/kget/kget-21.08.2.ebuild b/kde-apps/kget/kget-21.08.2.ebuild
index 38b0959c2d48..2ce8d955424a 100644
--- a/kde-apps/kget/kget-21.08.2.ebuild
+++ b/kde-apps/kget/kget-21.08.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kget/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="bittorrent gpg kde mms sqlite"
 
 RDEPEND="
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index 94115d758d1b..d9e4aa957c9b 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,5 +1,5 @@
 DIST khangman-21.04.3.tar.xz 7429172 BLAKE2B a32054dd415282f8ebdbe79ff4014f894db5de4f9a5e5ead3618dbaea98066fff8c052ec275e15e2f8d6e3a091a273dd017ec66206a27606d67cc605c2136f4b SHA512 9b5f719d1740484fcb30492f03c6e88f0306932bcd581425f6c6cf8d85868fe11dfd7b5fbd1bef5cc81c113d8e209961df0147f4d440ed6f6106ff1b215532e4
 DIST khangman-21.08.2.tar.xz 7433552 BLAKE2B 43babd89d0b3907cddfb33c7c08eceb6663fbe9bc5c986522b7fdbe44cefd9519b5cd5ef2d4ab044a95f735baf576da9f1e16b1bf07dfc7e7ca08b1b2e101a15 SHA512 04e0270df4c3b29776eb1d9b9231a9625e966214066844585028d4499c86735564b29c026eca0ba3e5ae3d4eccba074de3e551c7485e26c55f6ece987fe22c51
 EBUILD khangman-21.04.3.ebuild 1195 BLAKE2B 237ab70f2f348f1c3f143a99edd0142c99b9a5f2e22a862402ee6ff00c8b1bec22fa5af43a3768ae31f7ffc316bdd5214bdf5677d3b4a3ef65f4b1a4b8b5d522 SHA512 83a85e32c652ee689ca0b8b527a188011e53af2fe43744ea48de8e28292fdc2e84d840c62ad1a54f0331eccfd25f97e8d71b07926cf180b7f39ad2d3875d3516
-EBUILD khangman-21.08.2.ebuild 1198 BLAKE2B 9c3c42ef5107c71569e1a19d5951f381a648ecd1ffc5de42d58cdbe54986072ee0e91ee5c5175c493011b09a3b82b8f2562a86a57ec211f819af44059333c646 SHA512 4010770f6c03b8c06507057a988cdcb1b3402d33200a66a4a567bc5161cf21b0fcf91a1cc2579c7d1482cefe0689de228da33322f8740b6b33561736c8f35bfd
+EBUILD khangman-21.08.2.ebuild 1205 BLAKE2B 6b1a33818fc4debb78f99c1191f9c02b1a8e0d897c034d45b985c51892cd4db134edba2b201d69ed57f4f08959d45c26b59dab740b47a82029e792177df64d3e SHA512 8ce0c906e3661b3fb10c5548939c14cff04e6716533db9417054ab21dc8cf27b21daf473675c3c6c182928b2321652259b4f98d5fe0850b4a7aa9bd88c2b427d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/khangman/khangman-21.08.2.ebuild b/kde-apps/khangman/khangman-21.08.2.ebuild
index 7d82682335cf..ce5027b10320 100644
--- a/kde-apps/khangman/khangman-21.08.2.ebuild
+++ b/kde-apps/khangman/khangman-21.08.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/khangman/ https://edu.kde.org/khangman/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 1b1d306c48f6..6c7c8588b26f 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -2,5 +2,5 @@ AUX kig-20.08.70-cmake-boostpython.patch 2660 BLAKE2B 51c473dd8733f44214571772b2
 DIST kig-21.04.3.tar.xz 3166572 BLAKE2B bbd64b51cc768de9baeebb3b66906d8e0d8ff133a63ddfe19a9e360e34d6c10b9e08a55ca8aca88c7e723a7af29d5882d214e72db1c7292364631817e6ccc399 SHA512 f82695722fb66a707abaf120b56e0f0977a63065a21849e72f178ee0eb653b73bd5ceb651a92085a34ad7d1c98da08611138a7d52b491c7caa9cbca47b7ff19e
 DIST kig-21.08.2.tar.xz 3175328 BLAKE2B d8899c50ff121c914c72242711130ffe0f003ab2ecd9459b37d0611424a7bd58bac08d1a464302c69a046765bd0caed8216d412cf55bfb24b055bee98757bdd9 SHA512 65e279a21dbb3cde3a0f9aaa4563e340f8399825155e2e7d1a2bc0f5b88417be6dcc37d55a6d87f370ac7d978148ba394fe50fc4d43acb974d8730d6264be688
 EBUILD kig-21.04.3.ebuild 1738 BLAKE2B 8e6217cbeee1ba13976993af25e90d3380ce0fc69913cf62aea3d0287fa899d5876f404dde95e194da8ad669c38a2770fdfc4e19a34e174b8abbea2191b176c0 SHA512 2fb3f5db8f0385a66453e8279cb61d548aff3239c237d48e2900a0bce92b29ac9b3033f7c1764be7d04c51b9518adf9c66927e88e8d1c669a2b7687401f82a58
-EBUILD kig-21.08.2.ebuild 1743 BLAKE2B 4c8139985689b04fb843231df9df0f7db5c1b151df521d4514f5241a4a2e91aefdb62bcde8783a8109335a4201fd1c88450b2d91252a66720480a5f7e74fee8a SHA512 eb774ee576e9d039a5f31f8be66f6c916bb96cddcd484acddd47b9fd9e128899cd46f619c18f35199b98640c529941673ceedce52506f56b16a15b316cfd185f
+EBUILD kig-21.08.2.ebuild 1750 BLAKE2B 60efb5d09102b0b679eeb02e6712d6210b8b46f14e884b4802f4778e51ade59e0c564a05d13d74ac84daa9b0fdd7668a860f1dbfc2b41221261c93233eeb248e SHA512 da3ec778b9ec7c4a75e5688415e59239cd44c79618fd9b571a7a2ba4f60d29d98a774f5c95461ddee90ce9228b312eff70ca43c47266186e879f5b1eb5f18556
 MISC metadata.xml 486 BLAKE2B 11cf086271c289ac0e3f1343ad70021b4b847e7be0ddb8f1dfb2630a4d7ff026456e2ed1c2f303bc8d9a4ec6e062c923bf809e14e814ca8dd653d9c2fdbe8006 SHA512 b4a4b83cd44c29cf1f194f5c3bdd1e48f9ef08c02d1b33dcb25fe36d243588f5b83753c03826f1cb74df4ba225553fdd65263c047362edfca5709944cb24e08a
diff --git a/kde-apps/kig/kig-21.08.2.ebuild b/kde-apps/kig/kig-21.08.2.ebuild
index 55ffc63bc8b5..aae87d00bdd2 100644
--- a/kde-apps/kig/kig-21.08.2.ebuild
+++ b/kde-apps/kig/kig-21.08.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kig/ https://edu.kde.org/kig/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="geogebra scripting"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index adf3c90ffa6e..1145c22b0623 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,5 +1,5 @@
 DIST kiten-21.04.3.tar.xz 11312220 BLAKE2B 4d1a781a37cae93f088c49b4a5a996921b9c742feac8e4ea6761c544880243462d1b7d9db076a7ea62ac9dba556bf7a42d7aa92ac295b42e8955a37d987e1195 SHA512 22ae9b0ead5f6a8c30cff5fd5d29c7273c5e0844d0494b136d82245dc60d0d4635f9a83b61b94136554f545a7c3ddd51342c4072def2ba8050ef7a73f60da695
 DIST kiten-21.08.2.tar.xz 11312620 BLAKE2B a6be38021a32cde5f2f269542ffd898c0e2b4d168869241ac40ad04fd1affeabf172f6625e0065a4846dff8c1684bfae3673710edaf80325e6eed13ba08880dc SHA512 eb32647782f696fcf54e85a7881d8914697b4e4e288cfec112af539a416e99f2883488e4a1342ecf42d9502e611b362f5e0fc31ce934bf5007c0341fe0cc4721
 EBUILD kiten-21.04.3.ebuild 1076 BLAKE2B faa6ba7aeae469fe96ee12ef2e0d796d13be0159e29cb234646f3cddf5d24c6b81b64a679575cf793774a7494fca8fc500a8b45f12208f8fadd901e54d02d44a SHA512 9656bf1d976d7c9c542c47b856df3df6dec372aca30d40cb49d4615f2ba343936c7f86677ee59b0b586da9f486ac1308016a5b8e6b74b1a439812027ea81fe48
-EBUILD kiten-21.08.2.ebuild 1079 BLAKE2B af66c9aa4c6792f0057e623606522da62688337fb50e100a3947b16128a540380d441140e0a618c5856a4833b27d743d9d9fa0b04a0ea129305bee5712a46f40 SHA512 c8c570205a1723000f621addc5d6840842e5a60509375e4940e07c484b9d6fbf85fb88c74df666bb57329eacdf208d4d31255eae89ef32103957314e15abe0ba
+EBUILD kiten-21.08.2.ebuild 1086 BLAKE2B 2444a4e0d19e385a6a732dab743cbe4f17a91692d9d5802361e858ff535bee969e49f07d071d3d653a6d6568fa026a7e2ad95cccbe448331fcb4a04528ada2fc SHA512 5093f0f8d47150ddc8835bcea7b3e27dbe5cd38d6d928cfd23a02c52032bad4e1c7669ee4cb428c744680bdd1b713576ba0163cffff2f2ded82ade76f41d05fe
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kiten/kiten-21.08.2.ebuild b/kde-apps/kiten/kiten-21.08.2.ebuild
index 3c84f9871307..bdf90c68f7f6 100644
--- a/kde-apps/kiten/kiten-21.08.2.ebuild
+++ b/kde-apps/kiten/kiten-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kiten/ https://edu.kde.org/kiten/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 581536382f23..da39c71ba3f7 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,5 @@
 DIST kldap-21.04.3.tar.xz 172864 BLAKE2B 50ebba423914a59fb48535890d58196fd12a15a7c7022a4f8465e1964d79c16d217ceb36808502764171fd2f9827bd0a841d0acb3f4589520df4bb4d83c8547c SHA512 01e9a36e212d912f86c43c1a6af9b56f48c5ae041b17e282bd2b3d913257a757e6b43bda756507fe50068b3ded17506e3427df0bed2a9114d327fb808dca3e15
 DIST kldap-21.08.2.tar.xz 171908 BLAKE2B 3716339109215cf4ddda3e625c769fb8a4e278ee935e26461e416bfe64dfd2d6c92ba011f1c5cdc57bec866e7aca3e397fe393b46777b47dda465bb069413a6c SHA512 f65bb04b5d966b7358d950ac8a3e4544918f54d834a468d3dfb238654270d55d916140d78691131180dbc8dc6562c4fa61330578576065b9b01dbe1c30db34a3
 EBUILD kldap-21.04.3.ebuild 649 BLAKE2B a751a9ba9681906f2cb2da1cac7748220b3fb3d7aa56b91f3bb1c58a27dc5b9df52cb5ad06cb3ed788b01f62a4077ef5d9260d10ca41887960e1d4bc20940c8d SHA512 f6d0acedf17c8e6b95bec9fda6a8561404992850c0ba15ccce67bda0cf4b7eb8ab6eee3db8032ddc1bbe26f3b2628c86189aedd931e4f11f3cd84bc3c80addd8
-EBUILD kldap-21.08.2.ebuild 652 BLAKE2B b300452b0cb7d3294fcbcecb4cba2a05249feaa4ce61c9c9bf53cb1bddcff24d4de547d445ad5cbac1afacff3b249e05dbaff7b3999abe2dfb1cbadcf7f8b7bf SHA512 3454035dabf1143af4248540fc7ae769676f537192b1a91ef7bc8f2a0f62bcf2c36317c22c1e0a2ea2a4b086b4aabe27edfe4d56ac32b0a9c11f5319be647fbf
+EBUILD kldap-21.08.2.ebuild 659 BLAKE2B 5c16c623be4f382a10fcff5cfd4fe7f2476633331bf0ea00b3624f4ab174fbbc22fd51bcbc5d340b9f13255f38be96de6b3f2c6ab260f768d5ea33cd4380c300 SHA512 44dc1b532a11579216d19dd223b31c42630f67b30003cfae1e165a98ed9b96f44a640efe88b5344e5dcd2277b0532fc497a2c64470470c6a79a03ee5518c3155
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kldap/kldap-21.08.2.ebuild b/kde-apps/kldap/kldap-21.08.2.ebuild
index 06c268d597af..005425aa7109 100644
--- a/kde-apps/kldap/kldap-21.08.2.ebuild
+++ b/kde-apps/kldap/kldap-21.08.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index b475c8da25d1..ac51c679dcf3 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,5 +1,5 @@
 DIST klettres-21.04.3.tar.xz 47137188 BLAKE2B f62f524b5987428bbf1d65fb73c57150749e3f5ff629f1f9a80002c6e67a82e48e8af5a5fc3c0b599fbfc9b821a5c5eeabd9b27381d7be71fabc78f5c00be3be SHA512 33cf32acf0be7e62429e36f12bb84e04b67770bc07a238de8959c719c0fd6aba9515c56eada2e6004144e2311ad3f899040f8775d494c6434fea9482cada104d
 DIST klettres-21.08.2.tar.xz 47137608 BLAKE2B d7b2aa13e0ea164bc840526f0b76b4d588ddc132a11a43943f13bfd6030ec8563ffeb51febc2f31e5af04b2fe0c89e9f09935d0af366d8040f16e4a3e85bd8b2 SHA512 a9ee53483b6f9b0a8a560d20cdac26ea2c4b5ae02213137a87e0b295e17f5b443fd7c9925ef766bbb04668457f656911fdd2f61ae7478c1118c47c83a654c737
 EBUILD klettres-21.04.3.ebuild 865 BLAKE2B bfce527ddcdb489bfb2ee2928f558b876f58a20f69d6bc7a5f637f116b15467d9a34622b65a5f9cd3fe1db8fc9bfa87d82f0d6cfedffb58c3cd24a1cf9019837 SHA512 ad81bac809cd6565ae23e1c9c3bde51c2cbbacbfe7be45fcc54a6e8dec049a2cd2c6582fd2f5656dd3b7dcdc77815762117100d7525bd3f363b34fdbb79facd5
-EBUILD klettres-21.08.2.ebuild 868 BLAKE2B 35b2cc8dcdcdbcd097b25ba9891aac0b5fee68f5fe7ac369a1cec4a96bb500104e5571f9b85dcb4d116df1f13318bd48878ff0a78d068712d330602690bae68e SHA512 7535ed327f7502b2fad573cf472e17b9f0ce954187c5a93966880b940cd65cad4ff2207175c405eb6436e65a99813a08ea552ce74faee329766999b0aa84029b
+EBUILD klettres-21.08.2.ebuild 875 BLAKE2B d669b24684fba7ce9e2a6e0394de4e02957b09965bdb6c4713882582fddeec933d1beb6d55d52e5bc4bbcc4180dde26875441378f16933b94ed40782bb8368f1 SHA512 87c200565f7e18535e3a789fb3e821917e64b8a69f82ed0b44c3a8431ad457482ecc95a73639a1a8a799a6b8cfaa7ba45d5fe2392e0f162ed5817072f292fae8
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/klettres/klettres-21.08.2.ebuild b/kde-apps/klettres/klettres-21.08.2.ebuild
index 900d4fc27d0e..f663978de59a 100644
--- a/kde-apps/klettres/klettres-21.08.2.ebuild
+++ b/kde-apps/klettres/klettres-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/klettres/ https://edu.kde.org/klettres/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index 9c18d251c2e8..d7673d2ddc99 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,5 +1,5 @@
 DIST kmag-21.04.3.tar.xz 705548 BLAKE2B 0a2c353317189e41e09d40ea091e6f075a6145a7090ca3da8bda379ef75ec9905aff7f0f7c146fd1650662b95e686de58935293c8f7bbc09adbd31554219910b SHA512 b8893a9ebae7c0c2f15b27e0219f51992a3670783c5d84caf9b371b72cf0ec8d80580e067d2dd0d1b6ed86b80d71cb5eb383cd45f31dbd27809e6d73fa5668fa
 DIST kmag-21.08.2.tar.xz 706208 BLAKE2B 440bc84b6fbf3cca23e3a995a492f4db65b360474cf97bb841d0d8b832351aeac58b294f876c2a424316e494b354395a5c4a32c343ebed3b14a261d3006fb36e SHA512 6eb3ddee07c378557ed734cd3583d0f257f75570956e2c22d17f6a9c8dd9f880658ced38b7dbf702868076d66059307c9c82a3c4943f7eae42101ad3b9cd5af2
 EBUILD kmag-21.04.3.ebuild 938 BLAKE2B 484f0370a931f030085b73668c3d4899aa2f46d44c681118f4d4c93f9f3f727c168b770823cbd2f04230c469c43a88fbc11b5d33d383ed72f9ff56d407e2e578 SHA512 051cde4ff9ad39a3b800045aab604fe11bd07d7d287d667125201b474d346f08bc9de80dd2dc4fef97411c70e34dc6479b44e3efde889ebdc8752995689652b5
-EBUILD kmag-21.08.2.ebuild 941 BLAKE2B b7ff1428311bb0a7e7749cef2bbca03c8a5fa97aa2da58a49d13dda813089cdb5f7a8f9e453db5fca65dbe497caa1336fc4d31a156e364c23f87b14a8474f822 SHA512 695cb730bc9e607637f35443c21ce66f9182a6f63d4386db4dd37a254978ca2780a197fc1200e9e0120ec0ccafe95c2a89eafdebfbf60cd33b9138bf7ca6fecc
+EBUILD kmag-21.08.2.ebuild 948 BLAKE2B 2783190e25a3d7feba5a1d6738a4eb31b575e57f1142d4a9a449c921bf5265a4a65b0e0c2dcf8a092e3a2e5139d93db05f96a3f159f0c383d57e4186007da8e7 SHA512 3f1c39d23850bdc93868b94d9ef0d2bc95877d63027de6000a615065dd0e4226d88743104acfa6bf59f483672a0e9e21c695e51efb30d762257c6db19336c39e
 MISC metadata.xml 400 BLAKE2B c475c15863f12df6a31b8bb59b12b1dc8d66dc6651bfde77f73b1d546db577593a3d33bc9dd1434a5d16baba61c1cda5d22b3b31648b5601dc8c6e7746090c8c SHA512 bca2129e14ba53dd116f7404127deae59092bd6b4ecc239c0f9f4dcfc8076d22099439d491c6ceab9033318273480902277530a83bace4d54cebb2ef854edc51
diff --git a/kde-apps/kmag/kmag-21.08.2.ebuild b/kde-apps/kmag/kmag-21.08.2.ebuild
index e8ef90038b71..14aaf36e3c8d 100644
--- a/kde-apps/kmag/kmag-21.08.2.ebuild
+++ b/kde-apps/kmag/kmag-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmag/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="keyboardfocus"
 
 DEPEND="
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index 86f7c15095fb..07659f525b36 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,5 +1,5 @@
 DIST kmix-21.04.3.tar.xz 1161920 BLAKE2B 2b59ed9ae41daedf1a3e581e98bee02cda4b6499cbbdeca3431f68e79119b6cfe88686a02af06009e24ad1894c9e49aca00415b5beee784211c6caa45b106971 SHA512 9577c5e9de3dc34e9301d52ec1ec436fdf4856d89fbb5ba735f83d3ea2af57ef308884ba5e18e7b989b503e3f73bb87428d9873d9034778d6d7fcbf47750b8e6
 DIST kmix-21.08.2.tar.xz 1163720 BLAKE2B c731685836bec29f8216c7d489dc35760e05f22746eb1d33b058ee65c52c0b66e008e3ebf2e439294346a81c27a11489a3c59c1df7299456b2f382f31baaa7df SHA512 0c759e97da40f81eefaa6993655591c9f9233f6d8fd6dae3e69fe63aeb70c9ef9aec71dca7938bc7ed2ee7ba963f2280ae22313979f0726e6474e20d0faa4628
 EBUILD kmix-21.04.3.ebuild 1425 BLAKE2B a2651a42d35589c58e57954d2ac567d1d614ae035163e7803e9582b4dd1272ff7efd982762e68d5eab323540e3d520257b882b0b6814cd2e576ef7b7571ac120 SHA512 7692e8e4720bcad08e762becb61427db3c7cf11d7e6a074577f40139ad34398c3b9afaa639a12ef126f1028cc3a504e2a9fd3a89ee4d6abaa515dd1f99cc8ccc
-EBUILD kmix-21.08.2.ebuild 2041 BLAKE2B 04df025d41ff87808f162714e7dc43246ca5307db4a484a63c5cb46d4adfb4d4ebd2f89decd690ca9bb265eb809da01912580c32614d2a744cc7f04bf67d44af SHA512 ebe8de40029f17a46d973de79408fca798a0196044d63295aca5a78c09d456c5f6d751bdb7bbfdc69302eaaa79cbd72fc89cff7dadba193a022a347c672a83c7
+EBUILD kmix-21.08.2.ebuild 2048 BLAKE2B b41cb5a73d0c52bd2c473e2ad836ec2846284f09add26309cd9d71f6dff810aa1bfcbaf21334c508ff3e4ba897b0536ac950a3706244b3d6f91488566c678b8c SHA512 07aed19b980974cb92a0e8e0bb6c0bdbee8708e40d5640a52f21c93cbdb309de63572df5336a680ab9258e40f56ff571ad46ffc785c85b2a310959ff20aac0b7
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmix/kmix-21.08.2.ebuild b/kde-apps/kmix/kmix-21.08.2.ebuild
index efa82bcb2a51..23e704872886 100644
--- a/kde-apps/kmix/kmix-21.08.2.ebuild
+++ b/kde-apps/kmix/kmix-21.08.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kmix/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="alsa plasma pulseaudio"
 
 DEPEND="
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index a6f82f55a5c2..e524e3f4faae 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,5 +1,5 @@
 DIST kmousetool-21.04.3.tar.xz 120804 BLAKE2B e66aa46e1681aa234fa7be0a754fb90e48f678570598d09c7d58fdea9db0abbca199a25478c59f88a772c1de9a97cb3da33981bc6ac6e1bcce1469f494712808 SHA512 4c9f4530f61950fe0bc94dc20baa3d9d958c677139f3b8d06248fd071ccc1d9b2dcf1de69bf2a434c4ae634f46062c77c5041407afe929dbdda9fbe3e11de42d
 DIST kmousetool-21.08.2.tar.xz 121776 BLAKE2B 9e9d5aee75f9b9b98e6b2a5b14e2c33b3b693076c0222f0cd41b8e53796c5f0751fe5da66989ce677519b50a26fb0b80076ec431e42149b95e65058269694423 SHA512 30b1c58a6f08f98a64d38f69fffd902398cb6931f0ce72f93b16e347724b8b08b5783256730b4a60a0ef139c51dc4e865542f9d14517820ad8a47085c6df0e3c
 EBUILD kmousetool-21.04.3.ebuild 857 BLAKE2B f614fa124a1a4c9a6f0463ab01642bd24b75dfc6bd09e9a9cc768a2de9d96f72ef39a8834a7011ec97e9e51515e2ea1116aedb026b3789995527d2f4ee3dc4d7 SHA512 779341bd1abb29af6ac849473817cee89e96dbb30332037fc9704f4e3f81d53f3f2cc5b78a0a1d47047986b89f29d5cc99f7937735198e9dfe7dac165cf595c8
-EBUILD kmousetool-21.08.2.ebuild 860 BLAKE2B d456dd9ad9fa21b0e2ed0df47d16da3982d36096f528cc5ecd00a700b3c2886bd789d670ae0fe854d4d55d2a7d6eeae005e6644a043b2f089ddc6f94b05e840b SHA512 2ff3ae07da8a2fd456f6dd8b1f2ac6018e1ad561f180a4df76266ac43108ef70c1bfa7a2a8f0d54774f7623b3c114db6b5e416a841df8ad505b3bb1d1523c503
+EBUILD kmousetool-21.08.2.ebuild 867 BLAKE2B d1971393539a1cd37e8dfc7b41040fa0adc83010976f5a759681edebbd771c8c140422bcbb6ba8e6dce5e2321bb6d29920fa90c0341d9cf713a0d4ffe8158b06 SHA512 05fd55587de2e7f45ba2da2609d7ec82ce65e75c60ffb7a38bf5d5e79aa8547747746d07976735381639441bce96758b9b512b6ea22eb7c4c14e3d19635d66e7
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmousetool/kmousetool-21.08.2.ebuild b/kde-apps/kmousetool/kmousetool-21.08.2.ebuild
index 60d66ff1b66a..850a8a06de27 100644
--- a/kde-apps/kmousetool/kmousetool-21.08.2.ebuild
+++ b/kde-apps/kmousetool/kmousetool-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmousetool/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index 1392a636127f..434843e86fb6 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,5 +1,5 @@
 DIST kmouth-21.04.3.tar.xz 2100112 BLAKE2B a1ec149775757575e571737add5e74e2a4ccb72de419a27a3936f783b6f442c5b99c2b02fd90677e20156e7ba319aa76d1842acbfca8f7f9f560ed130e0ad217 SHA512 f4d807ea015ed03240acd2a031ecfaec613c74f6f0939bac74c8b48ccc82ff5f6a7ce0be6789bd8dc30cec8a6958b1b7cc1f7a6aece4910d394f6eb8b36313c3
 DIST kmouth-21.08.2.tar.xz 2100844 BLAKE2B 58400bcffb0c888ffe4852c31214d22f48b16df6227f882f7a95f199949d769e16002cbbf4e70b90f0c2347c44996e799b140ad27c9b6b4170189ab316fbe444 SHA512 e3ecb164d036e1d867f515d8fc5c316827c3afe667e7b3a19469444299db5e53931531ba2a662333ea44281a35ffeefee099a15841404e3157af64aa11139673
 EBUILD kmouth-21.04.3.ebuild 886 BLAKE2B b4f25657eb34e773f029dec36efef755bdddd32ef5a0b183f4217a47662bbb70f87514150f85caabb73acec95898bb8445322f48728281e5bfdad1d718cd92e9 SHA512 17fa0f1b9ddfb1522200482f7d0f13f88df688bc4d41200c27c65e319306a0dc484ebe04105b121ac28be26d710e625d34c8e35879b5b9cd43e0b84246d22795
-EBUILD kmouth-21.08.2.ebuild 889 BLAKE2B e8c51e46947bdb3f326815a082b7517ecb5bcdd868ae3a80132692f784b12c7b139556ea7752193328dbcf3ad5c5fec6baace53fac4071cce82368745e959c37 SHA512 1da25967c6eda1f91c67d978522e7c068dbb1384403b187b6e8df79b8243d32ac316a67a5e9bab84b3512fb9770e3296d537044e7c3cc6bf2e0ae004c11a756e
+EBUILD kmouth-21.08.2.ebuild 896 BLAKE2B cad9341be7827171b353d2b892d430a2ef47f458c073328b53e696b53563f74a6be143d6f139b591a4329a66d666a91ff183c6629e773ec7e375062f03f3ea9d SHA512 5d5a216cba5705ae763473e1d3b967ac4729cbe2dc164504818bcc0eee71f585b189f5fdfb5cc77e126d5c4927ff6c954d59de8fd4350c2be483838d8d1f78ed
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmouth/kmouth-21.08.2.ebuild b/kde-apps/kmouth/kmouth-21.08.2.ebuild
index f660c733e3a3..85eed817aa6b 100644
--- a/kde-apps/kmouth/kmouth-21.08.2.ebuild
+++ b/kde-apps/kmouth/kmouth-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmouth/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 415d26ba369d..d899fe9e52bf 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,5 +1,5 @@
 DIST kmplot-21.04.3.tar.xz 3043960 BLAKE2B 2123ec11b1ef05bc9d744f37095a7df4d5171cf87609eac45e405b7b11323c7ca4788b19ea092a15042250a35e01ec877b26ba06091886674585395d31590252 SHA512 80ceb936b6cb41ff3976fd7b4859ff9e54d0ab24a6d8d90690751b114749d55b70e2e1c07a7440addf8bc88c6a9fbc42d8cbab9aff49b70e808edeceaa8ee8f4
 DIST kmplot-21.08.2.tar.xz 3043140 BLAKE2B 3124ff0719026eab437cf3d0a8160fc3409faeafab792e4cb43ecc01c5325bfddc2b9aec63710299d756f94802e4d4c5dd2f1c9f6c9408a9d96a75e5b1e6260d SHA512 bb99a3c96228357b37f6943718693579616c61f3cdb47745dd5e0f146caca579838ee3b610adaa159a16b1afab8082c7b2dc087c8b4025501ad7c7352daaa82e
 EBUILD kmplot-21.04.3.ebuild 1055 BLAKE2B 3f3e27c73ecec595a43e3f2e7aa7b5f60bccc7ffed8e5a591013a8f236dbee293559af2556e3917d4d85661576198744cdf0734a003662125c321bf4cd2f1b6a SHA512 5accc42dc27ebd55339dcbd7538c26fc366f7670d25425e6352d6bd67d95c4583692420cc65b9d5f800d42412783662189df6be5b304e68106020b8c0e7c4c73
-EBUILD kmplot-21.08.2.ebuild 1058 BLAKE2B 44534b68cb58e4d1c4a0a61f1f36f3c7c93de3f147a21dec7f062b2025c331ecaf2b84cd406a0e6e62f24c7c8e6258db491e2eeffb28f920f7b6af9844ac39e6 SHA512 dd3ab1faf1c9915e34900963b6c5871273bc82606c012a792b33a3856aff211c8c85127c71725f3fdabd74046af708275a21f77e18e50e74c47e743ed12fbb02
+EBUILD kmplot-21.08.2.ebuild 1065 BLAKE2B 4b80fc974c274044678dfdeecce09e2fb85c9b277dafef62f64ac99c511dca5df382cc40aa8dd92689bcf982cdcb047f470e5dfe89200c77a1d4978e7a7ffdbe SHA512 040abf8a727471e8bdf6d916b0ec4c87e00427690546c6f6af91e63e0dc58e525d8c271593350d90986cd9f014ea17ca86279dc9c6921dcb2a8ee7ccb8cd5164
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmplot/kmplot-21.08.2.ebuild b/kde-apps/kmplot/kmplot-21.08.2.ebuild
index 03cbbf60ddd2..e3606ad71348 100644
--- a/kde-apps/kmplot/kmplot-21.08.2.ebuild
+++ b/kde-apps/kmplot/kmplot-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmplot/ https://edu.kde.org/kmplot/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index e241f7f49f3e..424ea3b9aab5 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,5 +1,5 @@
 DIST kolourpaint-21.04.3.tar.xz 5714920 BLAKE2B e8fb4d34ab677eb1dab5c8fd80a7930a30f42aea79626daa67abea9fa4fa688ad5ac60c5e2cb31c25942a695a8848827b73efb7ed0089f10acaffd6986f355d3 SHA512 9ab0242752bc051d12413772c2d4a0a38525c5b98283c58ea64802b649c6887ddd865dfc9a19abf93871d08d0017c7dd1daa1c555741e61b777340e6415cfe81
 DIST kolourpaint-21.08.2.tar.xz 5714988 BLAKE2B 0f2e4d3d5a08137d5b26444588784120d964ebf22daa42de257d035cc9a8c1da291d96bf8097355f19e99c9f3c8195fb91d90fbe5368f43cd95ebebc3a78661e SHA512 f79a191080192de7271734e33019b7cdae2197d46a62bed9250f0fffc8d3ebf392b6115ae9b5264dbebd5fe3f0df340b8f6afde2a5525634afeec291dc9ade85
 EBUILD kolourpaint-21.04.3.ebuild 1143 BLAKE2B 2bf523676681b90dfca88220b572e166dee39787cc9afefc09652748e4a438b0944bdfbb00c916051b68c21a0febe5c876ca28ce6cde49147eb424a058eff303 SHA512 54ed2685ab9c886818767d8a251a129aa91a9bc27b29fca238d8e567229078be3d1bfb763b43c2bf8d74f9fa9190f6a00322b9706776806007f7caf36f1b50d6
-EBUILD kolourpaint-21.08.2.ebuild 1146 BLAKE2B 98d7ecf5362a818b1d0814f0fc33745ca32e5b93549c80f6db6a0030820919e49c70866e46eea430ea5b37fd2adc5b0846afb4613aaeff79bd655ab823a01e80 SHA512 1b97fa369cd223de7ef7ba42f90d97196a9e0cf0a536b041d3feebd65aa306efca26b5bab960ce35529d21f6b27dfedc67bad7f6031cc76f306de5f6ec6784c6
+EBUILD kolourpaint-21.08.2.ebuild 1153 BLAKE2B d124a9c31084a8a3479b9978910a44a75f4568c42dd91e3b9dad0d122369bffe06c55165b9446829bd9574fa704a114656322a9b388a0c165816d6b39edccbcc SHA512 f400765386cbffbb2f278dff02ec41008e8173f9ddde624f4f87a820407c014b7ff478bb5b7a51ebfb913dc1faebe1c8052d71fee7b4923037e63a53ccb2ac8b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kolourpaint/kolourpaint-21.08.2.ebuild b/kde-apps/kolourpaint/kolourpaint-21.08.2.ebuild
index cf6253c19882..5a6554f4df86 100644
--- a/kde-apps/kolourpaint/kolourpaint-21.08.2.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-21.08.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kolourpaint/"
 
 LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="scanner"
 
 DEPEND="
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index 3edc43222b2c..e198394c6f6c 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,5 @@
 DIST kontactinterface-21.04.3.tar.xz 40136 BLAKE2B 8d2775ca21d400009844772134d059b50d28a3797f373aaf392fc0d127e88e9d1cb97e3601978ca1faf0eb66de12c44906e986f6d652542b287e7340715ac516 SHA512 e01fce2675cce7885f9167aab9fc4ae6d167e8c58aa6e4cb8fe9f714f35f02ee81700d5b86663f28fb9db802d877d2aac546e25ab9d23358a5e6c8ba3bf1f18d
 DIST kontactinterface-21.08.2.tar.xz 39636 BLAKE2B aac38d9a888230d0d38e2b651274a08275db671f68da224359d6dea21aeeed732aa1102e1797323e89c1f0725cc4342422aa0e8806db7bf33b8a498eba922ece SHA512 79fe6a38e2547ff13ad2495c2a4222efda61a83d76136bc70205550f5f5244e1be27c5921517d87d8d79eaabf44b1075945a136a4643bbbdd4a2b0e6968c19bd
 EBUILD kontactinterface-21.04.3.ebuild 711 BLAKE2B 18c9e964baaf4eee9f2ddb5bfe8cd555760678718a75542ea35e649d3fdbedaacc164ced47981606eed961b47dd524ddd39f3673d840ed277357d7e9989598e8 SHA512 e708c82d245a936662a62a57d923deffe7fa372fb9593bf28d5b49136413f1ebd3981c5c2a8a41f9778650d3c4d81aa5fd89d62940be0b4a308656c815d01836
-EBUILD kontactinterface-21.08.2.ebuild 714 BLAKE2B 73d40ff836a1354e434cde96ac7ed1d7aee17268c0cde632d6b93c63f9c3c15bcd65ffadef241c56b6788466a8f1f64f478f1be472bba904c642f3791841e38a SHA512 0ac5e098bc4491d34771e59210bf43a5a728fe06bf3668b7f8c5646984ab711156a296b372fd20b62e0b8b626df067c11c03f7c47309b5cf00c34a4f934f9dfa
+EBUILD kontactinterface-21.08.2.ebuild 721 BLAKE2B 74ffd5caf46ebb098e5f932add34fc7270cae8e7d06ae06a482d7cf9eb3b60c633fb25a7fa5c75956b2ea9fe249e3ed868e38d526e6ccd023a039f7872ce3970 SHA512 985e76cf6a53f4ac1522d40504740cad007480a08aca0c0f12c83a82f47ae7092e0edf0a97ddd980351c0abbe22c20df9b9a8d162258b8557986c942b261706f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kontactinterface/kontactinterface-21.08.2.ebuild b/kde-apps/kontactinterface/kontactinterface-21.08.2.ebuild
index 548da71a041a..fd166f525089 100644
--- a/kde-apps/kontactinterface/kontactinterface-21.08.2.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-21.08.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kontactinterface/html/index.html"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index e7a665e8b294..008464d80c4e 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,5 +1,5 @@
 DIST kqtquickcharts-21.04.3.tar.xz 29932 BLAKE2B 6fa241f9371341d62d7bf739e6e27c8568e425482ab5b71247784e368a4f98c67fd915aa38bda3551f11b2fff778797f3b1ee7e130ff49d374659c4feba82bf1 SHA512 5e6115cfb12aa1d1d376467b168ea171e4254dc66125e33c248e2bd7edcbe1a2d942190c800d8659c292cf07f7e824ff57569fc6e8e685c10eedb125f87b1bf9
 DIST kqtquickcharts-21.08.2.tar.xz 29928 BLAKE2B c14f1dd17f0cf4a5936c195cc046ac62b6ee6595b3958c329395fd12c1fd27b266c3473e9b020e6246adcbb6d2837eb7c2c884d3173de8aaacaad078507112f6 SHA512 f4496813eeeedd65460307b5ddb372ccee4cfa7d5e5500edffcbd09e3ebe565fb661ef393ed76f87cc27f6d077780f80f83d1f2ee9ab420e2960b0fd93a2bbd5
 EBUILD kqtquickcharts-21.04.3.ebuild 383 BLAKE2B 31a11a843ae6e87a5ec739efb0de0d319b67fde33781a981dcfbde59643cdc7ddd92c4bacea531f7d93ee477f30edcadf8098a1e228015f7f6e9256fb61c1009 SHA512 b70044f5f988742e3770929fea6e4eb32629d4bbb12d4efd0c86dee187e2f3d457d58d4964e1d7731c5f24ccf4536f2e77d9e75fc1198364efdb1ecb8e837beb
-EBUILD kqtquickcharts-21.08.2.ebuild 386 BLAKE2B abbef6de81094c38dd739dc8b645ddb5634061fd68bd587439aa94a08a00dd2c7e5e9da078ef7119747b69a281f1780bd4ce1e2261206e8a256b47edca8b5477 SHA512 bc729ac90f2462d713ae65dfea0454b93340b8566f9fa22b090c724150d55247139bbb387806da8cada86ac80fa94cf9114482c23ade6e2f02eb1a510e74efb9
+EBUILD kqtquickcharts-21.08.2.ebuild 393 BLAKE2B b7836e1024624b96a1041c558e9eb3fce62a6bdaeee5a116310e19c80f1d21e40fef51cb79d2c12934c37f2c4858896137bbde8c89817ff6a0cf046465c26bdf SHA512 af27e6d13d91208c6ec3f91c511901954accaa3b0d0a70236b9340af6d3e055d8b86e9e2c493788b91edd2baf80dd513232d2842fa66f444c20075189893d4e2
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-21.08.2.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-21.08.2.ebuild
index d99c4103a845..6278e7dc124b 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-21.08.2.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-21.08.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index 7d1fcc067e3a..105b467dfb87 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,5 +1,5 @@
 DIST kross-interpreters-21.04.3.tar.xz 151580 BLAKE2B cb73044d83e31ed9937605263815d328a6bb86e7a72224dd9bf64a6491ed001ae9bc87aa079c0ed1f4836695ac8100fa7ee97f879948e90957a602dea684703c SHA512 cf289e923b0c212e0a6c973795c6afa264d0fcf1b126debf6fa738ab326e0e7ee50a487ecdf59155214ea075777e6fb905621f7784e1e3e61132e8856050a462
 DIST kross-interpreters-21.08.2.tar.xz 151504 BLAKE2B 5c40d06d37c5314b032b99dc864e097f838c881a312d1023c50bbbf9eb1fc83b579b63dbda42e44f87b7a621c74773ddedfe0bdd8e8f3a74f701812447259644 SHA512 23dd4f62470018bb98209dde240e099894d50dc5914526737b9e19c18174b5cde0b324404368c5113faab776c4d2b5fb9ebb5a7163f8451d6abb12fef03fb6d2
 EBUILD kross-interpreters-21.04.3.ebuild 611 BLAKE2B 2e693eb82ef74d03eb7c0e1477478346a6b73ee28b234a1242eb66503d7acc60768b84229b086dd5fc7fd0e52f9089f91baeefb7dc5dc6d0545d5dd3c605616c SHA512 aeb4249100e16aae006fd1b551a3d59323212fa7d8166a1a234879961c3880acf7119dc1161121e1414b54d90fe6934d78789103da07741869dedf2014e0923e
-EBUILD kross-interpreters-21.08.2.ebuild 607 BLAKE2B b302e4d34b0529938d82697060f7324c88f1aca3dde681b8d868045fa4937afa404ef4f37b8ee27e8826099c2e5f06c2cc0b7411718e1a137800f7b86eb451b4 SHA512 fc88dbabacad6586ad1989dca8f0c408297674a7899eb1d709333c1e4d191c4304c636b164d5197e459d7f2e6c3fbd09b47745ea35103939f31a79aad4ba339f
+EBUILD kross-interpreters-21.08.2.ebuild 614 BLAKE2B efaed670ccbc819224c083871a6885aa4e47d1656ee2b934a2437397c80e575442c26ff9fc439b9093285596229548eced4372c259ba996a3b81ca1902c7a029 SHA512 718864925ec09911691a84e87b03230390f706a5a7e4745af2737b6ac707df1ddee4414449024f8a15fba220c79bf08bc7c8e0036443b7716dcbc372dd523bd3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kross-interpreters/kross-interpreters-21.08.2.ebuild b/kde-apps/kross-interpreters/kross-interpreters-21.08.2.ebuild
index 35a028ae36a1..46b028220818 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-21.08.2.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-21.08.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Kross interpreter plugins for programming languages"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 6bafd6fb31b5..9087010c36f6 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,5 +1,5 @@
 DIST kruler-21.04.3.tar.xz 275880 BLAKE2B f12f45353cb7fa9fc0253b94dcc302578c94d1fe2faa91451d13b065e6172e5a1065dd25492474383cd1666581f7126e9d2a8a28990a5b5d5889e21a111dd3a1 SHA512 e5ee427bcc1de89115eb7f8492c0da7c5d2dc0939b619f344c81ce79119ace6520565312321f48e584db5142dc5c7cb3d5ad05b1606ba060d76a54202c395360
 DIST kruler-21.08.2.tar.xz 276960 BLAKE2B a78ba5656fac9649b2f8bde9a5fad7b7486f4f9cc7f3d700a7d13b75556a66c742e9e959ee59cb1937fc120383f7a0919150a25b4fc3fe161d777c9e00734d5d SHA512 d7990d8486f0f86e5e706e1e3aa19fa400c16e9e1b617691a5eee2ec2168b2b324631b00741833108a4e1d0c4b53d53dea602fd93515a7a16053f487b16fe668
 EBUILD kruler-21.04.3.ebuild 934 BLAKE2B 5e29780b8492e5d6bd1ed1de1b68efa946a1f2f3b9b255e984aeb7f2439f6e4f6a53650b0ed72dd24bee4705bb46d95add08f530253e5fe3c00b52dd1dcb8509 SHA512 8e0660f1c929e1f4b57d0daf5037012d5fcc270860eeb996555b994441c0c18b69992f27f0583295a71a2ef10a67e9f4f4e38ac6fd04a17f21a0caf606441244
-EBUILD kruler-21.08.2.ebuild 937 BLAKE2B 912b3aaf9cde5ea19f63f73028f99b3eeb2e66ef8670955ac11058664755861283376427a63a2657450794c6a3c5a313e93f2124f53084209c55b04ff0ca6da0 SHA512 99e42c5b920c771fd4694fe7da9a876894d258bff463e5a8e63f4e03f595ee61b1a035ab70af0c837b74eb4387aee8332c00204271f7a978d66e34cc6b30d6fa
+EBUILD kruler-21.08.2.ebuild 944 BLAKE2B 0839cd4a59647c18f4f2d3b92fb30747cc1291c93d75f468a6bfbb2ccd80fa9d470b10284054a8a314fec0a1bf707b0986c4cb8b7c9a83acb2a3f639d8e9e24c SHA512 f985db3111628588a0a4e5e2c66ecba039c07bb0de5c82def894601276260774313b820b70ad804bf0c9147baed2bc2f10004880ac3dc70ae1c8dc65a2e0bdc1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kruler/kruler-21.08.2.ebuild b/kde-apps/kruler/kruler-21.08.2.ebuild
index 4c360324fb2d..70641aed6d3c 100644
--- a/kde-apps/kruler/kruler-21.08.2.ebuild
+++ b/kde-apps/kruler/kruler-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kruler/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index bcc8ad701788..6e8d690c3e39 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,5 @@
 DIST ksmtp-21.04.3.tar.xz 47680 BLAKE2B b1cea8d68e19c2512a7045231cd76b269f1b006278867770a1877a2707d01f06dbc5d5bced386baa412ad62ea49507b6245e2722cc5510a9450dc94049bc28d9 SHA512 b29e18e6b6b489e60fc100b8570ccc056babc2e6863e47d1f811e99bac1423b269939189763fd46b55ff8e8c31c9b219c30850e284de629a5b3bd6e61f3f9805
 DIST ksmtp-21.08.2.tar.xz 47512 BLAKE2B 89ab6950f6847cab3c2f60bc41570b867074bcfb331184dfeebcd42c4851466a190ae691da8718b7eb5049279542775866ce037c959d871e69b2a4ffefe7f9ae SHA512 66594151ea2b049aadbda293e326a50c0a440d621a3f9c42f0d16c4fce00474ebe1b2a2274349ab6a38a7d03fd4a412a6cce5c1ace3cc16dcfb3ee555cbde4c9
 EBUILD ksmtp-21.04.3.ebuild 602 BLAKE2B 92dfffdc7fa470c5e4519848b23895272b1d0cbd89353b2773f002c07f4c9829335b1e9f64ae4a9e7cee6bf4774048805ce3f5fc1e247c0bcf1d25631a3daaad SHA512 16ed9163d9862141adc44552adf63bc083a17c1739045fd9789ce94de20e0f36e7c2875c67f2004e17eceab885929cf5cf6f3dc655390403a44f0ca79deaa40b
-EBUILD ksmtp-21.08.2.ebuild 603 BLAKE2B a6f04df9a7e1672fdf2a7d9520a52b192764e7af66bb2855547ce4b8a40b5f7bd82b7194019dc323ff2a9494ee595e70baeee03a606899094e00951e404ec8f2 SHA512 c87292279e233a4c59512ecfabb1258cc8a77c09c6140c68027ff98a1de8b89b21699bc6a7ae2174fc4107ee544cc8742dc12bd35ff0c10d69be1820bf313739
+EBUILD ksmtp-21.08.2.ebuild 610 BLAKE2B 1bcb74a8bac6645baf92bfaeab331aa422250ce1a84ab70addb374a1c3e0b80b1a51f92c762098a0f88da66a2ea8e96a4279202079dcfd71580a5e31406bb504 SHA512 13f2b842ee03e8672a8f8f33a8a796b71eefae48b3a3e6b646ecf9ed5cdde968d668b8740dc3df2c0c48152e826794b9809c22c6a286571189ba4b95c177c65c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ksmtp/ksmtp-21.08.2.ebuild b/kde-apps/ksmtp/ksmtp-21.08.2.ebuild
index 786e5629c92a..443ea92ebdb3 100644
--- a/kde-apps/ksmtp/ksmtp-21.08.2.ebuild
+++ b/kde-apps/ksmtp/ksmtp-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://api.kde.org/kdepim/ksmtp/html/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index de8368aa52d8..a21ba5aaf11c 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,5 +1,5 @@
 DIST kteatime-21.04.3.tar.xz 298404 BLAKE2B e5be1c1a3988947c7b5cc00b48cec815605e922092374ff1ca0ece66ff10847e5fd95d0148608ace48259a79da3edc5152c0feb218656f39945c9ff02840810d SHA512 68775870910e90d9c462fec3b10c79d5396ab0710296ea55651534a3f3f224463f29a2e7a61841c2dca20d2f778b178148acf12d30b762bd362a37a6c6a3eb36
 DIST kteatime-21.08.2.tar.xz 299332 BLAKE2B 2d3c9e779556afb509d9c4dda998cc54578e1a7c606b0c82c19f330892c819ad9823ef88a414703cea86e3935861aadcb02a16b27b33e1f6f0e98fc3b7a08998 SHA512 d286c0866de182dc1c2a5b887415c5be4e1a00ff8803906cf7b3fc3a4b40577ee952a5191e2fbd6420317dd64cd6a20b6c8f6cb993eb4c147caae63fd8f9cf75
 EBUILD kteatime-21.04.3.ebuild 856 BLAKE2B fd93bb45e849828a4cc4918875251ee695a6b283c166647e54640ff60b866b563ec44b362fbcecb145430d7ea40f7956826084a8a4099c6dc11c1de948f8d1c9 SHA512 4f8d1284c54a17ffeb01f59d4c26f916ebc11f2ef6c63b5f23ee7defaea62381f897f40d7059236ddc8c43dc4f9eceb0e74aac862d8068c4bdb4c8ed6460b46e
-EBUILD kteatime-21.08.2.ebuild 859 BLAKE2B 4a6cebb7aa4a0aa7d68e4fe15b734cae0a56bef394cd58af57bc4916762b03046dffb6ac5806ae1d37f28d8ac9d084bc44be687cdd391ccca46aeaa4def41a7c SHA512 b7d820a1beff6482cd908d5f25c588c1befafc28852117243961d13e176c771afae11839a9a8aa58191f4b2149aef55ac45b41b8d15494bd80d966e41e271d2d
+EBUILD kteatime-21.08.2.ebuild 866 BLAKE2B f2deeb27038820abaa9a9346dccfdf77ebc2e0136540e1d514ae08bd53b55ea497560360129001f7d184cd773c7c7702f453dda64d4b2df84c06c0e9c95f6bae SHA512 c81961ac4787f0d3d56e3113cb7649bd92bf5e9861021d64aa5c5e357fc023bf43032f1554b1b2ab21e4985f8b2e993977d06cf1881b29753f62991d4e040b73
 MISC metadata.xml 458 BLAKE2B aa5828711349e9988628ab78eecfa13c6715281c6f55121e5b2e635e06c1a31402aa71cc2db7f8f931646d956339ca5527308fdc9fe88fb2c78bae76f06cbcc1 SHA512 7f53b4308c3e9c8b4bb78d822075acd242f10199facd8bfbcd23558adcbb6d7f4e86d841aced3062c927943d3701a004050407a500f3a207f9afddadc467f501
diff --git a/kde-apps/kteatime/kteatime-21.08.2.ebuild b/kde-apps/kteatime/kteatime-21.08.2.ebuild
index fe90b7dbe177..75557f43fb1a 100644
--- a/kde-apps/kteatime/kteatime-21.08.2.ebuild
+++ b/kde-apps/kteatime/kteatime-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kteatime/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index 231faa6b65bc..6226148c4bc6 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,5 +1,5 @@
 DIST ktimer-21.04.3.tar.xz 388044 BLAKE2B fdcb2780a8ecbe654c7438aa909c4d14ae338f04f3c314e5633c3b61e2838ee9dfcedc03a194d02696c8a7d2c370c8434c566dc648ed27099c446b6917a8cd83 SHA512 3cf8a0387174202ffaab9e901cc4e6bf851403b21d8b34df6b437f13d310a7bd657438fb1c10eb0b238d3d6407334987db4b94433d27187d1cfaacf23c09bc2d
 DIST ktimer-21.08.2.tar.xz 388796 BLAKE2B e29b59f5ee535eb35569f8a85a96111d6c74f045b29e9e14aa13c41752783b8a715b9df5a5d9d9cd9651e52ab3eb888cc90cf18524a3aedfe1a9b398bd282198 SHA512 1715629a772e2107cd99d8f4e8bb05bf3236d369eac6a5896fdc9a5ddf6d0823274ba79d45319e050cd3667df2f4ab3a82b48e4b7d2a576404d33f11d096ca59
 EBUILD ktimer-21.04.3.ebuild 821 BLAKE2B 90773b1d0a354de6e343b653f039688635738c18645bdf52d22df18ecec2422c9270e3372685450ebca0ba19ccfe5568b7c2c5aff016bfb9373bf033809c87d1 SHA512 014300bcdd28a98fe3dbb797eb4fb4b16e51e677dc3fe02f90e1ab87c91bb760b8352dde7f3c8d92db45f688e1d42f6dd12fad6a5e9204a6f1b588bc2a44feef
-EBUILD ktimer-21.08.2.ebuild 824 BLAKE2B cc56291aa88313a2ee34e720ef83094b2d58a6d8c533060c181dc2f9f998d2b3c26eba1193f29fbf7dd361866fdd994f36105a45283b1da7a252843a8b4e474b SHA512 603ebe0e03b1601fb2b4beb33100df732a82e80b35ff6c616885e36a122fe371c791a2ec26c523753e63424a604534f6b6d8a9c38f8bae75f2b50abc5994d7a1
+EBUILD ktimer-21.08.2.ebuild 831 BLAKE2B 763e305f28e1e17ec0a73f0bc6d8c5023e57f55fb36bb28560d64c48c2d9abd2682df6e134ca63fa83ec4639f4c1c6e44e63354753a0734eda10b973a1eb848a SHA512 1ad1c5ca403ac836b714f96f09c650eb33aa0af863228040e4efd0d430d6fc0591fca650ebf370b6c76e64dd3f7ef6cea9b762bf282a240335503033ffa2f335
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktimer/ktimer-21.08.2.ebuild b/kde-apps/ktimer/ktimer-21.08.2.ebuild
index 75d13344a67a..8ac360585de0 100644
--- a/kde-apps/ktimer/ktimer-21.08.2.ebuild
+++ b/kde-apps/ktimer/ktimer-21.08.2.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/ktimer/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index f717dc342cf7..527dfa818356 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,5 +1,5 @@
 DIST ktouch-21.04.3.tar.xz 4963192 BLAKE2B b17d75adef8d30bb0f1a27138e1397ee041bcea3ec046b9887e4f5333f75459ad578dc0b6f6a81f42e6c3f36c0d907d5c6cc4ef7148e3287df33c7c2b80d9432 SHA512 5d5cf00581518315736e5f52040f8487731e2899438ed5e78356755d22dfcbf890889a4510922cffa6e2b8460c4d092f86583060195eaf6214fcdc830da2bb97
 DIST ktouch-21.08.2.tar.xz 4965196 BLAKE2B 89700a6006f8d3ea5f1a9a2f77542bc1c8243eadf6b2fdd68f1880243561936511d487172e84ae28007f9f7c1ea65f59ec516324792d57623682b368863750e4 SHA512 793f72da5fae9fec95decfe1eb3c866688cad9dcbc22b3d3e52f5af321fa9fdd83f0946c05c2150296d3a35fd0c1c4412ec77a3ccf64c1b2a56646696403d594
 EBUILD ktouch-21.04.3.ebuild 1589 BLAKE2B d912cc5742d675ec55f1074463aa80cc46f640199d7fdc19025d3fb6c7f05b37d63e503119c8ab2736d89e8a773546a638769a6d368fc9d259b2ff35b1cc4b61 SHA512 926771fdeb442a20df0b78d1a895be7726e73c588a4a23c383a0f00d2e3f16c7600da6b9bab7198f3397c887bf79d1fd45fb8925526128ff44d94e5ee35d8b5a
-EBUILD ktouch-21.08.2.ebuild 1592 BLAKE2B 0d81fe6471ebe8f77cb3b3b61630c0a7394f0d99241b2cc97f95e0224e21874104ed941145ed491af5af1de4df635730a7b5713bb9b7c7e5da368f5c1c20718e SHA512 3da4e04d7ab87d985402313a8bb30bfaa730e83341321af0287de9dedb69e1fb660f371f26120420365c60b776e45021850e4cada6f2696dee26cd4be9384ff9
+EBUILD ktouch-21.08.2.ebuild 1599 BLAKE2B f71886875812f53b4f71c6ac6a28b3dfe4a9c8bbddcc1b298085bce63591cd7d1a736a594700b560a4ec43581550b194f72c913288ec5124d8f32fddbbadab8a SHA512 f19a61c12c59073e7f7fe7b5e5fafc2dcb03466ba48019b6778d78f085ba0d8505b2734d1c58e6250dec3cc198b88ed9ee5fffb790b42c7b954d50013098315f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktouch/ktouch-21.08.2.ebuild b/kde-apps/ktouch/ktouch-21.08.2.ebuild
index 8a4cc39ce431..114419c6ef47 100644
--- a/kde-apps/ktouch/ktouch-21.08.2.ebuild
+++ b/kde-apps/ktouch/ktouch-21.08.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/ktouch/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="X"
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index f0360791baf0..a25bb99ae991 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-auth-handler-21.04.3.tar.xz 47824 BLAKE2B 21446323d72ed739c900a59a9137276ae5649615e3d5098a7ea7752296d362d41586e72ba3de80f581569d8b227c838710af266d9bf88404e337311c0120a68d SHA512 45fed49e564a98d6630bdb5aa13e0bbb641965241b0936c22b8ab9f7f5696a377a5217fdef3079f70008f4932ea0b00c8f857ab2d3727892ed180f7b24a1da08
 DIST ktp-auth-handler-21.08.2.tar.xz 47872 BLAKE2B 12fa5c8545d6b236960f6ebb19f818c712feb122a99011749383ed42dfad16e98a5d9e15850556255a0d4653d12b331ff71334e0e3b3f4ec38c5222003ee1767 SHA512 b804d70d697bc4cdc703544292dd76049d340be394258c8517a2a4da91346fc8c854025846daf71a8c8fd09c9699d8a31388d9dd699a549f6ae91ba0de7d64e7
 EBUILD ktp-auth-handler-21.04.3.ebuild 929 BLAKE2B 30467458b2a663755bece940575047669d08896101ae26784b739c85ca1994ddce655cbd954d0124ba0e923dd50892dd62bfc98b3bde811bb9f09b662063edae SHA512 a3486b6b1489c64e13d773ff48ddc912b4663c981b128abae5ab5e2bb1d907150ccc7bff0cec10d63b190a51a8cb11822ccd84dfb728b343615643590d9f9ef0
-EBUILD ktp-auth-handler-21.08.2.ebuild 932 BLAKE2B a4e559c46d42ea96fc9474043bf2a271e534487560801e238b5e4a7e55f6423252353cc848d51353eed6c9e27831e7439a316c4419273103d91fa7953fe0ea5e SHA512 bff47597a7c0955b8f979fb32f9ad3c7ca4ebe86353d4d206b1e5833bea710b58ecc0b81b79fcf4d3b2d5ba29681b1cc5b228c34b7fdc566189731dae60cb62e
+EBUILD ktp-auth-handler-21.08.2.ebuild 939 BLAKE2B 7cba50427e11280e1a9f35f55374fcce3fc96282022e0ef4604b4ad96c9f561d47e34ac0ce21ce161bc0ad1090d5b405e90ba0bc0db70ea65642f014b2169e18 SHA512 38a309c254902b752935b26dbeda1751cb3f6ab4ddfbde246f4837ed4e62d25797c64fcc71ab91fa318cbdd7a2e23327d2b1608e6ddd87299d138b22400fd597
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-21.08.2.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-21.08.2.ebuild
index 060b2344c7cf..84333e3a907c 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-21.08.2.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index 86b1e8bae3cd..81e11e2a84af 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-runner-21.04.3.tar.xz 43852 BLAKE2B bd91afdf1d7573a6ff5f3971b6544d218ad94a3db16185fc4a7b95567682988082e680694e224fee8f4eaeb5810842c609883cb6914b5295877b1a857ce75f17 SHA512 e48bbf85ed2022f539055b8518e216cddf64fda168fae1738c963ee7fe8920835df816354fa0741fea6152a42dfff289d12b0656b7a68ebbba275d63e2ae158c
 DIST ktp-contact-runner-21.08.2.tar.xz 43864 BLAKE2B 6496995c31cdc6e13f44f5366bcd369bb549617418df248ec0b22f312c5307730f7183b0037925bf01c518aaf8375de9fc981950ebc51a83644e3682e81bec70 SHA512 90598880840e6b95b7d647bc99034be2c27ccc6a7ad4f6d7da8dbf4d611e017889ae7c3ad8e0dda96b42a6f5c293c824f1e1f94788a0a1fcc1a22e33ae6f1627
 EBUILD ktp-contact-runner-21.04.3.ebuild 675 BLAKE2B 77cc8c9f7197128ac41ddcded246670b1d2682b58a91a5e64ffe8986f408b074c33d11e5ef77d654f88d5bbba8379bec50ae97d3f4d3ce20df5f93712da4c852 SHA512 4f4a1087c837efb66f8b34c7006b986cfa7d25bd58c4d37327055172479d89d2d9ad507b30fee470286ce82342c6cf17ad634348c1bda13e763c280132e9f665
-EBUILD ktp-contact-runner-21.08.2.ebuild 678 BLAKE2B 48d7231bf7c53cfc7d4d915aa38eec5894dc740a6e5142ff98395a4d3d5d816cfbc53bd0e0b3b0796cacdd7caad0c388a85c6b8e125654394b36442c3665e0ad SHA512 492d28fda936c49274eea137b8a1370edb1de1ff265962e6c1c79e5279d91593371458c82f4dfffb594db8c4f83ce79f7c93d9103d2bc887efd0ca1c062bb18d
+EBUILD ktp-contact-runner-21.08.2.ebuild 685 BLAKE2B 345928ef0b7389d8856c8f73309910d861a7c47c20ee601d2332b6224efcde417db24468fc7f62b9b85320bc10ed24d724993ffcb71fa1c55d8dcb89d2c1987b SHA512 142ef75684f0c4485e457536b89c15a1664abaf3c03efab814974b6988471b6da72351a9f7302661144fa1d935669373d32ca970f17b04724321721d18559c8b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-21.08.2.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-21.08.2.ebuild
index 1ba491650c70..0e413fe51448 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-21.08.2.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index 2c9ef020e7e8..d6f260e059b5 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-desktop-applets-21.04.3.tar.xz 44396 BLAKE2B 958cef9d866997a4313fa13e425248d511eaf2fb94043f86c1dcdcf600a5d09b6c2b8dd61bfe8e712c00ebb513961a045b3381b42ab7e8e0455550670e92134b SHA512 50802cd5176e85a440113920bb3b6103067009608ed4f0a9115647daf7297d17d37cd705c124165c3855bfc331fbc398dd07243c2e234de038a1394b7c4ac39c
 DIST ktp-desktop-applets-21.08.2.tar.xz 44504 BLAKE2B 28316b4f14ae973bf73ef3d6dc3dd64e8a2856ba44fa1bf3ef649c808a12a1dc436709f541ad961ff51a6acbe912dcbdbb1ae715ab716ca56c4b3d04bbbe7d49 SHA512 46570a764acce4dfcf3c0d440013142e390e95ed71a085821118631c65c24c136519a1bf8cf4d10f1a11cae2411632d7cf05a7fad4f4645bf769e13af14db725
 EBUILD ktp-desktop-applets-21.04.3.ebuild 615 BLAKE2B e740a1cd9547742e7767748510394af3da7128be76784c7cdf383ef5bb5e6cda3294e8992e19688f1612aab8c91dd9a00339edd78025038830b1a602b596582f SHA512 c2de711661c4ccdc617b90dd95596b30d82e4fb3d82050bd6d4b8112ae567235cbed0cebde32e549ec07fb974ce690bcd4357ed2b2efc6685f41f83b39228538
-EBUILD ktp-desktop-applets-21.08.2.ebuild 618 BLAKE2B c5bfc6cd8f5c9e52404ddc04cadc4b278eb0befe5d975f6e9d209b5742ea2c418b3a94d11b656bf3a39116332400e011b813f38c634089db071f831aa8b1222d SHA512 a8c8414527d650864ab515f6125dbdeb66f694ceaf5679d86adc6bce2451f7cf16a7dd6eceac92bd7b3777bcd6b67e394cadb1f8217c1e4311a2bb7569f81b2f
+EBUILD ktp-desktop-applets-21.08.2.ebuild 625 BLAKE2B adc40cda3c1204c08e1e42387b69c66f2725dcf839b659115e58e541b2e951fd684c377ac6e5b8741a6cce5caed0de7daefc696de25b0e9e2bb02bdec69ae922 SHA512 176a2af62e37995389ceafcd8c06db72925b403ff23d5f46a0eec967ac1444689091086956716e2bc59956d40d4945cc0e9fd0c636f416612613a7bd8ae1a519
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.08.2.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.08.2.ebuild
index 36f2bc9a86fe..e82371260bdb 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.08.2.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-21.08.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index 606f6f650577..f12b399644a0 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-filetransfer-handler-21.04.3.tar.xz 46436 BLAKE2B 6a52d84bcc8106946cfb839dff9871a3fa6ed082046e306b3041e87a517f638400cfb71cf419568b621ee27d54bcc9f5119bf2aed4a6500c9dfac730a3cf7fc6 SHA512 40811483b2e8748f259b7612bc40e978a5de931e37c10f3e494a3c048396298be70d1d5e82e75b6c3f44bccf8d5e9738da9aea2ba3c4ff5994667c15fb02a952
 DIST ktp-filetransfer-handler-21.08.2.tar.xz 46392 BLAKE2B fb27227929fc3b6b7cb7665a9eeccfd1d26b9df6678f3df7a7b0f56e3ba7e460e9758357e6d36d953aa2a4772e1c198e9a6e4f948f07c3297a4a6360288455b5 SHA512 7cdbbb1c520dde2792306b93b87fa3ca39530475bfcb376817b979ba124164d1990c291635259370f963c22a377360b3ab68f6deafa376a05866808c59c43ddc
 EBUILD ktp-filetransfer-handler-21.04.3.ebuild 691 BLAKE2B a6824d9f5700e29a14bfe3584122e128f97c7db38f26d9a91748bd265ea8b8c00cfa1c4d728842557589c8c7bb58270eeec3ac8ede57b5a38d43e275f6328c9b SHA512 24a49bd2078395dda46ddec302e49c9d13a31405b21805ce318be566c9fc28ac6319da39a1773a224a01db909874ed30c74818ac7f5941ace3294e0b489cb1c4
-EBUILD ktp-filetransfer-handler-21.08.2.ebuild 694 BLAKE2B ca5cbc2575c1e78b9c5ad48b0d404d5c1c930c53fce67a76aee0eff161a55a9a8c575d791d6578ff8083378246f70092e29e829d95378767d47f587de3679f6c SHA512 3fd2bff480eb977bdf336626f380963e21b0ac7ba2505e750e9d84b72d51577938c6fed741e7d3d5ec5e7273f40af8179a1a404494afd03d1156d5ebd4b005b7
+EBUILD ktp-filetransfer-handler-21.08.2.ebuild 701 BLAKE2B abe7f798e0a28911005b436bc2449c3c3f4c1b0ff22260e2a40e3b7672d772e3f96c8009a9ad4414b27a8385c9f4e9b37eb5e133ff15f1be9b9fcafff5d4ba13 SHA512 95fca6fb21ecc60b3f8ef7fb3dd94f4f8aa35f49b717d79cee8872f44ef815439e7d735a02dbd4016f433bb2fa5e0a9cebf89d9a22c6676dc64afa3f5aec76a2
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.08.2.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.08.2.ebuild
index 8c0bcd4d9cc6..6c047dfc0c41 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.08.2.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index 463d33155b33..deff36e93144 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-kded-module-21.04.3.tar.xz 99128 BLAKE2B 3e9bdee280cf476c81ea428c519c0183fe2a01cac7449f03d49146dd987c763bc56b5ee2a049192a733053df7b28f4bfd8af45ea38c0d7c1d7b56839491fc833 SHA512 f8ec2b4e55a7b78ae208ae9a2f8a77aa5bbec8eef52b7a7671975846858955a6ed84b3a042ad2d35e90c74c72b65ca251e7938145dc16332a8c397e0952f12f6
 DIST ktp-kded-module-21.08.2.tar.xz 99172 BLAKE2B 6a2f5c5a6e391c4dd4c455e2ec1a552d7f0e9429200561c9e21e60539955a36e7321355e94243a439f2bded5216cce5fe599be9dc78e10620882b1a276d7ef75 SHA512 38fc316b4789c23782993eb152757e7aafb0a649eb072dfc5fa418a9e65719afa85939e8f18aab140f7a9513f50200199b037825d39b979cb53c7aac2d06a9d2
 EBUILD ktp-kded-module-21.04.3.ebuild 1107 BLAKE2B e8a25f7d98d8f38c064a0917fce81acebef44cfccddec99a5b6dfa5f7f255867675452c68b649275e600556e4c2b7f3aa05a5fcab5f2ba41f65263de026a1538 SHA512 1b048c9e03fbc50253d2e68872baaa7f3b42e698f15c5b0755c3fdbacb96d6a48824d452dcf6bffffa8660337a814e680e1c0192e54e586c7470e0105b340502
-EBUILD ktp-kded-module-21.08.2.ebuild 1110 BLAKE2B 688480cf75562cd3f101dae61748a21c21a0b96c2679e604070a6ac4ebd009b6f31033c6a786a7f6ea5a8a3de654ae6b3a718693c518fc71926dd3ca10d904c4 SHA512 4f606edc7dfc8a5fd0eafa3607f2afe064a70cab4f95188af252b98c5316caf800dca14c99f966bd26102e932160fb966e170f1128977261727ad25243dd5d82
+EBUILD ktp-kded-module-21.08.2.ebuild 1117 BLAKE2B fe80440112289acd492b219fe172e74734ab3cdf3de8f76372704f0260088ac6b86cf62778352918380898b5e7780fe9129860c107fbaccb4e2303c46f9bb739 SHA512 cbeea947fa8dee79c902420501fc1f98c8fbe7397005c0a789a02176c6088b5330f8d95d08506554eae59343eb6d748df28424104aa5551a16252d3a7c622d70
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-21.08.2.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-21.08.2.ebuild
index a971b23406dd..74ce6721148b 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-21.08.2.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index 29d7ddf59f80..9e9c127091d4 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-send-file-21.04.3.tar.xz 28700 BLAKE2B 52e73baf0d7193465be660b759ac47702f167e9d94efd7604fe991f1bd87889ebfa0e940e1a6025b688c855a4b2e2174f8db2e5a07b726a50903facd4ba1a844 SHA512 538c9dce9ed232f24fdb4e20e2fda57cfe394d4d6b1c546e3b6b7cb139141c1307328b14f777e0936ed4329229639afe91786fea767fbdfc9a093ea6ff2eb577
 DIST ktp-send-file-21.08.2.tar.xz 28788 BLAKE2B ec8dcbf2e242c4c58cd24e75b057ce71163f4aa83846948f40389a918b2a69a37b36b549a01de7d3cc7257241508fc92e6dc90e798b462b5be10ac2a30c564fa SHA512 c22ebb60ea994967980f79c2720ca7cb8a47c710833683cacc7bd20a3ffbb5dc2de64b8392826f790e6fff582537b443e7f91b5f074410a677c1e7a89c883e8b
 EBUILD ktp-send-file-21.04.3.ebuild 875 BLAKE2B 1f4126b89ee1a3045f5a986850ec42cc34248db58c082c6fded65b20ea05baf4412e820c62ac708f9d42265e46f08e7bc4e90676ea8261732b33f6b276b724a5 SHA512 faf585b40064e4ea41408c9a1084e07d8f6273fdd079ce1eca41ca61163bd2e2f1ca6ecf1f789903933f151d69a7e29703c90194c00ed255ff7500e29c4a8ea0
-EBUILD ktp-send-file-21.08.2.ebuild 878 BLAKE2B 2a67922e25b9df11286cf6c6c04e4ae6e8ffa280d186e5e7d1cf1c3fe9e07f39eafa243665fba372dbe68430610d26a9d4ff4d26c9b442786163a3744e537249 SHA512 6fa3a447c7edb4ae45ba69ac2d35f41006cf4ecefba0f389183638497a772102e03829ed02fe8cf9266b8a74799da29573024f5307fd73bde40865cc0ab122c7
+EBUILD ktp-send-file-21.08.2.ebuild 885 BLAKE2B f3f3e83c7e508c430b6b0160df80fa102da73fe2d86b124196a633c78964bde0858caa01dc9d1f3d735c7c893c574ebbba1b328cbe20b319e6765cb87925c469 SHA512 8f2bd663c28844dd8abb2ac85cb2a38d6361501fb5e8c2929c0f8d9318b10ed70ed5f8b7aef297318405bc513119b16ad45dc58c0fcfa6f63da4c6ad5781ecf1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ktp-send-file/ktp-send-file-21.08.2.ebuild b/kde-apps/ktp-send-file/ktp-send-file-21.08.2.ebuild
index aa9e4dfb203a..26ffd2911b39 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-21.08.2.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index 058dafc7dd08..8773346c249b 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,5 +1,5 @@
 DIST kturtle-21.04.3.tar.xz 1970952 BLAKE2B 88bb4425fd7d798c9d7d069b61a241adba9bce457f2e3bc804c12572637087feb6cc221c628a4d60c97ea3d292c242bc3339c033217dd14e41f1f6a0ed39b3a2 SHA512 7c7b4ff311a694ebfd29de55f7b74767daac7edd228612496356823a81e9836db6094d1802c3c7ed39540db645901bf3e0ff607d246c9f38b3501ccdeca0b012
 DIST kturtle-21.08.2.tar.xz 1971756 BLAKE2B 8411ec6a1827276c4dbae3d8c7ce0f7dfda29abcec65732e1a3f01e5e47f9776622a50336539aca8124eeaf5d874b8db33c895e476e7cf0d021b530d5ed7727d SHA512 07c57cd6dede96c53924838f4acd75c263caec060fad323fc91e23760cf5a8508e082bb294ca5eab2a28f3b625f1bd0df445acc366a13249656439f3b13888d5
 EBUILD kturtle-21.04.3.ebuild 1086 BLAKE2B 599158b87765bbb401ede61aa29a1be3c6cb2f82adcd0b4b3afecab588988d294a5d073189159b79bfe80dbb66e5f80ac3dc238595c7e8df163e79df4d3b476e SHA512 5f96c3fe126195ceaeb11f0a91de878b86847ee03197fee56813d0e3ea77beeb68277c05939810c9c4b3b1c15ee07e4975ddbeda42aa1b8b6ab2519ba7ccd853
-EBUILD kturtle-21.08.2.ebuild 992 BLAKE2B f9ff8d40bf8bd3d47f50f1984a09e1d87d254dbad28a874c57480622797b49aa1c6731792a22b4cd8e553ced7f79d17f7987b698caf1910e4dc07d77eb24321b SHA512 36d616bfa054cd3d82b4313cb9b9a27d6195684395988c3093f27b0734708ffcdbe933d09a1178c64e8f8d993556f2ea98286aa69b07eb5f53110c9076d8f6d5
+EBUILD kturtle-21.08.2.ebuild 999 BLAKE2B a35d8947b1653fc1118a20b15b242fc7128b87a4992ff0e1f4129ebf73448d21b1f072ed69d90c685c4707e9036109a91d10fc177b4ed205b9363cfad584b9da SHA512 72a48494428ae3e0ed338d60ae8474aa2200063834ccb76b2d8323ccee062d1009c96791e5f69b9b0d0929a9fef4903ab64ac9c6494a3adab5b90ba97f92d9d2
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kturtle/kturtle-21.08.2.ebuild b/kde-apps/kturtle/kturtle-21.08.2.ebuild
index fb8c13efeba6..159b0768d9e2 100644
--- a/kde-apps/kturtle/kturtle-21.08.2.ebuild
+++ b/kde-apps/kturtle/kturtle-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kturtle/ https://edu.kde.org/kturtle/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index e006c7f9365c..02ed4e6be2b1 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,5 +1,5 @@
 DIST kwalletmanager-21.04.3.tar.xz 796240 BLAKE2B 65188c28aa97ed7384db63dcd3ca2caf5be143f5b949ec62196dc7fb2c96aadaded2c9333be4f961351cfe33492f341ab9e50c6ace55d0e2e9bad7984fded39b SHA512 89bedce351f0c27c7a0452d087fd0633c40ca82d3fc162bdff06c6ee5eb95b66305aa85b9e4c37c6f01ff54b45c575f6af5d5cf9a6ec7e8836198a9e928203a1
 DIST kwalletmanager-21.08.2.tar.xz 796912 BLAKE2B da5c1ef1ddef8a5dfa93c79ae186e447894122e2af4f8112062d354baa2cdd294a6390ffad7e1cf7d9db740e0435e95dc3f93b1af6946a4ecce49f81fdb9f789 SHA512 060f3aa81a57967dc295f8e11de78c2c7ebb06042fd84f8dd9221110dfb4812fc9f9111fe7faba164f5505b5d51d7accd03e9e4b35bdf13ad6527ef97ffef929
 EBUILD kwalletmanager-21.04.3.ebuild 1408 BLAKE2B d933bf4bc1339d94bea02492a99f0e1e54e81f682c40bbcc18d0083472f8ff2aad4e383bff2d176beb359484796e6aa7865ff5f5487aa8a3a4728270119cc891 SHA512 8df543e5844c5438a77f7081a6d417d314644c385be6af3fcea1c547cb6439f32b869fe98eedc2675eaa9072a2fce7a49a38a532e6ffdb063b50f3b95bccfa3f
-EBUILD kwalletmanager-21.08.2.ebuild 1370 BLAKE2B a04c6e94c763210e9a7a72202a2871ad88768beadd67a9ed7ea97772af7ee7a15d603b5683ab7b11a5a33ccdf1b85d7415f22b7e03ce9bde0bb9507bd1de3e96 SHA512 bdbf4092258933dff2122f1c88a26e670dbaec15074dba1499aa71dc15e007ee02a78d9a0360001d08316db17436b3e5c36cdbe074452d0e7f738f4e6e69898c
+EBUILD kwalletmanager-21.08.2.ebuild 1377 BLAKE2B 9ce4231543ec400b9aa8e8ff2e94b187028b9add84827fb454fed35705cb5c000ad749733df16331d823880cfce76d0dde5a5ac3793e75db2b8f8e882521e64e SHA512 2f1e1d21ab05fcc0205d925fb4b0e79d3bdf2651fae29dd557375c33faf4bc8edfcf498b982db7a995c5f396634127908497260a6accaad710b039a79ac65ad3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kwalletmanager/kwalletmanager-21.08.2.ebuild b/kde-apps/kwalletmanager/kwalletmanager-21.08.2.ebuild
index 51808c5f2843..cc989175faa0 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-21.08.2.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-21.08.2.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/kwalletmanager/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index 8fb73e0d332f..f9987e987fb7 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,5 +1,5 @@
 DIST kwordquiz-21.04.3.tar.xz 4208304 BLAKE2B bf226afa6a145a438609de132aec7e4593e203f66b2f94bdb34f9eaa15d35ed7d60e73dc932e28cc704986b1ccbaeb65b0c00e2fe0699a9ed3b039d7d43b16c8 SHA512 5b52aa118b80f846ef4b61b43468438d0597e551a130ab9e2eb8d93a997eb59a3d5c694ccb2e77dc8c6372e3f81561c0e630a9e659bc1c561e448abeeeb46e21
 DIST kwordquiz-21.08.2.tar.xz 4209168 BLAKE2B 4be37d28f42c0fa52f3e21a444349c8cbab8eb6c3223723edbe41c8d55f62ad38134589b2d71ef96209f4e99a90264fc094079039a505dba17343711506c2073 SHA512 e09605a4752213079567d7fe324a917b73dd1f58ecf0989c45df2531d8a2d6cbb223b70c13f7d44b5491c69d2aff616c49a1b098f34d9834cb97cda8046c66b2
 EBUILD kwordquiz-21.04.3.ebuild 1169 BLAKE2B 4e061731753e97c4943d8de75bf9947818937d5c53e0a42bffc519be41221a0b42edc147ddd18535fc5ce0e795d4591cf6c9481e82efbd2d2e6bd9802095df42 SHA512 cd799d07c25aafb224e7cd105108008ce8c65c3b925bf269ec303448b74dd5f89d7d3e30dc135d58dabd5a7acf916d819293c590cc1e8a0703682a2c329cc75f
-EBUILD kwordquiz-21.08.2.ebuild 1172 BLAKE2B 8ef94839fd39fdcab97b06c8ddedf3cafd521913d636b583a062c78c9f635ac4368d2322173c65e9029b83419ff99cba7c21119e1f0129bde1b5044783320d4f SHA512 401ac1e76bbec174a6a1f452792e18ac273b873290babc972607568046fe3d28edf46e743abab7fef8470e576e6e69571b3b612b769ac14d75358fe26b4b90dd
+EBUILD kwordquiz-21.08.2.ebuild 1179 BLAKE2B c24bd7496b22fe55c299688b26cc7caed0e4c08fb1c57510a5a06f1f5ec84f8e996190fe5534229759594565652a2edd1fd23f74da3563c813e9169f18ef3326 SHA512 c6f5502da13b1db56f83ab54f16986cea16a0952a2df850f013d8ae90bb9eccdb43e903b7dd01d810b93d46a79781c7492ffa10164334f2031f479d30723170a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kwordquiz/kwordquiz-21.08.2.ebuild b/kde-apps/kwordquiz/kwordquiz-21.08.2.ebuild
index 209c6d273f54..7a6c2b8e2b4a 100644
--- a/kde-apps/kwordquiz/kwordquiz-21.08.2.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-21.08.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kwordquiz/ https://edu.kde.org/kwordquiz/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index 9288aa186773..fb9af4698964 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,5 +1,5 @@
 DIST libkdepim-21.04.3.tar.xz 253924 BLAKE2B 13324c2e931d81ccf8a4970551f636654c9ebbadff353ea33c5308c61838d6575cf5924a693f65c984bdad66c4d78fd6e73e1ec5100665f5b5e565843f090848 SHA512 79cfe0aa5095246d407d697e05916878a74cc021368f4385ecbd4c92dc87a43b8b001ace84b3f40752d549de1940f65acfe709da4171e2a3a21a9c335c090bac
 DIST libkdepim-21.08.2.tar.xz 253128 BLAKE2B 885a45cfe65138a1044c6f9bb386ad83028f8718ee4b03001bde0b5027b79331a5461f85d576e8aecfb7213685e505ecf37d8fc728983d1a906c688da6601ec1 SHA512 0666a1aa92ba7a88d5bfc2ee9c1437e622979948ff7e18340b0f15a623844e941fe4067fa619882f86bcad255174f49f2e7dd67f135cdaf52d08ed14db4f2f58
 EBUILD libkdepim-21.04.3.ebuild 843 BLAKE2B 375b06f30ee8390568d59001d5c5c15335e05d633cc6dda171af2335b867efaa27c547e3c981b8ca5f18778e9c661047be65c76bba456231346821ce2bc56863 SHA512 120da55d3d3e8fa85e189117301b161292e66303a6f5a5348ece0da1313261a0be294273c3fa377ad573238938dd4f60fe58ac15fbc5ca6a9171fd3d21727868
-EBUILD libkdepim-21.08.2.ebuild 846 BLAKE2B 3342605e19b952bcdcf190495bde4cdf02816af52b33d8f5011dfbadc390818b84dff5aa1392c040c4ad824f45aeb79a81269c3387ac8217dcba5354b61d37c8 SHA512 d3959288b688199f14d77697f85a12da02635930ae13d00fd359678def96fe5fad6fc3ee4431852c8079e57d2b185bebcfadbda558b8cfbbc0992a2fb19223e3
+EBUILD libkdepim-21.08.2.ebuild 853 BLAKE2B 2a74e3af8a85c36f9f2854a12ed3b304bafb6bef37db848e30461e51a34493b07573590ac12762440ba6e4483063cd16ba512f814731e688f8bb2b4b3645a70f SHA512 a64d80121687c79d3aac9bc21b1469568a4dbf23383340d923146d4c429d5ebe2ac4042f45e6494e3f9b8e93fd86eac1ef3941228dba07d028c11a06d1690118
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
diff --git a/kde-apps/libkdepim/libkdepim-21.08.2.ebuild b/kde-apps/libkdepim/libkdepim-21.08.2.ebuild
index 4afc218bc325..8faeaba6c004 100644
--- a/kde-apps/libkdepim/libkdepim-21.08.2.ebuild
+++ b/kde-apps/libkdepim/libkdepim-21.08.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index f169488fee4e..26f484532b55 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,5 +1,5 @@
 DIST libkexiv2-21.04.3.tar.xz 60268 BLAKE2B 1f6210e20a701d87250b465658360cd5fadbda006b9604844c5af76b841a2b25618712c66d934d964695cc83952c346a4f9c2439a976ef03b1c7767ae3945a45 SHA512 0295c1b88744f350846ded713943733de6a0e1d4b2d92a09e1a44af57bb94a62e63420b9c911dcf0e3ca89e7df22a3424981ee38d8f4a299cdd437ea3f12bf6c
 DIST libkexiv2-21.08.2.tar.xz 59384 BLAKE2B 2b7f5a402db67a55251239b338a494e52acf34accc1518f93740566d42f2aaa6b1bb2cd871b455bac2afc0dc1e4cba1e900e176fe02c460b60105f95bfa06874 SHA512 e484adcd3d035ae8c5dc5a7c96a1c940e953d53faf4215fbd27b8fa3c6b1a81ff4ef0ab90f2a8fb68d7ac03d99889b3e009f7f117ecc89671f004f35ebea90be
 EBUILD libkexiv2-21.04.3.ebuild 354 BLAKE2B 58e5e1fd50812ee00c510086a5d6cbdb6ed59b72b7ba62b18740528225fbb4dd0de719e0d0d28949f6b9c8def55b2472c78d27c01f452fa956125ba4faa6475c SHA512 ab11ef2335831ee5d900e9325ca9221b506e1785dbcf5b72851d069983ff67cae4f301e6dc56bf2c18c227a97543089f8262bd02ad249fe9b8498dd54b8ea52b
-EBUILD libkexiv2-21.08.2.ebuild 357 BLAKE2B 46de15f8d452a0d9255af12c98c84fefb6045124817474faa8b5535657959cfe1841fbf1663364285307bbfc24cc2de47992e2cbf654ab6a472ca06156ee766c SHA512 0a526db27fdc9c2e5c39766fcefcb40eb1add73367a73074875b3ff6c67ad7daa034bd2bde7dca874f1c225167e7e4dea5fc50d7f468c9abbaf6ea9c34ad328c
+EBUILD libkexiv2-21.08.2.ebuild 364 BLAKE2B b493d54e32fccea9fd22efe5e586174655cdb75380c52dd8d7adef77395a52c2c941b7d1a9b53fbd96a352f4f20de971ea3bf6ae2648338b126e103bfb1ed18c SHA512 e98a07b09b49e867eb96f9a93f6452a78df3084f92fa07a67b292c51a00b1e6bb8937ea77d36197af5896ab55f436c5b368b9c586a4c3243e0e40039c7b198bf
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libkexiv2/libkexiv2-21.08.2.ebuild b/kde-apps/libkexiv2/libkexiv2-21.08.2.ebuild
index 2d6c0af81069..892cd34a72b3 100644
--- a/kde-apps/libkexiv2/libkexiv2-21.08.2.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-21.08.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wrapper around exiv2 library"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+xmp"
 
 DEPEND="
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index 8891028fd7cc..fa328880361d 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,5 +1,5 @@
 DIST libksane-21.04.3.tar.xz 145304 BLAKE2B 0b6a44aa21591051395a135c37e7635fa54eeb65bb7aee6757db0978da10ceeedc71c6eee0ed881deaa34f01a2c123488ae15f1e528873d086cb0c0183ce6845 SHA512 33676207ceedd6e855c797cb8f2fe35ac920869f4a9e8a76ce4a278f24db32e3c7481071d09ca535c5ddf9641d20a04d8a1899521985c6d25b30b78b7d9c0923
 DIST libksane-21.08.2.tar.xz 156768 BLAKE2B f303589c425c7d8793c55632c1714b21469a2f800a61f9b890442a01735656992e23c225b8884c079dd29a3b1f95c266c358a31e468e4c4223cbb95057c9c1e0 SHA512 66c31d8927f7d7890a87fb328ebef7f3d631376bd35b03db0693a888916b5d6365e24b98a2ceab39baa97258bd611c787fd8317e3731ee17d30e7a1182208756
 EBUILD libksane-21.04.3.ebuild 709 BLAKE2B 72bbadb5ea65823f26d632418ec95f8e16f5cd0af92f6f976ccb55d3e3979398ad80ff2f317d776b361b2232eeb2d86799371627b9d66274fb49f84ecaeaf8fe SHA512 9f2795e35f03de028763135806fc2e5c24dfb93bfbaf246b8fb0c5d9ef4b2046e0d12a555a1600ab9c844fbb1f8a82fe7c0389316f328b7ff7e5045bd59a60f9
-EBUILD libksane-21.08.2.ebuild 712 BLAKE2B 7df8ec0cc22bc95bea6f9323a82b4f3b67738b494cb5ac2c843bb98c97ae5e774702a1288d42cf3c5324444874376cc42de886952eac731b7e730c016f279d41 SHA512 2a611237650f3c8eb84ffde5e48a8f3417fe65cb115b93aca004f0f3aa05ad0ec169bd6fc0a3de81a893f94b1f306461319b189d41535a449832570acb2997c4
+EBUILD libksane-21.08.2.ebuild 719 BLAKE2B 9930a370e2061b9eab36e5a179f32285f7710f8bc0a09fe9ee77662f42c3058734ad4f80c8e6132a4065cda35817a728440b1d4856ad46038b77b0bf1c379f37 SHA512 970dcf10797a3104bb04241f51f84972dd6cd29ef4ffc39d5d2b8a3c9690a6a9970037709a848102a3311d5de2a5685406b64e3cec9e3612037ea0f52c0bc0bc
 MISC metadata.xml 440 BLAKE2B 09802236acebec3b481f48351f5397ac95b2a0a13defe6860c118f7b55e5f36ed7976e67633a0d391b4e05bff712696b03d3d49c486f09c7ea01ca6422825216 SHA512 b8e84e2bdedc8bcdea58a05f2252f7f41e374d98c10420e912fb7334e480946ba14023cd278d18091cc7f3883626eda9caae221b6c2696fe154c016e82019cf2
diff --git a/kde-apps/libksane/libksane-21.08.2.ebuild b/kde-apps/libksane/libksane-21.08.2.ebuild
index a838ed71644a..0b572231aa39 100644
--- a/kde-apps/libksane/libksane-21.08.2.ebuild
+++ b/kde-apps/libksane/libksane-21.08.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="SANE Library interface based on KDE Frameworks"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="kwallet"
 
 DEPEND="
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index f95b37c6574d..e04a14cdb021 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,5 @@
 DIST ktnef-21.04.3.tar.xz 306380 BLAKE2B 5749d419c1c765f6a47903cec11df336797c1b20c22b72649d3814975cf2c79567eef891223679f8c20ec8b58b652416f544b246f607d87e3396d46f704c229d SHA512 e2d13dcf5ec40f777b88a662c85cccccbebb7a7fe24c980d4faa2ff4e1a9a1129dd59b6e05b2564c6884552541a53f4a3de5456ed1c51574753c2306c70daa60
 DIST ktnef-21.08.2.tar.xz 305684 BLAKE2B 714d26004d5289bd8c4819a48e1a416709df71ff3e86ddc651fd41ac7f21af025332a110d0644d4bf6d6f5c1d4101bf9a61adb3d79c61e68fa818840ef4d74eb SHA512 544bda34c7351e949e7afeded8604d7cf69ee24698358851da3f15de6f7e30e0e52cf75ceed27b63c4cb8ce6adbc2e6f633e6e45bc61c0e65ee9c7832bdffe87
 EBUILD libktnef-21.04.3.ebuild 545 BLAKE2B acfd8a635c5ad8575bcbfc232104ee3e772cf0a7872edb627a776078cfddb1e0e690c4c5a38baf01a4b320b70ed1ffc29a84b3924c1304ab13436aa5a85c6f5d SHA512 5aeded9188d56799a9b9e7f6bcbd6cb297ee05a5cadd525558b9f2235e41ecd7397fe5028088cf6af84af65d60017abee7027ccf8c21c3a13d4838ecc94672d9
-EBUILD libktnef-21.08.2.ebuild 548 BLAKE2B 20693f0d112e19f605c0d467694e88ee6679a7e6fbf536b4d252ab6a7b82519536bbce081810ca77675a33d298b892bc00c5d69984336f068e90665acf863289 SHA512 f8f816dab690063305893dc44fc0e17fedad642f7cd392b75842412950172a38701ccca46c8ed008f7bf131acc9248d8217ecd6a6ef2e01920dac0e0ce66ed1c
+EBUILD libktnef-21.08.2.ebuild 555 BLAKE2B 76334422ef92b0e311ec1d755e2949f0f9379b9a7720833c1e86c3075e6650ea79515c58fdb6b5b7ef5d34d94584824de0501fbf200acd7a840d181366575a74 SHA512 04ae06630b337c7372f4c66740f1150073e18fc29c4299844a2f8390fa2c41807c480e5445577b1022e2cc9f065d1792dc0641ef228a8651a615c3d1ffc5a012
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libktnef/libktnef-21.08.2.ebuild b/kde-apps/libktnef/libktnef-21.08.2.ebuild
index 9e9a012b3906..1633806c3dec 100644
--- a/kde-apps/libktnef/libktnef-21.08.2.ebuild
+++ b/kde-apps/libktnef/libktnef-21.08.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for handling TNEF data"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index eb7a8f1e758c..d953a351bec9 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,5 +1,5 @@
 DIST minuet-21.04.3.tar.xz 27726656 BLAKE2B c986771fba76acfd54095819fa817a51a69f68add00267d044d5e2a2176ffa6a0213c5541539ee46fa2905e14ee612e940b02f855bbabfb3a2b9785893e85fed SHA512 0513c9074c4505a0f83899b340dd122c7c5861325fa5e27b18ce11d1195069d0066b47861f8ab3eb540d3a5e89c6134cab9016680709c650a322ff4599bb35de
 DIST minuet-21.08.2.tar.xz 27728152 BLAKE2B 9410d0ce9130c473bc629780fcfef260403b2352938efd0e302ee3e4f5dd8cbc817fca2aa1d2549b998e61bb6f6c636d58466000a2e80217d256c69f3bd5a191 SHA512 17c930190d5c8b7cdac17fe2b8ca65f46282325a96be931315c610bfe363ce35f78da3ba4dbfd6b1a8b7d66b44940a6c417ec879768b573961e9c7f7c9bf6a8d
 EBUILD minuet-21.04.3.ebuild 673 BLAKE2B 96412a1be49b0b9e5fbc1ed8616348467dbeb5a638d02844989fd6e67c908eab382c14ea46a027e4dc71c6ef013ed2f65aabf430c04fd17b9fcb54432e3b0f6b SHA512 31632ed1ae7f85ea4c305a93b24e779a4dc23efab58c6ef0a195d65d3f789ed5be378b605b65abb4a7c8297877c99dd151b0920926a903ddd0b7c0e88dfa3697
-EBUILD minuet-21.08.2.ebuild 676 BLAKE2B f18dcd826fb3494b5687cc249e22a2958c2ac28c1667482d41b82f26cbd3a5d4382f1c15bfd5e668049a1d484e7d36959c1c25147bb9b1e3e52302fc6a8996e0 SHA512 2930ed03d7dbf6787c676ff30225cc85e0ebc74e6aae089baa0bc9e8a435c35f81ad78fc9039a0776b4bb43172803b628759d12bb1ede999cc0aaab2c1783377
+EBUILD minuet-21.08.2.ebuild 683 BLAKE2B 058f49ba231588d7df9a1bfc4d0231efeb68d8e1a5b25fa63b8e80c6fa5a02bfeb5a400126f1099ff45cc080facdb3bc2c145f017f747467fdcdf4e0ec238397 SHA512 5911223275fb0b717067e53aae18384d76148bfa86c9153afc8bbf989817b99d44fb58618e0fb4dcbde8396ffef048d2f3b30256686bcab84b82f3ea7bc03018
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/minuet/minuet-21.08.2.ebuild b/kde-apps/minuet/minuet-21.08.2.ebuild
index af24910cabe1..45d586341d01 100644
--- a/kde-apps/minuet/minuet-21.08.2.ebuild
+++ b/kde-apps/minuet/minuet-21.08.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://minuet.kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index 2ee871f4621d..dac1109dd5df 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,5 +1,5 @@
 DIST poxml-21.04.3.tar.xz 43540 BLAKE2B 97c42e772625c82d1d2f6f994228eb8159130875450580d8e292fedd2f1b048d8672987929c256e07b5ae3d6735f602930917993d3c21738d32936cd4c8558df SHA512 52647f1574790e7f0c444e4a0ade0789da6034db0e68f8a9b92606c8511ca06c7f317ead23b4cb72db5330cf1e41e58646b98eb2c3bec47c6b8c813c60969df8
 DIST poxml-21.08.2.tar.xz 43532 BLAKE2B 38ad9d371bf011dce65d74930551ee0b3252f4f93f45e1624b43be2314984ba423cb49873005c349f246c13168d4ee45c22f31956da9b6767e3936f635a2e761 SHA512 9f6c065bdaa2862b97bf7d299257a654974fd9cdc261ac4f61164ae23dfdfbbc7c9f83f9b2ba3ed70ae01223f37a1f2abc3827f41ac79703be40f1c9523e9337
 EBUILD poxml-21.04.3.ebuild 409 BLAKE2B e44956fb6f363ab6ee88a386442587d7f35ed73a05f280886ec45170a79b7bf3691516127a64fa72d67e3475bcea1bf9bc7f006c35150dadb037af9a52d952b1 SHA512 f29398570744814b07ac3dc9a738f2c99f937407bf53a9fcb9c215fe48ef6c11dd2959dd4b2ffcffc9f9437c668635f0a0980d011292f2f1778dfb8d204312bd
-EBUILD poxml-21.08.2.ebuild 412 BLAKE2B b1304b9c8ffdea332ea5569b29aaa8dd4eea829d555449f268560e096a47b80059af0ee0352f5e5d0f8a83826ca347b95720faaa6cf79ac6c6cd4987311930be SHA512 ef80607e272a19bd280e2a853f158147894b1348b6993c349e2cbf00905159ee2d89153641641573b77edf8bca00fab52487dc60733a8f81714473dff163d852
+EBUILD poxml-21.08.2.ebuild 419 BLAKE2B e34d7e606f31dc73563cc642c9189a4291741a30f6b7ad7b52802f97727f5eaf620447622476949c5b65c33cefd67e82b3ae9f6769d1849ef6851f3a79c63a6c SHA512 f1154598aa588945ea0cf608937ee23bd0a3b7ed2c8a14955e65f796187456ab05c0784a1856dae66ef4eae88d26360354cfa9b581c268d35a7fe39b594fedd6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/poxml/poxml-21.08.2.ebuild b/kde-apps/poxml/poxml-21.08.2.ebuild
index 3c3161c3ce99..0d5f6515027d 100644
--- a/kde-apps/poxml/poxml-21.08.2.ebuild
+++ b/kde-apps/poxml/poxml-21.08.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index 3558ca9f238a..8fcf0eb2d8fe 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,5 +1,5 @@
 DIST print-manager-21.04.3.tar.xz 263964 BLAKE2B 9e2646b618bd4b64d811ae920880414ca11b78dcdd74a815194499929d453649bc08d0a9b3043d472cedeef10ff66acdd64f63e499c6d68ced24cfda4abcc898 SHA512 6ee679f46301213dcccc15212f78c23aff173d9fab2f26a492cc7e07e95c5f1fa98a2feea5a42d3f0460ac3b7ce8147f5624cdc36c4def74f15dd2b924f9412b
 DIST print-manager-21.08.2.tar.xz 270352 BLAKE2B a1059e28212826740a5813c650c2028951d0307bbae8213d7bd0693c78af300d44bcff842346e2acce62b94f23d54c49b7b1fb77dfeb8f54b3b02245d9e8ec99 SHA512 a3b5ec03e99990cdab44d0b41715fa3c5ba8ed16f3e83f557448774dcadc5d0ddce794b77685aa8a51a20a8d1c6fcfaca0a07277aa0fd92594cf0b9d628c28af
 EBUILD print-manager-21.04.3.ebuild 1824 BLAKE2B c50aecf8ee858a02fd60cc08358299938f8f0c6a231ce9cab0f7576e1b89595b42939ac65954600d6e7bb5a79c1342f127cc3a64a48cb5fb93733192f973aa0e SHA512 9eee73edd987e659a6eca5bc0d1e94b4bbf26035f13115711e4e75979cd113d37095fd0c78416aa87557ec92613ed3c86eec345df99954f5c3f9fc04b2a06c44
-EBUILD print-manager-21.08.2.ebuild 1827 BLAKE2B 2bd66b2dbd0cdc8c0d4c99886fb461f43668a7fbfc4d8c2310420a822e0851fcf92c4d91deacd92e5bb56e9c8d7d71335e163ae6b8a660d21fe246dfb7f63cb3 SHA512 ca03c9769986dc96bf75b9cf804c3f58aba6a544f9b84071e859c0c7a2be10fdb586a6bfe4774956ccb8d4e7dfd23cd4fd4c4ffe04aedd6a9ec75adfabcaac2f
+EBUILD print-manager-21.08.2.ebuild 1834 BLAKE2B 1b88b0fba26c9d0e866647a866c1872fa54958428b7f50cb4898329440589550176ce185e74b4b373486dc3c2f19a582390aa7175b387ac54f3b24dd16fc87a5 SHA512 8014c7f4b668980fb889f405afaf8e1575188ccc109030332d3d8e00a7642ba49e59c97ae7e129fe44f1462887ab7a12d8d19830faf4e9c5cacca4035cfc2d05
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/print-manager/print-manager-21.08.2.ebuild b/kde-apps/print-manager/print-manager-21.08.2.ebuild
index b08f0dd9dca2..25c399835a97 100644
--- a/kde-apps/print-manager/print-manager-21.08.2.ebuild
+++ b/kde-apps/print-manager/print-manager-21.08.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Manage print jobs and printers in Plasma"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+gtk"
 
 DEPEND="
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index 511d09e1a492..09f70ec7618f 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,5 +1,5 @@
 DIST rocs-21.04.3.tar.xz 1547728 BLAKE2B 7088fa48653da5a5f4fc2f8dff9fc38233e15701a1139934ae06660e257a579db0c7a442305daf75129cf968a872b45a564ca563609e67ad31f6133d11b114d1 SHA512 f097157f7664a637448055a2b9142dcb4b0fada3a811f8efa1f37c3f23f486b613aac367f4248db8efc3fbe6ca8c350b5c280c3e382b8bbc331e2659a32fb1fd
 DIST rocs-21.08.2.tar.xz 1554828 BLAKE2B 3a280a2005ef2ce03ce759feed0828c9c1b7e91b31ccaacf68b31e16c61ba657b2c57ea8a6b036decc805ba22a5077c19f492deae3ce71c191e811c4bd99e59d SHA512 128c6f68d7bd4db5516a18033e8fef03c013f5e118633efd7b7a89c019b17dbafeba760fb196549fecf1a637bb1e68991d323f810bd38683fe5e25b9efea6d7a
 EBUILD rocs-21.04.3.ebuild 1299 BLAKE2B 15f68280e4f8b2134b2144ddc8107e92836adeb91ff9e8e232f10d9295734c826ec71643e7655c77f0e4e3d002dd42e7ac2396cb1a1fa9cc25d3400f219b95d8 SHA512 4ef542ad0cb0c12abebc71f6b325fa146ca59a70b3b87079a2d1bc77c8326658c14dcf3e9a5b720863e8a36ec11244de93436cdd8a92dc4268e7a3938c748757
-EBUILD rocs-21.08.2.ebuild 1279 BLAKE2B 70579851e079e3f0d76a7e8f97aa95f7d232349170efd2e33ea6750dbcd419eedddff135bd2cf101ee5369d500be6c8d9bc5077abb620e3a18cbbbb6aedb7adc SHA512 2faa1438642b6b76b0936075fa53b64a4b84d2ee2a24282b9b11ef93b5696d63d306d5f28b42147c43fa8abefea0958c993948e86734a85b63d6d381ce13b3ae
+EBUILD rocs-21.08.2.ebuild 1286 BLAKE2B 6c4f0d69bfe9abd012e5dc0a5f8f80e632c741a83d41f21510f32e61715cdea9f65b2e587c765df7ad9eb6624bd3dde14918f710321090ef4f7a8399f0f0be05 SHA512 a6ae0829ead78399dbb74faf058efc71aed06099ca05d4fabc801d874a97432a3b06f844989bcc87ecf3cbbefa4537252f5855884cf7ea48d9dedf1e0b1253a3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/rocs/rocs-21.08.2.ebuild b/kde-apps/rocs/rocs-21.08.2.ebuild
index 7dc0b0952d40..bd5d8cfdec89 100644
--- a/kde-apps/rocs/rocs-21.08.2.ebuild
+++ b/kde-apps/rocs/rocs-21.08.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/rocs/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index 997b8c541085..ca09605c1358 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,5 +1,5 @@
 DIST signon-kwallet-extension-21.04.3.tar.xz 10780 BLAKE2B 1253500a0317054d2a965facf965d903e62f09eb37c7d23fdd99338d72aa03b43e321c78de47f0cf09f6fe098776b2225b21d73223f6bb5c506af058c5836135 SHA512 26ead682a111548b1f6c4cb6c9c9dbe53613bfaea81c835a3c30d1af2eee0f571f0dd179e8a837d719893f482dd22479c413e23c6f212c7615484be816224136
 DIST signon-kwallet-extension-21.08.2.tar.xz 10772 BLAKE2B dbdcce8e35a440efd78b7e4d1a25fe2fb3b86c340b3739b296e0d641362943d09cd88cf168346800763d50030b5be03d18576a8aef3105015b10e8a31b1b7c39 SHA512 cd905eaa3b453f5570673c541caff87bbb45654c38f59b2c9c2d15d652ee415af9415194b728d8f2d32e42ec279f24dc97c94404bfa64902550c66d662b3a859
 EBUILD signon-kwallet-extension-21.04.3.ebuild 375 BLAKE2B 68f8c1594f83136252ddd2208f157d263ea8be339055e428f19218778f7e6ceb455331c9abc095f6ac47634f8f436f35a7986df3f6f11685f918f13282672c33 SHA512 3a619406eaf7002c5df89a350946b6fb772da642786eeaf88810a4f7e58f7183cadbdc190efd013fc69b5b9f0d49f5ffee19f4836fd22fc75a71a6e311323df5
-EBUILD signon-kwallet-extension-21.08.2.ebuild 378 BLAKE2B 3bb2d3deaf5bee4f42c1d1facff989b4aabe396506cfff1c7e24b6d5a4bcdbeb6580ecb83661a17e1b1dc2da3fffd7a823dcc359b4c4d1aa939fc79a9bbbbe38 SHA512 94d6b3da87aea0798fbf571db32c699c905f5d6575033fbec973a06289742e6044cf7cf29b21dc95d928e4465fafe4c2059525ad390695517c674fc315acdf91
+EBUILD signon-kwallet-extension-21.08.2.ebuild 385 BLAKE2B a76ebf320193fd0cab92ed949aa87c1bcafd77e73c14c4868b783fee636cece6103fe577256138064994f2a5db4be1969542be91c0190e57bf7cb397c0e6259e SHA512 1b063aefa0ce4c7089543466074cc025d429485877b73ed34bc0d0e36ae7a328679592ccc655052b8cd10fc1863a5562aa3837f2e54ae6db79a899b11a0be681
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.08.2.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.08.2.ebuild
index 9ed38ecc0937..a7ef94eed799 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.08.2.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.08.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://accounts-sso.gitlab.io/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 DEPEND="
 	>=kde-frameworks/kwallet-${KFMIN}:5
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index 14b88a47aeca..298dd017224f 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,5 @@
 DIST step-21.04.3.tar.xz 979172 BLAKE2B ab734e21dfa406be1686632f0f10376354a8a3d633a3c539b266814a5a14b9d98db7b9a11652fc9490e0a1419cd0220b066274a46ad18baed198de116925318c SHA512 273c5424321a1508a715c4553c954914dbd8b0a42b8ca0872d61ed0d272f252262f6794daa64d5764366f406678004c51cf0224541da1a813d99bd7502af1898
 DIST step-21.08.2.tar.xz 975928 BLAKE2B 8f7e49737d8af55e85a27da5b6f619e868a17608266235cb01efe220a321a86f85b1977955738bf2dfb0abd8a3c01acad9eed1f80f2e16fc3418a250e71deacb SHA512 da8525a77badb48f39874c698e9531f37ad41c28f40b7bfa74aa17504c0fa193287047a60e19f002ffd039ef586aa18feaa87595f9799bbb5ab9cc675c9f3053
 EBUILD step-21.04.3.ebuild 1436 BLAKE2B 8d14170a1b0404935b70ead43b5a5df25627d408b5e5e4b9704d809e8b9a0ce9e9427ad1b7b628b9a3232f995be969d7bc6fa36b31edda837e70fbb044891ed0 SHA512 4decda9d5f97bc2fdf559ddc90cbe16cf7228100287265f6c3d5542e64aea049f48af842ffd600195e577aa7208ed0b7e169eff38991236b23d8cdfc01b25666
-EBUILD step-21.08.2.ebuild 1439 BLAKE2B a7397e0b03105f1a92c70b3fa3ab97e47bebc0b4c99aa2e6f67390d9ed657a5d08b97aa8be80794e612d4d63a0fb726f8295c4a2b8bfd1f41dff91a4e7ee4b6f SHA512 e05783804f3089cbbe27741431fe9105bf875fa46103a207c6d69125a59d30c2622e794228b1795dee043d35f8910dcb2a0d7a68a94e830e0a325ea28ee383e0
+EBUILD step-21.08.2.ebuild 1446 BLAKE2B 4647a1dcc829176b65e4d0cc546d84497426864be65f6a98338f1307815e436a62615a4ae59c98584067078d1aa509daf8c94331cd3639a63d76c0dfe6d62d83 SHA512 85a069e9f677cae95f757956bb88029e67b1ded2740f5f7b7e8ec17721f47ac219bb068f2a8b4a51fafbcd5fd190b98756600dde6b288cca1af45346f5a03ec7
 MISC metadata.xml 417 BLAKE2B de9527c46129517ecc1eac9da86866a8196d7256cd1e6b73fd9c415b18f3278099bb08200e16b791bea345daf84a6b3392ae583530f848e699fb8102c2f99b4f SHA512 ff67c68e133f784d4819a3b475ca8090bf6a2ee7d4266f4f48bc3a3032fc3778ae4004206981098f304a3c32fbb9a36a0488dca095cdff55e2abfafc16424fff
diff --git a/kde-apps/step/step-21.08.2.ebuild b/kde-apps/step/step-21.08.2.ebuild
index f242b5a3c60f..a49c348c7bda 100644
--- a/kde-apps/step/step-21.08.2.ebuild
+++ b/kde-apps/step/step-21.08.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/step/ https://edu.kde.org/step/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+gsl nls +qalculate"
 
 BDEPEND="
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index 5abe9926f291..389f86a281cf 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,5 +1,5 @@
 DIST svgpart-21.04.3.tar.xz 24600 BLAKE2B 06216a156a15abe07303ad937418a048c3c6e4a4889878e92f2089b8c5ae7de548f900da32f783796a3d52edf3d40e4d778e3cc092bae9345a4b77e87b958332 SHA512 ca0507eb3e0b95462161cf3f883970d32ca1dc266b319e7f959db1ec06da5a593c7aa71b8185cc8af226e5e86c6c5e3238c6607048877e546cf7eadc0970743b
 DIST svgpart-21.08.2.tar.xz 24644 BLAKE2B b74c99eacabf06e48b0d0fde0116b2e77bcf6d569df4aac83a2bc9a786fedf1a532178c343207098d724612a5977a7fec0e9c8626d0a482dd7e167af3b42ca91 SHA512 1af3c40494b207e3bcc39fd6d075f60d66f08cfbf7f7f155b7a315a1db0469b803c52253fd9395c2502d2fdb53b14225c6c5ff7d901f04d226a78e090d8bf789
 EBUILD svgpart-21.04.3.ebuild 576 BLAKE2B 80f8f41cd410fc1b0791dc0c0e44ce90335f12bc993dcdbbe943d5a00be9ea9cfd127e0489051ce0a99557fc04a30842709ffdbf247ae602b3c0342f39d89021 SHA512 8231ef3f9d5232abfe45b26c5c6e2b04fa1b70c8587b1eff41a7b24107dd74eaca5b32e37f883b792fbcfea5dcbe4fe78fe9401c8e43b88a1a67ec989d0dbf8f
-EBUILD svgpart-21.08.2.ebuild 579 BLAKE2B 5fd07ef6442e55aa82a4a0d576d46bd3bf4eefc203e3d0480b513aa370359c63de129cc1230a877743364a84a6816da06be63f80d1ec818724349c6368fc5a29 SHA512 348d5c55458789996ba040df694af8d0560295dde3bf562510ace3b9f0f5e0fc8032d11b4e96356b0a1c88aa6798c83fac9b8fd31a780ee78e3d353fdcd16c98
+EBUILD svgpart-21.08.2.ebuild 586 BLAKE2B 08b27fb9cfc46ed65d8d7bdf5611f14e95d2c7b368065012294d10bc1cefdba4469bbff6444c3cc92c0e46a23d850d7668924e80a0e29c7ad602ea8f60ef5641 SHA512 7b38d8e2dcb2e846c756a42cae079e98d42640b806de803a2ff43d46c64861254b0afa080b20f39bfaf987ce73214df3a4f420235a6da2e69b70c0d61974d3a3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/svgpart/svgpart-21.08.2.ebuild b/kde-apps/svgpart/svgpart-21.08.2.ebuild
index d44c225ae973..77af33bcc7e6 100644
--- a/kde-apps/svgpart/svgpart-21.08.2.ebuild
+++ b/kde-apps/svgpart/svgpart-21.08.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Kpart for viewing SVGs"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index 221348157c04..c90618062799 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,5 +1,5 @@
 DIST sweeper-21.04.3.tar.xz 376440 BLAKE2B c22d1caeb59126157381961a8fdaeda9504010f1c0732280d2b3a031eb35467baf961703f17e4d9c177c53cc4c52f377b06ec2d42cac2aae11a23de72251da81 SHA512 b500294b708275aa6744c4d2db6aaaf306c939de337d878d9f5a00318a7d76b3e1597b8f87402953a90a4b3188d643a53d41fd85848a4aa56336b0dd76846eb0
 DIST sweeper-21.08.2.tar.xz 377384 BLAKE2B 720913f8d7ef68b09b2461a8cd3e79382e50a531c38ab396c187ec29af281c54a42f0935d0488eb819b13870d1a759da43215c2ab4dc792523688deb9fe8fcb6 SHA512 ab36dfba6abb9ae758ea9e8ebeb2a724cfddbb10eec3a16806d8fa10ac4701f8b352af1588c7c288117724eb65210c21978fb6bfbb309d8899a984b6cb9940a0
 EBUILD sweeper-21.04.3.ebuild 1010 BLAKE2B 800cdf9665c1d56af77ecee347520b570155584531f3ed1c3f09df2ef919fa1d6644a0549758e86f708af74aef24aba484b9ef6a98fdfe87f93518e717f0dad4 SHA512 1ebee912afe1844f78720526249827a229f707852f30f66269aec89ef841c8d45852c7738fd2b279ed71bb4e3b47b971cfbffde8b7c141cb7f5dc86db7f6bbcb
-EBUILD sweeper-21.08.2.ebuild 1013 BLAKE2B d45cea4878bf68eb15248fbb4dff626c2a0785c398dee1d98c0a520aeb33346e5656002e01ab5e1c74555c07a2d56c4b2366f059b455a0e2781180ec9ee277eb SHA512 678c1c62cb90b42db27b6ce8d74868b83f335397b2b3b4fd6dc2986cc8d7826a531aa4063e32eebb14fcfc65897b90012b852456bcc0f2eca595f108693d0d4b
+EBUILD sweeper-21.08.2.ebuild 1020 BLAKE2B f67011fea2ddeb28ac24b7d3bfa62a91723378495572a31700005a4c5458a98b450f3ae2ddd7abb71c333e6c4723153add20b485b9f0260eb79a2ece88ba466b SHA512 98aadccd5393e189ac52ed65daaca713dabed82560a82b9b41b39265887146562c71ee0c427d324ec574885f194048086fe89dcbbcf46c262669f034d0681b35
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/sweeper/sweeper-21.08.2.ebuild b/kde-apps/sweeper/sweeper-21.08.2.ebuild
index a341750771f7..dff5c083a12e 100644
--- a/kde-apps/sweeper/sweeper-21.08.2.ebuild
+++ b/kde-apps/sweeper/sweeper-21.08.2.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/sweeper/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index d62d84d148da..62efa189a7ed 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 141fa343dfea..699d67a8cf14 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,6 +1,5 @@
-AUX attica-5.86.0-fetch-categories.xml-only-once.patch 2156 BLAKE2B da3a18472e18e2ac1866242ff89bbdb65a1f207e5630306e45953c9dbe7df9ec8e380bb38fa3ebcb13b6bdf2f36344d54b5576a5431776db54c13191ad795df9 SHA512 40b51d7e1c5f42c2b97bea1c20704c3e740357f094745669a33773b696e309a15c7f21abf4a7a5e61fa87c64e23e70bf4c98fc381ce38ae8045f7d2cead3f506
 DIST attica-5.85.0.tar.xz 66672 BLAKE2B 61e3ca48058f615af27fd7ad226c2a3ad6a05ae6edb1e1e59ed4dded937ec24a5115780fe128011bb983d83d3d7e3603a1780a5b15dadbceb95165f05e2fd1e6 SHA512 a6f64c51bd0b6a8eb739db198b6db7f5c91f3276912a0bba8b20bbca526738b6e8baea24e6f4502cd0f96b1fc704f4a61445dde0acd645776052527d376215bc
-DIST attica-5.86.0.tar.xz 66608 BLAKE2B 631c6c779a931ad8bd12cc48db707463ffba69b1f7f003c85dd0e619362dcc53e2ee7a31467f60b87380ef8ae5441138b16a88df630789925f3859a2e4881219 SHA512 aff74d1bbde5ad10f007f3f51f7bf0346746fd6fd5ca37745001257a72b04bb02a08bd61f03891edc13fbb11975833d1fa1ced6dcc116f9435a544dc9e6d5d47
+DIST attica-5.87.0.tar.xz 67080 BLAKE2B 90b1e2e7113867cee5e302f1bc82becbb406c848129c69986914e9cff68485ff0e111536057bb33be363802b1d5f5ba34181940452eadeb4934175c4b3ff2740 SHA512 211ee8256bd5da4a21cf4afe513557e4be878b2f84c5b9848e929df62d18573bfcbab5128b998d9eb00c8f5e54c65da768a5e017b4e2e27105ad3efaeca7a172
 EBUILD attica-5.85.0.ebuild 474 BLAKE2B 69014551eac7b2fc88654885770f6a8f8da75610d8cbbee26f3636da90298c89fd90a3b94d53306a3ecc96420db7e1f973c9f374a540bc2badc83e83df11640c SHA512 6fe63eb1f450893872ace7783150df0f63f4dfe16b28154408a3c7eaaed48f2173aa9fd33fb1eb783cc0844acad28362457d7f9c8fb5eb308aacc59d07986d6e
-EBUILD attica-5.86.0-r1.ebuild 546 BLAKE2B d954004c2a9bb828591c81eaee4e80a035e56937e0b03b1de9423de2ed10f7f238b3289c217febf9af32564da42a1bb5336f94915e553c1f467c2e8050ebb973 SHA512 7364a3b7002eb0bfcf9132165ead7dcafcb55af8827643f693c34f91c18ec67b149a217d42ff8e90692c0759f9e85cb75112661f4488a13c778a49e2fc12da5f
+EBUILD attica-5.87.0.ebuild 477 BLAKE2B a317b99cf0e08a4bd81bbae69d2829f73bd23fcda698c01e96ffc5733eb3d4fef461dc29b05e88503e5fcafe42ad539424d416b0ccce2a1a1f36224c0f582e97 SHA512 ebe9f550ff6bd301ba3ceac3be6bb1ce2394a58b8370d46f68e6a80f3596df309e1ac49c7b5275a5e4ddc62682e285f91215f4635e708abfa61b91920f52c8b1
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/attica/attica-5.86.0-r1.ebuild b/kde-frameworks/attica/attica-5.86.0-r1.ebuild
deleted file mode 100644
index d920df50fa1f..000000000000
--- a/kde-frameworks/attica/attica-5.86.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing access to Open Collaboration Services"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-fetch-categories.xml-only-once.patch" )
-
-src_test() {
-	# requires network access, bug #661230
-	local myctestargs=(
-		-E "(providertest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/attica/attica-5.87.0.ebuild b/kde-frameworks/attica/attica-5.87.0.ebuild
new file mode 100644
index 000000000000..b126db32d6af
--- /dev/null
+++ b/kde-frameworks/attica/attica-5.87.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing access to Open Collaboration Services"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtnetwork-${QTMIN}:5
+"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	# requires network access, bug #661230
+	local myctestargs=(
+		-E "(providertest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/attica/files/attica-5.86.0-fetch-categories.xml-only-once.patch b/kde-frameworks/attica/files/attica-5.86.0-fetch-categories.xml-only-once.patch
deleted file mode 100644
index 75f7f75b6e91..000000000000
--- a/kde-frameworks/attica/files/attica-5.86.0-fetch-categories.xml-only-once.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-commit 7c38c8cf28a4d0d667e23ddfaaf38a955d65bf3e
-Author: Aleix Pol <aleixpol@kde.org>
-Date:   Wed Sep 22 16:19:39 2021 +0200
-
-    Ensure categories.xml is only fetched once in parallel
-    
-    Otherwise we overload the server that is returning them fairly slowly
-    anyway (2 to 3 seconds?). It seems like it serves these sequentially as
-    well, which makes Discover startup stuttery.
-
-diff --git a/src/atticabasejob.cpp b/src/atticabasejob.cpp
-index 99acf4f..e65d556 100644
---- a/src/atticabasejob.cpp
-+++ b/src/atticabasejob.cpp
-@@ -26,6 +26,7 @@ public:
-     PlatformDependent *m_internals;
-     QNetworkReply *m_reply;
-     bool aborted{false};
-+    bool started = false;
- 
-     Private(PlatformDependent *internals)
-         : m_internals(internals)
-@@ -120,7 +121,10 @@ void BaseJob::dataFinished()
- 
- void BaseJob::start()
- {
--    QTimer::singleShot(0, this, &BaseJob::doWork);
-+    if (!d->started) {
-+        d->started = true;
-+        QTimer::singleShot(0, this, &BaseJob::doWork);
-+    }
- }
- 
- void BaseJob::doWork()
-diff --git a/src/provider.cpp b/src/provider.cpp
-index 9e4da64..b994ce9 100644
---- a/src/provider.cpp
-+++ b/src/provider.cpp
-@@ -64,6 +64,7 @@
- #include <QFile>
- #include <QNetworkAccessManager>
- #include <QNetworkReply>
-+#include <QThreadStorage>
- #include <QUrlQuery>
- 
- using namespace Attica;
-@@ -1134,8 +1135,18 @@ ListJob<Category> *Provider::requestCategories()
-         return nullptr;
-     }
- 
--    QUrl url = createUrl(QLatin1String("content/categories"));
--    ListJob<Category> *job = new ListJob<Category>(d->m_internals, createRequest(url));
-+    const QUrl url = createUrl(QLatin1String("content/categories"));
-+
-+    // Thread-local cache of categories requests. They are fairly slow and block startup
-+    static QThreadStorage<QHash<QUrl, ListJob<Category> *>> reqs;
-+    ListJob<Category> *job = reqs.localData().value(url);
-+    if (!job) {
-+        job = new ListJob<Category>(d->m_internals, createRequest(url));
-+        QObject::connect(job, &BaseJob::finished, [url] {
-+            reqs.localData().remove(url);
-+        });
-+        reqs.localData().insert(url, job);
-+    }
-     return job;
- }
- 
-
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 40d97c1670d6..ce3f1cdf65a8 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,5 +1,5 @@
 DIST baloo-5.85.0.tar.xz 281308 BLAKE2B e5d1812996674ce9542ba437ec6318ed81d8f00fa1acf2db3a5cf118d8c620ea2e9b3fb0f937390e21c69106a77bcad154a53226e88d3e2b44e87690a1b4b1e0 SHA512 63d483ae4688fb093cb8566366b7a821840ba7d1dbec916fead088d079771c803adb06a0d7252aa07058b9571ae8a84caab44d34c1d6ee1e37537113c1e92831
-DIST baloo-5.86.0.tar.xz 281652 BLAKE2B 024fe7f2b63cc473c8e6bfaf8e969aac1a780e309d5b5a7db6cac8f13288d9558135c11f95142f87c0208f7640ca519e3f7d07af88a6edd2e2a0c04d627af15d SHA512 d789c275a1ee6f8f8e5d395e447db8c924b3bf985f995f2b0c5052084f54c2c5706f23abadfe3941e16277cf0845a2d88bd796f316f994f338e57af2c3ecf81b
+DIST baloo-5.87.0.tar.xz 281892 BLAKE2B 1b303e0087781ea37a72c5d5d49dab9211c26365566572ca1887863aeb2eb9e23b1dbf323f4a7ef82c8ccd33bc3c18794bb169af7c8b5c8441d09746c1a40af8 SHA512 1113e3b0f00778b61878636f124ca6d2817581a9aa5b89ea1805379152e6e548049cd2315d23e38577d9b07d6f7d1417c481be4ae3a633adb34609145ac814a8
 EBUILD baloo-5.85.0.ebuild 895 BLAKE2B df88b1e20230e2a9a1e88d67975f4f4316451b505e5427857fe510fdfe5dcc031f7e406c905719a8e553d8c93039437aa3c4962791ebbb67f6690be6da463c93 SHA512 e3bdbd397d12560baf1a297528f5136a28003e19a81ebdaeabaaf4559191a6bba83f886a3fa63f1bdf2bc13d3c79383e369ac28f6aad21279f1f1c54233a07e8
-EBUILD baloo-5.86.0.ebuild 898 BLAKE2B 2d09a66594b917a223408c73df79fba1cdb49673cecdccb4a3e5aa7fb87b426d1be2e6200e7beee5b7ee688f1521ccac17368785efdadc86d3a57647f3ed2e92 SHA512 88131b6f6e0be69d0d4c1fadafa1cd7f3590207ad904c89f2492aaeacd8104b61bd5ab306b58b909e8495154781bc64526cbc7a82c5a2a759b2a67bf3ba8417a
+EBUILD baloo-5.87.0.ebuild 898 BLAKE2B 2d09a66594b917a223408c73df79fba1cdb49673cecdccb4a3e5aa7fb87b426d1be2e6200e7beee5b7ee688f1521ccac17368785efdadc86d3a57647f3ed2e92 SHA512 88131b6f6e0be69d0d4c1fadafa1cd7f3590207ad904c89f2492aaeacd8104b61bd5ab306b58b909e8495154781bc64526cbc7a82c5a2a759b2a67bf3ba8417a
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/baloo/baloo-5.86.0.ebuild b/kde-frameworks/baloo/baloo-5.87.0.ebuild
index 5f0003ad737c..5f0003ad737c 100644
--- a/kde-frameworks/baloo/baloo-5.86.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.87.0.ebuild
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index fdc759512918..043e62206395 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,5 +1,5 @@
 DIST bluez-qt-5.85.0.tar.xz 101768 BLAKE2B 43dea08e7370f13247908c4545a6f755f259b3a76d6a3600b08889e7ac7a1b0cb71cac45435012ec6efde9765aeb5e315fd051463feb3d80401caf83e3fe837d SHA512 cc86562edc55ca0b7db2a475068bff8a0094f74780be07c5080000f14d0568f21bf9ebd239a886023ddcb664cec7b4fc393133c5fa8bd2c0cae8b9aec74aec77
-DIST bluez-qt-5.86.0.tar.xz 101972 BLAKE2B 2be47a4efee1c5ee4b4863e3496d1e3a0cf99928d00136583013047a562923d2bbcf920d97a6fc7335a652ace56572655b630c4b71457525128498fe278ab2a2 SHA512 a24f8d6c6bebba3ad71755afe5a311a043a453dad597acff255b73fddee03f8e2835781c5a23de92558803cf0e3751419fca07ea8b6b4f4c4d5c85457b26ec7a
+DIST bluez-qt-5.87.0.tar.xz 102188 BLAKE2B 3671c651e52a7022963b59f0ff4843e0e18b551b45ffd16134f7c38be9039c92a58f10bfe8ce66892ce199ee39508b64d7b81fa976374d4f5cf1c40d2cee8971 SHA512 6f4ba8c27e17888a339be46c5d61560f3117ef39d7da1fc739e421490fd901059fef9c60fb6b7360e56fc02e6b8bad48bbb93916c40412b13cd2259f726060cc
 EBUILD bluez-qt-5.85.0.ebuild 685 BLAKE2B b51bd498ed98dc910ec1f48a8724d2eb43ea8650c69e420516aba8a027d437e609029f5f545c91cde0808cd6859291e823bf88e2d5f268f55a0581fd1f8597b5 SHA512 c87f509da8191f2e36f88efc2277ca6d438a3bf694cfa80a197afe477a54da1b61ba94b5902d45dd9608cad523ac4678badef30e5a09e5ab30103fb893e1833d
-EBUILD bluez-qt-5.86.0.ebuild 688 BLAKE2B fc17b49f90b2acfb35b69f26e4195a87d3b9cef0d5df6942e5f56884fe19645f2512b1dff2243539791fe8fcae79614b3fb00ba811eccc11b739543e1fdf1d90 SHA512 b024f3004583f98ad6be88011f1eed70e662cc9ea5283d67f06b59657e03196cab9716789d5d79a6f5f021023186a3c4fff78568a283b49a80295e053b501598
+EBUILD bluez-qt-5.87.0.ebuild 688 BLAKE2B fc17b49f90b2acfb35b69f26e4195a87d3b9cef0d5df6942e5f56884fe19645f2512b1dff2243539791fe8fcae79614b3fb00ba811eccc11b739543e1fdf1d90 SHA512 b024f3004583f98ad6be88011f1eed70e662cc9ea5283d67f06b59657e03196cab9716789d5d79a6f5f021023186a3c4fff78568a283b49a80295e053b501598
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.86.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.87.0.ebuild
index 036f8176f68f..036f8176f68f 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-5.86.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.87.0.ebuild
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 57744ea85d46..db2651543b6b 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.85.0.tar.xz 2051056 BLAKE2B 443edc464db1248ffef50e64fe8d680e9e854ad6f389861cff242c1a174cd05ac7c77cf172ac96510fa55869d8d9657eb6a99db730b86cf7de1892dabae2f23d SHA512 78be4cdf9701d92a5e8f405bceb64334c84008cb63c08af861e7d7424e08970d07f9f8320df2e66ae3468860424792c55b26299c14cb4cf347cfd65f513ab363
-DIST breeze-icons-5.86.0.tar.xz 2065564 BLAKE2B 5f88fc9842a58f03a945c9a4aa1ee200549e32fd60184f0d8672e119cdab00c2546a74394ad6c384a57454ebd3dbb862583dbd9b769b773fe053a8fa628fdb35 SHA512 683e8a2b7ea5a2e79875de09516b3133e8cb4ddf03d97c8dc09dca59175b333bdb2edabf807dbef53c42e2626e46894185ee471c8c0bde7ce182dc88a2096fe7
+DIST breeze-icons-5.87.0.tar.xz 2107940 BLAKE2B a7fea9183e0689f3b4d533f755cd7fe7d15addf5be15d5a8c57a31f5991d0955c1f01b39d916940a23ca0f4f486b3f360ce2bff7a88c350b1ec194aa57090299 SHA512 cfd7bf1724b0fa7d68cf76b4b46e007148dfb8c2f03f9419606a543e2b21345f7ca36339f134c415342f284115d0dc7303ea5064b0ce2863b9acabe630ce6938
 EBUILD breeze-icons-rcc-5.85.0.ebuild 911 BLAKE2B 474a0407b727eff529affe1d3cf3c811b247025159b2fe0fa43e9486e0b42cb7c469de2172671aefbb5aa8115ce8d074d2882529a18f80f5ca9dd8ce03afd431 SHA512 cdcc9fb786093b2bad5ca33314e93afc7f5433a622e7afdab3e51fad6dc28941d9311f47642dde76946bfd16320620cecfdf1534b41f68b8e04911328234934a
-EBUILD breeze-icons-rcc-5.86.0.ebuild 914 BLAKE2B 5c1c0632d46703f6f7d610cd168d606f2e84156b429aa3d02c5895be7a570766adad03494e795fe86bc3a508e00daea21a72e9e2a733b37271d235a95f0735b4 SHA512 8cf4096d3fc70f6c1f7a6af75b64b32dd80a7c4eb37464cbb2ac0f6955757b5b7bdd52fb61dba1851d92554228f56f7641e2df4cb146321e1a9260be03e9c7dc
+EBUILD breeze-icons-rcc-5.87.0.ebuild 914 BLAKE2B 5c1c0632d46703f6f7d610cd168d606f2e84156b429aa3d02c5895be7a570766adad03494e795fe86bc3a508e00daea21a72e9e2a733b37271d235a95f0735b4 SHA512 8cf4096d3fc70f6c1f7a6af75b64b32dd80a7c4eb37464cbb2ac0f6955757b5b7bdd52fb61dba1851d92554228f56f7641e2df4cb146321e1a9260be03e9c7dc
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.86.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.87.0.ebuild
index f18acabfef4f..f18acabfef4f 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.86.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.87.0.ebuild
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 6cc7aa17ba6a..fd18f8bd71a4 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.85.0.tar.xz 2051056 BLAKE2B 443edc464db1248ffef50e64fe8d680e9e854ad6f389861cff242c1a174cd05ac7c77cf172ac96510fa55869d8d9657eb6a99db730b86cf7de1892dabae2f23d SHA512 78be4cdf9701d92a5e8f405bceb64334c84008cb63c08af861e7d7424e08970d07f9f8320df2e66ae3468860424792c55b26299c14cb4cf347cfd65f513ab363
-DIST breeze-icons-5.86.0.tar.xz 2065564 BLAKE2B 5f88fc9842a58f03a945c9a4aa1ee200549e32fd60184f0d8672e119cdab00c2546a74394ad6c384a57454ebd3dbb862583dbd9b769b773fe053a8fa628fdb35 SHA512 683e8a2b7ea5a2e79875de09516b3133e8cb4ddf03d97c8dc09dca59175b333bdb2edabf807dbef53c42e2626e46894185ee471c8c0bde7ce182dc88a2096fe7
+DIST breeze-icons-5.87.0.tar.xz 2107940 BLAKE2B a7fea9183e0689f3b4d533f755cd7fe7d15addf5be15d5a8c57a31f5991d0955c1f01b39d916940a23ca0f4f486b3f360ce2bff7a88c350b1ec194aa57090299 SHA512 cfd7bf1724b0fa7d68cf76b4b46e007148dfb8c2f03f9419606a543e2b21345f7ca36339f134c415342f284115d0dc7303ea5064b0ce2863b9acabe630ce6938
 EBUILD breeze-icons-5.85.0.ebuild 949 BLAKE2B bab86c354c440ed3e2d42beed870b026492e31dee862301b58456833910a05c9b9163d755bab23a88883fdba0e9f76a32da7fbe72b9974c4c00be9afcfe5fcf4 SHA512 3ebae5cc471e72aab4fe2fe65785aa3937c1b471c687484350dbd3dc4e38595b00a9dda72bc85c43be4bef8f82144225c048709590cedb8bf1b3aea6ead9f3b5
-EBUILD breeze-icons-5.86.0.ebuild 1120 BLAKE2B 1bcc55ea1ba4b0e0bb9d510f729db83185cafb2f928167ae9156827b2e7a9d8c1516d63ddb547e829905f3ff6a5fb6c98cff7e080eac9ea2e890c5532401b520 SHA512 adc8f74699401da887613fe5bf3c448bf9aac3c340068fca608248dee67b3ece39b060e88c6cced7907e20d39879e4ddb88ed901e7974b480fa4b23891111d4e
+EBUILD breeze-icons-5.87.0.ebuild 1120 BLAKE2B 1bcc55ea1ba4b0e0bb9d510f729db83185cafb2f928167ae9156827b2e7a9d8c1516d63ddb547e829905f3ff6a5fb6c98cff7e080eac9ea2e890c5532401b520 SHA512 adc8f74699401da887613fe5bf3c448bf9aac3c340068fca608248dee67b3ece39b060e88c6cced7907e20d39879e4ddb88ed901e7974b480fa4b23891111d4e
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.86.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.87.0.ebuild
index ef153169884c..ef153169884c 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.86.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.87.0.ebuild
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index f6574f6b6e3e..a10147be8f71 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -2,7 +2,7 @@ AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed926
 AUX extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch 1636 BLAKE2B 8aa07049667ec2e4e986e459fa557ec171dde2746ff603b7d6a18f3197aa025ff1ee07d89e6dd17a722abde379aed69eaee58b99131c289efa979ad1bc3dc91c SHA512 3ba5f3d6cdf6afb230378e9891426ab64414eb19876ad0a7253b4301a50cd23a1bfbe9f5d267545fe788e846a4f86f93c09887b5f76f96f19643f0e18d6b0ba1
 AUX extra-cmake-modules-5.74.0-disable-qmlplugindump.patch 2677 BLAKE2B 7ee3d039291f65e667d83dafbedf1a7790db9c411962dca48dadf8e65d25733cf1f74b406b871986340e65ab43cea586739274d3e9e36ad00021bfa1fc6700a8 SHA512 47105664fb59b5bee31b58c034e4e83cfa93983d40d369ff82204a35195171a5fab6063f0257eead5186fadd17f87c378daacecc3c9cdb63fdfd0dbe42fe56a7
 DIST extra-cmake-modules-5.85.0.tar.xz 318048 BLAKE2B b33d1e4d131349f706f7ef3cc75b59dc48299f03c62699fb1cdc6a9c496ebc527628bf07da41241ddd86128c5fa44b2b2c0a68509a0eefe742efa37d02386be0 SHA512 78ff26496c37d93106449663ab30ad35784a3ad668f4b1ec49d1ef51916e5de050e828fec8f6dc4ee5e2bed95cf22becb06ddd971dc46b65acc19934f5c1c5b3
-DIST extra-cmake-modules-5.86.0.tar.xz 318384 BLAKE2B 01e4e9adfaa9df10a53d7b67d230eee60bb1f4520b7c4559140ee1e7ee3afd3fb192700d567e015be25f056caeceb39886fa3dc036f5e6c8ac41722b0df23442 SHA512 88fbd26bebf9dda99593eccf49029b845aee0c48b31e7893e2dccc5eac53376e348275a09b37199b9d69de6ce41f939570e5e63e11e04bb537b669d2b90cf8d6
+DIST extra-cmake-modules-5.87.0.tar.xz 318800 BLAKE2B bfb50ab565d6b9f58282b8b14ea1d1522eac0166ce55ee3a4dc3aaf247ad88d30e8caef27ea8841bdf8b7b1d1fea4d96fefa6630ae1b490225c096214931118d SHA512 88b431aaffbafbc619e6b332edb3c20110d869c17d11859cbb70fa5c6d1c8b8b29797cd8e9af375cd17b928d65b4a8b03c4e52e3b56012c1ffbbe7c4cc602c79
 EBUILD extra-cmake-modules-5.85.0.ebuild 1818 BLAKE2B 5b656427e1b0a4c525428d985e9a3badde2543bdf7a71b3528cc6499b2111b43c6ea942b7916cd895ba720a56d852a5c7ac2051ec4faf552935ec3dc32d51185 SHA512 58a150ff3cc1f3f351d75dfbcf3b9faaa15ffb87a297152da746a2186f061475d54116ee3500f07a1fd33cc597ea4e31544c435d28e92b152abbaa975cd3fc5c
-EBUILD extra-cmake-modules-5.86.0.ebuild 1823 BLAKE2B b3b0e5b5f98ae2606fe0ba5dc6f26cfd936cb3241e5da5d49f172b751e45fb453f65907fd297b4057ca4a02489e3c597a99df83508d620154fdf37bd209c18c5 SHA512 419b66e3f05220ba7d65108f4543305cf680175e7f5419f5f549488339e0e73bdc40769c2efd498284df15992ec6ab9f7cc35efec3b2076b9561eef71e9ded52
+EBUILD extra-cmake-modules-5.87.0.ebuild 1823 BLAKE2B b3b0e5b5f98ae2606fe0ba5dc6f26cfd936cb3241e5da5d49f172b751e45fb453f65907fd297b4057ca4a02489e3c597a99df83508d620154fdf37bd209c18c5 SHA512 419b66e3f05220ba7d65108f4543305cf680175e7f5419f5f549488339e0e73bdc40769c2efd498284df15992ec6ab9f7cc35efec3b2076b9561eef71e9ded52
 MISC metadata.xml 480 BLAKE2B ab8e3f4e0a74a0e856bba9cf47e40254738c6d545a569bf12fae38e8e6d1e5d0cfd5a0ffaf6d5266a1532ea455d5f7f5421f1b88fa09539af6e31d2e85e170ad SHA512 0161373d45e5fd9a1c3c4f47892fcf1173419481f8de3ee73cc029ac628d36551516d0b99acc8b227b336ec5ce138844fd2654555edff3a73b8c07dbd931e468
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.86.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.87.0.ebuild
index fe872c28e049..fe872c28e049 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.86.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.87.0.ebuild
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 28521475451e..cc1287a8a8de 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,5 +1,5 @@
 DIST frameworkintegration-5.85.0.tar.xz 1755792 BLAKE2B 0a9b6b9a35d20fac0d07cbcf23f4ca1e0627a0175a7298a6b6391b1f4e1c38a46e029dc21ff22ea397ad3de053485097137e5a0de818300000f0c0e4f03c474e SHA512 d496c3b2ff49a3e4ee43e3c208b7dd3df68561fed0fe519f22a163c3389683f7d776270fc6472f4b52677cf85eb4a73c6bb7bdeea951600f8f5302411677a4f3
-DIST frameworkintegration-5.86.0.tar.xz 1755804 BLAKE2B f5100b577fc3664d34ae0e62f1c05763eba173595aaf86b7bb073a69c3baa126c7fae34e07e72a541f2da79063ea6cbf101c43294eca65ad545e37a8f2245ed6 SHA512 66a97064a47599e27ec5fc7ac92be87a5c7df31154f662d13bcd21556562b50989b82ab538ae96b7f372a2ee77c408e47ffed62bff1c94c91f8b2b9c786dec69
+DIST frameworkintegration-5.87.0.tar.xz 1756108 BLAKE2B 4ada22086c806988bbd845e2f2b85facad26a14db853e26d86cd4752c894a595d40e8f8b123b2e26d62447bf82cefa474140207b1d7d3d24140038f44a4b6797 SHA512 39d5217e2f537ee31331ae918e7d97242175fbed2f336cf5cf8c78dc7c5fb1ddc5b2f9cc86c78c737ac4fae2edda56be5a7991d6f48ee33fa4d0d13658dfec74
 EBUILD frameworkintegration-5.85.0.ebuild 996 BLAKE2B b86a1104b8818d91e389de6ee1c842e0162ad64ec4af36cd18556af2cf15e63fd0740a5376af3cad89e634b9d4c372593f7d9222cc7c137b6245743e9f74bd30 SHA512 b5dad393d1f8c77d8cca3870ab3ef5bb206adaa3f0c5c96f850e9291aebb299fe8bba8e5630ebefa5fdc7429109924de7a046e723698baff340f294fdbc2d093
-EBUILD frameworkintegration-5.86.0.ebuild 999 BLAKE2B 1fb9970af1d6d216ffb54713db1705bc7207cee6636b0130f2f162bcdc9ebf302ada3adfa74e74bea71d5f8b7c293e41f8917801f77b499424ed2e6eb89c3cb3 SHA512 bfd51abff3bf71b2b84f164f757fbbb96774a6aa65ffe3c4a8914d23509423105e63e141555f508a76b8ba6c90fcaa235643b4229b9d77fbe7c1ac450aa6558f
+EBUILD frameworkintegration-5.87.0.ebuild 999 BLAKE2B 1fb9970af1d6d216ffb54713db1705bc7207cee6636b0130f2f162bcdc9ebf302ada3adfa74e74bea71d5f8b7c293e41f8917801f77b499424ed2e6eb89c3cb3 SHA512 bfd51abff3bf71b2b84f164f757fbbb96774a6aa65ffe3c4a8914d23509423105e63e141555f508a76b8ba6c90fcaa235643b4229b9d77fbe7c1ac450aa6558f
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.86.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.87.0.ebuild
index d52fad501353..d52fad501353 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.86.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.87.0.ebuild
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index e0ca124ff959..5cc58ab1e640 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,5 +1,5 @@
 DIST kactivities-stats-5.85.0.tar.xz 81924 BLAKE2B 2e00d96f01b3f3540405c0e4dcddc201eec8218e025e0c3086a9038ab24f4727acf7c11af7a8234d068d6808ce4bcd1384fcd14cc858c6dc33079749ac6e37f6 SHA512 4d58a6ca1f5d373a0c625bcc782e3f6e3bd68c960615c1a7f08ec3ca0e889b72dce300e80d080ae3e531bbcfa9cadeb50cea27a517e35f4cae3d426d487322ed
-DIST kactivities-stats-5.86.0.tar.xz 81980 BLAKE2B 6eee449c3e5c936763f0e2d335920a78d4b4e771a5252181be0b859d31e6969521303228951998695f239a639dacde2963fc6704a93a7fef6df7b00a6406ce10 SHA512 27ef21c651c6794028b1fac49622147360234d8a711286b165bfd9e08ae7768e88f6f57bcbd36b8237c1a029d58926ea9638347d5699baf8361e532cb0185d73
+DIST kactivities-stats-5.87.0.tar.xz 82216 BLAKE2B 48a554922af48f25482ea45c2a3528afeea37f2b27bf49e7e5aee5057eb752c2ac1ec700a4c73fc11955a45217af3dce4e5eaf87684eeba082c05dbefb71e6c0 SHA512 d588797d26412e8f8518ff918953b1fb3c452364c2cb8726b4a44cb0680fd7c0a0ed349d437ba813332ba5d844bfea4e272d3424b2ace7d9afa111437906eb37
 EBUILD kactivities-stats-5.85.0.ebuild 523 BLAKE2B 71a7678470d0b4b858687f1c4dda7ed578c29fbeb071ae45ccb92ee5b5b78bfae78f7a17ac9b6bd241d247a14157c69e88a532588ff0bb366ac41f07dfd4653d SHA512 180de99a5b73d3ae38a4382d6ae04e34ad00d2323d36eae6942fe2f9f3bdf83db67655449d2c2e7b73ba0ef11abeeb7797ae1c631e1e74d7923c23205d4758d1
-EBUILD kactivities-stats-5.86.0.ebuild 526 BLAKE2B be0bcfc14b467dd662ebd84fe0334ef40c583ae390a97accb0c564516b65f44d49280a651ba8e9102dd6ca1e815d876a42fbabe872e7447f5f9520d654de4dc6 SHA512 19c81f5d876624b00b4e97c6b0541750b9d76771b14789b062103092170d40d54f7d42d6bb3e7159d332ed9ba3246138d6371599d52e7cc08f95ed28b23f66c6
+EBUILD kactivities-stats-5.87.0.ebuild 526 BLAKE2B be0bcfc14b467dd662ebd84fe0334ef40c583ae390a97accb0c564516b65f44d49280a651ba8e9102dd6ca1e815d876a42fbabe872e7447f5f9520d654de4dc6 SHA512 19c81f5d876624b00b4e97c6b0541750b9d76771b14789b062103092170d40d54f7d42d6bb3e7159d332ed9ba3246138d6371599d52e7cc08f95ed28b23f66c6
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.86.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.87.0.ebuild
index 02989e763ca8..02989e763ca8 100644
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.86.0.ebuild
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.87.0.ebuild
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index da997e6e409e..61c31408c0f3 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,5 +1,5 @@
 DIST kactivities-5.85.0.tar.xz 71328 BLAKE2B 59f01075a0cc785061251ab9da1cde122b0bdd7cd02c870f875513c54e8a008e3069952e860b60399b714f30eb15229f2581557948d951d47eff038ce3393c91 SHA512 62769a6a0f8d243e9774c819658b5e451c0d1fa4910987d7b07d809d61d63355300d5ef29f91193f62f66d032539066286ac11b4da87e7b60eac4277df68c0ab
-DIST kactivities-5.86.0.tar.xz 71508 BLAKE2B a8892574ab18f244d3e787451019e082339c67d27ed75ef94d9d55ab18d96f880807488bed016a5c3eb3876c21b09f27e50fbaf01c4b6e5a57e7482751a9ea8d SHA512 cbe718ca966b5ed1f8a6590a07babea69289cef8cdbf96defa42604988bc14b0a6cb235b34a6219682972ab8cde6372645168ca2f55385043cae37b57a582cae
+DIST kactivities-5.87.0.tar.xz 71760 BLAKE2B 5cb04e75202f998236cd41a4aee78df229a864bbd8eed2a631d3845c0a0e09790de21e0834dbdf80dcc623b3c6893ffde1734d32ef10be66a1e81991e78e24ee SHA512 f1402f3e18419df49ceb0277bb660a9a39958226119d5890fc6f61d6b6306c3213c82250ae667812391620a41296bd879a55587e7cbc017b1ece51114089a474
 EBUILD kactivities-5.85.0.ebuild 686 BLAKE2B 4cf7d67bcd96e80f8372981d091aff7b652588a88044470ef2d240014577507daadc8680d227a3a52c10500cbf172c86e146a160230f8d9edd2b8ae1d358860b SHA512 7d30c2f46c4550ef09630f807daa6140dbb027e92707f79a21e226a5e74f9c1e74743579b895591c213af2eee0cf98908e4d413a1ea34d9d7e70ca0bf71485e9
-EBUILD kactivities-5.86.0.ebuild 689 BLAKE2B 8d1578630bcce4b73793cb6bd7c2f6651bb1a10d355c84249de7ccb7263fe6f8365aa14016613535df6351f08f035eabebf67e185e4ed12561a59b5b183c1d13 SHA512 bd06da405a53cb0a6f324e91216924c1c9e7e71eb16a63d371a55df0a81a385ebf400af21f0ee651910253d7952222bf278e8633fa8d778704c5b3af48240568
+EBUILD kactivities-5.87.0.ebuild 689 BLAKE2B 8d1578630bcce4b73793cb6bd7c2f6651bb1a10d355c84249de7ccb7263fe6f8365aa14016613535df6351f08f035eabebf67e185e4ed12561a59b5b183c1d13 SHA512 bd06da405a53cb0a6f324e91216924c1c9e7e71eb16a63d371a55df0a81a385ebf400af21f0ee651910253d7952222bf278e8633fa8d778704c5b3af48240568
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kactivities/kactivities-5.86.0.ebuild b/kde-frameworks/kactivities/kactivities-5.87.0.ebuild
index 426ccf34ebb0..426ccf34ebb0 100644
--- a/kde-frameworks/kactivities/kactivities-5.86.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-5.87.0.ebuild
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index eeefd163929b..03c5a91fecb6 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,5 +1,5 @@
 DIST kapidox-5.85.0.tar.xz 195060 BLAKE2B 9ae5cf5f6930174ad966e6b5625b1a1619f4ff241388c3f692cbdbd6f56c2df685ca78b4dfbc07ea307db16f39c2bd6c81cb78b41584c25dcf7c119805c428e8 SHA512 afbcace81c249fbd5e26cbb53afea0f30d690fbef0c35bcca674ffaf2fffbcd73f00a21c4f50bdb4e32d8349c40f680fe1879df2d8f79eb284e5863fa7afd07f
-DIST kapidox-5.86.0.tar.xz 195088 BLAKE2B 698b00962f601f0907f5b8476939f50cf418bfa0ed9101acf5416f1d64cb139b17cb23ed76d44e9dba002ca2fabde9f5c8ec67ad264dc3eb5a476217a408b5ff SHA512 2b65cd8ce36b0c61efc8792acbbc5acf62216436d4c570e18db749a1e562df6549dffdffe9ddcbdeb3b313b32ce4e13175b2e5cbf955c5f330f67ca19592b71f
+DIST kapidox-5.87.0.tar.xz 195348 BLAKE2B b26287854fcade918a05f34f55d1149346abd45ff0c90bf9a4a94312553a4ee50b1dbac27e649766776fe0f5c19e43fe52525a12adcd5105cceeea1f779ca0ce SHA512 5c547562c18415209dd4660d01717cb2ad98dcd84ffca3c40ffb2024a5a81d5c4f1f9e8567f2f068baed3cf53b344f95720e25d50e8fa1e34b11f53e96d4dab0
 EBUILD kapidox-5.85.0.ebuild 580 BLAKE2B a6ca4844cb039f72cb7591666e8c5b3ee1010574e6fcb00552bcd41a9474bb088ceada3860ec642872d55ac72bf8e0b6930a595f0fb162c2148f9051f359be99 SHA512 d9f55da7b5da2c14500626be368920dbdde8b968af5b360bd759af610ba8916a0a33b7ca970e611f3de65578a07ab2fe9ad2ba5647df3232862f214c6fada38f
-EBUILD kapidox-5.86.0.ebuild 583 BLAKE2B 65652f3afa8965cb29d66ce1df2e7f7731a4e0b89e5659f527045df5b3043917abae063b3890bb2b743e0db25bfd8af618c22660648026f8d54e575466e9823a SHA512 4ffab2721405199d4279b73a4b7f455155089754c7402b339064128c2f10a605182f819af5eea36bd03cab7f9718c4fbbed9ac624be7866ce50da6ca3fffc9c8
+EBUILD kapidox-5.87.0.ebuild 583 BLAKE2B 65652f3afa8965cb29d66ce1df2e7f7731a4e0b89e5659f527045df5b3043917abae063b3890bb2b743e0db25bfd8af618c22660648026f8d54e575466e9823a SHA512 4ffab2721405199d4279b73a4b7f455155089754c7402b339064128c2f10a605182f819af5eea36bd03cab7f9718c4fbbed9ac624be7866ce50da6ca3fffc9c8
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kapidox/kapidox-5.86.0.ebuild b/kde-frameworks/kapidox/kapidox-5.87.0.ebuild
index 904180677a05..904180677a05 100644
--- a/kde-frameworks/kapidox/kapidox-5.86.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.87.0.ebuild
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index 9495927e556f..a08b97a58a33 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,5 +1,5 @@
 DIST karchive-5.85.0.tar.xz 985392 BLAKE2B 1a38aff9e62ed0cd5936992d514707548fc0d727b9c3da019d97ca600a34c303e9c88962c96d3c897a9d95dab8f9a02253be91d3ecf7ba490870f9ddd0b7df9a SHA512 5890e1b7e354420a63f8deaca0375b8caf1d798c5682ee4ef902c40435d493e232d66528fcd40c7efa40a390d76a22ce6d6f73e884e95528f5d56639cddbf7f5
-DIST karchive-5.86.0.tar.xz 985432 BLAKE2B 2ad61fcd41e9649ffd99eab901eda985c41cd628b2bdbcce7dac3b7f8d1c2612b65efc3a1a4b3874295189ccfad105ea1a7c7d476f90765cb8a6cb98e35ad64a SHA512 64c1b8ded7b2c7b56d0a75a7cbe22e708b926f4b2df00c9f08105928e7e0af6e578bda74e4299a79565ef08e029f1daefe51e8bed20164f55fb8da8d1e5307e9
+DIST karchive-5.87.0.tar.xz 985656 BLAKE2B 27ced185f72dd644fb61738eb77f5eb784948f3a18fa5da2b1d648e867bc759c55523a33fd40d70a49e340234739129ae8e5a8731c6c4e06ca64e2e18a5e45b3 SHA512 e43f672335557274adc63de9c95564ebbd9602c7eb6613afaf278f2200c9a905e1d51cec189c5472a912f765641c7c25bb54b9d6482cf8276987c01d8b64bd6a
 EBUILD karchive-5.85.0.ebuild 634 BLAKE2B fa06f13f10a8ae5f7fc1add7d6a6c7fb3cd25f57d4d2e9fefd2c2e967c66680cc1d8d509874c1205ddcc00a324d38b966d29f923683151318d1775dd8712781c SHA512 4d95ccd6c096592127b101b1ee7696c6f27e0ebdbd85f5a0e2a183402f55b29ad521df032080d012281aad74be0b0bad4f620237f19cac3ebce1e71567c930d0
-EBUILD karchive-5.86.0.ebuild 637 BLAKE2B 25ffcda0a9aad044083f125829f59b8d060eb87c5a934e66092b641228e0f248e3e1c95867e4ce52404e9ada31c5cc6283e2f7ee3eb515cc85ec9e27972f86b8 SHA512 b14086a2bdb82214474f1d53e2de9fb745b47e224e698454efce50c651bb0c30690cfe1b8e806e59ca49178b0de2c23ec4deb5d86c7da9156087b444e7e0738b
+EBUILD karchive-5.87.0.ebuild 637 BLAKE2B 25ffcda0a9aad044083f125829f59b8d060eb87c5a934e66092b641228e0f248e3e1c95867e4ce52404e9ada31c5cc6283e2f7ee3eb515cc85ec9e27972f86b8 SHA512 b14086a2bdb82214474f1d53e2de9fb745b47e224e698454efce50c651bb0c30690cfe1b8e806e59ca49178b0de2c23ec4deb5d86c7da9156087b444e7e0738b
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/karchive/karchive-5.86.0.ebuild b/kde-frameworks/karchive/karchive-5.87.0.ebuild
index 37a163f34150..37a163f34150 100644
--- a/kde-frameworks/karchive/karchive-5.86.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.87.0.ebuild
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 0f00dd4ac5c5..579a176cb73e 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,5 +1,5 @@
 DIST kauth-5.85.0.tar.xz 88580 BLAKE2B bbb6d0d65c3ee0090ee8c7201938ca92cd59d9fbab84c6051b0937d9a6acd8fa3770f11a4e7cff32662c4d6d98296a58960700a87d9359124719be57f893ecaf SHA512 a775f1952ae112fc80a8119dd7060146dd427da6f73d9d3bb308c9683ffa263949e5f06615bc397806e951cf6156631a3d02505edc390c5982732199f17d812d
-DIST kauth-5.86.0.tar.xz 88596 BLAKE2B 6d4647d7ab538bd9371995b347a77267750c22f69bca8172a68ee6d1973ed7b1b4478d27dd1d08dec5612a177d89ee948219fef6f9e0e88f14082cec3843dd2a SHA512 df5317620d892b25f6cf8f39043ea102c841e34d8201d96b551ab870e2124964e3c4ab975ebeb443dbeff0976f2d8374beab257f1cb6394374867cceedb05bfb
+DIST kauth-5.87.0.tar.xz 88840 BLAKE2B 6b546b926147ab03400911c5648070ce2651a3b1d4a69b656506498590be91d5fba7d7e7f77bb154d25c2980cc587e24c47f63f1c80954f8c88c087e8be4558d SHA512 4026dbbf5813bdc64519a07be4f1f1946ff77c2eb76d44a8bd43d0ef2d3a8c7504f7ff3fa829b85c3ead900484e7cad9d221d564f2432e372c33a22cb532f453
 EBUILD kauth-5.85.0.ebuild 983 BLAKE2B 766885ef482b1d8bed2e93c31b0216f659b0614fa086fbef8f8c95ad1621c8257f02f3bb13238ded233eec5f5caa97cc3b49be494d4d5235195f261a58f44142 SHA512 c0fecace5d145cca1d1bc104d2b132bb4dad6ca89ef4dc3f58017edb41d386c80c672be917ed2cb1f9391f34e560f98b8d260803573ad9aa591e6de3cb361174
-EBUILD kauth-5.86.0.ebuild 986 BLAKE2B aabb41ce2062801f265a5124825a891b3432b02757756296a1af75e41ba6db16c718761e09a900855c377743492f77b9e6e514ade0923f76e4a46b9eeedd9f7a SHA512 0362163b9d9a19a9fbd3b4bcae9c359abb9bb4e7fd60dc384b2c949d54ce5267aaa2844d13a80a6e26b74ae2163cbdd8674a4307815046bd731e63b565a0d833
+EBUILD kauth-5.87.0.ebuild 986 BLAKE2B aabb41ce2062801f265a5124825a891b3432b02757756296a1af75e41ba6db16c718761e09a900855c377743492f77b9e6e514ade0923f76e4a46b9eeedd9f7a SHA512 0362163b9d9a19a9fbd3b4bcae9c359abb9bb4e7fd60dc384b2c949d54ce5267aaa2844d13a80a6e26b74ae2163cbdd8674a4307815046bd731e63b565a0d833
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kauth/kauth-5.86.0.ebuild b/kde-frameworks/kauth/kauth-5.87.0.ebuild
index 1b89dd9ac255..1b89dd9ac255 100644
--- a/kde-frameworks/kauth/kauth-5.86.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.87.0.ebuild
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index a546c870cdd5..ffe737915069 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST kbookmarks-5.85.0.tar.xz 127000 BLAKE2B 8d334192686f1696aff395acf7d562c55201d20eb3588083b44678bb9aa3a589e056e092584821c805be159283b3c22fdc5aa752648c286bb7610901726d0176 SHA512 f67f59c4fa6ee0eec16c431216223f352bdc4852c0ba4fb89cb50f477485a6a0dcfae161c69b49956d19b533d1624968e2275e3e2ac26a2da66a126c7c4334c2
-DIST kbookmarks-5.86.0.tar.xz 127140 BLAKE2B 223b4b845cf834ff9030fdd178f4e54d6eaf2c95d1eb3cb77bc2aecbf3fb82f546a97e4f768331a4528ed27e1911dce13c25f7f4527e0714c00d49bc4bcbcf3e SHA512 f5a9bab1794264fc5d7fb8a93b88b1eab701336a34a553dbada079816d52e109e5811e36fae6b455a374ed068969b75bd724ca15451626d63eb73723b8c15d9a
+DIST kbookmarks-5.87.0.tar.xz 127408 BLAKE2B 9fadf582424bedf5c592ebaa5ad19e3baff1ffbf63502bca005e4a435e775c30e9919d2fa76daee69b45671ecc417a5b6b731e93c4dc5e453bc8c996b7229a33 SHA512 346df4716b9dd93a3b783bd7d37a11847d22cad0e180c467623834785c09b5aaf42325d3be0d7b9d2d22251ba85674f3b4d0da146295ad678a660c9e2c865708
 EBUILD kbookmarks-5.85.0.ebuild 823 BLAKE2B 00c236d359de6646e8c500e3383ba2d00402ec36b0625de68805e9ce687e8f5f937d518856147f927dc5aaa14cbc83bf6a1337b3e2d184d17a49456442776c65 SHA512 b1a73ccc8d88d7ace7356c116dc1db436536c7ae2821f1090233cd842ed420c85f97fff74f8e982abfa0c803beb7e34bdeda0f6a71bdbdd510e88f1ee8d3bf92
-EBUILD kbookmarks-5.86.0.ebuild 826 BLAKE2B 22d170040cc1615542c7b16802e9bb73a9e058ddb0de873284ecca6f70a529784edd39fabfeb15d084819c431e2f377760f9bd0d4825460309b1ed8fee0bb59a SHA512 bc37714fa76ba2aa64066245a8a34b99b399b8f58fe70caaee2f375c614710b10ff9d0fa7cc84d126eff24388f3ed07bfaa8e28cb7256a8ec1c1216f09792229
+EBUILD kbookmarks-5.87.0.ebuild 826 BLAKE2B 22d170040cc1615542c7b16802e9bb73a9e058ddb0de873284ecca6f70a529784edd39fabfeb15d084819c431e2f377760f9bd0d4825460309b1ed8fee0bb59a SHA512 bc37714fa76ba2aa64066245a8a34b99b399b8f58fe70caaee2f375c614710b10ff9d0fa7cc84d126eff24388f3ed07bfaa8e28cb7256a8ec1c1216f09792229
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.86.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.87.0.ebuild
index 01f3a9d2a959..01f3a9d2a959 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.86.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.87.0.ebuild
diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index 865da670db8c..6dda7a1df42f 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1,5 +1,5 @@
 DIST kcalendarcore-5.85.0.tar.xz 258044 BLAKE2B 469af118c30c5fa685625271fea5490a2d13b611541787e1998c5434bbea1a30fa283b9fb9cf60cbde75d9e7fe2ce9511ee9f81613c2675b09d594b72e3158e5 SHA512 91d37a49bcaace1c7717b1ea0e710b13f1e56edfbb0db2b7c012e7b86e0a4437466289a6770c745cc1993c6b1bbf670f238b3dd1b033225e6e6d36c19584c79e
-DIST kcalendarcore-5.86.0.tar.xz 260196 BLAKE2B a1db517f82216e33187f4d9660c315cda4dfda64bc63799ce26094d125a65681a113fead1239ac4d7c047e3ac830eb9398da7845b8381d7d558c801cfd7acf1f SHA512 255c8b0204f7c1dfca6b1cf9fceddbcb763136a7df5372cf5e755b2df038ba4126b7202ebdd307987c5f174ce4878a62f140d3ba7cadbda7ed3c9f214fad3b92
+DIST kcalendarcore-5.87.0.tar.xz 260596 BLAKE2B 128cdf0f992c2c6d2613b0a7160595da7675edd65a5977bf64378a4fa0f5b9b0b94bb684c76fae655bfd7f75a32a9cb924cf27e153b46bc43c1b7c65f9d2701a SHA512 97172e23a5119a37c7f6374cadbab58c55e4bc195e38bb74fb26aa0249f5ecbb00ffbf5889187f195d598b9654be08be0b78eae1b9f89b18f969f76c0e53d28f
 EBUILD kcalendarcore-5.85.0.ebuild 524 BLAKE2B 25afecbddaa0ba5ddffb6a4577c08207d1c1de699f320a0c67d4f7fdb1c75d1e0c76ee84b1c60e84c7606382780e5ce04b72e0b735dee8509841059108f3ec47 SHA512 42ed432a7c8fd5daa8532c7aa142ccd598aefec1d434d68afb4290483d8a927a3896bab2631469831e46fd9f7083d49cafffe10e139b32238670bf338bba2b75
-EBUILD kcalendarcore-5.86.0.ebuild 527 BLAKE2B 61e94abda31b0a4573a77a120c64847793f9336155eec0732bd4bfe0d20efd93694ea339b0dcfcc7a9182980687ac11d5abdbd751b7a301add7d881bff28cd07 SHA512 a7d0a622c9293a9bc8251c1914ddeba45386d93d7c5a7b977e3158dda7ddfc4234681aa3b6088ddc812432a55b577087a728c7a75998243ba2e56e929956a2b2
+EBUILD kcalendarcore-5.87.0.ebuild 527 BLAKE2B 61e94abda31b0a4573a77a120c64847793f9336155eec0732bd4bfe0d20efd93694ea339b0dcfcc7a9182980687ac11d5abdbd751b7a301add7d881bff28cd07 SHA512 a7d0a622c9293a9bc8251c1914ddeba45386d93d7c5a7b977e3158dda7ddfc4234681aa3b6088ddc812432a55b577087a728c7a75998243ba2e56e929956a2b2
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.86.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.87.0.ebuild
index c8d79be4c996..c8d79be4c996 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.86.0.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.87.0.ebuild
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index a626ff5d094c..5abb17d3ff59 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcmutils-5.85.0.tar.xz 163296 BLAKE2B d392902e5629920f307b224bafe07037426152660a4ba8c66eab17aba356304c99456b6f487a8f8954266ab3a7b4d0b207dbb8daa692485060046ae6b853050b SHA512 38c7168d91b535a58317ee36442ef2857aa3c43c7a33ba2abab115f7f890f7c53f29b488c0d5597a93b500814bf0a0bc8d8347124f5ced5d13118a0efc95f1fa
-DIST kcmutils-5.86.0.tar.xz 164164 BLAKE2B ef4cdeb65abe1df9120201a2b295f6b66b8c4fe0d4bd2da196a0c5485628eadb008b53a95adbae3047cb3ddbcf183fbf90b66e3f928f87931ea4c720c617a074 SHA512 5579a963f1414e85568b068e57bec99b2162ae41221055c81538707acd9a5a4476155baf86838f30f4337a6187b95cad9964ecd0f41482f9566d3106b227ceb2
+DIST kcmutils-5.87.0.tar.xz 164756 BLAKE2B fcb5ae77c753e902bbe5dbddabf47b8dc7373b05b1288eb722ffa684b459aced0c0de1f3c0d0ecf01e6ac9ca44fec3ad31010e5e1c332b2d3513c410a9f05c78 SHA512 5dbf99c11b8302436b75b7c169f68fc7ff2e5acb4cf7b500456df98ff02f78c0c9bcad01e76e98acbba4eb9ef5f4a0fa981d3e8e033d2ccd63c331d9e05b690a
 EBUILD kcmutils-5.85.0.ebuild 949 BLAKE2B fafad65df5953c1cbf984f592ae0ca63d090c5d523cf4a9a31e1b4c35e165c415482da54d286ad1d9a235b640f3d0ffdf063707527f27e49be23507b449273d4 SHA512 9594edffa8bb2afb825db2633ec177ce34533c22501f2a98a5f7fcb4d6ca2a00f3567afa1c47f59bf125e02335e370dbdd170c8ef6609394642ad2848c32d517
-EBUILD kcmutils-5.86.0.ebuild 952 BLAKE2B 962a284cb175e4c2dff3fe17bb59f4830cb2c8376a74f9a577bc5c9d41bfe8c6c44c57adfd9c3a278773ebd319f1de74c5862e6693c482472c01eae41c2bab44 SHA512 15cd3f6fb61d24becdd40f8eb0b7bb5c089ec1a12a743add3e7a52d8b83d608d6f3d923ab8c22fe02a588dff16d08f544fd2c244af5e6cb4ab2867512c2cf659
+EBUILD kcmutils-5.87.0.ebuild 952 BLAKE2B 962a284cb175e4c2dff3fe17bb59f4830cb2c8376a74f9a577bc5c9d41bfe8c6c44c57adfd9c3a278773ebd319f1de74c5862e6693c482472c01eae41c2bab44 SHA512 15cd3f6fb61d24becdd40f8eb0b7bb5c089ec1a12a743add3e7a52d8b83d608d6f3d923ab8c22fe02a588dff16d08f544fd2c244af5e6cb4ab2867512c2cf659
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcmutils/kcmutils-5.86.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.87.0.ebuild
index 52061f0cd40f..52061f0cd40f 100644
--- a/kde-frameworks/kcmutils/kcmutils-5.86.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-5.87.0.ebuild
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index eb58de215e33..00a001d452dc 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,5 +1,5 @@
 DIST kcodecs-5.85.0.tar.xz 232016 BLAKE2B 1165a5c89682d2987d414c134a6e0481d9ed5b7d17f3e76899105feed510a4deb27d018b4f1dc6c7c9c70712aa66c36c1768ad557490f527375de8e29e8a1667 SHA512 1ea9b627d71cbe5435ba584f4af6e28b2c68ecbe5c415e125aefcd66c3418535cac6b5688e138aa60b3722374d9dade736590ee0900cbe65638814c80921ace0
-DIST kcodecs-5.86.0.tar.xz 234564 BLAKE2B 1a79fa62d9149d97f07c8edb6f39dc7209d64ee487f7fe1fa87bcf96881e3dd4a7b4a78f8f7236632c4bd4dd8934b85188d9525a5679328dabafbf0698c599c6 SHA512 0dbed3384fe86b1ecc520b6013284507bfe6888a745306125237378a7ea317edb458b7c5f31a0d90081f28f6673466a33e76a3a299b6cadb20142b37fe68bee4
+DIST kcodecs-5.87.0.tar.xz 235092 BLAKE2B e93033e20b14d737e6d3ff5089881b936e87742bf924fab90f83b4178a0ce80e32dbaa3982bc086e13ff150a895b216c012594b4ad8c474bb682f3ff3188c9a2 SHA512 97290b9cad05668cd7779f779ed6977aeb0637462aa7cb303de36f2fe34386e6b78417b8afc85b069baba2710c2b629de241f6236cd4b8901b4c7ba5a1a6323e
 EBUILD kcodecs-5.85.0.ebuild 510 BLAKE2B ba1a8a3d7b170f1ebe0ed12b8db50a842b4f147601f8e4f5700613885dbff5f0ff378a80b48b8dda2308c9cd08a71b585beb3500be6348aad51bdb065132ff15 SHA512 a05cb1773d57e1ba747a2601cc7f402385588c38bc5d956b86c827d8980e5f1ab1c551fc2b797820b656960f31aff799f2330127f76249dabe7c7b7a2044c9f2
-EBUILD kcodecs-5.86.0.ebuild 513 BLAKE2B 587de5bdffb17b0eeaaea8a116651f33370cd13ef1c33168a49b79320feba1c6405a10f16b6948807a67023e177cc4bf5619aecd4a22e5f896764b233f309767 SHA512 08733d10cdbbe17066f5d51814220bc2826890c17569abdf54e4e97c16566faf9c22022dba41a41ea81c2b6a26f1e1101dd81e87e3f8c8fe97b05a7642dde051
+EBUILD kcodecs-5.87.0.ebuild 513 BLAKE2B 587de5bdffb17b0eeaaea8a116651f33370cd13ef1c33168a49b79320feba1c6405a10f16b6948807a67023e177cc4bf5619aecd4a22e5f896764b233f309767 SHA512 08733d10cdbbe17066f5d51814220bc2826890c17569abdf54e4e97c16566faf9c22022dba41a41ea81c2b6a26f1e1101dd81e87e3f8c8fe97b05a7642dde051
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcodecs/kcodecs-5.86.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.87.0.ebuild
index a624d4944065..a624d4944065 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.86.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.87.0.ebuild
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 4d842c611a49..52592fda1db1 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,5 +1,5 @@
 DIST kcompletion-5.85.0.tar.xz 122020 BLAKE2B 064b6074827722ceb852faa93c0a1132ab8dfb7496eddcb951deb52d9b6acfbaaf0cf2ef5f74449889998b734b4db9d9114972ceb2017ccf26dcb1a25c1cf5d4 SHA512 c10cf1e5710dc7cabc107b8e9320f79a3eda28bc7ca386853043fbc229736ad10f1ea3bdd2cd77c4a1c0ffa4f0e7407bd400929d0d4bb8d61afa8832889b31a0
-DIST kcompletion-5.86.0.tar.xz 122128 BLAKE2B a7961e83c7d33acac6a38d0047bb77d06fa1092557ead25d777883f7dca70080e54741c2bdc8abc1c370652d61e1418e73c12ec0595a901b157169525f041912 SHA512 43a2a7a2af704d4e1f44ef053bb9d652a14497bdb3145336aed5636d8ecc2f7279f7e12eb0dde0f153e3a417cbd6ce1548e11133455754f19e4a00ec330bba19
+DIST kcompletion-5.87.0.tar.xz 122512 BLAKE2B 9d996429ef21ee69142ee8e6eb3af0d471c1d5715b35961b45ed330b35b7d9f72107ee52252db18c3fd85ebd1250dd93dd8d67dbb282e27d88d868e0c8427224 SHA512 85aad3b8259efd0bd6af2158578ca930adc827c115c0314409d6d631ceadcfc34c94dbce47f5cb26c3d270f6933bc09fbf58a7866f7065653c7c95fcd0b791e5
 EBUILD kcompletion-5.85.0.ebuild 743 BLAKE2B 8e2a892ea73e321f3a79604e60e43fd9291de577c7130af923f826940e7a34609d52254a34bcd93d17d94c57dbef82432e1ad0822675d98ab1282ef0c661b79d SHA512 cac49a6283d1ff70e4d7605ae215a37ccd17e476f7e6974abe293ba1dcacd451b0a4b5132ddb3156ddf1d8f754f81d036ad534d3a67ecde65ce0351008aa8f7c
-EBUILD kcompletion-5.86.0.ebuild 746 BLAKE2B 6cd17786c17af2ae42fc1a05faee7af3df61d62ee8d9faf6cb789f39045f9d478860c0fa1bee79ecd058181aa04b90601525851c058648fb6c69377bc9e54461 SHA512 b4a6752c7dbfe0a7d77199cb2a372dfd221d5e84c44a8c758fd166455db4b4ada855b405e0b987dce7fa4c11df8d726ecb3bf725a6ba74f983ae0a3ca678a856
+EBUILD kcompletion-5.87.0.ebuild 746 BLAKE2B 6cd17786c17af2ae42fc1a05faee7af3df61d62ee8d9faf6cb789f39045f9d478860c0fa1bee79ecd058181aa04b90601525851c058648fb6c69377bc9e54461 SHA512 b4a6752c7dbfe0a7d77199cb2a372dfd221d5e84c44a8c758fd166455db4b4ada855b405e0b987dce7fa4c11df8d726ecb3bf725a6ba74f983ae0a3ca678a856
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kcompletion/kcompletion-5.86.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.87.0.ebuild
index f0f1b4037efe..f0f1b4037efe 100644
--- a/kde-frameworks/kcompletion/kcompletion-5.86.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.87.0.ebuild
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index dbe75e7268fe..b581ee357859 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,5 +1,5 @@
 DIST kconfig-5.85.0.tar.xz 270420 BLAKE2B d2de8ba3f91857d9b806627df685ebaf14b9e02620fc820163f15d8a36b51b190a2984d06ec1133bd2eec2f548c38089d7d50105e3514cecb64ac052b1f8b4ee SHA512 38cefed52e322be34bfd4b26a243b4f931442239a14bcb1f496f9223d2b87e05cdb9931a2aec9579b8bbe31d716bb6a1ce7901ba3cb525607bbef2aee7b96d52
-DIST kconfig-5.86.0.tar.xz 270412 BLAKE2B 2f44c5cfbb7d75eac4220a2de5afc897b68db6aef3aee6942edcaa5b91162937f252b00500cbbe0fb0bad3e491deb444f3947d8e2c0da793a25d62ff756fd7d1 SHA512 23d2b742667a4ec4c97838256b413cae79c83324132bf15b00a86bf2b9d2e5193d68819e9807980df7f8e2067014e72110235dd25c234e0a754cdc22b01df53b
+DIST kconfig-5.87.0.tar.xz 272984 BLAKE2B 6804c6a505b9c16d35d4673b4e39ea9688c6caeeedd7b38f33e1b4f0e761a0b94e2a1ecbfcb043152954a98d62d594f76a430297bd08c512bbcba1175aab332a SHA512 62d014e05274b7e6092540ce96969002c580deb83d17d7fa6e54e1d969c8aba659b138aa711f4332b58560656b71363f53226ce53c65a4c8492be9a493a37823
 EBUILD kconfig-5.85.0.ebuild 789 BLAKE2B ca839afb8018c51c9e31169eb3100785e66528cc9698e10f99f1607979befadaf2bb8816680af0cf67ff5e2d9a42d485c242eee7464f454dc0c01f5449cd7486 SHA512 2fa1252da7d5699d61575ff6a002fefe477c077ba4d2c2ea988eae8cf18bd17d8d1fadeac9df904d5d619c6221a355099bcca33b2ff81937f5e548cba87241ac
-EBUILD kconfig-5.86.0.ebuild 792 BLAKE2B 2ddd99144f622d8266aca771f70ae598b85784876629f584a32f8fc5febdb35c56f4d644041da1c2ef19e066700d0769d1b0b7015a397470afe7a1d29fd80b98 SHA512 77c2236ceb75cdce810e9699172d989fd2c41475542778f407db4ef2e26783fcf1151f0f5cad5103ceb8f00c87c0a447071f8fadcaf2b6deee4c9b30877d8fe1
+EBUILD kconfig-5.87.0.ebuild 792 BLAKE2B 2ddd99144f622d8266aca771f70ae598b85784876629f584a32f8fc5febdb35c56f4d644041da1c2ef19e066700d0769d1b0b7015a397470afe7a1d29fd80b98 SHA512 77c2236ceb75cdce810e9699172d989fd2c41475542778f407db4ef2e26783fcf1151f0f5cad5103ceb8f00c87c0a447071f8fadcaf2b6deee4c9b30877d8fe1
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kconfig/kconfig-5.86.0.ebuild b/kde-frameworks/kconfig/kconfig-5.87.0.ebuild
index f2f24bbd72a3..f2f24bbd72a3 100644
--- a/kde-frameworks/kconfig/kconfig-5.86.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.87.0.ebuild
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 8611d91b9fb9..146ae37544b7 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kconfigwidgets-5.85.0.tar.xz 410632 BLAKE2B cbeb31c40a5cd22c5a0ebbb83089387482e1b54571d02a7c7dff8e373ce11bcb9215ce778be45b9deda544e82140080edce6408282af1ecdcad7ef790178b75a SHA512 dddcfd54e36b2c45ab42d5e61811141eff2bb8d2d70a5bd09993e742bee05bf18a3b2e94b2ff8bcf6199db84044542a8d3d01a36f6b29d7d9b33e6c82392ac7b
-DIST kconfigwidgets-5.86.0.tar.xz 411624 BLAKE2B c7eb764f33ca69fbc172f4741f2122638dbeedce61beef502f1a38b63df5e7f643dff58bfb7bfa1c479b4c7d93ad4b1b633c12314ca073d0b3ae191985981acc SHA512 405d1282a300a92ea608bd9af890e060a284ec24847ecd42c6273029f9a856270e324b33e176004fb9291f4591cc7d0c33c17cb7ee06841ffa342c38c98c195c
+DIST kconfigwidgets-5.87.0.tar.xz 412048 BLAKE2B 3c92349b901a5b45b0bd616b894e7df88aee4f1ab56bd979b80d6c3c9dbe3a3e862d2c64944663006b5fa7d42282d423eed1e0ca786a6f80f8b133f10800f3ca SHA512 5d35f1f02e2f60d5306170cfb08fd7eeb38ba52837445c133ebd29e593817cfaec57a8b08069abd050bf9c23efdbafd4849956ebc76e38a896d696496eb426a5
 EBUILD kconfigwidgets-5.85.0.ebuild 1002 BLAKE2B 958936e17ed05c186735feb4dbcd97eec0efc70b40553b35e08266f1f069becd479ca5a1f1bcd8069c37828d0496fa61446ae3acb98ef8395147d51a87c12b7b SHA512 3f9cbb3a3faeb3a631b2c9c04e7888129c48cea4c1a3363a23926cca00206758cd1ae82dd1bb524d1b6e83128653202208b99a0c57ef5ca6e76f17c99de14525
-EBUILD kconfigwidgets-5.86.0.ebuild 1005 BLAKE2B a182c531ffcef1c1ab83c1e1f7a08154c8567288b946a4c80cc06c06473b3c338afa3710e073204ec1f1a60c9d4dfaf5954f6316bbdd10c31e862ff264fea472 SHA512 6ebf47a55a061c7039a8d52e97158cca9f9076e36f2e08bb8eff91040f8bdeff6de9db8d3958e418dbf0c9c3e62718f390a6d58e8252f4b439d60e0a0b3983e4
+EBUILD kconfigwidgets-5.87.0.ebuild 1005 BLAKE2B a182c531ffcef1c1ab83c1e1f7a08154c8567288b946a4c80cc06c06473b3c338afa3710e073204ec1f1a60c9d4dfaf5954f6316bbdd10c31e862ff264fea472 SHA512 6ebf47a55a061c7039a8d52e97158cca9f9076e36f2e08bb8eff91040f8bdeff6de9db8d3958e418dbf0c9c3e62718f390a6d58e8252f4b439d60e0a0b3983e4
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.86.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.87.0.ebuild
index 50e1c0fc6af5..50e1c0fc6af5 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.86.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.87.0.ebuild
diff --git a/kde-frameworks/kcontacts/Manifest b/kde-frameworks/kcontacts/Manifest
index e017e15b7b19..f6576d9b2f5a 100644
--- a/kde-frameworks/kcontacts/Manifest
+++ b/kde-frameworks/kcontacts/Manifest
@@ -1,5 +1,5 @@
 DIST kcontacts-5.85.0.tar.xz 543896 BLAKE2B 68ce1d43539f7d4a5d41e26e45f8267c6ca70cd04991d8917708352b44a71b95d891a5fd8c931d08a3ac2b6df67e304d1d72a3acbd14de0b12ed8ad74e079afa SHA512 bd43baaee638455038c7278eed5bb3a46ea8171edc1aeef86e150a4d5e2e07a45fc0a4e7e93d70bdd53603e43771256e0a5e85c8d59456651bf4370fffa7427f
-DIST kcontacts-5.86.0.tar.xz 543892 BLAKE2B 11bae4df035f337444d8330d621dbd6465260f85196f1d9990adcc6253c37d44778053749348f8bc5828a8548d1c943362382eccfecb2ec089751e313d77decf SHA512 108c368e09c8b50a14447af9e3db0be2cbe47c5bdfd120ba95d376778116201b9bea4827428bfcf7edde9c3d1e460f4b70d46c22a96bd457ce4097fc9282e515
+DIST kcontacts-5.87.0.tar.xz 543840 BLAKE2B 619ea24a474a6ace0cac78bc591a18ec1339daea837ea6ce58a82ef55fd5b10a6dbeefc9bec4121037a60241c54e8f51fa3357fff53a64021b1f134f40dd91db SHA512 3f20ea55c307e2b6c3759339bb3ab9d4c181cd4fa7b5b9a62c1f7a91dd7b9104ed99f7993f7653be13298ab0a90cfc2bb7e3d34ae52830f8d620bcbf728f5c15
 EBUILD kcontacts-5.85.0.ebuild 752 BLAKE2B c13e0d71171b106da444e8592c3b55c0a8ce9f4d3beb94d17785c393c0c6045288d28dae4626e6ad2af9bd1033732b1c63a7e3e0f539c0140f6e0b98508a86d3 SHA512 3856ca4e93f974eaa3f23bf43462d4d53d8fdcf01944cd427b7a4e52950ed5baf134884d70dc8984485047616c362a451dbccfcc367d3d1c976b6688dc3b6a41
-EBUILD kcontacts-5.86.0.ebuild 755 BLAKE2B 356f39ba85ad4196e8a8fc0279f02387e6b8e2fff72500260141a4f2ae2b378537e821dc248ed43751d6605f7ab01bbae10dc22b3a83fbb8d16fa7034990dab3 SHA512 c522ca5a2eb643dc31384d32a161b39ea4eaa4ed224334085a49bbdb91e12e81184a592ab026887ca16f579a29256279d14d3689c90666f87824267f0e53e080
+EBUILD kcontacts-5.87.0.ebuild 755 BLAKE2B 356f39ba85ad4196e8a8fc0279f02387e6b8e2fff72500260141a4f2ae2b378537e821dc248ed43751d6605f7ab01bbae10dc22b3a83fbb8d16fa7034990dab3 SHA512 c522ca5a2eb643dc31384d32a161b39ea4eaa4ed224334085a49bbdb91e12e81184a592ab026887ca16f579a29256279d14d3689c90666f87824267f0e53e080
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcontacts/kcontacts-5.86.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.87.0.ebuild
index 1f6c1a246bad..1f6c1a246bad 100644
--- a/kde-frameworks/kcontacts/kcontacts-5.86.0.ebuild
+++ b/kde-frameworks/kcontacts/kcontacts-5.87.0.ebuild
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 191977e5c893..f09500058ea5 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kcoreaddons-5.85.0.tar.xz 427876 BLAKE2B 2e4dda676209333cc735ae4028bb245d4828af49e79cc3e3a7101f06452b35f04d72496a777a9039668597c9703b518674ed17dd0e05215daefe29da38fdc8e4 SHA512 46509b91a138924c040a7dcee87be1ebe5d5324a040fc76cab1b19e427b03eaf80766a0bfe708d1226be83d8307253061f11604ce122dc8ef354b47dbe3f7753
-DIST kcoreaddons-5.86.0.tar.xz 440392 BLAKE2B 3c0f284b3e33d2721def306b9950d96c4f2cf653f10884874c53eae5650d5270616a153923588aeafead6aa23ae2edf4ba8f3629caca4fe7209b0f8c28f04510 SHA512 9cd90f8d5aee2ad01b01ad796527a532af3dcdce1d239915712ed4643246df6f0b6d2dbaa63e8b658b4776285d1dbcb042834c14a8cef52d54b5e707dc307571
+DIST kcoreaddons-5.87.0.tar.xz 441060 BLAKE2B 6a26c5bc56e7d6200480470d839afc5b33f7ac83cf22bf74a242a5d3bba4b00d3e98433aaf93dc0e69bf096a415e935835d1b991e108b3be4185d30de420dba4 SHA512 21a47d07d50d5027a84b08b941d0e291f41b275b9822b33760a2d2e7fe39362c60d21414fc4bdcbc9d020293d7176917ed95ba7afd1ccb87f9a0f7c1f99aae85
 EBUILD kcoreaddons-5.85.0.ebuild 1001 BLAKE2B 6863f6d14d878c120b64c084003517a246bcb793f0b79ea8cca51d8bb4b0f28d6545afc251d082a2d31c995c67f1e56edcf9f13680c79e15bc54f2a1735f6de7 SHA512 4ffdd136e4893da0308710fbe56dde87912bc2608baf53b1e45f061a610da85ae304e04e2ea168df4e493e1d34958ddd74138ae0fa7696f551ab27e325c4c72d
-EBUILD kcoreaddons-5.86.0.ebuild 1004 BLAKE2B a5a98e948aa36b02849f1197335645298f5fe493a09414bd12a750e8b5105eb1c0f161bf9537686b6d7f18f6da7e3d0f5557edfd0c56d8c97cfa0e88f79339d8 SHA512 879c445cba83c766abf78e51a83bbfbbdc9bd929a665cf9aa3bc2d0ce1b537957becea4fbbf34773f721263bdfadfe52e5ba998dcabfd9ff9e2ae61a2430d084
+EBUILD kcoreaddons-5.87.0.ebuild 1004 BLAKE2B a5a98e948aa36b02849f1197335645298f5fe493a09414bd12a750e8b5105eb1c0f161bf9537686b6d7f18f6da7e3d0f5557edfd0c56d8c97cfa0e88f79339d8 SHA512 879c445cba83c766abf78e51a83bbfbbdc9bd929a665cf9aa3bc2d0ce1b537957becea4fbbf34773f721263bdfadfe52e5ba998dcabfd9ff9e2ae61a2430d084
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.86.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.87.0.ebuild
index fd23dd204b01..fd23dd204b01 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.86.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.87.0.ebuild
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 5fb2fbe19485..d55bfbe61bca 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,5 +1,5 @@
 DIST kcrash-5.85.0.tar.xz 27936 BLAKE2B 943e42fc7aa4db8e1179970f3f4e1b532c9efd4a609263919adefa90e2288e8412b52e84bab8a520ec04d4114f64803e9e6581c0be689c33d2de9041b444f6ae SHA512 26ae87cf816f104cd2da4052eeb8a49a6afb1227e873a4ccd829e8a7addc162ec86dd5ebee83b47d57d9c5cb79471239b1504c54603828dd8589f9ac0915adba
-DIST kcrash-5.86.0.tar.xz 27932 BLAKE2B 2ab219059e1224ea38aaa4474769226ebbe37cb9d393acd03258ff0877e55f3ca8c0bf88f0bfff9c96d43e470a624edc54fb40c4a8ede41183b17922e928ce66 SHA512 80afd5e4ae4b8772afdf4796103d801d3d976061b55e3f258f4130b7fad6dfc2e0870405ef9649dca28c86e321c99d1fc62bbb81f75a878ec7e430e766339ed0
+DIST kcrash-5.87.0.tar.xz 28160 BLAKE2B a4c4072cb48101a6c7936e4c69c50f48e5596e4a6ff797b8a1ce562eeac45e76ac785ceae85e5dec9db2cd073a26261e8b02eac73f0bba9e5b1f70bfe0dcbd89 SHA512 307c59dfb1b5c867d45c8b84b6e06050953e96f1423e63c9867e1d42d3df043704ac6b51098cd49f2f7b7dd37bdd57b86bc027137766abbefc9b7b7c26053f25
 EBUILD kcrash-5.85.0.ebuild 708 BLAKE2B 3550170d7d8b7335dc0d0dbd9c276ec24071f932da6940811d9120121876dc75885b3bbee5f1cd6e12fd35cf5a18df158b5f23e9fd6c9d52e0b3cd55a56a14c9 SHA512 b362673002653068f3669202bb88607d4e1c470295fdb10e35548244f90178ca9406ffc6fd38a00f12fa4f4027ddf205f940ae89126ccbc3a98e210640d4db1a
-EBUILD kcrash-5.86.0.ebuild 711 BLAKE2B 9993e5475e6d6a82eee19a4213edafbedd35bc4e26cf46fca1b88eadc6122a35fcf00647692288619477090d7b95d6a9f6c8500f5cf75275ad7398f32a15d417 SHA512 e54f71158c3f18a3e028a60c042c4361da66718b01fb9e51123ab592ae63823509ca1c0d29e1fa60f42049989ba015356e3fe02ac02ed24bb4fe0cce5c56fb7d
+EBUILD kcrash-5.87.0.ebuild 711 BLAKE2B 9993e5475e6d6a82eee19a4213edafbedd35bc4e26cf46fca1b88eadc6122a35fcf00647692288619477090d7b95d6a9f6c8500f5cf75275ad7398f32a15d417 SHA512 e54f71158c3f18a3e028a60c042c4361da66718b01fb9e51123ab592ae63823509ca1c0d29e1fa60f42049989ba015356e3fe02ac02ed24bb4fe0cce5c56fb7d
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kcrash/kcrash-5.86.0.ebuild b/kde-frameworks/kcrash/kcrash-5.87.0.ebuild
index 9662571cc324..9662571cc324 100644
--- a/kde-frameworks/kcrash/kcrash-5.86.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-5.87.0.ebuild
diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest
index cb8e25c08780..5bdfa74b3f06 100644
--- a/kde-frameworks/kdav/Manifest
+++ b/kde-frameworks/kdav/Manifest
@@ -1,5 +1,5 @@
 DIST kdav-5.85.0.tar.xz 61600 BLAKE2B da4ec7e2683f15e8fa8d4d6ffc9cd6408a2d8ab42738278e778307b01f9674cd287050879aa08b072144f3243ceae077185670384ed1218ba77df58b241fc2e8 SHA512 85c463c742b48a07de9f72e9ee922876f50742d6a82f897d564fe59f71cc4fd39d77e520d432fda4418a8e574657cf8daac86744885ff46467495c0e693b96d1
-DIST kdav-5.86.0.tar.xz 61684 BLAKE2B 4db4ce79030320c04ccafaa21c74ac42958d8016f140a133d6e32cb376569bec5c9c9301630a474339b484e126ef69f03e0b27ac8409b751295b8f856ebda8c0 SHA512 58c3285e7adbfc57082a2d616b84b0cefb98f72f475c1708a09c7c5381c68c8b90f5651e77328c22c2956725d411a44b0c69fda9dbe5134e5afebf3c95667aa5
+DIST kdav-5.87.0.tar.xz 61900 BLAKE2B 045545311ffad1e52cd0cde0f392625aadf287eb1705e8c9b2805611c664369efaffa3d6b46ae2888d52d23fafa15b394504f1a65730503035fdd8003aaf1b4d SHA512 660f61ff5e5aa3ce076c2124bdfb3fb7ebe933957f01621d99d504c75f29252dbcb12f7721725c4a193fb7e55a2dd1ebaa302ba2b2fd4d96ef3506ebeb7616de
 EBUILD kdav-5.85.0.ebuild 793 BLAKE2B 001bbb77eceb7296228c6e2c98c61900a422fe404ee43c395a3ee4d7ded54231252d5f079c968d16a5c7495809c374ceb19434bc0957f9a8a7511cbd6b008dfa SHA512 ee640b3bc45819015bde180144895c0b2aae6e1d8ee493fa216f37cd73070f0de99536c71b2e57a7b4118ea9ff3a80633d99926a2fae0605b7fee06fe2fb8bed
-EBUILD kdav-5.86.0.ebuild 796 BLAKE2B 6279359bced6c81e39b8714f3d4152fbd66a8371ceb8d917f7e45744029fc7fda525b36d792654641e70a731424a6d5d8eefb297166ff90fec060ae8069eb441 SHA512 204f6d13baf51d70b0a942e70418c8e53c41e026b339d4144991a966317f8d0bb0b150d940f6f170bf0272ac2c6cd80ed58c1e70332b21c3620893677c9f2c3f
+EBUILD kdav-5.87.0.ebuild 796 BLAKE2B 6279359bced6c81e39b8714f3d4152fbd66a8371ceb8d917f7e45744029fc7fda525b36d792654641e70a731424a6d5d8eefb297166ff90fec060ae8069eb441 SHA512 204f6d13baf51d70b0a942e70418c8e53c41e026b339d4144991a966317f8d0bb0b150d940f6f170bf0272ac2c6cd80ed58c1e70332b21c3620893677c9f2c3f
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdav/kdav-5.86.0.ebuild b/kde-frameworks/kdav/kdav-5.87.0.ebuild
index 1b84f1a6e828..1b84f1a6e828 100644
--- a/kde-frameworks/kdav/kdav-5.86.0.ebuild
+++ b/kde-frameworks/kdav/kdav-5.87.0.ebuild
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 12c37e6f4acd..7900224b7801 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kdbusaddons-5.85.0.tar.xz 43212 BLAKE2B 8e11c4298e0e46224bd2d61e666ff504c0a112224452b2f25ad7cab618524f17cf166abf2d74ae05f0e945d3b95e872a84f01bda14baa635d96855329e87aea9 SHA512 7c83b546795ca944afd58e95bee2dc5491b295a3adadbf0ab027a75d2ce16ad6100f2cf92bf3c20fe2ea17c68338cb5a05da56b0ae1e03682b4276021d8ec370
-DIST kdbusaddons-5.86.0.tar.xz 43220 BLAKE2B 35097e1964b3929a083f155fc327879f4713e52f55d57aa225313f75683dd5de9392366c93af2b4bbbe02a15cd34f6b3428aec8647d3340389d1840a3c4dcb17 SHA512 7973762796fe19adcb14a349de629f418ef0d3bd3a165fb036790837bae10bba64e52dca5e43f93e108b39b58755503c3994f2448321b688081935537d02fede
+DIST kdbusaddons-5.87.0.tar.xz 45180 BLAKE2B 52cdc6dc5d0450be1cbb1caefd48358e9cba6c4cca1642ec275da901bc2a2d7b77eab84ab1bfe33668ba278d3aeefc9d89dd9b8511c43f11370d68ba59f41a7f SHA512 e8e2520a4760d7a1e33a66c8746830fbbc1dd29fbeb45134e6d93e4ee54c17bc62f5da598c24742c52c373a184de4e2e834e12225a5fd778ea9fe218e32e2360
 EBUILD kdbusaddons-5.85.0.ebuild 675 BLAKE2B 87e974e04d4c2aa3196c2ee752d35fe4b93961b39feba05c6c612f25a516c10c7585ee669bb71c95c79f6c9a793373b065a8d8700caf3356c29fa9790a38482b SHA512 b0f310d81b94866fc66d2b58375fe7fd609877d926d24538e5eefa3b178517cfafcbbd9e501ec76c2b03761dca12d8ec67080ce472c5f717b3b8e5e241c73f3f
-EBUILD kdbusaddons-5.86.0.ebuild 678 BLAKE2B 7aa83682eeae997e23f92b68b887759621024fcbdd94800ef3dd0a31dedfd8c92b2afac523b4b796fff7028a9b467b809ef80f926ffc005a37769131108a0f0d SHA512 501d9ab44e7896eb82a6add57e49a250e87ca9e23bb3770161ba5d4807a6193ff92f6a363c3b5e97b6313a0a677b854a4c4eff6e7a4845f84b307ce9296e7314
+EBUILD kdbusaddons-5.87.0.ebuild 678 BLAKE2B 7aa83682eeae997e23f92b68b887759621024fcbdd94800ef3dd0a31dedfd8c92b2afac523b4b796fff7028a9b467b809ef80f926ffc005a37769131108a0f0d SHA512 501d9ab44e7896eb82a6add57e49a250e87ca9e23bb3770161ba5d4807a6193ff92f6a363c3b5e97b6313a0a677b854a4c4eff6e7a4845f84b307ce9296e7314
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.86.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.87.0.ebuild
index fec82a5650a6..fec82a5650a6 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.86.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.87.0.ebuild
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 1234498bd166..ad0afd55e632 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,5 +1,5 @@
 DIST kdeclarative-5.85.0.tar.xz 189632 BLAKE2B 9c0f83849337d2dee0c1b104fcba556633e013a0902cf02c6958bda0296a2c84064dec4fb0bc88f4d3c79ebe2c6c7d9b2ca28639341884dc0a1d7288b989f91a SHA512 49eb6f6318875af5c5aae1d6c937c600bec395d5a4edbeadf5e36c68d40f5fe400c0b7ef127e1ed10d442b42564c8dee6ebf159915f5cd0618392ca07b858276
-DIST kdeclarative-5.86.0.tar.xz 190184 BLAKE2B 97150e097c36e2306f423746af4ef6ef730b7b985be10c9e725e307071312b07319f11b221ebb7c0d59c523eacfc89628f99d4ab85ce52513e040bea557d06eb SHA512 ea6dbcad575ee1480087c6c01f2040b1fd9bc68da9705416e72683ddb158cd3724e30fcc88a832cd33682094f839e679d7db17cd5ee893cd842a02c3eba0ba93
+DIST kdeclarative-5.87.0.tar.xz 190524 BLAKE2B da38fe9a881a58b4a9ceefbe726bbee4f3a0c3ab8d18564af7d6cb4aa063d52ac35481f4268af08b1ad63981c6f2a766c2954a75c96ff8e4fa65e058d3388c07 SHA512 529e0d3009227c9f71670633c9d0d524cdc551e8a971952ea54c557e6462ab34923d8b9ea7ad83b3dd33536f5dbc532ef7e4051374a4dbf6444cc98b541d9411
 EBUILD kdeclarative-5.85.0.ebuild 944 BLAKE2B 1d91bbb980f107ef01ba7587c29c78eb9a058a40aaee4f89f7c2b1877248aab2d59ee8182ef7288f71dfc7ac5d45a24c0ff30bd8e042d127472685fd9eb1f4dd SHA512 cedee55e2529c597d8e6b067e5b5c174c3a3096f95bf134498b472da54a20117b183cdcdff37cc5d5d4058375dc70cede859447b5c3588db5f79a046a4a80d43
-EBUILD kdeclarative-5.86.0.ebuild 947 BLAKE2B 6548c286eab8e8e804c70404be9d57bb9550b3a2240e6bc7dc2663953ca6cf391c6bd6c8bedd6c6122b84acf6bf5ea660a17ee537ccb921174a2574019507a29 SHA512 f9432a40922025949a9646c3b204daad6bb96095581c476a314121352752417d6abc7e02093409288d4cf34c491096d8c68798c8b0beadcbfc467b67861bb0d3
+EBUILD kdeclarative-5.87.0.ebuild 947 BLAKE2B 6548c286eab8e8e804c70404be9d57bb9550b3a2240e6bc7dc2663953ca6cf391c6bd6c8bedd6c6122b84acf6bf5ea660a17ee537ccb921174a2574019507a29 SHA512 f9432a40922025949a9646c3b204daad6bb96095581c476a314121352752417d6abc7e02093409288d4cf34c491096d8c68798c8b0beadcbfc467b67861bb0d3
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.86.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.87.0.ebuild
index 0f5f80cc7699..0f5f80cc7699 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.86.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.87.0.ebuild
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 1534fb7e778f..d18b108597d8 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,5 +1,5 @@
 DIST kded-5.85.0.tar.xz 36952 BLAKE2B d237349d95f2186a102181f420bb1deafb9fc83332dc535084531a6b73c5feac2c37e6c15589ed8225d0391f4f6541720525d3cd7d2645e6e90789a013c6e5eb SHA512 cbc8e8c101d4af7df0d47d91c51273e41dfff4bf8e558f93a0d2c16cd814cfb4ba73e69a00b3bacd944d677de778456b0020e063af6a4cbd3957296387eccb8f
-DIST kded-5.86.0.tar.xz 36960 BLAKE2B c7eceef7bb4ca8e57856665464f9166076e14aeb70db43c6b19401ca5ca898933498c9f9862386fdcd3132aacdb1b20e0dd07ef6385acba70817f0c5c9a495f0 SHA512 512958cf61a2a4d31d2a2e51536757b6ab92fbfa5af1d7f979efcf9a543a9bcc198687ed64ee8d6a293de23d00520b0d9cf4ac11552d2268234a65559ec04846
+DIST kded-5.87.0.tar.xz 37216 BLAKE2B 01d7e1ff7958378cd69b7fea1aa60a87b5420137bafe59fae1a5bdf9bff58280609b8461f4aea16a62171035aaefda1f776b9ffa8ae2eb4c292a93c7b5a38c25 SHA512 a22f1e9a7d952683e4ac8b72a7630523c585d9fee88f79f73e2bc86c7632f6f0f114309314bc3259070cb4f19f3f51baf8df9c160be90353c515382d1e677693
 EBUILD kded-5.85.0.ebuild 842 BLAKE2B e5bb67a26c05223259f453247e4d441f85a3c264919f65cc46e64cd2c3da92a695026ecc974bbc15b9a4e1728d18663b3ee9c7bf3868ffef3a070f9fcb503890 SHA512 d7f60dc69ddf1ed1cedf3e28afa8432023a5a43421924d51e98de8888fb2587d8dc226f59910bd0d51bb84cc4f41ab2c1ed36083ae82521ca69c699766814383
-EBUILD kded-5.86.0.ebuild 845 BLAKE2B 8e3eafb1bbd286829a1372e52fcd23f0094b7f6ca2d4707d1320a65038cf84e3738353af3317f15fbecf9f9cd520b9dfbd535f833dacd0dee8a9eccfd83450ba SHA512 f3f59fd58eac002192d121bee32ea3183aa30c4e4b5b297effe33efb5139b24f83c83874331d0b78eaef1fe4030cdd23d0d786343e2cf4a5db496f9294c65195
+EBUILD kded-5.87.0.ebuild 845 BLAKE2B 8e3eafb1bbd286829a1372e52fcd23f0094b7f6ca2d4707d1320a65038cf84e3738353af3317f15fbecf9f9cd520b9dfbd535f833dacd0dee8a9eccfd83450ba SHA512 f3f59fd58eac002192d121bee32ea3183aa30c4e4b5b297effe33efb5139b24f83c83874331d0b78eaef1fe4030cdd23d0d786343e2cf4a5db496f9294c65195
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kded/kded-5.86.0.ebuild b/kde-frameworks/kded/kded-5.87.0.ebuild
index d80bb022fe14..d80bb022fe14 100644
--- a/kde-frameworks/kded/kded-5.86.0.ebuild
+++ b/kde-frameworks/kded/kded-5.87.0.ebuild
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 3f8cdf4cb4c7..3541ab9fa2cd 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -2,7 +2,7 @@ AUX kdelibs4support-5.80.0-no-kdesignerplugin.patch 5689 BLAKE2B 74771136992074f
 AUX kdelibs4support-5.82.0-unused-dep.patch 1693 BLAKE2B e11fdcf22b656952871730e9144e69d9011215567dd3a6691e1f1484dedd8c314a10d01c39d2e945eb61a3ddc41a0304f89e9f6f7840fc0f9161bf0a3d4e4829 SHA512 f0b9cd6dd6f97e3d3747a1241221e01b43c31dfba7eb398c33f3515a5a8609e0c12ad2be64df89ea74b7ab95eadb0a8768cb7706b98df6201cd50294c198de8c
 AUX kdelibs4support-5.86.0-unused-dep.patch 1693 BLAKE2B b310444effa8bf0a2a203cdc7e427ade52caceabc77b1dce96cbc739443c9d8429c2f1186f3d1e5180a0b8ef6323ea805a040ded435b2a0a3abdcef0e4dceee9 SHA512 bf7637791517739ebfa296beb91f3873d21165c4760374df8972fa75f237dfefb24cac7ea7895f359dcf368a18f974005b83646f9ba3cd6891ba6181880a4a6a
 DIST kdelibs4support-5.85.0.tar.xz 3642876 BLAKE2B 436645e8ac519b5078c37797fdea854e25e71a8079a49a33436a88576f1f370409a6fd780ab778520c474263df66b3a37d06398fdcc1ddfbeef8be5933f30192 SHA512 6edf7d612be56f81b7908ae85f6cfcc9618b14e8b9741fb19e0c8eb55ac73b9b82963be923d67ddfd450401fffc29bf164d112e45cba3657f10a1c84f86e346c
-DIST kdelibs4support-5.86.0.tar.xz 3643140 BLAKE2B d857c7a128f26a289195b39d1ce2a948c483902e21d913d05a1397aa326402986abbd7ffa5c7af03e6b70a1d4cdd311c921fb978435e578abe1cd67b5e3b0631 SHA512 c02743f74db0e228fc77d152de7b72053d1decbfb0c4979c47c425ab256adf34464b493942b55388466800cab86efc13b3bd412597fa330cce794473c1fbf59a
+DIST kdelibs4support-5.87.0.tar.xz 3644092 BLAKE2B 5004ef62aab47290e6004f85f5217a0d5a67d86688e360b0273960bcb40911e092cfbe0bd81c0adcee3c6512f9428858e85b36c58dfc1d165a2e20624af3a11c SHA512 61d0c9edcb00749f5b889c28a62ea655cec4120f9339584588bf5707866978e8fa57148dcc305d4b53bc70264719842e0f70f2f03a0cf8d771ad16fa80a22a36
 EBUILD kdelibs4support-5.85.0.ebuild 2490 BLAKE2B bdccd2180122fceb23c47eb94cbaf58619d22ba4775b29e77e16ebda67a1e109dc4204ae23844fae82099e21f87183eca35122b3c53a56b02d55c6094db15b0a SHA512 fb8f6171661a32ac7272925aa25244d00d4b93a7c992102e8c7c87ff612e10d192a829865d8add6e4f01d7c4e00629a51e2ed5b4447b2e2300c95960b4a695f7
-EBUILD kdelibs4support-5.86.0-r1.ebuild 2527 BLAKE2B b344a83a575d098c918c2c24ea37fa298aa24a8b5cae0d959e7d200d5ac7248ec669efa1019fe24590ad406a65b67bce79c07df66d0fdc6fb893c6d6530e4077 SHA512 c6f0bc86e381bd1fb683ef97e6176641431c3903ca6cc6fe640e0a5c8858c4f67536a46db01463f24fdeaaa3258a872472494aa1329e35151a91d41a4a8cbfbf
+EBUILD kdelibs4support-5.87.0.ebuild 2527 BLAKE2B b344a83a575d098c918c2c24ea37fa298aa24a8b5cae0d959e7d200d5ac7248ec669efa1019fe24590ad406a65b67bce79c07df66d0fdc6fb893c6d6530e4077 SHA512 c6f0bc86e381bd1fb683ef97e6176641431c3903ca6cc6fe640e0a5c8858c4f67536a46db01463f24fdeaaa3258a872472494aa1329e35151a91d41a4a8cbfbf
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.86.0-r1.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.87.0.ebuild
index d8c19122d713..d8c19122d713 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.86.0-r1.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.87.0.ebuild
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index d8f4d39ef236..0644223e52a8 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,5 +1,5 @@
 DIST kdesu-5.85.0.tar.xz 52460 BLAKE2B b5a9c5c5bf0842ac7686bf4f2888186bc5534f8af4330c07bb757a90123be22c7460836c2508124f2f2a9a78d686493c0cf666a048cfeb5f72170b6c2fb7f5e6 SHA512 77e5fcfb00ecda59a6e1496f97cda10b6dde40ab3ea3c4537990ccb02561018d540d89988633fd17e2f22f64f6bbbbe02e6d0bea0c7484790f59812d94773c9d
-DIST kdesu-5.86.0.tar.xz 52492 BLAKE2B ff1bbb2abd404540cd97966753602894102c0ee032153131fa47bf8305eb1b09c0608ea4b08b65ac510342347c0ce726c9f54b9c6e5fdcc3ab55a0c9c8435df7 SHA512 5373d529b1e455b20aa3c816ddb8224cfa6ec952d4fa49d62ec1298697e2dba5cbd13bf1822b27482b950be25cb8dd594cc53c715b89551d1f555d72af6c9ded
+DIST kdesu-5.87.0.tar.xz 52732 BLAKE2B 56822d43cedc204e565f6c004299052f66ef3ef44579d8b0ae4a3075b59d6bc2f6808483162461bc27b52ec7bd9810bbcc29c82566557518c81bcfe5830621e8 SHA512 a705e6cf89a6e7eebdd822ebf03d4e47eff3dd18e40211bf649f2fd34e82c78abaa1bf4eea202f70f87abfa3006b9df66dceec2e9a2f40fba62a0db636e7ef38
 EBUILD kdesu-5.85.0.ebuild 666 BLAKE2B b05587b0a1bf1adb734281b25c060f1ac4be52822521c4bdf17690afc095ca9350f793ef1f96440c4e073488bbcf232063084494e808c48fc834e506d87315ae SHA512 f20cf6cc2f98e92179d0c22819eabd52c92d559a172d5e8be3ed26f2ae2acd91910fc17755e3204d9823f35b1db149fec074b07acda3dac74d32fc40a109b06f
-EBUILD kdesu-5.86.0.ebuild 669 BLAKE2B 01b0721ce357b5c3ab4afff1af2da6b7350c2e3b9cd824e4eb804483b2234f1c16e5a04a46958623844e7ee84932859d358412267b9d254765e5a6b6b8d31620 SHA512 08a2774166fed9f215c263ef26e6b5d56f3e8bbce29e880a0a5e755a1456819d897aa7a77aa84e4b23e3c704fcf2fa4fadd3f7ff4b6884a4847d143677ed07f7
+EBUILD kdesu-5.87.0.ebuild 669 BLAKE2B 01b0721ce357b5c3ab4afff1af2da6b7350c2e3b9cd824e4eb804483b2234f1c16e5a04a46958623844e7ee84932859d358412267b9d254765e5a6b6b8d31620 SHA512 08a2774166fed9f215c263ef26e6b5d56f3e8bbce29e880a0a5e755a1456819d897aa7a77aa84e4b23e3c704fcf2fa4fadd3f7ff4b6884a4847d143677ed07f7
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdesu/kdesu-5.86.0.ebuild b/kde-frameworks/kdesu/kdesu-5.87.0.ebuild
index 9f1f81824f2c..9f1f81824f2c 100644
--- a/kde-frameworks/kdesu/kdesu-5.86.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.87.0.ebuild
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index b954860c9420..8b6cdbd5953d 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,5 +1,5 @@
 DIST kdnssd-5.85.0.tar.xz 58676 BLAKE2B 174114189daee2a2fff8b42c81a81d640af2b2f43bc4a889978db468873dc5b330495fa5c5a0283fb2e5a4e0083a97d47296002c29bbd5641f5b4ed4e57c65b0 SHA512 a6356b5c643a1e7e1f7d30e67a1ac8f13427ee3758709ccaad83af68f30a085f46a3d12e814ea8ec29adc1f9bea2a48e2c180b20ad9d5bb5834c02894f4286b4
-DIST kdnssd-5.86.0.tar.xz 58716 BLAKE2B c03be1d39f739d03b381a347001ad17542a2b14a47f5e80858f4292dc040cc8a00e97f14aebb1660a28e82b37a4f8b62268755faa73e98fdbc3582200d9d8954 SHA512 935f1fafdb45fe5860467e9f3cfb2c689b7a9aa58c0b3573c14d56111b1146b27e9e86d89388dc23ab1ec54c04b74d482f7fe2e3427cbb2432861b94b4956807
+DIST kdnssd-5.87.0.tar.xz 58900 BLAKE2B 348a24b9d7c1ef053afeeacf0bc9cce328affc296f0f800fb430ee1aa9760270bb0500452e9db63af4d07ff89ddf0d29b9014c07886ac16784f57e343ece2da2 SHA512 ab215226f95906913ada48b1ac9ed194d76e14a6ddc6df1cb77ccd94938d788a896decdbc97a33ac33c73bc71447dfec907f28f79d86586a9ad95e360b69ce51
 EBUILD kdnssd-5.85.0.ebuild 651 BLAKE2B cba57f584d184d918d0602bbf4a5384116ffb7af421db759979af2fe5ae0f7675d2f02dee9b7f50a6010ab91e9f7b813872edc41941c060a947f606aa9ffad69 SHA512 d1b4b5331d9c07359adc34146b569a38a482b79e465174d37bc05c6f24ba5838512403d4209bb620b7b012aca975bb196a84cc8be66f9c49f3581f0c1fb7b50d
-EBUILD kdnssd-5.86.0.ebuild 654 BLAKE2B d9bdf338ca672dcc5423f35d260573e41cfa431f09735a04f56a83a1dd2a046a94561ba21447f60c097fcccdfa7f041e310c5eb4c6586f0fb46788e6eb042e15 SHA512 929cb23f459594ed042d7f3262562bdb47e0b5bb5455f2de9100120a9fae8b9c55c0edc5d2c3964dba928eb2e191b1e662975377dea29fd0c7eac1b5053ebb61
+EBUILD kdnssd-5.87.0.ebuild 654 BLAKE2B d9bdf338ca672dcc5423f35d260573e41cfa431f09735a04f56a83a1dd2a046a94561ba21447f60c097fcccdfa7f041e310c5eb4c6586f0fb46788e6eb042e15 SHA512 929cb23f459594ed042d7f3262562bdb47e0b5bb5455f2de9100120a9fae8b9c55c0edc5d2c3964dba928eb2e191b1e662975377dea29fd0c7eac1b5053ebb61
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdnssd/kdnssd-5.86.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.87.0.ebuild
index 286299b7a37d..286299b7a37d 100644
--- a/kde-frameworks/kdnssd/kdnssd-5.86.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-5.87.0.ebuild
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 1b5adbcb93fe..893d3b726496 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,6 +1,6 @@
 AUX kdoctools-5.54.0-gentoo-docbundledir.patch 1055 BLAKE2B 0b57d4d23fdac39a939d1355ddecb5d0ba53c1a2b2ef43fb1127834b1004b4fd63a8e32a160794a51879a103c658068a67663fe8f9e1cb99ede5154cbccf2c1d SHA512 18dcd82bfccec19eccb5993cfabf4ead9222dbf29cad3a9df4b1c225a2693ea0b882dac78f969da7bf98aa4bdf5b09ee28cef6ff28935502439ca20fad427bdb
 DIST kdoctools-5.85.0.tar.xz 437036 BLAKE2B 76b1e2e10e058e541b45f520c11503a1360af2a053d5ab493b867f5166d84271d53a41c8dc547b78bff22cac06f25e66605337cc4e5a735513475ba14f2b4300 SHA512 b0118c94a3a4520076e9849ca4a7cfe13ec13ea7486d2c7bf81689a6ec6b23280793d87057513ebf45291c400a59d110583411eca9ffdacddc5c53d5a2ff4620
-DIST kdoctools-5.86.0.tar.xz 437128 BLAKE2B 5a713b75a5f4425d4e24e134293814f5fd257cb68f3ab49cced3bdb5a21b3a425c4ee984879daffc120bc822c1954d1385d2ce5b4ea0a8bbd0bb51d25bb24540 SHA512 b441dce91b7f0230c0d4df31e1109bc743ba11ecb3337ec45a21614c25c71840c94ee7b96219d2f6bfc2eb5cc6cf40209b73e14754c5799c7a724731e44014d0
+DIST kdoctools-5.87.0.tar.xz 437464 BLAKE2B c3cbcad117ca8ea14225428de03547505b0d81c38e87696630581ea0fb36c5741a507b9ff751d93fd4196db891e244677ada5a8c578199cfe9a76e7f0f7f3bda SHA512 e29f4d5b03d2ce89403c6ef8b66fbfe53fa63b1a94599d6f2e7e95fc2b0dbdd9743645f84bfc0381fe4f0f355bab6f93b33e4eb57faaa0a63a5402cce1d29ce5
 EBUILD kdoctools-5.85.0.ebuild 876 BLAKE2B e09ac1b5b2e18c8f34d637b0dd18bccb1879a9afb3809a8d55b36e7daef907826f9295bb73149aae7fddaf199d8cd1c99ca7d6b58ba3ec154039b02f86a1eba5 SHA512 c9acf54eff15e11f90700974063ab358dacd5bd4e5db623581ff3d4887f11d18c0e2b92d56b7ad50cb37b71bd0101e563b4ba356ab83bc117dbe1d3b8610c71a
-EBUILD kdoctools-5.86.0.ebuild 879 BLAKE2B 24d0be13dbbf7fd009605f3ce491a66fd1120d6f6446fb8d504971784b4853691f2f181a2e4aa941e93a9e2247f09a63d85d91b82d6576432bac27110a527950 SHA512 cbf8fbf92bd309e818befd8c7a32334ef47cd48a9fcfa5b04d21807a6aeabe364291ba1dbc274195cc641a1e21d30c1c82e03234c5dceb6100e05e18f5eaea68
+EBUILD kdoctools-5.87.0.ebuild 879 BLAKE2B 24d0be13dbbf7fd009605f3ce491a66fd1120d6f6446fb8d504971784b4853691f2f181a2e4aa941e93a9e2247f09a63d85d91b82d6576432bac27110a527950 SHA512 cbf8fbf92bd309e818befd8c7a32334ef47cd48a9fcfa5b04d21807a6aeabe364291ba1dbc274195cc641a1e21d30c1c82e03234c5dceb6100e05e18f5eaea68
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdoctools/kdoctools-5.86.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.87.0.ebuild
index 70d5563f3007..70d5563f3007 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.86.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.87.0.ebuild
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index d18ea9373bb0..22f8f478f5ef 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,5 +1,5 @@
 DIST kemoticons-5.85.0.tar.xz 1698484 BLAKE2B 46c7a07b3bc80c54a461b1f47b57d6f155af3fc71b6eb4cd8f0c56b3c9c7571ffa93703f07ac4281453bfa6d19922f21bc4ca6e92b66fafc7d87fee7accb1ff3 SHA512 62fda2265b0fa7154f68d2535e331e38fa899b1517b7fd08faee1419bdaee46f2a3fc63469a54277ce25997df4215d3314219e608927389da4451c8fa3bdf526
-DIST kemoticons-5.86.0.tar.xz 1698376 BLAKE2B 55f52ec6a21f1ab2bf622dad9e66a2aaf6f7932034c4f4696e26f6b44869513b333a7120101b80e3f09ab827b41ac31658faa32c182d913307774bc4f887ea28 SHA512 70a6868201781ae9adaf9cfda3585dc67a8339fec9ac063e455de9a504e69576d5b0e5b7a6e96f74d02320a85774cba6576ab89bd7b7890063d91dbce8550b7f
+DIST kemoticons-5.87.0.tar.xz 1698692 BLAKE2B 80531387b375cb5176144c61a8bdb8b31cf25a319335bf0fc67e0c7ecab7b0af66cb86d185d180cc99e2839490b5f5168c0e09117bc24992b82254d5954f8b71 SHA512 26a11f6aa4237a9be98b04b4b944f031a19e9be7eeb1d66039114ba6288cb3ab28432e48173f9903e58a918771fac8909c26fb118c545f477360703f7e42b04f
 EBUILD kemoticons-5.85.0.ebuild 670 BLAKE2B f10017722a6df3862740d5d91f9b5ea43d566ed601a99b45ddce265676ca20618f304d7f8b404018978dd163bca62176015542822f65836947845bcd78d5d57b SHA512 8461602adb5fde34f2e689dc3bd829daff55e9ab82e224b8b55297fb55db5cc680cd08896f3c7b7045eca9995d2c511eb75a81fddf85a43e12b96fd9c0b49e96
-EBUILD kemoticons-5.86.0.ebuild 673 BLAKE2B d2d51ecbefa6707415463a810c3d8f1b57145710eaf06b342e32a1df68c3412a196fadd386f2f51a0ffe5ca13225513ab0cb760e1007737c35e63f18f6f33717 SHA512 4e13b1c9f6f6452a25fbb27e8f377eb1cc0c384890ffce1b6b86a8ad2f2e3ed555867abab92d178b30e9ba5d084c459fee07a455645b8079156394e98e322b91
+EBUILD kemoticons-5.87.0.ebuild 673 BLAKE2B d2d51ecbefa6707415463a810c3d8f1b57145710eaf06b342e32a1df68c3412a196fadd386f2f51a0ffe5ca13225513ab0cb760e1007737c35e63f18f6f33717 SHA512 4e13b1c9f6f6452a25fbb27e8f377eb1cc0c384890ffce1b6b86a8ad2f2e3ed555867abab92d178b30e9ba5d084c459fee07a455645b8079156394e98e322b91
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kemoticons/kemoticons-5.86.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.87.0.ebuild
index eee0296e94d2..eee0296e94d2 100644
--- a/kde-frameworks/kemoticons/kemoticons-5.86.0.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-5.87.0.ebuild
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index c42226c08525..8015aa036388 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,5 +1,5 @@
 DIST kfilemetadata-5.85.0.tar.xz 426336 BLAKE2B f68125f17afb6f3f9c65486670ad2eca8ad057927c30ad3f765d6551cf3cb1801512c9432c70f2e87a992e7ef8f81ef23908cfdcac0df5c466eb4a0e932e58ab SHA512 f531a1519ee3efc8b6973bf979ce2ee1380c9b425f06233267d007c1b79f6b7c2166e47212093ec8250f75dc9897dbb0d9b8b17ee4d999c487f10451a725ffd7
-DIST kfilemetadata-5.86.0.tar.xz 426388 BLAKE2B 39aba0d4d303a0952a61d55a5c1fbaefc4bd1c5aa15aa23e84937242d217fe050cdcaca3b45d0116c58d6fc298bef01a14ff4c90d42636632c1bb398052975a5 SHA512 74e980bb6f8cb1b8ea24c59d8d2b557a3a92bbc9d3a58e5cada259406b31698b7c8a37d40802253b1c80617e15d6a3f3fe724e4e2c5b4415a2ff2fffc22c2e94
+DIST kfilemetadata-5.87.0.tar.xz 426456 BLAKE2B e197bcd0d989d023eeb2a3b66247e742e1b2a7f4ac913ffb080361883d5ef0e2d292713631bad6f5ef514946525dd35d60a7d5435a3760849010916b75a1b36d SHA512 654f94da41284094dc70060b04076e61617a82843edc096bed7f4e9dc9b7c8786ba857daec66204b9c9e70d76de2de8955b9ef62e5601788e59a02ba3fe41979
 EBUILD kfilemetadata-5.85.0.ebuild 1575 BLAKE2B 49c53fdca77d7fcbcad89749fe9f38569b4a0aa35cf96230ce03922983903cb9f848b4884ed458dc7cf5eece6e3157b96985ad2ff38cd17a1ce159f0b25cc721 SHA512 91a8a8366dbd01ec7534b59416066664fbcb6ff4bb99c5ff511ed1886a60ea14bb354ecd3ce646d6d63a62dd433ae0cd3e6a2ed3a9fae47119d368700f0a4ded
-EBUILD kfilemetadata-5.86.0.ebuild 1578 BLAKE2B 2fcc08fba41ecc2b804f03df94af739ccb8a032cc93c827bb9900dd3cd4e0915569293bf70c0e9b4174473855ead07a72d61daa2ca74546be9fcb8bafc964a33 SHA512 cdb4675570b7ff8f14c46b71d5719cbaf9cd4d6cbf9256c3060f555291de2639311575d19c4230cf87e1619b6d9033ca4031898b9dd3cd7a5f55460d0912e6f5
+EBUILD kfilemetadata-5.87.0.ebuild 1578 BLAKE2B 2fcc08fba41ecc2b804f03df94af739ccb8a032cc93c827bb9900dd3cd4e0915569293bf70c0e9b4174473855ead07a72d61daa2ca74546be9fcb8bafc964a33 SHA512 cdb4675570b7ff8f14c46b71d5719cbaf9cd4d6cbf9256c3060f555291de2639311575d19c4230cf87e1619b6d9033ca4031898b9dd3cd7a5f55460d0912e6f5
 MISC metadata.xml 624 BLAKE2B 541c1fa5c3478a459411545868f4eed8bd73ad04ce37f32cb92e18bbdcc47c5ed16680486e7e76f39545d987ce087c76ff585ec68999c30223a31e4bb1933773 SHA512 14cd3d7036f59ceeed58be5c013b2a5a2871bb380afbbbc4bf3c98610c4e1e9dc62a9164c7020ccff01e3255f24e92e58d297d127f07398b87a14a57b8f661da
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.86.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.87.0.ebuild
index b66b72669f85..b66b72669f85 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.86.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.87.0.ebuild
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index db8919a33b23..0519f251bdfa 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,6 +1,6 @@
 AUX kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch 2743 BLAKE2B 067e602048a9caceee71d1288f43d3da06b4d00b904f46ea2e227c7af18b8c1cf543f8f84e2bec1890187488cf81abfa0a9cfadc311bcc67169a85f8b5876393 SHA512 21c6d19fa875b920e80027ddc9122a4f6855051b3397948864e408dc2265da405eac4b5d345930f94d4eda32e0340f746e20c56c7068b99fe8f5b5a8c6fc747f
 DIST kglobalaccel-5.85.0.tar.xz 87868 BLAKE2B c76a60426406689434b8b7e90ff9f107173ffa8bb6e6f78603541c2f7fdba62719d141f01ac2a7e3ebeae06a2a891a5467e6ee87eb5d30a53ed4e3faa98a1b28 SHA512 091194d3171820c121c32356bf1dfd98416b91952b745afbf35fc75a7e944a5c80f17fb1f8418016513eaaf63ccb07c1aec822f5f3823f3f4aa604c3dd9963f2
-DIST kglobalaccel-5.86.0.tar.xz 88000 BLAKE2B 3c9d361ddf8a85fef783dedafa508f98e90da22652e057298b68a6957d882ddd2c7a28cc13278520c9d5672b1d3954e634d1df0963c7b78c18bfc6183c4db9a7 SHA512 ee1b700cd0c7f9162f6b649e61164e5e0915be3acdc52c504c85f133b64ec8d2ea962503d60d772efb127b6537c3bbd7d61f2b018b9846a791e9cf8caa4c0eb6
+DIST kglobalaccel-5.87.0.tar.xz 88136 BLAKE2B df86e873391d60a832c6ad9b6e6a69c9bf7af53b96d010ab03bd6c6fd5eee1a0f20bf3bfd68e4c20b33cb84b6248c597901ded6b62974f0790989b599709ccd3 SHA512 087ed056e9198b22ca79890b29fe594d721c4efaade8013e036216579564e484eca2fdaad3443444e9ba9b05e7038437fd4da297844e3c8c2883bc6b00b71c30
 EBUILD kglobalaccel-5.85.0-r1.ebuild 934 BLAKE2B 3dcd7e5e9972800ab25e50094761cd7b5eafaffeed22239c88936a348074457e91396dfc3e419f826cb7564706af374e2277dd30fea4970c513b15d96787e651 SHA512 56074522a4948ea9419639234851fb63f8bb29241d1d4403b1544581c810282be1ba01a29e188c29f5ded374de9922eea1290e50086e8217d85e385022cfc34d
-EBUILD kglobalaccel-5.86.0.ebuild 842 BLAKE2B 1489f22563189291286d7976e8568ad38a5131d57a550d409cd7c25372eca559f95ef69b1417670749c42a71fc6f132f854dda8d86ea11811f36d9269c28b0db SHA512 1cc8b8adf61d121b697ac2033f4aa29a8305f2259d3bccb4cc2b542317e32ccd63d5665478eee69a9cc961047681fef8242a6ff5e3f0d7cf0c09faf5d6cc336a
+EBUILD kglobalaccel-5.87.0.ebuild 842 BLAKE2B 1489f22563189291286d7976e8568ad38a5131d57a550d409cd7c25372eca559f95ef69b1417670749c42a71fc6f132f854dda8d86ea11811f36d9269c28b0db SHA512 1cc8b8adf61d121b697ac2033f4aa29a8305f2259d3bccb4cc2b542317e32ccd63d5665478eee69a9cc961047681fef8242a6ff5e3f0d7cf0c09faf5d6cc336a
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.86.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.87.0.ebuild
index 43fdf06f50f9..43fdf06f50f9 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.86.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.87.0.ebuild
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index bd9813b064c9..b9dccedd77a0 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kguiaddons-5.85.0.tar.xz 60620 BLAKE2B 11910055959a4d257969c665be64f6e1933ae7afcbfa16f3fd5e31503935ffe5b62188f0da7e0b9621cb158e01512c88eb07d7e2c4e6ec1600fa932157a08b53 SHA512 0f2b1f0201028da520ac0b04fd66c753a953a675cd29249bab79807b08739979601499530be119b5bda124bda4dd09e10c8e11b68d0bcaf8a1a2283e853cadc5
-DIST kguiaddons-5.86.0.tar.xz 60736 BLAKE2B b0d64662023600c7d3dc7baadb4cae84a690f9c6caffdf791fb4dc950cb87d0e491a2d48d1a2a2bc0f7c372bcc18dfd80b44b92c02ab7b0378b6cacdea958b93 SHA512 24ecf0ee7c646bd5ac4f1072269e353a821d2af6e741f2a652765c5e098c6c2f5d2c62861600d587214cc5d864f1648998ef7ea95caa899d98e06c87c4ebc8b4
+DIST kguiaddons-5.87.0.tar.xz 60892 BLAKE2B 5e8d68306696a3fb4401b1db293e9522271229c0e6f2667802fd782617f25a3e766f0f3825599e402a2ed81e8c073eb1e77315b03b589472fa1dd7b5f1de980b SHA512 7c4c9239717bc8a701898c13dcb020382afa89f19293be775d16b8ec30d97a3a7612404a8e4b448a09f4216a477859862ad8065f65e454374cfb7ab3b973bb54
 EBUILD kguiaddons-5.85.0-r1.ebuild 802 BLAKE2B 973821e44115bdd2f58ed0adf340386ab6e7a15746cb66fe2d23cda68f90bf414bf2309d5fa2bf926c98bd2e62b6243b0c8e37ae34e9f00c886ef2dbfc0d05ac SHA512 2cb679d383dafd75528dc0d72ccf7ee0977b3feb253977d1164aa1657e12feb98318e5524418cf62aa04b11fd31de47e87768a1d92e165d52379bd905d7dcb02
-EBUILD kguiaddons-5.86.0-r1.ebuild 805 BLAKE2B 0ed764942455cda6be19d4e3372a3a86b44cff3b043d12bc3b554538af02447b263261f3ad61e73016a3494927ac604e2b401a62e91fcaf24d75e8e4a4baadff SHA512 5adfb6aff2c7072ea85b29ab95166889b14d53a1f95c275f301debd3a0573fa40c2b3566120fccc44d2db7ab9e512d9dd9bd4c0fbe21b0d3fc94819417fb9630
+EBUILD kguiaddons-5.87.0.ebuild 848 BLAKE2B a8666e13acdded1798371388c74ec7a81c1ae80c9418ccd28e696b6b84bf9630a40f0e6f29cf21e8e41a0098cf3820e8f1f485d2b3a684ba1fd7ed3ecf58ded6 SHA512 5381cc54599ea144ecb8ac9ab728fcdaedcaef27b036ca1ef8e4ef145c1a69dd78061bbffe2ca8573935bad9074447f5696d61b962b2f910341c93422bce3dac
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.86.0-r1.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.86.0-r1.ebuild
deleted file mode 100644
index 47bd6c9639ca..000000000000
--- a/kde-frameworks/kguiaddons/kguiaddons-5.86.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing assorted high-level user interface components"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="wayland"
-
-# slot op: includes qpa/qplatformnativeinterface.h
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	x11-libs/libX11
-	wayland? (
-		dev-libs/wayland
-		>=dev-qt/qtgui-${QTMIN}:5=[wayland]
-		>=dev-qt/qtwayland-${QTMIN}:5
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxcb
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-		-DWITH_WAYLAND=$(usex wayland)
-	)
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.87.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.87.0.ebuild
new file mode 100644
index 000000000000..ca5ae913e5e3
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.87.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="wayland X"
+
+# slot op: includes qpa/qplatformnativeinterface.h
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	wayland? (
+		dev-libs/wayland
+		>=dev-qt/qtgui-${QTMIN}:5=[wayland]
+		>=dev-qt/qtwayland-${QTMIN}:5
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	X? ( x11-libs/libxcb )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
+		-DWITH_WAYLAND=$(usex wayland)
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index da57c36c985d..e45c3a7a10c6 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,5 +1,5 @@
 DIST kholidays-5.85.0.tar.xz 230532 BLAKE2B c9212b1036af4767eb7dde0cf504cf1ff255ff329c041d9d00f656419b3b92f9a82b0c0c0008511bdc59e485f60a5f57fa91af31842a1bf053c94d42d4b3b030 SHA512 c58ac20764db8eec399ba0ae77d227023cfc455c76289faa4a688f8dc3e6987a87c7b0825ed4d4bba4198915d39ad9d74dd6abb3a10b04d2128764c201bd4ab1
-DIST kholidays-5.86.0.tar.xz 231732 BLAKE2B d6780cb48f20a874f9108f55751a42b7c6654409950ec513adaf89551673fb518ff99549062032aee0a18be980444388c72804a1b1768607effcf2c22e9b617c SHA512 bd46595bf2d6429687ce2a38109286e86da9a98680bc882c1a11040f47917c06e88696716c4da2b38999bfd4d6cb45c23d39fe183731df8dd2773b50dd526ebb
+DIST kholidays-5.87.0.tar.xz 232068 BLAKE2B 9699b76fa06bea5e70f207783550bf0b45834b8667e65e0bcbff54c9e1acaf587b4191da6f17941d1b695c5eb179054c47ed71fbdf3940681ee9a6bf4027a47d SHA512 d71ab5f3592d15237e0ab493e214782758f876a8b91924b4f9de02387e00136427d5973800f14e79010acaba2cae17ccd9d29a97930911ab0dcfb5bdb2331c4b
 EBUILD kholidays-5.85.0.ebuild 656 BLAKE2B 08e36dbbb3fe25bc15dd19f619506ab8fff0da2e9630961e8d5f7b8fcc862b50ad6cb8b59d0eb2415fd811c05b172e92339a522438cf470ebe958e1805c77b14 SHA512 8a59b08492c61e09bd79c8c79d2712374114532d0dd2c27faf5dfdda7b6bb13edca66382967620e785d30c2a1c5c75582b13d1e2ab50765d5950e72dc18f9ebb
-EBUILD kholidays-5.86.0.ebuild 659 BLAKE2B f92eeb5f0487e9df7c7098f10bea075c6e0a712432985baceca4833f65114e39b2016f7d57611727209cf99a6930511f0d4058058341427e80d6c5f89799e6aa SHA512 42ac87dbdd5b956a9b894f2f4b638cf429dbfa9aa16a734453aa55510385ee365c5bb34b999a1b796d9dd90f1e013f90f7af8e4e82d8a74d48423da0c106f784
+EBUILD kholidays-5.87.0.ebuild 659 BLAKE2B f92eeb5f0487e9df7c7098f10bea075c6e0a712432985baceca4833f65114e39b2016f7d57611727209cf99a6930511f0d4058058341427e80d6c5f89799e6aa SHA512 42ac87dbdd5b956a9b894f2f4b638cf429dbfa9aa16a734453aa55510385ee365c5bb34b999a1b796d9dd90f1e013f90f7af8e4e82d8a74d48423da0c106f784
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kholidays/kholidays-5.86.0.ebuild b/kde-frameworks/kholidays/kholidays-5.87.0.ebuild
index db511b412b81..db511b412b81 100644
--- a/kde-frameworks/kholidays/kholidays-5.86.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-5.87.0.ebuild
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index fcacc7d66b0d..d46ae91f1f6b 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,5 +1,5 @@
 DIST khtml-5.85.0.tar.xz 2093124 BLAKE2B 627bfa8581c6a5574027ddbc8c9c87544e218068ea6deed5190b0528cc8a9035eb8154b1847fcceb7f4edb664d72aea23e608880cda84eb610da66ea9a74a85a SHA512 772aa4bc541be3f03274f01810bd7d49486f9a7497e8f6e2bd4cbdf3dee4776318fddff0c2b221181184dc185ac4549457ae372b5521462749f5213c62e1dddd
-DIST khtml-5.86.0.tar.xz 2093140 BLAKE2B cbffd1b3135de54dc790543c809eafe384701c7077347e8db5db6c7fcf6d8b1f54d9ef132486d460d7894d343fc36910bf13dab2bee497080a26c7303c546dba SHA512 4d40c92ae8eb1a17e8dfe0b1c275152d5cc11fb68a748bc9a23692f0953126001dfbac0a077b97338428af92b74f3249412c5f3e03cc20751c7dceb793da6d4f
+DIST khtml-5.87.0.tar.xz 2093572 BLAKE2B 0d5ec7f3bcac10df6adb283d789ebe62b277faf6c5dc7f1f19b26921e16bcc61f9f9af3678a6f32cf7ac480101b7c03839bff3686a13463fc7bc764aefce4da2 SHA512 b87cc182e22f17b7ac77b012b7af9da360837db052353134c871f0a449e4177270489bea21f548f35f7ac9bda35864a5c3fb43146eead1c8b413b878d6b4534e
 EBUILD khtml-5.85.0.ebuild 1760 BLAKE2B 74d67c320828dfb8cee26876498486587ed14cf7d80115f7abc701ba213113a3f27fd40ad3240832b983c824c918a70f40362938ad34a0bd4b36ef0fc8d55039 SHA512 23806a9491e03c1c6710536275412bb06dbf9318370cef5ab718f4263d36d04ea7674d7451e86723a6875c4c9b9545e484f73329dfaa9ed57a713a718763d861
-EBUILD khtml-5.86.0.ebuild 1763 BLAKE2B efbe9c64000d063d6a3ce67e673e6dd884fcce750d8bcbc2b1aa07278e241bb72ae717754c581be4c82361eb4e39b08d5dc66b083b85e92d166cfa702400386d SHA512 753a8039ccd49cad4b7527e21e75994d62de76f430a6ad89421bd3c33c701cdb371f56d5545e9028c2219e8edafec77f02f39eb48ccba49b8ba4aa71370bb356
+EBUILD khtml-5.87.0.ebuild 1763 BLAKE2B efbe9c64000d063d6a3ce67e673e6dd884fcce750d8bcbc2b1aa07278e241bb72ae717754c581be4c82361eb4e39b08d5dc66b083b85e92d166cfa702400386d SHA512 753a8039ccd49cad4b7527e21e75994d62de76f430a6ad89421bd3c33c701cdb371f56d5545e9028c2219e8edafec77f02f39eb48ccba49b8ba4aa71370bb356
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/khtml/khtml-5.86.0.ebuild b/kde-frameworks/khtml/khtml-5.87.0.ebuild
index e20decaca238..e20decaca238 100644
--- a/kde-frameworks/khtml/khtml-5.86.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.87.0.ebuild
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 4537b5337e7a..1722204812e1 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,6 +1,6 @@
 AUX ki18n-5.57.0-python.patch 512 BLAKE2B 9feb6bd88fbf7ed853be777320d5d4821320da91308866d1afa08f3e7ee1631f3f59e2b096c8aa6f2b2562ead934ab11a03633fa3b09cdccd1e292adee7adfaa SHA512 51462a06c232b9ee1eb1f0e290ba286f7f7702676e5b8c86626dfcaa0ed11b3d15744573643960ead459f9366e21d859e54e344abf7108f084e84dcf0765b596
 DIST ki18n-5.85.0.tar.xz 590384 BLAKE2B 337898b907e673365175a3fd7f122baa156266e60ae47d0f5f7f9afa577c4ed2abfd34d8b2189c162fa4c15e4b726984cf620d699a65b8dfebbeeea99eab0079 SHA512 01053f5715d907eba28daab411880013b9f0305f72d84d1a26edd1aeae6b3f05c1b580ea95aae4de122a57a3bcabb11c4737a82bd51facf8201d584c64708856
-DIST ki18n-5.86.0.tar.xz 590516 BLAKE2B 74da0ca604a7336f059665b678c8823f0080dbd472affde1729d9d98836e3338d9481e1a5d4ce990755ea0e3c16960b76e0a96d7f60cb1d9c1383e6981f0057a SHA512 ac51b877e10803d06520cda3a222cc425abc6208437558dbdfc27f2af7dbc9fc33f214f7d0f35598b03733b347f640b5aeb49cca7e3204b7fe37742cc13dc669
+DIST ki18n-5.87.0.tar.xz 590996 BLAKE2B fbb24921273a6deadcb943cc30f63e5ea7b39d35ef1ce7e0d2e325471c26b3c4936d712ce4bfcc39fc8194e3cd40164ba70dc2a77d6eb97dcf35beb74b95bf17 SHA512 3b6420de995d6ed64a57934c16334fc48bdd495e81d5b64c15d2403c82fcbab21601d831d9b802b61af64b88c16281a50c8d689069bb3a92467c963cb6e9a0ac
 EBUILD ki18n-5.85.0.ebuild 837 BLAKE2B 4410feceadb137fd8d2c4110cdcfd6067e4677c54a6fae240d72f1e94a8fda8e0a1746b008d05853d570abe6c1855d7635521e4602e6cb394233c93884912eb9 SHA512 9cccb3eee1e58709fbac5c86dcdffa7cacaf68108b3c4976bfad99980130e72e360be0721715d2d9bea9069a3e1a1b030241a773d1fae1a00b544be30c414ad4
-EBUILD ki18n-5.86.0.ebuild 840 BLAKE2B e16b66252c783261c7f84d905b178dce98057d9269299ce8ce135e4acb693e71e38f0aa22cc5577269f540d84a63cc87061e2317ad97375b9a5aa98215f7e18f SHA512 95bf43617182d7680d2c0d6f15091955b69e9e00acdcec215afbf07198b732efb78cb0c8269f27a323db8e213d2cf9d1fe1693d2ee4558c83f42aa8bd8578e7a
+EBUILD ki18n-5.87.0.ebuild 840 BLAKE2B e16b66252c783261c7f84d905b178dce98057d9269299ce8ce135e4acb693e71e38f0aa22cc5577269f540d84a63cc87061e2317ad97375b9a5aa98215f7e18f SHA512 95bf43617182d7680d2c0d6f15091955b69e9e00acdcec215afbf07198b732efb78cb0c8269f27a323db8e213d2cf9d1fe1693d2ee4558c83f42aa8bd8578e7a
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/ki18n/ki18n-5.86.0.ebuild b/kde-frameworks/ki18n/ki18n-5.87.0.ebuild
index c3e589fbadbd..c3e589fbadbd 100644
--- a/kde-frameworks/ki18n/ki18n-5.86.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.87.0.ebuild
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 9944e0dcadff..fd30277a138e 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,5 +1,5 @@
 DIST kiconthemes-5.85.0.tar.xz 221352 BLAKE2B ee619a6192b1d6dbfa000b1f6366ebe1dd8c25df41dabd2dd15f888f7cae2a9f5cf53d5d0a0a2d5ff7d95a224137a69a31f4c2e67fb6419b750241c7cdf05c81 SHA512 87e041835401273627c596338f94a0507f3184fb3e0a004ad4ba0c878fc2ef9ceac5bd4a9318d8c8e852e1ab26944368ca6b27a3efcd4269643d8e0cd0d60953
-DIST kiconthemes-5.86.0.tar.xz 221488 BLAKE2B 73dcf0f65d49aaa0b735ce143ce9f578ec9b681877509b44f959ac7f30195e6bc42aed8d39f8e7f4da9eb6e1f59d714c8948ef2261996aa7a5af55d1364dbf33 SHA512 f17dd47b3ddfbc1acd3136abc2b1208aec6394c00ebcb48695a05e93116d857a2a5137bfa7bf7531c706f9fa091dd2528ed8f015bae800fbfa9c6a4a15c3c11f
+DIST kiconthemes-5.87.0.tar.xz 221816 BLAKE2B a9fc42cf40c8cd8c04ba3bb3cc99fe302370bdb64aaa2d8cc307d30e4b8ee5698f35237e01bf9f8c4630807b8e6fdefd8cb862b43ead9b8b1fc3d292bd831722 SHA512 f218c19e76c863a7690953566b572da93fb9eaa7bcd19c4219f832f8b6cbc6d6e7c4556f1d5d6e2e559addb8ce32a330e9ae96270ed2af10fed6a8b739f7c949
 EBUILD kiconthemes-5.85.0.ebuild 804 BLAKE2B a5bcb998ec8526e4da28816b125d62b834bc556de38ca6c23a9ee39a029249145daf6da873ca530af8b139721e06a594e0a2071f50bf9b0c3f9423d9c7fff71f SHA512 da05b732f33630e4081dd733f65c08a2120139057c234f90bb22a4b7c07e8b7c971adfd08efb720b6073d93a225ca2ecbb521bb2eebd928f4e501b3e786e5cf5
-EBUILD kiconthemes-5.86.0.ebuild 807 BLAKE2B 4e27e943e7d26ea898e67f30049b3e322c539a0f522be53d833cc0e51e33345a488804e86de4874f9c3046edf83e8d98d9746fce6e5740655d9d2bb1385ee542 SHA512 45c8fe29a48202324f3da249dbc1aa11ae73ef1f3067ca0809f80d5b80546f66a3523a101fd7878d94dd6cfab572cd3e2fbe4f2240afc38c86f7081047c6edf3
+EBUILD kiconthemes-5.87.0.ebuild 807 BLAKE2B 4e27e943e7d26ea898e67f30049b3e322c539a0f522be53d833cc0e51e33345a488804e86de4874f9c3046edf83e8d98d9746fce6e5740655d9d2bb1385ee542 SHA512 45c8fe29a48202324f3da249dbc1aa11ae73ef1f3067ca0809f80d5b80546f66a3523a101fd7878d94dd6cfab572cd3e2fbe4f2240afc38c86f7081047c6edf3
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.86.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.87.0.ebuild
index 1898cad3ba08..1898cad3ba08 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-5.86.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.87.0.ebuild
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index c81ab9dc9d69..18da4f228cbb 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,5 +1,5 @@
 DIST kidletime-5.85.0.tar.xz 26116 BLAKE2B 45a51974ec3e3db3a9528d7c2073b13536ed291691fda7fd3fd5810cf4b602ab394419bc67286634d6beee65a1f6e12f7962431cd34e64b819c16dd7ed207b03 SHA512 1a3c322bffe3d596283ac4b48c10b83deb9cd5f792bb47974e048994f74117d3f65148424f48a9b4f812cab3b96a1ecc5360b0fd69efc9c4f0326d630046e880
-DIST kidletime-5.86.0.tar.xz 26120 BLAKE2B a1d3f8f91f06ab25a97127d358a6284e968aa678cf65246089e71f3b97d27f8360789886fe7f16ac31078660d32336a2c09574bb9e733639f27fbc793b9d657c SHA512 3d69e15a45434a899565aba9a0f57bd1b47d29d73680a00a2e58c4506937b2e8674d80a97c0672ba3392dae9df032834532169461cd5b8c7b4a5670d7663d91c
+DIST kidletime-5.87.0.tar.xz 26328 BLAKE2B df1e35b9207cec9df9f49457f60c86ee1dbe3d2520cc2ed87254af354d8828f67ee693d5e04043cb60f1702cdb2219bf04ee02e49b267c18c07dfa5c445dc9eb SHA512 429f56b63daabc3d9a367dfeff348df08017e43c62d4a2e3d0922d7e90681eadf9dcc2c1f5c5808a27ecae098f35aae651a5c278fc16c1bb4fb447e8aad26284
 EBUILD kidletime-5.85.0.ebuild 862 BLAKE2B ca5bc3dd9595f2292dbb0d01543aa986dbf1a1b8fc03baf1de155d0f824d3d86e4e6efe5cc787cad02d5db6eff82709f879c15c7e5056886ab8717b2c1a3caef SHA512 771c56d9e233f735e1f518bcf21060e0bf8843dbaba7b2a79b7225413b43c2333cdb1a32efb3d56044b442bedfe72acdd8158da55c7cb30d6a88c65e0653c93c
-EBUILD kidletime-5.86.0.ebuild 865 BLAKE2B eabf83de33504f49c46684ecde9c7355482c5d7cfe110e0966d4aa5c7ca140b70d747de6eec86d17745cb9acdecb45ab827584513b82ed412f28a809a5b99e0c SHA512 0198a814fecbc6ea04948e6e0d841dd010dcaee8c6f1a6535f7c8686019bab1037eba71e1657a3d30f70f9ca25d6cb5496a114ec6d8871e8691cf99fc29209c8
+EBUILD kidletime-5.87.0.ebuild 865 BLAKE2B eabf83de33504f49c46684ecde9c7355482c5d7cfe110e0966d4aa5c7ca140b70d747de6eec86d17745cb9acdecb45ab827584513b82ed412f28a809a5b99e0c SHA512 0198a814fecbc6ea04948e6e0d841dd010dcaee8c6f1a6535f7c8686019bab1037eba71e1657a3d30f70f9ca25d6cb5496a114ec6d8871e8691cf99fc29209c8
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kidletime/kidletime-5.86.0.ebuild b/kde-frameworks/kidletime/kidletime-5.87.0.ebuild
index a3ce5a27e933..a3ce5a27e933 100644
--- a/kde-frameworks/kidletime/kidletime-5.86.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.87.0.ebuild
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index a206f570b12e..2d5299186c06 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,5 @@
 DIST kimageformats-5.85.0.tar.xz 590844 BLAKE2B 39102bcb685a35146871201604d220a0f439531ab65b1d78b6045bb9c45651c7b54967c8c82a100dfb5da028fef1c845c8711a632dcfffa9fbd752a2884e42bd SHA512 7f72ee1d0d56638c1aa8ab0b61f18e69517921f25a64424ab848177da13506ed917eb17661f5a1069f5e56578f6a5271c9fbe665d8cfdbd284e28747e6bfc321
-DIST kimageformats-5.86.0.tar.xz 590288 BLAKE2B e1a8945fe439e07d6bf982770dd2040f4f0f194d22ff531890347606802093815273e4cbf7a8a80d3c3e1e704ceb6b2091f79f35c20b8acfe100fc429e296f5d SHA512 cdfb56a7807174c64141063d26f263fc83b58792995cfc00bfe6c5843bc646aba118e088e53d8da40ba781ddaa0c0a985251f79a83206655179dd3e9cf3c90a3
+DIST kimageformats-5.87.0.tar.xz 590528 BLAKE2B 0d9e9c24f84f9d44f2b70003d0af4f0015e42a82aa18293094d4005a0769ac49da84b3bd8464d5c13ca7ee141608d4252ed207c5247f8f47d9b487446b70de78 SHA512 29eba31cdab40262a3bc85aa62c319fa6b58084589fd635ceb1e882fe8f9e829e2b4042c8e46b7f909a78d3d82af253ce217cf574c69a03d7b2d00f6ac985bb8
 EBUILD kimageformats-5.85.0.ebuild 944 BLAKE2B 7fc5c2eaee24712772c57a0fd55a18642e6d96b126bfca9017e98382f7733ed81ed7420c4f35c9b02b10f249a6c3791ae8c5f0de38eda1813efe3350c445d413 SHA512 6f4040db07fea31d9c102f1ef4acb1edd6ffd9df097a152080dfa0740532a692b9ad8c6870382c107c5b83332b00dab1c23613532e5f8290d7a1355a197f5664
-EBUILD kimageformats-5.86.0.ebuild 945 BLAKE2B a7c05adca9c495f26a0b870c0526d9ea8c3407c95daa4cc4e1874452eee365198cc1fa8b7faf4b21f4b78dc3e679b83b86ac8f29540aeb651e9040fec92aa2e0 SHA512 eeff83b38dd189997e2cd7b94e0bc33647f39ec756b63548ce58034d3a7a5ff2a9d5268b92a5c2440595aca81997ec02013d6ec0c826aaeb3a2c25da81345551
+EBUILD kimageformats-5.87.0.ebuild 945 BLAKE2B a7c05adca9c495f26a0b870c0526d9ea8c3407c95daa4cc4e1874452eee365198cc1fa8b7faf4b21f4b78dc3e679b83b86ac8f29540aeb651e9040fec92aa2e0 SHA512 eeff83b38dd189997e2cd7b94e0bc33647f39ec756b63548ce58034d3a7a5ff2a9d5268b92a5c2440595aca81997ec02013d6ec0c826aaeb3a2c25da81345551
 MISC metadata.xml 652 BLAKE2B d9d29bd39e9338e0db873b7981b4e2625a73ca8baf5a4afcf0b04b16d680622f54188b8718df0396cee54325e4b9946ff2c5c8a557cd6e930e4d2f2ba7fe10ed SHA512 1f430d9ce273518093f1d75e9d7d509df23db68a72654581afa98a51b502261c88cc88916c5acfa37226108641592b9d635fd1b796d4b30f5bd69f6f5d5b57db
diff --git a/kde-frameworks/kimageformats/kimageformats-5.86.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.87.0.ebuild
index ffb6ac8ad0e5..ffb6ac8ad0e5 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.86.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.87.0.ebuild
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 43775789e0a8..ce679c2cba1f 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,5 +1,5 @@
 DIST kinit-5.85.0.tar.xz 121608 BLAKE2B e6d8f14dc6930ad058c35246dcb408d7249de800a27e2db07091cae93bfd3ad0b37cadb048ee95398a0330b571a71517d4e7d61d6b98edb40e73201786a5a532 SHA512 9968dc1381f236c843aa76bd3ede13b83607dd6e6a9fc5723e3ff23fa1d924536fd227ffbdc20a4c914dc76843f0b315b4247410dd5580ae1134db3b50ae679e
-DIST kinit-5.86.0.tar.xz 121652 BLAKE2B 6fe78d52280b12032f3ed2f54fd284bd237b49325397c05097e011537f1f1fd2d1b732a60cc32ef7d261506a6a4ce1e418ebc585d3047cf8c267d2f7e7d85904 SHA512 01e78820e3cac54fbdd519ca8fb094158f012bfc2dcdf743914f4afe07c8d42708bc10faf4203b5e6347b0805740edb9dcbc87b7fb131ab25a57a025442ba399
+DIST kinit-5.87.0.tar.xz 121956 BLAKE2B a71dd102ba069dcdb6e137fb4503b8d556f373dc6bc06ef4779feedd51a23e3201a7e5391a5a92a43b6bf6500ef2084dfb7fa17a5459d16bf4b0a81ab24d35bf SHA512 6d220bd657e105cb8c6a37ea70f552bb642acc2427752dd02728ab4f0512714dfe860cffb28d7413d431f5caa4f79994f3aca2e71e5abbe992689492b9e09853
 EBUILD kinit-5.85.0.ebuild 1141 BLAKE2B 7c505a9b8d05795753469f17602f73e7d80204e09aa3bde456f23a1c7f5bcde7adcc2b45ede62377ac497520e0e8ea677b75b531ef10382b91223bc104b7e797 SHA512 d61c72547ac1274ce40a22d4c50277ef50afb88da625a0005be3730421811a1a0fd433561a478ecd222506ccaa3c3fe652e22a67d89028cbb8336a741834363e
-EBUILD kinit-5.86.0.ebuild 1144 BLAKE2B 148a1f2606c84faa07651b4f1d5e4e6d4674852c4852abb2c00ca85baf490782987b309eec8ec4b67e5c9e1f02a8c7874e8830ccbf93d2a53e322cf5cbda22ac SHA512 85494cf1488e279b9ad3c4bb2e391cf4badf559b6ec05ad7f465aa3815e3ae2e537ef737d89f09d7332e200569088564db2ed366bfdac4bf4d231d6a69ae1466
+EBUILD kinit-5.87.0.ebuild 1144 BLAKE2B 148a1f2606c84faa07651b4f1d5e4e6d4674852c4852abb2c00ca85baf490782987b309eec8ec4b67e5c9e1f02a8c7874e8830ccbf93d2a53e322cf5cbda22ac SHA512 85494cf1488e279b9ad3c4bb2e391cf4badf559b6ec05ad7f465aa3815e3ae2e537ef737d89f09d7332e200569088564db2ed366bfdac4bf4d231d6a69ae1466
 MISC metadata.xml 565 BLAKE2B 8e740127ae95b251e2e5cdf63fc19fb605cf5ef42e631b54e0ef300e8f21f04e288527c4628500c076e884da4b3017d041b1b45ff9a6680e72585a43caa452a4 SHA512 0efe6998f185b5a5aca504a041b3e5fc1ef8da0a4f9eaf2398ef9533054d9de27ae50c9e940001b24e69958d2ead67ab829304d8e322404cb19fda0c904e952d
diff --git a/kde-frameworks/kinit/kinit-5.86.0.ebuild b/kde-frameworks/kinit/kinit-5.87.0.ebuild
index bf8dfd8761a0..bf8dfd8761a0 100644
--- a/kde-frameworks/kinit/kinit-5.86.0.ebuild
+++ b/kde-frameworks/kinit/kinit-5.87.0.ebuild
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index f16104d94eb9..63ceec65f69f 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,7 +1,7 @@
 AUX kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch 1839 BLAKE2B a09e264a7c6e6bc8bf2ceda44937b8aac7c70a3fc40383dac70a78dcc7126c9387a7bfb478d52f7b2fb8c829b7e996d4336aee27c141ecb229f3f903ff6f37ba SHA512 7b4124d839337074e85fe499eeb1ef6b4290b000be9c180cf7c09432c85bc2a6f931207aa3f3c3cab94d4f877efaf1a73701394c1be3fbf15c9950ed6dffc816
 AUX kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch 1156 BLAKE2B 4a36114a86844b7d5abe0a5ab89ae979b99dda3e2fe307d7887fc66ef31c81da311f708927b2cddf0367ede36e12945ed9eee715178c6fd23abb99a6f47e4109 SHA512 579b74442c0057a5629cc516b5955a9d7b5504727d0eaeb3f5a5eb7ef828f30c2869e286000b492800b9139b602b98293cd3a67e91877993c2ea5deb70f4890a
 DIST kio-5.85.0.tar.xz 3200300 BLAKE2B fd723dba761b81862bf503645a8526a246867e5a10441f3edf895e4107c189ead357615e17f3704325976ed29867c54f98bc11b4e977e21a78d429ee7efa2dde SHA512 73c69743f3d99671ced8176bf9806df54eb3afd04dbdd9dd92b79c9979428f980d3dbda9504c81aca4aa36249b3e43edcc38831497752e31a510a70ee98dc4e8
-DIST kio-5.86.0.tar.xz 3251976 BLAKE2B 5257ad0be8023ec661262fcd96f3f5860357fda73d1a039fbb30e549f4bb0bcab62217ccea70c22ecea63622ecbccfbeae27afe3692470be738f813e466a9142 SHA512 64a4ae7b0fff6e4e2c5ee3a25ec6db472c198fbcce5d8a929da2d42f6a881e404151a1935532c53359b645acac2a46ffa129616acb26b871dc7993b91a31fd8e
+DIST kio-5.87.0.tar.xz 3260188 BLAKE2B c9681bd404a3a60eda4d0b5f9b05254cedba2f20a74942314f4462b5306b81d206bac24e8032eab31287c7083e8fafd8db15c2064342feb746abb0629def7041 SHA512 55a3dbdbb2169a1f3b59b6b1857552ef75ff07ffa8dd7871f72aae1c42aa027fdfbbe80e2d7874b3c1914862bd6ff09cdbef3e19766cc7178b642a73e8dc8c19
 EBUILD kio-5.85.0-r1.ebuild 2622 BLAKE2B 326ebbf29032e342e73b733dd721ad5c11902048233ab566a8570b024a580ccd3a26b6ace2838f5f2f9af79241c18d811e1b4ac646b3f4c04fe65f1eb52bfeea SHA512 507a63d154d91561d2e5e7ea08f93536c8c1c8b5b9d722793e53464f2eda089ef0f3db139259c351100fc00edbd8c7b00e39c45c8f41a12f0a394dd7927fa39d
-EBUILD kio-5.86.0.ebuild 2432 BLAKE2B 942486a3eff422422b18101539bd78a903d004975ebc63428b2b6542f9f26c3e27c63e36f3c21aefa27e0e6aab985e168c30435b38581889410a12ed1fd7cad0 SHA512 094f60150e13476b1d0efe5fcd93f82282232d58c7b98dcdaa7ebba22a90989468836f9de540694c4ad04f5d420944af88ef39a397528745a374d0a8134ebf89
+EBUILD kio-5.87.0.ebuild 2432 BLAKE2B 942486a3eff422422b18101539bd78a903d004975ebc63428b2b6542f9f26c3e27c63e36f3c21aefa27e0e6aab985e168c30435b38581889410a12ed1fd7cad0 SHA512 094f60150e13476b1d0efe5fcd93f82282232d58c7b98dcdaa7ebba22a90989468836f9de540694c4ad04f5d420944af88ef39a397528745a374d0a8134ebf89
 MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce
diff --git a/kde-frameworks/kio/kio-5.86.0.ebuild b/kde-frameworks/kio/kio-5.87.0.ebuild
index 6c1d184379bd..6c1d184379bd 100644
--- a/kde-frameworks/kio/kio-5.86.0.ebuild
+++ b/kde-frameworks/kio/kio-5.87.0.ebuild
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index ee8a9a023b41..e26b61a53a6d 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,5 +1,5 @@
 DIST kirigami2-5.85.0.tar.xz 323312 BLAKE2B 4953b9d3f0114aa7f12b23c7c12092cc0de57ff67e73130a1428e7c334d34b5a87dc8c7b2095dbaa2f28f6a96cc8be67682a73b2785a19f39ac9396c20646213 SHA512 239a8f7e5e77ca19cd9b8e45a383959c0c5b07dda279862c3aa0474fd34d58d905ca947c7f19eec3bc2de53557e8ae7dd8cb5a4879a53c28436e6636931c2603
-DIST kirigami2-5.86.0.tar.xz 328492 BLAKE2B 8616dceb89ece6b6cd39c33b0fbc35613103864106ccb313345fbe1760a43f594210b265c16c362efa055b019d31bbb2ae0ff0aa63483a0de941ebd967e61f87 SHA512 213c0dc7a49b1b0e8647f48321fc419e475c751d90d80bdad280ebd11e630c8cad61769b124694cf172d2771861145af39542a0a25dabf203d329b27035b9d4c
+DIST kirigami2-5.87.0.tar.xz 332160 BLAKE2B 18506c0883e56113220b920413d00da7bbbd7807425296c5e3678c6c92960f7dd12b85b70fa267154f05f93a7b5e3fb09842681742e0753a256401dba3f7da10 SHA512 b6c552232aa9d68b62285eaa4ef0cbe0cefcc2294328fd539a0765abc153f1de7308c9e517206de6d879ce9501ffd059d8ec65df707bd28b45412409b839c25b
 EBUILD kirigami-5.85.0.ebuild 980 BLAKE2B 999fece128f09c3c6ae2f44728b0116e8f61a4546e17d05b88522de2bb07d4cd839537d02e9f221f822317484660321ae8b6f0472d19dfc602b5ee9bff969177 SHA512 dea66074332475e1e478e01f885e91628e767213cc37069dc9e5e5c1e91676130add99d6bb6a584bb979dc8824ef33cbd6b7be6e73a9350434038ab4e6f783cb
-EBUILD kirigami-5.86.0.ebuild 983 BLAKE2B af4c4f0de065b04abea3693bdd35ea019e8aecf35abefdd3e2c20aec6afe929dbc580ba7fc7f33583440043680606c995008e8552340e2ae245a0893f4a6fac2 SHA512 f4ead26545ce0e5f5c71c4e4ca01ed0b91a0ff37b6f920e52875ba5618c035152c0e9a50174b3fd95c2dbbc460ff9fd47625a4e4393772a6fc0260de91e7abe7
+EBUILD kirigami-5.87.0.ebuild 983 BLAKE2B af4c4f0de065b04abea3693bdd35ea019e8aecf35abefdd3e2c20aec6afe929dbc580ba7fc7f33583440043680606c995008e8552340e2ae245a0893f4a6fac2 SHA512 f4ead26545ce0e5f5c71c4e4ca01ed0b91a0ff37b6f920e52875ba5618c035152c0e9a50174b3fd95c2dbbc460ff9fd47625a4e4393772a6fc0260de91e7abe7
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kirigami/kirigami-5.86.0.ebuild b/kde-frameworks/kirigami/kirigami-5.87.0.ebuild
index 32d0b42c0693..32d0b42c0693 100644
--- a/kde-frameworks/kirigami/kirigami-5.86.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.87.0.ebuild
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 8f05fe1a907b..023795fc521b 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,5 +1,5 @@
 DIST kitemmodels-5.85.0.tar.xz 403004 BLAKE2B 3d5ebb1ac85d56860dc141a055341f90111554158c5335d2f4cdb750a0904db75442c464e4d547d4ba5596ffafc0eded9ed3b5a966542ddebaecf038b72bc81d SHA512 e953a8145cfbae9ee3041ef12e1a8c2a3e8289be116893b6e0c89c32e0cc39207928732ef7930b9af1466672d429ecf7ab85f92ae83ffb75906e201455b5d85f
-DIST kitemmodels-5.86.0.tar.xz 403240 BLAKE2B 71f1d1f771cdf2799d3d4fa19749e2b40d175a6fcea0c7834c12c50d5e2243f754983051a02a3d569d62ef15843807d43a04c2f9f2ee2d8823c64226c15d308b SHA512 25d4c371fed7b372e05d722234041971a849d30090347eac9324693c66d7ac43094409609089b475da4a659aecd940ef4bfc5802ef887837fa0e47630d8bc363
+DIST kitemmodels-5.87.0.tar.xz 403376 BLAKE2B 37ece36bd76d84f35e25226d1f798027755da9f166c796ecf3b03eb99930e3234a3689044615b32852ad82fbf8daa06d5b71bfd1a04682d7fce980abaf0d9825 SHA512 c2291560601da060da7f96f42e3e53e7293e7c6ee814a729c5e141c0d6b11e6724744d1b69be2230fffa6c5bd8aa0d2ff18d006ada9269f558750f4122ed2977
 EBUILD kitemmodels-5.85.0.ebuild 693 BLAKE2B f7f8c20d60df1b1345c58539dde6d6946de72c26bf83bd27d3faf8c014f77fcbf37b834a90e724e076397d692182d58b88dc7a3c6204372512cb50ee21c23870 SHA512 e676cdaa0b88fc94a19b090c9fae54a5ff577d8fafe797c3fc485a36b59c23417011ce42abbe2c728f3ec3fe71729bd4d79ba922f4dfef6b4347ed6a63c969cb
-EBUILD kitemmodels-5.86.0.ebuild 696 BLAKE2B d7118662e5cf8c012f166890dbb5223a2f4697c4429238d1b1b605ca6a841e3af45b5464c83f35d7943b93cf5e00c69042214fd2ab7e51efaae76330dcc7366d SHA512 c04436e9c66366916b8616e4a3f41f02675f4e1e6101eb16acb566b72302023a45d0e3bf49fb5c47ad0b9e880c8c301b00d32b3ef71982051d7d3d17faba4932
+EBUILD kitemmodels-5.87.0.ebuild 696 BLAKE2B d7118662e5cf8c012f166890dbb5223a2f4697c4429238d1b1b605ca6a841e3af45b5464c83f35d7943b93cf5e00c69042214fd2ab7e51efaae76330dcc7366d SHA512 c04436e9c66366916b8616e4a3f41f02675f4e1e6101eb16acb566b72302023a45d0e3bf49fb5c47ad0b9e880c8c301b00d32b3ef71982051d7d3d17faba4932
 MISC metadata.xml 552 BLAKE2B 5cdc5875ea809e9597a8510b6c427afadb94c1f5673c2787d8d825ab1b1609be3f0ddfaaccd64b717f188c7eaeb44cba90ad8beef3653844bcd6c1567b598a90 SHA512 ea592f4380f95578d9c15487498f8600540e3f41d4702d63b13a34ef6f722dcefe70677e5026f507ae04b1a97d29d91851e0e06dfb48a63c3dac98618f08ddf6
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.86.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.87.0.ebuild
index f0e41176ca8f..f0e41176ca8f 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-5.86.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.87.0.ebuild
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index 01d2860656e4..1972dec8ba89 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,5 +1,5 @@
 DIST kitemviews-5.85.0.tar.xz 74868 BLAKE2B 96fe28e325e88eb713220f231ad9ec93eea8128ffebe5b67db16179e659e8880a7920f4637ccf5eaa273a3519da494bc97296a8a0e4f6ddeb9afd1445fc5cc4e SHA512 63e7b4ce92be46e631ddbccf1fac484626f236e215e2b314f9ca088be36af794527f903a1fe28d450b8b5fb2852891d1c7e298d299cc7fda203a072d8905fbf1
-DIST kitemviews-5.86.0.tar.xz 74992 BLAKE2B 8d32f46bb4e525a19a30943611671b03e3218db0acc2d616c8d55b54f4a07a69faba2c1f6467a19676ef5498c4040b1bf57fe6c636f41a9404b5804aaf2f5a83 SHA512 a6854e18bf3cb6de1b1ea481bb69e87a2af43c358ee5970e65849f9fd383028a4cdc9dbd938ed879f134eb5fb07126e7fc7bf69a6329c8166c3af2fb3329f931
+DIST kitemviews-5.87.0.tar.xz 75168 BLAKE2B 9319fa023d5ba333f36efe2fc5eb7b797afc2614038ffc79c96e9ccaa0e3fbb2ed418dee83c6ebed013bcb3a6515232aab9ae836dc3194c700c599735510f302 SHA512 3796428861d37e139459a2e58c74ff8dac37e6055f61cf671eedb4227d6248c82a034d529f0ec8b983965a61b87d9e96d0a83fb7e5f8bc241af388cc4059f4c8
 EBUILD kitemviews-5.85.0.ebuild 623 BLAKE2B bb1a8dcd45ee8a68ffa4283fe8463896f936dd62035dc12858be93bb79987d2e823e652bdbc7f65ba4140d44fbc0dafd9de1b656424c5c872093e2e10d8efbe1 SHA512 11473af2a528f2ec6a1435438bd31fa1e83342a2f023035d0518b68295656f7987b1911cd6bc8230ce552a26d94fe0993556515ce2b489079ef39bf1bc0ec331
-EBUILD kitemviews-5.86.0.ebuild 626 BLAKE2B 01f2ccc01bd542cbb946ce833b66a6e1b8593df4f101a67444ecc041180e52ef1f5995f587028af716e7ba00f84f62494939cb1f2c9428135e41b775748a8f04 SHA512 c9ba786e1d833432c44c076df6b54b1c9d4a5cfdfe281f2e19a3e0a4fb4becfe686e43c623b7a66daddbff0ffa98fe324bbe6616121fc0115e61651b503b746a
+EBUILD kitemviews-5.87.0.ebuild 626 BLAKE2B 01f2ccc01bd542cbb946ce833b66a6e1b8593df4f101a67444ecc041180e52ef1f5995f587028af716e7ba00f84f62494939cb1f2c9428135e41b775748a8f04 SHA512 c9ba786e1d833432c44c076df6b54b1c9d4a5cfdfe281f2e19a3e0a4fb4becfe686e43c623b7a66daddbff0ffa98fe324bbe6616121fc0115e61651b503b746a
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kitemviews/kitemviews-5.86.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.87.0.ebuild
index 0285b52bae8f..0285b52bae8f 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.86.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.87.0.ebuild
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 9480f4b45c64..b78d8d6204cc 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kjobwidgets-5.85.0.tar.xz 99076 BLAKE2B 77887b78e37644d3a6cbb7528532385956efe7c152d939f25a8d95e07be004973a2977e251ca67200f341af0c213b7483d1466d541adaadbbd161a2f6c7e50b5 SHA512 d3ee9f74f0aebccea1a939568793d3162d76bd2fc8dd8271d2b9b19836fe1f05bb1eb8fdf4c3456891587b8c6b6e91004d3b18374420aad8af0e9efaac64fae0
-DIST kjobwidgets-5.86.0.tar.xz 99124 BLAKE2B 4fead786e4b2cd9453c53f84f926c46eea574ed5cbb65023d4b4c9f6b9f985dd6802bfd029c92d44cce0a310f275250633c40915f6b415afb8aafe01e43b5a32 SHA512 f3ad703b03f31d7c1965486e5b9c9dd42ebd3e0480ad14d1bd3c2edb6fedb7b0915968ee9c54d3e12cd1f8a03c237a54b86a13874143e6a17a20e81a47bdfc94
+DIST kjobwidgets-5.87.0.tar.xz 99324 BLAKE2B 73aef11304ae6ae3b74482f1bef23ae0d36e0990cb35b2c8007792811c6f5e150a7ca985610fe4767b0a69f9ded55f965c0e3df442d17a92ad1656375279f52d SHA512 3afcd42ec67af416c513a95155d5d53360dbb8a95ff6320d3f61d7062498efb72478d42b667703767a4e5f1ad6aabc819f703d3ba02b543c40b711240813dbcb
 EBUILD kjobwidgets-5.85.0.ebuild 849 BLAKE2B aa4b8b3b5df9f7b6b5184093e57f64659c7be9aad2fa7432c2f358431df8115d1983b0363c77288c4b8fdebd6732838fc167668b5787d180c8ded8b55928ec57 SHA512 1bef4d271a4344dd3138689ca989175f491aa7d1158246dbe212fadd48e0746e23c5eb44ec7c5d434b730f8e9dd9c6f25c707343534b643a2cdf0ef97b3c6f09
-EBUILD kjobwidgets-5.86.0.ebuild 852 BLAKE2B 6df2c4cd45f870fcad8e8403d32bb7dd7be67498159457ffc38ef9f04d9c247a73001c835057a2faa0d1b9c0c7e25ede90b9f0d6c5c3741b9e4333d6f1db42a0 SHA512 72d5432949da3cbaf1d62031802591e8d1ef17ac213d5f46bbee0b475ccdc61a8a646cf201826ceaa4241f46b6c4a54a88daa504dc98fd628e82f1102505fb09
+EBUILD kjobwidgets-5.87.0.ebuild 852 BLAKE2B 6df2c4cd45f870fcad8e8403d32bb7dd7be67498159457ffc38ef9f04d9c247a73001c835057a2faa0d1b9c0c7e25ede90b9f0d6c5c3741b9e4333d6f1db42a0 SHA512 72d5432949da3cbaf1d62031802591e8d1ef17ac213d5f46bbee0b475ccdc61a8a646cf201826ceaa4241f46b6c4a54a88daa504dc98fd628e82f1102505fb09
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.86.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.87.0.ebuild
index 67c1618edbbc..67c1618edbbc 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.86.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.87.0.ebuild
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index a51dece948f2..0635ebf53b10 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,5 +1,5 @@
 DIST kjs-5.85.0.tar.xz 337888 BLAKE2B 1ba61fa79ecc130744ba183fab25b8118bf4f3635f11ec50d73a64c83508941fe23c6eea92f688233d70c784e82bf460a6c4229c8f449076e6c2d12842cd08aa SHA512 80a873d7277efe053587bb9875f0958e26d5ad582a9c12377b187584f76e88f1ba64f4e071fa1329fe42690379a217a9f68d28cfb1a6724b615c01398840f324
-DIST kjs-5.86.0.tar.xz 337908 BLAKE2B 67caed0d53f8581e222346b947ef5a3723c767cb35690684de31c52e7cb96c3469b29bc876ad860fe077ee9ef32876c6408d1f56b3fdef2275a93212b2254de8 SHA512 f5b106b3a03945a6c6c5bb543c80366726412b7cd1919f6b0317ea60aa7521d66814d8d49a20cf3fff2f9f0bf26fdce23c34700ae347674f2d5d1008237798e3
+DIST kjs-5.87.0.tar.xz 338152 BLAKE2B bda9ec7b73970f49279bb6200ec12e167e79d74890f32189bf835b65e39cec27f1aa4c7976353f7ea1049934c90f3d522f6bec206a3ccabc0a073a53920f6be6 SHA512 b62864d05add7512ed867e823e160b2579c152c8d692d6efc64641d85353e95331cc1509711c9edd8580dbdda6f7d6402170bb7295e90d5d9754fbd1dff23eec
 EBUILD kjs-5.85.0.ebuild 406 BLAKE2B be9ea38e0f3d60f119eb7d345272c1794371b6f47c57595e24be13fb145bb7f8a784da3f7d8f12a541bdc0934ec2dce1ba22c46888bfeacbb32179bbf6e2cfea SHA512 5aea577e20e8288af47160dde23c81be38987ff751c169bb2f4e7dc0cc0b5f884c6ca595bc8434bc781f4c861b9cd602a05981044a4a2f875493b782af692739
-EBUILD kjs-5.86.0.ebuild 409 BLAKE2B c619ead54e44ba9e06b83fed6c8137454b110af75df2c4573d507a3a9363cbd14e88b0d11f483875e0a5e0ec88df70daa099deb059fa8eac9c7035cfa2624194 SHA512 3b731097af14f7d0bbf9e1154e0e5a716f55613b3c35aa5a88af1b3eaf7b791f9f8e4a616e49c33ac8e7d0a47c2a43397aa2575ee4eeec17d047f24733311f05
+EBUILD kjs-5.87.0.ebuild 409 BLAKE2B c619ead54e44ba9e06b83fed6c8137454b110af75df2c4573d507a3a9363cbd14e88b0d11f483875e0a5e0ec88df70daa099deb059fa8eac9c7035cfa2624194 SHA512 3b731097af14f7d0bbf9e1154e0e5a716f55613b3c35aa5a88af1b3eaf7b791f9f8e4a616e49c33ac8e7d0a47c2a43397aa2575ee4eeec17d047f24733311f05
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kjs/kjs-5.86.0.ebuild b/kde-frameworks/kjs/kjs-5.87.0.ebuild
index 0fedac96ed3f..0fedac96ed3f 100644
--- a/kde-frameworks/kjs/kjs-5.86.0.ebuild
+++ b/kde-frameworks/kjs/kjs-5.87.0.ebuild
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index b2b33577f3fa..6386d5901915 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,7 +1,5 @@
-AUX knewstuff-5.86.0-fix-crash-in-DownloadWidget.patch 725 BLAKE2B 2395108343b6ead975779ae06c63beab4bf3f88eea3f16f7c50c9baebd639e933550553e7f664ab9a33f01bd4503eabb9ffe663aa436b063120063ea1fc46b08 SHA512 89d18085897197f2a3d1fa7164c2ca2957c75b519bc588c8c4981b934199a6e919ef1e293b80bff18c1e7f188898362d3f41517e5f1a14eaaa78a806f373c3a5
-AUX knewstuff-5.86.0-include-user-agent-on-KNS-requests.patch 2150 BLAKE2B 3da29159a51597d2986568b465a0f04d3c96e32af5a66a7adf8b2a3bf2af027ff0aa1ce0e1537d90232075da00f19beb5bb3a1b6db356917df2345f8eff4b811 SHA512 dd765c485761ec25a18feba10c80762cee76b660e4108d737deb17e96e3b0d9597bdf43fbabc1035ed65c30470ed7bb1afe095b04fd931b2059bfdf3a2afb12f
 DIST knewstuff-5.85.0.tar.xz 1138788 BLAKE2B 6f037ddd3dd7d9499d19b8d10b2486ced1ab169180d69a004369158665eb098015c60fd657e9d84af7b15634a28abd13e761b2728861f3f88c02ac0510121c5c SHA512 2da81b520ecab1d43b79e75ec56cbba410bd0944b13ea53eeee5ca94c77f9c04ad91a35b0c1942516edc5101a365f2a91b774405183bc8bf82c6cd5fb53a0570
-DIST knewstuff-5.86.0.tar.xz 1142536 BLAKE2B 8b1aa8ee9e8dc54f0431f77516d3e39bb4f9ff33f72573fee27b749df692b32c850230a2bc566ee580a56b587af05822a0348cd61d58501c49b507fdf0d164bb SHA512 984291bb68e6bde5d90b35245c101c0feb64338ee4c0656802f4812c3a0619a5291307e8e5e2de99b7a34e29554e2283de6513156e7aac32f0d2198433bb45cc
+DIST knewstuff-5.87.0.tar.xz 1146336 BLAKE2B 1f1beff60c59532e892e9b5f561b6a0848bd55d8c483f8195496fb9ec269c2cd4fc3f22216669b6486d5ae987b5d664bc20ffe8d867e401de7be6a6f228b009f SHA512 6979417e3a8b4b9a1dae0850cb8e333d31c1124f60c67ecc292b0b9372e6c7fcd8d5ae8f59afdcc543379b148f0fc310cfc7a24f8ae8fbf29358de0508ff307b
 EBUILD knewstuff-5.85.0.ebuild 1269 BLAKE2B b1a564a30a07c4b50c2383fc79b216c770cf5f3e51cf979336decd4d5aecd4b6bb8e802484dc681cc49818b1995f930f826c53a33a1b430d30bf12f75689f94f SHA512 01511a2c8cd685a147bce2f43c7887de2f14d500f900f0d11fe3bfcde06390cc9c5ff8955d79da2c0fd6e7dd2af71d484945abaac280a57ce372b54323b08a3e
-EBUILD knewstuff-5.86.0-r2.ebuild 1417 BLAKE2B bdb88b835f530ba6ead02e0e9661fc18985362e52067221f8c87da6b7a8e2e942a9de46c5b727967ff07be02c7f69ec5486cb79133efe7d6b61c24e7791db127 SHA512 5dbc60f5bad5eb2d470e86748b5539ff66d72abdb33946935059d008d8e5dc7c98e6b7e056b8d5560fbda0892418f598b0a92609ca5eb23fe6bfe9df8857f03a
+EBUILD knewstuff-5.87.0.ebuild 1272 BLAKE2B 017a8aef427b4916fd4741cd8719d525514a73550e8db9ef9e5461697f1a277ef8e19daadd15a676060a34f07e07be13846011c6b6ee48a52ba8389a0f1c5799 SHA512 8d3d4e1c3ec22535f8f0feba2ed13b870d8c201faaa910c51318b63132b076380378826ec12638ead82d15050efa1953263bbb3769d999185a18b5089ffd89cb
 MISC metadata.xml 600 BLAKE2B b9dafdddae4fb5f9969ca845f02690b096f81f6b3c1f76fe877f2886697c0636b8a3b4498aa5cbf903f1b6ee14f3de51c10ce88b37a9780f91ce23bd841f5fbe SHA512 5f3710e9d14cb62c66fa6b21f70691f276fb1fe030b3b2eb92f206a55bbc10dd998dd522e478c883c36d7f811d7f163602e3a2af7ff92e6dd79fa28a1fa32b85
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.86.0-fix-crash-in-DownloadWidget.patch b/kde-frameworks/knewstuff/files/knewstuff-5.86.0-fix-crash-in-DownloadWidget.patch
deleted file mode 100644
index dbed97665d57..000000000000
--- a/kde-frameworks/knewstuff/files/knewstuff-5.86.0-fix-crash-in-DownloadWidget.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d09ba1917cb7e035a9aac6c27c86fc4df5da3194 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Mon, 27 Sep 2021 20:05:09 +0200
-Subject: [PATCH] Fix crash in DownloadWidget
-
-BUGS: 443025
----
- src/downloadwidget.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/downloadwidget.cpp b/src/downloadwidget.cpp
-index 40df2e8c..36cfde37 100644
---- a/src/downloadwidget.cpp
-+++ b/src/downloadwidget.cpp
-@@ -97,7 +97,7 @@ Entry::List DownloadWidget::installedEntries()
- }
- 
- DownloadWidgetPrivate::DownloadWidgetPrivate(DownloadWidget *qq)
--    : q(q)
-+    : q(qq)
-     , engine(new KNSCore::Engine)
-     , model(new KNSCore::ItemsModel(engine))
-     , messageTimer(nullptr)
--- 
-GitLab
-
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.86.0-include-user-agent-on-KNS-requests.patch b/kde-frameworks/knewstuff/files/knewstuff-5.86.0-include-user-agent-on-KNS-requests.patch
deleted file mode 100644
index 6252d28f7b93..000000000000
--- a/kde-frameworks/knewstuff/files/knewstuff-5.86.0-include-user-agent-on-KNS-requests.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From f687c5abd0c5e9bd5a6688b6d9d50f2536b7d33d Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Fri, 24 Sep 2021 14:31:05 +0200
-Subject: [PATCH] Include a user agent on KNS requests
-
----
- src/core/jobs/httpworker.cpp | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/src/core/jobs/httpworker.cpp b/src/core/jobs/httpworker.cpp
-index 4c218b08..b81edd2d 100644
---- a/src/core/jobs/httpworker.cpp
-+++ b/src/core/jobs/httpworker.cpp
-@@ -7,7 +7,9 @@
- #include "httpworker.h"
- 
- #include "knewstuffcore_debug.h"
-+#include "knewstuffcore_version.h"
- 
-+#include <QCoreApplication>
- #include <QFile>
- #include <QMutex>
- #include <QMutexLocker>
-@@ -93,6 +95,15 @@ void HTTPWorker::setUrl(const QUrl &url)
-     d->source = url;
- }
- 
-+static void addUserAgent(QNetworkRequest &request)
-+{
-+    QString agentHeader = QStringLiteral("KNewStuff/%1").arg(QLatin1String(KNEWSTUFFCORE_VERSION_STRING));
-+    if (QCoreApplication::instance()) {
-+        agentHeader += QStringLiteral("-%1/%2").arg(QCoreApplication::instance()->applicationName(), QCoreApplication::instance()->applicationVersion());
-+    }
-+    request.setHeader(QNetworkRequest::UserAgentHeader, agentHeader);
-+}
-+
- void HTTPWorker::startRequest()
- {
-     if (d->reply) {
-@@ -101,6 +112,7 @@ void HTTPWorker::startRequest()
-     }
- 
-     QNetworkRequest request(d->source);
-+    addUserAgent(request);
-     d->reply = s_httpWorkerNAM->get(request);
-     connect(d->reply, &QNetworkReply::readyRead, this, &HTTPWorker::handleReadyRead);
-     connect(d->reply, &QNetworkReply::finished, this, &HTTPWorker::handleFinished);
-@@ -144,6 +156,7 @@ void HTTPWorker::handleFinished()
-                                    << d->reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-             d->reply->deleteLater();
-             QNetworkRequest request(d->redirectUrl);
-+            addUserAgent(request);
-             d->reply = s_httpWorkerNAM->get(request);
-             connect(d->reply, &QNetworkReply::readyRead, this, &HTTPWorker::handleReadyRead);
-             connect(d->reply, &QNetworkReply::finished, this, &HTTPWorker::handleFinished);
--- 
-GitLab
-
diff --git a/kde-frameworks/knewstuff/knewstuff-5.86.0-r2.ebuild b/kde-frameworks/knewstuff/knewstuff-5.86.0-r2.ebuild
deleted file mode 100644
index 06de55295853..000000000000
--- a/kde-frameworks/knewstuff/knewstuff-5.86.0-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for downloading and sharing additional application data"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="opds"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/attica-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	opds? ( =kde-frameworks/syndication-${PVCUT}*:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${PVCUT}:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-crash-in-DownloadWidget.patch" # KDE-bug 443025
-	"${FILESDIR}/${P}-include-user-agent-on-KNS-requests.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package opds KF5Syndication)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/knewstuff/knewstuff-5.87.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.87.0.ebuild
new file mode 100644
index 000000000000..67d43e05a700
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.87.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="opds"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/attica-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	opds? ( =kde-frameworks/syndication-${PVCUT}*:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package opds KF5Syndication)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index ecc297f486b9..41ab76663210 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,5 +1,5 @@
 DIST knotifications-5.85.0.tar.xz 124336 BLAKE2B c6f12695b30fa8bb6a183cf7a5a1be515e5e9ceae81c4c3278fce84e25f782eda589795f879c4dc50cd1303cc2b49f99dbb9e0aea3e8f9b1ed70b769cc333b65 SHA512 e95106af6a0dcd7695ca58d0146189925a6581991aaa151a3978686be88b5d6686e370fbe9a5736b824acbf4041316519dfed1c38abc2048bbc1626516ca5670
-DIST knotifications-5.86.0.tar.xz 124380 BLAKE2B 6a46e4bd944cd7765875bedf06156ccf5145ee8dec770ae03fbe26febb29ecfed17194bb32f8d9de7cfc4a0b7bd6ef2e498003ab9467a4336134f6d71536e495 SHA512 7284deaf5167d0ec139fdf4f4bc1466f3eaffd0659c62ccb4980a03eff0184ec18463d1b27836172e9603f3d934a38995188c98eb86116063d10c2ee32ba3e7f
+DIST knotifications-5.87.0.tar.xz 124776 BLAKE2B 0e1640de33adc8f7bef09e106be8f245521ebad391502c06fde69e8537d10558fc95fa4ed40ca4796e0afcb58f93767ca9e4dfb986f709245e5e07a111714c49 SHA512 18735757f8630b51199b4b254ca6c2e49f4afd16909a2edb6ae5e0e3fc3c0d6b972a2e213e5289ee4f6e27d41742b0a063c2051c885c62352e4822664f8ca56d
 EBUILD knotifications-5.85.0.ebuild 1151 BLAKE2B db3c3182a52933d6adf6db347f585af74a4f77eb226ecb729e04d3898350fa2ad6f0f4358ea9fc7def28f0921ae8a85b4a851695f2d013bea18a1ccff197d33a SHA512 669ad165542b0cb71813baec22efbd080a954b26d1283538baa6d7a2ac4952f3a07038dda54eeae09e48267144e1a7f476b3da43ae438c1c57147f6bb7a62cc9
-EBUILD knotifications-5.86.0-r1.ebuild 1158 BLAKE2B 05dd0e48ad415b914cbff5cc7f2ef8598e1b9f16082b0230a6a91fbc2f31c90839c1e7c5a1b649d3b13fbb96fcfe7cd9f0f9ba0ef67fca05dd21a71210654735 SHA512 4ab29adafdcf8062f1633580d59e0b504d8c9e1d9947f0005cb9020d94778c5914645c0be4296cc90c6fb5cfc543e8b9561f43979392d8b1beca8d34f1a4ae60
+EBUILD knotifications-5.87.0.ebuild 1158 BLAKE2B 05dd0e48ad415b914cbff5cc7f2ef8598e1b9f16082b0230a6a91fbc2f31c90839c1e7c5a1b649d3b13fbb96fcfe7cd9f0f9ba0ef67fca05dd21a71210654735 SHA512 4ab29adafdcf8062f1633580d59e0b504d8c9e1d9947f0005cb9020d94778c5914645c0be4296cc90c6fb5cfc543e8b9561f43979392d8b1beca8d34f1a4ae60
 MISC metadata.xml 675 BLAKE2B 1a9f077242a8241183ef9b88f6fa7e8be01fb530f8333323937a92bd3bffe39e5755a37304f944b816a6b8e0edb6ab4f1672cfaff824db39f933b41fd769e56b SHA512 68ff6b663376afd0f1c63a2b48e4aadd6db0bded48f1a98860c538fdc6760438f572244df75090343d4e86d50233a1082f8b596bb3281769d4cd2610e293d48d
diff --git a/kde-frameworks/knotifications/knotifications-5.86.0-r1.ebuild b/kde-frameworks/knotifications/knotifications-5.87.0.ebuild
index 69f412eb830f..69f412eb830f 100644
--- a/kde-frameworks/knotifications/knotifications-5.86.0-r1.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.87.0.ebuild
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index 4eefd9e036b2..763e44c5747b 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,5 +1,5 @@
 DIST knotifyconfig-5.85.0.tar.xz 84852 BLAKE2B e8d8a9580241ec2f57fc32208aac536a0d86f00946a1c2c56fdab1bdc1461a0dd8ec4d4b3df33c68a8c46d30fa4c6c1db1253c7f1595e6fa37795b84cd7e3820 SHA512 0bada9636e8c97e85d1405054dc5def34c25ecc8ce49dade8407de2213830f3802e044a4cc8782ae8bd4c89fdd982624454b6b77c469981b1fbc811b40edb326
-DIST knotifyconfig-5.86.0.tar.xz 84868 BLAKE2B a12935a8126b90b7459714d628af34b4ab1e7eb416b473d5755c684e141d2dadb64c35c0a9927b6688edc0860842ef248ee92de836d8d05f8c474c95d750530e SHA512 30e75cd71826be6abadd69d4df3f264106fb3b144616e417bdda054002187ef5c364041b4d5283463b252143c542965ed44aaee3bee7aece59a59d39599596b5
+DIST knotifyconfig-5.87.0.tar.xz 85088 BLAKE2B 192606f0e608f2d50d70ee4122eb1cac574900eb78f68e480e08643b75a4fcd86dbae6fd530a5a51f279989bf5f3a85fd647bb5f8d00355ec3caa80f788c680f SHA512 5e444c01f1e8eee25781baea1d81b78d9ede46847634aad429067b324397eed170c8bfd8ca274c50aa9da78a6689002b5f4f3f8009c591617e97c59758e3f751
 EBUILD knotifyconfig-5.85.0.ebuild 775 BLAKE2B aa5698cf1662877cdd634427454a9ca4f29510bab6accff556f04638a33688d3c35814b13266fe3f8849f419d45bad40da65f9e2e83e625a4cd145abd583ea68 SHA512 77d4ec732474aab40300a745d3d6a8068e2d3d9057d09094a837d8cde57cf8c10f5efb0e8c682e6b7424d8663f5328842b015be10090efc181000104170b606e
-EBUILD knotifyconfig-5.86.0.ebuild 778 BLAKE2B 61d0b3a5b57d97a290613e87f1c833cd2e5f75877cb05deb792a174a9ae0822f012edc4a41e275b3bf753720ee1569c8f1208a87666524494c0a0ae0be91b128 SHA512 330b55077918c5aee4660abf34410b6800ad26bbbd694e8d53d359f06d64ddb229ff7da35157b1e63b7f108552db7b2f0fdb40306506db32b2901a6742d8b4ab
+EBUILD knotifyconfig-5.87.0.ebuild 778 BLAKE2B 61d0b3a5b57d97a290613e87f1c833cd2e5f75877cb05deb792a174a9ae0822f012edc4a41e275b3bf753720ee1569c8f1208a87666524494c0a0ae0be91b128 SHA512 330b55077918c5aee4660abf34410b6800ad26bbbd694e8d53d359f06d64ddb229ff7da35157b1e63b7f108552db7b2f0fdb40306506db32b2901a6742d8b4ab
 MISC metadata.xml 603 BLAKE2B de97624d3f4f43eeffef1385a40736073d352f17204b1667850dd033193b66f15a32ad7d743ec6c27c0717a315c1372805d800263226308d4f099e580cfc4a5a SHA512 39deeac37b8b1e6533852619ccdd245d2d9cc7c6a36fbb8393412cb161ed0dfb6ab711bdd7fb38ab515fc6c7972659b4faeb2cef11da979d798b0a1f43c8ed29
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.86.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.87.0.ebuild
index 8dd2bf4f3b09..8dd2bf4f3b09 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.86.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.87.0.ebuild
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 58ebbb03749a..8626e4156794 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,5 +1,5 @@
 DIST kpackage-5.85.0.tar.xz 138696 BLAKE2B 4c1122bc24c7914cd0bc8e6f390f637b4ce0d9bce692ae2a245fbc53adb86649c7db683d829427e6e728746ec6a78f8e2178b5d27a9c399f0e6e95a5e3448c67 SHA512 1209088a78e0ff2d3db1cbd8b0e154364febbac2941b064e196fed296b5ed963278fff4db21136dddb4f8d20e990b9d4773ea39edf1ef5a07528987b6fe8cf54
-DIST kpackage-5.86.0.tar.xz 138692 BLAKE2B 17f36388d87071128a10c4bb1821ab36b0026a6659cf161a350d53b2e23741816bdb75bcdd902780a2944499e4a5334e502a9d29c3a909dd8cc7ccde0b308d64 SHA512 f279d261a426329b566614e998544c690a9893ac05ff77190c38136639d0f1636b864cb15c5651a574347b77e097b25c3d680ae582bf6caeca128d57af541065
+DIST kpackage-5.87.0.tar.xz 138924 BLAKE2B 5840196cb973cfc978903286378faf12d1be8523aca0f864aeb484e23390163f43cfd13c6b1370415eb92c72e4cfd765469d2a18fd044735e72cff0febb8a22e SHA512 f06d98060aa99ca92e0d0301eca52ea2c620227e532456be5de6bc5086ae543001adf1d68fd327175cd3ab878de201d95239744f8a465f26e1869a76e44f6140
 EBUILD kpackage-5.85.0.ebuild 762 BLAKE2B a0ef34c96151b098d57eb3074b111629b159153d40ba36b442b24432c3cc702593ba035aa05ea13359ca12ed12c960bb1d98b287211bac0e3ecfd9f8fc9a552c SHA512 eaa84d9aa9e03a53d40088eee6cd840e1de71a92ada281740807d6af5832c38eb68da58194ef6df5ddbc64b108c653a26c28aa035ce071df50990f497cfb2e68
-EBUILD kpackage-5.86.0.ebuild 765 BLAKE2B e4c3ac897784ba4befbfdd507ca6afd231fb2b6db8f00f19c351d295f05d2658ac567e3ae2fe1af1d53b071b2d12e8ff05fe4540022728f6642a2d575627a740 SHA512 ccec4f6705dec454f323594f8640151a647250ac31bc50b25764c395e0bd78e7d9e3ce41acfd1d44746f24d101b7e660d34bb8aa172b4c32ef846bb8fb980a8a
+EBUILD kpackage-5.87.0.ebuild 765 BLAKE2B e4c3ac897784ba4befbfdd507ca6afd231fb2b6db8f00f19c351d295f05d2658ac567e3ae2fe1af1d53b071b2d12e8ff05fe4540022728f6642a2d575627a740 SHA512 ccec4f6705dec454f323594f8640151a647250ac31bc50b25764c395e0bd78e7d9e3ce41acfd1d44746f24d101b7e660d34bb8aa172b4c32ef846bb8fb980a8a
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kpackage/kpackage-5.86.0.ebuild b/kde-frameworks/kpackage/kpackage-5.87.0.ebuild
index f49451a2fa7a..f49451a2fa7a 100644
--- a/kde-frameworks/kpackage/kpackage-5.86.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.87.0.ebuild
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 0aa3e491052c..621bafe6377e 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,5 +1,5 @@
 DIST kparts-5.85.0.tar.xz 192484 BLAKE2B 7a5bd8d306ba3fc12640996fbdd7493347ba4d1b8fa74588e96b985c788803c6c18445ced757a5d07186cca1f2da807033bedf673926b870471b7e695dfe490d SHA512 d255cff86a434a886c1466c9b84a9818f0e93c49c17af9351b324c89f7f2f807686718fcd50cd70bbfba0f8af8af01e5af9d60f3c361b0a196e48d591711444d
-DIST kparts-5.86.0.tar.xz 192560 BLAKE2B 373a660a2982ee688e5574908420d306f9dc0aa8ec2edb121b8a30e25105097a5672fcd17c7e9b93e137fc4fbd8b56e2d4015b368d14b692ef37a1f5405e756e SHA512 603df5bb1b6985399c72f6939a8c18c04948a8f6bf965ad7610312bdd4798f0c07ef04bb8a02bf2c1b7f90f1c7c6c4f4edb2d6fbaad8f7d39a5c39403d80399e
+DIST kparts-5.87.0.tar.xz 193728 BLAKE2B 23bcaaca0343f48933ae1f157149026d9f3f00c7b4e19e98d2f2a0eb279a3d8cd54f9486713e90fb5e23cad474ac848c9c576775df5c0989aa2e6ca27d9f80d1 SHA512 d4581aec298b5a375ac4f0e6c5075b530f09f4bb92f111b30b59a46d9a0cc6ae3171912d00e35a06778b9e52c5bd6b4bc7b2400bc738b6a18834a0cea43ec036
 EBUILD kparts-5.85.0.ebuild 844 BLAKE2B 3ceb01afa2cb262e4b35710a6c1d175e2c759fe04cca13cf439a6cb080cbe4cc5c28ca92393f51548013e0357bd2a404c434aabf8106f4d5ce3df26d7e2e6351 SHA512 d414d2c17366817e6d3db7a22d2e362a4e8b4b7a352a8c9319d6364a7bfc0dfdbea461057ea486eca203b135d536637fd6608d9111c57b10e18cb26f7bb0f143
-EBUILD kparts-5.86.0.ebuild 847 BLAKE2B a13cb699aa530975e27a0018a3ead2077fadc692603666bca423dba4a7bbac24d8b4596b4632c31410eee67bcaf60e784a1c35a57ece428660af0695bfcb339c SHA512 c8fb86a39cca29ed612a13e60cfb125ac34b23f54dc6c8bcc265170d24a8a8f6af8bb2e5037246c17bcf60e5e1524f58b7c0bcfd3084989dc51f9e488dd64485
+EBUILD kparts-5.87.0.ebuild 847 BLAKE2B a13cb699aa530975e27a0018a3ead2077fadc692603666bca423dba4a7bbac24d8b4596b4632c31410eee67bcaf60e784a1c35a57ece428660af0695bfcb339c SHA512 c8fb86a39cca29ed612a13e60cfb125ac34b23f54dc6c8bcc265170d24a8a8f6af8bb2e5037246c17bcf60e5e1524f58b7c0bcfd3084989dc51f9e488dd64485
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kparts/kparts-5.86.0.ebuild b/kde-frameworks/kparts/kparts-5.87.0.ebuild
index 9d4cb3eb5ee9..9d4cb3eb5ee9 100644
--- a/kde-frameworks/kparts/kparts-5.86.0.ebuild
+++ b/kde-frameworks/kparts/kparts-5.87.0.ebuild
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 11c026253b62..d516a69efa94 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,5 +1,5 @@
 DIST kpeople-5.85.0.tar.xz 56732 BLAKE2B 2fd14a33ab2ea49234caeded7807f0d1efd642ab1003b0231c3389158a5b4365c1b2d0e994ea8bfe05663927e5225c27d168e6bfe06fb03fd10582a0361c848d SHA512 f93242008625fd3aec28e113d34ae7d3bfb919cbc0ffa897d12a3b782bf713803202cb21f81e6b66f7c49c80199be57f47e659d04587c63eac770629bfe88cdc
-DIST kpeople-5.86.0.tar.xz 56752 BLAKE2B 9f154dd2b5470cfc175d850bd3a8513d0841ec3c07bfb2d38b0796596de0bc73013c63235979190080e00cf7ddb483c5d9b268e108c86cf14df3d402fd197e30 SHA512 4040ce29e6054615fc4ae3e02533fe69450c08717f0beb375d5af71563c275e1666071a8a92cf99128eaef3ec2a87194432ff0e53c29353fc4c934b23aa63be8
+DIST kpeople-5.87.0.tar.xz 57008 BLAKE2B 9f76969c30cfa718086a68f38614b01962364ffee84bc2cfe80d0aa1a60ff925bcce1efbc44ceb043c606751e967b49fcea4e1de947fc02df65390fc14f96bbc SHA512 1c82775498a4895c7755a7cd44856ecb4a3c7858408390f8ef059dcddfbb0a738c445f7a5ae9342d0795b77814700e2ec7a9640e54b4bdaaa8803e79d5e27d5b
 EBUILD kpeople-5.85.0.ebuild 877 BLAKE2B de3390735fe91832759659d165ed667a6d8359473511c41d2d53414c1d6f6995c31d535e4e19acc6b32018834351f848eeff612dd2a151adb446705a1bdf3a70 SHA512 394d448692fee3712d61653afcedf91df98ad7906429007055bcf41e79cbfd3f17e8016ccba541a754a1b216276d3fec6fe61df40ab2cdbbbb09676b552d8794
-EBUILD kpeople-5.86.0.ebuild 880 BLAKE2B 397595c04c7236088a1bf368b7bbdf4b811f8d12684514a4aaaa20bdc545b238734100e768464cbe44af756421fd927646a83a95592a87991168f1ff58c9fbfa SHA512 df279374d31a83ad316f18b7a0618860a539625fe5d175c646b4e8d3f7c7318699fd3695b92639c26b16638ec00060378f5b2577cebcd53d73350af64a0d3503
+EBUILD kpeople-5.87.0.ebuild 880 BLAKE2B 397595c04c7236088a1bf368b7bbdf4b811f8d12684514a4aaaa20bdc545b238734100e768464cbe44af756421fd927646a83a95592a87991168f1ff58c9fbfa SHA512 df279374d31a83ad316f18b7a0618860a539625fe5d175c646b4e8d3f7c7318699fd3695b92639c26b16638ec00060378f5b2577cebcd53d73350af64a0d3503
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kpeople/kpeople-5.86.0.ebuild b/kde-frameworks/kpeople/kpeople-5.87.0.ebuild
index 8fb8ba0fc8fd..8fb8ba0fc8fd 100644
--- a/kde-frameworks/kpeople/kpeople-5.86.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.87.0.ebuild
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 291c67de86d4..36376da01e7f 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,5 +1,5 @@
 DIST kplotting-5.85.0.tar.xz 31192 BLAKE2B 3b9edc82cef6cc76a514f9b91589f8d8690b3e9a4f373a12e0bbd027a072fca6651c84dc4eeebf968b646d8b30c558d97c05938ec0bfa9a95ca59f334f69ca16 SHA512 ee36730cbde0461e72ebf012f88fff0b57605eb3fbdb16dde3921f044f074f834038f79ec45d2c7b5b12b9ca3c69dc08a1db28fb17624e9d020b58f7739d266e
-DIST kplotting-5.86.0.tar.xz 31172 BLAKE2B 0f9f2a2b8323aa494071effced5466369c4a04505413506b85702c8db73a49b9009981386f3adefb16b9ac4587f1fbf2624f460f55cc1a617ab3aa5186b98682 SHA512 d7320729c7d5c6991c278f8d1d713a544978b907daf07beffc800e29e6e271ed48c6612bb9a6fecf51ae86e3f52d7ec27906a282e406f1fedea3f572caca42a1
+DIST kplotting-5.87.0.tar.xz 31428 BLAKE2B ea07ac05a8d8b0d60a5c21c7d5d6caf9603cb1d55bb0d4d77e4ad9459b9ef9b760705a7cc2d698a42b3f921a4a664a2ba925d6b2aa177bbeb5afd2994653856b SHA512 d9950ebee6a43850a136a4ded508a1f20c7b51281027e4abd128007b1281520eacf9f6e3591222d20e4d28342c7b35cda4efc9ea1cb92a113c0d056b0b9fa7c3
 EBUILD kplotting-5.85.0.ebuild 437 BLAKE2B 145451949f947ae44e2a6351c8724fabe8989e4637436b2a03d1873f230c923d5dc8b0c59417f15340b4dd1aed2b9579e4ee8d22f829a1c058fdde780d6a41de SHA512 8b1e728991f45b7ff1cc6a7df4a5201cd0e98b7f3fe3361bd43f6b51da57d28c076f9e970d4070482039be0d0092919b237d4b3399dae3438ea443304e7b35d6
-EBUILD kplotting-5.86.0.ebuild 447 BLAKE2B 49fc408b47c9883a56185327de87215e01689b5054479eabd46e03f3ca443002f4a3285ed0e553e463456b544565f1acedd0542d10f0c4b10cd5ef95ccfa6707 SHA512 bd7089073d4b4524c6d10c3fdcedb03003df3b54aff4dd00c62af4cdddffaa6be6e79f7a35175361742a682874734d2125c3f0fafd247360622323a71a0e02d7
+EBUILD kplotting-5.87.0.ebuild 447 BLAKE2B 49fc408b47c9883a56185327de87215e01689b5054479eabd46e03f3ca443002f4a3285ed0e553e463456b544565f1acedd0542d10f0c4b10cd5ef95ccfa6707 SHA512 bd7089073d4b4524c6d10c3fdcedb03003df3b54aff4dd00c62af4cdddffaa6be6e79f7a35175361742a682874734d2125c3f0fafd247360622323a71a0e02d7
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kplotting/kplotting-5.86.0.ebuild b/kde-frameworks/kplotting/kplotting-5.87.0.ebuild
index a1242ec38f8a..a1242ec38f8a 100644
--- a/kde-frameworks/kplotting/kplotting-5.86.0.ebuild
+++ b/kde-frameworks/kplotting/kplotting-5.87.0.ebuild
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index 2bbeb36dbe26..e94d5997813d 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,5 +1,5 @@
 DIST kpty-5.85.0.tar.xz 56272 BLAKE2B 1fdf346b40b9200622670c58b7480ad01fdbde5b58f543f61e68fa291d0d76008213904a4118ba43d55c716593aa901e0bd7d9cb4a8c2e76308036c89d08ad7a SHA512 51d00091f23b5cf1d397d3055283a945803372e8b3c7f99cd18be0c23376d62156e9135488fd6788752233b3aeee827a5f9ecdeef838308f0289bdbc632d61c2
-DIST kpty-5.86.0.tar.xz 56312 BLAKE2B 1590d252a0b3a7aa3456d882f140b722b6303e9af50aeebc7fc632725c4e057804a069b6e60fdc1360eb8a23539f7aa661c20169babb8979d6e1724e6e271c2a SHA512 ecc57ce123fdc1cfb2595e1d9490b3d080006893d96e31d1710b5d4828cc4d2f7fb0c038e4edf939c3fbac88299955dde6f1a0e7a5c574b930547aac85f861bc
+DIST kpty-5.87.0.tar.xz 56472 BLAKE2B dd82653947edcde59fae1c8e24d120903586157fcd9877dcb0eea254ea65325f9092bcc5bcb3404d91f2784e20f9dc2b395ed60f6e2388e6f20a533dab910343 SHA512 acaa2f7bb2badbfb4559e79056625f9bbee2a6f7ae9efac61c5de60115a33a0d7af9d6cd9d89137a8d838e0efc9baceee6ee8d6adb22c615e6661a3adf987d72
 EBUILD kpty-5.85.0.ebuild 557 BLAKE2B 3e3ea742d864b9b00ed57bd391d6663d42df31997803772cd66f942308f9e41eefa7d3e0057493e0f8cdee78300acb2e4eb74a94eb31440c9bbcd3c279367847 SHA512 5abd40ed4d53bb800ddb2bed443dbe623e23de68d882c0c12f85eba6222a5a1fd0812f2f864b023fae4a2d56a1fc4f3b98898a2bfa795613a23a3d3ad0917c8b
-EBUILD kpty-5.86.0.ebuild 560 BLAKE2B cde3a1b4d9631c21605ff2e40e71b9bfd45211673b014e716a02f853d1b90dcb9c40293e5cefa88b9de71ea69f2aab6f072ec1205487cee7f1b110cd5e88d3d4 SHA512 24a721c5e8406dabf6aa1cfef1cac7468db8b057ecbba5e611e672b210423897c1d61c16fe01fc602d44e5497f5303c6b98afd3f7e7964f5ef82e04ddc0c0fa2
+EBUILD kpty-5.87.0.ebuild 560 BLAKE2B cde3a1b4d9631c21605ff2e40e71b9bfd45211673b014e716a02f853d1b90dcb9c40293e5cefa88b9de71ea69f2aab6f072ec1205487cee7f1b110cd5e88d3d4 SHA512 24a721c5e8406dabf6aa1cfef1cac7468db8b057ecbba5e611e672b210423897c1d61c16fe01fc602d44e5497f5303c6b98afd3f7e7964f5ef82e04ddc0c0fa2
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kpty/kpty-5.86.0.ebuild b/kde-frameworks/kpty/kpty-5.87.0.ebuild
index 124c8900dcae..124c8900dcae 100644
--- a/kde-frameworks/kpty/kpty-5.86.0.ebuild
+++ b/kde-frameworks/kpty/kpty-5.87.0.ebuild
diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest
index a42c0ee8d775..001b0c19f2b2 100644
--- a/kde-frameworks/kquickcharts/Manifest
+++ b/kde-frameworks/kquickcharts/Manifest
@@ -1,5 +1,5 @@
 DIST kquickcharts-5.85.0.tar.xz 105940 BLAKE2B a7b3b4b16602ab030102310e8a94ad3ea64d5e9fa3db60e12ddd947a9c2385976ad80755608896cc22c2fd3c884a3ec8b1969f95002b2c1313d64ed688cafce7 SHA512 ea5e7187a15e715d8e6359cfb08696030243c190fd70ccbf60e82ded22a24170dfe3eac3963ccc44782c5fc7beee6e398435d08fe1b5bc19c26386fa83645f30
-DIST kquickcharts-5.86.0.tar.xz 108384 BLAKE2B 8149800011242d32438f38db5140db909b8f6d0a261de3ac1163f923d184073a8e92f2594f03d390bfa79425cfbb89ceca3b40f38febe07e78a1a9e53b05e17f SHA512 a64a446b5c1c8e66ffd4a5ee0519e6ef373636d2232b486ea27402359a027f886544690f017457c77f08ca02e9d9ee8a47ee302e08b47a36bbe0717647247957
+DIST kquickcharts-5.87.0.tar.xz 108352 BLAKE2B 0e0441285943acca5605cd06f9ac083b4f9b4fab7f92b1474f07fc2368d3952ac757f8f87265528a1ecfa42231cff682923c9e09d934ab084e37c2dac75adb58 SHA512 89c71182351f0922c68b385afabe24372b26078556f361a94015106f59d5711f77da6d292a83fb8b638ba13ee1742641bf6f103c84e08d7b1b5788f1c07de1b5
 EBUILD kquickcharts-5.85.0.ebuild 805 BLAKE2B 179c580fab1b1d548e6a4d439bbd28a5244faa5b532a1ef682b7c0dc13faa90aa2912a26ed813b2aed4b6b6c7583b3ab426d2a4c9e4b7aa1905b7b12ebb9130c SHA512 ff0fa87d4cdab1cec009a50f0e5449be7c2c0e869759d3241eef2e1c0fc0b390985dcc39a5fd0ee1a359b3545430b2dcf55076ba786cc823485665043f73b963
-EBUILD kquickcharts-5.86.0.ebuild 808 BLAKE2B eed5215550e898153984a35c3ee673e3405f10456c931e016b386dc9e110532f63dd47e95ca27bbdd348a48c9300e0d3160639fe8d7790abc5ae99ee246bcadc SHA512 18502fb0c53ff30b58cc2b9e739e975386eab8d0e78ba8a098caf2ef04e548e0ad8eb6fbeb4ba1b12e1c9917e9863a352be48eea078f046a0edf85f601132e95
+EBUILD kquickcharts-5.87.0.ebuild 808 BLAKE2B eed5215550e898153984a35c3ee673e3405f10456c931e016b386dc9e110532f63dd47e95ca27bbdd348a48c9300e0d3160639fe8d7790abc5ae99ee246bcadc SHA512 18502fb0c53ff30b58cc2b9e739e975386eab8d0e78ba8a098caf2ef04e548e0ad8eb6fbeb4ba1b12e1c9917e9863a352be48eea078f046a0edf85f601132e95
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.86.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.87.0.ebuild
index d4f10a50a5bf..d4f10a50a5bf 100644
--- a/kde-frameworks/kquickcharts/kquickcharts-5.86.0.ebuild
+++ b/kde-frameworks/kquickcharts/kquickcharts-5.87.0.ebuild
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index 92ea3a52fbc5..817dc397d98a 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,5 +1,5 @@
 DIST kross-5.85.0.tar.xz 128932 BLAKE2B 21029db192b6ce4432d28fbb3acd9d5411b33183b45f131e8dc4fc6db7cf19d09aa5e4deb6784d61b0c32256a0acabee0f599bb13a3f46c2de3614de8fbef71d SHA512 35d459e60edfe43df7064ba64c719dc0acb37b8cb75dfeb61d75a505e0791e90e23e3558944d94d146e521593c510e3d59fde4fd5c7197151f8e05aa1c79c0cf
-DIST kross-5.86.0.tar.xz 128888 BLAKE2B b1147541af834a82c622218940871a48c18951f14f3cbf3e2665a9e8c9cfb309ecc70968a723274a401b9b522cc4f629941604bff18044b85352eeb7e087b9e6 SHA512 cd634dfb9e09956a230dbf628e07669b7aa5c7052daf38321cfeffeb50942a1c13e596ec01aed601f51750828185bcb145040f7fc99f8f0d0c9a8695226f442e
+DIST kross-5.87.0.tar.xz 129252 BLAKE2B aed638d062bf7a7b891672e6e853cbc61aab0f6d6dcd386968ad159385d1ff5bc20c1b90fe8f957a2d3fa88a23651e41bb59158dd7db59dc4d4c9cb4730194cc SHA512 268b9b13780d0d9cf21448c7e0486f85280a21e1acb54acce880ec4548732e79dda9f4e8f8fc99dc721ff4af89c6445884cea09ab6a83f0c5a90fdce563c0361
 EBUILD kross-5.85.0.ebuild 866 BLAKE2B 94bcb7bb4f412ed71724f7ced48f4f4cd0721d57f0fe39f38f7c8fcd345c7d472e0fd6c993f70eb00a9126f2e7a55144ce7b3155b6c1b2046212214ccf7d9e6e SHA512 d861e50c3102515f8e263999177f0fa97c18fa0089327ded28ad2414569be3e85d0b42843dfa2c79be36c5336d3533a6c7e0c9251f05d107779d77cca26bd84d
-EBUILD kross-5.86.0.ebuild 869 BLAKE2B c6bb4dc56480ecfdc5418165b0fcad5375c690d715b2256b5f1cf34392b19ede26583ef8ea4a5f1069041ec083c42c3454d3866b0a4482926ba9e3d150a34961 SHA512 541598d05d130e74390d0f99cbd1e30f8519e5fb1a2f509fc0048eca5c5455a8fc82835d7a2a8ab65b1b57648843bcc25c34038a3d694a0183ec8e5f2f9cea79
+EBUILD kross-5.87.0.ebuild 869 BLAKE2B c6bb4dc56480ecfdc5418165b0fcad5375c690d715b2256b5f1cf34392b19ede26583ef8ea4a5f1069041ec083c42c3454d3866b0a4482926ba9e3d150a34961 SHA512 541598d05d130e74390d0f99cbd1e30f8519e5fb1a2f509fc0048eca5c5455a8fc82835d7a2a8ab65b1b57648843bcc25c34038a3d694a0183ec8e5f2f9cea79
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kross/kross-5.86.0.ebuild b/kde-frameworks/kross/kross-5.87.0.ebuild
index 30bb4ec0d0a5..30bb4ec0d0a5 100644
--- a/kde-frameworks/kross/kross-5.86.0.ebuild
+++ b/kde-frameworks/kross/kross-5.87.0.ebuild
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 55355be828ca..68e935945603 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,5 +1,5 @@
 DIST krunner-5.85.0.tar.xz 76940 BLAKE2B 889577cd2b889a7e1aaf8b6b7070c74480e0e17ab81a09fce4b5e4bf5624acc3b86c327fb7293474d18dfa0e369ee174a27432ee2ae2df1a6f08d99297ef5d1e SHA512 6af8f5a3208acb571346b487b2233ed5294f6358a1a3bf5dfb4f3a5a247da9c83b67a0a0942561682009e49d92d00d2b9d8181ce1e40ea312aeaac0bde727831
-DIST krunner-5.86.0.tar.xz 78656 BLAKE2B 62afe5f1762930a423e08cb9e82fd3810cd3b9d7fc8e28a41f847dbd0ed6d09f9ad8f43bd7aea9000889528db91e6a8c90e2f2fa1417d881fcc1f9c7db6ded6f SHA512 38b8b57fc3ee0c0b45719904996d2de7ec3cd5684e73c45a23b9abdffbb446d8cc74ead4f9ec9354400e5ac372d62029ec88aa7a35056bb666aff5cde0ccb16e
+DIST krunner-5.87.0.tar.xz 83460 BLAKE2B 57f00fa09c332e2a9c6e96f124f80b29d0fc2fc9ce14dfdcb701cf6644d44417c53760b5aafa234535fee2ba70c35a7fb23e74411a83e948302330c970719850 SHA512 6ed7b8e3fc6be6ed9f426aca385cf46f060c74acce09eda91279fc401c4626822cdccd310ca1c6514138e9735618d6b665963b46870978a6dbd2ecb4b1f4efcf
 EBUILD krunner-5.85.0.ebuild 1154 BLAKE2B 373299382d59a1a0b02e6bed469eb5b92c8a02e7b3f0fd2cd308ff80986c0225d3848ca5f65ff54cb2da86b3590c18e67e1441b8bd2573363598cc306bf597ea SHA512 11e76c4ebba416d6743259beffd280ae6845f7ee410af0dfdb826d9236c6005b4a2993905d5ef28f232a1cb95a74b3c5f1e25ee53393158952cdd100e8b7e05e
-EBUILD krunner-5.86.0.ebuild 1157 BLAKE2B e522e4b73e2ac329e22c371b11498791de3429678e9200e858795c6c01bdaf4d67e0b7b8d2f396a91131e9c2a16511ba9bad79c473e00d930df36cdbe0aa8ea7 SHA512 0dfc4cc2fa339309bd94b57967195fca575ceea64e06be7d7b790afbde1a7cd3f51403a795c525533e6a245342d9f9d771312fbcf277a5f81c9a182317bda2b9
+EBUILD krunner-5.87.0.ebuild 1157 BLAKE2B e522e4b73e2ac329e22c371b11498791de3429678e9200e858795c6c01bdaf4d67e0b7b8d2f396a91131e9c2a16511ba9bad79c473e00d930df36cdbe0aa8ea7 SHA512 0dfc4cc2fa339309bd94b57967195fca575ceea64e06be7d7b790afbde1a7cd3f51403a795c525533e6a245342d9f9d771312fbcf277a5f81c9a182317bda2b9
 MISC metadata.xml 552 BLAKE2B 6fc263110547ce6552754eceb08fa408b798642c8525e975ef326a154776129839872f1f66d72b499070b18af12f0dd5a84a8dc06287648c5fd00602c1a72ab1 SHA512 ab8b303f3c07000e126031e092019f3226cf59b191c221e1de39ce32bf44fede7918516be74bafda1886154026d1504c0ad3652b8ae9efe65831f09fbe8d52a8
diff --git a/kde-frameworks/krunner/krunner-5.86.0.ebuild b/kde-frameworks/krunner/krunner-5.87.0.ebuild
index 802ba9fe2c47..802ba9fe2c47 100644
--- a/kde-frameworks/krunner/krunner-5.86.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.87.0.ebuild
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 1f3771c11d2d..be8ce4f192b7 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,5 +1,5 @@
 DIST kservice-5.85.0.tar.xz 263292 BLAKE2B 8f71484ce4f454a368491c7ed8f0624b49cf7059f8b74ec90efe368933ebefb73691764109a98e045f68684e85a35f1c4b50d1c07ef5b09463e2f4fa0710b0d9 SHA512 b6aa99578f676aa00527e91d09eaec48eda7e71b975015fc433842fa8f973198828172d9c63f9d72fd3a17b0c72e3f34a7f01657cdba796fbc1ddcd730b41010
-DIST kservice-5.86.0.tar.xz 263916 BLAKE2B c9d2f5fa85b868e936eb9eaf970a4e3c1dbeb0b5e7f4f14400adba787e2e67b3c7836427633bae5ca38dbd9df4575335811e856b43fb6fc8cf2c05658388a0c0 SHA512 2721662cb354c6e050044f09a4108ff1b85e2ac17ec789060e6dfb40cf3fd8262df3a6a89e084ab86dd4b34cc6432def9a47ff683dd2174120f5de7859fbb770
+DIST kservice-5.87.0.tar.xz 264516 BLAKE2B 54082b25927795add1ae361f155c8b96a34252f731d25fd2fcb9d34fc7fa94f295c4ac01720395d31514cd348930ccfa006e09f492c1c60776f83a5b647cf166 SHA512 ffd9eafa04cc6ba8acf61d190f7ec493d16a30c6eccae15806681fa52a37ff885b2ee3aefa567fb8c7cb1dfa65f1b9656b51fba6a33791950dcfa6c5f2447df2
 EBUILD kservice-5.85.0.ebuild 1049 BLAKE2B 0059c8988585c1c16fca19bc4e8d2e1877b68d03b7f5a99677e0c4c5c1c9fd6f0f3614157f572126c6ad42390902e3d2f4962e4bc009a94b23fdde2fa8ea6a3a SHA512 33bc61bd5263f8fb331ee9800c6f468c1f793af3c231a65994f5e0acbe902adce41cf0a3881ade22ce0d797f9bc004c9a1d9cf4cbec43ec253ee2c63a275f047
-EBUILD kservice-5.86.0.ebuild 1016 BLAKE2B 764e1e5f3ccb5da95168a4dfdc73724e0f5502f86150328b59efe1b7a9a3bcacdfe0b9412ba2ef3876cb095a0ebc6388eca2ffead80ab788e223db9d9a1d804d SHA512 519002422179174830ff452deef715cc6555758380c3275c1465fa005c8e1375b90fd3a9f43e101bb9d4feffabfdbfe468ddb92e62df03cb9c1cd02fb6a058b6
+EBUILD kservice-5.87.0.ebuild 1016 BLAKE2B 764e1e5f3ccb5da95168a4dfdc73724e0f5502f86150328b59efe1b7a9a3bcacdfe0b9412ba2ef3876cb095a0ebc6388eca2ffead80ab788e223db9d9a1d804d SHA512 519002422179174830ff452deef715cc6555758380c3275c1465fa005c8e1375b90fd3a9f43e101bb9d4feffabfdbfe468ddb92e62df03cb9c1cd02fb6a058b6
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kservice/kservice-5.86.0.ebuild b/kde-frameworks/kservice/kservice-5.87.0.ebuild
index 5600016e6e23..5600016e6e23 100644
--- a/kde-frameworks/kservice/kservice-5.86.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.87.0.ebuild
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index a018d8198fa2..ea563d9a05d7 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,5 +1,5 @@
 DIST ktexteditor-5.85.0.tar.xz 2327328 BLAKE2B 528f0888a09453613f76ab3209090d8a8a3647e71617fca280adb5e828b4ba138a4f30361e60fa8bb96316edf543f49a62a31e14328410bf4d8771012f9b3b8b SHA512 90219189043fc04920a4462f67d5cd9ebab8ab720801e29c5d4ae4d7746413d7776f37204486245e21e1da47605d6ecef269acb48dfc1431255335fec6e0e8ea
-DIST ktexteditor-5.86.0.tar.xz 2335224 BLAKE2B 16316ad6b99ff9a892cb93a8925bb48d45ee305b78b029b00455fe3a9640a11855093c6e51ddd9d2eb7f0a29118d7d9f8afa59d3d9ee1f089c44ff20393468f2 SHA512 28f4577d90061828b3d678f5291099652586d6852aeb55d3722fc57532f4f40a5557f64c5d890c8d7850282f3994f064fbc04bb223f3be7d28e934a3401989f0
+DIST ktexteditor-5.87.0.tar.xz 2336240 BLAKE2B 6f1ad10c33001c045335634b0ddc752e4156e6a0c2a82d05c1c0851cfa09142aae76aedf868d5806e7a3cb6fd283cd29673a4b19509e1c5092395cfd116412bf SHA512 43f697f3997258aad5dd541f21c05be77b5bfd290fa8b032d6007ffab38a05bb771fd989e0496dd8e528d8e1d074a5820c1f082deef414df7900c993633b4e7b
 EBUILD ktexteditor-5.85.0.ebuild 1594 BLAKE2B a958c28cbeb2c263e1eafc81800a0ae6b99435e5c0a9c10671290b752edcc90041a9cd68d9c132308ab8cababad7555772c9f4de874ad8c650faa955a0042ef3 SHA512 22aff673367f956c2ad0b00750e1afdca7296b429b4bde65551bfa5529ae4252e4bd731ab2b91d051777adfd974828e90685377ed3e04fd2f0df840ffd6119f9
-EBUILD ktexteditor-5.86.0.ebuild 1597 BLAKE2B 6fe3fa031d19a5ad5c53cfbf86bf2ef5f18a4e0e76862a49bbb131a7eeaa88ff7f91ceab839e25dcde654c8fdc04884f03cf6cbc655375853a8a482def04de02 SHA512 25963a6a16bc09b031be6b94ac1d51e66b4bf732477466baad7d03b1dab27629a826521fbbe69498fa002adef97ef96ccc0254a349262562b8ebc2512ff0a9eb
+EBUILD ktexteditor-5.87.0.ebuild 1597 BLAKE2B 6fe3fa031d19a5ad5c53cfbf86bf2ef5f18a4e0e76862a49bbb131a7eeaa88ff7f91ceab839e25dcde654c8fdc04884f03cf6cbc655375853a8a482def04de02 SHA512 25963a6a16bc09b031be6b94ac1d51e66b4bf732477466baad7d03b1dab27629a826521fbbe69498fa002adef97ef96ccc0254a349262562b8ebc2512ff0a9eb
 MISC metadata.xml 558 BLAKE2B 4f17698120e7bb1f131519e4a43f33e99916d3690a548412572a43cc060a115eeed44d0ca0cab43f7c3fea8c098f4c495ce571ea1cb6ce78a25e7ef0fb49f1e5 SHA512 441d42f0f301c60e77f90d40cf57f76addaf455225a99e63ea95ed3b7a08d944fe80260c7188a989d830277006da96f271fb6a02bad41ead3bea7358621ae04a
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.86.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.87.0.ebuild
index 8dd4b006a85a..8dd4b006a85a 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.86.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.87.0.ebuild
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 8fd877044031..c0a5878d7df2 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST ktextwidgets-5.85.0.tar.xz 326548 BLAKE2B 23a584eec7a0a8d2ac713a824d64df98b80c39c809e17b366c78f5a2eca2e8e3010dad3fbcf49956f463ea7a554d918e6995678511f16de655ae8358ef19eaaa SHA512 c17b5fcebd03ee1852f461c406cfe0894264a8b9aaf7f86a6ad6b90a7c764222f511ec58db29765fa74dc82c8b9fa518d7613ed39e5eb837e62db3be17390737
-DIST ktextwidgets-5.86.0.tar.xz 326588 BLAKE2B d5129883e04b3464c3b8893d4f86f2ae9566a9d9d7ee99919f9cba1475761fba2821e77f9c0dccd87bd32660ffe9ece4d9a2dfeb7c3de81af8660023444d6d7f SHA512 cb443f2053bd5e7a829cc7c9517c3366496f1da09f4c1a2c97f611ab169aaada44b56bdb3df90e7c01f4f4035ff057642c66f0e89e9b8c94ab2983d9341e9503
+DIST ktextwidgets-5.87.0.tar.xz 326976 BLAKE2B 045004be766cb1eec27bf23b47441338315fb18da16194bdb82bd9496d525126594d57e07ddee3c90bfa73126fb06f2e73ec100bc80a2238e459027254a088d3 SHA512 4fb0000eb89a2a352d9fd88c3f1c9a33b1a32c420fa3fac43c2fd7b63949c899986b8ac325acb51acfe7f9cdc03280819bd66cdf578268db575fd127389a0aa6
 EBUILD ktextwidgets-5.85.0.ebuild 962 BLAKE2B acde48c4d7cd42031916c1c87ab61898f21e9b62ff2688a4e2810b6aa47ef9eb406731552e9a2222de5dd9347eca9ed624f2eeb0d0722afc84d0ca804c0b5160 SHA512 5c5628d1d0e2171d964585ec5654f38bbf68892edbc564c5fed68d438f3e6ce3d14231bdac5db48ff3821e0a41d633ef40ecedcf0341446338892c6f0b40c229
-EBUILD ktextwidgets-5.86.0.ebuild 965 BLAKE2B e26967da109dbb6e1c0a60a5c209a3bc868f3c60378294e3a607e5984ab15858e0446df75f22281c629512e61938811565e21aa72cbc60ac53c62f38782c015d SHA512 670dbfe51d0b68bef9f39052667d626fe82a2d25e05fa7378e2c120d11279d5374329f40258ac7e278e0efa5ad4d038bd32734244568cdca73f929dc1a857a4b
+EBUILD ktextwidgets-5.87.0.ebuild 965 BLAKE2B e26967da109dbb6e1c0a60a5c209a3bc868f3c60378294e3a607e5984ab15858e0446df75f22281c629512e61938811565e21aa72cbc60ac53c62f38782c015d SHA512 670dbfe51d0b68bef9f39052667d626fe82a2d25e05fa7378e2c120d11279d5374329f40258ac7e278e0efa5ad4d038bd32734244568cdca73f929dc1a857a4b
 MISC metadata.xml 606 BLAKE2B b0657b12dfbcb381fbc777811260f4904059890473e420a0f5bcc82c9e785c0611f61355b665c57042cbacbf0d397f0ef190a152b9dced6c7ada3c7b024f4bca SHA512 b7d8f946e5fdbe0ba748f6236ea9273c95687909bd6d6306d722dffbfece7233aa1b5345f9b3033471f5772540a166439602dca828df8d7262c0035908552076
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.86.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.87.0.ebuild
index e920db3935ff..e920db3935ff 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.86.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.87.0.ebuild
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index ccc960923566..e1d316d3df67 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,7 +1,7 @@
 AUX kunitconversion-5.85.0-fix-24h-currency-sync.patch 3236 BLAKE2B 561814077c1c46226540ad130cd25261657d43ca1ecb16abaf7e011ea0b0a2837dd8c1c54ca2feea615d05a18a4f816f560b27b230da62340b7ad4c0b2c03136 SHA512 8d2df0d6eb218f46c1a0cbe0bb0ba030f76196d88995a08147ed12527cafbb3932e32ce45501228c6f2746de3fba7b0b8b52b50998cf49e1a5b6fe051da40ed2
 AUX kunitconversion-5.85.0-fix-currency-values-init.patch 8599 BLAKE2B 4650128f295a8b873bb874de5f44baf165c124ad3a4f6704817814718152f5936e399da099a1500e6c079bab5a2698c233bd03be40d926d91b46a61144de36ad SHA512 fe2d928c8873da893e8fb1a28a5b509c23f05d70cf6bbbc5424f000ab8e6639b14bd3137eff6fe65929983b494bd4f7522235aba206b68be8a374bca62844c3e
 DIST kunitconversion-5.85.0.tar.xz 888652 BLAKE2B 8e5a773f0f8acdd1c24b81a8946b7190e52a3dbe5a63c48027f423be9fb735508394ccd01b3caa4bb7c920dc873a73a08c78afb335a158b598f8793c53d194a7 SHA512 f053ba454f4a5a44801a1f5b8c6562a7db71f4aef1c3b253610d20d3bb1b634347f9bb1483f607cbe1746f0b80a8625dcfb05bee5cbda467b799c9d3d5ca6668
-DIST kunitconversion-5.86.0.tar.xz 889512 BLAKE2B eb2ec1393b3833d43e645a88983ddb156b8138eb6c5b325ce60fe009ebaa203460c8a8f1f5a356c00cc96c7abc2719db46e3aa920f130369e909c2918c282531 SHA512 ae37f1e355f8e5aea5ba2fc79a01f525348e10173425cbdcbac06419a5005f02cd06f1e6bc0c72970c762558b5e68dfafa1b15c6d93cf3fd1c00ac44a549ee25
+DIST kunitconversion-5.87.0.tar.xz 889836 BLAKE2B c59629ba4485676b1fe68d80009b24960487bb0ed5ad21a445a05de22b4331a615415d7491e49a565e016f8f70603112dd03f410df5292d420f43dd686be4f6b SHA512 57113a188196a484fb4eb5acf8006ad3399ddb451aa6eba74f6388d273d27da95ab97b5e7c35ef34a29b58d212bb54aa51aa1824b7b6b09647b1074b04db311e
 EBUILD kunitconversion-5.85.0-r1.ebuild 835 BLAKE2B 7fcfc10e12cd88181d7d73403f59ffd58015b001d94b51bf91a7d63e7a2a1002bb6448f4ea70c730a8b5a2284c47cf0aafdd05061a671823875231cb393c9e09 SHA512 0a955039360ad1e76484e205c927843d3e4ad2df3efd34bd9b1397b15bbe3b1c4c7c8d6daa31ec25d9824d756a2756f515aaf0575ab47e7234caf2082bff8f3b
-EBUILD kunitconversion-5.86.0.ebuild 709 BLAKE2B 9af078a05a556c22b68fc8fbfbb43142064a5b616d4e1a7d223409824d0dea38033b5c8f2d049ec009579068e279279bb383e75cdbce09d8b2e956664f58824f SHA512 8b450cd11f6f39fd50fbd708b3eda3783ffb86db33268c1ddeb4b4bfc484948b49f7cba91a5f36548a1d5d9f82426ab8b133d301c8cb3a85d5af8f89796285ba
+EBUILD kunitconversion-5.87.0.ebuild 709 BLAKE2B 9af078a05a556c22b68fc8fbfbb43142064a5b616d4e1a7d223409824d0dea38033b5c8f2d049ec009579068e279279bb383e75cdbce09d8b2e956664f58824f SHA512 8b450cd11f6f39fd50fbd708b3eda3783ffb86db33268c1ddeb4b4bfc484948b49f7cba91a5f36548a1d5d9f82426ab8b133d301c8cb3a85d5af8f89796285ba
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.86.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.87.0.ebuild
index be8c74167610..be8c74167610 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-5.86.0.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.87.0.ebuild
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index fcbeb083b1f2..df70f79f09c5 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-5.85.0.tar.xz 302844 BLAKE2B f43bd9a0046cd18490961fa0d97e40c3fe0502306afc76416f045d7fb7f74c3a54cee90b2a0fcce1f847ce97e18c3b2b680c235bb899720643e2b22b9f968c0f SHA512 7cead5cac3856ad08a71778e44ba57cecdc97cbd2abe3ec33d461edd95a8fce742ec011b8773841cc5f24d8eb282a197d462e979829c62d477c87625c5107c10
-DIST kwallet-5.86.0.tar.xz 302880 BLAKE2B cb1568bf6832d6b23e49b1b4a1e8a1a722b2447b7c308efff4c3391e54af16efbb5ea9658775e1c61b9f4f218cefcf048c6c80f999b755af14706fa5617b5813 SHA512 8f7fbc181c4b677fbf34d6bbc3f6daf65d79624e34fbd530119d9ca626f96b396f68c0897cf5b33d20b5e772850568b6e613538c0d3babe8525d6d4c3685ab03
+DIST kwallet-5.87.0.tar.xz 303168 BLAKE2B e67cc536ebaea1229efe4b47dc906c2b259605d43812fd185325aa437fa016318806cbce0243c9f94722aa049aac86ab22591e91bd617258064b7264224571a8 SHA512 1a62d248bc41d6a2eecaf4dddc92f49a44864e85f730a705b0c1ad973267e83191dd89a10c5374c32944177d30eed1d562927c6ac04aa1d91600abf02ec3653b
 EBUILD kwallet-5.85.0.ebuild 1384 BLAKE2B 144f12e8e9d10659983c17c52871a5a570771470f0e00de018717046120105604acb2c419eb790adca228550b0de34bc1a9477a7fb8b2470eb82f9b452620431 SHA512 61a5e007f53a638c1a7317fe5429bce6ef057b9efe5d4e18a19e491809135d4c215852e82596c8884e1bdd444a2b1cc2ed0e6ff5a38416c74385914f9fff3947
-EBUILD kwallet-5.86.0.ebuild 1387 BLAKE2B b91dbfd61fe54be3b0d8dcd5b9dd71687f5bd8841c9696f41b9a3970c8449098b5d83611cfce262b406362754cf8daa5fdd8262bcc45dc1410a2c4ec55d71c32 SHA512 43a240a00043eb849da252d1293c015a93b2f4c69cebaa2fb40889b8c73c4a6e3c2111d3724b3f2520dfc9613855fce7d57e5a3a47b86e9459f656029f69306f
+EBUILD kwallet-5.87.0.ebuild 1387 BLAKE2B b91dbfd61fe54be3b0d8dcd5b9dd71687f5bd8841c9696f41b9a3970c8449098b5d83611cfce262b406362754cf8daa5fdd8262bcc45dc1410a2c4ec55d71c32 SHA512 43a240a00043eb849da252d1293c015a93b2f4c69cebaa2fb40889b8c73c4a6e3c2111d3724b3f2520dfc9613855fce7d57e5a3a47b86e9459f656029f69306f
 MISC metadata.xml 586 BLAKE2B 7ab7b780f8861068d289d9563a6a81ee660265764db00a7be316a1242fc56689af895248783ee8814b95f46ce35bfa7533d511b2c47b1170b46ae0ba96aa92e5 SHA512 f0d5748631151406a2baf5401386cf644a8d373651e44858f336741a8eecffe1b3c2967b10925fdd9490a050740b3f9eba781f2aacee13fcd211c3145c625a3c
diff --git a/kde-frameworks/kwallet/kwallet-5.86.0.ebuild b/kde-frameworks/kwallet/kwallet-5.87.0.ebuild
index f985d0d7667a..f985d0d7667a 100644
--- a/kde-frameworks/kwallet/kwallet-5.86.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.87.0.ebuild
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 3ff9762e1dfe..b14fa78c3086 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-5.85.0.tar.xz 331208 BLAKE2B 87397c48534784dac0b7b864ec1fd6579308c34daa5ff613d6b39f50b5fa6f5c59b33f648479e694e4135460468df9196682e169fcc9aee22d9dbd1be70ffc38 SHA512 b45321c2846c2311c2e4b48aa5edb19a3a4cac889415d490a21202470ea27281d8b9cf69f1521109bd236eb48ca93702e461b54c49e38dcc50fb90f4cea0d063
-DIST kwayland-5.86.0.tar.xz 332440 BLAKE2B 343785ecf5dbc06c503c025f31725a61886f6b02ddb07e2f0729b4f8b031f273f95e33733d0ed8d42a7d8c927ff5ec0d6aa57b0f26e360987b39de6626b3f7bd SHA512 60a9f00dc9611d02733c173b517b9d910e9d32ac2fe61e9c01f11095dee9bce134ae5cb4a98cc4a687d53a719e7bbda6ca518e89ccb5e4d914a6810fbe646baf
+DIST kwayland-5.87.0.tar.xz 332588 BLAKE2B e869deb4db0942e5bd4088198765e71873b9a8353155ca761c933b5c40bc7c92cd7122f6132dbec1191cbf0f62ef6772197db7e66f4e0e395fbfac017ce017c7 SHA512 2e581e41a59047d9ad5832883eb940cc2a0f6af254fa72016e7a43975bbc48e335502d21a003eabf1593c894bf3523854faf8cedd17e0dbfca26d5373907e0f7
 EBUILD kwayland-5.85.0-r1.ebuild 820 BLAKE2B 9c76a750b21d21620c47b74e74a4866b01a8cd03e0a36070cb065c4222d8fa4eaa5172ccc2891de6c9cd44504e81baff0007e53cb57be06fbe22c1f1f05b5146 SHA512 c6de58a3bef6502f006e908f6e932b0c7042792d4d6e3600f80d096f01fa70f1993571dd91b3348d6df9b56c5457f677f737074ea053cd6145936a0166a1102b
-EBUILD kwayland-5.86.0.ebuild 823 BLAKE2B 540a0295b28b588d14f96a3cc3b754727860bcc7ef3378623e3a201653f85104f9dce4ada13ee38fcc21881a147439e54f4bb50fff690d191fd8c31461f49595 SHA512 c01ba38d5226aaa69f959ffa319613c0d6144d5ed8f54ff7e52ffca904d9024641df7808c16e436c2b3f728913770b3b4028ac054b6f4d813b46bfa00539d46f
+EBUILD kwayland-5.87.0.ebuild 823 BLAKE2B 540a0295b28b588d14f96a3cc3b754727860bcc7ef3378623e3a201653f85104f9dce4ada13ee38fcc21881a147439e54f4bb50fff690d191fd8c31461f49595 SHA512 c01ba38d5226aaa69f959ffa319613c0d6144d5ed8f54ff7e52ffca904d9024641df7808c16e436c2b3f728913770b3b4028ac054b6f4d813b46bfa00539d46f
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kwayland/kwayland-5.86.0.ebuild b/kde-frameworks/kwayland/kwayland-5.87.0.ebuild
index ad4ba6d75c5e..ad4ba6d75c5e 100644
--- a/kde-frameworks/kwayland/kwayland-5.86.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.87.0.ebuild
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 3b878e945f91..29a4d6f297a3 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kwidgetsaddons-5.85.0.tar.xz 2306380 BLAKE2B c2fe7d9fc1680b90aa32fc3d5c9d88b1bb0b94094065f0c666da35bead3ff6dc76a6b943a0f814dbc322ce1493af414044b1a7fefc9d6d316db5a6fd9a61d974 SHA512 973ccc1f77f092384e0933972ecea8ed7fcc4f7891e7393f4ebf860ebd4155b7b7e6229b92d308844c8f3c31f720d150c3afc5573c85d9b6d34e1ac70ad3d315
-DIST kwidgetsaddons-5.86.0.tar.xz 2306324 BLAKE2B e6c7917b271ffb6ac2f771211367db546d101aad6863cbe3f46d9eb165768b38fa18ed09ac72f45fa19e8d0173dcf1be15c7f054fb77f613a6aacf487bc86d63 SHA512 d1f8a17d99b1fc4d732e650dbb5110e4bfe2d741694a9d536c95d4ad36a4a7d52811d788ee756c91654b3410c4e6c2d38be34c2bd4ac0901f625a5c1e044664b
+DIST kwidgetsaddons-5.87.0.tar.xz 2309804 BLAKE2B 1f3ff2ff340923d126ddbccea117a3b81ce71956f90a9757469b24a7a9fda764aa54cd4af50292d8c0f4d7f797144e77fc48c807955ee60c63e16d3eecab45b7 SHA512 91a6100cb6f0075b8fd9dcc176f25c42bf65df62b6c328985ff4278869a62f0e11d64f38071647b8664a55fce3a766bd79b83d0e2802b67716ccfb74d3dc0aec
 EBUILD kwidgetsaddons-5.85.0.ebuild 804 BLAKE2B be4f67608c6835072a29d464558957304fb1eb7907f8e6d342f60daac9fcb57f9bd8f6c671eb8489482fe1fe5be88a3f311eba02c3cb6638f8817130caee8583 SHA512 a2acbb9097fca4eb8e6a00f19a726b28cddde2a9e02ae166624c383e596c337d5ecde33918c7c4926c83dc3a54780d25083d8a679d5c7873dc8135405eed7f77
-EBUILD kwidgetsaddons-5.86.0.ebuild 807 BLAKE2B a942307ce2978ce311708c4bbf40db9d8176129ff9db5ba5f6b703a26d7c1f99f893ae675975847e13f77567ddbac4ac8d7db865e84803b12e4be4f7814db30e SHA512 2fad85065756a5eebf0308c81db2686a14381701e7031dc476f3232e3105b4b96aa9e3e803c4e3e4a9f976337ec889ab6f0275c9853d75de7dbb0741308f0367
+EBUILD kwidgetsaddons-5.87.0.ebuild 807 BLAKE2B a942307ce2978ce311708c4bbf40db9d8176129ff9db5ba5f6b703a26d7c1f99f893ae675975847e13f77567ddbac4ac8d7db865e84803b12e4be4f7814db30e SHA512 2fad85065756a5eebf0308c81db2686a14381701e7031dc476f3232e3105b4b96aa9e3e803c4e3e4a9f976337ec889ab6f0275c9853d75de7dbb0741308f0367
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.86.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.87.0.ebuild
index 2df9cc25d47a..2df9cc25d47a 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.86.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.87.0.ebuild
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 02f6bcb4b407..d9d465bf61d5 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,5 +1,5 @@
 DIST kwindowsystem-5.85.0.tar.xz 178256 BLAKE2B f18dbe1f56529f7500ede59bc3447d6dfd4439086dadbd59d137a21ddea01653cfdfe945f6120461f507e7007228ef2135687ba740981a37e2e9ffe1866e21d3 SHA512 517943febe93ec84d91792ece6a2ad4518c3976d4f9ae3ba631713bdb87cec72817d3231da0fa6318c93e7b6ccf4875ba1c079b3838d3d68ad28cb9c35211d43
-DIST kwindowsystem-5.86.0.tar.xz 179152 BLAKE2B d765fb19f74fc3513fc012a725ae1cad1b80369e207493d7aa7f6226b00c3f3908185a47d5889d06821c2eab955b10f1781b40e8afea6814a2af9284bd978c32 SHA512 ca9097a0bee54ee12a5bad77a4c6fe0a0df126091938c43d644e6838fd9a01758ff397647d4058e088703b4c88535003d7d58863dbf8f14a745d47f0958e593a
+DIST kwindowsystem-5.87.0.tar.xz 179384 BLAKE2B 624a13f9ca307f9987ab12f36e272e9014fbbfb9fff9be949b3997b04f015ae3cd34f9ad62dfd245fa5a5f99f22276e32bb011db8c7bda8a4997383a99ac2454 SHA512 c2cc0ad4d6dcb08de85e8cc99d3f20bc8d4e773556016900c7b627dbc150bc9fa4e89f15d897876f0685c3b4bf31bd9b3c74713c5619bed92aadb7cc451604ff
 EBUILD kwindowsystem-5.85.0.ebuild 856 BLAKE2B 322e2a182351ae4bfc21761d4a6f7b3786ae91ac3c4504e10a7acb5885025fafaa25f5660740fb78b4a2bf1ac96b2b67078e71f6885452a739c3becb75a386a4 SHA512 ee4638e1ca03a993108b5a635102c8eabeaf919b014d4bae07b787bc063271bb35e430123823f53990e3042f292456fbe36a206df9459b405932d8e3f9bf89b1
-EBUILD kwindowsystem-5.86.0.ebuild 859 BLAKE2B 70ab39adf48705f875651cabe6fc3fffcbaa21787ca74d490c14ea9c845368365eb6cc1ac930b628b72f6748a12c3b172dbd917ff1e29791284689122eaba076 SHA512 fb6116316e193d30863b29c63c22972b0bd55e5c68a0b45eb34300589267206a24fe73d9b28a5ae9e1a89a9a381704fea8db5865e86e6c3832f13debe658c38f
+EBUILD kwindowsystem-5.87.0.ebuild 859 BLAKE2B 70ab39adf48705f875651cabe6fc3fffcbaa21787ca74d490c14ea9c845368365eb6cc1ac930b628b72f6748a12c3b172dbd917ff1e29791284689122eaba076 SHA512 fb6116316e193d30863b29c63c22972b0bd55e5c68a0b45eb34300589267206a24fe73d9b28a5ae9e1a89a9a381704fea8db5865e86e6c3832f13debe658c38f
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.86.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.87.0.ebuild
index 18350d22806e..18350d22806e 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.86.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.87.0.ebuild
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index f4f7bd328656..740d6e7bbadd 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,5 @@
 DIST kxmlgui-5.85.0.tar.xz 870124 BLAKE2B d9f70d0cc936544f6370cc361bbab39e2b7cc2decd15d01946dd277e25f735924bf5feac552e78fd041ca4693520fe7ad4019140066b55aaad8394a755b0c3f8 SHA512 03e36478e07635ff0acbe86602f64fc9d7c1c334e396e3136fde56a3d4fc28ed0c5170aae43d1a586adcce17241da0ffdc0836a9dc94f204f93cbce32a03050a
-DIST kxmlgui-5.86.0.tar.xz 879384 BLAKE2B 5137a2522c4473fe208ee5cbc21ded1ccdbfcea5b2e325acfb6f493ec6fbcdaf285abaa2fb30d485c1194ab4f2896ec43427cf796fbc4f405c5df99d0e4bb368 SHA512 b0e469470594f5f6471ab66f5c599ff31f8655de757bc096ed0a3e14ce7706d31b3dc1b6f50db92b66d22fb917b4ea104a815898ddf38d830749b513437c1fd1
+DIST kxmlgui-5.87.0.tar.xz 883840 BLAKE2B 29ac0f3df690f2bb30733e0283e40d1314a7f546ff9df77ff6e2c24df907f7b3b7aa18dda2cfebdba5c138c7710d9513636451a04f62159bee6e26b64944bcbb SHA512 7a6c70cc99cb72cb92884dc5830487b6bb6c5c52afa72e6a07819a7d6cf5e7772f275d47772a71b49269af21122d6a8730f651c7ab0ee93fc5b2d0f8a228eca3
 EBUILD kxmlgui-5.85.0.ebuild 1213 BLAKE2B 8bee338c97593112e601135729503677aa84384caf54f0873e6cf81e1eea5d3775dd286607cf092b27010087b2a552119f8005de39ca331ae6158878e1279d7c SHA512 f746660c82c0bcf78ed090a41aae8a4aa198c144743ff9ecf78cf9257bc983f942291f0fd8d8059d1d47b74bab23ee1e184a1bf705df5441579c50deb2668d50
-EBUILD kxmlgui-5.86.0.ebuild 1216 BLAKE2B 8922049a9a363e617bc87aaa397efc5b0837bc029a549069abf2b4d2193828f982decfc847b8a3846edd32639390449531a4c575bf1866ce4e4adac91da5696a SHA512 901567816f759fed8d12c31944b14dcb41f8336c2e16703e58850925055dbd44a7e88a06fd70d31e532e0905507e1374de12d05d77d47e05aa9995d7a39e5e7b
+EBUILD kxmlgui-5.87.0.ebuild 1216 BLAKE2B 8922049a9a363e617bc87aaa397efc5b0837bc029a549069abf2b4d2193828f982decfc847b8a3846edd32639390449531a4c575bf1866ce4e4adac91da5696a SHA512 901567816f759fed8d12c31944b14dcb41f8336c2e16703e58850925055dbd44a7e88a06fd70d31e532e0905507e1374de12d05d77d47e05aa9995d7a39e5e7b
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.86.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.87.0.ebuild
index d55c4f70b7ce..d55c4f70b7ce 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.86.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.87.0.ebuild
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index a8636d02b642..765b27a7f8f1 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST modemmanager-qt-5.85.0.tar.xz 112436 BLAKE2B 8e86d6c330a048a6f2ac522f1b59d89e3b1951d21c3667254c2f8c6d3e01f0d2e53ac55d4bd6a4edfa6cf68413dac6afb71ee1c6ba59780a4d033614fcd24b06 SHA512 535cb520bb2102fc50ee884b50edd02689c59528ee9c9fdfe958d14dc1c57c1e3805256ad15c6ab8e0aae43441139ae659a850b5cef350011da4d2b554e3aec5
-DIST modemmanager-qt-5.86.0.tar.xz 112488 BLAKE2B 0139c5c1168c297f6918339a51ef7493126c0d864c0821573e88fe113baed61d349fb4a6a4b05d64c47f3bcc64d1af1617b56923bf7fa43a3f3bdd1131f9aca9 SHA512 373e4048c5fbdec4fcef2b4fb25f4aec141616d027c29ff12df6360e7320dbd438b1aa29cd467d59310fef5d1d64a5096f71bb0679d3e4b6654b5973e7c7d3ea
+DIST modemmanager-qt-5.87.0.tar.xz 118572 BLAKE2B b06e4e9c6fe64c6fa1c412d38e227819f90ef177389929221cfecf9084393cbcd2154ab9f81a51838e12478384aa2c750adcf86b2b2b7cf759916fbb9748ca29 SHA512 bc4a1abf17f6ba473e8eb18e347fbf7da11d9d92d6eb3ed8af15309ac2a44171d19905b6ab96a24222c34ce32c9deea3e295a8c19bf54696f0ae480bb5d73328
 EBUILD modemmanager-qt-5.85.0.ebuild 471 BLAKE2B 3d228ca63de113523ead186b2785f8f33941d11444f57fb24fcdc0dcbcd7406e22081ebbcea02eca86bd55a9f1e343ccbd8467939ca1b1d72ddb27ac5970246c SHA512 167707384020c9bc698cbbe4c3b7a6f586ec886493ce7d0b793ca313bf00ab4442b49f170ae55372d57f3a9076d17e22d4847e7d0299bc45c3debc9c9729b6a5
-EBUILD modemmanager-qt-5.86.0.ebuild 474 BLAKE2B d35b4c2cd21514c2765958eec99c359f9917f7aaf1112da9a8364830d76a920ab565684abd217323c1ac69214a2938d249dfd45bc808f83677c527837397269e SHA512 98eaa16eea9c5ca43866f869ac68069d2ccb1e053ff92aa502deb96cdc1c6c7ed20b8403663645a0f68464783133cc2207a3f62372d22581240d477279555d5a
+EBUILD modemmanager-qt-5.87.0.ebuild 474 BLAKE2B d35b4c2cd21514c2765958eec99c359f9917f7aaf1112da9a8364830d76a920ab565684abd217323c1ac69214a2938d249dfd45bc808f83677c527837397269e SHA512 98eaa16eea9c5ca43866f869ac68069d2ccb1e053ff92aa502deb96cdc1c6c7ed20b8403663645a0f68464783133cc2207a3f62372d22581240d477279555d5a
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.86.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.87.0.ebuild
index 5cec0e740d6c..5cec0e740d6c 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.86.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.87.0.ebuild
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 797deb87ab4d..59739d0447a2 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST networkmanager-qt-5.85.0.tar.xz 195996 BLAKE2B bbd41b95ca8c9f676941240bdab40f2d9ac76ca6ccb3eb0cf133aaf4e8bd7bffaf13a91f0a3cae06ea617ee11dce2c198536f134f9e17246897a9afebc89348c SHA512 84bb0edecb6162834caa495d9fa34947ea25f69cd915ba7a516657077492fb7f6c0fedd7a127d7e2caa7d8c038520410505b829eadd19d3ef9daa445442b090f
-DIST networkmanager-qt-5.86.0.tar.xz 195996 BLAKE2B 346315297e12c8d91c6af3948c1d8312c9ba723076872fef8c7cdabac972d083476674a932dac5e1a5d6c6a919a6da0326e7eb8e3c9fe404d9e31ed65a4a3438 SHA512 90eee48102ee47d81dcc5ad0cb06420d27c7223012f5ac3a8205b37ea517426d8d80a10a2093d8dc2e28043dd1113d942231d7e5b32c00fbe93bd4ba63516b22
+DIST networkmanager-qt-5.87.0.tar.xz 196184 BLAKE2B 5fd5b6748e380b809bf3b3df06b51545822645ce7bdb22d8c44d9be28bd3d8f8591c3d97a460b6286673ce179a75dcf8f35c4db811acdc9907446378cec25876 SHA512 1ebd8658a68a3fbd1b63c5c66cc87dd341b9a197ee01740e01974279aaa28ff90454973703f924348ab6c477358da9ac1d21474199349c6051a06ba7b20ab125
 EBUILD networkmanager-qt-5.85.0.ebuild 658 BLAKE2B a60498370729c79b2ab176372fa26bcd7d884daac14c8d2bdb88ca0494592d1a5c4aa4c860f14152529bbec453222fe17d28431f4e78f51f9e37f8e9fc146077 SHA512 1f02c9411b890e537bc5ff92578ca3da45d40e5306ed45aba3775820704f0995591ac5413aca3ba7e3592aa4a5be03f90bc02b2136733040e2c85a192eecfed8
-EBUILD networkmanager-qt-5.86.0.ebuild 661 BLAKE2B 49d0a14394b1f62e8b51006929d5d8bcebff80ca17a75eb5a29e0aa9c09f6190cf5b1e5dcadb1ffdd735c3ad177ea9015b6870f002b66ca6083dc16b17ac1980 SHA512 c03d6275f8f2cc70496bd961aba3f50217d141e4d6e3e1d03f02769805ecdcdf70ba8fc223eab55282b5474b44645310127131784421d7bfb30259a07ce2cace
+EBUILD networkmanager-qt-5.87.0.ebuild 661 BLAKE2B 49d0a14394b1f62e8b51006929d5d8bcebff80ca17a75eb5a29e0aa9c09f6190cf5b1e5dcadb1ffdd735c3ad177ea9015b6870f002b66ca6083dc16b17ac1980 SHA512 c03d6275f8f2cc70496bd961aba3f50217d141e4d6e3e1d03f02769805ecdcdf70ba8fc223eab55282b5474b44645310127131784421d7bfb30259a07ce2cace
 MISC metadata.xml 528 BLAKE2B 8e547c097f06ce6bc78746988171989fd5f71384b62d582c6b7cb8c99e30ab06f5e139fd1892ae10dbf4ffb389d9cd42aaf83455b90f7cbdf54e14da469a9783 SHA512 ec5a831fec9baf40d8298ca6f825d2c20d2b221f83eec4f2439a5e9aab8ab07b2ed4e114bc73f37ee55a15174c94fc7f271a587de9d2e8d34bcd76ace8565d19
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.86.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.87.0.ebuild
index cb414e811d3b..cb414e811d3b 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.86.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.87.0.ebuild
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index 128fa441751e..c185f15d237e 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-icons5-5.85.0.tar.xz 238630636 BLAKE2B 7a6656d8474f2acd734da6bb673603d059afe76e2f2a8eb5e0270c4f72a2155486d985861582070c7dd8fe3cb154f310cd6662086ac45e867feae6e1da75190b SHA512 c3ebcdbbaa65177a5833cd51808dea4205a27f993de9a2aca4af37512a2b258863922be8389c3ba8090183a092f72754efea7521cd1cd7e1a2bc2266768daa4f
-DIST oxygen-icons5-5.86.0.tar.xz 238634616 BLAKE2B f35c26c772df2e6dbc21da4e260ab10091d66d3683a73c25fa59ee732678ab5da4f98a705746c34b3c7b5adbf25576125ded3d41dc31732ba32e7b021a74b795 SHA512 ce6b31a74961158612a67f10791140c8aae5712c17b0e7e6c5b94d872e2c650d837c008fb3fa55d3f2dbb4e22a10de57c942b63ce4a201ed410a407a22476e6f
+DIST oxygen-icons5-5.87.0.tar.xz 238639052 BLAKE2B ca866bf6ad4f3123713818d0a63131530f389431873267c1bcca97d434c95c41768b384468099e2c73323f14fef48e98c3972750b17932ee4875a2265e407e74 SHA512 59cdcac45c3d5adc2a4ff6321515619102251b6fa9f9f5957388371e2342905e09d5283e7eedae8e7aad314bb17ab55f8cc73a84dc788abc1255e2725eca0553
 EBUILD oxygen-icons-5.85.0.ebuild 693 BLAKE2B 10b09def9413f64dccbb5a3ae4148088d5228081d1244616dff7569ec9388caa425d7d806e16ae54c487a1a386431031e276dad323306c869b09f766082726be SHA512 f24f67192555a1f8fde8d62088639a69df15d2b285c0b8dd6b964681a3381eaf69ac3237f25f6e1978d4d87d3067ea6eee1088f7dc00bc0eeda60b2714bd2438
-EBUILD oxygen-icons-5.86.0.ebuild 696 BLAKE2B 236ab60579167fac318e1e36576caae1a110a6c858efc8046e322d08d38ab132951aa59834dd4425a9a1cc7ea01ebfa5b62bef948a9ec7752fdacd6f0adbee33 SHA512 e3d17b2a37044a172340d8bee77ca3f88cb3415ab8b199538494b38b618463ad3cda43709d8e708f0b67d35b0b7f55c3361117a9a9e304cef64a58d70e3781bc
+EBUILD oxygen-icons-5.87.0.ebuild 696 BLAKE2B 236ab60579167fac318e1e36576caae1a110a6c858efc8046e322d08d38ab132951aa59834dd4425a9a1cc7ea01ebfa5b62bef948a9ec7752fdacd6f0adbee33 SHA512 e3d17b2a37044a172340d8bee77ca3f88cb3415ab8b199538494b38b618463ad3cda43709d8e708f0b67d35b0b7f55c3361117a9a9e304cef64a58d70e3781bc
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.86.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.87.0.ebuild
index e71b5c0490b2..e71b5c0490b2 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.86.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.87.0.ebuild
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 9f63d71084fd..89069b019c14 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -4,9 +4,8 @@ AUX plasma-5.85.0-fix-pinned-calendar-dots.patch 1466 BLAKE2B 1d4f72269928e35e03
 AUX plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch 1766 BLAKE2B 07e8f384a2dde888465b4c6e3317afdd511ddc03fbc18ccf6e76d235bd6552c9b0dbd292f19244e0792129c68b2284af9220f9ef54240bee1255e35a5e94d907 SHA512 5f452b6634bd53f7265dfad2a38e40aa46ff69d10081b51c47b1aed97cabd28d545e7fd985ff26412c07315214821f201e5ff2de3d895e8afde9523d187b932c
 AUX plasma-5.85.0-fix-svgicon-memleak.patch 1613 BLAKE2B be00da72ac0a1a8ce97cf771ea83db44fe97142ddadfc1a1b283cce5297568ec0566b7a2ce626ad7d7e4f7bbc82edf260dcda1db6ea8cf8ed1c132b3a25dedce SHA512 c8dbb37558ecf3491edbbbda6f93075d7ddea7561eb42b30416d61f7b7256966c609862fb8e0c746b9a93d2caff37b8afef9eff0d5db271d6e3cff8aef2d560b
 AUX plasma-5.85.0-fix-theme-memleak.patch 3873 BLAKE2B 8ec65e67dab0020febd483b4b369d26d4f9e7a1782b783c2910e80db643f92562559053a6319b57af4f905daeaa970db7d78e1a2c11b07dcdbc9d3bb74f52c10 SHA512 fe93829d4881a71bd4671af187a7210fb8fec1c92b29917d1530c58d1247976d59ea2e16eb0eec0c14e25824a9b15caebb7912f7db23b6088c1352e9925d15a9
-AUX plasma-5.86.0-revert-Change-busywidget-to-a-gear.patch 14178 BLAKE2B 81c08e0e372842b83a0510ee0df24c8a78bafc4fd85a8a68e6a9ff84b8abb707b2fc5e680974fb0a4b1b91884ad4a271549bbca2cde1f975b9d9d95dc9cb4d40 SHA512 3c82fe85e0fd38d289d1611bfe637ab94305b4c5b7b3bc67fc48adbac10dac5231407787f633af57d145de104846e4d32b90b8e7eade6e1bed85ef45ce3906dc
 DIST plasma-framework-5.85.0.tar.xz 3145156 BLAKE2B 8a9257e3613ecc20051064af8eaa94cd30d07fd9c6349f6dd2aa1169ab661dbede1ff424ac1f96a30230270cf8f957731465c0a655270862c104987576b614ed SHA512 aba7e62ff3d9eff7c28c1736bd1b25e14c19502f021ed7f78025f7129abb728a066de0fff327098f52b84e78f78fbe87743563b78a4c91e2065187fb443eeb77
-DIST plasma-framework-5.86.0.tar.xz 3147804 BLAKE2B 39b58d3613a5e99217b9cef3aaff0c5ef7c0563f3a6014b50ccd8ac1a7b328f6fc2a91af94c66c2bb702435f892b23605cda6a8aee049c6f7c9ea7a455fae57d SHA512 f94d9a0175141705eb8e384877d69d0b6bfbdc76a12f7f3fcc33587186a7ab5ed7cf87eaa9e13102932d7c8fad500bf479da111ea4b61c1e35acea9f216eaef8
+DIST plasma-framework-5.87.0.tar.xz 3139456 BLAKE2B bc04461b82084e2f341f6b47bda054fb5ff70f3d23ad05af203218b2d8a6e4a4ec2b898b3901e2845fd58ceb5157077edfdda2ee6378c7ab0418eeef1e19b4e5 SHA512 e74f60a15329fbda1a5c8e978914844dc5bf6486c241a9e44905a2955399dc67605361618ec3b33815a0af85b7711e18ede1d481b81d9909cf87e6b0e32374fb
 EBUILD plasma-5.85.0-r3.ebuild 2329 BLAKE2B eab27d4eea5e926738094e0e3f711369a229f87922aa1256f75e9b240111f0c6f8a430102c807ed4cb93dcfd392005f13c0f81f572134a51e0c47d32c49da4e1 SHA512 f40ddb75ef8316018d0eda6db3602ecea8958d26446517c790fed6776f297a78e7d22bbc113149f625b8b2f37b9ed98dcfad73fe7dd176db6e7c4388ecb8aafc
-EBUILD plasma-5.86.0-r1.ebuild 2016 BLAKE2B 7c20f1ac7e146094b3f92b7eee2c3fc87ba01c420ae1f3de8d2a067e2d5b3d3fb5b30276384807d541ccc8b4752050c708429ff2d4d98ee85d819f0005bb782d SHA512 3236c96b386da06cc6e7a58642e02e43d6ef0d02b9e0a15223d125d26638d6336a25a925ff3b514f5a9871a856219cb50ab63e46289097895a4766c5bcd9f9ad
+EBUILD plasma-5.87.0.ebuild 1943 BLAKE2B 4f9cabe4ac6c36839d71bfbad8cd5b6652d22723eba67017ae7587941de3efb6595c4f472770bee802a4421f6c711e83832185e3a8d333e358a0b4cdb1a79526 SHA512 23aa0e6f6349402291049e4203dff1a9263fd797a749cb274e4d53b8032eac9931f1d457290499ae9694ef93dbbd82b329d9c55e707496906f89adc3f0b6c122
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/plasma/files/plasma-5.86.0-revert-Change-busywidget-to-a-gear.patch b/kde-frameworks/plasma/files/plasma-5.86.0-revert-Change-busywidget-to-a-gear.patch
deleted file mode 100644
index f0c8042d50ce..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.86.0-revert-Change-busywidget-to-a-gear.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-From 6f8eae0ca24e1ca7e816906042cb8b6b14886698 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Fri, 17 Sep 2021 07:43:48 -0600
-Subject: [PATCH] Revert "Change busywidget to a gear"
-
-This reverts commit aafe6523cc0fe809d03fb6b98c624ac3c0f49973.
-
-This change has not been well-received by users, and exposes a
-conceptual issue with how app launch animations are currently handled in
-Plasma, with the loading spinner simply re-used as an overlay on top of
-the app icon. This constrains possible designs for the spinner because
-the backgrounds it will be displayed on top of differ gratly in these
-usages; what looks good in one context may not look good in the other.
-We will have to find another way.
-
-BUG: 442525
-FIXED-IN: 5.87
----
- .../breeze/widgets/busywidget.svg             | 80 ++++++++-----------
- 1 file changed, 35 insertions(+), 45 deletions(-)
-
-diff --git a/src/desktoptheme/breeze/widgets/busywidget.svg b/src/desktoptheme/breeze/widgets/busywidget.svg
-index 2ca09f283..0eaf137a7 100644
---- a/src/desktoptheme/breeze/widgets/busywidget.svg
-+++ b/src/desktoptheme/breeze/widgets/busywidget.svg
-@@ -14,7 +14,7 @@
-    viewBox="0 0 35.983333 35.983334"
-    id="svg2"
-    version="1.1"
--   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
-+   inkscape:version="0.48.5 r10040"
-    sodipodi:docname="busywidget.svgz">
-   <defs
-      id="defs4">
-@@ -75,7 +75,7 @@
-      inkscape:pageopacity="0"
-      inkscape:pageshadow="2"
-      inkscape:zoom="5.4632354"
--     inkscape:cx="186.91665"
-+     inkscape:cx="219.5896"
-      inkscape:cy="25.042129"
-      inkscape:document-units="px"
-      inkscape:current-layer="layer1"
-@@ -84,9 +84,9 @@
-      inkscape:showpageshadow="false"
-      borderlayer="true"
-      inkscape:window-width="1920"
--     inkscape:window-height="1007"
-+     inkscape:window-height="1027"
-      inkscape:window-x="0"
--     inkscape:window-y="0"
-+     inkscape:window-y="-3"
-      inkscape:window-maximized="1"
-      fit-margin-top="0"
-      fit-margin-left="0"
-@@ -96,73 +96,59 @@
-        type="xygrid"
-        id="grid4160"
-        empspacing="2"
--       originx="0"
--       originy="0"
-+       originx="0px"
-+       originy="0px"
-        visible="true"
-        enabled="true"
--       snapvisiblegridlinesonly="true"
--       spacingx="1"
--       spacingy="1" />
-+       snapvisiblegridlinesonly="true" />
-     <sodipodi:guide
-        position="-5.8455811e-08,35.983344"
-        orientation="136.00001,0"
--       id="guide4155"
--       inkscape:locked="false" />
-+       id="guide4155" />
-     <sodipodi:guide
-        position="-5.8455811e-08,6.6152344e-06"
-        orientation="0,136"
--       id="guide4157"
--       inkscape:locked="false" />
-+       id="guide4157" />
-     <sodipodi:guide
-        position="35.983333,6.6152344e-06"
-        orientation="-136.00001,0"
--       id="guide4159"
--       inkscape:locked="false" />
-+       id="guide4159" />
-     <sodipodi:guide
-        position="35.983333,35.983344"
-        orientation="0,-136"
--       id="guide4161"
--       inkscape:locked="false" />
-+       id="guide4161" />
-     <sodipodi:guide
-        position="1.1488343e-09,17.991675"
-        orientation="68.000007,0"
--       id="guide4165"
--       inkscape:locked="false" />
-+       id="guide4165" />
-     <sodipodi:guide
-        position="1.1488343e-09,6.6152344e-06"
-        orientation="0,67.999998"
--       id="guide4167"
--       inkscape:locked="false" />
-+       id="guide4167" />
-     <sodipodi:guide
-        position="17.991666,6.6152344e-06"
-        orientation="-68.000007,0"
--       id="guide4169"
--       inkscape:locked="false" />
-+       id="guide4169" />
-     <sodipodi:guide
-        position="17.991666,17.991675"
-        orientation="0,-67.999998"
--       id="guide4171"
--       inkscape:locked="false" />
-+       id="guide4171" />
-     <sodipodi:guide
-        position="1.8520831,34.131232"
-        orientation="122.00003,0"
--       id="guide4199"
--       inkscape:locked="false" />
-+       id="guide4199" />
-     <sodipodi:guide
-        position="1.8520831,1.8520574"
-        orientation="0,121.99999"
--       id="guide4201"
--       inkscape:locked="false" />
-+       id="guide4201" />
-     <sodipodi:guide
-        position="34.131248,1.8520574"
-        orientation="-122.00003,0"
--       id="guide4203"
--       inkscape:locked="false" />
-+       id="guide4203" />
-     <sodipodi:guide
-        position="34.131248,34.131232"
-        orientation="0,-121.99999"
--       id="guide4205"
--       inkscape:locked="false" />
-+       id="guide4205" />
-   </sodipodi:namedview>
-   <metadata
-      id="metadata7">
-@@ -227,7 +213,7 @@
-        y="285.35831" />
-     <g
-        id="busywidget"
--       transform="translate(-36.777084)">
-+       transform="translate(-36.777084,0)">
-       <rect
-          style="fill:none;stroke:none"
-          id="rect3016"
-@@ -236,10 +222,11 @@
-          x="36.247917"
-          y="249.37498" />
-       <path
--         class="ColorScheme-ButtonFocus"
--         d="m 54.239579,252.55041 c -1.250543,0.007 -2.495143,0.1722 -3.704169,0.4921 v 1.93529 c -0.8449,0.2527 -1.661835,0.5908 -2.4381,1.00926 l -1.370963,-1.37102 c -2.161292,1.27435 -3.963589,3.07664 -5.237918,5.23796 l 1.370971,1.37095 c -0.41972,0.77609 -0.75908,1.59306 -1.012872,2.4381 h -1.9425 c -0.31598,1.20946 -0.47768,2.45413 -0.48111,3.70419 0.0077,1.25055 0.17227,2.49515 0.49196,3.70412 h 1.935276 c 0.25263,0.8449 0.5908,1.66187 1.009239,2.4381 l -0.40516,0.4053 -0.965839,0.96586 c 1.274322,2.16125 3.076626,3.96361 5.237932,5.23789 l 0.965824,-0.96586 0.40516,-0.4053 c 0.776118,0.4193 1.593053,0.75908 2.4381,1.01283 v 1.9425 c 1.209488,0.3164 2.454088,0.4774 3.704169,0.4809 1.250081,-0.006 2.494681,-0.1652 3.704169,-0.4809 v -1.9425 c 0.845047,-0.2534 1.661982,-0.5929 2.4381,-1.01283 l 1.370964,1.37095 c 2.161309,-1.27428 3.963606,-3.07664 5.237928,-5.23789 l -1.370985,-1.37102 c 0.41846,-0.77623 0.756637,-1.5932 1.009239,-2.4381 h 1.935297 c 0.31969,-1.20897 0.48454,-2.45357 0.49196,-3.70412 -0.0036,-1.25006 -0.1652,-2.49473 -0.48111,-3.70419 h -1.9425 c -0.25375,-0.84504 -0.59318,-1.66201 -1.012872,-2.4381 l 0.40516,-0.4053 0.965839,-0.96579 c -1.274322,-2.16132 -3.07664,-3.96361 -5.237928,-5.23796 l -1.356502,1.35653 -0.0147,0.014 c -0.776286,-0.4186 -1.593221,-0.75663 -2.438121,-1.00926 v -1.93529 c -1.209026,-0.3199 -2.453626,-0.4844 -3.704169,-0.4921 z m 0,1.85206 c 0.62027,0.001 1.240078,0.049 1.852081,0.1414 v 1.87019 c 1.649396,0.2828 3.213623,0.9345 4.575942,1.90638 l 0.11949,-0.119 1.208284,-1.20827 c 0.995193,0.74207 1.877914,1.62204 2.622581,2.61534 l -1.327739,1.32769 c 0.96845,1.36437 1.616384,2.92978 1.895404,4.57961 h 1.880991 c 0.08946,0.6132 0.1365,1.23074 0.13741,1.85206 -0.002,0.6202 -0.0504,1.24005 -0.14112,1.85206 h -1.870176 c -0.2828,1.64941 -0.934451,3.21363 -1.906331,4.57597 l 0.11928,0.1197 1.208277,1.20827 c -0.74207,0.99526 -1.622068,1.87796 -2.615336,2.62262 l -1.327746,-1.32776 c -1.364447,0.96845 -2.929899,1.61644 -4.579659,1.89546 v 1.88097 c -0.61313,0.0896 -1.230803,0.1365 -1.852088,0.1372 -0.62125,-9.1e-4 -1.23893,-0.049 -1.852081,-0.1372 v -1.88097 c -1.64976,-0.2793 -3.215219,-0.92701 -4.579575,-1.89553 l -1.327738,1.32776 c -0.993251,-0.74466 -1.873249,-1.62736 -2.615326,-2.62262 l 1.208284,-1.20827 0.11942,-0.119 c -0.97188,-1.3622 -1.623552,-2.92642 -1.906331,-4.57583 h -1.870176 c -0.09037,-0.6118 -0.13888,-1.23179 -0.14112,-1.85213 9.24e-4,-0.6216 0.0483,-1.23893 0.13741,-1.85206 h 1.881012 c 0.27902,-1.64976 0.926947,-3.21524 1.895495,-4.57954 l -1.327739,-1.32776 c 0.744667,-0.99323 1.627388,-1.87327 2.622585,-2.61534 l 1.208283,1.20827 0.11949,0.119 c 1.36234,-0.97188 2.926574,-1.62351 4.575963,-1.90631 v -1.87019 c 0.61201,-0.0903 1.231804,-0.1386 1.852081,-0.1414 z"
--         id="path5"
-          inkscape:connector-curvature="0"
-+         class="ColorScheme-ButtonFocus"
-+         id="path3018"
-+         transform="matrix(0.26458334,0,0,0.26458334,-0.52916714,249.37498)"
-+         d="m 207,7 a 60.999998,61.000013 0 0 0 -61,61 60.999998,61.000013 0 0 0 52.5,60.34375 60.999998,61.000013 0 0 0 0.0625,0 60.999998,61.000013 0 0 0 0.125,0.0313 60.999998,61.000013 0 0 0 3.46875,0.40625 60.999998,61.000013 0 0 0 1.34375,0.0937 60.999998,61.000013 0 0 0 0.0313,0 c 0.15685,0.009 0.31182,0.0232 0.46875,0.0313 A 60.999998,61.000013 0 0 0 207,129 c 0.15564,-7.2e-4 0.31314,-0.0292 0.46875,-0.0313 a 60.999998,61.000013 0 0 0 4.1875,-0.21875 c 0.20839,-0.0188 0.41684,-0.0101 0.625,-0.0313 12.83843,-1.3057 25.21151,-7.11778 34.34375,-16.25 10.43684,-10.43683 16.49999,-25.115076 16.5,-39.875 0,-5.534972 -0.85031,-11.052726 -2.46875,-16.34375 A 54.99999,55.000005 0 0 1 262,68 54.99999,55.000005 0 0 1 207,123 54.99999,55.000002 0 0 1 152,68 54.99999,55.000002 0 0 1 154.46875,51.75 54.99999,55.000002 0 0 1 207,13 l 1,0 c 1.10799,0 2,-0.892032 2,-2 l 0,-2 c 0,-1.1079685 -0.89201,-2 -2,-2 l -1,0 z"
-          style="fill:currentColor;fill-opacity:1;stroke:none" />
-     </g>
-     <g
-@@ -252,11 +239,13 @@
-          id="rect3007"
-          style="fill:none;stroke:none" />
-       <path
--         class="ColorScheme-ButtonFocus"
--         d="m 53.84271,280.06665 v 0.43717 c -0.248425,0.0513 -0.484716,0.1497 -0.696085,0.28991 l -0.310057,-0.31005 -0.561206,0.5612 0.310059,0.31005 c -0.139694,0.2115 -0.237569,0.44777 -0.288353,0.6961 h -0.438734 v 0.79374 h 0.437181 c 0.05126,0.24842 0.14967,0.48472 0.289906,0.69608 l -0.310059,0.31005 0.561206,0.56122 0.310057,-0.31005 c 0.211484,0.13965 0.447772,0.23755 0.696085,0.28834 v 0.43874 h 0.793748 v -0.43717 c 0.248425,-0.0513 0.484717,-0.14971 0.696085,-0.28991 l 0.310057,0.31005 0.561206,-0.56122 -0.310059,-0.31005 c 0.139695,-0.21148 0.23757,-0.44775 0.288353,-0.69608 h 0.438734 v -0.79374 h -0.437181 c -0.05126,-0.24844 -0.14967,-0.48473 -0.289906,-0.6961 l 0.310059,-0.31005 -0.561206,-0.5612 -0.310057,0.31005 c -0.211487,-0.13965 -0.447771,-0.23755 -0.696085,-0.28835 v -0.43873 z m 0.396874,0.79375 c 0.429013,0 0.839763,0.17364 1.13869,0.48137 0.28781,0.29628 0.44881,0.69307 0.44881,1.10612 0,0.42903 -0.17364,0.83977 -0.481365,1.1387 -0.296283,0.2878 -0.693075,0.44881 -1.106135,0.44881 -0.429013,0 -0.839762,-0.17365 -1.13869,-0.48137 -0.287809,-0.29628 -0.44881,-0.69308 -0.44881,-1.10614 0,-0.42901 0.173641,-0.83975 0.481365,-1.13868 0.296284,-0.28782 0.693076,-0.44881 1.106135,-0.44881 z"
--         id="path5-3"
-+         sodipodi:nodetypes="sccccccccccccccccsssss"
-          inkscape:connector-curvature="0"
--         style="fill:currentColor;fill-opacity:1;stroke:none" />
-+         id="path3009"
-+         transform="matrix(0.26458334,0,0,0.26458334,-0.52916714,249.37498)"
-+         d="m 206.90625,115 c -5.68285,0 -9.90626,4.76331 -9.90625,10 0,5.11064 3.86041,9.24196 8.53125,9.90625 0.007,0.001 0.0245,-0.001 0.0313,0 0.1869,0.0265 0.37435,0.0459 0.5625,0.0625 0.0726,0.008 0.11478,-0.004 0.1875,0 l 0.0313,0 c 0.0253,0.002 0.0371,0 0.0625,0 0.16207,0.008 0.3377,0.0313 0.5,0.0313 0.0253,-1.1e-4 0.0373,0 0.0625,0 0.22673,-0.003 0.46154,-0.0123 0.6875,-0.0313 0.0336,-0.003 0.06,0.002 0.0937,0 2.08268,-0.2143 4.08105,-1.19024 5.5625,-2.6875 2.29078,-2.85585 2.42433,-5.2927 1.42433,-9.29269 1.22819,5.24703 -2.45297,9.87167 -7.86188,10.0102 -4.24948,0 -7.87455,-3.58819 -7.87457,-7.99871 0.0682,-4.85133 3.99957,-7.98861 7.93707,-8.00652 l 0.15625,0 c 0.16789,0 0.31534,-0.15426 0.3125,-0.32394 -0.006,-0.3677 -0.0216,-0.97956 -0.0313,-1.32579 C 207.36994,115.1624 207.24222,115 207.0625,115 z"
-+         style="fill:currentColor;fill-opacity:1;stroke:none"
-+         class="ColorScheme-ButtonFocus" />
-     </g>
-     <g
-        id="16-16-busywidget">
-@@ -268,11 +257,12 @@
-          x="58.472801"
-          y="281.12497" />
-       <path
--         class="ColorScheme-ButtonFocus"
--         d="m 60.280903,281.38956 v 0.34003 c -0.193218,0.0399 -0.377001,0.11643 -0.541398,0.22548 l -0.241156,-0.24115 -0.436493,0.4365 0.241157,0.24115 c -0.108652,0.16448 -0.184777,0.34826 -0.224276,0.5414 H 58.7375 v 0.61735 h 0.34003 c 0.03986,0.19323 0.11641,0.37701 0.225483,0.54141 l -0.241157,0.24115 0.436493,0.43649 0.241156,-0.24115 c 0.164487,0.10862 0.348266,0.18477 0.541398,0.22427 v 0.34124 h 0.617361 v -0.34003 c 0.193218,-0.0399 0.377001,-0.11643 0.541398,-0.22548 l 0.241156,0.24115 0.436493,-0.43649 -0.241157,-0.24115 c 0.108652,-0.16449 0.184777,-0.34827 0.224276,-0.54141 h 0.341237 v -0.61735 h -0.34003 c -0.03987,-0.19322 -0.11641,-0.37701 -0.225483,-0.5414 l 0.241157,-0.24115 -0.436493,-0.4365 -0.241156,0.24115 c -0.164489,-0.10862 -0.348266,-0.18477 -0.541398,-0.22427 v -0.34124 z m 0.30868,0.61737 c 0.333678,0 0.653149,0.13505 0.885649,0.37439 0.223851,0.23044 0.349073,0.53906 0.349073,0.86033 0,0.33367 -0.135053,0.65314 -0.374395,0.88565 -0.230442,0.22385 -0.539058,0.34906 -0.860327,0.34906 -0.333677,0 -0.653149,-0.13505 -0.885648,-0.37439 -0.223852,-0.23044 -0.349073,-0.53906 -0.349073,-0.86032 0,-0.33368 0.135053,-0.65315 0.374395,-0.88566 0.230442,-0.22384 0.539058,-0.34906 0.860326,-0.34906 z"
--         id="path5-6"
-+         style="fill:currentColor;fill-opacity:1;stroke:none"
-+         d="m 60.57642,281.3808 c -1.05492,0 -1.838921,0.88423 -1.838919,1.85633 0,0.9487 0.716617,1.71561 1.583674,1.83892 0.0013,1.8e-4 0.0045,-1.8e-4 0.0058,0 0.03469,0.005 0.06949,0.008 0.104418,0.0115 0.01348,9.5e-4 0.02132,-7.1e-4 0.03481,0 l 0.0058,0 c 0.0047,3.7e-4 0.0068,0 0.0116,0 0.03009,9.5e-4 0.06269,0.006 0.09281,0.006 0.0047,-10e-6 0.007,0 0.01161,0 0.04209,-5.5e-4 0.08568,-0.002 0.127622,-0.006 0.0062,-5.5e-4 0.01115,3.7e-4 0.01739,0 0.386612,-0.0397 0.757573,-0.22096 1.032578,-0.49889 0.425244,-0.53014 0.450034,-0.98249 0.264402,-1.72502 0.227992,0.97402 -0.455349,1.8325 -1.459418,1.85821 -0.788838,0 -1.461768,-0.66608 -1.461773,-1.48481 0.01267,-0.90056 0.74245,-1.48294 1.473376,-1.48626 l 0.029,0 c 0.03117,0 0.05855,-0.0288 0.05801,-0.0601 -0.0011,-0.0683 -0.0039,-0.18183 -0.0058,-0.2461 -9.11e-4,-0.0337 -0.02464,-0.0638 -0.058,-0.0638 z"
-+         id="path3794"
-          inkscape:connector-curvature="0"
--         style="fill:currentColor;fill-opacity:1;stroke:none" />
-+         sodipodi:nodetypes="sccccccccccccccccsssss"
-+         class="ColorScheme-ButtonFocus" />
-     </g>
-   </g>
- </svg>
--- 
-GitLab
-
diff --git a/kde-frameworks/plasma/plasma-5.86.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.86.0-r1.ebuild
deleted file mode 100644
index 9019b0099afa..000000000000
--- a/kde-frameworks/plasma/plasma-5.86.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="gles2-only man wayland X"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kactivities-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdeclarative-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	!gles2-only? ( media-libs/libglvnd[X?] )
-	wayland? (
-		=kde-frameworks/kwayland-${PVCUT}*:5
-		media-libs/libglvnd
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-PATCHES=( "${FILESDIR}"/${P}-revert-Change-busywidget-to-a-gear.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !gles2-only OpenGL)
-		$(cmake_use_find_package man KF5DocTools)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/plasma/plasma-5.87.0.ebuild b/kde-frameworks/plasma/plasma-5.87.0.ebuild
new file mode 100644
index 000000000000..1ccc68601353
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.87.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only man wayland X"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kactivities-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdeclarative-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	!gles2-only? ( media-libs/libglvnd[X?] )
+	wayland? (
+		=kde-frameworks/kwayland-${PVCUT}*:5
+		media-libs/libglvnd
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package !gles2-only OpenGL)
+		$(cmake_use_find_package man KF5DocTools)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 4daa7e43a2b0..ac32f6d2ffef 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,5 +1,5 @@
 DIST prison-5.85.0.tar.xz 47056 BLAKE2B 8cba0f739c93b759f3683eb1a5077656111aeeca13b367d5ca7689516517b56b1afb9ac255f486d2ad003a2b6b86bc7acf7be718badddddf042ed8bfa632da8f SHA512 29916598b8ce86ac84014f5b107012cd636965ae65a7071971155b898484e97e79e1cb78f67dbd77077e0ffaddf759cf0fab8b370ac1c0d92be0b9b9f06e406c
-DIST prison-5.86.0.tar.xz 47088 BLAKE2B 92af41e7c82b4d1b8f17784f19ad292f9a8c1c35cab470fb4a220b4abf91a6c7fbb92b3d735279f8adf4d156a0b673471f410a61a31ea91fec69d5695bb14731 SHA512 dd5fc163a29f992b8a9675cd7356fe87a52fe971726a0066cf7e7cc80dad09b3c2748ced55773c0bd0c7d2cd9594fb3500bf69d1af385c3d55e4c57dcae8dfe5
+DIST prison-5.87.0.tar.xz 47276 BLAKE2B d3d5ce977e54cc0cfa09798f52cac9ee447d95aad69ad1edd9735d4f8533ee3f89dddde97b6966c8a79b71114aefffb5c7fdcbd691036ee537e619cfa4cdabe0 SHA512 f136cdb01b4e57dd733189714dc0fee23821fb30a6cb6bea3afac610944eb0f826b66390bc8476e0bb81bd501381c96eb46659609c1a07ce363b9a0b65ebac91
 EBUILD prison-5.85.0.ebuild 620 BLAKE2B b7f2e3d7a86d4d2171c43102e5ca73cd90aac0d800bd481777bbc0621788c9bdf5532b36148fe491ca0c6f864e13ced4dd02c03e32cc10cd5325ef3ac2ceb4b0 SHA512 3818d34f9070bd73ba1e62530d112e59a922543d99fd5f4b5ca7a188b6fb159de9d0355ec5b35f076987d3921560cd632288fd86654233e58d87f091f55e7415
-EBUILD prison-5.86.0.ebuild 623 BLAKE2B ae2694c219641469f9eecc36c0b5381b9707ab51dfb1f7d9f0d518dc2d9fa1daf062a5fdaf044ffacee11fdae2252737cd2e4c7c70626dcdb55ecce4c4769d8c SHA512 b56396b658b00b55d985c4e89671b8fe5f04ca6128f8c7cd03895c1cd42e8c253bab6865102c233a290bbf5d37415557547d88b3f02c436584dbaaa11494a03a
+EBUILD prison-5.87.0.ebuild 623 BLAKE2B ae2694c219641469f9eecc36c0b5381b9707ab51dfb1f7d9f0d518dc2d9fa1daf062a5fdaf044ffacee11fdae2252737cd2e4c7c70626dcdb55ecce4c4769d8c SHA512 b56396b658b00b55d985c4e89671b8fe5f04ca6128f8c7cd03895c1cd42e8c253bab6865102c233a290bbf5d37415557547d88b3f02c436584dbaaa11494a03a
 MISC metadata.xml 560 BLAKE2B 3c60b8b8f04fb43ee27b250985d080758dfb521e4ed3ec0ee94dc36c57db90701504490a0b56bfad2ea9bfc7c6d3e76a4f68995c1b7d9213104d13a8de622259 SHA512 7c3c097098192485a17926575bc5d9a008c480ad01fbd89f94b218f709a2d8b7d913f067548cd51579a65e43c3d0847b0567e37ce9bf1b8ada53f212650f0144
diff --git a/kde-frameworks/prison/prison-5.86.0.ebuild b/kde-frameworks/prison/prison-5.87.0.ebuild
index ac5b2987ac95..ac5b2987ac95 100644
--- a/kde-frameworks/prison/prison-5.86.0.ebuild
+++ b/kde-frameworks/prison/prison-5.87.0.ebuild
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index f90eda50da2f..6428fef8d68f 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,5 +1,5 @@
 DIST purpose-5.85.0.tar.xz 161412 BLAKE2B c6d55396ebde4f8b3f08a71c429bce4f0bbfe1303907d06faf841ab53147a78b582bd63e4b731eb6c5d16b939dade6dab2ca30930a9fa31babb9c1b68c37e53e SHA512 30da8286d7eb8b0652656d0c52fe0f95dd4c3c1f86e468af5f9b546b0afc996dbf9f3a0e011376de5b58e34bf529faca9f3add7ee0e820ab693745c98e21b1ed
-DIST purpose-5.86.0.tar.xz 161844 BLAKE2B d0c8fc27012e2809de65f36f84355d11b484912e5bbfe32508ea4811fcb070cd614932b48efb5d7e9809d515947aa278742dbe8984c9de46de9526ab76445d0b SHA512 64a51a739fcbab8b9810a112a35c1fd217c0afc0baf5819e2ffd80594523fcab27cfd43e8957a310927757651f6bbfeb258f1a486cf7cf0c5394ad91b2304327
+DIST purpose-5.87.0.tar.xz 165172 BLAKE2B 8cd6954e9e518251f9b47c8d78d1e2573a6e52c16bbbbe0899f0023afd0acfac370f6d7fa09d7093c6f0269571f05792b25292590c2b3c294d2d43da57becbad SHA512 87a181c0d8d783684ba80e160ba57da48810c389a393f47f9e6017bd77d01d71b079375777fc89f2e61f964e50aeb0151085d86b9d8ae221572b9f477e523886
 EBUILD purpose-5.85.0.ebuild 1552 BLAKE2B 07f673dc0d780b0fbd40c7733b68b7b267ee255825ef363707efa6e452272ff8ce006674f0790d28595d433570a9369b591e5b6fdf2f7ebe7e17b4eaec1576f9 SHA512 0223d99ba4d13e814352ce90837fb41f57d724cf2c9b0b316832a956f04752a04cdbd9d6505f7a62bab6b06042f8980eebb2e1f2c08df556a009f784f14d8bd3
-EBUILD purpose-5.86.0.ebuild 1555 BLAKE2B 31374f09031e19b38d6592391b06af89dbd6059b6506201c145f22ecdb543f16b74753e278917bf6ba25661b8c9415ea970ec4cd02b7673323d94696ae3e3655 SHA512 7675dfbe8e7ffd70c025bbaff70daf04ede5002cd7ed1002f294fb0936e0b1e1b9ba65bb22b098afbdf9f18f1b806f4eada44305876483098223f06ad23f174a
+EBUILD purpose-5.87.0.ebuild 1591 BLAKE2B b9f25ec16645ea7300bff54213cee5c7572bbe7abd1a911b0be8fa50b38762b401d613142f959344f7dfa749e4af740ae5fbf7845c771f207ac103c2b25a7978 SHA512 9ff4a16592a68bc0710a69a97f080af6134f93300447a4a7c21aa1ac3621e976b0c908884102cba4a1fc26ee53558e17248679ead34bb631b6699447bf2522a1
 MISC metadata.xml 552 BLAKE2B b690292da1dd33f95eee7c08e13912efa3c683278c494d666eed7b29ebfff7852986009fc93ef86cea1e0c1a2e3f477810caf8c1fbffe6160da187630a9a9197 SHA512 5552139f71158888ea3d87b07a13492f12a502314fc03d7ef9ac9ea827aa2ae650bcbec7d872e2fa1473f830cc18ce630bf459e449e5cba44a6f8aa436e49a1e
diff --git a/kde-frameworks/purpose/purpose-5.86.0.ebuild b/kde-frameworks/purpose/purpose-5.86.0.ebuild
deleted file mode 100644
index 6993a98a7883..000000000000
--- a/kde-frameworks/purpose/purpose-5.86.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature xdg-utils
-
-DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="bluetooth +kaccounts"
-
-# requires running environment
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	kaccounts? (
-		>=kde-apps/kaccounts-integration-19.04.3:5
-		net-libs/accounts-qt
-	)
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kdeclarative-${PVCUT}:5
-	bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:5 )
-	kaccounts? ( net-libs/accounts-qml )
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	use bluetooth ||
-		cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kaccounts KAccounts)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Send through KDE Connect" kde-misc/kdeconnect
-	fi
-	ecm_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/kde-frameworks/purpose/purpose-5.87.0.ebuild b/kde-frameworks/purpose/purpose-5.87.0.ebuild
new file mode 100644
index 000000000000..8f61c83816a7
--- /dev/null
+++ b/kde-frameworks/purpose/purpose-5.87.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+inherit ecm kde.org optfeature xdg-utils
+
+DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="bluetooth +kaccounts"
+
+# requires running environment
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/prison-${PVCUT}*:5
+	kaccounts? (
+		>=kde-apps/kaccounts-integration-19.04.3:5
+		net-libs/accounts-qt
+	)
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kdeclarative-${PVCUT}:5
+	bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:5 )
+	kaccounts? ( net-libs/accounts-qml )
+"
+
+src_prepare() {
+	ecm_src_prepare
+
+	use bluetooth ||
+		cmake_run_in src/plugins cmake_comment_add_subdirectory bluetooth
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kaccounts KAccounts)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Send through KDE Connect" kde-misc/kdeconnect
+	fi
+	ecm_pkg_postinst
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 3af7e0094959..02d10d052c10 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,5 +1,5 @@
 DIST qqc2-desktop-style-5.85.0.tar.xz 60580 BLAKE2B 15cde2a32102e64db7b9f94d894d67d4f067febeec622231ed8bb78909453c7f3207568d2c9a3d84e0c655b54bf7367bd9c6db711ea70bd388fdda7d9bfbc445 SHA512 9129044781a3bdbed7af932d498cc87b9d6b65f95833502e934245afb31337a71a5c578f36a74fe5f5aa88b33dc56b8fa682a4d8b938c0d62025cad1ff3bd18d
-DIST qqc2-desktop-style-5.86.0.tar.xz 61812 BLAKE2B a16faab5fa5332abfd86506caef945eddeaddd84ea5833f3feeee3d0cbd045359cb4298d09d98faae5eee814cbf13f710f31607c2b1485046be91de18b1f397e SHA512 884592f93e21d2b8fd81a9c7c2043973163bcff53f61c3ca60832280230e11e88ff2862f7cba4917b1b75ca94be0dcc6441c0810ed57c22c310e86502e9bf385
+DIST qqc2-desktop-style-5.87.0.tar.xz 62100 BLAKE2B 259fc3c846d9fd67e40b4f83bff920cd5b0be9b0957464a0672cdadfd7d76a3d44754575928d0a1f072f63523899870782ee311d2f19bc0722bca432dc92ccbb SHA512 0a9720067f21f53281b16fe030301419332a3b9743039ccf3a61de69f375065a2c33ae7012482db499da759b5315cb576126578f0e9ba3e93573a25756bc7373
 EBUILD qqc2-desktop-style-5.85.0.ebuild 684 BLAKE2B e03ccb1beb1031ceb29ac4c6996596f0344a7601fae0b8cf177626db3cdbce0a28b1be95690834893e52483d152b844b2008521d5210deda213f53dcc5f8ddbe SHA512 443f37143d414ddab3172a3ab763340d6addeca3dfb530f8c04e0bf59338139ea5edb70f2a8c2b8e87a8e61ae6650730c1026bb2a0e05825422938ccba2bb429
-EBUILD qqc2-desktop-style-5.86.0.ebuild 687 BLAKE2B 9f2e7b6f5d5d70d048f66454570fbf0d8b9a7ddeffa62157c9aa259bf6cba8c45a9d4633d62a2e4c7effb20241c30085907bd245bf80b5813fa4f8eb6ce09d29 SHA512 b5504f0fbdac27678dedc4a500fffd74a6cda3f321a023c1b09d4b5f0bae8011f2955ba1457eabec4a6cc7736ca4854be428941ad03198260e2cfdb54a091ee5
+EBUILD qqc2-desktop-style-5.87.0.ebuild 687 BLAKE2B 9f2e7b6f5d5d70d048f66454570fbf0d8b9a7ddeffa62157c9aa259bf6cba8c45a9d4633d62a2e4c7effb20241c30085907bd245bf80b5813fa4f8eb6ce09d29 SHA512 b5504f0fbdac27678dedc4a500fffd74a6cda3f321a023c1b09d4b5f0bae8011f2955ba1457eabec4a6cc7736ca4854be428941ad03198260e2cfdb54a091ee5
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.86.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.87.0.ebuild
index 1bd33428d23c..1bd33428d23c 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.86.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.87.0.ebuild
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 820983d2319d..2528cca9ca5b 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,5 @@
 DIST solid-5.85.0.tar.xz 251032 BLAKE2B 31fb2c180506ee52955753c9fdae262d940d8e21b626ba9ef3e41b43cc0a26fcc901d7991a5e7f174eb218109cf992dcfc2f05c7bbe3d96b8144634ec8443c48 SHA512 e84148cdc76d8f0c075f5e064c4e7b5a886fb1beb6f343f9ab450cd17db8aa5094f839dd0fc383bc4ef1764e75f1444841bd802093343544cea99ab9668ac4c5
-DIST solid-5.86.0.tar.xz 251184 BLAKE2B d9089f9b8660bfeedc8c8ca78cdd450c769ce621a09948bb4475791d4f605b40da65b745fa5359043dcddd21fc43e9ec69d079bc22a2f6b4645ae63e48b92b92 SHA512 3076c9a060bfdaafc52f3a1eefcb2213320bb3c18d59b0b85b4f90e587291d2f5447ffe11a307b50b08792ae4faefbead88bc94dc870368dec8f79a6d6d7b6e4
+DIST solid-5.87.0.tar.xz 251332 BLAKE2B b191217e57c3a8235da88f2555aee38c99b98cfde77ff32a9666ffb0c39fcc42e969e25a33fc0a0cb56783e8964835cf84a46051bbfbffe818fdab427edac373 SHA512 c77b201e6b304534b1f932912fd6a650801caabaabb03d6b3826d0c21c625556bb243d04186c609070530b8ddd4aca33c655719cdc18b1a96444422ff36cbea2
 EBUILD solid-5.85.0.ebuild 1067 BLAKE2B 04aa78cc9d87f160227816e57973a79d63f17a01f045e4be31999d6e767778afdd033af46a813400877d36e66d52ad94d2be1d159c2c8b07254aca749aab4ccc SHA512 0e2023326ba841c84c7e49ebd5eb038fdc6b3393edc24871cdf77c2e1cff3c365aa3e70ab3e5ca42983c9d5c16b02af978752f9961ad0532da3462da78f84f95
-EBUILD solid-5.86.0.ebuild 1070 BLAKE2B d7ce403eb14867ef0739eeea302f6ca21698ed069fdcb70daa4d2916667c5ecec8f41391ba848303d95d07dd0f9d3abe860a7950038b22a6c79e066db37308ac SHA512 4169376cbab73770a794faf56d32bf8f7c989632726c308d105e8f6114647afbbd4925a1635634795d12978d18d9dd67d16d658e0d550455b7a05f7477c278dd
+EBUILD solid-5.87.0.ebuild 1070 BLAKE2B d7ce403eb14867ef0739eeea302f6ca21698ed069fdcb70daa4d2916667c5ecec8f41391ba848303d95d07dd0f9d3abe860a7950038b22a6c79e066db37308ac SHA512 4169376cbab73770a794faf56d32bf8f7c989632726c308d105e8f6114647afbbd4925a1635634795d12978d18d9dd67d16d658e0d550455b7a05f7477c278dd
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/solid/solid-5.86.0.ebuild b/kde-frameworks/solid/solid-5.87.0.ebuild
index 522552e6a6eb..522552e6a6eb 100644
--- a/kde-frameworks/solid/solid-5.86.0.ebuild
+++ b/kde-frameworks/solid/solid-5.87.0.ebuild
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index eccfdc7b1c7e..de0b2db38a13 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,5 +1,5 @@
 DIST sonnet-5.85.0.tar.xz 297068 BLAKE2B 7f5bad0ebe851443dd2150be3784442008ffd7ad7acdacb42d0f3495490477a1f570a0aec6dd1b600ca01a5f9fa13c87f56cceb50c98cc2ab399ce85bc04c369 SHA512 50ed8787a8c7378574376ef0539b211eafb349f139fabe6d22788af91d57e758c994ddfdf72d83d76009570dbc8dd4bcb3df3add5c9dc17347b9263e09969930
-DIST sonnet-5.86.0.tar.xz 297144 BLAKE2B f85e898cafdf3c45544c73c9a6867a344de6000ef884a18feab6113bbc1d4cba410fc7e32d2e6559ce17ac2bd1c1d084f0fcfd0c6368bc2a9f2cf5e7d68e3276 SHA512 11d9a736180868fbe79c66cfeaddbcb9b24f3dc33387520536ce24de5a2fcd4e0a205b0bbb74d8c143e923a17d4872fb70945072c960ae04e580e3ed1dab3711
+DIST sonnet-5.87.0.tar.xz 297372 BLAKE2B d889e81eb6553adb241ad47c4687faec8460d9949c6612dadc59ad383eb82fe909dd79a0ce67738acc2db3818c1e096dbf68c0c79e751176ee0b7c536cee3b12 SHA512 ca3f2abe345c50d6914a6a76aa1983992703161424eced64cad8e190d5ae04770164c624e9d1d619bb8aaafb942e322f8c0267568d3f181e0dd6de9b05cc37fd
 EBUILD sonnet-5.85.0.ebuild 968 BLAKE2B 3e264152e50fd2dabee5fc293266c6e26b32b5088bc978d68c5f38b3e3a6407bcff595350c9c2fedbdabb7a2368fce1ce92345d6888537b11ae4a8db9184e6a2 SHA512 ee87b608395854738fc5fc57c5f205852a964f4f9dffbbbbde20ac42982ac0366400d043830c690dc57d16958e74fd1c5705d59fccdc97b7461ba5ccbdecca58
-EBUILD sonnet-5.86.0.ebuild 971 BLAKE2B d898144e91a4da5293170b77fb00e8d80b180cf4b326bf3c406e4cad9354bc64ce6b2a4648d8cc759d62d35daabcef39370e0c1bfb5bfa491232347814371220 SHA512 fed8507e03184712f6a0672a7c612b2d35faab15a9990ba722148da97a6a49ba4fd78c7b59deaca0006572e945e736e35019892fd4fe8b32264ad7eb666211f7
+EBUILD sonnet-5.87.0.ebuild 971 BLAKE2B d898144e91a4da5293170b77fb00e8d80b180cf4b326bf3c406e4cad9354bc64ce6b2a4648d8cc759d62d35daabcef39370e0c1bfb5bfa491232347814371220 SHA512 fed8507e03184712f6a0672a7c612b2d35faab15a9990ba722148da97a6a49ba4fd78c7b59deaca0006572e945e736e35019892fd4fe8b32264ad7eb666211f7
 MISC metadata.xml 709 BLAKE2B 7436241c5542580a5f9cc08781ff16c6dd31ca866bbc05cbb078c20f0d2fe8a22a34d7bc44dfaa5a87f65a0d0b63ef0541a18f0862814d8fe81af55f3c9ddb2e SHA512 e1161989670ee8d28915bc54209bd07f06ff021c0f78c32fc07167db5ab20380d0b3b413b4eb195bf2ac6d20a654a99ec305516d0d7c9faaa7077f04c39ff71d
diff --git a/kde-frameworks/sonnet/sonnet-5.86.0.ebuild b/kde-frameworks/sonnet/sonnet-5.87.0.ebuild
index dfbc16b70395..dfbc16b70395 100644
--- a/kde-frameworks/sonnet/sonnet-5.86.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.87.0.ebuild
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index 6f2a4df6a90a..f5e2dfb5aa61 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,5 +1,5 @@
 DIST syndication-5.85.0.tar.xz 508288 BLAKE2B c7c90e7a8735ec3cadf9e290644e87dbc1a18996150a779146a2a0bc4a8e838b0bade9d4f486901ddeaf4eaeae1a9f9c883e4ac589a53cb591f8faeef465a8d8 SHA512 d0f57e7fcd02efaaf69b90c921767c7f053e8dbe43c63963a56329e1fc9da46ee14980580f44e0015a49482ea2848887f1e92b4151973c5a60cbd7ccb4365f64
-DIST syndication-5.86.0.tar.xz 508296 BLAKE2B 508e4800e4c4d7073f6c88eb9b5420f6059871bddb665530a01c5f434c52cc568736631252c122fd6afa41a0d9f60681bcd001217d6bd956518f222834ac832a SHA512 6268e7693ef385afd40ed6e33086b41fdb3b4e0ac8f9fd4bca794ebc81a5aa045ddf82c6e9695ca43bf191ce823392f78a53ce33bc2e5b88735afd2f507a33a3
+DIST syndication-5.87.0.tar.xz 508588 BLAKE2B 5c8fff2e5e378082458ba2c01fe2fdb5ab235bea75c9ed1c82a262bb30620047fc164c5edd1ef88b3ad2eb0c7736993d51ea95d7e05cbb8b9673435deb7fcfc7 SHA512 865ba7633e19db43c3adee9317d1072662bc631363a5c262f34f99eefe2647b3149e7cc919eb2b0a5af5cfab1dbb50441e35d5287a0d69777460d052281c5815
 EBUILD syndication-5.85.0.ebuild 449 BLAKE2B 615bc639fe907cb37ac27cca68c9b3f66e21757c473d759c1c77cee83a3128050e05ec4a168984ed266dc99ec4bed67a666ab9b93df39ff23e39244e394f9e1f SHA512 b13bb529dd887c11050f2695acae5a4c00e2ca1b2f56e1e264e9432eabb68928f858c9943179a3e4e2312dc190cd46be3158420fb6fb0872e1b4b6fdd164070f
-EBUILD syndication-5.86.0.ebuild 452 BLAKE2B 3427934acb082b9e46605d69a8edb15c0bb43f3831c4f2d8ea3d15ca0183ec5e79d23a94c14fc45ef4b310ebdf54af859ba1b540982d25b17b3d41803d094486 SHA512 930815db662f6660646731c1e91f5d7158027fa0f01d7984bc6080ec27507a8f0aa37a2d1c797577b1de9969aed783c2c4cc5f43cce461dc0f4f902614e704e6
+EBUILD syndication-5.87.0.ebuild 452 BLAKE2B 3427934acb082b9e46605d69a8edb15c0bb43f3831c4f2d8ea3d15ca0183ec5e79d23a94c14fc45ef4b310ebdf54af859ba1b540982d25b17b3d41803d094486 SHA512 930815db662f6660646731c1e91f5d7158027fa0f01d7984bc6080ec27507a8f0aa37a2d1c797577b1de9969aed783c2c4cc5f43cce461dc0f4f902614e704e6
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/syndication/syndication-5.86.0.ebuild b/kde-frameworks/syndication/syndication-5.87.0.ebuild
index c36c2a59b68b..c36c2a59b68b 100644
--- a/kde-frameworks/syndication/syndication-5.86.0.ebuild
+++ b/kde-frameworks/syndication/syndication-5.87.0.ebuild
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index ce718de98619..300a113a3490 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,6 +1,6 @@
 AUX syntax-highlighting-5.85.0-python-add-yield-from-keyword.patch 11150 BLAKE2B ac67afb36241a591e9a773d359452f8c101df21a62d332e76617be455f962e944a18c7c1cf61c2b37ccba85a6079c509290e5dc7f2897173e6c7e46e20226571 SHA512 cf5472233c61033625e178dc19bfd5ffb2181b2ecdb969807feceb38645a74dcd04909b01d1410fa71b597654bcedf81c09626ef5973c7f909d03822183c3231
 DIST syntax-highlighting-5.85.0.tar.xz 2334784 BLAKE2B faaa2e57b4f5acc6b090e0ffebbeb70715dc164f634683b2d442017087aed630581ab5d91e04fd4591d28c3a6d7bbfff395a36af6ed3911de79a512c00fe1f3a SHA512 d01ef96ba4fc2c281918850adbc72239f60875a6c9f1c589286eaa4cb7a18be96e8b184f77e1a056ed17ece7d70338e4b6fd7cadf69a307e4a8bdc0ce6dc3d38
-DIST syntax-highlighting-5.86.0.tar.xz 2344392 BLAKE2B 79c76d6e6a7fc407378d9a0406f5bba2c2abc6cb05ed718e08339ba1b1d0bab50d13786cfb16ed14f226cc6ecdfbb365af33af44db06f9926c623e29a24fc3fa SHA512 f69ba9e163a3c2653f3771bd32f71afaedf53eee4a7cf1c29a91042214d594662d163d9da27f2dce0fe4d421bf05fc378f16daec518a9299a56a2c49339997c6
+DIST syntax-highlighting-5.87.0.tar.xz 2348100 BLAKE2B 10a73b32dde360f0bce4092152fc09d1f174d0ea6f5b602548d81daeebf0a0bbac19081654e10b25285897d1804d61e7764dfda8f34dd01df83c8c2882a0793e SHA512 c80c1fa6b33e2cc54e4098b875f09d9ee6658d76ad71602e602629b565402aaa70d2c6853fb12f4dff6ef94f84a16aad307e5d955aad75fa11b6c514a3eb96a6
 EBUILD syntax-highlighting-5.85.0-r1.ebuild 660 BLAKE2B e861fac8517510979628715a60d0ac0155aa03a46d486e470b8a0d4c0f2c7459311e07af65bd069c67bfc313b8983d47ae78e045f571c33da7c842a026c82e7a SHA512 8e8f123727f2bcd03a2e8f5e977a9a96cc5e0e76a8ae2bc446cfb1e8f30d58f55a13dca64914b6539fb6a0c5df2bb1ca2ee99f2af998e99c7583cecd7a389f76
-EBUILD syntax-highlighting-5.86.0.ebuild 577 BLAKE2B 1c26a8b4783dfc03d580051bb11e758d4bf5e7a007915aee94cc74b620a9935d393f9dd1fad284b7028dd456dc8a66e496457c69132e5e33aa79b7cf0d85ef5f SHA512 b7a4dbbead522ec4dd87836a8aa7543e0f2e3f248130ccd1efd5e3ecfddcb840bb43b6c655c24b7a4609cab7597ffc105c281ccfbc27fa2e7e287bd390f745e5
+EBUILD syntax-highlighting-5.87.0.ebuild 612 BLAKE2B 865b99b2cd6fe42069a21f2ef893c051807811721f7cbdcf87183033c1bc9dda8b94cee3cf44a369843b1f87c4b349d805c403b991986e972a20281b7c16d02a SHA512 bad503e1715ec2082ca6875db5d53ba4466b251dd6ec9e879e6a2146b2f7a9a18886bfd7d37944d3841d5bb464fad6ae71429bdb6e732892749d449bd6737eeb
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.86.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.86.0.ebuild
deleted file mode 100644
index 0988126a5fab..000000000000
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.86.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework for syntax highlighting"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="nls"
-
-BDEPEND="
-	dev-lang/perl
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	ecm_src_install
-	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
-}
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.87.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.87.0.ebuild
new file mode 100644
index 000000000000..094222310b95
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.87.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for syntax highlighting"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="nls"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-lang/perl
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+
+src_install() {
+	ecm_src_install
+	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
+}
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index 20dd1886cf5a..91e49e65483c 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,5 +1,5 @@
 DIST threadweaver-5.85.0.tar.xz 1410060 BLAKE2B 06c388dc224926482092903159d168348da2289808157517529c9180dad5bc8782dd5d171bbe28645fe6aadd59aadf7c14802a4ce6a7eba37634c4507ce25859 SHA512 4c2de589f9648dc56a05789349dcd45a5e7a75fd5804e82f9e4f418330404e66028450f3c713f184ebec1c8c53d46df7f3d4264f3f3284acad3e4dc7812ed199
-DIST threadweaver-5.86.0.tar.xz 1410096 BLAKE2B aab331f2b44cc03147d961849b30a6f5a2d3a8de728951f6d136ad08a1a008cdb67105abf9b34ac25ba52f262bbef6264d7b331f29a79011324b2df75e055d13 SHA512 94d2013d21c36905ded45e83a0343e2a133c477092ca3930dc57c45d83f04d60d43b961a76c9b631faa4f034219b14b5ebc4295d95ad1e6f217234e6e163f80a
+DIST threadweaver-5.87.0.tar.xz 1410660 BLAKE2B bb3fa742d828a9c9ff9165c11004a2caf1702b9ea1b017cea16d0c1df0171c2f035dfdf91345ef4eb8f86d012db031e8c61cb5e7503de1e4b73e8f063bd99741 SHA512 64a41955e35b6d97067c018c5c43033a30125a8bae5a6e3cf41b170f24be46551e40e2e2cef1e35d51d643aca0c33d88f50fc9281cb3a8a8308c70a325ba9399
 EBUILD threadweaver-5.85.0.ebuild 367 BLAKE2B 1d47c6f97ffa955c888927b3b9cd25db2efe111a679289054e94505a3d1e991ff03c5c68e769869613bb90c97f38a33a9f97225805e65d955ab343c366abf6cf SHA512 d24473dccffeb54b6f41033eafea39de72d40c6b44cb86252833cee1dcdcdc4a7c3cb8a4270755ffc881bf63e1f6c81490e0c70f65d38c5044e23efbcb4ac41d
-EBUILD threadweaver-5.86.0.ebuild 370 BLAKE2B 4b1cd2470f58a3243979fb62e5d26ff5aa28b3591b06790bcfbadac2a187a3958e475505b55bf2cba28e8e8fb35371107a0df1a062a7f3302173f36fed6c67e1 SHA512 fba9c8f4a03b5460dcb7e196934691debb31f098801dbe1e4f69ebb38a1dc701b4f0303bc4b2ef64e27e9ccf0bb980aeffb88d0a1c44ff6c82b85bd2b01f965b
+EBUILD threadweaver-5.87.0.ebuild 370 BLAKE2B 4b1cd2470f58a3243979fb62e5d26ff5aa28b3591b06790bcfbadac2a187a3958e475505b55bf2cba28e8e8fb35371107a0df1a062a7f3302173f36fed6c67e1 SHA512 fba9c8f4a03b5460dcb7e196934691debb31f098801dbe1e4f69ebb38a1dc701b4f0303bc4b2ef64e27e9ccf0bb980aeffb88d0a1c44ff6c82b85bd2b01f965b
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/threadweaver/threadweaver-5.86.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.87.0.ebuild
index 5b5690a5e3b7..5b5690a5e3b7 100644
--- a/kde-frameworks/threadweaver/threadweaver-5.86.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-5.87.0.ebuild
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 87f9d837b183..ee05f1561fc0 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
index 762af2c8259f..50fa095ca691 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1,5 +1,5 @@
 DIST skanlite-2.2.0.tar.xz 2415104 BLAKE2B 4ae5d909cdfdf55a552c11346ac689190aa67fd960e2af98ccc02cbf834ec6668e2926a5ab8a07ff6c4a4ef375dc1979250686c5ba05f1a94be4c59026f44f1a SHA512 cbf4c85894c742f025147950f1586252b92e0b3ad9f51b917649c449d46387a4673141e7645cd7f0b005b4c50dd671f2217d35e64ac84e97afa7a6562a961b20
 DIST skanlite-21.08.2.tar.xz 2426088 BLAKE2B 05b46c4fce4c2288754b0a73e45f6348415bdca7cdd8d97d71dbd1aa6558fd099636ec79e14c13dc4415cbc4594c0d84b108b0f8b3732ebad99860997c8689b4 SHA512 7deca0ab4bc093d92875826b10b5cf8519c105f9ef6b53d3bc0844effe32a7aded0b02cba75d225bd020ea772c247b66bed473a41835ef4de74a48e7ff6422cd
 EBUILD skanlite-2.2.0.ebuild 953 BLAKE2B 727ec672c3c0a3d51ac4912832e5741567844524a1c97d2e0ed2a83c613ed9dc61fb60c326a4fc31996751a47dc1da1763bc64302ed2382a2f9c169bbc83efae SHA512 d73a6312f95cb05f1f53457c16ce9cc8a8887dca45b03e5b6e9aa7df67b848352283181472f5fbf9e2909e4a8e0f5b5889a5ed3775b65b069c8f56d05dceb03b
-EBUILD skanlite-21.08.2.ebuild 947 BLAKE2B 2606c260563030d1967ad5942379e15a0ff37d1f47306e9f735616932547a9ebe68722fe46c7d81f74c51c078eb42050dd0734ed66280c1faa1fdcb144b85355 SHA512 5792101c06838ce78a0772352211e3cb2a4c73968da524ab62a33dcc2210cf88aa1d80fa7802e8b7ea2af9de8b633e0892fcbaee6e927b2bb04d0b3d7f0a4e16
+EBUILD skanlite-21.08.2.ebuild 954 BLAKE2B f6da3a820a9783edfaab26f23fc4dcd99821a9a6145395c017a84a89efd46fc2839c01cfe2a806da95e1ea9f990f8b8cc20ccb9a97492f50683bb7e143b6a903 SHA512 f63f6492d716e5f1c42074bae542ea7d58abe13825d140e84e7321224248a58e5cb0f37ea143d7f9f7150c9aace2517146617a641befe8c5c17ffd6f7ac3a8b6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-misc/skanlite/skanlite-21.08.2.ebuild b/kde-misc/skanlite/skanlite-21.08.2.ebuild
index 7ceef3e76dca..195f717e8822 100644
--- a/kde-misc/skanlite/skanlite-21.08.2.ebuild
+++ b/kde-misc/skanlite/skanlite-21.08.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://apps.kde.org/skanlite/"
 
 LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 0fe27ec528b8..04aba7145e87 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 0b32bd38b24d..7dbd73072f2f 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,5 @@
 DIST bluedevil-5.22.5.tar.xz 162740 BLAKE2B 2561bc614083bb7548c752330588d46afe99c0a0e7c215c8079044b240dce6dda8894aecf67d9af6750a1dbef5259e4e508d672485fe9ede215259bdb41e9480 SHA512 bd92fb1bd55f29916a5e4818785e9be43f7eec01bb5ec9ac35ffe5a8e20ac11079261f46f96a7e60d2f6c5b9b1a06773de2bd525f796d4e0d651edc5056202ab
-DIST bluedevil-5.22.90.tar.xz 168576 BLAKE2B 2546a3fd3c4d0baee81a4a4d41aa67b8ddc0dd83cb871684b5406d1cbe9a341c02d4b866d78e5bffbdb2fb6a96eef9d56fbb80db52918a416ecadd00462d0c4e SHA512 8a6ed6444fa36d596d12d1c09499bf39d85cbbd29e6b172260a567c343712a1f08d19b1d9f936949762031223447359989cec287c8018cf8f572d0e75930ee73
+DIST bluedevil-5.23.1.tar.xz 169056 BLAKE2B cc2368853e63ec6ec3f29d88fcd85319bb4db66732b6a67ad26559b04fd1afdd7c7daa6c1e8db054f92cc2ebc2d65a01ac9c0c55de486b533ce7d387dd60c20f SHA512 29b5b809110688fae814ece2bcba7bd9df9d7321b55aadd352b5cd996ab097cabf632293c5266dc3d5a883ee60e968250519e56619c1bbd0db1c8c3f13f8dc0e
 EBUILD bluedevil-5.22.5.ebuild 1118 BLAKE2B af4d6e101a1f5cbc513d2d0155ce7a93a97bd509f7bf53827fed90dd98feaabdfdff2ea76ab0996caaaad958ec0a81c57c7f29d8e41c346304e2915ef46660b4 SHA512 25872950b76d750fc4f471b1efdfa70534010b538a504c5673d55910cddea9662e0f1b1ee76d6bc08086b44de5a18a11cda159913b42d1e50848c4afc3ab312b
-EBUILD bluedevil-5.22.90.ebuild 1121 BLAKE2B acbda1f0abf4912eb5b7da6bef58762d4796f1b557f67c5d936da99ce19106dbb7469ecc404aab99181089cd5edcaf38a2695f0db02f5ffb6960307ebfa5ac6c SHA512 a65f37ff96ea819771df1b869bf1855c4d258a4678ec1711fe9b7a05b31ac129eaea98154645fe3cbbb616f67265b1dfa44d18a8c34e9a681d1c1967b3ce924b
+EBUILD bluedevil-5.23.1.ebuild 1121 BLAKE2B acbda1f0abf4912eb5b7da6bef58762d4796f1b557f67c5d936da99ce19106dbb7469ecc404aab99181089cd5edcaf38a2695f0db02f5ffb6960307ebfa5ac6c SHA512 a65f37ff96ea819771df1b869bf1855c4d258a4678ec1711fe9b7a05b31ac129eaea98154645fe3cbbb616f67265b1dfa44d18a8c34e9a681d1c1967b3ce924b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/bluedevil/bluedevil-5.22.90.ebuild b/kde-plasma/bluedevil/bluedevil-5.23.1.ebuild
index a5596eaace02..a5596eaace02 100644
--- a/kde-plasma/bluedevil/bluedevil-5.22.90.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.23.1.ebuild
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 6496d4402065..f674d37eeeb7 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-grub-5.22.5.tar.xz 3144508 BLAKE2B 6c26fd22a142d00c904396eb460a10dc39b4206c0937d83a5fcb1d617ea278e67fa6b8d6fc6a2d22c83061664dd1b842c68387a71c9c000ee8942431ec1d165e SHA512 09071d7256c0ce21c13e13803aadcf044af2ea54f69335c3d7cb773d2e45d71932de9e3d2f8e662b6d5ffead9a216e8c6f1a6c298fb99893d2a1ae27eccc74d2
-DIST breeze-grub-5.22.90.tar.xz 3168652 BLAKE2B 3c3d6d6f34afdd8bd9d786b356b848860cf205ffe7f6635eb29c97c68f7f68dc682253d468d823957d83cc2e5f6d1134b77149d8d5d1f29edae65e5385459c72 SHA512 93c2a36b6c6f921f04e4b076a4b67a50d94d695c7886f4c56ec4ce9957d5f7a7c7c23c95d7cd70b0f1c513507089b574dae50fc39ffc985f1d0056a072b02ba4
+DIST breeze-grub-5.23.1.tar.xz 3158076 BLAKE2B cd45478f93e3bd0cccbde3676726126416f9e4797950647f9517a41204dd529f4cbabe4924d062ffd533cb2b91cadc6feec54b2c6f18a08957fe395cbd4cbcd2 SHA512 e78bddcca549999290cd6d2ecb48e5ab6a5c2c3a54eade2808f8bc4e7fcef95f193293fd6c809227fb4efc02f85fec718b3819eca97ff358600e0fa74569d324
 EBUILD breeze-grub-5.22.5.ebuild 401 BLAKE2B 9cde80ae6be6a89ce4f79d242593049449421a6a463d221f723281d37435e70cc7a4f5afa98d0ac58faa9d1f0b833e84e4a195bda0ef2ad2516d6a374d10bd95 SHA512 289c25ddacb017aae7407da80b6ba50a40e69fab568e7e5dd6fc40970fe52260c80fe8f666114bce7e561b77b274722474f6d927d6e3994145a914746d651fda
-EBUILD breeze-grub-5.22.90.ebuild 404 BLAKE2B f56fac7bd9f2f4af79a51d606d0d646d81551530c3af69e13a98928afc8c6b14dc3ceb6dae3c4be4a2fe37f61e24c4ddab88fde0bb934593b10f94a7e124fb95 SHA512 70c16c418794b8531a329d6ee3c1c67ad46fa0421aada4e4f944530b777d06737bc3c7c099c5b75d178d9ca6d55418f91304b23f21772d0dddf28d6e2d661ab9
+EBUILD breeze-grub-5.23.1.ebuild 404 BLAKE2B f56fac7bd9f2f4af79a51d606d0d646d81551530c3af69e13a98928afc8c6b14dc3ceb6dae3c4be4a2fe37f61e24c4ddab88fde0bb934593b10f94a7e124fb95 SHA512 70c16c418794b8531a329d6ee3c1c67ad46fa0421aada4e4f944530b777d06737bc3c7c099c5b75d178d9ca6d55418f91304b23f21772d0dddf28d6e2d661ab9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.22.90.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.23.1.ebuild
index e05a4cd33bed..e05a4cd33bed 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.22.90.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.23.1.ebuild
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 5225862dda38..d77af7ff4185 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-gtk-5.22.5.tar.xz 47424 BLAKE2B 0252cad49e10153c99bffdf6ee355057d023bd867b53b7ce9f67c72808a0425efe5a8ae845297f0c1f558d7e5c33299de417fac78589001a59f0b863669153a8 SHA512 91ae3512ce71f04a7694e439b763b99faf10ca43af1b68790ae6822b481e43a769254add15fab01d9b45a5306a50ea5d59493638df9d6ca526dd8c2d54126c9d
-DIST breeze-gtk-5.22.90.tar.xz 47560 BLAKE2B b525bfea1840bf276494d56b12f56ac6737126ce8f67952a16a9f7920d27521a7f2ed9d70929d3ea006d7c070e90558859eec17bfbe1de76acf683617384c833 SHA512 9791b30ef03e6baf9233c5e5a8f2a6ff41cdf4d442fd4eb632d924572af58dc3798169c37f9e56c0a45f268df1d249f3bdc75fc20a1dbac0b3656648c936be49
+DIST breeze-gtk-5.23.1.tar.xz 47604 BLAKE2B f57cfef830031f873be33c449691ce04307b81a686086c9a7818a170b2b3dbced33228a57b154077ea3bb64a1e594371c71bceca8975e48097b7895ea81845d4 SHA512 96c9ab272738025cb145a31d808a6104430232448e3c70560a0a98850f9a7dc53a95a41dc91d931ccceef86de02bed5aa0dd80eb38ba1f3d0683f5154d7ebe18
 EBUILD breeze-gtk-5.22.5.ebuild 797 BLAKE2B 993ac2356bd9337a5c9615df5a6b2f0aaa34a6dc0b3f98d62ec8f65219dc9a70b234fb470c8624bfe5b9c50ce6204712025c015d93935015cb0fc5bbdd5c4e06 SHA512 52a8b6727d4b485b6c66950912ffdb48a8455dc8cf2fed4f5d1c6cd53bad0ce7d01d355c401f5db48bc472d3298bcf2e542399a63807330aa41c112d96e82f0e
-EBUILD breeze-gtk-5.22.90.ebuild 800 BLAKE2B e68718ca68a5a8afeae3b0a4303981260120ae03a0210f4406875772922b11f8cdffbc51f55788a80a4344b21da1658b2035286992f9385f57e33e86c4b4be7a SHA512 c359e7b7e6fdf90cc9c92ea335d541a92fc4477339cdf0a70bb4e1a1b25e97a7f0cfdeecd0cf116b441404be8d9fa9a4bfabd8cde9d0f3945148ab5df950965f
+EBUILD breeze-gtk-5.23.1.ebuild 800 BLAKE2B e68718ca68a5a8afeae3b0a4303981260120ae03a0210f4406875772922b11f8cdffbc51f55788a80a4344b21da1658b2035286992f9385f57e33e86c4b4be7a SHA512 c359e7b7e6fdf90cc9c92ea335d541a92fc4477339cdf0a70bb4e1a1b25e97a7f0cfdeecd0cf116b441404be8d9fa9a4bfabd8cde9d0f3945148ab5df950965f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.22.90.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.23.1.ebuild
index 3a25f86673fe..3a25f86673fe 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.22.90.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.23.1.ebuild
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index e118618f71a3..1304e16ef0e8 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-plymouth-5.22.5.tar.xz 108704 BLAKE2B 278f87416c22b14fb9d770401ce2fba1dee963678a58c6127c42c8074eacf9191b9e35c3da6e63f6a5d1760ee2e68a25f54e3dd59b4c270b56a8fd43457bb9ea SHA512 be27a707952da3573562a04aa9fac4f31f7e125ad068aab9a216af51df7b53eea830fc3998113f9a9cebb7d9f915e00391c9012791e51d15482048d7eff3e016
-DIST breeze-plymouth-5.22.90.tar.xz 110536 BLAKE2B 1c79cfa4e9bf6497b772740197e8061aaec57aa116bef3f5bc59911fb12630ae6e596cb5d81746cec16151f4524f689f6d4c55f1420f20994348c657d4ad8434 SHA512 eeb3020608c62cdc5ce301e567c677631313c3c34dfb0ae9d8d2eef074dd5430785f8e548cd48fdfdfccea34dc531d51177660a0c9daa16da6aee5a2971b8623
+DIST breeze-plymouth-5.23.1.tar.xz 110584 BLAKE2B d5ea43e046d93af72c74aa8e3b334b8c3816da0f420b7812e55cdf6847f1f38ceee9a7e8581bb4fa9f7461875f8f7f1342c3cb864d1dfb4eb5c9a766cef954b2 SHA512 36a7fd864e8496fb818378d2fe86ea1fdb7ac48081b56a6b0f5be03b2d0583d21f3400b0192fb21cb8cd5c15b48815dfc54e289f3097573730c8b35a4dd14484
 EBUILD breeze-plymouth-5.22.5.ebuild 515 BLAKE2B a63875fa117e71070166f67655220f021e2306ce138935b30dea7e69f4a136ad9296bfc4047cbd6b86c5260493c8a76e37fd492c01e1164eba3bd4bb49118cf7 SHA512 f4c47229926617b0f8bc9ea1a66c37160dde4a8911055712262de20d49c511408c1645938c39ca6460ad1a34516467df0f44ebda3c0a2b73bf1791eba7c3051a
-EBUILD breeze-plymouth-5.22.90.ebuild 518 BLAKE2B 691cc3516db545c478d863def31d82387fa8c718defdedab2e26c741b62ea7269326e293c0d6fe6da4668f341cf9ad5f0bafdb30cae4854dc892d5d966116c0b SHA512 64aa2c133bf1808f38d4ab385213608b821d8030185671628dafb19bf123c0d9d99d17bb5e47541a927ff8dba953da99192267b55867221e2db3476b8df91802
+EBUILD breeze-plymouth-5.23.1.ebuild 518 BLAKE2B 691cc3516db545c478d863def31d82387fa8c718defdedab2e26c741b62ea7269326e293c0d6fe6da4668f341cf9ad5f0bafdb30cae4854dc892d5d966116c0b SHA512 64aa2c133bf1808f38d4ab385213608b821d8030185671628dafb19bf123c0d9d99d17bb5e47541a927ff8dba953da99192267b55867221e2db3476b8df91802
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.90.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.23.1.ebuild
index ec9a8ea4970a..ec9a8ea4970a 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.22.90.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.23.1.ebuild
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 99eb468f0559..e2407ddb19bb 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-5.22.5.tar.xz 34548108 BLAKE2B aa92a0ac1054043e3584bfa82d783d5798b54d29edbc953ed69731295b6e076cae31606f5262313f5dd9e2036c05f4609c43b1e064e8b2308e4e4d56ace21ee7 SHA512 b9cc95dfbc21097f289d5c463f788b51ecc9523e5361981241a08ee80028a5f72f9dba3fc019006ec934104323c9c0a4d80742ae60a12f3d00751f75cccac66d
-DIST breeze-5.22.90.tar.xz 73811684 BLAKE2B fa5371e8cfe794901994b66db599cae22172e7f3be593fed683c9c66d65671eb732eed9cc89d52ad560f05480b209b763411ff6aa830885a27f55d56af0457bb SHA512 98f7fc6dd5e84df5a5ce9a47e3b357064583cfa21a3d6a971a0dc285cdde02ba272f72a16cbc8d9e457e9cd27549b35d4b68bffad2dd420d27f16aa4ea428c7f
+DIST breeze-5.23.1.tar.xz 73815804 BLAKE2B 9b66055126d25f70fc5e5c3bf9e8e8d8a2d3d2e452e001ab603b4b365f4c4cfc529b252b8fd5f083a282f632cb381dfc9024cd633271a8de5b8228c397eec1a8 SHA512 df708181a9ed18f3babc7c5fed51f70d68f195a8d398d6e6d21ef7db99f744470e44df61cbd70cb427f9e87177f86e97e5601d574a3267222d69762baeef4cce
 EBUILD breeze-5.22.5.ebuild 1272 BLAKE2B 16bc96592da6d84fbfe8b5ef73386aa7cefb10499c67282641f74a475628bea30fb3f8c1a1258e3795fcd2266b73f8a9271a82b3823c1a43a3d838e9f4bcf2ba SHA512 65d6702cc8efb303f69022de57ba4afd01937d91e4d03635443c642a88d140f540c393847fcb9d1086455e6dba89f0b334f75395c07b48b7c2538fb5b760cbed
-EBUILD breeze-5.22.90.ebuild 1275 BLAKE2B 23b8ec56440a3ce14de9d07baf95232297301e78e99b912c8298af1391e91cc81e383ba82d7432bbf1e7f389a610abad5fdf5c6b9bab3ee38868e5c23c26d8c2 SHA512 c2c1f9248c8c7a40754b9487f38334caed15ae05a48c58043b13cbab8dd2795552fe9a4851338c22fae40bc21c20a6105a7561039fafce9abacd0f02841828dd
+EBUILD breeze-5.23.1.ebuild 1275 BLAKE2B 23b8ec56440a3ce14de9d07baf95232297301e78e99b912c8298af1391e91cc81e383ba82d7432bbf1e7f389a610abad5fdf5c6b9bab3ee38868e5c23c26d8c2 SHA512 c2c1f9248c8c7a40754b9487f38334caed15ae05a48c58043b13cbab8dd2795552fe9a4851338c22fae40bc21c20a6105a7561039fafce9abacd0f02841828dd
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze/breeze-5.22.90.ebuild b/kde-plasma/breeze/breeze-5.23.1.ebuild
index 76a474649d74..76a474649d74 100644
--- a/kde-plasma/breeze/breeze-5.22.90.ebuild
+++ b/kde-plasma/breeze/breeze-5.23.1.ebuild
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 73da4ba00cdf..6987d6978a44 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,7 +1,7 @@
 AUX discover-5.21.90-tests-optional.patch 3372 BLAKE2B 9c1ee887d31b48b730350cb599f3f8e7ca4b802ba2d68dce72cede96b7a6d0e83451697b9e9e3da67c611514a3d808affb9616a515b80cc3788365fc3ca01997 SHA512 43a7152fb04224f52e417f2684fda6561cfd26888ff6493899e70b313f725066be1aefe9a0350c1aa260d799c44bdd5643a79e4a84dd6cfa34511dbc098ff93d
 AUX discover-5.22.5-no-updates-kcm.patch 925 BLAKE2B d1f5c52c3d9b47ae108712aad1e55621ae5be9d1ad5e97e3d907d0003e6c59b5296abaf1a79a05865598e71156e1fedbc5eb843c1f8a4f9058dfe2d4fd81b29f SHA512 03d1899af2c61465f9d8da050c55b35620c1624bc1fa89970fd73a490aaaa5d1e957b38cf0678a914598ddecf76dd762c1aa614a21db5ced10c06e50c8f5dfd8
 DIST discover-5.22.5.tar.xz 8462332 BLAKE2B bf5cadfa928afd81fc8bbd5c1b7c7e3251874ca384fc28fa1e0bad7ea0feca996d1b0c2378e2e1561a0462bdb6e15b4764d3d9a43f44b808b7e5be9b43608465 SHA512 7c4e5c17897dfabe306cdf5a2a7fa02639658a59e06b3623fdc1cd0f6b394a0861511016318e8cf62606261d102e0555b240e0b708b1870f8cdae96553cef912
-DIST discover-5.22.90.tar.xz 8228824 BLAKE2B 7d6bca0407cfadbac1bce63354081c8ffef778d060d38c9d0d655518b309891c4b17b3843478a4d9a0403261699607e083cc87d7824153b69b08a65e1f74ec09 SHA512 12e235d52464132ecc4d0d483e5ba5d967db4659ee5785db1bbb35c8ad8ff78ad4f2697beace0d26228a552b765ef4bacfac7ba413e8b9b3340415fc6b68d41a
+DIST discover-5.23.1.tar.xz 8233356 BLAKE2B ca36ff4dee67e1c1a9190e063f2100181c52eac87b52750aa142ae2071153f04ad11a43d2ccedc1b0dbc0723849e3105e439920b2e3eda5082518997727cb7fc SHA512 0de955a670c340d5afa3784ca4820003720795dff5023d1d976f655e56c5caa5b767d7bee875b1b59864f2c905081527d5b6c2a75546799788c0c3bccd6b88e4
 EBUILD discover-5.22.5.ebuild 2344 BLAKE2B 2cec026b1669b2509e18fa1c8800662254ab1dab756b9f42f2e7a25da58dc4e326bb013dea9dd2589ed23e9c041dd41ddcacc1b3360f9823939733f639675199 SHA512 b59194b3b5b28e4c88e0b301eafa80d31a55143d1f5f7f022a05de591a6112040860fe3937345c815e25b53e7d2ed95b335137e79d676e8dd8ad1045e955e405
-EBUILD discover-5.22.90.ebuild 2297 BLAKE2B 829364d324271168b4c04e27f933e5c594676412d6efb19c67b650b71dde25783dc251dc445040398938e5264d74aebdd9f8747ada252beab49146656fbd0481 SHA512 38dd90840ea9ebf724482e4596afe0f9b73c1b7216cc8693d9d21fc0939c385a8e1737e036315a8e0ebb5a0400726c19b3051e8db2ed93925c04d9464779f384
+EBUILD discover-5.23.1.ebuild 2297 BLAKE2B 829364d324271168b4c04e27f933e5c594676412d6efb19c67b650b71dde25783dc251dc445040398938e5264d74aebdd9f8747ada252beab49146656fbd0481 SHA512 38dd90840ea9ebf724482e4596afe0f9b73c1b7216cc8693d9d21fc0939c385a8e1737e036315a8e0ebb5a0400726c19b3051e8db2ed93925c04d9464779f384
 MISC metadata.xml 537 BLAKE2B 3f8ef5cff5aba41680b677214f13254460b589b01380bb7c569f0f4cd011d046f76efaab48eb3f36bd0f13ace05845e670223e34b12519c3add4f0412443c792 SHA512 68b34b02c8f1b9a4c41f4aa5b2c2ced838bf65854b7cf15286ee426290f80fff4065ed8fe86db1aec62329778f425b0f9dc0e69c08db029910cd43136aca1d9b
diff --git a/kde-plasma/discover/discover-5.22.90.ebuild b/kde-plasma/discover/discover-5.23.1.ebuild
index ffb613b84536..ffb613b84536 100644
--- a/kde-plasma/discover/discover-5.22.90.ebuild
+++ b/kde-plasma/discover/discover-5.23.1.ebuild
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 360ac777300b..edecf36109d1 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,6 +1,6 @@
 AUX drkonqi-5.22.3-unused-dep.patch 954 BLAKE2B 8daf7abdd007f0c4ba8adc1173dc314c17bc0144aaa494076d1a031bb1de87ef33da9d9d322fd63582cd1b917383295479fdd3547ce1b1651a9f36b56ca5d0da SHA512 8b26d70986ef5cceb7abf83c36a12d3b17158d87fa3b16ac6814c17b0afbc6258dc4aebe9a630f6724ada6f41a9d3f5029cb558966b6dc01f833a91ce36ef7b4
 DIST drkonqi-5.22.5.tar.xz 780496 BLAKE2B 2c9e6dc22070027d8c7864e4b6e74540bbeb09affaab491c1effcf47000edd6cce0cc454ea00c2ff006a7f871ab975c88da1d2416705b6e6e73ca1c3c1e5c9cc SHA512 a37679bc7d365fe194ba80d1254631aba3cd5811c2a4b97c1327f7f5e91f2e095b83b326f1a4dd0a85976e98f7392ae78db03ee383cea10d37ab5a0a25a3cb48
-DIST drkonqi-5.22.90.tar.xz 791852 BLAKE2B 771302436a51e90cc4feafbe5c995d0078fdab31e0a2ca0689904ae20c9e42251b013d3ed0c87146bc00ec56f47f4b1bbbafe179748a2912afffe373e3873a07 SHA512 19f5e2d80a533894242076612063036bb07c64e26fa6b88a0f3f8200be2d092536d3bc7f349fa19af6d57e0486b67f1d52795603358b1caaf3ddbdca828b91a1
+DIST drkonqi-5.23.1.tar.xz 792016 BLAKE2B 97e2121ee7a529034ed1df1511e4219c203edf7caced1cab11a495d951df16e2fd16bd9d2ce27f7317fb639508c043891e9c19ca6701bd50b769a4df9808aecf SHA512 26b0968e8adf79c9990a02c240a0d0f9b3447f2c5bcfa5ecc88d047c2ad1108aa0a4ec4da735f3d12069d48dfe0c350f4c2c4e9603137e14ad4a11e95d10f4f6
 EBUILD drkonqi-5.22.5.ebuild 1392 BLAKE2B b44d8eeec0c026dbd6c16398c23968eed4caecea64434d4d0648118b92cea6a3c5244455a319f56c64bac14b415104db3750cd17b0d220dc6dee98dcfbbfd15a SHA512 24c37a397bf033cfa2f478a4da3d8cc3624d2a802de4478c0f351ac7c813a3a2dcd0794ef905851b8463ff71c1eb57693d3795c75dadf17dd3e5ceee4ebd3c0d
-EBUILD drkonqi-5.22.90.ebuild 1338 BLAKE2B ede2b772ac418d321edcbf50dbdb64bdf6dc40a0a811609232af158e872cc2287ceac1a7bb529efb760a07eec92d3c15b45726499ccecbad5fc81f7d92b54c5d SHA512 4e07c687ea050fe1081341e1ed96905b14245a9a8f32e853460f4e71a6331976b529ec351c65d00c04965e826c3ee82cadc96a944f25cfdaa30ba749601de26e
+EBUILD drkonqi-5.23.1.ebuild 1338 BLAKE2B ede2b772ac418d321edcbf50dbdb64bdf6dc40a0a811609232af158e872cc2287ceac1a7bb529efb760a07eec92d3c15b45726499ccecbad5fc81f7d92b54c5d SHA512 4e07c687ea050fe1081341e1ed96905b14245a9a8f32e853460f4e71a6331976b529ec351c65d00c04965e826c3ee82cadc96a944f25cfdaa30ba749601de26e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/drkonqi/drkonqi-5.22.90.ebuild b/kde-plasma/drkonqi/drkonqi-5.23.1.ebuild
index 8c03ecd357f4..8c03ecd357f4 100644
--- a/kde-plasma/drkonqi/drkonqi-5.22.90.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.23.1.ebuild
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index d3e12bd5d741..c0773f8e1266 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,5 @@
 DIST kactivitymanagerd-5.22.5.tar.xz 103668 BLAKE2B 5fb63f387dcbf45f3e7be7818932844639dca88120096dbccb3629dfc823556cae29f4fa1c0ae9795e233ea2e56edb921284dd54f2117275691bee735ff716ec SHA512 00f5a071fbfb7dc4bd2dfea3c811f359a416310385a2d1e107ba8b7bce8449676c39ebd6cd02f2cc22776fde3f2d0ff9d6ff635bd0a3c408a0ee17e31bfb02b0
-DIST kactivitymanagerd-5.22.90.tar.xz 104312 BLAKE2B c2a498753e441b427b0c83deae7fbecd81822318b618c87c859f7bf2dc682ea27846158acc9658d3a700c6afabcef73d74bdcad3824539b1dd838e3925ac47c1 SHA512 a67a2c4e0d7f23e3a6e0864b3090c0692dbcd518763f110b7ac4f1e9724390c34581dc64f3aa77ff7d585f87f3a2d27d2b189ebba22d84f26a0717c4e2127978
+DIST kactivitymanagerd-5.23.1.tar.xz 104352 BLAKE2B 1d9741c196e3d5a763ad6e4c5d3e0e6810d21b66ebdb4f50c403b3b0b8958e5c5e64f2aae576b737bf3d97c5632ebf228f1503653e4a3458bd473c349f2b72b9 SHA512 b39f540490a0e22f6f16c7e8e060740b854309ec38c724fbc6ce67984d1db746ff7aa47d53f5db273bbc75e476efe22de634502ce730f2956431207b3b3e64ee
 EBUILD kactivitymanagerd-5.22.5.ebuild 916 BLAKE2B 0f5d910e8cda5ef80ed9eeb966791ad686a1aed76708cec0d0bfe6a2ca97ab43ae91138288883033f026be90baeb9a9fd3b731a478a6c5bf13d3f4e864e87eff SHA512 f08ad2be616d0c649c5f34c5287d4dbc957d27bb30f5da8523687afe554ff122501c5ff7455727b4fa87e833771f68b34ada2d7ac0e2840184ab176b0ab86c8e
-EBUILD kactivitymanagerd-5.22.90.ebuild 919 BLAKE2B b151be1c39801e1a4b1aeed6d22f65a930236bce8d8830d4c2ef427a56dbfb717dc9d25cf4e44486cbfa78a5d074b32daba8927d6c6c9021d4dcd5519ad1ed87 SHA512 216843d196b9a4c932a413f1478c5261598822eead48c05c30568b8ff13ad12eb9a25bdddf67859d45279473a4693298c296e94bd0c8e9bf52d10d7c1640fef9
+EBUILD kactivitymanagerd-5.23.1.ebuild 919 BLAKE2B b151be1c39801e1a4b1aeed6d22f65a930236bce8d8830d4c2ef427a56dbfb717dc9d25cf4e44486cbfa78a5d074b32daba8927d6c6c9021d4dcd5519ad1ed87 SHA512 216843d196b9a4c932a413f1478c5261598822eead48c05c30568b8ff13ad12eb9a25bdddf67859d45279473a4693298c296e94bd0c8e9bf52d10d7c1640fef9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.90.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.1.ebuild
index ad18b9fd8faa..ad18b9fd8faa 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.22.90.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.23.1.ebuild
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 43d364c9332b..641df8244f84 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,6 +1,6 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
 DIST kde-cli-tools-5.22.5.tar.xz 626212 BLAKE2B 78bf7bcb14b101c6bc5d135b16e8a74c7d1fe5485b60b6977c102210840ae908cc9ef76e5d9d7f3278c8a3fa976013ba135cf47866bb05511de7dd53270876a4 SHA512 bbaca46ea389148f994ceef0ef0c55623ff739b3119fe6eaf967b315d3086a4e06c6c44aa065d44bfeaaf6768355774fc7b9398ea9f0ce4ec5d9fe386bc41fb9
-DIST kde-cli-tools-5.22.90.tar.xz 631408 BLAKE2B 5294891d3d6553dd87378292a6e59b7bd90607e989648493ae01f8d205bfccb832bc7051715a4efd76b4b476c56de47240d0c4968df7c6f3f08bd70dbb3b704a SHA512 85d0f2ddcd24c8082f78b44207358fca952ec8fc60172ab0a4a2ea851ba8db9b1f72eba7956ac95136d58049ae9f5257f0677e7847efb61b607d636c18d854a3
+DIST kde-cli-tools-5.23.1.tar.xz 631576 BLAKE2B c3d1f539e57f7fd3da19b99c8f624e810170a475fe39ecf6d33104312d5eaa2dc33cc63e736d7786deadffd6574b2d2630877e89239ff8e77cb8b41c5f354db8 SHA512 c5331b729f7da746ec4bf9d11dd28a31c8d58f51ee708dafcff400cd6a6dd3846edcf434c1c9ec769c2121172fce9e8725a7fb4caadc3c81aed815df4e02dcb9
 EBUILD kde-cli-tools-5.22.5.ebuild 1727 BLAKE2B 68c095a92071cfec56af22da4adb0e8a232bb864c005d87d0381dec6a8fc3873a822f0ab7ba767e9127585637ae32d6a10d4aea00888ea9f005408399a1c3a2c SHA512 e4abb4444b5c9fabe0111baa7a1fb6ae66dbee94dd755a8e7ba15063aa08d92a07aa45a9553df44fca75e824c2c32b88eeaf2601aa9af767af660b8062fd66fd
-EBUILD kde-cli-tools-5.22.90.ebuild 1730 BLAKE2B d2ca5a154822755348368094201d4826b903c2b95f5b366a8c0e576574e9ef2760c04c67cd502bed9e3fb5a66b686bcb89699bd10248da451c9e11ac508488ee SHA512 357c5ead191a76122d77cf37711d1a7f473796d7d4f64ef6a6f27082ec4c7f28c37096d1822b9087a0fa733ac6c469fe6a2deec97146934d1b13189426aeb4e8
+EBUILD kde-cli-tools-5.23.1.ebuild 1730 BLAKE2B d2ca5a154822755348368094201d4826b903c2b95f5b366a8c0e576574e9ef2760c04c67cd502bed9e3fb5a66b686bcb89699bd10248da451c9e11ac508488ee SHA512 357c5ead191a76122d77cf37711d1a7f473796d7d4f64ef6a6f27082ec4c7f28c37096d1822b9087a0fa733ac6c469fe6a2deec97146934d1b13189426aeb4e8
 MISC metadata.xml 422 BLAKE2B 6c7e36778e4ecaafce86d11fa6e70a86c064c654de467a57f9b5d181d720bf0a90c02655131be794fc271f6664764fe79fb7e29df622cdad67cd69bf67c3d39c SHA512 41cfaa9753dba1b53c1a2fe0cba54c1bde6982180d96841c057f2a56ecbbe4000d702141ecef493ab3d1a80c53520363a28d0024ad2619b5642e740927c7e4f1
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.90.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.23.1.ebuild
index 656d0a4e757a..656d0a4e757a 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.22.90.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.23.1.ebuild
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 4ab25af0d434..cb483e693c84 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,6 +1,6 @@
 AUX kde-gtk-config-5.22.5-drop-gtk2-dep.patch 805 BLAKE2B 262b3d6e644b592d3323609e8958c189b217663a0e6653c82aad57ea85c266d068dd0d4166a2327c33a325fc251549a8eee2c26a45a8fd21800f14a0e2b05ef6 SHA512 8e418333f286f7eb74a6bea42d6c63794ff58520c17b51a0eb5436d753f8af727515db45e12d07bb393a2e0ea4b8562830f6e0708bd0eb2285c8f839e025591c
 DIST kde-gtk-config-5.22.5.tar.xz 71064 BLAKE2B ef1f1d40ae76c526af164b6113e6ff2aa09a52eaf7434a7660062c26a25a18461f83dc7e31d974ad7c46908d80144611df6f970b1fd9d2fa7e996f62b82f7d30 SHA512 76d2c3b56c29aa251087499e96f91b02b1190202d3e93d4895366d0a39abafac442dbba22b3afd79867c82d0eb35c05c8d2976f35762d9bf52c5a742a22c8490
-DIST kde-gtk-config-5.22.90.tar.xz 71000 BLAKE2B 7472625bfe7ae1a5b13b6d17d4480d63afec98591800b164b47b9ed46ccf63dd85ed683cffa41d3239c2dace12cc09698588885059aa035fa5dd34d595f632bc SHA512 0171f8c3e31bc08099912fffc6f2d8d9cf1cc4e89044f1751587ec3e13a1199465d970aafe17318fed55f233ccaad5bc91e402ba9496191fa0cc6130e6987c8c
+DIST kde-gtk-config-5.23.1.tar.xz 71092 BLAKE2B 99865569fe9032e374cee0088af593550526fc837d4001b58d6ab12f4eac593e0a7becfaccfff91c2bff04a33acbf6f850938bd9804b26e8a96b9846d6991108 SHA512 ee97299fcbe387a2df6a3ff9e4760eb136935d681dd51b0f681edb43dbfe58cc12c09e6fd46c6f6999d683a7c39431ffe443a95514362061f6ff84f14fb8abc7
 EBUILD kde-gtk-config-5.22.5.ebuild 1341 BLAKE2B a9c51e830b7d0bfbcdf05d81c624c6e405f477562ddeb4d7987f1748995e635f16c664452e610219007ce3036bb3a58b8a28b0787d8aba1735227693b604a599 SHA512 f116deb44930d8db0aec3d667a86dec2d7934aff31c19baba87084531da6faa48e75dc5ac3b4ef2a71740d9c107f3fbc2cb7a801983140bce63ab16f0ccf7b63
-EBUILD kde-gtk-config-5.22.90.ebuild 1284 BLAKE2B 64c73ba8c29aee496bac4fe68de51518fbc109d79fb2e50133ebd6903e8711ec8a51a719790cfbebe49d3a12d9ed284d05e536c6d78a73464df80bf34a5154fe SHA512 6ed80095644a04078857a77e9cd9f363767ef08a8f99fb896fecb2cc6c3327f1548eea734c72841e12a2fee007c5ccc0a4cf70e8cc22a207975153af2191b4cb
+EBUILD kde-gtk-config-5.23.1.ebuild 1284 BLAKE2B 64c73ba8c29aee496bac4fe68de51518fbc109d79fb2e50133ebd6903e8711ec8a51a719790cfbebe49d3a12d9ed284d05e536c6d78a73464df80bf34a5154fe SHA512 6ed80095644a04078857a77e9cd9f363767ef08a8f99fb896fecb2cc6c3327f1548eea734c72841e12a2fee007c5ccc0a4cf70e8cc22a207975153af2191b4cb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.90.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.23.1.ebuild
index 8ebcf8b1fc84..8ebcf8b1fc84 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.22.90.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.23.1.ebuild
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index ff30eb0ead2d..0b8c36bb8b09 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,5 @@
 DIST kdecoration-5.22.5.tar.xz 47256 BLAKE2B 20b173e3364e0d40cd864cc985ee1d5a27ce8103cec7d2006e25117c231eedd6e6c6f42cd1144df1674bb809d334ad3b90b71ac588ec6fd2bd6e4a2641681b84 SHA512 cbb707cda299d8f2938c63a382e1ea65853754a130711ac4df16300d16b7d215a1d7150faabae04c32ac8e79218739cb9493fc481921b65a0c188ae66ebd7beb
-DIST kdecoration-5.22.90.tar.xz 47344 BLAKE2B 1e306c4b264faefb12b7ef18e484d7cb9b62dfed568bc8aa1bf892045bb0acdd049b1b532f3b6b5d9996bb8f70574c4798fd9683cd75b83285f720eb44af1ccf SHA512 785f56faaf752cf0c1cfcb78796875c15a3aa0fa58e816350dbd31877cf96f87528bda3317990d82e750dd0adf999941ea18918225a0a75e4e786c4f4be18354
+DIST kdecoration-5.23.1.tar.xz 47340 BLAKE2B b7f0f1ae3148fb4ab343570ec092a17b583d03460718f1afda7a43af929c24de8fe93fc6e6114506dc400ac15c209165e36b19dfe60de03c8b6ee2a1bbe28c74 SHA512 14537f1a7751fd96e167f198d9dc06fe3dc1c55d0a99fad9d092e4796cf79e86e23f830bcf691a0feab10a1a11db52b20e990a8b785ca607932d767350a93065
 EBUILD kdecoration-5.22.5.ebuild 486 BLAKE2B b609acd134352da7a52ae9a77d763e3c2fa351ab3a82af283360746598bbe3ec28c7e22982efec484a5e7b8ddec3839797b5064afe3b738ec065671fe7ee36bb SHA512 50f491d2e9ac866577b8f906a0e766ed8f91fe7c8e563bb06485c3b987dd63d7c6840d3c80138199ac1d0c28c008a310aecd37124f255db3504961cb3a562105
-EBUILD kdecoration-5.22.90.ebuild 489 BLAKE2B b8a1ca515c11f956d4a29562d2ee3964b55b9b251721b4fe657319c98f19ad42e7c517c601f182c1f1e36fcdb58829b01dffcdc4ce6c1ec07f6ab1c834452383 SHA512 d72f5df2b3ba93df37de2fb3d7b286af32c8bbee884b1d650fe42c5be546c12d412612ab48384bf55ee63a30c1e677f92553a7b9c8bf789cf5ca99163426635e
+EBUILD kdecoration-5.23.1.ebuild 489 BLAKE2B b8a1ca515c11f956d4a29562d2ee3964b55b9b251721b4fe657319c98f19ad42e7c517c601f182c1f1e36fcdb58829b01dffcdc4ce6c1ec07f6ab1c834452383 SHA512 d72f5df2b3ba93df37de2fb3d7b286af32c8bbee884b1d650fe42c5be546c12d412612ab48384bf55ee63a30c1e677f92553a7b9c8bf789cf5ca99163426635e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kdecoration/kdecoration-5.22.90.ebuild b/kde-plasma/kdecoration/kdecoration-5.23.1.ebuild
index be4395b9d913..be4395b9d913 100644
--- a/kde-plasma/kdecoration/kdecoration-5.22.90.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.23.1.ebuild
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 711e8478a414..5b4786d6cadb 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,6 +1,6 @@
 AUX kdeplasma-addons-5.19.3-kross-optional.patch 1956 BLAKE2B 922b8e73147439a706a37fcec29dcf7fb424e8ceaa8bfa1e4e54ca6c5851cf937318ee91654bf5cb352b80076aa90c9063ec07b02c7fbade8613f3d560178e86 SHA512 f9c87b27b0e8d020519259fda8df118266dd11b589873a3a8a5b4bcdf1e77e65fad29334aee80717cfe208c54021d39caee36533d144538bd80b5c1618cd36b4
 DIST kdeplasma-addons-5.22.5.tar.xz 633320 BLAKE2B 12cb41ebbbec6a6bbb65bbac55e856951cee7249acbc5e9228fddbf3d844066c6a674dfe45242d63b4e4b1321955c547c349ec735a966bc7c02ca38eb62c2f03 SHA512 7915d20808bcceea9451590723abd8f20fc2eb33c6b1346cf1b0971c69360eaf24ad72b141d15bc102090c1dc3f82f8c0e7398cfdd41b7452dbf57af2da87803
-DIST kdeplasma-addons-5.22.90.tar.xz 619668 BLAKE2B 0ac1dce2d6319c1a88885b7c5cfa74451686d64b152c7f5ee4054e5a6ada7038669730cd940d8cb042512f20ba7bfa3291ff1edaf67105dbbf7fd5520d618ef1 SHA512 71fc62f79267779c41c4b5a561ee2787812902f6718c96c841c662348f282d935eeb90ed11023224293eeb5375575513c8294b3edaf8aa2ece8b15a7fd397597
+DIST kdeplasma-addons-5.23.1.tar.xz 627512 BLAKE2B a94b981d4ea1ffbcdfa239de7088121b397ee669cfc825dd8b3653d41a7bf2f3fd103aaaf4bd92f5105a6b30466b6e1bde126d36a0ec770be5ea169d70e475f4 SHA512 b6b1a6faf0ca99c1a1ff2a3f8d7db81bff1a55215a63355e17ffb95e13eb171204a72eb40d03690b1df50201e8c1f148c60eaa4768a872a37d1d572d6482ed27
 EBUILD kdeplasma-addons-5.22.5.ebuild 2084 BLAKE2B 29a9f5295f402b6c3220aa25e3fb249aa797bd509d31ab855082b1d0434619f6b9dfde61d06ed62ffc4d7402e0a6d6b8c9b6145929d3085dbfdba0f406a4dfe2 SHA512 7aa1e811550548f3d3a550bc1325c4c5ae2b9b7aaeee4b117c78701083380168faae27bc84fc4c83623ef59ad0d2bf8a9c4a0a225642268a31e5e669401fe2c7
-EBUILD kdeplasma-addons-5.22.90.ebuild 1912 BLAKE2B d8af3d1a19e434fdcaee6f10ac04d60ba612e7863f3fbc63817439ca8efc9715aca64e47041eaf580060150a42efb669763f21e40fa4716113acee4e7eef8f41 SHA512 d7c21dd3b6e8289a4ecea9503e587e0014b4b3e81cd43843a17cebe7b0451e0a3abf96c56fcd3156e3799af8a29eae1d6d512dc23a8404d560375d497aabfd74
+EBUILD kdeplasma-addons-5.23.1.ebuild 1912 BLAKE2B d8af3d1a19e434fdcaee6f10ac04d60ba612e7863f3fbc63817439ca8efc9715aca64e47041eaf580060150a42efb669763f21e40fa4716113acee4e7eef8f41 SHA512 d7c21dd3b6e8289a4ecea9503e587e0014b4b3e81cd43843a17cebe7b0451e0a3abf96c56fcd3156e3799af8a29eae1d6d512dc23a8404d560375d497aabfd74
 MISC metadata.xml 636 BLAKE2B c58a6f828b6e74e39343a6bb50c4563dac6615236d18ff1e81d6dc4de6a204e089886bd5ca8394242bb03860832edede323071721bdec55bd447247fe2c04f86 SHA512 af527fa0329ce0f9c61bd9f01d56389a455aa8ab72bcb32f8d8f6ef91dac27d91710d4347e92d2d8b414a91755c1015cf700849286f6ccbf8416ce00dcefea09
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.90.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.1.ebuild
index 87182ab6828a..87182ab6828a 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.90.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.1.ebuild
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index d85a744b88bf..cc08e52dd2eb 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,5 @@
 DIST kgamma5-5.22.5.tar.xz 83124 BLAKE2B 0c90174ca3108c469ab1f2d349d533ea3592864731901d84426a3d1135497729e8fd7705fea4efcf4a160d9b2232073f6a8864256daefd01043c14448a22bc9f SHA512 c04e2c291cc0dd0c5edda07cc4b6c921ba1f297899cde95399e0d4039cea2a9c5bc2b2da319de227793e8a40bcabba496848f0559730a6105d215abfe8ee6069
-DIST kgamma5-5.22.90.tar.xz 83164 BLAKE2B 2c173689984badb2b6369fe47a3140a0a4a5274eb6b8b83d845d140339a8b99553b209512cef674c25d96ac02778be7894403767ad044455c2af1837cbb30421 SHA512 9783b6ecef16dd1d29ac4c5df3e749b48082800c8349b4d43779e3fe3edd053a3f4b7a7e57fbb929d3f9fb3c3bce9ca151bc0a4c7898ffa7dd24a2c916a4aa72
+DIST kgamma5-5.23.1.tar.xz 83132 BLAKE2B 1c45553f6f50879fc0720030b2eda665ed329678bf634a742f150579065d6d02e66ec387a178ffb12c7f200eee5805e5ec67eeeb613680cf6a36e57645b2d36e SHA512 0b44b12aba94270c9f6833f144cf2abc3fc9399205dcbda39c13dcd77fc32c6ad834536209949fe4e18857389947d9a8aa38f29c765f73185c97cce510cbea2b
 EBUILD kgamma-5.22.5.ebuild 684 BLAKE2B 4635ec9f686d2cedafa99e29fa17150df94cd00d61b9b356b6ad00e1b2b05c8ffc363398258d470a94d0ff4832b8d823c53cd0bd7b007958d988a83cb3b5d801 SHA512 ad14db94e63fab5a379a476935bacfb54f434d95982fe65acf8b6ff549aff4ea1e865558dbef7a69ff822777b1711ed8e27453b25babd1a69f0ca9edb78b4e22
-EBUILD kgamma-5.22.90.ebuild 687 BLAKE2B 10b298c90f672da962eb04c6f34742938db0652bbbe24d1e7f496dfe0d14f2ff19132c165f954e012a6c55d2eb45bd89ae28c9f1491aeff8e3ae891723490731 SHA512 3be1930d55c231fceed958bef6abcffb09ef8e5ec88c1177996045da184b4874f314234681b81715da0cdd8ff1b456f77121bd56b9d7b4d1ab00721d18688854
+EBUILD kgamma-5.23.1.ebuild 687 BLAKE2B 10b298c90f672da962eb04c6f34742938db0652bbbe24d1e7f496dfe0d14f2ff19132c165f954e012a6c55d2eb45bd89ae28c9f1491aeff8e3ae891723490731 SHA512 3be1930d55c231fceed958bef6abcffb09ef8e5ec88c1177996045da184b4874f314234681b81715da0cdd8ff1b456f77121bd56b9d7b4d1ab00721d18688854
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kgamma/kgamma-5.22.90.ebuild b/kde-plasma/kgamma/kgamma-5.23.1.ebuild
index 9e840b337945..9e840b337945 100644
--- a/kde-plasma/kgamma/kgamma-5.22.90.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.23.1.ebuild
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 507b9bdc33c7..30dfc1b40c3e 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,5 @@
 DIST khotkeys-5.22.5.tar.xz 1859668 BLAKE2B a079df3082a6bc5147e8c3f9c63ebd155588c10bf752b27d22c3feac66aeb42229f194e47e33730643c10cc94132fb760061f6e5e6d035bd8c4f414951a63bb7 SHA512 de66cb92986c025ba0fd2b70eab65dcf25057e1a4afcd3616b7063047d0e41f2d80b780ab6a2d564e22be7bd4f9532e0c37c62c5e54bb6d9587ea95c363402d6
-DIST khotkeys-5.22.90.tar.xz 1850896 BLAKE2B 52e37e59975538a3e4ce0e27e8dfd92b3421f86d98863b9749f68cb1d16bf3860f4912db324b20375602f581dd03d571309c39163e14e6018e4d47a5cce698e5 SHA512 cde32b2009ddf2c7bcf0506f32e8aaf1764f15b65065438bdd85c1989d892d7bfd32e85c32c0e01aa31a4d9ac599e9eb0d0fc80310698b85e8bfdcbe919f4e85
+DIST khotkeys-5.23.1.tar.xz 1850872 BLAKE2B 98421d90c22c2243e691dbd6b030d07076177c9e344a9aa22749dadc09037b07fc909687ef249ea1c56a859add5ff6a4055f18d911eb3e0aaf43d3e0a28c91bb SHA512 8aded4fc6a898e77a0c15c0649880305ccd4185f6ba0bba0480815478648ed5927375eec09a5db44f105eb490ab65d2d465bb445da8930719cd7b9f2a082e823
 EBUILD khotkeys-5.22.5.ebuild 1353 BLAKE2B 31ff0c5515ee7828310174c85c796ad99e568515de45a39a8669fd3b59df12d45744ea71618d6566ca6dafa6238adeabd7c2ac20413df8e5170197efbeff5d22 SHA512 b1875e9618b2dcfb3b182b4c1f0850a9f38b6d010a835dad44a91ec82ffd73e4a1df529a65d9e30b3f8b1ed09a662881aff56c38f57712241f1c3d4de9d37434
-EBUILD khotkeys-5.22.90.ebuild 1356 BLAKE2B 6cb4a8fa5f357542aa61912daab29f593d1ba0962d3423e29e08d93b1604b3a4edc60ba29a91d8db3efd36c2b7285a2eb2baed7e693f7b20e69965965fd9fa3c SHA512 3dd469944a0e56bf68619367403a7f8b936d0c3aa419a2cd6bedf00f94dde5f3cec6134a1b0856b81973a298a7859d1729d9a4c31ef1b9a38f4515483d5188fa
+EBUILD khotkeys-5.23.1.ebuild 1356 BLAKE2B 6cb4a8fa5f357542aa61912daab29f593d1ba0962d3423e29e08d93b1604b3a4edc60ba29a91d8db3efd36c2b7285a2eb2baed7e693f7b20e69965965fd9fa3c SHA512 3dd469944a0e56bf68619367403a7f8b936d0c3aa419a2cd6bedf00f94dde5f3cec6134a1b0856b81973a298a7859d1729d9a4c31ef1b9a38f4515483d5188fa
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/khotkeys/khotkeys-5.22.90.ebuild b/kde-plasma/khotkeys/khotkeys-5.23.1.ebuild
index 97b3c8d71f60..97b3c8d71f60 100644
--- a/kde-plasma/khotkeys/khotkeys-5.22.90.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.23.1.ebuild
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 71c34581e21f..a32d83748190 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.22.5.tar.xz 1170716 BLAKE2B 8e9cefdb426e9635928aa2b81359acc1e8b2113865b18109fa442efa7cd35684fdf911a39c3ce8a43c31afabced6820d6bac6ce31a5c00eb629f6a8462906a7b SHA512 7eaafde6f9a388e9d4cfe9a8f4057c462bf83f9fecdd39fdd96e05f4c5094c1a116bf66a781bba67721e63e8cfd5a8bfb32fb1906392c2acb70263afaa17c560
-DIST kinfocenter-5.22.90.tar.xz 1156180 BLAKE2B 2cda67467328a3df1f04778f5a7aa9e1cae347e91d8318f42417ce5950e60774fb36eeae4209db933014cea39cf5edfd31b65281473b072b53f960b8978817c3 SHA512 fd7bfbdbfa363134c16d0787963291fcdaccda1b8a9530c4112c86ea4513c40d2295e9c768239efdcda51a716a74662e673f06da893eceaa34bd405ccf23704c
+DIST kinfocenter-5.23.1.tar.xz 1152544 BLAKE2B 2d9704b86fac6e41637b22637c70cb0482230361e11547b8a8c8676afd2d794d7e85280b9cd2d5d0786c677941e10b9c34421426e94fc710805f5e11579f6863 SHA512 1dae1cef1ba7fe2ddc94555f528d51b5aec7aa30e6e65aa323d4b49615db527f083cb8dec3714be4e9824556d817a12f35c3f636370dc157d8e930edd1a87953
 EBUILD kinfocenter-5.22.5.ebuild 2640 BLAKE2B 7c9240900fab2677818ef21f7ed7f467c1b39bc8db8c1fe777f88914f199a2e8609df176c17b2348e331ea8261ba7cc937c4ebb37fcc9ffa9e11750425cdf8cf SHA512 d2bf9570ffb7f759c96d4c42de3cf46ba6061854b9606740fe7c2be3596ddfc4a47e07a9fc0c7ef6964e945738d5413c1e2e7d07812e87ff0b043a51275ecb6a
-EBUILD kinfocenter-5.22.90.ebuild 2786 BLAKE2B c3179132642e7d8b73ed908161e92e37c1870d141e03b251f93f672a03abc39af004a021f00d45e0fd099d91d8a9a3eb06b6c03d3f0ba0e38d9bb56a29c9a4d4 SHA512 805ee119251c41ccd63cac8565094e734fb457c35d3d21df9031444c93e114927a2182737e378b55ba9276d039ef8da87ede0db56bc14cfc4edc99df963b28b4
+EBUILD kinfocenter-5.23.1.ebuild 2786 BLAKE2B c3179132642e7d8b73ed908161e92e37c1870d141e03b251f93f672a03abc39af004a021f00d45e0fd099d91d8a9a3eb06b6c03d3f0ba0e38d9bb56a29c9a4d4 SHA512 805ee119251c41ccd63cac8565094e734fb457c35d3d21df9031444c93e114927a2182737e378b55ba9276d039ef8da87ede0db56bc14cfc4edc99df963b28b4
 MISC metadata.xml 389 BLAKE2B 7775c88615433812927bd69023ba3943d13b1fadc77d1c8a84f286e0f7b3efdc34d3cd9b877cafcb3ae7ef9c0056c6a39d669baea5875707155d361a6024b1d0 SHA512 dfebb398a78818127260bc03d2e267c3feea4c54f2de6adec01868fceede532764a0f90559b070d4136cb6c1ad8e86cc98d832f340b3a0a687a41b0c354631b0
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.22.90.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.23.1.ebuild
index 8c0e917a1080..8c0e917a1080 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.22.90.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.23.1.ebuild
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 6bc0a8b79dd9..ad995eee4fe2 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,5 @@
 DIST kmenuedit-5.22.5.tar.xz 900120 BLAKE2B 7ee3f94e3b749a54f893913b08bebc4515f27422498cad0aa06a3f7e687c7da085db57d434a224c8cabf6e6d8da3dea8b1c35d262e8f3d4e1da3ef983e8b9c95 SHA512 f7516303c45e1f48a3b329ef3df23a33011ed5be57307811f8b9ef6d92c4cf82793bbb1fabd69db0ad8c2c7005f8c453391ae18dc27439fc3d4e1510e36b0049
-DIST kmenuedit-5.22.90.tar.xz 900636 BLAKE2B f78132c2b5958f52a783889432b86a30d272b29852096bfd74e6d65f9a782a12b689668cbfdf1adc2fc929741bfb93f6b017b2ecad0a14b3c4c4f2e0ebf4c0a5 SHA512 2252d14c15c55272a630781aa2e7230d5d66f96ace1e166bc64e0250c729a475bb60c139eeb0b6283c78aaa7a0eeeebf6169bd11a9845f5bbd05ca64d3676b90
+DIST kmenuedit-5.23.1.tar.xz 900596 BLAKE2B 6b9a182067a434ae69dafdff89e350326426e0617112608c5691032cabfe9af5c783aa325b298d703f6e5b4efb50a06b959237f10b2cbb87cf0d52f851e0f8f7 SHA512 d8c5e4619b0246faecb35b6aa76a2a43c7b963cb0689a1b2b3ec565793556c5dec16052ac417cfd0ab741f777b58dcba981b57b7cfd803a091571d6ab84cd304
 EBUILD kmenuedit-5.22.5.ebuild 1067 BLAKE2B 2328aa3684ce5e813b90b50de576109b429823b54bfba1a2f41cdd7d34f36ffdad5723669cf50942580775d90cae596d0aa935bc36002888a3b66096c0c8bd56 SHA512 3e14178cfdb6b0e0dffb1b3d5e811fc196b4982d846273dfcbbacfcf9f300998e8c4a4b5b63c4410f430979a42b34fc5bbf18ae84ee7214d143088e6f866c52f
-EBUILD kmenuedit-5.22.90.ebuild 1070 BLAKE2B b0c664cbbbb05bf4518fbca916299848b24d12422b58a0e24a81afb7742fb0835aa1185443eb015bd4fba495530d1b3b2089a8a28dfbbdbc351afab8786dc6f3 SHA512 00aca2766299e0f01ccabc76b39f3083ac15dcc19390e872484cc085417cbee2af3e5cfb9e13d6e79691982cb363bb2b9572a2bc9d969b99213144561ce99ca2
+EBUILD kmenuedit-5.23.1.ebuild 1070 BLAKE2B b0c664cbbbb05bf4518fbca916299848b24d12422b58a0e24a81afb7742fb0835aa1185443eb015bd4fba495530d1b3b2089a8a28dfbbdbc351afab8786dc6f3 SHA512 00aca2766299e0f01ccabc76b39f3083ac15dcc19390e872484cc085417cbee2af3e5cfb9e13d6e79691982cb363bb2b9572a2bc9d969b99213144561ce99ca2
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.22.90.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.23.1.ebuild
index 87a9cfbbd331..87a9cfbbd331 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.22.90.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.23.1.ebuild
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 924cbc7d8068..92192b04638f 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,5 @@
 DIST kscreen-5.22.5.tar.xz 117916 BLAKE2B c965a4feee13aa2ae1af29feab9dcfc166a4d6ede547358902e5292d971909062095c3ece00ead0757ff1e50efb79e20cb2354c29ccf9b833be8ef81d1121a97 SHA512 c2be9546bdc00f83fe501a9cbd7b900b4201804edcda94d0632b8a09514821b52a57bf4c8db6111a6c1d54a6806a173d09d983b2e8d035cc98b57638a011920e
-DIST kscreen-5.22.90.tar.xz 131320 BLAKE2B 393c453b2f2a7c3d10c68720b159c5835b81d6373bdbb25902a1738842bd99330532443f5c09d0c2d558daee77a78fc0877587714673329f41bb4b58b13c230a SHA512 b131c8f87453cab7cf575772a690ea135fb67439bd139cfd6c15db2b82715b59eafe64e2930db9046c4d848f183c3bba63e4a7b62164712db5acb8a78701ced0
+DIST kscreen-5.23.1.tar.xz 132136 BLAKE2B ebb3c7906055f0c4fe588bf05aff3001be5ce1cfb74d7890a80aa4bcf1712abc926f5284b9dec85b905384522a4cfcee6be7564caa9ad49e4b25f72967cbc031 SHA512 41597e859959063e6ddea766005dde6c4022c6308477852ff6855002dedbae0f24874534a18bc0c3ed81d7a5e4a76bfc8a42a856becc8f19c16e64d4453d2734
 EBUILD kscreen-5.22.5.ebuild 1230 BLAKE2B 3a48559a3b1ec7071c2af09f1b7677da852c32cd688d6e886f13fce59514686aa5a6618ab373d00adac9ae6d21f1c59d88e67ed9bbe82d444c16a938f70eeb87 SHA512 30cf35eb0bd7408c4edf2be138ebdd1ed36ecc2c7e3beefc681fad22141c4c36c255eb0c05e61abae48f1cc1118387912c69ade0c527d91ab2e0a6ec332737e4
-EBUILD kscreen-5.22.90.ebuild 1233 BLAKE2B 0ab3c034a013377588bb9ece116296b49f903d1795c27863ac0c97a34e897cf31b0326bd6227eaddaaf24d483c9aea62734df1e858155044ce7f4f6ef0bdb9f3 SHA512 a258f0f2266476375d4e910b63e4ee319114e1b265ad74ac5e305fe7aa0861d25b08f8b60136d051ec6a793d51a494d13c44b4e48c847ef1e181c3deee25c593
+EBUILD kscreen-5.23.1.ebuild 1233 BLAKE2B 0ab3c034a013377588bb9ece116296b49f903d1795c27863ac0c97a34e897cf31b0326bd6227eaddaaf24d483c9aea62734df1e858155044ce7f4f6ef0bdb9f3 SHA512 a258f0f2266476375d4e910b63e4ee319114e1b265ad74ac5e305fe7aa0861d25b08f8b60136d051ec6a793d51a494d13c44b4e48c847ef1e181c3deee25c593
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreen/kscreen-5.22.90.ebuild b/kde-plasma/kscreen/kscreen-5.23.1.ebuild
index d90b37272cd1..d90b37272cd1 100644
--- a/kde-plasma/kscreen/kscreen-5.22.90.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.23.1.ebuild
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 489ef4dd410e..14d62ea92cd4 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 DIST kscreenlocker-5.22.5.tar.xz 116688 BLAKE2B 8e4bba6e78910f37e6abe18130c634afbbf9be7bba2a6eb1a694badd376890bd16e96bc2e575f1468dc9c4cc0a9bb057bd5c1dc0c4a75e2e8feb9dd26caad3b4 SHA512 e2b467743f36271cf3eac2c7b593ae5971dcc3ab917af42480dbf782bbe93eb2f24cb600d6fceae5efc2ccd8e5ab3d6a76b921f189cfcec62c661d7cc1f545f9
-DIST kscreenlocker-5.22.90.tar.xz 117276 BLAKE2B 43e7bbbd20c0c0dc00e450f808150678de324e48b0bd8a9dc7ce575c1d0e86281fec84280c2bbfa8b13e6295a8719e155267f0ac6aabe9ca7112058b71fd7eb6 SHA512 1c894f28a6585822d1b66de3e6c711f63581ea2fde2f2fb954bb5ef23c403fe12be13d3279db905d3b393728ecb96350c08b5293675c87e7eabb7014f40b59ac
+DIST kscreenlocker-5.23.1.tar.xz 117484 BLAKE2B 2449ff9182bfe322e24f53bd1704812de69f7e707f0a5b8b63f94542335370da98c20992c6e64a5cf5aa9db539837da83db32c3f0acccae5794d2494da484c5e SHA512 f3564ca9de68464ab27999714d5450afda94398cfbbe958930ebf60a997f9ac14040574eef3f2092a2d8b09be4539b88b6034dce90420ef9e988d53645e6aee6
 EBUILD kscreenlocker-5.22.5.ebuild 2263 BLAKE2B b61aab7b36993b2ad7fd0e02f58118a47f339f7be5fee412eff406c40b47bfc6cf2fb6b942f218962dbb3edc069f62b8deb74e964247dc34fd0d13343c855a0e SHA512 fdb4d5a984c7fb9ab3ae1730503ca3232239763d8608cd8d716440fb5d6c95b638c00d37594396ce9459f68d06ee135ff62d4cd5d1ae43366688c7bbb7345a41
-EBUILD kscreenlocker-5.22.90.ebuild 2266 BLAKE2B 8e992b572d848e3f4d3d8805b33f96e1dd579a7698752ca02ac7601161634aaa307fe83ca2e5087b9a1d211727d3a60febb2f50989aef29bf305cda0b6df619a SHA512 a0987917fc6d9ba233280eb2a1aa83b265763c660c31b29822323bf14e03843c3f2d38b7942902cad162bd5a2710a3c54256dbd3d73c942448facc2805d63983
+EBUILD kscreenlocker-5.23.1.ebuild 2266 BLAKE2B 8e992b572d848e3f4d3d8805b33f96e1dd579a7698752ca02ac7601161634aaa307fe83ca2e5087b9a1d211727d3a60febb2f50989aef29bf305cda0b6df619a SHA512 a0987917fc6d9ba233280eb2a1aa83b265763c660c31b29822323bf14e03843c3f2d38b7942902cad162bd5a2710a3c54256dbd3d73c942448facc2805d63983
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.22.90.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.23.1.ebuild
index 0f53f43e33ae..0f53f43e33ae 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.22.90.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.23.1.ebuild
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 30f7d752e5aa..5c672379b24d 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,6 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
 DIST ksshaskpass-5.22.5.tar.xz 24076 BLAKE2B 2625d07b18b5e1ccd98f5b34e402a4ea201190f3be240ea596e8b4c70f0a15204e7d5ea559a0b17bc253247eca41a988f65bb2e29ee07c2e35600d8a1f761b34 SHA512 35f430882aa735f1b9d7a1874f83fa67074cfb720bbba377d0b38baab2f3eaeddc1598f6f7b9c79479b95d22fdc661d7dfd6835b98a78ea159c68d64abc81a67
-DIST ksshaskpass-5.22.90.tar.xz 24068 BLAKE2B 9d6b2d6806df0f43a274a3a18c135d5368a6ae83f77d131f73ee968a9e6e01e8da7c6b3c8652ec3cf338a8bc4d98c9999ad2a4e0f15dc001bf328c871fe2e3c1 SHA512 7c941eb2e8057a06ae9d7b99f40bebcb6b463c047d31647e305fdd5a01b1686a091650ff4804b8671cff2c7f38c5ed4137f98f314a785ce1c14adadae6da756a
+DIST ksshaskpass-5.23.1.tar.xz 24064 BLAKE2B edfe2e7c439ef346726c73c0ba757cd9d6d7c1b7efb3eb41dcf4a813714f5150bd4366b789bb6ee8212101256424b1fcad3f5a63fa2c8489901bbf6406ebe33b SHA512 6f0483159ef2fe1bc5bbb02d8be440494a1c6cde2516f7f37e8d3e99cbb71e486025ba20853395de49fcf4149d49603342a7e5416382f728f2193ab977d3f50b
 EBUILD ksshaskpass-5.22.5.ebuild 1440 BLAKE2B bd31463f01b5247c0b832fc75df87992c1ce72f9cc88b85b1cbc9add2bf8ba34489d2e0f30e03e0220a7bbdf8eb235ab79df8834f901f0514cbd7c9c2b7c8eff SHA512 8220f2d31c415d7abe82f0952ed98e0b248fbf3e5f8887b93aecd1efb2632ad6f7f5da547ff49cf681d44a63a26bb1dc7e40683c03b4113038d60b36dd2becb4
-EBUILD ksshaskpass-5.22.90.ebuild 1443 BLAKE2B 9cde742f021639b9556046bb2d871369b63ccbf688ed6c85250343aaa2687015ccb53e97d38eff2138a4d472a2a471f14333813f6f4b423df25e3a0a0d3da2f3 SHA512 744a1b76c1a7339b35c11f99a54c04ac1c1da9378384d30c2fb6a80b5c896499cddbc8fcd9433cb71cff7c38e36fcd09dd124142eb3967f9c9cfd14e524ffde7
+EBUILD ksshaskpass-5.23.1.ebuild 1443 BLAKE2B 9cde742f021639b9556046bb2d871369b63ccbf688ed6c85250343aaa2687015ccb53e97d38eff2138a4d472a2a471f14333813f6f4b423df25e3a0a0d3da2f3 SHA512 744a1b76c1a7339b35c11f99a54c04ac1c1da9378384d30c2fb6a80b5c896499cddbc8fcd9433cb71cff7c38e36fcd09dd124142eb3967f9c9cfd14e524ffde7
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.22.90.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.23.1.ebuild
index 618cd3f1026f..618cd3f1026f 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.22.90.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.23.1.ebuild
diff --git a/kde-plasma/ksystemstats/Manifest b/kde-plasma/ksystemstats/Manifest
index bd1ce1eab281..d2aafe860278 100644
--- a/kde-plasma/ksystemstats/Manifest
+++ b/kde-plasma/ksystemstats/Manifest
@@ -1,5 +1,5 @@
 DIST ksystemstats-5.22.5.tar.xz 86240 BLAKE2B 397ab260be6d49174613ca4cd0a1611605a127a72641e53ec8c1f5f743b6799dac1c82632dc5830075e790f1184a10d283e2e5556b3d8a84c3dc59b5f5c36867 SHA512 020e5b9ab2768c37563ee8db8b6ec812cc86423f72629dbb777168c74a9c7a417db8b32e745d100ad1141a4915328ea9649d1d6a2e6eaa79e238f29fd336d546
-DIST ksystemstats-5.22.90.tar.xz 89284 BLAKE2B 8fa2b8af6b7b85c17e76fa3b277d4e29c38310f34e505e12dcbac1c0977b950f9483ee879260e58b9f9014ca06da23180fbabba9eba915d053e3b5b0555175e3 SHA512 ac40be5620a7c00a7d5c0249245c678c93af71e0bfd6270d7e8f83a5c2390ca90dbe75421cb7159c1e3da6dc26214a7f801b190462b117a70662adfa8017dc88
+DIST ksystemstats-5.23.1.tar.xz 90488 BLAKE2B 0a3e6e1ae4be4657cd02f08fbc17206306cfd41ca97d8671da29b091e9a10bdc5db8c989276860531d25ed56cfe808bfefd257dde761699e455d98ac39d24562 SHA512 d69b2c19096ab00b876018fc52595a7f71b08121caffae8d435910f07869ca1500d891d537fb9143476efd660f7a557e9897454185ed9de7805f2e72265efae0
 EBUILD ksystemstats-5.22.5.ebuild 1119 BLAKE2B 349c0061be78373396718a4e4f4ecb480ef74f517e80bf85b9164745ba0e592fcabe9d0d310608c6722a83870efc6ab0390a6633ce173f543f7f54d0d0ec6888 SHA512 dcce49a1e3c005e61a74318750a5e21ddcf77e5a46fd7f4eecb8b465b044b19eaabfbfe431b63470fa1dd529128d04236dd7bbbf1990d6614da603328e0bd36d
-EBUILD ksystemstats-5.22.90.ebuild 1048 BLAKE2B 7c229d0d29900a4994daf081cf036f58ef8e415e9fd040e0161cfbee0d5d5cb7f441db4a24a50a66c45c611594ef28c1e9f923c8945097741b778683562669f2 SHA512 301715f2a834f874211f7309f492accaa28cff22d6ce4c5385ef3960593c6595c06abd91321f42e6bc2fc07446b603671b109f4ab1ffb5716be2440e44ba8fa7
+EBUILD ksystemstats-5.23.1.ebuild 1048 BLAKE2B 7c229d0d29900a4994daf081cf036f58ef8e415e9fd040e0161cfbee0d5d5cb7f441db4a24a50a66c45c611594ef28c1e9f923c8945097741b778683562669f2 SHA512 301715f2a834f874211f7309f492accaa28cff22d6ce4c5385ef3960593c6595c06abd91321f42e6bc2fc07446b603671b109f4ab1ffb5716be2440e44ba8fa7
 MISC metadata.xml 467 BLAKE2B 61ac6047a4cb3d54d26f963b75c94022a501fd1b1b9ee227cce16023fb40b101ba40c6ff99e02c5913137b191bd9c516249387b0310f6558c9800b10f52e780a SHA512 0ad261d9d2e7a45d01b06a15270346bf169a3a8d827b409616e3801e4357910fe196813dd87ff4bea34e61cce3931443d9b617ef532230448f54048d1ed84f4a
diff --git a/kde-plasma/ksystemstats/ksystemstats-5.22.90.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.23.1.ebuild
index 5c363a1d417c..5c363a1d417c 100644
--- a/kde-plasma/ksystemstats/ksystemstats-5.22.90.ebuild
+++ b/kde-plasma/ksystemstats/ksystemstats-5.23.1.ebuild
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index a7fe3580337a..cc7e0e87185a 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-pam-5.22.5.tar.xz 19960 BLAKE2B 978860fc113e2a02bd2543aa5147832050fb3b53a1916939cc21772e98a7a2e4d47892d514427f15a3fbff70a6eadcb98fdd934fb8d731992ff3fc8252c32f6b SHA512 230135ee7aadbbc9f08695afa87fd7d8f0e3dca5da40f94bea92ad83a8a2ccc86efb7d593730079a0affc91f28383d089a08fd2b4db57961ba7c5b3a009a6038
-DIST kwallet-pam-5.22.90.tar.xz 20116 BLAKE2B 9ad8a89f9ed9adbdb93532bf555d22789c67905dd8c8b985c03a1472d0343be9cc26a73eee3dba140a609b50ce1fac85debe8c8bc6a8faed34fd85024ff0ad0d SHA512 c773af7ac2ecfe3e78c6ca185684ef0f91de85b94d808e1c683600cecfa9385275472673daa82c5e8fcd8648f72e14f60491581d0025df834d60da6b24e4a95d
+DIST kwallet-pam-5.23.1.tar.xz 20120 BLAKE2B 4c40d1a283e0837f30a5f4be352f50636cc94c7a67a8e248446dff84b946215fe6f6585ae76a09ffb334376ad6bce1c9777d3b6c6ddf71fbda61acf326113769 SHA512 0e8369a25fdd1cd8de43f8a13ba0a62dcd03a9f20997cf803957716e5ec14173cb16eac350c14b30e25cfb9f547ece97dbc9deb67ff9a1184626881dde433010
 EBUILD kwallet-pam-5.22.5.ebuild 738 BLAKE2B 81da3c107bcdad60688be474718d174329f32bd92d3f61fbb63b8b385eb8a33b0a71496c1c8e7e8411b6891d45acce7b0fe0deb4537d2ac713809fd413a175d6 SHA512 97fce9429137a2cfb807397e34dc99fa23b879977285adb22ba046651acfd5cb140e1cf96f6fd0ee6caa75d350a854a23f633f255a6fa85acf9283818fe69258
-EBUILD kwallet-pam-5.22.90.ebuild 741 BLAKE2B 0194cd9dacc1fd1b848dd92cbaa2ff1a7187abbd76002d570f88c0ba4d67396416ee24957c6e530929f923126100d218b249f6cb8f7399bf857114d83c99af19 SHA512 71c3e2c6f6ed674ac7c0d6699959bdb600b6bf7f239261e31bd507ff7b14018d991c1f25498f89dbd58509103d3fddfdbb50a1eec8793a46bb44135b8b3939b3
+EBUILD kwallet-pam-5.23.1.ebuild 741 BLAKE2B 0194cd9dacc1fd1b848dd92cbaa2ff1a7187abbd76002d570f88c0ba4d67396416ee24957c6e530929f923126100d218b249f6cb8f7399bf857114d83c99af19 SHA512 71c3e2c6f6ed674ac7c0d6699959bdb600b6bf7f239261e31bd507ff7b14018d991c1f25498f89dbd58509103d3fddfdbb50a1eec8793a46bb44135b8b3939b3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.22.90.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.23.1.ebuild
index bc2a2dd88454..bc2a2dd88454 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.22.90.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.23.1.ebuild
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index f9a7dc706d99..38c8ea6cf7ae 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-integration-5.22.5.tar.xz 22708 BLAKE2B 61e084dd71721b556fc9bf0aafe92908c25070d1f8683ae53093ca413b0e81efb1c21a3fbb7c033c1e324b2032c8fe9946287eadd53607ee549944f06d081932 SHA512 456b745e493965781178e1cd2fe64b8833294800ea152f5f95d00e1e2c221f97c2a29b91498573bc25710e3ad42482e46a4f0f33d5a57ce8ed1454a65fba81a9
-DIST kwayland-integration-5.22.90.tar.xz 24164 BLAKE2B 6be1c6558ead14b0e892e579f52b85d0379deca89da80d1e0add3669750bd59e478a65dfd71010824ce0dc2aa1e32b57ccca90eeaf07defc342768efa434e5d9 SHA512 f442125728966bfe09fda859b642af71ac0d33526391828d98854d372a4d82f69c6b2f844ac591de539f72f25fefadd5b0d7c714e5d283f57dea0bbb05ef39cf
+DIST kwayland-integration-5.23.1.tar.xz 24176 BLAKE2B 185b68e76725fc082d1a01a27f577b8aaa7453c15b3a3289999a249b7a99d41e74bd836a443a7fea7b66435027e86878677c79206ce8fd911189ec5dc1f02c3e SHA512 6287004978e61572765d3826d395c643b9e1ee54ae0b82060f0c367663e522abacf8a2e4440c275c39beec836d5c8e5aaa175dab5fc4b77c97dc1051a82167da
 EBUILD kwayland-integration-5.22.5-r1.ebuild 1017 BLAKE2B 57872a830383214d8cea2296305003fc41cd4f945c725a2beb290fce919a7fd22e96fd3005653c0439084548b36d68a5e3f08b11455b8d3139cebbdd85565cde SHA512 4beab3997fa640a39fa6d2a159145a5a1b6d49716317a7d77006a9801492c479ce1e80049801b97eb84d3bc967975135a101ba98ec0194bd0898b3b73b24b31b
-EBUILD kwayland-integration-5.22.90.ebuild 1156 BLAKE2B 08f55b1a7e6b11deb6c4763fc804e9e2c515de35eb185ef9a88d3c1c0fb20279f787368d3c535c31c1f77b3d8735cd818efabd6db328dbc7d7b1e98dfb7e9d78 SHA512 05056712acac2b68cf624252429a3b5d3e58895063a2c5114ad2f41eefe2fc98ad25372f8e7ffd136b95ee26f1a1fc8a7b4311adf5b543f40fe6d52b93815284
+EBUILD kwayland-integration-5.23.1.ebuild 1156 BLAKE2B 08f55b1a7e6b11deb6c4763fc804e9e2c515de35eb185ef9a88d3c1c0fb20279f787368d3c535c31c1f77b3d8735cd818efabd6db328dbc7d7b1e98dfb7e9d78 SHA512 05056712acac2b68cf624252429a3b5d3e58895063a2c5114ad2f41eefe2fc98ad25372f8e7ffd136b95ee26f1a1fc8a7b4311adf5b543f40fe6d52b93815284
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.22.90.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.23.1.ebuild
index 9a1d55f7aa5c..9a1d55f7aa5c 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.22.90.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.23.1.ebuild
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index 510539630818..4fb0d3ae6335 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-server-5.22.5.tar.xz 218728 BLAKE2B dcc74e853b5d63709c72e44c34935829e4b14544bf8571578d08cbc3d8fcf52bff9f53cce82538be28f4c2fe2eddeb0042ac43081cab000816e8f3491076fa2e SHA512 2fbbd025622fe01b57099a418e2b42d567d1874ac7e04ee21b19f471ce7a89a9feb7ccd79269dfa2b55d043d234bf0454368fd304039d9a3e056602d1f6c0dd0
-DIST kwayland-server-5.22.90.tar.xz 217352 BLAKE2B 075925906c3436de2fbbf19cb2549af79d139a27f77c405bf82b4da96d5238675722055475a7b542100dc4b93deb3fe13220f38198e2d2a1fb9c91f08b72cad4 SHA512 470718519c6aec29a8bc5289a76bd1bef78556f72e5df2326e0d6e7aa76278746e83e631b5a5169f51d686c4854aa6bbe9ca7d88bc8fcfac78210d87806d2023
+DIST kwayland-server-5.23.1.tar.xz 217548 BLAKE2B 30ae75ba80f8720700933893ed911d873664b5a73e082a37b3e2304727bd6a3e01d161a820316342ff16df4ea839f2c2f299756e56f0e4d67c83c61e245c9507 SHA512 a060d10f34c83bdbbbe26b007f166f8b10a314d572ef65f801a3191e4685964e0b48a89d9e1df5600cc766c686d9f9eac01c0b7e5178856ced5f8fd9ba5c72de
 EBUILD kwayland-server-5.22.5.ebuild 822 BLAKE2B f68d08b7f81cc6153d2c0b86498e44393925787449ce2657ce105273bd3f4ba58f38d9585e86a9f9b859ae22d39a54fdbf142aaccbe8b39d0587a1c7168134cf SHA512 bf5e072d522be518a0360607b5ebc47f24b423ab02d498b46db98b7e21af9e24880e9456516be75ea988644316edd5c011cd7115fbf6566b138de4893709df95
-EBUILD kwayland-server-5.22.90.ebuild 825 BLAKE2B c6a2a8e061cf42e369036e7d9f91d124b1cf5319c1baca70a3e3db96eaea05a49e2f26fa6ad508aae57307ee78b634f412fa32da62885a1dc14877e9020f5a24 SHA512 4f1836a915e46afb42cef728972200d64d492459c3ce145a4dede54ca964c6b54ae7435575efd7f305909f2e66fc1d6e8ae04d18dea5e5cb037b0963fc0fddac
+EBUILD kwayland-server-5.23.1.ebuild 825 BLAKE2B c6a2a8e061cf42e369036e7d9f91d124b1cf5319c1baca70a3e3db96eaea05a49e2f26fa6ad508aae57307ee78b634f412fa32da62885a1dc14877e9020f5a24 SHA512 4f1836a915e46afb42cef728972200d64d492459c3ce145a4dede54ca964c6b54ae7435575efd7f305909f2e66fc1d6e8ae04d18dea5e5cb037b0963fc0fddac
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.22.90.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.23.1.ebuild
index 6badc119f3d9..6badc119f3d9 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.22.90.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.23.1.ebuild
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 69cf61436287..4c98ff626825 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,7 +1,7 @@
 AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc
 AUX kwin-5.22.5-libglvnd-1.3.4.patch 2959 BLAKE2B 849912f1b614d8ece456c9bbf020cd146a4a07ec759b1a5f8f19d773c3081ce464e26dff64e84fa5f7df7df3e44e8e5fe607a136d9fa29e93530aa14f336b7e8 SHA512 982b50894427ed5275ab0d807f616e7b4e17370000558c434d9178c09ec7fa5447b3f9ad08c1945fcf6f2cbc17f2653ce6863027678ae74fd2dc653a5d587263
 DIST kwin-5.22.5.tar.xz 6459916 BLAKE2B caaec435be180fd4c359bea2d1f4a9a0e3e5854f73b91b83d62ad4e488e9d779a7f6bc5620dfb2ebcf5629b2f90c958d4a4a126df34c9734220c64262e751fba SHA512 4e466f3961279610c16d24c1dbc6368862308ee7bf677bf9f8ed1898465aa31263a34362b1beaad451b6c5e94068d908718c7bb37d12b814f2af9a1eccf417d2
-DIST kwin-5.22.90.tar.xz 6327028 BLAKE2B 273c7a92225136e7c86e8249be0c0200cab2c9e90fcc64b24e3c4450580600ba53ace32da0a7409b7c3f7efe0985f12ed90229b524377511d95aae6d4d7841ac SHA512 89dcb08f00a130ff5498f641993aec3997b9ff95ffcc8749cd4d3bfacc204ac9e83f6a9653f14fa0743276cefc02220ac96e898c653c2f18261a2a5a0e3fffea
+DIST kwin-5.23.1.tar.xz 6332136 BLAKE2B 17236fe39f1d8c842c3003aa9d22fc27cc018bb77b1ad8d73668face0d8bcff25c964f1273281edf8437b8a33fbc1c6ef5a0b93f464e98547234ccde681c5601 SHA512 b3dd5585f2baed520474d12d301fb4d3d356fffac5f532dcd642d5413627f6c7f02ef6406da584db1cba99bc96e983d6ea5b4a2104d2f39ed219f25fed7d3a78
 EBUILD kwin-5.22.5.ebuild 4128 BLAKE2B 8b93294d20199942f6aa0b4ed480618dff5bb7d4cc391340741c5c56088b577c02c15cec0742e6df2a7c45293316011c0a74dfec892ed53c566e86bb295ef81c SHA512 8d7c7c74e886ea8fd4d7a2dd47f8483cc162dd489d13c1d82a76595255d0c321c4e38ec6d9bba3a945349045963db018b0e1fa3526464e07d962922528f778c9
-EBUILD kwin-5.22.90.ebuild 4003 BLAKE2B 3a57c49c4640fc7aea1bb139b3b1a6298b951f99af5308573771822072d61e77898f66d11ed8f66cd2524eb49ffdfd903bbe158eb0211ac4938ec5b5e2de4a70 SHA512 a9d939d9e41cfccd0cfca8d0ad1c3dcda0064ae7dfb83d69efc594053bbea47bd8fa90803a071f8cc5c64e319888de76f70333002b85e1b9e65840a4106ed692
+EBUILD kwin-5.23.1.ebuild 4003 BLAKE2B 3a57c49c4640fc7aea1bb139b3b1a6298b951f99af5308573771822072d61e77898f66d11ed8f66cd2524eb49ffdfd903bbe158eb0211ac4938ec5b5e2de4a70 SHA512 a9d939d9e41cfccd0cfca8d0ad1c3dcda0064ae7dfb83d69efc594053bbea47bd8fa90803a071f8cc5c64e319888de76f70333002b85e1b9e65840a4106ed692
 MISC metadata.xml 512 BLAKE2B 3e81119dbc98181573e294885c52623e4799b55c238ca9513e33547e718ec0f1762371d6391a4291c54159f31cd510cd8d9c192aa16ef0fc16672a3d0ef25dbe SHA512 a9a28562cb0f25abf24cb89c48fea816bfaf701c889ee08e66b80b3afe434af68e5ddb0fa21d313d68418c81a1e73eefcabf75e8e3878f55a1292039dde6ecdb
diff --git a/kde-plasma/kwin/kwin-5.22.90.ebuild b/kde-plasma/kwin/kwin-5.23.1.ebuild
index 52d15b22caac..52d15b22caac 100644
--- a/kde-plasma/kwin/kwin-5.22.90.ebuild
+++ b/kde-plasma/kwin/kwin-5.23.1.ebuild
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 6de33da31c1f..8be1ca344427 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,5 @@
 DIST kwrited-5.22.5.tar.xz 20504 BLAKE2B 05e306020cfdeaa2273f2f9e782c19dd7ae319f6318c70498d4aa32d00d97add5abc5c19e69726b4269d9274a85377c3f1b1affdad911dba857ad6218880bd08 SHA512 2988b0cd5f287503367d48f43ac31e454d5545476bc6763360b111f945d6b3ebffc1a55f8746493c70e9443c6d04d1c41f25a0484932de2edb12a54ab54f117c
-DIST kwrited-5.22.90.tar.xz 20512 BLAKE2B fc5221c7af8075b4339527823fcc48a1694609cdcfa321f956ebe62279dcfa77c40e7590839cbc7c11480808f73dcc53a400f53700c2657dab5efe948aa50ac5 SHA512 214b71e8e3cc0bbb335ad0781c9741a3bc3e77ea1c1da2f468c8f2cc170315054f755fc2582e2c0bd60f391646c869efdcdb9299673bc22a1ae77299e2c070ed
+DIST kwrited-5.23.1.tar.xz 20512 BLAKE2B 870b13092514e3a8b637783017e9bbe580b0901f4d07ec01454c873baaec8f12949cae08cd2082841a114b6019f6fbc149ee91f8fbef6ffb04d4a03889475485 SHA512 127c7fe44277aac3889b530e18c350cd15fd340846eeb259333d59a18427f3cfe292983fd9953d222b5c5d5f0266c81b99f1bd89cbeae1616d53d86f4d5778ca
 EBUILD kwrited-5.22.5.ebuild 599 BLAKE2B 466e79dfdad4de784707f7b97f2c76ea06487d68e18d7cc9dd561b6aebe518ed7052d6a873356901d092db0d0f04de44cab3dd4681e6acdcf12079c88bf899be SHA512 3c4d91b14c990354325f6e2d50b0e05564f9e0ed8cde67ca2a1a5b0efb46e10573c17a260bf17c241bc60c15e65c8a46469e87b1392ab68786d86e2b9487f474
-EBUILD kwrited-5.22.90.ebuild 602 BLAKE2B c594ac61715c4ac0837b48ebce0230a6afd69d303561fed723d66f6f4cd3b3c3be35bf499522ca816bcf27b7e69599eba7740f4725b369b187cc4ac0cde5b13c SHA512 8ed0c3a91c14250df05a61f87a39769ee806693677a032844f4ed9a85a1de7e4066e5282f2235f2a68dd3b422b7583f15dc504ff9dff1e5badce49b1ffb87aae
+EBUILD kwrited-5.23.1.ebuild 602 BLAKE2B c594ac61715c4ac0837b48ebce0230a6afd69d303561fed723d66f6f4cd3b3c3be35bf499522ca816bcf27b7e69599eba7740f4725b369b187cc4ac0cde5b13c SHA512 8ed0c3a91c14250df05a61f87a39769ee806693677a032844f4ed9a85a1de7e4066e5282f2235f2a68dd3b422b7583f15dc504ff9dff1e5badce49b1ffb87aae
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwrited/kwrited-5.22.90.ebuild b/kde-plasma/kwrited/kwrited-5.23.1.ebuild
index aa1c51796c7d..aa1c51796c7d 100644
--- a/kde-plasma/kwrited/kwrited-5.22.90.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.23.1.ebuild
diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest
index c8373d792838..c54e001e48f4 100644
--- a/kde-plasma/layer-shell-qt/Manifest
+++ b/kde-plasma/layer-shell-qt/Manifest
@@ -1,5 +1,5 @@
 DIST layer-shell-qt-5.22.5.tar.xz 17604 BLAKE2B 4079ffebddc52b3ec4422516daa4894531b2a99fd184135ce081de1cbd8cd14ab477be355ebe50bf41dc4ee323ced7a7cf00a629c8ee16a0072d97eb18dc1628 SHA512 5bb85f73d68eb47b9fcad18e5d52ce22bddb73a486710dc2b47e5eb5f3ffee9674969505e55bdedbae19669c9568f9b4276a739aa1cde326c7795a199e6776d2
-DIST layer-shell-qt-5.22.90.tar.xz 17768 BLAKE2B d8e2af3a28ac52433611677d011a9da0cf05833c1f3aeab8f0875dc98816d74cf1800c97aa47db40da597f22c8b4dce76815be658cfac93bbfc4c343b777de6c SHA512 0ff0387aed2e3f7cf2df3d95a47493b50bf9816c2a620228465d4f01a19fad50fc78146eb500455d37e84e260e14f516dee1e4b822c2efb4c7617f1b3b60c146
+DIST layer-shell-qt-5.23.1.tar.xz 17772 BLAKE2B cbbf4b8bea40c6e162f9361281bd733f73716b4fec4f32d01a203bf8dfe95d0834af8a5ba49fe2e956da55cfaeab604690b8c12124381cd4df275a54b7e1420b SHA512 42bab4108ef7057a7dfc5ac09cd8e947e9a7dfdcf6d7c453bf6cc5d93c33cbd8ab6ebd703e311fab823d82a3a0007e7866bb3b83c49b08a86b97f7169048d0f0
 EBUILD layer-shell-qt-5.22.5-r1.ebuild 774 BLAKE2B 0959c4261edacea210776903652df28cdf6fb105d89095aadc1eb89759544128072be05ee638e8354283e3bdb0f84f8947a8084f7012d79c21fab585cb61bb6a SHA512 372bf4dc5d97f108e8e75ebcce28f268833a87418af9ede707008feb51c8383c85657f1850dbc918443d5bcbbede2324a23e290e92e78228f22797b160b7bea4
-EBUILD layer-shell-qt-5.22.90.ebuild 777 BLAKE2B f0b518ab88b8599721c714c3bf8214be0fa7f88f2648c75f5c9df7ed7da99ee8d5d13493e8485957746c5ffac6db8b8a53241b2e3abd1417917dc63794ae2f49 SHA512 94724605e29b513ba3a0b1acdd5454c4b28de4402f3fc1128e1f4b26dd0b10a34e3b6960bd1babafbf01d1a15de780fb70a005481c1a8973420901f57c5b84b1
+EBUILD layer-shell-qt-5.23.1.ebuild 777 BLAKE2B f0b518ab88b8599721c714c3bf8214be0fa7f88f2648c75f5c9df7ed7da99ee8d5d13493e8485957746c5ffac6db8b8a53241b2e3abd1417917dc63794ae2f49 SHA512 94724605e29b513ba3a0b1acdd5454c4b28de4402f3fc1128e1f4b26dd0b10a34e3b6960bd1babafbf01d1a15de780fb70a005481c1a8973420901f57c5b84b1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.90.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.1.ebuild
index 582e24874ff2..582e24874ff2 100644
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.90.ebuild
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.23.1.ebuild
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 69b67104fad5..5720550f3947 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
 DIST libkscreen-5.22.5.tar.xz 95376 BLAKE2B e5182f2bbc3805e3aab90966ea2abb91c8651acdd6aa315bd58d9b52320cf56e53588fcd7b8cf97a6b69ad523b7abb886c53a7a72a512aa1d76652e86ec7166f SHA512 3b6ccc3ebc813345dec6955ce95bb8601879614a89fc8b319da2430d261dfa0d326c64a19d3e01fc9c3379f3b876c56fc3da4ade5709aaa0f31217dd04d9a226
-DIST libkscreen-5.22.90.tar.xz 97860 BLAKE2B c37c2cf5597bf65b90bd0726d69df67f718988c3a9887c4c6de8d6b5cd74b49d7d765f5e56888cc645989dcd80a07a93647509287212acc1f7f3516b3cf09dcc SHA512 dc01540b4f7ad7e271bc02a3b3fc1cf9098ffa2639463930488aacbd644f08a3d8adc932a1dc3697815c9c7ba1c0ed4ed122768bdaf8238d16be75f32f6e1b37
+DIST libkscreen-5.23.1.tar.xz 97944 BLAKE2B f3d645823c0fc2eb10f179f535cccd210726a5036e53cf3800d18c9d09fd7d7019a6d3b81eb924827df56451d7b62969961a964b2c585c745bb9455e37453dc2 SHA512 6357864965f6fec64bba8c03766b41e0ecbdd20ece92fdc907ee0a18fc464b93a3ad905823750fb9165898f2620d4b27da73067601391a9a3956c07c768bb81c
 EBUILD libkscreen-5.22.5.ebuild 652 BLAKE2B adf64ade89ad9189df3cb429cefad5e86e6522898c22c75c56461393b05a10064f583d5964e159ee17abd6f5d909b9e661adfcfd59679e820f658ee1ed3401ad SHA512 6161c7319d3b0707380aa467775a294416f5075d857a028e513d2e8e01eb4dca8c9325c40ba93b2c4df846243ee2cfc60adad4ce5322973d90bc9b3439edd352
-EBUILD libkscreen-5.22.90.ebuild 655 BLAKE2B 9b085cbbcadd214d9f3dd2705973bddc0c31f862a5ebaf3c4f34ab38b179c843eaca0f7357de6662a72726a4a6fc2724cf91ff9b5d9f1f1a42a5711a07e9cb05 SHA512 460040c26869449e936dda73d629ecf6393fd8fadb94565619c7eccf19592af2533ea2357d829b0ba9d932d1d519f84f8683c7ec5a170cce7df53777092f4476
+EBUILD libkscreen-5.23.1.ebuild 655 BLAKE2B 9b085cbbcadd214d9f3dd2705973bddc0c31f862a5ebaf3c4f34ab38b179c843eaca0f7357de6662a72726a4a6fc2724cf91ff9b5d9f1f1a42a5711a07e9cb05 SHA512 460040c26869449e936dda73d629ecf6393fd8fadb94565619c7eccf19592af2533ea2357d829b0ba9d932d1d519f84f8683c7ec5a170cce7df53777092f4476
 MISC metadata.xml 406 BLAKE2B f47c4d7eab804ce88be47f9723f0610045c62b51883ad7877b00388cff9c2a6cd1e72afa24076c1c9affae154d6cc881f33eab04b862c4e40f708fde341a4883 SHA512 47370335bdf14118dacfa8189bcafd2089a2ec131c62d2c07a21ea4db32d837de1f5765be2907fd709b263f5fd3c3b2c5f12da1646ad5d9ff6d2b9ea9f99ebf7
diff --git a/kde-plasma/libkscreen/libkscreen-5.22.90.ebuild b/kde-plasma/libkscreen/libkscreen-5.23.1.ebuild
index b240516c9862..b240516c9862 100644
--- a/kde-plasma/libkscreen/libkscreen-5.22.90.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.23.1.ebuild
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index d7994df21980..679c962cf4b0 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,7 +1,7 @@
 AUX libksysguard-5.22.5-no-detailed-mem-message.patch 1100 BLAKE2B ca0d79c17109b9a24258c48a59efc3a8f66b28bcfd15ec1168f6276ea9568530abbfe442db7fdd9bd524409fac5cad951de44778df382e48b731d3d33fd68479 SHA512 20fd323fd34c6f46d4d3116c85edbeb8feee048890c5c78d1862891937962d5b04ec2e1d1429826f4f3999d6413d09040307322ae16284fb8c8f31e301290e65
 AUX libksysguard-5.22.80-no-detailed-mem-message.patch 1091 BLAKE2B 1c15fbea7e0f46cb60f1423523eb53ed564b2d0d8d6ab0429851f1e73e1aef844cbdcb23cfa70c4b0aac125587caa924fed50da94c5cb8de49d5f215fd38c03a SHA512 281b047e7f7e4d3a8e8d5ca9247dd4aca538cb13d1ff3e35303c059187140586233cff1b7c50caf5f289f9e4f63a2f57421ff0389cbbb50ad3f408a2addb396b
 DIST libksysguard-5.22.5.tar.xz 736820 BLAKE2B fab0f51362bd973d1b5d1ed2e393614b12e334f002b1bdcd8d2c4d582e2dcf03dabad86cf325944bdc565fb9098a361b73ec5645a0b2887b585c57c0f0acff06 SHA512 e7f14519d35146dce9eea3903cfda25e63d819a6305b099786404f2eb44b0923cf2296cf576e33b9f642c0934e7baff6fd87ffc505cc2af9f5807082f3aefd80
-DIST libksysguard-5.22.90.tar.xz 768516 BLAKE2B d50df60b9e2b2a09ea951d9ee2fd8dc89f9df85f23e2e1c1d8af23f2df719ad6f0224739cf7ec95745c6e05e1ae652ea5e93bbfde1cecfc15b9e02ba821a2d25 SHA512 5c586c24a64ebd05b4768ae3713e852ec8cbb9517b799b37bed56284cf4f6daafcb9ea9f9c0f53392f56645c80ccb1763bbac1c43cdc8344239a2da38fd550a9
+DIST libksysguard-5.23.1.tar.xz 768928 BLAKE2B 8c78c902e570c64f48886a821efd0da6e7665d7df23fb8e32269e0ea915615f9f8cff26021e164a31a12d78d0747afa16387e4b85e242b80a4fa6454ea7dfe4f SHA512 49818f40b0c01e13d57651b21913a99a059625ef897b7df6eb57cde0ca077df2a749a664bb9cf90bb2ce8a54108ded34c8ca678d763586b272681fa214a27a7a
 EBUILD libksysguard-5.22.5.ebuild 1795 BLAKE2B b750fa9d5ed0e13f8f5959db8a36650ae94ab73a9f6b17640f74072481b9a7753bb16684508b17b74ad236639f66fad5e2e6636a464a872c84402c2903d61243 SHA512 5dba3b166d5e56bd0adea34f7407312abeab0d051e20aacd1cc0cdee7e5017d2133b5d7b3098dbb132b08d6b9fe793a4e1e78d1d53c6d8cfc9fb25a671179145
-EBUILD libksysguard-5.22.90.ebuild 1830 BLAKE2B 822bafb786ed86f9c829416e52924d1439b5bb105505f0a08cf35e2e1a51bdd0194246dede9b7f3d90298af09af8c8ca10a5945cd0c61c5fd205cd9f4801ede3 SHA512 04a9bfc170ad79dd428046cdb115bc4fee71cbf6cf45bd487dbeaef8f793dfa626d895fb06e0c6ff5457b9c845b0a33e51ec93c5b64c5023ff68acc27fc9e21c
+EBUILD libksysguard-5.23.1.ebuild 1830 BLAKE2B 822bafb786ed86f9c829416e52924d1439b5bb105505f0a08cf35e2e1a51bdd0194246dede9b7f3d90298af09af8c8ca10a5945cd0c61c5fd205cd9f4801ede3 SHA512 04a9bfc170ad79dd428046cdb115bc4fee71cbf6cf45bd487dbeaef8f793dfa626d895fb06e0c6ff5457b9c845b0a33e51ec93c5b64c5023ff68acc27fc9e21c
 MISC metadata.xml 611 BLAKE2B 7e821b5bc0966b855561677eb598ec5eca351955c79f40e2f8622981eb02a206a07b47aec23db6efea5e08edfa2546a01f7f953ed7c7c3dae46ac1fa3f8cfeaa SHA512 ebdb86fa4d523efa0fd614acd9b2275284fb8298a75532d6afb272fe92cd927486044074121811f34ec8096d6de331934413347d1ca6f0f137e5beda0cdfc302
diff --git a/kde-plasma/libksysguard/libksysguard-5.22.90.ebuild b/kde-plasma/libksysguard/libksysguard-5.23.1.ebuild
index 1a8b55594efa..1a8b55594efa 100644
--- a/kde-plasma/libksysguard/libksysguard-5.22.90.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.23.1.ebuild
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index c00240643377..62d042360bce 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,7 +1,7 @@
 AUX libkworkspace-5.21.90-standalone.patch 4996 BLAKE2B 1f09de9fbd1426fc065066897b1b966cda3993f0b1b6ac2a490d4c3c71863b93212e58ccc87353dc836fd58d969cc22c0a3ab8e6c6aacf81ac35823624e693dd SHA512 8702b74cdefbfc793e9ec0a1ce6ed6cca9f92b6c2d8c60d1a40c1530336af9c212d460ebca31ba8d28e3bcb02c1e6ae99dbea39d3572f1658e8d3575d1d947ca
 AUX libkworkspace-5.22.80-standalone.patch 4984 BLAKE2B e0f5c36ab657600326d0cbd29fe51c5ac6cf264caa7ec4c04473a2c5bf88113d8496b45618db103dd2e078efc1350b9fc613b25aeaa58bf0957d22ca4d37e5a0 SHA512 20c790d4860aec20b415c5c236537a5d8caf5666432c513adda0782694548320dc918c0d093ee0b716943df1fdab56c03a56f18ec691b0fc517443c35d0335ff
 DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
-DIST plasma-workspace-5.22.90.tar.xz 8981860 BLAKE2B 505189ed45587b29756ca80d384fd6b21ee04a0821d2c23b041a6199f6998413b9a359dbfd855eebde3150cee45bb3c9a2e425b5035a8b78a7025dda9c4e5b4d SHA512 0f400cd6753bf3d793a2efd5fa75d45cbcac0fe43e2e783d3d06374422a1a59354e6ef986e0286915193c06a6d2beaf443cb028d598783e18115437d12768816
+DIST plasma-workspace-5.23.1.tar.xz 9001244 BLAKE2B e1ce6282148e45f64552770bb1debcc9bfaaea0e1388c3b695eccf9a879053959aedcc070e117e6727b09e2a5075773aa9d9ae0b0cbb79e6ac71cb1d2efb0337 SHA512 038c141585c9b8b897641cb2be490406a0d0ab0e5029bb264e33a45fa7cb83ff80a00ca069f1acdce4b74eb4513e27be1d6d6d244b85127a9074fb8f95cc841e
 EBUILD libkworkspace-5.22.5.ebuild 1323 BLAKE2B 9c12d79979232dd53793878411e837800219b0da9a762aae21abcb4c7b6a0d7c0dca0e18f464a7607f75f4a7145c01acef15720730dd6599acd1b02ea6e10fe8 SHA512 62a495d6647173f8845e549b749f64b0b93136f1535a7943417e55bff603d9c7fc3259ec32e2901018332ad00145e7b8708864ebc1f795bb35bc63846ffebe37
-EBUILD libkworkspace-5.22.90.ebuild 1326 BLAKE2B 030ab1b313e6c1e13dfe580fc864120fbe174c5c6464f0ab92dbbd9d1f3a27f76f58f62fb0c62e2148e27aae4d00475f3c1a3ec6f712c307df8e33ef8beb442d SHA512 5d9581a1ec9b6ef4116a67b54ff991e13e413b0282ba28db62e6793910f32e66fd7cddc783f52f31876d61875c9b7f87fd688ce132919dde6a83c8c67ee84ee3
+EBUILD libkworkspace-5.23.1.ebuild 1326 BLAKE2B 030ab1b313e6c1e13dfe580fc864120fbe174c5c6464f0ab92dbbd9d1f3a27f76f58f62fb0c62e2148e27aae4d00475f3c1a3ec6f712c307df8e33ef8beb442d SHA512 5d9581a1ec9b6ef4116a67b54ff991e13e413b0282ba28db62e6793910f32e66fd7cddc783f52f31876d61875c9b7f87fd688ce132919dde6a83c8c67ee84ee3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.22.90.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.23.1.ebuild
index aacfb311c9ba..aacfb311c9ba 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.22.90.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.23.1.ebuild
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 3bb0ab950e50..17f7c4661706 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,5 +1,5 @@
 DIST milou-5.22.5.tar.xz 52868 BLAKE2B 188d764cf5ce14db38368cf3b1bb8a1fb62796f8eaf2e3933d53714bcb94eee657c88dd3fb485ad1471a9f22fa19fcad4e0262ec953f366aa2cc4b88d0ae6a51 SHA512 9be952458c3e5c6b0cf99fde2c6dd810f109af5c6c1fecf0419b615ebeaf5c2794301ed7d96e234a4b111fb8e5d63e11e9848f7112bc16580fda7ef107b81d60
-DIST milou-5.22.90.tar.xz 47896 BLAKE2B 11044ab6aa5f2ee378d517d3d25967389e5c64c3fbba5936c918bd2f62666b72d083aa69d1b8f06ff2cb1adb00bf0e31404fabfe77724f2c2d28265429f873e5 SHA512 e8e34c8f99695b864bb52b2ffa94dc49d4a2c8da81ac2e4cfb280e3d607f465feaa5a5c7fdd2bf5636595c3a5c84cd01d93a418abd55be17e08802a1727c5162
+DIST milou-5.23.1.tar.xz 47896 BLAKE2B c5b5fc16a7a67cdc21648fce6bbe86dbc190faddf442607effec5613073d42aae44bc0eacd512f2b8ed3ebb0b369345e0a734c2f81894e00601e3f5eeab0227b SHA512 4056abccfb4fff80ea00bd53c753abb3caf63d35850ff57fd42c36f1ef013c6b133404c512fa41def3c3750f57019e987e0d9d963369f3d4e06540563af600d0
 EBUILD milou-5.22.5.ebuild 830 BLAKE2B 324e7db8cdd4d87bc1604daeacfed77107009f9838855b832792b3183256cefca6c62142047680e169fddc41f1cad617a601fa098c367d201af896925c69dcd0 SHA512 e835203dd8d8d215dca1faa0c6ba3d132a3e2db48c20347906160400e039d17390767284070ba3e9b80701595cb24c9d8b71d9e8db563c911913b475f2831762
-EBUILD milou-5.22.90.ebuild 833 BLAKE2B 4b615f068454fea67590730832bb06fb1904c578a4ce95b6dfe5bfceae9e6082ddd5543c7678ba0281f4032b37e491085f20d65a22117d74b15dd1d59ce4bb57 SHA512 7196394085e2ee49ec035cb8485736919186329ff069107a7144cbfaaac5afd9c37cc50a721f5b7252451bb925ec62020261a3edb08e8f41352f6b57848a243d
+EBUILD milou-5.23.1.ebuild 833 BLAKE2B 4b615f068454fea67590730832bb06fb1904c578a4ce95b6dfe5bfceae9e6082ddd5543c7678ba0281f4032b37e491085f20d65a22117d74b15dd1d59ce4bb57 SHA512 7196394085e2ee49ec035cb8485736919186329ff069107a7144cbfaaac5afd9c37cc50a721f5b7252451bb925ec62020261a3edb08e8f41352f6b57848a243d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/milou/milou-5.22.90.ebuild b/kde-plasma/milou/milou-5.23.1.ebuild
index bfa5e8e64e63..bfa5e8e64e63 100644
--- a/kde-plasma/milou/milou-5.22.90.ebuild
+++ b/kde-plasma/milou/milou-5.23.1.ebuild
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index aa3730445d8e..3ce6f7b7658a 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-5.22.5.tar.xz 4471020 BLAKE2B 3462d89fc6d151d9a746290374c174066eed0e95404b8a6fd4c1810b185ed3d74ef78e76c583750dafb2d29cc7fcb9ddfd6415db061fcad6040984e0145fd1f5 SHA512 5002d0260a5bf93ac98d9262330f4db8484c0a6ecbd217783321bf916ef4a8f27e5c94d301e6da95cf8f276ab210e14765439f8ff6be44220e8f526d7bb24fe1
-DIST oxygen-5.22.90.tar.xz 4610464 BLAKE2B 6e60c6aed59401f5e63b0129d7a346d51764c29b8826775fe7e3fc1ea9ad4d4c55fd014a9f6abad9828dd233b3d9bc51085eb32dbaebbcf84487085e1b445b2f SHA512 81c1e71ed820e2998d546d108e62d269d61f542e2fa5cced839721723ae222e219797ad26622a9b84493100b898078e910e5b5c6bcae03f48c41ae9be170729d
+DIST oxygen-5.23.1.tar.xz 4610176 BLAKE2B 539333127e2fad184ed2ee182232e4a97a97d77469ccbe456d5a4cf93d106bd1c0b0643b2b2b4c15f53134257b39ccc6687d2a038ed5798e09d671e0ef3381dc SHA512 cf1cbae0c14189382bfa2e7b4b20ffd8457ed2545da4429b4f9b5417da4f23d6e1b3e9081b772c8c32f49947f4fa38c0778084c4260d3ab090f624bcade3aa28
 EBUILD oxygen-5.22.5.ebuild 1370 BLAKE2B 657951f674910aec6346e3e42f09709e65adeb4e947c5a0e755a0eca3fb50148177db7812a7d6506b3eaf904fe71d00b773a2b8057ed3c81d8f0a1a50c2a41e3 SHA512 59a49e5933c8c1a3622163ca2295083efd38c89348fa4503ee78d8db005dad28ffd49c16d8a9a4aebcbd8f3f87c62832ebbe0df57362679e0a9d51b647e630f9
-EBUILD oxygen-5.22.90.ebuild 1373 BLAKE2B 943f67c8008c8ad3dd4ea9f9c274735d2a973ad265333f8fca40ac054a86de687f12cba7294828319ba836e4a64286458f3c5973c9ffebaf6aff0d2b8dfb73d0 SHA512 27b98fefdf1f655428b94c198fde0451a5d236ab01b507be9fc278fa5910262315893f8e1c8c258fbf9c4f697daaf5f69f7d73208a6c6a622a8285f7b6d0ed84
+EBUILD oxygen-5.23.1.ebuild 1373 BLAKE2B 943f67c8008c8ad3dd4ea9f9c274735d2a973ad265333f8fca40ac054a86de687f12cba7294828319ba836e4a64286458f3c5973c9ffebaf6aff0d2b8dfb73d0 SHA512 27b98fefdf1f655428b94c198fde0451a5d236ab01b507be9fc278fa5910262315893f8e1c8c258fbf9c4f697daaf5f69f7d73208a6c6a622a8285f7b6d0ed84
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/oxygen/oxygen-5.22.90.ebuild b/kde-plasma/oxygen/oxygen-5.23.1.ebuild
index 3123e9e382a9..3123e9e382a9 100644
--- a/kde-plasma/oxygen/oxygen-5.22.90.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.23.1.ebuild
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 99a74d057e84..8522bba0ae3d 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-browser-integration-5.22.5.tar.xz 214448 BLAKE2B 114baa04ab7fad7a3450c199b405afc3d0ce6c4a7e7cf8828dc15e509417de003ffb6b73a002b52b5d8a46f566a63320d33d23fdb8a60484e65c0176afcfadd1 SHA512 8cc29cc51c6cce4dd31677cff8851d58eb0dded0d41c52e0fa488a6f5a803c46b0f29ae02642707a039a283e19ea49fe2dac36604202282f6a62cd0f8716940a
-DIST plasma-browser-integration-5.22.90.tar.xz 219512 BLAKE2B 86231665eceff465dd02bb8d5b6878aefcbd72cf7b5cdd52bc4b1e695a4b64a1da33bb00a84fe7e08f62d948565f4619bef9238e488e775bad690a219b8edad7 SHA512 63407dad52741b8646aab7a666029d1c3cf6b782cd8390306ee2023577b364056ba58f81de61d93463a183167120d7cba887dbcae20da9ee0c340bebc0dd0862
+DIST plasma-browser-integration-5.23.1.tar.xz 219568 BLAKE2B ccaa8ce82b3926b943ccc3ba2cc5eec683d9caba94123719e8d9c6c83494b691f05eb082327c9d1ffcb51ac4a9313f38a6666f96d0761a429cc9cb62c0b6818a SHA512 084437387f9645007e552d3b33b4b20c593023c109589bcc7efc2543bd8caec385e5900034822f322e4dd7f3f904d8a1f22ba3928d4ba3e977b35409a1677977
 EBUILD plasma-browser-integration-5.22.5.ebuild 1123 BLAKE2B 7506e1e1864f26192f29af82b8d058c8a0c59077692d5ecaa317761b73205ab83e498d6b46436a69f76714680a42a5c73cf637538e357318005d4f8c25d58f18 SHA512 6260299785df3d8ea1cc2d5c575849586d6ebc77f92f22c6692e1daa65aa5ae63afae1cceb5062dc6b410ec02634db98762cb7daedea906ea99182bcb7636bd5
-EBUILD plasma-browser-integration-5.22.90.ebuild 1126 BLAKE2B 001c0911ba75cc6015388bc96a1fd821ea9a90efdcdc7e12d860669d13fe739ec7fb2b3cf15c3c740a4c19a58424aed5eb3735a975262d7917b0b7abfc405d33 SHA512 d64296a3dc50b22c9863bbb3bd9d1b6d74138e5c17a59164b4e1f4b5bbb07b959cb7d889a8d8c1fd11959e74fdd54f2627123fda67ec94c73fdab1600215279e
+EBUILD plasma-browser-integration-5.23.1.ebuild 1126 BLAKE2B 001c0911ba75cc6015388bc96a1fd821ea9a90efdcdc7e12d860669d13fe739ec7fb2b3cf15c3c740a4c19a58424aed5eb3735a975262d7917b0b7abfc405d33 SHA512 d64296a3dc50b22c9863bbb3bd9d1b6d74138e5c17a59164b4e1f4b5bbb07b959cb7d889a8d8c1fd11959e74fdd54f2627123fda67ec94c73fdab1600215279e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.90.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.1.ebuild
index 83cbeb103590..83cbeb103590 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.22.90.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.23.1.ebuild
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index d6d2c037f762..2cdcf738edc0 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,6 +1,6 @@
 DIST plasma-desktop-5.22.5.tar.xz 15747008 BLAKE2B ea20e4cbad43e0005ef621bf08fb978b5ce566579e9ba947a4750fb35468b642f57a92bde6f2264b0374a890adb948313e40072b230e20478c5393c90931d566 SHA512 9f39e3709e6e774b8846cb14f8e8aec776ba28c2601c9ee8d7b243240961f2a67cd649eb8005324a4ef0c10ed152ca1a1fc5b2a75c78f551aa20b53106b649ac
-DIST plasma-desktop-5.22.90.tar.xz 15770628 BLAKE2B 473dbd7c77a79d8c626df737a3d80760cd086d301f0f4e8485634eb17a0b30334b5b6b0c0e0aed29e10fa7f2cf0d07e8e125c0eaa0e61be27343ea668fb92309 SHA512 7942075cfb1b6d9457bbe986b1300fd2aa004dffea703f648125fb63a171f085d1537d1e12a2d33203690b47b0a61e0dee5c78ccb03fe4c706edc74ef6b0ff8b
+DIST plasma-desktop-5.23.1.tar.xz 15785208 BLAKE2B 528653f68f1a3e17fc38859d70fe3f985276d2a8cb73b2b5f47f195238221d17ce65e678017ac88ab2f760d2db23b3efbff2c076d2211c8014805e06c1e1852b SHA512 f6f0483e9dc8e64b4def5e723d259ea32ab5b1556d8486a406b3c65e55d5b7d332614ded8c4f651785890067cd6920a497a110905f2cedb9383b254eab8b2505
 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
 EBUILD plasma-desktop-5.22.5.ebuild 5429 BLAKE2B 979ca198a875cc14e82a5f1acc21f5c61b595febefae0ae63f107498f7267919dfb4c7d8821aeccf615c2d39ddacd2f17b0bce1bb5c1cc0fb3fdb0edbcc792b0 SHA512 cb2212107565b78a19b580178e4b9c7dfff84cc095d0ac6d291c9003de86d0adc7def98378e3a07a7d4106e5c83f62690baa5075592bbecae2b1d523f17dd98b
-EBUILD plasma-desktop-5.22.90.ebuild 5432 BLAKE2B 8e7005a94b9a7eba8e9e85ad94d234116d7d1ec1be685ecbe1f35a7ea8cc28532e6739a3284ca3b5fd230f3a4183d0d34d8606de91dd50d30f78305b4f9598cc SHA512 e7638797533bbeccf0a6f49ac64b31f34b0b241ee2f6e8c295b08e3f0b4d8c0450095e3191eef0a966c3abbe078e0d3eaa2c42282fa3e3c43d9f2ef70cfc1c35
+EBUILD plasma-desktop-5.23.1.ebuild 5432 BLAKE2B 8e7005a94b9a7eba8e9e85ad94d234116d7d1ec1be685ecbe1f35a7ea8cc28532e6739a3284ca3b5fd230f3a4183d0d34d8606de91dd50d30f78305b4f9598cc SHA512 e7638797533bbeccf0a6f49ac64b31f34b0b241ee2f6e8c295b08e3f0b4d8c0450095e3191eef0a966c3abbe078e0d3eaa2c42282fa3e3c43d9f2ef70cfc1c35
 MISC metadata.xml 807 BLAKE2B 50ef818039bb95543085a7c18aa1b60bd4a9b235380e594ff1cbef8a30c571d93de5c8e82974b03de706818bf5b01657dc8f0db12ff36e665e4aecf4b922566a SHA512 f209621d214fdfd9c6bbf2c67b8453c45a3a7d645077d7b2827021648d74c4e449b8c64d1f5ebff100bc9141f341f4ca0aa5dfc884a4081001dec30ba1b2d724
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.22.90.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.23.1.ebuild
index 1de5918b5983..1de5918b5983 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.22.90.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.23.1.ebuild
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index 1aaeb1e6e351..d22a19c579fd 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-disks-5.22.5.tar.xz 84464 BLAKE2B 983ed0d6a478b601f8183abdb4d971523b30cb50038799a045a4277cf494d18ba3143a119d1e9dfc303576f5f863811934a9592e01211f3b9f0d64cfb6775dda SHA512 a49644a696d00ff84e150e68297a574b5d33190f0ecf407dc741d60f3243fb02507133bcb2e3e7bd1fc860f466a48988ac861e2b518b5a60cad9bc9f51490a1a
-DIST plasma-disks-5.22.90.tar.xz 86324 BLAKE2B b290b2f42011c8ce6e6eb36ea2535a67b12f80fa61079123c6d03c0df6778c2e572b49b79ba1a1b18e8029469ebd5b19445866812d3fea1ce8a0ec34f06cc0e2 SHA512 129e368c1feb358f8826505b2d9c68e177837c3c475e3b6c42ca72d7bda2c635e07f848fe3f03759bc739a853a9dc5b9f773061fd228405078cd00138fd6afa5
+DIST plasma-disks-5.23.1.tar.xz 86624 BLAKE2B 7a6d6f6628f4a27fa4148c5e57e46d504c4823307814136b76748c263246d0eaa91c0647bc2dcf0439d5d40277890952f0b4f596f7a23a21f7fb3227ebff7dbb SHA512 698d90d6066408f5c8eb4412092a50ba73d6b50f4de3b01c80679c3f458c6449b0a4431f5ddb5da089f567daf7c67a2f39448d94ac40ddeb4fa76cd3bd884640
 EBUILD plasma-disks-5.22.5.ebuild 1037 BLAKE2B 3574937dac2667f741c5c91623b88ad653674de6961abdbb4f11d0faa426d4265d10e34da860c0ebca8681d39c94fd347e60299fa77fc9586cbdb662604688d0 SHA512 41da89c2dcf85f48a9c241f607e805bdb8958489e631ee1c31e0f5becbac7540904c69066c53900e7ac87e1030c7293432541c91cdeedfba2d565a0f17693b21
-EBUILD plasma-disks-5.22.90.ebuild 1040 BLAKE2B 3ca014da0abed7652d474b518afdee1cb70f6c74102c5eaec81c622683176a6ae70f9729ee9c209eda98d4feaac8ff861caaa88e90290e1bafa7d33bdddbdc52 SHA512 f1b1798c703ec78c09b2839a6895f5ca3cbc263f07413791a81173276b6b386a0851de6dab5d801e4c0e437975f6f0edf96a970664ecf571ed38d39746c460f6
+EBUILD plasma-disks-5.23.1.ebuild 1040 BLAKE2B 3ca014da0abed7652d474b518afdee1cb70f6c74102c5eaec81c622683176a6ae70f9729ee9c209eda98d4feaac8ff861caaa88e90290e1bafa7d33bdddbdc52 SHA512 f1b1798c703ec78c09b2839a6895f5ca3cbc263f07413791a81173276b6b386a0851de6dab5d801e4c0e437975f6f0edf96a970664ecf571ed38d39746c460f6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.22.90.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.23.1.ebuild
index 3311c0ee7beb..3311c0ee7beb 100644
--- a/kde-plasma/plasma-disks/plasma-disks-5.22.90.ebuild
+++ b/kde-plasma/plasma-disks/plasma-disks-5.23.1.ebuild
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index e960cfa033bb..87760d7f171d 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-firewall-5.22.5.tar.xz 339372 BLAKE2B 332a7fd2be63429c452f43371b2875f8838e05b107a6c3472974c5db123eef9e415ec70601cb830a743d77422639225e01611e52c07a2b3fe079572278e2f638 SHA512 cc81884550b5c73061f5a1df24c0b32e5fff234a51e56153e95a9e4b0e23c305a555c2deff69633b9cd21dff7bfbcf5d9fcbd5ab3605d4ffa87be57514a91901
-DIST plasma-firewall-5.22.90.tar.xz 342912 BLAKE2B 1dc1423c44b356d37de654d2e1a950a1e20ce01867273b5797f2b85914e39515f6f6a947b0d4e5cd83f041a9cd31a0487eadcf0fe06cb503a6f7ffb0843dc0a1 SHA512 9f4b3142e93472e6926cac394f7710cebba547b951ebefeb3ad33292c5910c66fc4406b0401f007e178ef02c9b0af57841b503949e29f4e93c8be640587ba2eb
+DIST plasma-firewall-5.23.1.tar.xz 343896 BLAKE2B 1d4b4a963cad1e83227141867998fefe11b4d1cff425e217400acfe4c0e056db9408bae984f82d602962cc0cd7c26c8019e9b5f3b751f397e3396bb728d95b92 SHA512 fd8955699c02e902a97b9b3cdda583af0a30676d6dd281877ee64eba6ae626a600ee9eb24de2c32163a9cf205b5ba94b851d7990cf6b822809ee55a2a982cddb
 EBUILD plasma-firewall-5.22.5-r1.ebuild 1591 BLAKE2B 5a3ad21785167e8573b8d7cb9653529ee0587a7ab32cf2dd8f310fe683f93cb186fb31e006fadd06b869f3cdff571fcf54aa649386177cd0d3e2d9337ae66421 SHA512 6561cf3917cc7d98fd19a8372c02ca75812d530b10497a2f8d2f1476e4b53e1a2e670b376a4dc825aeefbce0f3a6484bb33adfc43b85c9c5505c377f7c3f6384
-EBUILD plasma-firewall-5.22.90.ebuild 1594 BLAKE2B 2268ee3f73ef09f5f127bb42b4c7c0c0c0533df5cdfb047f407f8d622b2ab5cb8b74935f59f3aa22fed2a1a64f0c08f3257c837421a461d42b67d95c519a9aef SHA512 dd20cf65aab27ae12d9081a8a7ac7df8c2c715e349071fad118f668c9e64114283c8274abbf3a99f3be43489eb30ac557981ed88b034be9f17d0b7ebdf4b93bf
+EBUILD plasma-firewall-5.23.1.ebuild 1594 BLAKE2B 2268ee3f73ef09f5f127bb42b4c7c0c0c0533df5cdfb047f407f8d622b2ab5cb8b74935f59f3aa22fed2a1a64f0c08f3257c837421a461d42b67d95c519a9aef SHA512 dd20cf65aab27ae12d9081a8a7ac7df8c2c715e349071fad118f668c9e64114283c8274abbf3a99f3be43489eb30ac557981ed88b034be9f17d0b7ebdf4b93bf
 MISC metadata.xml 481 BLAKE2B dccce364cb3100483c9d5932a250f05575badc6c66a0868a706817c3da4be16fabfdc584fea5d6fe45284da282b2123b1b7985e7813264d27a0338dcb76428ec SHA512 f3925caf241daf159b2b19ea70c4a177f023487ba3fef866e7fc529563b045664debaafb0a9978d05882b69457d9dada314c3109803eaf2e8bb244ac5f9b8f3d
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.22.90.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.23.1.ebuild
index dfd7cff04540..dfd7cff04540 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.22.90.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.23.1.ebuild
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 13791b540d3d..a0c63e6abbba 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-integration-5.22.5.tar.xz 65644 BLAKE2B 5a127c3f8ceb95177447fbbfd29e24ff65aba0dba4373c42ec358f2f0df941baf428962bcc90c25217d843df7c8f896ddf35d6001f575d4d226929a62c514136 SHA512 5da783bc3e32de5e68fb065f7dc014f92216821942b6f2c016fe494915fed1edaaaf88c26cd2a830fa306459e03d63d73dfbc805a845a0ac1f215128aa18df3c
-DIST plasma-integration-5.22.90.tar.xz 83032 BLAKE2B 47b4cf4375ac38a57314cbe564f6a1c3f24e10b82166f0d34b2af6ac0b70176547ecd7c641c4342abf86caeef63a37172751f19eb893d34571d3be7b9742c947 SHA512 1e2b49560144be363f42d37d288b1c88a5fe9338a8d5259ee83fb077348890020fb30824fdb273670d0485c04408471e800526c6f209347a98ccbb1375e2c091
+DIST plasma-integration-5.23.1.tar.xz 83076 BLAKE2B 97d8581e172fc0f95d31b77faf7a91c132791001ede9059981aeccd633b18951dd93522369c47856be466428bebf81a04e3d72cf9063b3f55a2c267973ef8992 SHA512 7876c4c5aa63b1d521223a61530f6181725efbdf78fafb668c5817ced7b5710d30846b51c9e073be1bd4e048b645719bee59b34b32acda17a29c2a19668f984d
 EBUILD plasma-integration-5.22.5.ebuild 1240 BLAKE2B dc987d263b7f78e5d71c3ead5c19726fae2c3c8d0c1e732c0f94837b91a881552367751e0d4eae280e4a5add38b0dae9240159b32cbc2eb4dc7e7efa6e094c07 SHA512 d5db967a46b6fe5b363949c8e93388f7aff6fda0f97351c8b3c889e5a5e417f97ce50f3738e82fbb14ca0f60365873577b461a3a60475671f5a80d73224d9592
-EBUILD plasma-integration-5.22.90.ebuild 1243 BLAKE2B 47a16bbeb4dcc249f6e251d55ed1c908aa58a2b130d65df44886bbc689fb11468497d888d0a5f3aa680435a2fa2675d3537d7530add3fd5b2f28de98f05f4da8 SHA512 d335f3692749183f9245c9d64cc1ae840881da11cb0047bdcf66594a91a7c29ffde0858d7dbe2d0cc8434afa82de6c1f051ab04588e10257446c70330ace1b80
+EBUILD plasma-integration-5.23.1.ebuild 1243 BLAKE2B 47a16bbeb4dcc249f6e251d55ed1c908aa58a2b130d65df44886bbc689fb11468497d888d0a5f3aa680435a2fa2675d3537d7530add3fd5b2f28de98f05f4da8 SHA512 d335f3692749183f9245c9d64cc1ae840881da11cb0047bdcf66594a91a7c29ffde0858d7dbe2d0cc8434afa82de6c1f051ab04588e10257446c70330ace1b80
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.22.90.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.23.1.ebuild
index 2873e4f7febe..2873e4f7febe 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.22.90.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.23.1.ebuild
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index c2cdfbf1d7e2..661f7981ad88 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-meta-5.22.5-r1.ebuild 4084 BLAKE2B b55305c70f54abd9721e1c4e22eb76d4a1fde99bc2c3cdee125163141f2e233a289d6cf0e7222cffd9b21eebad81d7877634b0c0279a53640871164e454c8b88 SHA512 b1a2f6939940663dc3ceb44fb1e3daafd58b350d5aafcee5ed9793490d5e817232a37abc01247bc9eba2c1d202f40e3a4e39accdc6d9c4c0ef899441b189d8f8
-EBUILD plasma-meta-5.22.90.ebuild 4087 BLAKE2B 4bc8be17d827bd49baabba94baaaecb5b3b7085a64827d3154b60c605ae4e84a2234002536be7f2f06829727af1286187155b2c005de553875458d5833862ba6 SHA512 d9d0af532295b38faf066147509ddb5ab8777c012f6fdf1265367f8488846f2c9f64053f4e413f4e4bb15af3802e55c80986956d37f22d9165dd738c60089ece
+EBUILD plasma-meta-5.23.1.ebuild 4087 BLAKE2B 4bc8be17d827bd49baabba94baaaecb5b3b7085a64827d3154b60c605ae4e84a2234002536be7f2f06829727af1286187155b2c005de553875458d5833862ba6 SHA512 d9d0af532295b38faf066147509ddb5ab8777c012f6fdf1265367f8488846f2c9f64053f4e413f4e4bb15af3802e55c80986956d37f22d9165dd738c60089ece
 MISC metadata.xml 2380 BLAKE2B a0326237bd12897117b80c6e173b8e5772d349bf370a383fca531bcfba0e25d29ea4444dca0ddb53b2348834209e4d5838e0f2a5a8f583beba8c7e2cb90226c2 SHA512 0a89ba5be15bf07ab83c6b59d4c277c00e0641227b60e490a0854598b1d2451b2a8f7733e9eff97709193d281995fe130adcdf6e75714eaee7195695a76834af
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.22.90.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.23.1.ebuild
index 0add9022a742..0add9022a742 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.22.90.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.23.1.ebuild
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index b87ceecbacf2..70d0fb55ffa3 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-nm-5.22.5.tar.xz 898960 BLAKE2B 0285425f4ed474c38e3a72b8b6654ba17e957921db0372bc24a9ce4fe226186cb687e5ec91836f7bbb1cb2fb9f4da1287efca41cd7b11673e2086477024f4578 SHA512 802b908c61214e77162f09289d9e9c1d3c9d39b77799d71b3c4802245f2920c29065b793a83a483a9e9df004e113bcb06fa864c456b6950ba3a4d8eaf4ec4b94
-DIST plasma-nm-5.22.90.tar.xz 918272 BLAKE2B 081c4478e5e91fc21a5607a67fa0f94a6b8fe22ff9f02ff06a324e6aab9ce556fce82f1232eb9fec8fea6680519281ae10b4758b13ee74dfb5bef443168d5898 SHA512 51dad2ecc4af9fda99cc85fc1169a1f2d9476b8a54dc6a22b7a38a51d3bfa1997d110ab957b7b18f6863373b770df7951fc90f81695961b5ff378e60006e3157
+DIST plasma-nm-5.23.1.tar.xz 919792 BLAKE2B 2114769a046952465a07b3269fbd978924d61e00408af66e89bc1534b99ce2fcc2f52d10e2a07aa7c83e8391d4b9523a989e40a1c42dd40f2b5651c7314fc868 SHA512 dfb6e9894524c2ebfe1b0bc14ec42636ff6b3f08cd378d54610a6e27f40736fc9d3a97ec060447c7402990c85e3e819dc4c1f97d0891ab84f05f9ae96dd06c51
 EBUILD plasma-nm-5.22.5.ebuild 2286 BLAKE2B 17c6f20d72197b717aa6f7e05141d0557ece68320e239a4d38cd9a3ddf19c7b534b6a568d56c63735b201e0cb38071b33276542c867c368e2efe604028266c55 SHA512 bd8e74df71a77a42abf1b1860ead8327d70e487c6fe6ed2ee115ad51fbeb44ca7ae31c5974b7d50cab97098cfb14e8c43b33023e9dc3cdd81c34c72fea330286
-EBUILD plasma-nm-5.22.90.ebuild 2454 BLAKE2B 130564d171fda526200c9feb8be026e03bc2e71f51118ed358c3bf563b07a008c078951d52c2207c1c8dceed4b95ee7fcae0b6da684aac5b77f8d6d89cfb27aa SHA512 3df3ff0223619d7b3c5e6d8299375c986106fc3f28646b2dc106111560ea318bb6fa5205d7362d9442407b5ac2a7110c48a83a483c48f844d633572612bad4a3
+EBUILD plasma-nm-5.23.1.ebuild 2454 BLAKE2B 130564d171fda526200c9feb8be026e03bc2e71f51118ed358c3bf563b07a008c078951d52c2207c1c8dceed4b95ee7fcae0b6da684aac5b77f8d6d89cfb27aa SHA512 3df3ff0223619d7b3c5e6d8299375c986106fc3f28646b2dc106111560ea318bb6fa5205d7362d9442407b5ac2a7110c48a83a483c48f844d633572612bad4a3
 MISC metadata.xml 548 BLAKE2B 72ae60901cd45e2b312418553d64dbed59ed4b9d3fd8b71f0e6eaa1782dd997d08f28fd7fb2668303a6dfa290eee1cbde6397580091730b3c5f65c85c111435a SHA512 f4cd7aa6532a5816a111cc088db3a712462bce395aa792c0ba6869981d70bec7f56040038e3dce6a7b0496f423a5be8f0e0081ab45ee51451a384f3cd8c4ade5
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.22.90.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.23.1.ebuild
index 0ac6235da156..0ac6235da156 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.22.90.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.23.1.ebuild
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index f8aefb05ebad..58a599991eb8 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-pa-5.22.5.tar.xz 127092 BLAKE2B dd57129aec51056ac7f7020d0e479718c3c18b7da7c7e75e8b4dd2f052c3e198c6dfb350000b50230293e8e35281862a6ad503fe62d23af7083f15f650a13d38 SHA512 4082096d532ddeba6b9cd117a7588fb5b62739ce7265b70ad5834cbd30dab140ccb8b3146f9264dd01a664bfc72071bd42cdd23c24b08fd7f89919d939eb4ba9
-DIST plasma-pa-5.22.90.tar.xz 129200 BLAKE2B 65005b34534367e1e377ef7ba0a64d1856254822a413039347f56834c97bafcd42fbb9610dcd89c0bdba3b3e2dfa77fe43da41d9b663b07457ce196905a82b6a SHA512 67abbaafcd3b990630b2cb773fe86764b2a6f7343ebc9c93041cc417c78e72d79fdc3c98d486260ee8cd65344cb33c3a20acae09b9b7d5ad9e9efd5e6012fb9c
+DIST plasma-pa-5.23.1.tar.xz 129972 BLAKE2B c16c4a61bbcf725b408ef00e5f07db3fb4fa9390ad7bdbc96181d45cd331a701bcec4609adf561ce96065ff941fda5432f913c77487f8f06168f7335aef3acc4 SHA512 b034a0e1236089e244f8f9e274603c86032e6c82accff0d48f4db732bb0c727f33480ce1faba955b4c436f91e4ef5de5088fca1ae3e10dd729fa51a48322b089
 EBUILD plasma-pa-5.22.5.ebuild 845 BLAKE2B 3f5007ab05c0249afc87d2a751d73e223c796001eb8357e00215623e700e6fb1077aaebcfa22abd2c773f8ed7e2d4bcffba74fbccd2a0b15091ca0d5adc92a34 SHA512 7ddf853541bde1b4cf247b9d566f9a1ab3b3d8a3c5d21cd139242bb4b458d1dcdc5fa8d527e2b077d00ce73d26f44cd0e843f89fa099ad14b5a8e65d41eb7fe6
-EBUILD plasma-pa-5.22.90.ebuild 948 BLAKE2B 452c94ac4950b11b4d166dd370f7e5632168053defd4b052b30263abfe950668d9b55a57e407410831a6c92245bfe54ac56857a8f4f6f07e4cf9f9cb96be68e2 SHA512 51248cc75e00bc547186bae63d2391c84edb2372dab1eeb5f8c7153b979eafab5883db62cb899ec92032208931a293bfa685dc050eecc278453202729b287ef3
+EBUILD plasma-pa-5.23.1.ebuild 948 BLAKE2B 452c94ac4950b11b4d166dd370f7e5632168053defd4b052b30263abfe950668d9b55a57e407410831a6c92245bfe54ac56857a8f4f6f07e4cf9f9cb96be68e2 SHA512 51248cc75e00bc547186bae63d2391c84edb2372dab1eeb5f8c7153b979eafab5883db62cb899ec92032208931a293bfa685dc050eecc278453202729b287ef3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.22.90.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.23.1.ebuild
index a3f477bf21b3..a3f477bf21b3 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.22.90.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.23.1.ebuild
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 25277ac3d80f..a6f30e6d7985 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-sdk-5.22.5.tar.xz 269688 BLAKE2B 90ed4b103b7b2ce3bfc3b84dcc0928d7e7b4ab88c7eeea9be0f2be8807b96271e9e5c0a00e04e252a3c099384f90f532084a03eae79ed5d88da97994bcbb715d SHA512 893bf785994537068efe5f8c854c2bd9a650849029822a5790b3874e2137eeac4f587185e571471494a47551c60e8b395520e125b8e2f511f36f6f483867671e
-DIST plasma-sdk-5.22.90.tar.xz 274640 BLAKE2B e7e06fc6da0dc4a96f49ff5294bf18b32481c3560be82726ae11f03b9cd55e5d3648facbe576f272c25c451d26b4c38ed9f8a2b3181afaa2e379962635f41afe SHA512 03a987a94aba13bc20ab52059fc9797f65c9e1ab1edffd5296d1bd027f9fbb73bea74cedcc82c239c2a48d1ff54dc15eb7961eb7b726565cb0bfb17c7f09770e
+DIST plasma-sdk-5.23.1.tar.xz 275828 BLAKE2B 88a97fec302deb0ecdabb4ecf92673413e780707a78c2e1a5c9ee6c0d45793df8e2ba70f4fff1b427b6b7f1dc80adedcddf613eb8ebc7705400345e3e4caa43a SHA512 1e8c03f6889cf289525506141202875a5200a07f0bead40b005a25e74e3b191aa016cb12584ddcf4890eecefba97838d51ad54fe531cf3cee324d17914e6f826
 EBUILD plasma-sdk-5.22.5.ebuild 1261 BLAKE2B 65c25097e4c6816cd77150dec90275da0bce6ff6e2d11e5e398e94a1ba0610ccb4807afd3bc53d1f457687efe1bb33c8e3ff8296c5d08e1f776be93a9a5aea89 SHA512 cd899ea77ff7d6b680688c6776a2dfe4eeea9e860c777bf0da662440236145fadc20b8edf0c476a0bd00ce187462570377d900fb2a5fe9c43838244734f878b5
-EBUILD plasma-sdk-5.22.90.ebuild 1264 BLAKE2B 214a84bb7a97a4b0796d8220a31a793bea5ce4e91de89111f3cabbc88c50477847f1e980db802be81fbbf32c3a7424e4a259fa0e10b73c7d5c0280032a3880b1 SHA512 c7249176e23f734103bc0b5cfb9ea0225815d2cba422d3c104cd9ede64bab61659ca9c2311b99a2970bdce9fdb30180648f8cb93dde0a8b63ee958a6a52bff1e
+EBUILD plasma-sdk-5.23.1.ebuild 1264 BLAKE2B 214a84bb7a97a4b0796d8220a31a793bea5ce4e91de89111f3cabbc88c50477847f1e980db802be81fbbf32c3a7424e4a259fa0e10b73c7d5c0280032a3880b1 SHA512 c7249176e23f734103bc0b5cfb9ea0225815d2cba422d3c104cd9ede64bab61659ca9c2311b99a2970bdce9fdb30180648f8cb93dde0a8b63ee958a6a52bff1e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.22.90.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.23.1.ebuild
index 9c5a5e9fa9b6..9c5a5e9fa9b6 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.22.90.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.23.1.ebuild
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index 003450f94ea7..d477729491d3 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-systemmonitor-5.22.5.tar.xz 134624 BLAKE2B 728ce4b89405445cbe385da504fb026d0c310eb06d41a3c4ab5557b8d66d1ed000ba30334363e5a9975e7515595e1cd3dac493a01f1f1bb235df4b9cb3f6ba38 SHA512 4116be820038318022efe6d7460d7deef2983940dac7ab1949aa0c8d18473b15d9de41f21241c63342656b5871c1a2291daa3ff0d576849fa27177425419013c
-DIST plasma-systemmonitor-5.22.90.tar.xz 142664 BLAKE2B 4c6231a8b7003beeb47ff8c6c1e61c634ff306c21090b8234818d5fc3bcbbb113e0fe9d073bf03ee48049294f06459e9bc8990fb8d86dfe672391a48f8ff6c69 SHA512 d02b6e010e474b67cba7608d4c7d39702c8b8878045582af78c210043c4e97c2c8817936cf2cfe51e626a37c023df9d31efc8d217723556fef2772523d6e21bd
+DIST plasma-systemmonitor-5.23.1.tar.xz 144716 BLAKE2B 3a8d804d19ee5018c67bb5a523a8ea65c12cbf87020159143a01d400b1beff495ff467a6bd066d2d73e85113837030d2fd02e012472ee148da579f44c5e73312 SHA512 bfe8e4e21070266dba3645efeb432e06b8637044f1c0dd652b1140e1ec38cd607c70dae50c4f1d078a63bcd8a03fb41de6c96c8e372114ea45aff3979f27d02b
 EBUILD plasma-systemmonitor-5.22.5.ebuild 1196 BLAKE2B d94938f545224d0910db9102518e0b6b673ef370bcd58f188d97f63d5571e39b8cd6eaa0fc765f29c5e13a5c9d19466d1ce1aef2289e9011e6f611b922c55ca8 SHA512 96bcdcbfabe2618cce4069c36accc7caf18497ba5394d69f2bb263840ac55734ee96eebd6a78b07041954900b6172ac085e60b5f835cbcfc515da5831393cce6
-EBUILD plasma-systemmonitor-5.22.90.ebuild 1199 BLAKE2B a75ac2c72ef185a0fa20ca8c20304cc1094f5ca39d80eaf3dc00b3fd2e29be241b08601389f88333579de7244ef8362c15eaa719ffa2d575bb78b0f769286cfb SHA512 5e5cf5db489112912708da8a8eba570b88579c2b4f77fe2bb4a5af928f8a04e84fcdffdf1169c2d01e43742ecf151b0e5cf02461ecd384b5f068a69d30f4b252
+EBUILD plasma-systemmonitor-5.23.1.ebuild 1199 BLAKE2B a75ac2c72ef185a0fa20ca8c20304cc1094f5ca39d80eaf3dc00b3fd2e29be241b08601389f88333579de7244ef8362c15eaa719ffa2d575bb78b0f769286cfb SHA512 5e5cf5db489112912708da8a8eba570b88579c2b4f77fe2bb4a5af928f8a04e84fcdffdf1169c2d01e43742ecf151b0e5cf02461ecd384b5f068a69d30f4b252
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.90.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.1.ebuild
index 6960f0e9446b..6960f0e9446b 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.22.90.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.23.1.ebuild
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 2d61f06d4f11..c9cfa1aae5c4 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-thunderbolt-5.22.5.tar.xz 64216 BLAKE2B 74914087256f7f0496c4f1f4bf2f82180b424bf357208b70d0c6416a9288b7f26d0dc385823a5ace087dca3aa388963b28be00d31f1335bd0ba1071ed382bab7 SHA512 abc492c6a69cd3a2efa82c798d9a5e178f08fac098cd68055308f5bb4459e16914210e119e50838dd5af8d2240ead47e1dcfb06cb49a9a8d4e4ee6c0ba386581
-DIST plasma-thunderbolt-5.22.90.tar.xz 64824 BLAKE2B 5bad98cbf2c0e6af1847220f866edb6cbd0d59d4bdeb16e01e7aedbadf9d75fd2932cac81f1f4edd71daf890c7509b56cdb76f164487648e77214fe76af0b96e SHA512 c87de8fd08e24c77c449113ce4e5af8f7433f098bd11a5c555de8b5c80d89314c9a3c083b3c11d45e803f787863df43e6392c56ce749491b9cae03d70e3052a4
+DIST plasma-thunderbolt-5.23.1.tar.xz 65100 BLAKE2B 80ebf5c5ad0186d83c80ab8840983b4143e407374e23657a825bdb143fa5c42bd1fb5f37a96e61c92da2d2019a6b75cc10b98939a1a6a29110d202cf5beb9fb6 SHA512 3a478c5af64b01cd5595d8b0497194b9862e4017d9e4fd2d0c5941aeb8179b656a6adbc8d09490e0c5968dc952e347ebe6137a83eb1e50b42abe4566cc63ba46
 EBUILD plasma-thunderbolt-5.22.5.ebuild 895 BLAKE2B b8d96af1c94dc9c480bd12eb4f81c2731cce5561ed8b8a42d8597d1815286761c665508f9ce1e255c71a44b32744d62df6549f5b0d054f9f14ea57eb428537e4 SHA512 7a3d0b02672d8e5f077e79ae7d4aef83d9e8a26645c9dbd6f8aa9abc318721393bb0c025daf6b83d69c1a75d47fabe706f56865be4951f39a5381288505cb9e1
-EBUILD plasma-thunderbolt-5.22.90.ebuild 897 BLAKE2B 7d09fd7c77cdde1055cbae14efdf0280d16908cf06e1a8993c246c051cd0161130c7d81d30a54e370724aa4d539d764e90b1960f27636ac34ea25d8acf006281 SHA512 169f1e02d4fd2990fe2609eb39c2a13e8229b37816c803bb44a9efa88b38ec4d6b16b2a861e8764ac1f8c2cb9eb7b099187ba8c0d09c75f0f989124356cfcfde
+EBUILD plasma-thunderbolt-5.23.1.ebuild 897 BLAKE2B 7d09fd7c77cdde1055cbae14efdf0280d16908cf06e1a8993c246c051cd0161130c7d81d30a54e370724aa4d539d764e90b1960f27636ac34ea25d8acf006281 SHA512 169f1e02d4fd2990fe2609eb39c2a13e8229b37816c803bb44a9efa88b38ec4d6b16b2a861e8764ac1f8c2cb9eb7b099187ba8c0d09c75f0f989124356cfcfde
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.90.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.1.ebuild
index 98520e14669d..98520e14669d 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.22.90.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.23.1.ebuild
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 71f1834caa2e..fcbb14429034 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-vault-5.22.5.tar.xz 171012 BLAKE2B 44cc939d1fe03d4a042d3cd28b9ecc9457a1c667f5c7ee145db9d600ffaf49407108c019e91b475647bb5922b5fd9a25224dc00d3c6eb18e1adc67b0ee83cfbc SHA512 360bfe2ceab0f6318dff866af9a1445ea7f43bffc0471cee50d2283bc125062cbea5974a88db537384a5b5bfd28e679be3c50f95afe4b53c9f7c8a6ab6756cf0
-DIST plasma-vault-5.22.90.tar.xz 176068 BLAKE2B 87c12caa528f59ebb2f3923776e67fb3606f8d849f8ee9b2e1c19aa23baba466eb68c2e6455510b503e9b522598f3450a75ecc56681a3a655340546547371185 SHA512 9a98030760e418d5bcba5c85ed20f5da1496a6e8640f3dc5ca50291ddf4d8a1169af04e6b4e5990941dff4137dc328be918b39595bdcc95b58b4dfe97e32ade0
+DIST plasma-vault-5.23.1.tar.xz 176204 BLAKE2B a1ce1cb71d4b8619f6aaa02e1457ec4d04adeb8211264b9c53b81a0f9270b73bf801085c0a5928c1f54cfdf37da15f1de96918749b4e4e618c512695c5d58f24 SHA512 820d45eb4be3884c560d7de854ad111872fda8fa198e99d72ba79d046a83917982f4aa7f32cf4a0b0c79666443e0dc060dfd17404797269686979b140535fa54
 EBUILD plasma-vault-5.22.5.ebuild 1281 BLAKE2B f56640ca397d6a7e217cfdc7f223ca632004abd0dabca97814e83df55c4300da4a2798abebfbf917e14ac22d4eda702c2e10630e623985083b8a8d995b122352 SHA512 cefc525aa144647d9d72eadf80eec441fe3951e172b75a645bb2ef0a3db85d38647ef896979a224d62c8f722b72e2a207e8d1f5927f082e13b2b480412725a10
-EBUILD plasma-vault-5.22.90.ebuild 1284 BLAKE2B 6f76ce395d96b828630e262e68fc8550df07fa0bd9ddfdec149f6d6a1f9b19474b1cbeac1fee8e73609b715de4c6304e1d836ad50d093fab521ae32d134dec6b SHA512 cdb29c97431eda4171d47b4dc05b98c877156a10481f51554b8e1045657f8dfdff579d2f84f185bf74aa53e210b6b44cf583d7b28b3315147e3d3127afc2146f
+EBUILD plasma-vault-5.23.1.ebuild 1284 BLAKE2B 6f76ce395d96b828630e262e68fc8550df07fa0bd9ddfdec149f6d6a1f9b19474b1cbeac1fee8e73609b715de4c6304e1d836ad50d093fab521ae32d134dec6b SHA512 cdb29c97431eda4171d47b4dc05b98c877156a10481f51554b8e1045657f8dfdff579d2f84f185bf74aa53e210b6b44cf583d7b28b3315147e3d3127afc2146f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.22.90.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.23.1.ebuild
index 820c8cb2ccae..820c8cb2ccae 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.22.90.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.23.1.ebuild
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index a621ca226e72..eb9beeff75b3 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-workspace-wallpapers-5.22.5.tar.xz 51347952 BLAKE2B 090a0a72357e3597e102f3164596cf8614dea88f06a30c07019085891c65278dfff6149588e3c0cdedabde3d8c76cd0030878870ce3106b27b0222577133a3a8 SHA512 851e81e901fb50fc1c65c0863570b4c13c41ab3b4eef0fa862e60813ea6c316daa629464184cbc7f76f4ab4fd7422abe5ee1931f46ec968b9176bfe7f72aef19
-DIST plasma-workspace-wallpapers-5.22.90.tar.xz 57048936 BLAKE2B 14a705ed73bc0f6eb3bd97c756cebb7ecd6c2d50667d270bd07963def5480168dc69d739546a71963449bf68d4f049cf98cfaceaefff6b3873371ae9a7b70077 SHA512 39889b9ffd91bfbe0afec344da41a60ec87ec7fa201f02335926be824c00d85f840e73fcf228784bdfdcc06d4eaa60b8bd822bb9bb1c7f8c52503691855c7147
+DIST plasma-workspace-wallpapers-5.23.1.tar.xz 57049044 BLAKE2B f2d411fb682ca8a665bb4bd51967c672aab4a4182e0e824f5ca9917a8ae5c577eff78a6698b070e98598c2e95a54a36e86608947d776bb877c15df3979c70d5a SHA512 2f6fbaf90888311fb679f0b0c593aeffeb9faeb1292403a33460b40d0ab38e9a52a606b8ed2ff0957962f439b17ab803ad550dc16092f2173ceebf35319cb7ed
 EBUILD plasma-workspace-wallpapers-5.22.5.ebuild 355 BLAKE2B a9708760a7fdb6fa85da644f877c5cc3b8507500f55cce8f1b1e49fd53ecd2db6d4ca659b40bae823082f6c5471274793ff36f737b834c1ee597973f2ef34f94 SHA512 011e0d3ae30a65165287925bd4c21bc6313be51731810bc39acbd022bea4ab7a7a04319d6a7e34862bbe15b585b9458a2d9d2c56a9c684172f9e2057fb7b5eb6
-EBUILD plasma-workspace-wallpapers-5.22.90.ebuild 358 BLAKE2B 29af02f5b757245b3351633816c786120a7cbd7468c306c1f38de7de5e5f73befc67d3c85ac89e9e022bebea97064356f9f32e335fe535f9cbe2e054582b84fa SHA512 d26b6b8000b08c95c964e286ffd1f78aa3cb9885c10dbab0884296d4c05a6fcb4e691f05a9bc3f5a54c88b06aaa0a74e740b47b9e85275f3407d5f2f4b707510
+EBUILD plasma-workspace-wallpapers-5.23.1.ebuild 358 BLAKE2B 29af02f5b757245b3351633816c786120a7cbd7468c306c1f38de7de5e5f73befc67d3c85ac89e9e022bebea97064356f9f32e335fe535f9cbe2e054582b84fa SHA512 d26b6b8000b08c95c964e286ffd1f78aa3cb9885c10dbab0884296d4c05a6fcb4e691f05a9bc3f5a54c88b06aaa0a74e740b47b9e85275f3407d5f2f4b707510
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.90.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.23.1.ebuild
index 505df2c2d303..505df2c2d303 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.22.90.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.23.1.ebuild
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 386e32e9fbfc..2f2359a5c7c7 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -6,8 +6,7 @@ AUX plasma-workspace-5.22.5-fix-powermanagement-inhibition.patch 1882 BLAKE2B 89
 AUX plasma-workspace-5.22.5-gpsd-3.23.1.patch 1107 BLAKE2B 5646510f32ed997ee0e91fc742569f6de6ea7793f9f2eb152e2ca8e058c94031271d33cc8df69255f6ad446bed40a8303b0dcfd212c62b66cac40076f86bf690 SHA512 1540ec69470d66adbcdc2ec108947f2ecd3ab8dfc12d57899765d15ed0288634e3d69ea19e7e9cd957b1246178492b38952657861352606e7e9452615c727fce
 AUX plasma-workspace-5.22.5-krunner-cwd-at-home.patch 804 BLAKE2B 4bb337ea04037f8992988b70a40896166a2e10b2b557fa5518e3c2bd7129a221fe2efe064465cbffcc3db4abebb13d354599f44884eaf8c1bc029646280921bb SHA512 e49635bbb42c1beeaa9eee6a803f8c96497bc6e768a72d93886281edec922cb641a373fc0a1a482cedb36bd1f400f77b0030247f621373ebc141760a97ef5bbd
 DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
-DIST plasma-workspace-5.22.90.tar.xz 8981860 BLAKE2B 505189ed45587b29756ca80d384fd6b21ee04a0821d2c23b041a6199f6998413b9a359dbfd855eebde3150cee45bb3c9a2e425b5035a8b78a7025dda9c4e5b4d SHA512 0f400cd6753bf3d793a2efd5fa75d45cbcac0fe43e2e783d3d06374422a1a59354e6ef986e0286915193c06a6d2beaf443cb028d598783e18115437d12768816
-EBUILD plasma-workspace-5.22.5-r1.ebuild 6263 BLAKE2B 35117c863cced911809ac43850aa0687299a21e75657f6bf98b63e973b023dda904e9587b5759f2f1fb6aadeb5240e7bd4b23b00614211363afcadce5e2ce424 SHA512 6e60c093910da37806d88f7408c3a902c380f1726c905f3f3d5e666aa4ca272ebfd52ea8b71cb6df820c728c2065b5ac2d55f289a5f39d84f460ede015fc865f
-EBUILD plasma-workspace-5.22.5-r2.ebuild 6473 BLAKE2B 4ca0782d940feb26cd742bd711d4323bc1525ac879abecdddab1cb72a2f1539694dceaec1bc26ff5d86a122fe7b40419de27101b687ab425dbec5e5779231e96 SHA512 2d62dc7dec6b5afb31d1babc6cced67683140a66b7a25af95c33bb4ff7497902e570a6e2c7aeac262727e59ff787942c0f8eb48cc78c3999ffda55e1292f0f5f
-EBUILD plasma-workspace-5.22.90.ebuild 6274 BLAKE2B ceeabb3ee02f3c66b632983d9ebcabefa04ead9944840280d2d088f0004f9ac6a18f3b9457e24cbf9c0b869c5cf919cb228fbbf05f7b90355e34c32f33e0835e SHA512 1dcd6c862f6e1dbbbe31c66350ac1b1d245ac758293f9aae65aa77d88676afdf70cd32ae13dac0e7fc3c2cac63fe93fd54497a0c1801a53ed54274abc4f25fc7
+DIST plasma-workspace-5.23.1.tar.xz 9001244 BLAKE2B e1ce6282148e45f64552770bb1debcc9bfaaea0e1388c3b695eccf9a879053959aedcc070e117e6727b09e2a5075773aa9d9ae0b0cbb79e6ac71cb1d2efb0337 SHA512 038c141585c9b8b897641cb2be490406a0d0ab0e5029bb264e33a45fa7cb83ff80a00ca069f1acdce4b74eb4513e27be1d6d6d244b85127a9074fb8f95cc841e
+EBUILD plasma-workspace-5.22.5-r2.ebuild 6472 BLAKE2B 6effe9d2a01d8b79396f9e1ad1ff5f5ad38ee4307a2fecccc5e467347f2249a21ede35e5a1d6833b0ef3f69dcf96be84c6e753ce96b3adc884b8f2b76747f401 SHA512 ff8fa3163673ed89b8a6b0130094fa062517ba27e1d648183edc028cb8908f10b10e24f36ad4b429cadbd8a02803af5c4ba47f1a466ab8cc762fc36f8e556c61
+EBUILD plasma-workspace-5.23.1.ebuild 6274 BLAKE2B ceeabb3ee02f3c66b632983d9ebcabefa04ead9944840280d2d088f0004f9ac6a18f3b9457e24cbf9c0b869c5cf919cb228fbbf05f7b90355e34c32f33e0835e SHA512 1dcd6c862f6e1dbbbe31c66350ac1b1d245ac758293f9aae65aa77d88676afdf70cd32ae13dac0e7fc3c2cac63fe93fd54497a0c1801a53ed54274abc4f25fc7
 MISC metadata.xml 794 BLAKE2B 9347a321add3734ec04c45476253f76cb4bb0de8a91227733743c5a971a69e3bd9e6ecc8e0052a46c7a6955cc1da749332a5c009b3bfd424d66b130c076c0d9d SHA512 53a4f25ba06997c1dd082837b400e37fed6350ef60938cfddc4c89f4b9001f28c23e18ce68887c124149c998268867e23d35c0435118e429c1e77eaebb792829
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r1.ebuild
deleted file mode 100644
index de2f64e8896e..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
-+semantic-desktop systemd telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-libs/wayland-1.15
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwayland-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kpeople-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kunitconversion-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5[qml]
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/layer-shell-qt-${PVCUT}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=media-libs/phonon-4.11.0
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	appstream? ( dev-libs/appstream[qt5] )
-	calculator? ( sci-libs/libqalculate:= )
-	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-	fontconfig? (
-		>=dev-qt/qtprintsupport-${QTMIN}:5
-		media-libs/fontconfig
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-	gps? ( sci-geosciences/gpsd )
-	screencast? (
-		>=dev-qt/qtgui-${QTMIN}:5=[egl]
-		media-libs/libglvnd
-		>=media-video/pipewire-0.3:=
-		x11-libs/libdrm
-	)
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.1.1
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-util/wayland-scanner-1.19.0
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	>=dev-qt/qdbus-${QTMIN}:5
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtpaths-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	kde-apps/kio-extras:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-plasma/milou-${PVCUT}:5
-	>=kde-plasma/plasma-integration-${PVCUT}:5
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	systemd? ( sys-apps/dbus[user-session] )
-	!systemd? ( sys-apps/dbus )
-	!<kde-plasma/plasma-desktop-5.21.90:5
-"
-BDEPEND="virtual/pkgconfig"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
-	"${FILESDIR}/${P}-fix-powermanagement-inhibition.patch" # KDE-bug 433675
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	cmake_comment_add_subdirectory libkworkspace
-	# delete colliding libkworkspace translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
-	fi
-
-	# TODO: try to get a build switch upstreamed
-	if ! use screencast; then
-		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
-	fi
-
-	# KDE-bug: 433730
-	use calculator ||
-		cmake_run_in runners cmake_comment_add_subdirectory calculator
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_xembed-sni-proxy=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
-		$(cmake_use_find_package appstream AppStreamQt)
-		$(cmake_use_find_package calendar KF5Holidays)
-		$(cmake_use_find_package fontconfig Fontconfig)
-		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# default startup and shutdown scripts
-	insinto /etc/xdg/plasma-workspace/env
-	doins "${FILESDIR}"/10-agent-startup.sh
-
-	insinto /etc/xdg/plasma-workspace/shutdown
-	doins "${FILESDIR}"/10-agent-shutdown.sh
-	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
-	ecm_pkg_postinst
-
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
-	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild
index d1c1df142878..f80461566250 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
 +semantic-desktop systemd telemetry"
 
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.90.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.1.ebuild
index 442c97629ce4..442c97629ce4 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.22.90.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.1.ebuild
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index ce4e52fb8d4d..16bed7638246 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST plymouth-kcm-5.22.5.tar.xz 38064 BLAKE2B d6177f953be19344eb949ff2a76da131cb18cb62e9917fe480b703585e57fa063b01783233376a8cbc51f7dc8b204e7bc42738685ee2cfa3838a95a2db9e3970 SHA512 eb18fa7d6c4c0df765679db000c82d95c72346a812005a743b83491ce476fdb790e302ce074568420041b3f9dc23c0fde21dcffa8dfaed02ce0725b831961ba3
-DIST plymouth-kcm-5.22.90.tar.xz 38960 BLAKE2B d5a3cce173a7c8a391b0eb6e20e3dc2832acf59cf0edefb3b980dd9eb3360cda7d036ba4d21d2ae9a0cd46c8545bac323ff36a33abe4be8dc708536dd86b2ecc SHA512 98e165883fe2e5eb3111faee64b98adc930809ea760caa4cf0bd5350a674edd011132de161ec70d3cec0446f3b9fbbdbbaf1c5af876c5d075cac6675da6bce96
+DIST plymouth-kcm-5.23.1.tar.xz 39260 BLAKE2B 96420ec5101ae579e7e8f0f03e415a6d11683762a701548892f44c7a9cceef2cac41462a863506cadecaaef09b0803f741393bc6acd361a3012142c21fe0551a SHA512 bfb01b1bcdbf1915bdfab6f09f91baea1b3ff3592e5e06918a1ad7fe8a0fad64ebaa947049585f40bd3d3c86b894c09731a09bd541e2598c884e966a7c4fa09a
 EBUILD plymouth-kcm-5.22.5.ebuild 927 BLAKE2B e58a4eb6fb3c62455f6de9024bc6c8498015721d36b3b825f374f618605f1f852558e639f2fa5aa60e5250934fb9352edf326a0189ddd0613421dfd0fe2c728b SHA512 4a7f600993c3712c27bf92a2bb942dfb33792e57ee72c1e442d6576ecc4d0bc3b4c13a68f20667513183604d25f2fad24ac49ad67b524e78b1659c37a5f8b926
-EBUILD plymouth-kcm-5.22.90.ebuild 930 BLAKE2B a66f10e95507e794d708199eedc02a1829d5e46cff805bd6090863b02d15b7eaf567f55ee355f25a30be67d738c18d64bec04abc5e171bbc80dacb88b5ecc1d5 SHA512 6fd787a0669ae526108285dfe74063f3ce6995a759bf846475aa6c0a29c2e9c261915704a0d329536418edd464e7319695b0779bc6a6485d75952233361b770b
+EBUILD plymouth-kcm-5.23.1.ebuild 930 BLAKE2B a66f10e95507e794d708199eedc02a1829d5e46cff805bd6090863b02d15b7eaf567f55ee355f25a30be67d738c18d64bec04abc5e171bbc80dacb88b5ecc1d5 SHA512 6fd787a0669ae526108285dfe74063f3ce6995a759bf846475aa6c0a29c2e9c261915704a0d329536418edd464e7319695b0779bc6a6485d75952233361b770b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.90.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.23.1.ebuild
index 57d4b2f388e2..57d4b2f388e2 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.22.90.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.23.1.ebuild
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index e63d12cbd079..33c22c8e1ea1 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,5 @@
 DIST polkit-kde-agent-1-5.22.5.tar.xz 45652 BLAKE2B e95815b7760810743d54f1adb10992f1bf1cbf37870729c022aa8d34e518b41af2b81c9e3eb0f22dad0facbe97d1a70d26b31aa1aa8d8ba2ab99674fd0357814 SHA512 418bee7d6f32577a68e7a7a2f3db0bf54eb213bead9852356cd813c1a64ce64e9cd217f7b9b13c8872a797c4a629eaffa7d2f1ea4ff471b70567de1f6ac808fa
-DIST polkit-kde-agent-1-5.22.90.tar.xz 47560 BLAKE2B 6e06bd8fb3ba25c7b97ed0f3a42d337491db010548777332b58917791f7dedb887b272912ab99bd0b851a022d54b8459924fd0f1ca879681a4f388363631d78f SHA512 2cf44abadba223eb41d497841cddc93d2146bb6fcce6a0b24bf1ab8738b34fc1b3faac19e11cb38533d8f00c49b5482c6eb89b5a6deabdc7f67d42abed566224
+DIST polkit-kde-agent-1-5.23.1.tar.xz 47548 BLAKE2B 48da14a9730eba8310a63c67591458f2b2a131e050ed3f6fe9999f5cfcb8ce4ba2b92bdd1819f01f152598447e426766063cc1d885cdfabfa3b8c794abc33937 SHA512 3edaeb39d4fd28c3984f0ab3f7007cedcfd22605ac10093af5a5a79d7eaf892ad7e8ad297767000d58e9751915e4c5a26a4c6082b1d3120ec7774db3222dfaba
 EBUILD polkit-kde-agent-5.22.5.ebuild 804 BLAKE2B 5c917914b8359b49f6b8982324150d3f7bcda785641c8991a74089805ad5f847c686acbfac71ee93f953bc250a8e7fa5a08bc14b749c25e32a7f609945bf5dda SHA512 8d1a4a442ed559a28f5c0d2bdbb708dd9e1035e1569121a5885b08d3d548877e9e334209877b72c48ff114e17fc65d5f522970238f084f93bb7638c8e2acafce
-EBUILD polkit-kde-agent-5.22.90.ebuild 807 BLAKE2B 35492e852f2f7ce760d81e96496b1c033b7c3ba8de285d67b733651cbab16a7cf85be8f760684dfbb715bd4276e0e19dc239812feb66903aa436fdd5d02427e2 SHA512 313f141403221007cd4fb5162197aa48a25a05acdb726f381f1adabe609152584567edb575d4da631860cdde2249964289012a04249a5533c885c0bfec0906f5
+EBUILD polkit-kde-agent-5.23.1.ebuild 807 BLAKE2B 35492e852f2f7ce760d81e96496b1c033b7c3ba8de285d67b733651cbab16a7cf85be8f760684dfbb715bd4276e0e19dc239812feb66903aa436fdd5d02427e2 SHA512 313f141403221007cd4fb5162197aa48a25a05acdb726f381f1adabe609152584567edb575d4da631860cdde2249964289012a04249a5533c885c0bfec0906f5
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.90.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.1.ebuild
index 5dc5f3c9aa38..5dc5f3c9aa38 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.22.90.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.1.ebuild
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 2b6963164fc9..931ebf45b95b 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,5 @@
 DIST powerdevil-5.22.5.tar.xz 618576 BLAKE2B 5d4128adf99d0d3c355b28ca320c280b44f605a92adfb86582d9294752fce47a689023d38a0480dc5e91704c273774048fa8a38b62f9c3065bc5e9fe91a8c050 SHA512 9ecef0eec3673ac4560a0e50a3e31299718af9575d4a11e274d5e1d1516971362d93ca31e66b79b3593a68b1aebf93502066de7e4134761c5681dba84ab79318
-DIST powerdevil-5.22.90.tar.xz 626356 BLAKE2B e2323537670daecb2726a3ab629d0a1507e3d1e311aec75d168ed11686026704fd99b69bd0c0466fdb074c732c7ada5d5fced02225bb41f5e7b48e54d39c8310 SHA512 9a70a76e3ca5454c27c6926fe8e387445d0f09ae8a8ba7a5ffc029f614e6edd0fe8ec53fc3ef33df63311f8ad8c55bba4aff5ad621c30e5bf7cc01207961d599
+DIST powerdevil-5.23.1.tar.xz 627656 BLAKE2B 8b6e2f0dfea03ffa23d2830fc391a4fbb7b40c01e5d7897fa12bc748076e813a9d73cd1d6b3bef236cc5b7e5eb4a5ebadc3ad4d1a231ced345a2e6c690aa866c SHA512 ac0fe98b11a27fe0e95006936e88b64c4b217e538033b0b17ffb6014e0dc01b95d8194565f2bbe4090d682a0f6c2aab239d657926714620f9469b37949664355
 EBUILD powerdevil-5.22.5.ebuild 1951 BLAKE2B f7312ff7465b721137222fd0c02480c67f9eb5bded7cfc8a30c48cdead8e03383d559ff0928694febb18a012bfec2138088e7e8a52bedffcbc8105ec1f564aec SHA512 9d6e8d08ea83c88251bc9a078de4625a11912fb82143ab73d7c69c766e35575fc1a4815cb1a11e93334ac77fcff34e52550fdcaf35a9b82007cce7806a26bb94
-EBUILD powerdevil-5.22.90.ebuild 1954 BLAKE2B c2045e6029b9fe6fd376eddf923dd0c31440a2255bfc35f9078f98342b2584a5dada60279558cfa6bc357a6768c017e0f044d3310e349addd8cc6822d371ba93 SHA512 34e67ac88bf2b62bdce4e6fe757283b63e19979dc5e9b95a3b0e84387ee7d8710bdbfb552a20aa772758160e02a5035f9b6911a7e9d129c98e43fa24b7ea0e84
+EBUILD powerdevil-5.23.1.ebuild 1954 BLAKE2B c2045e6029b9fe6fd376eddf923dd0c31440a2255bfc35f9078f98342b2584a5dada60279558cfa6bc357a6768c017e0f044d3310e349addd8cc6822d371ba93 SHA512 34e67ac88bf2b62bdce4e6fe757283b63e19979dc5e9b95a3b0e84387ee7d8710bdbfb552a20aa772758160e02a5035f9b6911a7e9d129c98e43fa24b7ea0e84
 MISC metadata.xml 597 BLAKE2B 4e436cb067ff3c936a6e497de75b03947f4ccd1103f45237a8a7fe738f67c5a718bf17bbb7aa0a9eff068ce18ce4f0b73bb8f737badc63971e3edabcdd09bff8 SHA512 f4652971683109791e796a57de30efaf603566ad5f9e3e1d16ca54b1212b4cd3ebe1d9a934959fcb51d2722aafe3d57af708f45722534f225ea4b2889a492dc6
diff --git a/kde-plasma/powerdevil/powerdevil-5.22.90.ebuild b/kde-plasma/powerdevil/powerdevil-5.23.1.ebuild
index 7b2e96d8b63a..7b2e96d8b63a 100644
--- a/kde-plasma/powerdevil/powerdevil-5.22.90.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.23.1.ebuild
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 11d479221025..ccaa0c300ac8 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST sddm-kcm-5.22.5.tar.xz 64592 BLAKE2B a0980e9dcac2ea6d61e2493c64f338442dec55036598048c2feb1bdeddf7f8b7f71c1dd3759d1d7b2548ee1cb197497ae13bcc08eb776b6f19012e4b6abca11f SHA512 4026d5ae90ce6842541ef405c5859c35f7eb12fb16cfebb21a438ec33c73f7c741e1a2a1338caad9d97eb31bc8d74453c19a13434cbdf03a33fc12b1466f9cd3
-DIST sddm-kcm-5.22.90.tar.xz 76940 BLAKE2B 3b730f05ee608cd89db1b38f1c53bf6a9717004ebaed9cff301a41523706351693560db6d3a526d48be981891e85fe4a89a2fd63fb638ba1f63f0fc261fe4e6f SHA512 1079c5ea9fb0676999d17ffa9b4df1ca14a4cf0e397a9f91ccb71dc2d449e86cd0afde288546312e7a9145fe6940eb48d8ce0e29ca124a53df8c750bd15289d7
+DIST sddm-kcm-5.23.1.tar.xz 77544 BLAKE2B 1a21a0ab9d24c9540d2667e3bc6863bfd24db3be9a9148f52c5c7338630a7f74f1829c0a1089bc4934bf5aca5670851874094e346a864861e2e3aaf4f24ed5fd SHA512 7dcb5aa5bc22fad6839d0f03de79ff9faef4b28a2710ee5ed96ecb1501272be6837983eac3cca698b52383f17fa78ee9b2507862f7e167373b0cd7948204798b
 EBUILD sddm-kcm-5.22.5.ebuild 1079 BLAKE2B 7ff7ede17179d5e0695899acd5469e0759d21307c7029803cf5d257119b5df2c5fa0a846326a3cfed280ef2120fb3367127fa4cc1a3a1ed24928689c91937a06 SHA512 44995950d8bcdab94ba5bb3e578b2fcadf96bd1ecc2a81363d3913fa916485ead8d7fd9640fe4436b7d5832dc64561da007927dcf8e6820db335335fa2d1ec83
-EBUILD sddm-kcm-5.22.90.ebuild 1124 BLAKE2B c402a309342f7976461963e12d1a40a69e283ea84278cffbbdb5fbe95729e88d46da5c79febfcd4b5df1461332977a78f5450e63d744b1ca23178683974863b7 SHA512 3f0b121e0375f73f020cd4f80cb6696c9f7dea1605b6df53f0d4fe64c5292a1a0454ad9aa96ca27969254c8ba008ae0eca1548de8c88d3eeb5f78bc3d16ccd2f
+EBUILD sddm-kcm-5.23.1.ebuild 1124 BLAKE2B c402a309342f7976461963e12d1a40a69e283ea84278cffbbdb5fbe95729e88d46da5c79febfcd4b5df1461332977a78f5450e63d744b1ca23178683974863b7 SHA512 3f0b121e0375f73f020cd4f80cb6696c9f7dea1605b6df53f0d4fe64c5292a1a0454ad9aa96ca27969254c8ba008ae0eca1548de8c88d3eeb5f78bc3d16ccd2f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.22.90.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.23.1.ebuild
index c0a6d49efe85..c0a6d49efe85 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.22.90.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.23.1.ebuild
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index ec8413d9f10e..5795baad5ae0 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
 DIST systemsettings-5.22.5.tar.xz 205224 BLAKE2B b9aed5a330f2497e7df172e83a0633e3ac1fbaeba58d4dfdc6f9ec5f1645c164ab426396d9e9fb8640c7567b61c17a172e5bc9574dd108e3d8da4a8d56f1e627 SHA512 d74aca46221dd8da152139a7cb0d5eb05d29d9d39e935b8d29f8f105bc7573af55808d7b77d8416deec1743ae1a9149b24a6c6082dedf7ada53d16d4cf09f22f
-DIST systemsettings-5.22.90.tar.xz 202780 BLAKE2B 7af8bef9535ea2f2f9df91ad6f0528d5b9eec2b157e935d102249a1cfe0eef7e7dfe4232f0054837243e5bb705b074b9b546066a30d171c7e690315ea73a41d4 SHA512 0c2de8f9ae5245f8f79c7464e19358d3b1f86fdd51c98ff10add99d9bc85aac79d1a09b41417fd893505e174a97f9700502e235cfa0e60eb7c81f0c8063845e7
+DIST systemsettings-5.23.1.tar.xz 203448 BLAKE2B e2587dc11d6c7d2813db662e6e43a14defc2adbdfd72ed6e94ce0057b433531b4bdac7816b8dbd187ed0f7b173168fb80378e1325fbd10c42b02750e23dce9f0 SHA512 df352da43fbe0fdf3d467f4bb0eacb6d0f05498ff36623bb721a56882ce239ac4e2ad73964d2f2cfe29c039a2b782fc81ccfe5edfc0cc21dff06cf597af15227
 EBUILD systemsettings-5.22.5.ebuild 1678 BLAKE2B 31cb254fd0f29931bb0afbc0d7f021659a66d4440b5954aea05c6f341128c58e13097790d5c884f0965094d61752ac8261db2a3b3b6b2a5d27d615854a6e65df SHA512 a243ea3cf73fcbaa5be79618c27045e805e131f2eea9ce0e442b86d538ee596a5f0d3cb9ba63b4c8f6bff330c32bcff069b200b23a3418ad655ee782075baf96
-EBUILD systemsettings-5.22.90.ebuild 1757 BLAKE2B 7377e818b32feb088be59875829d62b506798434955a1ee0d5b13c9c185b58429096b0f99dad2d293c5a1fd5c1fd0d5d5c51c61d145732f2783f2142bc86fa09 SHA512 674097b35741a516f906dc14b84776acf88e33d6b1d43ddb6cd037b52092176a669ae3e515bbc8ef3e374e98fb0d427ba74cc538f233c03314e4652f35c5aa1a
+EBUILD systemsettings-5.23.1.ebuild 1757 BLAKE2B 7377e818b32feb088be59875829d62b506798434955a1ee0d5b13c9c185b58429096b0f99dad2d293c5a1fd5c1fd0d5d5c51c61d145732f2783f2142bc86fa09 SHA512 674097b35741a516f906dc14b84776acf88e33d6b1d43ddb6cd037b52092176a669ae3e515bbc8ef3e374e98fb0d427ba74cc538f233c03314e4652f35c5aa1a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/systemsettings/systemsettings-5.22.90.ebuild b/kde-plasma/systemsettings/systemsettings-5.23.1.ebuild
index 452b6efd42ca..452b6efd42ca 100644
--- a/kde-plasma/systemsettings/systemsettings-5.22.90.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.23.1.ebuild
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 1edb00cde044..d59200bacc8a 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-desktop-portal-kde-5.22.5.tar.xz 87036 BLAKE2B 57bdcd7999587607a7e952ce52b4ab9a6fe948af4d2cc4929425618b372b3d20eeece60e8cf2baf11ca989e3c79d77c69469aaa4e6120bd069b82f977216017e SHA512 753adf3a4b7543ebbd220f85980e23f1bf98642c8aac408b41ba07bd7aa1ef9929518794e946d497b216eb781695b491c4eb35fce47c43a3a3463d6b9e62017f
-DIST xdg-desktop-portal-kde-5.22.90.tar.xz 89260 BLAKE2B c4f29ed0df7a47c8581d27fba68ac7e592c5ca464b18b77116dc9e2d6ebebabe5b561c5f6f2aacea2022b93762566d026124da56014d3af093af499090a7297e SHA512 255c500b1fdb8f45f4adeddff6960ed142d88a30235f9512f269a229397f7067c3d3b88d8a2adcf7c7108e57496caa98edb8d673b94a7ac260c89fd54764bdc9
+DIST xdg-desktop-portal-kde-5.23.1.tar.xz 89376 BLAKE2B 64e584218b51d0d101b4ac888d16dd8d10fa62f224997c81dd812093595dba43d8ef4f5d2eb298593caabe06af1d1468d494657b51ca68c0109491df5fd5490b SHA512 cf871343bd3cd36a0439014a4c558fba137f77a22fa56265d4739b381280c390d6d663529427326ceecadab91086ec5ea451d3f16ff1ed9df758710886cb5576
 EBUILD xdg-desktop-portal-kde-5.22.5.ebuild 1105 BLAKE2B 20df70250cd44f379c019c7a5f814da493fdc04e99c419233e53aa1e1ca9a6d802c47649fb172ddeee329e7ab798ad1293c7731aa3fc6ab16ed7df2c20561ae7 SHA512 c98508f0b6acd65c204607c5c91f713a4dcd96ffa578c41ba6e31a6c5de57e788f115a2f9325c45a93b5424281ed3cbf2c303009710f55b0dbd8467b93e83720
-EBUILD xdg-desktop-portal-kde-5.22.90.ebuild 1108 BLAKE2B a80d31fcfd2913f5607bafd5ee5672938573780289c44d2e43c1291ffe338adf5fe042b19b2e0426b0e649489661786ec7a758bec9b4e9c2a9a94fb72795e929 SHA512 d4332a8b4bd04f18782a736b0921ba58db9ab0e311c837fd1f84f871debbcc82ac06ae05bbab8299019d0ce974de280a37e3d8283768d50cae854b38be0691e4
+EBUILD xdg-desktop-portal-kde-5.23.1.ebuild 1108 BLAKE2B a80d31fcfd2913f5607bafd5ee5672938573780289c44d2e43c1291ffe338adf5fe042b19b2e0426b0e649489661786ec7a758bec9b4e9c2a9a94fb72795e929 SHA512 d4332a8b4bd04f18782a736b0921ba58db9ab0e311c837fd1f84f871debbcc82ac06ae05bbab8299019d0ce974de280a37e3d8283768d50cae854b38be0691e4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.90.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.1.ebuild
index 741a7d0cb11f..741a7d0cb11f 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.22.90.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.23.1.ebuild
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 7a4f47f226a6..83d236d13034 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,6 @@
 AUX xembed-sni-proxy-5.20.80-standalone.patch 2090 BLAKE2B d56e29d6bdf62bd4fea74c963e6af642c956b2907a2995335845d730b11ab09b81bf535edceecca2bbc7fa44552bc1659e5e59e95415470fe77a7bece759ba4a SHA512 8eb77b1a97715d549164cff12dd4d1b63af2d0f8bbcb447d47b4ec82f539e37dad5395e0a7f8fd5c700fc82e06569313a36cf1f7e6eca09ad6d18bb890dbb9fe
 DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
-DIST plasma-workspace-5.22.90.tar.xz 8981860 BLAKE2B 505189ed45587b29756ca80d384fd6b21ee04a0821d2c23b041a6199f6998413b9a359dbfd855eebde3150cee45bb3c9a2e425b5035a8b78a7025dda9c4e5b4d SHA512 0f400cd6753bf3d793a2efd5fa75d45cbcac0fe43e2e783d3d06374422a1a59354e6ef986e0286915193c06a6d2beaf443cb028d598783e18115437d12768816
+DIST plasma-workspace-5.23.1.tar.xz 9001244 BLAKE2B e1ce6282148e45f64552770bb1debcc9bfaaea0e1388c3b695eccf9a879053959aedcc070e117e6727b09e2a5075773aa9d9ae0b0cbb79e6ac71cb1d2efb0337 SHA512 038c141585c9b8b897641cb2be490406a0d0ab0e5029bb264e33a45fa7cb83ff80a00ca069f1acdce4b74eb4513e27be1d6d6d244b85127a9074fb8f95cc841e
 EBUILD xembed-sni-proxy-5.22.5.ebuild 1015 BLAKE2B 11b057039b67982acca95b5c38035b99c7fb01cd580b0e9865911fcd3bbca6dc7b053cd5571e3edf1e8ec7247744d2466c8d78352e5e5b53cd76d05f725b63f3 SHA512 c0afe7eda4d58c6341535c6d7dd7a0c7f89b2095762ede6684822b4dfb55895bd63b287d363ab39e65971139c656fe0ef52095032acd61d72818fdc1a70a92ba
-EBUILD xembed-sni-proxy-5.22.90.ebuild 1018 BLAKE2B 07f711eeba0b50239446c898eb01556542166b08ffb9e685c1c53560b7a9c5647ddca2c73a2f126bcb76f0ab5950d4ae73c7507836656d842a3242f6423aab1c SHA512 28594e58bfa8c8101f201de9762004d2dd45b6e17a08f9b8d1f68852a070424485a783b49464a9281a7314ee69deb02cddcd13bcc76984635ad65d16659fd786
+EBUILD xembed-sni-proxy-5.23.1.ebuild 1018 BLAKE2B 07f711eeba0b50239446c898eb01556542166b08ffb9e685c1c53560b7a9c5647ddca2c73a2f126bcb76f0ab5950d4ae73c7507836656d842a3242f6423aab1c SHA512 28594e58bfa8c8101f201de9762004d2dd45b6e17a08f9b8d1f68852a070424485a783b49464a9281a7314ee69deb02cddcd13bcc76984635ad65d16659fd786
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.90.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.1.ebuild
index 7ebe3cfa45e1..7ebe3cfa45e1 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.22.90.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.23.1.ebuild
diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index cb1fc730298f..2e62bb931c4c 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxterminal/Manifest b/lxde-base/lxterminal/Manifest
index 188781e40e81..bf0c667fadcb 100644
--- a/lxde-base/lxterminal/Manifest
+++ b/lxde-base/lxterminal/Manifest
@@ -1,3 +1,3 @@
 DIST lxterminal-0.4.0.tar.xz 201856 BLAKE2B 2fe72007e36c5324b868b9dfc54b04422f85f93f71265126f65eb0b6e0510e60eefb0a2a53acadee6f2c44adcd3c498117b709c9eaa1eb2241dd9016558b9e5c SHA512 d1462bf9739c5e9022cbabe9f9c8f70bbb882c0aba7a39d1f87d804f4002056151165d7555cace6f439c0acfbdcd3c959a420993379f646d066f5d30af71232e
-EBUILD lxterminal-0.4.0.ebuild 742 BLAKE2B ecf93d341510e1284bbb05a956932ec6a9ab633f238196b7aa6876599e3c3d35351eb0ec78f48ccbbd8b5df205c64d5a085c8ea5612fd87cc899b0e9bc531974 SHA512 a0893681df6c940ce31d7a48ff645cda7e5c181006b988277048d5fbd6fe143f2aff9172d22b30fa93d48ea616be4c2e771662ad6d4c32ef30dd14b124cebce7
+EBUILD lxterminal-0.4.0.ebuild 804 BLAKE2B 4297d4546129374193417fc51482397334690034afec68a6cb0d4b44bcced588cc9a9551f46c043b2628e794d88a0e4d383a819bc830f4a4eda83056d1512dc3 SHA512 51aed4cc244b4431b1c4741d65ea5dc8be145cfe0165f3bf22484db26820c4e4222a6b7cfde84efea2127c46d02f73451120f8b23b7278e0478c4943faec9543
 MISC metadata.xml 241 BLAKE2B ead789f341d3b5c6bde7eab536830a67c381d73a0351d89effe597afe926859cfdeeead93d798ab79d259218c7f9bd217bd76bd2af68e7d33927091c007df304 SHA512 00defe579ea018f94848c159109c5f117af5f2f109559698824d7ec62f40bd3e703443ff02d1a93073d5517cd847ddb9da40e00f779acf567df1fd95c43f42b6
diff --git a/lxde-base/lxterminal/lxterminal-0.4.0.ebuild b/lxde-base/lxterminal/lxterminal-0.4.0.ebuild
index ac2acb53b0ea..186f5c0131bd 100644
--- a/lxde-base/lxterminal/lxterminal-0.4.0.ebuild
+++ b/lxde-base/lxterminal/lxterminal-0.4.0.ebuild
@@ -31,6 +31,10 @@ BDEPEND="
 
 src_prepare() {
 	xdg_src_prepare
+
+	# Avoid maintainer mode, bug #818211
+	rm aclocal.m4 || die
+
 	eautoreconf
 }
 
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 45ff4bfa14be..9d114faab140 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index ee82189ed1bd..4765beea1152 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,4 +1,8 @@
 DIST alpine-2.24-chappa.patch.gz 172010 BLAKE2B 39f5336ead355a4b78bcdd5b44dc398888bf93f3c3efa95b3ad8a86f3a0dda13f03164a03fbed898150864130648a204a6b5d9e32c3437138878516d014c8bbe SHA512 7152a8e4a79a530345448267204a96bc2585b4fccb23f011fd4dc97bc713696b8eb7ca9563655d8da33570ef14bf29577f82fe0f104c80590a43b0e74ec89e81
 DIST alpine-2.24.tar.xz 7341676 BLAKE2B 63e2d9387f1a369f9a4623625524f25eec64c600672092608256fd2827c094fae1384b35da84ec5f5865295744982ede533551dc47b6f0c80f2405ed16cad546 SHA512 642a51f73732ebdf7c40e2b66370aa2f48fb13b349b477871b26295c3e8b860a0cc78dec9f80efc6ea74c548a080ceff04181eb18c35a9c8cae8d8ef831178c5
+DIST alpine-2.25-chappa.patch.gz 172963 BLAKE2B 5e306325beb46fd2f716620794894f563b93e116693a1af050ea5f61c203350d2aa72b67d7f66acc748caea6a73bdef85f45324eb01edf8a6035b07f8a50e2bb SHA512 b88ca58e42a72b2b92cf28e4cae492a5ee75d534821046645fcc358833e87287fc707d5bec5c3508942a0ef1ecffe64916f00f1a01e430048384838e5ca40358
+DIST alpine-2.25-ssl.patch 5431 BLAKE2B 0cf2fcb682fbee41aa988ff089c16b75ebd9bee321c1c130d0b5136e5ca521bded7e9a97cd3ade1c86b17e72136264d4405cc36427a347c9bee84ee8a64548d4 SHA512 698d2a3c3b7b588fe3fcfe0291f0aab05c42b5ea80de1f210c1985082651329b80447de4e8057bc7e962fe8ed5175ea8132bad413c02fb1f0cc67c84e9420642
+DIST alpine-2.25.tar.xz 7495372 BLAKE2B ce2587a309c87ba527d51c360ee0d9627453cce6585631f569eb26db04aa6c5cddb7c9599478092447a040c43e9234e78a942fef4b1186d07c608163f96236be SHA512 76c214cf66f4ac7af3de40357ad3a592ff2a119e327e5f6c256125b7865d46b09197435fe6ac8077ab7a498e4821925939f3f902431ca77baa786e149466a193
 EBUILD alpine-2.24-r1.ebuild 2176 BLAKE2B 6fca43a26daa89d8b7d57990c09c2ca50fe49eac66c50fb095abfe26beaeefa6d3d14946c5e622cb4e4a173cf3a3830fb8a2bdff0fd70982a1d6f848734ba128 SHA512 9c0bffd2db7029e4516219bc6d8a0fb07be074e5b21a6cd3da5192845fa76b4dd0273bcba9622d2472b8d92cf0d654a47251215cfdd86542474239712ca8c999
+EBUILD alpine-2.25.ebuild 2411 BLAKE2B ef36452e59caeae479cdbc64c69102f3d316e5c47633586544cfa00edf755d4ff72600d1fce614f490bd2aa80d7978221715b86ff55b5a5bf22e493508d614b4 SHA512 d0baebb5678516ea6546fc79f92d096f14c7520da0cc57259cfa4c49bbbd53842f970f7631d58db826c26ebd87a8fcf0d46a4180b9acd10f7fc1cbf5547899c7
 MISC metadata.xml 762 BLAKE2B 026faecac5042e19cce6f125f66fd7af22cbd50140abe315a686d1b129f53b939f5325f9bd1956d41b47da146b6f37c597fe91370722f2f4c7af8169cbcb0f66 SHA512 e11cb2d6c0612fc09302485c38d216245adcabde36fb2c6e829b452f10f3adc9037f1461305e2e3cc3e89025560ac3d621b90b94eea152c9c3e0c53a6c6f9512
diff --git a/mail-client/alpine/alpine-2.25.ebuild b/mail-client/alpine/alpine-2.25.ebuild
new file mode 100644
index 000000000000..7d853c64fc2a
--- /dev/null
+++ b/mail-client/alpine/alpine-2.25.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="An easy to use text-based based mail and news client"
+HOMEPAGE="http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/"
+CHAPPA_PATCH_NAME="${P}-chappa.patch"
+SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz
+	https://repo.or.cz/alpine.git/patch/fb2217ac67706e4cbef69bea41041e2fb8b910e9 -> ${P}-ssl.patch
+	chappa? ( http://alpine.x10host.com/alpine/patches/${P}/all.patch.gz -> ${CHAPPA_PATCH_NAME}.gz ) "
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+chappa ipv6 kerberos ldap nls onlyalpine passfile smime spell ssl threads"
+
+# alpine-2.25-ssl.patch can only be applied when not using the chappa patches.
+REQUIRED_USE="chappa? ( ssl )"
+
+DEPEND="sys-libs/ncurses:=
+	virtual/libcrypt:=
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap )
+	spell? ( app-text/aspell )
+	ssl? ( dev-libs/openssl:0= )
+"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+"
+
+src_prepare() {
+	default
+	if use !ssl; then
+		eapply "${DISTDIR}/${P}-ssl.patch"
+	fi
+	use chappa && eapply "${WORKDIR}/${CHAPPA_PATCH_NAME}"
+	eautoreconf
+	tc-export CC RANLIB AR
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+}
+
+src_configure() {
+	myconf=(
+		--without-tcl
+		--with-system-pinerc="${EPREFIX}"/etc/pine.conf
+		--with-system-fixed-pinerc="${EPREFIX}"/etc/pine.conf.fixed
+		$(use_with ldap)
+		$(use_with ssl)
+		$(use_with passfile passfile .pinepwd)
+		$(use_with kerberos krb5)
+		$(use_with threads pthread)
+		$(use_with spell interactive-spellcheck /usr/bin/aspell)
+		$(use_enable nls)
+		$(use_with ipv6)
+		$(use_with smime)
+	)
+
+	if use ssl; then
+		myconf+=(
+			--with-ssl-include-dir="${EPREFIX}"/usr/include/openssl
+			--with-ssl-lib-dir="${EPREFIX}"/usr/$(get_libdir)
+			--with-ssl-certs-dir="${EPREFIX}"/etc/ssl/certs
+		)
+	fi
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake -j1 AR=$(tc-getAR)
+}
+
+src_install() {
+	if use onlyalpine ; then
+		dobin alpine/alpine
+		doman doc/man1/alpine.1
+	else
+		emake -j1 DESTDIR="${D}" install
+		doman doc/man1/*.1
+	fi
+	dodoc NOTICE README*
+	dodoc doc/brochure.txt
+	dodoc -r doc/tech-notes/
+	newdoc "${S}/doc/mailcap.unx" mailcap.unx.sample
+	newdoc "${S}/doc/mime.types" mime.types.sample
+	docompress -x /usr/share/doc/${PF}/mailcap.unx.sample /usr/share/doc/${PF}/mime.types.sample
+}
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 8b195dc6ee83..6ce60793c2a6 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,5 +1,7 @@
 DIST evolution-3.40.3.tar.xz 12216768 BLAKE2B 7b146ee09abff566a5a0cbbda9dda6ce5cd26c076462fd511cbc02fa35352d1ab776c67c5c99990278963a6f96c2ea8410588925cce1c05300e34ad5252de618 SHA512 08fcfdafd78ee323a57355dec1c8755525eefb599b70e6fb60ed0e9963a538a4b3f172b78f03aecbd245741fad08363b01ada46c2e349a9ccdc080d28c286452
 DIST evolution-3.40.4.tar.xz 12219300 BLAKE2B cbe56014252e8a23debbd4055be85d8bf89e25aa677b92880a6dba78d5d5fbb452403d5f9199b0257ca4c7ee10bff3bc5ca7601fa74390cf6d01d4d7cf099d1d SHA512 f6f08ab3cbc21397a0727b1edc5e37711294fdba6e537000d5a9f11f0142f69702fffad3922645fab256ccdee348b914a87abd0e6ed843c01762ccd32333518a
+DIST evolution-3.42.0.tar.xz 12243112 BLAKE2B fc79c75b4a684da8d0c09fbc8b682095704d9446c93909d57947083fb5798b622efdb4dc52423bc10bdd392e8f05f4968cbf119dd3ffad737403934e9ef5f68a SHA512 435155a69ef324ff3b0f85c9f0ed3206a7dfe12bd8ad5e9a87dff5de839e837417147e81faa93c57f207dff4d92cdc36ac3856402493ff693055f267aed5cbeb
 EBUILD evolution-3.40.3.ebuild 4156 BLAKE2B efda580e566f9f234b1c96252a5af675386f479a3b166a5a356eaecae7f83b2a4b9b140648ee1df755838dc303179ae656080c4c4bf48c19c10c0badc4d9feba SHA512 c007a759e42e4190e7c9c7a8c741c43fb2fa5d2eb126017f8b2269c8bd1af907ef42d2386849860724388d604bf0deaf066f9706a36597aeee74851352230f36
 EBUILD evolution-3.40.4.ebuild 4157 BLAKE2B 28fe2d273facbca610e00017c053661f2c1380076b00601a63d71c3dbfd22a47c61e000adad7ffe0434c889231c228240d7a3f68fffdade8127290001d54f2da SHA512 6f7259a25900aa06e7fd5166565311f28ad17fcb37cedddb149c194414bb4296b9543f1a6fe5f17a7ee6a82a7d9f8cdab2926fcffe69b8d3e0dc89fb2200c7b6
+EBUILD evolution-3.42.0.ebuild 4158 BLAKE2B 20d944a401e2f8cd3ac032a089a6d3b126dc9daa1a0c42e8c18e210360e6cd59c1944283df0a51ad3edf2413d33ff57d0637be629c265693ac7bd5817028314a SHA512 68777f37ecb80c4178b6fe72994fffe7fa92ac4f848abf26e4a1529f6ecc5de118eb73c7154693c159d14304a2d0d936cf5c453c6b574514a8164262fb781578
 MISC metadata.xml 1078 BLAKE2B b3a32d1876342fba5db22aae478cf1194df56f01719c6322f13a069e9fe8d1f17123b9592e0a0c5c25ac856ddbb9d20266bc11ce7c9a4737aa7dd43e76c0aa8d SHA512 9c3da89a72cc8235f73fb98b2cbe21597a4889ebd4d989a98e105613e131a42236ed115c0ac88cb87a312a43123c5bdcc44aa76328bf3cd537367553691408f1
diff --git a/mail-client/evolution/evolution-3.42.0.ebuild b/mail-client/evolution/evolution-3.42.0.ebuild
new file mode 100644
index 000000000000..141bc4cc9c0c
--- /dev/null
+++ b/mail-client/evolution/evolution-3.42.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake gnome2 flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# automagic libunity dep
+# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk
+DEPEND="
+	>=app-crypt/gcr-3.4:=[gtk]
+	>=app-text/enchant-2.2.0:2
+	>=dev-libs/glib-2.56:2[dbus]
+	>=dev-libs/libxml2-2.7.3:2
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.28.0:4[spell?]
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libnotify-0.7:=
+	>=x11-misc/shared-mime-info-0.22
+
+	>=app-text/iso-codes-0.49
+	dev-libs/atk
+	gnome-base/dconf
+	x11-libs/libSM
+	x11-libs/libICE
+
+	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+	bogofilter? ( mail-filter/bogofilter )
+	geolocation? (
+		>=media-libs/libchamplain-0.12:0.12[gtk]
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-3.10.0 )
+	ldap? ( >=net-nds/openldap-2:= )
+	spamassassin? ( mail-filter/spamassassin )
+	spell? ( >=app-text/gspell-1.8:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+	ytnef? ( net-mail/ytnef )
+"
+RDEPEND="${DEPEND}
+	highlight? ( app-text/highlight )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake_src_prepare call, if that works
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DENABLE_SMIME=$(usex ssl)
+		-DENABLE_GNOME_DESKTOP=ON
+		-DWITH_ENCHANT_VERSION=2
+		-DENABLE_CANBERRA=ON
+		-DENABLE_AUTOAR=$(usex archive)
+		-DWITH_HELP=ON
+		-DENABLE_YTNEF=OFF
+		-DWITH_BOGOFILTER=$(usex bogofilter)
+		-DWITH_SPAMASSASSIN=$(usex spamassassin)
+		-DENABLE_GSPELL=$(usex spell)
+		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_CONTACT_MAPS=$(usex geolocation)
+		-DENABLE_YTNEF=$(usex ytnef)
+		-DENABLE_PST_IMPORT=OFF
+		-DWITH_GLADE_CATALOG=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Problems with prelink:
+	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
+	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
+	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
+	doenvd "${T}"/99${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 74166daeda4a..582edb46bcb8 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,6 +1,8 @@
 AUX 0001-Fix-seqset-iterator-when-it-ends-in-a-comma.patch 1175 BLAKE2B a01218e92fb230f7adeacec1803acf80d8e2c44494109deae9b261012c84e1b8eda160f2e663504d30f0d67a52ab39be206b18b04d35a5da3d0b8f29f0ed7f34 SHA512 6bfeb433b5d9ff16e70b7765efd537cb6cb27c5fab9396fed88f1ba3d683a90308afd1a6c7b25af44c5b3d53f54138d6bd671d8330999b402dc887a5af7ca424
 DIST neomutt-20210205.tar.gz 3476980 BLAKE2B 2b8f07a957d668f0903ae3f48d72e0b00414b9ed0411723bc725cd2369ed16c31e461799a0161f3b6caecb8b3a182a0ad9ca7bbb5431ed9ff67cae5dc87b11e5 SHA512 4e9faaa989eb17d1f65e835d3ad37bbda3307f9a939f351776d4cb4677d856fa998ba0eff04bf0cf344485977077695e07c55e79e0800888f646c46fbfac8554
+DIST neomutt-20211015.tar.gz 3727778 BLAKE2B 2a2c57014b089a86ee38a261251ef1ee8c07d25753358cde4f3be0897a04f1fa54828e7cbe7435d004adc49afa40bcfd80ad7e9a8f4c4e7b11ebd7d7f7f60a2a SHA512 b466fa73567b3f97c084133315dc8b35578ca369018a7beccb0e6f18324add262c591671c4fc60defd3c9623db7e95e2f631a6df10b0ef3869cf0e4a6b0eec03
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3
 EBUILD neomutt-20210205-r1.ebuild 4404 BLAKE2B e9ac5596196d2d9ac8c462bc099adf7f775bb782c821f978ab5d9811f8cd7df3ebc1d4a0de9cfe39d4712265def68c6b22d94948859d33e55bc56dfd72d4ed30 SHA512 e374e339d62b4807da033d5b1907f43064773763e38e157b3f9de6d48b41209efbe84bbbcc61fe5325b09ba1f8b6e2f632e5c4e3c7dd2b28a62d2861ec1c1261
+EBUILD neomutt-20211015.ebuild 4322 BLAKE2B 0c4e649fde0e36a31bc46a977a6477c3d69d68338e0be3cc5cd8b99f552b860572a75bdbe020f2d49981ff7a34fcc7056496a937af97c4c1c63fa79f1bc2183f SHA512 eaa79262b049cb25ad88a120bbf6e525eee157b339f9138650e95b09374ae810dee048e5a827d44f9ef5c5cc4c639af0b4e4bcf4280b3447dc83fecdf7e32de6
 EBUILD neomutt-99999999.ebuild 4322 BLAKE2B 0c4e649fde0e36a31bc46a977a6477c3d69d68338e0be3cc5cd8b99f552b860572a75bdbe020f2d49981ff7a34fcc7056496a937af97c4c1c63fa79f1bc2183f SHA512 eaa79262b049cb25ad88a120bbf6e525eee157b339f9138650e95b09374ae810dee048e5a827d44f9ef5c5cc4c639af0b4e4bcf4280b3447dc83fecdf7e32de6
 MISC metadata.xml 1566 BLAKE2B 79d3e2c7123d2ca85fef6660f181923555694a76ce484ce07ab236dc97107e3f6d59bd398823194ec9d00a044dd42b8924e45010cfd6a71f5ef715733b094953 SHA512 4548b2bcca9d03ae8ee772f0837c670840771673f0e3e545ed5dd3a6ceebe851025f916f16c461b6c05b822ea50d819688c1ac71d6e5a99375072e66a76db184
diff --git a/mail-client/neomutt/neomutt-20211015.ebuild b/mail-client/neomutt/neomutt-20211015.ebuild
new file mode 100644
index 000000000000..dd0fe7e9a572
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20211015.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~s390 ~x86"
+fi
+
+TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
+SRC_URI+=" test? ( https://github.com/${PN}/neomutt-test-files/archive/${TEST_FILES_COMMIT}.tar.gz -> neomutt-test-files-${TEST_FILES_COMMIT}.tar.gz )"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet
+	lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test zlib zstd"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.2
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+		<sys-libs/db-6.3:=
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	lmdb? ( dev-db/lmdb:= )
+	nls? ( virtual/libintl )
+	qdbm? ( dev-db/qdbm )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	gnutls? ( >=net-libs/gnutls-1.0.17:= )
+	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
+	idn? ( net-dns/libidn:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	!slang? ( sys-libs/ncurses:0= )
+	slang? ( sys-libs/slang )
+	ssl? ( >=dev-libs/openssl-1.0.2u:0= )
+	lz4? ( app-arch/lz4 )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+DEPEND="${CDEPEND}
+	dev-lang/tcl:=
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| (
+			www-client/lynx
+			www-client/w3m
+			www-client/elinks
+		)
+	)
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable autocrypt)"
+		"$(use_enable gpgme)"
+		"$(use_enable pgp-classic pgp)"
+		"$(use_enable smime-classic smime)"
+
+		# Database backends.
+		"$(use_enable berkdb bdb)"
+		"$(use_enable gdbm)"
+		"$(use_enable kyotocabinet)"
+		"$(use_enable qdbm)"
+		"$(use_enable tokyocabinet)"
+
+		# Header compression.
+		"$(use_enable lz4)"
+		"$(use_enable zlib)"
+		"$(use_enable zstd)"
+
+		"$(use_enable idn)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--with-ui=$(usex slang slang ncurses)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	econf CCACHE=none CC_FOR_BUILD=$(tc-getCC) "${myconf[@]}"
+}
+
+src_test() {
+	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	pushd ${test_dir} || die "Could not cd into test_dir"
+	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
+		|| die "Failed to run the setup.sh script"
+	popd || die "Could not cd back"
+	NEOMUTT_TEST_DIR="${test_dir}" emake test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A man-page is always handy, so fake one - here neomuttrc.5 (neomutt.1
+	# already exists)
+	if use !doc; then
+		sed -n \
+			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
+			Makefile > docs/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^docs\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			docs/Makefile.autosetup >> docs/Makefile.fakedoc || die
+		emake -f docs/Makefile.fakedoc docs/neomutt.1
+		emake -f docs/Makefile.fakedoc docs/neomuttrc.5
+		doman docs/neomutt.1 docs/neomuttrc.5
+	fi
+
+	dodoc LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use gpgme && ( use pgp-classic || use smime-classic ); then
+		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+		ewarn "  support.  You can probably remove pgp-classic (old crypt)"
+		ewarn "  and smime-classic (old smime) from your USE-flags and"
+		ewarn "  only enable gpgme."
+	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
+}
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 039f22e19514..31b6868090ce 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,7 +1,9 @@
 AUX POST-UPGRADE_complete.txt 854 BLAKE2B e99a1ec9a316c90ee4adc112dd87f394d0e2ce37ca5d1195e3f812683a2da59bedf45688cd448cc3ca544a02ee1c0e125f3960e81a062b0f7949e2cde581563d SHA512 0328842265ca859e78fa7d5babeac7b6baa16fb25962f50d431bbca133d042694d98942f77ba3387832d66645cc4df8fb9f3c4591ca7ed4eade6782a92a3d445
 DIST roundcubemail-1.4.11-complete.tar.gz 7048262 BLAKE2B aaf5e6ce5b07577f687788730bc9181334402bb2ff5e78fb306425913b62b4a8f72505547bdcc8673806b48b9ba8252b8059b59399efc95a51877d5c672a4760 SHA512 2bfe0ff3716f76bf9eb5bf5f7b62c738b233c57e67d6ac767c044d1a3a694ae003642d9cc68a18d6f6ba94135aa7ee1692db920e9127128669faee9ddf78fe80
 DIST roundcubemail-1.5-rc-complete.tar.gz 7683911 BLAKE2B e67bbb8ad3d5ffa69091c18b519f78a3dc6d4cc1783921aab9de3c86351d2946cbf784267f5db69434da25413ad1f961161289b47408f14d9e6fa26d8b1e0999 SHA512 4e49e91bb53546e6ac348e33e64019afeee2ce6b78caa4375148fc6fac5abbe8e5db42670c5527e3678abe838ddf349275353e7919584d751bf4c321a62fe795
-EBUILD roundcube-1.4.11.ebuild 2272 BLAKE2B ff467e66c84492af33462c4f26b896344b43ae10585ad551afc105e8fe76e0878bac85b98adf17c0fed649509e3cb2c77e5670a4589510364cdecfe97085d606 SHA512 2a8d669a627042f377f61ee1b742e39a59cf2e3b65f3f8497106624970a5e3a1001b5d1d4d57cf0e7a2a1224244da58eb228c04d29c371b310cc34612320f5d6
+DIST roundcubemail-1.5.0-complete.tar.gz 7802014 BLAKE2B d81a521c264b47b55b7f868caf4fd8f0d7fdb2f0d04bf560bf1774c39aa4d0b4143ba1edb977941a4596848921671ec47a0dfd21f20f7e28778a021d58bec402 SHA512 cba32ee2b86864af9d9163d83fa49763267e3420bee59b86d47b889e1bc53871ed2ff5b2c1444778324f4b259e99752faa3b72f909a8f9c26c7af9c96ba08a54
+EBUILD roundcube-1.4.11.ebuild 2289 BLAKE2B 3e24731cb8fa44a45ff7c34aeaf0f2766849d1cec59e6c5ae26fb639443e9288889e435a976686328860fdd6bc64b98369d0ad585f879b57202cdbf6dbdd6d06 SHA512 858450c270914701ad910de943f35985c538a817cc325cef345ed6d582507fc365b3df11df2d1f800c107cebd3cd8ed0251e5d055dcb568f91423c5c62017bc6
+EBUILD roundcube-1.5.0.ebuild 2358 BLAKE2B e44b1329bb7d68f7d328c5b8a2b4adb394b81781e0245dd709d1a0827e813a44b59f4f934dbcf157fc236159ad735b6dfdcb2b894f7f6710d40f522476270924 SHA512 b207366b024710c60da353129ca2316009d256060164198a6a374d6cec9eeb733b89b81acf6f2256b0e996b716d3caa9ec9905e77569b758e25997662564b483
 EBUILD roundcube-1.5_rc.ebuild 2337 BLAKE2B 5e2f9c8fbacc0ad8130170a4c6cf63de55608cc714b1e3d7539b92a0ac1dc0c9a16fce52c8b25b0398ea4aa7313d52d7f87442cacb46f824ee55ec7fe708815b SHA512 1cb7e351fcd9537f4201aa31128eb8db02ea27398068978b33bc6b602f97a361e885b88e6a3c799afe66a55e6a615a6fdad9a38dfe7f10115a5cdcf3fee7a15a
 EBUILD roundcube-9999.ebuild 2358 BLAKE2B e44b1329bb7d68f7d328c5b8a2b4adb394b81781e0245dd709d1a0827e813a44b59f4f934dbcf157fc236159ad735b6dfdcb2b894f7f6710d40f522476270924 SHA512 b207366b024710c60da353129ca2316009d256060164198a6a374d6cec9eeb733b89b81acf6f2256b0e996b716d3caa9ec9905e77569b758e25997662564b483
 MISC metadata.xml 1118 BLAKE2B 2872ed8444c98f6c9f96642089c879225e14ee2b53ad2dc70b307a82b8a1e0988e19c24fc9da8f98c63bacd6cfb105941ee5a5bc8e4ee756e216e0dd6d970e84 SHA512 3bb6ac4d95aaa94e0a23f1382b79220de90a45f45e1c98dac00c91e4bf12d35646c95b633713896062c729777e0ec57a6ebcc5d4d1b416105dc63378b50afb47
diff --git a/mail-client/roundcube/roundcube-1.4.11.ebuild b/mail-client/roundcube/roundcube-1.4.11.ebuild
index cb9a6709c782..9e557b1fae0c 100644
--- a/mail-client/roundcube/roundcube-1.4.11.ebuild
+++ b/mail-client/roundcube/roundcube-1.4.11.ebuild
@@ -25,6 +25,7 @@ need_httpd_cgi
 RDEPEND="
 	${DEPEND}
 	>=dev-lang/php-5.4.0[filter,gd,iconv,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml]
+	<dev-lang/php-8
 	virtual/httpd-php
 	change-password? (
 		dev-lang/php[sockets]
diff --git a/mail-client/roundcube/roundcube-1.5.0.ebuild b/mail-client/roundcube/roundcube-1.5.0.ebuild
new file mode 100644
index 000000000000..e63578dfa2c6
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.5.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+MY_PN=${PN}mail
+MY_PV=${PV/_/-}
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="https://roundcube.net"
+
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components, googiespell and utf8.class.php
+LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
+
+IUSE="change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# this function only sets DEPEND so we need to include that in RDEPEND
+need_httpd_cgi
+
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/php-5.5.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
+	virtual/httpd-php
+	change-password? (
+		dev-lang/php[sockets]
+	)
+	enigma? (
+		app-crypt/gnupg
+	)
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	spell? ( dev-lang/php[curl,spell] )
+"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/roundcube/roundcubemail"
+	EGIT_BRANCH="master"
+	BDEPEND="${BDEPEND}
+		app-arch/unzip
+		dev-php/composer
+		net-misc/curl"
+else
+	SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		pushd "${S}" > /dev/null || die
+		rm Makefile || die
+		mv composer.json-dist composer.json || die
+		composer install --no-dev || die
+		./bin/install-jsdeps.sh || die
+		popd > /dev/null || die
+	else
+		default
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG.md INSTALL README.md UPGRADING SECURITY.md
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
+	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE_complete.txt"
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "You can review the post-upgrade instructions at:"
+		elog "${EROOT}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
+	fi
+}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 40e3b2333a27..a5a912771492 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 940241ee72d5..85d46d0efbb0 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -4,6 +4,6 @@ DIST msmtp-1.8.12.tar.xz 364712 BLAKE2B 94707d18d9be71e8e51413cdcc55887fc15bd7d0
 DIST msmtp-1.8.16.tar.xz 375372 BLAKE2B 4567c323bf2f53fa878ed315dc4a2c524918de22305d2034be476373409bc61a9c841f0b9c6075e06e47eceb816ea24e9d6cb71c2bd94d9ba6738ae36ccb09b7 SHA512 5e7e39927007fe8e1763b13a83f44f6456e8e9efade8e1c3148f34d5c2b5aff51b1e4519337628776e6bce91066de9f145c7c2957927cadb0962a25452a47247
 DIST msmtp-1.8.17.tar.xz 379876 BLAKE2B 61394172603948a3fc2110e1c0f54e53eb45b6990bc0557693445a0ffd36ea64dacde5d8defa205b219f8b8b8d778b513ee222d94e6ddce26d91dfbdfce4b12e SHA512 a6f8f30af47e432ffaef5b47b105f6b4ea0a6ca3069689137c66112b6425eca8775ad4f7606c3ca0dfc132c14c6f9969767329615a82d1f5a11f07dfdf151ced
 EBUILD msmtp-1.8.12.ebuild 3288 BLAKE2B 4ec63367028567c9cb4fdd17d790a0c6cca9c1940474b82e7b635c0ad7a1b20168ba40d83d49237528dd9c6b7fe6f0d002713679fe577733ee543968c9311ba1 SHA512 afebb34c1bf95f0ff1161a03df5a38260e90c5e36d2c995c22f4fc8c8ed5e2c6fa6b7ba6b3ee1dc859545c7f90203a7ee4924984d99dfaefae0ced78c4c74730
-EBUILD msmtp-1.8.16.ebuild 3296 BLAKE2B ba019d19c03575073fcf97ab5cdf9a3004d9341bae4536bc7ac2e7d41113e69f0a689113fda6bdd7c8813d828689a5618e0af110bcff96903ee2778cf1da3c02 SHA512 032a34078956dd2f996c4a26554572cfb8541b7d3486473ba7bb1bd9e61f03d2740325c3b3e9e0186a97f2d014aa38634efcfd0cde660b5d5980d24d4a02c0fb
+EBUILD msmtp-1.8.16.ebuild 3295 BLAKE2B 9dcf98f1472fcbce1de4ee38115179f85bba01fb1c807a1159d657f2d4e52cb7fb1e6a4df380d446481fea19052f27080da0e9cd70a2e5eb1164d2b932c0fa23 SHA512 58d31fb4cecbdc3c54491cb32d2012d2cba31a418689cb124e5d5bef3f862ee0a101f32ef77e27245e9f4b526dcd079d1c94a9243e9578ddb6cad373ba10a589
 EBUILD msmtp-1.8.17.ebuild 3300 BLAKE2B 0467ac0de1dbf509ecc99fa7b6075f09922d997670c03f76e1dd54ff056ab309a8be78e4a282d6d17b751bc3ada33bad305bf4daa395b833ef57bfd3b00e7a14 SHA512 4ce6bbbe0cefed26aab4e5bbb375d57114a898a962f5d70c3b10df76a4e518896c9817be8d21b7f4f8596b3463718f7d6187ce514440b19cc7b44d33dcc92368
 MISC metadata.xml 471 BLAKE2B 2f73e5ba3eb891844f14bcd4792a4a1df6f2bc90839819a4489fca29128d4268962e6f4cc781b99942e0f54b85a99554293e50f8be4680c58df38fb90f199916 SHA512 22bf1461c446daf3c854cccce644cf6647881878c346f2bd6390f69eb397dfa608d15cfca75bdc3a58fa4c86b2f69e1224bab181c336e883726d9564a358db7a
diff --git a/mail-mta/msmtp/msmtp-1.8.16.ebuild b/mail-mta/msmtp/msmtp-1.8.16.ebuild
index 0f1f2207cb68..10959a15403e 100644
--- a/mail-mta/msmtp/msmtp-1.8.16.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax"
 
 # fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index ee15d1e50223..457b6bdbf631 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 20acfc8bd45e..a080bac1c551 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,4 +1,6 @@
 AUX alembic-1.8.0-0001-set-correct-libdir.patch 1879 BLAKE2B 2cbcdfee02094745544ebc67e467e452d225a8a9445481f984eaadf399544bfac24a410d8a7f4137f4b73d038e7f5eaf08ea492aa7bb95f15fede87fef081eb6 SHA512 d1ec399048a6baebdbd4eadb5be55281693455d0280dd3ff86d8747d2aaf52eede4c6848d71362e17de2d23d063357ff983bb3a8ecad28e81303f72a76f48a02
 DIST alembic-1.8.2.tar.gz 861796 BLAKE2B 9ea2dea33b3116331dd02802055e8db7faa736bc2674e6b30209a9e178877523d9f14516b35729eaf6fc348b89367e9830ca1b998a8c7d10766b9b2f265b97d8 SHA512 23fec3d51cfd8ac8bc02749550de53a7b699ebe67654336864a8208a6a1d4f69e8e1a2c8e07832665c203788cbabbb65f346582741bac10ceb0d56c16d6b4217
+DIST alembic-1.8.3.tar.gz 862221 BLAKE2B 81639b0968dbcaac0096eac83385b7d6b1dc27b4b1652ede8cf6b6cf3aa3eea3c6f5e53f033708b61f79d99ebfaa766a9cac3345a043d6cc0ba6d6c29dcb9ed0 SHA512 0049c72d93e66e12d704d27e7ba36cd9c718667f2ce4f7baa1bee1613ed88ba53abea98f457e14f7f2144cb353810a4108d26c7dd1a1543ec2af576272f19036
 EBUILD alembic-1.8.2.ebuild 1234 BLAKE2B 8fc18141031dcbf54bef2d0323c4a4e7f7315a7f2be9297c2af1683ac073530ae34271c97fb7d2f4961afb05baf5625bdb680caaf64f5da25cdc9dfdbaa55707 SHA512 7d2f20abc3d8d656dfe9b41528bf9ed494accd9678b46fd695637df4baa6bf116b770f21a1494f58370190f2af8ec20876b3e5639e9bd5f67bf15b055fdd9cfb
+EBUILD alembic-1.8.3.ebuild 1638 BLAKE2B 196b6575fa7c97ac01adf354c6f3345a24ce3304c6099e89de4b41f3e6d9c2d1ff8fce38b76c14ed677f4929fca05bfe73d15c1de1cd710ce8b9c91591884d73 SHA512 42603d6e35d7f1b59d13bbdded3e054405293b89d97e5f33d4001c67c6b813dad75dd1ba1fadbb5fe4232491bcf2f679ce466dad935e54ee5e2b22501b601809
 MISC metadata.xml 824 BLAKE2B 55b10435d032292b05af14bde6a69772eaf7993bd1686a0f1489313624d14b3572037d6ba7e9caab7bb69ed36cb61d5f1518d6c945e9e7c3853dcde1e80e3e0d SHA512 55c878337d8297cd8d811443d8821835e4ee5096364014bc43c798a34645076dc47ec405bdfd3c62a03481f8539cca9fadd8f7f15a2bb98471c9f7d0d57450a1
diff --git a/media-gfx/alembic/alembic-1.8.3.ebuild b/media-gfx/alembic/alembic-1.8.3.ebuild
new file mode 100644
index 000000000000..c46c467c35e5
--- /dev/null
+++ b/media-gfx/alembic/alembic-1.8.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Open framework for storing and sharing scene data"
+HOMEPAGE="https://www.alembic.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="examples hdf5 python test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		>=dev-libs/imath-3.0.1[python?,${PYTHON_SINGLE_USEDEP}]
+		(
+			>=media-libs/ilmbase-2.5.5
+			python? ( >=dev-python/pyilmbase-2.5.5[${PYTHON_SINGLE_USEDEP}] )
+		)
+	)
+	hdf5? (
+		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
+		>=sys-libs/zlib-1.2.11-r1
+	)
+	python? ( $(python_gen_cond_dep 'dev-libs/boost[python,${PYTHON_USEDEP}]') )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.0-0001-set-correct-libdir.patch )
+
+DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
+
+src_prepare() {
+	cmake_src_prepare
+	# PyAlembic test doesn't properly find Imath, comment it for now
+	cmake_run_in python/PyAlembic cmake_comment_add_subdirectory Tests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DALEMBIC_BUILD_LIBS=ON
+		-DALEMBIC_SHARED_LIBS=ON
+		# currently does nothing but require doxygen
+		-DDOCS_PATH=OFF
+		-DUSE_ARNOLD=OFF
+		-DUSE_BINARIES=ON
+		-DUSE_EXAMPLES=$(usex examples)
+		-DUSE_HDF5=$(usex hdf5)
+		-DUSE_MAYA=OFF
+		-DUSE_PRMAN=OFF
+		-DUSE_PYALEMBIC=$(usex python)
+		-DUSE_TESTS=$(usex test)
+	)
+
+	use python && mycmakeargs+=( -DPython3_EXECUTABLE=${PYTHON} )
+
+	cmake_src_configure
+}
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 7a08e6368b38..6594db4b53a2 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1,6 +1,4 @@
 AUX 64asymptote-gentoo.el 337 BLAKE2B 56b028184573dd8db6babd90ae45838b9788671134d625df5960744b71b377db3cacf1dd4fc78d9800ffdf4e83a2413b7e87680ab0fcf45c31ecad9dc538388a SHA512 c8c74d5464f500e9bc3ca2fd89065e4f68a834c1b82a444820efd70abf9d2bd7c52ecbecd7ea5fad916259512acf4aedf8aed803a707733121211e59ef300c86
-AUX asymptote-2.69-info.patch 436 BLAKE2B cf8510e1f0135eb1e16e0e3913572418761a6eec863efff59c29d84a0f5f1b863febdb965120e1661bca743cf5d0d6e752a929cbe197ec7ae8fca162eb47ade1 SHA512 5a7c19d64609ed8c287a598b57331a318fbc47aac8770d0a9e1451b3b4f4f715a4fc30b8dc7238fd3498ca10ab4fcf2bf6373cc2e576c11d5d8eeaeadf9324c5
-AUX asymptote-2.69-xdg-utils.patch 791 BLAKE2B 126fbc6a5b253e536c6daf479d5b422b52e51d874504f2b586df647ecf940f730b6564cab8c5bf5e2fbff1e5eee8b84dd882f312e2492afa0ae6490d401ee7fd SHA512 003dd1867fb4d44d9e9dd414e908adda6f3802d44a614732e28df415c6591aaa4cb053dd7848c857c7b9cc3ae253cf3cc51699242e3d5629395070d29da226da
 AUX asymptote-2.70-info.patch 436 BLAKE2B 70eac7625341e21f9cf03cf1ea08e4864fe102627349f2411680b9c18f4df508f5cd6972f9e6dc719795f0323c51b6a5d096e9e3cae81cc1ee497f3f9325fafd SHA512 5b7494351bef5240bd4dba531a3eb68d3a6025990f32fe4064df31e351df9cfb27be29c69b16309929a63ec8d164eb4f2b14315406e546c7dba9dc416ae6b8d4
 AUX asymptote-2.70-xdg-utils.patch 791 BLAKE2B 971b2f1c6a4db7e39cc2d4bac0e3e6cc951733fb0718ace6e6807f63585fe8f4aa6f8519c6e03ed75f0176dca87e705d1b7175e0c1c7a1e79eb6c15dc4f2df76 SHA512 f78359aa71adfcea4ba31e3cae4c30aca47e39337b647f6fb2ad5264bd318a45071fcc47b1bbe5cc4c59c6b707b7b17461af62add2ee2477027d95d369f29994
 DIST asymptote-2.70.src.tgz 4674495 BLAKE2B 126b2e99222e6ae438aaef89df00b8eae19118c3ef42d2fab0b0117f343911939e680d22e903b784213186a5d2eeeecb112afba1467562e7127c34de4bc66773 SHA512 24d60af361e3f0309a896ce8163da6fc0a9d6587efe726c5acf874dcb74f4d51b4bad8146a615ff54173ef06dac53117fd1cc09c77940271adc9f64cac6bcfe6
diff --git a/media-gfx/asymptote/files/asymptote-2.69-info.patch b/media-gfx/asymptote/files/asymptote-2.69-info.patch
deleted file mode 100644
index 63f2dc281762..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.69-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.69/doc/asymptote.texi
-===================================================================
---- asymptote-2.69.orig/doc/asymptote.texi
-+++ asymptote-2.69/doc/asymptote.texi
-@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
-      
- @dircategory Languages
- @direntry
--* asymptote: (asymptote/asymptote). Vector graphics language.
-+* asymptote: (asymptote). Vector graphics language.
- @end direntry
- 
- @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.69-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.69-xdg-utils.patch
deleted file mode 100644
index f07d23ac6183..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.69-xdg-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Только в asymptote-2.67.orig: .pc
-Index: asymptote-2.69/settings.cc
-===================================================================
---- asymptote-2.69.orig/settings.cc
-+++ asymptote-2.69/settings.cc
-@@ -101,13 +101,13 @@ string defaultPSViewer="open";
- string defaultPDFViewer="open";
- string defaultHTMLViewer="open";
- #else
--string defaultPSViewer="gv";
--string defaultPDFViewer="acroread";
--string defaultHTMLViewer="google-chrome";
-+string defaultPSViewer="xdg-open";
-+string defaultPDFViewer="xdg-open";
-+string defaultHTMLViewer="xdg-open";
- #endif
- string defaultGhostscript="gs";
- string defaultGhostscriptLibrary="";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index aa3c087c06c9..280f974959e2 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,5 +1,3 @@
-DIST chafa-1.6.1.tar.xz 418720 BLAKE2B 5f6c42311d81bf508f5ec890d72508fd2255e226102b8a7c5c71a9bc1293cd75b08c6b640ca4e6fe9ae34ad47e4e408e25a1aeed7057a5bd823550bea4526f4a SHA512 96cf772638e1a6874d94636a69d6c76d1040d956a16be851ea818292f5b2252867acd0891fede3e030de591b5567d820cf062c5a103a0943a0ea2f2ba34eea77
 DIST chafa-1.8.0.tar.xz 435712 BLAKE2B 15a6e64fff13ac32b2f828a68fb12c96856e175eae83c0396b07cbb2ce71d8c1c8eee67db00880372026fe91eaefac2b34376dee597108ffc07c706cf8c98682 SHA512 15ff08a0df82ae8517ac7744b81a39e1ae1eff8c9848128341cc25da94864e89b7101aabcff2d532bf11ea293bfc4c9e48b01f85388dafadbce2d2b2c8b7439d
-EBUILD chafa-1.6.1.ebuild 744 BLAKE2B f45a1b29f5d37253413c759b66888035e16a69318e95c4b46062549f441afecf3d43377d4132ad5c789cea2108fe4e25f69dfaeeb307a19b65cd9ce626f5f63a SHA512 336aa03393a3cccb5e44a317e66f50d0dd86bdec5bba2fd8550f78d0491ed262bb0292c5a23ad292430ab19f0e0063b46bccc93389ab2c77e046da25404c6c9e
-EBUILD chafa-1.8.0.ebuild 747 BLAKE2B a309ab04266e19385050fdf7946296a9426672f5948586f3089d01f544ab6998c0c3f640c9a0c91a0b382a6199878254f3a8b8dd2ec0af7f3cab940211eaac7e SHA512 c5194bd1a700117084dc9f73d5b5466537bf3319ed6b791023b8e2c56398f62b680cf808ecd2a0a62619ea57f658543539ea8e46aacd41c755957837ace72ee9
+EBUILD chafa-1.8.0.ebuild 744 BLAKE2B f45a1b29f5d37253413c759b66888035e16a69318e95c4b46062549f441afecf3d43377d4132ad5c789cea2108fe4e25f69dfaeeb307a19b65cd9ce626f5f63a SHA512 336aa03393a3cccb5e44a317e66f50d0dd86bdec5bba2fd8550f78d0491ed262bb0292c5a23ad292430ab19f0e0063b46bccc93389ab2c77e046da25404c6c9e
 MISC metadata.xml 396 BLAKE2B fc22be32275227f194b224a340dcd08e55a565fa68b102eb9cb55406402ed38d4f593aa6f59f3c40a24480c8d002ea0ce4a9a831055bb6821fdbe1a1dfd103ff SHA512 46617cd84ec16190865a896432df30443d31123b790d871bf634cd446b520ed9b1728951e49217b0619a91d0d46d3013ce7f41e142893298ad7e8c2522d1552d
diff --git a/media-gfx/chafa/chafa-1.6.1.ebuild b/media-gfx/chafa/chafa-1.6.1.ebuild
deleted file mode 100644
index aaee185d5da3..000000000000
--- a/media-gfx/chafa/chafa-1.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
-HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
-SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+tools"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-gfx/imagemagick:0=
-	tools? ( >=media-libs/freetype-2.0.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-man \
-		$(use_with tools)
-}
-
-src_install() {
-	local DOCS=( AUTHORS NEWS README TODO )
-	default
-
-	use tools && doman docs/chafa.1
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-gfx/chafa/chafa-1.8.0.ebuild b/media-gfx/chafa/chafa-1.8.0.ebuild
index 0949da594e0d..aaee185d5da3 100644
--- a/media-gfx/chafa/chafa-1.8.0.ebuild
+++ b/media-gfx/chafa/chafa-1.8.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+tools"
 
 RDEPEND="
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index e1dbb6bf2f0e..7cce006dccea 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST eog-plugins-3.26.7.tar.xz 482336 BLAKE2B 9cd1d7e16f8e7f1fe06c3bc2ea79ab06c397beaf9d9bfb26568ad5fb90a144ceab11f6250c7dd51ebb5d3962fff47a4c855b85725b95abca07cdc4de739a2b7e SHA512 c9312eccc5529b01cb285a165c833243ea60bb12f8be6f40ccc6da0db1bd951916000a48aa31705b048659e8d637aa7e56d761fe0f9be720a4e0ce81289d2b83
-EBUILD eog-plugins-3.26.7.ebuild 1724 BLAKE2B bc1b80d1d3775b924554435d23188361933ca594cc552794182e617300b673cbfcdd523ae334de644b8d061bd4d4741a6799a714709ddc203c05b7e67118a1a1 SHA512 489b429a9b792c4405c0cb88c2c09178bb35bc5818c644f51641177b24ddbbd1a87969147024cabb310b1b8950a2c8d42983a71ded4fbbedaa8f5c8eb78eaa3b
+EBUILD eog-plugins-3.26.7.ebuild 1725 BLAKE2B 5063f5a3c9e9e9a55749b6df79a1b1dba448e071c517b8eac94dcea955db715f1c4ae979dd49b9c2e549c0b5ca85d6b86fa351936259e399efc3930105a48ac8 SHA512 b4ff645c5af1295765cd2f92bd44ed3fc5a188693e14e2237cd16f6a838940d3e9bc60e6b07e77818296a0ead6c8c0b102f798695c3b4d0092c24e2c7572972a
 MISC metadata.xml 429 BLAKE2B 61e0c5a268c0dbcb1a2b0a0e1d0ceb1b7795db34e022ba9229015ecf05210dcdd247c2c9867549f5c75028dcb20011f7757fd9b4ef507af65b80aa8aa1ca6f18 SHA512 d4b81d9f78bf49afe842990d9c1c9dde1c3f1bc68090f77dde1bd51b2be98ab647be10f8886da7dcc1831cabc4f7c81b18b7e6e5cadb2c5aeeec69db883509bf
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
index 5f727ce583b2..998f6cc3c250 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome2 python-single-r1
 
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 017383a13d0b..8552778f9f05 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -11,6 +11,6 @@ EBUILD feh-3.6.2.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab24
 EBUILD feh-3.6.3.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab240a8ce320b3c50034c907cf6729f5c36185c376581236d4bce6913224e842ba711e6c481409e7691a307c4 SHA512 54677a9d00d4135041ed124893bb9fe7e36af5f2afe8d9baca2e52deb8a5bf1a6347a1b597ce938873d2caa54f3ed9c5ef1428760e10fe566ebe65edacc5ccc2
 EBUILD feh-3.6.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
 EBUILD feh-3.7.1.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
-EBUILD feh-3.7.2.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
+EBUILD feh-3.7.2.ebuild 1515 BLAKE2B 67ecdd1281ba33a13b51fc2c23b4c8efcca57cc678f5cfb77850dd7495cf6a0463db0af547f4c9c7cac74467b063f724b679814e498887eb3431ac1068d8bf47 SHA512 4cde105c3719d084c150a1777b3134fd382f66e55f2df003c5d3e3458168b38dc89598446f2840f4d527a5beae539e620e246803e296d9d33f5884062add972e
 EBUILD feh-3.7.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
 MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/media-gfx/feh/feh-3.7.2.ebuild b/media-gfx/feh/feh-3.7.2.ebuild
index 9ccef7a27f03..33b646356d2a 100644
--- a/media-gfx/feh/feh-3.7.2.ebuild
+++ b/media-gfx/feh/feh-3.7.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
 IUSE="debug curl exif test xinerama inotify"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index be4141c7c5c3..88d06b4073b0 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -1,3 +1,5 @@
 DIST gifsicle-1.92.tar.gz 575199 BLAKE2B 53716621846b14c0727e05893cb1876572ab80aa4d444c2b75499b541a19a5e45738b817c203b3926301378b2211a3263311c424cd8dd53e71d2b60f28ecdfb3 SHA512 5d9539eb5a6a8b87aed49ff3ca3d62e337845edbd05459b002369d571f74878c99740c34f50b4c86e5b8787ff189d4c21230e4f9019cd96a09db603afd7563dc
+DIST gifsicle-1.93.tar.gz 578194 BLAKE2B c5635fc736e2fd97278ab97377663f9702d2891cab5e19b16fa1aa53412ae48945d82ee42e9690208532cb854c99397ec4c1a11d4521454d8d40efd9adfd9d2a SHA512 1ace2c9597a405d69bb9dfa24764a3d7c7dd9864e1832d25a4a7ad2e32780038206b889711846d6e4dbc7189482d0d03874f18d86966ebffbc4ee10569c390d3
 EBUILD gifsicle-1.92.ebuild 650 BLAKE2B 0d9ff8115ef3c7b970fce293ebe3c7ac2d59064885e8aa4f5289652d02234c4772406a0e650305c783aa408926db6fe37a1c3c3cf3f221d6e7d88a7a30cf28f3 SHA512 eb99c7394bf33c104412f73c9e3c2b08564c0ad9164e26484c8f8530064d0a2780ef7c4690e764bef942be600118b605f8d5890c16fd9708fec23499c567666c
+EBUILD gifsicle-1.93.ebuild 642 BLAKE2B 21e2b2c1b724c6c4dc063aabe842ad94cf50717fbc6a1432c43d45e52e57ebe0308865b0ee1c6eda6d3e957f796cb3be9ba0eb09b67ed18cd723c6c79f12267d SHA512 194263ac52acc7405c122c894f477fb9bf7dc3bbb01763dd21c7675475caa0391ee4bd0f1b41b41283ea228b2489839ba97a0f1b8f408e162d5cfffd2e2dc2d8
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/gifsicle/gifsicle-1.93.ebuild b/media-gfx/gifsicle/gifsicle-1.93.ebuild
new file mode 100644
index 000000000000..72395ff30f1d
--- /dev/null
+++ b/media-gfx/gifsicle/gifsicle-1.93.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Create, manipulate, and optimize GIF images and animations"
+HOMEPAGE="https://www.lcdf.org/~eddietwo/gifsicle/ https://github.com/kohler/gifsicle"
+SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="X"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+DOCS=(
+	NEWS.md
+	README.md
+)
+
+src_configure() {
+	econf $(use_enable X gifview)
+}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index e04036d96fde..d6b8281ccbf3 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -4,9 +4,9 @@ DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B d11b0ee8f0f24934383028a0b21820af30da6
 DIST gimp-2.10.24.tar.bz2 31546295 BLAKE2B e2b873313b41799cb9461f6cd2ec45dcb0d3f51fe3e2710e47be99be868fba962cb75afb47bc2f12e2d6090993d70f560f4d58d2614939a0d36cadc9191fa2a7 SHA512 828350ad5c53b8409463c24693821d78a1940f18c221249ae7b864ad9db5cf01ab41d6ec5bbefd96115f0e91809ecdc61451d71881b56b07920c442f4a514936
 DIST gimp-2.10.28.tar.bz2 31675862 BLAKE2B b491b55d5adf08221feb7cee8b3adc1d8b090901e8f43b93a4d2c3d935ce1ca45072b0ccd6840e06b329fbfafc8fe5e3d6056381c5129203fa3c5e781cab0453 SHA512 587f6f46741672f0700fd642a5b779694d2d8bc8ad70e7677ccdbfc2266dc62203ed347d6aaffaa4b8e7d84a84a25f7d5a51507dfd64b21b4c05970856d3ab94
 DIST gimp-2.99.6.tar.bz2 30663040 BLAKE2B ccbdc2baa9e99a94e85345ce90bcba6ca56c0f264d3248d198009b730a5c810997b76c7d7a3cf131374316298d719a3e70c81ee7bc0a5e34beda1b112921807a SHA512 51ada696693ac51624ba222d1fff54d39bdc72a06de54f7c244b89740b77f7205aab44f1cec90785ca4196cab32f817e7390b4287a30f5024606163f24222961
-EBUILD gimp-2.10.22-r2.ebuild 5636 BLAKE2B ab208d7b8c28b52eee77ed8ba150264e7939308474a6adffa7372589f5b4d1347b1d25145d1f91aae4a05731d1a050e99cfe7700ae2ff455a67eca1cb61dfe8d SHA512 d9646bd07e014e6efa79782665b0d095b95476ede9ce15222428c53c91609b5837d925923aae8f3cad92b20043f0db98993a4b037e6bd866cd467753c49f20be
-EBUILD gimp-2.10.24.ebuild 5581 BLAKE2B 7639817275bc53b7e08b8f190aa11b2be6d62f2c12f46474fe67c74409fdbb0a4cc2bcaa8c7bdd04721f111ea52d3c8a950efb9d85ee1d22cbaab687207fcbe7 SHA512 c22ff9efa6044e6f0fba4094b0bd9debfb9752464357dbbe7c760ba9901ad36d479c1bbecfcae8c7c6b0bfecb8084cab970d8ee1d458122b2eb9f0b40a0b8054
-EBUILD gimp-2.10.28.ebuild 5581 BLAKE2B 6d8eaf4a6ecb37437f48b9d8648d50fc673d1f16b0660b9e948b323832501f6ea925cb52f33dda150d911c7a526a8a8b4322ed00be1c051fc155ee92fd56051b SHA512 b9a71feb722a970668561225c82c15a31728f93ceb63c6a6503a57e769af05fc1e28ac6c15fee65a4a38257c76a4ca3ca76ed31f14f79c9c468c6aacd83ad8ed
-EBUILD gimp-2.99.6.ebuild 6827 BLAKE2B 9ea9ca8d05654e6e569e42930e3f65c23629ad0218aa26d7368963cf3675237ac7b85c61c745c1d8d97f77ab824f676289c4508618366d4e12084a7b8e021129 SHA512 feb1d24d9ff9a72e0f400a6215254ff780df2c4660b3b4f4e31ea56bbc8da4bed9b6dbe2b518eae91d2963ff9ee7df832a50336e2713c7576ac399f8c9bbc5cc
-EBUILD gimp-9999.ebuild 6995 BLAKE2B 77775a32a461e6147afe35b5e43c540101810dcfe437ff68783d05ce282992eebc9cf7af948bd87a9f1f7b7a73ced2e6ce603e89b4d55a8881c6228a9a5bbdbe SHA512 61a0c945a463f4885cff848d523d17fa1c6ca5b885687244e0d54a7babea76427d67e39c6275788a2ddfc0aeedc8db9dea6d72c0ffd97ec1e33036dc1aeb7fdd
+EBUILD gimp-2.10.22-r3.ebuild 5638 BLAKE2B 1d71a07139f3005de53dce494c3603a7fe84d0b82d52b066e1ca6e7f663ba14d46ce8faed4b31c2bb072202ba2ef28d3004420b5fc637e5cc1f5f0b2cfbf96c3 SHA512 bbb7192ae8f9ddf3ce26f9388e67da042297d8fb42040f49821dae762d6ca16edbabc1b5204de801e857759c032625e39b6945e6a19e674ed6c8dda848216158
+EBUILD gimp-2.10.24-r1.ebuild 5583 BLAKE2B 8da764ad95278c60c962e0254b2a839e35e4222e045a3c17cc4387058037d933b5f07d17def0992b1da7fd3c7baafa19700f79c39b7dd8ab673d7ccdb4672cc2 SHA512 4041817e72d868ccf5faf05643691d543aea7e32af241762cd5364397e47827da8a59eaf38db6b2108c12862989a8a36c95911081c09ff4eaeec0f420f522176
+EBUILD gimp-2.10.28-r1.ebuild 5590 BLAKE2B e68af0cb443a25f79cf0a9fef3ad51de9e1ca806621a2a11bef7a1c8d94e1d9a89dfb0163bcbf2dbc9eec520de41c15ed35d864f5317c41b1e2f28fc10745773 SHA512 6ea6f94eae3de5f58110c4bda728cff83f22bd93f64e2451b0aeb211852d6cc8d4bce73745a28107a111cf8f1cebec4a31d0277bf18b97163d5ffbc594e32fd4
+EBUILD gimp-2.99.6-r1.ebuild 6811 BLAKE2B 51c8312fe6e6e8f4af8bdf2205e1280137ab32b599aa0c57d00d60eb34ec48f8a52d91b66188bbfd97c376d036d83e5290f6e425613e81041942be9663e96eca SHA512 63ad5d670e04875ac3b32a30d372a1441f4f448054c380f5da3f2c177b5ea1aaec77cb083a44b1a385e77d128d8641f4b22610fb007b881809f8b8c08be37d5a
+EBUILD gimp-9999.ebuild 6997 BLAKE2B 8e23f601c64acf308c35373c2277464819127c650a0a3ac525b6b223aaa94678f219896810726a557e952a40dd059d750859bd809f6062fd3c6e27938064f32b SHA512 63be8d9f35f412e98c9bc8548e55eb1337f8a16d18a4ee057cff7c63efddf617bcd62be8367b09cd58ddd871f0197368cea9249192b65abd5369c7824b4662f3
 MISC metadata.xml 577 BLAKE2B a8bfdc064608bf0bb4a2f81a5de928d7eb35da9eaf2db64198ca34ca8b2542116ed1f341fe822354fa60b8d447676eb892c38dc4093b4b9db16622fe9d64bba8 SHA512 12e030815c13bc253aa877c7da837e01f8d259a6297807c0543f05e21edb92fda38b3a54a064b4721172fcc3db9d0ed2ae580118d51f03fc37f6ac4bacde5154
diff --git a/media-gfx/gimp/gimp-2.10.22-r2.ebuild b/media-gfx/gimp/gimp-2.10.22-r2.ebuild
deleted file mode 100644
index 7da8cd3f7e7c..000000000000
--- a/media-gfx/gimp/gimp-2.10.22-r2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=dev-libs/atk-2.2.0
-	>=dev-libs/glib-2.56.2:2
-	>=dev-libs/json-glib-1.2.6
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.78
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.26:0.4[cairo]
-	<media-libs/gegl-0.4.28:0.4
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/lcms-2.8:2
-	>=media-libs/libmypaint-1.6.1:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:0
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	virtual/jpeg
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/gtk+-2.24.32:2
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.29.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.3.2:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( dev-libs/libgudev:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
-	sys-apps/findutils
-	>=sys-devel/gettext-0.19
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-	"${FILESDIR}/${PN}-2.99.2_fix_autoconf-2.70.patch"
-)
-
-src_prepare() {
-	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
-		--enable-default-binary
-
-		--disable-check-update
-		--disable-python
-		--enable-mp
-		--with-appdata-test
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-xmc
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prepend=gimp-org-
-	(
-		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
-			mv ${plugin}/{,${prepend}}${plugin} || die
-			mv {,${prepend}}${plugin} || die
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(ver_cut 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	# Remove gimp devel-docs html files if user doesn't need it
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/gtk-doc || die
-	fi
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.10.22-r3.ebuild b/media-gfx/gimp/gimp-2.10.22-r3.ebuild
new file mode 100644
index 000000000000..9552457f6c17
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.22-r3.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0/2"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=dev-libs/atk-2.2.0
+	>=dev-libs/glib-2.56.2:2
+	>=dev-libs/json-glib-1.2.6
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.78
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.4.26:0.4[cairo]
+	<media-libs/gegl-0.4.28:0.4
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19:=
+	>=media-libs/lcms-2.8:2
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:0
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.3.2:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl )
+	udev? ( dev-libs/libgudev:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.40.1
+	sys-apps/findutils
+	>=sys-devel/gettext-0.19
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+	"${FILESDIR}/${PN}-2.99.2_fix_autoconf-2.70.patch"
+)
+
+src_prepare() {
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--disable-check-update
+		--disable-python
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prepend=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || die
+			mv {,${prepend}}${plugin} || die
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(ver_cut 1-2)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/gtk-doc || die
+	fi
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.10.24-r1.ebuild b/media-gfx/gimp/gimp-2.10.24-r1.ebuild
new file mode 100644
index 000000000000..7465abeb55ff
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.24-r1.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=dev-libs/atk-2.2.0
+	>=dev-libs/glib-2.56.2:2
+	>=dev-libs/json-glib-1.2.6
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.86
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.4.30:0.4[cairo]
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19:=
+	>=media-libs/lcms-2.8:2
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:0
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.9.1:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl )
+	udev? ( dev-libs/libgudev:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.40.1
+	sys-apps/findutils
+	>=sys-devel/gettext-0.19
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
+
+src_prepare() {
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--disable-check-update
+		--disable-python
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable debug)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prepend=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || die
+			mv {,${prepend}}${plugin} || die
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(ver_cut 1-2)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/gtk-doc || die
+	fi
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.10.24.ebuild b/media-gfx/gimp/gimp-2.10.24.ebuild
deleted file mode 100644
index 7f0d8d959b43..000000000000
--- a/media-gfx/gimp/gimp-2.10.24.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=dev-libs/atk-2.2.0
-	>=dev-libs/glib-2.56.2:2
-	>=dev-libs/json-glib-1.2.6
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.86
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.30:0.4[cairo]
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/lcms-2.8:2
-	>=media-libs/libmypaint-1.6.1:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:0
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	virtual/jpeg
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/gtk+-2.24.32:2
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.29.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.9.1:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( dev-libs/libgudev:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
-	sys-apps/findutils
-	>=sys-devel/gettext-0.19
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-)
-
-src_prepare() {
-	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
-		--enable-default-binary
-
-		--disable-check-update
-		--disable-python
-		--enable-mp
-		--with-appdata-test
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-xmc
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable debug)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prepend=gimp-org-
-	(
-		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
-			mv ${plugin}/{,${prepend}}${plugin} || die
-			mv {,${prepend}}${plugin} || die
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(ver_cut 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	# Remove gimp devel-docs html files if user doesn't need it
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/gtk-doc || die
-	fi
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.10.28-r1.ebuild b/media-gfx/gimp/gimp-2.10.28-r1.ebuild
new file mode 100644
index 000000000000..834b51637a24
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.28-r1.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=dev-libs/atk-2.2.0
+	>=dev-libs/glib-2.56.2:2
+	>=dev-libs/json-glib-1.2.6
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.88
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.4.32:0.4[cairo]
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19:=
+	>=media-libs/lcms-2.8:2
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:0
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.9.1:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl )
+	udev? ( dev-libs/libgudev:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.40.1
+	sys-apps/findutils
+	>=sys-devel/gettext-0.19
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
+
+src_prepare() {
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--disable-check-update
+		--disable-python
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable debug)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prepend=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || die
+			mv {,${prepend}}${plugin} || die
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(ver_cut 1-2)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/gtk-doc || die
+	fi
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.10.28.ebuild b/media-gfx/gimp/gimp-2.10.28.ebuild
deleted file mode 100644
index 09172d13d44c..000000000000
--- a/media-gfx/gimp/gimp-2.10.28.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=dev-libs/atk-2.2.0
-	>=dev-libs/glib-2.56.2:2
-	>=dev-libs/json-glib-1.2.6
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.88
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.32:0.4[cairo]
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/lcms-2.8:2
-	>=media-libs/libmypaint-1.6.1:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:0
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	virtual/jpeg
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/gtk+-2.24.32:2
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.29.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.9.1:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( dev-libs/libgudev:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
-	sys-apps/findutils
-	>=sys-devel/gettext-0.19
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-)
-
-src_prepare() {
-	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
-		--enable-default-binary
-
-		--disable-check-update
-		--disable-python
-		--enable-mp
-		--with-appdata-test
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-xmc
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable debug)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prepend=gimp-org-
-	(
-		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
-			mv ${plugin}/{,${prepend}}${plugin} || die
-			mv {,${prepend}}${plugin} || die
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(ver_cut 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	# Remove gimp devel-docs html files if user doesn't need it
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/gtk-doc || die
-	fi
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.99.6-r1.ebuild b/media-gfx/gimp/gimp-2.99.6-r1.ebuild
new file mode 100644
index 000000000000..47068406091c
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.99.6-r1.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{8..10} )
+GNOME2_EAUTORECONF=yes
+VALA_MIN_API_VERSION="0.44"
+VALA_USE_DEPEND=vapigen
+
+inherit gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.99/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0/3"
+
+IUSE="aalib alsa aqua doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RESTRICT="!test? ( test )"
+
+# media-libs/{babl,gegl} are required to be built with USE="introspection"
+# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
+COMMON_DEPEND="
+	>=app-text/poppler-0.90.1[cairo]
+	>=app-text/poppler-data-0.4.9
+	>=dev-libs/atk-2.34.1
+	>=dev-libs/glib-2.62.6:2
+	>=dev-libs/json-glib-1.4.4
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.21:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.86[introspection,lcms,vala?]
+	>=media-libs/fontconfig-2.12.6
+	>=media-libs/freetype-2.10.2
+	>=media-libs/gegl-0.4.30:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gexiv2-0.10.10
+	>=media-libs/harfbuzz-2.6.5:=
+	>=media-libs/lcms-2.9:2
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.37:0=
+	>=media-libs/tiff-4.1.0:0
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-libs/cairo-1.16.0
+	>=x11-libs/gdk-pixbuf-2.40.0:2
+	>=x11-libs/gtk+-3.24.16:3
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.44.7
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.9.1:= )
+	javascript? ( dev-libs/gjs )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
+	lua? (
+		${LUA_DEPS}
+		$(lua_gen_cond_dep '
+			dev-lua/lgi[${LUA_USEDEP}]
+		')
+	)
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-2.3.0:= )
+	postscript? ( app-text/ghostscript-gpl )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+		')
+	)
+	udev? ( >=dev-libs/libgudev-167:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.30.3
+	>=dev-libs/appstream-glib-0.7.16
+	dev-util/gdbus-codegen
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.51.0
+	sys-apps/findutils
+	>=sys-devel/autoconf-2.54
+	>=sys-devel/automake-1.11
+	>=sys-devel/gettext-0.21
+	>=sys-devel/libtool-2.4.6
+	doc? (
+		app-text/yelp-tools
+		dev-libs/gobject-introspection[doctool]
+		>=dev-util/gtk-doc-1.32
+		dev-util/gtk-doc-am
+	)
+	vala? ( $(vala_depend) )
+"
+
+# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
+
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	use vala && vala_src_prepare
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
+
+		--enable-default-binary
+
+		--disable-check-update
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable doc gtk_doc)
+		$(use_enable doc g-ir-doc)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with javascript)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with lua)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with python)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with vala)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prepend=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || exit 1
+			mv {,${prepend}}${plugin} || exit 1
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		python_optimize
+	fi
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
+
+	_rename_plugins || die
+
+	if use doc; then
+		mkdir "${ED}/usr/share/gtk-doc/html/gimp3_g-ir-docs" || die
+		cp -r "${S}/devel-docs/g-ir-docs/html/"{gjs,python} "${ED}/usr/share/gtk-doc/html/gimp3_g-ir-docs/" || die
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.99.6.ebuild b/media-gfx/gimp/gimp-2.99.6.ebuild
deleted file mode 100644
index f44f9dad70b0..000000000000
--- a/media-gfx/gimp/gimp-2.99.6.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{8..10} )
-GNOME2_EAUTORECONF=yes
-VALA_MIN_API_VERSION="0.44"
-VALA_USE_DEPEND=vapigen
-
-inherit gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.99/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/3"
-KEYWORDS="~riscv"
-
-IUSE="aalib alsa aqua doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RESTRICT="!test? ( test )"
-
-# media-libs/{babl,gegl} are required to be built with USE="introspection"
-# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
-COMMON_DEPEND="
-	>=app-text/poppler-0.90.1[cairo]
-	>=app-text/poppler-data-0.4.9
-	>=dev-libs/atk-2.34.1
-	>=dev-libs/glib-2.62.6:2
-	>=dev-libs/json-glib-1.4.4
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.21:2
-	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.86[introspection,lcms,vala?]
-	>=media-libs/fontconfig-2.12.6
-	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.30:0.4[cairo,introspection,lcms,vala?]
-	>=media-libs/gexiv2-0.10.10
-	>=media-libs/harfbuzz-2.6.5
-	>=media-libs/lcms-2.9:2
-	>=media-libs/libmypaint-1.6.1:=
-	>=media-libs/libpng-1.6.37:0=
-	>=media-libs/tiff-4.1.0:0
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	virtual/jpeg
-	>=x11-libs/cairo-1.16.0
-	>=x11-libs/gdk-pixbuf-2.40.0:2
-	>=x11-libs/gtk+-3.24.16:3
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.44.7
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.9.1:= )
-	javascript? ( dev-libs/gjs )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
-	lua? (
-		${LUA_DEPS}
-		$(lua_gen_cond_dep '
-			dev-lua/lgi[${LUA_USEDEP}]
-		')
-	)
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-2.3.0:= )
-	postscript? ( app-text/ghostscript-gpl )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
-		')
-	)
-	udev? ( >=dev-libs/libgudev-167:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-lang/perl-5.30.3
-	>=dev-libs/appstream-glib-0.7.16
-	dev-util/gdbus-codegen
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.51.0
-	sys-apps/findutils
-	>=sys-devel/autoconf-2.54
-	>=sys-devel/automake-1.11
-	>=sys-devel/gettext-0.21
-	>=sys-devel/libtool-2.4.6
-	doc? (
-		app-text/yelp-tools
-		dev-libs/gobject-introspection[doctool]
-		>=dev-util/gtk-doc-1.32
-		dev-util/gtk-doc-am
-	)
-	vala? ( $(vala_depend) )
-"
-
-# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	use vala && vala_src_prepare
-
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
-
-		--enable-default-binary
-
-		--disable-check-update
-		--enable-mp
-		--with-appdata-test
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-xmc
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable doc gtk_doc)
-		$(use_enable doc g-ir-doc)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with javascript)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with lua)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with python)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with vala)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prepend=gimp-org-
-	(
-		cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
-			mv ${plugin}/{,${prepend}}${plugin} || exit 1
-			mv {,${prepend}}${plugin} || exit 1
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
-
-	_rename_plugins || die
-
-	if use doc; then
-		mkdir "${ED}/usr/share/gtk-doc/html/gimp3_g-ir-docs" || die
-		cp -r "${S}/devel-docs/g-ir-docs/html/"{gjs,python} "${ED}/usr/share/gtk-doc/html/gimp3_g-ir-docs/" || die
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 4dd4eac9daa1..1519df009bc8 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
 	>=media-libs/freetype-2.10.2
 	>=media-libs/gegl-0.4.30:0.4[cairo,introspection,lcms,vala?]
 	>=media-libs/gexiv2-0.10.10
-	>=media-libs/harfbuzz-2.6.5
+	>=media-libs/harfbuzz-2.6.5:=
 	>=media-libs/lcms-2.9:2
 	>=media-libs/libmypaint-1.6.1:=
 	>=media-libs/libpng-1.6.37:0=
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index cf2e0a42f89a..168e1a2985ae 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-font-viewer-40.0.tar.xz 175396 BLAKE2B 33e10646fe31f76696867c0c5e7a99385064f09049390adb78149141f906958a6f14c3e29a9fbbfe8c48879f4600963ec66e9753018d9d7d658f4111c6dad120 SHA512 c82044e6750494d693cf631abe7fb76c655b58965ccd1ca08f512f0e79c40e9f207997465908b99e5813f350ca05ea8e76f029be79f3008173c49f3c5a4ee23d
-EBUILD gnome-font-viewer-40.0.ebuild 697 BLAKE2B f3eb825761342d9df2fb6a0209d7ebd02c36759357364d0c6ece5b65bf0f7ca4ccc5bf04405c57c2052f61443b626b0c48ee8ea9b904f5d39850f1ff666c4c34 SHA512 e0352369afe9cb9c9de95663f1dc537fcccc80ba1f7e2ab478b0ca105b51a9463441ce4dab00f5de31dfc9c307c1bc16ed511d3464229b7a27c1863ca6817a8f
+EBUILD gnome-font-viewer-40.0-r1.ebuild 699 BLAKE2B 5a55f830912dd510f25383881ae27694ebc25ee361522b2ca5289969c3d63e1c68557477c0b8886c32869f7be587e9302dc7f64ca4f4e4f8996ddc60c03f13f5 SHA512 d82268dd1af89a786dce1184a394fb3a259a4a04f0e309424fa76bf029fc8801b8c876ff57cfa723621632995b4869f08a5c512a60f27328d7b884b9f47862bd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0-r1.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0-r1.ebuild
new file mode 100644
index 000000000000..3780d534f0b7
--- /dev/null
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson xdg
+
+DESCRIPTION="Font viewer utility for GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gtk+-3.24.1:3
+	>=gui-libs/libhandy-1.0.0:1=
+	>=media-libs/harfbuzz-0.9.9:=
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	gnome-base/gnome-desktop:3=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild
deleted file mode 100644
index 675a6dc9c8bc..000000000000
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson xdg
-
-DESCRIPTION="Font viewer utility for GNOME"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.24.1:3
-	>=gui-libs/libhandy-1.0.0:1=
-	>=media-libs/harfbuzz-0.9.9
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	gnome-base/gnome-desktop:3=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 291b47fedb41..2c885e5e02e6 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,11 +1,7 @@
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
 AUX graphviz-2.47.1-bashisms.patch 407 BLAKE2B 957817776e4ea7a0ae84a64d65c452e1bf632a1a10e18a62a47c238fef3a63aca9fe60c5a8749d63004b5a6a442b55870de201a546dfc8b40e43dd4f47e9aeae SHA512 035312d4910bd063bcffdfa3b921c6398614625381747611603fbeed4e1332e687ba7b12b86e18ffe6ae826ebb99a9916c3ee058a86a240126a230b6cd14242e
 DIST graphviz-2.47.1.tar.xz 23226336 BLAKE2B 7e9f8683ba3694ff34c589dee7f595694e3fb44fa14b3904d648e2f6effebcd725b3cbf09bdfbc25825a92a8fdb4a6cf988f7000997d0a6be065138585fc897a SHA512 4a49a14ca738058ced6ce6352b65137c34cd130525ab2b84a436d282b8b65ecfe7330a214e472e74cfa8e432b4574a746460daff0a4d292962c851fec341aefb
-DIST graphviz-2.47.3.tar.xz 23199524 BLAKE2B 450601995da7ea543c951a6abbdd08878b4698cc2b59105d16255950acaf4585e56102ab952e79dc422efcdcc86bc28eaa3e62731626b1a3ede97480f9aeb24b SHA512 3fd43e91471e4a55212a9fc48775e208aaf64d59b40613b964e7020753b23358ec06bca0d6901d616cbe7c031a2760e9783ddc03070e05bc138b5f1dcad28bc1
-DIST graphviz-2.48.0.tar.xz 23082516 BLAKE2B 07cf4e2d84d6f49ae10dca90ef22c9cc18efdb6b0e2527795db639b2b851cf1b5179d796ed982d2518ea797c9b657c1f5ab379db30d5e37feba4f4628ef5be51 SHA512 9aa4983c9c56e2e2b485fb44d6381fa8769fe836a8e7673a9211cd67171f81c3c534ea6627cfee6b9d9b1127b538ffacdd16ba74401ad531a0e47ec107000265
 DIST graphviz-2.49.0.tar.xz 23040392 BLAKE2B 74bc90e433c29662b292c0f086777648db4cded69b7640586647f46e3df46137044fa287d170a780e58f552289fec2d65e10def9ed68095bd4ec8efe9208f929 SHA512 5396b6cb4615ba509233a5a079956aef014245cac64635f01467dcb26e9d6e4b1d044110bc3a85132c747ba410597fa289bef3e503e84fa000c845e1e75c89b0
 EBUILD graphviz-2.47.1-r1.ebuild 7746 BLAKE2B b5dc9125734820998a498d3fd48a811e90b88fe4d36b9bd694ac3f2c7134a11ebaea8694a4b0d131f8f6991d009b489dd9cb1bac2f27d0d8afe728a6d1322608 SHA512 11f479ccf853fd1d2e93a8efdb9baf56b00daeb8a8964479faf5b1fc7d77e941187b40519c0b52d1470972878e5ba14954b056e998ca15a5dddb54b098d0af52
-EBUILD graphviz-2.47.3.ebuild 7951 BLAKE2B ada464b9d2de919aa94e14183ef41939e25f55901d2a0ecd72312ab4efb2973f125280f96f348b8bbcc9571a0c280546916d3aca7ac9ee04e84a15c500726bd9 SHA512 7bfa0a63a185548c5c2ed5689b572fa8bdf32c5fb5ff14e15e5f234abd86dfdf6ac3c078de480c77ff7632f28ffe88742498bbcfdaae71f569031dc161b76fb3
-EBUILD graphviz-2.48.0.ebuild 7723 BLAKE2B ef50d78f842cb9eca2b22a2fd014952a80fed033df693261bc1a2fa2b7b19de3e5b10e2713267c8305041f446ccfd2326dc8dd1559ae02bb974474e61d5dcec1 SHA512 f6f75eff167ea686fd0e8ea733545766c5f79611b289874573d4bb383aa343d33fb6f4417ad562edd04fe7ea7eed14380c1170fa34d9e5e98258087b913a4237
-EBUILD graphviz-2.49.0.ebuild 7689 BLAKE2B 969de8ab1319f368e3610d61ddc0cbe319922c88293e308ce995c96fb0994a8d46c5bac909684f9ced1882a97a11f0f54ff79ae833fbaa041d7cb482cc53b9c3 SHA512 5bca460d8bb2a7619774f138ad347ed8fcfbb9c1dc02a6681c8421272accfe39a06da8037089978d508fea0b3aaa2ae57f3dc0284c243d031a6d3e0b4f875817
+EBUILD graphviz-2.49.0.ebuild 7682 BLAKE2B 54530fcb2f1ada5fee4b62b5a67e88e2440dc9d3ae9f6606dcb1f31f8b6ea23e7b314123df00384f07e002976e00b971ab219bbc8c9e90ddbae8f03fca36436a SHA512 039a3fd73d3c4a33ce12cc251bf3a67bf7ddb76fcb746e4509bd9bf38b136965323f3360b049b4cc2e9a46ad9f0e384f1e0d05a4323b58ad967b440605420137
 MISC metadata.xml 2381 BLAKE2B 97971708021091d2d53c49f2f83751cea0aa7e2e0d4c5c9f09fc6e4c187bd23d1bf29b79b953e40601492365b2e592b2481946c53d15190c64a80aeeeffc3992 SHA512 6baa00b4838adda1093799bd773f242258bf0900c9b211336888c94a0c6d4f58d5749552cf0acea79329e0ebcf2f0cf63ae933fa13ed6497d94ea63f961b812f
diff --git a/media-gfx/graphviz/graphviz-2.47.3.ebuild b/media-gfx/graphviz/graphviz-2.47.3.ebuild
deleted file mode 100644
index cf00d300d517..000000000000
--- a/media-gfx/graphviz/graphviz-2.47.3.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
-# unfortunately upstream uses an "artifact" store for the pre-generated
-# tarball now, which makes predictable URLs impossible.
-SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
-
-REQUIRED_USE="
-	!cairo? ( !X !gtk !postscript !lasi )
-	pdf? ( cairo )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Requires ksh, tests against installed package, missing files and directory
-RESTRICT="test"
-
-BDEPEND="
-	sys-devel/flex
-	sys-devel/libtool
-	x11-libs/gdk-pixbuf:2
-	virtual/pkgconfig
-	doc? (
-		app-text/ghostscript-gpl
-		sys-apps/groff
-	)
-	guile? (
-		dev-lang/swig
-		dev-scheme/guile
-	)
-	java? (
-		dev-lang/swig
-		>=virtual/jdk-1.8:*
-	)
-	nls? ( >=sys-devel/gettext-0.14.5 )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )
-	tcl? ( dev-lang/swig )"
-RDEPEND="
-	>=dev-libs/expat-2
-	>=dev-libs/glib-2.11.1:2
-	dev-libs/libltdl:0
-	>=media-libs/fontconfig-2.3.95
-	>=media-libs/freetype-2.1.10
-	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
-	>=media-libs/libpng-1.2:0=
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libiconv
-	cairo? (
-		>=x11-libs/cairo-1.1.10[svg]
-		>=x11-libs/pango-1.12
-	)
-	devil? ( media-libs/devil[png,jpeg] )
-	gtk? ( x11-libs/gtk+:2 )
-	gts? ( sci-libs/gts )
-	guile? ( dev-scheme/guile )
-	java? ( >=virtual/jre-1.8:* )
-	lasi? ( media-libs/lasi )
-	pdf? ( app-text/poppler )
-	perl? ( dev-lang/perl:= )
-	postscript? ( app-text/ghostscript-gpl )
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
-	ruby? ( dev-lang/ruby:* )
-	svg? ( gnome-base/librsvg )
-	tcl? ( >=dev-lang/tcl-8.3:0= )
-	webp? ( media-libs/libwebp:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}"
-
-# Dependency description / Maintainer-Info:
-
-# Rendering is done via the following plugins (/plugins):
-# - core, dot_layout, neato_layout, gd , dot
-#   the ones which are always compiled in, depend on zlib, gd
-# - gtk
-#   Directly depends on gtk-2.
-#   needs 'pangocairo' enabled in graphviz configuration
-#   gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-#   Disabled, GTK-1 junk.
-# - glitz
-#   Disabled, no particular reason
-#   needs 'pangocairo' enabled in graphviz configuration
-# - ming
-#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-#   incomplete.
-# - cairo/pango:
-#   Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-#   needs cairo+pango,
-#   can make use of gnomeui and inotify support (??? unsure),
-#   needs libXaw for UI
-#   UI also links directly against libX11, libXmu, and libXt
-#   and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer broken on ~x86
-# - go (disabled)
-# - io (disabled)
-# - java (enabled via java) *2
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-#   sci-libs/gts can be used for some of these
-# - lefty:
-#   needs Xaw and X to build
-# - gvedit (via 'qt5'):
-#   based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-#   currently disabled -- it segfaults a lot
-#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
-#   with flags enabled at configure time
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch
-	"${FILESDIR}"/${PN}-2.47.1-bashisms.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# ToDo: Do the same thing for examples and/or
-	#       write a patch for a configuration-option
-	#       and send it to upstream
-	# note - the longer sed expression removes multi-line assignments that are extended via '\'
-	if ! use doc ; then
-		find . -iname Makefile.am \
-			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
-				-e '/^\(html\|pdf\)_DATA/d' || die
-	fi
-
-	# Nuke the dead symlinks for the bindings
-	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
-
-	# replace the whitespace with tabs
-	sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
-
-	# use correct version of qmake. bug #567236
-	sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" configure.ac || die
-
-	use java && append-cppflags $(java-pkg_get-jni-cflags)
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--enable-ltdl
-		--enable-gdk-pixbuf
-		$(use_with cairo pangocairo)
-		$(use_with devil)
-		$(use_with gtk)
-		$(use_with gts)
-		$(use_with qt5 qt)
-		$(use_with lasi)
-		$(use_with pdf poppler)
-		$(use_with postscript ghostscript)
-		$(use_with svg rsvg)
-		$(use_with webp)
-		$(use_with X x)
-		$(use_with X xaw)
-		$(use_with X lefty)
-		--with-digcola
-		--with-fontconfig
-		--with-freetype2
-		--with-ipsepcola
-		--with-libgd
-		--with-sfdp
-		--without-ming
-		# new/experimental features, to be tested, disable for now
-		--with-cgraph
-		--without-glitz
-		--without-ipsepcola
-		--without-smyrna
-		--without-visio
-		# Bindings:
-		$(use_enable guile)
-		$(use_enable java)
-		$(use_enable perl)
-		$(use_enable python python2)
-		$(use_enable python python3)
-		$(use_enable ruby)
-		$(use_enable tcl)
-		--disable-go
-		--disable-io
-		--disable-lua
-		--disable-ocaml
-		--disable-php
-		--disable-python
-		--disable-r
-		--disable-sharp
-		# libtool file collision, bug #276609
-		--without-included-ltdl
-		--disable-ltdl-install
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
-	emake DESTDIR="${D}" \
-		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
-		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
-		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
-		install
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/graphviz/demo || die
-	fi
-
-	# useless test binary, because upstream uses
-	# bin_PROGRAMS and not check_PROGRAMS, creates
-	# a spurious dependency on dev-libs/criterion
-	rm -f "${ED}"/usr/bin/command_line || die
-
-	find "${ED}" -name '*.la' -delete || die
-
-	einstalldocs
-
-	use python && python_optimize \
-		"${D}"$(python_get_sitedir) \
-		"${ED}"/usr/$(get_libdir)/graphviz/python3
-}
-
-pkg_postinst() {
-	# This actually works if --enable-ltdl is passed
-	# to configure
-	dot -c || die
-}
-
-pkg_postrm() {
-	# Remove cruft, bug #547344
-	rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
-}
diff --git a/media-gfx/graphviz/graphviz-2.48.0.ebuild b/media-gfx/graphviz/graphviz-2.48.0.ebuild
deleted file mode 100644
index 062047851a2e..000000000000
--- a/media-gfx/graphviz/graphviz-2.48.0.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
-# unfortunately upstream uses an "artifact" store for the pre-generated
-# tarball now, which makes predictable URLs impossible.
-SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
-
-REQUIRED_USE="
-	!cairo? ( !X !gtk !postscript !lasi )
-	pdf? ( cairo )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Requires ksh, tests against installed package, missing files and directory
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/expat-2
-	>=dev-libs/glib-2.11.1:2
-	dev-libs/libltdl:0
-	>=media-libs/fontconfig-2.3.95
-	>=media-libs/freetype-2.1.10
-	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
-	>=media-libs/libpng-1.2:0=
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libiconv
-	cairo? (
-		>=x11-libs/cairo-1.1.10[svg]
-		>=x11-libs/pango-1.12
-	)
-	devil? ( media-libs/devil[png,jpeg] )
-	gtk? ( x11-libs/gtk+:2 )
-	gts? ( sci-libs/gts )
-	guile? ( dev-scheme/guile )
-	java? ( >=virtual/jre-1.8:* )
-	lasi? ( media-libs/lasi )
-	pdf? ( app-text/poppler )
-	perl? ( dev-lang/perl:= )
-	postscript? ( app-text/ghostscript-gpl )
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
-	ruby? ( dev-lang/ruby:* )
-	svg? ( gnome-base/librsvg )
-	tcl? ( >=dev-lang/tcl-8.3:0= )
-	webp? ( media-libs/libwebp:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	sys-devel/libtool
-	x11-libs/gdk-pixbuf:2
-	virtual/pkgconfig
-	doc? (
-		app-text/ghostscript-gpl
-		sys-apps/groff
-	)
-	guile? (
-		dev-lang/swig
-		dev-scheme/guile
-	)
-	java? (
-		dev-lang/swig
-		>=virtual/jdk-1.8:*
-	)
-	nls? ( >=sys-devel/gettext-0.14.5 )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )
-	tcl? ( dev-lang/swig )"
-
-# Dependency description / Maintainer-Info:
-
-# Rendering is done via the following plugins (/plugins):
-# - core, dot_layout, neato_layout, gd , dot
-#   the ones which are always compiled in, depend on zlib, gd
-# - gtk
-#   Directly depends on gtk-2.
-#   needs 'pangocairo' enabled in graphviz configuration
-#   gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-#   Disabled, GTK-1 junk.
-# - glitz
-#   Disabled, no particular reason
-#   needs 'pangocairo' enabled in graphviz configuration
-# - ming
-#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-#   incomplete.
-# - cairo/pango:
-#   Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-#   needs cairo+pango,
-#   can make use of gnomeui and inotify support (??? unsure),
-#   needs libXaw for UI
-#   UI also links directly against libX11, libXmu, and libXt
-#   and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer broken on ~x86
-# - go (disabled)
-# - io (disabled)
-# - java (enabled via java) *2
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-#   sci-libs/gts can be used for some of these
-# - lefty:
-#   needs Xaw and X to build
-# - gvedit (via 'qt5'):
-#   based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-#   currently disabled -- it segfaults a lot
-#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
-#   with flags enabled at configure time
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# ToDo: Do the same thing for examples and/or
-	#       write a patch for a configuration-option
-	#       and send it to upstream
-	# note - the longer sed expression removes multi-line assignments that are extended via '\'
-	if ! use doc ; then
-		find . -iname Makefile.am \
-			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
-				-e '/^\(html\|pdf\)_DATA/d' || die
-	fi
-
-	# Nuke the dead symlinks for the bindings
-	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
-
-	# replace the whitespace with tabs
-	sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
-
-	# use correct version of qmake. bug #567236
-	sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" configure.ac || die
-
-	use java && append-cppflags $(java-pkg_get-jni-cflags)
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--enable-ltdl
-		--enable-gdk-pixbuf
-		$(use_with cairo pangocairo)
-		$(use_with devil)
-		$(use_with gtk)
-		$(use_with gts)
-		$(use_with qt5 qt)
-		$(use_with lasi)
-		$(use_with pdf poppler)
-		$(use_with postscript ghostscript)
-		$(use_with svg rsvg)
-		$(use_with webp)
-		$(use_with X x)
-		$(use_with X xaw)
-		$(use_with X lefty)
-		--with-digcola
-		--with-fontconfig
-		--with-freetype2
-		--with-ipsepcola
-		--with-libgd
-		--with-sfdp
-		--without-ming
-		# new/experimental features, to be tested, disable for now
-		--with-cgraph
-		--without-glitz
-		--without-ipsepcola
-		--without-smyrna
-		--without-visio
-		# Bindings:
-		$(use_enable guile)
-		$(use_enable java)
-		$(use_enable perl)
-		$(use_enable python python2)
-		$(use_enable python python3)
-		$(use_enable ruby)
-		$(use_enable tcl)
-		--disable-go
-		--disable-io
-		--disable-lua
-		--disable-ocaml
-		--disable-php
-		--disable-python
-		--disable-r
-		--disable-sharp
-		# libtool file collision, bug #276609
-		--without-included-ltdl
-		--disable-ltdl-install
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
-	emake DESTDIR="${D}" \
-		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
-		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
-		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
-		install
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/graphviz/demo || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	einstalldocs
-
-	use python && python_optimize \
-		"${D}"$(python_get_sitedir) \
-		"${ED}"/usr/$(get_libdir)/graphviz/python3
-}
-
-pkg_postinst() {
-	# This actually works if --enable-ltdl is passed
-	# to configure
-	dot -c || die
-}
-
-pkg_postrm() {
-	# Remove cruft, bug #547344
-	rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
-}
diff --git a/media-gfx/graphviz/graphviz-2.49.0.ebuild b/media-gfx/graphviz/graphviz-2.49.0.ebuild
index ba7c9fb7dc05..8e343b19cf4a 100644
--- a/media-gfx/graphviz/graphviz-2.49.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.49.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re
 
 LICENSE="CPL-1.0"
 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 ~x64-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 ~x64-solaris"
 IUSE="+cairo devil doc examples gtk gts guile java lasi lefty nls pdf perl postscript python qt5 ruby svg tcl webp X"
 
 REQUIRED_USE="
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 714e367b56d7..73fb3bfd5594 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,4 +1,4 @@
 DIST hugin-2020.0.0.tar.bz2 10371301 BLAKE2B f5092dfe3c61344f8b03e14dd85903ae6f5170989b6824578bd3350408d7a11be2c2f9cd83d030a3967b81e4125cf97af075d79136a93e06de3fac8901859c6d SHA512 4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
-EBUILD hugin-2020.0.0-r1.ebuild 2119 BLAKE2B e697eebaa7c6e6afba08e1edbb179dfc7db8fb60a7f8e07cfe749936f9f943d42b71b21fef88ce10f56050f905fe6c42e53fc989e4685274c6e38e4d476d7559 SHA512 051eb7eff33fb3eb73465d769de6a755c8c3c5136f7191969ec1ab1f84f641caa259dc049b901327121b6ac690492da43224e30a94e2a6373c8e9686fafa69b7
+EBUILD hugin-2020.0.0-r1.ebuild 2120 BLAKE2B c7227cd28ae5f565fd7d0c3a6d929bc6b97b3405dda05ee392556df5d2d093f73740795ea67465f573bcd8002e936483285c07be594d589bbfacd56772b346b4 SHA512 1d37c7a20063e174f15e23ad2a16cebf8a82c95b4114bd6a71e3e949beba1a61628f0775a8d4f434caf9ea0e5b4f410717f3701a89b23649dfcac361371b0586
 EBUILD hugin-9999.ebuild 2062 BLAKE2B 4a24726bf47c3ff2911c29cf6c8fe8fd3632c82ca54a1fe60c562ea3e202260c93e38d76b5ea6a1d934b3ff036019110ee15d45067e91effc43a3aafd426b56a SHA512 359170dfbae430c9210dc75945cc883eea5b7928d22ea191f9179674032a06a3d84bccbf28cefaaafca1dc7b91c1c14040f4c26dad6d0c48506fae41b6f1817c
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index 7c550810e7c9..e52816245c81 100644
--- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -30,7 +30,7 @@ CDEPEND="
 	media-libs/glew:=
 	>=media-libs/libpano13-2.9.19_beta1:0=
 	media-libs/libpng:0=
-	media-libs/openexr:=
+	media-libs/openexr:0=
 	media-libs/tiff:0
 	>=media-libs/vigra-1.11.0[openexr]
 	sci-libs/fftw:3.0=
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 23b5f3fd85fd..cd223260dc58 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,13 +1,13 @@
 AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5
 AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-452.tar.gz 38873698 BLAKE2B 3c9c5fc63533f9c94ff3425b8767bffacb20c435f7a904de1229ec3cb079d86009c971515461d55f947743c705b12eee798160cbae04f0c3af283666a82ac482 SHA512 5c0280ae80b9af32629f6a2bcab3466abd01eea502034ac2354e3efabfd7bbe5ae5582950a19d9f28019b993f847000aa194a0b810f4d32b143b24e589de9f66
-DIST hydrus-453.tar.gz 38880317 BLAKE2B 93b29d3c973aa583cb6dd32abf94df199aefa9c49137b8137e144a891fbdf9db1cdfb0ec4d378d35e0a07d488a94828bb261c26de3b61b5460d208921c56d194 SHA512 6da364c6f9de9f838d9b3dcc02107bd3d089fde420f4e04086f094e47246e6949c27791a816dc99659db77acad3ca8f7578dc16749eb8b13cfafd7b6c044f5a1
 DIST hydrus-454.tar.gz 38886940 BLAKE2B 38fe5b3483c13dfbf82e636be1e743bb6af6f340a86d5ea69f0e71f7452cd3506b076cf4d6f460e0a1896f0839be7494028a0cbb5f567001af025cd436cf5c45 SHA512 87971c45bc11e7eaba2e08255ca23600406124bd73d6d8d4800ec67135a0d74b5ca7fc8a8a159dbdc89f70702760469c8d719de11f5bf943f7679978a790c456
 DIST hydrus-456.tar.gz 38899003 BLAKE2B 03e575034f2b4234c7f9ed3d4da59a3f94e9e2871440548b192b0898fa7e5d73bf7ab07f91a380db6e884449d6d86df9aed313238f28e1b3c4d7ae4a8f7f00f4 SHA512 de16874aa714a7e3640a9673a1445049256a2a05122f57a8646fd375a295f229c8b262e8c7862bbc7257d8db84a9e4ddf03cf841af307bed30e174e8f159508a
-EBUILD hydrus-452.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
-EBUILD hydrus-453.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
+DIST hydrus-457.tar.gz 38915780 BLAKE2B 56506ba2098198f42593a061a79f7f6521597f057d87c07eb66b3a213111a46caaf1e167e9f49deaf3d3ffe6259105b6d19cca8fb8fbd0d1c708d796eea63394 SHA512 2a653f69928f4b65cdde332e7be52861527237a284a61ddd0536b6e1db40f91424e78953910dacf494d947a57086cbfbf9588fe638143f386910fb1d7ba1e484
+DIST hydrus-458.tar.gz 38922758 BLAKE2B 3339e44498a606664cd54357cf285f96eb4f146673d9991b9b0fb82bc961b31f4f47c9f27616251b610c4e28664a6b4753aa99713e50d93e79121270796b1408 SHA512 0f2c419012c683c163fd180662eb9d2eb5610a6d87c0cbd42be91dbdf6101e747ba0c6238d1574084a30d1da1c7546a79b0e648fe55420c510d47ab26fad28c3
 EBUILD hydrus-454.ebuild 4098 BLAKE2B a6b0a5817e577b1539d2b3a047f7253ba6bfe0babcf637f583daae1fe67b51da9350a846f27d04ca492e15e6de7a5a7375d0db31267fba89a52e3bba4690a5e7 SHA512 6be825a196983e5c4888e9a5877a48aea7119b300f068ac3961efc919e12bc8da60a413de8db277f7972765a3e32cec78b179fe6f17ac0596e31d97c7cbed53a
 EBUILD hydrus-456.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
+EBUILD hydrus-457.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
+EBUILD hydrus-458.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
 EBUILD hydrus-9999.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
 MISC metadata.xml 751 BLAKE2B 05dfcd30440ca7bc1375206469123c5bb93ff7fbb7612191faabee7abe87334bfb4f25db3291cd3a989264516c315eeb489eaac2c83c95b2436446966ba27880 SHA512 f2e7c839e4567355bb6ff1cdbf1355ab7a2fbf166a3f87ac7a8af92fc80efa7833010376317a38e2594a203be66bfcb3e0df9dc7346ac3d37d8466bb0368b50e
diff --git a/media-gfx/hydrus/hydrus-452.ebuild b/media-gfx/hydrus/hydrus-457.ebuild
index 0915a2ae5436..0915a2ae5436 100644
--- a/media-gfx/hydrus/hydrus-452.ebuild
+++ b/media-gfx/hydrus/hydrus-457.ebuild
diff --git a/media-gfx/hydrus/hydrus-453.ebuild b/media-gfx/hydrus/hydrus-458.ebuild
index 0915a2ae5436..0915a2ae5436 100644
--- a/media-gfx/hydrus/hydrus-453.ebuild
+++ b/media-gfx/hydrus/hydrus-458.ebuild
diff --git a/media-gfx/kgeotag/Manifest b/media-gfx/kgeotag/Manifest
index 59f9dba9d4e7..db0b83676041 100644
--- a/media-gfx/kgeotag/Manifest
+++ b/media-gfx/kgeotag/Manifest
@@ -1,4 +1,6 @@
 AUX kgeotag-1.0.0-libera.patch 1142 BLAKE2B 8a99a340f2542f23314034e7bf3a8f88e9b017651039953ebd5eaf7d370383295838ac9c7b1744b23068aad2565d007bb9a87fc40157027c194604f8819497d6 SHA512 aeef253e1953fa3af659f75044a37652c18adb5e44ced94515ed9d117224916698504022f3651828afd10e212f7481f884188d1f9ef4ab62132f4b12c1f9955e
 DIST kgeotag-1.0.0.tar.xz 266488 BLAKE2B ff69ad02fc72766c4c8aa08dedba681cc6d73bfb9004ae8f12282b3cd09bb074acba2231f41ce4693929c3506a89ff90666c01e0c333450fd827eeb787d48c46 SHA512 8696ffe67abbfa2cefdc78c0bfed6894b3e376323a291b64e0aaf6d11eb8f5f2fc5bf1335ebdebc0f5e9d1c99f1c45972c193f7b91e71c14b1da63d5d845811e
+DIST kgeotag-1.1.0.tar.xz 282436 BLAKE2B 8d59665bc56147f1b1177c15ee5e67823cbff1ede19abcfa2c9c6d8f514a72c5d92a8216920fdfdc58a0880d093b570d61f3ec273868059a1182b9f444affa4c SHA512 b849cd43118f05253352a5059f0c29a9e3db59602455f3413ec5bcbe9c4b72c1e695f077089a2fe048443c04ec31be07540d42ab1f055bb32b3b459da7f7911a
 EBUILD kgeotag-1.0.0.ebuild 857 BLAKE2B af7eec9e333b28f1a6f54031844f36ea8fac6a47ed357b19fd2c2dc17e023bb46e264051d8f1d304801175d160fc9fda35b6b86eb2aaa0db59c3ddc817785f9f SHA512 99c62cc1ddff70adbf4c406dacbb32dd54784376f0665d81290f6c9a756f152b3815e31b780a4cacf057833d519d5375054abb1d60fec9eb36b4e7b4258b2cb4
+EBUILD kgeotag-1.1.0.ebuild 837 BLAKE2B 07604082a7fce27aa8b1ec5c302aa9e3e823188ea70f86d73ab06b33519b967458ecba533f19aa4c3fde3f57cd71655805a0184546842f12273e0a8fd8aef8f5 SHA512 77df24a4a158919b9c860085d236d2c21b658a0073c67f84c5159949ca3a1227577627643b99228b5a3e702a87ff0034670702d49fa55934c75845344a8e6f4c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-gfx/kgeotag/kgeotag-1.1.0.ebuild b/media-gfx/kgeotag/kgeotag-1.1.0.ebuild
new file mode 100644
index 000000000000..2e4f29ade5e5
--- /dev/null
+++ b/media-gfx/kgeotag/kgeotag-1.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Photo geotagging program"
+HOMEPAGE="https://kgeotag.kde.org/ https://apps.kde.org/kgeotag/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="5"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	kde-apps/libkexiv2:5
+	kde-apps/marble:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog.rst README.md )
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 7cdb3075cc13..caedb68a9062 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,5 @@
 AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c
 AUX krita-4.4.2-quazip1.patch 1422 BLAKE2B 917bf30f1dc702276b524713b1ec01a4807f967bc974c0c9896e6972fc56554a4da954c690a0743a4d92d86e57d32028c809418cbf10b30294bf1412a1a08beb SHA512 7c55e371f4c6a5e6d3d275298bf22810b58cb845bf4abcdd3cecdd84cb228499c59e8f7e9902319009dc52ea4dde575de77668ab2d1e9cf076e8ffa6fba582b5
-AUX krita-4.4.5-pykrita-crash-on-exit.patch 1197 BLAKE2B bebb54df49f02056acc43232bcebf6c98a6e93fb7b28fdb6450ebc0b882f0fed13f24ab13b8227de99effea00ae29b7752b17bb07e1bec0a0fd9c4acbcc874f2 SHA512 bfa7cb10c8f81ac119bacfaaec7207a71a5cdd45cf53270f8edbd8164af790ee931b24f6caacf3c66e44a7984503b7c90b0bd80447e1fb2ed680da92893a76d1
 AUX krita-4.4.7-pykrita-crash-on-exit.patch 1583 BLAKE2B 077ebf5108badd615d9bc1086f2890a8f45506ca8cf0b5abf089b68e469200513f9be0a5516bad17b131e4afecc9560c8903ed6b1aaecd7c245a432ac8a2cd02 SHA512 44f023f49a0c5bfd895f65a013787bf2870b06fbba6fe292fb97c791b05965de176184d6a669225748848bc0ae1c7984d0c8dfaf3fd3ccf5ae0dbee953a08f92
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb SHA512 53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81
diff --git a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
deleted file mode 100644
index 12ebb2fa95a7..000000000000
--- a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 86a38621fbbf96edf489a0efd2b9c24c123e2051 Mon Sep 17 00:00:00 2001
-From: Dmitry Kazakov <dimula73@gmail.com>
-Date: Tue, 3 Aug 2021 11:57:33 +0300
-Subject: [PATCH] Disable finalizing of the PyQt to prevent crash on exit
-
-CCBUG:417465
----
- plugins/extensions/pykrita/plugin/plugin.cpp | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/plugins/extensions/pykrita/plugin/plugin.cpp b/plugins/extensions/pykrita/plugin/plugin.cpp
-index 028798e2f4..cc06c07fbe 100644
---- a/plugins/extensions/pykrita/plugin/plugin.cpp
-+++ b/plugins/extensions/pykrita/plugin/plugin.cpp
-@@ -89,11 +89,10 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &)
- 
- KritaPyQtPlugin::~KritaPyQtPlugin()
- {
--    // XXX: With Qt 5.14, this crashes Krita on exit. See https://bugs.kde.org/show_bug.cgi?id=417465
--    //      So, for now, we just don't call finalize...
--#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
--    PyKrita::finalize();
--#endif
-+    /// XXX: Don't call PyKrita::finalize here, because that can result in a crash
-+    ///      deep inside Qt. See https://bugs.kde.org/show_bug.cgi?id=417465
-+
-+    // PyKrita::finalize();
- }
- 
- #include "plugin.moc"
--- 
-GitLab
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index f0bf2b07237e..4f702c71cbae 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -3,5 +3,5 @@ AUX luminance-hdr-2.6.0-cmake.patch 855 BLAKE2B 2656ec16d554199a8cb0dca0df77ab71
 AUX luminance-hdr-2.6.0-docs.patch 948 BLAKE2B 5ac822b10ffc61c552292806adc3f5470a7f03a9b2df7ba385435904963e52af583a892762867abb6a76a5351ffbbf0ffbd67107310e84bab9b649cc33666e09 SHA512 2b242a558c3b734a653943f3128c4cbc2440f940407faa096505ac7abe945c729bd0b4c5e9d06f53141bdb1271b097d7de15e87cd31db75ef1e30839a64f32b0
 AUX luminance-hdr-2.6.0-no-git.patch 377 BLAKE2B 454a9973831aa3ba312926190a84622c8c3bd9481c67ece8ccf8916517f6b314931a09adf8a4168d8a1c7cd8a7694db27291009b9fae8a9cacc8356d32c7f5c3 SHA512 fba84a0415c8e514fb85b229adb29fbda238e8146d2dfff296d92fde33aeb22562e5ac98fed2422326354be9c0096cc2bd1b8947edfa9e7ca160d207ba0db476
 DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
-EBUILD luminance-hdr-2.6.0-r1.ebuild 2075 BLAKE2B 205d6c7414aa36307e4234f8468e490ee2559ee5c7d385a8d98a5448aa8526eddb76ffa4731f86e326ac9683f60de4ef1083bd2c98dffcde1c55a50798493bc2 SHA512 0836f498b93caac775cc9f91af799d4696e2cf50db72021c87c4a5114cddcc5344a490b9a411e1c29cb8e93764a2f095b3410afa726d8e5c8a91488b67769d28
+EBUILD luminance-hdr-2.6.0-r1.ebuild 2076 BLAKE2B d22e0e67e352a2ff518999534223694a383e087250372d9d8b4909f6536df2680fd6c82d98bfab197ebe3964527f6d8d7733026e42eeb7fe15032dd3f7f0ded0 SHA512 09de47154150b2e7cbf1407f64f20b9d673ff4dc2f67abdbc074b224a3901b05ca36bc78b99370dbe33c25b196d73c6582c6fc916586d507faace9f4fea9c0d8
 MISC metadata.xml 1272 BLAKE2B 08d1f2e217eaffcb4419532ed41ba963a971b343e2d0ff7f3718c9df23ac9ffd5299264d5a87b66451acd231965f135bdeebf3b91244e3d9e51763c818b317f9 SHA512 98f1fa351c3e0bc7e47b30263093408cbbebacf8e0eb23d780cd704f5ddfff3d6939aee4d18c06cd083d90dc8a68ea51995352ab1f15ce75b0585230a3f9cbc8
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild
index 6ad066bc4226..0a3b97a457c2 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ RDEPEND="
 	media-libs/lcms:2
 	media-libs/libpng:0=
 	media-libs/libraw:=
-	media-libs/openexr:=
+	media-libs/openexr:0=
 	media-libs/tiff:0
 	sci-libs/fftw:3.0=[threads]
 	sci-libs/gsl:=
diff --git a/media-gfx/pqiv/Manifest b/media-gfx/pqiv/Manifest
index 59e8fdf4cd78..5a7e3ae45ae2 100644
--- a/media-gfx/pqiv/Manifest
+++ b/media-gfx/pqiv/Manifest
@@ -1,4 +1,4 @@
 DIST pqiv-2.11.tar.gz 139825 BLAKE2B 981d472ccd3284b2e9ad3da8e84233c95555a927af797f8421ac820225d3d39cab2275f01269a986bab54994e0fce2095b7c33b1201e7a6117e1c8399617341b SHA512 6017a9d7ed332915a9f6fa788bb02c3b9d4d83c2ae2f9a8ab7d7738caa14ba3e9d253906f2e73fdfd368bb5e7bc51380ee9906fd9921e5f7f113811fd3da66f7
-EBUILD pqiv-2.11.ebuild 1728 BLAKE2B 232ba0e63bc478af137485dbe1868705f55c90d5ac0551682b25e6b63ac7c2087e778b06fdb09a786bd8ead5d662089b68b511a99a0db9ba843c5d1b75e6edd9 SHA512 3d57320d6c1daaf5ca59f2faf3b5676fbf31b753c79b57ca75b8e073ed115384f849deeafce5aae88d4a7c6044729293c0f7a3d16a1707a66aca2ab16b527146
+EBUILD pqiv-2.11.ebuild 1735 BLAKE2B 4807d79e856314ae9562de15bd7a13a985d651d3faa2fa5e5aff6f950fe716f2aeabc234cfb3dbf5d4c4143de8e5515fe94084e96771ad88e3ff6cc804171181 SHA512 f6b08179cc084a3ec3b9714c1158a804a3726509e8dabc13069f0a119135cd6a4760f4c15a63e24581ff72b82f7ea1aa5073f487cfa564102895f2c7ba70c82d
 EBUILD pqiv-9999.ebuild 1730 BLAKE2B 078594b0e5901d7d8657ebd799431aef03418d501df182fabee3f4a288fc402c8938280ad932026668322f82e2823ee6bf6fa1d46b940d1d6dad7acdfc385dfa SHA512 472c909163057c8f0063d14a15b8614ab3d7dcd0b8ceb205c97c679a2cccca3607e8188d2984003665b0ae458658047cd0ee7d6fafca68913bbe7e45b7a920e4
 MISC metadata.xml 488 BLAKE2B f2e983c8214ea274f0920a2f3449b1ed3cad7246a1ba60ea976063ee5f11d6a827d9be993cdaedcaeb1f86cfeaf6301e7826f60dafc4eebd5b10c5890cec9966 SHA512 45e5496e534774e3b892576823d37f49a6cb0486287b8a8149964cf513b524205b0abd4b04f644702c741f3c5ca495de26ddc150c212ca1ace67bb720e573859
diff --git a/media-gfx/pqiv/pqiv-2.11.ebuild b/media-gfx/pqiv/pqiv-2.11.ebuild
index bb2e9b03aec6..a339c0069333 100644
--- a/media-gfx/pqiv/pqiv-2.11.ebuild
+++ b/media-gfx/pqiv/pqiv-2.11.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=6
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="powerful GTK 3 based command-line image viewer with a minimal UI"
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index 44a9e337f0bb..e006c3d41574 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,4 +1,4 @@
 AUX pstoedit-3.75-libdl.patch 432 BLAKE2B 19d6b192c7fa1497f40baff8c039139248be34bbd7f1858e4731da4e631a46dfa8a7e5a9041a5e991a44fb049b0399fad763c65b9a27437d7bcd1d61631fd760 SHA512 010263020e07b57fdde3fa6478cf5865877d71d015a446d8111326d69ce7138467e384bb5f48baa149932a0c4a42d9a60552ff8616125cbc1dabf613cd78df79
 DIST pstoedit-3.75.tar.gz 1290057 BLAKE2B 607a265ea6f058e1ba432d55c4602452cd52a48302441ecee542a113d90b090ce888cc6fa5e3a8e3a2fdbf94dce9b1ab1f7f5ba58ab81f1f509eea9052a3cd82 SHA512 54b8cf7e78e52027d45e7550821476d9a9c4df4f63af83792b6a2909bc62236450ba6b619f95eede9f61a715f4937f1fbaf2ce4ae4b486daa0294c396a882a28
-EBUILD pstoedit-3.75.ebuild 1293 BLAKE2B f549f1af21a983957a6101676632123994fa7c57014ef76133f05bcfec37cd37d9c4e5d620688746fddad0577d4077406f5e4639253fa5d8b803f2e35932e2e4 SHA512 d01f29f8263591a0aee8996d17575163c4602f07443c855230da9323d998a068aabffb406d73e5bedd3268c407472da278c587cd6bdf0cc9222140ce188b1427
+EBUILD pstoedit-3.75.ebuild 1300 BLAKE2B 7614bc471896e99ac154c612bee2d111f10a1975b14268d81e2e6f894f062e718ec7d4e1f8d7fbaee5769b39c4a5fcd259c6f9c1337d27ea9bfffeec67c9c514 SHA512 47fa2e7eb1a7e6b893c9d5e6dedd93b451020dbd644e72c4d31cf091c092eade02005a8cd6341b37d391559bfe732b1773863d554bfa612922cf1563103b1e5d
 MISC metadata.xml 634 BLAKE2B ea6bd21397a45a3591572e803513b32361761a9872800027ab779c2a9f0e214db9e70dc9fed0acbf6dafe3769cd8525e21d2875e62f4b8711bfc03f38bc47214 SHA512 d8d509f442aee8fbb9036dab15fba870e18b8d6b0b120d3c82bb50e7d86379425f5b91161e4f37137f43710fd50ac2c8481b47b0dd5ab39654729a7280258465
diff --git a/media-gfx/pstoedit/pstoedit-3.75.ebuild b/media-gfx/pstoedit/pstoedit-3.75.ebuild
index c876af5e5c68..6469d052b2b6 100644
--- a/media-gfx/pstoedit/pstoedit-3.75.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.75.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,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="emf imagemagick plotutils pptx"
 
 BDEPEND="
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index ffcc43fc6101..b8708104a159 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,5 @@
-DIST ristretto-0.10.0.tar.bz2 586447 BLAKE2B 73e4be551879d58e0c43b7a039b3173e96df8a7c367bb1696dd27a6b20fc675465e6a78019e11498f0dc55286b605c7ab9545dd7d13e2607bc0fc05527947568 SHA512 1727025bbc056a71475d91505cc141661b011c3944cf4ca4d96b48a9ad7e1b28b8f4b0c856fa789cd2c877c1faa27aa57441e35e06f38fd2b81ddcd3284dc2b6
 DIST ristretto-0.11.0.tar.bz2 589169 BLAKE2B f1a0a28e7fdf83f05fc3b0a99f0c4ac0e48d07af3f9ff46f849e3768ce7b7978873cef8d028a74f5eff806cc0305d36c57e7ace99d56b61cc7acb3645e501161 SHA512 d38e3c488f106f5a060478e08fbba75fd0420fe1d1af40383118c9674f8acc079da6efdae4f41366d4cc8f34dce61e8eba89342e56747e697fd9c89b2689267f
-EBUILD ristretto-0.10.0.ebuild 874 BLAKE2B e07b94b57833859413826556f0b18150b2fada428c24b6fa33a57c1f0b4188bd2bc29ec1a3b2ead30d5b9c68192b4d29f62c11582e94322dcf8d0d5be8e40f92 SHA512 9d8917e11a0d27ba3f975c007b6e8661ce5cd2727b82990b80436495d34209df5d0e7f47581d1f53493524fd3898592f5322f829a4a634d0fe4b1c269acfcb1a
-EBUILD ristretto-0.11.0.ebuild 876 BLAKE2B e9a409488993ec8a2e8487013426c8009c4cab7e616f6ab969140d507ab56a7aa4fe02f1f122a8980d984bf36cabb4cc65d148e9c32c89fd34667421f709428b SHA512 2c5596d7b95c1ffb449814aff4887c321185b2d0c4ac7839be97e18fbef2108411fbf37257220698792259eca685d9754cbe9f22e6bf59623c567e85d1b902ca
+DIST ristretto-0.12.0.tar.bz2 600522 BLAKE2B 3af1c81ee881148b44637262aa45aec071b281be227a29a23d3baae10963e7bc328acd2ba875dd2ff2e3f3eed109e63f0af3d35f727237cd6f3ce54bcaa02495 SHA512 24782959f8560c6b3d78725b7bf99f61c5d4b16abb196d3b9d0fcc542de938ac1a26b0c76f5671149a1f1a9e0925e71b7000b1abc12e658470beb48cc51d5193
+EBUILD ristretto-0.11.0.ebuild 874 BLAKE2B 0b4d7463db35d79714c33d1f294d055e0940cdb1a6b65e5c1fee2e6b579c33aa35669616d90e3eac4fc8c2a4a8e2f8db14f2ce9d13927465aae3d2e90b8b7830 SHA512 02a09ed5cac0e73aa4317b2ab61f0fcd3430f0f524f60aa1255d4455e156de4c602d882b5fb708a7399fff9646961605d5a6a64442a574f20c3a21ce4cf5f659
+EBUILD ristretto-0.12.0.ebuild 886 BLAKE2B 116a3cb9f8cb99942e8e64f09f7918ed2c080be76a1d3fcb5da4d644368017377c1dcd3c2e4306954017a093e285cef76daf8a7a58b0fcd543399079544e890f SHA512 80e0d3625002b7da7b4f5f7adf815b5b21327740fb5ed57a73fa639083c9e72c1bdb5a9d5529af71c25e8830b5d2e41d63ea2fc8965574b34382f50666ab0a5b
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-gfx/ristretto/ristretto-0.10.0.ebuild b/media-gfx/ristretto/ristretto-0.10.0.ebuild
deleted file mode 100644
index 4377e583baec..000000000000
--- a/media-gfx/ristretto/ristretto-0.10.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A fast and lightweight picture viewer for Xfce"
-HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.42:2
-	media-libs/libexif:0=
-	sys-apps/file
-	x11-libs/cairo:0
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.10:0=
-	>=xfce-base/libxfce4util-4.10:0=
-	>=xfce-base/xfconf-4.12.1:0="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/ristretto/ristretto-0.11.0.ebuild b/media-gfx/ristretto/ristretto-0.11.0.ebuild
index ada9033aca5e..0023c6284f53 100644
--- a/media-gfx/ristretto/ristretto-0.11.0.ebuild
+++ b/media-gfx/ristretto/ristretto-0.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.42:2
diff --git a/media-gfx/ristretto/ristretto-0.12.0.ebuild b/media-gfx/ristretto/ristretto-0.12.0.ebuild
new file mode 100644
index 000000000000..9bc62d72c2bf
--- /dev/null
+++ b/media-gfx/ristretto/ristretto-0.12.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit xdg-utils
+
+DESCRIPTION="A fast and lightweight picture viewer for Xfce"
+HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.42:2
+	media-libs/libexif:0=
+	sys-apps/file
+	x11-libs/cairo:0
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libX11:0=
+	>=xfce-base/libxfce4ui-4.16:0=
+	>=xfce-base/libxfce4util-4.16:0=
+	>=xfce-base/xfconf-4.12.1:0="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index d3b3438c18ae..df9c2d98639e 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -10,5 +10,7 @@ AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST backends-1.0.31.tar.gz 5731445 BLAKE2B d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298 SHA512 d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb
+DIST sane-backends-1.0.32.tar.gz 7349442 BLAKE2B 8841542ffd520b38bbeb532eaae7cce803f0bd868cae7edc28d2138729dcffb5a2a0908b56c16c25ffbba539525331c12c259e1768e105de1bdd1419d29efe83 SHA512 416757d9a69bbc18678d1f16a024ba5a949c571204a68f36009d416be28723886ccea71daaa7da90d20eac9696cd44e567802d6c21c3fc5914b97213bbedb6d5
 EBUILD sane-backends-1.0.31-r2.ebuild 8554 BLAKE2B 20ef534583a3052e699693472bca958e49426353f6f1cf8e721690657c657e1411fcbf7c49ed28a84367afbd5e1f40a70bf3551a06d3d0e169b3dbdf6d89075e SHA512 690006aef47beaaad149199cef5ee694a6fa74913e30dc61d14aedd1558ef8e14f238e88d71c316a4c38f29f4e6a069f9ccd8508f5ec536864d192eb504105cf
+EBUILD sane-backends-1.0.32.ebuild 8378 BLAKE2B 77be0023958ecc1ab0d7b5540d64ddde7e47199a78d9f9dfdcb20a0b613b4734f80ce3ff3439956038f4beb05822ccaf91c1fee6124bb2ad780e058c760a4eb3 SHA512 bc66b785de5b525eaa37b80437a80b70b3353aedc86227ad74cfd8fdaa59919ba8801b5e5f8b73c55b25062cb8ea47b00728100b25ceb40f741d396ab29942e3
 MISC metadata.xml 267 BLAKE2B cf3ca2583acfc7c5d4b3e053cef4d72bf240aa58c54e8a0f72b9393ee8587bd587d4a88bad4b041cfd50d4465879ed546afa71b6e4570477b376a92ab47bb415 SHA512 d471748b0a9f7d7d4aca203c6bd1ff222f3faa455e7d1df2f8437a188922a40e3a656a5e20032256caf58d664e0f723e25055871e62d102e0c677264942b6fb1
diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
new file mode 100644
index 000000000000..36bb18f0a982
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
@@ -0,0 +1,352 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+# python-any-r1 required for a script in
+# backends/pixma/scripts/
+inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS=(
+	abaton
+	agfafocus
+	apple
+	artec
+	artec_eplus48u
+	as6e
+	avision
+	bh
+	canon
+	canon630u
+	canon_dr
+	canon_lide70
+	canon_pp
+	cardscan
+	coolscan
+	coolscan2
+	coolscan3
+	dc210
+	dc240
+	dc25
+	dell1600n_net
+	dmc
+	epjitsu
+	epson
+	epson2
+	escl
+	fujitsu
+	genesys
+	gt68xx
+	hp
+	hp3500
+	hp3900
+	hp4200
+	hp5400
+	hp5590
+	hpljm1005
+	hpsj5s
+	hs2p
+	ibm
+	kodak
+	kodakaio
+	kvs1025
+	kvs20xx
+	kvs40xx
+	leo
+	lexmark
+	ma1509
+	magicolor
+	matsushita
+	microtek
+	microtek2
+	mustek
+	mustek_pp
+	mustek_usb
+	mustek_usb2
+	nec
+	net
+	niash
+	p5
+	pie
+	pieusb
+	pixma
+	plustek
+	plustek_pp
+	pnm
+	qcam
+	ricoh
+	ricoh2
+	rts8891
+	s9036
+	sceptre
+	sharp
+	sm3600
+	sm3840
+	snapscan
+	sp15c
+	st400
+	stv680
+	tamarack
+	teco1
+	teco2
+	teco3
+	test
+	u12
+	umax
+	umax1220u
+	umax_pp
+	xerox_mfp
+)
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
+	case ${GBACKEND} in
+	# Disable backends that require parallel ports as no one has those anymore.
+	canon_pp|hpsj5s|mustek_pp|\
+	pnm|mustek_usb2|kvs40xx)
+		IUSE+=" sane_backends_${GBACKEND}"
+		;;
+	*)
+		IUSE+=" +sane_backends_${GBACKEND}"
+	esac
+done
+
+REQUIRED_USE="
+	sane_backends_escl? ( zeroconf )
+	sane_backends_kvs40xx? ( threads )
+	sane_backends_mustek_usb2? ( threads )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+SRC_URI="https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/${P}.tar.gz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+	acct-group/scanner
+	acct-user/saned
+	gphoto2? (
+		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dell1600n_net? (
+		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	sane_backends_escl? (
+		app-text/poppler[cairo]
+		|| (
+			net-dns/avahi[dbus]
+			net-dns/avahi[gtk]
+		)
+		net-dns/avahi[${MULTILIB_USEDEP}]
+		net-misc/curl[${MULTILIB_USEDEP}]
+	)
+	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	snmp? ( net-analyzer/net-snmp:0= )
+	systemd? ( sys-apps/systemd:0= )
+	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	v4l? ( sys-kernel/linux-headers )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
+	"${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
+	"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/sane-config
+)
+
+src_prepare() {
+	default
+
+	# Patch out the git reference so we can run eautoreconf
+	sed \
+		-e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
+		-e '/^AM_MAINTAINER_MODE/d' \
+		-i configure.ac || die
+	eautoreconf
+
+	# Fix for "make check".  Upstream sometimes forgets to update this.
+	local ver=$(./configure --version | awk '{print $NF; exit 0}')
+	sed -i \
+		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
+		testsuite/tools/data/html* || die
+
+	# don't bleed user LDFLAGS into pkgconfig files
+	sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
+}
+
+src_configure() {
+	# From Fedora
+	append-flags -fno-strict-aliasing
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# the blank is intended - an empty string would result in building ALL backends.
+	local lbackends=" "
+
+	use gphoto2 && lbackends="gphoto2"
+	use v4l && lbackends+=" v4l"
+	use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl"
+	local backend
+	for backend in ${IUSE_SANE_BACKENDS[@]} ; do
+		if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then
+			lbackends+=" ${backend}"
+		fi
+	done
+
+	local myconf=(
+		$(use_with usb)
+		$(multilib_native_use_with snmp)
+
+		$(multilib_native_use_with sane_backends_escl poppler-glib)
+		# you can only enable this backend, not disable it...
+		$(usex sane_backends_pnm --enable-pnm-backend '')
+		$(usex sane_backends_mustek_pp --enable-parport-directio '')
+	)
+
+	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then
+		myconf+=( sane_cv_use_libieee1284=no )
+	fi
+
+	# relative path must be used for tests to work properly
+	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
+	# that break in many ways, bug #636202, #668232, #668350
+	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
+	myconf+=(
+		--disable-locking
+		$(use_with gphoto2)
+		$(multilib_native_use_with systemd)
+		$(use_with v4l)
+		$(use_enable ipv6)
+		$(use_enable threads pthread)
+		$(use_with zeroconf avahi)
+	)
+	ECONF_SOURCE="${S}" \
+	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
+	BACKENDS="${lbackends}" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake VARTEXFONTS="${T}/fonts"
+
+	if tc-is-cross-compiler ; then
+		pushd "${BUILD_DIR}"/tools >/dev/null || die
+
+		# The build system sucks and doesn't handle this properly.
+		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
+			-I. -I../include -I"${S}"/include \
+			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
+			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
+		local dirs=( hal hotplug hotplug-ng udev )
+		local targets=(
+			hal/libsane.fdi
+			hotplug/libsane.usermap
+			hotplug-ng/libsane.db
+			udev/libsane.rules
+		)
+		mkdir -p "${dirs[@]}" || die
+		emake "${targets[@]}"
+
+		popd >/dev/null || die
+	fi
+
+	if use usb ; then
+		sed -i -e '/^$/d' \
+			tools/hotplug/libsane.usermap || die
+	fi
+}
+
+multilib_src_install() {
+	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
+		docdir="${EPREFIX}"/usr/share/doc/${PF}
+
+	if multilib_is_native_abi ; then
+		if use usb ; then
+			insinto /etc/hotplug/usb
+			doins tools/hotplug/libsane.usermap
+		fi
+
+		udev_newrules tools/udev/libsane.rules 41-libsane.rules
+		insinto "/usr/share/pkgconfig"
+		doins tools/sane-backends.pc
+	fi
+}
+
+multilib_src_install_all() {
+	keepdir /var/lib/lock/sane
+	fowners root:scanner /var/lib/lock/sane
+	fperms g+w /var/lib/lock/sane
+	dodir /etc/env.d
+
+	if use systemd ; then
+		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
+		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
+	fi
+
+	if use usb ; then
+		exeinto /etc/hotplug/usb
+		doexe tools/hotplug/libusbscanner
+		newdoc tools/hotplug/README README.hotplug
+	fi
+
+	dodoc NEWS AUTHORS PROBLEMS README README.linux
+	find "${ED}" -name '*.la' -delete || die
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		doins "${FILESDIR}"/saned
+	fi
+
+	newinitd "${FILESDIR}"/saned.initd saned
+	newconfd "${FILESDIR}"/saned.confd saned
+}
+
+pkg_postinst() {
+	optfeature "Epson-specific backend" media-gfx/iscan
+	optfeature "HP-specific backend" net-print/hplip
+
+	if use xinetd ; then
+		elog "If you want remote clients to connect, edit"
+		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
+	fi
+
+	if ! use systemd ; then
+		elog "If you are using a USB scanner, add all users who want"
+		elog "to access your scanner to the \"scanner\" group."
+	fi
+}
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index 942093bf3da8..e500820d8a3c 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,3 +1,3 @@
 DIST scour-0.38.2.tar.gz 99910 BLAKE2B 4273287b201ecea64cb2be666bb7de4fbadc3483935515de92ec8dfb39f3b856584e35ac877958efd798bb5840baba4fc4d40a376d2c9f3b0c52a679d7ded6df SHA512 a2c418e25283af399be032322b3af0c336c2392ba361681d4b133b64ebc441ac5beeed2b920f42316cef376c971b230681e306687786a875162d33b659d3fdeb
-EBUILD scour-0.38.2.ebuild 722 BLAKE2B 03409f6b1eb636c2e91332a9381b9910005a94f1faf1ee347f3b24c9a7a685d0f51e87ae0df0067e2bef7fc2a800fc3e6bcea6f495cd810bb471c7a5c9997f50 SHA512 bc76ea87a3b2e4fab6884c8b59c981214464eb9f89693a31b7f1c72c848f62e3c2d30145444503309fa5c1d2f8c5524f0e38a780ca5cd8b2368f485d2f1c3b9c
-MISC metadata.xml 194 BLAKE2B 52e2f299addb0e889c54f25eb300fc9ef4ae70672255d191c49f06f60d3e0a564f7dfb500aaeff99600bb12b9c3744e40b4db69601644e4221f442fd13296431 SHA512 049195acfd7f7fd614f142947dfa0ba848267c4dcfca30cd9d24a668b9416de2745a3a7fdc499c041403e2b28e7f9bf051a4c784e0b4c8585e53d3ed6e1e0e7b
+EBUILD scour-0.38.2.ebuild 621 BLAKE2B 6a2f9dd5b5a85de1d9f3aa7fe38fac6eda64aeef6332ab2e8762d4dcf33f18135fd4bd361d23d9bfd80fa2ed7166ff7a798a72b65e25da64e0c3bd582b3b8bfc SHA512 cafe74e84c706b40dafc8f5da74c45bb996be1ba0974a71cac4d52e8c9c19f7d3b648b8d6168af2f8f191fe4efdb08f8449198d04e32ed0abc036eb0d6e86ea7
+MISC metadata.xml 282 BLAKE2B 6620cd1197d43d2a968e882186c2e144bf20ee709d4f3c812cec56f48899477fda8fbdd7f198d5e2bc9e9a3b7e8f72b547013e31b6d0d2fdc6271dc7680d48e1 SHA512 41c21e7c62696f6a337d3ed21585284972244e0cbb6b92247a1f745e75ce1a901d4b290f0e99ac6f866f110c08d926375f107e4eabbae000c918fe9f939af2cd
diff --git a/media-gfx/scour/metadata.xml b/media-gfx/scour/metadata.xml
index 70c16c0f82d3..b229b50ca604 100644
--- a/media-gfx/scour/metadata.xml
+++ b/media-gfx/scour/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
   <!-- maintainer-needed -->
   <stabilize-allarches/>
+  <upstream>
+    <remote-id type="github">scour-project/scour</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-gfx/scour/scour-0.38.2.ebuild b/media-gfx/scour/scour-0.38.2.ebuild
index 79258e63799e..1aa5120da935 100644
--- a/media-gfx/scour/scour-0.38.2.ebuild
+++ b/media-gfx/scour/scour-0.38.2.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Take an SVG file and produce a cleaner and more concise file"
@@ -14,11 +13,8 @@ SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
 python_test() {
 	"${EPYTHON}" test_scour.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/media-gfx/sfftobmp/Manifest b/media-gfx/sfftobmp/Manifest
index 4c96d40a2a04..7c73ecff11e6 100644
--- a/media-gfx/sfftobmp/Manifest
+++ b/media-gfx/sfftobmp/Manifest
@@ -1,5 +1,6 @@
-AUX sfftobmp-3.1.1-gcc44-and-boost-1_37.patch 1351 BLAKE2B 00dc9e14b8742a7aaa16bff964d6c183c81856298b205df97c5028081046b6cb0b0687ef0a3649d3560f6a5eafab6e62f5e276d41afc70e57398917828482ece SHA512 bd92e0f3e6743941080319da764ce6bbdb0b8d0694a9e5dd113e3a64c0deb0a86ce33a9a9f306c8a2c75d08f6fb33c78c1fe60f36309acf9c6223ec02b158f5b
-AUX sfftobmp-3.1.2-boost_fs3.patch 538 BLAKE2B bb2ea6156f3572f2da8ffd2f2bfd55fa89afe99af3f358d56b978e98160bd7b90c72cae8490687fc0b9c0509f896f5c6a7bfe41677f42652d77d52860b56e46c SHA512 75158af4ff574fe5112e4057ce0c2bca2f49afaf63862c42add85b8ee8e843f0a08b8c3d9f658f999024643d95ffcd65085bcb0607213722eb021b102037872e
+AUX sfftobmp-3.1.1-gcc44-and-boost-1_37.patch 749 BLAKE2B 3bd8d52ed467c188f8b0545dfbce8be3d7093c25ba7c9882701751a6eef18c9e43d9b83979669457ef337d857866754be750de44ffe0482880275a7f294751b2 SHA512 ad6c0bf2a2c0c44ab9f7fe0226137061561b943d59167f9de0adc6d1998d1a938166a2120b24c6499466a310736310a5e05be8b7d4575ea1121d99604fc56cdb
+AUX sfftobmp-3.1.2-Wformat.patch 342 BLAKE2B 1e6db3a432fce740f34f2cb2a3f3662f59c0fedd84e6b63a1cc58dbf2f5d9e48858ad0f1e25e0a9b2ef493eec4cdc8587cb24430026ad3c51190ddaf2213e8b3 SHA512 afde9e1a0acabe7d4fa51b6a533f09afe93deb5c8015c1cb322849feb543ccd45bf0639a61928c6c8641a741b348e119528ba1a03d6c201d12b4be98d49eb85e
+AUX sfftobmp-3.1.2-boost_fs3.patch 542 BLAKE2B 032a3f526407bb7e4c94176b914b8dfc298a250b468322561e6f0fa9b37578cd8872717080469eb147bd7fab2c9239d8a06ce9e2b937b87899355aa231e3a459 SHA512 1829c9cbfef93e9a019c2b92aa60e45c9f32498fba15ceac456ccd0fa6244e92aa8dc2b5ddff3cf56ad01e7e7111f0553807b4faa94c3d1ddeb2ab7328c8c915
 DIST sfftobmp3_1_2_src.zip 121478 BLAKE2B fe5e09d358cfa75a45a05e780fcf8b3409ae9791882c8c4ab3fe99b078cade57a75751343c42a5d7764702ca32565e8c97d417e3c095c10a01b6fcd0f09f03b3 SHA512 3c460dcd60486954f792ecc8e864d109dabbae30b56a6ba4b3228a42dd489fd88793e4d93e2d032e6cd1c552bf5e217bc2afb3eae85a1a4e1db340f7761905b7
-EBUILD sfftobmp-3.1.2-r1.ebuild 776 BLAKE2B 57ddfa11e0f88cff41ce693309b478594a57e353504cd2476a527bc25ed977885683c32d764271babd15897b0fe3364ffb55942d3ca86d0395b8b9b4f20f577c SHA512 8c0a30b354a613cf39a404cab80a1c56b67e8d01f1617dbb4e53a23f8d63c86062b66dfc6584e9cb7a0fa395e573607e9e227c3819080ec8d558fc59b4a4c930
+EBUILD sfftobmp-3.1.2-r1.ebuild 827 BLAKE2B bdc6c0a4f3d12d1bdfdfe6bd018d773958722e40102a25c5306ce0805a7d344fb7d06f7061456231bc2ce90e86f1ab48054add8ee3b33506b3a1f82ab4be35ac SHA512 3f4e8e8c92c9b1fb214ffa13ddec3715a1ad8696327926428262c9f835d7277b3d904bace7fa5902b819312e0be339539deaaf393e450f4b64a06713abe043a9
 MISC metadata.xml 246 BLAKE2B 7c25526b9240c42e9e0b41a00848ca2311c8edf487c120d4bdb03b78e15f3e773c8437e037ee3000ad437d5d12b237b2fb09e6c151f0be7e1cbe06f448f07a70 SHA512 f0ff62e58d57dded6e30f61f7734cdc744f9a727a7e2435f225b38990217690713eb50dff49920235efa94547e9a6aab32ba5c3a599fd80689e0c4d841eaa043
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch
index 3ba832afaed6..226b717431de 100644
--- a/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.1-gcc44-and-boost-1_37.patch
@@ -1,8 +1,5 @@
-Only in sfftobmp3_1_1: Makefile.am.orig
-Only in sfftobmp3_1_1: Makefile.am.rej
-diff -ur sfftobmp3_1_1.orig/src/cmdline.cpp sfftobmp3_1_1/src/cmdline.cpp
---- sfftobmp3_1_1.orig/src/cmdline.cpp	2007-10-07 22:01:21.000000000 +0300
-+++ sfftobmp3_1_1/src/cmdline.cpp	2009-05-09 00:33:06.000000000 +0300
+--- a/src/cmdline.cpp
++++ b/src/cmdline.cpp
 @@ -35,6 +35,7 @@
  
  ---RCS-Info--------------------------------------------------*/
@@ -11,9 +8,8 @@ diff -ur sfftobmp3_1_1.orig/src/cmdline.cpp sfftobmp3_1_1/src/cmdline.cpp
  #include <vector>
  #include <cassert>
  #include <iostream>
-diff -ur sfftobmp3_1_1.orig/src/common.cpp sfftobmp3_1_1/src/common.cpp
---- sfftobmp3_1_1.orig/src/common.cpp	2007-10-07 22:01:20.000000000 +0300
-+++ sfftobmp3_1_1/src/common.cpp	2009-05-09 00:28:37.000000000 +0300
+--- a/src/common.cpp
++++ b/src/common.cpp
 @@ -49,6 +49,7 @@
  #include <sys/utime.h>
  #endif
@@ -22,9 +18,8 @@ diff -ur sfftobmp3_1_1.orig/src/common.cpp sfftobmp3_1_1/src/common.cpp
  #include <cassert>
  #include <iostream>
  
-diff -ur sfftobmp3_1_1.orig/src/Makefile.am sfftobmp3_1_1/src/Makefile.am
---- sfftobmp3_1_1.orig/src/Makefile.am	2006-10-24 23:14:19.000000000 +0300
-+++ sfftobmp3_1_1/src/Makefile.am	2009-05-09 00:27:42.000000000 +0300
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -3,4 +3,4 @@
  INCLUDES            =  -I$(top_builddir) -I$(top_srcdir)
  bin_PROGRAMS = sfftobmp
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-Wformat.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-Wformat.patch
new file mode 100644
index 000000000000..a7ab1c185751
--- /dev/null
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-Wformat.patch
@@ -0,0 +1,11 @@
+--- a/src/output.cpp
++++ b/src/output.cpp
+@@ -163,7 +163,7 @@
+   m_pFile->Write(acBuf, strlen(acBuf));
+   sprintf(acBuf, "%s", "# generated with SffToBmp\n");
+   m_pFile->Write(acBuf, strlen(acBuf));
+-  sprintf(acBuf, "%ld %ld\n", aWidth, aHeight);
++  sprintf(acBuf, "%u %u\n", aWidth, aHeight);
+   m_pFile->Write(acBuf, strlen(acBuf));
+ }
+ 
diff --git a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch
index f39d157e1972..7ae13855def7 100644
--- a/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch
+++ b/media-gfx/sfftobmp/files/sfftobmp-3.1.2-boost_fs3.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/425364
 
---- src/cmdline.cpp
-+++ src/cmdline.cpp
+--- a/src/cmdline.cpp
++++ b/src/cmdline.cpp
 @@ -264,14 +264,14 @@
    }
    do {
diff --git a/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild b/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
index 4f2ebeb017fe..1bc93102d377 100644
--- a/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
+++ b/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
@@ -1,37 +1,45 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools epatch flag-o-matic
+EAPI=8
+
+inherit autotools flag-o-matic
 
 MY_P=${PN}${PV//./_}
 
 DESCRIPTION="sff to bmp converter"
 HOMEPAGE="http://sfftools.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sfftools/${MY_P}_src.zip"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND MIT"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc x86"
-IUSE=""
 
-RDEPEND=">=dev-libs/boost-1.49
+RDEPEND="
+	dev-libs/boost:=
 	media-libs/tiff:0
 	virtual/jpeg:0"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.1-gcc44-and-boost-1_37.patch
+	"${FILESDIR}"/${PN}-3.1.2-boost_fs3.patch
+	"${FILESDIR}"/${PN}-3.1.2-Wformat.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.1.1-gcc44-and-boost-1_37.patch \
-		"${FILESDIR}"/${PN}-3.1.2-boost_fs3.patch
-	append-cppflags -DBOOST_FILESYSTEM_VERSION=3
+	default
 	eautoreconf
 }
 
+src_configure() {
+	append-cppflags -DBOOST_FILESYSTEM_VERSION=3
+	default
+}
+
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	dodoc doc/{changes,credits,readme}
 }
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 8ed3d2a89823..350221901b45 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -7,5 +7,5 @@ DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df
 DIST slic3r-1.3.1_pre20200824.tar.gz 2432288 BLAKE2B 37e767b6cb12909ea3a6411532103ea30500903cf3d6a221c2fa3d3109fb733db5d0cb0e9d0eec5033dad9acec2f89258242cdab316ea26392a8386097d9dd38 SHA512 fd7198f7c4a60911b2009f617d37485bf73964a626a53d02bd13baae963d28e74dc2f8314888e7c0fcacb389e0b481f3357c6ea595ac8f92d99f7a228c5cc2b7
 EBUILD slic3r-1.3.0-r4.ebuild 2744 BLAKE2B b6bf1e8b964ef877d3b11e02bc636265820a36dcacfa84a912fe5533511feb205e1ee91657da46ce73160279fb6cdc9a44c054edbbb2e6bf485c94382f80cd3f SHA512 353b0cb79919ad64ef7dd90d29372e9d7e796102b9759adf80bf7bd8f3bef82e2e4260083448d6568e07643f3e0c47f800f69996db231f58e99c83461756ae36
 EBUILD slic3r-1.3.1_pre20200824-r1.ebuild 2780 BLAKE2B 8f41a258bdbd10da0fd8479ca2752e45240a47f6b69c70825fda69f7ec938f4a1b28878041e548d095d541ce71ae506f7f0318b10fe8f359745aff157949a615 SHA512 da9e0ff4cf0207c5150d1d668390e4a6be172a090397f18d64acf2ae4579682cc4d7a2b43a2bd2c7110ef8fb44fc53a321a620ae487c0c1de257d50730787223
-EBUILD slic3r-9999.ebuild 2691 BLAKE2B b14a5b90f76f4fbad343e58c4e021aa9aa7cbc24266b186af3498fc11819f171fb113a96bc181163181e54afcd22e2468b44a2a55e215f5c832974a0e07ebe6f SHA512 0d369a847ba58c9f6cd732c3694974e6901a16c2cc05e793fe3c01f586fdc216117ca88168ce18e2a93fd98bf006245276c96814f6497a738d2647f3c3ba69e5
+EBUILD slic3r-9999.ebuild 2735 BLAKE2B 894915ab09547a131f4435a786202d06b30c039c88dcee170c0cbbe2409a213079c1b10bf8d9e4aaca69b4bc69e2aa95b0aff0cd5eb251fdd7d91c74c5e530b8 SHA512 9c825dc76c78a3aa48f7dbbffdd974cef17077b37558209daa3512aa0957abd1748a1e61a8e6b253835be2ccfdb166ffa93e5b1f64852d5956b15a200d9c9152
 MISC metadata.xml 977 BLAKE2B bc737e1255bc2204a44b1aee62c3e342a8ac0c4844279c5cf404f52f6f052c6da1fcd490fc12cfa5d2158f79dd921c9c6bd29a4b99d7c62ff77a55d4073666fe SHA512 f09ea6f44124ebc24aa0d009d48af8d40190fa0d1fd9c2935341ac84f4ae900619b9557718fc38f399fcbdbe42924afc4ff6fb4676e19b3a3bfec6a7e9f6d1a6
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index 16f8d66dac36..3d418fb61e12 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@@ -69,6 +69,9 @@ DEPEND="
 		virtual/perl-Test-Simple
 	)
 "
+BDEPEND="${DEPEND}
+	dev-perl/Module-Build
+"
 
 PERL_S="${S}/xs"
 
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 1b82b83765b2..9d4aa910353d 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1,6 +1,9 @@
 AUX xpaint-3.1.3-gentoo-prefix.patch 3605 BLAKE2B c513a72991ec83b99fc12d90c112c743a0fec456ae09ad77ecee887e67d2891efd200d8d08bad594472060515b56b02b9097951c5ad285ddfebd3d46acc4265a SHA512 d231237fa1512637c5448b1c8c7a1dcffa1383a0dd24f6606215643ce51932ef58e994bfbc3f24d3376acdd9cc06d713d453c643d4d00e9d00af0e011e55762d
 AUX xpaint-3.1.3-gentoo-qa.patch 1480 BLAKE2B 43b80854e8d0bb68566f86116444507852bf61807846ec97238a90fefc8a86f9be3978858c12af3278b787b14f805edb628327ae411b8b6fbdcd7530ee72cbd5 SHA512 cfa7057625f3086b573f9109a89f29e1cf17c15d253a0c903bd0f315e4aac3d8111df899ef98d0a3416486d81305f0a041f061985d31d435ccbd24b0fc5a57b3
 AUX xpaint-3.1.3-libtool-clang.patch 1434 BLAKE2B d89978f8c925a64fa62ff2a0788ed81ca5faee6a71afda069930a7381e2bb095bbad3c1236c3594532afc5441ef789bf6ea0571b4bb25065e2cbef7fdc52ebe3 SHA512 f4027619c4eda686953fc33c62518a7ef12db09e6160f5e038179aa06f64629d2ad28b373ec332fe3266fd7e15af77577b6a60cfdffb165afe1358519201c399
+AUX xpaint-3.1.4-gentoo-shared-lib.patch 503 BLAKE2B 12bae42eb3a119c8acb3c5a6436191bf65c9697f6d743531633f0d64f5cdb26270f659eb0725a26efcc780cc06f91cf7f4e4f5032cf72f21614f3f7e48615b25 SHA512 971fb77386f2a896605d05346c4cf65fd68bdcc7b2f82e1319059f1c4ac37b0d76585c8ff0ce6d5841639bd94b420ac29b2e5275fe9309b31549cc540f2a9833
 DIST xpaint-3.1.3.tar.bz2 1656489 BLAKE2B c6f5ed4a6c990dccacc572c834fabf68a16cacfde477915e5c3598a96335a899344d4375a48e6bf06fb601e9b260a11cc2b43afb404a83b9fb7b3044288ce1fa SHA512 8ef15d6af4b65d9da18d3e5eb9eacc0b42e718d069e20de91f2e0352b642d0a4b7626a2008fdd6217c0668ed1ecdc7a09c4a993a6074c77b7899b4613c1c4bda
+DIST xpaint-3.1.4.tar.bz2 1630009 BLAKE2B 6090156f0c27742487edfd24e803e814d7f2801c3847a5435a896e575ee3bf0b17f498e8ba8f4b7a87536780dd7c15ec7e0c0e0acb28b225d95ed0c835abfa97 SHA512 ea81f0f0eaad2072fe487efba933b6f0a4f2a4d8ae7548169b8e765cf1232c9944149a822173350af91309535d8f3625b8e58814811a5f4491fa3e2fcdf92e1d
 EBUILD xpaint-3.1.3.ebuild 1941 BLAKE2B 5e739c74c5341e48c973cb0786b96f56724ea602cf463855d2e587ce67a5437620585bfa84b8b6de2707c882453c43e3f1181e3f76fae69ad6ca73725d60caf4 SHA512 3b073c54cc13783430d34d6777eab200953dff07d01c529fc6ba1a5ff21de390a98758b588388fcc217c06783f335033f2de71275961b5563d68aa231fdc7dbf
+EBUILD xpaint-3.1.4.ebuild 1833 BLAKE2B e0059015e593960e104a5270bc7122d51c4b0589cdc0d6bb3c617b3b0845de5b7a0a92c09d12fff5abe813646622307edfa5e67f1c87da6c0a9e2d152c131963 SHA512 afb301b6c6e0c93cb1157acfbdf91f7240d786e36a06319a41cba49c438597832dff70bc66380903a155fc77f33bf5d08fcceb7665ab4c434c0adf6dfa303a3d
 MISC metadata.xml 1440 BLAKE2B 54c11ed5ec99921d5ff28f23ee6be2df1fb2d21b3a994c92a94f0edfb2b69116620767bb51811c095736c1f1a7fb4205d6f1971997d81ca9f3c17c6c394d3068 SHA512 34c889965c22aa055b0205d0f93b45f51572958bf0ac992a781a3a5c679303081c368e4af35fa4c4699e8ac4724e125b4048b2d2856c408092cd4c7859728880
diff --git a/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-shared-lib.patch b/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-shared-lib.patch
new file mode 100644
index 000000000000..b05500ea6f75
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-shared-lib.patch
@@ -0,0 +1,15 @@
+xpaint was compiling and installing a shared library but it was not using it, linking with the static one instead
+This patch attempts to link with libxpaintrw.so instead
+So we can pass --disable-static to configure
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -79,7 +79,7 @@
+ 
+ xpaint_SOURCES = $(BASE_HDRS) $(BASE_SRCS)
+ 
+-xpaint_LDADD = xpaintrw/.libs/libxpaintrw.a @X_LIBS@ @X_LIBS_EXTRA@
++xpaint_LDADD = -Lxpaintrw/.libs -lxpaintrw @X_LIBS@ @X_LIBS_EXTRA@
+ 
+ docs: INSTALL README TODO ChangeLog
+ .PHONY:
diff --git a/media-gfx/xpaint/xpaint-3.1.4.ebuild b/media-gfx/xpaint/xpaint-3.1.4.ebuild
new file mode 100644
index 000000000000..64e86898d496
--- /dev/null
+++ b/media-gfx/xpaint/xpaint-3.1.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop toolchain-funcs xdg-utils
+
+DESCRIPTION="Image editor with tiff, jpeg and png support"
+HOMEPAGE="http://sf-xpaint.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pgf tiff"
+# jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	media-libs/netpbm
+	x11-libs/libX11
+	>=x11-libs/libXaw3dXft-1.6.2h[unicode]
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	pgf? ( media-libs/libpgf )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.3-libtool-clang.patch
+	"${FILESDIR}"/${PN}-3.1.3-gentoo-qa.patch
+	"${FILESDIR}"/${PN}-3.1.3-gentoo-prefix.patch
+	"${FILESDIR}"/${P}-gentoo-shared-lib.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tiff) \
+		--disable-libdvipgm \
+		--disable-libopenjpeg
+}
+
+src_compile() {
+	# clean up
+	emake clean
+	emake -C util clean
+
+	# parallel make still fails sometimes
+	emake substads
+	emake xpaint.1
+
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		includedir="${EPREFIX}"/usr/include \
+		-C util
+}
+
+src_install() {
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		DESTDIR="${ED}" \
+		-C util install
+	doicon icons/xpaint.svg
+	make_desktop_entry "${PN}"
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 0d2bf8e804dc..f215a25b6965 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/cal3d/Manifest b/media-libs/cal3d/Manifest
index e120ecc9ea09..41decbaeda23 100644
--- a/media-libs/cal3d/Manifest
+++ b/media-libs/cal3d/Manifest
@@ -1,7 +1,8 @@
-AUX cal3d-0.11.0-gcc43.patch 269 BLAKE2B 931141ed133a3e48a0473844d8d52e33ff76b6721cb81d050b90730f0d8b37d09d124b8f86b6caee099302bb6b90e397a7432579b24f4dba76c25610ff9cf2c8 SHA512 daf0d3621e20ed47d24270e526ddac8059c2f13da37d7f9f9c4e3edad60ae4d8ab94a132179a42505b5164ce12e37cd96ec77e3128087f73625a53c396d18cda
-AUX cal3d-0.11.0-gcc6.patch 19938 BLAKE2B bb2cd317a004e33fdcd9a1d73f563a933b7b4ae42566f0d3891ac75ea9f5362d7edfa4b58ea8d5f45bd8e65f12c77666558d6d4eec98f240db02f983cba6ce02 SHA512 6779ff0315b333cc10dde49eea2c84f8c985314618d6188b0dd8be63a195071103cc60f6492a7b5c60f8aef7deb0765fb10ee49c5b666f29d895d1b650476fd7
-AUX cal3d-0.11.0-tests.patch 352 BLAKE2B af4d33ccb48a89c45e3de3dab7860ff3a60e29756681b63a0da9c886591ebc6e7cb41caacdd5bb5f477b65edb4d3f7ad147b224eb8309a546187606a5ae8cd9b SHA512 bf605596206935d7882ee878e6fd1bb42e474f2c59f5bb76e8f8f92c606fa7258271eabd14fa30793aee6cb55dd95fb8592ddf7895f513363c22d91d80099857
-AUX cal3d-0.11.0-verbose.patch 503 BLAKE2B 8efdf4a56cd1430b9632f9ba85172024f700afea081b896bfcd50fc126a85748b5fdf53dfee1d9b2c4b8a8d43593bb68c733b3c1b7ef15c52bf7b75eb1d84fb2 SHA512 e0dc8a17b644012f4c291d9ba667ba6c7c8c3f34491f35490ab92573c137d1a6a1d1bf88c846b457a0310aff1aef27eabbf8c92b8477685b5828930f68416793
+AUX cal3d-0.11.0-docbook2html.patch 664 BLAKE2B a91108ab140b5e2284ef281175deeffb311eb36822bb30a5bd49449716f74c7cdaff13efdcb6800f1ab88993a2d9871778e4f0750c2730ae4cc21ef9d9bcdfbe SHA512 cead9ddc48045d9e59559a48a4266731aa02171b9d595981079a8bdeaaa60394092fa37ef675d15eced70d6aeec2238760e11080dead79bac3e956f959fc3577
+AUX cal3d-0.11.0-gcc43.patch 197 BLAKE2B ff12f3ac6aa32b68d848b137522c78356d4ee27c1709770d138ec4b1a9523cb083677489f140a8490913c4dee7832429c137b6e1094801041af158930a7674f7 SHA512 1a12756bccb20855a5761f16a01891b2182521e3c24f04eda2835fec02d2eea5509a084298c82aaf0b5c21bc1a37d10bcb9cafd3933792d196b06d1c357b77e0
+AUX cal3d-0.11.0-gcc6.patch 19840 BLAKE2B f5534040342c07174b0ff26a730331c390a036f9b6a628eabd59d329b263129512b924745bf1e4f6aa738cffeb2ea57d961ba08017a922ed19282cb85647fe1d SHA512 f6dda6218790d6361d2e518da3c8612af2d42b4ee26e68a88c263ce486b30efd762520a95cca5e37fe4976d1c57c3eca27f9692119667e29fc16f2b2ac0f09c3
+AUX cal3d-0.11.0-tests.patch 280 BLAKE2B f5216a9ed24ea1596252ec7f321cd18d2c90f45380852826e6cd331703c9891e508f918a00bd6918c7c203f334df42fc23c944c375c750be55bb0b225a0e116e SHA512 552f2ce605302b870431d3efabeabcfded91866d91675121047228d02668780e7446f704a18fbcdf8b4d5b8348a208e763c570b5d48eaac6a72f2db47b9385c2
+AUX cal3d-0.11.0-verbose.patch 431 BLAKE2B bf2e2fd9b60ed276846681b96a1c972783306a128f8075065f46d6a2cfe2a82d56bec948114e75b9ef445f9594b855c9142f0e9c07b8116a2fd811a70906c585 SHA512 38ff9b00458162fce21f66a2a0dd117af31bfb16a1cfe1357516261a63b86acc4ee5d399b0e620289796d27c5af9773240ae156c2d26ae67b691603c48183581
 DIST cal3d-0.11.0.tar.gz 568532 BLAKE2B 6730b9d623c9fa3dddb9f90d3cdcfc70a80ea1d2decb3bc5e8e3137142565c2fa570512b59c807996c6dfb04edc92f21301aaffa064bd41e6de7809223167ccd SHA512 4dc4b36b8f18760bfe6f8c80cbd941c14e2ebe596d0cd514fdb1ae4175bf2706e125665272d67ff21d33bb4b34e7be22bad9c00d488c1da21f442550bf3f204f
-EBUILD cal3d-0.11.0-r1.ebuild 1115 BLAKE2B 860ffda2c31fd870836316c7bee4ac53a9df77235022d21996338f08792b632cdd2e2fbdebe3af8404deb765d728180aea1b20a3ac67086c733443236f3c37a2 SHA512 bb0316247908249e371c802750fb3d4b4d9edc8534db3c451d17418fca5a9f30fb4ccdd481d8680dddd7667befbe4fd6917bc1403e91f69543d0057f5ebd953a
+EBUILD cal3d-0.11.0-r1.ebuild 1026 BLAKE2B 0dbb6aa211d1c82e402771cd011c31045911d4daf2bfca58cabf2213986d6c48b71b05e57fbcabc9371ef634a010c4c36a107fa741b231917fd21877a8602103 SHA512 a922094faa70452bcd2b82039ee431794a47f80b2c2636cf03923d1f22d170f755bb65068a7b1fed450775ad1dcaec93cd1648ae19bb3f01aa83ce32c67de999
 MISC metadata.xml 253 BLAKE2B 3c0e9c3c5f281d6e4e4325ed00c0ba65d7a882e798f5c18d02520dec99a494bfc8912036d4078540a86ea5f9107c579c89629f641b6dbc6f9440d2ee695bbc22 SHA512 81b82ada4d8d565c3aab65dbc79585e73f41736714c37100524ef624a42cb51329bd5430f41e701fc261f68b7266c2d2873c2029be777eb1cfb1d093a3413b02
diff --git a/media-libs/cal3d/cal3d-0.11.0-r1.ebuild b/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
index 4ed4f9c971d4..14ba7aa6fe82 100644
--- a/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
+++ b/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit epatch autotools
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="Cal3D is a skeletal based character animation library"
-HOMEPAGE="http://home.gna.org/cal3d"
+HOMEPAGE="https://mp3butcher.github.io/Cal3D/"
 SRC_URI="http://download.gna.org/cal3d/sources/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -13,23 +14,22 @@ SLOT="0"
 KEYWORDS="amd64 ~ia64 ppc x86"
 IUSE="16bit-indices debug doc"
 
-DEPEND="doc? (
+BDEPEND="
+	doc? (
 		app-doc/doxygen
 		app-text/docbook-sgml-utils
 	)"
-RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-tests.patch
+	"${FILESDIR}"/${P}-verbose.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-docbook2html.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-	    "${FILESDIR}"/${P}-tests.patch \
-	    "${FILESDIR}"/${P}-verbose.patch \
-	    "${FILESDIR}"/${P}-gcc6.patch
-	sed -i \
-		-e "s:db2html:docbook2html:g" \
-		configure.in \
-		docs/Makefile.am \
-		|| die "sed for doc failed"
+	default
 	eautoreconf
 }
 
@@ -41,17 +41,14 @@ src_configure() {
 
 src_compile() {
 	emake
+
 	if use doc; then
-		cd docs
+		cd docs || die
 		emake doc-api
 		emake doc-guide
-		mkdir -p html/{guide,api}
-		mv *.{html,gif} html/guide/
-		mv api/html/* html/api/
+		mkdir -p html/{guide,api} || die
+		mv *.{html,gif} html/guide/ || die
+		mv api/html/* html/api/ || die
+		HTML_DOCS=( docs/html/api docs/html/guide )
 	fi
 }
-
-src_install() {
-	default
-	use doc && dohtml -r docs/html/api docs/html/guide
-}
diff --git a/media-libs/cal3d/files/cal3d-0.11.0-docbook2html.patch b/media-libs/cal3d/files/cal3d-0.11.0-docbook2html.patch
new file mode 100644
index 000000000000..2e3e88e318eb
--- /dev/null
+++ b/media-libs/cal3d/files/cal3d-0.11.0-docbook2html.patch
@@ -0,0 +1,25 @@
+--- a/configure.in
++++ b/configure.in
+@@ -50,9 +50,9 @@
+   AC_MSG_WARN([cannot find doxygen, unable to generate Cal3D API Reference!])
+ fi
+ 
+-AC_CHECK_PROG(DB2HTML, db2html, true, false)
++AC_CHECK_PROG(DB2HTML, docbook2html, true, false)
+ if test "$DB2HTML" = false; then
+-  AC_MSG_WARN([cannot find db2html, unable to generate Cal3D User's Guide!])
++  AC_MSG_WARN([cannot find docbook2html, unable to generate Cal3D User's Guide!])
+ fi
+ 
+ AC_PATH_PROG(BLENDER, [blender])
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -18,7 +18,7 @@
+ 	doxygen cal3d.doxygen
+ 
+ doc-guide:
+-	db2html guide.sgml
++	docbook2html guide.sgml
+ 
+ clean-local:
+ 	rm -rf guide guide.junk
diff --git a/media-libs/cal3d/files/cal3d-0.11.0-gcc43.patch b/media-libs/cal3d/files/cal3d-0.11.0-gcc43.patch
index 80d73b274742..6f5bad7293ea 100644
--- a/media-libs/cal3d/files/cal3d-0.11.0-gcc43.patch
+++ b/media-libs/cal3d/files/cal3d-0.11.0-gcc43.patch
@@ -1,5 +1,5 @@
---- src/cal3d/platform.h.old	2008-04-27 23:08:41.000000000 +0200
-+++ src/cal3d/platform.h	2008-04-27 23:08:56.000000000 +0200
+--- a/src/cal3d/platform.h
++++ b/src/cal3d/platform.h
 @@ -77,6 +77,7 @@
  // standard includes
  #include <stdlib.h>
diff --git a/media-libs/cal3d/files/cal3d-0.11.0-gcc6.patch b/media-libs/cal3d/files/cal3d-0.11.0-gcc6.patch
index 98fc546eace1..f17d063e935b 100644
--- a/media-libs/cal3d/files/cal3d-0.11.0-gcc6.patch
+++ b/media-libs/cal3d/files/cal3d-0.11.0-gcc6.patch
@@ -1,5 +1,5 @@
---- cal3d-0.11.0/src/cal3d/loader.cpp.old	2016-09-24 00:58:09.968689367 -0400
-+++ cal3d-0.11.0/src/cal3d/loader.cpp	2016-09-24 01:06:54.867068386 -0400
+--- a/src/cal3d/loader.cpp
++++ b/src/cal3d/loader.cpp
 @@ -886,7 +886,7 @@
    if(!dataSrc.ok())
    {
diff --git a/media-libs/cal3d/files/cal3d-0.11.0-tests.patch b/media-libs/cal3d/files/cal3d-0.11.0-tests.patch
index 3a6754f40155..d676d86f2d9d 100644
--- a/media-libs/cal3d/files/cal3d-0.11.0-tests.patch
+++ b/media-libs/cal3d/files/cal3d-0.11.0-tests.patch
@@ -1,5 +1,5 @@
---- tests/Makefile.am.old	2014-10-27 12:14:44.534607920 +0100
-+++ tests/Makefile.am	2014-10-27 12:16:00.825891248 +0100
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
 @@ -14,7 +14,7 @@
  EXTRA_DIST = \
  	$(wildcard cal3d_converter/base.??f)
diff --git a/media-libs/cal3d/files/cal3d-0.11.0-verbose.patch b/media-libs/cal3d/files/cal3d-0.11.0-verbose.patch
index a6dfbd677bff..c50918cd899f 100644
--- a/media-libs/cal3d/files/cal3d-0.11.0-verbose.patch
+++ b/media-libs/cal3d/files/cal3d-0.11.0-verbose.patch
@@ -1,5 +1,5 @@
---- tests/run.in.old	2012-06-29 13:27:55.413765822 +0200
-+++ tests/run.in	2012-06-29 13:29:02.092084095 +0200
+--- a/tests/run.in
++++ b/tests/run.in
 @@ -43,7 +43,7 @@
                  exit 1
                  ;;
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index 5e180eec754d..7c3c542f62c8 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -4,6 +4,6 @@ AUX ctl-1.5.2-fix-unit-tests.patch 1863 BLAKE2B 7fab88b476d9e5468d4195e8dc3f9c9c
 AUX ctl-1.5.2-install-dpx-library.patch 565 BLAKE2B 234ba1ca74575a0babcf080c74052ce433a7698afa86b4991d67fe29c51c2eb42ad8a2748a5c1187c6c865e1860695d11736da788f41be919334bd119456a66c SHA512 bcf3ee6e44193436f1e70f0fef739dee74f83d814cfac1ad7b652a908934f73bc9f00f83ed4327e82d917f8579b9b476416e68e523a747ba9e5bbf8bc82d0bec
 AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb4b99527003acd6a97eceec8286e073b3c6594c92ae99ad559c9d520b9d94fe93ea783e9d6021d81f66b258c3e2f1 SHA512 0e97065c78c6ef5c2a8f657c6c41031f66379483aaf2754f612d69261932a7f6ee1ccd01c5c0b1b450e511aa758a640cacf55629651d5974a92c519f4ff3a25a
 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
-EBUILD ctl-1.5.2-r1.ebuild 706 BLAKE2B 5750dfbd0b0d60de4002e06d908bd1ee00faf689cf4e20748d8909a72dbc2673f08977cb00b9640ced231d7b2169c142665d52ebf6d0a029606bf73abd3a43c3 SHA512 e3b36bc318a3bcfee03902122dc654d693c8ed0f5fc529596a2e7a6a9b34103684b8c30756bbfb92a812c47215b8ce7652918a1116323d3833bc491b56f58958
-EBUILD ctl-1.5.2-r2.ebuild 970 BLAKE2B 6257c5de4ba9a38081b4de2722f67313fdfb92f3f52048d2655375b8ee041bb63ed5643d4fc4d9149c5f5b2765ca294e710ef4001e2d790ca2787f4ffbb375d1 SHA512 bdcb9dc3ad14d9ad324fe69293ea9f28ceab11abc4e849f6e29176b37b5e855f852108101495785e9daf09059a3e5384634ddfe9117c4b08f1f385cbd4d3120c
+EBUILD ctl-1.5.2-r1.ebuild 690 BLAKE2B a87464dcb12e21d42906136e9e418e5a947fc50bcf8bed17fe49f78dfa69f1df0fa1ab1188cf8caf2fb0660b2216650b3bf4a2a79c21fe04042fbca6d6f8a256 SHA512 8e49101efa73e68f2f25af05c32a55dbb62f52775b6ed8c44f8647977f7c8f357a9df02203ddff18c3b4ae2b8d46636a5a0a8ab59093aa0d60a2b99f35f4321d
+EBUILD ctl-1.5.2-r2.ebuild 954 BLAKE2B 8deca6a05ddac60350a92a87e8c86855caf6a59a4b9f41923887f9d8b53a80fa7d2efb779c2dfd8df928cc99b4502935cfc913a60f27c0379de9e1d9dad4fcb7 SHA512 112425d0174a8eca5efd1fd61fcc5b4685e12ce737c6dd3a96c6630cdefafcce259438c7fce1ce4b3a1df513632c9b26e920f1553cd45ab7fc191b8722b2a497
 MISC metadata.xml 298 BLAKE2B 6e4266628d090b71081fd7756e6e725250f41a8a670fa745eef96503c01915a93d41e82b84bca8f81b173b846f5437a40a1974491cb261adeb3e692e4750a40c SHA512 318801a89aef840e0aa9e823bc50bad3c95aa4f993a2a67097fe1ebe397d3702ad18165074e7887c090921f2e3330965b45114375ddb1ac60b40161a8acda8de
diff --git a/media-libs/ctl/ctl-1.5.2-r1.ebuild b/media-libs/ctl/ctl-1.5.2-r1.ebuild
index 8342a003007b..068acadc2a9e 100644
--- a/media-libs/ctl/ctl-1.5.2-r1.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ampas/CTL/archive/${P}.tar.gz"
 
 LICENSE="AMPAS"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~ia64 ppc64 x86"
 
 RDEPEND="media-libs/ilmbase:=
 	media-libs/openexr:=
diff --git a/media-libs/ctl/ctl-1.5.2-r2.ebuild b/media-libs/ctl/ctl-1.5.2-r2.ebuild
index ac7d581366ec..3989ebd3bda8 100644
--- a/media-libs/ctl/ctl-1.5.2-r2.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/CTL-ctl-${PV}"
 
 LICENSE="AMPAS"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~ia64 ppc64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 4ee11a99f5e2..427ffd381a42 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,5 +1,7 @@
 DIST Image-ExifTool-12.26.tar.gz 4933296 BLAKE2B e45683243b82f8276aee498d52a88d5b34eaf8b28aebdd631f70e30bb91ceb52224dc994ed189b914f024be4eb471b07bf9f1d860d96af2ab211e482b9ea194e SHA512 15bbff738e151d3ed5c77a17c99ded6cc3da2050fe7df94c42aea544aa31d7f539d70d07fd5336ae018af05b7f168712f1367046d8004861fce58442c03f82bd
 DIST Image-ExifTool-12.30.tar.gz 4948601 BLAKE2B 359c06dc5d4f71e186d7a265488cb16e47e40438d8a0e2d4e74f75b6aac7efd1c5b3271a158cb8b822eace5f6b437d5d39458c31ae8e6e886e93f2e643f8c9a9 SHA512 2966854d8fd163fd5aaaca5608eeab2a3f0681fe9e22e006840acacd2ff2aaecd6076bcec23989facb7baf64aa96425ad7eeceb4045da44004421b8f10050935
+DIST Image-ExifTool-12.33.tar.gz 4958375 BLAKE2B 699529e71e87cf2a5b4d1a69049f48b7b00ce8e720918cb25c2f2b35453fd44c580444bca2ff14d6cef76de99568b2e22b98ea87f45e550d69b40dda464831fe SHA512 7d6bb1942597535cc982e77397b4dc2edee3f361338f82cf2b5f24fd7fa94c148312b125d1d4f37c8dd303eed45173a805eb79ba61a6e74205e21c52f7561d90
 EBUILD exiftool-12.26.ebuild 543 BLAKE2B 3c64bd7b7a5a26358572ebb599df5c815200cee69bb7121a60d51f94eac2ffec1d6b19027150acf57474e05d8921272c1012dc71d95b1bfcf4abe54d2be44d2d SHA512 d98a45ba549b24053b9fb21a2bf61250fd73f5ca478dd24db1f1925e7d0c6956d183f235b7a4542b96794500284916e10d6c2eef73a82ea94338f74f5c35dfac
-EBUILD exiftool-12.30.ebuild 548 BLAKE2B 4fe20c6aff48822e2830453d416740ccbd257ef0fb28164793f8cc3ff9e4ccd5448983e2a2008546f9ccd57a8e57685f2e06d01d5d7ab6bd5caae0f0fab79aeb SHA512 8ee2add456ad6eb6ce386075e6498e9cdd250434e0e881a6201febdc8fa9abfa1b7e5041d63bad0907c23df0e8d412476081bc33c1bf17ea6a9f664fcdd0c842
+EBUILD exiftool-12.30.ebuild 543 BLAKE2B 3c64bd7b7a5a26358572ebb599df5c815200cee69bb7121a60d51f94eac2ffec1d6b19027150acf57474e05d8921272c1012dc71d95b1bfcf4abe54d2be44d2d SHA512 d98a45ba549b24053b9fb21a2bf61250fd73f5ca478dd24db1f1925e7d0c6956d183f235b7a4542b96794500284916e10d6c2eef73a82ea94338f74f5c35dfac
+EBUILD exiftool-12.33.ebuild 533 BLAKE2B 9aaa41daac00428adb11e56e14aaa1bcc69ea84234230b889d643c1ffb354241ac05a2dada47cf48c8eb434c0449c8967d259ca5332b624548ac4b1574d282bd SHA512 a8b9220b794ff46809c4f35a1edde7ef2415fed4a0b2a53cc6c2ae2ad88fae0581f1f14b4f79d4c6e70e938a9695cc1e191901b18d60ccc65d861591ef0dd6d3
 MISC metadata.xml 10040 BLAKE2B 8bcecde1df2dd3e79c3bcfbd38dcd9d3db9564a7abd5a684e0204779bcb685946f2eeb83a62efaa03efc841f0414b82f1087a3da3c6bd5f43e85561e43d7fb3e SHA512 af79302b57833d1368eff738b2326dd9cd47de47baf42426bfb00f61c1c6f52fcdc41d74bf95d8f65b2b0b00578ce07c3471b8cf4923e2f47c2c0b9d58dea35f
diff --git a/media-libs/exiftool/exiftool-12.30.ebuild b/media-libs/exiftool/exiftool-12.30.ebuild
index 48300e4ce1a6..579e441d9422 100644
--- a/media-libs/exiftool/exiftool-12.30.ebuild
+++ b/media-libs/exiftool/exiftool-12.30.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://exiftool.org/"
 SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-12.33.ebuild b/media-libs/exiftool/exiftool-12.33.ebuild
new file mode 100644
index 000000000000..b40b4ece01ca
--- /dev/null
+++ b/media-libs/exiftool/exiftool-12.33.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://exiftool.org/"
+SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+
+	insinto /usr/share/${PN}
+	doins -r fmt_files config_files arg_files
+}
diff --git a/media-libs/flickcurl/Manifest b/media-libs/flickcurl/Manifest
index 7e9c687286d4..8b8284dde21e 100644
--- a/media-libs/flickcurl/Manifest
+++ b/media-libs/flickcurl/Manifest
@@ -1,3 +1,3 @@
 DIST flickcurl-1.26.tar.gz 1870073 BLAKE2B 2e14565ee076b5fd83987fc4aadc00ef1561714ea30cefef9d79260ebefa4856eca18ada5afdf6b02ad6e8ed293dd0872927346083d9eb8209bece1f456ea6bf SHA512 5ffdef58e67cbf99da2e8eefad57e845627703d5b22c85d5635557cd2df53e47e74d8e3387523495708c5cc8952c290da5c4d5f1e86bd482312fc7e46e9af6cd
-EBUILD flickcurl-1.26.ebuild 973 BLAKE2B 040d72cb444e60ad355b53853153dc62748b325dadc1e8a28588357bad6c049d61b7dd4c3cc7ba79a7bdf5e0f908b8d655ca8495f7e39da67b1216287688482a SHA512 0ac4bee946c40bdd6935c6b1c822401ab26fb6ff749f97408e776683db626fdf719aa015b30520533f88a2cd0824253770ab5a499626bd79164ff3e96bbdc0f3
+EBUILD flickcurl-1.26.ebuild 720 BLAKE2B 7901dd3fb8f1f2c03e69ec3c1d74546c9e46a416fa89ef7ba856d8fe759ba8177a6b9f376d4ed81856910e9e7345c2c5be9674bbc6d04bfc943aef355e8829fb SHA512 ec684a3fcdaf0e3270b06d21c86550b4262e10c67a9d4af98b6676760214e7da917b195132dbac4eb28374bf3bf62c44fa16c3b338fd0bffe1950545500eff9d
 MISC metadata.xml 353 BLAKE2B 9ca14bef082c611a8196f2dd2c4928f12a8a7c8bbd0690309a0fe3d11a04fb3fcb86d06580818c979a31c1213596f1e20b80da32792e8e4c3bba8d83c8dab454 SHA512 6f0ae948fc542b3d2a04b02eed1f4b30bb9ad5b359ec07f0aba4085e978184f8426b94c1f49a083214eeb21f018fee3696a63111ec53045f5c2b95c7e1b43c60
diff --git a/media-libs/flickcurl/flickcurl-1.26.ebuild b/media-libs/flickcurl/flickcurl-1.26.ebuild
index ae2503f8cd35..96f1e11eec80 100644
--- a/media-libs/flickcurl/flickcurl-1.26.ebuild
+++ b/media-libs/flickcurl/flickcurl-1.26.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 inherit autotools
 
@@ -12,33 +12,29 @@ SRC_URI="http://download.dajobe.org/flickcurl/${P}.tar.gz"
 LICENSE="|| ( LGPL-2.1 GPL-2 Apache-2.0 )"
 SLOT="0"
 KEYWORDS="amd64 arm64 x86"
-IUSE="doc raptor static-libs"
+IUSE="raptor"
 
-RDEPEND=">=net-misc/curl-7.10.0
+RDEPEND="
+	>=net-misc/curl-7.10.0
 	>=dev-libs/libxml2-2.6.8:2
 	raptor? ( media-libs/raptor:2 )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gtk-doc-am
 	virtual/pkgconfig"
 
 src_prepare() {
-	if ! use doc ; then
-		# Only install html documentation when the use flag is enabled
-		sed -e '/gtk-doc.make/d' \
-			-e 's:+=:=:' \
-			-i docs/Makefile.am || die
-	fi
-
+	default
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		$(use_with raptor) \
-		$(use_enable static-libs static)
+		--disable-gtk-doc \
+		$(use_with raptor)
 }
 
 src_install() {
-	emake DESTDIR="${D}" TARGET_DIR=/usr/share/doc/${PF}/html install
-	dodoc AUTHORS ChangeLog NEWS README
+	default
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 1195cb5e89a9..018d6bb1e9b8 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -5,6 +5,6 @@ DIST harfbuzz-3.0.0.tar.gz 20360786 BLAKE2B acc1e4d7d59908a23ae1015700cfbf1737cd
 EBUILD harfbuzz-2.8.1.ebuild 2497 BLAKE2B 89bb2b0796c1a151efc58f43abb0c87df3829361be12e37d43652dae4c002efd29405c61e2e66350ac5ae8b75693f385ce4594d8e480d7a389a3311af4c41621 SHA512 8093198447adef9c164c8fb8d7f9a39a39bfd3ca43e2210a2d4edfe6e51716378c009f0aa5b64e5560f4f174021b8b525d9a3d2837aea53eba6059efd1cf336e
 EBUILD harfbuzz-2.8.2-r1.ebuild 2547 BLAKE2B 8c1cc61fda1ffbd7bb0c6bba79e7b0f2121b6a533a994536723f1ce6f58ed9cab2ef5c08f704a7cd66775e9f65e7f426fd3cb3c9ae8e01aeafc4ba8160ff2cd5 SHA512 7f6e6715df93de2ece043f2e651463241bb6095d5fc5e1e1b90a24647eafe94ffc845f0814ac52b59804e546140f8f3d929e1ea225e228cb1018c32cbe893ca4
 EBUILD harfbuzz-2.9.1.ebuild 2505 BLAKE2B 1de2fdb70f4647273658b95cf2425c7c94d56d55c695d4df4b94b4c375d5dad50a04e2f279443061e721c19102345832d3be84cb857f9713e7ab9660e0ab3d82 SHA512 ed1bc1b2870766467bf808aa277c5db7fcda334e610378b84e739646c22cc71e810c6ad051abb0d4bb93af10a74be672b552054719a29979e653131ad4af4070
-EBUILD harfbuzz-3.0.0.ebuild 2513 BLAKE2B ed6f714333a7f48d93bdfb6bb1bdf0638bd40ac8b53817e4c147dddc82e97e02c6d5907fe7ff0171cb1e6a3f5bb1e0e32900319813aafb6a9a7c957ef053c593 SHA512 f4065a49bef78aaad3d2ddd76bd0ba5ad9b076d82c49f375dda1d1d2e2b5fa9c5e1b1c6467a836872d0e37b73f5997a15528d9c607d981e5a1964975922e26cf
-EBUILD harfbuzz-9999.ebuild 2507 BLAKE2B 43f60e9425b5560c03e7c677d718542e09ac36d1d748a5cc270ce4f9d6f0b0260e07b1f32d11e2ff0e59c52daf8cbbcd2b0cba95f4cc046755cfc35cf140d1ff SHA512 5642c71c3b99dc1e11d9ec0c267bc466d0421151e077ea0141f3aaa11f6b891ecc24686e40c10de4c4494ca396493d585d2e71dd9f0dfb28984048b5f1f963eb
+EBUILD harfbuzz-3.0.0-r1.ebuild 2560 BLAKE2B 834b18435b9f86998faf43a40a61094064b93db75943d87ddf5b9b9d40600f7554c3d4a0cdb3eddb3ce7c9a836638b8773ef11da90fcb0630f18c210906d6eb0 SHA512 c44538f14327df10ec25f7f57afbe107a14286688c5d7912be9044abaa3e14a6ed3034601a9c354b89b9d26ced7559ece1e5c42dd2c94cb13cf0bd8bdf1e8a3a
+EBUILD harfbuzz-9999.ebuild 2560 BLAKE2B 834b18435b9f86998faf43a40a61094064b93db75943d87ddf5b9b9d40600f7554c3d4a0cdb3eddb3ce7c9a836638b8773ef11da90fcb0630f18c210906d6eb0 SHA512 c44538f14327df10ec25f7f57afbe107a14286688c5d7912be9044abaa3e14a6ed3034601a9c354b89b9d26ced7559ece1e5c42dd2c94cb13cf0bd8bdf1e8a3a
 MISC metadata.xml 818 BLAKE2B 6165990c46a33076cbcb991aa9417b1b1725886c03748d1fbb3f299408d6b56895b66cd723be06f0c72ded731698ca8d16d00cbf7247fafd1291b031aa784cf6 SHA512 141b1399bb3bdb6a5ade1bef685f99e60195edac718b93ec2350ab9e2dad3cc138a3d599c3a2b662a76579309a4f4cff259ef12a194d6a8dfffc4ef74c9102b6
diff --git a/media-libs/harfbuzz/harfbuzz-3.0.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..64ba1e60df03
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-3.0.0-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	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"
+fi
+
+LICENSE="Old-MIT ISC icu"
+# 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 3.0.0 dropped some unstable APIs; bug #813705
+SLOT="0/3.0.0"
+
+IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-util/glib-utils )
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	sed -i \
+		-e '/tests\/macos\.tests/d' \
+		test/shape/data/in-house/Makefile.sources \
+		|| die # bug 726120
+
+	# bug 618772
+	append-cxxflags -std=c++14
+
+	# bug 790359
+	filter-flags -fexceptions -fthreadsafe-statics
+
+	# bug 762415
+	local pyscript
+	for pyscript in $(find -type f -name "*.py") ; do
+		python_fix_shebang -q "${pyscript}"
+	done
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local emesonargs=(
+		-Dcoretext="disabled"
+		-Dchafa="disabled"
+
+		$(meson_feature glib)
+		$(meson_feature graphite)
+		$(meson_feature icu)
+		$(meson_feature introspection gobject)
+		$(meson_feature test tests)
+		$(meson_feature truetype freetype)
+
+		$(meson_native_use_feature cairo)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_use_feature introspection)
+
+		$(meson_use experimental experimental_api)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/harfbuzz/harfbuzz-3.0.0.ebuild b/media-libs/harfbuzz/harfbuzz-3.0.0.ebuild
deleted file mode 100644
index 27e92e9b2b49..000000000000
--- a/media-libs/harfbuzz/harfbuzz-3.0.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	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"
-fi
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-util/glib-utils )
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	sed -i \
-		-e '/tests\/macos\.tests/d' \
-		test/shape/data/in-house/Makefile.sources \
-		|| die # bug 726120
-
-	# bug 618772
-	append-cxxflags -std=c++14
-
-	# bug 790359
-	filter-flags -fexceptions -fthreadsafe-statics
-
-	# bug 762415
-	local pyscript
-	for pyscript in $(find -type f -name "*.py") ; do
-		python_fix_shebang -q "${pyscript}"
-	done
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	local emesonargs=(
-		-Dcoretext="disabled"
-		-Dchafa="disabled"
-
-		$(meson_feature glib)
-		$(meson_feature graphite)
-		$(meson_feature icu)
-		$(meson_feature introspection gobject)
-		$(meson_feature test tests)
-		$(meson_feature truetype freetype)
-
-		$(meson_native_use_feature cairo)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_use_feature introspection)
-
-		$(meson_use experimental experimental_api)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 6b8cea0dd156..64ba1e60df03 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -15,11 +15,13 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
 fi
 
 LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 3.0.0 dropped some unstable APIs; bug #813705
+SLOT="0/3.0.0"
 
 IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/libafterimage/Manifest b/media-libs/libafterimage/Manifest
index 428243ecf130..499e0c564011 100644
--- a/media-libs/libafterimage/Manifest
+++ b/media-libs/libafterimage/Manifest
@@ -7,5 +7,5 @@ AUX libafterimage-libpng15.patch 1076 BLAKE2B 1de5fb2ea663842a0f843f5f2db1406202
 AUX libafterimage-makefile.in.patch 2168 BLAKE2B eae3d6ded2e08442d72014c9e054357ffc8dfa37b9f4be76debd6a3c6e4f54a661735eac54a5e4b12663e0365f46c49283efec21ec0e3130d6ede6c0be20e58c SHA512 0fab45a672d4cdecdbd792eb966a31d3ea7e7be7fae52b1e7080d96a513788502099dac41692b4cadfc062ee7fa24bfaceeed4931811488dc4f7c7c34a1e99ec
 DIST libAfterImage-1.20.tar.bz2 1017055 BLAKE2B 2a0c7de0a6e3369518e19d87c877401675533247f40bfc60f77ac48b52ee1ffc66feae34eb6f80a5e37415999d38db9f05ef06be88610d846a1077685decf1ce SHA512 4056c73d1ab401480803a3a932d647a66574df9f65efc0d30ba80800e1a3424b4fbfce8e9cdf82c4852862491d92cbb42392f8cce8d6ac21d3b49e4ffe1808c4
 EBUILD libafterimage-1.20-r3.ebuild 2616 BLAKE2B 5a675b26535616567447720dfc1c11d989b3cae58e2a63c04754231ed0eea52585dfe1778cb037d0fd3bdaf24fb73cb39db99c5d92e3f7848ae312d3759a614a SHA512 55328dd6dd1fe6aa5c5d74ce08ddb2b5312725ae177226d1d85f9575c3e3f518c24eee081d8dac93abd2ede943f2411a4f2bc8f3b62783b09b9553162172ff55
-EBUILD libafterimage-1.20-r4.ebuild 2778 BLAKE2B e5abc7d8cd6bdf6f92ea299a114a8d19495acdb39ea5123cc7df76477addb8d28dd0d552a48d5f2604dcd54d3b3d9f278e61eb01c6307fa11dcdd0713fa44440 SHA512 f987b94d84867f0fbbfdc20ee3cfe91b3a702d07bbcededf6cf96f54178a4a1e25ebd62976d495209e76eea657827da9bc95270a314c5480c1fb3519f97a6d27
+EBUILD libafterimage-1.20-r4.ebuild 2773 BLAKE2B 821b468843d6e15e252339ced0592d2ee9fd56223cb4fa825f9d975e246604b8058a9d2ea7f4848c7fea4b1b480830bdab167de880ef433a9db9ed7295073e47 SHA512 fe74049b2432927642fd9d31e907bd565a2eb92426fef0a54154a89183014329a7d6d2fb1b5f881cda10f82910e77a3f4f2f3cf838767a28fcc9181a58670866
 MISC metadata.xml 1094 BLAKE2B bb5d212de95b47c95a7663a0a8850fb946ef155a1a38a9ec1529f46635c9c5c4e7c6e6c1252bf27c07aa622f33e1c16f442c0029d41d33c32179d7d86dde8af7 SHA512 8bddafa2e39a7d27dcf0ca81e8a540eb52cd4ce2c368a5c41a00ea8dc658f644f51a145511b6595871aa181d86fc879a349a60ae23db3f539f1b15c543e323f8
diff --git a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
index a682ba6f4eea..7d656730f2af 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping svg tiff truetype"
 
 RDEPEND="
diff --git a/media-libs/libdvbcsa/Manifest b/media-libs/libdvbcsa/Manifest
index 528ed496fbc2..0cd9b555a2a1 100644
--- a/media-libs/libdvbcsa/Manifest
+++ b/media-libs/libdvbcsa/Manifest
@@ -1,5 +1,5 @@
 AUX altivec.patch 1627 BLAKE2B 306742b8fea3fcbf21bf7839c05252284c4d05f33022f1f5655a633b421b1e3ae5db165dc870d4c1f2706620d6c0618bae8ca7a730da453332d4641610a4dbeb SHA512 290ac3aa86a932923c3332b7bcc910907e07dfc5a401d28ca8918b3b90b3d40a24724d8ffc18ead1ed6c5b9fa4cc2c886bcbea78f4528fb2e18fc7cf113ee6f2
 DIST libdvbcsa-1.1.0.tar.gz 345487 BLAKE2B ff5d9347f4255ca2c4e62477771715a7d8fcfca6eeb3a2e6cfdfcd903c9927a35d9049d18ec5a9d458328d6a3712d6cf81633e7ddc7c67d1a8099b8d56b2fd68 SHA512 f336bc90711261bb86bb42f897d5207a71da5a384bfb7d641de7e1fb3a43d20aeec250e9a5ceaf0b20f1e4335ccda70055675256c6889873bf1bfff55005a015
-EBUILD libdvbcsa-1.1.0-r1.ebuild 1173 BLAKE2B 368991aa45ecb8577ee47dd9fcbb0e1202bd7b5f47537cc2de5edb735dad9243355877bb81fcd220c5749ac8cd277879ce328f9601a6729fbd3ee989bfc591a3 SHA512 c3c753669d857d9637a7dd460e66d7f0205be5660f288387a07a4d689d3b70d304b0b2e6e41ccee9d3f44ecac7c5b67358c51e0ae736dba5eb89044cadc1c535
+EBUILD libdvbcsa-1.1.0-r1.ebuild 1172 BLAKE2B 5d83dfa22ed1acb159e9d53fdce8532a5a3055ec4f285827b92e49c2d28a59420a5d0c089fede6b7cf8c59718b82b7ac2ef55d2f70c142e0fcdf8e90d55a8c7c SHA512 e4fd281b78fcd59a09718ae2b46e03ead0cb76eabe0ea15e5217ccc930dd7d46b5125dd39e6c56da1bd6f2515ac8482f45f82b974d6d143b086ce9d297ec6db4
 EBUILD libdvbcsa-1.1.0.ebuild 806 BLAKE2B cb24d42c44474bc57e207a5e7736303be510ecf33bb33f9d8d733e4eb580def21e132b4d7b15865000e81a610317b51a5177c3bbd81332fd037fa6e883abb15c SHA512 5c12338d1abaa400e3eaac194d7d3263af90cf9beb87daddbefb5a692107cd67492ee3b1a653713a52358c2629ce7520c7599de77229585a2d25759ecf86255c
 MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
diff --git a/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild b/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
index bc96ad4de4b6..9328797e48fb 100644
--- a/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
+++ b/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse2 debug"
 
 # https://github.com/buildroot/buildroot/blob/master/package/libdvbcsa/
diff --git a/media-libs/libemf/Manifest b/media-libs/libemf/Manifest
index af93e0f61241..6da7bd4b1484 100644
--- a/media-libs/libemf/Manifest
+++ b/media-libs/libemf/Manifest
@@ -1,3 +1,3 @@
 DIST libemf-1.0.13.tar.gz 1314905 BLAKE2B a2614aae1e34fdd65292d7feff3c0c002393aad806bbe398c665191e496ff0d3af676b04bf95400e732f09b846d033f98d3f08e47f6d7779dca9694372ef1451 SHA512 37fdc959d2269ad1ae97d49c4f75b914593b7b636024c035d96a5a47b4258b5b522cd1928a5b99392afcdfe54e46c7f2d4c157056f99c8c0d88d71c25813cc60
-EBUILD libemf-1.0.13.ebuild 635 BLAKE2B 11301d6497ae464144fbcd850946eadde0d09a6ee9f2381144041f134022a986d943266786bccbe3ac2a781a81ae72788ff1eda1023fd04562a4e66158e3ff57 SHA512 42ed14eadcf521e614d3e3d8a1afb1f0c6972a81d5893ee495d29ea8d24716ddfc55c0436cb7e1d10bd4e20ba39d89b4f1ac8ed17d9bf57988af59e2c1687e1f
+EBUILD libemf-1.0.13.ebuild 642 BLAKE2B 45f62f1a521becf51ad9450ace119f652e68dbd0f5125cb5d46658fd0f2b7c24bb8cfd8968176be5a9d6019502a61990c5bd143a8f315cfbf7849907a445f91c SHA512 3416763d270ee289888ab3958ba6140e3b0f22f420f44c8438bfb270481fc0c48f8098123758f836b1b36e8d933b6b7e5a3b579519ba04b9abe935367432b9d0
 MISC metadata.xml 249 BLAKE2B 94edb96c777278d61ac237eedff255f06f9e0d82578830410d1c3d6e8c46c5bdef55cf85b304c0780d2c4634d386ae1255482ba0b660f68afb8904daad6cda7d SHA512 cc567d64897413fa6318263fec23936f76c0fec3a87d3224e213628e395576da4f1d33e0701c6600351061ab975e5bde1e7db24592fa73a33029f8dab1010449
diff --git a/media-libs/libemf/libemf-1.0.13.ebuild b/media-libs/libemf/libemf-1.0.13.ebuild
index c389b3d7a9b7..0cd5e48d2464 100644
--- a/media-libs/libemf/libemf-1.0.13.ebuild
+++ b/media-libs/libemf/libemf-1.0.13.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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libemf/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 -arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 -arm ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 src_configure() {
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 5f5c26c68949..c2b1b5445d06 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,6 +1,4 @@
 AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e676bccac2fb2bff2553b12d5978f03719175b9d25fa66bc06dd459e0f6671af48276d449de9b029202dfe7a3622fc85 SHA512 859c6b5bf179f315184f5f34a986761f113786792ff2e13461cf64ccf394dd2d7bd97215db0651d52819533cb918652d7eae9f18b2a913dd9ccf390cdf3adb65
-DIST libexif-0.6.22_p20201105.tar.gz 1111695 BLAKE2B d4eb856ad950f8ae068a27088e54311789c7b8b646dd1c4851ef637b626015119b3b5ac9cbac58f9c79c37c07ba7d3e9a9a67dc52715187495aa824846ec2335 SHA512 5472bf2531d9147be5c6e681d0257325f6609d6aa3935243f887df0ab32e51242ff9d853fc2c183cf5c2709c89d5c52d8fecb9144343d6f959f4bed1062098ab
 DIST libexif-0.6.23.tar.gz 2764684 BLAKE2B 517eaadc71b6ccaa7899b89b770a14fc051f365c728d5518fe6f0c05aa14690eaa6a33323c9305d02398df6ba2fceb806537202224a3c00018f7bcf835a3ff84 SHA512 c382b5f36e4fc1501664e3bad18553abb1b18f752f93111af5081e996bcc37b425ac9f0b0e1ffd7145270254ac44a4adb7875d5b0d8379113da6162b17442e23
-EBUILD libexif-0.6.22_p20201105.ebuild 1444 BLAKE2B 06eaa6fd9f35df9057b57c1b25b30358a3b295e4f365e97e7beaea46dde17dff5a0592e225c746675b2dc6e4e884a64346fc704119769a35a267ba5fc772253a SHA512 5fe208d86dfc950a0cf7b529654de444ed4513d4c38e7925756c74ccc0089d3803ae231705e25a6a25f92850c0f505b324663380e9d5e847c8e22d2c6dced904
-EBUILD libexif-0.6.23.ebuild 1266 BLAKE2B 9e985acf0340b10c89b5e28952d50b6fc581f8c4aaad1f999b3b27b7c3d23fca2bcf0eb16977025a51363ed7dff47a5583b6a342348f9d75c6161df403257c02 SHA512 41ab866895aac46841c18a3fe73fcf6d207fb22f1e4c64830713d383e0ac64337636427e4b0b0fec4b573d69bf45646e46e10728db7ec671ea34cfddc5535444
+EBUILD libexif-0.6.23.ebuild 1259 BLAKE2B 37fbb51a58132fd41e93dd1bb739027b333c685fbf359936d706a4835a682f289238905fda934e3d92ac966ae4e997c7a5e179fc8e3fde1fd03163824e309d4e SHA512 06aba07cca26cbe47f175ca566004972cb6de84b4396bd74c37858351057d8bb4421f094e9d664981740873234d4a7d3bfd97bcbd6201bb166b14ff12ee53c40
 MISC metadata.xml 453 BLAKE2B a6539b21b1ea55bbd09ab7385ae771673a802a3dcc41d637fae7ad50f2f67aecc2c253cc77c86d80df83649972d8619f9e18e8b9d7c6259ecc1326617be8ffff SHA512 44b76d19654a28cfaedbd9627d9556554846ce48f142cdfd67753f395547cb3717772cdef6935a641354a5621c560a0b7d276dac4ab62d467d42946a8327e0cc
diff --git a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
deleted file mode 100644
index 221fff98bbf9..000000000000
--- a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-COMMIT="9266d14b5ca4e29b970fa03272318e5f99386e06"
-DESCRIPTION="Library for parsing, editing, and saving EXIF data"
-HOMEPAGE="https://libexif.github.io/"
-SRC_URI="https://github.com/libexif/libexif/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-#SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PN}-${PV//./_}-release/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="doc nls static-libs"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e '/FLAGS=/s:-g::' configure.ac || die #390249
-	# Previously elibtoolize for BSD
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable doc docs) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING} || die
-}
diff --git a/media-libs/libexif/libexif-0.6.23.ebuild b/media-libs/libexif/libexif-0.6.23.ebuild
index f8e8ac1b6299..c195ebb72b5f 100644
--- a/media-libs/libexif/libexif-0.6.23.ebuild
+++ b/media-libs/libexif/libexif-0.6.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libfreeaptx/Manifest b/media-libs/libfreeaptx/Manifest
index fade92db0d78..104081eb005b 100644
--- a/media-libs/libfreeaptx/Manifest
+++ b/media-libs/libfreeaptx/Manifest
@@ -1,5 +1,5 @@
 AUX libfreeaptx-0.1.1-fix-version.patch 571 BLAKE2B 0fa43bf3b7180b5ec90e3cb2fc633959d5b484954bd50f468903a6c0c9b0646fe77be1618b68746692b57224e46270e538133ccfeb3f320ff71780bc5cd4297d SHA512 b8d3bcadeba8534979c02e55ad129bfce147e920e2e881f99ac9d579095fb944b6e88351a74dc410d141e0a6b89f17c15ddc21019e63cc3cf362a20d5e9b37b6
 DIST libfreeaptx-0.1.1.tar.gz 27902 BLAKE2B 0aa015b0317db7f6dd61ae667cc1b7b10c7f7457d057144c1457572a214891848b81512960eb8643138c638a0f691b53a7bbcb36ad434ac29335d92b108a43fa SHA512 53dd7f348120fea0425b365f26668925dd435a8a3a0c5e98476764a452c7d729f2a3556e953c557d0ccaaa65391265c8c3c61fc29377cf60079fa0bed2cc20b1
-EBUILD libfreeaptx-0.1.1.ebuild 1066 BLAKE2B fa88b305a88cde4141cec0eb54c088d26e293a93bceaf4f15638bcaaffda0dece75e2314cda3ce671af5877e656c390f52016eb9d5c25a4158113ccf9b83ec11 SHA512 19199f44d5f837361dc40908228b09d6c89948e410658ed7894c8415d802254b8a0c4a7d749059aad49dd154e6aa27c9e591a5f17eb21e5ce3e17989010b9dba
+EBUILD libfreeaptx-0.1.1.ebuild 1065 BLAKE2B 4699fc1c765083725959be4038b74eaf112ba6df0626aa3d302a45bdf9ece28b9928114ee3020e1af0b4309f8a4a5fe5a12d351a4d4fcf055d03fbf687225f0b SHA512 da73e91c22f5056ca98aaebba13a7c4f7e9b1176a3b2d209c8598aa23748205bfa8aa4e3d4e4cb4f54dee38ea916a91e54a54565c82c2700f92141aa61346b6d
 EBUILD libfreeaptx-9999.ebuild 1104 BLAKE2B 9ab4ea981ac6243332276f0f17b3b941b4a49b658cabf5e6658efb7664cd71ae522683383f023788cc8dafb233d0ff94d4f21e16ed47a36f8d7273638d963706 SHA512 99f6b1912b7c00e7c2e0f55ee7c9210697b2b0d705a85920a02a58c9aaa443fa29e85128a699b76280a994b27b1a954e0c9e900c74ad41133a2484d2b671eae5
 MISC metadata.xml 443 BLAKE2B c6bc37f198358a17bb8c099093ed64f9318966930771426243e401e35d8c4c0b4d764532ded69a71ec6e5ed463d582106d8574d661bd9d9a144b71528b0d02ae SHA512 ab15fe16e8ab3e5cfc792dbbb65437e17ee76f4b9b94a08fa90f553f1d15a1c179e6cd791962ac9ddc764b50ac5410ddf0dd7c3618b2c274f6fcb5ef7c5982ea
diff --git a/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild b/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
index c7a81b9cd718..b80bee6a5e72 100644
--- a/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
+++ b/media-libs/libfreeaptx/libfreeaptx-0.1.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/iamthehorker/${PN}"
 else
 	SRC_URI="https://github.com/iamthehorker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 6ee8d9b364bc..f203e9a63a0b 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,13 +1,5 @@
-AUX libjpeg-turbo-1.2.0-x32.patch 1248 BLAKE2B 760f35a02c6a565a43702a4188186732f93c57a5c879cdc6920c427da097c3dc5eb111189c40510252c0209caf63100ecff7ffec1b10a177b09449db4dc5c3c6 SHA512 9ffc28a89db43eba9545bca2d4c1f5a11953f36a46e294b697bda190058dcaa59982f83552ce54f37ef83970d4b0fefd1e14497854c7991db38ab7f7c1c6afae
-AUX libjpeg-turbo-1.5.3-CVE-2020-13790.patch 1744 BLAKE2B 7cfd68e3f29b530ad573c5f6476ef539e3499d2cfafbe5be129c1a246cf2f3e7f170e71bfb33adbaebe6b3812ccdfd72d99c5961011e093f740d7182fd7c1398 SHA512 1f97899970327fb6dabe521e93029a518f1493bdf45f9a345f55e803f97af7f36b65d569e4921c1aab7478006b4cd34c4f17bf150a7ffdd3760f14d9acb5b303
-AUX libjpeg-turbo-1.5.3-cve-2018-11813.patch 1240 BLAKE2B 469eefb5673f48ca8892050507bc7566cacb0b7ff2d2914428971a994bb41d9d717be7fe0a4908cee2ee57a74f6ca8112bee53cb021f4fadbef201536ebee979 SHA512 2542833a6afdbf1f2112695c524197bf5a319ef99c1c6ecea0fe0436681c45321bb6eb59e25fa97d8fa923717452f609e3f85d25547751fa4f8fe99f4ee789c9
-AUX libjpeg-turbo-1.5.3-divzero_fix.patch 792 BLAKE2B 31d3617155ac639ebd49a5db9c3898fdd6b20dc04776003121d6c906a96a8963984405b674ad6bee81c6de97304da78fa1de249cca7000fa7eed42f011e5a918 SHA512 b8ba793319e1f8c658f550fe6427625b2053486d784133c6b9e6778fac74c4eedadb6b9c208c6725a27cf585b4857c719ae03efaf602e181c4b782d55cb9b47a
 AUX libjpeg-turbo-2.1.1-arm64-relro.patch 679 BLAKE2B f6ea6f311cc05ff960d76cdc49afc1d14bf4d638052d1f6007defe239757002ecad18823d706a2e5f5e51245a2447c237c97daf0862e2e1889c751b52f3890b7 SHA512 56ef2f905fe54921618a0c4f79de67cf74070d1ee595d3b4b41f19b33e23701d8045b250b28b8c53b1bd8911f4179dd3b1594a5e85ac9dbce8c869feef1ad124
-DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
-DIST libjpeg-turbo-2.1.0.tar.gz 2255497 BLAKE2B 693eccd00e8e1574e60ceb7464552ce9c4fd370c5ec4fc0dc3696ead7b4cd031228aaaf0eef3ceba194bb96bac6134b9c951162c0b81e88637edd6e71f4577f7 SHA512 6632a2a71cb3a350fe4f850fe84e51e361755c373babf2b47fb164c3a9fc3fd66705639bebedd8c1b40cf6c15fd702e814425b0be5919048987bbec357828605
 DIST libjpeg-turbo-2.1.1.tar.gz 2256321 BLAKE2B ad3fc108e0136220586cc59a277735d573a82d740146d2ac091cbb50af84019b7c623ca1c9c2e6e0f8a672b6fde7ed23441b199eef2435a52013abd73a3a7157 SHA512 9cf61b4677b38e254063248a3fdbe138634d23a35ae8f2ee2661bdb3248b1d0500bd43201b8d9fe66c779d578074fd9ed19bc097ba22e10143530c2a19738673
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
-EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2978 BLAKE2B 50575c65e6fd694e2a9b3a124294f72974a2996ed3d8434ef7cc60ca00c59bec617f0ee5472bc5fbf8a0afa6bb4bb3d2c0e5fff6087c287ba9818133d8a79eb1 SHA512 50937ee99535fe2d4aa9da3b403f9dc412a39ea15551f216845645ac8cdcb711570553ed444c9154bfd980c8019da230c0d1b2089abea34f40aa00f9b3d89866
-EBUILD libjpeg-turbo-2.1.0-r2.ebuild 3224 BLAKE2B e96c8b4aea2e7b1f445c80f4c4cff87b83169f7c273df39bc06dfe95cd3609e7213c685118097ca549efed282e1c315a9a1901d5001f3aa8e155fbc6def1a8f9 SHA512 7d91d57218b278bcc19010250be0446c4d85982c063469553649cfaa7038e00fce92bb59820e24c397915a5f7e8a4f952b64fb84d57caa70a6b73ba7496fd745
 EBUILD libjpeg-turbo-2.1.1-r2.ebuild 3308 BLAKE2B a564ec8e512f77cf44021081698ed5b0e14b441bfa8b3a112ecfc7a9d0fa2c1afdc9988a46a4a5fe29464b7dd1c46874fe70256d2f4dad8cfd98a28d11a10191 SHA512 59d55f613e9625be5ae27dd8942874ab632dca5e3db3cbc7eff7394f46558bbd8bbfac633d9266e92cfcc374929d47ac8af11c2d645aaeb74d5e6b9e573e5fb1
 MISC metadata.xml 567 BLAKE2B b4e2dc1098bc3a518b8af80dd63a9d6d000c6a62ab26e9d7792743b10955738bfccde4f6e32d46599194d8f63066913dad4b20c7a8674917d7bf9cd217a0f9bc SHA512 d9af7f4a6ca425c6ae75ac96da3b4467c62dc3baa0be04e590dc821f17e03e12279ed1faf2e66944ce0bed9ed0c9b176e7e372278062588db7adc9ed71f200c1
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch
deleted file mode 100644
index 523eed7557d5..000000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/420239
-
-https://sourceforge.net/tracker/?func=detail&aid=3533795&group_id=303195&atid=1278160
-
---- a/configure
-+++ b/configure
-@@ -33,7 +33,11 @@ case "$host_os" in
-   linux*)
-     case "$host_cpu" in
-       x86_64)
--        objfmt='ELF64'
-+        if echo __ILP32__ | $CC $CFLAGS -E - | grep __ILP32__ > /dev/null; then
-+          objfmt='ELF64'
-+        else
-+          objfmt='ELFX32'
-+        fi
-         ;;
-       *)
-         objfmt='ELF'
-@@ -94,6 +98,7 @@ case "$objfmt" in
-   a.out)      NAFLAGS='-faout -DAOUT';;
-   BSD-a.out)  NAFLAGS='-faoutb -DAOUT';;
-   ELF)        NAFLAGS='-felf -DELF';;
-+  ELFX32)     NAFLAGS='-felfx32 -DELF -D__x86_64__';;
-   ELF64)      NAFLAGS='-felf64 -DELF -D__x86_64__';;
-   RDF)        NAFLAGS='-frdf -DRDF';;
-   Mach-O)     NAFLAGS='-fmacho -DMACHO';;
---- a/simd/nasm_lt.sh
-+++ b/simd/nasm_lt.sh
-@@ -11,7 +11,7 @@ while [ $# -gt 0 ]; do
-                 pic=yes
-             fi
-             ;;
--        -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-fas86| \
-+        -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-felfx32|-fas86| \
-         -fobj|-fwin32|-fwin64|-frdf|-fieee|-fmacho|-fmacho64)
-             # it's a file format specifier for nasm.
-             command="$command $1"
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch
deleted file mode 100644
index 8a9fcbd79724..000000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1bfb0b5247f4fc8f6677639781ce468543490216 Mon Sep 17 00:00:00 2001
-From: DRC <information@libjpeg-turbo.org>
-Date: Tue, 2 Jun 2020 14:15:37 -0500
-Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM
-
-This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to
-include binary PPM files with maximum values < 255, thus preventing a
-malformed binary PPM input file with those specifications from
-triggering an overrun of the rescale array and potentially crashing
-cjpeg, TJBench, or any program that uses the tjLoadImage() function.
-
-Fixes #433
-diff --git a/rdppm.c b/rdppm.c
-index c0c096218..899436eec 100644
---- a/rdppm.c
-+++ b/rdppm.c
-@@ -5,7 +5,7 @@
-  * Copyright (C) 1991-1997, Thomas G. Lane.
-  * Modified 2009 by Bill Allombert, Guido Vollbeding.
-  * libjpeg-turbo Modifications:
-- * Copyright (C) 2015, 2016, D. R. Commander.
-+ * Copyright (C) 2015, 2016, 2020, D. R. Commander.
-  * For conditions of distribution and use, see the accompanying README.ijg
-  * file.
-  *
-@@ -22,6 +22,7 @@
-  * the file is indeed PPM format).
-  */
- 
-+#define JPEG_INTERNALS
- #include "cdjpeg.h"             /* Common decls for cjpeg/djpeg applications */
- 
- #ifdef PPM_SUPPORTED
-@@ -425,7 +426,7 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
-     /* On 16-bit-int machines we have to be careful of maxval = 65535 */
-     source->rescale = (JSAMPLE *)
-       (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
--                                  (size_t) (((long) maxval + 1L) *
-+                                  (size_t) (((long) MAX(maxval, 255) + 1L) *
-                                             sizeof(JSAMPLE)));
-     half_maxval = maxval / 2;
-     for (val = 0; val <= (long) maxval; val++) {
-
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch
deleted file mode 100644
index f99a1ab27f97..000000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 909a8cfc7bca9b2e6707425bdb74da997e8fa499 Mon Sep 17 00:00:00 2001
-From: DRC <information@libjpeg-turbo.org>
-Date: Tue, 12 Jun 2018 16:08:26 -0500
-Subject: [PATCH] Fix CVE-2018-11813
-
-Refer to change log for details.
-
-Fixes #242
----
- ChangeLog.md | 14 ++++++++++++++
- rdtarga.c    |  6 ++----
- 2 files changed, 16 insertions(+), 4 deletions(-)
-
---- libjpeg-turbo-1.5.3/rdtarga.c
-+++ libjpeg-turbo-1.5.3/rdtarga.c
-@@ -125,11 +125,10 @@
- read_non_rle_pixel (tga_source_ptr sinfo)
- /* Read one Targa pixel from the input file; no RLE expansion */
- {
--  register FILE *infile = sinfo->pub.input_file;
-   register int i;
- 
-   for (i = 0; i < sinfo->pixel_size; i++) {
--    sinfo->tga_pixel[i] = (U_CHAR) getc(infile);
-+    sinfo->tga_pixel[i] = (U_CHAR) read_byte(sinfo);
-   }
- }
- 
-@@ -138,7 +137,6 @@
- read_rle_pixel (tga_source_ptr sinfo)
- /* Read one Targa pixel from the input file, expanding RLE data as needed */
- {
--  register FILE *infile = sinfo->pub.input_file;
-   register int i;
- 
-   /* Duplicate previously read pixel? */
-@@ -160,7 +158,7 @@
- 
-   /* Read next pixel */
-   for (i = 0; i < sinfo->pixel_size; i++) {
--    sinfo->tga_pixel[i] = (U_CHAR) getc(infile);
-+    sinfo->tga_pixel[i] = (U_CHAR) read_byte(sinfo);
-   }
- }
- 
diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch
deleted file mode 100644
index c7e6d1056769..000000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Backported from
-https://github.com/libjpeg-turbo/libjpeg-turbo/commit/43e84cff1bb2bd8293066f6ac4eb0df61ddddbc6
-
---- libjpeg-turbo-1.5.3/rdbmp.c
-+++ libjpeg-turbo-1.5.3/rdbmp.c
-@@ -434,6 +434,12 @@
-     progress->total_extra_passes++; /* count file input as separate pass */
-   }
- 
-+  /* Ensure that biWidth * cinfo->input_components doesn't exceed the maximum
-+     value of the JDIMENSION type.  This is only a danger with BMP files, since
-+     their width and height fields are 32-bit integers. */
-+  if ((unsigned long long)biWidth *
-+      (unsigned long long)cinfo->input_components > 0xFFFFFFFFULL)
-+    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
-   /* Allocate one-row buffer for returned data */
-   source->pub.buffer = (*cinfo->mem->alloc_sarray)
-     ((j_common_ptr) cinfo, JPOOL_IMAGE,
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild
deleted file mode 100644
index 0df02e0f65ee..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools java-pkg-opt-2 toolchain-funcs multilib-minimal
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
-
-LICENSE="BSD IJG ZLIB"
-SLOT="0/0.1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="java static-libs"
-
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-
-COMMON_DEPEND="!media-libs/jpeg:0
-	!media-libs/jpeg:62"
-
-BDEPEND="amd64? ( ${ASM_DEPEND} )
-	x86? ( ${ASM_DEPEND} )
-	amd64-fbsd? ( ${ASM_DEPEND} )
-	x86-fbsd? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
-	x64-macos? ( ${ASM_DEPEND} )
-	x64-cygwin? ( ${ASM_DEPEND} )"
-
-DEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
-	"${FILESDIR}"/${P}-divzero_fix.patch #658624
-	"${FILESDIR}"/${P}-cve-2018-11813.patch
-	"${FILESDIR}"/${P}-CVE-2020-13790.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=()
-	if multilib_is_native_abi; then
-		myconf+=( $(use_with java) )
-		if use java; then
-			export JAVACFLAGS="$(java-pkg_javac-args)"
-			export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
-		fi
-	else
-		myconf+=( --without-java )
-	fi
-	[[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
-
-	# Force /bin/bash until upstream generates a new version. #533902
-	CONFIG_SHELL="${EPREFIX}"/bin/bash \
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--with-mem-srcdst \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	local _java_makeopts
-	use java && _java_makeopts="-j1"
-	emake ${_java_makeopts}
-
-	if multilib_is_native_abi; then
-		pushd ../debian/extra >/dev/null
-		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
-		popd >/dev/null
-	fi
-}
-
-multilib_src_test() {
-	emake test
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		exampledir="${EPREFIX}"/usr/share/doc/${PF} \
-		install
-
-	if multilib_is_native_abi; then
-		pushd "${WORKDIR}"/debian/extra >/dev/null
-		emake \
-			DESTDIR="${D}" prefix="${EPREFIX}"/usr \
-			INSTALL="install -m755" INSTALLDIR="install -d -m755" \
-			install
-		popd >/dev/null
-
-		if use java; then
-			rm -rf "${ED}"/usr/classes
-			java-pkg_dojar java/turbojpeg.jar
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	docinto html
-	dodoc -r "${S}"/doc/html/*
-	newdoc "${WORKDIR}"/debian/changelog changelog.debian
-	if use java; then
-		docinto html/java
-		dodoc -r "${S}"/java/doc/*
-		newdoc "${S}"/java/README README.java
-	fi
-}
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
deleted file mode 100644
index c9b389047486..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib java-pkg-opt-2
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
-
-LICENSE="BSD IJG ZLIB"
-SLOT="0/0.2"
-if [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="cpu_flags_arm_neon java static-libs"
-
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-
-COMMON_DEPEND="!media-libs/jpeg:0
-	!media-libs/jpeg:62"
-
-BDEPEND=">=dev-util/cmake-3.16.5
-	amd64? ( ${ASM_DEPEND} )
-	x86? ( ${ASM_DEPEND} )
-	amd64-fbsd? ( ${ASM_DEPEND} )
-	x86-fbsd? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
-	x64-macos? ( ${ASM_DEPEND} )
-	x64-cygwin? ( ${ASM_DEPEND} )"
-
-DEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.8:* )"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-src_prepare() {
-	local FILE
-	ln -snf ../debian/extra/*.c . || die
-
-	for FILE in ../debian/extra/*.c; do
-		FILE=${FILE##*/}
-		cat >> CMakeLists.txt <<EOF || die
-add_executable(${FILE%.c} ${FILE})
-install(TARGETS ${FILE%.c})
-EOF
-	done
-
-	for FILE in ../debian/extra/exifautotran; do
-		cat >> CMakeLists.txt <<EOF || die
-install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_BINDIR})
-EOF
-	done
-
-	for FILE in ../debian/extra/*.[0-9]*; do
-		cat >> CMakeLists.txt <<EOF || die
-install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_MANDIR}/man${FILE##*.})
-EOF
-	done
-
-	cmake_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi && use java ; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_STATIC="$(usex static-libs)"
-		-DWITH_JAVA="$(multilib_native_usex java)"
-		-DWITH_MEM_SRCDST=ON
-	)
-
-	# Avoid ARM ABI issues by disabling SIMD for CPUs without NEON. #792810
-	if use arm; then
-		mycmakeargs+=(
-			-DWITH_SIMD:BOOL=$(usex cpu_flags_arm_neon ON OFF)
-		)
-	fi
-
-	# mostly for Prefix, ensure that we use our yasm if installed and
-	# not pick up host-provided nasm
-	if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then
-		mycmakeargs+=(
-			-DCMAKE_ASM_NASM_COMPILER=$(type -P yasm)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	if multilib_is_native_abi && use java ; then
-		rm -rf "${ED}"/usr/classes || die
-		java-pkg_dojar java/turbojpeg.jar
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	local -a DOCS=( README.md ChangeLog.md )
-	einstalldocs
-
-	newdoc "${WORKDIR}"/debian/changelog changelog.debian
-
-	docinto html
-	dodoc -r "${S}"/doc/html/.
-
-	if use java; then
-		docinto html/java
-		dodoc -r "${S}"/java/doc/.
-		newdoc "${S}"/java/README README.java
-	fi
-}
diff --git a/media-libs/libkeyfinder/Manifest b/media-libs/libkeyfinder/Manifest
index 803fbf6d086f..28114effac0c 100644
--- a/media-libs/libkeyfinder/Manifest
+++ b/media-libs/libkeyfinder/Manifest
@@ -1,5 +1,5 @@
 DIST libkeyfinder-2.2.4.tar.gz 79053 BLAKE2B 4d30931451625b00e1ecc2bfb6349497887ab805b5a986e05dbc51fb007a2aededcefbf9fc18c1beb7a7bc4e368c763a658979b5c5c6f7e91f4a21797ad414d7 SHA512 6673b9a81dbfa3693fc4e7af4e5fc0f351f0c60b00fdafeb9e3437e2f77b5fec7d1e78e3989ff1daca72770a1d3cdbe3837508718b8e8aba3ac3f3d56af81a56
 DIST libkeyfinder-2.2.5.tar.gz 79220 BLAKE2B a0a9b6b0d392d8da7be479e30a733f64f0c0723a1890a969ff1cc0ffc56599778148f7fe081724e83f1b3cc2217bb52f46418ed328da7d34d9229aabf24cbaef SHA512 54463d1f1111dc474d3e43723fddd5579ea1a3842f99f43e50e85622a1d6ee6fe42b22c300ce5ba5807cf6b2d7067af741773af95974a42c5d863c53165893eb
 EBUILD libkeyfinder-2.2.4.ebuild 626 BLAKE2B 8e8ccfefe5732c82eec1b155ebdb52ab05dea92dca7bbd2b5a54edc463cbdc0f808beabc133412536d646b1e2957ba1b5e705aff1043309bcb27a53d5e5829b5 SHA512 5384f945acb1f6323faad9e043c911e737c1d00542a901bcf12ce73a87a8714e3a26f79c28e0a40f63b2debc63bb71021e2e57d2fc8d9bddf2b0afa787192d88
-EBUILD libkeyfinder-2.2.5.ebuild 626 BLAKE2B 8e8ccfefe5732c82eec1b155ebdb52ab05dea92dca7bbd2b5a54edc463cbdc0f808beabc133412536d646b1e2957ba1b5e705aff1043309bcb27a53d5e5829b5 SHA512 5384f945acb1f6323faad9e043c911e737c1d00542a901bcf12ce73a87a8714e3a26f79c28e0a40f63b2debc63bb71021e2e57d2fc8d9bddf2b0afa787192d88
+EBUILD libkeyfinder-2.2.5.ebuild 633 BLAKE2B 0498b9032218a6e8912666f125cf12601870b018f0babe3f2bafcf907f1d95e140845840938d18821dd1de6de43d393aa1ea80732711a921295ed4349ca6a084 SHA512 20071b62303ef5f15c32aeb001dba8f0dfd4c8a10ed04b220a5a15a367acb57bf7652d557ebde32b9744944c4270870fbb0c0e40f2064260779bb26ef6cf2935
 MISC metadata.xml 260 BLAKE2B 67e6833093739454709d11437f08f56992d87b35e1f70405c5667ce6f35164e50891bd5a590f67a234c7a6bcfaa53bbd3b0034324a70aaabf1dfbdac16c20681 SHA512 ec587e23153929573978a938c94e2e87519f5e08fba1e07d0aedfa782f6ce09480299149ad874c04f7f5acf21c1ca8275efcb2a3589d16842041ce1c11cb63ab
diff --git a/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild b/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild
index b102bfc23bfe..43183be273ec 100644
--- a/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild
+++ b/media-libs/libkeyfinder/libkeyfinder-2.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mixxxdj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest
index 716b64edbe39..b4c559dcb85c 100644
--- a/media-libs/libopenmpt/Manifest
+++ b/media-libs/libopenmpt/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.5.11+release.autotools.tar.gz 1477946 BLAKE2B 8fed41af7e5fe1d822716eaa51912e7c5f7d3cd7bef2dbf2266f5e474c4d6300b988636d08bc750602beb831fbf25e532ec137311c84a150806164edc7b5fe30 SHA512 29e19ef2add316fd824f82095db9e81a9a60c07f0b6a54a224c0416452d566c4376e688c5e1b1556461e0f5a1b1543ff45d1388d611d010a646efb8bf1ba733e
-EBUILD libopenmpt-0.5.11.ebuild 1539 BLAKE2B 55b4bd27473b615348ca62bc4c3739e4e7026f7e131c3b556ecfb36755b87c7b5214921440868e7a3f799858201907ba078d354869a241084f7b417d8b3ea927 SHA512 31689e5b8ccef179944e31e1f0ffb913c2659a33580c131ca348b15a68556feb9405dd25b8864d0bd0566e45b26fc4d3c8c1bc1caad7097c4d2b8bfe534d2462
+DIST libopenmpt-0.5.12+release.autotools.tar.gz 1477744 BLAKE2B 1c3cb1424cba334ca9aa7adb0be19308551c51dec9b4bb4657be93f76c01804f15f9a98a4568c48a6c6d0ab44058c72e8ad1b60402f9542c580197b761933fe3 SHA512 e22a79737a825a5753429271bba7af94fd195fb0ff770a3e2091b941c3856bbad770eeeb88cd86d37e01b0138e820199d3650f55546f2e33bb2e99b1b14d9925
+EBUILD libopenmpt-0.5.12.ebuild 1539 BLAKE2B 55b4bd27473b615348ca62bc4c3739e4e7026f7e131c3b556ecfb36755b87c7b5214921440868e7a3f799858201907ba078d354869a241084f7b417d8b3ea927 SHA512 31689e5b8ccef179944e31e1f0ffb913c2659a33580c131ca348b15a68556feb9405dd25b8864d0bd0566e45b26fc4d3c8c1bc1caad7097c4d2b8bfe534d2462
 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181
diff --git a/media-libs/libopenmpt/libopenmpt-0.5.11.ebuild b/media-libs/libopenmpt/libopenmpt-0.5.12.ebuild
index 0e4a4efa3c62..0e4a4efa3c62 100644
--- a/media-libs/libopenmpt/libopenmpt-0.5.11.ebuild
+++ b/media-libs/libopenmpt/libopenmpt-0.5.12.ebuild
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index c756a8837bc1..d8dd907a0354 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -1,6 +1,4 @@
-DIST libsamplerate-0.2.1.tar.bz2 3747188 BLAKE2B 83540f3e75cfa79cbd166f075d22cab6a63e0e057b90ac6a3760c07196cac962df7d1ca26620a9033de046e0528bee3ded2b482e8629b1ae316844b5b31f3074 SHA512 f54f7f12c9536868d7a11fc9cbb86857505e7b75fe34cedaf0b9bfc864da6037296b3eae303a33d4c87b7fd20d96933b91ef59c8cc3d1313b9fc21654e5daa2d
 DIST libsamplerate-0.2.2.tar.xz 3319468 BLAKE2B 71b1e8a1644a94fff019abc6bf98c557df84994293f1e9bc651ad3ad3f0afeb24f54b8c75fc26e5202ae7c3a3e34e783fd1be7f7c6fdefe9eac9a5dfe7100b91 SHA512 d23ae54d23209ba22baae9e5fd178dd8e0e99205dada7e7c3a7b3a3d8cf816ed427a411bfeb008427f64da7767d645edce40811f238af11c8c386f5ef25a9f0c
-EBUILD libsamplerate-0.2.1.ebuild 1283 BLAKE2B 9a2ab16ba202ce58d532b595f8e751f3f17374d7985de6d4dce8a34daaf899c369a30223932f7b34c21f69d5c6373cbe98d492d52b36852b69a29eddc9902120 SHA512 92d9463d1b2f58021e2c9478ccbaca5f611190676aead11430211412fbaa31224ededcf47147545e1298f7588e30b594f53a9e240de0ac18283d1ba6382533ba
-EBUILD libsamplerate-0.2.2.ebuild 1262 BLAKE2B dcb69f89366ab474be8d47ec467beee74e76d2bb88a9f36affb0797f72f39d8263d739d637a6f0bdc4c4e103b0a707bc01818c4767f00532ab8bc78d649a2ce1 SHA512 0ea582bed6c4994947e696cf32032bd6c0ec78f762c61053eed66835595dc1205ce40981680d4d591930d80c8f70afbb6ba81ea6c0cc88427adb76565cf86247
+EBUILD libsamplerate-0.2.2.ebuild 1261 BLAKE2B a7bc596500b0cd9ce0f5a86852abc1632d38e24434b7c4ffa2ebf3ba28cd43f797d6feaa8c4a925520d54da0c4ea6e7cfa9e6b407d0ed0b29e258bdc4926366d SHA512 6ee4f1048d336800fcfea236174bbcdda898ca1c00e71706d5eb4b821ef9f455cfc85ff8a592363e552f7c6250480e63c6a19debe8c10b3eaa3d45e6eeaebbe4
 EBUILD libsamplerate-9999.ebuild 1268 BLAKE2B 87baa5925767b94b377850cb1285d2097073880f46e8954f6c4936acf70e5a7da5285ba6df9a2cc6e6d19617f7db012990d9fda418377d821c4bed53d11b4d78 SHA512 11cf28cd637b9731502f15def1ee77ae7e1f3dc454ef9c7f3fd36c2b8e7f12638e52603605e1064ae36e08ec2f96848369a48cc0b1d552374974a4052462bd62
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild b/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild
deleted file mode 100644
index 283b46dc02b6..000000000000
--- a/media-libs/libsamplerate/libsamplerate-0.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio"
-HOMEPAGE="https://libsndfile.github.io/libsamplerate/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/libsndfile/libsamplerate.git"
-else
-	SRC_URI="https://github.com/libsndfile/libsamplerate/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Alsa/FFTW are only required for tests
-# libsndfile is only used by examples and tests
-DEPEND="
-	test? (
-		media-libs/alsa-lib[${MULTILIB_USEDEP}]
-		media-libs/libsndfile[${MULTILIB_USEDEP}]
-		sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
-	)"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		$(use_enable test alsa) \
-		$(use_enable test fftw) \
-		$(use_enable test sndfile)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild b/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
index e3ca4a780abd..a38ac235842c 100644
--- a/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsamplerate.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsamplerate/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="BSD-2"
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 19997521eda0..650b47465428 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -2,5 +2,5 @@ AUX libsdl-1.2.15-gamma.patch 1339 BLAKE2B 83e0d10fc4396ce992c8f59043e2380921a44
 AUX libsdl-1.2.15-sdl-config.patch 784 BLAKE2B d54d98ad6ddbea163fd4a0ce9d65ac77d832d68d611c1cd4fb20fa70b5bee641204a4ff7b51eff47f6a4e94193d1cad2f82bdb64a4d73582c932a3661870e3cb SHA512 95af8c3dac4fdea5bad92c044a311efaae02a46e1c5bfa84dadee7b3fab6b48f4dcf12ca6e581429decb479de21ec6167c59b215fb3a398fb82151aa4c3fb432
 AUX libsdl-1.2.15-slibtool.patch 2288 BLAKE2B 5018f714eb40320eb0d310de1553638d66c81a70e7ab7366cedc38d11641f7ab68699d5fa2ea466a2e99c5cd778bb949114a5c5a4190e37f8fc86060962a8bf4 SHA512 e020a8d9a4fe2e74884b0aa8e69778dbbf2b60c70181767f84404038a07ca55956794b19ad8d3a4e5211bf6ecf05ec65712a588076fe9467442f21b99baca4fe
 DIST SDL-1.2.15_p20210224.tar.gz 3991106 BLAKE2B be0906950c80cddf15bc458f7734a3ebfa767b11e2f54bf9f771155f4420947900b95bbbebf01341d9dba4c1c7cfe9d54e43150e5f7781622b99668b3362adeb SHA512 3521fe996cf8a8ebb9beaa4802ac05cf5f3a2e7ed1c9b362a818d965b26ec8b3bbebfaac7c827feae44becf5bdd764378cb4282d129285f23a982b5c7474e006
-EBUILD libsdl-1.2.15_p20210224.ebuild 4972 BLAKE2B 0846118e8fea17c21bdd3f2a7576434794f48c435a6fb0c65bbdc58ddbcb95c1cabc4c1fc63631efd7c54a451ff709f969fbe2737fcaf64d2bb8c7c132235a74 SHA512 ba94cb5d0a70d2b38ef6b97bbc7059e3cf490b80d0850a467375043e5cf356ba6b85e614d96c05a9c85ad3e03ea68dc438f5c3621711777bd3775fe7229936ff
+EBUILD libsdl-1.2.15_p20210224.ebuild 4992 BLAKE2B e45b4739277e2f3f73d317171d23007a589164bbb3a0b4ae723e5fe57d325a89316fe8a8128a023a81c2cc1c4cc7da3a041e31ce9c5d95250370055d5a5c5568 SHA512 05fa57f8630d1af8e9856c1ff039a1f89473003940e41a72daafecfcd0b9c9481c391b03b75b32187184509581fb94994e925d258a6d2eec228e80bd89a478fd
 MISC metadata.xml 1416 BLAKE2B 6af92a836cd40833fa7969db829d91d2afd78cbc8a992b79f88655d54da5053af98a44e222f64c1f3189b43c97dbc697cbaa7992620740c0e486df37bcd878dc SHA512 96b7e96ece4c3a81e719041ad0dd2293b0781d84496cef0a7af1077405b9a0cf7bc3d41aad2f31aa6451768e7d8a9f0402cd38fcdbbfd527fd85b88f8e81a04c
diff --git a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
index e8a0a07cccee..07ad4f42215d 100644
--- a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
@@ -125,6 +125,7 @@ multilib_src_configure() {
 		--enable-cpuinfo \
 		--disable-alsa-shared \
 		--disable-esd-shared \
+		--disable-sndio \
 		--disable-pulseaudio-shared \
 		--disable-arts-shared \
 		--disable-nas-shared \
diff --git a/media-libs/libxmi/Manifest b/media-libs/libxmi/Manifest
index 0f44df7a3027..3169b4162da5 100644
--- a/media-libs/libxmi/Manifest
+++ b/media-libs/libxmi/Manifest
@@ -1,3 +1,3 @@
 DIST libxmi-1.3.tar.xz 258672 BLAKE2B 7eb50a9a7804bd37fdacd238e41241d54e9b0ee00aac9267e9d6a62a1a61338522c26df56021821fd7af74123550f99305a233dadb55a6a9514feb124fd70d32 SHA512 f54b0925e2b848f7cfb31bd0f9eed27df6fd6e704ffeeb58eb490d49e7ca76f46e03eee6ed89d6644f6a3bad05c7b0b986f9634d0cd23c49f31ee80f23ff8262
-EBUILD libxmi-1.3-r1.ebuild 697 BLAKE2B 32b8be7e61fde560e810d0afa3ab42474e91ccf7c4fea251e9d4cb5d9fec626f543e5535dd92e1616c4eda318bb30aecb6206dd2bd86b4578b273fbc21529927 SHA512 779f59dc00dde09b7cba67402459db4d56dd50d976f8cda7cda85e8afd23139535d5fb0f5924fd9006dab0827c726177ab38f4add98538c3e1a026582d1f1d1c
+EBUILD libxmi-1.3-r1.ebuild 704 BLAKE2B 3d4b10e609a406e3ae42925cc54ea5b7071233e880d493538b8f8b771df574eeada8b8ba78f4e1be02f8164cbf68679bb0815c83dd0952cade9a11305879c279 SHA512 6408f11f37374d57b497d21a106403be212551d2a39f48bd9de47e354a2950b67c0c7b9c27eadceeb0cc89712de0e83b43f896c10bc3e76691134f26a9120937
 MISC metadata.xml 1175 BLAKE2B 152b1cf790fb78721ca9410ec488d9558ce6e212fe55f24e7dbce09db47fc8c6e39d9dcbf4319e7ad3e46a38ebe37414a0378324d5125de0e78badc0b8abf5cf SHA512 267d9d22b95c4361667a5dbfa36d17cfaaca09f8075c0d0e13f398f22643e935db39a13822a616bb253fd07ab4c0b269c38dea8c46db9d627eff6e380dc2eb7c
diff --git a/media-libs/libxmi/libxmi-1.3-r1.ebuild b/media-libs/libxmi/libxmi-1.3-r1.ebuild
index de24622b7049..1f6d89aec8f9 100644
--- a/media-libs/libxmi/libxmi-1.3-r1.ebuild
+++ b/media-libs/libxmi/libxmi-1.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 src_prepare() {
 	default
diff --git a/media-libs/munt-mt32emu/Manifest b/media-libs/munt-mt32emu/Manifest
index a8abaa55baa5..bc1c9abd57c5 100644
--- a/media-libs/munt-mt32emu/Manifest
+++ b/media-libs/munt-mt32emu/Manifest
@@ -1,4 +1,4 @@
 AUX munt-mt32emu-2.4.2-docs.patch 518 BLAKE2B 15ed5513d3ef11dbfdd9304a1295d82b3e54f223dcf448285392c9cdc24635c5823a8b5ad4b0954908627ba2ebd450e2f849a9cd725fd78b70e578d0a3d68c43 SHA512 2a1ba4731a13c2f54d5eccad6971b0544b75787df922d31ab2ae68471f078e0585d2c386f09461b89db38fa2bf57b2e402ad98c07f6d5773fbd93856d1c27d6d
 DIST libmt32emu_2_5_3.tar.gz 527698 BLAKE2B 1ca31f2da92d77f9c3d34bb8c9f19e34e83cc82751ba08dfda1240a28b49e36c2acf3a6d8aab6e62107df4d88645e77d447e332968007fe865882d54e71475de SHA512 c801e22e861898281316109533ca6264f5a9cf778d4f0bb14b49bb6d04d53b7e60cd8320d5b29a63534f6c470b4feb67c881e86c49b7860a98639ce01b99debf
-EBUILD munt-mt32emu-2.5.3-r1.ebuild 672 BLAKE2B e0e801589b1bf96f77867434dd24a7eb40f29e30c86e4e60e42e668f7d459deb5a8da6d2113ded641ee33bc3c8baa0a5dfa8c7c55007b7b3b40f2617d3b99643 SHA512 fd937bfee73147904cfc1654ce0ec9974182bde7ac7970ff3a34ee8ff9cfc1509c199a6181a47f65306005b4ce1b0dc5cc3ca94845534e0d0d3bbe11189396f2
+EBUILD munt-mt32emu-2.5.3-r1.ebuild 679 BLAKE2B 9d76865bc70b3108c8ce5e69c8aaab5017678769007e94d57470d740acfbf0f9351df1a28e8b640a2833932d76945ca3a6b3d8e61b782aeafd60369849001f7f SHA512 775142ffd72e0a7d96e7f5bb2e776858adc80654225fcd4a925b549b0d975c44f46185d46a863290e43c183d13d7b4fded8c28a627208586dd4190a22f508105
 MISC metadata.xml 621 BLAKE2B 52ec37202ec80fc7b37c23087264133c670058b8ae6428377abbccd7b7728314463b13b42f85abbe6b7befdb66a2447d5bb4614767ae94769ae850547c0ec18c SHA512 20c482a847d5b9511d54765ff0d7a8b634a5f5f14e4f0a2abdcc8fea4a424836ff80b7526ebfb39ccf2c848ce02bd52eb7b3088fedfde5b5760f5f9b0bf113c4
diff --git a/media-libs/munt-mt32emu/munt-mt32emu-2.5.3-r1.ebuild b/media-libs/munt-mt32emu/munt-mt32emu-2.5.3-r1.ebuild
index 69e3f2578ea5..1faa39379892 100644
--- a/media-libs/munt-mt32emu/munt-mt32emu-2.5.3-r1.ebuild
+++ b/media-libs/munt-mt32emu/munt-mt32emu-2.5.3-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/munt/munt"
 SRC_URI="https://github.com/munt/munt/archive/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 S="${WORKDIR}/munt-${MY_P}/mt32emu"
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 8beaa7b9b65d..f06331ebe0f8 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -7,14 +7,13 @@ AUX netpbm-10.76.00-misc-deps.patch 1677 BLAKE2B 2b54610958755b452bffd186e6bdbac
 AUX netpbm-10.76.00-pbmtext-test.patch 711 BLAKE2B 7e1b825bd9735ace1e91c1e705df4843aebbec61d090ec3903e680aac3facba80075ffa518340140657e33cd6c36ae84cd669e9dcddb920d832caed218b6651e SHA512 32be11758652105a6964bca3a9b08c06ed34e2f9ea00370c8d3a961a0ba8b64102120881238fe016d0b0ca4f10882b25f655691bbd75be8ceb700e68a624d5ca
 AUX netpbm-10.76.00-test.patch 6045 BLAKE2B ec4bf18a2022e67b26b78a591f3949552e103d9dbaec0793707988265ecd9f1006e576b094e4a47c9a94de5aa0ac2be00702493d3234364e91e727ac90ca4f61 SHA512 36244194a688d7b3f9ef632ecc3a56ea9aae3e28ad68d4dc5f1a804c19203a76b76fd75c1d999661dea4aa6e529e7200fd195383d8585d129d6df088a0c633b5
 AUX netpbm-10.86.21-build.patch 2319 BLAKE2B b22150c8683790c9ac31abc00b8f3f5b55cc6e990186f506c67496fce774fdfef1ba23843129fd493f8aa3e4ad5f74cfcf1d2388da95225ac2ef19f0c949f425 SHA512 459c54dac19067f2185a02ef812932e8fcb6a73d6267c32578bd3b7d3b12494052e929b24663407ad919e1e98aa2df58ed8e27be3f18eeb2fbe2402e4ff9e629
-AUX netpbm-10.86.21-format-security.patch 730 BLAKE2B 2957d10c75264688a47a6b42a43915c4a29e97c8c097008d30adcb9783a90575bc7526121dea02d9016eb456dfbd08bd06cb2a76d22eef36620223be266dcb06 SHA512 e7b90662d8f2bb786bc0473151c949c6cb1d467e122114b5d4c8018e4b8cf3b6b2dc49a1a8b1deae95706b81d8d61bee38506b6deb82eb30d40762d4d8e6d934
 AUX netpbm-10.86.21-misc-deps.patch 1565 BLAKE2B a4d629ea9fe01efc45c799dac4bd3764368be33f264929bdc338bb724ace03471949467e5c84144636a9f4ee9130395dad77e23aa6686998bf9700dbde224cbf SHA512 f274ede7d11ed0f2a1825a4412a52fd9e30f5caf470c6111b606a87f1e67b16278c9f2a901d512ea3516ba033e30a3c08386cc5af1a555f868b7d7175fbfeed0
 AUX netpbm-10.86.21-test.patch 331 BLAKE2B 59451b2f1632afdd8e84bcec0ef91e0589604706b373281bf4963385fe971991711cc6ed4f169cc45aa460ac1db20de69039b137da1a2ec3d6cb82b60ae5f745 SHA512 e5c1a88cc03e227c7a7a01e9586ceacaf24a6752f4285f228b0176a8a12a6a9ac83d8ce1c5965e8f56ab652b5e42aa2cd535f1e121449fe668312b7e49720e4f
 AUX netpbm-10.86.22-fix-ps-test.patch 15448 BLAKE2B cfe77600197fc39ef0be0ed793f5181db57fd718a6fed268a8afb2fd2b5afab404c3be3c89dc25d178f8fe2edc4d386e33f22f7b3bc826e9c90307ef3895830f SHA512 a521c771d2384cb86d87b4efdf05e0835adcbefb84d4e66e744b2f8bc40df5358f20c4824dce5a942ccc24b18168276278d65e8e9a529b7c09b157b3e02438bb
 DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
-DIST netpbm-10.86.22.tar.xz 3696588 BLAKE2B eabc11b4928681f2d96c8b6da1e23284868d7ba2f610f496d1ddf5b6ceb34c991160780f79c69b2c905e5210b024a1a5868656b89e23d6b63e587ce0cd70a950 SHA512 5840d0e88158ac77be7dfc5430e696701a740d56c98efdaf02b3c4e92bdf10268572ef0087b3bf263937073e0fbda3183aa7ed56bfe12dba30b3a3ff382bd4ff
+DIST netpbm-10.86.24.tar.xz 3698448 BLAKE2B 189fbaeb91db15e317c62758c64d1165d3cb32fa0221b2dcdefb0425577d4af9a13e66c35774149a44727c99fc18263123fd3c2b71f6409344bcf458341a4470 SHA512 50ad5a726c4219e1d87c7a46868b8f7bdb2d676903f049816b58e00addb416e4684a6c669188beebc5cc3c3961d2b0e35cd663215196d9925e3a23a989e14be3
 EBUILD netpbm-10.70.00.ebuild 5382 BLAKE2B 8b5a70217742d7f87b59c16d777b040277cd582929a7ae5fdf3d7ca1287e598e5204d498a4b38cd3e54fd3411bfc2d2ead8cf2ee030ce34f0594d3894ff45f7d SHA512 bca0a73ebb20f6eb7543048c0e34eabf5c8a3652c8b43ab357ba3742b649bd1075ff97c522da910b80e9d9feb8125103eea4df5373b00cf7d44851bd9927c786
 EBUILD netpbm-10.76.00.ebuild 5269 BLAKE2B c94c55e373301f8506a9ee6275865f0702c0bcc5ceeccf2b8433dedf71f99834475dd27ef5328db4c9d9eda5b7a5ce3943cd59e3e19e8e6db22bc35741cbf911 SHA512 a79ddc4ab964ed64e29d644ca33fc0bed01e0c90e96a3aa38d6a6be30039b5cff2dd86f8c5a798982df9e353d286e461ae560e8be6c98e008cfdd345927c611f
-EBUILD netpbm-10.86.22.ebuild 5754 BLAKE2B c554f780abcdfd3c410fd449543a3db724d95e0bc3aec1338b87c97a83b8b2a6ff2271143049abf1ad331a4b8a8e5c70ee8a2cf4b69bd55164774221459f4eeb SHA512 bf47679b311c675a3f641dc3eb96782f0466378fc6805a6ae1055c1a5abbea2469effe68bcc64a6ccf0b19bc44ed4ad5cfabf44b12cd041d493b28af2dc16b27
+EBUILD netpbm-10.86.24.ebuild 5801 BLAKE2B c3998445295978c3224e0fbcd8b0383a9b072cdb1676d98175ef02d123d6cac99f50eaecdf1452bd085212e6b65fcc7457a070b23e1fc66746c8d6deb310092b SHA512 8b41bf0ea62d328e00f068480a3278695a65199e4d5f529c7167994fdd760880ac1ef4953b625bceafdeaaca76bcdb88b4005a1ffc2958340ce7f95916ca2f27
 MISC metadata.xml 578 BLAKE2B 44f5899feee3b35c43e1b21f631fc53acc615003a5ed21c3461b5946882f1b67b9de9ac0b3d5d24f9faf291bbc9d3410841ccbba15f4981fb5ec050195bf93d7 SHA512 a9ef7432d1404a5dfc2458761867fbdcb9be368f20ea3290bb0a2aac10a82c968d3d97c4dbbf65f4840f0a60e9266d63c577e33c27d3b8b45b70349cb211478d
diff --git a/media-libs/netpbm/files/netpbm-10.86.21-format-security.patch b/media-libs/netpbm/files/netpbm-10.86.21-format-security.patch
deleted file mode 100644
index a7afc259ff5c..000000000000
--- a/media-libs/netpbm/files/netpbm-10.86.21-format-security.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix compiling with `CFLAGS` `-Werror=format-security`
-See also https://bugs.gentoo.org/517524
-
---- a/converter/ppm/ximtoppm.c
-+++ b/converter/ppm/ximtoppm.c
-@@ -117,9 +117,9 @@
- */
-     header->bits_channel = atoi(a_head.bits_per_channel);
-     header->alpha_flag = atoi(a_head.alpha_channel);
--    pm_asprintf(&header->author,  a_head.author);
--    pm_asprintf(&header->date,    a_head.date);
--    pm_asprintf(&header->program, a_head.program);
-+    pm_asprintf(&header->author,  "%s", a_head.author);
-+    pm_asprintf(&header->date,    "%s", a_head.date);
-+    pm_asprintf(&header->program, "%s", a_head.program);
-     /* Do double checking for bakwards compatibility */
-     if (header->npics == 0)
-         header->npics = 1;
diff --git a/media-libs/netpbm/netpbm-10.86.22.ebuild b/media-libs/netpbm/netpbm-10.86.22.ebuild
deleted file mode 100644
index 402cbd40216d..000000000000
--- a/media-libs/netpbm/netpbm-10.86.22.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
-
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="jbig? ( media-libs/jbigkit )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( >=media-libs/libpng-1.4:0 )
-	postscript? ( app-text/ghostscript-gpl )
-	rle? ( media-libs/urt )
-	svga? ( media-libs/svgalib )
-	tiff? ( >=media-libs/tiff-3.5.5:0 )
-	xml? ( dev-libs/libxml2 )
-	zlib? ( sys-libs/zlib )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/netpbm-10.86.21-build.patch
-	"${FILESDIR}"/netpbm-10.86.21-test.patch #450530
-	"${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
-	"${FILESDIR}"/netpbm-10.86.21-format-security.patch #517524
-	"${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
-)
-
-netpbm_libtype() {
-	case ${CHOST} in
-		*-darwin*) echo dylib;;
-		*)         echo unixshared;;
-	esac
-}
-
-netpbm_libsuffix() {
-	local suffix=$(get_libname)
-	echo ${suffix//\.}
-}
-
-netpbm_ldshlib() {
-	case ${CHOST} in
-		*-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
-		*)         echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
-	esac
-}
-netpbm_config() {
-	if use ${1} ; then
-		[[ ${2} != "!" ]] && echo -l${2:-$1}
-	else
-		echo NONE
-	fi
-}
-
-src_prepare() {
-	default
-
-	# make sure we use system libs
-	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
-	rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
-
-	# take care of the importinc stuff ourselves by only doing it once
-	# at the top level and having all subdirs use that one set #149843
-	sed -i \
-		-e '/^importinc:/s|^|importinc:\nmanual_|' \
-		-e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
-		common.mk || die
-	sed -i \
-		-e '/%.c/s: importinc$::' \
-		common.mk lib/Makefile lib/util/Makefile || die
-	sed -i \
-		-e 's:pkg-config:$(PKG_CONFIG):' \
-		GNUmakefile converter/other/Makefile other/pamx/Makefile || die
-
-	# The postscript knob is currently bound up with a fork test.
-	if ! use postscript ; then
-		sed -i \
-			-e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
-			converter/other/Makefile generator/Makefile || die
-		sed -i -r \
-			-e 's:(pbmtextps|pnmtops|pstopnm).*::' \
-			test/all-in-place.{ok,test} || die
-		sed -i -e 's:lps-roundtrip.*::' test/Test-Order || die
-		sed -i -e '/^$/d' test/all-in-place.ok || die
-		sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die
-	fi
-
-	# the new postscript test needs +x
-	chmod +x test/lps-roundtrip.test
-
-	# Do not test png if not built
-	if ! use png ; then
-		sed -i -r \
-			-e 's:(pamtopng|pngtopam|pnmtopng).*::' \
-			test/all-in-place.{ok,test} || die
-		sed -i -e '/^$/d' test/all-in-place.ok || die
-
-		sed -i -r \
-			-e 's:(pamrgbatopng|pngtopnm).*::' \
-			test/legacy-names.{ok,test} || die
-		sed -i -e '/^$/d' test/legacy-names.ok || die
-		sed -i -e 's:png-roundtrip.*::' test/Test-Order || die
-	fi
-}
-
-src_configure() {
-	# cannot chain the die with the heredoc, please check the comment below
-	cat config.mk.in - >> config.mk <<-EOF
-	# Misc crap
-	BUILD_FIASCO = N
-	SYMLINK = ln -sf
-
-	# These vars let src_test work by default
-	PKGDIR_DEFAULT = ${T}/netpbm
-	RESULTDIR_DEFAULT = ${T}/netpbm-test
-
-	# Toolchain options
-	CC = $(tc-getCC) -Wall
-	LD = \$(CC)
-	CC_FOR_BUILD = $(tc-getBUILD_CC)
-	LD_FOR_BUILD = \$(CC_FOR_BUILD)
-	AR = $(tc-getAR)
-	RANLIB = $(tc-getRANLIB)
-	PKG_CONFIG = $(tc-getPKG_CONFIG)
-
-	STRIPFLAG =
-	CFLAGS_SHLIB = -fPIC
-
-	LDRELOC = \$(LD) -r
-	LDSHLIB = $(netpbm_ldshlib)
-	LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
-	LINKERISCOMPILER = Y
-	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
-	NETPBMLIBTYPE = $(netpbm_libtype)
-	STATICLIB_TOO = $(usex static-libs Y N)
-
-	# The var is called SSE, but the code is actually SSE2.
-	WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
-
-	# Gentoo build options
-	TIFFLIB = $(netpbm_config tiff)
-	# Let tiff worry about its own dependencies #395753
-	TIFFLIB_NEEDS_JPEG = N
-	TIFFLIB_NEEDS_Z = N
-	JPEGLIB = $(netpbm_config jpeg)
-	PNGLIB = $(netpbm_config png)
-	ZLIB = $(netpbm_config zlib z)
-	LINUXSVGALIB = $(netpbm_config svga vga)
-	XML2_LIBS = $(netpbm_config xml xml2)
-	JBIGLIB = $(netpbm_config jbig)
-	JBIGHDR_DIR =
-	JASPERLIB = NONE
-	JASPERHDR_DIR =
-	URTLIB = $(netpbm_config rle)
-	URTHDR_DIR =
-	X11LIB = $(netpbm_config X X11)
-	X11HDR_DIR =
-	EOF
-	# cannot chain the die with the heredoc above as bash-3
-	# has a parser bug in that setup #282902
-	[[ $? -eq 0 ]] || die "writing config.mk failed"
-}
-
-src_compile() {
-	emake -j1 pm_config.h version.h manual_importinc #149843
-	emake
-}
-
-src_test() {
-	# The code wants to install everything first and then test the result.
-	emake install.{bin,lib,data}
-	emake check
-}
-
-src_install() {
-	# Subdir make targets like to use `mkdir` all over the place
-	# without any actual dependencies, thus the -j1.
-	emake -j1 package pkgdir="${ED}"/usr
-
-	if [[ $(get_libdir) != "lib" ]] ; then
-		mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
-	fi
-
-	# Remove cruft that we don't need, and move around stuff we want
-	rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
-
-	dodir /usr/share
-	mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
-
-	doman userguide/*.[0-9]
-	dodoc README
-
-	cd doc || die
-	dodoc HISTORY Netpbm.programming USERDOC
-	docinto html
-	dodoc -r *.html
-
-	use doc && dodoc -r ../userguide/*.html
-}
diff --git a/media-libs/netpbm/netpbm-10.86.24.ebuild b/media-libs/netpbm/netpbm-10.86.24.ebuild
new file mode 100644
index 000000000000..ec6f1d72b547
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.86.24.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="http://netpbm.sourceforge.net/"
+SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+# zlib USE flag is no longer used, enabled by default.
+# cannot remove it yet because of #801445
+
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/flex
+	virtual/pkgconfig
+"
+# app-text/ghostscript-gpl is really needed for postscript
+# some utilities execute /usr/bin/gs
+RDEPEND="jbig? ( media-libs/jbigkit:= )
+	jpeg? ( virtual/jpeg:0 )
+	png? (
+		>=media-libs/libpng-1.4:0=
+		sys-libs/zlib
+	)
+	postscript? (
+		app-text/ghostscript-gpl
+		sys-libs/zlib
+	)
+	rle? ( media-libs/urt:= )
+	svga? ( media-libs/svgalib )
+	tiff? ( >=media-libs/tiff-3.5.5:0 )
+	xml? ( dev-libs/libxml2 )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/netpbm-10.86.21-build.patch
+	"${FILESDIR}"/netpbm-10.86.21-test.patch #450530
+	"${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
+	"${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
+)
+
+netpbm_libtype() {
+	case ${CHOST} in
+		*-darwin*) echo dylib;;
+		*)         echo unixshared;;
+	esac
+}
+
+netpbm_libsuffix() {
+	local suffix=$(get_libname)
+	echo ${suffix//\.}
+}
+
+netpbm_ldshlib() {
+	case ${CHOST} in
+		*-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
+		*)         echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
+	esac
+}
+netpbm_config() {
+	if use ${1} ; then
+		[[ ${2} != "!" ]] && echo -l${2:-$1}
+	else
+		echo NONE
+	fi
+}
+
+src_prepare() {
+	default
+
+	# make sure we use system libs
+	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
+	rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
+
+	# take care of the importinc stuff ourselves by only doing it once
+	# at the top level and having all subdirs use that one set #149843
+	sed -i \
+		-e '/^importinc:/s|^|importinc:\nmanual_|' \
+		-e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
+		common.mk || die
+	sed -i \
+		-e '/%.c/s: importinc$::' \
+		common.mk lib/Makefile lib/util/Makefile || die
+	sed -i \
+		-e 's:pkg-config:$(PKG_CONFIG):' \
+		GNUmakefile converter/other/Makefile other/pamx/Makefile || die
+
+	# The postscript knob is currently bound up with a fork test.
+	if ! use postscript ; then
+		sed -i \
+			-e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
+			converter/other/Makefile generator/Makefile || die
+		sed -i -r \
+			-e 's:(pbmtextps|pnmtops|pstopnm).*::' \
+			test/all-in-place.{ok,test} || die
+		sed -i -e 's:lps-roundtrip.*::' test/Test-Order || die
+		sed -i -e '/^$/d' test/all-in-place.ok || die
+		sed -i '2iexit 80' test/ps-{alt-,flate-,}roundtrip.test || die
+	fi
+
+	# the new postscript test needs +x
+	chmod +x test/lps-roundtrip.test
+
+	# Do not test png if not built
+	if ! use png ; then
+		sed -i -r \
+			-e 's:(pamtopng|pngtopam|pnmtopng).*::' \
+			test/all-in-place.{ok,test} || die
+		sed -i -e '/^$/d' test/all-in-place.ok || die
+
+		sed -i -r \
+			-e 's:(pamrgbatopng|pngtopnm).*::' \
+			test/legacy-names.{ok,test} || die
+		sed -i -e '/^$/d' test/legacy-names.ok || die
+		sed -i -e 's:png-roundtrip.*::' test/Test-Order || die
+	fi
+}
+
+src_configure() {
+	# cannot chain the die with the heredoc
+	# repoman tries to parse the heredoc and fails
+	cat config.mk.in - >> config.mk <<-EOF
+	# Misc crap
+	BUILD_FIASCO = N
+	SYMLINK = ln -sf
+
+	# These vars let src_test work by default
+	PKGDIR_DEFAULT = ${T}/netpbm
+	RESULTDIR_DEFAULT = ${T}/netpbm-test
+
+	# Toolchain options
+	CC = $(tc-getCC) -Wall
+	LD = \$(CC)
+	CC_FOR_BUILD = $(tc-getBUILD_CC)
+	LD_FOR_BUILD = \$(CC_FOR_BUILD)
+	AR = $(tc-getAR)
+	RANLIB = $(tc-getRANLIB)
+	PKG_CONFIG = $(tc-getPKG_CONFIG)
+
+	STRIPFLAG =
+	CFLAGS_SHLIB = -fPIC
+
+	LDRELOC = \$(LD) -r
+	LDSHLIB = $(netpbm_ldshlib)
+	LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
+	LINKERISCOMPILER = Y
+	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
+	NETPBMLIBTYPE = $(netpbm_libtype)
+	STATICLIB_TOO = $(usex static-libs Y N)
+
+	# The var is called SSE, but the code is actually SSE2.
+	WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
+
+	# Gentoo build options
+	TIFFLIB = $(netpbm_config tiff)
+	# Let tiff worry about its own dependencies #395753
+	TIFFLIB_NEEDS_JPEG = N
+	TIFFLIB_NEEDS_Z = N
+	JPEGLIB = $(netpbm_config jpeg)
+	PNGLIB = $(netpbm_config png)
+	ZLIB = -lz
+	LINUXSVGALIB = $(netpbm_config svga vga)
+	XML2_LIBS = $(netpbm_config xml xml2)
+	JBIGLIB = $(netpbm_config jbig)
+	JBIGHDR_DIR =
+	JASPERLIB = NONE
+	JASPERHDR_DIR =
+	URTLIB = $(netpbm_config rle)
+	URTHDR_DIR =
+	X11LIB = $(netpbm_config X X11)
+	X11HDR_DIR =
+	EOF
+	[[ $? -eq 0 ]] || die "writing config.mk failed"
+}
+
+src_compile() {
+	emake -j1 pm_config.h version.h manual_importinc #149843
+	emake
+}
+
+src_test() {
+	# The code wants to install everything first and then test the result.
+	emake install.{bin,lib,data}
+	emake check
+}
+
+src_install() {
+	# Subdir make targets like to use `mkdir` all over the place
+	# without any actual dependencies, thus the -j1.
+	emake -j1 package pkgdir="${ED}"/usr
+
+	if [[ $(get_libdir) != "lib" ]] ; then
+		mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die
+	fi
+
+	# Remove cruft that we don't need, and move around stuff we want
+	rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
+
+	dodir /usr/share
+	mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
+
+	doman userguide/*.[0-9]
+	dodoc README
+
+	cd doc || die
+	dodoc HISTORY Netpbm.programming USERDOC
+	docinto html
+	dodoc -r *.html
+
+	use doc && dodoc -r ../userguide/*.html
+}
diff --git a/media-libs/nv-codec-headers/Manifest b/media-libs/nv-codec-headers/Manifest
index d924b7c251e5..fbcd8aa4d0da 100644
--- a/media-libs/nv-codec-headers/Manifest
+++ b/media-libs/nv-codec-headers/Manifest
@@ -1,12 +1,14 @@
 DIST nv-codec-headers-10.0.26.0.tar.gz 61978 BLAKE2B 0f91a3e9f0be19658a519ad4d9091aea4e8a59c0a857d997ce49060d84f35ba7fe5f5fc2e19ee63ad054df16df08946990cc70abe867ceefd40867fb3a06f9ee SHA512 707a2151e5045939be69083bca8b8219439e1edb218a3eb3a8f1ebf38e6c8fd9ef2066e5f986c57b63573603c1fa2ae34f24acee118d1f69e39b3d7b747a28f0
 DIST nv-codec-headers-10.0.26.1.tar.gz 62544 BLAKE2B a19d87101fe0bb511383ca6d5f61fe5a8ecce54827a09ae5526d6b546f50cf14368887550f7689180041e8a36b61ba53c103b8a225a7765670b5d97169d62a62 SHA512 18c507d73efc8b7194bcc79a2e25f88c81390d10766511f9b0c4826cb7b9332e9d0f2667441dd5529575dd1d2c0e0625304ee489c643c9f66ec90f2dbab566c9
 DIST nv-codec-headers-11.0.10.0.tar.gz 66724 BLAKE2B 98fb8cd663ac61ad58f5d463ded9852e94b377991de2f980ec0a0088fcd5d0af98090b76f82e9e7ca242a0ff55e4d4c1ef91c9c6466a6de8d81e97ba2d721e66 SHA512 f4964499a834ba31e073f0b0deabba354eb8351cd135846efd3387313ef4af0750a875d450674ef416f2b2cc7176e9154c1e5033de07f6091b9d0cc7c7ef9cb1
+DIST nv-codec-headers-11.1.5.0.tar.gz 67850 BLAKE2B 27c1ae4a8710bbb1ca72d5009ec4b62c71f1899c128009bf7017603429dc9c47df9894bb0e1eb2fd21986ee713aa24a82e0753a4b196347ad51371d67b2f3dbf SHA512 b973ba763476b083870d7701b63cb98cc5e22d3698e431316c82b8ffd887d430df296938af52ed54478440105ac34f4282b0a8471eb541c1ff77cac9ad33ec3d
 DIST nv-codec-headers-8.1.24.2.tar.gz 53627 BLAKE2B 482c86824f81652b439fba1b765261de107d51a3bd780d3f0c58e1cdd53cd21ddad3fea59e8ab5d920fb34c73e43c10c007a5efe32024bfd3523ed8d4ad26f44 SHA512 daa45ae8bcc11eb6b8d671c2d720d5c3edce9e4ef68f913ed25a8c4d1a4b165e0576b03eff9ce2fe355156ab5a5d8d74573158ef190feec5cfb5ac0838e0caa7
 DIST nv-codec-headers-9.0.18.1.tar.gz 58850 BLAKE2B 8e940ffb929f67c4e459cfd55113298527cf8430b94d20e9bb7148cf532dbed798138e63801f29d168d0b4b465c0eb6ef3c58596289063f461b7d5e8832ce7e8 SHA512 4306ee3c6e72e9e3172b28c5e6166ec3fb9dfdc32578aebda0588afc682f56286dd6f616284c9892907cd413f57770be3662572207a36d6ac65c75a03d381f6f
 DIST nv-codec-headers-9.1.23.1.tar.gz 59400 BLAKE2B a4f437b5abc8bac05bafde4f01a4fa42f7acf2fd4a1d8b7e58f6a5a5e54c95a6ef9d6b510829bed9ed63f804220de460adc6441bf3c0bd451774dacc6f11e43e SHA512 0c1112cb1db98f60e64eeee24e3592b65c31ea8a808de707d4d0a56efb71c9a483bb3af45a641bff1f8422ab44e6be4bffd548b6567305021a448bcd66202b29
 EBUILD nv-codec-headers-10.0.26.0.ebuild 759 BLAKE2B 7ec2db5c03c43de930ccbcf0345a83037c8bda64d104134d66dd53171f2d169c2948dec4ed772ac3f2173fa98a890dba20d83547daa1411bf73025fdf84635c7 SHA512 e9bc9c52ae0edd7bebedca223f3abfd7f9e117d95a793fb3dd6477dd066c1af0e2bfc66da11904436c8e58e7764c73efaf767bb3a67b9cd82012ae0351d2f977
 EBUILD nv-codec-headers-10.0.26.1.ebuild 759 BLAKE2B 7ec2db5c03c43de930ccbcf0345a83037c8bda64d104134d66dd53171f2d169c2948dec4ed772ac3f2173fa98a890dba20d83547daa1411bf73025fdf84635c7 SHA512 e9bc9c52ae0edd7bebedca223f3abfd7f9e117d95a793fb3dd6477dd066c1af0e2bfc66da11904436c8e58e7764c73efaf767bb3a67b9cd82012ae0351d2f977
 EBUILD nv-codec-headers-11.0.10.0.ebuild 729 BLAKE2B 201843335dc4dffb34ad67aa24736331d5913031f9a148edcdbf3a2d8e78112164b43d1eb583f1747fea65a7631473deda078051b6956259336ebd6bfda97807 SHA512 09a1e4d6dbc74c255f47ff0c09510de1fdc8d402f988e491dfe5d1742575e333e32a1e21683e043631e483f9eebfd58613e0263dbd900b76b61540215e1ed3c8
+EBUILD nv-codec-headers-11.1.5.0.ebuild 732 BLAKE2B 00dea0daf2a3437e6bb0536bd1c83eb70a0b9823ac30cb1347ac44d3a6b3d41be589102a88cd6d343715edec7f577169d46e9dce9f91451cc8a913e639f5b34a SHA512 9c4061aef95cb7c923ac39c2ad7080552cf2f2e8ec5fc4936b9b53dfeeda2ce0932e6cc4634f321cc268e607d38c4a302f2912a836bfaf461f95d3d6d255a349
 EBUILD nv-codec-headers-8.1.24.2.ebuild 791 BLAKE2B 1a30ee929c9619f0497c4912b709b3e860227ef5daf466e9319bb4799aaf6de7b377324f779d674b78b45ae23041d65188a4ede6827a1cf35cd913ad36a2c9fb SHA512 258ad2e47ed9dcfabe870010f15670e318d064e35bbc1ed60347b48b91d0be65c941125794e817df013851263657628ee844e08d1c000390ad244960f5b58675
 EBUILD nv-codec-headers-9.0.18.1.ebuild 791 BLAKE2B 883e69bfc8304eff9f48c6095f2356df69ad16f6cfcfe2f4ef23cc648641a69ea9a3f50740e1f1b8305e00d72e10812d69714603bd96c8f2dc42e0322a5b66b4 SHA512 0a947197e469c989d2fe76adc2f303c96ce6e9d441521daa7ca87c4aaf99d7890d19b59c3727d83be54bef1b2279097033d5441ba274b9212958289086e453e6
 EBUILD nv-codec-headers-9.1.23.1.ebuild 758 BLAKE2B 1e5096e56aababfe603c97bc548b18f44cd3f025f23ac2fc522bacc6029848e13a12d5cb9686e2b4b8a9ab4d4cd31849659897e97a1da9be8e2ed43bc4dbbbc8 SHA512 2f4e666dd3d801a775761f836c04b782a87b40aaf0936805b2abadb3c074b2314e1db0e98f7b91b64270367756682c0d72b437c677a5b3c3a66fc5e9e354805a
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.0.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.0.ebuild
new file mode 100644
index 000000000000..a00618c3dc95
--- /dev/null
+++ b/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="FFmpeg version of headers required to interface with Nvidias codec APIs"
+HOMEPAGE="https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
+SRC_URI="https://github.com/FFmpeg/nv-codec-headers/releases/download/n${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=x11-drivers/nvidia-drivers-470.57.02[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	multilib_copy_sources
+	default
+}
+
+multilib_src_compile() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
+}
+
+multilib_src_install() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install
+}
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 18a9eab9e2e8..aad93178aff3 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -12,6 +12,6 @@ DIST opencolorio-2.0.1.tar.gz 9945107 BLAKE2B cb4b152205642abd847b7263db838dbb92
 DIST opencolorio-2.0.2.tar.gz 10812416 BLAKE2B 36f008035c36bef9473f9f79e9362eec20abb8e217a2131d3a2be5766de60cdab36e137547d414bf18e97ad368e30fb89a0ad4d8095b24bd184704d88ef192ae SHA512 ebc6b4b4251f69cb69f7203bc9ae962010f7f60ed5d53eb3ff14b64d5ef8cac2b98d0482485f1adaaf6b8c065cd4edd01c4e0577324a86ed4ebfe8e33e9fa667
 EBUILD opencolorio-1.1.1-r1.ebuild 2627 BLAKE2B 3a04ff5740dd6e830ba17f2356f2a2b87e1de465e7d103fea654ac95438160abd3dda92a7d6503fd2749542fb8d5717f547adf8a445a98db9c39e690949e6200 SHA512 f58868e63953ee16aa995cb6042458c510bfc3892f11f0e2f37a048b28678189d3fd4a787b5d2d4975e5b2fbdbc119d4cb2131d9fc1227bd3b594f807766aabe
 EBUILD opencolorio-2.0.0.ebuild 2773 BLAKE2B f1469f1917fa14f9cec3a9e5bb799a8c4a38b670a5fae43f9468fe7f97f0e49fdffd49f77958e0dee2d2b8367492fa61642b8177bc06290bd37e256cf72d49e4 SHA512 e527cc50a8d148ddb36ebb9d2e661e2be3c5b0558b7d8b8eaa4b2fc935a835954cffab1fb17f60a985b193818f3951d3e305398885ea329713fa7acfb3048650
-EBUILD opencolorio-2.0.1.ebuild 2702 BLAKE2B 6733c6ba420b54df3479186798392f4ed923b8cebebbce75b00b0b40c67175719908511ff47ea25bacb4c36e1d93301a418b77339fc4bd18ca90ec23b9d85d14 SHA512 1565919a9cdcbc8bcc82fd9ec916db28691e86067942b17568d5ecbfaaf3e1695bdc429fdef0b55ec2777305275976b5f8e572dff20c9bc82b552897d940b390
-EBUILD opencolorio-2.0.2.ebuild 2708 BLAKE2B 3e1081e167d56e1eed3f0b9a211442b9568153efc6c74d8b4ba9718c770d6cbfc12547d6dee1693f76e2336c6a74ab4d060d10548aa684bd02582c38b1c7bb81 SHA512 efee09f6ce289b679d4c9035ee33eb62f773f9fa5460af1cf04ce405b8beca91f4cebe2d5875a1eda40377fa332cf834b07bf4aa5498a2c45cb6c4e1619594e3
+EBUILD opencolorio-2.0.1.ebuild 2709 BLAKE2B aa368b450adc2a11c09179d573bbc9999a220500b377bcaec4630dd4c05f2465987e01450744abea60edffee88119564e210eab96d4024aba59829ef8e863564 SHA512 5528729ab388d3045d5847963daddd038bd06d814a0c1078641c312117febbad76bdc56fcbed70b265f0c5c05955784c57d66df3735f49a1b31dbdd316f6db55
+EBUILD opencolorio-2.0.2.ebuild 2745 BLAKE2B 60e63b2ab268d418d3e7a846f31f301d7ca27e8a96e22a7ccd12d6e74c6138de2c3cfc93aafe79cbda980fa310a8d28debf615a01bc98500e4d27fb7f5e25225 SHA512 480def1802d5112fa44c21ecaa6ff0d1a31a0dae2054a3980a658b4bb7a3810635b0f31080b516e15e68a3fc6dcd47fb519a06d348c52efd930cc8ff38eb0035
 MISC metadata.xml 460 BLAKE2B 564c46a6d12ec479bfbe92401cda933760a3fbfd72b83221f8edc927a01eb5f18ecab877184b95aa5bcc8af20a0c36fbff8c6f45bf7ce2996c795b0f8fac1c9c SHA512 d58b105d94f1f11e52f1e88b9cb24885b5369207c3fa2a6ab4c2133c22e2b47a887a8358b79ea53cc9bdd63a44bb18672e5d26d614074e0bc08539cb4e73b49a
diff --git a/media-libs/opencolorio/opencolorio-2.0.1.ebuild b/media-libs/opencolorio/opencolorio-2.0.1.ebuild
index 48d1c400dd1a..a164851fb44a 100644
--- a/media-libs/opencolorio/opencolorio-2.0.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/O
 SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/OpenColorIO-${PV}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 LICENSE="BSD"
 SLOT="0"
 IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
diff --git a/media-libs/opencolorio/opencolorio-2.0.2.ebuild b/media-libs/opencolorio/opencolorio-2.0.2.ebuild
index 1367951a8fda..7bef3bb4a1b0 100644
--- a/media-libs/opencolorio/opencolorio-2.0.2.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.0.2.ebuild
@@ -77,6 +77,7 @@ src_configure() {
 		-DOCIO_BUILD_DOCS=$(usex doc)
 		-DOCIO_BUILD_APPS=$(usex opengl)
 		-DOCIO_BUILD_PYTHON=$(usex python)
+		-DOCIO_PYTHON_VERSION="${EPYTHON}"
 		-DOCIO_BUILD_JAVA=OFF
 		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
 		-DOCIO_BUILD_TESTS=$(usex test)
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index fbbd012f97aa..03d11c31a6a3 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,17 +1,15 @@
 AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857
 AUX openexr-2.5.7-0001-disable-testRgba-on-sparc.patch 937 BLAKE2B e2e432649100457a3273b50aa6725625ac50f48bf95bb04b85a2587a44d4c9e87662a36b68c3b7ac0c741068223e439fb51c1b69d5ae8f852794b0a7ee238d4a SHA512 8c640d67f2db6ed2789b8e25dd25e6ba8db6b3ed0ddb2138027ca579b3fe5db43b60d5bffc4de3f31ba60521c6479cf89f1ff7a8b2bbba97dd22c13279b92f81
 AUX openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch 687 BLAKE2B 49aaf9d5282ad878ec415413106540d4a92aecceebbc9a03e30a4289377ec1d8ec4e1bacf49e0cec80a44e75f7f345c885c4746092c4dc3d57b03b317631d4d5 SHA512 9bcb62eec3bdf05ba54dff037ccd71e5e1dcd37831246f95d7803f1710b7335d930292dd27b5a6ddd927c45e7734d61d3a42a637fdf7e83724830f21b3d3db9e
-AUX openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch 6235 BLAKE2B bbde922a018390d11685ef76c3202419c639f8075adfbe5952bed585055376375fb2bd31463c140500feee1867245d6a6f7c59888d1d0f06979834dc181dc45c SHA512 ab3a405f119ce1f6e478923e99203a8ee6122d9a585f5d667555aefa6402e85def2df8410c88a20eb3e4b1c298f9f90f7a2ddd9377f75b57d40485a2ac9890c8
-AUX openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch 9741 BLAKE2B f92fd894f339bce71fa1b63437fafa033c0f4d3bc164534b824ed44e00d1c23de2191b44168952d89969d4a36b7635476740543b0b093c048680fffb6a2e54aa SHA512 a5ba9b29cd63d6bd65adf3a181dbada23720a98ff683262f08be88aaff4cbfce6286e5067e666db08978b9617a61a1d05503cbac25aa86b26f632b384bd63a43
 AUX openexr-3.1.1-0001-changes-needed-for-proper-slotting.patch 6243 BLAKE2B 7c2d2f23153c098027f9edf2671dfa86d7b5924c3e1256db1dc9d3925e4e1f2b354e5524da25d90ef9f7123103947856820f426e51dd6e977fd098e6f35311ee SHA512 3a79c3eb66ff63b92fe45d51b2fbf25c2b4c863e12b4f59a8ea2e8275e3647d23af66d8133dc49dd935e5b5c4383455ce02bac767a4b84c8999285d57573b3a0
 AUX openexr-3.1.1-0002-add-version-to-binaries-for-slotting.patch 10834 BLAKE2B e789a55f14968089b27648e7989bfcb29e4fe634417348dffa8c24a6faafb85bdd9f9f523dc31a2ed26ec2e9d0ff2a2a3f5869317a20014b142085a6720c92f9 SHA512 b187ab8a4c25ffb865293eabb489232d151bfb9260cf2fd4700011e240029b91faa1d072e2f3c5865f79de7d5facfb5bb32fd53ece9f7338f9164c63d5d442f9
 AUX openexr-3.1.1-0003-disable-failing-test.patch 1193 BLAKE2B d4a40151e2c0b2278bfbec06b88d1a2b1a0caccb651a53aa4d54945524e3c79fb03d9031540ed0f423be4503fff0881b2185cc33b614a2508135cec3113f9384 SHA512 e07602d78d15ab0f1076d7b5d3f3d16912e9d0ad792703af1b1d3d8fcf472eef2e410efc2abed2da70e39a97f4dd9194a47c6de50484da799d49cf44e62c9167
 DIST openexr-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
 DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
-DIST openexr-3.0.5.tar.gz 25060148 BLAKE2B 24b5601e27342eeff831219f75416797c30afb1ca28ae0a0692d97169297584da503d016c6dda80f63bd5bb9c9a31dc7f91d7713e6fc217a2760af2c662406f0 SHA512 7a0f83320ad5e1d8f8414b5175a64eef3c6b06a7ccd7d66d0aa21472ea22146e2617ff10c20e04203fc2a3326d8bac2d95023bec315badb03e6a006596b64595
 DIST openexr-3.1.1.tar.gz 25588029 BLAKE2B c2ce9622ad7b8a328ce556b6120a868cddb86e908917e001f543e70501b6d31ce549fc10d65806dd9d63e63872b273ad3a1d4f6813b5d23ea238c238f5815304 SHA512 430becbb214cedec5a57e9ff2363badd8a2d94e8a00edffbc75fbcf30d26d887a6eb3f4ff96e371cb26f9d44e63bf0fe2dc511493a0951171ddc64bba7aed735
-EBUILD openexr-2.5.6.ebuild 1690 BLAKE2B eab42b0f5ce389e642e80fc4a53a3721d883d22332f5e773a86aa19ae85cf0f0002b38e9cc0266f2dc00c1b8aac722957a987e266efbdb304dda674fcc958e9a SHA512 100e7b271952985f3e576aca1965345a7ed5dfbbef070cb22ba1d8907a22de436a57b2eeb2500707c11db1ed2e1179778e75820b651309557ef5d20cc73da87c
-EBUILD openexr-2.5.7.ebuild 2119 BLAKE2B 2859ee7c6f2e23540602129626218829275be14f45104f4bc3e1c712303cc1d1d1c79e109712a49406a890024bbd346355901e5b0654e75d2fee96c05275437f SHA512 c62b232f81eab0d2ace75e0616f91a04ac926e4e0d83c49b1aa87b489860b5060bd0f61dcf8dfc0e4c5792fcc4a570d8bf720caf0657f9aa234a34cb9cbf34a4
-EBUILD openexr-3.0.5.ebuild 2147 BLAKE2B 4620226043268d73a1e290003849584d46604e42b04e18cf67ed918a41cb376b5951387a485cef227295ee4630d3e137a829081baf7c16ab53d701ec96bac88c SHA512 198c920c8457c94148a9880c7ab4c843bb3cedad6c60b6d42305962e251885ef2ea81c3ef0f584d42f663584832e448e65d6c971bfd2184fc27e77e10683d6dd
-EBUILD openexr-3.1.1.ebuild 2128 BLAKE2B 6b26c0ca2acc299e2371857fbcc6580d795deef5cb04a0283fb7a31079c600862f03e8273ca5b4fab7eb0119d467db6bbb138e19eceb6ee3dfcebf2a92f1066f SHA512 184c8520b6c523c0af0421f4d9b4ed03add57d9d1d749387e18cea5d1efb0d40f146e98401255e7fc7b12acb618f796181822bb74073884e826440a435b6e344
+DIST openexr-3.1.2.tar.gz 20315253 BLAKE2B d11f26d3e2bb098c4c009271b40da1eca97b120e5683137a0b38f64e2862c226aebff7c17e79344da4a1be5a1967fb8ab0493ff919a7fb5bec16b34e494e49e2 SHA512 34fb28f149e49bb23b2dc230dd5277229f2c780de66aff0acc819601e6802a1dbf83110b5df455dffd63be6eaa286d4aedb4b0af559b8b034d98c3208ee9d969
+EBUILD openexr-2.5.6.ebuild 1743 BLAKE2B 8b2158c878589a878da14d945ff955e3b98b17c6da06470ac15965797a7f8096fb721f7ccbc2984394b0e4b341c0c5efe2c552453c702c095e725d997061eb98 SHA512 6bc52d858d7be2e73061572575658ca224e9bf696beff4e7015da3edca8b1da231e690b32cf152af4c046223d61bd9815da7e009f649bd658fafdc52618798b2
+EBUILD openexr-2.5.7.ebuild 2171 BLAKE2B fb59902ef509b75d58b1df078d3bb7ef9bf866fc55ee5de8211721745fbf048d2431aba65d1627ed9748862e751c04f58c51b50355fa34f3d22f163fbdde2a14 SHA512 4a91fa4d593dfc94aba295d5572ed9f7c73e9ccdba52b4f38053a0431bd4a89e1b195aa50aed4f5297464838815d62dbe388b24f72ff29ff40bcb0396c8c6e09
+EBUILD openexr-3.1.1.ebuild 2215 BLAKE2B a3916bf03903c147682f8e99d7e16c9dd7118293c07fe1fa8afb1da8290beb53a94cd26dd7d197f4c861b1e80615491ee138f115ec793ee64f8581fb6e057606 SHA512 d55549195644ae45c1eea31248973f43cc0b0166adedd40af303e24782f65523aee0f7974ff10617cd584915512eaf3d8add5718afe1b838c67aff403b43a709
+EBUILD openexr-3.1.2.ebuild 2110 BLAKE2B 69de4064b65a7a7588ad374fed0c65c903493c3986d56ed6c300949a3c50df333ef84e497aee650c6d9b4744445f85fd1748d2558aac3493e11c13dd542fd0b3 SHA512 f8e4ce99226ccab661f8e26f81026ada221655ef2744338b27b984096c442f4d792a90c71b10f391c8e497b45c2a94a4d063ab55da869972d70655e9c24b6822
 MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch b/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch
deleted file mode 100644
index 30991f423b00..000000000000
--- a/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Fri, 2 Jul 2021 17:46:33 +0200
-Subject: [PATCH] changes needed for proper slotting
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- cmake/CMakeLists.txt             | 8 ++++----
- cmake/LibraryDefine.cmake        | 8 ++++----
- cmake/OpenEXR.pc.in              | 4 ++--
- cmake/OpenEXRLibraryDefine.cmake | 8 ++++----
- 4 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 2014d27..7dfb2f2 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -200,7 +200,7 @@ if(OPENEXR_INSTALL_PKG_CONFIG)
-         DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-     )
-   endfunction()
--  openexr_pkg_config_help(OpenEXR.pc.in)
-+  openexr_pkg_config_help(OpenEXR-${OpenEXR_VERSION_MAJOR}.pc.in)
- else()
-   message(STATUS "-- pkg-config generation disabled")
- endif()
-@@ -220,7 +220,7 @@ include(CMakePackageConfigHelpers)
- if(OPENEXR_INSTALL)
- configure_package_config_file(${PROJECT_NAME}Config.cmake.in
-   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
--  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
- )
- write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-   VERSION ${PROJECT_VERSION}
-@@ -229,11 +229,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
- 
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-               ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
- )
- 
- install(EXPORT ${PROJECT_NAME}
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
-   FILE ${PROJECT_NAME}Targets.cmake
-   NAMESPACE ${PROJECT_NAME}::
-   EXPORT_LINK_INTERFACE_LIBRARIES
-diff --git a/cmake/LibraryDefine.cmake b/cmake/LibraryDefine.cmake
-index aa5bb46..2767420 100644
---- a/cmake/LibraryDefine.cmake
-+++ b/cmake/LibraryDefine.cmake
-@@ -79,8 +79,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
-     install(TARGETS ${libname}
-       EXPORT ${PROJECT_NAME}
-       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
-+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
-       INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-       PUBLIC_HEADER
-         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR}
-@@ -90,8 +90,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
-     set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
-     set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
--    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
--    install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")")
-+    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-+    install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} ${baselibname} -> ${verlibname}\")")
-     set(verlibname)
-     set(baselibname)
-   endif()
-diff --git a/cmake/OpenEXR.pc.in b/cmake/OpenEXR.pc.in
-index 7d9bb7c..c7e1dd6 100644
---- a/cmake/OpenEXR.pc.in
-+++ b/cmake/OpenEXR.pc.in
-@@ -5,9 +5,9 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=@libdir@/@OPENEXR_OUTPUT_SUBDIR@
- includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+OpenEXR_includedir=@includedir@/@OPENEXR_OUTPUT_SUBDIR@
- libsuffix=@LIB_SUFFIX_DASH@
- 
- Name: OpenEXR
-diff --git a/cmake/OpenEXRLibraryDefine.cmake b/cmake/OpenEXRLibraryDefine.cmake
-index 8022e2e..9f919c8 100644
---- a/cmake/OpenEXRLibraryDefine.cmake
-+++ b/cmake/OpenEXRLibraryDefine.cmake
-@@ -54,8 +54,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
-     install(TARGETS ${libname}
-       EXPORT ${PROJECT_NAME}
-       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
-+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
-       INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-       PUBLIC_HEADER
-         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR}
-@@ -65,8 +65,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
-     set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
-     set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
--    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
--    install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR} ${baselibname} -> ${verlibname}\")")
-+    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-+    install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR}/${OPENEXR_OUTPUT_SUBDIR} ${baselibname} -> ${verlibname}\")")
-     set(verlibname)
-     set(baselibname)
-   endif()
--- 
-2.32.0
-
diff --git a/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch b/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch
deleted file mode 100644
index d6c6b532c879..000000000000
--- a/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 22 May 2021 17:04:12 +0200
-Subject: [PATCH] add version to binaries for slotting
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- src/bin/exr2aces/CMakeLists.txt       | 10 +++++-----
- src/bin/exrenvmap/CMakeLists.txt      | 10 +++++-----
- src/bin/exrheader/CMakeLists.txt      | 10 +++++-----
- src/bin/exrmakepreview/CMakeLists.txt | 10 +++++-----
- src/bin/exrmaketiled/CMakeLists.txt   | 10 +++++-----
- src/bin/exrmultipart/CMakeLists.txt   | 10 +++++-----
- src/bin/exrmultiview/CMakeLists.txt   | 10 +++++-----
- src/bin/exrstdattr/CMakeLists.txt     | 10 +++++-----
- 8 files changed, 40 insertions(+), 40 deletions(-)
-
-diff --git a/src/bin/exr2aces/CMakeLists.txt b/src/bin/exr2aces/CMakeLists.txt
-index 72c4e1c..ede5973 100644
---- a/src/bin/exr2aces/CMakeLists.txt
-+++ b/src/bin/exr2aces/CMakeLists.txt
-@@ -1,14 +1,14 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
- 
--add_executable(exr2aces main.cpp)
--target_link_libraries(exr2aces OpenEXR::OpenEXR)
--set_target_properties(exr2aces PROPERTIES
-+add_executable(exr2aces-${OpenEXR_VERSION_MAJOR} main.cpp)
-+target_link_libraries(exr2aces-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exr2aces-${OpenEXR_VERSION_MAJOR} PROPERTIES
-   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
--  install(TARGETS exr2aces DESTINATION ${CMAKE_INSTALL_BINDIR})
-+  install(TARGETS exr2aces-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
--  target_compile_definitions(exr2aces PRIVATE OPENEXR_DLL)
-+  target_compile_definitions(exr2aces-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrenvmap/CMakeLists.txt b/src/bin/exrenvmap/CMakeLists.txt
-index bbd26c0..cbe8401 100644
---- a/src/bin/exrenvmap/CMakeLists.txt
-+++ b/src/bin/exrenvmap/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
- 
--add_executable( exrenvmap
-+add_executable( exrenvmap-${OpenEXR_VERSION_MAJOR}
-   makeLatLongMap.cpp
-   readInputImage.cpp
-   resizeImage.cpp
-@@ -11,13 +11,13 @@ add_executable( exrenvmap
-   EnvmapImage.cpp
- )
- 
--target_link_libraries(exrenvmap OpenEXR::OpenEXR)
--set_target_properties(exrenvmap PROPERTIES
-+target_link_libraries(exrenvmap-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrenvmap-${OpenEXR_VERSION_MAJOR} PROPERTIES
-   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
--  install(TARGETS exrenvmap DESTINATION ${CMAKE_INSTALL_BINDIR})
-+  install(TARGETS exrenvmap-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
--  target_compile_definitions(exrenvmap PRIVATE OPENEXR_DLL)
-+  target_compile_definitions(exrenvmap-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrheader/CMakeLists.txt b/src/bin/exrheader/CMakeLists.txt
-index c427445..b8b0e9a 100644
---- a/src/bin/exrheader/CMakeLists.txt
-+++ b/src/bin/exrheader/CMakeLists.txt
-@@ -1,14 +1,14 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
- 
--add_executable(exrheader main.cpp)
--target_link_libraries(exrheader OpenEXR::OpenEXR)
--set_target_properties(exrheader PROPERTIES
-+add_executable(exrheader-${OpenEXR_VERSION_MAJOR} main.cpp)
-+target_link_libraries(exrheader-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrheader-${OpenEXR_VERSION_MAJOR} PROPERTIES
-   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
--  install(TARGETS exrheader DESTINATION ${CMAKE_INSTALL_BINDIR})
-+  install(TARGETS exrheader-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
--  target_compile_definitions(exrheader PRIVATE OPENEXR_DLL)
-+  target_compile_definitions(exrheader-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrmakepreview/CMakeLists.txt b/src/bin/exrmakepreview/CMakeLists.txt
-index bb8b548..03c0687 100644
---- a/src/bin/exrmakepreview/CMakeLists.txt
-+++ b/src/bin/exrmakepreview/CMakeLists.txt
-@@ -1,17 +1,17 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
- 
--add_executable(exrmakepreview
-+add_executable(exrmakepreview-${OpenEXR_VERSION_MAJOR}
-   main.cpp
-   makePreview.cpp
- )
--target_link_libraries(exrmakepreview OpenEXR::OpenEXR)
--set_target_properties(exrmakepreview PROPERTIES
-+target_link_libraries(exrmakepreview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrmakepreview-${OpenEXR_VERSION_MAJOR} PROPERTIES
-   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
--  install(TARGETS exrmakepreview DESTINATION ${CMAKE_INSTALL_BINDIR})
-+  install(TARGETS exrmakepreview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
--  target_compile_definitions(exrmakepreview PRIVATE OPENEXR_DLL)
-+  target_compile_definitions(exrmakepreview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrmaketiled/CMakeLists.txt b/src/bin/exrmaketiled/CMakeLists.txt
-index 6c8dfa5..7116b54 100644
---- a/src/bin/exrmaketiled/CMakeLists.txt
-+++ b/src/bin/exrmaketiled/CMakeLists.txt
-@@ -1,18 +1,18 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors (c) to the OpenEXR Project.
- 
--add_executable(exrmaketiled 
-+add_executable(exrmaketiled-${OpenEXR_VERSION_MAJOR}
-   makeTiled.cpp
-   main.cpp
-   Image.cpp
- )
--target_link_libraries(exrmaketiled OpenEXR::OpenEXR)
--set_target_properties(exrmaketiled PROPERTIES
-+target_link_libraries(exrmaketiled-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrmaketiled-${OpenEXR_VERSION_MAJOR} PROPERTIES
-   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
--  install(TARGETS exrmaketiled DESTINATION ${CMAKE_INSTALL_BINDIR})
-+  install(TARGETS exrmaketiled-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
--  target_compile_definitions(exrmaketiled PRIVATE OPENEXR_DLL)
-+  target_compile_definitions(exrmaketiled-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrmultipart/CMakeLists.txt b/src/bin/exrmultipart/CMakeLists.txt
-index 7f8fc1b..dad8c8d 100644
---- a/src/bin/exrmultipart/CMakeLists.txt
-+++ b/src/bin/exrmultipart/CMakeLists.txt
-@@ -1,14 +1,14 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
- 
--add_executable(exrmultipart exrmultipart.cpp)
--target_link_libraries(exrmultipart OpenEXR::OpenEXR)
--set_target_properties(exrmultipart PROPERTIES
-+add_executable(exrmultipart-${OpenEXR_VERSION_MAJOR} exrmultipart.cpp)
-+target_link_libraries(exrmultipart-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrmultipart-${OpenEXR_VERSION_MAJOR} PROPERTIES
-   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
--  install(TARGETS exrmultipart DESTINATION ${CMAKE_INSTALL_BINDIR})
-+  install(TARGETS exrmultipart-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
--  target_compile_definitions(exrmultipart PRIVATE OPENEXR_DLL)
-+  target_compile_definitions(exrmultipart-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrmultiview/CMakeLists.txt b/src/bin/exrmultiview/CMakeLists.txt
-index bbac3a6..eba48c1 100644
---- a/src/bin/exrmultiview/CMakeLists.txt
-+++ b/src/bin/exrmultiview/CMakeLists.txt
-@@ -1,18 +1,18 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
- 
--add_executable(exrmultiview
-+add_executable(exrmultiview-${OpenEXR_VERSION_MAJOR}
-   makeMultiView.cpp
-   main.cpp
-   Image.cpp
- )
--target_link_libraries(exrmultiview OpenEXR::OpenEXR)
--set_target_properties(exrmultiview PROPERTIES
-+target_link_libraries(exrmultiview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrmultiview-${OpenEXR_VERSION_MAJOR} PROPERTIES
-   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
--  install(TARGETS exrmultiview DESTINATION ${CMAKE_INSTALL_BINDIR})
-+  install(TARGETS exrmultiview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
--  target_compile_definitions(exrmultiview PRIVATE OPENEXR_DLL)
-+  target_compile_definitions(exrmultiview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
-diff --git a/src/bin/exrstdattr/CMakeLists.txt b/src/bin/exrstdattr/CMakeLists.txt
-index 79205fc..35ac580 100644
---- a/src/bin/exrstdattr/CMakeLists.txt
-+++ b/src/bin/exrstdattr/CMakeLists.txt
-@@ -1,14 +1,14 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright (c) Contributors to the OpenEXR Project.
- 
--add_executable(exrstdattr main.cpp)
--target_link_libraries(exrstdattr OpenEXR::OpenEXR)
--set_target_properties(exrstdattr PROPERTIES
-+add_executable(exrstdattr-${OpenEXR_VERSION_MAJOR} main.cpp)
-+target_link_libraries(exrstdattr-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
-+set_target_properties(exrstdattr-${OpenEXR_VERSION_MAJOR} PROPERTIES
-   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
- )
- if(OPENEXR_INSTALL_TOOLS)
--  install(TARGETS exrstdattr DESTINATION ${CMAKE_INSTALL_BINDIR})
-+  install(TARGETS exrstdattr-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- if(WIN32 AND BUILD_SHARED_LIBS)
--  target_compile_definitions(exrstdattr PRIVATE OPENEXR_DLL)
-+  target_compile_definitions(exrstdattr-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
- endif()
--- 
-2.31.1
-
diff --git a/media-libs/openexr/openexr-2.5.6.ebuild b/media-libs/openexr/openexr-2.5.6.ebuild
index ec9bb6f201d0..0583348afc4f 100644
--- a/media-libs/openexr/openexr-2.5.6.ebuild
+++ b/media-libs/openexr/openexr-2.5.6.ebuild
@@ -13,7 +13,8 @@ S="${WORKDIR}/${P}/OpenEXR"
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/openexr/openexr-2.5.7.ebuild b/media-libs/openexr/openexr-2.5.7.ebuild
index 241131a5bc3a..990a17843d0d 100644
--- a/media-libs/openexr/openexr-2.5.7.ebuild
+++ b/media-libs/openexr/openexr-2.5.7.ebuild
@@ -13,7 +13,8 @@ S="${WORKDIR}/${P}/OpenEXR"
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/openexr/openexr-3.0.5.ebuild b/media-libs/openexr/openexr-3.0.5.ebuild
deleted file mode 100644
index 242e04c95413..000000000000
--- a/media-libs/openexr/openexr-3.0.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic toolchain-funcs
-
-MY_PN=OpenEXR
-MY_PV=$(ver_cut 1)
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3/29" # based on SONAME
-# imath needs keywording: arm{,64}, hppa, ia64, ppc{,64}, sparc, x64-macos, x86-solaris
-KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-libs/imath-${PV}:=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch
-	"${FILESDIR}"/${P}-0002-add-version-to-binaries-for-slotting.patch
-)
-
-DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
-
-src_prepare() {
-	# Fix path for testsuite
-	sed -e "s:/var/tmp/:${T}:" \
-		-i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests"
-
-	cmake_src_prepare
-
-	mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DBUILD_TESTING=$(usex test)
-		-DOPENEXR_BUILD_UTILS=$(usex utils)
-		-DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
-		-DOPENEXR_ENABLE_THREADING=$(usex threads)
-		-DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
-		-DOPENEXR_INSTALL_PKG_CONFIG=ON
-		-DOPENEXR_INSTALL_TOOLS=$(usex utils)
-		-DOPENEXR_OUTPUT_SUBDIR="${MY_P}"
-		-DOPENEXR_USE_CLANG_TIDY=OFF		# don't look for clang-tidy
-	)
-
-	use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
-
-	cmake_src_configure
-}
-
-src_install() {
-	if use doc; then
-		DOCS+=( docs/*.pdf )
-	fi
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-	cmake_src_install
-
-	cat > "${T}"/99${PN}3 <<-EOF || die
-	LDPATH=/usr/$(get_libdir)/${MY_P}
-	EOF
-	doenvd "${T}"/99${PN}3
-}
diff --git a/media-libs/openexr/openexr-3.1.1.ebuild b/media-libs/openexr/openexr-3.1.1.ebuild
index 572fb41e9506..915f1405d3d7 100644
--- a/media-libs/openexr/openexr-3.1.1.ebuild
+++ b/media-libs/openexr/openexr-3.1.1.ebuild
@@ -16,7 +16,8 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/
 LICENSE="BSD"
 SLOT="3/30" # based on SONAME
 # imath needs keywording: x64-macos, x86-solaris
-KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 -ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/openexr/openexr-3.1.2.ebuild b/media-libs/openexr/openexr-3.1.2.ebuild
new file mode 100644
index 000000000000..7b41f0eca9df
--- /dev/null
+++ b/media-libs/openexr/openexr-3.1.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN=OpenEXR
+MY_PV=$(ver_cut 1)
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3/30" # based on SONAME
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/imath-3.1.0:=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( dev-python/breathe )
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.1-0001-changes-needed-for-proper-slotting.patch
+	"${FILESDIR}"/${PN}-3.1.1-0002-add-version-to-binaries-for-slotting.patch
+	"${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch
+)
+
+DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
+
+src_prepare() {
+	# Fix path for testsuite
+	sed -e "s:/var/tmp/:${T}:" \
+		-i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests"
+
+	cmake_src_prepare
+
+	mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DBUILD_TESTING=$(usex test)
+		-DDOCS=$(usex doc)
+		-DOPENEXR_BUILD_TOOLS=$(usex utils)
+		-DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
+		-DOPENEXR_ENABLE_THREADING=$(usex threads)
+		-DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
+		-DOPENEXR_INSTALL_PKG_CONFIG=ON
+		-DOPENEXR_INSTALL_TOOLS=$(usex utils)
+		-DOPENEXR_OUTPUT_SUBDIR="${MY_P}"
+		-DOPENEXR_USE_CLANG_TIDY=OFF		# don't look for clang-tidy
+	)
+
+	use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
+
+	cmake_src_configure
+}
+
+src_install() {
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+	cmake_src_install
+
+	newenvd - 99${PN}3 <<-EOF
+		LDPATH=/usr/$(get_libdir)/${MY_P}
+	EOF
+}
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 39fd8d3312da..5aaaf0e95513 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -2,4 +2,4 @@ AUX openjpeg-2.4.0-gnuinstalldirs.patch 15977 BLAKE2B d1036c329d2f1b829e0bc019d2
 DIST openjpeg-2.4.0.tar.gz 2233229 BLAKE2B ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf SHA512 55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8
 DIST openjpeg-data_20201130.tar.gz 497969983 BLAKE2B 35ff1ee234e3bbf47a822151c97cdf2764f864094973fa60adc7962f8065b38318b0cc41338b5ba3fffd9bb00eac3eaf4153ecc398abd49a8047168414c1c85b SHA512 4c367c8262fe894f90a1e63fb59d87e974ae0d750d3cee89adfe4d765040f0a2049b491a17a34a5b3ba79e183a508c9d592376fe3c112df56c311bf3212f0c31
 EBUILD openjpeg-2.4.0.ebuild 4467 BLAKE2B c1940c9c26d9e010fee76fe1c5c894a0fbffa5be2bc8eba8bb6d1d74b28e37f3a1e1eaad6a9bab60e58ce82942019a7fe796b2672c518c7c519b5cd05d2778fb SHA512 40d63968fb5f16b086ed154ef407a02f1cac452e82ce4fbd853f05ec76ef336db75be867dd1767c2845019eab72e3a6142d0de526b870b1b9f6d8b847441def2
-MISC metadata.xml 364 BLAKE2B ad5ed0f600df870752a5bed4046b38b4eb3e369033589cf1212a75717739154f9fdff9537dba125229caea63091b5991b631d828489bc14aa4e4a85f30203782 SHA512 9f551fc5a5c78854563cade31d7c66b3aef14ff7326232073d27f14edf9aa6b9c902d29b50985e5ac713fbcc033ca4d462075faaaa2f5ff9f0f311b421095bbc
+MISC metadata.xml 311 BLAKE2B f7da3c88ae13437c6dbd48c7468f091d1b87bea39a53a85b4abc97d6beb3869c5bb9bd0aeafb065961611be1098a25fdafd8f9b0eb6e395a0de734fc2df53dd5 SHA512 a5a60bfea83513d0eba56f9873bc2d38ca89bc2fade19744d32b767120b5c9e29f56ebddb903648643517f6e2488525e538a1810d91cc864640312c05b7031b2
diff --git a/media-libs/openjpeg/metadata.xml b/media-libs/openjpeg/metadata.xml
index 2001f66c697b..7fa8ba2aacfa 100644
--- a/media-libs/openjpeg/metadata.xml
+++ b/media-libs/openjpeg/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="google-code">openjpeg</remote-id>
 		<remote-id type="sourceforge">openjpeg.mirror</remote-id>
 		<remote-id type="github">uclouvain/openjpeg</remote-id>
 	</upstream>
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 02f9f415b4dd..d8fcc1c55d65 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -3,5 +3,7 @@ AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82
 AUX opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch 1620 BLAKE2B 5c7e721f8754d50fdffb468009a2cc67c926ecb8abe3c0c2e5c60f15cac5f778222074f639b0040b98f405eb392f3d9c97358ed3302832fb32a1417d6bc36311 SHA512 b919c3c3f8c3190b683c5bc02cb523821200bbe951d65e2543d6f0f818ee1bcc4117c3140857becf032c54fd58aa4ee2f06b8f8cf550f72f3df9c5b21f483cb1
 AUX opensubdiv-3.4.3-install-tutorials-into-bin.patch 2239 BLAKE2B d35a7118b742244f045aa5c0e5e1ab42a8eea98cac377b9fb0efd8948e2b13d2be973aa17714a8554a97061a8de0769861947cf9c890bcf81acff593b3f34ae5 SHA512 2e86d3f73568c16c839d783574abfb765432b3bf9171b73da8eab9c86be4c736912b892879cb04d974046fb90c5fdf2e60669cc94d468d5aec51573c0ffdcaa6
 DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed SHA512 44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2
+DIST opensubdiv-3.4.4.tar.gz 39228037 BLAKE2B 53bada3ff2652c6041a3becaf037b593c0e1e4c1bd57a285e6c068c11060b06f9ab0617284a57d0e8974f80082abd6563930ede8b1d6bfb801bfa61dd3256445 SHA512 fc8f28b79347015c8991150535c1339e695d96947c72fadd4fa27b546a0813c1125cd175ee03bed5aacdb3609f74c4e526ef70103d1195ba9f7df041e73ea9fb
 EBUILD opensubdiv-3.4.3.ebuild 2364 BLAKE2B 69170fed94197b2f7d1b8163b9c87bec8135678a18675ada98018110644bc3a842616633812df6529d5b12cb11f6b1fdc413c248cd4ee8cd2cd4c3039b30e54c SHA512 0b0e981af5d29f3271fc2cc1d710e071de2b27989aa407ebd215eda91163882ee1970353841dda060515a648d91244317379ecb89121f8894e0dc679cad01af6
+EBUILD opensubdiv-3.4.4.ebuild 2241 BLAKE2B eb21a7c9f77c9eb37b8da3da3a0c8abc16580262c49cce55b8f299e4abcbbae91e2c2b786e620eef92885b2dd02e5f1d2125a732d82da3097ff19f90e5743599 SHA512 92ee98ad664b1012690532fc3439d554dccb6c4812e21ec811c5b8c7d15696e3f4068d2372c121e8076addd4e72f306cf9185886facba3c9773089001f881c93
 MISC metadata.xml 1036 BLAKE2B cc36d0e341535d825d18bc4485cadd6c46b907bacc5fb52421aecd4e194cae73165d9708502dff6ac748396176df6a29c2920b99cb2eb9f841ff26b5de1eb916 SHA512 057a0aa062daed49dcab313aaf049a1ce41a10fa98e6c73c809e7d441689505db27bc0f52785c407226f642c69f65b54a211bccd1690f43eb6f4246faef94984
diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.4.ebuild
new file mode 100644
index 000000000000..20acfdfe73a3
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.4.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake toolchain-funcs
+
+MY_PV="$(ver_rs "1-3" '_')"
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html"
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenSubdiv-${MY_PV}"
+
+# Modfied Apache-2.0 license, where section 6 has been replaced.
+# See for example CMakeLists.txt for details.
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="cuda examples opencl openmp ptex tbb test tutorials"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/glew:=
+	media-libs/glfw:=
+	x11-libs/libXinerama
+	cuda? ( dev-util/nvidia-cuda-toolkit:* )
+	opencl? ( virtual/opencl )
+	ptex? ( media-libs/ptex )
+"
+DEPEND="
+	${RDEPEND}
+	tbb? ( dev-cpp/tbb )
+"
+BDEPEND="
+	cuda? ( <sys-devel/gcc-9[cxx] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
+	"${FILESDIR}/${PN}-3.3.0-add-CUDA9-compatibility.patch"
+	"${FILESDIR}/${PN}-3.4.3-install-tutorials-into-bin.patch"
+)
+
+pkg_pretend() {
+	if use cuda; then
+		[[ $(gcc-major-version) -gt 8 ]] && \
+		eerror "USE=cuda requires gcc < 9. Run gcc-config to switch your default compiler" && \
+		die "Need gcc version earlier than 9"
+	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	# GLTESTS are disabled as portage is unable to open a display during test phase
+	# TODO: virtx work?
+	local mycmakeargs=(
+		-DGLEW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
+		-DGLFW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
+		-DNO_CLEW=ON
+		-DNO_CUDA=$(usex !cuda)
+		# Docs needed Python 2 so disabled
+		# bug #815172
+		-DNO_DOC=ON
+		-DNO_EXAMPLES=$(usex !examples)
+		-DNO_GLTESTS=ON
+		-DNO_OMP=$(usex !openmp)
+		-DNO_OPENCL=$(usex !opencl)
+		-DNO_PTEX=$(usex !ptex)
+		-DNO_REGRESSION=$(usex !test)
+		-DNO_TBB=$(usex !tbb)
+		-DNO_TESTS=$(usex !test)
+		-DNO_TUTORIALS=$(usex !tutorials)
+	)
+
+	# Fails with building cuda kernels when using multiple jobs
+	export MAKEOPTS="-j1"
+
+	cmake_src_configure
+}
diff --git a/media-libs/pcaudiolib/Manifest b/media-libs/pcaudiolib/Manifest
index 72b8e4706cb5..859b78a7710e 100644
--- a/media-libs/pcaudiolib/Manifest
+++ b/media-libs/pcaudiolib/Manifest
@@ -1,3 +1,3 @@
 DIST pcaudiolib-1.1.tar.gz 34049 BLAKE2B 7c6ce1532c47db30db2b80be690453257148be9a7115cd24dabda3dfcaca667d5c3a8278276f278556406144461cda48905ce581f0fde2f8429b3f829a948a36 SHA512 d503c11b355601e1e05f0f438a0cd9ce277d19fd53d3f7edf26f6e17f1f8184e8b2112a282e8ed74db8646bb5534d2a9a3c707b1742ce02ef13fd89669785007
-EBUILD pcaudiolib-1.1.ebuild 860 BLAKE2B da556ab3fb992c831d459f32d27ea3263b33f949f757a471654c5c21c8db2faba02671de8046ea014722ff2d9061c01e079e52192ffdf22b81d23dbe7f773aed SHA512 4fdb3dadcee874ffee82b5923f291b9a90fb8bce897b0e41b5da8563e60736d3cc5920e5f419acd048bfbca4964f5dc2576b116f39f38d7ce038d7003d0246b8
+EBUILD pcaudiolib-1.1.ebuild 865 BLAKE2B 7e24aef18c2e114fa6aaf39cdc69bfafc27c35ae8a5fe7f57da007ca9987ea58bb48b52ca0ac112b28f1a010fce414bf64b9883692a2700098ba790e90a70556 SHA512 5a98851e56892cbc5ea71dff316fb6c34d3ca6ad95750138648a75ce9d99a348f5864883322b948a61e2e066346a6e200a5d6a70e06f36047bf83b1384485b33
 MISC metadata.xml 588 BLAKE2B e148577ddfbf9688495e1a620708903f0bbe126ea9bff194e6b0f75a0e2a36ec52567f4d7a86381f89fb6c2e828ae372217e983d30810bb62dc60c0692420fed SHA512 d5de3f26535c7b147515cd9952951ed16be99345d309c7110c36a93fcd3f44f43373293d082c60170dfe5e05956d22b4c2cc1dd7343b3c28188f935ba8feaadf
diff --git a/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild b/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
index 70bf9fc0fe8e..738c49d0d4c1 100644
--- a/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
+++ b/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/espeak-ng/pcaudiolib/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3+ ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+alsa oss pulseaudio"
 
 REQUIRED_USE="|| ( alsa oss pulseaudio )"
diff --git a/media-libs/plotutils/Manifest b/media-libs/plotutils/Manifest
index baaf9c8db487..1d2a7eb57cdf 100644
--- a/media-libs/plotutils/Manifest
+++ b/media-libs/plotutils/Manifest
@@ -4,5 +4,5 @@ AUX plotutils-2.6-libpng-1.5.patch 579 BLAKE2B b2c4b5f2fcae4a44f6817f61d92ba0462
 AUX plotutils-2.6-libxmi.patch 5076 BLAKE2B ca028895b5af74e38176b3fe43747196033d39f01aa763f5388de8dc502ca5119f5bc153ec9537a1f1934940fe253125460844e8090459890132d4ade90e446b SHA512 157824dce491a06c15091eae8129e0c2269ffecaff168485e17535d61eabfade4007fd7e799921d91d674f28b2a9f67ac957155f0661821b1363fe5045dacae1
 AUX plotutils-2.6-makefile.patch 2921 BLAKE2B db41feef6b6f25cd5fe3b9e2329c142805d8cc2b3698042846f91275eb968f1eea797c482dd153f97ab63d0a0f937d3efa4fc01a52e97d0f72cf05614a403cb3 SHA512 ac98f183d19d36c4380d0bbb25a2f86569d79136729a6c265cbc51ce4aa7ad1fc279f9ae7c0ac1db7b4e49325032bbf082db900eb740f394d890ecca57f19a84
 DIST plotutils-2.6.tar.gz 3657562 BLAKE2B d77d62ba4e632001d056da7333d1300b2e3d7966029a130e6836fa88545a1749e15b5dc7322d03575432fc5e1342c839f4769ed821962f711848c2d8523904fb SHA512 4e5982605e5c1fbdb7325069c3ab2edd736e37a2eb30a1ec01fdc3541fcee6ed49937d4814c6baf79dab5b6fa42f909e4800c851d0ace3c7cf6d5a8681d0f0e7
-EBUILD plotutils-2.6-r2.ebuild 1949 BLAKE2B 040a1479cbd428285a62304161539e19ffffa04a29bfba58849e4bda4eaabd5910e838bde718662d12233004f1a048f5b7dcbb70822d6a78691666cdef616980 SHA512 7380a537c772bc051110d3d0fa14628ec7664c8835c216ca5369fd38553c744a285153b52821137fa06f76f2024f866033d5eab7cf51382b8875134acd1edf81
+EBUILD plotutils-2.6-r2.ebuild 1956 BLAKE2B d579aa42bedb1d5208dee18612ba8ffd5d0cec0692453d8e889e82bfa275dd44a7c9c255f8b189a043e1d20ff39f13a92af48d98133915526223a07623bc6cdf SHA512 37ac71072aee5d04846a7eb2f961e8853e255b6a34ef2912b4f6bfc1bcf8704d23424d46c961cd9b60842fdf9c5923b487e38699f22f31841e5f0143d4a768fc
 MISC metadata.xml 266 BLAKE2B 8dc7c8e41cf8c2190d095f43854e0572b406aafcddb65f5edd577a97f2d1c83174e6eb3552785d95a4a2d064f22794427cbbec5809e25409aa3ada141284ba7c SHA512 6cc6a0d81ad8a450f5fea7ed8977424c16376dd2026223c98c77847785418a7401a4c755ee16fb1a8629fd985957afd57194e8e6a99a8dbe46d50ca16806e5db
diff --git a/media-libs/plotutils/plotutils-2.6-r2.ebuild b/media-libs/plotutils/plotutils-2.6-r2.ebuild
index daeaf19ac6bd..94645c96f8d2 100644
--- a/media-libs/plotutils/plotutils-2.6-r2.ebuild
+++ b/media-libs/plotutils/plotutils-2.6-r2.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,7 +11,7 @@ SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+png X"
 
 DEPEND="
diff --git a/media-libs/quesoglc/Manifest b/media-libs/quesoglc/Manifest
index 85c4151e94ae..ee48e46b6ffa 100644
--- a/media-libs/quesoglc/Manifest
+++ b/media-libs/quesoglc/Manifest
@@ -1,4 +1,3 @@
 DIST quesoglc-0.7.2-free.tar.bz2 657394 BLAKE2B 73798b80fea5be9a66aa7c0090ec0564d517417a8597d102d057fcd91bc4c6d0c48352470b02182705d135cb04434178b206a964d539283cc4ac69d2f1dc5cb9 SHA512 107cc28fe85722614bc6c222a64914eeef0de1c5dfa01cef9ec611e5caff54fdbcf2b387d413c0b56533d33e06741ca8dee99fc0c5ee1e63d9a95d86c6c69190
-EBUILD quesoglc-0.7.2-r1.ebuild 977 BLAKE2B f3d8792ef601bfe5260c5c098b3f520e658657ba963e7e4fe2c7df143b48ac2b9dc25d2d16e5b220623e318a63eb4a757e09b4035649b72ed51f79695d8a8b31 SHA512 235e6a68e3107bf41b7324ad7b093303c353abeb2afecfcfd587c204cd0c8d5f3f4286b68188a6688b07f4e3e238449c370494935f9b9860d1909b1109cabe43
-EBUILD quesoglc-0.7.2.ebuild 1070 BLAKE2B d47799a691ff92458be513ceb7c3cb450a536eb9bf5083ab1af805d8d52666ba6c5fcdfbb1a17ea7eb84a6e434e8a36ba2d664f55002e59ddcf9e29276b08829 SHA512 2d718bd3914ffb01fe1e4453ce6198754b2ffb67cfb6ff6863b457bdfc1b6d1832d57e8c2d6dd451bc2c39a94c42e271ad7592acf24ef55aeb65864f0153932f
+EBUILD quesoglc-0.7.2-r1.ebuild 976 BLAKE2B 27aaa18f276d70cb1405d29a5400b1931f119a3c32b0dc6dc14c0decb609fea1e02c2b00eabad5603d3aa81a58d95dd4d96047de7c5402aa14136a099575ec9e SHA512 8e18ae305238c5acee721fd7e3bc46bcfcd255de7816dcfa232f950aa6a45921e6c372af13b0deeaf2d8f0d635888cb2a20d5a95ed1bfa843e2cdc3ef292d3f1
 MISC metadata.xml 332 BLAKE2B 1a4176bc587552b145f0d3b28082632ab19ae2832813a639acf0eeae83a200528d35b045a26a1b015c25dca9c03dd238bd59bcd56ab1ba029f7be0f90901857a SHA512 aff8552c5203af4956d6d79b6fcdaa79a98dc2e43e1e5ec223c9d2520ddf3d6da40ccc6cf0245efd96747cd566a66f4175b4f3ef4cab8d3c680621a3868121cf
diff --git a/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild b/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild
index 25361aaf211d..361382ff10b6 100644
--- a/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild
+++ b/media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-free.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-libs/quesoglc/quesoglc-0.7.2.ebuild b/media-libs/quesoglc/quesoglc-0.7.2.ebuild
deleted file mode 100644
index e96995d0f8e6..000000000000
--- a/media-libs/quesoglc/quesoglc-0.7.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A free implementation of the OpenGL Character Renderer (GLC)"
-HOMEPAGE="http://quesoglc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-free.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="doc examples static-libs"
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	media-libs/fontconfig
-	media-libs/freetype:2
-	dev-libs/fribidi"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	rm -rf src/fribidi
-}
-
-src_configure() {
-	# Uses its own copy of media-libs/glew with GLEW_MX
-	econf \
-		--disable-executables \
-		--with-fribidi \
-		--without-glew \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake
-	if use doc ; then
-		cd docs
-		doxygen -u Doxyfile && doxygen || die
-	fi
-}
-
-src_install() {
-	default
-	if use doc ; then
-		dohtml docs/html/*
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/sdl-terminal/Manifest b/media-libs/sdl-terminal/Manifest
deleted file mode 100644
index 83e306e7571b..000000000000
--- a/media-libs/sdl-terminal/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX sdl-terminal-1.1.3-nopython.patch 620 BLAKE2B 059ea3c8bb08f3649983c70551d1fff5017dea5e87d3f2d13b6d530826d1b6bd67f1fc716cb5ab50dfb16345cb57e307db776088cf96bf2bb5a34a209bca6776 SHA512 0e7aede86affef6041c0fb76d84b9a76a5b00c6e6ea68cb6669e12d5d50c162360660ee720e072451913166417e7fe24823da24be6eaa1deebe2009ccf6f75a2
-DIST SDL_terminal-1.1.3.tar.gz 466321 BLAKE2B 49c8a8262fd4a9dd14ce987e9128ece958e0357e8da3877516a9e139951d04ef779a414b15ab7748de679c053b8b14d461dbd4575b7aea62fe12608889a88c23 SHA512 be6e74430ac9467e58fde6048b042db319940e564061b6e537f45dcbd54148f5df593dd0b8a28d866ae298d0f1c8f3a113bf23640c25213c6784ede5233882ef
-EBUILD sdl-terminal-1.1.3-r1.ebuild 806 BLAKE2B 52d80e2cc533a86d3f977deb82907ccdf3022a807d54882312b0a68432ea94120187c8bb5592d5f2f084983c8a922c800588a421aaa7cf3bb29b8cbb94af6df6 SHA512 59c8f94d58c928334a413c1962516b8122f6f05a85c0ee0826b99e3df641bf4d84d4e807fd28296344380769b9f560dae204aff771f584a916a496da3e377ce1
-MISC metadata.xml 336 BLAKE2B 780bb0eaac28e9d98fafd961376e851eb37c708d677b9e60003b9310bb43a2a28c464819abac55ce57b8cde20645c95c27653c16745b0d8d37760bf5663ef3f2 SHA512 55f703fef906a646924ee6c4b65310b5caf43b8be33f6ba06148c63e64da4ab097583b5b5e5404e87a6c659651891cfb24142c213d5b06266848380a29b9ccbe
diff --git a/media-libs/sdl-terminal/files/sdl-terminal-1.1.3-nopython.patch b/media-libs/sdl-terminal/files/sdl-terminal-1.1.3-nopython.patch
deleted file mode 100644
index c9d3214dd091..000000000000
--- a/media-libs/sdl-terminal/files/sdl-terminal-1.1.3-nopython.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.ac.old	2014-07-22 14:19:33.797413503 +0200
-+++ configure.ac	2014-07-22 14:19:55.293201011 +0200
-@@ -108,7 +108,6 @@
- fi
- AC_SUBST(GL_LIBS)
- 
--AC_PYTHON_DEVEL
- 
- # Finally create all the generated files
- # The configure script takes "file.in" and substitutes variables to produce
-@@ -118,5 +117,4 @@
- Makefile
- src/Makefile
- include/Makefile
--examples/Makefile
- ])
---- Makefile.am.old	2014-07-22 14:19:40.729344917 +0200
-+++ Makefile.am	2014-07-22 14:20:06.353091713 +0200
-@@ -1,4 +1,4 @@
- ## Process this file with automake to produce Makefile.in
- 
--SUBDIRS = src include examples
-+SUBDIRS = src include
- 
diff --git a/media-libs/sdl-terminal/metadata.xml b/media-libs/sdl-terminal/metadata.xml
deleted file mode 100644
index a4d841a67e7a..000000000000
--- a/media-libs/sdl-terminal/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">sdl-terminal</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild b/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild
deleted file mode 100644
index bd3598f12cc7..000000000000
--- a/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch autotools
-
-MY_P="${P/sdl-/SDL_}"
-DESCRIPTION="library that provides a pseudo-ansi color terminal that can be used with any SDL application"
-HOMEPAGE="https://sourceforge.net/projects/sdl-terminal/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-DEPEND="virtual/opengl
-	virtual/glu
-	>=media-libs/libsdl-1.2.4[opengl]
-	media-libs/sdl-ttf"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-nopython.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog README" \
-		default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/tremor/Manifest b/media-libs/tremor/Manifest
index 9c3b2c58abeb..cd4503cedcaf 100644
--- a/media-libs/tremor/Manifest
+++ b/media-libs/tremor/Manifest
@@ -1,4 +1,5 @@
+AUX tremor-0_pre20130223-autoconf.patch 829 BLAKE2B 8a1577f8a9350dab208ed9ea051b52fa9f30f0080504b6a3477ad3e6d3506fe7b2ded25d34d164a0b04385e5e010144f1c4136c5fffeec19247feb795c2fd309 SHA512 5e0d4efa7193bf7f3cd4a381616032f8e42d6b26ec85399eb406a0a753b0f6a321e968fe16d96645e3a52832279663362587b0bb93e28dd911b535a2dd496f30
 AUX tremor-0_pre20130223-out-of-bounds-write.patch 2721 BLAKE2B a9d254873d08d261c72197fbe44875aefe9f48f97464ccc5653e88e50fe3546d2426d80e62a67c0a595695737fb2b7c95df1a850b612688c02b2574a3b986fcc SHA512 022a8e813f42e3e9a0983cd2e948898dc36689433cc76d292b8b24bb3c7318bbe71a2618022a16025ee25dea0dab063266212499e5d84669603414b6c769f74e
 DIST tremor-0_pre20130223.tar.xz 110096 BLAKE2B aec25548c971d2021a3b5f81469d3bf74434f2bcf215601e79a2663fd044085519fde449736f0513c949de5a79e297cac65a7abd50f5fcd8b940f655b966b164 SHA512 3fc109dfc6f9f33da9d2da7d5c1708d6fe4b22179048c4acd5b4b037eafbdda392d5ba74ffec5d8a225d56ebd860f67d28e4460f0b54cb170152a0b9fd89c514
-EBUILD tremor-0_pre20130223-r2.ebuild 1113 BLAKE2B f7c80c12c8947a239f92a875ca809f0d6d9ee14cfbc35c7f3b56afc4cc47c3d5e6fbc3854aaf8210a72c8128ea061719dc32de2f43fcfae61c864fc1bc4355c8 SHA512 8f61d94aa6054781662493206023b0c197e11d0eb49c4c2412970f72f47e4f802f94e60d6365f0e120141bc6b1830af349c87b8cab76348186d7a7710a51a2c5
+EBUILD tremor-0_pre20130223-r2.ebuild 891 BLAKE2B 5408a682a3e3923f353eac39a77a3fb0d55c15792cb8ba6440f27a005b2af7d819e783da3665c9fc776816f3b92d266f56999718d9b5561c8209cf002c14c081 SHA512 4b1756cc81271618cf113f22b46ba8576153c1cbdb532e4f6c5f9e2cd70782d3e402bbd81da88730469265ddc0f9f4316445dc39cd98f943714887d6d5780c35
 MISC metadata.xml 342 BLAKE2B 5f8cb1f46d849f476969a68aa612cb89eac3b7d3b3de918cc6b472c7847b19cc703f16d4784f1931a57f5c64d0edfc80abf3b7c37d20562e03c5798b869d9c9e SHA512 39920a8902f374459188e7981b0930ee2d108ac944c24cfc6cb577e8a0e310753620996a51d3882d9550dbbdec768b2927f4a7aca4f858dae26e9ceef11c6ba9
diff --git a/media-libs/tremor/files/tremor-0_pre20130223-autoconf.patch b/media-libs/tremor/files/tremor-0_pre20130223-autoconf.patch
new file mode 100644
index 000000000000..97dda9ffac9e
--- /dev/null
+++ b/media-libs/tremor/files/tremor-0_pre20130223-autoconf.patch
@@ -0,0 +1,26 @@
+--- a/configure.in
++++ b/configure.in
+@@ -9,7 +9,7 @@
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+ 
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ AM_INIT_AUTOMAKE(libvorbisidec,1.2.1)
+ 
+@@ -62,12 +62,12 @@
+         case $host in 
+         arm-*-*)
+                 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -D_ARM_ASSEM_"
+-                CFLAGS="-O2 -D_ARM_ASSEM_ -fsigned-char"
++                CFLAGS=" -D_ARM_ASSEM_ -fsigned-char"
+                 PROFILE="-W -pg -g -O2 -D_ARM_ASSEM_ -fsigned-char -fno-inline-functions";;
+ 
+         *)
+                 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+-                CFLAGS="-O2 -Wall -fsigned-char"
++                CFLAGS=" -Wall -fsigned-char"
+                 PROFILE="-Wall -pg -g -O2 -fsigned-char -fno-inline-functions";;
+         esac
+ fi
diff --git a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
index dd8a83316d28..1fa4c476ded3 100644
--- a/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
+++ b/media-libs/tremor/tremor-0_pre20130223-r2.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# svn export http://svn.xiph.org/trunk/Tremor tremor-${PV}
-
-inherit autotools eutils multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="A fixed-point version of the Ogg Vorbis decoder (also known as libvorbisidec)"
 HOMEPAGE="https://wiki.xiph.org/Tremor"
@@ -14,37 +12,29 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="low-accuracy static-libs"
+IUSE="low-accuracy"
 
 RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( "CHANGELOG" "README" )
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-out-of-bounds-write.patch
+	"${FILESDIR}"/${P}-autoconf.patch
 )
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	sed -i \
-		-e '/CFLAGS/s:-O2::' \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		configure.in || die
-
+	default
 	eautoreconf
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_enable low-accuracy)
+	ECONF_SOURCE="${S}" econf $(use_enable low-accuracy)
 }
 
 multilib_src_install_all() {
+	HTML_DOCS=( doc/. )
 	einstalldocs
-	dohtml -r doc/*
-	find "${D}" -name '*.la' -type f -delete || die
+
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 16ccbe971a9a..9ddb884c3344 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gst-plugins-jack/Manifest b/media-plugins/gst-plugins-jack/Manifest
index 2dc14bd86fa9..84f6febff6be 100644
--- a/media-plugins/gst-plugins-jack/Manifest
+++ b/media-plugins/gst-plugins-jack/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-good-1.16.3.tar.xz 3914676 BLAKE2B 52f18027f9d9a77e8b459a0a10fa7c1450dff2faf8a2a63134f833ad08b19985b7f0d3d2af4b766c9b8bf802d048fabd6f52ad5a7865eccd1fe0d26404b7b2de SHA512 3e0da4a4defc0ddea1c26dfc767fed732548654f4155452649777109a17d5b65b2fde895483a3e35dc1646de5a16e913cd2408f826251d46a99b7751b88dcb65
 DIST gst-plugins-good-1.18.4.tar.xz 3277572 BLAKE2B 8acfb975d19eabc681184d0096328051a9a02e5f849599dbad1233a0e9254e1a2d2bef75d8afdc779a7ca01a71b15d1e83a843749c0ef5f7ab2b5818067ab898 SHA512 764c66383c93e57f9c5e7742002013e07e7b25750d6974d6c07744433e8ceb7570e829e68278e2bc5214f77158311a6b3bfb013d615cf66205d8d7a9e2d54b86
 EBUILD gst-plugins-jack-1.16.3.ebuild 354 BLAKE2B 588eecfa2ce2e32c7cbae7c477cab2817fa7174d9f2d02879fe555bb590382b6f1ff4db60a005e15bbd269663611f0036c1429d37ec3020815d0dd3f89c116d3 SHA512 a3f73eed8fdfaea2f3deeb415a2b9bc21c2f1bf48b8e7ed31b9cb2ea8636223e0bcacca785594bc9604fb1339d11c29b3a3762991d9a78428ac5540973e63d10
-EBUILD gst-plugins-jack-1.18.4-r1.ebuild 478 BLAKE2B a13f4d84ee4d48189d6c6f970067c6d0863a4ae0339be6fd7509add3808042e597910d706177ddeb4178468c51bd69333eb8c664d4a91adf6d0bcf18f75ae519 SHA512 c271f9ecb3c3897c6610f281086b12bf359fa250bac0567b1d4f396533ddd5cdff1dc2751744e13f2856c584925936afe800770f5fd2d897b0f3a7518abcf716
+EBUILD gst-plugins-jack-1.18.4-r1.ebuild 485 BLAKE2B ff976fff898919c35ad91806c398ae9e64c70778180cc1bc400ece83ebf51a03e77380e6b745245c742164c05bf55c634997b0260177805df8ebb6de07a06414 SHA512 4b10743ac15b8acbf2816be8797fcbc08b7f1fd3274baf6e56492f7e6af878fec20223b37362e2cfecc55ceef7ffb0eb599af7293e1d72263508e0210d92e142
 MISC metadata.xml 488 BLAKE2B 342e74e1ed49bff874d7fb35c19f3c1492c31ea7ebf13006ae1d9f2ff0abe5e6c1292f8c5033f9c8609233e8ae9a8bb51bb600a95624643722bcb4d85fc030a4 SHA512 9d57b66877f623a7d50b38656f33082ee439ce5a04fa1b5dca67cef8dda03e71d5a7707981bce6e5e5a13a524be0b3b4b4ca806751c2618decdf12e7454265d8
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.18.4-r1.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.18.4-r1.ebuild
index 80503cb409d0..d1c77afebb42 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.18.4-r1.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.18.4-r1.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 # >=jack-1.9.7 is provided by pipewire[jack-sdk] as well
diff --git a/media-plugins/gst-plugins-meta/Manifest b/media-plugins/gst-plugins-meta/Manifest
index 43ad5977bd93..6be64015b9db 100644
--- a/media-plugins/gst-plugins-meta/Manifest
+++ b/media-plugins/gst-plugins-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD gst-plugins-meta-1.16.3.ebuild 3756 BLAKE2B c1d47c34e6ec4bae156e5bdf3b70af4b296c3592017d6f7c2a8123b1875a8968c6823797f2866cb7ff37f0f613ff7974715bb6c3f9ce30436fa4e5bc71a889be SHA512 04e5fc1c98c65153533842ca8bdf1fdab491fcd7583d69b9321c6f91168b76f51f94172778995eca6ba15cd98d31f25470acfba5ea21af90fdb42ea8530dedf2
-EBUILD gst-plugins-meta-1.18.4.ebuild 3750 BLAKE2B f581aaf5f6b2e3c21db7d5d517c159e17694a4e7163166470e5ea5e5d8148b63f91b06baace9ed4ed75d21a39764c6a8aaf89d992b3d00727b7438fd52c37b5b SHA512 305249ef04d68b7b47d16f55bbad6b2da17ac1d0e65a8e90e0c4908811fb17aa41889bccf34f24a3007c17739b20849c7bc47996cdf6a0a3708ed07a34adf84d
+EBUILD gst-plugins-meta-1.18.4.ebuild 3757 BLAKE2B 4b3301cdedb370e0ae09e47d398ae43ad7ce763719d90e06e6c025bcee64e5149f6c1e84de59508825cdc0f54fd40a14d8fa1788c2f852422b42b9c0409106f7 SHA512 dbfe67a9f30df8a5f52158777c634f6b4dde5007f57bef2c83fa50f71c42f525d98779e6045f61ab5c887e4f447e8924801dc9987746137f6e724c5eb65ba31b
 MISC metadata.xml 997 BLAKE2B ba911d337f8113baa8dafbd46c3e0d7ca54e2bfcc8902a9fab89c683af5b3f4e4cbccd9a45afa588701db8d7c98b1c45be3cf2e6a82efc119a0d872c717a2bb4 SHA512 3ab15b72a6e1513272d15aff9b046fbcdbe2859e9fe53c7b388a507c782649fffdc8e991cb705aa452cfc5c96c0942362ab2fb74755456d0f5d7e136aea0cac8
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.18.4.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.18.4.ebuild
index afcbc75ed1da..efed096e8647 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.18.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="metapackage"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
 REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
 
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/Manifest b/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
index 126c5ebe6dda..c02dab490248 100644
--- a/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-inputstream-ffmpegdirect-19.0.0.tar.gz 283259 BLAKE2B b5db2c0b98dd8640a560d95fe2164cf76bbbd0c3b4c47e53d5e39011e3b6225afe5c4c47c3d9eaf357bb93d5813c40864cd54cfebf5aa52910c9967ab5a53725 SHA512 61a9ba311be0b6eae90565da2711ddbe35b0549b223febb9a43c36662f1fd541a3a25787ff5513f8ca515254d18864c6b2b37caa7a2a3cd35cffa9b10bfd2c5e
-EBUILD kodi-inputstream-ffmpegdirect-19.0.0.ebuild 961 BLAKE2B abe3ade3e876897a679d89685a4e05a50f1a2dc2301155a4fb29fa5832d8ad32e9b0352a5beaac8a262fa9a60436515fa1baecbd9b267f991dd10c2e26fa17b9 SHA512 375ae15cfa72ea18f5ad1dc8f2363800cc3eb1d4adfe76f330354aaba57c63c544b8acc1c56ba5d7e14f5c1650c46f32f524fd0f7c8ba4755a3a883c11a61d04
+EBUILD kodi-inputstream-ffmpegdirect-19.0.0.ebuild 966 BLAKE2B 1995220ee44d686569be61f4681c87875b3790704f333ef40d0614ba74f401fca0b16da9089283d70655ef9eaa530f3fefe6bbab85b7bea2d18e237c3513d580 SHA512 5750f76afc20f3a91f8929e46c0f48d49733ac5acbaadc0434aa0de98c93377d0e28e0c117623106d2d8f4b40f4431577e030cdb8875ab355b2d05d121c68c27
 EBUILD kodi-inputstream-ffmpegdirect-9999.ebuild 949 BLAKE2B b3455c47c5ba05ceed17ec36b9ad7dd2945e5f8a1eb1e3483081ad85ae118ccc8dd6a124eb3676aceb993a24e4191b1cd4361c4d51086f8ad683f9d8c7158498 SHA512 b4dc908c9c95f9ac46ca1d3637fb9243d50654d99e8d08d36ee05431902f4011efe909ef339a43aa542250e73e91568de8c38230869d9ee9ed0d5b033bcda0ff
 MISC metadata.xml 505 BLAKE2B ee4773daea9d6c00f7492a63e4b02d6e9dd403f756a1b2e2b47e0422b4924d51ed82fd6cfe170204f950d0e2d2ecc7342f4d9fce4248347ac47a81b77962bcb0 SHA512 fbbe21c49ee6bf2afdabc3e81ce273e6a008515034787e48e8eea43ed0d6f0ce3a4d6d6c54fabd562479f57eb1f119a80ca69e14023332243a3d94027baedcc1
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-19.0.0.ebuild b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-19.0.0.ebuild
index 26abe6bde540..844c44dfcc43 100644
--- a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-19.0.0.ebuild
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-19.0.0.ebuild
@@ -17,7 +17,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	CODENAME="Matrix"
 	SRC_URI="https://github.com/xbmc/inputstream.ffmpegdirect/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/inputstream.ffmpegdirect-${PV}-${CODENAME}"
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 69322a9c6075..6479baa4370f 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,4 +1,6 @@
 AUX config.gentoo-so-r3 539 BLAKE2B e80c461f69a991641100d3966d1d100dc7fe8c15e3edc358bcd8ebd17a3f8c4d00a5557c9983f51a251a4602dcc378138df736f13665f5d5140081e047df0f5b SHA512 3f7d4a860b45ff6769fe1f29e694dfb897ab5b7c50f3d0d896425d300be6277df850cdb67cf311a0671ba747339b32f65d44a95b020940b3d1ac5764d873f20f
 DIST live.2021.05.22.tar.gz 682749 BLAKE2B 38663f8c5dbd8cccf4e5cfe685b0eb393559195eba852fcdf6c38c7be936948d2727da91e829aedbde08eab6edb6082533d14061edfcf125d82c925bffdb9f90 SHA512 4021cbdaffb48b9b361e931fa71f89db1e116fe8c4e57df78d54493b111a8c6249431cc418a20352a45a75ef240712609eed3aa7468c6049996dd2451ae2941c
+DIST live.2021.08.24.tar.gz 683337 BLAKE2B fabc24498cc5b23b43f11303598b770a84036d0f835a04284bc9fc4f2525d39f4e846e8eb16f724136f9b0caad20cb3dc55b14218fc0ec764822fa22a018642d SHA512 f776e43a9b0792fd41e43f3c06e48f5d766c405d6af4ed5ddac108723f222c844ec5dbe29701b62dff760fbed777935ffc9149080b45d7a7b4c655a7f1fe6dae
 EBUILD live-2021.05.22.ebuild 3109 BLAKE2B af54967cdf34cfeb6b7f175902a69aac1d3b01dad02e3e90c7da47dd170a7c363270e1bdb90ee2d1d297726fcf4cbbc9e7e52c395c2a4d8b62af652f359525e1 SHA512 5ec35a0d90bec902ba75a4398189100b04b482c864707fa01be6259046a58eaa1d4055717080edcf109967dcd81dbba6a1f7ffeee138e158b23bb62e64b1a588
+EBUILD live-2021.08.24.ebuild 3115 BLAKE2B 88373da81a2c9fa24c646e76c38dba0c3e9f5626c1977ccf31cc4c5ad3ddbb8cdb079de265d8e4e052e47da181916e1bf889d0610bad13ddb3f764c7b34275c0 SHA512 53c2d9cd6c1b60e29b5e6f5cd6f4a4d1865c8f2c54cb9f46db4407d741ec7a6124dc7331a75d50b956182f2d38c9c794f988489120077acef96215e541ca1a83
 MISC metadata.xml 222 BLAKE2B 96fcf0d83a18e2c1f4611d550e7e2123a06fe8b3b2890cb5757284d8fc7d3bebdf1aeb4f82affbc7c51268749cac9fdcbf43888e3bec0e68e1b6548a3f6eca76 SHA512 c3657a6bf2503e6585ee53453bf0ba26b5eed2e894342087358b5f4306a960db915de61036b6c8dc57cdb7a7f3326d57ff3badf7b3ecefaa99291289a73997de
diff --git a/media-plugins/live/live-2021.08.24.ebuild b/media-plugins/live/live-2021.08.24.ebuild
new file mode 100644
index 000000000000..24964a3eab89
--- /dev/null
+++ b/media-plugins/live/live-2021.08.24.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
+HOMEPAGE="http://www.live555.com/"
+SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="ssl"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	ssl? (
+		dev-libs/openssl:0=
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( "live-shared/README" )
+
+# Alexis Ballier <aballier@gentoo.org>, Sam James <sam@gentoo.org>
+# Be careful, bump this everytime you bump the package and the ABI has changed.
+# If you don't know, ask someone.
+# You may wish to use a site like https://abi-laboratory.pro/index.php?view=timeline&l=live555
+LIVE_ABI_VERSION=9
+SLOT="0/${LIVE_ABI_VERSION}"
+
+S="${WORKDIR}/live"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/config.gentoo-so-r3" "${S}/config.gentoo-so-r1" || die
+
+	# This is all legacy stuff which needs to be cleaned up
+	case ${CHOST} in
+		*-solaris*)
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+				live/config.gentoo-so-r1 \
+				|| die
+		;;
+		*-darwin*)
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+				-e '/^LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
+				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
+				-e '/^LIB_SUFFIX /s/so/dylib/' \
+				live/config.gentoo-so-r1 \
+				|| die
+		;;
+	esac
+}
+
+src_configure() {
+	# This ebuild uses its own build system
+	# We don't want to call ./configure or anything here.
+	# The only thing we can do is honour the user's SSL preference.
+	if use ssl ; then
+		sed -i 's/-DNO_OPENSSL=1//' "${S}/config.gentoo-so-r1" || die
+	fi
+
+	# Bug 718912
+	tc-export CC CXX
+
+	# And defer to the scripts that upstream provide.
+	./genMakefiles gentoo-so-r1 || die
+}
+
+src_compile() {
+	export suffix="${LIVE_ABI_VERSION}.so"
+	local link_opts="$(usex ssl "$($(tc-getPKG_CONFIG) --libs libssl libcrypto)" '') -L. ${LDFLAGS}"
+	local lib_suffix="${suffix#.}"
+
+	einfo "Beginning shared library build"
+	emake LINK_OPTS="${link_opts}" LIB_SUFFIX="${lib_suffix}"
+
+	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
+		cd "${S}/${i}" || die
+		ln -s "lib${i}.${suffix}" "lib${i}.so" || die
+	done
+
+	einfo "Beginning programs build"
+	for i in proxyServer mediaServer ; do
+		cd "${S}/${i}" || die
+		emake LINK_OPTS="${link_opts}"
+	done
+}
+
+src_install() {
+	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock ; do
+		dolib.so "${S}/${library}/lib${library}.${suffix}"
+		dosym "lib${library}.${suffix}" "/usr/$(get_libdir)/lib${library}.so"
+
+		insinto /usr/include/"${library}"
+		doins "${S}/${library}"/include/*h
+	done
+
+	dobin "${S}"/mediaServer/live555MediaServer
+	dobin "${S}"/proxyServer/live555ProxyServer
+}
diff --git a/media-plugins/x42-plugins/Manifest b/media-plugins/x42-plugins/Manifest
index a1406b7b9bab..5b8314589d7e 100644
--- a/media-plugins/x42-plugins/Manifest
+++ b/media-plugins/x42-plugins/Manifest
@@ -1,4 +1,6 @@
 DIST x42-plugins-20210714.tar.xz 3443752 BLAKE2B 8e871ba52a83139ace41ae68c09a99bcfc4402c76614f8b9afbd47177e9bb8f0f146e21edb00efaf8648dc4105ac9c5acb1336f7e64764424b162b8f48af11a8 SHA512 9ee50cd389b573044e36d903c6468dc3470ca2d6a0aeee9cc9c52c6caeb3f7a4e7855d5e7defcfb6908111a31bb91ed1f4fc90270b09aefa158c864d8e23f2ea
+DIST x42-plugins-20211016.tar.xz 3585184 BLAKE2B 0d053c0da317f65a61d95c787bc8ad85c1ab70ad4e392a217f0dca754cf627831826958b21424d667ee2d396650b3bf5f9fadda88e54558b0f804cdd6143abeb SHA512 44805f4ffc692bcb6263c7f2eea82925bdab1ad26a76cd2eda6991c8e3f1e2c173eb254185c1897f25910ee31bf74c4357715ab2605d157f0e4d3aba26a67b54
 EBUILD x42-plugins-20210714.ebuild 947 BLAKE2B 5ad534fa0954e9bbe4dcf494c9b75e73b769c1b89d67a74089ca9074fdcfc5533310fda5ed6c8a3d74dfbc6fbf4c97b18d0bbe7ba86bedd720e02147bfdba9ee SHA512 66b5f2a43c3de5105eaa42c6f54295950ddd99c0f811d1c9d50d9931fbad8d34e8fbf42238348a6a7ba858b507ae58d7bc3ed79d0256c38c76c1a967ff179415
+EBUILD x42-plugins-20211016.ebuild 948 BLAKE2B 7424af2904f562a89b95424c5a4e7f3b33fee9e446ca06f0f8adc7a41e67827d16f95ef351f4a89cae672937e6e40db63ffc3b88c5020b75e322fb9a6904d227 SHA512 fb140d12cd2485546360ece3d2002fc97c3aa640edfaf500ecf57dd2be8b2110b1ea7149d2e3f0a576d47fdebad25a3bbe7f9c1abf6eef853b47fd15218fa0a4
 EBUILD x42-plugins-9999.ebuild 948 BLAKE2B 7424af2904f562a89b95424c5a4e7f3b33fee9e446ca06f0f8adc7a41e67827d16f95ef351f4a89cae672937e6e40db63ffc3b88c5020b75e322fb9a6904d227 SHA512 fb140d12cd2485546360ece3d2002fc97c3aa640edfaf500ecf57dd2be8b2110b1ea7149d2e3f0a576d47fdebad25a3bbe7f9c1abf6eef853b47fd15218fa0a4
 MISC metadata.xml 340 BLAKE2B 18bfc086ea4e852a5b9c0e85c989fa02a89daaf114648d6f88569086d745823c92831548cb82089cf20092c0966bf7ec995c0918c0ce5a63701fb29078f2877c SHA512 3cbfc4312dc8f03c34aba0ae513fe8042b64cb570c0f408496d67bc7bb21688fa7939259bb67a7aaa1e1c1a3847a6f8d4bce5690d9aa025c27e15e74c24b8229
diff --git a/media-plugins/x42-plugins/x42-plugins-20211016.ebuild b/media-plugins/x42-plugins/x42-plugins-20211016.ebuild
new file mode 100644
index 000000000000..62be7c10ec26
--- /dev/null
+++ b/media-plugins/x42-plugins/x42-plugins-20211016.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Collection of LV2 plugins"
+HOMEPAGE="https://github.com/x42/x42-plugins"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/x42/x42-plugins.git"
+else
+	SRC_URI="http://gareus.org/misc/x42-plugins/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT="mirror"
+
+RDEPEND="dev-libs/glib
+	media-fonts/dejavu
+	media-libs/ftgl
+	media-libs/glu
+	media-libs/liblo
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/libltc
+	media-libs/lv2
+	media-libs/zita-convolver
+	sci-libs/fftw:3.0
+	virtual/jack
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	sys-apps/help2man"
+
+src_compile() {
+	emake STRIP="#" FONTFILE="/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" LV2DIR="/usr/$(get_libdir)/lv2" install
+}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 95385ce35cb7..63aa17459c1f 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index ff34a9033c89..9444680c7f22 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,3 +1,3 @@
 DIST flrig-1.4.2.tar.gz 918730 BLAKE2B 85c2ac351e833b19dab0e36899df58665c86ac397035e8eabad29bb38018a0d2c822ca73b721f2db938a1f7cf2cd2b3a6878f605d5d65f01608563f3f4a0d89e SHA512 094f50a427cabc5c596a4315e7182ea4040218467f06fac456a0fe8923726f30cf3220379033024449066b4379a3877d48449971afe3f4b46b4307f9a64c3ff8
-EBUILD flrig-1.4.2.ebuild 494 BLAKE2B 36486ca125bd2701b4679178896a1b9455a1e8486e13a331df9118fc96c8e3655c92651f3e766b625919a5c0edb7a33183a54abd1ed26375930d25470dd9dff0 SHA512 aa6b14cb3c8fedfb8472fc5cee20d5e5cac1d81abb0dc740ab25e16d73ddd23c75e7d551434404a68635ec9d780807fc251765d4681c1f2507615916756c9277
+EBUILD flrig-1.4.2.ebuild 476 BLAKE2B 8665ccf1ef91f3f25912d4af906aeb74a579a5c865ce52f392f34f9ecaf14309a2d936ab6f3916b02e50fa8ea5d92d1171c9de3ef0cb7fb80491d02eec96cd99 SHA512 aec358712976dcaceada364545bcd9306cc5b3441db9100a71dae0d8d5f3a09e1e69b855a79524722840b3090c40c6fc000aa03fc0ba399a8cbc84dfebb0bc32
 MISC metadata.xml 326 BLAKE2B fb57e943fa61222b3967939ff95da7bb17aae2651e55d960a9c405e6d5965843ed0ec9e6fadd0df1f41602c0f3c90c78c6ca2ab12ea72b515484f7c2ec34ec68 SHA512 e48dc185e9eaa074ed92d1ed27920e41b72760cd3e878fd40583efdca0a6997598a7d82221a33c7987fb19dea090f92eee070b9e89ea452ddce028d88db7bf9c
diff --git a/media-radio/flrig/flrig-1.4.2.ebuild b/media-radio/flrig/flrig-1.4.2.ebuild
index 070168983962..bee49b2172f4 100644
--- a/media-radio/flrig/flrig-1.4.2.ebuild
+++ b/media-radio/flrig/flrig-1.4.2.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit autotools
 
 DESCRIPTION="Transceiver control program for Amateur Radio use"
 HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index 749a6ca18f61..332d79eb221d 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -1,3 +1,5 @@
 DIST tucnak-4.30.tar.gz 3594691 BLAKE2B 41ea3469ebd7ab4a50805c2806289c78ec4fe2ab28b3fea0301e486c9b9232a86b3c93ed26dc1ffc3dc531b69acb847f5cfe66b48ea2579d702d0a5427387d79 SHA512 dd840295c69c2a42ab2ac803444684e06bbf4f47623f9200832f2600bf4540817e2e375ffd1e1dcb6bb57743991396eea7f99a79182397d22dcb78adcf98f500
-EBUILD tucnak-4.30.ebuild 1968 BLAKE2B 33060a1288edd2bc2f564f58bd541419a43404b0206fb8d62738002f49d01e6a206ab17f986c90326b194876bab55e8e4b477afe48f4c5046e19c3451b846a88 SHA512 8912dc644b499c39dc65c8fa502793f40b498a23a9bade6d0399e2a961304ced5e51342bc0581d13ac123cf247747d083757508bfb5f1501d98a9f1127bb76ef
+DIST tucnak-4.32.tar.gz 3595195 BLAKE2B 6fd837efd0f649eec8c78f232b00e51d7f08a52e7651f6bbea3a16d3e1fcc21a7ad8a7a69e1507ce9a95b4c2da3a3605708849e0fc856511da9d297689d2163f SHA512 a414007e5090fcfb2f538dce2b8a33b5f9d8491cdbdb21a2067f976b9db8778de1b6cefff1e42fe161e8c0965e069102653ac9bb64ac8a1fbd0539d6a14f5b8f
+EBUILD tucnak-4.30.ebuild 1959 BLAKE2B 94972eddb358f2910ea869829343cd73f1b665fac521f8079a0d8a2bc7bca833519fdb4d6f931748727d65f89ff3d4c3b705963cf173d3cbe180c0f56ae05aeb SHA512 2079ead9bad0d6510c610adb9dfa35a4512ba7bbe5c7601fa03de99ad48de385f91bb160bb2a43e7ef940c00ebfe27a755d5e307dfe7e824632ddbfdd48ea60f
+EBUILD tucnak-4.32.ebuild 1961 BLAKE2B 03bb6db83fe82d2f7a455ba581ea22f29b2e82c90599879a951a0ea11efb7b7f7d9d995e325edaf73aaf9e2f53bbe3f538a874e73807608820b728bc7ab744bf SHA512 b1f2a920e2d077225be1e4033c01e62ed86a0c5f97864412c2512546054d1d3d31016628648991d00def38991f9fc97664956a379042d4217c3278b1df2010ba
 MISC metadata.xml 409 BLAKE2B 8179722b95bb5d639bbf3755eac5ec6d3a2492d117a9af0edd5aba1910974f7ca99c35bf759f9c44a6ee59d18a4b7088c1f009abf0dbdfbafd04f6c3a6875b3a SHA512 e07f3bbf055dfafb6d6fb2596fe20bdb0aaccb8960fc5d1ad5ea372a51baafb75458571729f99afc1086fcc596aa35cd22aafbc9af4d422dba2aba1243c93422
diff --git a/media-radio/tucnak/tucnak-4.30.ebuild b/media-radio/tucnak/tucnak-4.30.ebuild
index 9d0aeaa30bb1..4365636151e0 100644
--- a/media-radio/tucnak/tucnak-4.30.ebuild
+++ b/media-radio/tucnak/tucnak-4.30.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools flag-o-matic multilib
+inherit autotools flag-o-matic
 
 DESCRIPTION="Amateur Radio VHF Contest Logbook"
 HOMEPAGE="http://tucnak.nagano.cz"
diff --git a/media-radio/tucnak/tucnak-4.32.ebuild b/media-radio/tucnak/tucnak-4.32.ebuild
new file mode 100644
index 000000000000..ae02ee026cda
--- /dev/null
+++ b/media-radio/tucnak/tucnak-4.32.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools flag-o-matic
+
+DESCRIPTION="Amateur Radio VHF Contest Logbook"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa fftw gpm hamlib suid"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libzia
+	media-libs/libsndfile
+	>=media-libs/libsdl-1.2
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( sci-libs/fftw:3.0 )
+	gpm? ( sys-libs/gpm )
+	hamlib? ( media-libs/hamlib:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	# fix destop file
+	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
+	# fix doc install path
+	sed -i -e "s/docsdir/# docsdir/" \
+		-e "s/docs_DATA =/# docs_DATA/" \
+		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -L/usr/$(get_libdir)/hamlib
+	econf $(use_with alsa) \
+		$(use_with gpm) $(use_with hamlib) \
+		$(use_with fftw fftw3)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
+	if use suid ; then
+		fperms 4711 /usr/bin/soundwrapper
+	fi
+}
+
+pkg_postinst() {
+	elog "In order to use sound with tucnak add yourself to the 'audio' group"
+	elog "and to key your rig via the parport add yourself to the 'lp' group"
+	elog ""
+	elog "tucnak can be used with the following additional packages:"
+	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
+	elog "                             (No need to recompile)"
+	if use suid ; then
+		ewarn "You have choosen to install the little helper program 'soundwrapper'"
+		ewarn "setuid by setting USE=suid. That helper is only needed if you"
+		ewarn "want to use morse sidetone output via the PC speaker."
+		ewarn ""
+		ewarn "While the helper should be safe by design be aware that setting"
+		ewarn "any program setuid is a security risk."
+	fi
+}
diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index df1fdc750c74..13c21c5f177d 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,5 +1,5 @@
 AUX unixcw-3.5-tinfo.patch 1212 BLAKE2B 00afb10b8318957f8c4d10ae9254586aef365674822d23da9fdafcc31956252e77ad754c3389ae535b5d78a8611c0750b5609bfd785b6e111d350cc98411eb00 SHA512 370f2bd601546dd5043dedf1387783c425d15d0c52a8f357c4bb1bb9eb0ebb8b54bb4afd79db14314603bf23838568041c590c830622017bc05bd9bfd97baf6f
 AUX unixcw-tests.patch 533 BLAKE2B 0b2c08f1f2bb9db4ad2c98a4af7d2097f408e873cde8f03b46c994adcbb06ed0a20f95e2951c55810821b92e7a3e529621914308726233a108879e3341e98cf5 SHA512 331a7e71a3f9686b08ce59e06e59d4812dd36c4e2597a0ae57f663c2c0b7f32eca3e70adbc1769886b12856ed2d96bd9f4279f95db70d401e31f477b183fa2b7
 DIST unixcw-3.5.1.tar.gz 740331 BLAKE2B 9b5b4b819cf75ca0b10d773ebdf9869bf835c49f10c54b5bd34441b417d48d9a92abc9390a41870bf1c09fbbfe932554307abba181cad3b8631947adcf9890b1 SHA512 b59499723d810a537a2f5ab2b4b34c83a1c8c815af82a60ba29f4d9cee445525e530136f4e202db6b87305ac7a818fa6e59214a45c6bffce299eb50b58c866e1
-EBUILD unixcw-3.5.1-r1.ebuild 1980 BLAKE2B d7c577e1295ce61faa5d2099281aca2354279aa170722e1c900bf9b5ac12865e0300f4e567bebcac90c9e9ccb4f663769f495fc9ef0176b4c8c859303da2a4c4 SHA512 da0a2afc4bd2d9ffee89e645097cdf171ec7f1ef2d0ee8fc9aaad31e1a972cc1b513b1c25a533156ea95184d664c63c62cbf693c91dc7e91a3d8f5f330b3de59
+EBUILD unixcw-3.5.1-r1.ebuild 1971 BLAKE2B bfd6b8e0086a2cf2f8658aa38764c90db77cb814177be08b3d8b250d2699e9cc706858852701f729396daa0c3cf421994dd41956ce9151999a0cb4a7062571f5 SHA512 5c486e4cbd7f52d2318c1ee79634db552e582a641092881f6a21f2817491a7b51bd0cda85c49cd1cb870c07e0f1ede73c428119ea6f91f09bbf9c261d83a0cbf
 MISC metadata.xml 875 BLAKE2B 582b1ba40e9424d308e33d5f2bf430e270a2d4d106aeffec3d03e1736360758776f5aa8a8d0078aa03c0e4ca8ea206b9805be2223db69282bca0cb752c531314 SHA512 07b92861370f28e4723e48d75dac80e3517c7a944f7a4ac07e6afc75f80871b6ca6a4904d042bd79bce1dfcd81b74d3b85a25b0eab3f8c83dac7742f6fb10219
diff --git a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
index 56f654e4a8fb..09e46e9788f0 100644
--- a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
+++ b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic multilib
+inherit autotools flag-o-matic
 
 DESCRIPTION="A package of programs that fit together to form a morse code tutor program"
 HOMEPAGE="http://unixcw.sourceforge.net"
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index 066fe7d91989..75b194c46e19 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -5,6 +5,8 @@ AUX wsjtx-2.3.0-drop-docs.patch 676 BLAKE2B b5d6edb900dd9f26026ba3752ad14bd4b944
 AUX wsjtx-clang.patch 619 BLAKE2B 8019381b563bfede3977e37c96c0c664089458f0be7704a5267eece14a48b8cbd4a6348803d4a4e4ef0023006363e26f89f03788ac20f01d227126952f8d2375 SHA512 cf40f9ad542ca07f70ae507a74625663541c05968e1cac78eff7ec1fc0668b683b62ed35effc03b7028a317694e1056b70b862169900f3dc9655ae1ba057210d
 DIST wsjtx-2.3.1.tgz 18040272 BLAKE2B 37b90842470d5565d49d5ed7b9d92207904216d29b8a9966dc38142303d48e92eb640901e4f0a80350f915963f725e36daa7c6fe8034743d30a253eeb02f9e1d SHA512 0a709ca605fb8d93f7583393ec4bdf6416b93233e2910e7e59942f4e40bdb9f2591e3e4b8e0822f49e104e74198a861ed2995cbb4976c7597ef1a1bd6fc43b44
 DIST wsjtx-2.4.0.tgz 18239827 BLAKE2B c58081fe4fe8afe08a137727ea492e61060f8bd4e5674a3c8daba35e4f89bc925d9e6d4ecbd8e1ed003ab4ad9bca71df24d6012456d5a64eb899fb79ba0be40e SHA512 c40e145ccab9e7339046994a08394f5a41604762e7998431648beb4b7c3067a87e32e346e3fb74615f7be64c71151c80286ffb217589f1f7e276dcc4761a9406
+DIST wsjtx-2.5.0.tgz 25180010 BLAKE2B 09a50f8bbaca4fa6883ad335a6eb3e0d60d3e20382140ab69e3165ba4a38c9e96b059831db9a28452b15f5a0b98118e1269f3484ac8f375525135236b9d7ce02 SHA512 d5f801c9ec038a84d5b12a3843de9af7bbd6d628bd5eb8d3dd1e1621f04b319f9cc2ed01c882bf09ad3801800ee1b1fbeb49c8a9f991a2c03f3170ac192a6017
 EBUILD wsjtx-2.3.1.ebuild 1687 BLAKE2B 9332b16222b137b0226429aaa4940fe8c968e2f4d23d7a3221d74fe1cef0e543f8a33e75cad5e497af79fed0b97a0ef30ac444f92506c956572bb2b92ca4dc0e SHA512 1a8258078a1a8cc10e011e27d31de464320a5acb41368c7ed874cd0ce7dd4b1d960ae78a9c0e719b6e90c696d8cd1c27c8597cc51a9a36e53c339ed3415cac27
 EBUILD wsjtx-2.4.0.ebuild 1687 BLAKE2B 9332b16222b137b0226429aaa4940fe8c968e2f4d23d7a3221d74fe1cef0e543f8a33e75cad5e497af79fed0b97a0ef30ac444f92506c956572bb2b92ca4dc0e SHA512 1a8258078a1a8cc10e011e27d31de464320a5acb41368c7ed874cd0ce7dd4b1d960ae78a9c0e719b6e90c696d8cd1c27c8597cc51a9a36e53c339ed3415cac27
+EBUILD wsjtx-2.5.0.ebuild 1689 BLAKE2B dd6a09e69b77941ace5d69e756359d3f321d982831160b05eaba1a7ed4befba470d18c684a0776a2efa78b6f64c2c1a5eeec527118cbf180b582643c7f2c9463 SHA512 d407ea31a2c61f46f98f21b2736b76e25e212a87a047f6c506ce336ed561ee7aa554d0bb1b4b7b632902ddbcb6968ea2af7943a174cf62e774c1665cc6e7b3f1
 MISC metadata.xml 412 BLAKE2B a8910c8ec81f720c209c3d9cb6cdfbde76be4c5a96941dfc3b799e9ba6b4d967928508c04bc5805536319a20f0b7cb292a2475f91de27471c11b9fd0f9073bec SHA512 2215cd7cea5ed62ef70bb2823ce85628877e3c204f7a55e582431c2d90ec8f77e6523b3e81c1747b339d58eeaf7c026ea26b6245af86294904e1c34887da943f
diff --git a/media-radio/wsjtx/wsjtx-2.5.0.ebuild b/media-radio/wsjtx/wsjtx-2.5.0.ebuild
new file mode 100644
index 000000000000..aef0bd374750
--- /dev/null
+++ b/media-radio/wsjtx/wsjtx-2.5.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Weak signal ham radio communication"
+HOMEPAGE="http://physics.princeton.edu/pulsar/K1JT/wsjtx.html"
+SRC_URI="mirror://sourceforge/wsjt/${MY_P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/boost:=[nls,python]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtserialport:5
+	dev-qt/qtsql:5
+	dev-qt/qttest:5
+	dev-qt/qtprintsupport:5
+	virtual/libusb:1
+	>=media-libs/hamlib-4.0:=
+	media-libs/portaudio
+	sci-libs/fftw:3.0[threads,fortran]
+	virtual/fortran
+	app-text/asciidoc
+	doc? ( dev-ruby/asciidoctor )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools
+	"
+
+S=${WORKDIR}/wsjtx
+
+PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.patch"
+		  "${FILESDIR}/${PN}-2.3.0-drop-docs.patch"
+		  "${FILESDIR}/${PN}-2.1.2-qt_helpers.patch"
+		  "${FILESDIR}/${PN}-2.2.0-werror.patch"
+		  "${FILESDIR}/${PN}-clang.patch" )
+
+DOCS=( AUTHORS BUGS NEWS README THANKS )
+
+src_unpack() {
+	unpack ${A}
+	unpack "${WORKDIR}/${MY_P}/src/wsjtx.tgz"
+}
+
+src_prepare() {
+	sed -i -e "s/COMMAND \${GZIP_EXECUTABLE}/#  COMMAND/" \
+								manpages/CMakeLists.txt || die
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWSJT_GENERATE_DOCS="$(usex doc)"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+	)
+	append-ldflags -no-pie
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
+	rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1 || die
+}
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 3c4b9e4c20bd..c841f8e0d930 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,5 +1,6 @@
 AUX xastir-2.0.0-dont-filter-flags.diff 621 BLAKE2B 7bb56ddfd744123b705e7f00866fa5ac76a3ee0cd5379ee8cb41b7f1eac94ab9e704802b64eb22fe182d594c4d62ece3215122c22f5cd30b3f00c4c60dde875e SHA512 da94db0dcbd79c7b258f3657d0e6135fb93de81f3a2c25a73d68051b1a92156392a638f6a5478f4a0b8b568c4780a4091d7345e4c8cc60ecc190633123da0a6b
 AUX xastir-2.1.2-scripts.diff 3766 BLAKE2B fbad015655864f26dfed1b50ea6c1399fc70088ff092a2cdd1a173879db4bdbba43aea9107cc961890012682d0e265f888b908d553c50018d34ea040dc08243e SHA512 aef4410c53aa3d80c4f3ea48a50759a9a1813801d18fb6dd0cf4e90b8e49358c9f6040cca964b5ce4eefcea2966f197207b25e67dd1b69e1bbd5cf0ba640ae46
+AUX xastir-2.1.6-automake-1.16.5.patch 426 BLAKE2B bded6c304ce675046d833fe1b52d474ef47ec1c237eaa8b23976cba80e2d773cea94ff3f0e28b7c4ea33a75092710be312c37940684223cc2959b07a1224bb7e SHA512 c5ea9a433473a2f0766911ad9acb38f21bd168fe46af166cef2c338cc5277e24bb972f8edb90b1664ecbb4eb991e34290d8661163579c2c91e9491b41f62705f
 DIST xastir-2.1.6.tar.gz 2687180 BLAKE2B 053ee4e8d1fd589bf0767c6ffdaa7de2ef14d292d5773b2f08239fc4b73d3695e5c061dccab75caae068bc8887f7924d3793f0dfb8368b2cd25526211e240914 SHA512 91f40f3788f51589619833102d1db997ff725f84e6fa5f9b7dd8942094a1b7a94433779243be1c14b980d96613972482a397cec8e15b8ea4784fdd106c32ae08
-EBUILD xastir-2.1.6.ebuild 1925 BLAKE2B eb058e099fb416870dc9269b59fa853f7c54e65cc890b341ed3df3e143ad06e1f05b63e7ec0d0b7d8d9a3e5a65450b642f771b2612dcb0bc2b709f38d00c33ee SHA512 490fbceccc239a2174f83bd7a0d4fd7a777a9cd7f63ea8918ac2cc87801cce42d3ba9ac3f15d8bde27b041b96765ef617e6e43b9e0fc13856ef57e42689b90c0
-MISC metadata.xml 470 BLAKE2B 7c08b1868815e6c07c0f62906cbaeea5927f97b59a26b6acc7527ffd68e2ee7f4f5c225fe8c8722cf0975f0ff0277319f405294b181a96cbb04bb50d190bd78a SHA512 f1e8b59093f5239fa014a028fe64b03418d161282f07b70ff8078174c481640f9956a1a4d567205860e101b807e0f8491efc0d2b18c012df0bdaba7a5f849027
+EBUILD xastir-2.1.6.ebuild 2053 BLAKE2B 9aee91db280c9719be855d381f31c2acf43b0b6dda48f830b5d9c0125b093f1264597462fd3bad24b79a49eea57cf45f66b658aeb9e943550c127c942a59b253 SHA512 bd9b236d04fc845b0a7c235089e55ee52ef17e0ea0643979bc26b44b1e9a5cbdfdee054fcc13d807338f62b54e2d4f32b777574d8970a1f270e71563ed3285bb
+MISC metadata.xml 394 BLAKE2B f1277742dc42b3ec0fd74c6ad56fccac145b0a6635232a0e64823cfcc002f79a912f5298a929a9dc3555d94f8771c8a405147f25d4383de8ef8786b65d349c94 SHA512 71caf8df00b9bd50a6c84799002e904f08461c9d3aefdb105fb12bf09f07c1c6090e0c83fc6f822178603d610f868d053afe84f0c7bc30558e5032fb480388b6
diff --git a/media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch b/media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch
new file mode 100644
index 000000000000..51d10a2c8159
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/816615
+https://github.com/Xastir/Xastir/pull/181
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,7 +23,6 @@
+ # It should look something like this:  ([xastir], [2.0.8], [xastir@xastir.org])
+ # The revision number must contain at least one '.' and two digits.
+ AC_INIT([xastir], [2.1.6], [xastir@xastir.org])
+-AM_INIT_AUTOMAKE
+ #########################################################################
+ 
+ 
diff --git a/media-radio/xastir/metadata.xml b/media-radio/xastir/metadata.xml
index c4a39d650212..b96de3345070 100644
--- a/media-radio/xastir/metadata.xml
+++ b/media-radio/xastir/metadata.xml
@@ -9,7 +9,4 @@
 		<flag name="geotiff">Install geotiff support. Allows using USGS DRG topo
 			maps or other types of geotiff mapes/images</flag>
 	</use>
-	<upstream>
-		<remote-id type="sourceforge">xastir</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/media-radio/xastir/xastir-2.1.6.ebuild b/media-radio/xastir/xastir-2.1.6.ebuild
index 1da0b5592d83..fcd3f2a7f254 100644
--- a/media-radio/xastir/xastir-2.1.6.ebuild
+++ b/media-radio/xastir/xastir-2.1.6.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
@@ -40,9 +40,12 @@ src_prepare() {
 	# fix script location (bug #407185)
 	eapply  "${FILESDIR}"/${PN}-2.1.2-scripts.diff
 
-	# do not filter duplicate flags (see bug 411095)
+	# do not filter duplicate flags (see bug #411095)
 	eapply -p0 "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
 
+	# fix eautoreconf with >=sys-devel/automake-1.16.5 (see bug #816615)
+	eapply "${FILESDIR}"/${PN}-2.1.6-automake-1.16.5.patch
+
 	eautoreconf
 }
 
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index 69f71a11f5a3..c321386962d5 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,6 +1,8 @@
 AUX xlog-2.0.7-desktop.patch 435 BLAKE2B 56fee116a69c99f5192f1a2e4804821d715dd15f927525694100471b296412675eb97237c7e239cc407a2ffb145dbf779e802c1a1f5914a064d70f73ad269d12 SHA512 5119356e9635ca7b6d028d4bb3be12542636ce5d2967540b20ad9c22d62792b81a1a06fcd8722c7cbe8df706d8113e60b308d1db7c6fa8f3238bea039eb4b4f6
 DIST xlog-2.0.22.tar.gz 11407849 BLAKE2B 85d2e904d33ef39883cb8ac086eed4dc7e65503cdccb95e8d33f169d12de4f1ed556a28ac2f40e0044e937185bf4d93fe55608088d6e95744617c9c3a051fb55 SHA512 a261f8e28b75aed9380c29b3da69c7615b0d32346eaf84a0ace5cf77c53407372c4985c599078dba5ed92f77bd8052a74c7dca40028b99bca49cc3164d4ec490
 DIST xlog-2.0.23.tar.gz 11407743 BLAKE2B 82828d043006b7f73ee32bae5b0beb261684aa70a2c556af34a8a269b790ad76e24d40a7ddb5c9b5cfd74ac7feb510c19deacc1b3dea647594d1f5f8c1293ca4 SHA512 1c235e6a49c7d6dd049aade4a0c34ffed61c211ea31c0f8d4d62db1a03b2d1e025ffd2fd9ae42b639113485d36e1ee2e40439f74e1971eb99847f4564b21bd10
+DIST xlog-2.0.24.tar.gz 11407825 BLAKE2B 0de5203d4229005ba84940443672a9787a9ab2a87565bcbf47e0a0fcf375dcddec7636d11a359a117c42b7e07ea81fd482a2684b8a75379da1fe72cbc991643d SHA512 cc96dfabf01a6c49ed7db1257cc102a469642bdd32a158b0a026da2017181060f8aace5de22ada5df42b3bc89c14448dd372332a9ff0101121570f5b1187e5ab
 EBUILD xlog-2.0.22.ebuild 1888 BLAKE2B bee6934c6a426de22807f032b2ef5706b2014ea3f13cb36cd9229aac625e220209a1a6a1a33bd5f95086415a612770302d2692dcc228d8c0ff642ce53764874c SHA512 8dd97e60010d3abb1985ebb3f3ead50ea5c867528705eca25035e244d3bd4ffee397c6fde5548d87b0918e636cb71476dfc21b2c7a409370764f5577210808d9
 EBUILD xlog-2.0.23.ebuild 1890 BLAKE2B 4eee0c65853210997bd9b01b5bee76103ad7bf6b9623ddaeb3cae3f9e5284310be60cd252c25acb62d73ae2115e136ab8c34b6f2382086dc9197b1048253e522 SHA512 7f451d6585b14d8f6f9488a66491d73c849a7363e80c7388d2d41e5aa84e81c7690eb233ac0b7b9ef515f4febe621430d78a37308a2d57d34fa3876222ed2bda
+EBUILD xlog-2.0.24.ebuild 1890 BLAKE2B 4eee0c65853210997bd9b01b5bee76103ad7bf6b9623ddaeb3cae3f9e5284310be60cd252c25acb62d73ae2115e136ab8c34b6f2382086dc9197b1048253e522 SHA512 7f451d6585b14d8f6f9488a66491d73c849a7363e80c7388d2d41e5aa84e81c7690eb233ac0b7b9ef515f4febe621430d78a37308a2d57d34fa3876222ed2bda
 MISC metadata.xml 246 BLAKE2B 0e24c5acb9f25df4ce675d772f01ef4cca1df3e885dff8c64c0c6f255b9ec49c4761ee159c30a35f77bbeefa1ec62ac6e835d2facdae2b63fbf0d6b350ac23b0 SHA512 be18486abf39193c34501128c8f1bf7e1886b74a7d551735d00c3492c7bae8845ba2dbea93b2ca73d5467cb7764d90b670014143ae8a8ca0a480a02d9af60efb
diff --git a/media-radio/xlog/xlog-2.0.24.ebuild b/media-radio/xlog/xlog-2.0.24.ebuild
new file mode 100644
index 000000000000..6a50652eae61
--- /dev/null
+++ b/media-radio/xlog/xlog-2.0.24.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs xdg-utils
+MY_P=${P/_}
+
+DESCRIPTION="An amateur radio logging program"
+HOMEPAGE="https://www.nongnu.org/xlog"
+SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/hamlib:=
+	dev-libs/glib:2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	media-libs/libpng:0
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS data/doc/THANKS NEWS README )
+
+src_prepare() {
+	eapply_user
+	eapply -p0 "${FILESDIR}/${PN}-2.0.7-desktop.patch"
+
+	# Drop -Werror
+	sed -i -e "s:-Werror::g" configure.ac || die
+	# fix underlinking
+	sed -i -e "s:HAMLIB_LIBS@:HAMLIB_LIBS@ -lm:g" src/Makefile.am || die
+	eautoconf
+
+	# prepare for media-radio/hamlib-4.2 change of API
+	if has_version '>=media-libs/hamlib-4.2' ; then
+		sed -i -e "s/FILPATHLEN/HAMLIB_FILPATHLEN/g" "${S}"/src/hamlib-utils.c || die
+	fi
+
+	# Fix broken png files<<
+	einfo "Fixing broken png files."
+	pushd "${S}"/data/doc/manual/output/html
+	for png in xlog-clock.png xlog-dropdown.png xlog-editbox.png; do
+		pngfix -q --out=out.png ${png}
+		mv -f out.png "${png}" || die
+	done
+	popd
+	einfo "done ..."
+
+}
+
+src_configure() {
+	# mime-update causes file collisions if enabled
+	econf --disable-mime-update
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	# build system makes it complicate to inhibit updating desktop
+	# database, so just remove the offending file
+	rm  "${D}"/usr/share/applications/mimeinfo.cache || die
+	docompress -x /usr/share/doc/${PF}/{KEYS,ChangeLog,TODO,BUGS}
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 23fbf1cdee94..0ff94199d176 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 75ad64e378b5..af72a95b3573 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,5 +1,7 @@
 DIST abcMIDI-2021.06.27.zip 605658 BLAKE2B b522c96b7f8990f297cc13a3334872763fb2879f5893f09e630d66ab425d1772e0eee64273249d26e8118c6d341dad84129e140d8c309adab160f3120b5a18a2 SHA512 b1e4a7a9b93e6633abe211258995cfa84bb8eaed3870ed20e244aa12353c6cc351ea7e1c842e4e410dad9dd91b2e8c918826138bec39503c56e95062f4a99f37
 DIST abcMIDI-2021.09.15.zip 605783 BLAKE2B 814dbc75489e0df509219d64d3a094a1988832f38199236559cd2137890855acd18e5cddd1fc82dab942e183b8fd18aa1cbc1b0082bd7e6c3bc89180fc196ba5 SHA512 2bce8af706b51d10ee250cfa770d6047929bd575af57b4ca24c08e55b7105d25ec117983d2e84f4bc35350da2c0b351dd27585bbe6580846b23a3a91f523d7ee
+DIST abcMIDI-2021.10.15.zip 607327 BLAKE2B f36d212c582c4098faffde797c55fcbfde086dd64cfbeca9f58300d80eeb519f3f5aaebf6649bab25912115c583a0e11998dd9c5076547bd77009749051ae7f2 SHA512 f9877444c28add8d036223d1f8aa309928d14a26b923509411fb5781192c77292138a02837015673a92c724b0ce59aa8fc11c66177371c9dd1d23501410f01e7
 EBUILD abcmidi-2021.06.27.ebuild 676 BLAKE2B 916e0595b5c1cbf9dad1ba1c9fd7fdba8010898e12ebbc95ef02bcc725cb22a44e8608bf07ec3dd253128aafa3af728ae3709bb9a8bef786b3e6124cd32ae7c5 SHA512 3f000a5a47de4dcc3da9279dee49e962f526833ec4f85dd7f2d749d54b4c08057a99b53deef3c978f7dd1840ffd96b97d3db875d7bf559e27e18042eb8dc8bc6
 EBUILD abcmidi-2021.09.15.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
+EBUILD abcmidi-2021.10.15.ebuild 678 BLAKE2B b09a3d0f7474ccaebf61cb08b70511e4a6a968af676434d24a90773632503424befdfac284b762eb02168f5949fd79c2349ba36fcf3f1f10c721018b0750f689 SHA512 280fe2968d73a5db39665edcc822938f8ed2ea7f47108dba58a42cc3ae4a053a0b7db4ca67db090d5a77e5a9aee14700a23b73c9494b1dcbba2e9f07a04580ba
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2021.10.15.ebuild b/media-sound/abcmidi/abcmidi-2021.10.15.ebuild
new file mode 100644
index 000000000000..a0a2a9de38ec
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2021.10.15.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+S="${WORKDIR}"/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+	sed -i "s:-O2::" configure.ac || die
+	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 775444362428..ea5901de4ccf 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,8 +1,5 @@
-AUX hydrogen-1.0.0-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b62088daad51e4ec5951fa547415b96e6f036d927bbfc134e41a3b695b96212de196b3b8acf3aeed3fedf5342277b0caadaeb55a9b SHA512 13ca4375ee79c88ff79e3d9fe4f6c1d9d73526e0dc03e4e99d37fcf436cc74f178df9c8fe474e224c9885722d19c8d2c8e693d944a75411811ea41dd15557792
 AUX hydrogen-1.1.0-gnuinstalldirs.patch 1879 BLAKE2B bf1563cbedc0b3a6d2aefcfe6bbf1bfd7f44ea26456d18889d684763f9af8170aeacc5887182ea845093c5187e92da51298dcb44bd99d6c2f0c5a47adbe5ba7d SHA512 20cc8970301192c967866f27b344591a58747a3a501eaa1b5d92dfb82af48e98f5c9e4c7908084f2845d258f323cec0ec42b578797b1bc3447c9b1918cbbdaea
-DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d SHA512 7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9
 DIST hydrogen-1.1.0.tar.gz 11413446 BLAKE2B 8008336d2199bf36d9efca8875217e4a5f3d66c0274e25334525292e7864ca1dc4da75f86cbba981dfdbc19a3dbafebff503ce1ef597adae56fc467b44611a19 SHA512 116380be03f03a9294e278be5c7ede90fe088f21bf31db46a5e5df2684d11676e518200e6c4a187063c769f5b97950af9602b9b2694ca37788f73a2666265cc8
-EBUILD hydrogen-1.0.2.ebuild 2079 BLAKE2B 6edfa53c9d4609d76dd0923dbe9f726f25ba14d7eae18c1b1a1735a3b7bc630912a4a0ab45d6e961ff0b43a09ed35ed2adca11486df531db93a771bc4d2fa06e SHA512 2337df146265eeba5c1f5216e14d6d487a97493f316e95a671c54765279768b70acd46da7ad4bccff8076b97f999f458de72c7014bc21c6c9ec893b1ca0693c0
-EBUILD hydrogen-1.1.0.ebuild 2043 BLAKE2B 444e242109efebde38441568ddbf90700677fa39cdc08f9dae8720d78d090082bc37c5b89b2a42de7247d15fc03ba58e65ea2d96c0d727a009b63179c6d9e989 SHA512 baa3a18a44b7d2504a8b05e943b0a88b8365a44aa1adf498aa11d6ee60d7ec2c6a39342bbd15dfdc291af8b789c50bc22ccc4a7d9b671c109d59ee31c55921ba
+EBUILD hydrogen-1.1.0.ebuild 2039 BLAKE2B a76037393333d532b1c8d2fc273f9d2c88492e479b251069da4ae7b510f2d842227d67192fdabc34c74efbccf30f9ab7fe73569dc02de89b7eac2e7cc37f09ae SHA512 0dd08ba3b7d3f45c85b23937f32d8fb9245a65dcdfea5f23ef090052a9b85bfd943d549b2c28b9a770362a151f4fb4fff6d8da54fbcffd42584f0d0767dd6d13
 EBUILD hydrogen-9999.ebuild 2050 BLAKE2B 6196b99a92cf45e3b4af44f5015e19c1727af83062362332459dd0b207baea81822e7ceab88942b37a76bd8f8ecedc5291cb666a2c753a9bee430b7d3f43f792 SHA512 c0c2426def5cdbdef507d724f6c22d79da050064d96ec70add7b1b9554c6325eedfaa0817f6dc49d44308d964693546921bcfcf0df6231da8b9dc85978f3d118
 MISC metadata.xml 478 BLAKE2B bd59feef45263e2f2440696d657c0845f70498b64dec764dc4fff3e0c837a725195f55a2a651498f5c38448ae7c45fdc50def9a8068fe58e93332ad66de7e1ab SHA512 757c7766697ad73293ed281df0079de5775068bc6b899a9dc6bd3a41a36ed024646e01d242177948be1756d407e44cacd2bb2ed7ec0e4698fd358ec0031db3c4
diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch
deleted file mode 100644
index 9b8429753072..000000000000
--- a/media-sound/hydrogen/files/hydrogen-1.0.0-gnuinstalldirs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 04aa6380..e979783e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -362,10 +362,10 @@ ELSE()
- 	INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
- ENDIF()
- IF(NOT MINGW AND NOT APPLE)
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
- 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "org.hydrogenmusic.Hydrogen.svg")
--	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
- ENDIF()
- 
- #
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index cfdc72a7..b7b0dbcb 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION}
- 
- IF(NOT APPLE AND NOT WIN32)
-     INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
--    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
-+    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
- ENDIF()
diff --git a/media-sound/hydrogen/hydrogen-1.0.2.ebuild b/media-sound/hydrogen/hydrogen-1.0.2.ebuild
deleted file mode 100644
index 5b62655b32e1..000000000000
--- a/media-sound/hydrogen/hydrogen-1.0.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://www.hydrogen-music.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
-else
-	MY_PV=${PV/_/-}
-	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-fi
-
-LICENSE="GPL-2 ZLIB"
-SLOT="0"
-IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
-
-REQUIRED_USE="lash? ( alsa )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-CDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/libsndfile-1.0.18
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lash? ( media-sound/lash )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="
-	${CDEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-
-PATCHES=( "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_CPPUNIT=OFF
-		-DWANT_DEBUG=OFF
-		-DWANT_JACK=$(usex jack)
-		-DWANT_JACKSESSION=$(usex jack)
-		-DWANT_LADSPA=$(usex ladspa)
-		-DWANT_LASH=$(usex lash)
-		-DWANT_LIBARCHIVE=$(usex archive)
-		-DWANT_LRDF=$(usex ladspa)
-		-DWANT_OSC=$(usex osc)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PORTAUDIO=$(usex portaudio)
-		-DWANT_PORTMIDI=$(usex portmidi)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_RUBBERBAND=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	cmake_src_install
-}
diff --git a/media-sound/hydrogen/hydrogen-1.1.0.ebuild b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
index 85706a8f385c..966393b75e6b 100644
--- a/media-sound/hydrogen/hydrogen-1.1.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 	S="${WORKDIR}"/${PN}-${MY_PV}
 fi
 
diff --git a/media-sound/kmidimon/Manifest b/media-sound/kmidimon/Manifest
index 4140e7e42776..3ac6347f4a53 100644
--- a/media-sound/kmidimon/Manifest
+++ b/media-sound/kmidimon/Manifest
@@ -1,6 +1,4 @@
 AUX kmidimon-1.1.0-fix-install.patch 446 BLAKE2B 3a1a4633c63dee9334ddd1f8a5b40f8a8427d83193ea65e7296c833f7856544323c47a02684ad90c59906fb63d9dc5f2de008a0b197a4e6325f953461271ad95 SHA512 9a3cdb4586b988a78c9f38fc167475db27cec608bbeca2bf489252a74007bcde241732e9cf4dbe5db709637ffa70e5e43ddb2b51859c0bfde723f420d8c1dae8
-DIST kmidimon-1.0.0.tar.bz2 322397 BLAKE2B 6c70e6b6162fe53fbaf7b7945035cb3974120501504c74c3fc0a0c607b2c38153f72cdefdc5f68b97c02148aefc3cd6e49ec0ea45f8b8f9ee6c11ab9383b813d SHA512 3c69fdc128bf5c0b7ec123b06ce3ef0e2220a04e8e721d8fbfa461dc8392b08250f2d333fc0f6080135107a97cd16736327648c4cb4cca72ea4d43c1007ad744
 DIST kmidimon-1.1.0.tar.bz2 392541 BLAKE2B b4b45eaf0d370c0b0989e7c1a7a30473cb8e252346687a6b3d99a5d3e78a8155893e478d354cadc00b1a7df07a174dbd21ae07fd9a0746f5b7dcdb5786520797 SHA512 6792d2b45e2ee9da777d2f29623453a41532d6f6d93a6e375afd07b4cbcf2eb18f11ab2d9358febbb22925ee7e63912c5bd4714a3804b95971a52a1c0b00a324
-EBUILD kmidimon-1.0.0.ebuild 692 BLAKE2B f4377cebe26ef311506cba8e6b1c58142f0ec4babbe9d849bbada819af45f6aa44cbd0c97ca8261898c52b70bfada6b505dc48edb508ac54757795af20d79669 SHA512 42a8574b2ae3910f11cdc4bf07a0e739270f4998cdd2dabd574c5e73a9c30bcaa1b009e4c44456ba315c6d9aca7f88badd93816eaf345063a9fac35878423a08
 EBUILD kmidimon-1.1.0.ebuild 704 BLAKE2B 0c28d4e8a2115feff95b3fb3483601a3ea4b01e5640de8a922d68aaffd1ff6dbc63438421f5f1d32a91695f5504f65ed963d4544400a5f9a0cd5cddbd089018e SHA512 27f0a3ab0327b75819be82071ea4e9876400a54f02bca775c6b77bd16368d526a2d6ae7174509af5e23a9b8f546cbb69dd155f1b123a1021352c797e907be3ce
 MISC metadata.xml 442 BLAKE2B 20c1a6190737f4d447ab159fa0568f27b731d3472b3a4ec26fc4d3225ec9e82fca014d82ad41fe1c8c6b80e785973d066bf7101078ccccd7efac67d3d992749b SHA512 bf4cb478d26b5e1f49057954f77284b6126c72541925299b71f901559bba3020c25a8ca6e6b9b4ccee966f612c71a6b8554f08e64e97e00c3c09232ded483c09
diff --git a/media-sound/kmidimon/kmidimon-1.0.0.ebuild b/media-sound/kmidimon/kmidimon-1.0.0.ebuild
deleted file mode 100644
index 3c9506e1889b..000000000000
--- a/media-sound/kmidimon/kmidimon-1.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="MIDI monitor for ALSA sequencer"
-HOMEPAGE="https://kmidimon.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	>=media-sound/drumstick-2.0.0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index 7383cf88693a..16aa5512b1ae 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -2,6 +2,6 @@ AUX linuxsampler-2.0.0-lv2-automagic.patch 929 BLAKE2B 11e2dac74d6e4bc76385544f9
 AUX linuxsampler-2.0.0-nptl-hardened.patch 654 BLAKE2B 1e3f06d78cce3a67847bf3bedbb40b4ee7d28d410997444506d21d4ed0e646106ddcc78c770c3e214d73e474e6138f436841d3ce1703c9da2f06df3df921e9ce SHA512 cc75f55d80264d939650ea87c967e206110ae07245ae8e00dd83bed63a4e0aa75aa2a18b3b384ca3557896e44b2a13bd34deb3cc6f5487d7516b09b2c05e1594
 AUX linuxsampler-2.1.1-fix-yyterror-not-declared.patch 427 BLAKE2B 017c8fd7e7343eb582a5fcbf083be3fa9fcb02fff69caace767534ee509215a835caf548cce73955295c39a6a42409e0caf3ec3e5752018235ccf2defe327b0f SHA512 6a89d17600eab3aac9b9a90899c441af1359b7798fe79ceed4e3acb624024e6285e56210b484f50fc03dfd7da4def2cfdb708adfd0526d84d9b041256fd6f4e6
 DIST linuxsampler-2.2.0.tar.bz2 1507276 BLAKE2B 9650938d0aace876e817884121b824713dd2f747505344d7895e7d99da62f2214fb4c4bf43c398f4e486202e23e7a57288e19734e8c565a917d823169deb717a SHA512 9015bb8d3af125e13c5c2ef3ae2d3987f7b7dda72e238cff25e622a3291019f5e392195dd27e7e783c70d877d9b267915fc443369eb17117e5eb7c54b8496c68
-EBUILD linuxsampler-2.2.0.ebuild 1735 BLAKE2B 8133c90eea4922a25e5c3d36d93fe166c0d5f35ef0676739e4ebf1575707abd85790d47225d5cdfbb976ef9d8dfc7673f151683741e93b85c9f025f6e83d271b SHA512 7bc4f789a2471cd793371b388f1b4f89078e24701516e3a82bf6eccac8a2cc9bf28572642648af9db9ab759f7257484421971fdac55eea29f66a23ceda919926
-EBUILD linuxsampler-9999.ebuild 1563 BLAKE2B 9e429cc9f1877db28206ab161a952d3a0219a099a4d04aaa54f59a313ffbd4471a579a2e8b86d42c289af60da6518e7f2e6cdf7d01b8f30b5af39224aff81387 SHA512 cea0571ab48c8db627184052d56b9f0c8e6f3096d89dfff8ce2fcdf4a24e556b1cd06d75dc1b5baa5e50851d3bc12e3281f3c6d2d72347224d0b34da2455b3fb
+EBUILD linuxsampler-2.2.0.ebuild 1754 BLAKE2B 5f7fb629dc47ff3848eada9071e6015fcc3561e94f149d56ab57d5b60a64524eb5bc7bff4892469ae5ff7848b7f0396d653bf344e410022831f030a2a8b1557d SHA512 05c4726ea9808d3222f8436181ccef8d03bbe766b19a75c0592d1dbc070a4ad052841c30cd7496ad032199e4c9075f45fd780a6968ff9717258bdfc711aa5141
+EBUILD linuxsampler-9999.ebuild 1582 BLAKE2B a3a76843bc8b7482874dd29cb5b77baad5ef712646325b1fe94bc0ac50419ae9edf2e6ba6287ebb92254be0b648b19ecacb7d114810988b00b10213fa48575a4 SHA512 c18404c4cce6c21a52b05f6f3e6215cf62f28703e9348ace817afcf2ae5261322cf71e195bcd3dd8ddbe72dffe17476c73d6e182e6e1a040599bf2a6d7122c25
 MISC metadata.xml 392 BLAKE2B 4dad0ff3f6c461c9672da1cee3f37f78720a0d5dda462c385d96759e9adcf39367c6fba4a010793881aeb75efb4f0a78fae0e4acad2d82b2512deadc324307a5 SHA512 f3f5a5a0ed00efffbe1287e8014a1291d436c35fb03bff17c70ba23836b2a858fee9a9749ebeda9bf48b759c2f57553a8eb639751f99f60704e15e7cc5ca208c
diff --git a/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild b/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild
index b8df140e6296..f09562220ec4 100644
--- a/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild
@@ -62,7 +62,8 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	# bug #666738
+	emake -j1
 	use doc && emake docs
 }
 
diff --git a/media-sound/linuxsampler/linuxsampler-9999.ebuild b/media-sound/linuxsampler/linuxsampler-9999.ebuild
index d33e3b81f2f0..e4663f701cf9 100644
--- a/media-sound/linuxsampler/linuxsampler-9999.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-9999.ebuild
@@ -61,7 +61,8 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	# bug #666738
+	emake -j1
 	use doc && emake docs
 }
 
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 400f4f02ae5a..699f452e3a17 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -2,4 +2,4 @@ DIST lollypop-1.2.35.tar.xz 509916 BLAKE2B 8cf9ea74287b6ac7d4942c2312cc4d6e07d47
 DIST lollypop-1.4.18.tar.xz 575120 BLAKE2B 62ff404c0e7c2ac7029ebb45143db35b0b93b30bfc386fb08aa4a2fc10916efb190118f41e40a0f795bef4f8d0b21b0353b9e27bbb75c5471132145028fc8b27 SHA512 17f2db91a56fd140c66c251732eca4b2a6cc1849b5dc72f0a4014c766c64eee475bc9d2305d307e2a54184ab5dd812a5fb27b39acf60a1c468770d1d34307982
 EBUILD lollypop-1.2.35.ebuild 1485 BLAKE2B b2259b9ad1469a62faa46800ad2bdf9830b4fa28aa46266ab3b13dd99f1e5b48c80d7194bb48f0c6bef833b9c7093ced5f51adcb6898eed293e7a4648906a551 SHA512 04235991552dc76decd9ff1430f30bbc1e99f050fe5e244163a2f1f5b7768ea09d47dec9eec4b5fb6e2f8376bae5b003465b95c23be077acb7381bd45c70d5bc
 EBUILD lollypop-1.4.18.ebuild 1510 BLAKE2B 2517184251761a4d3a64d51f662a3b7623dc18043eb6626329f10da26b8f8ab6ae35cc0d9662d8b5d05c9323bcdc4a4218da5692a16d0fc0b1e80bfec13f7789 SHA512 9c3ff2942f58532a22514c906e481e205aa7dda6ae868130b384c7f11bff606ea8d662ecce6bf8cdcd8a870459ed9a8e4dc6024ab5456f676ad9ef47dcd04122
-MISC metadata.xml 246 BLAKE2B 9ee65595d2ce7d0c82f8bfa5110c981e55be2592e0ab8beb2abf163268dcbbe4ac2c1825bc1f3619c26fd447ef95a3153ce7ca7f627ca806030c217493fd51f0 SHA512 79818ad9d4436efa7bbeb3c302aee6b3c72ceadb118aab6d390fc4431110d2fdbc6cfe2d2c3c4e360688449279001e52acc9ace257b5ac401eb5c401e299bec1
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/media-sound/lollypop/metadata.xml b/media-sound/lollypop/metadata.xml
index be2af7044308..115e9d64a669 100644
--- a/media-sound/lollypop/metadata.xml
+++ b/media-sound/lollypop/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 6e2988d905ea..f7951a300261 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -4,7 +4,7 @@ AUX mixxx-2.2.4-fix-scons-compat.patch 744 BLAKE2B ffadce18947d538a8f614bc3c53f7
 AUX mixxx-2.2.4-metadata.patch 848 BLAKE2B c5acec33886b585572426da7dd56c147c64683ab5f30b5f8023836330b365bbd17cd490cc70ae383c2159b18fcf9b582f6020b04df20dc18c49c0489c59c6f90 SHA512 d09fbb8171e84b0a0fb23249efb9485140e080e3abaa06c4c59ce1b1110d84f6d6e8c421207ffb214738ddf3e23739db04257bef212728631f9a740693b5c8f8
 AUX mixxx-9999-docs.patch 469 BLAKE2B 6daf15a450b79fb85deb9a218c5762e26bc3a88e92f96fc73575ac64eb9731945e3fc95d63e3f4b391f07263dc2ec56820ca486725971cf35ee223afd30dede9 SHA512 76d18e26ccdfb0bfda9bb7563a5012e567b2546dee8014da9070a8654d93fd548475293ae9cbd1914407727b146738e6ba5647229acc41b43f1405cd8efe5d80
 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
-EBUILD mixxx-2.2.4-r1.ebuild 3229 BLAKE2B da761449e1cae6b3f15bad1ce27aca814072fd51de74262effb69515e5e729153cc3a1ece682fdfbd3b2056b2da75323ab98bc92a9637ce23c96502284ea891e SHA512 165a0c7fb737a51df060731e9fb904bc6233d21cc9f0aef6e5f8882b2026360e76c8457fd95d49e1df07b8fd36f835113acc81924d261ccbf689b5941aa028a1
+EBUILD mixxx-2.2.4-r1.ebuild 3354 BLAKE2B 6be93d4f897357f38bc65d5e0f4a3a6c42c9a701e1e0e452d2549b40eeac346fe7bcb7f0f3cc803db8cdb248e8d894ec70c165e7a86c28dedd0a1036fc09d63c SHA512 5f4cd8ef58b8eec7c608bdc796d393e28c9b397df58a74acf78ed530c85702708953135522f7546b259195e007b914a935c53b8ebf6ee6a96d34b3af5516f19b
 EBUILD mixxx-2.3.9999.ebuild 2740 BLAKE2B 1fc346b62b137915adf3b992ffdddbc1c3ed9eec8b8e854e2f8894b00616c6bade501b856fc40b5061909499209be642b7e0dbd90dbe83ca9a6018dc5d63acb5 SHA512 1f07442ea9b628b1e7dfce44735b570db611725fefdc4d9015e01923050dae3dfd95fb4d34d24ea91e42ac71b8750fc425f6f00ee6a991445755369048ad2e26
 EBUILD mixxx-9999.ebuild 2740 BLAKE2B 1fc346b62b137915adf3b992ffdddbc1c3ed9eec8b8e854e2f8894b00616c6bade501b856fc40b5061909499209be642b7e0dbd90dbe83ca9a6018dc5d63acb5 SHA512 1f07442ea9b628b1e7dfce44735b570db611725fefdc4d9015e01923050dae3dfd95fb4d34d24ea91e42ac71b8750fc425f6f00ee6a991445755369048ad2e26
 MISC metadata.xml 850 BLAKE2B 988b0e86bb646e484fb395996aa389e416dc000fc9b46665638f52391f4c24ecf04a8b8efa8f64bac66f3ed994f65db9f87de2c08d4301e3021308cf073122f2 SHA512 7673654ee70e239937c65fc597b744893085e7b1d8b4901d0ea28764933bfe317bf98615b2beb85236f6fd34d51ab67a27a5cd5e6c7f4e0c17e78ff7b07294f4
diff --git a/media-sound/mixxx/mixxx-2.2.4-r1.ebuild b/media-sound/mixxx/mixxx-2.2.4-r1.ebuild
index 06e567d08097..8cb76558f56b 100644
--- a/media-sound/mixxx/mixxx-2.2.4-r1.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4-r1.ebuild
@@ -74,10 +74,14 @@ RDEPEND="
 "
 # media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	dev-qt/qttest:5
 	dev-qt/qtxmlpatterns:5
-	${PYTHON_DEPS}
+"
+# See bug #806085 for scons upper bound, newer versions drop scons dependency
+# altogether.
+BDEPEND="${PYTHON_DEPS}
+	<dev-util/scons-4.2.0
+	virtual/pkgconfig
 "
 
 PATCHES=(
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 41df4f3450f0..4b2ba0c070e9 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -12,7 +12,7 @@ DIST mpd-0.22.8.tar.xz 737368 BLAKE2B 96866fdbcf124534d99db1bde89039d515c64afd7c
 DIST mpd-0.22.9.tar.xz 738432 BLAKE2B c0c3a87ea83941e7ab85b4338db40daeff0c7fe665d4e0b27eebdf7cb06302d2b7a7573724d06d06d45a62583304f095ec4f67a21467748de665067e10a2514c SHA512 744e20e9a2b5df0f0c01b33809aa87cb159385b69868df5418302b091e6c5265dd70de13f383efcd71f76ae059c73969667212e55ee96e13d89ca0da5c2d4ae2
 EBUILD mpd-0.21.26-r1.ebuild 8071 BLAKE2B 91df71b928168d00d63eabb823621f4e22d5e6d0d81075098607adb594ecf8f13f7842c2af370c19c1fc6b168eac15215d999706094978025653d61ecd80e2b7 SHA512 933751f86d9a7e24717bbd3ded3ddc13c15b5268fc6c6ac287d646704acb0e1a7cf5635a862e7de471a68000129c2f7232ae9956ae22f3b645356d0f512864ef
 EBUILD mpd-0.22.10-r1.ebuild 8520 BLAKE2B 23f1d52663adb310138b4b0749d9c5c9f16d24344f522055ce5fae93f531894073047d57e7c4509618c11c73ff0919b1b4bbf9e6ed7c6a0c4e9d85d3606d3a95 SHA512 ae900911cf01c13bb86ae12372b2fc1e40b09e938de61d52f50cb8572858cedec580baf80ddfc309a6c35052189155e64e1dc81e178fc1f84e595d5d117a0b93
-EBUILD mpd-0.22.11.ebuild 8527 BLAKE2B e9fdc64ff02fa7c9fbd2c0878cad5dda204735c714204f750649103a569671366bb90a781c214cef7874fb7076d01d21663d8b6301d41ba0902adef26f088769 SHA512 5e06f9750c639d2cb72dbd3203ff69e74c604d5f7cbed9298d49b3faf2544f6528e6db2bc43568592c77ce6da614bff2af46cd195bace487c45e4a16f742cc94
+EBUILD mpd-0.22.11.ebuild 8525 BLAKE2B 87ec745e0b86e66c5bfe2734a4d7885ee07b3d1e4a004df56e1d4a624fa05838fa54f9c3b9ed1c5122bbbe151ead7b209dc42fc67b8ff18a0d311d073967dffa SHA512 d7339e8640373586f4f299fe180b3541864061e6d31bbeac2e7c77a45e50c0b96978bf5820800aa730b774d202382b5faf88971a2a9c3a16e9d403111212dc59
 EBUILD mpd-0.22.3-r1.ebuild 8128 BLAKE2B f30f8d3b609102c7f9b8df1b7ea5eee6e5e1f449c4a8ef0e8e69d1025fd288025715fedaaa2d79a0589f085a1de8bd7ad499a17ecd8acbe27919b7bbf4dcaf9b SHA512 0e591e6e5b4955697a93307814ddb56de27545ceb21b3aea4dbac7b34fba47ee3412d7f8a5505c5877a807b4efc7c5a58e5296774298dd0b9702e372732dc0f9
 EBUILD mpd-0.22.4-r2.ebuild 8520 BLAKE2B 97b075b83e64feb64837cdf5c57efd7c4f7b7740cbf9d710d35d81cc76fb29ffb71bcc5058dcd80e5abf97e9b6d3bc7ef98e7fa04cb49b046d6704441b16360d SHA512 125c848346f5d1ed3b3ae66f83fb6191d8d9f1f312603aeb2964379962940bae3d926383e3a258dd6197391da0e659287a958141073b275b68adfbc4f6c9ed7f
 EBUILD mpd-0.22.5-r1.ebuild 8520 BLAKE2B 97b075b83e64feb64837cdf5c57efd7c4f7b7740cbf9d710d35d81cc76fb29ffb71bcc5058dcd80e5abf97e9b6d3bc7ef98e7fa04cb49b046d6704441b16360d SHA512 125c848346f5d1ed3b3ae66f83fb6191d8d9f1f312603aeb2964379962940bae3d926383e3a258dd6197391da0e659287a958141073b275b68adfbc4f6c9ed7f
diff --git a/media-sound/mpd/mpd-0.22.11.ebuild b/media-sound/mpd/mpd-0.22.11.ebuild
index 5ed8afa7afd2..11a1603a87c4 100644
--- a/media-sound/mpd/mpd-0.22.11.ebuild
+++ b/media-sound/mpd/mpd-0.22.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~riscv x86"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
diff --git a/media-sound/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest
index beb942008537..dcb09b387150 100644
--- a/media-sound/mpdscribble/Manifest
+++ b/media-sound/mpdscribble/Manifest
@@ -4,5 +4,5 @@ AUX mpdscribble.rc 475 BLAKE2B f57a87b042cd60d87119ea396bd84bdf846a04fcfadff69b6
 DIST mpdscribble-0.22.tar.bz2 116981 BLAKE2B 13b15ca9e49faa3e5d254bc2864de4a0c409d8767db586def3a7bee415c67f84ddffbd7fce6093afe4aba5d5e66db8182aed52d9a141bebf4094a400f2ababe3 SHA512 bedd93392a4d5a0609dcaf7aefeeff3851f3084da8c34a4fc1f8fde51c2ba10b8370ac52cc8d55f0c9a96fffed975827a0935087c2c51880b7bfef8d79182dc8
 DIST mpdscribble-0.23.tar.xz 46624 BLAKE2B 47c59a4b2936b7990bb2d8563422c553d1e08b39a09a873fae1ad0215bd1fcc0dbcaa69e62eab9332530717a200a52295018a578e3c615e83d68d84564060402 SHA512 f924076a8aa201f67ba81e72a44d3dd1c31618bd87e4f75f6b63f7b3814fa08f6ef4f7964b1d518c5f8b68a1f8ba88f867c08ed8b0387157eec8e9f97eb0b825
 EBUILD mpdscribble-0.22.ebuild 707 BLAKE2B 2ce67900b9bde1e81839e257cf3365f934873177b9675113915f6c46e68b6de006e703e37930162ef07558f46a0213ad1d06ecf038dd0546788388ac51ca0aaf SHA512 e2aaf1b1bb18bb8a0311b3e34379669666606fc2af58b2eaec6098dc88b2cb9a6f25a5c0db3ec01d83a68e041853a2c6963e01b1466e15400c188d604c27e131
-EBUILD mpdscribble-0.23.ebuild 996 BLAKE2B 6dfab0da40252d9cff82ccaa8be94dc8e29cd4a7d364e48f461a0fd5c38f2bdb89fa8d08c75d6c348aab5ee17e66fb9ee179b35398f937236ccefaa5cb545c0e SHA512 b6233debc73437394a252c2514b64a17d8fc10ab8517541741f2d9ffa0aaaa8e433958185c26b2aedbb1d358c802875be2a4e9c3bf5ecabcfe25a163d109413f
+EBUILD mpdscribble-0.23.ebuild 1006 BLAKE2B 07297a75cee5e1c3ab03420fa971c86360cba4a45cbcce3ba30f30085724593195560587b11e3f678bbb422045496c489a74de923e855c0c2a309ac03ebb74ae SHA512 831bc63481bdb6474d906c45b6af9a9720dfb394f6ec83f71fa680428f5a016fc5a4a86d157a8a7380a2c1cbd0af42bffcd38cde46808bfeed94a2652cb41518
 MISC metadata.xml 784 BLAKE2B c38018b5bc728569e23dccc11fe4509b916448fec5316ac7170fe2fd4decb9a4ed568f40d039ed2d514e22209c18033f14324a5ff26521658e27e79c4102eab9 SHA512 f52ee040880383020d9f945359fd2597b44898fa215619e2ad435dfb1128791f8fcddcaa4cf1426712d684e3c1fa41e35fa35e1920364199e158cf24001c1443
diff --git a/media-sound/mpdscribble/mpdscribble-0.23.ebuild b/media-sound/mpdscribble/mpdscribble-0.23.ebuild
index 09a5937e6e1f..31a25f8e4100 100644
--- a/media-sound/mpdscribble/mpdscribble-0.23.ebuild
+++ b/media-sound/mpdscribble/mpdscribble-0.23.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	dev-libs/boost
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 13176df33ec0..21863a87962a 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,5 +1,3 @@
-DIST mpg123-1.28.2.tar.bz2 1065867 BLAKE2B 2fc585598e49334b608c2a8487b40b599dc1a57afc53249975a339dbc381b968cc099d4274fb74872d3c4c54d1a6ee1858c4b00c78feb93809c823cc56398661 SHA512 45ac11c5997d13f80917e135a40d2fb4448703dad56271dfe8ce7c8dea339cbac7727ec121779040bd7a07fc4ea79086860ea4a8ec879eda3bdcbf7d57348cda
 DIST mpg123-1.29.0.tar.bz2 1068523 BLAKE2B f044dcdef62156cc34a4709d6ead71042e936d77a86386563862d54d7b18635dd378d4dcac1358228c8275d7bcef894f17432cac0519373d11d4c5f18e346728 SHA512 4261a086395f118f6723d8a3757ebcf5244359be07af634d8bf802e48524978a0974f8b17b423bbf38d262c82ac9e31e0fd5d07a735f63f5e33f58d82dc5fdaf
-EBUILD mpg123-1.28.2-r1.ebuild 2992 BLAKE2B 4bb2cafa1ed3c1f69097a953697fe924c675b78d5117dc52d1abcd3b8a9e6fd6b694e791320c9ada6fd6852c478f3a93eb5e810323f59fdd719ec2ad829fba66 SHA512 804e99324bf8c5fbbf870307d8b243733eb09708b0c6a9a6068803f8886219169d7153789f43690e368a0c2fc2ed2ac47ebcf84a67fca035937c202abc5869a4
-EBUILD mpg123-1.29.0.ebuild 2997 BLAKE2B 9075445f0712ee679a65f97cf85cfa0a7d044898c8e2e776e251cb9970f387b8b98343b1308e57231057ec0a4d3e54b4fbfe75ce6f04ddedfb25d83af78649dd SHA512 953077d11d5ee4ed7693e2f99db8e777e48277f43beb6519d03a0f1c247a4e5e5b2046e56c586d5695d39969c873de0fae26be7529a6cf7aa52a542366e2ab40
+EBUILD mpg123-1.29.0.ebuild 2992 BLAKE2B 4bb2cafa1ed3c1f69097a953697fe924c675b78d5117dc52d1abcd3b8a9e6fd6b694e791320c9ada6fd6852c478f3a93eb5e810323f59fdd719ec2ad829fba66 SHA512 804e99324bf8c5fbbf870307d8b243733eb09708b0c6a9a6068803f8886219169d7153789f43690e368a0c2fc2ed2ac47ebcf84a67fca035937c202abc5869a4
 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-sound/mpg123/mpg123-1.28.2-r1.ebuild b/media-sound/mpg123/mpg123-1.28.2-r1.ebuild
deleted file mode 100644
index b49ebad52d41..000000000000
--- a/media-sound/mpg123/mpg123-1.28.2-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-# Note: build system prefers libsdl2 > libsdl. We could in theory add both
-# but it's tricky when it comes to handling switching between them properly.
-# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
-RDEPEND="
-	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl2 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-IDEPEND="app-eselect/eselect-mpg123"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-}
-
-multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-
-	if $(multilib_is_native_abi) ; then
-		local flag
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
-			if use ${flag}; then
-				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
-			fi
-		done
-	fi
-
-	use cpu_flags_ppc_altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext
-		# bug #164504
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=(
-		--with-optimization=0
-		--with-audio="${_audio}"
-		--with-default-audio=${_output}
-		--with-cpu=${_cpu}
-		--enable-network
-		$(use_enable ipv6)
-		--enable-int-quality=$(usex int-quality)
-	)
-
-	multilib_is_native_abi || myconf+=( --disable-modules )
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-sound/mpg123/mpg123-1.29.0.ebuild b/media-sound/mpg123/mpg123-1.29.0.ebuild
index 3b1cbeb24236..b49ebad52d41 100644
--- a/media-sound/mpg123/mpg123-1.29.0.ebuild
+++ b/media-sound/mpg123/mpg123-1.29.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
index fdac9d95d1f6..014996617ad8 100644
--- a/media-sound/openmpt123/Manifest
+++ b/media-sound/openmpt123/Manifest
@@ -1,3 +1,3 @@
-DIST libopenmpt-0.5.11+release.autotools.tar.gz 1477946 BLAKE2B 8fed41af7e5fe1d822716eaa51912e7c5f7d3cd7bef2dbf2266f5e474c4d6300b988636d08bc750602beb831fbf25e532ec137311c84a150806164edc7b5fe30 SHA512 29e19ef2add316fd824f82095db9e81a9a60c07f0b6a54a224c0416452d566c4376e688c5e1b1556461e0f5a1b1543ff45d1388d611d010a646efb8bf1ba733e
-EBUILD openmpt123-0.5.11.ebuild 1712 BLAKE2B 6947d0493edc22ab0714149e02fb4aa1e2717d6d745338f9a7fd5cb8052885f0352c6513c36a3c68079cf262d3583ef19459725f121ee4a4caf813091818b207 SHA512 0e0520077ad9f27ad5a6ed52961477dfe6346155d79ae038bec18182144390ced977d505edd7a1d774ae937e40e555d03d8b022202f3db18389173f9d669e9fb
+DIST libopenmpt-0.5.12+release.autotools.tar.gz 1477744 BLAKE2B 1c3cb1424cba334ca9aa7adb0be19308551c51dec9b4bb4657be93f76c01804f15f9a98a4568c48a6c6d0ab44058c72e8ad1b60402f9542c580197b761933fe3 SHA512 e22a79737a825a5753429271bba7af94fd195fb0ff770a3e2091b941c3856bbad770eeeb88cd86d37e01b0138e820199d3650f55546f2e33bb2e99b1b14d9925
+EBUILD openmpt123-0.5.12.ebuild 1712 BLAKE2B 6947d0493edc22ab0714149e02fb4aa1e2717d6d745338f9a7fd5cb8052885f0352c6513c36a3c68079cf262d3583ef19459725f121ee4a4caf813091818b207 SHA512 0e0520077ad9f27ad5a6ed52961477dfe6346155d79ae038bec18182144390ced977d505edd7a1d774ae937e40e555d03d8b022202f3db18389173f9d669e9fb
 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181
diff --git a/media-sound/openmpt123/openmpt123-0.5.11.ebuild b/media-sound/openmpt123/openmpt123-0.5.12.ebuild
index 386c068f1a59..386c068f1a59 100644
--- a/media-sound/openmpt123/openmpt123-0.5.11.ebuild
+++ b/media-sound/openmpt123/openmpt123-0.5.12.ebuild
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index f29eec576bd6..73ab43a6de95 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,3 +1,5 @@
 DIST qtractor-0.9.23.tar.gz 1951615 BLAKE2B 6ccf22ccc21ad36aecff63a16de9e3bb2ae19ba6fd7475432c3cd1e37ce2468f837a68c160ceec0f9c7ec9931e1fc1614c3a84cd0dd34078d1e227868338c021 SHA512 fe57cc82d072ed49569441bb9f25f5233c0d7a6e7f0958a84247c8896741f2e4b83067e69d8e7999ccd9e68002b0e6ba4dc084674286952c17d472ae9f507bbd
+DIST qtractor-0.9.24.tar.gz 1960092 BLAKE2B a94822b20544aa0675a4b1208b7f1dcb726973c3ffb4705ef10ef284e21433c2b92747eca189667e2e8d8cec4569421e8492ea330d7b51cb80a6157dffdd8e41 SHA512 b65dc90566023e06edc08a437e3a9f1e8a6e524cb1c9cf78afe90cdc1437ce345b7bb4907619ced7886966923facb7dbe8f22ac23076531e95e149a71286187b
 EBUILD qtractor-0.9.23.ebuild 2456 BLAKE2B 36c9e63143b085897618b492a94a7539281959d12ae8618192e915dbd28c368409fb6f5460b5856404b25505080b72b10d6b6fc0747a3e0bfb60003d81fa3d27 SHA512 c34b4164cb5a367caf9fd2e7e5ab7743b11b4e5c517ab30b0b4844c39bbd1212e8a09394b8984c09bab05de31405f6f871a5f32c2cc183746e26f497e4d0b879
+EBUILD qtractor-0.9.24.ebuild 2445 BLAKE2B fa7cdc41395662797fdee38ad4b36517a6148dcb5738b3331c31ced3ed9d7bd3ae8ec5dd4bf5adbe44e79a4ad8e7c24282d2589c99c0f66de88027f986bb72f6 SHA512 f44df6bad7d6a3924bf344c393cd05e94408066fa86c830c0ddb16eeeb758361b5df4b3aaf79adfb76163b2795f80562af2432b1bd878c855bf2fb65c83ef6be
 MISC metadata.xml 891 BLAKE2B c85e76d86b5e559e2de880a440e8bdddfb8d67de2b7216a42ebb1ec7cce7b9a4dc8ccf20732e4b4ea489a14fcf5584aecef193e9fe3ac2bb0159011002607a60 SHA512 fcc0f8b61f0b9d9fd3d49c5f00f46b739012a6e8e4f7664bf08ae277b279d282d11056f9ca986788a7e444da53a17aeab46c2ee30fa945eb54dd271b11cf4a55
diff --git a/media-sound/qtractor/qtractor-0.9.24.ebuild b/media-sound/qtractor/qtractor-0.9.24.ebuild
new file mode 100644
index 000000000000..565bf4c4905a
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.9.24.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
+HOMEPAGE="https://qtractor.sourceforge.io"
+SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
+REQUIRED_USE="dssi? ( ladspa )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	media-libs/lilv
+	media-libs/lv2
+	media-libs/suil
+	virtual/jack
+	aubio? ( media-libs/aubio )
+	dssi? ( media-libs/dssi )
+	ladspa? ( media-libs/ladspa-sdk )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? ( media-libs/libvorbis )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DSSI=$(usex dssi 1 0)
+		-DCONFIG_GRADIENT=1
+		-DCONFIG_JACK_LATENCY=1
+		-DCONFIG_JACK_METADATA=1
+		-DCONFIG_JACK_SESSION=1
+		-DCONFIG_LADSPA=$(usex ladspa 1 0)
+		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
+		-DCONFIG_LIBLILV=1
+		-DCONFIG_LIBLO=$(usex osc 1 0)
+		-DCONFIG_LIBMAD=$(usex mad 1 0)
+		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
+		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
+		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
+		-DCONFIG_LIBZ=$(usex zlib 1 0)
+		-DCONFIG_LV2=1
+		-DCONFIG_LV2_UI_GTK2=0
+		-DCONFIG_NSM=0
+		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
+		-DCONFIG_STACKTRACE=$(usex debug 1 0)
+		-DCONFIG_VESTIGE=0
+		-DCONFIG_VST=0
+		-DCONFIG_VST3=0
+		-DCONFIG_XUNIQUE=0
+	)
+	# Following options are left to the default
+	# CONFIG_LV2_ATOM
+	# CONFIG_LV2_BUF_SIZE
+	# CONFIG_LV2_CVPORT
+	# CONFIG_LV2_EVENT
+	# CONFIG_LV2_EXTERNAL_UI
+	# CONFIG_LV2_MIDNAM
+	# CONFIG_LV2_OPTIONS
+	# CONFIG_LV2_PARAMETERS
+	# CONFIG_LV2_PATCH
+	# CONFIG_LV2_PORT_EVENT
+	# CONFIG_LV2_PRESETS
+	# CONFIG_LV2_PROGRAMS
+	# CONFIG_LV2_STATE
+	# CONFIG_LV2_STATE_FILES
+	# CONFIG_LV2_STATE_MAKE_PATH
+	# CONFIG_LV2_TIME
+	# CONFIG_LV2_TIME_POSITION
+	# CONFIG_LV2_UI
+	# CONFIG_LV2_UI_IDLE
+	# CONFIG_LV2_UI_REQ_VALUE
+	# CONFIG_LV2_UI_SHOW
+	# CONFIG_LV2_UI_TOUCH
+	# CONFIG_LV2_WORKER
+	# CONFIG_LV2_UI_X11
+	cmake_src_configure
+}
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 5d596f7a0c59..068e9b0a4271 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,3 @@
 DIST rhythmbox-3.4.4.tar.xz 3890320 BLAKE2B 69c89c0478d6c43e1c4a10d39f25c25c3dc81f9b93f870e0de8947395e0f49d3902cb8dcf74c945da744536090b7058616545ad706626047e0c8fb61b0b792d7 SHA512 1fcd41dd66ffe34852f8cedb80ade57d101118295d6fd6f0a8687000ab6500991d2e11482daedb30a7abaf63e54e33ee3c4eaab73b075ec5e5907182f9a8c865
-EBUILD rhythmbox-3.4.4.ebuild 3329 BLAKE2B a0594365eb10aced4bbbff60e493a79d92f51ada1568071189bc43cb606e6f722dfb48008e39bac6d8ce73d9bb6d8e41f0d8930bb08516a5ed1a63ea9dbdb2ec SHA512 a6d76672409528d751f5f44de5697354972c35953078957f86bc582302cc396cc4edd426180709001b984ea134817875f47f98df078e9044342fca5ca6f0e041
+EBUILD rhythmbox-3.4.4.ebuild 3330 BLAKE2B 2d3af8777c8bba6b6259c8e40b9d8b77f8234e47df79283319ac1d96d9bef90557221f3b97de9d2c3db3c102ae063bd12d8cde504c2ae3c7c51b38e466ee998d SHA512 8892f5fdc1041781b8163c8e71cac08afd42025ec2dfe9d4375db3b45c9e32f6bcfcc7175cf1c15dfce8e5d74c2a9e79e2f2de8352ff6986b7dcf87da8396080
 MISC metadata.xml 546 BLAKE2B 3f273ab651f53329ae8c493be78977713b4bcf31b35a65d66b523f5b27e11b456b26cddf78ce4ec7b08478fff2fceb875b7e976e9491cb63007744ea93f518ed SHA512 bb4c662bc4728e72ff31d32101da0b67e77e254e3511de9b7cf5bf98bc224f21d6b31e07f3c687c41d66f7abe15109d353402d6db5405086edea1f5518f2436d
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
index 287b4eb83505..49b5d725a857 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome2 python-single-r1 multilib virtualx
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index e5c6af5a650a..5457603aa19e 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,4 +1,6 @@
 DIST strawberry-0.9.3.tar.xz 10928116 BLAKE2B 3edb80065876d63b79292c6b75660aaaeaa6ea294bb84011124fa8aee3163717b8ab4f0e8d6e7aff321466d3cfbc214b5e8b987c9ae9b0823f8d3c681aae6e9e SHA512 d253ffaa6cf0412eb135bc792c31458816fc0a1ae7070d6885487da4fb4855ffeeeeddd285b853fd10220c797c3beb73a91059514d76b1b1638350fdff17107c
+DIST strawberry-1.0.0.tar.xz 11149316 BLAKE2B db500acb75c1e206c7eb2b5b668fc850444da8383ea98926e05d3eaee46a477f9b7c24017c75a1ea8d0ac8d89287a137aa65ef9098527b0449e3b5b14e37fa9e SHA512 e7f03eb068bd2de22b83b0bdd493dabbbe054bb0f7d3f4d237ff38955e382a13d7c42f60c9a257c906ded46567b6f4ca9139920291df8a7688fb4025cdfec488
 EBUILD strawberry-0.9.3.ebuild 2936 BLAKE2B 9fcac1154c3e5531cfd8ac2739c16034ddfa85336775cf1d6f18d49dd4d2f23b604e7224642349c7c2f88f78c596fdfb09ead197ad255cb60665c113d627b614 SHA512 ac75150dcb913b7f9c6ad3a34cb6362584268aadb890f89bf73fb432fcd7dd3b8c997c61c24afed01f76e37c2dc2eb53ae1b6157448bb0398de7ac1cbcb2363c
-EBUILD strawberry-9999.ebuild 2938 BLAKE2B f79e21f451040357b84c61a94662c00b672c2d8d85bceb1ea249eaa9860f903d43bbc5047c750a22980ae0291b17d8eaf1398162b06252903786f7f5a963601a SHA512 1a2d5dad2ce62f4bf3330b736fce01c0edd82ba221aee3e2ccb0f3781962e9216ddb5682fd7b01d76ff9bf770086e4fa0c64cbaa10fe7f73a9e2205022d5bf38
+EBUILD strawberry-1.0.0.ebuild 2986 BLAKE2B 51c17f06060909737f468d1f3d94757a2c29dd3147f0c5146ba45354783eebb13d90f9dd271d0c8c7241b1a97e637dbbc9e9eeb8ef5f2d58e33590a45e3752e6 SHA512 acffcdd97fbf71b254918ee836653d0088c702138dcd71df4a88de0dc880308819aa1f62d9cb6dea2c449a7783e8756b5c508b689a94cb498861abe1f0251abe
+EBUILD strawberry-9999.ebuild 2986 BLAKE2B 51c17f06060909737f468d1f3d94757a2c29dd3147f0c5146ba45354783eebb13d90f9dd271d0c8c7241b1a97e637dbbc9e9eeb8ef5f2d58e33590a45e3752e6 SHA512 acffcdd97fbf71b254918ee836653d0088c702138dcd71df4a88de0dc880308819aa1f62d9cb6dea2c449a7783e8756b5c508b689a94cb498861abe1f0251abe
 MISC metadata.xml 532 BLAKE2B 92c28967a4c323a7fa04309336fb52f7625701cbf965828ace4359452801ed36683e4fc20e7fc6f691d0cdb56bc027fc5ff758233c3f8a7aac214f36c8565b70 SHA512 569814f4eee1fd43e75e5ddfd7935b7d503b6127a2d3c276237e5237d9de571b18037484893d05dc44c5ba95ae9ac2f95d6715c5280f0da37443f16972b4e627
diff --git a/media-sound/strawberry/strawberry-1.0.0.ebuild b/media-sound/strawberry/strawberry-1.0.0.ebuild
new file mode 100644
index 000000000000..b79659cf7e03
--- /dev/null
+++ b/media-sound/strawberry/strawberry-1.0.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic plocale virtualx xdg
+
+PLOCALES="cs de es fr hu id it ko nb pl ru sv"
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawbs.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	>=media-libs/chromaprint-1.4:=
+	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+	>=media-libs/taglib-1.11.1_p20181028
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	pulseaudio? ( media-sound/pulseaudio )
+	vlc? ( media-video/vlc )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+RDEPEND="${COMMON_DEPEND}
+	gstreamer? (
+		media-plugins/gst-plugins-meta:1.0
+		media-plugins/gst-plugins-soup:1.0
+		media-plugins/gst-plugins-taglib:1.0
+	)
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
+	dev-qt/qtopengl:5
+	dev-qt/qttest:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+"
+
+DOCS=( Changelog README.md )
+
+REQUIRED_USE="
+	|| ( gstreamer vlc )
+"
+
+src_prepare() {
+	plocale_find_changes "src/translations" "" ".po"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DLINGUAS="$(plocale_get_locales)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_VLC="$(usex vlc)"
+		# Disable until we have qt6 in the tree
+		-DWITH_QT6=OFF
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use gstreamer ; then
+		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+		elog "depending on your preferences"
+	fi
+}
diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild
index ccbe95c4a8c1..b79659cf7e03 100644
--- a/media-sound/strawberry/strawberry-9999.ebuild
+++ b/media-sound/strawberry/strawberry-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake flag-o-matic plocale virtualx xdg
 
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
 	media-libs/alsa-lib
-	media-libs/chromaprint:=
+	>=media-libs/chromaprint-1.4:=
 	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
 	>=media-libs/taglib-1.11.1_p20181028
 	sys-libs/zlib
@@ -106,6 +106,7 @@ src_configure() {
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_VLC="$(usex vlc)"
+		# Disable until we have qt6 in the tree
 		-DWITH_QT6=OFF
 	)
 
diff --git a/media-sound/ttaenc/Manifest b/media-sound/ttaenc/Manifest
index ee74e44ccc1c..cda56d70dba1 100644
--- a/media-sound/ttaenc/Manifest
+++ b/media-sound/ttaenc/Manifest
@@ -1,4 +1,5 @@
 AUX ttaenc-3.4.1-fix-build-system.patch 460 BLAKE2B c6b8ff7b908364a0052b8b32c5ed424e998a600449c9f04bf52a7d2fc1cb7221b7eacf3f542f102b15b08a1208a3fd7b75b3c1b590986e1bea56d2bef899cd12 SHA512 4d36ac15f22dca57bbb1c83f94a6279dff56607c428eea56b4aaef9ca4405233653c28a7df924f36da60b60c6cd54226ae70553f81f996ae796fed1ed8deee33
+AUX ttaenc-3.4.1-fix-hybrid-filter.patch 371 BLAKE2B 512d3b2a2498be549d5f5aad2a8da3c2e525340a11d5a72f1cf80160b8fb729154233a9d39a07de4bf29cf17867f879e9d1a75568a211afa2e966b8981276a0d SHA512 9bb77ff0d9ffe7c90512b5d49a8d955b7a314b0c305c2d875514a70d6adabec105053e01e62d7e8da8466e72d47bf407ba0532f4f77a3cc2a8b0a2da9063f7cc
 DIST ttaenc-3.4.1-src.tgz 20835 BLAKE2B 9eb2a52b67874c1b44b092c6f665c8105b86f05b69be10aea1a0b196487e0d950dbc174385dd686c4574abdcd77c2945f441b672a77e9c9a48bfa822ccdc1a01 SHA512 489f9a2e0f94a82f12302f076e33062104e58688ffde97e742ad3c8c226bd0000133c539e9111e10f2d24c176e0b7ddd0a76e60bd3baafa53c29b3cd89ada06d
-EBUILD ttaenc-3.4.1-r1.ebuild 493 BLAKE2B 05dd271171e8e8bbded6c23bb19ebeb76de0cd89d981a728c37cae86bc0b1a7b221ec24139ea7b49abebbc94cf619d050f6f35643161211eec3bb0cfc52a9885 SHA512 9cec57c6c403d94edeab729c4cb46fe67148941be9b63e8ab53ae039822247d2da81895a44e7e79895f4db9b8be85f466d2c77bdf93435716fb2deb87a335d30
+EBUILD ttaenc-3.4.1-r1.ebuild 538 BLAKE2B 444d9f24fbaabeb6ac129475cdcd58cba4bef428ba125ed4d5f9b95738692f9bdc8658a7fefe1de0c2337fdbe559d94fef4d159f353bc6e1fc47bc7595a50ef8 SHA512 67bfcf40a767a21406c4ed3f95def3e31a59663d94558abfab1ce69aab64b7b958dfdb21e0f2e69c99e91e3d2860b16076efd31ef5991390640a9b7f378e686d
 MISC metadata.xml 327 BLAKE2B 0bc0f44c37e16d36b4f39c63e1fd6180db02b7be32801f08b90da647bb659626c6efb2358c82de027b827909097b1be6a53bddbc1113d5ffdbc4f989fd82a79b SHA512 d38b12e2f33c9ffcb899b78e5a3e8907af33a35efcdebc83b19ddedca356f0fdfc3b24f9c84fdefd547f887d3f59dedd6dfedb03ae19d9567dd054c499782b05
diff --git a/media-sound/ttaenc/files/ttaenc-3.4.1-fix-hybrid-filter.patch b/media-sound/ttaenc/files/ttaenc-3.4.1-fix-hybrid-filter.patch
new file mode 100644
index 000000000000..e6243dfae77e
--- /dev/null
+++ b/media-sound/ttaenc/files/ttaenc-3.4.1-fix-hybrid-filter.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/721988
+
+--- a/ttaenc.c
++++ b/ttaenc.c
+@@ -525,7 +525,7 @@ __inline void memshl (register int *pA, register int *pB) {
+ 	*pA   = *pB;
+ }
+ 
+-__inline void hybrid_filter (fltst *fs, int *in, int mode) {
++static void hybrid_filter (fltst *fs, int *in, int mode) {
+ 	register int *pA = fs->dl;
+ 	register int *pB = fs->qm;
+ 	register int *pM = fs->dx;
diff --git a/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
index 34f01191dd63..833e61d88d20 100644
--- a/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
+++ b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,10 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/${P}-src"
-PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-build-system.patch
+	"${FILESDIR}"/${P}-fix-hybrid-filter.patch
+)
 
 src_configure() {
 	tc-export CC
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 74d9c8099aee..0d173bc6a4c5 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -5,5 +5,5 @@ AUX xmms2-0.8_p20161122-mac-4.patch 1215 BLAKE2B 746bcf75ce5b1f73ecb4023e7760806
 DIST waf-2.0.22.tar.bz2 687244 BLAKE2B feea82e7e6aaba1187f368aa00025f206a7217196de9be7a97ca6aa8882823decd79db38dda4f1f25e81541eaa44edf029eea8d57e28f7d31b94d9ee93201ea9 SHA512 a3a275fd4c81c7b7385c2da001f3924d272105b8f33839265ebbb38708051b7cb13b9b9019e84325707d04513de0c13b032b1ad21458aec6586d10df4ed8d5f5
 DIST xmms2-0.8_p20201016.tar.gz 1720185 BLAKE2B e1cad8ed2ece9d8ce905ffe86de53bb4010639d83fd15700eefccf190034577ff8666f3557bfb23741ed8400eba1e6246ef28ff21c4dbbe499239da945befc74 SHA512 0e73771f56c341e5dea15451457426958217de3ac19cad1924c11740f96feb69e385242a27a9cf9258841ed4e6538c12e135492f715bfae6976b31fb358508bf
 DIST xmms2-s4-0.8_p20201016.tar.gz 184231 BLAKE2B 0676f89b743e265af01593c215c609ae48ea368d861fd28b022b4124a00852182686a46ebf90ac44a10343f86ba5c398c47fd85e2688971b2b4445f3c3843af5 SHA512 f510141ca792893feba2c00d9bc437f492fdce7c29b12c9a8432792ca5a1703cc7068e1a9f4641abd50b320fefb5867fb5bc58a58b0b0272cf75828c764f94ed
-EBUILD xmms2-0.8_p20201016.ebuild 5873 BLAKE2B 5009cc7bec5f3a4addf40555dc4a43a9f4a044cf309433b37430efa4f2f13073662efd341b89809e89b69cd7dc44c65613ee612c5fdc6034bf73402df992bbb1 SHA512 9380099454cafefb9032d6a366a523591707f4323b14745024bf5cd181ca1d14e7cb9ef49d7a02f96aba2a26b65435911b138fdccb2d2ef48445f9e0a1f196bb
+EBUILD xmms2-0.8_p20201016-r1.ebuild 5869 BLAKE2B df06d661f79002c4406d181ed0d85f7dd075a6ad6ba543fcdbbb19d1958cc22d33f0d83b156f9b557c12c3f434250ff2ca202e23b9af42d0fdae133db448de00 SHA512 c2c54fd728682790145e1e957727f744eb348f1d66e8d3f3ecbf695073c999f348a7781b88db04b8d2381e23226288b57d50113dac33434f31eeb6351ff1bbec
 MISC metadata.xml 1529 BLAKE2B 0f5c762b0325e767ba28410bd6838960e84df8a8f30ceda76833809b21b4e109f01caa2c4c5e234aacd4697f9a0a43d8fc1012f62261b8a1e9e458e2530b9dfe SHA512 be88d429da72efc944841bbb11c85dd6e746201eae90c20cc588bb5c42958315fc23bb9388396e971f0bc2069d4eb6dd9189b9c8f4c7cf4f343ca491f9d744be
diff --git a/media-sound/xmms2/xmms2-0.8_p20201016-r1.ebuild b/media-sound/xmms2/xmms2-0.8_p20201016-r1.ebuild
new file mode 100644
index 000000000000..8f6923d5c139
--- /dev/null
+++ b/media-sound/xmms2/xmms2-0.8_p20201016-r1.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit multiprocessing optfeature perl-functions python-single-r1 toolchain-funcs
+
+XMMS2_COMMIT="46da10f0e20c53fd2b40843617ed182c0cba4ebb"
+S4_COMMIT="652ac581df7a0bca04334da397f8bb4f86eb7b59"
+WAF_VER="2.0.22"
+
+DESCRIPTION="X(cross)platform Music Multiplexing System, next generation of the XMMS player"
+HOMEPAGE="https://github.com/XMMS2"
+SRC_URI="
+	https://github.com/xmms2/xmms2-devel/archive/${XMMS2_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/xmms2/s4/archive/${S4_COMMIT}.tar.gz -> ${PN}-s4-${PV}.tar.gz
+	https://waf.io/waf-${WAF_VER}.tar.bz2"
+S="${WORKDIR}/${PN}-devel-${XMMS2_COMMIT}"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ppc x86"
+
+# IUSE static map to be passed to --with-{optionals,plugins}=opt1,opt2,...
+# flag:opt = `usev flag opt`, opt = `usev opt`, :opt = `echo opt`
+XMMS2_OPTIONALS=(
+	cxx:xmmsclient++,xmmsclient++-glib :launcher mlib-update:medialib-updater
+	:nycli perl :pixmaps python server:s4 test:tests
+	# disabled: et,mdns,migrate-collections,ruby,sqlite2s4,vistest,xmmsclient-cf,xmmsclient-ecore
+)
+XMMS2_PLUGINS=(
+	aac:faad airplay alsa ao asf :asx cdda :cue curl :diskwrite :equalizer
+	ffmpeg:apefile,avcodec,flv,tta :file flac fluidsynth:fluidsynth,mid1,midsquash
+	gme :html ices :icymetaint :id3v2 jack :karaoke :m3u mac +mad mms modplug
+	mp3:mpg123 :mp4 musepack :normalize :null :nulstripper ofa opus oss :pls
+	pulseaudio:pulse :replaygain samba sid sndfile speex tremor vocoder +vorbis
+	:wave wavpack :xml xml:rss,xspf zeroconf:daap
+	# disabled: coreaudio,gvfs,nms,sc68,sun,waveout
+)
+
+IUSE="
+	${XMMS2_OPTIONALS[@]%:*}
+	${XMMS2_PLUGINS[@]%:*}
+	+server valgrind"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test ) !server? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	sys-libs/readline:=
+	server? (
+		aac? ( media-libs/faad2 )
+		airplay? ( dev-libs/openssl:= )
+		alsa? ( media-libs/alsa-lib )
+		ao? ( media-libs/libao )
+		cdda? (
+			dev-libs/libcdio-paranoia:=
+			dev-libs/libcdio:=
+			media-libs/libdiscid
+		)
+		curl? ( net-misc/curl )
+		ffmpeg? ( media-video/ffmpeg:= )
+		flac? ( media-libs/flac )
+		fluidsynth? ( media-sound/fluidsynth:= )
+		gme? ( media-libs/game-music-emu )
+		ices? (
+			media-libs/libogg
+			media-libs/libshout
+			media-libs/libvorbis
+		)
+		jack? ( virtual/jack )
+		mac? ( media-sound/mac )
+		mad? ( media-libs/libmad )
+		mms? (
+			media-libs/libmms
+			media-video/ffmpeg:=
+		)
+		modplug? ( media-libs/libmodplug )
+		mp3? ( media-sound/mpg123 )
+		musepack? ( media-sound/musepack-tools )
+		ofa? (
+			dev-libs/expat
+			media-libs/libofa
+			sci-libs/fftw:3.0=
+		)
+		opus? (
+			media-libs/libogg
+			media-libs/opus
+			media-libs/opusfile
+		)
+		pulseaudio? ( media-sound/pulseaudio )
+		samba? ( net-fs/samba )
+		sid? ( media-libs/libsidplay:2 )
+		sndfile? ( media-libs/libsndfile )
+		speex? (
+			media-libs/libogg
+			media-libs/speex
+		)
+		tremor? ( media-libs/tremor )
+		vocoder? (
+			media-libs/libsamplerate
+			sci-libs/fftw:3.0=
+		)
+		vorbis? ( media-libs/libvorbis )
+		wavpack? ( media-sound/wavpack )
+		xml? ( dev-libs/libxml2 )
+		zeroconf? (
+			net-dns/avahi[mdnsresponder-compat]
+			net-misc/curl
+		)
+	)
+	python? ( virtual/libcrypt:= )"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		dev-lang/perl
+		dev-perl/glib-perl
+		virtual/perl-Carp
+		virtual/perl-IO
+		virtual/perl-Scalar-List-Utils
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
+	)"
+DEPEND="
+	${COMMON_DEPEND}
+	cxx? ( dev-libs/boost )
+	test? ( dev-util/cunit )"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	perl? (	dev-perl/Pod-Parser )
+	python? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]') )
+	test? ( valgrind? ( dev-util/valgrind ) )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8-rtvg.patch
+	"${FILESDIR}"/${PN}-0.8_p20161122-mac-4.patch
+	"${FILESDIR}"/${PN}-0.8_p20161122-cpp-client.patch
+	"${FILESDIR}"/${PN}-0.8_p20161122-faad.patch
+)
+
+src_prepare() {
+	rmdir src/lib/s4 && mv ../s4-${S4_COMMIT} src/lib/s4 || die
+	mv ../waf-${WAF_VER}/waf{,lib} . || die
+
+	default
+
+	sed -e "s|/path/to/.*sf2|${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2|" \
+		-i src/plugins/fluidsynth/fluidsynth.c || die
+}
+
+src_configure() {
+	local waf=(
+		./waf configure
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--boost-includes="${ESYSROOT}"/usr/include # needed for prefix
+		--with-custom-version="%(version)s (git commit: ${XMMS2_COMMIT:0:8})"
+		--with-target-platform="${CHOST}"
+	)
+
+	xmms2_flag() {
+		local IFS=:
+		set -- ${1#+}
+
+		if [[ ${1} ]]; then
+			usev ${1} ,${2:-${1}}
+		else
+			echo ,${2}
+		fi
+	}
+
+	local flag optionals plugins
+
+	if use server; then
+		for flag in "${XMMS2_PLUGINS[@]}"; do
+			plugins+=$(xmms2_flag ${flag})
+		done
+	else
+		waf+=( --without-xmms2d )
+	fi
+
+	for flag in "${XMMS2_OPTIONALS[@]}"; do
+		optionals+=$(xmms2_flag ${flag})
+	done
+
+	waf+=(
+		# pass even if empty to avoid automagic
+		--with-optionals=${optionals:1}
+		--with-plugins=${plugins:1}
+	)
+
+	if use perl; then
+		perl_set_version
+		waf+=( --with-perl-archdir="${ARCH_LIB}" )
+	fi
+
+	if use valgrind; then
+		if valgrind true &>/dev/null; then
+			waf+=( --with-valgrind )
+		else
+			ewarn "valgrind was disabled due to failing a basic sanity check" #807271
+		fi
+	fi
+
+	tc-export AR CC CXX
+
+	echo "${waf[*]}"
+	"${waf[@]}" || die
+}
+
+src_compile() {
+	./waf build -j$(makeopts_jobs) --verbose --notests || die
+}
+
+src_test() {
+	./waf --alltests || die
+}
+
+src_install() {
+	./waf install --destdir="${D}" --without-ldconfig --notests || die
+
+	einstalldocs
+
+	use python && python_optimize
+
+	# to avoid editing waftools/man.py (use find given not always installed)
+	find "${ED}" -name '*.gz' -exec gzip -d {} + || die
+}
+
+pkg_postinst() {
+	use fluidsynth && optfeature "the default MIDI soundfont" media-sound/fluid-soundfont
+}
diff --git a/media-sound/xmms2/xmms2-0.8_p20201016.ebuild b/media-sound/xmms2/xmms2-0.8_p20201016.ebuild
deleted file mode 100644
index d01c06980c3a..000000000000
--- a/media-sound/xmms2/xmms2-0.8_p20201016.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit multiprocessing optfeature perl-functions python-single-r1 toolchain-funcs
-
-XMMS2_COMMIT="46da10f0e20c53fd2b40843617ed182c0cba4ebb"
-S4_COMMIT="652ac581df7a0bca04334da397f8bb4f86eb7b59"
-WAF_VER="2.0.22"
-
-DESCRIPTION="X(cross)platform Music Multiplexing System, next generation of the XMMS player"
-HOMEPAGE="https://github.com/XMMS2"
-SRC_URI="
-	https://github.com/xmms2/xmms2-devel/archive/${XMMS2_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/xmms2/s4/archive/${S4_COMMIT}.tar.gz -> ${PN}-s4-${PV}.tar.gz
-	https://waf.io/waf-${WAF_VER}.tar.bz2"
-S="${WORKDIR}/${PN}-devel-${XMMS2_COMMIT}"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc x86"
-
-# IUSE static map to be passed to --with-{optionals,plugins}=opt1,opt2,...
-# flag:opt = `usev flag opt`, opt = `usev opt`, :opt = `echo opt`
-XMMS2_OPTIONALS=(
-	cxx:xmmsclient++,xmmsclient++-glib :launcher mlib-update:medialib-updater
-	:nycli perl :pixmaps python server:s4 test:tests
-	# disabled: et,mdns,migrate-collections,ruby,sqlite2s4,vistest,xmmsclient-cf,xmmsclient-ecore
-)
-XMMS2_PLUGINS=(
-	aac:faad airplay alsa ao asf :asx cdda :cue curl :diskwrite :equalizer
-	ffmpeg:apefile,avcodec,flv,tta :file flac fluidsynth:fluidsynth,mid1,midsquash
-	gme :html ices :icymetaint :id3v2 jack :karaoke :m3u mac +mad mms modplug
-	mp3:mpg123 :mp4 musepack :normalize :null :nulstripper ofa opus oss :pls
-	pulseaudio:pulse :replaygain samba sid sndfile speex tremor vocoder +vorbis
-	:wave wavpack :xml xml:rss,xspf zeroconf:daap
-	# disabled: coreaudio,gvfs,nms,sc68,sun,waveout
-)
-
-IUSE="
-	${XMMS2_OPTIONALS[@]%:*}
-	${XMMS2_PLUGINS[@]%:*}
-	+server valgrind"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test ) !server? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	sys-libs/readline:=
-	server? (
-		aac? ( media-libs/faad2 )
-		airplay? ( dev-libs/openssl:= )
-		alsa? ( media-libs/alsa-lib )
-		ao? ( media-libs/libao )
-		cdda? (
-			dev-libs/libcdio-paranoia:=
-			dev-libs/libcdio:=
-			media-libs/libdiscid
-		)
-		curl? ( net-misc/curl )
-		ffmpeg? ( media-video/ffmpeg:= )
-		flac? ( media-libs/flac )
-		fluidsynth? ( media-sound/fluidsynth:= )
-		gme? ( media-libs/game-music-emu )
-		ices? (
-			media-libs/libogg
-			media-libs/libshout
-			media-libs/libvorbis
-		)
-		jack? ( virtual/jack )
-		mac? ( media-sound/mac )
-		mad? ( media-libs/libmad )
-		mms? (
-			media-libs/libmms
-			media-video/ffmpeg:=
-		)
-		modplug? ( media-libs/libmodplug )
-		mp3? ( media-sound/mpg123 )
-		musepack? ( media-sound/musepack-tools )
-		ofa? (
-			dev-libs/expat
-			media-libs/libofa
-			sci-libs/fftw:3.0=
-		)
-		opus? (
-			media-libs/libogg
-			media-libs/opus
-			media-libs/opusfile
-		)
-		pulseaudio? ( media-sound/pulseaudio )
-		samba? ( net-fs/samba )
-		sid? ( media-libs/libsidplay:2 )
-		sndfile? ( media-libs/libsndfile )
-		speex? (
-			media-libs/libogg
-			media-libs/speex
-		)
-		tremor? ( media-libs/tremor )
-		vocoder? (
-			media-libs/libsamplerate
-			sci-libs/fftw:3.0=
-		)
-		vorbis? ( media-libs/libvorbis )
-		wavpack? ( media-sound/wavpack )
-		xml? ( dev-libs/libxml2 )
-		zeroconf? (
-			net-dns/avahi[mdnsresponder-compat]
-			net-misc/curl
-		)
-	)
-	python? ( virtual/libcrypt:= )"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/glib-perl
-		virtual/perl-Carp
-		virtual/perl-IO
-		virtual/perl-Scalar-List-Utils
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
-	)"
-DEPEND="
-	${COMMON_DEPEND}
-	cxx? ( dev-libs/boost )
-	test? ( dev-util/cunit )"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	perl? (	virtual/perl-Pod-Parser )
-	python? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]') )
-	test? ( valgrind? ( dev-util/valgrind ) )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8-rtvg.patch
-	"${FILESDIR}"/${PN}-0.8_p20161122-mac-4.patch
-	"${FILESDIR}"/${PN}-0.8_p20161122-cpp-client.patch
-	"${FILESDIR}"/${PN}-0.8_p20161122-faad.patch
-)
-
-src_prepare() {
-	rmdir src/lib/s4 && mv ../s4-${S4_COMMIT} src/lib/s4 || die
-	mv ../waf-${WAF_VER}/waf{,lib} . || die
-
-	default
-
-	sed -e "s|/path/to/.*sf2|${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2|" \
-		-i src/plugins/fluidsynth/fluidsynth.c || die
-}
-
-src_configure() {
-	local waf=(
-		./waf configure
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--boost-includes="${ESYSROOT}"/usr/include # needed for prefix
-		--with-custom-version="%(version)s (git commit: ${XMMS2_COMMIT:0:8})"
-		--with-target-platform="${CHOST}"
-	)
-
-	xmms2_flag() {
-		local IFS=:
-		set -- ${1#+}
-
-		if [[ ${1} ]]; then
-			usev ${1} ,${2:-${1}}
-		else
-			echo ,${2}
-		fi
-	}
-
-	local flag optionals plugins
-
-	if use server; then
-		for flag in "${XMMS2_PLUGINS[@]}"; do
-			plugins+=$(xmms2_flag ${flag})
-		done
-	else
-		waf+=( --without-xmms2d )
-	fi
-
-	for flag in "${XMMS2_OPTIONALS[@]}"; do
-		optionals+=$(xmms2_flag ${flag})
-	done
-
-	waf+=(
-		# pass even if empty to avoid automagic
-		--with-optionals=${optionals:1}
-		--with-plugins=${plugins:1}
-	)
-
-	if use perl; then
-		perl_set_version
-		waf+=( --with-perl-archdir="${ARCH_LIB}" )
-	fi
-
-	if use valgrind; then
-		if valgrind true &>/dev/null; then
-			waf+=( --with-valgrind )
-		else
-			ewarn "valgrind was disabled due to failing a basic sanity check" #807271
-		fi
-	fi
-
-	tc-export AR CC CXX
-
-	echo "${waf[*]}"
-	"${waf[@]}" || die
-}
-
-src_compile() {
-	./waf build -j$(makeopts_jobs) --verbose --notests || die
-}
-
-src_test() {
-	./waf --alltests || die
-}
-
-src_install() {
-	./waf install --destdir="${D}" --without-ldconfig --notests || die
-
-	einstalldocs
-
-	use python && python_optimize
-
-	# to avoid editing waftools/man.py (use find given not always installed)
-	find "${ED}" -name '*.gz' -exec gzip -d {} + || die
-}
-
-pkg_postinst() {
-	use fluidsynth && optfeature "the default MIDI soundfont" media-sound/fluid-soundfont
-}
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index 57a01caf5ccf..629b5e10e748 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -2,5 +2,5 @@ AUX xwax-etc-security-limits.conf 18 BLAKE2B 7056521164d62b76e2cba2b7a128a160364
 DIST xwax-1.7.tar.gz 80745 BLAKE2B b431951651b66899b5bcceadfadc546c564123e47632aa9b395c26d706fc37cda4b5bf4f8695538e1a5e2bb0a690f125ca89705259d11df580f6a833e5d114b6 SHA512 ab0fcaf32f1fd1d6b38323095524f1932a067a3d04d40e4b043993e360411fed0c4b78bb71662581b438cb1e3005bc21659db4521a6ec704994b2e8e1b7e62d4
 DIST xwax-1.8.tar.gz 86268 BLAKE2B 7fbde34e6c1a3508da6ea8230cec7d2663503882182e403bf9bbf2b7327248c1b2e38a21392615a359d30d4a65f558e55346f99bf8f89621a18bcf9e8cf09139 SHA512 db37a16ecc5437f9b085c17e5e645e04b76a18aa7f7d8e8448a2994435596394ea7f2b52a6734194be7cf0b7099995f0f8735c2c547f3f57525339c4dc671d9d
 EBUILD xwax-1.7-r1.ebuild 1977 BLAKE2B 1d54913f2c3e018371d8a4b2b5c9a19d5e9fd044e256b4fb8273666f66200ed6796c431a831c856b3aeb548c3b7e8b26a1118b77218f5c644eb487c2227af319 SHA512 c6c989d648d059aa011a031842c7d3a007b2d139a83165c5f82df7c960fe00c33a1e48bfad32bce549c4ff4c63e6f7853e79e1772696fdae91a219b679709dd9
-EBUILD xwax-1.8.ebuild 1979 BLAKE2B e6828b8dba9e50e7506c53e43a2ea6e6f13ddb3168225ad5e58aa8150fdbc9c8a8eb8c136036175889cd021ecddf87d406dad95f1f95ed0d9df2d2d0b5a34bce SHA512 d5967367b8375064a6adec86a855c8b54efe6790280326c6bde0a471f40d8a0838dba04c3cf0a992514bc78c57206f9e635f23e800bd393ddf5d1881899e4eda
+EBUILD xwax-1.8.ebuild 1977 BLAKE2B 1d54913f2c3e018371d8a4b2b5c9a19d5e9fd044e256b4fb8273666f66200ed6796c431a831c856b3aeb548c3b7e8b26a1118b77218f5c644eb487c2227af319 SHA512 c6c989d648d059aa011a031842c7d3a007b2d139a83165c5f82df7c960fe00c33a1e48bfad32bce549c4ff4c63e6f7853e79e1772696fdae91a219b679709dd9
 MISC metadata.xml 706 BLAKE2B 43e84daeedcc941ec85d093b2cbd437adfe54f76ffa382e65848f8ffc0b2aeafeabf23fc5d7b9ca0a9341a0c6e08f9d71d41e1126ccf0c5bdee96727e200b013 SHA512 19e6898741b91ff55ac37fcb9094e9c685e13efaee7ed2c4ef22a882162c83f6d04c25a13ca71c810b82228b6daad56a971fb124da9d6395002ab244c30ac7d1
diff --git a/media-sound/xwax/xwax-1.8.ebuild b/media-sound/xwax/xwax-1.8.ebuild
index 0a944c4484b0..ecde10ea92a6 100644
--- a/media-sound/xwax/xwax-1.8.ebuild
+++ b/media-sound/xwax/xwax-1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://xwax.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="alsa jack oss cdda mp3 +fallback"
 
 REQUIRED_USE="
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 524670f1a34a..23d51c545413 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,3 +1,5 @@
 DIST yoshimi-2.1.0.tar.gz 7471945 BLAKE2B f95fb49ec901e5a513960bfc4c1d27ce1979f3cd664d7ca7ddb723ad41fb06153749db0560a32f41c44c7fb433fde09ee49e898cb8bf55e232536b163d616992 SHA512 d90666ca2599d057d5c22abfc5e64f9a31eb323d13c50f771b92c5f94f7da9049b79dc8a478b3832142a97f8c2f5ea384a26e1543fdd6c063930989e34b146eb
+DIST yoshimi-2.1.1.1.tar.gz 7479260 BLAKE2B eec292d489c01054ff3e7b4402a359d5abc29157048b475df8482630dccaae9fdff6cc697d95614778e34d363215633b0dc8beaeb1c832c02f98f0f21384b42e SHA512 4feaf7b779d450e4d8f9612a141fdcd2858117c738c56bb43fa12a19f9806d6c990e560dfc62755c7d39e23608f516fb017b0c4063440996c5c17286a58bf946
 EBUILD yoshimi-2.1.0-r1.ebuild 1193 BLAKE2B d29685b96b0e40949d055036cb266e7eae25d4b0e0f7c135f75fbb796eb0a6148e3c19b3a57c3aaede3ac84f4d679aa9a5402003b52d4689d8ab295d213280f2 SHA512 f8d6b1642c5540e67352af2ccf278ade542d1cf18fb8bc3772017bc94f1ac9568b52b80c0bb287945ed1fdf0a35a94493688b54bc8fb674a6feca9ed0b4579b4
+EBUILD yoshimi-2.1.1.1.ebuild 1195 BLAKE2B 0d5c2293fd43c238fb68bbbb0cd21f5554d16dccd9ca10de130136ff7813c450cc1ede150b8b278ac2b9e9d8502332cf9032ff433ccab94f9bdbc882af85e295 SHA512 1837120f7c243549b618bb261b46ed0ad6ac3846c3b89a6126b5a73b203a8d9a2b250ae441c6253bbcff61cfd36b2945bf1faaaaf79d2735d16a35c8db930a42
 MISC metadata.xml 1414 BLAKE2B 4dab154682ec4f0dfe9f4ee1f2b1510f020ef9bf8ce8b871c7bae3709a505faff8e07a2af20cedc3de357dd01c5a2bc192b2776153c1fb028894db732e0215dc SHA512 0ae6d64001643cc80c58929a4d28af6c3c4e0433b31567091e495dd34c350f7fa8908bf89d9aea1b3f004b40e7c8b60ec36025d04fa510f93af17f2316833c61
diff --git a/media-sound/yoshimi/yoshimi-2.1.1.1.ebuild b/media-sound/yoshimi/yoshimi-2.1.1.1.ebuild
new file mode 100644
index 000000000000..23dfc649dc2c
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-2.1.1.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Software synthesizer based on ZynAddSubFX"
+HOMEPAGE="https://yoshimi.github.io/"
+SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lv2"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	dev-libs/mxml
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/libsndfile
+	sci-libs/fftw:3.0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/jack
+	x11-libs/cairo[X]
+	x11-libs/fltk:1[opengl]
+	lv2? ( media-libs/lv2 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+DOCS=( ../Changelog ../README.txt )
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die
+	append-cxxflags -lpthread
+	append-cppflags -lpthread
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLV2Plugin=$(usex lv2)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# unpack Histories.tar.bz2 to avoid QA issues
+	pushd "${ED}/usr/share/doc/${PF}" || die
+	tar xvf Histories.tar.bz2 || die
+	rm Histories.tar.bz2
+	popd
+}
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index b48e97f2149a..dad5c27c2950 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/dtv-scan-tables/Manifest b/media-tv/dtv-scan-tables/Manifest
index 32c2cada8b1a..b2f8a158b794 100644
--- a/media-tv/dtv-scan-tables/Manifest
+++ b/media-tv/dtv-scan-tables/Manifest
@@ -3,6 +3,6 @@ DIST dtv-scan-tables-2019-09-22-f07bde777d4d.tar.bz2 270211 BLAKE2B 76d5250a8eb7
 DIST dtv-scan-tables-2021-04-30-4181e93a30ab.tar.bz2 272870 BLAKE2B b9672235ad2ed826205278ffd06ed793126f743fe2b0b8af4369c1cb24825662e579f9246a287df1d61efad7985e2e18d59097d359fe84626149464bfc253bc5 SHA512 c15c07937cabefad731f4b3f8b6e9f993e500f7c59b17ef5e5c46f9bb86f9cbdf748f7d875c363c641ed9f3333a03b5033cc7d0272e96323d36be944ea35379d
 EBUILD dtv-scan-tables-0_p20171003.ebuild 737 BLAKE2B 239cd08dda04b32e1090c15edbea043c5319af646256c89389bb28f1dfaf32051365ee54b395932bea67fc31f13b0ed28b66edda834b0884c88bd0c1cbc3c821 SHA512 b75a884494995705e88bd2a5808e0671511487c3e3d9d891816034d24d285b31aad5a0d580e62a990c2ed158226da3f993babe6b75cdc71c10bb1489561610f6
 EBUILD dtv-scan-tables-0_p20190922.ebuild 749 BLAKE2B c8354f3eb9dacaef712d03310899fa9d3f1141f462631a71701c13effbb9266e0441ae2be60b1b6d63ecf344c2e0d7ef50226a5625d48d99e96c5826b76eaecb SHA512 71c288a544feb26a214896dd51a697b4fd93768f03d0e4801e4d66fc5a7d3d2344164ea2f5058eb863eb6cbd723f566ad5a1293a149bd835006daabdad1182ad
-EBUILD dtv-scan-tables-0_p20210430.ebuild 746 BLAKE2B 83ba513847bd299ca99387f7f56a0fbcf05ade2c146fd0977491af98acc8baa618c2f23a60a6d270926db0dbcd92dac48d9c362b72f5f195ab737c8dd8daa358 SHA512 ae2d6068e4d2e31213be498fcd6b69fc2a23670b1603276d66e213bd50624109d1e385725268dcc870d1408d86c836281352b6e48b0b7f282f96d333cf7703d5
+EBUILD dtv-scan-tables-0_p20210430.ebuild 745 BLAKE2B 5414b2207d57e8b475641302178849c578542cd9f5e602447849173db7b60636350b6a89e4545a786014197d02ee381c62310625cc477487fbe665494a04fe2f SHA512 de155cca135d59a4936353f7e92b0c330eadf083a1547544abd3c1e491424a8bbce66b0fc958baee99a3e92ca3f835cfc883e84c4396324d4be475d2ec09d725
 EBUILD dtv-scan-tables-9999.ebuild 749 BLAKE2B c8354f3eb9dacaef712d03310899fa9d3f1141f462631a71701c13effbb9266e0441ae2be60b1b6d63ecf344c2e0d7ef50226a5625d48d99e96c5826b76eaecb SHA512 71c288a544feb26a214896dd51a697b4fd93768f03d0e4801e4d66fc5a7d3d2344164ea2f5058eb863eb6cbd723f566ad5a1293a149bd835006daabdad1182ad
 MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
index b406df7c9116..ed209bd82845 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 else
 	COMMIT="4181e93a30ab"
 	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
-	KEYWORDS="amd64 ~arm arm64 ~ppc x86"
+	KEYWORDS="amd64 arm arm64 ~ppc x86"
 	S="${WORKDIR}/usr/share/dvb"
 fi
 
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index d68f5cc8d062..3355ece37cdf 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -10,7 +10,7 @@ DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
 EBUILD kodi-19.0-r1.ebuild 10827 BLAKE2B 36f09ef533f53e7022fd3143eec46e3bb016e98b7d9a5649da8ad8b49f366fad469006f568ca17e18252dfa61aebf73bc0d72706aeb28f8234cb383be2254345 SHA512 e09aca92ca458f529273a9468c18be18beeb1144e65b6db2f3d289849c02b48f95792eb0847e93c18395dbba4296f2bb936e6766f9c7a7c5b352e6efa995290a
 EBUILD kodi-19.1-r1.ebuild 10850 BLAKE2B 79852614ea4a3fde03141edb4fceec64b7b00c5f8104b3df80c6f2bf11e6912b59bf2660effc4711ce2ff407fce8f3e751a31a80e52324d6bd0dec11cffb6583 SHA512 122a8a60ba9d1995d971e87e757d86fb1eaa95e380dcd2d12ca6ebf541b822ec98419bc5150c084b242eac3f2e152ac8d4789801bc90d91c946badc88dea21b7
-EBUILD kodi-19.2.ebuild 10836 BLAKE2B 03c56146a2a54c0f5624b6a4d7b4cebae6e8a7dadb5636634cd5a3591653754ef21823c65a0829f7b66ccfd3c39696b3ad0be9ff6d3c029efe0957df0236adc5 SHA512 a71b0d0fa0a9b4ce0523d4a83c0b2010aaa1ac4ec4ab093e46f1ddf4f1ed4b8145b09dce2794e9e150271a0bbf633b77a2860e2d7a84e583441d5b03cd972047
-EBUILD kodi-19.9999.ebuild 10836 BLAKE2B 03c56146a2a54c0f5624b6a4d7b4cebae6e8a7dadb5636634cd5a3591653754ef21823c65a0829f7b66ccfd3c39696b3ad0be9ff6d3c029efe0957df0236adc5 SHA512 a71b0d0fa0a9b4ce0523d4a83c0b2010aaa1ac4ec4ab093e46f1ddf4f1ed4b8145b09dce2794e9e150271a0bbf633b77a2860e2d7a84e583441d5b03cd972047
+EBUILD kodi-19.2.ebuild 10835 BLAKE2B 71045fccda99c818aefed48861006704a455bf9168d1e866d4a0dbecafb6ab7a3dc07ee16d826029d316f1b7d9ba7db4a326b6287b8f01dc5891a8efe4f74a41 SHA512 2c6812a2f86db7ece3d3625b46cae124878290b30316e3355bfe91a0501d1805b49eebed2f9d58af6a8f2445b170b8158f828555edc8edd24086ea085bccd6f6
+EBUILD kodi-19.9999.ebuild 10835 BLAKE2B 71045fccda99c818aefed48861006704a455bf9168d1e866d4a0dbecafb6ab7a3dc07ee16d826029d316f1b7d9ba7db4a326b6287b8f01dc5891a8efe4f74a41 SHA512 2c6812a2f86db7ece3d3625b46cae124878290b30316e3355bfe91a0501d1805b49eebed2f9d58af6a8f2445b170b8158f828555edc8edd24086ea085bccd6f6
 EBUILD kodi-9999.ebuild 10883 BLAKE2B bde5172b18271d7b694317013e1a10ee7a3fd8dab3dd33ae55d2814dbeaef8beee579c7c874dfa02f28c5938183b07f0815475077eb9ee4aa6e1d09b91ef2494 SHA512 b8652e57b708c213b92767d47855c03d5b1afcf198d0e725e3a91d09d8d6933ffd917ab5e0b3845abbbd840655c0138e8a3caf749f6d9fa191e139fe789c5a2e
 MISC metadata.xml 2763 BLAKE2B 6ec3b7c4eb4e0686de8f7cc0b8ead41538afe9c1cfb77952087a515647474797ee2901bd47a919c0634551196937d2810e624f0a5ecacd11afa0aaead88342a6 SHA512 c476b5108d33ce322f45268bdcbb224b045584f6b110fda25c074426dced4e87379d82b2c16bfe43157b882390e1cd5affa27da283e49c60e328a094eaa7e588
diff --git a/media-tv/kodi/kodi-19.2.ebuild b/media-tv/kodi/kodi-19.2.ebuild
index fa8cb42d4342..297409ecfaf0 100644
--- a/media-tv/kodi/kodi-19.2.ebuild
+++ b/media-tv/kodi/kodi-19.2.ebuild
@@ -26,7 +26,7 @@ else
 	MY_PV=${MY_PV/_rc/RC}
 	MY_PV="${MY_PV}-${CODENAME}"
 	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/xbmc-${MY_PV}
 fi
diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild
index fa8cb42d4342..297409ecfaf0 100644
--- a/media-tv/kodi/kodi-19.9999.ebuild
+++ b/media-tv/kodi/kodi-19.9999.ebuild
@@ -26,7 +26,7 @@ else
 	MY_PV=${MY_PV/_rc/RC}
 	MY_PV="${MY_PV}-${CODENAME}"
 	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/xbmc-${MY_PV}
 fi
diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index 2db581aaee89..391ad2be51a8 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -5,5 +5,5 @@ AUX linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch 413 BLAKE2B 0d66160c487ef9f952e1
 AUX linuxtv-dvb-apps-glibc-2.31.patch 291 BLAKE2B b03833abf623175e9697a2745e9d99c7510b34e3823b42e4a394739d39a534cb4781a076879c85794fc4f9f703ded73778695b8334324186c4bafb3285d0dbb7 SHA512 efd1e8aa91cdcdff7f17856f13bb8689d3eb0288e2ff45c05bc55b44b32a137854c194cb3ee477a243b5377b44f221481e3323c9caa0065eb551cddf37a89c41
 AUX linuxtv-dvb-apps-no-ca_set_pid.patch 1004 BLAKE2B 36ab3817546d5a832473f4d69a2ce97642f3a6d7d8b17cb036d8976398274c4c9e040cb60a909e8f28f1ff25e6cfbb990dfe0b44b4c729b7e8abe30e645704bc SHA512 1cef92aee99ee03255115e1979b0342bbf9b45bd55c6f9ff6a8529edaf6f3a36c172a145c01706341486aae5d6e0a3fde52b535af97e020cb7009d23e0c9cf72
 DIST linuxtv-dvb-apps-1.1.1.20140321.tar.bz2 368759 BLAKE2B 5ef1bc4ee4f0ab167cda8d87a73c83566b40005e16fbaa79525af4fb0b117dec19a4883eedad8bcfedd269c2e295dd7f9e055f905dff5f39dffe1ff052e87547 SHA512 ceb057f760fa0b3902e6824e74b9392be9a7bd3318a1a83f206c99672da17904060ffdc35e84c89d3b8af60ac29d4427acad44e9ae16797baaeb5738e2ab1bf5
-EBUILD linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild 2254 BLAKE2B f68ef40fcab238ca6a44a746a8812cb5f1d4d20a0e9bbba7a1471e9e537ad39710e05fa68b355e3cc11e93ff1ebd5cbc93713f7238fe738e8fa85e992094afd8 SHA512 e668cd9b98701ac0af54cb4a5e45dcf1420bd763fa97591ffdddc21426f8583cc0c12055d214cf0b6660b7bb637b493f6924c0712f933d8d587d9bca27e577b7
+EBUILD linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild 2253 BLAKE2B f6f8fca8da15c34771ffb9840c47d60d9f7b3841a0736d6a722719fef244c99674c8941f4efce470a07bc2de37857ab901ff15d9f50c73baa9bf577151382ce4 SHA512 6907354b6d476acc7c74aba265967392bbdf40894bab17ce4f06c456591e2eadc58ea115e99e461dd219646e41d81645b44ae1ffc797254c02ed2c4b3fd0d308
 MISC metadata.xml 231 BLAKE2B b5dc028019638020965a9345da438ade5810c8573efbc39a05c4ad7f8271992c7a7bd46ea9724032078bf79ea23fe396cef68c1cafa889a36377865981c59ddf SHA512 bcee889112d8fb0374dd6de6c65ab3795d65390818416a6cb783d3adaeae012c186b972dfe5f285b3a8f82f18af5bb0430888fd90ce5bd6f703218aa9492f59b
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
index bc87cd4d1982..ce54345e3aea 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc x86"
+KEYWORDS="amd64 arm arm64 ppc x86"
 IUSE="alevt usb"
 
 RDEPEND="
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index bebda1533139..747f006eae1d 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -11,6 +11,6 @@ AUX tvheadend.confd 359 BLAKE2B 3b44e47b9216daaa2defa69254700693015619e8b0196060
 AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5fa0fd6b2a1d1ba930af05de8ebedba343302aa861f7fb42d3eb25b67acf6b43aa7c956d4965ab944 SHA512 6f17fa6bee502f586b4500c5f5541c9c6ce095deed7ddb3c1d1ad129a2e22fa66de0e72b712866659f7080753c73f67154d6dcdbf8539d6c8a942bea29bb1aa7
 AUX tvheadend.service 573 BLAKE2B e99853082623ca0522bf83aec4be33f2cdc62ba3e3e09bd22246f93c93d5342180be409ba9ad8f862830aca68ca0dbfafd3da0ecb9033e43d6a7e50a523c0bd8 SHA512 8f8e8f9feed45c20919bca402ef9179208a305cd7b06b47dfbbc368fc85d739c3dca2b53e6964bff10f8581cc4c8091660ac2be3b975d80941dc7a16cbb3fb49
 DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f
-EBUILD tvheadend-4.2.8-r2.ebuild 3530 BLAKE2B 4b887b29b81b2ff1ae5b4ff378541f654bdfc8e0631521583df8e7645b88f2d06b5d9c66fef7b858c1d9a17d0e3662a9ece86bedd31ea3d0d3f71ac2c6b317be SHA512 7573fa5a8344f44e6504a6c28b8ac048433bab783dce79da905a3bcc90d885a67d883d0b8bfa5bb508e25dafc5299f11769dbf20a9f5e0da0c03e003d6035c8b
+EBUILD tvheadend-4.2.8-r2.ebuild 3529 BLAKE2B a9b7b39b6c5d5445364632b35a488a8bfc45af4816fd5c137e459843b558bbf5f5286441bb7740a094502ab0f15a3cc04d94e4e7737e2b5abcdb0660277e5339 SHA512 f018cbbcdb47f34ddfba572343f48ad8c09af9fcbfa5430537f14b3e7858baf93d9f079c1891d8437f1356ddd0f41674b69a6984465bf269426b4fb653c2569a
 EBUILD tvheadend-9999.ebuild 4135 BLAKE2B 07f636e118cabae70d477bb09f979932af0ad7769eeaf354801ffbac18951be1387e39beedec3c7631f37bc594120fc8fca878a97ab73e59ecd526c3251056bf SHA512 473f5418b410cd2282596c56e72e47d195a0ce33826a4a025619506bfa3d272bb6edf6c33a149f40fe23045d4d23d574d7863ac4f3a14ce18c0b50efd1b7289d
 MISC metadata.xml 1446 BLAKE2B 622295d497db162d2a214c94187f0e15a9c23b8cc7d484255618f2bb3d10c5de9ecd9aaacbceeb05c27e5d53ffa2338fcd2678cdfdc386104033c1c57aa51c96 SHA512 5e34e61e7ecec9a997ece8b50f6a45f1158e203df0759e08e8d3735a4973baa795a556f9bcac1aaf8069cd25974655adc3f393c0f1670cf6e6a3762903d84759
diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
index dc2993fb7b90..28147deb7b63 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf zlib"
 
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 57ad1ba69e5a..09a21b59cb50 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,4 +1,4 @@
 AUX v4l-utils-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
 DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
-EBUILD v4l-utils-1.20.0.ebuild 2447 BLAKE2B 0036ee1bef177cab6b6875b5b770d95f133ab6e1d77f2efdf985bed23ed006ef91769f0a6ca0afbd9e4a66fd93013c35942bcbd23b1788050dabce5956a09623 SHA512 c118c0ebb17ff7ba72df6a912373edf9204cb1ec01d9c3b58a2edafb2080a38f357d7927891be11ea69c81091b5b77ad2573d87beaef8c317858729188c78619
+EBUILD v4l-utils-1.20.0.ebuild 2446 BLAKE2B 39b9192ddee93f01b4ee75db9813a426b083ab302db54c0923fde944b843677146a8bec48cde8eb939ec97a90bba2ff1a491fc33cc73b85c8ae8b5f44ac68058 SHA512 c50f3149199bacfd770cc1ef241f0d621621b3867dc9911c0a9b778f0e6d1598eb844ee6c28ca2e1760e8145836614979ac6145b6dbec617f5f1a2102bc67c21
 MISC metadata.xml 323 BLAKE2B 79c864de29f9e92372f16bc835f1d260bc7de2c2c809c625806cc18611c50d992abc69de9b8754afa683fabd6a9422e4eb619d87490d4cf5ae1142f05af3557f SHA512 89ec71cc2961d7a6787e4d0e95c959823d1068602ea6cbeac7065ffe926e6c218ad7984c32271131e2624f49f314507cccf1a639e68e3669481d979dcc50bdc7
diff --git a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
index 71e15ab03e4a..4965c6c3c704 100644
--- a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ~ppc64 ~sparc x86"
 IUSE="+bpf dvb opengl qt5 +udev"
 
 RDEPEND="
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index df1a4b6b95e7..ff2671f133d6 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -1,5 +1,3 @@
-DIST xmltv-0.6.1.tar.gz 838051 BLAKE2B d4011ee31b56096ae275647e0cbd85b11c2edbc3d150208aa619900c9741ac3bed2a1255d778622883b3d24a32ce3b803f5719fdd2273549bafa31ebdcb1a887 SHA512 137dad875c6f7f77fb986b4662b411766424676df0a2422f3dc123c8cec4e1dff123ea68577add65c0e5bcf2d0bdf89d7fba0ed423502ec27e2aa82ec6b10bc2
 DIST xmltv-1.0.0.tar.gz 780014 BLAKE2B dd39f77ebbaf321450db525b0c58401728ac1fece8e31e71a3d917fc72b914fbf9a471c2a77258f46a72913b2f86a84164576878dc28b38d3a77bdb9dab03494 SHA512 72df61cbcdfa7ba31d899b37e7f5308e845d263d8b9402c067bbd5761a7502ad7d272604a1d132337041a4d6bb2afa58a93b324239879294431108c1ac0ef09b
-EBUILD xmltv-0.6.1-r1.ebuild 5972 BLAKE2B 4e089470ce4aee09b85f8b2dca3f4df9da81b9ec352d92522e840622bd2a85a91c7d8b377188ae43e9ccf77c5ca75284bda30bfc0deb88260caa7c1724263239 SHA512 1375ca63cf2e18b9d23182dcd5799bce6e22e2dd843bf72f79cd8d6c1e8e0cfa3b07670fda72d2228e2e9e023eb0cb55d73700468bba5b64c330baa1091bd43e
-EBUILD xmltv-1.0.0.ebuild 5124 BLAKE2B db2598ed40dae82faa872c3052a3223405c980830da19794fcd702aa05bebddd2e3cb05e88d4d58620c52a1fcca49897f8922ed66e2a56e70968d3c94feb8804 SHA512 ff0053b3f96405064df7a9c4e637f06559b07c401adfc33f5ecf3723fd35b2036f94e9fd5920c9b5186ae5f7dc5cbe96e3094f8620918657275125e49e2b592c
-MISC metadata.xml 2443 BLAKE2B 9b757f8cc44780d11b7d046fb8013ff67292e6c1c92a49b4c58e8ab27e7daef58239f5d001bce5c76f3d41878c2bdcc2ce09a42d109e2adc08816adf3922c2af SHA512 f71f22fcf50da36cf2d80d9721511e18c8e3aaece46093d217b807147577b9e079a1eb8442762749f09e22a816e87f109dbdb858728e5bf6dc23bec8fdbe767c
+EBUILD xmltv-1.0.0.ebuild 5120 BLAKE2B da86471227e37128487b41916dae7a67cbe1da9fc30f8e0d5b5cb92ceb4a45cf918750f5c6a35e46e33313d23c86061b70c5eb743c119252907def07157e2d83 SHA512 ab35739c3cb5ccdc74087fcaa304094cb351a3108abcfaf39a5dacb277112db3e1a29a07cd7424fc670b85fe0fb783bafbaa6c080eb0d88fb3d01699813508f5
+MISC metadata.xml 1958 BLAKE2B eb4fe6e760882f5953097d65028dc105d65f70e6524cf30bdd484a083a955b5f6c85a7dece17290d0c9e5f1311cbd27bbac7e4be6787eadc0e4c46c6f444c056 SHA512 142aee0f79acc9dc26c206d5eb6b0ca9e764d567ab4e0876c0a00d2d1eb24430b95f07068e064098a2258b7db32d086443ea546c362ae4110e926cf40dc4ff40
diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml
index a0f91caa55d6..700de9f2614c 100644
--- a/media-tv/xmltv/metadata.xml
+++ b/media-tv/xmltv/metadata.xml
@@ -12,31 +12,23 @@
 	<use>
 		<flag name="ar">Argentina tv listing grabber</flag>
 		<flag name="ch-search">Grabber for Switzerland</flag>
-		<flag name="dk">Denmark tv listing grabber</flag>
-		<flag name="dtvla">Latin America digital tv listing grabber</flag>
-		<flag name="eu-dotmedia">Grabber for Europe (xmltv.se / dotmedia)</flag>
 		<flag name="eu-epgdata">include fanart URLs for some European countries.</flag>
 		<flag name="eu-xmltvse">Grabbber for Europe [replaces eu-dotmedia and se-tvzon]</flag>
 		<flag name="fi">Finland tv listing grabber (0.6.1 add ampparit telsu)</flag>
 		<flag name="fi-sv">Grabber for Finland (Swedish)</flag>
 		<flag name="fr">France tv listing grabber</flag>
 		<flag name="huro">Hungarian tv listing grabber</flag>
-		<flag name="il">Israel tv listing grabber</flag>
 		<flag name="is">Iceland tv listing grabber</flag>
 		<flag name="it">Italy tv listing grabber (RUV)</flag>
 		<flag name="it-dvb">Italy tv listing grabber</flag>
 		<flag name="na-dd">North America tv listing grabber</flag>
 		<flag name="na-dtv">North America Direct TV grabber</flag>
 		<flag name="na-tvmedia">Grabber for North America (TVMedia)</flag>
-		<flag name="pt-meo">Grabber for Portugal (MEO)</flag>
 		<flag name="pt-vodafone">Grabber for Portugal (Vodafone)</flag>
-		<flag name="se-swedb">Sweden tv listing grabber</flag>
-		<flag name="se-tvzon">Sweden (tvzon.se) tv listing grabber</flag>
 		<flag name="tr">Turkey (Digiturk) tv listing grabber</flag>
 		<flag name="tv-check">enable GUI checking</flag>
 		<flag name="tv-combiner">enable grabbers combiner</flag>
 		<flag name="tv-pick-cgi">enable CGI support</flag>
-		<flag name="uk-bleb">Britain tv listing grabber</flag>
 		<flag name="uk-tvguide">UK and Ireland tv listing grabber using TV Guide website</flag>
 		<flag name="zz-sdjson">Grabber for schedulesDirect.org SD-JSON service (many countries)</flag>
 		<flag name="zz-sdjson-sqlite">Grabber for schedulesDirect.org SD-JSON service (sqlite DB)</flag>
diff --git a/media-tv/xmltv/xmltv-0.6.1-r1.ebuild b/media-tv/xmltv/xmltv-0.6.1-r1.ebuild
deleted file mode 100644
index b88c635fc279..000000000000
--- a/media-tv/xmltv/xmltv-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit perl-module
-
-DESCRIPTION="Set of utilities to manage TV listings stored in the XMLTV format"
-HOMEPAGE="http://wiki.xmltv.org/index.php/XMLTVProject https://github.com/XMLTV/xmltv"
-SRC_URI="https://github.com/XMLTV/xmltv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~x86-linux"
-
-IUSE="ar ch-search dk dtvla eu-dotmedia eu-epgdata eu-xmltvse fi fi-sv fr
-huro il is it na-dd na-dtv na-tvmedia pt-meo pt-vodafone se-swedb se-tvzon tr
-tv-check tv-combiner tv-pick-cgi uk-bleb uk-tvguide zz-sdjson zz-sdjson-sqlite"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Date-Manip
-	dev-perl/File-Slurp
-	dev-perl/JSON
-	dev-perl/libwww-perl
-	dev-perl/Lingua-Preferred
-	dev-perl/PerlIO-gzip
-	dev-perl/Term-ProgressBar
-	dev-perl/TermReadKey
-	dev-perl/XML-Parser
-	dev-perl/XML-TreePP
-	dev-perl/XML-Twig
-	dev-perl/XML-Writer
-	dev-perl/Unicode-String
-	virtual/perl-Memoize
-	virtual/perl-Storable
-	virtual/perl-IO-Compress
-	ar? (
-		dev-perl/DateTime
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-		dev-perl/HTTP-Cookies
-	)
-	ch-search? (
-		dev-perl/HTML-Tree
-		dev-perl/HTML-Parser
-		dev-perl/HTTP-Cookies
-		dev-perl/URI
-	)
-	dk? (
-		dev-perl/DateTime
-		dev-perl/IO-stringy
-	)
-	dtvla? (
-		dev-perl/DateTime
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-		dev-perl/HTTP-Cookies
-	)
-	eu-dotmedia? (
-		dev-perl/HTTP-Cache-Transparent
-		dev-perl/IO-stringy
-	)
-	eu-epgdata? (
-		dev-perl/Archive-Zip
-		dev-perl/DateTime
-		dev-perl/DateTime-Format-Strptime
-		dev-perl/HTML-Parser
-		dev-perl/HTTP-Message
-	)
-	eu-xmltvse? (
-		dev-perl/HTTP-Cache-Transparent
-		dev-perl/IO-stringy
-	)
-	fi? (
-		dev-perl/HTML-Tree
-		dev-perl/LWP-Protocol-https
-		dev-perl/URI
-	)
-	fi-sv? (
-		dev-perl/DateTime
-		dev-perl/HTML-Tree
-		dev-perl/IO-stringy
-	)
-	fr? (
-		dev-perl/DateTime
-		dev-perl/DateTime-TimeZone
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-	)
-	huro? (
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-	)
-	il? ( dev-perl/DateTime )
-	is? (
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-		dev-perl/URI
-		dev-perl/XML-DOM
-		dev-perl/XML-LibXSLT
-	)
-	it? (
-		dev-perl/HTML-Parser
-		dev-perl/HTML-Tree
-		dev-perl/URI
-	)
-	na-dd? ( dev-perl/SOAP-Lite )
-	na-dtv? (
-		dev-perl/DateTime
-		dev-perl/HTTP-Cookies
-		dev-perl/URI
-	 )
-	na-tvmedia? ( dev-perl/XML-LibXML )
-	pt-meo? (
-		dev-perl/DateTime
-		dev-perl/XML-LibXML
-	)
-	pt-vodafone? (
-		dev-perl/DateTime
-		dev-perl/URI
-		dev-perl/XML-LibXML
-	)
-	se-swedb? (
-		dev-perl/HTTP-Cache-Transparent
-		dev-perl/IO-stringy
-		dev-perl/XML-LibXML
-	)
-	se-tvzon? (
-		dev-perl/XML-LibXML
-		dev-perl/IO-stringy
-		dev-perl/HTTP-Cache-Transparent
-	)
-	tr? (
-		dev-perl/DateTime
-		dev-perl/HTTP-Cache-Transparent
-		dev-perl/HTTP-Cookies
-		dev-perl/URI
-	)
-	uk-bleb? (
-		dev-perl/Archive-Zip
-		dev-perl/IO-stringy
-	)
-	uk-tvguide? (
-		dev-perl/DateTime
-		dev-perl/HTML-Tree
-		dev-perl/HTTP-Cache-Transparent
-		dev-perl/HTTP-Cookies
-		dev-perl/URI
-	)
-	zz-sdjson? (
-		dev-lang/perl
-		dev-perl/DateTime
-		virtual/perl-Digest-SHA
-		dev-perl/HTTP-Message
-		dev-perl/LWP-Protocol-https
-		dev-perl/Try-Tiny
-		dev-perl/XML-LibXML
-	)
-	zz-sdjson-sqlite? (
-		dev-lang/perl
-		dev-perl/DateTime
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/DateTime-Format-SQLite
-		dev-perl/DateTime-TimeZone
-		dev-perl/DBD-SQLite
-		dev-perl/DBI
-		virtual/perl-Digest-SHA
-		dev-perl/File-HomeDir
-		dev-perl/File-Which
-		dev-perl/List-MoreUtils
-		dev-perl/LWP-UserAgent-Determined
-		dev-perl/XML-LibXML
-	)
-	tv-check? (
-		dev-perl/Tk
-		dev-perl/Tk-TableMatrix
-	)
-	tv-combiner? ( dev-perl/XML-LibXML )
-	tv-pick-cgi? ( dev-perl/CGI )
-"
-
-PREFIX="/usr"
-
-pkg_setup() {
-	# Uses Data::Manip in various places which can fail
-	# if TZ is still set to Factory as it is in stock gentoo
-	# install media
-	export TZ=UTC
-}
-
-src_prepare() {
-	default
-	# Add revision number to version info.
-	# Remove the doc/COPYING file from documentation.
-	sed -i \
-		-e "s:\$VERSION = '${PV}':\$VERSION = '${PVR}':" \
-		-e "/^@docs/s:doc/COPYING ::" \
-		Makefile.PL || die
-}
-
-src_configure() {
-	# Must match the order of elements in @opt_components in Makefile.PL
-	make_config() {
-		# Never except default configuration
-		echo "no"
-
-		# Enable Agentina
-		usex ar
-		# Enable Switzerland Search
-		usex ch-search
-		# Enable Denmark
-		usex dk
-		# Enable Latin America
-		usex dtvla
-		# Enable Europe (DEPRECATED, xmltv.se / dotmedia)
-		usex eu-dotmedia
-		# Enable EU epgdata.com including fanart
-		usex eu-epgdata
-		# Enable Europe (xmltv.se / xmltvse)
-		usex eu-xmltvse
-		# Enable Finland
-		usex fi
-		# Enable Swedish listings in Finland
-		usex fi-sv
-		# Enable France
-		usex fr
-		# Enable Hungary and Romania
-		usex huro
-		# Enable Israel
-		usex il
-		# Enable Iceland
-		usex is
-		# Enable Italy
-		usex it
-		# Enable Italy from DVB-S stream
-		echo "no" # missing Linux::DVB
-		# Enable North America using DataDirect
-		usex na-dd
-		# Enable North America from directv.com
-		usex na-dtv
-		# Enable North America XMLTVListings.com
-		usex na-tvmedia
-		# Enable Portugal EPG from sappo.pt
-		usex pt-meo
-		# Enable Portugal EPG from Vodafone
-		usex pt-vodafone
-		# Enable Sweden
-		usex se-swedb
-		# Enable Sweeden Alternative (Repace with eu_xmltvse)
-		usex se-tvzon
-		# Enable Turkey
-		usex tr
-		# Enable UK fast alternative grabber
-		usex uk-bleb
-		# Enable UK/Ireland TV Guide
-		usex uk-tvguide
-		# Enable Schedules Direct JSON
-		usex zz-sdjson
-		# Enable Schedules Direct JSON (SQLite version)
-		usex zz-sdjson-sqlite
-		# rules to improve episode numbering
-		usex tv-check
-		# Enable combiner
-		usex tv-combiner
-		# Enable CGI support
-		usex tv-pick-cgi
-	}
-
-	pm_echovar=`make_config`
-	perl-module_src_configure
-}
-
-src_install() {
-	perl-module_src_install
-
-	if use tv-pick-cgi; then
-		dobin choose/tv_pick/tv_pick_cgi
-	fi
-}
-
-pkg_postinst() {
-	if use tv-pick-cgi; then
-		elog "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
-		elog "to where the ScriptAlias directive is configured."
-	fi
-}
diff --git a/media-tv/xmltv/xmltv-1.0.0.ebuild b/media-tv/xmltv/xmltv-1.0.0.ebuild
index b7f0b18388fb..9e11263f40e9 100644
--- a/media-tv/xmltv/xmltv-1.0.0.ebuild
+++ b/media-tv/xmltv/xmltv-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/XMLTV/xmltv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc x86 ~x86-linux"
 
 IUSE="ar ch-search eu-epgdata eu-xmltvse fi fi-sv fr
 huro is it it-dvb na-dd na-dtv na-tvmedia pt-vodafone tr
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 68683e9cd602..14a67b56f035 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 391eb81b7f0b..d04bc9b98829 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,8 +1,10 @@
 AUX handbrake-1.3.0-dont-search-for-python.patch 691 BLAKE2B 623654494bf61cedb531df3f9b3e64aa17a2a3d03cf9d71577ba1961961d3d058dfa383ef3bb5215eba8a2c84231531b35f1a331850070ae0bcc5b5fa1586c67 SHA512 044b0cb7d9302f74e1ef92e37162135b8ac76d96bf7d647c269ef19b5cf2a8771ce0cc76cbc8817b2480cc3e40af6bafd717888a3982b3e679d831519aad4e64
+AUX handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch 1016 BLAKE2B ffe0a1dc7d693352010eeeafbc61c9d4df43f148ae2a67449c252d71dfc888589161aa88938ee333d9f082aed6873a2d8f2461c0da14d1af388e311a3f8f6058 SHA512 d6237cf24e97a80a6f407209199af281f31f3b2745051db270f9ff2e887a5da98323c6c48be5d7aa3e59a5da17f2691e503b00137c670a6569baed67d8bd39a0
 AUX handbrake-1.3.3-x265-link.patch 277 BLAKE2B 6e5f7d5f59601ebf3c36116f595040d6e884637c8dc9a900774db9db07d1c0686a1b5c2db9276ca1c14612615e3974a7f9b05cb48c23f8f30ed0851238b92c32 SHA512 a74a2d20972a01b89dbfd7b81c070608d57e646de2ce63d9ae2d2e1486d31ca63e96d5ec803052b52e68bee157d5a1882914e0009ae480d1f8192031d79852eb
 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0
 AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
 DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a SHA512 a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
 EBUILD handbrake-1.3.3-r2.ebuild 4175 BLAKE2B 3e70f8e7c14d51b807fecff2d165c49136114379744ab8050c29dfbbdd7ea3cca04bb144e0ede35821d065ae9f5a87777944c6a18e3777560ed3b63a48414a1d SHA512 f740e0f0d564a93810e1c870e8941ab162c5cb41b5b9848bc06563db067d341e677221536c6c3617db6a31dff0c5ad1fed76b148cef2565c4714dccac938212d
-EBUILD handbrake-9999.ebuild 4177 BLAKE2B 25cb3cfc7d3ceb109bec0000e28c686774135de354e247c05c065c04da16902f7e7f9865aa857358b6c34dabbc0973081d4c89528c5d4a477182f7ea3692a675 SHA512 7f3d69592b79bfa420f60d692cc6c2e6ed17220fb782a93686ae0d84e3c95f953e3faddf85af2d4f7d204d4ced7d0f9a6c92127a59ddf09ef912a03d720bb82c
+EBUILD handbrake-1.3.3-r3.ebuild 4340 BLAKE2B 36a49d49b47572a8b3e19e85f1c03ba6e799fb32d1adc14a771fbe1cc2a88eb7f57d99e48b93df28743e6dcc9c0a7250d9dc74261ccdcc192d212852f66f6b69 SHA512 daaccfe49fdaed9081e4358ec507de703d1b5db020611462595a87f4ab636db3f5a695fb552408431ed2cb009b17101bf486602915e133a9bf2c8853212ec984
+EBUILD handbrake-9999.ebuild 4175 BLAKE2B 3e70f8e7c14d51b807fecff2d165c49136114379744ab8050c29dfbbdd7ea3cca04bb144e0ede35821d065ae9f5a87777944c6a18e3777560ed3b63a48414a1d SHA512 f740e0f0d564a93810e1c870e8941ab162c5cb41b5b9848bc06563db067d341e677221536c6c3617db6a31dff0c5ad1fed76b148cef2565c4714dccac938212d
 MISC metadata.xml 887 BLAKE2B b1d57d0087bfd584903bfb4866e385ba5ec6802f6122cce50ad16b558df1f07f85f4e1fe61c2247aec2fa982d7093fb2741c9cb9c93f782f1fd99477f08582ae SHA512 f677e455ad104d74a9ae6a35cf76f87bedde7a96f92c34b951bffd0cf0591857dc52ec43d1226de2918363475b94ad2e9a9035d4e274693c73c95aa9b922e2d4
diff --git a/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch b/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch
new file mode 100644
index 000000000000..d7cc565377fd
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch
@@ -0,0 +1,28 @@
+From f28289fb06ab461ea082b4be56d6d1504c0c31c2 Mon Sep 17 00:00:00 2001
+From: Damiano Galassi <damiog@gmail.com>
+Date: Sat, 10 Apr 2021 13:18:02 +0200
+Subject: [PATCH] libhb: fix audio encoders when linking to FFmpeg 4.4.
+
+---
+ libhb/encavcodecaudio.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c
+index 52fc4565d..e6cf42414 100644
+--- a/libhb/encavcodecaudio.c
++++ b/libhb/encavcodecaudio.c
+@@ -410,7 +410,10 @@ static void Encode(hb_work_object_t *w, hb_buffer_list_t *list)
+ 
+         // Prepare input frame
+         int     out_size;
+-        AVFrame frame = { .nb_samples = pv->samples_per_frame, };
++        AVFrame frame = { .nb_samples = pv->samples_per_frame,
++                          .format = pv->context->sample_fmt,
++                          .channels = pv->context->channels
++        };
+ 
+         out_size = av_samples_get_buffer_size(NULL,
+                                               pv->context->channels,
+-- 
+2.26.3
+
diff --git a/media-video/handbrake/handbrake-1.3.3-r3.ebuild b/media-video/handbrake/handbrake-1.3.3-r3.ebuild
new file mode 100644
index 000000000000..a02d836a04b5
--- /dev/null
+++ b/media-video/handbrake/handbrake-1.3.3-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit autotools gnome2-utils python-any-r1 xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
+	inherit git-r3
+else
+	MY_P="HandBrake-${PV}"
+	SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
+HOMEPAGE="http://handbrake.fr/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
+
+REQUIRED_USE="^^ ( fdk libav-aac )"
+
+RDEPEND="
+	app-arch/xz-utils
+	media-libs/speex
+	dev-libs/jansson:=
+	dev-libs/libxml2
+	media-libs/a52dec
+	media-libs/libass:=
+	>=media-libs/libbluray-1.0
+	>=media-libs/dav1d-0.5.1
+	media-libs/libdvdnav
+	media-libs/libdvdread:=
+	media-libs/libsamplerate
+	media-libs/libtheora
+	media-libs/libvorbis
+	>=media-libs/libvpx-1.8
+	nvenc? ( media-libs/nv-codec-headers )
+	media-libs/opus
+	media-libs/x264:=
+	media-sound/lame
+	sys-libs/zlib
+	>=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-a52dec:1.0
+		media-plugins/gst-plugins-libav:1.0
+		media-plugins/gst-plugins-x264:1.0
+		media-plugins/gst-plugins-gdkpixbuf:1.0
+	)
+	gtk? (
+		>=x11-libs/gtk+-3.10
+		dev-libs/dbus-glib
+		dev-libs/glib:2
+		dev-libs/libgudev:=
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/libnotify
+		x11-libs/pango
+	)
+	fdk? ( media-libs/fdk-aac )
+	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/nasm
+	dev-util/intltool"
+
+PATCHES=(
+	# Remove libdvdnav duplication and call it on the original instead.
+	# It may work this way; if not, we should try to mimic the duplication.
+	"${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
+
+	# Remove faac dependency; TODO: figure out if we need to do this at all.
+	"${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
+
+	# Use whichever python is set by portage
+	"${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
+
+	# Fix x265 linkage... again again #730034
+	"${FILESDIR}/${PN}-1.3.3-x265-link.patch"
+
+	# Fix missing audio stream when using MPEG-4 avformat with ffmpeg-4.4 #791220
+	"${FILESDIR}/${PN}-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch"
+)
+
+src_prepare() {
+	# Get rid of leftover bundled library build definitions,
+	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
+		"${S}"/make/include/main.defs \
+		|| die "Contrib removal failed."
+
+	default
+
+	cd "${S}/gtk"
+	# Don't run autogen.sh.
+	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+	eautoreconf
+}
+
+src_configure() {
+	# Libav was replaced in 1.2 with ffmpeg by default
+	# but I've elected to not make people change their use flags for AAC
+	# as its the same code anyway
+	./configure \
+		--force \
+		--verbose \
+		--prefix="${EPREFIX}/usr" \
+		--disable-gtk-update-checks \
+		--disable-flatpak \
+		--disable-gtk4 \
+		$(use_enable libav-aac ffmpeg-aac) \
+		$(use_enable fdk fdk-aac) \
+		$(usex !gtk --disable-gtk) \
+		$(usex !gstreamer --disable-gst) \
+		$(use_enable numa) \
+		$(use_enable nvenc) \
+		$(use_enable x265) || die "Configure failed."
+}
+
+src_compile() {
+	emake -C build
+
+	# TODO: Documentation building is currently broken, try to fix it.
+	#
+	# if use doc ; then
+	# 	emake -C build doc
+	# fi
+}
+
+src_install() {
+	emake -C build DESTDIR="${D}" install
+
+	dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
+}
+
+pkg_postinst() {
+	einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
+	einfo "do not use the bundled (and often patched) upstream libraries."
+	einfo ""
+	einfo "Please do not raise bugs with upstream because of these ebuilds,"
+	einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
+
+	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
+	if use gtk ; then
+		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
+	fi
+
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index f90d1b9f1528..a0fb60145610 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -68,8 +68,7 @@ RDEPEND="
 		x11-libs/pango
 	)
 	fdk? ( media-libs/fdk-aac )
-	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
-	"
+	x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )"
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index b22c86b58b58..c16494033e04 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -2,6 +2,7 @@ AUX libva-utils-2.10.0_test_in_sandbox.patch 526 BLAKE2B 8275555ee777b8e66852730
 DIST libva-utils-2.10.0.tar.gz 1203536 BLAKE2B c7b51e07618204c55e992f57dd2d80b289d2edd7b4f526c3afaaec1081f5497ac86614e097bc14a1e79d380ca2c529359d02cee601502e292ca8f89073d5fdbb SHA512 2d44c5e3f52ff4ce8bfb206af95c4d790b6d31ec21f899f0ec9604391359f55de06c63b446e19cd8f0ea0c36ccb4ac7cc5ae7fe68361eb263c01454682d18402
 DIST libva-utils-2.11.1.tar.gz 1205472 BLAKE2B 251a318d10eb5907e0ee54f101a153cfe76a98d61fc1f4fabf890901b52e980439d77acfbb4e1b566d361a7cda5c7ab504e575067eb932b0e121904be34b801f SHA512 d64c4767269a810386e02426fce3bde6aa693ac899ace22900e4ae4918dfe461736fe0a031db36751281d5bd78960354cdfa4ca13c5f7c30cc67d05abdd0bcd2
 DIST libva-utils-2.12.0.tar.gz 1213135 BLAKE2B 259ed063e178adc22aa9d69d92715420dd82f25c8b85ce946e13539d96723ee80d406052e4f7a646721f3d4ee4743ffea816c6916f4a5fd6aeeabf9bce1e6671 SHA512 38ef214fa8cb67b5252915e134333fab46d911cc4c9884576013083023e782bccf045ec01534024e901de1143f1ae85f52cdf6e6fe087cb9f3bf727c206d9746
+DIST libva-utils-2.13.0.tar.gz 1230036 BLAKE2B 4e70a13fb9b4362713b6f461a0ee199b8f7e9d9cbac7bc664c11870db92a87873d73306b5777c554830b932a15e726965e1db3591fd1349fb62f068617dd8558 SHA512 81c7c122a4d1bdf8d390a4ea3e0d34499158fb7b7fe0f7aa9d556158895e755139975fd01d73d883897c0a4390612d131b6349febbdf16fa5edcd46a6a82acd2
 DIST libva-utils-2.4.0.tar.bz2 1030271 BLAKE2B b57947f9bd63f34b27a403484ae6b66e750f854dd87c8448afb3d361581d83b20a5ffd8d7e22c9dbf5fae6f7ff3fd62d70cc248b29a862066ff10928629e4d11 SHA512 c5c674179ed589968fd296a7e33dd57a3476c237d8e15258938b364051d501e156c22b41b98fe59d6bc36805495a934dee602ec9e9bb5350c72aa65d3d300ff6
 DIST libva-utils-2.8.0.tar.bz2 1037112 BLAKE2B 9168d7d489e1574d970e9e3a270946de522a4063b80c4cafe38cc6917b99deb6394570592d3ed29a0ff7b92f819b9bbc9eb2a8f3b70077625a2714f70ee1959e SHA512 b3412349234ad2923953296674926ee7cb33c43ce17df8942f751789f0208064a4557ca16e1a5878a4e1b35e5bbbd415a9c9f182ffb24e589ac4757e990576b5
 DIST libva-utils-2.8.0.tar.gz 1198057 BLAKE2B 7c3332fcd2f4631cb2f77d0775e7f542b8ffbbb77aac0fb0629fb2474563320dbbefa546999fc7c991e8081e82a2c48b1406a34d2f075c80fca391088d779fcc SHA512 2102c5bc2b9b1caa99852892b2b7c1f5db7846283781cec84fe9683ac245ea366120096c1032a2c8b36a7c5fc8e4cd68e3939b0a2712a15f453c33560217585d
@@ -9,11 +10,12 @@ DIST libva-utils-2.9.1.tar.gz 1198337 BLAKE2B 58f5a6a537c68eed74aec5dc8f1c4b5a04
 EBUILD libva-utils-2.10.0.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
 EBUILD libva-utils-2.11.1.ebuild 2368 BLAKE2B a95caf61fe2b9f5f70101bdb163cbd0f856e79c79828a313b5120e69405153c6e3a934272f154db246d6d1e57be044ebe0eba3fdd6bfe5ead7acede20ebc7cdc SHA512 46e34b227bccb4bb9a97c1069b4a3def2c7e87eb5119220f50151e7814ab986776e721b9930c3d26756b95b74a615c6a5d58205e0f8eea78d1f7e1c291b03aff
 EBUILD libva-utils-2.12.0.ebuild 2365 BLAKE2B 92ec7de337502e258cc2cd4b379389c0afc09f2b9254ce7aa6a8b6a84b885b3c8f85f1f2d76ec62a64e21af0a1c16ed177ec44d346a1dd3f0dae07fb6874c284 SHA512 03471a71432a8dd6717061ecf99d56ee1ec91b84626affcf61d82c73fedadd51e19d0e854d66a1fc75b7f1debe8e94a5da42eee780c2852812d2ef6c649d12e4
+EBUILD libva-utils-2.13.0.ebuild 2369 BLAKE2B 3685bf3d3c73824ff81b79a24e9997fb163d3625fabc2c69a179ad7474c22a268fa79e1ccf7eda593b34fb7018e5f4e838f54668eec1c88814cb80c079dbad75 SHA512 cf1e632c2a0236f7f7b370ad2c47fc1c363fcb391ac38c46d545f22ec9653f9916fc84e6f817320fb3381b2e0ef693ea3631907af0913532f05b579df869046f
 EBUILD libva-utils-2.4.0.ebuild 1259 BLAKE2B 228e9161a295447362bed7e34d422e1291c184b426e00741b56990ba3d0a36c69966926a902ce4d1e5c065bde7c79b8a2ae01709e67dd319c02e7a8bbeb7d601 SHA512 6a0b6ad30e76bdeef7a2faaf55bee12eddd4c4f2ce23692d9fa2ed9a27754f4221c8c88c83f4dcc389a55337d00f70daf7fb037569e0176cf396ec99a24cb1ce
 EBUILD libva-utils-2.8.0-r1.ebuild 1537 BLAKE2B 2c1f7727f4b9c1bbc3360dd20133a56ce641c1fd53ec56ab5b0f736db0ae343c9efbf5b523de2bb9bb50dac477a45f005256fac98ae25b2ffefe8c07469f5f18 SHA512 5f36c0614e05d5ceb11af1bae4aa698cf2a45f3535eb947088546d0f74bf5a725c74d92b054f6cb3a70fd572742d359ab92f68af45e51cfbf8093540a12d95ff
 EBUILD libva-utils-2.8.0-r2.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
 EBUILD libva-utils-2.8.0.ebuild 1264 BLAKE2B 184c33bb8683bb8d86e9fdf8f12dfb33a4fd5ae1ed25a6fc1ca75835c8d791b1805abf20ef9096ffa69bc30d2d9e767d5b9f3f2f47ad1a58ffd50de9cc8789d4 SHA512 ccfccee30aba5857f484b6d8a308a3d895ba89cabac7d7d5b1240f7ed5b9b0d672efef4f02be591864dfa8ce9a530eed848831af971897685e1fc1ced57d3788
 EBUILD libva-utils-2.9.1-r1.ebuild 1576 BLAKE2B 6479521cd60b67dcd56420a1f6c905f118e6f5513668bb6bfb0cd51971f0e0ed3558b2646580226a2379e53f45b893d8fa22010105572a3572985afb251d9953 SHA512 c46d4576732e21524a79fc712d3241891f0daac3bc52d9f1bbefcee73447886790842a09064f3027ba33bcf7879187f389ad15625a40c0c42127e79db075a125
 EBUILD libva-utils-2.9.1.ebuild 1269 BLAKE2B 7a67145af77dab26119aada7dc4ce3a341d605802c0e514693dd02de71848a1f0435f8591449af69dbe69554f6d28b700cd8e723e183eb2b39f2d10d7a07bb56 SHA512 0c3d37d06de6b2aa4f2156c3ea09c49a8f4066ea5e11003e077a405767abf299ac1fb37c585c8674f5c21dae94f3585842ccbb83baae4aed96e9db68b5874e1a
-EBUILD libva-utils-9999.ebuild 2368 BLAKE2B 8cc7157a1d31a9e6b0ab4755b14a275dac66935cf013b35a002e0cafba61ea8fef9fc82177e7ab1ff60ed41a947e170080c97f0299ee645a7103c052a3c73673 SHA512 f16400d93c37e7f0661720b1364bf4125b33f394c4898a5cd76235d72ca9c3413cdb975906f4619e2b87619bb43f573740b7b5eb17cbf6599817808598939fac
+EBUILD libva-utils-9999.ebuild 2369 BLAKE2B 3685bf3d3c73824ff81b79a24e9997fb163d3625fabc2c69a179ad7474c22a268fa79e1ccf7eda593b34fb7018e5f4e838f54668eec1c88814cb80c079dbad75 SHA512 cf1e632c2a0236f7f7b370ad2c47fc1c363fcb391ac38c46d545f22ec9653f9916fc84e6f817320fb3381b2e0ef693ea3631907af0913532f05b579df869046f
 MISC metadata.xml 761 BLAKE2B 5aaf0b0be9bf41a00d7df2bfd5975ea0f0e2b257e091b77752db8e29ed358a919fd9c9aaf6296f665a2d5f8864766893044064f8ccff9be7d66c41993d6bd454 SHA512 e5fdc3992abc81021b2ec939ea4ab11a997ae0374e3bc6ba87b49127a7478e023283614a9fc39ec9f33f5221469587196d932bf85da9f0a99f134673d6d5f006
diff --git a/media-video/libva-utils/libva-utils-2.13.0.ebuild b/media-video/libva-utils/libva-utils-2.13.0.ebuild
new file mode 100644
index 000000000000..2f790d95839d
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-2.13.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Collection of utilities and tests for VA-API"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [[ ${PV} = *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/intel/libva-utils"
+else
+	# Tarball with pre-built 'configure' not always available, portage use tarballs
+	# without pre-built 'configure' as they are always available upstream.
+	# SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
+	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+drm examples putsurface test test-va-api +vainfo wayland X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	|| ( drm wayland X )
+	putsurface? ( || ( wayland X ) )
+	putsurface? ( drm )
+	|| ( examples putsurface test-va-api vainfo )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+if [[ ${PV} = *9999 ]] ; then
+	DEPEND="~x11-libs/libva-${PV}:=[drm?,wayland?,X?]"
+else
+	DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm?,wayland?,X?]"
+fi
+
+DEPEND+="
+	wayland? ( >=dev-libs/wayland-1.0.6 )
+	X? ( >=x11-libs/libX11-1.6.2 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.10.0_test_in_sandbox.patch" )
+
+# CONTRIBUTING.md and README.md are avaialbe only in .tar.gz tarballs and in git
+DOCS=( NEWS CONTRIBUTING.md README.md )
+
+src_prepare() {
+	default
+
+	sed -e 's/-Werror//' -i test/Makefile.am || die
+
+	if ! use examples ; then
+		sed -E -e '/^SUBDIRS \+?=/s!( decode\>| encode\>| videoprocess\>| vendor/intel\>| vendor/intel/sfcsample\>)!!g' -i Makefile.am || die
+	fi
+
+	if ! use putsurface ; then
+		sed -E -e '/^SUBDIRS \+?=/s! putsurface\>!!g' -i Makefile.am || die
+	fi
+
+	if ! use vainfo ; then
+		sed -E -e '/^SUBDIRS \+?=/s! vainfo\>!!g' -i Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable test tests)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+
+	if use test || use test-va-api ; then
+		myeconfargs+=( --enable-tests )
+	else
+		myeconfargs+=( --disable-tests )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if ! use test-va-api ; then
+		if [[ -e "${ED}"/usr/bin/test_va_api ]] ; then
+			rm -f "${ED}"/usr/bin/test_va_api || die
+		fi
+	fi
+}
diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild
index 0155912ee582..2f790d95839d 100644
--- a/media-video/libva-utils/libva-utils-9999.ebuild
+++ b/media-video/libva-utils/libva-utils-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 else
 	# Tarball with pre-built 'configure' not always available, portage use tarballs
-	# without pre-built 'configure' as they are always avaialbe upstream.
+	# without pre-built 'configure' as they are always available upstream.
 	# SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
 	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
diff --git a/media-video/oxine/Manifest b/media-video/oxine/Manifest
index c1db6b702dab..47d839ea5d38 100644
--- a/media-video/oxine/Manifest
+++ b/media-video/oxine/Manifest
@@ -1,3 +1,3 @@
 DIST oxine-0.7.1.tar.gz 3653511 BLAKE2B 33f9e213d1bd379b3faca0d8bba01c656838109a1b47c4dde87aa385c5ecf478e3655b3fd4fffecf6d01d0f95a138d926d55124846f581450c5635eadd9722a9 SHA512 96f6851f6277d97530b1f4d95d0f0843c9c3262d1a97ccc431e8a674441e06ca8fc24a65f83be5735f54e089d636e60fb297fa7958279b24004eecbc1711a257
-EBUILD oxine-0.7.1-r4.ebuild 1789 BLAKE2B f8f3a6a2798f7a061a5e95a4b38dd47587bb1a442161ddc1051fabe46905e31df6d1c9e6a02e44ca2cf0b94a6e5aa22e448f40ae6a02e7cd3ace64f0585b3eb8 SHA512 5ac31a27297e0ffe83ab53015ed6e6658eb97247da8fb97175d303f9a85ae9ef029e90b1143e0f126e48c36edb520494ed7944f4953834d9ff944e4bd7d62fad
+EBUILD oxine-0.7.1-r5.ebuild 1795 BLAKE2B 29ea98b40b58c135833a6a7c308437fd68aac50e348e314d9a442b98179d4bff776dc87757fc8d99ce0bd51254633d2202525df33609db5d17203aa681c8f2cf SHA512 5fad6f80c3949b0900cf6d18f39513e600118b4970c3cdd5e3fdaff1dfd25ba7e91d06e14df2de5aab3b936d9c9640cd7fab7c698ac062d2b117c36ccaa1d1f3
 MISC metadata.xml 307 BLAKE2B a1f867899fb89719d20c336c4452db7298d0dafd16c20203e4f188e89c8c3da6428456ceb91fac343f8a9b1233c979ef6e7e3229b3ca6af2aabe95128352e8e4 SHA512 ba9be1c84f47a0200720c51cec4d0a069c3711b7f56482222ebf4391fc344be6f24754785f4471d0b1a67ed97b5bd71510d813707de7fe92f35a5ea7d888fb0c
diff --git a/media-video/oxine/oxine-0.7.1-r4.ebuild b/media-video/oxine/oxine-0.7.1-r4.ebuild
deleted file mode 100644
index c827c4ee2203..000000000000
--- a/media-video/oxine/oxine-0.7.1-r4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="OSD frontend for Xine"
-HOMEPAGE="http://oxine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="curl debug dvb exif joystick jpeg lirc nls png v4l X"
-
-COMMON_DEPEND="
-	dev-libs/libcdio
-	media-libs/xine-lib[v4l?,X,imagemagick]
-	virtual/libcrypt:=
-	curl? ( net-misc/curl )
-	dvb? ( media-libs/xine-lib[v4l] )
-	joystick? ( media-libs/libjsw )
-	jpeg? (
-		media-gfx/imagemagick
-		media-libs/netpbm[jpeg,zlib]
-		media-video/mjpegtools
-	)
-	lirc? ( app-misc/lirc )
-	nls? (
-		virtual/libintl
-		sys-devel/gettext
-	)
-	png? (
-		media-gfx/imagemagick
-		media-libs/netpbm[png,zlib]
-		media-video/mjpegtools
-	)
-	X? (
-		x11-libs/libXext
-		x11-libs/libX11
-	)"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/util-linux"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-HTML_DOCS=( doc/README.html )
-
-src_configure() {
-	# Fix underlinking by falling back to
-	# GNU89 inline semantics, bug 590946
-	append-cflags -std=gnu89
-
-	# Note on images: Image support will be automatically disabled if
-	# netpbm, imagemagick or mjpegtools is not installed, regardless
-	# of what the USE flags are set to.
-	# If one of the image USE flags is unset, disable image support
-	local myconf=()
-	if use !png || use !jpeg; then
-		myconf+=( --disable-images )
-	fi
-
-	econf \
-		--disable-hal \
-		--disable-rpath \
-		--disable-extractor \
-		$(use_with curl) \
-		$(use_enable debug) \
-		$(use_enable dvb) \
-		$(use_enable exif) \
-		$(use_enable joystick) \
-		$(use_enable lirc) \
-		$(use_enable nls) \
-		$(use_enable v4l) \
-		$(use_with X x) \
-		"${myconf[@]}"
-}
-
-src_install() {
-	default
-	dodoc doc/keymapping.pdf
-}
diff --git a/media-video/oxine/oxine-0.7.1-r5.ebuild b/media-video/oxine/oxine-0.7.1-r5.ebuild
new file mode 100644
index 000000000000..6cbda902137b
--- /dev/null
+++ b/media-video/oxine/oxine-0.7.1-r5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="OSD frontend for Xine"
+HOMEPAGE="http://oxine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="curl debug dvb exif joystick jpeg lirc nls png v4l X"
+
+COMMON_DEPEND="
+	dev-libs/libcdio
+	media-libs/xine-lib[v4l?,X,imagemagick]
+	virtual/libcrypt:=
+	curl? ( net-misc/curl )
+	dvb? ( media-libs/xine-lib[v4l] )
+	joystick? ( media-libs/libjsw )
+	jpeg? (
+		media-gfx/imagemagick
+		media-libs/netpbm[jpeg,zlib(+)]
+		media-video/mjpegtools
+	)
+	lirc? ( app-misc/lirc )
+	nls? (
+		virtual/libintl
+		sys-devel/gettext
+	)
+	png? (
+		media-gfx/imagemagick
+		media-libs/netpbm[png,zlib(+)]
+		media-video/mjpegtools
+	)
+	X? (
+		x11-libs/libXext
+		x11-libs/libX11
+	)"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/util-linux"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+HTML_DOCS=( doc/README.html )
+
+src_configure() {
+	# Fix underlinking by falling back to
+	# GNU89 inline semantics, bug 590946
+	append-cflags -std=gnu89
+
+	# Note on images: Image support will be automatically disabled if
+	# netpbm, imagemagick or mjpegtools is not installed, regardless
+	# of what the USE flags are set to.
+	# If one of the image USE flags is unset, disable image support
+	local myconf=()
+	if use !png || use !jpeg; then
+		myconf+=( --disable-images )
+	fi
+
+	econf \
+		--disable-hal \
+		--disable-rpath \
+		--disable-extractor \
+		$(use_with curl) \
+		$(use_enable debug) \
+		$(use_enable dvb) \
+		$(use_enable exif) \
+		$(use_enable joystick) \
+		$(use_enable lirc) \
+		$(use_enable nls) \
+		$(use_enable v4l) \
+		$(use_with X x) \
+		"${myconf[@]}"
+}
+
+src_install() {
+	default
+	dodoc doc/keymapping.pdf
+}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 3ea27ed4f2ad..d8ffeedeb160 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,9 +1,6 @@
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
 AUX pipewire-0.3.25-non-systemd-integration.patch 822 BLAKE2B e80245300313151c01ec56a9be74590d6ee9211a78d9c16180ef1bfb1938a8ad9f8e00f2086d220ca6f8ad2d1c55508cfcc3c240467ed66239808f76029fdcae SHA512 0a7570e0dadd9119ba81b91fc0831ad511ed793f2f10f304547152448e0cf079118c595944e22f31cea94a92a0819524aad26c3fc2d17e73b622b43637cdf06a
 AUX pipewire-0.3.29-revert-openaptx-restriction.patch 1228 BLAKE2B a282cd6f678ecd5fd27076cd945b86a8139caf644fae5f6420f45e47cfa1f1ef7edacb6e5c6c0ae860bfaa016de902accb916159f90a85bddb0b26b73658e3ff SHA512 cadfe7c54eec23d2619faf274d2c5c95b4f430525c7fc0b84e667e3f90775d27dbb6682d200d3af5d48475a2b37ab0ff2dd6e8be4f2d69bead68f6f1efb7a7ad
-AUX pipewire-0.3.31-non-systemd-integration.patch 854 BLAKE2B 361b01278d2525768edd33881ebfa78e15006d346612422cc11817df6cc6c5079d166f3185b8d48312294a6a225ecdb607f180339f416131c7acd638b6efe3fb SHA512 495a7568a1c19e0a24edab7d0572032234efd2380fc9c0fe282a891ff316a235cdb97d5df4524233ed6d8ebfc7724ba9870393b8a5c2a192974865aa706760ab
-AUX pipewire-0.3.31-revert-openaptx-restriction.patch 1368 BLAKE2B 7f995c53ea843282ea802304365833c1464393f7e3e4edeb93cb400c1ed85d2cb7e9f3aa47565139e80ee0fae33e83f5306062e4d26c43d5d544a7f9ca4a4e17 SHA512 0ef4262d5d7c95061dbb68c998539c5a3f70084b6ecbed4b237f699df4f1fdb95539ab35fe0295acf46e729065295cb75750bd99eaa1ff565a26369116b52855
-AUX pipewire-0.3.33-revert-libfreeaptx-switch.patch 1709 BLAKE2B e66bd84b0e297899dfa5167179394b2e5b0d7e98da35171cd9f37c0c100fb593d21955e44643ac7df00d4aa087d7e4e7d26017fc8d2b60477adb7c619978c874 SHA512 d91a7985d32e33d24e05145c567483b50d2a0049f0641a06abc295be776c1eb1a8c2935aa96118d1d71dce2e0538837bf4a18e3c235a2bdab6f9188f012da41b
 AUX pipewire-0.3.35-non-systemd-integration.patch 820 BLAKE2B bbde90ab174a0101f7c48f682d40b0457a19db23c42c9df9b50d29af9643dcb29d5c03fd5faaa467ef94090c00c9022a01ed699f15bf4b69239ead6a41586880 SHA512 8a545da244ad3cbba35c75c9ea15607ff012bb10143cc349c1feea077ac2db09a28f7e06b3b04095b39b217f4b97af679027aee631d93ea3b281801e799bf60e
 AUX pipewire-0.3.36-fix-crash-uaf-media-session.patch 1295 BLAKE2B 7c32a70c48e2cdcaab5cba0315845026ce4feadd2531724e92aa0932f20783253aa00ff4c6f96eeb6124f4ac6011c22afee07fd4cc22488c6ad4619655972155 SHA512 a46341fa86b61f0bf8b80736b411b870d7ac809d556358f4994aaa876a7827811073f99591fb1269ee70dc3b62157d2f1f3d4db63c1cd7729c9f160bf0e621a9
 AUX pipewire-0.3.36-fix-version.patch 716 BLAKE2B c447bd11291f809b7607f4094f2d5e3497996a3834e5d5d468dcc63f0e36c117a31158634c08b8acc724f0ce5b599594b05f79ef3e3128ac28843cc08df03fed SHA512 74c757edf20c911df9299b4322486a34746eec8c4aa212441082f954cebe7c7d9c836a757dd134d71b3c31a97abe1494c13dc470495846ffaf52f943ec397532
@@ -15,20 +12,12 @@ AUX pipewire-0.3.38-libcamera-null-deref.patch 2031 BLAKE2B a1bc641385bd762da8e0
 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
-DIST pipewire-0.3.32.tar.gz 1604622 BLAKE2B cab83a17a2b27f710e1377a2ad2ad7003053ef3e8b55423362f0b428e22d52c2ce564da00aab71cc93262d4cb21f239fffea195d05937fdf3489dc540b77d58d SHA512 8a7fe26a78071fdd8d4c9e2d9bf3791af8e0cb53b976b45d39dcab4ad08196808f416911fb1b366cc85e3fa80592ec79c4e4556bb3a390f4a10229b4bf9893f7
-DIST pipewire-0.3.33.tar.gz 1629559 BLAKE2B de48956ac87ed6d63a08dd354b1e4abf81b9db99825ca65cbb5b522e71eb6920b35173e1c3abd9a710c28709e2b0a459db67654cfeac42149cdfa91c84833a8b SHA512 bc3d5658d6fda11dd55f22ba5293b4ff6c3e9a8d083b0cf7b3356bc18f4f65967557602a0d6603a2a2a548ecb42c6b7fbb9d315ed0fce435f4bb884ab4dd263b
-DIST pipewire-0.3.34.tar.gz 1682396 BLAKE2B 1a3524a833bde6facf637071f905bb0237f3fc53a86d6160083f36c7a42fb7c71c873a0dc9eea04cfb08cbec08807557c2b83efc1ac403adf6a9998d83441338 SHA512 cbf8eb410d2cd1923e67ac9ee9eca0e74567bb7e8ea407a536e64b3ec27b5bbb1e7fdd74a5a7cbffbac3f9996d8a08f8c723401fb44cb2920f044a3a2f3a6c18
-DIST pipewire-0.3.35.tar.gz 1704419 BLAKE2B 5c0debd19b29a9488be26125794f04e57e8b3cd3842654cb935decae18ffefc4137927d969448f60f1c1c2985d54db139fc3dcf07e36e81014021d63490096d8 SHA512 08a2e305fe4e9d3c3f4533c163b725dd32d26513e51a9f476bd18d6157ebf67e97e48b8df9595d45c81599f416e6b3f76e90df575dd460a8d26fe951db30e0f6
 DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
 DIST pipewire-0.3.37.tar.gz 1716320 BLAKE2B ce98b28015de69a0c91953a4839d5f86a29cfa19e2058ba0a2476a75a03b782ae67239b418306e4ed7dab81fe7e77928a417b966ff3c72ac552006cea66e3218 SHA512 3f4cf1ac66117a56a7a264262e2e238a54060457da6a986bd9227f51cc7e8d1a8fd282aef8462c096819282c5baec22779d2025c2e1918bbfb3d6ff75829aea6
 DIST pipewire-0.3.38.tar.gz 1727371 BLAKE2B dac7f3e1992b9690195df1dbc04575d386d21d06d1727b004b851e300709b3707806b7b20d36c1e74225d91a2df5428c913376903b286592f87083857347e53e SHA512 c3c6c822bf4e5e77fed8d6ef09059d3e43195957692ab7baddc349af3d759d892a9af0e7802d389e2a9a15e5fece4c08ec963ac42df931233eec6057bad67eb6
 EBUILD pipewire-0.3.30-r2.ebuild 9675 BLAKE2B df43c7f1ef0622d96741266e53dc343d9697903571c723c73f5267a8083539fde110ea8f6420f2c86e296d275ab45e4b9abacbd6f0310825a6121336cf11215b SHA512 47cdcbd48311cee24b45c05b3283c4bbe1231c44f6d55136966f887aa43ad69b789bf642e003b17aa6f1a3b59963e68047e4f8c396431cb05f6dd4d3161f8c14
-EBUILD pipewire-0.3.32.ebuild 9601 BLAKE2B 4c01a9a3f04b8ec73583b0a6329fd728d025366cec1cc8bb5ad00d700643fcf1a2b0970f625e57cf847df533699a4e2ab7833429663842b37a9790d0071b55d5 SHA512 650385d711644a743144659a6f5642bd5ec73c93a5992354d87c4b6942967e7eccd251be481ccd79b44295aef52411608ac8c4d75c3ecd45087d23d42acfec4d
-EBUILD pipewire-0.3.33-r1.ebuild 9797 BLAKE2B ef2472ea8e6e06d286a72b00cc77fa04dbf6ffef5cf93cb1db75fca910114bf09442a72fe06709ab40f54f36206de47ff2b068381bb8d82c1e8077c79a7f683c SHA512 f2fcd471370696005008ec8614493cab105e08faf07f13effc76866c7f022f474a9e255c184069d5a371507713b1ca1e967ef0d254ea8e314dec3a105c13ec6e
-EBUILD pipewire-0.3.34.ebuild 9816 BLAKE2B 067c01652c0dbb7981606af3818735c37772ad4c2852761ccba4f94c1983246699b6445351458faed259024454052f69ca2ea03e5ad9b47581900ce32f458a0d SHA512 1b7ee3e5ebf11b27bf6c276d83dccc8c3b0fc013e9b75f82ffdedf70e712e9de1bd268b06e8c7cbeed4a71bd0ab5ec249055c817e17c655a011666e35bf62801
-EBUILD pipewire-0.3.35.ebuild 9979 BLAKE2B 12d3135ef817c2266c911dd3182f9f876acee795038b77b7674d41521dd603fa7c8d874887cf841d4dcbb0376a4d0fcbd36f9e03245a9e359810338f69303b58 SHA512 5c3c314dca12e15736c4a16fd28799c3c982a5bca9bddc0ba0033727696aa685d4d52d2d7c5fe25e23e95c0930d11420845fc531b3388de7a33a9ee0a8d25587
-EBUILD pipewire-0.3.36.ebuild 10265 BLAKE2B 2f8126a2b17057613566895fea3d83fdb72fb305cd838144145aac61fb83dee6e6b49cba0a5745d2ae7451aedbcd9c72b67a716220a82858215bb549c9f3b7aa SHA512 378cdac981be1f8d55e5aafc7e869ef7ab49619784c4f91065aa94368fc5338b7cb4dc602c83ea0ae543aa29b39c616e96df37cc985f9d26dfeb3f1ea334d91e
+EBUILD pipewire-0.3.36.ebuild 10264 BLAKE2B 4c34ce0089bf417366a1cc2eb6e5a83d84af4816db5da53fe0293504c26ddd3d0caef8e4cb48fd3c1a48cb4424720f31319e6f3d99729213595498d447ace0dd SHA512 a4ad4dfe0969fd41533e6742843e8b4332fc0122c4327e3198ae8c7a84be166f008c9ed694f14a56b56bfc129a6678651a17a168b96b13329485be2af378930d
 EBUILD pipewire-0.3.37.ebuild 10105 BLAKE2B 3c2d5450d5ffdd1be84b55e9fa06305f6b94566761045f13b978aac9fcc721badf46c5cbac97c5ceffef69d68bb02e5ea3986fc448e2b15ac5a5c5e03ea99c8c SHA512 5dd64416f24b099bf465b630e9116e1c756b0372ae0035ee4b7a7ca6d9fe88b3c9d9ce507251dcc8ae91a4aa0ad9fb9fd95c84275146052c1b05149e0c0f2b61
-EBUILD pipewire-0.3.38.ebuild 10331 BLAKE2B b4d2175802683b15af627551c6f7911c1a79979d8544987b3be4bbdd910621b7847667050d5605798e2cf17d1bbb130083ec0a9f3421ed167d18ca9abd84cf20 SHA512 21caf157edf054945b92b0ac7a402bb7e51c8bb03e740bac33fb2f392cb5ee76d276f3d88f3e9cbcd9108f535b6017f657889ca0a37f0c992e053124ffc62698
+EBUILD pipewire-0.3.38.ebuild 10338 BLAKE2B 7861add091c7a01562398c392f512426a71e09f2ea3026aa22f296d9c57074f09807790cdaa6f9dd8f8c6b8ed453e83e40bb6561f8d2277c551b84f0e051914b SHA512 3f0758cc305d9efe5ba1599dd47b24820c0100b1279e607607db0d36779da0e6e0c4803e9861887ed49205dba4fc1a22a33b634ddc5c4b02899a910e61c3cb59
 EBUILD pipewire-9999.ebuild 10126 BLAKE2B 26b722b3d6b6b603e9b73fc0272bd75b9e99fbb39c314e2cd8f864147cebe20b777d26d3ac922eef43addfdf94c1faf785279f0f6540b7b38fd6ef7f8c76e9cc SHA512 cd811868b41e04bf2c65884839910010d0641bea72f4afd3d2df9f23dd4a0a87d863f3481955dc1bde2db86893cbc08d4ddbe478f68e65a5aef2171ef4429dad
 MISC metadata.xml 1182 BLAKE2B 1f8a03e4957ec550bbdc24352ff138ae42b7aaffd876cef6578b4e7247f91fe1eb6d0c6b47bac01c3b477a7efbd1d89bdeb32c5a1411e7d749c45d5e5c3c70bd SHA512 d38b464b77040206ee7e45fb4f18f01c29db0f5bce087fc8caefa1728d3680c1bc299d7197e3ff7a46e0e08f219ac4b0893c1815d564517365c8996cac5e49bf
diff --git a/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch b/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch
deleted file mode 100644
index ccc89f1310b7..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.31-non-systemd-integration.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/daemon/pipewire.conf.in	2021-06-30 22:22:09.520402459 +0200
-+++ b/src/daemon/pipewire.conf.in	2021-06-30 22:22:30.620404999 +0200
-@@ -234,12 +234,12 @@
-     # but it is better to start it as a systemd service.
-     # Run the session manager with -h for options.
-     #
--    @comment@{ path = "@session_manager_path@"  args = "@session_manager_args@" }
-+    { path = "@session_manager_path@"  args = "@session_manager_args@" }
-     #
-     # You can optionally start the pulseaudio-server here as well
-     # but it is better to start it as a systemd service.
-     # It can be interesting to start another daemon here that listens
-     # on another address with the -a option (eg. -a tcp:4713).
-     #
--    @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
-+    { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
- ]
diff --git a/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch b/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch
deleted file mode 100644
index d8496bc5a694..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3449214466c4dac866ec9f47ecc573efaf4505bb Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Fri, 21 May 2021 10:32:52 +0200
-Subject: [PATCH] Revert "openaptx: Blacklist >= 0.2.1 due to license change"
-
-This reverts commit d08b6fac6bec0d334ee9fc785d551a67832f95fe.
-
-Doesn't apply to us.
-
-Bug: https://bugs.gentoo.org/785634
----
- spa/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spa/meson.build b/spa/meson.build
-index e13802e94..885b25405 100644
---- a/spa/meson.build
-+++ b/spa/meson.build
-@@ -28,7 +28,7 @@ if not get_option('spa-plugins').disabled()
-     summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
-     ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac'))
-     summary({'LDAC ABR': ldac_abr_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
--    aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx'))
-+    aptx_dep = dependency('libopenaptx', required : get_option('bluez5-codec-aptx'))
-     summary({'aptX': aptx_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
-     fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac'))
-     summary({'AAC': fdk_aac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
--- 
-2.32.0
-
diff --git a/media-video/pipewire/files/pipewire-0.3.33-revert-libfreeaptx-switch.patch b/media-video/pipewire/files/pipewire-0.3.33-revert-libfreeaptx-switch.patch
deleted file mode 100644
index 94d4b7dcb0c3..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.33-revert-libfreeaptx-switch.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit f405a4e6069725934f9ae0f1b978497a34197d8d
-Author:     Thomas Deutschmann <whissi@gentoo.org>
-AuthorDate: Tue Aug 24 14:22:36 2021 +0200
-Commit:     Thomas Deutschmann <whissi@gentoo.org>
-CommitDate: Tue Aug 24 14:22:43 2021 +0200
-
-    Revert "bluez5: Use libfreeaptx instead of libopenaptx"
-    
-    This reverts commit 1216371f8c06f548f8ade6468b66612f43df1436.
-    
-    Delay decision for now since both aptx libs haven't diverged yet.
-
-diff --git a/spa/meson.build b/spa/meson.build
-index 483536b54..e13802e94 100644
---- a/spa/meson.build
-+++ b/spa/meson.build
-@@ -28,7 +28,7 @@ if not get_option('spa-plugins').disabled()
-     summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
-     ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac'))
-     summary({'LDAC ABR': ldac_abr_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
--    aptx_dep = dependency('libfreeaptx', required : get_option('bluez5-codec-aptx'))
-+    aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx'))
-     summary({'aptX': aptx_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
-     fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac'))
-     summary({'AAC': fdk_aac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
-diff --git a/spa/plugins/bluez5/a2dp-codec-aptx.c b/spa/plugins/bluez5/a2dp-codec-aptx.c
-index f8d7d6dd8..62ecde348 100644
---- a/spa/plugins/bluez5/a2dp-codec-aptx.c
-+++ b/spa/plugins/bluez5/a2dp-codec-aptx.c
-@@ -32,7 +32,7 @@
- 
- #include <sbc/sbc.h>
- 
--#include <freeaptx.h>
-+#include <openaptx.h>
- 
- #include "defs.h"
- #include "rtp.h"
diff --git a/media-video/pipewire/pipewire-0.3.32.ebuild b/media-video/pipewire/pipewire-0.3.32.ebuild
deleted file mode 100644
index 7c5256744eed..000000000000
--- a/media-video/pipewire/pipewire-0.3.32.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson-multilib optfeature python-any-r1 udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="jack-sdk? ( !jack-client )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-doc/xmltoman
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	virtual/libudev[${MULTILIB_USEDEP}]
-	bluetooth? (
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libopenaptx
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-	)
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		|| (
-			media-plugins/alsa-plugins[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
-	systemd? ( sys-apps/systemd )
-	v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-	"${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-src_prepare() {
-	default
-
-	if ! use systemd; then
-		# This can be applied non-conditionally but would make for a
-		# significantly worse user experience on systemd then.
-		eapply "${FILESDIR}"/${PN}-0.3.31-non-systemd-integration.patch
-	fi
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
-		$(meson_native_enabled media-session)
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_feature jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		-Dudev=enabled
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our customs DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
-
-		exeinto /usr/libexec
-		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
-	fi
-}
-
-pkg_postinst() {
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "To use PipeWire for audio, the user units must be manually enabled:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
-		elog
-		elog "  systemctl --user enable pipewire-media-session.service"
-		elog
-	else
-		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
-		elog "autospawn'ing of the original daemon by setting:"
-		elog
-		elog "  autospawn = no"
-		elog
-		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-		elog
-		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
-		elog "command near the end of the file:"
-		elog
-		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
-		elog
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, package is no longer installing config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override sections you want to change."
-	fi
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.33-r1.ebuild b/media-video/pipewire/pipewire-0.3.33-r1.ebuild
deleted file mode 100644
index d0320fcb4b38..000000000000
--- a/media-video/pipewire/pipewire-0.3.33-r1.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson-multilib optfeature python-any-r1 udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="jack-sdk? ( !jack-client )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-doc/xmltoman
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	virtual/libudev[${MULTILIB_USEDEP}]
-	bluetooth? (
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libopenaptx
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-	)
-	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		|| (
-			media-plugins/alsa-plugins[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
-	systemd? ( sys-apps/systemd )
-	v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-	"${FILESDIR}"/${PN}-0.3.33-revert-libfreeaptx-switch.patch
-	"${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-src_prepare() {
-	default
-
-	if ! use systemd; then
-		# This can be applied non-conditionally but would make for a
-		# significantly worse user experience on systemd then.
-		eapply "${FILESDIR}"/${PN}-0.3.31-non-systemd-integration.patch
-	fi
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
-		$(meson_native_enabled media-session)
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_feature jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		-Dudev=enabled
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our customs DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
-
-		exeinto /usr/libexec
-		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
-	fi
-}
-
-pkg_postinst() {
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "To use PipeWire for audio, the user units must be manually enabled:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
-		elog
-		elog "  systemctl --user enable pipewire-media-session.service"
-		elog
-	else
-		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
-		elog "autospawn'ing of the original daemon by setting:"
-		elog
-		elog "  autospawn = no"
-		elog
-		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-		elog
-		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
-		elog "command near the end of the file:"
-		elog
-		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
-		elog
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, package is no longer installing config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override sections you want to change."
-	fi
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.34.ebuild b/media-video/pipewire/pipewire-0.3.34.ebuild
deleted file mode 100644
index 2ce80ce5a7d4..000000000000
--- a/media-video/pipewire/pipewire-0.3.34.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson-multilib optfeature python-any-r1 udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="jack-sdk? ( !jack-client )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-doc/xmltoman
-	>=dev-util/meson-0.59
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	virtual/libudev[${MULTILIB_USEDEP}]
-	bluetooth? (
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libopenaptx
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-	)
-	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		|| (
-			media-plugins/alsa-plugins[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
-	systemd? ( sys-apps/systemd )
-	v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-	"${FILESDIR}"/${PN}-0.3.33-revert-libfreeaptx-switch.patch
-	"${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-src_prepare() {
-	default
-
-	if ! use systemd; then
-		# This can be applied non-conditionally but would make for a
-		# significantly worse user experience on systemd then.
-		eapply "${FILESDIR}"/${PN}-0.3.31-non-systemd-integration.patch
-	fi
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
-		$(meson_native_enabled media-session)
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_use jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		-Dudev=enabled
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our customs DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
-
-		exeinto /usr/libexec
-		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
-	fi
-}
-
-pkg_postinst() {
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "To use PipeWire for audio, the user units must be manually enabled:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
-		elog
-		elog "  systemctl --user enable pipewire-media-session.service"
-		elog
-	else
-		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
-		elog "autospawn'ing of the original daemon by setting:"
-		elog
-		elog "  autospawn = no"
-		elog
-		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-		elog
-		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
-		elog "command near the end of the file:"
-		elog
-		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
-		elog
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, package is no longer installing config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override sections you want to change."
-	fi
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.35.ebuild b/media-video/pipewire/pipewire-0.3.35.ebuild
deleted file mode 100644
index d68355c9f4c4..000000000000
--- a/media-video/pipewire/pipewire-0.3.35.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson-multilib optfeature python-any-r1 udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~riscv"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="jack-sdk? ( !jack-client )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-doc/xmltoman
-	>=dev-util/meson-0.59
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	virtual/libudev[${MULTILIB_USEDEP}]
-	bluetooth? (
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libfreeaptx
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-	)
-	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-		|| (
-			media-plugins/alsa-plugins[-pulseaudio]
-			!media-plugins/alsa-plugins
-		)
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
-	systemd? ( sys-apps/systemd )
-	v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-python_check_deps() {
-	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	if ! use systemd; then
-		# This can be applied non-conditionally but would make for a
-		# significantly worse user experience on systemd then.
-		eapply "${FILESDIR}"/${PN}-0.3.35-non-systemd-integration.patch
-	fi
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
-		# Replaced upstream by -Dsession-managers=..., needs more work, bug #812809
-		# but default is same as before and right now, this is fatal with unreleased Meson.
-		#$(meson_native_enabled media-session)
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_use jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		-Dudev=enabled
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our customs DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
-
-		exeinto /usr/libexec
-		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
-	fi
-}
-
-pkg_postinst() {
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "To use PipeWire for audio, the user units must be manually enabled:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
-		elog
-		elog "  systemctl --user enable pipewire-media-session.service"
-		elog
-	else
-		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
-		elog "autospawn'ing of the original daemon by setting:"
-		elog
-		elog "  autospawn = no"
-		elog
-		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-		elog
-		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
-		elog "command near the end of the file:"
-		elog
-		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
-		elog
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, package is no longer installing config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override sections you want to change."
-	fi
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
-	if use bluetooth; then
-		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
-		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.36.ebuild b/media-video/pipewire/pipewire-0.3.36.ebuild
index ed38e2d391cb..8c7b2820b89b 100644
--- a/media-video/pipewire/pipewire-0.3.36.ebuild
+++ b/media-video/pipewire/pipewire-0.3.36.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/pipewire/pipewire-0.3.38.ebuild b/media-video/pipewire/pipewire-0.3.38.ebuild
index 9b2951c07937..a9e1b729e5b0 100644
--- a/media-video/pipewire/pipewire-0.3.38.ebuild
+++ b/media-video/pipewire/pipewire-0.3.38.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index ab54ffc9b62f..6a33023fbe10 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,4 +1,4 @@
 AUX 3.38.0-gst-inspect-sandbox.patch 1823 BLAKE2B 14be244c4bd9d96264ff776fb68381df5ea153fac41bf358e2253628bdb09733846a9331e6b129a1abd9186b967357549d6247d5ac021a37362a34206d8e17d8 SHA512 45f7602233b2f64debe1624442a2f6a21e0bf0b2cddf06b49dcdae7dcf0fc0ae6c3f16e5ec2603340df7cd89271501be70a31a0e0b0a737f85f667ac10c3ad53
 DIST totem-3.38.1.tar.xz 2196156 BLAKE2B a9f5771d7406df9490b6eb0f9dc03ef449bee05d6ff038fce9adbac63692b5555de6ff36fe90b3b63cf4bc59739d91b23e57b3a03bf953594567e6a21060b509 SHA512 f33583b0890bfdd0dfff0722f73242b1d38605564a3055b587a30eae4c0ba51159c105ef577ab144792ca1994f385c2b8a9375a356b7cdf2b93bfeb6317f6040
-EBUILD totem-3.38.1.ebuild 2777 BLAKE2B 682bad8bd9eac4408b33e285306d137be365625b7621bc60f13ac57d994293e79fb818dc47548046564f523b9998e33a5d414e6f94bbd9114670b9e74e0c8760 SHA512 31a9d00ea794d3dac208df22d0c5ae4a1fb92db79c063e122f4d84c474c141fd0adab40e5b7c43b8bf11fa37349edc0b6781a13c45401015f9c6f815ba86fe79
+EBUILD totem-3.38.1.ebuild 2829 BLAKE2B a0cafb192ae7fc7d6416d48be2d8d04590a7ec786c3f81bad2f02848b1e7cfd77842171f5a75f67f793f75b5d2e6e3c91ffaaa95672cc0f2826f9410f51e24b4 SHA512 d4a50e2a85e822faef1ad4f7692c0bfbbf5f1ed13459ac20fe1863884aa19d9f55827706a9daa7692d2b0077205437c2a96281f2978b4a715122704a4a2f0116
 MISC metadata.xml 1018 BLAKE2B 1cb6fbaa86e0aa6bc60901e7e0b30765de1bea563666af206bfd75c8ed779332e1536dfebbe8d83d0a940bb4266157d0673b19f64021c76e3fa549a208945335 SHA512 3cb85a567ae7573ec0cf7cc12440ff3d879a3566b4773930752142b9e83ab366b983a470d3ae1f212acd78b217136c1ee681ff7d98d1e980e769867b1791d1d6
diff --git a/media-video/totem/totem-3.38.1.ebuild b/media-video/totem/totem-3.38.1.ebuild
index 4f5cac066acb..717a1d6b7eff 100644
--- a/media-video/totem/totem-3.38.1.ebuild
+++ b/media-video/totem/totem-3.38.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
@@ -23,7 +23,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.19.4:3[introspection]
+	>=x11-libs/gtk+-3.22.0:3[introspection]
 	>=media-libs/gstreamer-1.6.0:1.0
 	>=media-libs/gst-plugins-base-1.6.0:1.0[pango]
 	>=media-libs/gst-plugins-good-1.6.0:1.0
@@ -98,6 +98,7 @@ src_configure() {
 }
 
 src_install() {
+	local -x GST_PLUGIN_SYSTEM_PATH_1_0= # bug 812170
 	meson_src_install
 	if use python ; then
 		python_optimize "${ED}"/usr/$(get_libdir)/totem/plugins/
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 1512d0fddfca..f2aced530621 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -12,8 +12,8 @@ AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bc
 AUX vlc-configure_lua_version.patch 2057 BLAKE2B 995291bab038c912b5d76982da803da34afd4ddce4e21f2aeff8ebe2be760857d169f904a0ce96658b6810e1030031f0a33d0c57f7bc514b1bbdc17e0d67157c SHA512 119f2fff52b334cb073c73979a6bec8710695c67e5ab3ff80d846ede52e922138ac77f8f3f9cccb6f750c74a00baf1529e27c683f0b93a6698436bdcdd930e99
 DIST vlc-3.0-3.0.14.tar.gz 34355555 BLAKE2B e8182229da1fe4f73b640fad8005ec3fc49da70f289bd32c33fcec51bf81d393b067a795626bad57c87499e8de181ac3ce159e572431e794586753c4a7c32597 SHA512 6d366c0f17a8bda7f588ab1818d985bccd076dd821bc83dd7d06827d463931e56cb06ca934622ee2cda4a76b0fbe265a66e4566e9307abc768b76174020f0150
 DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
-EBUILD vlc-3.0.14-r6.ebuild 13811 BLAKE2B c7bfa970ce2ed6474b08486cc80d781b71a8149184fe3a61a655417440f530198d2eedceb0f022b54b25f720453925a34fabb41cf539dafb532162614311596e SHA512 e838d26950efa98ba4b39c171c5246beb61d57a25005ed6d04899ccff8c37c0f37081e9545b8ff6d70bbe2b7ab3dff804f4c49fc762178ff05352b66a3a98fe9
-EBUILD vlc-3.0.16-r6.ebuild 13943 BLAKE2B d723108fe54d617f050da68e70e9ef18efb5dcb34744fb7ae3fe7af0c4da83b32df5e2ce0beb19ad6232f8b4a77c98918a05c6d1d1535651cfde98f908403f1e SHA512 111168b0229b80e9e48d47f09528673e424bc76eb63b1fc4e89b2bc3b6e208a5f79567371e1b5775c62faa9105f14a07d8389314bd4cbc38b545b95b30fe799a
-EBUILD vlc-3.0.9999.ebuild 13484 BLAKE2B 4af596070d8b9a4f4c22d14540863221725a591d34d26979b1b60c06d24923963dd3f1279c8de4f9adefc90b87bf08a88267d1a42324988099c4d656f2a3f843 SHA512 f5cf094b7eb9ce67b10a71719b476f9a960086587dfdb469d09c58e5c449fc1a06aea8532f479d51478d095dd0b92cb04e015d036752c56ad7e188e1ec8b2ade
-EBUILD vlc-9999.ebuild 13496 BLAKE2B 34f910ff15c32ccd8394a2ff55743e242ad89a81188f3f14a064c35825f6bec3cfeb5a07921e3e90aa84a4e4a7f69e9c0e1f3a921335ca64e57200a11461f02d SHA512 1b6da672d51b83c8fab3adca52c4b77cbb731f9d4d0158f41009230cfb384e9c1e0541dad652c5af325df5cf3ac0a612e4f6774e42ff6a44259109f9c2b25d16
+EBUILD vlc-3.0.14-r7.ebuild 13813 BLAKE2B c65604fa710fd31c775fcc9b27b66c6756c7f3ff8b87427f46df59edf38629ef27080b8dac49cb87cf485d4981167753a4143c7ba6d2e961922ffd41d57b211f SHA512 06f1e5a6c2e92a2f49556f78ec2aa2f20af263a73038c892f0b8c93a83a5bdc7c11cd0adab8fe2aee0d9ba4c8b1157119c12ed7f338521ef954722925a6c9173
+EBUILD vlc-3.0.16-r7.ebuild 13944 BLAKE2B 3d5bf8d410492da8614845eab3e1fb58756f5b01559f014856dab785df4f5877df92d16e776fc73e6fd3be8d44d10aa3dd4b76bbd8d32129ccecb36d768665a7 SHA512 c459f6b79d293ca0ca42c80331b0948044042eee77d97308b4540738332c26bbc9dd556f1d7dc08d20018bfa301eb25b5d281c985373c1a8ceff0788e368669e
+EBUILD vlc-3.0.9999.ebuild 13486 BLAKE2B 51ee12e042e6d656b4a5cb016397e70e1fcd5d9c13a37170dffc4100b127ded3817764d68591b7303695e697fd004f184c251c332908ecc0f68236dca6d5eb1f SHA512 f88809f93fde7e0190cc8fdca801446a212d2e15b83b7511be24a353ca8e45555f57a3218195d973f2b8b1ab6473f9b3313715f7d53cb8632e8b2bcc5a962cf0
+EBUILD vlc-9999.ebuild 13498 BLAKE2B 5c5dcc2579d2935b643298f17ad8ca7e21c9602fa17eac72f63324efb29ff25c39d6ce4a4509daccaf9a63b86da55e9aeeca4923802bcb21849d7d55aed1deae SHA512 dd8094cb589b74dfbfd5e802e0e8de52c9c724b4a5cde660615beccca3af9d490e645f85070e196f0dac46231cb2e1bcfc946640e96b30820e474489e8c92145
 MISC metadata.xml 4912 BLAKE2B 97661f54c1c16cb3084e12ce7899c080e7e69b203c1539b90048cf3d7c1f673b29051fd68216b6bed54f8842990f0c47e2c67038d85e911dcd1c905b54093719 SHA512 c24db55603932f9b52808e0b9d5687a333078d1735c05e1b561d91c08b99246b321b5b60f8111b286041c524d5913ec6f4f321a79c0773cbb9aaaa3fea9a50d6
diff --git a/media-video/vlc/vlc-3.0.14-r6.ebuild b/media-video/vlc/vlc-3.0.14-r6.ebuild
deleted file mode 100644
index 8cc409ebdb5d..000000000000
--- a/media-video/vlc/vlc-3.0.14-r6.ebuild
+++ /dev/null
@@ -1,514 +0,0 @@
-# Copyright 2000-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
-	fi
-	inherit git-r3
-else
-	SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
-	#if [[ ${MY_P} = ${P} ]] ; then
-	#	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	#else
-	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-	#fi
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86"
-fi
-
-inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-
-IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
-	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
-	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
-	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
-	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
-	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
-	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
-	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X
-	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
-	cpu_flags_x86_sse
-"
-REQUIRED_USE="
-	chromecast? ( encode )
-	directx? ( ffmpeg )
-	fontconfig? ( truetype )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	lua? ( ${LUA_REQUIRED_USE} )
-	skins? ( qt5 truetype X xml )
-	ssl? ( gcrypt )
-	vaapi? ( ffmpeg X )
-	vdpau? ( ffmpeg X )
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	lua? ( ${LUA_DEPS} )
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-"
-RDEPEND="
-	media-libs/libvorbis
-	net-dns/libidn:=
-	sys-libs/zlib[minizip]
-	virtual/libintl
-	virtual/opengl
-	a52? ( media-libs/a52dec )
-	alsa? ( media-libs/alsa-lib )
-	aom? ( media-libs/libaom:= )
-	archive? ( app-arch/libarchive:= )
-	aribsub? ( media-libs/aribb24 )
-	bidi? (
-		dev-libs/fribidi
-		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
-		virtual/ttf-fonts
-	)
-	bluray? ( >=media-libs/libbluray-1.3.0:= )
-	cddb? ( media-libs/libcddb )
-	chromaprint? ( media-libs/chromaprint:= )
-	chromecast? (
-		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.1.2:=
-	)
-	dav1d? ( media-libs/dav1d:= )
-	dbus? ( sys-apps/dbus )
-	dc1394? (
-		media-libs/libdc1394:2
-		sys-libs/libraw1394
-	)
-	dts? ( media-libs/libdca )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
-	dvd? (
-		>=media-libs/libdvdnav-6.1.1:0=
-		>=media-libs/libdvdread-6.1.2:0=
-	)
-	faad? ( media-libs/faad2 )
-	fdk? ( media-libs/fdk-aac:= )
-	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
-	flac? (
-		media-libs/flac
-		media-libs/libogg
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error
-	)
-	gme? ( media-libs/game-music-emu )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	ieee1394? (
-		sys-libs/libavc1394
-		sys-libs/libraw1394
-	)
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate )
-	libass? (
-		media-libs/fontconfig:1.0
-		media-libs/libass:=
-	)
-	libcaca? ( media-libs/libcaca )
-	libnotify? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libnotify
-	)
-	libsamplerate? ( media-libs/libsamplerate )
-	libtar? ( dev-libs/libtar )
-	libtiger? ( media-libs/libtiger )
-	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc )
-	live? ( >=media-plugins/live-2021.05.22:= )
-	lua? ( ${LUA_DEPS} )
-	mad? ( media-libs/libmad )
-	matroska? (
-		>=dev-libs/libebml-1.4.2:=
-		media-libs/libmatroska:=
-	)
-	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
-	mp3? ( media-sound/mpg123 )
-	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:= )
-	musepack? ( media-sound/musepack-tools )
-	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
-	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( media-libs/libogg )
-	opus? ( >=media-libs/opus-1.0.3 )
-	png? ( media-libs/libpng:0= )
-	projectm? (
-		media-fonts/dejavu
-		>=media-libs/libprojectm-3.1.12:0=
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		X? (
-			dev-qt/qtx11extras:5
-			x11-libs/libX11
-		)
-	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	sdl-image? ( media-libs/sdl-image )
-	sftp? ( net-libs/libssh2 )
-	shout? ( media-libs/libshout )
-	sid? ( media-libs/libsidplay:2 )
-	skins? (
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXpm
-	)
-	soxr? ( >=media-libs/soxr-0.1.2 )
-	speex? (
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
-	)
-	srt? ( >=net-libs/srt-1.4.2:= )
-	ssl? ( net-libs/gnutls:= )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-	)
-	taglib? ( >=media-libs/taglib-1.9 )
-	theora? ( media-libs/libtheora )
-	tremor? ( media-libs/tremor )
-	truetype? (
-		media-libs/freetype:2
-		virtual/ttf-fonts
-		!fontconfig? ( media-fonts/dejavu )
-	)
-	twolame? ( media-sound/twolame )
-	udev? ( virtual/udev )
-	upnp? ( net-libs/libupnp:=[ipv6] )
-	v4l? ( media-libs/libv4l:= )
-	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
-	vdpau? ( x11-libs/libvdpau )
-	vnc? ( net-libs/libvncserver )
-	vpx? ( media-libs/libvpx:= )
-	wayland? (
-		>=dev-libs/wayland-1.15
-		dev-libs/wayland-protocols
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-keysyms
-	)
-	x264? ( >=media-libs/x264-0.0.20190214:= )
-	x265? ( media-libs/x265:= )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zvbi? ( media-libs/zvbi )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
-	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
-	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
-	"${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
-	"${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 795798
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-pkg_setup() {
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare # bug 608256
-
-	has_version 'net-libs/libupnp:1.8' && \
-		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	#rm m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	# Disable running of vlc-cache-gen, we do that in pkg_postinst
-	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
-	# Fix gettext version mismatch errors.
-	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
-	local -x BUILDCC=$(tc-getBUILD_CC)
-
-	local myeconfargs=(
-		--disable-aa
-		--disable-optimizations
-		--disable-rpath
-		--disable-update-check
-		--enable-fast-install
-		--enable-screen
-		--enable-vcd
-		--enable-vlc
-		--enable-vorbis
-		$(use_enable a52)
-		$(use_enable alsa)
-		$(use_enable aom)
-		$(use_enable archive)
-		$(use_enable aribsub)
-		$(use_enable bidi fribidi)
-		$(use_enable bidi harfbuzz)
-		$(use_enable bluray)
-		$(use_enable cddb libcddb)
-		$(use_enable chromaprint)
-		$(use_enable chromecast)
-		$(use_enable chromecast microdns)
-		$(use_enable cpu_flags_arm_neon neon)
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable dav1d)
-		$(use_enable dbus)
-		$(use_enable dbus kwallet)
-		$(use_enable dc1394)
-		$(use_enable debug)
-		$(use_enable directx)
-		$(use_enable directx d3d11va)
-		$(use_enable directx dxva2)
-		$(use_enable dts dca)
-		$(use_enable dvbpsi)
-		$(use_enable dvd dvdnav)
-		$(use_enable dvd dvdread)
-		$(use_enable encode sout)
-		$(use_enable encode vlm)
-		$(use_enable faad)
-		$(use_enable fdk fdkaac)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable ffmpeg avformat)
-		$(use_enable ffmpeg postproc)
-		$(use_enable ffmpeg swscale)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable fontconfig)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable gme)
-		$(use_enable gnome-keyring secret)
-		$(use_enable gstreamer gst-decode)
-		$(use_enable ieee1394 dv1394)
-		$(use_enable jack)
-		$(use_enable jpeg)
-		$(use_enable kate)
-		$(use_enable libass)
-		$(use_enable libcaca caca)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable libtar)
-		$(use_enable libtiger tiger)
-		$(use_enable linsys)
-		$(use_enable lirc)
-		$(use_enable live live555)
-		$(use_enable lua)
-		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable mad)
-		$(use_enable matroska)
-		$(use_enable modplug mod)
-		$(use_enable mp3 mpg123)
-		$(use_enable mpeg libmpeg2)
-		$(use_enable mtp)
-		$(use_enable musepack mpc)
-		$(use_enable ncurses)
-		$(use_enable nfs)
-		$(use_enable ogg)
-		$(use_enable omxil)
-		$(use_enable omxil omxil-vout)
-		$(use_enable optimisememory optimize-memory)
-		$(use_enable opus)
-		$(use_enable png)
-		$(use_enable projectm)
-		$(use_enable pulseaudio pulse)
-		$(use_enable qt5 qt)
-		$(use_enable rdp freerdp)
-		$(use_enable run-as-root)
-		$(use_enable samba smbclient)
-		$(use_enable sdl-image)
-		$(use_enable sftp)
-		$(use_enable shout)
-		$(use_enable sid)
-		$(use_enable skins skins2)
-		$(use_enable soxr)
-		$(use_enable speex)
-		$(use_enable srt)
-		$(use_enable ssl gnutls)
-		$(use_enable svg)
-		$(use_enable svg svgdec)
-		$(use_enable taglib)
-		$(use_enable theora)
-		$(use_enable tremor)
-		$(use_enable twolame)
-		$(use_enable udev)
-		$(use_enable upnp)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi libva)
-		$(use_enable vdpau)
-		$(use_enable vnc)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_with X x)
-		$(use_enable X xcb)
-		$(use_enable X xvideo)
-		$(use_enable x264)
-		$(use_enable x264 x26410b)
-		$(use_enable x265)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf avahi)
-		$(use_enable zvbi)
-		$(use_enable !zvbi telx)
-		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
-		--disable-asdcp
-		--disable-coverage
-		--disable-cprof
-		--disable-crystalhd
-		--disable-decklink
-		--disable-gles2
-		--disable-goom
-		--disable-kai
-		--disable-kva
-		--disable-libplacebo
-		--disable-maintainer-mode
-		--disable-merge-ffmpeg
-		--disable-mfx
-		--disable-mmal
-		--disable-opencv
-		--disable-opensles
-		--disable-oss
-		--disable-rpi-omxil
-		--disable-schroedinger
-		--disable-shine
-		--disable-sndio
-		--disable-spatialaudio
-		--disable-vsxu
-		--disable-wasapi
-		--disable-wma-fixed
-	)
-	# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
-	append-cxxflags -std=c++11
-
-	if use omxil; then
-		# bug #723006
-		# https://trac.videolan.org/vlc/ticket/24617
-		append-cflags -fcommon
-	fi
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	if use truetype || use bidi; then
-		myeconfargs+=( --enable-freetype )
-	else
-		myeconfargs+=( --disable-freetype )
-	fi
-
-	if use truetype || use projectm; then
-		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
-		myeconfargs+=(
-			--with-default-font=${dejavu}/DejaVuSans.ttf
-			--with-default-font-family=Sans
-			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-			--with-default-monospace-font-family=Monospace
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values may break the build (bug 523144), so definition should not be removed.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
-	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
-		einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-		"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
-		ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
-		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
-	fi
-
-	xdg_pkg_postrm
-}
diff --git a/media-video/vlc/vlc-3.0.14-r7.ebuild b/media-video/vlc/vlc-3.0.14-r7.ebuild
new file mode 100644
index 000000000000..dadbb25cc1af
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.14-r7.ebuild
@@ -0,0 +1,514 @@
+# Copyright 2000-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	inherit git-r3
+else
+	SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
+	#if [[ ${MY_P} = ${P} ]] ; then
+	#	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	#else
+	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+	#fi
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86"
+fi
+
+inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
+	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
+	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
+	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
+	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
+	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
+	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
+	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X
+	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
+	cpu_flags_x86_sse
+"
+REQUIRED_USE="
+	chromecast? ( encode )
+	directx? ( ffmpeg )
+	fontconfig? ( truetype )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	lua? ( ${LUA_REQUIRED_USE} )
+	skins? ( qt5 truetype X xml )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
+RDEPEND="
+	media-libs/libvorbis
+	net-dns/libidn:=
+	sys-libs/zlib[minizip]
+	virtual/libintl
+	virtual/opengl
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
+	aom? ( media-libs/libaom:= )
+	archive? ( app-arch/libarchive:= )
+	aribsub? ( media-libs/aribb24 )
+	bidi? (
+		dev-libs/fribidi
+		media-libs/freetype:2[harfbuzz]
+		media-libs/harfbuzz:=
+		virtual/ttf-fonts
+	)
+	bluray? ( >=media-libs/libbluray-1.3.0:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
+	chromecast? (
+		>=dev-libs/protobuf-2.5.0:=
+		>=net-libs/libmicrodns-0.1.2:=
+	)
+	dav1d? ( media-libs/dav1d:= )
+	dbus? ( sys-apps/dbus )
+	dc1394? (
+		media-libs/libdc1394:2
+		sys-libs/libraw1394
+	)
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
+	dvd? (
+		>=media-libs/libdvdnav-6.1.1:0=
+		>=media-libs/libdvdread-6.1.2:0=
+	)
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
+	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	gme? ( media-libs/game-music-emu )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? (
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( media-libs/libkate )
+	libass? (
+		media-libs/fontconfig:1.0
+		media-libs/libass:=
+	)
+	libcaca? ( media-libs/libcaca )
+	libnotify? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libnotify
+	)
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
+	linsys? ( media-libs/zvbi )
+	lirc? ( app-misc/lirc )
+	live? ( >=media-plugins/live-2021.05.22:= )
+	lua? ( ${LUA_DEPS} )
+	mad? ( media-libs/libmad )
+	matroska? (
+		>=dev-libs/libebml-1.4.2:=
+		media-libs/libmatroska:=
+	)
+	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
+	mp3? ( media-sound/mpg123 )
+	mpeg? ( media-libs/libmpeg2 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
+	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+	nfs? ( >=net-fs/libnfs-0.10.0:= )
+	ogg? ( media-libs/libogg )
+	opus? ( >=media-libs/opus-1.0.3 )
+	png? ( media-libs/libpng:0= )
+	projectm? (
+		media-fonts/dejavu
+		>=media-libs/libprojectm-3.1.12:0=
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
+	sid? ( media-libs/libsidplay:2 )
+	skins? (
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
+	)
+	soxr? ( >=media-libs/soxr-0.1.2 )
+	speex? (
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
+	)
+	srt? ( >=net-libs/srt-1.4.2:= )
+	ssl? ( net-libs/gnutls:= )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
+	truetype? (
+		media-libs/freetype:2
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
+	)
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/libupnp:=[ipv6] )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vpx? ( media-libs/libvpx:= )
+	wayland? (
+		>=dev-libs/wayland-1.15
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
+	"${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
+	"${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 795798
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare # bug 608256
+
+	has_version 'net-libs/libupnp:1.8' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	#rm m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+	# Fix gettext version mismatch errors.
+	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	local -x BUILDCC=$(tc-getBUILD_CC)
+
+	local myeconfargs=(
+		--disable-aa
+		--disable-optimizations
+		--disable-rpath
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		--enable-vcd
+		--enable-vlc
+		--enable-vorbis
+		$(use_enable a52)
+		$(use_enable alsa)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable aribsub)
+		$(use_enable bidi fribidi)
+		$(use_enable bidi harfbuzz)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable dav1d)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable directx)
+		$(use_enable directx d3d11va)
+		$(use_enable directx dxva2)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable encode sout)
+		$(use_enable encode vlm)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg postproc)
+		$(use_enable ffmpeg swscale)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable mad)
+		$(use_enable matroska)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mpg123)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable nfs)
+		$(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable opus)
+		$(use_enable png)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable sdl-image)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable sid)
+		$(use_enable skins skins2)
+		$(use_enable soxr)
+		$(use_enable speex)
+		$(use_enable srt)
+		$(use_enable ssl gnutls)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vdpau)
+		$(use_enable vnc)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
+		$(use_enable x264)
+		$(use_enable x264 x26410b)
+		$(use_enable x265)
+		$(use_enable xml libxml2)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opencv
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-schroedinger
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-vsxu
+		--disable-wasapi
+		--disable-wma-fixed
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	if use x86; then
+		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+		append-cflags $(test-flags-CC -fno-stack-check)
+		# Bug 569774
+		replace-flags -Os -O2
+	fi
+
+	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+	append-cxxflags -std=c++11
+
+	if use omxil; then
+		# bug #723006
+		# https://trac.videolan.org/vlc/ticket/24617
+		append-cflags -fcommon
+	fi
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use bidi; then
+		myeconfargs+=( --enable-freetype )
+	else
+		myeconfargs+=( --disable-freetype )
+	fi
+
+	if use truetype || use projectm; then
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+		"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
+		ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
+	xdg_pkg_postrm
+}
diff --git a/media-video/vlc/vlc-3.0.16-r6.ebuild b/media-video/vlc/vlc-3.0.16-r6.ebuild
deleted file mode 100644
index 71358f7fda0c..000000000000
--- a/media-video/vlc/vlc-3.0.16-r6.ebuild
+++ /dev/null
@@ -1,520 +0,0 @@
-# Copyright 2000-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
-	fi
-	inherit git-r3
-else
-	SRC_URI="https://get.videolan.org/vlc/${PV}/${P}.tar.xz"
-	#S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
-	#SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
-	#if [[ ${MY_P} = ${P} ]] ; then
-	#	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	#else
-	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-	#fi
-	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv -sparc x86"
-fi
-
-inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-
-IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
-	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
-	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
-	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
-	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
-	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
-	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
-	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X
-	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
-	cpu_flags_x86_sse
-"
-REQUIRED_USE="
-	chromecast? ( encode )
-	directx? ( ffmpeg )
-	fontconfig? ( truetype )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	lua? ( ${LUA_REQUIRED_USE} )
-	skins? ( qt5 truetype X xml )
-	ssl? ( gcrypt )
-	vaapi? ( ffmpeg X )
-	vdpau? ( ffmpeg X )
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	lua? ( ${LUA_DEPS} )
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-"
-RDEPEND="
-	media-libs/libvorbis
-	net-dns/libidn:=
-	sys-libs/zlib[minizip]
-	virtual/libintl
-	virtual/opengl
-	a52? ( media-libs/a52dec )
-	alsa? ( media-libs/alsa-lib )
-	aom? ( media-libs/libaom:= )
-	archive? ( app-arch/libarchive:= )
-	aribsub? ( media-libs/aribb24 )
-	bidi? (
-		dev-libs/fribidi
-		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
-		virtual/ttf-fonts
-	)
-	bluray? ( >=media-libs/libbluray-1.3.0:= )
-	cddb? ( media-libs/libcddb )
-	chromaprint? ( media-libs/chromaprint:= )
-	chromecast? (
-		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.1.2:=
-	)
-	dav1d? ( media-libs/dav1d:= )
-	dbus? ( sys-apps/dbus )
-	dc1394? (
-		media-libs/libdc1394:2
-		sys-libs/libraw1394
-	)
-	dts? ( media-libs/libdca )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
-	dvd? (
-		>=media-libs/libdvdnav-6.1.1:0=
-		>=media-libs/libdvdread-6.1.2:0=
-	)
-	faad? ( media-libs/faad2 )
-	fdk? ( media-libs/fdk-aac:= )
-	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
-	flac? (
-		media-libs/flac
-		media-libs/libogg
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error
-	)
-	gme? ( media-libs/game-music-emu )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	ieee1394? (
-		sys-libs/libavc1394
-		sys-libs/libraw1394
-	)
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate )
-	libass? (
-		media-libs/fontconfig:1.0
-		media-libs/libass:=
-	)
-	libcaca? ( media-libs/libcaca )
-	libnotify? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libnotify
-	)
-	libsamplerate? ( media-libs/libsamplerate )
-	libtar? ( dev-libs/libtar )
-	libtiger? ( media-libs/libtiger )
-	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc )
-	live? ( >=media-plugins/live-2021.05.22:= )
-	lua? ( ${LUA_DEPS} )
-	mad? ( media-libs/libmad )
-	matroska? (
-		>=dev-libs/libebml-1.4.2:=
-		media-libs/libmatroska:=
-	)
-	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
-	mp3? ( media-sound/mpg123 )
-	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:= )
-	musepack? ( media-sound/musepack-tools )
-	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
-	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( media-libs/libogg )
-	opus? ( >=media-libs/opus-1.0.3 )
-	png? ( media-libs/libpng:0= )
-	projectm? (
-		media-fonts/dejavu
-		>=media-libs/libprojectm-3.1.12:0=
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		X? (
-			dev-qt/qtx11extras:5
-			x11-libs/libX11
-		)
-	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	sdl-image? ( media-libs/sdl-image )
-	sftp? ( net-libs/libssh2 )
-	shout? ( media-libs/libshout )
-	sid? ( media-libs/libsidplay:2 )
-	skins? (
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXpm
-	)
-	soxr? ( >=media-libs/soxr-0.1.2 )
-	speex? (
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
-	)
-	srt? ( >=net-libs/srt-1.4.2:= )
-	ssl? ( net-libs/gnutls:= )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-	)
-	taglib? ( >=media-libs/taglib-1.9 )
-	theora? ( media-libs/libtheora )
-	tremor? ( media-libs/tremor )
-	truetype? (
-		media-libs/freetype:2
-		virtual/ttf-fonts
-		!fontconfig? ( media-fonts/dejavu )
-	)
-	twolame? ( media-sound/twolame )
-	udev? ( virtual/udev )
-	upnp? ( net-libs/libupnp:=[ipv6] )
-	v4l? ( media-libs/libv4l:= )
-	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
-	vdpau? ( x11-libs/libvdpau )
-	vnc? ( net-libs/libvncserver )
-	vpx? ( media-libs/libvpx:= )
-	wayland? (
-		>=dev-libs/wayland-1.15
-		dev-libs/wayland-protocols
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-keysyms
-	)
-	x264? ( >=media-libs/x264-0.0.20190214:= )
-	x265? ( media-libs/x265:= )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zvbi? ( media-libs/zvbi )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
-	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
-	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
-	"${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
-	"${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 795798
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-pkg_setup() {
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare # bug 608256
-
-	has_version 'net-libs/libupnp:1.8' && \
-		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	#rm m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	# Disable running of vlc-cache-gen, we do that in pkg_postinst
-	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
-	# Fix gettext version mismatch errors.
-	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
-	local -x BUILDCC=$(tc-getBUILD_CC)
-
-	local myeconfargs=(
-		--disable-aa
-		--disable-optimizations
-		--disable-rpath
-		--disable-update-check
-		--enable-fast-install
-		--enable-screen
-		--enable-vcd
-		--enable-vlc
-		--enable-vorbis
-		$(use_enable a52)
-		$(use_enable alsa)
-		$(use_enable aom)
-		$(use_enable archive)
-		$(use_enable aribsub)
-		$(use_enable bidi fribidi)
-		$(use_enable bidi harfbuzz)
-		$(use_enable bluray)
-		$(use_enable cddb libcddb)
-		$(use_enable chromaprint)
-		$(use_enable chromecast)
-		$(use_enable chromecast microdns)
-		$(use_enable cpu_flags_arm_neon neon)
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable dav1d)
-		$(use_enable dbus)
-		$(use_enable dbus kwallet)
-		$(use_enable dc1394)
-		$(use_enable debug)
-		$(use_enable directx)
-		$(use_enable directx d3d11va)
-		$(use_enable directx dxva2)
-		$(use_enable dts dca)
-		$(use_enable dvbpsi)
-		$(use_enable dvd dvdnav)
-		$(use_enable dvd dvdread)
-		$(use_enable encode sout)
-		$(use_enable encode vlm)
-		$(use_enable faad)
-		$(use_enable fdk fdkaac)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable ffmpeg avformat)
-		$(use_enable ffmpeg postproc)
-		$(use_enable ffmpeg swscale)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable fontconfig)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable gme)
-		$(use_enable gnome-keyring secret)
-		$(use_enable gstreamer gst-decode)
-		$(use_enable ieee1394 dv1394)
-		$(use_enable jack)
-		$(use_enable jpeg)
-		$(use_enable kate)
-		$(use_enable libass)
-		$(use_enable libcaca caca)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable libtar)
-		$(use_enable libtiger tiger)
-		$(use_enable linsys)
-		$(use_enable lirc)
-		$(use_enable live live555)
-		$(use_enable lua)
-		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable mad)
-		$(use_enable matroska)
-		$(use_enable modplug mod)
-		$(use_enable mp3 mpg123)
-		$(use_enable mpeg libmpeg2)
-		$(use_enable mtp)
-		$(use_enable musepack mpc)
-		$(use_enable ncurses)
-		$(use_enable nfs)
-		$(use_enable ogg)
-		$(use_enable omxil)
-		$(use_enable omxil omxil-vout)
-		$(use_enable optimisememory optimize-memory)
-		$(use_enable opus)
-		$(use_enable png)
-		$(use_enable projectm)
-		$(use_enable pulseaudio pulse)
-		$(use_enable qt5 qt)
-		$(use_enable rdp freerdp)
-		$(use_enable run-as-root)
-		$(use_enable samba smbclient)
-		$(use_enable sdl-image)
-		$(use_enable sftp)
-		$(use_enable shout)
-		$(use_enable sid)
-		$(use_enable skins skins2)
-		$(use_enable soxr)
-		$(use_enable speex)
-		$(use_enable srt)
-		$(use_enable ssl gnutls)
-		$(use_enable svg)
-		$(use_enable svg svgdec)
-		$(use_enable taglib)
-		$(use_enable theora)
-		$(use_enable tremor)
-		$(use_enable twolame)
-		$(use_enable udev)
-		$(use_enable upnp)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi libva)
-		$(use_enable vdpau)
-		$(use_enable vnc)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_with X x)
-		$(use_enable X xcb)
-		$(use_enable X xvideo)
-		$(use_enable x264)
-		$(use_enable x264 x26410b)
-		$(use_enable x265)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf avahi)
-		$(use_enable zvbi)
-		$(use_enable !zvbi telx)
-		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
-		--disable-asdcp
-		--disable-coverage
-		--disable-cprof
-		--disable-crystalhd
-		--disable-decklink
-		--disable-gles2
-		--disable-goom
-		--disable-kai
-		--disable-kva
-		--disable-libplacebo
-		--disable-maintainer-mode
-		--disable-merge-ffmpeg
-		--disable-mfx
-		--disable-mmal
-		--disable-opencv
-		--disable-opensles
-		--disable-oss
-		--disable-rpi-omxil
-		--disable-schroedinger
-		--disable-shine
-		--disable-sndio
-		--disable-spatialaudio
-		--disable-vsxu
-		--disable-wasapi
-		--disable-wma-fixed
-	)
-	# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
-	append-cxxflags -std=c++11
-
-	if use omxil; then
-		# bug #723006
-		# https://trac.videolan.org/vlc/ticket/24617
-		append-cflags -fcommon
-	fi
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	if use riscv; then
-		# Bug #803473
-		append-libs -latomic
-	fi
-
-	if use truetype || use bidi; then
-		myeconfargs+=( --enable-freetype )
-	else
-		myeconfargs+=( --disable-freetype )
-	fi
-
-	if use truetype || use projectm; then
-		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
-		myeconfargs+=(
-			--with-default-font=${dejavu}/DejaVuSans.ttf
-			--with-default-font-family=Sans
-			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-			--with-default-monospace-font-family=Monospace
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values may break the build (bug 523144), so definition should not be removed.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
-	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
-		einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-		"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
-		ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
-		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
-	fi
-
-	xdg_pkg_postrm
-}
diff --git a/media-video/vlc/vlc-3.0.16-r7.ebuild b/media-video/vlc/vlc-3.0.16-r7.ebuild
new file mode 100644
index 000000000000..6c0852eb7fb2
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.16-r7.ebuild
@@ -0,0 +1,520 @@
+# Copyright 2000-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	inherit git-r3
+else
+	SRC_URI="https://get.videolan.org/vlc/${PV}/${P}.tar.xz"
+	#S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
+	#SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
+	#if [[ ${MY_P} = ${P} ]] ; then
+	#	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	#else
+	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+	#fi
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv -sparc x86"
+fi
+
+inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
+	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
+	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
+	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
+	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
+	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
+	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
+	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X
+	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
+	cpu_flags_x86_sse
+"
+REQUIRED_USE="
+	chromecast? ( encode )
+	directx? ( ffmpeg )
+	fontconfig? ( truetype )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	lua? ( ${LUA_REQUIRED_USE} )
+	skins? ( qt5 truetype X xml )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
+RDEPEND="
+	media-libs/libvorbis
+	net-dns/libidn:=
+	sys-libs/zlib[minizip]
+	virtual/libintl
+	virtual/opengl
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
+	aom? ( media-libs/libaom:= )
+	archive? ( app-arch/libarchive:= )
+	aribsub? ( media-libs/aribb24 )
+	bidi? (
+		dev-libs/fribidi
+		media-libs/freetype:2[harfbuzz]
+		media-libs/harfbuzz:=
+		virtual/ttf-fonts
+	)
+	bluray? ( >=media-libs/libbluray-1.3.0:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
+	chromecast? (
+		>=dev-libs/protobuf-2.5.0:=
+		>=net-libs/libmicrodns-0.1.2:=
+	)
+	dav1d? ( media-libs/dav1d:= )
+	dbus? ( sys-apps/dbus )
+	dc1394? (
+		media-libs/libdc1394:2
+		sys-libs/libraw1394
+	)
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
+	dvd? (
+		>=media-libs/libdvdnav-6.1.1:0=
+		>=media-libs/libdvdread-6.1.2:0=
+	)
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
+	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	gme? ( media-libs/game-music-emu )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? (
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( media-libs/libkate )
+	libass? (
+		media-libs/fontconfig:1.0
+		media-libs/libass:=
+	)
+	libcaca? ( media-libs/libcaca )
+	libnotify? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libnotify
+	)
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
+	linsys? ( media-libs/zvbi )
+	lirc? ( app-misc/lirc )
+	live? ( >=media-plugins/live-2021.05.22:= )
+	lua? ( ${LUA_DEPS} )
+	mad? ( media-libs/libmad )
+	matroska? (
+		>=dev-libs/libebml-1.4.2:=
+		media-libs/libmatroska:=
+	)
+	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
+	mp3? ( media-sound/mpg123 )
+	mpeg? ( media-libs/libmpeg2 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
+	ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+	nfs? ( >=net-fs/libnfs-0.10.0:= )
+	ogg? ( media-libs/libogg )
+	opus? ( >=media-libs/opus-1.0.3 )
+	png? ( media-libs/libpng:0= )
+	projectm? (
+		media-fonts/dejavu
+		>=media-libs/libprojectm-3.1.12:0=
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
+	sid? ( media-libs/libsidplay:2 )
+	skins? (
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
+	)
+	soxr? ( >=media-libs/soxr-0.1.2 )
+	speex? (
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
+	)
+	srt? ( >=net-libs/srt-1.4.2:= )
+	ssl? ( net-libs/gnutls:= )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
+	truetype? (
+		media-libs/freetype:2
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
+	)
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/libupnp:=[ipv6] )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vpx? ( media-libs/libvpx:= )
+	wayland? (
+		>=dev-libs/wayland-1.15
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
+	"${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
+	"${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 795798
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare # bug 608256
+
+	has_version 'net-libs/libupnp:1.8' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	#rm m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+	# Fix gettext version mismatch errors.
+	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	local -x BUILDCC=$(tc-getBUILD_CC)
+
+	local myeconfargs=(
+		--disable-aa
+		--disable-optimizations
+		--disable-rpath
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		--enable-vcd
+		--enable-vlc
+		--enable-vorbis
+		$(use_enable a52)
+		$(use_enable alsa)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable aribsub)
+		$(use_enable bidi fribidi)
+		$(use_enable bidi harfbuzz)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable dav1d)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable directx)
+		$(use_enable directx d3d11va)
+		$(use_enable directx dxva2)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable encode sout)
+		$(use_enable encode vlm)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg postproc)
+		$(use_enable ffmpeg swscale)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable mad)
+		$(use_enable matroska)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mpg123)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable nfs)
+		$(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable opus)
+		$(use_enable png)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable sdl-image)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable sid)
+		$(use_enable skins skins2)
+		$(use_enable soxr)
+		$(use_enable speex)
+		$(use_enable srt)
+		$(use_enable ssl gnutls)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vdpau)
+		$(use_enable vnc)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
+		$(use_enable x264)
+		$(use_enable x264 x26410b)
+		$(use_enable x265)
+		$(use_enable xml libxml2)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opencv
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-schroedinger
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-vsxu
+		--disable-wasapi
+		--disable-wma-fixed
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	if use x86; then
+		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+		append-cflags $(test-flags-CC -fno-stack-check)
+		# Bug 569774
+		replace-flags -Os -O2
+	fi
+
+	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+	append-cxxflags -std=c++11
+
+	if use omxil; then
+		# bug #723006
+		# https://trac.videolan.org/vlc/ticket/24617
+		append-cflags -fcommon
+	fi
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use riscv; then
+		# Bug #803473
+		append-libs -latomic
+	fi
+
+	if use truetype || use bidi; then
+		myeconfargs+=( --enable-freetype )
+	else
+		myeconfargs+=( --disable-freetype )
+	fi
+
+	if use truetype || use projectm; then
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+		"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
+		ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
+	xdg_pkg_postrm
+}
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 2c90e88cc44a..fb2127172d31 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -75,7 +75,7 @@ RDEPEND="
 	bidi? (
 		dev-libs/fribidi
 		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
+		media-libs/harfbuzz:=
 		virtual/ttf-fonts
 	)
 	bluray? ( >=media-libs/libbluray-1.3.0:= )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 88345ff41a5f..62677697baa2 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -75,7 +75,7 @@ RDEPEND="
 	bidi? (
 		dev-libs/fribidi
 		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
+		media-libs/harfbuzz:=
 		virtual/ttf-fonts
 	)
 	bluray? ( >=media-libs/libbluray-1.3.0:= )
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index f06e74d81047..eb5726772562 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -4,6 +4,8 @@ AUX wireplumber-0.4.2-lua-api-fix-object-constructors-to-fail-gracefully.patch 2
 AUX wireplumber-0.4.2-meson-Build-tests-conditionally.patch 1232 BLAKE2B f828160ff6e86f3a6b693a4e09fcc6f0647d742998777264483906d8974e294fa1fb9522d67c7a12c3893f6182a248cc14c50c785a50115d65a6f0779b615079 SHA512 b89c1519fb10c1b59ea8ed42f24cfff9b03c7024b33fb88ad8d5bfa57042ee6d1baf8f1a17e897b7da97b4fd4b91c04e7a66ee5105762a4ae690998145b20995
 AUX wireplumber-0.4.2-v4l-add-basic-check-for-nil-monitor.patch 1466 BLAKE2B bfbec8088c33d38a637cbdc517c1bad3b472b296c6302872cefaa444b1524248ce73b14aef3b9d1d7ef35528b46cadce8dd9a846c2e9b43d8b232f894c58a839 SHA512 4b654808c2e3c9b5b8f401d2874040e32efaa25bfb76cd5080c529c75922685e3466d570bd7278e2b6079f6fa28134e5b493f3d54c26d06993572f7aa08ce142
 DIST wireplumber-0.4.2.tar.gz 332499 BLAKE2B 4747ae405a824b019415188ff1a586d32fc2e97aba6777cd1e403aadf0e44458156d1f8b6dbc706b812a7ea8c873d0f506f2b42817d1bc5312874530edaf7234 SHA512 8ded43fba5de58068516558918d49c86be7d67330e8a14e735561fefadba5e27952d556987b7304dead52b4e2f72a7d9626da0170e768c4702dd164840b08e3c
+DIST wireplumber-0.4.4.tar.gz 346770 BLAKE2B cc2768db3a4f6f26a176c9fff759384fedb020c98540ecbe1e02e28a7f16fa3ecc4ec25de50a65021cabb4e5746c41c683b714e0bc5cf5003f2a7d9c9414516c SHA512 f8d764c1728c2e550fc41044a8ebbbeba27157540077648431796d7de5a04281df00d9742b04c6f76b50e446b2a723f2555520cb953d432f90b05148967de4ef
 EBUILD wireplumber-0.4.2-r1.ebuild 2581 BLAKE2B 95aad145ac9fb82a4264306c1035ffa7ec565f9dd73480020d42b30c87ca4e3a549deb37e5e458c24408ab4cdf03e9ebb98c259c921cb2b0636860aa524e17bc SHA512 6fae3994707b949385fb72f60c771563617fdb2e46e7d0e076b38c96bf7d6308f2c2fcc61cf94311a5786b1a9b1fff9dbac6bc06b7b8c0453848c0fe19cc2679
-EBUILD wireplumber-9999.ebuild 2194 BLAKE2B 7fa180a3b5c16004076a955e2973dd80f7704a88de1e9038911f82707850517d11a08e6e2c7d372eabab311f8dbbe7e43c3dee90df31e4c81334601056444bb1 SHA512 b37500fd4fa62152de475b3061d5759b3f5fa6085e0d3097598b90c9a30728d636d7418b9f69e5b9096f10758a816d98d7e594210dcfbf8222bb9fb668f04c3b
+EBUILD wireplumber-0.4.4.ebuild 2304 BLAKE2B e59f4b3c5d883183943fa465c06d057995c792feaae52b6a83e8596915f2953a757ab3addd67440b6bbd8ab44624dbb5bd70a90efa9a190612048695a20cb1d0 SHA512 51dabf46bbe405fbab21f0dead03d16f01c7b43ae2227823357028657bcfac3549eb8eee02e39d9e72dcb354ad7d0118d77a1e8a0eb34969bc648d052ff201c6
+EBUILD wireplumber-9999.ebuild 2304 BLAKE2B e59f4b3c5d883183943fa465c06d057995c792feaae52b6a83e8596915f2953a757ab3addd67440b6bbd8ab44624dbb5bd70a90efa9a190612048695a20cb1d0 SHA512 51dabf46bbe405fbab21f0dead03d16f01c7b43ae2227823357028657bcfac3549eb8eee02e39d9e72dcb354ad7d0118d77a1e8a0eb34969bc648d052ff201c6
 MISC metadata.xml 673 BLAKE2B 71a411815b61a970653e39cf33ef56e04268805b98d5d5fbc405f4739b71adee9137e0198bf4ebaad208b4e878ab3087766ee223e1e18aaff90fac14d2c5dc23 SHA512 ba6121c54e9f6208b0b5c471790b005c51105d479a0dd2464563b7320530b3d8c176ff38bdb6c760d3f31a18fb993647244d944a222991110f14508ce63c4a96
diff --git a/media-video/wireplumber/wireplumber-0.4.4.ebuild b/media-video/wireplumber/wireplumber-0.4.4.ebuild
new file mode 100644
index 000000000000..bcb971cdf84c
--- /dev/null
+++ b/media-video/wireplumber/wireplumber-0.4.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{3,4} )
+
+inherit lua-single meson systemd
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Replacement for pipewire-media-session"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
+
+LICENSE="MIT"
+SLOT="0/0.4"
+IUSE="elogind systemd test"
+
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	?? ( elogind systemd )
+"
+
+RESTRICT="!test? ( test )"
+
+# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building
+BDEPEND="
+	dev-libs/glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+"
+
+DEPEND="
+	${LUA_DEPS}
+	>=dev-libs/glib-2.62
+	>=media-video/pipewire-0.3.37
+	virtual/libc
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+
+# Any dev-lua/* deps get declared like this inside RDEPEND:
+#	$(lua_gen_cond_dep '
+#		dev-lua/<NAME>[${LUA_USEDEP}]
+#	')
+RDEPEND="${DEPEND}"
+
+DOCS=( {NEWS,README}.rst )
+
+src_configure() {
+	local emesonargs=(
+		-Dintrospection=disabled # Only used for Sphinx doc generation
+		-Dsystem-lua=true # We always unbundle everything we can
+		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
+		$(meson_feature elogind)
+		$(meson_feature systemd)
+		-Dsystemd-system-service=false # Matches upstream
+		$(meson_use systemd systemd-user-service)
+		-Dsystemd-system-unit-dir=$(systemd_get_systemunitdir)
+		-Dsystemd-user-unit-dir=$(systemd_get_userunitdir)
+		$(meson_use test tests)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if systemd_is_booted ; then
+		elog "To replace media-session with WirePlumber immediately:"
+		elog "systemctl --user disable --now pipewire-media-session.service"
+		elog "systemctl --user enable --now wireplumber.service"
+	else
+		elog "OpenRC users need to copy ${EROOT}/usr/share/pipewire/pipewire.conf"
+		elog "to ${EROOT}/etc/pipewire/pipewire.conf and in it replace"
+		elog "${EROOT}/usr/bin/pipewire-media-session with ${EROOT}/usr/bin/wireplumber"
+		elog "The switch to WirePlumber will happen the next time pipewire is started."
+	fi
+	elog
+}
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index 88f08ce12c07..bcb971cdf84c 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Replacement for pipewire-media-session"
@@ -21,9 +21,12 @@ HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
 
 LICENSE="MIT"
 SLOT="0/0.4"
-IUSE="systemd test"
+IUSE="elogind systemd test"
 
-REQUIRED_USE="${LUA_REQUIRED_USE}"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	?? ( elogind systemd )
+"
 
 RESTRICT="!test? ( test )"
 
@@ -37,8 +40,9 @@ BDEPEND="
 DEPEND="
 	${LUA_DEPS}
 	>=dev-libs/glib-2.62
-	>=media-video/pipewire-0.3.32
+	>=media-video/pipewire-0.3.37
 	virtual/libc
+	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
 "
 
@@ -55,6 +59,7 @@ src_configure() {
 		-Dintrospection=disabled # Only used for Sphinx doc generation
 		-Dsystem-lua=true # We always unbundle everything we can
 		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
+		$(meson_feature elogind)
 		$(meson_feature systemd)
 		-Dsystemd-system-service=false # Matches upstream
 		$(meson_use systemd systemd-user-service)
diff --git a/media-video/xvattr/Manifest b/media-video/xvattr/Manifest
index a46e55736a59..7b3c32867444 100644
--- a/media-video/xvattr/Manifest
+++ b/media-video/xvattr/Manifest
@@ -1,5 +1,5 @@
 AUX xvattr-1.3-gtk.patch 1255 BLAKE2B 471cfe05fbeaaa405771543d5c3b8900be848642724078a583321aa997b5e8c442894e6d2f6bf4ccb0eeed283f5f059b2be741c654c9a18f888034a105eb2eff SHA512 a81015dfa6c556d99e27765e9d793d1ab745925be212c8a3c21503ac73a6d7bbae5642e7cae067544578e7a1388968a354b759e72edcde1ccb0fa704c929e138
 AUX xvattr-1.3-pod-encoding.patch 303 BLAKE2B 127fa43fe4ab6586d30d85a685d98038f226f54286147c98fc4fa738cc996c2bb802cf8fa962bb9143dfc506d64243b1d3f8af5218705b24f0f435fff85f3256 SHA512 84be4a336efa6caffbacf15f2b68ddb1d6b60cc8212593662194d7a7df5891c6d5cefcb28c25412471e5e943359e6c4f076b77f9c92d1a93e084597d39697484
 DIST xvattr-1.3.tar.gz 82263 BLAKE2B 5e12c3001640c50294693eccf4e6b04c0e034634cc25a7be9e70dcd84c6da73e87be5a092ba4e9d9e5a70469d5018ac016d9812c2099bd68d35247ac6c522730 SHA512 f7b9f9f46961458be6aebfa5c40b28ab0757220ee5a20bcc3b635eaf6912afd7ca2ee9e9d0cfa1894e8ce6c97433e23f78f307fa216d16b5628b8b37202120a0
-EBUILD xvattr-1.3-r3.ebuild 770 BLAKE2B fcac1d11ea60af2b838fb9303c314f99ae4d01559e132c35022d963c7104af685f1ed0ff4bcf643a014d3758bc805869b7c3fc2fb7edd9cbaa8c69bae02d5d8f SHA512 4f2323510ba6bafacc719719d9bec4da5b002f028a9efec6107fd7fa13e0bc53fc03dbc62bb13b2d0093198440a140a9aa4903bb7c63207b135c74ecb080ae6a
+EBUILD xvattr-1.3-r3.ebuild 696 BLAKE2B 200a1c5318b14179733f60bb5fb2255fff69c8323482d6ab709e89c774ddb07b5b9e30952435406006b54d4b508d15819a18bd055a805b55e32e703a4ec495a1 SHA512 1b813172e152136528dadec79da8a6699517fb9bf5d369b6de3193405ecf93c478e058077159d0f07722e9ddef00d7f7e3a98e06c0d572448ac705c7a4b77209
 MISC metadata.xml 220 BLAKE2B 6f39345ea8474519439cc9768baf57bf07c0d8051eba252c30638ce35f30f8cbd1ecb06f7448893fa72ab9338630c83211fd366d66136b6ed090558fb376982c SHA512 3a2781821a74f9512a2b1fa55c8982a23f880b96b1707fdedf129d37685c2793eefe75a8080afe2bac64ed44d5f24648e6a25e163f87fe76a2b6be76b995647a
diff --git a/media-video/xvattr/xvattr-1.3-r3.ebuild b/media-video/xvattr/xvattr-1.3-r3.ebuild
index 54db3e63fb5a..7a16d54cbe19 100644
--- a/media-video/xvattr/xvattr-1.3-r3.ebuild
+++ b/media-video/xvattr/xvattr-1.3-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch autotools
+inherit autotools
 
 DESCRIPTION="X11 XVideo Querying/Setting Tool from Ogle project"
 HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd"
@@ -14,25 +14,25 @@ SLOT=0
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gtk"
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXv
 	x11-libs/libXext
 	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
-	x11-libs/libXt
-	virtual/pkgconfig"
+	x11-libs/libXt"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gtk.patch
+	"${FILESDIR}"/${P}-pod-encoding.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gtk.patch
-	epatch "${FILESDIR}"/${P}-pod-encoding.patch
+	default
 	eautoreconf
 }
 
 src_configure() {
 	econf $(use_with gtk)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 72cee8ab4908..635917e0fd15 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 1990ad495263..55124f1121c8 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 08 Oct 2021 21:09:13 +0000
+Wed, 20 Oct 2021 08:38:55 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 4f4cde27c1d1..b24bc440bcd9 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 517807 BLAKE2B 2ecdb63e9cfe1a1b71d23ab4fe58b057928be5a410ab9012b87ec1e7c917af227099229248e5b2c7dc5b25edb96e4adad920259d956349d0ecbb204178f8da2c SHA512 4ca9cc06a8ae7d4eefdd8a435b92f1f4e675295b618afdb11cf1d7f45b49f0fd5137f7f0c81b60933a8b942fe25de9928a9f4ffe0d5968bae8eae39c95a7da50
-TIMESTAMP 2021-10-08T21:09:18Z
+TIMESTAMP 2021-10-20T08:38:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFgs35fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFv1aNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAY+w//fmt+9j4hxozWWTni5exatWYnrKh6MTxDg70ybWw5/hwmI+kGc741xtDt
-l1SErb+gaCRnc3gGswZN1w2z/K6+nsZ9UUUZ8bQHo0CefjhUP4FubO51LCOzlIT0
-SRTgL4XychhBFGM4zRc/4WXFBApUGAJjteO2alBGq48I/mP/XX1wpEsoIsNQWL9A
-6XdX0GA7lMM6hSPTXMdajPg5X2MoqYkjvF7PVrLBm+AlHOTD8IuP07QTMJMR3mHi
-6EFyQYfARQ0E6JxDBEs8MNwoSFK5Ogpm1Fs1tzzmPgCCXGJnRz4WjiS465XYrI2M
-mdbvp9MpuVJ8655M7GUdY7RkjagV8eR6qkzyJIqbYHO3HsSzRltKP+CXsoKq8I8Y
-MJnNyKKXjaN1x2tXZl1k5uhzEoofDufq5LMMHJIx0JHlQFXlk49SVQ4NQy8wNcPJ
-lCb2NNWUHFEFxXjYN6GXAjBU1Nb1AEQCu1SJrEFjtUNOeTK1GFHhteD73LIYgg4I
-x1G8z9v2LS6JluvM7FoCnah8PAjBdhEDDV8+ZPthi1qfBYB80R5ggZnJqPwOIbFJ
-b/s1jhMPfraBaVKT858cqPWY5kob1ZK12F8hkGcRd+LAju812v/lqpNNWcJXNgL6
-zp3BvikGXx6/U+GMQQR40yJlfCpr6UfgRL7eAegAYBjEfNJbA2g=
-=NQfP
+klBAfRAAtIalTP1M09EGduaFhnPAvj2l4G3tZ8HAZvpgB/Z+Qwi1TTzTAlChlwQJ
+/ryMulE9+53Kc4qHGsQHabKuvqbIySX8sq++6S4n7xI5Lc6mPGZhQJovUa1zypSb
+OzVB8/80fteS8MjWG+6C5vvgeER2a4vo5CXUiiX1Sg4AgvDHAR3xWpeQ6H4VSHlb
+4oz2o8MFhvul8puTpfBuryzA2WFZ7JnynxDh2MXncGO2kthJJFEwscwmWTTM0uzc
+/YqGXOd6Vzs4rUQOsCjgKWVD4QoFLrb7rpjCBtf86sNCxwgl5zeSNJxUCG6HYDu2
+jv4LyGM22lwjN2b/TjsY8t3La7as4uK7kaHfQFN7Dw37gAb1F7YjlK/tUqd9cPwi
+h3dlrLqEPg1gXHsGLTxOtC6m36DUwnIFmn5IlhA11tWRGD9q5j8B2SwO4cS46vne
+JHwlaXH/Bdd5xzCY1ihJuTXEuO44Hb+wHwbFzO/hGndd68PGlk2VSVuPNJKXRyCH
+Qb6v3qe9jkD/wlvsEndfC3CLsUAmDaQQhK9cSv1wcHdy7qwMCMbBiewbeBhRdW6Q
+h+3lTR74zyRhtsQgPifk7/uGCBjq3OMN0Mcq+bZuTyFXMk3EalbtHtxLijnftGX3
+dFywc6SjnWyXz+LaGSNGm3NIfWeZb0AHakLfBVs8ijjerthjvQ0=
+=yeKL
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 1990ad495263..55124f1121c8 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 08 Oct 2021 21:09:13 +0000
+Wed, 20 Oct 2021 08:38:55 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a45d8422ab13..967f8e332003 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 76cbf804c074..089e56e27eb2 100644
--- a/metadata/md5-cache/acct-group/Manifest.gz
+++ b/metadata/md5-cache/acct-group/Manifest.gz
diff --git a/metadata/md5-cache/acct-group/seat-0 b/metadata/md5-cache/acct-group/seat-0
new file mode 100644
index 000000000000..74834717fc96
--- /dev/null
+++ b/metadata/md5-cache/acct-group/seat-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for sys-auth/seatd
+EAPI=8
+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
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=4ae11db7bbae3f95369f896c55debee9
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index b1052717ea8d..12cf2910e615 100644
--- a/metadata/md5-cache/acct-user/Manifest.gz
+++ b/metadata/md5-cache/acct-user/Manifest.gz
diff --git a/metadata/md5-cache/acct-user/fcron-0 b/metadata/md5-cache/acct-user/fcron-0
new file mode 100644
index 000000000000..b38aeabfced3
--- /dev/null
+++ b/metadata/md5-cache/acct-user/fcron-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for sys-process/fcron
+EAPI=7
+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
+RDEPEND=acct-group/fcron
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=60303e01aeee92417f612299f765953d
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 0dad09fe1fb4..0d303dd4f788 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/espeak-ng-1.50 b/metadata/md5-cache/app-accessibility/espeak-ng-1.50
index 9ed9c3b0f97f..4eecff01e9e3 100644
--- a/metadata/md5-cache/app-accessibility/espeak-ng-1.50
+++ b/metadata/md5-cache/app-accessibility/espeak-ng-1.50
@@ -5,10 +5,10 @@ DESCRIPTION=Software speech synthesizer for English, and some other languages
 EAPI=7
 HOMEPAGE=https://github.com/espeak-ng/espeak-ng
 IUSE=+async +klatt l10n_ru l10n_zh man mbrola +sound
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3+ Turkowski unicode
 RDEPEND=!app-accessibility/espeak mbrola? ( app-accessibility/mbrola ) sound? ( media-libs/pcaudiolib ) sound? ( media-sound/sox )
 SLOT=0
 SRC_URI=https://github.com/espeak-ng/espeak-ng/archive/1.50.tar.gz -> espeak-ng-1.50.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d7ae288d176c034eee3d46b220f3a7f9
+_md5_=b821bdf0784e3c8b96e1515eab27bf66
diff --git a/metadata/md5-cache/app-accessibility/espeakup-0.80 b/metadata/md5-cache/app-accessibility/espeakup-0.80
index ece39bd73e9e..b63f1a5110ad 100644
--- a/metadata/md5-cache/app-accessibility/espeakup-0.80
+++ b/metadata/md5-cache/app-accessibility/espeakup-0.80
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( app-accessibility/espeak[portaudio] app-accessibility/espeak[pulseaudio] )
 SLOT=0
 SRC_URI=https://github.com/williamh/espeakup/archive/v0.80.tar.gz -> espeakup-0.80.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=8eeee858b95b73e888464145f82aa477
diff --git a/metadata/md5-cache/app-accessibility/espeakup-0.90 b/metadata/md5-cache/app-accessibility/espeakup-0.90
index f0db62a76289..96098ea1ef0a 100644
--- a/metadata/md5-cache/app-accessibility/espeakup-0.90
+++ b/metadata/md5-cache/app-accessibility/espeakup-0.90
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=app-accessibility/espeak-ng[sound] media-libs/alsa-lib
 SLOT=0
 SRC_URI=https://github.com/linux-speakup/espeakup/archive/v0.90.tar.gz -> espeakup-0.90.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=09ec0296b9c6310926d5292c5004d609
diff --git a/metadata/md5-cache/app-accessibility/espeakup-9999 b/metadata/md5-cache/app-accessibility/espeakup-9999
index fb7c399e8bf0..9392ae307f95 100644
--- a/metadata/md5-cache/app-accessibility/espeakup-9999
+++ b/metadata/md5-cache/app-accessibility/espeakup-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=app-accessibility/espeak-ng[sound] media-libs/alsa-lib
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=14b588993f3413b5986888313ca58200
diff --git a/metadata/md5-cache/app-accessibility/kontrast-21.08.2 b/metadata/md5-cache/app-accessibility/kontrast-21.08.2
index 80d90eecf95f..392e0be887bb 100644
--- a/metadata/md5-cache/app-accessibility/kontrast-21.08.2
+++ b/metadata/md5-cache/app-accessibility/kontrast-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Tool to check contrast for colors to verify they are correctly acces
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kontrast/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kdeclarative-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kirigami-5.84.0:5 kde-plasma/xdg-desktop-portal-kde || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kontrast-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9270d88a18e2d5816fb58e191baecfe7
+_md5_=83afa1c026a0b3f88ff907b646af46b5
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 6f3805105587..90d270a3c9f3 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ansible-4.6.0 b/metadata/md5-cache/app-admin/ansible-4.6.0
new file mode 100644
index 000000000000..6093b4ac848d
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-4.6.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://www.ansible.com/
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=>=app-admin/ansible-base-2.11.1 <app-admin/ansible-base-2.12 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible/ansible-4.6.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ab0b2cfebc407d368a4d3dc372748fda
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.11.6 b/metadata/md5-cache/app-admin/ansible-base-2.11.6
new file mode 100644
index 000000000000..39b4cd56de9f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-base-2.11.6
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://www.ansible.com/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/sshpass virtual/ssh python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.11.6.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=213f59cbd459e3ce584ee84104535aac
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.28 b/metadata/md5-cache/app-admin/awscli-1.20.28
deleted file mode 100644
index c28cfbcb6f25..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.20.28
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.21.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=7
-HOMEPAGE=https://pypi.org/project/awscli/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.21.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.20.28.tar.gz -> awscli-1.20.28.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a1d34d6a3aa1066bda8901e9c3a3f674
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.40 b/metadata/md5-cache/app-admin/awscli-1.20.40
deleted file mode 100644
index 9578ac0c2852..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.20.40
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.21.40[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=7
-HOMEPAGE=https://pypi.org/project/awscli/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.21.40[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.20.40.tar.gz -> awscli-1.20.40.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.47 b/metadata/md5-cache/app-admin/awscli-1.20.47
deleted file mode 100644
index d7ae7447d12e..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.20.47
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/botocore-1.21.47[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://pypi.org/project/awscli/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.21.47[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.20.47.tar.gz -> awscli-1.20.47.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d449de323be56f12d4d81a4e80c8ed38
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.53 b/metadata/md5-cache/app-admin/awscli-1.20.53
index e199e97fe9d5..e25424697c58 100644
--- a/metadata/md5-cache/app-admin/awscli-1.20.53
+++ b/metadata/md5-cache/app-admin/awscli-1.20.53
@@ -4,7 +4,7 @@ DESCRIPTION=Universal Command Line Environment for AWS
 EAPI=8
 HOMEPAGE=https://pypi.org/project/awscli/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.21.53[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-cli/archive/1.20.53.tar.gz -> awscli-1.20.53.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=59aaa69aaac884c7da575bc3fd3a5e6e
+_md5_=2a8d2da2e3367b80b38c6fc94ed12c10
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.54 b/metadata/md5-cache/app-admin/awscli-1.20.54
deleted file mode 100644
index d7182c86bbc4..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.20.54
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/botocore-1.21.54[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://pypi.org/project/awscli/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.21.54[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.20.54.tar.gz -> awscli-1.20.54.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=59aaa69aaac884c7da575bc3fd3a5e6e
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.55 b/metadata/md5-cache/app-admin/awscli-1.20.55
deleted file mode 100644
index a07c7c662516..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.20.55
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/botocore-1.21.55[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://pypi.org/project/awscli/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.21.55[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.20.55.tar.gz -> awscli-1.20.55.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=59aaa69aaac884c7da575bc3fd3a5e6e
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.56 b/metadata/md5-cache/app-admin/awscli-1.20.56
deleted file mode 100644
index cc0e95fc0ebd..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.20.56
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/botocore-1.21.56[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://pypi.org/project/awscli/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.21.56[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.20.56.tar.gz -> awscli-1.20.56.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=59aaa69aaac884c7da575bc3fd3a5e6e
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.57 b/metadata/md5-cache/app-admin/awscli-1.20.57
deleted file mode 100644
index 0ead24b1e96c..000000000000
--- a/metadata/md5-cache/app-admin/awscli-1.20.57
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/botocore-1.21.57[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Universal Command Line Environment for AWS
-EAPI=8
-HOMEPAGE=https://pypi.org/project/awscli/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.21.57[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-cli/archive/1.20.57.tar.gz -> awscli-1.20.57.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=59aaa69aaac884c7da575bc3fd3a5e6e
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.60 b/metadata/md5-cache/app-admin/awscli-1.20.60
new file mode 100644
index 000000000000..62ee34ac2ebd
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.60
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/botocore-1.21.60[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.60[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.60.tar.gz -> awscli-1.20.60.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=59aaa69aaac884c7da575bc3fd3a5e6e
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.61 b/metadata/md5-cache/app-admin/awscli-1.20.61
new file mode 100644
index 000000000000..ee6fa1dc7f70
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.61
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/botocore-1.21.61[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.61[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.61.tar.gz -> awscli-1.20.61.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=59aaa69aaac884c7da575bc3fd3a5e6e
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.62 b/metadata/md5-cache/app-admin/awscli-1.20.62
new file mode 100644
index 000000000000..04a40a0c2a48
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.62
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/botocore-1.21.62[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.62[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.62.tar.gz -> awscli-1.20.62.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=59aaa69aaac884c7da575bc3fd3a5e6e
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.63 b/metadata/md5-cache/app-admin/awscli-1.20.63
new file mode 100644
index 000000000000..a67c2c2db6af
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.63
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/botocore-1.21.63[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.63[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.63.tar.gz -> awscli-1.20.63.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=59aaa69aaac884c7da575bc3fd3a5e6e
diff --git a/metadata/md5-cache/app-admin/awscli-1.20.64 b/metadata/md5-cache/app-admin/awscli-1.20.64
new file mode 100644
index 000000000000..9f876ed08598
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.20.64
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/botocore-1.21.64[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.64[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.20.64.tar.gz -> awscli-1.20.64.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=59aaa69aaac884c7da575bc3fd3a5e6e
diff --git a/metadata/md5-cache/app-admin/checksec-2.5.0 b/metadata/md5-cache/app-admin/checksec-2.5.0
new file mode 100644
index 000000000000..085966d170ff
--- /dev/null
+++ b/metadata/md5-cache/app-admin/checksec-2.5.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
+EAPI=7
+HOMEPAGE=https://github.com/slimm609/checksec.sh
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/slimm609/checksec.sh/archive/2.5.0.tar.gz -> checksec-2.5.0.tar.gz
+_md5_=6268249f876613658977027344f6a280
diff --git a/metadata/md5-cache/app-admin/clsync-0.4.5 b/metadata/md5-cache/app-admin/clsync-0.4.5
index 04107aa01a65..7acc80bac7a0 100644
--- a/metadata/md5-cache/app-admin/clsync-0.4.5
+++ b/metadata/md5-cache/app-admin/clsync-0.4.5
@@ -11,5 +11,5 @@ RDEPEND=caps? ( sys-libs/libcap ) cgroups? ( dev-libs/libcgroup ) clsync? ( dev-
 REQUIRED_USE=|| ( clsync socket-library ) || ( gio inotify ) mhash? ( cluster ) seccomp? ( caps )
 SLOT=0
 SRC_URI=https://github.com/clsync/clsync/archive/v0.4.5.tar.gz -> clsync-0.4.5.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6b16fe300954041b8a7ecd24b6a7763b
diff --git a/metadata/md5-cache/app-admin/clsync-9999 b/metadata/md5-cache/app-admin/clsync-9999
index 9f18a2f4fa9d..cba381478bee 100644
--- a/metadata/md5-cache/app-admin/clsync-9999
+++ b/metadata/md5-cache/app-admin/clsync-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=caps? ( sys-libs/libcap ) cgroups? ( dev-libs/libcgroup ) clsync? ( dev-libs/glib:2 ) mhash? ( app-crypt/mhash ) !app-doc/clsync-docs !dev-libs/libclsync
 REQUIRED_USE=|| ( clsync socket-library ) || ( gio inotify ) mhash? ( cluster ) seccomp? ( caps )
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c162b4f7f75e1902854e405b5a93d40
diff --git a/metadata/md5-cache/app-admin/conky-1.12.1-r1 b/metadata/md5-cache/app-admin/conky-1.12.1-r1
index ce2d5cc0d09b..100bc103acb1 100644
--- a/metadata/md5-cache/app-admin/conky-1.12.1-r1
+++ b/metadata/md5-cache/app-admin/conky-1.12.1-r1
@@ -11,5 +11,5 @@ RDEPEND=cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) ical? ( dev-libs/libi
 REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp ) nvidia? ( X ) truetype? ( X ) xinerama? ( X )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.12.1.tar.gz -> conky-1.12.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=db0d7837ba767499ad961b8bc2f61172
diff --git a/metadata/md5-cache/app-admin/conky-1.12.2 b/metadata/md5-cache/app-admin/conky-1.12.2
index f04d6977e9f5..662f4e26cdfe 100644
--- a/metadata/md5-cache/app-admin/conky-1.12.2
+++ b/metadata/md5-cache/app-admin/conky-1.12.2
@@ -11,5 +11,5 @@ RDEPEND=cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) ical? ( dev-libs/libi
 REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp ) nvidia? ( X ) truetype? ( X ) xinerama? ( X )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.12.2.tar.gz -> conky-1.12.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=12c6a0c30807682796bb3c9832a184ac
diff --git a/metadata/md5-cache/app-admin/consul-1.10.2 b/metadata/md5-cache/app-admin/consul-1.10.2
deleted file mode 100644
index e426655b6d4a..000000000000
--- a/metadata/md5-cache/app-admin/consul-1.10.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/consul acct-user/consul
-DESCRIPTION=A tool for service discovery, monitoring and configuration
-EAPI=7
-HOMEPAGE=https://www.consul.io
-KEYWORDS=~amd64
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
-RDEPEND=acct-group/consul acct-user/consul
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/consul/archive/v1.10.2.tar.gz -> consul-1.10.2.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.8.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.8.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.37.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.1.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.1.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.4.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.4.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.3.1.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.3.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.5.zip -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.zip mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.5.mod -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20210826001029-26ff87cf9493.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20210826001029-26ff87cf9493.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20210826001029-26ff87cf9493.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20210826001029-26ff87cf9493.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1-0.20210112042008-8ebf2d61a8b4.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1-0.20210112042008-8ebf2d61a8b4.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1-0.20210112042008-8ebf2d61a8b4.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1-0.20210112042008-8ebf2d61a8b4.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210410081132-afb366fc7cd1.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210410081132-afb366fc7cd1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201024232916-9f70ab9862d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.16.9.zip -> k8s.io%2Fapi%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/api/@v/v0.16.9.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.9.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/client-go/@v/v0.16.9.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=693f58fd87e4c8309d81c26b5dfd8c36
diff --git a/metadata/md5-cache/app-admin/consul-1.10.3 b/metadata/md5-cache/app-admin/consul-1.10.3
new file mode 100644
index 000000000000..9304770e52a8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.10.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/consul acct-user/consul
+DESCRIPTION=A tool for service discovery, monitoring and configuration
+EAPI=7
+HOMEPAGE=https://www.consul.io
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
+RDEPEND=acct-group/consul acct-user/consul
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul/archive/v1.10.3.tar.gz -> consul-1.10.3.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.8.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.8.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.37.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.1.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.1.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.4.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.4.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.4.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.3.1.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.3.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.5.zip -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.zip mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.5.mod -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20210826001029-26ff87cf9493.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20210826001029-26ff87cf9493.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20210826001029-26ff87cf9493.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20210826001029-26ff87cf9493.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1-0.20210112042008-8ebf2d61a8b4.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1-0.20210112042008-8ebf2d61a8b4.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1-0.20210112042008-8ebf2d61a8b4.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1-0.20210112042008-8ebf2d61a8b4.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210410081132-afb366fc7cd1.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210410081132-afb366fc7cd1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201024232916-9f70ab9862d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.16.9.zip -> k8s.io%2Fapi%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/api/@v/v0.16.9.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.9.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/client-go/@v/v0.16.9.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=693f58fd87e4c8309d81c26b5dfd8c36
diff --git a/metadata/md5-cache/app-admin/consul-1.8.16 b/metadata/md5-cache/app-admin/consul-1.8.16
new file mode 100644
index 000000000000..81c38c9f2636
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.8.16
@@ -0,0 +1,14 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/consul acct-user/consul
+DESCRIPTION=A tool for service discovery, monitoring and configuration
+EAPI=7
+HOMEPAGE=https://www.consul.io
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
+RDEPEND=acct-group/consul acct-user/consul
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul/archive/v1.8.16.tar.gz -> consul-1.8.16.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.37.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.1.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.1.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.1.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.4.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.4.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20210826001029-26ff87cf9493.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20210826001029-26ff87cf9493.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20210826001029-26ff87cf9493.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20210826001029-26ff87cf9493.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.9+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.9+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v2.20.9+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.9+incompatible.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201007082116-8445cc04cbdf.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201007082116-8445cc04cbdf.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.16.9.zip -> k8s.io%2Fapi%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/api/@v/v0.16.9.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.9.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/client-go/@v/v0.16.9.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9bbfc8ab2c69ce30b50edf646d3de743
diff --git a/metadata/md5-cache/app-admin/consul-1.9.10 b/metadata/md5-cache/app-admin/consul-1.9.10
new file mode 100644
index 000000000000..517839149eb0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.9.10
@@ -0,0 +1,14 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/consul acct-user/consul
+DESCRIPTION=A tool for service discovery, monitoring and configuration
+EAPI=7
+HOMEPAGE=https://www.consul.io
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
+RDEPEND=acct-group/consul acct-user/consul
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul/archive/v1.9.10.tar.gz -> consul-1.9.10.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.6.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.6.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.37.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.5.zip -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.zip mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.5.mod -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20210826001029-26ff87cf9493.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20210826001029-26ff87cf9493.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20210826001029-26ff87cf9493.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20210826001029-26ff87cf9493.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210410081132-afb366fc7cd1.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210410081132-afb366fc7cd1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201024232916-9f70ab9862d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.16.9.zip -> k8s.io%2Fapi%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/api/@v/v0.16.9.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.9.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/client-go/@v/v0.16.9.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e00aad07eb2873e2752f6f98d5b2ea68
diff --git a/metadata/md5-cache/app-admin/consul-1.9.9 b/metadata/md5-cache/app-admin/consul-1.9.9
deleted file mode 100644
index eeb1211a2f5a..000000000000
--- a/metadata/md5-cache/app-admin/consul-1.9.9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install unpack
-DEPEND=acct-group/consul acct-user/consul
-DESCRIPTION=A tool for service discovery, monitoring and configuration
-EAPI=7
-HOMEPAGE=https://www.consul.io
-KEYWORDS=~amd64
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
-RDEPEND=acct-group/consul acct-user/consul
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/consul/archive/v1.9.9.tar.gz -> consul-1.9.9.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.6.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.6.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.37.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.37.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20200423225030-a18a1cd20038.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20200423225030-a18a1cd20038.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.5.zip -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.zip mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.5.mod -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20200717191844-f687267c8086.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20200717191844-f687267c8086.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20200519221838-e0cfd64bc267.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20200519221838-e0cfd64bc267.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20210826001029-26ff87cf9493.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20210826001029-26ff87cf9493.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20210826001029-26ff87cf9493.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20210826001029-26ff87cf9493.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.20.10.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.20.10.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210410081132-afb366fc7cd1.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210410081132-afb366fc7cd1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201024232916-9f70ab9862d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.zip mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.16.9.zip -> k8s.io%2Fapi%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/api/@v/v0.16.9.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.9.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/client-go/@v/v0.16.9.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e00aad07eb2873e2752f6f98d5b2ea68
diff --git a/metadata/md5-cache/app-admin/consul-template-0.25.0 b/metadata/md5-cache/app-admin/consul-template-0.25.0
deleted file mode 100644
index ff9781760e40..000000000000
--- a/metadata/md5-cache/app-admin/consul-template-0.25.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=acct-group/consul-template acct-user/consul-template
-DESCRIPTION=Generic template rendering and notifications with Consul
-EAPI=7
-HOMEPAGE=https://github.com/hashicorp/consul-template
-KEYWORDS=~amd64
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2
-RDEPEND=acct-group/consul-template acct-user/consul-template
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/consul-template/archive/v0.25.0.tar.gz -> consul-template-0.25.0.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.4.0.zip -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.4.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-gatedio/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-gatedio/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.4.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.4.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.3.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.3.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20190730042357-746c0b111519.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20190730042357-746c0b111519.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20190730042357-746c0b111519.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20190730042357-746c0b111519.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20190730042320-0dc007d98cc8.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20190730042320-0dc007d98cc8.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20190730042320-0dc007d98cc8.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20190730042320-0dc007d98cc8.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.5.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.5.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.zip mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.2.5+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.5+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.2.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.zip mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b75500722d99fa9ccc9c445877e6212b
diff --git a/metadata/md5-cache/app-admin/consul-template-0.27.1 b/metadata/md5-cache/app-admin/consul-template-0.27.1
new file mode 100644
index 000000000000..35064286eeae
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-template-0.27.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=acct-group/consul-template acct-user/consul-template
+DESCRIPTION=Generic template rendering and notifications with Consul
+EAPI=7
+HOMEPAGE=https://github.com/hashicorp/consul-template
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2
+RDEPEND=acct-group/consul-template acct-user/consul-template
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul-template/archive/v0.27.1.tar.gz -> consul-template-0.27.1.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.2.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.2.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.4.0.zip -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.4.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.1-0.20200910203702-bb2b5dd871ca.zip -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.1-0.20200910203702-bb2b5dd871ca.zip mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.1-0.20200910203702-bb2b5dd871ca.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.1-0.20200910203702-bb2b5dd871ca.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-gatedio/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-gatedio/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.4.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.4.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20190730042357-746c0b111519.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20190730042357-746c0b111519.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.5-0.20190730042357-746c0b111519.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.5-0.20190730042357-746c0b111519.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20190730042320-0dc007d98cc8.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20190730042320-0dc007d98cc8.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.14-0.20190730042320-0dc007d98cc8.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.14-0.20190730042320-0dc007d98cc8.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.12.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.12.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.12.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.12.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.7.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.7.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=892332b3cdefeda162745e6f4f26578b
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-2.99.2 b/metadata/md5-cache/app-admin/eclean-kernel-2.99.2
deleted file mode 100644
index c7d23f745269..000000000000
--- a/metadata/md5-cache/app-admin/eclean-kernel-2.99.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( kernel_linux? ( dev-python/pymountboot[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Remove outdated built kernels
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/eclean-kernel/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=kernel_linux? ( dev-python/pymountboot[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mgorny/eclean-kernel/archive/v2.99.2.tar.gz -> eclean-kernel-2.99.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=95cbbeb9a478f754dafc8b8f1c293706
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-2.99.3 b/metadata/md5-cache/app-admin/eclean-kernel-2.99.3
index 46d083163d3e..722d517fe103 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-2.99.3
+++ b/metadata/md5-cache/app-admin/eclean-kernel-2.99.3
@@ -4,7 +4,7 @@ DESCRIPTION=Remove outdated built kernels
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/eclean-kernel/
 IUSE=lz4 lzo zstd test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=kernel_linux? ( dev-python/pymountboot[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) lz4? ( dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) lzo? ( dev-python/python-lzo[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) zstd? ( dev-python/zstandard[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/eclean-kernel/archive/v2.99.3.tar.gz -> eclean-kernel-2.99.3.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ab50afe6eb52a7588305f0d35d7ef48c
+_md5_=f1d3075c5d040fc28b2388c76c7a4a32
diff --git a/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1 b/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
deleted file mode 100644
index f355de0cba84..000000000000
--- a/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=app-arch/unzip dev-perl/DateTime dev-perl/Digest-CRC dev-perl/DateTime dev-perl/Carp-Assert dev-perl/Data-Hexify dev-lang/perl:=[-build(-)]
-DESCRIPTION=Read, decode and dump Windows Vista/2008/7 event log file
-EAPI=5
-HOMEPAGE=http://computer.forensikblog.de/en/topics/windows/vista_event_log
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip dev-perl/DateTime dev-perl/Digest-CRC dev-perl/DateTime dev-perl/Carp-Assert dev-perl/Data-Hexify dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://computer.forensikblog.de/files/evtx/Parse-Evtx-1.1.1.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fab8d9c3f3917bd54e96c78d303e49d5
diff --git a/metadata/md5-cache/app-admin/evtxtools-1.1.1-r2 b/metadata/md5-cache/app-admin/evtxtools-1.1.1-r2
new file mode 100644
index 000000000000..910ab91dfc5e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/evtxtools-1.1.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Digest-CRC dev-perl/DateTime dev-perl/Carp-Assert dev-perl/Data-Hexify app-arch/unzip virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Read, decode and dump Windows Vista/2008/7 event log file
+EAPI=8
+HOMEPAGE=http://computer.forensikblog.de/en/topics/windows/vista_event_log
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-perl/Digest-CRC dev-perl/DateTime dev-perl/Carp-Assert dev-perl/Data-Hexify dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://computer.forensikblog.de/files/evtx/Parse-Evtx-1.1.1.zip
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=6ce9bc75cf3aacf50f06e7644dfc5fe6
diff --git a/metadata/md5-cache/app-admin/exo-1.44.0 b/metadata/md5-cache/app-admin/exo-1.44.0
deleted file mode 100644
index cfa9a667591b..000000000000
--- a/metadata/md5-cache/app-admin/exo-1.44.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/go:=
-DESCRIPTION=Command-line tool for everything at Exoscale: compute, storage, dns.
-EAPI=7
-HOMEPAGE=https://github.com/exoscale/cli
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/exoscale/cli/archive/v1.44.0.tar.gz -> exo-1.44.0.tar.gz
-_md5_=a638813d2b712f85d21a976d47d1d5b9
diff --git a/metadata/md5-cache/app-admin/exo-1.45.1 b/metadata/md5-cache/app-admin/exo-1.45.1
new file mode 100644
index 000000000000..c4618e834510
--- /dev/null
+++ b/metadata/md5-cache/app-admin/exo-1.45.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/go:=
+DESCRIPTION=Command-line tool for everything at Exoscale: compute, storage, dns.
+EAPI=7
+HOMEPAGE=https://github.com/exoscale/cli
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/exoscale/cli/archive/v1.45.1.tar.gz -> exo-1.45.1.tar.gz
+_md5_=a638813d2b712f85d21a976d47d1d5b9
diff --git a/metadata/md5-cache/app-admin/filebeat-7.13.4 b/metadata/md5-cache/app-admin/filebeat-7.13.4
index d1764a7ad5b5..40ee84b9b09f 100644
--- a/metadata/md5-cache/app-admin/filebeat-7.13.4
+++ b/metadata/md5-cache/app-admin/filebeat-7.13.4
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install postinst prepare unpack
 DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
 EAPI=7
 HOMEPAGE=https://www.elastic.co/products/beats
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0 BSD-2 MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elastic/beats/archive/v7.13.4.tar.gz -> filebeat-7.13.4.tar.gz mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.zip -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.zip mirror://goproxy//4d63.com/embedfiles/@v/v0.0.0-20190311033909-995e0740726f.mod -> 4d63.com%2Fembedfiles%2F@v%2Fv0.0.0-20190311033909-995e0740726f.mod mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.zip -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.zip mirror://goproxy//4d63.com/tz/@v/v1.1.1-0.20191124060701-6d37baae851b.mod -> 4d63.com%2Ftz%2F@v%2Fv1.1.1-0.20191124060701-6d37baae851b.mod mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.zip -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.zip mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.zip -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.zip mirror://goproxy//code.cloudfoundry.org/go-diodes/@v/v0.0.0-20190809170250-f77fb823c7ee.mod -> code.cloudfoundry.org%2Fgo-diodes%2F@v%2Fv0.0.0-20190809170250-f77fb823c7ee.mod mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.zip -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.zip mirror://goproxy//code.cloudfoundry.org/go-loggregator/@v/v7.4.0+incompatible.mod -> code.cloudfoundry.org%2Fgo-loggregator%2F@v%2Fv7.4.0+incompatible.mod mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.zip -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.zip mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.mod -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.mod mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.zip -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.zip mirror://goproxy//code.cloudfoundry.org/rfc5424/@v/v0.0.0-20180905210152-236a6d29298a.mod -> code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.zip -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.zip mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.zip -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/!azure/azure-amqp-common-go/v3/@v/v3.0.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.zip -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.zip mirror://goproxy//github.com/!azure/azure-event-hubs-go/v3/@v/v3.1.2.mod -> github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.8.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.1.9.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.9.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v37.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.6.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.zip -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.zip mirror://goproxy//github.com/!azure/go-amqp/@v/v0.12.6.mod -> github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.6.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.6.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.6.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.6.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.zip -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.zip mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.zip -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.mod -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.zip -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.zip mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20170221213301-9f32b5905fd6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20170221213301-9f32b5905fd6.mod mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.zip -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.zip mirror://goproxy//github.com/adriansr/fsnotify/@v/v0.0.0-20180417234312-c9bbe1f46f1d.mod -> github.com%2Fadriansr%2Ffsnotify%2F@v%2Fv0.0.0-20180417234312-c9bbe1f46f1d.mod mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.zip -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.zip mirror://goproxy//github.com/adriansr/gopacket/@v/v1.1.18-0.20200327165309-dd62abfa8a41.mod -> github.com%2Fadriansr%2Fgopacket%2F@v%2Fv1.1.18-0.20200327165309-dd62abfa8a41.mod mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.zip -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.zip mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v1.27.1-0.20170612174108-0f3b54da6bdc.mod -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.mod mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.zip -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/akavel/rsrc/@v/v0.8.0.mod -> github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.zip -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.zip mirror://goproxy//github.com/andrewkroh/goja/@v/v0.0.0-20190128172624-dd2ac4456e20.mod -> github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.mod mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.zip -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.zip mirror://goproxy//github.com/andrewkroh/sys/@v/v0.0.0-20151128191922-287798fe3e43.mod -> github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.mod mirror://goproxy//github.com/antihax/optional/@v/v0.0.0-20180407024304-ca021399b1a6.zip -> github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.zip mirror://goproxy//github.com/antihax/optional/@v/v0.0.0-20180407024304-ca021399b1a6.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200820155224-be881fa6b91d.zip -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200820155224-be881fa6b91d.zip mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200820155224-be881fa6b91d.mod -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200820155224-be881fa6b91d.mod mirror://goproxy//github.com/apache/thrift/@v/v0.13.1-0.20200603211036-eac4d0c79a5f.zip -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.1-0.20200603211036-eac4d0c79a5f.zip mirror://goproxy//github.com/apache/thrift/@v/v0.13.1-0.20200603211036-eac4d0c79a5f.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.1-0.20200603211036-eac4d0c79a5f.mod mirror://goproxy//github.com/apoydence/eachers/@v/v0.0.0-20181020210610-23942921fe77.zip -> github.com%2Fapoydence%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.zip mirror://goproxy//github.com/apoydence/eachers/@v/v0.0.0-20181020210610-23942921fe77.mod -> github.com%2Fapoydence%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.zip -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.zip mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.zip -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.zip -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.6.0.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.zip -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.9.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/awslabs/goformation/v3/@v/v3.1.0.zip -> github.com%2Fawslabs%2Fgoformation%2Fv3%2F@v%2Fv3.1.0.zip mirror://goproxy//github.com/awslabs/goformation/v3/@v/v3.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.zip -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//github.com/awslabs/goformation/v4/@v/v4.1.0.mod -> github.com%2Fawslabs%2Fgoformation%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bi-zone/go-winio/@v/v0.4.15.zip -> github.com%2Fbi-zone%2Fgo-winio%2F@v%2Fv0.4.15.zip mirror://goproxy//github.com/bi-zone/go-winio/@v/v0.4.15.mod -> github.com%2Fbi-zone%2Fgo-winio%2F@v%2Fv0.4.15.mod mirror://goproxy//github.com/blakerouse/service/@v/v1.1.1-0.20200924160513-057808572ffa.zip -> github.com%2Fblakerouse%2Fservice%2F@v%2Fv1.1.1-0.20200924160513-057808572ffa.zip mirror://goproxy//github.com/blakerouse/service/@v/v1.1.1-0.20200924160513-057808572ffa.mod -> github.com%2Fblakerouse%2Fservice%2F@v%2Fv1.1.1-0.20200924160513-057808572ffa.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20150311145944-8bd4349a67f2.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.zip mirror://goproxy//github.com/bsm/sarama-cluster/@v/v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod -> github.com%2Fbsm%2Fsarama-cluster%2F@v%2Fv2.1.14-0.20180625083203-7e67d87a6b3f+incompatible.mod mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.zip -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.zip mirror://goproxy//github.com/cavaliercoder/badio/@v/v0.0.0-20160213150051-ce5280129e9e.mod -> github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9e.mod mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.zip -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.zip mirror://goproxy//github.com/cavaliercoder/go-rpm/@v/v0.0.0-20190131055624-7a9c54e3d83e.mod -> github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.zip -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.zip -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.zip mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190808214049-35bcce23fc5f.mod -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190808214049-35bcce23fc5f.mod mirror://goproxy//github.com/cloudfoundry/noaa/@v/v2.1.0+incompatible.zip -> github.com%2Fcloudfoundry%2Fnoaa%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/cloudfoundry/noaa/@v/v2.1.0+incompatible.mod -> github.com%2Fcloudfoundry%2Fnoaa%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.zip -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.zip mirror://goproxy//github.com/cloudfoundry/sonde-go/@v/v0.0.0-20171206171820-b33733203bb4.mod -> github.com%2Fcloudfoundry%2Fsonde-go%2F@v%2Fv0.0.0-20171206171820-b33733203bb4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.zip -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.zip mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.zip mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200107194136-26c1120b8d41.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.zip mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.zip -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.zip mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.zip -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.zip mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.zip mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.zip -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.zip mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.zip -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.mod -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.zip -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.zip mirror://goproxy//github.com/davecgh/go-xdr/@v/v0.0.0-20161123171359-e6a2ba005892.mod -> github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200206145737-bbfc9a55622e.zip -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.zip mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200206145737-bbfc9a55622e.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.zip -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.zip mirror://goproxy//github.com/devigned/tab/@v/v0.1.2-0.20190607222403-0c15cf42f9a2.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.mod mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.2007.3-0.20201012072640-f5a7e0a1c83b.zip -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.2007.3-0.20201012072640-f5a7e0a1c83b.zip mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.2007.3-0.20201012072640-f5a7e0a1c83b.mod -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.2007.3-0.20201012072640-f5a7e0a1c83b.mod mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.3-0.20200630154024-f66de99634de.zip -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.3-0.20200630154024-f66de99634de.zip mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.3-0.20200630154024-f66de99634de.mod -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.3-0.20200630154024-f66de99634de.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.zip -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.zip -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.zip mirror://goproxy//github.com/digitalocean/go-libvirt/@v/v0.0.0-20180301200012-6075ea3c39a1.mod -> github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.7-0.20171009020623-7632a260cbaf.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.7-0.20171009020623-7632a260cbaf.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.zip -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.zip mirror://goproxy//github.com/docker/engine/@v/v0.0.0-20191113042239-ea84732a7725.mod -> github.com%2Fdocker%2Fengine%2F@v%2Fv0.0.0-20191113042239-ea84732a7725.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.zip -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.zip mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.zip -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.zip mirror://goproxy//github.com/dop251/goja_nodejs/@v/v0.0.0-20171011081505-adff31b136e6.mod -> github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.zip -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.2.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.zip -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.zip mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.zip -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.zip -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.zip mirror://goproxy//github.com/eclipse/paho.mqtt.golang/@v/v1.2.1-0.20200121105743-0d940dd29fd2.mod -> github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.1-0.20200121105743-0d940dd29fd2.mod mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.zip -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.zip mirror://goproxy//github.com/elastic/dhcp/@v/v0.0.0-20200227161230-57ec251c7eb3.mod -> github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.mod mirror://goproxy//github.com/elastic/ecs/@v/v1.8.0.zip -> github.com%2Felastic%2Fecs%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/elastic/ecs/@v/v1.8.0.mod -> github.com%2Felastic%2Fecs%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/elastic/elastic-agent-client/v7/@v/v7.0.0-20210308165121-7dd05ee2b5a5.zip -> github.com%2Felastic%2Felastic-agent-client%2Fv7%2F@v%2Fv7.0.0-20210308165121-7dd05ee2b5a5.zip mirror://goproxy//github.com/elastic/elastic-agent-client/v7/@v/v7.0.0-20210308165121-7dd05ee2b5a5.mod -> github.com%2Felastic%2Felastic-agent-client%2Fv7%2F@v%2Fv7.0.0-20210308165121-7dd05ee2b5a5.mod mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.zip -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.zip mirror://goproxy//github.com/elastic/fsevents/@v/v0.0.0-20181029231046-e1d381a4d270.mod -> github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.mod mirror://goproxy//github.com/elastic/go-concert/@v/v0.1.0.zip -> github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/elastic/go-concert/@v/v0.1.0.mod -> github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/elastic/go-libaudit/v2/@v/v2.2.0.zip -> github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//github.com/elastic/go-libaudit/v2/@v/v2.2.0.mod -> github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/elastic/go-licenser/@v/v0.3.1.zip -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/elastic/go-licenser/@v/v0.3.1.mod -> github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.zip -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/elastic/go-lookslike/@v/v0.3.0.mod -> github.com%2Felastic%2Fgo-lookslike%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.zip -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/elastic/go-lumber/@v/v0.1.0.mod -> github.com%2Felastic%2Fgo-lumber%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.zip -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.zip mirror://goproxy//github.com/elastic/go-perf/@v/v0.0.0-20191212140718-9c656876f595.mod -> github.com%2Felastic%2Fgo-perf%2F@v%2Fv0.0.0-20191212140718-9c656876f595.mod mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.zip -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.zip mirror://goproxy//github.com/elastic/go-plugins-helpers/@v/v0.0.0-20200207104224-bdf17607b79f.mod -> github.com%2Felastic%2Fgo-plugins-helpers%2F@v%2Fv0.0.0-20200207104224-bdf17607b79f.mod mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.zip -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/elastic/go-seccomp-bpf/@v/v1.1.0.mod -> github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.8.zip -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/elastic/go-structform/@v/v0.0.8.mod -> github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.1.1.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.6.0.zip -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/elastic/go-sysinfo/@v/v1.6.0.mod -> github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.zip -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/elastic/go-txfile/@v/v0.0.7.mod -> github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.7.0.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.zip -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/elastic/go-ucfg/@v/v0.8.3.mod -> github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.0.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.zip -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/elastic/go-windows/@v/v1.0.1.mod -> github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/elastic/gosigar/@v/v0.14.1.zip -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/elastic/gosigar/@v/v0.14.1.mod -> github.com%2Felastic%2Fgosigar%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/elastic/sarama/@v/v1.19.1-0.20210120173147-5c8cb347d877.zip -> github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20210120173147-5c8cb347d877.zip mirror://goproxy//github.com/elastic/sarama/@v/v1.19.1-0.20210120173147-5c8cb347d877.mod -> github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20210120173147-5c8cb347d877.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.zip -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.zip mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.zip -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.10.2.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.2.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.10.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.2.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.zip -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.zip mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.zip -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.5-0.20190920104607-14974a1cf647.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.5-0.20190920104607-14974a1cf647.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.zip -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.zip mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.zip -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.zip mirror://goproxy//github.com/go-sourcemap/sourcemap/@v/v2.1.2+incompatible.mod -> github.com%2Fgo-sourcemap%2Fsourcemap%2F@v%2Fv2.1.2+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.7.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.7.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.7.mod mirror://goproxy//github.com/gobuffalo/here/@v/v0.6.0.zip -> github.com%2Fgobuffalo%2Fhere%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/gobuffalo/here/@v/v0.6.0.mod -> github.com%2Fgobuffalo%2Fhere%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.zip -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.zip mirror://goproxy//github.com/gocarina/gocsv/@v/v0.0.0-20170324095351-ffef3ffc77be.mod -> github.com%2Fgocarina%2Fgocsv%2F@v%2Fv0.0.0-20170324095351-ffef3ffc77be.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godror/godror/@v/v0.10.4.zip -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.zip mirror://goproxy//github.com/godror/godror/@v/v0.10.4.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.10.4.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.2-0.20190320160742-5135e617513b.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.2-0.20190320160742-5135e617513b.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.zip -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/gomodule/redigo/@v/v1.8.3.zip -> github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.8.3.zip mirror://goproxy//github.com/gomodule/redigo/@v/v1.8.3.mod -> github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.8.3.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.zip -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.zip mirror://goproxy//github.com/google/flatbuffers/@v/v1.7.2-0.20170925184458-7a6b2bf521e9.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521e9.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/licenseclassifier/@v/v0.0.0-20200402202327-879cb1424de0.zip -> github.com%2Fgoogle%2Flicenseclassifier%2F@v%2Fv0.0.0-20200402202327-879cb1424de0.zip mirror://goproxy//github.com/google/licenseclassifier/@v/v0.0.0-20200402202327-879cb1424de0.mod -> github.com%2Fgoogle%2Flicenseclassifier%2F@v%2Fv0.0.0-20200402202327-879cb1424de0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.zip -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.zip mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.zip -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20180427100037-88b0669f7d75.zip -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20180427100037-88b0669f7d75.zip mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20180427100037-88b0669f7d75.mod -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20180427100037-88b0669f7d75.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.13.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/h2non/filetype/@v/v1.1.1-0.20201130172452-f60988ab73d5.zip -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.1.1-0.20201130172452-f60988ab73d5.zip mirror://goproxy//github.com/h2non/filetype/@v/v1.1.1-0.20201130172452-f60988ab73d5.mod -> github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.1.1-0.20201130172452-f60988ab73d5.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/nomad/api/@v/v0.0.0-20200303134319-e31695b5bbe6.zip -> github.com%2Fhashicorp%2Fnomad%2Fapi%2F@v%2Fv0.0.0-20200303134319-e31695b5bbe6.zip mirror://goproxy//github.com/hashicorp/nomad/api/@v/v0.0.0-20200303134319-e31695b5bbe6.mod -> github.com%2Fhashicorp%2Fnomad%2Fapi%2F@v%2Fv0.0.0-20200303134319-e31695b5bbe6.mod mirror://goproxy//github.com/hectane/go-acl/@v/v0.0.0-20190604041725-da78bae5fc95.zip -> github.com%2Fhectane%2Fgo-acl%2F@v%2Fv0.0.0-20190604041725-da78bae5fc95.zip mirror://goproxy//github.com/hectane/go-acl/@v/v0.0.0-20190604041725-da78bae5fc95.mod -> github.com%2Fhectane%2Fgo-acl%2F@v%2Fv0.0.0-20190604041725-da78bae5fc95.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.zip -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.zip mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.4.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.4.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.zip -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.zip -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.zip -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.zip mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.2.1-0.20190826204134-d7d95172beb5.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.mod mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.zip -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.zip mirror://goproxy//github.com/joeshaw/multierror/@v/v0.0.0-20140124173710-69b34d4ec901.mod -> github.com%2Fjoeshaw%2Fmultierror%2F@v%2Fv0.0.0-20140124173710-69b34d4ec901.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.zip -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.2.2.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.2.2.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20190209210621-63e6d1acd3dd.zip -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20190209210621-63e6d1acd3dd.zip mirror://goproxy//github.com/josephspurrier/goversioninfo/@v/v0.0.0-20190209210621-63e6d1acd3dd.mod -> github.com%2Fjosephspurrier%2Fgoversioninfo%2F@v%2Fv0.0.0-20190209210621-63e6d1acd3dd.mod mirror://goproxy//github.com/jpillora/backoff/@v/v0.0.0-20180909062703-3050d21c67d7.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.zip -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.zip -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.6.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.6.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.6.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.6.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.zip -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.zip -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.0.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.11.0.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/kolide/osquery-go/@v/v0.0.0-20200604192029-b019be7063ac.zip -> github.com%2Fkolide%2Fosquery-go%2F@v%2Fv0.0.0-20200604192029-b019be7063ac.zip mirror://goproxy//github.com/kolide/osquery-go/@v/v0.0.0-20200604192029-b019be7063ac.mod -> github.com%2Fkolide%2Fosquery-go%2F@v%2Fv0.0.0-20200604192029-b019be7063ac.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.zip -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.0.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.zip mirror://goproxy//github.com/lib/pq/@v/v1.1.2-0.20190507191818-2ff3cb3adc01.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.2-0.20190507191818-2ff3cb3adc01.mod mirror://goproxy//github.com/magefile/mage/@v/v1.9.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/magefile/mage/@v/v1.11.0.zip -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/magefile/mage/@v/v1.11.0.mod -> github.com%2Fmagefile%2Fmage%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.1.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/markbates/pkger/@v/v0.17.0.zip -> github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.0.zip mirror://goproxy//github.com/markbates/pkger/@v/v0.17.0.mod -> github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.zip -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.zip mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.mod -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20191113090002-7c0f6868bffe.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20191113090002-7c0f6868bffe.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.9.0.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.15.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170116052023-ab25296c0f51.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.zip -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.zip mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.zip -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.zip mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.zip -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.zip -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.5.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.2.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20190228220655-ac19fd6e7483.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20190823105129-775207bd45b6.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20190823105129-775207bd45b6.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.zip -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.zip mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/otiai10/copy/@v/v1.2.0.zip -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/otiai10/copy/@v/v1.2.0.mod -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/otiai10/curr/@v/v0.0.0-20150429015615-9b4961190c95.mod -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.mod mirror://goproxy//github.com/otiai10/curr/@v/v1.0.0.zip -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/otiai10/curr/@v/v1.0.0.mod -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/otiai10/mint/@v/v1.3.0.mod -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/otiai10/mint/@v/v1.3.1.zip -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/otiai10/mint/@v/v1.3.1.mod -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.zip -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.mod -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160517101806-924dca7d15f0.zip -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160517101806-924dca7d15f0.zip mirror://goproxy//github.com/pierrre/gotestcover/@v/v0.0.0-20160517101806-924dca7d15f0.mod -> github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160517101806-924dca7d15f0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20170505043639-c605e284fe17.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20170505043639-c605e284fe17.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/poy/eachers/@v/v0.0.0-20181020210610-23942921fe77.zip -> github.com%2Fpoy%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.zip mirror://goproxy//github.com/poy/eachers/@v/v0.0.0-20181020210610-23942921fe77.mod -> github.com%2Fpoy%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.1-0.20190913103102-20428fa0bffc.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.1-0.20190913103102-20428fa0bffc.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190425082905-87a4384529e0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190425082905-87a4384529e0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.11.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.zip -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.zip mirror://goproxy//github.com/prometheus/prometheus/@v/v2.5.0+incompatible.mod -> github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20200313005456-10cdbea86bc0.zip -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20200313005456-10cdbea86bc0.zip mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20200313005456-10cdbea86bc0.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20200313005456-10cdbea86bc0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.zip -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.zip -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.zip mirror://goproxy//github.com/samuel/go-parser/@v/v0.0.0-20130731160455-ca8abbf65d0e.mod -> github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.mod mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.zip -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.zip mirror://goproxy//github.com/samuel/go-thrift/@v/v0.0.0-20140522043831-2187045faa54.mod -> github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.mod mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.zip -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.zip mirror://goproxy//github.com/sanathkr/go-yaml/@v/v0.0.0-20170819195128-ed9d249f429b.mod -> github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v0.0.0-20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv0.0.0-20170819201035-0056894fa522.mod mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.zip -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.zip mirror://goproxy//github.com/sanathkr/yaml/@v/v1.0.1-0.20170819201035-0056894fa522.mod -> github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.mod mirror://goproxy//github.com/santhosh-tekuri/jsonschema/@v/v1.2.4.zip -> github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/santhosh-tekuri/jsonschema/@v/v1.2.4.mod -> github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v3.20.12+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.20.12+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v3.20.12+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.20.12+incompatible.mod mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.1.5-0.20170601210322-f6abca593680.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.5-0.20170601210322-f6abca593680.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.zip -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.zip mirror://goproxy//github.com/tsg/go-daemon/@v/v0.0.0-20200207173439-e704b93fd89b.mod -> github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.mod mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20200626092518-2ab8e397a786.zip -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.zip mirror://goproxy//github.com/tsg/gopacket/@v/v0.0.0-20200626092518-2ab8e397a786.mod -> github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.8.zip -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/ugorji/go/@v/v1.1.8.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v1.1.8.zip -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/ugorji/go/codec/@v/v1.1.8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.zip mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200210123136-21b3cc8eb797.zip -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.zip mirror://goproxy//github.com/urso/diag/@v/v0.0.0-20200210123136-21b3cc8eb797.mod -> github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.mod mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.zip -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.zip mirror://goproxy//github.com/urso/go-bin/@v/v0.0.0-20180220135811-781c575c9f0e.mod -> github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.mod mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20190919040553-290c89e0c230.zip -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.zip mirror://goproxy//github.com/urso/magetools/@v/v0.0.0-20190919040553-290c89e0c230.mod -> github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.mod mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.zip -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.zip mirror://goproxy//github.com/urso/qcgen/@v/v0.0.0-20180131103024-0b059e7db4f4.mod -> github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.mod mirror://goproxy//github.com/urso/sderr/@v/v0.0.0-20200210124243-c2a16f3d43ec.zip -> github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.zip mirror://goproxy//github.com/urso/sderr/@v/v0.0.0-20200210124243-c2a16f3d43ec.mod -> github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.mod mirror://goproxy//github.com/vbatts/tar-split/@v/v0.11.1.zip -> github.com%2Fvbatts%2Ftar-split%2F@v%2Fv0.11.1.zip mirror://goproxy//github.com/vbatts/tar-split/@v/v0.11.1.mod -> github.com%2Fvbatts%2Ftar-split%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.0.0-20170802214208-2cad15190b41.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.zip -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.zip -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20190905194746-02993c407bfb.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20190905194746-02993c407bfb.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20181112162635-ac52e6811b56.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.zip -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.zip mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.zip -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.zip mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20170403160031-b402f3114ec7.mod -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.mod mirror://goproxy//go.elastic.co/apm/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/apm/@v/v1.8.1-0.20200909061013-2aef45b9cf4b.zip -> go.elastic.co%2Fapm%2F@v%2Fv1.8.1-0.20200909061013-2aef45b9cf4b.zip mirror://goproxy//go.elastic.co/apm/@v/v1.8.1-0.20200909061013-2aef45b9cf4b.mod -> go.elastic.co%2Fapm%2F@v%2Fv1.8.1-0.20200909061013-2aef45b9cf4b.mod mirror://goproxy//go.elastic.co/apm/module/apmelasticsearch/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/module/apmelasticsearch/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/apm/module/apmhttp/@v/v1.7.2.zip -> go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.zip mirror://goproxy//go.elastic.co/apm/module/apmhttp/@v/v1.7.2.mod -> go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.mod mirror://goproxy//go.elastic.co/ecszap/@v/v0.3.0.zip -> go.elastic.co%2Fecszap%2F@v%2Fv0.3.0.zip mirror://goproxy//go.elastic.co/ecszap/@v/v0.3.0.mod -> go.elastic.co%2Fecszap%2F@v%2Fv0.3.0.mod mirror://goproxy//go.elastic.co/fastjson/@v/v1.0.0.mod -> go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.mod mirror://goproxy//go.elastic.co/fastjson/@v/v1.1.0.zip -> go.elastic.co%2Ffastjson%2F@v%2Fv1.1.0.zip mirror://goproxy//go.elastic.co/fastjson/@v/v1.1.0.mod -> go.elastic.co%2Ffastjson%2F@v%2Fv1.1.0.mod mirror://goproxy//go.elastic.co/go-licence-detector/@v/v0.4.0.zip -> go.elastic.co%2Fgo-licence-detector%2F@v%2Fv0.4.0.zip mirror://goproxy//go.elastic.co/go-licence-detector/@v/v0.4.0.mod -> go.elastic.co%2Fgo-licence-detector%2F@v%2Fv0.4.0.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.4.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.4.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.zip -> go.opencensus.io%2F@v%2Fv0.22.2.zip mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.zip -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.zip mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.zip -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.zip mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191002035440-2ec189313ef0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191021144547-ec77196f6094.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191021144547-ec77196f6094.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190130055435-99b60b757ec1.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180810173357-98c5dad5d1a0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180810173357-98c5dad5d1a0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180815093151-14742f9018cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180815093151-14742f9018cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190204203706-41f3e6584952.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190204203706-41f3e6584952.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190529164535-6a60838ec259.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190529164535-6a60838ec259.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191025021431-6c3a3bfe00ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191025021431-6c3a3bfe00ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200102141924-c96a22e43c9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200622214017-ed371f2e16b4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200622214017-ed371f2e16b4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201009025420-dfb3f7c4e634.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210308170721-88b6017d0656.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210308170721-88b6017d0656.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210308170721-88b6017d0656.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210308170721-88b6017d0656.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200602230032-c00d67ef29d0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200602230032-c00d67ef29d0.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200602230032-c00d67ef29d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200602230032-c00d67ef29d0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.zip mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190927181202-20e1ac93f88c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190927181202-20e1ac93f88c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200902074654-038fdea0a05b.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200902074654-038fdea0a05b.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.zip -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.zip mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/aescts.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.zip -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.zip mirror://goproxy//gopkg.in/jcmturner/dnsutils.v1/@v/v1.0.1.mod -> gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.mod mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.zip -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.mod -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.5.0.zip -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.zip mirror://goproxy//gopkg.in/jcmturner/gokrb5.v7/@v/v7.5.0.mod -> gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.mod mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.zip -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip mirror://goproxy//gopkg.in/jcmturner/rpc.v1/@v/v1.1.0.mod -> gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20160818020120-3f83fa500528.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/gotestsum/@v/v0.6.0.zip -> gotest.tools%2Fgotestsum%2F@v%2Fv0.6.0.zip mirror://goproxy//gotest.tools/gotestsum/@v/v0.6.0.mod -> gotest.tools%2Fgotestsum%2F@v%2Fv0.6.0.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.zip -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.mod -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.mod mirror://goproxy//k8s.io/api/@v/v0.19.4.zip -> k8s.io%2Fapi%2F@v%2Fv0.19.4.zip mirror://goproxy//k8s.io/api/@v/v0.19.4.mod -> k8s.io%2Fapi%2F@v%2Fv0.19.4.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.19.4.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.4.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.19.4.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.4.mod mirror://goproxy//k8s.io/client-go/@v/v0.19.4.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.19.4.zip mirror://goproxy//k8s.io/client-go/@v/v0.19.4.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.19.4.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.zip -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.zip mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200805222855-6aeccd4b50c6.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200805222855-6aeccd4b50c6.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200805222855-6aeccd4b50c6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200805222855-6aeccd4b50c6.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.zip -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.zip mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200729134348-d5654de09c73.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200729134348-d5654de09c73.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.zip -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.zip mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.1.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.1.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.1.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.1.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
 _eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61
-_md5_=25f1867cecef458838ad91fb6cbbe13c
+_md5_=f88aa514ffadb4064c7721bfc462a7c8
diff --git a/metadata/md5-cache/app-admin/fluentd-1.4.2 b/metadata/md5-cache/app-admin/fluentd-1.4.2
index 0fe644c11d24..d2dac52c2bcf 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.4.2
+++ b/metadata/md5-cache/app-admin/fluentd-1.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fluentd-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=1e0e2ea87c4b6f798c734b2178d1067d
diff --git a/metadata/md5-cache/app-admin/fluentd-1.9.0 b/metadata/md5-cache/app-admin/fluentd-1.9.0
index f52726233524..26924398c63e 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.9.0
+++ b/metadata/md5-cache/app-admin/fluentd-1.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fluentd-1.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=58de2647fdcee221e1fbd2ca12994654
diff --git a/metadata/md5-cache/app-admin/helm-3.7.0 b/metadata/md5-cache/app-admin/helm-3.7.0
index 5bc579fdbd21..4066163030d9 100644
--- a/metadata/md5-cache/app-admin/helm-3.7.0
+++ b/metadata/md5-cache/app-admin/helm-3.7.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install prepare unpack
 DESCRIPTION=Kubernetes Package Manager
 EAPI=8
 HOMEPAGE=https://github.com/helm/helm https://helm.sh
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/helm/helm/archive/v3.7.0.tar.gz -> helm-3.7.0.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.72.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.74.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.78.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.79.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.81.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.81.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.2.1+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20210608223527-2377c96fe795.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210608223527-2377c96fe795.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20210617225240-d185dfc1b5a1.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210617225240-d185dfc1b5a1.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20210617225240-d185dfc1b5a1.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210617225240-d185dfc1b5a1.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.8.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.18.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.18.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.5.0.zip -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.5.0.mod -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.1.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.1.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.1.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.1.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.1.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.1.mod mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.zip -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.zip mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.mod -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.mod mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.2.2.zip -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.2.2.zip mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.2.2.mod -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.2.2.mod mirror://goproxy//github.com/!masterminds/squirrel/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/squirrel/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/vcs/@v/v1.13.1.zip -> github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.1.zip mirror://goproxy//github.com/!masterminds/vcs/@v/v1.13.1.mod -> github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.1.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16-0.20201130162521-d1ffc52c7331.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210211115548-6eac466e5fa3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210324224401-5516f17a5958.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210324224401-5516f17a5958.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7-0.20190325164909-8abdbb8205e4.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7-0.20190325164909-8abdbb8205e4.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.9.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.15.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.15.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.16.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.16.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.18.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.18.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.18.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.18.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20201218223536-d3e5debf77da.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20201218223536-d3e5debf77da.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20210227013316-43a75bb4edd3.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20210227013316-43a75bb4edd3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.zip -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.zip mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.mod -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.mod -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod mirror://goproxy//github.com/antihax/optional/@v/v1.0.0.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20200428143746-21a406dcc535.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200428143746-21a406dcc535.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20200428143746-21a406dcc535.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200428143746-21a406dcc535.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.9.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.9.mod mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.3.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20160804104726-4c0e84591b9a.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.zip -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.mod -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.4.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v0.4.1.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v1.0.0.zip -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v1.0.0.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.mod mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.zip -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.zip mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.mod -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.zip -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.zip mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.mod -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.zip -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.zip mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.mod -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20191021191039-0944d244cd40.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20191021191039-0944d244cd40.mod mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20200922220541-2c3bb06c6054.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20200922220541-2c3bb06c6054.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.1.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200702112145-1c8d4c9ef775.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.2.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.4.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200629203442-efcf912fb354.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20200714090401-bf6692d28da5.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20200714090401-bf6692d28da5.mod mirror://goproxy//github.com/cockroachdb/errors/@v/v1.2.4.mod -> github.com%2Fcockroachdb%2Ferrors%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/cockroachdb/logtags/@v/v0.0.0-20190617123548-eb05cc24525f.mod -> github.com%2Fcockroachdb%2Flogtags%2F@v%2Fv0.0.0-20190617123548-eb05cc24525f.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20200908144142-dab0cbea06f4.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20200908144142-dab0cbea06f4.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20201003224125-76a6863f2989.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20201003224125-76a6863f2989.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20210316121734-20793ff83c97.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20210316121734-20793ff83c97.mod mirror://goproxy//github.com/containerd/aufs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20201111183144-404b9149801e.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20210316141732-918d888fb676.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20210316141732-918d888fb676.mod mirror://goproxy//github.com/containerd/btrfs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190717030353-c4b9ac5c7601.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190717030353-c4b9ac5c7601.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200710171044-318312a37340.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200824123100-0b889c03f102.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200824123100-0b889c03f102.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20210114181951-8a68de567b68.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20210114181951-8a68de567b68.mod mirror://goproxy//github.com/containerd/cgroups/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/cgroups/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20181022165439-0650fd9eeb50.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20181022165439-0650fd9eeb50.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191206165004-02ecf6a7291e.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.2.10.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.2.10.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.1-0.20191213020239-082f7e3aed57.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.0-beta.2.0.20200729163537-40b22ef07410.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.0-beta.2.0.20200729163537-40b22ef07410.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.4.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.4.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-rc.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-rc.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.4.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.4.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.5.4.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.4.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190815185530-f2a389ac0a02.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190815185530-f2a389ac0a02.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20191127005431-f65d91d395eb.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20191127005431-f65d91d395eb.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200710164510-efbc4488d8fe.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20201208142359-180525291bb7.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20201208142359-180525291bb7.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20210208174643-50096c924a4e.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20210208174643-50096c924a4e.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.1.0.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.1.0.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20180307165137-3d5202aec260.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20180307165137-3d5202aec260.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20200410184934-f15a3290365b.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20201026212402-0724c46b320c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20201026212402-0724c46b320c.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20210316144830-115abcc95a1d.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20210316144830-115abcc95a1d.mod mirror://goproxy//github.com/containerd/fifo/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20190911050354-e029b79d8cda.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20190911050354-e029b79d8cda.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20201020171139-16b287bc67d0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20201020171139-16b287bc67d0.mod mirror://goproxy//github.com/containerd/go-runc/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.4-0.20210301171431-0ae5c75f59ba.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.4-0.20210301171431-0ae5c75f59ba.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1-0.20210312161619-7ed62a527887.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1-0.20210312161619-7ed62a527887.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/containerd/nri/@v/v0.0.0-20201007170849-eb1350a75164.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20201007170849-eb1350a75164.mod mirror://goproxy//github.com/containerd/nri/@v/v0.0.0-20210316161719-dbaa18c31c14.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20210316161719-dbaa18c31c14.mod mirror://goproxy//github.com/containerd/nri/@v/v0.1.0.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828172938-92c8520ef9f8.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828172938-92c8520ef9f8.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20191028202541-4f1b8fe65a5c.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20191028202541-4f1b8fe65a5c.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20190911142611-5eb25027c9fd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190911142611-5eb25027c9fd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20200918131355-0a33824f23a2.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20200918131355-0a33824f23a2.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20210301145711-11e8f1707f62.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210301145711-11e8f1707f62.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20210315114300-dde8f0fda960.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210315114300-dde8f0fda960.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20210324211415-d5c4544f0433.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210324211415-d5c4544f0433.mod mirror://goproxy//github.com/containerd/zfs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.9.1.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.0.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.0.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.5.0.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20161114122254-48702e0da86b.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20161114122254-48702e0da86b.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.2.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.11.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.11.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.mod -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.mod -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.mod -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.mod -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.9.0.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20190125010748-a747050bb1ba.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20170104182250-a601269ab70c.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/distribution/distribution/v3/@v/v3.0.0-20210804104954-38ab4c606ee3.zip -> github.com%2Fdistribution%2Fdistribution%2Fv3%2F@v%2Fv3.0.0-20210804104954-38ab4c606ee3.zip mirror://goproxy//github.com/distribution/distribution/v3/@v/v3.0.0-20210804104954-38ab4c606ee3.mod -> github.com%2Fdistribution%2Fdistribution%2Fv3%2F@v%2Fv3.0.0-20210804104954-38ab4c606ee3.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/cli/@v/v20.10.7+incompatible.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.7+incompatible.zip mirror://goproxy//github.com/docker/cli/@v/v20.10.7+incompatible.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.7+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20190905152932-14b96e55d84c.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20190905152932-14b96e55d84c.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible.mod mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.zip -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.zip mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.mod -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20170721190031-9461782956ad.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20170721190031-9461782956ad.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.zip -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.zip mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.0-20180209012529-399ea8c73916.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.zip -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.zip mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.7.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210217033140-668b12f5399d.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.11.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.11.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.11.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.11.0+incompatible.mod mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.zip -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.mod -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/felixge/httpsnoop/@v/v1.0.1.zip -> github.com%2Ffelixge%2Fhttpsnoop%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/felixge/httpsnoop/@v/v1.0.1.mod -> github.com%2Ffelixge%2Fhttpsnoop%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.3+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.3+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.3+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.3+incompatible.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/fullsailor/pkcs7/@v/v0.0.0-20190404230743-d7302db945fa.mod -> github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.mod mirror://goproxy//github.com/fvbommel/sortorder/@v/v1.0.1.mod -> github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.zip -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.zip mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.mod -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.zip -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/log/@v/v0.1.0.mod -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.14.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.14.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobuffalo/logger/@v/v1.0.3.zip -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/gobuffalo/logger/@v/v1.0.3.mod -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v1.0.0.zip -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/gobuffalo/packd/@v/v1.0.0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.8.1.zip -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.8.1.zip mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.8.1.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.8.1.mod mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.zip -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.mod -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20151105175453-c7fdd8b5cd55.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20151105175453-c7fdd8b5cd55.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod mirror://goproxy//github.com/godror/godror/@v/v0.24.2.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.24.2.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.8.0.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.8.0.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.2.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/mock/@v/v1.5.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.mod mirror://goproxy//github.com/gomodule/redigo/@v/v1.8.2.zip -> github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.8.2.zip mirror://goproxy//github.com/gomodule/redigo/@v/v1.8.2.mod -> github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.8.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/btree/@v/v1.0.1.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/google/btree/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201023163331-3e6fc7fc9c4c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201203190320-1bf35d6f28c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210122040257-d980be63207e.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210226084205-cbba55b83ad5.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.5.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.5.5.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.5.5.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/handlers/@v/v0.0.0-20150720190736-60c7bfde3e33.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod mirror://goproxy//github.com/gorilla/handlers/@v/v1.5.1.zip -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/gorilla/handlers/@v/v1.5.1.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gosuri/uitable/@v/v0.0.4.zip -> github.com%2Fgosuri%2Fuitable%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/gosuri/uitable/@v/v0.0.4.mod -> github.com%2Fgosuri%2Fuitable%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.3.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.16.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.1.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.10.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.10.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.mod -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.3.1.zip -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.3.1.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.2.2.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.zip -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.mod -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.8.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.8.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.8.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.8.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.3.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.13.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.13.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.11.13.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.13.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kortschak/utter/@v/v1.0.1.mod -> github.com%2Fkortschak%2Futter%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/lann/builder/@v/v0.0.0-20180802200727-47ae307949d0.zip -> github.com%2Flann%2Fbuilder%2F@v%2Fv0.0.0-20180802200727-47ae307949d0.zip mirror://goproxy//github.com/lann/builder/@v/v0.0.0-20180802200727-47ae307949d0.mod -> github.com%2Flann%2Fbuilder%2F@v%2Fv0.0.0-20180802200727-47ae307949d0.mod mirror://goproxy//github.com/lann/ps/@v/v0.0.0-20150810152359-62de8c46ede0.zip -> github.com%2Flann%2Fps%2F@v%2Fv0.0.0-20150810152359-62de8c46ede0.zip mirror://goproxy//github.com/lann/ps/@v/v0.0.0-20150810152359-62de8c46ede0.mod -> github.com%2Flann%2Fps%2F@v%2Fv0.0.0-20150810152359-62de8c46ede0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.10.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.10.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.zip -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.mod -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.mod -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.5.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.5.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.mod mirror://goproxy//github.com/markbates/errx/@v/v1.1.0.zip -> github.com%2Fmarkbates%2Ferrx%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/markbates/errx/@v/v1.1.0.mod -> github.com%2Fmarkbates%2Ferrx%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/markbates/oncer/@v/v1.0.0.zip -> github.com%2Fmarkbates%2Foncer%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/markbates/oncer/@v/v1.0.0.mod -> github.com%2Fmarkbates%2Foncer%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/markbates/safe/@v/v1.0.1.zip -> github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/markbates/safe/@v/v1.0.1.mod -> github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/marstr/guid/@v/v1.1.0.mod -> github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-oci8/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-oci8%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.11.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.11.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.11.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.11.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.6.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.6.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.6.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.6.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.mod -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.1.1.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.1.1.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.zip -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.zip mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.mod -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/locker/@v/v1.0.1.zip -> github.com%2Fmoby%2Flocker%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/moby/locker/@v/v1.0.1.mod -> github.com%2Fmoby%2Flocker%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/spdystream/@v/v0.2.0.zip -> github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/moby/spdystream/@v/v0.2.0.mod -> github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.0.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/moby/sys/symlink/@v/v0.1.0.mod -> github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20210610120745-9d4ed1856297.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20210610120745-9d4ed1856297.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20210610120745-9d4ed1856297.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20210610120745-9d4ed1856297.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/monochromegane/go-gitignore/@v/v0.0.0-20200626010858-205db1a8cc00.zip -> github.com%2Fmonochromegane%2Fgo-gitignore%2F@v%2Fv0.0.0-20200626010858-205db1a8cc00.zip mirror://goproxy//github.com/monochromegane/go-gitignore/@v/v0.0.0-20200626010858-205db1a8cc00.mod -> github.com%2Fmonochromegane%2Fgo-gitignore%2F@v%2Fv0.0.0-20200626010858-205db1a8cc00.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20151202141238-7f8ab55aaf3b.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20151007035656-2152b45fa28a.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20170106003457-a6d0ee40d420.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.1.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc93.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc93.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2-0.20190207185410-29686dbc5559.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20190207185410-29686dbc5559.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200929063507-e6143ca7d51d.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.6.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.1.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.3.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.zip -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.zip mirror://goproxy//github.com/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.mod -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.10.1.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.0.0-20180209125602-c332b6f63c06.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20171117100541-99fa1f4be8e5.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180110214958-89604d197083.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.5.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/rubenv/sql-migrate/@v/v0.0.0-20210614095031-55d5740dbbcc.zip -> github.com%2Frubenv%2Fsql-migrate%2F@v%2Fv0.0.0-20210614095031-55d5740dbbcc.zip mirror://goproxy//github.com/rubenv/sql-migrate/@v/v0.0.0-20210614095031-55d5740dbbcc.mod -> github.com%2Frubenv%2Fsql-migrate%2F@v%2Fv0.0.0-20210614095031-55d5740dbbcc.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.5.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.6.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.6.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.2.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.2.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.8.1.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/stefanberger/go-pkcs11uri/@v/v0.0.0-20201008174630-78d3cae3a980.mod -> github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.mod mirror://goproxy//github.com/stoewer/go-strcase/@v/v1.2.0.mod -> github.com%2Fstoewer%2Fgo-strcase%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.0.0-20180129172003-8a3f7159479f.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.0.0-20180129172003-8a3f7159479f.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20180303142811-b89eecf5ca5d.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20180303142811-b89eecf5ca5d.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20201229170055-e5319fda7802.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20201229170055-e5319fda7802.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20181108222139-023a6dafdcdf.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.1-0.20201029203352-d40f9887b852.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.1-0.20201029203352-d40f9887b852.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11-0.20200630133818-d5bec3311243.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v1.2.0.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v1.2.0.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20181112141820-a009c3971eca.zip -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20181112141820-a009c3971eca.zip mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20181112141820-a009c3971eca.mod -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20181112141820-a009c3971eca.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.zip -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.zip mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.mod -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.zip -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.zip mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.mod -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.zip -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.zip mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.mod -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod mirror://goproxy//github.com/ziutek/mymysql/@v/v1.5.4.zip -> github.com%2Fziutek%2Fmymysql%2F@v%2Fv1.5.4.zip mirror://goproxy//github.com/ziutek/mymysql/@v/v1.5.4.mod -> github.com%2Fziutek%2Fmymysql%2F@v%2Fv1.5.4.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.6.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.6.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod mirror://goproxy//go.etcd.io/etcd/api/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/client/pkg/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fpkg%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/client/v2/@v/v2.305.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fv2%2F@v%2Fv2.305.0.mod mirror://goproxy//go.etcd.io/etcd/client/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/pkg/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fpkg%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/raft/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fraft%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/server/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fserver%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.mod -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.zip -> go.opencensus.io%2F@v%2Fv0.23.0.zip mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.opentelemetry.io/contrib/@v/v0.20.0.mod -> go.opentelemetry.io%2Fcontrib%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/@v/v0.20.0.mod -> go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fgoogle.golang.org%2Fgrpc%2Fotelgrpc%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/@v/v0.20.0.mod -> go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fnet%2Fhttp%2Fotelhttp%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/exporters/otlp/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fexporters%2Fotlp%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/export/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2Fexport%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/proto/otlp/@v/v0.7.0.mod -> go.opentelemetry.io%2Fproto%2Fotlp%2F@v%2Fv0.7.0.mod mirror://goproxy//go.starlark.net/@v/v0.0.0-20200306205701-8dd3e2ee1dd5.zip -> go.starlark.net%2F@v%2Fv0.0.0-20200306205701-8dd3e2ee1dd5.zip mirror://goproxy//go.starlark.net/@v/v0.0.0-20200306205701-8dd3e2ee1dd5.mod -> go.starlark.net%2F@v%2Fv0.0.0-20200306205701-8dd3e2ee1dd5.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.17.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.17.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181009213950-7c1a557ab941.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191122220453-ac88ee75c92c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191122220453-ac88ee75c92c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200128174031-69ecbb4d6d5d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200414173820-0848c9571904.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200414173820-0848c9571904.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20210508222113-6edffad5e616.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20210508222113-6edffad5e616.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201006153459-a7d1128ccaa0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201006153459-a7d1128ccaa0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201202161906-c7110b5ffcbb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201202161906-c7110b5ffcbb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201209123823-ac852fbbde11.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210520170846-37e1c6afe023.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210520170846-37e1c6afe023.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210520170846-37e1c6afe023.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210520170846-37e1c6afe023.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210220000619-9bb904979d93.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210402161424-2e8d93401602.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210402161424-2e8d93401602.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210402161424-2e8d93401602.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210402161424-2e8d93401602.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190522044717-8097e1b27ff5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190522044717-8097e1b27ff5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190602015325-4c4f7f33c9ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190812073006-9eafafc0a87e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190812073006-9eafafc0a87e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191002063906-3421d5a6bb1c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191002063906-3421d5a6bb1c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191115151921-52ab43148777.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200217220822-9197077df867.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200217220822-9197077df867.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200622214017-ed371f2e16b4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200622214017-ed371f2e16b4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200817155316-9781c653f443.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200817155316-9781c653f443.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200831180312-196b9ba8737a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200909081042-eff7692f9009.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200916030750-2334cc1a136f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916030750-2334cc1a136f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200922070232-aee5d888a860.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200922070232-aee5d888a860.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200923182605-d9f96fdee20d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200923182605-d9f96fdee20d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201117170446-d9b008d0a637.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201117170446-d9b008d0a637.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201202213521-69691e467435.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201202213521-69691e467435.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210220050731-9a76102bfb43.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210315160823-c6e025ad8005.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210324051608-47abb6519492.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210403161142-5e06dd20ab57.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210603081109-ebe580a85c40.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210616094352-59db8d763f22.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210616094352-59db8d763f22.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210220033141-f8bda1e9f3ba.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210723032227-1f47c861a9ac.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210723032227-1f47c861a9ac.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210723032227-1f47c861a9ac.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210723032227-1f47c861a9ac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200308013534-11ec41452d41.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200308013534-11ec41452d41.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200505023115-26f46d2f7ef8.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200505023115-26f46d2f7ef8.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201110124207-079ba7bd75cd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201201161351-ac6f37ff4c2a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210105154028-b0ab187a4818.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20160322025152-9bf6e6e569ff.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.35.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod mirror://goproxy//google.golang.org/api/@v/v0.36.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod mirror://goproxy//google.golang.org/api/@v/v0.40.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod mirror://goproxy//google.golang.org/api/@v/v0.41.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod mirror://goproxy//google.golang.org/api/@v/v0.43.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.43.0.mod mirror://goproxy//google.golang.org/api/@v/v0.44.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.44.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/cloud/@v/v0.0.0-20151119220103-975617b05ea8.mod -> google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190522204451-c2c4e71fbf69.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190522204451-c2c4e71fbf69.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200117163144-32f20d992d24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200423170343-7949de9c1215.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200423170343-7949de9c1215.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200513103714-09dca8ec2884.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201019141844-1ed22bb0c154.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201019141844-1ed22bb0c154.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201109203340-2640f1f9cdfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201110150050-8816d57aaa9a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201201144952-b05cb90ed32e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201210142538-e3217bee35cc.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201210142538-e3217bee35cc.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201214200347-8c77b98c765d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210222152913-aa3ee6e6a81c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210222152913-aa3ee6e6a81c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210310155132-4ce2db91004e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210310155132-4ce2db91004e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210402141018-6c239bbf2bb1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210402141018-6c239bbf2bb1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210602131652-f16073e35f0c.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210602131652-f16073e35f0c.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210602131652-f16073e35f0c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210602131652-f16073e35f0c.mod mirror://goproxy//google.golang.org/grpc/@v/v0.0.0-20160317175043-d3ddb4469d5a.mod -> google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.34.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.35.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.38.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.38.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20141024133853-64131543e789.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20201130134442-10cb98267c6c.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20201130134442-10cb98267c6c.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/gorp.v1/@v/v1.7.2.zip -> gopkg.in%2Fgorp.v1%2F@v%2Fv1.7.2.zip mirror://goproxy//gopkg.in/gorp.v1/@v/v1.7.2.mod -> gopkg.in%2Fgorp.v1%2F@v%2Fv1.7.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//k8s.io/api/@v/v0.20.1.mod -> k8s.io%2Fapi%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/api/@v/v0.20.4.mod -> k8s.io%2Fapi%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/api/@v/v0.20.6.mod -> k8s.io%2Fapi%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/api/@v/v0.22.1.zip -> k8s.io%2Fapi%2F@v%2Fv0.22.1.zip mirror://goproxy//k8s.io/api/@v/v0.22.1.mod -> k8s.io%2Fapi%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.22.1.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.22.1.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.22.1.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.20.1.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.20.4.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.20.6.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.22.1.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.22.1.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.22.1.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/apiserver/@v/v0.20.1.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/apiserver/@v/v0.20.4.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/apiserver/@v/v0.20.6.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/apiserver/@v/v0.22.1.zip -> k8s.io%2Fapiserver%2F@v%2Fv0.22.1.zip mirror://goproxy//k8s.io/apiserver/@v/v0.22.1.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.22.1.zip -> k8s.io%2Fcli-runtime%2F@v%2Fv0.22.1.zip mirror://goproxy//k8s.io/cli-runtime/@v/v0.22.1.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/client-go/@v/v0.20.1.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/client-go/@v/v0.20.4.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/client-go/@v/v0.20.6.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/client-go/@v/v0.22.1.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.22.1.zip mirror://goproxy//k8s.io/client-go/@v/v0.22.1.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/code-generator/@v/v0.22.1.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/component-base/@v/v0.20.1.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/component-base/@v/v0.20.4.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/component-base/@v/v0.20.6.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/component-base/@v/v0.22.1.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.22.1.zip mirror://goproxy//k8s.io/component-base/@v/v0.22.1.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/component-helpers/@v/v0.22.1.mod -> k8s.io%2Fcomponent-helpers%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/cri-api/@v/v0.17.3.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cri-api/@v/v0.20.1.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/cri-api/@v/v0.20.4.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/cri-api/@v/v0.20.6.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20201214224949-b6c5ce23f027.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20201214224949-b6c5ce23f027.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.9.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.9.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.9.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.9.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20210421082810-95288971da7e.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210421082810-95288971da7e.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20210421082810-95288971da7e.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210421082810-95288971da7e.mod mirror://goproxy//k8s.io/kubectl/@v/v0.22.1.zip -> k8s.io%2Fkubectl%2F@v%2Fv0.22.1.zip mirror://goproxy//k8s.io/kubectl/@v/v0.22.1.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod mirror://goproxy//k8s.io/metrics/@v/v0.22.1.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20210707171843-4b05e18ac7d9.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20210707171843-4b05e18ac7d9.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20210707171843-4b05e18ac7d9.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20210707171843-4b05e18ac7d9.mod mirror://goproxy//oras.land/oras-go/@v/v0.4.0.zip -> oras.land%2Foras-go%2F@v%2Fv0.4.0.zip mirror://goproxy//oras.land/oras-go/@v/v0.4.0.mod -> oras.land%2Foras-go%2F@v%2Fv0.4.0.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/letsencrypt/@v/v0.0.3.zip -> rsc.io%2Fletsencrypt%2F@v%2Fv0.0.3.zip mirror://goproxy//rsc.io/letsencrypt/@v/v0.0.3.mod -> rsc.io%2Fletsencrypt%2F@v%2Fv0.0.3.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.14.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.14.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.15.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.22.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.22.mod mirror://goproxy//sigs.k8s.io/kustomize/api/@v/v0.8.11.zip -> sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.8.11.zip mirror://goproxy//sigs.k8s.io/kustomize/api/@v/v0.8.11.mod -> sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.8.11.mod mirror://goproxy//sigs.k8s.io/kustomize/cmd/config/@v/v0.9.13.mod -> sigs.k8s.io%2Fkustomize%2Fcmd%2Fconfig%2F@v%2Fv0.9.13.mod mirror://goproxy//sigs.k8s.io/kustomize/kustomize/v4/@v/v4.2.0.mod -> sigs.k8s.io%2Fkustomize%2Fkustomize%2Fv4%2F@v%2Fv4.2.0.mod mirror://goproxy//sigs.k8s.io/kustomize/kyaml/@v/v0.11.0.zip -> sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.11.0.zip mirror://goproxy//sigs.k8s.io/kustomize/kyaml/@v/v0.11.0.mod -> sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.11.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.3.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.3.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.2.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.2.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.2.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c00d33f583102afd4dad3cf0eb2f09c9
+_md5_=21fd73cb794a7bcfe7e95ba2662b58e4
diff --git a/metadata/md5-cache/app-admin/helm-3.7.1 b/metadata/md5-cache/app-admin/helm-3.7.1
new file mode 100644
index 000000000000..2033ea444f9a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/helm-3.7.1
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=Kubernetes Package Manager
+EAPI=8
+HOMEPAGE=https://github.com/helm/helm https://helm.sh
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/helm/helm/archive/v3.7.1.tar.gz -> helm-3.7.1.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.72.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.74.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.78.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.79.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.81.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.81.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.2.1+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20210608223527-2377c96fe795.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210608223527-2377c96fe795.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20210617225240-d185dfc1b5a1.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210617225240-d185dfc1b5a1.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20210617225240-d185dfc1b5a1.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210617225240-d185dfc1b5a1.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.8.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.18.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.18.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.5.0.zip -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!d!a!t!a-!d!o!g/go-sqlmock/@v/v1.5.0.mod -> github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.1.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.1.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.1.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.1.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.1.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.1.mod mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.zip -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.zip mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.mod -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.mod mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.2.2.zip -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.2.2.zip mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.2.2.mod -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.2.2.mod mirror://goproxy//github.com/!masterminds/squirrel/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/squirrel/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/vcs/@v/v1.13.1.zip -> github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.1.zip mirror://goproxy//github.com/!masterminds/vcs/@v/v1.13.1.mod -> github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.1.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16-0.20201130162521-d1ffc52c7331.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210211115548-6eac466e5fa3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210324224401-5516f17a5958.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210324224401-5516f17a5958.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7-0.20190325164909-8abdbb8205e4.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7-0.20190325164909-8abdbb8205e4.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.9.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.15.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.15.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.16.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.16.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.21.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.21.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.21.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.21.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20201218223536-d3e5debf77da.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20201218223536-d3e5debf77da.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20210227013316-43a75bb4edd3.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20210227013316-43a75bb4edd3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.zip -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.zip mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.mod -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.mod -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod mirror://goproxy//github.com/antihax/optional/@v/v1.0.0.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20200428143746-21a406dcc535.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200428143746-21a406dcc535.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20200428143746-21a406dcc535.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200428143746-21a406dcc535.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.9.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.9.mod mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.3.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20160804104726-4c0e84591b9a.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.zip -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.mod -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/bits-and-blooms/bitset/@v/v1.2.0.mod -> github.com%2Fbits-and-blooms%2Fbitset%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.4.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v0.4.1.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v1.0.0.zip -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v1.0.0.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.mod mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.zip -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.zip mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.mod -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.zip -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.zip mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.mod -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.zip -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.zip mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.mod -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20191021191039-0944d244cd40.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20191021191039-0944d244cd40.mod mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20200922220541-2c3bb06c6054.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20200922220541-2c3bb06c6054.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.1.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v5/@v/v5.0.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200702112145-1c8d4c9ef775.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.2.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.4.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.6.2.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200629203442-efcf912fb354.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20200714090401-bf6692d28da5.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20200714090401-bf6692d28da5.mod mirror://goproxy//github.com/cockroachdb/errors/@v/v1.2.4.mod -> github.com%2Fcockroachdb%2Ferrors%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/cockroachdb/logtags/@v/v0.0.0-20190617123548-eb05cc24525f.mod -> github.com%2Fcockroachdb%2Flogtags%2F@v%2Fv0.0.0-20190617123548-eb05cc24525f.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20200908144142-dab0cbea06f4.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20200908144142-dab0cbea06f4.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20201003224125-76a6863f2989.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20201003224125-76a6863f2989.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20210316121734-20793ff83c97.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20210316121734-20793ff83c97.mod mirror://goproxy//github.com/containerd/aufs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20201111183144-404b9149801e.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20210316141732-918d888fb676.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20210316141732-918d888fb676.mod mirror://goproxy//github.com/containerd/btrfs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190717030353-c4b9ac5c7601.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190717030353-c4b9ac5c7601.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200710171044-318312a37340.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200824123100-0b889c03f102.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200824123100-0b889c03f102.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20210114181951-8a68de567b68.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20210114181951-8a68de567b68.mod mirror://goproxy//github.com/containerd/cgroups/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/cgroups/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20181022165439-0650fd9eeb50.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20181022165439-0650fd9eeb50.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191206165004-02ecf6a7291e.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.2.10.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.2.10.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.1-0.20191213020239-082f7e3aed57.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.0-beta.2.0.20200729163537-40b22ef07410.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.0-beta.2.0.20200729163537-40b22ef07410.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.4.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.4.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-rc.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-rc.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.7.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.7.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.5.7.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.7.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190815185530-f2a389ac0a02.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190815185530-f2a389ac0a02.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20191127005431-f65d91d395eb.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20191127005431-f65d91d395eb.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200710164510-efbc4488d8fe.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20201208142359-180525291bb7.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20201208142359-180525291bb7.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20210208174643-50096c924a4e.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20210208174643-50096c924a4e.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.1.0.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.1.0.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20180307165137-3d5202aec260.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20180307165137-3d5202aec260.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20200410184934-f15a3290365b.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20201026212402-0724c46b320c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20201026212402-0724c46b320c.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20210316144830-115abcc95a1d.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20210316144830-115abcc95a1d.mod mirror://goproxy//github.com/containerd/fifo/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20190911050354-e029b79d8cda.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20190911050354-e029b79d8cda.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20201020171139-16b287bc67d0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20201020171139-16b287bc67d0.mod mirror://goproxy//github.com/containerd/go-runc/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.4-0.20210301171431-0ae5c75f59ba.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.4-0.20210301171431-0ae5c75f59ba.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1-0.20210312161619-7ed62a527887.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1-0.20210312161619-7ed62a527887.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/containerd/nri/@v/v0.0.0-20201007170849-eb1350a75164.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20201007170849-eb1350a75164.mod mirror://goproxy//github.com/containerd/nri/@v/v0.0.0-20210316161719-dbaa18c31c14.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20210316161719-dbaa18c31c14.mod mirror://goproxy//github.com/containerd/nri/@v/v0.1.0.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828172938-92c8520ef9f8.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828172938-92c8520ef9f8.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20191028202541-4f1b8fe65a5c.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20191028202541-4f1b8fe65a5c.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20190911142611-5eb25027c9fd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190911142611-5eb25027c9fd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20200918131355-0a33824f23a2.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20200918131355-0a33824f23a2.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20210301145711-11e8f1707f62.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210301145711-11e8f1707f62.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20210315114300-dde8f0fda960.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210315114300-dde8f0fda960.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20210324211415-d5c4544f0433.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210324211415-d5c4544f0433.mod mirror://goproxy//github.com/containerd/zfs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.9.1.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.0.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.0.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.5.0.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20161114122254-48702e0da86b.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20161114122254-48702e0da86b.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.2.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.11.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.11.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.mod -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.mod -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.mod -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.mod -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.9.0.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20190125010748-a747050bb1ba.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20170104182250-a601269ab70c.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/distribution/distribution/v3/@v/v3.0.0-20210804104954-38ab4c606ee3.zip -> github.com%2Fdistribution%2Fdistribution%2Fv3%2F@v%2Fv3.0.0-20210804104954-38ab4c606ee3.zip mirror://goproxy//github.com/distribution/distribution/v3/@v/v3.0.0-20210804104954-38ab4c606ee3.mod -> github.com%2Fdistribution%2Fdistribution%2Fv3%2F@v%2Fv3.0.0-20210804104954-38ab4c606ee3.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/cli/@v/v20.10.7+incompatible.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.7+incompatible.zip mirror://goproxy//github.com/docker/cli/@v/v20.10.7+incompatible.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.7+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20190905152932-14b96e55d84c.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20190905152932-14b96e55d84c.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible.mod mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.zip -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.zip mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.mod -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20170721190031-9461782956ad.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20170721190031-9461782956ad.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.zip -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.zip mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.0-20180209012529-399ea8c73916.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.zip -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.zip mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.7.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210217033140-668b12f5399d.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.11.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.11.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.11.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.11.0+incompatible.mod mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.zip -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.mod -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/felixge/httpsnoop/@v/v1.0.1.zip -> github.com%2Ffelixge%2Fhttpsnoop%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/felixge/httpsnoop/@v/v1.0.1.mod -> github.com%2Ffelixge%2Fhttpsnoop%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.3+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.3+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.3+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.3+incompatible.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/fullsailor/pkcs7/@v/v0.0.0-20190404230743-d7302db945fa.mod -> github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.mod mirror://goproxy//github.com/fvbommel/sortorder/@v/v1.0.1.mod -> github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.zip -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.zip mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.mod -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.zip -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/log/@v/v0.1.0.mod -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.14.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.14.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gobuffalo/logger/@v/v1.0.3.zip -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/gobuffalo/logger/@v/v1.0.3.mod -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v1.0.0.zip -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/gobuffalo/packd/@v/v1.0.0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.8.1.zip -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.8.1.zip mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.8.1.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.8.1.mod mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.zip -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.mod -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20151105175453-c7fdd8b5cd55.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20151105175453-c7fdd8b5cd55.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod mirror://goproxy//github.com/godror/godror/@v/v0.24.2.mod -> github.com%2Fgodror%2Fgodror%2F@v%2Fv0.24.2.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.8.0.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.8.0.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.2.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/mock/@v/v1.5.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.mod mirror://goproxy//github.com/gomodule/redigo/@v/v1.8.2.zip -> github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.8.2.zip mirror://goproxy//github.com/gomodule/redigo/@v/v1.8.2.mod -> github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.8.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/btree/@v/v1.0.1.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/google/btree/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201023163331-3e6fc7fc9c4c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201203190320-1bf35d6f28c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210122040257-d980be63207e.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210226084205-cbba55b83ad5.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.5.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.5.5.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.5.5.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/handlers/@v/v0.0.0-20150720190736-60c7bfde3e33.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod mirror://goproxy//github.com/gorilla/handlers/@v/v1.5.1.zip -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/gorilla/handlers/@v/v1.5.1.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gosuri/uitable/@v/v0.0.4.zip -> github.com%2Fgosuri%2Fuitable%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/gosuri/uitable/@v/v0.0.4.mod -> github.com%2Fgosuri%2Fuitable%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.3.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.16.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.1.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.10.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.10.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.12.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.12.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.12.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.12.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.mod -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.3.1.zip -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/jmoiron/sqlx/@v/v1.3.1.mod -> github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.2.2.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.zip -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.mod -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.8.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.8.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.8.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.8.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.3.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.13.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.13.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.11.13.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.13.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kortschak/utter/@v/v1.0.1.mod -> github.com%2Fkortschak%2Futter%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/lann/builder/@v/v0.0.0-20180802200727-47ae307949d0.zip -> github.com%2Flann%2Fbuilder%2F@v%2Fv0.0.0-20180802200727-47ae307949d0.zip mirror://goproxy//github.com/lann/builder/@v/v0.0.0-20180802200727-47ae307949d0.mod -> github.com%2Flann%2Fbuilder%2F@v%2Fv0.0.0-20180802200727-47ae307949d0.mod mirror://goproxy//github.com/lann/ps/@v/v0.0.0-20150810152359-62de8c46ede0.zip -> github.com%2Flann%2Fps%2F@v%2Fv0.0.0-20150810152359-62de8c46ede0.zip mirror://goproxy//github.com/lann/ps/@v/v0.0.0-20150810152359-62de8c46ede0.mod -> github.com%2Flann%2Fps%2F@v%2Fv0.0.0-20150810152359-62de8c46ede0.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.10.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.10.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.zip -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.mod -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.mod -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.5.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.5.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.mod mirror://goproxy//github.com/markbates/errx/@v/v1.1.0.zip -> github.com%2Fmarkbates%2Ferrx%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/markbates/errx/@v/v1.1.0.mod -> github.com%2Fmarkbates%2Ferrx%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/markbates/oncer/@v/v1.0.0.zip -> github.com%2Fmarkbates%2Foncer%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/markbates/oncer/@v/v1.0.0.mod -> github.com%2Fmarkbates%2Foncer%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/markbates/safe/@v/v1.0.1.zip -> github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/markbates/safe/@v/v1.0.1.mod -> github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/marstr/guid/@v/v1.1.0.mod -> github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-oci8/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-oci8%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.11.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.11.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.11.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.11.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.6.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.6.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.6.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.6.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.mod -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.1.1.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.1.1.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.zip -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.zip mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.mod -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/locker/@v/v1.0.1.zip -> github.com%2Fmoby%2Flocker%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/moby/locker/@v/v1.0.1.mod -> github.com%2Fmoby%2Flocker%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/spdystream/@v/v0.2.0.zip -> github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/moby/spdystream/@v/v0.2.0.mod -> github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.0.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/moby/sys/symlink/@v/v0.1.0.mod -> github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20210610120745-9d4ed1856297.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20210610120745-9d4ed1856297.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20210610120745-9d4ed1856297.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20210610120745-9d4ed1856297.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/monochromegane/go-gitignore/@v/v0.0.0-20200626010858-205db1a8cc00.zip -> github.com%2Fmonochromegane%2Fgo-gitignore%2F@v%2Fv0.0.0-20200626010858-205db1a8cc00.zip mirror://goproxy//github.com/monochromegane/go-gitignore/@v/v0.0.0-20200626010858-205db1a8cc00.mod -> github.com%2Fmonochromegane%2Fgo-gitignore%2F@v%2Fv0.0.0-20200626010858-205db1a8cc00.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20151202141238-7f8ab55aaf3b.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20151007035656-2152b45fa28a.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20170106003457-a6d0ee40d420.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.1.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc93.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.2.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2-0.20190207185410-29686dbc5559.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20190207185410-29686dbc5559.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200929063507-e6143ca7d51d.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210326190908-1c3f411f0417.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.6.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.2.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.1.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.3.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.zip -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.zip mirror://goproxy//github.com/phayes/freeport/@v/v0.0.0-20180830031419-95f893ade6f2.mod -> github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.10.1.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.0.0-20180209125602-c332b6f63c06.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20171117100541-99fa1f4be8e5.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180110214958-89604d197083.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.5.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/rubenv/sql-migrate/@v/v0.0.0-20210614095031-55d5740dbbcc.zip -> github.com%2Frubenv%2Fsql-migrate%2F@v%2Fv0.0.0-20210614095031-55d5740dbbcc.zip mirror://goproxy//github.com/rubenv/sql-migrate/@v/v0.0.0-20210614095031-55d5740dbbcc.mod -> github.com%2Frubenv%2Fsql-migrate%2F@v%2Fv0.0.0-20210614095031-55d5740dbbcc.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.5.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.6.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.6.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.2.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.2.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.8.1.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/stefanberger/go-pkcs11uri/@v/v0.0.0-20201008174630-78d3cae3a980.mod -> github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.mod mirror://goproxy//github.com/stoewer/go-strcase/@v/v1.2.0.mod -> github.com%2Fstoewer%2Fgo-strcase%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.0.0-20180129172003-8a3f7159479f.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.0.0-20180129172003-8a3f7159479f.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20180303142811-b89eecf5ca5d.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20180303142811-b89eecf5ca5d.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20201229170055-e5319fda7802.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20201229170055-e5319fda7802.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20181108222139-023a6dafdcdf.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.1-0.20201029203352-d40f9887b852.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.1-0.20201029203352-d40f9887b852.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11-0.20200630133818-d5bec3311243.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v1.2.0.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v1.2.0.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20181112141820-a009c3971eca.zip -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20181112141820-a009c3971eca.zip mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20181112141820-a009c3971eca.mod -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20181112141820-a009c3971eca.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.zip -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.zip mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.mod -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.zip -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.zip mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.mod -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.zip -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.zip mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.mod -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod mirror://goproxy//github.com/ziutek/mymysql/@v/v1.5.4.zip -> github.com%2Fziutek%2Fmymysql%2F@v%2Fv1.5.4.zip mirror://goproxy//github.com/ziutek/mymysql/@v/v1.5.4.mod -> github.com%2Fziutek%2Fmymysql%2F@v%2Fv1.5.4.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.6.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.6.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod mirror://goproxy//go.etcd.io/etcd/api/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/client/pkg/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fpkg%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/client/v2/@v/v2.305.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fv2%2F@v%2Fv2.305.0.mod mirror://goproxy//go.etcd.io/etcd/client/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/pkg/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fpkg%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/raft/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fraft%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/server/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fserver%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.mod -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.zip -> go.opencensus.io%2F@v%2Fv0.23.0.zip mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.opentelemetry.io/contrib/@v/v0.20.0.mod -> go.opentelemetry.io%2Fcontrib%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/@v/v0.20.0.mod -> go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fgoogle.golang.org%2Fgrpc%2Fotelgrpc%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/@v/v0.20.0.mod -> go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fnet%2Fhttp%2Fotelhttp%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/exporters/otlp/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fexporters%2Fotlp%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/export/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2Fexport%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/proto/otlp/@v/v0.7.0.mod -> go.opentelemetry.io%2Fproto%2Fotlp%2F@v%2Fv0.7.0.mod mirror://goproxy//go.starlark.net/@v/v0.0.0-20200306205701-8dd3e2ee1dd5.zip -> go.starlark.net%2F@v%2Fv0.0.0-20200306205701-8dd3e2ee1dd5.zip mirror://goproxy//go.starlark.net/@v/v0.0.0-20200306205701-8dd3e2ee1dd5.mod -> go.starlark.net%2F@v%2Fv0.0.0-20200306205701-8dd3e2ee1dd5.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.17.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.17.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181009213950-7c1a557ab941.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191122220453-ac88ee75c92c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191122220453-ac88ee75c92c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200128174031-69ecbb4d6d5d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200414173820-0848c9571904.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200414173820-0848c9571904.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20210508222113-6edffad5e616.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20210508222113-6edffad5e616.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201006153459-a7d1128ccaa0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201006153459-a7d1128ccaa0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201202161906-c7110b5ffcbb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201202161906-c7110b5ffcbb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201209123823-ac852fbbde11.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210520170846-37e1c6afe023.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210520170846-37e1c6afe023.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210520170846-37e1c6afe023.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210520170846-37e1c6afe023.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210220000619-9bb904979d93.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210402161424-2e8d93401602.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210402161424-2e8d93401602.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210402161424-2e8d93401602.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210402161424-2e8d93401602.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190522044717-8097e1b27ff5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190522044717-8097e1b27ff5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190602015325-4c4f7f33c9ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190812073006-9eafafc0a87e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190812073006-9eafafc0a87e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191002063906-3421d5a6bb1c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191002063906-3421d5a6bb1c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191115151921-52ab43148777.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200217220822-9197077df867.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200217220822-9197077df867.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200622214017-ed371f2e16b4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200622214017-ed371f2e16b4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200817155316-9781c653f443.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200817155316-9781c653f443.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200831180312-196b9ba8737a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200909081042-eff7692f9009.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200916030750-2334cc1a136f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916030750-2334cc1a136f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200922070232-aee5d888a860.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200922070232-aee5d888a860.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200923182605-d9f96fdee20d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200923182605-d9f96fdee20d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201117170446-d9b008d0a637.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201117170446-d9b008d0a637.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201202213521-69691e467435.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201202213521-69691e467435.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210220050731-9a76102bfb43.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210315160823-c6e025ad8005.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210324051608-47abb6519492.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210403161142-5e06dd20ab57.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426230700-d19ff857e887.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210603081109-ebe580a85c40.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210616094352-59db8d763f22.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210616094352-59db8d763f22.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210220033141-f8bda1e9f3ba.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210723032227-1f47c861a9ac.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210723032227-1f47c861a9ac.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210723032227-1f47c861a9ac.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210723032227-1f47c861a9ac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200308013534-11ec41452d41.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200308013534-11ec41452d41.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200505023115-26f46d2f7ef8.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200505023115-26f46d2f7ef8.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201110124207-079ba7bd75cd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201201161351-ac6f37ff4c2a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210105154028-b0ab187a4818.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20160322025152-9bf6e6e569ff.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.35.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod mirror://goproxy//google.golang.org/api/@v/v0.36.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod mirror://goproxy//google.golang.org/api/@v/v0.40.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod mirror://goproxy//google.golang.org/api/@v/v0.41.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod mirror://goproxy//google.golang.org/api/@v/v0.43.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.43.0.mod mirror://goproxy//google.golang.org/api/@v/v0.44.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.44.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/cloud/@v/v0.0.0-20151119220103-975617b05ea8.mod -> google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190522204451-c2c4e71fbf69.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190522204451-c2c4e71fbf69.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200117163144-32f20d992d24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200423170343-7949de9c1215.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200423170343-7949de9c1215.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200513103714-09dca8ec2884.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201019141844-1ed22bb0c154.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201019141844-1ed22bb0c154.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201109203340-2640f1f9cdfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201110150050-8816d57aaa9a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201201144952-b05cb90ed32e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201210142538-e3217bee35cc.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201210142538-e3217bee35cc.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201214200347-8c77b98c765d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210222152913-aa3ee6e6a81c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210222152913-aa3ee6e6a81c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210310155132-4ce2db91004e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210310155132-4ce2db91004e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210402141018-6c239bbf2bb1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210402141018-6c239bbf2bb1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210602131652-f16073e35f0c.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210602131652-f16073e35f0c.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210602131652-f16073e35f0c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210602131652-f16073e35f0c.mod mirror://goproxy//google.golang.org/grpc/@v/v0.0.0-20160317175043-d3ddb4469d5a.mod -> google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.34.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.35.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.38.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.38.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20141024133853-64131543e789.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20201130134442-10cb98267c6c.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20201130134442-10cb98267c6c.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/gorp.v1/@v/v1.7.2.zip -> gopkg.in%2Fgorp.v1%2F@v%2Fv1.7.2.zip mirror://goproxy//gopkg.in/gorp.v1/@v/v1.7.2.mod -> gopkg.in%2Fgorp.v1%2F@v%2Fv1.7.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//k8s.io/api/@v/v0.20.1.mod -> k8s.io%2Fapi%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/api/@v/v0.20.4.mod -> k8s.io%2Fapi%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/api/@v/v0.20.6.mod -> k8s.io%2Fapi%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/api/@v/v0.22.1.zip -> k8s.io%2Fapi%2F@v%2Fv0.22.1.zip mirror://goproxy//k8s.io/api/@v/v0.22.1.mod -> k8s.io%2Fapi%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.22.1.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.22.1.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.22.1.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.20.1.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.20.4.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.20.6.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.22.1.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.22.1.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.22.1.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/apiserver/@v/v0.20.1.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/apiserver/@v/v0.20.4.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/apiserver/@v/v0.20.6.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/apiserver/@v/v0.22.1.zip -> k8s.io%2Fapiserver%2F@v%2Fv0.22.1.zip mirror://goproxy//k8s.io/apiserver/@v/v0.22.1.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.22.1.zip -> k8s.io%2Fcli-runtime%2F@v%2Fv0.22.1.zip mirror://goproxy//k8s.io/cli-runtime/@v/v0.22.1.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/client-go/@v/v0.20.1.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/client-go/@v/v0.20.4.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/client-go/@v/v0.20.6.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/client-go/@v/v0.22.1.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.22.1.zip mirror://goproxy//k8s.io/client-go/@v/v0.22.1.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/code-generator/@v/v0.22.1.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/component-base/@v/v0.20.1.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/component-base/@v/v0.20.4.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/component-base/@v/v0.20.6.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/component-base/@v/v0.22.1.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.22.1.zip mirror://goproxy//k8s.io/component-base/@v/v0.22.1.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/component-helpers/@v/v0.22.1.mod -> k8s.io%2Fcomponent-helpers%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/cri-api/@v/v0.17.3.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cri-api/@v/v0.20.1.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/cri-api/@v/v0.20.4.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.20.4.mod mirror://goproxy//k8s.io/cri-api/@v/v0.20.6.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20201214224949-b6c5ce23f027.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20201214224949-b6c5ce23f027.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.9.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.9.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.9.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.9.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20210421082810-95288971da7e.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210421082810-95288971da7e.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20210421082810-95288971da7e.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210421082810-95288971da7e.mod mirror://goproxy//k8s.io/kubectl/@v/v0.22.1.zip -> k8s.io%2Fkubectl%2F@v%2Fv0.22.1.zip mirror://goproxy//k8s.io/kubectl/@v/v0.22.1.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod mirror://goproxy//k8s.io/metrics/@v/v0.22.1.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.22.1.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20210707171843-4b05e18ac7d9.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20210707171843-4b05e18ac7d9.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20210707171843-4b05e18ac7d9.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20210707171843-4b05e18ac7d9.mod mirror://goproxy//oras.land/oras-go/@v/v0.4.0.zip -> oras.land%2Foras-go%2F@v%2Fv0.4.0.zip mirror://goproxy//oras.land/oras-go/@v/v0.4.0.mod -> oras.land%2Foras-go%2F@v%2Fv0.4.0.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/letsencrypt/@v/v0.0.3.zip -> rsc.io%2Fletsencrypt%2F@v%2Fv0.0.3.zip mirror://goproxy//rsc.io/letsencrypt/@v/v0.0.3.mod -> rsc.io%2Fletsencrypt%2F@v%2Fv0.0.3.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.14.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.14.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.15.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.22.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.22.mod mirror://goproxy//sigs.k8s.io/kustomize/api/@v/v0.8.11.zip -> sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.8.11.zip mirror://goproxy//sigs.k8s.io/kustomize/api/@v/v0.8.11.mod -> sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.8.11.mod mirror://goproxy//sigs.k8s.io/kustomize/cmd/config/@v/v0.9.13.mod -> sigs.k8s.io%2Fkustomize%2Fcmd%2Fconfig%2F@v%2Fv0.9.13.mod mirror://goproxy//sigs.k8s.io/kustomize/kustomize/v4/@v/v4.2.0.mod -> sigs.k8s.io%2Fkustomize%2Fkustomize%2Fv4%2F@v%2Fv4.2.0.mod mirror://goproxy//sigs.k8s.io/kustomize/kyaml/@v/v0.11.0.zip -> sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.11.0.zip mirror://goproxy//sigs.k8s.io/kustomize/kyaml/@v/v0.11.0.mod -> sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.11.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.3.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.3.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.2.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.2.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.2.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d6433a433ef277fcc36262504d1a5d69
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.6.6 b/metadata/md5-cache/app-admin/keepassxc-2.6.6
index 490d9195084b..a9cecb20b929 100644
--- a/metadata/md5-cache/app-admin/keepassxc-2.6.6
+++ b/metadata/md5-cache/app-admin/keepassxc-2.6.6
@@ -5,11 +5,11 @@ DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
 EAPI=7
 HOMEPAGE=https://keepassxc.org
 IUSE=autotype browser ccache doc keeshare +network test yubikey
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1 GPL-2 GPL-3
 RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( dev-libs/quazip:0= ) yubikey? ( sys-auth/ykpers )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/keepassxreboot/keepassxc/archive/2.6.6.tar.gz -> keepassxc-2.6.6.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3a443ad473e5b33eb8b60024502a8020
+_md5_=87303bed33fcdb4e147f2d72918043bf
diff --git a/metadata/md5-cache/app-admin/longrun-0.9-r4 b/metadata/md5-cache/app-admin/longrun-0.9-r4
index cc1596af076d..8137eea6d7b2 100644
--- a/metadata/md5-cache/app-admin/longrun-0.9-r4
+++ b/metadata/md5-cache/app-admin/longrun-0.9-r4
@@ -8,5 +8,5 @@ KEYWORDS=-ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/cpu/crusoe/longrun-0.9.tar.bz2 mirror://debian/pool/main/l/longrun/longrun_0.9-19.diff.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=197c8dc7e7a6cd2175ee6a522ec787ac
diff --git a/metadata/md5-cache/app-admin/mcelog-178 b/metadata/md5-cache/app-admin/mcelog-178
index e98492b351d7..3e08acdbf4b2 100644
--- a/metadata/md5-cache/app-admin/mcelog-178
+++ b/metadata/md5-cache/app-admin/mcelog-178
@@ -10,5 +10,5 @@ RDEPEND=selinux? ( sec-policy/selinux-mcelog )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/andikleen/mcelog/archive/v178.tar.gz -> mcelog-178.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3d4f443d2173ccdf778a64c348b3a1bb
diff --git a/metadata/md5-cache/app-admin/mcelog-179 b/metadata/md5-cache/app-admin/mcelog-179
index 069ef5be8dc1..7392760a599e 100644
--- a/metadata/md5-cache/app-admin/mcelog-179
+++ b/metadata/md5-cache/app-admin/mcelog-179
@@ -10,5 +10,5 @@ RDEPEND=selinux? ( sec-policy/selinux-mcelog )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/andikleen/mcelog/archive/v179.tar.gz -> mcelog-179.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bf74048475d82b61d099da0e9360e620
diff --git a/metadata/md5-cache/app-admin/mei-amt-check-0_p20170515 b/metadata/md5-cache/app-admin/mei-amt-check-0_p20170515
index 97d7c354a6d9..6f1c2ea6c418 100644
--- a/metadata/md5-cache/app-admin/mei-amt-check-0_p20170515
+++ b/metadata/md5-cache/app-admin/mei-amt-check-0_p20170515
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/mjg59/mei-amt-check/archive/d07672120ce7a0c79e949e537f3d19efecec1700.tar.gz -> mei-amt-check-0_p20170515.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=84a83d459cb2c0fefb1aa1a67ec433ff
diff --git a/metadata/md5-cache/app-admin/mongo-tools-100.4.1 b/metadata/md5-cache/app-admin/mongo-tools-100.4.1
index 279f4a4f5bdf..e41889c9cecd 100644
--- a/metadata/md5-cache/app-admin/mongo-tools-100.4.1
+++ b/metadata/md5-cache/app-admin/mongo-tools-100.4.1
@@ -4,8 +4,8 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
 IUSE=sasl ssl
-KEYWORDS=~amd64 ~arm64 ~riscv
+KEYWORDS=amd64 ~arm64 ~riscv
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-tools/archive/100.4.1.tar.gz -> mongo-tools-100.4.1.tar.gz
-_md5_=3322edbbaac5ea77cbb7fca70d370918
+_md5_=88826c32e29420ce06759ca69248bcee
diff --git a/metadata/md5-cache/app-admin/mongo-tools-4.2.15 b/metadata/md5-cache/app-admin/mongo-tools-4.2.15
index 87af29c78e20..f1ade9d8b7f3 100644
--- a/metadata/md5-cache/app-admin/mongo-tools-4.2.15
+++ b/metadata/md5-cache/app-admin/mongo-tools-4.2.15
@@ -4,8 +4,8 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
 IUSE=sasl ssl
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-tools/archive/r4.2.15.tar.gz -> mongo-tools-4.2.15.tar.gz
-_md5_=d4e7794532221211fdff8d33d7fa05cc
+_md5_=7790078b53c0881a2d36e1400027eca4
diff --git a/metadata/md5-cache/app-admin/monit-5.29.0 b/metadata/md5-cache/app-admin/monit-5.29.0
index 792a482b7c64..4a2d11e6d1e5 100644
--- a/metadata/md5-cache/app-admin/monit-5.29.0
+++ b/metadata/md5-cache/app-admin/monit-5.29.0
@@ -5,10 +5,10 @@ DESCRIPTION=Monitoring and managing daemons or similar programs running on a Uni
 EAPI=7
 HOMEPAGE=http://mmonit.com/monit/
 IUSE=ipv6 pam ssl
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=AGPL-3
 RDEPEND=sys-libs/zlib:= virtual/libcrypt:= pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://mmonit.com/monit/dist/monit-5.29.0.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dedfbb0a02ed8a8711350091176a5639
+_md5_=bf914882b682af01ae1e0fe06e538e73
diff --git a/metadata/md5-cache/app-admin/pass-1.7.4-r1 b/metadata/md5-cache/app-admin/pass-1.7.4-r1
index eff1c66c83f4..ac6c56490947 100644
--- a/metadata/md5-cache/app-admin/pass-1.7.4-r1
+++ b/metadata/md5-cache/app-admin/pass-1.7.4-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Stores, retrieves, generates, and synchronizes passwords securely
 EAPI=7
 HOMEPAGE=https://www.passwordstore.org/
 IUSE=+git wayland X emacs dmenu importers elibc_Darwin
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/password-store/snapshot/password-store-1.7.4.tar.xz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3c574e0a8b13fc2e37eb0d8a1940242e
+_md5_=58d94f326b3157f89029eab1737c446d
diff --git a/metadata/md5-cache/app-admin/passwordsafe-1.14.0 b/metadata/md5-cache/app-admin/passwordsafe-1.14.0
new file mode 100644
index 000000000000..4d965a949fd3
--- /dev/null
+++ b/metadata/md5-cache/app-admin/passwordsafe-1.14.0
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/zip sys-devel/gettext test? ( dev-cpp/gtest ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare pretend test
+DEPEND=dev-libs/openssl:0= net-misc/curl sys-apps/file sys-apps/util-linux x11-libs/libXt x11-libs/libXtst x11-libs/wxGTK:3.0-gtk3[X] qr? ( media-gfx/qrencode ) xml? ( dev-libs/xerces-c ) yubikey? ( sys-auth/ykpers )
+DESCRIPTION=Password manager with wxGTK based frontend
+EAPI=7
+HOMEPAGE=https://pwsafe.org/ https://github.com/pwsafe/pwsafe/
+IUSE=qr test +xml yubikey
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=dev-libs/openssl:0= net-misc/curl sys-apps/file sys-apps/util-linux x11-libs/libXt x11-libs/libXtst x11-libs/wxGTK:3.0-gtk3[X] qr? ( media-gfx/qrencode ) xml? ( dev-libs/xerces-c ) yubikey? ( sys-auth/ykpers )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pwsafe/pwsafe/archive/1.14.0.tar.gz -> passwordsafe-1.14.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c86917021a91560f286ebd3162fb6b94
diff --git a/metadata/md5-cache/app-admin/puppet-5.5.22-r1 b/metadata/md5-cache/app-admin/puppet-5.5.22-r1
index 9e6e2fe6f082..e437c2417121 100644
--- a/metadata/md5-cache/app-admin/puppet-5.5.22-r1
+++ b/metadata/md5-cache/app-admin/puppet-5.5.22-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppet-5.5.22.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b629ef8594123b64a26d470bc37eb328
diff --git a/metadata/md5-cache/app-admin/puppet-7.10.0 b/metadata/md5-cache/app-admin/puppet-7.10.0
index af53cfe8f262..e3059eee747c 100644
--- a/metadata/md5-cache/app-admin/puppet-7.10.0
+++ b/metadata/md5-cache/app-admin/puppet-7.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83919d8bfc870bcf5e6a57ed5a30d47b
diff --git a/metadata/md5-cache/app-admin/puppet-7.11.0 b/metadata/md5-cache/app-admin/puppet-7.11.0
index ec902581a20a..78d02ad7adfb 100644
--- a/metadata/md5-cache/app-admin/puppet-7.11.0
+++ b/metadata/md5-cache/app-admin/puppet-7.11.0
@@ -5,7 +5,7 @@ DESCRIPTION=A system automation and configuration management software.
 EAPI=7
 HOMEPAGE=https://puppet.com/
 IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=Apache-2.0 GPL-2
 PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
 RDEPEND=ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) virtual/tmpfiles
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6650ef0083c7a2481cce84ad8006dfd7
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c6de7e0dcbb3d62cb478829b4235471a
diff --git a/metadata/md5-cache/app-admin/puppet-7.12.0 b/metadata/md5-cache/app-admin/puppet-7.12.0
new file mode 100644
index 000000000000..a2a941aa7c99
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-7.12.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A system automation and configuration management software.
+EAPI=7
+HOMEPAGE=https://puppet.com/
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0 GPL-2
+PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) virtual/tmpfiles
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.12.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6650ef0083c7a2481cce84ad8006dfd7
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.11.0-r1 b/metadata/md5-cache/app-admin/puppet-agent-7.11.0-r1
index 65614d42feda..041557fec484 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-7.11.0-r1
+++ b/metadata/md5-cache/app-admin/puppet-agent-7.11.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=general puppet client utils along with hiera and facter
 EAPI=7
 HOMEPAGE=https://puppetlabs.com/
 IUSE=puppetdb selinux
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet virtual/libcrypt:= app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/8 sys-libs/libxcrypt[compat] sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 ) virtual/tmpfiles
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.11.0-1focal_amd64.deb
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=46595034e84f5a15813f4bfd6b01bad1
+_md5_=6b585a3670450a3b0a2a6d4c6b775747
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.12.0 b/metadata/md5-cache/app-admin/puppet-agent-7.12.0
new file mode 100644
index 000000000000..c19d64b5657c
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-agent-7.12.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst unpack
+DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet virtual/libcrypt:= app-admin/augeas
+DESCRIPTION=general puppet client utils along with hiera and facter
+EAPI=7
+HOMEPAGE=https://puppetlabs.com/
+IUSE=puppetdb selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet virtual/libcrypt:= app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/8 sys-libs/libxcrypt[compat] sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 ) virtual/tmpfiles
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.12.0-1focal_amd64.deb
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
+_md5_=46595034e84f5a15813f4bfd6b01bad1
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.4.2 b/metadata/md5-cache/app-admin/puppet-lint-2.4.2
index 4ffa207de8b5..1a0f6f3d2897 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.4.2
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/puppet-lint-2.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ad076030990dfbd9925c1c1433a6df8
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.5.0 b/metadata/md5-cache/app-admin/puppet-lint-2.5.0
index c7cd0e159dd8..f60990063644 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.5.0
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/puppet-lint-2.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c787d60ebc337fe2ded2a3af156cb042
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.5.1 b/metadata/md5-cache/app-admin/puppet-lint-2.5.1
index 0297cb0612f9..0fb436fbaec3 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.5.1
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/puppet-lint-2.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=90061079c138a9dc5b8b9dccdf6af380
diff --git a/metadata/md5-cache/app-admin/puppetdb-7.6.0 b/metadata/md5-cache/app-admin/puppetdb-7.6.0
index 56cb3f5a98e8..127334bc68cf 100644
--- a/metadata/md5-cache/app-admin/puppetdb-7.6.0
+++ b/metadata/md5-cache/app-admin/puppetdb-7.6.0
@@ -4,10 +4,10 @@ DEPEND=acct-user/puppetdb acct-group/puppetdb
 DESCRIPTION=PuppetDB collects data generated by Puppet.
 EAPI=7
 HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-7.6.0.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cd270f6bf049258e01f2bc72aa391202
+_md5_=72c593d312a2056fd7a85171d781fc70
diff --git a/metadata/md5-cache/app-admin/puppetdb-7.7.0 b/metadata/md5-cache/app-admin/puppetdb-7.7.0
new file mode 100644
index 000000000000..b09c999a8db7
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetdb-7.7.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=acct-user/puppetdb acct-group/puppetdb
+DESCRIPTION=PuppetDB collects data generated by Puppet.
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8.0 virtual/tmpfiles
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-7.7.0.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cd270f6bf049258e01f2bc72aa391202
diff --git a/metadata/md5-cache/app-admin/puppetserver-7.4.0 b/metadata/md5-cache/app-admin/puppetserver-7.4.0
index 29f041ee448e..0b19705b3e35 100644
--- a/metadata/md5-cache/app-admin/puppetserver-7.4.0
+++ b/metadata/md5-cache/app-admin/puppetserver-7.4.0
@@ -5,10 +5,10 @@ DESCRIPTION=Puppet Server is the next-generation application for managing Puppet
 EAPI=7
 HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
 IUSE=puppetdb
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-7.4.0.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=80166a866915209d71d346457d919bef
+_md5_=44a5418969ad8f63ba51a9b78d6e3aa7
diff --git a/metadata/md5-cache/app-admin/puppetserver-7.4.1 b/metadata/md5-cache/app-admin/puppetserver-7.4.1
new file mode 100644
index 000000000000..bdd57361e98b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetserver-7.4.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=acct-user/puppet acct-group/puppet
+DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
+EAPI=7
+HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
+IUSE=puppetdb
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
+SLOT=0
+SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-7.4.1.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=80166a866915209d71d346457d919bef
diff --git a/metadata/md5-cache/app-admin/r10k-3.7.0-r2 b/metadata/md5-cache/app-admin/r10k-3.7.0-r2
index fa19f0c0cda9..e123f7552971 100644
--- a/metadata/md5-cache/app-admin/r10k-3.7.0-r2
+++ b/metadata/md5-cache/app-admin/r10k-3.7.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/r10k-3.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=28d282c583357a835e9da1bb55a6134f
diff --git a/metadata/md5-cache/app-admin/rasdaemon-0.6.7 b/metadata/md5-cache/app-admin/rasdaemon-0.6.7
index 83fe34f75298..5f5cb5343d3a 100644
--- a/metadata/md5-cache/app-admin/rasdaemon-0.6.7
+++ b/metadata/md5-cache/app-admin/rasdaemon-0.6.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gettext sys-apps/dmidecode sqlite? ( dev-db/sqlite dev-perl/DBD-SQLite )
 SLOT=0
 SRC_URI=http://www.infradead.org/~mchehab/rasdaemon/rasdaemon-0.6.7.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9f52c64bc3f3ec3787c9431077b41788
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2102.0 b/metadata/md5-cache/app-admin/rsyslog-8.2102.0
index 98fd6c29a38f..b5e7ae21ef49 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.2102.0
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2102.0
@@ -12,5 +12,5 @@ REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2102.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2102.0.tar.gz )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=de5cf0c75687c6947724b9e35d3a8b5a
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2104.0 b/metadata/md5-cache/app-admin/rsyslog-8.2104.0
index cb0ce99f77ee..b284b371e047 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.2104.0
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2104.0
@@ -12,5 +12,5 @@ REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2104.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2104.0.tar.gz )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=de5feaf103295bd6bcce4b7b7572cbb4
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2106.0 b/metadata/md5-cache/app-admin/rsyslog-8.2106.0
index 76a079a84101..beb35d8c0cfa 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.2106.0
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2106.0
@@ -12,5 +12,5 @@ REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2106.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2106.0.tar.gz )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=500944735bddca0e91b8515b5f7b8224
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2108.0 b/metadata/md5-cache/app-admin/rsyslog-8.2108.0
index 611b4442983a..bf4d042bc63f 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.2108.0
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2108.0
@@ -12,5 +12,5 @@ REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2108.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2108.0.tar.gz )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=500944735bddca0e91b8515b5f7b8224
diff --git a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2 b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2
index 02b69e361f4e..9561be8082fc 100644
--- a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2
+++ b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/leogx9r/ryzen_smu/archive/v0.1.2.tar.gz -> ryzen_smu-0.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=798904db1fe98f9f209d1c03553416d7
diff --git a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627 b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627
index d10df70170a1..984d8427dd47 100644
--- a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627
+++ b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20210627
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slashbeast/distfiles/ryzen_smu/ryzen_smu-0.1.2_p20210627.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bdcba0d172169768cc50d2e5ba0d89e9
diff --git a/metadata/md5-cache/app-admin/salt-3003.3 b/metadata/md5-cache/app-admin/salt-3003.3
index 88f965409f5e..ba0233746acd 100644
--- a/metadata/md5-cache/app-admin/salt-3003.3
+++ b/metadata/md5-cache/app-admin/salt-3003.3
@@ -4,7 +4,7 @@ DESCRIPTION=Salt is a remote execution and configuration manager
 EAPI=7
 HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
 IUSE=cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako mongodb neutron nova openssl portage profile redis selinux test raet +zeromq vim-syntax python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=sys-apps/pciutils >=dev-python/distro-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/libnacl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pycryptodome-3.9.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markupsafe[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toml-0.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/watchdog[python_targets_python3_8(-)?,python_targets_python3_9(-)?] libcloud? ( >=dev-python/libcloud-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mako? ( dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) libvirt? ( python_targets_python3_8? ( dev-python/libvirt-python[python_targets_python3_8(-)?] ) ) openssl? ( dev-libs/openssl:0=[-bindist(-)] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/raet-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) cheetah? ( dev-python/cheetah3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) portage? ( sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) redis? ( dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( python_targets_python3_8? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_8(-)?] ) ) neutron? ( python_targets_python3_8? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_8(-)?] ) ) gnupg? ( dev-python/python-gnupg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) profile? ( dev-python/yappi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-3003.3.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=830dc678f0872b9ada94809d0c5a54ee
+_md5_=715581ae83f8d6fde0f697d11f938dcd
diff --git a/metadata/md5-cache/app-admin/sshguard-2.4.1-r1 b/metadata/md5-cache/app-admin/sshguard-2.4.1-r1
deleted file mode 100644
index e640f6ec7bbe..000000000000
--- a/metadata/md5-cache/app-admin/sshguard-2.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=install prepare
-DEPEND=sys-devel/flex
-DESCRIPTION=protects hosts from brute force attacks against ssh
-EAPI=7
-HOMEPAGE=https://www.sshguard.net/
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD
-RDEPEND=virtual/logger
-SLOT=0
-SRC_URI=mirror://sourceforge/sshguard/sshguard-2.4.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d8ccc07cd0b8e154afa9043f6b9fda42
diff --git a/metadata/md5-cache/app-admin/sshguard-2.4.2 b/metadata/md5-cache/app-admin/sshguard-2.4.2
index ba6d241b96f2..23349ce11f25 100644
--- a/metadata/md5-cache/app-admin/sshguard-2.4.2
+++ b/metadata/md5-cache/app-admin/sshguard-2.4.2
@@ -4,10 +4,10 @@ DEPEND=sys-devel/flex
 DESCRIPTION=protects hosts from brute force attacks against ssh
 EAPI=7
 HOMEPAGE=https://www.sshguard.net/
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=BSD
 RDEPEND=virtual/logger
 SLOT=0
 SRC_URI=mirror://sourceforge/sshguard/sshguard-2.4.2.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=41dc1d4d62c1267c566c0e87fe1db846
+_md5_=9a03a4b51caea593a7af843eb47944d9
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.33.2 b/metadata/md5-cache/app-admin/syslog-ng-3.33.2
index 838b0e4815a5..4f653fac3fc9 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.33.2
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.33.2
@@ -5,7 +5,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=7
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) test? ( python )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.33.2/syslog-ng-3.33.2.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=680af925378f0d338d57014e8d583911
+_md5_=7d49c5bc4cf191cd90a6074f74979bf6
diff --git a/metadata/md5-cache/app-admin/terraform-1.0.9 b/metadata/md5-cache/app-admin/terraform-1.0.9
new file mode 100644
index 000000000000..aff8674be3b0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/terraform-1.0.9
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=A tool for building, changing, and combining infrastructure safely
+EAPI=8
+HOMEPAGE=https://www.terraform.io/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/hashicorp/terraform/archive/v1.0.9.tar.gz -> terraform-1.0.9.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.72.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.74.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.78.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.79.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.79.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v45.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv45.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v47.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv47.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v51.2.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.2.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v52.5.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv52.5.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v52.5.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv52.5.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v11.1.2+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv11.1.2+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.10.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.10.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.18.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.18.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20180810175552-4a21cbd618b4.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20180810175552-4a21cbd618b4.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!chris!trenkamp/goxpath/@v/v0.0.0-20170922090931-c385f95c6022.mod -> github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20170922090931-c385f95c6022.mod mirror://goproxy//github.com/!chris!trenkamp/goxpath/@v/v0.0.0-20190607011252-c5096ec8773d.zip -> github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20190607011252-c5096ec8773d.zip mirror://goproxy//github.com/!chris!trenkamp/goxpath/@v/v0.0.0-20190607011252-c5096ec8773d.mod -> github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20190607011252-c5096ec8773d.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.zip -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.zip mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.mod -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!qcloud!api/qcloud_sign_golang/@v/v0.0.0-20141224014652-e4130a326409.mod -> github.com%2F!qcloud!api%2Fqcloud_sign_golang%2F@v%2Fv0.0.0-20141224014652-e4130a326409.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/agext/levenshtein/@v/v1.2.1.mod -> github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/agext/levenshtein/@v/v1.2.2.zip -> github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/agext/levenshtein/@v/v1.2.2.mod -> github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190329064014-6e358769c32a.zip -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190329064014-6e358769c32a.zip mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190329064014-6e358769c32a.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190329064014-6e358769c32a.mod mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190103054945-8205d1f41e70.zip -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190103054945-8205d1f41e70.zip mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190103054945-8205d1f41e70.mod -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190103054945-8205d1f41e70.mod mirror://goproxy//github.com/aliyun/aliyun-tablestore-go-sdk/@v/v4.1.2+incompatible.zip -> github.com%2Faliyun%2Faliyun-tablestore-go-sdk%2F@v%2Fv4.1.2+incompatible.zip mirror://goproxy//github.com/aliyun/aliyun-tablestore-go-sdk/@v/v4.1.2+incompatible.mod -> github.com%2Faliyun%2Faliyun-tablestore-go-sdk%2F@v%2Fv4.1.2+incompatible.mod mirror://goproxy//github.com/antchfx/xpath/@v/v0.0.0-20190129040759-c8489ed3251e.zip -> github.com%2Fantchfx%2Fxpath%2F@v%2Fv0.0.0-20190129040759-c8489ed3251e.zip mirror://goproxy//github.com/antchfx/xpath/@v/v0.0.0-20190129040759-c8489ed3251e.mod -> github.com%2Fantchfx%2Fxpath%2F@v%2Fv0.0.0-20190129040759-c8489ed3251e.mod mirror://goproxy//github.com/antchfx/xquery/@v/v0.0.0-20180515051857-ad5b8c7a47b0.zip -> github.com%2Fantchfx%2Fxquery%2F@v%2Fv0.0.0-20180515051857-ad5b8c7a47b0.zip mirror://goproxy//github.com/antchfx/xquery/@v/v0.0.0-20180515051857-ad5b8c7a47b0.mod -> github.com%2Fantchfx%2Fxquery%2F@v%2Fv0.0.0-20180515051857-ad5b8c7a47b0.mod mirror://goproxy//github.com/apparentlymart/go-cidr/@v/v1.1.0.zip -> github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/apparentlymart/go-cidr/@v/v1.1.0.mod -> github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/apparentlymart/go-dump/@v/v0.0.0-20180507223929-23540a00eaa3.mod -> github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20180507223929-23540a00eaa3.mod mirror://goproxy//github.com/apparentlymart/go-dump/@v/v0.0.0-20190214190832-042adf3cf4a0.zip -> github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20190214190832-042adf3cf4a0.zip mirror://goproxy//github.com/apparentlymart/go-dump/@v/v0.0.0-20190214190832-042adf3cf4a0.mod -> github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20190214190832-042adf3cf4a0.mod mirror://goproxy//github.com/apparentlymart/go-shquot/@v/v0.0.1.zip -> github.com%2Fapparentlymart%2Fgo-shquot%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/apparentlymart/go-shquot/@v/v0.0.1.mod -> github.com%2Fapparentlymart%2Fgo-shquot%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/apparentlymart/go-textseg/@v/v1.0.0.zip -> github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/apparentlymart/go-textseg/@v/v1.0.0.mod -> github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/apparentlymart/go-textseg/v13/@v/v13.0.0.zip -> github.com%2Fapparentlymart%2Fgo-textseg%2Fv13%2F@v%2Fv13.0.0.zip mirror://goproxy//github.com/apparentlymart/go-textseg/v13/@v/v13.0.0.mod -> github.com%2Fapparentlymart%2Fgo-textseg%2Fv13%2F@v%2Fv13.0.0.mod mirror://goproxy//github.com/apparentlymart/go-userdirs/@v/v0.0.0-20200915174352-b0c018a67c13.zip -> github.com%2Fapparentlymart%2Fgo-userdirs%2F@v%2Fv0.0.0-20200915174352-b0c018a67c13.zip mirror://goproxy//github.com/apparentlymart/go-userdirs/@v/v0.0.0-20200915174352-b0c018a67c13.mod -> github.com%2Fapparentlymart%2Fgo-userdirs%2F@v%2Fv0.0.0-20200915174352-b0c018a67c13.mod mirror://goproxy//github.com/apparentlymart/go-versions/@v/v1.0.1.zip -> github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/apparentlymart/go-versions/@v/v1.0.1.mod -> github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20190214190532-5111143e8da2.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20190214190532-5111143e8da2.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20190214190532-5111143e8da2.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20190214190532-5111143e8da2.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.78.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.31.9.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.9.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.40.25.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.40.25.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.40.25.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.40.25.mod mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.zip -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.zip mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.mod -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.zip -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.zip mirror://goproxy//github.com/bgentry/go-netrc/@v/v0.0.0-20140422174119-9fd32a8b3d3d.mod -> github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bmatcuk/doublestar/@v/v1.1.5.zip -> github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/bmatcuk/doublestar/@v/v1.1.5.mod -> github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.27.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.27.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200629203442-efcf912fb354.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.11.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20160705203006-01aeca54ebda.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20160705203006-01aeca54ebda.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.1.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.1.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dylanmei/iso8601/@v/v0.1.0.zip -> github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/dylanmei/iso8601/@v/v0.1.0.mod -> github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/dylanmei/winrmtest/@v/v0.0.0-20190225150635-99b7fe2fddf1.zip -> github.com%2Fdylanmei%2Fwinrmtest%2F@v%2Fv0.0.0-20190225150635-99b7fe2fddf1.zip mirror://goproxy//github.com/dylanmei/winrmtest/@v/v0.0.0-20190225150635-99b7fe2fddf1.mod -> github.com%2Fdylanmei%2Fwinrmtest%2F@v%2Fv0.0.0-20190225150635-99b7fe2fddf1.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.7.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v0.0.0-20190203023257-5858425f7550.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20190203023257-5858425f7550.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.1.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.3.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.3.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.2.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v3.3.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/gogo/protobuf/@v/v0.0.0-20171007142547-342cbe0a0415.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv0.0.0-20171007142547-342cbe0a0415.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.1.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20160524151835-7d79101e329e.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20160524151835-7d79101e329e.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.zip -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.zip mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201023163331-3e6fc7fc9c4c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201203190320-1bf35d6f28c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210122040257-d980be63207e.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210226084205-cbba55b83ad5.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20190126172459-c818fa66e4c8.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190126172459-c818fa66e4c8.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.6.1-0.20191122030953-d8ac278c1c9d.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.6.1-0.20191122030953-d8ac278c1c9d.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.10.1-0.20200424014253-c3bfe50899e5.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.10.1-0.20200424014253-c3bfe50899e5.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.10.1-0.20200424014253-c3bfe50899e5.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.10.1-0.20200424014253-c3bfe50899e5.mod mirror://goproxy//github.com/gophercloud/utils/@v/v0.0.0-20200423144003-7c72efc7435d.zip -> github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20200423144003-7c72efc7435d.zip mirror://goproxy//github.com/gophercloud/utils/@v/v0.0.0-20200423144003-7c72efc7435d.mod -> github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20200423144003-7c72efc7435d.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20170728041850-787624de3eb7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20170728041850-787624de3eb7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/aws-sdk-go-base/@v/v0.6.0.zip -> github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/hashicorp/aws-sdk-go-base/@v/v0.6.0.mod -> github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/hashicorp/consul/@v/v0.0.0-20171026175957-610f3c86a089.zip -> github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.zip mirror://goproxy//github.com/hashicorp/consul/@v/v0.0.0-20171026175957-610f3c86a089.mod -> github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-azure-helpers/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-azure-helpers/@v/v0.14.0.zip -> github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.14.0.zip mirror://goproxy//github.com/hashicorp/go-azure-helpers/@v/v0.14.0.mod -> github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.14.0.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-getter/@v/v1.5.2.zip -> github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/hashicorp/go-getter/@v/v1.5.2.mod -> github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.15.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.15.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.15.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.15.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v0.0.0-20180129170900-7f3cd4390caa.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20180129170900-7f3cd4390caa.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v0.0.0-20180129170900-7f3cd4390caa.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20180129170900-7f3cd4390caa.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.4.1.zip -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.4.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.2.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-safetemp/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-safetemp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.zip -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.mod -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v0.0.0-20180320115054-6d291a969b86.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv0.0.0-20180320115054-6d291a969b86.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v0.0.0-20180320115054-6d291a969b86.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv0.0.0-20180320115054-6d291a969b86.mod mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.15.0.zip -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.15.0.zip mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.15.0.mod -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.15.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20170504190234-a4b07c25de5f.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20170504190234-a4b07c25de5f.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20170504190234-a4b07c25de5f.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20170504190234-a4b07c25de5f.mod mirror://goproxy//github.com/hashicorp/hcl/v2/@v/v2.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/hashicorp/hcl/v2/@v/v2.10.1.zip -> github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.10.1.zip mirror://goproxy//github.com/hashicorp/hcl/v2/@v/v2.10.1.mod -> github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.10.1.mod mirror://goproxy//github.com/hashicorp/jsonapi/@v/v0.0.0-20210518035559-1e50d74c8db3.zip -> github.com%2Fhashicorp%2Fjsonapi%2F@v%2Fv0.0.0-20210518035559-1e50d74c8db3.zip mirror://goproxy//github.com/hashicorp/jsonapi/@v/v0.0.0-20210518035559-1e50d74c8db3.mod -> github.com%2Fhashicorp%2Fjsonapi%2F@v%2Fv0.0.0-20210518035559-1e50d74c8db3.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.0.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.0.0-20160124182025-e4ec8cc423bb.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.0.0-20160124182025-e4ec8cc423bb.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.0.0-20160124182025-e4ec8cc423bb.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.0.0-20160124182025-e4ec8cc423bb.mod mirror://goproxy//github.com/hashicorp/terraform-config-inspect/@v/v0.0.0-20210209133302-4fd17a0faac2.zip -> github.com%2Fhashicorp%2Fterraform-config-inspect%2F@v%2Fv0.0.0-20210209133302-4fd17a0faac2.zip mirror://goproxy//github.com/hashicorp/terraform-config-inspect/@v/v0.0.0-20210209133302-4fd17a0faac2.mod -> github.com%2Fhashicorp%2Fterraform-config-inspect%2F@v%2Fv0.0.0-20210209133302-4fd17a0faac2.mod mirror://goproxy//github.com/hashicorp/terraform-svchost/@v/v0.0.0-20200729002733-f050f53b9734.zip -> github.com%2Fhashicorp%2Fterraform-svchost%2F@v%2Fv0.0.0-20200729002733-f050f53b9734.zip mirror://goproxy//github.com/hashicorp/terraform-svchost/@v/v0.0.0-20200729002733-f050f53b9734.mod -> github.com%2Fhashicorp%2Fterraform-svchost%2F@v%2Fv0.0.0-20200729002733-f050f53b9734.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jhump/protoreflect/@v/v1.6.0.zip -> github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/jhump/protoreflect/@v/v1.6.0.mod -> github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180313100802-d8f9c0314926.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.zip mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180313100802-d8f9c0314926.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180701071628-ab8a2e0c74be.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180701071628-ab8a2e0c74be.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kardianos/osext/@v/v0.0.0-20190222173326-2bc1f35cddc0.zip -> github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.zip mirror://goproxy//github.com/kardianos/osext/@v/v0.0.0-20190222173326-2bc1f35cddc0.mod -> github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.2.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.2.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.11.2.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.8.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.8.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190309162924-0a377eecf7aa.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190418170008-ace88ad0983b.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190501133040-e77ea8b19cdc.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.20.15.zip -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.15.zip mirror://goproxy//github.com/likexian/gokit/@v/v0.20.15.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.15.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190409170913-40473a74d76d.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190419151922-c1f9f0b4f084.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190502021454-d8787b4bfa0b.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.mod mirror://goproxy//github.com/lusis/go-artifactory/@v/v0.0.0-20160115162124-7e4ce345df82.zip -> github.com%2Flusis%2Fgo-artifactory%2F@v%2Fv0.0.0-20160115162124-7e4ce345df82.zip mirror://goproxy//github.com/lusis/go-artifactory/@v/v0.0.0-20160115162124-7e4ce345df82.mod -> github.com%2Flusis%2Fgo-artifactory%2F@v%2Fv0.0.0-20160115162124-7e4ce345df82.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/masterzen/simplexml/@v/v0.0.0-20160608183007-4572e39b1ab9.mod -> github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20160608183007-4572e39b1ab9.mod mirror://goproxy//github.com/masterzen/simplexml/@v/v0.0.0-20190410153822-31eea3082786.zip -> github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20190410153822-31eea3082786.zip mirror://goproxy//github.com/masterzen/simplexml/@v/v0.0.0-20190410153822-31eea3082786.mod -> github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20190410153822-31eea3082786.mod mirror://goproxy//github.com/masterzen/winrm/@v/v0.0.0-20200615185753-c42b5136ff88.zip -> github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20200615185753-c42b5136ff88.zip mirror://goproxy//github.com/masterzen/winrm/@v/v0.0.0-20200615185753-c42b5136ff88.mod -> github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20200615185753-c42b5136ff88.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.4.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.4.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.8.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.8.zip mirror://goproxy//github.com/miekg/dns/@v/v1.0.8.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.8.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.zip -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.mod -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-linereader/@v/v0.0.0-20190213213312-1b945b3263eb.zip -> github.com%2Fmitchellh%2Fgo-linereader%2F@v%2Fv0.0.0-20190213213312-1b945b3263eb.zip mirror://goproxy//github.com/mitchellh/go-linereader/@v/v0.0.0-20190213213312-1b945b3263eb.mod -> github.com%2Fmitchellh%2Fgo-linereader%2F@v%2Fv0.0.0-20190213213312-1b945b3263eb.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v0.0.0-20150314170334-ad45545899c7.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv0.0.0-20150314170334-ad45545899c7.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/panicwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpanicwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/panicwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpanicwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mozillazg/go-httpheader/@v/v0.2.1.zip -> github.com%2Fmozillazg%2Fgo-httpheader%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/mozillazg/go-httpheader/@v/v0.2.1.mod -> github.com%2Fmozillazg%2Fgo-httpheader%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nu7hatch/gouuid/@v/v0.0.0-20131221200532-179d4d0c4d8d.zip -> github.com%2Fnu7hatch%2Fgouuid%2F@v%2Fv0.0.0-20131221200532-179d4d0c4d8d.zip mirror://goproxy//github.com/nu7hatch/gouuid/@v/v0.0.0-20131221200532-179d4d0c4d8d.mod -> github.com%2Fnu7hatch%2Fgouuid%2F@v%2Fv0.0.0-20131221200532-179d4d0c4d8d.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.zip -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20190113212917-5533ce8a0da3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20190113212917-5533ce8a0da3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packer-community/winrmcp/@v/v0.0.0-20180921211025-c76d91c1e7db.zip -> github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180921211025-c76d91c1e7db.zip mirror://goproxy//github.com/packer-community/winrmcp/@v/v0.0.0-20180921211025-c76d91c1e7db.mod -> github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180921211025-c76d91c1e7db.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20201207095918-0426ae3fba23.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20201207095918-0426ae3fba23.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20201207095918-0426ae3fba23.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20201207095918-0426ae3fba23.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.1.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.2.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/@v/v1.0.194.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2Ftencentcloud%2Fcommon%2F@v%2Fv1.0.194.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/@v/v1.0.232.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2Ftencentcloud%2Fcommon%2F@v%2Fv1.0.232.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/@v/v1.0.232.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2Ftencentcloud%2Fcommon%2F@v%2Fv1.0.232.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms/@v/v1.0.194.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2Ftencentcloud%2Fkms%2F@v%2Fv1.0.194.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tag/@v/v1.0.233.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2Ftencentcloud%2Ftag%2F@v%2Fv1.0.233.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tag/@v/v1.0.233.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2Ftencentcloud%2Ftag%2F@v%2Fv1.0.233.mod mirror://goproxy//github.com/tencentyun/cos-go-sdk-v5/@v/v0.7.29.zip -> github.com%2Ftencentyun%2Fcos-go-sdk-v5%2F@v%2Fv0.7.29.zip mirror://goproxy//github.com/tencentyun/cos-go-sdk-v5/@v/v0.7.29.mod -> github.com%2Ftencentyun%2Fcos-go-sdk-v5%2F@v%2Fv0.7.29.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20200427203606-3cfed13b9966.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20200427203606-3cfed13b9966.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20200427203606-3cfed13b9966.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20200427203606-3cfed13b9966.mod mirror://goproxy//github.com/tombuildsstuff/giovanni/@v/v0.15.1.zip -> github.com%2Ftombuildsstuff%2Fgiovanni%2F@v%2Fv0.15.1.zip mirror://goproxy//github.com/tombuildsstuff/giovanni/@v/v0.15.1.mod -> github.com%2Ftombuildsstuff%2Fgiovanni%2F@v%2Fv0.15.1.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.8.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.8.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.8.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.8.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/vmihailenco/msgpack/@v/v3.3.3+incompatible.zip -> github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv3.3.3+incompatible.zip mirror://goproxy//github.com/vmihailenco/msgpack/@v/v3.3.3+incompatible.mod -> github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv3.3.3+incompatible.mod mirror://goproxy//github.com/vmihailenco/msgpack/v4/@v/v4.3.12.zip -> github.com%2Fvmihailenco%2Fmsgpack%2Fv4%2F@v%2Fv4.3.12.zip mirror://goproxy//github.com/vmihailenco/msgpack/v4/@v/v4.3.12.mod -> github.com%2Fvmihailenco%2Fmsgpack%2Fv4%2F@v%2Fv4.3.12.mod mirror://goproxy//github.com/vmihailenco/tagparser/@v/v0.1.1.zip -> github.com%2Fvmihailenco%2Ftagparser%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/vmihailenco/tagparser/@v/v0.1.1.mod -> github.com%2Fvmihailenco%2Ftagparser%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.zip -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.mod -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20161029104018-1d6e34225557.zip -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20161029104018-1d6e34225557.zip mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20161029104018-1d6e34225557.mod -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20161029104018-1d6e34225557.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.0.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.1.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.2.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.8.0.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/zclconf/go-cty/@v/v1.9.1.zip -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.9.1.zip mirror://goproxy//github.com/zclconf/go-cty/@v/v1.9.1.mod -> github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/zclconf/go-cty-debug/@v/v0.0.0-20191215020915-b22d67c1ba0b.zip -> github.com%2Fzclconf%2Fgo-cty-debug%2F@v%2Fv0.0.0-20191215020915-b22d67c1ba0b.zip mirror://goproxy//github.com/zclconf/go-cty-debug/@v/v0.0.0-20191215020915-b22d67c1ba0b.mod -> github.com%2Fzclconf%2Fgo-cty-debug%2F@v%2Fv0.0.0-20191215020915-b22d67c1ba0b.mod mirror://goproxy//github.com/zclconf/go-cty-yaml/@v/v1.0.2.zip -> github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/zclconf/go-cty-yaml/@v/v1.0.2.mod -> github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20210428180535-15715dcf1ace.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20210428180535-15715dcf1ace.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20210428180535-15715dcf1ace.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20210428180535-15715dcf1ace.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.zip -> go.opencensus.io%2F@v%2Fv0.23.0.zip mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181025213731-e84da0312774.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181025213731-e84da0312774.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190219172222-a4c6cb3142f2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190222235706-ffb98f73852f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190222235706-ffb98f73852f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190426145343-a29dc8fdc734.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191202143827-86a70503ff7e.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191202143827-86a70503ff7e.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.2.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180530234432-1e491301e022.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180530234432-1e491301e022.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180811021610-c39426892332.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180811021610-c39426892332.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190206173232-65e2d4e15006.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190206173232-65e2d4e15006.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190812203447-cdfb69ac37fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190812203447-cdfb69ac37fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191009170851-d66e71096ffb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191009170851-d66e71096ffb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191126235420-ef20fe5d7933.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191126235420-ef20fe5d7933.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201209123823-ac852fbbde11.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210614182718-04defd469f4e.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210614182718-04defd469f4e.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210614182718-04defd469f4e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210614182718-04defd469f4e.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210220000619-9bb904979d93.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190221075227-b4e8571b14e0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502175342-a43fa875dd82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502175342-a43fa875dd82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190509141414-a5b02f93d862.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190509141414-a5b02f93d862.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191128015809-6d18c012aee9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191128015809-6d18c012aee9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210220050731-9a76102bfb43.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201210144234-2321bbc49cbf.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201210144234-2321bbc49cbf.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20161028155119-f51c12702a4d.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20161028155119-f51c12702a4d.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191203134012-c197fd4bf371.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191203134012-c197fd4bf371.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201110124207-079ba7bd75cd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201201161351-ac6f37ff4c2a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210105154028-b0ab187a4818.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.35.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod mirror://goproxy//google.golang.org/api/@v/v0.36.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod mirror://goproxy//google.golang.org/api/@v/v0.40.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod mirror://goproxy//google.golang.org/api/@v/v0.41.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod mirror://goproxy//google.golang.org/api/@v/v0.44.0-impersonate-preview.zip -> google.golang.org%2Fapi%2F@v%2Fv0.44.0-impersonate-preview.zip mirror://goproxy//google.golang.org/api/@v/v0.44.0-impersonate-preview.mod -> google.golang.org%2Fapi%2F@v%2Fv0.44.0-impersonate-preview.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20170818010345-ee236bd376b0.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20170818010345-ee236bd376b0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201109203340-2640f1f9cdfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201201144952-b05cb90ed32e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201210142538-e3217bee35cc.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201210142538-e3217bee35cc.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201214200347-8c77b98c765d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210222152913-aa3ee6e6a81c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210222152913-aa3ee6e6a81c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210310155132-4ce2db91004e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210310155132-4ce2db91004e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod mirror://goproxy//google.golang.org/grpc/@v/v1.8.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.8.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.34.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.35.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.27.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190620084959-7cf5895f2711.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190620084959-7cf5895f2711.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20190620084959-7cf5895f2711.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190620084959-7cf5895f2711.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190612205821-1799e75a0719.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190612205821-1799e75a0719.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190913080033-27d36303b655.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190913080033-27d36303b655.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190913080033-27d36303b655.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190913080033-27d36303b655.mod mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20190620085101-78d2af792bab.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20190620085101-78d2af792bab.zip mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20190620085101-78d2af792bab.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20190620085101-78d2af792bab.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.1.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.1.mod mirror://goproxy//k8s.io/klog/@v/v0.4.0.zip -> k8s.io%2Fklog%2F@v%2Fv0.4.0.zip mirror://goproxy//k8s.io/klog/@v/v0.4.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.4.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190228160746-b3a7cee44a30.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190228160746-b3a7cee44a30.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190221042446-c2654d5206da.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190221042446-c2654d5206da.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200411171748-3d5a2fe318e4.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200411171748-3d5a2fe318e4.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200411171748-3d5a2fe318e4.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200411171748-3d5a2fe318e4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61
+_md5_=04eafb6ba93011c34fd436b1c010abba
diff --git a/metadata/md5-cache/app-admin/ulogd-2.0.7-r3 b/metadata/md5-cache/app-admin/ulogd-2.0.7-r3
index 119183b6928d..9a436c7a46d6 100644
--- a/metadata/md5-cache/app-admin/ulogd-2.0.7-r3
+++ b/metadata/md5-cache/app-admin/ulogd-2.0.7-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson:= ) nfacct? ( >=net-libs/libmnl-1.0.4 >=net-libs/libnetfilter_acct-1.0.3 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) nflog? ( >=net-libs/libnetfilter_log-1.0.1 ) mysql? ( dev-db/mysql-connector-c:= ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) acct-user/ulogd acct-group/ulogd selinux? ( sec-policy/selinux-ulogd )
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/ulogd/files/ulogd-2.0.7.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8f488ffc1b481afea466853efca6c7f5
diff --git a/metadata/md5-cache/app-admin/usbview-2.0 b/metadata/md5-cache/app-admin/usbview-2.0
index 5a78c6ca782e..aac03cdd31f1 100644
--- a/metadata/md5-cache/app-admin/usbview-2.0
+++ b/metadata/md5-cache/app-admin/usbview-2.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=http://www.kroah.com/linux-usb/usbview-2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0da8448f93888ab19884604ec365f75a
diff --git a/metadata/md5-cache/app-admin/vault-1.8.2 b/metadata/md5-cache/app-admin/vault-1.8.2
deleted file mode 100644
index 3de99613b9ef..000000000000
--- a/metadata/md5-cache/app-admin/vault-1.8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-go/gox >=dev-lang/go-1.15.3 filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=acct-group/vault acct-user/vault
-DESCRIPTION=A tool for managing secrets
-EAPI=7
-HOMEPAGE=https://vaultproject.io/
-IUSE=+webui +filecaps
-KEYWORDS=amd64
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
-RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/vault/archive/v1.8.2.tar.gz -> vault-1.8.2.tar.gz webui? ( https://dev.gentoo.org/~zmedico/dist/vault-1.8.2-webui.tar.xz ) mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.39.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.6.0.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.6.0.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/spanner/@v/v1.5.1.zip -> cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.5.1.zip mirror://goproxy//cloud.google.com/go/spanner/@v/v1.5.1.mod -> cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.5.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.zip -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.zip mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.mod -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//git.apache.org/thrift.git/@v/v0.12.0.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.3.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.3.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v36.2.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v44.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv44.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v51.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v51.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.13.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.13.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.13.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.17.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.17.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.17.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.17.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.7.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.11.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.11.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.11.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.11.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.7.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.7.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!jeffail/gabs/@v/v1.1.1.zip -> github.com%2F!jeffail%2Fgabs%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!jeffail/gabs/@v/v1.1.1.mod -> github.com%2F!jeffail%2Fgabs%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!knetic/govaluate/@v/v3.0.1-0.20171022003610-9aa49832a739+incompatible.mod -> github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.zip -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.zip mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.mod -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.13.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.13.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16-0.20201130162521-d1ffc52c7331.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16-0.20201130162521-d1ffc52c7331.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!nvveen/!gotty/@v/v0.0.0-20120604004816-cd527374f1e5.zip -> github.com%2F!nvveen%2F!gotty%2F@v%2Fv0.0.0-20120604004816-cd527374f1e5.zip mirror://goproxy//github.com/!nvveen/!gotty/@v/v0.0.0-20120604004816-cd527374f1e5.mod -> github.com%2F!nvveen%2F!gotty%2F@v%2Fv0.0.0-20120604004816-cd527374f1e5.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!s!a!p/go-hdb/@v/v0.14.1.zip -> github.com%2F!s!a!p%2Fgo-hdb%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/!s!a!p/go-hdb/@v/v0.14.1.mod -> github.com%2F!s!a!p%2Fgo-hdb%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/!sectorbob/mlab-ns2/@v/v0.0.0-20171030222938-d3aa0c295a8a.zip -> github.com%2F!sectorbob%2Fmlab-ns2%2F@v%2Fv0.0.0-20171030222938-d3aa0c295a8a.zip mirror://goproxy//github.com/!sectorbob/mlab-ns2/@v/v0.0.0-20171030222938-d3aa0c295a8a.mod -> github.com%2F!sectorbob%2Fmlab-ns2%2F@v%2Fv0.0.0-20171030222938-d3aa0c295a8a.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.19.0.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/!vivid!cortex/gohistogram/@v/v1.0.0.mod -> github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v3.1.1+incompatible.zip -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv3.1.1+incompatible.zip mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v3.1.1+incompatible.mod -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/afex/hystrix-go/@v/v0.0.0-20180502004556-fa1af6a1f4f5.mod -> github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190412020505-60e2075261b6.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190412020505-60e2075261b6.mod mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190620160927-9418d7b0cd0f.zip -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190620160927-9418d7b0cd0f.zip mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190620160927-9418d7b0cd0f.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190620160927-9418d7b0cd0f.mod mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190307165228-86c17b95fcd5.zip -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190307165228-86c17b95fcd5.zip mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190307165228-86c17b95fcd5.mod -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190307165228-86c17b95fcd5.mod mirror://goproxy//github.com/apache/arrow/go/arrow/@v/v0.0.0-20200601151325-b2287a20f230.zip -> github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20200601151325-b2287a20f230.zip mirror://goproxy//github.com/apache/arrow/go/arrow/@v/v0.0.0-20200601151325-b2287a20f230.mod -> github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20200601151325-b2287a20f230.mod mirror://goproxy//github.com/apache/thrift/@v/v0.12.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/apache/thrift/@v/v0.13.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/apple/foundationdb/bindings/go/@v/v0.0.0-20190411004307-cd5c9d91fad2.zip -> github.com%2Fapple%2Ffoundationdb%2Fbindings%2Fgo%2F@v%2Fv0.0.0-20190411004307-cd5c9d91fad2.zip mirror://goproxy//github.com/apple/foundationdb/bindings/go/@v/v0.0.0-20190411004307-cd5c9d91fad2.mod -> github.com%2Fapple%2Ffoundationdb%2Fbindings%2Fgo%2F@v%2Fv0.0.0-20190411004307-cd5c9d91fad2.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.3.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.7.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.7.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.7.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/armon/go-proxyproto/@v/v0.0.0-20210323213023-7e956b284f0a.zip -> github.com%2Farmon%2Fgo-proxyproto%2F@v%2Fv0.0.0-20210323213023-7e956b284f0a.zip mirror://goproxy//github.com/armon/go-proxyproto/@v/v0.0.0-20210323213023-7e956b284f0a.mod -> github.com%2Farmon%2Fgo-proxyproto%2F@v%2Fv0.0.0-20210323213023-7e956b284f0a.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aryann/difflib/@v/v0.0.0-20170710044230-e206f873d14a.mod -> github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.13.3.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.0.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.30.27.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.27.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.28.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.28.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.19.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.19.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.19.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.19.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.18.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v1.3.2.zip -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v1.3.2.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/config/@v/v1.1.5.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fconfig%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/config/@v/v1.1.5.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fconfig%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/credentials/@v/v1.1.5.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fcredentials%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/credentials/@v/v1.1.5.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fcredentials%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/feature/ec2/imds/@v/v1.0.6.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Ffeature%2Fec2%2Fimds%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/feature/ec2/imds/@v/v1.0.6.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Ffeature%2Fec2%2Fimds%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/feature/s3/manager/@v/v1.1.2.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Ffeature%2Fs3%2Fmanager%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/feature/s3/manager/@v/v1.1.2.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Ffeature%2Fs3%2Fmanager%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/@v/v1.0.4.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Faccept-encoding%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/@v/v1.0.4.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Faccept-encoding%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/@v/v1.0.6.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Fpresigned-url%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/@v/v1.0.6.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Fpresigned-url%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/s3shared/@v/v1.2.2.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Fs3shared%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/s3shared/@v/v1.2.2.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Fs3shared%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/s3/@v/v1.5.0.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fs3%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/s3/@v/v1.5.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fs3%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/sso/@v/v1.1.5.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fsso%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/sso/@v/v1.1.5.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fsso%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/sts/@v/v1.2.2.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fsts%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/sts/@v/v1.2.2.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fsts%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/aws/smithy-go/@v/v1.3.1.zip -> github.com%2Faws%2Fsmithy-go%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/aws/smithy-go/@v/v1.3.1.mod -> github.com%2Faws%2Fsmithy-go%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.zip -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.zip mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.mod -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bitly/go-hostpool/@v/v0.0.0-20171023180738-a3a6125de932.mod -> github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.0.0-20171023180738-a3a6125de932.mod mirror://goproxy//github.com/bitly/go-hostpool/@v/v0.1.0.zip -> github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bitly/go-hostpool/@v/v0.1.0.mod -> github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.zip -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.zip mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/boombuler/barcode/@v/v1.0.1-0.20190219062509-6c824513bacc.zip -> github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1-0.20190219062509-6c824513bacc.zip mirror://goproxy//github.com/boombuler/barcode/@v/v1.0.1-0.20190219062509-6c824513bacc.mod -> github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1-0.20190219062509-6c824513bacc.mod mirror://goproxy//github.com/briankassouf/jose/@v/v0.9.2-0.20180619214549-d2569464773f.zip -> github.com%2Fbriankassouf%2Fjose%2F@v%2Fv0.9.2-0.20180619214549-d2569464773f.zip mirror://goproxy//github.com/briankassouf/jose/@v/v0.9.2-0.20180619214549-d2569464773f.mod -> github.com%2Fbriankassouf%2Fjose%2F@v%2Fv0.9.2-0.20180619214549-d2569464773f.mod mirror://goproxy//github.com/c2h5oh/datasize/@v/v0.0.0-20200112174442-28bbd4740fee.mod -> github.com%2Fc2h5oh%2Fdatasize%2F@v%2Fv0.0.0-20200112174442-28bbd4740fee.mod mirror://goproxy//github.com/casbin/casbin/v2/@v/v2.1.2.mod -> github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/cenkalti/backoff/v3/@v/v3.0.0.zip -> github.com%2Fcenkalti%2Fbackoff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/cenkalti/backoff/v3/@v/v3.0.0.mod -> github.com%2Fcenkalti%2Fbackoff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/centrify/cloud-golang-sdk/@v/v0.0.0-20190214225812-119110094d0f.zip -> github.com%2Fcentrify%2Fcloud-golang-sdk%2F@v%2Fv0.0.0-20190214225812-119110094d0f.zip mirror://goproxy//github.com/centrify/cloud-golang-sdk/@v/v0.0.0-20190214225812-119110094d0f.mod -> github.com%2Fcentrify%2Fcloud-golang-sdk%2F@v%2Fv0.0.0-20190214225812-119110094d0f.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chrismalek/oktasdk-go/@v/v0.0.0-20181212195951-3430665dfaa0.zip -> github.com%2Fchrismalek%2Foktasdk-go%2F@v%2Fv0.0.0-20181212195951-3430665dfaa0.zip mirror://goproxy//github.com/chrismalek/oktasdk-go/@v/v0.0.0-20181212195951-3430665dfaa0.mod -> github.com%2Fchrismalek%2Foktasdk-go%2F@v%2Fv0.0.0-20181212195951-3430665dfaa0.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/clbanning/x2j/@v/v0.0.0-20191024224557-825249438eec.mod -> github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.zip -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190201205600-f136f9222381.zip -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190201205600-f136f9222381.zip mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190201205600-f136f9222381.mod -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190201205600-f136f9222381.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cockroachdb/cockroach-go/@v/v0.0.0-20181001143604-e0a95dfd547c.zip -> github.com%2Fcockroachdb%2Fcockroach-go%2F@v%2Fv0.0.0-20181001143604-e0a95dfd547c.zip mirror://goproxy//github.com/cockroachdb/cockroach-go/@v/v0.0.0-20181001143604-e0a95dfd547c.mod -> github.com%2Fcockroachdb%2Fcockroach-go%2F@v%2Fv0.0.0-20181001143604-e0a95dfd547c.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codahale/hdrhistogram/@v/v0.0.0-20161010025455-3a0bb77429bd.mod -> github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.zip -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190827140505-75bee3e2ccb6.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190827140505-75bee3e2ccb6.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200710164510-efbc4488d8fe.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200710164510-efbc4488d8fe.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/v3/@v/v3.0.0.zip -> github.com%2Fcoreos%2Fgo-oidc%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/coreos/go-oidc/v3/@v/v3.0.0.mod -> github.com%2Fcoreos%2Fgo-oidc%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/couchbase/gocb/v2/@v/v2.1.4.zip -> github.com%2Fcouchbase%2Fgocb%2Fv2%2F@v%2Fv2.1.4.zip mirror://goproxy//github.com/couchbase/gocb/v2/@v/v2.1.4.mod -> github.com%2Fcouchbase%2Fgocb%2Fv2%2F@v%2Fv2.1.4.mod mirror://goproxy//github.com/couchbase/gocbcore/v9/@v/v9.0.4.zip -> github.com%2Fcouchbase%2Fgocbcore%2Fv9%2F@v%2Fv9.0.4.zip mirror://goproxy//github.com/couchbase/gocbcore/v9/@v/v9.0.4.mod -> github.com%2Fcouchbase%2Fgocbcore%2Fv9%2F@v%2Fv9.0.4.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200428022330-06a60b6afbbc.zip -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200428022330-06a60b6afbbc.zip mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200428022330-06a60b6afbbc.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200428022330-06a60b6afbbc.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.7.5.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.7.5.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.7.5.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.7.5.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.1.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.1.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20200319182547-c7ad2b866182.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200319182547-c7ad2b866182.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dsnet/compress/@v/v0.0.1.zip -> github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/dsnet/compress/@v/v0.0.1.mod -> github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/dsnet/golib/@v/v0.0.0-20171103203638-1ea166775780.mod -> github.com%2Fdsnet%2Fgolib%2F@v%2Fv0.0.0-20171103203638-1ea166775780.mod mirror://goproxy//github.com/duosecurity/duo_api_golang/@v/v0.0.0-20190308151101-6c680f768e74.zip -> github.com%2Fduosecurity%2Fduo_api_golang%2F@v%2Fv0.0.0-20190308151101-6c680f768e74.zip mirror://goproxy//github.com/duosecurity/duo_api_golang/@v/v0.0.0-20190308151101-6c680f768e74.mod -> github.com%2Fduosecurity%2Fduo_api_golang%2F@v%2Fv0.0.0-20190308151101-6c680f768e74.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/edsrzf/mmap-go/@v/v1.0.0.mod -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v1.0.1-0.20200509193318-234c15e7648f.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.1-0.20200509193318-234c15e7648f.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v1.0.1-0.20200509193318-234c15e7648f.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.1-0.20200509193318-234c15e7648f.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.6.9.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v0.0.0-20190203023257-5858425f7550.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20190203023257-5858425f7550.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.11.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.11.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.zip -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/franela/goblin/@v/v0.0.0-20200105215937-c9ffbefa60db.mod -> github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod mirror://goproxy//github.com/franela/goreq/@v/v0.0.0-20171204163338-bcd34c9993f8.mod -> github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.10.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.13.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.13.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/gammazero/deque/@v/v0.0.0-20190130191400-2afb3858e9c7.zip -> github.com%2Fgammazero%2Fdeque%2F@v%2Fv0.0.0-20190130191400-2afb3858e9c7.zip mirror://goproxy//github.com/gammazero/deque/@v/v0.0.0-20190130191400-2afb3858e9c7.mod -> github.com%2Fgammazero%2Fdeque%2F@v%2Fv0.0.0-20190130191400-2afb3858e9c7.mod mirror://goproxy//github.com/gammazero/workerpool/@v/v0.0.0-20190406235159-88d534f22b56.zip -> github.com%2Fgammazero%2Fworkerpool%2F@v%2Fv0.0.0-20190406235159-88d534f22b56.zip mirror://goproxy//github.com/gammazero/workerpool/@v/v0.0.0-20190406235159-88d534f22b56.mod -> github.com%2Fgammazero%2Fworkerpool%2F@v%2Fv0.0.0-20190406235159-88d534f22b56.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.1-0.20190212211648-25d852aebe32.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.1-0.20190212211648-25d852aebe32.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.4.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.1.zip -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.zip -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.7.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.7.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.10.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.10.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.4.zip -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.4.zip mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.4.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.4.mod mirror://goproxy//github.com/go-ldap/ldif/@v/v0.0.0-20200320164324-fd88d9b715b3.zip -> github.com%2Fgo-ldap%2Fldif%2F@v%2Fv0.0.0-20200320164324-fd88d9b715b3.zip mirror://goproxy//github.com/go-ldap/ldif/@v/v0.0.0-20200320164324-fd88d9b715b3.mod -> github.com%2Fgo-ldap%2Fldif%2F@v%2Fv0.0.0-20200320164324-fd88d9b715b3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.zip -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.1.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.7.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.7.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.7.mod mirror://goproxy//github.com/go-yaml/yaml/@v/v2.1.0+incompatible.zip -> github.com%2Fgo-yaml%2Fyaml%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/go-yaml/yaml/@v/v2.1.0+incompatible.mod -> github.com%2Fgo-yaml%2Fyaml%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/gobuffalo/attrs/@v/v0.0.0-20190224210810-a9411de4debd.mod -> github.com%2Fgobuffalo%2Fattrs%2F@v%2Fv0.0.0-20190224210810-a9411de4debd.mod mirror://goproxy//github.com/gobuffalo/depgen/@v/v0.0.0-20190329151759-d478694a28d3.mod -> github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.0.0-20190329151759-d478694a28d3.mod mirror://goproxy//github.com/gobuffalo/depgen/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.6.15.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.6.15.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.7.0.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.3.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.0.0-20190329151137-27723ad26ef9.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190329151137-27723ad26ef9.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.0.0-20190403191548-3ca520ef0d9e.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190403191548-3ca520ef0d9e.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/gitgen/@v/v0.0.0-20190315122116-cc086187d211.mod -> github.com%2Fgobuffalo%2Fgitgen%2F@v%2Fv0.0.0-20190315122116-cc086187d211.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.0.0-20190315121717-8f38393713f5.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.0.0-20190315121717-8f38393713f5.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/logger/@v/v0.0.0-20190315122211-86e12af44bc2.mod -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv0.0.0-20190315122211-86e12af44bc2.mod mirror://goproxy//github.com/gobuffalo/mapi/@v/v1.0.1.mod -> github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/gobuffalo/mapi/@v/v1.0.2.mod -> github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.0.0-20190315124812-a385830c7fc0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.0.0-20190315124812-a385830c7fc0.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.0.9.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.0.9.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.2.0.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/gobuffalo/syncx/@v/v0.0.0-20190224160051-33c29581e754.mod -> github.com%2Fgobuffalo%2Fsyncx%2F@v%2Fv0.0.0-20190224160051-33c29581e754.mod mirror://goproxy//github.com/gocql/gocql/@v/v0.0.0-20210401103645-80ab1e13e309.zip -> github.com%2Fgocql%2Fgocql%2F@v%2Fv0.0.0-20210401103645-80ab1e13e309.zip mirror://goproxy//github.com/gocql/gocql/@v/v0.0.0-20210401103645-80ab1e13e309.mod -> github.com%2Fgocql%2Fgocql%2F@v%2Fv0.0.0-20210401103645-80ab1e13e309.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/goji/httpauth/@v/v0.0.0-20160601135302-2da839ab0f4d.mod -> github.com%2Fgoji%2Fhttpauth%2F@v%2Fv0.0.0-20160601135302-2da839ab0f4d.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.zip -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20170215233205-553a64147049.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20170215233205-553a64147049.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.2.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.4.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.4.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/flatbuffers/@v/v1.11.0.zip -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/google/flatbuffers/@v/v1.11.0.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-metrics-stackdriver/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-metrics-stackdriver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-metrics-stackdriver/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-metrics-stackdriver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180628210949-0892b62f0d9f.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180628210949-0892b62f0d9f.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20180427100037-88b0669f7d75.zip -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20180427100037-88b0669f7d75.zip mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20180427100037-88b0669f7d75.mod -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20180427100037-88b0669f7d75.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.6.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.zip -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/sessions/@v/v1.2.0.zip -> github.com%2Fgorilla%2Fsessions%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/gorilla/sessions/@v/v1.2.0.mod -> github.com%2Fgorilla%2Fsessions%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gotestyourself/gotestyourself/@v/v2.2.0+incompatible.zip -> github.com%2Fgotestyourself%2Fgotestyourself%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/gotestyourself/gotestyourself/@v/v2.2.0+incompatible.mod -> github.com%2Fgotestyourself%2Fgotestyourself%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.6.2.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hailocab/go-hostpool/@v/v0.0.0-20160125115350-e80d13ce29ed.zip -> github.com%2Fhailocab%2Fgo-hostpool%2F@v%2Fv0.0.0-20160125115350-e80d13ce29ed.zip mirror://goproxy//github.com/hailocab/go-hostpool/@v/v0.0.0-20160125115350-e80d13ce29ed.mod -> github.com%2Fhailocab%2Fgo-hostpool%2F@v%2Fv0.0.0-20160125115350-e80d13ce29ed.mod mirror://goproxy//github.com/hashicorp/cap/@v/v0.1.0.zip -> github.com%2Fhashicorp%2Fcap%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/hashicorp/cap/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fcap%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/consul-template/@v/v0.26.0.zip -> github.com%2Fhashicorp%2Fconsul-template%2F@v%2Fv0.26.0.zip mirror://goproxy//github.com/hashicorp/consul-template/@v/v0.26.0.mod -> github.com%2Fhashicorp%2Fconsul-template%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.4.0.zip -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.4.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.1-0.20200910203702-bb2b5dd871ca.zip -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.1-0.20200910203702-bb2b5dd871ca.zip mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.1-0.20200910203702-bb2b5dd871ca.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.1-0.20200910203702-bb2b5dd871ca.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-bindata/@v/v3.0.8-0.20180209072458-bf7910af8997+incompatible.zip -> github.com%2Fhashicorp%2Fgo-bindata%2F@v%2Fv3.0.8-0.20180209072458-bf7910af8997+incompatible.zip mirror://goproxy//github.com/hashicorp/go-bindata/@v/v3.0.8-0.20180209072458-bf7910af8997+incompatible.mod -> github.com%2Fhashicorp%2Fgo-bindata%2F@v%2Fv3.0.8-0.20180209072458-bf7910af8997+incompatible.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.2.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20201029210230-738cb3105cd0.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20201029210230-738cb3105cd0.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20201029210230-738cb3105cd0.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20201029210230-738cb3105cd0.mod mirror://goproxy//github.com/hashicorp/go-gatedio/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-gatedio/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-gcp-common/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-gcp-common/@v/v0.7.0.zip -> github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/hashicorp/go-gcp-common/@v/v0.7.0.mod -> github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.15.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.15.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.16.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.16.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/@v/v0.5.16.zip -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2F@v%2Fv0.5.16.zip mirror://goproxy//github.com/hashicorp/go-kms-wrapping/@v/v0.5.16.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2F@v%2Fv0.5.16.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.zip -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v1.1.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v1.1.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.3-0.20191002164813-7e9e8525653a.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.3-0.20191002164813-7e9e8525653a.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.3-0.20191002164813-7e9e8525653a.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.3-0.20191002164813-7e9e8525653a.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-secure-stdlib/strutil/@v/v0.1.1.zip -> github.com%2Fhashicorp%2Fgo-secure-stdlib%2Fstrutil%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/hashicorp/go-secure-stdlib/strutil/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fgo-secure-stdlib%2Fstrutil%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.zip -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.mod -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.1-vault-3.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.1-vault-3.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.1-vault-3.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.1-vault-3.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/nomad/api/@v/v0.0.0-20191220223628-edc62acd919d.zip -> github.com%2Fhashicorp%2Fnomad%2Fapi%2F@v%2Fv0.0.0-20191220223628-edc62acd919d.zip mirror://goproxy//github.com/hashicorp/nomad/api/@v/v0.0.0-20191220223628-edc62acd919d.mod -> github.com%2Fhashicorp%2Fnomad%2Fapi%2F@v%2Fv0.0.0-20191220223628-edc62acd919d.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2-0.20191002163536-9c6bd3e3eb17.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2-0.20191002163536-9c6bd3e3eb17.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.3.zip -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/v2/@v/v2.0.0-20210421194847-a7e34179d62c.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2Fv2%2F@v%2Fv2.0.0-20210421194847-a7e34179d62c.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/v2/@v/v2.0.0-20210421194847-a7e34179d62c.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2Fv2%2F@v%2Fv2.0.0-20210421194847-a7e34179d62c.mod mirror://goproxy//github.com/hashicorp/raft-snapshot/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fraft-snapshot%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/raft-snapshot/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fraft-snapshot%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.4.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-alicloud/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-alicloud%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-alicloud/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-alicloud%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-azure/@v/v0.8.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-azure%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-azure/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-azure%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-centrify/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-centrify%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-centrify/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-centrify%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-cf/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-cf%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-cf/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-cf%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-gcp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-gcp/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-gcp/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-jwt/@v/v0.10.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-jwt%2F@v%2Fv0.10.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-jwt/@v/v0.10.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-jwt%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kerberos/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-kerberos%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kerberos/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-kerberos%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kubernetes/@v/v0.10.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-kubernetes%2F@v%2Fv0.10.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kubernetes/@v/v0.10.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-kubernetes%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-oci/@v/v0.8.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-oci%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-oci/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-oci%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-couchbase/@v/v0.4.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-couchbase%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-couchbase/@v/v0.4.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-couchbase%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-elasticsearch/@v/v0.8.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-elasticsearch%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-elasticsearch/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-elasticsearch%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-mongodbatlas/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-mongodbatlas%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-mongodbatlas/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-mongodbatlas%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-snowflake/@v/v0.2.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-snowflake%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-snowflake/@v/v0.2.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-snowflake%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-mock/@v/v0.16.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-mock%2F@v%2Fv0.16.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-mock/@v/v0.16.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-mock%2F@v%2Fv0.16.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-ad/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-ad%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-ad/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-ad%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-alicloud/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-alicloud%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-alicloud/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-alicloud%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-azure/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-azure%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-azure/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-azure%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcp/@v/v0.10.2.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcp%2F@v%2Fv0.10.2.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcp/@v/v0.10.2.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcp%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcpkms/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcpkms%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcpkms/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcpkms%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-kv/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-kv%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-kv/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-kv%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-mongodbatlas/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-mongodbatlas%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-mongodbatlas/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-mongodbatlas%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-openldap/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-openldap/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-terraform/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-terraform%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-terraform/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-terraform%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/huaweicloud/golangsdk/@v/v0.0.0-20200304081349-45ec0797f2a4.mod -> github.com%2Fhuaweicloud%2Fgolangsdk%2F@v%2Fv0.0.0-20200304081349-45ec0797f2a4.mod mirror://goproxy//github.com/hudl/fargo/@v/v1.3.0.mod -> github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/influxdata/influxdb/@v/v0.0.0-20190411212539-d24b7ba8c4c4.zip -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv0.0.0-20190411212539-d24b7ba8c4c4.zip mirror://goproxy//github.com/influxdata/influxdb/@v/v0.0.0-20190411212539-d24b7ba8c4c4.mod -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv0.0.0-20190411212539-d24b7ba8c4c4.mod mirror://goproxy//github.com/influxdata/influxdb1-client/@v/v0.0.0-20191209144304-8bf82d3c094d.mod -> github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.zip -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.zip mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.zip -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.zip mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.4.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.5.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.5.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/jcmturner/aescts/@v/v1.0.1.zip -> github.com%2Fjcmturner%2Faescts%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/jcmturner/aescts/@v/v1.0.1.mod -> github.com%2Fjcmturner%2Faescts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/jcmturner/dnsutils/@v/v1.0.1.zip -> github.com%2Fjcmturner%2Fdnsutils%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/jcmturner/dnsutils/@v/v1.0.1.mod -> github.com%2Fjcmturner%2Fdnsutils%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.zip -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jcmturner/goidentity/v6/@v/v6.0.1.zip -> github.com%2Fjcmturner%2Fgoidentity%2Fv6%2F@v%2Fv6.0.1.zip mirror://goproxy//github.com/jcmturner/goidentity/v6/@v/v6.0.1.mod -> github.com%2Fjcmturner%2Fgoidentity%2Fv6%2F@v%2Fv6.0.1.mod mirror://goproxy//github.com/jcmturner/gokrb5/v8/@v/v8.0.0.zip -> github.com%2Fjcmturner%2Fgokrb5%2Fv8%2F@v%2Fv8.0.0.zip mirror://goproxy//github.com/jcmturner/gokrb5/v8/@v/v8.0.0.mod -> github.com%2Fjcmturner%2Fgokrb5%2Fv8%2F@v%2Fv8.0.0.mod mirror://goproxy//github.com/jcmturner/rpc/v2/@v/v2.0.2.zip -> github.com%2Fjcmturner%2Frpc%2Fv2%2F@v%2Fv2.0.2.zip mirror://goproxy//github.com/jcmturner/rpc/v2/@v/v2.0.2.mod -> github.com%2Fjcmturner%2Frpc%2Fv2%2F@v%2Fv2.0.2.mod mirror://goproxy//github.com/jeffchao/backoff/@v/v0.0.0-20140404060208-9d7fd7aa17f2.zip -> github.com%2Fjeffchao%2Fbackoff%2F@v%2Fv0.0.0-20140404060208-9d7fd7aa17f2.zip mirror://goproxy//github.com/jeffchao/backoff/@v/v0.0.0-20140404060208-9d7fd7aa17f2.mod -> github.com%2Fjeffchao%2Fbackoff%2F@v%2Fv0.0.0-20140404060208-9d7fd7aa17f2.mod mirror://goproxy//github.com/jefferai/isbadcipher/@v/v0.0.0-20190226160619-51d2077c035f.zip -> github.com%2Fjefferai%2Fisbadcipher%2F@v%2Fv0.0.0-20190226160619-51d2077c035f.zip mirror://goproxy//github.com/jefferai/isbadcipher/@v/v0.0.0-20190226160619-51d2077c035f.mod -> github.com%2Fjefferai%2Fisbadcipher%2F@v%2Fv0.0.0-20190226160619-51d2077c035f.mod mirror://goproxy//github.com/jefferai/jsonx/@v/v1.0.0.zip -> github.com%2Fjefferai%2Fjsonx%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jefferai/jsonx/@v/v1.0.0.mod -> github.com%2Fjefferai%2Fjsonx%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180701071628-ab8a2e0c74be.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180701071628-ab8a2e0c74be.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.8.0.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.10.3.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/kelseyhightower/envconfig/@v/v1.3.0.mod -> github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/kelseyhightower/envconfig/@v/v1.4.0.zip -> github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/kelseyhightower/envconfig/@v/v1.4.0.mod -> github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/keybase/go-crypto/@v/v0.0.0-20190403132359-d65b6b94177f.zip -> github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20190403132359-d65b6b94177f.zip mirror://goproxy//github.com/keybase/go-crypto/@v/v0.0.0-20190403132359-d65b6b94177f.mod -> github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20190403132359-d65b6b94177f.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.1.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.5.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.9.5.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/lestrrat-go/jwx/@v/v0.9.0.mod -> github.com%2Flestrrat-go%2Fjwx%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/lib/pq/@v/v0.0.0-20180327071824-d34b9ff171c2.mod -> github.com%2Flib%2Fpq%2F@v%2Fv0.0.0-20180327071824-d34b9ff171c2.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.8.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.8.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-common/golang/gogo/@v/v0.0.0-20190605223551-bc2310a04743.mod -> github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-go/@v/v0.18.1.mod -> github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/lyft/protoc-gen-validate/@v/v0.0.13.mod -> github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/markbates/oncer/@v/v0.0.0-20181203154359-bf2de49a0be2.mod -> github.com%2Fmarkbates%2Foncer%2F@v%2Fv0.0.0-20181203154359-bf2de49a0be2.mod mirror://goproxy//github.com/markbates/safe/@v/v1.0.1.mod -> github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.zip -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.zip mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.mod -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.7.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.12.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.12.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.12.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.12.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mholt/archiver/@v/v3.1.1+incompatible.zip -> github.com%2Fmholt%2Farchiver%2F@v%2Fv3.1.1+incompatible.zip mirror://goproxy//github.com/mholt/archiver/@v/v3.1.1+incompatible.mod -> github.com%2Fmholt%2Farchiver%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/michaelklishin/rabbit-hole/@v/v0.0.0-20191008194146-93d9988f0cd5.zip -> github.com%2Fmichaelklishin%2Frabbit-hole%2F@v%2Fv0.0.0-20191008194146-93d9988f0cd5.zip mirror://goproxy//github.com/michaelklishin/rabbit-hole/@v/v0.0.0-20191008194146-93d9988f0cd5.mod -> github.com%2Fmichaelklishin%2Frabbit-hole%2F@v%2Fv0.0.0-20191008194146-93d9988f0cd5.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.40.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.40.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.40.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.40.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200915141129-7f0af18e79f2.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200915141129-7f0af18e79f2.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200915141129-7f0af18e79f2.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200915141129-7f0af18e79f2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mongodb/go-client-mongodb-atlas/@v/v0.1.2.zip -> github.com%2Fmongodb%2Fgo-client-mongodb-atlas%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mongodb/go-client-mongodb-atlas/@v/v0.1.2.mod -> github.com%2Fmongodb%2Fgo-client-mongodb-atlas%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/montanaflynn/stats/@v/v0.0.0-20171201202039-1bf9dbcd8cbe.mod -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.0.0-20171201202039-1bf9dbcd8cbe.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwielbut/pointy/@v/v1.1.0.zip -> github.com%2Fmwielbut%2Fpointy%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mwielbut/pointy/@v/v1.1.0.mod -> github.com%2Fmwielbut%2Fpointy%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/natefinch/atomic/@v/v0.0.0-20150920032501-a62ce929ffcc.zip -> github.com%2Fnatefinch%2Fatomic%2F@v%2Fv0.0.0-20150920032501-a62ce929ffcc.zip mirror://goproxy//github.com/natefinch/atomic/@v/v0.0.0-20150920032501-a62ce929ffcc.mod -> github.com%2Fnatefinch%2Fatomic%2F@v%2Fv0.0.0-20150920032501-a62ce929ffcc.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.0.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.2.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/nats-io/nats-server/v2/@v/v2.1.2.mod -> github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/nats-io/nats.go/@v/v1.9.1.mod -> github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.0.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.3.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/nats-io/nuid/@v/v1.0.1.mod -> github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.zip -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.zip mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nwaples/rardecode/@v/v1.1.0.zip -> github.com%2Fnwaples%2Frardecode%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/nwaples/rardecode/@v/v1.1.0.mod -> github.com%2Fnwaples%2Frardecode%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/oklog/oklog/@v/v0.3.2.mod -> github.com%2Foklog%2Foklog%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.zip -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/okta/okta-sdk-golang/@v/v1.1.0.zip -> github.com%2Fokta%2Fokta-sdk-golang%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/okta/okta-sdk-golang/@v/v1.1.0.mod -> github.com%2Fokta%2Fokta-sdk-golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/okta/okta-sdk-golang/v2/@v/v2.0.0.zip -> github.com%2Fokta%2Fokta-sdk-golang%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/okta/okta-sdk-golang/v2/@v/v2.0.0.mod -> github.com%2Fokta%2Fokta-sdk-golang%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20190113212917-5533ce8a0da3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20190113212917-5533ce8a0da3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.1.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/openlyinc/pointy/@v/v1.1.2.zip -> github.com%2Fopenlyinc%2Fpointy%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/openlyinc/pointy/@v/v1.1.2.mod -> github.com%2Fopenlyinc%2Fpointy%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/opentracing-contrib/go-observer/@v/v0.0.0-20170622124052-a52f23424492.mod -> github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod mirror://goproxy//github.com/opentracing/basictracer-go/@v/v1.0.0.mod -> github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/openzipkin-contrib/zipkin-go-opentracing/@v/v0.4.5.mod -> github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.3.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.6.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.2.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/oracle/oci-go-sdk/@v/v7.0.0+incompatible.mod -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv7.0.0+incompatible.mod mirror://goproxy//github.com/oracle/oci-go-sdk/@v/v12.5.0+incompatible.zip -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv12.5.0+incompatible.zip mirror://goproxy//github.com/oracle/oci-go-sdk/@v/v12.5.0+incompatible.mod -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv12.5.0+incompatible.mod mirror://goproxy//github.com/ory/dockertest/@v/v3.3.4+incompatible.mod -> github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.4+incompatible.mod mirror://goproxy//github.com/ory/dockertest/@v/v3.3.5+incompatible.zip -> github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.5+incompatible.zip mirror://goproxy//github.com/ory/dockertest/@v/v3.3.5+incompatible.mod -> github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.5+incompatible.mod mirror://goproxy//github.com/ory/dockertest/v3/@v/v3.6.2.zip -> github.com%2Fory%2Fdockertest%2Fv3%2F@v%2Fv3.6.2.zip mirror://goproxy//github.com/ory/dockertest/v3/@v/v3.6.2.mod -> github.com%2Fory%2Fdockertest%2Fv3%2F@v%2Fv3.6.2.mod mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.zip -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.mod -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pact-foundation/pact-go/@v/v1.0.4.mod -> github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v0.0.0-20180815053127-5633e0862627.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv0.0.0-20180815053127-5633e0862627.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.7.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/performancecopilot/speed/@v/v3.0.0+incompatible.mod -> github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/petermattis/goid/@v/v0.0.0-20180202154549-b0b1615b78e5.zip -> github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.zip mirror://goproxy//github.com/petermattis/goid/@v/v0.0.0-20180202154549-b0b1615b78e5.mod -> github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.mod mirror://goproxy//github.com/pierrec/lz4/@v/v1.0.2-0.20190131084431-473cd7ce01a1.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.2.6+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/profile/@v/v1.2.1.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20201205024021-ac21108117ac.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20201205024021-ac21108117ac.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20201205024021-ac21108117ac.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20201205024021-ac21108117ac.mod mirror://goproxy//github.com/pquerna/otp/@v/v1.2.1-0.20191009055518-468c2dd2b58d.zip -> github.com%2Fpquerna%2Fotp%2F@v%2Fv1.2.1-0.20191009055518-468c2dd2b58d.zip mirror://goproxy//github.com/pquerna/otp/@v/v1.2.1-0.20191009055518-468c2dd2b58d.mod -> github.com%2Fpquerna%2Fotp%2F@v%2Fv1.2.1-0.20191009055518-468c2dd2b58d.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.3.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.1.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.11.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.11.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.11.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.2.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.6.2.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.6.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20190923202752-2cc03de413da.zip -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.zip mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20190923202752-2cc03de413da.mod -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.2.0.zip -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.2.0.mod -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sethvargo/go-limiter/@v/v0.7.1.zip -> github.com%2Fsethvargo%2Fgo-limiter%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/sethvargo/go-limiter/@v/v0.7.1.mod -> github.com%2Fsethvargo%2Fgo-limiter%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v3.21.5+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.21.5+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v3.21.5+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.21.5+incompatible.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180725160413-e900ae048470.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180725160413-e900ae048470.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/snowflakedb/gosnowflake/@v/v1.6.1.zip -> github.com%2Fsnowflakedb%2Fgosnowflake%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/snowflakedb/gosnowflake/@v/v1.6.1.mod -> github.com%2Fsnowflakedb%2Fgosnowflake%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sony/gobreaker/@v/v0.4.1.mod -> github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/square/go-jose/@v/v2.4.1+incompatible.mod -> github.com%2Fsquare%2Fgo-jose%2F@v%2Fv2.4.1+incompatible.mod mirror://goproxy//github.com/square/go-jose/v3/@v/v3.0.0-20200225220504-708a9fe87ddc.mod -> github.com%2Fsquare%2Fgo-jose%2Fv3%2F@v%2Fv3.0.0-20200225220504-708a9fe87ddc.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190404075320-75d898a42a94.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.zip -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.zip mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod mirror://goproxy//github.com/streadway/handy/@v/v0.0.0-20190108123426-d5acb3125c2a.mod -> github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/svanharmelen/jsonapi/@v/v0.0.0-20180618144545-0c0828c3f16d.zip -> github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.zip mirror://goproxy//github.com/svanharmelen/jsonapi/@v/v0.0.0-20180618144545-0c0828c3f16d.mod -> github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.171+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.171+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.171+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.171+incompatible.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.1.zip -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.1.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.6.zip -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.6.mod -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/tklauser/numcpus/@v/v0.2.2.zip -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/tklauser/numcpus/@v/v0.2.2.mod -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.zip -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v0.0.0-20180714160509-73f8eece6fdc.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv0.0.0-20180714160509-73f8eece6fdc.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.zip -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.zip -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.zip mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.mod -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yandex-cloud/go-genproto/@v/v0.0.0-20200722140432-762fe965ce77.mod -> github.com%2Fyandex-cloud%2Fgo-genproto%2F@v%2Fv0.0.0-20200722140432-762fe965ce77.mod mirror://goproxy//github.com/yandex-cloud/go-sdk/@v/v0.0.0-20200722140627-2194e5077f13.mod -> github.com%2Fyandex-cloud%2Fgo-sdk%2F@v%2Fv0.0.0-20200722140627-2194e5077f13.mod mirror://goproxy//github.com/yhat/scrape/@v/v0.0.0-20161128144610-24b7890b0945.mod -> github.com%2Fyhat%2Fscrape%2F@v%2Fv0.0.0-20161128144610-24b7890b0945.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20200816102855-ee81675732da.zip -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20200816102855-ee81675732da.zip mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20200816102855-ee81675732da.mod -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20200816102855-ee81675732da.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.4.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200425165423-262c93980547.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200425165423-262c93980547.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200425165423-262c93980547.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200425165423-262c93980547.mod mirror://goproxy//go.mongodb.org/atlas/@v/v0.7.1.zip -> go.mongodb.org%2Fatlas%2F@v%2Fv0.7.1.zip mirror://goproxy//go.mongodb.org/atlas/@v/v0.7.1.mod -> go.mongodb.org%2Fatlas%2F@v%2Fv0.7.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.2.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.6.zip -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.zip mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.6.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.mod mirror://goproxy//go.opencensus.io/@v/v0.19.1.mod -> go.opencensus.io%2F@v%2Fv0.19.1.mod mirror://goproxy//go.opencensus.io/@v/v0.19.2.mod -> go.opencensus.io%2F@v%2Fv0.19.2.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.13.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.1.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190422162423-af44ce270edf.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190422162423-af44ce270edf.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190513172903-22d7a77e9e5f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200117160349-530e935923ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200117160349-530e935923ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200604202706-70a84ac30bf9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181217174547-8f45f776aaf1.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181217174547-8f45f776aaf1.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181106065722-10aee1819953.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190206173232-65e2d4e15006.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190206173232-65e2d4e15006.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191003171128-d98b1b443823.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191003171128-d98b1b443823.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200320220750-118fecf932d8.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200320220750-118fecf932d8.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200505041828-1ed23360d12c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200505041828-1ed23360d12c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201002202402-0a1ea396d57c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201002202402-0a1ea396d57c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210510120150-4163338589ed.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210510120150-4163338589ed.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181203162652-d668ce993890.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190130055435-99b60b757ec1.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190319182350-c85d3e98c914.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190319182350-c85d3e98c914.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190412183630-56d357773e84.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190412183630-56d357773e84.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181122145206-62eef0e2fa9b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181218192612-074acd46bca6.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181218192612-074acd46bca6.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190204203706-41f3e6584952.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190204203706-41f3e6584952.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190419153524-e8e3143a4f4a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190419153524-e8e3143a4f4a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190531175056-4c3a928424d2.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190531175056-4c3a928424d2.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190712062909-fae7ac547cb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190712062909-fae7ac547cb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191220142924-d4481acd189f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200409092240-59c9f1ba88fa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200409092240-59c9f1ba88fa.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200828194041-157a740278f4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200828194041-157a740278f4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200831180312-196b9ba8737a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210316164454-77fc1eacc6aa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210316164454-77fc1eacc6aa.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210514084401-e8d321eab015.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210514084401-e8d321eab015.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181219222714-6e267b5cc78e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181219222714-6e267b5cc78e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190329151228-23e29df326fe.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190329151228-23e29df326fe.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190416151739-9c9e1878f421.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190416151739-9c9e1878f421.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190420181800-aa740d480789.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190420181800-aa740d480789.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190424220101-1e8e1cfdf96b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190424220101-1e8e1cfdf96b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190531172133-b3315ee88b7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190531172133-b3315ee88b7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190718200317-82a3ea8a504c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190718200317-82a3ea8a504c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200103221440-774c71fcf114.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200409170454-77362c5149f0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200409170454-77362c5149f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200416214402-fc959738d646.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200416214402-fc959738d646.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200521155704-91d71f6c2f04.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200521155704-91d71f6c2f04.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210101214203-2dba1e4ea05c.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210101214203-2dba1e4ea05c.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210101214203-2dba1e4ea05c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210101214203-2dba1e4ea05c.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20181220000619-583d854617af.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181220000619-583d854617af.mod mirror://goproxy//google.golang.org/api/@v/v0.2.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.2.0.mod mirror://goproxy//google.golang.org/api/@v/v0.3.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.0.mod mirror://goproxy//google.golang.org/api/@v/v0.3.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod mirror://goproxy//google.golang.org/api/@v/v0.3.2.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.2.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.21.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.21.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.zip mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181219182458-5a97ab628bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181219182458-5a97ab628bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190508193815-b515fa19cec8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190513181449-d00d292a067c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190513181449-d00d292a067c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200323114720-3f67cca34472.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200323114720-3f67cca34472.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200409111301-baae70f3302d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200409111301-baae70f3302d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200416231807-8751e049a2a0.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200416231807-8751e049a2a0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.16.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.zip -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.zip mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.3.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.zip -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.mod -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20180705113604-9856a29383ce.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20180705113604-9856a29383ce.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.mod mirror://goproxy//gopkg.in/ory-am/dockertest.v3/@v/v3.3.4.zip -> gopkg.in%2Fory-am%2Fdockertest.v3%2F@v%2Fv3.3.4.zip mirror://goproxy//gopkg.in/ory-am/dockertest.v3/@v/v3.3.4.mod -> gopkg.in%2Fory-am%2Fdockertest.v3%2F@v%2Fv3.3.4.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.0.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.2.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180920025451-e3ad64cb4ed3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180920025451-e3ad64cb4ed3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190409092523-d687e77c8ae9.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190409092523-d687e77c8ae9.mod mirror://goproxy//k8s.io/api/@v/v0.18.2.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/api/@v/v0.18.2.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190409092423-760d1845f48b.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190409092423-760d1845f48b.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.2.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.2.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.2.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.2.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20190306015804-8e90cee79f82.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20190306015804-8e90cee79f82.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190228160746-b3a7cee44a30.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190228160746-b3a7cee44a30.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200121204235-bf4fb3bd569c.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//layeh.com/radius/@v/v0.0.0-20190322222518-890bc1058917.zip -> layeh.com%2Fradius%2F@v%2Fv0.0.0-20190322222518-890bc1058917.zip mirror://goproxy//layeh.com/radius/@v/v0.0.0-20190322222518-890bc1058917.mod -> layeh.com%2Fradius%2F@v%2Fv0.0.0-20190322222518-890bc1058917.mod mirror://goproxy//mvdan.cc/gofumpt/@v/v0.1.1.zip -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.zip mirror://goproxy//mvdan.cc/gofumpt/@v/v0.1.1.mod -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/appdash/@v/v0.0.0-20190731080439-ebfcffb1b5c0.mod -> sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod
-_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=86de3e31f80dec728e37a089caa9ac8e
diff --git a/metadata/md5-cache/app-admin/vault-1.8.3 b/metadata/md5-cache/app-admin/vault-1.8.3
deleted file mode 100644
index a9df2463da94..000000000000
--- a/metadata/md5-cache/app-admin/vault-1.8.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-go/gox >=dev-lang/go-1.15.3 filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=acct-group/vault acct-user/vault
-DESCRIPTION=A tool for managing secrets
-EAPI=7
-HOMEPAGE=https://vaultproject.io/
-IUSE=+webui +filecaps
-KEYWORDS=~amd64
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
-RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/vault/archive/v1.8.3.tar.gz -> vault-1.8.3.tar.gz webui? ( https://dev.gentoo.org/~zmedico/dist/vault-1.8.3-webui.tar.xz ) mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.39.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.6.0.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.6.0.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/spanner/@v/v1.5.1.zip -> cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.5.1.zip mirror://goproxy//cloud.google.com/go/spanner/@v/v1.5.1.mod -> cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.5.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.zip -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.zip mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.mod -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//git.apache.org/thrift.git/@v/v0.12.0.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.3.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.3.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v36.2.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v44.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv44.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v51.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v51.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.13.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.13.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.13.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.17.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.17.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.17.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.17.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.7.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.11.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.11.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.11.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.11.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.7.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.7.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!jeffail/gabs/@v/v1.1.1.zip -> github.com%2F!jeffail%2Fgabs%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!jeffail/gabs/@v/v1.1.1.mod -> github.com%2F!jeffail%2Fgabs%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!knetic/govaluate/@v/v3.0.1-0.20171022003610-9aa49832a739+incompatible.mod -> github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.zip -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.zip mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.mod -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.13.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.13.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16-0.20201130162521-d1ffc52c7331.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16-0.20201130162521-d1ffc52c7331.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!nvveen/!gotty/@v/v0.0.0-20120604004816-cd527374f1e5.zip -> github.com%2F!nvveen%2F!gotty%2F@v%2Fv0.0.0-20120604004816-cd527374f1e5.zip mirror://goproxy//github.com/!nvveen/!gotty/@v/v0.0.0-20120604004816-cd527374f1e5.mod -> github.com%2F!nvveen%2F!gotty%2F@v%2Fv0.0.0-20120604004816-cd527374f1e5.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!s!a!p/go-hdb/@v/v0.14.1.zip -> github.com%2F!s!a!p%2Fgo-hdb%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/!s!a!p/go-hdb/@v/v0.14.1.mod -> github.com%2F!s!a!p%2Fgo-hdb%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/!sectorbob/mlab-ns2/@v/v0.0.0-20171030222938-d3aa0c295a8a.zip -> github.com%2F!sectorbob%2Fmlab-ns2%2F@v%2Fv0.0.0-20171030222938-d3aa0c295a8a.zip mirror://goproxy//github.com/!sectorbob/mlab-ns2/@v/v0.0.0-20171030222938-d3aa0c295a8a.mod -> github.com%2F!sectorbob%2Fmlab-ns2%2F@v%2Fv0.0.0-20171030222938-d3aa0c295a8a.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.19.0.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/!vivid!cortex/gohistogram/@v/v1.0.0.mod -> github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v3.1.1+incompatible.zip -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv3.1.1+incompatible.zip mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v3.1.1+incompatible.mod -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/afex/hystrix-go/@v/v0.0.0-20180502004556-fa1af6a1f4f5.mod -> github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190412020505-60e2075261b6.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190412020505-60e2075261b6.mod mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190620160927-9418d7b0cd0f.zip -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190620160927-9418d7b0cd0f.zip mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190620160927-9418d7b0cd0f.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190620160927-9418d7b0cd0f.mod mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190307165228-86c17b95fcd5.zip -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190307165228-86c17b95fcd5.zip mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190307165228-86c17b95fcd5.mod -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190307165228-86c17b95fcd5.mod mirror://goproxy//github.com/apache/arrow/go/arrow/@v/v0.0.0-20200601151325-b2287a20f230.zip -> github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20200601151325-b2287a20f230.zip mirror://goproxy//github.com/apache/arrow/go/arrow/@v/v0.0.0-20200601151325-b2287a20f230.mod -> github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20200601151325-b2287a20f230.mod mirror://goproxy//github.com/apache/thrift/@v/v0.12.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/apache/thrift/@v/v0.13.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/apple/foundationdb/bindings/go/@v/v0.0.0-20190411004307-cd5c9d91fad2.zip -> github.com%2Fapple%2Ffoundationdb%2Fbindings%2Fgo%2F@v%2Fv0.0.0-20190411004307-cd5c9d91fad2.zip mirror://goproxy//github.com/apple/foundationdb/bindings/go/@v/v0.0.0-20190411004307-cd5c9d91fad2.mod -> github.com%2Fapple%2Ffoundationdb%2Fbindings%2Fgo%2F@v%2Fv0.0.0-20190411004307-cd5c9d91fad2.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.3.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.7.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.7.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.7.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/armon/go-proxyproto/@v/v0.0.0-20210323213023-7e956b284f0a.zip -> github.com%2Farmon%2Fgo-proxyproto%2F@v%2Fv0.0.0-20210323213023-7e956b284f0a.zip mirror://goproxy//github.com/armon/go-proxyproto/@v/v0.0.0-20210323213023-7e956b284f0a.mod -> github.com%2Farmon%2Fgo-proxyproto%2F@v%2Fv0.0.0-20210323213023-7e956b284f0a.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aryann/difflib/@v/v0.0.0-20170710044230-e206f873d14a.mod -> github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.13.3.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.0.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.30.27.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.27.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.28.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.28.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.19.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.19.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.19.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.19.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.18.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v1.3.2.zip -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v1.3.2.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/config/@v/v1.1.5.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fconfig%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/config/@v/v1.1.5.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fconfig%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/credentials/@v/v1.1.5.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fcredentials%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/credentials/@v/v1.1.5.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fcredentials%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/feature/ec2/imds/@v/v1.0.6.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Ffeature%2Fec2%2Fimds%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/feature/ec2/imds/@v/v1.0.6.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Ffeature%2Fec2%2Fimds%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/feature/s3/manager/@v/v1.1.2.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Ffeature%2Fs3%2Fmanager%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/feature/s3/manager/@v/v1.1.2.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Ffeature%2Fs3%2Fmanager%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/@v/v1.0.4.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Faccept-encoding%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/@v/v1.0.4.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Faccept-encoding%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/@v/v1.0.6.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Fpresigned-url%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/@v/v1.0.6.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Fpresigned-url%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/s3shared/@v/v1.2.2.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Fs3shared%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/s3shared/@v/v1.2.2.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Fs3shared%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/s3/@v/v1.5.0.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fs3%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/s3/@v/v1.5.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fs3%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/sso/@v/v1.1.5.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fsso%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/sso/@v/v1.1.5.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fsso%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/sts/@v/v1.2.2.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fsts%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/sts/@v/v1.2.2.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fsts%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/aws/smithy-go/@v/v1.3.1.zip -> github.com%2Faws%2Fsmithy-go%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/aws/smithy-go/@v/v1.3.1.mod -> github.com%2Faws%2Fsmithy-go%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.zip -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.zip mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.mod -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bitly/go-hostpool/@v/v0.0.0-20171023180738-a3a6125de932.mod -> github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.0.0-20171023180738-a3a6125de932.mod mirror://goproxy//github.com/bitly/go-hostpool/@v/v0.1.0.zip -> github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bitly/go-hostpool/@v/v0.1.0.mod -> github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.zip -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.zip mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/boombuler/barcode/@v/v1.0.1-0.20190219062509-6c824513bacc.zip -> github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1-0.20190219062509-6c824513bacc.zip mirror://goproxy//github.com/boombuler/barcode/@v/v1.0.1-0.20190219062509-6c824513bacc.mod -> github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1-0.20190219062509-6c824513bacc.mod mirror://goproxy//github.com/briankassouf/jose/@v/v0.9.2-0.20180619214549-d2569464773f.zip -> github.com%2Fbriankassouf%2Fjose%2F@v%2Fv0.9.2-0.20180619214549-d2569464773f.zip mirror://goproxy//github.com/briankassouf/jose/@v/v0.9.2-0.20180619214549-d2569464773f.mod -> github.com%2Fbriankassouf%2Fjose%2F@v%2Fv0.9.2-0.20180619214549-d2569464773f.mod mirror://goproxy//github.com/c2h5oh/datasize/@v/v0.0.0-20200112174442-28bbd4740fee.mod -> github.com%2Fc2h5oh%2Fdatasize%2F@v%2Fv0.0.0-20200112174442-28bbd4740fee.mod mirror://goproxy//github.com/casbin/casbin/v2/@v/v2.1.2.mod -> github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/cenkalti/backoff/v3/@v/v3.0.0.zip -> github.com%2Fcenkalti%2Fbackoff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/cenkalti/backoff/v3/@v/v3.0.0.mod -> github.com%2Fcenkalti%2Fbackoff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/centrify/cloud-golang-sdk/@v/v0.0.0-20190214225812-119110094d0f.zip -> github.com%2Fcentrify%2Fcloud-golang-sdk%2F@v%2Fv0.0.0-20190214225812-119110094d0f.zip mirror://goproxy//github.com/centrify/cloud-golang-sdk/@v/v0.0.0-20190214225812-119110094d0f.mod -> github.com%2Fcentrify%2Fcloud-golang-sdk%2F@v%2Fv0.0.0-20190214225812-119110094d0f.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chrismalek/oktasdk-go/@v/v0.0.0-20181212195951-3430665dfaa0.zip -> github.com%2Fchrismalek%2Foktasdk-go%2F@v%2Fv0.0.0-20181212195951-3430665dfaa0.zip mirror://goproxy//github.com/chrismalek/oktasdk-go/@v/v0.0.0-20181212195951-3430665dfaa0.mod -> github.com%2Fchrismalek%2Foktasdk-go%2F@v%2Fv0.0.0-20181212195951-3430665dfaa0.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/clbanning/x2j/@v/v0.0.0-20191024224557-825249438eec.mod -> github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.zip -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190201205600-f136f9222381.zip -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190201205600-f136f9222381.zip mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190201205600-f136f9222381.mod -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190201205600-f136f9222381.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cockroachdb/cockroach-go/@v/v0.0.0-20181001143604-e0a95dfd547c.zip -> github.com%2Fcockroachdb%2Fcockroach-go%2F@v%2Fv0.0.0-20181001143604-e0a95dfd547c.zip mirror://goproxy//github.com/cockroachdb/cockroach-go/@v/v0.0.0-20181001143604-e0a95dfd547c.mod -> github.com%2Fcockroachdb%2Fcockroach-go%2F@v%2Fv0.0.0-20181001143604-e0a95dfd547c.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codahale/hdrhistogram/@v/v0.0.0-20161010025455-3a0bb77429bd.mod -> github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.zip -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190827140505-75bee3e2ccb6.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190827140505-75bee3e2ccb6.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200710164510-efbc4488d8fe.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200710164510-efbc4488d8fe.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/v3/@v/v3.0.0.zip -> github.com%2Fcoreos%2Fgo-oidc%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/coreos/go-oidc/v3/@v/v3.0.0.mod -> github.com%2Fcoreos%2Fgo-oidc%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/couchbase/gocb/v2/@v/v2.1.4.zip -> github.com%2Fcouchbase%2Fgocb%2Fv2%2F@v%2Fv2.1.4.zip mirror://goproxy//github.com/couchbase/gocb/v2/@v/v2.1.4.mod -> github.com%2Fcouchbase%2Fgocb%2Fv2%2F@v%2Fv2.1.4.mod mirror://goproxy//github.com/couchbase/gocbcore/v9/@v/v9.0.4.zip -> github.com%2Fcouchbase%2Fgocbcore%2Fv9%2F@v%2Fv9.0.4.zip mirror://goproxy//github.com/couchbase/gocbcore/v9/@v/v9.0.4.mod -> github.com%2Fcouchbase%2Fgocbcore%2Fv9%2F@v%2Fv9.0.4.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200428022330-06a60b6afbbc.zip -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200428022330-06a60b6afbbc.zip mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200428022330-06a60b6afbbc.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200428022330-06a60b6afbbc.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.7.5.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.7.5.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.7.5.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.7.5.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.1.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.1.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20200319182547-c7ad2b866182.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200319182547-c7ad2b866182.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dsnet/compress/@v/v0.0.1.zip -> github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/dsnet/compress/@v/v0.0.1.mod -> github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/dsnet/golib/@v/v0.0.0-20171103203638-1ea166775780.mod -> github.com%2Fdsnet%2Fgolib%2F@v%2Fv0.0.0-20171103203638-1ea166775780.mod mirror://goproxy//github.com/duosecurity/duo_api_golang/@v/v0.0.0-20190308151101-6c680f768e74.zip -> github.com%2Fduosecurity%2Fduo_api_golang%2F@v%2Fv0.0.0-20190308151101-6c680f768e74.zip mirror://goproxy//github.com/duosecurity/duo_api_golang/@v/v0.0.0-20190308151101-6c680f768e74.mod -> github.com%2Fduosecurity%2Fduo_api_golang%2F@v%2Fv0.0.0-20190308151101-6c680f768e74.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/edsrzf/mmap-go/@v/v1.0.0.mod -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v1.0.1-0.20200509193318-234c15e7648f.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.1-0.20200509193318-234c15e7648f.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v1.0.1-0.20200509193318-234c15e7648f.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.1-0.20200509193318-234c15e7648f.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.6.9.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v0.0.0-20190203023257-5858425f7550.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20190203023257-5858425f7550.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.11.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.11.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.zip -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/franela/goblin/@v/v0.0.0-20200105215937-c9ffbefa60db.mod -> github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod mirror://goproxy//github.com/franela/goreq/@v/v0.0.0-20171204163338-bcd34c9993f8.mod -> github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.10.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.13.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.13.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/gammazero/deque/@v/v0.0.0-20190130191400-2afb3858e9c7.zip -> github.com%2Fgammazero%2Fdeque%2F@v%2Fv0.0.0-20190130191400-2afb3858e9c7.zip mirror://goproxy//github.com/gammazero/deque/@v/v0.0.0-20190130191400-2afb3858e9c7.mod -> github.com%2Fgammazero%2Fdeque%2F@v%2Fv0.0.0-20190130191400-2afb3858e9c7.mod mirror://goproxy//github.com/gammazero/workerpool/@v/v0.0.0-20190406235159-88d534f22b56.zip -> github.com%2Fgammazero%2Fworkerpool%2F@v%2Fv0.0.0-20190406235159-88d534f22b56.zip mirror://goproxy//github.com/gammazero/workerpool/@v/v0.0.0-20190406235159-88d534f22b56.mod -> github.com%2Fgammazero%2Fworkerpool%2F@v%2Fv0.0.0-20190406235159-88d534f22b56.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.1-0.20190212211648-25d852aebe32.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.1-0.20190212211648-25d852aebe32.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.4.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.1.zip -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.zip -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.7.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.7.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.10.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.10.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.4.zip -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.4.zip mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.4.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.4.mod mirror://goproxy//github.com/go-ldap/ldif/@v/v0.0.0-20200320164324-fd88d9b715b3.zip -> github.com%2Fgo-ldap%2Fldif%2F@v%2Fv0.0.0-20200320164324-fd88d9b715b3.zip mirror://goproxy//github.com/go-ldap/ldif/@v/v0.0.0-20200320164324-fd88d9b715b3.mod -> github.com%2Fgo-ldap%2Fldif%2F@v%2Fv0.0.0-20200320164324-fd88d9b715b3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.zip -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.1.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.7.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.7.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.7.mod mirror://goproxy//github.com/go-yaml/yaml/@v/v2.1.0+incompatible.zip -> github.com%2Fgo-yaml%2Fyaml%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/go-yaml/yaml/@v/v2.1.0+incompatible.mod -> github.com%2Fgo-yaml%2Fyaml%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/gobuffalo/attrs/@v/v0.0.0-20190224210810-a9411de4debd.mod -> github.com%2Fgobuffalo%2Fattrs%2F@v%2Fv0.0.0-20190224210810-a9411de4debd.mod mirror://goproxy//github.com/gobuffalo/depgen/@v/v0.0.0-20190329151759-d478694a28d3.mod -> github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.0.0-20190329151759-d478694a28d3.mod mirror://goproxy//github.com/gobuffalo/depgen/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.6.15.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.6.15.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.7.0.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.3.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.0.0-20190329151137-27723ad26ef9.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190329151137-27723ad26ef9.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.0.0-20190403191548-3ca520ef0d9e.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190403191548-3ca520ef0d9e.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/gitgen/@v/v0.0.0-20190315122116-cc086187d211.mod -> github.com%2Fgobuffalo%2Fgitgen%2F@v%2Fv0.0.0-20190315122116-cc086187d211.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.0.0-20190315121717-8f38393713f5.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.0.0-20190315121717-8f38393713f5.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/logger/@v/v0.0.0-20190315122211-86e12af44bc2.mod -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv0.0.0-20190315122211-86e12af44bc2.mod mirror://goproxy//github.com/gobuffalo/mapi/@v/v1.0.1.mod -> github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/gobuffalo/mapi/@v/v1.0.2.mod -> github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.0.0-20190315124812-a385830c7fc0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.0.0-20190315124812-a385830c7fc0.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.0.9.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.0.9.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.2.0.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/gobuffalo/syncx/@v/v0.0.0-20190224160051-33c29581e754.mod -> github.com%2Fgobuffalo%2Fsyncx%2F@v%2Fv0.0.0-20190224160051-33c29581e754.mod mirror://goproxy//github.com/gocql/gocql/@v/v0.0.0-20210401103645-80ab1e13e309.zip -> github.com%2Fgocql%2Fgocql%2F@v%2Fv0.0.0-20210401103645-80ab1e13e309.zip mirror://goproxy//github.com/gocql/gocql/@v/v0.0.0-20210401103645-80ab1e13e309.mod -> github.com%2Fgocql%2Fgocql%2F@v%2Fv0.0.0-20210401103645-80ab1e13e309.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/goji/httpauth/@v/v0.0.0-20160601135302-2da839ab0f4d.mod -> github.com%2Fgoji%2Fhttpauth%2F@v%2Fv0.0.0-20160601135302-2da839ab0f4d.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.zip -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20170215233205-553a64147049.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20170215233205-553a64147049.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.2.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.4.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.4.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/flatbuffers/@v/v1.11.0.zip -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/google/flatbuffers/@v/v1.11.0.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-metrics-stackdriver/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-metrics-stackdriver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-metrics-stackdriver/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-metrics-stackdriver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180628210949-0892b62f0d9f.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180628210949-0892b62f0d9f.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20180427100037-88b0669f7d75.zip -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20180427100037-88b0669f7d75.zip mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20180427100037-88b0669f7d75.mod -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20180427100037-88b0669f7d75.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.6.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.zip -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/sessions/@v/v1.2.0.zip -> github.com%2Fgorilla%2Fsessions%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/gorilla/sessions/@v/v1.2.0.mod -> github.com%2Fgorilla%2Fsessions%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gotestyourself/gotestyourself/@v/v2.2.0+incompatible.zip -> github.com%2Fgotestyourself%2Fgotestyourself%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/gotestyourself/gotestyourself/@v/v2.2.0+incompatible.mod -> github.com%2Fgotestyourself%2Fgotestyourself%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.6.2.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hailocab/go-hostpool/@v/v0.0.0-20160125115350-e80d13ce29ed.zip -> github.com%2Fhailocab%2Fgo-hostpool%2F@v%2Fv0.0.0-20160125115350-e80d13ce29ed.zip mirror://goproxy//github.com/hailocab/go-hostpool/@v/v0.0.0-20160125115350-e80d13ce29ed.mod -> github.com%2Fhailocab%2Fgo-hostpool%2F@v%2Fv0.0.0-20160125115350-e80d13ce29ed.mod mirror://goproxy//github.com/hashicorp/cap/@v/v0.1.0.zip -> github.com%2Fhashicorp%2Fcap%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/hashicorp/cap/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fcap%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/consul-template/@v/v0.26.0.zip -> github.com%2Fhashicorp%2Fconsul-template%2F@v%2Fv0.26.0.zip mirror://goproxy//github.com/hashicorp/consul-template/@v/v0.26.0.mod -> github.com%2Fhashicorp%2Fconsul-template%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.4.0.zip -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.4.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.1-0.20200910203702-bb2b5dd871ca.zip -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.1-0.20200910203702-bb2b5dd871ca.zip mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.1-0.20200910203702-bb2b5dd871ca.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.1-0.20200910203702-bb2b5dd871ca.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-bindata/@v/v3.0.8-0.20180209072458-bf7910af8997+incompatible.zip -> github.com%2Fhashicorp%2Fgo-bindata%2F@v%2Fv3.0.8-0.20180209072458-bf7910af8997+incompatible.zip mirror://goproxy//github.com/hashicorp/go-bindata/@v/v3.0.8-0.20180209072458-bf7910af8997+incompatible.mod -> github.com%2Fhashicorp%2Fgo-bindata%2F@v%2Fv3.0.8-0.20180209072458-bf7910af8997+incompatible.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.2.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20201029210230-738cb3105cd0.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20201029210230-738cb3105cd0.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20201029210230-738cb3105cd0.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20201029210230-738cb3105cd0.mod mirror://goproxy//github.com/hashicorp/go-gatedio/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-gatedio/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-gcp-common/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-gcp-common/@v/v0.7.0.zip -> github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/hashicorp/go-gcp-common/@v/v0.7.0.mod -> github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.15.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.15.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.16.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.16.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/@v/v0.5.16.zip -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2F@v%2Fv0.5.16.zip mirror://goproxy//github.com/hashicorp/go-kms-wrapping/@v/v0.5.16.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2F@v%2Fv0.5.16.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.zip -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v1.1.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v1.1.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.3-0.20191002164813-7e9e8525653a.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.3-0.20191002164813-7e9e8525653a.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.3-0.20191002164813-7e9e8525653a.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.3-0.20191002164813-7e9e8525653a.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-secure-stdlib/strutil/@v/v0.1.1.zip -> github.com%2Fhashicorp%2Fgo-secure-stdlib%2Fstrutil%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/hashicorp/go-secure-stdlib/strutil/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fgo-secure-stdlib%2Fstrutil%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.zip -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.mod -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.1-vault-3.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.1-vault-3.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.1-vault-3.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.1-vault-3.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/nomad/api/@v/v0.0.0-20191220223628-edc62acd919d.zip -> github.com%2Fhashicorp%2Fnomad%2Fapi%2F@v%2Fv0.0.0-20191220223628-edc62acd919d.zip mirror://goproxy//github.com/hashicorp/nomad/api/@v/v0.0.0-20191220223628-edc62acd919d.mod -> github.com%2Fhashicorp%2Fnomad%2Fapi%2F@v%2Fv0.0.0-20191220223628-edc62acd919d.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2-0.20191002163536-9c6bd3e3eb17.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2-0.20191002163536-9c6bd3e3eb17.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.3.zip -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/v2/@v/v2.0.0-20210421194847-a7e34179d62c.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2Fv2%2F@v%2Fv2.0.0-20210421194847-a7e34179d62c.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/v2/@v/v2.0.0-20210421194847-a7e34179d62c.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2Fv2%2F@v%2Fv2.0.0-20210421194847-a7e34179d62c.mod mirror://goproxy//github.com/hashicorp/raft-snapshot/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fraft-snapshot%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/raft-snapshot/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fraft-snapshot%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.4.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-alicloud/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-alicloud%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-alicloud/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-alicloud%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-azure/@v/v0.8.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-azure%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-azure/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-azure%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-centrify/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-centrify%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-centrify/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-centrify%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-cf/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-cf%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-cf/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-cf%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-gcp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-gcp/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-gcp/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-jwt/@v/v0.10.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-jwt%2F@v%2Fv0.10.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-jwt/@v/v0.10.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-jwt%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kerberos/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-kerberos%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kerberos/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-kerberos%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kubernetes/@v/v0.10.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-kubernetes%2F@v%2Fv0.10.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kubernetes/@v/v0.10.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-kubernetes%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-oci/@v/v0.8.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-oci%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-oci/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-oci%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-couchbase/@v/v0.4.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-couchbase%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-couchbase/@v/v0.4.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-couchbase%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-elasticsearch/@v/v0.8.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-elasticsearch%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-elasticsearch/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-elasticsearch%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-mongodbatlas/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-mongodbatlas%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-mongodbatlas/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-mongodbatlas%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-snowflake/@v/v0.2.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-snowflake%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-snowflake/@v/v0.2.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-snowflake%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-mock/@v/v0.16.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-mock%2F@v%2Fv0.16.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-mock/@v/v0.16.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-mock%2F@v%2Fv0.16.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-ad/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-ad%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-ad/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-ad%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-alicloud/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-alicloud%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-alicloud/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-alicloud%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-azure/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-azure%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-azure/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-azure%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcp/@v/v0.10.2.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcp%2F@v%2Fv0.10.2.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcp/@v/v0.10.2.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcp%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcpkms/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcpkms%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcpkms/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcpkms%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-kv/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-kv%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-kv/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-kv%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-mongodbatlas/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-mongodbatlas%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-mongodbatlas/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-mongodbatlas%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-openldap/@v/v0.5.2.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-openldap/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-terraform/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-terraform%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-terraform/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-terraform%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/huaweicloud/golangsdk/@v/v0.0.0-20200304081349-45ec0797f2a4.mod -> github.com%2Fhuaweicloud%2Fgolangsdk%2F@v%2Fv0.0.0-20200304081349-45ec0797f2a4.mod mirror://goproxy//github.com/hudl/fargo/@v/v1.3.0.mod -> github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/influxdata/influxdb/@v/v0.0.0-20190411212539-d24b7ba8c4c4.zip -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv0.0.0-20190411212539-d24b7ba8c4c4.zip mirror://goproxy//github.com/influxdata/influxdb/@v/v0.0.0-20190411212539-d24b7ba8c4c4.mod -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv0.0.0-20190411212539-d24b7ba8c4c4.mod mirror://goproxy//github.com/influxdata/influxdb1-client/@v/v0.0.0-20191209144304-8bf82d3c094d.mod -> github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.zip -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.zip mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.zip -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.zip mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.4.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.5.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.5.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/jcmturner/aescts/@v/v1.0.1.zip -> github.com%2Fjcmturner%2Faescts%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/jcmturner/aescts/@v/v1.0.1.mod -> github.com%2Fjcmturner%2Faescts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/jcmturner/dnsutils/@v/v1.0.1.zip -> github.com%2Fjcmturner%2Fdnsutils%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/jcmturner/dnsutils/@v/v1.0.1.mod -> github.com%2Fjcmturner%2Fdnsutils%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.zip -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jcmturner/goidentity/v6/@v/v6.0.1.zip -> github.com%2Fjcmturner%2Fgoidentity%2Fv6%2F@v%2Fv6.0.1.zip mirror://goproxy//github.com/jcmturner/goidentity/v6/@v/v6.0.1.mod -> github.com%2Fjcmturner%2Fgoidentity%2Fv6%2F@v%2Fv6.0.1.mod mirror://goproxy//github.com/jcmturner/gokrb5/v8/@v/v8.0.0.zip -> github.com%2Fjcmturner%2Fgokrb5%2Fv8%2F@v%2Fv8.0.0.zip mirror://goproxy//github.com/jcmturner/gokrb5/v8/@v/v8.0.0.mod -> github.com%2Fjcmturner%2Fgokrb5%2Fv8%2F@v%2Fv8.0.0.mod mirror://goproxy//github.com/jcmturner/rpc/v2/@v/v2.0.2.zip -> github.com%2Fjcmturner%2Frpc%2Fv2%2F@v%2Fv2.0.2.zip mirror://goproxy//github.com/jcmturner/rpc/v2/@v/v2.0.2.mod -> github.com%2Fjcmturner%2Frpc%2Fv2%2F@v%2Fv2.0.2.mod mirror://goproxy//github.com/jeffchao/backoff/@v/v0.0.0-20140404060208-9d7fd7aa17f2.zip -> github.com%2Fjeffchao%2Fbackoff%2F@v%2Fv0.0.0-20140404060208-9d7fd7aa17f2.zip mirror://goproxy//github.com/jeffchao/backoff/@v/v0.0.0-20140404060208-9d7fd7aa17f2.mod -> github.com%2Fjeffchao%2Fbackoff%2F@v%2Fv0.0.0-20140404060208-9d7fd7aa17f2.mod mirror://goproxy//github.com/jefferai/isbadcipher/@v/v0.0.0-20190226160619-51d2077c035f.zip -> github.com%2Fjefferai%2Fisbadcipher%2F@v%2Fv0.0.0-20190226160619-51d2077c035f.zip mirror://goproxy//github.com/jefferai/isbadcipher/@v/v0.0.0-20190226160619-51d2077c035f.mod -> github.com%2Fjefferai%2Fisbadcipher%2F@v%2Fv0.0.0-20190226160619-51d2077c035f.mod mirror://goproxy//github.com/jefferai/jsonx/@v/v1.0.0.zip -> github.com%2Fjefferai%2Fjsonx%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jefferai/jsonx/@v/v1.0.0.mod -> github.com%2Fjefferai%2Fjsonx%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180701071628-ab8a2e0c74be.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180701071628-ab8a2e0c74be.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.8.0.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.10.3.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/kelseyhightower/envconfig/@v/v1.3.0.mod -> github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/kelseyhightower/envconfig/@v/v1.4.0.zip -> github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/kelseyhightower/envconfig/@v/v1.4.0.mod -> github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/keybase/go-crypto/@v/v0.0.0-20190403132359-d65b6b94177f.zip -> github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20190403132359-d65b6b94177f.zip mirror://goproxy//github.com/keybase/go-crypto/@v/v0.0.0-20190403132359-d65b6b94177f.mod -> github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20190403132359-d65b6b94177f.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.1.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.5.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.9.5.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/lestrrat-go/jwx/@v/v0.9.0.mod -> github.com%2Flestrrat-go%2Fjwx%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/lib/pq/@v/v0.0.0-20180327071824-d34b9ff171c2.mod -> github.com%2Flib%2Fpq%2F@v%2Fv0.0.0-20180327071824-d34b9ff171c2.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.8.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.8.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-common/golang/gogo/@v/v0.0.0-20190605223551-bc2310a04743.mod -> github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-go/@v/v0.18.1.mod -> github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/lyft/protoc-gen-validate/@v/v0.0.13.mod -> github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/markbates/oncer/@v/v0.0.0-20181203154359-bf2de49a0be2.mod -> github.com%2Fmarkbates%2Foncer%2F@v%2Fv0.0.0-20181203154359-bf2de49a0be2.mod mirror://goproxy//github.com/markbates/safe/@v/v1.0.1.mod -> github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.zip -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.zip mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.mod -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.7.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.12.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.12.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.12.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.12.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mholt/archiver/@v/v3.1.1+incompatible.zip -> github.com%2Fmholt%2Farchiver%2F@v%2Fv3.1.1+incompatible.zip mirror://goproxy//github.com/mholt/archiver/@v/v3.1.1+incompatible.mod -> github.com%2Fmholt%2Farchiver%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/michaelklishin/rabbit-hole/@v/v0.0.0-20191008194146-93d9988f0cd5.zip -> github.com%2Fmichaelklishin%2Frabbit-hole%2F@v%2Fv0.0.0-20191008194146-93d9988f0cd5.zip mirror://goproxy//github.com/michaelklishin/rabbit-hole/@v/v0.0.0-20191008194146-93d9988f0cd5.mod -> github.com%2Fmichaelklishin%2Frabbit-hole%2F@v%2Fv0.0.0-20191008194146-93d9988f0cd5.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.40.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.40.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.40.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.40.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200915141129-7f0af18e79f2.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200915141129-7f0af18e79f2.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200915141129-7f0af18e79f2.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200915141129-7f0af18e79f2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mongodb/go-client-mongodb-atlas/@v/v0.1.2.zip -> github.com%2Fmongodb%2Fgo-client-mongodb-atlas%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mongodb/go-client-mongodb-atlas/@v/v0.1.2.mod -> github.com%2Fmongodb%2Fgo-client-mongodb-atlas%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/montanaflynn/stats/@v/v0.0.0-20171201202039-1bf9dbcd8cbe.mod -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.0.0-20171201202039-1bf9dbcd8cbe.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwielbut/pointy/@v/v1.1.0.zip -> github.com%2Fmwielbut%2Fpointy%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mwielbut/pointy/@v/v1.1.0.mod -> github.com%2Fmwielbut%2Fpointy%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/natefinch/atomic/@v/v0.0.0-20150920032501-a62ce929ffcc.zip -> github.com%2Fnatefinch%2Fatomic%2F@v%2Fv0.0.0-20150920032501-a62ce929ffcc.zip mirror://goproxy//github.com/natefinch/atomic/@v/v0.0.0-20150920032501-a62ce929ffcc.mod -> github.com%2Fnatefinch%2Fatomic%2F@v%2Fv0.0.0-20150920032501-a62ce929ffcc.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.0.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.2.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/nats-io/nats-server/v2/@v/v2.1.2.mod -> github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/nats-io/nats.go/@v/v1.9.1.mod -> github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.0.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.3.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/nats-io/nuid/@v/v1.0.1.mod -> github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.zip -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.zip mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nwaples/rardecode/@v/v1.1.0.zip -> github.com%2Fnwaples%2Frardecode%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/nwaples/rardecode/@v/v1.1.0.mod -> github.com%2Fnwaples%2Frardecode%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/oklog/oklog/@v/v0.3.2.mod -> github.com%2Foklog%2Foklog%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.zip -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/okta/okta-sdk-golang/@v/v1.1.0.zip -> github.com%2Fokta%2Fokta-sdk-golang%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/okta/okta-sdk-golang/@v/v1.1.0.mod -> github.com%2Fokta%2Fokta-sdk-golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/okta/okta-sdk-golang/v2/@v/v2.0.0.zip -> github.com%2Fokta%2Fokta-sdk-golang%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/okta/okta-sdk-golang/v2/@v/v2.0.0.mod -> github.com%2Fokta%2Fokta-sdk-golang%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20190113212917-5533ce8a0da3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20190113212917-5533ce8a0da3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.1.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/openlyinc/pointy/@v/v1.1.2.zip -> github.com%2Fopenlyinc%2Fpointy%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/openlyinc/pointy/@v/v1.1.2.mod -> github.com%2Fopenlyinc%2Fpointy%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/opentracing-contrib/go-observer/@v/v0.0.0-20170622124052-a52f23424492.mod -> github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod mirror://goproxy//github.com/opentracing/basictracer-go/@v/v1.0.0.mod -> github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/openzipkin-contrib/zipkin-go-opentracing/@v/v0.4.5.mod -> github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.3.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.6.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.2.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/oracle/oci-go-sdk/@v/v7.0.0+incompatible.mod -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv7.0.0+incompatible.mod mirror://goproxy//github.com/oracle/oci-go-sdk/@v/v12.5.0+incompatible.zip -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv12.5.0+incompatible.zip mirror://goproxy//github.com/oracle/oci-go-sdk/@v/v12.5.0+incompatible.mod -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv12.5.0+incompatible.mod mirror://goproxy//github.com/ory/dockertest/@v/v3.3.4+incompatible.mod -> github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.4+incompatible.mod mirror://goproxy//github.com/ory/dockertest/@v/v3.3.5+incompatible.zip -> github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.5+incompatible.zip mirror://goproxy//github.com/ory/dockertest/@v/v3.3.5+incompatible.mod -> github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.5+incompatible.mod mirror://goproxy//github.com/ory/dockertest/v3/@v/v3.6.2.zip -> github.com%2Fory%2Fdockertest%2Fv3%2F@v%2Fv3.6.2.zip mirror://goproxy//github.com/ory/dockertest/v3/@v/v3.6.2.mod -> github.com%2Fory%2Fdockertest%2Fv3%2F@v%2Fv3.6.2.mod mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.zip -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.mod -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pact-foundation/pact-go/@v/v1.0.4.mod -> github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v0.0.0-20180815053127-5633e0862627.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv0.0.0-20180815053127-5633e0862627.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.7.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/performancecopilot/speed/@v/v3.0.0+incompatible.mod -> github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/petermattis/goid/@v/v0.0.0-20180202154549-b0b1615b78e5.zip -> github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.zip mirror://goproxy//github.com/petermattis/goid/@v/v0.0.0-20180202154549-b0b1615b78e5.mod -> github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.mod mirror://goproxy//github.com/pierrec/lz4/@v/v1.0.2-0.20190131084431-473cd7ce01a1.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.2.6+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/profile/@v/v1.2.1.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20201205024021-ac21108117ac.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20201205024021-ac21108117ac.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20201205024021-ac21108117ac.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20201205024021-ac21108117ac.mod mirror://goproxy//github.com/pquerna/otp/@v/v1.2.1-0.20191009055518-468c2dd2b58d.zip -> github.com%2Fpquerna%2Fotp%2F@v%2Fv1.2.1-0.20191009055518-468c2dd2b58d.zip mirror://goproxy//github.com/pquerna/otp/@v/v1.2.1-0.20191009055518-468c2dd2b58d.mod -> github.com%2Fpquerna%2Fotp%2F@v%2Fv1.2.1-0.20191009055518-468c2dd2b58d.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.3.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.1.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.11.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.11.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.11.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.2.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.6.2.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.6.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20190923202752-2cc03de413da.zip -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.zip mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20190923202752-2cc03de413da.mod -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.2.0.zip -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.2.0.mod -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sethvargo/go-limiter/@v/v0.7.1.zip -> github.com%2Fsethvargo%2Fgo-limiter%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/sethvargo/go-limiter/@v/v0.7.1.mod -> github.com%2Fsethvargo%2Fgo-limiter%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v3.21.5+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.21.5+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v3.21.5+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.21.5+incompatible.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180725160413-e900ae048470.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180725160413-e900ae048470.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/snowflakedb/gosnowflake/@v/v1.6.1.zip -> github.com%2Fsnowflakedb%2Fgosnowflake%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/snowflakedb/gosnowflake/@v/v1.6.1.mod -> github.com%2Fsnowflakedb%2Fgosnowflake%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sony/gobreaker/@v/v0.4.1.mod -> github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/square/go-jose/@v/v2.4.1+incompatible.mod -> github.com%2Fsquare%2Fgo-jose%2F@v%2Fv2.4.1+incompatible.mod mirror://goproxy//github.com/square/go-jose/v3/@v/v3.0.0-20200225220504-708a9fe87ddc.mod -> github.com%2Fsquare%2Fgo-jose%2Fv3%2F@v%2Fv3.0.0-20200225220504-708a9fe87ddc.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190404075320-75d898a42a94.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.zip -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.zip mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod mirror://goproxy//github.com/streadway/handy/@v/v0.0.0-20190108123426-d5acb3125c2a.mod -> github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/svanharmelen/jsonapi/@v/v0.0.0-20180618144545-0c0828c3f16d.zip -> github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.zip mirror://goproxy//github.com/svanharmelen/jsonapi/@v/v0.0.0-20180618144545-0c0828c3f16d.mod -> github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.171+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.171+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.171+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.171+incompatible.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.1.zip -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.1.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.6.zip -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.6.mod -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/tklauser/numcpus/@v/v0.2.2.zip -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/tklauser/numcpus/@v/v0.2.2.mod -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.zip -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v0.0.0-20180714160509-73f8eece6fdc.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv0.0.0-20180714160509-73f8eece6fdc.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.zip -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.zip -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.zip mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.mod -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yandex-cloud/go-genproto/@v/v0.0.0-20200722140432-762fe965ce77.mod -> github.com%2Fyandex-cloud%2Fgo-genproto%2F@v%2Fv0.0.0-20200722140432-762fe965ce77.mod mirror://goproxy//github.com/yandex-cloud/go-sdk/@v/v0.0.0-20200722140627-2194e5077f13.mod -> github.com%2Fyandex-cloud%2Fgo-sdk%2F@v%2Fv0.0.0-20200722140627-2194e5077f13.mod mirror://goproxy//github.com/yhat/scrape/@v/v0.0.0-20161128144610-24b7890b0945.mod -> github.com%2Fyhat%2Fscrape%2F@v%2Fv0.0.0-20161128144610-24b7890b0945.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20200816102855-ee81675732da.zip -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20200816102855-ee81675732da.zip mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20200816102855-ee81675732da.mod -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20200816102855-ee81675732da.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.4.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200425165423-262c93980547.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200425165423-262c93980547.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200425165423-262c93980547.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200425165423-262c93980547.mod mirror://goproxy//go.mongodb.org/atlas/@v/v0.7.1.zip -> go.mongodb.org%2Fatlas%2F@v%2Fv0.7.1.zip mirror://goproxy//go.mongodb.org/atlas/@v/v0.7.1.mod -> go.mongodb.org%2Fatlas%2F@v%2Fv0.7.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.2.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.6.zip -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.zip mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.6.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.mod mirror://goproxy//go.opencensus.io/@v/v0.19.1.mod -> go.opencensus.io%2F@v%2Fv0.19.1.mod mirror://goproxy//go.opencensus.io/@v/v0.19.2.mod -> go.opencensus.io%2F@v%2Fv0.19.2.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.13.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.1.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190422162423-af44ce270edf.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190422162423-af44ce270edf.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190513172903-22d7a77e9e5f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200117160349-530e935923ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200117160349-530e935923ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200604202706-70a84ac30bf9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181217174547-8f45f776aaf1.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181217174547-8f45f776aaf1.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181106065722-10aee1819953.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190206173232-65e2d4e15006.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190206173232-65e2d4e15006.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191003171128-d98b1b443823.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191003171128-d98b1b443823.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200320220750-118fecf932d8.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200320220750-118fecf932d8.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200505041828-1ed23360d12c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200505041828-1ed23360d12c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201002202402-0a1ea396d57c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201002202402-0a1ea396d57c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210510120150-4163338589ed.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210510120150-4163338589ed.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181203162652-d668ce993890.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190130055435-99b60b757ec1.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190319182350-c85d3e98c914.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190319182350-c85d3e98c914.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190412183630-56d357773e84.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190412183630-56d357773e84.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181122145206-62eef0e2fa9b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181218192612-074acd46bca6.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181218192612-074acd46bca6.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190204203706-41f3e6584952.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190204203706-41f3e6584952.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190419153524-e8e3143a4f4a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190419153524-e8e3143a4f4a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190531175056-4c3a928424d2.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190531175056-4c3a928424d2.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190712062909-fae7ac547cb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190712062909-fae7ac547cb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191220142924-d4481acd189f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200409092240-59c9f1ba88fa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200409092240-59c9f1ba88fa.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200828194041-157a740278f4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200828194041-157a740278f4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200831180312-196b9ba8737a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210316164454-77fc1eacc6aa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210316164454-77fc1eacc6aa.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210514084401-e8d321eab015.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210514084401-e8d321eab015.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181219222714-6e267b5cc78e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181219222714-6e267b5cc78e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190329151228-23e29df326fe.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190329151228-23e29df326fe.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190416151739-9c9e1878f421.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190416151739-9c9e1878f421.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190420181800-aa740d480789.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190420181800-aa740d480789.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190424220101-1e8e1cfdf96b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190424220101-1e8e1cfdf96b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190531172133-b3315ee88b7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190531172133-b3315ee88b7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190718200317-82a3ea8a504c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190718200317-82a3ea8a504c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200103221440-774c71fcf114.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200409170454-77362c5149f0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200409170454-77362c5149f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200416214402-fc959738d646.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200416214402-fc959738d646.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200521155704-91d71f6c2f04.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200521155704-91d71f6c2f04.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210101214203-2dba1e4ea05c.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210101214203-2dba1e4ea05c.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210101214203-2dba1e4ea05c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210101214203-2dba1e4ea05c.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20181220000619-583d854617af.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181220000619-583d854617af.mod mirror://goproxy//google.golang.org/api/@v/v0.2.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.2.0.mod mirror://goproxy//google.golang.org/api/@v/v0.3.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.0.mod mirror://goproxy//google.golang.org/api/@v/v0.3.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod mirror://goproxy//google.golang.org/api/@v/v0.3.2.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.2.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.21.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.21.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.zip mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181219182458-5a97ab628bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181219182458-5a97ab628bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190508193815-b515fa19cec8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190513181449-d00d292a067c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190513181449-d00d292a067c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200323114720-3f67cca34472.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200323114720-3f67cca34472.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200409111301-baae70f3302d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200409111301-baae70f3302d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200416231807-8751e049a2a0.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200416231807-8751e049a2a0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.16.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.zip -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.zip mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.3.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.zip -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.mod -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20180705113604-9856a29383ce.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20180705113604-9856a29383ce.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.mod mirror://goproxy//gopkg.in/ory-am/dockertest.v3/@v/v3.3.4.zip -> gopkg.in%2Fory-am%2Fdockertest.v3%2F@v%2Fv3.3.4.zip mirror://goproxy//gopkg.in/ory-am/dockertest.v3/@v/v3.3.4.mod -> gopkg.in%2Fory-am%2Fdockertest.v3%2F@v%2Fv3.3.4.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.0.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.2.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180920025451-e3ad64cb4ed3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180920025451-e3ad64cb4ed3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190409092523-d687e77c8ae9.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190409092523-d687e77c8ae9.mod mirror://goproxy//k8s.io/api/@v/v0.18.2.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/api/@v/v0.18.2.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190409092423-760d1845f48b.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190409092423-760d1845f48b.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.2.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.2.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.2.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.2.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20190306015804-8e90cee79f82.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20190306015804-8e90cee79f82.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190228160746-b3a7cee44a30.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190228160746-b3a7cee44a30.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200121204235-bf4fb3bd569c.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//layeh.com/radius/@v/v0.0.0-20190322222518-890bc1058917.zip -> layeh.com%2Fradius%2F@v%2Fv0.0.0-20190322222518-890bc1058917.zip mirror://goproxy//layeh.com/radius/@v/v0.0.0-20190322222518-890bc1058917.mod -> layeh.com%2Fradius%2F@v%2Fv0.0.0-20190322222518-890bc1058917.mod mirror://goproxy//mvdan.cc/gofumpt/@v/v0.1.1.zip -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.zip mirror://goproxy//mvdan.cc/gofumpt/@v/v0.1.1.mod -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/appdash/@v/v0.0.0-20190731080439-ebfcffb1b5c0.mod -> sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod
-_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=694cecb6b71f1d00e28a67a1a81461a4
diff --git a/metadata/md5-cache/app-admin/vault-1.8.4 b/metadata/md5-cache/app-admin/vault-1.8.4
new file mode 100644
index 000000000000..23411f0b9d50
--- /dev/null
+++ b/metadata/md5-cache/app-admin/vault-1.8.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.15.3 filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=acct-group/vault acct-user/vault
+DESCRIPTION=A tool for managing secrets
+EAPI=7
+HOMEPAGE=https://vaultproject.io/
+IUSE=+webui +filecaps
+KEYWORDS=amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
+RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vault/archive/v1.8.4.tar.gz -> vault-1.8.4.tar.gz webui? ( https://dev.gentoo.org/~zmedico/dist/vault-1.8.4-webui.tar.xz ) mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.39.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.6.0.zip -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.6.0.zip mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.zip -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.zip mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.zip -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.zip mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/spanner/@v/v1.5.1.zip -> cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.5.1.zip mirror://goproxy//cloud.google.com/go/spanner/@v/v1.5.1.mod -> cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.5.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.zip -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.zip mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.zip -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.zip mirror://goproxy//code.cloudfoundry.org/gofileutils/@v/v0.0.0-20170111115228-4d0c80011a0f.mod -> code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a0f.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//git.apache.org/thrift.git/@v/v0.12.0.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.3.zip -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.3.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v36.2.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v44.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv44.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v51.1.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.1.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v51.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.13.0.zip -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.13.0.zip mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.13.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.17.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.17.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.17.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.17.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.7.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.11.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.11.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.11.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.11.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.7.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.5.7.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!jeffail/gabs/@v/v1.1.1.zip -> github.com%2F!jeffail%2Fgabs%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!jeffail/gabs/@v/v1.1.1.mod -> github.com%2F!jeffail%2Fgabs%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!knetic/govaluate/@v/v3.0.1-0.20171022003610-9aa49832a739+incompatible.mod -> github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.zip -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.zip mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.mod -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.13.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.13.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16-0.20201130162521-d1ffc52c7331.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16-0.20201130162521-d1ffc52c7331.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!nvveen/!gotty/@v/v0.0.0-20120604004816-cd527374f1e5.zip -> github.com%2F!nvveen%2F!gotty%2F@v%2Fv0.0.0-20120604004816-cd527374f1e5.zip mirror://goproxy//github.com/!nvveen/!gotty/@v/v0.0.0-20120604004816-cd527374f1e5.mod -> github.com%2F!nvveen%2F!gotty%2F@v%2Fv0.0.0-20120604004816-cd527374f1e5.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!s!a!p/go-hdb/@v/v0.14.1.zip -> github.com%2F!s!a!p%2Fgo-hdb%2F@v%2Fv0.14.1.zip mirror://goproxy//github.com/!s!a!p/go-hdb/@v/v0.14.1.mod -> github.com%2F!s!a!p%2Fgo-hdb%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/!sectorbob/mlab-ns2/@v/v0.0.0-20171030222938-d3aa0c295a8a.zip -> github.com%2F!sectorbob%2Fmlab-ns2%2F@v%2Fv0.0.0-20171030222938-d3aa0c295a8a.zip mirror://goproxy//github.com/!sectorbob/mlab-ns2/@v/v0.0.0-20171030222938-d3aa0c295a8a.mod -> github.com%2F!sectorbob%2Fmlab-ns2%2F@v%2Fv0.0.0-20171030222938-d3aa0c295a8a.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.19.0.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/!vivid!cortex/gohistogram/@v/v1.0.0.mod -> github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v3.1.1+incompatible.zip -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv3.1.1+incompatible.zip mirror://goproxy//github.com/aerospike/aerospike-client-go/@v/v3.1.1+incompatible.mod -> github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/afex/hystrix-go/@v/v0.0.0-20180502004556-fa1af6a1f4f5.mod -> github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190412020505-60e2075261b6.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190412020505-60e2075261b6.mod mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190620160927-9418d7b0cd0f.zip -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190620160927-9418d7b0cd0f.zip mirror://goproxy//github.com/aliyun/alibaba-cloud-sdk-go/@v/v0.0.0-20190620160927-9418d7b0cd0f.mod -> github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190620160927-9418d7b0cd0f.mod mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190307165228-86c17b95fcd5.zip -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190307165228-86c17b95fcd5.zip mirror://goproxy//github.com/aliyun/aliyun-oss-go-sdk/@v/v0.0.0-20190307165228-86c17b95fcd5.mod -> github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190307165228-86c17b95fcd5.mod mirror://goproxy//github.com/apache/arrow/go/arrow/@v/v0.0.0-20200601151325-b2287a20f230.zip -> github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20200601151325-b2287a20f230.zip mirror://goproxy//github.com/apache/arrow/go/arrow/@v/v0.0.0-20200601151325-b2287a20f230.mod -> github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20200601151325-b2287a20f230.mod mirror://goproxy//github.com/apache/thrift/@v/v0.12.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/apache/thrift/@v/v0.13.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/apple/foundationdb/bindings/go/@v/v0.0.0-20190411004307-cd5c9d91fad2.zip -> github.com%2Fapple%2Ffoundationdb%2Fbindings%2Fgo%2F@v%2Fv0.0.0-20190411004307-cd5c9d91fad2.zip mirror://goproxy//github.com/apple/foundationdb/bindings/go/@v/v0.0.0-20190411004307-cd5c9d91fad2.mod -> github.com%2Fapple%2Ffoundationdb%2Fbindings%2Fgo%2F@v%2Fv0.0.0-20190411004307-cd5c9d91fad2.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.0.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.3.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.4.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.7.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.7.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.7.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/armon/go-proxyproto/@v/v0.0.0-20210323213023-7e956b284f0a.zip -> github.com%2Farmon%2Fgo-proxyproto%2F@v%2Fv0.0.0-20210323213023-7e956b284f0a.zip mirror://goproxy//github.com/armon/go-proxyproto/@v/v0.0.0-20210323213023-7e956b284f0a.mod -> github.com%2Farmon%2Fgo-proxyproto%2F@v%2Fv0.0.0-20210323213023-7e956b284f0a.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aryann/difflib/@v/v0.0.0-20170710044230-e206f873d14a.mod -> github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.13.3.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.0.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.30.27.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.27.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.28.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.28.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.19.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.19.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.19.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.19.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.18.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v1.3.2.zip -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v1.3.2.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/config/@v/v1.1.5.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fconfig%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/config/@v/v1.1.5.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fconfig%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/credentials/@v/v1.1.5.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fcredentials%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/credentials/@v/v1.1.5.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fcredentials%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/feature/ec2/imds/@v/v1.0.6.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Ffeature%2Fec2%2Fimds%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/feature/ec2/imds/@v/v1.0.6.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Ffeature%2Fec2%2Fimds%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/feature/s3/manager/@v/v1.1.2.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Ffeature%2Fs3%2Fmanager%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/feature/s3/manager/@v/v1.1.2.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Ffeature%2Fs3%2Fmanager%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/@v/v1.0.4.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Faccept-encoding%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/@v/v1.0.4.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Faccept-encoding%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/@v/v1.0.6.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Fpresigned-url%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/@v/v1.0.6.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Fpresigned-url%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/s3shared/@v/v1.2.2.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Fs3shared%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/internal/s3shared/@v/v1.2.2.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Finternal%2Fs3shared%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/s3/@v/v1.5.0.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fs3%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/s3/@v/v1.5.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fs3%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/sso/@v/v1.1.5.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fsso%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/sso/@v/v1.1.5.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fsso%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/sts/@v/v1.2.2.zip -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fsts%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/aws/aws-sdk-go-v2/service/sts/@v/v1.2.2.mod -> github.com%2Faws%2Faws-sdk-go-v2%2Fservice%2Fsts%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/aws/smithy-go/@v/v1.3.1.zip -> github.com%2Faws%2Fsmithy-go%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/aws/smithy-go/@v/v1.3.1.mod -> github.com%2Faws%2Fsmithy-go%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.zip -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.zip mirror://goproxy//github.com/baiyubin/aliyun-sts-go-sdk/@v/v0.0.0-20180326062324-cfa1a18b161f.mod -> github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bitly/go-hostpool/@v/v0.0.0-20171023180738-a3a6125de932.mod -> github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.0.0-20171023180738-a3a6125de932.mod mirror://goproxy//github.com/bitly/go-hostpool/@v/v0.1.0.zip -> github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bitly/go-hostpool/@v/v0.1.0.mod -> github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.zip -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.zip mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/boombuler/barcode/@v/v1.0.1-0.20190219062509-6c824513bacc.zip -> github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1-0.20190219062509-6c824513bacc.zip mirror://goproxy//github.com/boombuler/barcode/@v/v1.0.1-0.20190219062509-6c824513bacc.mod -> github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1-0.20190219062509-6c824513bacc.mod mirror://goproxy//github.com/briankassouf/jose/@v/v0.9.2-0.20180619214549-d2569464773f.zip -> github.com%2Fbriankassouf%2Fjose%2F@v%2Fv0.9.2-0.20180619214549-d2569464773f.zip mirror://goproxy//github.com/briankassouf/jose/@v/v0.9.2-0.20180619214549-d2569464773f.mod -> github.com%2Fbriankassouf%2Fjose%2F@v%2Fv0.9.2-0.20180619214549-d2569464773f.mod mirror://goproxy//github.com/c2h5oh/datasize/@v/v0.0.0-20200112174442-28bbd4740fee.mod -> github.com%2Fc2h5oh%2Fdatasize%2F@v%2Fv0.0.0-20200112174442-28bbd4740fee.mod mirror://goproxy//github.com/casbin/casbin/v2/@v/v2.1.2.mod -> github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.zip -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/cenkalti/backoff/v3/@v/v3.0.0.zip -> github.com%2Fcenkalti%2Fbackoff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/cenkalti/backoff/v3/@v/v3.0.0.mod -> github.com%2Fcenkalti%2Fbackoff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/centrify/cloud-golang-sdk/@v/v0.0.0-20190214225812-119110094d0f.zip -> github.com%2Fcentrify%2Fcloud-golang-sdk%2F@v%2Fv0.0.0-20190214225812-119110094d0f.zip mirror://goproxy//github.com/centrify/cloud-golang-sdk/@v/v0.0.0-20190214225812-119110094d0f.mod -> github.com%2Fcentrify%2Fcloud-golang-sdk%2F@v%2Fv0.0.0-20190214225812-119110094d0f.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chrismalek/oktasdk-go/@v/v0.0.0-20181212195951-3430665dfaa0.zip -> github.com%2Fchrismalek%2Foktasdk-go%2F@v%2Fv0.0.0-20181212195951-3430665dfaa0.zip mirror://goproxy//github.com/chrismalek/oktasdk-go/@v/v0.0.0-20181212195951-3430665dfaa0.mod -> github.com%2Fchrismalek%2Foktasdk-go%2F@v%2Fv0.0.0-20181212195951-3430665dfaa0.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/clbanning/x2j/@v/v0.0.0-20191024224557-825249438eec.mod -> github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.zip -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190201205600-f136f9222381.zip -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190201205600-f136f9222381.zip mirror://goproxy//github.com/cloudfoundry-community/go-cfclient/@v/v0.0.0-20190201205600-f136f9222381.mod -> github.com%2Fcloudfoundry-community%2Fgo-cfclient%2F@v%2Fv0.0.0-20190201205600-f136f9222381.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.zip -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cockroachdb/cockroach-go/@v/v0.0.0-20181001143604-e0a95dfd547c.zip -> github.com%2Fcockroachdb%2Fcockroach-go%2F@v%2Fv0.0.0-20181001143604-e0a95dfd547c.zip mirror://goproxy//github.com/cockroachdb/cockroach-go/@v/v0.0.0-20181001143604-e0a95dfd547c.mod -> github.com%2Fcockroachdb%2Fcockroach-go%2F@v%2Fv0.0.0-20181001143604-e0a95dfd547c.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codahale/hdrhistogram/@v/v0.0.0-20161010025455-3a0bb77429bd.mod -> github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.zip -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190827140505-75bee3e2ccb6.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190827140505-75bee3e2ccb6.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200710164510-efbc4488d8fe.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200710164510-efbc4488d8fe.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/v3/@v/v3.0.0.zip -> github.com%2Fcoreos%2Fgo-oidc%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//github.com/coreos/go-oidc/v3/@v/v3.0.0.mod -> github.com%2Fcoreos%2Fgo-oidc%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20191104093116-d3cd4ed1dbcf.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20191104093116-d3cd4ed1dbcf.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/couchbase/gocb/v2/@v/v2.1.4.zip -> github.com%2Fcouchbase%2Fgocb%2Fv2%2F@v%2Fv2.1.4.zip mirror://goproxy//github.com/couchbase/gocb/v2/@v/v2.1.4.mod -> github.com%2Fcouchbase%2Fgocb%2Fv2%2F@v%2Fv2.1.4.mod mirror://goproxy//github.com/couchbase/gocbcore/v9/@v/v9.0.4.zip -> github.com%2Fcouchbase%2Fgocbcore%2Fv9%2F@v%2Fv9.0.4.zip mirror://goproxy//github.com/couchbase/gocbcore/v9/@v/v9.0.4.mod -> github.com%2Fcouchbase%2Fgocbcore%2Fv9%2F@v%2Fv9.0.4.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200428022330-06a60b6afbbc.zip -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200428022330-06a60b6afbbc.zip mirror://goproxy//github.com/denisenkom/go-mssqldb/@v/v0.0.0-20200428022330-06a60b6afbbc.mod -> github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200428022330-06a60b6afbbc.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.7.5.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.7.5.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.7.5.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.7.5.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.1.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.1.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20200319182547-c7ad2b866182.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200319182547-c7ad2b866182.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dsnet/compress/@v/v0.0.1.zip -> github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/dsnet/compress/@v/v0.0.1.mod -> github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/dsnet/golib/@v/v0.0.0-20171103203638-1ea166775780.mod -> github.com%2Fdsnet%2Fgolib%2F@v%2Fv0.0.0-20171103203638-1ea166775780.mod mirror://goproxy//github.com/duosecurity/duo_api_golang/@v/v0.0.0-20190308151101-6c680f768e74.zip -> github.com%2Fduosecurity%2Fduo_api_golang%2F@v%2Fv0.0.0-20190308151101-6c680f768e74.zip mirror://goproxy//github.com/duosecurity/duo_api_golang/@v/v0.0.0-20190308151101-6c680f768e74.mod -> github.com%2Fduosecurity%2Fduo_api_golang%2F@v%2Fv0.0.0-20190308151101-6c680f768e74.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/edsrzf/mmap-go/@v/v1.0.0.mod -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v1.0.1-0.20200509193318-234c15e7648f.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.1-0.20200509193318-234c15e7648f.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v1.0.1-0.20200509193318-234c15e7648f.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.1-0.20200509193318-234c15e7648f.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.6.9.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v0.0.0-20190203023257-5858425f7550.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20190203023257-5858425f7550.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.11.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.13.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.13.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.zip -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/franela/goblin/@v/v0.0.0-20200105215937-c9ffbefa60db.mod -> github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod mirror://goproxy//github.com/franela/goreq/@v/v0.0.0-20171204163338-bcd34c9993f8.mod -> github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.4.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.10.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.13.0.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.13.0.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/gammazero/deque/@v/v0.0.0-20190130191400-2afb3858e9c7.zip -> github.com%2Fgammazero%2Fdeque%2F@v%2Fv0.0.0-20190130191400-2afb3858e9c7.zip mirror://goproxy//github.com/gammazero/deque/@v/v0.0.0-20190130191400-2afb3858e9c7.mod -> github.com%2Fgammazero%2Fdeque%2F@v%2Fv0.0.0-20190130191400-2afb3858e9c7.mod mirror://goproxy//github.com/gammazero/workerpool/@v/v0.0.0-20190406235159-88d534f22b56.zip -> github.com%2Fgammazero%2Fworkerpool%2F@v%2Fv0.0.0-20190406235159-88d534f22b56.zip mirror://goproxy//github.com/gammazero/workerpool/@v/v0.0.0-20190406235159-88d534f22b56.mod -> github.com%2Fgammazero%2Fworkerpool%2F@v%2Fv0.0.0-20190406235159-88d534f22b56.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.1-0.20190212211648-25d852aebe32.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.1-0.20190212211648-25d852aebe32.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.3.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.4.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.1.zip -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/go-asn1-ber/asn1-ber/@v/v1.5.1.mod -> github.com%2Fgo-asn1-ber%2Fasn1-ber%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.zip -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.3.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.3.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.7.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.7.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.1.10.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.1.10.mod mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.4.zip -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.4.zip mirror://goproxy//github.com/go-ldap/ldap/v3/@v/v3.2.4.mod -> github.com%2Fgo-ldap%2Fldap%2Fv3%2F@v%2Fv3.2.4.mod mirror://goproxy//github.com/go-ldap/ldif/@v/v0.0.0-20200320164324-fd88d9b715b3.zip -> github.com%2Fgo-ldap%2Fldif%2F@v%2Fv0.0.0-20200320164324-fd88d9b715b3.zip mirror://goproxy//github.com/go-ldap/ldif/@v/v0.0.0-20200320164324-fd88d9b715b3.mod -> github.com%2Fgo-ldap%2Fldif%2F@v%2Fv0.0.0-20200320164324-fd88d9b715b3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.zip -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.1.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.7.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.7.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.7.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.7.mod mirror://goproxy//github.com/go-yaml/yaml/@v/v2.1.0+incompatible.zip -> github.com%2Fgo-yaml%2Fyaml%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/go-yaml/yaml/@v/v2.1.0+incompatible.mod -> github.com%2Fgo-yaml%2Fyaml%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/gobuffalo/attrs/@v/v0.0.0-20190224210810-a9411de4debd.mod -> github.com%2Fgobuffalo%2Fattrs%2F@v%2Fv0.0.0-20190224210810-a9411de4debd.mod mirror://goproxy//github.com/gobuffalo/depgen/@v/v0.0.0-20190329151759-d478694a28d3.mod -> github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.0.0-20190329151759-d478694a28d3.mod mirror://goproxy//github.com/gobuffalo/depgen/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fdepgen%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.6.15.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.6.15.mod mirror://goproxy//github.com/gobuffalo/envy/@v/v1.7.0.mod -> github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/flect/@v/v0.1.3.mod -> github.com%2Fgobuffalo%2Fflect%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.0.0-20190329151137-27723ad26ef9.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190329151137-27723ad26ef9.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.0.0-20190403191548-3ca520ef0d9e.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.0.0-20190403191548-3ca520ef0d9e.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/genny/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fgenny%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/gitgen/@v/v0.0.0-20190315122116-cc086187d211.mod -> github.com%2Fgobuffalo%2Fgitgen%2F@v%2Fv0.0.0-20190315122116-cc086187d211.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.0.0-20190315121717-8f38393713f5.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.0.0-20190315121717-8f38393713f5.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/gogen/@v/v0.1.1.mod -> github.com%2Fgobuffalo%2Fgogen%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gobuffalo/logger/@v/v0.0.0-20190315122211-86e12af44bc2.mod -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv0.0.0-20190315122211-86e12af44bc2.mod mirror://goproxy//github.com/gobuffalo/mapi/@v/v1.0.1.mod -> github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/gobuffalo/mapi/@v/v1.0.2.mod -> github.com%2Fgobuffalo%2Fmapi%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.0.0-20190315124812-a385830c7fc0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.0.0-20190315124812-a385830c7fc0.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v0.1.0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.0.9.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.0.9.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.2.0.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/gobuffalo/syncx/@v/v0.0.0-20190224160051-33c29581e754.mod -> github.com%2Fgobuffalo%2Fsyncx%2F@v%2Fv0.0.0-20190224160051-33c29581e754.mod mirror://goproxy//github.com/gocql/gocql/@v/v0.0.0-20210401103645-80ab1e13e309.zip -> github.com%2Fgocql%2Fgocql%2F@v%2Fv0.0.0-20210401103645-80ab1e13e309.zip mirror://goproxy//github.com/gocql/gocql/@v/v0.0.0-20210401103645-80ab1e13e309.mod -> github.com%2Fgocql%2Fgocql%2F@v%2Fv0.0.0-20210401103645-80ab1e13e309.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/goji/httpauth/@v/v0.0.0-20160601135302-2da839ab0f4d.mod -> github.com%2Fgoji%2Fhttpauth%2F@v%2Fv0.0.0-20160601135302-2da839ab0f4d.mod mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.zip -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip mirror://goproxy//github.com/golang-sql/civil/@v/v0.0.0-20190719163853-cb61b32ac6fe.mod -> github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20170215233205-553a64147049.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20170215233205-553a64147049.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.2.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.4.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.4.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/flatbuffers/@v/v1.11.0.zip -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/google/flatbuffers/@v/v1.11.0.mod -> github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.zip -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-metrics-stackdriver/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-metrics-stackdriver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-metrics-stackdriver/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-metrics-stackdriver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.zip -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180628210949-0892b62f0d9f.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180628210949-0892b62f0d9f.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20180427100037-88b0669f7d75.zip -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20180427100037-88b0669f7d75.zip mirror://goproxy//github.com/gorhill/cronexpr/@v/v0.0.0-20180427100037-88b0669f7d75.mod -> github.com%2Fgorhill%2Fcronexpr%2F@v%2Fv0.0.0-20180427100037-88b0669f7d75.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.6.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.zip -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gorilla/securecookie/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/sessions/@v/v1.2.0.zip -> github.com%2Fgorilla%2Fsessions%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/gorilla/sessions/@v/v1.2.0.mod -> github.com%2Fgorilla%2Fsessions%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/gotestyourself/gotestyourself/@v/v2.2.0+incompatible.zip -> github.com%2Fgotestyourself%2Fgotestyourself%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/gotestyourself/gotestyourself/@v/v2.2.0+incompatible.mod -> github.com%2Fgotestyourself%2Fgotestyourself%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.6.2.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hailocab/go-hostpool/@v/v0.0.0-20160125115350-e80d13ce29ed.zip -> github.com%2Fhailocab%2Fgo-hostpool%2F@v%2Fv0.0.0-20160125115350-e80d13ce29ed.zip mirror://goproxy//github.com/hailocab/go-hostpool/@v/v0.0.0-20160125115350-e80d13ce29ed.mod -> github.com%2Fhailocab%2Fgo-hostpool%2F@v%2Fv0.0.0-20160125115350-e80d13ce29ed.mod mirror://goproxy//github.com/hashicorp/cap/@v/v0.1.0.zip -> github.com%2Fhashicorp%2Fcap%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/hashicorp/cap/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fcap%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/consul-template/@v/v0.26.0.zip -> github.com%2Fhashicorp%2Fconsul-template%2F@v%2Fv0.26.0.zip mirror://goproxy//github.com/hashicorp/consul-template/@v/v0.26.0.mod -> github.com%2Fhashicorp%2Fconsul-template%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.4.0.zip -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.4.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.1-0.20200910203702-bb2b5dd871ca.zip -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.1-0.20200910203702-bb2b5dd871ca.zip mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.4.1-0.20200910203702-bb2b5dd871ca.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.1-0.20200910203702-bb2b5dd871ca.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-bindata/@v/v3.0.8-0.20180209072458-bf7910af8997+incompatible.zip -> github.com%2Fhashicorp%2Fgo-bindata%2F@v%2Fv3.0.8-0.20180209072458-bf7910af8997+incompatible.zip mirror://goproxy//github.com/hashicorp/go-bindata/@v/v3.0.8-0.20180209072458-bf7910af8997+incompatible.mod -> github.com%2Fhashicorp%2Fgo-bindata%2F@v%2Fv3.0.8-0.20180209072458-bf7910af8997+incompatible.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.2.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20201029210230-738cb3105cd0.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20201029210230-738cb3105cd0.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20201029210230-738cb3105cd0.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20201029210230-738cb3105cd0.mod mirror://goproxy//github.com/hashicorp/go-gatedio/@v/v0.5.0.zip -> github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/hashicorp/go-gatedio/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-gcp-common/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-gcp-common/@v/v0.7.0.zip -> github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/hashicorp/go-gcp-common/@v/v0.7.0.mod -> github.com%2Fhashicorp%2Fgo-gcp-common%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.14.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.14.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.15.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.15.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.16.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.16.2.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.2.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.16.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.16.2.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-kms-wrapping/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.zip -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/hashicorp/go-kms-wrapping/entropy/@v/v0.1.0.mod -> github.com%2Fhashicorp%2Fgo-kms-wrapping%2Fentropy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v1.1.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v1.1.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.3-0.20191002164813-7e9e8525653a.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.3-0.20191002164813-7e9e8525653a.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.3-0.20191002164813-7e9e8525653a.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.3-0.20191002164813-7e9e8525653a.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.6.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.7.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.7.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-secure-stdlib/awsutil/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-secure-stdlib%2Fawsutil%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-secure-stdlib/awsutil/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-secure-stdlib%2Fawsutil%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-secure-stdlib/strutil/@v/v0.1.1.zip -> github.com%2Fhashicorp%2Fgo-secure-stdlib%2Fstrutil%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/hashicorp/go-secure-stdlib/strutil/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fgo-secure-stdlib%2Fstrutil%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.zip -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/hashicorp/go-slug/@v/v0.4.1.mod -> github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-tfe/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.1.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.1-vault-3.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.1-vault-3.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.1-vault-3.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.1-vault-3.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/nomad/api/@v/v0.0.0-20191220223628-edc62acd919d.zip -> github.com%2Fhashicorp%2Fnomad%2Fapi%2F@v%2Fv0.0.0-20191220223628-edc62acd919d.zip mirror://goproxy//github.com/hashicorp/nomad/api/@v/v0.0.0-20191220223628-edc62acd919d.mod -> github.com%2Fhashicorp%2Fnomad%2Fapi%2F@v%2Fv0.0.0-20191220223628-edc62acd919d.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2-0.20191002163536-9c6bd3e3eb17.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2-0.20191002163536-9c6bd3e3eb17.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.3.0.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.3.zip -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/hashicorp/raft-autopilot/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fraft-autopilot%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/v2/@v/v2.0.0-20210421194847-a7e34179d62c.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2Fv2%2F@v%2Fv2.0.0-20210421194847-a7e34179d62c.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/v2/@v/v2.0.0-20210421194847-a7e34179d62c.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2Fv2%2F@v%2Fv2.0.0-20210421194847-a7e34179d62c.mod mirror://goproxy//github.com/hashicorp/raft-snapshot/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fraft-snapshot%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/raft-snapshot/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fraft-snapshot%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.4.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.5.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-alicloud/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-alicloud%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-alicloud/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-alicloud%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-azure/@v/v0.8.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-azure%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-azure/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-azure%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-centrify/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-centrify%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-centrify/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-centrify%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-cf/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-cf%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-cf/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-cf%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-gcp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-gcp/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-gcp/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-gcp%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-jwt/@v/v0.10.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-jwt%2F@v%2Fv0.10.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-jwt/@v/v0.10.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-jwt%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kerberos/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-kerberos%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kerberos/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-kerberos%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kubernetes/@v/v0.10.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-kubernetes%2F@v%2Fv0.10.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-kubernetes/@v/v0.10.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-kubernetes%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-auth-oci/@v/v0.8.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-auth-oci%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-auth-oci/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-auth-oci%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-couchbase/@v/v0.4.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-couchbase%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-couchbase/@v/v0.4.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-couchbase%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-elasticsearch/@v/v0.8.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-elasticsearch%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-elasticsearch/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-elasticsearch%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-mongodbatlas/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-mongodbatlas%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-mongodbatlas/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-mongodbatlas%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-database-snowflake/@v/v0.2.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-database-snowflake%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-database-snowflake/@v/v0.2.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-database-snowflake%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-mock/@v/v0.16.1.zip -> github.com%2Fhashicorp%2Fvault-plugin-mock%2F@v%2Fv0.16.1.zip mirror://goproxy//github.com/hashicorp/vault-plugin-mock/@v/v0.16.1.mod -> github.com%2Fhashicorp%2Fvault-plugin-mock%2F@v%2Fv0.16.1.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-ad/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-ad%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-ad/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-ad%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-alicloud/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-alicloud%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-alicloud/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-alicloud%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-azure/@v/v0.10.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-azure%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-azure/@v/v0.10.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-azure%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcp/@v/v0.10.2.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcp%2F@v%2Fv0.10.2.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcp/@v/v0.10.2.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcp%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcpkms/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcpkms%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-gcpkms/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-gcpkms%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-kv/@v/v0.9.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-kv%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-kv/@v/v0.9.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-kv%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-mongodbatlas/@v/v0.4.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-mongodbatlas%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-mongodbatlas/@v/v0.4.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-mongodbatlas%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-openldap/@v/v0.5.2.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-openldap/@v/v0.5.2.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-openldap%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-terraform/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fvault-plugin-secrets-terraform%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/vault-plugin-secrets-terraform/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fvault-plugin-secrets-terraform%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.2.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/huaweicloud/golangsdk/@v/v0.0.0-20200304081349-45ec0797f2a4.mod -> github.com%2Fhuaweicloud%2Fgolangsdk%2F@v%2Fv0.0.0-20200304081349-45ec0797f2a4.mod mirror://goproxy//github.com/hudl/fargo/@v/v1.3.0.mod -> github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/influxdata/influxdb/@v/v0.0.0-20190411212539-d24b7ba8c4c4.zip -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv0.0.0-20190411212539-d24b7ba8c4c4.zip mirror://goproxy//github.com/influxdata/influxdb/@v/v0.0.0-20190411212539-d24b7ba8c4c4.mod -> github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv0.0.0-20190411212539-d24b7ba8c4c4.mod mirror://goproxy//github.com/influxdata/influxdb1-client/@v/v0.0.0-20191209144304-8bf82d3c094d.mod -> github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.zip -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.zip mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.zip -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.zip mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.4.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.5.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.5.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/jcmturner/aescts/@v/v1.0.1.zip -> github.com%2Fjcmturner%2Faescts%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/jcmturner/aescts/@v/v1.0.1.mod -> github.com%2Fjcmturner%2Faescts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/jcmturner/dnsutils/@v/v1.0.1.zip -> github.com%2Fjcmturner%2Fdnsutils%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/jcmturner/dnsutils/@v/v1.0.1.mod -> github.com%2Fjcmturner%2Fdnsutils%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.zip -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jcmturner/gofork/@v/v1.0.0.mod -> github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jcmturner/goidentity/v6/@v/v6.0.1.zip -> github.com%2Fjcmturner%2Fgoidentity%2Fv6%2F@v%2Fv6.0.1.zip mirror://goproxy//github.com/jcmturner/goidentity/v6/@v/v6.0.1.mod -> github.com%2Fjcmturner%2Fgoidentity%2Fv6%2F@v%2Fv6.0.1.mod mirror://goproxy//github.com/jcmturner/gokrb5/v8/@v/v8.0.0.zip -> github.com%2Fjcmturner%2Fgokrb5%2Fv8%2F@v%2Fv8.0.0.zip mirror://goproxy//github.com/jcmturner/gokrb5/v8/@v/v8.0.0.mod -> github.com%2Fjcmturner%2Fgokrb5%2Fv8%2F@v%2Fv8.0.0.mod mirror://goproxy//github.com/jcmturner/rpc/v2/@v/v2.0.2.zip -> github.com%2Fjcmturner%2Frpc%2Fv2%2F@v%2Fv2.0.2.zip mirror://goproxy//github.com/jcmturner/rpc/v2/@v/v2.0.2.mod -> github.com%2Fjcmturner%2Frpc%2Fv2%2F@v%2Fv2.0.2.mod mirror://goproxy//github.com/jeffchao/backoff/@v/v0.0.0-20140404060208-9d7fd7aa17f2.zip -> github.com%2Fjeffchao%2Fbackoff%2F@v%2Fv0.0.0-20140404060208-9d7fd7aa17f2.zip mirror://goproxy//github.com/jeffchao/backoff/@v/v0.0.0-20140404060208-9d7fd7aa17f2.mod -> github.com%2Fjeffchao%2Fbackoff%2F@v%2Fv0.0.0-20140404060208-9d7fd7aa17f2.mod mirror://goproxy//github.com/jefferai/isbadcipher/@v/v0.0.0-20190226160619-51d2077c035f.zip -> github.com%2Fjefferai%2Fisbadcipher%2F@v%2Fv0.0.0-20190226160619-51d2077c035f.zip mirror://goproxy//github.com/jefferai/isbadcipher/@v/v0.0.0-20190226160619-51d2077c035f.mod -> github.com%2Fjefferai%2Fisbadcipher%2F@v%2Fv0.0.0-20190226160619-51d2077c035f.mod mirror://goproxy//github.com/jefferai/jsonx/@v/v1.0.0.zip -> github.com%2Fjefferai%2Fjsonx%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jefferai/jsonx/@v/v1.0.0.mod -> github.com%2Fjefferai%2Fjsonx%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180701071628-ab8a2e0c74be.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180701071628-ab8a2e0c74be.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.zip -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.8.0.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.10.3.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/kelseyhightower/envconfig/@v/v1.3.0.mod -> github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/kelseyhightower/envconfig/@v/v1.4.0.zip -> github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/kelseyhightower/envconfig/@v/v1.4.0.mod -> github.com%2Fkelseyhightower%2Fenvconfig%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/keybase/go-crypto/@v/v0.0.0-20190403132359-d65b6b94177f.zip -> github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20190403132359-d65b6b94177f.zip mirror://goproxy//github.com/keybase/go-crypto/@v/v0.0.0-20190403132359-d65b6b94177f.mod -> github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20190403132359-d65b6b94177f.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.1.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.5.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.9.5.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/lestrrat-go/jwx/@v/v0.9.0.mod -> github.com%2Flestrrat-go%2Fjwx%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/lib/pq/@v/v0.0.0-20180327071824-d34b9ff171c2.mod -> github.com%2Flib%2Fpq%2F@v%2Fv0.0.0-20180327071824-d34b9ff171c2.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/lib/pq/@v/v1.2.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.8.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.10.3.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.10.3.zip mirror://goproxy//github.com/lib/pq/@v/v1.10.3.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-common/golang/gogo/@v/v0.0.0-20190605223551-bc2310a04743.mod -> github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-go/@v/v0.18.1.mod -> github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/lyft/protoc-gen-validate/@v/v0.0.13.mod -> github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/markbates/oncer/@v/v0.0.0-20181203154359-bf2de49a0be2.mod -> github.com%2Fmarkbates%2Foncer%2F@v%2Fv0.0.0-20181203154359-bf2de49a0be2.mod mirror://goproxy//github.com/markbates/safe/@v/v1.0.1.mod -> github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.zip -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.zip mirror://goproxy//github.com/martini-contrib/render/@v/v0.0.0-20150707142108-ec18f8345a11.mod -> github.com%2Fmartini-contrib%2Frender%2F@v%2Fv0.0.0-20150707142108-ec18f8345a11.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.7.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.11.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.11.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.11.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.11.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.14.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.14.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.12.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.12.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.12.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.12.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mholt/archiver/@v/v3.1.1+incompatible.zip -> github.com%2Fmholt%2Farchiver%2F@v%2Fv3.1.1+incompatible.zip mirror://goproxy//github.com/mholt/archiver/@v/v3.1.1+incompatible.mod -> github.com%2Fmholt%2Farchiver%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/michaelklishin/rabbit-hole/@v/v0.0.0-20191008194146-93d9988f0cd5.zip -> github.com%2Fmichaelklishin%2Frabbit-hole%2F@v%2Fv0.0.0-20191008194146-93d9988f0cd5.zip mirror://goproxy//github.com/michaelklishin/rabbit-hole/@v/v0.0.0-20191008194146-93d9988f0cd5.mod -> github.com%2Fmichaelklishin%2Frabbit-hole%2F@v%2Fv0.0.0-20191008194146-93d9988f0cd5.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.40.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.40.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.40.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.40.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200915141129-7f0af18e79f2.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200915141129-7f0af18e79f2.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200915141129-7f0af18e79f2.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200915141129-7f0af18e79f2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mongodb/go-client-mongodb-atlas/@v/v0.1.2.zip -> github.com%2Fmongodb%2Fgo-client-mongodb-atlas%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/mongodb/go-client-mongodb-atlas/@v/v0.1.2.mod -> github.com%2Fmongodb%2Fgo-client-mongodb-atlas%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/montanaflynn/stats/@v/v0.0.0-20171201202039-1bf9dbcd8cbe.mod -> github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.0.0-20171201202039-1bf9dbcd8cbe.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwielbut/pointy/@v/v1.1.0.zip -> github.com%2Fmwielbut%2Fpointy%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mwielbut/pointy/@v/v1.1.0.mod -> github.com%2Fmwielbut%2Fpointy%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/natefinch/atomic/@v/v0.0.0-20150920032501-a62ce929ffcc.zip -> github.com%2Fnatefinch%2Fatomic%2F@v%2Fv0.0.0-20150920032501-a62ce929ffcc.zip mirror://goproxy//github.com/natefinch/atomic/@v/v0.0.0-20150920032501-a62ce929ffcc.mod -> github.com%2Fnatefinch%2Fatomic%2F@v%2Fv0.0.0-20150920032501-a62ce929ffcc.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.0.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.2.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/nats-io/nats-server/v2/@v/v2.1.2.mod -> github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/nats-io/nats.go/@v/v1.9.1.mod -> github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.0.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.3.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/nats-io/nuid/@v/v1.0.1.mod -> github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.zip -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.zip mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nwaples/rardecode/@v/v1.1.0.zip -> github.com%2Fnwaples%2Frardecode%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/nwaples/rardecode/@v/v1.1.0.mod -> github.com%2Fnwaples%2Frardecode%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/oklog/oklog/@v/v0.3.2.mod -> github.com%2Foklog%2Foklog%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.zip -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/okta/okta-sdk-golang/@v/v1.1.0.zip -> github.com%2Fokta%2Fokta-sdk-golang%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/okta/okta-sdk-golang/@v/v1.1.0.mod -> github.com%2Fokta%2Fokta-sdk-golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/okta/okta-sdk-golang/v2/@v/v2.0.0.zip -> github.com%2Fokta%2Fokta-sdk-golang%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/okta/okta-sdk-golang/v2/@v/v2.0.0.mod -> github.com%2Fokta%2Fokta-sdk-golang%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20190113212917-5533ce8a0da3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20190113212917-5533ce8a0da3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.1.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/openlyinc/pointy/@v/v1.1.2.zip -> github.com%2Fopenlyinc%2Fpointy%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/openlyinc/pointy/@v/v1.1.2.mod -> github.com%2Fopenlyinc%2Fpointy%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/opentracing-contrib/go-observer/@v/v0.0.0-20170622124052-a52f23424492.mod -> github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod mirror://goproxy//github.com/opentracing/basictracer-go/@v/v1.0.0.mod -> github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/openzipkin-contrib/zipkin-go-opentracing/@v/v0.4.5.mod -> github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.3.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.6.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.2.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/oracle/oci-go-sdk/@v/v7.0.0+incompatible.mod -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv7.0.0+incompatible.mod mirror://goproxy//github.com/oracle/oci-go-sdk/@v/v13.1.0+incompatible.zip -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv13.1.0+incompatible.zip mirror://goproxy//github.com/oracle/oci-go-sdk/@v/v13.1.0+incompatible.mod -> github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv13.1.0+incompatible.mod mirror://goproxy//github.com/ory/dockertest/@v/v3.3.4+incompatible.mod -> github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.4+incompatible.mod mirror://goproxy//github.com/ory/dockertest/@v/v3.3.5+incompatible.zip -> github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.5+incompatible.zip mirror://goproxy//github.com/ory/dockertest/@v/v3.3.5+incompatible.mod -> github.com%2Fory%2Fdockertest%2F@v%2Fv3.3.5+incompatible.mod mirror://goproxy//github.com/ory/dockertest/v3/@v/v3.6.2.zip -> github.com%2Fory%2Fdockertest%2Fv3%2F@v%2Fv3.6.2.zip mirror://goproxy//github.com/ory/dockertest/v3/@v/v3.6.2.mod -> github.com%2Fory%2Fdockertest%2Fv3%2F@v%2Fv3.6.2.mod mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.zip -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip mirror://goproxy//github.com/oxtoacart/bpool/@v/v0.0.0-20150712133111-4e1c5567d7c2.mod -> github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pact-foundation/pact-go/@v/v1.0.4.mod -> github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v0.0.0-20180815053127-5633e0862627.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv0.0.0-20180815053127-5633e0862627.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.7.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/performancecopilot/speed/@v/v3.0.0+incompatible.mod -> github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/petermattis/goid/@v/v0.0.0-20180202154549-b0b1615b78e5.zip -> github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.zip mirror://goproxy//github.com/petermattis/goid/@v/v0.0.0-20180202154549-b0b1615b78e5.mod -> github.com%2Fpetermattis%2Fgoid%2F@v%2Fv0.0.0-20180202154549-b0b1615b78e5.mod mirror://goproxy//github.com/pierrec/lz4/@v/v1.0.2-0.20190131084431-473cd7ce01a1.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.2.6+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20180916011732-0a3d74bf9ce4.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/profile/@v/v1.2.1.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20201205024021-ac21108117ac.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20201205024021-ac21108117ac.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20201205024021-ac21108117ac.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20201205024021-ac21108117ac.mod mirror://goproxy//github.com/pquerna/otp/@v/v1.2.1-0.20191009055518-468c2dd2b58d.zip -> github.com%2Fpquerna%2Fotp%2F@v%2Fv1.2.1-0.20191009055518-468c2dd2b58d.zip mirror://goproxy//github.com/pquerna/otp/@v/v1.2.1-0.20191009055518-468c2dd2b58d.mod -> github.com%2Fpquerna%2Fotp%2F@v%2Fv1.2.1-0.20191009055518-468c2dd2b58d.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.3.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.1.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.11.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.11.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.11.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.2.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.6.2.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.6.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20190923202752-2cc03de413da.zip -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.zip mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20190923202752-2cc03de413da.mod -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.2.0.zip -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/sasha-s/go-deadlock/@v/v0.2.0.mod -> github.com%2Fsasha-s%2Fgo-deadlock%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sethvargo/go-limiter/@v/v0.7.1.zip -> github.com%2Fsethvargo%2Fgo-limiter%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/sethvargo/go-limiter/@v/v0.7.1.mod -> github.com%2Fsethvargo%2Fgo-limiter%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v3.21.5+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.21.5+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v3.21.5+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.21.5+incompatible.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.zip mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180725160413-e900ae048470.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180725160413-e900ae048470.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/snowflakedb/gosnowflake/@v/v1.6.1.zip -> github.com%2Fsnowflakedb%2Fgosnowflake%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/snowflakedb/gosnowflake/@v/v1.6.1.mod -> github.com%2Fsnowflakedb%2Fgosnowflake%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sony/gobreaker/@v/v0.4.1.mod -> github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/square/go-jose/@v/v2.4.1+incompatible.mod -> github.com%2Fsquare%2Fgo-jose%2F@v%2Fv2.4.1+incompatible.mod mirror://goproxy//github.com/square/go-jose/v3/@v/v3.0.0-20200225220504-708a9fe87ddc.mod -> github.com%2Fsquare%2Fgo-jose%2Fv3%2F@v%2Fv3.0.0-20200225220504-708a9fe87ddc.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190404075320-75d898a42a94.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.zip -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.zip mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod mirror://goproxy//github.com/streadway/handy/@v/v0.0.0-20190108123426-d5acb3125c2a.mod -> github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/svanharmelen/jsonapi/@v/v0.0.0-20180618144545-0c0828c3f16d.zip -> github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.zip mirror://goproxy//github.com/svanharmelen/jsonapi/@v/v0.0.0-20180618144545-0c0828c3f16d.mod -> github.com%2Fsvanharmelen%2Fjsonapi%2F@v%2Fv0.0.0-20180618144545-0c0828c3f16d.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v1.0.162.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv1.0.162.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.1.zip -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.1.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.6.zip -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.6.mod -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/tklauser/numcpus/@v/v0.2.2.zip -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/tklauser/numcpus/@v/v0.2.2.mod -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.zip -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip mirror://goproxy//github.com/xdg/scram/@v/v0.0.0-20180814205039-7eeb5667e42c.mod -> github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod mirror://goproxy//github.com/xdg/stringprep/@v/v0.0.0-20180714160509-73f8eece6fdc.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv0.0.0-20180714160509-73f8eece6fdc.mod mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.zip -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/xdg/stringprep/@v/v1.0.0.mod -> github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.zip -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.zip mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.mod -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yandex-cloud/go-genproto/@v/v0.0.0-20200722140432-762fe965ce77.mod -> github.com%2Fyandex-cloud%2Fgo-genproto%2F@v%2Fv0.0.0-20200722140432-762fe965ce77.mod mirror://goproxy//github.com/yandex-cloud/go-sdk/@v/v0.0.0-20200722140627-2194e5077f13.mod -> github.com%2Fyandex-cloud%2Fgo-sdk%2F@v%2Fv0.0.0-20200722140627-2194e5077f13.mod mirror://goproxy//github.com/yhat/scrape/@v/v0.0.0-20161128144610-24b7890b0945.mod -> github.com%2Fyhat%2Fscrape%2F@v%2Fv0.0.0-20161128144610-24b7890b0945.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20200816102855-ee81675732da.zip -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20200816102855-ee81675732da.zip mirror://goproxy//github.com/yuin/gopher-lua/@v/v0.0.0-20200816102855-ee81675732da.mod -> github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20200816102855-ee81675732da.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.4.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200425165423-262c93980547.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200425165423-262c93980547.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200425165423-262c93980547.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200425165423-262c93980547.mod mirror://goproxy//go.mongodb.org/atlas/@v/v0.7.1.zip -> go.mongodb.org%2Fatlas%2F@v%2Fv0.7.1.zip mirror://goproxy//go.mongodb.org/atlas/@v/v0.7.1.mod -> go.mongodb.org%2Fatlas%2F@v%2Fv0.7.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.2.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.6.zip -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.zip mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.4.6.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.4.6.mod mirror://goproxy//go.opencensus.io/@v/v0.19.1.mod -> go.opencensus.io%2F@v%2Fv0.19.1.mod mirror://goproxy//go.opencensus.io/@v/v0.19.2.mod -> go.opencensus.io%2F@v%2Fv0.19.2.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.zip -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.13.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.14.1.zip -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.zip mirror://goproxy//go.uber.org/zap/@v/v1.14.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190325154230-a5d413f7728c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190418165655-df01cb2cc480.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190422162423-af44ce270edf.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190422162423-af44ce270edf.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190513172903-22d7a77e9e5f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190530122614-20be4c3c3ed5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200117160349-530e935923ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200117160349-530e935923ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200604202706-70a84ac30bf9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181217174547-8f45f776aaf1.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181217174547-8f45f776aaf1.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181106065722-10aee1819953.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190206173232-65e2d4e15006.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190206173232-65e2d4e15006.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191003171128-d98b1b443823.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191003171128-d98b1b443823.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191112182307-2180aed22343.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200320220750-118fecf932d8.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200320220750-118fecf932d8.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200505041828-1ed23360d12c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200505041828-1ed23360d12c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200602114024-627f9648deb9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201002202402-0a1ea396d57c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201002202402-0a1ea396d57c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210510120150-4163338589ed.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210510120150-4163338589ed.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181203162652-d668ce993890.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190130055435-99b60b757ec1.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190319182350-c85d3e98c914.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190319182350-c85d3e98c914.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190412183630-56d357773e84.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190412183630-56d357773e84.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181122145206-62eef0e2fa9b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181218192612-074acd46bca6.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181218192612-074acd46bca6.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190204203706-41f3e6584952.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190204203706-41f3e6584952.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190419153524-e8e3143a4f4a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190419153524-e8e3143a4f4a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190531175056-4c3a928424d2.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190531175056-4c3a928424d2.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190712062909-fae7ac547cb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190712062909-fae7ac547cb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191112214154-59a1497f0cea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191220142924-d4481acd189f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200409092240-59c9f1ba88fa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200409092240-59c9f1ba88fa.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200828194041-157a740278f4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200828194041-157a740278f4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200831180312-196b9ba8737a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210316164454-77fc1eacc6aa.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210316164454-77fc1eacc6aa.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210514084401-e8d321eab015.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210927094055-39ccf1dd6fa6.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210927094055-39ccf1dd6fa6.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210927094055-39ccf1dd6fa6.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210927094055-39ccf1dd6fa6.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181219222714-6e267b5cc78e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181219222714-6e267b5cc78e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190329151228-23e29df326fe.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190329151228-23e29df326fe.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190416151739-9c9e1878f421.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190416151739-9c9e1878f421.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190420181800-aa740d480789.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190420181800-aa740d480789.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190424220101-1e8e1cfdf96b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190424220101-1e8e1cfdf96b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190531172133-b3315ee88b7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190531172133-b3315ee88b7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190718200317-82a3ea8a504c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190718200317-82a3ea8a504c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200103221440-774c71fcf114.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200409170454-77362c5149f0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200409170454-77362c5149f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200416214402-fc959738d646.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200416214402-fc959738d646.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200521155704-91d71f6c2f04.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200521155704-91d71f6c2f04.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210101214203-2dba1e4ea05c.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210101214203-2dba1e4ea05c.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210101214203-2dba1e4ea05c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210101214203-2dba1e4ea05c.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20181220000619-583d854617af.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181220000619-583d854617af.mod mirror://goproxy//google.golang.org/api/@v/v0.2.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.2.0.mod mirror://goproxy//google.golang.org/api/@v/v0.3.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.0.mod mirror://goproxy//google.golang.org/api/@v/v0.3.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod mirror://goproxy//google.golang.org/api/@v/v0.3.2.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.2.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.21.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.21.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.zip mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181219182458-5a97ab628bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181219182458-5a97ab628bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190508193815-b515fa19cec8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190513181449-d00d292a067c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190513181449-d00d292a067c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200323114720-3f67cca34472.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200323114720-3f67cca34472.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200409111301-baae70f3302d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200409111301-baae70f3302d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200416231807-8751e049a2a0.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200416231807-8751e049a2a0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.16.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.zip -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.zip mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.3.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.42.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.zip -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip mirror://goproxy//gopkg.in/jcmturner/goidentity.v3/@v/v3.0.0.mod -> gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20180705113604-9856a29383ce.zip -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.zip mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20180705113604-9856a29383ce.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.mod mirror://goproxy//gopkg.in/ory-am/dockertest.v3/@v/v3.3.4.zip -> gopkg.in%2Fory-am%2Fdockertest.v3%2F@v%2Fv3.3.4.zip mirror://goproxy//gopkg.in/ory-am/dockertest.v3/@v/v3.3.4.mod -> gopkg.in%2Fory-am%2Fdockertest.v3%2F@v%2Fv3.3.4.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.0.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.2.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180920025451-e3ad64cb4ed3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180920025451-e3ad64cb4ed3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190409092523-d687e77c8ae9.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190409092523-d687e77c8ae9.mod mirror://goproxy//k8s.io/api/@v/v0.18.2.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/api/@v/v0.18.2.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190409092423-760d1845f48b.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190409092423-760d1845f48b.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.2.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.2.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.2.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.2.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.2.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.2.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20190306015804-8e90cee79f82.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20190306015804-8e90cee79f82.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190228160746-b3a7cee44a30.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190228160746-b3a7cee44a30.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200121204235-bf4fb3bd569c.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//layeh.com/radius/@v/v0.0.0-20190322222518-890bc1058917.zip -> layeh.com%2Fradius%2F@v%2Fv0.0.0-20190322222518-890bc1058917.zip mirror://goproxy//layeh.com/radius/@v/v0.0.0-20190322222518-890bc1058917.mod -> layeh.com%2Fradius%2F@v%2Fv0.0.0-20190322222518-890bc1058917.mod mirror://goproxy//mvdan.cc/gofumpt/@v/v0.1.1.zip -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.zip mirror://goproxy//mvdan.cc/gofumpt/@v/v0.1.1.mod -> mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//sourcegraph.com/sourcegraph/appdash/@v/v0.0.0-20190731080439-ebfcffb1b5c0.mod -> sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod
+_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e02f68d7c84c0284dca1edca0af4c558
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index a27d5d1be03a..b90098aa3e8a 100644
--- a/metadata/md5-cache/app-antivirus/Manifest.gz
+++ b/metadata/md5-cache/app-antivirus/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.104.0-r1 b/metadata/md5-cache/app-antivirus/clamav-0.104.0-r1
new file mode 100644
index 000000000000..b2c1ed12a4b5
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamav-0.104.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=acct-group/clamav acct-user/clamav dev-libs/libltdl dev-libs/libmspack dev-libs/json-c:= dev-libs/libpcre2 >=sys-libs/zlib-1.2.2:= app-arch/bzip2 clamapp? ( sys-libs/ncurses:= net-misc/curl ) elibc_musl? ( sys-libs/fts-standalone ) virtual/libiconv !libclamav-only? ( net-misc/curl ) dev-libs/openssl:= milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libxml2 rar? ( app-arch/unrar ) test? ( dev-python/pytest ) test? ( dev-libs/check )
+DESCRIPTION=Clam Anti-Virus Scanner
+EAPI=7
+HOMEPAGE=https://www.clamav.net/
+IUSE=doc clamonacc +clamapp libclamav-only milter rar selinux systemd test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=acct-group/clamav acct-user/clamav dev-libs/libltdl dev-libs/libmspack dev-libs/json-c:= dev-libs/libpcre2 >=sys-libs/zlib-1.2.2:= app-arch/bzip2 clamapp? ( sys-libs/ncurses:= net-misc/curl ) elibc_musl? ( sys-libs/fts-standalone ) virtual/libiconv !libclamav-only? ( net-misc/curl ) dev-libs/openssl:= milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) dev-libs/libxml2 rar? ( app-arch/unrar ) test? ( dev-python/pytest ) selinux? ( sec-policy/selinux-clamav ) virtual/tmpfiles
+REQUIRED_USE=libclamav-only? ( !clamonacc !clamapp !milter ) clamonacc? ( clamapp ) milter? ( clamapp ) test? ( !libclamav-only )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.clamav.net/downloads/production/clamav-0.104.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=85cf524b66a899269d2c54314c1649ff
diff --git a/metadata/md5-cache/app-antivirus/fangfrisch-1.5.0 b/metadata/md5-cache/app-antivirus/fangfrisch-1.5.0
new file mode 100644
index 000000000000..1e6a595d7e86
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/fangfrisch-1.5.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-python/requests-2.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlalchemy-1.3.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DESCRIPTION=Update and verify unofficial Clam Anti-Virus signatures
+EAPI=7
+HOMEPAGE=https://github.com/rseichter/fangfrisch https://pypi.org/project/fangfrisch/
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-python/requests-2.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlalchemy-1.3.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/rseichter/fangfrisch/archive/1.5.0.tar.gz -> fangfrisch-1.5.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3f0bb38c1fcb693466c8aa66f1228671
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index cb42f822b0b8..40874da9b9c5 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/arj-3.10.22-r7 b/metadata/md5-cache/app-arch/arj-3.10.22-r7
index 077978bc3137..1bca55189c8c 100644
--- a/metadata/md5-cache/app-arch/arj-3.10.22-r7
+++ b/metadata/md5-cache/app-arch/arj-3.10.22-r7
@@ -3,9 +3,9 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
 DESCRIPTION=Utility for opening arj archives
 EAPI=6
 HOMEPAGE=http://arj.sourceforge.net/
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/arj/arj_3.10.22.orig.tar.gz mirror://debian/pool/main/a/arj/arj_3.10.22-15.debian.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=85e01ce4ea021bbbb4edf92ba0b9abd8
+_md5_=f9e45909d1266035ada531c640fda173
diff --git a/metadata/md5-cache/app-arch/gzip-1.11 b/metadata/md5-cache/app-arch/gzip-1.11
index 417beb8de70d..f8c2d2f463bc 100644
--- a/metadata/md5-cache/app-arch/gzip-1.11
+++ b/metadata/md5-cache/app-arch/gzip-1.11
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install
+DEFINED_PHASES=configure install prepare
 DESCRIPTION=Standard GNU compressor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gzip/
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gzip/gzip-1.11.tar.xz https://alpha.gnu.org/gnu/gzip/gzip-1.11.tar.xz mirror://gentoo/gzip-1.11.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f73286d6070a3a3d7a8f629e9edda7af
+_md5_=503adfdc8534674266db5b8aad6cf99f
diff --git a/metadata/md5-cache/app-arch/rpm-4.17.0 b/metadata/md5-cache/app-arch/rpm-4.17.0
new file mode 100644
index 000000000000..352e1383e5a0
--- /dev/null
+++ b/metadata/md5-cache/app-arch/rpm-4.17.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) virtual/pkgconfig test? ( sys-apps/fakechroot ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=!app-arch/rpm5 app-arch/libarchive:= >=app-arch/bzip2-1.0.1 app-arch/xz-utils >=app-crypt/gnupg-1.2 >=dev-lang/perl-5.8.8 dev-libs/elfutils dev-libs/libgcrypt:= >=dev-libs/popt-1.7 sys-apps/file >=sys-libs/zlib-1.2.3-r1 virtual/libintl lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dbus? ( sys-apps/dbus ) sqlite? ( dev-db/sqlite:3 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) nls? ( virtual/libintl ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd:= ) dev-lang/perl
+DESCRIPTION=Red Hat Package Management Utils
+EAPI=7
+HOMEPAGE=https://rpm.org https://github.com/rpm-software-management/rpm
+IUSE=acl caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2 LGPL-2
+RDEPEND=!app-arch/rpm5 app-arch/libarchive:= >=app-arch/bzip2-1.0.1 app-arch/xz-utils >=app-crypt/gnupg-1.2 >=dev-lang/perl-5.8.8 dev-libs/elfutils dev-libs/libgcrypt:= >=dev-libs/popt-1.7 sys-apps/file >=sys-libs/zlib-1.2.3-r1 virtual/libintl lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dbus? ( sys-apps/dbus ) sqlite? ( dev-db/sqlite:3 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) nls? ( virtual/libintl ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd:= ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
+REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://ftp.osuosl.org/pub/rpm/releases/rpm-4.17.x/rpm-4.17.0.tar.bz2 http://ftp.rpm.org/releases/rpm-4.17.x/rpm-4.17.0.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6d0db03a4ec1bc4dc834b2430a62022a
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.9 b/metadata/md5-cache/app-arch/snappy-1.1.9
index 98cb1fea19d7..d96fc0c88185 100644
--- a/metadata/md5-cache/app-arch/snappy-1.1.9
+++ b/metadata/md5-cache/app-arch/snappy-1.1.9
@@ -5,10 +5,10 @@ DESCRIPTION=A high-speed compression/decompression library by Google
 EAPI=7
 HOMEPAGE=https://github.com/google/snappy
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/snappy/archive/1.1.9.tar.gz -> snappy-1.1.9.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=539662dd078883772f4f44fcc007af47
+_md5_=c8c968bbe669273e63193b56e681237b
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 42bbb5cb7ab1..78c2627d8e13 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.17-r1 b/metadata/md5-cache/app-backup/borgbackup-1.1.17-r1
index 95f60489360c..2d9c555505b3 100644
--- a/metadata/md5-cache/app-backup/borgbackup-1.1.17-r1
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.17-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Deduplicating backup program with compression and authenticated encr
 EAPI=7
 HOMEPAGE=https://borgbackup.readthedocs.io/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.17.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=55c68abe0bad4dbe91905ace1c3c740a
+_md5_=63fb53eaa2d143832b2b9b0009e1d3d3
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.5.15 b/metadata/md5-cache/app-backup/borgmatic-1.5.15
deleted file mode 100644
index 1d46bb91b966..000000000000
--- a/metadata/md5-cache/app-backup/borgmatic-1.5.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-backup/borgbackup python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DESCRIPTION=Automatically create, prune and verify backups with borgbackup
-EAPI=7
-HOMEPAGE=https://torsion.org/borgmatic/
-IUSE=test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~riscv
-LICENSE=GPL-3
-RDEPEND=app-backup/borgbackup python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] >=dev-python/pykwalify-1.6.0[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.5.15.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6a309074f4af1392bdc2600073342731
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.5.18 b/metadata/md5-cache/app-backup/borgmatic-1.5.18
index f0daf14f7ab8..5c91275d7d22 100644
--- a/metadata/md5-cache/app-backup/borgmatic-1.5.18
+++ b/metadata/md5-cache/app-backup/borgmatic-1.5.18
@@ -4,7 +4,7 @@ DESCRIPTION=Automatically create, prune and verify backups with borgbackup
 EAPI=8
 HOMEPAGE=https://torsion.org/borgmatic/
 IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~riscv
+KEYWORDS=amd64 ~arm ~arm64 ~riscv
 LICENSE=GPL-3
 RDEPEND=app-backup/borgbackup python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/colorama[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.5.18.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=be381851d29f9debba1f18c01d79f996
+_md5_=45617158d7b8ca8b343045f414674978
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.5.20 b/metadata/md5-cache/app-backup/borgmatic-1.5.20
new file mode 100644
index 000000000000..07542b68215d
--- /dev/null
+++ b/metadata/md5-cache/app-backup/borgmatic-1.5.20
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_single_target_python3_8? ( >=dev-python/flexmock-0.10.10[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/flexmock-0.10.10[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/flexmock-0.10.10[python_targets_python3_10(-)] ) ) test? ( app-backup/borgbackup python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/colorama[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-4.5.0[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DESCRIPTION=Automatically create, prune and verify backups with borgbackup
+EAPI=8
+HOMEPAGE=https://torsion.org/borgmatic/
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv
+LICENSE=GPL-3
+RDEPEND=app-backup/borgbackup python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/colorama[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.5.20.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=24962167afe32e4d078b47d88b8f8c10
diff --git a/metadata/md5-cache/app-backup/btrbk-0.29.1 b/metadata/md5-cache/app-backup/btrbk-0.29.1
deleted file mode 100644
index c815446a796b..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.29.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+mbuffer +doc
-KEYWORDS=amd64 arm ~arm64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.29.1.tar.xz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=951d0ff5b2d3a8cbf14f6fa828a48610
diff --git a/metadata/md5-cache/app-backup/snapper-0.9.0-r1 b/metadata/md5-cache/app-backup/snapper-0.9.0-r1
index ccdf328478cc..ef693a19fb03 100644
--- a/metadata/md5-cache/app-backup/snapper-0.9.0-r1
+++ b/metadata/md5-cache/app-backup/snapper-0.9.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Command-line program for btrfs and lvm snapshot management
 EAPI=7
 HOMEPAGE=http://snapper.io/
 IUSE=doc lvm pam test systemd xattr
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openSUSE/snapper/archive/v0.9.0.tar.gz -> snapper-0.9.0.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=07d28f347a2d4372a2ada5bc680af176
+_md5_=8a0ecace306d41ae423a32afcc64655a
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index ec92c4c0f5d6..8ed763995924 100644
--- a/metadata/md5-cache/app-benchmarks/Manifest.gz
+++ b/metadata/md5-cache/app-benchmarks/Manifest.gz
diff --git a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8-r1 b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8-r1
index f7c508f0b487..f877b913d01f 100644
--- a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8-r1
+++ b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.8-r1
@@ -10,5 +10,5 @@ RDEPEND=!app-benchmarks/bootchart sys-apps/lsb-release
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mmeeks/bootchart/archive/0.14.8.tar.gz -> bootchart2-0.14.8.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b701d8412b8ce30b2402000839ddacbc
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.13.04 b/metadata/md5-cache/app-benchmarks/stress-ng-0.13.04
deleted file mode 100644
index 75e38a23643c..000000000000
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.13.04
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile postinst
-DEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:=
-DESCRIPTION=Stress test for a computer system with various selectable ways
-EAPI=7
-HOMEPAGE=https://kernel.ubuntu.com/~cking/stress-ng/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:=
-SLOT=0
-SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.13.04.tar.xz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=03c63513d7627dd1a0058eace7b13794
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.13.05 b/metadata/md5-cache/app-benchmarks/stress-ng-0.13.05
new file mode 100644
index 000000000000..c30cc92178ad
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.13.05
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile postinst
+DEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:=
+DESCRIPTION=Stress test for a computer system with various selectable ways
+EAPI=7
+HOMEPAGE=https://kernel.ubuntu.com/~cking/stress-ng/
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:=
+SLOT=0
+SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.13.05.tar.xz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=08868342c7df4ff10de3c24d3bbf624d
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 3d10e20dc9d9..0d3307e0705b 100644
--- a/metadata/md5-cache/app-cdr/Manifest.gz
+++ b/metadata/md5-cache/app-cdr/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/cuetools-1.4.1 b/metadata/md5-cache/app-cdr/cuetools-1.4.1
deleted file mode 100644
index 2e195ecda141..000000000000
--- a/metadata/md5-cache/app-cdr/cuetools-1.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Utilities to manipulate and convert cue and toc files
-EAPI=5
-HOMEPAGE=https://github.com/svend/cuetools
-IUSE=flac mp3 vorbis
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=flac? ( media-libs/flac ) mp3? ( media-sound/mp3info ) vorbis? ( media-sound/vorbis-tools )
-SLOT=0
-SRC_URI=https://github.com/svend/cuetools/archive/1.4.1.tar.gz -> cuetools-1.4.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bffa6513f64df8eb8f594d4c1000d828
diff --git a/metadata/md5-cache/app-cdr/cuetools-1.4.1-r1 b/metadata/md5-cache/app-cdr/cuetools-1.4.1-r1
new file mode 100644
index 000000000000..e3f6894d3334
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/cuetools-1.4.1-r1
@@ -0,0 +1,11 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=Utilities to manipulate and convert cue and toc files
+EAPI=8
+HOMEPAGE=https://github.com/svend/cuetools
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/svend/cuetools/archive/1.4.1.tar.gz -> cuetools-1.4.1.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2048601a0d90e8416daad4088625d33e
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 4681fa0639df..f72b10609393 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/acme-1.19.0 b/metadata/md5-cache/app-crypt/acme-1.19.0
index 914dc40f5788..d89db33fa312 100644
--- a/metadata/md5-cache/app-crypt/acme-1.19.0
+++ b/metadata/md5-cache/app-crypt/acme-1.19.0
@@ -4,7 +4,7 @@ DESCRIPTION=An implementation of the ACME protocol
 EAPI=8
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.19.0.tar.gz -> certbot-1.19.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cf9d2a566f709ba094112a6542f09f7d
+_md5_=fc804ae25d8d40125e3f9166168845c1
diff --git a/metadata/md5-cache/app-crypt/acme-1.20.0 b/metadata/md5-cache/app-crypt/acme-1.20.0
new file mode 100644
index 000000000000..4d755e283402
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-1.20.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An implementation of the ACME protocol
+EAPI=8
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.20.0.tar.gz -> certbot-1.20.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4778cd222591b3f8609e67371661ac26
diff --git a/metadata/md5-cache/app-crypt/acme-9999 b/metadata/md5-cache/app-crypt/acme-9999
index 46d080211c97..71f4e9e99da9 100644
--- a/metadata/md5-cache/app-crypt/acme-9999
+++ b/metadata/md5-cache/app-crypt/acme-9999
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=An implementation of the ACME protocol
 EAPI=8
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cf9d2a566f709ba094112a6542f09f7d
+_md5_=4778cd222591b3f8609e67371661ac26
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.33 b/metadata/md5-cache/app-crypt/ccid-1.4.33
deleted file mode 100644
index da03b00e5e9f..000000000000
--- a/metadata/md5-cache/app-crypt/ccid-1.4.33
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=kernel_linux? ( virtual/pkgconfig ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install
-DEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
-DESCRIPTION=CCID free software driver
-EAPI=7
-HOMEPAGE=https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID
-IUSE=twinserial kobil-midentity +usb
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
-SLOT=0
-SRC_URI=https://ccid.apdu.fr/files/ccid-1.4.33.tar.bz2
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=51e0fd5c568689832a04662580059708
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.34 b/metadata/md5-cache/app-crypt/ccid-1.4.34
deleted file mode 100644
index 494443525cf9..000000000000
--- a/metadata/md5-cache/app-crypt/ccid-1.4.34
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=kernel_linux? ( virtual/pkgconfig ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install
-DEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
-DESCRIPTION=CCID free software driver
-EAPI=7
-HOMEPAGE=https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID
-IUSE=twinserial kobil-midentity +usb
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
-SLOT=0
-SRC_URI=https://ccid.apdu.fr/files/ccid-1.4.34.tar.bz2
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=41afffaff522d4ac3726ee41b09f3315
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.35 b/metadata/md5-cache/app-crypt/ccid-1.4.35
index 88109b9fc28b..e3b4cfaf476f 100644
--- a/metadata/md5-cache/app-crypt/ccid-1.4.35
+++ b/metadata/md5-cache/app-crypt/ccid-1.4.35
@@ -5,10 +5,10 @@ DESCRIPTION=CCID free software driver
 EAPI=7
 HOMEPAGE=https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID
 IUSE=twinserial kobil-midentity +usb
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
 SLOT=0
 SRC_URI=https://ccid.apdu.fr/files/ccid-1.4.35.tar.bz2
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=f69db83b4a7840172b2609e0b0da9463
+_md5_=74a82ca3b3659625f1accbd132453bba
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.36 b/metadata/md5-cache/app-crypt/ccid-1.4.36
new file mode 100644
index 000000000000..1b6af31e79b0
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/ccid-1.4.36
@@ -0,0 +1,14 @@
+BDEPEND=kernel_linux? ( virtual/pkgconfig ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install
+DEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
+DESCRIPTION=CCID free software driver
+EAPI=8
+HOMEPAGE=https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID
+IUSE=twinserial kobil-midentity +usb
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
+SLOT=0
+SRC_URI=https://ccid.apdu.fr/files/ccid-1.4.36.tar.bz2
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=91dbe866b4c5d55dbd2d0f2cb5ab3557
diff --git a/metadata/md5-cache/app-crypt/certbot-1.19.0 b/metadata/md5-cache/app-crypt/certbot-1.19.0
index e7976d69544a..1dc164d8fecd 100644
--- a/metadata/md5-cache/app-crypt/certbot-1.19.0
+++ b/metadata/md5-cache/app-crypt/certbot-1.19.0
@@ -4,7 +4,7 @@ DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-crypt/acme-1.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configargparse-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distro-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.19.0.tar.gz -> certbot-1.19.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e2fc4560c597400ec0b22e3e96833593
+_md5_=dd0d1e755b0eef9146e1f07b7ce5ac8c
diff --git a/metadata/md5-cache/app-crypt/certbot-1.20.0 b/metadata/md5-cache/app-crypt/certbot-1.20.0
new file mode 100644
index 000000000000..75c9ca2d1f54
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-1.20.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=app-crypt/acme-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configargparse-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distro-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configargparse-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distro-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.20.0.tar.gz -> certbot-1.20.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5d28959020bc76de5a3d857fcd985187
diff --git a/metadata/md5-cache/app-crypt/certbot-9999 b/metadata/md5-cache/app-crypt/certbot-9999
index 9fdafce28c3f..b25973744e8a 100644
--- a/metadata/md5-cache/app-crypt/certbot-9999
+++ b/metadata/md5-cache/app-crypt/certbot-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=app-crypt/acme-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configargparse-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distro-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( >=app-crypt/acme-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configargparse-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distro-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
 EAPI=7
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=>=app-crypt/acme-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configargparse-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distro-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+RDEPEND=>=app-crypt/acme-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configargparse-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configobj-5.0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distro-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/josepy-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parsedatetime-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e2fc4560c597400ec0b22e3e96833593
+_md5_=5d28959020bc76de5a3d857fcd985187
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.19.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.19.0
index d9cdd097dbe6..1bc2bdbcd278 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.19.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.19.0
@@ -4,7 +4,7 @@ DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-crypt/acme-1.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-crypt/certbot-1.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-augeas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.19.0.tar.gz -> certbot-1.19.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2937a2f0a1a646baa44adc99ed8f7ae9
+_md5_=1f75df8fc983b59753ed6d1fdd8030b6
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.20.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.20.0
new file mode 100644
index 000000000000..410d0ce52f1a
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.20.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=app-crypt/acme-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-crypt/certbot-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-augeas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-crypt/certbot-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-augeas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.20.0.tar.gz -> certbot-1.20.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2937a2f0a1a646baa44adc99ed8f7ae9
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.19.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.19.0
index 8cb35d27286b..d7d5a544e27b 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.19.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.19.0
@@ -4,7 +4,7 @@ DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-crypt/acme-1.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-crypt/certbot-1.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.19.0.tar.gz -> certbot-1.19.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=56f218daad0a9b500bece0425d65b488
+_md5_=c7181e0a6a0d85a66932bcbe7c8dd5a1
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.20.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.20.0
new file mode 100644
index 000000000000..84487f861b35
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.20.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=app-crypt/acme-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-crypt/certbot-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-crypt/certbot-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.20.0.tar.gz -> certbot-1.20.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=56f218daad0a9b500bece0425d65b488
diff --git a/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r101 b/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r101
index 8b10522c6c5a..fe973881ced1 100644
--- a/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r101
+++ b/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r101
@@ -11,5 +11,5 @@ RDEPEND=!minimal? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_ta
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) minimal? ( !munin )
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_1.1.5.orig.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=c1f03917b7fbb1ba160d981b510416df
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.32 b/metadata/md5-cache/app-crypt/gnupg-2.2.32
index 70f4cb167889..b19b0dbf33b3 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.32
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.32
@@ -5,10 +5,10 @@ DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
 EAPI=7
 HOMEPAGE=https://gnupg.org/
 IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=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 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.32.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=36a95dbe6d60c386649ce17221558bd6
+_md5_=5fe61c079dd646b214b1862334950dd7
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.3.3 b/metadata/md5-cache/app-crypt/gnupg-2.3.3
new file mode 100644
index 000000000000..eb8d2b4efbac
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/gnupg-2.3.3
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+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 ) ) tofu? ( >=dev-db/sqlite-3.27 ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib
+DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
+EAPI=7
+HOMEPAGE=https://gnupg.org/
+IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tools usb user-socket wks-server
+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
+LICENSE=GPL-3
+RDEPEND=>=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 ) ) tofu? ( >=dev-db/sqlite-3.27 ) ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
+REQUIRED_USE=test? ( tofu )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnupg/gnupg/gnupg-2.3.3.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=523a79a51c460d5421adf6e8d087269a
diff --git a/metadata/md5-cache/app-crypt/jitterentropy-rngd-1.2.5 b/metadata/md5-cache/app-crypt/jitterentropy-rngd-1.2.5
index 04572d6b8d93..d0981b09467b 100644
--- a/metadata/md5-cache/app-crypt/jitterentropy-rngd-1.2.5
+++ b/metadata/md5-cache/app-crypt/jitterentropy-rngd-1.2.5
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~mips ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/smuellerDD/jitterentropy-rngd/archive/v1.2.5.tar.gz -> jitterentropy-rngd-1.2.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e1f5adb21a2baf4f4c5947b2ac4b7c4
diff --git a/metadata/md5-cache/app-crypt/libu2f-host-1.1.10 b/metadata/md5-cache/app-crypt/libu2f-host-1.1.10
index 52e87d3d3e03..b68a808a8f0b 100644
--- a/metadata/md5-cache/app-crypt/libu2f-host-1.1.10
+++ b/metadata/md5-cache/app-crypt/libu2f-host-1.1.10
@@ -10,5 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/hidapi dev-libs/json-c:= !systemd? ( acct-group/plugdev ) systemd? ( sys-apps/systemd[acl] )
 SLOT=0
 SRC_URI=https://developers.yubico.com/libu2f-host/Releases/libu2f-host-1.1.10.tar.xz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=cedb31b80b6c05f5d97b1d779d10a2a7
diff --git a/metadata/md5-cache/app-crypt/minisign-0.10 b/metadata/md5-cache/app-crypt/minisign-0.10
new file mode 100644
index 000000000000..834243c0b9ce
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/minisign-0.10
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libsodium:=[-minimal]
+DESCRIPTION=Dead simple tool to sign files and verify signatures
+EAPI=8
+HOMEPAGE=https://github.com/jedisct1/minisign
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=ISC
+RDEPEND=dev-libs/libsodium:=[-minimal]
+SLOT=0
+SRC_URI=https://github.com/jedisct1/minisign/archive/0.10.tar.gz -> minisign-0.10.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=38e3f7d7ca3cce89cd93011457a71b59
diff --git a/metadata/md5-cache/app-crypt/minisign-9999 b/metadata/md5-cache/app-crypt/minisign-9999
index 14b1e5080ba3..331921b9c339 100644
--- a/metadata/md5-cache/app-crypt/minisign-9999
+++ b/metadata/md5-cache/app-crypt/minisign-9999
@@ -1,12 +1,12 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libsodium-1.0.16:=[-minimal]
+DEPEND=dev-libs/libsodium:=[-minimal]
 DESCRIPTION=Dead simple tool to sign files and verify signatures
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/jedisct1/minisign
 LICENSE=ISC
 PROPERTIES=live
-RDEPEND=>=dev-libs/libsodium-1.0.16:=[-minimal]
+RDEPEND=dev-libs/libsodium:=[-minimal]
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=da7f7ff2f51699927aee9bd87fdc39d9
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=38e3f7d7ca3cce89cd93011457a71b59
diff --git a/metadata/md5-cache/app-crypt/pinentry-1.2.0 b/metadata/md5-cache/app-crypt/pinentry-1.2.0
index 6560e5e584aa..f2f599fc749f 100644
--- a/metadata/md5-cache/app-crypt/pinentry-1.2.0
+++ b/metadata/md5-cache/app-crypt/pinentry-1.2.0
@@ -5,10 +5,10 @@ DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol
 EAPI=7
 HOMEPAGE=https://gnupg.org/aegypten2
 IUSE=caps efl emacs gnome-keyring gtk ncurses qt5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-pinentry-0.7.2 >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) efl? ( dev-libs/efl[X] ) gnome-keyring? ( app-crypt/libsecret ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) gtk? ( app-crypt/gcr[gtk] )
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-1.2.0.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f7c15c141a5ac419eaf8d7289471e883
+_md5_=3b46a863c1f7b08a26f3328919460a3b
diff --git a/metadata/md5-cache/app-crypt/qca-2.3.4 b/metadata/md5-cache/app-crypt/qca-2.3.4
index 326443081df0..96850b37dd44 100644
--- a/metadata/md5-cache/app-crypt/qca-2.3.4
+++ b/metadata/md5-cache/app-crypt/qca-2.3.4
@@ -5,11 +5,11 @@ DESCRIPTION=Qt Cryptographic Architecture (QCA)
 EAPI=8
 HOMEPAGE=https://userbase.kde.org/QCA
 IUSE=botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtcore-5.14:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) pkcs11? ( >=dev-libs/openssl-1.1 dev-libs/pkcs11-helper ) sasl? ( dev-libs/cyrus-sasl:2 ) ssl? ( >=dev-libs/openssl-1.1:= )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://kde/stable/qca/2.3.4/qca-2.3.4.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=72502927bb3273fff15e2ed98ee85c76
+_md5_=38183b06ac2ad8f448b9fd4b04931d63
diff --git a/metadata/md5-cache/app-crypt/rhash-1.4.1 b/metadata/md5-cache/app-crypt/rhash-1.4.1
deleted file mode 100644
index 63d51278cdd7..000000000000
--- a/metadata/md5-cache/app-crypt/rhash-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ssl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Console utility and library for computing and verifying file hash sums
-EAPI=7
-HOMEPAGE=http://rhash.sourceforge.net/
-IUSE=debug nls ssl static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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
-LICENSE=MIT
-RDEPEND=ssl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=mirror://sourceforge/rhash/rhash-1.4.1-src.tar.gz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8c22eef206be87d87c347bf7ffeecfe8
diff --git a/metadata/md5-cache/app-crypt/rhash-1.4.2 b/metadata/md5-cache/app-crypt/rhash-1.4.2
index 8ded2bcf7cc8..78d001da7a67 100644
--- a/metadata/md5-cache/app-crypt/rhash-1.4.2
+++ b/metadata/md5-cache/app-crypt/rhash-1.4.2
@@ -11,4 +11,4 @@ RDEPEND=ssl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 SLOT=0
 SRC_URI=mirror://sourceforge/rhash/rhash-1.4.2-src.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=df627e8ab4480489c1b62acc5873d617
+_md5_=c52f77aca3eea48d288df30da5505cdd
diff --git a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r3 b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r3
index 92ebb3cd4118..3754a732e62e 100644
--- a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r3
+++ b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/tpm acct-user/tpm dev-libs/gmp:= modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://github.com/PeterHuewe/tpm-emulator/archive/v0.7.5.tar.gz -> tpm-emulator-0.7.5.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0d5c45b47554a87aea509b8b54475e01
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-2.4.5 b/metadata/md5-cache/app-crypt/tpm2-tss-2.4.5
index 87c564e0d0d3..230edfea2412 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tss-2.4.5
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-2.4.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( gcrypt openssl ) fapi? ( openssl !gcrypt )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/2.4.5/tpm2-tss-2.4.5.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=8cf7f015b1c99b8842bcde4153242fbb
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-2.4.6 b/metadata/md5-cache/app-crypt/tpm2-tss-2.4.6
index 0603190a55b7..7482f31bc3a4 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tss-2.4.6
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-2.4.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( gcrypt openssl ) fapi? ( openssl !gcrypt )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/2.4.6/tpm2-tss-2.4.6.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=8cf7f015b1c99b8842bcde4153242fbb
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-3.1.0 b/metadata/md5-cache/app-crypt/tpm2-tss-3.1.0
index b150b62381a2..93b0b84383ac 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tss-3.1.0
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-3.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( mbedtls openssl ) fapi? ( openssl !mbedtls )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/3.1.0/tpm2-tss-3.1.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=8acceef58e9e4cf62864b7739439b269
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.14-r3 b/metadata/md5-cache/app-crypt/trousers-0.3.14-r3
index c60c883e317f..8af0bc6de759 100644
--- a/metadata/md5-cache/app-crypt/trousers-0.3.14-r3
+++ b/metadata/md5-cache/app-crypt/trousers-0.3.14-r3
@@ -10,5 +10,5 @@ LICENSE=CPL-1.0 GPL-2
 RDEPEND=acct-group/tss acct-user/tss >=dev-libs/glib-2 >=dev-libs/openssl-0.9.7:0= selinux? ( sec-policy/selinux-tcsd )
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/trousers/trousers-0.3.14.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=364e6d51bc7a57c2406bfabc308c7527
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.15 b/metadata/md5-cache/app-crypt/trousers-0.3.15
index 5e5bb005259a..86eaa16e0054 100644
--- a/metadata/md5-cache/app-crypt/trousers-0.3.15
+++ b/metadata/md5-cache/app-crypt/trousers-0.3.15
@@ -10,5 +10,5 @@ LICENSE=CPL-1.0 GPL-2
 RDEPEND=acct-group/tss acct-user/tss >=dev-libs/glib-2 >=dev-libs/openssl-0.9.7:0= selinux? ( sec-policy/selinux-tcsd )
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/trousers/trousers-0.3.15.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=c378935374eaeb56d22486f9ceb1bb78
diff --git a/metadata/md5-cache/app-crypt/veracrypt-1.24_p8 b/metadata/md5-cache/app-crypt/veracrypt-1.24_p8
index 3eb8d9deaaca..625218f5c6d9 100644
--- a/metadata/md5-cache/app-crypt/veracrypt-1.24_p8
+++ b/metadata/md5-cache/app-crypt/veracrypt-1.24_p8
@@ -11,5 +11,5 @@ RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0-gtk3[X?] app-admin/sudo dev
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.24-Update8_MacOSX.tar.gz -> veracrypt-1.24_p8.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
 _md5_=5eea6ae79b48aa1b48f333f6f7fc3f53
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 77b615d08bc7..c8cf36212fcd 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
diff --git a/metadata/md5-cache/app-dicts/wordnet-3.0-r4 b/metadata/md5-cache/app-dicts/wordnet-3.0-r4
deleted file mode 100644
index 5a144f887485..000000000000
--- a/metadata/md5-cache/app-dicts/wordnet-3.0-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-lang/tcl:0= dev-lang/tk:0= sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A lexical database for the English language
-EAPI=5
-HOMEPAGE=https://wordnet.princeton.edu/
-IUSE=doc
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=Princeton
-RDEPEND=dev-lang/tcl:0= dev-lang/tk:0=
-SLOT=0
-SRC_URI=ftp://ftp.cogsci.princeton.edu/pub/wordnet/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ba67c1fe493d9a8c37f2cdf976b88c10
diff --git a/metadata/md5-cache/app-dicts/wordnet-3.0-r5 b/metadata/md5-cache/app-dicts/wordnet-3.0-r5
deleted file mode 100644
index fb4a3a46aef3..000000000000
--- a/metadata/md5-cache/app-dicts/wordnet-3.0-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-lang/tcl:0= dev-lang/tk:0= sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A lexical database for the English language
-EAPI=6
-HOMEPAGE=https://wordnet.princeton.edu/
-IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=Princeton
-RDEPEND=dev-lang/tcl:0= dev-lang/tk:0=
-SLOT=0
-SRC_URI=http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3fe69a24da9e10e5d1c72eb3e99b84fd
diff --git a/metadata/md5-cache/app-dicts/wordnet-3.1 b/metadata/md5-cache/app-dicts/wordnet-3.1
deleted file mode 100644
index df646a72aed1..000000000000
--- a/metadata/md5-cache/app-dicts/wordnet-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=dev-lang/tcl:0= dev-lang/tk:0= sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A lexical database for the English language
-EAPI=6
-HOMEPAGE=https://wordnet.princeton.edu/
-IUSE=doc
-KEYWORDS=amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=Princeton
-RDEPEND=dev-lang/tcl:0= dev-lang/tk:0=
-SLOT=0
-SRC_URI=http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2 http://wordnetcode.princeton.edu/wn3.1.dict.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=32c503a1c08c2be8f39b60b1c7ddc9ee
diff --git a/metadata/md5-cache/app-dicts/wordnet-3.1-r1 b/metadata/md5-cache/app-dicts/wordnet-3.1-r1
new file mode 100644
index 000000000000..de216c5fc26f
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/wordnet-3.1-r1
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-lang/tcl:0= dev-lang/tk:0=
+DESCRIPTION=A lexical database for the English language
+EAPI=8
+HOMEPAGE=https://wordnet.princeton.edu/
+KEYWORDS=~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=Princeton
+RDEPEND=dev-lang/tcl:0= dev-lang/tk:0=
+SLOT=0
+SRC_URI=http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz http://wordnetcode.princeton.edu/wn3.1.dict.tar.gz https://dev.gentoo.org/~soap/distfiles/wordnet-3.0-patchset-2.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6e7bd4b528b0e64a4e63548f0f4c3953
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 016b7d35ef0f..a4eb772e589c 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/devmanual-9999 b/metadata/md5-cache/app-doc/devmanual-9999
index c7532ecff92d..075d16585913 100644
--- a/metadata/md5-cache/app-doc/devmanual-9999
+++ b/metadata/md5-cache/app-doc/devmanual-9999
@@ -1,11 +1,12 @@
-BDEPEND=dev-libs/libxml2 dev-libs/libxslt gnome-base/librsvg media-fonts/open-sans || ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-libs/libxml2 dev-libs/libxslt gnome-base/librsvg media-fonts/open-sans || ( dev-lang/python:3.9 dev-lang/python:3.8 ) test? ( >=app-text/htmltidy-5.8.0 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst setup unpack
 DESCRIPTION=The Gentoo Development Guide
-EAPI=7
+EAPI=8
 HOMEPAGE=https://devmanual.gentoo.org/
-IUSE=+offline
+IUSE=+offline test
 LICENSE=CC-BY-SA-4.0
 PROPERTIES=live
+RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3dea8ee4ac06d1c155e237c0e4cc0745
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0deb1e5cfde2a0c2482702947869202b
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index fa52c5d976b9..21eb01e76997 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/diakonos-0.9.4 b/metadata/md5-cache/app-editors/diakonos-0.9.4
deleted file mode 100644
index 9db377a38762..000000000000
--- a/metadata/md5-cache/app-editors/diakonos-0.9.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/curses[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/bacon[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DESCRIPTION=A Linux editor for the masses
-EAPI=5
-HOMEPAGE=http://diakonos.pist0s.ca
-IUSE=doc test test ruby_targets_ruby26
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-ruby/curses[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://diakonos.pist0s.ca/archives/diakonos-0.9.4.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f45beb9be7a40380eb406afe664f0d52
diff --git a/metadata/md5-cache/app-editors/fe-2.0 b/metadata/md5-cache/app-editors/fe-2.0
deleted file mode 100644
index b2e6d3d03f74..000000000000
--- a/metadata/md5-cache/app-editors/fe-2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install
-DEPEND=sys-libs/ncurses:0= sendmail? ( virtual/mta )
-DESCRIPTION=A small and easy to use folding editor
-EAPI=7
-HOMEPAGE=http://www.moria.de/~michael/fe/
-IUSE=sendmail
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= sendmail? ( virtual/mta )
-SLOT=0
-SRC_URI=http://www.moria.de/~michael/fe/fe-2.0.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e821261e3a9575ef087bfe12c6734605
diff --git a/metadata/md5-cache/app-editors/fe-2.0-r1 b/metadata/md5-cache/app-editors/fe-2.0-r1
new file mode 100644
index 000000000000..ecff20ddaf16
--- /dev/null
+++ b/metadata/md5-cache/app-editors/fe-2.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/ncurses:0= sendmail? ( virtual/mta )
+DESCRIPTION=A small and easy to use folding editor
+EAPI=8
+HOMEPAGE=http://www.moria.de/~michael/fe/
+IUSE=sendmail
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=sys-libs/ncurses:0= sendmail? ( virtual/mta )
+SLOT=0
+SRC_URI=http://www.moria.de/~michael/fe/fe-2.0.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=276f7ff0e0fb076047af4319a8fde0cc
diff --git a/metadata/md5-cache/app-editors/gedit-40.1 b/metadata/md5-cache/app-editors/gedit-40.1
index cdbc36419591..4cd34a23a9fa 100644
--- a/metadata/md5-cache/app-editors/gedit-40.1
+++ b/metadata/md5-cache/app-editors/gedit-40.1
@@ -1,15 +1,15 @@
 BDEPEND=|| ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) app-text/docbook-xml-dtd:4.1.2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1 ) dev-util/itstool >=sys-devel/gettext-0.18 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.64:2 >=dev-libs/libpeas-1.14.1[gtk] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.22.0:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] gui-libs/tepl:6 spell? ( >=app-text/gspell-0.2.5:0= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.64:2 >=dev-libs/libpeas-1.14.1[gtk] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.22.0:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] gui-libs/tepl:6 spell? ( >=app-text/gspell-0.2.5:0= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A text editor for the GNOME desktop
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Gedit
-IUSE=+python gtk-doc spell python_single_target_python3_8 python_single_target_python3_9
+IUSE=+python gtk-doc spell python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.64:2 >=dev-libs/libpeas-1.14.1[gtk] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.22.0:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] gui-libs/tepl:6 spell? ( >=app-text/gspell-0.2.5:0= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ) x11-themes/adwaita-icon-theme gnome-base/gsettings-desktop-schemas gnome-base/gvfs
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RDEPEND=>=dev-libs/glib-2.64:2 >=dev-libs/libpeas-1.14.1[gtk] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.22.0:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] gui-libs/tepl:6 spell? ( >=app-text/gspell-0.2.5:0= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ) x11-themes/adwaita-icon-theme gnome-base/gsettings-desktop-schemas gnome-base/gvfs
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gedit/40/gedit-40.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=19da42bf6ee0b60bf009c83e79d45bd8
+_md5_=cf7037f5661c19bb7f1dc40889bf25a5
diff --git a/metadata/md5-cache/app-editors/gedit-plugins-40.1 b/metadata/md5-cache/app-editors/gedit-plugins-40.1
index f5f8b4cd0679..85258627cf0b 100644
--- a/metadata/md5-cache/app-editors/gedit-plugins-40.1
+++ b/metadata/md5-cache/app-editors/gedit-plugins-40.1
@@ -1,15 +1,15 @@
 BDEPEND=dev-libs/libxml2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) ) app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/libpeas-1.14.1[gtk] >=app-editors/gedit-40.0 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-4.0.2:4 python? ( python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( app-editors/gedit[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-python/dbus-python-0.82[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-editors/gedit[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-python/dbus-python-0.82[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6[python] ) terminal? ( >=x11-libs/vte-0.52:2.91[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/libpeas-1.14.1[gtk] >=app-editors/gedit-40.0 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-4.0.2:4 python? ( python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[xml] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( app-editors/gedit[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] >=dev-python/dbus-python-0.82[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-editors/gedit[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] >=dev-python/dbus-python-0.82[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-editors/gedit[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] >=dev-python/dbus-python-0.82[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6[python] ) terminal? ( >=x11-libs/vte-0.52:2.91[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Collection of extra plugins for the gedit Text Editor
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Gedit/ShippedPlugins
-IUSE=charmap git +python terminal vala python_single_target_python3_8 python_single_target_python3_9
+IUSE=charmap git +python terminal vala python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/libpeas-1.14.1[gtk] >=app-editors/gedit-40.0 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-4.0.2:4 python? ( python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( app-editors/gedit[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-python/dbus-python-0.82[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-editors/gedit[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-python/dbus-python-0.82[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6[python] ) terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
-REQUIRED_USE=charmap? ( python ) git? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) terminal? ( python )
+RDEPEND=>=dev-libs/libpeas-1.14.1[gtk] >=app-editors/gedit-40.0 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-4.0.2:4 python? ( python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[xml] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( app-editors/gedit[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] >=dev-python/dbus-python-0.82[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-editors/gedit[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] >=dev-python/dbus-python-0.82[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-editors/gedit[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/libpeas[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] >=dev-python/dbus-python-0.82[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6[python] ) terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
+REQUIRED_USE=charmap? ( python ) git? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) terminal? ( python )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gedit-plugins/40/gedit-plugins-40.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=327d771e79d5534e73a55b25576df17c
+_md5_=e5e24a31a47a9c437d3d5b711c850d9c
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.3428 b/metadata/md5-cache/app-editors/gvim-8.2.3428
deleted file mode 100644
index ca8d3a941e93..000000000000
--- a/metadata/md5-cache/app-editors/gvim-8.2.3428
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~app-editors/vim-core-8.2.3428 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=GUI version of the Vim text editor
-EAPI=7
-HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=acl aqua cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=vim
-RDEPEND=~app-editors/vim-core-8.2.3428 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/vim/vim/archive/v8.2.3428.tar.gz -> vim-8.2.3428.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	ruby-single	214d0508e74b80c85efcef39699cb9a2	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c5e5aa7356bec11af3a2f1633eebcb7a
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.3428-r1 b/metadata/md5-cache/app-editors/gvim-8.2.3428-r1
new file mode 100644
index 000000000000..b7499d6c1ce2
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gvim-8.2.3428-r1
@@ -0,0 +1,16 @@
+BDEPEND=lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~app-editors/vim-core-8.2.3428 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=GUI version of the Vim text editor
+EAPI=7
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=vim
+RDEPEND=~app-editors/vim-core-8.2.3428 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.2.3428.tar.gz -> vim-8.2.3428.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	ruby-single	214d0508e74b80c85efcef39699cb9a2	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bc479ea390a1960bc9fe8074d724687f
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index 36448311f6a6..27c2c4619855 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -1,15 +1,15 @@
 BDEPEND=lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext )
+DEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext )
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=7
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=acl aqua cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=vim
 PROPERTIES=live
-RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	ruby-single	214d0508e74b80c85efcef39699cb9a2	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=60610e944439e69d74ec5c6a9c03cd53
+_md5_=bc479ea390a1960bc9fe8074d724687f
diff --git a/metadata/md5-cache/app-editors/nano-5.8-r2 b/metadata/md5-cache/app-editors/nano-5.8-r2
index 0cdadb970037..c79b24e77064 100644
--- a/metadata/md5-cache/app-editors/nano-5.8-r2
+++ b/metadata/md5-cache/app-editors/nano-5.8-r2
@@ -5,11 +5,11 @@ DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=7
 HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
 IUSE=debug justify magic minimal ncurses nls +spell +split-usr static unicode
-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
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
 REQUIRED_USE=magic? ( !minimal )
 SLOT=0
 SRC_URI=https://www.nano-editor.org/dist/v5/nano-5.8.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=18509eb63f1b16f9af8afc9161912d72
+_md5_=a863d05a3c5b0dac8fc5ae80be4dd5a6
diff --git a/metadata/md5-cache/app-editors/neovim-0.5.1 b/metadata/md5-cache/app-editors/neovim-0.5.1
index 2fe7730738c3..c77d8c4f8698 100644
--- a/metadata/md5-cache/app-editors/neovim-0.5.1
+++ b/metadata/md5-cache/app-editors/neovim-0.5.1
@@ -5,11 +5,11 @@ DESCRIPTION=Vim-fork focused on extensibility and agility.
 EAPI=7
 HOMEPAGE=https://neovim.io
 IUSE=+lto +nvimpager +tui lua_single_target_luajit lua_single_target_lua5-1
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
 LICENSE=Apache-2.0 vim
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-lua/luv[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= dev-libs/tree-sitter:= tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=https://github.com/neovim/neovim/archive/v0.5.1.tar.gz -> neovim-0.5.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6a8c2b6913b7a875ad2a012911a80ce3
+_md5_=e791e2822598750bb4afec5d13db395e
diff --git a/metadata/md5-cache/app-editors/vim-8.2.3428 b/metadata/md5-cache/app-editors/vim-8.2.3428
deleted file mode 100644
index 795b109b1256..000000000000
--- a/metadata/md5-cache/app-editors/vim-8.2.3428
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.2.3428 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
-DESCRIPTION=Vim, an improved vi-style text editor
-EAPI=7
-HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=X acl cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-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
-LICENSE=vim
-RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.2.3428 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
-SLOT=0
-SRC_URI=https://github.com/vim/vim/archive/v8.2.3428.tar.gz -> vim-8.2.3428.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	ruby-single	214d0508e74b80c85efcef39699cb9a2	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c87c1c7a2e079f189dbf98f0b4caa2df
diff --git a/metadata/md5-cache/app-editors/vim-8.2.3428-r1 b/metadata/md5-cache/app-editors/vim-8.2.3428-r1
new file mode 100644
index 000000000000..810d265f75b6
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vim-8.2.3428-r1
@@ -0,0 +1,15 @@
+BDEPEND=lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.2.3428 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
+DESCRIPTION=Vim, an improved vi-style text editor
+EAPI=7
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+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
+LICENSE=vim
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.2.3428 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.2.3428.tar.gz -> vim-8.2.3428.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	ruby-single	214d0508e74b80c85efcef39699cb9a2	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=303554d0ff43b036b8dee5da78c3cd56
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index 62c6a9813270..d859d5684434 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -1,14 +1,14 @@
 BDEPEND=lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=7
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=X acl cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=vim
 PROPERTIES=live
-RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	ruby-single	214d0508e74b80c85efcef39699cb9a2	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c87c1c7a2e079f189dbf98f0b4caa2df
+_md5_=303554d0ff43b036b8dee5da78c3cd56
diff --git a/metadata/md5-cache/app-editors/xemacs-21.5.34-r7 b/metadata/md5-cache/app-editors/xemacs-21.5.34-r7
new file mode 100644
index 000000000000..24aea8c83c5b
--- /dev/null
+++ b/metadata/md5-cache/app-editors/xemacs-21.5.34-r7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15 virtual/pkgconfig
+DESCRIPTION=highly customizable open source text editor and application development system
+EAPI=8
+HOMEPAGE=http://www.xemacs.org/
+IUSE=alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 -riscv ~sparc ~x86
+LICENSE=GPL-3+
+PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
+RDEPEND=berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0[xft=] ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
+SLOT=0
+SRC_URI=http://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.34.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e569964865bb506c6dbb302d3931206a
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 4fc5dadbee90..8808b320ed22 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/async-1.9.3 b/metadata/md5-cache/app-emacs/async-1.9.3
index 52306f60449c..e3fde85ee5f7 100644
--- a/metadata/md5-cache/app-emacs/async-1.9.3
+++ b/metadata/md5-cache/app-emacs/async-1.9.3
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Simple library for asynchronous processing in Emacs
 EAPI=7
 HOMEPAGE=https://github.com/jwiegley/emacs-async
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/jwiegley/emacs-async/archive/v1.9.3.tar.gz -> emacs-async-1.9.3.tar.gz
 _eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=2ed0daef725b93c434757e0e443f51d2
+_md5_=81b51f3b0a83969bc87a3854638d43c7
diff --git a/metadata/md5-cache/app-emacs/dash-2.18.1 b/metadata/md5-cache/app-emacs/dash-2.18.1
index 402fd2988fd8..57649d050af5 100644
--- a/metadata/md5-cache/app-emacs/dash-2.18.1
+++ b/metadata/md5-cache/app-emacs/dash-2.18.1
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A modern list library for Emacs
 EAPI=7
 HOMEPAGE=https://github.com/magnars/dash.el
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.18.1.tar.gz -> dash-2.18.1.tar.gz
 _eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=f9820a1ed36d0f9ba77c3eb6729cb085
+_md5_=4134404663bef3ce47778ca4e699de9a
diff --git a/metadata/md5-cache/app-emacs/dash-2.19.1 b/metadata/md5-cache/app-emacs/dash-2.19.1
index 5e59bd52badb..7c652beffa11 100644
--- a/metadata/md5-cache/app-emacs/dash-2.19.1
+++ b/metadata/md5-cache/app-emacs/dash-2.19.1
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=A modern list library for Emacs
 EAPI=8
 HOMEPAGE=https://github.com/magnars/dash.el
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.19.1.tar.gz -> dash-2.19.1.tar.gz
 _eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=1739ee2204801795d2803b8cfe844936
+_md5_=91f3b74d25a5bf851d89a45db96bc70b
diff --git a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1 b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1
index b7095ba6f210..907518092141 100644
--- a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1
+++ b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=EditorConfig plugin for emacs
 EAPI=7
 HOMEPAGE=https://github.com/editorconfig/editorconfig-emacs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-emacs/archive/v0.7.8.tar.gz -> editorconfig-emacs-0.7.8.tar.gz
 _eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=ab4acc1125badd8a54276903d4f6b1a4
+_md5_=7e91e8737c51601ca394fbc75ac12fa5
diff --git a/metadata/md5-cache/app-emacs/eglot-1.6 b/metadata/md5-cache/app-emacs/eglot-1.6
new file mode 100644
index 000000000000..fc29ee412802
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/eglot-1.6
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-26.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=A minimal Emacs LSP client
+EAPI=8
+HOMEPAGE=https://github.com/joaotavora/eglot
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=app-editors/emacs-26.1:*
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/joaotavora/eglot/archive/refs/tags/1.6.tar.gz -> eglot-1.6.tar.gz
+_eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_md5_=dcfe421e359dced7c979bc24b4948455
diff --git a/metadata/md5-cache/app-emacs/f-0.20.0 b/metadata/md5-cache/app-emacs/f-0.20.0
index cceef7d77b75..a32b17604bc9 100644
--- a/metadata/md5-cache/app-emacs/f-0.20.0
+++ b/metadata/md5-cache/app-emacs/f-0.20.0
@@ -3,11 +3,11 @@ DEPEND=app-emacs/dash app-emacs/s >=app-editors/emacs-23.1:*
 DESCRIPTION=Modern API for working with files and directories in Emacs
 EAPI=6
 HOMEPAGE=https://github.com/rejeep/f.el
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/dash app-emacs/s >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rejeep/f.el/archive/v0.20.0.tar.gz -> f-0.20.0.tar.gz
 _eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=e9d8d9b47c8b24b034cd3bf476daf766
+_md5_=56e56b62f441b483e0b36a32721dc52e
diff --git a/metadata/md5-cache/app-emacs/helm-3.8.0 b/metadata/md5-cache/app-emacs/helm-3.8.0
index 8648d07a4a45..2f0fef46acce 100644
--- a/metadata/md5-cache/app-emacs/helm-3.8.0
+++ b/metadata/md5-cache/app-emacs/helm-3.8.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs incremental completion and selection narrowing framework
 EAPI=8
 HOMEPAGE=https://emacs-helm.github.io/helm/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/async app-emacs/popup >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm/archive/v3.8.0.tar.gz -> helm-3.8.0.tar.gz
 _eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=38cc7135b6c1facc718d9240d50072e0
+_md5_=72d5b08bd62e60c2d24e35002fa7d5fb
diff --git a/metadata/md5-cache/app-emacs/libegit2-0.0.20200515-r1 b/metadata/md5-cache/app-emacs/libegit2-0.0.20200515-r1
index fe4d30b16fea..946082bcd6cd 100644
--- a/metadata/md5-cache/app-emacs/libegit2-0.0.20200515-r1
+++ b/metadata/md5-cache/app-emacs/libegit2-0.0.20200515-r1
@@ -4,11 +4,11 @@ DEPEND=>=dev-libs/libgit2-1.0.0:=
 DESCRIPTION=Emacs bindings for libgit2
 EAPI=7
 HOMEPAGE=https://github.com/magit/libegit2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/libgit2-1.0.0:= >=app-editors/emacs-26:*[dynamic-loading] >=app-editors/emacs-26:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/magit/libegit2/archive/0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a.tar.gz -> libegit2-0.0.20200515.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=83b71d66801020607f9ce20b307de856
+_md5_=d25c4656c1c766092e648447df71eea3
diff --git a/metadata/md5-cache/app-emacs/magit-3.2.0 b/metadata/md5-cache/app-emacs/magit-3.2.0
index b469bfc7f83b..a0fc90e7701d 100644
--- a/metadata/md5-cache/app-emacs/magit-3.2.0
+++ b/metadata/md5-cache/app-emacs/magit-3.2.0
@@ -4,10 +4,10 @@ DEPEND=>=app-emacs/dash-2.18.1 app-emacs/libegit2 >=app-emacs/transient-0.3.6 >=
 DESCRIPTION=A Git porcelain inside Emacs
 EAPI=8
 HOMEPAGE=https://magit.vc/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.18.1 app-emacs/libegit2 >=app-emacs/transient-0.3.6 >=app-emacs/with-editor-3.0.4 >=dev-vcs/git-2.0.0 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/v3.2.0.tar.gz -> magit-3.2.0.tar.gz
 _eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=01518d51fb8d51bba1b849070aa597bb
+_md5_=67e67c3027a356bae9d7737460948b5d
diff --git a/metadata/md5-cache/app-emacs/popup-0.5.3 b/metadata/md5-cache/app-emacs/popup-0.5.3
index 0206a081173b..2b4a795b9144 100644
--- a/metadata/md5-cache/app-emacs/popup-0.5.3
+++ b/metadata/md5-cache/app-emacs/popup-0.5.3
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Visual popup interface library for Emacs
 EAPI=7
 HOMEPAGE=https://github.com/auto-complete/popup-el
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/auto-complete/popup-el/archive/v0.5.3.tar.gz -> popup-el-0.5.3.tar.gz
 _eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=494bee3e7a380d10dbffc5138ec94939
+_md5_=11a11ed473142833a48348ad547402dc
diff --git a/metadata/md5-cache/app-emacs/s-1.12.0 b/metadata/md5-cache/app-emacs/s-1.12.0
index 44de681ba2a7..2b11fbee4f0b 100644
--- a/metadata/md5-cache/app-emacs/s-1.12.0
+++ b/metadata/md5-cache/app-emacs/s-1.12.0
@@ -3,10 +3,10 @@ DEPEND=>=app-editors/emacs-23.1:*
 DESCRIPTION=The long lost Emacs string manipulation library
 EAPI=6
 HOMEPAGE=https://github.com/magnars/s.el
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/s.el/archive/1.12.0.tar.gz -> s-1.12.0.tar.gz
 _eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=26b7b91b1ce43a1548726e13a0386190
+_md5_=37339a47bb953cf840c682c582b7e001
diff --git a/metadata/md5-cache/app-emacs/transient-0.3.6 b/metadata/md5-cache/app-emacs/transient-0.3.6
index dec5629bc3df..b4fe6af45f4c 100644
--- a/metadata/md5-cache/app-emacs/transient-0.3.6
+++ b/metadata/md5-cache/app-emacs/transient-0.3.6
@@ -4,10 +4,10 @@ DEPEND=sys-apps/texinfo
 DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
 EAPI=7
 HOMEPAGE=https://magit.vc/manual/transient
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/transient/archive/v0.3.6.tar.gz -> transient-0.3.6.tar.gz
 _eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=07dab04816637d09ea2ce1383c4a1b80
+_md5_=97650541824208b62d408a072326926a
diff --git a/metadata/md5-cache/app-emacs/with-editor-3.0.4 b/metadata/md5-cache/app-emacs/with-editor-3.0.4
index d7bee0ff54b7..7d3f9ca8c115 100644
--- a/metadata/md5-cache/app-emacs/with-editor-3.0.4
+++ b/metadata/md5-cache/app-emacs/with-editor-3.0.4
@@ -4,10 +4,10 @@ DEPEND=sys-apps/texinfo
 DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
 EAPI=7
 HOMEPAGE=https://magit.vc/manual/with-editor
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v3.0.4.tar.gz -> with-editor-3.0.4.tar.gz
 _eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=55c0ad9eb1bde1495b35d393fedd9369
+_md5_=00d13050514b46b147e416fa7bbb6de2
diff --git a/metadata/md5-cache/app-emacs/with-editor-3.0.5 b/metadata/md5-cache/app-emacs/with-editor-3.0.5
index f1034ae88348..ec523a26ddfe 100644
--- a/metadata/md5-cache/app-emacs/with-editor-3.0.5
+++ b/metadata/md5-cache/app-emacs/with-editor-3.0.5
@@ -4,10 +4,10 @@ DEPEND=sys-apps/texinfo
 DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
 EAPI=8
 HOMEPAGE=https://magit.vc/manual/with-editor
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v3.0.5.tar.gz -> with-editor-3.0.5.tar.gz
 _eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=30cbba3d157e27a969b72a7d74d512f3
+_md5_=bf9caea91d04747d345f946390c131f0
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 7a2ff7bbb08d..79815af115cf 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/bochs-2.7 b/metadata/md5-cache/app-emulation/bochs-2.7
new file mode 100644
index 000000000000..a5a961ef527d
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/bochs-2.7
@@ -0,0 +1,14 @@
+BDEPEND=>=app-text/opensp-1.5 doc? ( app-text/docbook-sgml-utils )
+DEFINED_PHASES=configure prepare
+DEPEND=ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) sdl? ( media-libs/libsdl ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm ) X? ( x11-base/xorg-proto )
+DESCRIPTION=LGPL-ed pc emulator
+EAPI=7
+HOMEPAGE=http://bochs.sourceforge.net/
+IUSE=3dnow avx debugger doc gdb ncurses readline sdl +smp vnc X +x86-64
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) sdl? ( media-libs/libsdl ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm )
+REQUIRED_USE=avx? ( x86-64 ) gdb? ( !debugger !smp ) debugger? ( !gdb )
+SLOT=0
+SRC_URI=mirror://sourceforge/bochs/bochs-2.7.tar.gz
+_md5_=3bb75ca11e1693f603b07b493d9e7253
diff --git a/metadata/md5-cache/app-emulation/bochs-9999 b/metadata/md5-cache/app-emulation/bochs-9999
index d2d33ca9dee2..575a8c25dc69 100644
--- a/metadata/md5-cache/app-emulation/bochs-9999
+++ b/metadata/md5-cache/app-emulation/bochs-9999
@@ -1,14 +1,14 @@
-BDEPEND=doc? ( app-text/docbook-sgml-utils ) sys-apps/sed >=app-text/opensp-1.5 dev-vcs/subversion[http(+)] net-misc/rsync
+BDEPEND=>=app-text/opensp-1.5 doc? ( app-text/docbook-sgml-utils ) dev-vcs/subversion[http(+)] net-misc/rsync
 DEFINED_PHASES=configure preinst prepare unpack
-DEPEND=X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) readline? ( sys-libs/readline:= ) ncurses? ( sys-libs/ncurses:= ) X? ( x11-base/xorg-proto )
+DEPEND=ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) sdl? ( media-libs/libsdl ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm ) X? ( x11-base/xorg-proto )
 DESCRIPTION=LGPL-ed pc emulator
 EAPI=7
 HOMEPAGE=http://bochs.sourceforge.net/
-IUSE=3dnow avx debugger doc gdb ncurses readline svga sdl +smp vnc X +x86-64
+IUSE=3dnow avx debugger doc gdb ncurses readline sdl +smp vnc X +x86-64
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) readline? ( sys-libs/readline:= ) ncurses? ( sys-libs/ncurses:= )
+RDEPEND=ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) sdl? ( media-libs/libsdl ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm )
 REQUIRED_USE=avx? ( x86-64 ) gdb? ( !debugger !smp ) debugger? ( !gdb )
 SLOT=0
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	subversion	c74febd1baf21b1229704d6a953c27db
-_md5_=06d5ea22735ec2185c21604b4b897575
+_md5_=4fa47eda0cc3f3711ac03201ba4fbeb0
diff --git a/metadata/md5-cache/app-emulation/buildah-1.23.1 b/metadata/md5-cache/app-emulation/buildah-1.23.1
new file mode 100644
index 000000000000..7efc5a495adc
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/buildah-1.23.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
+DESCRIPTION=A tool that facilitates building OCI images
+EAPI=7
+HOMEPAGE=https://github.com/containers/buildah
+IUSE=selinux
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
+RDEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/containers/buildah/archive/v1.23.1.tar.gz -> buildah-1.23.1.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0ab1bfb2fb5d6990968aeac636b022ab
diff --git a/metadata/md5-cache/app-emulation/conmon-2.0.22 b/metadata/md5-cache/app-emulation/conmon-2.0.22
deleted file mode 100644
index cb04b4ba3f87..000000000000
--- a/metadata/md5-cache/app-emulation/conmon-2.0.22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= ) dev-go/go-md2man
-DESCRIPTION=An OCI container runtime monitor
-EAPI=7
-HOMEPAGE=https://github.com/containers/conmon
-IUSE=systemd
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/containers/conmon/archive/9c34a8663b85e479e0c083801e89a2b2835228ed.tar.gz -> conmon-2.0.22.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=56afd9a7c1e09d86e0b3efe85c1da6de
diff --git a/metadata/md5-cache/app-emulation/conmon-2.0.30 b/metadata/md5-cache/app-emulation/conmon-2.0.30
new file mode 100644
index 000000000000..4805f175d9c0
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/conmon-2.0.30
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= ) dev-go/go-md2man
+DESCRIPTION=An OCI container runtime monitor
+EAPI=7
+HOMEPAGE=https://github.com/containers/conmon
+IUSE=systemd
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/conmon/archive/v2.0.30.tar.gz -> conmon-2.0.30.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ae294d1b4823f57c3ff4a7243104b719
diff --git a/metadata/md5-cache/app-emulation/distrobuilder-1.1 b/metadata/md5-cache/app-emulation/distrobuilder-1.1
index eb55ef4c2255..1ba605614c98 100644
--- a/metadata/md5-cache/app-emulation/distrobuilder-1.1
+++ b/metadata/md5-cache/app-emulation/distrobuilder-1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-util/debootstrap app-crypt/gnupg sys-fs/squashfs-tools dev-vcs/git n
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/distrobuilder/distrobuilder-1.1.tar.gz
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=51c012f4f12c9c9b9c455a6e6a8c94f0
diff --git a/metadata/md5-cache/app-emulation/distrobuilder-1.2 b/metadata/md5-cache/app-emulation/distrobuilder-1.2
index d3aa33f643bc..9eea989e5186 100644
--- a/metadata/md5-cache/app-emulation/distrobuilder-1.2
+++ b/metadata/md5-cache/app-emulation/distrobuilder-1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-util/debootstrap app-crypt/gnupg sys-fs/squashfs-tools dev-vcs/git n
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/lxc/distrobuilder/archive/distrobuilder-1.2.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.2.1+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.8.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20200113171025-3fe6c5262873.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20200113171025-3fe6c5262873.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16-0.20201130162521-d1ffc52c7331.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16-0.20201130162521-d1ffc52c7331.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.16.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210211115548-6eac466e5fa3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210211115548-6eac466e5fa3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7-0.20190325164909-8abdbb8205e4.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7-0.20190325164909-8abdbb8205e4.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.9.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.14.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.14.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.15.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.15.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.15.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.15.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20201218223536-d3e5debf77da.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20201218223536-d3e5debf77da.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20210227013316-43a75bb4edd3.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20210227013316-43a75bb4edd3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!open!pee!dee!p/depguard/@v/v1.0.0.mod -> github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.mod -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.mod -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod mirror://goproxy//github.com/antchfx/xpath/@v/v1.1.11.zip -> github.com%2Fantchfx%2Fxpath%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/antchfx/xpath/@v/v1.1.11.mod -> github.com%2Fantchfx%2Fxpath%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/apex/log/@v/v1.1.1.mod -> github.com%2Fapex%2Flog%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/apex/log/@v/v1.9.0.zip -> github.com%2Fapex%2Flog%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/apex/log/@v/v1.9.0.mod -> github.com%2Fapex%2Flog%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/apex/logs/@v/v1.0.0.mod -> github.com%2Fapex%2Flogs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aphistic/golf/@v/v0.0.0-20180712155816-02c07f170c5a.mod -> github.com%2Faphistic%2Fgolf%2F@v%2Fv0.0.0-20180712155816-02c07f170c5a.mod mirror://goproxy//github.com/aphistic/sweet/@v/v0.2.0.mod -> github.com%2Faphistic%2Fsweet%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/aphistic/sweet/@v/v0.3.0.mod -> github.com%2Faphistic%2Fsweet%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.20.6.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.20.6.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.23.21.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.23.21.mod mirror://goproxy//github.com/aybabtme/rgbterm/@v/v0.0.0-20170906152045-cc83f3b3ce59.mod -> github.com%2Faybabtme%2Frgbterm%2F@v%2Fv0.0.0-20170906152045-cc83f3b3ce59.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20160804104726-4c0e84591b9a.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.mod -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v0.4.1.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.mod mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.mod -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.mod -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.mod -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.1.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200702112145-1c8d4c9ef775.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.2.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20200908144142-dab0cbea06f4.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20200908144142-dab0cbea06f4.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20201003224125-76a6863f2989.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20201003224125-76a6863f2989.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20210316121734-20793ff83c97.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20210316121734-20793ff83c97.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20201111183144-404b9149801e.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20210316141732-918d888fb676.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20210316141732-918d888fb676.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190717030353-c4b9ac5c7601.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190717030353-c4b9ac5c7601.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200710171044-318312a37340.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200824123100-0b889c03f102.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200824123100-0b889c03f102.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20210114181951-8a68de567b68.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20210114181951-8a68de567b68.zip mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20210114181951-8a68de567b68.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20210114181951-8a68de567b68.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20181022165439-0650fd9eeb50.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20181022165439-0650fd9eeb50.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191206165004-02ecf6a7291e.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.2.10.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.2.10.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.1-0.20191213020239-082f7e3aed57.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.0-beta.2.0.20200729163537-40b22ef07410.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.0-beta.2.0.20200729163537-40b22ef07410.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.4.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.4.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.4.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.4.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190815185530-f2a389ac0a02.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190815185530-f2a389ac0a02.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20191127005431-f65d91d395eb.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20191127005431-f65d91d395eb.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200228182428-0f16d7a0959c.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200228182428-0f16d7a0959c.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20200710164510-efbc4488d8fe.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200710164510-efbc4488d8fe.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20201208142359-180525291bb7.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20201208142359-180525291bb7.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20210208174643-50096c924a4e.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20210208174643-50096c924a4e.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20210315143101-93e15499afd5.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20210315143101-93e15499afd5.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20210315143101-93e15499afd5.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20210315143101-93e15499afd5.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20180307165137-3d5202aec260.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20180307165137-3d5202aec260.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20200410184934-f15a3290365b.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20201026212402-0724c46b320c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20201026212402-0724c46b320c.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20210316144830-115abcc95a1d.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20210316144830-115abcc95a1d.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20190911050354-e029b79d8cda.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20190911050354-e029b79d8cda.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20201020171139-16b287bc67d0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20201020171139-16b287bc67d0.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.4-0.20210301171431-0ae5c75f59ba.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.4-0.20210301171431-0ae5c75f59ba.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1-0.20210312161619-7ed62a527887.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1-0.20210312161619-7ed62a527887.mod mirror://goproxy//github.com/containerd/nri/@v/v0.0.0-20201007170849-eb1350a75164.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20201007170849-eb1350a75164.mod mirror://goproxy//github.com/containerd/nri/@v/v0.0.0-20210316161719-dbaa18c31c14.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20210316161719-dbaa18c31c14.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828172938-92c8520ef9f8.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828172938-92c8520ef9f8.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20191028202541-4f1b8fe65a5c.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20191028202541-4f1b8fe65a5c.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20190911142611-5eb25027c9fd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190911142611-5eb25027c9fd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20200918131355-0a33824f23a2.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20200918131355-0a33824f23a2.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20210301145711-11e8f1707f62.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210301145711-11e8f1707f62.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20210315114300-dde8f0fda960.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210315114300-dde8f0fda960.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.0.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.0.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20161114122254-48702e0da86b.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20161114122254-48702e0da86b.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.11.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.11.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.mod -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.mod -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.mod -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.mod -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20190125010748-a747050bb1ba.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20170104182250-a601269ab70c.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20171011171712-7484e51bf6af.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20171011171712-7484e51bf6af.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20190905152932-14b96e55d84c.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20190905152932-14b96e55d84c.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20191101170500-ac7306503d23.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20191101170500-ac7306503d23.mod mirror://goproxy//github.com/docker/docker/@v/v20.10.3-0.20210216175712-646072ed6524+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.3-0.20210216175712-646072ed6524+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v20.10.5+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.5+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v20.10.5+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.5+incompatible.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20170721190031-9461782956ad.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20170721190031-9461782956ad.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.0-20180209012529-399ea8c73916.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20160708172513-aabc10ec26b7.zip -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20160708172513-aabc10ec26b7.zip mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20160708172513-aabc10ec26b7.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20160708172513-aabc10ec26b7.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.6.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/flosch/pongo2/@v/v0.0.0-20200913210552-0d938eb266f3.zip -> github.com%2Fflosch%2Fpongo2%2F@v%2Fv0.0.0-20200913210552-0d938eb266f3.zip mirror://goproxy//github.com/flosch/pongo2/@v/v0.0.0-20200913210552-0d938eb266f3.mod -> github.com%2Fflosch%2Fpongo2%2F@v%2Fv0.0.0-20200913210552-0d938eb266f3.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/fsouza/go-dockerclient/@v/v1.6.4.mod -> github.com%2Ffsouza%2Fgo-dockerclient%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/fsouza/go-dockerclient/@v/v1.7.2.zip -> github.com%2Ffsouza%2Fgo-dockerclient%2F@v%2Fv1.7.2.zip mirror://goproxy//github.com/fsouza/go-dockerclient/@v/v1.7.2.mod -> github.com%2Ffsouza%2Fgo-dockerclient%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/fullsailor/pkcs7/@v/v0.0.0-20190404230743-d7302db945fa.mod -> github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.mod mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-critic/go-critic/@v/v0.3.5-0.20190526074819-1df300866540.mod -> github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.3.5-0.20190526074819-1df300866540.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-lintpack/lintpack/@v/v0.5.2.mod -> github.com%2Fgo-lintpack%2Flintpack%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-toolsmith/astcast/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastcast%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astcopy/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastcopy%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astequal/@v/v0.0.0-20180903214952-dcb477bfacd6.mod -> github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv0.0.0-20180903214952-dcb477bfacd6.mod mirror://goproxy//github.com/go-toolsmith/astequal/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astfmt/@v/v0.0.0-20180903215011-8f8ee99c3086.mod -> github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv0.0.0-20180903215011-8f8ee99c3086.mod mirror://goproxy//github.com/go-toolsmith/astfmt/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastfmt%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/astinfo/@v/v0.0.0-20180906194353-9809ff7efb21.mod -> github.com%2Fgo-toolsmith%2Fastinfo%2F@v%2Fv0.0.0-20180906194353-9809ff7efb21.mod mirror://goproxy//github.com/go-toolsmith/astp/@v/v0.0.0-20180903215135-0af7e3c24f30.mod -> github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv0.0.0-20180903215135-0af7e3c24f30.mod mirror://goproxy//github.com/go-toolsmith/astp/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fastp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/pkgload/@v/v0.0.0-20181119091011-e9e65178eee8.mod -> github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv0.0.0-20181119091011-e9e65178eee8.mod mirror://goproxy//github.com/go-toolsmith/pkgload/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/strparse/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Fstrparse%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-toolsmith/typep/@v/v1.0.0.mod -> github.com%2Fgo-toolsmith%2Ftypep%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gobuffalo/logger/@v/v1.0.3.zip -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/gobuffalo/logger/@v/v1.0.3.mod -> github.com%2Fgobuffalo%2Flogger%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/gobuffalo/packd/@v/v1.0.0.zip -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/gobuffalo/packd/@v/v1.0.0.mod -> github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.8.1.zip -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.8.1.zip mirror://goproxy//github.com/gobuffalo/packr/v2/@v/v2.8.1.mod -> github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.8.1.mod mirror://goproxy//github.com/gobwas/glob/@v/v0.2.3.mod -> github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20151105175453-c7fdd8b5cd55.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20151105175453-c7fdd8b5cd55.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.2.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.0.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/golangci/check/@v/v0.0.0-20180506172741-cfe4005ccda2.mod -> github.com%2Fgolangci%2Fcheck%2F@v%2Fv0.0.0-20180506172741-cfe4005ccda2.mod mirror://goproxy//github.com/golangci/dupl/@v/v0.0.0-20180902072040-3e9179ac440a.mod -> github.com%2Fgolangci%2Fdupl%2F@v%2Fv0.0.0-20180902072040-3e9179ac440a.mod mirror://goproxy//github.com/golangci/errcheck/@v/v0.0.0-20181223084120-ef45e06d44b6.mod -> github.com%2Fgolangci%2Ferrcheck%2F@v%2Fv0.0.0-20181223084120-ef45e06d44b6.mod mirror://goproxy//github.com/golangci/go-misc/@v/v0.0.0-20180628070357-927a3d87b613.mod -> github.com%2Fgolangci%2Fgo-misc%2F@v%2Fv0.0.0-20180628070357-927a3d87b613.mod mirror://goproxy//github.com/golangci/go-tools/@v/v0.0.0-20190318055746-e32c54105b7c.mod -> github.com%2Fgolangci%2Fgo-tools%2F@v%2Fv0.0.0-20190318055746-e32c54105b7c.mod mirror://goproxy//github.com/golangci/goconst/@v/v0.0.0-20180610141641-041c5f2b40f3.mod -> github.com%2Fgolangci%2Fgoconst%2F@v%2Fv0.0.0-20180610141641-041c5f2b40f3.mod mirror://goproxy//github.com/golangci/gocyclo/@v/v0.0.0-20180528134321-2becd97e67ee.mod -> github.com%2Fgolangci%2Fgocyclo%2F@v%2Fv0.0.0-20180528134321-2becd97e67ee.mod mirror://goproxy//github.com/golangci/gofmt/@v/v0.0.0-20181222123516-0b8337e80d98.mod -> github.com%2Fgolangci%2Fgofmt%2F@v%2Fv0.0.0-20181222123516-0b8337e80d98.mod mirror://goproxy//github.com/golangci/golangci-lint/@v/v1.17.2-0.20190909185456-6163a8a79084.mod -> github.com%2Fgolangci%2Fgolangci-lint%2F@v%2Fv1.17.2-0.20190909185456-6163a8a79084.mod mirror://goproxy//github.com/golangci/gosec/@v/v0.0.0-20190211064107-66fb7fc33547.mod -> github.com%2Fgolangci%2Fgosec%2F@v%2Fv0.0.0-20190211064107-66fb7fc33547.mod mirror://goproxy//github.com/golangci/ineffassign/@v/v0.0.0-20190609212857-42439a7714cc.mod -> github.com%2Fgolangci%2Fineffassign%2F@v%2Fv0.0.0-20190609212857-42439a7714cc.mod mirror://goproxy//github.com/golangci/lint-1/@v/v0.0.0-20190420132249-ee948d087217.mod -> github.com%2Fgolangci%2Flint-1%2F@v%2Fv0.0.0-20190420132249-ee948d087217.mod mirror://goproxy//github.com/golangci/maligned/@v/v0.0.0-20180506175553-b1d89398deca.mod -> github.com%2Fgolangci%2Fmaligned%2F@v%2Fv0.0.0-20180506175553-b1d89398deca.mod mirror://goproxy//github.com/golangci/misspell/@v/v0.0.0-20180809174111-950f5d19e770.mod -> github.com%2Fgolangci%2Fmisspell%2F@v%2Fv0.0.0-20180809174111-950f5d19e770.mod mirror://goproxy//github.com/golangci/prealloc/@v/v0.0.0-20180630174525-215b22d4de21.mod -> github.com%2Fgolangci%2Fprealloc%2F@v%2Fv0.0.0-20180630174525-215b22d4de21.mod mirror://goproxy//github.com/golangci/revgrep/@v/v0.0.0-20180526074752-d9c87f5ffaf0.mod -> github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180526074752-d9c87f5ffaf0.mod mirror://goproxy//github.com/golangci/unconvert/@v/v0.0.0-20180507085042-28b1c447d1f4.mod -> github.com%2Fgolangci%2Funconvert%2F@v%2Fv0.0.0-20180507085042-28b1c447d1f4.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/handlers/@v/v0.0.0-20150720190736-60c7bfde3e33.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.4.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.4.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gostaticanalysis/analysisutil/@v/v0.0.0-20190318220348-4088753ea4d3.mod -> github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.0-20190318220348-4088753ea4d3.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v0.0.0-20180404174102-ef8a98b0bbce.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20180404174102-ef8a98b0bbce.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/heroku/docker-registry-client/@v/v0.0.0-20181004091502-47ecf50fd8d4.mod -> github.com%2Fheroku%2Fdocker-registry-client%2F@v%2Fv0.0.0-20181004091502-47ecf50fd8d4.mod mirror://goproxy//github.com/heroku/docker-registry-client/@v/v0.0.0-20190909225348-afc9e1acc3d5.zip -> github.com%2Fheroku%2Fdocker-registry-client%2F@v%2Fv0.0.0-20190909225348-afc9e1acc3d5.zip mirror://goproxy//github.com/heroku/docker-registry-client/@v/v0.0.0-20190909225348-afc9e1acc3d5.mod -> github.com%2Fheroku%2Fdocker-registry-client%2F@v%2Fv0.0.0-20190909225348-afc9e1acc3d5.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.10.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.10.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.mod -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jpillora/backoff/@v/v0.0.0-20180909062703-3050d21c67d7.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.15.8.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.15.8.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v0.0.0-20161130080628-0de1eaf82fa3.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv0.0.0-20161130080628-0de1eaf82fa3.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.0.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.4.1.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.8.3.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.8.3.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.3.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.12.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.12.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.11.12.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.12.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v0.0.0-20180405133222-e7e905edc00e.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv0.0.0-20180405133222-e7e905edc00e.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/klauspost/pgzip/@v/v1.2.1.mod -> github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/klauspost/pgzip/@v/v1.2.5.zip -> github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.5.zip mirror://goproxy//github.com/klauspost/pgzip/@v/v1.2.5.mod -> github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.5.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/logrusorgru/aurora/@v/v0.0.0-20181002194514-a7b3b318ed4e.mod -> github.com%2Flogrusorgru%2Faurora%2F@v%2Fv0.0.0-20181002194514-a7b3b318ed4e.mod mirror://goproxy//github.com/lxc/lxd/@v/v0.0.0-20210322210645-afff9e5620d6.zip -> github.com%2Flxc%2Flxd%2F@v%2Fv0.0.0-20210322210645-afff9e5620d6.zip mirror://goproxy//github.com/lxc/lxd/@v/v0.0.0-20210322210645-afff9e5620d6.mod -> github.com%2Flxc%2Flxd%2F@v%2Fv0.0.0-20210322210645-afff9e5620d6.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.7.6.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.7.6.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/markbates/errx/@v/v1.1.0.zip -> github.com%2Fmarkbates%2Ferrx%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/markbates/errx/@v/v1.1.0.mod -> github.com%2Fmarkbates%2Ferrx%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/markbates/oncer/@v/v1.0.0.zip -> github.com%2Fmarkbates%2Foncer%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/markbates/oncer/@v/v1.0.0.mod -> github.com%2Fmarkbates%2Foncer%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/markbates/safe/@v/v1.0.1.zip -> github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/markbates/safe/@v/v1.0.1.mod -> github.com%2Fmarkbates%2Fsafe%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/marstr/guid/@v/v1.1.0.mod -> github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mattn/goveralls/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.mod -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-ps/@v/v0.0.0-20170309133038-4fdf99ab2936.mod -> github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20170309133038-4fdf99ab2936.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20180220230111-00c29f56e238.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20180220230111-00c29f56e238.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.mod -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod mirror://goproxy//github.com/moby/sys/mount/@v/v0.2.0.zip -> github.com%2Fmoby%2Fsys%2Fmount%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/moby/sys/mount/@v/v0.2.0.mod -> github.com%2Fmoby%2Fsys%2Fmount%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.0.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/moby/sys/symlink/@v/v0.1.0.mod -> github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20201216013528-df9cb8a40635.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20201216013528-df9cb8a40635.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170929034955-c48cc78d4826.zip -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170929034955-c48cc78d4826.zip mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170929034955-c48cc78d4826.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170929034955-c48cc78d4826.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mozilla/tls-observatory/@v/v0.0.0-20180409132520-8791a200eb40.mod -> github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20180409132520-8791a200eb40.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/mudler/docker-companion/@v/v0.4.6-0.20201209184016-2d26fc9143d4.zip -> github.com%2Fmudler%2Fdocker-companion%2F@v%2Fv0.4.6-0.20201209184016-2d26fc9143d4.zip mirror://goproxy//github.com/mudler/docker-companion/@v/v0.4.6-0.20201209184016-2d26fc9143d4.mod -> github.com%2Fmudler%2Fdocker-companion%2F@v%2Fv0.4.6-0.20201209184016-2d26fc9143d4.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20160627004424-a22cb81b2ecd.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20160627004424-a22cb81b2ecd.mod mirror://goproxy//github.com/nbutton23/zxcvbn-go/@v/v0.0.0-20171102151520-eafdab6b0663.mod -> github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20171102151520-eafdab6b0663.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20151202141238-7f8ab55aaf3b.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20151007035656-2152b45fa28a.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.2.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/open!s!u!s!e/umoci/@v/v0.1.1-0.20191030112807-c0dd46ae078f.mod -> github.com%2Fopen!s!u!s!e%2Fumoci%2F@v%2Fv0.1.1-0.20191030112807-c0dd46ae078f.mod mirror://goproxy//github.com/open!s!u!s!e/umoci/@v/v0.4.5.zip -> github.com%2Fopen!s!u!s!e%2Fumoci%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/open!s!u!s!e/umoci/@v/v0.4.5.mod -> github.com%2Fopen!s!u!s!e%2Fumoci%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20170106003457-a6d0ee40d420.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.1.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc93.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc93.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2-0.20190207185410-29686dbc5559.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20190207185410-29686dbc5559.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200929063507-e6143ca7d51d.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200929063507-e6143ca7d51d.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.6.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.1.zip -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/pborman/uuid/@v/v1.2.1.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.1.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1-0.20171018195549-f15c970de5b7.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.0.0-20180209125602-c332b6f63c06.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20171117100541-99fa1f4be8e5.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180110214958-89604d197083.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/quasilyte/go-consistent/@v/v0.0.0-20190521200055-c6f3937de18c.mod -> github.com%2Fquasilyte%2Fgo-consistent%2F@v%2Fv0.0.0-20190521200055-c6f3937de18c.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.5.2.zip -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.5.2.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/rootless-containers/proto/@v/v0.1.0.zip -> github.com%2Frootless-containers%2Fproto%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/rootless-containers/proto/@v/v0.1.0.mod -> github.com%2Frootless-containers%2Fproto%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v0.0.0-20170128012129-256dc444b735.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv0.0.0-20170128012129-256dc444b735.mod mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20180427012116-c95755e4bcd7.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20180427012116-c95755e4bcd7.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.4-0.20170822132746-89742aefa4b2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.5.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.3.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.1.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/smartystreets/go-aws-auth/@v/v0.0.0-20180515143844-0c1422d1fdb9.mod -> github.com%2Fsmartystreets%2Fgo-aws-auth%2F@v%2Fv0.0.0-20180515143844-0c1422d1fdb9.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/smartystreets/gunit/@v/v1.0.0.mod -> github.com%2Fsmartystreets%2Fgunit%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/smartystreets/gunit/@v/v1.0.4.mod -> github.com%2Fsmartystreets%2Fgunit%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/sourcegraph/go-diff/@v/v0.5.1.mod -> github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.2.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.6.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v0.0.0-20180109140146-7c0cea34c8ec.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv0.0.0-20180109140146-7c0cea34c8ec.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.0.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stefanberger/go-pkcs11uri/@v/v0.0.0-20201008174630-78d3cae3a980.mod -> github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.0.0-20180129172003-8a3f7159479f.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.0.0-20180129172003-8a3f7159479f.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20180303142811-b89eecf5ca5d.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20180303142811-b89eecf5ca5d.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/timakin/bodyclose/@v/v0.0.0-20190721030226-87058b9bfcec.mod -> github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190721030226-87058b9bfcec.mod mirror://goproxy//github.com/tj/assert/@v/v0.0.0-20171129193455-018094318fb0.mod -> github.com%2Ftj%2Fassert%2F@v%2Fv0.0.0-20171129193455-018094318fb0.mod mirror://goproxy//github.com/tj/assert/@v/v0.0.3.zip -> github.com%2Ftj%2Fassert%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/tj/assert/@v/v0.0.3.mod -> github.com%2Ftj%2Fassert%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/tj/go-buffer/@v/v1.1.0.mod -> github.com%2Ftj%2Fgo-buffer%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/tj/go-elastic/@v/v0.0.0-20171221160941-36157cbbebc2.mod -> github.com%2Ftj%2Fgo-elastic%2F@v%2Fv0.0.0-20171221160941-36157cbbebc2.mod mirror://goproxy//github.com/tj/go-kinesis/@v/v0.0.0-20171128231115-08b17f58cb1b.mod -> github.com%2Ftj%2Fgo-kinesis%2F@v%2Fv0.0.0-20171128231115-08b17f58cb1b.mod mirror://goproxy//github.com/tj/go-spin/@v/v1.1.0.mod -> github.com%2Ftj%2Fgo-spin%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ultraware/funlen/@v/v0.0.1.mod -> github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.5.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasthttp/@v/v1.2.0.mod -> github.com%2Fvalyala%2Ffasthttp%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/valyala/quicktemplate/@v/v1.1.1.mod -> github.com%2Fvalyala%2Fquicktemplate%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/valyala/tcplisten/@v/v0.0.0-20161114210144-ceec8f93295a.mod -> github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.mod mirror://goproxy//github.com/vbatts/go-mtree/@v/v0.4.4.mod -> github.com%2Fvbatts%2Fgo-mtree%2F@v%2Fv0.4.4.mod mirror://goproxy//github.com/vbatts/go-mtree/@v/v0.5.0.zip -> github.com%2Fvbatts%2Fgo-mtree%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/vbatts/go-mtree/@v/v0.5.0.mod -> github.com%2Fvbatts%2Fgo-mtree%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20181108222139-023a6dafdcdf.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11-0.20200630133818-d5bec3311243.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.mod -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.mod -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.mod -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.mod -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.zip -> go.opencensus.io%2F@v%2Fv0.23.0.zip mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.16.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.16.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.16.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.16.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20171113213409-9f005a07e0d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181009213950-7c1a557ab941.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190426145343-a29dc8fdc734.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190911031432-227b76d455e7.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191122220453-ac88ee75c92c.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191122220453-ac88ee75c92c.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170915142106-8351a756f30f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170915142106-8351a756f30f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180911220305-26e67e76b6c3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180911220305-26e67e76b6c3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190912160710-24e19bdeb0f2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190912160710-24e19bdeb0f2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20171026204733-164713f0dfce.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20171026204733-164713f0dfce.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190522044717-8097e1b27ff5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190522044717-8097e1b27ff5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190602015325-4c4f7f33c9ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190812073006-9eafafc0a87e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190812073006-9eafafc0a87e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190913121621-c3b328c6e5a7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190913121621-c3b328c6e5a7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191115151921-52ab43148777.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200622214017-ed371f2e16b4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200622214017-ed371f2e16b4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200817155316-9781c653f443.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200817155316-9781c653f443.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200831180312-196b9ba8737a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200909081042-eff7692f9009.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200916030750-2334cc1a136f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916030750-2334cc1a136f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200922070232-aee5d888a860.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200922070232-aee5d888a860.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201202213521-69691e467435.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201202213521-69691e467435.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210216224549-f992740a1bac.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210216224549-f992740a1bac.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210315160823-c6e025ad8005.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201113234701-d7a72108b828.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201113234701-d7a72108b828.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210317153231-de623e64d2a6.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210317153231-de623e64d2a6.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210317153231-de623e64d2a6.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915090833-1cbadb444a80.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915090833-1cbadb444a80.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20170915040203-e531a2a1c15f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20170915040203-e531a2a1c15f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181117154741-2ddaf7f79a09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181117154741-2ddaf7f79a09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190110163146-51295c7ec13a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190110163146-51295c7ec13a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190121143147-24cd39ecf745.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190121143147-24cd39ecf745.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311215038-5c2858a9cfe5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311215038-5c2858a9cfe5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190322203728-c1a832b0ad89.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190322203728-c1a832b0ad89.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190521203540-521d6ed310dd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190521203540-521d6ed310dd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190913181337-0240832f5c3d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190913181337-0240832f5c3d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200308013534-11ec41452d41.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200308013534-11ec41452d41.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20160322025152-9bf6e6e569ff.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/cloud/@v/v0.0.0-20151119220103-975617b05ea8.mod -> google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190522204451-c2c4e71fbf69.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190522204451-c2c4e71fbf69.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200117163144-32f20d992d24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201110150050-8816d57aaa9a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.mod mirror://goproxy//google.golang.org/grpc/@v/v0.0.0-20160317175043-d3ddb4469d5a.mod -> google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/antchfx/htmlquery.v1/@v/v1.2.2.zip -> gopkg.in%2Fantchfx%2Fhtmlquery.v1%2F@v%2Fv1.2.2.zip mirror://goproxy//gopkg.in/antchfx/htmlquery.v1/@v/v1.2.2.mod -> gopkg.in%2Fantchfx%2Fhtmlquery.v1%2F@v%2Fv1.2.2.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20141024133853-64131543e789.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200902074654-038fdea0a05b.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200902074654-038fdea0a05b.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/flosch/pongo2.v3/@v/v3.0.0-20141028000813-5e81b817a0c4.zip -> gopkg.in%2Fflosch%2Fpongo2.v3%2F@v%2Fv3.0.0-20141028000813-5e81b817a0c4.zip mirror://goproxy//gopkg.in/flosch/pongo2.v3/@v/v3.0.0-20141028000813-5e81b817a0c4.mod -> gopkg.in%2Fflosch%2Fpongo2.v3%2F@v%2Fv3.0.0-20141028000813-5e81b817a0c4.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/robfig/cron.v2/@v/v2.0.0-20150107220207-be2e0b0deed5.zip -> gopkg.in%2Frobfig%2Fcron.v2%2F@v%2Fv2.0.0-20150107220207-be2e0b0deed5.zip mirror://goproxy//gopkg.in/robfig/cron.v2/@v/v2.0.0-20150107220207-be2e0b0deed5.mod -> gopkg.in%2Frobfig%2Fcron.v2%2F@v%2Fv2.0.0-20150107220207-be2e0b0deed5.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200605160147-a5ece683394c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200605160147-a5ece683394c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//k8s.io/api/@v/v0.20.1.mod -> k8s.io%2Fapi%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.20.1.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/apiserver/@v/v0.20.1.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/client-go/@v/v0.20.1.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/component-base/@v/v0.20.1.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/cri-api/@v/v0.17.3.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.17.3.mod mirror://goproxy//k8s.io/cri-api/@v/v0.20.1.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.20.1.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.13.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//mvdan.cc/interfacer/@v/v0.0.0-20180901003855-c20040233aed.mod -> mvdan.cc%2Finterfacer%2F@v%2Fv0.0.0-20180901003855-c20040233aed.mod mirror://goproxy//mvdan.cc/lint/@v/v0.0.0-20170908181259-adc824a0674b.mod -> mvdan.cc%2Flint%2F@v%2Fv0.0.0-20170908181259-adc824a0674b.mod mirror://goproxy//mvdan.cc/unparam/@v/v0.0.0-20190209190245-fbb59629db34.mod -> mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20190209190245-fbb59629db34.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.14.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.14.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1a3f1620aa415ea8a3ee6b1fd8e58ac
diff --git a/metadata/md5-cache/app-emulation/docker-20.10.9 b/metadata/md5-cache/app-emulation/docker-20.10.9
index 7c4a5d59c9da..80046f2143f7 100644
--- a/metadata/md5-cache/app-emulation/docker-20.10.9
+++ b/metadata/md5-cache/app-emulation/docker-20.10.9
@@ -11,5 +11,5 @@ RDEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparm
 RESTRICT=installsources strip test
 SLOT=0
 SRC_URI=https://github.com/moby/moby/archive/v20.10.9.tar.gz -> docker-20.10.9.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ee98df2c8a27c4347826db72f6dc2d50	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ee98df2c8a27c4347826db72f6dc2d50	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=aaede10117a5d622c629cfbd94998d86
diff --git a/metadata/md5-cache/app-emulation/firecracker-0.21.1-r1 b/metadata/md5-cache/app-emulation/firecracker-0.21.1-r1
index f1f6ae4882b7..341b55d8127e 100644
--- a/metadata/md5-cache/app-emulation/firecracker-0.21.1-r1
+++ b/metadata/md5-cache/app-emulation/firecracker-0.21.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firecracker-microvm/firecracker/archive/v0.21.1.tar.gz -> firecracker-0.21.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.8/download -> aho-corasick-0.7.8.crate https://crates.io/api/v1/crates/backtrace/0.3.44/download -> backtrace-0.3.44.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.32/download -> backtrace-sys-0.1.32.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cc/1.0.50/download -> cc-1.0.50.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cpuid/0.1.0/download -> cpuid-0.1.0.crate https://crates.io/api/v1/crates/device_tree/1.1.0/download -> device_tree-1.1.0.crate https://crates.io/api/v1/crates/epoll/4.1.0/download -> epoll-4.1.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/kernel/0.1.0/download -> kernel-0.1.0.crate https://crates.io/api/v1/crates/kvm-bindings/0.2.0/download -> kvm-bindings-0.2.0.crate https://crates.io/api/v1/crates/kvm-ioctls/0.5.0/download -> kvm-ioctls-0.5.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/logger/0.1.0/download -> logger-0.1.0.crate https://crates.io/api/v1/crates/memchr/2.3.2/download -> memchr-2.3.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.8/download -> proc-macro2-1.0.8.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/regex/1.3.4/download -> regex-1.3.4.crate https://crates.io/api/v1/crates/regex-syntax/0.6.14/download -> regex-syntax-0.6.14.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/seccomp/0.1.0/download -> seccomp-0.1.0.crate https://crates.io/api/v1/crates/serde/1.0.104/download -> serde-1.0.104.crate https://crates.io/api/v1/crates/serde_derive/1.0.104/download -> serde_derive-1.0.104.crate https://crates.io/api/v1/crates/serde_json/1.0.48/download -> serde_json-1.0.48.crate https://crates.io/api/v1/crates/syn/1.0.14/download -> syn-1.0.14.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/timerfd/1.1.1/download -> timerfd-1.1.1.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vm-memory/0.1.0/download -> vm-memory-0.1.0.crate https://crates.io/api/v1/crates/vmm-sys-util/0.4.0/download -> vmm-sys-util-0.4.0.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17f137938ff686618c08e813b17e1551
diff --git a/metadata/md5-cache/app-emulation/firecracker-bin-0.24.5 b/metadata/md5-cache/app-emulation/firecracker-bin-0.24.5
index cdfcefcdbb9a..ebecd1e6d1cc 100644
--- a/metadata/md5-cache/app-emulation/firecracker-bin-0.24.5
+++ b/metadata/md5-cache/app-emulation/firecracker-bin-0.24.5
@@ -9,5 +9,5 @@ RDEPEND=!app-emulation/firecracker acct-group/kvm
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( https://github.com/firecracker-microvm/firecracker/releases/download/v0.24.5/firecracker-v0.24.5-x86_64.tgz ) arm64? ( https://github.com/firecracker-microvm/firecracker/releases/download/v0.24.5/firecracker-v0.24.5-aarch64.tgz )
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58319b0cbb531bb970a15b4c466d059b
diff --git a/metadata/md5-cache/app-emulation/firecracker-bin-0.25.0 b/metadata/md5-cache/app-emulation/firecracker-bin-0.25.0
index 87e8b3eaef81..533163b25cdc 100644
--- a/metadata/md5-cache/app-emulation/firecracker-bin-0.25.0
+++ b/metadata/md5-cache/app-emulation/firecracker-bin-0.25.0
@@ -9,5 +9,5 @@ RDEPEND=!app-emulation/firecracker acct-group/kvm
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( https://github.com/firecracker-microvm/firecracker/releases/download/v0.25.0/firecracker-v0.25.0-x86_64.tgz ) arm64? ( https://github.com/firecracker-microvm/firecracker/releases/download/v0.25.0/firecracker-v0.25.0-aarch64.tgz )
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58319b0cbb531bb970a15b4c466d059b
diff --git a/metadata/md5-cache/app-emulation/fs-uae-3.1.35 b/metadata/md5-cache/app-emulation/fs-uae-3.1.35
new file mode 100644
index 000000000000..ef6730876d71
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/fs-uae-3.1.35
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/zip sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 media-libs/libpng:0= media-libs/libsdl2[opengl,X] media-libs/openal sys-libs/zlib virtual/opengl x11-libs/libdrm x11-libs/libX11 fmv? ( media-libs/libmpeg2 ) glew? ( media-libs/glew:0= ) x11-base/xorg-proto
+DESCRIPTION=Integrates the most accurate Amiga emulation code available from WinUAE
+EAPI=8
+HOMEPAGE=https://fs-uae.net/
+IUSE=fmv glew
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 media-libs/libpng:0= media-libs/libsdl2[opengl,X] media-libs/openal sys-libs/zlib virtual/opengl x11-libs/libdrm x11-libs/libX11 fmv? ( media-libs/libmpeg2 ) glew? ( media-libs/glew:0= )
+SLOT=0
+SRC_URI=https://fs-uae.net/stable/3.1.35/fs-uae-3.1.35.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0671f705337f336543d4f39f00fd9184
diff --git a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5 b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5
index c701b8108991..708c2a782d29 100644
--- a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5
+++ b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.5
@@ -9,7 +9,8 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=app-emulation/fs-uae python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-),declarative,gui,network,opengl,widgets] dev-python/pyopengl[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] lha? ( dev-python/python-lhafile[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-),declarative,gui,network,opengl,widgets] dev-python/pyopengl[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] lha? ( dev-python/python-lhafile[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
 SLOT=0
 SRC_URI=https://fs-uae.net/stable/3.0.5/fs-uae-launcher-3.0.5.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=55e7c239b87d625ba822895cc6e96907
+_md5_=1ce0cf3f1fd77a7b6e619f2482e9cd67
diff --git a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.1.26 b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.1.26
new file mode 100644
index 000000000000..566833993719
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.1.26
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DESCRIPTION=PyQt5-based launcher for FS-UAE
+EAPI=8
+HOMEPAGE=https://fs-uae.net/
+IUSE=lha python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=app-emulation/fs-uae python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-),declarative,gui,network,opengl,widgets] dev-python/pyopengl[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] lha? ( dev-python/python-lhafile[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-),declarative,gui,network,opengl,widgets] dev-python/pyopengl[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] lha? ( dev-python/python-lhafile[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/FrodeSolheim/fs-uae-launcher/archive/refs/tags/v3.1.26.tar.gz -> fs-uae-launcher-3.1.26.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5f62c5ce293cb02300b2805060cdae08
diff --git a/metadata/md5-cache/app-emulation/grub-xen-host-1.0-r1 b/metadata/md5-cache/app-emulation/grub-xen-host-1.0-r1
new file mode 100644
index 000000000000..1f395babde64
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/grub-xen-host-1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=sys-boot/grub:2=[grub_platforms_xen] pvh? ( >=sys-boot/grub-2.04:2=[grub_platforms_xen-pvh] ) app-emulation/xen-tools:=
+DESCRIPTION=Grub2 built as a PV grub per the Xen PV Boot Protocol
+EAPI=7
+HOMEPAGE=https://blog.xenproject.org/2015/01/07/using-grub-2-as-a-bootloader-for-xen-pv-guests/
+IUSE=pvh
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=sys-boot/grub:2=[grub_platforms_xen] pvh? ( >=sys-boot/grub-2.04:2=[grub_platforms_xen-pvh] ) app-emulation/xen-tools:=
+RESTRICT=binchecks strip test
+SLOT=0
+_md5_=1711cbc0581d74271156540b7b410a22
diff --git a/metadata/md5-cache/app-emulation/guestfs-tools-1.46.1-r1 b/metadata/md5-cache/app-emulation/guestfs-tools-1.46.1-r1
index bd62e8c6646d..2cbac315f24d 100644
--- a/metadata/md5-cache/app-emulation/guestfs-tools-1.46.1-r1
+++ b/metadata/md5-cache/app-emulation/guestfs-tools-1.46.1-r1
@@ -10,5 +10,5 @@ RDEPEND=!<app-emulation/libguestfs-1.46.0-r1 app-arch/cpio app-arch/lzma app-arc
 RESTRICT=!test? ( test )
 SLOT=0/1.46
 SRC_URI=https://download.libguestfs.org/guestfs-tools/1.46-stable/guestfs-tools-1.46.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	perl-functions	fea344a91ebf37efadf172c6a3de5a72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cd2c61ff146009b5198b2bff163583e4
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r104 b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r104
index 0f0305378f21..52b3a12c59c2 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r104
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r104
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test )
 SLOT=0/1.38
 SRC_URI=https://libguestfs.org/download/1.38-stable/libguestfs-1.38.6.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5d63ef1b71c9ebeec3a08c87b7391904
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.44.1-r1 b/metadata/md5-cache/app-emulation/libguestfs-1.44.1-r1
index 387ce1954c2a..24caa8defb8f 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.44.1-r1
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.44.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test )
 SLOT=0/1.44
 SRC_URI=https://libguestfs.org/download/1.44-stable/libguestfs-1.44.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e96b5ade953dd5a478d705c393fbd0ac
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.46.0-r1 b/metadata/md5-cache/app-emulation/libguestfs-1.46.0-r1
index 84ce8dcec589..64b90f4177f8 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.46.0-r1
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.46.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test )
 SLOT=0/1.46
 SRC_URI=https://libguestfs.org/download/1.46-stable/libguestfs-1.46.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b683cb9d68798b5453f6b80ba6067736
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.0.0-r3 b/metadata/md5-cache/app-emulation/libvirt-7.0.0-r3
index d745365f0f49..59d3999af158 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.0.0-r3
+++ b/metadata/md5-cache/app-emulation/libvirt-7.0.0-r3
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.0.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.0.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.0.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bab91bb21cd9165b3c0af2e41e0b11b3
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.1.0-r1 b/metadata/md5-cache/app-emulation/libvirt-7.1.0-r1
index 38d6ede193aa..2e89f90663bb 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.1.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-7.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.1.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.1.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.1.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=a37f83bbab3fccfd2310b87e35c7e0d6
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.2.0-r1 b/metadata/md5-cache/app-emulation/libvirt-7.2.0-r1
index e844b3279be1..a4fafa8e7915 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.2.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-7.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.2.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.2.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.2.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=95724c01bac1835f9da25ccc301571c6
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.3.0 b/metadata/md5-cache/app-emulation/libvirt-7.3.0
index 0f41fbb9c144..109205a9a72f 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.3.0
+++ b/metadata/md5-cache/app-emulation/libvirt-7.3.0
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.3.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.3.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.3.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=9f260bc7cd1a11de335e876ad28a6b5c
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.4.0 b/metadata/md5-cache/app-emulation/libvirt-7.4.0
index 9f73f98f52d7..1195d34572e5 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.4.0
+++ b/metadata/md5-cache/app-emulation/libvirt-7.4.0
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.4.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.4.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.4.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=2dee8c302c614f8a63cd96c93cdcb6f5
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.5.0 b/metadata/md5-cache/app-emulation/libvirt-7.5.0
index d74c6ca225c7..da5ce79919be 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.5.0
+++ b/metadata/md5-cache/app-emulation/libvirt-7.5.0
@@ -11,5 +11,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.5.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.5.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.5.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=2a80c2e5df614abf6e8c62d0fb7fd62c
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.7.0 b/metadata/md5-cache/app-emulation/libvirt-7.7.0
index e341a4b624ab..7ab4f9c30817 100644
--- a/metadata/md5-cache/app-emulation/libvirt-7.7.0
+++ b/metadata/md5-cache/app-emulation/libvirt-7.7.0
@@ -5,11 +5,11 @@ DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=7
 HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
 IUSE=apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs kernel_linux verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6,script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) virtual/tmpfiles
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/7.7.0
 SRC_URI=https://libvirt.org/sources/libvirt-7.7.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.7.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=2a80c2e5df614abf6e8c62d0fb7fd62c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=456e8a7ca64ebea158b418fc12aa96c8
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.8.0 b/metadata/md5-cache/app-emulation/libvirt-7.8.0
new file mode 100644
index 000000000000..cb04eda1a506
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libvirt-7.8.0
@@ -0,0 +1,15 @@
+BDEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( app-crypt/openpgp-keys-libvirt ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( app-crypt/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6,script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.9 dev-lang/python:3.8 )
+DESCRIPTION=C toolkit to manipulate virtual machines
+EAPI=7
+HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
+IUSE=apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs kernel_linux verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6,script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) virtual/tmpfiles
+REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
+SLOT=0/7.8.0
+SRC_URI=https://libvirt.org/sources/libvirt-7.8.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.8.0.tar.xz.asc )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=cb93bd7b7c430887e2265d41eaa4cde0
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index f7bfb20065b6..9d53c30ae51b 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6,script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) virtual/tmpfiles
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=2a80c2e5df614abf6e8c62d0fb7fd62c
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=cb93bd7b7c430887e2265d41eaa4cde0
diff --git a/metadata/md5-cache/app-emulation/lxc-4.0.10 b/metadata/md5-cache/app-emulation/lxc-4.0.10
index 1c6713d6984f..92d5f3787017 100644
--- a/metadata/md5-cache/app-emulation/lxc-4.0.10
+++ b/metadata/md5-cache/app-emulation/lxc-4.0.10
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=acct-group/lxc acct-user/lxc app-misc/pax-utils sys-apps/util-linux sys-libs/libcap virtual/awk caps? ( sys-libs/libcap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-4.0.10.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/lxc-4.0.10.tar.gz.asc )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pam	41ce39f668e11d31ff4734f3b5794f7d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pam	41ce39f668e11d31ff4734f3b5794f7d	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=270e8a29c590a1cabc3d63b876d3bd15
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.7 b/metadata/md5-cache/app-emulation/lxd-4.0.7
index 7adf6dbeb873..488565d81757 100644
--- a/metadata/md5-cache/app-emulation/lxd-4.0.7
+++ b/metadata/md5-cache/app-emulation/lxd-4.0.7
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft[lz4] >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6?] acct-group/lxd net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:* sys-fs/lxcfs sys-fs/squashfs-tools[lzma] virtual/acl
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.7.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.7.tar.gz.asc )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
 _md5_=2f7bc32ecd6a9c0ebdce259a707bf4e1
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.7-r1 b/metadata/md5-cache/app-emulation/lxd-4.0.7-r1
deleted file mode 100644
index 4444b1355925..000000000000
--- a/metadata/md5-cache/app-emulation/lxd-4.0.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-lang/go nls? ( sys-devel/gettext ) verify-sig? ( app-crypt/openpgp-keys-linuxcontainers ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft[lz4] >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6?]
-DESCRIPTION=Fast, dense and secure container management
-EAPI=7
-HOMEPAGE=https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd
-IUSE=apparmor ipv6 nls verify-sig kernel_linux verify-sig
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft[lz4] >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6?] acct-group/lxd net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:* sys-fs/lxcfs sys-fs/squashfs-tools[lzma] virtual/acl
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.7.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.7.tar.gz.asc )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=9fe7263a648f1214c079095036fe39c3
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.7-r2 b/metadata/md5-cache/app-emulation/lxd-4.0.7-r2
new file mode 100644
index 000000000000..7c9636fa5e56
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxd-4.0.7-r2
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/go nls? ( sys-devel/gettext ) verify-sig? ( app-crypt/openpgp-keys-linuxcontainers ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=acct-group/lxd app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft[lz4] >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6?]
+DESCRIPTION=Fast, dense and secure container management
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd
+IUSE=apparmor ipv6 nls verify-sig kernel_linux verify-sig
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=acct-group/lxd app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] dev-libs/dqlite dev-libs/lzo dev-libs/raft[lz4] >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6?] net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:* sys-fs/lxcfs sys-fs/squashfs-tools[lzma] virtual/acl
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.7.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.7.tar.gz.asc )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=4ca5fb86dee044e5441d586fb2fad95b
diff --git a/metadata/md5-cache/app-emulation/nemu-2.5.0-r1 b/metadata/md5-cache/app-emulation/nemu-2.5.0-r1
index 4a86b76d4ecb..ff3c3fa73a41 100644
--- a/metadata/md5-cache/app-emulation/nemu-2.5.0-r1
+++ b/metadata/md5-cache/app-emulation/nemu-2.5.0-r1
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=app-emulation/qemu[vnc,virtfs,spice?] dev-db/sqlite:3= sys-libs/ncurses:=[unicode(+)] virtual/libusb:1 virtual/libudev:= dbus? ( sys-apps/dbus ) network-map? ( media-gfx/graphviz[svg] ) ovf? ( dev-libs/libxml2:2 app-arch/libarchive:= ) spice? ( app-emulation/virt-viewer ) vnc-client? ( net-misc/tigervnc )
 SLOT=0
 SRC_URI=https://github.com/nemuTUI/nemu/archive/v2.5.0.tar.gz -> nemu-2.5.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0abf9eaecddd24633249bcbde550c056
diff --git a/metadata/md5-cache/app-emulation/nerdctl-0.11.1 b/metadata/md5-cache/app-emulation/nerdctl-0.11.1
new file mode 100644
index 000000000000..4539678c2ae0
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/nerdctl-0.11.1
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Docker-compatible CLI for containerd, with support for Compose
+EAPI=7
+HOMEPAGE=https://github.com/containerd/nerdctl
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/containerd/nerdctl/archive/refs/tags/v0.11.1.tar.gz -> nerdctl-0.11.1.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!ada!logics/go-fuzz-headers/@v/v0.0.0-20210715213245-6c3934b029d8.mod -> github.com%2F!ada!logics%2Fgo-fuzz-headers%2F@v%2Fv0.0.0-20210715213245-6c3934b029d8.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.2.1+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.8.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.12.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.12.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210211115548-6eac466e5fa3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210324224401-5516f17a5958.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210324224401-5516f17a5958.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.5.0.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.5.0.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.16.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.16.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.18.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.18.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.18.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.18.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.mod -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.mod -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod mirror://goproxy//github.com/antihax/optional/@v/v1.0.0.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.34.9.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.9.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.mod -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/bits-and-blooms/bitset/@v/v1.2.0.zip -> github.com%2Fbits-and-blooms%2Fbitset%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/bits-and-blooms/bitset/@v/v1.2.0.mod -> github.com%2Fbits-and-blooms%2Fbitset%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v1.0.0.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.mod mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.mod -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.mod -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.mod -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v5/@v/v5.0.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.2.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.4.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.6.2.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/cncf/xds/go/@v/v0.0.0-20210312221358-fbca930ec8ed.mod -> github.com%2Fcncf%2Fxds%2Fgo%2F@v%2Fv0.0.0-20210312221358-fbca930ec8ed.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/compose-spec/compose-go/@v/v0.0.0-20210716132856-efad24e892ce.zip -> github.com%2Fcompose-spec%2Fcompose-go%2F@v%2Fv0.0.0-20210716132856-efad24e892ce.zip mirror://goproxy//github.com/compose-spec/compose-go/@v/v0.0.0-20210716132856-efad24e892ce.mod -> github.com%2Fcompose-spec%2Fcompose-go%2F@v%2Fv0.0.0-20210716132856-efad24e892ce.mod mirror://goproxy//github.com/containerd/aufs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/btrfs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20210114181951-8a68de567b68.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20210114181951-8a68de567b68.mod mirror://goproxy//github.com/containerd/cgroups/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/cgroups/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.3.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/containerd/console/@v/v1.0.3.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.1-0.20210802172229-7d4891783aac.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.1-0.20210802172229-7d4891783aac.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.5.1-0.20210802172229-7d4891783aac.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.1-0.20210802172229-7d4891783aac.mod mirror://goproxy//github.com/containerd/containerd/api/@v/v0.0.0-20210802172229-7d4891783aac.zip -> github.com%2Fcontainerd%2Fcontainerd%2Fapi%2F@v%2Fv0.0.0-20210802172229-7d4891783aac.zip mirror://goproxy//github.com/containerd/containerd/api/@v/v0.0.0-20210802172229-7d4891783aac.mod -> github.com%2Fcontainerd%2Fcontainerd%2Fapi%2F@v%2Fv0.0.0-20210802172229-7d4891783aac.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20210208174643-50096c924a4e.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20210208174643-50096c924a4e.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.1.0.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.1.0.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/containerd/fifo/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/fifo/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.3-0.20210427061315-4efee5f0b4db.zip -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.3-0.20210427061315-4efee5f0b4db.zip mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.3-0.20210427061315-4efee5f0b4db.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.3-0.20210427061315-4efee5f0b4db.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20201020171139-16b287bc67d0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20201020171139-16b287bc67d0.mod mirror://goproxy//github.com/containerd/go-runc/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1.zip -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/containerd/nri/@v/v0.1.0.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/containerd/stargz-snapshotter/@v/v0.7.0.zip -> github.com%2Fcontainerd%2Fstargz-snapshotter%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/containerd/stargz-snapshotter/@v/v0.7.0.mod -> github.com%2Fcontainerd%2Fstargz-snapshotter%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/containerd/stargz-snapshotter/estargz/@v/v0.7.0.zip -> github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/containerd/stargz-snapshotter/estargz/@v/v0.7.0.mod -> github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/zfs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.1.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.9.1.zip -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/containernetworking/plugins/@v/v0.9.1.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.1.zip -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.5.0.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.2.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.2.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.3.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.3.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.mod -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.mod -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.mod -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.mod -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod mirror://goproxy//github.com/danieljoos/wincred/@v/v1.1.0.mod -> github.com%2Fdanieljoos%2Fwincred%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20190125010748-a747050bb1ba.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20170104182250-a601269ab70c.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/distribution/distribution/v3/@v/v3.0.0-20210316161203-a01c71e2477e.zip -> github.com%2Fdistribution%2Fdistribution%2Fv3%2F@v%2Fv3.0.0-20210316161203-a01c71e2477e.zip mirror://goproxy//github.com/distribution/distribution/v3/@v/v3.0.0-20210316161203-a01c71e2477e.mod -> github.com%2Fdistribution%2Fdistribution%2Fv3%2F@v%2Fv3.0.0-20210316161203-a01c71e2477e.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/cli/@v/v20.10.7+incompatible.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.7+incompatible.mod mirror://goproxy//github.com/docker/cli/@v/v20.10.8+incompatible.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.8+incompatible.zip mirror://goproxy//github.com/docker/cli/@v/v20.10.8+incompatible.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.8+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v20.10.7+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.7+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v20.10.8+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.8+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v20.10.8+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.8+incompatible.mod mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.4.zip -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.4.zip mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.4.mod -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.4.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.zip -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.zip mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.zip -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.zip mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210217033140-668b12f5399d.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210512163311-63b5d3c536b0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210512163311-63b5d3c536b0.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod mirror://goproxy//github.com/fanliao/go-promise/@v/v0.0.0-20141029170127-1890db352a72.mod -> github.com%2Ffanliao%2Fgo-promise%2F@v%2Fv0.0.0-20141029170127-1890db352a72.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.12.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.12.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.12.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/felixge/httpsnoop/@v/v1.0.1.mod -> github.com%2Ffelixge%2Fhttpsnoop%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/log/@v/v0.1.0.mod -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.8.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.zip -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.3.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.3.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/gomodule/redigo/@v/v1.8.2.mod -> github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.8.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.3.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.3.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/handlers/@v/v1.5.1.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.16.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.mod mirror://goproxy//github.com/hanwen/go-fuse/@v/v1.0.0.mod -> github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hanwen/go-fuse/v2/@v/v2.1.0.mod -> github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hugelgupf/socketpair/@v/v0.0.0-20190730060125-05d35a94e714.mod -> github.com%2Fhugelgupf%2Fsocketpair%2F@v%2Fv0.0.0-20190730060125-05d35a94e714.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.12.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.12.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.12.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.12.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/insomniacslk/dhcp/@v/v0.0.0-20210120172423-cc9239ac6294.mod -> github.com%2Finsomniacslk%2Fdhcp%2F@v%2Fv0.0.0-20210120172423-cc9239ac6294.mod mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.mod -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.zip -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201009170750-9c6f07d100c1.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201110080708-d2c240429e6c.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201110080708-d2c240429e6c.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.13.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.13.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.12.3.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.3.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.12.3.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.3.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/marstr/guid/@v/v1.1.0.mod -> github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.13.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.13.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.13.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.12.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.12.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.12.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.12.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/mdlayher/ethernet/@v/v0.0.0-20190606142754-0394541c37b7.mod -> github.com%2Fmdlayher%2Fethernet%2F@v%2Fv0.0.0-20190606142754-0394541c37b7.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mdlayher/raw/@v/v0.0.0-20190606142536-fef19f00fc18.mod -> github.com%2Fmdlayher%2Fraw%2F@v%2Fv0.0.0-20190606142536-fef19f00fc18.mod mirror://goproxy//github.com/mdlayher/raw/@v/v0.0.0-20191009151244-50f2db8cc065.mod -> github.com%2Fmdlayher%2Fraw%2F@v%2Fv0.0.0-20191009151244-50f2db8cc065.mod mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.zip -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.mod -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.mod -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod mirror://goproxy//github.com/moby/locker/@v/v1.0.1.zip -> github.com%2Fmoby%2Flocker%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/moby/locker/@v/v1.0.1.mod -> github.com%2Fmoby%2Flocker%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/spdystream/@v/v0.2.0.mod -> github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/moby/sys/signal/@v/v0.5.1-0.20210723232958-8a51b5cc8879.zip -> github.com%2Fmoby%2Fsys%2Fsignal%2F@v%2Fv0.5.1-0.20210723232958-8a51b5cc8879.zip mirror://goproxy//github.com/moby/sys/signal/@v/v0.5.1-0.20210723232958-8a51b5cc8879.mod -> github.com%2Fmoby%2Fsys%2Fsignal%2F@v%2Fv0.5.1-0.20210723232958-8a51b5cc8879.mod mirror://goproxy//github.com/moby/sys/symlink/@v/v0.1.0.mod -> github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.mod mirror://goproxy//github.com/moby/vpnkit/@v/v0.5.0.mod -> github.com%2Fmoby%2Fvpnkit%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200929063507-e6143ca7d51d.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210326190908-1c3f411f0417.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210326190908-1c3f411f0417.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.2.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.2.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.2.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.2.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.1.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.3.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.3.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.14.5.zip -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.5.zip mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.14.5.mod -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.5.mod mirror://goproxy//github.com/rs/xid/@v/v1.3.0.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/songgao/water/@v/v0.0.0-20200317203138-2b4b6d7c09d8.mod -> github.com%2Fsonggao%2Fwater%2F@v%2Fv0.0.0-20200317203138-2b4b6d7c09d8.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stefanberger/go-pkcs11uri/@v/v0.0.0-20201008174630-78d3cae3a980.zip -> github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.zip mirror://goproxy//github.com/stefanberger/go-pkcs11uri/@v/v0.0.0-20201008174630-78d3cae3a980.mod -> github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/tidwall/gjson/@v/v1.8.1.zip -> github.com%2Ftidwall%2Fgjson%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/tidwall/gjson/@v/v1.8.1.mod -> github.com%2Ftidwall%2Fgjson%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/tidwall/match/@v/v1.0.3.zip -> github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/tidwall/match/@v/v1.0.3.mod -> github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.1.0.zip -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/tidwall/pretty/@v/v1.1.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/u-root/u-root/@v/v7.0.0+incompatible.mod -> github.com%2Fu-root%2Fu-root%2F@v%2Fv7.0.0+incompatible.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.1-0.20201029203352-d40f9887b852.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.1-0.20201029203352-d40f9887b852.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.zip -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.zip mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.zip -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v1.2.0.zip -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v1.2.0.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.mod -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.mod -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.mod -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.zip -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.zip mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.mod -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opentelemetry.io/proto/otlp/@v/v0.7.0.mod -> go.opentelemetry.io%2Fproto%2Fotlp%2F@v%2Fv0.7.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200128174031-69ecbb4d6d5d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190419010253-1f3472d942ba.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190419010253-1f3472d942ba.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191007182048-72f939374954.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201006153459-a7d1128ccaa0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201006153459-a7d1128ccaa0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201010224723-4f7140c49acb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210224082022-3d97a244fca7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210224082022-3d97a244fca7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190411185658-b44545bcd369.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190418153312-f0ce4c0180be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190418153312-f0ce4c0180be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606122018-79a91cf218c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606122018-79a91cf218c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191115151921-52ab43148777.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200217220822-9197077df867.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200217220822-9197077df867.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200909081042-eff7692f9009.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200916030750-2334cc1a136f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916030750-2334cc1a136f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200922070232-aee5d888a860.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200922070232-aee5d888a860.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201009025420-dfb3f7c4e634.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201101102859-da207088b7d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201101102859-da207088b7d1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201117170446-d9b008d0a637.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201117170446-d9b008d0a637.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210324051608-47abb6519492.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426230700-d19ff857e887.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210603081109-ebe580a85c40.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210220033141-f8bda1e9f3ba.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20160322025152-9bf6e6e569ff.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/cloud/@v/v0.0.0-20151119220103-975617b05ea8.mod -> google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200117163144-32f20d992d24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200513103714-09dca8ec2884.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201110150050-8816d57aaa9a.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201110150050-8816d57aaa9a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.mod mirror://goproxy//google.golang.org/grpc/@v/v0.0.0-20160317175043-d3ddb4469d5a.mod -> google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.38.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.39.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.39.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.39.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.39.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20141024133853-64131543e789.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//k8s.io/api/@v/v0.20.6.mod -> k8s.io%2Fapi%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/api/@v/v0.21.2.mod -> k8s.io%2Fapi%2F@v%2Fv0.21.2.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.20.6.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.21.2.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.21.2.mod mirror://goproxy//k8s.io/apiserver/@v/v0.20.6.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/client-go/@v/v0.20.6.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/client-go/@v/v0.21.2.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.21.2.mod mirror://goproxy//k8s.io/component-base/@v/v0.20.6.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/cri-api/@v/v0.20.6.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.20.6.mod mirror://goproxy//k8s.io/cri-api/@v/v0.21.2.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.21.2.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.8.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.8.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20210305001622-591a79e4bda7.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210305001622-591a79e4bda7.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.15.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.3.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.3.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61
+_md5_=2cc13b43e50c63f6d30eec61595dbca5
diff --git a/metadata/md5-cache/app-emulation/open-vm-tools-11.2.5_p17337674-r3 b/metadata/md5-cache/app-emulation/open-vm-tools-11.2.5_p17337674-r3
index b3dd095d47ac..898016315013 100644
--- a/metadata/md5-cache/app-emulation/open-vm-tools-11.2.5_p17337674-r3
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-11.2.5_p17337674-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse?
 REQUIRED_USE=multimon? ( X ) vgauth? ( ssl )
 SLOT=0
 SRC_URI=https://github.com/vmware/open-vm-tools/releases/download/stable-11.2.5/open-vm-tools-11.2.5-17337674.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bb5e321d63e7d9b2e997d0e9541b93fb
diff --git a/metadata/md5-cache/app-emulation/open-vm-tools-11.3.5_p18557794 b/metadata/md5-cache/app-emulation/open-vm-tools-11.3.5_p18557794
index c483b8b20fe1..21d6d853ad07 100644
--- a/metadata/md5-cache/app-emulation/open-vm-tools-11.3.5_p18557794
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-11.3.5_p18557794
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse?
 REQUIRED_USE=multimon? ( X ) vgauth? ( ssl )
 SLOT=0
 SRC_URI=https://github.com/vmware/open-vm-tools/releases/download/stable-11.3.5/open-vm-tools-11.3.5-18557794.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=763bc09b66f068c52c3c31ac5f57779c
diff --git a/metadata/md5-cache/app-emulation/podman-3.4.0 b/metadata/md5-cache/app-emulation/podman-3.4.0
new file mode 100644
index 000000000000..46f98d97207b
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/podman-3.4.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst preinst prepare unpack
+DEPEND=app-crypt/gpgme:= >=app-emulation/conmon-2.0.0 || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= >=net-misc/cni-plugins-0.8.6 sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) rootless? ( app-emulation/slirp4netns ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man
+DESCRIPTION=Library and podman tool for running OCI-based containers in Pods
+EAPI=7
+HOMEPAGE=https://github.com/containers/podman/
+IUSE=apparmor btrfs +fuse +rootless selinux
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
+RDEPEND=app-crypt/gpgme:= >=app-emulation/conmon-2.0.0 || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= >=net-misc/cni-plugins-0.8.6 sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) rootless? ( app-emulation/slirp4netns ) selinux? ( sys-libs/libselinux:= ) fuse? ( sys-fs/fuse-overlayfs ) virtual/tmpfiles
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/containers/podman/archive/v3.4.0.tar.gz -> podman-3.4.0.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b4b183e8724eb39960d90a092ddabfa8
diff --git a/metadata/md5-cache/app-emulation/qemu-6.0.0-r3 b/metadata/md5-cache/app-emulation/qemu-6.0.0-r3
index 973d85df64d5..fcd3edfd6066 100644
--- a/metadata/md5-cache/app-emulation/qemu-6.0.0-r3
+++ b/metadata/md5-cache/app-emulation/qemu-6.0.0-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-6.0.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c7bac10cd63e9d1617f1efab78305831
diff --git a/metadata/md5-cache/app-emulation/qemu-6.0.0-r53 b/metadata/md5-cache/app-emulation/qemu-6.0.0-r53
index 35ddc9c0ebc1..4a6c81c862f6 100644
--- a/metadata/md5-cache/app-emulation/qemu-6.0.0-r53
+++ b/metadata/md5-cache/app-emulation/qemu-6.0.0-r53
@@ -5,12 +5,12 @@ DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=7
 HOMEPAGE=https://www.qemu.org https://www.linux-kvm.org
 IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus kernel_linux python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +filecaps
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-6.0.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c685fb20b7e83909ccc94849c65746df
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=29e516cda05be68b5b3bf6e47c863c30
diff --git a/metadata/md5-cache/app-emulation/qemu-6.1.0 b/metadata/md5-cache/app-emulation/qemu-6.1.0
index 1f57668d9246..ad1b6e8822b2 100644
--- a/metadata/md5-cache/app-emulation/qemu-6.1.0
+++ b/metadata/md5-cache/app-emulation/qemu-6.1.0
@@ -1,16 +1,16 @@
 BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) dev-lang/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
 DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
+DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=7
 HOMEPAGE=https://www.qemu.org https://www.linux-kvm.org
-IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus kernel_linux python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +filecaps
+IUSE=accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus kernel_linux python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +filecaps
 KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
+RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bpf? ( dev-libs/libbpf:= ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) fuse? ( >=sys-fs/fuse-3.1:3 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] sys-libs/ncurses:= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev:= ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202105[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( >=sys-firmware/edk2-ovmf-202105 sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-6.1.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ca3b4b9f073fb08e07f13b346f7e20bd
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=946c10054cd0c67dd3bca842f56e0b23
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index c9023616bda3..58ba323d9289 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -11,5 +11,5 @@ RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) sdl-image? ( sdl ) static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2c919fbcf250f4c2ea36b8c31f3be104
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.2 b/metadata/md5-cache/app-emulation/runc-1.0.2
index 9dbc3102269a..90f5ca2f1e14 100644
--- a/metadata/md5-cache/app-emulation/runc-1.0.2
+++ b/metadata/md5-cache/app-emulation/runc-1.0.2
@@ -11,5 +11,5 @@ RDEPEND=seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc apparmor? (
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/opencontainers/runc/archive/v1.0.2.tar.gz -> runc-1.0.2.tar.gz
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a892b4ce55acce83d531cba83eb3f988
diff --git a/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181012-r1 b/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181012-r1
index aee437733433..28347a5690c8 100644
--- a/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181012-r1
+++ b/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181012-r1
@@ -9,5 +9,5 @@ RDEPEND=acct-group/simplevirt virtual/logger app-emulation/qemu
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/rafaelmartins/simplevirt/archive/78d29d8fa11ce72af5f897430af7bb7d2947a32f.tar.gz -> simplevirt-0.0_p20181012.tar.gz https://github.com/inconshreveable/mousetrap/archive/v1.0.0.tar.gz -> github.com-inconshreveable-mousetrap-v1.0.0.tar.gz https://github.com/spf13/cobra/archive/v0.0.3.tar.gz -> github.com-spf13-cobra-v0.0.3.tar.gz https://github.com/spf13/pflag/archive/v1.0.2.tar.gz -> github.com-spf13-pflag-v1.0.2.tar.gz https://github.com/go-check/check/archive/20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz -> github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz https://github.com/go-yaml/yaml/archive/v2.2.1.tar.gz -> github.com-go-yaml-yaml-v2.2.1.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ee98df2c8a27c4347826db72f6dc2d50	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ee98df2c8a27c4347826db72f6dc2d50	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a89a4cccd8e0a48965afbdf7523328aa
diff --git a/metadata/md5-cache/app-emulation/simplevirt-0.1 b/metadata/md5-cache/app-emulation/simplevirt-0.1
index f0c39e89b46f..409c6cdc5c4e 100644
--- a/metadata/md5-cache/app-emulation/simplevirt-0.1
+++ b/metadata/md5-cache/app-emulation/simplevirt-0.1
@@ -9,5 +9,5 @@ RDEPEND=acct-group/simplevirt virtual/logger app-emulation/qemu
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/rafaelmartins/simplevirt/archive/v0.1.tar.gz -> simplevirt-0.1.tar.gz mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.2.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.2.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b0509db121ab0ed03cb40a2c1e47c68e
diff --git a/metadata/md5-cache/app-emulation/slirp4netns-1.1.12 b/metadata/md5-cache/app-emulation/slirp4netns-1.1.12
new file mode 100644
index 000000000000..e6be69ccc0c4
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/slirp4netns-1.1.12
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=postinst prepare
+DEPEND=dev-libs/glib:2= dev-libs/libpcre:= net-libs/libslirp:= sys-libs/libseccomp:= sys-libs/libcap:= virtual/pkgconfig
+DESCRIPTION=User-mode networking for unprivileged network namespaces
+EAPI=7
+HOMEPAGE=https://github.com/rootless-containers/slirp4netns
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2= dev-libs/libpcre:= net-libs/libslirp:= sys-libs/libseccomp:= sys-libs/libcap:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rootless-containers/slirp4netns/archive/v1.1.12.tar.gz -> slirp4netns-1.1.12.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=57d79ed108d7233cd973a6a4ab3a2c4b
diff --git a/metadata/md5-cache/app-emulation/slirp4netns-1.1.8 b/metadata/md5-cache/app-emulation/slirp4netns-1.1.8
deleted file mode 100644
index 5b12093ca87b..000000000000
--- a/metadata/md5-cache/app-emulation/slirp4netns-1.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=postinst prepare
-DEPEND=dev-libs/glib:2= dev-libs/libpcre:= net-libs/libslirp:= sys-libs/libseccomp:= sys-libs/libcap:= virtual/pkgconfig
-DESCRIPTION=User-mode networking for unprivileged network namespaces
-EAPI=7
-HOMEPAGE=https://github.com/rootless-containers/slirp4netns
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2= dev-libs/libpcre:= net-libs/libslirp:= sys-libs/libseccomp:= sys-libs/libcap:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rootless-containers/slirp4netns/archive/v1.1.8.tar.gz -> slirp4netns-1.1.8.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=63813063a6576aea4641c9bfcf50eb4c
diff --git a/metadata/md5-cache/app-emulation/snapd-2.52 b/metadata/md5-cache/app-emulation/snapd-2.52
index 2c8d06ae04a4..63706c845d8a 100644
--- a/metadata/md5-cache/app-emulation/snapd-2.52
+++ b/metadata/md5-cache/app-emulation/snapd-2.52
@@ -13,5 +13,5 @@ REQUIRED_USE=!forced-devmode? ( apparmor cgroup-hybrid ) systemd
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/snapcore/snapd/releases/download/2.52/snapd_2.52.vendor.tar.xz -> snapd-2.52.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ee98df2c8a27c4347826db72f6dc2d50	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ee98df2c8a27c4347826db72f6dc2d50	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=74067ca897f2a642f386674c1fcadf80
diff --git a/metadata/md5-cache/app-emulation/snapd-2.52.1 b/metadata/md5-cache/app-emulation/snapd-2.52.1
index 4a89cfbaf6cf..b3c384d5bf72 100644
--- a/metadata/md5-cache/app-emulation/snapd-2.52.1
+++ b/metadata/md5-cache/app-emulation/snapd-2.52.1
@@ -13,5 +13,5 @@ REQUIRED_USE=!forced-devmode? ( apparmor cgroup-hybrid ) systemd
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/snapcore/snapd/releases/download/2.52.1/snapd_2.52.1.vendor.tar.xz -> snapd-2.52.1.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ee98df2c8a27c4347826db72f6dc2d50	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ee98df2c8a27c4347826db72f6dc2d50	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=74067ca897f2a642f386674c1fcadf80
diff --git a/metadata/md5-cache/app-emulation/spice-vdagent-0.19.0-r1 b/metadata/md5-cache/app-emulation/spice-vdagent-0.19.0-r1
index 7ca813e957a8..3daeb1a0e2bb 100644
--- a/metadata/md5-cache/app-emulation/spice-vdagent-0.19.0-r1
+++ b/metadata/md5-cache/app-emulation/spice-vdagent-0.19.0-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 >=app-emulation/spice-protocol-0.14.0 media-libs/alsa-lib >=x11-libs/libpciaccess-0.10 x11-libs/libdrm x11-libs/libXfixes x11-libs/libXrandr x11-libs/libX11 x11-libs/libXinerama gtk? ( x11-libs/gtk+:3 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-vdagent )
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/releases/spice-vdagent-0.19.0.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b82d43105c4694cc4801a1a05683bfd6
diff --git a/metadata/md5-cache/app-emulation/spice-vdagent-0.21.0 b/metadata/md5-cache/app-emulation/spice-vdagent-0.21.0
index dc8fda98325d..d6c81a52d5a0 100644
--- a/metadata/md5-cache/app-emulation/spice-vdagent-0.21.0
+++ b/metadata/md5-cache/app-emulation/spice-vdagent-0.21.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 >=app-emulation/spice-protocol-0.14.0 media-libs/alsa-lib >=x11-libs/libpciaccess-0.10 x11-libs/libdrm x11-libs/libXfixes x11-libs/libXrandr x11-libs/libX11 x11-libs/libXinerama gtk? ( x11-libs/gtk+:3 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-vdagent ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/releases/spice-vdagent-0.21.0.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d2348534090904ee65036e08e5b46c7
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.2.18 b/metadata/md5-cache/app-emulation/vagrant-2.2.18
deleted file mode 100644
index ef03d6c08343..000000000000
--- a/metadata/md5-cache/app-emulation/vagrant-2.2.18
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/childprocess-4.0.0[ruby_targets_ruby26(-)] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby26(-)] dev-ruby/erubi[ruby_targets_ruby26(-)] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.8:1[ruby_targets_ruby26(-)] >=dev-ruby/listen-3.1[ruby_targets_ruby26(-)] <dev-ruby/log4r-1.1.11[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rubyzip-2.0[ruby_targets_ruby26(-)] >=dev-ruby/net-scp-3.0.0[ruby_targets_ruby26(-)] >=dev-ruby/net-sftp-3.0[ruby_targets_ruby26(-)] >=dev-ruby/net-ssh-6.1.0[ruby_targets_ruby26(-)] dev-ruby/rest-client:2[ruby_targets_ruby26(-)] >=dev-ruby/vagrant_cloud-3.0.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/childprocess-4.0.0[ruby_targets_ruby27(-)] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby27(-)] dev-ruby/erubi[ruby_targets_ruby27(-)] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.8:1[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.1[ruby_targets_ruby27(-)] <dev-ruby/log4r-1.1.11[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rubyzip-2.0[ruby_targets_ruby27(-)] >=dev-ruby/net-scp-3.0.0[ruby_targets_ruby27(-)] >=dev-ruby/net-sftp-3.0[ruby_targets_ruby27(-)] >=dev-ruby/net-ssh-6.1.0[ruby_targets_ruby27(-)] dev-ruby/rest-client:2[ruby_targets_ruby27(-)] >=dev-ruby/vagrant_cloud-3.0.5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( >=dev-ruby/rake-12.3.3[ruby_targets_ruby26(-)] test? ( dev-ruby/rspec[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] dev-ruby/webmock[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/rake-12.3.3[ruby_targets_ruby27(-)] test? ( dev-ruby/rspec[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A tool for building and distributing development environments
-EAPI=7
-HOMEPAGE=https://vagrantup.com/
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=app-arch/libarchive net-misc/curl ruby_targets_ruby26? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/childprocess-4.0.0[ruby_targets_ruby26(-)] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby26(-)] dev-ruby/erubi[ruby_targets_ruby26(-)] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.8:1[ruby_targets_ruby26(-)] >=dev-ruby/listen-3.1[ruby_targets_ruby26(-)] <dev-ruby/log4r-1.1.11[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rubyzip-2.0[ruby_targets_ruby26(-)] >=dev-ruby/net-scp-3.0.0[ruby_targets_ruby26(-)] >=dev-ruby/net-sftp-3.0[ruby_targets_ruby26(-)] >=dev-ruby/net-ssh-6.1.0[ruby_targets_ruby26(-)] dev-ruby/rest-client:2[ruby_targets_ruby26(-)] >=dev-ruby/vagrant_cloud-3.0.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/childprocess-4.0.0[ruby_targets_ruby27(-)] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby27(-)] dev-ruby/erubi[ruby_targets_ruby27(-)] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.8:1[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.1[ruby_targets_ruby27(-)] <dev-ruby/log4r-1.1.11[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rubyzip-2.0[ruby_targets_ruby27(-)] >=dev-ruby/net-scp-3.0.0[ruby_targets_ruby27(-)] >=dev-ruby/net-sftp-3.0[ruby_targets_ruby27(-)] >=dev-ruby/net-ssh-6.1.0[ruby_targets_ruby27(-)] dev-ruby/rest-client:2[ruby_targets_ruby27(-)] >=dev-ruby/vagrant_cloud-3.0.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.2.18.tar.gz -> vagrant-2.2.18.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3bf4915f6f7fab5d3a5b4ca37620cdd7
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.2.18-r1 b/metadata/md5-cache/app-emulation/vagrant-2.2.18-r1
new file mode 100644
index 000000000000..1ddf9d246e10
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/vagrant-2.2.18-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/childprocess-4.0.0[ruby_targets_ruby26(-)] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby26(-)] dev-ruby/erubi[ruby_targets_ruby26(-)] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.8:1[ruby_targets_ruby26(-)] >=dev-ruby/listen-3.1[ruby_targets_ruby26(-)] <dev-ruby/log4r-1.1.11[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rubyzip-2.0[ruby_targets_ruby26(-)] >=dev-ruby/net-scp-3.0.0[ruby_targets_ruby26(-)] >=dev-ruby/net-sftp-3.0[ruby_targets_ruby26(-)] >=dev-ruby/net-ssh-6.1.0[ruby_targets_ruby26(-)] dev-ruby/rest-client:2[ruby_targets_ruby26(-)] >=dev-ruby/vagrant_cloud-3.0.5[ruby_targets_ruby26(-)] >=dev-ruby/rexml-3.2.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/childprocess-4.0.0[ruby_targets_ruby27(-)] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby27(-)] dev-ruby/erubi[ruby_targets_ruby27(-)] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.8:1[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.1[ruby_targets_ruby27(-)] <dev-ruby/log4r-1.1.11[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rubyzip-2.0[ruby_targets_ruby27(-)] >=dev-ruby/net-scp-3.0.0[ruby_targets_ruby27(-)] >=dev-ruby/net-sftp-3.0[ruby_targets_ruby27(-)] >=dev-ruby/net-ssh-6.1.0[ruby_targets_ruby27(-)] dev-ruby/rest-client:2[ruby_targets_ruby27(-)] >=dev-ruby/vagrant_cloud-3.0.5[ruby_targets_ruby27(-)] >=dev-ruby/rexml-3.2.5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( >=dev-ruby/rake-12.3.3[ruby_targets_ruby26(-)] test? ( dev-ruby/rspec[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] dev-ruby/webmock[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/rake-12.3.3[ruby_targets_ruby27(-)] test? ( dev-ruby/rspec[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A tool for building and distributing development environments
+EAPI=7
+HOMEPAGE=https://vagrantup.com/
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-arch/libarchive net-misc/curl ruby_targets_ruby26? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/childprocess-4.0.0[ruby_targets_ruby26(-)] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby26(-)] dev-ruby/erubi[ruby_targets_ruby26(-)] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.8:1[ruby_targets_ruby26(-)] >=dev-ruby/listen-3.1[ruby_targets_ruby26(-)] <dev-ruby/log4r-1.1.11[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rubyzip-2.0[ruby_targets_ruby26(-)] >=dev-ruby/net-scp-3.0.0[ruby_targets_ruby26(-)] >=dev-ruby/net-sftp-3.0[ruby_targets_ruby26(-)] >=dev-ruby/net-ssh-6.1.0[ruby_targets_ruby26(-)] dev-ruby/rest-client:2[ruby_targets_ruby26(-)] >=dev-ruby/vagrant_cloud-3.0.5[ruby_targets_ruby26(-)] >=dev-ruby/rexml-3.2.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/childprocess-4.0.0[ruby_targets_ruby27(-)] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby27(-)] dev-ruby/erubi[ruby_targets_ruby27(-)] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.8:1[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.1[ruby_targets_ruby27(-)] <dev-ruby/log4r-1.1.11[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rubyzip-2.0[ruby_targets_ruby27(-)] >=dev-ruby/net-scp-3.0.0[ruby_targets_ruby27(-)] >=dev-ruby/net-sftp-3.0[ruby_targets_ruby27(-)] >=dev-ruby/net-ssh-6.1.0[ruby_targets_ruby27(-)] dev-ruby/rest-client:2[ruby_targets_ruby27(-)] >=dev-ruby/vagrant_cloud-3.0.5[ruby_targets_ruby27(-)] >=dev-ruby/rexml-3.2.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.2.18.tar.gz -> vagrant-2.2.18.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54959a2b600fa75b1515c4eeb375dd35
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.2.7-r1 b/metadata/md5-cache/app-emulation/vagrant-2.2.7-r1
index 35bda0ada379..b9813e0612ae 100644
--- a/metadata/md5-cache/app-emulation/vagrant-2.2.7-r1
+++ b/metadata/md5-cache/app-emulation/vagrant-2.2.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.2.7.tar.gz -> vagrant-2.2.7.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7659da174e6ab3eb32e2c03fb3a5dade
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.2.9-r1 b/metadata/md5-cache/app-emulation/vagrant-2.2.9-r1
index c079a618050c..051b04856a65 100644
--- a/metadata/md5-cache/app-emulation/vagrant-2.2.9-r1
+++ b/metadata/md5-cache/app-emulation/vagrant-2.2.9-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.2.9.tar.gz -> vagrant-2.2.9.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a83c665ce1731beda4ac8a4b1901aa30
diff --git a/metadata/md5-cache/app-emulation/vendor-reset-0.1.0 b/metadata/md5-cache/app-emulation/vendor-reset-0.1.0
index 21b23d47f256..53eaebc7f1ec 100644
--- a/metadata/md5-cache/app-emulation/vendor-reset-0.1.0
+++ b/metadata/md5-cache/app-emulation/vendor-reset-0.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/gnif/vendor-reset/archive/v0.1.0.tar.gz -> vendor-reset-0.1.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f319c1fb4982e782f2c0193dbcfd08a7
diff --git a/metadata/md5-cache/app-emulation/vendor-reset-9999 b/metadata/md5-cache/app-emulation/vendor-reset-9999
index bfd4b09df577..062aae5fdc51 100644
--- a/metadata/md5-cache/app-emulation/vendor-reset-9999
+++ b/metadata/md5-cache/app-emulation/vendor-reset-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3ee76dedcf3e53c3270523edfc243244
diff --git a/metadata/md5-cache/app-emulation/vice-3.5-r1 b/metadata/md5-cache/app-emulation/vice-3.5-r1
index 6a27542eb88c..d5ff40486f52 100644
--- a/metadata/md5-cache/app-emulation/vice-3.5-r1
+++ b/metadata/md5-cache/app-emulation/vice-3.5-r1
@@ -5,11 +5,11 @@ DESCRIPTION=The Versatile Commodore Emulator
 EAPI=7
 HOMEPAGE=https://vice-emu.sourceforge.io/
 IUSE=alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg lame mpg123 ogg oss parport pci png portaudio pulseaudio sdl zlib
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=sys-libs/readline:= virtual/libintl alsa? ( media-libs/alsa-lib ) ethernet? ( net-libs/libnet:1.1 net-libs/libpcap ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) gif? ( media-libs/giflib:= ) gtk? ( dev-libs/atk dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/glew:0= virtual/opengl x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) jpeg? ( virtual/jpeg ) lame? ( media-sound/lame ) mpg123? ( media-sound/mpg123 ) ogg? ( media-libs/libogg media-libs/libvorbis ) parport? ( sys-libs/libieee1284 ) pci? ( sys-apps/pciutils ) png? ( media-libs/libpng:= ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-image ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=|| ( gtk headless sdl ) gtk? ( zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/vice-emu/releases/vice-3.5.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d2872a9ee7dd96f610809296606a7bd1
+_md5_=aeaa82d61520f57251610747ea1b504b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.22 b/metadata/md5-cache/app-emulation/virtualbox-6.1.22
index 8fb4cb7bb404..72fc9169377b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.22
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.22/VirtualBox-6.1.22.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2f965c66df97e97a4681e33897d2bc40
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.24 b/metadata/md5-cache/app-emulation/virtualbox-6.1.24
index cf47845b2e9c..24b618db28aa 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.24
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.24
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.24/VirtualBox-6.1.24.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2f965c66df97e97a4681e33897d2bc40
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.26 b/metadata/md5-cache/app-emulation/virtualbox-6.1.26
index ead7a36bf786..79ee311bf700 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.26
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.26
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.26/VirtualBox-6.1.26.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=113ce0889bdb5df44721f3a7e40c4590
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.20 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.20
index 7ae0c92070f3..bbccea0fcdc6 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.20
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.20
@@ -11,5 +11,5 @@ PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.20/VirtualBox-6.1.20.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=59f67126f18426448eecd22e0f29c948
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.22 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.22
index da2fbb16a46d..f4ad4256b361 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.22
@@ -11,5 +11,5 @@ PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.22/VirtualBox-6.1.22.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=85b58b1b74775adf82cf2f925dcfce04
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.24 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.24
index 3da5f1598565..52b38df4fa40 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.24
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.24
@@ -11,5 +11,5 @@ PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.24/VirtualBox-6.1.24.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=59f67126f18426448eecd22e0f29c948
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.26 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.26
index 88f6c5e9b938..e582264eeea7 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.26
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.26
@@ -11,5 +11,5 @@ PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.26/VirtualBox-6.1.26.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=461efe0d1f7e7c52d3b739d39e645ef7
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.22 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.22
index d7e250a6b9d7..1e936d23a7db 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.22
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.22.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c930b4d02e135f2c37ba6d30444b9c2b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.24 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.24
index 272c1f3595e5..87cdc21e1b07 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.24
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.24
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.24.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c930b4d02e135f2c37ba6d30444b9c2b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.26 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.26
index 2b89962870ea..026e75eba116 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.26
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.26
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.26.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ddbe0a12f0704314ed8f71d00594f8fc
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.15 b/metadata/md5-cache/app-emulation/wine-staging-6.15
deleted file mode 100644
index d65c2a9215dc..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-6.15
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.3.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=6.15
-SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.15.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.15.tar.gz -> wine-staging-6.15.tar.gz )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0c3acb9a0c170a0a87595bf9c5d1d26c
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.19 b/metadata/md5-cache/app-emulation/wine-staging-6.19
new file mode 100644
index 000000000000..1d08af7f7330
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-6.19
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.4.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=6.19
+SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.19.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20210925.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.19.tar.gz -> wine-staging-6.19.tar.gz )
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2b167226eab88f58467cad7497746e77
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.15 b/metadata/md5-cache/app-emulation/wine-vanilla-6.15
deleted file mode 100644
index bc767681d80c..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.15
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.3.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=6.15
-SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.15.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=37e9a8fccbeb345604ac1616a3d7f2a4
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.19 b/metadata/md5-cache/app-emulation/wine-vanilla-6.19
new file mode 100644
index 000000000000..94bede2253fb
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.19
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.4.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=6.19
+SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.19.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20210925.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pax-utils	fce6ad998516159787b92e8043167889	plocale	89c6aac5da68423465e6fd79fb4ad5fb	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5165db895616941fd41971ac86a2a7f7
diff --git a/metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120 b/metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120
index 9b16da039693..63c7b78c8565 100644
--- a/metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120
+++ b/metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120
@@ -9,5 +9,5 @@ LICENSE=LGPL-3 LGPL-2.1
 RDEPEND=!xenstore? ( app-emulation/xen-tools ) xenstore? ( !app-emulation/xen-tools )
 SLOT=0
 SRC_URI=http://updates.vmd.citrix.com/XenServer/6.2.0/rhel4x/SRPMS/xe-guest-utilities-6.2.0-1120.src.rpm
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6bcc82be513b43073839ebd5f4b31934
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index b742c2a31305..bb3c57ab2dcb 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-java-0.4.3 b/metadata/md5-cache/app-eselect/eselect-java-0.4.3
new file mode 100644
index 000000000000..9d4f3f9ef7be
--- /dev/null
+++ b/metadata/md5-cache/app-eselect/eselect-java-0.4.3
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=postinst prepare
+DESCRIPTION=A set of eselect modules for Java
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=!app-eselect/eselect-maven app-admin/eselect
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/eselect-java.git/snapshot/eselect-java-0.4.3.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b862c4d572cfbbd53bcdcd37d7e67c7e
diff --git a/metadata/md5-cache/app-eselect/eselect-ruby-20191222 b/metadata/md5-cache/app-eselect/eselect-ruby-20191222
index 2aad68720de3..ec4b5d1134c9 100644
--- a/metadata/md5-cache/app-eselect/eselect-ruby-20191222
+++ b/metadata/md5-cache/app-eselect/eselect-ruby-20191222
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages multiple Ruby versions
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Ruby
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-20191222.xz
-_md5_=f0ffb13ed942f6345e9531d8bdd7e4e2
+_md5_=58ee3d0f909553ee11e2178e522d9a72
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 9d7bd88b73b5..0badab1a5de6 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/fbterm-1.7_p20190503 b/metadata/md5-cache/app-i18n/fbterm-1.7_p20190503
index 4e3d38d29309..dd5883d6d6e9 100644
--- a/metadata/md5-cache/app-i18n/fbterm-1.7_p20190503
+++ b/metadata/md5-cache/app-i18n/fbterm-1.7_p20190503
@@ -5,10 +5,10 @@ DESCRIPTION=Fast terminal emulator for the Linux framebuffer
 EAPI=7
 HOMEPAGE=https://github.com/gjedeer/fbterm
 IUSE=gpm video_cards_vesa +filecaps
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig media-libs/freetype:2 >=sys-libs/ncurses-6.1 gpm? ( sys-libs/gpm ) video_cards_vesa? ( dev-libs/libx86 ) filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/gjedeer/fbterm/archive/ccea326dd73f4d6b6442fde7ba7c2be9cd35c6df.tar.gz -> fbterm-1.7_p20190503.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=61cbc6429443431e1f208cd85a692450
+_md5_=da99f8d6cc964950a976748f7ab1359b
diff --git a/metadata/md5-cache/app-i18n/ibus-chewing-1.5.1-r1 b/metadata/md5-cache/app-i18n/ibus-chewing-1.5.1-r1
deleted file mode 100644
index 82f85b760a03..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-chewing-1.5.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 dev-util/gob:2 x11-libs/gtk+:2 x11-libs/libX11 gconf? ( gnome-base/gconf ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=Chinese Chewing engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=gconf nls test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 dev-util/gob:2 x11-libs/gtk+:2 x11-libs/libX11 gconf? ( gnome-base/gconf ) nls? ( virtual/libintl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/definite/ibus-chewing/releases/download/1.5.1/ibus-chewing-1.5.1-Source.tar.gz
-_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3843ab7e4dfc72183d07d6f0b945e1eb
diff --git a/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1 b/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1
deleted file mode 100644
index 22524d3e445d..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 dev-util/gob:2 x11-libs/gtk+:2 x11-libs/libX11 gconf? ( gnome-base/gconf ) nls? ( virtual/libintl ) dev-util/cmake-fedora virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=Chinese Chewing engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=gconf nls test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 dev-util/gob:2 x11-libs/gtk+:2 x11-libs/libX11 gconf? ( gnome-base/gconf ) nls? ( virtual/libintl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/definite/ibus-chewing/archive/1.6.1.tar.gz -> ibus-chewing-1.6.1.tar.gz
-_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7bee4963e55dd2f21a1a3916492c7c5d
diff --git a/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1_p20210117 b/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1_p20210117
new file mode 100644
index 000000000000..304d6e09eb94
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1_p20210117
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/cmake-fedora virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/libX11 gconf? ( gnome-base/gconf ) nls? ( virtual/libintl )
+DESCRIPTION=Chinese Chewing engine for IBus
+EAPI=7
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IUSE=gconf nls test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/libX11 gconf? ( gnome-base/gconf ) nls? ( virtual/libintl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/definite/ibus-chewing/archive/8e17848d3fe3bd7de052a1c26b4161092ba1df9f.tar.gz -> ibus-chewing-1.6.1_p20210117.tar.gz https://dev.gentoo.org/~hattya/distfiles/ibus-chewing-gob2.patch.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f9b0f755fec551c422793825db583c0c
diff --git a/metadata/md5-cache/app-i18n/ibus-handwrite-3.0.0 b/metadata/md5-cache/app-i18n/ibus-handwrite-3.0.0
deleted file mode 100644
index 88cb61fd793e..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-handwrite-3.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-i18n/ibus x11-libs/gtk+:3 nls? ( virtual/libintl ) zinnia? ( app-i18n/zinnia app-i18n/zinnia-tomoe ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Hand write recognition/input for IBus
-EAPI=6
-HOMEPAGE=https://github.com/microcai/ibus-handwrite
-IUSE=nls +zinnia
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus x11-libs/gtk+:3 nls? ( virtual/libintl ) zinnia? ( app-i18n/zinnia app-i18n/zinnia-tomoe )
-SLOT=0
-SRC_URI=https://github.com/microcai/ibus-handwrite/releases/download/3.0/ibus-handwrite-3.0.0.tar.bz2
-_md5_=4fac008fc36f67a72d603b07408d93f7
diff --git a/metadata/md5-cache/app-i18n/ibus-handwrite-3.0.0-r1 b/metadata/md5-cache/app-i18n/ibus-handwrite-3.0.0-r1
new file mode 100644
index 000000000000..d2b1733f16dc
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-handwrite-3.0.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure
+DEPEND=app-i18n/ibus x11-libs/gtk+:3 nls? ( virtual/libintl ) zinnia? ( app-i18n/zinnia app-i18n/zinnia-tomoe )
+DESCRIPTION=Hand write recognition/input for IBus
+EAPI=7
+HOMEPAGE=https://github.com/microcai/ibus-handwrite
+IUSE=nls +zinnia
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+
+RDEPEND=app-i18n/ibus x11-libs/gtk+:3 nls? ( virtual/libintl ) zinnia? ( app-i18n/zinnia app-i18n/zinnia-tomoe )
+SLOT=0
+SRC_URI=https://github.com/microcai/ibus-handwrite/releases/download/3.0/ibus-handwrite-3.0.0.tar.bz2
+_md5_=0b04b70523bbaf9c9e78c26775022535
diff --git a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.4 b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.4
index 38858d51fda9..c96e6aaec2ef 100644
--- a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.4
+++ b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.4
@@ -1,15 +1,16 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm preinst prepare setup
+BDEPEND=sys-devel/gettext virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=configure postinst postrm preinst prepare setup test
 DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) >=app-i18n/libhangul-0.1 nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Korean Hangul engine for IBus
 EAPI=7
 HOMEPAGE=https://github.com/libhangul/ibus-hangul/wiki
-IUSE=nls python_single_target_python3_8 python_single_target_python3_9
+IUSE=nls python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) >=app-i18n/libhangul-0.1 nls? ( virtual/libintl )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libhangul/ibus-hangul/releases/download/1.5.4/ibus-hangul-1.5.4.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9c939c025ff7cda02897225a073f7cc9
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a6304a425a22131ee09c61914ca3cc3e
diff --git a/metadata/md5-cache/app-i18n/ibus-kkc-1.5.22 b/metadata/md5-cache/app-i18n/ibus-kkc-1.5.22
deleted file mode 100644
index 89cf5a6c9532..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-kkc-1.5.22
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=app-i18n/ibus app-i18n/libkkc x11-libs/gtk+:3 nls? ( virtual/libintl ) || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Japanese Kana Kanji conversion engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ueno/ibus-kkc
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus app-i18n/libkkc x11-libs/gtk+:3 nls? ( virtual/libintl ) app-i18n/skk-jisyo
-SLOT=0
-SRC_URI=https://github.com/ueno/ibus-kkc/releases/download/v1.5.22/ibus-kkc-1.5.22.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e8b70d9131c94c73d2e58b96087f10d4
diff --git a/metadata/md5-cache/app-i18n/ibus-kkc-1.5.22_p20170607 b/metadata/md5-cache/app-i18n/ibus-kkc-1.5.22_p20170607
new file mode 100644
index 000000000000..de7b0896f4c9
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-kkc-1.5.22_p20170607
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare unpack
+DEPEND=app-i18n/ibus app-i18n/libkkc x11-libs/gtk+:3 nls? ( virtual/libintl )
+DESCRIPTION=Japanese Kana Kanji conversion engine for IBus
+EAPI=7
+HOMEPAGE=https://github.com/ueno/ibus-kkc
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-i18n/ibus app-i18n/libkkc x11-libs/gtk+:3 nls? ( virtual/libintl ) app-i18n/skk-jisyo
+SLOT=0
+SRC_URI=https://github.com/ueno/ibus-kkc/archive/f7516ae20cb648cd8b0904aec5853d3a3d2611c4.tar.gz -> ibus-kkc-1.5.22_p20170607.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0f4af3843a14f3e08a14bd1d860667a6
diff --git a/metadata/md5-cache/app-i18n/ibus-skk-1.4.2 b/metadata/md5-cache/app-i18n/ibus-skk-1.4.2
deleted file mode 100644
index 4d03d1a732b3..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-skk-1.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=app-i18n/ibus >=app-i18n/libskk-1.0.2 x11-libs/gtk+:3 nls? ( virtual/libintl ) || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Japanese SKK engine for IBus
-EAPI=7
-HOMEPAGE=https://github.com/ueno/ibus-skk
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=app-i18n/ibus >=app-i18n/libskk-1.0.2 x11-libs/gtk+:3 nls? ( virtual/libintl ) app-i18n/skk-jisyo
-SLOT=0
-SRC_URI=https://github.com/ueno/ibus-skk/releases/download/ibus-skk-1.4.2/ibus-skk-1.4.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1a57b086dd20d203a5f441981da71b97
diff --git a/metadata/md5-cache/app-i18n/ibus-skk-1.4.3 b/metadata/md5-cache/app-i18n/ibus-skk-1.4.3
index c99040203bf9..2936dd991ddf 100644
--- a/metadata/md5-cache/app-i18n/ibus-skk-1.4.3
+++ b/metadata/md5-cache/app-i18n/ibus-skk-1.4.3
@@ -1,13 +1,14 @@
+BDEPEND=|| ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )
 DEFINED_PHASES=configure prepare
-DEPEND=app-i18n/ibus >=app-i18n/libskk-1.0.2 x11-libs/gtk+:3 nls? ( virtual/libintl ) || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )
+DEPEND=app-i18n/ibus >=app-i18n/libskk-1.0.2 x11-libs/gtk+:3 nls? ( virtual/libintl )
 DESCRIPTION=Japanese SKK engine for IBus
 EAPI=7
 HOMEPAGE=https://github.com/ueno/ibus-skk
 IUSE=nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-i18n/ibus >=app-i18n/libskk-1.0.2 x11-libs/gtk+:3 nls? ( virtual/libintl ) app-i18n/skk-jisyo
 SLOT=0
 SRC_URI=https://github.com/ueno/ibus-skk/releases/download/ibus-skk-1.4.3/ibus-skk-1.4.3.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=48adcd680fc675ac219d7a544418510d
+_md5_=64fb87d72e1e32303cceb2e291ec4521
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.14.0 b/metadata/md5-cache/app-i18n/ibus-table-1.14.0
deleted file mode 100644
index 65f6f1d6fd95..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-table-1.14.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
-DEFINED_PHASES=configure postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) virtual/libiconv nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Tables engines for IBus
-EAPI=7
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=nls python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) virtual/libiconv nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.14.0/ibus-table-1.14.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f01702679fef5ff589cdcb962fed4e23
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.14.1 b/metadata/md5-cache/app-i18n/ibus-table-1.14.1
index 725642099ff8..788f837f469b 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-1.14.1
+++ b/metadata/md5-cache/app-i18n/ibus-table-1.14.1
@@ -5,7 +5,7 @@ DESCRIPTION=Tables engines for IBus
 EAPI=7
 HOMEPAGE=https://github.com/ibus/ibus/wiki
 IUSE=nls python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) virtual/libiconv nls? ( virtual/libintl )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.14.1/ibus-table-1.14.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5282be0289c91995d3ef330d1f53d32d
+_md5_=f01702679fef5ff589cdcb962fed4e23
diff --git a/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.2 b/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.2
deleted file mode 100644
index b5ed38e71d59..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-i18n/ibus-table dev-util/cmake-fedora
-DESCRIPTION=Chinese tables for IBus-Table
-EAPI=7
-HOMEPAGE=https://github.com/definite/ibus-table-chinese
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=app-i18n/ibus-table
-SLOT=0
-SRC_URI=https://github.com/definite/ibus-table-chinese/archive/1.8.2.tar.gz -> ibus-table-chinese-1.8.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f2d4fcb04eb248252b9057304d2fb435
diff --git a/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.3 b/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.3
index a3245fdebdf0..1320a074e63a 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.3
+++ b/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.3
@@ -4,10 +4,10 @@ DEPEND=app-i18n/ibus-table dev-util/cmake-fedora
 DESCRIPTION=Chinese tables for IBus-Table
 EAPI=7
 HOMEPAGE=https://github.com/definite/ibus-table-chinese
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=app-i18n/ibus-table
 SLOT=0
 SRC_URI=https://github.com/definite/ibus-table-chinese/archive/1.8.3.tar.gz -> ibus-table-chinese-1.8.3.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c8b2157e6792417c2ba891202ee1d9b1
+_md5_=75cdaf0dcc045256f49acc046bcc6398
diff --git a/metadata/md5-cache/app-i18n/ibus-table-others-1.3.11 b/metadata/md5-cache/app-i18n/ibus-table-others-1.3.11
index dedd7d5e5e9a..06a0d3361735 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-others-1.3.11
+++ b/metadata/md5-cache/app-i18n/ibus-table-others-1.3.11
@@ -4,9 +4,9 @@ DEPEND=app-i18n/ibus-table !app-i18n/ibus-table-code !app-i18n/ibus-table-cyrill
 DESCRIPTION=Various tables for IBus-Table
 EAPI=7
 HOMEPAGE=https://github.com/moebiuscurve/ibus-table-others
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=app-i18n/ibus-table !app-i18n/ibus-table-code !app-i18n/ibus-table-cyrillic !app-i18n/ibus-table-latin !app-i18n/ibus-table-tv
 SLOT=0
 SRC_URI=https://github.com/moebiuscurve/ibus-table-others/releases/download/1.3.11/ibus-table-others-1.3.11.tar.gz
-_md5_=367776c941bab6c9ff918f1f632b6d77
+_md5_=05bb46a6d73c7ab558a860cd35a37001
diff --git a/metadata/md5-cache/app-i18n/ibus-table-others-1.3.9 b/metadata/md5-cache/app-i18n/ibus-table-others-1.3.9
deleted file mode 100644
index 4b3c5cd051df..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-table-others-1.3.9
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=-
-DEPEND=app-i18n/ibus-table !app-i18n/ibus-table-code !app-i18n/ibus-table-cyrillic !app-i18n/ibus-table-latin !app-i18n/ibus-table-tv
-DESCRIPTION=Various tables for IBus-Table
-EAPI=7
-HOMEPAGE=https://github.com/moebiuscurve/ibus-table-others
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=app-i18n/ibus-table !app-i18n/ibus-table-code !app-i18n/ibus-table-cyrillic !app-i18n/ibus-table-latin !app-i18n/ibus-table-tv
-SLOT=0
-SRC_URI=https://github.com/moebiuscurve/ibus-table-others/releases/download/1.3.9/ibus-table-others-1.3.9.tar.gz
-_md5_=f0bf8cd6829d1d4ac2234a04ab19729e
diff --git a/metadata/md5-cache/app-i18n/ibus-unikey-0.6.1-r2 b/metadata/md5-cache/app-i18n/ibus-unikey-0.6.1-r2
index 5fffb3fa25eb..1a36be123dc1 100644
--- a/metadata/md5-cache/app-i18n/ibus-unikey-0.6.1-r2
+++ b/metadata/md5-cache/app-i18n/ibus-unikey-0.6.1-r2
@@ -1,13 +1,14 @@
-DEFINED_PHASES=configure
-DEPEND=app-i18n/ibus x11-libs/libX11 gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) nls? ( virtual/libintl ) virtual/pkgconfig dev-util/intltool nls? ( sys-devel/gettext )
+BDEPEND=virtual/pkgconfig dev-util/intltool nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=app-i18n/ibus x11-libs/libX11 x11-libs/gtk+:3 nls? ( virtual/libintl )
 DESCRIPTION=Vietnamese UniKey engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/mrlequoctuan/ibus-unikey
-IUSE=+gtk gtk2 nls
+EAPI=7
+HOMEPAGE=https://github.com/vn-input/ibus-unikey
+IUSE=nls
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-i18n/ibus x11-libs/libX11 gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) nls? ( virtual/libintl )
-REQUIRED_USE=gtk2? ( gtk )
+LICENSE=GPL-3+
+RDEPEND=app-i18n/ibus x11-libs/libX11 x11-libs/gtk+:3 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus-unikey/ibus-unikey-0.6.1.tar.gz https://dev.gentoo.org/~dlan/distfiles/ibus-unikey-0.6.1-gcc6.patch
-_md5_=791e5b3f76ae722ce88988059126ab6f
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c6d43ddb95621c600c667c164aebcb38
diff --git a/metadata/md5-cache/app-i18n/ibus-unikey-0.7.0_beta1 b/metadata/md5-cache/app-i18n/ibus-unikey-0.7.0_beta1
new file mode 100644
index 000000000000..0a390c34e111
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-unikey-0.7.0_beta1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-i18n/ibus x11-libs/gtk+:3 virtual/libintl
+DESCRIPTION=Vietnamese UniKey engine for IBus
+EAPI=7
+HOMEPAGE=https://github.com/vn-input/ibus-unikey
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-i18n/ibus x11-libs/gtk+:3 virtual/libintl
+SLOT=0
+SRC_URI=https://github.com/vn-input/ibus-unikey/archive/0.7.0-beta1.tar.gz -> ibus-unikey-0.7.0_beta1.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=23a7a90df4e5ac0633ce1df117d78e90
diff --git a/metadata/md5-cache/app-i18n/libkkc-0.3.5_p20210928 b/metadata/md5-cache/app-i18n/libkkc-0.3.5_p20210928
new file mode 100644
index 000000000000..a94fbce02b14
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/libkkc-0.3.5_p20210928
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( dev-lang/python:3.10 dev-libs/marisa[python,python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-libs/marisa[python,python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-libs/marisa[python,python_targets_python3_8(-)] ) ) || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) dev-libs/gobject-introspection virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup unpack
+DEPEND=app-i18n/libkkc-data dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 dev-libs/marisa nls? ( virtual/libintl )
+DESCRIPTION=Japanese Kana Kanji conversion input method library
+EAPI=7
+HOMEPAGE=https://github.com/ueno/libkkc
+IUSE=nls static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-i18n/libkkc-data dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 dev-libs/marisa nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=https://github.com/ueno/libkkc/archive/cdcaf4dceaf273bfe7b018a4a651a92f786c6ec6.tar.gz -> libkkc-0.3.5_p20210928.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1936aa1deb86dcb3ce6836ce9f3e32ab
diff --git a/metadata/md5-cache/app-i18n/libkkc-0.3.6_pre20190809104047 b/metadata/md5-cache/app-i18n/libkkc-0.3.6_pre20190809104047
deleted file mode 100644
index a42c8cd87da3..000000000000
--- a/metadata/md5-cache/app-i18n/libkkc-0.3.6_pre20190809104047
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( ( dev-lang/python:3.9 dev-libs/marisa[python,python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-libs/marisa[python,python_targets_python3_8(-)] ) ) || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) dev-libs/gobject-introspection virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 dev-libs/marisa nls? ( virtual/libintl )
-DESCRIPTION=Japanese Kana Kanji conversion input method library
-EAPI=7
-HOMEPAGE=https://github.com/ueno/libkkc
-IUSE=nls static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 dev-libs/marisa nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=https://github.com/ueno/libkkc/archive/b2e5a152980ee627c39ca8a49082e6df7694b8fc.tar.gz -> libkkc-0.3.6_pre20190809104047.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=551a17beec8bf99be52a83543189d08e
diff --git a/metadata/md5-cache/app-i18n/libkkc-9999 b/metadata/md5-cache/app-i18n/libkkc-9999
index c16a9366a2b7..beb40d18410b 100644
--- a/metadata/md5-cache/app-i18n/libkkc-9999
+++ b/metadata/md5-cache/app-i18n/libkkc-9999
@@ -1,13 +1,13 @@
-BDEPEND=|| ( ( dev-lang/python:3.9 dev-libs/marisa[python,python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-libs/marisa[python,python_targets_python3_8(-)] ) ) || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) dev-libs/gobject-introspection virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.10 dev-libs/marisa[python,python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-libs/marisa[python,python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-libs/marisa[python,python_targets_python3_8(-)] ) ) || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) dev-libs/gobject-introspection virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 dev-libs/marisa nls? ( virtual/libintl )
+DEPEND=app-i18n/linkkc-data dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 dev-libs/marisa nls? ( virtual/libintl )
 DESCRIPTION=Japanese Kana Kanji conversion input method library
 EAPI=7
 HOMEPAGE=https://github.com/ueno/libkkc
 IUSE=nls static-libs
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 dev-libs/marisa nls? ( virtual/libintl )
+RDEPEND=app-i18n/linkkc-data dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 dev-libs/marisa nls? ( virtual/libintl )
 SLOT=0
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=564e2371f88aad337415d3fa6ee4059d
+_md5_=2c0f563ca3f029b8231a0ad18d177707
diff --git a/metadata/md5-cache/app-i18n/libkkc-data-0.2.7 b/metadata/md5-cache/app-i18n/libkkc-data-0.2.7
new file mode 100644
index 000000000000..6a13ee477d67
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/libkkc-data-0.2.7
@@ -0,0 +1,11 @@
+BDEPEND=|| ( ( dev-lang/python:3.9 dev-libs/marisa[python,python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-libs/marisa[python,python_targets_python3_8(-)] ) )
+DEFINED_PHASES=setup
+DESCRIPTION=Language model data for libkkc
+EAPI=7
+HOMEPAGE=https://github.com/ueno/libkkc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://github.com/ueno/libkkc/releases/download/v0.3.5/libkkc-data-0.2.7.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f5289cea7c2ea1a7fec3251621bee981
diff --git a/metadata/md5-cache/app-i18n/libskk-1.0.2 b/metadata/md5-cache/app-i18n/libskk-1.0.2
deleted file mode 100644
index a21122b4b24d..000000000000
--- a/metadata/md5-cache/app-i18n/libskk-1.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl ) || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=GObject-based library to deal with Japanese kana-to-kanji conversion method
-EAPI=7
-HOMEPAGE=https://github.com/ueno/libskk
-IUSE=+introspection nls static-libs test
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ueno/libskk/releases/download/1.0.2/libskk-1.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4f9bec2a2e2363934d15cf6201e68957
diff --git a/metadata/md5-cache/app-i18n/libskk-1.0.5 b/metadata/md5-cache/app-i18n/libskk-1.0.5
index 73280f880cd4..8a494f20651c 100644
--- a/metadata/md5-cache/app-i18n/libskk-1.0.5
+++ b/metadata/md5-cache/app-i18n/libskk-1.0.5
@@ -1,15 +1,15 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=|| ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 x11-libs/libxkbcommon introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl ) || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 x11-libs/libxkbcommon introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl )
 DESCRIPTION=GObject-based library to deal with Japanese kana-to-kanji conversion method
 EAPI=7
 HOMEPAGE=https://github.com/ueno/libskk
 IUSE=+introspection nls static-libs test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 x11-libs/libxkbcommon introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ueno/libskk/releases/download/1.0.5/libskk-1.0.5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=31b1dd3f3adec6d175bab600a156b9ff
+_md5_=fa9c1063e0c70ab776cb55ddcbd5908f
diff --git a/metadata/md5-cache/app-i18n/libskk-1.0.5_p20210830 b/metadata/md5-cache/app-i18n/libskk-1.0.5_p20210830
new file mode 100644
index 000000000000..27736b3dc2e4
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/libskk-1.0.5_p20210830
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=configure install prepare test unpack
+DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 x11-libs/libxkbcommon introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl )
+DESCRIPTION=GObject-based library to deal with Japanese kana-to-kanji conversion method
+EAPI=7
+HOMEPAGE=https://github.com/ueno/libskk
+IUSE=+introspection nls static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8 x11-libs/libxkbcommon introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ueno/libskk/archive/5f5e5c2d3facfec9f577fb66032e6f1994ed5d44.tar.gz -> libskk-1.0.5_p20210830.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2d2b15d7514bd3479951c8bedc753542
diff --git a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r6 b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r6
index 82a37f337988..6052ea001112 100644
--- a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r6
+++ b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r6
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( dev-db/mysql-connector-c:= ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 dev-ruby/ruby-glib2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 dev-ruby/ruby-glib2[ruby_targets_ruby26] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 dev-ruby/ruby-glib2[ruby_targets_ruby27] ) ) subversion? ( dev-vcs/subversion ) dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( dev-db/mysql-connector-c:= ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 dev-ruby/ruby-glib2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 dev-ruby/ruby-glib2[ruby_targets_ruby26] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 dev-ruby/ruby-glib2[ruby_targets_ruby27] ) ) subversion? ( dev-vcs/subversion )
 DESCRIPTION=Japanese handwriting recognition engine
-EAPI=6
+EAPI=7
 HOMEPAGE=http://tomoe.osdn.jp/
 IUSE=hyperestraier mysql ruby ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 subversion
 KEYWORDS=amd64 x86
@@ -11,5 +12,5 @@ REQUIRED_USE=ruby? ( ^^ ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_r
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tomoe/tomoe-0.6.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a02d43ef11fd35f889fd57fc6cb64c64
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=40bbbb077752560e321df7e43f775b07
diff --git a/metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r6 b/metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r6
deleted file mode 100644
index 6cfad3f60ec3..000000000000
--- a/metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r6
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/glib-utils dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=app-i18n/tomoe x11-libs/gtk+:2
-DESCRIPTION=Tomoe GTK+ interface widget library
-EAPI=7
-HOMEPAGE=http://tomoe.osdn.jp/
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=app-i18n/tomoe x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://sourceforge/tomoe/tomoe-gtk-0.6.0.tar.gz
-_md5_=d7ad5869e5ef0c6de33b76cbb7f8237d
diff --git a/metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r7 b/metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r7
new file mode 100644
index 000000000000..7185bb329e68
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r7
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/glib-utils dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=app-i18n/tomoe x11-libs/gtk+:2
+DESCRIPTION=Tomoe GTK+ interface widget library
+EAPI=7
+HOMEPAGE=http://tomoe.osdn.jp/
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1+
+RDEPEND=app-i18n/tomoe x11-libs/gtk+:2
+SLOT=0
+SRC_URI=mirror://sourceforge/tomoe/tomoe-gtk-0.6.0.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5a57bf9465d2d2045ddc7a26355a51c5
diff --git a/metadata/md5-cache/app-i18n/uim-tomoe-gtk-0.6.0 b/metadata/md5-cache/app-i18n/uim-tomoe-gtk-0.6.0
index 668a2447fc1f..5ed74bc3310e 100644
--- a/metadata/md5-cache/app-i18n/uim-tomoe-gtk-0.6.0
+++ b/metadata/md5-cache/app-i18n/uim-tomoe-gtk-0.6.0
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
-DEPEND=app-i18n/uim ~app-i18n/tomoe-gtk-0.6.0 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=app-i18n/uim ~app-i18n/tomoe-gtk-0.6.0
 DESCRIPTION=Japanese input method Tomoe IMEngine for uim
-EAPI=6
+EAPI=7
 HOMEPAGE=http://tomoe.sourceforge.net/
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=app-i18n/uim ~app-i18n/tomoe-gtk-0.6.0
 SLOT=0
 SRC_URI=mirror://sourceforge/tomoe/uim-tomoe-gtk-0.6.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e11d597792c2ad1a52dbee59fc354986
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0b6e9e550c56b71360c752140ff52cd6
diff --git a/metadata/md5-cache/app-i18n/xvnkb-0.2.11 b/metadata/md5-cache/app-i18n/xvnkb-0.2.11
new file mode 100644
index 000000000000..e315abfb49d1
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/xvnkb-0.2.11
@@ -0,0 +1,14 @@
+BDEPEND=xft? ( virtual/pkgconfig )
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=x11-libs/libX11:= xft? ( x11-libs/libXft:= ) x11-base/xorg-proto
+DESCRIPTION=Vietnamese input keyboard for X
+EAPI=8
+HOMEPAGE=http://xvnkb.sourceforge.net/
+IUSE=spell xft
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=x11-libs/libX11:= xft? ( x11-libs/libXft:= )
+SLOT=0
+SRC_URI=http://xvnkb.sourceforge.net/xvnkb-0.2.11.tar.bz2
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bfef0dab2e7b5694e997b20a16636a37
diff --git a/metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1 b/metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1
index 9e4ba47c1ffa..3e93d56154fd 100644
--- a/metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1
+++ b/metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1
@@ -1,13 +1,14 @@
-DEFINED_PHASES=configure install postinst
+BDEPEND=xft? ( virtual/pkgconfig )
+DEFINED_PHASES=configure install postinst prepare
 DEPEND=x11-libs/libX11:= xft? ( x11-libs/libXft:= ) x11-base/xorg-proto
 DESCRIPTION=Vietnamese input keyboard for X
 EAPI=7
 HOMEPAGE=http://xvnkb.sourceforge.net/
 IUSE=spell xft
 KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=x11-libs/libX11:= xft? ( x11-libs/libXft:= )
 SLOT=0
 SRC_URI=http://xvnkb.sourceforge.net/xvnkb-0.2.9a.tar.bz2
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2076482ef0caa1846df6a06c0cd71e6f
+_md5_=8676dd16cc73cbbfcd5455f59f5fdebf
diff --git a/metadata/md5-cache/app-i18n/yaskkserv2-0.1.1-r1 b/metadata/md5-cache/app-i18n/yaskkserv2-0.1.1-r1
new file mode 100644
index 000000000000..10dc26580c26
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/yaskkserv2-0.1.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-emacs/ddskk app-i18n/yaskkserv ) >=virtual/rust-1.37.0 virtual/pkgconfig
+DEFINED_PHASES=compile configure install preinst prepare test unpack
+DEPEND=dev-libs/openssl:0=
+DESCRIPTION=Yet Another SKK server
+EAPI=7
+HOMEPAGE=https://github.com/wachikun/yaskkserv2
+IUSE=test debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Apache-2.0 MIT )
+RDEPEND=dev-libs/openssl:0= app-i18n/skk-jisyo
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/wachikun/yaskkserv2/archive/0.1.1.tar.gz -> yaskkserv2-0.1.1.tar.gz https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.11/download -> arrayvec-0.4.11.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.6/download -> autocfg-0.1.6.crate https://crates.io/api/v1/crates/backtrace/0.3.37/download -> backtrace-0.3.37.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/bincode/1.1.4/download -> bincode-1.1.4.crate https://crates.io/api/v1/crates/bitflags/1.1.0/download -> bitflags-1.1.0.crate https://crates.io/api/v1/crates/boxfnonce/0.1.1/download -> boxfnonce-0.1.1.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.crate https://crates.io/api/v1/crates/c2-chacha/0.2.2/download -> c2-chacha-0.2.2.crate https://crates.io/api/v1/crates/cc/1.0.45/download -> cc-1.0.45.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/cookie/0.12.0/download -> cookie-0.12.0.crate https://crates.io/api/v1/crates/cookie_store/0.7.0/download -> cookie_store-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.6.4/download -> core-foundation-0.6.4.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.1/download -> crossbeam-deque-0.7.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.7.2/download -> crossbeam-epoch-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.1.2/download -> crossbeam-queue-0.1.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/daemonize/0.4.1/download -> daemonize-0.4.1.crate https://crates.io/api/v1/crates/dtoa/0.4.4/download -> dtoa-0.4.4.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/encoding_rs/0.8.20/download -> encoding_rs-0.8.20.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/error-chain/0.11.0/download -> error-chain-0.11.0.crate https://crates.io/api/v1/crates/error-chain/0.12.1/download -> error-chain-0.12.1.crate https://crates.io/api/v1/crates/failure/0.1.5/download -> failure-0.1.5.crate https://crates.io/api/v1/crates/failure_derive/0.1.5/download -> failure_derive-0.1.5.crate https://crates.io/api/v1/crates/flate2/1.0.11/download -> flate2-1.0.11.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.29/download -> futures-0.1.29.crate https://crates.io/api/v1/crates/futures-cpupool/0.1.8/download -> futures-cpupool-0.1.8.crate https://crates.io/api/v1/crates/getrandom/0.1.12/download -> getrandom-0.1.12.crate https://crates.io/api/v1/crates/h2/0.1.26/download -> h2-0.1.26.crate https://crates.io/api/v1/crates/http/0.1.18/download -> http-0.1.18.crate https://crates.io/api/v1/crates/http-body/0.1.0/download -> http-body-0.1.0.crate https://crates.io/api/v1/crates/httparse/1.3.4/download -> httparse-1.3.4.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/hyper/0.12.35/download -> hyper-0.12.35.crate https://crates.io/api/v1/crates/hyper-tls/0.3.2/download -> hyper-tls-0.3.2.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/indexmap/1.2.0/download -> indexmap-1.2.0.crate https://crates.io/api/v1/crates/iovec/0.1.2/download -> iovec-0.1.2.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/json/0.12.0/download -> json-0.12.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/lock_api/0.1.5/download -> lock_api-0.1.5.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/memoffset/0.5.1/download -> memoffset-0.5.1.crate https://crates.io/api/v1/crates/mime/0.3.14/download -> mime-0.3.14.crate https://crates.io/api/v1/crates/mime_guess/2.0.1/download -> mime_guess-2.0.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.2/download -> miniz_oxide-0.3.2.crate https://crates.io/api/v1/crates/mio/0.6.19/download -> mio-0.6.19.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/native-tls/0.2.3/download -> native-tls-0.2.3.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/num_cpus/1.10.1/download -> num_cpus-1.10.1.crate https://crates.io/api/v1/crates/once_cell/1.4.1/download -> once_cell-1.4.1.crate https://crates.io/api/v1/crates/openssl/0.10.24/download -> openssl-0.10.24.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.49/download -> openssl-sys-0.9.49.crate https://crates.io/api/v1/crates/owning_ref/0.4.0/download -> owning_ref-0.4.0.crate https://crates.io/api/v1/crates/parking_lot/0.7.1/download -> parking_lot-0.7.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.4.0/download -> parking_lot_core-0.4.0.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.16/download -> pkg-config-0.3.16.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.5/download -> ppv-lite86-0.2.5.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.3/download -> proc-macro2-1.0.3.crate https://crates.io/api/v1/crates/publicsuffix/1.5.3/download -> publicsuffix-1.5.3.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rand/0.6.5/download -> rand-0.6.5.crate https://crates.io/api/v1/crates/rand/0.7.2/download -> rand-0.7.2.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_chacha/0.2.1/download -> rand_chacha-0.2.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_jitter/0.1.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/reqwest/0.9.20/download -> reqwest-0.9.20.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc-hash/1.0.1/download -> rustc-hash-1.0.1.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/schannel/0.1.16/download -> schannel-0.1.16.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/scopeguard/1.0.0/download -> scopeguard-1.0.0.crate https://crates.io/api/v1/crates/security-framework/0.3.1/download -> security-framework-0.3.1.crate https://crates.io/api/v1/crates/security-framework-sys/0.3.1/download -> security-framework-sys-0.3.1.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.101/download -> serde-1.0.101.crate https://crates.io/api/v1/crates/serde_derive/1.0.101/download -> serde_derive-1.0.101.crate https://crates.io/api/v1/crates/serde_json/1.0.40/download -> serde_json-1.0.40.crate https://crates.io/api/v1/crates/serde_urlencoded/0.5.5/download -> serde_urlencoded-0.5.5.crate https://crates.io/api/v1/crates/sha1/0.6.0/download -> sha1-0.6.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/0.6.10/download -> smallvec-0.6.10.crate https://crates.io/api/v1/crates/stable_deref_trait/1.1.1/download -> stable_deref_trait-1.1.1.crate https://crates.io/api/v1/crates/string/0.2.1/download -> string-0.2.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/syn/1.0.11/download -> syn-1.0.11.crate https://crates.io/api/v1/crates/synstructure/0.10.2/download -> synstructure-0.10.2.crate https://crates.io/api/v1/crates/syslog/4.0.1/download -> syslog-4.0.1.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.20/download -> thiserror-1.0.20.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.20/download -> thiserror-impl-1.0.20.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/tokio/0.1.22/download -> tokio-0.1.22.crate https://crates.io/api/v1/crates/tokio-buf/0.1.1/download -> tokio-buf-0.1.1.crate https://crates.io/api/v1/crates/tokio-current-thread/0.1.6/download -> tokio-current-thread-0.1.6.crate https://crates.io/api/v1/crates/tokio-executor/0.1.8/download -> tokio-executor-0.1.8.crate https://crates.io/api/v1/crates/tokio-io/0.1.12/download -> tokio-io-0.1.12.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.9/download -> tokio-reactor-0.1.9.crate https://crates.io/api/v1/crates/tokio-sync/0.1.6/download -> tokio-sync-0.1.6.crate https://crates.io/api/v1/crates/tokio-tcp/0.1.3/download -> tokio-tcp-0.1.3.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.15/download -> tokio-threadpool-0.1.15.crate https://crates.io/api/v1/crates/tokio-timer/0.2.11/download -> tokio-timer-0.2.11.crate https://crates.io/api/v1/crates/try-lock/0.2.2/download -> try-lock-0.2.2.crate https://crates.io/api/v1/crates/try_from/0.3.2/download -> try_from-0.3.2.crate https://crates.io/api/v1/crates/twoway/0.2.0/download -> twoway-0.2.0.crate https://crates.io/api/v1/crates/unchecked-index/0.2.2/download -> unchecked-index-0.2.2.crate https://crates.io/api/v1/crates/unicase/2.5.1/download -> unicase-2.5.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.8/download -> unicode-normalization-0.1.8.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/url/2.1.0/download -> url-2.1.0.crate https://crates.io/api/v1/crates/uuid/0.7.4/download -> uuid-0.7.4.crate https://crates.io/api/v1/crates/vcpkg/0.2.7/download -> vcpkg-0.2.7.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/want/0.2.0/download -> want-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate test? ( https://dev.gentoo.org/~hattya/distfiles/yaskkserv2-testdata-202110.tar.xz )
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=757e6b728b56ba666ef534111e180d94
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 5243532ae21e..fb97278a3ca5 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/hdapsd-20141203-r2 b/metadata/md5-cache/app-laptop/hdapsd-20141203-r2
index 0ba35a1003db..d8ce88db05a8 100644
--- a/metadata/md5-cache/app-laptop/hdapsd-20141203-r2
+++ b/metadata/md5-cache/app-laptop/hdapsd-20141203-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=libconfig? ( dev-libs/libconfig:= )
 SLOT=0
 SRC_URI=https://github.com/evgeni/hdapsd/releases/download/20141203/hdapsd-20141203.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d12b50f9b7e16f1552bf8260328b8365
diff --git a/metadata/md5-cache/app-laptop/i8kutils-1.43 b/metadata/md5-cache/app-laptop/i8kutils-1.43
index 544773994671..943a770923d0 100644
--- a/metadata/md5-cache/app-laptop/i8kutils-1.43
+++ b/metadata/md5-cache/app-laptop/i8kutils-1.43
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/tcl sys-power/acpi
 SLOT=0
 SRC_URI=https://launchpad.net/i8kutils/trunk/1.43/+download/i8kutils_1.43.tar.xz -> i8kutils-1.43.tar.xz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b2b765d067ac93faf2a2f3cf9c8d0c50
diff --git a/metadata/md5-cache/app-laptop/mbpfan-2.1.1 b/metadata/md5-cache/app-laptop/mbpfan-2.1.1
index ecee6287014a..c64594dfcb3c 100644
--- a/metadata/md5-cache/app-laptop/mbpfan-2.1.1
+++ b/metadata/md5-cache/app-laptop/mbpfan-2.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dgraziotin/mbpfan/archive/v2.1.1.tar.gz -> mbpfan-2.1.1.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4c8105cdf3f921e3f5a18482ef2a3391
diff --git a/metadata/md5-cache/app-laptop/mbpfan-2.2.1 b/metadata/md5-cache/app-laptop/mbpfan-2.2.1
index da32f8e796be..c6116ba992dc 100644
--- a/metadata/md5-cache/app-laptop/mbpfan-2.2.1
+++ b/metadata/md5-cache/app-laptop/mbpfan-2.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dgraziotin/mbpfan/archive/v2.2.1.tar.gz -> mbpfan-2.2.1.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8ac03d6d1ec17e2695c9094693e532e0
diff --git a/metadata/md5-cache/app-laptop/mbpfan-9999 b/metadata/md5-cache/app-laptop/mbpfan-9999
index 556731244c48..a57459bdb74e 100644
--- a/metadata/md5-cache/app-laptop/mbpfan-9999
+++ b/metadata/md5-cache/app-laptop/mbpfan-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RESTRICT=test
 SLOT=0
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8ac03d6d1ec17e2695c9094693e532e0
diff --git a/metadata/md5-cache/app-laptop/pommed-1.39-r2 b/metadata/md5-cache/app-laptop/pommed-1.39-r2
index e998de4de657..f9da0ea6e0e2 100644
--- a/metadata/md5-cache/app-laptop/pommed-1.39-r2
+++ b/metadata/md5-cache/app-laptop/pommed-1.39-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib media-libs/audiofile dev-libs/confuse dev-libs/dbus-glib sys-apps/dbus sys-libs/zlib amd64? ( sys-apps/pciutils ) x86? ( sys-apps/pciutils ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXpm ) media-sound/alsa-utils sys-apps/util-linux
 SLOT=0
 SRC_URI=http://alioth.debian.org/frs/download.php/3583/pommed-1.39.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=488a05324ece43941d7b955ac491170e
diff --git a/metadata/md5-cache/app-laptop/tp_smapi-0.43-r1 b/metadata/md5-cache/app-laptop/tp_smapi-0.43-r1
index 8a0ac23546ac..c059828a5899 100644
--- a/metadata/md5-cache/app-laptop/tp_smapi-0.43-r1
+++ b/metadata/md5-cache/app-laptop/tp_smapi-0.43-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/dmidecode kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/evgeni/tp_smapi/releases/download/tp-smapi/0.43/tp_smapi-0.43.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=df35c217300f0cd1d55d7725b57933aa
diff --git a/metadata/md5-cache/app-laptop/tpb-0.6.4-r1 b/metadata/md5-cache/app-laptop/tpb-0.6.4-r1
index 63a6ecb912d6..f0d62e83d575 100644
--- a/metadata/md5-cache/app-laptop/tpb-0.6.4-r1
+++ b/metadata/md5-cache/app-laptop/tpb-0.6.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libXt x11-libs/libXext xosd? ( >=x11-libs/xosd-2.2.0 )
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/tpb/tpb-0.6.4.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2e56173b35453c3476e8dedde0918a80
diff --git a/metadata/md5-cache/app-laptop/tuxedo-keyboard-2.0.5-r1 b/metadata/md5-cache/app-laptop/tuxedo-keyboard-2.0.5-r1
index b06d6abc4903..400dc0297d96 100644
--- a/metadata/md5-cache/app-laptop/tuxedo-keyboard-2.0.5-r1
+++ b/metadata/md5-cache/app-laptop/tuxedo-keyboard-2.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/tuxedocomputers/tuxedo-keyboard/archive/v2.0.5.tar.gz -> tuxedo-keyboard-2.0.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=979a365d9093e7136d6f90201f57d358
diff --git a/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.8 b/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.8
index b4553c47c65c..aa6b7e4a4610 100644
--- a/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.8
+++ b/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/tuxedocomputers/tuxedo-keyboard/archive/v3.0.8.tar.gz -> tuxedo-keyboard-3.0.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=10db22c86bdb1afadccc50ffc6429212
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index d75fcea00116..c46cbee7d0d5 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
diff --git a/metadata/md5-cache/app-metrics/collectd-5.12.0-r1 b/metadata/md5-cache/app-metrics/collectd-5.12.0-r1
index 6274bd568917..8e66086190c5 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.12.0-r1
+++ b/metadata/md5-cache/app-metrics/collectd-5.12.0-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-group/collectd acct-user/collectd dev-libs/libgcrypt:= dev-libs/lib
 REQUIRED_USE=collectd_plugins_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) ) collectd_plugins_python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) collectd_plugins_smart? ( udev ) contrib? ( perl )
 SLOT=0
 SRC_URI=https://github.com/collectd/collectd/releases/download/collectd-5.12.0/collectd-5.12.0.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cc34a1cc462650d3f1a0702959eba52d
diff --git a/metadata/md5-cache/app-metrics/pushgateway-1.4.2 b/metadata/md5-cache/app-metrics/pushgateway-1.4.2
new file mode 100644
index 000000000000..bf11c002c0fc
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/pushgateway-1.4.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/promu-0.3.0 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=acct-group/pushgateway acct-user/pushgateway
+DESCRIPTION=Prometheus push acceptor for ephemeral and batch jobs
+EAPI=7
+HOMEPAGE=https://github.com/prometheus/pushgateway
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 MIT
+RDEPEND=acct-group/pushgateway acct-user/pushgateway
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/prometheus/pushgateway/archive/v1.4.2.tar.gz -> pushgateway-1.4.2.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/log/@v/v0.1.0.mod -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-kit/log/@v/v0.2.0.zip -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/go-kit/log/@v/v0.2.0.mod -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.1.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.1.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.zip -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.zip -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.zip -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.zip mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.29.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.29.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.31.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.31.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.31.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.31.1.mod mirror://goproxy//github.com/prometheus/exporter-toolkit/@v/v0.6.1.zip -> github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/prometheus/exporter-toolkit/@v/v0.6.1.mod -> github.com%2Fprometheus%2Fexporter-toolkit%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20190707220628-8d4bc4ba7749.zip -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20190707220628-8d4bc4ba7749.zip mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20190707220628-8d4bc4ba7749.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20190707220628-8d4bc4ba7749.mod mirror://goproxy//github.com/shurcoo!l/vfsgen/@v/v0.0.0-20200824052919-0d455de96546.zip -> github.com%2Fshurcoo!l%2Fvfsgen%2F@v%2Fv0.0.0-20200824052919-0d455de96546.zip mirror://goproxy//github.com/shurcoo!l/vfsgen/@v/v0.0.0-20200824052919-0d455de96546.mod -> github.com%2Fshurcoo!l%2Fvfsgen%2F@v%2Fv0.0.0-20200824052919-0d455de96546.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210616213533-5ff15b29337e.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210616213533-5ff15b29337e.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210525063256-abc453219eb5.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210525063256-abc453219eb5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210514164344-f6687ab2804c.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210514164344-f6687ab2804c.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210603081109-ebe580a85c40.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b3ef8ac6a2b41d29f3e3a07e9a90adb3
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index db3f40ce5495..1381e612b20b 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/actkbd-0.2.8-r2 b/metadata/md5-cache/app-misc/actkbd-0.2.8-r2
index 6450e1e478ad..8c1d6d0a6547 100644
--- a/metadata/md5-cache/app-misc/actkbd-0.2.8-r2
+++ b/metadata/md5-cache/app-misc/actkbd-0.2.8-r2
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/actkbd-0.2.8.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e56cbf5957e34c2d0f3a8f8c99f7dce9
diff --git a/metadata/md5-cache/app-misc/blink1-1.98-r2 b/metadata/md5-cache/app-misc/blink1-1.98-r2
index 40e7c869bf4f..5aef074aa685 100644
--- a/metadata/md5-cache/app-misc/blink1-1.98-r2
+++ b/metadata/md5-cache/app-misc/blink1-1.98-r2
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0
 RDEPEND=dev-libs/hidapi virtual/libusb:1 virtual/libudev sys-apps/attr sys-libs/libcap
 SLOT=0
 SRC_URI=https://github.com/todbot/blink1/archive/v1.98.tar.gz -> blink1-1.98.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c08b48cf386b800de329f569f3f72e18
diff --git a/metadata/md5-cache/app-misc/broot-1.6.4 b/metadata/md5-cache/app-misc/broot-1.6.4
new file mode 100644
index 000000000000..e1950f4bd411
--- /dev/null
+++ b/metadata/md5-cache/app-misc/broot-1.6.4
@@ -0,0 +1,14 @@
+BDEPEND=X? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) ) >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/libgit2:= X? ( x11-libs/libxcb:= )
+DESCRIPTION=A new way to see and navigate directory trees
+EAPI=8
+HOMEPAGE=https://dystroy.org/broot/ https://github.com/Canop/broot
+IUSE=X debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB
+RDEPEND=dev-libs/libgit2:= X? ( x11-libs/libxcb:= )
+SLOT=0
+SRC_URI=https://github.com/Canop/broot/archive/v1.6.4.tar.gz -> broot-1.6.4.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/ahash/0.4.7/download -> ahash-0.4.7.crate https://crates.io/api/v1/crates/ahash/0.7.4/download -> ahash-0.7.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_colours/1.0.4/download -> ansi_colours-1.0.4.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.42/download -> anyhow-1.0.42.crate https://crates.io/api/v1/crates/argh/0.1.5/download -> argh-0.1.5.crate https://crates.io/api/v1/crates/argh_derive/0.1.5/download -> argh_derive-0.1.5.crate https://crates.io/api/v1/crates/argh_shared/0.1.5/download -> argh_shared-0.1.5.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bet/1.0.0/download -> bet-1.0.0.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.16/download -> bstr-0.2.16.crate https://crates.io/api/v1/crates/bytemuck/1.7.2/download -> bytemuck-1.7.2.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.69/download -> cc-1.0.69.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/char_reader/0.1.0/download -> char_reader-0.1.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cli-log/0.1.0/download -> cli-log-0.1.0.crate https://crates.io/api/v1/crates/cli-log/2.0.0/download -> cli-log-2.0.0.crate https://crates.io/api/v1/crates/clipboard-win/4.2.1/download -> clipboard-win-4.2.1.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam/0.8.1/download -> crossbeam-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.1/download -> crossbeam-channel-0.5.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.5/download -> crossbeam-epoch-0.9.5.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.2/download -> crossbeam-queue-0.3.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/crossterm/0.19.0/download -> crossterm-0.19.0.crate https://crates.io/api/v1/crates/crossterm/0.21.0/download -> crossterm-0.21.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.7.0/download -> crossterm_winapi-0.7.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.8.0/download -> crossterm_winapi-0.8.0.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/csv2svg/0.1.5/download -> csv2svg-0.1.5.crate https://crates.io/api/v1/crates/custom_error/1.9.2/download -> custom_error-1.9.2.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/deser-hjson/1.0.2/download -> deser-hjson-1.0.2.crate https://crates.io/api/v1/crates/directories/3.0.2/download -> directories-3.0.2.crate https://crates.io/api/v1/crates/directories-next/2.0.0/download -> directories-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/error-code/2.3.0/download -> error-code-2.3.0.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/file-size/1.0.3/download -> file-size-1.0.3.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gif/0.11.2/download -> gif-0.11.2.crate https://crates.io/api/v1/crates/git2/0.13.20/download -> git2-0.13.20.crate https://crates.io/api/v1/crates/glassbench/0.3.0/download -> glassbench-0.3.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashlink/0.6.0/download -> hashlink-0.6.0.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/id-arena/2.2.1/download -> id-arena-2.2.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/image/0.23.14/download -> image-0.23.14.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/instant/0.1.10/download -> instant-0.1.10.crate https://crates.io/api/v1/crates/is_executable/1.0.1/download -> is_executable-1.0.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.22/download -> jobserver-0.1.22.crate https://crates.io/api/v1/crates/jpeg-decoder/0.1.22/download -> jpeg-decoder-0.1.22.crate https://crates.io/api/v1/crates/lazy-regex/2.2.1/download -> lazy-regex-2.2.1.crate https://crates.io/api/v1/crates/lazy-regex-proc_macros/2.2.1/download -> lazy-regex-proc_macros-2.2.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lfs-core/0.4.2/download -> lfs-core-0.4.2.crate https://crates.io/api/v1/crates/libc/0.2.98/download -> libc-0.2.98.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.21+1.1.0/download -> libgit2-sys-0.12.21+1.1.0.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.20.1/download -> libsqlite3-sys-0.20.1.crate https://crates.io/api/v1/crates/libz-sys/1.1.3/download -> libz-sys-1.1.3.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/lock_api/0.4.4/download -> lock_api-0.4.4.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.6.4/download -> memoffset-0.6.4.crate https://crates.io/api/v1/crates/minimad/0.7.1/download -> minimad-0.7.1.crate https://crates.io/api/v1/crates/minimad/0.8.0/download -> minimad-0.8.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.7.13/download -> mio-0.7.13.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/onig/6.2.0/download -> onig-6.2.0.crate https://crates.io/api/v1/crates/onig_sys/69.7.0/download -> onig_sys-69.7.0.crate https://crates.io/api/v1/crates/open/1.7.1/download -> open-1.7.1.crate https://crates.io/api/v1/crates/open/2.0.0/download -> open-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/pathdiff/0.2.0/download -> pathdiff-0.2.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.9.0/download -> phf-0.9.0.crate https://crates.io/api/v1/crates/phf_generator/0.9.0/download -> phf_generator-0.9.0.crate https://crates.io/api/v1/crates/phf_macros/0.9.0/download -> phf_macros-0.9.0.crate https://crates.io/api/v1/crates/phf_shared/0.9.0/download -> phf_shared-0.9.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plist/1.2.0/download -> plist-1.2.0.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.28/download -> proc-macro2-1.0.28.crate https://crates.io/api/v1/crates/proc-status/0.1.1/download -> proc-status-0.1.1.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/rayon/1.5.1/download -> rayon-1.5.1.crate https://crates.io/api/v1/crates/rayon-core/1.9.1/download -> rayon-core-1.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.9/download -> redox_syscall-0.2.9.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rusqlite/0.24.2/download -> rusqlite-0.24.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/secular/1.0.1/download -> secular-1.0.1.crate https://crates.io/api/v1/crates/serde/1.0.127/download -> serde-1.0.127.crate https://crates.io/api/v1/crates/serde_derive/1.0.127/download -> serde_derive-1.0.127.crate https://crates.io/api/v1/crates/serde_json/1.0.66/download -> serde_json-1.0.66.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook/0.3.9/download -> signal-hook-0.3.9.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.1/download -> signal-hook-mio-0.2.1.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/siphasher/0.3.6/download -> siphasher-0.3.6.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/splitty/0.1.0/download -> splitty-0.1.0.crate https://crates.io/api/v1/crates/str-buf/1.0.5/download -> str-buf-1.0.5.crate https://crates.io/api/v1/crates/strict/0.1.4/download -> strict-0.1.4.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/svg/0.8.2/download -> svg-0.8.2.crate https://crates.io/api/v1/crates/syn/1.0.74/download -> syn-1.0.74.crate https://crates.io/api/v1/crates/syntect/4.6.0/download -> syntect-4.6.0.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termimad/0.10.3/download -> termimad-0.10.3.crate https://crates.io/api/v1/crates/termimad/0.16.1/download -> termimad-0.16.1.crate https://crates.io/api/v1/crates/terminal-clipboard/0.2.1/download -> terminal-clipboard-0.2.1.crate https://crates.io/api/v1/crates/termux-clipboard/0.1.0/download -> termux-clipboard-0.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.26/download -> thiserror-1.0.26.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.26/download -> thiserror-impl-1.0.26.crate https://crates.io/api/v1/crates/tiff/0.6.1/download -> tiff-0.6.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.3.1/download -> tinyvec-1.3.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/umask/1.0.0/download -> umask-1.0.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/weezl/0.1.5/download -> weezl-0.1.5.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.2/download -> x11-clipboard-0.5.2.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d3d1bbfbd1f0c1e8b5d0a4a16811505a
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20210119.3.71 b/metadata/md5-cache/app-misc/ca-certificates-20210119.3.71
new file mode 100644
index 000000000000..ae6829b59e83
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ca-certificates-20210119.3.71
@@ -0,0 +1,13 @@
+BDEPEND=app-misc/c_rehash sys-apps/debianutils || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 )
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DESCRIPTION=Common CA Certificates PEM files
+EAPI=7
+HOMEPAGE=https://packages.debian.org/sid/ca-certificates
+IUSE=cacert
+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 ~x86-winnt
+LICENSE=MPL-1.1
+RDEPEND=app-misc/c_rehash sys-apps/debianutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20210119.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_71_RTM/src/nss-3.71.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3e452193392fdaa6aca4213cf648738e
diff --git a/metadata/md5-cache/app-misc/ckb-0.4.4-r1 b/metadata/md5-cache/app-misc/ckb-0.4.4-r1
deleted file mode 100644
index c252a096edd3..000000000000
--- a/metadata/md5-cache/app-misc/ckb-0.4.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/libdbusmenu-qt dev-libs/quazip:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-sound/pulseaudio virtual/libudev:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-wm dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Corsair K65/K70/K95 Driver
-EAPI=7
-HOMEPAGE=https://github.com/ckb-next/ckb-next
-IUSE=systemd
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/libdbusmenu-qt dev-libs/quazip:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-sound/pulseaudio virtual/libudev:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-wm
-SLOT=0
-SRC_URI=https://github.com/ckb-next/ckb-next/archive/v0.4.4.tar.gz -> ckb-0.4.4.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9c2792b9537779f82fe3a05cc1f48988
diff --git a/metadata/md5-cache/app-misc/ddcutil-0.9.9-r2 b/metadata/md5-cache/app-misc/ddcutil-0.9.9-r2
index 5ae7baa89952..3cb713d01564 100644
--- a/metadata/md5-cache/app-misc/ddcutil-0.9.9-r2
+++ b/metadata/md5-cache/app-misc/ddcutil-0.9.9-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm )
 REQUIRED_USE=drm? ( X )
 SLOT=0
 SRC_URI=https://github.com/rockowitz/ddcutil/archive/v0.9.9.tar.gz -> ddcutil-0.9.9.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=accf06dc94d624bc5288051d3d7a9979
diff --git a/metadata/md5-cache/app-misc/detox-1.4.2 b/metadata/md5-cache/app-misc/detox-1.4.2
deleted file mode 100644
index f159f4bc600f..000000000000
--- a/metadata/md5-cache/app-misc/detox-1.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/flex sys-devel/bison sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare
-DEPEND=!dev-python/detox
-DESCRIPTION=Safely remove spaces and strange characters from filenames
-EAPI=7
-HOMEPAGE=http://detox.sourceforge.net/ https://github.com/dharple/detox
-KEYWORDS=amd64 ~arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=!dev-python/detox
-SLOT=0
-SRC_URI=https://github.com/dharple/detox/archive/v1.4.2.tar.gz -> detox-1.4.2.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0d89071c48ae22dd3cec66b6ce391b55
diff --git a/metadata/md5-cache/app-misc/detox-1.4.2-r1 b/metadata/md5-cache/app-misc/detox-1.4.2-r1
new file mode 100644
index 000000000000..daeea911b215
--- /dev/null
+++ b/metadata/md5-cache/app-misc/detox-1.4.2-r1
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/flex sys-devel/bison sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=!dev-python/detox
+DESCRIPTION=Safely remove spaces and strange characters from filenames
+EAPI=7
+HOMEPAGE=http://detox.sourceforge.net/ https://github.com/dharple/detox
+KEYWORDS=amd64 ~arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!dev-python/detox
+SLOT=0
+SRC_URI=https://github.com/dharple/detox/archive/v1.4.2.tar.gz -> detox-1.4.2.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e0a42b765ef34132f4b9c65338d048fe
diff --git a/metadata/md5-cache/app-misc/detox-1.4.5 b/metadata/md5-cache/app-misc/detox-1.4.5
deleted file mode 100644
index 1320e126ec75..000000000000
--- a/metadata/md5-cache/app-misc/detox-1.4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare
-DEPEND=!dev-python/detox
-DESCRIPTION=Safely remove spaces and strange characters from filenames
-EAPI=7
-HOMEPAGE=http://detox.sourceforge.net/ https://github.com/dharple/detox
-KEYWORDS=amd64 ~arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=!dev-python/detox
-SLOT=0
-SRC_URI=https://github.com/dharple/detox/archive/v1.4.5.tar.gz -> detox-1.4.5.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dfb0cc8124d881377558217a6f699eb8
diff --git a/metadata/md5-cache/app-misc/detox-1.4.5-r1 b/metadata/md5-cache/app-misc/detox-1.4.5-r1
new file mode 100644
index 000000000000..1d5eaafbf849
--- /dev/null
+++ b/metadata/md5-cache/app-misc/detox-1.4.5-r1
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/bison sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=!dev-python/detox
+DESCRIPTION=Safely remove spaces and strange characters from filenames
+EAPI=7
+HOMEPAGE=http://detox.sourceforge.net/ https://github.com/dharple/detox
+KEYWORDS=amd64 ~arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!dev-python/detox
+SLOT=0
+SRC_URI=https://github.com/dharple/detox/archive/v1.4.5.tar.gz -> detox-1.4.5.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b5216ec6f6e3bcd450d1de26d2c01e01
diff --git a/metadata/md5-cache/app-misc/elasticsearch-6.8.19 b/metadata/md5-cache/app-misc/elasticsearch-6.8.19
index e8b5e1e41067..c0dc0b8e7971 100644
--- a/metadata/md5-cache/app-misc/elasticsearch-6.8.19
+++ b/metadata/md5-cache/app-misc/elasticsearch-6.8.19
@@ -10,4 +10,4 @@ RDEPEND=acct-group/elasticsearch acct-user/elasticsearch virtual/jre:1.8 virtual
 SLOT=0
 SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.19.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.8.19.tar.gz )
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6286ca23003b1314088cd5253d8345c2
+_md5_=955f24bb3b9e005082e9b48eda8b7263
diff --git a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r14 b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r14
index dc7718386cc1..ac79a158ac77 100644
--- a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r14
+++ b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r14
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 >=dev-libs/libg15-1.2.4 >=dev-libs/libg15render-1.2 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/g15daemon/g15daemon-1.9.5.3.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f22b807108279314eed77f2babdc377d
diff --git a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r15 b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r15
index 83056e0c3f4b..dc11ccac1ac7 100644
--- a/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r15
+++ b/metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r15
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 >=dev-libs/libg15-1.2.4 >=dev-libs/libg15render-1.2 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/g15daemon/g15daemon-1.9.5.3.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6f1c46f9f475aea30c891b0fbb850b95
diff --git a/metadata/md5-cache/app-misc/g15daemon-9999 b/metadata/md5-cache/app-misc/g15daemon-9999
index 5b3227e34c12..ee022654e660 100644
--- a/metadata/md5-cache/app-misc/g15daemon-9999
+++ b/metadata/md5-cache/app-misc/g15daemon-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=virtual/libusb:0 >=dev-libs/libg15-9999 >=dev-libs/libg15render-9999 perl? ( dev-lang/perl dev-perl/GDGraph >=dev-perl/Inline-0.4 )
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	c74febd1baf21b1229704d6a953c27db	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	subversion	c74febd1baf21b1229704d6a953c27db	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=290d2398386a7f900dbc1300f846e92a
diff --git a/metadata/md5-cache/app-misc/gcal-4.1 b/metadata/md5-cache/app-misc/gcal-4.1
index 23d771db37a9..5bda663a82aa 100644
--- a/metadata/md5-cache/app-misc/gcal-4.1
+++ b/metadata/md5-cache/app-misc/gcal-4.1
@@ -5,10 +5,10 @@ DESCRIPTION=The GNU Calendar - a replacement for cal
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gcal/
 IUSE=ncurses nls unicode
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+
 RDEPEND=nls? ( virtual/libintl ) unicode? ( dev-libs/libunistring:= )
 SLOT=0
 SRC_URI=mirror://gnu/gcal/gcal-4.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=55e98f7ad668e2419e9cc06a7ba7a33d
+_md5_=8b4a1d102b2a18c0ed00b3449cde9a5a
diff --git a/metadata/md5-cache/app-misc/geneweb-7.0.0-r2 b/metadata/md5-cache/app-misc/geneweb-7.0.0-r2
index 6a109809645f..be347fe25b9f 100644
--- a/metadata/md5-cache/app-misc/geneweb-7.0.0-r2
+++ b/metadata/md5-cache/app-misc/geneweb-7.0.0-r2
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/ocaml[ocamlopt?] <dev-ml/camlp5-8:=[ocamlopt?] acct-user/genewe
 RESTRICT=strip !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/geneweb/geneweb/archive/v7.0.0.tar.gz -> geneweb-7.0.0.tar.gz
-_md5_=09f14ad0abb12c26a31aed3bd3d09edb
+_md5_=a71157fa72702eaf8f754b4553f3a3df
diff --git a/metadata/md5-cache/app-misc/jdupes-1.20.0 b/metadata/md5-cache/app-misc/jdupes-1.20.0
new file mode 100644
index 000000000000..897e192ac1bd
--- /dev/null
+++ b/metadata/md5-cache/app-misc/jdupes-1.20.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Identify duplicate files on the filesystem
+EAPI=8
+HOMEPAGE=https://github.com/jbruchon/jdupes
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/jbruchon/jdupes/archive/refs/tags/v1.20.0.tar.gz -> jdupes-1.20.0.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f47b4994bab7b446c9ba1d69cc440554
diff --git a/metadata/md5-cache/app-misc/jdupes-9999 b/metadata/md5-cache/app-misc/jdupes-9999
new file mode 100644
index 000000000000..5ab4a132e0d1
--- /dev/null
+++ b/metadata/md5-cache/app-misc/jdupes-9999
@@ -0,0 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=Identify duplicate files on the filesystem
+EAPI=8
+HOMEPAGE=https://github.com/jbruchon/jdupes
+LICENSE=MIT
+PROPERTIES=live
+RESTRICT=test
+SLOT=0
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f47b4994bab7b446c9ba1d69cc440554
diff --git a/metadata/md5-cache/app-misc/kanatest-0.4.8 b/metadata/md5-cache/app-misc/kanatest-0.4.8
index f04f9772d89e..78d53f13956c 100644
--- a/metadata/md5-cache/app-misc/kanatest-0.4.8
+++ b/metadata/md5-cache/app-misc/kanatest-0.4.8
@@ -1,12 +1,13 @@
-DEFINED_PHASES=postinst postrm preinst prepare
-DEPEND=>=x11-libs/gtk+-2.12:2= dev-libs/libxml2:= virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=x11-libs/gtk+:2 dev-libs/libxml2:=
 DESCRIPTION=Visual flashcard tool for memorizing the Japanese Hiragana and Katakana alphabet
-EAPI=5
-HOMEPAGE=http://www.clayo.org/kanatest
+EAPI=8
+HOMEPAGE=https://www.clayo.org/kanatest
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2 GPL-2+
-RDEPEND=>=x11-libs/gtk+-2.12:2= dev-libs/libxml2:=
+RDEPEND=x11-libs/gtk+:2 dev-libs/libxml2:=
 SLOT=0
-SRC_URI=http://www.clayo.org/kanatest/kanatest-0.4.8.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aae20f42a727d637ed16fa84f0beef92
+SRC_URI=https://www.clayo.org/kanatest/kanatest-0.4.8.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=03d268c851a031bd49c3a1fa76432225
diff --git a/metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721 b/metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721
deleted file mode 100644
index 292f3ae366ab..000000000000
--- a/metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
-DEPEND=lcd_devices_cfontz? ( dev-libs/libhid:= ) lcd_devices_cfontzpacket? ( dev-libs/libhid:= ) lcd_devices_cwlnx? ( dev-libs/libhid:= ) lcd_devices_futaba? ( virtual/libusb:1= ) lcd_devices_g15? ( app-misc/g15daemon dev-libs/libg15render:= virtual/libusb:0= ) lcd_devices_glcd? ( app-misc/glcdprocdriver:= dev-embedded/libftdi:1= dev-libs/libhid:= dev-libs/serdisplib:= virtual/libusb:0= x11-libs/libX11:= ) lcd_devices_hd44780? ( dev-embedded/libftdi:1= dev-libs/libugpio:= virtual/libusb:0= ) lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= ) lcd_devices_irman? ( media-libs/libirman:= ) lcd_devices_iowarrior? ( virtual/libusb:0= ) lcd_devices_lirc? ( app-misc/lirc ) lcd_devices_lis? ( dev-embedded/libftdi:1= ) lcd_devices_lb216? ( dev-libs/libhid:= ) lcd_devices_mdm166a? ( dev-libs/libhid:= ) lcd_devices_mtc_s16209x? ( dev-libs/libhid:= ) lcd_devices_mx5000? ( app-misc/mx5000tools ) lcd_devices_noritakevfd? ( dev-libs/libhid:= ) lcd_devices_picolcd? ( virtual/libusb:1= ) lcd_devices_shuttlevfd? ( virtual/libusb:0= ) lcd_devices_ula200? ( dev-embedded/libftdi:1= ) lcd_devices_xosd? ( x11-libs/libX11:= x11-libs/xosd:= ) doc? ( app-doc/doxygen[dot] app-text/xmlto ) freetype? ( media-libs/freetype:2= ) nfs? ( net-fs/nfs-utils ) png? ( media-libs/libpng:0= ) samba? ( net-fs/samba )
-DESCRIPTION=Displays real-time system information from your Linux/*BSD box on a LCD
-EAPI=7
-HOMEPAGE=http://www.lcdproc.org/
-IUSE=debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu lcd_devices_bayrad lcd_devices_cfontz lcd_devices_cfontzpacket lcd_devices_curses lcd_devices_cwlnx lcd_devices_ea65 lcd_devices_eyeboxone lcd_devices_futaba lcd_devices_g15 +lcd_devices_glcd lcd_devices_glcdlib lcd_devices_glk lcd_devices_hd44780 lcd_devices_i2500vfd lcd_devices_icp_a106 lcd_devices_imon lcd_devices_imonlcd lcd_devices_iowarrior lcd_devices_irman lcd_devices_irtrans lcd_devices_joy lcd_devices_jw002 lcd_devices_lb216 lcd_devices_lcdm001 lcd_devices_lcterm lcd_devices_linux_input lcd_devices_lirc lcd_devices_lis lcd_devices_md8800 lcd_devices_mdm166a lcd_devices_ms6931 lcd_devices_mtc_s16209x lcd_devices_mtxorb lcd_devices_mx5000 lcd_devices_noritakevfd lcd_devices_olimex_mod_lcd1x9 lcd_devices_picolcd lcd_devices_pyramid lcd_devices_rawserial lcd_devices_sdeclcd lcd_devices_sed1330 lcd_devices_sed1520 lcd_devices_serialpos lcd_devices_serialvfd lcd_devices_shuttlevfd lcd_devices_sli lcd_devices_stv5730 lcd_devices_sureelec lcd_devices_t6963 lcd_devices_text lcd_devices_tyan lcd_devices_ula200 lcd_devices_vlsys_m428 lcd_devices_xosd lcd_devices_yard2lcd
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=lcd_devices_cfontz? ( dev-libs/libhid:= ) lcd_devices_cfontzpacket? ( dev-libs/libhid:= ) lcd_devices_cwlnx? ( dev-libs/libhid:= ) lcd_devices_futaba? ( virtual/libusb:1= ) lcd_devices_g15? ( app-misc/g15daemon dev-libs/libg15render:= virtual/libusb:0= ) lcd_devices_glcd? ( app-misc/glcdprocdriver:= dev-embedded/libftdi:1= dev-libs/libhid:= dev-libs/serdisplib:= virtual/libusb:0= x11-libs/libX11:= ) lcd_devices_hd44780? ( dev-embedded/libftdi:1= dev-libs/libugpio:= virtual/libusb:0= ) lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= ) lcd_devices_irman? ( media-libs/libirman:= ) lcd_devices_iowarrior? ( virtual/libusb:0= ) lcd_devices_lirc? ( app-misc/lirc ) lcd_devices_lis? ( dev-embedded/libftdi:1= ) lcd_devices_lb216? ( dev-libs/libhid:= ) lcd_devices_mdm166a? ( dev-libs/libhid:= ) lcd_devices_mtc_s16209x? ( dev-libs/libhid:= ) lcd_devices_mx5000? ( app-misc/mx5000tools ) lcd_devices_noritakevfd? ( dev-libs/libhid:= ) lcd_devices_picolcd? ( virtual/libusb:1= ) lcd_devices_shuttlevfd? ( virtual/libusb:0= ) lcd_devices_ula200? ( dev-embedded/libftdi:1= ) lcd_devices_xosd? ( x11-libs/libX11:= x11-libs/xosd:= )
-REQUIRED_USE=ethlcd? ( lcd_devices_hd44780 ) freetype? ( lcd_devices_glcd ) png? ( lcd_devices_glcd ) || ( lcd_devices_bayrad lcd_devices_cfontz lcd_devices_cfontzpacket lcd_devices_curses lcd_devices_cwlnx lcd_devices_ea65 lcd_devices_eyeboxone lcd_devices_futaba lcd_devices_g15 lcd_devices_glcd lcd_devices_glcdlib lcd_devices_glk lcd_devices_hd44780 lcd_devices_i2500vfd lcd_devices_icp_a106 lcd_devices_imon lcd_devices_imonlcd lcd_devices_iowarrior lcd_devices_irman lcd_devices_irtrans lcd_devices_joy lcd_devices_jw002 lcd_devices_lb216 lcd_devices_lcdm001 lcd_devices_lcterm lcd_devices_linux_input lcd_devices_lirc lcd_devices_lis lcd_devices_md8800 lcd_devices_mdm166a lcd_devices_ms6931 lcd_devices_mtc_s16209x lcd_devices_mtxorb lcd_devices_mx5000 lcd_devices_noritakevfd lcd_devices_olimex_mod_lcd1x9 lcd_devices_picolcd lcd_devices_pyramid lcd_devices_rawserial lcd_devices_sdeclcd lcd_devices_sed1330 lcd_devices_sed1520 lcd_devices_serialpos lcd_devices_serialvfd lcd_devices_shuttlevfd lcd_devices_sli lcd_devices_stv5730 lcd_devices_sureelec lcd_devices_t6963 lcd_devices_text lcd_devices_tyan lcd_devices_ula200 lcd_devices_vlsys_m428 lcd_devices_xosd lcd_devices_yard2lcd )
-SLOT=0
-SRC_URI=https://github.com/lcdproc/lcdproc/archive/9ec9ba4e5dda653288bc55d2898723aa2c2ad9c1.tar.gz -> lcdproc-0.5.9_p20200721.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a06d16d0ed158d272e7519f56b24cb28
diff --git a/metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721-r1 b/metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721-r1
new file mode 100644
index 000000000000..0c4107453c6b
--- /dev/null
+++ b/metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=lcd_devices_cfontz? ( dev-libs/libhid:= ) lcd_devices_cfontzpacket? ( dev-libs/libhid:= ) lcd_devices_cwlnx? ( dev-libs/libhid:= ) lcd_devices_futaba? ( virtual/libusb:1= ) lcd_devices_g15? ( app-misc/g15daemon dev-libs/libg15render:= virtual/libusb:0= ) lcd_devices_glcd? ( app-misc/glcdprocdriver:= dev-embedded/libftdi:1= dev-libs/libhid:= dev-libs/serdisplib:= virtual/libusb:0= x11-libs/libX11:= ) lcd_devices_hd44780? ( dev-embedded/libftdi:1= dev-libs/libugpio:= virtual/libusb:0= ) lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= ) lcd_devices_irman? ( media-libs/libirman:= ) lcd_devices_iowarrior? ( virtual/libusb:0= ) lcd_devices_lirc? ( app-misc/lirc ) lcd_devices_lis? ( dev-embedded/libftdi:1= ) lcd_devices_lb216? ( dev-libs/libhid:= ) lcd_devices_mdm166a? ( dev-libs/libhid:= ) lcd_devices_mtc_s16209x? ( dev-libs/libhid:= ) lcd_devices_mx5000? ( app-misc/mx5000tools ) lcd_devices_noritakevfd? ( dev-libs/libhid:= ) lcd_devices_picolcd? ( virtual/libusb:1= ) lcd_devices_shuttlevfd? ( virtual/libusb:0= ) lcd_devices_ula200? ( dev-embedded/libftdi:1= ) lcd_devices_xosd? ( x11-libs/libX11:= x11-libs/xosd:= ) doc? ( app-doc/doxygen[dot] app-text/xmlto ) nfs? ( net-fs/nfs-utils ) png? ( media-libs/libpng:0= ) samba? ( net-fs/samba ) truetype? ( media-libs/freetype:2= )
+DESCRIPTION=Displays real-time system information from your Linux/*BSD box on a LCD
+EAPI=7
+HOMEPAGE=http://www.lcdproc.org/
+IUSE=debug doc ethlcd extra-charmaps menu nfs png samba test-menu truetype lcd_devices_bayrad lcd_devices_cfontz lcd_devices_cfontzpacket lcd_devices_curses lcd_devices_cwlnx lcd_devices_ea65 lcd_devices_eyeboxone lcd_devices_futaba lcd_devices_g15 +lcd_devices_glcd lcd_devices_glcdlib lcd_devices_glk lcd_devices_hd44780 lcd_devices_i2500vfd lcd_devices_icp_a106 lcd_devices_imon lcd_devices_imonlcd lcd_devices_iowarrior lcd_devices_irman lcd_devices_irtrans lcd_devices_joy lcd_devices_jw002 lcd_devices_lb216 lcd_devices_lcdm001 lcd_devices_lcterm lcd_devices_linux_input lcd_devices_lirc lcd_devices_lis lcd_devices_md8800 lcd_devices_mdm166a lcd_devices_ms6931 lcd_devices_mtc_s16209x lcd_devices_mtxorb lcd_devices_mx5000 lcd_devices_noritakevfd lcd_devices_olimex_mod_lcd1x9 lcd_devices_picolcd lcd_devices_pyramid lcd_devices_rawserial lcd_devices_sdeclcd lcd_devices_sed1330 lcd_devices_sed1520 lcd_devices_serialpos lcd_devices_serialvfd lcd_devices_shuttlevfd lcd_devices_sli lcd_devices_stv5730 lcd_devices_sureelec lcd_devices_t6963 lcd_devices_text lcd_devices_tyan lcd_devices_ula200 lcd_devices_vlsys_m428 lcd_devices_xosd lcd_devices_yard2lcd
+KEYWORDS=amd64 ppc ppc64 x86
+LICENSE=GPL-2
+RDEPEND=lcd_devices_cfontz? ( dev-libs/libhid:= ) lcd_devices_cfontzpacket? ( dev-libs/libhid:= ) lcd_devices_cwlnx? ( dev-libs/libhid:= ) lcd_devices_futaba? ( virtual/libusb:1= ) lcd_devices_g15? ( app-misc/g15daemon dev-libs/libg15render:= virtual/libusb:0= ) lcd_devices_glcd? ( app-misc/glcdprocdriver:= dev-embedded/libftdi:1= dev-libs/libhid:= dev-libs/serdisplib:= virtual/libusb:0= x11-libs/libX11:= ) lcd_devices_hd44780? ( dev-embedded/libftdi:1= dev-libs/libugpio:= virtual/libusb:0= ) lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= ) lcd_devices_irman? ( media-libs/libirman:= ) lcd_devices_iowarrior? ( virtual/libusb:0= ) lcd_devices_lirc? ( app-misc/lirc ) lcd_devices_lis? ( dev-embedded/libftdi:1= ) lcd_devices_lb216? ( dev-libs/libhid:= ) lcd_devices_mdm166a? ( dev-libs/libhid:= ) lcd_devices_mtc_s16209x? ( dev-libs/libhid:= ) lcd_devices_mx5000? ( app-misc/mx5000tools ) lcd_devices_noritakevfd? ( dev-libs/libhid:= ) lcd_devices_picolcd? ( virtual/libusb:1= ) lcd_devices_shuttlevfd? ( virtual/libusb:0= ) lcd_devices_ula200? ( dev-embedded/libftdi:1= ) lcd_devices_xosd? ( x11-libs/libX11:= x11-libs/xosd:= )
+REQUIRED_USE=ethlcd? ( lcd_devices_hd44780 ) png? ( lcd_devices_glcd ) truetype? ( lcd_devices_glcd ) || ( lcd_devices_bayrad lcd_devices_cfontz lcd_devices_cfontzpacket lcd_devices_curses lcd_devices_cwlnx lcd_devices_ea65 lcd_devices_eyeboxone lcd_devices_futaba lcd_devices_g15 lcd_devices_glcd lcd_devices_glcdlib lcd_devices_glk lcd_devices_hd44780 lcd_devices_i2500vfd lcd_devices_icp_a106 lcd_devices_imon lcd_devices_imonlcd lcd_devices_iowarrior lcd_devices_irman lcd_devices_irtrans lcd_devices_joy lcd_devices_jw002 lcd_devices_lb216 lcd_devices_lcdm001 lcd_devices_lcterm lcd_devices_linux_input lcd_devices_lirc lcd_devices_lis lcd_devices_md8800 lcd_devices_mdm166a lcd_devices_ms6931 lcd_devices_mtc_s16209x lcd_devices_mtxorb lcd_devices_mx5000 lcd_devices_noritakevfd lcd_devices_olimex_mod_lcd1x9 lcd_devices_picolcd lcd_devices_pyramid lcd_devices_rawserial lcd_devices_sdeclcd lcd_devices_sed1330 lcd_devices_sed1520 lcd_devices_serialpos lcd_devices_serialvfd lcd_devices_shuttlevfd lcd_devices_sli lcd_devices_stv5730 lcd_devices_sureelec lcd_devices_t6963 lcd_devices_text lcd_devices_tyan lcd_devices_ula200 lcd_devices_vlsys_m428 lcd_devices_xosd lcd_devices_yard2lcd )
+SLOT=0
+SRC_URI=https://github.com/lcdproc/lcdproc/archive/9ec9ba4e5dda653288bc55d2898723aa2c2ad9c1.tar.gz -> lcdproc-0.5.9_p20200721.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f62c2d26d38b0363f9712bd59acbe775
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1-r4 b/metadata/md5-cache/app-misc/lirc-0.10.1-r4
index 294993a9e68d..bbed660cdee2 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.1-r4
+++ b/metadata/md5-cache/app-misc/lirc-0.10.1-r4
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) gtk? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.10.1.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=519dfb38e09ea20d11f621a769b8fdf7
diff --git a/metadata/md5-cache/app-misc/livecd-tools-2.10 b/metadata/md5-cache/app-misc/livecd-tools-2.10
index 47405805d115..5f3f345cbb0f 100644
--- a/metadata/md5-cache/app-misc/livecd-tools-2.10
+++ b/metadata/md5-cache/app-misc/livecd-tools-2.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-util/dialog media-sound/alsa-utils net-dialup/mingetty sys-apps/openrc sys-apps/pciutils
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/livecd-tools-2.10.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cfda044beec2b5f06b984f2439f71433
diff --git a/metadata/md5-cache/app-misc/livecd-tools-2.9 b/metadata/md5-cache/app-misc/livecd-tools-2.9
index 12c0ae28e434..6264ec2a8964 100644
--- a/metadata/md5-cache/app-misc/livecd-tools-2.9
+++ b/metadata/md5-cache/app-misc/livecd-tools-2.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-util/dialog media-sound/alsa-utils net-dialup/mingetty sys-apps/openrc sys-apps/pciutils
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/livecd-tools-2.9.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6893433d0d6aba6c022016606fab4269
diff --git a/metadata/md5-cache/app-misc/livecd-tools-9999 b/metadata/md5-cache/app-misc/livecd-tools-9999
index 1419b938b375..f37468cdfa6d 100644
--- a/metadata/md5-cache/app-misc/livecd-tools-9999
+++ b/metadata/md5-cache/app-misc/livecd-tools-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-util/dialog media-sound/alsa-utils net-dialup/mingetty sys-apps/openrc sys-apps/pciutils
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cd73d8a5c345b19ee189f1fce95007c0
diff --git a/metadata/md5-cache/app-misc/logiops-0.2.3 b/metadata/md5-cache/app-misc/logiops-0.2.3
index 6843187a5d05..8f2958ac0751 100644
--- a/metadata/md5-cache/app-misc/logiops-0.2.3
+++ b/metadata/md5-cache/app-misc/logiops-0.2.3
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/libconfig:=[cxx] dev-libs/libevdev virtual/libudev systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://github.com/PixlOne/logiops/archive/refs/tags/v0.2.3.tar.gz -> logiops-0.2.3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d06a2c00a8034d74f72b5403362fc704
diff --git a/metadata/md5-cache/app-misc/neofetch-7.1.0-r1 b/metadata/md5-cache/app-misc/neofetch-7.1.0-r1
index 8883e4a41259..02475d93ba08 100644
--- a/metadata/md5-cache/app-misc/neofetch-7.1.0-r1
+++ b/metadata/md5-cache/app-misc/neofetch-7.1.0-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Simple information system script
 EAPI=7
 HOMEPAGE=https://github.com/dylanaraps/neofetch
-KEYWORDS=~amd64 ~arm64 ~mips ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~mips ~ppc64 ~riscv x86
 LICENSE=MIT-with-advertising
 SLOT=0
 SRC_URI=https://github.com/dylanaraps/neofetch/archive/7.1.0/neofetch-7.1.0.tar.gz
 _eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	prefix	d04f14b297013ad1410550c0757f14f8
-_md5_=1b05c42110c33ce92d06d467c29618ec
+_md5_=d95e4397bee43a635736f293f0f80257
diff --git a/metadata/md5-cache/app-misc/recoll-1.27.12 b/metadata/md5-cache/app-misc/recoll-1.27.12
index 792a9fbc91d9..41905851d180 100644
--- a/metadata/md5-cache/app-misc/recoll-1.27.12
+++ b/metadata/md5-cache/app-misc/recoll-1.27.12
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmli
 REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/recoll/recoll-1.27.12.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a5f9f0a7e7c073e5d66bdcab8b3b389b
diff --git a/metadata/md5-cache/app-misc/recoll-1.28.5 b/metadata/md5-cache/app-misc/recoll-1.28.5
index 0f68cacaa33f..e88e55e1fcaf 100644
--- a/metadata/md5-cache/app-misc/recoll-1.28.5
+++ b/metadata/md5-cache/app-misc/recoll-1.28.5
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmli
 REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/recoll/recoll-1.28.5.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6e02deb01f07729d77021f6ccebecd1b
diff --git a/metadata/md5-cache/app-misc/recoll-1.29.2 b/metadata/md5-cache/app-misc/recoll-1.29.2
index 6834b5bc817b..d640770193dd 100644
--- a/metadata/md5-cache/app-misc/recoll-1.29.2
+++ b/metadata/md5-cache/app-misc/recoll-1.29.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmli
 REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/recoll/recoll-1.29.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6e02deb01f07729d77021f6ccebecd1b
diff --git a/metadata/md5-cache/app-misc/recoll-1.31.0 b/metadata/md5-cache/app-misc/recoll-1.31.0
index feec306d44c1..c9fdad4a65aa 100644
--- a/metadata/md5-cache/app-misc/recoll-1.31.0
+++ b/metadata/md5-cache/app-misc/recoll-1.31.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmli
 REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/recoll/recoll-1.31.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d84cc7f65a26a28a486fd1c9d576abc0
diff --git a/metadata/md5-cache/app-misc/solaar-1.0.5-r2 b/metadata/md5-cache/app-misc/solaar-1.0.5-r2
index 01a3e4164781..057e5cca2175 100644
--- a/metadata/md5-cache/app-misc/solaar-1.0.5-r2
+++ b/metadata/md5-cache/app-misc/solaar-1.0.5-r2
@@ -11,5 +11,5 @@ RDEPEND=acct-group/plugdev python_single_target_python3_8? ( dev-python/psutil[p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/pwr-Solaar/Solaar/archive/1.0.5.tar.gz -> solaar-1.0.5.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=113e242bcf90e836761cc8dbcf048c11
diff --git a/metadata/md5-cache/app-misc/solaar-9999 b/metadata/md5-cache/app-misc/solaar-9999
index 2e272280a750..f289863dc14e 100644
--- a/metadata/md5-cache/app-misc/solaar-9999
+++ b/metadata/md5-cache/app-misc/solaar-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=acct-group/plugdev python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-xlib[python_targets_python3_8(-)] >=dev-python/pyudev-0.13[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-xlib[python_targets_python3_9(-)] >=dev-python/pyudev-0.13[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) x11-libs/gtk+:3[introspection] appindicator? ( dev-libs/libappindicator:3[introspection] ) libnotify? ( x11-libs/libnotify[introspection] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d175e13818ce820f1eea2fd84ea1e585
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.7.1 b/metadata/md5-cache/app-misc/spacenavd-0.7.1
index 6d6c3ee3669f..070f8ac48056 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.7.1
+++ b/metadata/md5-cache/app-misc/spacenavd-0.7.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo x11-base/xorg-proto x11-libs/libX11 x11-libs/libXi )
 SLOT=0
 SRC_URI=https://github.com/FreeSpacenav/spacenavd/releases/download/v0.7.1/spacenavd-0.7.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c51cebfdb7d615a604b9327164d5a303
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.8 b/metadata/md5-cache/app-misc/spacenavd-0.8
index f600b2941ac9..b6a0083c12a7 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.8
+++ b/metadata/md5-cache/app-misc/spacenavd-0.8
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo x11-base/xorg-proto x11-libs/libX11 x11-libs/libXi )
 SLOT=0
 SRC_URI=https://github.com/FreeSpacenav/spacenavd/releases/download/v0.8/spacenavd-0.8.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2dde2581b6d44cf7f355446355cdb02b
diff --git a/metadata/md5-cache/app-misc/srm-1.2.15 b/metadata/md5-cache/app-misc/srm-1.2.15
index ca27cc8faf44..6bd3c809c987 100644
--- a/metadata/md5-cache/app-misc/srm-1.2.15
+++ b/metadata/md5-cache/app-misc/srm-1.2.15
@@ -1,12 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure postinst prepare
-DEPEND=!app-misc/secure-delete sys-kernel/linux-headers sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-kernel/linux-headers
 DESCRIPTION=A command-line compatible rm which destroys file contents before unlinking
-EAPI=5
+EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/srm/
 IUSE=debug
 KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/srm/srm-1.2.15.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5892f535ddaad1fff84ef25a833c11f2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b83de18183f4d6799ebe6b72b75436df
diff --git a/metadata/md5-cache/app-misc/supercat-0.5.7 b/metadata/md5-cache/app-misc/supercat-0.5.7
index aac3edcb5d52..664d083cc9de 100644
--- a/metadata/md5-cache/app-misc/supercat-0.5.7
+++ b/metadata/md5-cache/app-misc/supercat-0.5.7
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=A text file colorizer using powerful regular expressions
 EAPI=7
 HOMEPAGE=http://supercat.nosredna.net
-KEYWORDS=~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://supercat.nosredna.net/supercat-0.5.7.tar.gz
-_md5_=9507ceba3efad228151bd48c0ae3b5b3
+_md5_=75ae62aaf7697fe9f8498de5dbfe0b71
diff --git a/metadata/md5-cache/app-misc/tmux-3.2a b/metadata/md5-cache/app-misc/tmux-3.2a
index 565738ab7891..77b600e6b847 100644
--- a/metadata/md5-cache/app-misc/tmux-3.2a
+++ b/metadata/md5-cache/app-misc/tmux-3.2a
@@ -5,10 +5,10 @@ DESCRIPTION=Terminal multiplexer
 EAPI=7
 HOMEPAGE=https://tmux.github.io/
 IUSE=debug selinux utempter vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=ISC
 RDEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( sys-libs/libutempter ) selinux? ( sec-policy/selinux-screen ) vim-syntax? ( app-vim/vim-tmux )
 SLOT=0
 SRC_URI=https://github.com/tmux/tmux/releases/download/3.2a/tmux-3.2a.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d2ecbe121ca36040632843cbc9acf3aa
+_md5_=d300dc5a337e6ecde42f03614938ece5
diff --git a/metadata/md5-cache/app-misc/tmux-xpanes-4.1.2-r1 b/metadata/md5-cache/app-misc/tmux-xpanes-4.1.2-r1
deleted file mode 100644
index 095546fda056..000000000000
--- a/metadata/md5-cache/app-misc/tmux-xpanes-4.1.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=tmux-based terminal divider
-EAPI=7
-HOMEPAGE=https://github.com/greymd/tmux-xpanes
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/greymd/tmux-xpanes/archive/v4.1.2.tar.gz -> tmux-xpanes-4.1.2.tar.gz
-_md5_=460a65951e0a9cd7d358a9c9202b12b2
diff --git a/metadata/md5-cache/app-misc/tmux-xpanes-4.1.3-r1 b/metadata/md5-cache/app-misc/tmux-xpanes-4.1.3-r1
index ba0948a87f25..726615c2c101 100644
--- a/metadata/md5-cache/app-misc/tmux-xpanes-4.1.3-r1
+++ b/metadata/md5-cache/app-misc/tmux-xpanes-4.1.3-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=tmux-based terminal divider
 EAPI=7
 HOMEPAGE=https://github.com/greymd/tmux-xpanes
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=app-misc/tmux dev-lang/perl dev-libs/openssl:0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/greymd/tmux-xpanes/archive/v4.1.3.tar.gz -> tmux-xpanes-4.1.3.tar.gz
-_md5_=22848f312572ff908f7f3b8e5e65bf70
+_md5_=460a65951e0a9cd7d358a9c9202b12b2
diff --git a/metadata/md5-cache/app-misc/tracker-2.3.5-r1 b/metadata/md5-cache/app-misc/tracker-2.3.5-r1
index 72f87ec5eecc..c74c5157ac75 100644
--- a/metadata/md5-cache/app-misc/tracker-2.3.5-r1
+++ b/metadata/md5-cache/app-misc/tracker-2.3.5-r1
@@ -11,5 +11,5 @@ PDEPEND=miners? ( >=app-misc/tracker-miners-2.3 )
 RDEPEND=>=dev-libs/glib-2.46:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.0 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.20.0 networkmanager? ( >=net-misc/networkmanager-0.8 ) stemmer? ( dev-libs/snowball-stemmer:= ) sys-apps/util-linux
 SLOT=0/2.0
 SRC_URI=mirror://gnome/sources/tracker/2.3/tracker-2.3.5.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=792861a92ba03eb30a887a02ec87cc23
diff --git a/metadata/md5-cache/app-misc/tracker-2.3.6-r1 b/metadata/md5-cache/app-misc/tracker-2.3.6-r1
index 859b037c47f3..1c16b43800ff 100644
--- a/metadata/md5-cache/app-misc/tracker-2.3.6-r1
+++ b/metadata/md5-cache/app-misc/tracker-2.3.6-r1
@@ -11,5 +11,5 @@ PDEPEND=miners? ( >=app-misc/tracker-miners-2.3 )
 RDEPEND=>=dev-libs/glib-2.46:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.0 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.20.0 networkmanager? ( >=net-misc/networkmanager-0.8 ) stemmer? ( dev-libs/snowball-stemmer:= ) sys-apps/util-linux
 SLOT=0/2.0
 SRC_URI=mirror://gnome/sources/tracker/2.3/tracker-2.3.6.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a001eac532b9304a76e9115f4e2a512a
diff --git a/metadata/md5-cache/app-misc/tracker-3.1.2-r1 b/metadata/md5-cache/app-misc/tracker-3.1.2-r1
index 6cc62a403f68..7bdfdb155322 100644
--- a/metadata/md5-cache/app-misc/tracker-3.1.2-r1
+++ b/metadata/md5-cache/app-misc/tracker-3.1.2-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspe
 RESTRICT=!test? ( test )
 SLOT=3/0
 SRC_URI=mirror://gnome/sources/tracker/3.1/tracker-3.1.2.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4afd6fe57f0088185b39d4b9f4594842
diff --git a/metadata/md5-cache/app-misc/ttyload-0.5.3-r1 b/metadata/md5-cache/app-misc/ttyload-0.5.3-r1
index e8355f6c930f..5bb2df5177a9 100644
--- a/metadata/md5-cache/app-misc/ttyload-0.5.3-r1
+++ b/metadata/md5-cache/app-misc/ttyload-0.5.3-r1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=color-coded graph of load averages over time
 EAPI=8
 HOMEPAGE=https://www.daveltd.com/src/util/ttyload https://github.com/lindes/ttyload
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.daveltd.com/src/util/ttyload/ttyload-0.5.3.tar.bz2
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=644fe3915f56ac10af847fbac1f7baae
+_md5_=89191129695a38536477e458595bebb6
diff --git a/metadata/md5-cache/app-misc/uptimed-0.4.3 b/metadata/md5-cache/app-misc/uptimed-0.4.3
deleted file mode 100644
index ae70f7b0401b..000000000000
--- a/metadata/md5-cache/app-misc/uptimed-0.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=acct-group/uptimed acct-user/uptimed sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/uptimed acct-user/uptimed
-DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
-EAPI=7
-HOMEPAGE=https://github.com/rpodgorny/uptimed/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/uptimed acct-user/uptimed
-SLOT=0
-SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.3.tar.gz -> uptimed-0.4.3.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=04b764d4a15d88c3429248c82a795e66
diff --git a/metadata/md5-cache/app-misc/uptimed-0.4.4 b/metadata/md5-cache/app-misc/uptimed-0.4.4
index 00b4f1f5433e..174ed4431bd2 100644
--- a/metadata/md5-cache/app-misc/uptimed-0.4.4
+++ b/metadata/md5-cache/app-misc/uptimed-0.4.4
@@ -4,10 +4,10 @@ DEPEND=acct-group/uptimed acct-user/uptimed
 DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
 EAPI=8
 HOMEPAGE=https://github.com/rpodgorny/uptimed/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-group/uptimed acct-user/uptimed
 SLOT=0
 SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.4.tar.gz -> uptimed-0.4.4.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e875aa7a01b288fa79f73e7a084a38b5
+_md5_=a556a78a68b90e15458a1141e7ce0088
diff --git a/metadata/md5-cache/app-misc/uptimed-0.4.5 b/metadata/md5-cache/app-misc/uptimed-0.4.5
new file mode 100644
index 000000000000..911954f8c39f
--- /dev/null
+++ b/metadata/md5-cache/app-misc/uptimed-0.4.5
@@ -0,0 +1,13 @@
+BDEPEND=acct-group/uptimed acct-user/uptimed sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare
+DEPEND=acct-group/uptimed acct-user/uptimed
+DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
+EAPI=8
+HOMEPAGE=https://github.com/rpodgorny/uptimed/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/uptimed acct-user/uptimed
+SLOT=0
+SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.5.tar.gz -> uptimed-0.4.5.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e875aa7a01b288fa79f73e7a084a38b5
diff --git a/metadata/md5-cache/app-misc/vifm-0.11 b/metadata/md5-cache/app-misc/vifm-0.11
index 4bac25cfed13..185d89b46e95 100644
--- a/metadata/md5-cache/app-misc/vifm-0.11
+++ b/metadata/md5-cache/app-misc/vifm-0.11
@@ -5,10 +5,10 @@ DESCRIPTION=Console file manager with vi(m)-like keybindings
 EAPI=7
 HOMEPAGE=https://vifm.info/
 IUSE=developer +extended-keys gtk +magic +vim +vim-syntax X
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 ~arm64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) vim? ( || ( app-editors/vim app-editors/gvim ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/vifm/vifm/archive/v0.11.tar.gz -> vifm-0.11.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9916547319765fdd0ddf586d8187d1ae
+_md5_=01c43791b488f179cd72dad96570cbeb
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index 8d8b0ba3070f..ef008e9969a5 100644
--- a/metadata/md5-cache/app-mobilephone/Manifest.gz
+++ b/metadata/md5-cache/app-mobilephone/Manifest.gz
diff --git a/metadata/md5-cache/app-mobilephone/dfu-util-0.11 b/metadata/md5-cache/app-mobilephone/dfu-util-0.11
index 232a2b96b0a2..b593deea8668 100644
--- a/metadata/md5-cache/app-mobilephone/dfu-util-0.11
+++ b/metadata/md5-cache/app-mobilephone/dfu-util-0.11
@@ -4,9 +4,9 @@ DEPEND=virtual/libusb:1
 DESCRIPTION=implements the Host (PC) side of the USB DFU (Device Firmware Upgrade) protocol
 EAPI=8
 HOMEPAGE=http://dfu-util.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=mirror://sourceforge/dfu-util/dfu-util-0.11.tar.gz
-_md5_=09849f76f5cee3feeaac2a1f5611fb26
+_md5_=de647d9c88d17a48decd01d989068ea5
diff --git a/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r3 b/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r3
index 1c2a52186b2e..ee7d4bc31d50 100644
--- a/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r3
+++ b/metadata/md5-cache/app-mobilephone/gnokii-0.6.31-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!app-mobilephone/smstools dev-libs/glib:2 bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( postgres? ( dev-db/postgresql:* ) mysql? ( dev-db/mysql-connector-c:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=https://www.gnokii.org/download/gnokii/gnokii-0.6.31.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=01397246bb366361e1d800f40b6f5d63
diff --git a/metadata/md5-cache/app-mobilephone/gnokii-9999 b/metadata/md5-cache/app-mobilephone/gnokii-9999
index 45cfd9f12db8..afbb8c6a106f 100644
--- a/metadata/md5-cache/app-mobilephone/gnokii-9999
+++ b/metadata/md5-cache/app-mobilephone/gnokii-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=!app-mobilephone/smstools bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) ical? ( dev-libs/libical:= ) pcsc-lite? ( sys-apps/pcsc-lite ) sms? ( dev-libs/glib:2 postgres? ( dev-db/postgresql:* ) mysql? ( dev-db/mysql-connector-c:= ) ) usb? ( virtual/libusb:0 ) X? ( x11-libs/gtk+:2 )
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ccf9777dd7bf9bec6da4e7b27c54b41b
diff --git a/metadata/md5-cache/app-mobilephone/vmoconv-1.0-r1 b/metadata/md5-cache/app-mobilephone/vmoconv-1.0-r1
index 02828030ad2f..adc685a9637c 100644
--- a/metadata/md5-cache/app-mobilephone/vmoconv-1.0-r1
+++ b/metadata/md5-cache/app-mobilephone/vmoconv-1.0-r1
@@ -1,12 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
-DEPEND=media-sound/gsm sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-sound/gsm
 DESCRIPTION=A tool that converts Siemens phones VMO and VMI audio files to gsm and wav
-EAPI=5
+EAPI=8
 HOMEPAGE=http://triq.net/obex/
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=media-sound/gsm
 SLOT=0
 SRC_URI=http://triq.net/obexftp/vmoconv-1.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=106443890b515364815b5c514a784a49
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=313742f7cf8218b7b7898b1872a9eef6
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 1b1b3b76fe99..c3e0d08219b9 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/scribus-1.5.7 b/metadata/md5-cache/app-office/scribus-1.5.7
index 1a7a5d77d737..27eaf96ca1c6 100644
--- a/metadata/md5-cache/app-office/scribus-1.5.7
+++ b/metadata/md5-cache/app-office/scribus-1.5.7
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=https://pilotfiber.dl.sourceforge.net/project/scribus/scribus-devel/1.5.7/scribus-1.5.7.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c6011cddd17b287568dcb84efd680b09
+_md5_=7be33102e0b05d163cd677b654d21070
diff --git a/metadata/md5-cache/app-office/texstudio-4.0.1 b/metadata/md5-cache/app-office/texstudio-4.0.1
new file mode 100644
index 000000000000..7733852614ad
--- /dev/null
+++ b/metadata/md5-cache/app-office/texstudio-4.0.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=app-text/hunspell:= app-text/poppler:=[qt5] >=dev-libs/quazip-0.7.3-r1:0= dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( >=media-libs/phonon-4.11.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Free cross-platform LaTeX editor (fork from texmakerX)
+EAPI=7
+HOMEPAGE=https://www.texstudio.org https://github.com/texstudio-org/texstudio
+IUSE=video
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/hunspell:= app-text/poppler:=[qt5] >=dev-libs/quazip-0.7.3-r1:0= dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( >=media-libs/phonon-4.11.0 ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
+SLOT=0
+SRC_URI=https://github.com/texstudio-org/texstudio/archive/4.0.1.tar.gz -> texstudio-4.0.1.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=15a7668f0fbfb1bf50dbe8d0953b49a3
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index ec461d4c5f36..a4114a304ea6 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/genlop-0.30.10-r2 b/metadata/md5-cache/app-portage/genlop-0.30.10-r2
index 0c02f8842ba3..e81d0e9d2d36 100644
--- a/metadata/md5-cache/app-portage/genlop-0.30.10-r2
+++ b/metadata/md5-cache/app-portage/genlop-0.30.10-r2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/libwww-perl
 DESCRIPTION=A nice emerge.log parser
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Perl
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/libwww-perl
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/genlop-0.30.10.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=496e5503ce47327ecaa60501c9348ffa
+_md5_=b54ddb1dd24bfd6b57fdbd09a067f26d
diff --git a/metadata/md5-cache/app-portage/grs-0.7 b/metadata/md5-cache/app-portage/grs-0.7
index d41bc9337e8d..dc1fc9141568 100644
--- a/metadata/md5-cache/app-portage/grs-0.7
+++ b/metadata/md5-cache/app-portage/grs-0.7
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-cdr/cdrtools app-cryp
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/grs/grs-0.7.tar.gz https://dev.gentoo.org/~blueness/grs/ISO-1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dd5bf0eba419b7f8367001464aae144f
diff --git a/metadata/md5-cache/app-portage/grs-9999 b/metadata/md5-cache/app-portage/grs-9999
index 4bc4781a3ac6..e714e9fcab8b 100644
--- a/metadata/md5-cache/app-portage/grs-9999
+++ b/metadata/md5-cache/app-portage/grs-9999
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-cdr/cdrtools app-cryp
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/grs/ISO-1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d19513638f1155a27ab46720fd87b7e
diff --git a/metadata/md5-cache/app-portage/layman-2.4.3 b/metadata/md5-cache/app-portage/layman-2.4.3
index 2dc713ffe3d2..7d02dd7d570f 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.3
+++ b/metadata/md5-cache/app-portage/layman-2.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.4.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a22746a2707e677b360e3e099e73038a
diff --git a/metadata/md5-cache/app-portage/layman-9999 b/metadata/md5-cache/app-portage/layman-9999
index 8a1bd0cb3d06..abfdf13ce883 100644
--- a/metadata/md5-cache/app-portage/layman-9999
+++ b/metadata/md5-cache/app-portage/layman-9999
@@ -11,5 +11,5 @@ RDEPEND=cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercu
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7197b456d11e930f6f7037e9510382f6
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-11 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-11
index 9ad5a4e990d2..75f1f5205f01 100644
--- a/metadata/md5-cache/app-portage/mgorny-dev-scripts-11
+++ b/metadata/md5-cache/app-portage/mgorny-dev-scripts-11
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Handy scripts for ebuild development and more
 EAPI=8
 HOMEPAGE=https://github.com/mgorny/mgorny-dev-scripts
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD-2
 RDEPEND=app-portage/gentoolkit dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
 SLOT=0
 SRC_URI=https://github.com/mgorny/mgorny-dev-scripts/archive/v11.tar.gz -> mgorny-dev-scripts-11.tar.gz
-_md5_=15efe61cc9a6c84ed8d6e98d188fb147
+_md5_=9ad829566f189b60fba290690b2bc773
diff --git a/metadata/md5-cache/app-portage/pfl-3.1-r1 b/metadata/md5-cache/app-portage/pfl-3.1-r1
index dc08b3a38f5e..6859ce92d6f2 100644
--- a/metadata/md5-cache/app-portage/pfl-3.1-r1
+++ b/metadata/md5-cache/app-portage/pfl-3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Searchable online file/package database for Gentoo
 EAPI=7
 HOMEPAGE=http://www.portagefilelist.de https://github.com/portagefilelist/client
 IUSE=+network-cron python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/curl sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] network-cron? ( sys-apps/util-linux[caps] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/portagefilelist/client/archive/3.1.tar.gz -> pfl-3.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f7bb5881fcf01172fae768f79f7187a5
+_md5_=6e670d9ed18e3e13d38189212ad4b21c
diff --git a/metadata/md5-cache/app-portage/pkg-testing-tools-0.1.0 b/metadata/md5-cache/app-portage/pkg-testing-tools-0.1.0
index dabbe312774b..a13c06f24ec0 100644
--- a/metadata/md5-cache/app-portage/pkg-testing-tools-0.1.0
+++ b/metadata/md5-cache/app-portage/pkg-testing-tools-0.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Packages testing tools for Gentoo
 EAPI=7
 HOMEPAGE=https://github.com/slashbeast/pkg-testing-tools
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/slashbeast/pkg-testing-tools/archive/refs/tags/v0.1.0.tar.gz -> pkg-testing-tools-0.1.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fa34a6231a5a2645e62947b7a2a95ff4
+_md5_=e2c26a81aa025d0adecc82a6773afec5
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 63a892cc3aaa..750eb384902b 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/bash-5.1_p8 b/metadata/md5-cache/app-shells/bash-5.1_p8
index 623f894d4ebe..5d39a57ef351 100644
--- a/metadata/md5-cache/app-shells/bash-5.1_p8
+++ b/metadata/md5-cache/app-shells/bash-5.1_p8
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-5.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007 ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008 mirror://gnu/bash/bash-5.1-patches/bash51-001 mirror://gnu/bash/bash-5.1-patches/bash51-002 mirror://gnu/bash/bash-5.1-patches/bash51-003 mirror://gnu/bash/bash-5.1-patches/bash51-004 mirror://gnu/bash/bash-5.1-patches/bash51-005 mirror://gnu/bash/bash-5.1-patches/bash51-006 mirror://gnu/bash/bash-5.1-patches/bash51-007 mirror://gnu/bash/bash-5.1-patches/bash51-008
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7eb2465272a8a2e55fdde75ef2493c71
+_md5_=4d21bdf48c2950bd1c6aca6fc51dbbbb
diff --git a/metadata/md5-cache/app-shells/yash-2.50 b/metadata/md5-cache/app-shells/yash-2.50
deleted file mode 100644
index 96d457288359..000000000000
--- a/metadata/md5-cache/app-shells/yash-2.50
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) test? ( sys-apps/ed )
-DEFINED_PHASES=configure
-DEPEND=sys-libs/ncurses:= nls? ( virtual/libintl )
-DESCRIPTION=Yash is a POSIX-compliant command line shell
-EAPI=7
-HOMEPAGE=https://yash.osdn.jp/
-IUSE=nls test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=sys-libs/ncurses:= nls? ( virtual/libintl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/yash/73097/yash-2.50.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6f4c680d0caffeb4ee42ba5047e716ed
diff --git a/metadata/md5-cache/app-shells/yash-2.51 b/metadata/md5-cache/app-shells/yash-2.51
index 2e895450d000..c4c9955303fd 100644
--- a/metadata/md5-cache/app-shells/yash-2.51
+++ b/metadata/md5-cache/app-shells/yash-2.51
@@ -5,11 +5,11 @@ DESCRIPTION=Yash is a POSIX-compliant command line shell
 EAPI=7
 HOMEPAGE=https://yash.osdn.jp/
 IUSE=nls test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=sys-libs/ncurses:= nls? ( virtual/libintl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/yash/74064/yash-2.51.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=35ad169005bc59096c7e6397da5f74cc
+_md5_=8fb01016010baa9fc4d14380cda82e8e
diff --git a/metadata/md5-cache/app-shells/yash-2.52 b/metadata/md5-cache/app-shells/yash-2.52
new file mode 100644
index 000000000000..ce952dad18f3
--- /dev/null
+++ b/metadata/md5-cache/app-shells/yash-2.52
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) test? ( sys-apps/ed )
+DEFINED_PHASES=configure
+DEPEND=sys-libs/ncurses:= nls? ( virtual/libintl )
+DESCRIPTION=Yash is a POSIX-compliant command line shell
+EAPI=7
+HOMEPAGE=https://yash.osdn.jp/
+IUSE=nls test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=sys-libs/ncurses:= nls? ( virtual/libintl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge.jp/yash/76153/yash-2.52.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3311aaf62da932fa0a06350fc9732227
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 3b4d58b19efc..f0a6c286f83d 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/build-docbook-catalog-2.1 b/metadata/md5-cache/app-text/build-docbook-catalog-2.1
index de7a7b79fdff..c71e840920d0 100644
--- a/metadata/md5-cache/app-text/build-docbook-catalog-2.1
+++ b/metadata/md5-cache/app-text/build-docbook-catalog-2.1
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 || ( sys-apps/util-linux app-misc/getopt )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/build-docbook-catalog-2.1.tar.bz2
-_md5_=90dad923ec74e60149edd7f393ba6892
+_md5_=de99cfc440d5614cc09cc40e3b5c55a9
diff --git a/metadata/md5-cache/app-text/coolreader-3.2.57 b/metadata/md5-cache/app-text/coolreader-3.2.57
deleted file mode 100644
index f13a35555f6d..000000000000
--- a/metadata/md5-cache/app-text/coolreader-3.2.57
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz dev-libs/libunibreak wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !wxwidgets? ( dev-qt/linguist-tools:5 ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
-EAPI=7
-HOMEPAGE=https://github.com/buggins/coolreader/
-IUSE=wxwidgets
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz dev-libs/libunibreak wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
-SLOT=0
-SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.57.tar.gz -> coolreader-3.2.57.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f2fa81c98d318f8c618b33ef45088db3
diff --git a/metadata/md5-cache/app-text/coolreader-3.2.57-r1 b/metadata/md5-cache/app-text/coolreader-3.2.57-r1
new file mode 100644
index 000000000000..4ea62237c8af
--- /dev/null
+++ b/metadata/md5-cache/app-text/coolreader-3.2.57-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !wxwidgets? ( dev-qt/linguist-tools:5 ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
+EAPI=7
+HOMEPAGE=https://github.com/buggins/coolreader/
+IUSE=wxwidgets
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
+SLOT=0
+SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.57.tar.gz -> coolreader-3.2.57.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=676d5ce205f05a4eaf99a99ca85edfd1
diff --git a/metadata/md5-cache/app-text/coolreader-3.2.58 b/metadata/md5-cache/app-text/coolreader-3.2.58
deleted file mode 100644
index 6538fe92f2f6..000000000000
--- a/metadata/md5-cache/app-text/coolreader-3.2.58
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz dev-libs/libunibreak wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !wxwidgets? ( dev-qt/linguist-tools:5 ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
-EAPI=7
-HOMEPAGE=https://github.com/buggins/coolreader/
-IUSE=wxwidgets
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz dev-libs/libunibreak wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
-SLOT=0
-SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.58.tar.gz -> coolreader-3.2.58.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2d825bf4e65fafb1c39645d2cbd7ff21
diff --git a/metadata/md5-cache/app-text/coolreader-3.2.58-r1 b/metadata/md5-cache/app-text/coolreader-3.2.58-r1
new file mode 100644
index 000000000000..be1fd172b443
--- /dev/null
+++ b/metadata/md5-cache/app-text/coolreader-3.2.58-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !wxwidgets? ( dev-qt/linguist-tools:5 ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
+EAPI=7
+HOMEPAGE=https://github.com/buggins/coolreader/
+IUSE=wxwidgets
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
+SLOT=0
+SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.58.tar.gz -> coolreader-3.2.58.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=16174d7969fc25ee3774a3ed32bfab62
diff --git a/metadata/md5-cache/app-text/coolreader-3.2.59-r1 b/metadata/md5-cache/app-text/coolreader-3.2.59-r1
deleted file mode 100644
index 68d7f1eb9894..000000000000
--- a/metadata/md5-cache/app-text/coolreader-3.2.59-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-libs/zlib app-arch/zstd media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz dev-libs/libunibreak dev-libs/libutf8proc wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !wxwidgets? ( dev-qt/linguist-tools:5 ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
-EAPI=7
-HOMEPAGE=https://github.com/buggins/coolreader/
-IUSE=wxwidgets
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib app-arch/zstd media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz dev-libs/libunibreak dev-libs/libutf8proc wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
-SLOT=0
-SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.59.tar.gz -> coolreader-3.2.59.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dd77a13845c2a94e1233fbf5dc514aba
diff --git a/metadata/md5-cache/app-text/coolreader-3.2.59-r2 b/metadata/md5-cache/app-text/coolreader-3.2.59-r2
new file mode 100644
index 000000000000..ed7603f4eb78
--- /dev/null
+++ b/metadata/md5-cache/app-text/coolreader-3.2.59-r2
@@ -0,0 +1,14 @@
+BDEPEND=sys-libs/zlib app-arch/zstd media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak dev-libs/libutf8proc wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !wxwidgets? ( dev-qt/linguist-tools:5 ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
+EAPI=7
+HOMEPAGE=https://github.com/buggins/coolreader/
+IUSE=wxwidgets
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib app-arch/zstd media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak dev-libs/libutf8proc wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
+SLOT=0
+SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.59.tar.gz -> coolreader-3.2.59.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=26688fdb10f70e8fe05764329bb9c734
diff --git a/metadata/md5-cache/app-text/cssmin-0.2.0 b/metadata/md5-cache/app-text/cssmin-0.2.0
new file mode 100644
index 000000000000..cc3cc0a35d10
--- /dev/null
+++ b/metadata/md5-cache/app-text/cssmin-0.2.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python port of the YUI CSS compression algorithm
+EAPI=8
+HOMEPAGE=https://pypi.org/project/cssmin/ https://github.com/zacharyvoase/cssmin
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT BSD
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cssmin/cssmin-0.2.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f4b4eac7c79f659c19d2bc76e2f14ecd
diff --git a/metadata/md5-cache/app-text/epstool-3.09 b/metadata/md5-cache/app-text/epstool-3.09
index 0aca24afa946..853ce09a21fc 100644
--- a/metadata/md5-cache/app-text/epstool-3.09
+++ b/metadata/md5-cache/app-text/epstool-3.09
@@ -3,10 +3,10 @@ DEPEND=app-text/ghostscript-gpl
 DESCRIPTION=Creates or extracts preview images in EPS files, fixes bounding boxes
 EAPI=7
 HOMEPAGE=http://www.ghostgum.com.au/software/epstool.htm
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl
 SLOT=0
 SRC_URI=http://www.ghostgum.com.au/download/epstool-3.09.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ec5b5518d517ef531e9228df927ee4d4
+_md5_=f8edf33417d2e2b7e9111a4f3c07d393
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.54.0-r1 b/metadata/md5-cache/app-text/ghostscript-gpl-9.54.0-r1
index d8c22ef67d47..052e42706cce 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.54.0-r1
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.54.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Interpreter for the PostScript language and PDF
 EAPI=7
 HOMEPAGE=https://ghostscript.com/
 IUSE=cups dbus gtk +jpeg2k l10n_de static-libs unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-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
 LICENSE=AGPL-3 CPL-1.0
 RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/tiff-4.0.1:0= >=sys-libs/zlib-1.2.7 virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) unicode? ( net-dns/libidn:0= ) X? ( x11-libs/libXt x11-libs/libXext ) app-text/poppler-data >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts )
 SLOT=0/9.54
 SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9540/ghostscript-9.54.0.tar.xz https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.54-patchset-01.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=35904e6c103348a4adb42e076df4ad66
+_md5_=b377a6f1e54c2b16313d5b268b66612c
diff --git a/metadata/md5-cache/app-text/kramdown-rfc2629-1.4.19 b/metadata/md5-cache/app-text/kramdown-rfc2629-1.4.19
index c45337310761..079b56787935 100644
--- a/metadata/md5-cache/app-text/kramdown-rfc2629-1.4.19
+++ b/metadata/md5-cache/app-text/kramdown-rfc2629-1.4.19
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/kramdown-rfc2629-1.4.19.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7688d46bc2c4365022bb3b4df12ee7c0
diff --git a/metadata/md5-cache/app-text/kramdown-rfc2629-1.5.6 b/metadata/md5-cache/app-text/kramdown-rfc2629-1.5.6
deleted file mode 100644
index a3cb3ca0b7a8..000000000000
--- a/metadata/md5-cache/app-text/kramdown-rfc2629-1.5.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-2.3.0[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-parser-gfm-1.1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-2.3.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-parser-gfm-1.1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=An RFC2629 (XML2RFC) backend for Thomas Leitner's kramdown markdown parser
-EAPI=8
-HOMEPAGE=https://github.com/cabo/kramdown-rfc2629
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-2.3.0[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-parser-gfm-1.1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-2.3.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-parser-gfm-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/kramdown-rfc2629-1.5.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7bcac690b7881a0e195c4a3c750f85ac
diff --git a/metadata/md5-cache/app-text/kramdown-rfc2629-1.5.9 b/metadata/md5-cache/app-text/kramdown-rfc2629-1.5.9
new file mode 100644
index 000000000000..9e41e2d1a609
--- /dev/null
+++ b/metadata/md5-cache/app-text/kramdown-rfc2629-1.5.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-2.3.0[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-parser-gfm-1.1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-2.3.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-parser-gfm-1.1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=An RFC2629 (XML2RFC) backend for Thomas Leitner's kramdown markdown parser
+EAPI=8
+HOMEPAGE=https://github.com/cabo/kramdown-rfc2629
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby26(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-2.3.0[ruby_targets_ruby26(-)] >=dev-ruby/kramdown-parser-gfm-1.1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/certified-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/json-2.0.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-2.3.0[ruby_targets_ruby27(-)] >=dev-ruby/kramdown-parser-gfm-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/kramdown-rfc2629-1.5.9.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7bcac690b7881a0e195c4a3c750f85ac
diff --git a/metadata/md5-cache/app-text/languagetool-5.4 b/metadata/md5-cache/app-text/languagetool-5.4
new file mode 100644
index 000000000000..7769de254939
--- /dev/null
+++ b/metadata/md5-cache/app-text/languagetool-5.4
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A proof-reading tool for many languages
+EAPI=7
+HOMEPAGE=https://www.languagetool.org/
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=virtual/jre-1.8 dev-java/commons-cli:1 dev-java/commons-collections:4 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/hamcrest-core:1.3 dev-java/jcommander:0 dev-java/jna:4 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://www.languagetool.org/download/LanguageTool-5.4.zip
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7a0a5e045ba2b218e36316fdff669fc0
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.8.06 b/metadata/md5-cache/app-text/master-pdf-editor-5.8.06
new file mode 100644
index 000000000000..176cbc2c93df
--- /dev/null
+++ b/metadata/md5-cache/app-text/master-pdf-editor-5.8.06
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A complete solution for viewing and editing PDF files
+EAPI=7
+HOMEPAGE=https://code-industry.net/free-pdf-editor/
+KEYWORDS=~amd64
+LICENSE=master-pdf-editor
+RDEPEND=dev-libs/nss >=dev-qt/qtcore-5.12.9:5 >=dev-qt/qtgui-5.12.9:5 >=dev-qt/qtnetwork-5.12.9:5 >=dev-qt/qtprintsupport-5.12.9:5 >=dev-qt/qtsvg-5.12.9:5 >=media-gfx/sane-backends-1.0
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://code-industry.net/public/master-pdf-editor-5.8.06-qt5.x86_64.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=644d57ce502c2634dd2ef0476ea2c0c2
diff --git a/metadata/md5-cache/app-text/po4a-0.57-r1 b/metadata/md5-cache/app-text/po4a-0.57-r1
deleted file mode 100644
index 5a786a89873e..000000000000
--- a/metadata/md5-cache/app-text/po4a-0.57-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 virtual/latex-base ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-perl/Pod-Parser dev-lang/perl
-DESCRIPTION=Tools to ease the translation of documentation
-EAPI=7
-HOMEPAGE=https://po4a.org/
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-perl/Pod-Parser dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.57/po4a-0.57.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb
-_md5_=3518f1ea44b86f7b53557dd7789716d8
diff --git a/metadata/md5-cache/app-text/ronn-0.7.3-r4 b/metadata/md5-cache/app-text/ronn-0.7.3-r4
index 7114325bca54..802fa0c85f35 100644
--- a/metadata/md5-cache/app-text/ronn-0.7.3-r4
+++ b/metadata/md5-cache/app-text/ronn-0.7.3-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ronn-0.7.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed839b4da20f22ef56384bf787fd22a7
diff --git a/metadata/md5-cache/app-text/vgrep-2.5.2 b/metadata/md5-cache/app-text/vgrep-2.5.2
new file mode 100644
index 000000000000..c8ae8c698440
--- /dev/null
+++ b/metadata/md5-cache/app-text/vgrep-2.5.2
@@ -0,0 +1,12 @@
+BDEPEND=dev-go/go-md2man >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=A pager for grep, git-grep and similar grep implementations
+EAPI=8
+HOMEPAGE=https://github.com/vrothberg/vgrep
+KEYWORDS=~amd64
+LICENSE=BSD GPL-3+ MIT MIT-with-advertising
+RESTRICT=strip test strip
+SLOT=0
+SRC_URI=https://github.com/vrothberg/vgrep/archive/v2.5.2.tar.gz -> vgrep-2.5.2.tar.gz
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61
+_md5_=cdaf58545ac7c1a3231cdbc186f52962
diff --git a/metadata/md5-cache/app-text/webgen-1.7.1 b/metadata/md5-cache/app-text/webgen-1.7.1
index 5a6e09ab26b7..a4938ce961ac 100644
--- a/metadata/md5-cache/app-text/webgen-1.7.1
+++ b/metadata/md5-cache/app-text/webgen-1.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/webgen-1.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5209ac189a51dd345f83453e44b6c693
diff --git a/metadata/md5-cache/app-text/webgen-1.7.2 b/metadata/md5-cache/app-text/webgen-1.7.2
index 0e4e2b08fcc1..0d84b20683f6 100644
--- a/metadata/md5-cache/app-text/webgen-1.7.2
+++ b/metadata/md5-cache/app-text/webgen-1.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/webgen-1.7.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa9ca4a8d5024df7eb8254a04f1986ae
diff --git a/metadata/md5-cache/app-text/wscr-1.2-r2 b/metadata/md5-cache/app-text/wscr-1.2-r2
index 77611442e570..7e4001754fe3 100644
--- a/metadata/md5-cache/app-text/wscr-1.2-r2
+++ b/metadata/md5-cache/app-text/wscr-1.2-r2
@@ -6,6 +6,6 @@ KEYWORDS=amd64 ~mips ppc x86
 LICENSE=public-domain
 RDEPEND=sys-apps/miscfiles
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/wscr-1.2.tar.gz
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/wscr-1.2.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8e0ae3b997e00a602af57a0995dc658f
+_md5_=cae166b05e4ed1bfa32fe3524eac15c3
diff --git a/metadata/md5-cache/app-text/xournalpp-1.0.20 b/metadata/md5-cache/app-text/xournalpp-1.0.20
index 46186ee904ac..dc3b9c376dbb 100644
--- a/metadata/md5-cache/app-text/xournalpp-1.0.20
+++ b/metadata/md5-cache/app-text/xournalpp-1.0.20
@@ -4,10 +4,10 @@ DEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:=
 DESCRIPTION=Handwriting notetaking software with PDF annotation support
 EAPI=7
 HOMEPAGE=https://github.com/xournalpp/xournalpp
-KEYWORDS=amd64
+KEYWORDS=amd64 ~ppc64
 LICENSE=GPL-2
 RDEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio[cxx] media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/xournalpp/xournalpp/archive/1.0.20.tar.gz -> xournalpp-1.0.20.tgz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=23e53da16623fd6fdc5fcfbab0e7a0b1
+_md5_=81f0f85e5b6ff0c55d178a93f2e08657
diff --git a/metadata/md5-cache/app-text/zathura-0.4.8 b/metadata/md5-cache/app-text/zathura-0.4.8
new file mode 100644
index 000000000000..3acd0f1ac043
--- /dev/null
+++ b/metadata/md5-cache/app-text/zathura-0.4.8
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx ) test? ( dev-libs/appstream-glib dev-libs/check ) virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/girara-0.3.6 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A highly customizable and functional document viewer
+EAPI=7
+HOMEPAGE=https://pwmt.org/projects/zathura/
+IUSE=doc +magic seccomp sqlite synctex test test
+KEYWORDS=~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=ZLIB
+RDEPEND=>=dev-libs/girara-0.3.6 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pwmt/zathura/archive/0.4.8.tar.gz -> zathura-0.4.8.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=199f6d15b31b66f345f9384025de5827
diff --git a/metadata/md5-cache/app-text/zathura-9999 b/metadata/md5-cache/app-text/zathura-9999
index cdae728daf45..ce9a5152b020 100644
--- a/metadata/md5-cache/app-text/zathura-9999
+++ b/metadata/md5-cache/app-text/zathura-9999
@@ -1,14 +1,14 @@
 BDEPEND=doc? ( dev-python/sphinx ) test? ( dev-libs/appstream-glib dev-libs/check ) virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=>=dev-libs/girara-0.3.3 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-libs/girara-0.3.6 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A highly customizable and functional document viewer
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura/
 IUSE=doc +magic seccomp sqlite synctex test test
 LICENSE=ZLIB
 PROPERTIES=live
-RDEPEND=>=dev-libs/girara-0.3.3 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
+RDEPEND=>=dev-libs/girara-0.3.6 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=755b041890d753c6facca2332194564b
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=199f6d15b31b66f345f9384025de5827
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index a4aa50e3601e..61f7751bd44c 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/command-t-5.0.3 b/metadata/md5-cache/app-vim/command-t-5.0.3
deleted file mode 100644
index abed88b51450..000000000000
--- a/metadata/md5-cache/app-vim/command-t-5.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DESCRIPTION=vim plugin: fast file navigation for vim
-EAPI=6
-HOMEPAGE=https://vim.sourceforge.io/scripts/script.php?script_id=3025 https://github.com/wincent/command-t
-IUSE=ruby_targets_ruby26
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
-SLOT=0
-SRC_URI=https://github.com/wincent/command-t/archive/5.0.3.tar.gz -> command-t-5.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
-_md5_=deeff17dabdae1d0bbafd4d9de0a57ea
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20210716 b/metadata/md5-cache/app-vim/gentoo-syntax-20210716
deleted file mode 100644
index 4c1938d84c59..000000000000
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20210716
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
-EAPI=7
-HOMEPAGE=https://github.com/gentoo/gentoo-syntax
-IUSE=ignore-glep31
-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
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/gentoo-syntax-20210716.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
-_md5_=f1608d97e4bb7b71607f442ce8c48bb3
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20210828 b/metadata/md5-cache/app-vim/gentoo-syntax-20210828
deleted file mode 100644
index 22c59a44411a..000000000000
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20210828
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
-EAPI=7
-HOMEPAGE=https://github.com/gentoo/gentoo-syntax
-IUSE=ignore-glep31
-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
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/gentoo-syntax-20210828.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
-_md5_=efd73e1821001afe173e15eb006d2abe
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20210901 b/metadata/md5-cache/app-vim/gentoo-syntax-20210901
deleted file mode 100644
index b7b6d3280733..000000000000
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20210901
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
-EAPI=7
-HOMEPAGE=https://github.com/gentoo/gentoo-syntax
-IUSE=ignore-glep31
-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
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/gentoo-syntax-20210901.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
-_md5_=efd73e1821001afe173e15eb006d2abe
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20210911 b/metadata/md5-cache/app-vim/gentoo-syntax-20210911
index 7f0e14bb76e4..2ba4e7a0560f 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20210911
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-20210911
@@ -4,10 +4,10 @@ DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
 EAPI=7
 HOMEPAGE=https://github.com/gentoo/gentoo-syntax
 IUSE=ignore-glep31
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/gentoo-syntax-20210911.tar.bz2
 _eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
-_md5_=efd73e1821001afe173e15eb006d2abe
+_md5_=f1608d97e4bb7b71607f442ce8c48bb3
diff --git a/metadata/md5-cache/app-vim/gnupg-2.7.1 b/metadata/md5-cache/app-vim/gnupg-2.7.1
new file mode 100644
index 000000000000..410760455446
--- /dev/null
+++ b/metadata/md5-cache/app-vim/gnupg-2.7.1
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=transparent editing of gpg encrypted files
+EAPI=7
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3645
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=app-crypt/gnupg || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=27359 -> gnupg-2.7.1.zip
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_md5_=0cf7342fc9c13782e3d651d15e87641c
diff --git a/metadata/md5-cache/app-xemacs/Manifest.gz b/metadata/md5-cache/app-xemacs/Manifest.gz
index a9c5ab0a79da..f52d24e0364d 100644
--- a/metadata/md5-cache/app-xemacs/Manifest.gz
+++ b/metadata/md5-cache/app-xemacs/Manifest.gz
diff --git a/metadata/md5-cache/app-xemacs/ada-1.14 b/metadata/md5-cache/app-xemacs/ada-1.14
deleted file mode 100644
index d43df5501745..000000000000
--- a/metadata/md5-cache/app-xemacs/ada-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Ada language support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ada-1.14-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=13fadff88e056bc80ffb4cb61320e1d8
diff --git a/metadata/md5-cache/app-xemacs/apel-1.32 b/metadata/md5-cache/app-xemacs/apel-1.32
deleted file mode 100644
index 1283744dd9cb..000000000000
--- a/metadata/md5-cache/app-xemacs/apel-1.32
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A Portable Emacs Library. Used by XEmacs MIME support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ~hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/apel-1.32-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=d1bfc7ce6da79044e74cabe588796e9a
diff --git a/metadata/md5-cache/app-xemacs/apel-1.34 b/metadata/md5-cache/app-xemacs/apel-1.34
deleted file mode 100644
index da0cf5526624..000000000000
--- a/metadata/md5-cache/app-xemacs/apel-1.34
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A Portable Emacs Library. Used by XEmacs MIME support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/apel-1.34-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=516f39cfeef37453ee6816439d3bc6e2
diff --git a/metadata/md5-cache/app-xemacs/auctex-1.47 b/metadata/md5-cache/app-xemacs/auctex-1.47
deleted file mode 100644
index 3074357ecbed..000000000000
--- a/metadata/md5-cache/app-xemacs/auctex-1.47
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Basic TeX/LaTeX support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/auctex-1.47-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=544414018d842d6e3283ed9dc19c41c4
diff --git a/metadata/md5-cache/app-xemacs/auctex-1.51 b/metadata/md5-cache/app-xemacs/auctex-1.51
deleted file mode 100644
index 560c6772916e..000000000000
--- a/metadata/md5-cache/app-xemacs/auctex-1.51
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Basic TeX/LaTeX support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/texinfo app-xemacs/fsf-compat app-xemacs/mail-lib app-xemacs/edit-utils app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/auctex-1.51-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=1f7b5db127adaa67906a1e3bd97ba8b9
diff --git a/metadata/md5-cache/app-xemacs/bbdb-1.32 b/metadata/md5-cache/app-xemacs/bbdb-1.32
deleted file mode 100644
index ebbc425425c8..000000000000
--- a/metadata/md5-cache/app-xemacs/bbdb-1.32
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=The Big Brother Data Base
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/edit-utils app-xemacs/gnus app-xemacs/mh-e app-xemacs/rmail app-xemacs/supercite app-xemacs/vm app-xemacs/tm app-xemacs/apel app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/w3 app-xemacs/fsf-compat app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/os-utils app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/bbdb-1.32-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=7a4681b19eccd7cbfd3e31eebdcfc85c
diff --git a/metadata/md5-cache/app-xemacs/build-1.14 b/metadata/md5-cache/app-xemacs/build-1.14
deleted file mode 100644
index 1c7010f4ed56..000000000000
--- a/metadata/md5-cache/app-xemacs/build-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Build XEmacs from within (UNIX, Windows)
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/pcl-cvs app-xemacs/dired app-xemacs/w3 app-xemacs/prog-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/build-1.14-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=75c9d36324cad5805e29be63a3f6e15a
diff --git a/metadata/md5-cache/app-xemacs/build-1.15 b/metadata/md5-cache/app-xemacs/build-1.15
deleted file mode 100644
index 20c889f3a057..000000000000
--- a/metadata/md5-cache/app-xemacs/build-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Build XEmacs from within (UNIX, Windows)
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/pcl-cvs app-xemacs/dired app-xemacs/w3 app-xemacs/prog-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/build-1.15-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=75c9d36324cad5805e29be63a3f6e15a
diff --git a/metadata/md5-cache/app-xemacs/c-support-1.22 b/metadata/md5-cache/app-xemacs/c-support-1.22
deleted file mode 100644
index 2d7e791f17af..000000000000
--- a/metadata/md5-cache/app-xemacs/c-support-1.22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Basic single-file add-ons for editing C code
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/cc-mode app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/c-support-1.22-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=070244ac5945eccff510e40557ddafbb
diff --git a/metadata/md5-cache/app-xemacs/calc-1.26 b/metadata/md5-cache/app-xemacs/calc-1.26
deleted file mode 100644
index fb68fdb8eae4..000000000000
--- a/metadata/md5-cache/app-xemacs/calc-1.26
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs calculator
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/calc-1.26-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=625632e49d0d4b7c57f68f06004476ed
diff --git a/metadata/md5-cache/app-xemacs/calendar-1.32 b/metadata/md5-cache/app-xemacs/calendar-1.32
deleted file mode 100644
index dfec63b3a88d..000000000000
--- a/metadata/md5-cache/app-xemacs/calendar-1.32
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Calendar and diary support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/calendar-1.32-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=b258db9f2c4516166f614cdd9053041d
diff --git a/metadata/md5-cache/app-xemacs/calendar-1.38 b/metadata/md5-cache/app-xemacs/calendar-1.38
deleted file mode 100644
index 257fd1ab98ba..000000000000
--- a/metadata/md5-cache/app-xemacs/calendar-1.38
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Calendar and diary support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/calendar-1.38-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=b258db9f2c4516166f614cdd9053041d
diff --git a/metadata/md5-cache/app-xemacs/cc-mode-1.45 b/metadata/md5-cache/app-xemacs/cc-mode-1.45
deleted file mode 100644
index c46c3f9c02cb..000000000000
--- a/metadata/md5-cache/app-xemacs/cc-mode-1.45
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=C, C++ and Java language support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/cc-mode-1.45-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=0dbb8924e990221b2f99cefab3dd9731
diff --git a/metadata/md5-cache/app-xemacs/cedet-common-1.01 b/metadata/md5-cache/app-xemacs/cedet-common-1.01
deleted file mode 100644
index c154daad2dfc..000000000000
--- a/metadata/md5-cache/app-xemacs/cedet-common-1.01
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Common files for CEDET development environment
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/edebug app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/cedet-common-1.01-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=661acdc17b533f6b236fe966ef8ebc98
diff --git a/metadata/md5-cache/app-xemacs/clearcase-1.10 b/metadata/md5-cache/app-xemacs/clearcase-1.10
deleted file mode 100644
index 4048ff112807..000000000000
--- a/metadata/md5-cache/app-xemacs/clearcase-1.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=New Clearcase Version Control for XEmacs (UNIX, Windows)
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/dired app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/sh-script app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/clearcase-1.10-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=563e698f18e71623e1322ac9686a6d6f
diff --git a/metadata/md5-cache/app-xemacs/cookie-1.15 b/metadata/md5-cache/app-xemacs/cookie-1.15
deleted file mode 100644
index 00f37efeb800..000000000000
--- a/metadata/md5-cache/app-xemacs/cookie-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Spook and Yow (Zippy quotes)
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/cookie-1.15-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=ba45a14ca5b27d3db434c79d8fc98b8b
diff --git a/metadata/md5-cache/app-xemacs/crisp-1.15 b/metadata/md5-cache/app-xemacs/crisp-1.15
deleted file mode 100644
index 4688cee98582..000000000000
--- a/metadata/md5-cache/app-xemacs/crisp-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Crisp/Brief emulation
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/crisp-1.15-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=d444857282fa4c9e2bce607c9f7d2e91
diff --git a/metadata/md5-cache/app-xemacs/debug-1.18 b/metadata/md5-cache/app-xemacs/debug-1.18
deleted file mode 100644
index 29621cb1c854..000000000000
--- a/metadata/md5-cache/app-xemacs/debug-1.18
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=GUD, gdb, dbx debugging support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/debug-1.18-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=ace4a43fb6c1d2c3c9f48425e411f690
diff --git a/metadata/md5-cache/app-xemacs/dictionary-1.16 b/metadata/md5-cache/app-xemacs/dictionary-1.16
deleted file mode 100644
index 219c8b2da15f..000000000000
--- a/metadata/md5-cache/app-xemacs/dictionary-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Interface to RFC2229 dictionary servers
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/dictionary-1.16-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=4967f83e5caa18ff7d15668afe76a331
diff --git a/metadata/md5-cache/app-xemacs/dired-1.17 b/metadata/md5-cache/app-xemacs/dired-1.17
deleted file mode 100644
index 96170c94cd51..000000000000
--- a/metadata/md5-cache/app-xemacs/dired-1.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Manage file systems
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/prog-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/dired-1.17-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=7b857a6c2b95a3096c802c1f92372e91
diff --git a/metadata/md5-cache/app-xemacs/dired-1.19 b/metadata/md5-cache/app-xemacs/dired-1.19
deleted file mode 100644
index 7be8016d0a05..000000000000
--- a/metadata/md5-cache/app-xemacs/dired-1.19
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Manage file systems
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/prog-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/dired-1.19-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=fe5bcb9275c1ae6123c424931b75d4b2
diff --git a/metadata/md5-cache/app-xemacs/dired-1.20 b/metadata/md5-cache/app-xemacs/dired-1.20
deleted file mode 100644
index fc1be7e2d121..000000000000
--- a/metadata/md5-cache/app-xemacs/dired-1.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Manage file systems
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/prog-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/dired-1.20-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=7b857a6c2b95a3096c802c1f92372e91
diff --git a/metadata/md5-cache/app-xemacs/docbookide-0.08 b/metadata/md5-cache/app-xemacs/docbookide-0.08
deleted file mode 100644
index 16e7d6e9dc46..000000000000
--- a/metadata/md5-cache/app-xemacs/docbookide-0.08
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=DocBook editing support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-ispell app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/docbookide-0.08-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=a6aeedc19cbdfdf7bd00f94468534b8c
diff --git a/metadata/md5-cache/app-xemacs/easypg-1.02 b/metadata/md5-cache/app-xemacs/easypg-1.02
deleted file mode 100644
index a5ef53914f6a..000000000000
--- a/metadata/md5-cache/app-xemacs/easypg-1.02
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=GnuPG interface for Emacs
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/dired app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/easypg-1.02-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=097fc92ca00c632a6ba7dd3e154c4928
diff --git a/metadata/md5-cache/app-xemacs/easypg-1.03-r1 b/metadata/md5-cache/app-xemacs/easypg-1.03-r1
deleted file mode 100644
index be79b791f0f0..000000000000
--- a/metadata/md5-cache/app-xemacs/easypg-1.03-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=GnuPG interface for Emacs
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/dired app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/easypg-1.03-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=bc2a89f1d00db1e6b9bd12b3dfeaff32
diff --git a/metadata/md5-cache/app-xemacs/ebuild-mode-1.52 b/metadata/md5-cache/app-xemacs/ebuild-mode-1.52
deleted file mode 100644
index 988bc2262c9a..000000000000
--- a/metadata/md5-cache/app-xemacs/ebuild-mode-1.52
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script
-DEFINED_PHASES=compile install
-DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-2+
-RDEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.52.tar.xz
-_md5_=5f40bfdacaae030497111b5048a119d2
diff --git a/metadata/md5-cache/app-xemacs/ecrypto-0.20 b/metadata/md5-cache/app-xemacs/ecrypto-0.20
deleted file mode 100644
index df1bdbbddc98..000000000000
--- a/metadata/md5-cache/app-xemacs/ecrypto-0.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Crypto functionality in Emacs Lisp
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ecrypto-0.20-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=a2904398dbcea31e5a58245f3812caa9
diff --git a/metadata/md5-cache/app-xemacs/ecrypto-0.21 b/metadata/md5-cache/app-xemacs/ecrypto-0.21
deleted file mode 100644
index ee9f97f69849..000000000000
--- a/metadata/md5-cache/app-xemacs/ecrypto-0.21
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Crypto functionality in Emacs Lisp
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ecrypto-0.21-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=a2904398dbcea31e5a58245f3812caa9
diff --git a/metadata/md5-cache/app-xemacs/edebug-1.22 b/metadata/md5-cache/app-xemacs/edebug-1.22
deleted file mode 100644
index 665d3eb2488c..000000000000
--- a/metadata/md5-cache/app-xemacs/edebug-1.22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=An Emacs Lisp debugger
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-devel app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edebug-1.22-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=ac5b6a4cf906060f6bf3dfe814103745
diff --git a/metadata/md5-cache/app-xemacs/edict-1.16 b/metadata/md5-cache/app-xemacs/edict-1.16
deleted file mode 100644
index 3db4a29c9c06..000000000000
--- a/metadata/md5-cache/app-xemacs/edict-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Lisp Interface to EDICT, Kanji Dictionary
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edict-1.16-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=f24822ebe5ba2fbe95142f9a8d2a740d
diff --git a/metadata/md5-cache/app-xemacs/edict-1.17 b/metadata/md5-cache/app-xemacs/edict-1.17
deleted file mode 100644
index c982f320ba97..000000000000
--- a/metadata/md5-cache/app-xemacs/edict-1.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Lisp Interface to EDICT, Kanji Dictionary
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edict-1.17-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=f24822ebe5ba2fbe95142f9a8d2a740d
diff --git a/metadata/md5-cache/app-xemacs/ediff-1.68 b/metadata/md5-cache/app-xemacs/ediff-1.68
deleted file mode 100644
index ddd51e13b0ab..000000000000
--- a/metadata/md5-cache/app-xemacs/ediff-1.68
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Interface over GNU patch
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/pcl-cvs app-xemacs/elib app-xemacs/dired app-xemacs/xemacs-base app-xemacs/edebug app-xemacs/prog-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ediff-1.68-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=63593ec1e50d620da544b62935430bca
diff --git a/metadata/md5-cache/app-xemacs/ediff-1.77 b/metadata/md5-cache/app-xemacs/ediff-1.77
deleted file mode 100644
index 5cbf5fcb6623..000000000000
--- a/metadata/md5-cache/app-xemacs/ediff-1.77
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Interface over GNU patch
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/pcl-cvs app-xemacs/elib app-xemacs/dired app-xemacs/xemacs-base app-xemacs/edebug app-xemacs/prog-modes app-xemacs/gnus app-xemacs/tramp app-xemacs/vc app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ediff-1.77-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=f8fe3c962548a9eb1500a69789d57d86
diff --git a/metadata/md5-cache/app-xemacs/ediff-1.81 b/metadata/md5-cache/app-xemacs/ediff-1.81
deleted file mode 100644
index f6ecd2da7032..000000000000
--- a/metadata/md5-cache/app-xemacs/ediff-1.81
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Interface over GNU patch
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/pcl-cvs app-xemacs/elib app-xemacs/dired app-xemacs/xemacs-base app-xemacs/edebug app-xemacs/prog-modes app-xemacs/gnus app-xemacs/tramp app-xemacs/vc app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ediff-1.81-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=9425c8918fb28cd3bc9a0f869900d699
diff --git a/metadata/md5-cache/app-xemacs/edit-utils-2.39 b/metadata/md5-cache/app-xemacs/edit-utils-2.39
deleted file mode 100644
index fc685c511958..000000000000
--- a/metadata/md5-cache/app-xemacs/edit-utils-2.39
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Miscellaneous editor extensions, you probably need this
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-devel app-xemacs/fsf-compat app-xemacs/dired app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edit-utils-2.39-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=977892c32eae306855ae8d322af067d0
diff --git a/metadata/md5-cache/app-xemacs/edit-utils-2.43 b/metadata/md5-cache/app-xemacs/edit-utils-2.43
deleted file mode 100644
index 612a784a5b3f..000000000000
--- a/metadata/md5-cache/app-xemacs/edit-utils-2.43
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Miscellaneous editor extensions, you probably need this
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-devel app-xemacs/fsf-compat app-xemacs/dired app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edit-utils-2.43-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=977892c32eae306855ae8d322af067d0
diff --git a/metadata/md5-cache/app-xemacs/edit-utils-2.44 b/metadata/md5-cache/app-xemacs/edit-utils-2.44
deleted file mode 100644
index 8234f610dd3b..000000000000
--- a/metadata/md5-cache/app-xemacs/edit-utils-2.44
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Miscellaneous editor extensions, you probably need this
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-devel app-xemacs/fsf-compat app-xemacs/dired app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/edit-utils-2.44-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=a978aafd16eb3170ef66621fe70e4d9e
diff --git a/metadata/md5-cache/app-xemacs/edt-1.13 b/metadata/md5-cache/app-xemacs/edt-1.13
deleted file mode 100644
index 4283144f311f..000000000000
--- a/metadata/md5-cache/app-xemacs/edt-1.13
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=DEC EDIT/EDT emulation
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edt-1.13-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=c1238e93359a27444b0d6e25ff562502
diff --git a/metadata/md5-cache/app-xemacs/edt-1.14 b/metadata/md5-cache/app-xemacs/edt-1.14
deleted file mode 100644
index 892cc28cdc6b..000000000000
--- a/metadata/md5-cache/app-xemacs/edt-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=DEC EDIT/EDT emulation
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edt-1.14-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=c1238e93359a27444b0d6e25ff562502
diff --git a/metadata/md5-cache/app-xemacs/efs-1.33 b/metadata/md5-cache/app-xemacs/efs-1.33
deleted file mode 100644
index 9504296d40d3..000000000000
--- a/metadata/md5-cache/app-xemacs/efs-1.33
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Treat files on remote systems the same as local files
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/dired app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/efs-1.33-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=8edeffb5f4a59c679d0b04f023b981c8
diff --git a/metadata/md5-cache/app-xemacs/efs-1.34 b/metadata/md5-cache/app-xemacs/efs-1.34
deleted file mode 100644
index cd8c1a4cd8a4..000000000000
--- a/metadata/md5-cache/app-xemacs/efs-1.34
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Treat files on remote systems the same as local files
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/dired app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/efs-1.34-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=8edeffb5f4a59c679d0b04f023b981c8
diff --git a/metadata/md5-cache/app-xemacs/egg-its-1.27 b/metadata/md5-cache/app-xemacs/egg-its-1.27
deleted file mode 100644
index 994f13df7c24..000000000000
--- a/metadata/md5-cache/app-xemacs/egg-its-1.27
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Wnn (4.2 and 6) support. SJ3 support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/leim app-xemacs/mule-base app-xemacs/fsf-compat app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/egg-its-1.27-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=a52aaa8c61620b3d8556bd16bc2829e1
diff --git a/metadata/md5-cache/app-xemacs/eieio-1.05 b/metadata/md5-cache/app-xemacs/eieio-1.05
deleted file mode 100644
index 5ce3cc0c7990..000000000000
--- a/metadata/md5-cache/app-xemacs/eieio-1.05
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Enhanced Implementation of Emacs Interpreted Objects
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/speedbar app-xemacs/xemacs-base app-xemacs/edebug app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/eieio-1.05-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=8ddd360926c04d6ff4325fb0f66765ef
diff --git a/metadata/md5-cache/app-xemacs/eieio-1.07 b/metadata/md5-cache/app-xemacs/eieio-1.07
deleted file mode 100644
index 4b430bc8f1f7..000000000000
--- a/metadata/md5-cache/app-xemacs/eieio-1.07
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Enhanced Implementation of Emacs Interpreted Objects
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/edebug app-xemacs/cedet-common app-xemacs/speedbar app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/eieio-1.07-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=3499b1e3ecc5c377588657089506b175
diff --git a/metadata/md5-cache/app-xemacs/elib-1.11 b/metadata/md5-cache/app-xemacs/elib-1.11
deleted file mode 100644
index a31818268473..000000000000
--- a/metadata/md5-cache/app-xemacs/elib-1.11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Portable Emacs Lisp utilities library
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/elib-1.11-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=668c653cca92cec86f8e7d58ad905c25
diff --git a/metadata/md5-cache/app-xemacs/elib-1.13 b/metadata/md5-cache/app-xemacs/elib-1.13
deleted file mode 100644
index b127299a1ef8..000000000000
--- a/metadata/md5-cache/app-xemacs/elib-1.13
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Portable Emacs Lisp utilities library
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/elib-1.13-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=23c07b6d53df477408a5fc0c5768100d
diff --git a/metadata/md5-cache/app-xemacs/emerge-1.11 b/metadata/md5-cache/app-xemacs/emerge-1.11
deleted file mode 100644
index b2d816ab5393..000000000000
--- a/metadata/md5-cache/app-xemacs/emerge-1.11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Another interface over GNU patch
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/emerge-1.11-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=8442f3776cf35efe7b396cf1f14b2bab
diff --git a/metadata/md5-cache/app-xemacs/erc-0.21 b/metadata/md5-cache/app-xemacs/erc-0.21
deleted file mode 100644
index 4ae5d13919fd..000000000000
--- a/metadata/md5-cache/app-xemacs/erc-0.21
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-xemacs/xemacs-base
-DESCRIPTION=ERC - The Emacs IRC Client
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/erc-0.21-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=36b161f696c994d6fa8d116b93e62f88
diff --git a/metadata/md5-cache/app-xemacs/erc-0.23 b/metadata/md5-cache/app-xemacs/erc-0.23
deleted file mode 100644
index a6576d5e2985..000000000000
--- a/metadata/md5-cache/app-xemacs/erc-0.23
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=ERC - The Emacs IRC Client
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/edit-utils app-xemacs/fsf-compat app-xemacs/gnus app-xemacs/pcomplete app-xemacs/xemacs-base app-xemacs/text-modes app-xemacs/xemacs-ispell app-xemacs/viper app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/erc-0.23-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=463290cdd6867f8cf90cc3301a023adf
diff --git a/metadata/md5-cache/app-xemacs/escreen-1.01 b/metadata/md5-cache/app-xemacs/escreen-1.01
deleted file mode 100644
index 3db013e34b72..000000000000
--- a/metadata/md5-cache/app-xemacs/escreen-1.01
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Multiple editing sessions withing a single frame (like screen)..
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/escreen-1.01-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=6c0975b2bc87943ad704a85e46fd884e
diff --git a/metadata/md5-cache/app-xemacs/eshell-1.10 b/metadata/md5-cache/app-xemacs/eshell-1.10
deleted file mode 100644
index 4f13d8f447c7..000000000000
--- a/metadata/md5-cache/app-xemacs/eshell-1.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Command shell implemented entirely in Emacs Lisp
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-eterm app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/eshell-1.10-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=46cec0e559ef8137d82805441a8aa18f
diff --git a/metadata/md5-cache/app-xemacs/eshell-1.18 b/metadata/md5-cache/app-xemacs/eshell-1.18
deleted file mode 100644
index 27f2b94e2644..000000000000
--- a/metadata/md5-cache/app-xemacs/eshell-1.18
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Command shell implemented entirely in Emacs Lisp
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-eterm app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/eshell-1.18-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=46cec0e559ef8137d82805441a8aa18f
diff --git a/metadata/md5-cache/app-xemacs/eudc-1.39 b/metadata/md5-cache/app-xemacs/eudc-1.39
deleted file mode 100644
index 82cbbcbb7fa8..000000000000
--- a/metadata/md5-cache/app-xemacs/eudc-1.39
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs Unified Directory Client (LDAP, PH)
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/bbdb app-xemacs/mail-lib app-xemacs/gnus app-xemacs/rmail app-xemacs/tm app-xemacs/apel app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/eudc-1.39-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=ee5430e0f7e5d706c5ffe1280ad9efad
diff --git a/metadata/md5-cache/app-xemacs/eudc-1.40 b/metadata/md5-cache/app-xemacs/eudc-1.40
deleted file mode 100644
index b7ef38d4905a..000000000000
--- a/metadata/md5-cache/app-xemacs/eudc-1.40
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs Unified Directory Client (LDAP, PH)
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/bbdb app-xemacs/mail-lib app-xemacs/gnus app-xemacs/rmail app-xemacs/tm app-xemacs/apel app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/eudc-1.40-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=9359a846c1a93d232012072e7b49e0b6
diff --git a/metadata/md5-cache/app-xemacs/footnote-1.16 b/metadata/md5-cache/app-xemacs/footnote-1.16
deleted file mode 100644
index 0a25d668801e..000000000000
--- a/metadata/md5-cache/app-xemacs/footnote-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Footnoting in mail message editing modes
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/footnote-1.16-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=ba2e75978230611a5fe0500144d4f886
diff --git a/metadata/md5-cache/app-xemacs/forms-1.15 b/metadata/md5-cache/app-xemacs/forms-1.15
deleted file mode 100644
index 72b9e80ddb10..000000000000
--- a/metadata/md5-cache/app-xemacs/forms-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Forms editing support (obsolete, use Widget instead)
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/forms-1.15-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=9b75020f35b20f411b867c5c9b3d3b20
diff --git a/metadata/md5-cache/app-xemacs/fortran-modes-1.05 b/metadata/md5-cache/app-xemacs/fortran-modes-1.05
deleted file mode 100644
index 35e4d26f1528..000000000000
--- a/metadata/md5-cache/app-xemacs/fortran-modes-1.05
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Fortran support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/fortran-modes-1.05-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=cafa2f030378d62dc35fa18975ca42f1
diff --git a/metadata/md5-cache/app-xemacs/frame-icon-1.11 b/metadata/md5-cache/app-xemacs/frame-icon-1.11
deleted file mode 100644
index 7a8ccec1fbd8..000000000000
--- a/metadata/md5-cache/app-xemacs/frame-icon-1.11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Set up mode-specific icons for each frame under XEmacs
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/frame-icon-1.11-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=4f00ec15880a2c7e45115a6888fcd084
diff --git a/metadata/md5-cache/app-xemacs/fsf-compat-1.15 b/metadata/md5-cache/app-xemacs/fsf-compat-1.15
deleted file mode 100644
index e55c87d490a1..000000000000
--- a/metadata/md5-cache/app-xemacs/fsf-compat-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=FSF Emacs compatibility files
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ~hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/fsf-compat-1.15-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=a9a1e0e16c7ab3abdde9d709c3800563
diff --git a/metadata/md5-cache/app-xemacs/fsf-compat-1.19 b/metadata/md5-cache/app-xemacs/fsf-compat-1.19
deleted file mode 100644
index a79f7906a683..000000000000
--- a/metadata/md5-cache/app-xemacs/fsf-compat-1.19
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=FSF Emacs compatibility files
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/fsf-compat-1.19-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=bc34690ddc212f21d5efa0c7408cbc3c
diff --git a/metadata/md5-cache/app-xemacs/games-1.20 b/metadata/md5-cache/app-xemacs/games-1.20
deleted file mode 100644
index cfbdc86f7267..000000000000
--- a/metadata/md5-cache/app-xemacs/games-1.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Tetris, Sokoban, and Snake
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/games-1.20-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=e9f7eb079dd562f0938593a8b7a5d64e
diff --git a/metadata/md5-cache/app-xemacs/general-docs-1.04 b/metadata/md5-cache/app-xemacs/general-docs-1.04
deleted file mode 100644
index 3290fcb90309..000000000000
--- a/metadata/md5-cache/app-xemacs/general-docs-1.04
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=General XEmacs documentation
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/general-docs-1.04-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=9010cc2627b3966102ddf89d264fd9f4
diff --git a/metadata/md5-cache/app-xemacs/general-docs-1.06 b/metadata/md5-cache/app-xemacs/general-docs-1.06
deleted file mode 100644
index 9413e52393c9..000000000000
--- a/metadata/md5-cache/app-xemacs/general-docs-1.06
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=General XEmacs documentation
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/general-docs-1.06-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=9010cc2627b3966102ddf89d264fd9f4
diff --git a/metadata/md5-cache/app-xemacs/gnats-1.17 b/metadata/md5-cache/app-xemacs/gnats-1.17
deleted file mode 100644
index 4c7716945d8d..000000000000
--- a/metadata/md5-cache/app-xemacs/gnats-1.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=XEmacs bug reports
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/gnats-1.17-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=06f89f1c824aea324479034e9c622105
diff --git a/metadata/md5-cache/app-xemacs/gnus-1.99 b/metadata/md5-cache/app-xemacs/gnus-1.99
deleted file mode 100644
index 82fe65fb5bc8..000000000000
--- a/metadata/md5-cache/app-xemacs/gnus-1.99
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=The Gnus Newsreader and Mailreader
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/os-utils app-xemacs/dired app-xemacs/mh-e app-xemacs/sieve app-xemacs/ps-print app-xemacs/w3 app-xemacs/pgg app-xemacs/mailcrypt app-xemacs/ecrypto app-xemacs/sasl app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/gnus-1.99-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=47025b3a1f4be9c52e926f82a1e08bed
diff --git a/metadata/md5-cache/app-xemacs/guided-tour-0.52 b/metadata/md5-cache/app-xemacs/guided-tour-0.52
deleted file mode 100644
index 0b44cbadea7e..000000000000
--- a/metadata/md5-cache/app-xemacs/guided-tour-0.52
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Phil Sung's Guided Tour of Emacs
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/guided-tour-0.52-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=e75f85e73b2aa44bf6e0d8d3bef8d366
diff --git a/metadata/md5-cache/app-xemacs/haskell-mode-1.11 b/metadata/md5-cache/app-xemacs/haskell-mode-1.11
deleted file mode 100644
index 0feb6b576bf0..000000000000
--- a/metadata/md5-cache/app-xemacs/haskell-mode-1.11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Haskell editing support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/dired app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/edit-utils app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/haskell-mode-1.11-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=5811f600d9b0c00b4f5d37877601e059
diff --git a/metadata/md5-cache/app-xemacs/hm-html-menus-1.23 b/metadata/md5-cache/app-xemacs/hm-html-menus-1.23
deleted file mode 100644
index cc77a1c0b83e..000000000000
--- a/metadata/md5-cache/app-xemacs/hm-html-menus-1.23
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=HTML editing
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/dired app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/packages/hm--html-menus-1.23-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=60f59344b23db2ca1dc66675734b945a
diff --git a/metadata/md5-cache/app-xemacs/hm-html-menus-1.24 b/metadata/md5-cache/app-xemacs/hm-html-menus-1.24
deleted file mode 100644
index 167699841e35..000000000000
--- a/metadata/md5-cache/app-xemacs/hm-html-menus-1.24
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=HTML editing
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/dired app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/packages/hm--html-menus-1.24-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=60f59344b23db2ca1dc66675734b945a
diff --git a/metadata/md5-cache/app-xemacs/hyperbole-1.16 b/metadata/md5-cache/app-xemacs/hyperbole-1.16
deleted file mode 100644
index f89addb398bf..000000000000
--- a/metadata/md5-cache/app-xemacs/hyperbole-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Hyperbole: The Everyday Info Manager
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/calendar app-xemacs/vm app-xemacs/text-modes app-xemacs/gnus app-xemacs/mh-e app-xemacs/rmail app-xemacs/apel app-xemacs/tm app-xemacs/sh-script app-xemacs/net-utils app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/hyperbole-1.16-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=8b1e990af97338634d64a07fa1074d40
diff --git a/metadata/md5-cache/app-xemacs/hyperbole-1.17 b/metadata/md5-cache/app-xemacs/hyperbole-1.17
deleted file mode 100644
index 8a71bbeb6436..000000000000
--- a/metadata/md5-cache/app-xemacs/hyperbole-1.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Hyperbole: The Everyday Info Manager
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/calendar app-xemacs/vm app-xemacs/text-modes app-xemacs/gnus app-xemacs/mh-e app-xemacs/rmail app-xemacs/apel app-xemacs/tm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/hyperbole-1.17-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=989b5f4cdafa6cdb9ece642f1dd94212
diff --git a/metadata/md5-cache/app-xemacs/ibuffer-1.09 b/metadata/md5-cache/app-xemacs/ibuffer-1.09
deleted file mode 100644
index efcbe23a8008..000000000000
--- a/metadata/md5-cache/app-xemacs/ibuffer-1.09
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Advanced replacement for buffer-menu
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ibuffer-1.09-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=6d93250e0bf5884fd4752fa397f10734
diff --git a/metadata/md5-cache/app-xemacs/ibuffer-1.10 b/metadata/md5-cache/app-xemacs/ibuffer-1.10
deleted file mode 100644
index 98acc8ad1fc9..000000000000
--- a/metadata/md5-cache/app-xemacs/ibuffer-1.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Advanced replacement for buffer-menu
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ibuffer-1.10-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=6d93250e0bf5884fd4752fa397f10734
diff --git a/metadata/md5-cache/app-xemacs/idlwave-1.32 b/metadata/md5-cache/app-xemacs/idlwave-1.32
deleted file mode 100644
index c9cc3eac9138..000000000000
--- a/metadata/md5-cache/app-xemacs/idlwave-1.32
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Editing and Shell mode for the Interactive Data Language
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/idlwave-1.32-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=269404b856edb3f3bd3343782b138b87
diff --git a/metadata/md5-cache/app-xemacs/igrep-1.14 b/metadata/md5-cache/app-xemacs/igrep-1.14
deleted file mode 100644
index 1d4011554057..000000000000
--- a/metadata/md5-cache/app-xemacs/igrep-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Enhanced front-end for Grep
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/dired app-xemacs/xemacs-base app-xemacs/efs app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/igrep-1.14-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=16f513c3b4bf51278c7b7f4b730a764c
diff --git a/metadata/md5-cache/app-xemacs/igrep-1.16 b/metadata/md5-cache/app-xemacs/igrep-1.16
deleted file mode 100644
index 734b7e7a93d7..000000000000
--- a/metadata/md5-cache/app-xemacs/igrep-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Enhanced front-end for Grep
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/dired app-xemacs/xemacs-base app-xemacs/efs app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/igrep-1.16-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=16f513c3b4bf51278c7b7f4b730a764c
diff --git a/metadata/md5-cache/app-xemacs/latin-euro-standards-1.07 b/metadata/md5-cache/app-xemacs/latin-euro-standards-1.07
deleted file mode 100644
index 99e046252669..000000000000
--- a/metadata/md5-cache/app-xemacs/latin-euro-standards-1.07
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Support for the Latin{7,8,9,10} character sets & coding systems
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/latin-euro-standards-1.07-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=3bca9f73fb89fde4113fa7028db4f8a0
diff --git a/metadata/md5-cache/app-xemacs/latin-euro-standards-1.09 b/metadata/md5-cache/app-xemacs/latin-euro-standards-1.09
deleted file mode 100644
index 7cf2398edfe7..000000000000
--- a/metadata/md5-cache/app-xemacs/latin-euro-standards-1.09
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Support for the Latin{7,8,9,10} character sets & coding systems
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/latin-euro-standards-1.09-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=3bca9f73fb89fde4113fa7028db4f8a0
diff --git a/metadata/md5-cache/app-xemacs/latin-unity-1.20 b/metadata/md5-cache/app-xemacs/latin-unity-1.20
deleted file mode 100644
index bb87259e48b7..000000000000
--- a/metadata/md5-cache/app-xemacs/latin-unity-1.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: find single ISO 8859 character set to encode a buffer
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-xemacs/latin-euro-standards app-xemacs/mule-ucs app-xemacs/leim app-xemacs/fsf-compat app-xemacs/dired app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/latin-unity-1.20-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=b6c92d4fb567e64dd051facfd2794e12
diff --git a/metadata/md5-cache/app-xemacs/leim-1.24 b/metadata/md5-cache/app-xemacs/leim-1.24
deleted file mode 100644
index 99658290498d..000000000000
--- a/metadata/md5-cache/app-xemacs/leim-1.24
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Quail. All non-English and non-Japanese language support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-xemacs/fsf-compat app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/leim-1.24-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=39ee1afae3c2d4fbff3ef88a26367063
diff --git a/metadata/md5-cache/app-xemacs/leim-1.31 b/metadata/md5-cache/app-xemacs/leim-1.31
deleted file mode 100644
index 394dbe84fa7e..000000000000
--- a/metadata/md5-cache/app-xemacs/leim-1.31
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Quail. All non-English and non-Japanese language support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/latin-euro-standards app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/leim-1.31-pkg.tar.gz
-_eclasses_=xemacs-packages	c0b71c5a79f0f3cbd759f7754332ecca
-_md5_=121bf84f385944ad354ba0dc11d0001f
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index a2da0b56e1bb..62278d38d621 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/asio-1.17.0 b/metadata/md5-cache/dev-cpp/asio-1.17.0
deleted file mode 100644
index 23f37826f64e..000000000000
--- a/metadata/md5-cache/dev-cpp/asio-1.17.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/boost ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=Asynchronous Network Library
-EAPI=7
-HOMEPAGE=https://think-async.com https://github.com/chriskohlhoff/asio
-IUSE=doc examples ssl test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=Boost-1.0
-RDEPEND=dev-libs/boost ssl? ( dev-libs/openssl:0= )
-REQUIRED_USE=test? ( ssl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/asio/asio/asio-1.17.0.tar.bz2
-_md5_=e6074092cf62b9833d7736f64a0577af
diff --git a/metadata/md5-cache/dev-cpp/asio-1.19.1 b/metadata/md5-cache/dev-cpp/asio-1.19.1
deleted file mode 100644
index e21598f7f0b3..000000000000
--- a/metadata/md5-cache/dev-cpp/asio-1.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/boost:= ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=Asynchronous Network Library
-EAPI=7
-HOMEPAGE=https://think-async.com https://github.com/chriskohlhoff/asio
-IUSE=doc examples ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Boost-1.0
-RDEPEND=dev-libs/boost:= ssl? ( dev-libs/openssl:0= )
-REQUIRED_USE=test? ( ssl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/asio/asio/asio-1.19.1.tar.bz2
-_md5_=d30bfdc5f684b26ec99f5af643126978
diff --git a/metadata/md5-cache/dev-cpp/asio-1.20.0 b/metadata/md5-cache/dev-cpp/asio-1.20.0
new file mode 100644
index 000000000000..81095a488d3f
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/asio-1.20.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=test? ( dev-libs/boost dev-libs/openssl )
+DESCRIPTION=Asynchronous Network Library
+EAPI=8
+HOMEPAGE=https://think-async.com https://github.com/chriskohlhoff/asio
+IUSE=doc examples test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Boost-1.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/asio/asio/asio-1.20.0.tar.bz2
+_md5_=d9dc0a9b141e314241dd67b9e2704879
diff --git a/metadata/md5-cache/dev-cpp/ctemplate-2.4 b/metadata/md5-cache/dev-cpp/ctemplate-2.4
index 971d9f34e5b5..0fc4f9fb59dd 100644
--- a/metadata/md5-cache/dev-cpp/ctemplate-2.4
+++ b/metadata/md5-cache/dev-cpp/ctemplate-2.4
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) )
+DEPEND=test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) )
 DESCRIPTION=A simple but powerful template language for C++
 EAPI=7
 HOMEPAGE=https://github.com/olafvdspek/ctemplate
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OlafvdSpek/ctemplate/archive/ctemplate-2.4.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c6400bf141d3390c98b0e20de18c92b8
+_md5_=da41407b5e0b1c67bfe4cc12212cc504
diff --git a/metadata/md5-cache/dev-cpp/doctest-2.4.6 b/metadata/md5-cache/dev-cpp/doctest-2.4.6
index eaafd2941c29..269de1850a2e 100644
--- a/metadata/md5-cache/dev-cpp/doctest-2.4.6
+++ b/metadata/md5-cache/dev-cpp/doctest-2.4.6
@@ -4,10 +4,10 @@ DESCRIPTION=The fastest feature-rich C++11/14/17/20 single-header testing framew
 EAPI=7
 HOMEPAGE=https://github.com/onqtam/doctest
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/onqtam/doctest/archive/2.4.6.tar.gz -> doctest-2.4.6.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=336a43d97c47edb9b7ca347c53eb93ba
+_md5_=46d663bc2528a7980d8c835987a438ee
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.11.0 b/metadata/md5-cache/dev-cpp/gtest-1.11.0
new file mode 100644
index 000000000000..f54067d05395
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/gtest-1.11.0
@@ -0,0 +1,13 @@
+BDEPEND=test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Google C++ Testing Framework
+EAPI=8
+HOMEPAGE=https://github.com/google/googletest
+IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+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
+LICENSE=BSD
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz -> gtest-1.11.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d7d56c23208c88070d542aace9035936
diff --git a/metadata/md5-cache/dev-cpp/gtest-9999 b/metadata/md5-cache/dev-cpp/gtest-9999
index dded74d8cd5e..8c49482acd51 100644
--- a/metadata/md5-cache/dev-cpp/gtest-9999
+++ b/metadata/md5-cache/dev-cpp/gtest-9999
@@ -1,12 +1,12 @@
 BDEPEND=test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=Google C++ Testing Framework
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/google/googletest
 IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=BSD
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c45d4b7b27905e3b481b39873bf9ccba
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d7d56c23208c88070d542aace9035936
diff --git a/metadata/md5-cache/dev-cpp/json11-1.0.0 b/metadata/md5-cache/dev-cpp/json11-1.0.0
new file mode 100644
index 000000000000..d160d71e1f35
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/json11-1.0.0
@@ -0,0 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A tiny JSON library for C++11
+EAPI=8
+HOMEPAGE=https://github.com/dropbox/json11
+KEYWORDS=~amd64
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/dropbox/json11/archive/refs/tags/v1.0.0.tar.gz -> json11-1.0.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=28f26be86200c3a6577c166bd2a594b7
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.10.4 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.10.4
new file mode 100644
index 000000000000..e21c5eb60573
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.10.4
@@ -0,0 +1,13 @@
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=JSON for Modern C++
+EAPI=7
+HOMEPAGE=https://github.com/nlohmann/json https://nlohmann.github.io/json/
+IUSE=doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/nlohmann/json/archive/v3.10.4.tar.gz -> nlohmann_json-3.10.4.tar.gz test? ( https://github.com/nlohmann/json_test_data/archive/v3.0.0.tar.gz -> nlohmann_json-testdata-3.0.0.tar.gz )
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=925a888bd09f78f7d653aa547d5484a8
diff --git a/metadata/md5-cache/dev-cpp/notcurses-2.4.3 b/metadata/md5-cache/dev-cpp/notcurses-2.4.3
deleted file mode 100644
index a6d8d6be8ff4..000000000000
--- a/metadata/md5-cache/dev-cpp/notcurses-2.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libunistring:= media-video/ffmpeg:= sys-libs/gpm sys-libs/ncurses:= >=sys-libs/readline-8.0:= sys-libs/zlib
-DESCRIPTION=Blingful TUIs and character graphics
-EAPI=8
-HOMEPAGE=https://notcurses.com
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/libunistring:= media-video/ffmpeg:= sys-libs/gpm sys-libs/ncurses:= >=sys-libs/readline-8.0:= sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/dankamongmen/notcurses/archive/v2.4.3.tar.gz -> notcurses-2.4.3.tar.gz https://github.com/dankamongmen/notcurses/releases/download/v2.4.3/notcurses-doc-2.4.3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a15e91e92241388094a3e94577e39437
diff --git a/metadata/md5-cache/dev-cpp/notcurses-2.4.5 b/metadata/md5-cache/dev-cpp/notcurses-2.4.5
new file mode 100644
index 000000000000..0ddbc70dcd59
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/notcurses-2.4.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libunistring:= media-video/ffmpeg:= sys-libs/gpm sys-libs/ncurses:= sys-libs/zlib
+DESCRIPTION=Blingful TUIs and character graphics
+EAPI=8
+HOMEPAGE=https://notcurses.com
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/libunistring:= media-video/ffmpeg:= sys-libs/gpm sys-libs/ncurses:= sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/dankamongmen/notcurses/archive/v2.4.5.tar.gz -> notcurses-2.4.5.tar.gz https://github.com/dankamongmen/notcurses/releases/download/v2.4.5/notcurses-doc-2.4.5.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=48d511fed18c635de9cb3f1754c91671
diff --git a/metadata/md5-cache/dev-cpp/yaml-cpp-0.7.0-r1 b/metadata/md5-cache/dev-cpp/yaml-cpp-0.7.0-r1
index c64ab7d6df53..b5c48bdc8943 100644
--- a/metadata/md5-cache/dev-cpp/yaml-cpp-0.7.0-r1
+++ b/metadata/md5-cache/dev-cpp/yaml-cpp-0.7.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=YAML parser and emitter in C++
 EAPI=7
 HOMEPAGE=https://github.com/jbeder/yaml-cpp
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.7
 SRC_URI=https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.7.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=23cc9328c7840b8b2df3f8a7f2b5e618
+_md5_=67ae4056443f77a7a0e78e1f69dc082b
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index afc395357702..d9a56fefe045 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r3 b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r3
index 77f88bf4da10..62569776c481 100644
--- a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r3
+++ b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r3
@@ -5,11 +5,11 @@ DESCRIPTION=The leading SQL relational database engine written in Java
 EAPI=7
 HOMEPAGE=http://hsqldb.org
 IUSE=elibc_FreeBSD doc source test
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2
 RDEPEND=acct-group/hsqldb acct-user/hsqldb dev-java/tomcat-servlet-api:4.0 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/hsqldb/hsqldb_1_8_1_3.zip
 _eclasses_=java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e426b1eef8fdc5112e7cbe522af03577
+_md5_=539067cbb3597a9556be232bb6575c5a
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.2.4 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.2.4
new file mode 100644
index 000000000000..bbf1bc41b553
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-3.2.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+DESCRIPTION=C client library for MariaDB/MySQL
+EAPI=8
+HOMEPAGE=https://mariadb.org/
+IUSE=+curl gnutls kerberos +ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://downloads.mariadb.com/Connectors/c/connector-c-3.2.4/mariadb-connector-c-3.2.4-src.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b00291220db53748120b15b88337b8ec
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-9999 b/metadata/md5-cache/dev-db/mariadb-connector-c-9999
index 0415bac9ccc2..cd0278e2b15b 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-9999
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-9999
@@ -2,7 +2,7 @@ BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 DESCRIPTION=C client library for MariaDB/MySQL
-EAPI=7
+EAPI=8
 HOMEPAGE=https://mariadb.org/
 IUSE=+curl gnutls kerberos +ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=LGPL-2.1
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( || ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0b4a90b8bb05053ce06655e2190e2af3
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b00291220db53748120b15b88337b8ec
diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.15-r1 b/metadata/md5-cache/dev-db/mongodb-4.2.15-r1
index 0726ee4c81b8..010a0a562495 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.2.15-r1
+++ b/metadata/md5-cache/dev-db/mongodb-4.2.15-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
 IUSE=debug kerberos lto ssl test +tools
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-4.2.15 )
 RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp/yaml-cpp-0.6.2:= >=dev-libs/boost-1.70:=[threads(+)] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd:= dev-libs/snowball-stemmer:= net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( >=dev-libs/openssl-1.0.1g:0= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.15.tar.gz
 _eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=150a938ec2a1dbbff9c37ce7716f5114
+_md5_=cb796f299c4e0f4a6329479b51e02ecb
diff --git a/metadata/md5-cache/dev-db/mongodb-4.4.8-r1 b/metadata/md5-cache/dev-db/mongodb-4.4.8-r1
index ef8457cb5caa..bb414d9102ee 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.4.8-r1
+++ b/metadata/md5-cache/dev-db/mongodb-4.4.8-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
 IUSE=debug kerberos lto ssl test +tools
-KEYWORDS=~amd64 ~arm64 -riscv
+KEYWORDS=amd64 ~arm64 -riscv
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-100 )
 RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp/yaml-cpp-0.6.2:= >=dev-libs/boost-1.70:=[threads(+),nls] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd:= dev-libs/snowball-stemmer:= net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( >=dev-libs/openssl-1.0.1g:0= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.4.8.tar.gz
 _eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=82cbb0777b0078b1efebf9ca900d6a76
+_md5_=dfc4fdf02230afc0c75b0790412f64cd
diff --git a/metadata/md5-cache/dev-db/mydumper-0.11.1.3 b/metadata/md5-cache/dev-db/mydumper-0.11.1.3
new file mode 100644
index 000000000000..826f59fd6f3f
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mydumper-0.11.1.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/zstd dev-db/mysql-connector-c:= dev-libs/glib:2 dev-libs/libpcre dev-libs/openssl:= sys-libs/zlib:=
+DESCRIPTION=A high-performance multi-threaded backup (and restore) toolset for MySQL
+EAPI=8
+HOMEPAGE=https://github.com/maxbube/mydumper
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-arch/zstd dev-db/mysql-connector-c:= dev-libs/glib:2 dev-libs/libpcre dev-libs/openssl:= sys-libs/zlib:=
+SLOT=0
+SRC_URI=https://github.com/maxbube/mydumper/archive/v0.11.1-3.tar.gz -> mydumper-0.11.1-3.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=68be6c97816f6f09369951a0c313c562
diff --git a/metadata/md5-cache/dev-db/myodbc-8.0.25 b/metadata/md5-cache/dev-db/myodbc-8.0.25
index 1081ae28c2ab..371158fafdbb 100644
--- a/metadata/md5-cache/dev-db/myodbc-8.0.25
+++ b/metadata/md5-cache/dev-db/myodbc-8.0.25
@@ -5,10 +5,10 @@ DESCRIPTION=ODBC driver for MySQL
 EAPI=7
 HOMEPAGE=https://dev.mysql.com/downloads/connector/odbc/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/mysql-connector-c-8.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=8.0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-ODBC/8.0/mysql-connector-odbc-8.0.25-src.tar.gz
 _eclasses_=cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1bb0013fcb9f85774eaa2dac6c51bb8b
+_md5_=1d2025635a90ff6d82fb3270c424fd1e
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.32 b/metadata/md5-cache/dev-db/mysql-5.7.32
index 1ca2dcc63b21..49d8352535ac 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.32
+++ b/metadata/md5-cache/dev-db/mysql-5.7.32
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=!test? ( test )
 SLOT=5.7/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.32.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.32.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.32.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.32-patches-01.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=93cbb781db0ef9e19103d600a18f1327
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.33 b/metadata/md5-cache/dev-db/mysql-5.7.33
index 31fc37af68db..b48cf3c16963 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.33
+++ b/metadata/md5-cache/dev-db/mysql-5.7.33
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=!test? ( test )
 SLOT=5.7/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.33.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.33.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.33.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.33-patches-01.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3c03355b4457e616dc66ceb3abe54950
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.34 b/metadata/md5-cache/dev-db/mysql-5.7.34
index cafda3918177..39496423b3e2 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.34
+++ b/metadata/md5-cache/dev-db/mysql-5.7.34
@@ -5,7 +5,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=7
 HOMEPAGE=https://www.mysql.com/
 IUSE=cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling selinux +server static static-libs systemtap tcmalloc test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=sys-libs/ncurses:0= client-libs? ( >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) !client-libs? ( dev-db/mysql-connector-c[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= ) server? ( >=app-arch/lz4-0_p131:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:=[ssl] dev-libs/protobuf:= net-libs/libtirpc:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mysql:0 !dev-db/mysql:8.0 client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= ) selinux? ( sec-policy/selinux-mysql ) server? ( !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts ) )
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=!test? ( test )
 SLOT=5.7/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.34.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.34.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.34.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.34-patches-01.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e05099239d84c37df74c2dafccb48463
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=671ddf977152d3823d63c82d1beb1c31
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.34-r1 b/metadata/md5-cache/dev-db/mysql-5.7.34-r1
index 8366d41a01c6..ec33f99f4f13 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.34-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.7.34-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=!test? ( test )
 SLOT=5.7/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.34.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.34.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.34.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.34-patches-02.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f659d82b4e587a15a988091ba9ed58e6
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.35 b/metadata/md5-cache/dev-db/mysql-5.7.35
index ab5ddb1f4bb4..5f9f9530c01d 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.35
+++ b/metadata/md5-cache/dev-db/mysql-5.7.35
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=!test? ( test )
 SLOT=5.7/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.35.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.35.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.35.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.35-patches-01.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fd0c075fb5e1d4a8870fb1d224e4fe39
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.22 b/metadata/md5-cache/dev-db/mysql-8.0.22
index 40e6bb85453a..1dfe95db3941 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.22
+++ b/metadata/md5-cache/dev-db/mysql-8.0.22
@@ -5,7 +5,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=7
 HOMEPAGE=https://www.mysql.com/
 IUSE=cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test kernel_linux
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips -ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mysql:0 !dev-db/mysql:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.22.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.22.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.22.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.22-patches-02.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=480abd8d996f561fd3c73770592d4c66
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ca7bd200ad68892c8277decb595b3d33
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.23 b/metadata/md5-cache/dev-db/mysql-8.0.23
index a96dbc91558e..90b6fc9eb181 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.23
+++ b/metadata/md5-cache/dev-db/mysql-8.0.23
@@ -5,7 +5,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=7
 HOMEPAGE=https://www.mysql.com/
 IUSE=cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips -ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mysql:0 !dev-db/mysql:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.23.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.23.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.23.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.23-patches-01.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2f7caf4f1c3ed13b81a30790889d7703
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=34067b301fefc5079f131976dbf391cb
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.25 b/metadata/md5-cache/dev-db/mysql-8.0.25
index 5aa204d89e42..2f35a706fba3 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.25
+++ b/metadata/md5-cache/dev-db/mysql-8.0.25
@@ -5,7 +5,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=7
 HOMEPAGE=https://www.mysql.com/
 IUSE=cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips -ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mysql:0 !dev-db/mysql:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.25.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.25.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.25.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.25-patches-01.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b04af1effbc8559998c80b6f5418ba09
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e3c96a38f8e6d4eec5c4dcd563cc497a
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.25-r1 b/metadata/md5-cache/dev-db/mysql-8.0.25-r1
index 5924053dbaed..299b31cff456 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.25-r1
+++ b/metadata/md5-cache/dev-db/mysql-8.0.25-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=7
 HOMEPAGE=https://www.mysql.com/
 IUSE=cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips -ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mysql:0 !dev-db/mysql:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.25.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.25.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.25.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.25-patches-02.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4d55613f2a11bdb868d53720d9843497
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=78658b81f35b08b42d41c1e666e7eb0c
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.26 b/metadata/md5-cache/dev-db/mysql-8.0.26
index 6b791b48b191..d22e12ee9c0d 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.26
+++ b/metadata/md5-cache/dev-db/mysql-8.0.26
@@ -5,7 +5,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=7
 HOMEPAGE=https://www.mysql.com/
 IUSE=cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips -ppc ~ppc64 -riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mysql:0 !dev-db/mysql:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.26.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.26.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.26.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.26-patches-01.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7bd0a0212ffe41d78f16dc3ca43c444c
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=56dd265b3af4fe00412373d63360a380
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.24 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.24
index f4bfbb6c1744..3994c54df7e4 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.24
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.24
@@ -5,10 +5,10 @@ DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
 EAPI=7
 HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
 IUSE=+legacy
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 arm ~arm64 -ppc ~ppc64 -sparc x86
 LICENSE=Artistic GPL-2
 RDEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.24-src.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=99aae72f4fdaa15a6888566ead7d815a
+_md5_=4698ae02dc8d7c34a75f9e5ff3937a47
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.25 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.25
index 8833a81329f2..fb1d247ba582 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.25
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.25
@@ -5,10 +5,10 @@ DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
 EAPI=7
 HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
 IUSE=+legacy
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 arm ~arm64 -ppc ~ppc64 -sparc x86
 LICENSE=Artistic GPL-2
 RDEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.25-src.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=adb3ac4f02f1b42d4a4c2ccaa2dddabf
+_md5_=c5e0ac1887998419d5641392a260454a
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.26 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.26
index e8868eb0882a..dd4da80a7fb3 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.26
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.26
@@ -5,10 +5,10 @@ DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
 EAPI=7
 HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
 IUSE=+legacy
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 -ppc ~ppc64 -sparc ~x86
 LICENSE=Artistic GPL-2
 RDEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.26-src.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a51afb88d768dd5f606fd91591ba1d18
+_md5_=6cb16d929d410f3ac9499c3657adb66a
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.25 b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.25
index 2497ec83146b..7c51303c70dc 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.25
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.25
@@ -5,10 +5,10 @@ DESCRIPTION=C client library for MariaDB/MySQL
 EAPI=7
 HOMEPAGE=https://dev.mysql.com/downloads/
 IUSE=ldap static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-arch/lz4-0_p131:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( dev-libs/cyrus-sasl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<dev-db/mysql-5.6.45-r1 !=dev-db/mysql-5.7.23* !=dev-db/mysql-5.7.24* !=dev-db/mysql-5.7.25* !=dev-db/mysql-5.7.26-r0 !=dev-db/mysql-5.7.27-r0 !<dev-db/percona-server-5.7.26.29-r1
 SLOT=0/21
 SRC_URI=https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.25.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=51ba8df9902aab8e20841de881ebc0e5
+_md5_=22fae542142a6d3bf43fe949eeb09d56
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.22.13 b/metadata/md5-cache/dev-db/percona-server-8.0.22.13
index 54ecd9fbb5a0..c99fbe5596e7 100644
--- a/metadata/md5-cache/dev-db/percona-server-8.0.22.13
+++ b/metadata/md5-cache/dev-db/percona-server-8.0.22.13
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.22-13/source/tarball/percona-server-8.0.22-13.tar.gz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.22.13-patches-02.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ac313b5e96d827389acd0cf37b047eca
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.23.14 b/metadata/md5-cache/dev-db/percona-server-8.0.23.14
index ff9617703e5d..9db668b92bf3 100644
--- a/metadata/md5-cache/dev-db/percona-server-8.0.23.14
+++ b/metadata/md5-cache/dev-db/percona-server-8.0.23.14
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.23-14/source/tarball/percona-server-8.0.23-14.tar.gz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.23.14-patches-01.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ded62c6c6c83b0c32ddf4a822c94f83a
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.25.15 b/metadata/md5-cache/dev-db/percona-server-8.0.25.15
index f407127eb1e7..f75ca161290e 100644
--- a/metadata/md5-cache/dev-db/percona-server-8.0.25.15
+++ b/metadata/md5-cache/dev-db/percona-server-8.0.25.15
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.25-15/source/tarball/percona-server-8.0.25-15.tar.gz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.25.15-patches-01.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1879d10694c76403b021802eb79f861f
diff --git a/metadata/md5-cache/dev-db/postgresql-10.17-r2 b/metadata/md5-cache/dev-db/postgresql-10.17-r2
index a8b8c4fdbe66..0f421d8e3615 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.17-r2
+++ b/metadata/md5-cache/dev-db/postgresql-10.17-r2
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=10
 SRC_URI=https://ftp.postgresql.org/pub/source/v10.17/postgresql-10.17.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c2098bd21a1bb2f0d8b32b66b9b011b3
diff --git a/metadata/md5-cache/dev-db/postgresql-10.18 b/metadata/md5-cache/dev-db/postgresql-10.18
index cb04727ba521..fb0cd01ae14d 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.18
+++ b/metadata/md5-cache/dev-db/postgresql-10.18
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=10
 SRC_URI=https://ftp.postgresql.org/pub/source/v10.18/postgresql-10.18.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4fbe1d18a970add1c69541e77345f090
diff --git a/metadata/md5-cache/dev-db/postgresql-11.12 b/metadata/md5-cache/dev-db/postgresql-11.12
index a95429ade7f2..04db0b2d6f9b 100644
--- a/metadata/md5-cache/dev-db/postgresql-11.12
+++ b/metadata/md5-cache/dev-db/postgresql-11.12
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=11
 SRC_URI=https://ftp.postgresql.org/pub/source/v11.12/postgresql-11.12.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cd645558874803223e699715d8ba6474
diff --git a/metadata/md5-cache/dev-db/postgresql-11.13 b/metadata/md5-cache/dev-db/postgresql-11.13
index 9954fba80b15..206371a9f3e9 100644
--- a/metadata/md5-cache/dev-db/postgresql-11.13
+++ b/metadata/md5-cache/dev-db/postgresql-11.13
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=11
 SRC_URI=https://ftp.postgresql.org/pub/source/v11.13/postgresql-11.13.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=22ca8c9ffcfc84bbf02ff91544baa248
diff --git a/metadata/md5-cache/dev-db/postgresql-12.7 b/metadata/md5-cache/dev-db/postgresql-12.7
index bdb22ff4df50..01a925ea3510 100644
--- a/metadata/md5-cache/dev-db/postgresql-12.7
+++ b/metadata/md5-cache/dev-db/postgresql-12.7
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=12
 SRC_URI=https://ftp.postgresql.org/pub/source/v12.7/postgresql-12.7.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a2d25510eecadf63319e9a3022c0d3c4
diff --git a/metadata/md5-cache/dev-db/postgresql-12.8 b/metadata/md5-cache/dev-db/postgresql-12.8
index f05bf4dbe8b8..ea4ff2c7be60 100644
--- a/metadata/md5-cache/dev-db/postgresql-12.8
+++ b/metadata/md5-cache/dev-db/postgresql-12.8
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=12
 SRC_URI=https://ftp.postgresql.org/pub/source/v12.8/postgresql-12.8.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=518f6c9d97ecf65884cd50b14de9b17a
diff --git a/metadata/md5-cache/dev-db/postgresql-13.3 b/metadata/md5-cache/dev-db/postgresql-13.3
index 6a47db7230b6..b937ac90c21a 100644
--- a/metadata/md5-cache/dev-db/postgresql-13.3
+++ b/metadata/md5-cache/dev-db/postgresql-13.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=13
 SRC_URI=https://ftp.postgresql.org/pub/source/v13.3/postgresql-13.3.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=98540ade8bf11172638cc71a8941315c
diff --git a/metadata/md5-cache/dev-db/postgresql-13.4 b/metadata/md5-cache/dev-db/postgresql-13.4
index cd395f6e0367..991ee4191a60 100644
--- a/metadata/md5-cache/dev-db/postgresql-13.4
+++ b/metadata/md5-cache/dev-db/postgresql-13.4
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=13
 SRC_URI=https://ftp.postgresql.org/pub/source/v13.4/postgresql-13.4.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4100f769d3ef1dbf75d492c62e8d6151
diff --git a/metadata/md5-cache/dev-db/postgresql-14.0 b/metadata/md5-cache/dev-db/postgresql-14.0
index c594ab1e7c4a..c00704843e8d 100644
--- a/metadata/md5-cache/dev-db/postgresql-14.0
+++ b/metadata/md5-cache/dev-db/postgresql-14.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=14
 SRC_URI=https://ftp.postgresql.org/pub/source/v14.0/postgresql-14.0.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=563ea613611691ec96a5d0fe79988857
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.22-r2 b/metadata/md5-cache/dev-db/postgresql-9.6.22-r2
index 093d1fea1f36..3b25442940fb 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.22-r2
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.22-r2
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=9.6
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.6.22/postgresql-9.6.22.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=58f15153ec1bbb10eb4b253b036979a8
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.23 b/metadata/md5-cache/dev-db/postgresql-9.6.23
index e2a470d65249..8c3389366d9f 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.23
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.23
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postg
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=9.6
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.6.23/postgresql-9.6.23.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=270e1e30cb768ad97d9e64c535e4a265
diff --git a/metadata/md5-cache/dev-db/postgresql-9999 b/metadata/md5-cache/dev-db/postgresql-9999
index 94499afadcb9..43487b427ce9 100644
--- a/metadata/md5-cache/dev-db/postgresql-9999
+++ b/metadata/md5-cache/dev-db/postgresql-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) readline? ( sys-libs/readline:0= ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=9999
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8694c7ca5f4bddd086b2df508ad3be98
diff --git a/metadata/md5-cache/dev-db/redis-5.0.14 b/metadata/md5-cache/dev-db/redis-5.0.14
index cd3f10e007be..01a39e63a001 100644
--- a/metadata/md5-cache/dev-db/redis-5.0.14
+++ b/metadata/md5-cache/dev-db/redis-5.0.14
@@ -5,7 +5,7 @@ DESCRIPTION=A persistent caching system, key-value and data structures database
 EAPI=7
 HOMEPAGE=https://redis.io
 IUSE=+jemalloc tcmalloc luajit test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:5.1 ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) acct-group/redis acct-user/redis virtual/tmpfiles
 REQUIRED_USE=?? ( tcmalloc jemalloc )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-5.0.14.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=20f635d520e528d896f6da10649260d6
+_md5_=c92d3f23dbd3385aed3926f8a86fb05b
diff --git a/metadata/md5-cache/dev-db/redis-6.0.16 b/metadata/md5-cache/dev-db/redis-6.0.16
index 82dcac967f51..601f8b53074d 100644
--- a/metadata/md5-cache/dev-db/redis-6.0.16
+++ b/metadata/md5-cache/dev-db/redis-6.0.16
@@ -5,7 +5,7 @@ DESCRIPTION=A persistent caching system, key-value and data structures database
 EAPI=7
 HOMEPAGE=https://redis.io
 IUSE=+jemalloc ssl systemd tcmalloc test lua_single_target_luajit lua_single_target_lua5-1
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) acct-group/redis acct-user/redis virtual/tmpfiles
 REQUIRED_USE=?? ( jemalloc tcmalloc ) ^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-6.0.16.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e5d2540a36fb4262a2e7bc67aab597e5
+_md5_=f2c07ab77771ba3aa5a3b4537353226f
diff --git a/metadata/md5-cache/dev-db/redis-6.2.6 b/metadata/md5-cache/dev-db/redis-6.2.6
index 2a71a3904336..6aaeea915284 100644
--- a/metadata/md5-cache/dev-db/redis-6.2.6
+++ b/metadata/md5-cache/dev-db/redis-6.2.6
@@ -5,7 +5,7 @@ DESCRIPTION=A persistent caching system, key-value and data structures database
 EAPI=7
 HOMEPAGE=https://redis.io
 IUSE=+jemalloc ssl systemd tcmalloc test lua_single_target_luajit lua_single_target_lua5-1
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) acct-group/redis acct-user/redis virtual/tmpfiles
 REQUIRED_USE=?? ( jemalloc tcmalloc ) ^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-6.2.6.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=57d89b746df57691d7c6e365cccd983f
+_md5_=8600220f24389507bc950cc1a5907c1b
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 10bfe7fa877d..7704dbcefd9d 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r101 b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r101
index 032e36e765cb..f5f1d4345702 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r101
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r101
@@ -5,11 +5,11 @@ DESCRIPTION=Open source high performance 3D graphics toolkit
 EAPI=7
 HOMEPAGE=http://www.openscenegraph.org/
 IUSE=curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib +lua_single_target_lua5-1
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
+KEYWORDS=amd64 ~hppa ppc64 x86
 LICENSE=wxWinLL-3 LGPL-2.1
 RDEPEND=media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) openexr? ( zlib ) sdl2? ( sdl )
 SLOT=0/161
 SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f7eb92f2ed3e38c025a6232e4a764368
+_md5_=b8b2ecee1cb6a4bad2aba95290f76d18
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r110 b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r110
index eb0379cf605c..d0b2554eac3a 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r110
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r110
@@ -5,11 +5,11 @@ DESCRIPTION=Open source high performance 3D graphics toolkit
 EAPI=7
 HOMEPAGE=http://www.openscenegraph.org/
 IUSE=collada curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib +lua_single_target_lua5-1
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~hppa ~ppc64 ~x86
 LICENSE=wxWinLL-3 LGPL-2.1
 RDEPEND=media-libs/mesa[egl(+)?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) openexr? ( zlib ) sdl2? ( sdl )
 SLOT=0/161
 SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d00be8554c8c73905694da706b060093
+_md5_=6fbe0e7f23fd8e09c04a1721478c029d
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index 361cc90ce1c0..c05a5feb7dfa 100644
--- a/metadata/md5-cache/dev-go/Manifest.gz
+++ b/metadata/md5-cache/dev-go/Manifest.gz
diff --git a/metadata/md5-cache/dev-go/delve-1.6.1 b/metadata/md5-cache/dev-go/delve-1.6.1
deleted file mode 100644
index 3fb2d1f4b187..000000000000
--- a/metadata/md5-cache/dev-go/delve-1.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=A source-level debugger for the Go programming language
-EAPI=7
-HOMEPAGE=https://github.com/go-delve/delve
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT BSD BSD-2 Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/go-delve/delve/archive/v1.6.1.tar.gz -> delve-1.6.1.tar.gz
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61
-_md5_=74d06d916f396da9b374f006ec3da67e
diff --git a/metadata/md5-cache/dev-go/delve-1.7.2 b/metadata/md5-cache/dev-go/delve-1.7.2
new file mode 100644
index 000000000000..c9f624052cc8
--- /dev/null
+++ b/metadata/md5-cache/dev-go/delve-1.7.2
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=A source-level debugger for the Go programming language
+EAPI=7
+HOMEPAGE=https://github.com/go-delve/delve
+KEYWORDS=~amd64
+LICENSE=MIT BSD BSD-2 Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/go-delve/delve/archive/v1.7.2.tar.gz -> delve-1.7.2.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/aquasecurity/libbpfgo/@v/v0.1.2-0.20210708203834-4928d36fafac.zip -> github.com%2Faquasecurity%2Flibbpfgo%2F@v%2Fv0.1.2-0.20210708203834-4928d36fafac.zip mirror://goproxy//github.com/aquasecurity/libbpfgo/@v/v0.1.2-0.20210708203834-4928d36fafac.mod -> github.com%2Faquasecurity%2Flibbpfgo%2F@v%2Fv0.1.2-0.20210708203834-4928d36fafac.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cosiner/argv/@v/v0.1.0.zip -> github.com%2Fcosiner%2Fargv%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/cosiner/argv/@v/v0.1.0.mod -> github.com%2Fcosiner%2Fargv%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/derekparker/trie/@v/v0.0.0-20200317170641-1fdf38b7b0e9.zip -> github.com%2Fderekparker%2Ftrie%2F@v%2Fv0.0.0-20200317170641-1fdf38b7b0e9.zip mirror://goproxy//github.com/derekparker/trie/@v/v0.0.0-20200317170641-1fdf38b7b0e9.mod -> github.com%2Fderekparker%2Ftrie%2F@v%2Fv0.0.0-20200317170641-1fdf38b7b0e9.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-dap/@v/v0.5.1-0.20210713061233-c91b005e3987.zip -> github.com%2Fgoogle%2Fgo-dap%2F@v%2Fv0.5.1-0.20210713061233-c91b005e3987.zip mirror://goproxy//github.com/google/go-dap/@v/v0.5.1-0.20210713061233-c91b005e3987.mod -> github.com%2Fgoogle%2Fgo-dap%2F@v%2Fv0.5.1-0.20210713061233-c91b005e3987.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterh/liner/@v/v0.0.0-20170317030525-88609521dc4b.zip -> github.com%2Fpeterh%2Fliner%2F@v%2Fv0.0.0-20170317030525-88609521dc4b.zip mirror://goproxy//github.com/peterh/liner/@v/v0.0.0-20170317030525-88609521dc4b.mod -> github.com%2Fpeterh%2Fliner%2F@v%2Fv0.0.0-20170317030525-88609521dc4b.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.starlark.net/@v/v0.0.0-20200821142938-949cc6f4b097.zip -> go.starlark.net%2F@v%2Fv0.0.0-20200821142938-949cc6f4b097.zip mirror://goproxy//go.starlark.net/@v/v0.0.0-20200821142938-949cc6f4b097.mod -> go.starlark.net%2F@v%2Fv0.0.0-20200821142938-949cc6f4b097.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/arch/@v/v0.0.0-20190927153633-4e8777c89be4.zip -> golang.org%2Fx%2Farch%2F@v%2Fv0.0.0-20190927153633-4e8777c89be4.zip mirror://goproxy//golang.org/x/arch/@v/v0.0.0-20190927153633-4e8777c89be4.mod -> golang.org%2Fx%2Farch%2F@v%2Fv0.0.0-20190927153633-4e8777c89be4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210514084401-e8d321eab015.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210514084401-e8d321eab015.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191127201027-ecd32218bd7f.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191127201027-ecd32218bd7f.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191127201027-ecd32218bd7f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191127201027-ecd32218bd7f.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61
+_md5_=44d93619f493f1a1f82c27cbb49f7a77
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 61789c05f12c..75186e0ee51c 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r2 b/metadata/md5-cache/dev-java/aopalliance-1.0-r2
index bf5b653b598d..065f03d593f4 100644
--- a/metadata/md5-cache/dev-java/aopalliance-1.0-r2
+++ b/metadata/md5-cache/dev-java/aopalliance-1.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Aspect-Oriented Programming (AOP) Alliance classes
 EAPI=5
 HOMEPAGE=http://aopalliance.sourceforge.net/
 IUSE=elibc_FreeBSD doc source
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/aopalliance-1.0-gentoo.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=785a5d7fd82531054df6f38100c2cf2c
+_md5_=331b2d7c3cfa69f24d20f554c1318831
diff --git a/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2 b/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2
new file mode 100644
index 000000000000..c4c173e1cc0c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/bnd-junit-2.1.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/osgi-core-api:0 dev-java/bndlib:0 virtual/jdk:1.8 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Junit plugin for bndlib, a swiss army knife for OSGi
+EAPI=7
+HOMEPAGE=http://www.aqute.biz/Bnd/Bnd
+IUSE=elibc_FreeBSD test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/osgi-core-api:0 dev-java/bndlib:0 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
+_eclasses_=java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=024d611dae6922351631e7f7f594bca7
diff --git a/metadata/md5-cache/dev-java/bndlib-2.1.0-r1 b/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
new file mode 100644
index 000000000000..01f512e97d00
--- /dev/null
+++ b/metadata/md5-cache/dev-java/bndlib-2.1.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=virtual/jdk:1.8 dev-java/libg:0 dev-java/osgi-compendium:0 dev-java/osgi-core-api:0 dev-java/osgi-enterprise-api:0 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A swiss army knife for OSGi
+EAPI=7
+HOMEPAGE=https://bnd.bndtools.org/
+IUSE=elibc_FreeBSD test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=virtual/jre:1.8 dev-java/libg:0 dev-java/osgi-compendium:0 dev-java/osgi-core-api:0 dev-java/osgi-enterprise-api:0 >=dev-java/java-config-2.2.0-r3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
+_eclasses_=java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7c2cbf2e20db598f7910a185670ed63f
diff --git a/metadata/md5-cache/dev-java/bsf-2.4.0-r2 b/metadata/md5-cache/dev-java/bsf-2.4.0-r2
index a64a0e29a56a..87881160ef08 100644
--- a/metadata/md5-cache/dev-java/bsf-2.4.0-r2
+++ b/metadata/md5-cache/dev-java/bsf-2.4.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Bean Script Framework
 EAPI=5
 HOMEPAGE=http://commons.apache.org/bsf/
 IUSE=javascript python tcl elibc_FreeBSD doc examples source
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=python? ( dev-java/jython:2.7 ) javascript? ( dev-java/rhino:1.6 ) tcl? ( dev-java/jacl:0 ) dev-java/xalan:0 dev-java/commons-logging:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/jakarta/bsf/source/bsf-src-2.4.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3adbb1c06dc3758660e387b8d7ff6837
+_md5_=4334df13a0fb1a97ad6dfa1aa7001423
diff --git a/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1 b/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
index 1cc220fb5111..c40df0c03b1a 100644
--- a/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
+++ b/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A small embeddable Java source interpreter
 EAPI=7
 HOMEPAGE=https://github.com/beanshell/beanshell
 IUSE=elibc_FreeBSD doc source test
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=dev-java/bsf:2.3 java-virtuals/servlet-api:3.0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beanshell/beanshell/archive/2.0b6.tar.gz -> bsh-2.0b6.tar.gz
 _eclasses_=java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9ea5e9a219a6bbe619135f01eb1e9f9f
+_md5_=f2b83f1c67df6032fe1565da3379147c
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.21 b/metadata/md5-cache/dev-java/commons-compress-1.21
new file mode 100644
index 000000000000..a97c20aa30c8
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-compress-1.21
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/asm:9 >=dev-java/brotli-dec-0.1.2:0 >=dev-java/xz-java-1.9:0 >=dev-java/zstd-jni-1.5.0.4:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Java API for working with archive files
+EAPI=7
+HOMEPAGE=https://commons.apache.org/proper/commons-compress/
+IUSE=elibc_FreeBSD doc source
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 >=dev-java/brotli-dec-0.1.2:0 >=dev-java/xz-java-1.9:0 >=dev-java/zstd-jni-1.5.0.4:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://apache/commons/compress/source/commons-compress-1.21-src.tar.gz -> commons-compress-1.21-sources.tar.gz
+_eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
+_md5_=27432309a73cdc003d87472cb21b37c8
diff --git a/metadata/md5-cache/dev-java/dom4j-2.1.3 b/metadata/md5-cache/dev-java/dom4j-2.1.3
index 05e0b00cf777..5a08b8927a18 100644
--- a/metadata/md5-cache/dev-java/dom4j-2.1.3
+++ b/metadata/md5-cache/dev-java/dom4j-2.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=flexible XML framework for Java
 EAPI=7
 HOMEPAGE=https://dom4j.github.io/
 IUSE=jaxen elibc_FreeBSD doc source test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=dom4j
 RDEPEND=dev-java/jaxb-api:2 dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 jaxen? ( dev-java/jaxen:1.2[dom4j] ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/dom4j/dom4j/archive/refs/tags/version-2.1.3.tar.gz -> dom4j-2.1.3.tar.gz https://repo1.maven.org/maven2/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar
 _eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
-_md5_=23844043cf6a4044eb2ce032550c6256
+_md5_=dad2a6251eb387191366037e179e9ec6
diff --git a/metadata/md5-cache/dev-java/guice-4.1 b/metadata/md5-cache/dev-java/guice-4.1
index 9019fa75d149..ce789cb9b286 100644
--- a/metadata/md5-cache/dev-java/guice-4.1
+++ b/metadata/md5-cache/dev-java/guice-4.1
@@ -4,11 +4,11 @@ DESCRIPTION=A lightweight dependency injection framework for Java 5 and above
 EAPI=6
 HOMEPAGE=https://github.com/google/guice/
 IUSE=elibc_FreeBSD source
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 dev-java/aopalliance:1 >=dev-java/asm-5:4 >=dev-java/cglib-3.1:3 dev-java/guava:20 dev-java/javax-inject:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=4
 SRC_URI=https://github.com/google/guice/archive/4.1.tar.gz -> guice-4.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1131efb770813c2c0e9dbcaab0c66eef
+_md5_=f81d3dcf34223a3a650ff6e01bc41705
diff --git a/metadata/md5-cache/dev-java/jacl-1.4.1-r1 b/metadata/md5-cache/dev-java/jacl-1.4.1-r1
index c2ca92d191e6..884b4a95a616 100644
--- a/metadata/md5-cache/dev-java/jacl-1.4.1-r1
+++ b/metadata/md5-cache/dev-java/jacl-1.4.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Jacl is an implementation of Tcl written in Java
 EAPI=5
 HOMEPAGE=http://tcljava.sourceforge.net
 IUSE=doc elibc_FreeBSD doc source
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.4.5:* >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/tcljava/jacl1.4.1.tar.gz -> jacl-1.4.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2c9c61aff1df3bd9c81363c394776c8c
+_md5_=17d6789afbe585eb9c428f52df4ac7e9
diff --git a/metadata/md5-cache/dev-java/janino-2.7.0 b/metadata/md5-cache/dev-java/janino-2.7.0
index fc116ba5d25c..b48e7601f7b6 100644
--- a/metadata/md5-cache/dev-java/janino-2.7.0
+++ b/metadata/md5-cache/dev-java/janino-2.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=An embedded compiler for run-time compilation purposes
 EAPI=5
 HOMEPAGE=http://janino.net/
 IUSE=elibc_FreeBSD doc source examples
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/unkrig-nullanalysis:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://janino.net/download/janino-2.7.0.zip
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d3481284a365744490f18ddf2d709a57
+_md5_=88a5974d0ee185f4239020f7265dd563
diff --git a/metadata/md5-cache/dev-java/javacc-5.0-r3 b/metadata/md5-cache/dev-java/javacc-5.0-r3
index 5b9545c6076c..eee92c286b09 100644
--- a/metadata/md5-cache/dev-java/javacc-5.0-r3
+++ b/metadata/md5-cache/dev-java/javacc-5.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Java Compiler Compiler - The Java Parser Generator
 EAPI=6
 HOMEPAGE=https://javacc.java.net/
 IUSE=elibc_FreeBSD doc examples source test
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=dev-java/junit:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://java.net/projects/javacc/downloads/download/javacc-5.0src.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3aadeb6eeb7c37040354e22335019fa0
+_md5_=cc7cb5af8194b96343e1de85e56fc3b4
diff --git a/metadata/md5-cache/dev-java/javassist-3.18.2 b/metadata/md5-cache/dev-java/javassist-3.18.2
index aa16a8643a20..1835f0b86265 100644
--- a/metadata/md5-cache/dev-java/javassist-3.18.2
+++ b/metadata/md5-cache/dev-java/javassist-3.18.2
@@ -4,10 +4,10 @@ DESCRIPTION=Javassist makes Java bytecode manipulation simple
 EAPI=5
 HOMEPAGE=http://www.csg.is.titech.ac.jp/~chiba/javassist/
 IUSE=elibc_FreeBSD doc source examples
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_18_2_ga_build.tar.gz -> javassist-3.18.2.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f6f7fee852ca9f045bbd3649697242b0
+_md5_=b5b83c9ff5ae93676a003ab7172fdba8
diff --git a/metadata/md5-cache/dev-java/javax-inject-1-r3 b/metadata/md5-cache/dev-java/javax-inject-1-r3
index f9d08d89f721..3e7e8a78f458 100644
--- a/metadata/md5-cache/dev-java/javax-inject-1-r3
+++ b/metadata/md5-cache/dev-java/javax-inject-1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Dependency injection for Java (JSR-330)
 EAPI=6
 HOMEPAGE=https://code.google.com/p/atinject/
 IUSE=elibc_FreeBSD doc source
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar -> javax-inject-1.jar
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d792b82e19281f86c431741cfe621ed8
+_md5_=2e133e123861e5b6a99bd1401586e985
diff --git a/metadata/md5-cache/dev-java/jclasslib-3.1 b/metadata/md5-cache/dev-java/jclasslib-3.1
index 2ed6c61e9e45..39e637232556 100644
--- a/metadata/md5-cache/dev-java/jclasslib-3.1
+++ b/metadata/md5-cache/dev-java/jclasslib-3.1
@@ -4,10 +4,10 @@ DESCRIPTION=Java bytecode viewer
 EAPI=6
 HOMEPAGE=https://github.com/ingokegel/jclasslib
 IUSE=elibc_FreeBSD doc source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/ingokegel/jclasslib/archive/3.1.tar.gz -> jclasslib-3.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=43a18d81a9af39c5d3a0587c57c100bc
+_md5_=9c0671bb61bc02e0f2416bb1564c37e2
diff --git a/metadata/md5-cache/dev-java/jcommander-1.48 b/metadata/md5-cache/dev-java/jcommander-1.48
index 1ed0636ea4a4..6dd8ce05692d 100644
--- a/metadata/md5-cache/dev-java/jcommander-1.48
+++ b/metadata/md5-cache/dev-java/jcommander-1.48
@@ -4,11 +4,11 @@ DESCRIPTION=Command line parsing framework for Java
 EAPI=5
 HOMEPAGE=https://github.com/cbeust/jcommander
 IUSE=elibc_FreeBSD doc source
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cbeust/jcommander/archive/jcommander-1.48.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c850ffa696e430a788ecf243d5565d15
+_md5_=8f201e5563da9df7a87287224ca990e9
diff --git a/metadata/md5-cache/dev-java/joda-convert-1.3.1-r1 b/metadata/md5-cache/dev-java/joda-convert-1.3.1-r1
index 488cc890f797..2fb998fc5801 100644
--- a/metadata/md5-cache/dev-java/joda-convert-1.3.1-r1
+++ b/metadata/md5-cache/dev-java/joda-convert-1.3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Java library for conversion between Object and String
 EAPI=7
 HOMEPAGE=https://www.joda.org/joda-convert/
 IUSE=elibc_FreeBSD doc source test
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/joda-convert/joda-convert-1.3.1-dist.tar.gz
 _eclasses_=java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=27ad651699cc0f7d5710acf9600f7ad2
+_md5_=57090bb62b03e5b571491e89d4f2c899
diff --git a/metadata/md5-cache/dev-java/joda-time-2.10.10-r1 b/metadata/md5-cache/dev-java/joda-time-2.10.10-r1
index 86d9023eefe9..b4981f953374 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.10.10-r1
+++ b/metadata/md5-cache/dev-java/joda-time-2.10.10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Date and time library to replace JDK date handling
 EAPI=7
 HOMEPAGE=https://www.joda.org/joda-time/
 IUSE=elibc_FreeBSD doc source test
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/joda-convert:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-time/archive/refs/tags/v2.10.10.tar.gz -> joda-time-2.10.10.tar.gz
 _eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
-_md5_=a945221520a356858bb771baa7edc873
+_md5_=f83597de456be62e937a23efb7f299d8
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0-r2 b/metadata/md5-cache/dev-java/jython-2.7.0-r2
index f61c6fd0b7ed..204e835a41e9 100644
--- a/metadata/md5-cache/dev-java/jython-2.7.0-r2
+++ b/metadata/md5-cache/dev-java/jython-2.7.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of Python written in Java
 EAPI=6
 HOMEPAGE=https://www.jython.org
 IUSE=examples test elibc_FreeBSD doc source
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-2
 RDEPEND=dev-java/antlr:3 dev-java/netty-transport:0 >=dev-java/asm-5:4 dev-java/commons-compress:0 dev-java/guava:20 dev-java/jffi:1.2 dev-java/jline:2 dev-java/icu4j:52 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/script-api:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=2.7
 SRC_URI=https://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9146b361b1282323dfc5dc8500c35f72
+_md5_=099c895f408ab407690211257c0985d4
diff --git a/metadata/md5-cache/dev-java/netty-buffer-4.0.36 b/metadata/md5-cache/dev-java/netty-buffer-4.0.36
index 2862f142e805..7d855cec8907 100644
--- a/metadata/md5-cache/dev-java/netty-buffer-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-buffer-4.0.36
@@ -4,11 +4,11 @@ DESCRIPTION=Async event-driven framework for high performance network applicatio
 EAPI=5
 HOMEPAGE=https://netty.io/
 IUSE=test elibc_FreeBSD doc source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-common-4.0.36:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1f8dda37e1345527668ea12bf0fc2105
+_md5_=33145c0b8f8d2061e681542c83e489ea
diff --git a/metadata/md5-cache/dev-java/netty-transport-4.0.36 b/metadata/md5-cache/dev-java/netty-transport-4.0.36
index 7911716e5ba7..c0df8aeafcad 100644
--- a/metadata/md5-cache/dev-java/netty-transport-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-transport-4.0.36
@@ -4,11 +4,11 @@ DESCRIPTION=Async event-driven framework for high performance network applicatio
 EAPI=5
 HOMEPAGE=https://netty.io/
 IUSE=test elibc_FreeBSD doc source
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-common-4.0.36:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5eb97f0554af21782a48ae7b7f879b99
+_md5_=44ad6b98723ce838b84014e925900706
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1 b/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1
index 6625b8d27d67..ee4af48ccd27 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.11_p9-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=javafx? ( alsa !headless-awt )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.11-ga.tar.bz2 -> openjdk-11.0.11_p9.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	java-vm-2	1b9686c0df06500159478dfaf5c21338	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a5047643b0a8a954600ef40894c5775f
+_md5_=843db35c1b173233c4d6bd689e124f5f
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.12_p7 b/metadata/md5-cache/dev-java/openjdk-11.0.12_p7
index 67296b0780e6..68924ef680ef 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.12_p7
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.12_p7
@@ -11,4 +11,4 @@ REQUIRED_USE=javafx? ( alsa !headless-awt )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.12-ga.tar.bz2 -> openjdk-11.0.12_p7.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	java-vm-2	1b9686c0df06500159478dfaf5c21338	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=09a16e08a1ded42ce83fcd958fab60b3
+_md5_=be574fe58f9b6984a1cddf8ce6741931
diff --git a/metadata/md5-cache/dev-java/openjdk-17_p35 b/metadata/md5-cache/dev-java/openjdk-17_p35
new file mode 100644
index 000000000000..d03c039490fb
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-17_p35
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:17= ) || ( dev-java/openjdk-bin:17 dev-java/openjdk:17 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=Open source implementation of the Java programming language
+EAPI=6
+HOMEPAGE=https://openjdk.java.net
+IUSE=alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+LICENSE=GPL-2
+RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+REQUIRED_USE=javafx? ( alsa !headless-awt )
+SLOT=17
+SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17+35.tar.gz -> openjdk-17_p35.tar.gz
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b6e0bb25db70ff1a40a4e6fbc4594d50
diff --git a/metadata/md5-cache/dev-java/openjdk-8.292_p10 b/metadata/md5-cache/dev-java/openjdk-8.292_p10
index 04f2a7e7d81a..88d346e30b47 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.292_p10
+++ b/metadata/md5-cache/dev-java/openjdk-8.292_p10
@@ -11,4 +11,4 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/ba
 SLOT=8
 SRC_URI=!arm64? ( https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u292-ga.tar.bz2 -> openjdk-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u292-ga.tar.bz2 -> openjdk-corba-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u292-ga.tar.bz2 -> openjdk-hotspot-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u292-ga.tar.bz2 -> openjdk-jaxp-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u292-ga.tar.bz2 -> openjdk-jaxws-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u292-ga.tar.bz2 -> openjdk-jdk-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u292-ga.tar.bz2 -> openjdk-langtools-8.292_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u292-ga.tar.bz2 -> openjdk-nashorn-8.292_p10.tar.bz2 ) arm64? ( https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-corba-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-hotspot-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jaxp-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jaxws-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-jdk-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-langtools-8.292_p10.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u292-b10.tar.bz2 -> openjdk-aarch64-shenandoah-nashorn-jdk8.292_p10.tar.bz2 )
 _eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=56de332b7b59352a2eca762e9fa5504a
+_md5_=c6af17a127ded32ec9fb231b8119d328
diff --git a/metadata/md5-cache/dev-java/openjdk-8.302_p08 b/metadata/md5-cache/dev-java/openjdk-8.302_p08
index 97861282e11f..dd932ee24468 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.302_p08
+++ b/metadata/md5-cache/dev-java/openjdk-8.302_p08
@@ -11,4 +11,4 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/ba
 SLOT=8
 SRC_URI=!arm64? ( https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u302-ga.tar.bz2 -> openjdk-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u302-ga.tar.bz2 -> openjdk-corba-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u302-ga.tar.bz2 -> openjdk-hotspot-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u302-ga.tar.bz2 -> openjdk-jaxp-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u302-ga.tar.bz2 -> openjdk-jaxws-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u302-ga.tar.bz2 -> openjdk-jdk-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u302-ga.tar.bz2 -> openjdk-langtools-8.302_p08.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u302-ga.tar.bz2 -> openjdk-nashorn-8.302_p08.tar.bz2 ) arm64? ( https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-corba-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-hotspot-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jaxp-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jaxws-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-jdk-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-langtools-8.302_p08.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u302-b08.tar.bz2 -> openjdk-aarch64-shenandoah-nashorn-jdk8.302_p08.tar.bz2 )
 _eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	java-vm-2	1b9686c0df06500159478dfaf5c21338	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c351e56e72debbaa0946a0fc0fb67d7d
+_md5_=75aa80fdb2f9338fad9e94ee2b8f1fea
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-17_p35 b/metadata/md5-cache/dev-java/openjdk-bin-17_p35
index c87761dcdd88..0224acbe2e37 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-17_p35
+++ b/metadata/md5-cache/dev-java/openjdk-bin-17_p35
@@ -6,9 +6,9 @@ HOMEPAGE=https://adoptium.net
 IUSE=alsa cups +gentoo-vm headless-awt selinux source
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x64-macos
 LICENSE=GPL-2-with-classpath-exception
-RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/harfbuzz >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/harfbuzz elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 RESTRICT=preserve-libs splitdebug
 SLOT=17
-SRC_URI=arm? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17+35/OpenJDK17-jdk_arm_linux_hotspot_17_35.tar.gz ) arm64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17+35/OpenJDK17-jdk_aarch64_linux_hotspot_17_35.tar.gz ) ppc64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17+35/OpenJDK17-jdk_ppc64le_linux_hotspot_17_35.tar.gz ) amd64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17+35/OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17+35/OpenJDK17-jdk_x64_mac_hotspot_17_35.tar.gz )
+SRC_URI=arm? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17+35//OpenJDK17-jdk_arm_linux_hotspot_17_35.tar.gz ) arm64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17+35//OpenJDK17-jdk_aarch64_linux_hotspot_17_35.tar.gz ) ppc64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17+35//OpenJDK17-jdk_ppc64le_linux_hotspot_17_35.tar.gz ) amd64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17+35//OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17+35//OpenJDK17-jdk_x64_alpine-linux_hotspot_17_35.tar.gz ) ) x64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17+35//OpenJDK17-jdk_x64_mac_hotspot_17_35.tar.gz )
 _eclasses_=java-vm-2	1b9686c0df06500159478dfaf5c21338	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cf077f6a8c831bb1144bf4e6a859fd77
+_md5_=85a310668842ef0d43464faffde57ac7
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.28-r1 b/metadata/md5-cache/dev-java/snakeyaml-1.28-r1
index aa36594796dc..0d9acdfd4189 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.28-r1
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.28-r1
@@ -4,11 +4,11 @@ DESCRIPTION=YAML 1.1 parser and emitter for Java
 EAPI=7
 HOMEPAGE=https://bitbucket.org/asomov/snakeyaml
 IUSE=elibc_FreeBSD doc source test
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/asomov/snakeyaml/get/snakeyaml-1.28.tar.gz -> asomov-snakeyaml-b28f0b4d87c6.tar.gz
 _eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
-_md5_=11f8c667e48528867d7f3c7d2673387c
+_md5_=f206c5d90e988deadc18426404dcdcbf
diff --git a/metadata/md5-cache/dev-java/testng-6.9.10 b/metadata/md5-cache/dev-java/testng-6.9.10
index 054d58c854e7..7f51c6bad0b5 100644
--- a/metadata/md5-cache/dev-java/testng-6.9.10
+++ b/metadata/md5-cache/dev-java/testng-6.9.10
@@ -4,11 +4,11 @@ DESCRIPTION=Testing framework inspired by JUnit and NUnit with new features
 EAPI=5
 HOMEPAGE=https://testng.org/
 IUSE=test elibc_FreeBSD doc source
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev-java/snakeyaml:0 dev-java/jcommander:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cbeust/testng/archive/6.9.10.tar.gz -> testng-6.9.10.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=533552959c837beb161598a3e8135656
+_md5_=ed1aeb987ecf260af25a403fab6cd8c4
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.10 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.10
deleted file mode 100644
index c7534460dd5d..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source
-KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=5.0
-SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.10/src/apache-tomcat-10.0.10-src.tar.gz
-_eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
-_md5_=4b36dad821b9d52f8aa9b794b09c08ac
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.11 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.11
deleted file mode 100644
index 21ef2638f089..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=5.0
-SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.11/src/apache-tomcat-10.0.11-src.tar.gz
-_eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
-_md5_=77fd539bb8ae0a999f3ea38f455ad5b1
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.12 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.12
index e0881f9cf47c..788a01f58950 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.12
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.12
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.12/src/apache-tomcat-10.0.12-src.tar.gz
 _eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
-_md5_=77fd539bb8ae0a999f3ea38f455ad5b1
+_md5_=4b36dad821b9d52f8aa9b794b09c08ac
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.70 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.70
deleted file mode 100644
index fcbf4826a3a9..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.70
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.70/src/apache-tomcat-8.5.70-src.tar.gz
-_eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
-_md5_=79a96c508aead4b84cfed9039f703158
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.71 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.71
deleted file mode 100644
index 3e9fcb8abfa1..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.71
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.71/src/apache-tomcat-8.5.71-src.tar.gz
-_eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
-_md5_=6bfb744c21b3aef71221b585819bbcf5
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.72 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.72
new file mode 100644
index 000000000000..9cb14b6e4111
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.72
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.72/src/apache-tomcat-8.5.72-src.tar.gz
+_eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
+_md5_=79a96c508aead4b84cfed9039f703158
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.52 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.52
deleted file mode 100644
index 459cd737f50d..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.52
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.0
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.52/src/apache-tomcat-9.0.52-src.tar.gz
-_eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
-_md5_=3e1c4341b1005b5e55812eaa88d4fc04
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.53 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.53
deleted file mode 100644
index be6e27844184..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.53
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.0
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.53/src/apache-tomcat-9.0.53-src.tar.gz
-_eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
-_md5_=5c43d891ab52b7fab53f38a55644b1ce
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.54 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.54
index 2f3b7b15b309..d604a67d9a4a 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.54
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.54
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.54/src/apache-tomcat-9.0.54-src.tar.gz
 _eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
-_md5_=5c43d891ab52b7fab53f38a55644b1ce
+_md5_=3e1c4341b1005b5e55812eaa88d4fc04
diff --git a/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644 b/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
index 9e01fafa612c..11f46d475675 100644
--- a/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
+++ b/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
@@ -4,10 +4,10 @@ DESCRIPTION=Some classes to test for various null conditions
 EAPI=5
 HOMEPAGE=http://commons.unkrig.de
 IUSE=elibc_FreeBSD doc source
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c1e3e967e811cb6a8506aaf8f196e00c
+_md5_=320e8fecc1a19918665295df1653b13b
diff --git a/metadata/md5-cache/dev-java/velocity-2.3 b/metadata/md5-cache/dev-java/velocity-2.3
index e9dd500bf43d..0e0531b38e89 100644
--- a/metadata/md5-cache/dev-java/velocity-2.3
+++ b/metadata/md5-cache/dev-java/velocity-2.3
@@ -5,11 +5,11 @@ DESCRIPTION=Apache Velocity is a general purpose template engine.
 EAPI=7
 HOMEPAGE=https://velocity.apache.org
 IUSE=elibc_FreeBSD doc source test
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-io-2.8.0:1 >=dev-java/commons-lang-3.11:3.6 >=dev-java/slf4j-api-1.7.30:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/apache/velocity-engine/archive/refs/tags/2.3.tar.gz -> velocity-2.3.tar.gz
 _eclasses_=java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-pkg-simple	148ea0f0bf459bdb4768a56036df3cc2	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460
-_md5_=2c82ab5fb11466d44fda112e10441119
+_md5_=576aefb14fa5314e92533cdb6ec432db
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index b33116595090..5b84c18a8518 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/cfortran-20110621 b/metadata/md5-cache/dev-lang/cfortran-20110621
index 7479e35cac20..49adcac8936c 100644
--- a/metadata/md5-cache/dev-lang/cfortran-20110621
+++ b/metadata/md5-cache/dev-lang/cfortran-20110621
@@ -4,10 +4,10 @@ DESCRIPTION=Header file allowing to call Fortran routines from C and C++
 EAPI=8
 HOMEPAGE=https://www-zeus.desy.de/~burow/cfortran/
 IUSE=examples test
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/cfortran/cfortran_20110621.orig.tar.gz mirror://debian/pool/main/c/cfortran/cfortran_20110621-1.debian.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3f3b94409e44335e8a4b818baa3cdcc0
+_md5_=2630fac27792e15cbdbf32b2d75e6413
diff --git a/metadata/md5-cache/dev-lang/cfortran-20210827 b/metadata/md5-cache/dev-lang/cfortran-20210827
new file mode 100644
index 000000000000..556471c70527
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/cfortran-20210827
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( virtual/fortran )
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=Header file allowing to call Fortran routines from C and C++
+EAPI=8
+HOMEPAGE=https://www-zeus.desy.de/~burow/cfortran/ https://github.com/bastien-roucaries/cfortran
+IUSE=examples test
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/c/cfortran/cfortran_20210827.orig.tar.gz mirror://debian/pool/main/c/cfortran/cfortran_20210827-1.debian.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=37706ec6fe49ef39b35855cf1627e7c4
diff --git a/metadata/md5-cache/dev-lang/fpc-3.2.2 b/metadata/md5-cache/dev-lang/fpc-3.2.2
index ac4bd3459e52..bdb0102a94e8 100644
--- a/metadata/md5-cache/dev-lang/fpc-3.2.2
+++ b/metadata/md5-cache/dev-lang/fpc-3.2.2
@@ -3,10 +3,10 @@ DESCRIPTION=Free Pascal Compiler
 EAPI=7
 HOMEPAGE=https://www.freepascal.org/
 IUSE=doc source
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~arm64 x86
 LICENSE=GPL-2 LGPL-2.1-with-linking-exception
 RESTRICT=strip
 SLOT=0
-SRC_URI=mirror://sourceforge/freepascal/fpcbuild-3.2.2.tar.gz mirror://sourceforge/freepascal/fpc-3.2.2.source.tar.gz amd64? ( mirror://sourceforge/freepascal/fpc-3.2.2.x86_64-linux.tar ) x86? ( mirror://sourceforge/freepascal/fpc-3.2.2.i386-linux.tar ) doc? ( mirror://sourceforge/freepascal/Documentation/3.2.2/doc-html.tar.gz -> fpc-3.2.2-doc-html.tar.gz )
+SRC_URI=mirror://sourceforge/freepascal/fpcbuild-3.2.2.tar.gz mirror://sourceforge/freepascal/fpc-3.2.2.source.tar.gz amd64? ( mirror://sourceforge/freepascal/fpc-3.2.2.x86_64-linux.tar ) arm64? ( mirror://sourceforge/freepascal/fpc-3.2.2.aarch64-linux.tar ) x86? ( mirror://sourceforge/freepascal/fpc-3.2.2.i386-linux.tar ) doc? ( mirror://sourceforge/freepascal/Documentation/3.2.2/doc-html.tar.gz -> fpc-3.2.2-doc-html.tar.gz )
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8bdea9baa86ab79709e3e796f3f66d3b
+_md5_=b49ea103657f3aff326c8e1e7d892a65
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
index f25165c9fb3e..fa2ec7494625 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
 RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
 RESTRICT=!test? ( test )
 SLOT=6.3.0
-SRC_URI=http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3 -> gnat-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adb65c7a4473fcbb153ac -> gcc-6-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adbc5c7a4473fcbb153ae -> gcc-interface-6-gpl-2017-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3 -> gnat-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adb65c7a4473fcbb153ac -> gcc-6-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adbc5c7a4473fcbb153ae -> gcc-interface-6-gpl-2017-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5795a247e934bc6ad85ca75ee0b1c224
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3 b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
index eae701f56ceb..e73c7129bd1e 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
 RDEPEND=!sys-devel/gcc:7.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=7.3.1
-SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5 -> gnat-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7 -> gcc-7-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6 -> gcc-interface-7-gpl-2018-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.8.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5 -> gnat-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7 -> gcc-7-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6 -> gcc-interface-7-gpl-2018-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.8.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0ed22962849b42bbc6d445632f93a3ed
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2 b/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
index e623cb0a5191..cf0e67a6866c 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
 RDEPEND=!sys-devel/gcc:8.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=test
 SLOT=8.3.1
-SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf865331e87aa2cdf16b49 -> gnat-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf8a0731e87a8f1d425049 -> gcc-8-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf87cc31e87aa2cdf16b50 -> gcc-interface-8-2019-20190510-18F59-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-4.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf865331e87aa2cdf16b49 -> gnat-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf8a0731e87a8f1d425049 -> gcc-8-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf87cc31e87aa2cdf16b50 -> gcc-interface-8-2019-20190510-18F59-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-4.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=27927871f5886f2ea85b6eb1de05115a
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2020 b/metadata/md5-cache/dev-lang/gnat-gpl-2020
index ff78b56f859b..fbcd638da4c5 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2020
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2020
@@ -11,6 +11,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
 RDEPEND=!sys-devel/gcc:9.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=test
 SLOT=9.3.1
-SRC_URI=https://community.download.adacore.com/v1/649a561ec6de9e476c54b02715b79f7503600ce5?filename=gnat-2020-20200429-19B04-src.tar.gz -> gnat-2020-20200429-19B04-src.tar.gz https://community.download.adacore.com/v1/e6b6a3e318e13248456bd37b758435e602b367da?filename=gcc-9-2020-20200429-19AA7-src.tar.gz -> gcc-9-2020-20200429-19AA7-src.tar.gz https://community.download.adacore.com/v1/c7a97636b31f3575df85f1eb0965462a353630dd?filename=gcc-interface-9-2020-20200429-19B10-src.tar.gz -> gcc-interface-9-2020-20200429-19B10-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.3.0-patches-4.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=https://community.download.adacore.com/v1/649a561ec6de9e476c54b02715b79f7503600ce5?filename=gnat-2020-20200429-19B04-src.tar.gz -> gnat-2020-20200429-19B04-src.tar.gz https://community.download.adacore.com/v1/e6b6a3e318e13248456bd37b758435e602b367da?filename=gcc-9-2020-20200429-19AA7-src.tar.gz -> gcc-9-2020-20200429-19AA7-src.tar.gz https://community.download.adacore.com/v1/c7a97636b31f3575df85f1eb0965462a353630dd?filename=gcc-interface-9-2020-20200429-19B10-src.tar.gz -> gcc-interface-9-2020-20200429-19B10-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.3.0-patches-4.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=305f34fec95d5164df881d5c5640bc53
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2021 b/metadata/md5-cache/dev-lang/gnat-gpl-2021
index 3cc12b42437f..8f76cde8a719 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2021
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2021
@@ -11,6 +11,6 @@ PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=!~sys-devel/gcc-10.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=test
 SLOT=10
-SRC_URI=https://community.download.adacore.com/v1/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=gnat-2021-20210519-19A70-src.tar.gz -> gnat-2021-20210519-19A70-src.tar.gz https://community.download.adacore.com/v1/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=gcc-10-2021-20210519-19A74-src.tar.gz -> gcc-10-2021-20210519-19A74-src.tar.gz https://community.download.adacore.com/v1/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=gcc-interface-10-2021-20210519-19A75-src.tar.gz -> gcc-interface-10-2021-20210519-19A75-src.tar.gz bootstrap? ( amd64? ( https://community.download.adacore.com/v1/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=gnat-gpl-2014-x86_64-linux-bin.tar.gz&rand=1193 -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( https://community.download.adacore.com/v1/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=gnat-gpl-2014-x86-linux-bin.tar.gz&rand=436 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=https://community.download.adacore.com/v1/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=gnat-2021-20210519-19A70-src.tar.gz -> gnat-2021-20210519-19A70-src.tar.gz https://community.download.adacore.com/v1/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=gcc-10-2021-20210519-19A74-src.tar.gz -> gcc-10-2021-20210519-19A74-src.tar.gz https://community.download.adacore.com/v1/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=gcc-interface-10-2021-20210519-19A75-src.tar.gz -> gcc-interface-10-2021-20210519-19A75-src.tar.gz bootstrap? ( amd64? ( https://community.download.adacore.com/v1/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=gnat-gpl-2014-x86_64-linux-bin.tar.gz&rand=1193 -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( https://community.download.adacore.com/v1/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=gnat-gpl-2014-x86-linux-bin.tar.gz&rand=436 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-1.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2a2fe976b6a350944f6dddf897363262
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
index 49c5e537932e..31c202d43b0d 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
@@ -11,6 +11,6 @@ PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=!~sys-devel/gcc-10.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=test
 SLOT=10
-SRC_URI=https://community.download.adacore.com/v1/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=gnat-2021-20210519-19A70-src.tar.gz -> gnat-2021-20210519-19A70-src.tar.gz https://community.download.adacore.com/v1/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=gcc-10-2021-20210519-19A74-src.tar.gz -> gcc-10-2021-20210519-19A74-src.tar.gz https://community.download.adacore.com/v1/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=gcc-interface-10-2021-20210519-19A75-src.tar.gz -> gcc-interface-10-2021-20210519-19A75-src.tar.gz bootstrap? ( amd64? ( https://community.download.adacore.com/v1/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=gnat-gpl-2014-x86_64-linux-bin.tar.gz&rand=1193 -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( https://community.download.adacore.com/v1/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=gnat-gpl-2014-x86-linux-bin.tar.gz&rand=436 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=https://community.download.adacore.com/v1/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=gnat-2021-20210519-19A70-src.tar.gz -> gnat-2021-20210519-19A70-src.tar.gz https://community.download.adacore.com/v1/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=gcc-10-2021-20210519-19A74-src.tar.gz -> gcc-10-2021-20210519-19A74-src.tar.gz https://community.download.adacore.com/v1/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=gcc-interface-10-2021-20210519-19A75-src.tar.gz -> gcc-interface-10-2021-20210519-19A75-src.tar.gz bootstrap? ( amd64? ( https://community.download.adacore.com/v1/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=gnat-gpl-2014-x86_64-linux-bin.tar.gz&rand=1193 -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( https://community.download.adacore.com/v1/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=gnat-gpl-2014-x86-linux-bin.tar.gz&rand=436 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-3.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cf2ab6dcca7a053bebc95ca33c7f0cd9
diff --git a/metadata/md5-cache/dev-lang/go-1.17 b/metadata/md5-cache/dev-lang/go-1.17
deleted file mode 100644
index 2dcf92c8997e..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.17
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install postinst test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-IUSE=cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=strip
-SLOT=0/1.17
-SRC_URI=https://storage.googleapis.com/golang/go1.17.src.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f6bbac794022e3d88bc440450daf559
diff --git a/metadata/md5-cache/dev-lang/go-1.17.1 b/metadata/md5-cache/dev-lang/go-1.17.1
deleted file mode 100644
index 5d54841e8c76..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.17.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install postinst test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://golang.org
-IUSE=cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=!<dev-go/go-tools-0_pre20150902
-RESTRICT=strip
-SLOT=0/1.17.1
-SRC_URI=https://storage.googleapis.com/golang/go1.17.1.src.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1ac3d2c90d712fc3c9888f6a7b5b9180
diff --git a/metadata/md5-cache/dev-lang/go-1.17.2 b/metadata/md5-cache/dev-lang/go-1.17.2
new file mode 100644
index 000000000000..65089928e0e3
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.17.2
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
+DEFINED_PHASES=compile install postinst test
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://golang.org
+IUSE=cpu_flags_x86_sse2
+KEYWORDS=-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=strip
+SLOT=0/1.17.2
+SRC_URI=https://storage.googleapis.com/golang/go1.17.2.src.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1ac3d2c90d712fc3c9888f6a7b5b9180
diff --git a/metadata/md5-cache/dev-lang/ispc-1.16.1 b/metadata/md5-cache/dev-lang/ispc-1.16.1
new file mode 100644
index 000000000000..2671503125a9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ispc-1.16.1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison sys-devel/flex || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=<sys-devel/clang-13:= !!sys-devel/llvm:0
+DESCRIPTION=Intel SPMD Program Compiler
+EAPI=7
+HOMEPAGE=https://ispc.github.io/
+IUSE=examples
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD BSD-2 UoI-NCSA
+RDEPEND=<sys-devel/clang-13:=
+SLOT=0
+SRC_URI=https://github.com/ispc/ispc/archive/v1.16.1.tar.gz -> ispc-1.16.1.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=489a31fb27ff11b75706e12503b901c6
diff --git a/metadata/md5-cache/dev-lang/ispc-9999 b/metadata/md5-cache/dev-lang/ispc-9999
index 1f191a221bde..6e76ebd71662 100644
--- a/metadata/md5-cache/dev-lang/ispc-9999
+++ b/metadata/md5-cache/dev-lang/ispc-9999
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/bison sys-devel/flex dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/bison sys-devel/flex || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=<sys-devel/clang-13:= || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) !!sys-devel/llvm:0
+DEPEND=<sys-devel/clang-13:= !!sys-devel/llvm:0
 DESCRIPTION=Intel SPMD Program Compiler
 EAPI=7
 HOMEPAGE=https://ispc.github.io/
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=<sys-devel/clang-13:=
 SLOT=0
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7d81b9d7ff9b75a630c33ea4df156955
+_md5_=489a31fb27ff11b75706e12503b901c6
diff --git a/metadata/md5-cache/dev-lang/janet-1.15.5 b/metadata/md5-cache/dev-lang/janet-1.15.5
deleted file mode 100644
index 3853d094fdc7..000000000000
--- a/metadata/md5-cache/dev-lang/janet-1.15.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst
-DESCRIPTION=A dynamic Lisp dialect and bytecode vm
-EAPI=7
-HOMEPAGE=https://janet-lang.org https://github.com/janet-lang/janet/
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/janet-lang/janet/archive/v1.15.5.tar.gz -> janet-1.15.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=89e96defbb42ba85391c880b8cf0b1f0
diff --git a/metadata/md5-cache/dev-lang/janet-1.17.2 b/metadata/md5-cache/dev-lang/janet-1.17.2
new file mode 100644
index 000000000000..3f9dab19a299
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/janet-1.17.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst
+DESCRIPTION=A dynamic Lisp dialect and bytecode vm
+EAPI=7
+HOMEPAGE=https://janet-lang.org https://github.com/janet-lang/janet/
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/janet-lang/janet/archive/v1.17.2.tar.gz -> janet-1.17.2.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=05ed7ad8482670ff151d399a3ae0bf1c
diff --git a/metadata/md5-cache/dev-lang/lazarus-2.0.12 b/metadata/md5-cache/dev-lang/lazarus-2.0.12
new file mode 100644
index 000000000000..9e59890b13ef
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/lazarus-2.0.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=dev-lang/fpc-3.2.0[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/binutils-2.19.1-r1:=
+DESCRIPTION=Lazarus IDE is a feature rich visual programming environment emulating Delphi
+EAPI=7
+HOMEPAGE=https://www.lazarus-ide.org/
+IUSE=minimal
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-lang/fpc-3.2.0[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/binutils-2.19.1-r1:=
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://sourceforge.net/projects/lazarus/files/Lazarus%20Zip%20_%20GZip/Lazarus%202.0.12/lazarus-2.0.12.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=4b4722622cd9fcc6c66338ddf8f97405
diff --git a/metadata/md5-cache/dev-lang/mono-6.12.0.122 b/metadata/md5-cache/dev-lang/mono-6.12.0.122
index 567301ec49f0..ff275f31fd54 100644
--- a/metadata/md5-cache/dev-lang/mono-6.12.0.122
+++ b/metadata/md5-cache/dev-lang/mono-6.12.0.122
@@ -10,5 +10,5 @@ LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
 RDEPEND=app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ia64? ( sys-libs/libunwind ) !minimal? ( >=dev-dotnet/libgdiplus-6.0.2 ) nls? ( sys-devel/gettext ) app-misc/ca-certificates
 SLOT=0
 SRC_URI=https://download.mono-project.com/sources/mono/mono-6.12.0.122.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=427a54f23114a7f4c7ca0efadcea0a06
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.05.0-r7 b/metadata/md5-cache/dev-lang/ocaml-4.05.0-r7
index df240fd6b01a..872fb5e486b6 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.05.0-r7
+++ b/metadata/md5-cache/dev-lang/ocaml-4.05.0-r7
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/binutils-libs:= ncurses? ( sys-libs/ncurses:0= ) spacetime? ( s
 SLOT=0/4.05
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.05.0.tar.gz -> ocaml-4.05.0.tar.gz mirror://gentoo/ocaml-patches-9.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a8f0d6c0af6af782707efd820bfb1abe
+_md5_=0e4565e1eb61e9033b56ed2c74c34e4c
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.05.0-r8 b/metadata/md5-cache/dev-lang/ocaml-4.05.0-r8
index d815e9efe446..d0a17e852945 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.05.0-r8
+++ b/metadata/md5-cache/dev-lang/ocaml-4.05.0-r8
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/binutils-libs:= ncurses? ( sys-libs/ncurses:0= ) spacetime? ( s
 SLOT=0/4.05
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.05.0.tar.gz -> ocaml-4.05.0.tar.gz mirror://gentoo/ocaml-patches-9.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ba6487c445660d7022a80eccba04e7ba
+_md5_=d8722e39ad10d297caabc9997f012713
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.09.0-r2 b/metadata/md5-cache/dev-lang/ocaml-4.09.0-r2
index 705a2db53a43..c5ca7037ef99 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.09.0-r2
+++ b/metadata/md5-cache/dev-lang/ocaml-4.09.0-r2
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/binutils-libs:= spacetime? ( sys-libs/libunwind:= )
 SLOT=0/4.09
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.09.0.tar.gz -> ocaml-4.09.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0e911e479ff7bfde2ea6f6ee9ec0b28a
+_md5_=997697da2d8dca2c925692383027262c
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.10.2-r2 b/metadata/md5-cache/dev-lang/ocaml-4.10.2-r2
index a88222cfe27e..81e4514e1e1f 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.10.2-r2
+++ b/metadata/md5-cache/dev-lang/ocaml-4.10.2-r2
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/binutils-libs:= spacetime? ( sys-libs/libunwind:= )
 SLOT=0/4.10
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.10.2.tar.gz -> ocaml-4.10.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=adbc09bcd34c746b0ec561eb37456d47
+_md5_=1dd230e1a988c5f7a35fe0a530c0a94f
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.11.2-r2 b/metadata/md5-cache/dev-lang/ocaml-4.11.2-r2
index 3ac81621ce9c..50d76b5e1d6c 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.11.2-r2
+++ b/metadata/md5-cache/dev-lang/ocaml-4.11.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Programming language supporting functional, imperative & object-orie
 EAPI=7
 HOMEPAGE=https://ocaml.org/
 IUSE=emacs flambda latex +ocamlopt spacetime xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=QPL-1.0 LGPL-2
 PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
 RDEPEND=sys-libs/binutils-libs:= spacetime? ( sys-libs/libunwind:= )
 SLOT=0/4.11
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.11.2.tar.gz -> ocaml-4.11.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=37928dedb43d505ae8db55cdc628f344
+_md5_=99f788d30a1766c1d81fa1027e7211f9
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.12.0-r2 b/metadata/md5-cache/dev-lang/ocaml-4.12.0-r2
deleted file mode 100644
index c71083be6f2b..000000000000
--- a/metadata/md5-cache/dev-lang/ocaml-4.12.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-libs/binutils-libs:= virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Programming language supporting functional, imperative & object-oriented styles
-EAPI=7
-HOMEPAGE=https://ocaml.org/
-IUSE=emacs flambda latex +ocamlopt xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=QPL-1.0 LGPL-2
-PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
-RDEPEND=sys-libs/binutils-libs:=
-SLOT=0/4.12
-SRC_URI=https://github.com/ocaml/ocaml/archive/4.12.0.tar.gz -> ocaml-4.12.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8c33ffe6321f669f63e6e403cc941715
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.12.1 b/metadata/md5-cache/dev-lang/ocaml-4.12.1
index 118ed8333539..8769fa3e48b4 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.12.1
+++ b/metadata/md5-cache/dev-lang/ocaml-4.12.1
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/binutils-libs:=
 SLOT=0/4.12
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.12.1.tar.gz -> ocaml-4.12.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8c33ffe6321f669f63e6e403cc941715
+_md5_=f90ad8a148b373ef3dd98e4d15f77ffc
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.13.0 b/metadata/md5-cache/dev-lang/ocaml-4.13.0
deleted file mode 100644
index 3353678e53a0..000000000000
--- a/metadata/md5-cache/dev-lang/ocaml-4.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-libs/binutils-libs:= virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Programming language supporting functional, imperative & object-oriented styles
-EAPI=7
-HOMEPAGE=https://ocaml.org/
-IUSE=emacs flambda latex +ocamlopt xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=QPL-1.0 LGPL-2
-PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
-RDEPEND=sys-libs/binutils-libs:=
-SLOT=0/4.13
-SRC_URI=https://github.com/ocaml/ocaml/archive/4.13.0.tar.gz -> ocaml-4.13.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8c33ffe6321f669f63e6e403cc941715
diff --git a/metadata/md5-cache/dev-lang/perl-5.32.1 b/metadata/md5-cache/dev-lang/perl-5.32.1
deleted file mode 100644
index 55d1b3cb6f9c..000000000000
--- a/metadata/md5-cache/dev-lang/perl-5.32.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DESCRIPTION=Larry Wall's Practical Extraction and Report Language
-EAPI=7
-HOMEPAGE=https://www.perl.org/
-IUSE=berkdb debug doc gdbm ithreads minimal
-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
-LICENSE=|| ( Artistic GPL-1+ )
-PDEPEND=!minimal? ( >=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-SLOT=0/5.32
-SRC_URI=mirror://cpan/src/5.0/perl-5.32.1.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.32.1.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.32.0-patches-1/perl-5.32.0-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.32.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.4/perl-cross-1.3.4.tar.gz
-_eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c4a6fee92111d8be45be6beee0929255
diff --git a/metadata/md5-cache/dev-lang/perl-5.34.0 b/metadata/md5-cache/dev-lang/perl-5.34.0
deleted file mode 100644
index 2637821bbd72..000000000000
--- a/metadata/md5-cache/dev-lang/perl-5.34.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DESCRIPTION=Larry Wall's Practical Extraction and Report Language
-EAPI=7
-HOMEPAGE=https://www.perl.org/
-IUSE=berkdb debug doc gdbm ithreads minimal
-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
-LICENSE=|| ( Artistic GPL-1+ )
-PDEPEND=!minimal? ( >=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-SLOT=0/5.34
-SRC_URI=mirror://cpan/src/5.0/perl-5.34.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.34.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.34.0-patches-1/perl-5.34.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.34.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.tar.gz
-_eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cebb4eff4ed7280aec0b6a194648d358
diff --git a/metadata/md5-cache/dev-lang/perl-5.34.0-r1 b/metadata/md5-cache/dev-lang/perl-5.34.0-r1
deleted file mode 100644
index e18a1b28367d..000000000000
--- a/metadata/md5-cache/dev-lang/perl-5.34.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-DESCRIPTION=Larry Wall's Practical Extraction and Report Language
-EAPI=7
-HOMEPAGE=https://www.perl.org/
-IUSE=berkdb debug doc gdbm ithreads minimal
-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
-LICENSE=|| ( Artistic GPL-1+ )
-PDEPEND=!minimal? ( >=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
-SLOT=0/5.34
-SRC_URI=mirror://cpan/src/5.0/perl-5.34.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.34.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.34.0-patches-1/perl-5.34.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.34.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.tar.gz
-_eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=54a76b416960a27af808702f73f31bb3
diff --git a/metadata/md5-cache/dev-lang/perl-5.34.0-r3 b/metadata/md5-cache/dev-lang/perl-5.34.0-r3
new file mode 100644
index 000000000000..55452cc618ed
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/perl-5.34.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
+DESCRIPTION=Larry Wall's Practical Extraction and Report Language
+EAPI=7
+HOMEPAGE=https://www.perl.org/
+IUSE=berkdb debug doc gdbm ithreads minimal
+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
+LICENSE=|| ( Artistic GPL-1+ )
+PDEPEND=!minimal? ( >=app-admin/perl-cleaner-2.5 >=virtual/perl-Encode-3.120.0 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
+SLOT=0/5.34
+SRC_URI=mirror://cpan/src/5.0/perl-5.34.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.34.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.34.0-patches-1/perl-5.34.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.34.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.tar.gz
+_eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=37aa23a571c6f253f199c7bddb164e61
diff --git a/metadata/md5-cache/dev-lang/python-3.10.0 b/metadata/md5-cache/dev-lang/python-3.10.0
deleted file mode 100644
index 3566c75ebe7b..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.10
-SRC_URI=https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tar.xz https://dev.gentoo.org/~sam/distfiles/dev-lang/python/python-gentoo-patches-3.10.0.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tar.xz.asc )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=054384ac5d087e51a24929bc2fa9fcaf
diff --git a/metadata/md5-cache/dev-lang/python-3.10.0_p1 b/metadata/md5-cache/dev-lang/python-3.10.0_p1
new file mode 100644
index 000000000000..5acd1adc1ce8
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.10.0_p1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/
+IUSE=bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.10
+SRC_URI=https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.10.0_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tar.xz.asc )
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=73d67a1399a53acbe5170f11248b07fd
diff --git a/metadata/md5-cache/dev-lang/python-3.7.12 b/metadata/md5-cache/dev-lang/python-3.7.12
deleted file mode 100644
index a5e325dc17a5..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.7.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.7/3.7m
-SRC_URI=https://www.python.org/ftp/python/3.7.12/Python-3.7.12.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.12.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.7.12/Python-3.7.12.tar.xz.asc )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e57698772843fc73280647520d3d9b77
diff --git a/metadata/md5-cache/dev-lang/python-3.7.12_p1 b/metadata/md5-cache/dev-lang/python-3.7.12_p1
new file mode 100644
index 000000000000..ba72987c4c75
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.7.12_p1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/
+IUSE=bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.7/3.7m
+SRC_URI=https://www.python.org/ftp/python/3.7.12/Python-3.7.12.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.7.12_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.7.12/Python-3.7.12.tar.xz.asc )
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=100b1355e65bba29440f33ece1e013ba
diff --git a/metadata/md5-cache/dev-lang/python-3.8.12_p1 b/metadata/md5-cache/dev-lang/python-3.8.12_p1
new file mode 100644
index 000000000000..0a2fec8add11
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.8.12_p1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/
+IUSE=bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.8
+SRC_URI=https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.8.12_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tar.xz.asc )
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ca34b2f0899837f5ecb66fe69ffe5495
diff --git a/metadata/md5-cache/dev-lang/python-3.9.7 b/metadata/md5-cache/dev-lang/python-3.9.7
deleted file mode 100644
index 9610997ee4e1..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.9.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.9
-SRC_URI=https://www.python.org/ftp/python/3.9.7/Python-3.9.7.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.7.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.7/Python-3.9.7.tar.xz.asc )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=acd73751f4bef4677206da93a2ff9a21
diff --git a/metadata/md5-cache/dev-lang/python-3.9.7_p1 b/metadata/md5-cache/dev-lang/python-3.9.7_p1
new file mode 100644
index 000000000000..f126de51fa26
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.9.7_p1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/
+IUSE=bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.9
+SRC_URI=https://www.python.org/ftp/python/3.9.7/Python-3.9.7.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.9.7_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.7/Python-3.9.7.tar.xz.asc )
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e850ab6d33134782da6e88c5240b6a29
diff --git a/metadata/md5-cache/dev-lang/ruby-2.7.4 b/metadata/md5-cache/dev-lang/ruby-2.7.4
index e5f575bca34d..cecfcd23d910 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.7.4
+++ b/metadata/md5-cache/dev-lang/ruby-2.7.4
@@ -5,11 +5,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/minitest-5.13.0[ruby_targets_ruby27] >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby27] >=dev-ruby/power_assert-1.1.7[ruby_targets_ruby27] >=dev-ruby/rake-13.0.1[ruby_targets_ruby27] >=dev-ruby/test-unit-3.3.4[ruby_targets_ruby27] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby27] virtual/rubygems[ruby_targets_ruby27] >=dev-ruby/bundler-2.1.4[ruby_targets_ruby27] >=dev-ruby/did_you_mean-1.3.1[ruby_targets_ruby27] >=dev-ruby/json-2.0.2[ruby_targets_ruby27] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby27] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20191222
 SLOT=2.7
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.4.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=018cfd7f502643f477a8e548f825be7f
+_md5_=3a7b260ea4b6070d4e33623c3e3458d3
diff --git a/metadata/md5-cache/dev-lang/ruby-3.0.2 b/metadata/md5-cache/dev-lang/ruby-3.0.2
index 71fdf6a47a2c..11f143f4ac65 100644
--- a/metadata/md5-cache/dev-lang/ruby-3.0.2
+++ b/metadata/md5-cache/dev-lang/ruby-3.0.2
@@ -12,4 +12,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs
 SLOT=3.0
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.2.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4558f3cefddd883337056fb69e3af6ec
+_md5_=b70ef62570d3292c0b160a7f5aa0d7c2
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.2.4-r3 b/metadata/md5-cache/dev-lang/swi-prolog-8.2.4-r3
new file mode 100644
index 000000000000..c8a7d36f432e
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.2.4-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )
+DESCRIPTION=Versatile implementation of the Prolog programming language
+EAPI=7
+HOMEPAGE=https://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test uuid X yaml
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.swi-prolog.org/download/stable/src/swipl-8.2.4.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7200690c3d6c007855f2b2fb5f7c128d
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.3.29-r1 b/metadata/md5-cache/dev-lang/swi-prolog-8.3.29-r1
new file mode 100644
index 000000000000..6eb3a5cb9f4d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.3.29-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) )
+DESCRIPTION=Versatile implementation of the Prolog programming language
+EAPI=7
+HOMEPAGE=https://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp java +libedit minimal odbc pcre qt5 readline ssl test +uuid X yaml
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= sys-libs/zlib virtual/libcrypt:= archive? ( app-arch/libarchive:= ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0= ) ssl? ( dev-libs/openssl:0= ) java? ( >=virtual/jdk-1.8:* ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.swi-prolog.org/download/devel/src/swipl-8.3.29.tar.gz https://dev.gentoo.org/~keri/distfiles/swi-prolog/swi-prolog-8.3.29-gentoo-patchset-0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4db9779c7a2e01c902ed968b0e8778eb
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index ab7abe30f66d..53bfba7b030f 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/angelscript-2.34.0 b/metadata/md5-cache/dev-libs/angelscript-2.34.0
deleted file mode 100644
index a5e528a7f8cc..000000000000
--- a/metadata/md5-cache/dev-libs/angelscript-2.34.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=A flexible, cross-platform scripting library
-EAPI=7
-HOMEPAGE=http://www.angelcode.com/angelscript/
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-SLOT=0/2.34.0
-SRC_URI=http://www.angelcode.com/angelscript/sdk/files/angelscript_2.34.0.zip
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dc91488b35fb0c7ffabd07ebb0cc166f
diff --git a/metadata/md5-cache/dev-libs/angelscript-2.35.1 b/metadata/md5-cache/dev-libs/angelscript-2.35.1
new file mode 100644
index 000000000000..4f5dffd6d83f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/angelscript-2.35.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=A flexible, cross-platform scripting library
+EAPI=8
+HOMEPAGE=http://www.angelcode.com/angelscript/
+IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=ZLIB
+SLOT=0/2.35.1
+SRC_URI=http://www.angelcode.com/angelscript/sdk/files/angelscript_2.35.1.zip
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a9c1b45691f89624637b743d3494ad41
diff --git a/metadata/md5-cache/dev-libs/appstream-0.14.4-r1 b/metadata/md5-cache/dev-libs/appstream-0.14.4-r1
deleted file mode 100644
index 8bd8b03c41cb..000000000000
--- a/metadata/md5-cache/dev-libs/appstream-0.14.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/appstream-glib dev-libs/libxslt dev-util/itstool >=sys-devel/gettext-0.19.8 doc? ( app-text/docbook-xml-dtd:4.5 ) test? ( dev-qt/linguist-tools:5 ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-db/lmdb:= >=dev-libs/glib-2.58:2 dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer:= net-misc/curl introspection? ( >=dev-libs/gobject-introspection-1.56:= ) qt5? ( dev-qt/qtcore:5 ) test? ( qt5? ( dev-qt/qttest:5 ) )
-DESCRIPTION=Cross-distro effort for providing metadata for software in the Linux ecosystem
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Distributions/AppStream/
-IUSE=apt doc +introspection qt5 test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+ GPL-2+
-RDEPEND=dev-db/lmdb:= >=dev-libs/glib-2.58:2 dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer:= net-misc/curl introspection? ( >=dev-libs/gobject-introspection-1.56:= ) qt5? ( dev-qt/qtcore:5 )
-RESTRICT=test
-SLOT=0/4
-SRC_URI=https://www.freedesktop.org/software/appstream/releases/AppStream-0.14.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=39bebc6c5b0df31e25abffa683f7d8d2
diff --git a/metadata/md5-cache/dev-libs/boehm-gc-8.0.6 b/metadata/md5-cache/dev-libs/boehm-gc-8.0.6
new file mode 100644
index 000000000000..d598a0a2c61e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/boehm-gc-8.0.6
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libatomic_ops-7.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=The Boehm-Demers-Weiser conservative garbage collector
+EAPI=7
+HOMEPAGE=https://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/
+IUSE=cxx +large static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=boehm-gc
+RDEPEND=>=dev-libs/libatomic_ops-7.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://github.com/ivmai/bdwgc/releases/download/v8.0.6/gc-8.0.6.tar.gz
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6c3ffddc57679bb60732336477c18aa0
diff --git a/metadata/md5-cache/dev-libs/crc32c-1.1.1 b/metadata/md5-cache/dev-libs/crc32c-1.1.1
index 20c5f4aa9f2e..cea01aaeb14b 100644
--- a/metadata/md5-cache/dev-libs/crc32c-1.1.1
+++ b/metadata/md5-cache/dev-libs/crc32c-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=CRC32C implementation with support for CPU-specific acceleration ins
 EAPI=7
 HOMEPAGE=https://github.com/google/crc32c
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/crc32c/archive/1.1.1.tar.gz -> crc32c-1.1.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=189dbe7af85aa5a3bb20450365ae47ec
+_md5_=701d568b4fe45c29b62e16026620cc10
diff --git a/metadata/md5-cache/dev-libs/crypto++-8.6.0 b/metadata/md5-cache/dev-libs/crypto++-8.6.0
index d3924eec7765..e671db7f2189 100644
--- a/metadata/md5-cache/dev-libs/crypto++-8.6.0
+++ b/metadata/md5-cache/dev-libs/crypto++-8.6.0
@@ -4,9 +4,9 @@ DESCRIPTION=C++ class library of cryptographic schemes
 EAPI=7
 HOMEPAGE=https://cryptopp.com
 IUSE=+asm static-libs verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Boost-1.0
 SLOT=0/8.6
 SRC_URI=https://www.cryptopp.com/cryptopp860.zip verify-sig? ( https://cryptopp.com/cryptopp860.zip.sig )
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=1e2fe0b86a635065274fb80fdf952331
+_md5_=04e5b62e365a6a5bf75f0ac0a90d9dee
diff --git a/metadata/md5-cache/dev-libs/ell-0.41 b/metadata/md5-cache/dev-libs/ell-0.41
index 5c64359975c5..25ddaff72507 100644
--- a/metadata/md5-cache/dev-libs/ell-0.41
+++ b/metadata/md5-cache/dev-libs/ell-0.41
@@ -10,5 +10,5 @@ RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.41.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1d108d002a058a70791939595c59c966
diff --git a/metadata/md5-cache/dev-libs/ell-0.44 b/metadata/md5-cache/dev-libs/ell-0.44
index c93f12cf6012..29eb08aeb396 100644
--- a/metadata/md5-cache/dev-libs/ell-0.44
+++ b/metadata/md5-cache/dev-libs/ell-0.44
@@ -4,10 +4,10 @@ DESCRIPTION=Embedded Linux Library provides core, low-level functionality for sy
 EAPI=7
 HOMEPAGE=https://01.org/ell
 IUSE=pie test kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.44.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6e97d65fae6e9f9d9c1bb91b323a8506
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=55505beba4359edf0d9a4e0f9a936940
diff --git a/metadata/md5-cache/dev-libs/ell-9999 b/metadata/md5-cache/dev-libs/ell-9999
index 3bc92efa214e..ec2eeb46d236 100644
--- a/metadata/md5-cache/dev-libs/ell-9999
+++ b/metadata/md5-cache/dev-libs/ell-9999
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=54dd8f8ea3bcac5976d6a7f9c61da17a
diff --git a/metadata/md5-cache/dev-libs/folks-0.15.2 b/metadata/md5-cache/dev-libs/folks-0.15.2
deleted file mode 100644
index a6ca9511b03f..000000000000
--- a/metadata/md5-cache/dev-libs/folks-0.15.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] ) telepathy? ( net-libs/telepathy-glib[vala] ) eds? ( gnome-extra/evolution-data-server[vala] ) test? ( sys-apps/dbus bluetooth? ( || ( ( dev-lang/python:3.9 dev-python/python-dbusmock[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/python-dbusmock[python_targets_python3_8(-)] ) ) ) ) app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8[introspection] >=dev-libs/gobject-introspection-1.54:= telepathy? ( >=net-libs/telepathy-glib-0.19.9 dev-libs/dbus-glib ) eds? ( >=gnome-extra/evolution-data-server-3.38:= ) dev-libs/libxml2:2 utils? ( sys-libs/readline:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Library for aggregating people from multiple sources
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/Folks
-IUSE=bluetooth eds +telepathy test utils
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8[introspection] >=dev-libs/gobject-introspection-1.54:= telepathy? ( >=net-libs/telepathy-glib-0.19.9 dev-libs/dbus-glib ) eds? ( >=gnome-extra/evolution-data-server-3.38:= ) dev-libs/libxml2:2 utils? ( sys-libs/readline:0= ) bluetooth? ( >=net-wireless/bluez-5[obex] ) telepathy? ( net-im/telepathy-mission-control )
-REQUIRED_USE=bluetooth? ( eds )
-RESTRICT=!test? ( test )
-SLOT=0/26
-SRC_URI=mirror://gnome/sources/folks/0.15/folks-0.15.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d2e4e9d91343fe029b226f4336efd80e
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.6 b/metadata/md5-cache/dev-libs/girara-0.3.6
new file mode 100644
index 000000000000..7e51b0fa559a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/girara-0.3.6
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-doc/doxygen ) test? ( dev-libs/check ) virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 libnotify? ( x11-libs/libnotify )
+DESCRIPTION=UI library that focuses on simplicity and minimalism
+EAPI=7
+HOMEPAGE=https://pwmt.org/projects/girara/
+IUSE=doc libnotify test test
+KEYWORDS=~amd64 ~arm ~riscv ~x86
+LICENSE=ZLIB
+RDEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 libnotify? ( x11-libs/libnotify )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://pwmt.org/projects/girara/download/girara-0.3.6.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=18506404294ba66bafddf809906f65af
diff --git a/metadata/md5-cache/dev-libs/gjs-1.70.0 b/metadata/md5-cache/dev-libs/gjs-1.70.0
new file mode 100644
index 000000000000..9607a96060cf
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/gjs-1.70.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.66.0 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= >=dev-lang/spidermonkey-78.2.0:78 cairo? ( x11-libs/cairo[X,svg] ) readline? ( sys-libs/readline:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) test? ( sys-apps/dbus >=x11-libs/gtk+-3.20:3[introspection] )
+DESCRIPTION=Javascript bindings for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
+IUSE=+cairo examples gtk readline sysprof test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
+RDEPEND=>=dev-libs/glib-2.66.0 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= >=dev-lang/spidermonkey-78.2.0:78 cairo? ( x11-libs/cairo[X,svg] ) readline? ( sys-libs/readline:0= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gjs/1.70/gjs-1.70.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c3a76870127827d58010554616695c60
diff --git a/metadata/md5-cache/dev-libs/glib-2.68.2-r1 b/metadata/md5-cache/dev-libs/glib-2.68.2-r1
index ce43fe45e561..b6111317238a 100644
--- a/metadata/md5-cache/dev-libs/glib-2.68.2-r1
+++ b/metadata/md5-cache/dev-libs/glib-2.68.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=gtk-doc? ( test )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.68/glib-2.68.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1910f2edb441e7b2f40d48027b5e5ee4
diff --git a/metadata/md5-cache/dev-libs/glib-2.68.3-r1 b/metadata/md5-cache/dev-libs/glib-2.68.3-r1
index 07cbf23a3b73..252321990252 100644
--- a/metadata/md5-cache/dev-libs/glib-2.68.3-r1
+++ b/metadata/md5-cache/dev-libs/glib-2.68.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=gtk-doc? ( test )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.68/glib-2.68.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=33bfa252e937a6877187c6906ab64672
diff --git a/metadata/md5-cache/dev-libs/glib-2.68.4 b/metadata/md5-cache/dev-libs/glib-2.68.4
index a0bd08f0c25b..9a08a07557cd 100644
--- a/metadata/md5-cache/dev-libs/glib-2.68.4
+++ b/metadata/md5-cache/dev-libs/glib-2.68.4
@@ -13,5 +13,5 @@ REQUIRED_USE=gtk-doc? ( test )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.68/glib-2.68.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ae4515cc0ec922158adfcff13d73b9c4
diff --git a/metadata/md5-cache/dev-libs/glib-2.70.0 b/metadata/md5-cache/dev-libs/glib-2.70.0
index 41ec6e636c46..6d72c0835b62 100644
--- a/metadata/md5-cache/dev-libs/glib-2.70.0
+++ b/metadata/md5-cache/dev-libs/glib-2.70.0
@@ -13,5 +13,5 @@ REQUIRED_USE=gtk-doc? ( test )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.70/glib-2.70.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8da8d6fbb206d69a351b837f022125f5
diff --git a/metadata/md5-cache/dev-libs/imath-3.0.5-r1 b/metadata/md5-cache/dev-libs/imath-3.0.5-r1
deleted file mode 100644
index 1b3400686292..000000000000
--- a/metadata/md5-cache/dev-libs/imath-3.0.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_8? ( dev-python/breathe[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/breathe[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/breathe[python_targets_python3_10(-)] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!dev-libs/imath:0 sys-libs/zlib python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] ) )
-DESCRIPTION=Imath basic math package
-EAPI=7
-HOMEPAGE=https://imath.readthedocs.io
-IUSE=doc large-stack python static-libs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=!dev-libs/imath:0 sys-libs/zlib python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=!test? ( test )
-SLOT=3/28
-SRC_URI=https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.0.5.tar.gz -> imath-3.0.5.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6aed4e1ca0d437028de82cec465e27e9
diff --git a/metadata/md5-cache/dev-libs/imath-3.1.3 b/metadata/md5-cache/dev-libs/imath-3.1.3
new file mode 100644
index 000000000000..fa6f459457da
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/imath-3.1.3
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_8? ( dev-python/breathe[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/breathe[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/breathe[python_targets_python3_10(-)] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!dev-libs/imath:0 sys-libs/zlib python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] ) )
+DESCRIPTION=Imath basic math package
+EAPI=8
+HOMEPAGE=https://imath.readthedocs.io
+IUSE=doc large-stack python static-libs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!dev-libs/imath:0 sys-libs/zlib python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=!test? ( test )
+SLOT=3/29
+SRC_URI=https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.3.tar.gz -> imath-3.1.3.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=845bdaa41024f3fdbafa6c383898426b
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-21.33.20678-r1 b/metadata/md5-cache/dev-libs/intel-compute-runtime-21.33.20678-r1
deleted file mode 100644
index 164eced8f739..000000000000
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-21.33.20678-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.8365 dev-util/intel-graphics-system-controller >=media-libs/gmmlib-21.2.1 >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.4.1 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva ) media-libs/mesa
-DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
-EAPI=7
-HOMEPAGE=https://github.com/intel/compute-runtime
-IUSE=+l0 +vaapi
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.8365 dev-util/intel-graphics-system-controller >=media-libs/gmmlib-21.2.1 >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.4.1 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
-SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/21.33.20678.tar.gz -> intel-compute-runtime-21.33.20678.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d8c36df1a02630871c76745e4f5a4cf2
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-21.40.21182 b/metadata/md5-cache/dev-libs/intel-compute-runtime-21.40.21182
new file mode 100644
index 000000000000..c8f1ec3c1c95
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-21.40.21182
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.8744 >=dev-util/intel-graphics-system-controller-0.2.4 >=media-libs/gmmlib-21.2.1 >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.5.0 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva ) media-libs/mesa
+DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
+EAPI=8
+HOMEPAGE=https://github.com/intel/compute-runtime
+IUSE=+l0 +vaapi
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.8744 >=dev-util/intel-graphics-system-controller-0.2.4 >=media-libs/gmmlib-21.2.1 >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.5.0 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
+SLOT=0
+SRC_URI=https://github.com/intel/compute-runtime/archive/21.40.21182.tar.gz -> intel-compute-runtime-21.40.21182.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e6edf6931e67e24bb4893b31ecfdd72b
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-21.41.21220 b/metadata/md5-cache/dev-libs/intel-compute-runtime-21.41.21220
new file mode 100644
index 000000000000..833044884ae9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-21.41.21220
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.8744 >=dev-util/intel-graphics-system-controller-0.2.4 >=media-libs/gmmlib-21.2.1 >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.5.0 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva ) media-libs/mesa
+DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
+EAPI=8
+HOMEPAGE=https://github.com/intel/compute-runtime
+IUSE=+l0 +vaapi
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.8744 >=dev-util/intel-graphics-system-controller-0.2.4 >=media-libs/gmmlib-21.2.1 >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.5.0 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
+SLOT=0
+SRC_URI=https://github.com/intel/compute-runtime/archive/21.41.21220.tar.gz -> intel-compute-runtime-21.41.21220.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e6edf6931e67e24bb4893b31ecfdd72b
diff --git a/metadata/md5-cache/dev-libs/isl-0.24 b/metadata/md5-cache/dev-libs/isl-0.24
index afc155dd44e8..18d43b3f4b1d 100644
--- a/metadata/md5-cache/dev-libs/isl-0.24
+++ b/metadata/md5-cache/dev-libs/isl-0.24
@@ -3,12 +3,12 @@ DEFINED_PHASES=compile configure install postinst preinst test
 DEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=A library for manipulating integer points bounded by linear constraints
 EAPI=7
-HOMEPAGE=http://isl.gforge.inria.fr/
+HOMEPAGE=http://isl.gforge.inria.fr/ https://libisl.sourceforge.io/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/23
-SRC_URI=http://isl.gforge.inria.fr/isl-0.24.tar.xz
+SRC_URI=http://isl.gforge.inria.fr/isl-0.24.tar.xz https://libisl.sourceforge.io/isl-0.24.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d488f97907831abbd0deea42961fce1d
+_md5_=6793aad74572c703248fbbfd9262c388
diff --git a/metadata/md5-cache/dev-libs/isl-0.24-r1 b/metadata/md5-cache/dev-libs/isl-0.24-r1
new file mode 100644
index 000000000000..382f92af9ca9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/isl-0.24-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=A library for manipulating integer points bounded by linear constraints
+EAPI=7
+HOMEPAGE=http://isl.gforge.inria.fr/ https://libisl.sourceforge.io/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/23
+SRC_URI=http://isl.gforge.inria.fr/isl-0.24.tar.xz https://libisl.sourceforge.io/isl-0.24.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=37a5e09ad790431218050a1b46128e7d
diff --git a/metadata/md5-cache/dev-libs/jansson-2.14 b/metadata/md5-cache/dev-libs/jansson-2.14
index b9e560561c27..17d752ec81a1 100644
--- a/metadata/md5-cache/dev-libs/jansson-2.14
+++ b/metadata/md5-cache/dev-libs/jansson-2.14
@@ -4,9 +4,9 @@ DESCRIPTION=C library for encoding, decoding and manipulating JSON data
 EAPI=8
 HOMEPAGE=https://www.digip.org/jansson/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 SLOT=0/4
 SRC_URI=https://github.com/akheron/jansson/releases/download/v2.14/jansson-2.14.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aa23d67b9d8ac90d22cf3509a939207e
+_md5_=c1bff085e983419a7c0f0c3a04ff3e17
diff --git a/metadata/md5-cache/dev-libs/level-zero-1.5.0 b/metadata/md5-cache/dev-libs/level-zero-1.5.0
index 55f58fa486fb..0db21e86d18a 100644
--- a/metadata/md5-cache/dev-libs/level-zero-1.5.0
+++ b/metadata/md5-cache/dev-libs/level-zero-1.5.0
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=oneAPI Level Zero headers, loader and validation layer
 EAPI=7
 HOMEPAGE=https://github.com/oneapi-src/level-zero
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/oneapi-src/level-zero/archive/v1.5.tar.gz -> level-zero-1.5.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=53e9888a1a94529a6e697ca7d754ad7e
+_md5_=13eea1f2424fc0fcb1499fb3b74588dc
diff --git a/metadata/md5-cache/dev-libs/libaio-0.3.112 b/metadata/md5-cache/dev-libs/libaio-0.3.112
index 32eda1a2cc76..e2dd9bdfb621 100644
--- a/metadata/md5-cache/dev-libs/libaio-0.3.112
+++ b/metadata/md5-cache/dev-libs/libaio-0.3.112
@@ -9,4 +9,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=59d4c59336c2d87b6785187456e362bc
+_md5_=c42c4007bf70e194b21fa8c16dd3fa02
diff --git a/metadata/md5-cache/dev-libs/libaio-9999 b/metadata/md5-cache/dev-libs/libaio-9999
index 046a1c9f646c..af5954ed218c 100644
--- a/metadata/md5-cache/dev-libs/libaio-9999
+++ b/metadata/md5-cache/dev-libs/libaio-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=34c801e150ac98d67713c1aec6930640
+_md5_=640e61ddacea98f841372ed4db968382
diff --git a/metadata/md5-cache/dev-libs/libcec-4.0.4-r1 b/metadata/md5-cache/dev-libs/libcec-4.0.4-r1
index 093b99ad7800..636e54275a35 100644
--- a/metadata/md5-cache/dev-libs/libcec-4.0.4-r1
+++ b/metadata/md5-cache/dev-libs/libcec-4.0.4-r1
@@ -11,5 +11,5 @@ RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-p
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.4.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fb4a35f96f43904272a615b6aef38959
diff --git a/metadata/md5-cache/dev-libs/libcec-4.0.7 b/metadata/md5-cache/dev-libs/libcec-4.0.7
index 83382e88cb88..c5d406218819 100644
--- a/metadata/md5-cache/dev-libs/libcec-4.0.7
+++ b/metadata/md5-cache/dev-libs/libcec-4.0.7
@@ -11,5 +11,5 @@ RDEPEND=udev? ( virtual/udev ) >=dev-libs/libplatform-2.0.0 tools? ( sys-libs/nc
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.7.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=320f2ba079717bbe889aef580b10917d
diff --git a/metadata/md5-cache/dev-libs/libcec-6.0.2 b/metadata/md5-cache/dev-libs/libcec-6.0.2
index f489e792c836..6ddc6d396883 100644
--- a/metadata/md5-cache/dev-libs/libcec-6.0.2
+++ b/metadata/md5-cache/dev-libs/libcec-6.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libplatform-2.0.0 python? ( python_single_target_python3_8? (
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-6.0.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0fbe0087428e0b8547693ee95ee2340f
diff --git a/metadata/md5-cache/dev-libs/libcgroup-0.41-r6 b/metadata/md5-cache/dev-libs/libcgroup-0.41-r6
index d36530a78bdb..b2a04c7ffb4d 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-0.41-r6
+++ b/metadata/md5-cache/dev-libs/libcgroup-0.41-r6
@@ -12,5 +12,5 @@ REQUIRED_USE=daemon? ( tools )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/libcg/libcgroup/v0.41/libcgroup-0.41.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=814c2008ccdf504b5d47a66dc9baf9f7
diff --git a/metadata/md5-cache/dev-libs/libcgroup-2.0 b/metadata/md5-cache/dev-libs/libcgroup-2.0
index 378d71679950..47b56fa0cff9 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-2.0
+++ b/metadata/md5-cache/dev-libs/libcgroup-2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=daemon? ( tools )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libcgroup/libcgroup/releases/download/v2.0/libcgroup-2.0.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=36694580c272b639eba8ffcb3fa9fdee
diff --git a/metadata/md5-cache/dev-libs/libdbh-5.0.19 b/metadata/md5-cache/dev-libs/libdbh-5.0.19
deleted file mode 100644
index 88cce003f82a..000000000000
--- a/metadata/md5-cache/dev-libs/libdbh-5.0.19
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-util/gtk-doc-am virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=a small library to create and manage 64-bit disk based hash tables
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/libdbh/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/dbh/dbh/5.0.19/libdbh2-5.0.19.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=680eea673053ccf0cb1400d9c4341361
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.11.0 b/metadata/md5-cache/dev-libs/libevdev-1.11.0
index 2874d7513e9f..3267d84c8e19 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.11.0
+++ b/metadata/md5-cache/dev-libs/libevdev-1.11.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install setup test
 DEPEND=test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Handler library for evdev events
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.11.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b09295db68b7d8351a2f481a1d6a2f6b
+_md5_=472db39e0cf026fc3a13621d5d25cbf2
diff --git a/metadata/md5-cache/dev-libs/libevdev-9999 b/metadata/md5-cache/dev-libs/libevdev-9999
index 6c45fd62680b..c00925ca025c 100644
--- a/metadata/md5-cache/dev-libs/libevdev-9999
+++ b/metadata/md5-cache/dev-libs/libevdev-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install setup test unpack
 DEPEND=test? ( dev-libs/check[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Handler library for evdev events
@@ -10,4 +10,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c5f45204f920859917f7a4dfb6cd369a
+_md5_=ff97f092c664c1b8586694e6b5cdbf07
diff --git a/metadata/md5-cache/dev-libs/libfido2-1.8.0 b/metadata/md5-cache/dev-libs/libfido2-1.8.0
index 92392f09344c..8ccab1972937 100644
--- a/metadata/md5-cache/dev-libs/libfido2-1.8.0
+++ b/metadata/md5-cache/dev-libs/libfido2-1.8.0
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/libcbor:= dev-libs/openssl:0= sys-libs/zlib:0= virtual/libudev:= acct-group/plugdev
 SLOT=0/1
 SRC_URI=https://github.com/Yubico/libfido2/archive/1.8.0.tar.gz -> libfido2-1.8.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=85f6ad9ab182e1c6d70fd854c0283b0a
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.34.0 b/metadata/md5-cache/dev-libs/libfilezilla-0.34.0
new file mode 100644
index 000000000000..cc40d8fef7b5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.34.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install pretend
+DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= virtual/libcrypt:= test? ( dev-util/cppunit )
+DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
+EAPI=7
+HOMEPAGE=https://lib.filezilla-project.org/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= virtual/libcrypt:=
+RESTRICT=!test? ( test )
+SLOT=0/21
+SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.34.0.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8c1edc0f0f654eda1c2f0fcff441d173
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.8.8 b/metadata/md5-cache/dev-libs/libgcrypt-1.8.8
index 81330122c280..d337ed1c065a 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.8.8
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.8.8
@@ -5,10 +5,10 @@ DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=7
 HOMEPAGE=https://www.gnupg.org/
 IUSE=doc o-flag-munging static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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
 LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.8.8.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dbfe15a5295dcdea841e768f2351b66c
+_md5_=5e82269317538e022315b459b5a6aea8
diff --git a/metadata/md5-cache/dev-libs/libgudev-237-r1 b/metadata/md5-cache/dev-libs/libgudev-237-r1
index 88685a614b59..900abfc15fef 100644
--- a/metadata/md5-cache/dev-libs/libgudev-237-r1
+++ b/metadata/md5-cache/dev-libs/libgudev-237-r1
@@ -5,11 +5,11 @@ DESCRIPTION=GObject bindings for libudev
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
 IUSE=introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://download.gnome.org/sources/libgudev/237/libgudev-237.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b97fdb9dabc519563f3e1d8c943f59aa
+_md5_=567aef604c4d5693dcaeb5503756b77d
diff --git a/metadata/md5-cache/dev-libs/libinput-1.19.1 b/metadata/md5-cache/dev-libs/libinput-1.19.1
index 878d9f858314..d3dcfc329f17 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.19.1
+++ b/metadata/md5-cache/dev-libs/libinput-1.19.1
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.9 dev-python/commonmark[python_targets_python3_9(-)] dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/commonmark[python_targets_python3_8(-)] dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_8(-)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev test? ( >=dev-libs/check-0.9.10 )
+DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) >=dev-libs/libevdev-1.9.902 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev test? ( >=dev-libs/check-0.9.10 )
 DESCRIPTION=Library to handle input devices in Wayland
 EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
 IUSE=doc input_devices_wacom test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
+RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) >=dev-libs/libevdev-1.9.902 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.19.1.tar.xz
 _eclasses_=meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=08418e000c7abb246a01cdbfefd3413e
+_md5_=29d052b632b1445c6a53bb839dbece9b
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3 b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3
deleted file mode 100644
index cbf58ab978c2..000000000000
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=a C client library to the memcached server
-EAPI=5
-HOMEPAGE=https://libmemcached.org/libMemcached.html
-IUSE=debug hsieh +libevent sasl static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-RDEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a332b156e9d3451415fee57527a5cd1e
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r4 b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r4
index 0a1b83034061..f4123b3ddc4b 100644
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r4
+++ b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r4
@@ -5,11 +5,11 @@ DESCRIPTION=a C client library to the memcached server
 EAPI=8
 HOMEPAGE=https://libmemcached.org/libMemcached.html
 IUSE=debug hsieh +libevent sasl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3ecafa6ed03aafe428229103d59689df
+_md5_=55c28c481faa4d0184baa7bb2109b2d5
diff --git a/metadata/md5-cache/dev-libs/libmpack-1.0.5 b/metadata/md5-cache/dev-libs/libmpack-1.0.5
index 60c9e2d7dfdd..2e1e0e5faae1 100644
--- a/metadata/md5-cache/dev-libs/libmpack-1.0.5
+++ b/metadata/md5-cache/dev-libs/libmpack-1.0.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare test
 DESCRIPTION=Simple implementation of msgpack in C
 EAPI=7
 HOMEPAGE=https://github.com/libmpack/libmpack
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/libmpack/libmpack/archive/1.0.5.tar.gz -> libmpack-1.0.5.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4c2136e2ffb2c6ac31f8d776f1ede3d7
+_md5_=4d62a22d6ba91f3a4dacaf2f765adba9
diff --git a/metadata/md5-cache/dev-libs/libnfc-1.7.2 b/metadata/md5-cache/dev-libs/libnfc-1.7.2
deleted file mode 100644
index cd290f282269..000000000000
--- a/metadata/md5-cache/dev-libs/libnfc-1.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install
-DEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 )
-DESCRIPTION=Near Field Communications (NFC) library
-EAPI=7
-HOMEPAGE=http://www.libnfc.org/
-IUSE=doc pcsc-lite readline static-libs usb
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-3
-RDEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 )
-SLOT=0
-SRC_URI=https://github.com/nfc-tools/libnfc/releases/download/libnfc-1.7.2/libnfc-1.7.2.tar.bz2
-_md5_=a282821e98d5dca38f841456bf3bbc14
diff --git a/metadata/md5-cache/dev-libs/libnfc-1.8.0 b/metadata/md5-cache/dev-libs/libnfc-1.8.0
deleted file mode 100644
index 845d6c637b81..000000000000
--- a/metadata/md5-cache/dev-libs/libnfc-1.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install
-DEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 )
-DESCRIPTION=Near Field Communications (NFC) library
-EAPI=7
-HOMEPAGE=http://www.libnfc.org/
-IUSE=doc pcsc-lite readline static-libs usb
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-3
-RDEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:0 ) usb? ( virtual/libusb:0 )
-SLOT=0
-SRC_URI=https://github.com/nfc-tools/libnfc/releases/download/libnfc-1.8.0/libnfc-1.8.0.tar.bz2
-_md5_=a282821e98d5dca38f841456bf3bbc14
diff --git a/metadata/md5-cache/dev-libs/libnfc-1.8.0-r1 b/metadata/md5-cache/dev-libs/libnfc-1.8.0-r1
new file mode 100644
index 000000000000..e373db2531e6
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libnfc-1.8.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install
+DEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:0 )
+DESCRIPTION=Near Field Communications (NFC) library
+EAPI=8
+HOMEPAGE=http://www.libnfc.org/
+IUSE=doc pcsc-lite readline usb
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-3
+RDEPEND=pcsc-lite? ( sys-apps/pcsc-lite ) readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:0 )
+SLOT=0
+SRC_URI=https://github.com/nfc-tools/libnfc/releases/download/libnfc-1.8.0/libnfc-1.8.0.tar.bz2
+_md5_=8a55d270caae7a7d746aaa1d7a356689
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.30.0 b/metadata/md5-cache/dev-libs/libpeas-1.30.0
index 1caf5eac77f5..774b32decb38 100644
--- a/metadata/md5-cache/dev-libs/libpeas-1.30.0
+++ b/metadata/md5-cache/dev-libs/libpeas-1.30.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.11 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] ) glade? ( >=dev-util/glade-3.9.1:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_luajit? ( >=dev-lua/lgi-0.9.0[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( >=dev-lua/lgi-0.9.0[lua_targets_lua5-1(-)] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.2:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.2:3[python_targets_python3_9(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] ) glade? ( >=dev-util/glade-3.9.1:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_luajit? ( >=dev-lua/lgi-0.9.0[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( >=dev-lua/lgi-0.9.0[lua_targets_lua5-1(-)] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.2:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.2:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.2:3[python_targets_python3_10(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A GObject plugins library
 EAPI=7
 HOMEPAGE=https://developer.gnome.org/libpeas/stable/
-IUSE=glade +gtk gtk-doc lua +python vala lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=glade +gtk gtk-doc lua +python vala lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] ) glade? ( >=dev-util/glade-3.9.1:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_luajit? ( >=dev-lua/lgi-0.9.0[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( >=dev-lua/lgi-0.9.0[lua_targets_lua5-1(-)] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.2:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.2:3[python_targets_python3_9(-)] ) )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] ) glade? ( >=dev-util/glade-3.9.1:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_luajit? ( >=dev-lua/lgi-0.9.0[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( >=dev-lua/lgi-0.9.0[lua_targets_lua5-1(-)] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.2:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.2:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.2:3[python_targets_python3_10(-)] ) )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libpeas/1.30/libpeas-1.30.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=84fcc6f9589c332e8d11d01f705ea553
+_md5_=8ff18d326425f0677598143503f3ceeb
diff --git a/metadata/md5-cache/dev-libs/libretls-3.4.1 b/metadata/md5-cache/dev-libs/libretls-3.4.1
new file mode 100644
index 000000000000..bbdc227e616a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libretls-3.4.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/openssl:=
+DESCRIPTION=Port of libtls from LibreSSL to OpenSSL
+EAPI=8
+HOMEPAGE=https://git.causal.agency/libretls/about/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=ISC
+RDEPEND=dev-libs/openssl:=
+SLOT=0/22
+SRC_URI=https://causal.agency/libretls/libretls-3.4.1.tar.gz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c8031308a029dba0118b5b9ee295db5b
diff --git a/metadata/md5-cache/dev-libs/libtermkey-0.22 b/metadata/md5-cache/dev-libs/libtermkey-0.22
index 32949c8264d6..3a57450ae04a 100644
--- a/metadata/md5-cache/dev-libs/libtermkey-0.22
+++ b/metadata/md5-cache/dev-libs/libtermkey-0.22
@@ -4,10 +4,10 @@ DESCRIPTION=Library for easy processing of keyboard entry from terminal-based pr
 EAPI=6
 HOMEPAGE=http://www.leonerd.org.uk/code/libtermkey/
 IUSE=demos static-libs
-KEYWORDS=amd64 arm ~arm64 x86 ~x64-macos
+KEYWORDS=amd64 arm ~arm64 ~riscv x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-libs/unibilium:=
 SLOT=0
 SRC_URI=http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f9124c6816b33fdc9b766ec243864d39
+_md5_=54171f714b6dcb95abc962ef93fc2129
diff --git a/metadata/md5-cache/dev-libs/libthreadar-1.3.3 b/metadata/md5-cache/dev-libs/libthreadar-1.3.3
new file mode 100644
index 000000000000..791b6159c0c0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libthreadar-1.3.3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Threading library used by dar archiver
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/libthreadar/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=LGPL-3
+SLOT=0
+SRC_URI=mirror://sourceforge/libthreadar/libthreadar-1.3.3.tar.gz
+_md5_=76c2450a767946a7ab7fd5e5f9152c89
diff --git a/metadata/md5-cache/dev-libs/libuev-2.3.2-r1 b/metadata/md5-cache/dev-libs/libuev-2.3.2-r1
new file mode 100644
index 000000000000..cc9d533f99de
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libuev-2.3.2-r1
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Lightweight event loop library for Linux epoll() family APIs
+EAPI=7
+HOMEPAGE=https://github.com/troglobit/libuev
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/troglobit/libuev/releases/download/v2.3.2/libuev-2.3.2.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d4a65df70512ce61f425fb8790ef455f
diff --git a/metadata/md5-cache/dev-libs/libugpio-0.0.7 b/metadata/md5-cache/dev-libs/libugpio-0.0.7
index f62bccd2a1e3..59827bf6a543 100644
--- a/metadata/md5-cache/dev-libs/libugpio-0.0.7
+++ b/metadata/md5-cache/dev-libs/libugpio-0.0.7
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-3+ LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/mhei/libugpio/releases/download/v0.0.7/libugpio-0.0.7.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d66d723ee954b5a39192fa8cd7541898
diff --git a/metadata/md5-cache/dev-libs/libuv-1.41.1 b/metadata/md5-cache/dev-libs/libuv-1.41.1
deleted file mode 100644
index 7e46d76c2374..000000000000
--- a/metadata/md5-cache/dev-libs/libuv-1.41.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=sys-devel/libtool virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Cross-platform asychronous I/O
-EAPI=7
-HOMEPAGE=https://github.com/libuv/libuv
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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
-LICENSE=BSD BSD-2 ISC MIT
-SLOT=0/1
-SRC_URI=https://github.com/libuv/libuv/archive/v1.41.1.tar.gz -> libuv-1.41.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4e4263aba3fadba484c8023d00edb142
diff --git a/metadata/md5-cache/dev-libs/libuv-1.42.0 b/metadata/md5-cache/dev-libs/libuv-1.42.0
index 9ff86a7ab693..8887a9197e94 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.42.0
+++ b/metadata/md5-cache/dev-libs/libuv-1.42.0
@@ -4,9 +4,9 @@ DESCRIPTION=Cross-platform asychronous I/O
 EAPI=7
 HOMEPAGE=https://github.com/libuv/libuv
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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
 LICENSE=BSD BSD-2 ISC MIT
 SLOT=0/1
 SRC_URI=https://github.com/libuv/libuv/archive/v1.42.0.tar.gz -> libuv-1.42.0.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=46cda5f9a370bc27f20969be967ac815
+_md5_=4e4263aba3fadba484c8023d00edb142
diff --git a/metadata/md5-cache/dev-libs/libvterm-0.1.3 b/metadata/md5-cache/dev-libs/libvterm-0.1.3
index be1d5ef1aab5..5af55cc794c6 100644
--- a/metadata/md5-cache/dev-libs/libvterm-0.1.3
+++ b/metadata/md5-cache/dev-libs/libvterm-0.1.3
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator
 EAPI=7
 HOMEPAGE=http://www.leonerd.org.uk/code/libvterm/
-KEYWORDS=amd64 ~arm ~arm64 x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=!dev-libs/libvterm-neovim
 SLOT=0
 SRC_URI=http://www.leonerd.org.uk/code/libvterm/libvterm-0.1.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e81c080e186616a352875c54824fc2a1
+_md5_=1aacedc9174ce15b88f375e526349c93
diff --git a/metadata/md5-cache/dev-libs/libx86-1.1-r4 b/metadata/md5-cache/dev-libs/libx86-1.1-r4
index 134b945efd87..a3ceceeec907 100644
--- a/metadata/md5-cache/dev-libs/libx86-1.1-r4
+++ b/metadata/md5-cache/dev-libs/libx86-1.1-r4
@@ -3,9 +3,9 @@ DESCRIPTION=A hardware-independent library for executing real-mode x86 code
 EAPI=6
 HOMEPAGE=https://www.codon.org.uk/~mjg59/libx86/
 IUSE=static-libs
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm -ppc -riscv -sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6bcb8fcea0adab3c77e54eb11c8dee7f
+_md5_=3d1538bfacbec4286c7169c14fbfcbd9
diff --git a/metadata/md5-cache/dev-libs/libzia-4.32 b/metadata/md5-cache/dev-libs/libzia-4.32
new file mode 100644
index 000000000000..e808a0c7ddee
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libzia-4.32
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
+DESCRIPTION=Platform abstraction code for tucnak package
+EAPI=8
+HOMEPAGE=http://tucnak.nagano.cz
+IUSE=ftdi
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:1 )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/libzia-4.32.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=20c3500e7c81efe942c6b23f11968744
diff --git a/metadata/md5-cache/dev-libs/mpfr-4.1.0 b/metadata/md5-cache/dev-libs/mpfr-4.1.0
deleted file mode 100644
index 1c950662d686..000000000000
--- a/metadata/md5-cache/dev-libs/mpfr-4.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/gmp-5.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
-DESCRIPTION=library for multiple-precision floating-point computations with exact rounding
-EAPI=7
-HOMEPAGE=https://www.mpfr.org/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/gmp-5.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
-SLOT=0/6
-SRC_URI=https://www.mpfr.org/mpfr-4.1.0/mpfr-4.1.0.tar.xz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d3d5aaceea7966d0203fa163f34b538d
diff --git a/metadata/md5-cache/dev-libs/mpfr-4.1.0-r1 b/metadata/md5-cache/dev-libs/mpfr-4.1.0-r1
new file mode 100644
index 000000000000..c1ac85d16c50
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mpfr-4.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/gmp-5.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
+DESCRIPTION=Library for multiple-precision floating-point computations with exact rounding
+EAPI=7
+HOMEPAGE=https://www.mpfr.org/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+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
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/gmp-5.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
+SLOT=0/6
+SRC_URI=https://www.mpfr.org/mpfr-4.1.0/mpfr-4.1.0.tar.xz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c2891548cf6da6c04669b3aa0d70e222
diff --git a/metadata/md5-cache/dev-libs/nss-3.71 b/metadata/md5-cache/dev-libs/nss-3.71
new file mode 100644
index 000000000000..b5c269cabd6d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nss-3.71
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/nspr-4.32[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
+DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
+EAPI=8
+HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
+IUSE=cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+RDEPEND=>=dev-libs/nspr-4.32[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
+RESTRICT=test
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_71_RTM/src/nss-3.71.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=699d5fd22ba5a922b40b4ca0897e4130
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1-r1 b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1-r1
deleted file mode 100644
index 8b731c908a2f..000000000000
--- a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~sys-devel/clang-10.0.1:10=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/spirv-llvm-translator:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=OpenCL-oriented thin wrapper library around clang
-EAPI=7
-HOMEPAGE=https://github.com/intel/opencl-clang
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64
-LICENSE=UoI-NCSA
-RDEPEND=~sys-devel/clang-10.0.1:10=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/spirv-llvm-translator:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=10
-SRC_URI=https://github.com/intel/opencl-clang/archive/v10.0.0-1.tar.gz -> opencl-clang-10.0.0.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=889574872c884c7f5fd28ff9a25edff7
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2-r1 b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2-r1
deleted file mode 100644
index 1e124686b54c..000000000000
--- a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~sys-devel/clang-10.0.1:10=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/spirv-llvm-translator-10.0.0_p20200909:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=OpenCL-oriented thin wrapper library around clang
-EAPI=7
-HOMEPAGE=https://github.com/intel/opencl-clang
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=UoI-NCSA
-RDEPEND=~sys-devel/clang-10.0.1:10=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/spirv-llvm-translator-10.0.0_p20200909:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=10
-SRC_URI=https://github.com/intel/opencl-clang/archive/v10.0.0-2.tar.gz -> opencl-clang-10.0.0.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0c04a100a7c06f0e6a9be219aac58951
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.0 b/metadata/md5-cache/dev-libs/openssl-3.0.0
index 99a56367f57e..61f7fd676b5b 100644
--- a/metadata/md5-cache/dev-libs/openssl-3.0.0
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.0
@@ -12,5 +12,5 @@ RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[s
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://openssl/source/openssl-3.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c081ba8c287ed384900deff3f7951beb
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.0_beta2 b/metadata/md5-cache/dev-libs/openssl-3.0.0_beta2
index 5fa4b16146ac..b5e2445743e5 100644
--- a/metadata/md5-cache/dev-libs/openssl-3.0.0_beta2
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.0_beta2
@@ -11,5 +11,5 @@ RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[s
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://openssl/source/openssl-3.0.0-beta2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=03490e00cffc2dfcadad8474029315dd
diff --git a/metadata/md5-cache/dev-libs/pocl-1.8 b/metadata/md5-cache/dev-libs/pocl-1.8
new file mode 100644
index 000000000000..2c7c32f08191
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pocl-1.8
@@ -0,0 +1,15 @@
+BDEPEND=!cuda? ( <sys-devel/clang-14:= ) cuda? ( <sys-devel/clang-14:=[llvm_targets_NVPTX] ) virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.10 <dev-python/markupsafe-2.0[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 <dev-python/markupsafe-2.0[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 <dev-python/markupsafe-2.0[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 <dev-python/markupsafe-2.0[python_targets_pypy3(-)] ) ) ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libltdl <sys-devel/llvm-14:* virtual/opencl !cuda? ( <sys-devel/clang-14:= ) cuda? ( <sys-devel/clang-14:=[llvm_targets_NVPTX] ) debug? ( dev-util/lttng-ust ) hwloc? ( sys-apps/hwloc[cuda?] ) !!sys-devel/llvm:0
+DESCRIPTION=Portable Computing Language (an implementation of OpenCL)
+EAPI=7
+HOMEPAGE=http://portablecl.org https://github.com/pocl/pocl
+IUSE=accel cl20 +conformance cuda debug examples float-conversion hardening +hwloc memmanager test doc
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/libltdl <sys-devel/llvm-14:* virtual/opencl !cuda? ( <sys-devel/clang-14:= ) cuda? ( <sys-devel/clang-14:=[llvm_targets_NVPTX] ) debug? ( dev-util/lttng-ust ) hwloc? ( sys-apps/hwloc[cuda?] )
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://github.com/pocl/pocl/archive/v1.8.tar.gz -> pocl-1.8.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6f4c69c0752b8ff92a12723a81103aa0
diff --git a/metadata/md5-cache/dev-libs/poco-1.10.1 b/metadata/md5-cache/dev-libs/poco-1.10.1
index 3c766ae3cd81..7a6804842508 100644
--- a/metadata/md5-cache/dev-libs/poco-1.10.1
+++ b/metadata/md5-cache/dev-libs/poco-1.10.1
@@ -5,7 +5,7 @@ DESCRIPTION=C++ libraries for building network-based applications
 EAPI=7
 HOMEPAGE=https://pocoproject.org/
 IUSE=7z cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 arm x86
 LICENSE=Boost-1.0
 RDEPEND=>=dev-libs/libpcre-8.42 mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= ) mariadb? ( dev-db/mariadb-connector-c:0= ) ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) xml? ( dev-libs/expat ) zip? ( sys-libs/zlib )
 REQUIRED_USE=7z? ( xml ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) mongodb? ( data ) mysql? ( data ) odbc? ( data ) pagecompiler? ( json net util xml ) pocodoc? ( cppparser util xml ) sqlite? ( data ) ssl? ( util ) test? ( data? ( sqlite ) json util xml )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.10.1-release.tar.gz -> poco-1.10.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b458bc86d22b6463aebd9ca773f6aa25
+_md5_=9945d30437f2e30ba89102633a2cec66
diff --git a/metadata/md5-cache/dev-libs/qqwing-1.3.3 b/metadata/md5-cache/dev-libs/qqwing-1.3.3
deleted file mode 100644
index 1f089c3c03e0..000000000000
--- a/metadata/md5-cache/dev-libs/qqwing-1.3.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Sudoku puzzle generator and solver
-EAPI=5
-HOMEPAGE=https://qqwing.com
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=https://github.com/stephenostermiller/qqwing/archive/v1.3.3.tar.gz -> qqwing-1.3.3.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=900b503abbc2dc1b823710d698c12588
diff --git a/metadata/md5-cache/dev-libs/qqwing-1.3.4 b/metadata/md5-cache/dev-libs/qqwing-1.3.4
index 54d64bbdd725..a325006c06e2 100644
--- a/metadata/md5-cache/dev-libs/qqwing-1.3.4
+++ b/metadata/md5-cache/dev-libs/qqwing-1.3.4
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Sudoku puzzle generator and solver
-EAPI=5
+EAPI=8
 HOMEPAGE=https://qqwing.com
 KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=GPL-2+
 SLOT=0/2
 SRC_URI=https://qqwing.com/qqwing-1.3.4.tar.gz
-_md5_=d1cb9df87f925c547e36606e92f5c2b3
+_md5_=8e90981b0ee14fbd082728d93cc6644c
diff --git a/metadata/md5-cache/dev-libs/qtkeychain-0.12.0 b/metadata/md5-cache/dev-libs/qtkeychain-0.12.0
index cf7c5e5e72b5..1b78d61cee2b 100644
--- a/metadata/md5-cache/dev-libs/qtkeychain-0.12.0
+++ b/metadata/md5-cache/dev-libs/qtkeychain-0.12.0
@@ -5,10 +5,10 @@ DESCRIPTION=Qt API for storing passwords securely
 EAPI=8
 HOMEPAGE=https://github.com/frankosterfeld/qtkeychain
 IUSE=gnome-keyring
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 )
 SLOT=0/1
 SRC_URI=https://github.com/frankosterfeld/qtkeychain/archive/v0.12.0.tar.gz -> qtkeychain-0.12.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=318845e64ee0063d8e1163b836d14ee3
+_md5_=1553310cc7541bbbbfd06eaccfea2962
diff --git a/metadata/md5-cache/dev-libs/quazip-1.1-r1 b/metadata/md5-cache/dev-libs/quazip-1.1-r1
index 2ff62e862c69..c66c28645843 100644
--- a/metadata/md5-cache/dev-libs/quazip-1.1-r1
+++ b/metadata/md5-cache/dev-libs/quazip-1.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package
 EAPI=7
 HOMEPAGE=https://stachenov.github.io/quazip/
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-qt/qtcore:5 sys-libs/zlib[minizip] !=dev-libs/quazip-1.1-r0:1
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/stachenov/quazip/archive/v1.1.tar.gz -> quazip-1.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=82cf792d4900f37e676ec451c687ce25
+_md5_=3c825cd507b73f7177123e689633a3b3
diff --git a/metadata/md5-cache/dev-libs/rccl-4.3.0 b/metadata/md5-cache/dev-libs/rccl-4.3.0
new file mode 100644
index 000000000000..a38fe88da0ea
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rccl-4.3.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-util/hip-4.3* dev-util/rocm-cmake
+DESCRIPTION=ROCm Communication Collectives Library (RCCL)
+EAPI=7
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rccl
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND==dev-util/hip-4.3*
+SLOT=0
+SRC_URI=https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-4.3.0.tar.gz -> rccl-4.3.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=542c87de2934aefa121256ed27b80f1a
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.0.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.0.0
index 913caff1c750..f4f86de5c601 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.0.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.0.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/4.0
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-4.0.0.tar.gz -> roct-thunk-interface-4.0.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0820c596b5b21ead35d3f465ab7a6b6e
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.1.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.1.0
index dcef7ea97547..e7dcbcfa7992 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.1.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.1.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/4.1
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-4.1.0.tar.gz -> roct-thunk-interface-4.1.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=23a5754c6c89e3f511a2a72e38f6d62e
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.2.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.2.0
index beccef444847..4ded4d4de5b5 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.2.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.2.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/4.2
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-4.2.0.tar.gz -> roct-thunk-interface-4.2.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=23a5754c6c89e3f511a2a72e38f6d62e
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.3.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.3.0
index e295cc77982f..0cb8ce055507 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-4.3.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-4.3.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/4.3
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-4.3.0.tar.gz -> roct-thunk-interface-4.3.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0820c596b5b21ead35d3f465ab7a6b6e
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-9999 b/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
index f45120cb3b99..fc6d95aaa372 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=sys-process/numactl
 SLOT=0/9999
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d47d1f6f96f6141da33282b380807e84
diff --git a/metadata/md5-cache/dev-libs/unibilium-2.1.1 b/metadata/md5-cache/dev-libs/unibilium-2.1.1
index 551d213cde0d..85e8ce4153dd 100644
--- a/metadata/md5-cache/dev-libs/unibilium-2.1.1
+++ b/metadata/md5-cache/dev-libs/unibilium-2.1.1
@@ -4,9 +4,9 @@ DESCRIPTION=A very basic terminfo library
 EAPI=7
 HOMEPAGE=https://github.com/neovim/unibilium/
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
 LICENSE=LGPL-3+ MIT
 SLOT=0/4
 SRC_URI=https://github.com/neovim/unibilium/archive/v2.1.1.tar.gz -> unibilium-2.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c16533da43f1c28cd3eba343e30a571c
+_md5_=a1bbbaf4cb7deb0fa995b8506f73add7
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.9.5 b/metadata/md5-cache/dev-libs/uriparser-0.9.5
index 53e92c633b6d..3607db3c52fb 100644
--- a/metadata/md5-cache/dev-libs/uriparser-0.9.5
+++ b/metadata/md5-cache/dev-libs/uriparser-0.9.5
@@ -5,11 +5,11 @@ DESCRIPTION=Strictly RFC 3986 compliant URI parsing library in C
 EAPI=7
 HOMEPAGE=https://uriparser.github.io/
 IUSE=+doc qt5 test unicode
-KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=BSD
 REQUIRED_USE=qt5? ( doc ) test? ( unicode )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.5/uriparser-0.9.5.tar.bz2
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=812bd065cdeca42546aa51b69f5f52e8
+_md5_=b9366f9bb9ae63eac7a234ec87752411
diff --git a/metadata/md5-cache/dev-libs/uthash-2.3.0 b/metadata/md5-cache/dev-libs/uthash-2.3.0
index 52b2c169cc3f..3b717915afeb 100644
--- a/metadata/md5-cache/dev-libs/uthash-2.3.0
+++ b/metadata/md5-cache/dev-libs/uthash-2.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=An easy-to-use hash implementation for C programmers
 EAPI=7
 HOMEPAGE=https://troydhanson.github.io/uthash/index.html
 IUSE=test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD-1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/troydhanson/uthash/archive/v2.3.0.tar.gz -> uthash-2.3.0.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a08d1ac4f62f873ca15335b769d047a9
+_md5_=33ebb158b517ca39f490e12f32363e6f
diff --git a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102 b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
deleted file mode 100644
index ab5bca703021..000000000000
--- a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare test
-DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 )
-DESCRIPTION=Bit Operations Library for the Lua Programming Language
-EAPI=7
-HOMEPAGE=http://bitop.luajit.org
-IUSE=lua_targets_luajit lua_targets_lua5-1
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 )
-REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 )
-SLOT=0
-SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua	f41923d10bccf946e7ce65f103ab577d	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=97e947f931430e22803b286dd9680abb
diff --git a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r103 b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r103
index 4be2882bc668..99d4af968812 100644
--- a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r103
+++ b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r103
@@ -5,11 +5,11 @@ DESCRIPTION=Bit Operations Library for the Lua Programming Language
 EAPI=7
 HOMEPAGE=http://bitop.luajit.org
 IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
 SLOT=0
 SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua	f41923d10bccf946e7ce65f103ab577d	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cb528d50294beb28b2fe8540a5f97f5c
+_md5_=422e383fe241b3898fbe8fdc915739d2
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index cf4a1d75f314..f196b754001a 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101 b/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
index dddb3c0dc324..a7c36b1573fe 100644
--- a/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
+++ b/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
@@ -5,7 +5,7 @@ DESCRIPTION=Parsing Expression Grammars for Lua
 EAPI=7
 HOMEPAGE=http://www.inf.puc-rio.br/~roberto/lpeg/
 IUSE=test debug doc lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua	f41923d10bccf946e7ce65f103ab577d	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=55d29cbafb283681e2b070e6f33de307
+_md5_=52ab049d50f5dc03db491ee88b60adc8
diff --git a/metadata/md5-cache/dev-lua/luasec-1.0.2-r1 b/metadata/md5-cache/dev-lua/luasec-1.0.2-r1
new file mode 100644
index 000000000000..a21b9eb9e42b
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luasec-1.0.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=>=dev-lua/luasocket-3.0_rc1_p20200328-r103[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-libs/openssl:0= lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+DESCRIPTION=Lua binding for OpenSSL library to provide TLS/SSL communication
+EAPI=8
+HOMEPAGE=https://github.com/brunoos/luasec
+IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lua/luasocket-3.0_rc1_p20200328-r103[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-libs/openssl:0= lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+SLOT=0
+SRC_URI=https://github.com/brunoos/luasec/archive/v1.0.2.tar.gz -> luasec-1.0.2.tar.gz
+_eclasses_=lua	f41923d10bccf946e7ce65f103ab577d	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=75f65035fb0ec865e58f110f8e239947
diff --git a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r103 b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r103
new file mode 100644
index 000000000000..8879ee7450aa
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r103
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+DESCRIPTION=Networking support library for the Lua language
+EAPI=8
+HOMEPAGE=http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/ https://github.com/diegonehab/luasocket
+IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/diegonehab/luasocket/archive/5b18e475f38fcf28429b1cc4b17baee3b9793a62.tar.gz -> luasocket-3.0_rc1_p20200328.tar.gz
+_eclasses_=lua	f41923d10bccf946e7ce65f103ab577d	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f6cf07286b025a9bbb324488013f7010
diff --git a/metadata/md5-cache/dev-lua/luv-1.36.0.0 b/metadata/md5-cache/dev-lua/luv-1.36.0.0
index 7a44fb595028..b2101d589da2 100644
--- a/metadata/md5-cache/dev-lua/luv-1.36.0.0
+++ b/metadata/md5-cache/dev-lua/luv-1.36.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=Bare libuv bindings for lua
 EAPI=7
 HOMEPAGE=https://github.com/luvit/luv
 IUSE=test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=amd64 ~arm ~arm64 x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~x64-macos
 LICENSE=Apache-2.0 MIT
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/libuv-1.32.0:=
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luvit/luv/archive/1.36.0-0.tar.gz -> luv-1.36.0.0.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> luv-lua-compat-0.10.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c7889959a3a78e26884fd663fa9b2ea0
+_md5_=0ad9c103a01a0110890e877368976542
diff --git a/metadata/md5-cache/dev-lua/mpack-1.0.8-r100 b/metadata/md5-cache/dev-lua/mpack-1.0.8-r100
index b4e0cacead92..2b42289b774c 100644
--- a/metadata/md5-cache/dev-lua/mpack-1.0.8-r100
+++ b/metadata/md5-cache/dev-lua/mpack-1.0.8-r100
@@ -5,7 +5,7 @@ DESCRIPTION=Lua bindings for libmpack
 EAPI=7
 HOMEPAGE=https://github.com/libmpack/libmpack-lua/
 IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-libs/libmpack lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libmpack/libmpack-lua/archive/1.0.8.tar.gz -> mpack-1.0.8.tar.gz
 _eclasses_=lua	f41923d10bccf946e7ce65f103ab577d	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3ec67c99933097d6c13cec1942da5e50
+_md5_=a11bc3f3259ea34ff3fb1e837b59036d
diff --git a/metadata/md5-cache/dev-lua/penlight-1.11.0 b/metadata/md5-cache/dev-lua/penlight-1.11.0
index 2ec7fe03de4e..8280c9ef1a86 100644
--- a/metadata/md5-cache/dev-lua/penlight-1.11.0
+++ b/metadata/md5-cache/dev-lua/penlight-1.11.0
@@ -5,7 +5,7 @@ DESCRIPTION=Lua utility libraries loosely based on the Python standard libraries
 EAPI=7
 HOMEPAGE=https://github.com/Tieske/Penlight
 IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-lua/luafilesystem[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Tieske/Penlight/archive/1.11.0.tar.gz -> penlight-1.11.0.tar.gz
 _eclasses_=lua	f41923d10bccf946e7ce65f103ab577d	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=32ef8d71f9ee658ff6724f4ae6dca362
+_md5_=09e0343688961088c1d2e56a0b0bc8bc
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 200e4c03bed4..6ff781af345e 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/alcotest-1.4.0 b/metadata/md5-cache/dev-ml/alcotest-1.4.0
index dc90b9803d50..39dd63980d07 100644
--- a/metadata/md5-cache/dev-ml/alcotest-1.4.0
+++ b/metadata/md5-cache/dev-ml/alcotest-1.4.0
@@ -5,10 +5,10 @@ DESCRIPTION=A lightweight and colourful test framework
 EAPI=7
 HOMEPAGE=https://github.com/mirage/alcotest/
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=dev-ml/astring:= dev-ml/async_unix:= dev-ml/cmdliner:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/duration:= >=dev-ml/fmt-0.8.9:= dev-ml/mirage-clock:= dev-ml/re:= dev-ml/result:= dev-ml/logs:= dev-ml/uutf:= dev-ml/uuidm:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.4.0
 SRC_URI=https://github.com/mirage/alcotest/archive/1.4.0.tar.gz -> alcotest-1.4.0.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=4816160c9e9520c6ebccfaef1dd01eeb
+_md5_=77374d9208aa6e753d24095016bdce03
diff --git a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0 b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0
deleted file mode 100644
index 3f717e8feef4..000000000000
--- a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Randomized testing framework, designed for compatibility with Base
-EAPI=7
-HOMEPAGE=https://github.com/janestreet/base_quickcheck
-IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/0.14.0
-SRC_URI=https://github.com/janestreet/base_quickcheck/archive/v0.14.0.tar.gz -> base_quickcheck-0.14.0.tar.gz
-_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=df0860c33500878e5837fe71b6c26d81
diff --git a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0-r1 b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0-r1
new file mode 100644
index 000000000000..10a8552ff580
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Randomized testing framework, designed for compatibility with Base
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/base_quickcheck
+IUSE=+ocamlopt
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
+LICENSE=MIT
+RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/base_quickcheck/archive/v0.14.0.tar.gz -> base_quickcheck-0.14.0.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=b010bd646ec2210987d13b6f4f6a7350
diff --git a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.1 b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.1
deleted file mode 100644
index 90fed14fd6f5..000000000000
--- a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Randomized testing framework, designed for compatibility with Base
-EAPI=7
-HOMEPAGE=https://github.com/janestreet/base_quickcheck
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/0.14.1
-SRC_URI=https://github.com/janestreet/base_quickcheck/archive/v0.14.1.tar.gz -> base_quickcheck-0.14.1.tar.gz
-_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=7279b02d2a65503e765b9abc9e8bca4a
diff --git a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.1-r1 b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.1-r1
new file mode 100644
index 000000000000..9685475904e7
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Randomized testing framework, designed for compatibility with Base
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/base_quickcheck
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/0.14.1
+SRC_URI=https://github.com/janestreet/base_quickcheck/archive/v0.14.1.tar.gz -> base_quickcheck-0.14.1.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=bf6bb2d09169399ded4e7a6a9df1c6e5
diff --git a/metadata/md5-cache/dev-ml/bigarray-compat-1.0.0 b/metadata/md5-cache/dev-ml/bigarray-compat-1.0.0
index 7c410debe74d..8601f756e8bf 100644
--- a/metadata/md5-cache/dev-ml/bigarray-compat-1.0.0
+++ b/metadata/md5-cache/dev-ml/bigarray-compat-1.0.0
@@ -5,10 +5,10 @@ DESCRIPTION=Compatibility library to use Stdlib.Bigarray when possible
 EAPI=7
 HOMEPAGE=https://github.com/mirage/bigarray-compat
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/mirage/bigarray-compat/archive/v1.0.0.tar.gz -> bigarray-compat-1.0.0.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=3f44f29e60e5c62a03f3fd7bca361a4f
+_md5_=407a57dcd3cfb51c5114d05b25d7b9b7
diff --git a/metadata/md5-cache/dev-ml/bos-0.1.6 b/metadata/md5-cache/dev-ml/bos-0.1.6
index 162978c031f1..91ea3b3dc3d0 100644
--- a/metadata/md5-cache/dev-ml/bos-0.1.6
+++ b/metadata/md5-cache/dev-ml/bos-0.1.6
@@ -4,10 +4,10 @@ DESCRIPTION=Basic OS interaction for OCaml
 EAPI=6
 HOMEPAGE=https://erratique.ch/software/bos https://github.com/dbuenzli/bos
 IUSE=test
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=dev-lang/ocaml:= dev-ml/rresult:= dev-ml/astring:= dev-ml/fpath:= dev-ml/fmt:= dev-ml/logs:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.6
 SRC_URI=https://erratique.ch/software/bos/releases/bos-0.1.6.tbz
-_md5_=bde13fc6dd97386a427ef00be0878e2b
+_md5_=e232982a69a10dd0d5d389c38d2ffc9a
diff --git a/metadata/md5-cache/dev-ml/bos-0.2.0 b/metadata/md5-cache/dev-ml/bos-0.2.0
index 44651774884c..fc886ba1e0c5 100644
--- a/metadata/md5-cache/dev-ml/bos-0.2.0
+++ b/metadata/md5-cache/dev-ml/bos-0.2.0
@@ -5,10 +5,10 @@ DESCRIPTION=Basic OS interaction for OCaml
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/bos https://github.com/dbuenzli/bos
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
 LICENSE=ISC
 RDEPEND=dev-lang/ocaml:= dev-ml/rresult:= dev-ml/astring:= dev-ml/fpath:= dev-ml/fmt:= dev-ml/logs:=
 RESTRICT=!test? ( test )
 SLOT=0/0.2.0
 SRC_URI=https://erratique.ch/software/bos/releases/bos-0.2.0.tbz
-_md5_=9f532b6b56c1d32844a219e3086f9d08
+_md5_=9bcf0e7d36c63ac82da5c8bad1e8b01d
diff --git a/metadata/md5-cache/dev-ml/cairo2-0.6.2 b/metadata/md5-cache/dev-ml/cairo2-0.6.2
index faaeffe26892..d5a1f641ed89 100644
--- a/metadata/md5-cache/dev-ml/cairo2-0.6.2
+++ b/metadata/md5-cache/dev-ml/cairo2-0.6.2
@@ -5,11 +5,11 @@ DESCRIPTION=Binding to Cairo, a 2D Vector Graphics Library
 EAPI=7
 HOMEPAGE=https://github.com/Chris00/ocaml-cairo
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=x11-libs/cairo:= dev-ml/dune-configurator:= !dev-ml/ocaml-cairo >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.6.2
 SRC_URI=https://github.com/Chris00/ocaml-cairo/releases/download/0.6.2/cairo2-0.6.2.tbz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=1c52c5a32c0ae7ed29c877863803159c
+_md5_=a0750532dc7b079410114b93d6fc081b
diff --git a/metadata/md5-cache/dev-ml/camlbz2-0.7.0 b/metadata/md5-cache/dev-ml/camlbz2-0.7.0
index 8a0399a0e5ef..187f617683ef 100644
--- a/metadata/md5-cache/dev-ml/camlbz2-0.7.0
+++ b/metadata/md5-cache/dev-ml/camlbz2-0.7.0
@@ -4,11 +4,11 @@ DEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt] >=dev-ml/findlib-1.0.4-r
 DESCRIPTION=OCaml bindings for libbz (AKA, bzip2)
 EAPI=7
 HOMEPAGE=https://gitlab.com/irill/camlbz2
-IUSE=doc ocamlopt
+IUSE=ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/0.7.0
 SRC_URI=https://gitlab.com/irill/camlbz2/-/archive/0.7.0/camlbz2-0.7.0.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	1470b3b78030acb2c8fcd04414f4c611	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=61ee3e5a6e052b646a3e2f46321e9a37
+_md5_=b712ef937f54a8d63fea6b28fbdfa455
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.05_p1-r1 b/metadata/md5-cache/dev-ml/camlp4-4.05_p1-r1
index b82e887d0cf8..a287dc5ed19f 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.05_p1-r1
+++ b/metadata/md5-cache/dev-ml/camlp4-4.05_p1-r1
@@ -9,4 +9,4 @@ LICENSE=LGPL-2-with-linking-exception
 RDEPEND=dev-lang/ocaml:0/4.05[ocamlopt?]
 SLOT=0/4.05_p1
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.05+1.tar.gz -> camlp4-4.05_p1.tar.gz
-_md5_=ad7df4ae445ddf2367254f16c0fce73e
+_md5_=4597d66ccb59eb89f42d90a6e4a0cffb
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.09_p1-r1 b/metadata/md5-cache/dev-ml/camlp4-4.09_p1-r1
index 2595ba671f26..725e39a7e141 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.09_p1-r1
+++ b/metadata/md5-cache/dev-ml/camlp4-4.09_p1-r1
@@ -9,4 +9,4 @@ LICENSE=LGPL-2-with-linking-exception
 RDEPEND=dev-lang/ocaml:0/4.09[ocamlopt?]
 SLOT=0/4.09_p1
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.09+1.tar.gz -> camlp4-4.09_p1.tar.gz
-_md5_=db7d62696ea715b938ce97cf992bb5bb
+_md5_=61561fc1418e9b385bb274002a40facd
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.10_p1-r2 b/metadata/md5-cache/dev-ml/camlp4-4.10_p1-r2
index 4ec420c9603d..f9129bc0016b 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.10_p1-r2
+++ b/metadata/md5-cache/dev-ml/camlp4-4.10_p1-r2
@@ -9,4 +9,4 @@ LICENSE=LGPL-2-with-linking-exception
 RDEPEND=dev-lang/ocaml:0/4.10[ocamlopt?]
 SLOT=0/4.10_p1
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.10+1.tar.gz -> camlp4-4.10_p1.tar.gz
-_md5_=9d4cf02c4b6c5f1839e87ac3c84e7403
+_md5_=b7326a6021cc4010e03dad17b3ee4c07
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.11_p1-r2 b/metadata/md5-cache/dev-ml/camlp4-4.11_p1-r2
index 153156361601..d7f2e651c326 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.11_p1-r2
+++ b/metadata/md5-cache/dev-ml/camlp4-4.11_p1-r2
@@ -4,9 +4,9 @@ DESCRIPTION=System for writing extensible parsers for programming languages
 EAPI=7
 HOMEPAGE=https://github.com/camlp4/camlp4
 IUSE=+ocamlopt
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2-with-linking-exception
 RDEPEND=dev-lang/ocaml:0/4.11[ocamlopt?]
 SLOT=0/4.11_p1
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.11+1.tar.gz -> camlp4-4.11_p1.tar.gz
-_md5_=8635843fc07c787498fe77aebc1bb395
+_md5_=f263c07f27be32c17a6f92e6bc4adc57
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.12-r1 b/metadata/md5-cache/dev-ml/camlp4-4.12-r1
index 6024c658f314..8f09bef938b2 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.12-r1
+++ b/metadata/md5-cache/dev-ml/camlp4-4.12-r1
@@ -9,4 +9,4 @@ LICENSE=LGPL-2-with-linking-exception
 RDEPEND=dev-lang/ocaml:0/4.12[ocamlopt?]
 SLOT=0/4.12
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.12.tar.gz -> camlp4-4.12.tar.gz
-_md5_=8635843fc07c787498fe77aebc1bb395
+_md5_=6c6ae8400a5986c8b6e4eb412b4238d2
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.13-r1 b/metadata/md5-cache/dev-ml/camlp4-4.13-r1
index cf542cc51994..8c55f1084f64 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.13-r1
+++ b/metadata/md5-cache/dev-ml/camlp4-4.13-r1
@@ -9,4 +9,4 @@ LICENSE=LGPL-2-with-linking-exception
 RDEPEND=dev-lang/ocaml:0/4.13[ocamlopt?]
 SLOT=0/4.13
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.13.tar.gz -> camlp4-4.13.tar.gz
-_md5_=8635843fc07c787498fe77aebc1bb395
+_md5_=6c6ae8400a5986c8b6e4eb412b4238d2
diff --git a/metadata/md5-cache/dev-ml/cinaps-0.14.0 b/metadata/md5-cache/dev-ml/cinaps-0.14.0
index 6bdb39700803..6659a0b29c03 100644
--- a/metadata/md5-cache/dev-ml/cinaps-0.14.0
+++ b/metadata/md5-cache/dev-ml/cinaps-0.14.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.14.0
 SRC_URI=https://github.com/ocaml-ppx/cinaps/archive/v0.14.0.tar.gz -> cinaps-0.14.0.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=45ae8a8f9215e5b5dcd7080485779650
+_md5_=ebea1a9fd4d2e2444753f9faa15b2a3e
diff --git a/metadata/md5-cache/dev-ml/cinaps-0.15.1 b/metadata/md5-cache/dev-ml/cinaps-0.15.1
index 4d5a313ece59..8c5035549519 100644
--- a/metadata/md5-cache/dev-ml/cinaps-0.15.1
+++ b/metadata/md5-cache/dev-ml/cinaps-0.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Trivial metaprogramming tool
 EAPI=7
 HOMEPAGE=https://github.com/ocaml-ppx/cinaps
 IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/0.15.1
 SRC_URI=https://github.com/ocaml-ppx/cinaps/archive/v0.15.1.tar.gz -> cinaps-0.15.1.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=8181c0f3a9cc6ab54db9ec5d531cc725
+_md5_=31fead40087af2e173677dddc5540fdb
diff --git a/metadata/md5-cache/dev-ml/csexp-1.3.2-r1 b/metadata/md5-cache/dev-ml/csexp-1.3.2-r1
index 287128c16456..1acdc600bff2 100644
--- a/metadata/md5-cache/dev-ml/csexp-1.3.2-r1
+++ b/metadata/md5-cache/dev-ml/csexp-1.3.2-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.3.2
 SRC_URI=https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=fe4a73684fcb9e69f5e29aaa1a68daf3
+_md5_=8d0ecc0e23af0889d8464f5615ca1e56
diff --git a/metadata/md5-cache/dev-ml/csexp-1.5.1 b/metadata/md5-cache/dev-ml/csexp-1.5.1
index 616a8e8a5fe2..f6b63502c0ff 100644
--- a/metadata/md5-cache/dev-ml/csexp-1.5.1
+++ b/metadata/md5-cache/dev-ml/csexp-1.5.1
@@ -5,11 +5,11 @@ DESCRIPTION=Parsing and printing of S-expressions in Canonical form
 EAPI=7
 HOMEPAGE=https://github.com/ocaml-dune/csexp
 IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/result-1.5:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/1.5.1
 SRC_URI=https://github.com/ocaml-dune/csexp/releases/download/1.5.1/csexp-1.5.1.tbz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=9cf84a87c122055a234eb249109e442e
+_md5_=8d0ecc0e23af0889d8464f5615ca1e56
diff --git a/metadata/md5-cache/dev-ml/cudf-0.9-r1 b/metadata/md5-cache/dev-ml/cudf-0.9-r1
deleted file mode 100644
index 7748dcd030e6..000000000000
--- a/metadata/md5-cache/dev-ml/cudf-0.9-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-ml/findlib:= dev-libs/glib:2 sys-libs/libunwind:= sys-libs/ncurses:= test? ( dev-ml/ounit2 ) dev-ml/ocamlbuild dev-lang/perl
-DESCRIPTION=Library to parse, pretty print, and evaluate CUDF documents
-EAPI=7
-HOMEPAGE=http://www.mancoosi.org/cudf/
-IUSE=+ocamlopt test
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-ml/findlib:= dev-libs/glib:2 sys-libs/libunwind:= sys-libs/ncurses:=
-RESTRICT=!test? ( test )
-SLOT=0/0.9
-SRC_URI=https://gforge.inria.fr/frs/download.php/file/36602/cudf-0.9.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=16db502c54f2df5834e7fdb5e602751a
diff --git a/metadata/md5-cache/dev-ml/cudf-0.9-r2 b/metadata/md5-cache/dev-ml/cudf-0.9-r2
new file mode 100644
index 000000000000..2c671c2c8f7e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/cudf-0.9-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-ml/findlib:= dev-libs/glib:2 llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) sys-libs/ncurses:= test? ( dev-ml/ounit2 ) dev-ml/ocamlbuild dev-lang/perl
+DESCRIPTION=Library to parse, pretty print, and evaluate CUDF documents
+EAPI=7
+HOMEPAGE=http://www.mancoosi.org/cudf/
+IUSE=+ocamlopt llvm-libunwind test
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-ml/findlib:= dev-libs/glib:2 llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) sys-libs/ncurses:=
+RESTRICT=!test? ( test )
+SLOT=0/0.9
+SRC_URI=https://gforge.inria.fr/frs/download.php/file/36602/cudf-0.9.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4494836293dfef398c169f11f0a17e64
diff --git a/metadata/md5-cache/dev-ml/dose3-5.0.1_p16-r3 b/metadata/md5-cache/dev-ml/dose3-5.0.1_p16-r3
deleted file mode 100644
index b9d97348847c..000000000000
--- a/metadata/md5-cache/dev-ml/dose3-5.0.1_p16-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/cppo dev-ml/findlib dev-ml/ocamlbuild
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt=] <dev-lang/ocaml-4.10.0:=[ocamlopt=] dev-ml/cudf:=[ocamlopt=] >=dev-ml/extlib-1.7.0:=[ocamlopt=] >=dev-ml/ocamlgraph-1.8.6:=[ocamlopt=] <dev-ml/ocamlgraph-1.8.9:=[ocamlopt=] >=dev-ml/re-1.9.0:=[ocamlopt=] parmap? ( dev-ml/parmap:=[ocamlopt=] ) zip? ( dev-ml/camlzip:=[ocamlopt=] ) bzip2? ( dev-ml/camlbz2:= ) xml? ( dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] ) curl? ( dev-ml/ocurl:= ) rpm4? ( app-arch/rpm ) test? ( dev-python/pyyaml[libyaml] )
-DESCRIPTION=Library to perform analysis on package repositories
-EAPI=7
-HOMEPAGE=http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose
-IUSE=+ocamlopt parmap zip bzip2 xml curl rpm4 test
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt=] <dev-lang/ocaml-4.10.0:=[ocamlopt=] dev-ml/cudf:=[ocamlopt=] >=dev-ml/extlib-1.7.0:=[ocamlopt=] >=dev-ml/ocamlgraph-1.8.6:=[ocamlopt=] <dev-ml/ocamlgraph-1.8.9:=[ocamlopt=] >=dev-ml/re-1.9.0:=[ocamlopt=] parmap? ( dev-ml/parmap:=[ocamlopt=] ) zip? ( dev-ml/camlzip:=[ocamlopt=] ) bzip2? ( dev-ml/camlbz2:= ) xml? ( dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] ) curl? ( dev-ml/ocurl:= ) rpm4? ( app-arch/rpm )
-RESTRICT=test
-SLOT=0/5.0.1_p16
-SRC_URI=http://deb.debian.org/debian/pool/main/d/dose3/dose3_5.0.1.orig.tar.gz http://deb.debian.org/debian/pool/main/d/dose3/dose3_5.0.1-16.debian.tar.xz
-_md5_=9e90843e8cea207b349d6af74e7a0fb7
diff --git a/metadata/md5-cache/dev-ml/dose3-5.0.1_p16-r4 b/metadata/md5-cache/dev-ml/dose3-5.0.1_p16-r4
new file mode 100644
index 000000000000..32b746c83e72
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dose3-5.0.1_p16-r4
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/cppo dev-ml/findlib dev-ml/ocamlbuild
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt=] <dev-lang/ocaml-4.10.0:=[ocamlopt=] dev-ml/cudf:=[ocamlopt=] >=dev-ml/extlib-1.7.0:=[ocamlopt=] >=dev-ml/ocamlgraph-1.8.6:=[ocamlopt=] <dev-ml/ocamlgraph-1.8.9:=[ocamlopt=] >=dev-ml/re-1.9.0:=[ocamlopt=] parmap? ( dev-ml/parmap:=[ocamlopt=] ) zip? ( dev-ml/camlzip:=[ocamlopt=] ) bzip2? ( dev-ml/camlbz2:= ) xml? ( dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] ) curl? ( dev-ml/ocurl:= ) rpm4? ( app-arch/rpm ) test? ( dev-python/pyyaml[libyaml(+)] )
+DESCRIPTION=Library to perform analysis on package repositories
+EAPI=7
+HOMEPAGE=http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose
+IUSE=+ocamlopt parmap zip bzip2 xml curl rpm4 test
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt=] <dev-lang/ocaml-4.10.0:=[ocamlopt=] dev-ml/cudf:=[ocamlopt=] >=dev-ml/extlib-1.7.0:=[ocamlopt=] >=dev-ml/ocamlgraph-1.8.6:=[ocamlopt=] <dev-ml/ocamlgraph-1.8.9:=[ocamlopt=] >=dev-ml/re-1.9.0:=[ocamlopt=] parmap? ( dev-ml/parmap:=[ocamlopt=] ) zip? ( dev-ml/camlzip:=[ocamlopt=] ) bzip2? ( dev-ml/camlbz2:= ) xml? ( dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] ) curl? ( dev-ml/ocurl:= ) rpm4? ( app-arch/rpm )
+RESTRICT=test
+SLOT=0/5.0.1_p16
+SRC_URI=http://deb.debian.org/debian/pool/main/d/dose3/dose3_5.0.1.orig.tar.gz http://deb.debian.org/debian/pool/main/d/dose3/dose3_5.0.1-16.debian.tar.xz
+_md5_=ea49b723f746f172244eb11739f5ebd0
diff --git a/metadata/md5-cache/dev-ml/dose3-6.0.1_p2 b/metadata/md5-cache/dev-ml/dose3-6.0.1_p2
deleted file mode 100644
index 83307d1518ea..000000000000
--- a/metadata/md5-cache/dev-ml/dose3-6.0.1_p2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-ml/findlib dev-ml/ocamlbuild dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=dev-ml/cudf-0.7:=[ocamlopt=] >=dev-ml/extlib-1.7.8:=[ocamlopt=] >=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=] >=dev-ml/re-1.2.2:=[ocamlopt=] dev-ml/parmap:=[ocamlopt=] >=dev-ml/camlzip-1.08:=[ocamlopt=] >=dev-ml/camlbz2-0.7.0:= dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] app-arch/rpm test? ( dev-python/pyyaml[libyaml] ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Library to perform analysis on package repositories
-EAPI=7
-HOMEPAGE=http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose
-IUSE=+ocamlopt test
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=dev-ml/cudf-0.7:=[ocamlopt=] >=dev-ml/extlib-1.7.8:=[ocamlopt=] >=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=] >=dev-ml/re-1.2.2:=[ocamlopt=] dev-ml/parmap:=[ocamlopt=] >=dev-ml/camlzip-1.08:=[ocamlopt=] >=dev-ml/camlbz2-0.7.0:= dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] app-arch/rpm >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/6.0.1_p2
-SRC_URI=http://deb.debian.org/debian/pool/main/d/dose3/dose3_6.0.1.orig.tar.gz http://deb.debian.org/debian/pool/main/d/dose3/dose3_6.0.1-2.debian.tar.xz
-_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=1863bef022670315d4a6160c6ea7b222
diff --git a/metadata/md5-cache/dev-ml/dose3-6.0.1_p2-r1 b/metadata/md5-cache/dev-ml/dose3-6.0.1_p2-r1
new file mode 100644
index 000000000000..e6fe50056662
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dose3-6.0.1_p2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/findlib dev-ml/ocamlbuild dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=dev-ml/cudf-0.7:=[ocamlopt=] >=dev-ml/extlib-1.7.8:=[ocamlopt=] >=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=] >=dev-ml/re-1.2.2:=[ocamlopt=] dev-ml/parmap:=[ocamlopt=] >=dev-ml/camlzip-1.08:=[ocamlopt=] >=dev-ml/camlbz2-0.7.0:= dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] app-arch/rpm test? ( dev-python/pyyaml[libyaml(+)] ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Library to perform analysis on package repositories
+EAPI=7
+HOMEPAGE=http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose
+IUSE=+ocamlopt test
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=dev-ml/cudf-0.7:=[ocamlopt=] >=dev-ml/extlib-1.7.8:=[ocamlopt=] >=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=] >=dev-ml/re-1.2.2:=[ocamlopt=] dev-ml/parmap:=[ocamlopt=] >=dev-ml/camlzip-1.08:=[ocamlopt=] >=dev-ml/camlbz2-0.7.0:= dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] app-arch/rpm >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/6.0.1_p2
+SRC_URI=http://deb.debian.org/debian/pool/main/d/dose3/dose3_6.0.1.orig.tar.gz http://deb.debian.org/debian/pool/main/d/dose3/dose3_6.0.1-2.debian.tar.xz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=063232bdda5316094045427b50283f15
diff --git a/metadata/md5-cache/dev-ml/dose3-6.1 b/metadata/md5-cache/dev-ml/dose3-6.1
deleted file mode 100644
index 766ae83e7d9f..000000000000
--- a/metadata/md5-cache/dev-ml/dose3-6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-ml/findlib dev-ml/ocamlbuild dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=dev-ml/cudf-0.7:=[ocamlopt=] >=dev-ml/extlib-1.7.8:=[ocamlopt=] >=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=] >=dev-ml/re-1.2.2:=[ocamlopt=] dev-ml/parmap:=[ocamlopt=] >=dev-ml/camlzip-1.08:=[ocamlopt=] >=dev-ml/camlbz2-0.7.0:= dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] app-arch/rpm test? ( dev-python/pyyaml[libyaml] ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Library to perform analysis on package repositories
-EAPI=7
-HOMEPAGE=http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=dev-ml/cudf-0.7:=[ocamlopt=] >=dev-ml/extlib-1.7.8:=[ocamlopt=] >=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=] >=dev-ml/re-1.2.2:=[ocamlopt=] dev-ml/parmap:=[ocamlopt=] >=dev-ml/camlzip-1.08:=[ocamlopt=] >=dev-ml/camlbz2-0.7.0:= dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] app-arch/rpm >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/6.1
-SRC_URI=https://gitlab.com/irill/dose3/-/archive/6.1/dose3-6.1.tar.gz
-_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=8d3c7f598da0f97b78d6832fc268bf63
diff --git a/metadata/md5-cache/dev-ml/dose3-6.1-r1 b/metadata/md5-cache/dev-ml/dose3-6.1-r1
new file mode 100644
index 000000000000..23559b5d8e46
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dose3-6.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/findlib dev-ml/ocamlbuild dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=dev-ml/cudf-0.7:=[ocamlopt=] >=dev-ml/extlib-1.7.8:=[ocamlopt=] >=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=] >=dev-ml/re-1.2.2:=[ocamlopt=] dev-ml/parmap:=[ocamlopt=] >=dev-ml/camlzip-1.08:=[ocamlopt=] >=dev-ml/camlbz2-0.7.0:= dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] app-arch/rpm test? ( dev-python/pyyaml[libyaml(+)] ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Library to perform analysis on package repositories
+EAPI=7
+HOMEPAGE=http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose
+IUSE=+ocamlopt test
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=dev-ml/cudf-0.7:=[ocamlopt=] >=dev-ml/extlib-1.7.8:=[ocamlopt=] >=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=] >=dev-ml/re-1.2.2:=[ocamlopt=] dev-ml/parmap:=[ocamlopt=] >=dev-ml/camlzip-1.08:=[ocamlopt=] >=dev-ml/camlbz2-0.7.0:= dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] app-arch/rpm >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/6.1
+SRC_URI=https://gitlab.com/irill/dose3/-/archive/6.1/dose3-6.1.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=61b4dd0b30edeb5ac91c42a5ff686ddb
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1 b/metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1
index 81b9577f5fd2..7ebb5adee5b4 100644
--- a/metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1
+++ b/metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.8.2
 SRC_URI=https://github.com/ocaml/dune/archive/2.8.2.tar.gz -> dune-2.8.2.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=22ad4c56367729b17f30b6e1e130b662
+_md5_=b44310d102c4231e7ea09b1010a87ec6
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-2.8.4 b/metadata/md5-cache/dev-ml/dune-configurator-2.8.4
index 72c1624e6e3f..8ddfdfe73543 100644
--- a/metadata/md5-cache/dev-ml/dune-configurator-2.8.4
+++ b/metadata/md5-cache/dev-ml/dune-configurator-2.8.4
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.8.4
 SRC_URI=https://github.com/ocaml/dune/archive/2.8.4.tar.gz -> dune-2.8.4.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=e8a8089a3c358e4b4171de9101f40616
+_md5_=c863b4d3f5216816bed829cbfbe19c79
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-2.9.0 b/metadata/md5-cache/dev-ml/dune-configurator-2.9.0
index 5fca7a145b21..6af57d4221cd 100644
--- a/metadata/md5-cache/dev-ml/dune-configurator-2.9.0
+++ b/metadata/md5-cache/dev-ml/dune-configurator-2.9.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.9.0
 SRC_URI=https://github.com/ocaml/dune/archive/2.9.0.tar.gz -> dune-2.9.0.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=1bc0c754d2c158933ecd1f887bc1c692
+_md5_=bb6e7f1017f2cd13ecdb3d9e6be30e9e
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-2.9.1 b/metadata/md5-cache/dev-ml/dune-configurator-2.9.1
index a9ab26f2e761..226c87d5bcbf 100644
--- a/metadata/md5-cache/dev-ml/dune-configurator-2.9.1
+++ b/metadata/md5-cache/dev-ml/dune-configurator-2.9.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.9.1
 SRC_URI=https://github.com/ocaml/dune/archive/2.9.1.tar.gz -> dune-2.9.1.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=1bc0c754d2c158933ecd1f887bc1c692
+_md5_=bb6e7f1017f2cd13ecdb3d9e6be30e9e
diff --git a/metadata/md5-cache/dev-ml/extlib-1.7.8 b/metadata/md5-cache/dev-ml/extlib-1.7.8
index cfb9b3a5399d..acba10189b6a 100644
--- a/metadata/md5-cache/dev-ml/extlib-1.7.8
+++ b/metadata/md5-cache/dev-ml/extlib-1.7.8
@@ -5,10 +5,10 @@ DESCRIPTION=Standard library extensions for O'Caml
 EAPI=7
 HOMEPAGE=https://github.com/ygrek/ocaml-extlib
 IUSE=doc +ocamlopt ocamlopt
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.7.8
 SRC_URI=https://github.com/ygrek/ocaml-extlib/archive/1.7.8.tar.gz -> extlib-1.7.8.tar.gz
 _eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
-_md5_=9cff7b828d8259112e94c7142267e19c
+_md5_=6a2a79fe1808d8f5f3362c2dc7751cbb
diff --git a/metadata/md5-cache/dev-ml/fpath-0.7.2 b/metadata/md5-cache/dev-ml/fpath-0.7.2
index 52a4d18f3b07..9246516d5614 100644
--- a/metadata/md5-cache/dev-ml/fpath-0.7.2
+++ b/metadata/md5-cache/dev-ml/fpath-0.7.2
@@ -3,10 +3,10 @@ DEPEND=dev-ml/result:= dev-ml/astring:= dev-ml/topkg dev-ml/ocamlbuild dev-ml/fi
 DESCRIPTION=File system paths for OCaml
 EAPI=6
 HOMEPAGE=https://erratique.ch/software/fpath https://github.com/dbuenzli/fpath
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=dev-ml/result:= dev-ml/astring:= >=dev-lang/ocaml-4:=
 SLOT=0/0.7.2
 SRC_URI=https://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz
 _eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
-_md5_=40429ae1c5424dbb9dcf68cfa5df7610
+_md5_=d83bf74562e4e23fb4faf7392f18e4f1
diff --git a/metadata/md5-cache/dev-ml/fpath-0.7.3 b/metadata/md5-cache/dev-ml/fpath-0.7.3
index af1c274b698f..3d05d4ae18f5 100644
--- a/metadata/md5-cache/dev-ml/fpath-0.7.3
+++ b/metadata/md5-cache/dev-ml/fpath-0.7.3
@@ -4,10 +4,10 @@ DEPEND=dev-ml/result:= dev-ml/astring:= >=dev-lang/ocaml-4:=
 DESCRIPTION=File system paths for OCaml
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/fpath https://github.com/dbuenzli/fpath
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
 LICENSE=ISC
 RDEPEND=dev-ml/result:= dev-ml/astring:= >=dev-lang/ocaml-4:=
 SLOT=0/0.7.3
 SRC_URI=https://erratique.ch/software/fpath/releases/fpath-0.7.3.tbz
 _eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
-_md5_=de059086d85d7e0fa16756d0e42a2391
+_md5_=d40c745383469d922340960ee47f9a6e
diff --git a/metadata/md5-cache/dev-ml/graphics-5.1.2 b/metadata/md5-cache/dev-ml/graphics-5.1.2
index 89e390d22d40..3ee370054984 100644
--- a/metadata/md5-cache/dev-ml/graphics-5.1.2
+++ b/metadata/md5-cache/dev-ml/graphics-5.1.2
@@ -5,10 +5,10 @@ DESCRIPTION=The OCaml graphics library
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/graphics
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/dune-configurator:=[ocamlopt?] >=dev-lang/ocaml-4.09:= x11-libs/libX11:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/ocaml/graphics/releases/download/5.1.2/graphics-5.1.2.tbz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=9f2160fc807d3e289b25de6f817d175a
+_md5_=a2424668677a91fefe5db3b8608f3ca3
diff --git a/metadata/md5-cache/dev-ml/jst-config-0.14.1 b/metadata/md5-cache/dev-ml/jst-config-0.14.1
new file mode 100644
index 000000000000..31ba384dd8d9
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/jst-config-0.14.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/stdio:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Compile-time configuration for Jane Street libraries
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/jst-config
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/stdio:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/0.14.1
+SRC_URI=https://github.com/janestreet/jst-config/archive/v0.14.1.tar.gz -> jst-config-0.14.1.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=adbeae5a69bc51155fdbb7d24ccdb444
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.10 b/metadata/md5-cache/dev-ml/labltk-8.06.10
index acb09e293f33..e23c1e75e10f 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.10
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.10
@@ -4,10 +4,10 @@ DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
 EAPI=7
 HOMEPAGE=https://garrigue.github.io/labltk/
 IUSE=+ocamlopt X ocamlopt
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=QPL-1.0 LGPL-2
 RDEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.06.10
 SRC_URI=https://github.com/garrigue/labltk/archive/8.06.10.tar.gz -> labltk-8.06.10.tar.gz
 _eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
-_md5_=8b8dd673ab86d68019d02cfd5f978cb7
+_md5_=35c525e703b68b16048d8de98330f473
diff --git a/metadata/md5-cache/dev-ml/menhir-20210419-r1 b/metadata/md5-cache/dev-ml/menhir-20210419-r1
index 94233e09ff4f..d93ae785e136 100644
--- a/metadata/md5-cache/dev-ml/menhir-20210419-r1
+++ b/metadata/md5-cache/dev-ml/menhir-20210419-r1
@@ -5,10 +5,10 @@ DESCRIPTION=LR(1) parser generator for the OCaml language
 EAPI=7
 HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/20210419
 SRC_URI=https://gitlab.inria.fr/fpottier/menhir/-/archive/20210419/menhir-20210419.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=abb3126df465272611ff9e21373b6338
+_md5_=71e5a3b4f1bc5e09b5bc48084a88cea7
diff --git a/metadata/md5-cache/dev-ml/merlin-4.2 b/metadata/md5-cache/dev-ml/merlin-4.2
new file mode 100644
index 000000000000..4f47aa57ba44
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/merlin-4.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install postinst postrm prepare test
+DEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) test? ( app-misc/jq ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/merlin
+IUSE=emacs +ocamlopt test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/4.2
+SRC_URI=https://github.com/ocaml/merlin/archive/v4.2-411.tar.gz -> merlin-4.2-411.tar.gz https://dev.gentoo.org/~tupone/distfiles/merlin-4.2-ocaml-4.12.patch.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_md5_=12fcbdcdfda74e269608fd55e421334f
diff --git a/metadata/md5-cache/dev-ml/merlin-4.3.1 b/metadata/md5-cache/dev-ml/merlin-4.3.1
new file mode 100644
index 000000000000..0da1d3689934
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/merlin-4.3.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install postinst postrm prepare test
+DEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) test? ( app-misc/jq ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/merlin
+IUSE=emacs +ocamlopt test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/4.3.1
+SRC_URI=https://github.com/ocaml/merlin/archive/v4.3.1-411.tar.gz -> merlin-4.3.1-411.tar.gz https://dev.gentoo.org/~tupone/distfiles/merlin-4.3.1-ocaml-4.12.patch.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_md5_=f0f54939c211439dcfc43009337d0374
diff --git a/metadata/md5-cache/dev-ml/merlin-extend-0.3-r1 b/metadata/md5-cache/dev-ml/merlin-extend-0.3-r1
index c7ed0e8ce196..ca408e217149 100644
--- a/metadata/md5-cache/dev-ml/merlin-extend-0.3-r1
+++ b/metadata/md5-cache/dev-ml/merlin-extend-0.3-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/ocaml:0/4.05 dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/0.3
 SRC_URI=https://github.com/let-def/merlin-extend/archive/v0.3.tar.gz -> merlin-extend-0.3.tar.gz
 _eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
-_md5_=1f433df2da567a2a13ce602ff31fb3b5
+_md5_=b5b1adfb32630e70c7617bcbfc272dfb
diff --git a/metadata/md5-cache/dev-ml/merlin-extend-0.6 b/metadata/md5-cache/dev-ml/merlin-extend-0.6
index 357bf0115cfd..52b607e20734 100644
--- a/metadata/md5-cache/dev-ml/merlin-extend-0.6
+++ b/metadata/md5-cache/dev-ml/merlin-extend-0.6
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/ocaml:= dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/0.6
 SRC_URI=https://github.com/let-def/merlin-extend/archive/v0.6.tar.gz -> merlin-extend-0.6.tar.gz
 _eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
-_md5_=08cf4c244c64330a7e92d5ae605d1cbc
+_md5_=021b19cd60fdffaeef4bc729b73ca661
diff --git a/metadata/md5-cache/dev-ml/mtime-1.2.0 b/metadata/md5-cache/dev-ml/mtime-1.2.0
index 60a66dd8bcf3..0bec3bb46782 100644
--- a/metadata/md5-cache/dev-ml/mtime-1.2.0
+++ b/metadata/md5-cache/dev-ml/mtime-1.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=OCaml module to access monotonic wall-clock time
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/mtime https://github.com/dbuenzli/mtime
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=dev-lang/ocaml:=[ocamlopt] >=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/1.2.0
 SRC_URI=https://erratique.ch/software/mtime/releases/mtime-1.2.0.tbz
 _eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
-_md5_=957c3c7cc5a87d8554ee54eb4d131469
+_md5_=8f86e714cad1e2e3094210defc9e2350
diff --git a/metadata/md5-cache/dev-ml/ocaml-base64-3.5.0 b/metadata/md5-cache/dev-ml/ocaml-base64-3.5.0
index 48032c0b78f7..2e735ad4eeb3 100644
--- a/metadata/md5-cache/dev-ml/ocaml-base64-3.5.0
+++ b/metadata/md5-cache/dev-ml/ocaml-base64-3.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Library for radix-64 representation (de)coding
 EAPI=7
 HOMEPAGE=https://github.com/mirage/ocaml-base64
 IUSE=+ocamlopt test
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/3.5.0
 SRC_URI=https://github.com/mirage/ocaml-base64/archive/v3.5.0.tar.gz -> ocaml-base64-3.5.0.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=e3573d96ee60654af3f49513aa429656
+_md5_=fe6bc2431e193293fb5b7aa303eab219
diff --git a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3 b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3
index 978a69f9bb34..f3a48ed332d7 100644
--- a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3
+++ b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3
@@ -6,9 +6,9 @@ EAPI=7
 HOMEPAGE=https://github.com/janestreet/ocaml-compiler-libs
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=Apache-2.0
+LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.12.3
 SRC_URI=https://github.com/janestreet/ocaml-compiler-libs/archive/v0.12.3.tar.gz -> ocaml-compiler-libs-0.12.3.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=979476c4665ca6ba71c82893262586fb
+_md5_=e948f800ac0591614d8dcabbe76d64b7
diff --git a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.4 b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.4
new file mode 100644
index 000000000000..d4c5cb396c69
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Repackage the OCaml compiler libs so they do not expose everything at toplevel
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ocaml-compiler-libs
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/0.12.4
+SRC_URI=https://github.com/janestreet/ocaml-compiler-libs/archive/v0.12.4.tar.gz -> ocaml-compiler-libs-0.12.4.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=150815ce528958d5775a8c9073f29449
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.19.1 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.19.1
index c1efe1ea68cb..85982752b1f9 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.19.1
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.19.1
@@ -4,11 +4,11 @@ DESCRIPTION=Library for binding to C libraries using pure OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
 IUSE=test ocamlopt
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] >=dev-libs/libffi-3.3_rc0:= dev-ml/bigarray-compat:= dev-ml/integers:= dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.19.1
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.19.1.tar.gz -> ocaml-ctypes-0.19.1.tar.gz
 _eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
-_md5_=c98af9a024e7a793b9ff8c0023a73551
+_md5_=5c0acf564b47fc5411fbd3d9ffa515fe
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.2.0 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.2.0
index 29041f17a1dd..60932be02139 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.2.0
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.2.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
+BDEPEND=>=dev-ml/dune-2.3 dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
 DEPEND=test? ( dev-ml/cinaps ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Convert OCaml parsetrees between different major versions
 EAPI=7
 HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
 IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) strip
 SLOT=0/2.2.0
 SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v2.2.0.tar.gz -> ocaml-migrate-parsetree-2.2.0.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=0ce9b4afb396215cf239d5c061c4160d
+_md5_=418af6aa99fb292bdcb0904c0d2f377b
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.9 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.9
index 5a6e039d3d71..7663509f37a9 100644
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.9
+++ b/metadata/md5-cache/dev-ml/ocamlnet-4.1.9
@@ -5,11 +5,11 @@ DESCRIPTION=Modules for OCaml application-level Internet protocols
 EAPI=7
 HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
 IUSE=kerberos tk httpd +ocamlopt +pcre ssl zip ocamlopt
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=ZLIB GPL-2+
 RDEPEND=>=dev-ml/findlib-1.0 >=dev-lang/ocaml-3.10.2:=[ocamlopt?] pcre? ( >=dev-ml/pcre-ocaml-5:= ) tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= ) dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=installsources strip
 SLOT=0/4.1.9
 SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.9.tar.gz
 _eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
-_md5_=933316bc7f0b62c4cf18d59291a2f0fe
+_md5_=51d153b2607f6787161eac7bba3d3ee2
diff --git a/metadata/md5-cache/dev-ml/ocamlweb-1.41 b/metadata/md5-cache/dev-ml/ocamlweb-1.41
deleted file mode 100644
index 31f54a43219f..000000000000
--- a/metadata/md5-cache/dev-ml/ocamlweb-1.41
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-tex/hevea )
-DEFINED_PHASES=compile install postinst postrm
-DEPEND=>=dev-lang/ocaml-4.08.0:= virtual/latex-base dev-texlive/texlive-latexextra virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=O'Caml literate programming tool
-EAPI=7
-HOMEPAGE=https://www.lri.fr/~filliatr/ocamlweb/
-IUSE=test
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=LGPL-2
-RDEPEND=virtual/latex-base
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.lri.fr/~filliatr/ftp/ocamlweb/ocamlweb-1.41.tar.gz
-_eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2
-_md5_=873217ed5e460dc7c0308d29e76e7256
diff --git a/metadata/md5-cache/dev-ml/ocamlweb-1.41-r1 b/metadata/md5-cache/dev-ml/ocamlweb-1.41-r1
new file mode 100644
index 000000000000..f7b974653163
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocamlweb-1.41-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-tex/hevea )
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=>=dev-lang/ocaml-4.08.0:= virtual/latex-base dev-texlive/texlive-latexextra virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DESCRIPTION=O'Caml literate programming tool
+EAPI=7
+HOMEPAGE=https://www.lri.fr/~filliatr/ocamlweb/
+IUSE=test
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-lang/ocaml-4.08.0:= virtual/latex-base dev-texlive/texlive-latexextra virtual/latex-base
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.lri.fr/~filliatr/ftp/ocamlweb/ocamlweb-1.41.tar.gz
+_eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2
+_md5_=ec3f4c6511dbbc69e4b91caffbb32a63
diff --git a/metadata/md5-cache/dev-ml/opam-2.0.9 b/metadata/md5-cache/dev-ml/opam-2.0.9
new file mode 100644
index 000000000000..8de3e34f44a0
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-2.0.9
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-6.0:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.9:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=A source-based package manager for OCaml
+EAPI=7
+HOMEPAGE=http://opam.ocaml.org/
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-6.0:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.9:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/2.0.9
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=abd9956c1121e82edce505fb928f4b77
diff --git a/metadata/md5-cache/dev-ml/opam-2.1.0 b/metadata/md5-cache/dev-ml/opam-2.1.0
index ac801881075e..e4ba5b291338 100644
--- a/metadata/md5-cache/dev-ml/opam-2.1.0
+++ b/metadata/md5-cache/dev-ml/opam-2.1.0
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-6.0:= dev-ml/extlib:= ~dev-ml/opam-client-2.1.0:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.1.0
-SRC_URI=https://github.com/ocaml/opam/archive/2.1.0.tar.gz -> opam-2.1.0.tar.gz
+SRC_URI=https://github.com/ocaml/opam/archive/2.1.0.tar.gz -> opam-2.1.0.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=abd9956c1121e82edce505fb928f4b77
+_md5_=f38acdff89b5a5a23348e69a9ea1ba19
diff --git a/metadata/md5-cache/dev-ml/opam-file-format-2.1.3 b/metadata/md5-cache/dev-ml/opam-file-format-2.1.3
index b45dad7bb90a..b390e0e4ce81 100644
--- a/metadata/md5-cache/dev-ml/opam-file-format-2.1.3
+++ b/metadata/md5-cache/dev-ml/opam-file-format-2.1.3
@@ -5,11 +5,11 @@ DESCRIPTION=Parser and printer for the opam file syntax
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/opam-file-format
 IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/2.1.3
 SRC_URI=https://github.com/ocaml/opam-file-format/archive/2.1.3.tar.gz -> opam-file-format-2.1.3.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=44f33a6bee8abd5eea17d0ae37525906
+_md5_=433877dc84233bd21e59aed6c2e007b1
diff --git a/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r3 b/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r3
index 64114c02aa24..612b6c262f8f 100644
--- a/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r3
+++ b/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r3
@@ -4,10 +4,10 @@ DEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.8 >=dev
 DESCRIPTION=Core installer for opam packages
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.8 >=dev-ml/dose3-6 >=dev-lang/ocaml-4:=
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/releases/download/2.0.8/opam-full-2.0.8.tar.gz
 _eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
-_md5_=3763748b7ea605103bb48ec9ced45806
+_md5_=cf6c76e9b4325c8cb5a4af57649b2332
diff --git a/metadata/md5-cache/dev-ml/parsexp-0.14.0 b/metadata/md5-cache/dev-ml/parsexp-0.14.0
index e19d286a44bd..26ec579a6030 100644
--- a/metadata/md5-cache/dev-ml/parsexp-0.14.0
+++ b/metadata/md5-cache/dev-ml/parsexp-0.14.0
@@ -6,9 +6,9 @@ EAPI=7
 HOMEPAGE=https://github.com/janestreet/parsexp
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=Apache-2.0
+LICENSE=MIT
 RDEPEND=dev-ml/sexplib0:= dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/parsexp/archive/v0.14.0.tar.gz -> parsexp-0.14.0.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=f855186d69223b0b207bcce7fdd8e4d0
+_md5_=2a5d4e6019ad5fb84fcc4255f77bac77
diff --git a/metadata/md5-cache/dev-ml/parsexp-0.14.1 b/metadata/md5-cache/dev-ml/parsexp-0.14.1
new file mode 100644
index 000000000000..61c28683be41
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/parsexp-0.14.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/sexplib0:= dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=S-expression parsing library
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/parsexp
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-ml/sexplib0:= dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/0.14.1
+SRC_URI=https://github.com/janestreet/parsexp/archive/v0.14.1.tar.gz -> parsexp-0.14.1.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=95e2d84bd16ecba6ac8c840f3ee85172
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.4.6-r1 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.4.6-r1
deleted file mode 100644
index f7f66e827966..000000000000
--- a/metadata/md5-cache/dev-ml/pcre-ocaml-7.4.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/dune-configurator dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-libs/libpcre-4.5 dev-ml/stdio >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
-EAPI=7
-HOMEPAGE=http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml
-IUSE=examples +ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ppc x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/7.4.6
-SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/7.4.6/pcre-7.4.6.tbz -> pcre-ocaml-7.4.6.tbz
-_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=49fd6e8969e7ce86c50650fa91aeb842
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.4.6-r2 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.4.6-r2
new file mode 100644
index 000000000000..0c6218cf2c4f
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/pcre-ocaml-7.4.6-r2
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune-configurator dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-libs/libpcre-4.5 dev-ml/stdio:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
+EAPI=7
+HOMEPAGE=http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml
+IUSE=examples +ocamlopt
+KEYWORDS=amd64 ~arm ~arm64 ppc x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-libs/libpcre-4.5 dev-ml/stdio:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/7.4.6
+SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/7.4.6/pcre-7.4.6.tbz -> pcre-ocaml-7.4.6.tbz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=5552f02bb3a62d3c73fffee1a152252e
diff --git a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0 b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
index 2218f890bb77..c4729ccd30b7 100644
--- a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_bin_prot/archive/v0.14.0.tar.gz -> ppx_bin_prot-0.14.0.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=05312be2fe0b6fd4684064fdbf0bc663
+_md5_=88f799e2f066d7d92a9a7abae2620f4a
diff --git a/metadata/md5-cache/dev-ml/ppx_expect-0.14.0 b/metadata/md5-cache/dev-ml/ppx_expect-0.14.0
index 2f34341df026..5bdb5ab6e129 100644
--- a/metadata/md5-cache/dev-ml/ppx_expect-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_expect-0.14.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_expect/archive/v0.14.0.tar.gz -> ppx_expect-0.14.0.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=a3fd584763acc183bf1e311fbd65365b
+_md5_=c54ac2d33f3e0fba6989164d356ca0e8
diff --git a/metadata/md5-cache/dev-ml/ppx_expect-0.14.1 b/metadata/md5-cache/dev-ml/ppx_expect-0.14.1
index 62fc573fc8fd..8d53c2b4620b 100644
--- a/metadata/md5-cache/dev-ml/ppx_expect-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_expect-0.14.1
@@ -5,11 +5,11 @@ DESCRIPTION=Cram like framework for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_expect
 IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_inline_test-0.14.1:= >=dev-ml/stdio-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_expect/archive/v0.14.1.tar.gz -> ppx_expect-0.14.1.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=81365aad4c7f10f2353c48794bc72eec
+_md5_=937c008a78c3c0a0d3d91b7771476888
diff --git a/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.3 b/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.3
index 4fa8c65b7c7b..3f74d21a34f1 100644
--- a/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.3
+++ b/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.3
@@ -5,10 +5,10 @@ DESCRIPTION=Optional compilation for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_optcomp
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/stdio-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.3
 SRC_URI=https://github.com/janestreet/ppx_optcomp/archive/v0.14.3.tar.gz -> ppx_optcomp-0.14.3.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=3fd370103d1e47f664ede3e2263b99d2
+_md5_=a959826d291bb4b6feb0e22fa19a5495
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2
deleted file mode 100644
index 9c0afe0ea430..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= <=dev-ml/ppxlib-0.20.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Support Library for type-driven code generators
-EAPI=7
-HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
-IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= <=dev-ml/ppxlib-0.20.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/0.14.2
-SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.2.tar.gz -> ppx_sexp_conv-0.14.2.tar.gz
-_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=6d73ae7dc9474e3366dd9cb6441fcde3
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2-r1 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2-r1
new file mode 100644
index 000000000000..884970106a1e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.21.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Support Library for type-driven code generators
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
+IUSE=+ocamlopt
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
+LICENSE=MIT
+RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.21.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/0.14.2
+SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.2.tar.gz -> ppx_sexp_conv-0.14.2.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=9211c788cef931ac9d560ef3469279d2
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
index f51a76c21375..b24df2ad3069 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
@@ -5,10 +5,10 @@ DESCRIPTION=Support Library for type-driven code generators
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.3
 SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.3.tar.gz -> ppx_sexp_conv-0.14.3.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=33b2116948276e1bcafb5752d96f79ef
+_md5_=5f8faeb3af57f35b560cc72224e47015
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-6.3 b/metadata/md5-cache/dev-ml/ppx_tools-6.3
index f2c59b6022c5..cffd18602798 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools-6.3
+++ b/metadata/md5-cache/dev-ml/ppx_tools-6.3
@@ -1,4 +1,4 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
+BDEPEND=dev-ml/cppo dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
 DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Tools for authors of ppx rewriters
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/6.3
 SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/6.3.tar.gz -> ppx_tools-6.3.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=6742b4c4684116a8f8c9383d818d991d
+_md5_=4b518b0a028c3348faf40d92e1d87802
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-6.4 b/metadata/md5-cache/dev-ml/ppx_tools-6.4
index fa434f0f4170..067f6d460aa1 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools-6.4
+++ b/metadata/md5-cache/dev-ml/ppx_tools-6.4
@@ -1,4 +1,4 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
+BDEPEND=dev-ml/cppo dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
 DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Tools for authors of ppx rewriters
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/6.4
 SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/6.4.tar.gz -> ppx_tools-6.4.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=073492f4ec277c494f2f945d4f2b3001
+_md5_=14f0e16810c61b6b1702361c5784d7a2
diff --git a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1
deleted file mode 100644
index 38af6c8100b8..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.18.0:= <=dev-ml/ppxlib-0.20.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Generation of runtime types from type declarations
-EAPI=7
-HOMEPAGE=https://github.com/janestreet/ppx_typerep_conv
-IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.18.0:= <=dev-ml/ppxlib-0.20.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/0.14.1
-SRC_URI=https://github.com/janestreet/ppx_typerep_conv/archive/v0.14.1.tar.gz -> ppx_typerep_conv-0.14.1.tar.gz
-_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=f92b4a597061fabc24b7769f5171c4f9
diff --git a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1-r1 b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1-r1
new file mode 100644
index 000000000000..6c4c51014ff8
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.21.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Generation of runtime types from type declarations
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_typerep_conv
+IUSE=+ocamlopt
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
+LICENSE=MIT
+RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.21.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/0.14.1
+SRC_URI=https://github.com/janestreet/ppx_typerep_conv/archive/v0.14.1.tar.gz -> ppx_typerep_conv-0.14.1.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=c9dcffabce93d6e6ffe1ccec658d1e34
diff --git a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2 b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
index 792a7a71ede0..1897391a9c23 100644
--- a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
+++ b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
@@ -5,10 +5,10 @@ DESCRIPTION=Generation of runtime types from type declarations
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/ppx_typerep_conv
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.2
 SRC_URI=https://github.com/janestreet/ppx_typerep_conv/archive/v0.14.2.tar.gz -> ppx_typerep_conv-0.14.2.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=8bd1e2e6ee68897e90e820220a3f85c0
+_md5_=153c88ce88a81fd53c6f1a861088829e
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.18.0 b/metadata/md5-cache/dev-ml/ppxlib-0.18.0
index 169a4b3adc3e..42dff6b7ad68 100644
--- a/metadata/md5-cache/dev-ml/ppxlib-0.18.0
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.18.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.18.0
 SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.18.0.tar.gz -> ppxlib-0.18.0.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=bb39d4bd5e74ab88cd0e499e5cb73f68
+_md5_=12a4883a25f39116a393df23204ec97b
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.20.0 b/metadata/md5-cache/dev-ml/ppxlib-0.20.0
deleted file mode 100644
index 0e199f31acf3..000000000000
--- a/metadata/md5-cache/dev-ml/ppxlib-0.20.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=test? ( dev-ml/cinaps:= ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Base library and tools for ppx rewriters
-EAPI=7
-HOMEPAGE=https://github.com/ocaml-ppx/ppxlib
-IUSE=+ocamlopt test
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/base-0.11.0:= dev-ml/findlib:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.1.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= >=dev-ml/stdio-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=!test? ( test )
-SLOT=0/0.20.0
-SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.20.0.tar.gz -> ppxlib-0.20.0.tar.gz
-_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=cceed4df496548b6920f3ed9c4d25c70
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.20.0-r1 b/metadata/md5-cache/dev-ml/ppxlib-0.20.0-r1
new file mode 100644
index 000000000000..38e18e03179e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.20.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/base-0.11.0:= dev-ml/findlib:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.1.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= >=dev-ml/stdio-0.11.0:= test? ( dev-ml/cinaps:= ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Base library and tools for ppx rewriters
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-ppx/ppxlib
+IUSE=+ocamlopt test
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/base-0.11.0:= dev-ml/findlib:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.1.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= >=dev-ml/stdio-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/0.20.0
+SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.20.0.tar.gz -> ppxlib-0.20.0.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=eba3637de896ee07a7ed392d1ff4663b
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.21.0-r2 b/metadata/md5-cache/dev-ml/ppxlib-0.21.0-r2
deleted file mode 100644
index 5f81dbe8a436..000000000000
--- a/metadata/md5-cache/dev-ml/ppxlib-0.21.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=test? ( dev-ml/cinaps:= dev-ml/re:= ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Base library and tools for ppx rewriters
-EAPI=7
-HOMEPAGE=https://github.com/ocaml-ppx/ppxlib
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/base-0.11.0:= dev-ml/findlib:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.1.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= >=dev-ml/stdio-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=!test? ( test )
-SLOT=0/0.21.0
-SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.21.0.tar.gz -> ppxlib-0.21.0.tar.gz
-_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=528c4444694dd3150a882af76edcc57a
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.21.0-r3 b/metadata/md5-cache/dev-ml/ppxlib-0.21.0-r3
new file mode 100644
index 000000000000..77d5ece613e4
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.21.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/base-0.11.0:= dev-ml/findlib:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.1.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= >=dev-ml/stdio-0.11.0:= test? ( dev-ml/cinaps:= dev-ml/re:= ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Base library and tools for ppx rewriters
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-ppx/ppxlib
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/base-0.11.0:= dev-ml/findlib:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.1.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= >=dev-ml/stdio-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/0.21.0
+SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.21.0.tar.gz -> ppxlib-0.21.0.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=f84c21e5acdb3329ef8cb982ccb5605f
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.22.0-r2 b/metadata/md5-cache/dev-ml/ppxlib-0.22.0-r2
deleted file mode 100644
index f4e9e5fdbdf6..000000000000
--- a/metadata/md5-cache/dev-ml/ppxlib-0.22.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-ml/dune-2.8 dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=test? ( dev-ml/findlib:= >=dev-ml/base-0.11.0:= dev-ml/cinaps:= dev-ml/re:= >=dev-ml/stdio-0.11.0:= ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Base library and tools for ppx rewriters
-EAPI=7
-HOMEPAGE=https://github.com/ocaml-ppx/ppxlib
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.1.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=!test? ( test )
-SLOT=0/0.22.0
-SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.22.0.tar.gz -> ppxlib-0.22.0.tar.gz
-_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=d7ba8149a1734c1826915631dafc0537
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.22.0-r3 b/metadata/md5-cache/dev-ml/ppxlib-0.22.0-r3
new file mode 100644
index 000000000000..ea16c5d24fd3
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.22.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-ml/dune-2.8 dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.1.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= test? ( dev-ml/findlib:= >=dev-ml/base-0.11.0:= dev-ml/cinaps:= dev-ml/re:= >=dev-ml/stdio-0.11.0:= ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Base library and tools for ppx rewriters
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-ppx/ppxlib
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.1.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/0.22.0
+SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.22.0.tar.gz -> ppxlib-0.22.0.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=df83bf17f327315e98045eb1ec948295
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.22.2-r1 b/metadata/md5-cache/dev-ml/ppxlib-0.22.2-r1
deleted file mode 100644
index afc4026be500..000000000000
--- a/metadata/md5-cache/dev-ml/ppxlib-0.22.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-ml/dune-2.8 dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=test? ( dev-ml/findlib:= >=dev-ml/base-0.11.0:= dev-ml/cinaps:= dev-ml/re:= >=dev-ml/stdio-0.11.0:= ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Base library and tools for ppx rewriters
-EAPI=7
-HOMEPAGE=https://github.com/ocaml-ppx/ppxlib
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.2.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=!test? ( test )
-SLOT=0/0.22.2
-SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.22.2.tar.gz -> ppxlib-0.22.2.tar.gz
-_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=aeed439fd749ab48031f95bf7411be0b
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.22.2-r2 b/metadata/md5-cache/dev-ml/ppxlib-0.22.2-r2
new file mode 100644
index 000000000000..c5bec3aff3f0
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.22.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-ml/dune-2.8 dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.2.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= test? ( dev-ml/findlib:= >=dev-ml/base-0.11.0:= dev-ml/cinaps:= dev-ml/re:= >=dev-ml/stdio-0.11.0:= ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Base library and tools for ppx rewriters
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-ppx/ppxlib
+IUSE=+ocamlopt test
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.2.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/0.22.2
+SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.22.2.tar.gz -> ppxlib-0.22.2.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=63fae79e0cd32e16cffe3b676e89e872
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.23.0 b/metadata/md5-cache/dev-ml/ppxlib-0.23.0
deleted file mode 100644
index 8c2a6eb012a4..000000000000
--- a/metadata/md5-cache/dev-ml/ppxlib-0.23.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-ml/dune-2.8 dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=test? ( dev-ml/findlib:= >=dev-ml/base-0.11.0:= dev-ml/cinaps:= dev-ml/re:= >=dev-ml/stdio-0.11.0:= ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Base library and tools for ppx rewriters
-EAPI=7
-HOMEPAGE=https://github.com/ocaml-ppx/ppxlib
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.2.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=!test? ( test )
-SLOT=0/0.23.0
-SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.23.0.tar.gz -> ppxlib-0.23.0.tar.gz
-_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=b63675fc148df3ff270e8b5782a7e5ce
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.23.0-r1 b/metadata/md5-cache/dev-ml/ppxlib-0.23.0-r1
new file mode 100644
index 000000000000..b08c47c8f6e9
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.23.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-ml/dune-2.8 dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.2.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= test? ( dev-ml/findlib:= >=dev-ml/base-0.11.0:= dev-ml/cinaps:= dev-ml/re:= >=dev-ml/stdio-0.11.0:= ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Base library and tools for ppx rewriters
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-ppx/ppxlib
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.2.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/0.23.0
+SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.23.0.tar.gz -> ppxlib-0.23.0.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=b7a8bfe965b52d08f0dc05996e639d68
diff --git a/metadata/md5-cache/dev-ml/rresult-0.5.0 b/metadata/md5-cache/dev-ml/rresult-0.5.0
index 796a2840a2f2..fe9d38a52dc5 100644
--- a/metadata/md5-cache/dev-ml/rresult-0.5.0
+++ b/metadata/md5-cache/dev-ml/rresult-0.5.0
@@ -3,10 +3,10 @@ DEPEND=dev-ml/result:= dev-ml/topkg dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-m
 DESCRIPTION=Result value combinators for OCaml
 EAPI=6
 HOMEPAGE=https://erratique.ch/software/rresult https://github.com/dbuenzli/rresult
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
 SLOT=0/0.5.0
 SRC_URI=https://erratique.ch/software/rresult/releases/rresult-0.5.0.tbz
 _eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
-_md5_=4c30ab613d9c2b2581c398ba32740124
+_md5_=7e08c214cbc2376eb90933632e25a782
diff --git a/metadata/md5-cache/dev-ml/rresult-0.6.0 b/metadata/md5-cache/dev-ml/rresult-0.6.0
index f61c0b848418..60d817d2e147 100644
--- a/metadata/md5-cache/dev-ml/rresult-0.6.0
+++ b/metadata/md5-cache/dev-ml/rresult-0.6.0
@@ -4,10 +4,10 @@ DEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
 DESCRIPTION=Result value combinators for OCaml
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/rresult https://github.com/dbuenzli/rresult
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~x86
 LICENSE=ISC
 RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
 SLOT=0/0.6.0
 SRC_URI=https://erratique.ch/software/rresult/releases/rresult-0.6.0.tbz
 _eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
-_md5_=984dee65b740cba2d4a261e391d2cf8c
+_md5_=7d88542dbf239cedd1722ec27bae6f91
diff --git a/metadata/md5-cache/dev-ml/seq-0.2.2 b/metadata/md5-cache/dev-ml/seq-0.2.2
index 81b34be01280..667bd8d07f14 100644
--- a/metadata/md5-cache/dev-ml/seq-0.2.2
+++ b/metadata/md5-cache/dev-ml/seq-0.2.2
@@ -5,10 +5,10 @@ DESCRIPTION=Compatibility package for the standard OCaml iterator type
 EAPI=7
 HOMEPAGE=https://github.com/c-cube/seq
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/c-cube/seq/archive/0.2.2.tar.gz -> seq-0.2.2.tar.gz
 _eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=200b0b475dca17492254320c1eba70fe
+_md5_=ac63e83e51514cb2b0c9ff37a61ba861
diff --git a/metadata/md5-cache/dev-ml/uunf-13.0.0 b/metadata/md5-cache/dev-ml/uunf-13.0.0
deleted file mode 100644
index 35b34cf76593..000000000000
--- a/metadata/md5-cache/dev-ml/uunf-13.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-ml/findlib dev-ml/opam-installer dev-lang/ocaml
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/topkg dev-ml/uutf dev-ml/cmdliner >=dev-lang/ocaml-4:=
-DESCRIPTION=Unicode text normalization
-EAPI=7
-HOMEPAGE=https://erratique.ch/software/uunf https://github.com/dbuenzli/uunf
-KEYWORDS=amd64 x86
-LICENSE=ISC
-RDEPEND=dev-ml/topkg dev-ml/uutf dev-ml/cmdliner >=dev-lang/ocaml-4:=
-SLOT=0/13.0.0
-SRC_URI=https://erratique.ch/software/uunf/releases/uunf-13.0.0.tbz
-_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
-_md5_=a49772497db15effe484e157fa6b1c99
diff --git a/metadata/md5-cache/dev-ml/uunf-13.0.0-r1 b/metadata/md5-cache/dev-ml/uunf-13.0.0-r1
new file mode 100644
index 000000000000..36d3025e6269
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/uunf-13.0.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-ml/findlib dev-ml/opam-installer dev-lang/ocaml
+DEFINED_PHASES=compile install
+DEPEND=dev-ml/topkg:= dev-ml/uutf:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=
+DESCRIPTION=Unicode text normalization
+EAPI=7
+HOMEPAGE=https://erratique.ch/software/uunf https://github.com/dbuenzli/uunf
+KEYWORDS=amd64 x86
+LICENSE=ISC
+RDEPEND=dev-ml/topkg:= dev-ml/uutf:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=
+SLOT=0/13.0.0
+SRC_URI=https://erratique.ch/software/uunf/releases/uunf-13.0.0.tbz
+_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
+_md5_=b3f667a6fd9cb91f5cf7ef5206624e44
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.1 b/metadata/md5-cache/dev-ml/uutf-1.0.1
index de5570bb58bf..97d69cf0da72 100644
--- a/metadata/md5-cache/dev-ml/uutf-1.0.1
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.0.1
 SRC_URI=https://erratique.ch/software/uutf/releases/uutf-1.0.1.tbz
 _eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
-_md5_=7a9e33489e82758223d4b5bd464662e9
+_md5_=b72a59ff745e53a497a6f6fae92b0469
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.2 b/metadata/md5-cache/dev-ml/uutf-1.0.2
index 557b824c05cf..48dcb722a342 100644
--- a/metadata/md5-cache/dev-ml/uutf-1.0.2
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Non-blocking streaming Unicode codec for OCaml
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/uutf
 IUSE=doc utftrip +ocamlopt test ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= ) dev-lang/ocaml:=[ocamlopt?]
 REQUIRED_USE=utftrip? ( ocamlopt )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.0.2
 SRC_URI=https://erratique.ch/software/uutf/releases/uutf-1.0.2.tbz
 _eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
-_md5_=61b6cb20b849e15f57d1bced9960df83
+_md5_=56af5d49ed556b550cf02a59135d00e1
diff --git a/metadata/md5-cache/dev-perl/Alien-HDF4-0.50.0 b/metadata/md5-cache/dev-perl/Alien-HDF4-0.50.0
index 6c4543f571ab..e585d01887f3 100644
--- a/metadata/md5-cache/dev-perl/Alien-HDF4-0.50.0
+++ b/metadata/md5-cache/dev-perl/Alien-HDF4-0.50.0
@@ -5,11 +5,11 @@ DESCRIPTION=Encapsulate install info for HDF4
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Alien-HDF4
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sci-libs/hdf dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/Alien-HDF4-0.05.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=fc9159fef5765466a424fc7390adb3ea
+_md5_=0a059da8e8e8d30f8327ea8eb6673623
diff --git a/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r2 b/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r2
deleted file mode 100644
index c458edbb6384..000000000000
--- a/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Digest-SHA1-2.10.0 >=virtual/perl-Digest-MD5-2.2 >=dev-perl/DBI-1.30 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Authentication and Authorization via Perl's DBI
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Apache-DBI
-IUSE=test examples
-KEYWORDS=~alpha amd64 ppc ppc64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Digest-SHA1-2.10.0 >=virtual/perl-Digest-MD5-2.2 >=dev-perl/DBI-1.30 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Apache-DBI-1.12.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=430dab7eec14a710bc9f32fee90c0d67
diff --git a/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r3 b/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r3
new file mode 100644
index 000000000000..4de11cd0cd06
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Digest-SHA1-2.10.0 >=virtual/perl-Digest-MD5-2.200.0 >=dev-perl/DBI-1.300.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DESCRIPTION=Authentication and Authorization via Perl's DBI
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Apache-DBI
+IUSE=test examples
+KEYWORDS=~alpha amd64 ppc ppc64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Digest-SHA1-2.10.0 >=virtual/perl-Digest-MD5-2.200.0 >=dev-perl/DBI-1.300.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Apache-DBI-1.12.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=2f521b2cfe23b90fc4869afe305fb5fb
diff --git a/metadata/md5-cache/dev-perl/Apache-Reload-0.130.0-r1 b/metadata/md5-cache/dev-perl/Apache-Reload-0.130.0-r1
deleted file mode 100644
index 73e82dd8a5d7..000000000000
--- a/metadata/md5-cache/dev-perl/Apache-Reload-0.130.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=www-apache/mod_perl dev-perl/Apache-Test dev-lang/perl
-DESCRIPTION=Automatically reload changed modules without restarting Apache
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Apache-Reload
-KEYWORDS=amd64 ~arm ppc ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=www-apache/mod_perl dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/Apache-Reload-0.13.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=49b2575488bd4425afbc300fbe74f121
diff --git a/metadata/md5-cache/dev-perl/Apache-Reload-0.130.0-r2 b/metadata/md5-cache/dev-perl/Apache-Reload-0.130.0-r2
new file mode 100644
index 000000000000..c2dea02f8c41
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Apache-Reload-0.130.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=www-apache/mod_perl dev-perl/Apache-Test dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Automatically reload changed modules without restarting Apache
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Apache-Reload
+IUSE=test
+KEYWORDS=amd64 ~arm ppc ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=www-apache/mod_perl dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/Apache-Reload-0.13.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=77e4f5a6304ac66854714ee708e4efbe
diff --git a/metadata/md5-cache/dev-perl/Apache-Session-1.930.0-r1 b/metadata/md5-cache/dev-perl/Apache-Session-1.930.0-r1
deleted file mode 100644
index a7240f94381d..000000000000
--- a/metadata/md5-cache/dev-perl/Apache-Session-1.930.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Storable dev-perl/Module-Build test? ( >=dev-perl/Test-Deep-0.82.0 >=dev-perl/Test-Exception-0.150.0 >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Module-Build dev-lang/perl
-DESCRIPTION=A persistence framework for session data
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Apache-Session
-IUSE=test
-KEYWORDS=~alpha amd64 ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Storable dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.93.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=a546a62835cb3c33b0afa4e53210d947
diff --git a/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r2 b/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r2
index 7ffe0e3cdf09..9d28104f3bf3 100644
--- a/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r2
+++ b/metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Graceful exit for large children
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Apache-SizeLimit
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-perl/Linux-Pid !<www-apache/mod_perl-2.0.5 >=www-apache/mod_perl-2.0.5 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Apache-SizeLimit-0.97.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=d459ae1b57542a0baf9755944d0bfe55
+_md5_=8395ca12c53da9f4ff93fb38f444b21c
diff --git a/metadata/md5-cache/dev-perl/App-Cmd-0.331.0 b/metadata/md5-cache/dev-perl/App-Cmd-0.331.0
deleted file mode 100644
index 987251e405ae..000000000000
--- a/metadata/md5-cache/dev-perl/App-Cmd-0.331.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Capture-Tiny-0.130.0 virtual/perl-Carp >=dev-perl/Class-Load-0.60.0 dev-perl/Data-OptList >=virtual/perl-Getopt-Long-2.390.0 >=dev-perl/Getopt-Long-Descriptive-0.84.0 dev-perl/IO-TieCombine dev-perl/Module-Pluggable dev-perl/String-RewritePrefix dev-perl/Sub-Exporter dev-perl/Sub-Install virtual/perl-parent virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-IPC-Cmd dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
-DESCRIPTION=write command line apps with less suffering
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/App-Cmd
-IUSE=test minimal
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Capture-Tiny-0.130.0 virtual/perl-Carp >=dev-perl/Class-Load-0.60.0 dev-perl/Data-OptList >=virtual/perl-Getopt-Long-2.390.0 >=dev-perl/Getopt-Long-Descriptive-0.84.0 dev-perl/IO-TieCombine dev-perl/Module-Pluggable dev-perl/String-RewritePrefix dev-perl/Sub-Exporter dev-perl/Sub-Install virtual/perl-parent dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.331.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=485d2c601e1da12220815884d0ff2078
diff --git a/metadata/md5-cache/dev-perl/App-Cmd-0.334.0 b/metadata/md5-cache/dev-perl/App-Cmd-0.334.0
new file mode 100644
index 000000000000..61d8c440aca0
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/App-Cmd-0.334.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Capture-Tiny-0.130.0 virtual/perl-Carp >=dev-perl/Class-Load-0.60.0 dev-perl/Data-OptList >=virtual/perl-Getopt-Long-2.390.0 >=dev-perl/Getopt-Long-Descriptive-0.84.0 dev-perl/IO-TieCombine dev-perl/Module-Pluggable dev-perl/String-RewritePrefix dev-perl/Sub-Exporter dev-perl/Sub-Install virtual/perl-parent virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-IPC-Cmd dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Write command line apps with less suffering
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/App-Cmd
+IUSE=minimal test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Capture-Tiny-0.130.0 virtual/perl-Carp >=dev-perl/Class-Load-0.60.0 dev-perl/Data-OptList >=virtual/perl-Getopt-Long-2.390.0 >=dev-perl/Getopt-Long-Descriptive-0.84.0 dev-perl/IO-TieCombine dev-perl/Module-Pluggable dev-perl/String-RewritePrefix dev-perl/Sub-Exporter dev-perl/Sub-Install virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.334.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=7f20bbc3003c56ccd06bb33a41df490e
diff --git a/metadata/md5-cache/dev-perl/App-cpanminus-1.704.400 b/metadata/md5-cache/dev-perl/App-cpanminus-1.704.400
deleted file mode 100644
index b0d7859f2d79..000000000000
--- a/metadata/md5-cache/dev-perl/App-cpanminus-1.704.400
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Get, unpack, build and install modules from CPAN
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/App-cpanminus
-IUSE=test
-KEYWORDS=amd64 ~arm64 ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=36060c954db5aa8447fbf8804ba75580
diff --git a/metadata/md5-cache/dev-perl/App-cpanminus-1.704.400-r1 b/metadata/md5-cache/dev-perl/App-cpanminus-1.704.400-r1
new file mode 100644
index 000000000000..d09920695409
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/App-cpanminus-1.704.400-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Get, unpack, build and install modules from CPAN
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/App-cpanminus
+IUSE=test
+KEYWORDS=amd64 ~arm64 ppc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=19752f6a17e6b4ad713262770eb146e9
diff --git a/metadata/md5-cache/dev-perl/Archive-Extract-0.800.0 b/metadata/md5-cache/dev-perl/Archive-Extract-0.800.0
deleted file mode 100644
index e2982d2de7ef..000000000000
--- a/metadata/md5-cache/dev-perl/Archive-Extract-0.800.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-IPC-Cmd virtual/perl-Locale-Maketext-Simple virtual/perl-Module-Load-Conditional virtual/perl-Params-Check virtual/perl-if virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Generic archive extracting mechanism
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Archive-Extract
-IUSE=test
-KEYWORDS=amd64 ~hppa ~riscv x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-IPC-Cmd virtual/perl-Locale-Maketext-Simple virtual/perl-Module-Load-Conditional virtual/perl-Params-Check virtual/perl-if dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Archive-Extract-0.80.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=6bdab19ef2550e9a8931f0dc5bf8c985
diff --git a/metadata/md5-cache/dev-perl/Archive-Extract-0.880.0 b/metadata/md5-cache/dev-perl/Archive-Extract-0.880.0
new file mode 100644
index 000000000000..d547b3a04b07
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Archive-Extract-0.880.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-File-Path >=virtual/perl-File-Spec-0.820.0 >=virtual/perl-IPC-Cmd-0.640.0 virtual/perl-Locale-Maketext-Simple >=virtual/perl-Module-Load-Conditional-0.660.0 >=virtual/perl-Params-Check-0.70.0 virtual/perl-if virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Generic archive extracting mechanism
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Archive-Extract
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-File-Path >=virtual/perl-File-Spec-0.820.0 >=virtual/perl-IPC-Cmd-0.640.0 virtual/perl-Locale-Maketext-Simple >=virtual/perl-Module-Load-Conditional-0.660.0 >=virtual/perl-Params-Check-0.70.0 virtual/perl-if dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Archive-Extract-0.88.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=d76ee7755d6e26e1ce196a95b82403b9
diff --git a/metadata/md5-cache/dev-perl/Array-Compare-3.0.3 b/metadata/md5-cache/dev-perl/Array-Compare-3.0.3
deleted file mode 100644
index d1079a5f6267..000000000000
--- a/metadata/md5-cache/dev-perl/Array-Compare-3.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-perl/Module-Build-0.420.0 test? ( virtual/perl-Carp dev-perl/Moo dev-perl/Type-Tiny dev-perl/Test-NoWarnings ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Module-Build dev-lang/perl
-DESCRIPTION=Perl extension for comparing arrays
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Array-Compare
-IUSE=test
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp dev-perl/Moo dev-perl/Type-Tiny dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.3.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=780b91af3e1d7d78d5311533e070eb03
diff --git a/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.70.0-r1 b/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.70.0-r1
deleted file mode 100644
index fbc807538a4e..000000000000
--- a/metadata/md5-cache/dev-perl/Astro-FITS-Header-3.70.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-perl/Module-Build test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Module-Build dev-lang/perl
-DESCRIPTION=Interface to FITS headers
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Astro-FITS-Header
-IUSE=test
-KEYWORDS=amd64 arm ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/Astro-FITS-Header-3.07.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=0978d2f3a9f43dec87f8201bc7252386
diff --git a/metadata/md5-cache/dev-perl/AtExit-2.50.0 b/metadata/md5-cache/dev-perl/AtExit-2.50.0
new file mode 100644
index 000000000000..1030bee357aa
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/AtExit-2.50.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Capture-Tiny virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=atexit() function to register exit-callbacks
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/AtExit
+IUSE=test
+KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=Artistic
+RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JA/JANITOR/AtExit-2.05.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=09c7e746671c947f0751b0b7b7247b94
diff --git a/metadata/md5-cache/dev-perl/Authen-Radius-0.310.0 b/metadata/md5-cache/dev-perl/Authen-Radius-0.310.0
deleted file mode 100644
index fa4bda6e8231..000000000000
--- a/metadata/md5-cache/dev-perl/Authen-Radius-0.310.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-Data-Dumper-1.0.0 >=dev-perl/Data-HexDump-0.20.0 >=virtual/perl-Digest-MD5-2.200.0 >=virtual/perl-IO-1.120.0 >=dev-perl/Net-IP-1.260.0 >=virtual/perl-ExtUtils-MakeMaker-6.640.0 test? ( dev-perl/Test-NoWarnings virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Communicate with a Radius server from Perl
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Authen-Radius
-IUSE=test examples
-KEYWORDS=amd64 ~hppa ~sparc x86
-LICENSE=Artistic-2
-RDEPEND=>=virtual/perl-Data-Dumper-1.0.0 >=dev-perl/Data-HexDump-0.20.0 >=virtual/perl-Digest-MD5-2.200.0 >=virtual/perl-IO-1.120.0 >=dev-perl/Net-IP-1.260.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.31.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=451227a6c81ddd9728c9608f3b058d83
diff --git a/metadata/md5-cache/dev-perl/Authen-SASL-SASLprep-1.100.0 b/metadata/md5-cache/dev-perl/Authen-SASL-SASLprep-1.100.0
deleted file mode 100644
index eba2de38ae15..000000000000
--- a/metadata/md5-cache/dev-perl/Authen-SASL-SASLprep-1.100.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Unicode-Stringprep-1 >=dev-perl/Module-Build-0.420.0 test? ( virtual/perl-Test-Simple dev-perl/Test-NoWarnings ) dev-lang/perl
-DESCRIPTION=A Stringprep Profile for User Names and Passwords (RFC 4013)
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Authen-SASL-SASLprep
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Unicode-Stringprep-1 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Authen-SASL-SASLprep-1.100.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=91a636223ac0512e0d74cc2d195e533b
diff --git a/metadata/md5-cache/dev-perl/Authen-SASL-SASLprep-1.100.0-r1 b/metadata/md5-cache/dev-perl/Authen-SASL-SASLprep-1.100.0-r1
new file mode 100644
index 000000000000..f372ffa6f062
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Authen-SASL-SASLprep-1.100.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Unicode-Stringprep-1 >=dev-perl/Module-Build-0.420.0 test? ( virtual/perl-Test-Simple dev-perl/Test-NoWarnings ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A Stringprep Profile for User Names and Passwords (RFC 4013)
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Authen-SASL-SASLprep
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Unicode-Stringprep-1 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Authen-SASL-SASLprep-1.100.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=1d65f58e0ce58ac11f17e8fd065ebef9
diff --git a/metadata/md5-cache/dev-perl/Authen-Simple-0.500.0 b/metadata/md5-cache/dev-perl/Authen-Simple-0.500.0
deleted file mode 100644
index a80eff325b0b..000000000000
--- a/metadata/md5-cache/dev-perl/Authen-Simple-0.500.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable dev-perl/Crypt-PasswdMD5 virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-MIME-Base64 dev-perl/Params-Validate >=virtual/perl-ExtUtils-MakeMaker-6.360.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Simple Authentication
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Authen-Simple
-IUSE=test
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable dev-perl/Crypt-PasswdMD5 virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-MIME-Base64 dev-perl/Params-Validate dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-0.5.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=3b02ad7a2480451f48630f41db827dfc
diff --git a/metadata/md5-cache/dev-perl/Authen-Simple-0.500.0-r1 b/metadata/md5-cache/dev-perl/Authen-Simple-0.500.0-r1
new file mode 100644
index 000000000000..87917e7d1fec
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Authen-Simple-0.500.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable dev-perl/Crypt-PasswdMD5 virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-MIME-Base64 dev-perl/Params-Validate >=virtual/perl-ExtUtils-MakeMaker-6.360.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Simple Authentication
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Authen-Simple
+IUSE=test
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable dev-perl/Crypt-PasswdMD5 virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-MIME-Base64 dev-perl/Params-Validate dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-0.5.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=8cb8d87972d4cba1685e7cf0b05bb543
diff --git a/metadata/md5-cache/dev-perl/Authen-Simple-Passwd-0.600.0 b/metadata/md5-cache/dev-perl/Authen-Simple-Passwd-0.600.0
deleted file mode 100644
index 4a11f7e01ef7..000000000000
--- a/metadata/md5-cache/dev-perl/Authen-Simple-Passwd-0.600.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Authen-Simple-0.300.0 virtual/perl-IO dev-perl/Module-Build dev-lang/perl
-DESCRIPTION=Simple Passwd authentication
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Authen-Simple-Passwd
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Authen-Simple-0.300.0 virtual/perl-IO dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-Passwd-0.6.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=786a66d6a8673f56677c84a5daf3946c
diff --git a/metadata/md5-cache/dev-perl/Authen-Simple-Passwd-0.600.0-r1 b/metadata/md5-cache/dev-perl/Authen-Simple-Passwd-0.600.0-r1
new file mode 100644
index 000000000000..de88a8a47e8a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Authen-Simple-Passwd-0.600.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Authen-Simple-0.300.0 virtual/perl-IO dev-perl/Module-Build dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Simple Passwd authentication
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Authen-Simple-Passwd
+IUSE=test
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Authen-Simple-0.300.0 virtual/perl-IO dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-Passwd-0.6.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=9eb42875ed4ea7e572a51ac8a0d7173d
diff --git a/metadata/md5-cache/dev-perl/B-Debug-1.260.0 b/metadata/md5-cache/dev-perl/B-Debug-1.260.0
deleted file mode 100644
index 3a9a0657b0ac..000000000000
--- a/metadata/md5-cache/dev-perl/B-Debug-1.260.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!minimal? ( >=dev-perl/B-Flags-0.40.0 ) >=dev-lang/perl-5.19.2 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Walk Perl syntax tree, printing debug info about ops
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/B-Debug
-IUSE=test minimal
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=!minimal? ( >=dev-perl/B-Flags-0.40.0 ) >=dev-lang/perl-5.19.2 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/B-Debug-1.26.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=60f53878b044a17b0f2b1f20563fc943
diff --git a/metadata/md5-cache/dev-perl/B-Debug-1.260.0-r1 b/metadata/md5-cache/dev-perl/B-Debug-1.260.0-r1
new file mode 100644
index 000000000000..ce7f91ca2d0d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/B-Debug-1.260.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=!minimal? ( >=dev-perl/B-Flags-0.40.0 ) >=dev-lang/perl-5.19.2 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Walk Perl syntax tree, printing debug info about ops
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/B-Debug
+IUSE=minimal test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!minimal? ( >=dev-perl/B-Flags-0.40.0 ) >=dev-lang/perl-5.19.2 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/B-Debug-1.26.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=fa23893381e73f1f5e19dfd306a10d1f
diff --git a/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0 b/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0
deleted file mode 100644
index e0c4661833b5..000000000000
--- a/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Module-Implementation-0.50.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-Progressive-0.1.6 >=dev-perl/Variable-Magic-0.480.0 virtual/perl-ExtUtils-MakeMaker virtual/perl-Text-ParseWords test? ( >=virtual/perl-CPAN-Meta-2.120.900 virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl
-DESCRIPTION=Execute code after a scope finished compilation
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/B-Hooks-EndOfScope
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Module-Implementation-0.50.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-Progressive-0.1.6 >=dev-perl/Variable-Magic-0.480.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.24.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=9d6e27ed3d66d3cd38862638938c902e
diff --git a/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0-r1 b/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0-r1
new file mode 100644
index 000000000000..8b4d38efcb32
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.240.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Module-Implementation-0.50.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-Progressive-0.1.6 >=dev-perl/Variable-Magic-0.480.0 virtual/perl-ExtUtils-MakeMaker virtual/perl-Text-ParseWords test? ( >=virtual/perl-CPAN-Meta-2.120.900 virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Execute code after a scope finished compilation
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/B-Hooks-EndOfScope
+IUSE=test
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Module-Implementation-0.50.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-Progressive-0.1.6 >=dev-perl/Variable-Magic-0.480.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.24.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=f3693d0887e04fe0167bd591ef22c7ce
diff --git a/metadata/md5-cache/dev-perl/B-Keywords-1.210.0 b/metadata/md5-cache/dev-perl/B-Keywords-1.210.0
deleted file mode 100644
index dee2c6b6776b..000000000000
--- a/metadata/md5-cache/dev-perl/B-Keywords-1.210.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Lists of reserved barewords and symbol names
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/B-Keywords
-KEYWORDS=~alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.21.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=8ed3942f602cafa4d60ede589c742587
diff --git a/metadata/md5-cache/dev-perl/BZ-Client-4.400.300 b/metadata/md5-cache/dev-perl/BZ-Client-4.400.300
deleted file mode 100644
index e58ca149db87..000000000000
--- a/metadata/md5-cache/dev-perl/BZ-Client-4.400.300
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-perl/DateTime-Format-ISO8601 dev-perl/DateTime-Format-Strptime dev-perl/DateTime-TimeZone virtual/perl-Encode virtual/perl-File-Spec dev-perl/HTTP-CookieJar virtual/perl-HTTP-Tiny virtual/perl-MIME-Base64 dev-perl/URI dev-perl/XML-Parser dev-perl/XML-Writer virtual/perl-parent >=dev-perl/Module-Build-0.280.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-CPAN-Meta-2.120.900 dev-perl/Clone virtual/perl-Data-Dumper dev-perl/DateTime dev-perl/IO-Socket-SSL dev-perl/Test-RequiresInternet virtual/perl-Test-Simple dev-perl/Text-Password-Pronounceable ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Module-Build dev-lang/perl
-DESCRIPTION=A client for the Bugzilla web services API.
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/BZ-Client
-IUSE=test examples
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/DateTime-Format-ISO8601 dev-perl/DateTime-Format-Strptime dev-perl/DateTime-TimeZone virtual/perl-Encode virtual/perl-File-Spec dev-perl/HTTP-CookieJar virtual/perl-HTTP-Tiny virtual/perl-MIME-Base64 dev-perl/URI dev-perl/XML-Parser dev-perl/XML-Writer virtual/perl-parent dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DJ/DJZORT/BZ-Client-4.4003.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=bf70d7c23f01650e488521ea98e6a272
diff --git a/metadata/md5-cache/dev-perl/Benchmark-Timer-0.711.200 b/metadata/md5-cache/dev-perl/Benchmark-Timer-0.711.200
deleted file mode 100644
index 1e979b8c5483..000000000000
--- a/metadata/md5-cache/dev-perl/Benchmark-Timer-0.711.200
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Statistics-TTest virtual/perl-Time-HiRes >=virtual/perl-ExtUtils-MakeMaker-6.360.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Perl code benchmarking tool
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Benchmark-Timer
-IUSE=test examples
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Statistics-TTest virtual/perl-Time-HiRes dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DC/DCOPPIT/Benchmark-Timer-0.7112.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=86e893ac0ada99c1adaa811defa92eec
diff --git a/metadata/md5-cache/dev-perl/Benchmark-Timer-0.711.200-r1 b/metadata/md5-cache/dev-perl/Benchmark-Timer-0.711.200-r1
new file mode 100644
index 000000000000..6efbef3827fb
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Benchmark-Timer-0.711.200-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Statistics-TTest virtual/perl-Time-HiRes >=virtual/perl-ExtUtils-MakeMaker-6.360.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl code benchmarking tool
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Benchmark-Timer
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-perl/Statistics-TTest virtual/perl-Time-HiRes dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DC/DCOPPIT/Benchmark-Timer-0.7112.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=821214324c9de1fec653f03b82432882
diff --git a/metadata/md5-cache/dev-perl/Bio-ASN1-EntrezGene-1.730.0 b/metadata/md5-cache/dev-perl/Bio-ASN1-EntrezGene-1.730.0
index fa222be3f868..ec5be1f39a67 100644
--- a/metadata/md5-cache/dev-perl/Bio-ASN1-EntrezGene-1.730.0
+++ b/metadata/md5-cache/dev-perl/Bio-ASN1-EntrezGene-1.730.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/perl-Carp virtual/perl-parent >=sci-biology/bioperl-1.6.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-IO virtual/perl-Test-Simple ) dev-lang/perl
+BDEPEND=virtual/perl-Carp virtual/perl-parent >=sci-biology/bioperl-1.6.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-IO virtual/perl-Test-Simple dev-perl/Test-Exception ) dev-lang/perl
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-lang/perl
 DESCRIPTION=Regular expression-based Perl Parser for NCBI Entrez Gene
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/Bio-ASN1-EntrezGene-1.73.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=6424b822215011235ad1d399e11e61fb
+_md5_=d9672da3382be0500753952291277b10
diff --git a/metadata/md5-cache/dev-perl/Bio-Das-1.170.0-r2 b/metadata/md5-cache/dev-perl/Bio-Das-1.170.0-r2
deleted file mode 100644
index 11b1ec8857f6..000000000000
--- a/metadata/md5-cache/dev-perl/Bio-Das-1.170.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-IO-Compress-1.0 sci-biology/bioperl >=dev-perl/HTML-Parser-3 >=dev-perl/libwww-perl-5 >=virtual/perl-MIME-Base64-2.12 dev-lang/perl
-DESCRIPTION=Interface to Distributed Annotation System
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Bio-Das
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-IO-Compress-1.0 sci-biology/bioperl >=dev-perl/HTML-Parser-3 >=dev-perl/libwww-perl-5 >=virtual/perl-MIME-Base64-2.12 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Bio-Das-1.17.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=338250dd3c6dbfef965b3b0ef5dcc39e
diff --git a/metadata/md5-cache/dev-perl/Bio-Das-1.170.0-r3 b/metadata/md5-cache/dev-perl/Bio-Das-1.170.0-r3
new file mode 100644
index 000000000000..2c0a87670b53
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Bio-Das-1.170.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-IO-Compress-1.0 sci-biology/bioperl >=dev-perl/HTML-Parser-3 >=dev-perl/libwww-perl-5 >=virtual/perl-MIME-Base64-2.12 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Interface to Distributed Annotation System
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Bio-Das
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-IO-Compress-1.0 sci-biology/bioperl >=dev-perl/HTML-Parser-3 >=dev-perl/libwww-perl-5 >=virtual/perl-MIME-Base64-2.12 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Bio-Das-1.17.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=780d5629abe8706ee9809d5017dde91e
diff --git a/metadata/md5-cache/dev-perl/Boulder-1.300.0-r2 b/metadata/md5-cache/dev-perl/Boulder-1.300.0-r2
deleted file mode 100644
index 227a5587bff5..000000000000
--- a/metadata/md5-cache/dev-perl/Boulder-1.300.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=genbank? ( dev-perl/CGI ) store? ( virtual/perl-DB_File ) xml? ( dev-perl/XML-Parser ) virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=An API for hierarchical tag/value structures
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Boulder
-IUSE=genbank store xml examples
-KEYWORDS=amd64 ~ia64 ~ppc sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=genbank? ( dev-perl/CGI ) store? ( virtual/perl-DB_File ) xml? ( dev-perl/XML-Parser ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Boulder-1.30.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=f7ec61b624cb637b9b949c53ec08fe05
diff --git a/metadata/md5-cache/dev-perl/Boulder-1.300.0-r3 b/metadata/md5-cache/dev-perl/Boulder-1.300.0-r3
new file mode 100644
index 000000000000..efd291bdcd86
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Boulder-1.300.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=genbank? ( dev-perl/CGI ) store? ( virtual/perl-DB_File ) xml? ( dev-perl/XML-Parser ) virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=An API for hierarchical tag/value structures
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Boulder
+IUSE=genbank store xml test examples
+KEYWORDS=amd64 ~ia64 ~ppc sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=genbank? ( dev-perl/CGI ) store? ( virtual/perl-DB_File ) xml? ( dev-perl/XML-Parser ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Boulder-1.30.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=e5529e33602e6781b07ba968eaed3321
diff --git a/metadata/md5-cache/dev-perl/Browser-Open-0.40.0 b/metadata/md5-cache/dev-perl/Browser-Open-0.40.0
deleted file mode 100644
index 4352c04288fe..000000000000
--- a/metadata/md5-cache/dev-perl/Browser-Open-0.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.920.0 ) dev-lang/perl
-DESCRIPTION=Open a browser at a given URL
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Browser-Open
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CF/CFRANKS/Browser-Open-0.04.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=a7e4e7f142a5aba9e56fe3df5d96dc81
diff --git a/metadata/md5-cache/dev-perl/Browser-Open-0.40.0-r1 b/metadata/md5-cache/dev-perl/Browser-Open-0.40.0-r1
new file mode 100644
index 000000000000..b44b09903e58
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Browser-Open-0.40.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.920.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Open a browser at a given URL
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Browser-Open
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CF/CFRANKS/Browser-Open-0.04.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=5a6c4145210d9ca8a27842493b84b0ec
diff --git a/metadata/md5-cache/dev-perl/Business-Hours-0.130.0 b/metadata/md5-cache/dev-perl/Business-Hours-0.130.0
deleted file mode 100644
index 77e5bb2a4b1b..000000000000
--- a/metadata/md5-cache/dev-perl/Business-Hours-0.130.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Set-IntSpan-1.120.0 virtual/perl-Time-Local virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Calculate business hours in a time period
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Business-Hours
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Set-IntSpan-1.120.0 virtual/perl-Time-Local dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BP/BPS/Business-Hours-0.13.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=5c92588e1c3ac5218a372133e9e7b124
diff --git a/metadata/md5-cache/dev-perl/Business-Hours-0.130.0-r1 b/metadata/md5-cache/dev-perl/Business-Hours-0.130.0-r1
new file mode 100644
index 000000000000..c50da19e217f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Business-Hours-0.130.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Set-IntSpan-1.120.0 virtual/perl-Time-Local virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Calculate business hours in a time period
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Business-Hours
+IUSE=test
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Set-IntSpan-1.120.0 virtual/perl-Time-Local dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BP/BPS/Business-Hours-0.13.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=afab4c73ff33a5a67997e8496603ea71
diff --git a/metadata/md5-cache/dev-perl/Business-ISBN-Data-20191107.0.0 b/metadata/md5-cache/dev-perl/Business-ISBN-Data-20191107.0.0
deleted file mode 100644
index 554c3fb439ad..000000000000
--- a/metadata/md5-cache/dev-perl/Business-ISBN-Data-20191107.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-File-Spec >=virtual/perl-ExtUtils-MakeMaker-6.640.0 test? ( >=virtual/perl-Test-Simple-0.950.0 ) dev-lang/perl
-DESCRIPTION=Data pack for Business::ISBN
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Business-ISBN-Data
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=Artistic-2
-RDEPEND=virtual/perl-Carp virtual/perl-File-Spec dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20191107.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=326ec22b9aa9e641c7840bbc4a473b2d
diff --git a/metadata/md5-cache/dev-perl/Business-ISMN-1.201.0 b/metadata/md5-cache/dev-perl/Business-ISMN-1.201.0
deleted file mode 100644
index 18f979369404..000000000000
--- a/metadata/md5-cache/dev-perl/Business-ISMN-1.201.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-perl/Tie-Cycle-1.210.0 virtual/perl-Scalar-List-Utils >=virtual/perl-ExtUtils-MakeMaker-6.640.0 virtual/perl-File-Spec test? ( >=virtual/perl-Test-Simple-0.950.0 ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=International Standard Music Numbers
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Business-ISMN
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=Artistic-2
-RDEPEND=>=dev-perl/Tie-Cycle-1.210.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.201.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=08d7e16acf480dc9bf37dfb0d74c7332
diff --git a/metadata/md5-cache/dev-perl/Business-Tax-VAT-Validation-1.120.0 b/metadata/md5-cache/dev-perl/Business-Tax-VAT-Validation-1.120.0
deleted file mode 100644
index 51f519bfa404..000000000000
--- a/metadata/md5-cache/dev-perl/Business-Tax-VAT-Validation-1.120.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-perl/HTTP-Message-1.0.0 >=dev-perl/libwww-perl-1.0.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=A class for european VAT numbers validation
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Business-Tax-VAT-Validation
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-perl/HTTP-Message-1.0.0 >=dev-perl/libwww-perl-1.0.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BI/BIGPRESH/Business-Tax-VAT-Validation-1.12.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=60cad03b28bc392b2df132fc46884ff3
diff --git a/metadata/md5-cache/dev-perl/Business-UPS-2.10.0-r2 b/metadata/md5-cache/dev-perl/Business-UPS-2.10.0-r2
deleted file mode 100644
index 14510aec4af5..000000000000
--- a/metadata/md5-cache/dev-perl/Business-UPS-2.10.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-perl/libwww-perl virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=A UPS Interface Module
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Business-UPS
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/libwww-perl dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Business-UPS-2.01.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=6fddb9d3811cb690d47498dae9258f23
diff --git a/metadata/md5-cache/dev-perl/CBOR-XS-1.710.0-r1 b/metadata/md5-cache/dev-perl/CBOR-XS-1.710.0-r1
deleted file mode 100644
index 3ac1e8a3ba9a..000000000000
--- a/metadata/md5-cache/dev-perl/CBOR-XS-1.710.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Types-Serialiser dev-perl/common-sense dev-perl/Canary-Stability >=virtual/perl-ExtUtils-MakeMaker-6.520.0 dev-lang/perl
-DESCRIPTION=Concise Binary Object Representation (CBOR, RFC7049)
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/CBOR-XS
-IUSE=test
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3 || ( GPL-2+ BSD )
-RDEPEND=dev-perl/Types-Serialiser dev-perl/common-sense dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/CBOR-XS-1.71.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=3c58712aec21b45d35b4222dc48154e4
diff --git a/metadata/md5-cache/dev-perl/CDB_File-1.20.0-r1 b/metadata/md5-cache/dev-perl/CDB_File-1.20.0-r1
deleted file mode 100644
index 11339dc2cc3c..000000000000
--- a/metadata/md5-cache/dev-perl/CDB_File-1.20.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/B-COW virtual/perl-File-Temp virtual/perl-Test-Simple ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Tie to CDB (Bernstein's constant DB) files
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/CDB_File
-IUSE=test examples
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/CDB_File-1.02.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=a1b476046a284219ea123300c8d5a71a
diff --git a/metadata/md5-cache/dev-perl/CDDB-1.222.0-r2 b/metadata/md5-cache/dev-perl/CDDB-1.222.0-r2
deleted file mode 100644
index 771dac995c28..000000000000
--- a/metadata/md5-cache/dev-perl/CDDB-1.222.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( >=virtual/perl-Carp-1.260.0 >=virtual/perl-Encode-2.510.0 >=virtual/perl-IO-1.310.0 >=virtual/perl-MIME-Base64-3.130.0 >=virtual/perl-Scalar-List-Utils-1.290.0 >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl
-DESCRIPTION=high-level interface to cddb/freedb protocol
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/CDDB
-IUSE=test examples
-KEYWORDS=amd64 ~ia64 ppc sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Carp-1.260.0 >=virtual/perl-Encode-2.510.0 >=virtual/perl-IO-1.310.0 >=virtual/perl-MIME-Base64-3.130.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/CDDB-1.222.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=7e7ca8f4ef40234172560777bb1f26cd
diff --git a/metadata/md5-cache/dev-perl/CDDB-1.222.0-r3 b/metadata/md5-cache/dev-perl/CDDB-1.222.0-r3
new file mode 100644
index 000000000000..4a7b7fa3aec1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CDDB-1.222.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( >=virtual/perl-Carp-1.260.0 >=virtual/perl-Encode-2.510.0 >=virtual/perl-IO-1.310.0 >=virtual/perl-MIME-Base64-3.130.0 >=virtual/perl-Scalar-List-Utils-1.290.0 >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=high-level interface to cddb/freedb protocol
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/CDDB
+IUSE=test examples
+KEYWORDS=amd64 ~ia64 ppc sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Carp-1.260.0 >=virtual/perl-Encode-2.510.0 >=virtual/perl-IO-1.310.0 >=virtual/perl-MIME-Base64-3.130.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/CDDB-1.222.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=6d4083f76d9e553f3cf5578b92bda571
diff --git a/metadata/md5-cache/dev-perl/CGI-4.470.0 b/metadata/md5-cache/dev-perl/CGI-4.470.0
deleted file mode 100644
index 61c03d006138..000000000000
--- a/metadata/md5-cache/dev-perl/CGI-4.470.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=virtual/perl-File-Spec-0.820.0 >=virtual/perl-File-Temp-0.170.0 >=dev-perl/HTML-Parser-3.690.0 virtual/perl-if >=virtual/perl-parent-0.225.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-IO >=dev-perl/Test-Deep-0.110.0 dev-perl/Test-NoWarnings >=virtual/perl-Test-Simple-0.980.0 >=dev-perl/Test-Warn-0.300.0 ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Simple Common Gateway Interface Class
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/CGI
-IUSE=test examples
-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
-LICENSE=Artistic-2
-RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=virtual/perl-File-Spec-0.820.0 >=virtual/perl-File-Temp-0.170.0 >=dev-perl/HTML-Parser-3.690.0 virtual/perl-if >=virtual/perl-parent-0.225.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.47.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=f10325d886be439900a2ede20b64f3d0
diff --git a/metadata/md5-cache/dev-perl/CGI-4.530.0 b/metadata/md5-cache/dev-perl/CGI-4.530.0
new file mode 100644
index 000000000000..9ee16ff6099f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CGI-4.530.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=virtual/perl-File-Spec-0.820.0 >=virtual/perl-File-Temp-0.170.0 >=dev-perl/HTML-Parser-3.690.0 virtual/perl-if >=virtual/perl-parent-0.225.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-IO >=dev-perl/Test-Deep-0.110.0 dev-perl/Test-NoWarnings >=virtual/perl-Test-Simple-0.980.0 >=dev-perl/Test-Warn-0.300.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Simple Common Gateway Interface Class
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/CGI
+IUSE=test examples
+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
+LICENSE=Artistic-2
+RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=virtual/perl-File-Spec-0.820.0 >=virtual/perl-File-Temp-0.170.0 >=dev-perl/HTML-Parser-3.690.0 virtual/perl-if >=virtual/perl-parent-0.225.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.53.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=cad113c5c9ccab3c68fe6af7a4eda432
diff --git a/metadata/md5-cache/dev-perl/CGI-Builder-1.360.0-r2 b/metadata/md5-cache/dev-perl/CGI-Builder-1.360.0-r2
deleted file mode 100644
index d247b6627e61..000000000000
--- a/metadata/md5-cache/dev-perl/CGI-Builder-1.360.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/OOTools-2.21 >=dev-perl/IO-Util-1.5 dev-perl/CGI dev-lang/perl
-DESCRIPTION=Framework to build simple or complex web-apps
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/CGI-Builder
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/OOTools-2.21 >=dev-perl/IO-Util-1.5 dev-perl/CGI dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DO/DOMIZIO/CGI-Builder-1.36.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=e63bd1109beeccdfb1cd3cf1aa9faca0
diff --git a/metadata/md5-cache/dev-perl/CGI-Builder-1.360.0-r3 b/metadata/md5-cache/dev-perl/CGI-Builder-1.360.0-r3
new file mode 100644
index 000000000000..292175fefda3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CGI-Builder-1.360.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/OOTools-2.210.0 >=dev-perl/IO-Util-1.500.0 dev-perl/CGI dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Framework to build simple or complex web-apps
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/CGI-Builder
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/OOTools-2.210.0 >=dev-perl/IO-Util-1.500.0 dev-perl/CGI dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DO/DOMIZIO/CGI-Builder-1.36.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=7b8685d6d37279d01d49ae3fb9d1ff40
diff --git a/metadata/md5-cache/dev-perl/CGI-Compile-0.240.0 b/metadata/md5-cache/dev-perl/CGI-Compile-0.240.0
deleted file mode 100644
index 6604d8f25294..000000000000
--- a/metadata/md5-cache/dev-perl/CGI-Compile-0.240.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-perl/File-pushd dev-perl/Sub-Name >=dev-perl/Module-Build-Tiny-0.34.0 test? ( dev-perl/CGI dev-perl/Capture-Tiny dev-perl/Sub-Identify dev-perl/Switch dev-perl/Test-NoWarnings dev-perl/Test-Requires virtual/perl-Test-Simple dev-perl/Try-Tiny ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Module-Build-Tiny dev-lang/perl
-DESCRIPTION=Compile .cgi scripts to a code reference like ModPerl::Registry
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/CGI-Compile
-IUSE=test
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/File-pushd dev-perl/Sub-Name dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RK/RKITOVER/CGI-Compile-0.24.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=5f37a26d949f9a3cec17777de78fd4c2
diff --git a/metadata/md5-cache/dev-perl/CGI-Emulate-PSGI-0.230.0 b/metadata/md5-cache/dev-perl/CGI-Emulate-PSGI-0.230.0
deleted file mode 100644
index 27c79f7dce63..000000000000
--- a/metadata/md5-cache/dev-perl/CGI-Emulate-PSGI-0.230.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/CGI-3.630.0 dev-perl/HTTP-Message virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 >=dev-perl/Test-Requires-0.80.0 ) dev-lang/perl
-DESCRIPTION=PSGI adapter for CGI
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/CGI-Emulate-PSGI
-IUSE=test
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/CGI-3.630.0 dev-perl/HTTP-Message dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/CGI-Emulate-PSGI-0.23.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=065c46bfd35519aca4e9c2b597ed70b6
diff --git a/metadata/md5-cache/dev-perl/CGI-Emulate-PSGI-0.230.0-r1 b/metadata/md5-cache/dev-perl/CGI-Emulate-PSGI-0.230.0-r1
new file mode 100644
index 000000000000..f9b9bfb1d6cd
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CGI-Emulate-PSGI-0.230.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/CGI-3.630.0 dev-perl/HTTP-Message virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 >=dev-perl/Test-Requires-0.80.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=PSGI adapter for CGI
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/CGI-Emulate-PSGI
+IUSE=test
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/CGI-3.630.0 dev-perl/HTTP-Message dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/CGI-Emulate-PSGI-0.23.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=36eeea660e5d7d42f2b2334b043e67b6
diff --git a/metadata/md5-cache/dev-perl/CGI-Fast-2.160.0 b/metadata/md5-cache/dev-perl/CGI-Fast-2.160.0
new file mode 100644
index 000000000000..3be8a3e06f84
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CGI-Fast-2.160.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/CGI-4 virtual/perl-Carp >=dev-perl/FCGI-0.670.0 virtual/perl-if virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Temp virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=CGI Interface for Fast CGI
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/CGI-Fast
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/CGI-4 virtual/perl-Carp >=dev-perl/FCGI-0.670.0 virtual/perl-if dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.16.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=29be8d1891c85aff649b56bd178a79b0
diff --git a/metadata/md5-cache/dev-perl/CGI-FastTemplate-1.90.0-r2 b/metadata/md5-cache/dev-perl/CGI-FastTemplate-1.90.0-r2
deleted file mode 100644
index 410e00421820..000000000000
--- a/metadata/md5-cache/dev-perl/CGI-FastTemplate-1.90.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=High Performance Templates and Variable Interpolation
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/CGI-FastTemplate
-KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JM/JMOORE/CGI-FastTemplate-1.09.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=32db40686ea6543a9d1d7bcba484f9d6
diff --git a/metadata/md5-cache/dev-perl/CGI-FastTemplate-1.90.0-r3 b/metadata/md5-cache/dev-perl/CGI-FastTemplate-1.90.0-r3
new file mode 100644
index 000000000000..05e70c4f4e90
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CGI-FastTemplate-1.90.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=High Performance Templates and Variable Interpolation
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/CGI-FastTemplate
+IUSE=test
+KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JM/JMOORE/CGI-FastTemplate-1.09.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=d018e665b328545bdc4a040d2e22945c
diff --git a/metadata/md5-cache/dev-perl/CPAN-Checksums-2.120.0 b/metadata/md5-cache/dev-perl/CPAN-Checksums-2.120.0
deleted file mode 100644
index fd90b3b014f3..000000000000
--- a/metadata/md5-cache/dev-perl/CPAN-Checksums-2.120.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Compress-Bzip2 dev-perl/Data-Compare virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.360.0 virtual/perl-Digest-SHA virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-IO virtual/perl-IO-Compress virtual/perl-Safe virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Path virtual/perl-Test-Simple virtual/perl-Time-HiRes ) dev-lang/perl
-DESCRIPTION=Write a CHECKSUMS file for a directory as on CPAN
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/CPAN-Checksums
-IUSE=test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Compress-Bzip2 dev-perl/Data-Compare virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.360.0 virtual/perl-Digest-SHA virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-IO virtual/perl-IO-Compress virtual/perl-Safe dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AN/ANDK/CPAN-Checksums-2.12.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=97cca8ae100da0c4c9e7f65823e2186e
diff --git a/metadata/md5-cache/dev-perl/CPAN-Checksums-2.120.0-r1 b/metadata/md5-cache/dev-perl/CPAN-Checksums-2.120.0-r1
new file mode 100644
index 000000000000..6c277b17851c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CPAN-Checksums-2.120.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Compress-Bzip2 dev-perl/Data-Compare virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.360.0 virtual/perl-Digest-SHA virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-IO virtual/perl-IO-Compress virtual/perl-Safe virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Path virtual/perl-Test-Simple virtual/perl-Time-HiRes ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Write a CHECKSUMS file for a directory as on CPAN
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/CPAN-Checksums
+IUSE=test
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Compress-Bzip2 dev-perl/Data-Compare virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.360.0 virtual/perl-Digest-SHA virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-IO virtual/perl-IO-Compress virtual/perl-Safe dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AN/ANDK/CPAN-Checksums-2.12.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=6afe3e3b6942233cba8d3d246d34a2d1
diff --git a/metadata/md5-cache/dev-perl/CPAN-DistnameInfo-0.120.0-r2 b/metadata/md5-cache/dev-perl/CPAN-DistnameInfo-0.120.0-r2
deleted file mode 100644
index d4c718fbc50e..000000000000
--- a/metadata/md5-cache/dev-perl/CPAN-DistnameInfo-0.120.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Extract distribution name and version from a distribution filename
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/CPAN-DistnameInfo
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/CPAN-DistnameInfo-0.12.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=026d6f82ee5d4cca4af824be674876ce
diff --git a/metadata/md5-cache/dev-perl/CPAN-DistnameInfo-0.120.0-r3 b/metadata/md5-cache/dev-perl/CPAN-DistnameInfo-0.120.0-r3
new file mode 100644
index 000000000000..9d2e9b10b5d4
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CPAN-DistnameInfo-0.120.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Extract distribution name and version from a distribution filename
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/CPAN-DistnameInfo
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/CPAN-DistnameInfo-0.12.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=f5ae43f971bda8bd0ecd7660a3fc9447
diff --git a/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0 b/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0
deleted file mode 100644
index 96424cad722f..000000000000
--- a/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-CPAN-Meta-2.132.830 >=virtual/perl-CPAN-Meta-Requirements-2.121.0 virtual/perl-Exporter >=virtual/perl-Module-Metadata-1.0.23 >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl
-DESCRIPTION=Verify requirements in a CPAN::Meta object
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/CPAN-Meta-Check
-IUSE=test
-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
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-CPAN-Meta-2.132.830 >=virtual/perl-CPAN-Meta-Requirements-2.121.0 virtual/perl-Exporter >=virtual/perl-Module-Metadata-1.0.23 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=d9b11996d7e8deba1faf8dcdaf1e713f
diff --git a/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0-r1 b/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0-r1
new file mode 100644
index 000000000000..f0d44c80a895
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-CPAN-Meta-2.132.830 >=virtual/perl-CPAN-Meta-Requirements-2.121.0 virtual/perl-Exporter >=virtual/perl-Module-Metadata-1.0.23 >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Verify requirements in a CPAN::Meta object
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/CPAN-Meta-Check
+IUSE=test
+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
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-CPAN-Meta-2.132.830 >=virtual/perl-CPAN-Meta-Requirements-2.121.0 virtual/perl-Exporter >=virtual/perl-Module-Metadata-1.0.23 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=675c85bd51c686b2db7ae2ebf16175ec
diff --git a/metadata/md5-cache/dev-perl/CPAN-Mini-1.111.16 b/metadata/md5-cache/dev-perl/CPAN-Mini-1.111.16
deleted file mode 100644
index 5d7876bd9bb8..000000000000
--- a/metadata/md5-cache/dev-perl/CPAN-Mini-1.111.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp >=dev-perl/File-HomeDir-0.570.0 >=virtual/perl-File-Path-2.40.0 virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long >=virtual/perl-IO-Compress-1.20 >=dev-perl/libwww-perl-5 >=dev-perl/URI-1 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
-DESCRIPTION=Create a minimal mirror of CPAN
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/CPAN-Mini
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp >=dev-perl/File-HomeDir-0.570.0 >=virtual/perl-File-Path-2.40.0 virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long >=virtual/perl-IO-Compress-1.20 >=dev-perl/libwww-perl-5 >=dev-perl/URI-1 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111016.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=6bfd9c129d946b20da5cde1d3752e8f3
diff --git a/metadata/md5-cache/dev-perl/CPAN-Mini-1.111.16-r1 b/metadata/md5-cache/dev-perl/CPAN-Mini-1.111.16-r1
new file mode 100644
index 000000000000..57d98d0d5568
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CPAN-Mini-1.111.16-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=dev-perl/File-HomeDir-0.570.0 >=virtual/perl-File-Path-2.40.0 virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long >=virtual/perl-IO-Compress-1.20 >=dev-perl/libwww-perl-5 >=dev-perl/URI-1 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Create a minimal mirror of CPAN
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/CPAN-Mini
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=dev-perl/File-HomeDir-0.570.0 >=virtual/perl-File-Path-2.40.0 virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long >=virtual/perl-IO-Compress-1.20 >=dev-perl/libwww-perl-5 >=dev-perl/URI-1 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111016.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=526d025a5e0840981291fcc3ad018a19
diff --git a/metadata/md5-cache/dev-perl/CPAN-Mini-Inject-0.350.0 b/metadata/md5-cache/dev-perl/CPAN-Mini-Inject-0.350.0
deleted file mode 100644
index 1e3a4cd36bc4..000000000000
--- a/metadata/md5-cache/dev-perl/CPAN-Mini-Inject-0.350.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/CPAN-Checksums >=dev-perl/CPAN-Mini-0.320.0 virtual/perl-Carp >=dev-perl/Dist-Metadata-0.921.0 >=virtual/perl-File-Path-2.70.0 dev-perl/File-Slurp >=virtual/perl-File-Spec-2.70.0 virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-IO-Compress virtual/perl-IO-Zlib dev-perl/libwww-perl dev-perl/YAML >=dev-perl/Module-Build-0.400.0 test? ( >=dev-perl/HTTP-Server-Simple-0.70.0 dev-perl/Test-TCP virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Inject modules into a CPAN::Mini mirror
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/CPAN-Mini-Inject
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/CPAN-Checksums >=dev-perl/CPAN-Mini-0.320.0 virtual/perl-Carp >=dev-perl/Dist-Metadata-0.921.0 >=virtual/perl-File-Path-2.70.0 dev-perl/File-Slurp >=virtual/perl-File-Spec-2.70.0 virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-IO-Compress virtual/perl-IO-Zlib dev-perl/libwww-perl dev-perl/YAML dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MI/MITHALDU/CPAN-Mini-Inject-0.35.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=8dc5f8b07c48431ae9f6b3bf66b66b6a
diff --git a/metadata/md5-cache/dev-perl/CPAN-Mini-Inject-0.350.0-r1 b/metadata/md5-cache/dev-perl/CPAN-Mini-Inject-0.350.0-r1
new file mode 100644
index 000000000000..d2bf8e938158
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CPAN-Mini-Inject-0.350.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/CPAN-Checksums >=dev-perl/CPAN-Mini-0.320.0 virtual/perl-Carp >=dev-perl/Dist-Metadata-0.921.0 >=virtual/perl-File-Path-2.70.0 dev-perl/File-Slurp >=virtual/perl-File-Spec-2.70.0 virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-IO-Compress virtual/perl-IO-Zlib dev-perl/libwww-perl dev-perl/YAML >=dev-perl/Module-Build-0.400.0 test? ( >=dev-perl/HTTP-Server-Simple-0.70.0 dev-perl/Test-TCP virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Inject modules into a CPAN::Mini mirror
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/CPAN-Mini-Inject
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/CPAN-Checksums >=dev-perl/CPAN-Mini-0.320.0 virtual/perl-Carp >=dev-perl/Dist-Metadata-0.921.0 >=virtual/perl-File-Path-2.70.0 dev-perl/File-Slurp >=virtual/perl-File-Spec-2.70.0 virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-IO-Compress virtual/perl-IO-Zlib dev-perl/libwww-perl dev-perl/YAML dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MI/MITHALDU/CPAN-Mini-Inject-0.35.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=50bcbfd5894f898011cd55d3218e68ec
diff --git a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.103.200 b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.103.200
deleted file mode 100644
index ecf623968e3b..000000000000
--- a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.103.200
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Mapping Perl releases on CPAN to the location of the tarballs
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/CPAN-Perl-Releases
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20210320.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=ab84c273408e23d0a31017bcd4d50431
diff --git a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.109.200 b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.109.200
new file mode 100644
index 000000000000..5ab6312750bd
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.109.200
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Mapping Perl releases on CPAN to the location of the tarballs
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/CPAN-Perl-Releases
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20210920.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=25636fba8852f2ed294848df2cb8c615
diff --git a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.4.280 b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.4.280
deleted file mode 100644
index c460c9adb4df..000000000000
--- a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.4.280
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Mapping Perl releases on CPAN to the location of the tarballs
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/CPAN-Perl-Releases
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200428.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=574d408208c831bca7f199cc48b5dee6
diff --git a/metadata/md5-cache/dev-perl/CSS-Minifier-XS-0.90.0-r2 b/metadata/md5-cache/dev-perl/CSS-Minifier-XS-0.90.0-r2
deleted file mode 100644
index 4877450533df..000000000000
--- a/metadata/md5-cache/dev-perl/CSS-Minifier-XS-0.90.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-perl/Module-Build-0.40.0 virtual/perl-ExtUtils-CBuilder dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Module-Build dev-lang/perl
-DESCRIPTION=XS based CSS minifier
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/CSS-Minifier-XS
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=01480b22b19afd6491ad4fb66ffe65fc
diff --git a/metadata/md5-cache/dev-perl/CSS-Packer-2.70.0 b/metadata/md5-cache/dev-perl/CSS-Packer-2.70.0
deleted file mode 100644
index 801375eeb5ef..000000000000
--- a/metadata/md5-cache/dev-perl/CSS-Packer-2.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-perl/Regexp-RegGrp-1.1.1_rc virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-File-Contents virtual/perl-Test-Simple ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Another CSS minifier
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/CSS-Packer
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Regexp-RegGrp-1.1.1_rc dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CSS-Packer-2.07.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=f88df68e96dad6aa0a6d8da8e6630541
diff --git a/metadata/md5-cache/dev-perl/CSS-Tiny-1.200.0 b/metadata/md5-cache/dev-perl/CSS-Tiny-1.200.0
deleted file mode 100644
index 3e29b7a671c0..000000000000
--- a/metadata/md5-cache/dev-perl/CSS-Tiny-1.200.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
-DESCRIPTION=Read/Write .css files with as little code as possible
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/CSS-Tiny
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/CSS-Tiny-1.20.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=4eaf80ec05a26546b1adca69164435ff
diff --git a/metadata/md5-cache/dev-perl/CSS-Tiny-1.200.0-r1 b/metadata/md5-cache/dev-perl/CSS-Tiny-1.200.0-r1
new file mode 100644
index 000000000000..a49e3aac6503
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CSS-Tiny-1.200.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Read/Write .css files with as little code as possible
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/CSS-Tiny
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/CSS-Tiny-1.20.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=bd9259718c2a038ac6210714dae61a81
diff --git a/metadata/md5-cache/dev-perl/Cache-2.110.0 b/metadata/md5-cache/dev-perl/Cache-2.110.0
deleted file mode 100644
index 2a61fd18f949..000000000000
--- a/metadata/md5-cache/dev-perl/Cache-2.110.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-DB_File-1.720.0 virtual/perl-Digest-SHA >=virtual/perl-File-Path-1.0.0 >=virtual/perl-File-Spec-0.800.0 >=virtual/perl-Storable-1.0.0 >=dev-perl/Heap-0.10.0 >=dev-perl/IO-String-1.20.0 dev-perl/TimeDate >=dev-perl/File-NFSLock-1.200.0 virtual/perl-Test-Simple dev-perl/Module-Build dev-lang/perl
-DESCRIPTION=the Cache interface
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Cache
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-DB_File-1.720.0 virtual/perl-Digest-SHA >=virtual/perl-File-Path-1.0.0 >=virtual/perl-File-Spec-0.800.0 >=virtual/perl-Storable-1.0.0 >=dev-perl/Heap-0.10.0 >=dev-perl/IO-String-1.20.0 dev-perl/TimeDate >=dev-perl/File-NFSLock-1.200.0 virtual/perl-Test-Simple dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Cache-2.11.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=e2489d1b27307fbd617e1e52279c1b82
diff --git a/metadata/md5-cache/dev-perl/Cache-2.110.0-r1 b/metadata/md5-cache/dev-perl/Cache-2.110.0-r1
new file mode 100644
index 000000000000..d8f919bb355f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Cache-2.110.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-DB_File-1.720.0 virtual/perl-Digest-SHA >=virtual/perl-File-Path-1.0.0 >=virtual/perl-File-Spec-0.800.0 >=virtual/perl-Storable-1.0.0 >=dev-perl/Heap-0.10.0 >=dev-perl/IO-String-1.20.0 dev-perl/TimeDate >=dev-perl/File-NFSLock-1.200.0 virtual/perl-Test-Simple dev-perl/Module-Build dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=the Cache interface
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Cache
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-DB_File-1.720.0 virtual/perl-Digest-SHA >=virtual/perl-File-Path-1.0.0 >=virtual/perl-File-Spec-0.800.0 >=virtual/perl-Storable-1.0.0 >=dev-perl/Heap-0.10.0 >=dev-perl/IO-String-1.20.0 dev-perl/TimeDate >=dev-perl/File-NFSLock-1.200.0 virtual/perl-Test-Simple dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Cache-2.11.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=87437552e7e580aaa5b984811c2e4d43
diff --git a/metadata/md5-cache/dev-perl/Cache-Cache-1.80.0 b/metadata/md5-cache/dev-perl/Cache-Cache-1.80.0
deleted file mode 100644
index 3f757cdc687e..000000000000
--- a/metadata/md5-cache/dev-perl/Cache-Cache-1.80.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Digest-SHA1-2.20.0 >=dev-perl/Error-0.150.0 >=virtual/perl-File-Spec-0.820.0 >=dev-perl/IPC-ShareLite-0.90.0 >=virtual/perl-Storable-1.14.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Generic cache interface and implementations
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Cache-Cache
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Digest-SHA1-2.20.0 >=dev-perl/Error-0.150.0 >=virtual/perl-File-Spec-0.820.0 >=dev-perl/IPC-ShareLite-0.90.0 >=virtual/perl-Storable-1.14.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Cache-Cache-1.08.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=20fd2f0509a7feacbf44b2b527a784bd
diff --git a/metadata/md5-cache/dev-perl/Cache-Cache-1.80.0-r1 b/metadata/md5-cache/dev-perl/Cache-Cache-1.80.0-r1
new file mode 100644
index 000000000000..7126672263d0
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Cache-Cache-1.80.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Digest-SHA1-2.20.0 >=dev-perl/Error-0.150.0 >=virtual/perl-File-Spec-0.820.0 >=dev-perl/IPC-ShareLite-0.90.0 >=virtual/perl-Storable-1.14.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Generic cache interface and implementations
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Cache-Cache
+IUSE=test
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Digest-SHA1-2.20.0 >=dev-perl/Error-0.150.0 >=virtual/perl-File-Spec-0.820.0 >=dev-perl/IPC-ShareLite-0.90.0 >=virtual/perl-Storable-1.14.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Cache-Cache-1.08.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=0dbb9c79268a0c420053b59e2ebe118f
diff --git a/metadata/md5-cache/dev-perl/Cache-FastMmap-1.490.0-r1 b/metadata/md5-cache/dev-perl/Cache-FastMmap-1.490.0-r1
deleted file mode 100644
index 7f092ba587d7..000000000000
--- a/metadata/md5-cache/dev-perl/Cache-FastMmap-1.490.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/perl-Storable virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Uses an mmaped file to act as a shared memory interprocess cache
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Cache-FastMmap
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Storable dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.49.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=11f94fc27ac0611c563fab765dcdf079
diff --git a/metadata/md5-cache/dev-perl/Cache-FastMmap-1.570.0 b/metadata/md5-cache/dev-perl/Cache-FastMmap-1.570.0
new file mode 100644
index 000000000000..e5f9ad61424e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Cache-FastMmap-1.570.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Storable virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Deep ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Uses an mmaped file to act as a shared memory interprocess cache
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Cache-FastMmap
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Storable dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.57.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=98d872ae954fc5dade174acfa0ade6e2
diff --git a/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.260.0-r1 b/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.260.0-r1
deleted file mode 100644
index 2ce8ce6768ec..000000000000
--- a/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.260.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/perl-Storable virtual/perl-ExtUtils-MakeMaker test? ( net-misc/memcached virtual/perl-Test-Simple ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Perl client for memcached, in C language
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Cache-Memcached-Fast
-IUSE=test examples
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ ) LGPL-2.1+
-RDEPEND=virtual/perl-Storable dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.26.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=bef054a300b5d1f4267e0b167f6071f5
diff --git a/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.270.0 b/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.270.0
index 24ae6ece9d11..28fa3b3b1b25 100644
--- a/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.270.0
+++ b/metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.270.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.27.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=8d060f38fee61a7f2182cfc494292e7c
+_md5_=69492a27afd8bbc2bd2c221401c19fb2
diff --git a/metadata/md5-cache/dev-perl/Cache-Simple-TimedExpiry-0.270.0-r2 b/metadata/md5-cache/dev-perl/Cache-Simple-TimedExpiry-0.270.0-r2
index e74ef0acc63a..4d101400067d 100644
--- a/metadata/md5-cache/dev-perl/Cache-Simple-TimedExpiry-0.270.0-r2
+++ b/metadata/md5-cache/dev-perl/Cache-Simple-TimedExpiry-0.270.0-r2
@@ -1,13 +1,15 @@
-BDEPEND=dev-lang/perl
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-lang/perl
 DESCRIPTION=A lightweight cache with timed expiration
-EAPI=7
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/Cache-Simple-TimedExpiry
+IUSE=test
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-0.27.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=8335abe5baaf2caeac3a70e72da3a522
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=418b2636a56b102f2cfa9c27eb0efa02
diff --git a/metadata/md5-cache/dev-perl/Cairo-1.107.0-r1 b/metadata/md5-cache/dev-perl/Cairo-1.107.0-r1
deleted file mode 100644
index a89ad6932b7f..000000000000
--- a/metadata/md5-cache/dev-perl/Cairo-1.107.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=x11-libs/cairo-1.0.0 virtual/perl-ExtUtils-MakeMaker >=dev-perl/ExtUtils-Depends-0.200.0 >=dev-perl/ExtUtils-PkgConfig-1.0.0 test? ( dev-perl/Test-Number-Delta ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/cairo-1.0.0 dev-lang/perl
-DESCRIPTION=Perl interface to the cairo library
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Cairo
-IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=x11-libs/cairo-1.0.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.107.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=a7b7764aa5e28a0a964cb2838b002014
diff --git a/metadata/md5-cache/dev-perl/Calendar-Simple-2.0.0 b/metadata/md5-cache/dev-perl/Calendar-Simple-2.0.0
deleted file mode 100644
index 998298a79a5e..000000000000
--- a/metadata/md5-cache/dev-perl/Calendar-Simple-2.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/perl-Carp virtual/perl-Time-Local !minimal? ( dev-perl/DateTime ) >=dev-perl/Module-Build-0.28 test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Module-Build dev-lang/perl
-DESCRIPTION=Perl extension to create simple calendars
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Calendar-Simple
-IUSE=minimal test
-KEYWORDS=amd64 ~hppa ~ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-Time-Local !minimal? ( dev-perl/DateTime ) dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Calendar-Simple-v2.0.0.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=eaac4e912c069f4b0531b388faf6d1ad
diff --git a/metadata/md5-cache/dev-perl/Capture-Tiny-0.480.0 b/metadata/md5-cache/dev-perl/Capture-Tiny-0.480.0
deleted file mode 100644
index 0dc1b6d803ed..000000000000
--- a/metadata/md5-cache/dev-perl/Capture-Tiny-0.480.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Capture STDOUT and STDERR from Perl, XS or external programs
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Capture-Tiny
-IUSE=test examples
-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
-LICENSE=Apache-2.0
-RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Scalar-List-Utils dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.48.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=553f766a32be51241ec58042f07522a5
diff --git a/metadata/md5-cache/dev-perl/Capture-Tiny-0.480.0-r1 b/metadata/md5-cache/dev-perl/Capture-Tiny-0.480.0-r1
new file mode 100644
index 000000000000..9954b5d59e89
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Capture-Tiny-0.480.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Capture STDOUT and STDERR from Perl, XS or external programs
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Capture-Tiny
+IUSE=test examples
+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
+LICENSE=Apache-2.0
+RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.48.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=662ada6a3a7d4e97e95593bb7e76c64e
diff --git a/metadata/md5-cache/dev-perl/Carp-Assert-More-2.0.1 b/metadata/md5-cache/dev-perl/Carp-Assert-More-2.0.1
new file mode 100644
index 000000000000..a3f950503b90
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Carp-Assert-More-2.0.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Exception >=virtual/perl-Test-Simple-0.180.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Convenience assertions for common situations
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Carp-Assert-More
+IUSE=test
+KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=Artistic-2
+RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-2.0.1.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=2e6720a55babac6ebd367d973cbab8d8
diff --git a/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.80.0 b/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.80.0
deleted file mode 100644
index b8dd78caf3ed..000000000000
--- a/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.80.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl
-DESCRIPTION=A clone of the classic Eliza program
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Chatbot-Eliza
-IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GR/GRANTG/Chatbot-Eliza-1.08.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=59415889682d5db180f7d62eff51edda
diff --git a/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.80.0-r1 b/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.80.0-r1
new file mode 100644
index 000000000000..1e300bea3537
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.80.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A clone of the classic Eliza program
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Chatbot-Eliza
+IUSE=test examples
+KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GR/GRANTG/Chatbot-Eliza-1.08.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=45889c7dfdb094fffd9e5b04482ae718
diff --git a/metadata/md5-cache/dev-perl/Cisco-IPPhone-0.50.0-r2 b/metadata/md5-cache/dev-perl/Cisco-IPPhone-0.50.0-r2
deleted file mode 100644
index b5796d199f62..000000000000
--- a/metadata/md5-cache/dev-perl/Cisco-IPPhone-0.50.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Cisco IP Phone interface using XML Objects
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Cisco-IPPhone
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MR/MRPALMER/Cisco-IPPhone-0.05.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=c443c2d2fda5d6d9e3cf6c1f45a889a9
diff --git a/metadata/md5-cache/dev-perl/Cisco-IPPhone-0.50.0-r3 b/metadata/md5-cache/dev-perl/Cisco-IPPhone-0.50.0-r3
new file mode 100644
index 000000000000..974ab89c897e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Cisco-IPPhone-0.50.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Cisco IP Phone interface using XML Objects
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Cisco-IPPhone
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MR/MRPALMER/Cisco-IPPhone-0.05.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=e8c156f3f2d6c734203b5d9c50ad95da
diff --git a/metadata/md5-cache/dev-perl/Cisco-Reconfig-0.912.0 b/metadata/md5-cache/dev-perl/Cisco-Reconfig-0.912.0
deleted file mode 100644
index e1edb74203a0..000000000000
--- a/metadata/md5-cache/dev-perl/Cisco-Reconfig-0.912.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-Scalar-List-Utils-1.70.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Parse and generate Cisco configuration files
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Cisco-Reconfig
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Scalar-List-Utils-1.70.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Cisco-Reconfig-0.912.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=0901c2ff04bae5150eea3bc4b7841336
diff --git a/metadata/md5-cache/dev-perl/Cisco-Reconfig-0.912.0-r1 b/metadata/md5-cache/dev-perl/Cisco-Reconfig-0.912.0-r1
new file mode 100644
index 000000000000..021ee767286d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Cisco-Reconfig-0.912.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Scalar-List-Utils-1.70.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Parse and generate Cisco configuration files
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Cisco-Reconfig
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Scalar-List-Utils-1.70.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Cisco-Reconfig-0.912.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=4745a338d70177d55611ba5d8f149422
diff --git a/metadata/md5-cache/dev-perl/Class-Accessor-Lite-0.80.0-r1 b/metadata/md5-cache/dev-perl/Class-Accessor-Lite-0.80.0-r1
deleted file mode 100644
index 399275dd9d31..000000000000
--- a/metadata/md5-cache/dev-perl/Class-Accessor-Lite-0.80.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=A minimalistic variant of Class::Accessor
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Class-Accessor-Lite
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KA/KAZUHO/Class-Accessor-Lite-0.08.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=9952e5901196b54cf1d36f77ca9eef37
diff --git a/metadata/md5-cache/dev-perl/Class-Accessor-Lite-0.80.0-r2 b/metadata/md5-cache/dev-perl/Class-Accessor-Lite-0.80.0-r2
new file mode 100644
index 000000000000..8d633c36b697
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Class-Accessor-Lite-0.80.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.360.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A minimalistic variant of Class::Accessor
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Class-Accessor-Lite
+IUSE=test
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KA/KAZUHO/Class-Accessor-Lite-0.08.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=059e86ef696c7948968e3d9b78ce9ace
diff --git a/metadata/md5-cache/dev-perl/Class-C3-0.340.0 b/metadata/md5-cache/dev-perl/Class-C3-0.340.0
deleted file mode 100644
index 1559a483d803..000000000000
--- a/metadata/md5-cache/dev-perl/Class-C3-0.340.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-perl/Algorithm-C3-0.70.0 virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=A pragma to use the C3 method resolution order algortihm
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Class-C3
-IUSE=test
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Algorithm-C3-0.70.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Class-C3-0.34.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=a3dc773333fe52e0e8bb143c091235bc
diff --git a/metadata/md5-cache/dev-perl/Class-DBI-3.0.17-r2 b/metadata/md5-cache/dev-perl/Class-DBI-3.0.17-r2
deleted file mode 100644
index 51502d37fe30..000000000000
--- a/metadata/md5-cache/dev-perl/Class-DBI-3.0.17-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Class-Accessor-0.18.0 >=dev-perl/Class-Trigger-0.70.0 >=virtual/perl-File-Temp-0.120.0 virtual/perl-Storable >=virtual/perl-Scalar-List-Utils-1.80.0 dev-perl/Clone >=dev-perl/Ima-DBI-0.330.0 virtual/perl-version >=dev-perl/UNIVERSAL-moniker-0.60.0 test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
-DESCRIPTION=Simple Database Abstraction
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Class-DBI
-IUSE=test
-KEYWORDS=amd64 ~ppc ppc64 x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Class-Accessor-0.18.0 >=dev-perl/Class-Trigger-0.70.0 >=virtual/perl-File-Temp-0.120.0 virtual/perl-Storable >=virtual/perl-Scalar-List-Utils-1.80.0 dev-perl/Clone >=dev-perl/Ima-DBI-0.330.0 virtual/perl-version >=dev-perl/UNIVERSAL-moniker-0.60.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Class-DBI-v3.0.17.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=36d13686d54c94e6d6e14592de42cb13
diff --git a/metadata/md5-cache/dev-perl/Class-DBI-3.0.17-r3 b/metadata/md5-cache/dev-perl/Class-DBI-3.0.17-r3
new file mode 100644
index 000000000000..006aa3f20c39
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Class-DBI-3.0.17-r3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Class-Accessor-0.18.0 >=dev-perl/Class-Trigger-0.70.0 >=virtual/perl-File-Temp-0.120.0 virtual/perl-Storable >=virtual/perl-Scalar-List-Utils-1.80.0 dev-perl/Clone >=dev-perl/Ima-DBI-0.330.0 virtual/perl-version >=dev-perl/UNIVERSAL-moniker-0.60.0 test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Simple Database Abstraction
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Class-DBI
+IUSE=test
+KEYWORDS=amd64 ~ppc ppc64 x86 ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Class-Accessor-0.18.0 >=dev-perl/Class-Trigger-0.70.0 >=virtual/perl-File-Temp-0.120.0 virtual/perl-Storable >=virtual/perl-Scalar-List-Utils-1.80.0 dev-perl/Clone >=dev-perl/Ima-DBI-0.330.0 virtual/perl-version >=dev-perl/UNIVERSAL-moniker-0.60.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Class-DBI-v3.0.17.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=092334efd9077411578afaa065580a8a
diff --git a/metadata/md5-cache/dev-perl/Class-DBI-mysql-1.0.0-r3 b/metadata/md5-cache/dev-perl/Class-DBI-mysql-1.0.0-r3
deleted file mode 100644
index 2fa81ff2defd..000000000000
--- a/metadata/md5-cache/dev-perl/Class-DBI-mysql-1.0.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Extensions to Class::DBI for MySQL
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Class-DBI-mysql
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-perl/Class-DBI-0.940.0 dev-perl/DBD-mysql dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Class-DBI-mysql-1.00.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=03214635ce61e5377393fe0b3d5898b8
diff --git a/metadata/md5-cache/dev-perl/Class-DBI-mysql-1.0.0-r4 b/metadata/md5-cache/dev-perl/Class-DBI-mysql-1.0.0-r4
new file mode 100644
index 000000000000..a285b5477435
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Class-DBI-mysql-1.0.0-r4
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Class-DBI-0.940.0 dev-perl/DBD-mysql test? ( >=virtual/perl-Test-Simple-0.450.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Extensions to Class::DBI for MySQL
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Class-DBI-mysql
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-perl/Class-DBI-0.940.0 dev-perl/DBD-mysql dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Class-DBI-mysql-1.00.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=1b8afb34127043f94f75173249a2f1b1
diff --git a/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r2 b/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r2
deleted file mode 100644
index 71b0175dc8e8..000000000000
--- a/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Inheritable, overridable class and instance data accessor creation
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Class-Data-Accessor
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CL/CLACO/Class-Data-Accessor-0.04004.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=2e24512c2ca4ac34a128cbdd2ff22f30
diff --git a/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r3 b/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r3
new file mode 100644
index 000000000000..74528bfaa460
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Class-Data-Accessor-0.40.40-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Inheritable, overridable class and instance data accessor creation
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Class-Data-Accessor
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CL/CLACO/Class-Data-Accessor-0.04004.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=26172247e4e0a7fbaf0fd2d335d06f73
diff --git a/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r3 b/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r3
deleted file mode 100644
index 969a122d6b98..000000000000
--- a/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Inheritable, overridable class data
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Class-Data-Inheritable
-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
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=2bb7a539583416ca91b62fed70f464a9
diff --git a/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r4 b/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r4
new file mode 100644
index 000000000000..af1c44d67cb4
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r4
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Inheritable, overridable class data
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Class-Data-Inheritable
+IUSE=test
+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
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=144cc03a79f3a99b3463cb190d33611e
diff --git a/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.90.0 b/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.90.0
new file mode 100644
index 000000000000..fcbfd71f44c5
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.90.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Inheritable, overridable class data
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Class-Data-Inheritable
+IUSE=test
+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
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RS/RSHERER/Class-Data-Inheritable-0.09.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=4f2f1b99d6d96c20660868169eebfa05
diff --git a/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.40.0 b/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.40.0
deleted file mode 100644
index 617ad3115f35..000000000000
--- a/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.40.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Automated accessor generation
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Class-ErrorHandler
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Class-ErrorHandler-0.04.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=a4249b6b4e69ce6532bbbef335343425
diff --git a/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.40.0-r1 b/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.40.0-r1
new file mode 100644
index 000000000000..e00ac5dab4d3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.40.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Automated accessor generation
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Class-ErrorHandler
+IUSE=test
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Class-ErrorHandler-0.04.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=97549774a1940e1c9c04b9e66b81e0f9
diff --git a/metadata/md5-cache/dev-perl/Class-Factory-Util-1.700.0-r2 b/metadata/md5-cache/dev-perl/Class-Factory-Util-1.700.0-r2
deleted file mode 100644
index f8e38c564d03..000000000000
--- a/metadata/md5-cache/dev-perl/Class-Factory-Util-1.700.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Module-Build-0.28 dev-lang/perl
-DESCRIPTION=Provide utility methods for factory classes
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Class-Factory-Util
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Class-Factory-Util-1.7.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=140e232f2c3796cacb4f0e2995fdc82c
diff --git a/metadata/md5-cache/dev-perl/Class-Factory-Util-1.700.0-r3 b/metadata/md5-cache/dev-perl/Class-Factory-Util-1.700.0-r3
new file mode 100644
index 000000000000..71e8c1bac7dd
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Class-Factory-Util-1.700.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Module-Build-0.280.0 dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Provide utility methods for factory classes
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Class-Factory-Util
+IUSE=test
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Class-Factory-Util-1.7.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=63d66c49371c361475a3b805f7d2360b
diff --git a/metadata/md5-cache/dev-perl/Class-ISA-0.360.0 b/metadata/md5-cache/dev-perl/Class-ISA-0.360.0
deleted file mode 100644
index 6054c8e7754b..000000000000
--- a/metadata/md5-cache/dev-perl/Class-ISA-0.360.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-if virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test ) dev-lang/perl
-DESCRIPTION=Report the search path thru an ISA tree
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Class-ISA
-IUSE=test
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-if dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Class-ISA-0.36.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=158912f2aa69320494b16f8be5321db3
diff --git a/metadata/md5-cache/dev-perl/Class-ISA-0.360.0-r1 b/metadata/md5-cache/dev-perl/Class-ISA-0.360.0-r1
new file mode 100644
index 000000000000..a15755aec878
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Class-ISA-0.360.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-if virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Report the search path thru an ISA tree
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Class-ISA
+IUSE=test
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-if dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Class-ISA-0.36.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=8f576ddd9cebc02a68e044eeea2ad9b2
diff --git a/metadata/md5-cache/dev-perl/Class-InsideOut-1.140.0 b/metadata/md5-cache/dev-perl/Class-InsideOut-1.140.0
deleted file mode 100644
index fc6557e4f8c0..000000000000
--- a/metadata/md5-cache/dev-perl/Class-InsideOut-1.140.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp dev-perl/Class-ISA virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.90.0 virtual/perl-Storable >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Scalar-List-Utils >=virtual/perl-Test-Simple-0.45 virtual/perl-XSLoader ) dev-lang/perl
-DESCRIPTION=A safe, simple inside-out object construction kit
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Class-InsideOut
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=virtual/perl-Carp dev-perl/Class-ISA virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.90.0 virtual/perl-Storable dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-InsideOut-1.14.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=e7361d5b8b3a5d7c9bee159176eadd2e
diff --git a/metadata/md5-cache/dev-perl/Class-InsideOut-1.140.0-r1 b/metadata/md5-cache/dev-perl/Class-InsideOut-1.140.0-r1
new file mode 100644
index 000000000000..a5e006cc4201
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Class-InsideOut-1.140.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp dev-perl/Class-ISA virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.90.0 virtual/perl-Storable >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Scalar-List-Utils >=virtual/perl-Test-Simple-0.45 virtual/perl-XSLoader ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A safe, simple inside-out object construction kit
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Class-InsideOut
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=virtual/perl-Carp dev-perl/Class-ISA virtual/perl-Exporter >=virtual/perl-Scalar-List-Utils-1.90.0 virtual/perl-Storable dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-InsideOut-1.14.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=c96e037e828b111d0945e6fcddabf55f
diff --git a/metadata/md5-cache/dev-perl/Class-Singleton-1.500.0-r1 b/metadata/md5-cache/dev-perl/Class-Singleton-1.500.0-r1
deleted file mode 100644
index d088875209dd..000000000000
--- a/metadata/md5-cache/dev-perl/Class-Singleton-1.500.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Implementation of a Singleton class
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Class-Singleton
-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
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/Class-Singleton-1.5.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=58b7a21cf7beea88eb3a43d773f07e71
diff --git a/metadata/md5-cache/dev-perl/Class-Std-0.13.0 b/metadata/md5-cache/dev-perl/Class-Std-0.13.0
deleted file mode 100644
index 740f35f75615..000000000000
--- a/metadata/md5-cache/dev-perl/Class-Std-0.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Data-Dumper virtual/perl-Scalar-List-Utils >=dev-perl/Module-Build-0.420.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Support for creating standard "inside-out" classes
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Class-Std
-IUSE=test examples
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Data-Dumper virtual/perl-Scalar-List-Utils dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Class-Std-0.013.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=7870c6f399183b0471b860b229a66cef
diff --git a/metadata/md5-cache/dev-perl/Class-Std-0.13.0-r1 b/metadata/md5-cache/dev-perl/Class-Std-0.13.0-r1
new file mode 100644
index 000000000000..1b7404038562
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Class-Std-0.13.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Data-Dumper virtual/perl-Scalar-List-Utils >=dev-perl/Module-Build-0.420.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Support for creating standard "inside-out" classes
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Class-Std
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Data-Dumper virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHORNY/Class-Std-0.013.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=81cd59a1e5a801a751b63c1c8c5a069a
diff --git a/metadata/md5-cache/dev-perl/Class-Tiny-1.6.0 b/metadata/md5-cache/dev-perl/Class-Tiny-1.6.0
deleted file mode 100644
index 5621af541377..000000000000
--- a/metadata/md5-cache/dev-perl/Class-Tiny-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp >=virtual/perl-ExtUtils-MakeMaker-6.170.0 test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 dev-perl/Test-FailWarnings ) virtual/perl-Exporter virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
-DESCRIPTION=Minimalist class construction
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Class-Tiny
-IUSE=test minimal
-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
-LICENSE=Apache-2.0
-RDEPEND=virtual/perl-Carp dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.006.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=1544c4b5661695d7778726dbbaf09e13
diff --git a/metadata/md5-cache/dev-perl/Class-Unload-0.110.0 b/metadata/md5-cache/dev-perl/Class-Unload-0.110.0
deleted file mode 100644
index c933eff06ee0..000000000000
--- a/metadata/md5-cache/dev-perl/Class-Unload-0.110.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Class-Inspector virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880 dev-perl/Test-Requires ) dev-lang/perl
-DESCRIPTION=Unload a class
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Class-Unload
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Class-Inspector dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/Class-Unload-0.11.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=6b625c138b11e15d5a4b66caf9257cc4
diff --git a/metadata/md5-cache/dev-perl/Class-Unload-0.110.0-r1 b/metadata/md5-cache/dev-perl/Class-Unload-0.110.0-r1
new file mode 100644
index 000000000000..7393df664e07
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Class-Unload-0.110.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Class-Inspector virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880 dev-perl/Test-Requires ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Unload a class
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Class-Unload
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Class-Inspector dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/Class-Unload-0.11.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=163828f6d3ff498c497c910b34f24481
diff --git a/metadata/md5-cache/dev-perl/Class-Virtual-0.80.0 b/metadata/md5-cache/dev-perl/Class-Virtual-0.80.0
deleted file mode 100644
index 793dbe4d25ef..000000000000
--- a/metadata/md5-cache/dev-perl/Class-Virtual-0.80.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Carp-Assert-0.100.0 >=dev-perl/Class-ISA-0.31 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Base class for virtual base classes
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Class-Virtual
-IUSE=test
-KEYWORDS=amd64 ~ia64 ~ppc sparc x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Carp-Assert-0.100.0 >=dev-perl/Class-ISA-0.31 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Class-Virtual-0.08.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=88188f22ae835ae852d02d0575533a99
diff --git a/metadata/md5-cache/dev-perl/Class-Virtual-0.80.0-r1 b/metadata/md5-cache/dev-perl/Class-Virtual-0.80.0-r1
new file mode 100644
index 000000000000..a597b73e3f4d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Class-Virtual-0.80.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Carp-Assert-0.100.0 >=dev-perl/Class-ISA-0.310.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Base class for virtual base classes
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Class-Virtual
+IUSE=test
+KEYWORDS=amd64 ~ia64 ~ppc sparc x86 ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Carp-Assert-0.100.0 >=dev-perl/Class-ISA-0.310.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Class-Virtual-0.08.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=f9aca3ad67da844ed42d7c35cfb63806
diff --git a/metadata/md5-cache/dev-perl/Clipboard-0.260.0 b/metadata/md5-cache/dev-perl/Clipboard-0.260.0
deleted file mode 100644
index b41ec480f829..000000000000
--- a/metadata/md5-cache/dev-perl/Clipboard-0.260.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-perl/CGI virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/URI x11-misc/xclip >=dev-perl/Module-Build-0.280.0 test? ( >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Module-Build dev-lang/perl
-DESCRIPTION=Copy and paste with any OS
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Clipboard
-IUSE=test test
-KEYWORDS=amd64 arm ppc ppc64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/CGI virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/URI x11-misc/xclip dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.26.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=b6cd310c23ede2609d47717818db6ff6
diff --git a/metadata/md5-cache/dev-perl/Clone-0.390.0 b/metadata/md5-cache/dev-perl/Clone-0.390.0
deleted file mode 100644
index 43587081f4d8..000000000000
--- a/metadata/md5-cache/dev-perl/Clone-0.390.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Recursively copy Perl datatypes
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Clone
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GA/GARU/Clone-0.39.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=f709f20637f80a40f3ff85ceb9f3122f
diff --git a/metadata/md5-cache/dev-perl/Clone-Choose-0.10.0 b/metadata/md5-cache/dev-perl/Clone-Choose-0.10.0
index 1be4ca08bb17..3fca7a6ca9b5 100644
--- a/metadata/md5-cache/dev-perl/Clone-Choose-0.10.0
+++ b/metadata/md5-cache/dev-perl/Clone-Choose-0.10.0
@@ -5,11 +5,11 @@ DESCRIPTION=Choose appropriate clone utility
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Clone-Choose
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Module-Runtime virtual/perl-Storable dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HE/HERMES/Clone-Choose-0.010.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=50d5cdabbb41f20f8f7f465c4fb93fa3
+_md5_=26086ae47e33010f3dce838a95532941
diff --git a/metadata/md5-cache/dev-perl/Clone-PP-1.70.0 b/metadata/md5-cache/dev-perl/Clone-PP-1.70.0
deleted file mode 100644
index 7ac872130cb1..000000000000
--- a/metadata/md5-cache/dev-perl/Clone-PP-1.70.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Carp virtual/perl-Data-Dumper ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Recursively copy Perl datatypes
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Clone-PP
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Exporter dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-1.07.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=ade18dcc4357f49974fa531db40f8ebf
diff --git a/metadata/md5-cache/dev-perl/Clone-PP-1.80.0 b/metadata/md5-cache/dev-perl/Clone-PP-1.80.0
index 7cd7401d5d9c..97de390adf1d 100644
--- a/metadata/md5-cache/dev-perl/Clone-PP-1.80.0
+++ b/metadata/md5-cache/dev-perl/Clone-PP-1.80.0
@@ -5,11 +5,11 @@ DESCRIPTION=Recursively copy Perl datatypes
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Clone-PP
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-1.08.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=342c47aa12c2a366551788e9150621c8
+_md5_=214b8f1e3883bff3d54f6d7c8e2d1e7c
diff --git a/metadata/md5-cache/dev-perl/Color-Calc-1.74.0-r1 b/metadata/md5-cache/dev-perl/Color-Calc-1.74.0-r1
new file mode 100644
index 000000000000..a76561e30378
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Color-Calc-1.74.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Graphics-ColorNames-2.100.0 dev-perl/Graphics-ColorNames-HTML >=dev-perl/Graphics-ColorNames-WWW-0.10.0 !minimal? ( >=dev-perl/Graphics-ColorObject-0.5.0 ) >=dev-perl/Params-Validate-0.750.0 >=dev-perl/Module-Build-0.420.0 test? ( virtual/perl-Test-Simple dev-perl/Test-NoWarnings ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Simple calculations with RGB colors
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Color-Calc
+IUSE=minimal test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Graphics-ColorNames-2.100.0 dev-perl/Graphics-ColorNames-HTML >=dev-perl/Graphics-ColorNames-WWW-0.10.0 !minimal? ( >=dev-perl/Graphics-ColorObject-0.5.0 ) >=dev-perl/Params-Validate-0.750.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Color-Calc-1.074.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=17ce94da23ac22b04e6997b14354aa37
diff --git a/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1 b/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
deleted file mode 100644
index b75112608831..000000000000
--- a/metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Module-Pluggable dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable test? ( dev-perl/Test-Most ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=An easy-to-use and comprehensive named-color library
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Color-Library
-IUSE=test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Module-Pluggable dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RO/ROKR/Color-Library-0.021.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3801b6cba0e3213ab683ef577176be7d
diff --git a/metadata/md5-cache/dev-perl/Compress-Bzip2-2.260.0 b/metadata/md5-cache/dev-perl/Compress-Bzip2-2.260.0
deleted file mode 100644
index 5d7d1e7cfa54..000000000000
--- a/metadata/md5-cache/dev-perl/Compress-Bzip2-2.260.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/bzip2 virtual/perl-Carp virtual/perl-File-Spec virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Interface to Bzip2 compression library
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Compress-Bzip2
-IUSE=test
-KEYWORDS=amd64 ~ia64 ~mips sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=app-arch/bzip2 virtual/perl-Carp virtual/perl-File-Spec dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.26.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=24f78b55c786d7a6d067648c775cf7db
diff --git a/metadata/md5-cache/dev-perl/Config-Any-0.320.0 b/metadata/md5-cache/dev-perl/Config-Any-0.320.0
deleted file mode 100644
index ad6d646568ac..000000000000
--- a/metadata/md5-cache/dev-perl/Config-Any-0.320.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Module-Pluggable-3.600.0 conf? ( >=dev-perl/Config-General-2.470.0 ) !conf? ( !<dev-perl/config-general-2.470.0 !<dev-perl/Config-General-2.470.0 ) ini? ( dev-perl/Config-Tiny ) json? ( || ( dev-perl/Cpanel-JSON-XS dev-perl/JSON-MaybeXS dev-perl/JSON-XS >=virtual/perl-JSON-PP-2 dev-perl/JSON ) ) xml? ( dev-perl/XML-NamespaceSupport dev-perl/XML-Simple ) yaml? ( || ( dev-perl/YAML-LibYAML >=dev-perl/YAML-Syck-0.700.0 dev-perl/YAML ) ) virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Load configuration from different file formats, transparently
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Config-Any
-IUSE=test +conf +ini +json +xml +yaml
-KEYWORDS=amd64 arm ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Module-Pluggable-3.600.0 conf? ( >=dev-perl/Config-General-2.470.0 ) !conf? ( !<dev-perl/config-general-2.470.0 !<dev-perl/Config-General-2.470.0 ) ini? ( dev-perl/Config-Tiny ) json? ( || ( dev-perl/Cpanel-JSON-XS dev-perl/JSON-MaybeXS dev-perl/JSON-XS >=virtual/perl-JSON-PP-2 dev-perl/JSON ) ) xml? ( dev-perl/XML-NamespaceSupport dev-perl/XML-Simple ) yaml? ( || ( dev-perl/YAML-LibYAML >=dev-perl/YAML-Syck-0.700.0 dev-perl/YAML ) ) dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.32.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=b5fc6d7c12498e17b4716833c2c3d8ad
diff --git a/metadata/md5-cache/dev-perl/Config-Any-0.320.0-r1 b/metadata/md5-cache/dev-perl/Config-Any-0.320.0-r1
new file mode 100644
index 000000000000..90eda0cff97c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-Any-0.320.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Module-Pluggable-3.600.0 conf? ( >=dev-perl/Config-General-2.470.0 ) !conf? ( !<dev-perl/config-general-2.470.0 !<dev-perl/Config-General-2.470.0 ) ini? ( dev-perl/Config-Tiny ) json? ( || ( dev-perl/Cpanel-JSON-XS dev-perl/JSON-MaybeXS dev-perl/JSON-XS >=virtual/perl-JSON-PP-2 dev-perl/JSON ) ) xml? ( dev-perl/XML-NamespaceSupport dev-perl/XML-Simple ) yaml? ( || ( dev-perl/YAML-LibYAML >=dev-perl/YAML-Syck-0.700.0 dev-perl/YAML ) ) virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Load configuration from different file formats, transparently
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Config-Any
+IUSE=test +conf +ini +json +xml +yaml test
+KEYWORDS=amd64 arm ppc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Module-Pluggable-3.600.0 conf? ( >=dev-perl/Config-General-2.470.0 ) !conf? ( !<dev-perl/config-general-2.470.0 !<dev-perl/Config-General-2.470.0 ) ini? ( dev-perl/Config-Tiny ) json? ( || ( dev-perl/Cpanel-JSON-XS dev-perl/JSON-MaybeXS dev-perl/JSON-XS >=virtual/perl-JSON-PP-2 dev-perl/JSON ) ) xml? ( dev-perl/XML-NamespaceSupport dev-perl/XML-Simple ) yaml? ( || ( dev-perl/YAML-LibYAML >=dev-perl/YAML-Syck-0.700.0 dev-perl/YAML ) ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.32.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=780c51dad4184d52273af19ab2335103
diff --git a/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1 b/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1
deleted file mode 100644
index b9c95a62b5fe..000000000000
--- a/metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Class-MethodMaker virtual/perl-Text-Balanced virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
-DESCRIPTION=use Apache format config files
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Config-ApacheFormat
-KEYWORDS=~alpha amd64 ~ia64 ~ppc sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Class-MethodMaker virtual/perl-Text-Balanced virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/Config-ApacheFormat-1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3e72e76c225011e357a5c3a66ce64668
diff --git a/metadata/md5-cache/dev-perl/Config-AutoConf-0.315.0 b/metadata/md5-cache/dev-perl/Config-AutoConf-0.315.0
deleted file mode 100644
index 4a2375ded299..000000000000
--- a/metadata/md5-cache/dev-perl/Config-AutoConf-0.315.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Capture-Tiny virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-ExtUtils-CBuilder-0.280.220 virtual/perl-File-Spec virtual/perl-File-Temp >=virtual/perl-Scalar-List-Utils-1.180.0 virtual/perl-Text-ParseWords virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.900.0 ) dev-lang/perl
-DESCRIPTION=A module to implement some of AutoConf macros in pure perl
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Config-AutoConf
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Capture-Tiny virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-ExtUtils-CBuilder-0.280.220 virtual/perl-File-Spec virtual/perl-File-Temp >=virtual/perl-Scalar-List-Utils-1.180.0 virtual/perl-Text-ParseWords dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.315.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=a0569520d6eba40cfd30bb21993b42ab
diff --git a/metadata/md5-cache/dev-perl/Config-AutoConf-0.320.0 b/metadata/md5-cache/dev-perl/Config-AutoConf-0.320.0
new file mode 100644
index 000000000000..f7abe0bb31dc
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-AutoConf-0.320.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Capture-Tiny virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-ExtUtils-CBuilder-0.280.220 dev-perl/File-Slurper virtual/perl-File-Spec virtual/perl-File-Temp >=virtual/perl-Scalar-List-Utils-1.180.0 virtual/perl-Text-ParseWords virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.900.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A module to implement some of AutoConf macros in pure perl
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Config-AutoConf
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Capture-Tiny virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-ExtUtils-CBuilder-0.280.220 dev-perl/File-Slurper virtual/perl-File-Spec virtual/perl-File-Temp >=virtual/perl-Scalar-List-Utils-1.180.0 virtual/perl-Text-ParseWords dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AM/AMBS/Config-AutoConf-0.320.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=7ff9c36ddba154a6fa7c2276d130b19d
diff --git a/metadata/md5-cache/dev-perl/Config-Crontab-1.450.0 b/metadata/md5-cache/dev-perl/Config-Crontab-1.450.0
deleted file mode 100644
index 1b0b9cda3b38..000000000000
--- a/metadata/md5-cache/dev-perl/Config-Crontab-1.450.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Read/Write Vixie compatible crontab(5) files
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Config-Crontab
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=Artistic
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SC/SCOTTW/Config-Crontab-1.45.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=f95ae0c0258c3049b04f2e42a3f003f7
diff --git a/metadata/md5-cache/dev-perl/Config-Crontab-1.450.0-r1 b/metadata/md5-cache/dev-perl/Config-Crontab-1.450.0-r1
new file mode 100644
index 000000000000..b6ed7050d52a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-Crontab-1.450.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Read/Write Vixie compatible crontab(5) files
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Config-Crontab
+IUSE=test examples
+KEYWORDS=amd64 x86
+LICENSE=Artistic
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SC/SCOTTW/Config-Crontab-1.45.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=63bd6b027e04d3f5666709dd686ce923
diff --git a/metadata/md5-cache/dev-perl/Config-General-2.630.0 b/metadata/md5-cache/dev-perl/Config-General-2.630.0
deleted file mode 100644
index 377d9d1dd96b..000000000000
--- a/metadata/md5-cache/dev-perl/Config-General-2.630.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-File-Spec virtual/perl-IO virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Config file parser module
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Config-General
-IUSE=examples
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.63.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=e5fe8319ab252ca79c38693d39e528da
diff --git a/metadata/md5-cache/dev-perl/Config-General-2.630.0-r1 b/metadata/md5-cache/dev-perl/Config-General-2.630.0-r1
new file mode 100644
index 000000000000..19af40d641bb
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-General-2.630.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-File-Spec virtual/perl-IO virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Config file parser module
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Config-General
+IUSE=test examples
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.63.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=7a6190be86568e49b0b9bd74a6714017
diff --git a/metadata/md5-cache/dev-perl/Config-Grammar-1.120.0 b/metadata/md5-cache/dev-perl/Config-Grammar-1.120.0
deleted file mode 100644
index 109b54eb4c37..000000000000
--- a/metadata/md5-cache/dev-perl/Config-Grammar-1.120.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=A grammar-based, user-friendly config parser
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Config-Grammar
-IUSE=test
-KEYWORDS=amd64 ~hppa ~sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DS/DSCHWEI/Config-Grammar-1.12.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=cc49c80895b404917f27dc654fb87059
diff --git a/metadata/md5-cache/dev-perl/Config-INI-0.27.0 b/metadata/md5-cache/dev-perl/Config-INI-0.27.0
new file mode 100644
index 000000000000..4f52856ad67c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-INI-0.27.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=dev-perl/Mixin-Linewise-0.110.0 virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=simple .ini-file format
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Config-INI
+IUSE=minimal test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=dev-perl/Mixin-Linewise-0.110.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Config-INI-0.027.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=cd79a2b1c167a2ce6ee326bdc20e5362
diff --git a/metadata/md5-cache/dev-perl/Config-IniFiles-2.940.0 b/metadata/md5-cache/dev-perl/Config-IniFiles-2.940.0
deleted file mode 100644
index cebbf1564371..000000000000
--- a/metadata/md5-cache/dev-perl/Config-IniFiles-2.940.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-File-Temp dev-perl/IO-stringy >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Module-Build-0.280.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-IO virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=A module for reading .ini-style configuration files
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Config-IniFiles
-IUSE=test
-KEYWORDS=amd64 ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-File-Temp dev-perl/IO-stringy >=virtual/perl-Scalar-List-Utils-1.330.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-2.94.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=404f74dc4557b06291397c2cef5aab6a
diff --git a/metadata/md5-cache/dev-perl/Config-MVP-2.200.11 b/metadata/md5-cache/dev-perl/Config-MVP-2.200.11
deleted file mode 100644
index 04fad56cc762..000000000000
--- a/metadata/md5-cache/dev-perl/Config-MVP-2.200.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-perl/Class-Load-0.170.0 virtual/perl-File-Spec dev-perl/Module-Pluggable >=dev-perl/Moose-0.910.0 dev-perl/MooseX-OneArgNew dev-perl/Params-Util dev-perl/Role-HasMessage dev-perl/Role-Identifiable dev-perl/Throwable dev-perl/Tie-IxHash dev-perl/Try-Tiny virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=multivalue-property package-oriented configuration
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Config-MVP
-IUSE=test minimal
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Class-Load-0.170.0 virtual/perl-File-Spec dev-perl/Module-Pluggable >=dev-perl/Moose-0.910.0 dev-perl/MooseX-OneArgNew dev-perl/Params-Util dev-perl/Role-HasMessage dev-perl/Role-Identifiable dev-perl/Throwable dev-perl/Tie-IxHash dev-perl/Try-Tiny dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200011.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=5c6dc2c5e23d7e5e476ee48f2ec3c3a4
diff --git a/metadata/md5-cache/dev-perl/Config-MVP-Reader-INI-2.101.464 b/metadata/md5-cache/dev-perl/Config-MVP-Reader-INI-2.101.464
new file mode 100644
index 000000000000..d4fe2704b731
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-MVP-Reader-INI-2.101.464
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Config-INI >=dev-perl/Config-MVP-2 dev-perl/Moose virtual/perl-parent >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=an MVP config reader for .ini files
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Config-MVP-Reader-INI
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Config-INI >=dev-perl/Config-MVP-2 dev-perl/Moose virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-Reader-INI-2.101464.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=5600fd5b1a4ec8bf2ff03e7982fd0a17
diff --git a/metadata/md5-cache/dev-perl/Config-Tiny-2.270.0 b/metadata/md5-cache/dev-perl/Config-Tiny-2.270.0
new file mode 100644
index 000000000000..5c1933866597
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Config-Tiny-2.270.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-File-Spec-3.300.0 >=virtual/perl-File-Temp-0.220.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-1.1.2 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Read/Write .ini style files with as little code as possible
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Config-Tiny
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-File-Spec-3.300.0 >=virtual/perl-File-Temp-0.220.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.27.tgz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=54246d09f36ac4c6511e32a2ff688923
diff --git a/metadata/md5-cache/dev-perl/ConfigReader-0.500.0-r2 b/metadata/md5-cache/dev-perl/ConfigReader-0.500.0-r2
deleted file mode 100644
index c7982517a76f..000000000000
--- a/metadata/md5-cache/dev-perl/ConfigReader-0.500.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Read directives from a configuration file
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/ConfigReader
-KEYWORDS=amd64 ~ia64 ~ppc sparc x86
-LICENSE=LGPL-2
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AM/AMW/ConfigReader-0.5.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=75174e5894f3847d5b6d0439b35eeecf
diff --git a/metadata/md5-cache/dev-perl/ConfigReader-0.500.0-r3 b/metadata/md5-cache/dev-perl/ConfigReader-0.500.0-r3
new file mode 100644
index 000000000000..fa761e2c4fc2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/ConfigReader-0.500.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Read directives from a configuration file
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/ConfigReader
+IUSE=test
+KEYWORDS=amd64 ~ia64 ~ppc sparc x86
+LICENSE=LGPL-2
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AM/AMW/ConfigReader-0.5.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=46e9b9b239d933d64259e523b31be72c
diff --git a/metadata/md5-cache/dev-perl/Contextual-Return-0.4.14 b/metadata/md5-cache/dev-perl/Contextual-Return-0.4.14
deleted file mode 100644
index a80cc4081e1d..000000000000
--- a/metadata/md5-cache/dev-perl/Contextual-Return-0.4.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Want virtual/perl-version virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Create context-sensitive return values
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Contextual-Return
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Want virtual/perl-version dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DC/DCONWAY/Contextual-Return-0.004014.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=adc90638a23d85d12307f4e8fd25ba71
diff --git a/metadata/md5-cache/dev-perl/Contextual-Return-0.4.14-r1 b/metadata/md5-cache/dev-perl/Contextual-Return-0.4.14-r1
new file mode 100644
index 000000000000..29e816a54170
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Contextual-Return-0.4.14-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Want virtual/perl-version virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Create context-sensitive return values
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Contextual-Return
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Want virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DC/DCONWAY/Contextual-Return-0.004014.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=355f4682690f76f184e9cb8de2927896
diff --git a/metadata/md5-cache/dev-perl/Convert-ASN1-0.330.0 b/metadata/md5-cache/dev-perl/Convert-ASN1-0.330.0
new file mode 100644
index 000000000000..91abc57024ca
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Convert-ASN1-0.330.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Math-BigInt-1.997.0 >=virtual/perl-Test-Simple-0.900.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Standard en/decode of ASN.1 structures
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Convert-ASN1
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TI/TIMLEGGE/Convert-ASN1-0.33.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=61e07cdcccb91362b636ee02e18d74f8
diff --git a/metadata/md5-cache/dev-perl/Convert-BinHex-1.125.0 b/metadata/md5-cache/dev-perl/Convert-BinHex-1.125.0
deleted file mode 100644
index 73292799db04..000000000000
--- a/metadata/md5-cache/dev-perl/Convert-BinHex-1.125.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Slurp virtual/perl-File-Temp virtual/perl-Test-Simple dev-perl/Test-Most virtual/perl-autodie ) dev-lang/perl
-DESCRIPTION=Extract data from Macintosh BinHex files
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Convert-BinHex
-IUSE=test
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/ST/STEPHEN/Convert-BinHex-1.125.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=b47f25ff810079f70173a688cc7ad636
diff --git a/metadata/md5-cache/dev-perl/Convert-BinHex-1.125.0-r1 b/metadata/md5-cache/dev-perl/Convert-BinHex-1.125.0-r1
new file mode 100644
index 000000000000..55e600f1e8c9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Convert-BinHex-1.125.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Slurp virtual/perl-File-Temp virtual/perl-Test-Simple dev-perl/Test-Most virtual/perl-autodie ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Extract data from Macintosh BinHex files
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Convert-BinHex
+IUSE=test
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/ST/STEPHEN/Convert-BinHex-1.125.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=b91676ab3f3bf6fa6fce5497fee3ec92
diff --git a/metadata/md5-cache/dev-perl/Convert-Color-0.110.0 b/metadata/md5-cache/dev-perl/Convert-Color-0.110.0
deleted file mode 100644
index 3cfdf9ab478d..000000000000
--- a/metadata/md5-cache/dev-perl/Convert-Color-0.110.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Module-Pluggable dev-perl/List-UtilsBy >=dev-perl/Module-Build-0.380.0 test? ( >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-Number-Delta ) dev-lang/perl
-DESCRIPTION=Color space conversions and named lookups
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Convert-Color
-IUSE=test examples
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Module-Pluggable dev-perl/List-UtilsBy dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Convert-Color-0.11.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=b207ce23eb511262de4ebbd290976209
diff --git a/metadata/md5-cache/dev-perl/Convert-Color-0.110.0-r1 b/metadata/md5-cache/dev-perl/Convert-Color-0.110.0-r1
new file mode 100644
index 000000000000..609b25c48bb1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Convert-Color-0.110.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Module-Pluggable dev-perl/List-UtilsBy >=dev-perl/Module-Build-0.380.0 test? ( >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-Number-Delta ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Color space conversions and named lookups
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Convert-Color
+IUSE=test examples
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Module-Pluggable dev-perl/List-UtilsBy dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Convert-Color-0.11.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=6b11add5f9df662efba7402b8270899c
diff --git a/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1 b/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1
deleted file mode 100644
index 147a78ac6c92..000000000000
--- a/metadata/md5-cache/dev-perl/Convert-PEM-0.80.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Class-ErrorHandler dev-perl/Convert-ASN1 dev-perl/Crypt-DES_EDE3 virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Read/write encrypted ASN.1 PEM files
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Convert-PEM
-KEYWORDS=~alpha amd64 ~hppa ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Class-ErrorHandler dev-perl/Convert-ASN1 dev-perl/Crypt-DES_EDE3 virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Convert-PEM-0.08.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=69f174bd3736e6cf7976dbe23df59bf6
diff --git a/metadata/md5-cache/dev-perl/Convert-UU-0.520.100 b/metadata/md5-cache/dev-perl/Convert-UU-0.520.100
index 2d8a2cfb0027..c2c9b8e97f5d 100644
--- a/metadata/md5-cache/dev-perl/Convert-UU-0.520.100
+++ b/metadata/md5-cache/dev-perl/Convert-UU-0.520.100
@@ -5,11 +5,11 @@ DESCRIPTION=Perl replacement for uuencode
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Convert-UU
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AN/ANDK/Convert-UU-0.5201.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=9bb2a27dec9949e5dfd886d29ab62b1c
+_md5_=931289ff35c5ef98947019569cbef2fb
diff --git a/metadata/md5-cache/dev-perl/Convert-UUlib-1.710.0 b/metadata/md5-cache/dev-perl/Convert-UUlib-1.710.0
deleted file mode 100644
index ab95a823d61d..000000000000
--- a/metadata/md5-cache/dev-perl/Convert-UUlib-1.710.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-perl/common-sense-3.740.0 >=virtual/perl-ExtUtils-MakeMaker-6.520.0 dev-perl/Canary-Stability dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=A Perl interface to the uulib library
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Convert-UUlib
-IUSE=test
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD CC0-1.0 GPL-1 GPL-2+
-RDEPEND=>=dev-perl/common-sense-3.740.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Convert-UUlib-1.71.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d436075adc71c38b0bb4bc401dbba4b2
diff --git a/metadata/md5-cache/dev-perl/Cookie-Baker-0.80.0 b/metadata/md5-cache/dev-perl/Cookie-Baker-0.80.0
deleted file mode 100644
index 69f2c7f60813..000000000000
--- a/metadata/md5-cache/dev-perl/Cookie-Baker-0.80.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Exporter dev-perl/URI xs? ( >=dev-perl/Cookie-Baker-XS-0.80.0 ) >=dev-perl/Module-Build-Tiny-0.35.0 test? ( >=virtual/perl-Test-Simple-0.980.0 dev-perl/Test-Time ) dev-lang/perl
-DESCRIPTION=Cookie string generator / parser
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Cookie-Baker
-IUSE=test +xs
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Exporter dev-perl/URI xs? ( >=dev-perl/Cookie-Baker-XS-0.80.0 ) dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Cookie-Baker-0.08.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=a45fb527918156ae1965ed371b37f79f
diff --git a/metadata/md5-cache/dev-perl/Cookie-Baker-XS-0.80.0 b/metadata/md5-cache/dev-perl/Cookie-Baker-XS-0.80.0
deleted file mode 100644
index 2ad31a876fee..000000000000
--- a/metadata/md5-cache/dev-perl/Cookie-Baker-XS-0.80.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Exporter >=virtual/perl-ExtUtils-MakeMaker-6.640.0 test? ( >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl
-DESCRIPTION=Accelerate Cookie::Baker's crush_cookie
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Cookie-Baker-XS
-IUSE=test
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Exporter dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Cookie-Baker-XS-0.08.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=430faaecef29c3d6ffa811c7711b7338
diff --git a/metadata/md5-cache/dev-perl/Coro-6.550.0 b/metadata/md5-cache/dev-perl/Coro-6.550.0
deleted file mode 100644
index c36b76f5d91b..000000000000
--- a/metadata/md5-cache/dev-perl/Coro-6.550.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-perl/AnyEvent-7 ev? ( >=dev-perl/EV-4.0.0 ) event? ( >=dev-perl/Event-1.80.0 ) >=dev-perl/Guard-0.500.0 virtual/perl-Scalar-List-Utils >=virtual/perl-Storable-2.150.0 dev-perl/common-sense dev-perl/Canary-Stability >=virtual/perl-ExtUtils-MakeMaker-6.520.0 dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=The only real threads in perl
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Coro
-IUSE=+ev event examples
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ ) LGPL-2.1+ || ( BSD-2 GPL-2+ )
-RDEPEND=>=dev-perl/AnyEvent-7 ev? ( >=dev-perl/EV-4.0.0 ) event? ( >=dev-perl/Event-1.80.0 ) >=dev-perl/Guard-0.500.0 virtual/perl-Scalar-List-Utils >=virtual/perl-Storable-2.150.0 dev-perl/common-sense dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.55.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=95ed1c45d6762b7d4d5ba05148f926a3
diff --git a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.190.0 b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.190.0
deleted file mode 100644
index 3218e72a2698..000000000000
--- a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.190.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=virtual/perl-Math-BigInt-1.160.0 virtual/perl-Carp >=virtual/perl-Encode-1.980.100 virtual/perl-XSLoader >=virtual/perl-podlators-2.80.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Data-Dumper virtual/perl-Test virtual/perl-Test-Simple virtual/perl-Time-Piece ) dev-lang/perl
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=cPanel fork of JSON::XS, fast and correct serializing
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Cpanel-JSON-XS
-IUSE=test examples
-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
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Math-BigInt-1.160.0 virtual/perl-Carp >=virtual/perl-Encode-1.980.100 virtual/perl-XSLoader >=virtual/perl-podlators-2.80.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.19.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=33437a834d8109e97224c4e310baa02d
diff --git a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.260.0 b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.260.0
index 1919c29ee84a..3b89cd4449b5 100644
--- a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.260.0
+++ b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.260.0
@@ -5,11 +5,11 @@ DESCRIPTION=cPanel fork of JSON::XS, fast and correct serializing
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Cpanel-JSON-XS
 IUSE=test examples
-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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Math-BigInt-1.160.0 virtual/perl-Carp >=virtual/perl-Encode-1.980.100 virtual/perl-Exporter virtual/perl-XSLoader >=virtual/perl-podlators-2.80.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.26.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=d33de4d113b32398a04dcdedc0ee6e17
+_md5_=2ee1170801b0814f84401c8c1f7886d2
diff --git a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.270.0 b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.270.0
new file mode 100644
index 000000000000..d860b8c45575
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.270.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Math-BigInt-1.160.0 virtual/perl-Carp >=virtual/perl-Encode-1.980.100 virtual/perl-Exporter virtual/perl-XSLoader >=virtual/perl-podlators-2.80.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Data-Dumper virtual/perl-Test virtual/perl-Test-Simple virtual/perl-Time-Piece ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=cPanel fork of JSON::XS, fast and correct serializing
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Cpanel-JSON-XS
+IUSE=test examples
+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
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Math-BigInt-1.160.0 virtual/perl-Carp >=virtual/perl-Encode-1.980.100 virtual/perl-Exporter virtual/perl-XSLoader >=virtual/perl-podlators-2.80.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.27.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=f61e3c59a19c801d6a091999b43c14df
diff --git a/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1 b/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
deleted file mode 100644
index e0af2cb47653..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-CBC-2.330.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Digest-MD5 test? ( dev-perl/Crypt-Blowfish dev-perl/Crypt-DES dev-perl/Crypt-IDEA ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Encrypt Data with Cipher Block Chaining Mode
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Crypt-CBC
-IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Artistic
-RDEPEND=virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-2.33.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=68f5ca25ada7d29fee8bcf9f89445f82
diff --git a/metadata/md5-cache/dev-perl/Crypt-CBC-3.40.0 b/metadata/md5-cache/dev-perl/Crypt-CBC-3.40.0
new file mode 100644
index 000000000000..b6ff61520cc1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-CBC-3.40.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/CryptX dev-perl/Crypt-PBKDF2 virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Math-BigInt dev-perl/Math-Int128 virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Crypt-Blowfish dev-perl/Crypt-DES dev-perl/Crypt-IDEA dev-perl/Crypt-Rijndael ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Encrypt Data with Cipher Block Chaining Mode
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Crypt-CBC
+IUSE=test examples
+KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~mips ~ppc64 ~sparc
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/CryptX dev-perl/Crypt-PBKDF2 virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Math-BigInt dev-perl/Math-Int128 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-3.04.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=ab12d4046d01d497665e054722f451e3
diff --git a/metadata/md5-cache/dev-perl/Crypt-CipherSaber-1.10.0-r1 b/metadata/md5-cache/dev-perl/Crypt-CipherSaber-1.10.0-r1
deleted file mode 100644
index 3877c9b75118..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-CipherSaber-1.10.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-Scalar-List-Utils-1.4.2 dev-perl/Module-Build test? ( >=virtual/perl-Test-Simple-0.600.0 >=dev-perl/Test-Warn-0.300.0 ) dev-lang/perl
-DESCRIPTION=Perl module implementing CipherSaber encryption
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Crypt-CipherSaber
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Scalar-List-Utils-1.4.2 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/Crypt-CipherSaber-1.01.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=8111053996c04eb00a3fe93e5032e311
diff --git a/metadata/md5-cache/dev-perl/Crypt-CipherSaber-1.10.0-r2 b/metadata/md5-cache/dev-perl/Crypt-CipherSaber-1.10.0-r2
new file mode 100644
index 000000000000..3f4f24184cb3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-CipherSaber-1.10.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/perl-Scalar-List-Utils-1.4.2 dev-perl/Module-Build test? ( >=virtual/perl-Test-Simple-0.600.0 >=dev-perl/Test-Warn-0.300.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl module implementing CipherSaber encryption
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Crypt-CipherSaber
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-Scalar-List-Utils-1.4.2 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/Crypt-CipherSaber-1.01.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=3cb94d3c8500c66969b69ffb6ec9786c
diff --git a/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r2 b/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r2
deleted file mode 100644
index faca376f8e56..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-Cracklib-1.700.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/cracklib dev-lang/perl
-DESCRIPTION=Perl interface to Alec Muffett's Cracklib
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Crypt-Cracklib
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=sys-libs/cracklib dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DANIEL/Crypt-Cracklib-1.7.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=5b90d315641577b84637f535f5693ff7
diff --git a/metadata/md5-cache/dev-perl/Crypt-Curve25519-0.60.0 b/metadata/md5-cache/dev-perl/Crypt-Curve25519-0.60.0
deleted file mode 100644
index 7f4ac2828bac..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-Curve25519-0.60.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-IO virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Shared secret elliptic-curve Diffie-Hellman generator
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Crypt-Curve25519
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AJ/AJGB/Crypt-Curve25519-0.06.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f3567cd3ebd96ba86232efa74e83420c
diff --git a/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1 b/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1
deleted file mode 100644
index 3b4bff0c10c9..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-perl/Crypt-CBC ) dev-lang/perl
-DESCRIPTION=Perl DES encryption module
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Crypt-DES
-IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=DES
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-DES-2.07.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=deb47198d91dae602ca11ebaf15813c1
diff --git a/metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1 b/metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1
deleted file mode 100644
index abf0135b81fb..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-DES_EDE3-0.10.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Crypt-DES dev-lang/perl:=[-build(-)]
-DESCRIPTION=Triple-DES EDE encryption/decryption
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Crypt-DES_EDE3
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Crypt-DES dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BT/BTROTT/Crypt-DES_EDE3-0.01.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d6142c68b015dd7238dfaf9ee949ec4a
diff --git a/metadata/md5-cache/dev-perl/Crypt-DH-0.70.0-r2 b/metadata/md5-cache/dev-perl/Crypt-DH-0.70.0-r2
deleted file mode 100644
index a8f5a82a1a00..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-DH-0.70.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/gmp dev-perl/Math-BigInt-GMP >=virtual/perl-Math-BigInt-1.60 dev-perl/Crypt-Random dev-lang/perl
-DESCRIPTION=Diffie-Hellman key exchange system
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Crypt-DH
-KEYWORDS=amd64 ~hppa x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-libs/gmp dev-perl/Math-BigInt-GMP >=virtual/perl-Math-BigInt-1.60 dev-perl/Crypt-Random dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MI/MITHALDU/Crypt-DH-0.07.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=ae7f523a4ea24b23aed195e3a61a1af8
diff --git a/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0 b/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0
deleted file mode 100644
index 75ca38b5bc7a..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-DSA-1.170.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-perl/Data-Buffer dev-perl/Digest-SHA1 virtual/perl-File-Spec dev-perl/File-Which virtual/perl-MIME-Base64 >=virtual/perl-Math-BigInt-1.78 dev-perl/Math-BigInt-GMP ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=DSA Signatures and Key Generation
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Crypt-DSA
-IUSE=test
-KEYWORDS=~alpha amd64 ~hppa ppc sparc x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Data-Buffer dev-perl/Digest-SHA1 virtual/perl-File-Spec dev-perl/File-Which virtual/perl-MIME-Base64 >=virtual/perl-Math-BigInt-1.78 dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Crypt-DSA-1.17.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c322ccd284ce0f4523c1695e3fdf0cd9
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenPGP-1.120.0 b/metadata/md5-cache/dev-perl/Crypt-OpenPGP-1.120.0
deleted file mode 100644
index cb1a683c597a..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-OpenPGP-1.120.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Crypt-RSA dev-perl/Crypt-Blowfish dev-perl/Crypt-CAST5_PP dev-perl/Crypt-DES_EDE3 dev-perl/Crypt-DSA dev-perl/Crypt-IDEA dev-perl/Crypt-RIPEMD160 dev-perl/Crypt-Rijndael >=dev-perl/Crypt-Twofish-2.00 virtual/perl-Digest-MD5 virtual/perl-Digest-SHA dev-perl/File-HomeDir virtual/perl-IO-Compress dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Math-BigInt dev-perl/TermReadKey dev-perl/URI >=dev-perl/Data-Buffer-0.04 virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Exception virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Pure-Perl OpenPGP-compatible PGP implementation
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Crypt-OpenPGP
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Crypt-RSA dev-perl/Crypt-Blowfish dev-perl/Crypt-CAST5_PP dev-perl/Crypt-DES_EDE3 dev-perl/Crypt-DSA dev-perl/Crypt-IDEA dev-perl/Crypt-RIPEMD160 dev-perl/Crypt-Rijndael >=dev-perl/Crypt-Twofish-2.00 virtual/perl-Digest-MD5 virtual/perl-Digest-SHA dev-perl/File-HomeDir virtual/perl-IO-Compress dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Math-BigInt dev-perl/TermReadKey dev-perl/URI >=dev-perl/Data-Buffer-0.04 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SR/SROMANOV/Crypt-OpenPGP-1.12.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=907848cbf28d39b95fb493ba4524a4e2
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenPGP-1.120.0-r1 b/metadata/md5-cache/dev-perl/Crypt-OpenPGP-1.120.0-r1
new file mode 100644
index 000000000000..8e068893e701
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenPGP-1.120.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Crypt-RSA dev-perl/Crypt-Blowfish dev-perl/Crypt-CAST5_PP dev-perl/Crypt-DES_EDE3 dev-perl/Crypt-DSA dev-perl/Crypt-IDEA dev-perl/Crypt-RIPEMD160 dev-perl/Crypt-Rijndael >=dev-perl/Crypt-Twofish-2.00 virtual/perl-Digest-MD5 virtual/perl-Digest-SHA dev-perl/File-HomeDir virtual/perl-IO-Compress dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Math-BigInt dev-perl/TermReadKey dev-perl/URI >=dev-perl/Data-Buffer-0.04 virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Exception virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Pure-Perl OpenPGP-compatible PGP implementation
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Crypt-OpenPGP
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Crypt-RSA dev-perl/Crypt-Blowfish dev-perl/Crypt-CAST5_PP dev-perl/Crypt-DES_EDE3 dev-perl/Crypt-DSA dev-perl/Crypt-IDEA dev-perl/Crypt-RIPEMD160 dev-perl/Crypt-Rijndael >=dev-perl/Crypt-Twofish-2.00 virtual/perl-Digest-MD5 virtual/perl-Digest-SHA dev-perl/File-HomeDir virtual/perl-IO-Compress dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Math-BigInt dev-perl/TermReadKey dev-perl/URI >=dev-perl/Data-Buffer-0.04 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SR/SROMANOV/Crypt-OpenPGP-1.12.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=f32ec19b90109f8161cec8996d1fe4a2
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-ECDSA-0.80.0-r4 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-ECDSA-0.80.0-r4
deleted file mode 100644
index c3b041c9936f..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-ECDSA-0.80.0-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-perl/Crypt-OpenSSL-EC-0.50.0 dev-libs/openssl:0= virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl:0 dev-lang/perl
-DESCRIPTION=OpenSSL ECDSA (Elliptic Curve Digital Signature Algorithm) Perl extension
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-ECDSA
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Crypt-OpenSSL-EC-0.50.0 dev-libs/openssl:0= dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Crypt-OpenSSL-ECDSA-0.08.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=61893b923374351a47975c06cf501ff1
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.110.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.110.0
deleted file mode 100644
index 40ecf5b92525..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.110.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec dev-libs/openssl:0= >=virtual/perl-ExtUtils-MakeMaker-6.640.0 test? ( >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl:0= dev-lang/perl
-DESCRIPTION=Guess OpenSSL include path
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-Guess
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec dev-libs/openssl:0= dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.11.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=0834cbf6f765e8d1be9ad3bd6284cf90
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3
deleted file mode 100644
index 85457fdb0352..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.280.0-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Crypt-OpenSSL-Bignum dev-perl/Crypt-OpenSSL-Random dev-libs/openssl:0= dev-lang/perl:=[-build(-)]
-DESCRIPTION=Crypt::OpenSSL::RSA module for perl
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-RSA
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Crypt-OpenSSL-Bignum dev-perl/Crypt-OpenSSL-Random dev-libs/openssl:0= dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PE/PERLER/Crypt-OpenSSL-RSA-0.28.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e6068a8be2d40d0d4bef684bcf90564b
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.320.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.320.0
new file mode 100644
index 000000000000..acacec9c0e38
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.320.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Crypt-OpenSSL-Bignum dev-perl/Crypt-OpenSSL-Random dev-libs/openssl:0= >=dev-perl/Crypt-OpenSSL-Guess-0.110.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/openssl:0= dev-lang/perl
+DESCRIPTION=RSA encoding and decoding using the OpenSSL libraries
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-RSA
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Crypt-OpenSSL-Bignum dev-perl/Crypt-OpenSSL-Random dev-libs/openssl:0= dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.32.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=349a11edae4153667f8daa4d55e9bf39
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.110.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.110.0
deleted file mode 100644
index 63600a5888b0..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.110.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl:0= dev-lang/perl
-DESCRIPTION=OpenSSL pseudo-random number generator access
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-Random
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-libs/openssl:0= dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-0.11.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=4ebf7bb859bc9987d479bfa20ee2b8bc
diff --git a/metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1 b/metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1
deleted file mode 100644
index e7deaa74dd3e..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-RSA-1.990.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Class-Loader dev-perl/Crypt-Blowfish dev-perl/Convert-ASCII-Armour dev-perl/Crypt-CBC dev-perl/Crypt-Primes dev-perl/Crypt-Random dev-perl/Data-Buffer dev-perl/Digest-MD2 virtual/perl-Digest-MD5 dev-perl/Digest-SHA1 >=dev-perl/Math-Pari-2.010603 dev-perl/Sort-Versions dev-perl/Tie-EncryptedHash dev-lang/perl:=[-build(-)]
-DESCRIPTION=RSA public-key cryptosystem
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Crypt-RSA
-KEYWORDS=~alpha amd64 ~hppa x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Class-Loader dev-perl/Crypt-Blowfish dev-perl/Convert-ASCII-Armour dev-perl/Crypt-CBC dev-perl/Crypt-Primes dev-perl/Crypt-Random dev-perl/Data-Buffer dev-perl/Digest-MD2 virtual/perl-Digest-MD5 dev-perl/Digest-SHA1 >=dev-perl/Math-Pari-2.010603 dev-perl/Sort-Versions dev-perl/Tie-EncryptedHash dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Crypt-RSA-1.99.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9262c084f418a9bf8764390608a06188
diff --git a/metadata/md5-cache/dev-perl/Crypt-Random-1.540.0 b/metadata/md5-cache/dev-perl/Crypt-Random-1.540.0
new file mode 100644
index 000000000000..9a775119fa67
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-Random-1.540.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Class-Loader-2.0.0 >=dev-perl/Math-Pari-2.1.804 >=dev-perl/Statistics-ChiSquare-1.0.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Cryptographically Secure, True Random Number Generator
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Crypt-Random
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Class-Loader-2.0.0 >=dev-perl/Math-Pari-2.1.804 >=dev-perl/Statistics-ChiSquare-1.0.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Crypt-Random-1.54.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=34c2a65be76e7d44180ec68b0b094ecf
diff --git a/metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r2 b/metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r2
deleted file mode 100644
index 7dc3fb4afc31..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-Twofish-2.170.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=The Twofish Encryption Algorithm
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Crypt-Twofish
-KEYWORDS=amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AM/AMS/Crypt-Twofish-2.17.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=6cbe830b54e3f74e619e9a9f95ab23c9
diff --git a/metadata/md5-cache/dev-perl/Crypt-URandom-0.360.0 b/metadata/md5-cache/dev-perl/Crypt-URandom-0.360.0
deleted file mode 100644
index 54130d1b6081..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-URandom-0.360.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Provide non blocking randomness
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Crypt-URandom
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DD/DDICK/Crypt-URandom-0.36.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=207ff4cdedda477af27a5d04df2aa5b7
diff --git a/metadata/md5-cache/dev-perl/Crypt-URandom-0.360.0-r1 b/metadata/md5-cache/dev-perl/Crypt-URandom-0.360.0-r1
new file mode 100644
index 000000000000..4f24eacc5e3b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-URandom-0.360.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Provide non blocking randomness
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Crypt-URandom
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DD/DDICK/Crypt-URandom-0.36.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=44e94e51f467ccf399c9925781f9e954
diff --git a/metadata/md5-cache/dev-perl/Crypt-X509-0.530.0 b/metadata/md5-cache/dev-perl/Crypt-X509-0.530.0
deleted file mode 100644
index eda23951f6cb..000000000000
--- a/metadata/md5-cache/dev-perl/Crypt-X509-0.530.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-perl/Convert-ASN1-0.190.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Parse a X.509 certificate
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Crypt-X509
-IUSE=test
-KEYWORDS=amd64
-LICENSE=Artistic-2
-RDEPEND=>=dev-perl/Convert-ASN1-0.190.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-X509-0.53.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=86da5a27e167f7af42ded1baf9fec03b
diff --git a/metadata/md5-cache/dev-perl/CryptX-0.73.0 b/metadata/md5-cache/dev-perl/CryptX-0.73.0
new file mode 100644
index 000000000000..b108fb8e4c99
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CryptX-0.73.0
@@ -0,0 +1,15 @@
+BDEPEND=!minimal? ( dev-perl/JSON ) virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 !minimal? ( >=virtual/perl-Math-BigInt-1.999.715 >=virtual/perl-Storable-2.0.0 ) ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Self-contained crypto toolkit
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/CryptX
+IUSE=minimal test
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ ) public-domain
+RDEPEND=!minimal? ( dev-perl/JSON ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MI/MIK/CryptX-0.073.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=29c4fdcde6dcce71da8586435d530dcb
diff --git a/metadata/md5-cache/dev-perl/Curses-1.360.0-r1 b/metadata/md5-cache/dev-perl/Curses-1.360.0-r1
deleted file mode 100644
index 6c80a9ad9340..000000000000
--- a/metadata/md5-cache/dev-perl/Curses-1.360.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/ncurses:=[unicode(+)?] virtual/perl-Data-Dumper virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Curses interface modules for Perl
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Curses
-IUSE=+unicode test examples
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~sparc-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=sys-libs/ncurses:=[unicode(+)?] virtual/perl-Data-Dumper dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.36.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=19c6e8d6813bf859157ac2d7381a627b
diff --git a/metadata/md5-cache/dev-perl/Curses-1.380.0 b/metadata/md5-cache/dev-perl/Curses-1.380.0
new file mode 100644
index 000000000000..4a01e2364722
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Curses-1.380.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-libs/ncurses:=[unicode(+)?] virtual/perl-Data-Dumper virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:=[unicode(+)?] dev-lang/perl
+DESCRIPTION=Curses interface modules for Perl
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Curses
+IUSE=+unicode test examples
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] virtual/perl-Data-Dumper dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.38.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=c4463ee6af413d8e2e1e419e2501ca9d
diff --git a/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0 b/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
deleted file mode 100644
index 55d3912e88b3..000000000000
--- a/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-File-Spec virtual/perl-Exporter virtual/perl-if virtual/perl-parent >=dev-perl/Module-Build-0.380.0 test? ( dev-perl/Test-Requires virtual/perl-Test-Simple !minimal? ( dev-perl/File-Copy-Link ) ) dev-lang/perl
-DESCRIPTION=Temporary changing working directory (chdir)
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Cwd-Guard
-IUSE=test minimal
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-File-Spec virtual/perl-Exporter virtual/perl-if virtual/perl-parent dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Cwd-Guard-0.05.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=26d87e527edcecb9367842a0234b9560
diff --git a/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0-r1 b/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0-r1
new file mode 100644
index 000000000000..b963abbaae69
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-File-Spec virtual/perl-Exporter virtual/perl-if virtual/perl-parent >=dev-perl/Module-Build-0.380.0 test? ( dev-perl/Test-Requires virtual/perl-Test-Simple !minimal? ( dev-perl/File-Copy-Link ) ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Temporary changing working directory (chdir)
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Cwd-Guard
+IUSE=minimal test
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-File-Spec virtual/perl-Exporter virtual/perl-if virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Cwd-Guard-0.05.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=b442549bed9e8cf3b8a63ac89bad574c
diff --git a/metadata/md5-cache/dev-perl/Daemon-Generic-0.850.0 b/metadata/md5-cache/dev-perl/Daemon-Generic-0.850.0
deleted file mode 100644
index 53c512ae0db9..000000000000
--- a/metadata/md5-cache/dev-perl/Daemon-Generic-0.850.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/File-Flock-2013.60.0 dev-perl/File-Slurp virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Text-Tabs+Wrap virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/AnyEvent dev-perl/Event dev-perl/Eval-LineNumbers virtual/perl-Time-HiRes ) dev-lang/perl
-DESCRIPTION=Framework to provide start/stop/reload for a daemon
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Daemon-Generic
-IUSE=test
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/File-Flock-2013.60.0 dev-perl/File-Slurp virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Text-Tabs+Wrap dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Daemon-Generic-0.85.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=cca98e5436c5cfcb5f7dc218704a6fdb
diff --git a/metadata/md5-cache/dev-perl/Daemon-Generic-0.850.0-r1 b/metadata/md5-cache/dev-perl/Daemon-Generic-0.850.0-r1
new file mode 100644
index 000000000000..654760a724f8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Daemon-Generic-0.850.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/File-Flock-2013.60.0 dev-perl/File-Slurp virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Text-Tabs+Wrap virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/AnyEvent dev-perl/Event dev-perl/Eval-LineNumbers virtual/perl-Time-HiRes ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Framework to provide start/stop/reload for a daemon
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Daemon-Generic
+IUSE=test
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/File-Flock-2013.60.0 dev-perl/File-Slurp virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Text-Tabs+Wrap dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Daemon-Generic-0.85.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=7c80968d0af93ba2b06f88d06af848fd
diff --git a/metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1 b/metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1
deleted file mode 100644
index 6ccf5d952b36..000000000000
--- a/metadata/md5-cache/dev-perl/Danga-Socket-1.610.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Sys-Syscall dev-lang/perl:=[-build(-)]
-DESCRIPTION=A non-blocking socket object; uses epoll()
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Danga-Socket
-KEYWORDS=amd64 ~ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Sys-Syscall dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BR/BRADFITZ/Danga-Socket-1.61.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7a19bfbbf01f828509036c2fd9118b95
diff --git a/metadata/md5-cache/dev-perl/Data-Compare-1.250.0 b/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
deleted file mode 100644
index 781df310d738..000000000000
--- a/metadata/md5-cache/dev-perl/Data-Compare-1.250.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/File-Find-Rule-0.100.0 virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Clone dev-perl/Scalar-Properties ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Compare perl data structures
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Data-Compare
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/File-Find-Rule-0.100.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.25.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9aacd40c72a53b868feda61994d39de6
diff --git a/metadata/md5-cache/dev-perl/Data-Dump-1.250.0 b/metadata/md5-cache/dev-perl/Data-Dump-1.250.0
new file mode 100644
index 000000000000..7719e905681a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-Dump-1.250.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-MIME-Base64 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Pretty printing of data structures
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Data-Dump
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-MIME-Base64 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GA/GARU/Data-Dump-1.25.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=983f2bc41b352264221226c3a8c31c32
diff --git a/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.23.0 b/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.23.0
deleted file mode 100644
index 1da43648d675..000000000000
--- a/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.23.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Less indentation and newlines plus sub deparsing
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Data-Dumper-Concise
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Data-Dumper virtual/perl-Exporter dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Data-Dumper-Concise-2.023.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=8e278f8eb8175c64d241821e4ffd200d
diff --git a/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.23.0-r1 b/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.23.0-r1
new file mode 100644
index 000000000000..3d47e7121feb
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-Dumper-Concise-2.23.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Less indentation and newlines plus sub deparsing
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Data-Dumper-Concise
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Data-Dumper virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Data-Dumper-Concise-2.023.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=32fd82b90d2d286a9ce38df092f5ade3
diff --git a/metadata/md5-cache/dev-perl/Data-Float-0.13.0 b/metadata/md5-cache/dev-perl/Data-Float-0.13.0
deleted file mode 100644
index 813bca5e0726..000000000000
--- a/metadata/md5-cache/dev-perl/Data-Float-0.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-parent dev-perl/Module-Build test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=details of the floating point data type
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Data-Float
-IUSE=test
-KEYWORDS=~amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-parent dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Float-0.013.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=221808c920f4b97634b80d0af9c503c2
diff --git a/metadata/md5-cache/dev-perl/Data-Float-0.13.0-r1 b/metadata/md5-cache/dev-perl/Data-Float-0.13.0-r1
new file mode 100644
index 000000000000..95507bf24380
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-Float-0.13.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-parent dev-perl/Module-Build test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=details of the floating point data type
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Data-Float
+IUSE=test
+KEYWORDS=~amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Float-0.013.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=e64744304c40bdb6c8a2d843e4c59441
diff --git a/metadata/md5-cache/dev-perl/Data-FormValidator-4.880.0 b/metadata/md5-cache/dev-perl/Data-FormValidator-4.880.0
deleted file mode 100644
index 27a1dea69d20..000000000000
--- a/metadata/md5-cache/dev-perl/Data-FormValidator-4.880.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Image-Size >=dev-perl/Date-Calc-5.0 >=dev-perl/File-MMagic-1.170.0 >=dev-perl/MIME-Types-1.5.0 >=dev-perl/Regexp-Common-0.30.0 dev-perl/Email-Valid virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Validates user input (usually from an HTML form) based on input profile
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Data-FormValidator
-IUSE=test
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Image-Size >=dev-perl/Date-Calc-5.0 >=dev-perl/File-MMagic-1.170.0 >=dev-perl/MIME-Types-1.5.0 >=dev-perl/Regexp-Common-0.30.0 dev-perl/Email-Valid virtual/perl-Scalar-List-Utils dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DF/DFARRELL/Data-FormValidator-4.88.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=95bd61767c94b12ee4676cdec0ee9ba0
diff --git a/metadata/md5-cache/dev-perl/Data-FormValidator-4.880.0-r1 b/metadata/md5-cache/dev-perl/Data-FormValidator-4.880.0-r1
new file mode 100644
index 000000000000..a0366f276158
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-FormValidator-4.880.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Image-Size >=dev-perl/Date-Calc-5.0 >=dev-perl/File-MMagic-1.170.0 >=dev-perl/MIME-Types-1.5.0 >=dev-perl/Regexp-Common-0.30.0 dev-perl/Email-Valid virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Validates user input (usually from an HTML form) based on input profile
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Data-FormValidator
+IUSE=test
+KEYWORDS=amd64 ppc ppc64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Image-Size >=dev-perl/Date-Calc-5.0 >=dev-perl/File-MMagic-1.170.0 >=dev-perl/MIME-Types-1.5.0 >=dev-perl/Regexp-Common-0.30.0 dev-perl/Email-Valid virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DF/DFARRELL/Data-FormValidator-4.88.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=5dbcbde6047d0557b65ba4eb413b2d0b
diff --git a/metadata/md5-cache/dev-perl/Data-GUID-0.50.0 b/metadata/md5-cache/dev-perl/Data-GUID-0.50.0
new file mode 100644
index 000000000000..56344a1160e6
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-GUID-0.50.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=dev-perl/Data-UUID-1.148.0 >=dev-perl/Sub-Exporter-0.900.0 >=dev-perl/Sub-Install-0.30.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Simple interface for generating and using globally unique identifiers
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Data-GUID
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=dev-perl/Data-UUID-1.148.0 >=dev-perl/Sub-Exporter-0.900.0 >=dev-perl/Sub-Install-0.30.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.050.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=5b3ae860d9d3bc45f2cee5f33e8df073
diff --git a/metadata/md5-cache/dev-perl/Data-HexDump-0.20.0 b/metadata/md5-cache/dev-perl/Data-HexDump-0.20.0
deleted file mode 100644
index 114116f78fa3..000000000000
--- a/metadata/md5-cache/dev-perl/Data-HexDump-0.20.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=A Simple Hexadecial Dumper
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Data-HexDump
-KEYWORDS=amd64 ~hppa ~sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/F/FT/FTASSIN/Data-HexDump-0.02.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=e8c4779c08725f8928b63436413c8471
diff --git a/metadata/md5-cache/dev-perl/Data-OptList-0.112.0 b/metadata/md5-cache/dev-perl/Data-OptList-0.112.0
new file mode 100644
index 000000000000..b6aceeeaa12e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-OptList-0.112.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Sub-Install-0.921.0 dev-perl/Params-Util virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=parse and validate simple name/value option pairs
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Data-OptList
+IUSE=test
+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
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Sub-Install-0.921.0 dev-perl/Params-Util virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.112.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=46bc01f7a886ccd33225173d31be8b22
diff --git a/metadata/md5-cache/dev-perl/Data-Page-Pageset-1.20.0-r1 b/metadata/md5-cache/dev-perl/Data-Page-Pageset-1.20.0-r1
deleted file mode 100644
index 7b1db4f8ddeb..000000000000
--- a/metadata/md5-cache/dev-perl/Data-Page-Pageset-1.20.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Data-Page-2.0.0 dev-perl/Class-Accessor dev-perl/Module-Build test? ( dev-perl/Test-Exception ) dev-lang/perl
-DESCRIPTION=change long page list to be shorter and well navigate
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Data-Page-Pageset
-IUSE=test
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Data-Page-2.0.0 dev-perl/Class-Accessor dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CH/CHUNZI/Data-Page-Pageset-1.02.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=e6789c17af8e1b02d809fec1dcdc3bf4
diff --git a/metadata/md5-cache/dev-perl/Data-Page-Pageset-1.20.0-r2 b/metadata/md5-cache/dev-perl/Data-Page-Pageset-1.20.0-r2
new file mode 100644
index 000000000000..9f7c6fa46be1
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-Page-Pageset-1.20.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Data-Page-2.0.0 dev-perl/Class-Accessor dev-perl/Module-Build test? ( dev-perl/Test-Exception ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=change long page list to be shorter and well navigate
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Data-Page-Pageset
+IUSE=test
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Data-Page-2.0.0 dev-perl/Class-Accessor dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHUNZI/Data-Page-Pageset-1.02.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=07a6b9b823af7837c74082aab996794e
diff --git a/metadata/md5-cache/dev-perl/Data-Password-passwdqc-0.90.0 b/metadata/md5-cache/dev-perl/Data-Password-passwdqc-0.90.0
deleted file mode 100644
index 6c60fe7d76b4..000000000000
--- a/metadata/md5-cache/dev-perl/Data-Password-passwdqc-0.90.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/perl-Carp dev-perl/List-MoreUtils dev-perl/Moose dev-perl/namespace-autoclean >=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-perl/Devel-CheckOS test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Check password strength and generate password using passwdqc
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Data-Password-passwdqc
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp dev-perl/List-MoreUtils dev-perl/Moose dev-perl/namespace-autoclean dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHERWIN/Data-Password-passwdqc-0.09.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=011b00d17dcc118b69f2309eac87c73b
diff --git a/metadata/md5-cache/dev-perl/Data-Password-passwdqc-0.90.0-r1 b/metadata/md5-cache/dev-perl/Data-Password-passwdqc-0.90.0-r1
new file mode 100644
index 000000000000..f3c290da51db
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-Password-passwdqc-0.90.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp dev-perl/List-MoreUtils dev-perl/Moose dev-perl/namespace-autoclean >=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-perl/Devel-CheckOS test? ( virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Check password strength and generate password using passwdqc
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Data-Password-passwdqc
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-perl/List-MoreUtils dev-perl/Moose dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SH/SHERWIN/Data-Password-passwdqc-0.09.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=31c6a5d2db976853f5420dc42cd9183e
diff --git a/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1 b/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1
deleted file mode 100644
index 41ba99f20f39..000000000000
--- a/metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Class-Method-Modifiers dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils dev-perl/Module-Runtime dev-perl/Role-Tiny virtual/perl-parent dev-perl/strictures virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Deep dev-perl/Test-Fatal dev-perl/Test-Output ) dev-lang/perl
-DESCRIPTION=Base classes wrapping fundamental Perl data types
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Data-Perl
-IUSE=test
-KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Class-Method-Modifiers dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils dev-perl/Module-Runtime dev-perl/Role-Tiny virtual/perl-parent dev-perl/strictures dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MA/MATTP/Data-Perl-0.002009.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=4a38313001f82ecff6b475574d7bee50
diff --git a/metadata/md5-cache/dev-perl/Data-Printer-0.400.0 b/metadata/md5-cache/dev-perl/Data-Printer-0.400.0
deleted file mode 100644
index d27caa03f324..000000000000
--- a/metadata/md5-cache/dev-perl/Data-Printer-0.400.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/perl-Carp dev-perl/Clone-PP >=dev-perl/File-HomeDir-0.910.0 virtual/perl-File-Spec >=dev-perl/Package-Stash-0.300.0 virtual/perl-Scalar-List-Utils dev-perl/Sort-Naturally >=virtual/perl-Term-ANSIColor-3 >=virtual/perl-version-0.770.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Temp >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Colored pretty-print of Perl data structures and objects
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Data-Printer
-IUSE=test examples
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp dev-perl/Clone-PP >=dev-perl/File-HomeDir-0.910.0 virtual/perl-File-Spec >=dev-perl/Package-Stash-0.300.0 virtual/perl-Scalar-List-Utils dev-perl/Sort-Naturally >=virtual/perl-Term-ANSIColor-3 >=virtual/perl-version-0.770.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GA/GARU/Data-Printer-0.40.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=23185d49c65185f7d75cd40fd75190b7
diff --git a/metadata/md5-cache/dev-perl/Data-Random-0.120.0 b/metadata/md5-cache/dev-perl/Data-Random-0.120.0
deleted file mode 100644
index 8805ce22031f..000000000000
--- a/metadata/md5-cache/dev-perl/Data-Random-0.120.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.360.0 test? ( >=virtual/perl-Test-Simple-0.880.0 virtual/perl-File-Temp ) dev-lang/perl
-DESCRIPTION=A module used to generate random data
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Data-Random
-IUSE=test
-KEYWORDS=amd64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp >=virtual/perl-Time-Piece-1.160.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BA/BAREFOOT/Data-Random-0.12.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=14cb768166c6af02e9d420585973fb49
diff --git a/metadata/md5-cache/dev-perl/Data-Section-0.200.7 b/metadata/md5-cache/dev-perl/Data-Section-0.200.7
deleted file mode 100644
index dcbfc69fc9b3..000000000000
--- a/metadata/md5-cache/dev-perl/Data-Section-0.200.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Encode >=dev-perl/MRO-Compat-0.90.0 >=dev-perl/Sub-Exporter-0.979.0 >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( dev-perl/Test-FailWarnings >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
-DESCRIPTION=read multiple hunks of data out of your DATA section
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Data-Section
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Encode >=dev-perl/MRO-Compat-0.90.0 >=dev-perl/Sub-Exporter-0.979.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-Section-0.200007.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=ea7198e9fa1e194f304bceb43b617c78
diff --git a/metadata/md5-cache/dev-perl/Data-Section-0.200.7-r1 b/metadata/md5-cache/dev-perl/Data-Section-0.200.7-r1
new file mode 100644
index 000000000000..ad9a0d3c8e2a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-Section-0.200.7-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Encode >=dev-perl/MRO-Compat-0.90.0 >=dev-perl/Sub-Exporter-0.979.0 >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( dev-perl/Test-FailWarnings >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=read multiple hunks of data out of your DATA section
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Data-Section
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Encode >=dev-perl/MRO-Compat-0.90.0 >=dev-perl/Sub-Exporter-0.979.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-Section-0.200007.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=d9ae6ccfd5736c0b29348767845cdad7
diff --git a/metadata/md5-cache/dev-perl/Data-UUID-1.221.0 b/metadata/md5-cache/dev-perl/Data-UUID-1.221.0
deleted file mode 100644
index 6c695bc5a798..000000000000
--- a/metadata/md5-cache/dev-perl/Data-UUID-1.221.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Digest-MD5 virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
-DESCRIPTION=Generate Globally/Universally Unique Identifiers (GUIDs/UUIDs)
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Data-UUID
-KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.221.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=50e5f2b3039b5c23b9a9fe2901e9bffc
diff --git a/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.150.0 b/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.150.0
new file mode 100644
index 000000000000..d36222ce4e35
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.150.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Exporter >=dev-perl/Net-Domain-TLD-1.740.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec >=virtual/perl-Test-Simple-1.302.15 dev-perl/Test2-Suite ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Domain and host name validation
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Data-Validate-Domain
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Exporter >=dev-perl/Net-Domain-TLD-1.740.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-Domain-0.15.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=d38432814621ea36b029b9a09537f4f9
diff --git a/metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0 b/metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0
deleted file mode 100644
index ab036c7bcf7f..000000000000
--- a/metadata/md5-cache/dev-perl/Data-Validate-IP-0.270.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Exporter >=dev-perl/NetAddr-IP-4 virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.960.0 dev-perl/Test-Requires ) dev-lang/perl
-DESCRIPTION=Lightweight IPv4 and IPv6 validation module
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Data-Validate-IP
-IUSE=test examples
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Exporter >=dev-perl/NetAddr-IP-4 virtual/perl-Scalar-List-Utils dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.27.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=dbac8ff1478890cc23d04372328e889c
diff --git a/metadata/md5-cache/dev-perl/Date-Extract-0.60.0 b/metadata/md5-cache/dev-perl/Date-Extract-0.60.0
deleted file mode 100644
index 253cd9eff4b8..000000000000
--- a/metadata/md5-cache/dev-perl/Date-Extract-0.60.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp dev-perl/Class-Data-Inheritable >=dev-perl/DateTime-Format-Natural-0.600.0 virtual/perl-Scalar-List-Utils virtual/perl-parent >=virtual/perl-ExtUtils-MakeMaker-6.360.0 test? ( dev-perl/Test-MockTime virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Extract probable dates from strings
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Date-Extract
-IUSE=test
-KEYWORDS=amd64
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp dev-perl/Class-Data-Inheritable >=dev-perl/DateTime-Format-Natural-0.600.0 virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Date-Extract-0.06.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=a7e326f1dab17b3ab2e80fe2a0c544b0
diff --git a/metadata/md5-cache/dev-perl/Date-Extract-0.60.0-r1 b/metadata/md5-cache/dev-perl/Date-Extract-0.60.0-r1
new file mode 100644
index 000000000000..db701e0e6dcf
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Date-Extract-0.60.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp dev-perl/Class-Data-Inheritable >=dev-perl/DateTime-Format-Natural-0.600.0 virtual/perl-Scalar-List-Utils virtual/perl-parent >=virtual/perl-ExtUtils-MakeMaker-6.360.0 test? ( dev-perl/Test-MockTime virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Extract probable dates from strings
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Date-Extract
+IUSE=test
+KEYWORDS=amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-perl/Class-Data-Inheritable >=dev-perl/DateTime-Format-Natural-0.600.0 virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Date-Extract-0.06.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=a2c03911385a5cf0c2cd80065c1c6169
diff --git a/metadata/md5-cache/dev-perl/DateTime-Calendar-Julian-0.102.0 b/metadata/md5-cache/dev-perl/DateTime-Calendar-Julian-0.102.0
deleted file mode 100644
index 7b10a2244926..000000000000
--- a/metadata/md5-cache/dev-perl/DateTime-Calendar-Julian-0.102.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-perl/DateTime-0.80.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Dates in the Julian calendar
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/DateTime-Calendar-Julian
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/DateTime-0.80.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/W/WY/WYANT/DateTime-Calendar-Julian-0.102.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=8b85dd9f72f94bc702e9cc1d44df69d7
diff --git a/metadata/md5-cache/dev-perl/DateTime-Calendar-Julian-0.106.0 b/metadata/md5-cache/dev-perl/DateTime-Calendar-Julian-0.106.0
new file mode 100644
index 000000000000..c385aec39523
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-Calendar-Julian-0.106.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/DateTime-0.80.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Dates in the Julian calendar
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/DateTime-Calendar-Julian
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/DateTime-0.80.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/W/WY/WYANT/DateTime-Calendar-Julian-0.106.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=11b4f01d094dd7f2b24d4e2eb6f16904
diff --git a/metadata/md5-cache/dev-perl/DateTime-Event-ICal-0.130.0 b/metadata/md5-cache/dev-perl/DateTime-Event-ICal-0.130.0
deleted file mode 100644
index 6328b4d073de..000000000000
--- a/metadata/md5-cache/dev-perl/DateTime-Event-ICal-0.130.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/DateTime >=dev-perl/DateTime-Event-Recurrence-0.110.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Perl DateTime extension for computing rfc2445 recurrences
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/DateTime-Event-ICal
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/DateTime >=dev-perl/DateTime-Event-Recurrence-0.110.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-ICal-0.13.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=b7a1ce6e299e180621a3e39e87c76177
diff --git a/metadata/md5-cache/dev-perl/DateTime-Event-ICal-0.130.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Event-ICal-0.130.0-r1
new file mode 100644
index 000000000000..1f9e176a14bc
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-Event-ICal-0.130.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/DateTime >=dev-perl/DateTime-Event-Recurrence-0.110.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl DateTime extension for computing rfc2445 recurrences
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/DateTime-Event-ICal
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/DateTime >=dev-perl/DateTime-Event-Recurrence-0.110.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-ICal-0.13.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=319daf80a61ccf3c73b546ca7adb8782
diff --git a/metadata/md5-cache/dev-perl/DateTime-Event-Recurrence-0.190.0 b/metadata/md5-cache/dev-perl/DateTime-Event-Recurrence-0.190.0
deleted file mode 100644
index f4797b843b0e..000000000000
--- a/metadata/md5-cache/dev-perl/DateTime-Event-Recurrence-0.190.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/DateTime-0.270.0 >=dev-perl/DateTime-Set-0.360.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=DateTime::Set extension for create basic recurrence sets
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/DateTime-Event-Recurrence
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/DateTime-0.270.0 >=dev-perl/DateTime-Set-0.360.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-Recurrence-0.19.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=ac11390f937b58fccd361e749e67df52
diff --git a/metadata/md5-cache/dev-perl/DateTime-Event-Recurrence-0.190.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Event-Recurrence-0.190.0-r1
new file mode 100644
index 000000000000..e5c93bf2e7f0
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-Event-Recurrence-0.190.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/DateTime-0.270.0 >=dev-perl/DateTime-Set-0.360.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=DateTime::Set extension for create basic recurrence sets
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/DateTime-Event-Recurrence
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/DateTime-0.270.0 >=dev-perl/DateTime-Set-0.360.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-Recurrence-0.19.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=90b01467e20da858d5f133d49ea16394
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1
deleted file mode 100644
index 848ed15dac30..000000000000
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.810.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/DateTime dev-perl/Class-Factory-Util >=dev-perl/Params-Validate-0.91 >=dev-perl/DateTime-Format-Strptime-1.0800 dev-perl/Module-Build dev-lang/perl:=[-build(-)]
-DESCRIPTION=Create DateTime parser classes and objects
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/DateTime-Format-Builder
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/DateTime dev-perl/Class-Factory-Util >=dev-perl/Params-Validate-0.91 >=dev-perl/DateTime-Format-Strptime-1.0800 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.81.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f131fea19539d3bce4220714c1e9eb13
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.830.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.830.0
index ddc7fd322cd9..1e0c07327c78 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.830.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Builder-0.830.0
@@ -5,11 +5,11 @@ DESCRIPTION=Create DateTime parser classes and objects
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-Builder
 IUSE=minimal test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1.0.0 >=dev-perl/DateTime-Format-Strptime-1.40.0 >=dev-perl/Params-Validate-0.720.0 virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.83.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=d1b0c264aa1486e9e42ffb3f1dd44998
+_md5_=0d68c9347d741eb694b3d3ab80510cde
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.340.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.340.0
new file mode 100644
index 000000000000..135907b12df8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.340.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/DateTime >=dev-perl/DateTime-Format-Builder-0.740.0 dev-perl/DateTime-TimeZone dev-perl/List-MoreUtils virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Exception dev-perl/Test-MockTime dev-perl/Test-NoWarnings >=virtual/perl-Test-Simple-0.440.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Flexibly parse strings and turn them into DateTime objects
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/DateTime-Format-Flexible
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/DateTime >=dev-perl/DateTime-Format-Builder-0.740.0 dev-perl/DateTime-TimeZone dev-perl/List-MoreUtils dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.34.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=5cb80aa57cd7895ef04b6b3a07d52dc5
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Human-Duration-0.640.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Human-Duration-0.640.0
deleted file mode 100644
index a5b7d4220e15..000000000000
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Human-Duration-0.640.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Module-Build dev-lang/perl
-DESCRIPTION=Get a locale specific string describing the span of a given duration
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/DateTime-Format-Human-Duration
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MS/MSTRAT/DateTime-Format-Human-Duration-0.64.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=8bf8e7f2f6279363c044a0601eccef7e
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Human-Duration-0.640.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-Human-Duration-0.640.0-r1
new file mode 100644
index 000000000000..53fb2c183a3c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Human-Duration-0.640.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Module-Build dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Get a locale specific string describing the span of a given duration
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/DateTime-Format-Human-Duration
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MS/MSTRAT/DateTime-Format-Human-Duration-0.64.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=76c6d9cc17f63e430d047647cd9fae34
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.140.0 b/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.140.0
deleted file mode 100644
index 9fe5e40d6360..000000000000
--- a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.140.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1.450.0 >=dev-perl/DateTime-Format-Builder-0.770.0 >=dev-perl/Params-ValidationCompiler-0.260.0 >=dev-perl/Specio-0.180.0 dev-perl/namespace-autoclean virtual/perl-parent virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-CPAN-Meta-2.120.900 virtual/perl-File-Spec >=virtual/perl-Test-Simple-1.302.15 >=dev-perl/Test2-Suite-0.0.72 ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Parses ISO8601 formats
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/DateTime-Format-ISO8601
-IUSE=test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1.450.0 >=dev-perl/DateTime-Format-Builder-0.770.0 >=dev-perl/Params-ValidationCompiler-0.260.0 >=dev-perl/Specio-0.180.0 dev-perl/namespace-autoclean virtual/perl-parent dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ISO8601-0.14.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=0bcd022e2709b9c3ff782f438cff8b9d
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.160.0 b/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.160.0
index f9badacb7f78..0631e4cef888 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.160.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.160.0
@@ -5,11 +5,11 @@ DESCRIPTION=Parses ISO8601 formats
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-ISO8601
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1.450.0 >=dev-perl/DateTime-Format-Builder-0.770.0 >=dev-perl/Params-ValidationCompiler-0.260.0 >=dev-perl/Specio-0.180.0 dev-perl/namespace-autoclean virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ISO8601-0.16.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=e7e5b218d1e36fce0ea86bbe4fe4fe67
+_md5_=f3e9f374ee6d10ba947bfc4b1d382895
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1
deleted file mode 100644
index 49ff03c01922..000000000000
--- a/metadata/md5-cache/dev-perl/DateTime-Format-ISO8601-0.80.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/DateTime dev-perl/DateTime-Format-Builder dev-perl/Module-Build test? ( dev-perl/File-Find-Rule ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Parses ISO8601 formats
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/DateTime-Format-ISO8601
-IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/DateTime dev-perl/DateTime-Format-Builder dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-0.08.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=99cc4340ceac6d076efbd8840a23019e
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0
deleted file mode 100644
index 85d422095561..000000000000
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp >=dev-perl/DateTime-1.40.0 dev-perl/Params-Validate virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Convert between DateTime and RFC2822/822 formats
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/DateTime-Format-Mail
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1.40.0 dev-perl/Params-Validate dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.403.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=389c43e964a7f838ef16056a48c5b5ce
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0-r1
new file mode 100644
index 000000000000..2119a7f19776
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.403.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1.40.0 dev-perl/Params-Validate virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Convert between DateTime and RFC2822/822 formats
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/DateTime-Format-Mail
+IUSE=test
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1.40.0 dev-perl/Params-Validate dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.403.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=bc0d5cffd65cc9c144c8a2357ebdf27d
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0-r1 b/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0-r1
index c498e2e90202..acc1fc6b9abb 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-SQLite-0.110.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Parse and format SQLite dates and times
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-SQLite
 IUSE=test
-KEYWORDS=amd64 ~arm arm64 ~ppc x86 ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~ppc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/DateTime-0.51 >=dev-perl/DateTime-Format-Builder-0.79.01 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/DateTime-Format-SQLite-0.11.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=2ed09a9a8f46fd370804449f8ab7a8c7
+_md5_=7bb0ae18122db008833eb413abe8e749
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0
index 07da1a19661d..24e28876f12b 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.740.0
@@ -4,11 +4,11 @@ DESCRIPTION=Parse and Format DateTimes using Strptime
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/DateTime-Format-Strptime
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1 >=dev-perl/DateTime-Locale-1.50.0 >=dev-perl/DateTime-TimeZone-2.90.0 virtual/perl-Exporter >=dev-perl/Package-DeprecationManager-0.150.0 dev-perl/Params-ValidationCompiler >=dev-perl/Specio-0.330.0 dev-perl/Try-Tiny virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.74.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=fcf06ef77b327d4a571cd223806c5030
+_md5_=6d154efec1d0e758585e9298d5c0f4eb
diff --git a/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0-r1 b/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0-r1
index dc5a5a422396..d3c8d28bb6d7 100644
--- a/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0-r1
+++ b/metadata/md5-cache/dev-perl/Devel-Cycle-1.120.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Find memory cycles in objects
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Devel-Cycle
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~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 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/Devel-Cycle-1.12.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=34be5afbc0f7412e420057931b51b28f
+_md5_=a46f38bccf9361b18eebc5b41c457329
diff --git a/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r2 b/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r2
index a5e822b0ba02..becf8d6eb5c8 100644
--- a/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r2
+++ b/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Find RFC 822 email addresses in plain text
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Email-Find
 IUSE=test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Email-Valid-0.179.0 dev-perl/MailTools dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Email-Find-0.10.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=d67b6229f388a623ff22b9c2134d68bf
+_md5_=e7cd5411acd2abe92077b39d997e5cdb
diff --git a/metadata/md5-cache/dev-perl/Email-Valid-1.202.0 b/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
index 5f5897da6b2a..6114b71008d6 100644
--- a/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
+++ b/metadata/md5-cache/dev-perl/Email-Valid-1.202.0
@@ -4,11 +4,11 @@ DESCRIPTION=Check validity of Internet email addresses
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Email-Valid
 IUSE=test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec dev-perl/IO-CaptureOutput virtual/perl-IO dev-perl/MailTools dev-perl/Net-DNS >=dev-perl/Net-Domain-TLD-1.650.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.202.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=aa4e47b75cf183317439410602c16f6b
+_md5_=f44e7a8777081b5b821a75a14ab1f485
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0 b/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0
index 5ccc3f6c6ac8..b5566ce6a547 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0
@@ -5,11 +5,11 @@ DESCRIPTION=Check for the presence of a compiler
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/ExtUtils-HasCompiler
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-HasCompiler-0.023.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=75278c88f655d7a1bc4cf22c4b8263de
+_md5_=c3cc98a90dcdbe0cb85a64deb5b8fc09
diff --git a/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1 b/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1
deleted file mode 100644
index 8a26fadb963f..000000000000
--- a/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.380.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=uses File::Copy to recursively copy dirs
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/File-Copy-Recursive
-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
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.38.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=332c9fd4d28f97f059d74d7ad153df09
diff --git a/metadata/md5-cache/dev-perl/File-Next-1.180.0-r1 b/metadata/md5-cache/dev-perl/File-Next-1.180.0-r1
index dee8dd461762..d2ed6851e6a8 100644
--- a/metadata/md5-cache/dev-perl/File-Next-1.180.0-r1
+++ b/metadata/md5-cache/dev-perl/File-Next-1.180.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=An iterator-based module for finding files
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Next
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=Artistic-2 GPL-2+
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/File-Next-1.18.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=78ea84f10c417934d13f7a1c53fe8688
+_md5_=be63ad65ae598ab6ea2604cc96fef8a8
diff --git a/metadata/md5-cache/dev-perl/Graphics-ColorNames-HTML-3.3.1 b/metadata/md5-cache/dev-perl/Graphics-ColorNames-HTML-3.3.1
new file mode 100644
index 000000000000..b5cb7aa8b5c4
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Graphics-ColorNames-HTML-3.3.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Graphics-ColorNames test? ( virtual/perl-File-Spec virtual/perl-Module-Metadata virtual/perl-Test-Simple dev-perl/Test-Most >=dev-perl/Type-Tiny-1.4.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=HTML color names and equivalent RGB values
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Graphics-ColorNames-HTML
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Graphics-ColorNames dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RR/RRWO/Graphics-ColorNames-HTML-v3.3.1.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=530bdba6c57c3e735569c01409318eef
diff --git a/metadata/md5-cache/dev-perl/Gtk2-1.249.930 b/metadata/md5-cache/dev-perl/Gtk2-1.249.930
index b103ae716566..f20dd981e515 100644
--- a/metadata/md5-cache/dev-perl/Gtk2-1.249.930
+++ b/metadata/md5-cache/dev-perl/Gtk2-1.249.930
@@ -5,11 +5,11 @@ DESCRIPTION=Perl bindings for GTK2
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Gtk2
 IUSE=test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=x11-libs/gtk+:2 >=dev-perl/Cairo-1 >=dev-perl/glib-perl-1.280.0 >=dev-perl/Pango-1.220.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24993.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=34f5757085f94ee96c161449528b1ad4
+_md5_=68b779ca1c14e983e1849af8b2ca3cc9
diff --git a/metadata/md5-cache/dev-perl/Gtk3-ImageView-10.0.0 b/metadata/md5-cache/dev-perl/Gtk3-ImageView-10.0.0
new file mode 100644
index 000000000000..24902dac546e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Gtk3-ImageView-10.0.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Cairo >=dev-perl/glib-perl-1.210.0 dev-perl/Gtk3 dev-perl/Readonly virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Carp-Always dev-perl/Test-Differences dev-perl/Test-MockObject dev-perl/Try-Tiny media-gfx/imagemagick[jpeg,perl,png,svg,X] virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Image viewer widget for Gtk3
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Gtk3-ImageView
+IUSE=test test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Cairo >=dev-perl/glib-perl-1.210.0 dev-perl/Gtk3 dev-perl/Readonly dev-lang/perl:=
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AS/ASOKOLOV/Gtk3-ImageView-10.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=be5dced6b8614d8dd75a9d26afb61736
diff --git a/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0 b/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
index 4cf784b7d110..2437b8c6369c 100644
--- a/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
+++ b/metadata/md5-cache/dev-perl/HTML-FromText-2.70.0
@@ -4,11 +4,11 @@ DESCRIPTION=Convert plain text to HTML
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/HTML-FromText
 IUSE=test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Find-0.90.0 >=virtual/perl-Exporter-5.58 >=dev-perl/HTML-Parser-1.260.0 >=virtual/perl-Scalar-List-Utils-1.120.0 >=virtual/perl-Text-Tabs+Wrap-98.112.800 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/HTML-FromText-2.07.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=1aaa6c7e67227c1a0abc9d15599a0e91
+_md5_=a9e0d034cdf94dd5fff88f5dd7eb896c
diff --git a/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0 b/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
index b3592e04d2e7..5b64b7d2a88b 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Cache-Transparent-1.400.0
@@ -4,11 +4,11 @@ DESCRIPTION=Cache the result of http get-requests persistently
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/HTTP-Cache-Transparent
 IUSE=test examples
-KEYWORDS=amd64 ~arm arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Storable dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATTIASH/HTTP-Cache-Transparent-1.4.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=8667d658dd903f62b988ee1c9f9ed58c
+_md5_=4c849d7742c08b90f1c93a9021fe120f
diff --git a/metadata/md5-cache/dev-perl/HTTP-Simple-0.4.0 b/metadata/md5-cache/dev-perl/HTTP-Simple-0.4.0
index e1a0d27f3257..96ce0cfde363 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Simple-0.4.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Simple-0.4.0
@@ -5,11 +5,11 @@ DESCRIPTION=Simple procedural interface to HTTP::Tiny
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/HTTP-Simple
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-File-Temp >=virtual/perl-HTTP-Tiny-0.14.0 >=virtual/perl-JSON-PP-2.70.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DB/DBOOK/HTTP-Simple-0.004.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=99e92c42eb3604804f1faacaa734ebd5
+_md5_=97ac281c3ec7952cf05529e10110198c
diff --git a/metadata/md5-cache/dev-perl/Hash-Merge-0.302.0 b/metadata/md5-cache/dev-perl/Hash-Merge-0.302.0
index ae67b47019de..ba732e33eff3 100644
--- a/metadata/md5-cache/dev-perl/Hash-Merge-0.302.0
+++ b/metadata/md5-cache/dev-perl/Hash-Merge-0.302.0
@@ -5,11 +5,11 @@ DESCRIPTION=Merges arbitrarily deep hashes into a single hash
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Hash-Merge
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Clone-Choose-0.8.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HE/HERMES/Hash-Merge-0.302.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=0ec60b6123b0cd26bf6764d7c603dbe4
+_md5_=0e863810af924401354024be7cd44e33
diff --git a/metadata/md5-cache/dev-perl/IO-HTML-1.1.0 b/metadata/md5-cache/dev-perl/IO-HTML-1.1.0
deleted file mode 100644
index 9a3609e4617f..000000000000
--- a/metadata/md5-cache/dev-perl/IO-HTML-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Carp >=virtual/perl-Encode-2.100.0 >=virtual/perl-Exporter-5.570.0 >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-Scalar-List-Utils virtual/perl-File-Temp >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Open an HTML file with automatic charset detection
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/IO-HTML
-IUSE=test
-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
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp >=virtual/perl-Encode-2.100.0 >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fe918404b9379a62ac1c70f95cbf7219
diff --git a/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1 b/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1
index 75e2277391e9..2ea2a9e62f92 100644
--- a/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1
+++ b/metadata/md5-cache/dev-perl/IO-SessionData-1.30.0-r1
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
 DESCRIPTION=Session data support module for SOAP::Lite
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/IO-SessionData
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=cc20945ebf2d0052579270b9a1bbdbf6
+_md5_=5ce9b81f2d48897785d8bb28de0102bb
diff --git a/metadata/md5-cache/dev-perl/IO-stringy-2.111.0 b/metadata/md5-cache/dev-perl/IO-stringy-2.111.0
deleted file mode 100644
index 71a1073223cc..000000000000
--- a/metadata/md5-cache/dev-perl/IO-stringy-2.111.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
-DESCRIPTION=A Perl module for I/O on in-core objects like strings and arrays
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/IO-stringy
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DS/DSKOLL/IO-stringy-2.111.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dd5a17e8356cbd4fbc8e7b63d51fd0f3
diff --git a/metadata/md5-cache/dev-perl/Inline-Files-0.690.0 b/metadata/md5-cache/dev-perl/Inline-Files-0.690.0
deleted file mode 100644
index 4768cd32cfeb..000000000000
--- a/metadata/md5-cache/dev-perl/Inline-Files-0.690.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Multiple virtual files in a single file
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Inline-Files
-IUSE=test
-KEYWORDS=~alpha amd64 ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AM/AMBS/Inline-Files-0.69.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1feac6d33f1ee76e85b503fa5ff24901
diff --git a/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2 b/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
index b83d92311823..5164fc5417eb 100644
--- a/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
+++ b/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Does your process have access to the web
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/LWP-Online
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/libwww-perl-5.805.0 >=dev-perl/URI-1.350.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/LWP-Online-1.08.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=f45c7f2bb1e0ea15b310df253acf8edd
+_md5_=50a02a47d21e90e42b5ced4d40d66e16
diff --git a/metadata/md5-cache/dev-perl/LWP-UserAgent-Determined-1.70.0 b/metadata/md5-cache/dev-perl/LWP-UserAgent-Determined-1.70.0
index 1372e5113495..5b3b1ee891a6 100644
--- a/metadata/md5-cache/dev-perl/LWP-UserAgent-Determined-1.70.0
+++ b/metadata/md5-cache/dev-perl/LWP-UserAgent-Determined-1.70.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/libwww-perl virtual/perl-ExtUtils-MakeMaker dev-lang/perl
 DESCRIPTION=A virtual browser that retries errors
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/LWP-UserAgent-Determined
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/LWP-UserAgent-Determined-1.07.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=d0e375ab8c56d8855d6206f0e8a7546d
+_md5_=c340f8b47be6e3af63560d198b81b779
diff --git a/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r2 b/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r2
index 7c40aba97c2f..cb4509186cc5 100644
--- a/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r2
+++ b/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r2
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Pick a language based on user's preferences
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Lingua-Preferred
-KEYWORDS=amd64 ~arm arm64 ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-2+ )
 RDEPEND=dev-perl/Log-TraceMessages dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ED/EDAVIS/Lingua-Preferred-0.2.4.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=2ac8bc3a98626eb47df4b5457e8d7a8a
+_md5_=7e1544171357fd67a939d2e597833fda
diff --git a/metadata/md5-cache/dev-perl/Linux-Smaps-0.140.0 b/metadata/md5-cache/dev-perl/Linux-Smaps-0.140.0
index 02e44bdb1a15..6ec76873bd61 100644
--- a/metadata/md5-cache/dev-perl/Linux-Smaps-0.140.0
+++ b/metadata/md5-cache/dev-perl/Linux-Smaps-0.140.0
@@ -5,10 +5,10 @@ DESCRIPTION=Perl interface to /proc/PID/smaps
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Linux-Smaps
 IUSE=kernel_linux
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AE/AERUDER/Linux-Smaps-0.14.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=59821512e4ce6a2df7e8ffdb423a2bd0
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9897540ae237a1507462452de809d448
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.430.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.430.0
index 4af264681f89..e1f39be18582 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.430.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.430.0
@@ -5,11 +5,11 @@ DESCRIPTION=Compiled List::MoreUtils functions
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/List-MoreUtils-XS
 IUSE=test
-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
 LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/List-MoreUtils-0.417.1 >=virtual/perl-XSLoader-0.220.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.430.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=dbba04a521d9a256ea2201d90a31bdd2
+_md5_=be47cb631d3109e0c7198ae985c2d4cc
diff --git a/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0-r1 b/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0-r1
index 9a9d29f21f4c..0659011e7955 100644
--- a/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/Locale-Maketext-Lexicon-1.0.0-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DRTECH/Locale-Maketext-Lexicon-1.00.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=324a7e7f066f102e4d6152d878c39848
+_md5_=483d0802822656ce992288dbb64a27b0
diff --git a/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r2 b/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r2
index 23f74d2a4e1a..540100da6136 100644
--- a/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r2
+++ b/metadata/md5-cache/dev-perl/Log-TraceMessages-1.400.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Logging/debugging aid
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Log-TraceMessages
 IUSE=test
-KEYWORDS=amd64 ~arm arm64 ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/HTML-FromText-1.4.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ED/EDAVIS/Log-TraceMessages-1.4.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=6fbc4015317ebff2e7ec4486d904fbc7
+_md5_=366b5a759d934f5af0f6550fe95d5021
diff --git a/metadata/md5-cache/dev-perl/Mail-AuthenticationResults-2.202.101.120 b/metadata/md5-cache/dev-perl/Mail-AuthenticationResults-2.202.101.120
index e3dcb378ac7d..3874589c0661 100644
--- a/metadata/md5-cache/dev-perl/Mail-AuthenticationResults-2.202.101.120
+++ b/metadata/md5-cache/dev-perl/Mail-AuthenticationResults-2.202.101.120
@@ -5,11 +5,11 @@ DESCRIPTION=Object Oriented Authentication-Results Headers
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-AuthenticationResults
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/JSON virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-2.20210112.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=165b400cf0be33546c1f4414a34ebe83
+_md5_=ed1d3151030a108d7b07e10e9e08bad9
diff --git a/metadata/md5-cache/dev-perl/Mail-DKIM-1.202.9.070 b/metadata/md5-cache/dev-perl/Mail-DKIM-1.202.9.070
index fa725201dc74..84d8b6b25162 100644
--- a/metadata/md5-cache/dev-perl/Mail-DKIM-1.202.9.070
+++ b/metadata/md5-cache/dev-perl/Mail-DKIM-1.202.9.070
@@ -5,11 +5,11 @@ DESCRIPTION=Signs/verifies Internet mail using DKIM message signatures
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-DKIM
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Crypt-OpenSSL-RSA-0.240.0 virtual/perl-Digest-SHA virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/Mail-AuthenticationResults dev-perl/Net-DNS dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-1.20200907.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=72899046087811474893e1b025cbc7bf
+_md5_=40612e0bd5a06d417fa4751566ac35de
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 82b5579cd2dd..5f96a634805b 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Mouse-2.4.10 b/metadata/md5-cache/dev-perl/Mouse-2.4.10
deleted file mode 100644
index 4aee88c37f83..000000000000
--- a/metadata/md5-cache/dev-perl/Mouse-2.4.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-Scalar-List-Utils-1.140.0 >=virtual/perl-XSLoader-0.20.0 >=virtual/perl-ExtUtils-ParseXS-3.220.0 >=virtual/perl-Devel-PPPort-3.220.0 >=dev-perl/Module-Build-0.400.500 dev-perl/Module-Build-XSUtil test? ( dev-perl/Test-Exception dev-perl/Test-Fatal dev-perl/Test-LeakTrace >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-Output dev-perl/Test-Requires dev-perl/Try-Tiny ) dev-lang/perl
-DESCRIPTION=Moose minus the antlers
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Mouse
-IUSE=test examples
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Scalar-List-Utils-1.140.0 >=virtual/perl-XSLoader-0.20.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GF/GFUJI/Mouse-v2.4.10.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=a0efdde16b6cb01da9841fe053d3c6bf
diff --git a/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0-r1 b/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0-r1
index 3eaa44212dc5..24dd99d876e5 100644
--- a/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Current top level domain names including new ICANN additions and ccT
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-Domain-TLD
 IUSE=test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Storable dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXP/Net-Domain-TLD-1.75.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=7fc69d0336bab772a817b632cd5f9f1e
+_md5_=5e601818a7c54a40cc43837b81ef4478
diff --git a/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r2 b/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r2
index 4262860f7dde..45699f35e520 100644
--- a/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r2
+++ b/metadata/md5-cache/dev-perl/Net-Jabber-2.0.0-r2
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Jabber Perl library
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Net-Jabber
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XML-Stream dev-perl/Net-XMPP dev-perl/Digest-SHA1 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REATMON/Net-Jabber-2.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=7a1f922cc475403cba6841c89d46299e
+_md5_=cf3884f77eee91aad4fe44db1a128258
diff --git a/metadata/md5-cache/dev-perl/Net-Netmask-1.902.200 b/metadata/md5-cache/dev-perl/Net-Netmask-1.902.200
deleted file mode 100644
index 77e629bd9f6d..000000000000
--- a/metadata/md5-cache/dev-perl/Net-Netmask-1.902.200
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
-DESCRIPTION=Parse, manipulate and lookup IP network blocks
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Net-Netmask
-KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ~ppc64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Net-Netmask-1.9022.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cd99696043af28153c8b76b90e4ddeba
diff --git a/metadata/md5-cache/dev-perl/Net-OpenSSH-0.800.0 b/metadata/md5-cache/dev-perl/Net-OpenSSH-0.800.0
index b15dbb4c0e39..38296723e901 100644
--- a/metadata/md5-cache/dev-perl/Net-OpenSSH-0.800.0
+++ b/metadata/md5-cache/dev-perl/Net-OpenSSH-0.800.0
@@ -5,11 +5,11 @@ DESCRIPTION=Net::OpenSSH, Perl wrapper for OpenSSH secure shell client
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-OpenSSH
 IUSE=minimal test examples
-KEYWORDS=~amd64 ~hppa ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/ssh dev-perl/IO-Tty !minimal? ( dev-perl/Net-SSH-Any dev-perl/Net-SFTP-Foreign ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.80.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=f5903195291db1bab5109c5bb83a5995
+_md5_=344f43c5b2d73eb04a3fc728e4367c45
diff --git a/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0-r1 b/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0-r1
index aa60e3ff4c7b..1073845b2f57 100644
--- a/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=XMPP Perl Library
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-XMPP
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-perl/Authen-SASL-2.120.0 virtual/perl-Digest-SHA virtual/perl-Scalar-List-Utils >=dev-perl/XML-Stream-1.240.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAPATRICK/Net-XMPP-1.05.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=a4e5b7bc9964da83a88185aafbbdc630
+_md5_=b223c1535d1cb6a9709b81104b733aff
diff --git a/metadata/md5-cache/dev-perl/Number-Fraction-3.0.4 b/metadata/md5-cache/dev-perl/Number-Fraction-3.0.4
index 9d91469fd414..6f3ce5ba7b11 100644
--- a/metadata/md5-cache/dev-perl/Number-Fraction-3.0.4
+++ b/metadata/md5-cache/dev-perl/Number-Fraction-3.0.4
@@ -1,6 +1,6 @@
-BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+BDEPEND=>=dev-perl/Module-Build-0.420.0 test? ( virtual/perl-Test-Simple dev-perl/Test-Warn ) dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp dev-perl/Moo dev-perl/MooX-Types-MooseLike >=dev-perl/Module-Build-0.420.0 test? ( virtual/perl-Test-Simple dev-perl/Test-Warn ) dev-lang/perl
+DEPEND=virtual/perl-Carp dev-perl/Moo dev-perl/MooX-Types-MooseLike dev-lang/perl
 DESCRIPTION=Perl extension to model fractions
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Number-Fraction
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Number-Fraction-v3.0.4.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=2eb17bfdf09c3a212a0e5ce72eee269f
+_md5_=3bd7c6c20266e59da9ee20cd0deb9798
diff --git a/metadata/md5-cache/dev-perl/PDL-2.54.0 b/metadata/md5-cache/dev-perl/PDL-2.54.0
index 96f76838ffbf..7b77373c7a49 100644
--- a/metadata/md5-cache/dev-perl/PDL-2.54.0
+++ b/metadata/md5-cache/dev-perl/PDL-2.54.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl Data Language for scientific computing
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/PDL
 IUSE=+badval doc fortran gd gsl hdf netpbm pdl2 pgplot threads test test examples
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ ) public-domain PerlDL
 RDEPEND=sys-libs/ncurses:0= app-arch/sharutils dev-perl/Astro-FITS-Header dev-perl/Convert-UU >=virtual/perl-Data-Dumper-2.121.0 >=dev-perl/File-Map-0.570.0 >=virtual/perl-Filter-Simple-0.880.0 dev-perl/Filter >=dev-perl/Inline-0.830.0 >=dev-perl/Inline-C-0.620.0 >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Module-Compile >=dev-perl/OpenGL-0.700.0 >=dev-perl/TermReadKey-2.340.0 || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) >=virtual/perl-Data-Dumper-2.121.0 dev-perl/Pod-Parser virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Filter-Simple virtual/perl-Storable >=virtual/perl-Text-Balanced-1.890.0 fortran? ( >=dev-perl/ExtUtils-F77-1.260.0 ) gd? ( media-libs/gd ) gsl? ( sci-libs/gsl ) hdf? ( sci-libs/hdf dev-perl/Alien-HDF4 ) netpbm? ( media-libs/netpbm media-video/ffmpeg ) pdl2? ( >=dev-perl/Devel-REPL-1.3.11 || ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu ) ) pgplot? ( dev-perl/PGPLOT ) dev-lang/perl:= fortran? ( virtual/fortran )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/PDL-2.054.tar.gz
 _eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75dc3c480ba0141af6b6d1a33605d57d
+_md5_=c7001fba1f39e50ac74d1f00d453f662
diff --git a/metadata/md5-cache/dev-perl/PDL-Transform-Color-1.5.0 b/metadata/md5-cache/dev-perl/PDL-Transform-Color-1.5.0
index 877fcbff0bca..ad653b2ddd51 100644
--- a/metadata/md5-cache/dev-perl/PDL-Transform-Color-1.5.0
+++ b/metadata/md5-cache/dev-perl/PDL-Transform-Color-1.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Useful color system conversions for PDL
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/PDL-Transform-Color
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/PDL dev-perl/Safe-Isa dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/PDL-Transform-Color-1.005.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=5022c9916932e3f12037e239dfe0df99
+_md5_=b8540877e8a5192d74010e7e97060867
diff --git a/metadata/md5-cache/dev-perl/POSIX-strftime-Compiler-0.440.0 b/metadata/md5-cache/dev-perl/POSIX-strftime-Compiler-0.440.0
index 86028de278c5..401c190e8ead 100644
--- a/metadata/md5-cache/dev-perl/POSIX-strftime-Compiler-0.440.0
+++ b/metadata/md5-cache/dev-perl/POSIX-strftime-Compiler-0.440.0
@@ -5,11 +5,11 @@ DESCRIPTION=GNU C library compatible strftime for loggers and servers
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/POSIX-strftime-Compiler
 IUSE=minimal test examples
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Time-TZOffset ) virtual/perl-Carp virtual/perl-Exporter virtual/perl-Time-Local dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/POSIX-strftime-Compiler-0.44.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=3a8f08091ba74dfaea4e4de40b3392de
+_md5_=082688618bedace29069d7b549c09255
diff --git a/metadata/md5-cache/dev-perl/PPIx-Utils-0.3.0 b/metadata/md5-cache/dev-perl/PPIx-Utils-0.3.0
index 01075a4a2aba..1af0d6e25dcc 100644
--- a/metadata/md5-cache/dev-perl/PPIx-Utils-0.3.0
+++ b/metadata/md5-cache/dev-perl/PPIx-Utils-0.3.0
@@ -5,11 +5,11 @@ DESCRIPTION=Utility functions for PPI
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/PPIx-Utils
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Keywords-1.90.0 virtual/perl-Exporter >=dev-perl/PPI-1.250.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DB/DBOOK/PPIx-Utils-0.003.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=f003d5fd04a913ccca6fe91b2a97742e
+_md5_=0bb2c1fa8eff4e72cfda242a1f7d91b0
diff --git a/metadata/md5-cache/dev-perl/Package-Stash-0.390.0 b/metadata/md5-cache/dev-perl/Package-Stash-0.390.0
index 9e3274f71969..94e479590d7b 100644
--- a/metadata/md5-cache/dev-perl/Package-Stash-0.390.0
+++ b/metadata/md5-cache/dev-perl/Package-Stash-0.390.0
@@ -5,11 +5,11 @@ DESCRIPTION=Routines for manipulating stashes
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Package-Stash
 IUSE=minimal test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Getopt-Long >=dev-perl/Module-Implementation-0.60.0 virtual/perl-Scalar-List-Utils !minimal? ( >=dev-perl/Package-Stash-XS-0.260.0 ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.39.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=5c6bdc60ea4560c6bca88ea48eadf79f
+_md5_=6cf94647cff4872b5af438cad11d37a1
diff --git a/metadata/md5-cache/dev-perl/Perl-MinimumVersion-1.400.0 b/metadata/md5-cache/dev-perl/Perl-MinimumVersion-1.400.0
index 1c4977609ff8..684c50e6ef52 100644
--- a/metadata/md5-cache/dev-perl/Perl-MinimumVersion-1.400.0
+++ b/metadata/md5-cache/dev-perl/Perl-MinimumVersion-1.400.0
@@ -5,11 +5,11 @@ DESCRIPTION=Find a minimum required version of perl for Perl code
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Perl-MinimumVersion
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-perl/File-Find-Rule dev-perl/File-Find-Rule-Perl virtual/perl-File-Spec virtual/perl-Getopt-Long >=virtual/perl-Scalar-List-Utils-1.200.0 >=dev-perl/PPI-1.215.0 >=dev-perl/PPIx-Regexp-0.33.0 dev-perl/PPIx-Utils >=dev-perl/Params-Util-0.250.0 >=dev-perl/Perl-Critic-1.104.0 >=virtual/perl-version-0.760.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DB/DBOOK/Perl-MinimumVersion-1.40.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=60aad47686d42580ce448b9a046d4cf8
+_md5_=8c8f694f003e80fa30b7bc5c465728e4
diff --git a/metadata/md5-cache/dev-perl/Perl-PrereqScanner-1.24.0 b/metadata/md5-cache/dev-perl/Perl-PrereqScanner-1.24.0
index 90e2db07b838..5747664eb7de 100644
--- a/metadata/md5-cache/dev-perl/Perl-PrereqScanner-1.24.0
+++ b/metadata/md5-cache/dev-perl/Perl-PrereqScanner-1.24.0
@@ -5,11 +5,11 @@ DESCRIPTION=a tool to scan your Perl code for its prerequisites
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Perl-PrereqScanner
 IUSE=minimal test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-CPAN-Meta-Requirements-2.124.0 virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Getopt-Long-Descriptive >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/Module-Path dev-perl/Moose >=dev-perl/PPI-1.215.0 dev-perl/Params-Util >=dev-perl/String-RewritePrefix-0.5.0 dev-perl/namespace-autoclean dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.024.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=b35875bc776c2c9aaacefc6a38552667
+_md5_=08a94947d35dfef7dbed4fd0009b532b
diff --git a/metadata/md5-cache/dev-perl/Perl-Tidy-20210717.0.0 b/metadata/md5-cache/dev-perl/Perl-Tidy-20210717.0.0
index 51cd80bbb289..988be6d01ffb 100644
--- a/metadata/md5-cache/dev-perl/Perl-Tidy-20210717.0.0
+++ b/metadata/md5-cache/dev-perl/Perl-Tidy-20210717.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl script indenter and beautifier
 EAPI=8
 HOMEPAGE=http://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Tidy
 IUSE=test examples
-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
 LICENSE=GPL-2+
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20210717.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=a72c394ed5f825890f66621cadd26f57
+_md5_=f2412cf4649fb55beaa28e250848d7c0
diff --git a/metadata/md5-cache/dev-perl/PerlIO-eol-0.170.0 b/metadata/md5-cache/dev-perl/PerlIO-eol-0.170.0
index 3b29a7a93783..71ccf3bbed17 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-eol-0.170.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-eol-0.170.0
@@ -5,11 +5,11 @@ DESCRIPTION=PerlIO layer for normalizing line endings
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/PerlIO-eol
 IUSE=test
-KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/PerlIO-eol-0.17.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=0152cd90e6c4a4b95571f167ea85f853
+_md5_=dbd637e895d396754dc4644fa6fb6cc7
diff --git a/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.8.0 b/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.8.0
index 51b74a80a440..5dd4d62a728c 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.8.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.8.0
@@ -5,11 +5,11 @@ DESCRIPTION=Fast and correct UTF-8 IO
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/PerlIO-utf8_strict
 IUSE=test
-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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.008.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=9d2b0bf861828201f460cc50a9c70876
+_md5_=3f95469c138ce9c0186ab1026e499c69
diff --git a/metadata/md5-cache/dev-perl/Plack-1.4.800 b/metadata/md5-cache/dev-perl/Plack-1.4.800
index cb3ace7d3039..233556ea907a 100644
--- a/metadata/md5-cache/dev-perl/Plack-1.4.800
+++ b/metadata/md5-cache/dev-perl/Plack-1.4.800
@@ -5,11 +5,11 @@ DESCRIPTION=Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Plack
 IUSE=minimal test examples
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/CGI-Compile dev-perl/CGI-Emulate-PSGI dev-perl/FCGI dev-perl/FCGI-ProcManager >=dev-perl/libwww-perl-5.814.0 >=dev-perl/Log-Dispatch-2.250.0 dev-perl/Log-Log4perl dev-perl/Module-Refresh ) >=dev-perl/Apache-LogFormat-Compiler-0.330.0 >=dev-perl/Cookie-Baker-0.70.0 >=dev-perl/Devel-StackTrace-1.230.0 >=dev-perl/Devel-StackTrace-AsHTML-0.110.0 >=dev-perl/File-ShareDir-1.0.0 dev-perl/Filesys-Notify-Simple >=dev-perl/HTTP-Entity-Parser-0.250.0 >=dev-perl/HTTP-Headers-Fast-0.180.0 >=dev-perl/HTTP-Message-5.814.0 >=virtual/perl-HTTP-Tiny-0.34.0 >=dev-perl/Hash-MultiValue-0.50.0 >=dev-perl/Pod-Parser-1.360.0 >=dev-perl/Stream-Buffered-0.20.0 >=dev-perl/Test-TCP-2.150.0 dev-perl/Try-Tiny >=dev-perl/URI-1.590.0 >=dev-perl/WWW-Form-UrlEncoded-0.230.0 virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0048.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=5fb7b82a4108f274607f7b1cc4417e78
+_md5_=2bc2ba7ef46c228098172c186442d5e5
diff --git a/metadata/md5-cache/dev-perl/Pod-Elemental-0.103.5 b/metadata/md5-cache/dev-perl/Pod-Elemental-0.103.5
index d138bb7c5c96..b7a88e8987cc 100644
--- a/metadata/md5-cache/dev-perl/Pod-Elemental-0.103.5
+++ b/metadata/md5-cache/dev-perl/Pod-Elemental-0.103.5
@@ -5,11 +5,11 @@ DESCRIPTION=Work with nestable Pod elements
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Pod-Elemental
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Load virtual/perl-Encode virtual/perl-Scalar-List-Utils dev-perl/Mixin-Linewise dev-perl/Moose dev-perl/MooseX-Types >=dev-perl/Pod-Eventual-0.4.0 dev-perl/String-RewritePrefix dev-perl/String-Truncate dev-perl/Sub-Exporter dev-perl/Sub-Exporter-ForMethods dev-perl/namespace-autoclean dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.103005.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=a4009861260f423b6f0440da0f3b82c1
+_md5_=c447a336d08e90e848b245182ddf78fc
diff --git a/metadata/md5-cache/dev-perl/Pod-Eventual-0.94.2 b/metadata/md5-cache/dev-perl/Pod-Eventual-0.94.2
index 15bd412d34c3..cdeb50df98ea 100644
--- a/metadata/md5-cache/dev-perl/Pod-Eventual-0.94.2
+++ b/metadata/md5-cache/dev-perl/Pod-Eventual-0.94.2
@@ -5,11 +5,11 @@ DESCRIPTION=read a POD document as a series of trivial events
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Pod-Eventual
 IUSE=test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Mixin-Linewise-0.102.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.094002.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=1d491b1ce1e432621cde3cfa8fab5502
+_md5_=46eb9836df4f607483b752b54623afdb
diff --git a/metadata/md5-cache/dev-perl/Pod-Markdown-3.300.0 b/metadata/md5-cache/dev-perl/Pod-Markdown-3.300.0
index 6c66d6127551..de32ac5f3391 100644
--- a/metadata/md5-cache/dev-perl/Pod-Markdown-3.300.0
+++ b/metadata/md5-cache/dev-perl/Pod-Markdown-3.300.0
@@ -5,11 +5,11 @@ DESCRIPTION=Convert POD to Markdown
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Pod-Markdown
 IUSE=minimal test
-KEYWORDS=~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/HTML-Parser ) virtual/perl-Encode virtual/perl-Getopt-Long >=virtual/perl-Pod-Simple-3.270.0 dev-perl/URI virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.300.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=eb3b33af7adfdb4ae4ecc60fd4f3fbce
+_md5_=c3726e2472ca56930a79951b78a35d70
diff --git a/metadata/md5-cache/dev-perl/Pod-Tests-1.200.0 b/metadata/md5-cache/dev-perl/Pod-Tests-1.200.0
index f1191ba5ac2f..b1b1eff1d456 100644
--- a/metadata/md5-cache/dev-perl/Pod-Tests-1.200.0
+++ b/metadata/md5-cache/dev-perl/Pod-Tests-1.200.0
@@ -5,11 +5,11 @@ DESCRIPTION=Extracts embedded tests and code examples from POD
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Pod-Tests
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Pod-Tests-1.20.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=7187ef5e29b86015239a2f6397a1e14a
+_md5_=99623ec9aa5c61ca6e787cbdf933f3c1
diff --git a/metadata/md5-cache/dev-perl/Pod-Weaver-4.18.0 b/metadata/md5-cache/dev-perl/Pod-Weaver-4.18.0
index a2fc74ed78cf..f1f8903e5bd0 100644
--- a/metadata/md5-cache/dev-perl/Pod-Weaver-4.18.0
+++ b/metadata/md5-cache/dev-perl/Pod-Weaver-4.18.0
@@ -5,11 +5,11 @@ DESCRIPTION=Weave together a Pod document from an outline
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Pod-Weaver
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Config-MVP-2.0.0 dev-perl/Config-MVP-Reader-INI dev-perl/DateTime virtual/perl-File-Spec dev-perl/List-MoreUtils >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Log-Dispatchouli-1.100.710 >=dev-perl/Mixin-Linewise-0.103.0 dev-perl/Module-Runtime dev-perl/Moose dev-perl/Params-Util >=dev-perl/Pod-Elemental-0.100.220 >=dev-perl/String-Flogger-1.0.0 >=dev-perl/String-Formatter-0.100.680 dev-perl/String-RewritePrefix dev-perl/Text-Template virtual/perl-Text-Tabs+Wrap dev-perl/namespace-autoclean dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.018.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=09adbec8698a35e74ea206b9591c4437
+_md5_=fb8a1fd72fc9e2a6d9f59119863351ff
diff --git a/metadata/md5-cache/dev-perl/Proc-ProcessTable-0.590.0 b/metadata/md5-cache/dev-perl/Proc-ProcessTable-0.590.0
index 756e0bd9118a..f87f4e949b0f 100644
--- a/metadata/md5-cache/dev-perl/Proc-ProcessTable-0.590.0
+++ b/metadata/md5-cache/dev-perl/Proc-ProcessTable-0.590.0
@@ -5,11 +5,11 @@ DESCRIPTION=Unix process table information
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Proc-ProcessTable
 IUSE=examples test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Storable dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.59.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=ba394cbd3ee316037fcdd3d53c251068
+_md5_=898bf83b9fbc2a64bd8a7f2b908fd6a3
diff --git a/metadata/md5-cache/dev-perl/RPC-XML-0.820.0 b/metadata/md5-cache/dev-perl/RPC-XML-0.820.0
index 8555ead8e7af..26940c57e115 100644
--- a/metadata/md5-cache/dev-perl/RPC-XML-0.820.0
+++ b/metadata/md5-cache/dev-perl/RPC-XML-0.820.0
@@ -1,15 +1,15 @@
-BDEPEND=virtual/perl-Carp >=dev-perl/HTTP-Daemon-6.120.0 >=dev-perl/HTTP-Message-6.260.0 >=dev-perl/libwww-perl-6.510.0 >=virtual/perl-Module-Load-0.360.0 >=virtual/perl-Scalar-List-Utils-1.550.0 >=dev-perl/XML-Parser-2.460.0 >=virtual/perl-ExtUtils-MakeMaker-7.560.0 test? ( virtual/perl-IO-Socket-IP >=virtual/perl-Test-Simple-1.302.183 ) dev-lang/perl
+BDEPEND=virtual/perl-Carp >=dev-perl/HTTP-Daemon-6.120.0 >=dev-perl/HTTP-Message-6.260.0 >=dev-perl/libwww-perl-6.510.0 >=virtual/perl-Module-Load-0.360.0 >=virtual/perl-Scalar-List-Utils-1.550.0 >=dev-perl/XML-Parser-2.460.0 >=virtual/perl-ExtUtils-MakeMaker-7.560.0 test? ( virtual/perl-IO-Socket-IP dev-perl/Net-Server >=virtual/perl-Test-Simple-1.302.183 ) dev-lang/perl
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=dev-lang/perl
 DESCRIPTION=An implementation of XML-RPC
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/RPC-XML
 IUSE=test examples
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic-2 LGPL-2.1 )
 RDEPEND=virtual/perl-Carp >=dev-perl/HTTP-Daemon-6.120.0 >=dev-perl/HTTP-Message-6.260.0 >=dev-perl/libwww-perl-6.510.0 >=virtual/perl-Module-Load-0.360.0 >=virtual/perl-Scalar-List-Utils-1.550.0 >=dev-perl/XML-Parser-2.460.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.82.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=f8b519b9a85a2ebd6b70c6ff97b4213a
+_md5_=c364af35c1601c63821f7d19c812b66e
diff --git a/metadata/md5-cache/dev-perl/RRD-Simple-1.440.0-r2 b/metadata/md5-cache/dev-perl/RRD-Simple-1.440.0-r2
deleted file mode 100644
index cb31853f99a0..000000000000
--- a/metadata/md5-cache/dev-perl/RRD-Simple-1.440.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-analyzer/rrdtool[perl] dev-perl/Module-Build test? ( >=dev-perl/Test-Deep-0.93.0 ) dev-lang/perl
-DESCRIPTION=Simple interface to create and store data in RRD files
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/RRD-Simple
-IUSE=test examples
-KEYWORDS=~amd64
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=net-analyzer/rrdtool[perl] dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/N/NI/NICOLAW/RRD-Simple-1.44.tar.gz https://dev.gentoo.org/~kentnl/distfiles/RRD-Simple-1.44-patches-1.tar.xz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=8f82c271042912933932d77a46ea9944
diff --git a/metadata/md5-cache/dev-perl/RRD-Simple-1.440.0-r3 b/metadata/md5-cache/dev-perl/RRD-Simple-1.440.0-r3
new file mode 100644
index 000000000000..e71c8fd0a605
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/RRD-Simple-1.440.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=net-analyzer/rrdtool[graph,perl] dev-perl/Module-Build test? ( >=dev-perl/Test-Deep-0.93.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Simple interface to create and store data in RRD files
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/RRD-Simple
+IUSE=test examples
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=net-analyzer/rrdtool[graph,perl] dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NI/NICOLAW/RRD-Simple-1.44.tar.gz https://dev.gentoo.org/~kentnl/distfiles/RRD-Simple-1.44-patches-1.tar.xz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=4b6e98d6c5743d2dd1b42d538aa62e13
diff --git a/metadata/md5-cache/dev-perl/Ref-Util-0.204.0 b/metadata/md5-cache/dev-perl/Ref-Util-0.204.0
index ae2af7225c48..c445b1fde3b9 100644
--- a/metadata/md5-cache/dev-perl/Ref-Util-0.204.0
+++ b/metadata/md5-cache/dev-perl/Ref-Util-0.204.0
@@ -5,11 +5,11 @@ DESCRIPTION=Utility functions for checking references
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Ref-Util
 IUSE=+xs test
-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
 LICENSE=MIT
 RDEPEND=xs? ( dev-perl/Ref-Util-XS ) >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AR/ARC/Ref-Util-0.204.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=fcb281a888feb69f6e8286f12f452fde
+_md5_=f4ce605b244b387e93f4bfdec09007d4
diff --git a/metadata/md5-cache/dev-perl/Ref-Util-XS-0.117.0 b/metadata/md5-cache/dev-perl/Ref-Util-XS-0.117.0
index bb43c7f76214..6a9c7e689291 100644
--- a/metadata/md5-cache/dev-perl/Ref-Util-XS-0.117.0
+++ b/metadata/md5-cache/dev-perl/Ref-Util-XS-0.117.0
@@ -5,11 +5,11 @@ DESCRIPTION=XS Implementation for Ref::Util
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Ref-Util-XS
 IUSE=test
-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
 LICENSE=MIT
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XS/XSAWYERX/Ref-Util-XS-0.117.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=4a451250cb2f1954762b699a1009b3df
+_md5_=1d8245a1e13502df7d6ccecd2bb50eaa
diff --git a/metadata/md5-cache/dev-perl/Regexp-Util-0.5.0 b/metadata/md5-cache/dev-perl/Regexp-Util-0.5.0
index a0fd48cc052a..a517609a05df 100644
--- a/metadata/md5-cache/dev-perl/Regexp-Util-0.5.0
+++ b/metadata/md5-cache/dev-perl/Regexp-Util-0.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=General purpose utilities for working with Regular Expressions
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Regexp-Util
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Exporter-Tiny dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Regexp-Util-0.005.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=52d39b613036f8f4f5f5db7f8cb7eefd
+_md5_=b74867eccd76b12cd6577a275eb0da91
diff --git a/metadata/md5-cache/dev-perl/SDL-2.548.0 b/metadata/md5-cache/dev-perl/SDL-2.548.0
index 8d07a6591bb4..aab7c5bb5e83 100644
--- a/metadata/md5-cache/dev-perl/SDL-2.548.0
+++ b/metadata/md5-cache/dev-perl/SDL-2.548.0
@@ -5,11 +5,11 @@ DESCRIPTION=Simple DirectMedia Layer (SDL) bindings for perl
 EAPI=8
 HOMEPAGE=http://sdl.perl.org/ http://search.cpan.org/dist/SDL/ https://github.com/PerlGameDev/SDL
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=amd64 ~hppa ~x86
 LICENSE=GPL-2 OFL-1.1
 RDEPEND=>=dev-perl/Alien-SDL-1.446 dev-perl/Capture-Tiny >=virtual/perl-CPAN-1.920.0 >=virtual/perl-ExtUtils-CBuilder-0.260.301 >=dev-perl/File-ShareDir-1.0.0 >=dev-perl/Module-Build-0.400.0 virtual/perl-Scalar-List-Utils dev-perl/Tie-Simple media-libs/libpng:0 media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf media-libs/smpeg media-libs/tiff:0 virtual/glu virtual/jpeg:0 virtual/opengl dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FROGGS/SDL-2.548.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=e17b458b635adffa53487c37e38d1093
+_md5_=981983b2ec7637a18910a4d03b22e541
diff --git a/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0 b/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
index c657e2c47f94..2d77f804b435 100644
--- a/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
+++ b/metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight interface to the SOAP protocol both on client and server
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/SOAP-Lite
 IUSE=ssl test xmpp examples
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Inspector >=dev-perl/IO-SessionData-1.30.0 dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-perl/URI >=dev-perl/XML-Parser-2.230.0 dev-perl/MIME-tools ssl? ( dev-perl/IO-Socket-SSL dev-perl/LWP-Protocol-https dev-perl/Crypt-SSLeay ) xmpp? ( dev-perl/Net-Jabber ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.26.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=2f6501c9975bbdad0587a8b378dadaf9
+_md5_=316e5e7f899e9db1cb3955168fcd00d8
diff --git a/metadata/md5-cache/dev-perl/SOAP-Lite-1.270.0 b/metadata/md5-cache/dev-perl/SOAP-Lite-1.270.0
index 48ee4d0b8b6c..f707f41ad1a3 100644
--- a/metadata/md5-cache/dev-perl/SOAP-Lite-1.270.0
+++ b/metadata/md5-cache/dev-perl/SOAP-Lite-1.270.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-perl/Class-Inspector >=dev-perl/IO-SessionData-1.30.0 dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-perl/URI >=dev-perl/XML-Parser-2.230.0 dev-perl/MIME-tools ssl? ( dev-perl/IO-Socket-SSL dev-perl/LWP-Protocol-https dev-perl/Crypt-SSLeay ) xmpp? ( dev-perl/Net-Jabber ) virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-IO virtual/perl-Test-Simple dev-perl/Test-Warn >=dev-perl/XML-Parser-Lite-0.715.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+BDEPEND=dev-perl/Class-Inspector >=dev-perl/IO-SessionData-1.30.0 dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-perl/URI >=dev-perl/XML-Parser-2.230.0 dev-perl/MIME-tools ssl? ( dev-perl/IO-Socket-SSL dev-perl/LWP-Protocol-https dev-perl/Crypt-SSLeay ) xmpp? ( dev-perl/Net-Jabber ) virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/HTTP-Daemon virtual/perl-IO virtual/perl-Test-Simple dev-perl/Test-Warn >=dev-perl/XML-Parser-Lite-0.715.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-lang/perl
 DESCRIPTION=Lightweight interface to the SOAP protocol both on client and server side
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/SOAP-Lite
 IUSE=ssl test xmpp test examples
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Inspector >=dev-perl/IO-SessionData-1.30.0 dev-perl/libwww-perl virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-perl/URI >=dev-perl/XML-Parser-2.230.0 dev-perl/MIME-tools ssl? ( dev-perl/IO-Socket-SSL dev-perl/LWP-Protocol-https dev-perl/Crypt-SSLeay ) xmpp? ( dev-perl/Net-Jabber ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.27.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=1583006514c6b6f3876d447e462b7c10
+_md5_=fb7edc4da10d43b0094b6f6f32b65156
diff --git a/metadata/md5-cache/dev-perl/SQL-Statement-1.414.0 b/metadata/md5-cache/dev-perl/SQL-Statement-1.414.0
index aee0ef19db02..11fac5fde3a2 100644
--- a/metadata/md5-cache/dev-perl/SQL-Statement-1.414.0
+++ b/metadata/md5-cache/dev-perl/SQL-Statement-1.414.0
@@ -5,11 +5,11 @@ DESCRIPTION=Small SQL parser and engine
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/SQL-Statement
 IUSE=minimal test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Math-Base-Convert >=virtual/perl-Math-Complex-1.560.0 >=dev-perl/Text-Soundex-3.40.0 ) virtual/perl-Carp >=dev-perl/Clone-0.300.0 virtual/perl-Data-Dumper dev-perl/Module-Runtime >=dev-perl/Params-Util-1.0.0 >=virtual/perl-Scalar-List-Utils-1.0.0 virtual/perl-Text-Balanced dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/SQL-Statement-1.414.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=91ddc6747323dbee67c67cdec9867987
+_md5_=7b0595cc4f219561490b44e9988cb4c7
diff --git a/metadata/md5-cache/dev-perl/SUPER-1.201.905.310 b/metadata/md5-cache/dev-perl/SUPER-1.201.905.310
index a5cd9f8eb1e9..f95107283c68 100644
--- a/metadata/md5-cache/dev-perl/SUPER-1.201.905.310
+++ b/metadata/md5-cache/dev-perl/SUPER-1.201.905.310
@@ -5,11 +5,11 @@ DESCRIPTION=control superclass method dispatch
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/SUPER
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils dev-perl/Sub-Identify dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHROMATIC/SUPER-1.20190531.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=b23085e2c7b5b265f5a33761c68052f5
+_md5_=238733f35ca41a790d4f99f652d27a48
diff --git a/metadata/md5-cache/dev-perl/SVG-2.860.0 b/metadata/md5-cache/dev-perl/SVG-2.860.0
index dd01a6984b13..dc6c43b153a8 100644
--- a/metadata/md5-cache/dev-perl/SVG-2.860.0
+++ b/metadata/md5-cache/dev-perl/SVG-2.860.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl extension for generating Scalable Vector Graphics (SVG) documen
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/SVG
 IUSE=test examples
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-parent virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/SVG-2.86.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=af300f4cc7b07d02513a3e6967853749
+_md5_=173b7d18b26d6f0efefb9fcec63b3242
diff --git a/metadata/md5-cache/dev-perl/Safe-Hole-0.140.0 b/metadata/md5-cache/dev-perl/Safe-Hole-0.140.0
index 817454c422be..c41a175fef05 100644
--- a/metadata/md5-cache/dev-perl/Safe-Hole-0.140.0
+++ b/metadata/md5-cache/dev-perl/Safe-Hole-0.140.0
@@ -5,11 +5,11 @@ DESCRIPTION=Exec subs in the original package from Safe
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Safe-Hole
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Safe-Hole-0.14.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=1c7ab8c8e1351e639ce3f7d1f5defe93
+_md5_=6b6e385ee534dcc3d99d6d39d7c9a04d
diff --git a/metadata/md5-cache/dev-perl/Safe-Isa-1.0.10 b/metadata/md5-cache/dev-perl/Safe-Isa-1.0.10
index ec0f88289e45..7def5fbff4be 100644
--- a/metadata/md5-cache/dev-perl/Safe-Isa-1.0.10
+++ b/metadata/md5-cache/dev-perl/Safe-Isa-1.0.10
@@ -5,11 +5,11 @@ DESCRIPTION=Call isa, can, does and DOES safely on things that may not be object
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Safe-Isa
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000010.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=b798a296c111c4b824f8d578c31b8350
+_md5_=d18d05c6fa39a95cf217d977ef61ff9e
diff --git a/metadata/md5-cache/dev-perl/Scope-Upper-0.320.0 b/metadata/md5-cache/dev-perl/Scope-Upper-0.320.0
index 9411e601bc67..02e8be79e5dd 100644
--- a/metadata/md5-cache/dev-perl/Scope-Upper-0.320.0
+++ b/metadata/md5-cache/dev-perl/Scope-Upper-0.320.0
@@ -5,11 +5,11 @@ DESCRIPTION=Act on upper scopes
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Scope-Upper
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.32.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=87ed7f2ce0084eafee06e85f7e763481
+_md5_=a5e2e2f1d3fa6e0130a21bd7683f34c6
diff --git a/metadata/md5-cache/dev-perl/Sereal-4.18.0 b/metadata/md5-cache/dev-perl/Sereal-4.18.0
index fdcda4ae7d22..c45abaad7764 100644
--- a/metadata/md5-cache/dev-perl/Sereal-4.18.0
+++ b/metadata/md5-cache/dev-perl/Sereal-4.18.0
@@ -5,11 +5,11 @@ DESCRIPTION=Fast, compact, powerful binary (de-)serialization
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Sereal
 IUSE=test
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ia64 ppc ~ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Sereal-Encoder-4.18.0 >=dev-perl/Sereal-Decoder-4.18.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.018.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=72dbec8558431ef5b698a796d9e1d730
+_md5_=a43583315e160efcb6add307a73ce042
diff --git a/metadata/md5-cache/dev-perl/Sereal-Encoder-4.18.0 b/metadata/md5-cache/dev-perl/Sereal-Encoder-4.18.0
index c2668ec8fa72..c7fe230311dc 100644
--- a/metadata/md5-cache/dev-perl/Sereal-Encoder-4.18.0
+++ b/metadata/md5-cache/dev-perl/Sereal-Encoder-4.18.0
@@ -5,11 +5,11 @@ DESCRIPTION=Fast, compact, powerful binary serialization
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Sereal-Encoder
 IUSE=test
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-XSLoader app-arch/zstd:= dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.018.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=6709b33a6c7a192583ddbd2c2b2561bb
+_md5_=14a6835c9f4e0f927a84121fff612411
diff --git a/metadata/md5-cache/dev-perl/Server-Starter-0.350.0 b/metadata/md5-cache/dev-perl/Server-Starter-0.350.0
index 39b0a4800e87..0723efdffb5d 100644
--- a/metadata/md5-cache/dev-perl/Server-Starter-0.350.0
+++ b/metadata/md5-cache/dev-perl/Server-Starter-0.350.0
@@ -5,11 +5,11 @@ DESCRIPTION=A superdaemon for hot-deploying server programs
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Server-Starter
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZUHO/Server-Starter-0.35.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=54817980878287f547dc6184995087d6
+_md5_=a49e7f9835eddab99916b1bacb51f9e7
diff --git a/metadata/md5-cache/dev-perl/Shell-Config-Generate-0.340.0 b/metadata/md5-cache/dev-perl/Shell-Config-Generate-0.340.0
index c4d57d805679..3df762ee1bbe 100644
--- a/metadata/md5-cache/dev-perl/Shell-Config-Generate-0.340.0
+++ b/metadata/md5-cache/dev-perl/Shell-Config-Generate-0.340.0
@@ -5,11 +5,11 @@ DESCRIPTION=Portably generate config for any shell
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Shell-Config-Generate
 IUSE=test
-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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Shell-Guess dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Shell-Config-Generate-0.34.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=564e91fcf18082a5897b0cea9b2fa747
+_md5_=d86ea0f365dc86c6e3e99bf32cb6380c
diff --git a/metadata/md5-cache/dev-perl/Socket6-0.290.0 b/metadata/md5-cache/dev-perl/Socket6-0.290.0
index 57d8eb399a4b..e5ad00f867b5 100644
--- a/metadata/md5-cache/dev-perl/Socket6-0.290.0
+++ b/metadata/md5-cache/dev-perl/Socket6-0.290.0
@@ -5,11 +5,11 @@ DESCRIPTION=IPv6 related part of the C socket.h defines and structure manipulato
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Socket6
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/U/UM/UMEMOTO/Socket6-0.29.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e46c7f80e1661ba72c3249b13a63a086
+_md5_=68354d7b604e8f3d404933374d874c73
diff --git a/metadata/md5-cache/dev-perl/Software-License-0.104.1 b/metadata/md5-cache/dev-perl/Software-License-0.104.1
index 8ac6e39faf49..32fe7c79a397 100644
--- a/metadata/md5-cache/dev-perl/Software-License-0.104.1
+++ b/metadata/md5-cache/dev-perl/Software-License-0.104.1
@@ -5,11 +5,11 @@ DESCRIPTION=packages that provide templated software licenses
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Software-License
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Data-Section virtual/perl-File-Spec virtual/perl-IO virtual/perl-Module-Load dev-perl/Text-Template virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Software-License-0.104001.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=c766c9e36725e75cf3ef8edd1cbb8cd0
+_md5_=fe432f83ac4ae35ad9cee78efddd3b28
diff --git a/metadata/md5-cache/dev-perl/Specio-0.470.0 b/metadata/md5-cache/dev-perl/Specio-0.470.0
index 0ce0477e6a3d..fce88a1ea5ae 100644
--- a/metadata/md5-cache/dev-perl/Specio-0.470.0
+++ b/metadata/md5-cache/dev-perl/Specio-0.470.0
@@ -5,11 +5,11 @@ DESCRIPTION=Type constraints and coercions for Perl
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Specio
 IUSE=minimal test
-KEYWORDS=~amd64 ~arm ~m68k ~riscv ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/Ref-Util-0.112.0 ) virtual/perl-Carp dev-perl/Devel-StackTrace dev-perl/Eval-Closure virtual/perl-Exporter virtual/perl-IO dev-perl/MRO-Compat dev-perl/Module-Runtime >=dev-perl/Role-Tiny-1.3.3 >=virtual/perl-Scalar-List-Utils-1.330.0 virtual/perl-Storable dev-perl/Sub-Quote dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 dev-perl/Try-Tiny dev-perl/XString virtual/perl-parent >=virtual/perl-version-0.830.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.47.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=ebdbd050fdd58a9e1290839a62f4cd9d
+_md5_=694065d05fc67c71324a528fe636abaa
diff --git a/metadata/md5-cache/dev-perl/Statistics-ChiSquare-1.0.0 b/metadata/md5-cache/dev-perl/Statistics-ChiSquare-1.0.0
new file mode 100644
index 000000000000..ebc65782ca9e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Statistics-ChiSquare-1.0.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=How well-distributed is your data?
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Statistics-ChiSquare
+IUSE=test
+KEYWORDS=~amd64 ~sparc
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DC/DCANTRELL/Statistics-ChiSquare-1.0000.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=1d2198bc0e56ebee6e3112733f84710e
diff --git a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.80.0 b/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.80.0
index 303e52af6983..08a996683692 100644
--- a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.80.0
+++ b/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.80.0
@@ -5,11 +5,11 @@ DESCRIPTION=Module of basic descriptive statistical functions
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Statistics-Descriptive
 IUSE=test examples
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0800.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=9d823da5a9af165d588a635f39dbae08
+_md5_=1f756d1e3620607353b96eb49bb2ed5b
diff --git a/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.120.0 b/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.120.0
index 76ff2393427c..cf4c0c68413b 100644
--- a/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.120.0
+++ b/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.120.0
@@ -5,11 +5,11 @@ DESCRIPTION=Statistics-Descriptive-Discrete module
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Statistics-Descriptive-Discrete
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RH/RHETTBULL/Statistics-Descriptive-Discrete-0.12.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=08671bee1586bf65307989b9f232ebd7
+_md5_=725185526e4c621c3b64795992826768
diff --git a/metadata/md5-cache/dev-perl/String-CRC32-2.100.0 b/metadata/md5-cache/dev-perl/String-CRC32-2.100.0
index 41be41e303ca..7c5daf4c7cd3 100644
--- a/metadata/md5-cache/dev-perl/String-CRC32-2.100.0
+++ b/metadata/md5-cache/dev-perl/String-CRC32-2.100.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl interface for cyclic redundancy check generation
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/String-CRC32
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=public-domain
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-2.100.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=b7e54d6680a9c98f65b497f8f9e9038a
+_md5_=a84254f54851744bf288ea1a30c334b5
diff --git a/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r3 b/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r3
index 503b8efb21ae..18d28dc361dc 100644
--- a/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r3
+++ b/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r3
@@ -5,11 +5,11 @@ DESCRIPTION=Produce common sub-string indices for two strings
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/String-Ediff
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BOXZOU/String-Ediff-0.09.tar.gz https://dev.gentoo.org/~dilfridge/distfiles/String-Ediff-0.90.0-swig.patch.xz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=3edbae9ba27b9ff4ffe08f49e746d33e
+_md5_=00d9ff34fe82bd5f9144fd60127a806d
diff --git a/metadata/md5-cache/dev-perl/String-RewritePrefix-0.8.0 b/metadata/md5-cache/dev-perl/String-RewritePrefix-0.8.0
index f31337de7c1c..caeaf7cfa428 100644
--- a/metadata/md5-cache/dev-perl/String-RewritePrefix-0.8.0
+++ b/metadata/md5-cache/dev-perl/String-RewritePrefix-0.8.0
@@ -5,11 +5,11 @@ DESCRIPTION=Rewrite strings based on a set of known prefixes
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/String-RewritePrefix
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Sub-Exporter-0.972.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/String-RewritePrefix-0.008.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=e837942c1bca1e44d374d48c73077895
+_md5_=660cc8d7b451aaf73f56173e7db258f7
diff --git a/metadata/md5-cache/dev-perl/String-Util-1.320.0 b/metadata/md5-cache/dev-perl/String-Util-1.320.0
index 90c99c0c67a7..c2738471a659 100644
--- a/metadata/md5-cache/dev-perl/String-Util-1.320.0
+++ b/metadata/md5-cache/dev-perl/String-Util-1.320.0
@@ -5,11 +5,11 @@ DESCRIPTION=String processing utility functions
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/String-Util
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm64 ppc ~ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BA/BAKERSCOT/String-Util-1.32.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=57897fc9a19ebb5e081cd18055cbc84d
+_md5_=9f7c0f4b8c3aa4fc7441d0d2661e9fa0
diff --git a/metadata/md5-cache/dev-perl/Sub-Exporter-0.988.0 b/metadata/md5-cache/dev-perl/Sub-Exporter-0.988.0
index bec5fa7888b1..0d93a969d3c9 100644
--- a/metadata/md5-cache/dev-perl/Sub-Exporter-0.988.0
+++ b/metadata/md5-cache/dev-perl/Sub-Exporter-0.988.0
@@ -5,11 +5,11 @@ DESCRIPTION=A sophisticated exporter for custom-built routines
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Sub-Exporter
 IUSE=test
-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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Data-OptList-0.100.0 >=dev-perl/Params-Util-0.140.0 >=dev-perl/Sub-Install-0.920.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.988.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=f6076c04e889cb54645ef58530dc9ece
+_md5_=c6900b8b5506d61b268161e4246379ea
diff --git a/metadata/md5-cache/dev-perl/Sub-Name-0.260.0 b/metadata/md5-cache/dev-perl/Sub-Name-0.260.0
index 075017476186..34d04b3339f3 100644
--- a/metadata/md5-cache/dev-perl/Sub-Name-0.260.0
+++ b/metadata/md5-cache/dev-perl/Sub-Name-0.260.0
@@ -5,11 +5,11 @@ DESCRIPTION=(Re)name a sub
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Sub-Name
 IUSE=suggested test
-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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Sub-Name-0.26.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=0943c3d718424157fc9290f4663cda0a
+_md5_=f2b9a7ea9705ca27803567522eac6878
diff --git a/metadata/md5-cache/dev-perl/Task-Weaken-1.50.0 b/metadata/md5-cache/dev-perl/Task-Weaken-1.50.0
index 87ef07805165..9f5e2fd666ae 100644
--- a/metadata/md5-cache/dev-perl/Task-Weaken-1.50.0
+++ b/metadata/md5-cache/dev-perl/Task-Weaken-1.50.0
@@ -4,11 +4,11 @@ DESCRIPTION=Ensure that a platform has weaken support
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Task-Weaken
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Task-Weaken-1.05.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=01513bf65a2c625a9a6100ec444af6f5
+_md5_=4a0dafcc0ffa9e9c50954ea344ce7363
diff --git a/metadata/md5-cache/dev-perl/Task-Weaken-1.60.0 b/metadata/md5-cache/dev-perl/Task-Weaken-1.60.0
index f65f753f77d6..a04f4ca3163c 100644
--- a/metadata/md5-cache/dev-perl/Task-Weaken-1.60.0
+++ b/metadata/md5-cache/dev-perl/Task-Weaken-1.60.0
@@ -5,11 +5,11 @@ DESCRIPTION=Ensure that a platform has weaken support
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Task-Weaken
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Task-Weaken-1.06.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=203d1d85087ee764fc4827a4e4a615c3
+_md5_=858b79b46d5fcd5311e1f2f634fafd93
diff --git a/metadata/md5-cache/dev-perl/Term-Encoding-0.30.0 b/metadata/md5-cache/dev-perl/Term-Encoding-0.30.0
index 14f73a9fa8a1..3dc278de7f2a 100644
--- a/metadata/md5-cache/dev-perl/Term-Encoding-0.30.0
+++ b/metadata/md5-cache/dev-perl/Term-Encoding-0.30.0
@@ -5,11 +5,11 @@ DESCRIPTION=Detect encoding of the current terminal
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Term-Encoding
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Term-Encoding-0.03.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=17b40d07a6881d9c467abb8e627d5b2b
+_md5_=e01e531e8361d895fdd49d5f2333a6c1
diff --git a/metadata/md5-cache/dev-perl/Term-ProgressBar-2.210.0 b/metadata/md5-cache/dev-perl/Term-ProgressBar-2.210.0
index 26b5b51d97be..58e7f507c0a9 100644
--- a/metadata/md5-cache/dev-perl/Term-ProgressBar-2.210.0
+++ b/metadata/md5-cache/dev-perl/Term-ProgressBar-2.210.0
@@ -4,11 +4,11 @@ DESCRIPTION=Provide a progress meter on a standard terminal
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Term-ProgressBar
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Class-MethodMaker-1.20.0 >=dev-perl/TermReadKey-2.140.0 virtual/perl-autodie dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/Term-ProgressBar-2.21.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=f4409299edee84086c18f8ce2e4009e6
+_md5_=cf7e52b1d4d65e1047d312b5227bff63
diff --git a/metadata/md5-cache/dev-perl/Term-ProgressBar-2.220.0 b/metadata/md5-cache/dev-perl/Term-ProgressBar-2.220.0
index 037f4210f49c..16a152525c27 100644
--- a/metadata/md5-cache/dev-perl/Term-ProgressBar-2.220.0
+++ b/metadata/md5-cache/dev-perl/Term-ProgressBar-2.220.0
@@ -1,15 +1,15 @@
-BDEPEND=virtual/perl-Carp >=dev-perl/Class-MethodMaker-1.20.0 >=dev-perl/TermReadKey-2.140.0 virtual/perl-autodie virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/Test-Exception-0.310.0 >=dev-perl/Capture-Tiny-0.130.0 >=virtual/perl-Test-Simple-0.800.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+BDEPEND=virtual/perl-Carp >=dev-perl/Class-MethodMaker-1.20.0 >=dev-perl/TermReadKey-2.140.0 virtual/perl-autodie virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/Test-Exception-0.310.0 >=dev-perl/Capture-Tiny-0.130.0 >=virtual/perl-Test-Simple-0.800.0 dev-perl/Test-Warnings ) dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-lang/perl
 DESCRIPTION=Provide a progress meter on a standard terminal
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Term-ProgressBar
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Class-MethodMaker-1.20.0 >=dev-perl/TermReadKey-2.140.0 virtual/perl-autodie dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MANWAR/Term-ProgressBar-2.22.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=1cab07259e5413b4a3393c508901a501
+_md5_=68d5eec20bb7410e669ecbaf9b0b2370
diff --git a/metadata/md5-cache/dev-perl/Term-UI-0.500.0 b/metadata/md5-cache/dev-perl/Term-UI-0.500.0
index 5e59e69b9588..1c1c97c75bff 100644
--- a/metadata/md5-cache/dev-perl/Term-UI-0.500.0
+++ b/metadata/md5-cache/dev-perl/Term-UI-0.500.0
@@ -5,11 +5,11 @@ DESCRIPTION=User interfaces via Term::ReadLine made easy
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Term-UI
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Locale-Maketext-Simple dev-perl/Log-Message-Simple virtual/perl-Params-Check virtual/perl-Term-ReadLine virtual/perl-if dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Term-UI-0.50.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=3722207b7243bd2813e8789fb5495adb
+_md5_=0c336d221ebcc1421c26fc77b1001f29
diff --git a/metadata/md5-cache/dev-perl/TermReadKey-2.380.0 b/metadata/md5-cache/dev-perl/TermReadKey-2.380.0
index f6f5570e26b5..43dc9fef21f4 100644
--- a/metadata/md5-cache/dev-perl/TermReadKey-2.380.0
+++ b/metadata/md5-cache/dev-perl/TermReadKey-2.380.0
@@ -5,11 +5,11 @@ DESCRIPTION=Change terminal modes, and perform non-blocking reads
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/TermReadKey
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.38.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=b815eac467f143e256dda371b7a48a03
+_md5_=2187f8c84a0f0d7da825ff358440cde4
diff --git a/metadata/md5-cache/dev-perl/Test-Base-0.890.0 b/metadata/md5-cache/dev-perl/Test-Base-0.890.0
index 404af6a6a325..3bad687bcac4 100644
--- a/metadata/md5-cache/dev-perl/Test-Base-0.890.0
+++ b/metadata/md5-cache/dev-perl/Test-Base-0.890.0
@@ -5,11 +5,11 @@ DESCRIPTION=A Data Driven Testing Framework
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Base
 IUSE=test
-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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Filter >=virtual/perl-Scalar-List-Utils-1.70.0 >=dev-perl/Spiffy-0.400.0 >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-Deep dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Test-Base-0.89.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=edf49c475852754dce1951934d9f5a35
+_md5_=47df623f669ec7f337d51e22ca5bf948
diff --git a/metadata/md5-cache/dev-perl/Test-Class-0.520.0 b/metadata/md5-cache/dev-perl/Test-Class-0.520.0
index 98d0bde84823..9938aca3ee13 100644
--- a/metadata/md5-cache/dev-perl/Test-Class-0.520.0
+++ b/metadata/md5-cache/dev-perl/Test-Class-0.520.0
@@ -5,11 +5,11 @@ DESCRIPTION=Easily create test classes in an xUnit/JUnit style
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Class
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Attribute-Handlers-0.770.0 virtual/perl-Carp virtual/perl-File-Spec >=dev-perl/MRO-Compat-0.110.0 dev-perl/Module-Runtime >=virtual/perl-Storable-2.40.0 >=virtual/perl-Test-Simple-0.780.0 dev-perl/Try-Tiny dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SZ/SZABGAB/Test-Class-0.52.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=b1779540a59741fa5ddd7b92d2d2cedf
+_md5_=f32db8af817d9b720824a98724d0d463
diff --git a/metadata/md5-cache/dev-perl/Test-Command-0.110.0-r1 b/metadata/md5-cache/dev-perl/Test-Command-0.110.0-r1
index aa28a17ccd8e..d6f72521e79b 100644
--- a/metadata/md5-cache/dev-perl/Test-Command-0.110.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-Command-0.110.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Test routines for external commands
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Command
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Test-Simple-0.620.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DANBOO/Test-Command-0.11.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=fbf7cddd591d0b78733b83292036abf9
+_md5_=51fe1aac5ea517671bad3b3b1cbc30c8
diff --git a/metadata/md5-cache/dev-perl/Test-Compile-2.4.2 b/metadata/md5-cache/dev-perl/Test-Compile-2.4.2
index 4844550076e3..4e4c4d99b265 100644
--- a/metadata/md5-cache/dev-perl/Test-Compile-2.4.2
+++ b/metadata/md5-cache/dev-perl/Test-Compile-2.4.2
@@ -5,11 +5,11 @@ DESCRIPTION=Check whether Perl files compile correctly
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Compile
 IUSE=minimal test
-KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Devel-CheckOS ) >=virtual/perl-Exporter-5.680.0 dev-perl/UNIVERSAL-require >=virtual/perl-parent-0.225.0 virtual/perl-version dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.4.2.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=ab208fa59ec97a170d3f2fbbc697dccc
+_md5_=129ce1b2f49e2df814fbf7370dca9f36
diff --git a/metadata/md5-cache/dev-perl/Test-Deep-1.130.0 b/metadata/md5-cache/dev-perl/Test-Deep-1.130.0
index ff78fb52e351..6e10cb4e6164 100644
--- a/metadata/md5-cache/dev-perl/Test-Deep-1.130.0
+++ b/metadata/md5-cache/dev-perl/Test-Deep-1.130.0
@@ -5,11 +5,11 @@ DESCRIPTION=Extremely flexible deep comparison testing
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Deep
 IUSE=test
-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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.90.0 virtual/perl-Test-Simple dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.130.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=ea81b640c00fb9f73ec733bd43e7346b
+_md5_=f11466ae7ddf01c74aaef9e1cfbb09c0
diff --git a/metadata/md5-cache/dev-perl/Test-Differences-0.680.0 b/metadata/md5-cache/dev-perl/Test-Differences-0.680.0
index 3986da5550a3..efb0d726d28e 100644
--- a/metadata/md5-cache/dev-perl/Test-Differences-0.680.0
+++ b/metadata/md5-cache/dev-perl/Test-Differences-0.680.0
@@ -5,11 +5,11 @@ DESCRIPTION=Test strings and data structures and show differences if not ok
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Differences
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Capture-Tiny-0.240.0 >=virtual/perl-Data-Dumper-2.126.0 >=dev-perl/Text-Diff-1.430.0 >=virtual/perl-Test-Simple-0.880.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.68.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=c597d957fa2735eeb6a83a179a50854c
+_md5_=3f44b23811fca20a7e317a99b4565a40
diff --git a/metadata/md5-cache/dev-perl/Test-EOL-2.20.0 b/metadata/md5-cache/dev-perl/Test-EOL-2.20.0
index 487ad8afcaea..5c0887f67e79 100644
--- a/metadata/md5-cache/dev-perl/Test-EOL-2.20.0
+++ b/metadata/md5-cache/dev-perl/Test-EOL-2.20.0
@@ -5,11 +5,11 @@ DESCRIPTION=Check the correct line endings in your project
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-EOL
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Test-Simple dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-EOL-2.02.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=6ec71341520f9a527f4e502eca383207
+_md5_=cf6167aa6c8b65152abb5b96749c5ad3
diff --git a/metadata/md5-cache/dev-perl/Test-Fatal-0.16.0 b/metadata/md5-cache/dev-perl/Test-Fatal-0.16.0
index 1b17f7f68502..c621e5514ff1 100644
--- a/metadata/md5-cache/dev-perl/Test-Fatal-0.16.0
+++ b/metadata/md5-cache/dev-perl/Test-Fatal-0.16.0
@@ -5,11 +5,11 @@ DESCRIPTION=Incredibly simple helpers for testing code with exceptions
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Fatal
 IUSE=test examples
-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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-Test-Simple >=dev-perl/Try-Tiny-0.70.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.016.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=4c5df8dfe762044eed7779045f06f3ef
+_md5_=ca65d37b8b381a3b56ed6ae777838435
diff --git a/metadata/md5-cache/dev-perl/Test-File-1.448.0 b/metadata/md5-cache/dev-perl/Test-File-1.448.0
index e7737d5b497e..ab7aac2cab9e 100644
--- a/metadata/md5-cache/dev-perl/Test-File-1.448.0
+++ b/metadata/md5-cache/dev-perl/Test-File-1.448.0
@@ -5,11 +5,11 @@ DESCRIPTION=Test file attributes
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-File
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.448.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=198a7610cb6d986f9f1f71c08c8b2187
+_md5_=6e5e61760bdbbaa8500b14372c915ae5
diff --git a/metadata/md5-cache/dev-perl/Test-Files-0.150.0 b/metadata/md5-cache/dev-perl/Test-Files-0.150.0
index 013a909d9a60..9c524ecc74da 100644
--- a/metadata/md5-cache/dev-perl/Test-Files-0.150.0
+++ b/metadata/md5-cache/dev-perl/Test-Files-0.150.0
@@ -5,11 +5,11 @@ DESCRIPTION=A Test::Builder based module to ease testing with files and dirs
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Files
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Algorithm-Diff virtual/perl-Test-Simple dev-perl/Text-Diff dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSF/Test-Files-0.15.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=b229877216030bfc22d8cdd8862f4e20
+_md5_=22e31a2d1e582a303385fc3b48565505
diff --git a/metadata/md5-cache/dev-perl/Test-Inline-2.214.0 b/metadata/md5-cache/dev-perl/Test-Inline-2.214.0
index 96f86562e7ff..841bec0d15e2 100644
--- a/metadata/md5-cache/dev-perl/Test-Inline-2.214.0
+++ b/metadata/md5-cache/dev-perl/Test-Inline-2.214.0
@@ -5,11 +5,11 @@ DESCRIPTION=Inline test suite support for Perl
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Inline
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Algorithm-Dependency-1.20.0 >=dev-perl/Config-Tiny-2.0.0 >=dev-perl/File-Find-Rule-0.260.0 >=dev-perl/File-Flat-1.0.0 >=dev-perl/File-Remove-0.370.0 >=virtual/perl-File-Spec-0.800.0 >=dev-perl/File-chmod-0.310.0 >=virtual/perl-Getopt-Long-2.340.0 >=virtual/perl-Scalar-List-Utils-1.190.0 >=dev-perl/Params-Util-0.210.0 dev-perl/Path-Tiny dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-Inline-2.214.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=5ebdf5eecb8b9282073d86e67cf0655e
+_md5_=2fa73a53f8b2d6e3254629df2524083a
diff --git a/metadata/md5-cache/dev-perl/Test-LeakTrace-0.170.0 b/metadata/md5-cache/dev-perl/Test-LeakTrace-0.170.0
index 4332efa99dde..75bd2d5a6092 100644
--- a/metadata/md5-cache/dev-perl/Test-LeakTrace-0.170.0
+++ b/metadata/md5-cache/dev-perl/Test-LeakTrace-0.170.0
@@ -5,11 +5,11 @@ DESCRIPTION=Traces memory leaks
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-LeakTrace
 IUSE=test examples
-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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/Test-LeakTrace-0.17.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=e0c1e8ca2d8ecf9d2684724172aac69e
+_md5_=1960aa1e0840fd4bda1265bda1f8d7b0
diff --git a/metadata/md5-cache/dev-perl/Test-Manifest-2.22.0 b/metadata/md5-cache/dev-perl/Test-Manifest-2.22.0
index 62678de83960..3361cf580028 100644
--- a/metadata/md5-cache/dev-perl/Test-Manifest-2.22.0
+++ b/metadata/md5-cache/dev-perl/Test-Manifest-2.22.0
@@ -5,11 +5,11 @@ DESCRIPTION=Interact with a t/test_manifest file
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Manifest
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-File-Spec virtual/perl-Test-Harness dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.022.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=1b745e0258b22c80b57d9e0013a8768e
+_md5_=465bf18bf585819cb1d212fbbbfac1b4
diff --git a/metadata/md5-cache/dev-perl/Test-Memory-Cycle-1.60.0-r1 b/metadata/md5-cache/dev-perl/Test-Memory-Cycle-1.60.0-r1
index ac143f01303a..28e5180f4ebb 100644
--- a/metadata/md5-cache/dev-perl/Test-Memory-Cycle-1.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Test-Memory-Cycle-1.60.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Check for memory leaks and circular memory references
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Memory-Cycle
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~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 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Devel-Cycle-1.70.0 virtual/perl-Getopt-Long dev-perl/PadWalker >=virtual/perl-Test-Simple-0.620.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Test-Memory-Cycle-1.06.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=eef0776011fb70e9a6eb6fbc0cd1fd68
+_md5_=e5ab6dbac8e4748aaea8d376b0c4a32a
diff --git a/metadata/md5-cache/dev-perl/Test-MockModule-0.176.0 b/metadata/md5-cache/dev-perl/Test-MockModule-0.176.0
index eee1692b6a52..fe46076e4431 100644
--- a/metadata/md5-cache/dev-perl/Test-MockModule-0.176.0
+++ b/metadata/md5-cache/dev-perl/Test-MockModule-0.176.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/perl-Carp >=dev-perl/SUPER-1.200.0 virtual/perl-Scalar-List-Utils >=dev-perl/Module-Build-0.380.0 test? ( >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+BDEPEND=virtual/perl-Carp >=dev-perl/SUPER-1.200.0 virtual/perl-Scalar-List-Utils >=dev-perl/Module-Build-0.380.0 test? ( >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-Warnings ) dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-lang/perl
 DESCRIPTION=Override subroutines in a module for unit testing
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.176.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=9e2db602e579e1d8131eb228921a9343
+_md5_=c8652592d233170862981071ff567db2
diff --git a/metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.90.0 b/metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.90.0
index 0d3782771a18..561f0834701c 100644
--- a/metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.90.0
+++ b/metadata/md5-cache/dev-perl/Test2-Plugin-NoWarnings-0.90.0
@@ -5,11 +5,11 @@ DESCRIPTION=Fail if tests warn
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test2-Plugin-NoWarnings
 IUSE=test
-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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Test-Simple-1.302.167 virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.09.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=23f9b471662767bcb787da73699b5ad6
+_md5_=a44cf380a3713edcf464ffdefddc6823
diff --git a/metadata/md5-cache/dev-perl/Test2-Suite-0.0.141 b/metadata/md5-cache/dev-perl/Test2-Suite-0.0.141
index 5b2cfd2ccf18..963f8eb273f4 100644
--- a/metadata/md5-cache/dev-perl/Test2-Suite-0.0.141
+++ b/metadata/md5-cache/dev-perl/Test2-Suite-0.0.141
@@ -5,11 +5,11 @@ DESCRIPTION=A rich set of tools built upon the Test2 framework
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test2-Suite
 IUSE=test
-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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Exporter >=dev-perl/Importer-0.24.0 >=dev-perl/Module-Pluggable-2.700.0 virtual/perl-Scalar-List-Utils dev-perl/Scope-Guard >=dev-perl/Sub-Info-0.2.0 >=dev-perl/Term-Table-0.13.0 >=virtual/perl-Test-Simple-1.302.176 virtual/perl-Time-HiRes dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000141.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=a2d4483c92e0c99e3c5f7e4558f83a08
+_md5_=496f50fdd458d35d3429283b91e6457e
diff --git a/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1 b/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
index 7bb531bcfc5c..f07fb773ecd2 100644
--- a/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
+++ b/metadata/md5-cache/dev-perl/Tk-TableMatrix-1.230.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Tk dev-lang/perl:=[-build(-)]
 DESCRIPTION=Perl module for Tk-TableMatrix
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Tk-TableMatrix
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc sparc x86
 LICENSE=Artistic
 RDEPEND=dev-perl/Tk dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CE/CERNEY/Tk-TableMatrix-1.23.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e0a69fc79ae7d4595cec58c40d2fc11f
+_md5_=657e45f8cd0470182066367bdd10f30e
diff --git a/metadata/md5-cache/dev-perl/Type-Tiny-1.12.3 b/metadata/md5-cache/dev-perl/Type-Tiny-1.12.3
index ae778cf4167b..1f224e0d6a03 100644
--- a/metadata/md5-cache/dev-perl/Type-Tiny-1.12.3
+++ b/metadata/md5-cache/dev-perl/Type-Tiny-1.12.3
@@ -5,11 +5,11 @@ DESCRIPTION=tiny, yet Moo(se)-compatible type constraint
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Type-Tiny
 IUSE=test minimal examples
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Kavorka-0.13.0 !<dev-perl/Types-ReadOnly-0.1.0 >=dev-perl/Exporter-Tiny-1.0.0 >=virtual/perl-Test-Simple-1.1.10 !minimal? ( >=dev-perl/Devel-LexAlias-0.50.0 dev-perl/Devel-StackTrace >=dev-perl/Ref-Util-XS-0.100.0 >=dev-perl/Regexp-Util-0.3.0 virtual/perl-Scalar-List-Utils dev-perl/Type-Tie >=dev-perl/Type-Tiny-XS-0.16.0 ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.012003.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=a55e73096dfa698a391b68be8f6c5307
+_md5_=655e29dd637f3997860e2325ef8e872a
diff --git a/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0-r2 b/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0-r2
index c47f82e5945f..25c3c02acc99 100644
--- a/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0-r2
+++ b/metadata/md5-cache/dev-perl/Unicode-Map8-0.130.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Convert between most 8bit encodings
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Unicode-Map8
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Unicode-String-2.60.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Unicode-Map8-0.13.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=5868ed5f3415660883bdda883c482fdc
+_md5_=783edab3724c3bc668301606f51b7c1e
diff --git a/metadata/md5-cache/dev-perl/XML-DT-0.690.0 b/metadata/md5-cache/dev-perl/XML-DT-0.690.0
index 4573dc22e689..0654f0732b22 100644
--- a/metadata/md5-cache/dev-perl/XML-DT-0.690.0
+++ b/metadata/md5-cache/dev-perl/XML-DT-0.690.0
@@ -5,11 +5,11 @@ DESCRIPTION=A perl XML down translate module
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/XML-DT
 IUSE=test examples
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/HTTP-Simple virtual/perl-Scalar-List-Utils >=dev-perl/XML-DTDParser-2.0.0 >=dev-perl/XML-LibXML-1.540.0 virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMBS/XML-DT-0.69.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=803d35fa258e614ddbd65647f1a794d6
+_md5_=5b44313a03b4b1b151e2abdf32042deb
diff --git a/metadata/md5-cache/dev-perl/XML-LibXSLT-1.960.0 b/metadata/md5-cache/dev-perl/XML-LibXSLT-1.960.0
index f553547d360a..44aeff544ffa 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXSLT-1.960.0
+++ b/metadata/md5-cache/dev-perl/XML-LibXSLT-1.960.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Encode >=dev-perl/XML-LibXML-1.700.0 >=dev-libs/libxslt-1.1.
 DESCRIPTION=A Perl module to parse XSL Transformational sheets using gnome's libXSLT
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-LibXSLT
-KEYWORDS=amd64 ~arm arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Encode >=dev-perl/XML-LibXML-1.700.0 >=dev-libs/libxslt-1.1.32 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.96.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=f1e2f2768f9cd5858face40fdcaef12d
+_md5_=8b1e0a760a0eb4ce659f0cf4c298141c
diff --git a/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0 b/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
index 3c5c5568a57b..3c4fa9dac4b5 100644
--- a/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
+++ b/metadata/md5-cache/dev-perl/XML-Parser-Lite-0.721.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight regexp-based XML parser
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-Parser-Lite
 IUSE=test minimal
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.721.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=856cb3749e4d0f21c944be727c6b543e
+_md5_=c83f273a5670f4280374f5aeb03cefe0
diff --git a/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0-r1 b/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0-r1
index 6a9054811737..ed4765ae06ad 100644
--- a/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-TreePP-0.430.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Pure Perl implementation for parsing/writing XML documents
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/XML-TreePP
 IUSE=test
-KEYWORDS=amd64 ~arm arm64 ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAWASAKI/XML-TreePP-0.43.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=200543576dc9a637058ca12cc71b8b3e
+_md5_=d5f47e1cbf2352618013733fefb30b44
diff --git a/metadata/md5-cache/dev-perl/XString-0.5.0 b/metadata/md5-cache/dev-perl/XString-0.5.0
index 92a786b017ad..d3a91fd2675e 100644
--- a/metadata/md5-cache/dev-perl/XString-0.5.0
+++ b/metadata/md5-cache/dev-perl/XString-0.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Isolated String helpers from B
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/XString
 IUSE=test
-KEYWORDS=~amd64 ~arm ~m68k ~riscv ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AT/ATOOMIC/XString-0.005.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=956b938dd1091ae5557028331bc1b53f
+_md5_=879e24392377fc84dd51747c6b7225c6
diff --git a/metadata/md5-cache/dev-perl/aliased-0.340.0-r1 b/metadata/md5-cache/dev-perl/aliased-0.340.0-r1
deleted file mode 100644
index 200bfa1ddb12..000000000000
--- a/metadata/md5-cache/dev-perl/aliased-0.340.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/Module-Build-Tiny-0.39.0 test? ( virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec virtual/perl-Test-Simple virtual/perl-if ) dev-lang/perl
-DESCRIPTION=Use shorter versions of class names
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/aliased
-IUSE=test
-KEYWORDS=amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/aliased-0.34.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=c5eeb2329aa280ec62931e30e19363c1
diff --git a/metadata/md5-cache/dev-perl/aliased-0.340.0-r2 b/metadata/md5-cache/dev-perl/aliased-0.340.0-r2
new file mode 100644
index 000000000000..11097f93c772
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/aliased-0.340.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/Module-Build-Tiny-0.39.0 test? ( virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec virtual/perl-Test-Simple virtual/perl-if ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Use shorter versions of class names
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/aliased
+IUSE=test
+KEYWORDS=amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/aliased-0.34.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=651ecfb60f7dbe9d7ec932e2ecd7767e
diff --git a/metadata/md5-cache/dev-perl/boolean-0.460.0 b/metadata/md5-cache/dev-perl/boolean-0.460.0
deleted file mode 100644
index f005aee85686..000000000000
--- a/metadata/md5-cache/dev-perl/boolean-0.460.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Boolean support for Perl
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/boolean
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/I/IN/INGY/boolean-0.46.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=ead13d6b057dda134b4b37eeefbf6b8d
diff --git a/metadata/md5-cache/dev-perl/boolean-0.460.0-r1 b/metadata/md5-cache/dev-perl/boolean-0.460.0-r1
new file mode 100644
index 000000000000..de86240decb7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/boolean-0.460.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/JSON-MaybeXS ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Boolean support for Perl
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/boolean
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/I/IN/INGY/boolean-0.46.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=31c283b52005e04d76c8458aa0a996cc
diff --git a/metadata/md5-cache/dev-perl/common-sense-3.740.0-r1 b/metadata/md5-cache/dev-perl/common-sense-3.740.0-r1
deleted file mode 100644
index 2f9ddf94230f..000000000000
--- a/metadata/md5-cache/dev-perl/common-sense-3.740.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Save a tree AND a kitten, use common::sense!
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/common-sense
-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
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.74.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=e68af91ea6fa5817d61dab5f75da54f1
diff --git a/metadata/md5-cache/dev-perl/gnome2-canvas-1.2.0-r2 b/metadata/md5-cache/dev-perl/gnome2-canvas-1.2.0-r2
deleted file mode 100644
index 07f0695ee2d5..000000000000
--- a/metadata/md5-cache/dev-perl/gnome2-canvas-1.2.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/gtk+:2 >=gnome-base/libgnomecanvas-2 >=dev-perl/glib-perl-1.040 >=dev-perl/Gtk2-1.040 >=dev-perl/ExtUtils-PkgConfig-1.03 >=dev-perl/ExtUtils-Depends-0.202 virtual/pkgconfig dev-lang/perl test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=Perl interface to the Gnome Canvas
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Gnome2-Canvas
-IUSE=examples test
-KEYWORDS=~alpha amd64 ~ia64 ~ppc sparc x86
-LICENSE=LGPL-2
-RDEPEND=x11-libs/gtk+:2 >=gnome-base/libgnomecanvas-2 >=dev-perl/glib-perl-1.040 >=dev-perl/Gtk2-1.040 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Canvas-1.002.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=05f59fb64c7652a9ed64c473f0da8345
diff --git a/metadata/md5-cache/dev-perl/perl-headers-0.0.2 b/metadata/md5-cache/dev-perl/perl-headers-0.0.2
new file mode 100644
index 000000000000..519ab1eba2ee
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/perl-headers-0.0.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/perl:= sys-kernel/linux-headers
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Generated .ph equivalents of system headers
+EAPI=8
+HOMEPAGE=https://github.com/gentoo-perl/perl-headers
+IUSE=+debug +sizeof-warning
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=https://github.com/gentoo-perl/perl-headers/archive/0.0.2.tar.gz -> perl-headers-0.0.2.tar.gz
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	perl-functions	fea344a91ebf37efadf172c6a3de5a72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=279c911ffbe1e065a4b3257206d9f0c7
diff --git a/metadata/md5-cache/dev-perl/perl-ldap-0.680.0 b/metadata/md5-cache/dev-perl/perl-ldap-0.680.0
index 21c0e5c86f7d..fff5fff29de8 100644
--- a/metadata/md5-cache/dev-perl/perl-ldap-0.680.0
+++ b/metadata/md5-cache/dev-perl/perl-ldap-0.680.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl modules which provide an object-oriented interface to LDAP serv
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/perl-ldap
 IUSE=sasl xml ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Authen-SASL dev-perl/Convert-ASN1 dev-perl/IO-Socket-INET6 dev-perl/URI sasl? ( virtual/perl-Digest-MD5 dev-perl/Authen-SASL ) xml? ( dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-SAX-Writer ) ssl? ( >=dev-perl/IO-Socket-SSL-1.26 ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.68.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=f03f4957ae08a76151de170a7e16bdb5
+_md5_=85f9ef29f5589c342852adb7225d6e90
diff --git a/metadata/md5-cache/dev-perl/prefork-1.50.0 b/metadata/md5-cache/dev-perl/prefork-1.50.0
index 6203b2ea985e..e7139775c618 100644
--- a/metadata/md5-cache/dev-perl/prefork-1.50.0
+++ b/metadata/md5-cache/dev-perl/prefork-1.50.0
@@ -5,11 +5,11 @@ DESCRIPTION=Optimized module loading for forking or non-forking processes
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/prefork
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Scalar-List-Utils-0.180.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/prefork-1.05.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=02cd56d93250ddd31ef6547ddccbf196
+_md5_=fb01a3f2574a8f2d7a346257b3153b3c
diff --git a/metadata/md5-cache/dev-perl/strictures-2.0.6 b/metadata/md5-cache/dev-perl/strictures-2.0.6
index 6637261aac80..eded0b21710c 100644
--- a/metadata/md5-cache/dev-perl/strictures-2.0.6
+++ b/metadata/md5-cache/dev-perl/strictures-2.0.6
@@ -5,11 +5,11 @@ DESCRIPTION=Turn on strict and make most warnings fatal
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/strictures
 IUSE=minimal test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/bareword-filehandles dev-perl/indirect dev-perl/multidimensional ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/strictures-2.000006.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=4b72b4f6901d85bc1f4f918f4249ced7
+_md5_=ec52d39dcf0f3c56a51bc4e2ff0bc9ed
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 6672679508c2..dd754fb33b42 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/PHP_CodeSniffer-3.6.1 b/metadata/md5-cache/dev-php/PHP_CodeSniffer-3.6.1
new file mode 100644
index 000000000000..fc7e1795be1a
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PHP_CodeSniffer-3.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare test
+DEPEND=test? ( dev-lang/php:*[cli(-),tokenizer(-),xmlwriter(-)] <dev-php/phpunit-6 )
+DESCRIPTION=Detect violations of PHP code standards
+EAPI=8
+HOMEPAGE=https://github.com/squizlabs/PHP_CodeSniffer
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/php:*[cli(-),tokenizer(-),xmlwriter(-)]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://download.pear.php.net/package/PHP_CodeSniffer-3.6.1.tgz
+_md5_=b458b5ee56b698a85c6e453635f792e2
diff --git a/metadata/md5-cache/dev-php/ca-bundle-1.2.11 b/metadata/md5-cache/dev-php/ca-bundle-1.2.11
new file mode 100644
index 000000000000..677319dfbe63
--- /dev/null
+++ b/metadata/md5-cache/dev-php/ca-bundle-1.2.11
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Find the system CA bundle or fall back to the Mozilla one
+EAPI=8
+HOMEPAGE=https://github.com/composer/ca-bundle
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
+SLOT=0
+SRC_URI=https://github.com/composer/ca-bundle/archive/1.2.11.tar.gz -> ca-bundle-1.2.11.tar.gz
+_md5_=18e614518c267a7213f37c618b895aef
diff --git a/metadata/md5-cache/dev-php/composer-1.10.22 b/metadata/md5-cache/dev-php/composer-1.10.22
deleted file mode 100644
index a1e75d96eca0..000000000000
--- a/metadata/md5-cache/dev-php/composer-1.10.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Dependency Manager for PHP
-EAPI=7
-HOMEPAGE=https://github.com/composer/composer
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.1.3 >=dev-php/psr-log-1.1.0 dev-php/fedora-autoloader >=dev-php/json-schema-5.2.10 >=dev-php/jsonlint-1.7.1 >=dev-php/phar-utils-1.0.1 >=dev-php/semver-1.4.2 >=dev-php/spdx-licenses-1.5.0 >=dev-php/symfony-console-2.8.48 >=dev-php/symfony-filesystem-2.8.48 >=dev-php/symfony-finder-2.8.49 >=dev-php/symfony-process-2.8.48 >=dev-php/xdebug-handler-1.3.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/composer/composer/archive/1.10.22.tar.gz -> composer-1.10.22.tar.gz
-_md5_=4743fd5a31a3c49c6a2160bdc58c136c
diff --git a/metadata/md5-cache/dev-php/composer-1.10.22-r1 b/metadata/md5-cache/dev-php/composer-1.10.22-r1
new file mode 100644
index 000000000000..4dcd102815a4
--- /dev/null
+++ b/metadata/md5-cache/dev-php/composer-1.10.22-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Dependency Manager for PHP
+EAPI=7
+HOMEPAGE=https://github.com/composer/composer
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.1.3 >=dev-php/psr-log-1.1.0 dev-php/fedora-autoloader >=dev-php/json-schema-5.2.10 >=dev-php/jsonlint-1.7.1 >=dev-php/phar-utils-1.0.1 <dev-php/semver-3.0 >=dev-php/spdx-licenses-1.5.0 >=dev-php/symfony-console-2.8.48 >=dev-php/symfony-filesystem-2.8.48 >=dev-php/symfony-finder-2.8.49 >=dev-php/symfony-process-2.8.48 >=dev-php/xdebug-handler-1.3.1
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/composer/composer/archive/1.10.22.tar.gz -> composer-1.10.22.tar.gz
+_md5_=8ab5b99eb2117850c4bb00eeee37ef7b
diff --git a/metadata/md5-cache/dev-php/composer-2.1.9 b/metadata/md5-cache/dev-php/composer-2.1.9
new file mode 100644
index 000000000000..476f78d816ef
--- /dev/null
+++ b/metadata/md5-cache/dev-php/composer-2.1.9
@@ -0,0 +1,11 @@
+BDEPEND=dev-php/theseer-Autoload
+DEFINED_PHASES=install prepare
+DESCRIPTION=Dependency Manager for PHP
+EAPI=8
+HOMEPAGE=https://github.com/composer/composer
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.0 dev-php/fedora-autoloader >=dev-php/jsonlint-1.4 >=dev-php/json-schema-5.2.11 >=dev-php/metadata-minifier-1.0 >=dev-php/phar-utils-1.0 >=dev-php/psr-log-1.0 >=dev-php/reactphp-promise-2.7 >=dev-php/semver-3.0 >=dev-php/spdx-licenses-1.2 >=dev-php/symfony-console-2.8.52 >=dev-php/symfony-filesystem-2.8.52 >=dev-php/symfony-finder-2.8.52 >=dev-php/symfony-process-2.8.52 >=dev-php/xdebug-handler-2
+SLOT=0
+SRC_URI=https://github.com/composer/composer/archive/2.1.9.tar.gz -> composer-2.1.9.tar.gz
+_md5_=167e5d4f26237b9612772af72914096a
diff --git a/metadata/md5-cache/dev-php/pecl-apcu-5.1.21 b/metadata/md5-cache/dev-php/pecl-apcu-5.1.21
new file mode 100644
index 000000000000..19a4654c5f16
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-apcu-5.1.21
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DESCRIPTION=Stripped down version of APC supporting only user cache
+EAPI=7
+HOMEPAGE=https://pecl.php.net/apcu
+IUSE=+mmap lock-pthreadmutex +lock-pthreadrw lock-spinlock lock-semaphore php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=^^ ( lock-pthreadmutex lock-pthreadrw lock-spinlock lock-semaphore ) || ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+SLOT=7
+SRC_URI=https://pecl.php.net/get/apcu-5.1.21.tgz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-pecl-r3	4263125759167648adee458afac9b3f1	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f1bc1b7ca18935be8aba1e931dcfd146
diff --git a/metadata/md5-cache/dev-php/pecl-mailparse-3.1.2 b/metadata/md5-cache/dev-php/pecl-mailparse-3.1.2
new file mode 100644
index 000000000000..08feabbe219e
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-mailparse-3.1.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) php_targets_php7-3? ( dev-lang/php:7.3[unicode] ) php_targets_php7-4? ( dev-lang/php:7.4[unicode] ) php_targets_php8-0? ( dev-lang/php:8.0[unicode] ) php_targets_php8-1? ( dev-lang/php:8.1[unicode] )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) php_targets_php7-3? ( dev-lang/php:7.3[unicode] ) php_targets_php7-4? ( dev-lang/php:7.4[unicode] ) php_targets_php8-0? ( dev-lang/php:8.0[unicode] ) php_targets_php8-1? ( dev-lang/php:8.1[unicode] )
+DESCRIPTION=PHP extension for parsing and working with RFC822 and MIME compliant messages
+EAPI=7
+HOMEPAGE=https://pecl.php.net/mailparse
+IUSE=php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) php_targets_php7-3? ( dev-lang/php:7.3[unicode] ) php_targets_php7-4? ( dev-lang/php:7.4[unicode] ) php_targets_php8-0? ( dev-lang/php:8.0[unicode] ) php_targets_php8-1? ( dev-lang/php:8.1[unicode] )
+REQUIRED_USE=|| ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+SLOT=7
+SRC_URI=https://pecl.php.net/get/mailparse-3.1.2.tgz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-pecl-r3	4263125759167648adee458afac9b3f1	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f4e26a86682e09aa1fd561d4db3716eb
diff --git a/metadata/md5-cache/dev-php/pecl-rrd-2.0.3 b/metadata/md5-cache/dev-php/pecl-rrd-2.0.3
new file mode 100644
index 000000000000..2838eb5f3cfe
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-rrd-2.0.3
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-analyzer/rrdtool[graph(-)] php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DESCRIPTION=RRDtool bindings for PHP
+EAPI=7
+HOMEPAGE=https://pecl.php.net/rrd
+IUSE=php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=net-analyzer/rrdtool[graph(-)] php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
+SLOT=7
+SRC_URI=https://pecl.php.net/get/rrd-2.0.3.tgz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-pecl-r3	4263125759167648adee458afac9b3f1	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e3bf5216eb64148ce0dbfa00beae8660
diff --git a/metadata/md5-cache/dev-php/pecl-uploadprogress-2.0.2 b/metadata/md5-cache/dev-php/pecl-uploadprogress-2.0.2
new file mode 100644
index 000000000000..04bbd1a6b4ae
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-uploadprogress-2.0.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DESCRIPTION=An extension to track progress of a file upload
+EAPI=7
+HOMEPAGE=https://pecl.php.net/uploadprogress
+IUSE=examples php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=php_targets_php7-3? ( || ( dev-lang/php:7.3[apache2(-),fileinfo(-)] dev-lang/php:7.3[fileinfo(-),fpm(-)] ) ) php_targets_php7-4? ( || ( dev-lang/php:7.4[apache2(-),fileinfo(-)] dev-lang/php:7.4[fileinfo(-),fpm(-)] ) ) php_targets_php8-0? ( || ( dev-lang/php:8.0[apache2(-),fileinfo(-)] dev-lang/php:8.0[fileinfo(-),fpm(-)] ) ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/uploadprogress-2.0.2.tgz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-pecl-r3	4263125759167648adee458afac9b3f1	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=11ac6d1d2ad80b31fc440a5b31916937
diff --git a/metadata/md5-cache/dev-php/phar-io-manifest-2.0.3 b/metadata/md5-cache/dev-php/phar-io-manifest-2.0.3
new file mode 100644
index 000000000000..16d62db82883
--- /dev/null
+++ b/metadata/md5-cache/dev-php/phar-io-manifest-2.0.3
@@ -0,0 +1,12 @@
+BDEPEND=dev-php/theseer-Autoload
+DEFINED_PHASES=install prepare
+DESCRIPTION=Reading phar.io manifest information from a PHP Archive (PHAR)
+EAPI=7
+HOMEPAGE=https://github.com/phar-io/manifest
+IUSE=examples
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-php/fedora-autoloader >=dev-php/phar-io-version-3.0.1 >=dev-lang/php-7.2:*[phar,xml(-),xmlwriter(-)]
+SLOT=0
+SRC_URI=https://github.com/phar-io/manifest/archive/2.0.3.tar.gz -> phar-io-manifest-2.0.3.tar.gz
+_md5_=b66283345bf0db14aa418de0816e3734
diff --git a/metadata/md5-cache/dev-php/phpspec-prophecy-1.14.0 b/metadata/md5-cache/dev-php/phpspec-prophecy-1.14.0
new file mode 100644
index 000000000000..44c6a846ef92
--- /dev/null
+++ b/metadata/md5-cache/dev-php/phpspec-prophecy-1.14.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Highly opinionated mocking framework
+EAPI=7
+HOMEPAGE=https://github.com/phpspec/prophecy
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-php/fedora-autoloader <dev-php/doctrine-instantiator-2 <dev-php/phpdocumentor-reflection-docblock-6 <dev-php/sebastian-comparator-4 <dev-php/sebastian-recursion-context-4 >=dev-lang/php-5.6:*
+SLOT=0
+SRC_URI=https://github.com/phpspec/prophecy/archive/refs/tags/1.14.0.tar.gz -> phpspec-prophecy-1.14.0.tar.gz
+_md5_=5a4eacf3052f81726e7f552e2e3581f7
diff --git a/metadata/md5-cache/dev-php/theseer-Autoload-1.26.0-r1 b/metadata/md5-cache/dev-php/theseer-Autoload-1.26.0-r1
deleted file mode 100644
index b20a4c281e57..000000000000
--- a/metadata/md5-cache/dev-php/theseer-Autoload-1.26.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-lang/php:*[cli] >=dev-php/theseer-DirectoryScanner-1.3 <dev-php/theseer-DirectoryScanner-2 >=dev-php/zetacomponents-Base-1.8 <dev-php/zetacomponents-Base-2 >=dev-php/zetacomponents-ConsoleTools-1.7.1 <dev-php/zetacomponents-ConsoleTools-2 test? ( >=dev-php/phpunit-8 <dev-php/phpunit-9 )
-DEFINED_PHASES=install prepare test
-DESCRIPTION=PHP Autoload Builder
-EAPI=7
-HOMEPAGE=https://github.com/theseer/Autoload
-IUSE=test
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-lang/php:*[cli] >=dev-php/theseer-DirectoryScanner-1.3 <dev-php/theseer-DirectoryScanner-2 >=dev-php/zetacomponents-Base-1.8 <dev-php/zetacomponents-Base-2 >=dev-php/zetacomponents-ConsoleTools-1.7.1 <dev-php/zetacomponents-ConsoleTools-2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/theseer/Autoload/archive/1.26.0.tar.gz -> theseer-Autoload-1.26.0.tar.gz
-_md5_=dd2aab25ae3b42463a74e860f07d097c
diff --git a/metadata/md5-cache/dev-php/theseer-Autoload-1.26.0-r2 b/metadata/md5-cache/dev-php/theseer-Autoload-1.26.0-r2
new file mode 100644
index 000000000000..6e7d4b5d0ca9
--- /dev/null
+++ b/metadata/md5-cache/dev-php/theseer-Autoload-1.26.0-r2
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/php:*[cli,fileinfo(-),tokenizer(-)] >=dev-php/theseer-DirectoryScanner-1.3 <dev-php/theseer-DirectoryScanner-2 >=dev-php/zetacomponents-Base-1.8 <dev-php/zetacomponents-Base-2 >=dev-php/zetacomponents-ConsoleTools-1.7.1 <dev-php/zetacomponents-ConsoleTools-2 test? ( >=dev-php/phpunit-8 <dev-php/phpunit-9 )
+DEFINED_PHASES=install prepare test
+DESCRIPTION=PHP Autoload Builder
+EAPI=7
+HOMEPAGE=https://github.com/theseer/Autoload
+IUSE=test
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
+LICENSE=BSD
+RDEPEND=dev-lang/php:*[cli,fileinfo(-),tokenizer(-)] >=dev-php/theseer-DirectoryScanner-1.3 <dev-php/theseer-DirectoryScanner-2 >=dev-php/zetacomponents-Base-1.8 <dev-php/zetacomponents-Base-2 >=dev-php/zetacomponents-ConsoleTools-1.7.1 <dev-php/zetacomponents-ConsoleTools-2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/theseer/Autoload/archive/1.26.0.tar.gz -> theseer-Autoload-1.26.0.tar.gz
+_md5_=48a8ff864e003a6ee3cf3bdd567ccdcd
diff --git a/metadata/md5-cache/dev-php/theseer-Autoload-1.26.3 b/metadata/md5-cache/dev-php/theseer-Autoload-1.26.3
deleted file mode 100644
index 11bbc8853dca..000000000000
--- a/metadata/md5-cache/dev-php/theseer-Autoload-1.26.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-lang/php:*[cli] >=dev-php/theseer-DirectoryScanner-1.3 <dev-php/theseer-DirectoryScanner-2 >=dev-php/zetacomponents-Base-1.8 <dev-php/zetacomponents-Base-2 >=dev-php/zetacomponents-ConsoleTools-1.7.1 <dev-php/zetacomponents-ConsoleTools-2 test? ( >=dev-php/phpunit-8 <dev-php/phpunit-9 )
-DEFINED_PHASES=install prepare test
-DESCRIPTION=PHP Autoload Builder
-EAPI=8
-HOMEPAGE=https://github.com/theseer/Autoload
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php:*[cli] >=dev-php/theseer-DirectoryScanner-1.3 <dev-php/theseer-DirectoryScanner-2 >=dev-php/zetacomponents-Base-1.8 <dev-php/zetacomponents-Base-2 >=dev-php/zetacomponents-ConsoleTools-1.7.1 <dev-php/zetacomponents-ConsoleTools-2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/theseer/Autoload/archive/1.26.3.tar.gz -> theseer-Autoload-1.26.3.tar.gz
-_md5_=e0873e0613fe51ba9e4b28439523d12a
diff --git a/metadata/md5-cache/dev-php/theseer-Autoload-1.26.3-r1 b/metadata/md5-cache/dev-php/theseer-Autoload-1.26.3-r1
new file mode 100644
index 000000000000..bc862f2180c7
--- /dev/null
+++ b/metadata/md5-cache/dev-php/theseer-Autoload-1.26.3-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/php:*[cli,fileinfo(-),tokenizer(-)] >=dev-php/theseer-DirectoryScanner-1.3 <dev-php/theseer-DirectoryScanner-2 >=dev-php/zetacomponents-Base-1.8 <dev-php/zetacomponents-Base-2 >=dev-php/zetacomponents-ConsoleTools-1.7.1 <dev-php/zetacomponents-ConsoleTools-2 test? ( >=dev-php/phpunit-8 <dev-php/phpunit-9 )
+DEFINED_PHASES=install prepare test
+DESCRIPTION=PHP Autoload Builder
+EAPI=8
+HOMEPAGE=https://github.com/theseer/Autoload
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/php:*[cli,fileinfo(-),tokenizer(-)] >=dev-php/theseer-DirectoryScanner-1.3 <dev-php/theseer-DirectoryScanner-2 >=dev-php/zetacomponents-Base-1.8 <dev-php/zetacomponents-Base-2 >=dev-php/zetacomponents-ConsoleTools-1.7.1 <dev-php/zetacomponents-ConsoleTools-2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/theseer/Autoload/archive/1.26.3.tar.gz -> theseer-Autoload-1.26.3.tar.gz
+_md5_=208ae4c92f0d5512a7ee195cf9b9da5d
diff --git a/metadata/md5-cache/dev-php/xdebug-3.1.1 b/metadata/md5-cache/dev-php/xdebug-3.1.1
new file mode 100644
index 000000000000..00760958e2a7
--- /dev/null
+++ b/metadata/md5-cache/dev-php/xdebug-3.1.1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3[-threads(-)] ) php_targets_php7-4? ( dev-lang/php:7.4[-threads(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=php_targets_php7-3? ( dev-lang/php:7.3[-threads(-)] ) php_targets_php7-4? ( dev-lang/php:7.4[-threads(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
+DESCRIPTION=A PHP debugging and profiling extension
+EAPI=7
+HOMEPAGE=https://xdebug.org/
+IUSE=php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=Xdebug
+RDEPEND=php_targets_php7-3? ( dev-lang/php:7.3[-threads(-)] ) php_targets_php7-4? ( dev-lang/php:7.4[-threads(-)] ) php_targets_php8-0? ( dev-lang/php:8.0[-threads(-)] ) php_targets_php8-1? ( dev-lang/php:8.1[-threads(-)] )
+REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/xdebug/xdebug/archive/3.1.1.tar.gz -> xdebug-3.1.1.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d5dda513c251550059dcb025b53b54aa
diff --git a/metadata/md5-cache/dev-php/xhprof-2.3.5 b/metadata/md5-cache/dev-php/xhprof-2.3.5
new file mode 100644
index 000000000000..350704f08a89
--- /dev/null
+++ b/metadata/md5-cache/dev-php/xhprof-2.3.5
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DESCRIPTION=A Hierarchical Profiler for PHP
+EAPI=7
+HOMEPAGE=https://pecl.php.net/package/xhprof
+IUSE=php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/xhprof-2.3.5.tgz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-pecl-r3	4263125759167648adee458afac9b3f1	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c74a1421d73a10ae04a6a6eff47bf750
diff --git a/metadata/md5-cache/dev-php/zetacomponents-Base-1.9.3 b/metadata/md5-cache/dev-php/zetacomponents-Base-1.9.3
new file mode 100644
index 000000000000..f32e44037d23
--- /dev/null
+++ b/metadata/md5-cache/dev-php/zetacomponents-Base-1.9.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Base package for any Zeta component
+EAPI=8
+HOMEPAGE=https://github.com/zetacomponents/Base
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-lang/php:*
+SLOT=0
+SRC_URI=https://github.com/zetacomponents/Base/archive/1.9.3.tar.gz -> zetacomponents-Base-1.9.3.tar.gz
+_md5_=e6a997266ad32397d4f828671bd2e2bc
diff --git a/metadata/md5-cache/dev-python/Faker-8.12.0 b/metadata/md5-cache/dev-python/Faker-8.12.0
deleted file mode 100644
index 648c96bf62b8..000000000000
--- a/metadata/md5-cache/dev-python/Faker-8.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-8.12.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f4247b2caef34c612e26a81090b53eba
diff --git a/metadata/md5-cache/dev-python/Faker-8.12.1 b/metadata/md5-cache/dev-python/Faker-8.12.1
deleted file mode 100644
index 8d89771b5369..000000000000
--- a/metadata/md5-cache/dev-python/Faker-8.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-8.12.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f4247b2caef34c612e26a81090b53eba
diff --git a/metadata/md5-cache/dev-python/Faker-8.13.2 b/metadata/md5-cache/dev-python/Faker-8.13.2
deleted file mode 100644
index 0c84584e54f1..000000000000
--- a/metadata/md5-cache/dev-python/Faker-8.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-8.13.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f4247b2caef34c612e26a81090b53eba
diff --git a/metadata/md5-cache/dev-python/Faker-8.14.0 b/metadata/md5-cache/dev-python/Faker-8.14.0
deleted file mode 100644
index 59bcf75a28a4..000000000000
--- a/metadata/md5-cache/dev-python/Faker-8.14.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-8.14.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f4247b2caef34c612e26a81090b53eba
diff --git a/metadata/md5-cache/dev-python/Faker-8.14.1 b/metadata/md5-cache/dev-python/Faker-8.14.1
deleted file mode 100644
index 5c4ca9bd552b..000000000000
--- a/metadata/md5-cache/dev-python/Faker-8.14.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-8.14.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f4247b2caef34c612e26a81090b53eba
diff --git a/metadata/md5-cache/dev-python/Faker-8.16.0 b/metadata/md5-cache/dev-python/Faker-8.16.0
deleted file mode 100644
index 3a07ec3a0087..000000000000
--- a/metadata/md5-cache/dev-python/Faker-8.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-8.16.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f4247b2caef34c612e26a81090b53eba
diff --git a/metadata/md5-cache/dev-python/Faker-9.0.0 b/metadata/md5-cache/dev-python/Faker-9.0.0
deleted file mode 100644
index 7ff32b7d8c5b..000000000000
--- a/metadata/md5-cache/dev-python/Faker-9.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-9.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f4247b2caef34c612e26a81090b53eba
diff --git a/metadata/md5-cache/dev-python/Faker-9.2.0 b/metadata/md5-cache/dev-python/Faker-9.2.0
deleted file mode 100644
index 44e9b3383ade..000000000000
--- a/metadata/md5-cache/dev-python/Faker-9.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python package that generates fake data for you
-EAPI=8
-HOMEPAGE=https://github.com/joke2k/faker
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Faker/Faker-9.2.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f4247b2caef34c612e26a81090b53eba
diff --git a/metadata/md5-cache/dev-python/Faker-9.3.1 b/metadata/md5-cache/dev-python/Faker-9.3.1
new file mode 100644
index 000000000000..d21e813190dd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Faker-9.3.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff] dev-python/random2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/validators[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python package that generates fake data for you
+EAPI=8
+HOMEPAGE=https://github.com/joke2k/faker
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/text-unidecode-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-ruby/faker python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Faker/Faker-9.3.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f4247b2caef34c612e26a81090b53eba
diff --git a/metadata/md5-cache/dev-python/GridDataFormats-0.5.0 b/metadata/md5-cache/dev-python/GridDataFormats-0.5.0
deleted file mode 100644
index f4af214e9630..000000000000
--- a/metadata/md5-cache/dev-python/GridDataFormats-0.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/numpy-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Reading and writing of data on regular grids in Python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/GridDataFormats/ https://github.com/MDAnalysis/GridDataFormats
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=>=dev-python/numpy-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/G/GridDataFormats/GridDataFormats-0.5.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=02f1c40e46afaec2fd2d7494b1920966
diff --git a/metadata/md5-cache/dev-python/GridDataFormats-0.6.0 b/metadata/md5-cache/dev-python/GridDataFormats-0.6.0
new file mode 100644
index 000000000000..fe32cfc5b7c0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/GridDataFormats-0.6.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/numpy-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Reading and writing of data on regular grids in Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/GridDataFormats/ https://github.com/MDAnalysis/GridDataFormats
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=>=dev-python/numpy-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/G/GridDataFormats/GridDataFormats-0.6.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b990e3919533870fb47a51526bc5b473
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 30f52cd089ef..05f0384ee182 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/MechanicalSoup-1.0.0 b/metadata/md5-cache/dev-python/MechanicalSoup-1.0.0
deleted file mode 100644
index adcf317fcf9b..000000000000
--- a/metadata/md5-cache/dev-python/MechanicalSoup-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/requests-mock-1.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-httpbin[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/beautifulsoup4-4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A python library for automating interaction with websites
-EAPI=7
-HOMEPAGE=https://pypi.org/project/MechanicalSoup/
-IUSE=examples test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/beautifulsoup4-4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/M/MechanicalSoup/MechanicalSoup-1.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=27ab36102a6f95297b11a7197af1a3b3
diff --git a/metadata/md5-cache/dev-python/PyQt-builder-1.11.0 b/metadata/md5-cache/dev-python/PyQt-builder-1.11.0
deleted file mode 100644
index f499e015184b..000000000000
--- a/metadata/md5-cache/dev-python/PyQt-builder-1.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The PEP 517 compliant PyQt build system
-EAPI=8
-HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/
-IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sip-5.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/P/PyQt-builder/PyQt-builder-1.11.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2d6eb947dc686eb8baadf35fe3f39406
diff --git a/metadata/md5-cache/dev-python/PyQt-builder-1.12.1 b/metadata/md5-cache/dev-python/PyQt-builder-1.12.1
new file mode 100644
index 000000000000..1b46ca93543e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyQt-builder-1.12.1
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( dev-python/sphinx ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The PEP 517 compliant PyQt build system
+EAPI=8
+HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/
+IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 SIP )
+RDEPEND=dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sip-6.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/P/PyQt-builder/PyQt-builder-1.12.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3e9ca7274335eb0069ca077384ccb7d8
diff --git a/metadata/md5-cache/dev-python/PySDL2-0.9.7 b/metadata/md5-cache/dev-python/PySDL2-0.9.7
deleted file mode 100644
index 24ee570c7301..000000000000
--- a/metadata/md5-cache/dev-python/PySDL2-0.9.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( media-libs/libsdl2 >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-libs/libsdl2[joystick,sound,video] media-libs/sdl2-gfx media-libs/sdl2-image media-libs/sdl2-mixer media-libs/sdl2-ttf )
-DESCRIPTION=Python (ctypes) bindings for SDL2 libraries
-EAPI=7
-HOMEPAGE=https://github.com/marcusva/py-sdl2 https://pypi.org/project/PySDL2/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( public-domain CC0-1.0 ZLIB )
-RDEPEND=media-libs/libsdl2 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/P/PySDL2/PySDL2-0.9.7.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3b51be0e5eec5f6a0fd47f6259b0a4d2
diff --git a/metadata/md5-cache/dev-python/PySDL2-0.9.8 b/metadata/md5-cache/dev-python/PySDL2-0.9.8
deleted file mode 100644
index 83ee805b42fc..000000000000
--- a/metadata/md5-cache/dev-python/PySDL2-0.9.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( media-libs/libsdl2 >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/libsdl2[joystick,sound,video] media-libs/sdl2-gfx media-libs/sdl2-image[gif,jpeg,png,tiff,webp] || ( media-libs/sdl2-mixer[flac] media-libs/sdl2-mixer[midi] media-libs/sdl2-mixer[mod] media-libs/sdl2-mixer[mp3] media-libs/sdl2-mixer[opus] ) media-libs/sdl2-ttf )
-DESCRIPTION=Python (ctypes) bindings for SDL2 libraries
-EAPI=8
-HOMEPAGE=https://github.com/marcusva/py-sdl2 https://pypi.org/project/PySDL2/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( public-domain CC0-1.0 ZLIB )
-RDEPEND=media-libs/libsdl2 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/P/PySDL2/PySDL2-0.9.8.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ce4b01ab6e378c071ed875a22b3a9a68
diff --git a/metadata/md5-cache/dev-python/PyUtilib-5.7.2 b/metadata/md5-cache/dev-python/PyUtilib-5.7.2
deleted file mode 100644
index 78391b8fecb6..000000000000
--- a/metadata/md5-cache/dev-python/PyUtilib-5.7.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A collection of Python utilities
-EAPI=7
-HOMEPAGE=https://github.com/PyUtilib/pyutilib
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/PyUtilib/pyutilib/archive/5.7.2.tar.gz -> PyUtilib-5.7.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cc4b33daa00df6bb94af1a5fa3793ef7
diff --git a/metadata/md5-cache/dev-python/Pyro4-4.80 b/metadata/md5-cache/dev-python/Pyro4-4.80
deleted file mode 100644
index 5cfbba117b67..000000000000
--- a/metadata/md5-cache/dev-python/Pyro4-4.80
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/serpent-1.27[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/cloudpickle-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dill[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/msgpack-0.4.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Distributed object middleware for Python (RPC)
-EAPI=7
-HOMEPAGE=https://pypi.org/project/Pyro4/ https://github.com/irmen/Pyro4
-IUSE=doc examples test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 ppc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/serpent-1.27[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.80.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f9d49acbf9506f825230b6cd5d0baec
diff --git a/metadata/md5-cache/dev-python/Pyro4-4.81 b/metadata/md5-cache/dev-python/Pyro4-4.81
index f2ba48cde24d..6cfe84a8e97c 100644
--- a/metadata/md5-cache/dev-python/Pyro4-4.81
+++ b/metadata/md5-cache/dev-python/Pyro4-4.81
@@ -5,7 +5,7 @@ DESCRIPTION=Distributed object middleware for Python (RPC)
 EAPI=8
 HOMEPAGE=https://pypi.org/project/Pyro4/ https://github.com/irmen/Pyro4
 IUSE=doc examples test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm64 ppc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/serpent-1.27[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.81.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d3c7c9f8e6f9400c535d1ecbea47f9fe
+_md5_=2455225d74dc7c1b910fe99bd67321ae
diff --git a/metadata/md5-cache/dev-python/Rx-3.1.0 b/metadata/md5-cache/dev-python/Rx-3.1.0
deleted file mode 100644
index bc64443406df..000000000000
--- a/metadata/md5-cache/dev-python/Rx-3.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Reactive Extensions for Python
-EAPI=7
-HOMEPAGE=http://reactivex.io/
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ReactiveX/RxPY/archive/v3.1.0.tar.gz -> Rx-3.1.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=c42aa8187f2ad5e44fd3859888426ed8
diff --git a/metadata/md5-cache/dev-python/absl-py-0.10.0 b/metadata/md5-cache/dev-python/absl-py-0.10.0
deleted file mode 100644
index daa5ad2d7395..000000000000
--- a/metadata/md5-cache/dev-python/absl-py-0.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python3_8(-)?] dev-python/setuptools[python_targets_python3_8(-)?]
-DESCRIPTION=Abseil Python Common Libraries
-EAPI=7
-HOMEPAGE=https://github.com/abseil/abseil-py
-IUSE=python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?] dev-python/setuptools[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/abseil/abseil-py/archive/pypi-v0.10.0.tar.gz -> absl-py-0.10.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4c289fa90a582b84b2d29fe5313f0b72
diff --git a/metadata/md5-cache/dev-python/adblock-0.4.4 b/metadata/md5-cache/dev-python/adblock-0.4.4
deleted file mode 100644
index d1531cd5e345..000000000000
--- a/metadata/md5-cache/dev-python/adblock-0.4.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip dev-util/maturin test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Python wrapper for Brave's adblocking library, which is written in Rust
-EAPI=7
-HOMEPAGE=https://github.com/ArniDagur/python-adblock
-IUSE=debug test debug python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=|| ( Apache-2.0 MIT )
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ArniDagur/python-adblock/archive/refs/tags/0.4.4.tar.gz -> adblock-0.4.4.tar.gz https://crates.io/api/v1/crates/adblock/0.3.10/download -> adblock-0.3.10.crate https://crates.io/api/v1/crates/addr/0.11.8/download -> addr-0.11.8.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/ctor/0.1.20/download -> ctor-0.1.20.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/ghost/0.1.2/download -> ghost-0.1.2.crate https://crates.io/api/v1/crates/idna/0.2.2/download -> idna-0.2.2.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/inventory/0.1.10/download -> inventory-0.1.10.crate https://crates.io/api/v1/crates/inventory-impl/0.1.10/download -> inventory-impl-0.1.10.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/libc/0.2.93/download -> libc-0.2.93.crate https://crates.io/api/v1/crates/lock_api/0.4.3/download -> lock_api-0.4.3.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/once_cell/1.7.2/download -> once_cell-1.7.2.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.26/download -> proc-macro2-1.0.26.crate https://crates.io/api/v1/crates/psl/2.0.18/download -> psl-2.0.18.crate https://crates.io/api/v1/crates/psl-types/2.0.7/download -> psl-types-2.0.7.crate https://crates.io/api/v1/crates/pyo3/0.13.2/download -> pyo3-0.13.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.13.2/download -> pyo3-macros-0.13.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.13.2/download -> pyo3-macros-backend-0.13.2.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/regex/1.4.5/download -> regex-1.4.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.23/download -> regex-syntax-0.6.23.crate https://crates.io/api/v1/crates/rmp/0.8.10/download -> rmp-0.8.10.crate https://crates.io/api/v1/crates/rmp-serde/0.13.7/download -> rmp-serde-0.13.7.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/seahash/3.0.7/download -> seahash-3.0.7.crate https://crates.io/api/v1/crates/serde/1.0.125/download -> serde-1.0.125.crate https://crates.io/api/v1/crates/serde_derive/1.0.125/download -> serde_derive-1.0.125.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/syn/1.0.69/download -> syn-1.0.69.crate https://crates.io/api/v1/crates/tinyvec/1.2.0/download -> tinyvec-1.2.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/twoway/0.2.1/download -> twoway-0.2.1.crate https://crates.io/api/v1/crates/unchecked-index/0.2.2/download -> unchecked-index-0.2.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/unindent/0.1.7/download -> unindent-0.1.7.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=401a4bb56a29fbafc3901b1e97ac7fb3
diff --git a/metadata/md5-cache/dev-python/adblock-0.5.0 b/metadata/md5-cache/dev-python/adblock-0.5.0
index 2f53e3ff193b..3ae501f5431a 100644
--- a/metadata/md5-cache/dev-python/adblock-0.5.0
+++ b/metadata/md5-cache/dev-python/adblock-0.5.0
@@ -1,16 +1,15 @@
-BDEPEND=app-arch/unzip dev-util/maturin test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=virtual/rust-1.37.0
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/maturin test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=virtual/rust-1.53
 DEFINED_PHASES=compile configure install test unpack
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DESCRIPTION=Python wrapper for Brave's adblocking library, which is written in Rust
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/ArniDagur/python-adblock
-IUSE=debug test debug python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=|| ( Apache-2.0 MIT )
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+IUSE=test debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0 BSD MIT MPL-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ArniDagur/python-adblock/archive/refs/tags/0.5.0.tar.gz -> adblock-0.5.0.tar.gz https://crates.io/api/v1/crates/adblock/0.3.13/download -> adblock-0.3.13.crate https://crates.io/api/v1/crates/addr/0.14.0/download -> addr-0.14.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/ctor/0.1.20/download -> ctor-0.1.20.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/ghost/0.1.2/download -> ghost-0.1.2.crate https://crates.io/api/v1/crates/idna/0.2.2/download -> idna-0.2.2.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/inventory/0.1.10/download -> inventory-0.1.10.crate https://crates.io/api/v1/crates/inventory-impl/0.1.10/download -> inventory-impl-0.1.10.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/libc/0.2.93/download -> libc-0.2.93.crate https://crates.io/api/v1/crates/lock_api/0.4.3/download -> lock_api-0.4.3.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/once_cell/1.7.2/download -> once_cell-1.7.2.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.26/download -> proc-macro2-1.0.26.crate https://crates.io/api/v1/crates/psl/2.0.18/download -> psl-2.0.18.crate https://crates.io/api/v1/crates/psl-types/2.0.7/download -> psl-types-2.0.7.crate https://crates.io/api/v1/crates/pyo3/0.13.2/download -> pyo3-0.13.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.13.2/download -> pyo3-macros-0.13.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.13.2/download -> pyo3-macros-backend-0.13.2.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/rmp/0.8.10/download -> rmp-0.8.10.crate https://crates.io/api/v1/crates/rmp-serde/0.13.7/download -> rmp-serde-0.13.7.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/seahash/3.0.7/download -> seahash-3.0.7.crate https://crates.io/api/v1/crates/serde/1.0.125/download -> serde-1.0.125.crate https://crates.io/api/v1/crates/serde_derive/1.0.125/download -> serde_derive-1.0.125.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/syn/1.0.69/download -> syn-1.0.69.crate https://crates.io/api/v1/crates/tinyvec/1.2.0/download -> tinyvec-1.2.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/twoway/0.2.1/download -> twoway-0.2.1.crate https://crates.io/api/v1/crates/unchecked-index/0.2.2/download -> unchecked-index-0.2.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/unindent/0.1.7/download -> unindent-0.1.7.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=607f6dc985a4e33cd60290ccc272ea44
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2e8d6340332756e2ae2a5747446ae4d6
diff --git a/metadata/md5-cache/dev-python/agate-1.6.3 b/metadata/md5-cache/dev-python/agate-1.6.3
deleted file mode 100644
index 3599abefb071..000000000000
--- a/metadata/md5-cache/dev-python/agate-1.6.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/leather-0.3.3-r2[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytimeparse-1.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parsedatetime-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/isodate-0.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyicu-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-slugify-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/leather-0.3.3-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/leather-0.3.3-r2[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python data analysis library that is optimized for humans instead of machines
-EAPI=8
-HOMEPAGE=https://github.com/wireservice/agate https://pypi.org/project/agate/
-IUSE=+xml test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytimeparse-1.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parsedatetime-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/isodate-0.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyicu-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-slugify-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/leather-0.3.3-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/leather-0.3.3-r2[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/agate/agate-1.6.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8a81d62f8900db3ea676c311599a6a15
diff --git a/metadata/md5-cache/dev-python/agate-1.6.3-r1 b/metadata/md5-cache/dev-python/agate-1.6.3-r1
new file mode 100644
index 000000000000..5d398b522476
--- /dev/null
+++ b/metadata/md5-cache/dev-python/agate-1.6.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytimeparse-1.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parsedatetime-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/isodate-0.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyicu-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-slugify-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/leather-0.3.3-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python data analysis library that is optimized for humans instead of machines
+EAPI=8
+HOMEPAGE=https://github.com/wireservice/agate https://pypi.org/project/agate/
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytimeparse-1.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parsedatetime-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/isodate-0.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyicu-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-slugify-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/leather-0.3.3-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/agate/agate-1.6.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7d65c11ff33f828fd141808b49f607dc
diff --git a/metadata/md5-cache/dev-python/agate-dbf-0.2.2 b/metadata/md5-cache/dev-python/agate-dbf-0.2.2
deleted file mode 100644
index b45fcb48fa86..000000000000
--- a/metadata/md5-cache/dev-python/agate-dbf-0.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dbfread-2.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Adds read support for DBF files to agate.
-EAPI=8
-HOMEPAGE=https://github.com/wireservice/agate-dbf https://pypi.org/project/agate-dbf/
-IUSE=+xml test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dbfread-2.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/agate-dbf/agate-dbf-0.2.2.tar.gz test? ( https://raw.githubusercontent.com/wireservice/agate-dbf/0.2.2/examples/test.dbf -> agate-dbf-0.2.2_examples%2Ftest.dbf https://raw.githubusercontent.com/wireservice/agate-dbf/0.2.2/examples/testdbf_converted.csv -> agate-dbf-0.2.2_examples%2Ftestdbf_converted.csv https://raw.githubusercontent.com/wireservice/agate-dbf/0.2.2/tests/test_table.py -> agate-dbf-0.2.2_tests%2Ftest_table.py )
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6afb12ccaaf977af4c10b82d63a90705
diff --git a/metadata/md5-cache/dev-python/agate-dbf-0.2.2-r1 b/metadata/md5-cache/dev-python/agate-dbf-0.2.2-r1
new file mode 100644
index 000000000000..e21c261f4632
--- /dev/null
+++ b/metadata/md5-cache/dev-python/agate-dbf-0.2.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dbfread-2.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Adds read support for DBF files to agate.
+EAPI=8
+HOMEPAGE=https://github.com/wireservice/agate-dbf https://pypi.org/project/agate-dbf/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dbfread-2.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/wireservice/agate-dbf/archive/0.2.2.tar.gz -> agate-dbf-0.2.2.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=30a17aecd8b8ed1e6bf3ff6ae8f908b1
diff --git a/metadata/md5-cache/dev-python/agate-excel-0.2.3 b/metadata/md5-cache/dev-python/agate-excel-0.2.3
deleted file mode 100644
index 14b09eda5536..000000000000
--- a/metadata/md5-cache/dev-python/agate-excel-0.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openpyxl-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Adds read support for Excel files (xls and xlsx) to agate.
-EAPI=8
-HOMEPAGE=https://github.com/wireservice/agate-excel https://pypi.org/project/agate-excel/
-IUSE=+xml test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openpyxl-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/agate-excel/agate-excel-0.2.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a5b38615408e284146aec3ff9479d118
diff --git a/metadata/md5-cache/dev-python/agate-excel-0.2.5 b/metadata/md5-cache/dev-python/agate-excel-0.2.5
deleted file mode 100644
index f10133d55de2..000000000000
--- a/metadata/md5-cache/dev-python/agate-excel-0.2.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/olefile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openpyxl-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Adds read support for Excel files (xls and xlsx) to agate.
-EAPI=8
-HOMEPAGE=https://github.com/wireservice/agate-excel https://pypi.org/project/agate-excel/
-IUSE=+xml test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/olefile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openpyxl-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/agate-excel/agate-excel-0.2.5.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6c2460e1b459c566a0cfcb250f7e3042
diff --git a/metadata/md5-cache/dev-python/agate-excel-0.2.5-r1 b/metadata/md5-cache/dev-python/agate-excel-0.2.5-r1
new file mode 100644
index 000000000000..6451b785ced1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/agate-excel-0.2.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/olefile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openpyxl-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Adds read support for Excel files (xls and xlsx) to agate.
+EAPI=8
+HOMEPAGE=https://github.com/wireservice/agate-excel https://pypi.org/project/agate-excel/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/olefile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openpyxl-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/agate-excel/agate-excel-0.2.5.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3b1173fe75503c690fd0efa98179d43d
diff --git a/metadata/md5-cache/dev-python/agate-sql-0.5.7 b/metadata/md5-cache/dev-python/agate-sql-0.5.7
deleted file mode 100644
index 439018c3b655..000000000000
--- a/metadata/md5-cache/dev-python/agate-sql-0.5.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Adds SQL read/write support to agate.
-EAPI=8
-HOMEPAGE=https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/
-IUSE=+xml test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/agate-sql/agate-sql-0.5.7.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=891caa8dbbf763bfc9f53e659ab189e7
diff --git a/metadata/md5-cache/dev-python/agate-sql-0.5.8 b/metadata/md5-cache/dev-python/agate-sql-0.5.8
deleted file mode 100644
index c7743b32132a..000000000000
--- a/metadata/md5-cache/dev-python/agate-sql-0.5.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Adds SQL read/write support to agate.
-EAPI=8
-HOMEPAGE=https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/
-IUSE=+xml test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.5.0[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/agate-sql/agate-sql-0.5.8.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cabfdccab7cef5f2bd1f8029d73a5806
diff --git a/metadata/md5-cache/dev-python/agate-sql-0.5.8-r1 b/metadata/md5-cache/dev-python/agate-sql-0.5.8-r1
new file mode 100644
index 000000000000..ad4611ef9cb2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/agate-sql-0.5.8-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Adds SQL read/write support to agate.
+EAPI=8
+HOMEPAGE=https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/agate-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/agate-sql/agate-sql-0.5.8.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a54da1f2d36d11a2e4973e7bac20bee1
diff --git a/metadata/md5-cache/dev-python/aiofiles-0.5.0 b/metadata/md5-cache/dev-python/aiofiles-0.5.0
deleted file mode 100644
index 59353ad94cd7..000000000000
--- a/metadata/md5-cache/dev-python/aiofiles-0.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/pytest-5.4[python_targets_python3_8(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?] )
-DESCRIPTION=File support for asyncio
-EAPI=7
-HOMEPAGE=https://github.com/Tinche/aiofiles
-IUSE=test python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Tinche/aiofiles/archive/v0.5.0.tar.gz -> aiofiles-0.5.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a5632e55011c23e047863a1c8f3c11f4
diff --git a/metadata/md5-cache/dev-python/aiofiles-0.6.0 b/metadata/md5-cache/dev-python/aiofiles-0.6.0
deleted file mode 100644
index d1f134f77c4a..000000000000
--- a/metadata/md5-cache/dev-python/aiofiles-0.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=File support for asyncio
-EAPI=7
-HOMEPAGE=https://github.com/Tinche/aiofiles
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Tinche/aiofiles/archive/v0.6.0.tar.gz -> aiofiles-0.6.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=142a139004eb582722c40f30f3fa0e4d
diff --git a/metadata/md5-cache/dev-python/aiohttp-jinja2-1.4.2 b/metadata/md5-cache/dev-python/aiohttp-jinja2-1.4.2
deleted file mode 100644
index 6b292920b6e2..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-jinja2-1.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-aiohttp-0.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aiohttp-2.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/alabaster[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=jinja2 template renderer for aiohttp.web
-EAPI=7
-HOMEPAGE=https://github.com/aio-libs/aiohttp-jinja2
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aiohttp-2.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/aiohttp-jinja2/aiohttp-jinja2-1.4.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=95ff496d4da037f14240fcc61475133c
diff --git a/metadata/md5-cache/dev-python/amodem-1.15.1-r1 b/metadata/md5-cache/dev-python/amodem-1.15.1-r1
deleted file mode 100644
index 311e8db1becc..000000000000
--- a/metadata/md5-cache/dev-python/amodem-1.15.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Transmit data between two computers using audio
-EAPI=7
-HOMEPAGE=https://github.com/romanz/amodem
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/romanz/amodem/archive/v1.15.1.tar.gz -> amodem-1.15.1.tar.gz mirror://pypi/a/amodem/amodem-1.15.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=874b3c70697750c6799db26a1fbd3a19
diff --git a/metadata/md5-cache/dev-python/amodem-1.15.2 b/metadata/md5-cache/dev-python/amodem-1.15.2
deleted file mode 100644
index 72358ee20b94..000000000000
--- a/metadata/md5-cache/dev-python/amodem-1.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Transmit data between two computers using audio
-EAPI=7
-HOMEPAGE=https://github.com/romanz/amodem
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/romanz/amodem/archive/v1.15.2.tar.gz -> amodem-1.15.2.tar.gz mirror://pypi/a/amodem/amodem-1.15.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fbb90a44e69ca7c4d925dd49a26a9782
diff --git a/metadata/md5-cache/dev-python/anyio-3.1.0 b/metadata/md5-cache/dev-python/anyio-3.1.0
deleted file mode 100644
index 6d6e3246ef38..000000000000
--- a/metadata/md5-cache/dev-python/anyio-3.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/hypothesis-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-mock-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uvloop-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/idna-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sniffio-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Compatibility layer for multiple asynchronous event loop implementations
-EAPI=7
-HOMEPAGE=https://github.com/agronholm/anyio https://pypi.org/project/anyio/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/idna-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sniffio-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/anyio/anyio-3.1.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9047c15c16ad323f54c3d1bd3b1775e9
diff --git a/metadata/md5-cache/dev-python/anyio-3.2.0 b/metadata/md5-cache/dev-python/anyio-3.2.0
deleted file mode 100644
index a7c41cf96a30..000000000000
--- a/metadata/md5-cache/dev-python/anyio-3.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/hypothesis-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-mock-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uvloop-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/idna-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sniffio-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Compatibility layer for multiple asynchronous event loop implementations
-EAPI=7
-HOMEPAGE=https://github.com/agronholm/anyio https://pypi.org/project/anyio/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm
-LICENSE=MIT
-RDEPEND=>=dev-python/idna-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sniffio-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/anyio/anyio-3.2.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=79bd2d5c1e3d63f17772f1ef9605dc45
diff --git a/metadata/md5-cache/dev-python/anyio-3.2.1 b/metadata/md5-cache/dev-python/anyio-3.2.1
index de83013359f2..89a4c7de26ec 100644
--- a/metadata/md5-cache/dev-python/anyio-3.2.1
+++ b/metadata/md5-cache/dev-python/anyio-3.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Compatibility layer for multiple asynchronous event loop implementat
 EAPI=7
 HOMEPAGE=https://github.com/agronholm/anyio https://pypi.org/project/anyio/
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/idna-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sniffio-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/anyio/anyio-3.2.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=add5fc56a5eeb67638a884e5cf87f081
+_md5_=9210f84438b28ce3a25070fc3be3a5a0
diff --git a/metadata/md5-cache/dev-python/anyqt-0.0.12 b/metadata/md5-cache/dev-python/anyqt-0.0.12
deleted file mode 100644
index 8712eff10af5..000000000000
--- a/metadata/md5-cache/dev-python/anyqt-0.0.12
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=PyQt4/PyQt5 compatibility layer
-EAPI=7
-HOMEPAGE=https://github.com/ales-erjavec/anyqt
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/ales-erjavec/anyqt/archive/0.0.12.tar.gz -> anyqt-0.0.12.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6f8b65b0d10b928370a40a5f39438354
diff --git a/metadata/md5-cache/dev-python/anyqt-0.0.8-r1 b/metadata/md5-cache/dev-python/anyqt-0.0.8-r1
deleted file mode 100644
index ee3094c5b3a0..000000000000
--- a/metadata/md5-cache/dev-python/anyqt-0.0.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=PyQt4/PyQt5 compatibility layer
-EAPI=7
-HOMEPAGE=https://github.com/ales-erjavec/anyqt
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/ales-erjavec/anyqt/archive/0.0.8.tar.gz -> anyqt-0.0.8.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4f4182b8ec5e686d169f83fc3dad8db3
diff --git a/metadata/md5-cache/dev-python/apispec-5.1.0 b/metadata/md5-cache/dev-python/apispec-5.1.0
deleted file mode 100644
index d1ff58260f74..000000000000
--- a/metadata/md5-cache/dev-python/apispec-5.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/bottle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/marshmallow-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A pluggable API specification generator.
-EAPI=8
-HOMEPAGE=https://github.com/marshmallow-code/apispec/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/marshmallow-code/apispec/archive/5.1.0.tar.gz -> apispec-5.1.0.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d1d52c981f07c90962ac6fbb90b2c919
diff --git a/metadata/md5-cache/dev-python/argparse-manpage-1.4 b/metadata/md5-cache/dev-python/argparse-manpage-1.4
deleted file mode 100644
index 5209f04857a6..000000000000
--- a/metadata/md5-cache/dev-python/argparse-manpage-1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Automatically build man-pages for your Python project
-EAPI=7
-HOMEPAGE=https://github.com/praiskup/argparse-manpage https://pypi.org/project/argparse-manpage/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/praiskup/argparse-manpage/archive/v1.4.tar.gz -> argparse-manpage-1.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=42bb3cd28a29f92a5930a65b5e1fe3cb
diff --git a/metadata/md5-cache/dev-python/arrow-1.1.1 b/metadata/md5-cache/dev-python/arrow-1.1.1
index 01f51e095ed5..a16f70e42799 100644
--- a/metadata/md5-cache/dev-python/arrow-1.1.1
+++ b/metadata/md5-cache/dev-python/arrow-1.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Better dates and times for Python
 EAPI=7
 HOMEPAGE=https://github.com/arrow-py/arrow/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-dateutil-2.7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrow/arrow-1.1.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d9b2c6d7e0bd64ff60fd2036f609d5b5
+_md5_=2219f128d96d7f90257a31fcc6145545
diff --git a/metadata/md5-cache/dev-python/astroid-2.6.6 b/metadata/md5-cache/dev-python/astroid-2.6.6
deleted file mode 100644
index c34cf70d5dd1..000000000000
--- a/metadata/md5-cache/dev-python/astroid-2.6.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Abstract Syntax Tree for logilab packages
-EAPI=8
-HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyCQA/astroid/archive/v2.6.6.tar.gz -> astroid-2.6.6.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0dcd9eeb2797b5f42946bfc402acd65f
diff --git a/metadata/md5-cache/dev-python/astroid-2.6.6-r1 b/metadata/md5-cache/dev-python/astroid-2.6.6-r1
new file mode 100644
index 000000000000..565594a2719d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astroid-2.6.6-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/wrapt-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=8
+HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/wrapt-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/astroid/archive/v2.6.6.tar.gz -> astroid-2.6.6.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5b14e476fbf53d0a607b383bde8f5480
diff --git a/metadata/md5-cache/dev-python/astroid-2.7.3 b/metadata/md5-cache/dev-python/astroid-2.7.3
deleted file mode 100644
index 02bcc2da4ee5..000000000000
--- a/metadata/md5-cache/dev-python/astroid-2.7.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Abstract Syntax Tree for logilab packages
-EAPI=8
-HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyCQA/astroid/archive/v2.7.3.tar.gz -> astroid-2.7.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c65d30e9f95a9d998ddf8a79bdbcb043
diff --git a/metadata/md5-cache/dev-python/astroid-2.7.3-r1 b/metadata/md5-cache/dev-python/astroid-2.7.3-r1
new file mode 100644
index 000000000000..96185b9f3cf4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astroid-2.7.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/wrapt-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=8
+HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/wrapt-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/astroid/archive/v2.7.3.tar.gz -> astroid-2.7.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5c482f8c3a1491941935323d5b3fecba
diff --git a/metadata/md5-cache/dev-python/astroid-2.8.0 b/metadata/md5-cache/dev-python/astroid-2.8.0
deleted file mode 100644
index 1f18eff7fe2b..000000000000
--- a/metadata/md5-cache/dev-python/astroid-2.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Abstract Syntax Tree for logilab packages
-EAPI=8
-HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyCQA/astroid/archive/v2.8.0.tar.gz -> astroid-2.8.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=11527e706f0e135c0a029015c5ccc0e1
diff --git a/metadata/md5-cache/dev-python/astroid-2.8.0-r1 b/metadata/md5-cache/dev-python/astroid-2.8.0-r1
new file mode 100644
index 000000000000..80d514cfad17
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astroid-2.8.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/wrapt-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=8
+HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/wrapt-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/astroid/archive/v2.8.0.tar.gz -> astroid-2.8.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9668087c9b0b473a33b0594540f718bc
diff --git a/metadata/md5-cache/dev-python/astroid-2.8.2 b/metadata/md5-cache/dev-python/astroid-2.8.2
deleted file mode 100644
index d75fae939a83..000000000000
--- a/metadata/md5-cache/dev-python/astroid-2.8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Abstract Syntax Tree for logilab packages
-EAPI=8
-HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyCQA/astroid/archive/v2.8.2.tar.gz -> astroid-2.8.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=11527e706f0e135c0a029015c5ccc0e1
diff --git a/metadata/md5-cache/dev-python/astroid-2.8.2-r1 b/metadata/md5-cache/dev-python/astroid-2.8.2-r1
new file mode 100644
index 000000000000..afa6236a9455
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astroid-2.8.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/wrapt-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=8
+HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/wrapt-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/astroid/archive/v2.8.2.tar.gz -> astroid-2.8.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bd25ddc937827dbae0f212093503bea3
diff --git a/metadata/md5-cache/dev-python/astroid-2.8.3 b/metadata/md5-cache/dev-python/astroid-2.8.3
new file mode 100644
index 000000000000..c4fb717bd5d1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astroid-2.8.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/wrapt-1.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=8
+HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/wrapt-1.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/astroid/archive/v2.8.3.tar.gz -> astroid-2.8.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=47c1d9123708ed4347d0c4996a406957
diff --git a/metadata/md5-cache/dev-python/astunparse-1.6.3 b/metadata/md5-cache/dev-python/astunparse-1.6.3
index 3b2e1cdc0f94..a28e2b813b3e 100644
--- a/metadata/md5-cache/dev-python/astunparse-1.6.3
+++ b/metadata/md5-cache/dev-python/astunparse-1.6.3
@@ -4,7 +4,7 @@ DESCRIPTION=Astun parser for python
 EAPI=7
 HOMEPAGE=https://github.com/simonpercivall/astunparse
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.23.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astunparse/astunparse-1.6.3.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d743589b6a473e24522050f28d4a65e5
+_md5_=77f68c238edcb6594ffd9fdc12f0c8d7
diff --git a/metadata/md5-cache/dev-python/asyncstdlib-3.10.0 b/metadata/md5-cache/dev-python/asyncstdlib-3.10.0
deleted file mode 100644
index 24d816883ecf..000000000000
--- a/metadata/md5-cache/dev-python/asyncstdlib-3.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The missing async toolbox
-EAPI=8
-HOMEPAGE=https://github.com/maxfischer2781/asyncstdlib/ https://pypi.org/project/asyncstdlib/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/maxfischer2781/asyncstdlib/archive/v3.10.0.tar.gz -> asyncstdlib-3.10.0.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ecd934fcd3b7bb9c56dfa3d14451c4c7
diff --git a/metadata/md5-cache/dev-python/asyncstdlib-3.10.1 b/metadata/md5-cache/dev-python/asyncstdlib-3.10.1
deleted file mode 100644
index 606b880ba650..000000000000
--- a/metadata/md5-cache/dev-python/asyncstdlib-3.10.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The missing async toolbox
-EAPI=8
-HOMEPAGE=https://github.com/maxfischer2781/asyncstdlib/ https://pypi.org/project/asyncstdlib/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/maxfischer2781/asyncstdlib/archive/v3.10.1.tar.gz -> asyncstdlib-3.10.1.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ecd934fcd3b7bb9c56dfa3d14451c4c7
diff --git a/metadata/md5-cache/dev-python/asyncstdlib-3.10.2 b/metadata/md5-cache/dev-python/asyncstdlib-3.10.2
new file mode 100644
index 000000000000..1b9b991eac74
--- /dev/null
+++ b/metadata/md5-cache/dev-python/asyncstdlib-3.10.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The missing async toolbox
+EAPI=8
+HOMEPAGE=https://github.com/maxfischer2781/asyncstdlib/ https://pypi.org/project/asyncstdlib/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/maxfischer2781/asyncstdlib/archive/v3.10.2.tar.gz -> asyncstdlib-3.10.2.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ecd934fcd3b7bb9c56dfa3d14451c4c7
diff --git a/metadata/md5-cache/dev-python/asyncstdlib-3.9.1 b/metadata/md5-cache/dev-python/asyncstdlib-3.9.1
deleted file mode 100644
index f539782d9ce6..000000000000
--- a/metadata/md5-cache/dev-python/asyncstdlib-3.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The missing async toolbox
-EAPI=7
-HOMEPAGE=https://github.com/maxfischer2781/asyncstdlib/ https://pypi.org/project/asyncstdlib/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/maxfischer2781/asyncstdlib/archive/v3.9.1.tar.gz -> asyncstdlib-3.9.1.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5b1b5430e69ca466d7b0595b7eb22f28
diff --git a/metadata/md5-cache/dev-python/asyncstdlib-3.9.2 b/metadata/md5-cache/dev-python/asyncstdlib-3.9.2
deleted file mode 100644
index b251b050f02e..000000000000
--- a/metadata/md5-cache/dev-python/asyncstdlib-3.9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The missing async toolbox
-EAPI=7
-HOMEPAGE=https://github.com/maxfischer2781/asyncstdlib/ https://pypi.org/project/asyncstdlib/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/maxfischer2781/asyncstdlib/archive/v3.9.2.tar.gz -> asyncstdlib-3.9.2.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7b27f6e7b4fd9182de45801159c8bf65
diff --git a/metadata/md5-cache/dev-python/audioread-2.1.8-r2 b/metadata/md5-cache/dev-python/audioread-2.1.8-r2
deleted file mode 100644
index fa035840a14e..000000000000
--- a/metadata/md5-cache/dev-python/audioread-2.1.8-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Wrapper for audio file decoding using FFmpeg or GStreamer
-EAPI=7
-HOMEPAGE=https://pypi.org/project/audioread/
-IUSE=ffmpeg gstreamer mad python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ffmpeg? ( media-video/ffmpeg ) gstreamer? ( dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-libs/gstreamer:1.0 media-plugins/gst-plugins-meta:1.0 ) mad? ( dev-python/pymad ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/a/audioread/audioread-2.1.8.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6602eda3dc8e7224f35a4ff5cdafb2af
diff --git a/metadata/md5-cache/dev-python/authheaders-0.14.1 b/metadata/md5-cache/dev-python/authheaders-0.14.1
new file mode 100644
index 000000000000..ece9842645ae
--- /dev/null
+++ b/metadata/md5-cache/dev-python/authheaders-0.14.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/authres-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dkimpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dnspython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library wrapping email authentication header verification and generation.
+EAPI=8
+HOMEPAGE=https://github.com/ValiMail/authentication-headers
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/authres-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dkimpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dnspython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/authheaders/authheaders-0.14.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=87ff0b1935973e502209609779112df0
diff --git a/metadata/md5-cache/dev-python/autopage-0.4.0 b/metadata/md5-cache/dev-python/autopage-0.4.0
index 58a09c386e94..ec1304b11314 100644
--- a/metadata/md5-cache/dev-python/autopage-0.4.0
+++ b/metadata/md5-cache/dev-python/autopage-0.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=A library to provide automatic paging for console output
 EAPI=8
 HOMEPAGE=https://pypi.org/project/autopage/ https://github.com/zaneb/autopage/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zaneb/autopage/archive/v0.4.0.tar.gz -> autopage-0.4.0.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=840f3de45c50cbf79b9b1533495686eb
+_md5_=b9dc053da0381ab93e4e7306ef05798e
diff --git a/metadata/md5-cache/dev-python/autoprop-3.0.0 b/metadata/md5-cache/dev-python/autoprop-3.0.0
deleted file mode 100644
index 3d812d8ffa6b..000000000000
--- a/metadata/md5-cache/dev-python/autoprop-3.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/signature_dispatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Infer properties from accessor methods
-EAPI=7
-HOMEPAGE=https://github.com/kalekundert/autoprop/ https://pypi.org/project/autoprop/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/signature_dispatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/autoprop/autoprop-3.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b78c2636707bc855ac117363fec02ac8
diff --git a/metadata/md5-cache/dev-python/autoprop-4.0.1 b/metadata/md5-cache/dev-python/autoprop-4.0.1
deleted file mode 100644
index 0c18a1a5fc5f..000000000000
--- a/metadata/md5-cache/dev-python/autoprop-4.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/signature_dispatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Infer properties from accessor methods
-EAPI=8
-HOMEPAGE=https://github.com/kalekundert/autoprop/ https://pypi.org/project/autoprop/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/signature_dispatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/autoprop/autoprop-4.0.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a34246f0a7b2379ba66f8e25afff363a
diff --git a/metadata/md5-cache/dev-python/awxkit-19.0.0-r1 b/metadata/md5-cache/dev-python/awxkit-19.0.0-r1
deleted file mode 100644
index 63416164589d..000000000000
--- a/metadata/md5-cache/dev-python/awxkit-19.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Command line interface for Ansible AWX
-EAPI=7
-HOMEPAGE=https://github.com/ansible/awx
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/awxkit/awxkit-19.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=947365ca8f0081393d92b17361fdb672
diff --git a/metadata/md5-cache/dev-python/awxkit-19.1.0 b/metadata/md5-cache/dev-python/awxkit-19.1.0
deleted file mode 100644
index 74ed389aedc7..000000000000
--- a/metadata/md5-cache/dev-python/awxkit-19.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command line interface for Ansible AWX
-EAPI=7
-HOMEPAGE=https://github.com/ansible/awx
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/awxkit/awxkit-19.1.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=60402e7c6a6b0b71bd794f53bf24230e
diff --git a/metadata/md5-cache/dev-python/awxkit-19.2.0 b/metadata/md5-cache/dev-python/awxkit-19.2.0
deleted file mode 100644
index 6cd09efc1e5e..000000000000
--- a/metadata/md5-cache/dev-python/awxkit-19.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command line interface for Ansible AWX
-EAPI=7
-HOMEPAGE=https://github.com/ansible/awx
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/awxkit/awxkit-19.2.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=90425657b4130b3b3e55611d6e8f725a
diff --git a/metadata/md5-cache/dev-python/awxkit-19.2.1 b/metadata/md5-cache/dev-python/awxkit-19.2.1
deleted file mode 100644
index f3860c6f3f1c..000000000000
--- a/metadata/md5-cache/dev-python/awxkit-19.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command line interface for Ansible AWX
-EAPI=7
-HOMEPAGE=https://github.com/ansible/awx
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/awxkit/awxkit-19.2.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=87228f701745a8bf749dac684e86f240
diff --git a/metadata/md5-cache/dev-python/awxkit-19.2.2 b/metadata/md5-cache/dev-python/awxkit-19.2.2
deleted file mode 100644
index 2b27d6fe43a6..000000000000
--- a/metadata/md5-cache/dev-python/awxkit-19.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command line interface for Ansible AWX
-EAPI=8
-HOMEPAGE=https://github.com/ansible/awx
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/awxkit/awxkit-19.2.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=24e397a4fb395f380666faf48a95c04f
diff --git a/metadata/md5-cache/dev-python/awxkit-19.3.0 b/metadata/md5-cache/dev-python/awxkit-19.3.0
deleted file mode 100644
index efc282b551ed..000000000000
--- a/metadata/md5-cache/dev-python/awxkit-19.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command line interface for Ansible AWX
-EAPI=8
-HOMEPAGE=https://github.com/ansible/awx
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/awxkit/awxkit-19.3.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=24e397a4fb395f380666faf48a95c04f
diff --git a/metadata/md5-cache/dev-python/babelfish-0.5.5-r1 b/metadata/md5-cache/dev-python/babelfish-0.5.5-r1
deleted file mode 100644
index 787199581df4..000000000000
--- a/metadata/md5-cache/dev-python/babelfish-0.5.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library to work with countries and languages
-EAPI=7
-HOMEPAGE=https://github.com/Diaoul/babelfish https://pypi.org/project/babelfish/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/b/babelfish/babelfish-0.5.5.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8b3b7c64e7efada05d022d5c9da39e5a
diff --git a/metadata/md5-cache/dev-python/bandit-1.6.2-r1 b/metadata/md5-cache/dev-python/bandit-1.6.2-r1
deleted file mode 100644
index 9e8b2c5813da..000000000000
--- a/metadata/md5-cache/dev-python/bandit-1.6.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] test? ( >=dev-python/coverage-4.0[python_targets_python3_8(-)?] !~dev-python/coverage-4.4[python_targets_python3_8(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?] >=dev-python/hacking-1.0.0[python_targets_python3_8(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?] >=dev-python/stestr-1.0.0 >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?] >=dev-python/beautifulsoup4-4.6.0[python_targets_python3_8(-)?] >=dev-python/pylint-1.4.5[python_targets_python3_8(-)?] )
-DESCRIPTION=A security linter from OpenStack Security
-EAPI=7
-HOMEPAGE=https://github.com/PyCQA/bandit
-IUSE=test python_targets_python3_8
-KEYWORDS=amd64 ~arm arm64 ~s390 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] >=dev-python/GitPython-1.0.1[python_targets_python3_8(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/bandit/bandit-1.6.2.tar.gz https://github.com/PyCQA/bandit/commit/45494c94d59eea5ddbe0204f3781b90108cbde30.patch -> bandit-1.6.2_py38-1.patch https://github.com/PyCQA/bandit/commit/3d0824676974e7e2e9635c10bc4f12e261f1dbdf.patch -> bandit-1.6.2_py38-2.patch
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=069b9f301a607339cfa49c8a70c129f1
diff --git a/metadata/md5-cache/dev-python/bashate-2.0.0 b/metadata/md5-cache/dev-python/bashate-2.0.0
deleted file mode 100644
index c1cd87df5095..000000000000
--- a/metadata/md5-cache/dev-python/bashate-2.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/fixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testtools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >dev-python/Babel-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A pep8 equivalent for bash scripts
-EAPI=8
-HOMEPAGE=https://pypi.org/project/bashate/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>dev-python/Babel-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/bashate/bashate-2.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=605cc7c6cf5dd140ace978734bb207f5
diff --git a/metadata/md5-cache/dev-python/bashate-2.1.0 b/metadata/md5-cache/dev-python/bashate-2.1.0
index 63410bc9e9df..f3037305ea42 100644
--- a/metadata/md5-cache/dev-python/bashate-2.1.0
+++ b/metadata/md5-cache/dev-python/bashate-2.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=A pep8 equivalent for bash scripts
 EAPI=8
 HOMEPAGE=https://pypi.org/project/bashate/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bashate/bashate-2.1.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=82358240827f2a5160dadac21733c787
+_md5_=47030baec06fa0088e78cc678da42a92
diff --git a/metadata/md5-cache/dev-python/bcrypt-3.1.7-r2 b/metadata/md5-cache/dev-python/bcrypt-3.1.7-r2
deleted file mode 100644
index 1a45fa50a11d..000000000000
--- a/metadata/md5-cache/dev-python/bcrypt-3.1.7-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/six-1.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/six-1.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Modern password hashing for software and servers
-EAPI=7
-HOMEPAGE=https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/six-1.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/bcrypt/bcrypt-3.1.7.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a840beee70d30dc39fb6be72c51d73a1
diff --git a/metadata/md5-cache/dev-python/beagle-0.3.0 b/metadata/md5-cache/dev-python/beagle-0.3.0
index f7d7ecc977e2..d8f6f2a3718d 100644
--- a/metadata/md5-cache/dev-python/beagle-0.3.0
+++ b/metadata/md5-cache/dev-python/beagle-0.3.0
@@ -1,15 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?]
 DESCRIPTION=Command line client for Hound, the code search tool.
 EAPI=7
 HOMEPAGE=https://beagle-hound.readthedocs.io/en/latest/ https://github.com/beaglecli/beagle
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] >=dev-python/cliff-2.11.0[python_targets_python3_8(-)?] >=dev-python/requests-2.18.4[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cliff-2.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.18.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/b/beagle/beagle-0.3.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3c5baf5c30c78a091931f219928128ba
+_md5_=5d11408452c967d0081967bc6695de72
diff --git a/metadata/md5-cache/dev-python/beautifulsoup4-4.10.0 b/metadata/md5-cache/dev-python/beautifulsoup4-4.10.0
index 49a92fb8f279..1be914c8d242 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup4-4.10.0
+++ b/metadata/md5-cache/dev-python/beautifulsoup4-4.10.0
@@ -4,7 +4,7 @@ DESCRIPTION=Pythonic idioms for iterating, searching, and modifying an HTML/XML
 EAPI=8
 HOMEPAGE=https://www.crummy.com/software/BeautifulSoup/bs4/
 IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/soupsieve[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.10.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8c12b0c285bfb97f397c6b5b28f9ee08
+_md5_=f509ebfc6dfc76b5b525110191455c52
diff --git a/metadata/md5-cache/dev-python/beautifulsoup4-4.9.3 b/metadata/md5-cache/dev-python/beautifulsoup4-4.9.3
deleted file mode 100644
index 820653fffce4..000000000000
--- a/metadata/md5-cache/dev-python/beautifulsoup4-4.9.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=<dev-python/setuptools-58[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/soupsieve[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree
-EAPI=7
-HOMEPAGE=https://www.crummy.com/software/BeautifulSoup/bs4/
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/soupsieve[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.9.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e9a7403c4b46ff38159058309c787552
diff --git a/metadata/md5-cache/dev-python/beniget-0.4.0 b/metadata/md5-cache/dev-python/beniget-0.4.0
deleted file mode 100644
index 1af95645567e..000000000000
--- a/metadata/md5-cache/dev-python/beniget-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( =dev-python/gast-0.5*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extract semantic information about static Python code
-EAPI=7
-HOMEPAGE=https://pypi.org/project/beniget/ https://github.com/serge-sans-paille/beniget/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND==dev-python/gast-0.5*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/serge-sans-paille/beniget/archive/0.4.0.tar.gz -> beniget-0.4.0.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b962fb30c7873d549c4e294f8ecffbda
diff --git a/metadata/md5-cache/dev-python/beniget-0.4.1 b/metadata/md5-cache/dev-python/beniget-0.4.1
index 3b0a13d26a45..3187d84217bc 100644
--- a/metadata/md5-cache/dev-python/beniget-0.4.1
+++ b/metadata/md5-cache/dev-python/beniget-0.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=Extract semantic information about static Python code
 EAPI=7
 HOMEPAGE=https://pypi.org/project/beniget/ https://github.com/serge-sans-paille/beniget/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RDEPEND==dev-python/gast-0.5*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/serge-sans-paille/beniget/archive/0.4.1.tar.gz -> beniget-0.4.1.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b2930e3609114f53033d0dfa0f86ad24
+_md5_=925e41a46628484e852dcb4d9e97e300
diff --git a/metadata/md5-cache/dev-python/berkeleydb-18.1.4 b/metadata/md5-cache/dev-python/berkeleydb-18.1.4
index 961302927622..be5a81cf128e 100644
--- a/metadata/md5-cache/dev-python/berkeleydb-18.1.4
+++ b/metadata/md5-cache/dev-python/berkeleydb-18.1.4
@@ -5,11 +5,11 @@ DESCRIPTION=Python bindings for Oracle Berkeley DB
 EAPI=7
 HOMEPAGE=https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/berkeleydb/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RDEPEND=|| ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~arthurzam/distfiles/dev-python/berkeleydb/berkeleydb-18.1.4.tar.xz
 _eclasses_=db-use	063d3e7add942762a8203b52ec3066c2	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aeefa3eda9c3df5e1dd6aad0044c91d2
+_md5_=3925cc6fb369eb0a809295364b56ee2b
diff --git a/metadata/md5-cache/dev-python/betamax-matchers-0.4.0 b/metadata/md5-cache/dev-python/betamax-matchers-0.4.0
index c40fc21865c8..86541d3316cc 100644
--- a/metadata/md5-cache/dev-python/betamax-matchers-0.4.0
+++ b/metadata/md5-cache/dev-python/betamax-matchers-0.4.0
@@ -1,16 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/betamax-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/betamax-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-toolbelt-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DESCRIPTION=A group of experimental matchers for Betamax
 EAPI=7
 HOMEPAGE=https://github.com/betamaxpy/betamax_matchers
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/betamax-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-toolbelt-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
+RDEPEND=>=dev-python/betamax-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/b/betamax-matchers/betamax-matchers-0.4.0.tar.gz
+SRC_URI=https://github.com/betamaxpy/betamax_matchers/archive/0.4.0.tar.gz -> betamax-matchers-0.4.0.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7f83c54b44cfbb13b6941839f64b7e62
+_md5_=d80a0b31421935dac33db86a0d80067a
diff --git a/metadata/md5-cache/dev-python/bitarray-2.3.2 b/metadata/md5-cache/dev-python/bitarray-2.3.2
deleted file mode 100644
index e0fbba4f22c2..000000000000
--- a/metadata/md5-cache/dev-python/bitarray-2.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Efficient arrays of booleans -- C extension
-EAPI=8
-HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bitarray/bitarray-2.3.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a4890e9f2be9b1410e6dca893d227779
diff --git a/metadata/md5-cache/dev-python/bitarray-2.3.3 b/metadata/md5-cache/dev-python/bitarray-2.3.3
deleted file mode 100644
index eff87e55e5e5..000000000000
--- a/metadata/md5-cache/dev-python/bitarray-2.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Efficient arrays of booleans -- C extension
-EAPI=8
-HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bitarray/bitarray-2.3.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=83c3618eca0c3f422984662fe0f911ef
diff --git a/metadata/md5-cache/dev-python/bitarray-2.3.4 b/metadata/md5-cache/dev-python/bitarray-2.3.4
index 03747de5d457..cbd4c9cf92a6 100644
--- a/metadata/md5-cache/dev-python/bitarray-2.3.4
+++ b/metadata/md5-cache/dev-python/bitarray-2.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=Efficient arrays of booleans -- C extension
 EAPI=8
 HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-2
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bitarray/bitarray-2.3.4.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=83c3618eca0c3f422984662fe0f911ef
+_md5_=a4890e9f2be9b1410e6dca893d227779
diff --git a/metadata/md5-cache/dev-python/black-21.9_beta0 b/metadata/md5-cache/dev-python/black-21.9_beta0
index 81c07ca1d56c..5b243695f435 100644
--- a/metadata/md5-cache/dev-python/black-21.9_beta0
+++ b/metadata/md5-cache/dev-python/black-21.9_beta0
@@ -4,7 +4,7 @@ DESCRIPTION=The uncompromising Python code formatter
 EAPI=8
 HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/click-8.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/tomli-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psf/black/archive/21.9b0.tar.gz -> black-21.9b0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f9f4e027e047469a7d8f14bae7b4308e
+_md5_=0d9b1f8d9367f0d79bf42ad53690600c
diff --git a/metadata/md5-cache/dev-python/bleach-4.0.0 b/metadata/md5-cache/dev-python/bleach-4.0.0
deleted file mode 100644
index 1edcc1cf3238..000000000000
--- a/metadata/md5-cache/dev-python/bleach-4.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An easy whitelist-based HTML-sanitizing tool
-EAPI=8
-HOMEPAGE=https://github.com/mozilla/bleach/ https://pypi.org/project/bleach/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/bleach/bleach-4.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2cf6c4e69258edb7e6770c880d66a293
diff --git a/metadata/md5-cache/dev-python/bleach-4.1.0 b/metadata/md5-cache/dev-python/bleach-4.1.0
index 30bff95d0664..f554ec598c06 100644
--- a/metadata/md5-cache/dev-python/bleach-4.1.0
+++ b/metadata/md5-cache/dev-python/bleach-4.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=An easy whitelist-based HTML-sanitizing tool
 EAPI=8
 HOMEPAGE=https://github.com/mozilla/bleach/ https://pypi.org/project/bleach/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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
 LICENSE=Apache-2.0
 RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bleach/bleach-4.1.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=22846406a3331888c30bbc4bf334e583
+_md5_=bd6b1507963a7511ec919644f373ca18
diff --git a/metadata/md5-cache/dev-python/blessed-1.17.12 b/metadata/md5-cache/dev-python/blessed-1.17.12
deleted file mode 100644
index a18ece725a82..000000000000
--- a/metadata/md5-cache/dev-python/blessed-1.17.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for making terminal apps using colors, keyboard input and positioning
-EAPI=7
-HOMEPAGE=https://github.com/jquast/blessed
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/blessed/blessed-1.17.12.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7b63f87e0515d4ddfb64a5cad63d05ad
diff --git a/metadata/md5-cache/dev-python/blessed-1.18.0 b/metadata/md5-cache/dev-python/blessed-1.18.0
deleted file mode 100644
index 08f982ddb8c0..000000000000
--- a/metadata/md5-cache/dev-python/blessed-1.18.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for making terminal apps using colors, keyboard input and positioning
-EAPI=7
-HOMEPAGE=https://github.com/jquast/blessed
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/blessed/blessed-1.18.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1f1ebcef47db49f20725c6f9de4d7d14
diff --git a/metadata/md5-cache/dev-python/blessed-1.18.1 b/metadata/md5-cache/dev-python/blessed-1.18.1
deleted file mode 100644
index 04a1d3202c87..000000000000
--- a/metadata/md5-cache/dev-python/blessed-1.18.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for making terminal apps using colors, keyboard input and positioning
-EAPI=7
-HOMEPAGE=https://github.com/jquast/blessed
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/blessed/blessed-1.18.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a4c797f38fc58d323070340b5075792b
diff --git a/metadata/md5-cache/dev-python/blurb-1.0.7 b/metadata/md5-cache/dev-python/blurb-1.0.7
deleted file mode 100644
index 7d91b5df51a6..000000000000
--- a/metadata/md5-cache/dev-python/blurb-1.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Tool to create and manage NEWS blurbs for CPython
-EAPI=7
-HOMEPAGE=https://github.com/python/core-workflow/tree/master/blurb
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/29/4f/268f9aa095cbcf53253c665fd0f5103f22dccf246fe317ab9c5c481b38f5/blurb-1.0.7.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=279bcb66c4ecadb120a8d21718a3b926
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.28 b/metadata/md5-cache/dev-python/boto3-1.18.28
deleted file mode 100644
index e7456f25d702..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.18.28
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.21.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.18.28.tar.gz -> boto3-1.18.28.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17ba1142b8447b20ee58814cef5b13dd
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.40 b/metadata/md5-cache/dev-python/boto3-1.18.40
deleted file mode 100644
index 952f153a5c0e..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.18.40
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.40[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.21.40[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.18.40.tar.gz -> boto3-1.18.40.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.47 b/metadata/md5-cache/dev-python/boto3-1.18.47
deleted file mode 100644
index e00a7bd63b14..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.18.47
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.47[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.21.47[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.18.47.tar.gz -> boto3-1.18.47.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=54d01e4711ff5a8d177aa899d16724a4
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.53 b/metadata/md5-cache/dev-python/boto3-1.18.53
index 263885297f68..fe288fa43a0b 100644
--- a/metadata/md5-cache/dev-python/boto3-1.18.53
+++ b/metadata/md5-cache/dev-python/boto3-1.18.53
@@ -4,7 +4,7 @@ DESCRIPTION=The AWS SDK for Python
 EAPI=8
 HOMEPAGE=https://github.com/boto/boto3
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.21.53[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.18.53.tar.gz -> boto3-1.18.53.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
+_md5_=b722a77d4aacbaa19fe0da9d12a0f45f
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.54 b/metadata/md5-cache/dev-python/boto3-1.18.54
deleted file mode 100644
index 4d215c71bfce..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.18.54
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.54[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.21.54[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.18.54.tar.gz -> boto3-1.18.54.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.55 b/metadata/md5-cache/dev-python/boto3-1.18.55
deleted file mode 100644
index d6f0d4e8b7fe..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.18.55
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.55[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.21.55[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.18.55.tar.gz -> boto3-1.18.55.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.56 b/metadata/md5-cache/dev-python/boto3-1.18.56
deleted file mode 100644
index 4eb10fbdb5db..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.18.56
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.56[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.21.56[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.18.56.tar.gz -> boto3-1.18.56.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.57 b/metadata/md5-cache/dev-python/boto3-1.18.57
deleted file mode 100644
index 035ec54b84ff..000000000000
--- a/metadata/md5-cache/dev-python/boto3-1.18.57
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.57[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The AWS SDK for Python
-EAPI=8
-HOMEPAGE=https://github.com/boto/boto3
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.21.57[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/boto/boto3/archive/1.18.57.tar.gz -> boto3-1.18.57.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.60 b/metadata/md5-cache/dev-python/boto3-1.18.60
new file mode 100644
index 000000000000..a25101111e2e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.60
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.60[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.60[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.60.tar.gz -> boto3-1.18.60.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.61 b/metadata/md5-cache/dev-python/boto3-1.18.61
new file mode 100644
index 000000000000..0c42523d4801
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.61
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.61[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.61[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.61.tar.gz -> boto3-1.18.61.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.62 b/metadata/md5-cache/dev-python/boto3-1.18.62
new file mode 100644
index 000000000000..2a244f23f952
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.62
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.62[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.62[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.62.tar.gz -> boto3-1.18.62.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.63 b/metadata/md5-cache/dev-python/boto3-1.18.63
new file mode 100644
index 000000000000..a0ad00f2fe38
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.63
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.63[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.63[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.63.tar.gz -> boto3-1.18.63.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
diff --git a/metadata/md5-cache/dev-python/boto3-1.18.64 b/metadata/md5-cache/dev-python/boto3-1.18.64
new file mode 100644
index 000000000000..a1cad9c91d22
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.18.64
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.21.64[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.21.64[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.18.64.tar.gz -> boto3-1.18.64.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d5f5f5a53207c0b4f71f3b7372ef41e6
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.28 b/metadata/md5-cache/dev-python/botocore-1.21.28
deleted file mode 100644
index 10c5c4719e45..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.21.28
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.21.28.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5f28598add674dfc967045ac2385739e
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.40 b/metadata/md5-cache/dev-python/botocore-1.21.40
deleted file mode 100644
index 039139ce2a2d..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.21.40
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.21.40.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea8c6f49678b6d7e1d241a2c2f6deaae
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.47 b/metadata/md5-cache/dev-python/botocore-1.21.47
deleted file mode 100644
index 8dd2d1aa8fe9..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.21.47
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.21.47.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c3b1c0a85db0f812cffbe39d9d0cb881
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.53 b/metadata/md5-cache/dev-python/botocore-1.21.53
index 833b6b11640f..0faf5b6895b1 100644
--- a/metadata/md5-cache/dev-python/botocore-1.21.53
+++ b/metadata/md5-cache/dev-python/botocore-1.21.53
@@ -4,7 +4,7 @@ DESCRIPTION=Low-level, data-driven core of boto 3
 EAPI=8
 HOMEPAGE=https://github.com/boto/botocore
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.21.53.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d548c5327fb2eed79b44e3ae5fec6a12
+_md5_=a8b3647f51a1f4d59b5cbb2488350db5
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.54 b/metadata/md5-cache/dev-python/botocore-1.21.54
deleted file mode 100644
index b6d61f102bef..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.21.54
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.21.54.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d548c5327fb2eed79b44e3ae5fec6a12
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.55 b/metadata/md5-cache/dev-python/botocore-1.21.55
deleted file mode 100644
index cb7dedd16bb7..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.21.55
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.21.55.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d548c5327fb2eed79b44e3ae5fec6a12
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.56 b/metadata/md5-cache/dev-python/botocore-1.21.56
deleted file mode 100644
index 66bd2678d5a9..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.21.56
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.21.56.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d548c5327fb2eed79b44e3ae5fec6a12
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.57 b/metadata/md5-cache/dev-python/botocore-1.21.57
deleted file mode 100644
index 437902714079..000000000000
--- a/metadata/md5-cache/dev-python/botocore-1.21.57
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Low-level, data-driven core of boto 3
-EAPI=8
-HOMEPAGE=https://github.com/boto/botocore
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.21.57.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d548c5327fb2eed79b44e3ae5fec6a12
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.60 b/metadata/md5-cache/dev-python/botocore-1.21.60
new file mode 100644
index 000000000000..19b9d251456f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.60
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.60.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d548c5327fb2eed79b44e3ae5fec6a12
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.61 b/metadata/md5-cache/dev-python/botocore-1.21.61
new file mode 100644
index 000000000000..7006c224309c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.61
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.61.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d548c5327fb2eed79b44e3ae5fec6a12
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.62 b/metadata/md5-cache/dev-python/botocore-1.21.62
new file mode 100644
index 000000000000..3055d60ba97d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.62
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.62.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d548c5327fb2eed79b44e3ae5fec6a12
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.63 b/metadata/md5-cache/dev-python/botocore-1.21.63
new file mode 100644
index 000000000000..3910127c8fc2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.63
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.63.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d548c5327fb2eed79b44e3ae5fec6a12
diff --git a/metadata/md5-cache/dev-python/botocore-1.21.64 b/metadata/md5-cache/dev-python/botocore-1.21.64
new file mode 100644
index 000000000000..645e8a13b829
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.21.64
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.21.64.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d548c5327fb2eed79b44e3ae5fec6a12
diff --git a/metadata/md5-cache/dev-python/bracex-2.2 b/metadata/md5-cache/dev-python/bracex-2.2
new file mode 100644
index 000000000000..472e25af5122
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bracex-2.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-vcs/git ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( dev-lang/python:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs_pymdownx_material_extras[python_targets_python3_10(-)] dev-python/pyspelling[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs_pymdownx_material_extras[python_targets_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs_pymdownx_material_extras[python_targets_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Bash style brace expansion for Python
+EAPI=8
+HOMEPAGE=https://github.com/facelessuser/bracex/ https://pypi.org/project/bracex/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/facelessuser/bracex/archive/2.2.tar.gz -> bracex-2.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5a8248b0a35d991e3d66e46495ef031c
diff --git a/metadata/md5-cache/dev-python/breathe-4.30.0 b/metadata/md5-cache/dev-python/breathe-4.30.0
deleted file mode 100644
index 15e2bf285e8d..000000000000
--- a/metadata/md5-cache/dev-python/breathe-4.30.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-doc/doxygen dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx Doxygen renderer
-EAPI=7
-HOMEPAGE=https://breathe.readthedocs.io/en/latest/ https://github.com/michaeljones/breathe/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=app-doc/doxygen dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/michaeljones/breathe/archive/v4.30.0.tar.gz -> breathe-4.30.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=922c051d407ca310355534ff368cde8c
diff --git a/metadata/md5-cache/dev-python/breathe-4.31.0 b/metadata/md5-cache/dev-python/breathe-4.31.0
index 0c3d91380d4d..c17e885af158 100644
--- a/metadata/md5-cache/dev-python/breathe-4.31.0
+++ b/metadata/md5-cache/dev-python/breathe-4.31.0
@@ -4,7 +4,7 @@ DESCRIPTION=Sphinx Doxygen renderer
 EAPI=8
 HOMEPAGE=https://breathe.readthedocs.io/en/latest/ https://github.com/michaeljones/breathe/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=app-doc/doxygen dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/michaeljones/breathe/archive/v4.31.0.tar.gz -> breathe-4.31.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e7bf5894187c3ab142da7f8f50b8920c
+_md5_=ffc1be65259373bd1c54d9185f1bdb70
diff --git a/metadata/md5-cache/dev-python/cachelib-0.1.1 b/metadata/md5-cache/dev-python/cachelib-0.1.1
deleted file mode 100644
index f2c0e6bbfe29..000000000000
--- a/metadata/md5-cache/dev-python/cachelib-0.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of cache libraries in the same API interface. Extracted from werkzeug
-EAPI=7
-HOMEPAGE=https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/c/cachelib/cachelib-0.1.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a5d7ace7c30d30302a1773f33df9d69e
diff --git a/metadata/md5-cache/dev-python/cachelib-0.2.0 b/metadata/md5-cache/dev-python/cachelib-0.2.0
deleted file mode 100644
index 8bffc9b908c6..000000000000
--- a/metadata/md5-cache/dev-python/cachelib-0.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-db/redis dev-python/pylibmc[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/memcached www-servers/uwsgi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of cache libraries in the same API interface. Extracted from werkzeug
-EAPI=7
-HOMEPAGE=https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cachelib/cachelib-0.2.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c8c7ae9f7030aa8b6acf7cfde623aa80
diff --git a/metadata/md5-cache/dev-python/cachelib-0.3.0 b/metadata/md5-cache/dev-python/cachelib-0.3.0
index 23df6268d3c9..a6fc98d67db5 100644
--- a/metadata/md5-cache/dev-python/cachelib-0.3.0
+++ b/metadata/md5-cache/dev-python/cachelib-0.3.0
@@ -1,10 +1,10 @@
-BDEPEND=test? ( dev-db/redis dev-python/pylibmc[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/memcached www-servers/uwsgi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/pylibmc[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/memcached www-servers/uwsgi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of cache libraries in the same API interface. Extracted from werkzeug
 EAPI=8
 HOMEPAGE=https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cachelib/cachelib-0.3.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7711d84f3aab3ee10f33744eabd855b5
+_md5_=107c349c9cd8fe6387f8e2a86512205a
diff --git a/metadata/md5-cache/dev-python/cachelib-0.4.1 b/metadata/md5-cache/dev-python/cachelib-0.4.1
index b71f8a95d6ee..6da886e6cfb2 100644
--- a/metadata/md5-cache/dev-python/cachelib-0.4.1
+++ b/metadata/md5-cache/dev-python/cachelib-0.4.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-db/redis dev-python/pylibmc[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/memcached www-servers/uwsgi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/pylibmc[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/memcached www-servers/uwsgi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of cache libraries in the same API interface. Extracted from werkzeug
 EAPI=8
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cachelib/cachelib-0.4.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7711d84f3aab3ee10f33744eabd855b5
+_md5_=6e68d1e7382babbe66060e53ecaedcd1
diff --git a/metadata/md5-cache/dev-python/carbon-1.1.5 b/metadata/md5-cache/dev-python/carbon-1.1.5
deleted file mode 100644
index a38820b59713..000000000000
--- a/metadata/md5-cache/dev-python/carbon-1.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DESCRIPTION=Backend data caching and persistence daemon for Graphite
-EAPI=6
-HOMEPAGE=https://graphiteapp.org/
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/twisted[python_targets_python3_8(-)?] dev-python/cachetools[python_targets_python3_8(-)?] dev-python/txAMQP[python_targets_python3_8(-)?] dev-python/urllib3[python_targets_python3_8(-)?] =dev-python/whisper-1.1.5*[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/c/carbon/carbon-1.1.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=311a4fc5084e029b78c47ed947403a95
diff --git a/metadata/md5-cache/dev-python/casttube-0.2.0 b/metadata/md5-cache/dev-python/casttube-0.2.0
deleted file mode 100644
index 9097352de979..000000000000
--- a/metadata/md5-cache/dev-python/casttube-0.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=casttube provides a way to interact with the Youtube Chromecast api.
-EAPI=7
-HOMEPAGE=https://github.com/ur1katz/casttube
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/c/casttube/casttube-0.2.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4bdc1ac0ab201712fdc5ffad83791e9e
diff --git a/metadata/md5-cache/dev-python/cbor2-5.4.2 b/metadata/md5-cache/dev-python/cbor2-5.4.2
new file mode 100644
index 000000000000..cb602db2c10b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cbor2-5.4.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure Python CBOR (de)serializer with extensive tag support
+EAPI=8
+HOMEPAGE=https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/cbor2/cbor2-5.4.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c9e11753321f7f2723f5bb624f72cdd6
diff --git a/metadata/md5-cache/dev-python/cffi-1.15.0 b/metadata/md5-cache/dev-python/cffi-1.15.0
new file mode 100644
index 000000000000..ebe4eb57665c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cffi-1.15.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libffi:= dev-python/pycparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( dev-libs/libffi:= dev-python/pycparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libffi:=
+DESCRIPTION=Foreign Function Interface for Python calling C code
+EAPI=7
+HOMEPAGE=https://cffi.readthedocs.io/ https://pypi.org/project/cffi/
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+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
+LICENSE=MIT
+RDEPEND=dev-libs/libffi:= dev-python/pycparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0/1.15.0
+SRC_URI=mirror://pypi/c/cffi/cffi-1.15.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4819f7ae93239a071388cec4b0d6db3e
diff --git a/metadata/md5-cache/dev-python/cftime-1.4.1 b/metadata/md5-cache/dev-python/cftime-1.4.1
deleted file mode 100644
index 4cc4282933a9..000000000000
--- a/metadata/md5-cache/dev-python/cftime-1.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Time-handling functionality from netcdf4-python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/cftime
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cftime/cftime-1.4.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=68b4725cb4e19c376cf4e43d1f0eba4d
diff --git a/metadata/md5-cache/dev-python/cftime-1.5.0 b/metadata/md5-cache/dev-python/cftime-1.5.0
deleted file mode 100644
index 0aab12466548..000000000000
--- a/metadata/md5-cache/dev-python/cftime-1.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DESCRIPTION=Time-handling functionality from netcdf4-python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/cftime/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cftime/cftime-1.5.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6af57276fd0884fbe77eb0ea7f5b9376
diff --git a/metadata/md5-cache/dev-python/chardet-3.0.4-r1 b/metadata/md5-cache/dev-python/chardet-3.0.4-r1
deleted file mode 100644
index 60d1bffdae1c..000000000000
--- a/metadata/md5-cache/dev-python/chardet-3.0.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DESCRIPTION=Universal encoding detector
-EAPI=6
-HOMEPAGE=https://github.com/chardet/chardet https://pypi.org/project/chardet/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=LGPL-2.1
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/chardet/chardet/archive/3.0.4.tar.gz -> chardet-3.0.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=417f3183a9c6253fe03479084a62d59f
diff --git a/metadata/md5-cache/dev-python/charset_normalizer-2.0.3 b/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
deleted file mode 100644
index b354d0912e7d..000000000000
--- a/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The Real First Universal Charset Detector
-EAPI=7
-HOMEPAGE=https://pypi.org/project/charset-normalizer/ https://github.com/ousret/charset_normalizer/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Ousret/charset_normalizer/archive/2.0.3.tar.gz -> charset_normalizer-2.0.3.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=889c8c961a96d9f6bd9683a043aff28a
diff --git a/metadata/md5-cache/dev-python/charset_normalizer-2.0.4 b/metadata/md5-cache/dev-python/charset_normalizer-2.0.4
deleted file mode 100644
index 7517b1840b3e..000000000000
--- a/metadata/md5-cache/dev-python/charset_normalizer-2.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The Real First Universal Charset Detector
-EAPI=7
-HOMEPAGE=https://pypi.org/project/charset-normalizer/ https://github.com/ousret/charset_normalizer/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Ousret/charset_normalizer/archive/2.0.4.tar.gz -> charset_normalizer-2.0.4.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a0d87eb4e542423a5213d291b6eedb49
diff --git a/metadata/md5-cache/dev-python/charset_normalizer-2.0.5 b/metadata/md5-cache/dev-python/charset_normalizer-2.0.5
deleted file mode 100644
index 9090fd92ce3e..000000000000
--- a/metadata/md5-cache/dev-python/charset_normalizer-2.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The Real First Universal Charset Detector
-EAPI=7
-HOMEPAGE=https://pypi.org/project/charset-normalizer/ https://github.com/ousret/charset_normalizer/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Ousret/charset_normalizer/archive/2.0.5.tar.gz -> charset_normalizer-2.0.5.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7ca4ca441d22211b2baae409c2772d1c
diff --git a/metadata/md5-cache/dev-python/charset_normalizer-2.0.6 b/metadata/md5-cache/dev-python/charset_normalizer-2.0.6
index 9171d40155f1..582867c0f1c7 100644
--- a/metadata/md5-cache/dev-python/charset_normalizer-2.0.6
+++ b/metadata/md5-cache/dev-python/charset_normalizer-2.0.6
@@ -4,7 +4,7 @@ DESCRIPTION=The Real First Universal Charset Detector
 EAPI=7
 HOMEPAGE=https://pypi.org/project/charset-normalizer/ https://github.com/ousret/charset_normalizer/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ousret/charset_normalizer/archive/2.0.6.tar.gz -> charset_normalizer-2.0.6.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7ca4ca441d22211b2baae409c2772d1c
+_md5_=a0d87eb4e542423a5213d291b6eedb49
diff --git a/metadata/md5-cache/dev-python/charset_normalizer-2.0.7 b/metadata/md5-cache/dev-python/charset_normalizer-2.0.7
new file mode 100644
index 000000000000..0edea03a2f9c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/charset_normalizer-2.0.7
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The Real First Universal Charset Detector
+EAPI=7
+HOMEPAGE=https://pypi.org/project/charset-normalizer/ https://github.com/ousret/charset_normalizer/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Ousret/charset_normalizer/archive/2.0.7.tar.gz -> charset_normalizer-2.0.7.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7ca4ca441d22211b2baae409c2772d1c
diff --git a/metadata/md5-cache/dev-python/citeproc-py-0.6.0 b/metadata/md5-cache/dev-python/citeproc-py-0.6.0
new file mode 100644
index 000000000000..1f7d48919e77
--- /dev/null
+++ b/metadata/md5-cache/dev-python/citeproc-py-0.6.0
@@ -0,0 +1,15 @@
+BDEPEND=>=app-text/rnc2rng-2.6.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Yet another Python CSL Processor
+EAPI=8
+HOMEPAGE=https://pypi.org/project/citeproc-py/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/citeproc-py/citeproc-py-0.6.0.tar.gz test? ( https://github.com/citation-style-language/test-suite/archive/c3db429ab7c6b9b9ccaaa6d3c6bb9e503f0d7b11.tar.gz -> citeproc-py-test-suite-c3db429ab7c6b9b9ccaaa6d3c6bb9e503f0d7b11.tar.gz )
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2e4286b6a5ac140f7fa9d277e99edd8e
diff --git a/metadata/md5-cache/dev-python/click-8.0.2 b/metadata/md5-cache/dev-python/click-8.0.2
new file mode 100644
index 000000000000..4968c0a43629
--- /dev/null
+++ b/metadata/md5-cache/dev-python/click-8.0.2
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] >=dev-python/docutils-0.14[python_targets_python3_10(-)] dev-python/pallets-sphinx-themes[python_targets_python3_10(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] >=dev-python/docutils-0.14[python_targets_python3_9(-)] dev-python/pallets-sphinx-themes[python_targets_python3_9(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] >=dev-python/docutils-0.14[python_targets_python3_8(-)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] >=dev-python/docutils-0.14[python_targets_pypy3(-)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-)] ) ) ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python package for creating beautiful command line interfaces
+EAPI=8
+HOMEPAGE=https://palletsprojects.com/p/click/ https://pypi.org/project/click/
+IUSE=examples doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pallets/click/archive/8.0.2.tar.gz -> click-8.0.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=223e8fc271c2a42d77c2d6d5192dc177
diff --git a/metadata/md5-cache/dev-python/click-8.0.3 b/metadata/md5-cache/dev-python/click-8.0.3
new file mode 100644
index 000000000000..ea6879856480
--- /dev/null
+++ b/metadata/md5-cache/dev-python/click-8.0.3
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] >=dev-python/docutils-0.14[python_targets_python3_10(-)] dev-python/pallets-sphinx-themes[python_targets_python3_10(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] >=dev-python/docutils-0.14[python_targets_python3_9(-)] dev-python/pallets-sphinx-themes[python_targets_python3_9(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] >=dev-python/docutils-0.14[python_targets_python3_8(-)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] >=dev-python/docutils-0.14[python_targets_pypy3(-)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-)] ) ) ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python package for creating beautiful command line interfaces
+EAPI=8
+HOMEPAGE=https://palletsprojects.com/p/click/ https://pypi.org/project/click/
+IUSE=examples doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pallets/click/archive/8.0.3.tar.gz -> click-8.0.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=223e8fc271c2a42d77c2d6d5192dc177
diff --git a/metadata/md5-cache/dev-python/click-help-colors-0.9 b/metadata/md5-cache/dev-python/click-help-colors-0.9
deleted file mode 100644
index abf84d25e98b..000000000000
--- a/metadata/md5-cache/dev-python/click-help-colors-0.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( <dev-python/click-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Colorization of help messages in Click
-EAPI=7
-HOMEPAGE=https://github.com/click-contrib/click-help-colors
-IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=<dev-python/click-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/click-contrib/click-help-colors/archive/refs/tags/0.9.tar.gz -> click-help-colors-0.9.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2e122d17517708d95d0762ec81bc1d3e
diff --git a/metadata/md5-cache/dev-python/click-plugins-1.0.3 b/metadata/md5-cache/dev-python/click-plugins-1.0.3
deleted file mode 100644
index adce052ecfc9..000000000000
--- a/metadata/md5-cache/dev-python/click-plugins-1.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?]
-DESCRIPTION=Module for click to enable registering CLI commands via setuptools entry-points
-EAPI=7
-HOMEPAGE=https://pypi.org/project/click-plugins/
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/c/click-plugins/click-plugins-1.0.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea89b1deda16c8dae76cf9006328dfca
diff --git a/metadata/md5-cache/dev-python/click-threading-0.4.4 b/metadata/md5-cache/dev-python/click-threading-0.4.4
deleted file mode 100644
index 756f57a4af93..000000000000
--- a/metadata/md5-cache/dev-python/click-threading-0.4.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Multithreaded Click apps made easy.
-EAPI=7
-HOMEPAGE=https://github.com/click-contrib/click-threading https://pypi.org/project/click-threading/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/click-contrib/click-threading/archive/0.4.4.tar.gz -> click-threading-0.4.4-gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2a72b0f702a892418933220a10b29f33
diff --git a/metadata/md5-cache/dev-python/cliff-3.9.0 b/metadata/md5-cache/dev-python/cliff-3.9.0
index ba1715505760..5da38da8a46d 100644
--- a/metadata/md5-cache/dev-python/cliff-3.9.0
+++ b/metadata/md5-cache/dev-python/cliff-3.9.0
@@ -4,7 +4,7 @@ DESCRIPTION=Command Line Interface Formulation Framework
 EAPI=8
 HOMEPAGE=https://github.com/openstack/cliff
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/autopage-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cmd2-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cliff/cliff-3.9.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=468eea850f3d4956f80f71417b3ebc12
+_md5_=d819ebb836c200f43d3633213dae2de3
diff --git a/metadata/md5-cache/dev-python/cloudpickle-1.6.0 b/metadata/md5-cache/dev-python/cloudpickle-1.6.0
deleted file mode 100644
index 8d66fb767463..000000000000
--- a/metadata/md5-cache/dev-python/cloudpickle-1.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extended pickling support for Python objects
-EAPI=7
-HOMEPAGE=https://pypi.org/project/cloudpickle/ https://github.com/cloudpipe/cloudpickle/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cloudpickle/cloudpickle-1.6.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=32e9a1699365daf82634f72284bd8d14
diff --git a/metadata/md5-cache/dev-python/cloudpickle-2.0.0 b/metadata/md5-cache/dev-python/cloudpickle-2.0.0
index b302db722d89..0d2a3285c1f5 100644
--- a/metadata/md5-cache/dev-python/cloudpickle-2.0.0
+++ b/metadata/md5-cache/dev-python/cloudpickle-2.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Extended pickling support for Python objects
 EAPI=8
 HOMEPAGE=https://pypi.org/project/cloudpickle/ https://github.com/cloudpipe/cloudpickle/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cloudpickle/cloudpickle-2.0.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8c7e47d7c2e34def21effd6a92be10ba
+_md5_=2f32a4044cc252cd20b81e764de97bbc
diff --git a/metadata/md5-cache/dev-python/cmd2-2.1.2 b/metadata/md5-cache/dev-python/cmd2-2.1.2
deleted file mode 100644
index a5f105cbede4..000000000000
--- a/metadata/md5-cache/dev-python/cmd2-2.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/which || ( x11-misc/xclip x11-misc/xsel ) ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extra features for standard library's cmd module
-EAPI=7
-HOMEPAGE=https://github.com/python-cmd2/cmd2
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cmd2/cmd2-2.1.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=559a3cbec2f322984e0fe02d9281417d
diff --git a/metadata/md5-cache/dev-python/cmd2-2.2.0 b/metadata/md5-cache/dev-python/cmd2-2.2.0
index fc3e0a2ea808..d3015b59b65b 100644
--- a/metadata/md5-cache/dev-python/cmd2-2.2.0
+++ b/metadata/md5-cache/dev-python/cmd2-2.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Extra features for standard library's cmd module
 EAPI=8
 HOMEPAGE=https://github.com/python-cmd2/cmd2
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cmd2/cmd2-2.2.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=6fb2608ab4efb92b8003b02b73cbb44f
+_md5_=5f1b01a9410108a850eaefad64b51a97
diff --git a/metadata/md5-cache/dev-python/colorama-0.4.3-r1 b/metadata/md5-cache/dev-python/colorama-0.4.3-r1
deleted file mode 100644
index 7e35ab54b758..000000000000
--- a/metadata/md5-cache/dev-python/colorama-0.4.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=ANSI escape character sequences for colored terminal text & cursor positioning
-EAPI=7
-HOMEPAGE=https://pypi.org/project/colorama/ https://github.com/tartley/colorama
-IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tartley/colorama/archive/0.4.3.tar.gz -> colorama-0.4.3.github.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1c8bcea166a47bc1b442cef637d8e7de
diff --git a/metadata/md5-cache/dev-python/coloredlogs-14.0 b/metadata/md5-cache/dev-python/coloredlogs-14.0
deleted file mode 100644
index 6dee9592d421..000000000000
--- a/metadata/md5-cache/dev-python/coloredlogs-14.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/capturer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/verboselogs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) ) test? ( dev-python/humanfriendly[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Colored stream handler for the logging module
-EAPI=7
-HOMEPAGE=https://pypi.org/project/coloredlogs/ https://github.com/xolox/python-coloredlogs https://coloredlogs.readthedocs.io/en/latest/
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/humanfriendly[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/coloredlogs/coloredlogs-14.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=64e3a50c00c8a2fc64529bb89a458450
diff --git a/metadata/md5-cache/dev-python/colorspacious-1.1.2 b/metadata/md5-cache/dev-python/colorspacious-1.1.2
index 196386c35bc7..4a1fa091c1da 100644
--- a/metadata/md5-cache/dev-python/colorspacious-1.1.2
+++ b/metadata/md5-cache/dev-python/colorspacious-1.1.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Powerful, accurate, and easy-to-use Python library for colorspace conversions
 EAPI=7
 HOMEPAGE=https://colorspacious.readthedocs.org/en/latest/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorspacious/colorspacious-1.1.2.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f421b2acb4e66cfa56cff2f3482aba1
+_md5_=b31a83eea585c22720929e08f402ec48
diff --git a/metadata/md5-cache/dev-python/configshell-fb-1.1.28 b/metadata/md5-cache/dev-python/configshell-fb-1.1.28
index ffd4161261ae..2b7d76842d0e 100644
--- a/metadata/md5-cache/dev-python/configshell-fb-1.1.28
+++ b/metadata/md5-cache/dev-python/configshell-fb-1.1.28
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python library for building configuration shells
 EAPI=7
 HOMEPAGE=https://github.com/open-iscsi/configshell-fb
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/pyparsing[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] dev-python/urwid[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/c/configshell-fb/configshell-fb-1.1.28.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e0a6681833a87eafcfea0f0439276803
+_md5_=cda2d1e638c8fa2ddb23c9d06ac3e445
diff --git a/metadata/md5-cache/dev-python/configshell-fb-1.1.29 b/metadata/md5-cache/dev-python/configshell-fb-1.1.29
new file mode 100644
index 000000000000..e818cb1c8ec9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/configshell-fb-1.1.29
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python library for building configuration shells
+EAPI=7
+HOMEPAGE=https://github.com/open-iscsi/configshell-fb
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/c/configshell-fb/configshell-fb-1.1.29.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dfce24b21092ecabf8495e46f6077da2
diff --git a/metadata/md5-cache/dev-python/confuse-1.0.0 b/metadata/md5-cache/dev-python/confuse-1.0.0
deleted file mode 100644
index 5c43c2937dfe..000000000000
--- a/metadata/md5-cache/dev-python/confuse-1.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?] doc? ( dev-python/sphinx ) test? ( dev-python/nose[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyyaml[python_targets_pypy3(-)?]
-DESCRIPTION=Confuse is a configuration library for Python that uses YAML
-EAPI=7
-HOMEPAGE=https://github.com/beetbox/confuse
-IUSE=doc test python_targets_pypy3
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/beetbox/confuse/archive/v1.0.0.tar.gz -> confuse-1.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=838f61435c6665109b032b7532a1bbab
diff --git a/metadata/md5-cache/dev-python/confuse-1.4.0 b/metadata/md5-cache/dev-python/confuse-1.4.0
deleted file mode 100644
index 50cf2afff5f1..000000000000
--- a/metadata/md5-cache/dev-python/confuse-1.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/pyproject2setuppy[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyproject2setuppy-18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Confuse is a configuration library for Python that uses YAML
-EAPI=7
-HOMEPAGE=https://github.com/beetbox/confuse
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/beetbox/confuse/archive/v1.4.0.tar.gz -> confuse-1.4.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6c1357b5e5508d1c318a4620d2233229
diff --git a/metadata/md5-cache/dev-python/confuse-1.5.0 b/metadata/md5-cache/dev-python/confuse-1.5.0
deleted file mode 100644
index 69e39cdd0b91..000000000000
--- a/metadata/md5-cache/dev-python/confuse-1.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Confuse is a configuration library for Python that uses YAML
-EAPI=8
-HOMEPAGE=https://github.com/beetbox/confuse
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/beetbox/confuse/archive/v1.5.0.tar.gz -> confuse-1.5.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f700682f2fe68f1184772c3c9f7ff4be
diff --git a/metadata/md5-cache/dev-python/cov-core-1.15.0-r3 b/metadata/md5-cache/dev-python/cov-core-1.15.0-r3
new file mode 100644
index 000000000000..4238763ad63e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cov-core-1.15.0-r3
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=plugin core for use by pytest-cov, nose-cov and nose2-cov
+EAPI=8
+HOMEPAGE=https://github.com/schlamar/cov-core
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/coverage-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cov-core/cov-core-1.15.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0e2437511670066e07bab46d869d6d90
diff --git a/metadata/md5-cache/dev-python/coverage-6.0.2 b/metadata/md5-cache/dev-python/coverage-6.0.2
new file mode 100644
index 000000000000..927bcb35be61
--- /dev/null
+++ b/metadata/md5-cache/dev-python/coverage-6.0.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Code coverage measurement for Python
+EAPI=8
+HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/c/coverage/coverage-6.0.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=be2705ec316ff4962e5f7096851bff21
diff --git a/metadata/md5-cache/dev-python/croniter-1.0.15 b/metadata/md5-cache/dev-python/croniter-1.0.15
index cef26c16cfae..9dd2be2d49a2 100644
--- a/metadata/md5-cache/dev-python/croniter-1.0.15
+++ b/metadata/md5-cache/dev-python/croniter-1.0.15
@@ -4,7 +4,7 @@ DESCRIPTION=Python module to provide iteration for datetime object
 EAPI=7
 HOMEPAGE=https://github.com/kiorky/croniter https://pypi.org/project/croniter/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/croniter/croniter-1.0.15.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8958ceee2bd1c259cadb46966699b9ca
+_md5_=c11f8939886e6b537e4083655a3289e0
diff --git a/metadata/md5-cache/dev-python/css-parser-1.0.4-r1 b/metadata/md5-cache/dev-python/css-parser-1.0.4-r1
deleted file mode 100644
index 1d3eef47bb5a..000000000000
--- a/metadata/md5-cache/dev-python/css-parser-1.0.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A CSS Cascading Style Sheets library (fork of cssutils)
-EAPI=7
-HOMEPAGE=https://pypi.org/project/css-parser/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1+
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/c/css-parser/css-parser-1.0.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=017896f0660fb7f4c9937007d8396eec
diff --git a/metadata/md5-cache/dev-python/csvkit-1.0.6 b/metadata/md5-cache/dev-python/csvkit-1.0.6
deleted file mode 100644
index fc47a9936c91..000000000000
--- a/metadata/md5-cache/dev-python/csvkit-1.0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/agate-1.6.1[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/agate-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-excel-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-dbf-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-sql-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.6.1[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A suite of utilities for converting to and working with CSV.
-EAPI=8
-HOMEPAGE=https://github.com/wireservice/csvkit https://pypi.org/project/csvkit/
-IUSE=+xml test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/agate-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-excel-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-dbf-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-sql-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] xml? ( >=dev-python/agate-1.6.1[xml,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/csvkit/csvkit-1.0.6.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b28f11b04facdaf3539ba450d1e42d5e
diff --git a/metadata/md5-cache/dev-python/csvkit-1.0.6-r1 b/metadata/md5-cache/dev-python/csvkit-1.0.6-r1
new file mode 100644
index 000000000000..46ab550874e6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/csvkit-1.0.6-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/agate-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-excel-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-dbf-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-sql-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A suite of utilities for converting to and working with CSV.
+EAPI=8
+HOMEPAGE=https://github.com/wireservice/csvkit https://pypi.org/project/csvkit/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/agate-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-excel-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-dbf-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/agate-sql-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/csvkit/csvkit-1.0.6.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ffd3a32021333897e181b3bca7fe8340
diff --git a/metadata/md5-cache/dev-python/curtsies-0.3.10 b/metadata/md5-cache/dev-python/curtsies-0.3.10
new file mode 100644
index 000000000000..39d41ca06418
--- /dev/null
+++ b/metadata/md5-cache/dev-python/curtsies-0.3.10
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pyte[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/blessings-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cwcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Curses-like terminal wrapper, with colored strings
+EAPI=8
+HOMEPAGE=https://github.com/bpython/curtsies
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/blessings-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cwcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/curtsies/curtsies-0.3.10.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8794d88eb47ce3d55d70dcbbcd0eaf87
diff --git a/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1 b/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
deleted file mode 100644
index b2e5ee2debe7..000000000000
--- a/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) test? ( virtual/blas virtual/lapack sci-libs/amd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/suitesparseconfig:0= sci-libs/umfpack:0= dsdp? ( sci-libs/dsdp:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( >=sci-mathematics/glpk-4.49:0= ) gsl? ( sci-libs/gsl:0= ) dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/blas virtual/lapack sci-libs/amd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/suitesparseconfig:0= sci-libs/umfpack:0= dsdp? ( sci-libs/dsdp:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( >=sci-mathematics/glpk-4.49:0= ) gsl? ( sci-libs/gsl:0= )
-DESCRIPTION=Python package for convex optimization
-EAPI=7
-HOMEPAGE=https://cvxopt.org/ https://github.com/cvxopt/cvxopt
-IUSE=doc +dsdp examples fftw +glpk gsl test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=virtual/blas virtual/lapack sci-libs/amd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/suitesparseconfig:0= sci-libs/umfpack:0= dsdp? ( sci-libs/dsdp:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( >=sci-mathematics/glpk-4.49:0= ) gsl? ( sci-libs/gsl:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cvxopt/cvxopt/archive/1.2.5.tar.gz -> cvxopt-1.2.5.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9264eade96e423972a0a3bc76c05ddf9
diff --git a/metadata/md5-cache/dev-python/cvxopt-1.2.6 b/metadata/md5-cache/dev-python/cvxopt-1.2.6
deleted file mode 100644
index 26c992e1bcdd..000000000000
--- a/metadata/md5-cache/dev-python/cvxopt-1.2.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) test? ( virtual/blas virtual/lapack sci-libs/amd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/suitesparseconfig:0= sci-libs/umfpack:0= dsdp? ( sci-libs/dsdp:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( >=sci-mathematics/glpk-4.49:0= ) gsl? ( sci-libs/gsl:0= ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/blas virtual/lapack sci-libs/amd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/suitesparseconfig:0= sci-libs/umfpack:0= dsdp? ( sci-libs/dsdp:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( >=sci-mathematics/glpk-4.49:0= ) gsl? ( sci-libs/gsl:0= )
-DESCRIPTION=Python package for convex optimization
-EAPI=7
-HOMEPAGE=https://cvxopt.org/ https://github.com/cvxopt/cvxopt
-IUSE=+dsdp examples fftw +glpk gsl doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=virtual/blas virtual/lapack sci-libs/amd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/suitesparseconfig:0= sci-libs/umfpack:0= dsdp? ( sci-libs/dsdp:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( >=sci-mathematics/glpk-4.49:0= ) gsl? ( sci-libs/gsl:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cvxopt/cvxopt/archive/1.2.6.tar.gz -> cvxopt-1.2.6.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=950d15a52378258f62a9652d3eb411cb
diff --git a/metadata/md5-cache/dev-python/cwcwidth-0.1.5 b/metadata/md5-cache/dev-python/cwcwidth-0.1.5
new file mode 100644
index 000000000000..5c8ec7bbef9c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cwcwidth-0.1.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python bindings for wc(s)width
+EAPI=8
+HOMEPAGE=https://github.com/sebastinas/cwcwidth/ https://pypi.org/project/cwcwidth/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sebastinas/cwcwidth/archive/v0.1.5.tar.gz -> cwcwidth-0.1.5.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4b2bcb9074343baa424225fa6559a033
diff --git a/metadata/md5-cache/dev-python/cython-0.29.24-r1 b/metadata/md5-cache/dev-python/cython-0.29.24-r1
index dffca95bca12..279800757d9f 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.24-r1
+++ b/metadata/md5-cache/dev-python/cython-0.29.24-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A Python to C compiler
 EAPI=8
 HOMEPAGE=https://cython.org https://pypi.org/project/Cython/ https://github.com/cython/cython
 IUSE=emacs test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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 ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.24.tar.gz -> cython-0.29.24.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	elisp-common	cf4fd1b0835b9f3e638724840468064a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2520a1509eee491d58b8184cfb4727e1
+_md5_=053e4d5416bbea15cdccc41db8bfa61a
diff --git a/metadata/md5-cache/dev-python/dask-2021.8.1 b/metadata/md5-cache/dev-python/dask-2021.8.1
deleted file mode 100644
index 2699e2f1f6cd..000000000000
--- a/metadata/md5-cache/dev-python/dask-2021.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numexpr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-rerunfailures[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
-EAPI=8
-HOMEPAGE=https://dask.org/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/dask/dask-2021.8.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dfc09766095eb12bc024b52785f2da7e
diff --git a/metadata/md5-cache/dev-python/dask-2021.9.0 b/metadata/md5-cache/dev-python/dask-2021.9.0
deleted file mode 100644
index 07092f38e230..000000000000
--- a/metadata/md5-cache/dev-python/dask-2021.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numexpr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-rerunfailures[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
-EAPI=8
-HOMEPAGE=https://dask.org/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/dask/dask-2021.9.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7e40643a4158af043b6a360f5128177e
diff --git a/metadata/md5-cache/dev-python/dask-2021.9.1 b/metadata/md5-cache/dev-python/dask-2021.9.1
index 01540710e2bf..284bd34aee3b 100644
--- a/metadata/md5-cache/dev-python/dask-2021.9.1
+++ b/metadata/md5-cache/dev-python/dask-2021.9.1
@@ -4,7 +4,7 @@ DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
 EAPI=8
 HOMEPAGE=https://dask.org/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dask/dask-2021.9.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=18d38203e83ce754657947191392dc3c
+_md5_=043cf7f520099c2d2356a4517e08c56e
diff --git a/metadata/md5-cache/dev-python/dbutils-1.3 b/metadata/md5-cache/dev-python/dbutils-1.3
deleted file mode 100644
index c1ff51678987..000000000000
--- a/metadata/md5-cache/dev-python/dbutils-1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Database connections for multi-threaded environments
-EAPI=7
-HOMEPAGE=https://webwareforpython.github.io/DBUtils/ https://github.com/WebwareForPython/DBUtils/ https://pypi.org/project/DBUtils/
-IUSE=test python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=OSL-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/dbutils/DBUtils-1.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3adfec218a34fa1a8b0fea3049b1b54b
diff --git a/metadata/md5-cache/dev-python/dbutils-2.0 b/metadata/md5-cache/dev-python/dbutils-2.0
deleted file mode 100644
index f496ca3d8823..000000000000
--- a/metadata/md5-cache/dev-python/dbutils-2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Database connections for multi-threaded environments
-EAPI=7
-HOMEPAGE=https://webwareforpython.github.io/DBUtils/ https://github.com/WebwareForPython/DBUtils/ https://pypi.org/project/DBUtils/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=OSL-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/dbutils/DBUtils-2.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=70c27d800eb55e8d1e8dcff0dc39e55d
diff --git a/metadata/md5-cache/dev-python/dbutils-2.0.1 b/metadata/md5-cache/dev-python/dbutils-2.0.1
deleted file mode 100644
index 6571b99fee10..000000000000
--- a/metadata/md5-cache/dev-python/dbutils-2.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Database connections for multi-threaded environments
-EAPI=7
-HOMEPAGE=https://webwareforpython.github.io/DBUtils/ https://github.com/WebwareForPython/DBUtils/ https://pypi.org/project/DBUtils/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=OSL-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/dbutils/DBUtils-2.0.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d9e6e1406170ea55407fb6c7dad126f2
diff --git a/metadata/md5-cache/dev-python/debugpy-1.4.1 b/metadata/md5-cache/dev-python/debugpy-1.4.1
deleted file mode 100644
index bb8a669f4450..000000000000
--- a/metadata/md5-cache/dev-python/debugpy-1.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An implementation of the Debug Adapter Protocol for Python
-EAPI=8
-HOMEPAGE=https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/microsoft/debugpy/archive/refs/tags/v1.4.1.tar.gz -> debugpy-1.4.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=357420aadd32e530e6ff00fd1867d046
diff --git a/metadata/md5-cache/dev-python/debugpy-1.4.2 b/metadata/md5-cache/dev-python/debugpy-1.4.2
deleted file mode 100644
index 3ca9bc5f2476..000000000000
--- a/metadata/md5-cache/dev-python/debugpy-1.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/pydevd[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An implementation of the Debug Adapter Protocol for Python
-EAPI=8
-HOMEPAGE=https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc
-LICENSE=MIT
-RDEPEND=dev-python/pydevd[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/microsoft/debugpy/archive/refs/tags/v1.4.2.tar.gz -> debugpy-1.4.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da0201e1656fdb659a0b689b71b1372d
diff --git a/metadata/md5-cache/dev-python/debugpy-1.5.0 b/metadata/md5-cache/dev-python/debugpy-1.5.0
new file mode 100644
index 000000000000..965ad7b6d756
--- /dev/null
+++ b/metadata/md5-cache/dev-python/debugpy-1.5.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/pydevd[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An implementation of the Debug Adapter Protocol for Python
+EAPI=8
+HOMEPAGE=https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/pydevd[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/microsoft/debugpy/archive/v1.5.0.tar.gz -> debugpy-1.5.0.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=498202daf19dda2b01251888c0bb1b1a
diff --git a/metadata/md5-cache/dev-python/debugpy-1.5.1 b/metadata/md5-cache/dev-python/debugpy-1.5.1
new file mode 100644
index 000000000000..f249291e99c6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/debugpy-1.5.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/pydevd[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An implementation of the Debug Adapter Protocol for Python
+EAPI=8
+HOMEPAGE=https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/pydevd[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/microsoft/debugpy/archive/v1.5.1.tar.gz -> debugpy-1.5.1.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=498202daf19dda2b01251888c0bb1b1a
diff --git a/metadata/md5-cache/dev-python/decorator-4.4.2-r1 b/metadata/md5-cache/dev-python/decorator-4.4.2-r1
deleted file mode 100644
index 14955035e207..000000000000
--- a/metadata/md5-cache/dev-python/decorator-4.4.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplifies the usage of decorators for the average programmer
-EAPI=7
-HOMEPAGE=https://github.com/micheles/decorator https://pypi.org/project/decorator/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/d/decorator/decorator-4.4.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c5e0658aa0f2edf29cf793229062bdba
diff --git a/metadata/md5-cache/dev-python/decorator-5.0.9 b/metadata/md5-cache/dev-python/decorator-5.0.9
deleted file mode 100644
index 48ec127bc1ac..000000000000
--- a/metadata/md5-cache/dev-python/decorator-5.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplifies the usage of decorators for the average programmer
-EAPI=7
-HOMEPAGE=https://github.com/micheles/decorator https://pypi.org/project/decorator/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/d/decorator/decorator-5.0.9.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d6c8c8ac95d1c280d377cdb37be449dc
diff --git a/metadata/md5-cache/dev-python/decorator-5.1.0 b/metadata/md5-cache/dev-python/decorator-5.1.0
index d842f933a5ad..182822e87c1a 100644
--- a/metadata/md5-cache/dev-python/decorator-5.1.0
+++ b/metadata/md5-cache/dev-python/decorator-5.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Simplifies the usage of decorators for the average programmer
 EAPI=8
 HOMEPAGE=https://github.com/micheles/decorator https://pypi.org/project/decorator/
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/d/decorator/decorator-5.1.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b382d6f88e723c28b9ec6145100f9c0b
+_md5_=760e08939d37c880a873b847247a688b
diff --git a/metadata/md5-cache/dev-python/denonavr-0.10.7 b/metadata/md5-cache/dev-python/denonavr-0.10.7
deleted file mode 100644
index e9fe430d7e17..000000000000
--- a/metadata/md5-cache/dev-python/denonavr-0.10.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/asyncstdlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netifaces[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Automation Library for Denon AVR receivers
-EAPI=7
-HOMEPAGE=https://github.com/scarface-4711/denonavr
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/asyncstdlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/netifaces[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/denonavr/denonavr-0.10.7.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2518f04030054bc0fa2a2caaf30dd42b
diff --git a/metadata/md5-cache/dev-python/denonavr-0.10.8 b/metadata/md5-cache/dev-python/denonavr-0.10.8
deleted file mode 100644
index 92862d3a7e25..000000000000
--- a/metadata/md5-cache/dev-python/denonavr-0.10.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/asyncstdlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netifaces[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Automation Library for Denon AVR receivers
-EAPI=7
-HOMEPAGE=https://github.com/scarface-4711/denonavr
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/asyncstdlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netifaces[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/denonavr/denonavr-0.10.8.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=20cbc085171c614d70a261e2e1bfe7d6
diff --git a/metadata/md5-cache/dev-python/deprecated-1.2.12 b/metadata/md5-cache/dev-python/deprecated-1.2.12
deleted file mode 100644
index 984e65f82238..000000000000
--- a/metadata/md5-cache/dev-python/deprecated-1.2.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/wrapt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python @deprecated decorator to deprecate old API
-EAPI=7
-HOMEPAGE=https://github.com/tantale/deprecated
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=dev-python/wrapt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tantale/deprecated/archive/v1.2.12.tar.gz -> deprecated-1.2.12.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=483b734423f731197f96fbe2563b398b
diff --git a/metadata/md5-cache/dev-python/deprecated-1.2.13 b/metadata/md5-cache/dev-python/deprecated-1.2.13
index 73d3471bd17e..c47f36e71f6f 100644
--- a/metadata/md5-cache/dev-python/deprecated-1.2.13
+++ b/metadata/md5-cache/dev-python/deprecated-1.2.13
@@ -4,7 +4,7 @@ DESCRIPTION=Python @deprecated decorator to deprecate old API
 EAPI=8
 HOMEPAGE=https://github.com/tantale/deprecated
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-python/wrapt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tantale/deprecated/archive/v1.2.13.tar.gz -> deprecated-1.2.13.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6dc1e209efcd82e71fb3e3027521bc4d
+_md5_=d1b62e95a70a9e38724010360f8dd9ce
diff --git a/metadata/md5-cache/dev-python/django-3.2.6 b/metadata/md5-cache/dev-python/django-3.2.6
deleted file mode 100644
index 1739867d7c21..000000000000
--- a/metadata/md5-cache/dev-python/django-3.2.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[webp,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext !!<dev-python/ipython-7.21.0-r1 !!=dev-python/ipython-7.22.0-r0 ) verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 ) doc? ( dev-python/sphinx ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DESCRIPTION=High-level Python web framework
-EAPI=7
-HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
-IUSE=doc sqlite test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
-LICENSE=BSD Apache-2.0 MIT
-RDEPEND=>=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://media.djangoproject.com/releases/3.2/Django-3.2.6.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.2.6.checksum.txt )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=8375ebb373076a05790c4c61a4bd14ed
diff --git a/metadata/md5-cache/dev-python/django-3.2.8 b/metadata/md5-cache/dev-python/django-3.2.8
index 3b8603418998..6eff7ce77609 100644
--- a/metadata/md5-cache/dev-python/django-3.2.8
+++ b/metadata/md5-cache/dev-python/django-3.2.8
@@ -4,7 +4,7 @@ DESCRIPTION=High-level Python web framework
 EAPI=8
 HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
 IUSE=doc sqlite test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=BSD Apache-2.0 MIT
 RDEPEND=>=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/3.2/Django-3.2.8.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.2.8.checksum.txt )
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=76acda9683d22dbd877f3a4f56c5d46a
+_md5_=fca20ae092226a94f51885171d06f4b7
diff --git a/metadata/md5-cache/dev-python/django-allauth-0.42.0 b/metadata/md5-cache/dev-python/django-allauth-0.42.0
deleted file mode 100644
index 5bae7225b0d2..000000000000
--- a/metadata/md5-cache/dev-python/django-allauth-0.42.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?]
-DESCRIPTION=Django 3rd party (social) account authentication
-EAPI=7
-HOMEPAGE=https://www.intenct.nl/projects/django-allauth/
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/django[python_targets_python3_8(-)?] dev-python/python3-openid[python_targets_python3_8(-)?] dev-python/requests-oauthlib[python_targets_python3_8(-)?] dev-python/requests[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/d/django-allauth/django-allauth-0.42.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4edfee9a5bd6f1aab9508bdf85dc0c52
diff --git a/metadata/md5-cache/dev-python/django-appconf-1.0.4 b/metadata/md5-cache/dev-python/django-appconf-1.0.4
deleted file mode 100644
index 62a3cf4c4834..000000000000
--- a/metadata/md5-cache/dev-python/django-appconf-1.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=A helper class for handling configuration defaults of packaged apps gracefully.
-EAPI=7
-HOMEPAGE=https://django-appconf.readthedocs.io/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/d/django-appconf/django-appconf-1.0.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4860d8693c1036a65cb69424c12b5ce0
diff --git a/metadata/md5-cache/dev-python/django-auth-ldap-2.4.0 b/metadata/md5-cache/dev-python/django-auth-ldap-2.4.0
deleted file mode 100644
index be932faf465b..000000000000
--- a/metadata/md5-cache/dev-python/django-auth-ldap-2.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) net-nds/openldap[-minimal] ) doc? ( dev-python/sphinx ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Django LDAP authentication backend
-EAPI=7
-HOMEPAGE=https://github.com/django-auth-ldap/django-auth-ldap https://pypi.org/project/django-auth-ldap/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-ldap-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/django-auth-ldap/django-auth-ldap-2.4.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a239a43fe39ab29636c3d249716164d2
diff --git a/metadata/md5-cache/dev-python/django-compressor-2.4 b/metadata/md5-cache/dev-python/django-compressor-2.4
deleted file mode 100644
index 3cb05d58e25d..000000000000
--- a/metadata/md5-cache/dev-python/django-compressor-2.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/django-appconf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rcssmin[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rjsmin[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Compresses linked and inline JavaScript or CSS into single cached files.
-EAPI=7
-HOMEPAGE=https://django-compressor.readthedocs.io/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/d/django_compressor/django_compressor-2.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aec20da8cf80a3d317747eea9ee4d3c6
diff --git a/metadata/md5-cache/dev-python/django-cors-headers-3.7.0 b/metadata/md5-cache/dev-python/django-cors-headers-3.7.0
deleted file mode 100644
index 2427f8472403..000000000000
--- a/metadata/md5-cache/dev-python/django-cors-headers-3.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses
-EAPI=7
-HOMEPAGE=https://github.com/adamchainz/django-cors-headers
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/django-cors-headers/django-cors-headers-3.7.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b799b24f2590a812deb1a884c37a65a5
diff --git a/metadata/md5-cache/dev-python/django-cors-headers-3.8.0 b/metadata/md5-cache/dev-python/django-cors-headers-3.8.0
deleted file mode 100644
index 552c7bbd0176..000000000000
--- a/metadata/md5-cache/dev-python/django-cors-headers-3.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses
-EAPI=8
-HOMEPAGE=https://github.com/adamchainz/django-cors-headers
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/adamchainz/django-cors-headers/archive/3.8.0.tar.gz -> django-cors-headers-3.8.0.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a7a51627235eb8da1924147006cb3acc
diff --git a/metadata/md5-cache/dev-python/django-cors-headers-3.9.0 b/metadata/md5-cache/dev-python/django-cors-headers-3.9.0
deleted file mode 100644
index 38974e836111..000000000000
--- a/metadata/md5-cache/dev-python/django-cors-headers-3.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses
-EAPI=8
-HOMEPAGE=https://github.com/adamchainz/django-cors-headers
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/adamchainz/django-cors-headers/archive/3.9.0.tar.gz -> django-cors-headers-3.9.0.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a7a51627235eb8da1924147006cb3acc
diff --git a/metadata/md5-cache/dev-python/django-debug-toolbar-3.2.1 b/metadata/md5-cache/dev-python/django-debug-toolbar-3.2.1
deleted file mode 100644
index 1ea5548d106e..000000000000
--- a/metadata/md5-cache/dev-python/django-debug-toolbar-3.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlparse-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=A configurable set of panels that display debug information
-EAPI=7
-HOMEPAGE=https://pypi.org/project/django-debug-toolbar/ https://github.com/jazzband/django-debug-toolbar/
-IUSE=doc examples test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlparse-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jazzband/django-debug-toolbar/archive/3.2.1.tar.gz -> django-debug-toolbar-3.2.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=13820a860a6706f0baa73cb3398a275f
diff --git a/metadata/md5-cache/dev-python/django-filter-2.4.0 b/metadata/md5-cache/dev-python/django-filter-2.4.0
deleted file mode 100644
index 4acc35d2df76..000000000000
--- a/metadata/md5-cache/dev-python/django-filter-2.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Django app allowing declarative dynamic QuerySet filtering from URL parameters
-EAPI=7
-HOMEPAGE=https://github.com/carltongibson/django-filter
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/django-filter/django-filter-2.4.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=61386a28e390c52789861aed59e34e15
diff --git a/metadata/md5-cache/dev-python/django-mptt-0.13.3 b/metadata/md5-cache/dev-python/django-mptt-0.13.3
deleted file mode 100644
index 8a90dae858b7..000000000000
--- a/metadata/md5-cache/dev-python/django-mptt-0.13.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=utilities for modified preorder tree traversal and trees of model instances
-EAPI=8
-HOMEPAGE=https://github.com/django-mptt/django-mptt
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/django-js-asset[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/django-mptt/django-mptt/archive/0.13.3.tar.gz -> django-mptt-0.13.3.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a448b459ce4e8f6c1dec0f65f3458784
diff --git a/metadata/md5-cache/dev-python/django-otp-1.0.6 b/metadata/md5-cache/dev-python/django-otp-1.0.6
deleted file mode 100644
index 57e86148a962..000000000000
--- a/metadata/md5-cache/dev-python/django-otp-1.0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Django framework adding two-factor authentication using one-time passwords
-EAPI=7
-HOMEPAGE=https://github.com/django-otp/django-otp/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/django-otp/django-otp/archive/v1.0.6.tar.gz -> django-otp-1.0.6.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=609ea9d1d9f4160c23ff24f1ed5ab662
diff --git a/metadata/md5-cache/dev-python/django-otp-1.1.0 b/metadata/md5-cache/dev-python/django-otp-1.1.0
deleted file mode 100644
index 6ba30aa8a0ac..000000000000
--- a/metadata/md5-cache/dev-python/django-otp-1.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Django framework adding two-factor authentication using one-time passwords
-EAPI=8
-HOMEPAGE=https://github.com/django-otp/django-otp/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/django-otp/django-otp/archive/v1.1.0.tar.gz -> django-otp-1.1.0.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ce79a02b07b1571ab7864d3e05554d93
diff --git a/metadata/md5-cache/dev-python/django-picklefield-3.0.1 b/metadata/md5-cache/dev-python/django-picklefield-3.0.1
deleted file mode 100644
index ca70a12aa4ae..000000000000
--- a/metadata/md5-cache/dev-python/django-picklefield-3.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Pickled object field for Django.
-EAPI=7
-HOMEPAGE=https://github.com/gintas/django-picklefield
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/d/django-picklefield/django-picklefield-3.0.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dc45c6bfdc2a349a6a589c95ee3cb549
diff --git a/metadata/md5-cache/dev-python/django-redis-4.10.0 b/metadata/md5-cache/dev-python/django-redis-4.10.0
deleted file mode 100644
index cf8e7716d5e5..000000000000
--- a/metadata/md5-cache/dev-python/django-redis-4.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?] >=dev-python/redis-py-2.10.0[python_targets_python3_8(-)?]
-DESCRIPTION=Full featured redis cache backend for Django
-EAPI=7
-HOMEPAGE=https://github.com/jazzband/django-redis/
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?] >=dev-python/redis-py-2.10.0[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/d/django-redis/django-redis-4.10.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1d5938d5302bc9ae32e203a548676fce
diff --git a/metadata/md5-cache/dev-python/django-rq-2.3.2 b/metadata/md5-cache/dev-python/django-rq-2.3.2
deleted file mode 100644
index 75537fea8b83..000000000000
--- a/metadata/md5-cache/dev-python/django-rq-2.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An app that provides django integration for RQ (Redis Queue)
-EAPI=7
-HOMEPAGE=https://github.com/rq/django-rq
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/django-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rq-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/redis-py-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/d/django-rq/django-rq-2.3.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8f380be4ec2148895f68e199106ab24a
diff --git a/metadata/md5-cache/dev-python/django-rq-2.4.0 b/metadata/md5-cache/dev-python/django-rq-2.4.0
deleted file mode 100644
index 3cabca3497e2..000000000000
--- a/metadata/md5-cache/dev-python/django-rq-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An app that provides django integration for RQ (Redis Queue)
-EAPI=7
-HOMEPAGE=https://github.com/rq/django-rq
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/django-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rq-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/redis-py-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/d/django-rq/django-rq-2.4.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d6d73e84467dbe587e47558a58c151af
diff --git a/metadata/md5-cache/dev-python/django-sortedm2m-3.0.2 b/metadata/md5-cache/dev-python/django-sortedm2m-3.0.2
deleted file mode 100644
index 3f418e69855d..000000000000
--- a/metadata/md5-cache/dev-python/django-sortedm2m-3.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Drop-in replacement for django's many to many field with sorted relations
-EAPI=7
-HOMEPAGE=https://pypi.org/project/django-sortedm2m/ https://github.com/jazzband/django-sortedm2m
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jazzband/django-sortedm2m/archive/3.0.2.tar.gz -> django-sortedm2m-3.0.2.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=863fddbaef91787f3ebaf7fadb196854
diff --git a/metadata/md5-cache/dev-python/django-taggit-1.3.0 b/metadata/md5-cache/dev-python/django-taggit-1.3.0
deleted file mode 100644
index b689541bce52..000000000000
--- a/metadata/md5-cache/dev-python/django-taggit-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Simple tagging for Django
-EAPI=7
-HOMEPAGE=https://github.com/jazzband/django-taggit
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/d/django-taggit/django-taggit-1.3.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f17582655b2bb28accc186fd01176657
diff --git a/metadata/md5-cache/dev-python/django-timezone-field-4.1 b/metadata/md5-cache/dev-python/django-timezone-field-4.1
deleted file mode 100644
index 9286f5e5ddde..000000000000
--- a/metadata/md5-cache/dev-python/django-timezone-field-4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=A Django app providing database and form fields for pytz timezone objects
-EAPI=7
-HOMEPAGE=https://github.com/mfogel/django-timezone-field
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/d/django-timezone-field/django-timezone-field-4.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fe60bee9a7b95394057cf8ec6cf680ef
diff --git a/metadata/md5-cache/dev-python/dns-lexicon-3.3.4 b/metadata/md5-cache/dev-python/dns-lexicon-3.3.4
deleted file mode 100644
index efc804a7a1d6..000000000000
--- a/metadata/md5-cache/dev-python/dns-lexicon-3.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Manipulate DNS records on various DNS providers in a standardized/agnostic way
-EAPI=7
-HOMEPAGE=https://pypi.org/project/dns-lexicon/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tldextract[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/d/dns-lexicon/dns-lexicon-3.3.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6034cc76929ac0098807486c9bbd82cb
diff --git a/metadata/md5-cache/dev-python/dns-lexicon-3.7.0 b/metadata/md5-cache/dev-python/dns-lexicon-3.7.0
deleted file mode 100644
index 8114ba9159ac..000000000000
--- a/metadata/md5-cache/dev-python/dns-lexicon-3.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zeep[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/vcrpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tldextract[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Manipulate DNS records on various DNS providers in a standardized/agnostic way
-EAPI=8
-HOMEPAGE=https://pypi.org/project/dns-lexicon/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tldextract[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/AnalogJ/lexicon/archive/v3.7.0.tar.gz -> dns-lexicon-3.7.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b7363970c520c6b72e2546f110b8e541
diff --git a/metadata/md5-cache/dev-python/dns-lexicon-3.8.0 b/metadata/md5-cache/dev-python/dns-lexicon-3.8.0
deleted file mode 100644
index b41f8cae4cf1..000000000000
--- a/metadata/md5-cache/dev-python/dns-lexicon-3.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zeep[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/vcrpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tldextract[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Manipulate DNS records on various DNS providers in a standardized/agnostic way
-EAPI=8
-HOMEPAGE=https://pypi.org/project/dns-lexicon/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tldextract[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/AnalogJ/lexicon/archive/v3.8.0.tar.gz -> dns-lexicon-3.8.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ddb1a79ecaf5c2af7e6e2f9494175332
diff --git a/metadata/md5-cache/dev-python/dns-lexicon-3.8.1 b/metadata/md5-cache/dev-python/dns-lexicon-3.8.1
new file mode 100644
index 000000000000..781adaae7638
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dns-lexicon-3.8.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zeep[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/vcrpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tldextract[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Manipulate DNS records on various DNS providers in a standardized/agnostic way
+EAPI=8
+HOMEPAGE=https://pypi.org/project/dns-lexicon/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tldextract[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/AnalogJ/lexicon/archive/v3.8.1.tar.gz -> dns-lexicon-3.8.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ddb1a79ecaf5c2af7e6e2f9494175332
diff --git a/metadata/md5-cache/dev-python/doc8-0.6.0 b/metadata/md5-cache/dev-python/doc8-0.6.0
deleted file mode 100644
index 822a47b5f4b1..000000000000
--- a/metadata/md5-cache/dev-python/doc8-0.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-1.6[python_targets_python3_8(-)?]
-DESCRIPTION=Style checker for Sphinx (or other) RST documentation
-EAPI=7
-HOMEPAGE=http://git.openstack.org/cgit/stackforge/doc8
-IUSE=python_targets_python3_8
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python3_8(-)?] dev-python/chardet[python_targets_python3_8(-)?] dev-python/docutils[python_targets_python3_8(-)?] >=dev-python/restructuredtext-lint-0.7[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] dev-python/stevedore[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/d/doc8/doc8-0.6.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bb847222af91cb7a1109f74ea783282b
diff --git a/metadata/md5-cache/dev-python/duecredit-0.7.0 b/metadata/md5-cache/dev-python/duecredit-0.7.0
deleted file mode 100644
index 91d456dace14..000000000000
--- a/metadata/md5-cache/dev-python/duecredit-0.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-python/citeproc-py-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Publications (and donations) tracer
-EAPI=7
-HOMEPAGE=https://github.com/duecredit/duecredit
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/citeproc-py-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/d/duecredit/duecredit-0.7.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e26bc2537ef819711e4dd396dcc7ddae
diff --git a/metadata/md5-cache/dev-python/duecredit-0.8.0 b/metadata/md5-cache/dev-python/duecredit-0.8.0
deleted file mode 100644
index dcdef7e01db8..000000000000
--- a/metadata/md5-cache/dev-python/duecredit-0.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/citeproc-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/citeproc-py-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Publications (and donations) tracer
-EAPI=7
-HOMEPAGE=https://github.com/duecredit/duecredit
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/citeproc-py-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/duecredit/duecredit-0.8.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f8960146964fcbcd719a5ae4e700b31
diff --git a/metadata/md5-cache/dev-python/easy-thumbnails-2.7-r1 b/metadata/md5-cache/dev-python/easy-thumbnails-2.7-r1
deleted file mode 100644
index 533363a221c6..000000000000
--- a/metadata/md5-cache/dev-python/easy-thumbnails-2.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-python/django-1.11[python_targets_python3_8(-)?] dev-python/pillow[python_targets_python3_8(-)?] dev-python/testfixtures[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Easy thumbnails for Django
-EAPI=7
-HOMEPAGE=https://pypi.org/project/easy-thumbnails/
-IUSE=test python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?] dev-python/pillow[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/e/easy-thumbnails/easy-thumbnails-2.7.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f0cd01b55fb9254aade59380c85d3c89
diff --git a/metadata/md5-cache/dev-python/easy-thumbnails-2.7.2 b/metadata/md5-cache/dev-python/easy-thumbnails-2.7.2
new file mode 100644
index 000000000000..81352be8416b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/easy-thumbnails-2.7.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testfixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Easy thumbnails for Django
+EAPI=8
+HOMEPAGE=https://pypi.org/project/easy-thumbnails/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/django-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/e/easy-thumbnails/easy-thumbnails-2.7.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=11e9d4b23435fc6e18267fb3923c9811
diff --git a/metadata/md5-cache/dev-python/easyprocess-0.3-r1 b/metadata/md5-cache/dev-python/easyprocess-0.3-r1
index 55ab1a3e2fc4..d5a39ea999c8 100644
--- a/metadata/md5-cache/dev-python/easyprocess-0.3-r1
+++ b/metadata/md5-cache/dev-python/easyprocess-0.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Easy to use Python subprocess interface
 EAPI=8
 HOMEPAGE=https://github.com/ponty/EasyProcess
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponty/EasyProcess/archive/0.3.tar.gz -> easyprocess-0.3.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=251292218eace792aeb217a062daaab7
+_md5_=3fc1cd6576c7aa2cf2be29c52cb55ea0
diff --git a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0 b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
deleted file mode 100644
index 1fd72ca18346..000000000000
--- a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?] test? ( >dev-util/cmake-3.0 ) !<app-vim/editorconfig-vim-0.3.3-r1 python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DESCRIPTION=Clone of EditorConfig core written in Python
-EAPI=6
-HOMEPAGE=https://editorconfig.org/
-IUSE=test cli python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=PYTHON BSD-4
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/editorconfig/editorconfig-core-py/archive/v0.12.0.tar.gz -> editorconfig-core-py-0.12.0.tar.gz test? ( https://github.com/editorconfig/editorconfig-core-test/archive/abb579e00f2deeede91cb485e53512efab9c6474.tar.gz -> editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e6c7ce3294dc0e6ed8fb2f6ce82a0a0b
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-7.14.1 b/metadata/md5-cache/dev-python/elasticsearch-py-7.14.1
index 772eaf68bf3b..a5d29b819350 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-7.14.1
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-7.14.1
@@ -5,7 +5,7 @@ DESCRIPTION=Official Python low-level client for Elasticsearch
 EAPI=8
 HOMEPAGE=https://github.com/elastic/elasticsearch-py
 IUSE=async doc test doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 PROPERTIES=test_network
 RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.26.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/urllib3-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] async? ( >=dev-python/aiohttp-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/aiohttp-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elastic/elasticsearch-py/archive/v7.14.1.tar.gz -> elasticsearch-py-7.14.1.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.14.1-no-jdk-linux-x86_64.tar.gz )
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7c0176e9aea966ad921b1816e50f3fd2
+_md5_=c19ad7dee91798641a8e3dab1f039812
diff --git a/metadata/md5-cache/dev-python/emcee-3.0.2 b/metadata/md5-cache/dev-python/emcee-3.0.2
deleted file mode 100644
index 9c46e2b61c59..000000000000
--- a/metadata/md5-cache/dev-python/emcee-3.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Python ensemble sampling toolkit for affine-invariant MCMC
-EAPI=7
-HOMEPAGE=https://emcee.readthedocs.io/en/stable/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/e/emcee/emcee-3.0.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a255bb1f25c06b6ecf03c543f210f3e7
diff --git a/metadata/md5-cache/dev-python/emcee-3.1.0 b/metadata/md5-cache/dev-python/emcee-3.1.0
deleted file mode 100644
index 833689f9832f..000000000000
--- a/metadata/md5-cache/dev-python/emcee-3.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DESCRIPTION=Python ensemble sampling toolkit for affine-invariant MCMC
-EAPI=7
-HOMEPAGE=https://emcee.readthedocs.io/en/stable/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/e/emcee/emcee-3.1.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=68a19b6a1c3bf9ca73cd880b76439e27
diff --git a/metadata/md5-cache/dev-python/emoji-1.4.2 b/metadata/md5-cache/dev-python/emoji-1.4.2
deleted file mode 100644
index 1773c4d8fa0a..000000000000
--- a/metadata/md5-cache/dev-python/emoji-1.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Emoji for Python
-EAPI=8
-HOMEPAGE=https://github.com/carpedm20/emoji/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/carpedm20/emoji/archive/refs/tags/v.1.4.2.tar.gz -> emoji-1.4.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=882a8bfdb3069eb77e6a9c9433f766a9
diff --git a/metadata/md5-cache/dev-python/emoji-1.5.0 b/metadata/md5-cache/dev-python/emoji-1.5.0
deleted file mode 100644
index 11621618bdd0..000000000000
--- a/metadata/md5-cache/dev-python/emoji-1.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Emoji for Python
-EAPI=8
-HOMEPAGE=https://github.com/carpedm20/emoji/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/carpedm20/emoji/archive/v1.5.0.tar.gz -> emoji-1.5.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9487889e60b33a417af2f326a837e32a
diff --git a/metadata/md5-cache/dev-python/emoji-1.6.0 b/metadata/md5-cache/dev-python/emoji-1.6.0
deleted file mode 100644
index 843bce978669..000000000000
--- a/metadata/md5-cache/dev-python/emoji-1.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Emoji for Python
-EAPI=8
-HOMEPAGE=https://github.com/carpedm20/emoji/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/carpedm20/emoji/archive/v1.6.0.tar.gz -> emoji-1.6.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9487889e60b33a417af2f326a837e32a
diff --git a/metadata/md5-cache/dev-python/emoji-1.6.1 b/metadata/md5-cache/dev-python/emoji-1.6.1
new file mode 100644
index 000000000000..0ffa50922469
--- /dev/null
+++ b/metadata/md5-cache/dev-python/emoji-1.6.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Emoji for Python
+EAPI=8
+HOMEPAGE=https://github.com/carpedm20/emoji/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/carpedm20/emoji/archive/v1.6.1.tar.gz -> emoji-1.6.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9487889e60b33a417af2f326a837e32a
diff --git a/metadata/md5-cache/dev-python/entrypoint2-0.2.4 b/metadata/md5-cache/dev-python/entrypoint2-0.2.4
index 7c591c759199..df4fd0a60006 100644
--- a/metadata/md5-cache/dev-python/entrypoint2-0.2.4
+++ b/metadata/md5-cache/dev-python/entrypoint2-0.2.4
@@ -4,7 +4,7 @@ DESCRIPTION=Easy to use command-line interface for python modules
 EAPI=7
 HOMEPAGE=https://github.com/ponty/entrypoint2
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponty/entrypoint2/archive/0.2.4.tar.gz -> entrypoint2-0.2.4.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=44545c3ce63b4e6987bbf41ea03bce2c
+_md5_=98bb1f33e7154c46876ebce7c3e8f6ed
diff --git a/metadata/md5-cache/dev-python/eventlet-0.32.0 b/metadata/md5-cache/dev-python/eventlet-0.32.0
index f6083cd6e59e..e4262c6edb92 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.32.0
+++ b/metadata/md5-cache/dev-python/eventlet-0.32.0
@@ -4,7 +4,7 @@ DESCRIPTION=Highly concurrent networking library
 EAPI=8
 HOMEPAGE=https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/
 IUSE=examples test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/dnspython-1.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/dnspython-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.32.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f0f6b20fd2825e3f21e2a4e81e05ce7b
+_md5_=e4a296a1c4bd209880d4eb9f728e5b34
diff --git a/metadata/md5-cache/dev-python/executing-0.7.0 b/metadata/md5-cache/dev-python/executing-0.7.0
deleted file mode 100644
index 0fd64a62da75..000000000000
--- a/metadata/md5-cache/dev-python/executing-0.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/asttokens[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Get information about what a Python frame is currently doing
-EAPI=8
-HOMEPAGE=https://github.com/alexmojaki/executing/ https://pypi.org/project/executing/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/alexmojaki/executing/archive/v0.7.0.tar.gz -> executing-0.7.0.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=03a1ce35cdd9d4334a0372eee5c81fb7
diff --git a/metadata/md5-cache/dev-python/executing-0.8.0 b/metadata/md5-cache/dev-python/executing-0.8.0
deleted file mode 100644
index 1db07cbf8059..000000000000
--- a/metadata/md5-cache/dev-python/executing-0.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/asttokens[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Get information about what a Python frame is currently doing
-EAPI=8
-HOMEPAGE=https://github.com/alexmojaki/executing/ https://pypi.org/project/executing/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/alexmojaki/executing/archive/v0.8.0.tar.gz -> executing-0.8.0.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4bfa9012ab92dbec3607854f6f668b50
diff --git a/metadata/md5-cache/dev-python/executing-0.8.1 b/metadata/md5-cache/dev-python/executing-0.8.1
deleted file mode 100644
index fe88af2c0809..000000000000
--- a/metadata/md5-cache/dev-python/executing-0.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/asttokens[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Get information about what a Python frame is currently doing
-EAPI=8
-HOMEPAGE=https://github.com/alexmojaki/executing/ https://pypi.org/project/executing/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/alexmojaki/executing/archive/v0.8.1.tar.gz -> executing-0.8.1.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1d4c5c2e61ee56a31f47ca9db134e288
diff --git a/metadata/md5-cache/dev-python/executing-0.8.2 b/metadata/md5-cache/dev-python/executing-0.8.2
index af5343a178a5..0384dc7ce2de 100644
--- a/metadata/md5-cache/dev-python/executing-0.8.2
+++ b/metadata/md5-cache/dev-python/executing-0.8.2
@@ -4,7 +4,7 @@ DESCRIPTION=Get information about what a Python frame is currently doing
 EAPI=8
 HOMEPAGE=https://github.com/alexmojaki/executing/ https://pypi.org/project/executing/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alexmojaki/executing/archive/v0.8.2.tar.gz -> executing-0.8.2.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1d4c5c2e61ee56a31f47ca9db134e288
+_md5_=4bfa9012ab92dbec3607854f6f668b50
diff --git a/metadata/md5-cache/dev-python/falcon-2.0.0-r1 b/metadata/md5-cache/dev-python/falcon-2.0.0-r1
deleted file mode 100644
index 432eb8d258bc..000000000000
--- a/metadata/md5-cache/dev-python/falcon-2.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=cython? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A supersonic micro-framework for building cloud APIs
-EAPI=7
-HOMEPAGE=https://falconframework.org/ https://pypi.org/project/falcon/
-IUSE=+cython test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/falconry/falcon/archive/2.0.0.tar.gz -> falcon-2.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bc38d5f557c12896ae97817fe50f5756
diff --git a/metadata/md5-cache/dev-python/feedparser-5.2.1-r1 b/metadata/md5-cache/dev-python/feedparser-5.2.1-r1
deleted file mode 100644
index fcecb4ca9421..000000000000
--- a/metadata/md5-cache/dev-python/feedparser-5.2.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Parse RSS and Atom feeds in Python
-EAPI=7
-HOMEPAGE=https://github.com/kurtmckee/feedparser https://pypi.org/project/feedparser/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=BSD-2 PSF-2
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/f/feedparser/feedparser-5.2.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c11df47c5621d7b342b9dcc77d461fad
diff --git a/metadata/md5-cache/dev-python/feedparser-5.2.1-r2 b/metadata/md5-cache/dev-python/feedparser-5.2.1-r2
new file mode 100644
index 000000000000..a3835e2b234b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/feedparser-5.2.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=<dev-python/setuptools-58[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Parse RSS and Atom feeds in Python
+EAPI=7
+HOMEPAGE=https://github.com/kurtmckee/feedparser https://pypi.org/project/feedparser/
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=BSD-2 PSF-2
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/f/feedparser/feedparser-5.2.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bfe2a25baf266085e3bd09c5c8cb43df
diff --git a/metadata/md5-cache/dev-python/filelock-3.3.1 b/metadata/md5-cache/dev-python/filelock-3.3.1
new file mode 100644
index 000000000000..7d1befa2378f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/filelock-3.3.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A platform independent file lock for Python
+EAPI=8
+HOMEPAGE=https://github.com/tox-dev/py-filelock/ https://pypi.org/project/filelock/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Unlicense
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tox-dev/py-filelock/archive/3.3.1.tar.gz -> py-filelock-3.3.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=85d4c256b3de1070f141b9ed2f7103d6
diff --git a/metadata/md5-cache/dev-python/findimports-1.5.2 b/metadata/md5-cache/dev-python/findimports-1.5.2
deleted file mode 100644
index 087d904125b4..000000000000
--- a/metadata/md5-cache/dev-python/findimports-1.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python module import analysis tool
-EAPI=7
-HOMEPAGE=https://github.com/mgedmin/findimports
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/mgedmin/findimports/archive/1.5.2.tar.gz -> findimports-1.5.2.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5b79d73a162aed71857a0300d6768312
diff --git a/metadata/md5-cache/dev-python/findimports-2.0.0 b/metadata/md5-cache/dev-python/findimports-2.0.0
deleted file mode 100644
index 398f84bba107..000000000000
--- a/metadata/md5-cache/dev-python/findimports-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python module import analysis tool
-EAPI=7
-HOMEPAGE=https://github.com/mgedmin/findimports
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/mgedmin/findimports/archive/2.0.0.tar.gz -> findimports-2.0.0.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=101acba6becc3a0daf0685cb9c4f21aa
diff --git a/metadata/md5-cache/dev-python/flake8-4.0.0 b/metadata/md5-cache/dev-python/flake8-4.0.0
new file mode 100644
index 000000000000..b51f62f656de
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flake8-4.0.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pyflakes-2.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pyflakes-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycodestyle-2.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pycodestyle-2.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) test? ( >=dev-python/mccabe-0.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mccabe-0.7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-prompt[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-prompt[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-prompt[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx-prompt[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/pyflakes-2.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pyflakes-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycodestyle-2.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pycodestyle-2.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
+EAPI=8
+HOMEPAGE=https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+PDEPEND=>=dev-python/mccabe-0.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mccabe-0.7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+RDEPEND=>=dev-python/pyflakes-2.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pyflakes-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycodestyle-2.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pycodestyle-2.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/f/flake8/flake8-4.0.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c9f8ae8ed113d7a262f88c4e75553b31
diff --git a/metadata/md5-cache/dev-python/flake8-4.0.1 b/metadata/md5-cache/dev-python/flake8-4.0.1
new file mode 100644
index 000000000000..a06631d6656b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flake8-4.0.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pyflakes-2.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pyflakes-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycodestyle-2.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pycodestyle-2.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) test? ( >=dev-python/mccabe-0.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mccabe-0.7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-prompt[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-prompt[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-prompt[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx-prompt[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/pyflakes-2.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pyflakes-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycodestyle-2.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pycodestyle-2.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
+EAPI=8
+HOMEPAGE=https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+PDEPEND=>=dev-python/mccabe-0.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mccabe-0.7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+RDEPEND=>=dev-python/pyflakes-2.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pyflakes-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycodestyle-2.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pycodestyle-2.9.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/f/flake8/flake8-4.0.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c9f8ae8ed113d7a262f88c4e75553b31
diff --git a/metadata/md5-cache/dev-python/flake8-import-order-0.18 b/metadata/md5-cache/dev-python/flake8-import-order-0.18
deleted file mode 100644
index d55f6d4f9925..000000000000
--- a/metadata/md5-cache/dev-python/flake8-import-order-0.18
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pylama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Flake8 plugin that checks import order against various Python Style Guides
-EAPI=6
-HOMEPAGE=https://github.com/PyCQA/flake8-import-order
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/f/flake8-import-order/flake8-import-order-0.18.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6b8555997398d007a98157cad87cc7cb
diff --git a/metadata/md5-cache/dev-python/flask-api-2.0 b/metadata/md5-cache/dev-python/flask-api-2.0
deleted file mode 100644
index df6fa48efd6c..000000000000
--- a/metadata/md5-cache/dev-python/flask-api-2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markdown[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Browsable web APIs for Flask
-EAPI=7
-HOMEPAGE=https://www.flaskapi.org/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markdown[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/flask-api/flask-api/archive/v2.0.tar.gz -> flask-api-2.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2ddee7c38ad19ee8d7f0376c2badb600
diff --git a/metadata/md5-cache/dev-python/flask-htmlmin-2.2.0 b/metadata/md5-cache/dev-python/flask-htmlmin-2.2.0
new file mode 100644
index 000000000000..2b6602b1bcdf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-htmlmin-2.2.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-text/cssmin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-text/htmlmin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Minimize your flask rendered html
+EAPI=8
+HOMEPAGE=https://github.com/hamidfzm/Flask-HTMLmin
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-text/cssmin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-text/htmlmin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hamidfzm/Flask-HTMLmin/archive/v2.2.0.tar.gz -> Flask-HTMLmin-2.2.0.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b5b1af9bc36a5afae98e055d99ce377b
diff --git a/metadata/md5-cache/dev-python/flask-nav-0.6-r2 b/metadata/md5-cache/dev-python/flask-nav-0.6-r2
deleted file mode 100644
index 166fd8f7cabe..000000000000
--- a/metadata/md5-cache/dev-python/flask-nav-0.6-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/dominate[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/visitor[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/alabaster[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Easily create navigation for Flask applications.
-EAPI=7
-HOMEPAGE=https://pythonhosted.org/flask-nav/
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/dominate[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/visitor[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mbr/flask-nav/archive/0.6.tar.gz -> flask-nav-0.6.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9eb5d8237e60f6b389731faba900e0ba
diff --git a/metadata/md5-cache/dev-python/flask-security-4.1.0 b/metadata/md5-cache/dev-python/flask-security-4.1.0
deleted file mode 100644
index 2b60b8755883..000000000000
--- a/metadata/md5-cache/dev-python/flask-security-4.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/argon2-cffi-19.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/bcrypt-3.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/bleach[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-2.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-mail-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-sqlalchemy-2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mongomock-3.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/peewee-3.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/phonenumbers-8.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pony-0.7.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psycopg-2.8.4:2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pymysql-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyqrcode-1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/zxcvbn-4.4.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?] amd64? ( >=dev-python/flask-mongoengine-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) arm64? ( >=dev-python/flask-mongoengine-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) test? ( >=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cachetools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-babelex-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-login-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-principal-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-wtf-0.14.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/itsdangerous-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/passlib-1.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-email-validator-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simple security for Flask apps
-EAPI=8
-HOMEPAGE=https://github.com/Flask-Middleware/flask-security/ https://pypi.org/project/Flask-Security-Too/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cachetools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-babelex-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-login-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-principal-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-wtf-0.14.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/itsdangerous-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/passlib-1.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-email-validator-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Flask-Middleware/flask-security/archive/4.1.0.tar.gz -> flask-security-4.1.0.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fff8b9ab9122116fce6488836b724380
diff --git a/metadata/md5-cache/dev-python/flask-security-4.1.1 b/metadata/md5-cache/dev-python/flask-security-4.1.1
deleted file mode 100644
index ae635a60bdd5..000000000000
--- a/metadata/md5-cache/dev-python/flask-security-4.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/argon2-cffi-19.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/bcrypt-3.1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/bleach[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-2.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-mail-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-sqlalchemy-2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mongomock-3.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/peewee-3.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/phonenumbers-8.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pony-0.7.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psycopg-2.8.4:2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pymysql-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyqrcode-1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/zxcvbn-4.4.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?] amd64? ( >=dev-python/flask-mongoengine-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) arm64? ( >=dev-python/flask-mongoengine-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) test? ( >=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cachetools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-babelex-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-login-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-principal-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-wtf-0.14.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/itsdangerous-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/passlib-1.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-email-validator-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simple security for Flask apps
-EAPI=8
-HOMEPAGE=https://github.com/Flask-Middleware/flask-security/ https://pypi.org/project/Flask-Security-Too/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cachetools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-babelex-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-login-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-principal-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-wtf-0.14.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/itsdangerous-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/passlib-1.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-email-validator-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Flask-Middleware/flask-security/archive/4.1.1.tar.gz -> flask-security-4.1.1.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3ad943c1a34bdaf1ca09f23694c766bd
diff --git a/metadata/md5-cache/dev-python/flask-security-4.1.2 b/metadata/md5-cache/dev-python/flask-security-4.1.2
index 39af0a5259a8..4314e9b0a7ad 100644
--- a/metadata/md5-cache/dev-python/flask-security-4.1.2
+++ b/metadata/md5-cache/dev-python/flask-security-4.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Simple security for Flask apps
 EAPI=8
 HOMEPAGE=https://github.com/Flask-Middleware/flask-security/ https://pypi.org/project/Flask-Security-Too/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cachetools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-babelex-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-login-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-principal-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flask-wtf-0.14.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/itsdangerous-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/passlib-1.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-email-validator-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Flask-Middleware/flask-security/archive/4.1.2.tar.gz -> flask-security-4.1.2.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3ad943c1a34bdaf1ca09f23694c766bd
+_md5_=fff8b9ab9122116fce6488836b724380
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.10 b/metadata/md5-cache/dev-python/flexmock-0.10.10
index 5d04accd1ccb..15c76f837d8d 100644
--- a/metadata/md5-cache/dev-python/flexmock-0.10.10
+++ b/metadata/md5-cache/dev-python/flexmock-0.10.10
@@ -4,7 +4,7 @@ DESCRIPTION=Testing library to create mocks, stubs and fakes
 EAPI=8
 HOMEPAGE=https://flexmock.readthedocs.io/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~riscv
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flexmock/flexmock-0.10.10.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f38a2f29e7e6769f8c1afff91ae18b42
+_md5_=5f444042c9a916d2b8f02a4cbb712504
diff --git a/metadata/md5-cache/dev-python/flit-2.1.0 b/metadata/md5-cache/dev-python/flit-2.1.0
deleted file mode 100644
index c178e292f97a..000000000000
--- a/metadata/md5-cache/dev-python/flit-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=<dev-python/flit_core-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?] sys-apps/grep sys-apps/findutils test? ( >=dev-python/pytest-2.7.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) test? ( <dev-python/flit_core-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-)] dev-python/pygments-github-lexers[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinxcontrib-github-alt[python_targets_pypy3(-)] dev-python/pygments-github-lexers[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplified packaging of Python modules
-EAPI=7
-HOMEPAGE=https://github.com/takluyver/flit https://flit.readthedocs.io/
-IUSE=test test doc python_targets_pypy3 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=<dev-python/flit_core-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/f/flit/flit-2.1.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77225c7d7396fbecbc8487f5346c2fd7
diff --git a/metadata/md5-cache/dev-python/flit-3.2.0 b/metadata/md5-cache/dev-python/flit-3.2.0
deleted file mode 100644
index ea627ff8a6c1..000000000000
--- a/metadata/md5-cache/dev-python/flit-3.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep sys-apps/findutils test? ( dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/pygments-github-lexers[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/pygments-github-lexers[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-)] dev-python/pygments-github-lexers[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinxcontrib-github-alt[python_targets_pypy3(-)] dev-python/pygments-github-lexers[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplified packaging of Python modules
-EAPI=7
-HOMEPAGE=https://github.com/takluyver/flit https://flit.readthedocs.io/
-IUSE=test test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/f/flit/flit-3.2.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=35f288c6aee6a469993b299f8fa88848
diff --git a/metadata/md5-cache/dev-python/flit-3.3.0-r1 b/metadata/md5-cache/dev-python/flit-3.3.0-r1
deleted file mode 100644
index 59183863233b..000000000000
--- a/metadata/md5-cache/dev-python/flit-3.3.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep sys-apps/findutils test? ( dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/pygments-github-lexers[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/pygments-github-lexers[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-)] dev-python/pygments-github-lexers[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinxcontrib-github-alt[python_targets_pypy3(-)] dev-python/pygments-github-lexers[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplified packaging of Python modules
-EAPI=8
-HOMEPAGE=https://github.com/takluyver/flit https://flit.readthedocs.io/
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/f/flit/flit-3.3.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5e50735d9406976a75638afaf9f8fe35
diff --git a/metadata/md5-cache/dev-python/flit-3.4.0 b/metadata/md5-cache/dev-python/flit-3.4.0
new file mode 100644
index 000000000000..d17eab59110a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flit-3.4.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep sys-apps/findutils test? ( dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/pygments-github-lexers[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/pygments-github-lexers[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-)] dev-python/pygments-github-lexers[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinxcontrib-github-alt[python_targets_pypy3(-)] dev-python/pygments-github-lexers[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simplified packaging of Python modules
+EAPI=8
+HOMEPAGE=https://github.com/takluyver/flit https://flit.readthedocs.io/
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/f/flit/flit-3.4.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e38a234ed82cb488f2628ec1d3f3a40b
diff --git a/metadata/md5-cache/dev-python/flit_core-2.1.0 b/metadata/md5-cache/dev-python/flit_core-2.1.0
deleted file mode 100644
index 2dcf7f98722f..000000000000
--- a/metadata/md5-cache/dev-python/flit_core-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?] test? ( dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) test? ( dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplified packaging of Python modules (core module)
-EAPI=7
-HOMEPAGE=https://pypi.org/project/flit-core/
-IUSE=test test python_targets_pypy3 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/f/flit_core/flit_core-2.1.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ac04d3fed6f30e8316349a723d4ef2e8
diff --git a/metadata/md5-cache/dev-python/flit_core-3.2.0 b/metadata/md5-cache/dev-python/flit_core-3.2.0
deleted file mode 100644
index a7f4370aa6a2..000000000000
--- a/metadata/md5-cache/dev-python/flit_core-3.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplified packaging of Python modules (core module)
-EAPI=7
-HOMEPAGE=https://pypi.org/project/flit-core/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/f/flit_core/flit_core-3.2.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=63cccf6d0d5ea30e9673782a3444412a
diff --git a/metadata/md5-cache/dev-python/flit_core-3.3.0 b/metadata/md5-cache/dev-python/flit_core-3.3.0
deleted file mode 100644
index 0cbb4aa3f201..000000000000
--- a/metadata/md5-cache/dev-python/flit_core-3.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pyproject2setuppy-11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simplified packaging of Python modules (core module)
-EAPI=8
-HOMEPAGE=https://pypi.org/project/flit-core/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/f/flit_core/flit_core-3.3.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dfd845f59f4bdbeda7dea2e5fe0ed0d6
diff --git a/metadata/md5-cache/dev-python/flit_core-3.4.0 b/metadata/md5-cache/dev-python/flit_core-3.4.0
new file mode 100644
index 000000000000..20092b716b3a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flit_core-3.4.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pyproject2setuppy-11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simplified packaging of Python modules (core module)
+EAPI=8
+HOMEPAGE=https://pypi.org/project/flit-core/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/f/flit_core/flit_core-3.4.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8eb6733b3942971af00e09eaddf75ac3
diff --git a/metadata/md5-cache/dev-python/flufl-bounce-3.0.1 b/metadata/md5-cache/dev-python/flufl-bounce-3.0.1
deleted file mode 100644
index 4356011071aa..000000000000
--- a/metadata/md5-cache/dev-python/flufl-bounce-3.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Email bounce detectors.
-EAPI=7
-HOMEPAGE=https://gitlab.com/warsaw/flufl.bounce
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/atpublic[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/f/flufl.bounce/flufl.bounce-3.0.1.tar.gz -> flufl-bounce-3.0.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5287534a201b3623e956a1eaa45effd4
diff --git a/metadata/md5-cache/dev-python/flufl-i18n-2.0.2 b/metadata/md5-cache/dev-python/flufl-i18n-2.0.2
deleted file mode 100644
index 102b8823ecc5..000000000000
--- a/metadata/md5-cache/dev-python/flufl-i18n-2.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?]
-DESCRIPTION=A high level API for Python internationalization.
-EAPI=7
-HOMEPAGE=https://gitlab.com/warsaw/flufl.i18n
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/atpublic[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/f/flufl.i18n/flufl.i18n-2.0.2.tar.gz -> flufl-i18n-2.0.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=febb595bae06f1ff358058033e8095a3
diff --git a/metadata/md5-cache/dev-python/flufl-i18n-3.1.4 b/metadata/md5-cache/dev-python/flufl-i18n-3.1.4
deleted file mode 100644
index 1b5bbd752a22..000000000000
--- a/metadata/md5-cache/dev-python/flufl-i18n-3.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/sybil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/atpublic[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A high level API for Python internationalization
-EAPI=7
-HOMEPAGE=https://gitlab.com/warsaw/flufl.i18n
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/atpublic[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/f/flufl.i18n/flufl.i18n-3.1.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=debc9fd48b26b97b887b334fa78dfe3d
diff --git a/metadata/md5-cache/dev-python/flufl-i18n-3.1.5 b/metadata/md5-cache/dev-python/flufl-i18n-3.1.5
deleted file mode 100644
index e64062bf44b5..000000000000
--- a/metadata/md5-cache/dev-python/flufl-i18n-3.1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/sybil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/atpublic[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A high level API for Python internationalization
-EAPI=7
-HOMEPAGE=https://gitlab.com/warsaw/flufl.i18n
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/atpublic[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/f/flufl.i18n/flufl.i18n-3.1.5.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=debc9fd48b26b97b887b334fa78dfe3d
diff --git a/metadata/md5-cache/dev-python/flufl-lock-5.1 b/metadata/md5-cache/dev-python/flufl-lock-5.1
deleted file mode 100644
index ebee0d4be940..000000000000
--- a/metadata/md5-cache/dev-python/flufl-lock-5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/sybil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/atpublic[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=NFS-safe file locking with timeouts for POSIX systems
-EAPI=7
-HOMEPAGE=https://gitlab.com/warsaw/flufl.lock
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/atpublic[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/f/flufl.lock/flufl.lock-5.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f2ebe18c324d9aab7b5a2228306042bb
diff --git a/metadata/md5-cache/dev-python/fqdn-1.5.1 b/metadata/md5-cache/dev-python/fqdn-1.5.1
index 842f7b7c6484..d8a23cf1890f 100644
--- a/metadata/md5-cache/dev-python/fqdn-1.5.1
+++ b/metadata/md5-cache/dev-python/fqdn-1.5.1
@@ -4,7 +4,7 @@ DESCRIPTION=RFC-compliant FQDN validation and manipulation for Python
 EAPI=7
 HOMEPAGE=https://github.com/ypcrts/fqdn
 IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MPL-2.0
 RDEPEND=python_targets_pypy3? ( dev-python/cached-property[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ypcrts/fqdn/archive/v1.5.1.tar.gz -> fqdn-1.5.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ce7dcfe696c46069e8f74918643b3198
+_md5_=5abfc2a91eb0090991b6fbf899b5958c
diff --git a/metadata/md5-cache/dev-python/fritzconnection-1.5.0 b/metadata/md5-cache/dev-python/fritzconnection-1.5.0
deleted file mode 100644
index 5d999a886417..000000000000
--- a/metadata/md5-cache/dev-python/fritzconnection-1.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/requests-2.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/requests-2.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP
-EAPI=7
-HOMEPAGE=https://github.com/kbr/fritzconnection
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/requests-2.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/kbr/fritzconnection/archive/1.5.0.tar.gz -> fritzconnection-1.5.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea471e9c476cde364c7f379c13b5a617
diff --git a/metadata/md5-cache/dev-python/fritzconnection-1.6.0 b/metadata/md5-cache/dev-python/fritzconnection-1.6.0
deleted file mode 100644
index 4595f41cff04..000000000000
--- a/metadata/md5-cache/dev-python/fritzconnection-1.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/requests-2.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP
-EAPI=8
-HOMEPAGE=https://github.com/kbr/fritzconnection
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/requests-2.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/kbr/fritzconnection/archive/1.6.0.tar.gz -> fritzconnection-1.6.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4aa0ac40bd3d783b4d15c27fbcf52c4d
diff --git a/metadata/md5-cache/dev-python/fritzconnection-1.7.0 b/metadata/md5-cache/dev-python/fritzconnection-1.7.0
deleted file mode 100644
index fd4634a9cd81..000000000000
--- a/metadata/md5-cache/dev-python/fritzconnection-1.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/requests-2.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP
-EAPI=8
-HOMEPAGE=https://github.com/kbr/fritzconnection
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/requests-2.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/kbr/fritzconnection/archive/1.7.0.tar.gz -> fritzconnection-1.7.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4aa0ac40bd3d783b4d15c27fbcf52c4d
diff --git a/metadata/md5-cache/dev-python/fritzconnection-1.7.1 b/metadata/md5-cache/dev-python/fritzconnection-1.7.1
new file mode 100644
index 000000000000..27d8218bbc04
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fritzconnection-1.7.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/requests-2.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP
+EAPI=8
+HOMEPAGE=https://github.com/kbr/fritzconnection
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/requests-2.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/kbr/fritzconnection/archive/1.7.1.tar.gz -> fritzconnection-1.7.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4aa0ac40bd3d783b4d15c27fbcf52c4d
diff --git a/metadata/md5-cache/dev-python/fsspec-2021.07.0 b/metadata/md5-cache/dev-python/fsspec-2021.07.0
deleted file mode 100644
index c121d220d5ae..000000000000
--- a/metadata/md5-cache/dev-python/fsspec-2021.07.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A specification that python filesystems should adhere to
-EAPI=7
-HOMEPAGE=https://github.com/intake/filesystem_spec/ https://pypi.org/project/fsspec/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/intake/filesystem_spec/archive/2021.07.0.tar.gz -> filesystem_spec-2021.07.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2a3eee16e0e43d380e316fbc14f98ab6
diff --git a/metadata/md5-cache/dev-python/fsspec-2021.08.1 b/metadata/md5-cache/dev-python/fsspec-2021.08.1
index 888d98f88710..bd8029cedac4 100644
--- a/metadata/md5-cache/dev-python/fsspec-2021.08.1
+++ b/metadata/md5-cache/dev-python/fsspec-2021.08.1
@@ -4,7 +4,7 @@ DESCRIPTION=A specification that python filesystems should adhere to
 EAPI=8
 HOMEPAGE=https://github.com/intake/filesystem_spec/ https://pypi.org/project/fsspec/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intake/filesystem_spec/archive/2021.08.1.tar.gz -> filesystem_spec-2021.08.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=282831ab9138d939fbab528b4ad441fa
+_md5_=1206df64b52a335701148afc5e72a50e
diff --git a/metadata/md5-cache/dev-python/fsspec-2021.10.1 b/metadata/md5-cache/dev-python/fsspec-2021.10.1
new file mode 100644
index 000000000000..3ed3bbbde443
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fsspec-2021.10.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A specification that python filesystems should adhere to
+EAPI=8
+HOMEPAGE=https://github.com/intake/filesystem_spec/ https://pypi.org/project/fsspec/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/intake/filesystem_spec/archive/2021.10.1.tar.gz -> filesystem_spec-2021.10.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=30cdcf501282b29aef79c6941ecc6967
diff --git a/metadata/md5-cache/dev-python/fudge-1.1.1 b/metadata/md5-cache/dev-python/fudge-1.1.1
deleted file mode 100644
index 5b32682fbd03..000000000000
--- a/metadata/md5-cache/dev-python/fudge-1.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Replace real objects with fakes (mocks, stubs, etc) while testing
-EAPI=7
-HOMEPAGE=http://farmdev.com/projects/fudge/ https://pypi.org/project/fudge/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/f/fudge/fudge-1.1.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0849b139cabf62c5bdd2a14f391c322b
diff --git a/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1 b/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
deleted file mode 100644
index fc90a06da292..000000000000
--- a/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Recursive descent parsing library based on functional combinators
-EAPI=7
-HOMEPAGE=https://pypi.org/project/funcparserlib/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/f/funcparserlib/funcparserlib-0.3.6.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7db4798c42ecdd919ec21c5ff3e730b3
diff --git a/metadata/md5-cache/dev-python/funcparserlib-0.3.6_p20210809 b/metadata/md5-cache/dev-python/funcparserlib-0.3.6_p20210809
index 7e98f6c19ed0..49b165f860f7 100644
--- a/metadata/md5-cache/dev-python/funcparserlib-0.3.6_p20210809
+++ b/metadata/md5-cache/dev-python/funcparserlib-0.3.6_p20210809
@@ -4,7 +4,7 @@ DESCRIPTION=Recursive descent parsing library based on functional combinators
 EAPI=8
 HOMEPAGE=https://pypi.org/project/funcparserlib/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vlasovskikh/funcparserlib/archive/d4ba3955ffc10544dbae6aaed68bcab21d0c294b.tar.gz -> funcparserlib-0.3.6_p20210809.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c7caa3fc43a4f2a43661d26ba337f869
+_md5_=42a0c667e874a8a93c8fe6c6d0e6f9dd
diff --git a/metadata/md5-cache/dev-python/furo-2021.10.9 b/metadata/md5-cache/dev-python/furo-2021.10.9
new file mode 100644
index 000000000000..71bfa03e7b7c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/furo-2021.10.9
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Clean customisable Sphinx documentation theme
+EAPI=8
+HOMEPAGE=https://pypi.org/project/furo/ https://github.com/pradyunsg/furo
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/f/furo/furo-2021.10.9.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b1e8fd88773120540d210d60293d9126
diff --git a/metadata/md5-cache/dev-python/fuse-python-1.0.0 b/metadata/md5-cache/dev-python/fuse-python-1.0.0
deleted file mode 100644
index 7e62cd98ea82..000000000000
--- a/metadata/md5-cache/dev-python/fuse-python-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-fs/fuse:0=
-DESCRIPTION=Python FUSE bindings
-EAPI=7
-HOMEPAGE=https://github.com/libfuse/python-fuse
-IUSE=python_targets_pypy3 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/fuse:0= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/libfuse/python-fuse/archive/v1.0.0.tar.gz -> fuse-python-1.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f0ed58ff87e92a3832fc10de5a06a6a8
diff --git a/metadata/md5-cache/dev-python/gast-0.5.2 b/metadata/md5-cache/dev-python/gast-0.5.2
index 3c713a1e6946..767caeaa2463 100644
--- a/metadata/md5-cache/dev-python/gast-0.5.2
+++ b/metadata/md5-cache/dev-python/gast-0.5.2
@@ -4,7 +4,7 @@ DESCRIPTION=A generic AST to represent Python2 and Python3's Abstract Syntax Tre
 EAPI=8
 HOMEPAGE=https://pypi.org/project/gast/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gast/gast-0.5.2.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3e17ed46290cbfcd2d31c20ca9e22e3d
+_md5_=750128c88e1150498fda3932d5648298
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1
deleted file mode 100644
index 1b8fc5915cc3..000000000000
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?] dev-python/mock[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library
-EAPI=7
-HOMEPAGE=https://pypi.org/project/gcs-oauth2-boto-plugin/
-IUSE=test python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/boto-2.29.1[python_targets_python3_8(-)?] dev-python/google-reauth-python[python_targets_python3_8(-)?] >=dev-python/httplib2-0.8[python_targets_python3_8(-)?] >=dev-python/oauth2client-1.5.2[python_targets_python3_8(-)?] !=dev-python/oauth2client-2.0* >=dev-python/pyopenssl-0.13[python_targets_python3_8(-)?] >=dev-python/retry-decorator-1.0.0[python_targets_python3_8(-)?] >=dev-python/PySocks-1.01[python_targets_python3_8(-)?] >=dev-python/six-1.12.0[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=36eb1ae11da50a9246d2b3219fc0367a
diff --git a/metadata/md5-cache/dev-python/geventhttpclient-1.5.1 b/metadata/md5-cache/dev-python/geventhttpclient-1.5.1
deleted file mode 100644
index 58f9e5a936af..000000000000
--- a/metadata/md5-cache/dev-python/geventhttpclient-1.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[events(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A high performance, concurrent HTTP client library for Python using gevent
-EAPI=8
-HOMEPAGE=https://github.com/gwik/geventhttpclient
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[events(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/geventhttpclient/geventhttpclient-1.5.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2c98012eb1db422cb7ac81df8d252000
diff --git a/metadata/md5-cache/dev-python/geventhttpclient-1.5.3 b/metadata/md5-cache/dev-python/geventhttpclient-1.5.3
new file mode 100644
index 000000000000..619bc341bf25
--- /dev/null
+++ b/metadata/md5-cache/dev-python/geventhttpclient-1.5.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[events(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A high performance, concurrent HTTP client library for Python using gevent
+EAPI=8
+HOMEPAGE=https://github.com/gwik/geventhttpclient
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[events(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/g/geventhttpclient/geventhttpclient-1.5.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2c98012eb1db422cb7ac81df8d252000
diff --git a/metadata/md5-cache/dev-python/git-review-1.28.0 b/metadata/md5-cache/dev-python/git-review-1.28.0
deleted file mode 100644
index 43bd8c657709..000000000000
--- a/metadata/md5-cache/dev-python/git-review-1.28.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-0.8.0[python_targets_python3_8(-)?]
-DESCRIPTION=Tool to submit code to Gerrit
-EAPI=7
-HOMEPAGE=https://git.openstack.org/cgit/openstack-infra/git-review
-IUSE=python_targets_python3_8
-KEYWORDS=amd64 x86 ~x64-cygwin ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-1.1[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/g/git-review/git-review-1.28.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9ab923e4564cd1eaca758895c816476f
diff --git a/metadata/md5-cache/dev-python/github3-1.3.0 b/metadata/md5-cache/dev-python/github3-1.3.0
deleted file mode 100644
index 9674f06caf9f..000000000000
--- a/metadata/md5-cache/dev-python/github3-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/betamax-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/betamax-matchers-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-vcs/git >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jwcrypto-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A wrapper for the GitHub API written in python
-EAPI=7
-HOMEPAGE=https://github3py.readthedocs.io/en/master/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-vcs/git >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jwcrypto-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sigmavirus24/github3.py/archive/1.3.0.tar.gz -> github3-1.3.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4e069a54dedd7adc899c24a41cd20ce0
diff --git a/metadata/md5-cache/dev-python/github3-2.0.0 b/metadata/md5-cache/dev-python/github3-2.0.0
new file mode 100644
index 000000000000..51faed096a84
--- /dev/null
+++ b/metadata/md5-cache/dev-python/github3-2.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/betamax-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/betamax-matchers-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-vcs/git >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jwcrypto-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A wrapper for the GitHub API written in python
+EAPI=8
+HOMEPAGE=https://github3py.readthedocs.io/en/master/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-vcs/git >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jwcrypto-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sigmavirus24/github3.py/archive/2.0.0.tar.gz -> github3-2.0.0.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4f97060f1bd32c10b252aa4d7adf987c
diff --git a/metadata/md5-cache/dev-python/glob2-0.7 b/metadata/md5-cache/dev-python/glob2-0.7
new file mode 100644
index 000000000000..a1147bfeac0e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/glob2-0.7
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extended version of Python's builtin glob module
+EAPI=8
+HOMEPAGE=https://pypi.org/project/glob2/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/g/glob2/glob2-0.7.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=adbb8399338a705bab9e6ccf743c8c28
diff --git a/metadata/md5-cache/dev-python/google-api-core-2.1.1 b/metadata/md5-cache/dev-python/google-api-core-2.1.1
new file mode 100644
index 000000000000..9e6851734ef0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-core-2.1.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/grpcio-1.33.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/googleapis-common-protos[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/requests-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Core Library for Google Client Libraries
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/python-api-core/ https://googleapis.dev/python/google-api-core/latest/index.html
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/googleapis-common-protos[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/requests-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/python-api-core/archive/v2.1.1.tar.gz -> google-api-core-2.1.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fc2ad44787b469c4c06d3905329a0298
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.19.1 b/metadata/md5-cache/dev-python/google-api-python-client-2.19.1
deleted file mode 100644
index dcbc3cd4e775..000000000000
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google API Client for Python
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-api-python-client
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.19.1.tar.gz -> google-api-python-client-2.19.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=519f5e2c7aa7b5ca36ba406f7d94b040
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.20.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.20.0
deleted file mode 100644
index a3274574c7e0..000000000000
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.20.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google API Client for Python
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-api-python-client
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.20.0.tar.gz -> google-api-python-client-2.20.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8abbbdb6e29d0b0db60ffb2569384fd6
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.21.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.21.0
deleted file mode 100644
index 6bc9d8064a8e..000000000000
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.21.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google API Client for Python
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-api-python-client
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.21.0.tar.gz -> google-api-python-client-2.21.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8abbbdb6e29d0b0db60ffb2569384fd6
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.22.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.22.0
index 4a0791f7634e..a164dae01539 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.22.0
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.22.0
@@ -4,7 +4,7 @@ DESCRIPTION=Google API Client for Python
 EAPI=8
 HOMEPAGE=https://github.com/googleapis/google-api-python-client
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.22.0.tar.gz -> google-api-python-client-2.22.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8abbbdb6e29d0b0db60ffb2569384fd6
+_md5_=519f5e2c7aa7b5ca36ba406f7d94b040
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.25.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.25.0
new file mode 100644
index 000000000000..c0b7f800d9da
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.25.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google API Client for Python
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-api-python-client
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.25.0.tar.gz -> google-api-python-client-2.25.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8abbbdb6e29d0b0db60ffb2569384fd6
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.26.1 b/metadata/md5-cache/dev-python/google-api-python-client-2.26.1
new file mode 100644
index 000000000000..4c32e2614b4e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.26.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google API Client for Python
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-api-python-client
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.26.1.tar.gz -> google-api-python-client-2.26.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cdce9d9772657a35ccbd7ad927e0adfe
diff --git a/metadata/md5-cache/dev-python/google-auth-2.0.2 b/metadata/md5-cache/dev-python/google-auth-2.0.2
deleted file mode 100644
index fa0f19d69d86..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-2.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Authentication Library
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/google-auth/google-auth-2.0.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fe145752b61ec75a8a03df40e32209d0
diff --git a/metadata/md5-cache/dev-python/google-auth-2.1.0 b/metadata/md5-cache/dev-python/google-auth-2.1.0
index 6d5cee035758..fb3f7855ab0e 100644
--- a/metadata/md5-cache/dev-python/google-auth-2.1.0
+++ b/metadata/md5-cache/dev-python/google-auth-2.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Google Authentication Library
 EAPI=8
 HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-2.1.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1f4be6b82d9bf907acde91702ae062c0
+_md5_=fe145752b61ec75a8a03df40e32209d0
diff --git a/metadata/md5-cache/dev-python/google-auth-2.3.0 b/metadata/md5-cache/dev-python/google-auth-2.3.0
index d9e58525ffec..51e5b631d1cd 100644
--- a/metadata/md5-cache/dev-python/google-auth-2.3.0
+++ b/metadata/md5-cache/dev-python/google-auth-2.3.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Google Authentication Library
 EAPI=8
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-2.3.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1f4be6b82d9bf907acde91702ae062c0
+_md5_=1434b212f17b38dfbdfe796fdc630254
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1
deleted file mode 100644
index 2c8e29c04d0c..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/click[python_targets_python3_8(-)?] dev-python/google-auth[python_targets_python3_8(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?] )
-DESCRIPTION=Google Authentication Library
-EAPI=7
-HOMEPAGE=https://pypi.org/project/google-auth-oauthlib/ https://github.com/googleapis/google-auth-library-python-oauthlib
-IUSE=test python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/click[python_targets_python3_8(-)?] dev-python/google-auth[python_targets_python3_8(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/google-auth-oauthlib/google-auth-oauthlib/google-auth-oauthlib-0.4.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5a45cfda6ac04226a0af3f02aa2f3c92
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.3 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.3
deleted file mode 100644
index c78cf8537fdb..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/click-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Authentication Library
-EAPI=7
-HOMEPAGE=https://pypi.org/project/google-auth-oauthlib/ https://github.com/googleapis/google-auth-library-python-oauthlib
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/click-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v0.4.3.tar.gz -> google-auth-library-python-oauthlib-0.4.3.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b57072adfbef0f4985a82f7cce1f5cd2
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.4 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.4
deleted file mode 100644
index d59e958043ed..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/click-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Authentication Library
-EAPI=7
-HOMEPAGE=https://pypi.org/project/google-auth-oauthlib/ https://github.com/googleapis/google-auth-library-python-oauthlib
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/click-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v0.4.4.tar.gz -> google-auth-library-python-oauthlib-0.4.4.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b57072adfbef0f4985a82f7cce1f5cd2
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.5 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.5
deleted file mode 100644
index 39bbb9cede39..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/click-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Authentication Library
-EAPI=8
-HOMEPAGE=https://pypi.org/project/google-auth-oauthlib/ https://github.com/googleapis/google-auth-library-python-oauthlib
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/click-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-auth-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v0.4.5.tar.gz -> google-auth-library-python-oauthlib-0.4.5.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d4f76d464ca2b993ee8ad0032f090ec3
diff --git a/metadata/md5-cache/dev-python/google-pasta-0.2.0 b/metadata/md5-cache/dev-python/google-pasta-0.2.0
deleted file mode 100644
index f57d31b9e01e..000000000000
--- a/metadata/md5-cache/dev-python/google-pasta-0.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/six[python_targets_python3_8(-)?] dev-python/setuptools[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=AST-based Python refactoring library
-EAPI=7
-HOMEPAGE=https://pypi.org/project/google-pasta/
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/g/google-pasta/google-pasta-0.2.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c6fb90e6f19af1d9178fde98062b852f
diff --git a/metadata/md5-cache/dev-python/google-reauth-python-0.1.0-r1 b/metadata/md5-cache/dev-python/google-reauth-python-0.1.0-r1
deleted file mode 100644
index ed096a866bd0..000000000000
--- a/metadata/md5-cache/dev-python/google-reauth-python-0.1.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/oauth2client[python_targets_python3_8(-)?] dev-python/pyu2f[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/oauth2client[python_targets_python3_8(-)?] dev-python/pyu2f[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] dev-python/setuptools[python_targets_python3_8(-)?] test? ( dev-python/pytest[python_targets_python3_8(-)?] dev-python/mock[python_targets_python3_8(-)?] )
-DESCRIPTION=Python based U2F host library
-EAPI=7
-HOMEPAGE=https://github.com/google/google-reauth-python
-IUSE=test test python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/oauth2client[python_targets_python3_8(-)?] dev-python/pyu2f[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/google-reauth-python/archive/0.1.0.tar.gz -> google-reauth-python-0.1.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cab9889d9d5ccaeab094131a926a1ee8
diff --git a/metadata/md5-cache/dev-python/gsd-2.4.1 b/metadata/md5-cache/dev-python/gsd-2.4.1
deleted file mode 100644
index 2a07539f39e2..000000000000
--- a/metadata/md5-cache/dev-python/gsd-2.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=GSD - file format specification and a library to read and write it
-EAPI=7
-HOMEPAGE=https://github.com/glotzerlab/gsd
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/glotzerlab/gsd/releases/download/v2.4.1/gsd-v2.4.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=041dd536d1959172b1be85d62cd62759
diff --git a/metadata/md5-cache/dev-python/gsd-2.4.2 b/metadata/md5-cache/dev-python/gsd-2.4.2
deleted file mode 100644
index beaef3501577..000000000000
--- a/metadata/md5-cache/dev-python/gsd-2.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=GSD - file format specification and a library to read and write it
-EAPI=7
-HOMEPAGE=https://github.com/glotzerlab/gsd
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/glotzerlab/gsd/releases/download/v2.4.2/gsd-v2.4.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=26fd2315d87fa43ec619097ecfe396eb
diff --git a/metadata/md5-cache/dev-python/gsd-2.5.0 b/metadata/md5-cache/dev-python/gsd-2.5.0
new file mode 100644
index 000000000000..14c4dd23be8a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gsd-2.5.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=GSD - file format specification and a library to read and write it
+EAPI=8
+HOMEPAGE=https://github.com/glotzerlab/gsd
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/glotzerlab/gsd/releases/download/v2.5.0/gsd-v2.5.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6f4a2998e004cfdbb01a0d4d4c498ea4
diff --git a/metadata/md5-cache/dev-python/hiredis-2.0.0 b/metadata/md5-cache/dev-python/hiredis-2.0.0
index ad4861b1b2f8..8e45294bc98f 100644
--- a/metadata/md5-cache/dev-python/hiredis-2.0.0
+++ b/metadata/md5-cache/dev-python/hiredis-2.0.0
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 SLOT=0
 SRC_URI=mirror://pypi/h/hiredis/hiredis-2.0.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d4fd65b48016af1b2e81fb00355b047e
+_md5_=f65bd1435bebd2870083bb00ae99dc15
diff --git a/metadata/md5-cache/dev-python/httpcore-0.12.3 b/metadata/md5-cache/dev-python/httpcore-0.12.3
deleted file mode 100644
index af23982ca4e8..000000000000
--- a/metadata/md5-cache/dev-python/httpcore-0.12.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( =dev-python/h11-0*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/sniffio-1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A minimal low-level HTTP client
-EAPI=7
-HOMEPAGE=https://www.encode.io/httpcore/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND==dev-python/h11-0*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/sniffio-1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/encode/httpcore/archive/0.12.3.tar.gz -> httpcore-0.12.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3c92ea31825f485c048c1023d043d97d
diff --git a/metadata/md5-cache/dev-python/httpcore-0.13.0 b/metadata/md5-cache/dev-python/httpcore-0.13.0
deleted file mode 100644
index 98e714ada206..000000000000
--- a/metadata/md5-cache/dev-python/httpcore-0.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( =dev-python/h11-0*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/sniffio-1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A minimal low-level HTTP client
-EAPI=7
-HOMEPAGE=https://www.encode.io/httpcore/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND==dev-python/h11-0*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/sniffio-1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/encode/httpcore/archive/0.13.0.tar.gz -> httpcore-0.13.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b6944f02279382a21fcc152d76cf0f70
diff --git a/metadata/md5-cache/dev-python/httpcore-0.13.1 b/metadata/md5-cache/dev-python/httpcore-0.13.1
deleted file mode 100644
index 538026490f7e..000000000000
--- a/metadata/md5-cache/dev-python/httpcore-0.13.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( =dev-python/h11-0*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/sniffio-1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A minimal low-level HTTP client
-EAPI=7
-HOMEPAGE=https://www.encode.io/httpcore/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND==dev-python/h11-0*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/sniffio-1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/encode/httpcore/archive/0.13.1.tar.gz -> httpcore-0.13.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b6944f02279382a21fcc152d76cf0f70
diff --git a/metadata/md5-cache/dev-python/httpcore-0.13.2 b/metadata/md5-cache/dev-python/httpcore-0.13.2
deleted file mode 100644
index 4278964f3f46..000000000000
--- a/metadata/md5-cache/dev-python/httpcore-0.13.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( =dev-python/h11-0*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/sniffio-1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A minimal low-level HTTP client
-EAPI=7
-HOMEPAGE=https://www.encode.io/httpcore/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND==dev-python/h11-0*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/sniffio-1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/encode/httpcore/archive/0.13.2.tar.gz -> httpcore-0.13.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b6944f02279382a21fcc152d76cf0f70
diff --git a/metadata/md5-cache/dev-python/httpcore-0.13.6 b/metadata/md5-cache/dev-python/httpcore-0.13.6
index 6b1b52a27cf0..43fbcdbe3c8e 100644
--- a/metadata/md5-cache/dev-python/httpcore-0.13.6
+++ b/metadata/md5-cache/dev-python/httpcore-0.13.6
@@ -4,7 +4,7 @@ DESCRIPTION=A minimal low-level HTTP client
 EAPI=7
 HOMEPAGE=https://www.encode.io/httpcore/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86
 LICENSE=BSD
 RDEPEND==dev-python/anyio-3*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/h11-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/h2-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/sniffio-1*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/httpcore/archive/0.13.6.tar.gz -> httpcore-0.13.6.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4b931b5e4546840f2884f7b039a7e99c
+_md5_=f0de6d1e126ea389a6fd0fabd0a69379
diff --git a/metadata/md5-cache/dev-python/humanfriendly-8.2 b/metadata/md5-cache/dev-python/humanfriendly-8.2
deleted file mode 100644
index 444d24c2b84f..000000000000
--- a/metadata/md5-cache/dev-python/humanfriendly-8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/capturer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coloredlogs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Human friendly output for text interfaces using Python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/humanfriendly/ https://github.com/xolox/python-humanfriendly/ https://humanfriendly.readthedocs.io/
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/h/humanfriendly/humanfriendly-8.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=30bda4208e8e382ffbd9261d2ab5e470
diff --git a/metadata/md5-cache/dev-python/humanfriendly-9.1 b/metadata/md5-cache/dev-python/humanfriendly-9.1
deleted file mode 100644
index 0b82924a9bdc..000000000000
--- a/metadata/md5-cache/dev-python/humanfriendly-9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/capturer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/coloredlogs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Human friendly output for text interfaces using Python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/humanfriendly/ https://github.com/xolox/python-humanfriendly/ https://humanfriendly.readthedocs.io/
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/h/humanfriendly/humanfriendly-9.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=018ba1599ba5abc71c7b6289d73f4bff
diff --git a/metadata/md5-cache/dev-python/humanfriendly-9.2 b/metadata/md5-cache/dev-python/humanfriendly-9.2
deleted file mode 100644
index f6647bf927f4..000000000000
--- a/metadata/md5-cache/dev-python/humanfriendly-9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/capturer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/coloredlogs-15.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10[threads(+)] dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Human friendly output for text interfaces using Python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/humanfriendly/ https://github.com/xolox/python-humanfriendly/ https://humanfriendly.readthedocs.io/
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/h/humanfriendly/humanfriendly-9.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4c1c5e829ba62a7b6a8e6663a09bf4b1
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.23.2 b/metadata/md5-cache/dev-python/hypothesis-6.23.2
new file mode 100644
index 000000000000..b571ec53be0f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.23.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.23.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b123675b63bca072c5d90e163a8637ab
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.23.3 b/metadata/md5-cache/dev-python/hypothesis-6.23.3
new file mode 100644
index 000000000000..a84fffa0a7d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.23.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.23.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b123675b63bca072c5d90e163a8637ab
diff --git a/metadata/md5-cache/dev-python/icalendar-4.0.9 b/metadata/md5-cache/dev-python/icalendar-4.0.9
new file mode 100644
index 000000000000..225e83210807
--- /dev/null
+++ b/metadata/md5-cache/dev-python/icalendar-4.0.9
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Package used for parsing and generating iCalendar files (RFC 2445)
+EAPI=8
+HOMEPAGE=https://github.com/collective/icalendar
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/icalendar/icalendar-4.0.9.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9f7ab5a15c5e2ce390c8edadafcf56df
diff --git a/metadata/md5-cache/dev-python/identify-2.2.13 b/metadata/md5-cache/dev-python/identify-2.2.13
deleted file mode 100644
index 9b0df017aa51..000000000000
--- a/metadata/md5-cache/dev-python/identify-2.2.13
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/editdistance-s[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=File identification library for Python
-EAPI=8
-HOMEPAGE=https://github.com/pre-commit/identify
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=dev-python/editdistance-s[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pre-commit/identify/archive/refs/tags/v2.2.13.tar.gz -> identify-2.2.13.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=255cfdb74c8cb5f9ee70d7cd6e8bf865
diff --git a/metadata/md5-cache/dev-python/identify-2.2.14 b/metadata/md5-cache/dev-python/identify-2.2.14
index 21f1ada62876..7c634bf25112 100644
--- a/metadata/md5-cache/dev-python/identify-2.2.14
+++ b/metadata/md5-cache/dev-python/identify-2.2.14
@@ -4,7 +4,7 @@ DESCRIPTION=File identification library for Python
 EAPI=8
 HOMEPAGE=https://github.com/pre-commit/identify
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-python/editdistance-s[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pre-commit/identify/archive/refs/tags/v2.2.14.tar.gz -> identify-2.2.14.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7c4fcef28f7f81e53a4da71116ec01ce
+_md5_=255cfdb74c8cb5f9ee70d7cd6e8bf865
diff --git a/metadata/md5-cache/dev-python/idna-3.3 b/metadata/md5-cache/dev-python/idna-3.3
new file mode 100644
index 000000000000..1a26cf78ea95
--- /dev/null
+++ b/metadata/md5-cache/dev-python/idna-3.3
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Internationalized Domain Names in Applications (IDNA)
+EAPI=7
+HOMEPAGE=https://github.com/kjd/idna https://pypi.org/project/idna/
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+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
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/i/idna/idna-3.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6e9703a769431b5173c6064567618b9f
diff --git a/metadata/md5-cache/dev-python/imageio-2.6.1 b/metadata/md5-cache/dev-python/imageio-2.6.1
deleted file mode 100644
index 3d4d0f9d0de4..000000000000
--- a/metadata/md5-cache/dev-python/imageio-2.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-libs/freeimage
-DESCRIPTION=Python library for reading and writing image data
-EAPI=7
-HOMEPAGE=https://imageio.github.io/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] media-libs/freeimage python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/imageio/imageio/archive/v2.6.1.tar.gz -> imageio-2.6.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=535937e768e212542bec7db65aac00a0
diff --git a/metadata/md5-cache/dev-python/iminuit-2.7.0 b/metadata/md5-cache/dev-python/iminuit-2.7.0
deleted file mode 100644
index 6bacef6a1e66..000000000000
--- a/metadata/md5-cache/dev-python/iminuit-2.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sys-devel/make >=dev-util/cmake-3.20.5 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Minuit numerical function minimization in Python
-EAPI=7
-HOMEPAGE=https://github.com/scikit-hep/iminuit/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT LGPL-2.1
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/iminuit/iminuit-2.7.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d10859366cf30d4620e2d3ab82323896
diff --git a/metadata/md5-cache/dev-python/iminuit-2.8.0 b/metadata/md5-cache/dev-python/iminuit-2.8.0
deleted file mode 100644
index 17f8d15f9eaf..000000000000
--- a/metadata/md5-cache/dev-python/iminuit-2.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sys-devel/make >=dev-util/cmake-3.20.5 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Minuit numerical function minimization in Python
-EAPI=7
-HOMEPAGE=https://github.com/scikit-hep/iminuit/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT LGPL-2.1
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/iminuit/iminuit-2.8.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d10859366cf30d4620e2d3ab82323896
diff --git a/metadata/md5-cache/dev-python/iminuit-2.8.2 b/metadata/md5-cache/dev-python/iminuit-2.8.2
deleted file mode 100644
index e20b4dd611e5..000000000000
--- a/metadata/md5-cache/dev-python/iminuit-2.8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sys-devel/make >=dev-util/cmake-3.20.5 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Minuit numerical function minimization in Python
-EAPI=7
-HOMEPAGE=https://github.com/scikit-hep/iminuit/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT LGPL-2.1
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/iminuit/iminuit-2.8.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4ffaa8440b0b8f8af91eed63024edc83
diff --git a/metadata/md5-cache/dev-python/iminuit-2.8.3 b/metadata/md5-cache/dev-python/iminuit-2.8.3
deleted file mode 100644
index ff9d85be0cd1..000000000000
--- a/metadata/md5-cache/dev-python/iminuit-2.8.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sys-devel/make >=dev-util/cmake-3.20.5 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Minuit numerical function minimization in Python
-EAPI=8
-HOMEPAGE=https://github.com/scikit-hep/iminuit/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT LGPL-2.1
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/iminuit/iminuit-2.8.3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4dc221cc6b17b1368427e703efae44fd
diff --git a/metadata/md5-cache/dev-python/iminuit-2.8.4 b/metadata/md5-cache/dev-python/iminuit-2.8.4
new file mode 100644
index 000000000000..b454d298ea86
--- /dev/null
+++ b/metadata/md5-cache/dev-python/iminuit-2.8.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sys-devel/make >=dev-util/cmake-3.20.5 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Minuit numerical function minimization in Python
+EAPI=8
+HOMEPAGE=https://github.com/scikit-hep/iminuit/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT LGPL-2.1
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/iminuit/iminuit-2.8.4.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4dc221cc6b17b1368427e703efae44fd
diff --git a/metadata/md5-cache/dev-python/immutables-0.15 b/metadata/md5-cache/dev-python/immutables-0.15
deleted file mode 100644
index c90691bb18fe..000000000000
--- a/metadata/md5-cache/dev-python/immutables-0.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A high-performance immutable mapping type for Python
-EAPI=7
-HOMEPAGE=https://github.com/MagicStack/immutables
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/MagicStack/immutables/archive/v0.15.tar.gz -> immutables-0.15.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5a2daba2bebc4aed7f4c751e852bf540
diff --git a/metadata/md5-cache/dev-python/immutables-0.15-r1 b/metadata/md5-cache/dev-python/immutables-0.15-r1
deleted file mode 100644
index 55601257701d..000000000000
--- a/metadata/md5-cache/dev-python/immutables-0.15-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A high-performance immutable mapping type for Python
-EAPI=7
-HOMEPAGE=https://github.com/MagicStack/immutables
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/MagicStack/immutables/archive/v0.15.tar.gz -> immutables-0.15.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=636e03475ffd79f1b8a22d7128129d11
diff --git a/metadata/md5-cache/dev-python/importlib_resources-5.2.3 b/metadata/md5-cache/dev-python/importlib_resources-5.2.3
new file mode 100644
index 000000000000..e3f36925a5a7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib_resources-5.2.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools_scm-3.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?] test? ( python_targets_pypy3? ( >=dev-python/zipp-3.1.0[python_targets_pypy3(-)?] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read resources from Python packages
+EAPI=8
+HOMEPAGE=https://github.com/python/importlib_resources
+IUSE=test doc python_targets_pypy3 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/zipp-3.1.0[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/importlib_resources/importlib_resources-5.2.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4048fad37da8ba9a89b026663743c0f5
diff --git a/metadata/md5-cache/dev-python/importlib_resources-5.3.0 b/metadata/md5-cache/dev-python/importlib_resources-5.3.0
new file mode 100644
index 000000000000..3987b001b341
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib_resources-5.3.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools_scm-3.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?] test? ( python_targets_pypy3? ( >=dev-python/zipp-3.1.0[python_targets_pypy3(-)?] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read resources from Python packages
+EAPI=8
+HOMEPAGE=https://github.com/python/importlib_resources
+IUSE=test doc python_targets_pypy3 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/zipp-3.1.0[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/importlib_resources/importlib_resources-5.3.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4048fad37da8ba9a89b026663743c0f5
diff --git a/metadata/md5-cache/dev-python/indexed_gzip-0.8.10 b/metadata/md5-cache/dev-python/indexed_gzip-0.8.10
deleted file mode 100644
index 7882b5adcbaa..000000000000
--- a/metadata/md5-cache/dev-python/indexed_gzip-0.8.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Fast random access of gzip files in Python
-EAPI=7
-HOMEPAGE=https://github.com/pauldmccarthy/indexed_gzip
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pauldmccarthy/indexed_gzip/archive/v0.8.10.tar.gz -> indexed_gzip-0.8.10.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=24b1ee04c36852815bf4d7b75855e691
diff --git a/metadata/md5-cache/dev-python/indexed_gzip-1.6.0 b/metadata/md5-cache/dev-python/indexed_gzip-1.6.0
deleted file mode 100644
index 9a50c742f5d9..000000000000
--- a/metadata/md5-cache/dev-python/indexed_gzip-1.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Fast random access of gzip files in Python
-EAPI=7
-HOMEPAGE=https://github.com/pauldmccarthy/indexed_gzip
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pauldmccarthy/indexed_gzip/archive/v1.6.0.tar.gz -> indexed_gzip-1.6.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=53b1c744825c137f32b172f3ebf36ef4
diff --git a/metadata/md5-cache/dev-python/indexed_gzip-1.6.1 b/metadata/md5-cache/dev-python/indexed_gzip-1.6.1
deleted file mode 100644
index 7383044aa07e..000000000000
--- a/metadata/md5-cache/dev-python/indexed_gzip-1.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Fast random access of gzip files in Python
-EAPI=7
-HOMEPAGE=https://github.com/pauldmccarthy/indexed_gzip
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pauldmccarthy/indexed_gzip/archive/v1.6.1.tar.gz -> indexed_gzip-1.6.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=86fb184814029b14ed0944d1a8d2c9e5
diff --git a/metadata/md5-cache/dev-python/indexed_gzip-1.6.2 b/metadata/md5-cache/dev-python/indexed_gzip-1.6.2
deleted file mode 100644
index d508c3e9e27d..000000000000
--- a/metadata/md5-cache/dev-python/indexed_gzip-1.6.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( sys-libs/zlib:= >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib:=
-DESCRIPTION=Fast random access of gzip files in Python
-EAPI=8
-HOMEPAGE=https://github.com/pauldmccarthy/indexed_gzip
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-RDEPEND=sys-libs/zlib:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pauldmccarthy/indexed_gzip/archive/v1.6.2.tar.gz -> indexed_gzip-1.6.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1ae4caad13428568f799e3152d72260c
diff --git a/metadata/md5-cache/dev-python/indexed_gzip-1.6.4 b/metadata/md5-cache/dev-python/indexed_gzip-1.6.4
new file mode 100644
index 000000000000..f17b7a283c37
--- /dev/null
+++ b/metadata/md5-cache/dev-python/indexed_gzip-1.6.4
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( sys-libs/zlib:= >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib:=
+DESCRIPTION=Fast random access of gzip files in Python
+EAPI=8
+HOMEPAGE=https://github.com/pauldmccarthy/indexed_gzip
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=sys-libs/zlib:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pauldmccarthy/indexed_gzip/archive/v1.6.4.tar.gz -> indexed_gzip-1.6.4.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1ae4caad13428568f799e3152d72260c
diff --git a/metadata/md5-cache/dev-python/iniparse-0.4-r2 b/metadata/md5-cache/dev-python/iniparse-0.4-r2
deleted file mode 100644
index 98cacdd45460..000000000000
--- a/metadata/md5-cache/dev-python/iniparse-0.4-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.10.0[python_targets_python3_8(-)?]
-DESCRIPTION=Better INI parser for Python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/iniparse/
-IUSE=python_targets_python3_8
-KEYWORDS=amd64 arm64 x86
-LICENSE=MIT PSF-2
-RDEPEND=>=dev-python/six-1.10.0[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/i/iniparse/iniparse-0.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=442b7e10f102b4b04a5cd5a3e6d7bf7f
diff --git a/metadata/md5-cache/dev-python/intreehooks-1.0 b/metadata/md5-cache/dev-python/intreehooks-1.0
index 39dfeb7ddeb9..5b64e68dca8f 100644
--- a/metadata/md5-cache/dev-python/intreehooks-1.0
+++ b/metadata/md5-cache/dev-python/intreehooks-1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Load a PEP 517 backend from inside the source tree
 EAPI=7
 HOMEPAGE=https://pypi.org/project/intreehooks/ https://github.com/takluyver/intreehooks/
 IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/intreehooks/intreehooks-1.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=83d2f88dbcfd1fa7a5dafc4a9d41a45a
+_md5_=5bce8778ed896f363a673e42c06c9bb9
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.2.0 b/metadata/md5-cache/dev-python/ipykernel-6.2.0
index b49b468bdab8..d9125d7896b5 100644
--- a/metadata/md5-cache/dev-python/ipykernel-6.2.0
+++ b/metadata/md5-cache/dev-python/ipykernel-6.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=IPython Kernel for Jupyter
 EAPI=8
 HOMEPAGE=https://github.com/ipython/ipykernel
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/debugpy-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/debugpy-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/ipython-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/traitlets-4.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/traitlets-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/jupyter_client-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=www-servers/tornado-4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <www-servers/tornado-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/matplotlib-inline-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/matplotlib-inline-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.2.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=723a40a50694f46a7c98eb7eaa7e77cc
+_md5_=9a8ace429d88c2c41cfa6b7a290315b9
diff --git a/metadata/md5-cache/dev-python/isoduration-20.11.0 b/metadata/md5-cache/dev-python/isoduration-20.11.0
index fa918fa875f2..e19e5e42b4c1 100644
--- a/metadata/md5-cache/dev-python/isoduration-20.11.0
+++ b/metadata/md5-cache/dev-python/isoduration-20.11.0
@@ -4,7 +4,7 @@ DESCRIPTION=Operations with ISO 8601 durations
 EAPI=8
 HOMEPAGE=https://pypi.org/project/isoduration/ https://github.com/bolsote/isoduration/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-python/arrow-0.15.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bolsote/isoduration/archive/20.11.0.tar.gz -> isoduration-20.11.0.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2fc85f3ffad43c5d1f21c5a703a36e19
+_md5_=8ac743252fc7dae83e398b862928b156
diff --git a/metadata/md5-cache/dev-python/isort-5.9.3 b/metadata/md5-cache/dev-python/isort-5.9.3
index 299fe1806dfb..e40500a5652a 100644
--- a/metadata/md5-cache/dev-python/isort-5.9.3
+++ b/metadata/md5-cache/dev-python/isort-5.9.3
@@ -4,7 +4,7 @@ DESCRIPTION=A python utility/library to sort imports
 EAPI=8
 HOMEPAGE=https://pypi.org/project/isort/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/isort/archive/5.9.3.tar.gz -> isort-5.9.3.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8584e51a8592f35c10ee9716ed694e23
+_md5_=f61cd9945825eca4034e0da806be124b
diff --git a/metadata/md5-cache/dev-python/itypes-1.1.0 b/metadata/md5-cache/dev-python/itypes-1.1.0
deleted file mode 100644
index cceeb95d2aff..000000000000
--- a/metadata/md5-cache/dev-python/itypes-1.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=basic immutable container types for python
-EAPI=8
-HOMEPAGE=https://github.com/PavanTatikonda/itypes/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PavanTatikonda/itypes/archive/1.1.0.tar.gz -> itypes-1.1.0.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4590558177a8b24c2c1f526faa7664eb
diff --git a/metadata/md5-cache/dev-python/jaraco-stream-3.0.0-r1 b/metadata/md5-cache/dev-python/jaraco-stream-3.0.0-r1
deleted file mode 100644
index 3f084aa918fc..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-stream-3.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/pytest-2.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_9(-)] >=dev-python/rst-linker-1.9[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Routines for handling streaming data
-EAPI=7
-HOMEPAGE=https://github.com/jaraco/jaraco.stream
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jaraco.stream/jaraco.stream-3.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=689447d45305037221937d3754187266
diff --git a/metadata/md5-cache/dev-python/jikanpy-4.3.1 b/metadata/md5-cache/dev-python/jikanpy-4.3.1
deleted file mode 100644
index ee1e5957528f..000000000000
--- a/metadata/md5-cache/dev-python/jikanpy-4.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/vcrpy ) test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python wrapper for jikan.moe API.
-EAPI=7
-HOMEPAGE=https://pypi.org/project/jikanpy/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/abhinavk99/jikanpy/archive/v4.3.1.tar.gz -> jikanpy-4.3.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=89004999019fa82d7accea1f8e4a992f
diff --git a/metadata/md5-cache/dev-python/josepy-1.10.0 b/metadata/md5-cache/dev-python/josepy-1.10.0
index 434cd059aff7..13bf7b03e73c 100644
--- a/metadata/md5-cache/dev-python/josepy-1.10.0
+++ b/metadata/md5-cache/dev-python/josepy-1.10.0
@@ -4,7 +4,7 @@ DESCRIPTION=JOSE protocol implementation in Python
 EAPI=8
 HOMEPAGE=https://github.com/certbot/josepy
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-0.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/josepy/josepy-1.10.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3f8756a0a7d94011881d9249d0af00da
+_md5_=92e01de5fc0b6b0ca5d24137b066d5df
diff --git a/metadata/md5-cache/dev-python/josepy-1.8.0 b/metadata/md5-cache/dev-python/josepy-1.8.0
deleted file mode 100644
index 3e5fd9de56b7..000000000000
--- a/metadata/md5-cache/dev-python/josepy-1.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-0.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=JOSE protocol implementation in Python
-EAPI=7
-HOMEPAGE=https://github.com/certbot/josepy
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-0.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/josepy/josepy-1.8.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e6126733cbe12b009f89d68d1dbdee8f
diff --git a/metadata/md5-cache/dev-python/josepy-1.9.0 b/metadata/md5-cache/dev-python/josepy-1.9.0
deleted file mode 100644
index a4be984038e9..000000000000
--- a/metadata/md5-cache/dev-python/josepy-1.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-0.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=JOSE protocol implementation in Python
-EAPI=8
-HOMEPAGE=https://github.com/certbot/josepy
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-0.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/josepy/josepy-1.9.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=add7768a73f17405f005af3cfa52ce53
diff --git a/metadata/md5-cache/dev-python/jq-1.1.2 b/metadata/md5-cache/dev-python/jq-1.1.2
deleted file mode 100644
index cbeb81979cd2..000000000000
--- a/metadata/md5-cache/dev-python/jq-1.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings for jq
-EAPI=7
-HOMEPAGE=https://github.com/mwilliamson/jq.py
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/j/jq/jq-1.1.2.tar.gz https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz https://github.com/kkos/oniguruma/releases/download/v6.9.4/onig-6.9.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=058d3f36fc2fecc89f9a8601a0e28ad8
diff --git a/metadata/md5-cache/dev-python/jq-1.1.3 b/metadata/md5-cache/dev-python/jq-1.1.3
deleted file mode 100644
index fa94097a7fdd..000000000000
--- a/metadata/md5-cache/dev-python/jq-1.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings for jq
-EAPI=7
-HOMEPAGE=https://github.com/mwilliamson/jq.py
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/j/jq/jq-1.1.3.tar.gz https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz https://github.com/kkos/oniguruma/releases/download/v6.9.4/onig-6.9.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=058d3f36fc2fecc89f9a8601a0e28ad8
diff --git a/metadata/md5-cache/dev-python/js2py-0.70_p20210218 b/metadata/md5-cache/dev-python/js2py-0.70_p20210218
deleted file mode 100644
index 8177fbf45db7..000000000000
--- a/metadata/md5-cache/dev-python/js2py-0.70_p20210218
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pyjsparser-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tzlocal-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=JavaScript to Python Translator & JavaScript interpreter in Python
-EAPI=7
-HOMEPAGE=http://piter.io/projects/js2py/ https://github.com/PiotrDabkowski/Js2Py/ https://pypi.org/project/Js2Py/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pyjsparser-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tzlocal-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PiotrDabkowski/Js2Py/archive/ea16b519a0f72e17416859a57890b8388fce6e39.tar.gz -> Js2Py-0.70_p20210218.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f06f772a0fd5f15b6b0c29019c9f7b26
diff --git a/metadata/md5-cache/dev-python/jsmin-2.2.2 b/metadata/md5-cache/dev-python/jsmin-2.2.2
index 46aa5c3ee1d1..b36a12bed66c 100644
--- a/metadata/md5-cache/dev-python/jsmin-2.2.2
+++ b/metadata/md5-cache/dev-python/jsmin-2.2.2
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=<dev-python/setuptools-58[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JavaScript minifier
 EAPI=7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/j/jsmin/jsmin-2.2.2.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=98d80f98387b8e9e517cd0ef4365b3c2
+_md5_=f61795316cfcc35d1db1f06dcae7c372
diff --git a/metadata/md5-cache/dev-python/jsonschema-4.0.1 b/metadata/md5-cache/dev-python/jsonschema-4.0.1
index 014340e9948f..cab053529f4b 100644
--- a/metadata/md5-cache/dev-python/jsonschema-4.0.1
+++ b/metadata/md5-cache/dev-python/jsonschema-4.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=An implementation of JSON-Schema validation for Python
 EAPI=8
 HOMEPAGE=https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fqdn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/isoduration[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonpointer-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3339-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3986-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3987[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/uritemplate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/webcolors-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-4.0.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9f6134542fab80574168a138bdc543f4
+_md5_=e7956719c338fad223f04023dbdf821a
diff --git a/metadata/md5-cache/dev-python/jsonschema-4.1.0 b/metadata/md5-cache/dev-python/jsonschema-4.1.0
new file mode 100644
index 000000000000..544c23f477aa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonschema-4.1.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fqdn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/isoduration[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonpointer-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3339-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3986-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3987[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/uritemplate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/webcolors-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An implementation of JSON-Schema validation for Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fqdn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/isoduration[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonpointer-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3339-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3986-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rfc3987[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/uritemplate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/webcolors-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jsonschema/jsonschema-4.1.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=85f85ed336c679aa951e73beacbe265f
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.0.1 b/metadata/md5-cache/dev-python/jupyter_client-7.0.1
deleted file mode 100644
index 808fdba2b8e0..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_client-7.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Jupyter protocol implementation and client libraries
-EAPI=8
-HOMEPAGE=https://jupyter.org
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-7.0.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=774fa22fcf3f985efe6932953f0c7855
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.0.2 b/metadata/md5-cache/dev-python/jupyter_client-7.0.2
deleted file mode 100644
index 49bce201e296..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_client-7.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Jupyter protocol implementation and client libraries
-EAPI=8
-HOMEPAGE=https://jupyter.org
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-7.0.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4946311808368ccd18652f303d0ee5a3
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.0.3 b/metadata/md5-cache/dev-python/jupyter_client-7.0.3
deleted file mode 100644
index 85076df006a8..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_client-7.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Jupyter protocol implementation and client libraries
-EAPI=8
-HOMEPAGE=https://jupyter.org
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-7.0.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3444e73dc110595c9a7a4cbc5edc0622
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.0.4 b/metadata/md5-cache/dev-python/jupyter_client-7.0.4
deleted file mode 100644
index 8256f57c984b..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_client-7.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Jupyter protocol implementation and client libraries
-EAPI=8
-HOMEPAGE=https://jupyter.org
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-7.0.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3444e73dc110595c9a7a4cbc5edc0622
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.0.5 b/metadata/md5-cache/dev-python/jupyter_client-7.0.5
deleted file mode 100644
index 0196e025978d..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_client-7.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Jupyter protocol implementation and client libraries
-EAPI=8
-HOMEPAGE=https://jupyter.org
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-7.0.5.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3444e73dc110595c9a7a4cbc5edc0622
diff --git a/metadata/md5-cache/dev-python/jupyter_packaging-0.10.4 b/metadata/md5-cache/dev-python/jupyter_packaging-0.10.4
deleted file mode 100644
index b3860e0c741b..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_packaging-0.10.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Tools to help build and install Jupyter Python packages
-EAPI=8
-HOMEPAGE=https://jupyter.org
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyter_packaging/jupyter_packaging-0.10.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6c2fdd54082caa5e6d41e0fc2306bc98
diff --git a/metadata/md5-cache/dev-python/jupyter_server-1.11.0 b/metadata/md5-cache/dev-python/jupyter_server-1.11.0
deleted file mode 100644
index f80f04f24d6e..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_server-1.11.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tornasync[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-console-scripts[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/argon2-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/anyio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-unixsocket[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Core services, APIs, and REST endpoints to Jupyter web applications
-EAPI=8
-HOMEPAGE=https://jupyter.org
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/argon2-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/anyio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-unixsocket[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyter_server/jupyter_server-1.11.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e5ef4c731e5cfc199ad56eb6d4288805
diff --git a/metadata/md5-cache/dev-python/jupyter_server-1.8.0 b/metadata/md5-cache/dev-python/jupyter_server-1.8.0
deleted file mode 100644
index cf83509d3bba..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_server-1.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/argon2-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/anyio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Core services, APIs, and REST endpoints to Jupyter web applications
-EAPI=7
-HOMEPAGE=https://jupyter.org
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/argon2-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/anyio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyter_server/jupyter_server-1.8.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=547e343b7d5351e798d74e0b304475cf
diff --git a/metadata/md5-cache/dev-python/kafka-python-1.4.7 b/metadata/md5-cache/dev-python/kafka-python-1.4.7
deleted file mode 100644
index ba05a701781c..000000000000
--- a/metadata/md5-cache/dev-python/kafka-python-1.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( snappy? ( dev-python/snappy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Kafka protocol support in Python
-EAPI=8
-HOMEPAGE=https://github.com/dpkp/kafka-python/ https://pypi.org/project/kafka-python/
-IUSE=snappy test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=snappy? ( dev-python/snappy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dpkp/kafka-python/archive/1.4.7.tar.gz -> kafka-python-1.4.7.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da56f9fd42f535824ff7897f036fa93c
diff --git a/metadata/md5-cache/dev-python/keyring-23.1.0 b/metadata/md5-cache/dev-python/keyring-23.1.0
deleted file mode 100644
index 5e294a16b431..000000000000
--- a/metadata/md5-cache/dev-python/keyring-23.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jeepney[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/jaraco-packaging[python_targets_python3_10(-)] dev-python/rst-linker[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-)] dev-python/rst-linker[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Provides access to the system keyring service
-EAPI=8
-HOMEPAGE=https://github.com/jaraco/keyring
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=PSF-2
-RDEPEND=dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jeepney[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jaraco/keyring/archive/v23.1.0.tar.gz -> keyring-23.1.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=79d7c8ed6c1c624fb9fc94b5ead56b55
diff --git a/metadata/md5-cache/dev-python/keyring-23.2.1 b/metadata/md5-cache/dev-python/keyring-23.2.1
index acd1f64f264d..9a3acf355d7f 100644
--- a/metadata/md5-cache/dev-python/keyring-23.2.1
+++ b/metadata/md5-cache/dev-python/keyring-23.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Provides access to the system keyring service
 EAPI=8
 HOMEPAGE=https://github.com/jaraco/keyring
 IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=PSF-2
 RDEPEND=dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jeepney[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jaraco/keyring/archive/v23.2.1.tar.gz -> keyring-23.2.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0c3b2343b089e62e455a9894dc0892b4
+_md5_=626928701316295dc84cb942279d9e18
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.3.1 b/metadata/md5-cache/dev-python/kiwisolver-1.3.1
deleted file mode 100644
index d020d1d8a40b..000000000000
--- a/metadata/md5-cache/dev-python/kiwisolver-1.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/cppy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An efficient C++ implementation of the Cassowary constraint solving algorithm
-EAPI=7
-HOMEPAGE=https://github.com/nucleic/kiwi
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
-LICENSE=Clear-BSD
-RDEPEND=>=dev-python/cppy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nucleic/kiwi/archive/1.3.1.tar.gz -> kiwisolver-1.3.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=038b0de0f1cf0705fa8b1f3d8262850c
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.3.2 b/metadata/md5-cache/dev-python/kiwisolver-1.3.2
index 9420b803babd..939e0fdfad12 100644
--- a/metadata/md5-cache/dev-python/kiwisolver-1.3.2
+++ b/metadata/md5-cache/dev-python/kiwisolver-1.3.2
@@ -4,7 +4,7 @@ DESCRIPTION=An efficient C++ implementation of the Cassowary constraint solving
 EAPI=8
 HOMEPAGE=https://github.com/nucleic/kiwi
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Clear-BSD
 RDEPEND=>=dev-python/cppy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nucleic/kiwi/archive/1.3.2.rc1.tar.gz -> kiwisolver-1.3.2.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=15b0066d6562dc151b21c6993c80cc89
+_md5_=508837d9554804d23f51e8204d845227
diff --git a/metadata/md5-cache/dev-python/klein-20.6.0 b/metadata/md5-cache/dev-python/klein-20.6.0
deleted file mode 100644
index 6731cc90bbc0..000000000000
--- a/metadata/md5-cache/dev-python/klein-20.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/treq[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/hyperlink[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/incremental[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tubes[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=micro-framework for developing production-ready web services with Python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/klein https://github.com/twisted/klein
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/hyperlink[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/incremental[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tubes[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/k/klein/klein-20.6.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e8d63639b9c609757c82c266036f36b7
diff --git a/metadata/md5-cache/dev-python/lark-parser-0.11.2 b/metadata/md5-cache/dev-python/lark-parser-0.11.2
deleted file mode 100644
index fe752bdb1e97..000000000000
--- a/metadata/md5-cache/dev-python/lark-parser-0.11.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/js2py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python module to propose a modern general-purpose parsing library for Python
-EAPI=7
-HOMEPAGE=https://github.com/lark-parser/lark
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/l/lark-parser/lark-parser-0.11.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=92bb02b3538eb01a1b36813c35b74684
diff --git a/metadata/md5-cache/dev-python/lazr-config-2.2.2 b/metadata/md5-cache/dev-python/lazr-config-2.2.2
deleted file mode 100644
index 4c0fce0f74f0..000000000000
--- a/metadata/md5-cache/dev-python/lazr-config-2.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Create configuration schemas, and process and validate configurations.
-EAPI=7
-HOMEPAGE=https://code.launchpad.net/lazr.config
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lazr-delegates[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/l/lazr.config/lazr.config-2.2.2.tar.gz -> lazr-config-2.2.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e6508f0303c618881297389affc6a36b
diff --git a/metadata/md5-cache/dev-python/lcdproc-0.03_p20150508 b/metadata/md5-cache/dev-python/lcdproc-0.03_p20150508
deleted file mode 100644
index c00e2eac720a..000000000000
--- a/metadata/md5-cache/dev-python/lcdproc-0.03_p20150508
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python OOP wrapper library for LCDproc Telnet API
-EAPI=7
-HOMEPAGE=https://github.com/jinglemansweep/lcdproc
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=app-misc/lcdproc python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/jinglemansweep/lcdproc/archive/973628fc326177c9deaf3f2e1a435159eb565ae0.tar.gz -> lcdproc-0.03_p20150508.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d1af92bc6820f26d28712b585bcd974b
diff --git a/metadata/md5-cache/dev-python/leather-0.3.3-r2 b/metadata/md5-cache/dev-python/leather-0.3.3-r2
deleted file mode 100644
index 837544275090..000000000000
--- a/metadata/md5-cache/dev-python/leather-0.3.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( xml? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/cssselect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python charting for 80% of humans.
-EAPI=8
-HOMEPAGE=https://github.com/wireservice/leather https://pypi.org/project/leather/
-IUSE=+xml test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=xml? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/cssselect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/wireservice/leather/archive/refs/tags/0.3.3.tar.gz -> leather-0.3.3-src.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d857f4de0e1345ff472bfc87c25fd25a
diff --git a/metadata/md5-cache/dev-python/leather-0.3.4 b/metadata/md5-cache/dev-python/leather-0.3.4
new file mode 100644
index 000000000000..24172314c78a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/leather-0.3.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cssselect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python charting for 80% of humans
+EAPI=8
+HOMEPAGE=https://github.com/wireservice/leather https://pypi.org/project/leather/
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/cssselect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/wireservice/leather/archive/0.3.4.tar.gz -> leather-0.3.4.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b4cba201f2e7026bccb4bc2f2994dd94
diff --git a/metadata/md5-cache/dev-python/lesscpy-0.14.0 b/metadata/md5-cache/dev-python/lesscpy-0.14.0
deleted file mode 100644
index 45158eeb74bb..000000000000
--- a/metadata/md5-cache/dev-python/lesscpy-0.14.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A compiler written in Python for the LESS language
-EAPI=7
-HOMEPAGE=https://pypi.org/project/lesscpy/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/l/lesscpy/lesscpy-0.14.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1dee570ff44aa2d417383441eb20e606
diff --git a/metadata/md5-cache/dev-python/liblarch-3.0.1 b/metadata/md5-cache/dev-python/liblarch-3.0.1
deleted file mode 100644
index fb18b0361fb4..000000000000
--- a/metadata/md5-cache/dev-python/liblarch-3.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection]
-DESCRIPTION=Library to handle directed acyclic graphs
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/liblarch
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/getting-things-gnome/liblarch/archive/v3.0.1.tar.gz -> liblarch-3.0.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=2cd71f275a9fb6cf4356a05d27b5fa64
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.7.0 b/metadata/md5-cache/dev-python/libvirt-python-7.7.0
index fda10a208ff3..8aba300de00f 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-7.7.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-7.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=libvirt Python bindings
 EAPI=7
 HOMEPAGE=https://www.libvirt.org
 IUSE=examples test test python_targets_python3_8 python_targets_python3_9 verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=app-emulation/libvirt:0/7.7.0 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.7.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.7.0.tar.gz.asc )
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
-_md5_=9f41c13decaf177050dcc18e1950b811
+_md5_=c05aba5c0f551123c7c72fdc5c9c913f
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.8.0 b/metadata/md5-cache/dev-python/libvirt-python-7.8.0
new file mode 100644
index 000000000000..639cde32f423
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libvirt-python-7.8.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) verify-sig? ( app-crypt/openpgp-keys-libvirt ) test? ( app-emulation/libvirt:0/7.8.0 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=libvirt Python bindings
+EAPI=7
+HOMEPAGE=https://www.libvirt.org
+IUSE=examples test test python_targets_python3_8 python_targets_python3_9 verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=app-emulation/libvirt:0/7.8.0 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.8.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.8.0.tar.gz.asc )
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=9f41c13decaf177050dcc18e1950b811
diff --git a/metadata/md5-cache/dev-python/line_profiler-3.3.0 b/metadata/md5-cache/dev-python/line_profiler-3.3.0
deleted file mode 100644
index b2c7637e1fad..000000000000
--- a/metadata/md5-cache/dev-python/line_profiler-3.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scikit-build[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ubelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-util/ninja >=dev-util/cmake-3.20.5 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Line-by-line profiler
-EAPI=7
-HOMEPAGE=https://github.com/pyutils/line_profiler/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pyutils/line_profiler/archive/3.3.0.tar.gz -> line_profiler-3.3.0.gh.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9a92bdd8f5d8756707ca8d498353b2aa
diff --git a/metadata/md5-cache/dev-python/lmfit-1.0.2 b/metadata/md5-cache/dev-python/lmfit-1.0.2
deleted file mode 100644
index acc15b4ac50a..000000000000
--- a/metadata/md5-cache/dev-python/lmfit-1.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/asteval-0.9.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uncertainties-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/asteval-0.9.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uncertainties-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Non-Linear Least-Squares Minimization and Curve-Fitting for Python
-EAPI=8
-HOMEPAGE=https://lmfit.github.io/lmfit-py/ https://github.com/lmfit/lmfit-py/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-python/asteval-0.9.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uncertainties-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/l/lmfit/lmfit-1.0.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=adb0d0891796cec5b659d4d8490782c2
diff --git a/metadata/md5-cache/dev-python/lmfit-1.0.3 b/metadata/md5-cache/dev-python/lmfit-1.0.3
new file mode 100644
index 000000000000..a768671c9504
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lmfit-1.0.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/asteval-0.9.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uncertainties-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Non-Linear Least-Squares Minimization and Curve-Fitting for Python
+EAPI=8
+HOMEPAGE=https://lmfit.github.io/lmfit-py/ https://github.com/lmfit/lmfit-py/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-python/asteval-0.9.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uncertainties-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/l/lmfit/lmfit-1.0.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7416758138da8a8af8a0ed213f336f55
diff --git a/metadata/md5-cache/dev-python/loky-2.9.0 b/metadata/md5-cache/dev-python/loky-2.9.0
deleted file mode 100644
index 2498048d388e..000000000000
--- a/metadata/md5-cache/dev-python/loky-2.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Robust and reusable Executor for joblib
-EAPI=7
-HOMEPAGE=https://github.com/joblib/loky
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/joblib/loky/archive/2.9.0.tar.gz -> loky-2.9.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1c57cd7d33a348da8e7ee1c0cbe81613
diff --git a/metadata/md5-cache/dev-python/loky-3.0.0 b/metadata/md5-cache/dev-python/loky-3.0.0
index cdf08d10affa..9705a26dc336 100644
--- a/metadata/md5-cache/dev-python/loky-3.0.0
+++ b/metadata/md5-cache/dev-python/loky-3.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Robust and reusable Executor for joblib
 EAPI=8
 HOMEPAGE=https://github.com/joblib/loky
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joblib/loky/archive/3.0.0.tar.gz -> loky-3.0.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d72b25521d4bb6eedff586783669252e
+_md5_=ff2b3e93e6486aa4394c2349a2149725
diff --git a/metadata/md5-cache/dev-python/lunr-0.6.1 b/metadata/md5-cache/dev-python/lunr-0.6.1
new file mode 100644
index 000000000000..b2a3929d5b51
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lunr-0.6.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/nltk[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( dev-lang/python:3.10 dev-python/mkdocs[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python implementation of Lunr.js
+EAPI=8
+HOMEPAGE=https://github.com/yeraydiazdiaz/lunr.py
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/nltk[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/yeraydiazdiaz/lunr.py/archive/0.6.1.tar.gz -> lunr-0.6.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4075256560216b4bdccacc555246943e
diff --git a/metadata/md5-cache/dev-python/manuel-1.10.1 b/metadata/md5-cache/dev-python/manuel-1.10.1
index 8859bf1f2b87..607c7cc33c2b 100644
--- a/metadata/md5-cache/dev-python/manuel-1.10.1
+++ b/metadata/md5-cache/dev-python/manuel-1.10.1
@@ -4,7 +4,7 @@ DESCRIPTION=Lets you mix and match traditional doctests with custom test syntax
 EAPI=7
 HOMEPAGE=https://github.com/benji-york/manuel/ https://pypi.org/project/manuel/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/manuel/manuel-1.10.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1de83a8b89e49f43cbd1d260d3a69da4
+_md5_=71a21db42e2523a8584b1a7736a4b0f2
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.11 b/metadata/md5-cache/dev-python/markdown-2.6.11
deleted file mode 100644
index 8a29df655a76..000000000000
--- a/metadata/md5-cache/dev-python/markdown-2.6.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-DESCRIPTION=Python implementation of the markdown markup language
-EAPI=6
-HOMEPAGE=https://python-markdown.github.io/ https://pypi.org/project/Markdown/ https://github.com/Python-Markdown/markdown
-IUSE=doc python_targets_pypy3 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.11.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a41266be8c7aee6f55a155eaec59b183
diff --git a/metadata/md5-cache/dev-python/markups-3.1.1 b/metadata/md5-cache/dev-python/markups-3.1.1
deleted file mode 100644
index 0110e2e52c64..000000000000
--- a/metadata/md5-cache/dev-python/markups-3.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-text/pytextile[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pymdown-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-markdown-math[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-markdown-math[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=A wrapper around various text markups
-EAPI=7
-HOMEPAGE=https://pymarkups.readthedocs.io/en/latest/ https://github.com/retext-project/pymarkups https://pypi.org/project/Markups/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-markdown-math[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/M/Markups/Markups-3.1.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0b5fa1edcab4dbdabd5a1934cf5b92a6
diff --git a/metadata/md5-cache/dev-python/markups-3.1.2 b/metadata/md5-cache/dev-python/markups-3.1.2
index ca952057c005..fe53b25fcd74 100644
--- a/metadata/md5-cache/dev-python/markups-3.1.2
+++ b/metadata/md5-cache/dev-python/markups-3.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=A wrapper around various text markups
 EAPI=8
 HOMEPAGE=https://pymarkups.readthedocs.io/en/latest/ https://github.com/retext-project/pymarkups https://pypi.org/project/Markups/
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-markdown-math[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markups/Markups-3.1.2.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1b5a586db817a7a8489493562f4391d0
+_md5_=7445b249679b09da94404f297d76a782
diff --git a/metadata/md5-cache/dev-python/markupsafe-2.0.0 b/metadata/md5-cache/dev-python/markupsafe-2.0.0
deleted file mode 100644
index 78aefcc0bebe..000000000000
--- a/metadata/md5-cache/dev-python/markupsafe-2.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Implements a XML/HTML/XHTML Markup safe string for Python
-EAPI=7
-HOMEPAGE=https://pypi.org/project/MarkupSafe/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/M/MarkupSafe/MarkupSafe-2.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=99f790b07e34cc5e967a943207e2a32a
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.11.1 b/metadata/md5-cache/dev-python/marshmallow-3.11.1
deleted file mode 100644
index 89ae99d8ae98..000000000000
--- a/metadata/md5-cache/dev-python/marshmallow-3.11.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library for converting to and from native Python datatypes
-EAPI=7
-HOMEPAGE=https://github.com/marshmallow-code/marshmallow/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/marshmallow/marshmallow-3.11.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=218557aa78a8e89d586c8247df5e1b32
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.12.0 b/metadata/md5-cache/dev-python/marshmallow-3.12.0
deleted file mode 100644
index 1f16aaa9953a..000000000000
--- a/metadata/md5-cache/dev-python/marshmallow-3.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library for converting to and from native Python datatypes
-EAPI=7
-HOMEPAGE=https://github.com/marshmallow-code/marshmallow/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/marshmallow/marshmallow-3.12.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=218557aa78a8e89d586c8247df5e1b32
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.12.1 b/metadata/md5-cache/dev-python/marshmallow-3.12.1
deleted file mode 100644
index 33c1c8412e1c..000000000000
--- a/metadata/md5-cache/dev-python/marshmallow-3.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library for converting to and from native Python datatypes
-EAPI=7
-HOMEPAGE=https://github.com/marshmallow-code/marshmallow/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/marshmallow/marshmallow-3.12.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b8582cadcb13bb7d95f1aea42e710337
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.12.2 b/metadata/md5-cache/dev-python/marshmallow-3.12.2
deleted file mode 100644
index d0eb562d9dac..000000000000
--- a/metadata/md5-cache/dev-python/marshmallow-3.12.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library for converting to and from native Python datatypes
-EAPI=8
-HOMEPAGE=https://github.com/marshmallow-code/marshmallow/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/marshmallow/marshmallow-3.12.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6c11c88881b537a769efd03ffbe270ec
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.14.0 b/metadata/md5-cache/dev-python/marshmallow-3.14.0
new file mode 100644
index 000000000000..0a02f445f94f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/marshmallow-3.14.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library for converting to and from native Python datatypes
+EAPI=8
+HOMEPAGE=https://github.com/marshmallow-code/marshmallow/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/marshmallow/marshmallow-3.14.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6c11c88881b537a769efd03ffbe270ec
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.4.2 b/metadata/md5-cache/dev-python/matplotlib-3.4.2
index c93f6e7f73f9..3a19d7679ee3 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.4.2
+++ b/metadata/md5-cache/dev-python/matplotlib-3.4.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) virtual/pkgconfig doc? ( >=app-text/dvipng-1.15-r1 >=dev-python/colorspacious-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpydoc-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-gallery-0.3.1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended >=media-gfx/graphviz-2.42.3[cairo] ) test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) virtual/pkgconfig doc? ( >=app-text/dvipng-1.15-r1 >=dev-python/colorspacious-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpydoc-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-gallery-0.3.1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended dev-texlive/texlive-luatex dev-texlive/texlive-xetex >=media-gfx/graphviz-2.42.3[cairo] ) test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Pure python plotting library with matlab like syntax
 EAPI=7
@@ -6,10 +6,10 @@ HOMEPAGE=https://matplotlib.org/
 IUSE=cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
 KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.4.2.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=09ee13fa4d3ef06c088a792b35a49c8d
+_md5_=55e9bb96d01929373daf8a57f6ffb134
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.4.3 b/metadata/md5-cache/dev-python/matplotlib-3.4.3
deleted file mode 100644
index 4f42e776f9fc..000000000000
--- a/metadata/md5-cache/dev-python/matplotlib-3.4.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) virtual/pkgconfig doc? ( >=app-text/dvipng-1.15-r1 >=dev-python/colorspacious-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpydoc-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-gallery-0.3.1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended >=media-gfx/graphviz-2.42.3[cairo] ) test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=Pure python plotting library with matlab like syntax
-EAPI=8
-HOMEPAGE=https://matplotlib.org/
-IUSE=cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.4.3.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=d44db2e41702cf2ae0193ad07d5d2fd8
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.4.3-r1 b/metadata/md5-cache/dev-python/matplotlib-3.4.3-r1
new file mode 100644
index 000000000000..576016233832
--- /dev/null
+++ b/metadata/md5-cache/dev-python/matplotlib-3.4.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) virtual/pkgconfig doc? ( >=app-text/dvipng-1.15-r1 >=dev-python/colorspacious-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpydoc-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-gallery-0.3.1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended dev-texlive/texlive-luatex dev-texlive/texlive-xetex >=media-gfx/graphviz-2.42.3[cairo] ) test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) test? ( dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Pure python plotting library with matlab like syntax
+EAPI=8
+HOMEPAGE=https://matplotlib.org/
+IUSE=cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
+RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.18.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-7.1.1[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) webagg? ( >=www-servers/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.4.3.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=b64d5b24b5ef65e8738f02c342618d0c
diff --git a/metadata/md5-cache/dev-python/matplotlib-inline-0.1.2 b/metadata/md5-cache/dev-python/matplotlib-inline-0.1.2
deleted file mode 100644
index acf903292e52..000000000000
--- a/metadata/md5-cache/dev-python/matplotlib-inline-0.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Inline Matplotlib backend for Jupyter
-EAPI=8
-HOMEPAGE=https://github.com/ipython/matplotlib-inline/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/ipython/matplotlib-inline/archive/0.1.2.tar.gz -> matplotlib-inline-0.1.2.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ebb0e3c75239947345693b1f9a588b28
diff --git a/metadata/md5-cache/dev-python/matplotlib-inline-0.1.3 b/metadata/md5-cache/dev-python/matplotlib-inline-0.1.3
index 2345ef472a12..f9e735a487ca 100644
--- a/metadata/md5-cache/dev-python/matplotlib-inline-0.1.3
+++ b/metadata/md5-cache/dev-python/matplotlib-inline-0.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Inline Matplotlib backend for Jupyter
 EAPI=8
 HOMEPAGE=https://github.com/ipython/matplotlib-inline/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/ipython/matplotlib-inline/archive/0.1.3.tar.gz -> matplotlib-inline-0.1.3.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=192e68e500193895c28adb380e6d317f
+_md5_=ebb0e3c75239947345693b1f9a588b28
diff --git a/metadata/md5-cache/dev-python/mediafile-0.6.0 b/metadata/md5-cache/dev-python/mediafile-0.6.0
deleted file mode 100644
index e2771ffc6e08..000000000000
--- a/metadata/md5-cache/dev-python/mediafile-0.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( dev-python/sphinx ) test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=media-libs/mutagen-1.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Read and write audio files' tags in Python
-EAPI=7
-HOMEPAGE=https://github.com/beetbox/mediafile
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=media-libs/mutagen-1.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/beetbox/mediafile/archive/v0.6.0.tar.gz -> mediafile-0.6.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0e748cc1b71075ea50438275df288652
diff --git a/metadata/md5-cache/dev-python/mediafile-0.7.0 b/metadata/md5-cache/dev-python/mediafile-0.7.0
deleted file mode 100644
index b76f585fc6fb..000000000000
--- a/metadata/md5-cache/dev-python/mediafile-0.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=media-libs/mutagen-1.45.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read and write audio files' tags in Python
-EAPI=8
-HOMEPAGE=https://github.com/beetbox/mediafile
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=media-libs/mutagen-1.45.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/beetbox/mediafile/archive/v0.7.0.tar.gz -> mediafile-0.7.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=941bdbcf1221c14e2793115823d03e65
diff --git a/metadata/md5-cache/dev-python/mediafile-0.8.0 b/metadata/md5-cache/dev-python/mediafile-0.8.0
deleted file mode 100644
index 7847abb14c1d..000000000000
--- a/metadata/md5-cache/dev-python/mediafile-0.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=media-libs/mutagen-1.45.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read and write audio files' tags in Python
-EAPI=8
-HOMEPAGE=https://github.com/beetbox/mediafile
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=media-libs/mutagen-1.45.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/beetbox/mediafile/archive/v0.8.0.tar.gz -> mediafile-0.8.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=941bdbcf1221c14e2793115823d03e65
diff --git a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.10.0 b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.10.0
index b256a6fc1f99..c5eec6c3ba62 100644
--- a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.10.0
+++ b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.10.0
@@ -4,7 +4,7 @@ DESCRIPTION=Display the localized date of the last git modification of a markdow
 EAPI=8
 HOMEPAGE=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/ https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
 IUSE=test python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/Babel-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/archive/v0.10.0.tar.gz -> mkdocs-git-revision-date-localized-plugin-0.10.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c5bea986dfe1b423e4a0268b38bb90fd
+_md5_=6f0ca093681dcc137e5b81c583d94812
diff --git a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.2 b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.2
deleted file mode 100644
index 88979e751373..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mkdocs-material[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) doc? ( dev-vcs/git ) test? ( >=dev-python/Babel-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Display the localized date of the last git modification of a markdown file
-EAPI=7
-HOMEPAGE=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/ https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
-IUSE=test python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/Babel-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/archive/v0.9.2.tar.gz -> mkdocs-git-revision-date-localized-plugin-0.9.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d8089f0e98f506c34f9816eb7e696915
diff --git a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.3 b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.3
deleted file mode 100644
index fb65f6f36ed9..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.9.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mkdocs-material[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) doc? ( dev-vcs/git ) test? ( >=dev-python/Babel-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Display the localized date of the last git modification of a markdown file
-EAPI=8
-HOMEPAGE=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/ https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
-IUSE=test python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/Babel-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/archive/v0.9.3.tar.gz -> mkdocs-git-revision-date-localized-plugin-0.9.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ebe5ef4407d590437a8f8d39a4164c55
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.1 b/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.1
deleted file mode 100644
index 97ff03b77bbd..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/mkdocs-material-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extension pack for Python Markdown
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/mkdocs-material-extensions https://pypi.org/project/mkdocs-material-extensions
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-PDEPEND=>=dev-python/mkdocs-material-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/mkdocs-material-extensions/archive/1.0.1.tar.gz -> mkdocs-material-extensions-1.0.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5a08d7671a97a3263c6cf4c94f8383da
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.3 b/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.3
index 16d70ddce812..cd42fe7e91fd 100644
--- a/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.3
+++ b/metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.3
@@ -4,7 +4,7 @@ DESCRIPTION=Extension pack for Python Markdown
 EAPI=8
 HOMEPAGE=https://github.com/facelessuser/mkdocs-material-extensions https://pypi.org/project/mkdocs-material-extensions
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 PDEPEND=>=dev-python/mkdocs-material-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/mkdocs-material-extensions/archive/1.0.3.tar.gz -> mkdocs-material-extensions-1.0.3.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fee25f268899a05231ddc8905dbd005c
+_md5_=297ca5cd69ce86db58546bb3c75d32fc
diff --git a/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.1 b/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.1
deleted file mode 100644
index a81337f388c1..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Plugin for Mkdocs page redirects
-EAPI=7
-HOMEPAGE=https://github.com/datarobot/mkdocs-redirects https://pypi.org/project/mkdocs-redirects/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/mkdocs-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/twine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/datarobot/mkdocs-redirects/archive/v1.0.1.tar.gz -> mkdocs-redirects-1.0.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9553433072d214ee22cb1f78be7520be
diff --git a/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.3-r1 b/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.3-r1
index 7093ee943924..1ece77dc64ea 100644
--- a/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.3-r1
+++ b/metadata/md5-cache/dev-python/mkdocs-redirects-1.0.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Plugin for Mkdocs page redirects
 EAPI=8
 HOMEPAGE=https://github.com/datarobot/mkdocs-redirects https://pypi.org/project/mkdocs-redirects/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/mkdocs-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/twine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/datarobot/mkdocs-redirects/archive/07ef89796ec97be3c6ea2681441992d5d4bfa87b.tar.gz -> mkdocs-redirects-1.0.3.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=59b4810c4692bb300dac01b1fc956436
+_md5_=2af43ca9d34a20aaa1bc1b894a510507
diff --git a/metadata/md5-cache/dev-python/more-itertools-8.10.0 b/metadata/md5-cache/dev-python/more-itertools-8.10.0
index 1d16b75d3e53..7daff53d797d 100644
--- a/metadata/md5-cache/dev-python/more-itertools-8.10.0
+++ b/metadata/md5-cache/dev-python/more-itertools-8.10.0
@@ -4,7 +4,7 @@ DESCRIPTION=More routines for operating on iterables, beyond itertools
 EAPI=8
 HOMEPAGE=https://pypi.org/project/more-itertools/
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/more-itertools/more-itertools-8.10.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c8d1bf0f2c48b5f05839ca45d3a77ddb
+_md5_=9a6386fda36f7611d594f96cc9fba23d
diff --git a/metadata/md5-cache/dev-python/more-itertools-8.8.0 b/metadata/md5-cache/dev-python/more-itertools-8.8.0
deleted file mode 100644
index 0948e972bd6e..000000000000
--- a/metadata/md5-cache/dev-python/more-itertools-8.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=More routines for operating on iterables, beyond itertools
-EAPI=7
-HOMEPAGE=https://pypi.org/project/more-itertools/
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/more-itertools/more-itertools-8.8.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9f2247a76effd2e09271ffe1e0d23f47
diff --git a/metadata/md5-cache/dev-python/more-itertools-8.9.0 b/metadata/md5-cache/dev-python/more-itertools-8.9.0
deleted file mode 100644
index 463cf6d72e15..000000000000
--- a/metadata/md5-cache/dev-python/more-itertools-8.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=More routines for operating on iterables, beyond itertools
-EAPI=8
-HOMEPAGE=https://pypi.org/project/more-itertools/
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/more-itertools/more-itertools-8.9.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c8d1bf0f2c48b5f05839ca45d3a77ddb
diff --git a/metadata/md5-cache/dev-python/moto-2.2.10 b/metadata/md5-cache/dev-python/moto-2.2.10
new file mode 100644
index 000000000000..753534191704
--- /dev/null
+++ b/metadata/md5-cache/dev-python/moto-2.2.10
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Mock library for boto
+EAPI=8
+HOMEPAGE=https://github.com/spulec/moto
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/moto/moto-2.2.10.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bb02a72b87a713e9f393cc7cf800f81e
diff --git a/metadata/md5-cache/dev-python/moto-2.2.6 b/metadata/md5-cache/dev-python/moto-2.2.6
index 9501741db5b4..88c5dfccefe9 100644
--- a/metadata/md5-cache/dev-python/moto-2.2.6
+++ b/metadata/md5-cache/dev-python/moto-2.2.6
@@ -4,7 +4,7 @@ DESCRIPTION=Mock library for boto
 EAPI=8
 HOMEPAGE=https://github.com/spulec/moto
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-2.2.6.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=40888cd5fce79c177870580329d768da
+_md5_=73a5d006a831cf34eaad4bd11633e7de
diff --git a/metadata/md5-cache/dev-python/moto-2.2.9 b/metadata/md5-cache/dev-python/moto-2.2.9
new file mode 100644
index 000000000000..0ce78c42a3bc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/moto-2.2.9
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Mock library for boto
+EAPI=8
+HOMEPAGE=https://github.com/spulec/moto
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto3-1.9.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/botocore-1.12.201[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/moto/moto-2.2.9.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5318d3dc2193e1a2df2a2a4ff6c724b5
diff --git a/metadata/md5-cache/dev-python/mpi4py-3.0.3 b/metadata/md5-cache/dev-python/mpi4py-3.0.3
index ac8d264bef8a..dcf260de5b30 100644
--- a/metadata/md5-cache/dev-python/mpi4py-3.0.3
+++ b/metadata/md5-cache/dev-python/mpi4py-3.0.3
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/mpi test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/mpi[romio] )
+DEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/mpi test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/mpi[romio] )
 DESCRIPTION=Message Passing Interface for Python
 EAPI=7
 HOMEPAGE=https://bitbucket.org/mpi4py/ https://pypi.org/project/mpi4py/
-IUSE=doc examples test python_targets_python3_8 python_targets_python3_9
+IUSE=doc examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/mpi python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/mpi python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mpi4py/mpi4py-3.0.3.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=906e5073d03523f71462489c373eed33
+_md5_=476eb64649e51b2e33285599ff8775ee
diff --git a/metadata/md5-cache/dev-python/mss-6.1.0 b/metadata/md5-cache/dev-python/mss-6.1.0
index 2fb75b393c46..32734b721b0b 100644
--- a/metadata/md5-cache/dev-python/mss-6.1.0
+++ b/metadata/md5-cache/dev-python/mss-6.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=An ultra fast cross-platform multiple screenshots module in python u
 EAPI=7
 HOMEPAGE=https://github.com/BoboTiG/python-mss
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/BoboTiG/python-mss/archive/v6.1.0.tar.gz -> mss-6.1.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=6d33ef155ec31650eea1f7d86c838f4f
+_md5_=f71301fc32fe923c4a82a401875a5e08
diff --git a/metadata/md5-cache/dev-python/munkres-1.1.2 b/metadata/md5-cache/dev-python/munkres-1.1.2
deleted file mode 100644
index f8b5ca6b8cb3..000000000000
--- a/metadata/md5-cache/dev-python/munkres-1.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Module implementing munkres algorithm for the Assignment Problem
-EAPI=7
-HOMEPAGE=https://pypi.org/project/munkres/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/bmc/munkres/archive/release-1.1.2.tar.gz -> munkres-1.1.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4b4fc4243089879df54b26bb0da9a0ba
diff --git a/metadata/md5-cache/dev-python/mypy-0.910 b/metadata/md5-cache/dev-python/mypy-0.910
index fc6739aec3e3..67b836f8f98c 100644
--- a/metadata/md5-cache/dev-python/mypy-0.910
+++ b/metadata/md5-cache/dev-python/mypy-0.910
@@ -4,7 +4,7 @@ DESCRIPTION=Optional static typing for Python
 EAPI=7
 HOMEPAGE=http://www.mypy-lang.org/
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=!dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/typed-ast-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mypy_extensions-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy/archive/v0.910.tar.gz -> mypy-0.910.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3da039fcfcb07ca00c385d3a95b4c64c
+_md5_=f6f2e4b325d1e8f04b69168c955e5381
diff --git a/metadata/md5-cache/dev-python/mysqlclient-2.0.3 b/metadata/md5-cache/dev-python/mysqlclient-2.0.3
index b2d3c52e9761..d0d5df52fdcb 100644
--- a/metadata/md5-cache/dev-python/mysqlclient-2.0.3
+++ b/metadata/md5-cache/dev-python/mysqlclient-2.0.3
@@ -5,7 +5,7 @@ DESCRIPTION=Fork of MySQL-python
 EAPI=8
 HOMEPAGE=https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=dev-db/mysql-connector-c:0= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mysqlclient/mysqlclient-2.0.3.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9912052e4bec5e2d77d6851c5eea612f
+_md5_=cf1762fe1872ecd65b9940de617bb953
diff --git a/metadata/md5-cache/dev-python/natsort-7.1.1 b/metadata/md5-cache/dev-python/natsort-7.1.1
index b01c5b20a64b..8a3cd2aff254 100644
--- a/metadata/md5-cache/dev-python/natsort-7.1.1
+++ b/metadata/md5-cache/dev-python/natsort-7.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Natural sorting for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/natsort/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/natsort/natsort-7.1.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=44d6524ac8cd3c2c4ebac3fd690cfa05
+_md5_=0b151ebb9a744cc932cbb6ca091f8989
diff --git a/metadata/md5-cache/dev-python/nbconvert-6.0.7 b/metadata/md5-cache/dev-python/nbconvert-6.0.7
index 2dd6d2c25cdd..01bf6f43fe4e 100644
--- a/metadata/md5-cache/dev-python/nbconvert-6.0.7
+++ b/metadata/md5-cache/dev-python/nbconvert-6.0.7
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pebble[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/inkscape ) test? ( dev-python/bleach[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/entrypoints-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyterlab_pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mistune-0.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/pebble[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( media-gfx/inkscape ) ) test? ( dev-python/bleach[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/entrypoints-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyterlab_pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mistune-0.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Converting Jupyter Notebooks
 EAPI=8
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbconvert/nbconvert-6.0.7.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e609c86f3520ecc7bf71739ac8be3c76
+_md5_=7bc9b3ba9f2fd08c7a05e6c0be6c46bb
diff --git a/metadata/md5-cache/dev-python/nbconvert-6.2.0 b/metadata/md5-cache/dev-python/nbconvert-6.2.0
index 3c83d6d1583b..cb400d116ca7 100644
--- a/metadata/md5-cache/dev-python/nbconvert-6.2.0
+++ b/metadata/md5-cache/dev-python/nbconvert-6.2.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pebble[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/inkscape ) test? ( dev-python/bleach[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/entrypoints-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyterlab_pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mistune-0.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/pebble[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( media-gfx/inkscape ) ) test? ( dev-python/bleach[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/entrypoints-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyterlab_pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mistune-0.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Converting Jupyter Notebooks
 EAPI=8
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbconvert/nbconvert-6.2.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7809166f37d5fd7213e9c6b5078dbc4b
+_md5_=af10aa3cc2331e205c1100155b78fc10
diff --git a/metadata/md5-cache/dev-python/nbdime-2.0.0-r1 b/metadata/md5-cache/dev-python/nbdime-2.0.0-r1
deleted file mode 100644
index d548ce21ccc7..000000000000
--- a/metadata/md5-cache/dev-python/nbdime-2.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-cov[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tabulate[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?] webtools? ( net-libs/nodejs[npm] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Diff and merge of Jupyter Notebooks
-EAPI=7
-HOMEPAGE=https://jupyter.org
-IUSE=webtools doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?] webtools? ( net-libs/nodejs[npm] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/nbdime/nbdime-2.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ca964cbb64bfc1aaf25489b02e7610c5
diff --git a/metadata/md5-cache/dev-python/netcdf4-python-1.5.6 b/metadata/md5-cache/dev-python/netcdf4-python-1.5.6
deleted file mode 100644
index b0496d670ca3..000000000000
--- a/metadata/md5-cache/dev-python/netcdf4-python-1.5.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( sci-libs/hdf5 sci-libs/netcdf[hdf5,tools] dev-python/cftime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sci-libs/hdf5 sci-libs/netcdf:=[hdf5]
-DESCRIPTION=Python/numpy interface to the netCDF C library
-EAPI=7
-HOMEPAGE=https://unidata.github.io/netcdf4-python/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=sci-libs/hdf5 sci-libs/netcdf:=[hdf5] dev-python/cftime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/netCDF4/netCDF4-1.5.6.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b753e76053c11f83617ec5b45c7b1014
diff --git a/metadata/md5-cache/dev-python/networkx-2.6.2 b/metadata/md5-cache/dev-python/networkx-2.6.2
deleted file mode 100644
index 97994d530bd7..000000000000
--- a/metadata/md5-cache/dev-python/networkx-2.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/matplotlib-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] extras? ( >=dev-python/pydot-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/pygraphviz-1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/gdal-1.10.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/pygraphviz-1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/gdal-1.10.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) xml? ( >=dev-python/lxml-4.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python tools to manipulate graphs and complex networks
-EAPI=7
-HOMEPAGE=https://networkx.org/ https://github.com/networkx/networkx
-IUSE=examples extras xml yaml test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/matplotlib-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] extras? ( >=dev-python/pydot-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/pygraphviz-1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/gdal-1.10.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/pygraphviz-1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/gdal-1.10.0[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) xml? ( >=dev-python/lxml-4.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/networkx/networkx-2.6.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=84df5861d01a301d70787c45f9114948
diff --git a/metadata/md5-cache/dev-python/networkx-2.6.3 b/metadata/md5-cache/dev-python/networkx-2.6.3
index 0ea70d04a2ed..c6e6180f4404 100644
--- a/metadata/md5-cache/dev-python/networkx-2.6.3
+++ b/metadata/md5-cache/dev-python/networkx-2.6.3
@@ -4,7 +4,7 @@ DESCRIPTION=Python tools to manipulate graphs and complex networks
 EAPI=8
 HOMEPAGE=https://networkx.org/ https://github.com/networkx/networkx
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-2.6.3.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=d7526c2162443efa3d1208bad1bba887
+_md5_=877d756295776ebc34b6697c829048b9
diff --git a/metadata/md5-cache/dev-python/nltk-3.6.5 b/metadata/md5-cache/dev-python/nltk-3.6.5
new file mode 100644
index 000000000000..585c4f428759
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nltk-3.6.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/joblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nltk-data-20200312-r1 dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/twython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/joblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite,tk?,xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite,tk?,xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite,tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Natural Language Toolkit
+EAPI=8
+HOMEPAGE=https://www.nltk.org/ https://github.com/nltk/nltk/
+IUSE=tk test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=Apache-2.0
+PDEPEND=dev-python/nltk-data
+RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/joblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite,tk?,xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite,tk?,xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite,tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nltk/nltk/archive/3.6.5.tar.gz -> nltk-3.6.5.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=016258f458b8210ea6aac7675100ca13
diff --git a/metadata/md5-cache/dev-python/nose-1.3.7-r8 b/metadata/md5-cache/dev-python/nose-1.3.7-r8
deleted file mode 100644
index 9e0687db4fc7..000000000000
--- a/metadata/md5-cache/dev-python/nose-1.3.7-r8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( !hppa? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_python3_8? ( !hppa? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_python3_9? ( !hppa? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_python3_8? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Unittest extension with automatic test suite discovery and easy test authoring
-EAPI=7
-HOMEPAGE=https://pypi.org/project/nose/ https://nose.readthedocs.io/en/latest/ https://github.com/nose-devs/nose
-IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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
-LICENSE=LGPL-2.1
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/nose/nose-1.3.7.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=26133a79d4de1c68e16b3b3748f33c77
diff --git a/metadata/md5-cache/dev-python/nose-1.3.7-r9 b/metadata/md5-cache/dev-python/nose-1.3.7-r9
new file mode 100644
index 000000000000..51ddd28a2991
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nose-1.3.7-r9
@@ -0,0 +1,15 @@
+BDEPEND=<dev-python/setuptools-58[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( python_targets_pypy3? ( !hppa? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_python3_8? ( !hppa? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_python3_9? ( !hppa? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_python3_8? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Unittest extension with automatic test suite discovery and easy test authoring
+EAPI=7
+HOMEPAGE=https://pypi.org/project/nose/ https://nose.readthedocs.io/en/latest/ https://github.com/nose-devs/nose
+IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+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
+LICENSE=LGPL-2.1
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/n/nose/nose-1.3.7.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8c5521c5ef48833e48e456355d52b420
diff --git a/metadata/md5-cache/dev-python/ntplib-0.3.3 b/metadata/md5-cache/dev-python/ntplib-0.3.3
deleted file mode 100644
index a59af6becb10..000000000000
--- a/metadata/md5-cache/dev-python/ntplib-0.3.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python NTP library
-EAPI=7
-HOMEPAGE=https://pypi.org/project/ntplib/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-PROPERTIES=test_network
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/n/ntplib/ntplib-0.3.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=408e12304b9158dc692b38aa517e1483
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.16.3 b/metadata/md5-cache/dev-python/nuitka-0.6.16.3
deleted file mode 100644
index cb8dd4b1d0ce..000000000000
--- a/metadata/md5-cache/dev-python/nuitka-0.6.16.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=7
-HOMEPAGE=https://www.nuitka.net
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://nuitka.net/releases/Nuitka-0.6.16.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7918f53248cdc0df1d4e5f3e968da238
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.16.4 b/metadata/md5-cache/dev-python/nuitka-0.6.16.4
deleted file mode 100644
index 6234c5961061..000000000000
--- a/metadata/md5-cache/dev-python/nuitka-0.6.16.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://www.nuitka.net
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://nuitka.net/releases/Nuitka-0.6.16.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5c59e86d7ebd650598383e65cb4ba47b
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.17 b/metadata/md5-cache/dev-python/nuitka-0.6.17
deleted file mode 100644
index 0b4dd0fb832b..000000000000
--- a/metadata/md5-cache/dev-python/nuitka-0.6.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://www.nuitka.net
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://nuitka.net/releases/Nuitka-0.6.17.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5c59e86d7ebd650598383e65cb4ba47b
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.17.1 b/metadata/md5-cache/dev-python/nuitka-0.6.17.1
deleted file mode 100644
index e33140a35ee9..000000000000
--- a/metadata/md5-cache/dev-python/nuitka-0.6.17.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://www.nuitka.net
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://nuitka.net/releases/Nuitka-0.6.17.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5c59e86d7ebd650598383e65cb4ba47b
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.17.2 b/metadata/md5-cache/dev-python/nuitka-0.6.17.2
deleted file mode 100644
index f0b1f44f8416..000000000000
--- a/metadata/md5-cache/dev-python/nuitka-0.6.17.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://www.nuitka.net
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://nuitka.net/releases/Nuitka-0.6.17.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5c59e86d7ebd650598383e65cb4ba47b
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.17.3 b/metadata/md5-cache/dev-python/nuitka-0.6.17.3
new file mode 100644
index 000000000000..906a5a09e88e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.17.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python to native compiler
+EAPI=8
+HOMEPAGE=https://www.nuitka.net
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://nuitka.net/releases/Nuitka-0.6.17.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5c59e86d7ebd650598383e65cb4ba47b
diff --git a/metadata/md5-cache/dev-python/numpydoc-1.1.0 b/metadata/md5-cache/dev-python/numpydoc-1.1.0
index b9ade56e3686..de13bfb81450 100644
--- a/metadata/md5-cache/dev-python/numpydoc-1.1.0
+++ b/metadata/md5-cache/dev-python/numpydoc-1.1.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/matplotlib-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( >=dev-python/matplotlib-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx extension to support docstrings in Numpy format
 EAPI=7
 HOMEPAGE=https://pypi.org/project/numpydoc/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
-RDEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpydoc/numpydoc-1.1.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7bd9ee677c65db37a21a285fa38372fc
+_md5_=876d57aa2d843767500b8ba0dd9a522c
diff --git a/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1 b/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
deleted file mode 100644
index 71e725e2a849..000000000000
--- a/metadata/md5-cache/dev-python/oauth2-1.9.0_p1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=Library for OAuth version 1.0
-EAPI=7
-HOMEPAGE=https://pypi.org/project/oauth2/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/oauth2/oauth2-1.9.0.post1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dd033bef89b9b4ba13faf50577f13f35
diff --git a/metadata/md5-cache/dev-python/openpyxl-3.0.7-r1 b/metadata/md5-cache/dev-python/openpyxl-3.0.7-r1
deleted file mode 100644
index 1effac2207a9..000000000000
--- a/metadata/md5-cache/dev-python/openpyxl-3.0.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff,jpeg] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( dev-python/et_xmlfile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure python reader and writer of Excel OpenXML files
-EAPI=7
-HOMEPAGE=https://openpyxl.readthedocs.io/en/stable/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 x86
-LICENSE=MIT
-RDEPEND=dev-python/et_xmlfile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://foss.heptapod.net/openpyxl/openpyxl/-/archive/3.0.7/openpyxl-3.0.7.tar.bz2
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0ddf101386873d95d72177f0cd032723
diff --git a/metadata/md5-cache/dev-python/openpyxl-3.0.8 b/metadata/md5-cache/dev-python/openpyxl-3.0.8
deleted file mode 100644
index ba9134885dd7..000000000000
--- a/metadata/md5-cache/dev-python/openpyxl-3.0.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,tiff,jpeg] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( dev-python/et_xmlfile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure python reader and writer of Excel OpenXML files
-EAPI=8
-HOMEPAGE=https://openpyxl.readthedocs.io/en/stable/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/et_xmlfile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://foss.heptapod.net/openpyxl/openpyxl/-/archive/3.0.8/openpyxl-3.0.8.tar.bz2
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fe75076a6fdbc7c78fe20ee88af3136e
diff --git a/metadata/md5-cache/dev-python/openpyxl-3.0.9 b/metadata/md5-cache/dev-python/openpyxl-3.0.9
index e7e2a969a674..89b385db03bf 100644
--- a/metadata/md5-cache/dev-python/openpyxl-3.0.9
+++ b/metadata/md5-cache/dev-python/openpyxl-3.0.9
@@ -4,7 +4,7 @@ DESCRIPTION=Pure python reader and writer of Excel OpenXML files
 EAPI=8
 HOMEPAGE=https://openpyxl.readthedocs.io/en/stable/
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 x86
 LICENSE=MIT
 RDEPEND=dev-python/et_xmlfile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://foss.heptapod.net/openpyxl/openpyxl/-/archive/3.0.9/openpyxl-3.0.9.tar.bz2
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fe75076a6fdbc7c78fe20ee88af3136e
+_md5_=c1da4a1b484e70cf25394ae6e964f630
diff --git a/metadata/md5-cache/dev-python/oset-0.1.3 b/metadata/md5-cache/dev-python/oset-0.1.3
deleted file mode 100644
index 283cb7602b2e..000000000000
--- a/metadata/md5-cache/dev-python/oset-0.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Ordered Set
-EAPI=7
-HOMEPAGE=https://pypi.org/project/oset/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oset/oset-0.1.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fdb720cbfbb664db5ff09a33e2f29214
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-5.0.1-r1 b/metadata/md5-cache/dev-python/oslo-i18n-5.0.1-r1
deleted file mode 100644
index d145699625fd..000000000000
--- a/metadata/md5-cache/dev-python/oslo-i18n-5.0.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Oslo i18n library
-EAPI=7
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-5.0.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1a1ef3b23de4c5b3152e7ab0423ab16b
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-5.1.0 b/metadata/md5-cache/dev-python/oslo-i18n-5.1.0
index a81a3b83b317..472462a2fd7e 100644
--- a/metadata/md5-cache/dev-python/oslo-i18n-5.1.0
+++ b/metadata/md5-cache/dev-python/oslo-i18n-5.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Oslo i18n library
 EAPI=8
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-5.1.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=466420568df0aff0f074f3b40022f21e
+_md5_=0fec9d4ee1a3c989109c0b6fb27183ea
diff --git a/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10-r1 b/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10-r1
deleted file mode 100644
index 25841d91e9b9..000000000000
--- a/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Commonly needed Python modules used by Python software developed at OSRF
-EAPI=7
-HOMEPAGE=https://github.com/osrf/osrf_pycommon
-IUSE=test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/osrf/osrf_pycommon/archive/0.1.10.tar.gz -> osrf_pycommon-0.1.10.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=815a033323b9260f6ecdad834a55896c
diff --git a/metadata/md5-cache/dev-python/osrf_pycommon-0.2.1 b/metadata/md5-cache/dev-python/osrf_pycommon-0.2.1
deleted file mode 100644
index 642e5d93db80..000000000000
--- a/metadata/md5-cache/dev-python/osrf_pycommon-0.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Commonly needed Python modules used by Python software developed at OSRF
-EAPI=8
-HOMEPAGE=https://github.com/osrf/osrf_pycommon
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/osrf/osrf_pycommon/archive/0.2.1.tar.gz -> osrf_pycommon-0.2.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9ce8ac4c0338eddcbc7b42fc9e5f4e4d
diff --git a/metadata/md5-cache/dev-python/owslib-0.20.0 b/metadata/md5-cache/dev-python/owslib-0.20.0
index 112af7d033e5..3329368cbc9a 100644
--- a/metadata/md5-cache/dev-python/owslib-0.20.0
+++ b/metadata/md5-cache/dev-python/owslib-0.20.0
@@ -5,7 +5,7 @@ DESCRIPTION=Library for client programming with Open Geospatial Consortium web s
 EAPI=7
 HOMEPAGE=https://geopython.github.io/OWSLib/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 PROPERTIES=test_network
 RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyproj[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/geopython/owslib/archive/0.20.0.tar.gz -> owslib-0.20.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=19e78256c6d7239ce3a4cc0ddce610bf
+_md5_=713570edb3ada83dbd446394c6fc5d63
diff --git a/metadata/md5-cache/dev-python/pandas-1.3.3 b/metadata/md5-cache/dev-python/pandas-1.3.3
index 274c7842a38b..04e95cc6c42d 100644
--- a/metadata/md5-cache/dev-python/pandas-1.3.3
+++ b/metadata/md5-cache/dev-python/pandas-1.3.3
@@ -5,7 +5,7 @@ DESCRIPTION=Powerful data structures for data analysis and statistics
 EAPI=8
 HOMEPAGE=https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/
 IUSE=doc full-support minimal test X python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.17.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1-r3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2017.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !minimal? ( >=dev-python/bottleneck-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numexpr-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) full-support? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytables-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xarray-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] X? ( || ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pandas-dev/pandas/releases/download/v1.3.3/pandas-1.3.3.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=af1a98a56624b73437fa93a04296a4e4
+_md5_=9492fd08606e7b55b164169c9f5ec8ad
diff --git a/metadata/md5-cache/dev-python/pandas-1.3.4 b/metadata/md5-cache/dev-python/pandas-1.3.4
new file mode 100644
index 000000000000..1277f823cc68
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pandas-1.3.4
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-python/numpy-1.17.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1-r3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2017.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cython-0.29.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( x11-base/xorg-server[xvfb] x11-apps/xhost app-text/pandoc dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbsphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpydoc-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openpyxl-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytables-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlrd[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost >=dev-python/bottleneck-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numexpr-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytables-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xarray-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] X? ( || ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xsel ) ) dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pymysql[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psycopg:2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xsel )
+DESCRIPTION=Powerful data structures for data analysis and statistics
+EAPI=8
+HOMEPAGE=https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/
+IUSE=doc full-support minimal test X python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/numpy-1.17.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1-r3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2017.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !minimal? ( >=dev-python/bottleneck-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numexpr-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) full-support? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytables-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xarray-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] X? ( || ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pandas-dev/pandas/releases/download/v1.3.4/pandas-1.3.4.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=af1a98a56624b73437fa93a04296a4e4
diff --git a/metadata/md5-cache/dev-python/pandas-datareader-0.9.0 b/metadata/md5-cache/dev-python/pandas-datareader-0.9.0
deleted file mode 100644
index 84c3339e3605..000000000000
--- a/metadata/md5-cache/dev-python/pandas-datareader-0.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/wrapt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pandas-0.19.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pandas DataFrame extraction from a wide range of Internet sources
-EAPI=7
-HOMEPAGE=https://github.com/pydata/pandas-datareader
-IUSE=doc doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pandas-0.19.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pydata/pandas-datareader/archive/v0.9.0.tar.gz -> pandas-datareader-0.9.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c697261ca9e1315ff4d4d8182b8ac2e9
diff --git a/metadata/md5-cache/dev-python/pandocfilters-1.4.3 b/metadata/md5-cache/dev-python/pandocfilters-1.4.3
deleted file mode 100644
index f68b5a9e694b..000000000000
--- a/metadata/md5-cache/dev-python/pandocfilters-1.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Utilities for writing pandoc filters in python
-EAPI=7
-HOMEPAGE=https://github.com/jgm/pandocfilters
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pandocfilters/pandocfilters-1.4.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6eec114ed561cca720d1d7d7da557925
diff --git a/metadata/md5-cache/dev-python/pandocfilters-1.5.0 b/metadata/md5-cache/dev-python/pandocfilters-1.5.0
index 28beccc167c0..f186d89f0617 100644
--- a/metadata/md5-cache/dev-python/pandocfilters-1.5.0
+++ b/metadata/md5-cache/dev-python/pandocfilters-1.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=Utilities for writing pandoc filters in python
 EAPI=8
 HOMEPAGE=https://github.com/jgm/pandocfilters
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandocfilters/pandocfilters-1.5.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75e3d93ac31ff37a423c7446734f82b6
+_md5_=3cb092c89b0a4b8708132745ab293034
diff --git a/metadata/md5-cache/dev-python/paramiko-2.8.0 b/metadata/md5-cache/dev-python/paramiko-2.8.0
new file mode 100644
index 000000000000..416d7988fd66
--- /dev/null
+++ b/metadata/md5-cache/dev-python/paramiko-2.8.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10[threads(+)] dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/bcrypt-3.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pynacl-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=SSH2 protocol library
+EAPI=8
+HOMEPAGE=https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/
+IUSE=examples server doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+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
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/bcrypt-3.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pynacl-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/paramiko/paramiko/archive/2.8.0.tar.gz -> paramiko-2.8.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7061db08d88899bd1fd27041dea3ac48
diff --git a/metadata/md5-cache/dev-python/parse-1.19.0 b/metadata/md5-cache/dev-python/parse-1.19.0
new file mode 100644
index 000000000000..862d68f0f09d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/parse-1.19.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Parse strings using a specification based on the Python format() syntax
+EAPI=8
+HOMEPAGE=https://pypi.org/project/parse/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/parse/parse-1.19.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1b63ef736aab5c3be1ffa33272a00287
diff --git a/metadata/md5-cache/dev-python/parse_type-0.5.2 b/metadata/md5-cache/dev-python/parse_type-0.5.2
new file mode 100644
index 000000000000..c2f45b60a448
--- /dev/null
+++ b/metadata/md5-cache/dev-python/parse_type-0.5.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extension to the parse module
+EAPI=8
+HOMEPAGE=https://pypi.org/project/parse-type/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/parse_type/parse_type-0.5.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=81ccabea2607bc43ae8d53a3e915241c
diff --git a/metadata/md5-cache/dev-python/pdoc3-0.9.2 b/metadata/md5-cache/dev-python/pdoc3-0.9.2
deleted file mode 100644
index f483a834c6cf..000000000000
--- a/metadata/md5-cache/dev-python/pdoc3-0.9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DESCRIPTION=Auto-generate API documentation for Python projects
-EAPI=7
-HOMEPAGE=https://pdoc3.github.io/pdoc/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3+
-RDEPEND=dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pdoc3/pdoc3-0.9.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=545105898c6251b0c204e4711ca1a964
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.35 b/metadata/md5-cache/dev-python/phonenumbers-8.12.35
new file mode 100644
index 000000000000..1d871f40e9c6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.35
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python port of Google's libphonenumber
+EAPI=8
+HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.35.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f70b6d8f0abc35acbb5be565add89672
diff --git a/metadata/md5-cache/dev-python/picklemagic-0.0_pre20160415 b/metadata/md5-cache/dev-python/picklemagic-0.0_pre20160415
index 19ef41f8a474..18c6fce9f864 100644
--- a/metadata/md5-cache/dev-python/picklemagic-0.0_pre20160415
+++ b/metadata/md5-cache/dev-python/picklemagic-0.0_pre20160415
@@ -1,15 +1,14 @@
 BDEPEND=doc? ( dev-python/sphinx )
 DEFINED_PHASES=compile install
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
 DESCRIPTION=A library for analysing python pickles safely
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/CensoredUsername/picklemagic
-IUSE=doc python_targets_python3_8
+IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=WTFPL-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/picklemagic-0.0_pre20160415.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c019878d938a55b4a55460a8d18fd039
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1df28cd48d14e7e7f4e8554a70feeb7d
diff --git a/metadata/md5-cache/dev-python/pikepdf-3.2.0 b/metadata/md5-cache/dev-python/pikepdf-3.2.0
new file mode 100644
index 000000000000..8227555ade20
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pikepdf-3.2.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pybind11-2.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/attrs-20.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-timeout-1.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-text/qpdf-10.3.1:0= >=dev-python/pillow-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-text/qpdf-10.3.1:0=
+DESCRIPTION=Python library to work with pdf files based on qpdf
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=app-text/qpdf-10.3.1:0= >=dev-python/pillow-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pikepdf/pikepdf/archive/v3.2.0.tar.gz -> pikepdf-3.2.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ef45f3b2a8729130bc6c197588f3c7d0
diff --git a/metadata/md5-cache/dev-python/pillow-8.3.0 b/metadata/md5-cache/dev-python/pillow-8.3.0
index 2e960644b7fe..a946bbfa56ce 100644
--- a/metadata/md5-cache/dev-python/pillow-8.3.0
+++ b/metadata/md5-cache/dev-python/pillow-8.3.0
@@ -5,12 +5,12 @@ DESCRIPTION=Python Imaging Library (fork)
 EAPI=7
 HOMEPAGE=https://python-pillow.org/
 IUSE=examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 RDEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=test? ( jpeg jpeg2k tiff ) || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+REQUIRED_USE=test? ( jpeg jpeg2k tiff truetype ) || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/8.3.0.tar.gz -> pillow-8.3.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=e0dcb0be8fabe80807ef22080f76272a
+_md5_=5bd3a8a9c9687c0643827d529f4717f7
diff --git a/metadata/md5-cache/dev-python/pillow-8.3.1 b/metadata/md5-cache/dev-python/pillow-8.3.1
index 385150002dfd..7c107844d0de 100644
--- a/metadata/md5-cache/dev-python/pillow-8.3.1
+++ b/metadata/md5-cache/dev-python/pillow-8.3.1
@@ -8,9 +8,9 @@ IUSE=examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib p
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 RDEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=test? ( jpeg jpeg2k tiff ) || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+REQUIRED_USE=test? ( jpeg jpeg2k tiff truetype ) || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/8.3.1.tar.gz -> pillow-8.3.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=e0dcb0be8fabe80807ef22080f76272a
+_md5_=19033efc5fdb5d6e77e7234984744973
diff --git a/metadata/md5-cache/dev-python/pillow-8.4.0 b/metadata/md5-cache/dev-python/pillow-8.4.0
new file mode 100644
index 000000000000..ce0f2b968cc4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pillow-8.4.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= )
+DESCRIPTION=Python Imaging Library (fork)
+EAPI=8
+HOMEPAGE=https://python-pillow.org/
+IUSE=examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=HPND
+RDEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=test? ( jpeg jpeg2k tiff truetype ) || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-pillow/Pillow/archive/8.4.0.tar.gz -> pillow-8.4.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=10dc62246e8f1d37d0685bf992bd9048
diff --git a/metadata/md5-cache/dev-python/pipenv-2020.11.15 b/metadata/md5-cache/dev-python/pipenv-2020.11.15
deleted file mode 100644
index 77bd5635d033..000000000000
--- a/metadata/md5-cache/dev-python/pipenv-2020.11.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/virtualenv-20.0.35[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/virtualenv-clone[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python Development Workflow for Humans
-EAPI=7
-HOMEPAGE=https://github.com/pypa/pipenv https://pypi.org/project/pipenv/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/virtualenv-20.0.35[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/virtualenv-clone[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/pipenv/archive/v2020.11.15.tar.gz -> pipenv-2020.11.15.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=26483c9b7a2879e89a9675996708e5ad
diff --git a/metadata/md5-cache/dev-python/pipenv-2021.5.29 b/metadata/md5-cache/dev-python/pipenv-2021.5.29
deleted file mode 100644
index 3ead3c1ed61b..000000000000
--- a/metadata/md5-cache/dev-python/pipenv-2021.5.29
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/virtualenv-20.0.35[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/virtualenv-clone[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python Development Workflow for Humans
-EAPI=7
-HOMEPAGE=https://github.com/pypa/pipenv https://pypi.org/project/pipenv/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/virtualenv-20.0.35[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/virtualenv-clone[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/pipenv/archive/v2021.5.29.tar.gz -> pipenv-2021.5.29.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=26483c9b7a2879e89a9675996708e5ad
diff --git a/metadata/md5-cache/dev-python/platformdirs-2.3.0 b/metadata/md5-cache/dev-python/platformdirs-2.3.0
index 38cbfaba68cf..bfb35ddf0fb9 100644
--- a/metadata/md5-cache/dev-python/platformdirs-2.3.0
+++ b/metadata/md5-cache/dev-python/platformdirs-2.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=A small Python module for determining appropriate platform-specific
 EAPI=8
 HOMEPAGE=https://pypi.org/project/platformdirs/ https://github.com/platformdirs/platformdirs/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/platformdirs/platformdirs/archive/2.3.0.tar.gz -> platformdirs-2.3.0.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ac6e733061587ffdfa0a0ea68556afa3
+_md5_=f0cb2a5aa0c6cc6caf269f73695c3e4c
diff --git a/metadata/md5-cache/dev-python/plotly-4.14.1 b/metadata/md5-cache/dev-python/plotly-4.14.1
deleted file mode 100644
index a7455f2bf448..000000000000
--- a/metadata/md5-cache/dev-python/plotly-4.14.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Browser-based graphing library for Python
-EAPI=7
-HOMEPAGE=https://plot.ly/python/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/retrying[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/p/plotly/plotly-4.14.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=723563becc394e85d004bad2e442169b
diff --git a/metadata/md5-cache/dev-python/plotly-4.14.3 b/metadata/md5-cache/dev-python/plotly-4.14.3
deleted file mode 100644
index c6f862eb344a..000000000000
--- a/metadata/md5-cache/dev-python/plotly-4.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Browser-based graphing library for Python
-EAPI=7
-HOMEPAGE=https://plot.ly/python/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/retrying[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/p/plotly/plotly-4.14.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=44834e157560ea7cfe2c80b50bd744f8
diff --git a/metadata/md5-cache/dev-python/pluggy-1.0.0 b/metadata/md5-cache/dev-python/pluggy-1.0.0
index 893d0a1f24ed..c93727213cd9 100644
--- a/metadata/md5-cache/dev-python/pluggy-1.0.0
+++ b/metadata/md5-cache/dev-python/pluggy-1.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=plugin and hook calling mechanisms for python
 EAPI=8
 HOMEPAGE=https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluggy/pluggy-1.0.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=556b089f0d38f20a2cedc9b80874bb71
+_md5_=58f6f5d78c23c23796bae49e2fb997a2
diff --git a/metadata/md5-cache/dev-python/pluginbase-1.0.0 b/metadata/md5-cache/dev-python/pluginbase-1.0.0
deleted file mode 100644
index 24caa1b64c1a..000000000000
--- a/metadata/md5-cache/dev-python/pluginbase-1.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Support library for building plugins sytems in Python
-EAPI=7
-HOMEPAGE=https://github.com/mitsuhiko/pluginbase
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pluginbase/pluginbase-1.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0b598fe158566081ae70e78a834a9cc6
diff --git a/metadata/md5-cache/dev-python/podman-py-3.2.0 b/metadata/md5-cache/dev-python/podman-py-3.2.0
deleted file mode 100644
index 5e37ce604ea0..000000000000
--- a/metadata/md5-cache/dev-python/podman-py-3.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library to interact with a Podman server
-EAPI=8
-HOMEPAGE=https://github.com/containers/podman-py/ https://pypi.org/project/podman/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/containers/podman-py/archive/v3.2.0.tar.gz -> podman-py-3.2.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9a78dc8624a2de58f8e99dd90a81f4e5
diff --git a/metadata/md5-cache/dev-python/pooch-1.4.0 b/metadata/md5-cache/dev-python/pooch-1.4.0
deleted file mode 100644
index 4d55619f48a9..000000000000
--- a/metadata/md5-cache/dev-python/pooch-1.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localftpserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=manages your Python library's sample data files
-EAPI=7
-HOMEPAGE=https://github.com/fatiando/pooch
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pooch/pooch-1.4.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=42d087dff5aed5edfe50cd04b122d23a
diff --git a/metadata/md5-cache/dev-python/pooch-1.5.2 b/metadata/md5-cache/dev-python/pooch-1.5.2
new file mode 100644
index 000000000000..4ef5483158b0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pooch-1.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localftpserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Manage your Python library's sample data files
+EAPI=8
+HOMEPAGE=https://github.com/fatiando/pooch
+IUSE=doc test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=BSD
+PROPERTIES=test_network
+RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pooch/pooch-1.5.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e0cc8130c5daee8cba9eee05771aadda
diff --git a/metadata/md5-cache/dev-python/pretty-yaml-21.10.1 b/metadata/md5-cache/dev-python/pretty-yaml-21.10.1
new file mode 100644
index 000000000000..13dd8332b00f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pretty-yaml-21.10.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=PyYAML-based module to produce pretty and readable YAML-serialized data
+EAPI=8
+HOMEPAGE=https://github.com/mk-fg/pretty-yaml
+IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=WTFPL-2
+RDEPEND=dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyaml/pyaml-21.10.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3709c7dba9a52665327d122ec9d05e79
diff --git a/metadata/md5-cache/dev-python/progressbar2-3.53.1 b/metadata/md5-cache/dev-python/progressbar2-3.53.1
deleted file mode 100644
index 1b0753597572..000000000000
--- a/metadata/md5-cache/dev-python/progressbar2-3.53.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/python-utils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/progressbar >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Text progressbar library for python
-EAPI=7
-HOMEPAGE=https://progressbar-2.readthedocs.io/ https://pypi.org/project/progressbar2/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/python-utils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/progressbar python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/progressbar2/progressbar2-3.53.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fa73b2da344c80e8f77149c8ea205cce
diff --git a/metadata/md5-cache/dev-python/progressbar2-3.53.3 b/metadata/md5-cache/dev-python/progressbar2-3.53.3
index 2e30d8a8e4ba..a1baa3b85e57 100644
--- a/metadata/md5-cache/dev-python/progressbar2-3.53.3
+++ b/metadata/md5-cache/dev-python/progressbar2-3.53.3
@@ -4,7 +4,7 @@ DESCRIPTION=Text progressbar library for python
 EAPI=8
 HOMEPAGE=https://progressbar-2.readthedocs.io/ https://pypi.org/project/progressbar2/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/python-utils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/progressbar python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/progressbar2/progressbar2-3.53.3.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6f7d7e45e762bd4be6515e1c9c13b5ba
+_md5_=750e8f3790bda542c673d53725577442
diff --git a/metadata/md5-cache/dev-python/progressbar2-3.54.0 b/metadata/md5-cache/dev-python/progressbar2-3.54.0
new file mode 100644
index 000000000000..b7c8e6c4f1cc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/progressbar2-3.54.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/python-utils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/progressbar >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Text progressbar library for python
+EAPI=8
+HOMEPAGE=https://progressbar-2.readthedocs.io/ https://pypi.org/project/progressbar2/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/python-utils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/progressbar python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/progressbar2/progressbar2-3.54.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fa1bcb477f51d06e0c945bc1cab8c934
diff --git a/metadata/md5-cache/dev-python/progressbar2-3.55.0 b/metadata/md5-cache/dev-python/progressbar2-3.55.0
new file mode 100644
index 000000000000..45f3edd9ffad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/progressbar2-3.55.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/python-utils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/progressbar >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Text progressbar library for python
+EAPI=8
+HOMEPAGE=https://progressbar-2.readthedocs.io/ https://pypi.org/project/progressbar2/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/python-utils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/progressbar python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/progressbar2/progressbar2-3.55.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fa1bcb477f51d06e0c945bc1cab8c934
diff --git a/metadata/md5-cache/dev-python/pudb-2020.1 b/metadata/md5-cache/dev-python/pudb-2020.1
deleted file mode 100644
index 5cfbc08b83b3..000000000000
--- a/metadata/md5-cache/dev-python/pudb-2020.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A full-screen, console-based Python debugger
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pudb/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/urwid[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pudb/pudb-2020.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4587f7ba8a31bbf8c13bda1912d16281
diff --git a/metadata/md5-cache/dev-python/pulsectl-21.10.5 b/metadata/md5-cache/dev-python/pulsectl-21.10.5
new file mode 100644
index 000000000000..61c69013b5ac
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pulsectl-21.10.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( media-sound/pulseaudio dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)
+EAPI=8
+HOMEPAGE=https://github.com/mk-fg/python-pulse-control
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=media-sound/pulseaudio python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pulsectl/pulsectl-21.10.5.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bfc8f266f4ee776a2b56f0929f909cc6
diff --git a/metadata/md5-cache/dev-python/pulsectl-21.5.17 b/metadata/md5-cache/dev-python/pulsectl-21.5.17
deleted file mode 100644
index dc5e7355c727..000000000000
--- a/metadata/md5-cache/dev-python/pulsectl-21.5.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( media-sound/pulseaudio dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)
-EAPI=7
-HOMEPAGE=https://github.com/mk-fg/python-pulse-control
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=media-sound/pulseaudio python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pulsectl/pulsectl-21.5.17.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c8271237beeff3bcdbce8838ff697876
diff --git a/metadata/md5-cache/dev-python/pulsectl-21.5.18 b/metadata/md5-cache/dev-python/pulsectl-21.5.18
deleted file mode 100644
index 81531a2da9c9..000000000000
--- a/metadata/md5-cache/dev-python/pulsectl-21.5.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( media-sound/pulseaudio dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)
-EAPI=7
-HOMEPAGE=https://github.com/mk-fg/python-pulse-control
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=media-sound/pulseaudio python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pulsectl/pulsectl-21.5.18.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c8271237beeff3bcdbce8838ff697876
diff --git a/metadata/md5-cache/dev-python/pulsectl-21.9.1 b/metadata/md5-cache/dev-python/pulsectl-21.9.1
deleted file mode 100644
index 0c01a82bcf9d..000000000000
--- a/metadata/md5-cache/dev-python/pulsectl-21.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( media-sound/pulseaudio dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)
-EAPI=8
-HOMEPAGE=https://github.com/mk-fg/python-pulse-control
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=media-sound/pulseaudio python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pulsectl/pulsectl-21.9.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bfc8f266f4ee776a2b56f0929f909cc6
diff --git a/metadata/md5-cache/dev-python/py-cpuinfo-6.0.0 b/metadata/md5-cache/dev-python/py-cpuinfo-6.0.0
deleted file mode 100644
index 77c72fd45b82..000000000000
--- a/metadata/md5-cache/dev-python/py-cpuinfo-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Get CPU info with pure Python 2 & 3
-EAPI=7
-HOMEPAGE=https://github.com/workhorsy/py-cpuinfo https://pypi.org/project/py-cpuinfo/
-IUSE=python_targets_pypy3 python_targets_python3_8
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/p/py-cpuinfo/py-cpuinfo-6.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f191f045abe1130f153335674976499
diff --git a/metadata/md5-cache/dev-python/py-cpuinfo-7.0.0 b/metadata/md5-cache/dev-python/py-cpuinfo-7.0.0
deleted file mode 100644
index d888a4855628..000000000000
--- a/metadata/md5-cache/dev-python/py-cpuinfo-7.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Get CPU info with pure Python 2 & 3
-EAPI=7
-HOMEPAGE=https://github.com/workhorsy/py-cpuinfo https://pypi.org/project/py-cpuinfo/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/p/py-cpuinfo/py-cpuinfo-7.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a3c50b72d2a8f094f32ef5d08758c302
diff --git a/metadata/md5-cache/dev-python/py-gfm-0.1.4 b/metadata/md5-cache/dev-python/py-gfm-0.1.4
deleted file mode 100644
index ef0f878494c4..000000000000
--- a/metadata/md5-cache/dev-python/py-gfm-0.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/markdown[python_targets_python3_8(-)?] dev-python/setuptools[python_targets_python3_8(-)?]
-DESCRIPTION=Github-Flavored Markdown for Python-Markdown
-EAPI=7
-HOMEPAGE=https://github.com/Zopieux/py-gfm
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=dev-python/markdown[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/Zopieux/py-gfm/archive/0.1.4.tar.gz -> py-gfm-0.1.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a9cd066fa7b05dceb3021a8ffc220a6e
diff --git a/metadata/md5-cache/dev-python/py-gfm-1.0.2 b/metadata/md5-cache/dev-python/py-gfm-1.0.2
deleted file mode 100644
index 23fb7b49a0c6..000000000000
--- a/metadata/md5-cache/dev-python/py-gfm-1.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Github-Flavored Markdown for Python-Markdown
-EAPI=7
-HOMEPAGE=https://github.com/Zopieux/py-gfm
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/py-gfm/py-gfm-1.0.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=396d240e77f08390238da91e3b2dd6be
diff --git a/metadata/md5-cache/dev-python/pybluez-0.23 b/metadata/md5-cache/dev-python/pybluez-0.23
deleted file mode 100644
index 336afc9dde62..000000000000
--- a/metadata/md5-cache/dev-python/pybluez-0.23
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-wireless/bluez app-arch/unzip
-DESCRIPTION=Python bindings for Bluez Bluetooth Stack
-EAPI=7
-HOMEPAGE=https://github.com/pybluez/pybluez
-IUSE=examples python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=net-wireless/bluez python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/P/PyBluez/PyBluez-0.23.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=46bb8d17f484b0f1fd72be62615289ec
diff --git a/metadata/md5-cache/dev-python/pybtex-0.23.0 b/metadata/md5-cache/dev-python/pybtex-0.23.0
deleted file mode 100644
index 23a8ac3ae7ec..000000000000
--- a/metadata/md5-cache/dev-python/pybtex-0.23.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/nose[python_targets_python3_8(-)?] ) test? ( dev-python/latexcodec[python_targets_python3_8(-)?] dev-python/pyyaml[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=BibTeX-compatible bibliography processor
-EAPI=7
-HOMEPAGE=https://pybtex.org https://pypi.org/project/pybtex/
-IUSE=test test python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/latexcodec[python_targets_python3_8(-)?] dev-python/pyyaml[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/pybtex/pybtex-0.23.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1575f6d2e357dcd38e0f66d9d83b0820
diff --git a/metadata/md5-cache/dev-python/pybtex-docutils-1.0.0 b/metadata/md5-cache/dev-python/pybtex-docutils-1.0.0
deleted file mode 100644
index 679e70272d10..000000000000
--- a/metadata/md5-cache/dev-python/pybtex-docutils-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybtex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A docutils backend for pybtex
-EAPI=7
-HOMEPAGE=https://github.com/mcmtroffaes/pybtex-docutils
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybtex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pybtex-docutils/pybtex-docutils-1.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=20d87d4565967f3ef6dc857156e52bb4
diff --git a/metadata/md5-cache/dev-python/pycares-4.1.2 b/metadata/md5-cache/dev-python/pycares-4.1.2
new file mode 100644
index 000000000000..41a3ec9d46f2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycares-4.1.2
@@ -0,0 +1,17 @@
+BDEPEND=virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-dns/c-ares
+DESCRIPTION=Python interface for c-ares
+EAPI=8
+HOMEPAGE=https://github.com/saghul/pycares/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+PROPERTIES=test_network
+RDEPEND=dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/saghul/pycares/archive/pycares-4.1.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=489c9fbb5d0bc8deed3ee4a63f7d13dd
diff --git a/metadata/md5-cache/dev-python/pycdio-2.1.0 b/metadata/md5-cache/dev-python/pycdio-2.1.0
deleted file mode 100644
index 5fbd9c1c35dd..000000000000
--- a/metadata/md5-cache/dev-python/pycdio-2.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/swig test? ( >=dev-libs/libcdio-2.0.0 >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libcdio-2.0.0
-DESCRIPTION=Python OO interface to libcdio (CD Input and Control library)
-EAPI=7
-HOMEPAGE=https://savannah.gnu.org/projects/libcdio/ https://pypi.org/project/pycdio/
-IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libcdio-2.0.0 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pycdio/pycdio-2.1.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1fc58b654e85e04aa8c97d8471e0e55e
diff --git a/metadata/md5-cache/dev-python/pychromecast-9.3.1 b/metadata/md5-cache/dev-python/pychromecast-9.3.1
new file mode 100644
index 000000000000..7210177589a7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pychromecast-9.3.1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python module to talk to Google Chromecast
+EAPI=8
+HOMEPAGE=https://github.com/home-assistant-libs/pychromecast
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/casttube-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/protobuf-python-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/zeroconf-0.25.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/P/PyChromecast/PyChromecast-9.3.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a49022c609f1246e42bce88abffb8fbe
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.8.0 b/metadata/md5-cache/dev-python/pycodestyle-2.8.0
new file mode 100644
index 000000000000..7fe709d35047
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycodestyle-2.8.0
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python style guide checker (fka pep8)
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pycodestyle/
+IUSE=doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+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
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pycodestyle/pycodestyle-2.8.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ca6d58576c3b19893e8afbd81c9606aa
diff --git a/metadata/md5-cache/dev-python/pycollada-0.7.1 b/metadata/md5-cache/dev-python/pycollada-0.7.1
index 80316deefd76..c8e29645007d 100644
--- a/metadata/md5-cache/dev-python/pycollada-0.7.1
+++ b/metadata/md5-cache/dev-python/pycollada-0.7.1
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python library for reading and writing COLLADA documents
 EAPI=7
 HOMEPAGE=https://pycollada.readthedocs.io/
-IUSE=examples doc test python_targets_python3_8 python_targets_python3_9
+IUSE=examples doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-dateutil-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pycollada/pycollada/archive/v0.7.1.tar.gz -> pycollada-0.7.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3db5076a2bfe30185b8b1e3c5b39bd08
+_md5_=68fdb427853c26f0308f2b4775bd6fe3
diff --git a/metadata/md5-cache/dev-python/pycurl-requests-0.2.0 b/metadata/md5-cache/dev-python/pycurl-requests-0.2.0
deleted file mode 100644
index ea2ee01ec76a..000000000000
--- a/metadata/md5-cache/dev-python/pycurl-requests-0.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycurl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Requests-compatible interface for PycURL
-EAPI=7
-HOMEPAGE=https://github.com/dcoles/pycurl-requests
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT Apache-2.0
-RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pycurl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dcoles/pycurl-requests/archive/refs/tags/v0.2.0.tar.gz -> pycurl-requests-0.2.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4d6e0bd0bd8d88ac61fc03e2cb7884ae
diff --git a/metadata/md5-cache/dev-python/pydantic-1.8.2 b/metadata/md5-cache/dev-python/pydantic-1.8.2
deleted file mode 100644
index 2c1b4d77328f..000000000000
--- a/metadata/md5-cache/dev-python/pydantic-1.8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-email-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Data parsing and validation using Python type hints
-EAPI=7
-HOMEPAGE=https://github.com/samuelcolvin/pydantic
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/samuelcolvin/pydantic/archive/v1.8.2.tar.gz -> pydantic-1.8.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=293c09d239f354fab0451cb9d59d52a0
diff --git a/metadata/md5-cache/dev-python/pydantic-1.8.2_p20210719 b/metadata/md5-cache/dev-python/pydantic-1.8.2_p20210719
index 7270cb72452e..72d98939a7c5 100644
--- a/metadata/md5-cache/dev-python/pydantic-1.8.2_p20210719
+++ b/metadata/md5-cache/dev-python/pydantic-1.8.2_p20210719
@@ -4,7 +4,7 @@ DESCRIPTION=Data parsing and validation using Python type hints
 EAPI=7
 HOMEPAGE=https://github.com/samuelcolvin/pydantic
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/samuelcolvin/pydantic/archive/0c26c1c4e288e0d41d2c3890d5b3befa7579455c.tar.gz -> pydantic-1.8.2_p20210719.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b4d749b8f02524e407690a0c889070b1
+_md5_=bcdb1290590f7214bc8c75ed634c2500
diff --git a/metadata/md5-cache/dev-python/pydevd-2.5.0-r1 b/metadata/md5-cache/dev-python/pydevd-2.5.0-r1
deleted file mode 100644
index ce8e978f23b1..000000000000
--- a/metadata/md5-cache/dev-python/pydevd-2.5.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/untangle[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( !<dev-python/debugpy-1.4.2 sys-devel/gdb >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)
-EAPI=8
-HOMEPAGE=https://github.com/fabioz/PyDev.Debugger/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc
-LICENSE=EPL-1.0
-RDEPEND=!<dev-python/debugpy-1.4.2 sys-devel/gdb python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fabioz/PyDev.Debugger/archive/refs/tags/pydev_debugger_2_5_0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3b28a641da7bd283a37a6399fece0654
diff --git a/metadata/md5-cache/dev-python/pydevd-2.6.0 b/metadata/md5-cache/dev-python/pydevd-2.6.0
new file mode 100644
index 000000000000..dd152fe7a8e0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydevd-2.6.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/untangle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( !<dev-python/debugpy-1.4.2 sys-devel/gdb >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)
+EAPI=8
+HOMEPAGE=https://github.com/fabioz/PyDev.Debugger/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=EPL-1.0
+RDEPEND=!<dev-python/debugpy-1.4.2 sys-devel/gdb python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fabioz/PyDev.Debugger/archive/pydev_debugger_2_6_0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b7b53580c358957a00919c07735dcec8
diff --git a/metadata/md5-cache/dev-python/pydocstyle-6.1.1 b/metadata/md5-cache/dev-python/pydocstyle-6.1.1
index 1d14052d804e..24053e3690f7 100644
--- a/metadata/md5-cache/dev-python/pydocstyle-6.1.1
+++ b/metadata/md5-cache/dev-python/pydocstyle-6.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python docstring style checker
 EAPI=7
 HOMEPAGE=https://github.com/PyCQA/pydocstyle/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/snowballstemmer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/pydocstyle/archive/6.1.1.tar.gz -> pydocstyle-6.1.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5d5477ca5ce4d29f8e635c5a91100a85
+_md5_=dbcf71f8ef3e9c2fa58095291b2a3a66
diff --git a/metadata/md5-cache/dev-python/pydyf-0.0.3 b/metadata/md5-cache/dev-python/pydyf-0.0.3
deleted file mode 100644
index 9bd7c62776e4..000000000000
--- a/metadata/md5-cache/dev-python/pydyf-0.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-text/ghostscript-gpl dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A low-level PDF generator
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pydyf/ https://github.com/CourtBouillon/pydyf/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/CourtBouillon/pydyf/archive/v0.0.3.tar.gz -> pydyf-0.0.3.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fd23dc08e7ae253cb0c004dcf95738c5
diff --git a/metadata/md5-cache/dev-python/pydyf-0.1.0 b/metadata/md5-cache/dev-python/pydyf-0.1.0
deleted file mode 100644
index cb011670601d..000000000000
--- a/metadata/md5-cache/dev-python/pydyf-0.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-text/ghostscript-gpl dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A low-level PDF generator
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pydyf/ https://github.com/CourtBouillon/pydyf/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/CourtBouillon/pydyf/archive/v0.1.0.tar.gz -> pydyf-0.1.0.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fd23dc08e7ae253cb0c004dcf95738c5
diff --git a/metadata/md5-cache/dev-python/pygame-2.0.2 b/metadata/md5-cache/dev-python/pygame-2.0.2
new file mode 100644
index 000000000000..cb535952cdaf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygame-2.0.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( media-libs/fontconfig sys-apps/util-linux ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freetype media-libs/libpng:0= >=media-libs/sdl2-image-1.2.2 >=media-libs/sdl2-mixer-1.2.4 >=media-libs/sdl2-ttf-2.0.6 >=media-libs/smpeg2-0.4.4-r1 virtual/jpeg midi? ( media-libs/portmidi ) X? ( >=media-libs/libsdl2-1.2.5[opengl?,threads,video,X] ) !X? ( >=media-libs/libsdl2-1.2.5[threads] ) test? ( media-libs/sdl2-image[gif,jpeg,png] media-libs/sdl2-mixer[mp3,vorbis,wav] )
+DESCRIPTION=Python bindings for SDL multimedia library
+EAPI=8
+HOMEPAGE=https://www.pygame.org/
+IUSE=doc examples midi opengl test X python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freetype media-libs/libpng:0= >=media-libs/sdl2-image-1.2.2 >=media-libs/sdl2-mixer-1.2.4 >=media-libs/sdl2-ttf-2.0.6 >=media-libs/smpeg2-0.4.4-r1 virtual/jpeg midi? ( media-libs/portmidi ) X? ( >=media-libs/libsdl2-1.2.5[opengl?,threads,video,X] ) !X? ( >=media-libs/libsdl2-1.2.5[threads] ) media-libs/fontconfig python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pygame/pygame/releases/download/2.0.2/pygame-2.0.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d9032ffa2d81759a8916499090dc22f4
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r5 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r5
deleted file mode 100644
index a4e114d4a8d5..000000000000
--- a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_8? ( dev-python/numpy[python_targets_python3_8(-)?] ) media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] >=media-libs/sdl2-mixer-2.0.2:= media-libs/sdl2-ttf:= virtual/jpeg:0
-DESCRIPTION=Reimplementation of portions of the pygame API using SDL2
-EAPI=7
-HOMEPAGE=https://github.com/renpy/pygame_sdl2
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 ZLIB
-RDEPEND=python_targets_python3_8? ( dev-python/numpy[python_targets_python3_8(-)?] ) media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] >=media-libs/sdl2-mixer-2.0.2:= media-libs/sdl2-ttf:= virtual/jpeg:0 python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://www.renpy.org/dl/6.99.12.4/pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4d2bafd95637e7b1e6f75ce1ef9c3d28
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r1 b/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r1
deleted file mode 100644
index de8e6553d9c2..000000000000
--- a/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_8? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] >=media-libs/sdl2-mixer-2.0.2:= media-libs/sdl2-ttf:= virtual/jpeg:0
-DESCRIPTION=Reimplementation of portions of the pygame API using SDL2
-EAPI=7
-HOMEPAGE=https://github.com/renpy/pygame_sdl2
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1 ZLIB
-RDEPEND=python_targets_python3_8? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] >=media-libs/sdl2-mixer-2.0.2:= media-libs/sdl2-ttf:= virtual/jpeg:0 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://www.renpy.org/dl/7.3.5/pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=56c8f16aa2c737661fe0334e81aa6fef
diff --git a/metadata/md5-cache/dev-python/pyilmbase-2.5.6 b/metadata/md5-cache/dev-python/pyilmbase-2.5.6
deleted file mode 100644
index 4f63a9902024..000000000000
--- a/metadata/md5-cache/dev-python/pyilmbase-2.5.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-admin/chrpath virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ~media-libs/ilmbase-2.5.6:= sys-libs/zlib python_single_target_python3_8? ( >=dev-libs/boost-1.62.0-r1:=[python,python_targets_python3_8(-)] numpy? ( >=dev-python/numpy-1.10.4[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( >=dev-libs/boost-1.62.0-r1:=[python,python_targets_python3_9(-)] numpy? ( >=dev-python/numpy-1.10.4[python_targets_python3_9(-)] ) )
-DESCRIPTION=IlmBase Python bindings
-EAPI=7
-HOMEPAGE=https://www.openexr.com
-IUSE=exceptions +numpy test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ~media-libs/ilmbase-2.5.6:= sys-libs/zlib python_single_target_python3_8? ( >=dev-libs/boost-1.62.0-r1:=[python,python_targets_python3_8(-)] numpy? ( >=dev-python/numpy-1.10.4[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( >=dev-libs/boost-1.62.0-r1:=[python,python_targets_python3_9(-)] numpy? ( >=dev-python/numpy-1.10.4[python_targets_python3_9(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0/25
-SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.6.tar.gz -> pyilmbase-2.5.6.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1e5e4f902ca682713cfa1a523d4da3fe
diff --git a/metadata/md5-cache/dev-python/pyjwt-2.3.0 b/metadata/md5-cache/dev-python/pyjwt-2.3.0
new file mode 100644
index 000000000000..db404aa9f2fd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyjwt-2.3.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( !dev-python/python-jwt >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=JSON Web Token implementation in Python
+EAPI=8
+HOMEPAGE=https://github.com/jpadilla/pyjwt/ https://pypi.org/project/PyJWT/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=!dev-python/python-jwt python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/P/PyJWT/PyJWT-2.3.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0e1545ab791596be96b7867f61f9ed75
diff --git a/metadata/md5-cache/dev-python/pykka-2.0.2 b/metadata/md5-cache/dev-python/pykka-2.0.2
deleted file mode 100644
index c8a6cc6dd19a..000000000000
--- a/metadata/md5-cache/dev-python/pykka-2.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/eventlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python implementation of the actor model
-EAPI=7
-HOMEPAGE=https://www.pykka.org/en/latest/ https://github.com/jodal/pykka
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/P/Pykka/Pykka-2.0.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a742b536b07b63846fc2997c30e41c21
diff --git a/metadata/md5-cache/dev-python/pykka-2.0.3 b/metadata/md5-cache/dev-python/pykka-2.0.3
deleted file mode 100644
index b071dfc0cbca..000000000000
--- a/metadata/md5-cache/dev-python/pykka-2.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/eventlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python implementation of the actor model
-EAPI=7
-HOMEPAGE=https://www.pykka.org/en/latest/ https://github.com/jodal/pykka
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/P/Pykka/Pykka-2.0.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=278b2efddc968b38cd8a5c261a5eca69
diff --git a/metadata/md5-cache/dev-python/pykka-3.0.1 b/metadata/md5-cache/dev-python/pykka-3.0.1
deleted file mode 100644
index 6f36a967344c..000000000000
--- a/metadata/md5-cache/dev-python/pykka-3.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python implementation of the actor model
-EAPI=7
-HOMEPAGE=https://www.pykka.org/en/latest/ https://github.com/jodal/pykka/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jodal/pykka/archive/v3.0.1.tar.gz -> pykka-3.0.1.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2343551a042b8a31fab0c893aa019ae0
diff --git a/metadata/md5-cache/dev-python/pylama-7.7.1-r1 b/metadata/md5-cache/dev-python/pylama-7.7.1-r1
index 11bd5a4b25eb..6ce948c4836f 100644
--- a/metadata/md5-cache/dev-python/pylama-7.7.1-r1
+++ b/metadata/md5-cache/dev-python/pylama-7.7.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Code audit tool for python
 EAPI=7
 HOMEPAGE=https://github.com/klen/pylama
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=LGPL-3
 RDEPEND=>=dev-python/mccabe-0.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pydocstyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyflakes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/klen/pylama/archive/7.7.1.tar.gz -> pylama-7.7.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4a302d02cf937c694b8fb6cfbf7c5e94
+_md5_=ab6db9a999b2a7804710171a1e77dcb2
diff --git a/metadata/md5-cache/dev-python/pylint-2.10.2 b/metadata/md5-cache/dev-python/pylint-2.10.2
index 177e27103fff..98853fed8ebf 100644
--- a/metadata/md5-cache/dev-python/pylint-2.10.2
+++ b/metadata/md5-cache/dev-python/pylint-2.10.2
@@ -4,7 +4,7 @@ DESCRIPTION=Python code static checker
 EAPI=8
 HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint/
 IUSE=examples doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~m68k ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=<dev-python/astroid-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/astroid-2.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pycqa/pylint/archive/v2.10.2.tar.gz -> pylint-2.10.2.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ada27a68d56a1ac05ea71bb265509c96
+_md5_=1ace46810f4a4f5bcb3346d4d39a5c1b
diff --git a/metadata/md5-cache/dev-python/pymetar-1.3 b/metadata/md5-cache/dev-python/pymetar-1.3
deleted file mode 100644
index 587eddeaf6ab..000000000000
--- a/metadata/md5-cache/dev-python/pymetar-1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Downloads and decodes to the weather report for a given station ID
-EAPI=7
-HOMEPAGE=https://www.schwarzvogel.de/software/pymetar/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://www.schwarzvogel.de/pkgs/pymetar-1.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aadde7ef1a2b267d0f055031ff4c4749
diff --git a/metadata/md5-cache/dev-python/pymetar-1.4 b/metadata/md5-cache/dev-python/pymetar-1.4
new file mode 100644
index 000000000000..65224b33f18c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymetar-1.4
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Downloads and decodes to the weather report for a given station ID
+EAPI=7
+HOMEPAGE=https://www.schwarzvogel.de/software/pymetar/
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://www.schwarzvogel.de/pkgs/pymetar-1.4.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=aadde7ef1a2b267d0f055031ff4c4749
diff --git a/metadata/md5-cache/dev-python/pynput-1.6.8 b/metadata/md5-cache/dev-python/pynput-1.6.8
deleted file mode 100644
index 54a8c8c7b45f..000000000000
--- a/metadata/md5-cache/dev-python/pynput-1.6.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Sends virtual input commands
-EAPI=7
-HOMEPAGE=https://github.com/moses-palmer/pynput
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-xlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/moses-palmer/pynput/archive/v1.6.8.tar.gz -> pynput-1.6.8.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=949e05408cdafdbdcc2d7f9ceb46edac
diff --git a/metadata/md5-cache/dev-python/pyocr-0.7.2 b/metadata/md5-cache/dev-python/pyocr-0.7.2
deleted file mode 100644
index 361869b0dcf6..000000000000
--- a/metadata/md5-cache/dev-python/pyocr-0.7.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-python/pillow dev-python/six dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=An optical character recognition (OCR) tool wrapper for python
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork/pyocr
-IUSE=cuneiform +tesseract python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-python/pillow dev-python/six python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( cuneiform tesseract ) || ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyocr/pyocr-0.7.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c4f60e7164f591f67b55d7d6c685d8e4
diff --git a/metadata/md5-cache/dev-python/pyproj-3.0.1 b/metadata/md5-cache/dev-python/pyproj-3.0.1
deleted file mode 100644
index 4197349c456a..000000000000
--- a/metadata/md5-cache/dev-python/pyproj-3.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xarray[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( >=sci-libs/proj-7.2.0:= >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python interface to the PROJ library
-EAPI=7
-HOMEPAGE=https://github.com/pyproj4/pyproj
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=>=sci-libs/proj-7.2.0:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyproj/pyproj-3.0.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7386ef790fb04afafbb37073e4d670a7
diff --git a/metadata/md5-cache/dev-python/pyproj-3.1.0 b/metadata/md5-cache/dev-python/pyproj-3.1.0
deleted file mode 100644
index 6313e7ad6782..000000000000
--- a/metadata/md5-cache/dev-python/pyproj-3.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xarray[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( >=sci-libs/proj-7.2.0:= >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python interface to the PROJ library
-EAPI=7
-HOMEPAGE=https://github.com/pyproj4/pyproj
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=>=sci-libs/proj-7.2.0:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyproj/pyproj-3.1.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0d2b2b095e0e6bc2f7f36bc93fa11a06
diff --git a/metadata/md5-cache/dev-python/pyproj-3.2.0 b/metadata/md5-cache/dev-python/pyproj-3.2.0
deleted file mode 100644
index 788cc77e4897..000000000000
--- a/metadata/md5-cache/dev-python/pyproj-3.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/xarray[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( >=sci-libs/proj-7.2.0:= >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python interface to the PROJ library
-EAPI=8
-HOMEPAGE=https://github.com/pyproj4/pyproj
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=>=sci-libs/proj-7.2.0:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyproj/pyproj-3.2.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c61f275c5c48d67fd7301327e75aff14
diff --git a/metadata/md5-cache/dev-python/pyproj-3.2.1 b/metadata/md5-cache/dev-python/pyproj-3.2.1
index 8183d19e0722..c221485b39e2 100644
--- a/metadata/md5-cache/dev-python/pyproj-3.2.1
+++ b/metadata/md5-cache/dev-python/pyproj-3.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python interface to the PROJ library
 EAPI=8
 HOMEPAGE=https://github.com/pyproj4/pyproj
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=>=sci-libs/proj-7.2.0:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyproj/pyproj-3.2.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75bd5d810345f20fcc66ae1144df35b5
+_md5_=3c9460acea1c0c962ee51098341a3fc4
diff --git a/metadata/md5-cache/dev-python/pypugjs-5.9.5 b/metadata/md5-cache/dev-python/pypugjs-5.9.5
deleted file mode 100644
index 9f3bc9d173b9..000000000000
--- a/metadata/md5-cache/dev-python/pypugjs-5.9.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python3_8(-)?] dev-python/chardet
-DESCRIPTION=Pug (Jade) syntax adapter for Django, Jinja2 and Mako templates
-EAPI=7
-HOMEPAGE=https://github.com/kakulukia/pypugjs
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python3_8(-)?] dev-python/chardet python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/kakulukia/pypugjs/archive/v5.9.5.tar.gz -> pypugjs-5.9.5.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a520f99cc9a94714d0b2495fcf03d89c
diff --git a/metadata/md5-cache/dev-python/pypugjs-5.9.8 b/metadata/md5-cache/dev-python/pypugjs-5.9.8
deleted file mode 100644
index 9346472cbfe5..000000000000
--- a/metadata/md5-cache/dev-python/pypugjs-5.9.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python3_8(-)?] dev-python/chardet
-DESCRIPTION=Pug (Jade) syntax adapter for Django, Jinja2 and Mako templates
-EAPI=7
-HOMEPAGE=https://github.com/kakulukia/pypugjs
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python3_8(-)?] dev-python/chardet python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/kakulukia/pypugjs/archive/v5.9.8.tar.gz -> pypugjs-5.9.8.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a520f99cc9a94714d0b2495fcf03d89c
diff --git a/metadata/md5-cache/dev-python/pypy-7.3.6 b/metadata/md5-cache/dev-python/pypy-7.3.6
new file mode 100644
index 000000000000..b03fa6b5cdb5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-7.3.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=|| ( >=dev-python/pypy-exe-7.3.6:7.3.6[bzip2?,ncurses?] >=dev-python/pypy-exe-bin-7.3.6:7.3.6 ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
+DESCRIPTION=A fast, compliant alternative implementation of the Python language
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+IUSE=bzip2 gdbm +jit ncurses sqlite tk
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=|| ( >=dev-python/pypy-exe-7.3.6:7.3.6[bzip2?,ncurses?] >=dev-python/pypy-exe-bin-7.3.6:7.3.6 ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
+SLOT=0/73
+SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.6-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.6.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e70a77193d8a8d2fd17d8bcf7726eddd
diff --git a/metadata/md5-cache/dev-python/pypy-exe-7.3.6 b/metadata/md5-cache/dev-python/pypy-exe-7.3.6
new file mode 100644
index 000000000000..18605fd089ab
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-exe-7.3.6
@@ -0,0 +1,14 @@
+BDEPEND=!low-memory? ( || ( dev-python/pypy dev-lang/python:2.7 ) )
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.6
+DESCRIPTION=PyPy executable (build from source)
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.6
+SLOT=7.3.6
+SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.6-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.6.tar.xz
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c940d963ce68adb94e46d57fca54580f
diff --git a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.6 b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.6
new file mode 100644
index 000000000000..ef70544c2318
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=PyPy executable (pre-built version)
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0/1 || ( dev-libs/libffi-compat:7 dev-libs/libffi:0/7 ) virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.6
+SLOT=7.3.6
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/pypy-exe-7.3.6-1.xpak -> pypy-exe-7.3.6-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/pypy-exe-7.3.6-1.xpak -> pypy-exe-7.3.6-1.x86.xpak )
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
+_md5_=6c3a5223aea693224adf8398e58819ea
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.6 b/metadata/md5-cache/dev-python/pypy3-7.3.6
new file mode 100644
index 000000000000..579abf1476d1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( >=dev-python/pypy3-exe-7.3.6:7.3.6[bzip2?,ncurses?] >=dev-python/pypy3-exe-bin-7.3.6:7.3.6 ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0 test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) !!dev-python/pytest-forked )
+DESCRIPTION=A fast, compliant alternative implementation of the Python (3.8) language
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+IUSE=bzip2 gdbm +jit ncurses sqlite test tk
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=|| ( >=dev-python/pypy3-exe-7.3.6:7.3.6[bzip2?,ncurses?] >=dev-python/pypy3-exe-bin-7.3.6:7.3.6 ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0
+RESTRICT=test
+SLOT=0/pypy38-pp73
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.8-v7.3.6-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.8-gentoo-patches-7.3.6.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1fd4e8d677bebb74ba1e3a7b99c2d903
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.6_rc3 b/metadata/md5-cache/dev-python/pypy3-7.3.6_rc3
new file mode 100644
index 000000000000..16e15a43442f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.6_rc3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( >=dev-python/pypy3-exe-7.3.6_rc3:7.3.6_rc3[bzip2?,ncurses?] >=dev-python/pypy3-exe-bin-7.3.6_rc3:7.3.6_rc3 ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0 test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) !!dev-python/pytest-forked )
+DESCRIPTION=A fast, compliant alternative implementation of the Python (3.8) language
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+IUSE=bzip2 gdbm +jit ncurses sqlite test tk
+LICENSE=MIT
+RDEPEND=|| ( >=dev-python/pypy3-exe-7.3.6_rc3:7.3.6_rc3[bzip2?,ncurses?] >=dev-python/pypy3-exe-bin-7.3.6_rc3:7.3.6_rc3 ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0
+RESTRICT=test
+SLOT=0/pypy38-pp73
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.8-v7.3.6rc3-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.8-gentoo-patches-7.3.6rc3.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e574dde38579e299b8adb1310ae5e68f
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-7.3.6 b/metadata/md5-cache/dev-python/pypy3-exe-7.3.6
new file mode 100644
index 000000000000..19b2efc6ff2a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-exe-7.3.6
@@ -0,0 +1,14 @@
+BDEPEND=low-memory? ( dev-python/pypy ) !low-memory? ( || ( dev-python/pypy dev-lang/python:2.7 ) )
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.6
+DESCRIPTION=PyPy3 executable (build from source)
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.6
+SLOT=7.3.6
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.8-v7.3.6-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.8-gentoo-patches-7.3.6.tar.xz
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e688c8244fa78d647a282fcf2acd2113
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-7.3.6_rc3 b/metadata/md5-cache/dev-python/pypy3-exe-7.3.6_rc3
new file mode 100644
index 000000000000..d636aed95f03
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-exe-7.3.6_rc3
@@ -0,0 +1,13 @@
+BDEPEND=low-memory? ( dev-python/pypy ) !low-memory? ( || ( dev-python/pypy dev-lang/python:2.7 ) )
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.6_rc3
+DESCRIPTION=PyPy3 executable (build from source)
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.6_rc3
+SLOT=7.3.6_rc3
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.8-v7.3.6rc3-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.8-gentoo-patches-7.3.6rc3.tar.xz
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ca8528c58c1cab5c49c798e357e20d17
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.6 b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.6
new file mode 100644
index 000000000000..31b460ca6d15
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=PyPy3 executable (pre-built version)
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0/1 || ( dev-libs/libffi-compat:7 dev-libs/libffi:0/7 ) virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.6
+SLOT=7.3.6
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.6-1.xpak -> pypy3-exe-7.3.6-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.6-1.xpak -> pypy3-exe-7.3.6-1.x86.xpak )
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
+_md5_=07bab334bdf2134796a1828769db4fbf
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.6_rc3 b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.6_rc3
new file mode 100644
index 000000000000..14a31b9b68d0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.6_rc3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=PyPy3 executable (pre-built version)
+EAPI=7
+HOMEPAGE=https://www.pypy.org/
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0/1 || ( dev-libs/libffi-compat:7 dev-libs/libffi:0/7 ) virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.6_rc3
+SLOT=7.3.6_rc3
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.6_rc3-1.xpak -> pypy3-exe-7.3.6_rc3-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.6_rc3-1.xpak -> pypy3-exe-7.3.6_rc3-1.x86.xpak )
+_eclasses_=pax-utils	fce6ad998516159787b92e8043167889
+_md5_=adf6b4dd77acc645eee726297b8565c0
diff --git a/metadata/md5-cache/dev-python/pyqtgraph-0.12.2 b/metadata/md5-cache/dev-python/pyqtgraph-0.12.2
index ad9968870a77..e38d8e1d74a9 100644
--- a/metadata/md5-cache/dev-python/pyqtgraph-0.12.2
+++ b/metadata/md5-cache/dev-python/pyqtgraph-0.12.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[svg,testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xvfb[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/numpy-1.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python3_8(-)?,python_targets_python3_9(-)?] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xvfb[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/numpy-1.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A pure-python graphics and GUI library built on PyQt and numpy
 EAPI=8
 HOMEPAGE=https://www.pyqtgraph.org/ https://pypi.org/project/pyqtgraph/
-IUSE=examples opengl svg doc test python_targets_python3_8 python_targets_python3_9
+IUSE=examples opengl svg doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=>=dev-python/numpy-1.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python3_8(-)?,python_targets_python3_9(-)?] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/numpy-1.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=test? ( opengl svg ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyqtgraph/pyqtgraph/archive/pyqtgraph-0.12.2.tar.gz test? ( https://github.com/pyqtgraph/test-data/archive/test-data-8.tar.gz -> pyqtgraph-test-data-8.tar.gz )
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3e2ce0606f16949c4068e8419dee818b
+_md5_=b3cdd3ad7572c3616f2f12b46f10a862
diff --git a/metadata/md5-cache/dev-python/pyqtgraph-0.12.3 b/metadata/md5-cache/dev-python/pyqtgraph-0.12.3
new file mode 100644
index 000000000000..dbab853d9b80
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyqtgraph-0.12.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xvfb[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/numpy-1.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A pure-python graphics and GUI library built on PyQt and numpy
+EAPI=8
+HOMEPAGE=https://www.pyqtgraph.org/ https://pypi.org/project/pyqtgraph/
+IUSE=examples opengl svg doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/numpy-1.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] opengl? ( dev-python/pyopengl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=test? ( opengl svg ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pyqtgraph/pyqtgraph/archive/pyqtgraph-0.12.3.tar.gz test? ( https://github.com/pyqtgraph/test-data/archive/test-data-8.tar.gz -> pyqtgraph-test-data-8.tar.gz )
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b1144c07a58e2e9d73c7e8da4ccbf72d
diff --git a/metadata/md5-cache/dev-python/pyrqlite-2.1 b/metadata/md5-cache/dev-python/pyrqlite-2.1
index f78bc338d356..6da9a8e93340 100644
--- a/metadata/md5-cache/dev-python/pyrqlite-2.1
+++ b/metadata/md5-cache/dev-python/pyrqlite-2.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-db/rqlite ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-db/rqlite ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python client for rqlite
 EAPI=7
 HOMEPAGE=https://github.com/rqlite/pyrqlite
-IUSE=test test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/rqlite/pyrqlite/archive/v2.1.tar.gz -> pyrqlite-2.1.tar.gz
+SRC_URI=https://github.com/rqlite/pyrqlite/archive/v2.1.tar.gz -> pyrqlite-2.1.tar.gz https://github.com/rqlite/pyrqlite/pull/36.patch -> pyrqlite-2.1-python3.10-test_support.patch
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0c551326af5ff62fca897f8c8b892e5a
+_md5_=78e8a7d105de6bd13d854cd76426693f
diff --git a/metadata/md5-cache/dev-python/pyscreenshot-3.0 b/metadata/md5-cache/dev-python/pyscreenshot-3.0
index 95e3d4c01411..a2079d225af8 100644
--- a/metadata/md5-cache/dev-python/pyscreenshot-3.0
+++ b/metadata/md5-cache/dev-python/pyscreenshot-3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python screenshot library
 EAPI=7
 HOMEPAGE=https://github.com/ponty/pyscreenshot
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=dev-python/easyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/entrypoint2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jeepney[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mss[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponty/pyscreenshot/archive/3.0.tar.gz -> pyscreenshot-3.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=08c3bd5d67527abcb4978fd4e1c58713
+_md5_=a484e276a1cb10203be3152fcc247f6c
diff --git a/metadata/md5-cache/dev-python/pyside2-5.15.1-r1 b/metadata/md5-cache/dev-python/pyside2-5.15.1-r1
deleted file mode 100644
index 90c11b8416bb..000000000000
--- a/metadata/md5-cache/dev-python/pyside2-5.15.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/shiboken2-5.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-qt/qtcore:5= dev-qt/qtopengl:5= dev-qt/qtserialport:5= 3d? ( >=dev-qt/qt3d-5.15:5[qml?] ) charts? ( >=dev-qt/qtcharts-5.15:5[qml?] ) concurrent? ( >=dev-qt/qtconcurrent-5.15:5 ) datavis? ( >=dev-qt/qtdatavis3d-5.15:5[qml?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[jpeg,gles2-only?] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[qml?,widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5[qml?] ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) qml? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) script? ( >=dev-qt/qtscript-5.15:5 ) scxml? ( >=dev-qt/qtscxml-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5[qml?] ) speech? ( >=dev-qt/qtspeech-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5[qml?] ) webengine? ( >=dev-qt/qtwebengine-5.15:5[widgets?] ) websockets? ( >=dev-qt/qtwebsockets-5.15:5[qml?] ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xml? ( >=dev-qt/qtxml-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5[qml?] ) test? ( x11-misc/xvfb-run )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=7
-HOMEPAGE=https://wiki.qt.io/PySide2
-IUSE=3d charts concurrent datavis designer gles2-only +gui help location multimedia +network positioning printsupport qml quick script scripttools scxml sensors speech sql svg test testlib webchannel webengine websockets +widgets x11extras xml xmlpatterns python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=amd64 arm64 x86
-LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 )
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/shiboken2-5.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-qt/qtcore:5= dev-qt/qtopengl:5= dev-qt/qtserialport:5= 3d? ( >=dev-qt/qt3d-5.15:5[qml?] ) charts? ( >=dev-qt/qtcharts-5.15:5[qml?] ) concurrent? ( >=dev-qt/qtconcurrent-5.15:5 ) datavis? ( >=dev-qt/qtdatavis3d-5.15:5[qml?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[jpeg,gles2-only?] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[qml?,widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5[qml?] ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) qml? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) script? ( >=dev-qt/qtscript-5.15:5 ) scxml? ( >=dev-qt/qtscxml-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5[qml?] ) speech? ( >=dev-qt/qtspeech-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5[qml?] ) webengine? ( >=dev-qt/qtwebengine-5.15:5[widgets?] ) websockets? ( >=dev-qt/qtwebsockets-5.15:5[qml?] ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xml? ( >=dev-qt/qtxml-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5[qml?] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) 3d? ( gui network ) charts? ( widgets ) datavis? ( gui ) designer? ( widgets xml ) gles2-only? ( gui ) help? ( widgets ) location? ( positioning ) multimedia? ( gui network ) printsupport? ( widgets ) qml? ( gui network ) quick? ( qml ) scripttools? ( gui script widgets ) speech? ( multimedia ) sql? ( widgets ) svg? ( widgets ) testlib? ( widgets ) webengine? ( location quick widgets? ( gui network printsupport webchannel ) ) websockets? ( network ) widgets? ( gui ) x11extras? ( gui )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.1-src/pyside-setup-opensource-src-5.15.1.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=904683ee20605f03aa3cac036789ce20
diff --git a/metadata/md5-cache/dev-python/pyspelling-2.7.2 b/metadata/md5-cache/dev-python/pyspelling-2.7.2
deleted file mode 100644
index 0c8d68c4895d..000000000000
--- a/metadata/md5-cache/dev-python/pyspelling-2.7.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-vcs/git ) test? ( || ( app-text/aspell app-text/hunspell ) dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/soupsieve-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wcmatch-6.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.1.3[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.1.3[python_targets_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Spell checker automation tool
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/pyspelling
-IUSE=test python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=|| ( app-text/aspell app-text/hunspell ) dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/soupsieve-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wcmatch-6.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/pyspelling/archive/2.7.2.tar.gz -> pyspelling-2.7.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4bdc50ae443034c5280fb7a5121c7e67
diff --git a/metadata/md5-cache/dev-python/pyspelling-2.7.3 b/metadata/md5-cache/dev-python/pyspelling-2.7.3
index edae574b5a2a..dcb918fe074b 100644
--- a/metadata/md5-cache/dev-python/pyspelling-2.7.3
+++ b/metadata/md5-cache/dev-python/pyspelling-2.7.3
@@ -4,7 +4,7 @@ DESCRIPTION=Spell checker automation tool
 EAPI=8
 HOMEPAGE=https://github.com/facelessuser/pyspelling
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=|| ( app-text/aspell app-text/hunspell ) dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/soupsieve-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-6.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/pyspelling/archive/2.7.3.tar.gz -> pyspelling-2.7.3.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b391493b4767e08f3ed6a031ae07c38d
+_md5_=92eaba9ddb72e54a7fae527b418db2da
diff --git a/metadata/md5-cache/dev-python/pysvn-1.9.13 b/metadata/md5-cache/dev-python/pysvn-1.9.13
deleted file mode 100644
index 8ff4e9633649..000000000000
--- a/metadata/md5-cache/dev-python/pysvn-1.9.13
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pycxx-7.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-vcs/subversion-1.9
-DESCRIPTION=Object-oriented python bindings for subversion
-EAPI=7
-HOMEPAGE=https://pysvn.sourceforge.io/
-IUSE=doc examples python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=Apache-1.1
-RDEPEND=>=dev-python/pycxx-7.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-vcs/subversion-1.9 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/pysvn/pysvn/V1.9.13/pysvn-1.9.13.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b7a48d2dae0bc834c508067b29e6a99a
diff --git a/metadata/md5-cache/dev-python/pytest-asyncio-0.16.0 b/metadata/md5-cache/dev-python/pytest-asyncio-0.16.0
new file mode 100644
index 000000000000..bf12881ff0ae
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-asyncio-0.16.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/hypothesis-3.64[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-5.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for testing asyncio code with pytest
+EAPI=8
+HOMEPAGE=https://github.com/pytest-dev/pytest-asyncio https://pypi.org/project/pytest-asyncio/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pytest-5.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pytest-dev/pytest-asyncio/archive/v0.16.0.tar.gz -> pytest-asyncio-0.16.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=468e6ecb7db437f1b1ad06d936914ff7
diff --git a/metadata/md5-cache/dev-python/pytest-bdd-4.1.0 b/metadata/md5-cache/dev-python/pytest-bdd-4.1.0
new file mode 100644
index 000000000000..641af2a0d7b6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-bdd-4.1.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/glob2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parse_type[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=BDD library for the pytest runner
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pytest-bdd/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/glob2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parse_type[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/4.1.0.tar.gz -> pytest-bdd-4.1.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b1bd74bb1d53d54edf5a2a566ca31149
diff --git a/metadata/md5-cache/dev-python/pytest-check-1.0.4 b/metadata/md5-cache/dev-python/pytest-check-1.0.4
index 3954b0967c7d..5acfe7b20679 100644
--- a/metadata/md5-cache/dev-python/pytest-check-1.0.4
+++ b/metadata/md5-cache/dev-python/pytest-check-1.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=pytest plugin that allows multiple failures per test
 EAPI=8
 HOMEPAGE=https://github.com/okken/pytest-check https://pypi.org/project/pytest_check/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/okken/pytest-check/archive/1.0.4.tar.gz -> pytest-check-1.0.4.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ed5895b948f41fd4d61addc00eb1e698
+_md5_=43a593fb13fb701244b1e218c330312e
diff --git a/metadata/md5-cache/dev-python/pytest-flakes-4.0.2-r1 b/metadata/md5-cache/dev-python/pytest-flakes-4.0.2-r1
deleted file mode 100644
index 2a1b17a8d0ba..000000000000
--- a/metadata/md5-cache/dev-python/pytest-flakes-4.0.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pyflakes[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of small Python functions & classes
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pytest-flakes/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/pyflakes[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-flakes/pytest-flakes-4.0.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b99d835f5cb163298a3f7c04a42f9360
diff --git a/metadata/md5-cache/dev-python/pytest-html-1.22.1 b/metadata/md5-cache/dev-python/pytest-html-1.22.1
deleted file mode 100644
index 5708b9d9be61..000000000000
--- a/metadata/md5-cache/dev-python/pytest-html-1.22.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Plugin for generating HTML reports for py.test results
-EAPI=7
-HOMEPAGE=https://github.com/pytest-dev/pytest-html/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-html/pytest-html-1.22.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=525ef37fdb3ad9f2a9f40220923d47c5
diff --git a/metadata/md5-cache/dev-python/pytest-metadata-1.8.0 b/metadata/md5-cache/dev-python/pytest-metadata-1.8.0
deleted file mode 100644
index 5f8108ea0e69..000000000000
--- a/metadata/md5-cache/dev-python/pytest-metadata-1.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/pytest-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A plugin for pytest that provides access to test session metadata
-EAPI=7
-HOMEPAGE=https://github.com/pytest-dev/pytest-metadata/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/pytest-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-metadata/pytest-metadata-1.8.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d406669fe3ab9ecd01b251fe4033d7e8
diff --git a/metadata/md5-cache/dev-python/pytest-pylint-0.17.0 b/metadata/md5-cache/dev-python/pytest-pylint-0.17.0
deleted file mode 100644
index 4a6d9da7a168..000000000000
--- a/metadata/md5-cache/dev-python/pytest-pylint-0.17.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pylint-2.3.0[python_targets_python3_8(-)?] >=dev-python/pytest-5.4[python_targets_python3_8(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=pytest plugin to check source code with pylint
-EAPI=7
-HOMEPAGE=https://github.com/carsongee/pytest-pylint
-IUSE=test python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pylint-2.3.0[python_targets_python3_8(-)?] >=dev-python/pytest-5.4[python_targets_python3_8(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/carsongee/pytest-pylint/archive/v0.17.0.tar.gz -> pytest-pylint-0.17.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d27af6f54cd4fb7c9ea723851c8c75f3
diff --git a/metadata/md5-cache/dev-python/pytest-qt-4.0.2 b/metadata/md5-cache/dev-python/pytest-qt-4.0.2
index 936f0f192518..3c7e61f806a6 100644
--- a/metadata/md5-cache/dev-python/pytest-qt-4.0.2
+++ b/metadata/md5-cache/dev-python/pytest-qt-4.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Pytest plugin for PyQt5 and PySide2 applications
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-qt/ https://github.com/pytest-dev/pytest-qt/
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/QtPy[gui,testlib,widgets(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-qt/pytest-qt-4.0.2.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=e70b5dc6f96142f9fe3db59f9b2dcae7
+_md5_=039d68680a88de47806e11e01a9a1870
diff --git a/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2 b/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2
deleted file mode 100644
index 41de1cf021e9..000000000000
--- a/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=A hack for test fixtures, needed for hypothesis inside py.test
-EAPI=7
-HOMEPAGE=https://github.com/untitaker/pytest-subtesthack/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=public-domain
-RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/untitaker/pytest-subtesthack/archive/0.1.2.tar.gz -> pytest-subtesthack-0.1.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=69d08747eff162978ffd3cd87a2a725b
diff --git a/metadata/md5-cache/dev-python/pytest-testinfra-6.3.0 b/metadata/md5-cache/dev-python/pytest-testinfra-6.3.0
deleted file mode 100644
index a9132b6d9408..000000000000
--- a/metadata/md5-cache/dev-python/pytest-testinfra-6.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( app-admin/ansible app-admin/salt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pywinrm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Write unit tests in Python to test actual state of your servers
-EAPI=7
-HOMEPAGE=https://github.com/pytest-dev/pytest-testinfra
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-testinfra/pytest-testinfra-6.3.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d5f4e0499ce31610bc6132a919e7dea5
diff --git a/metadata/md5-cache/dev-python/pytest-timeout-2.0.0 b/metadata/md5-cache/dev-python/pytest-timeout-2.0.0
new file mode 100644
index 000000000000..a7723f0f8cf8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-timeout-2.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( dev-python/pytest-cov[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=pytest plugin to abort hanging tests
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pytest-timeout/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-timeout/pytest-timeout-2.0.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=30679cf3504cf802f7af376f3f5ba327
diff --git a/metadata/md5-cache/dev-python/pytest-toolbox-0.4 b/metadata/md5-cache/dev-python/pytest-toolbox-0.4
index 1b40000196a5..ec4796c424a8 100644
--- a/metadata/md5-cache/dev-python/pytest-toolbox-0.4
+++ b/metadata/md5-cache/dev-python/pytest-toolbox-0.4
@@ -4,7 +4,7 @@ DESCRIPTION=Numerous useful plugins for pytest
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest-toolbox/ https://github.com/samuelcolvin/pytest-toolbox/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/samuelcolvin/pytest-toolbox/archive/v0.4.tar.gz -> pytest-toolbox-0.4.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=27b7ce7739828167596003c1064347d6
+_md5_=e344d9817444d4cd9c113edca805e534
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-2.3.0 b/metadata/md5-cache/dev-python/pytest-xdist-2.3.0
index d190ce92001d..7104157e41c8 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-2.3.0
+++ b/metadata/md5-cache/dev-python/pytest-xdist-2.3.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-2.3.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=190e49a669bbfd95abb18db4c7e25832
+_md5_=0166bf8e84418919ff4f66a996e1798e
diff --git a/metadata/md5-cache/dev-python/pytest-xvfb-2.0.0-r1 b/metadata/md5-cache/dev-python/pytest-xvfb-2.0.0-r1
index de3aed29eb49..ec2f83a72253 100644
--- a/metadata/md5-cache/dev-python/pytest-xvfb-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-xvfb-2.0.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A pytest plugin to run Xvfb for tests
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-xvfb/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pytest-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyvirtualdisplay-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-base/xorg-server[xvfb] python_targets_python3_8? ( dev-lang/python:3.8[tk] ) python_targets_python3_9? ( dev-lang/python:3.9[tk] ) python_targets_python3_10? ( dev-lang/python:3.10[tk] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/The-Compiler/pytest-xvfb/archive/v2.0.0.tar.gz -> pytest-xvfb-2.0.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=df442ef336dff23bc2e98ec7f10fc9ae
+_md5_=18dc0c5fd87b2c9feb681c9140b5fa1d
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-7.2.1 b/metadata/md5-cache/dev-python/python-cinderclient-7.2.1
deleted file mode 100644
index b9b77cbbf83d..000000000000
--- a/metadata/md5-cache/dev-python/python-cinderclient-7.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.1.0
-DESCRIPTION=A client for the OpenStack Cinder API
-EAPI=7
-HOMEPAGE=https://launchpad.net/python-cinderclient
-IUSE=python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.1.0 >=dev-python/prettytable-0.7.1[python_targets_python3_8(-)?] <dev-python/prettytable-0.8[python_targets_python3_8(-)?] >=dev-python/keystoneauth-3.4.0[python_targets_python3_8(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?] !~dev-python/requests-2.20.0[python_targets_python3_8(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-cinderclient/python-cinderclient-7.2.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2d9769e3353a1f3314d30765f98872fb
diff --git a/metadata/md5-cache/dev-python/python-cstruct-1.8 b/metadata/md5-cache/dev-python/python-cstruct-1.8
deleted file mode 100644
index 7208fb78425b..000000000000
--- a/metadata/md5-cache/dev-python/python-cstruct-1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=C-style structs for Python
-EAPI=7
-HOMEPAGE=https://github.com/andreax79/python-cstruct https://pypi.org/project/cstruct/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/andreax79/python-cstruct/archive/v1.8.tar.gz -> python-cstruct-1.8.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3b2c776c2a58a265030f582e6da68bef
diff --git a/metadata/md5-cache/dev-python/python-cstruct-2.1 b/metadata/md5-cache/dev-python/python-cstruct-2.1
new file mode 100644
index 000000000000..ab3fbd486b17
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-cstruct-2.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=C-style structs for Python
+EAPI=8
+HOMEPAGE=https://github.com/andreax79/python-cstruct https://pypi.org/project/cstruct/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/andreax79/python-cstruct/archive/v2.1.tar.gz -> python-cstruct-2.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e6565835cb8bbf453533cc71cfe71c56
diff --git a/metadata/md5-cache/dev-python/python-debian-0.1.42 b/metadata/md5-cache/dev-python/python-debian-0.1.42
new file mode 100644
index 000000000000..0389bde48505
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-debian-0.1.42
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-arch/dpkg ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python modules to work with Debian-related data formats
+EAPI=8
+HOMEPAGE=https://salsa.debian.org/python-debian-team/python-debian
+IUSE=test python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 GPL-3
+RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.42.tar.xz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0227e88c351a691897699b222a5b1613
diff --git a/metadata/md5-cache/dev-python/python-dotenv-0.19.1 b/metadata/md5-cache/dev-python/python-dotenv-0.19.1
new file mode 100644
index 000000000000..db1c26c8e098
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-dotenv-0.19.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/click-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sh-1.09[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DESCRIPTION=Manage .env files
+EAPI=8
+HOMEPAGE=https://github.com/theskumar/python-dotenv
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-dotenv/python-dotenv-0.19.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=268d812911a5947eb227aa50575f4671
diff --git a/metadata/md5-cache/dev-python/python-email-validator-1.1.3 b/metadata/md5-cache/dev-python/python-email-validator-1.1.3
index 6af250a5408d..b04b43efa655 100644
--- a/metadata/md5-cache/dev-python/python-email-validator-1.1.3
+++ b/metadata/md5-cache/dev-python/python-email-validator-1.1.3
@@ -4,7 +4,7 @@ DESCRIPTION=A robust email syntax and deliverability validation library
 EAPI=8
 HOMEPAGE=https://github.com/JoshData/python-email-validator
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=CC0-1.0
 RDEPEND=>=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-1.15.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JoshData/python-email-validator/archive/v1.1.3.tar.gz -> python-email-validator-1.1.3.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b73f2882f1302c792244f72bdecd07c4
+_md5_=1a8c3f95d1b8e31a380773da814dba68
diff --git a/metadata/md5-cache/dev-python/python-engineio-3.12.1 b/metadata/md5-cache/dev-python/python-engineio-3.12.1
deleted file mode 100644
index acc663a3775a..000000000000
--- a/metadata/md5-cache/dev-python/python-engineio-3.12.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-DESCRIPTION=Python implementation of the Engine.IO realtime server.
-EAPI=7
-HOMEPAGE=https://python-engineio.readthedocs.org/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio/
-IUSE=python_targets_pypy3 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/python-engineio/python-engineio-3.12.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=44ac3a502e6285b7df77ce69abe44191
diff --git a/metadata/md5-cache/dev-python/python-engineio-4.0.1 b/metadata/md5-cache/dev-python/python-engineio-4.0.1
deleted file mode 100644
index 9b978e4f902c..000000000000
--- a/metadata/md5-cache/dev-python/python-engineio-4.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/eventlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python implementation of the Engine.IO realtime server.
-EAPI=7
-HOMEPAGE=https://python-engineio.readthedocs.org/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/miguelgrinberg/python-engineio/archive/v4.0.1.tar.gz -> python-engineio-4.0.1.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f97aa1035bc472c7a184f7d2c1eeb6c6
diff --git a/metadata/md5-cache/dev-python/python-engineio-4.1.0 b/metadata/md5-cache/dev-python/python-engineio-4.1.0
deleted file mode 100644
index d1fa7261a2eb..000000000000
--- a/metadata/md5-cache/dev-python/python-engineio-4.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/eventlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python implementation of the Engine.IO realtime server.
-EAPI=7
-HOMEPAGE=https://python-engineio.readthedocs.io/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/miguelgrinberg/python-engineio/archive/v4.1.0.tar.gz -> python-engineio-4.1.0.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bbcf0834d5c32415fde5c96ff9e5c535
diff --git a/metadata/md5-cache/dev-python/python-engineio-4.2.0 b/metadata/md5-cache/dev-python/python-engineio-4.2.0
deleted file mode 100644
index 7cb2f8243a97..000000000000
--- a/metadata/md5-cache/dev-python/python-engineio-4.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/eventlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python implementation of the Engine.IO realtime server.
-EAPI=7
-HOMEPAGE=https://python-engineio.readthedocs.io/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/miguelgrinberg/python-engineio/archive/v4.2.0.tar.gz -> python-engineio-4.2.0.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bbcf0834d5c32415fde5c96ff9e5c535
diff --git a/metadata/md5-cache/dev-python/python-fcl-0.0.12-r1 b/metadata/md5-cache/dev-python/python-fcl-0.0.12-r1
index 6805eacd3242..0b68f0ade40b 100644
--- a/metadata/md5-cache/dev-python/python-fcl-0.0.12-r1
+++ b/metadata/md5-cache/dev-python/python-fcl-0.0.12-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~sci-libs/fcl-0.5.0 sci-libs/octomap dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~sci-libs/fcl-0.5.0 sci-libs/octomap dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python bindings for the Flexible Collision Library
 EAPI=7
 HOMEPAGE=https://github.com/BerkeleyAutomation/python-fcl https://pypi.org/project/python-fcl/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~sci-libs/fcl-0.5.0 sci-libs/octomap python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~sci-libs/fcl-0.5.0 sci-libs/octomap python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-fcl/python-fcl-0.0.12.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75f0eb8ad3e7013aeeedf5270dffebfe
+_md5_=7a0f85b1649d25ebd853d515ee8c657b
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-3.2.2 b/metadata/md5-cache/dev-python/python-glanceclient-3.2.2
deleted file mode 100644
index 129a722a81e2..000000000000
--- a/metadata/md5-cache/dev-python/python-glanceclient-3.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.1.0
-DESCRIPTION=A client for the OpenStack Glance API
-EAPI=7
-HOMEPAGE=https://github.com/openstack/python-glanceclient
-IUSE=python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?] !~dev-python/pbr-2.1.0 >=dev-python/prettytable-0.7.1[python_targets_python3_8(-)?] <dev-python/prettytable-0.8[python_targets_python3_8(-)?] >=dev-python/keystoneauth-3.6.2[python_targets_python3_8(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?] >=dev-python/warlock-1.2.0[python_targets_python3_8(-)?] <dev-python/warlock-2[python_targets_python3_8(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?] >=dev-python/wrapt-1.7.0[python_targets_python3_8(-)?] >=dev-python/pyopenssl-17.1.0[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-3.2.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7cb8c9440f61cc56a44412f5a6256ebc
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-4.9.0 b/metadata/md5-cache/dev-python/python-ironicclient-4.9.0
new file mode 100644
index 000000000000..44a44c19e509
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-ironicclient-4.9.0
@@ -0,0 +1,15 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/tempest-17.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ddt-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-openstackclient-3.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/cliff-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dogpile-cache-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keystoneauth-3.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/openstacksdk-0.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/osc-lib-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python bindings for the Ironic API
+EAPI=8
+HOMEPAGE=https://www.openstack.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >dev-python/cliff-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/dogpile-cache-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keystoneauth-3.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/openstacksdk-0.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/osc-lib-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-ironicclient/python-ironicclient-4.9.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=574a5618f69426974681ddfb59ac7c7d
diff --git a/metadata/md5-cache/dev-python/python-keyutils-0.6 b/metadata/md5-cache/dev-python/python-keyutils-0.6
index 104f90ec5b51..84d51a45e7cc 100644
--- a/metadata/md5-cache/dev-python/python-keyutils-0.6
+++ b/metadata/md5-cache/dev-python/python-keyutils-0.6
@@ -5,7 +5,7 @@ DESCRIPTION=A set of python bindings for keyutils
 EAPI=8
 HOMEPAGE=https://github.com/sassoftware/python-keyutils/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=sys-apps/keyutils python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sassoftware/python-keyutils/archive/refs/tags/0.6.tar.gz -> python-keyutils-0.6.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b5ff6eb0beca62b5e328094e72057368
+_md5_=3387304c3ed76f9c05dd5eda265d9718
diff --git a/metadata/md5-cache/dev-python/python-levenshtein-0.12.1 b/metadata/md5-cache/dev-python/python-levenshtein-0.12.1
deleted file mode 100644
index 879d71a7022d..000000000000
--- a/metadata/md5-cache/dev-python/python-levenshtein-0.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Functions for fast computation of Levenshtein distance, and edit operations
-EAPI=7
-HOMEPAGE=https://pypi.org/project/python-Levenshtein/ https://github.com/ztane/python-Levenshtein/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-Levenshtein/python-Levenshtein-0.12.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b9892ce89afb4b1d238900d1eef4384b
diff --git a/metadata/md5-cache/dev-python/python-levenshtein-0.12.2 b/metadata/md5-cache/dev-python/python-levenshtein-0.12.2
index 748a4a5d8777..14ba0d394041 100644
--- a/metadata/md5-cache/dev-python/python-levenshtein-0.12.2
+++ b/metadata/md5-cache/dev-python/python-levenshtein-0.12.2
@@ -4,11 +4,11 @@ DESCRIPTION=Functions for fast computation of Levenshtein distance, and edit ope
 EAPI=8
 HOMEPAGE=https://pypi.org/project/python-Levenshtein/ https://github.com/ztane/python-Levenshtein/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-Levenshtein/python-Levenshtein-0.12.2.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cf4208a2dfe3a2d0c62d905ac1e025e6
+_md5_=a05f02e33bbcbae6ab71975d16852b6f
diff --git a/metadata/md5-cache/dev-python/python-lhafile-0.3.0 b/metadata/md5-cache/dev-python/python-lhafile-0.3.0
index 96c4f5f97834..6cdf353eb125 100644
--- a/metadata/md5-cache/dev-python/python-lhafile-0.3.0
+++ b/metadata/md5-cache/dev-python/python-lhafile-0.3.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=LHA archive support for Python
 EAPI=7
 HOMEPAGE=https://fengestad.no/python-lhafile/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/FrodeSolheim/python-lhafile/archive/v0.3.0.tar.gz -> python-lhafile-0.3.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e2a487b4a3f3505f03b5e7f344de3a3e
+_md5_=2070f34178eb7186a48ff31e6264f03c
diff --git a/metadata/md5-cache/dev-python/python-libevdev-0.9 b/metadata/md5-cache/dev-python/python-libevdev-0.9
index ed2374bf7d99..225a37e101d5 100644
--- a/metadata/md5-cache/dev-python/python-libevdev-0.9
+++ b/metadata/md5-cache/dev-python/python-libevdev-0.9
@@ -1,17 +1,16 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-libs/libevdev ) test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-libs/libevdev )
 DESCRIPTION=Python wrappers for the libevdev library
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/libevdev/python-libevdev
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 PDEPEND=dev-libs/libevdev
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/libevdev/python-libevdev/-/archive/0.9/python-libevdev-0.9.tar.bz2
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3e24e118451064b188939f994d2c5930
+_md5_=ea44f17ce4170c3ba3ddb3c9e959d989
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-2.0.4 b/metadata/md5-cache/dev-python/python-nbxmpp-2.0.4
new file mode 100644
index 000000000000..2c5ef65b49ba
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-2.0.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-libs/gobject-introspection net-libs/libsoup[introspection] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/precis-i18n[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
+EAPI=8
+HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/gobject-introspection net-libs/libsoup[introspection] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/precis-i18n[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-2.0.4/python-nbxmpp-nbxmpp-2.0.4.tar.bz2
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=57ccf28af82e27ef340c9e650f7ce184
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.31 b/metadata/md5-cache/dev-python/python-xlib-0.31
index f4f29b2f2746..159b9456afc7 100644
--- a/metadata/md5-cache/dev-python/python-xlib-0.31
+++ b/metadata/md5-cache/dev-python/python-xlib-0.31
@@ -4,7 +4,7 @@ DESCRIPTION=A fully functional X client library for Python, written in Python
 EAPI=7
 HOMEPAGE=https://github.com/python-xlib/python-xlib
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 ~arm ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-xlib/python-xlib/releases/download/0.31/python-xlib-0.31.tar.bz2
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=2534bd2d8fb492cfd78b6c7a4929ae3e
+_md5_=19c3ab43ea29bdfebb8661a1eb40325e
diff --git a/metadata/md5-cache/dev-python/pythran-0.10.0 b/metadata/md5-cache/dev-python/pythran-0.10.0
index 06a40c05760d..5880dfcc4e58 100644
--- a/metadata/md5-cache/dev-python/pythran-0.10.0
+++ b/metadata/md5-cache/dev-python/pythran-0.10.0
@@ -4,7 +4,7 @@ DESCRIPTION=Ahead of Time compiler for numeric kernels
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pythran/ https://github.com/serge-sans-paille/pythran/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND==dev-python/beniget-0.4*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/gast-0.5*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ply-3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/serge-sans-paille/pythran/archive/0.10.0.tar.gz -> pythran-0.10.0.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=808fafbf9d83bd0dcb9615389fe0d790
+_md5_=54a78d7b5a955391fd2178154c54b415
diff --git a/metadata/md5-cache/dev-python/pythran-0.9.12_p1 b/metadata/md5-cache/dev-python/pythran-0.9.12_p1
deleted file mode 100644
index f44f38cc5f05..000000000000
--- a/metadata/md5-cache/dev-python/pythran-0.9.12_p1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/cblas ) test? ( =dev-python/beniget-0.4*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/gast-0.5*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ply-3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Ahead of Time compiler for numeric kernels
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pythran/ https://github.com/serge-sans-paille/pythran/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND==dev-python/beniget-0.4*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/gast-0.5*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ply-3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/serge-sans-paille/pythran/archive/0.9.12.post1.tar.gz -> pythran-0.9.12.post1.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=808fafbf9d83bd0dcb9615389fe0d790
diff --git a/metadata/md5-cache/dev-python/pytz_deprecation_shim-0.1.0_p0 b/metadata/md5-cache/dev-python/pytz_deprecation_shim-0.1.0_p0
new file mode 100644
index 000000000000..9db4bb20a5c5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytz_deprecation_shim-0.1.0_p0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/pytzdata[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Shims to make deprecation of pytz easier
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pytz-deprecation-shim/ https://github.com/pganssle/pytz-deprecation-shim
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pytzdata[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0.post0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=faf5b1ca79ff0f8ae221ffebbe54543d
diff --git a/metadata/md5-cache/dev-python/pyvirtualdisplay-2.2 b/metadata/md5-cache/dev-python/pyvirtualdisplay-2.2
index c0b6a05f33b3..c116778ce4eb 100644
--- a/metadata/md5-cache/dev-python/pyvirtualdisplay-2.2
+++ b/metadata/md5-cache/dev-python/pyvirtualdisplay-2.2
@@ -4,7 +4,7 @@ DESCRIPTION=Python wrapper for Xvfb, Xephyr and Xvnc
 EAPI=7
 HOMEPAGE=https://github.com/ponty/PyVirtualDisplay
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=dev-python/easyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ponty/PyVirtualDisplay/archive/2.2.tar.gz -> PyVirtualDisplay-2.2.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eb38cf4decf1d11102ce4ccd697c5991
+_md5_=ac8594d2421a66037f77bf978d35d0cb
diff --git a/metadata/md5-cache/dev-python/pywavelets-1.1.1 b/metadata/md5-cache/dev-python/pywavelets-1.1.1
index b8cf31ba6ad2..d1f4e276097c 100644
--- a/metadata/md5-cache/dev-python/pywavelets-1.1.1
+++ b/metadata/md5-cache/dev-python/pywavelets-1.1.1
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpydoc[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpydoc[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/numpydoc[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/numpydoc[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/numpydoc[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Discrete Wavelet Transforms in Python
 EAPI=7
 HOMEPAGE=https://pywavelets.readthedocs.io/en/latest/ https://github.com/PyWavelets/pywt
-IUSE=doc examples test python_targets_python3_8 python_targets_python3_9
+IUSE=examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpydoc[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyWavelets/PyWavelets-1.1.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=59e8ce620393a29d6d66fc778c353f43
+_md5_=4f25c26e72c9b61a87438292228387eb
diff --git a/metadata/md5-cache/dev-python/pyyaml-5.3.1-r1 b/metadata/md5-cache/dev-python/pyyaml-5.3.1-r1
deleted file mode 100644
index c615ee1cab71..000000000000
--- a/metadata/md5-cache/dev-python/pyyaml-5.3.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( libyaml? ( dev-libs/libyaml:= ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=libyaml? ( dev-libs/libyaml:= ) libyaml? ( python_targets_python3_8? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
-DESCRIPTION=YAML parser and emitter for Python
-EAPI=7
-HOMEPAGE=https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/ https://github.com/yaml/pyyaml
-IUSE=examples +libyaml test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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 ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=libyaml? ( dev-libs/libyaml:= ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/yaml/pyyaml/archive/5.3.1.tar.gz -> pyyaml-5.3.1.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a6de0ac304a33a7f3885a429c2fadd71
diff --git a/metadata/md5-cache/dev-python/pyyaml-6.0 b/metadata/md5-cache/dev-python/pyyaml-6.0
new file mode 100644
index 000000000000..bc97abfd4cf9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyyaml-6.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/setuptools-58.2.0[python_targets_pypy3(-)?] ) test? ( dev-libs/libyaml:= ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libyaml:=
+DESCRIPTION=YAML parser and emitter for Python
+EAPI=8
+HOMEPAGE=https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/ https://github.com/yaml/pyyaml/
+IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+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 ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=dev-libs/libyaml:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/yaml/pyyaml/archive/6.0.tar.gz -> pyyaml-6.0.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=42327cec1cefc169bf632a0f0ad8ae2a
diff --git a/metadata/md5-cache/dev-python/pyzotero-1.4.25 b/metadata/md5-cache/dev-python/pyzotero-1.4.25
deleted file mode 100644
index b9e1a7834672..000000000000
--- a/metadata/md5-cache/dev-python/pyzotero-1.4.25
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httpretty[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( dev-python/sphinx ) test? ( app-text/zotero-bin dev-python/bibtexparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/feedparser-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python client for the Zotero API
-EAPI=8
-HOMEPAGE=https://github.com/urschrei/pyzotero
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=app-text/zotero-bin dev-python/bibtexparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/feedparser-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/urschrei/pyzotero/archive/v1.4.25.tar.gz -> pyzotero-1.4.25.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=248a7ca3d768871b5194acb0c2731814
diff --git a/metadata/md5-cache/dev-python/pyzotero-1.4.26 b/metadata/md5-cache/dev-python/pyzotero-1.4.26
new file mode 100644
index 000000000000..63f527f3c170
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyzotero-1.4.26
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httpretty[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( dev-python/sphinx ) test? ( app-text/zotero-bin dev-python/bibtexparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/feedparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python client for the Zotero API
+EAPI=8
+HOMEPAGE=https://github.com/urschrei/pyzotero
+IUSE=doc test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-text/zotero-bin dev-python/bibtexparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/feedparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/urschrei/pyzotero/archive/v1.4.26.tar.gz -> pyzotero-1.4.26.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6ddfcdc55a5b10af3240dd2edac9fd6a
diff --git a/metadata/md5-cache/dev-python/qstylizer-0.1.10 b/metadata/md5-cache/dev-python/qstylizer-0.1.10
deleted file mode 100644
index 5a20ae4d83b8..000000000000
--- a/metadata/md5-cache/dev-python/qstylizer-0.1.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/tinycss-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/tinycss-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/inflection-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/inflection-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stylesheet Generator for PyQt5/PySide2
-EAPI=7
-HOMEPAGE=https://github.com/blambright/qstylizer
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/tinycss-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/tinycss-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/inflection-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/inflection-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/blambright/qstylizer/archive/refs/tags/0.1.10.tar.gz -> qstylizer-0.1.10.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=851661c83e5cab2791f545aa7acaa63d
diff --git a/metadata/md5-cache/dev-python/qstylizer-0.2.0 b/metadata/md5-cache/dev-python/qstylizer-0.2.0
deleted file mode 100644
index 3a74a4134385..000000000000
--- a/metadata/md5-cache/dev-python/qstylizer-0.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/tinycss2-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/tinycss2-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/inflection-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/inflection-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/sphinxcontrib-autoprogram[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stylesheet Generator for PyQt5/PySide2
-EAPI=7
-HOMEPAGE=https://github.com/blambright/qstylizer
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/tinycss2-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/tinycss2-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/inflection-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/inflection-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/blambright/qstylizer/archive/refs/tags/0.2.0.tar.gz -> qstylizer-0.2.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=decc22d1a050490900001846e5f19529
diff --git a/metadata/md5-cache/dev-python/radon-4.5.2 b/metadata/md5-cache/dev-python/radon-4.5.2
deleted file mode 100644
index f9f1a9d134c3..000000000000
--- a/metadata/md5-cache/dev-python/radon-4.5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flake8-polyfill[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mando[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Code Metrics in Python
-EAPI=7
-HOMEPAGE=https://radon.readthedocs.io/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flake8-polyfill[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mando[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/radon/radon-4.5.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ffc5eef38f538da75900bc5d17bea1f8
diff --git a/metadata/md5-cache/dev-python/radon-5.0.1 b/metadata/md5-cache/dev-python/radon-5.0.1
deleted file mode 100644
index d704c950d426..000000000000
--- a/metadata/md5-cache/dev-python/radon-5.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mando[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Code Metrics in Python
-EAPI=7
-HOMEPAGE=https://radon.readthedocs.io/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mando[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/radon/radon-5.0.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=16fa76b76672c994628efbd46e047fd8
diff --git a/metadata/md5-cache/dev-python/rdflib-6.0.1 b/metadata/md5-cache/dev-python/rdflib-6.0.1
index 0ddc8df09c46..9da917599414 100644
--- a/metadata/md5-cache/dev-python/rdflib-6.0.1
+++ b/metadata/md5-cache/dev-python/rdflib-6.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=RDF library containing a triple store and parser/serializer
 EAPI=8
 HOMEPAGE=https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib/
 IUSE=examples sqlite test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-python/isodate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-6.0.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4812123c5aa989d5c2aef0946ae33c90
+_md5_=b59b697acfdd384335e922ef51bdfc61
diff --git a/metadata/md5-cache/dev-python/rdflib-6.0.2 b/metadata/md5-cache/dev-python/rdflib-6.0.2
new file mode 100644
index 000000000000..95571626d2e2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rdflib-6.0.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/berkeleydb[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/isodate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=RDF library containing a triple store and parser/serializer
+EAPI=8
+HOMEPAGE=https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib/
+IUSE=examples sqlite test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-python/isodate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/rdflib/rdflib-6.0.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b59b697acfdd384335e922ef51bdfc61
diff --git a/metadata/md5-cache/dev-python/regex-2021.10.8 b/metadata/md5-cache/dev-python/regex-2021.10.8
new file mode 100644
index 000000000000..9a9801f9dadf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/regex-2021.10.8
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Alternative regular expression module to replace re
+EAPI=8
+HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/regex/regex-2021.10.8.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3a7bb1f7b2c56ab1b3e920e496d2acf2
diff --git a/metadata/md5-cache/dev-python/regex-2021.8.28 b/metadata/md5-cache/dev-python/regex-2021.8.28
index 9a3976879830..871b220617f0 100644
--- a/metadata/md5-cache/dev-python/regex-2021.8.28
+++ b/metadata/md5-cache/dev-python/regex-2021.8.28
@@ -4,7 +4,7 @@ DESCRIPTION=Alternative regular expression module to replace re
 EAPI=8
 HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/regex/regex-2021.8.28.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4f170f34076eaba167e48e400905e1f7
+_md5_=8a7eea995b5e95d0c52dc0bebd57386a
diff --git a/metadata/md5-cache/dev-python/regex-2021.8.3 b/metadata/md5-cache/dev-python/regex-2021.8.3
deleted file mode 100644
index e09dc8e0366e..000000000000
--- a/metadata/md5-cache/dev-python/regex-2021.8.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Alternative regular expression module to replace re
-EAPI=8
-HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/regex/regex-2021.8.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8a7eea995b5e95d0c52dc0bebd57386a
diff --git a/metadata/md5-cache/dev-python/reportlab-3.6.2 b/metadata/md5-cache/dev-python/reportlab-3.6.2
new file mode 100644
index 000000000000..37eb3cfe706a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/reportlab-3.6.2
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) test? ( media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:=
+DESCRIPTION=Tools for generating printable PDF documents from any data source
+EAPI=8
+HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/reportlab/reportlab-3.6.2.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f2e680253796d70193c9be0f54e91558
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.6.4 b/metadata/md5-cache/dev-python/requests-cache-0.6.4
deleted file mode 100644
index 3e91ca688a27..000000000000
--- a/metadata/md5-cache/dev-python/requests-cache-0.6.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Persistent cache for requests library
-EAPI=7
-HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.6.4.tar.gz -> requests-cache-0.6.4.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=53b85d17d5d82d085bca133267bd665d
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.7.1 b/metadata/md5-cache/dev-python/requests-cache-0.7.1
deleted file mode 100644
index a1552da43ec9..000000000000
--- a/metadata/md5-cache/dev-python/requests-cache-0.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Persistent cache for requests library
-EAPI=8
-HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.7.1.tar.gz -> requests-cache-0.7.1.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ed0f363f4eef42e1476b184181553bf1
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.7.2 b/metadata/md5-cache/dev-python/requests-cache-0.7.2
deleted file mode 100644
index b0ad7afa20e0..000000000000
--- a/metadata/md5-cache/dev-python/requests-cache-0.7.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Persistent cache for requests library
-EAPI=8
-HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.7.2.tar.gz -> requests-cache-0.7.2.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ed0f363f4eef42e1476b184181553bf1
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.7.3 b/metadata/md5-cache/dev-python/requests-cache-0.7.3
deleted file mode 100644
index bb6a8ee3f450..000000000000
--- a/metadata/md5-cache/dev-python/requests-cache-0.7.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Persistent cache for requests library
-EAPI=8
-HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.7.3.tar.gz -> requests-cache-0.7.3.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=40a2bc047ea4a6fd19d3e9b9919abcfc
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.7.4 b/metadata/md5-cache/dev-python/requests-cache-0.7.4
deleted file mode 100644
index afe9fd8f89c5..000000000000
--- a/metadata/md5-cache/dev-python/requests-cache-0.7.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ujson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Persistent cache for requests library
-EAPI=8
-HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.7.4.tar.gz -> requests-cache-0.7.4.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a509bff7c51ec61fd2f443d71acbcdfe
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.7.5 b/metadata/md5-cache/dev-python/requests-cache-0.7.5
deleted file mode 100644
index 303db0402dcd..000000000000
--- a/metadata/md5-cache/dev-python/requests-cache-0.7.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ujson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Persistent cache for requests library
-EAPI=8
-HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.7.5.tar.gz -> requests-cache-0.7.5.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=65f0ff92f0e9488a9f7fe1f4fd79016c
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.8.0 b/metadata/md5-cache/dev-python/requests-cache-0.8.0
deleted file mode 100644
index 11d91e6c2d13..000000000000
--- a/metadata/md5-cache/dev-python/requests-cache-0.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Persistent cache for requests library
-EAPI=8
-HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.8.0.tar.gz -> requests-cache-0.8.0.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3313036235eebf883f729e7aea5cf4cf
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.8.1-r1 b/metadata/md5-cache/dev-python/requests-cache-0.8.1-r1
index cfe4520174cd..91f36810267d 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/requests-cache-0.8.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Persistent cache for requests library
 EAPI=8
 HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.8.1.tar.gz -> requests-cache-0.8.1.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c7b79d89e6d055114e44e7ddf90637fa
+_md5_=c76d42eaf333094dbff7ecfd3d619b8f
diff --git a/metadata/md5-cache/dev-python/requests-file-1.4.3 b/metadata/md5-cache/dev-python/requests-file-1.4.3
deleted file mode 100644
index 6498c4296500..000000000000
--- a/metadata/md5-cache/dev-python/requests-file-1.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=File transport adapter for Requests
-EAPI=7
-HOMEPAGE=https://pypi.org/project/requests-file/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/r/requests-file/requests-file-1.4.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9f7418977d327b1cb681225c6bb5df9e
diff --git a/metadata/md5-cache/dev-python/requests-file-1.5.1-r1 b/metadata/md5-cache/dev-python/requests-file-1.5.1-r1
index 84defc91eef4..1c0215a56e16 100644
--- a/metadata/md5-cache/dev-python/requests-file-1.5.1-r1
+++ b/metadata/md5-cache/dev-python/requests-file-1.5.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=File transport adapter for Requests
 EAPI=8
 HOMEPAGE=https://pypi.org/project/requests-file/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-file/requests-file-1.5.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=51ef3caab391b3d708a3d123b45a1da1
+_md5_=5b921cff7032365d3dc2fbc2e7fb9c2d
diff --git a/metadata/md5-cache/dev-python/requests_pkcs12-1.7 b/metadata/md5-cache/dev-python/requests_pkcs12-1.7
deleted file mode 100644
index 8317d604a4f4..000000000000
--- a/metadata/md5-cache/dev-python/requests_pkcs12-1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Adds PKCS#12 support to the Python requests library in a clean way
-EAPI=7
-HOMEPAGE=https://github.com/m-click/requests_pkcs12
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=ISC
-RDEPEND=dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.18.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/r/requests_pkcs12/requests_pkcs12-1.7.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c07eb6ffe5a2237ad9fb09de4014996d
diff --git a/metadata/md5-cache/dev-python/resolvelib-0.8.1 b/metadata/md5-cache/dev-python/resolvelib-0.8.1
new file mode 100644
index 000000000000..d22dc9c147e4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/resolvelib-0.8.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/commentjson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=provides a Resolver class that includes dependency resolution logic
+EAPI=8
+HOMEPAGE=https://github.com/sarugaku/resolvelib/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=ISC
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sarugaku/resolvelib/archive/0.8.1.tar.gz -> resolvelib-0.8.1.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=458de1354ec69addc054da4ddfb4de40
diff --git a/metadata/md5-cache/dev-python/rich-10.10.0 b/metadata/md5-cache/dev-python/rich-10.10.0
deleted file mode 100644
index 2549dfc567ea..000000000000
--- a/metadata/md5-cache/dev-python/rich-10.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/commonmark[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for renrering rich text, tables, etc. to the terminal
-EAPI=8
-HOMEPAGE=https://github.com/willmcgugan/rich
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/commonmark[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/willmcgugan/rich/archive/v10.10.0.tar.gz -> rich-10.10.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f9b49cf70a53c1b01e0bb61e5c1e95d
diff --git a/metadata/md5-cache/dev-python/rich-10.11.0 b/metadata/md5-cache/dev-python/rich-10.11.0
deleted file mode 100644
index 894546f41ba4..000000000000
--- a/metadata/md5-cache/dev-python/rich-10.11.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/commonmark[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for renrering rich text, tables, etc. to the terminal
-EAPI=8
-HOMEPAGE=https://github.com/willmcgugan/rich
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/commonmark[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/willmcgugan/rich/archive/v10.11.0.tar.gz -> rich-10.11.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f9b49cf70a53c1b01e0bb61e5c1e95d
diff --git a/metadata/md5-cache/dev-python/robot-detection-0.4.0 b/metadata/md5-cache/dev-python/robot-detection-0.4.0
deleted file mode 100644
index 7d609d514461..000000000000
--- a/metadata/md5-cache/dev-python/robot-detection-0.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Module to detect if a given HTTP User Agent is a web crawler.
-EAPI=7
-HOMEPAGE=https://github.com/rory/robot-detection
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/rory/robot-detection/archive/v0.4.0.tar.gz -> robot-detection-0.4.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=563fc89dc48045a04c1363d33337c1d6
diff --git a/metadata/md5-cache/dev-python/robot-detection-0.4.0-r1 b/metadata/md5-cache/dev-python/robot-detection-0.4.0-r1
new file mode 100644
index 000000000000..28612f17869c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/robot-detection-0.4.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Module to detect if a given HTTP User Agent is a web crawler.
+EAPI=8
+HOMEPAGE=https://github.com/rory/robot-detection
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rory/robot-detection/archive/v0.4.0.tar.gz -> robot-detection-0.4.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e37f2664b18ba377355650155c128cf4
diff --git a/metadata/md5-cache/dev-python/rope-0.21.0 b/metadata/md5-cache/dev-python/rope-0.21.0
new file mode 100644
index 000000000000..32baca5cb024
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rope-0.21.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python refactoring library
+EAPI=8
+HOMEPAGE=https://github.com/python-rope/rope
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3+
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/rope/rope-0.21.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=93e7a6c44f2eccdb9e6d3fc47564d0d6
diff --git a/metadata/md5-cache/dev-python/rq-1.10 b/metadata/md5-cache/dev-python/rq-1.10
index cfbb034fb5b1..5203d4a47d42 100644
--- a/metadata/md5-cache/dev-python/rq-1.10
+++ b/metadata/md5-cache/dev-python/rq-1.10
@@ -4,7 +4,7 @@ DESCRIPTION=simple, lightweight library for creating and processing background j
 EAPI=8
 HOMEPAGE=https://python-rq.org https://github.com/rq/rq
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/click-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/redis-py-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rq/rq/archive/v1.10.tar.gz -> rq-1.10.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cd0e540665f631fc15e83f939bf68792
+_md5_=855c680a3c9885ef921193635ffaeba4
diff --git a/metadata/md5-cache/dev-python/rq-1.9.0 b/metadata/md5-cache/dev-python/rq-1.9.0
deleted file mode 100644
index ccd6fcc97c7f..000000000000
--- a/metadata/md5-cache/dev-python/rq-1.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-db/redis dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sentry-sdk[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/click-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/redis-py-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=simple, lightweight library for creating and processing background jobs
-EAPI=7
-HOMEPAGE=https://python-rq.org https://github.com/rq/rq
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/click-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/redis-py-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rq/rq/archive/v1.9.0.tar.gz -> rq-1.9.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b10d8c1c7199112bb17e2915feeb5e8d
diff --git a/metadata/md5-cache/dev-python/rtslib-fb-2.1.74 b/metadata/md5-cache/dev-python/rtslib-fb-2.1.74
index 1d053fcf6170..2f1425b3890b 100644
--- a/metadata/md5-cache/dev-python/rtslib-fb-2.1.74
+++ b/metadata/md5-cache/dev-python/rtslib-fb-2.1.74
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?] virtual/pkgconfig
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python object API for managing the Linux LIO kernel target
 EAPI=7
 HOMEPAGE=https://github.com/open-iscsi/rtslib-fb
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=dev-python/pyudev[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-python/pyudev[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rtslib-fb/rtslib-fb-2.1.74.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8422beec4d99caf4ca8fdf64c5d1982f
+_md5_=abdc0f72740552dbe0f101aa1b5c4aa2
diff --git a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.9.0 b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.9.0
new file mode 100644
index 000000000000..7fc782145fc6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.9.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/namespace-ruamel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Ruamel enhancements to pathlib and pathlib2
+EAPI=8
+HOMEPAGE=https://pypi.org/project/ruamel.std.pathlib/ https://sourceforge.net/p/ruamel-std-pathlib/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/namespace-ruamel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruamel-dl-tagged-releases/ruamel.std.pathlib-0.9.0.tar.xz -> ruamel-std-pathlib-0.9.0.tar.xz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=67e74a002578bc105e4ba1c03a7f004c
diff --git a/metadata/md5-cache/dev-python/sarge-0.1.5 b/metadata/md5-cache/dev-python/sarge-0.1.5
deleted file mode 100644
index 0f037b707581..000000000000
--- a/metadata/md5-cache/dev-python/sarge-0.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=wrapper for subprocess which provides command pipeline functionality
-EAPI=7
-HOMEPAGE=https://sarge.readthedocs.org/
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/s/sarge/sarge-0.1.5.post0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d6031722593fdfd041734faf5bb5df25
diff --git a/metadata/md5-cache/dev-python/scipy-1.7.1 b/metadata/md5-cache/dev-python/scipy-1.7.1
index 797e39775000..5c5dbecbb39e 100644
--- a/metadata/md5-cache/dev-python/scipy-1.7.1
+++ b/metadata/md5-cache/dev-python/scipy-1.7.1
@@ -5,7 +5,7 @@ DESCRIPTION=Scientific algorithms library for Python
 EAPI=7
 HOMEPAGE=https://www.scipy.org/
 IUSE=doc sparse test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.16.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/fortran python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.7.1.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.6.2/scipy-html-1.6.2.zip https://docs.scipy.org/doc/scipy-1.6.2/scipy-ref-1.6.2.pdf )
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=52d67a68af0fa515edbf512f3ff50136
+_md5_=51b6eed3f1199cc5c3ba6c58781a9cee
diff --git a/metadata/md5-cache/dev-python/serverfiles-0.2.1 b/metadata/md5-cache/dev-python/serverfiles-0.2.1
deleted file mode 100644
index ccac557ded38..000000000000
--- a/metadata/md5-cache/dev-python/serverfiles-0.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/requests-2.11.1[python_targets_python3_8(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?] dev-python/setuptools_scm[python_targets_python3_8(-)?]
-DESCRIPTION=Utility for accessing HTTP server and storing files locally for reuse
-EAPI=7
-HOMEPAGE=https://github.com/biolab/serverfiles
-IUSE=test python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-python/requests-2.11.1[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/biolab/serverfiles/archive/0.2.1.tar.gz -> serverfiles-0.2.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e6c6eb37371498c2049f4233ed99a18f
diff --git a/metadata/md5-cache/dev-python/setuptools-57.4.0-r2 b/metadata/md5-cache/dev-python/setuptools-57.4.0-r2
deleted file mode 100644
index 7d7279d2a985..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-57.4.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-57.4.0.tar.gz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0rc1.tar.xz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=888c73dea13d4f6e7b7bdd350cb8c954
diff --git a/metadata/md5-cache/dev-python/setuptools-57.5.0 b/metadata/md5-cache/dev-python/setuptools-57.5.0
index e756bcb67312..f3e561145507 100644
--- a/metadata/md5-cache/dev-python/setuptools-57.5.0
+++ b/metadata/md5-cache/dev-python/setuptools-57.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of extensions to Distutils
 EAPI=7
 HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-57.5.0.tar.gz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0rc1.tar.xz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1df5c6fb8ca6a4797b15bfb13973de51
+_md5_=7f1daf62b306073ba683a52f08764654
diff --git a/metadata/md5-cache/dev-python/setuptools-58.2.0 b/metadata/md5-cache/dev-python/setuptools-58.2.0
new file mode 100644
index 000000000000..ef80d7c7387c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-58.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_pypy3? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of extensions to Distutils
+EAPI=7
+HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+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
+LICENSE=MIT
+PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools/setuptools-58.2.0.tar.gz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0rc1.tar.xz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ece08e1f42955ab304300156dcf73229
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-6.3.0-r1 b/metadata/md5-cache/dev-python/setuptools_scm-6.3.0-r1
deleted file mode 100644
index ccc845b9699d..000000000000
--- a/metadata/md5-cache/dev-python/setuptools_scm-6.3.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!!<dev-python/setuptools_scm-2 test? ( dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git !sparc? ( dev-vcs/mercurial ) ) test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Manage versions by scm tags via setuptools
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools_scm/ https://pypi.org/project/setuptools-scm/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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
-LICENSE=MIT
-RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-6.3.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b3020abb18dbac9807705ae0cd0bb4eb
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-6.3.2 b/metadata/md5-cache/dev-python/setuptools_scm-6.3.2
index 8403e23ec1a2..d1b65ddec971 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-6.3.2
+++ b/metadata/md5-cache/dev-python/setuptools_scm-6.3.2
@@ -4,7 +4,7 @@ DESCRIPTION=Manage versions by scm tags via setuptools
 EAPI=7
 HOMEPAGE=https://github.com/pypa/setuptools_scm/ https://pypi.org/project/setuptools-scm/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-6.3.2.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b3020abb18dbac9807705ae0cd0bb4eb
+_md5_=6c9dd83c233cb9ae9ac1fe03f00d4343
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.1-r1 b/metadata/md5-cache/dev-python/shiboken2-5.15.1-r1
deleted file mode 100644
index 323a5957330e..000000000000
--- a/metadata/md5-cache/dev-python/shiboken2-5.15.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-qt/qtcore-5.15:5 sys-devel/clang:= sys-devel/clang-runtime:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=dev-qt/qtxml-5.15:5 >=dev-qt/qtxmlpatterns-5.15:5 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vulkan? ( dev-util/vulkan-headers ) test? ( >=dev-qt/qttest-5.15:5 ) !!sys-devel/llvm:0
-DESCRIPTION=Python binding generator for C++ libraries
-EAPI=7
-HOMEPAGE=https://wiki.qt.io/PySide2
-IUSE=+docstrings numpy test vulkan python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm64 x86
-LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-qt/qtcore-5.15:5 sys-devel/clang:= sys-devel/clang-runtime:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=dev-qt/qtxml-5.15:5 >=dev-qt/qtxmlpatterns-5.15:5 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) vulkan? ( dev-util/vulkan-headers )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.1-src/pyside-setup-opensource-src-5.15.1.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fec3219acffe2a65d99eeee209b7045c
diff --git a/metadata/md5-cache/dev-python/signature_dispatch-0.1.0 b/metadata/md5-cache/dev-python/signature_dispatch-0.1.0
deleted file mode 100644
index 802157f1dae2..000000000000
--- a/metadata/md5-cache/dev-python/signature_dispatch-0.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Execute the first function that matches the given arguments
-EAPI=7
-HOMEPAGE=https://github.com/kalekundert/signature_dispatch/ https://pypi.org/project/signature-dispatch/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/signature_dispatch/signature_dispatch-0.1.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aba762e60e19430b95d31f1d39ba153a
diff --git a/metadata/md5-cache/dev-python/signature_dispatch-0.2.0 b/metadata/md5-cache/dev-python/signature_dispatch-0.2.0
deleted file mode 100644
index 1e6e260cda80..000000000000
--- a/metadata/md5-cache/dev-python/signature_dispatch-0.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Execute the first function that matches the given arguments
-EAPI=8
-HOMEPAGE=https://github.com/kalekundert/signature_dispatch/ https://pypi.org/project/signature-dispatch/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/typeguard[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/signature_dispatch/signature_dispatch-0.2.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ce3f20af33d267d7c28439d986089179
diff --git a/metadata/md5-cache/dev-python/simplejson-3.17.3 b/metadata/md5-cache/dev-python/simplejson-3.17.3
deleted file mode 100644
index 9ce4c6263c9c..000000000000
--- a/metadata/md5-cache/dev-python/simplejson-3.17.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
-EAPI=8
-HOMEPAGE=https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=|| ( MIT AFL-2.1 )
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/simplejson/simplejson-3.17.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=19065628f62e98a7b4299359deb6e3ee
diff --git a/metadata/md5-cache/dev-python/simplejson-3.17.5 b/metadata/md5-cache/dev-python/simplejson-3.17.5
index 48b9950dd699..37ef4c285e14 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.17.5
+++ b/metadata/md5-cache/dev-python/simplejson-3.17.5
@@ -4,7 +4,7 @@ DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
 EAPI=8
 HOMEPAGE=https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( MIT AFL-2.1 )
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplejson/simplejson-3.17.5.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=186c3a3bd40176857ac074b7eab79777
+_md5_=19065628f62e98a7b4299359deb6e3ee
diff --git a/metadata/md5-cache/dev-python/sip-6.3.1 b/metadata/md5-cache/dev-python/sip-6.3.1
new file mode 100644
index 000000000000..da2b5fbd7424
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sip-6.3.1
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( dev-python/sphinx ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python bindings generator for C/C++ libraries
+EAPI=8
+HOMEPAGE=https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/
+IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 SIP )
+RDEPEND=!<dev-python/sip-4.19.25-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !=dev-python/sip-5.5.0-r0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=5
+SRC_URI=mirror://pypi/s/sip/sip-6.3.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c01034644ec6868229a291ea42b845f5
diff --git a/metadata/md5-cache/dev-python/smmap-5.0.0 b/metadata/md5-cache/dev-python/smmap-5.0.0
new file mode 100644
index 000000000000..c6e2ad4615bd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/smmap-5.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A pure Python implementation of a sliding window memory map manager
+EAPI=8
+HOMEPAGE=https://pypi.org/project/smmap/ https://github.com/gitpython-developers/smmap/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/smmap/smmap-5.0.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8cb5dc177cf797413ad93df791088480
diff --git a/metadata/md5-cache/dev-python/sparql-wrapper-1.8.5 b/metadata/md5-cache/dev-python/sparql-wrapper-1.8.5
deleted file mode 100644
index 349b21ec3c1d..000000000000
--- a/metadata/md5-cache/dev-python/sparql-wrapper-1.8.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/rdflib-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Wrapper around a SPARQL service
-EAPI=7
-HOMEPAGE=https://pypi.org/project/SPARQLWrapper/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=W3C
-RDEPEND=>=dev-python/rdflib-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/S/SPARQLWrapper/SPARQLWrapper-1.8.5.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=76c07dbb965a926e2a99574a60a3dd7b
diff --git a/metadata/md5-cache/dev-python/sphinx-4.1.2 b/metadata/md5-cache/dev-python/sphinx-4.1.2
deleted file mode 100644
index 8362f604dc4a..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-4.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/graphviz ) test? ( dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/imagemagick-tools[jpeg,png,svg] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python documentation generator
-EAPI=8
-HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinx
-IUSE=doc latex test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/S/Sphinx/Sphinx-4.1.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=de2c78f3ba4c88932a43577d6d1fcd0c
diff --git a/metadata/md5-cache/dev-python/sphinx-4.2.0 b/metadata/md5-cache/dev-python/sphinx-4.2.0
index fa1f04ea57d5..3b67a2f40298 100644
--- a/metadata/md5-cache/dev-python/sphinx-4.2.0
+++ b/metadata/md5-cache/dev-python/sphinx-4.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python documentation generator
 EAPI=8
 HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinx
 IUSE=doc latex test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-4.2.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=238b0cdcc23b630c8f697fa1be0ad0fd
+_md5_=9d3a3a543d42a3e9ace941621bb0b00e
diff --git a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0 b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0
deleted file mode 100644
index fcbbb4fbc241..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx theme integrates the Bootstrap CSS / JavaScript framework
-EAPI=7
-HOMEPAGE=https://ryan-roemer.github.io/sphinx-bootstrap-theme/README.html
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/ryan-roemer/sphinx-bootstrap-theme/archive/a6dfc6f9054f6b4cf3eb1acadf715a679ed53a7b.tar.gz -> sphinx-bootstrap-theme-a6dfc6f9054f6b4cf3eb1acadf715a679ed53a7b.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7ce46d478763f8a4d031edda4c7a1ea6
diff --git a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0-r1 b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0-r1
index d16c971d8f38..f230468c1a45 100644
--- a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0-r1
+++ b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Sphinx theme integrates the Bootstrap CSS / JavaScript framework
 EAPI=7
 HOMEPAGE=https://ryan-roemer.github.io/sphinx-bootstrap-theme/README.html
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/ryan-roemer/sphinx-bootstrap-theme/archive/v0.8.0.tar.gz -> sphinx-bootstrap-theme-0.8.0.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f4d3d54552a59d672f10008d27cfd8ce
+_md5_=316110d0be5af6544909ff4a45f454f4
diff --git a/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0 b/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
deleted file mode 100644
index b23583819f12..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/sphinx-testing[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/sphinx-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A sphinx extension to include jinja based templates into a sphinx doc
-EAPI=7
-HOMEPAGE=https://github.com/tardyp/sphinx-jinja https://pypi.org/project/sphinx-jinja/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/sphinx-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/sphinx-jinja/sphinx-jinja-0.3.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fe9e075380813480109b164ad9a4a569
diff --git a/metadata/md5-cache/dev-python/sphinx_ansible_theme-0.7.0 b/metadata/md5-cache/dev-python/sphinx_ansible_theme-0.7.0
deleted file mode 100644
index 1f024f883cd7..000000000000
--- a/metadata/md5-cache/dev-python/sphinx_ansible_theme-0.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A reusable Ansible Sphinx theme
-EAPI=7
-HOMEPAGE=https://github.com/ansible-community/sphinx_ansible_theme
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/s/sphinx_ansible_theme/sphinx_ansible_theme-0.7.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2c77870833d8cb79a493375fb4d2f4fd
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.10 b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.10
index e60fbd20855a..d4384e57def4 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.10
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.10
@@ -4,7 +4,7 @@ DESCRIPTION=Extension to link to external Doxygen API documentation
 EAPI=8
 HOMEPAGE=https://pypi.org/project/sphinxcontrib-doxylink/ https://pythonhosted.org/sphinxcontrib-doxylink/ https://github.com/sphinx-contrib/doxylink
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=>=dev-python/sphinx-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/namespace-sphinxcontrib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sphinx-contrib/doxylink/archive/refs/tags/1.10.tar.gz -> sphinxcontrib-doxylink-1.10.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9cd3b68300ed1df11e6cb300e54676fc
+_md5_=0fb04d68ef0b1f5d82e7a513b6772be8
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.8 b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.8
deleted file mode 100644
index bd9c1a20429d..000000000000
--- a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-doc/doxygen dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/sphinx-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/namespace-sphinxcontrib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extension to link to external Doxygen API documentation
-EAPI=7
-HOMEPAGE=https://pypi.org/project/sphinxcontrib-doxylink/ https://pythonhosted.org/sphinxcontrib-doxylink/ https://github.com/sphinx-contrib/doxylink
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=>=dev-python/sphinx-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/namespace-sphinxcontrib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sphinx-contrib/doxylink/archive/refs/tags/1.8.tar.gz -> sphinxcontrib-doxylink-1.8.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=56222e8c076f810ca3c61ca59c3b0ec0
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.9 b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.9
deleted file mode 100644
index 1d67d5adcf50..000000000000
--- a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-doc/doxygen dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/sphinx-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/namespace-sphinxcontrib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extension to link to external Doxygen API documentation
-EAPI=8
-HOMEPAGE=https://pypi.org/project/sphinxcontrib-doxylink/ https://pythonhosted.org/sphinxcontrib-doxylink/ https://github.com/sphinx-contrib/doxylink
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=>=dev-python/sphinx-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/namespace-sphinxcontrib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sphinx-contrib/doxylink/archive/refs/tags/1.9.tar.gz -> sphinxcontrib-doxylink-1.9.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9cd3b68300ed1df11e6cb300e54676fc
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1-r2
deleted file mode 100644
index 93b06da7aa3b..000000000000
--- a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/sphinx[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Link to GitHub issues, pull requests, commits and users from Sphinx docs
-EAPI=7
-HOMEPAGE=https://github.com/jupyter/sphinxcontrib_github_alt
-IUSE=python_targets_python3_8
-KEYWORDS=amd64 ~arm arm64 ~hppa ~s390 x86
-LICENSE=BSD-2
-RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/jupyter/sphinxcontrib_github_alt/archive/1.1.tar.gz -> sphinxcontrib-github-alt-1.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4c13ab0e40b57aae10c6764bab0dbf49
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.17 b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.17
index 7c273f5ee260..7268eaf11f2a 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.17
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.17
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/namespace-sphinxcontrib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/namespace-sphinxcontrib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Extension to sphinx to include program output
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/NextThought/sphinxcontrib-programoutput/ https://pypi.org/project/sphinxcontrib-programoutput/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e8f440b6838becb5e1d4be10e8a86e52
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=67effc06361a7271ae2d0216acdfd9f5
diff --git a/metadata/md5-cache/dev-python/sphobjinv-2.1-r1 b/metadata/md5-cache/dev-python/sphobjinv-2.1-r1
index 8fe6d32ae565..7dbb19e06884 100644
--- a/metadata/md5-cache/dev-python/sphobjinv-2.1-r1
+++ b/metadata/md5-cache/dev-python/sphobjinv-2.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Sphinx objects.inv Inspection/Manipulation Tool
 EAPI=7
 HOMEPAGE=https://github.com/bskinn/sphobjinv/ https://pypi.org/project/sphobjinv/
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-19.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fuzzywuzzy-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bskinn/sphobjinv/archive/v2.1.tar.gz -> sphobjinv-2.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a75d5dd64cf8926a371612c1212b51d5
+_md5_=c01f47bea7b6a05cd610e0cf3205d0be
diff --git a/metadata/md5-cache/dev-python/spyder-terminal-1.0.0-r1 b/metadata/md5-cache/dev-python/spyder-terminal-1.0.0-r1
deleted file mode 100644
index f64843f86e7d..000000000000
--- a/metadata/md5-cache/dev-python/spyder-terminal-1.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Run system terminals inside Spyder
-EAPI=7
-HOMEPAGE=https://github.com/spyder-ide/spyder-terminal
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT BSD Apache-2.0 BSD-2 ISC CC-BY-4.0 ZLIB WTFPL-2
-RDEPEND=dev-python/coloredlogs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-5.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/spyder-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/terminado-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/s/spyder-terminal/spyder-terminal-1.0.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9075732ca6dc26024c9ca97c73d7392e
diff --git a/metadata/md5-cache/dev-python/stestr-2.1.0-r1 b/metadata/md5-cache/dev-python/stestr-2.1.0-r1
deleted file mode 100644
index c526d52b118f..000000000000
--- a/metadata/md5-cache/dev-python/stestr-2.1.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=A parallel Python test runner built around subunit
-EAPI=7
-HOMEPAGE=https://github.com/mtreinish/stestr
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cliff-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/subunit-0.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/voluptuous-0.8.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/s/stestr/stestr-2.1.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c93bb252b7874dcbf0113f534d5125d3
diff --git a/metadata/md5-cache/dev-python/stripe-2.61.0 b/metadata/md5-cache/dev-python/stripe-2.61.0
new file mode 100644
index 000000000000..d45d9a661a40
--- /dev/null
+++ b/metadata/md5-cache/dev-python/stripe-2.61.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-util/stripe-mock-0.112.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/curl ) test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Stripe python bindings
+EAPI=8
+HOMEPAGE=https://github.com/stripe/stripe-python
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/stripe/stripe-2.61.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0b6999b94e4686734281e5bbdac668d0
diff --git a/metadata/md5-cache/dev-python/subprocess-tee-0.3.2 b/metadata/md5-cache/dev-python/subprocess-tee-0.3.2
deleted file mode 100644
index 05bf10df74fe..000000000000
--- a/metadata/md5-cache/dev-python/subprocess-tee-0.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( python_targets_python3_8? ( dev-python/enrich[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/enrich[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=subprocess.run replacement with tee(1)-like output
-EAPI=7
-HOMEPAGE=https://github.com/pycontribs/subprocess-tee
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/subprocess-tee/subprocess-tee-0.3.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9290c0d4a08a0dcbdf5f202227a26a42
diff --git a/metadata/md5-cache/dev-python/subprocess-tee-0.3.4 b/metadata/md5-cache/dev-python/subprocess-tee-0.3.4
deleted file mode 100644
index e9b76043f530..000000000000
--- a/metadata/md5-cache/dev-python/subprocess-tee-0.3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( python_targets_python3_8? ( dev-python/enrich[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/enrich[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test-full? ( app-admin/ansible-molecule ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=subprocess.run replacement with tee(1)-like output
-EAPI=8
-HOMEPAGE=https://github.com/pycontribs/subprocess-tee
-IUSE=test-full test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=test-full? ( test ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/subprocess-tee/subprocess-tee-0.3.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4e199c7c57be031532cf81c07e5ba2d1
diff --git a/metadata/md5-cache/dev-python/suds-0.8.4 b/metadata/md5-cache/dev-python/suds-0.8.4
deleted file mode 100644
index a8201bba2019..000000000000
--- a/metadata/md5-cache/dev-python/suds-0.8.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Lightweight SOAP client
-EAPI=7
-HOMEPAGE=https://github.com/suds-community/suds
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/suds-community/suds-community-0.8.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7fcc1b4802e555302898458fb4e80e09
diff --git a/metadata/md5-cache/dev-python/suds-0.8.4-r1 b/metadata/md5-cache/dev-python/suds-0.8.4-r1
new file mode 100644
index 000000000000..83b1b8a32383
--- /dev/null
+++ b/metadata/md5-cache/dev-python/suds-0.8.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=<dev-python/setuptools-58[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Lightweight SOAP client
+EAPI=7
+HOMEPAGE=https://github.com/suds-community/suds
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/suds-community/suds-community-0.8.4.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=eb3dfe5b193d64b7cd41f1daf73f53dd
diff --git a/metadata/md5-cache/dev-python/svgwrite-1.4 b/metadata/md5-cache/dev-python/svgwrite-1.4
deleted file mode 100644
index 6bee3de51867..000000000000
--- a/metadata/md5-cache/dev-python/svgwrite-1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python Package to write SVG files
-EAPI=7
-HOMEPAGE=https://github.com/mozman/svgwrite
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mozman/svgwrite/archive/v1.4.tar.gz -> svgwrite-1.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=45e4258e231da5b4eb48a5b5b9a756a6
diff --git a/metadata/md5-cache/dev-python/tekore-3.7.1 b/metadata/md5-cache/dev-python/tekore-3.7.1
deleted file mode 100644
index 31c14274be03..000000000000
--- a/metadata/md5-cache/dev-python/tekore-3.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-asyncio-0.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/httpx-0.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Spotify Web API client
-EAPI=7
-HOMEPAGE=https://tekore.readthedocs.io https://github.com/felix-hilden/tekore
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/httpx-0.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/felix-hilden/tekore/archive/v3.7.1.tar.gz -> tekore-3.7.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8e5b56c3d992d9fcec56ac614f00908a
diff --git a/metadata/md5-cache/dev-python/terminado-0.11.1 b/metadata/md5-cache/dev-python/terminado-0.11.1
deleted file mode 100644
index 07602a98110f..000000000000
--- a/metadata/md5-cache/dev-python/terminado-0.11.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Terminals served to term.js using Tornado websockets
-EAPI=8
-HOMEPAGE=https://pypi.org/project/terminado/ https://github.com/jupyter/terminado
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/terminado/terminado-0.11.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7482786bfd5720c3ffc476f6b12d4ef5
diff --git a/metadata/md5-cache/dev-python/terminado-0.12.1 b/metadata/md5-cache/dev-python/terminado-0.12.1
index e9c0454fce0b..b4e2648c4a90 100644
--- a/metadata/md5-cache/dev-python/terminado-0.12.1
+++ b/metadata/md5-cache/dev-python/terminado-0.12.1
@@ -4,7 +4,7 @@ DESCRIPTION=Terminals served to term.js using Tornado websockets
 EAPI=8
 HOMEPAGE=https://pypi.org/project/terminado/ https://github.com/jupyter/terminado
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/terminado/terminado-0.12.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=04632ef71f5a60c7779b7e783e8efbb9
+_md5_=7482786bfd5720c3ffc476f6b12d4ef5
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.9.11 b/metadata/md5-cache/dev-python/tikzplotlib-0.9.11
deleted file mode 100644
index 357589eae254..000000000000
--- a/metadata/md5-cache/dev-python/tikzplotlib-0.9.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/exdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-text/texlive[extra] dev-python/matplotlib[latex,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Convert matplotlib figures into TikZ/PGFPlots
-EAPI=7
-HOMEPAGE=https://github.com/nschloe/tikzplotlib
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-text/texlive[extra] dev-python/matplotlib[latex,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nschloe/tikzplotlib/archive/0.9.11.tar.gz -> tikzplotlib-0.9.11.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=32bcfa41c03f6dbe61c071a7f7fffd6f
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.9.12 b/metadata/md5-cache/dev-python/tikzplotlib-0.9.12
deleted file mode 100644
index f022e6f016c1..000000000000
--- a/metadata/md5-cache/dev-python/tikzplotlib-0.9.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/exdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-text/texlive[extra] dev-python/matplotlib[latex,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Convert matplotlib figures into TikZ/PGFPlots
-EAPI=7
-HOMEPAGE=https://github.com/nschloe/tikzplotlib
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-text/texlive[extra] dev-python/matplotlib[latex,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nschloe/tikzplotlib/archive/0.9.12.tar.gz -> tikzplotlib-0.9.12.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=32bcfa41c03f6dbe61c071a7f7fffd6f
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.9.15 b/metadata/md5-cache/dev-python/tikzplotlib-0.9.15
new file mode 100644
index 000000000000..e9c7b108a58d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tikzplotlib-0.9.15
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/exdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-text/texlive[extra] dev-python/matplotlib[latex,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Convert matplotlib figures into TikZ/PGFPlots
+EAPI=8
+HOMEPAGE=https://github.com/nschloe/tikzplotlib
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-text/texlive[extra] dev-python/matplotlib[latex,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nschloe/tikzplotlib/archive/v0.9.15.tar.gz -> tikzplotlib-0.9.15.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=3e2d7b8e800fb9fdf7588246fee74479
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.9.9 b/metadata/md5-cache/dev-python/tikzplotlib-0.9.9
deleted file mode 100644
index c11afd9480ef..000000000000
--- a/metadata/md5-cache/dev-python/tikzplotlib-0.9.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/exdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( app-text/texlive[extra] dev-python/matplotlib[latex,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Convert matplotlib figures into TikZ/PGFPlots
-EAPI=7
-HOMEPAGE=https://github.com/nschloe/tikzplotlib
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-text/texlive[extra] dev-python/matplotlib[latex,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nschloe/tikzplotlib/archive/v0.9.9.tar.gz -> tikzplotlib-0.9.9.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=6f660fff45842f97b609e2b805a1b416
diff --git a/metadata/md5-cache/dev-python/tld-0.12.2 b/metadata/md5-cache/dev-python/tld-0.12.2
deleted file mode 100644
index 53a8e0d2af49..000000000000
--- a/metadata/md5-cache/dev-python/tld-0.12.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?]
-DESCRIPTION=Extract the top level domain (TLD) from the URL given
-EAPI=7
-HOMEPAGE=https://github.com/barseghyanartur/tld
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/barseghyanartur/tld/archive/0.12.2.tar.gz -> tld-0.12.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8c3b2297d3b94c23546dd702c68f8428
diff --git a/metadata/md5-cache/dev-python/tld-0.12.3 b/metadata/md5-cache/dev-python/tld-0.12.3
deleted file mode 100644
index 5a1e96f915cd..000000000000
--- a/metadata/md5-cache/dev-python/tld-0.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extract the top level domain (TLD) from the URL given
-EAPI=7
-HOMEPAGE=https://github.com/barseghyanartur/tld
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/barseghyanartur/tld/archive/0.12.3.tar.gz -> tld-0.12.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=713e245d444b539a228d9ea9c963ebb9
diff --git a/metadata/md5-cache/dev-python/tld-0.12.5 b/metadata/md5-cache/dev-python/tld-0.12.5
deleted file mode 100644
index 65f0f996cd55..000000000000
--- a/metadata/md5-cache/dev-python/tld-0.12.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/Faker[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-cov[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extract the top level domain (TLD) from the URL given
-EAPI=7
-HOMEPAGE=https://github.com/barseghyanartur/tld
-IUSE=test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/barseghyanartur/tld/archive/0.12.5.tar.gz -> tld-0.12.5.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1cf85a58fdc24d0b0b71aebe7890fdd3
diff --git a/metadata/md5-cache/dev-python/tldextract-2.2.1 b/metadata/md5-cache/dev-python/tldextract-2.2.1
deleted file mode 100644
index 6884b2668ada..000000000000
--- a/metadata/md5-cache/dev-python/tldextract-2.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Accurately separate the TLD from the registered domain and subdomains of a URL.
-EAPI=7
-HOMEPAGE=https://pypi.org/project/tldextract/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-file[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/t/tldextract/tldextract-2.2.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f301b2034337df2c364ee28f8362805
diff --git a/metadata/md5-cache/dev-python/tldextract-3.1.0 b/metadata/md5-cache/dev-python/tldextract-3.1.0
deleted file mode 100644
index e12721182c67..000000000000
--- a/metadata/md5-cache/dev-python/tldextract-3.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-file[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Accurately separate the TLD from the registered domain and subdomains of a URL.
-EAPI=8
-HOMEPAGE=https://pypi.org/project/tldextract/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-file[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/tldextract/tldextract-3.1.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c1d82ed85c6d423d3e7f022403a43111
diff --git a/metadata/md5-cache/dev-python/tldextract-3.1.1 b/metadata/md5-cache/dev-python/tldextract-3.1.1
deleted file mode 100644
index fed36e01529b..000000000000
--- a/metadata/md5-cache/dev-python/tldextract-3.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-file[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Accurately separate the TLD from the registered domain and subdomains of a URL.
-EAPI=8
-HOMEPAGE=https://pypi.org/project/tldextract/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-file[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/tldextract/tldextract-3.1.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a0e054afab93d3734d192d5dbdfdb311
diff --git a/metadata/md5-cache/dev-python/tldextract-3.1.2 b/metadata/md5-cache/dev-python/tldextract-3.1.2
index 881ccc62aeca..55a0fea3f93b 100644
--- a/metadata/md5-cache/dev-python/tldextract-3.1.2
+++ b/metadata/md5-cache/dev-python/tldextract-3.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Accurately separate the TLD from the registered domain and subdomain
 EAPI=8
 HOMEPAGE=https://pypi.org/project/tldextract/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-file[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tldextract/tldextract-3.1.2.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8e2bf99e8347b66007aac31010205ee7
+_md5_=f9f2e2f5edf699c71a9c198633cb886a
diff --git a/metadata/md5-cache/dev-python/tomli-1.0.4 b/metadata/md5-cache/dev-python/tomli-1.0.4
deleted file mode 100644
index f99d384ec624..000000000000
--- a/metadata/md5-cache/dev-python/tomli-1.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A lil' TOML parser
-EAPI=8
-HOMEPAGE=https://pypi.org/project/tomli/ https://github.com/hukkin/tomli/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hukkin/tomli/archive/1.0.4.tar.gz -> tomli-1.0.4.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e6f74a3ceca49151ad817f773c3487dc
diff --git a/metadata/md5-cache/dev-python/tomli-1.2.1 b/metadata/md5-cache/dev-python/tomli-1.2.1
index 929f6f90b8a1..0a8538720528 100644
--- a/metadata/md5-cache/dev-python/tomli-1.2.1
+++ b/metadata/md5-cache/dev-python/tomli-1.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=A lil' TOML parser
 EAPI=7
 HOMEPAGE=https://pypi.org/project/tomli/ https://github.com/hukkin/tomli/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hukkin/tomli/archive/1.2.1.tar.gz -> tomli-1.2.1.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=69a6d9541c787a92184c7f22ebc7c937
+_md5_=a29e7fda1f615ff25f95ae93ed02f220
diff --git a/metadata/md5-cache/dev-python/tomli-w-0.3.0 b/metadata/md5-cache/dev-python/tomli-w-0.3.0
new file mode 100644
index 000000000000..b9a105f25133
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tomli-w-0.3.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A lil' TOML writer
+EAPI=8
+HOMEPAGE=https://pypi.org/project/tomli_w/ https://github.com/hukkin/tomli-w/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hukkin/tomli-w/archive/0.3.0.tar.gz -> tomli-w-0.3.0.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e2e11e8b0f4709103d6192dd5eb06f55
diff --git a/metadata/md5-cache/dev-python/toposort-1.6 b/metadata/md5-cache/dev-python/toposort-1.6
deleted file mode 100644
index 0f2da0609b80..000000000000
--- a/metadata/md5-cache/dev-python/toposort-1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Implements a topological sort algorithm
-EAPI=8
-HOMEPAGE=https://gitlab.com/ericvsmith/toposort
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/t/toposort/toposort-1.6.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=54c2e53ab0ae3d2f00754c3eb423233d
diff --git a/metadata/md5-cache/dev-python/traitlets-4.3.3 b/metadata/md5-cache/dev-python/traitlets-4.3.3
deleted file mode 100644
index 791b7ece276a..000000000000
--- a/metadata/md5-cache/dev-python/traitlets-4.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/ipython_genutils[python_targets_python3_8(-)] ) ) ) test? ( dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A configuration system for Python applications
-EAPI=7
-HOMEPAGE=https://github.com/ipython/traitlets
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/traitlets/traitlets-4.3.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=33e3c05a3fc555de7fbdf6f1fdd5de17
diff --git a/metadata/md5-cache/dev-python/treq-20.9.0 b/metadata/md5-cache/dev-python/treq-20.9.0
deleted file mode 100644
index a9f71402d4cb..000000000000
--- a/metadata/md5-cache/dev-python/treq-20.9.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/incremental[python_targets_python3_8(-)?] dev-python/hyperlink[python_targets_python3_8(-)?] doc? ( dev-python/sphinx dev-python/incremental[python_targets_python3_8(-)?] dev-python/hyperlink[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] >=dev-python/twisted-18.7.0[crypt,python_targets_python3_8(-)?] >=dev-python/requests-2.1.0[python_targets_python3_8(-)?] dev-python/attrs[python_targets_python3_8(-)?] ) test? ( dev-python/mock[python_targets_python3_8(-)?] dev-python/httpbin[python_targets_python3_8(-)?] )
-DESCRIPTION=A requests-like API built on top of twisted.web's Agent
-EAPI=7
-HOMEPAGE=https://github.com/twisted/treq https://pypi.org/project/treq/
-IUSE=doc test python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/incremental[python_targets_python3_8(-)?] dev-python/hyperlink[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] >=dev-python/twisted-18.7.0[crypt,python_targets_python3_8(-)?] >=dev-python/requests-2.1.0[python_targets_python3_8(-)?] dev-python/attrs[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/treq/treq-20.9.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=34592fc801077ec82b286f27143e032b
diff --git a/metadata/md5-cache/dev-python/treq-21.1.0 b/metadata/md5-cache/dev-python/treq-21.1.0
deleted file mode 100644
index e7d2cf6b011b..000000000000
--- a/metadata/md5-cache/dev-python/treq-21.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/incremental[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/hyperlink-21.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( dev-python/sphinx dev-python/incremental[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/hyperlink-21.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/twisted-18.7.0[crypt,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httpbin[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=A requests-like API built on top of twisted.web's Agent
-EAPI=7
-HOMEPAGE=https://github.com/twisted/treq https://pypi.org/project/treq/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/incremental[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/hyperlink-21.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/twisted-18.7.0[crypt,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/treq/treq-21.1.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d6f1ea4231f9339641343343408407b6
diff --git a/metadata/md5-cache/dev-python/twisted-21.2.0-r1 b/metadata/md5-cache/dev-python/twisted-21.2.0-r1
deleted file mode 100644
index 093f0343780a..000000000000
--- a/metadata/md5-cache/dev-python/twisted-21.2.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/incremental-21.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/constantly-15.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cython-test-exception-raiser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyserial[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/openssh ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=An asynchronous networking framework written in Python
-EAPI=7
-HOMEPAGE=https://www.twistedmatrix.com/trac/
-IUSE=conch crypt http2 serial test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/automat-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/constantly-15.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperlink-17.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/incremental-16.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyhamcrest-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] conch? ( >=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) serial? ( >=dev-python/pyserial-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) http2? ( >=dev-python/h2-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/priority-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/priority-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !dev-python/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/twisted/twisted/archive/twisted-21.2.0.tar.gz https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=7724da45a593b14b392fc15be8b9a6a8
diff --git a/metadata/md5-cache/dev-python/twisted-21.7.0 b/metadata/md5-cache/dev-python/twisted-21.7.0
index 64e74755cb9b..f9d98f5ca362 100644
--- a/metadata/md5-cache/dev-python/twisted-21.7.0
+++ b/metadata/md5-cache/dev-python/twisted-21.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=An asynchronous networking framework written in Python
 EAPI=7
 HOMEPAGE=https://www.twistedmatrix.com/trac/
 IUSE=conch crypt http2 serial test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/automat-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/constantly-15.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperlink-17.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/incremental-21.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyhamcrest-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] conch? ( >=dev-python/appdirs-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) serial? ( >=dev-python/pyserial-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) http2? ( >=dev-python/h2-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/h2-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/priority-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/priority-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !dev-python/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twisted/twisted/archive/twisted-21.7.0.tar.gz https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=16dd899a82c2d696058dcdfc1098e8f3
+_md5_=f3823ada4a360da53b7074c7b4e65100
diff --git a/metadata/md5-cache/dev-python/txAMQP-0.8.2 b/metadata/md5-cache/dev-python/txAMQP-0.8.2
index 8313f389afff..e4e6adeda1bc 100644
--- a/metadata/md5-cache/dev-python/txAMQP-0.8.2
+++ b/metadata/md5-cache/dev-python/txAMQP-0.8.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-misc/rabbitmq-server ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/rabbitmq-server ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python library for communicating with AMQP peers using Twisted
 EAPI=7
 HOMEPAGE=https://github.com/txamqp/txamqp
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86 ~x64-solaris
 LICENSE=Apache-2.0
-RDEPEND=dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
+RDEPEND=dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/txamqp/txamqp/archive/0.8.2.tar.gz -> txamqp-0.8.2.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=571eb10d6bc71622d28931167acce3c3
+_md5_=847f11d1bdd966f36b53c7909e7f5442
diff --git a/metadata/md5-cache/dev-python/txgithub-15.0.0-r1 b/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
deleted file mode 100644
index 2b5974c8b3e6..000000000000
--- a/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/twisted-16.0.0[python_targets_python3_8(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-DESCRIPTION=GitHub API client implemented using Twisted
-EAPI=6
-HOMEPAGE=https://github.com/tomprince/txgithub https://pypi.org/project/txgithub/
-IUSE=test python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/twisted-16.0.0[python_targets_python3_8(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tomprince/txgithub/archive/15.0.0.tar.gz -> txgithub-15.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dc232a2f97c691d3b842d9ba5266fb97
diff --git a/metadata/md5-cache/dev-python/typeguard-2.12.1 b/metadata/md5-cache/dev-python/typeguard-2.12.1
deleted file mode 100644
index 0ec2614a2989..000000000000
--- a/metadata/md5-cache/dev-python/typeguard-2.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Run-time type checker for Python
-EAPI=8
-HOMEPAGE=https://pypi.org/project/typeguard/ https://github.com/agronholm/typeguard/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/agronholm/typeguard/archive/2.12.1.tar.gz -> typeguard-2.12.1.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5317d342652cf7572680403923e90953
diff --git a/metadata/md5-cache/dev-python/typeguard-2.13.0 b/metadata/md5-cache/dev-python/typeguard-2.13.0
new file mode 100644
index 000000000000..292dbf6b7800
--- /dev/null
+++ b/metadata/md5-cache/dev-python/typeguard-2.13.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Run-time type checker for Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/typeguard/ https://github.com/agronholm/typeguard/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/agronholm/typeguard/archive/2.13.0.tar.gz -> typeguard-2.13.0.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2e3acd7413c9058988ca5af6bda90905
diff --git a/metadata/md5-cache/dev-python/tzlocal-4.0 b/metadata/md5-cache/dev-python/tzlocal-4.0
new file mode 100644
index 000000000000..9ed70ba4cb30
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tzlocal-4.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/pytz_deprecation_shim[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=tzinfo object for the local timezone
+EAPI=8
+HOMEPAGE=https://github.com/regebro/tzlocal
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/pytz_deprecation_shim[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/regebro/tzlocal/archive/4.0.tar.gz -> tzlocal-4.0.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1b1c0e2ad7f548f81f43560f5d8816ec
diff --git a/metadata/md5-cache/dev-python/ubelt-0.10.0 b/metadata/md5-cache/dev-python/ubelt-0.10.0
deleted file mode 100644
index 615d2f213c0b..000000000000
--- a/metadata/md5-cache/dev-python/ubelt-0.10.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ordered-set[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/xdoctest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress
-EAPI=8
-HOMEPAGE=https://github.com/Erotemic/ubelt
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ordered-set[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Erotemic/ubelt/archive/0.10.0.tar.gz -> ubelt-0.10.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=00aae720b2f7a93d9cf3dc2ff8df088d
diff --git a/metadata/md5-cache/dev-python/ubelt-0.9.5 b/metadata/md5-cache/dev-python/ubelt-0.9.5
deleted file mode 100644
index 002258f3e152..000000000000
--- a/metadata/md5-cache/dev-python/ubelt-0.9.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ordered-set[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/xdoctest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress
-EAPI=8
-HOMEPAGE=https://github.com/Erotemic/ubelt
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ordered-set[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Erotemic/ubelt/archive/0.9.5.tar.gz -> ubelt-0.9.5.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dc11abb185f2537c387070768ec5b362
diff --git a/metadata/md5-cache/dev-python/unasync-0.5.0 b/metadata/md5-cache/dev-python/unasync-0.5.0
index d2ffd33b6b87..a5e6ca5602a8 100644
--- a/metadata/md5-cache/dev-python/unasync-0.5.0
+++ b/metadata/md5-cache/dev-python/unasync-0.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=The async transformation code.
 EAPI=8
 HOMEPAGE=https://github.com/python-trio/unasync
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Apache-2.0 MIT )
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-trio/unasync/archive/refs/tags/v0.5.0.tar.gz -> unasync-0.5.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1d5b03eb55eb674c2a124667d494aa4f
+_md5_=ea1af5569d0ebc6480b8f9db930d86fb
diff --git a/metadata/md5-cache/dev-python/uncertainties-3.1.4-r1 b/metadata/md5-cache/dev-python/uncertainties-3.1.4-r1
deleted file mode 100644
index cdaee86bd131..000000000000
--- a/metadata/md5-cache/dev-python/uncertainties-3.1.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Python module for calculations with uncertainties
-EAPI=7
-HOMEPAGE=https://pythonhosted.org/uncertainties/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/u/uncertainties/uncertainties-3.1.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dee9d9bc03521242ec550407dea3952b
diff --git a/metadata/md5-cache/dev-python/unidecode-1.2.0 b/metadata/md5-cache/dev-python/unidecode-1.2.0
deleted file mode 100644
index 8933bc198e2c..000000000000
--- a/metadata/md5-cache/dev-python/unidecode-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[wide-unicode(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[wide-unicode(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[wide-unicode(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[wide-unicode(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Module providing ASCII transliterations of Unicode text
-EAPI=7
-HOMEPAGE=https://pypi.org/project/Unidecode/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[wide-unicode(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[wide-unicode(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[wide-unicode(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[wide-unicode(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/U/Unidecode/Unidecode-1.2.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cd4d47ae9e1c4ad590971509f7b52fbe
diff --git a/metadata/md5-cache/dev-python/unidecode-1.3.0 b/metadata/md5-cache/dev-python/unidecode-1.3.0
index 1af6f5d256c8..4061a467df41 100644
--- a/metadata/md5-cache/dev-python/unidecode-1.3.0
+++ b/metadata/md5-cache/dev-python/unidecode-1.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Module providing ASCII transliterations of Unicode text
 EAPI=8
 HOMEPAGE=https://pypi.org/project/Unidecode/
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2+
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/U/Unidecode/Unidecode-1.3.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ba03140f9de2ed16598910b7d179b0b0
+_md5_=7eebb31da96eba5aa8600a7775cca7eb
diff --git a/metadata/md5-cache/dev-python/unidiff-0.6.0 b/metadata/md5-cache/dev-python/unidiff-0.6.0
deleted file mode 100644
index 9a3ceaca8856..000000000000
--- a/metadata/md5-cache/dev-python/unidiff-0.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Unified diff parsing/metadata extraction library
-EAPI=7
-HOMEPAGE=https://github.com/matiasb/python-unidiff https://pypi.org/project/unidiff/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/u/unidiff/unidiff-0.6.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=117e05d63089deb4479b764325a374ce
diff --git a/metadata/md5-cache/dev-python/untangle-1.1.1 b/metadata/md5-cache/dev-python/untangle-1.1.1
index 853930c52066..40ca9561b77b 100644
--- a/metadata/md5-cache/dev-python/untangle-1.1.1
+++ b/metadata/md5-cache/dev-python/untangle-1.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Convert XML documents into Python objects
 EAPI=8
 HOMEPAGE=https://github.com/stchris/untangle
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/u/untangle/untangle-1.1.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7ed54d343cb14ca0d39a7980bbcf09b4
+_md5_=8af94f103958889aa03ccc962e3397de
diff --git a/metadata/md5-cache/dev-python/uritemplate-3.0.1-r1 b/metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
index 52d9507afd3a..eeed2c4f9886 100644
--- a/metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
+++ b/metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python implementation of RFC6570, URI Template
 EAPI=7
 HOMEPAGE=https://pypi.org/project/uritemplate/
 IUSE=test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<=dev-python/google-api-python-client-1.3 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uritemplate/uritemplate-3.0.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5d21ce72ed6cc972a060cc03e984acd7
+_md5_=29b3b03a34deba1a960df874787f77a4
diff --git a/metadata/md5-cache/dev-python/uritemplate-4.0.0 b/metadata/md5-cache/dev-python/uritemplate-4.0.0
new file mode 100644
index 000000000000..fe1cd5c7889c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uritemplate-4.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python implementation of RFC6570, URI Template
+EAPI=8
+HOMEPAGE=https://pypi.org/project/uritemplate/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/uritemplate/uritemplate-4.0.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cc86b50459c3e6a76dbb92639a53106b
diff --git a/metadata/md5-cache/dev-python/uritemplate-4.1.0 b/metadata/md5-cache/dev-python/uritemplate-4.1.0
new file mode 100644
index 000000000000..cb905fca7d90
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uritemplate-4.1.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python implementation of RFC6570, URI Template
+EAPI=8
+HOMEPAGE=https://pypi.org/project/uritemplate/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/uritemplate/uritemplate-4.1.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cc86b50459c3e6a76dbb92639a53106b
diff --git a/metadata/md5-cache/dev-python/utidylib-0.7-r2 b/metadata/md5-cache/dev-python/utidylib-0.7-r2
index 03281abd3357..e2d9a24c599f 100644
--- a/metadata/md5-cache/dev-python/utidylib-0.7-r2
+++ b/metadata/md5-cache/dev-python/utidylib-0.7-r2
@@ -4,7 +4,7 @@ DESCRIPTION=TidyLib Python wrapper
 EAPI=8
 HOMEPAGE=https://cihar.com/software/utidylib/ https://pypi.org/project/uTidylib/
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=|| ( app-text/tidy-html5 >=app-text/htmltidy-5.0.0 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nijel/utidylib/archive/v0.7.tar.gz -> utidylib-0.7.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9e70aa1175a2ce08a94d927dfd9a45ee
+_md5_=9b620d96cf2f1d4f8cf1ba0ec6aadfb7
diff --git a/metadata/md5-cache/dev-python/uvicorn-0.13.4 b/metadata/md5-cache/dev-python/uvicorn-0.13.4
deleted file mode 100644
index 3711e9c1a1d3..000000000000
--- a/metadata/md5-cache/dev-python/uvicorn-0.13.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/trustme[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/websockets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/wsproto[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( =dev-python/click-7*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/h11-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Lightning-fast ASGI server implementation
-EAPI=7
-HOMEPAGE=https://www.uvicorn.org/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND==dev-python/click-7*[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/h11-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/encode/uvicorn/archive/0.13.4.tar.gz -> uvicorn-0.13.4.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8aa6533987f8ccd2c83bb371f3fd3bba
diff --git a/metadata/md5-cache/dev-python/uvicorn-0.15.0_p20210913 b/metadata/md5-cache/dev-python/uvicorn-0.15.0_p20210913
index 2600c2acd16e..c4a8a282b69a 100644
--- a/metadata/md5-cache/dev-python/uvicorn-0.15.0_p20210913
+++ b/metadata/md5-cache/dev-python/uvicorn-0.15.0_p20210913
@@ -4,7 +4,7 @@ DESCRIPTION=Lightning-fast ASGI server implementation
 EAPI=8
 HOMEPAGE=https://www.uvicorn.org/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/asgiref-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h11-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/uvicorn/archive/99acac598682b45be98094216f7db223c1fdf5f2.tar.gz -> uvicorn-0.15.0_p20210913.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=313a5f69f77e5ae0b853dad073d03c12
+_md5_=9a89d2b9b4d7340c8589ae171336e961
diff --git a/metadata/md5-cache/dev-python/uvloop-0.15.3-r1 b/metadata/md5-cache/dev-python/uvloop-0.15.3-r1
index a0f9849b38b5..436178fcbd06 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.15.3-r1
+++ b/metadata/md5-cache/dev-python/uvloop-0.15.3-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Ultra-fast implementation of asyncio event loop on top of libuv
 EAPI=8
 HOMEPAGE=https://github.com/magicstack/uvloop
 IUSE=doc examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv sparc
 LICENSE=MIT
 RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-0.15.3.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2768816977b0c57a7da74030f66fa4d1
+_md5_=c8dba45839fdb1d6ec9000ffef1bd027
diff --git a/metadata/md5-cache/dev-python/uvloop-0.16.0 b/metadata/md5-cache/dev-python/uvloop-0.16.0
index 94dfc9ae7454..fd444a023b0d 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.16.0
+++ b/metadata/md5-cache/dev-python/uvloop-0.16.0
@@ -5,7 +5,7 @@ DESCRIPTION=Ultra-fast implementation of asyncio event loop on top of libuv
 EAPI=8
 HOMEPAGE=https://github.com/magicstack/uvloop
 IUSE=doc examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-0.16.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f2c4f6ecdd8a306c554f4d9a996a0a5
+_md5_=36929436795b2c675a412fd9a54d9fa0
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.16.8-r1 b/metadata/md5-cache/dev-python/vdirsyncer-0.16.8-r1
deleted file mode 100644
index fa11b11ace5b..000000000000
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.16.8-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-log-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/click-log-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click-threading[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-subtesthack[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-log-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/click-log-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click-threading[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Synchronize calendars and contacts
-EAPI=7
-HOMEPAGE=https://github.com/pimutils/vdirsyncer
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-log-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/click-log-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/click-threading[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.16.8.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=50dc00493a1d7427f07c741964b73ac9
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.18.0 b/metadata/md5-cache/dev-python/vdirsyncer-0.18.0
deleted file mode 100644
index 89d05cb5ac81..000000000000
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.18.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-subtesthack[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-log-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/click-log-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-threading-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Synchronize calendars and contacts
-EAPI=7
-HOMEPAGE=https://github.com/pimutils/vdirsyncer
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-log-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/click-log-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-threading-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-toolbelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.18.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d0a7f6f7d6296e8290038b95a6a0ad12
diff --git a/metadata/md5-cache/dev-python/versioneer-0.21 b/metadata/md5-cache/dev-python/versioneer-0.21
new file mode 100644
index 000000000000..089f8ca518d0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/versioneer-0.21
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Easy VCS-based management of project version strings
+EAPI=8
+HOMEPAGE=https://pypi.org/project/versioneer/ https://github.com/python-versioneer/python-versioneer/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=public-domain
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/v/versioneer/versioneer-0.21.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8ff8c2b703649d47e55e33992a8d6373
diff --git a/metadata/md5-cache/dev-python/vncdotool-0.13.0 b/metadata/md5-cache/dev-python/vncdotool-0.13.0
index 83af29780e1d..0f235d7075b8 100644
--- a/metadata/md5-cache/dev-python/vncdotool-0.13.0
+++ b/metadata/md5-cache/dev-python/vncdotool-0.13.0
@@ -4,7 +4,7 @@ DESCRIPTION=Command line VNC client
 EAPI=7
 HOMEPAGE=https://github.com/sibson/vncdotool
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sibson/vncdotool/archive/v0.13.0.tar.gz -> vncdotool-0.13.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dd8b123fb52675ba68577ce07a151907
+_md5_=9a6e7e35294da1b543c001d482bed9ff
diff --git a/metadata/md5-cache/dev-python/wand-0.6.5 b/metadata/md5-cache/dev-python/wand-0.6.5
deleted file mode 100644
index 2718b139cbd4..000000000000
--- a/metadata/md5-cache/dev-python/wand-0.6.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( media-gfx/imagemagick[fftw,jpeg,png,truetype,xml] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) ) test? ( media-gfx/imagemagick >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Ctypes-based simple ImageMagick binding for Python
-EAPI=7
-HOMEPAGE=http://wand-py.org/
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=media-gfx/imagemagick python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/w/wand/Wand-0.6.5.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=64b50865aca0c555a53cf939d6728fe1
diff --git a/metadata/md5-cache/dev-python/wand-0.6.6 b/metadata/md5-cache/dev-python/wand-0.6.6
deleted file mode 100644
index 920c22c68512..000000000000
--- a/metadata/md5-cache/dev-python/wand-0.6.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( media-gfx/imagemagick[fftw,jpeg,png,truetype,xml] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) ) test? ( media-gfx/imagemagick >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Ctypes-based simple ImageMagick binding for Python
-EAPI=7
-HOMEPAGE=http://wand-py.org/
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=media-gfx/imagemagick python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/w/wand/Wand-0.6.6.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6ee70a78a077d4eb138ae07892a6a342
diff --git a/metadata/md5-cache/dev-python/watchgod-0.7 b/metadata/md5-cache/dev-python/watchgod-0.7
index 62f2d67745ff..202bab00a1f3 100644
--- a/metadata/md5-cache/dev-python/watchgod-0.7
+++ b/metadata/md5-cache/dev-python/watchgod-0.7
@@ -4,7 +4,7 @@ DESCRIPTION=Simple, modern file watching and code reload in Python
 EAPI=8
 HOMEPAGE=https://pypi.org/project/watchgod/ https://github.com/samuelcolvin/watchgod/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/samuelcolvin/watchgod/archive/v0.7.tar.gz -> watchgod-0.7.gh.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=45ab7bd18902f7b60951e4c218076608
+_md5_=1f0dfcd0bfa1572ef72cc9a144827d44
diff --git a/metadata/md5-cache/dev-python/wcmatch-8.1.2 b/metadata/md5-cache/dev-python/wcmatch-8.1.2
deleted file mode 100644
index ba815e391d2d..000000000000
--- a/metadata/md5-cache/dev-python/wcmatch-8.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-vcs/git ) test? ( >=dev-python/backrefs-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/bracex-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] doc? ( || ( ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Wildcard/glob file name matcher
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/wcmatch/ https://pypi.org/project/wcmatch/
-IUSE=test python_targets_python3_8 python_targets_python3_9 doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/backrefs-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/bracex-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/wcmatch/archive/8.1.2.tar.gz -> wcmatch-8.1.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=16bed79b7f9978b02406b9f01d0bfc1c
diff --git a/metadata/md5-cache/dev-python/weasyprint-53.0 b/metadata/md5-cache/dev-python/weasyprint-53.0
deleted file mode 100644
index 3dc69849a8ce..000000000000
--- a/metadata/md5-cache/dev-python/weasyprint-53.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-text/ghostscript-gpl media-fonts/ahem media-fonts/dejavu ) test? ( >=dev-python/cffi-0.6:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydyf-0.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/pango >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Visual rendering engine for HTML and CSS that can export to PDF
-EAPI=8
-HOMEPAGE=https://weasyprint.org https://github.com/Kozea/WeasyPrint
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/cffi-0.6:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydyf-0.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/pango python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/w/weasyprint/weasyprint-53.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=69a1bb560cc57588cf6a4478afa9cf40
diff --git a/metadata/md5-cache/dev-python/weasyprint-53.2 b/metadata/md5-cache/dev-python/weasyprint-53.2
deleted file mode 100644
index 410289b9a493..000000000000
--- a/metadata/md5-cache/dev-python/weasyprint-53.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-text/ghostscript-gpl media-fonts/ahem media-fonts/dejavu ) test? ( >=dev-python/cffi-0.6:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydyf-0.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/pango >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Visual rendering engine for HTML and CSS that can export to PDF
-EAPI=8
-HOMEPAGE=https://weasyprint.org https://github.com/Kozea/WeasyPrint
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/cffi-0.6:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydyf-0.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/pango python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/w/weasyprint/weasyprint-53.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=69a1bb560cc57588cf6a4478afa9cf40
diff --git a/metadata/md5-cache/dev-python/websockets-10.0 b/metadata/md5-cache/dev-python/websockets-10.0
index 0fa073fd180c..7f713617e690 100644
--- a/metadata/md5-cache/dev-python/websockets-10.0
+++ b/metadata/md5-cache/dev-python/websockets-10.0
@@ -4,7 +4,7 @@ DESCRIPTION=Library for building WebSocket servers and clients in Python
 EAPI=8
 HOMEPAGE=https://websockets.readthedocs.io/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aaugustin/websockets/archive/10.0.tar.gz -> websockets-10.0-src.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=479bb54a022d08267cc4f44e1c04602d
+_md5_=141b154e06b728a6383e67053ec9683b
diff --git a/metadata/md5-cache/dev-python/whisper-1.1.5 b/metadata/md5-cache/dev-python/whisper-1.1.5
deleted file mode 100644
index d25ec616f8bf..000000000000
--- a/metadata/md5-cache/dev-python/whisper-1.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?] )
-DESCRIPTION=Fixed size round-robin style database
-EAPI=7
-HOMEPAGE=https://github.com/graphite-project/whisper
-IUSE=test python_targets_pypy3 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/graphite-project/whisper/archive/1.1.5.tar.gz -> whisper-1.1.5.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=04b30de95e10bec01fd606aa2410dc97
diff --git a/metadata/md5-cache/dev-python/wrapt-1.13.2 b/metadata/md5-cache/dev-python/wrapt-1.13.2
new file mode 100644
index 000000000000..88c063bc2c3d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wrapt-1.13.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Module for decorators, wrappers and monkey patching
+EAPI=8
+HOMEPAGE=https://github.com/GrahamDumpleton/wrapt
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.13.2.tar.gz -> wrapt-1.13.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=da0e6347bbad6ca9db5ec6b8611446fe
diff --git a/metadata/md5-cache/dev-python/wsproto-0.15.0 b/metadata/md5-cache/dev-python/wsproto-0.15.0
deleted file mode 100644
index 0d215123fa49..000000000000
--- a/metadata/md5-cache/dev-python/wsproto-0.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/h11-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=WebSockets state-machine based protocol implementation
-EAPI=7
-HOMEPAGE=https://github.com/python-hyper/wsproto https://pypi.python.org/pypi/wsproto
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/h11-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/w/wsproto/wsproto-0.15.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2a1a791ebc5b61ffc8cef6aa389bbf35
diff --git a/metadata/md5-cache/dev-python/xdoctest-0.15.8 b/metadata/md5-cache/dev-python/xdoctest-0.15.8
deleted file mode 100644
index 51eb387f8908..000000000000
--- a/metadata/md5-cache/dev-python/xdoctest-0.15.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/nbformat-5.1.2-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A rewrite of Python's builtin doctest module but without all the weirdness
-EAPI=8
-HOMEPAGE=https://github.com/Erotemic/xdoctest/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Erotemic/xdoctest/archive/0.15.8.tar.gz -> xdoctest-0.15.8.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5aaccb877d6d20488ca140eab750822d
diff --git a/metadata/md5-cache/dev-python/xdoctest-0.15.9 b/metadata/md5-cache/dev-python/xdoctest-0.15.9
deleted file mode 100644
index 15bea0153396..000000000000
--- a/metadata/md5-cache/dev-python/xdoctest-0.15.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/nbformat-5.1.2-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A rewrite of Python's builtin doctest module but without all the weirdness
-EAPI=8
-HOMEPAGE=https://github.com/Erotemic/xdoctest/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Erotemic/xdoctest/archive/0.15.9.tar.gz -> xdoctest-0.15.9.gh.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3e369c491330438a346c0d5d8f039f68
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.7.0 b/metadata/md5-cache/dev-python/xmlschema-1.7.0
deleted file mode 100644
index a760b1e4df39..000000000000
--- a/metadata/md5-cache/dev-python/xmlschema-1.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/elementpath-2.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An XML Schema validator and decoder
-EAPI=8
-HOMEPAGE=https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/elementpath-2.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.7.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c423b96e6182d95edeb238d1d41b751f
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.7.1 b/metadata/md5-cache/dev-python/xmlschema-1.7.1
index c90854f99bc3..5aebbf605f6c 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.7.1
+++ b/metadata/md5-cache/dev-python/xmlschema-1.7.1
@@ -4,7 +4,7 @@ DESCRIPTION=An XML Schema validator and decoder
 EAPI=8
 HOMEPAGE=https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/elementpath-2.2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.7.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eb6d0e5a386174ea15fd1baa61228f7e
+_md5_=c423b96e6182d95edeb238d1d41b751f
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.36.8 b/metadata/md5-cache/dev-python/zeroconf-0.36.8
new file mode 100644
index 000000000000..ede7b64ba2e6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zeroconf-0.36.8
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
+EAPI=8
+HOMEPAGE=https://github.com/jstasiak/python-zeroconf/ https://pypi.org/project/zeroconf/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jstasiak/python-zeroconf/archive/0.36.8.tar.gz -> python-zeroconf-0.36.8.gh.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=015894f26dc58c55925b5c56e9ae8293
diff --git a/metadata/md5-cache/dev-python/zope-configuration-4.4.0 b/metadata/md5-cache/dev-python/zope-configuration-4.4.0
deleted file mode 100644
index 7a5aef9bbdad..000000000000
--- a/metadata/md5-cache/dev-python/zope-configuration-4.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Zope Configuration Architecture
-EAPI=7
-HOMEPAGE=https://github.com/zopefoundation/zope.configuration https://docs.zope.org/zope.configuration/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=ZPL
-RDEPEND=dev-python/zope-i18nmessageid[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/zope-schema-4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/z/zope.configuration/zope.configuration-4.4.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1d0de0a2094a786046c8099f6ded80a4
diff --git a/metadata/md5-cache/dev-python/zope-configuration-4.4.0-r1 b/metadata/md5-cache/dev-python/zope-configuration-4.4.0-r1
index 1ec42707ed5e..453bc3c92f97 100644
--- a/metadata/md5-cache/dev-python/zope-configuration-4.4.0-r1
+++ b/metadata/md5-cache/dev-python/zope-configuration-4.4.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Zope Configuration Architecture
 EAPI=7
 HOMEPAGE=https://github.com/zopefoundation/zope.configuration https://docs.zope.org/zope.configuration/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=ZPL
 RDEPEND=dev-python/zope-i18nmessageid[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-schema-4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.configuration/zope.configuration-4.4.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9d4e410129f0c7a5796b327c69a0fbfa
+_md5_=c0d7959ac6afc546dfe05fc878f5898b
diff --git a/metadata/md5-cache/dev-python/zope-schema-6.1.0 b/metadata/md5-cache/dev-python/zope-schema-6.1.0
deleted file mode 100644
index 4d9529b4ae2a..000000000000
--- a/metadata/md5-cache/dev-python/zope-schema-6.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/zope-i18nmessageid[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-5.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Zope schema Architecture
-EAPI=7
-HOMEPAGE=https://github.com/zopefoundation/zope.schema http://docs.zope.org/zope.schema/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=ZPL
-RDEPEND=dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-5.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/z/zope.schema/zope.schema-6.1.0.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=393157b68337dc60afb4e2387615f0d2
diff --git a/metadata/md5-cache/dev-python/zope-schema-6.1.1 b/metadata/md5-cache/dev-python/zope-schema-6.1.1
new file mode 100644
index 000000000000..5ac556c322f5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zope-schema-6.1.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/zope-i18nmessageid[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-5.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Zope schema Architecture
+EAPI=8
+HOMEPAGE=https://github.com/zopefoundation/zope.schema http://docs.zope.org/zope.schema/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=ZPL
+RDEPEND=dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-5.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/z/zope.schema/zope.schema-6.1.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5dccb6e430363d6eed057f1d6aba2028
diff --git a/metadata/md5-cache/dev-python/zope-schema-6.2.0 b/metadata/md5-cache/dev-python/zope-schema-6.2.0
new file mode 100644
index 000000000000..1f534b5aa1f6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zope-schema-6.2.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/zope-i18nmessageid[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-5.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Zope schema Architecture
+EAPI=8
+HOMEPAGE=https://github.com/zopefoundation/zope.schema http://docs.zope.org/zope.schema/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=ZPL
+RDEPEND=dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-5.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/z/zope.schema/zope.schema-6.2.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5dccb6e430363d6eed057f1d6aba2028
diff --git a/metadata/md5-cache/dev-python/zope-testrunner-5.2 b/metadata/md5-cache/dev-python/zope-testrunner-5.2
deleted file mode 100644
index 727fc895157a..000000000000
--- a/metadata/md5-cache/dev-python/zope-testrunner-5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-exceptions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Zope testrunner script
-EAPI=7
-HOMEPAGE=https://pypi.org/project/zope.testrunner/ https://github.com/zopefoundation/zope.testrunner
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=ZPL
-RDEPEND=dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-exceptions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/z/zope.testrunner/zope.testrunner-5.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=929dfa6ed55af1197e744ccd31f23111
diff --git a/metadata/md5-cache/dev-python/zstandard-0.16.0 b/metadata/md5-cache/dev-python/zstandard-0.16.0
new file mode 100644
index 000000000000..d80f94d15378
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zstandard-0.16.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-arch/zstd:= python_targets_python3_8? ( >=dev-python/cffi-1.14.0-r2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.14.0-r2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.14.0-r2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/zstd:=
+DESCRIPTION=Zstandard Bindings for Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=app-arch/zstd:= python_targets_python3_8? ( >=dev-python/cffi-1.14.0-r2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.14.0-r2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.14.0-r2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/z/zstandard/zstandard-0.16.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5ccc8041d0040eadac113925bab16507
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index e8b40293c405..dc8a371f8573 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/assistant-5.15.2 b/metadata/md5-cache/dev-qt/assistant-5.15.2
deleted file mode 100644
index 1d955b372d29..000000000000
--- a/metadata/md5-cache/dev-qt/assistant-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2 ~dev-qt/qthelp-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtprintsupport-5.15.2 ~dev-qt/qtsql-5.15.2[sqlite] ~dev-qt/qtwidgets-5.15.2 test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2 ~dev-qt/qthelp-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtprintsupport-5.15.2 ~dev-qt/qtsql-5.15.2[sqlite] ~dev-qt/qtwidgets-5.15.2
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dbb934ec9f8c6c7f609ee1fb35f3ef00
diff --git a/metadata/md5-cache/dev-qt/assistant-5.15.2-r11 b/metadata/md5-cache/dev-qt/assistant-5.15.2-r11
index c7a015b4cc9e..c2f7b0c0b9a0 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/assistant-5.15.2-r11
@@ -5,11 +5,11 @@ DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*[png] =dev-qt/qthelp-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtsql-5.15.2*[sqlite] =dev-qt/qtwidgets-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8920e7b8403330d2fd885966c8d7168d
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1e83085df38b34e91b0d6134769f594e
diff --git a/metadata/md5-cache/dev-qt/designer-5.15.2 b/metadata/md5-cache/dev-qt/designer-5.15.2
deleted file mode 100644
index f3adbd06891c..000000000000
--- a/metadata/md5-cache/dev-qt/designer-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2:5= ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtprintsupport-5.15.2 ~dev-qt/qtwidgets-5.15.2 ~dev-qt/qtxml-5.15.2 declarative? ( ~dev-qt/qtdeclarative-5.15.2[widgets] ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=declarative debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2:5= ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtprintsupport-5.15.2 ~dev-qt/qtwidgets-5.15.2 ~dev-qt/qtxml-5.15.2 declarative? ( ~dev-qt/qtdeclarative-5.15.2[widgets] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4a781a5743b6b8cb43566b88fca38fba
diff --git a/metadata/md5-cache/dev-qt/designer-5.15.2-r11 b/metadata/md5-cache/dev-qt/designer-5.15.2-r11
index 6f871db9f37a..33d79aed73e0 100644
--- a/metadata/md5-cache/dev-qt/designer-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/designer-5.15.2-r11
@@ -5,11 +5,11 @@ DESCRIPTION=WYSIWYG tool for designing and building graphical user interfaces wi
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=declarative debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[png] =dev-qt/qtnetwork-5.15.2* =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtwidgets-5.15.2* =dev-qt/qtxml-5.15.2* declarative? ( =dev-qt/qtdeclarative-5.15.2*[widgets] )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fdfbc390e62106a9e3f42bf7f920ceed
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b0ee1afef1af8aef050062d10ffec065
diff --git a/metadata/md5-cache/dev-qt/linguist-5.15.2 b/metadata/md5-cache/dev-qt/linguist-5.15.2
deleted file mode 100644
index ab5c5ff04c7c..000000000000
--- a/metadata/md5-cache/dev-qt/linguist-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/designer-5.15.2 ~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2:5= ~dev-qt/qtprintsupport-5.15.2 ~dev-qt/qtwidgets-5.15.2 ~dev-qt/qtxml-5.15.2 test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Graphical tool for translating Qt applications
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/designer-5.15.2 ~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2:5= ~dev-qt/qtprintsupport-5.15.2 ~dev-qt/qtwidgets-5.15.2 ~dev-qt/qtxml-5.15.2
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cd01067fdabb913aa4c6a9ad4519f3a3
diff --git a/metadata/md5-cache/dev-qt/linguist-5.15.2-r11 b/metadata/md5-cache/dev-qt/linguist-5.15.2-r11
index 9e022f9ddf3a..a81a69abf193 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/linguist-5.15.2-r11
@@ -5,11 +5,11 @@ DESCRIPTION=Graphical tool for translating Qt applications
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/designer-5.15.2* =dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[png] =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtwidgets-5.15.2* =dev-qt/qtxml-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=244f23fcd6b54f85bea816d279a87779
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=34b470a5e9d51cde2e764390257a0fdd
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.15.2 b/metadata/md5-cache/dev-qt/linguist-tools-5.15.2
deleted file mode 100644
index 4d384760b65d..000000000000
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtxml-5.15.2 qml? ( ~dev-qt/qtdeclarative-5.15.2 ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Tools for working with Qt translation data files
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtxml-5.15.2 qml? ( ~dev-qt/qtdeclarative-5.15.2 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ca836fa1010e257b8499cf24d8092c7c
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.15.2-r10 b/metadata/md5-cache/dev-qt/linguist-tools-5.15.2-r10
index 562e16a26928..301fca3a1dd6 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Tools for working with Qt translation data files
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtxml-5.15.2* qml? ( =dev-qt/qtdeclarative-5.15.2* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=61f8b995932294580a57aa7e67d0e176
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=39d90ed7837e369d37d00df942585581
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.15.2 b/metadata/md5-cache/dev-qt/pixeltool-5.15.2
deleted file mode 100644
index df8e1a86da2b..000000000000
--- a/metadata/md5-cache/dev-qt/pixeltool-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2:5= ~dev-qt/qtwidgets-5.15.2 test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Qt screen magnifier
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2:5= ~dev-qt/qtwidgets-5.15.2 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ceb05d5429c2b36d206e4cd094f7e8c0
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.15.2-r11 b/metadata/md5-cache/dev-qt/pixeltool-5.15.2-r11
index 4bdcdd8cf587..44674510c6d9 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.15.2-r11
@@ -5,11 +5,11 @@ DESCRIPTION=Qt screen magnifier
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[png] =dev-qt/qtwidgets-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=ad00d07d5bb5cb6208cb18f0d201302b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=6cb1a3c168ee5960a0d081468dd57deb
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.15.2 b/metadata/md5-cache/dev-qt/qdbus-5.15.2
deleted file mode 100644
index 2c041adf6188..000000000000
--- a/metadata/md5-cache/dev-qt/qdbus-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdbus-5.15.2 ~dev-qt/qtxml-5.15.2 test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Interface to Qt applications communicating over D-Bus
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdbus-5.15.2 ~dev-qt/qtxml-5.15.2
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=744c48ed63a131f3d53eb4fe12a80f30
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.15.2-r10 b/metadata/md5-cache/dev-qt/qdbus-5.15.2-r10
index c579809fedfd..4da2fe93c07b 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qdbus-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Interface to Qt applications communicating over D-Bus
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdbus-5.15.2* =dev-qt/qtxml-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=eee345494a3b0623a3962b26806dc2f0
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=9fc5ad0e7075a24e4aca5a3a5b03b111
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2 b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2
deleted file mode 100644
index 9f724286c291..000000000000
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdbus-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtwidgets-5.15.2 ~dev-qt/qtxml-5.15.2 test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdbus-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtwidgets-5.15.2 ~dev-qt/qtxml-5.15.2
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4588a8568a547e07e8ee5bb67dd2df93
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2-r10 b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2-r10
index bf2d5b756903..e438bb6b5219 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdbus-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtwidgets-5.15.2* =dev-qt/qtxml-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=02b0f2f4ac3c5e15e76bd9da36f1ec38
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1a06beed62c7168955c7add447820803
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.15.2 b/metadata/md5-cache/dev-qt/qdoc-5.15.2
deleted file mode 100644
index 210567bbe89a..000000000000
--- a/metadata/md5-cache/dev-qt/qdoc-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2:5= sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.15.2 ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Qt documentation generator
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.15.2 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fecd5923d26ee3723191d2cd93490040
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.15.2-r10 b/metadata/md5-cache/dev-qt/qdoc-5.15.2-r10
index 1c178d7d0300..f4391cc2b003 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qdoc-5.15.2-r10
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2*:5= sys-devel/clang:= qml? ( =dev-qt/qtdeclarative
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=01e0a4119836dfab0adc4970486ad615
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.15.2 b/metadata/md5-cache/dev-qt/qt3d-5.15.2
deleted file mode 100644
index 423f4eee77f4..000000000000
--- a/metadata/md5-cache/dev-qt/qt3d-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtconcurrent-5.15.2 ~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2:5=[vulkan=] ~dev-qt/qtnetwork-5.15.2 >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-5.15.2 ) qml? ( ~dev-qt/qtdeclarative-5.15.2[gles2-only=] ) vulkan? ( dev-util/vulkan-headers ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=3D rendering module for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=gamepad gles2-only qml vulkan debug test
-KEYWORDS=amd64 arm64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtconcurrent-5.15.2 ~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2:5=[vulkan=] ~dev-qt/qtnetwork-5.15.2 >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-5.15.2 ) qml? ( ~dev-qt/qtdeclarative-5.15.2[gles2-only=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6368f9c71b01ffc04d4ec43774778394
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.15.2-r10 b/metadata/md5-cache/dev-qt/qt3d-5.15.2-r10
index 91cb61a43225..bc9583eae097 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qt3d-5.15.2-r10
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtconcurrent-5.15.2* =dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qt3d/-/archive/7edec6e014de27b9dd03f63875c471aac606a918/qt3d-7edec6e014de27b9dd03f63875c471aac606a918.tar.gz -> qt3d-5.15.2-7edec6e0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=d6a24946ccb324e1c3ea7db44480d373
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.2-r1
index 2b2e27e10e03..905a457e44a4 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtconcurrent-5.15.2* =dev-qt/qtcore-5.15.2*:5= =dev-qt/qtdbus-5.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=b57669499345dddd61acec04bb7fbc3d
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtcharts-5.15.2-r1
index 3bc6a65662f8..0725c14c9fd7 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtwidgets-5.15.2* q
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=d35b5e35c658f89efcf5a277134e6b53
diff --git a/metadata/md5-cache/dev-qt/qtchooser-66 b/metadata/md5-cache/dev-qt/qtchooser-66
deleted file mode 100644
index 6f9d6dd709c3..000000000000
--- a/metadata/md5-cache/dev-qt/qtchooser-66
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=test? ( dev-qt/qtcore:5 dev-qt/qttest:5 )
-DESCRIPTION=Tool to quickly switch between multiple Qt installations
-EAPI=7
-HOMEPAGE=https://code.qt.io/cgit/qtsdk/qtchooser.git/
-IUSE=test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( LGPL-2.1 GPL-3 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://download.qt.io/official_releases/qtchooser/qtchooser-66.tar.xz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=20dc07d91aaa72c182de2f28e77c88c2
diff --git a/metadata/md5-cache/dev-qt/qtchooser-66-r1 b/metadata/md5-cache/dev-qt/qtchooser-66-r1
index aa185ddc016f..a8dc8aa5b285 100644
--- a/metadata/md5-cache/dev-qt/qtchooser-66-r1
+++ b/metadata/md5-cache/dev-qt/qtchooser-66-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to quickly switch between multiple Qt installations
 EAPI=8
 HOMEPAGE=https://code.qt.io/cgit/qtsdk/qtchooser.git/
 IUSE=test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=!<dev-qt/qtcore-5.15.2-r10:5
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.qt.io/official_releases/qtchooser/qtchooser-66.tar.xz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=41e2dd9b8dbf5cd5ab0dd31dbecae339
+_md5_=b5f99655b8f7b1683238041dc0784c9a
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2
deleted file mode 100644
index bbf650481694..000000000000
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2:5= test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5=
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=48b0c77f5f07332436cfd11ed7b6eee7
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r1
deleted file mode 100644
index 94d26fda3a87..000000000000
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2:5= test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5=
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ea9317e81e6d2b864cf5e0fd1eda1316
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r10
index 5561e965c537..847017bdaa43 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=e82d5c72eee81f65237269b7cf00a5d5
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=a6b6fea40b4d12cffd15d18d714651f7
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtcore-5.15.2-r10
index c60bbc1318a3..0fc95587e29b 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Cross-platform application development framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=icu old-kernel systemd kernel_linux debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) >=dev-qt/qtchooser-66-r1
 RESTRICT=test
 SLOT=5/5.15.2
 SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=9be454b3e65a74a44d37b83519c90df4
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=524ba61dc4edecb804f93c9a0859a050
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.2-r3 b/metadata/md5-cache/dev-qt/qtcore-5.15.2-r3
deleted file mode 100644
index 6dc7d7c89173..000000000000
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.2-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Cross-platform application development framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=icu old-kernel systemd kernel_linux debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15.2
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ba6e8beec6d7f986ac2806162ba876cf
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.2-r1
index cba2707217aa..bafd6c43d303 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[gles2-only=] qml? ( =dev-qt
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdatavis3d-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=25c8a37a4702771ceabd00ee4dc5c985
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r1
deleted file mode 100644
index 86c9243be620..000000000000
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2:5= >=sys-apps/dbus-1.4.20 test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=69ca3aa84cf9f4f4a27ac134dc6352f9
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r10
index bbe5636b23c3..6e8de76ddb07 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= >=sys-apps/dbus-1.4.20
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=9af07bb5b764584a50c7b79810e97caa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=959a0c4d2e7688413f8804a5071f425f
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r1
deleted file mode 100644
index 9466387479d5..000000000000
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2:5=[gles2-only=,vulkan=] ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qttest-5.15.2 localstorage? ( ~dev-qt/qtsql-5.15.2 ) widgets? ( ~dev-qt/qtwidgets-5.15.2[gles2-only=] ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=The QML and Quick modules for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2-only +jit localstorage vulkan +widgets debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2:5=[gles2-only=,vulkan=] ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qttest-5.15.2 localstorage? ( ~dev-qt/qtsql-5.15.2 ) widgets? ( ~dev-qt/qtwidgets-5.15.2[gles2-only=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=69ec8401e85dc29701e203601154998b
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r12 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r12
index e4144fac66c2..f24826e4d9cf 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r12
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r12
@@ -5,11 +5,11 @@ DESCRIPTION=The QML and Quick modules for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=gles2-only +jit localstorage vulkan +widgets debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*:5=[gles2-only=,vulkan=] =dev-qt/qtnetwork-5.15.2* =dev-qt/qttest-5.15.2* media-libs/libglvnd localstorage? ( =dev-qt/qtsql-5.15.2* ) widgets? ( =dev-qt/qtwidgets-5.15.2*[gles2-only=] )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtdeclarative/-/archive/1c33a9d045897ce755a818ebff7ddecae97885d3/qtdeclarative-1c33a9d045897ce755a818ebff7ddecae97885d3.tar.gz -> qtdeclarative-5.15.2-1c33a9d0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=92579e0dc18e576c701d8a0a4b1480e5
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=1aa3f065ca2534810eafbd978b298488
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.15.2 b/metadata/md5-cache/dev-qt/qtdiag-5.15.2
deleted file mode 100644
index 9db0dd060c9a..000000000000
--- a/metadata/md5-cache/dev-qt/qtdiag-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2:5= network? ( ~dev-qt/qtnetwork-5.15.2[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.15.2 ) ~dev-qt/qtxml-5.15.2 test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=+network +widgets debug test
-KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2:5= network? ( ~dev-qt/qtnetwork-5.15.2[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.15.2 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=519976c80581a2afa2bb37a67b45e3a6
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtdiag-5.15.2-r10
index 8a0c26ed576a..ac8f334ac4b4 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.15.2-r10
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5= network? ( =dev-qt/qt
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=ae73e8ff155993ef454ca9977f9a9cab
diff --git a/metadata/md5-cache/dev-qt/qtgamepad-5.15.2 b/metadata/md5-cache/dev-qt/qtgamepad-5.15.2
deleted file mode 100644
index 2c43f9d7c4ad..000000000000
--- a/metadata/md5-cache/dev-qt/qtgamepad-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2[evdev?] evdev? ( virtual/libudev:= ) qml? ( ~dev-qt/qtdeclarative-5.15.2 ) sdl? ( media-libs/libsdl ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Qt module to support gamepad hardware
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=evdev qml sdl debug test
-KEYWORDS=amd64 arm64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2[evdev?] evdev? ( virtual/libudev:= ) qml? ( ~dev-qt/qtdeclarative-5.15.2 ) sdl? ( media-libs/libsdl )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgamepad-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=53280113991d384cd0fcb3e68e0e5a6d
diff --git a/metadata/md5-cache/dev-qt/qtgamepad-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtgamepad-5.15.2-r1
index 5538a8d04612..dcba4bc36206 100644
--- a/metadata/md5-cache/dev-qt/qtgamepad-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtgamepad-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[evdev?] evdev? ( virtual/li
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgamepad-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=97cc644dc449bee4b34143db3c4e8b11
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.2-r1
index e1ec4241564d..75b9aa16ff0c 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=ec002371a9d06b3aa92ff7f720806f5e
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.2-r13 b/metadata/md5-cache/dev-qt/qtgui-5.15.2-r13
index 84ae57cff6cb..aab22d904b6b 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.2-r13
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.2-r13
@@ -5,7 +5,7 @@ DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( =dev-qt/qtwayland-5.15.2* )
 RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.2*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= media-libs/libglvnd sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.2* ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( =dev-qt/qtnetwork-5.15.2* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.2* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm )
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( eglfs X ) accessibility? ( dbus X ) eglfs? ( egl ) ibus? ( dbu
 RESTRICT=test
 SLOT=5/5.15.2
 SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=eb47722c80b71d6423f4fbb2b9175132
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=5f2152cf60543fc1ee3334d5ca3a7933
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.2-r2 b/metadata/md5-cache/dev-qt/qtgui-5.15.2-r2
deleted file mode 100644
index 396960d67f40..000000000000
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.2-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.15.2:5= dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= dbus? ( ~dev-qt/qtdbus-5.15.2 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-5.15.2 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.15.2 ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( ~dev-qt/qtwayland-5.15.2 )
-RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.15.2:5= dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= dbus? ( ~dev-qt/qtdbus-5.15.2 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-5.15.2 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.15.2 ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
-REQUIRED_USE=|| ( eglfs X ) accessibility? ( dbus X ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) X? ( gles2-only? ( egl ) )
-RESTRICT=test
-SLOT=5/5.15.2
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c98732c6c50f40e03f78be12a61d5673
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.15.2 b/metadata/md5-cache/dev-qt/qthelp-5.15.2
deleted file mode 100644
index 6a5cfc5a4d67..000000000000
--- a/metadata/md5-cache/dev-qt/qthelp-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtsql-5.15.2[sqlite] ~dev-qt/qtwidgets-5.15.2 test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Qt5 module for integrating online documentation into applications
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtsql-5.15.2[sqlite] ~dev-qt/qtwidgets-5.15.2 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7a5ec176637afffeba87004c92974d8c
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.15.2-r10 b/metadata/md5-cache/dev-qt/qthelp-5.15.2-r10
index 8d1f6af5dc75..35fba2918db4 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qthelp-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Qt5 module for integrating online documentation into applications
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtsql-5.15.2*[sqlite] =dev-qt/qtwidgets-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=b0e8346cbed42fb3539c672ab7c9207e
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=ee4691bf8e805e46abe9c6c13b72650c
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.2 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.2
deleted file mode 100644
index 36ffb0fa030f..000000000000
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Additional format plugins for the Qt image I/O system
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=mng debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f9ca4a4ee98af1946b74d20dae78faed
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.2-r10
index a5d1d8d8f2ed..29b4c1ba8f57 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Additional format plugins for the Qt image I/O system
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=mng debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2* media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtimageformats/-/archive/cb82c74310837fe4e832c8ab72176a5d63e4355f/qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.gz -> qtimageformats-5.15.2-cb82c743.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=7af48dec1809c71896b3d3f63fae3f15
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=a02e026f6f824f94fbcbb290c5fb4e9e
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r1
deleted file mode 100644
index 5a8b4d38e977..000000000000
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/icu:= ~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtpositioning-5.15.2[qml] ~dev-qt/qtsql-5.15.2 sys-libs/zlib ~dev-qt/qtconcurrent-5.15.2 test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Location (places, maps, navigation) library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/icu:= ~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtnetwork-5.15.2 ~dev-qt/qtpositioning-5.15.2[qml] ~dev-qt/qtsql-5.15.2 sys-libs/zlib
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=da34b906972e384f418fee1becc881bd
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r10
index 49cc7704a383..9486def3bf6c 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r10
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtlocation/-/archive/861e372b6ad81570d4f496e42fb25a6699b72f2f/qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.gz -> qtlocation-5.15.2-861e372b.tar.gz https://invent.kde.org/qt/qt/qtlocation-mapboxgl/-/archive/d3101bbc22edd41c9036ea487d4a71eabd97823d/qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.gz -> qtlocation-mapboxgl-5.15.2-d3101bbc.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=c7b0747e0033900c7a998f6900638ed4
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2-r1
deleted file mode 100644
index d9fe71f1215a..000000000000
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[gles2-only=] =dev-qt/qtnetwork-5.15.2* alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio[glib] ) qml? ( =dev-qt/qtdeclarative-5.15.2* gles2-only? ( =dev-qt/qtgui-5.15.2*[egl] ) openal? ( media-libs/openal ) ) widgets? ( =dev-qt/qtopengl-5.15.2* =dev-qt/qtwidgets-5.15.2*[gles2-only=] ) gstreamer? ( x11-base/xorg-proto ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa gles2-only gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[gles2-only=] =dev-qt/qtnetwork-5.15.2* alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio[glib] ) qml? ( =dev-qt/qtdeclarative-5.15.2* gles2-only? ( =dev-qt/qtgui-5.15.2*[egl] ) openal? ( media-libs/openal ) ) widgets? ( =dev-qt/qtopengl-5.15.2* =dev-qt/qtwidgets-5.15.2*[gles2-only=] )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=790043a533fefcdf846de559b05a0ce3
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2-r2 b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2-r2
index 5f80ef87e69a..704d9fc70ad8 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2-r2
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framewo
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa gles2-only gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[gles2-only=] =dev-qt/qtnetwork-5.15.2* alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio[glib] ) qml? ( =dev-qt/qtdeclarative-5.15.2* gles2-only? ( =dev-qt/qtgui-5.15.2*[egl] ) openal? ( media-libs/openal ) ) widgets? ( =dev-qt/qtwidgets-5.15.2*[gles2-only=] media-libs/libglvnd )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=973ee97b0c9572bcec4610007978a0af
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=c398e083e956775609b9594c78c99974
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r11 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r11
index 512617776afd..6550eb5a02b0 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r11
@@ -5,11 +5,11 @@ DESCRIPTION=Network abstraction library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=bindist connman gssapi libproxy networkmanager sctp +ssl debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= sys-libs/zlib:= connman? ( =dev-qt/qtdbus-5.15.2* ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( =dev-qt/qtdbus-5.15.2* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=e628bc35855569fbb518d49426da27f8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=223d0c22b6ed0dca829fbb88c627f69f
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r2 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r2
deleted file mode 100644
index 6a44b0a3ed9b..000000000000
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~dev-qt/qtcore-5.15.2:5= sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.15.2 ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.15.2 ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Network abstraction library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=bindist connman gssapi libproxy networkmanager sctp +ssl debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.15.2 ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.15.2 ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bbf11240d510f108fa4f775e40cd88c6
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.2-r1
index f46ce838f28b..3b4f54601997 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtnetwork-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtnetworkauth-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=333f921a581ff9c9a4d938debbc0f872
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r1
deleted file mode 100644
index 685e962dfbd2..000000000000
--- a/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] !gles2-only? ( virtual/opengl ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2-only test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] !gles2-only? ( virtual/opengl )
-RESTRICT=!test? ( test ) test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e9b49bbb495a747b35bf3e57f4a51700
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r11 b/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r11
index 8e72439eb829..6c745a0cda79 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r11
@@ -5,11 +5,11 @@ DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=gles2-only test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*[gles2-only=] =dev-qt/qtwidgets-5.15.2*[gles2-only=]
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=a5274c9e728407e47407e7bd50ba25b3
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=2918953fbc85a3a23d022499e40d3f15
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.15.2 b/metadata/md5-cache/dev-qt/qtpaths-5.15.2
deleted file mode 100644
index 01f44360dbdd..000000000000
--- a/metadata/md5-cache/dev-qt/qtpaths-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2 test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Command line client to QStandardPaths
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=437526ccc2e3697db6568a7fde0cedd6
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtpaths-5.15.2-r10
index f81b6bf53a08..304af0b3129d 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Command line client to QStandardPaths
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=d5a633ee21cd4ffd7084c6ed2f1e29c8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=63b22cf29ef127fec87548dbf9b8285a
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2 b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2
deleted file mode 100644
index fae791565fa3..000000000000
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2 test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Qt5 plugin metadata dumper
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=16b8dea25c993ea246532b13f068edf7
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2-r10
index 6bae0f9adbfd..4f7af59747c5 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2-r10
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=fc455d123f307930dc8b4fc0788264d1
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtpositioning-5.15.2-r1
index 90de9e3feae3..0f7891c7488f 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.15.2-r1
@@ -12,5 +12,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* geoclue? ( =dev-qt/qtdbus-5.15.2* ) qml? ( =dev-q
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=42fafdb025e9893154d0e0b8a6e3658a
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r1
deleted file mode 100644
index 38a4ee485117..000000000000
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.15.2 ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Printing support library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=cups gles2-only test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=] ~dev-qt/qtwidgets-5.15.2[gles2-only=] cups? ( >=net-print/cups-1.4 )
-RESTRICT=!test? ( test ) test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4c5bb09aeac65c43a0e305a0e3c90402
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r10
index 6f8acde96c21..650e618c97f7 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Printing support library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=cups gles2-only test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*[gles2-only=] =dev-qt/qtwidgets-5.15.2*[gles2-only=] cups? ( >=net-print/cups-1.4 )
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=b2ea1879f616e058df16b792bacc1285
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=caff9b59c506a11a0e3d3293bd76b24a
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.2-r1
index 7beb9eb51aa2..5f3bd65303ac 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=e7bf45a462f1996420a843da656cae7c
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2
deleted file mode 100644
index 50296973322b..000000000000
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 widgets? ( ~dev-qt/qtwidgets-5.15.2 ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=widgets debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 widgets? ( ~dev-qt/qtwidgets-5.15.2 ) ~dev-qt/qtgraphicaleffects-5.15.2
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=695fae016e2aaf5a9cadcdca88b0af9d
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2-r11 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2-r11
index 9f537d28ffb9..9ac24648a381 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2-r11
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtquickcontrols2/-/archive/be66bf9a5618c745d2a6ee2262967af6307b3b07/qtquickcontrols2-be66bf9a5618c745d2a6ee2262967af6307b3b07.tar.gz -> qtquickcontrols2-5.15.2-be66bf9a.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=fc85ed612bfa79d128787be0cad199db
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.2-r1
index 49041a94de19..baa7e6138c8a 100644
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=71073ce8956254f3cd8bf636553960e9
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtscript-5.15.2-r1
index 89bbbc315dbe..820fd1bed488 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtscript-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* scripttools? ( =dev-qt/qtgui-5.15.2* =dev-qt/qtwi
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=9d234e100e1c3bf7259d8ce13eaa3bd6
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtscxml-5.15.2-r1
index 04d8c40f1283..cda930f1d4ad 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=24536f3ec66265acdf09b68c2bdcf5c5
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtsensors-5.15.2-r1
index 8e9e275a443e..87f418bca5f6 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdbus-5.15.2* qml? ( =dev-qt/qtdeclarati
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=383ddc2c70ca9022e359fd38fa424ed8
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtserialbus-5.15.2-r1
index 59ba43ead2ea..d4c47fdd13cd 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtserialport-5.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=9a8aeaf699fe3388522283fe5b702d4b
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtserialport-5.15.2-r1
index fcc092474936..098eaafef600 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* virtual/libudev:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=2328001694afb21002e0aead8992643b
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.2 b/metadata/md5-cache/dev-qt/qtspeech-5.15.2
deleted file mode 100644
index 210947a6c502..000000000000
--- a/metadata/md5-cache/dev-qt/qtspeech-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.15.2 test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Text-to-speech library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.15.2
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtspeech-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a71a15f0841255f2aa86d9c9a875a465
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtspeech-5.15.2-r1
index ed98ac7d6153..dbc09929ceb9 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 =dev-qt/qtcore-5.15.2* flite
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtspeech-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=a8433179e878604debfb6b15c137443a
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtsql-5.15.2-r1
deleted file mode 100644
index 232d21ff7b82..000000000000
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=SQL abstraction library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
-RESTRICT=test
-SLOT=5/5.15.2
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b3a9b3594799ce6a6f4773949b17edcd
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtsql-5.15.2-r10
index 5c7a75cf8227..d7bdea807640 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtsql-5.15.2-r10
@@ -5,12 +5,12 @@ DESCRIPTION=SQL abstraction library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.15.2
 SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=b57ec6b818beb88336623d0d504e281b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=450849f01eb21813ee31475a0bca68c3
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.2 b/metadata/md5-cache/dev-qt/qtsvg-5.15.2
deleted file mode 100644
index 2dd16e603166..000000000000
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtwidgets-5.15.2 sys-libs/zlib:= test? ( ~dev-qt/qtxml-5.15.2 ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=SVG rendering library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtwidgets-5.15.2 sys-libs/zlib:=
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c825817b870d45d822c617c864f6fe63
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtsvg-5.15.2-r10
index 53970f13dcdc..63d2e899db77 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=SVG rendering library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtwidgets-5.15.2* sys-libs/zlib:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtsvg/-/archive/cfc616978b52a396b2ef6900546f7fc086d7cab3/qtsvg-cfc616978b52a396b2ef6900546f7fc086d7cab3.tar.gz -> qtsvg-5.15.2-cfc61697.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=0a0cee36294d0abee3547a7eb86d5501
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=f518c94199e8b1f6436acd71e32fc02f
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.2-r1 b/metadata/md5-cache/dev-qt/qttest-5.15.2-r1
deleted file mode 100644
index b65a24227c50..000000000000
--- a/metadata/md5-cache/dev-qt/qttest-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2:5= test? ( ~dev-qt/qtgui-5.15.2 ~dev-qt/qtxml-5.15.2 )
-DESCRIPTION=Unit testing library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5=
-RESTRICT=!test? ( test ) test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=941eec18a689d151624dbfac49e2ba2b
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.2-r10 b/metadata/md5-cache/dev-qt/qttest-5.15.2-r10
index 279ef38f8ea9..cf47254830ef 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qttest-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Unit testing library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5=
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=551e9149f72cfb8fa412386e5edb0c99
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=009a9b960df1c8261493a788bc904f8e
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.15.2 b/metadata/md5-cache/dev-qt/qttranslations-5.15.2
deleted file mode 100644
index 9f6d3387b535..000000000000
--- a/metadata/md5-cache/dev-qt/qttranslations-5.15.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/linguist-tools-5.15.2 ~dev-qt/qtcore-5.15.2 test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Translation files for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttranslations-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7fbb36c23171daa9a49d066b6573e2d7
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.15.2-r10 b/metadata/md5-cache/dev-qt/qttranslations-5.15.2-r10
index bdfa0c7dffa7..ca3fd9d5fabf 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.15.2-r10
@@ -5,10 +5,10 @@ DESCRIPTION=Translation files for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qttranslations/-/archive/68f420ebdfb226e3d0c09ebed06d5454cc6c3a7f/qttranslations-68f420ebdfb226e3d0c09ebed06d5454cc6c3a7f.tar.gz -> qttranslations-5.15.2-68f420eb.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=14513d15058162b28746102c4c6e1a84
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=bf28f87c3b8258fdd838e74cbfdbff07
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2
deleted file mode 100644
index c47584cf071a..000000000000
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtsvg-5.15.2 spell? ( app-text/hunspell:= ) X? ( x11-libs/libxcb:= ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Customizable input framework and virtual keyboard for Qt
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=handwriting +spell +X debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2 ~dev-qt/qtsvg-5.15.2 spell? ( app-text/hunspell:= ) X? ( x11-libs/libxcb:= )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7eb35e8564e87550055c55bc60045f13
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2-r11 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2-r11
index 98a0212638ce..a03520437477 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2-r11
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtvirtualkeyboard/-/archive/353b75b2e34bdae901625bbddf5c5e3f3e6c0de5/qtvirtualkeyboard-353b75b2e34bdae901625bbddf5c5e3f3e6c0de5.tar.gz -> qtvirtualkeyboard-5.15.2-353b75b2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=765d430bd21a7f3fdb94327cb317ae37
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r1
deleted file mode 100644
index 670de6bdce58..000000000000
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2[egl,libinput,vulkan=] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) X? ( ~dev-qt/qtgui-5.15.2[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Wayland platform plugin for Qt
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=vulkan X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.15.2 ~dev-qt/qtdeclarative-5.15.2 ~dev-qt/qtgui-5.15.2[egl,libinput,vulkan=] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) X? ( ~dev-qt/qtgui-5.15.2[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4aff741e7fcb13d9d1b128999a03fb20
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r14 b/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r14
index 8eb072ca60e8..0e34f3257f4e 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r14
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r14
@@ -5,11 +5,11 @@ DESCRIPTION=Wayland platform plugin for Qt
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=vulkan X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.2*:5= =dev-qt/qtdeclarative-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.2*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
 RESTRICT=test
 SLOT=5/5.15.2
 SRC_URI=https://invent.kde.org/qt/qt/qtwayland/-/archive/efe6edcaf8eba601dff99ec6ad4457c8a4442f86/qtwayland-efe6edcaf8eba601dff99ec6ad4457c8a4442f86.tar.gz -> qtwayland-5.15.2-efe6edca.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=2c722ea0dca88ab6c6d2e734f8ef3d18
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=7fbc76bc10850976ba86937af817e041
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.2-r1
index bc576509b902..f121fd29b05e 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* qml? ( =dev-qt/qtdeclarative-5.15.2* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=6985268e070c195d47c63506fdb09064
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210824-r1 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210824-r1
index a4645b9caa83..9882780dc791 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210824-r1
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20210824-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.2_p20210824.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-chromium87-ppc64le.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=046049215860182d2474ecb0f6ae9c25
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=5c6472df5f409d9ed888d06a73e86212
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20211015 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20211015
new file mode 100644
index 000000000000..deb0a942cc50
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20211015
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) dev-util/gperf dev-util/ninja dev-util/re2c net-libs/nodejs[ssl] sys-devel/bison sys-devel/flex ppc64? ( >=dev-util/gn-0.1807 ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtwebchannel-5.15.2*[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( =dev-qt/designer-5.15.2* ) geolocation? ( =dev-qt/qtpositioning-5.15.2* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtdeclarative-5.15.2*[widgets] =dev-qt/qtwidgets-5.15.2* ) media-libs/libglvnd test? ( =dev-qt/qttest-5.15.2* )
+DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+IUSE=alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets debug test
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtwebchannel-5.15.2*[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( =dev-qt/designer-5.15.2* ) geolocation? ( =dev-qt/qtpositioning-5.15.2* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtdeclarative-5.15.2*[widgets] =dev-qt/qtwidgets-5.15.2* )
+REQUIRED_USE=designer? ( widgets )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.2_p20211015.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-chromium87-ppc64le.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=6321c903b685c3beeeafb49abf0bc026
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2 b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2
deleted file mode 100644
index bc775caf4f59..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtnetwork-5.15.2[ssl=] qml? ( ~dev-qt/qtdeclarative-5.15.2 ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=qml +ssl debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2 ~dev-qt/qtnetwork-5.15.2[ssl=] qml? ( ~dev-qt/qtdeclarative-5.15.2 )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ceaf68474f9988c350012c7f6432f1b9
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2-r10
index 4810c362f7e0..23de91e98d2d 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=qml +ssl debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtnetwork-5.15.2*[ssl=] qml? ( =dev-qt/qtdeclarative-5.15.2* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtwebsockets/-/archive/e7883bc64440b1ff4666272ac6eb710ee4bc221b/qtwebsockets-e7883bc64440b1ff4666272ac6eb710ee4bc221b.tar.gz -> qtwebsockets-5.15.2-e7883bc6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=d32453aab9c167f2715ed4f75123bcd5
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=741ad11edba1009c159864175103ff3e
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.15.2-r2 b/metadata/md5-cache/dev-qt/qtwebview-5.15.2-r2
index f02f48a254e6..608ccfb7470d 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.15.2-r2
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.15.2-r2
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=d424e8bfdcf97751a66a64b449c3ea1a
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r1
deleted file mode 100644
index 52d3f7370bad..000000000000
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=,png=,X?] gtk? ( ~dev-qt/qtgui-5.15.2[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2-only gtk +png +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5= ~dev-qt/qtgui-5.15.2[gles2-only=,png=,X?] gtk? ( ~dev-qt/qtgui-5.15.2[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d8ede20cd3333bc4ec7a704159095c29
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r11 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r11
index f3a65684fb64..e61eb31cf0f1 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r11
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r11
@@ -5,12 +5,12 @@ DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=dbus gles2-only gtk +png +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.2* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.2*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango )
 REQUIRED_USE=gtk? ( dbus )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=18459e97c13edd5a2014f69a22bbc00c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=77fc6a490321ccd5484587cc14932424
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtx11extras-5.15.2-r1
index 17749966c19a..485ce5cbeaef 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[X]
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=6f93bce74a0be4aa9e7c381f28dcbdc2
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtxml-5.15.2-r1
deleted file mode 100644
index a0fe16cb02a0..000000000000
--- a/metadata/md5-cache/dev-qt/qtxml-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~dev-qt/qtcore-5.15.2:5= test? ( ~dev-qt/qtnetwork-5.15.2 ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.2:5=
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.2-gcc11.patch.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=717c1de67be20e241b10afe96a458695
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtxml-5.15.2-r10
index 0b0bbdf5070a..50b858e0b681 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.15.2-r10
+++ b/metadata/md5-cache/dev-qt/qtxml-5.15.2-r10
@@ -5,11 +5,11 @@ DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.2*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=d6625f1e97faf2fe82b2b518b9026350
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=06bbe33052261db7a51b12d00bb4766a
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.2-r1
index 5cfca24d6d1e..7e544ff1c8af 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.2-r1
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.2-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtnetwork-5.15.2* qml? ( =dev-qt/qtdeclar
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	14c97c05b3019e69a8ed198afdf5e82b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qt5-build	3dd6aa2952bf864755d5029a06d2bb34	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=825633af44cfe12a95429aa15a892e0d
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 4a150b499624..e99d761ac1dd 100644
--- a/metadata/md5-cache/dev-ros/Manifest.gz
+++ b/metadata/md5-cache/dev-ros/Manifest.gz
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-0.11.2 b/metadata/md5-cache/dev-ros/ament_xmllint-0.11.2
index 87940ee86b85..6ef684ad64da 100644
--- a/metadata/md5-cache/dev-ros/ament_xmllint-0.11.2
+++ b/metadata/md5-cache/dev-ros/ament_xmllint-0.11.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-ros/ament_copyright[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-ros/ament_flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-ros/ament_pep257[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-ros/ament_lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/libxml2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-ros/ament_copyright[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-ros/ament_flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-ros/ament_pep257[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-ros/ament_lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/libxml2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/libxml2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/libxml2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=Checks XML files like the package manifest using xmllint
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/libxml2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/libxml2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.11.2.tar.gz -> ament_lint-0.11.2.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75fa3a1c25127a3b8a1403d6154fe656
+_md5_=c1bc3bb3f244a67a997aac97df249761
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-9999 b/metadata/md5-cache/dev-ros/ament_xmllint-9999
index 72207ae60f88..0cce3c65b2f4 100644
--- a/metadata/md5-cache/dev-ros/ament_xmllint-9999
+++ b/metadata/md5-cache/dev-ros/ament_xmllint-9999
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-ros/ament_copyright[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-ros/ament_flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-ros/ament_pep257[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-ros/ament_lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/libxml2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-ros/ament_copyright[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-ros/ament_flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-ros/ament_pep257[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-ros/ament_lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/libxml2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/libxml2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/libxml2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=Checks XML files like the package manifest using xmllint
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-libs/libxml2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/libxml2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=75fa3a1c25127a3b8a1403d6154fe656
+_md5_=c1bc3bb3f244a67a997aac97df249761
diff --git a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1 b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
index 81f22975fa5e..3dd5c39ad0fe 100644
--- a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/georuby-2.5.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a92386c837e767d8940ea868412e808b
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 29cabe3ea2ef..5498f1aa60f8 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
index dd055e5422d2..7b03aa8ad0a9 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/abstract-1.0.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7b9baf6101e28292cf356a7116fec48a
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
index 6934a430d1b7..89c64c3321d8 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/abstract-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ede68fb3dae5a0b01d882ff47b9e4ec
diff --git a/metadata/md5-cache/dev-ruby/acme-client-2.0.8 b/metadata/md5-cache/dev-ruby/acme-client-2.0.8
index e3d43ba21739..23bb42ea9802 100644
--- a/metadata/md5-cache/dev-ruby/acme-client-2.0.8
+++ b/metadata/md5-cache/dev-ruby/acme-client-2.0.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/unixcharles/acme-client/archive/v2.0.8.tar.gz -> acme-client-2.0.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c344858e2252ff458e1aadde599457f0
diff --git a/metadata/md5-cache/dev-ruby/acme-client-2.0.9 b/metadata/md5-cache/dev-ruby/acme-client-2.0.9
index 4fae17966cc4..c3aca5d1ae63 100644
--- a/metadata/md5-cache/dev-ruby/acme-client-2.0.9
+++ b/metadata/md5-cache/dev-ruby/acme-client-2.0.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/unixcharles/acme-client/archive/v2.0.9.tar.gz -> acme-client-2.0.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3b1f042c15c1ead16edf9b71e69d2aa
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.2.6 b/metadata/md5-cache/dev-ruby/actioncable-5.2.6
index 8f085e5445ac..b959a4f27fd2 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-5.2.6
+++ b/metadata/md5-cache/dev-ruby/actioncable-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0db335f19158522ce8188f1be6ad9ff2
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.0.4.1 b/metadata/md5-cache/dev-ruby/actioncable-6.0.4.1
index 731acef026c0..4714bfb40c26 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.0.4.1
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.1.tar.gz -> rails-6.0.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=366044cd7d7112cb66a350871f55cd56
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.1.4.1 b/metadata/md5-cache/dev-ruby/actioncable-6.1.4.1
index aa041a95204f..4630260850b5 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.1.4.1
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.1.tar.gz -> rails-6.1.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eec108fe79d5ef394343e0697ef3b7c8
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.4.1 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.4.1
index b3a75c31efc0..2c9f87972fa0 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.4.1
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.1.tar.gz -> rails-6.0.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9341164ac1e90046e35d9c6d62b8a215
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.4.1 b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.4.1
index 7be3158b7195..c5c1af7332ed 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.4.1
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.1.tar.gz -> rails-6.1.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=da6deee2c8f6e6fbf2c07bb8fe8eab6a
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.2.6 b/metadata/md5-cache/dev-ruby/actionmailer-5.2.6
index c47579a790f5..f8b9efd22c1e 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.2.6
+++ b/metadata/md5-cache/dev-ruby/actionmailer-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e730121fd6f2c378610cc90e34e43a83
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.0.4.1 b/metadata/md5-cache/dev-ruby/actionmailer-6.0.4.1
index 47ed1751bb67..87721aeb1043 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.0.4.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.1.tar.gz -> rails-6.0.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac007e3640964fbe8035addf1d7bb8e7
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.1.4.1 b/metadata/md5-cache/dev-ruby/actionmailer-6.1.4.1
index b34449357827..a02ff9828950 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.1.4.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.1.tar.gz -> rails-6.1.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=889d8ba343f3566117819af04e7dd9fb
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.2.6 b/metadata/md5-cache/dev-ruby/actionpack-5.2.6
index 72ccee1389cf..10f0f2129a53 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.2.6
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6fd7a99e23136e386f6662b5178c3896
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.0.4.1 b/metadata/md5-cache/dev-ruby/actionpack-6.0.4.1
index 98c386bfc98d..28ea96e05af4 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.0.4.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.1.tar.gz -> rails-6.0.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0dea775bea645d11e72720275c2ec4c7
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.1.4.1 b/metadata/md5-cache/dev-ruby/actionpack-6.1.4.1
index 1791486b111b..496028c9f976 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.1.4.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.1.tar.gz -> rails-6.1.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=29141290376f46e4b42acf75b735cc65
diff --git a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.1 b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.1
index a2e4c352bb8e..c2490ce7ae42 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/actionpack-action_caching-1.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=02c3127f5e9c1d9b62e017ca872df786
diff --git a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2 b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2
index 0a989ea3b2ac..53c1c4487a79 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2
+++ b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/actionpack-action_caching-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=549f041bff35414e8603b1095c230ce1
diff --git a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r1 b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r1
index 4d66d1600cb3..cfb4d858fa81 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rails/actionpack-xml_parser/archive/v2.0.1.tar.gz -> actionpack-xml_parser-2.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aab15262fa34f5adef21259efb46dd9f
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.0.4.1 b/metadata/md5-cache/dev-ruby/actiontext-6.0.4.1
index ceef3df2df4a..f9403e545ce8 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.0.4.1
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.1.tar.gz -> rails-6.0.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d1b660fabf382a908c9127090f552aba
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.1.4.1 b/metadata/md5-cache/dev-ruby/actiontext-6.1.4.1
index a78898d322c5..be791b0e06ff 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.1.4.1
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.1.tar.gz -> rails-6.1.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e9726becbfb58af5d0cc478fae89760c
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.2.6 b/metadata/md5-cache/dev-ruby/actionview-5.2.6
index 5dc3f5603c69..5166c217b5d3 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.2.6
+++ b/metadata/md5-cache/dev-ruby/actionview-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e06d848f5df9096d9556ff23ff8c565e
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.0.4.1 b/metadata/md5-cache/dev-ruby/actionview-6.0.4.1
index c32ca82fd473..0943a79be0e5 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.0.4.1
+++ b/metadata/md5-cache/dev-ruby/actionview-6.0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.1.tar.gz -> rails-6.0.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7dc63617553dc42bbe70d4df22f99415
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.1.4.1 b/metadata/md5-cache/dev-ruby/actionview-6.1.4.1
index b88365c1a598..ed1f1387ea77 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.1.4.1
+++ b/metadata/md5-cache/dev-ruby/actionview-6.1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.1.tar.gz -> rails-6.1.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2a74ebbadb75736f4e21baf71c005415
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.2.6 b/metadata/md5-cache/dev-ruby/activejob-5.2.6
index 60e0f733f138..e02f1f294e90 100644
--- a/metadata/md5-cache/dev-ruby/activejob-5.2.6
+++ b/metadata/md5-cache/dev-ruby/activejob-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b53729fd4312e822a11711e56b9398d
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.0.4.1 b/metadata/md5-cache/dev-ruby/activejob-6.0.4.1
index 90dd4a4d17e9..2b975c1bef6e 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.0.4.1
+++ b/metadata/md5-cache/dev-ruby/activejob-6.0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.1.tar.gz -> rails-6.0.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=702ab20b567a7586bac8e64a01cc4658
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.1.4.1 b/metadata/md5-cache/dev-ruby/activejob-6.1.4.1
index 6e840591f0b6..2fa3ad9bf3b4 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.1.4.1
+++ b/metadata/md5-cache/dev-ruby/activejob-6.1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.1.tar.gz -> rails-6.1.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8591a7debfa5a85ce6704cef9d254c92
diff --git a/metadata/md5-cache/dev-ruby/activeldap-5.2.4 b/metadata/md5-cache/dev-ruby/activeldap-5.2.4
index 5af77507c403..d4c2a510a214 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-5.2.4
+++ b/metadata/md5-cache/dev-ruby/activeldap-5.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/activeldap-5.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=966764b50fa5a29ff4a5040d337f8efa
diff --git a/metadata/md5-cache/dev-ruby/activeldap-6.0.4 b/metadata/md5-cache/dev-ruby/activeldap-6.0.4
index e866282194c9..c7f6ad96adf2 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-6.0.4
+++ b/metadata/md5-cache/dev-ruby/activeldap-6.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/activeldap-6.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7283440d84d2da702ea70c7bed35312d
diff --git a/metadata/md5-cache/dev-ruby/activeldap-6.1.0 b/metadata/md5-cache/dev-ruby/activeldap-6.1.0
index aa2faee7641a..b59337879f83 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-6.1.0
+++ b/metadata/md5-cache/dev-ruby/activeldap-6.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/activeldap-6.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e3a6a95240da5348abd9bae1dd007b3e
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.2.6 b/metadata/md5-cache/dev-ruby/activemodel-5.2.6
index 184a96fa46fb..624c96ea6682 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.2.6
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6af5cf9939ef936cdb19bc53e13bdee4
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.0.4.1 b/metadata/md5-cache/dev-ruby/activemodel-6.0.4.1
index 31b94785f6ff..d31ff11e0dc3 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.0.4.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.1.tar.gz -> rails-6.0.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7c7da97bbd07207e2742c28732a7c523
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.1.4.1 b/metadata/md5-cache/dev-ruby/activemodel-6.1.4.1
index 9ee4fddb2ac9..460f531946b6 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.1.4.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.1.tar.gz -> rails-6.1.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ae6e7c5d5f40636f6b390c59002cffbe
diff --git a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r1 b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r1
index 98c64fae3ab8..1cebde807d49 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/rails/activemodel-serializers-xml/archive/v1.0.2.tar.gz -> activemodel-serializers-xml-1.0.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5fd4d328a40948de0e991b81170d8c84
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.2.6 b/metadata/md5-cache/dev-ruby/activerecord-5.2.6
index d33c079ccae5..1f0a61975d18 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-5.2.6
+++ b/metadata/md5-cache/dev-ruby/activerecord-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=39394ceded1e006ab138cb7098023786
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.0.4.1 b/metadata/md5-cache/dev-ruby/activerecord-6.0.4.1
index 6147b4eec069..74e5e774e69f 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.0.4.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.1.tar.gz -> rails-6.0.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ce87ea7eef40cdbfef42ccd4d0900308
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.1.4.1 b/metadata/md5-cache/dev-ruby/activerecord-6.1.4.1
index 6cb5a1a447a5..bf87ba0d7046 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.1.4.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.1.tar.gz -> rails-6.1.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8ddb330faea3a92eadb8fb17d9d7eb1e
diff --git a/metadata/md5-cache/dev-ruby/activestorage-5.2.6 b/metadata/md5-cache/dev-ruby/activestorage-5.2.6
index f231dcc0e3c9..d5673b0c9334 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-5.2.6
+++ b/metadata/md5-cache/dev-ruby/activestorage-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6970929ae3e71888b2b54dee32f8c593
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.4.1 b/metadata/md5-cache/dev-ruby/activestorage-6.0.4.1
index 33dfcf2b58b9..5514de6bb600 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.0.4.1
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.1.tar.gz -> rails-6.0.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5ea69aa7809722e9fdc8cee96ff3c2b5
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.1.4.1 b/metadata/md5-cache/dev-ruby/activestorage-6.1.4.1
index 40950a40b5bb..327b2f923d67 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.1.4.1
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.1.tar.gz -> rails-6.1.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0c5da959c15ed643ea4fb9400a88cd9
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.2.6 b/metadata/md5-cache/dev-ruby/activesupport-5.2.6
index b4e4f395d092..cd7a22ee5281 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.2.6
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3f9465ac66c41c10726f6bd2f051e9a9
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.4.1 b/metadata/md5-cache/dev-ruby/activesupport-6.0.4.1
index d5099e341046..f4ebe9532189 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.0.4.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.1.tar.gz -> rails-6.0.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f5b37d20dd09ece4c0cfd3527abae568
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.1.4.1 b/metadata/md5-cache/dev-ruby/activesupport-6.1.4.1
index 1f7edd5be67b..2330cc397d7c 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.1.4.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.1.tar.gz -> rails-6.1.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=344ca576301e2fcb90f626b008c4628c
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-1.0.1 b/metadata/md5-cache/dev-ruby/acts_as_list-1.0.1
index b256ec9a5178..8d4ef447722c 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-1.0.1
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/acts_as_list-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=abe5ca49cf38637bd6395a00bf29267e
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-1.0.3 b/metadata/md5-cache/dev-ruby/acts_as_list-1.0.3
index faed11ee7e93..f111d33c77a8 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-1.0.3
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-1.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/acts_as_list-1.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=abe5ca49cf38637bd6395a00bf29267e
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-1.0.4 b/metadata/md5-cache/dev-ruby/acts_as_list-1.0.4
index 575319ecef03..4b2fab5089e3 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-1.0.4
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-1.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/acts_as_list-1.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a389d032ff12c09274d47f66525e18b6
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.8.0 b/metadata/md5-cache/dev-ruby/addressable-2.8.0
index 6e6d2e76cf4a..5e7d16ce8b11 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.8.0
+++ b/metadata/md5-cache/dev-ruby/addressable-2.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/addressable-2.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b3f6dc4f8dc0cdca375df7c3ffd43863
diff --git a/metadata/md5-cache/dev-ruby/ae-1.8.2 b/metadata/md5-cache/dev-ruby/ae-1.8.2
index 6f3cf16c4905..fa8203877aa2 100644
--- a/metadata/md5-cache/dev-ruby/ae-1.8.2
+++ b/metadata/md5-cache/dev-ruby/ae-1.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ae-1.8.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=763d6d63431bb332bf77b6fb26753e4d
diff --git a/metadata/md5-cache/dev-ruby/afm-0.2.2 b/metadata/md5-cache/dev-ruby/afm-0.2.2
index 7917473a0b6b..a1b57cfe841f 100644
--- a/metadata/md5-cache/dev-ruby/afm-0.2.2
+++ b/metadata/md5-cache/dev-ruby/afm-0.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/afm-0.2.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7cc8bd023e5350dc78aec7424ce25783
diff --git a/metadata/md5-cache/dev-ruby/afm-0.2.2-r1 b/metadata/md5-cache/dev-ruby/afm-0.2.2-r1
index 577371c786e9..1f9632a5e1c1 100644
--- a/metadata/md5-cache/dev-ruby/afm-0.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/afm-0.2.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/afm-0.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6912652af0564c7f206988b451a4903d
diff --git a/metadata/md5-cache/dev-ruby/airbrussh-1.4.0 b/metadata/md5-cache/dev-ruby/airbrussh-1.4.0
index 8be7bc483862..a0d4be647cfa 100644
--- a/metadata/md5-cache/dev-ruby/airbrussh-1.4.0
+++ b/metadata/md5-cache/dev-ruby/airbrussh-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/mattbrictson/airbrussh/archive/v1.4.0.tar.gz -> airbrussh-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4f1122e2655f638f72db2481f19b5479
diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
index 84d1ff454730..63a643f90fa4 100644
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
+++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/allison-2.0.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4f5e11e9325caa91591b8fc5b7014530
diff --git a/metadata/md5-cache/dev-ruby/amatch-0.4.0 b/metadata/md5-cache/dev-ruby/amatch-0.4.0
index e1d0f34631ee..ed9e253df295 100644
--- a/metadata/md5-cache/dev-ruby/amatch-0.4.0
+++ b/metadata/md5-cache/dev-ruby/amatch-0.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/amatch-0.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0145deb42810fc2f9d5a9ec6cb8032db
diff --git a/metadata/md5-cache/dev-ruby/ammeter-1.1.5 b/metadata/md5-cache/dev-ruby/ammeter-1.1.5
index da84fa35a822..6143e20b9f94 100644
--- a/metadata/md5-cache/dev-ruby/ammeter-1.1.5
+++ b/metadata/md5-cache/dev-ruby/ammeter-1.1.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ammeter-1.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a0b96d28372809ba0375a59e8ddf59be
diff --git a/metadata/md5-cache/dev-ruby/amq-client-1.0.4 b/metadata/md5-cache/dev-ruby/amq-client-1.0.4
deleted file mode 100644
index 031a16155823..000000000000
--- a/metadata/md5-cache/dev-ruby/amq-client-1.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby26(-)] dev-ruby/eventmachine[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/evented-spec[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=A fully-featured, low-level AMQP 0.9.1 client
-EAPI=5
-HOMEPAGE=https://github.com/ruby-amqp/amq-client
-IUSE=test ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby26(-)] dev-ruby/eventmachine[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/amq-client-1.0.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b7af70b2353af798785bd50f257f8d1b
diff --git a/metadata/md5-cache/dev-ruby/amq-client-1.0.4-r1 b/metadata/md5-cache/dev-ruby/amq-client-1.0.4-r1
new file mode 100644
index 000000000000..9aa745b0437e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/amq-client-1.0.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby26(-)] dev-ruby/eventmachine[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby27(-)] dev-ruby/eventmachine[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/evented-spec[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/evented-spec[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A fully-featured, low-level AMQP 0.9.1 client
+EAPI=8
+HOMEPAGE=https://github.com/ruby-amqp/amq-client
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby26(-)] dev-ruby/eventmachine[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby27(-)] dev-ruby/eventmachine[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/amq-client-1.0.4.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4348c652deecd37eb10492e431cf477f
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-2.3.1 b/metadata/md5-cache/dev-ruby/amq-protocol-2.3.1
index ebdc1ac3be07..ae0dc08d6279 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-2.3.1
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-2.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/amq-protocol-2.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b3eda5bb11fd60a2de0a485fa204565b
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-2.3.2 b/metadata/md5-cache/dev-ruby/amq-protocol-2.3.2
index 9f12f64e9d0f..5a1eca928c42 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-2.3.2
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-2.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/amq-protocol-2.3.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f4bd455d6d0eda233c67d718b81f13a
diff --git a/metadata/md5-cache/dev-ruby/amqp-1.8.0 b/metadata/md5-cache/dev-ruby/amqp-1.8.0
deleted file mode 100644
index 4b0818c1a8b8..000000000000
--- a/metadata/md5-cache/dev-ruby/amqp-1.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/multi_json[ruby_targets_ruby26(-)] dev-ruby/evented-spec[ruby_targets_ruby26(-)] ) ) test? ( ruby_targets_ruby26? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby26(-)] >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=AMQP client implementation in Ruby/EventMachine
-EAPI=6
-HOMEPAGE=http://rubyamqp.info/
-IUSE=test ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby26(-)] >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=1.4
-SRC_URI=https://rubygems.org/gems/amqp-1.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=b837b75bd5559fa0ce13e5008d8d9ceb
diff --git a/metadata/md5-cache/dev-ruby/amqp-1.8.0-r1 b/metadata/md5-cache/dev-ruby/amqp-1.8.0-r1
new file mode 100644
index 000000000000..7168e69c380d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/amqp-1.8.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/multi_json[ruby_targets_ruby26(-)] dev-ruby/evented-spec[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/multi_json[ruby_targets_ruby27(-)] dev-ruby/evented-spec[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby26? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby26(-)] >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby27(-)] >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=AMQP client implementation in Ruby/EventMachine
+EAPI=8
+HOMEPAGE=http://rubyamqp.info/
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby26(-)] >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby27(-)] >=dev-ruby/amq-protocol-2.2.0:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=1.4
+SRC_URI=https://rubygems.org/gems/amqp-1.8.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f60933456188702deff23865bbb4dfc7
diff --git a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1 b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
index 09e94b60f9d0..e15b1e1fd632 100644
--- a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
+++ b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/annoy-0.5.6.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6664d58eab5497539be2c3087be2332d
diff --git a/metadata/md5-cache/dev-ruby/ansi-1.5.0 b/metadata/md5-cache/dev-ruby/ansi-1.5.0
index 46f6de59872d..472cfeed2d24 100644
--- a/metadata/md5-cache/dev-ruby/ansi-1.5.0
+++ b/metadata/md5-cache/dev-ruby/ansi-1.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ansi-1.5.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e9cc94850f1859f8cc66c409284e97fb
diff --git a/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1 b/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1
index e075f4c88be3..d78b25fcb685 100644
--- a/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/ansi-1.5.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ansi-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b739be77664c31368e99ba53dcd4cd2c
diff --git a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8 b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8
index ba0224654fcb..835937eca2a6 100644
--- a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8
+++ b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/halostatue/minitar/archive/v0.8.tar.gz -> archive-tar-minitar-0.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b93cc51785a2359648543e60a660beb
diff --git a/metadata/md5-cache/dev-ruby/arel-9.0.0 b/metadata/md5-cache/dev-ruby/arel-9.0.0
index e0a1d7d88bd7..632e44754c3b 100644
--- a/metadata/md5-cache/dev-ruby/arel-9.0.0
+++ b/metadata/md5-cache/dev-ruby/arel-9.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=9.0
 SRC_URI=https://github.com/rails/arel/archive/v9.0.0.tar.gz -> arel-9.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=157616a3bb65aff1dc0834f97e08daaa
diff --git a/metadata/md5-cache/dev-ruby/arel-helpers-2.12.0 b/metadata/md5-cache/dev-ruby/arel-helpers-2.12.0
index 8d13bf555aca..19998e844994 100644
--- a/metadata/md5-cache/dev-ruby/arel-helpers-2.12.0
+++ b/metadata/md5-cache/dev-ruby/arel-helpers-2.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/arel-helpers-2.12.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eb26f57ad7690ac0de73c316250bd305
diff --git a/metadata/md5-cache/dev-ruby/arel-helpers-2.12.1 b/metadata/md5-cache/dev-ruby/arel-helpers-2.12.1
index fbe96051418a..fd49a25f05ae 100644
--- a/metadata/md5-cache/dev-ruby/arel-helpers-2.12.1
+++ b/metadata/md5-cache/dev-ruby/arel-helpers-2.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/arel-helpers-2.12.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c6503f749a420d717eda6ba11010dad
diff --git a/metadata/md5-cache/dev-ruby/ascii85-1.0.3 b/metadata/md5-cache/dev-ruby/ascii85-1.0.3
index 9eb847a7aaa7..e2aff3727791 100644
--- a/metadata/md5-cache/dev-ruby/ascii85-1.0.3
+++ b/metadata/md5-cache/dev-ruby/ascii85-1.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/Ascii85-1.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07860a7673186d1562d08cb10fa0f1f7
diff --git a/metadata/md5-cache/dev-ruby/ascii85-1.1.0 b/metadata/md5-cache/dev-ruby/ascii85-1.1.0
index 433c67118166..0408e09fd5c3 100644
--- a/metadata/md5-cache/dev-ruby/ascii85-1.1.0
+++ b/metadata/md5-cache/dev-ruby/ascii85-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/Ascii85-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1cce87eded96959e38e0ff60d04a30e7
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.15 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.15
index 8f6e95369b41..6bcdfbc04cb7 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.15
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.15
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.15.tar.gz -> asciidoctor-2.0.15.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6a0c9ab36202bd8912218ad7e5b44867
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.16 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.16
index 0e50f36c2ce7..18ee820be3a6 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.16
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.16
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.16.tar.gz -> asciidoctor-2.0.16.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b9a73db256fe6d122b01a8a1b436cbad
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5 b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5
index 50ec131ddcb6..1504b598394a 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor-diagram/archive/v2.0.5.tar.gz -> asciidoctor-diagram-2.0.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a0e33da7516227030d618cedcdfce831
diff --git a/metadata/md5-cache/dev-ruby/asciimath-1.0.9 b/metadata/md5-cache/dev-ruby/asciimath-1.0.9
index c38486f18dd2..fbe1bc4f39ef 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-1.0.9
+++ b/metadata/md5-cache/dev-ruby/asciimath-1.0.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-1.0.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b0bafd90840842d302187198832836dd
diff --git a/metadata/md5-cache/dev-ruby/asciimath-2.0.0 b/metadata/md5-cache/dev-ruby/asciimath-2.0.0
index 274fb0880170..f787baf1e34d 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-2.0.0
+++ b/metadata/md5-cache/dev-ruby/asciimath-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=73b815922c5fa0720d202457a29132d9
diff --git a/metadata/md5-cache/dev-ruby/asciimath-2.0.1 b/metadata/md5-cache/dev-ruby/asciimath-2.0.1
index 53bf35ccdc81..2c9fe860ca64 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-2.0.1
+++ b/metadata/md5-cache/dev-ruby/asciimath-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1f8560af9427109153d9127a341533bb
diff --git a/metadata/md5-cache/dev-ruby/asciimath-2.0.2 b/metadata/md5-cache/dev-ruby/asciimath-2.0.2
index 66fbd2320020..5e6a037ecf2b 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-2.0.2
+++ b/metadata/md5-cache/dev-ruby/asciimath-2.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-2.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=feccc7da63b9d6a0cfbb6137f1baaace
diff --git a/metadata/md5-cache/dev-ruby/asciimath-2.0.3 b/metadata/md5-cache/dev-ruby/asciimath-2.0.3
index 093d81d07f26..9e7405e946ec 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-2.0.3
+++ b/metadata/md5-cache/dev-ruby/asciimath-2.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-2.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=00e96d60bcd53aec0ae865dbeee6119c
diff --git a/metadata/md5-cache/dev-ruby/ast-2.4.0 b/metadata/md5-cache/dev-ruby/ast-2.4.0
index 90b9f3b3881c..a0eae232c5e9 100644
--- a/metadata/md5-cache/dev-ruby/ast-2.4.0
+++ b/metadata/md5-cache/dev-ruby/ast-2.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ast-2.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=51e1b491567169d021f5886e0965ac4f
diff --git a/metadata/md5-cache/dev-ruby/ast-2.4.1 b/metadata/md5-cache/dev-ruby/ast-2.4.1
index 8ffa9aa79793..8388fb74ddb7 100644
--- a/metadata/md5-cache/dev-ruby/ast-2.4.1
+++ b/metadata/md5-cache/dev-ruby/ast-2.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/ast/archive/v2.4.1.tar.gz -> ast-2.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=39522b4d91884adaeb186ff7f9a62fad
diff --git a/metadata/md5-cache/dev-ruby/ast-2.4.2 b/metadata/md5-cache/dev-ruby/ast-2.4.2
index 4b5931ef5369..491bd3bcdfb6 100644
--- a/metadata/md5-cache/dev-ruby/ast-2.4.2
+++ b/metadata/md5-cache/dev-ruby/ast-2.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/ast/archive/v2.4.2.tar.gz -> ast-2.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f081b7ca9b3122cd06cf785f0b41492d
diff --git a/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0 b/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0
deleted file mode 100644
index faf477462c15..000000000000
--- a/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.6:5[ruby_targets_ruby26(-)] >=dev-ruby/eventmachine-0.12.11[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/rack-test[ruby_targets_ruby26(-)] ) ) test? ( ruby_targets_ruby26? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Asynchronous response API for Sinatra and Thin
-EAPI=6
-HOMEPAGE=https://github.com/raggi/async_sinatra
-IUSE=test ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/raggi/async_sinatra/archive/v1.3.0.tar.gz -> async_sinatra-1.3.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b94efc35ff74e45d52120021f82973a2
diff --git a/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0-r1 b/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0-r1
new file mode 100644
index 000000000000..b09ce8aff1de
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.6:5[ruby_targets_ruby26(-)] >=dev-ruby/eventmachine-0.12.11[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/rack-test[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.6:5[ruby_targets_ruby27(-)] >=dev-ruby/eventmachine-0.12.11[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/rack-test[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby26? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Asynchronous response API for Sinatra and Thin
+EAPI=8
+HOMEPAGE=https://github.com/raggi/async_sinatra
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-1.4.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/raggi/async_sinatra/archive/v1.3.0.tar.gz -> async_sinatra-1.3.0-git.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=30bb6fc6668b52e5e8f572a23a39cb30
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.101 b/metadata/md5-cache/dev-ruby/atomic-1.1.101
index 1010a3a59265..c41a7d31071e 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.101
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.101
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/atomic-1.1.101.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6caccc08197771c39b4bfa7783a9b79e
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.101-r1 b/metadata/md5-cache/dev-ruby/atomic-1.1.101-r1
index 580d0ec7f584..71fd84c3983f 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.101-r1
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.101-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/atomic-1.1.101.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d95d484325714f5a6222b77bc760e69b
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.5.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.5.0
deleted file mode 100644
index b85610d1f205..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( <dev-ruby/execjs-2.8.0:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/rspec-rails[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
-EAPI=7
-HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( <dev-ruby/execjs-2.8.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=10
-SRC_URI=https://github.com/ai/autoprefixer-rails/archive/10.2.5.0.tar.gz -> autoprefixer-rails-10.2.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cdfb8ebf2fa550270b26d801830d47a8
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.5.1 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.5.1
deleted file mode 100644
index 48b16cc224f8..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/execjs[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/execjs[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/rspec-rails[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/rspec-rails[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
-EAPI=7
-HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-ruby/execjs[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/execjs[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=10
-SRC_URI=https://github.com/ai/autoprefixer-rails/archive/10.2.5.1.tar.gz -> autoprefixer-rails-10.2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9693e09eb1134119d06529598062a352
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.3.1.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.3.1.0
index d39808f07657..c823ad63fd52 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.3.1.0
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.3.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=10
 SRC_URI=https://github.com/ai/autoprefixer-rails/archive/10.3.1.0.tar.gz -> autoprefixer-rails-10.3.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=09453092158ca280c75e92c2527cf90f
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5
index 1e93c8e2eab7..c874bbebde79 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=9
 SRC_URI=https://rubygems.org/gems/autoprefixer-rails-9.8.6.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=12c3e247e33c6eb20ae94a2afe66826f
diff --git a/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.0 b/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.0
index 61128231c0d5..7f2a34a7c79e 100644
--- a/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.0
+++ b/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-eventstream-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9c184443b5bdad44f97ca3369abc273b
diff --git a/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.1 b/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.1
index 10f4cfd832d1..b8d738260c5c 100644
--- a/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.1
+++ b/metadata/md5-cache/dev-ruby/aws-eventstream-1.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-eventstream-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6687f58965edb68cce41fa749d6da514
diff --git a/metadata/md5-cache/dev-ruby/aws-eventstream-1.2.0 b/metadata/md5-cache/dev-ruby/aws-eventstream-1.2.0
index 701d7412a900..7c2e5db630bb 100644
--- a/metadata/md5-cache/dev-ruby/aws-eventstream-1.2.0
+++ b/metadata/md5-cache/dev-ruby/aws-eventstream-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-eventstream-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=50dc9cbc5802ea3e52bc950266b04214
diff --git a/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0 b/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0
index dc3f43967138..dcf65b059f61 100644
--- a/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0
+++ b/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-partitions-1.297.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=90252676dd1761ed67b99228e01f57ad
diff --git a/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0 b/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0
index 2d7999e9a1ea..d06b34064243 100644
--- a/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0
+++ b/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-partitions-1.298.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=90252676dd1761ed67b99228e01f57ad
diff --git a/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0 b/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
index 0782bf5188eb..15977bfcbc85 100644
--- a/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
+++ b/metadata/md5-cache/dev-ruby/aws-partitions-1.370.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-partitions-1.370.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=449d47795834ca53ed7f616e69c53d58
diff --git a/metadata/md5-cache/dev-ruby/aws-s3-0.6.3 b/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
index 3db3b987e5c7..66e22dc752d5 100644
--- a/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
+++ b/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/aws-s3-0.6.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3a940c09eb4d72f1051b086371d572e6
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-2.11.488 b/metadata/md5-cache/dev-ruby/aws-sdk-2.11.488
index 1c20c8b41fe9..78bc529be3a7 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-2.11.488
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-2.11.488
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.11.488.tar.gz -> aws-sdk-ruby-2.11.488.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e112891746cf5589e768608be60634ea
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.11.488 b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.11.488
index ae4bfea3b378..b03ce90e5dd2 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.11.488
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.11.488
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.11.488.tar.gz -> aws-sdk-ruby-2.11.488.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=27ba17c94e52a7296c5b3e473510979e
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-3.94.0 b/metadata/md5-cache/dev-ruby/aws-sdk-core-3.94.0
index 9f335f44c716..bd81a68d319d 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-3.94.0
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-core-3.94.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/aws-sdk-core-3.94.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b89bd8bd0611b8fb6906c44b205d90c2
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488 b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488
index c687d6e97359..4bcd563980a5 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.11.488.tar.gz -> aws-sdk-ruby-2.11.488.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed4697db5d6fb27328bec27fb7101729
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3
index d493045b5cba..d43bba9548b0 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-sigv4-1.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6418bbff212124431dcf3f780f439b90
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.4 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.4
index e28f88d770ae..dc2b7ba7ab5c 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.4
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-sigv4-1.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=96446b0dcd68c3b497c1ee67cea6dd6b
diff --git a/metadata/md5-cache/dev-ruby/aws-sigv4-1.4.0 b/metadata/md5-cache/dev-ruby/aws-sigv4-1.4.0
index 8d81dc4f434f..8bdb9f0d1817 100644
--- a/metadata/md5-cache/dev-ruby/aws-sigv4-1.4.0
+++ b/metadata/md5-cache/dev-ruby/aws-sigv4-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/aws-sigv4-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=96446b0dcd68c3b497c1ee67cea6dd6b
diff --git a/metadata/md5-cache/dev-ruby/axiom-types-0.1.1 b/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
index a3daddba4820..97d92b89843b 100644
--- a/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
+++ b/metadata/md5-cache/dev-ruby/axiom-types-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/axiom-types-0.1.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b99f672ba45b99ac4cd488303388e134
diff --git a/metadata/md5-cache/dev-ruby/backports-3.20.2-r1 b/metadata/md5-cache/dev-ruby/backports-3.20.2-r1
index 211858435879..e83e42512293 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.20.2-r1
+++ b/metadata/md5-cache/dev-ruby/backports-3.20.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marcandre/backports/archive/v3.20.2.tar.gz -> backports-3.20.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=981c27aaf2462af8e78d842a672ee410
diff --git a/metadata/md5-cache/dev-ruby/backports-3.21.0 b/metadata/md5-cache/dev-ruby/backports-3.21.0
index eec91712f3a1..e10f60891c7c 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.21.0
+++ b/metadata/md5-cache/dev-ruby/backports-3.21.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marcandre/backports/archive/v3.21.0.tar.gz -> backports-3.21.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6c34d6e9c8d7f30f51e4a322ae28bb8
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
index 0852e1dc7e68..99a9f7374ff6 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bacon-1.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e6cd0db40ef73830a8a270e2c463214b
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r3 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r3
index e0b16e029a31..12456c662f4a 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r3
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bacon-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=49da83e787d818bd331dfb4cf77926e3
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.8 b/metadata/md5-cache/dev-ruby/barby-0.6.8
index b2d6331fa214..1fb1c1f63515 100644
--- a/metadata/md5-cache/dev-ruby/barby-0.6.8
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) prawn? ( test )
 SLOT=0
 SRC_URI=https://github.com/toretore/barby/archive/v0.6.8.tar.gz -> barby-0.6.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0ca5aa1890a31535de486d464744cb6e
diff --git a/metadata/md5-cache/dev-ruby/base32-0.3.2 b/metadata/md5-cache/dev-ruby/base32-0.3.2
index d090b1afea65..278005317281 100644
--- a/metadata/md5-cache/dev-ruby/base32-0.3.2
+++ b/metadata/md5-cache/dev-ruby/base32-0.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/base32-0.3.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=08881bc87f897f6fceef1212c25afe96
diff --git a/metadata/md5-cache/dev-ruby/base32-0.3.4 b/metadata/md5-cache/dev-ruby/base32-0.3.4
index ca54575bddc9..c4444cbde29f 100644
--- a/metadata/md5-cache/dev-ruby/base32-0.3.4
+++ b/metadata/md5-cache/dev-ruby/base32-0.3.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/base32-0.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2ad98d96169e9dd8fe48a448e1a8086
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.13 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.13
index 5929fcbf49aa..08b0eddc4fcd 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.13
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bcrypt-3.1.13.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b25bcf730a1a7e0277ad6dc64eac23cf
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.15 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.15
index 6c767b11f969..69a827eae952 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.15
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.15
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bcrypt-3.1.15.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0a61bf872ef6e650840a90682ab84025
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16
index 1334894d3fcb..6e0acb57d01c 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bcrypt-3.1.16.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cb2c00c52c7f765a05f7aa1c37b957f2
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r1 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r1
index 813e6999b36f..ed9a944da1ac 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r1
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.16-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bcrypt-3.1.16.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=610c3b372f384368c72831c7e290d4e4
diff --git a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1 b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1
index 6f4f4db4f937..967221a67da8 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/bcrypt_pbkdf-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1eee491df85f273c16d043ae14c42ee8
diff --git a/metadata/md5-cache/dev-ruby/best_in_place-3.1.1 b/metadata/md5-cache/dev-ruby/best_in_place-3.1.1
index ac042df7bed1..d25b151995e4 100644
--- a/metadata/md5-cache/dev-ruby/best_in_place-3.1.1
+++ b/metadata/md5-cache/dev-ruby/best_in_place-3.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/best_in_place-3.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=0b8a87fc7deedaadeed23215137bdf52
diff --git a/metadata/md5-cache/dev-ruby/bindata-2.4.10 b/metadata/md5-cache/dev-ruby/bindata-2.4.10
index df12af08b435..67d35b825ba8 100644
--- a/metadata/md5-cache/dev-ruby/bindata-2.4.10
+++ b/metadata/md5-cache/dev-ruby/bindata-2.4.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bindata-2.4.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=21f7c40d87a0bed9d38c5d7a4237c1a4
diff --git a/metadata/md5-cache/dev-ruby/bindex-0.8.1 b/metadata/md5-cache/dev-ruby/bindex-0.8.1
index 36bbf0f694f4..8c2950d626a0 100644
--- a/metadata/md5-cache/dev-ruby/bindex-0.8.1
+++ b/metadata/md5-cache/dev-ruby/bindex-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bindex-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07870d11e8c437f467ee00646de90bbe
diff --git a/metadata/md5-cache/dev-ruby/bindex-0.8.1-r1 b/metadata/md5-cache/dev-ruby/bindex-0.8.1-r1
index 2465fb357692..3d2f95ac96ef 100644
--- a/metadata/md5-cache/dev-ruby/bindex-0.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/bindex-0.8.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bindex-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=36c0767bb2dd6b4de8a6e54a0e71e792
diff --git a/metadata/md5-cache/dev-ruby/binding_of_caller-0.8.0 b/metadata/md5-cache/dev-ruby/binding_of_caller-0.8.0
index ec4d217e7016..ec59ec57308d 100644
--- a/metadata/md5-cache/dev-ruby/binding_of_caller-0.8.0
+++ b/metadata/md5-cache/dev-ruby/binding_of_caller-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/binding_of_caller-0.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6a021ba52947a797906d593feee4b375
diff --git a/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0 b/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0
index f13552a0fd5e..81eb6adbb982 100644
--- a/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0
+++ b/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/banister/binding_of_caller/archive/v1.0.0.tar.gz -> binding_of_caller-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4c447bb2908bfd9cb2964af2bea3040a
diff --git a/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1 b/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1
index 6f8fb9d08ec0..53459476463b 100644
--- a/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/binding_of_caller-1.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/banister/binding_of_caller/archive/v1.0.0.tar.gz -> binding_of_caller-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d55eb4e3260031446c3a822a589a5f15
diff --git a/metadata/md5-cache/dev-ruby/bit-struct-0.16 b/metadata/md5-cache/dev-ruby/bit-struct-0.16
index c730b35e2a2e..a794ee225ada 100644
--- a/metadata/md5-cache/dev-ruby/bit-struct-0.16
+++ b/metadata/md5-cache/dev-ruby/bit-struct-0.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bit-struct-0.16.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f2f38651d88302f3c7429b91143c905a
diff --git a/metadata/md5-cache/dev-ruby/bit-struct-0.17 b/metadata/md5-cache/dev-ruby/bit-struct-0.17
index e4c88fa34281..0dae23db526c 100644
--- a/metadata/md5-cache/dev-ruby/bit-struct-0.17
+++ b/metadata/md5-cache/dev-ruby/bit-struct-0.17
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bit-struct-0.17.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a17ca17abc713fbdf65e37418783f3b8
diff --git a/metadata/md5-cache/dev-ruby/blankslate-3.1.3 b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
index 0ee4fa1595ec..a55c80331ec7 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-3.1.3
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/blankslate-3.1.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eed2b20ba98f753e1287ded6d8717aca
diff --git a/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1 b/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
index ed0d2624e4e5..e09fee94e608 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/blankslate-3.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=172ba542be145cf2df6cf0a0fcad84b8
diff --git a/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901 b/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901
index 2bd9d31338c2..c815ec87ca69 100644
--- a/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901
+++ b/metadata/md5-cache/dev-ruby/blinkstick-1.0.1_p20150901
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/arvydas/blinkstick-ruby/archive/89e3f621132c2571d5f7c636b3962ff1b0a64564.tar.gz -> blinkstick-1.0.1_p20150901.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e8c1a65a1c7b94447ee7b3f6f14cd35
diff --git a/metadata/md5-cache/dev-ruby/bogus-0.1.6 b/metadata/md5-cache/dev-ruby/bogus-0.1.6
index 12d13315829c..9568e97087fe 100644
--- a/metadata/md5-cache/dev-ruby/bogus-0.1.6
+++ b/metadata/md5-cache/dev-ruby/bogus-0.1.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bogus-0.1.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=59c595f2f353eb045efdb540dd6c9a3d
diff --git a/metadata/md5-cache/dev-ruby/brass-1.2.1 b/metadata/md5-cache/dev-ruby/brass-1.2.1
index 198d6015f525..ea7f36cdc4da 100644
--- a/metadata/md5-cache/dev-ruby/brass-1.2.1
+++ b/metadata/md5-cache/dev-ruby/brass-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/brass-1.2.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=00b40061b8c9ea12f307267def46136a
diff --git a/metadata/md5-cache/dev-ruby/brotli-0.2.3 b/metadata/md5-cache/dev-ruby/brotli-0.2.3
index 83bae9c1765e..0f8f17d14e60 100644
--- a/metadata/md5-cache/dev-ruby/brotli-0.2.3
+++ b/metadata/md5-cache/dev-ruby/brotli-0.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/miyucy/brotli/archive/v0.2.3.tar.gz -> brotli-0.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7688b09b7ffef28c3f2f1eb750bb6a52
diff --git a/metadata/md5-cache/dev-ruby/brotli-0.4.0 b/metadata/md5-cache/dev-ruby/brotli-0.4.0
index 7db047423617..84ba2c081115 100644
--- a/metadata/md5-cache/dev-ruby/brotli-0.4.0
+++ b/metadata/md5-cache/dev-ruby/brotli-0.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/miyucy/brotli/archive/v0.4.0.tar.gz -> brotli-0.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7688b09b7ffef28c3f2f1eb750bb6a52
diff --git a/metadata/md5-cache/dev-ruby/brotli-0.4.0-r1 b/metadata/md5-cache/dev-ruby/brotli-0.4.0-r1
index b69aa2375d69..ef55b4de8f84 100644
--- a/metadata/md5-cache/dev-ruby/brotli-0.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/brotli-0.4.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/miyucy/brotli/archive/v0.4.0.tar.gz -> brotli-0.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3099c1bd8897ebe47d506b94cc052cd4
diff --git a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3 b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
index 756839f0f708..847b7ec280f4 100644
--- a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
+++ b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bsearch-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d97485df9fafbab66275bbc8d902611
diff --git a/metadata/md5-cache/dev-ruby/bson-4.10.0 b/metadata/md5-cache/dev-ruby/bson-4.10.0
index 89b2fde66b95..2a541e8357c3 100644
--- a/metadata/md5-cache/dev-ruby/bson-4.10.0
+++ b/metadata/md5-cache/dev-ruby/bson-4.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.10.0.tar.gz -> bson-4.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79705486afe465ee1180863aaca50841
diff --git a/metadata/md5-cache/dev-ruby/bson-4.12.0 b/metadata/md5-cache/dev-ruby/bson-4.12.0
index 4b300a110b32..67249ba5d549 100644
--- a/metadata/md5-cache/dev-ruby/bson-4.12.0
+++ b/metadata/md5-cache/dev-ruby/bson-4.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.12.0.tar.gz -> bson-4.12.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=abdd61a9a2a1333860f2db5fedea37a5
diff --git a/metadata/md5-cache/dev-ruby/bson-4.9.4 b/metadata/md5-cache/dev-ruby/bson-4.9.4
index 436987104c4d..191cb9f0d1c0 100644
--- a/metadata/md5-cache/dev-ruby/bson-4.9.4
+++ b/metadata/md5-cache/dev-ruby/bson-4.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.9.4.tar.gz -> bson-4.9.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79705486afe465ee1180863aaca50841
diff --git a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1 b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
index 65873ec08107..02951d6e22cf 100644
--- a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/buftok-0.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7496ecc40a3cfabc1f8f11890721cbcd
diff --git a/metadata/md5-cache/dev-ruby/buftok-0.3.0 b/metadata/md5-cache/dev-ruby/buftok-0.3.0
index d6a349b0a6e3..edff27ab2571 100644
--- a/metadata/md5-cache/dev-ruby/buftok-0.3.0
+++ b/metadata/md5-cache/dev-ruby/buftok-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sferik/buftok/archive/v0.3.0.tar.gz -> buftok-0.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=43f7405165ebc6a3c43252ecf62e284b
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.4 b/metadata/md5-cache/dev-ruby/builder-3.2.4
index c5bba8360250..d4b9ddd847df 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.4
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.2
 SRC_URI=https://rubygems.org/gems/builder-3.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3063ed78578972e78c45e8fe776bace
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.1.4 b/metadata/md5-cache/dev-ruby/bundler-2.1.4
index 0b13c6416e42..f83e625b28dd 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.1.4
+++ b/metadata/md5-cache/dev-ruby/bundler-2.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed0691f5beb053e0ceec368550b02e99
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.17 b/metadata/md5-cache/dev-ruby/bundler-2.2.17
index d94cfad1f656..589dcb2cde7e 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.17
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.17
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.17.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20da7c0bf440cd7987dda03753c57a93
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.18 b/metadata/md5-cache/dev-ruby/bundler-2.2.18
index 12fb89dd845f..ef62b455dba4 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.18
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.18
@@ -5,12 +5,12 @@ DESCRIPTION=An easy way to vendor gem dependencies
 EAPI=7
 HOMEPAGE=https://github.com/carlhuda/bundler
 IUSE=+doc test test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~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 ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.18.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=20da7c0bf440cd7987dda03753c57a93
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b744f9146e12cf32f88ad918ee35af9b
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.19 b/metadata/md5-cache/dev-ruby/bundler-2.2.19
index 951036ecd888..0f728c036154 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.19
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.19
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.19.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20da7c0bf440cd7987dda03753c57a93
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.20 b/metadata/md5-cache/dev-ruby/bundler-2.2.20
index 08712d2447de..b3c8bd8616e8 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.20
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.20
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.20.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20da7c0bf440cd7987dda03753c57a93
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.21 b/metadata/md5-cache/dev-ruby/bundler-2.2.21
index 8a0f3fd7e6de..c4a550eae919 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.21
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.21
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.21.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3f1601f88ea393f7f5390df3632a030a
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.24 b/metadata/md5-cache/dev-ruby/bundler-2.2.24
index 0c791d04a8e3..7a8695cfe54b 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.24
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.24
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.24.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc6d88928b859de1a74a9e6b034360a7
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.25 b/metadata/md5-cache/dev-ruby/bundler-2.2.25
index 08091a14bb51..5287df225d4b 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.2.25
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.25
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.2.25.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc6d88928b859de1a74a9e6b034360a7
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.8.0 b/metadata/md5-cache/dev-ruby/bundler-audit-0.8.0
index 912307a9333f..c7f9d5ba0e4e 100644
--- a/metadata/md5-cache/dev-ruby/bundler-audit-0.8.0
+++ b/metadata/md5-cache/dev-ruby/bundler-audit-0.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bundler-audit-0.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=049305a657a468961c284607c6b87ade
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.16.1 b/metadata/md5-cache/dev-ruby/bunny-2.16.1
index 69d43be9a326..9b104642db43 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.16.1
+++ b/metadata/md5-cache/dev-ruby/bunny-2.16.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bunny-2.16.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=592a6e5085246a75237cc06fbae15048
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.17.0 b/metadata/md5-cache/dev-ruby/bunny-2.17.0
index 61df7b1186e0..abe1506fa680 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.17.0
+++ b/metadata/md5-cache/dev-ruby/bunny-2.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bunny-2.17.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=592a6e5085246a75237cc06fbae15048
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.19.0 b/metadata/md5-cache/dev-ruby/bunny-2.19.0
index c6e3b31eef40..50c601457be1 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.19.0
+++ b/metadata/md5-cache/dev-ruby/bunny-2.19.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-amqp/bunny/archive/2.19.0.tar.gz -> bunny-2.19.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b15c420e09fc180f75ce3c56b3445b56
diff --git a/metadata/md5-cache/dev-ruby/c21e-1.2.1 b/metadata/md5-cache/dev-ruby/c21e-1.2.1
index 7d471dd7d15d..582d810e157b 100644
--- a/metadata/md5-cache/dev-ruby/c21e-1.2.1
+++ b/metadata/md5-cache/dev-ruby/c21e-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/c21e-1.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9717be0a0a6702534e6caa56c45b5061
diff --git a/metadata/md5-cache/dev-ruby/c21e-2.0.0 b/metadata/md5-cache/dev-ruby/c21e-2.0.0
index 4d0e0226f3e4..8a47d8366996 100644
--- a/metadata/md5-cache/dev-ruby/c21e-2.0.0
+++ b/metadata/md5-cache/dev-ruby/c21e-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/c21e-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0077cde892ca93615f6f62c100cc2d0a
diff --git a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2 b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
index 5a868af8846e..530b66ed2d37 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/capistrano-2.15.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=75e441607bbc56c6c0a2ec8bb75b6fe5
diff --git a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3 b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3
index 932f1811ba57..0ff9e74d739f 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/capistrano-2.15.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7ef59e2e06f2c172b9db01405afc85c4
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.16.0 b/metadata/md5-cache/dev-ruby/capistrano-3.16.0
index 6ad964126ab6..eaecb474d24e 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-3.16.0
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capistrano-3.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7514fdb6dc49300e69eb520d68e09a97
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.34.0 b/metadata/md5-cache/dev-ruby/capybara-3.34.0
index 0d821758a015..1df3425cd5ed 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.34.0
+++ b/metadata/md5-cache/dev-ruby/capybara-3.34.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.34.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=05a85f09ef910f657dee1184f4c4478c
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.35.0 b/metadata/md5-cache/dev-ruby/capybara-3.35.0
index d8f097577aa5..651defbe1916 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.35.0
+++ b/metadata/md5-cache/dev-ruby/capybara-3.35.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.35.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=117c408d91ba81cdc1da025b9a80cdf3
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.35.1 b/metadata/md5-cache/dev-ruby/capybara-3.35.1
index 7a6f19469087..4f07d0138cbb 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.35.1
+++ b/metadata/md5-cache/dev-ruby/capybara-3.35.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.35.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=117c408d91ba81cdc1da025b9a80cdf3
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.35.3 b/metadata/md5-cache/dev-ruby/capybara-3.35.3
index da0b119788e8..b7c203c82a54 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.35.3
+++ b/metadata/md5-cache/dev-ruby/capybara-3.35.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/capybara-3.35.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=99b4d745bb1022b9bd2a0e33e932ee5e
diff --git a/metadata/md5-cache/dev-ruby/certificate_authority-1.0.0 b/metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
index 4419214efa0d..ade37da0962b 100644
--- a/metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
+++ b/metadata/md5-cache/dev-ruby/certificate_authority-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cchandler/certificate_authority/archive/v1.0.0.tar.gz -> certificate_authority-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be0ea14226b463da3de9fd4b1a1f2114
diff --git a/metadata/md5-cache/dev-ruby/certified-1.0.0 b/metadata/md5-cache/dev-ruby/certified-1.0.0
index c8229f49442f..7da32c97fc18 100644
--- a/metadata/md5-cache/dev-ruby/certified-1.0.0
+++ b/metadata/md5-cache/dev-ruby/certified-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/certified-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d663a75cc7195a9315608c3bcd6da354
diff --git a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7 b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7
index 47fcb770818d..013de672932f 100644
--- a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7
+++ b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brianmario/charlock_holmes/archive/v0.7.7.tar.gz -> charlock_holmes-0.7.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=877e26f8c23a863261b475ced20cddb6
diff --git a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1 b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
index dcd1b172b0f6..a44925dccc4d 100644
--- a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/carllerche/childlabor/archive/6518b939dddbad20c7f05aa075d76e3ca6e70447.tar.gz -> childlabor-0.0.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=18bb3c96395f6b230bce9d588be37b87
diff --git a/metadata/md5-cache/dev-ruby/childprocess-3.0.0 b/metadata/md5-cache/dev-ruby/childprocess-3.0.0
index e9f55773b7bb..b2000d956de0 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-3.0.0
+++ b/metadata/md5-cache/dev-ruby/childprocess-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/childprocess-3.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d079a96b9bd825c31cd4ece7afc3d3ea
diff --git a/metadata/md5-cache/dev-ruby/childprocess-4.0.0 b/metadata/md5-cache/dev-ruby/childprocess-4.0.0
index ca134187b9df..e333778a6b1d 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-4.0.0
+++ b/metadata/md5-cache/dev-ruby/childprocess-4.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/childprocess-4.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b2511c89818a146ce84aa9c27b359ee
diff --git a/metadata/md5-cache/dev-ruby/childprocess-4.1.0 b/metadata/md5-cache/dev-ruby/childprocess-4.1.0
index 41eef1c1cdad..626ad4a92edb 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-4.1.0
+++ b/metadata/md5-cache/dev-ruby/childprocess-4.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/childprocess-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=107bf851ba80a9bfb3234fca2102752b
diff --git a/metadata/md5-cache/dev-ruby/chronic-0.10.2 b/metadata/md5-cache/dev-ruby/chronic-0.10.2
index 18918f0f9ab6..50aa6af998f7 100644
--- a/metadata/md5-cache/dev-ruby/chronic-0.10.2
+++ b/metadata/md5-cache/dev-ruby/chronic-0.10.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/chronic-0.10.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f9583a86d55f21656782961d34bfa66a
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.14 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.14
index dbbdc51c7931..55abe1fb940a 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.14
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.3.14
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/chunky_png-1.3.14.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95febf380b3039bcfdc60bb639689acc
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.15 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.15
index 5da4b0c28751..d38d2613aad1 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.15
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.3.15
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/chunky_png-1.3.15.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95febf380b3039bcfdc60bb639689acc
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.4.0 b/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
index c02cbd99de31..9f8fa6231dd7 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/chunky_png-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d1e0ca7ab7fcd96eb88ebed32cddd37a
diff --git a/metadata/md5-cache/dev-ruby/cinch-2.3.4 b/metadata/md5-cache/dev-ruby/cinch-2.3.4
index 9a4fa40cbd32..9f595eb6d6c3 100644
--- a/metadata/md5-cache/dev-ruby/cinch-2.3.4
+++ b/metadata/md5-cache/dev-ruby/cinch-2.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cinch-2.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=61484bc5941103f2c3927e13a9460347
diff --git a/metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0 b/metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0
index 551f5c55070a..bbb488a5e941 100644
--- a/metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0
+++ b/metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/classifier-reborn/archive/v2.2.0.tar.gz -> classifier-reborn-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d0b44f34e45109e87ace7ed1ef7438f8
diff --git a/metadata/md5-cache/dev-ruby/climate_control-0.2.0 b/metadata/md5-cache/dev-ruby/climate_control-0.2.0
index 4878bf2d7f76..712838ea98b4 100644
--- a/metadata/md5-cache/dev-ruby/climate_control-0.2.0
+++ b/metadata/md5-cache/dev-ruby/climate_control-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/climate_control-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0fee330e349709e77ec8f16c9d84ff05
diff --git a/metadata/md5-cache/dev-ruby/cliver-0.3.2 b/metadata/md5-cache/dev-ruby/cliver-0.3.2
index 218b7d0adad1..2ff94380ca44 100644
--- a/metadata/md5-cache/dev-ruby/cliver-0.3.2
+++ b/metadata/md5-cache/dev-ruby/cliver-0.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cliver-0.3.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a75893d1e360fd7dc5ec1dc2a9eb3573
diff --git a/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1 b/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
index 0a6edab58307..822da1606158 100644
--- a/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yaauie/cliver/archive/3d72e99af19c273a3f88adcd4b96c4b65b1b6d4b.tar.gz -> cliver-0.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b4a5876eef3d1e8f142e7741263dd672
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-3.0.6 b/metadata/md5-cache/dev-ruby/cmdparse-3.0.6
index 4fc3367a7d52..1f806f50d283 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-3.0.6
+++ b/metadata/md5-cache/dev-ruby/cmdparse-3.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/cmdparse-3.0.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=da6d138d47a4e9a659f6806434c56c04
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-3.0.7 b/metadata/md5-cache/dev-ruby/cmdparse-3.0.7
index c8439f66daa7..9807db419cde 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-3.0.7
+++ b/metadata/md5-cache/dev-ruby/cmdparse-3.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/cmdparse-3.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=665cc636b8945097714b47fe8237ed54
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.2 b/metadata/md5-cache/dev-ruby/coderay-1.1.2
index 63e81408dc04..4531d3417536 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.2
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.2.tar.gz -> coderay-1.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=480c8b0df3d3f53635db0a1f1caa03b2
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.3-r1 b/metadata/md5-cache/dev-ruby/coderay-1.1.3-r1
index ca1cdcc9facf..0e33af712bf5 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.3-r1
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.3.tar.gz -> coderay-1.1.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4494e3f5fd666bfd58272c428b6e7721
diff --git a/metadata/md5-cache/dev-ruby/coercible-1.0.0 b/metadata/md5-cache/dev-ruby/coercible-1.0.0
index dbc436ece6cb..831ccecced02 100644
--- a/metadata/md5-cache/dev-ruby/coercible-1.0.0
+++ b/metadata/md5-cache/dev-ruby/coercible-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/coercible-1.0.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c53e72b88232e68ae93594658c1d7adb
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1 b/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1
index 2f0b34749c3a..75087ad424e8 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-5.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.0
 SRC_URI=https://github.com/rails/coffee-rails/archive/v5.0.0.tar.gz -> coffee-rails-5.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c732feb8b2181048576bd3bcc517c913
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1 b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
index eecf2bbed506..791f45547191 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/coffee-script-2.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f727c00304556460be05230cf08c66fc
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
index 5c299a50c1db..26c873a88485 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/coffee-script-source-1.12.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=55823d339c66d9f0a442773b8cae2d48
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
index f79ab1e96c44..e6930c168795 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/coffee-script-source-1.12.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79cef212cb0e764ad4e251ff7ad5f096
diff --git a/metadata/md5-cache/dev-ruby/color-1.8 b/metadata/md5-cache/dev-ruby/color-1.8
index 48e61a5dfc97..514afa2baabc 100644
--- a/metadata/md5-cache/dev-ruby/color-1.8
+++ b/metadata/md5-cache/dev-ruby/color-1.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/halostatue/color/archive/v1.8.tar.gz -> color-1.8.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=74f3fe0f7bb124d882cafa34b383c0eb
diff --git a/metadata/md5-cache/dev-ruby/colorator-1.1.0 b/metadata/md5-cache/dev-ruby/colorator-1.1.0
index 6b0378b64ce6..74054b9ebfbc 100644
--- a/metadata/md5-cache/dev-ruby/colorator-1.1.0
+++ b/metadata/md5-cache/dev-ruby/colorator-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octopress/colorator/archive/v1.1.0.tar.gz -> colorator-1.1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1744fbb0765ead41a8919bd515d14aa3
diff --git a/metadata/md5-cache/dev-ruby/colored-1.2 b/metadata/md5-cache/dev-ruby/colored-1.2
index a35f08ca7520..2a85a4e40235 100644
--- a/metadata/md5-cache/dev-ruby/colored-1.2
+++ b/metadata/md5-cache/dev-ruby/colored-1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/colored-1.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=58c15157bff5a76965a8d95cf6e0f17f
diff --git a/metadata/md5-cache/dev-ruby/colored-1.2-r1 b/metadata/md5-cache/dev-ruby/colored-1.2-r1
index de8487216cfa..23285294a011 100644
--- a/metadata/md5-cache/dev-ruby/colored-1.2-r1
+++ b/metadata/md5-cache/dev-ruby/colored-1.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/colored-1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d71eda6511558b911394a2a4cef754e
diff --git a/metadata/md5-cache/dev-ruby/colored2-3.1.2 b/metadata/md5-cache/dev-ruby/colored2-3.1.2
index b065c5ab3375..269957726ab4 100644
--- a/metadata/md5-cache/dev-ruby/colored2-3.1.2
+++ b/metadata/md5-cache/dev-ruby/colored2-3.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/colored2-3.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee7ccd2b7b3c1f4935ca038c38732f1f
diff --git a/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1 b/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
index c87fa69c4c25..36a2d764871a 100644
--- a/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/colorize-0.8.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/colorize-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c5e85a9f47b75358c0bfb4de5962a7e
diff --git a/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1 b/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
index 5786580372d2..fe11d221e8f4 100644
--- a/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
+++ b/metadata/md5-cache/dev-ruby/columnize-0.9.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/columnize-0.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=495fabdf70145aaed275dd5e7d6d727a
diff --git a/metadata/md5-cache/dev-ruby/combustion-1.3.0 b/metadata/md5-cache/dev-ruby/combustion-1.3.0
index af870fc6cfd8..4c5f01868463 100644
--- a/metadata/md5-cache/dev-ruby/combustion-1.3.0
+++ b/metadata/md5-cache/dev-ruby/combustion-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/combustion-1.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db86248cf0ed4a6d90c83745d4637515
diff --git a/metadata/md5-cache/dev-ruby/combustion-1.3.1 b/metadata/md5-cache/dev-ruby/combustion-1.3.1
index 1057d1d3048d..6df0a1769993 100644
--- a/metadata/md5-cache/dev-ruby/combustion-1.3.1
+++ b/metadata/md5-cache/dev-ruby/combustion-1.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/combustion-1.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db86248cf0ed4a6d90c83745d4637515
diff --git a/metadata/md5-cache/dev-ruby/combustion-1.3.2 b/metadata/md5-cache/dev-ruby/combustion-1.3.2
index 58c53d8347ac..e45d80ecfd6a 100644
--- a/metadata/md5-cache/dev-ruby/combustion-1.3.2
+++ b/metadata/md5-cache/dev-ruby/combustion-1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/combustion-1.3.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=77394421606ccc6b3791b21a48ca8d39
diff --git a/metadata/md5-cache/dev-ruby/combustion-1.3.3 b/metadata/md5-cache/dev-ruby/combustion-1.3.3
new file mode 100644
index 000000000000..d8b87657e0d1
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/combustion-1.3.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby26(-)] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby26(-)] >=dev-ruby/thor-0.14.6:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.14.6:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Elegant Rails Engine Testing
+EAPI=8
+HOMEPAGE=https://github.com/pat/combustion
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby26(-)] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby26(-)] >=dev-ruby/thor-0.14.6:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/railties-3.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.14.6:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/combustion-1.3.3.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=77394421606ccc6b3791b21a48ca8d39
diff --git a/metadata/md5-cache/dev-ruby/commander-4.5.2 b/metadata/md5-cache/dev-ruby/commander-4.5.2
index d2c9c989edb2..7e9cb9dae674 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.5.2
+++ b/metadata/md5-cache/dev-ruby/commander-4.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/commander-4.5.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=61e3875443a7d1268a2020cb5c171f7f
diff --git a/metadata/md5-cache/dev-ruby/commander-4.6.0 b/metadata/md5-cache/dev-ruby/commander-4.6.0
index b976871a51e8..45726db3815f 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.6.0
+++ b/metadata/md5-cache/dev-ruby/commander-4.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/commander-4.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c0b312de2b01b547bd1ee4490dcc347
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
index 446358f26054..2e39218374c9 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.0.5.tar.gz -> concurrent-ruby-1.0.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=89956a71aac36ba9dd33e2a165ff292e
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.7 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.7
index fd57a5eb3a86..ccc0b84c3c0d 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.7
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.1.7.tar.gz -> concurrent-ruby-1.1.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=44560f95ec88484df1e9ec57d6b48ac8
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.8 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.8
index 41a47350cddb..29b346e07118 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.8
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.1.8.tar.gz -> concurrent-ruby-1.1.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a1ab06871243a4d7b5dd4cfef73a96e0
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9
index fe5e0334fcec..2bc524b43caa 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.1.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.1.9.tar.gz -> concurrent-ruby-1.1.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8d4488c2879d8a1e512e2563559c5f57
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.2 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.2
index 92636b8d959c..8a6995fad0a9 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.2
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/connection_pool-2.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a38ff7e69879bd82e2ae488e457416c8
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.3 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.3
index cd73b48bb6be..a80fb3512e8d 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.3
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/connection_pool-2.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa84e7211ba3f062c84fa2397bb43aeb
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.4 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.4
index 8aa20050cc30..60c6ba313754 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.4
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/connection_pool-2.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa84e7211ba3f062c84fa2397bb43aeb
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.5 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.5
index 743f601994d3..3c04a1be26d2 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.5
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/connection_pool-2.2.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa84e7211ba3f062c84fa2397bb43aeb
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.16.0 b/metadata/md5-cache/dev-ruby/contracts-0.16.0
index 24ecad8d799a..97917d2012a4 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.16.0
+++ b/metadata/md5-cache/dev-ruby/contracts-0.16.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/contracts-0.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cef2e60aee1a747a6d74cf22ebbe964b
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.16.1 b/metadata/md5-cache/dev-ruby/contracts-0.16.1
index cd7a86f9f49e..421b55177a47 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.16.1
+++ b/metadata/md5-cache/dev-ruby/contracts-0.16.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/contracts-0.16.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e67396e860ad6147f30f157c9ac405dc
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.17 b/metadata/md5-cache/dev-ruby/contracts-0.17
index e75334b318db..8dcc5d27aec9 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.17
+++ b/metadata/md5-cache/dev-ruby/contracts-0.17
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.17
 SRC_URI=https://rubygems.org/gems/contracts-0.17.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=840fde2dd81a71073cd85e75fcae0829
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.6.0 b/metadata/md5-cache/dev-ruby/coolio-1.6.0
index d75a91133b99..92302ab88e0f 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.6.0
+++ b/metadata/md5-cache/dev-ruby/coolio-1.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cool.io-1.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e716147bcafbaff72c9c3969067153e3
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.7.0 b/metadata/md5-cache/dev-ruby/coolio-1.7.0
index a07d08c683f3..d862c55f5ab5 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.7.0
+++ b/metadata/md5-cache/dev-ruby/coolio-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cool.io-1.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=40dc4a547375da0e08a88766b9a1fc0f
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.7.1 b/metadata/md5-cache/dev-ruby/coolio-1.7.1
index 9ccb3dc624df..93acd459b8b9 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.7.1
+++ b/metadata/md5-cache/dev-ruby/coolio-1.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cool.io-1.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a3ba86c949826facf6fdc564d9c1090d
diff --git a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1 b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
index 2272678a944e..db7ad9c5e73e 100644
--- a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/countdownlatch-1.0.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2a97b1cc7e61c82964ab49888d5396ac
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.3-r2 b/metadata/md5-cache/dev-ruby/crack-0.4.3-r2
deleted file mode 100644
index 12856605b080..000000000000
--- a/metadata/md5-cache/dev-ruby/crack-0.4.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) test? ( ruby_targets_ruby26? ( >=dev-ruby/safe_yaml-1.0.4-r4[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Really simple JSON and XML parsing, ripped from Merb and Rails
-EAPI=6
-HOMEPAGE=https://github.com/jnunemaker/crack
-IUSE=test ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/safe_yaml-1.0.4-r4[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/crack-0.4.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=707862cdbc1c46ebd00dd8b9854cff26
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.4 b/metadata/md5-cache/dev-ruby/crack-0.4.4
index 2e812f861dd7..29edb032b2e0 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.4
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnunemaker/crack/archive/v0.4.4.tar.gz -> crack-0.4.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e71df6e3b28a6ef3965fe17027d78d4c
diff --git a/metadata/md5-cache/dev-ruby/crass-1.0.6 b/metadata/md5-cache/dev-ruby/crass-1.0.6
index b28c3918af3b..7594af1c4bcf 100644
--- a/metadata/md5-cache/dev-ruby/crass-1.0.6
+++ b/metadata/md5-cache/dev-ruby/crass-1.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rgrove/crass/archive/v1.0.6.tar.gz -> crass-1.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e282adb0525d5791b829a83ceb7a9730
diff --git a/metadata/md5-cache/dev-ruby/creole-0.5.0 b/metadata/md5-cache/dev-ruby/creole-0.5.0
index 5e9ff8613008..c5ba11203a42 100644
--- a/metadata/md5-cache/dev-ruby/creole-0.5.0
+++ b/metadata/md5-cache/dev-ruby/creole-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/creole/archive/v0.5.0.tar.gz -> creole-0.5.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bb56825115b4e3df9fb587c2ba164a06
diff --git a/metadata/md5-cache/dev-ruby/creole-0.5.0-r1 b/metadata/md5-cache/dev-ruby/creole-0.5.0-r1
index 768484b0cd94..ede2b2bf199a 100644
--- a/metadata/md5-cache/dev-ruby/creole-0.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/creole-0.5.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/creole/archive/v0.5.0.tar.gz -> creole-0.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d27440a28ff07e4bf4825119976946f5
diff --git a/metadata/md5-cache/dev-ruby/cri-2.15.10 b/metadata/md5-cache/dev-ruby/cri-2.15.10
index 488979b167b5..14f737b305e3 100644
--- a/metadata/md5-cache/dev-ruby/cri-2.15.10
+++ b/metadata/md5-cache/dev-ruby/cri-2.15.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cri-2.15.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=59a8acc51518c5b466c25cd9f334a888
diff --git a/metadata/md5-cache/dev-ruby/cri-2.15.11 b/metadata/md5-cache/dev-ruby/cri-2.15.11
index 3d785f8d763c..8a8d86b442f9 100644
--- a/metadata/md5-cache/dev-ruby/cri-2.15.11
+++ b/metadata/md5-cache/dev-ruby/cri-2.15.11
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cri-2.15.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5883b85ef1c62a9ecfa83dfda164b0c6
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.10.0 b/metadata/md5-cache/dev-ruby/css_parser-1.10.0
index ad6d25dc6f5b..ada88018565e 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.10.0
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.10.0.tar.gz -> css_parser-1.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a27a693fc987f6290f83b19104261a5e
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.7.1 b/metadata/md5-cache/dev-ruby/css_parser-1.7.1
index e7f9173c9250..99a70e4d3154 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.7.1
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.7.1.tar.gz -> css_parser-1.7.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=157314cc40e7a95ed2b723b1398a4f65
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.9.0 b/metadata/md5-cache/dev-ruby/css_parser-1.9.0
index 760774f9b3a1..e3a1b859a7e2 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.9.0
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.9.0.tar.gz -> css_parser-1.9.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=28bc29f803016e341023e018e4873d36
diff --git a/metadata/md5-cache/dev-ruby/csv-3.2.0 b/metadata/md5-cache/dev-ruby/csv-3.2.0
index a5fafc974a41..80ae2b8ae6ce 100644
--- a/metadata/md5-cache/dev-ruby/csv-3.2.0
+++ b/metadata/md5-cache/dev-ruby/csv-3.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/csv/archive/v3.2.0.tar.gz -> csv-3.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d81a8e0e444321c1ce38fed1825b339d
diff --git a/metadata/md5-cache/dev-ruby/curb-0.9.10 b/metadata/md5-cache/dev-ruby/curb-0.9.10
index b7088c9a40af..d542de94cf7f 100644
--- a/metadata/md5-cache/dev-ruby/curb-0.9.10
+++ b/metadata/md5-cache/dev-ruby/curb-0.9.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/curb-0.9.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6769835981f62adc90eb35ce2339b30
diff --git a/metadata/md5-cache/dev-ruby/curb-0.9.11 b/metadata/md5-cache/dev-ruby/curb-0.9.11
index fbe542f08641..33a6279658b7 100644
--- a/metadata/md5-cache/dev-ruby/curb-0.9.11
+++ b/metadata/md5-cache/dev-ruby/curb-0.9.11
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/curb-0.9.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3212294dd02233b595fa3ea08471f14b
diff --git a/metadata/md5-cache/dev-ruby/curb-0.9.11-r1 b/metadata/md5-cache/dev-ruby/curb-0.9.11-r1
index 1c8fdd91cb1f..2b9d3d6c11c3 100644
--- a/metadata/md5-cache/dev-ruby/curb-0.9.11-r1
+++ b/metadata/md5-cache/dev-ruby/curb-0.9.11-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/curb-0.9.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e44219b0455d8f035a275757d092a54
diff --git a/metadata/md5-cache/dev-ruby/curses-1.3.2 b/metadata/md5-cache/dev-ruby/curses-1.3.2
index e7f8f209c4f3..a846b683a437 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.3.2
+++ b/metadata/md5-cache/dev-ruby/curses-1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/curses-1.3.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=533a158144b50293ec706542d30d0e10
diff --git a/metadata/md5-cache/dev-ruby/curses-1.4.0 b/metadata/md5-cache/dev-ruby/curses-1.4.0
index eba06c138839..54ab1eecb4fc 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.4.0
+++ b/metadata/md5-cache/dev-ruby/curses-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/curses-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=533a158144b50293ec706542d30d0e10
diff --git a/metadata/md5-cache/dev-ruby/curses-1.4.1 b/metadata/md5-cache/dev-ruby/curses-1.4.1
index b3cb9147d2f2..1d663bae906c 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.4.1
+++ b/metadata/md5-cache/dev-ruby/curses-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/curses-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5c28af1ddb2f0c4d121ac109860082c3
diff --git a/metadata/md5-cache/dev-ruby/curses-1.4.2 b/metadata/md5-cache/dev-ruby/curses-1.4.2
index 58475e08b892..e3fa8e2e078e 100644
--- a/metadata/md5-cache/dev-ruby/curses-1.4.2
+++ b/metadata/md5-cache/dev-ruby/curses-1.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/curses-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5c28af1ddb2f0c4d121ac109860082c3
diff --git a/metadata/md5-cache/dev-ruby/d3_rails-4.1.1 b/metadata/md5-cache/dev-ruby/d3_rails-4.1.1
index ddba63116b58..02fb01615b62 100644
--- a/metadata/md5-cache/dev-ruby/d3_rails-4.1.1
+++ b/metadata/md5-cache/dev-ruby/d3_rails-4.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/d3_rails-4.1.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=df5b90611e68f0c5e93e466329f9881f
diff --git a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1 b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
index 29e0711b64f7..c727dc58cec7 100644
--- a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/daemon_controller-1.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4ca1a7fd3a12aec5d628b2db6ab75d2d
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.3.1 b/metadata/md5-cache/dev-ruby/daemons-1.3.1
index 584dd03cbb90..a7cb69d7919a 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.3.1
+++ b/metadata/md5-cache/dev-ruby/daemons-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.3.1.tar.gz -> daemons-1.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9fdc7239f69e4108f1a153f607c9645b
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.4.0 b/metadata/md5-cache/dev-ruby/daemons-1.4.0
index 122bbbeca6a8..7309ce4b4293 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.4.0
+++ b/metadata/md5-cache/dev-ruby/daemons-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.4.0.tar.gz -> daemons-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d3f9a57569fe967ee35d4ec8363ba18
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.4.1 b/metadata/md5-cache/dev-ruby/daemons-1.4.1
index ef523d2b79e2..e418dbd51536 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.4.1
+++ b/metadata/md5-cache/dev-ruby/daemons-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.4.1.tar.gz -> daemons-1.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b16f681110a36ef918e1642cbc0e933a
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.11 b/metadata/md5-cache/dev-ruby/dalli-2.7.11
index f7e50ea0e04c..5ebe0bdb581d 100644
--- a/metadata/md5-cache/dev-ruby/dalli-2.7.11
+++ b/metadata/md5-cache/dev-ruby/dalli-2.7.11
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v2.7.11.tar.gz -> dalli-2.7.11.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f9e895b7d1a219527a8c9222bc63100c
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.7.0 b/metadata/md5-cache/dev-ruby/database_cleaner-1.7.0
index b5eb2afebea3..1f3970a7017a 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.7.0
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/database_cleaner-1.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d48ca7bb15aae4dd66f9b59e09e80a37
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-2.0.1 b/metadata/md5-cache/dev-ruby/database_cleaner-2.0.1
index 2135fa9802ad..cd74a588df07 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-2.0.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/database_cleaner-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=067d4810ce00cbf2ec3bca8dce81cc95
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1 b/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1
index e64a51dafcee..ce88099cf9c1 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-active_record-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.0
 SRC_URI=https://rubygems.org/gems/database_cleaner-active_record-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e0b4d7645afa6e5c1e6354b6c930ad4a
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1 b/metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1
index 5b5a32c4f34d..1d02f885525b 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-core-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=2.0
 SRC_URI=https://rubygems.org/gems/database_cleaner-core-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=19314e48f0b3667f4c731434508a0a72
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.10.0 b/metadata/md5-cache/dev-ruby/date_validator-0.10.0
index cc0dcdb1c86a..735567d08391 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.10.0
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/date_validator-0.10.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68cba8c4fd461444138d70599abde451
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.11.0 b/metadata/md5-cache/dev-ruby/date_validator-0.11.0
index b5df281f7fc9..6811258166b1 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.11.0
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/date_validator-0.11.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68cba8c4fd461444138d70599abde451
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.12.0 b/metadata/md5-cache/dev-ruby/date_validator-0.12.0
index 50b9dc38ca98..bc71a293c2f1 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.12.0
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/date_validator-0.12.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad8c3c8272cf4d73cb595ee0dc23f993
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.1.3 b/metadata/md5-cache/dev-ruby/dbf-4.1.3
index 32c110f17007..4a620e451035 100644
--- a/metadata/md5-cache/dev-ruby/dbf-4.1.3
+++ b/metadata/md5-cache/dev-ruby/dbf-4.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dbf-4.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=080ae00d4914a2acca9d9fcfac739908
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.1.6 b/metadata/md5-cache/dev-ruby/dbf-4.1.6
index c0875a32b937..03fcd9d2624f 100644
--- a/metadata/md5-cache/dev-ruby/dbf-4.1.6
+++ b/metadata/md5-cache/dev-ruby/dbf-4.1.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dbf-4.1.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=48ddc4c7a70cb7627bf350b6ca20a219
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.2.0 b/metadata/md5-cache/dev-ruby/dbf-4.2.0
index 48a4dbdcb27a..97ba7619ab8c 100644
--- a/metadata/md5-cache/dev-ruby/dbf-4.2.0
+++ b/metadata/md5-cache/dev-ruby/dbf-4.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dbf-4.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=48ddc4c7a70cb7627bf350b6ca20a219
diff --git a/metadata/md5-cache/dev-ruby/ddmemoize-1.0.0 b/metadata/md5-cache/dev-ruby/ddmemoize-1.0.0
index 33e28a398d82..2c42c4e21c4b 100644
--- a/metadata/md5-cache/dev-ruby/ddmemoize-1.0.0
+++ b/metadata/md5-cache/dev-ruby/ddmemoize-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ddmemoize-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a833a03c39e1040a2e3015fe07cc84c7
diff --git a/metadata/md5-cache/dev-ruby/ddmetrics-1.0.1 b/metadata/md5-cache/dev-ruby/ddmetrics-1.0.1
index 520657a7a06e..d2982dc657de 100644
--- a/metadata/md5-cache/dev-ruby/ddmetrics-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ddmetrics-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ddmetrics-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a239324c443e1f014bf6fcae4dd3a0cf
diff --git a/metadata/md5-cache/dev-ruby/ddplugin-1.0.2 b/metadata/md5-cache/dev-ruby/ddplugin-1.0.2
index 5dce5571cc97..248d839378e8 100644
--- a/metadata/md5-cache/dev-ruby/ddplugin-1.0.2
+++ b/metadata/md5-cache/dev-ruby/ddplugin-1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ddplugin-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a0e5826c351971dbb76e239510a0cb80
diff --git a/metadata/md5-cache/dev-ruby/ddplugin-1.0.3 b/metadata/md5-cache/dev-ruby/ddplugin-1.0.3
index b3ebeaad1b90..eae3048d0d85 100644
--- a/metadata/md5-cache/dev-ruby/ddplugin-1.0.3
+++ b/metadata/md5-cache/dev-ruby/ddplugin-1.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ddplugin-1.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4cfdc0110996ccf15677dbec104b381f
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3 b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
index 881828591c6c..ad02f8348b2d 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/debug_inspector-0.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8f4997e4c840f347d12b8bc39ef550a9
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-1.0.0 b/metadata/md5-cache/dev-ruby/debug_inspector-1.0.0
index a52e6f9a9dd4..00fbae4d94ee 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-1.0.0
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/banister/debug_inspector/archive/v1.0.0.tar.gz -> debug_inspector-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9477d6776214fac88a91e2ea6bb32725
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0 b/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0
index d10245620a7a..35d1fa6987df 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/banister/debug_inspector/archive/v1.1.0.tar.gz -> debug_inspector-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d71c549db6ac7e136e91a3f0e30d96bb
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.2.1 b/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
index a9b34009417f..4f803b130884 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/deep_merge-1.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0d8271629af08a5304a79ba8c44953e5
diff --git a/metadata/md5-cache/dev-ruby/delayer-1.1.2 b/metadata/md5-cache/dev-ruby/delayer-1.1.2
index a8273f0eba8e..a83629ee7316 100644
--- a/metadata/md5-cache/dev-ruby/delayer-1.1.2
+++ b/metadata/md5-cache/dev-ruby/delayer-1.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/delayer-1.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e2c3a677013fea82a64a35e7155a744
diff --git a/metadata/md5-cache/dev-ruby/delayer-1.2.0 b/metadata/md5-cache/dev-ruby/delayer-1.2.0
index 68ae383cf324..0d836d0b50a3 100644
--- a/metadata/md5-cache/dev-ruby/delayer-1.2.0
+++ b/metadata/md5-cache/dev-ruby/delayer-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/delayer-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=44631fe0f47a1f35804cfb08c6e56153
diff --git a/metadata/md5-cache/dev-ruby/delayer-1.2.1 b/metadata/md5-cache/dev-ruby/delayer-1.2.1
index de212fd9e945..e0b9f540eca1 100644
--- a/metadata/md5-cache/dev-ruby/delayer-1.2.1
+++ b/metadata/md5-cache/dev-ruby/delayer-1.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/delayer-1.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=44631fe0f47a1f35804cfb08c6e56153
diff --git a/metadata/md5-cache/dev-ruby/delayer-deferred-2.1.3 b/metadata/md5-cache/dev-ruby/delayer-deferred-2.1.3
deleted file mode 100644
index 905d326ef957..000000000000
--- a/metadata/md5-cache/dev-ruby/delayer-deferred-2.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/delayer:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/delayer:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Ruby implementation of JSDeferred
-EAPI=7
-HOMEPAGE=https://github.com/toshia/delayer-deferred
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-ruby/delayer:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/delayer:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/delayer-deferred-2.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9f378d015a4b8d2f28d2520e187afe80
diff --git a/metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0 b/metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0
index d01c87b5695e..f56759dda25b 100644
--- a/metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0
+++ b/metadata/md5-cache/dev-ruby/delayer-deferred-2.2.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/delayer:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/delayer:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/delayer:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/delayer:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/delayer:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Ruby implementation of JSDeferred
 EAPI=7
 HOMEPAGE=https://github.com/toshia/delayer-deferred
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-ruby/delayer:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/delayer:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/delayer:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/delayer:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/delayer:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/delayer-deferred-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8869b2fe9401d1e7672dfe4db00bc1fc
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0f34c54c8363524af2716e817d6a4600
diff --git a/metadata/md5-cache/dev-ruby/dependor-1.0.1 b/metadata/md5-cache/dev-ruby/dependor-1.0.1
index 3d6e6a4b27d5..addfff8067b5 100644
--- a/metadata/md5-cache/dev-ruby/dependor-1.0.1
+++ b/metadata/md5-cache/dev-ruby/dependor-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dependor-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c71826dca46919183ddecda494de50ea
diff --git a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2 b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
index e19a65e8bba4..195e4847d996 100644
--- a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/deprecated-3.0.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9f7a90f1525686c1677020baf8e37a60
diff --git a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4 b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
index badee81e0944..040401738971 100644
--- a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
+++ b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/descendants_tracker-0.0.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=298be84a6e43af95685dfe7930b2ac8b
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0 b/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0
index 5a91bad64a99..83aaaa40b055 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/did_you_mean-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7edf2a7b0bc9892b662ce4d5a7cf5a38
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.5.0 b/metadata/md5-cache/dev-ruby/did_you_mean-1.5.0
index 8e9c34c1b470..730c4406670a 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.5.0
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/did_you_mean-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e6c91511500f95d5fa082a9af47e450
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.3 b/metadata/md5-cache/dev-ruby/diff-lcs-1.3
index 058651759a12..77f4cb086bb3 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.3
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/diff-lcs-1.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=22a84d9e81bbcee4f21fa9b25d3b0110
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.4 b/metadata/md5-cache/dev-ruby/diff-lcs-1.4
index 549915eb0d62..92291cc06603 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.4
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/diff-lcs-1.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=246ed1fd7d55be9fb2656503df463d4f
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.4.1 b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.1
index cf9abab13654..c7a183fd2f31 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.4.1
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/diff-lcs-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=246ed1fd7d55be9fb2656503df463d4f
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4 b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
index 722210461bfb..9a7a5792e7c9 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/diff-lcs-1.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=650c392c480756742d7d4666a8457fa6
diff --git a/metadata/md5-cache/dev-ruby/diva-1.0.2-r2 b/metadata/md5-cache/dev-ruby/diva-1.0.2-r2
index a6fb5efb8698..28ace7a2ae8f 100644
--- a/metadata/md5-cache/dev-ruby/diva-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/diva-1.0.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/toshia/diva/archive/v1.0.2.tar.gz -> diva-1.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c059623ad13feaa54dbb861ff56318c5
diff --git a/metadata/md5-cache/dev-ruby/diva-1.1.0 b/metadata/md5-cache/dev-ruby/diva-1.1.0
new file mode 100644
index 000000000000..9dfd4dfcea98
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/diva-1.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( <dev-ruby/addressable-2.9[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( <dev-ruby/addressable-2.9[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( <dev-ruby/addressable-2.9[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/simplecov[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/simplecov[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/simplecov[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Implementation of expression for handling things.
+EAPI=7
+HOMEPAGE=https://github.com/toshia/diva https://rubygems.org/gems/diva
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( <dev-ruby/addressable-2.9[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( <dev-ruby/addressable-2.9[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( <dev-ruby/addressable-2.9[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/toshia/diva/archive/v1.1.0.tar.gz -> diva-1.1.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7fc7dfaaef67b228498ead7f142bf730
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.61.3 b/metadata/md5-cache/dev-ruby/dnsruby-1.61.3
index cbdcded2fe26..662de4bfafb5 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.61.3
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.61.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dnsruby-1.61.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=11f04cf514c8ed91c69e7fb2e7fe57eb
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.61.7 b/metadata/md5-cache/dev-ruby/dnsruby-1.61.7
index 3d043d683351..6c970dae88a3 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.61.7
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.61.7
@@ -5,12 +5,12 @@ DESCRIPTION=A pure Ruby DNS client library
 EAPI=7
 HOMEPAGE=https://github.com/alexdalitz/dnsruby
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/simpleidn-0.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/simpleidn-0.1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dnsruby-1.61.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cdc640d057253d4fb9e4c343fcf35ab6
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ba2968124a4177e939d7651d7d2ea3a4
diff --git a/metadata/md5-cache/dev-ruby/docile-1.3.5 b/metadata/md5-cache/dev-ruby/docile-1.3.5
index 68ee5244a3d6..3845497f9765 100644
--- a/metadata/md5-cache/dev-ruby/docile-1.3.5
+++ b/metadata/md5-cache/dev-ruby/docile-1.3.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ms-ati/docile/archive/v1.3.5.tar.gz -> docile-1.3.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2bac9ff3f31ed63678a18338b541a49d
diff --git a/metadata/md5-cache/dev-ruby/docile-1.4.0 b/metadata/md5-cache/dev-ruby/docile-1.4.0
index f8965079034b..5749f6838f9c 100644
--- a/metadata/md5-cache/dev-ruby/docile-1.4.0
+++ b/metadata/md5-cache/dev-ruby/docile-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ms-ati/docile/archive/v1.4.0.tar.gz -> docile-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=606741186292d9423830b9e6922bdfcc
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
index ee7c5c90735f..39db1659d492 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby26(-)] dev-ruby/shoulda[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby27(-)] dev-ruby/shoulda[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby26(-)] dev-ruby/shoulda[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby27(-)] dev-ruby/shoulda[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/test-unit-2.5.5[ruby_targets_ruby30(-)] dev-ruby/shoulda[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DESCRIPTION=Domain Name manipulation library for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/knu/ruby-domain_name
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/domain_name-0.5.20190701.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=86d64523f5a190c1fe1e346ebfe050a2
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=595c8f4e99af9302ed6c382ed8795eac
diff --git a/metadata/md5-cache/dev-ruby/dotenv-2.7.6 b/metadata/md5-cache/dev-ruby/dotenv-2.7.6
index 426ecb997de6..2f858a6bb803 100644
--- a/metadata/md5-cache/dev-ruby/dotenv-2.7.6
+++ b/metadata/md5-cache/dev-ruby/dotenv-2.7.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/bkeepers/dotenv/archive/v2.7.6.tar.gz -> dotenv-2.7.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b17b66ce54a1d774e2a47e8a9fe83d9
diff --git a/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r2 b/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r2
index 578ede14dbfc..49508ede2602 100644
--- a/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/duktape-rb-2.3.0.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/judofyr/duktape.rb/archive/v2.3.0.0.tar.gz -> duktape-rb-2.3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=51b8eaf63b4ec9d2ab95abedd90ba2bd
diff --git a/metadata/md5-cache/dev-ruby/dust-0.1.7-r2 b/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
index 64ec9a2c434d..f5f8793696e1 100644
--- a/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
+++ b/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/dust-0.1.7.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4960ff6f82df798c89ed43ffd4cb7ab8
diff --git a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.0 b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.0
index d83a9af3337c..feea63dfe943 100644
--- a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.0
+++ b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ecma-re-validator-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=776a7e2ce11ebc083102237eeeadcdcf
diff --git a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.1 b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.1
index eb7a5759fc45..17fde20a7d58 100644
--- a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.1
+++ b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ecma-re-validator-0.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6a63e5b6ed84999d7d79c34adda70f64
diff --git a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.3.0 b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.3.0
index 932aa3d07764..87787c85ec90 100644
--- a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.3.0
+++ b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ecma-re-validator-0.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7f00247fa37fb9fde5b28f245a12b075
diff --git a/metadata/md5-cache/dev-ruby/ed25519-1.2.4 b/metadata/md5-cache/dev-ruby/ed25519-1.2.4
index 364e778ec547..0a874fc26697 100644
--- a/metadata/md5-cache/dev-ruby/ed25519-1.2.4
+++ b/metadata/md5-cache/dev-ruby/ed25519-1.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/ed25519/archive/v1.2.4.tar.gz -> ed25519-1.2.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8f1ccf290bfdd64e3cada52efe7efc28
diff --git a/metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1 b/metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1
index 9b48e9b87764..41ddafc0e43a 100644
--- a/metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1
+++ b/metadata/md5-cache/dev-ruby/ed25519-1.2.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/ed25519/archive/v1.2.4.tar.gz -> ed25519-1.2.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d48ec7db9dc4b9e2c89687d16c11fe56
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1 b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
index df8f1c5a18a3..2b6b7f838b95 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=6
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.1.tar.gz -> elasticsearch-ruby-6.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3cf858fde80a3a04cceff394e7a76a8a
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3 b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3
index 6331aa4efd8b..4cddd07083f0 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=6.8.3
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.3.tar.gz -> elasticsearch-ruby-6.8.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=87c889ac73f63727b92711132344f9b3
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1 b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1
index 59d4227335c9..7e085d01def8 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.1.tar.gz -> elasticsearch-ruby-6.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=494cea2922d3dd0eedc82f89313ff677
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3 b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3
index eaf6af4d488f..333caa15c8d3 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.8.3
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.3.tar.gz -> elasticsearch-ruby-6.8.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b2a4d01afcd155931d5c7803b9d05e4
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33 b/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33
index c83c6bb1919c..b95241a23776 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v0.0.33.tar.gz -> elasticsearch-ruby-0.0.33.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f86323843b07077b6a69f5e4ab73ec96
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1
index 0d8847dcb708..0a40118f25c7 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.1.tar.gz -> elasticsearch-ruby-6.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=15babb90f9d2e9c1689c3963ffb84fab
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
index 061ad5514ea4..9335616678c5 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.8.3
 SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.3.tar.gz -> elasticsearch-ruby-6.8.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=af5fe2c4434c1f03d49c2f0d8f28d8c6
diff --git a/metadata/md5-cache/dev-ruby/em-websocket-0.5.2 b/metadata/md5-cache/dev-ruby/em-websocket-0.5.2
index c6bc1e54c989..02c9936baa97 100644
--- a/metadata/md5-cache/dev-ruby/em-websocket-0.5.2
+++ b/metadata/md5-cache/dev-ruby/em-websocket-0.5.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/eventmachine-0.12.9[ruby_targets_ruby26(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/eventmachine-0.12.9[ruby_targets_ruby26(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/eventmachine-0.12.9[ruby_targets_ruby27(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=EventMachine based WebSocket server
 EAPI=7
 HOMEPAGE=https://rubygems.org/gems/em-websocket
-IUSE=test ruby_targets_ruby26 doc test test
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/eventmachine-0.12.9[ruby_targets_ruby26(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/eventmachine-0.12.9[ruby_targets_ruby26(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/eventmachine-0.12.9[ruby_targets_ruby27(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/igrigorik/em-websocket/archive/v0.5.2.tar.gz -> em-websocket-0.5.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5508ef55acd641a91446191e06bea404
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=814ff0279a62ddd81155e0af67277668
diff --git a/metadata/md5-cache/dev-ruby/equalizer-0.0.11 b/metadata/md5-cache/dev-ruby/equalizer-0.0.11
index 51918198d0f5..47a3203456e6 100644
--- a/metadata/md5-cache/dev-ruby/equalizer-0.0.11
+++ b/metadata/md5-cache/dev-ruby/equalizer-0.0.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/equalizer-0.0.11.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dd3481b76e228655a835c9fca38bb4ec
diff --git a/metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1 b/metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1
index ca1c80ccab9f..46eee0bdd070 100644
--- a/metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1
+++ b/metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/equalizer-0.0.11.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ac342634f37d60acf59794b8b1e8874
diff --git a/metadata/md5-cache/dev-ruby/equatable-0.6.1 b/metadata/md5-cache/dev-ruby/equatable-0.6.1
index d334ea4c3d00..7284caba7609 100644
--- a/metadata/md5-cache/dev-ruby/equatable-0.6.1
+++ b/metadata/md5-cache/dev-ruby/equatable-0.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/equatable-0.6.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2cb0e50fb6c328f032dde864fc236b11
diff --git a/metadata/md5-cache/dev-ruby/equatable-0.7.0 b/metadata/md5-cache/dev-ruby/equatable-0.7.0
index cbaeaa3d6357..f2e236addaa1 100644
--- a/metadata/md5-cache/dev-ruby/equatable-0.7.0
+++ b/metadata/md5-cache/dev-ruby/equatable-0.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/equatable/archive/v0.7.0.tar.gz -> equatable-0.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=36862f51856a9fe91e61d53b31358d3d
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.10.0 b/metadata/md5-cache/dev-ruby/erubi-1.10.0
index f86625ef1659..786db3d425fb 100644
--- a/metadata/md5-cache/dev-ruby/erubi-1.10.0
+++ b/metadata/md5-cache/dev-ruby/erubi-1.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jeremyevans/erubi/archive/1.10.0.tar.gz -> erubi-1.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=64b804a7dacfc7bb4797742058cc9df1
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.9.0 b/metadata/md5-cache/dev-ruby/erubi-1.9.0
index c2f98f0a8c7f..84ecdca2e195 100644
--- a/metadata/md5-cache/dev-ruby/erubi-1.9.0
+++ b/metadata/md5-cache/dev-ruby/erubi-1.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/erubi-1.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=75743b64965b7260268242389d214801
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
index efffb332ca2e..fdf8a390a2ff 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/erubis-2.7.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a8da604a400914df7538ef2490083a37
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r3 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r3
index 187a8272e10f..8f7b42bb855a 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r3
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/erubis-2.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=13026a13ba9eaf38a7450d9dc78b8ebf
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.12.0 b/metadata/md5-cache/dev-ruby/ethon-0.12.0
index a4f391fe77b6..3f81ff0edc5e 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.12.0
+++ b/metadata/md5-cache/dev-ruby/ethon-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ethon-0.12.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7956e2d1a91abe47390ab88c4c283717
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.13.0 b/metadata/md5-cache/dev-ruby/ethon-0.13.0
index 8eb1e5d43e33..63e12608d7e5 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.13.0
+++ b/metadata/md5-cache/dev-ruby/ethon-0.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ethon-0.13.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=afb5ed0f7549b6f42e60055f89fd2f56
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.14.0 b/metadata/md5-cache/dev-ruby/ethon-0.14.0
index caea3d75dee2..e840b976235c 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.14.0
+++ b/metadata/md5-cache/dev-ruby/ethon-0.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ethon-0.14.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=afb5ed0f7549b6f42e60055f89fd2f56
diff --git a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0 b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
index 64be8dd711b2..94e92c9cd6e8 100644
--- a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
+++ b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/evented-spec-0.9.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d874715cf8436b1e24b741e0c099edda
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r1 b/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r1
index c9f76f0fd328..0704dafcf231 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r1
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eventmachine/eventmachine/archive/v1.2.7.tar.gz -> eventmachine-1.2.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1e2ab3f7e9b8d5248bd670320ab694eb
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r3 b/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r3
index 01dee1de1907..14dbebc8fd4f 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r3
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.2.7-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eventmachine/eventmachine/archive/v1.2.7.tar.gz -> eventmachine-1.2.7.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ruby/eventmachine/eventmachine-1.2.7-openssl-patches.tar.bz2
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6091b76b81443a0a89e1e2b3be4e1cd5
diff --git a/metadata/md5-cache/dev-ruby/excon-0.73.0 b/metadata/md5-cache/dev-ruby/excon-0.73.0
index c393177730ce..9c62dbfe7bf1 100644
--- a/metadata/md5-cache/dev-ruby/excon-0.73.0
+++ b/metadata/md5-cache/dev-ruby/excon-0.73.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/excon/excon/archive/v0.73.0.tar.gz -> excon-0.73.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=40f49ef5358757e6ed566b357b0b6b64
diff --git a/metadata/md5-cache/dev-ruby/excon-0.87.0 b/metadata/md5-cache/dev-ruby/excon-0.87.0
new file mode 100644
index 000000000000..4706ca24719d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/excon-0.87.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] test? ( dev-ruby/activesupport[ruby_targets_ruby26(-)] >=dev-ruby/eventmachine-1.0.4[ruby_targets_ruby26(-)] >=dev-ruby/json-1.8.5[ruby_targets_ruby26(-)] dev-ruby/open4[ruby_targets_ruby26(-)] dev-ruby/rdoc[ruby_targets_ruby26(-)] dev-ruby/sinatra[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] test? ( dev-ruby/activesupport[ruby_targets_ruby27(-)] >=dev-ruby/eventmachine-1.0.4[ruby_targets_ruby27(-)] >=dev-ruby/json-1.8.5[ruby_targets_ruby27(-)] dev-ruby/open4[ruby_targets_ruby27(-)] dev-ruby/rdoc[ruby_targets_ruby27(-)] dev-ruby/sinatra[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=EXtended http(s) CONnections
+EAPI=8
+HOMEPAGE=https://github.com/excon/excon
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/excon/excon/archive/v0.87.0.tar.gz -> excon-0.87.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1d5f701669eba0425ab537d405f6e593
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.7.0 b/metadata/md5-cache/dev-ruby/execjs-2.7.0
index 6c4812cecdc2..2fff5d2ae29c 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.7.0
+++ b/metadata/md5-cache/dev-ruby/execjs-2.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.7.0.tar.gz -> execjs-2.7.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=29f86f4ff0c7412754970728cd70c4c1
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.7.0-r1 b/metadata/md5-cache/dev-ruby/execjs-2.7.0-r1
index 848e1227ee29..cc1aa4476beb 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.7.0-r1
+++ b/metadata/md5-cache/dev-ruby/execjs-2.7.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.7.0.tar.gz -> execjs-2.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=830b4081d7c1c7849e9699691b5df5d3
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.8.0 b/metadata/md5-cache/dev-ruby/execjs-2.8.0
index 429fc91725df..6984f839fc5a 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.8.0
+++ b/metadata/md5-cache/dev-ruby/execjs-2.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.8.0.tar.gz -> execjs-2.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=542d70bc3682d937d225a66a8b2d78b6
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.8.1 b/metadata/md5-cache/dev-ruby/execjs-2.8.1
index ad11be14e486..72cb41cafd28 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.8.1
+++ b/metadata/md5-cache/dev-ruby/execjs-2.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.8.1.tar.gz -> execjs-2.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6aa8a5947dc85b8dd4c11a6904f1f612
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.3.8 b/metadata/md5-cache/dev-ruby/exifr-1.3.8
index f2135879a20f..17b1184124f0 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.3.8
+++ b/metadata/md5-cache/dev-ruby/exifr-1.3.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/remvee/exifr/archive/release-1.3.8.tar.gz -> exifr-1.3.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df089115027dabce4e259e850c9281ad
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.3.9 b/metadata/md5-cache/dev-ruby/exifr-1.3.9
index 70230b75eba7..0e1631107213 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.3.9
+++ b/metadata/md5-cache/dev-ruby/exifr-1.3.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/remvee/exifr/archive/release-1.3.9.tar.gz -> exifr-1.3.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df089115027dabce4e259e850c9281ad
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.19.2 b/metadata/md5-cache/dev-ruby/fakefs-0.19.2
index ee044c0bf68f..6b721c4db3c4 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.19.2
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.19.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v0.19.2.tar.gz -> fakefs-0.19.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=731d3025da4d27e5451095defa918bd5
diff --git a/metadata/md5-cache/dev-ruby/fakefs-1.2.3 b/metadata/md5-cache/dev-ruby/fakefs-1.2.3
index c01b474b3a68..f2231c9a2ac3 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-1.2.3
+++ b/metadata/md5-cache/dev-ruby/fakefs-1.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/defunkt/fakefs/archive/v1.2.3.tar.gz -> fakefs-1.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=169fd77d996b816f64b6d6f38a6c9501
diff --git a/metadata/md5-cache/dev-ruby/fakefs-1.3.2 b/metadata/md5-cache/dev-ruby/fakefs-1.3.2
new file mode 100644
index 000000000000..f7baf2b2b86b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/fakefs-1.3.2
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby26(-)] >=dev-ruby/maxitest-3.6:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby27(-)] >=dev-ruby/maxitest-3.6:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby30(-)] >=dev-ruby/maxitest-3.6:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=A fake filesystem. Use it in your tests
+EAPI=8
+HOMEPAGE=https://github.com/defunkt/fakefs
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/defunkt/fakefs/archive/v1.3.2.tar.gz -> fakefs-1.3.2.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ef72c9f7969a91eba4287553c774de51
diff --git a/metadata/md5-cache/dev-ruby/faker-2.16.0 b/metadata/md5-cache/dev-ruby/faker-2.16.0
index f1e51b8c8247..3d4f597d7689 100644
--- a/metadata/md5-cache/dev-ruby/faker-2.16.0
+++ b/metadata/md5-cache/dev-ruby/faker-2.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/stympy/faker/archive/v2.16.0.tar.gz -> faker-2.16.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e6ef36a3a872889155711db6bf5157e
diff --git a/metadata/md5-cache/dev-ruby/faker-2.17.0 b/metadata/md5-cache/dev-ruby/faker-2.17.0
index a822fb915961..cd302633ac60 100644
--- a/metadata/md5-cache/dev-ruby/faker-2.17.0
+++ b/metadata/md5-cache/dev-ruby/faker-2.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/stympy/faker/archive/v2.17.0.tar.gz -> faker-2.17.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e6ef36a3a872889155711db6bf5157e
diff --git a/metadata/md5-cache/dev-ruby/faker-2.19.0 b/metadata/md5-cache/dev-ruby/faker-2.19.0
new file mode 100644
index 000000000000..97beaa718bf6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/faker-2.19.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/timecop[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/timecop[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A library for generating fake data such as names, addresses, and phone numbers
+EAPI=8
+HOMEPAGE=https://github.com/stympy/faker
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/stympy/faker/archive/v2.19.0.tar.gz -> faker-2.19.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1ddb41ebf41b0188c591c0fd30c13b0a
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.17.3 b/metadata/md5-cache/dev-ruby/faraday-0.17.3
index 9822292df310..84a0eccb1fbe 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.17.3
+++ b/metadata/md5-cache/dev-ruby/faraday-0.17.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday/archive/v0.17.3.tar.gz -> faraday-0.17.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3761d51ab1e70a1413da2be8fd3493ef
diff --git a/metadata/md5-cache/dev-ruby/faraday-1.2.0 b/metadata/md5-cache/dev-ruby/faraday-1.2.0
index d9bb60460621..56f118a855b7 100644
--- a/metadata/md5-cache/dev-ruby/faraday-1.2.0
+++ b/metadata/md5-cache/dev-ruby/faraday-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/lostisland/faraday/archive/v1.2.0.tar.gz -> faraday-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7b42fbbfba211e254524964a7305d695
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0
index d2dd9bcf6493..31d32a287d0d 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-0.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v0.14.0.tar.gz -> faraday_middleware-0.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=15dedaf40c188fa5c806ac8f0cb1c599
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0
index ab97485248ad..ce96b8ef418a 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v1.0.0.tar.gz -> faraday_middleware-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee10dd012dab7900a13b91d8d576c810
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-1.1.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-1.1.0
new file mode 100644
index 000000000000..80e0af8280f1
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-1.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/faraday:1[ruby_targets_ruby26(-)] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby26(-)] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby26(-)] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby26(-)] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/faraday:1[ruby_targets_ruby27(-)] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby27(-)] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby27(-)] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby27(-)] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/brotli-0.1.8[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/addressable[ruby_targets_ruby26(-)] >=dev-ruby/rake-12.3.3[ruby_targets_ruby26(-)] dev-ruby/webmock:3[ruby_targets_ruby26(-)] dev-ruby/json[ruby_targets_ruby26(-)] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby26(-)] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby26(-)] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby26(-)] >=dev-ruby/hashie-1.2[ruby_targets_ruby26(-)] >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/brotli-0.1.8[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/addressable[ruby_targets_ruby27(-)] >=dev-ruby/rake-12.3.3[ruby_targets_ruby27(-)] dev-ruby/webmock:3[ruby_targets_ruby27(-)] dev-ruby/json[ruby_targets_ruby27(-)] >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.1[ruby_targets_ruby27(-)] >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby27(-)] >=dev-ruby/hashie-1.2[ruby_targets_ruby27(-)] >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Various middleware for Faraday
+EAPI=8
+HOMEPAGE=https://github.com/lostisland/faraday_middleware
+IUSE=+parsexml +oauth +mashify +rashify test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/faraday:1[ruby_targets_ruby26(-)] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby26(-)] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby26(-)] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby26(-)] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/faraday:1[ruby_targets_ruby27(-)] parsexml? ( >=dev-ruby/multi_xml-0.5.3[ruby_targets_ruby27(-)] ) oauth? ( >=dev-ruby/simple_oauth-0.1[ruby_targets_ruby27(-)] ) mashify? ( >=dev-ruby/hashie-1.2:*[ruby_targets_ruby27(-)] ) rashify? ( >=dev-ruby/rash_alt-0.4.3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v1.1.0.tar.gz -> faraday_middleware-1.1.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2d6d3f2322501f045957ab60296acf2b
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1 b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1
deleted file mode 100644
index d8f315f489df..000000000000
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/faraday_middleware:*[ruby_targets_ruby26(-)] dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Response JSON parser using MultiJson and FaradayMiddleware
-EAPI=6
-HOMEPAGE=https://github.com/denro/faraday_middleware-multi_json
-IUSE=test ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-ruby/faraday_middleware:*[ruby_targets_ruby26(-)] dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/denro/faraday_middleware-multi_json/archive/v0.0.6.tar.gz -> faraday_middleware-multi_json-0.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=efeb17d634c226265c11fc95a4c69160
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2 b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2
index 2b5dd84df42e..4bcc4c9348b5 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/denro/faraday_middleware-multi_json/archive/v0.0.6.tar.gz -> faraday_middleware-multi_json-0.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=712557625ce91aa282d69fc45cd3c062
diff --git a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2 b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
index 992d4f34579f..7f38d407f95d 100644
--- a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fast-stemmer-1.0.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ac9d43e9ffd90f0dc65141bee4d89aac
diff --git a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3 b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3
index d14d2ede78ed..e6f5006a5b7d 100644
--- a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3
+++ b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fast-stemmer-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d3ef4d0dffdade42c23b27c4cc96089
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0 b/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0
index 672a2cc02351..92f6db66409e 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v1.8.0.tar.gz -> fast_gettext-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c49faed56676c532bff0933cf6bbb689
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-2.0.3 b/metadata/md5-cache/dev-ruby/fast_gettext-2.0.3
index 7d15718fceae..5f3ca7d33b47 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-2.0.3
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-2.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v2.0.3.tar.gz -> fast_gettext-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=67a0b44b5cf2b014016c2b25af2d6316
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-2.1.0 b/metadata/md5-cache/dev-ruby/fast_gettext-2.1.0
index b281fcaebd43..57f71ba5bfde 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-2.1.0
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v2.1.0.tar.gz -> fast_gettext-2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=08aadeeaa68171a7973662ab089b2663
diff --git a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2 b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
index 42ce59472580..5584b16c835c 100644
--- a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
+++ b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fast_xs-0.8.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=582cb97f23ceac9adc6d42704470325a
diff --git a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3 b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3
index fd81b66f52f5..5d122cd1c483 100644
--- a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3
+++ b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fast_xs-0.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5c20b7e9b4336c96c464fa8109dd0c05
diff --git a/metadata/md5-cache/dev-ruby/fattr-2.4.0 b/metadata/md5-cache/dev-ruby/fattr-2.4.0
index 55be36b61a9a..dc1d81dbf5b7 100644
--- a/metadata/md5-cache/dev-ruby/fattr-2.4.0
+++ b/metadata/md5-cache/dev-ruby/fattr-2.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fattr-2.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f377f598b40dbe738be4baf16093dc07
diff --git a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1 b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
index b9481f9b2d07..7c61e760e921 100644
--- a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fcgi-0.9.2.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0cfda30c5dc0fc58e770376c9389a1d1
diff --git a/metadata/md5-cache/dev-ruby/ferret-0.11.8.7 b/metadata/md5-cache/dev-ruby/ferret-0.11.8.7
index d6feb79c19e0..c75ba2c005b7 100644
--- a/metadata/md5-cache/dev-ruby/ferret-0.11.8.7
+++ b/metadata/md5-cache/dev-ruby/ferret-0.11.8.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ferret-0.11.8.7.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ecef68c092655e120b2b626fd7861cc4
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.17.0 b/metadata/md5-cache/dev-ruby/ffaker-2.17.0
index cceff71207cd..fe696ebf4255 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.17.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ffaker-2.17.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=435213dbf69946621bef414744831344
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.18.0 b/metadata/md5-cache/dev-ruby/ffaker-2.18.0
index 0f73a6ea06cb..f6fc07548b4d 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.18.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.18.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ffaker-2.18.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=850315d19eaebf04876ba2aec50c572c
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.19.0 b/metadata/md5-cache/dev-ruby/ffaker-2.19.0
index 8d6881db90e4..8c5fda946949 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.19.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.19.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ffaker-2.19.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0dbb345876586e8bf39ca63c05980d3c
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.20.0 b/metadata/md5-cache/dev-ruby/ffaker-2.20.0
new file mode 100644
index 000000000000..112d97cc92da
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.20.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Faster Faker, generates dummy data
+EAPI=8
+HOMEPAGE=https://github.com/emmanueloga/ffaker
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/ffaker-2.20.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0dbb345876586e8bf39ca63c05980d3c
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.14.2-r1 b/metadata/md5-cache/dev-ruby/ffi-1.14.2-r1
index 899526ef835c..22b7bbffc721 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.14.2-r1
+++ b/metadata/md5-cache/dev-ruby/ffi-1.14.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/1.14.2.tar.gz -> ffi-git-1.14.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0ca56685a78b63369c6c54615dd71c21
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.15.1-r1 b/metadata/md5-cache/dev-ruby/ffi-1.15.1-r1
index 6b0c4ca2df25..a2503bb12dc3 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.15.1-r1
+++ b/metadata/md5-cache/dev-ruby/ffi-1.15.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/v1.15.1.tar.gz -> ffi-git-1.15.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7a3e06fc1a63f4c507cf3a61765f28b2
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.15.3-r1 b/metadata/md5-cache/dev-ruby/ffi-1.15.3-r1
index aabe37b48c4f..af38a63d2f1b 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.15.3-r1
+++ b/metadata/md5-cache/dev-ruby/ffi-1.15.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/v1.15.3.tar.gz -> ffi-git-1.15.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=236f63a77e6da47fe3d668161e63ecfa
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.15.4-r1 b/metadata/md5-cache/dev-ruby/ffi-1.15.4-r1
index a3baa06ef8ed..d1e7e0695370 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.15.4-r1
+++ b/metadata/md5-cache/dev-ruby/ffi-1.15.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/v1.15.4.tar.gz -> ffi-git-1.15.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d9bb705e8ddf5e80ab3f609ce5a47a6
diff --git a/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1 b/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1
index 62deb7d22cf4..6eec45b2fb17 100644
--- a/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ffi-compiler-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ffi-compiler-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aebf72ec512ca97f8d7ca06d9a93a9af
diff --git a/metadata/md5-cache/dev-ruby/file-tail-1.2.0 b/metadata/md5-cache/dev-ruby/file-tail-1.2.0
index fea70a055155..5db587c25639 100644
--- a/metadata/md5-cache/dev-ruby/file-tail-1.2.0
+++ b/metadata/md5-cache/dev-ruby/file-tail-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/file-tail-1.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0bee090b02d3741ba7218e1bb510fe8
diff --git a/metadata/md5-cache/dev-ruby/filesize-0.2.0 b/metadata/md5-cache/dev-ruby/filesize-0.2.0
index 57a5557ee792..92098d21c2d1 100644
--- a/metadata/md5-cache/dev-ruby/filesize-0.2.0
+++ b/metadata/md5-cache/dev-ruby/filesize-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.2.0
 SRC_URI=https://rubygems.org/gems/filesize-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0eb7537b5a59abdca88f4acf024ade0d
diff --git a/metadata/md5-cache/dev-ruby/filigree-0.4.1 b/metadata/md5-cache/dev-ruby/filigree-0.4.1
index 1cacfd5e1e11..6a6939fcb5f6 100644
--- a/metadata/md5-cache/dev-ruby/filigree-0.4.1
+++ b/metadata/md5-cache/dev-ruby/filigree-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/filigree-0.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b35ed2ff36963528d62dda31051f6450
diff --git a/metadata/md5-cache/dev-ruby/fivemat-1.3.7 b/metadata/md5-cache/dev-ruby/fivemat-1.3.7
index 51744a457e0e..3e00f0626d16 100644
--- a/metadata/md5-cache/dev-ruby/fivemat-1.3.7
+++ b/metadata/md5-cache/dev-ruby/fivemat-1.3.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fivemat-1.3.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=509c0fcb29819cac1fb98d615ed1e729
diff --git a/metadata/md5-cache/dev-ruby/flexmock-2.3.6 b/metadata/md5-cache/dev-ruby/flexmock-2.3.6
index 343230e0c02a..af68d6649423 100644
--- a/metadata/md5-cache/dev-ruby/flexmock-2.3.6
+++ b/metadata/md5-cache/dev-ruby/flexmock-2.3.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/doudou/flexmock/archive/v2.3.6.tar.gz -> flexmock-2.3.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2041b187cda07431af97c4b7ce4f061f
diff --git a/metadata/md5-cache/dev-ruby/flickraw-0.9.10 b/metadata/md5-cache/dev-ruby/flickraw-0.9.10
index c6831695123e..4caa1e7d43ad 100644
--- a/metadata/md5-cache/dev-ruby/flickraw-0.9.10
+++ b/metadata/md5-cache/dev-ruby/flickraw-0.9.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/flickraw-0.9.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bf8d75c6dbb49f4bdf7eea0241aec3d2
diff --git a/metadata/md5-cache/dev-ruby/flog-4.6.4 b/metadata/md5-cache/dev-ruby/flog-4.6.4
index 298aaac3b6df..4aabdb79e5f7 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.6.4
+++ b/metadata/md5-cache/dev-ruby/flog-4.6.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/flog-4.6.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c7b7dd6a5f47b62118e2fcb51ae55b3d
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.5 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.5
index 2f7b6fdacbcc..a92011114d41 100644
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.5
+++ b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/font-awesome-rails-4.7.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a522019286af69eb5eb89dc7e6d936e
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.6 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.6
index b8e166ca2752..5433493ce84d 100644
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.6
+++ b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/font-awesome-rails-4.7.0.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6afecfd8af98fccc96d293c339cdcc98
diff --git a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.7 b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.7
index 00be62b28d41..d37467cea696 100644
--- a/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.7
+++ b/metadata/md5-cache/dev-ruby/font-awesome-rails-4.7.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/font-awesome-rails-4.7.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=930085b37f698871d4889ca3c3e96ba2
diff --git a/metadata/md5-cache/dev-ruby/forgery-0.8.1 b/metadata/md5-cache/dev-ruby/forgery-0.8.1
index f1431872acfb..533780a79cb4 100644
--- a/metadata/md5-cache/dev-ruby/forgery-0.8.1
+++ b/metadata/md5-cache/dev-ruby/forgery-0.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/forgery-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=497e6b787229f8504015a71bd1446e9a
diff --git a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1 b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1
index fa7e1867ba91..a6f17dca7a61 100644
--- a/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/envygeeks/forwardable-extended/archive/v2.6.0.tar.gz -> forwardable-extended-2.6.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=96694fbfc6323b91e414a18e07056386
diff --git a/metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1 b/metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
index 4fe670dc47a0..0052a161bccd 100644
--- a/metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/thekompanee/fuubar/archive/releases/v2.5.0.tar.gz -> fuubar-2.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8288528bf6168ce97e8bad4645f4a7aa
diff --git a/metadata/md5-cache/dev-ruby/fuubar-2.5.1 b/metadata/md5-cache/dev-ruby/fuubar-2.5.1
index 0ae7defa26a8..f0773b035a65 100644
--- a/metadata/md5-cache/dev-ruby/fuubar-2.5.1
+++ b/metadata/md5-cache/dev-ruby/fuubar-2.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/thekompanee/fuubar/archive/releases/v2.5.1.tar.gz -> fuubar-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=85098efc393e1ccfd05e26d384d59822
diff --git a/metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2 b/metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2
index 9b0719037b9f..9c41c523984b 100644
--- a/metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2
+++ b/metadata/md5-cache/dev-ruby/gettext-setup-0.34-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/gettext-setup-gem/archive/0.34.tar.gz -> gettext-setup-0.34.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8ce299a06ee1767491c7674f95331cfe
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1
index 752732877fd7..ddb4b8055689 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.8.1.tar.gz -> gettext_i18n_rails-1.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=165b0b43bad1f4a7de779d3ff65cc6f3
diff --git a/metadata/md5-cache/dev-ruby/gh-0.18.0 b/metadata/md5-cache/dev-ruby/gh-0.18.0
index 83f7f1773dde..8cec18ac194f 100644
--- a/metadata/md5-cache/dev-ruby/gh-0.18.0
+++ b/metadata/md5-cache/dev-ruby/gh-0.18.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/travis-ci/gh/archive/v0.18.0.tar.gz -> gh-0.18.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7fef9882a67d8a80c93dea0456621775
diff --git a/metadata/md5-cache/dev-ruby/gherkin-5.1.0 b/metadata/md5-cache/dev-ruby/gherkin-5.1.0
index 69eabbeea0be..f55754e9ec39 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-5.1.0
+++ b/metadata/md5-cache/dev-ruby/gherkin-5.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/gherkin-5.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aff42f87036d8fc9e77e99f5fed5f0da
diff --git a/metadata/md5-cache/dev-ruby/gist-6.0.0 b/metadata/md5-cache/dev-ruby/gist-6.0.0
index 1a221ae46210..53f084b17e5a 100644
--- a/metadata/md5-cache/dev-ruby/gist-6.0.0
+++ b/metadata/md5-cache/dev-ruby/gist-6.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gist-6.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17cd5729e0b6605d15b1aea522d0e655
diff --git a/metadata/md5-cache/dev-ruby/git-1.7.0 b/metadata/md5-cache/dev-ruby/git-1.7.0
index c63faac7d53f..6b514c77463e 100644
--- a/metadata/md5-cache/dev-ruby/git-1.7.0
+++ b/metadata/md5-cache/dev-ruby/git-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/schacon/ruby-git/archive/v1.7.0.tar.gz -> git-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b720f7a62d9a4ba71ce3bc06f9cd79fd
diff --git a/metadata/md5-cache/dev-ruby/git-1.9.1 b/metadata/md5-cache/dev-ruby/git-1.9.1
index 112ea668748d..0f81448e9c2a 100644
--- a/metadata/md5-cache/dev-ruby/git-1.9.1
+++ b/metadata/md5-cache/dev-ruby/git-1.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/schacon/ruby-git/archive/v1.9.1.tar.gz -> git-1.9.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f01c15c63ab014b6e191a2d866a304de
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.4.2-r2 b/metadata/md5-cache/dev-ruby/globalid-0.4.2-r2
index 67125a9878b6..edd76ec55096 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.4.2-r2
+++ b/metadata/md5-cache/dev-ruby/globalid-0.4.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v0.4.2.tar.gz -> globalid-0.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dab3745abc0af58a9b4275fb6b95f2b9
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.5.1 b/metadata/md5-cache/dev-ruby/globalid-0.5.1
index 7a5590269b2d..b5253e842271 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.5.1
+++ b/metadata/md5-cache/dev-ruby/globalid-0.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v0.5.1.tar.gz -> globalid-0.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=acc1b5e3a0b07f00cfc2ea8edffc4366
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.5.2 b/metadata/md5-cache/dev-ruby/globalid-0.5.2
index 37a963d7c01f..5cb453fdd007 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.5.2
+++ b/metadata/md5-cache/dev-ruby/globalid-0.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v0.5.2.tar.gz -> globalid-0.5.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=acc1b5e3a0b07f00cfc2ea8edffc4366
diff --git a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2 b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
index e1523ca0f51e..7d5ce57d7751 100644
--- a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
+++ b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gnuplot-2.6.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e9e94be223bd6870dd282feef48bd2eb
diff --git a/metadata/md5-cache/dev-ruby/google-protobuf-3.12.4 b/metadata/md5-cache/dev-ruby/google-protobuf-3.12.4
index ba425a92206c..191bea6d48cf 100644
--- a/metadata/md5-cache/dev-ruby/google-protobuf-3.12.4
+++ b/metadata/md5-cache/dev-ruby/google-protobuf-3.12.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.12.4.tar.gz -> google-protobuf-3.12.4-ruby.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=82c8afa3df4e6cfebbba511fe8b90e60
diff --git a/metadata/md5-cache/dev-ruby/google-protobuf-3.13.0 b/metadata/md5-cache/dev-ruby/google-protobuf-3.13.0
index f08508270d42..1391c1ea74af 100644
--- a/metadata/md5-cache/dev-ruby/google-protobuf-3.13.0
+++ b/metadata/md5-cache/dev-ruby/google-protobuf-3.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz -> google-protobuf-3.13.0-ruby.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b7d75d25927fffa8815fed8660046b2f
diff --git a/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0 b/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
index 5bdf7220d79b..e67f9c9a735e 100644
--- a/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
+++ b/metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.14.0.tar.gz -> google-protobuf-3.14.0-ruby.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f495d8b4807204618d2a02873b95d8b8
diff --git a/metadata/md5-cache/dev-ruby/gpgme-2.0.20 b/metadata/md5-cache/dev-ruby/gpgme-2.0.20
index 58a9dde2ffcf..522dc9a12694 100644
--- a/metadata/md5-cache/dev-ruby/gpgme-2.0.20
+++ b/metadata/md5-cache/dev-ruby/gpgme-2.0.20
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ) || ( ruby_targets_ru
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ueno/ruby-gpgme/archive/v2.0.20.tar.gz -> ruby-gpgme-2.0.20.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2898197f86d65ac0c78f203555257b54
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.13.0 b/metadata/md5-cache/dev-ruby/gruff-0.13.0
deleted file mode 100644
index 0778b9ede31a..000000000000
--- a/metadata/md5-cache/dev-ruby/gruff-0.13.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/histogram[ruby_targets_ruby26(-)] dev-ruby/rmagick:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/histogram[ruby_targets_ruby27(-)] dev-ruby/rmagick:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test-unit[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Beautiful graphs for one or multiple datasets
-EAPI=7
-HOMEPAGE=https://github.com/topfunky/gruff
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=media-gfx/imagemagick[truetype] ruby_targets_ruby26? ( dev-ruby/histogram[ruby_targets_ruby26(-)] dev-ruby/rmagick:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/histogram[ruby_targets_ruby27(-)] dev-ruby/rmagick:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/topfunky/gruff/archive/v0.13.0.tar.gz -> gruff-0.13.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1c6603d70a015bb52407a6d7df5b67bd
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.14.0 b/metadata/md5-cache/dev-ruby/gruff-0.14.0
index 98e5354dcbb3..c67aba6ae6cf 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.14.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.14.0
@@ -5,12 +5,12 @@ DESCRIPTION=Beautiful graphs for one or multiple datasets
 EAPI=8
 HOMEPAGE=https://github.com/topfunky/gruff
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=media-gfx/imagemagick[truetype] ruby_targets_ruby26? ( dev-ruby/histogram[ruby_targets_ruby26(-)] dev-ruby/rmagick:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/histogram[ruby_targets_ruby27(-)] dev-ruby/rmagick:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/topfunky/gruff/archive/v0.14.0.tar.gz -> gruff-0.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=db752292d608676cce29e73dbcf2b657
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=05fda139f6ce51876d62390649023847
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.7.0-r2 b/metadata/md5-cache/dev-ruby/gruff-0.7.0-r2
index 4c8e57b08459..0603f4bcebc2 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.7.0-r2
+++ b/metadata/md5-cache/dev-ruby/gruff-0.7.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gruff-0.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d15505223efe813a19ca5ae2647af017
diff --git a/metadata/md5-cache/dev-ruby/haml-5.1.2 b/metadata/md5-cache/dev-ruby/haml-5.1.2
index 888b627a7503..0e8338f2fa28 100644
--- a/metadata/md5-cache/dev-ruby/haml-5.1.2
+++ b/metadata/md5-cache/dev-ruby/haml-5.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/haml/haml/archive/v5.1.2.tar.gz -> haml-5.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1c59c2feda3bb9adcdac0fc64668e1c2
diff --git a/metadata/md5-cache/dev-ruby/haml-5.2.2 b/metadata/md5-cache/dev-ruby/haml-5.2.2
index 567a460a0f0b..b02d899cd555 100644
--- a/metadata/md5-cache/dev-ruby/haml-5.2.2
+++ b/metadata/md5-cache/dev-ruby/haml-5.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/haml/haml/archive/v5.2.2.tar.gz -> haml-5.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=277d819623a1bd5858cbaf92ba4e8c12
diff --git a/metadata/md5-cache/dev-ruby/haml-rails-2.0.1 b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1
index ed5de688f35c..eebad36072ca 100644
--- a/metadata/md5-cache/dev-ruby/haml-rails-2.0.1
+++ b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/haml-rails-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2e3b092acd0eb86fef6e5ced378ce10
diff --git a/metadata/md5-cache/dev-ruby/hamster-3.0.0-r1 b/metadata/md5-cache/dev-ruby/hamster-3.0.0-r1
index 4272ef289187..5f9ef0b0b3bc 100644
--- a/metadata/md5-cache/dev-ruby/hamster-3.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/hamster-3.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hamster-3.0.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=680d3a0079f1b6a9a27c1ba23216cfbe
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-1.0.1 b/metadata/md5-cache/dev-ruby/hashdiff-1.0.1
index 7ca90a586e9d..ed1fec1671cd 100644
--- a/metadata/md5-cache/dev-ruby/hashdiff-1.0.1
+++ b/metadata/md5-cache/dev-ruby/hashdiff-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashdiff-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e3698530591fe1b9262ec04d14461f8f
diff --git a/metadata/md5-cache/dev-ruby/hashery-2.1.2 b/metadata/md5-cache/dev-ruby/hashery-2.1.2
index ace0fc9493d2..9accb3016818 100644
--- a/metadata/md5-cache/dev-ruby/hashery-2.1.2
+++ b/metadata/md5-cache/dev-ruby/hashery-2.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashery-2.1.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8828ef6b0286114440539e613296a2d6
diff --git a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1 b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
index 16993e96df69..3e46eb5e7796 100644
--- a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashicorp-checkpoint-0.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8d7f13eb2465ba7a3b6ccbc0fbb2eff9
diff --git a/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1 b/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
index 67cf7b33b973..543d9f4f772e 100644
--- a/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashie-2.1.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6a7017a5c6745cea56369c064242f470
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.6.0 b/metadata/md5-cache/dev-ruby/hashie-3.6.0
index f06cc524a464..d86881c2fdc0 100644
--- a/metadata/md5-cache/dev-ruby/hashie-3.6.0
+++ b/metadata/md5-cache/dev-ruby/hashie-3.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/hashie-3.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dad64ab32a92fd91ed5a7e46983f0d44
diff --git a/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1 b/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
index 2cbbe85a7c50..0f37baee085d 100644
--- a/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/hashie-4.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/intridea/hashie/archive/v4.1.0.tar.gz -> hashie-4.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2cba4f0722cfbbc1d7f02a26d5f34f41
diff --git a/metadata/md5-cache/dev-ruby/hashr-2.0.1 b/metadata/md5-cache/dev-ruby/hashr-2.0.1
index 765b2d4c61f2..6dacd3a3dcb6 100644
--- a/metadata/md5-cache/dev-ruby/hashr-2.0.1
+++ b/metadata/md5-cache/dev-ruby/hashr-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hashr-2.0.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3b4ae1bbbdcf7e2e1466770a25dad903
diff --git a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0 b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
index 9526697b1614..909493a06f81 100644
--- a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
+++ b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/heredoc_unindent-1.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=86858dbf55de3eb41adb78daeebf06f6
diff --git a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1 b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
index 3568969b1e3d..e1083b778863 100644
--- a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/heredoc_unindent-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3e33bd6f4b49e7627706bfc03af63862
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.6.0 b/metadata/md5-cache/dev-ruby/hiera-3.6.0
index 2a01514f0bab..7af8c8ae55da 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.6.0
+++ b/metadata/md5-cache/dev-ruby/hiera-3.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-3.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0fe4b59bee92a8ddf3fcc511d0a666a
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.7.0 b/metadata/md5-cache/dev-ruby/hiera-3.7.0
index c583b79be305..913d3ad557d3 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.7.0
+++ b/metadata/md5-cache/dev-ruby/hiera-3.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-3.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1065aeb9fc98c081759e2782b673ee7f
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1 b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
index 3df2ff6570a7..25fed230147c 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v3.1.1.tar.gz -> hiera-eyaml-3.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6cea6e67ae1b58e80a5e24f6b247ce9
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4 b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4
index 1c6cf4f1dffc..7b00c8c296cc 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-eyaml-gpg-0.7.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=96bac9d74e0c46558ca895ca9722023b
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r1 b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r1
index f3135166e2c1..d8639dae892f 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r1
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-eyaml-plaintext-0.6.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=22a97b41e83e6dcd6fdd0ac34ce5e53f
diff --git a/metadata/md5-cache/dev-ruby/highline-2.0.3 b/metadata/md5-cache/dev-ruby/highline-2.0.3
index 90d0b05eb37c..27f4a691b747 100644
--- a/metadata/md5-cache/dev-ruby/highline-2.0.3
+++ b/metadata/md5-cache/dev-ruby/highline-2.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/JEG2/highline/archive/v2.0.3.tar.gz -> highline-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fc4ba5496eabdc9ae1e140a52f5d2e10
diff --git a/metadata/md5-cache/dev-ruby/hipchat-1.6.0 b/metadata/md5-cache/dev-ruby/hipchat-1.6.0
index 163b5d75996f..7d10e783ee77 100644
--- a/metadata/md5-cache/dev-ruby/hipchat-1.6.0
+++ b/metadata/md5-cache/dev-ruby/hipchat-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hipchat/hipchat-rb/archive/v1.6.0.tar.gz -> hipchat-1.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=89fdc656c756246e03ce9f424dd3b054
diff --git a/metadata/md5-cache/dev-ruby/hiredis-0.6.3 b/metadata/md5-cache/dev-ruby/hiredis-0.6.3
index 6e98c957f85b..3f0790a227b2 100644
--- a/metadata/md5-cache/dev-ruby/hiredis-0.6.3
+++ b/metadata/md5-cache/dev-ruby/hiredis-0.6.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/redis/hiredis-rb/archive/v0.6.3.tar.gz -> hiredis-rb-0.6.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=46ec51d64432b31055667210d470c17c
diff --git a/metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1 b/metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1
new file mode 100644
index 000000000000..3d32d8ee004d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/hiredis-0.6.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/hiredis:= test? ( dev-ruby/test-unit:2 ) virtual/pkgconfig ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Wrapper for hiredis (protocol serialization/deserialization and blocking I/O)
+EAPI=8
+HOMEPAGE=https://github.com/redis/hiredis-rb
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND==dev-libs/hiredis-0.14*:= ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/redis/hiredis-rb/archive/v0.6.3.tar.gz -> hiredis-rb-0.6.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4d1f75601845bc05e5f1fa1bde2a29de
diff --git a/metadata/md5-cache/dev-ruby/histogram-0.2.4.1 b/metadata/md5-cache/dev-ruby/histogram-0.2.4.1
index df471d77d4ab..b156ea650744 100644
--- a/metadata/md5-cache/dev-ruby/histogram-0.2.4.1
+++ b/metadata/md5-cache/dev-ruby/histogram-0.2.4.1
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/narray[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/narray[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/narray[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/narray[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/narray[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Gives objects the ability to 'histogram' in several useful ways
 EAPI=7
 HOMEPAGE=https://github.com/jtprince/histogram
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~x86
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/histogram-0.2.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=29aa242941aaf92b1591bb6f0cfe21b7
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=addc6f09d26fb1d75f064a937132f60a
diff --git a/metadata/md5-cache/dev-ruby/hitimes-2.0.0 b/metadata/md5-cache/dev-ruby/hitimes-2.0.0
index 102033ea1e3e..b1f81941934f 100644
--- a/metadata/md5-cache/dev-ruby/hitimes-2.0.0
+++ b/metadata/md5-cache/dev-ruby/hitimes-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hitimes-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1490cf35f4933085e182d815cef7dc4f
diff --git a/metadata/md5-cache/dev-ruby/hocon-1.3.1 b/metadata/md5-cache/dev-ruby/hocon-1.3.1
index bfc9bdc0fd93..49ad37a86f79 100644
--- a/metadata/md5-cache/dev-ruby/hocon-1.3.1
+++ b/metadata/md5-cache/dev-ruby/hocon-1.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/ruby-hocon/archive/1.3.1.tar.gz -> hocon-1.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=87392f5ffa8744f2d3dda6c92fc76e57
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.21.0 b/metadata/md5-cache/dev-ruby/hoe-3.21.0
index 9b4bb0069da9..054073ca557d 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.21.0
+++ b/metadata/md5-cache/dev-ruby/hoe-3.21.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hoe-3.21.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d8c7bea2c5d9bcb94785e01c0a53c47f
diff --git a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5 b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
index 82429ecd595e..9459fd9124f7 100644
--- a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
+++ b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hpricot-0.8.6.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=40f776ca5a1d9f0e3f81d34457449b6e
diff --git a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6 b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
index 31f3ea6c91af..1398cc3ac79b 100644
--- a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
+++ b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hpricot-0.8.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f02a1c6bf69942273535ac42ccffc91d
diff --git a/metadata/md5-cache/dev-ruby/html2haml-2.2.0 b/metadata/md5-cache/dev-ruby/html2haml-2.2.0
index 962f3ef97a01..56d489eb8319 100644
--- a/metadata/md5-cache/dev-ruby/html2haml-2.2.0
+++ b/metadata/md5-cache/dev-ruby/html2haml-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/html2haml-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=871ba9f8a8312f1d1a530db3dea9536d
diff --git a/metadata/md5-cache/dev-ruby/htmlentities-4.3.4 b/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
index 02d7fd9d020f..585f081a208f 100644
--- a/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
+++ b/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/htmlentities-4.3.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe37dfee176b8b4e2ac03036d7879923
diff --git a/metadata/md5-cache/dev-ruby/http-4.1.1 b/metadata/md5-cache/dev-ruby/http-4.1.1
index c98c021047b9..77ed8926aec1 100644
--- a/metadata/md5-cache/dev-ruby/http-4.1.1
+++ b/metadata/md5-cache/dev-ruby/http-4.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/http-4.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ca1207ca6dea6cfd88ee2045e832ff81
diff --git a/metadata/md5-cache/dev-ruby/http-4.4.1 b/metadata/md5-cache/dev-ruby/http-4.4.1
index 153b2b870f77..971f9bb2186b 100644
--- a/metadata/md5-cache/dev-ruby/http-4.4.1
+++ b/metadata/md5-cache/dev-ruby/http-4.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/http-4.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7e13c89db8792ddd970e4e906efa9af2
diff --git a/metadata/md5-cache/dev-ruby/http-accept-1.7.0 b/metadata/md5-cache/dev-ruby/http-accept-1.7.0
index afaa11687ab1..68e000a6fed3 100644
--- a/metadata/md5-cache/dev-ruby/http-accept-1.7.0
+++ b/metadata/md5-cache/dev-ruby/http-accept-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/http-accept/archive/v1.7.0.tar.gz -> http-accept-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=84c0c82bb9957de694b8c9f6ed89c8dc
diff --git a/metadata/md5-cache/dev-ruby/http-accept-2.1.1 b/metadata/md5-cache/dev-ruby/http-accept-2.1.1
index b496b34e237e..c3f30cb3e4ae 100644
--- a/metadata/md5-cache/dev-ruby/http-accept-2.1.1
+++ b/metadata/md5-cache/dev-ruby/http-accept-2.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/socketry/http-accept/archive/v2.1.1.tar.gz -> http-accept-2.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=55b02e53c406e248497f6dea7b2275d4
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.3 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.3
index 39ed9520bcab..bd06a2a76de4 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.3
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/http-cookie-1.0.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2117629e79e8fc6b7c2e8c2b56404eb2
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.4 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.4
index 0b6b3d95f4d5..eae42e231d9f 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.4
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.4
@@ -1,16 +1,16 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=A ruby library to handle HTTP cookies
 EAPI=7
 HOMEPAGE=https://github.com/sparklemotion/http-cookie
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/http-cookie-1.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7cf8b01b728e677437f5b8470b264a90
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=53a368891c2a87e76e828381e8db0f6f
diff --git a/metadata/md5-cache/dev-ruby/http-form_data-2.2.0 b/metadata/md5-cache/dev-ruby/http-form_data-2.2.0
index 9c38df9d4c84..a1ec75ef6825 100644
--- a/metadata/md5-cache/dev-ruby/http-form_data-2.2.0
+++ b/metadata/md5-cache/dev-ruby/http-form_data-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/http-form_data-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e11f29a7fb1f32216d84d0d9d9cbbf64
diff --git a/metadata/md5-cache/dev-ruby/http-form_data-2.3.0 b/metadata/md5-cache/dev-ruby/http-form_data-2.3.0
index 6f0e2f8ebc96..aaa0d9c53ca8 100644
--- a/metadata/md5-cache/dev-ruby/http-form_data-2.3.0
+++ b/metadata/md5-cache/dev-ruby/http-form_data-2.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/http-form_data-2.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b8ea209064479366f740233c3e7b4dd1
diff --git a/metadata/md5-cache/dev-ruby/http-parser-1.2.2 b/metadata/md5-cache/dev-ruby/http-parser-1.2.2
index 7a32a03d8426..3e517564e640 100644
--- a/metadata/md5-cache/dev-ruby/http-parser-1.2.2
+++ b/metadata/md5-cache/dev-ruby/http-parser-1.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/http-parser-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=21216159ffc3cfdc2910d47440523086
diff --git a/metadata/md5-cache/dev-ruby/http-parser-1.2.3 b/metadata/md5-cache/dev-ruby/http-parser-1.2.3
index 78b5e448b483..d52ddfb3bfd7 100644
--- a/metadata/md5-cache/dev-ruby/http-parser-1.2.3
+++ b/metadata/md5-cache/dev-ruby/http-parser-1.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/http-parser-1.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68cd04b60bfd693e074fd28dfbff31a6
diff --git a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1 b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
index 43c83e2606ba..a0fe1c103931 100644
--- a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/http_parser.rb-0.6.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f9d6441c1d19b729fee69c0024f5ddb
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.18.1 b/metadata/md5-cache/dev-ruby/httparty-0.18.1
index eed7aa7e117a..e027330a8148 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.18.1
+++ b/metadata/md5-cache/dev-ruby/httparty-0.18.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnunemaker/httparty/archive/v0.18.1.tar.gz -> httparty-0.18.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c9c6e4a56ffd9388c2253356c633f267
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.19.0 b/metadata/md5-cache/dev-ruby/httparty-0.19.0
index 1b2562cadbd9..cfdc61d3d15e 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.19.0
+++ b/metadata/md5-cache/dev-ruby/httparty-0.19.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnunemaker/httparty/archive/v0.19.0.tar.gz -> httparty-0.19.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7137544445b2e6563905b85dc7fe0fdb
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.20.0 b/metadata/md5-cache/dev-ruby/httparty-0.20.0
index b6d2f769c521..d6063d34c7c1 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.20.0
+++ b/metadata/md5-cache/dev-ruby/httparty-0.20.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jnunemaker/httparty/archive/v0.20.0.tar.gz -> httparty-0.20.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7137544445b2e6563905b85dc7fe0fdb
diff --git a/metadata/md5-cache/dev-ruby/httpauth-0.2.1 b/metadata/md5-cache/dev-ruby/httpauth-0.2.1
index a0640e6d7af2..cc2ae9636642 100644
--- a/metadata/md5-cache/dev-ruby/httpauth-0.2.1
+++ b/metadata/md5-cache/dev-ruby/httpauth-0.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Manfred/HTTPauth/archive/v0.2.1.tar.gz -> httpauth-0.2.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f19f865ea68f8ae5ab8e7ac5bfb8a517
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.8.3 b/metadata/md5-cache/dev-ruby/httpclient-2.8.3
index c05bba1b247a..8696d1c3f550 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.8.3
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.8.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test-unit[ruby_targets_ruby26(-)] dev-ruby/http-cookie[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit[ruby_targets_ruby27(-)] dev-ruby/http-cookie[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEPEND=test? ( ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test-unit[ruby_targets_ruby26(-)] dev-ruby/http-cookie[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit[ruby_targets_ruby27(-)] dev-ruby/http-cookie[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/test-unit[ruby_targets_ruby30(-)] dev-ruby/http-cookie[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DESCRIPTION='httpclient' gives something like the functionality of libwww-perl (LWP) in Ruby
 EAPI=5
 HOMEPAGE=https://github.com/nahi/httpclient
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nahi/httpclient/archive/v2.8.3.tar.gz -> httpclient-2.8.3.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ef14bb17c765dbe148fb3c2edb46a9f1
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=334ffb631f41fcf82d5c0ed301d0d1f9
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.8.3-r1 b/metadata/md5-cache/dev-ruby/httpclient-2.8.3-r1
new file mode 100644
index 000000000000..ab6fa296b5e0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.8.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test-unit[ruby_targets_ruby26(-)] dev-ruby/http-cookie[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit[ruby_targets_ruby27(-)] dev-ruby/http-cookie[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/test-unit[ruby_targets_ruby30(-)] dev-ruby/http-cookie[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DESCRIPTION='httpclient' gives something like the functionality of libwww-perl (LWP) in Ruby
+EAPI=5
+HOMEPAGE=https://github.com/nahi/httpclient
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nahi/httpclient/archive/v2.8.3.tar.gz -> httpclient-2.8.3.tgz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f5f32f547bb074f493da3ee98b11b7de
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.8.10 b/metadata/md5-cache/dev-ruby/i18n-1.8.10
index 6e33088aaccd..26e4d5bccca1 100644
--- a/metadata/md5-cache/dev-ruby/i18n-1.8.10
+++ b/metadata/md5-cache/dev-ruby/i18n-1.8.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.8.10.tar.gz -> i18n-1.8.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f55beda10f1744e52c0a1b4249a83bce
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.8.9 b/metadata/md5-cache/dev-ruby/i18n-1.8.9
index 3b11aa5b0fac..6bc4effa8a66 100644
--- a/metadata/md5-cache/dev-ruby/i18n-1.8.9
+++ b/metadata/md5-cache/dev-ruby/i18n-1.8.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.8.9.tar.gz -> i18n-1.8.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dd0c9ab7783dfa69f2f8d9b3774d9f67
diff --git a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2 b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2
index 07473b8adba1..3605689ed31c 100644
--- a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2
+++ b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ice_nine-0.11.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fd6a9d2e4ab936abf3a869af61fcc2e3
diff --git a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1 b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1
index 256796181db3..0d9740dbe5a4 100644
--- a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1
+++ b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Deep Freeze Ruby Objects
 EAPI=7
 HOMEPAGE=https://rubygems.org/gems/ice_nine https://github.com/dkubb/ice_nine
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ice_nine-0.11.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=336716d693f6997efce5dfd67902bd1c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a1301a7e892e945cf122b353f425ebda
diff --git a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.0 b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.0
index e9432a6483cc..5553bb35f385 100644
--- a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.0
+++ b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/idn-ruby-0.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=53eadee1b0ad0b76c71ace4c5d6adff5
diff --git a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.2 b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.2
index 94c2a847860e..c23b49b5d90d 100644
--- a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.2
+++ b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/idn-ruby-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=671665ae4de18e07707d856059e4784d
diff --git a/metadata/md5-cache/dev-ruby/image_processing-1.12.1 b/metadata/md5-cache/dev-ruby/image_processing-1.12.1
index bdd5bf7d57a8..1bd50cdc450a 100644
--- a/metadata/md5-cache/dev-ruby/image_processing-1.12.1
+++ b/metadata/md5-cache/dev-ruby/image_processing-1.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janko/image_processing/archive/v1.12.1.tar.gz -> image_processing-1.12.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=232ed8b18887b51e5da0573970895a2c
diff --git a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1 b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
index 1431375fc5bd..450ae0a2159a 100644
--- a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
+++ b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mattheworiordan/imagesize/archive/bd5be2afb088beba3f0d863cef4eac7db56ca804.tar.gz -> imagesize-0.1.1_p20100902.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=44336050ffef31296dff9eb6da57ce6d
diff --git a/metadata/md5-cache/dev-ruby/inflecto-0.0.2 b/metadata/md5-cache/dev-ruby/inflecto-0.0.2
index e48b19439e6f..2a99a5bc8940 100644
--- a/metadata/md5-cache/dev-ruby/inflecto-0.0.2
+++ b/metadata/md5-cache/dev-ruby/inflecto-0.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/inflecto-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17c6b5077748e025e8c7c8fe743c8c74
diff --git a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0 b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
index 81648df8813f..737983f56e68 100644
--- a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
+++ b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/instance_storage-1.0.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c17dd03e58b75c7a5f91c7656c071c5a
diff --git a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1 b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1
index e8b8a8b685e0..8c5ed538846a 100644
--- a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/instance_storage-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee848b7b9654da14281b2d45f6694ed4
diff --git a/metadata/md5-cache/dev-ruby/instance_storage-2.0.0 b/metadata/md5-cache/dev-ruby/instance_storage-2.0.0
index 4baad18dc1fb..8856fdd7a3f3 100644
--- a/metadata/md5-cache/dev-ruby/instance_storage-2.0.0
+++ b/metadata/md5-cache/dev-ruby/instance_storage-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/instance_storage-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=239eff43bb190ba298c1ca6b339b13a2
diff --git a/metadata/md5-cache/dev-ruby/instantiator-0.0.7 b/metadata/md5-cache/dev-ruby/instantiator-0.0.7
index cea1faf9d8bc..75f2f2a52d4d 100644
--- a/metadata/md5-cache/dev-ruby/instantiator-0.0.7
+++ b/metadata/md5-cache/dev-ruby/instantiator-0.0.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/instantiator-0.0.7.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5893e4596777f0180eb8edbbc7abdec6
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.4 b/metadata/md5-cache/dev-ruby/introspection-0.0.4
index d50956ff8962..846999c9750b 100644
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.4
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/introspection-0.0.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1bbb07db412dc492eca3725d862b852e
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1 b/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
index 88c0fbbd132f..6049198d9977 100644
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/introspection-0.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b7f3477d7bf027cf6cc95dcb865f527d
diff --git a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3 b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
index 71330dfa3af9..14b87af4da1d 100644
--- a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
+++ b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tarcieri/iobuffer/tarball/v1.1.2 -> iobuffer-git-1.1.2.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=da18036d5158b57d1cfaa62027e9e4c0
diff --git a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4 b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4
index d56b58c33d4a..f6e9d724deb2 100644
--- a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4
+++ b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tarcieri/iobuffer/tarball/v1.1.2 -> iobuffer-git-1.1.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5349034afd92e9b952ea9fc6880ab7b0
diff --git a/metadata/md5-cache/dev-ruby/itextomml-1.6.0 b/metadata/md5-cache/dev-ruby/itextomml-1.6.0
index e510a19ea9e6..5689baa55e6e 100644
--- a/metadata/md5-cache/dev-ruby/itextomml-1.6.0
+++ b/metadata/md5-cache/dev-ruby/itextomml-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/itextomml-1.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ecd729cd1a5ec4d8a7e6ccf8ecb7be3c
diff --git a/metadata/md5-cache/dev-ruby/jbuilder-2.10.0 b/metadata/md5-cache/dev-ruby/jbuilder-2.10.0
index 1fc98a786340..88bca369f1f2 100644
--- a/metadata/md5-cache/dev-ruby/jbuilder-2.10.0
+++ b/metadata/md5-cache/dev-ruby/jbuilder-2.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/jbuilder-2.10.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7928513e569de515c728a326155e39f4
diff --git a/metadata/md5-cache/dev-ruby/jbuilder-2.10.1 b/metadata/md5-cache/dev-ruby/jbuilder-2.10.1
index db23a99d0c50..9fb979a89415 100644
--- a/metadata/md5-cache/dev-ruby/jbuilder-2.10.1
+++ b/metadata/md5-cache/dev-ruby/jbuilder-2.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/jbuilder-2.10.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=da6795dfcf466dd24692528babe91ceb
diff --git a/metadata/md5-cache/dev-ruby/jbuilder-2.11.0 b/metadata/md5-cache/dev-ruby/jbuilder-2.11.0
index 0a357111a879..9748a39e6b8f 100644
--- a/metadata/md5-cache/dev-ruby/jbuilder-2.11.0
+++ b/metadata/md5-cache/dev-ruby/jbuilder-2.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/jbuilder-2.11.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ee682fd2dc46f7ee378f40fdcd365d1
diff --git a/metadata/md5-cache/dev-ruby/jbuilder-2.11.2 b/metadata/md5-cache/dev-ruby/jbuilder-2.11.2
index b1a2048a97dd..31c7902c2fce 100644
--- a/metadata/md5-cache/dev-ruby/jbuilder-2.11.2
+++ b/metadata/md5-cache/dev-ruby/jbuilder-2.11.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/jbuilder-2.11.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ee682fd2dc46f7ee378f40fdcd365d1
diff --git a/metadata/md5-cache/dev-ruby/jmespath-1.4.0 b/metadata/md5-cache/dev-ruby/jmespath-1.4.0
index 1102735d16f1..eee92f6051d3 100644
--- a/metadata/md5-cache/dev-ruby/jmespath-1.4.0
+++ b/metadata/md5-cache/dev-ruby/jmespath-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jmespath/jmespath.rb/archive/v1.4.0.tar.gz -> jmespath-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fae365f01212cb59201ace230dcfc3e1
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0 b/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0
index e936c6af2c8c..00f225d7089d 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/jquery-rails-4.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6426ebd830fd36cc2e69aafd6b72d0b
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1
index 5a4fa169d7b5..c39895a00e54 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/jquery-ui-rails-6.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=421f88884e5aaa5f1f41f0bda0d94503
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2 b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
index 0705f4ddc323..596de355c429 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.4.2
 SRC_URI=https://rubygems.org/gems/jsobfu-0.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d26a2bef7fc0c8b4c636a98c7e53f883
diff --git a/metadata/md5-cache/dev-ruby/json-2.3.0 b/metadata/md5-cache/dev-ruby/json-2.3.0
index 3a07be8e41ac..26340c724c4f 100644
--- a/metadata/md5-cache/dev-ruby/json-2.3.0
+++ b/metadata/md5-cache/dev-ruby/json-2.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/json-2.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cbf8bebdb6a7601808cc494dd3351a67
diff --git a/metadata/md5-cache/dev-ruby/json-2.3.1 b/metadata/md5-cache/dev-ruby/json-2.3.1
deleted file mode 100644
index fc6705b30dd9..000000000000
--- a/metadata/md5-cache/dev-ruby/json-2.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A JSON implementation as a Ruby extension
-EAPI=7
-HOMEPAGE=https://github.com/flori/json
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://rubygems.org/gems/json-2.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3285fb85b36caae2ab905d7e687a12c5
diff --git a/metadata/md5-cache/dev-ruby/json-2.5.1 b/metadata/md5-cache/dev-ruby/json-2.5.1
deleted file mode 100644
index 83de0d148690..000000000000
--- a/metadata/md5-cache/dev-ruby/json-2.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/rake[ruby_targets_ruby30(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=A JSON implementation as a Ruby extension
-EAPI=7
-HOMEPAGE=https://github.com/flori/json
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/flori/json/archive/v2.5.1.tar.gz -> json-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c7d25bf7860f74d08a26292f1bd31c73
diff --git a/metadata/md5-cache/dev-ruby/json-2.5.1-r1 b/metadata/md5-cache/dev-ruby/json-2.5.1-r1
index 6f9e1b22260a..784731f28f0b 100644
--- a/metadata/md5-cache/dev-ruby/json-2.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/json-2.5.1-r1
@@ -5,12 +5,12 @@ DESCRIPTION=A JSON implementation as a Ruby extension
 EAPI=7
 HOMEPAGE=https://github.com/flori/json
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/flori/json/archive/v2.5.1.tar.gz -> json-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d34cece4de1fd3e9da38004545fa657b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=75f857fa3f5b5c4888ef61a7ec89d3af
diff --git a/metadata/md5-cache/dev-ruby/json_schema-0.20.8 b/metadata/md5-cache/dev-ruby/json_schema-0.20.8
index c8629b13ebf5..8dd562ee994b 100644
--- a/metadata/md5-cache/dev-ruby/json_schema-0.20.8
+++ b/metadata/md5-cache/dev-ruby/json_schema-0.20.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brandur/json_schema/archive/v0.20.8.tar.gz -> json_schema-0.20.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0f0b658a6f8baf2aeefc6df7c3e5afc0
diff --git a/metadata/md5-cache/dev-ruby/json_schema-0.20.9 b/metadata/md5-cache/dev-ruby/json_schema-0.20.9
index 1cd634e29adb..40e53e0df642 100644
--- a/metadata/md5-cache/dev-ruby/json_schema-0.20.9
+++ b/metadata/md5-cache/dev-ruby/json_schema-0.20.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brandur/json_schema/archive/v0.20.9.tar.gz -> json_schema-0.20.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=05abd6605b04a339981fa2590e21c1a7
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.2.2 b/metadata/md5-cache/dev-ruby/jwt-2.2.2
deleted file mode 100644
index 19a7196b0a06..000000000000
--- a/metadata/md5-cache/dev-ruby/jwt-2.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=A Ruby implementation of JSON Web Token draft 06
-EAPI=6
-HOMEPAGE=https://github.com/jwt/ruby-jwt
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.2.2.tar.gz -> jwt-2.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a033c3af61613da6cb02318f8212a00a
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.2.3 b/metadata/md5-cache/dev-ruby/jwt-2.2.3
index 19f05734840a..4d7e8dba3e93 100644
--- a/metadata/md5-cache/dev-ruby/jwt-2.2.3
+++ b/metadata/md5-cache/dev-ruby/jwt-2.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.2.3.tar.gz -> jwt-2.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b769bfb940bf040c19bb02b01e002a96
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.3.0 b/metadata/md5-cache/dev-ruby/jwt-2.3.0
new file mode 100644
index 000000000000..02dfbf10071b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/jwt-2.3.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rbnacl[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=A Ruby implementation of JSON Web Token draft 06
+EAPI=8
+HOMEPAGE=https://github.com/jwt/ruby-jwt
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.3.0.tar.gz -> jwt-2.3.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4b6f4d1d25e9f9129aeaab07d2326a2c
diff --git a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2 b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
index 52269da3a811..ad46d5f37d51 100644
--- a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
+++ b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/KirbyBase-2.6.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d191b7fc485ad2e056fcae7cfe1ddbf
diff --git a/metadata/md5-cache/dev-ruby/kissfft-0.0.2 b/metadata/md5-cache/dev-ruby/kissfft-0.0.2
index e08a5e6bd71f..714402e86ad3 100644
--- a/metadata/md5-cache/dev-ruby/kissfft-0.0.2
+++ b/metadata/md5-cache/dev-ruby/kissfft-0.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/kissfft-0.0.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=923fff2b63a1557639874f3f685afd42
diff --git a/metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1 b/metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1
index 56aacb7e6f24..feb801526a8d 100644
--- a/metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kpeg-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9a994fb0c3df901cf2a9407ae9d1deb5
diff --git a/metadata/md5-cache/dev-ruby/kramdown-2.3.1-r1 b/metadata/md5-cache/dev-ruby/kramdown-2.3.1-r1
index 46fe8b6a72c2..df68c528bfaa 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-2.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/kramdown-2.3.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/kramdown-2.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=400675be50fb0b5936d16ccc024ccf89
diff --git a/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0 b/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
index 5d13c1672655..b4430654b798 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
+++ b/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kramdown-parser-gfm-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=207e8284c07618b166a0b03f673b4461
diff --git a/metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1 b/metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1
index a8b2c6c66d86..2c0fd139d8ca 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1
+++ b/metadata/md5-cache/dev-ruby/kramdown-syntax-coderay-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kramdown-syntax-coderay-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e5cca2d3ee6a5192416ea51fc66e7984
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2 b/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
deleted file mode 100644
index 843e641cfe39..000000000000
--- a/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby26(-)] !!x11-misc/launchy[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Helper class for launching cross-platform applications
-EAPI=5
-HOMEPAGE=https://github.com/copiousfreetime/launchy
-IUSE=test ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=ISC
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby26(-)] !!x11-misc/launchy[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/launchy-2.4.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=68a2a8dc9597d0d7c9ca44a3988fec6d
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.5.0 b/metadata/md5-cache/dev-ruby/launchy-2.5.0
index 3e6caa353e77..f4a9bccc0226 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.5.0
+++ b/metadata/md5-cache/dev-ruby/launchy-2.5.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/addressable-2.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/addressable-2.7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/addressable-2.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/addressable-2.7[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/addressable-2.7[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Helper class for launching cross-platform applications
 EAPI=7
 HOMEPAGE=https://github.com/copiousfreetime/launchy
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=ISC
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/addressable-2.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/addressable-2.7[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/addressable-2.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/addressable-2.7[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/addressable-2.7[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/launchy-2.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a1ad556d4ff497edde6057bf6985adfa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=72fbeb4a9e5b65286cc9eac134ab07f6
diff --git a/metadata/md5-cache/dev-ruby/lemon-0.9.1 b/metadata/md5-cache/dev-ruby/lemon-0.9.1
index 425e682717db..dfc91e8fca2a 100644
--- a/metadata/md5-cache/dev-ruby/lemon-0.9.1
+++ b/metadata/md5-cache/dev-ruby/lemon-0.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/lemon-0.9.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8ae50a81195d9c018f5700b3e716b521
diff --git a/metadata/md5-cache/dev-ruby/letter_opener-1.7.0 b/metadata/md5-cache/dev-ruby/letter_opener-1.7.0
index 1b933d91583d..bd936488d42c 100644
--- a/metadata/md5-cache/dev-ruby/letter_opener-1.7.0
+++ b/metadata/md5-cache/dev-ruby/letter_opener-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ryanb/letter_opener/archive/v1.7.0.tar.gz -> letter_opener-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4f084504de2b25f54eafaa219f71e63
diff --git a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2 b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
index c99e9b893137..05fe7aa9563c 100644
--- a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
+++ b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/levenshtein-0.2.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9978f7550c222c2c6257c15bd7631671
diff --git a/metadata/md5-cache/dev-ruby/libusb-0.6.4 b/metadata/md5-cache/dev-ruby/libusb-0.6.4
index 1cd2a1b10ad9..297cbc8e16c7 100644
--- a/metadata/md5-cache/dev-ruby/libusb-0.6.4
+++ b/metadata/md5-cache/dev-ruby/libusb-0.6.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/libusb-0.6.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a44a6859389286cab399044e36d3731d
diff --git a/metadata/md5-cache/dev-ruby/liquid-4.0.3 b/metadata/md5-cache/dev-ruby/liquid-4.0.3
index fb35e0adc48b..604e352deae7 100644
--- a/metadata/md5-cache/dev-ruby/liquid-4.0.3
+++ b/metadata/md5-cache/dev-ruby/liquid-4.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/Shopify/liquid/archive/v4.0.3.tar.gz -> liquid-4.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e01726feae7fe36c60cadd5bc2947df1
diff --git a/metadata/md5-cache/dev-ruby/liquid-5.0.1 b/metadata/md5-cache/dev-ruby/liquid-5.0.1
index 8d90e16693b8..90f9d63e847d 100644
--- a/metadata/md5-cache/dev-ruby/liquid-5.0.1
+++ b/metadata/md5-cache/dev-ruby/liquid-5.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Shopify/liquid/archive/v5.0.1.tar.gz -> liquid-5.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8439b1563be269eaf398bac553e9b4be
diff --git a/metadata/md5-cache/dev-ruby/liquid-5.1.0 b/metadata/md5-cache/dev-ruby/liquid-5.1.0
index f8c0f781beba..89730d8ad68d 100644
--- a/metadata/md5-cache/dev-ruby/liquid-5.1.0
+++ b/metadata/md5-cache/dev-ruby/liquid-5.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/Shopify/liquid/archive/v5.1.0.tar.gz -> liquid-5.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8d9d73ccaf7e07ccfe46867da8f43edc
diff --git a/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1 b/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1
index e15438628067..5b44698ba8d0 100644
--- a/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/liquid-c-4.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/liquid-c-4.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c47a72f1f40e8bea02b822b53756dc45
diff --git a/metadata/md5-cache/dev-ruby/listen-1.3.1-r4 b/metadata/md5-cache/dev-ruby/listen-1.3.1-r4
index ebcd5b6cbecc..c28f2f9d52a4 100644
--- a/metadata/md5-cache/dev-ruby/listen-1.3.1-r4
+++ b/metadata/md5-cache/dev-ruby/listen-1.3.1-r4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/guard/listen/archive/v1.3.1.tar.gz -> listen-1.3.1-git.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f4fdd719348670776c1009cedc9791a6
diff --git a/metadata/md5-cache/dev-ruby/listen-3.5.1 b/metadata/md5-cache/dev-ruby/listen-3.5.1
index e6f6e1247e8b..f2e38a99cfce 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.5.1
+++ b/metadata/md5-cache/dev-ruby/listen-3.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.5.1.tar.gz -> listen-3.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=461543c32d0739b0dd3aa19eb2b92739
diff --git a/metadata/md5-cache/dev-ruby/listen-3.6.0 b/metadata/md5-cache/dev-ruby/listen-3.6.0
index b273431fc777..cf068ed994e8 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.6.0
+++ b/metadata/md5-cache/dev-ruby/listen-3.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.6.0.tar.gz -> listen-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a7c928e6e73b500c0f2e131b11e0a33
diff --git a/metadata/md5-cache/dev-ruby/listen-3.7.0 b/metadata/md5-cache/dev-ruby/listen-3.7.0
index 2bf77e8211cc..87acc3db2d78 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.7.0
+++ b/metadata/md5-cache/dev-ruby/listen-3.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.7.0.tar.gz -> listen-3.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b1df5a94de0957286533be422f763ec
diff --git a/metadata/md5-cache/dev-ruby/little-plugger-1.1.4 b/metadata/md5-cache/dev-ruby/little-plugger-1.1.4
index 411b625dd657..3cd812256ed4 100644
--- a/metadata/md5-cache/dev-ruby/little-plugger-1.1.4
+++ b/metadata/md5-cache/dev-ruby/little-plugger-1.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/little-plugger-1.1.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dd87a5f90d2657146899d3e2a7f2c724
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.3 b/metadata/md5-cache/dev-ruby/locale-2.1.3
index 20540f83ea2f..dc8504d633fb 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.3
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.3.tar.gz -> locale-2.1.3-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d4034cee7c0d9199d945811a5dc8440
diff --git a/metadata/md5-cache/dev-ruby/lockfile-2.1.3 b/metadata/md5-cache/dev-ruby/lockfile-2.1.3
index c3cb6ffccb0c..a9f948f2d9ba 100644
--- a/metadata/md5-cache/dev-ruby/lockfile-2.1.3
+++ b/metadata/md5-cache/dev-ruby/lockfile-2.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/lockfile-2.1.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=722404714f8b22089afc8ddf25008fe8
diff --git a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2 b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
index 22f4192936f0..a10d4ffbf702 100644
--- a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
+++ b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/log4r-1.1.10.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=58d9f7a3db1e66454ee8d258896b8eb5
diff --git a/metadata/md5-cache/dev-ruby/log_buddy-0.7.0 b/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
index 1865cffb1a0d..e0eaf1d042f8 100644
--- a/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
+++ b/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/log_buddy-0.7.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e00bff025217e41f5d9204dba7fd8045
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.18 b/metadata/md5-cache/dev-ruby/logue-1.0.18
index bcf29e99aec8..f16207014e15 100644
--- a/metadata/md5-cache/dev-ruby/logue-1.0.18
+++ b/metadata/md5-cache/dev-ruby/logue-1.0.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jpace/logue/archive/v1.0.18.tar.gz -> logue-git-1.0.18.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ab8bba23e27ba825f943545b32815084
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.10.0 b/metadata/md5-cache/dev-ruby/loofah-2.10.0
index aee424399ff5..6aa50ac9e046 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.10.0
+++ b/metadata/md5-cache/dev-ruby/loofah-2.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flavorjones/loofah/archive/v2.10.0.tar.gz -> loofah-2.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=03461b252513ade8c8db79daf8030326
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.11.0 b/metadata/md5-cache/dev-ruby/loofah-2.11.0
index a7cfca81f9cb..7db70712d866 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.11.0
+++ b/metadata/md5-cache/dev-ruby/loofah-2.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flavorjones/loofah/archive/v2.11.0.tar.gz -> loofah-2.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d26e06afaf1d459a80b8d8af39c7c11
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.12.0 b/metadata/md5-cache/dev-ruby/loofah-2.12.0
index 7f32ef71d87c..059236a2f2c4 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.12.0
+++ b/metadata/md5-cache/dev-ruby/loofah-2.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flavorjones/loofah/archive/v2.12.0.tar.gz -> loofah-2.12.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d26e06afaf1d459a80b8d8af39c7c11
diff --git a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r3 b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r3
index 8df1fbe71873..28e7d2cb3fa4 100644
--- a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r3
+++ b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/loquacious-1.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7c998626f77cf6876833a1fdd0cbb4d9
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.2.7 b/metadata/md5-cache/dev-ruby/lumberjack-1.2.7
index d73912d8f9b1..e1dd48d25302 100644
--- a/metadata/md5-cache/dev-ruby/lumberjack-1.2.7
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.2.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bdurand/lumberjack/archive/v1.2.7.tar.gz -> lumberjack-1.2.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=129d96678de518eacad1d3697f371a3f
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.2.8 b/metadata/md5-cache/dev-ruby/lumberjack-1.2.8
index 23865f0dcd2d..23584dd20f7e 100644
--- a/metadata/md5-cache/dev-ruby/lumberjack-1.2.8
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bdurand/lumberjack/archive/v1.2.8.tar.gz -> lumberjack-1.2.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6a3b48093fd020b92ee9b517db6ebe9b
diff --git a/metadata/md5-cache/dev-ruby/mab-0.0.3-r1 b/metadata/md5-cache/dev-ruby/mab-0.0.3-r1
index 430c812fdd3a..7246fac87353 100644
--- a/metadata/md5-cache/dev-ruby/mab-0.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/mab-0.0.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mab-0.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7a2011cea3e24e00b992981dd421e5f2
diff --git a/metadata/md5-cache/dev-ruby/magic-0.2.9-r1 b/metadata/md5-cache/dev-ruby/magic-0.2.9-r1
index c83866421022..5e340b98423a 100644
--- a/metadata/md5-cache/dev-ruby/magic-0.2.9-r1
+++ b/metadata/md5-cache/dev-ruby/magic-0.2.9-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qoobaa/magic/archive/v0.2.9.tar.gz -> magic-0.2.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5399893bc074ed83750255693e616a25
diff --git a/metadata/md5-cache/dev-ruby/mail-2.7.1 b/metadata/md5-cache/dev-ruby/mail-2.7.1
index f7cf4aedb4f0..d6d337a7d3aa 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.7.1
+++ b/metadata/md5-cache/dev-ruby/mail-2.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.7
 SRC_URI=https://github.com/mikel/mail/archive/2.7.1.tar.gz -> mail-2.7.1-git.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2f5a8322ec61694be316c6510d4488ba
diff --git a/metadata/md5-cache/dev-ruby/mail-2.7.1-r1 b/metadata/md5-cache/dev-ruby/mail-2.7.1-r1
index a285732112b8..620b72838b7a 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.7.1-r1
+++ b/metadata/md5-cache/dev-ruby/mail-2.7.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.7
 SRC_URI=https://github.com/mikel/mail/archive/2.7.1.tar.gz -> mail-2.7.1-git.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fc6b145f2794e7b4f5a05fdd360d69bc
diff --git a/metadata/md5-cache/dev-ruby/maildir-2.2.3 b/metadata/md5-cache/dev-ruby/maildir-2.2.3
index 945ba565aa28..eb6c47b246ae 100644
--- a/metadata/md5-cache/dev-ruby/maildir-2.2.3
+++ b/metadata/md5-cache/dev-ruby/maildir-2.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/maildir-2.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5edb6d767dff67eab0dc0d281ed8ba29
diff --git a/metadata/md5-cache/dev-ruby/marcel-0.3.3-r1 b/metadata/md5-cache/dev-ruby/marcel-0.3.3-r1
index 854faedfd4a9..61fa5479fc3c 100644
--- a/metadata/md5-cache/dev-ruby/marcel-0.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/marcel-0.3.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/basecamp/marcel/archive/v0.3.3.tar.gz -> marcel-0.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db1c803eab2af9ea6eec9740dcd42cb3
diff --git a/metadata/md5-cache/dev-ruby/marcel-1.0.0 b/metadata/md5-cache/dev-ruby/marcel-1.0.0
index 96ed3e3a3819..6d1488706670 100644
--- a/metadata/md5-cache/dev-ruby/marcel-1.0.0
+++ b/metadata/md5-cache/dev-ruby/marcel-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/basecamp/marcel/archive/v1.0.0.tar.gz -> marcel-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5fde6866282a4bbf21eec61b1237c73c
diff --git a/metadata/md5-cache/dev-ruby/marcel-1.0.1 b/metadata/md5-cache/dev-ruby/marcel-1.0.1
index 4bb3b867fe8c..5cae9f07b9e3 100644
--- a/metadata/md5-cache/dev-ruby/marcel-1.0.1
+++ b/metadata/md5-cache/dev-ruby/marcel-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/basecamp/marcel/archive/v1.0.1.tar.gz -> marcel-1.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5fde6866282a4bbf21eec61b1237c73c
diff --git a/metadata/md5-cache/dev-ruby/marcel-1.0.2 b/metadata/md5-cache/dev-ruby/marcel-1.0.2
index 86612ef9168d..a2e315059a3d 100644
--- a/metadata/md5-cache/dev-ruby/marcel-1.0.2
+++ b/metadata/md5-cache/dev-ruby/marcel-1.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/basecamp/marcel/archive/v1.0.2.tar.gz -> marcel-1.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d7f01a5d71b32bae2060bb85cf238062
diff --git a/metadata/md5-cache/dev-ruby/maruku-0.7.3 b/metadata/md5-cache/dev-ruby/maruku-0.7.3
index dc0f0fa23414..3974d179fdac 100644
--- a/metadata/md5-cache/dev-ruby/maruku-0.7.3
+++ b/metadata/md5-cache/dev-ruby/maruku-0.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/maruku-0.7.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0dcae3af910c6116085a3982b798f34
diff --git a/metadata/md5-cache/dev-ruby/mash-0.1.1-r2 b/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
index 1233aea9bf83..6a13fd8cace3 100644
--- a/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mash-0.1.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=35f5f7fa7856e68c454ced53f0f78174
diff --git a/metadata/md5-cache/dev-ruby/maxitest-3.6.0 b/metadata/md5-cache/dev-ruby/maxitest-3.6.0
index 9c1fac949f3c..e04eabf2a9d5 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-3.6.0
+++ b/metadata/md5-cache/dev-ruby/maxitest-3.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v3.6.0.tar.gz -> maxitest-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=925b53f48b2ebdcab7aeb0f49b0d7e44
diff --git a/metadata/md5-cache/dev-ruby/maxitest-3.6.0-r1 b/metadata/md5-cache/dev-ruby/maxitest-3.6.0-r1
index 1c8ef84cc3e9..3c3a51e4d49c 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-3.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/maxitest-3.6.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v3.6.0.tar.gz -> maxitest-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e518c86331625b1dfb032f2d13de79f
diff --git a/metadata/md5-cache/dev-ruby/maxitest-3.7.0 b/metadata/md5-cache/dev-ruby/maxitest-3.7.0
index f15a569e6eff..a707ad0a4a95 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-3.7.0
+++ b/metadata/md5-cache/dev-ruby/maxitest-3.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v3.7.0.tar.gz -> maxitest-3.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=90914349c55fc7175d99328253af2b16
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.7 b/metadata/md5-cache/dev-ruby/mechanize-2.7.7
index dc330a8c2723..efeed4c950bc 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.7
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mechanize-2.7.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5cc82da74885cbce42a1000503e93981
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.8.0 b/metadata/md5-cache/dev-ruby/mechanize-2.8.0
index 21f10342883f..ebfda30affbe 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.8.0
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mechanize-2.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26ac86d339f8810831eba55bad59fd1c
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.8.1 b/metadata/md5-cache/dev-ruby/mechanize-2.8.1
index bf83b6c4de52..179de569dfcf 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.8.1
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mechanize-2.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=86d45de62d740fd7a7f1bc9574225013
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.8.2 b/metadata/md5-cache/dev-ruby/mechanize-2.8.2
index 9ed98738dee4..3fd432781202 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.8.2
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mechanize-2.8.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=148c7ab1702b29b8e701e7b31ecec22b
diff --git a/metadata/md5-cache/dev-ruby/memoist-0.16.2 b/metadata/md5-cache/dev-ruby/memoist-0.16.2
index 72665a489265..bb187cf04c8b 100644
--- a/metadata/md5-cache/dev-ruby/memoist-0.16.2
+++ b/metadata/md5-cache/dev-ruby/memoist-0.16.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/memoist-0.16.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d6046b51310380cefaf54fac04b01a1
diff --git a/metadata/md5-cache/dev-ruby/memoizable-0.4.2 b/metadata/md5-cache/dev-ruby/memoizable-0.4.2
index 320046021d94..14f1e7e1a62e 100644
--- a/metadata/md5-cache/dev-ruby/memoizable-0.4.2
+++ b/metadata/md5-cache/dev-ruby/memoizable-0.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/memoizable-0.4.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eb52c1e49ba747ee813b390218b4013f
diff --git a/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1 b/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
index 9768b4637dff..5c351704e240 100644
--- a/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/memoize-1.3.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=77fb1b8caca38b97bed899b32edbaffc
diff --git a/metadata/md5-cache/dev-ruby/mercenary-0.4.0 b/metadata/md5-cache/dev-ruby/mercenary-0.4.0
index 957ca17e8dd2..b2039b57a012 100644
--- a/metadata/md5-cache/dev-ruby/mercenary-0.4.0
+++ b/metadata/md5-cache/dev-ruby/mercenary-0.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mercenary-0.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17594eed5549b7450b5944245e90bcf5
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.4 b/metadata/md5-cache/dev-ruby/metaclass-0.0.4
index f3d9adc295f7..1772d756d546 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.4
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/floehopper/metaclass/archive/v0.0.4.tar.gz -> metaclass-0.0.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=164dae32624d13e4f7cbb86f51bb5a35
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1 b/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1
index 4e874e888fc7..502a7bbebe74 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/floehopper/metaclass/archive/v0.0.4.tar.gz -> metaclass-0.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=db6076f83b2eea48a1c9c5bdf6a895bd
diff --git a/metadata/md5-cache/dev-ruby/metasm-1.0.4-r1 b/metadata/md5-cache/dev-ruby/metasm-1.0.4-r1
index 09764dffca95..87ec06ffcf6f 100644
--- a/metadata/md5-cache/dev-ruby/metasm-1.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/metasm-1.0.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/metasm-1.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ccec6317c70a91247ec2ab0d177ff635
diff --git a/metadata/md5-cache/dev-ruby/metasm-1.0.5-r1 b/metadata/md5-cache/dev-ruby/metasm-1.0.5-r1
index 4a32101504b3..365c38aec458 100644
--- a/metadata/md5-cache/dev-ruby/metasm-1.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/metasm-1.0.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/metasm-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7b91ba44c210a107534f74c368502311
diff --git a/metadata/md5-cache/dev-ruby/method_source-1.0.0 b/metadata/md5-cache/dev-ruby/method_source-1.0.0
index 44dddd58de05..1f7403017c94 100644
--- a/metadata/md5-cache/dev-ruby/method_source-1.0.0
+++ b/metadata/md5-cache/dev-ruby/method_source-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/method_source-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be8e299b46a9612f1b53d54c2e0917ff
diff --git a/metadata/md5-cache/dev-ruby/middleware-0.1.0 b/metadata/md5-cache/dev-ruby/middleware-0.1.0
index 0cf8bc95d043..a22132e08fd8 100644
--- a/metadata/md5-cache/dev-ruby/middleware-0.1.0
+++ b/metadata/md5-cache/dev-ruby/middleware-0.1.0
@@ -5,12 +5,12 @@ DESCRIPTION=Generalized implementation of the middleware abstraction for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/mitchellh/middleware
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/middleware-0.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7279d6d2e39c2e6802b73355791f27df
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6c30229099a8531216a65c99848d525d
diff --git a/metadata/md5-cache/dev-ruby/mime-types-2.99.2 b/metadata/md5-cache/dev-ruby/mime-types-2.99.2
index a8ca58ad502c..3a265d56e153 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-2.99.2
+++ b/metadata/md5-cache/dev-ruby/mime-types-2.99.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/mime-types-2.99.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=183d57a6d55adeee44ac000b9a08e932
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.3.1 b/metadata/md5-cache/dev-ruby/mime-types-3.3.1
index 3b1ebb585819..a6d5242f7941 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-3.3.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.3.1
@@ -5,12 +5,12 @@ DESCRIPTION=Provides a mailcap-like MIME Content-Type lookup for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/mime-types/ruby-mime-types
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-3.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=02a2e28735ab83725e518b204b06852b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=112c4916486725082f63221c54e2cf53
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0225 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0225
deleted file mode 100644
index d4f8ad27563e..000000000000
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0225
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Registry for information about MIME media type definitions
-EAPI=7
-HOMEPAGE=https://github.com/mime-types/mime-types-data
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=https://rubygems.org/gems/mime-types-data-3.2021.0225.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6027eecfd0d71e8b191abd83477f21e2
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0704 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0704
index 7661352f9e70..df9d57c867dd 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0704
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0704
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-data-3.2021.0704.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a2946bb5a3c1722e12671bc0eb99ce8e
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901
index 00c5b56e065f..47a7b65e401e 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901
@@ -5,12 +5,12 @@ DESCRIPTION=Registry for information about MIME media type definitions
 EAPI=8
 HOMEPAGE=https://github.com/mime-types/mime-types-data
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-data-3.2021.0901.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=39cfb4522caadf9b4c18e9a36b5720e1
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3fafb4cde08807bcffd9173c90f290c7
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.3.10 b/metadata/md5-cache/dev-ruby/mimemagic-0.3.10
index 3e8590aa3401..20a4b9ed281c 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.3.10
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.3.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mimemagicrb/mimemagic/archive/v0.3.10.tar.gz -> mimemagic-0.3.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d8cea8b455708e85d72d76868c1a59e7
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.4.3 b/metadata/md5-cache/dev-ruby/mimemagic-0.4.3
index c25366d894bc..6ec3476a04ac 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.4.3
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.4
 SRC_URI=https://github.com/mimemagicrb/mimemagic/archive/v0.4.3.tar.gz -> mimemagic-0.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=efcbca3c854049164e3949ccf3ced057
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.11.0 b/metadata/md5-cache/dev-ruby/mini_magick-4.11.0
index 389e695d2fd6..a94acf776edb 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.11.0
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v4.11.0.tar.gz -> mini_magick-4.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9dca8e57070ca9fbb4e4a79c4b3aafb7
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.0.2 b/metadata/md5-cache/dev-ruby/mini_mime-1.0.2
deleted file mode 100644
index 416f3e05e6ce..000000000000
--- a/metadata/md5-cache/dev-ruby/mini_mime-1.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DESCRIPTION=A lightweight mime type lookup toy
-EAPI=6
-HOMEPAGE=https://github.com/discourse/mini_mime
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/discourse/mini_mime/archive/v1.0.2.tar.gz -> mini_mime-1.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eb9e2ae42ed7463d0b7f063ee67c5f44
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.0.3 b/metadata/md5-cache/dev-ruby/mini_mime-1.0.3
index 6d7a1d30e95b..b46c77e01903 100644
--- a/metadata/md5-cache/dev-ruby/mini_mime-1.0.3
+++ b/metadata/md5-cache/dev-ruby/mini_mime-1.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/discourse/mini_mime/archive/v1.0.3.tar.gz -> mini_mime-1.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fc8267fc90625e5f91550b2fb0eb3b7c
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.1.0 b/metadata/md5-cache/dev-ruby/mini_mime-1.1.0
deleted file mode 100644
index 0f2126656aae..000000000000
--- a/metadata/md5-cache/dev-ruby/mini_mime-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=A lightweight mime type lookup toy
-EAPI=7
-HOMEPAGE=https://github.com/discourse/mini_mime
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/discourse/mini_mime/archive/v1.1.0.tar.gz -> mini_mime-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ce608a712dcd8d0fe30ecd308fc81163
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.1.1 b/metadata/md5-cache/dev-ruby/mini_mime-1.1.1
index a52f6ca01ad8..14c6e977930e 100644
--- a/metadata/md5-cache/dev-ruby/mini_mime-1.1.1
+++ b/metadata/md5-cache/dev-ruby/mini_mime-1.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/discourse/mini_mime/archive/v1.1.1.tar.gz -> mini_mime-1.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c385e14ab7693b86ba291183347c080
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.1.2 b/metadata/md5-cache/dev-ruby/mini_mime-1.1.2
new file mode 100644
index 000000000000..31a83e5e5cda
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mini_mime-1.1.2
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=A lightweight mime type lookup toy
+EAPI=8
+HOMEPAGE=https://github.com/discourse/mini_mime
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/discourse/mini_mime/archive/v1.1.2.tar.gz -> mini_mime-1.1.2.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8c385e14ab7693b86ba291183347c080
diff --git a/metadata/md5-cache/dev-ruby/mini_portile2-2.6.1 b/metadata/md5-cache/dev-ruby/mini_portile2-2.6.1
index d87793d7d37d..17bd8e4c77b2 100644
--- a/metadata/md5-cache/dev-ruby/mini_portile2-2.6.1
+++ b/metadata/md5-cache/dev-ruby/mini_portile2-2.6.1
@@ -5,12 +5,12 @@ DESCRIPTION=Simplistic port-like solution for developers
 EAPI=8
 HOMEPAGE=https://github.com/flavorjones/mini_portile
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~riscv
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2.6
 SRC_URI=https://rubygems.org/gems/mini_portile2-2.6.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4b028f531df5262d2db613720f228555
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d4436e079db6dd2b39e3bc82052c95d2
diff --git a/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1 b/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1
index 02dfaac827b6..d92b8ab1bda0 100644
--- a/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1
+++ b/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minispec-metadata-3.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b425c9445875f6649831ed561d61d2a6
diff --git a/metadata/md5-cache/dev-ruby/minitar-0.9 b/metadata/md5-cache/dev-ruby/minitar-0.9
index 53c7fcf9696f..602baea513fb 100644
--- a/metadata/md5-cache/dev-ruby/minitar-0.9
+++ b/metadata/md5-cache/dev-ruby/minitar-0.9
@@ -5,12 +5,12 @@ DESCRIPTION=Provides POSIX tarchive management from Ruby programs
 EAPI=7
 HOMEPAGE=https://github.com/halostatue/minitar
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( BSD-2 Ruby )
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/halostatue/minitar/archive/v0.9.tar.gz -> minitar-0.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f1e3ef958f597c3548849fbc67152a32
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4e88cddd3211d1cb143ba641664ca44e
diff --git a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2 b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
index 27d2ee24f913..e4e45ca888cb 100644
--- a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
+++ b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-4.7.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4ad1c20fd5b9979da9a6de14e0ff1a88
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.13.0 b/metadata/md5-cache/dev-ruby/minitest-5.13.0
index d6f86af51a4b..17b0884f0f5b 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.13.0
+++ b/metadata/md5-cache/dev-ruby/minitest-5.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.13.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8124596b9eab8ef82e16e1e87916dff4
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.14.3 b/metadata/md5-cache/dev-ruby/minitest-5.14.3
index d6642a182278..de14a42e431d 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.14.3
+++ b/metadata/md5-cache/dev-ruby/minitest-5.14.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.14.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=405bdcf2b1bb6ce8de0727ec06b535dc
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.14.4 b/metadata/md5-cache/dev-ruby/minitest-5.14.4
index e78fdbebfb8e..fe70e6137047 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.14.4
+++ b/metadata/md5-cache/dev-ruby/minitest-5.14.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/minitest-5.14.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17a583cbc9ee96e05d5ed3ebdab42869
diff --git a/metadata/md5-cache/dev-ruby/minitest-around-0.5.0 b/metadata/md5-cache/dev-ruby/minitest-around-0.5.0
index ff2f503b9be1..c25defadda95 100644
--- a/metadata/md5-cache/dev-ruby/minitest-around-0.5.0
+++ b/metadata/md5-cache/dev-ruby/minitest-around-0.5.0
@@ -4,12 +4,12 @@ DESCRIPTION=Alternative for setup/teardown dance
 EAPI=6
 HOMEPAGE=https://github.com/splattael/minitest-around
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-around-0.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=306bbbc62107f4070427d053c29286a3
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=04e2f7a99826b9457887f4344429bb00
diff --git a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0 b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
index ab31d6a04ce3..4ccebc603951 100644
--- a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
+++ b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/minitest-bonus-assertions-3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=48040033cc64bce051d482fccf05f12e
diff --git a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1 b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
index 5897f90050d8..dc3d5bf05e4b 100644
--- a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Bonus assertions for minitest
 EAPI=7
 HOMEPAGE=https://github.com/halostatue/minitest-bonus-assertions
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/minitest-bonus-assertions-3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=573c5d0355b08c80dba3cd1c3dffa406
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bc7caf9363cd693c5ff21dc5b6571b80
diff --git a/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1 b/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
index e373a56bfb60..3bd6e3ec1bd4 100644
--- a/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
+++ b/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/minitest-global_expectations-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f8ce45a5cf4e253a3a869e50d5dfef8d
diff --git a/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0 b/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
index 606b4792c98f..21c1107baa0f 100644
--- a/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
+++ b/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
@@ -5,12 +5,12 @@ DESCRIPTION=Adds around and before_all/after_all/around_all hooks for Minitest
 EAPI=8
 HOMEPAGE=https://github.com/jeremyevans/minitest-hooks
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/minitest-hooks-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bd2709a2d966951ea5f46a211964887a
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2527b229095b34df99db785df24d1e31
diff --git a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1 b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
index 42aad8f9cc28..f0d2a1763987 100644
--- a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
+++ b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-power_assert-0.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7a4d56a6731dcffd63f54c0fc4ad795a
diff --git a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1 b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
index a9b7cfe44a56..071503520274 100644
--- a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
+++ b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-pretty_diff-0.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c31106bf7cdf36aa1af5cc3d9f0080db
diff --git a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1 b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
index d684b8c5bca0..ec76d72872fa 100644
--- a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Pretty-print hashes and arrays before diffing them in MiniTest
 EAPI=7
 HOMEPAGE=https://github.com/adammck/minitest-pretty_diff
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/minitest-pretty_diff-0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7152497e558dd65043827cf60ef33121
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bc7294e2b9252b6622a891e5b67e37c6
diff --git a/metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9 b/metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9
index a1e1e53c6877..93a36ce26bd5 100644
--- a/metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9
+++ b/metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/opscode/mixlib-shellout/archive/v3.0.9.tar.gz -> mixlib-shellout-3.0.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=930c298477ed3f4b4cbccff575d3d1a8
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1 b/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
index b1f736f87b3f..3f0e57578276 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.14.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.14
 SRC_URI=https://rubygems.org/gems/mocha-0.14.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2199b241b92f9aef177117522bf8dbb5
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.13.0 b/metadata/md5-cache/dev-ruby/mocha-1.13.0
index ff1713b1af6a..a7c98268d490 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.13.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/freerange/mocha/archive/v1.13.0.tar.gz -> mocha-1.13.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8202ef9a9a347566367674ea73606a82
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.3.0 b/metadata/md5-cache/dev-ruby/moneta-1.3.0
index 95f117494b1a..56286a0ecd49 100644
--- a/metadata/md5-cache/dev-ruby/moneta-1.3.0
+++ b/metadata/md5-cache/dev-ruby/moneta-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/moneta/archive/v1.3.0.tar.gz -> moneta-1.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6b05e0c59c9e5c50e67f97fb21960761
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.4.0 b/metadata/md5-cache/dev-ruby/moneta-1.4.0
index 93edbcf1075c..290b771bb886 100644
--- a/metadata/md5-cache/dev-ruby/moneta-1.4.0
+++ b/metadata/md5-cache/dev-ruby/moneta-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/moneta/archive/v1.4.0.tar.gz -> moneta-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6b05e0c59c9e5c50e67f97fb21960761
diff --git a/metadata/md5-cache/dev-ruby/moneta-1.4.1 b/metadata/md5-cache/dev-ruby/moneta-1.4.1
index 3ea629edcc42..8b4782a7dd4f 100644
--- a/metadata/md5-cache/dev-ruby/moneta-1.4.1
+++ b/metadata/md5-cache/dev-ruby/moneta-1.4.1
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=A unified interface to key/value stores
 EAPI=7
 HOMEPAGE=https://github.com/minad/moneta
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 test
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minad/moneta/archive/v1.4.1.tar.gz -> moneta-1.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bba7f3771ed7c4d36d8fb76f09cc3c50
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=966217bd2464eff734e63c4290ef066a
diff --git a/metadata/md5-cache/dev-ruby/mqtt-0.5.0 b/metadata/md5-cache/dev-ruby/mqtt-0.5.0
index 0fbf5611fb02..2b56ab8379a0 100644
--- a/metadata/md5-cache/dev-ruby/mqtt-0.5.0
+++ b/metadata/md5-cache/dev-ruby/mqtt-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/njh/ruby-mqtt/archive/v0.5.0.tar.gz -> mqtt-0.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ebdd4c1bf06228ee8c0a1b0f57aec687
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.3.3 b/metadata/md5-cache/dev-ruby/msgpack-1.3.3
index af52ed12137e..7e0970dec503 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.3.3
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.3.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/msgpack-1.3.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=611c6b8a44f2d56a30a0baeddaa35f3b
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.4.2 b/metadata/md5-cache/dev-ruby/msgpack-1.4.2
index 8c735c37af91..726adfc79550 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.4.2
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/msgpack-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5599d3e66964f08de67fd1aa2e854561
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.14.1 b/metadata/md5-cache/dev-ruby/multi_json-1.14.1
index dbfdf54656e0..5df033e07494 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.14.1
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.14.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.14.1.tar.gz -> multi_json-1.14.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d69b69aa313fe02b40f7eb04b921a3d
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.15.0 b/metadata/md5-cache/dev-ruby/multi_json-1.15.0
index fc2dd080f074..a68e303a0087 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.15.0
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.15.0.tar.gz -> multi_json-1.15.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cbbd50160de172b98f3226337cc0f996
diff --git a/metadata/md5-cache/dev-ruby/multi_test-0.1.2 b/metadata/md5-cache/dev-ruby/multi_test-0.1.2
index ad79735d7f73..09370440663f 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-0.1.2
+++ b/metadata/md5-cache/dev-ruby/multi_test-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/multi_test-0.1.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=98b554c1097a23b8c6309a8c179efdfa
diff --git a/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1 b/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
index 7decc626a453..77a377954ae0 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/multi_test-0.1.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/multi_test-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dd3deecff1e0ed6032762b8638ba786c
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1 b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1
index 3871a8f02ed9..35553494709b 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sferik/multi_xml/archive/v0.6.0.tar.gz -> multi_xml-0.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8ac9ac39ee4b6900e2ac52472728a134
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2 b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2
index 14da74da1a24..56eec933745e 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sferik/multi_xml/archive/v0.6.0.tar.gz -> multi_xml-0.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=74ce59a9ce522d224f696a463db30867
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.1.1 b/metadata/md5-cache/dev-ruby/multipart-post-2.1.1
index e1da548bedaf..bc90473db0ca 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.1.1
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/multipart-post-2.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aef71f88657a959ba3b2ca3ee1c78e7f
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.1.1 b/metadata/md5-cache/dev-ruby/mustache-1.1.1
index 977f86fe7ff6..d2332d082dc6 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.1.1
+++ b/metadata/md5-cache/dev-ruby/mustache-1.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mustache-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0769071b58534beb8f581f28431871a5
diff --git a/metadata/md5-cache/dev-ruby/mustermann-1.1.1 b/metadata/md5-cache/dev-ruby/mustermann-1.1.1
index b417c3f5fc02..288552642bf6 100644
--- a/metadata/md5-cache/dev-ruby/mustermann-1.1.1
+++ b/metadata/md5-cache/dev-ruby/mustermann-1.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/mustermann-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1e08ac7f6243ad83bc1c723f697b2ab1
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1 b/metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1
index b9e2fda99351..b68584a2a2bc 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.5.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( mariadb mysql ) || ( ruby_targets_ruby26 ruby_targets_ruby27 r
 RESTRICT=!test? ( test )
 SLOT=0.5
 SRC_URI=https://rubygems.org/gems/mysql2-0.5.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c1ebc216cc852015e115fb6dc2e90ba
diff --git a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1 b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
index 55a4720db323..f8aaaf264d72 100644
--- a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nagios_analyzer-0.0.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f0b0af24203bc3bb4eb1c11a9119317e
diff --git a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1 b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
index c99fb4024d59..f74a0c2e0027 100644
--- a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
+++ b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nanotest-0.9.4.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cc1e21ce305800cdc10c822bddee28a5
diff --git a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1 b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
index 01e34e115dc1..658e9c7d7c61 100644
--- a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nanotest-0.9.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1f8e69627c71891beddfdd1dd36f25e9
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.2 b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
index 8c39171d72bc..f72a98d2947d 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.1.2
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.1.2.tar.gz -> narray-0.6.1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e03af14f531782d404c225c962c4e021
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r1 b/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r1
new file mode 100644
index 000000000000..eaac65d13df1
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Numerical N-dimensional Array class
+EAPI=8
+HOMEPAGE=https://masa16.github.io/narray/
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test
+KEYWORDS=~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/masa16/narray/archive/0.6.1.2.tar.gz -> narray-0.6.1.2.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6c0ccd4e625584dbb95f5026faad6a62
diff --git a/metadata/md5-cache/dev-ruby/naught-1.1.0 b/metadata/md5-cache/dev-ruby/naught-1.1.0
index 7037f5554dca..7bbc36721e7f 100644
--- a/metadata/md5-cache/dev-ruby/naught-1.1.0
+++ b/metadata/md5-cache/dev-ruby/naught-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/naught-1.1.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f8772675adeda7154ac39b91dcaec1e0
diff --git a/metadata/md5-cache/dev-ruby/necromancer-0.5.1 b/metadata/md5-cache/dev-ruby/necromancer-0.5.1
index d3e7d3c647fa..83e676644d3b 100644
--- a/metadata/md5-cache/dev-ruby/necromancer-0.5.1
+++ b/metadata/md5-cache/dev-ruby/necromancer-0.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/necromancer-0.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1365ed1f8149a96ef7b2b3675e2f5223
diff --git a/metadata/md5-cache/dev-ruby/necromancer-0.7.0 b/metadata/md5-cache/dev-ruby/necromancer-0.7.0
index 3c2c8ba50edc..2661f00d51be 100644
--- a/metadata/md5-cache/dev-ruby/necromancer-0.7.0
+++ b/metadata/md5-cache/dev-ruby/necromancer-0.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/necromancer/archive/v0.7.0.tar.gz -> necromancer-0.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=969125575321f0b35b32bd3702f4a009
diff --git a/metadata/md5-cache/dev-ruby/nenv-0.3.0 b/metadata/md5-cache/dev-ruby/nenv-0.3.0
index b5854a14fde8..e7ea77abec54 100644
--- a/metadata/md5-cache/dev-ruby/nenv-0.3.0
+++ b/metadata/md5-cache/dev-ruby/nenv-0.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/e2/nenv/archive/v0.3.0.tar.gz -> nenv-0.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ba70ca270821b907b8fba241cf5c4b5d
diff --git a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.8.1-r1 b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.8.1-r1
index b7899a330be1..a8c4290ba5ae 100644
--- a/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/neovim-ruby-client-0.8.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/neovim-0.8.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b5a33a9356267b812a7a9ea9f9fe327d
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
index b566c96e479e..25331bf748d7 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/net-http-digest_auth-1.4.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f81ed009ca52ebc2aca5849bcd9cc522
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
index 9fd428254ea8..24be60843755 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/net-http-digest_auth-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ddfd1274226735fd63bdbad28624bac
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-3.0.0 b/metadata/md5-cache/dev-ruby/net-http-persistent-3.0.0
deleted file mode 100644
index 5f7334b01797..000000000000
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-3.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/hoe[ruby_targets_ruby26(-)] dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8
-EAPI=6
-HOMEPAGE=https://github.com/drbrain/net-http-persistent
-IUSE=doc test test ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://rubygems.org/gems/net-http-persistent-3.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7e3337a52a573b8e3990b81debcc8cda
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0 b/metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0
index 51e628b549f8..b221f2c56406 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-3.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/net-http-persistent-3.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d4823acda6f39b2a3bac8340d7acefc
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.0 b/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.0
deleted file mode 100644
index 4f347f477620..000000000000
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/hoe[ruby_targets_ruby26(-)] dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/hoe[ruby_targets_ruby27(-)] dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8
-EAPI=7
-HOMEPAGE=https://github.com/drbrain/net-http-persistent
-IUSE=doc test test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/connection_pool-2.2:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=4
-SRC_URI=https://rubygems.org/gems/net-http-persistent-4.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bd612a8d2929ecbad66f14cca6740117
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1 b/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1
index 5816d55f40db..7065eca65191 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-4.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/net-http-persistent-4.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b981f78994353509c4f729f5588d6be6
diff --git a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1 b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
index fc4a7973b0e6..c749ea359072 100644
--- a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
+++ b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/net-http-pipeline-1.0.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=964dce7f6e3e0310526fee3c937b02c9
diff --git a/metadata/md5-cache/dev-ruby/net-scp-3.0.0 b/metadata/md5-cache/dev-ruby/net-scp-3.0.0
index e31fd82d0683..1f6fb7411d8b 100644
--- a/metadata/md5-cache/dev-ruby/net-scp-3.0.0
+++ b/metadata/md5-cache/dev-ruby/net-scp-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-scp/archive/v3.0.0.tar.gz -> net-scp-3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b0cc17454609b31e3a38448e8360c599
diff --git a/metadata/md5-cache/dev-ruby/net-sftp-3.0.0 b/metadata/md5-cache/dev-ruby/net-sftp-3.0.0
index eda6258f9b26..64381c5e76f0 100644
--- a/metadata/md5-cache/dev-ruby/net-sftp-3.0.0
+++ b/metadata/md5-cache/dev-ruby/net-sftp-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-sftp/archive/v3.0.0.tar.gz -> net-sftp-3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f204728753df33bee8d85f861e23cdeb
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-5.2.0 b/metadata/md5-cache/dev-ruby/net-ssh-5.2.0
index 6e47acaaacde..4806dcb07d45 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-5.2.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-5.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v5.2.0.tar.gz -> net-ssh-git-5.2.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed002f949b3e4b262a06ca0b637ed7a4
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1 b/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1
index 321a82d8af0d..8b9e4e1d6966 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v6.1.0.tar.gz -> net-ssh-git-6.1.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e71e07afcf5a6a3549410b87b7520d51
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
index e20db5fadc21..20f97aa6a47e 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.0
 SRC_URI=https://github.com/net-ssh/net-ssh-gateway/archive/2.0.0.tar.gz -> net-ssh-gateway-2.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6e2568a876359508a1024f1bd15e0439
diff --git a/metadata/md5-cache/dev-ruby/net-telnet-0.2.0 b/metadata/md5-cache/dev-ruby/net-telnet-0.2.0
index a3ebb1ba9048..aac172436bd6 100644
--- a/metadata/md5-cache/dev-ruby/net-telnet-0.2.0
+++ b/metadata/md5-cache/dev-ruby/net-telnet-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby/net-telnet/archive/v0.2.0.tar.gz -> net-telnet-0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b143fd426b27eb310539b49449aae28
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.11.0 b/metadata/md5-cache/dev-ruby/netrc-0.11.0
index 70383fc90ba6..b979a424445d 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.11.0
+++ b/metadata/md5-cache/dev-ruby/netrc-0.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/netrc-0.11.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2c455b30f2a59d3330faf076c7e86c44
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.11.0-r1 b/metadata/md5-cache/dev-ruby/netrc-0.11.0-r1
index bfa43a361d2d..913fb3cbfc05 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.11.0-r1
+++ b/metadata/md5-cache/dev-ruby/netrc-0.11.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/netrc-0.11.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e6e0a0212fe69c2c211053cbec2df04
diff --git a/metadata/md5-cache/dev-ruby/network_interface-0.0.2 b/metadata/md5-cache/dev-ruby/network_interface-0.0.2
index 5306d03c1730..ac32bd2456d8 100644
--- a/metadata/md5-cache/dev-ruby/network_interface-0.0.2
+++ b/metadata/md5-cache/dev-ruby/network_interface-0.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/network_interface-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83fa0e9cd3dee0ad2d390e681a92a236
diff --git a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2 b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
index ced556c32321..0b033dd38fcc 100644
--- a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
+++ b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/niceogiri-1.1.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1be431808e617fc2081b959ad8c138c3
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.5.4 b/metadata/md5-cache/dev-ruby/nio4r-2.5.4
index 604732a626bf..ad5ad7195cc9 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-2.5.4
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.5.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/nio4r-2.5.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=daf0fd8829a69b5f9c177203bc3cf002
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.5.5 b/metadata/md5-cache/dev-ruby/nio4r-2.5.5
index 01fda5b43153..a6cfcaa382ea 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-2.5.5
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.5.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/nio4r-2.5.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cff96dbb977ba343a58db0d3d7f5a2bf
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.5.5-r1 b/metadata/md5-cache/dev-ruby/nio4r-2.5.5-r1
index 61402618e080..8f1cd6455a4c 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-2.5.5-r1
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.5.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/nio4r-2.5.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fe3e421548053410a00435d93cfed2d2
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.5.7 b/metadata/md5-cache/dev-ruby/nio4r-2.5.7
index 0e9c6fc1089f..7adc5eb264f0 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-2.5.7
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.5.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/nio4r-2.5.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95df9996217d5497fe543f6ca63b5bc8
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.5.8 b/metadata/md5-cache/dev-ruby/nio4r-2.5.8
index 4a8290b368b3..9ccca08cf09c 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-2.5.8
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.5.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/nio4r-2.5.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad274c3596c9b4cb8b5623afb4f37c9f
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.11.7 b/metadata/md5-cache/dev-ruby/nokogiri-1.11.7
index eb86e80794fd..8979bf5ab07b 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.11.7
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.11.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.11.7.tar.gz -> nokogiri-1.11.7-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=821776a54e9d94087f2fef744efbaee9
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.12.5 b/metadata/md5-cache/dev-ruby/nokogiri-1.12.5
index 42d42eddf713..db2a3386c39a 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.12.5
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.12.5
@@ -5,12 +5,12 @@ DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
 EAPI=8
 HOMEPAGE=https://www.nokogiri.org/
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~riscv
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.12:= >=dev-libs/libxslt-1.1.34 sys-libs/zlib virtual/libiconv ruby_targets_ruby26? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.12.5.tar.gz -> nokogiri-1.12.5-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=36d3068e74a556525457d78cee4c8bbf
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2a669064d63cbfccbef3cd6edc9b3c3e
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2 b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
index 51c99e915e20..d04558f2cdff 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nokogiri-diff-0.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=294144afc3d7762dfb64aaf06a0bd3e3
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-2.0.5-r1 b/metadata/md5-cache/dev-ruby/nokogumbo-2.0.5-r1
index b96a61bcbee0..91768d94c363 100644
--- a/metadata/md5-cache/dev-ruby/nokogumbo-2.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-2.0.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rubys/nokogumbo/archive/v2.0.5.tar.gz -> nokogumbo-2.0.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=af490ee2cf5e9d1bd24978cb15a223f7
diff --git a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2 b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
index 79390e3f077b..4d37bd333678 100644
--- a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ntlm-http-0.1.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=96fdcfe49212069ceaa513c3182088ef
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.5.6 b/metadata/md5-cache/dev-ruby/oauth-0.5.6
index 5fb4c8f7b5d6..b58d21d6ef5f 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.5.6
+++ b/metadata/md5-cache/dev-ruby/oauth-0.5.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oauth-xx/oauth-ruby/archive/v0.5.6.tar.gz -> oauth-0.5.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=31d7c582a1f1e1983af8ec447d604c7c
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.4.4 b/metadata/md5-cache/dev-ruby/oauth2-1.4.4
index b0ca864ac45b..a0979dccb51c 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.4.4
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/oauth2/archive/v1.4.4.tar.gz -> oauth2-1.4.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eee1046d6d1e2c1444b3ed287a8d377b
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.4.7 b/metadata/md5-cache/dev-ruby/oauth2-1.4.7
index d4bd8e551c4d..152a5bbfa3f4 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.4.7
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.4.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/oauth2/archive/v1.4.7.tar.gz -> oauth2-1.4.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=227c2d5647e4aeca5d329e179966598e
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.20.0 b/metadata/md5-cache/dev-ruby/octokit-4.20.0
index a9a1106ff5e2..ad7948776765 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.20.0
+++ b/metadata/md5-cache/dev-ruby/octokit-4.20.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.20.0.tar.gz -> octokit-4.20.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e59d650b160a11a9a441984838cd684d
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.21.0 b/metadata/md5-cache/dev-ruby/octokit-4.21.0
index edf5a497d795..b7a5abe47dde 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.21.0
+++ b/metadata/md5-cache/dev-ruby/octokit-4.21.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.21.0.tar.gz -> octokit-4.21.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e59d650b160a11a9a441984838cd684d
diff --git a/metadata/md5-cache/dev-ruby/omniauth-2.0.4 b/metadata/md5-cache/dev-ruby/omniauth-2.0.4
index c39898873cb3..a5ddb80edc80 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-2.0.4
+++ b/metadata/md5-cache/dev-ruby/omniauth-2.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/intridea/omniauth/archive/v2.0.4.tar.gz -> omniauth-2.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a8921c61d2e19844ad67e24c8f05c04b
diff --git a/metadata/md5-cache/dev-ruby/open4-1.3.4 b/metadata/md5-cache/dev-ruby/open4-1.3.4
index 5a3faaabac4a..138842530f3c 100644
--- a/metadata/md5-cache/dev-ruby/open4-1.3.4
+++ b/metadata/md5-cache/dev-ruby/open4-1.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/open4-1.3.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c501f1fe2f154071bc79d1ec7af73800
diff --git a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2 b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
index 0a802a47aea7..fe86394526bb 100644
--- a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
+++ b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.2.2
 SRC_URI=https://rubygems.org/gems/openssl-ccm-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e7a4e7a44cae6ae17f6d681d3961543f
diff --git a/metadata/md5-cache/dev-ruby/optimist-3.0.1 b/metadata/md5-cache/dev-ruby/optimist-3.0.1
index a136593e7ce3..de2b3cb87578 100644
--- a/metadata/md5-cache/dev-ruby/optimist-3.0.1
+++ b/metadata/md5-cache/dev-ruby/optimist-3.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/optimist-3.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=67e9faca17a176a2d2bed22167eed0eb
diff --git a/metadata/md5-cache/dev-ruby/optionable-0.2.0 b/metadata/md5-cache/dev-ruby/optionable-0.2.0
index 5f46c5b9df22..a3c8b479af3b 100644
--- a/metadata/md5-cache/dev-ruby/optionable-0.2.0
+++ b/metadata/md5-cache/dev-ruby/optionable-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/optionable-0.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=62cc2c23ae55c74c903bb6f9447fe67a
diff --git a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12 b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
index 0251d5411851..d6cf69f94c1d 100644
--- a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
+++ b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wallyqs/org-ruby/archive/version-0.9.12.tar.gz -> org-ruby-0.9.12.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f6a43393f8fcfe6b3d83aa2094ef0ffb
diff --git a/metadata/md5-cache/dev-ruby/origin-2.3.1 b/metadata/md5-cache/dev-ruby/origin-2.3.1
index 9b05e9a11198..42be51125fb8 100644
--- a/metadata/md5-cache/dev-ruby/origin-2.3.1
+++ b/metadata/md5-cache/dev-ruby/origin-2.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongoid/origin/archive/v2.3.1.tar.gz -> origin-2.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cd0e62a71b4f6f0c57089e49eff29da7
diff --git a/metadata/md5-cache/dev-ruby/ox-2.14.1 b/metadata/md5-cache/dev-ruby/ox-2.14.1
index f0d4c5904fca..60a91ecafce0 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.14.1
+++ b/metadata/md5-cache/dev-ruby/ox-2.14.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.14.1.tar.gz -> ox-2.14.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=39922d95debbea8b90b7a6b53ba99159
diff --git a/metadata/md5-cache/dev-ruby/ox-2.14.4 b/metadata/md5-cache/dev-ruby/ox-2.14.4
index a1103cee5f15..2f9305ac4482 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.14.4
+++ b/metadata/md5-cache/dev-ruby/ox-2.14.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.14.4.tar.gz -> ox-2.14.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54121f88a21a6839c12151fa82f54ded
diff --git a/metadata/md5-cache/dev-ruby/ox-2.14.5 b/metadata/md5-cache/dev-ruby/ox-2.14.5
index 673f60e8e080..2c69febfc406 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.14.5
+++ b/metadata/md5-cache/dev-ruby/ox-2.14.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.14.5.tar.gz -> ox-2.14.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=68660ad78d203662e5b6a5566cf63c02
diff --git a/metadata/md5-cache/dev-ruby/packetfu-1.1.13 b/metadata/md5-cache/dev-ruby/packetfu-1.1.13
index cc2e35f81803..2a514b8c4396 100644
--- a/metadata/md5-cache/dev-ruby/packetfu-1.1.13
+++ b/metadata/md5-cache/dev-ruby/packetfu-1.1.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.1.13
 SRC_URI=https://rubygems.org/gems/packetfu-1.1.13.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=79ccdf5be14d8957f5d904881ce031dc
diff --git a/metadata/md5-cache/dev-ruby/paint-2.2.0 b/metadata/md5-cache/dev-ruby/paint-2.2.0
index faf8be742da3..1cbb4d503559 100644
--- a/metadata/md5-cache/dev-ruby/paint-2.2.0
+++ b/metadata/md5-cache/dev-ruby/paint-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janlelis/paint/archive/v2.2.0.tar.gz -> paint-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=106bf803e12fdf3a6fc344c44aa99782
diff --git a/metadata/md5-cache/dev-ruby/paint-2.2.1 b/metadata/md5-cache/dev-ruby/paint-2.2.1
index b30b8ff5f65e..fab8f8e62a97 100644
--- a/metadata/md5-cache/dev-ruby/paint-2.2.1
+++ b/metadata/md5-cache/dev-ruby/paint-2.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/janlelis/paint/archive/v2.2.1.tar.gz -> paint-2.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=374da28f9f0d7c72733bdc4a09b0697c
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.19.2 b/metadata/md5-cache/dev-ruby/parallel-1.19.2
index 695de293af23..d973b2b296c5 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.19.2
+++ b/metadata/md5-cache/dev-ruby/parallel-1.19.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.19.2.tar.gz -> parallel-1.19.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ef211617128125779043df6776a8501
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.20.0 b/metadata/md5-cache/dev-ruby/parallel-1.20.0
index 8f85c89b9132..d11b8fe5d72a 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.20.0
+++ b/metadata/md5-cache/dev-ruby/parallel-1.20.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.20.0.tar.gz -> parallel-1.20.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ef211617128125779043df6776a8501
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.20.1 b/metadata/md5-cache/dev-ruby/parallel-1.20.1
index 31281bdb0e43..f4c34ce7754b 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.20.1
+++ b/metadata/md5-cache/dev-ruby/parallel-1.20.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.20.1.tar.gz -> parallel-1.20.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ef211617128125779043df6776a8501
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.21.0 b/metadata/md5-cache/dev-ruby/parallel-1.21.0
index f1d66da58c13..c11de515625a 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.21.0
+++ b/metadata/md5-cache/dev-ruby/parallel-1.21.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.21.0.tar.gz -> parallel-1.21.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=882f15304c276210e35c297788553dea
diff --git a/metadata/md5-cache/dev-ruby/paramesan-0.1.1 b/metadata/md5-cache/dev-ruby/paramesan-0.1.1
index b6197f4ebd74..712ae6694b60 100644
--- a/metadata/md5-cache/dev-ruby/paramesan-0.1.1
+++ b/metadata/md5-cache/dev-ruby/paramesan-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jpace/paramesan/archive/v0.1.1.tar.gz -> paramesan-0.1.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4082f55aca0133f24586924aecfc11ca
diff --git a/metadata/md5-cache/dev-ruby/paramesan-1.0.1 b/metadata/md5-cache/dev-ruby/paramesan-1.0.1
index 38cd65d4291f..6c25b21189f2 100644
--- a/metadata/md5-cache/dev-ruby/paramesan-1.0.1
+++ b/metadata/md5-cache/dev-ruby/paramesan-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jpace/paramesan/archive/v1.0.1.tar.gz -> paramesan-1.0.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eb1c3b74530dc318685479a20bfceba5
diff --git a/metadata/md5-cache/dev-ruby/parser-2.7.1.5 b/metadata/md5-cache/dev-ruby/parser-2.7.1.5
index 49785fe2ba29..dfe8eaaa4907 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.7.1.5
+++ b/metadata/md5-cache/dev-ruby/parser-2.7.1.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/parser-2.7.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d669eaea2d72b31d29ba5ef9627290e1
diff --git a/metadata/md5-cache/dev-ruby/parser-2.7.2.0 b/metadata/md5-cache/dev-ruby/parser-2.7.2.0
index 1ab74d919348..69bdae86530b 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.7.2.0
+++ b/metadata/md5-cache/dev-ruby/parser-2.7.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v2.7.2.0.tar.gz -> parser-2.7.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5cc36e60b7a557d82fffe667ca4b0d57
diff --git a/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1 b/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
index 2c958a1db851..b0274c7e5ef1 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v2.7.2.0.tar.gz -> parser-2.7.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2c637fb3c8788602d77d5a331d5bf7e
diff --git a/metadata/md5-cache/dev-ruby/parser-3.0.0.0 b/metadata/md5-cache/dev-ruby/parser-3.0.0.0
index 327ed0d94c40..4c103f46fa9b 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.0.0.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.0.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.0.0.0.tar.gz -> parser-3.0.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1a57b4b702653c02f1980d5a8e1c5fd
diff --git a/metadata/md5-cache/dev-ruby/parser-3.0.1.0 b/metadata/md5-cache/dev-ruby/parser-3.0.1.0
index 116f98e1069c..5d376e1d540a 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.0.1.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.0.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.0.1.0.tar.gz -> parser-3.0.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1a57b4b702653c02f1980d5a8e1c5fd
diff --git a/metadata/md5-cache/dev-ruby/parser-3.0.1.1 b/metadata/md5-cache/dev-ruby/parser-3.0.1.1
index 007431214bdd..441b5644f5a2 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.0.1.1
+++ b/metadata/md5-cache/dev-ruby/parser-3.0.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.0.1.1.tar.gz -> parser-3.0.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=65b309941fc82eed061ebaba6d628e2a
diff --git a/metadata/md5-cache/dev-ruby/parser-3.0.2.0 b/metadata/md5-cache/dev-ruby/parser-3.0.2.0
index 322816be6eb6..c11fb9f830fb 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.0.2.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.0.2.0.tar.gz -> parser-3.0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=65b309941fc82eed061ebaba6d628e2a
diff --git a/metadata/md5-cache/dev-ruby/pastel-0.7.4 b/metadata/md5-cache/dev-ruby/pastel-0.7.4
index 8ee0937dba96..7bf4c0faef8b 100644
--- a/metadata/md5-cache/dev-ruby/pastel-0.7.4
+++ b/metadata/md5-cache/dev-ruby/pastel-0.7.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/pastel/archive/v0.7.4.tar.gz -> pastel-0.7.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=319c804270e12852fd66cda52fc67e69
diff --git a/metadata/md5-cache/dev-ruby/pastel-0.8.0 b/metadata/md5-cache/dev-ruby/pastel-0.8.0
index fac5948842c8..6283bc11aaea 100644
--- a/metadata/md5-cache/dev-ruby/pastel-0.8.0
+++ b/metadata/md5-cache/dev-ruby/pastel-0.8.0
@@ -5,12 +5,12 @@ DESCRIPTION=Terminal strings styling with intuitive and clean API
 EAPI=7
 HOMEPAGE=https://github.com/piotrmurach/pastel
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/tty-color-0.5:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/tty-color-0.5:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/tty-color-0.5:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/pastel/archive/v0.8.0.tar.gz -> pastel-0.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b32e0f4d6860b0d57ba112b125a8ce33
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c037e2d6c40318266996101511044d3c
diff --git a/metadata/md5-cache/dev-ruby/path_expander-1.1.0 b/metadata/md5-cache/dev-ruby/path_expander-1.1.0
index 25000aadf63d..99033139e85b 100644
--- a/metadata/md5-cache/dev-ruby/path_expander-1.1.0
+++ b/metadata/md5-cache/dev-ruby/path_expander-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/path_expander-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=91d1600b928aa7f8f71b020b471374d0
diff --git a/metadata/md5-cache/dev-ruby/pathutil-0.16.2 b/metadata/md5-cache/dev-ruby/pathutil-0.16.2
index 51b8095789ff..085f6f61846f 100644
--- a/metadata/md5-cache/dev-ruby/pathutil-0.16.2
+++ b/metadata/md5-cache/dev-ruby/pathutil-0.16.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/envygeeks/pathutil/archive/v0.16.2.tar.gz -> pathutil-0.16.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2773ee4d8a0940af16e09e628959d21b
diff --git a/metadata/md5-cache/dev-ruby/patron-0.13.1-r1 b/metadata/md5-cache/dev-ruby/patron-0.13.1-r1
index a7571fdda174..b9b8106efb36 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.13.1-r1
+++ b/metadata/md5-cache/dev-ruby/patron-0.13.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/patron-0.13.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b10b7c9b78475fc53a6f0658ccbddf0
diff --git a/metadata/md5-cache/dev-ruby/patron-0.13.3-r1 b/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
index 340f34bc4375..338091a45bd7 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
+++ b/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/rack[ruby_targets_ruby26(-)] www-servers/puma[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rack[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/rack[ruby_targets_ruby26(-)] www-servers/puma[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rack[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rack[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-misc/curl ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=net-misc/curl ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Patron is a Ruby HTTP client library based on libcurl
 EAPI=7
 HOMEPAGE=https://toland.github.com/patron/
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=net-misc/curl ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=net-misc/curl ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/patron-0.13.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4fa444b6653729e588bcce33dc1634b8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=635f123be43cf1914dab4cde1e75e2c9
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.13.0 b/metadata/md5-cache/dev-ruby/pcaprub-0.13.0
index 588e79e64754..7fe2eed6448c 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.13.0
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0.13
 SRC_URI=https://rubygems.org/gems/pcaprub-0.13.0.gem
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=996a4e30a6a8234d3ed8aa250d5e8e3b
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.7.0 b/metadata/md5-cache/dev-ruby/pdf-core-0.7.0
index 9ef4c1ae8cc1..4356f2a8889a 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.7.0
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/prawnpdf/pdf-core/archive/0.7.0.tar.gz -> pdf-core-0.7.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2412fd6ea9f3c62136f496cba4cf3689
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.8.1 b/metadata/md5-cache/dev-ruby/pdf-core-0.8.1
index 7c09796bcfa4..d53ec6d97909 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.8.1
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/prawnpdf/pdf-core/archive/0.8.1.tar.gz -> pdf-core-0.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=069da159be628c332ba89f4e45c79c8c
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.9.0 b/metadata/md5-cache/dev-ruby/pdf-core-0.9.0
index 9f82e0244caf..037c48ec63cc 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.9.0
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/prawnpdf/pdf-core/archive/0.9.0.tar.gz -> pdf-core-0.9.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c27f69939dfb64ddff1714f8c9f8c0dd
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
index 1c73dfaea2cc..b99ce04577a4 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pdf-inspector-1.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1f888e9c449b0483a08c0cb3e8689c97
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r2 b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r2
index 3b0417649c6d..cda1a6e705ad 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r2
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yob/pdf-reader/archive/v1.4.1.tar.gz -> pdf-reader-1.4.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a177a7d99a754a3b168ab1ecc72b3955
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r3 b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r3
index 28fe6eca2387..54a67523ff84 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r3
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yob/pdf-reader/archive/v1.4.1.tar.gz -> pdf-reader-1.4.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=485b1b6b3b4c461708c2c875b2456a9c
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.4.0 b/metadata/md5-cache/dev-ruby/pdf-reader-2.4.0
index ded142eb515b..bd96e92277b8 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.4.0
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.4.0.tar.gz -> pdf-reader-2.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b451eacdf93301e8e1f603296f77e824
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.4.1 b/metadata/md5-cache/dev-ruby/pdf-reader-2.4.1
index 4c6a8127abb6..b48da10f9cb7 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.4.1
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.4.1.tar.gz -> pdf-reader-2.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5c8ee7d02b2fc8278780ce8a3a994ffb
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.4.2 b/metadata/md5-cache/dev-ruby/pdf-reader-2.4.2
index 7b8c87a8eafd..898b9341a39c 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.4.2
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.4.2.tar.gz -> pdf-reader-2.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3f56f86a1f26ca942b97bf8857a1bac
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-2.5.0 b/metadata/md5-cache/dev-ruby/pdf-reader-2.5.0
index 2f4e6ce24f08..0030684c9644 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-2.5.0
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-2.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/yob/pdf-reader/archive/v2.5.0.tar.gz -> pdf-reader-2.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3f56f86a1f26ca942b97bf8857a1bac
diff --git a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1 b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
index 59cffd3c4564..a6da9ab04a34 100644
--- a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
+++ b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/permutation-0.1.8.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4040ccd498c3e933dbd154e68e780704
diff --git a/metadata/md5-cache/dev-ruby/pg-1.2.2 b/metadata/md5-cache/dev-ruby/pg-1.2.2
index 81c14ce078e7..ac49319530be 100644
--- a/metadata/md5-cache/dev-ruby/pg-1.2.2
+++ b/metadata/md5-cache/dev-ruby/pg-1.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/pg-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83cc29a34cfc7ab5e94ffade28ef5aa8
diff --git a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2 b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
index a5ee4ca40be5..3274fd1af14d 100644
--- a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
+++ b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.0.9
 SRC_URI=https://rubygems.org/gems/pg_array_parser-0.0.9.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c65ed4b1f6fd2f2cbde6d61f6f226b3f
diff --git a/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r3 b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r3
new file mode 100644
index 000000000000..9ae961cfce7d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r3
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-ruby/bundler[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/bundler[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Simple library to parse PostgreSQL arrays into a array of strings
+EAPI=8
+HOMEPAGE=https://github.com/dockyard/pg_array_parser
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0.0.9
+SRC_URI=https://rubygems.org/gems/pg_array_parser-0.0.9.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b5f8d7e150b383a367ad1e87869810cb
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.1 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
index c74af1865ca9..10b914808d0d 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e0d9da3d651b6bf4a60aebbc0d034e3c
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.2 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.2
index 701f07df3e27..6d9dd8d98098 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.2
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fb634a7018b03dd48d886cb853b88fba
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.3 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.3
index 9af3e4ed2109..63382ad3da6f 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.3
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=56c94707896826f4945ee0c8fe45353b
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.4 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.4
index eb809159face..ed5407032978 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.4
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=596a96a4fc449ea49fc5a8ad6e029f65
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.5 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.5
index 6544ef831425..3f61f4d08e50 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.5
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=596a96a4fc449ea49fc5a8ad6e029f65
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.6 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
index 684b0334920c..3453dd1d2a8a 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=30423886b6c87d83bc93239a6dde327e
diff --git a/metadata/md5-cache/dev-ruby/plist-3.5.0 b/metadata/md5-cache/dev-ruby/plist-3.5.0
index 2e9e0a36a15a..9bc276e6ce23 100644
--- a/metadata/md5-cache/dev-ruby/plist-3.5.0
+++ b/metadata/md5-cache/dev-ruby/plist-3.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/patsplat/plist/archive/v3.5.0.tar.gz -> plist-3.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=540b53a3521c8fd03d480750ec1e0cda
diff --git a/metadata/md5-cache/dev-ruby/plist-3.6.0 b/metadata/md5-cache/dev-ruby/plist-3.6.0
index 5d0d738ff21d..b42728898940 100644
--- a/metadata/md5-cache/dev-ruby/plist-3.6.0
+++ b/metadata/md5-cache/dev-ruby/plist-3.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/patsplat/plist/archive/v3.6.0.tar.gz -> plist-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5de5113e4a77d668f04b242b348c0d8e
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.2.0 b/metadata/md5-cache/dev-ruby/pluggaloid-1.2.0
index e924b7c6e6bf..d1bfdea56867 100644
--- a/metadata/md5-cache/dev-ruby/pluggaloid-1.2.0
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pluggaloid-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d51c011f51fa1641230b12bb13c326b
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.5.0 b/metadata/md5-cache/dev-ruby/pluggaloid-1.5.0
index 304bbfd719c2..156292a76aeb 100644
--- a/metadata/md5-cache/dev-ruby/pluggaloid-1.5.0
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pluggaloid-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=810ff5a9aa3e2ca75270afe7560f8954
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.7.0 b/metadata/md5-cache/dev-ruby/pluggaloid-1.7.0
index 6fe4df57f032..5beb79a4c83a 100644
--- a/metadata/md5-cache/dev-ruby/pluggaloid-1.7.0
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pluggaloid-1.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1f80b11d172aae60701be1cf18bb744f
diff --git a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2 b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
index 49a81c4796cf..ca252c6220f0 100644
--- a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/podcast-0.0.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=97744be1821b2b801ad8d2c7898ee664
diff --git a/metadata/md5-cache/dev-ruby/polyglot-0.3.5 b/metadata/md5-cache/dev-ruby/polyglot-0.3.5
index 0352e848f0c7..220cf8d98a30 100644
--- a/metadata/md5-cache/dev-ruby/polyglot-0.3.5
+++ b/metadata/md5-cache/dev-ruby/polyglot-0.3.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/polyglot-0.3.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a8fecb39d7872a2fd0c89f20f7e57f0c
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.14 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.14
index eddad991fa16..fc1c5646cd03 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.14
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.14
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/posix-spawn-0.3.14.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=250e2eaa64c8cebb2e5586fb2e78c800
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.15 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.15
index 53a54e9c3de6..93fcb2d8f5f7 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.15
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.15
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/posix-spawn-0.3.15.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=55808df16c4ea6057e56e1e2ca5a9072
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.1.7 b/metadata/md5-cache/dev-ruby/power_assert-1.1.7
index 07b3062c692b..ee4e48bad19c 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-1.1.7
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.1.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/k-tsj/power_assert/archive/v1.1.7.tar.gz -> power_assert-1.1.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b01c7376d047a656c1f9f137fdf2b8c7
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.2.0 b/metadata/md5-cache/dev-ruby/power_assert-1.2.0
index 6a84382085c7..10a84fdf9548 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-1.2.0
+++ b/metadata/md5-cache/dev-ruby/power_assert-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/power_assert/archive/v1.2.0.tar.gz -> power_assert-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=307cba43edef1687661822595092456a
diff --git a/metadata/md5-cache/dev-ruby/power_assert-2.0.0 b/metadata/md5-cache/dev-ruby/power_assert-2.0.0
index 3b2f341d54b4..ba662705ee88 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-2.0.0
+++ b/metadata/md5-cache/dev-ruby/power_assert-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/power_assert/archive/v2.0.0.tar.gz -> power_assert-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=202b4d3644cd1db5af8af0040e8b4c6f
diff --git a/metadata/md5-cache/dev-ruby/power_assert-2.0.1 b/metadata/md5-cache/dev-ruby/power_assert-2.0.1
index 432e4514a856..beb12f9f96e7 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-2.0.1
+++ b/metadata/md5-cache/dev-ruby/power_assert-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/power_assert/archive/v2.0.1.tar.gz -> power_assert-2.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=75058cb282e24218b0c25eefd4295f99
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.2.2 b/metadata/md5-cache/dev-ruby/prawn-2.2.2
index dc2b4ccb1209..3bbaec89c9bf 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.2.2
+++ b/metadata/md5-cache/dev-ruby/prawn-2.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/prawnpdf/prawn/archive/2.2.2.tar.gz -> prawn-2.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b94071e14cf4bfdf812379e4fb33576c
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.4.0 b/metadata/md5-cache/dev-ruby/prawn-2.4.0
index 2486ebeb7bb8..9682967d96e6 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.4.0
+++ b/metadata/md5-cache/dev-ruby/prawn-2.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/prawnpdf/prawn/archive/2.4.0.tar.gz -> prawn-2.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ff5868f9682bbf2776b9e767bcbf43d
diff --git a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1 b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1
index 3151ee59c8d3..54efb612b97b 100644
--- a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/prawn-table-0.2.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a650c6296a687b90c61d400b50f94150
diff --git a/metadata/md5-cache/dev-ruby/pry-0.13.1 b/metadata/md5-cache/dev-ruby/pry-0.13.1
index 62e26a66ebf2..018c109c3304 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.13.1
+++ b/metadata/md5-cache/dev-ruby/pry-0.13.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.13.1.tar.gz -> pry-0.13.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8242c00fad9d949991d23da3a7a7b735
diff --git a/metadata/md5-cache/dev-ruby/pry-0.14.0 b/metadata/md5-cache/dev-ruby/pry-0.14.0
index 489353ba6c24..b99f3708597a 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.14.0
+++ b/metadata/md5-cache/dev-ruby/pry-0.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.14.0.tar.gz -> pry-0.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d7b60def875cc7e201efc562d8050c86
diff --git a/metadata/md5-cache/dev-ruby/pry-0.14.1 b/metadata/md5-cache/dev-ruby/pry-0.14.1
index 94a234a13de2..3f056905d3a8 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.14.1
+++ b/metadata/md5-cache/dev-ruby/pry-0.14.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.14.1.tar.gz -> pry-0.14.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=08ee07c7e0a19c9939de70b193e0edb5
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-3.1.1 b/metadata/md5-cache/dev-ruby/public_suffix-3.1.1
index c39be7f087ef..75743da14573 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-3.1.1
+++ b/metadata/md5-cache/dev-ruby/public_suffix-3.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/public_suffix-3.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c0255de1017037823ce09499ef81da56
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-4.0.5 b/metadata/md5-cache/dev-ruby/public_suffix-4.0.5
index 0331aafffc8d..1e29d3a643f3 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-4.0.5
+++ b/metadata/md5-cache/dev-ruby/public_suffix-4.0.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/public_suffix-4.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=409839739e1ea5ad9986e8d2b7b40782
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-4.0.6 b/metadata/md5-cache/dev-ruby/public_suffix-4.0.6
index 5e67553fe5d7..8d8e715084cc 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-4.0.6
+++ b/metadata/md5-cache/dev-ruby/public_suffix-4.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/public_suffix-4.0.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5ab0036972ebbf714f1f112a2087ce7b
diff --git a/metadata/md5-cache/dev-ruby/pundit-2.1.0 b/metadata/md5-cache/dev-ruby/pundit-2.1.0
index 4669876137c9..991692590ae6 100644
--- a/metadata/md5-cache/dev-ruby/pundit-2.1.0
+++ b/metadata/md5-cache/dev-ruby/pundit-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/pundit-2.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=71e8c7845ce69c470e19d143ab85f037
diff --git a/metadata/md5-cache/dev-ruby/pundit-2.1.1 b/metadata/md5-cache/dev-ruby/pundit-2.1.1
index 566327c0d582..edb5b19db16b 100644
--- a/metadata/md5-cache/dev-ruby/pundit-2.1.1
+++ b/metadata/md5-cache/dev-ruby/pundit-2.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/pundit-2.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7cce9495ac2aa6fb1c324e43f3a8669a
diff --git a/metadata/md5-cache/dev-ruby/puppet_forge-2.3.4 b/metadata/md5-cache/dev-ruby/puppet_forge-2.3.4
index 0285dc00000a..bfc6ac1720c7 100644
--- a/metadata/md5-cache/dev-ruby/puppet_forge-2.3.4
+++ b/metadata/md5-cache/dev-ruby/puppet_forge-2.3.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/puppet_forge-2.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6561d89db28219445d210f486f5f2f52
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-7.6.0 b/metadata/md5-cache/dev-ruby/puppetdb-termini-7.6.0
index 782fc7113c6b..6dc613ccfdd1 100644
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-7.6.0
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-7.6.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Library needed to connect puppet to puppetdb
 EAPI=7
 HOMEPAGE=https://puppet.com/docs/puppetdb/latest/index.html
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/stretch/puppet/p/puppetdb-termini/puppetdb-termini_7.6.0-1stretch_all.deb
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=96988590c2b67b60ffc27080a1c54d60
+_md5_=30cbd67d502d678d77ca54b7fb8b2de7
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-7.7.0 b/metadata/md5-cache/dev-ruby/puppetdb-termini-7.7.0
new file mode 100644
index 000000000000..6452b79cfd42
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-7.7.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Library needed to connect puppet to puppetdb
+EAPI=7
+HOMEPAGE=https://puppet.com/docs/puppetdb/latest/index.html
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=http://apt.puppetlabs.com/pool/stretch/puppet/p/puppetdb-termini/puppetdb-termini_7.7.0-1stretch_all.deb
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
+_md5_=96988590c2b67b60ffc27080a1c54d60
diff --git a/metadata/md5-cache/dev-ruby/pusher-client-0.6.2 b/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
index 7f8d1a5f55ce..720486dbe322 100644
--- a/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
+++ b/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pusher-client-0.6.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=95924b0260a4dc72de51d785511fe813
diff --git a/metadata/md5-cache/dev-ruby/qed-2.9.2 b/metadata/md5-cache/dev-ruby/qed-2.9.2
index 40ccb41b3c70..adc8fc3bce6e 100644
--- a/metadata/md5-cache/dev-ruby/qed-2.9.2
+++ b/metadata/md5-cache/dev-ruby/qed-2.9.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/qed-2.9.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f4a954247f2987d5bea0b954fa460231
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.16-r1 b/metadata/md5-cache/dev-ruby/racc-1.4.16-r1
index e0fde311e152..e5c9e27dcffb 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.16-r1
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.16-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/racc/archive/v1.4.16.tar.gz -> racc-1.4.16.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=14be7494d9823bf822fd579325929e03
diff --git a/metadata/md5-cache/dev-ruby/racc-1.5.2 b/metadata/md5-cache/dev-ruby/racc-1.5.2
index df535e9c3334..5f84b506cdb3 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.5.2
+++ b/metadata/md5-cache/dev-ruby/racc-1.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/racc/archive/v1.5.2.tar.gz -> racc-1.5.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fdea1ac0499fdeec74f75f5035c2e639
diff --git a/metadata/md5-cache/dev-ruby/racc-1.5.2-r1 b/metadata/md5-cache/dev-ruby/racc-1.5.2-r1
index 8b70f39dba82..549c5e42cc47 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/racc-1.5.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tenderlove/racc/archive/v1.5.2.tar.gz -> racc-1.5.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=363789ebaffbba84012876325523b01a
diff --git a/metadata/md5-cache/dev-ruby/rack-2.2.3 b/metadata/md5-cache/dev-ruby/rack-2.2.3
index 464fd6507ac5..6868f58d5235 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.2.3
+++ b/metadata/md5-cache/dev-ruby/rack-2.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.2
 SRC_URI=https://github.com/rack/rack/archive/2.2.3.tar.gz -> rack-2.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d022dcca369658cf084e8e856f956879
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-6.3.1 b/metadata/md5-cache/dev-ruby/rack-attack-6.3.1
index d1c012292430..2e75f919ec08 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-6.3.1
+++ b/metadata/md5-cache/dev-ruby/rack-attack-6.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/rack-attack-6.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c331c58240311ce92a3fc6481f882fe
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-6.4.0 b/metadata/md5-cache/dev-ruby/rack-attack-6.4.0
index 6ba6a93d03b8..0ed10c4f9dea 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-6.4.0
+++ b/metadata/md5-cache/dev-ruby/rack-attack-6.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/rack-attack-6.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f3288639980cca4aa562899451b9c404
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-6.5.0 b/metadata/md5-cache/dev-ruby/rack-attack-6.5.0
index 4f443e2c3f4f..b8d9d9f2a884 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-6.5.0
+++ b/metadata/md5-cache/dev-ruby/rack-attack-6.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/rack-attack-6.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f3288639980cca4aa562899451b9c404
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.12.0 b/metadata/md5-cache/dev-ruby/rack-cache-1.12.0
index dfbe1ad765fc..633377796196 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.12.0
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.12.0.tar.gz -> rack-cache-1.12.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df02194600180f982dcbcab52469efda
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.12.1 b/metadata/md5-cache/dev-ruby/rack-cache-1.12.1
index 5ac64e4b25d0..0750763f480e 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.12.1
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.12.1.tar.gz -> rack-cache-1.12.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7387153f3776c13a697b5b47f7f0474e
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.13.0 b/metadata/md5-cache/dev-ruby/rack-cache-1.13.0
index fc5869ef2cfd..b377efb997ea 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.13.0
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.13.0.tar.gz -> rack-cache-1.13.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c76603ce2206d1aff3679bd22b341c8
diff --git a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2 b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
index 84859e8ebc5f..80656d381cc8 100644
--- a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
+++ b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/rack-openid/archive/v1.4.2.tar.gz -> rack-openid-1.4.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0fc5362c2a5acb8cb257c8f3f4ad7930
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-2.1.0 b/metadata/md5-cache/dev-ruby/rack-protection-2.1.0
index 394a6c06185e..a4d7d12b2a08 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-2.1.0
+++ b/metadata/md5-cache/dev-ruby/rack-protection-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rack-protection-2.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0f303eea10614ab6f331da77452d51b
diff --git a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1 b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
index 7e595e85d488..1a73872105a0 100644
--- a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
+++ b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.4
 SRC_URI=https://github.com/josh/rack-ssl/archive/v1.4.1.tar.gz -> rack-ssl-1.4.1-git.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7c39b7cc9ca9a72d4a6036d413d53c8a
diff --git a/metadata/md5-cache/dev-ruby/rack-test-1.1.0 b/metadata/md5-cache/dev-ruby/rack-test-1.1.0
index 7088fb55d4e7..d84d1729b5c8 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-1.1.0
+++ b/metadata/md5-cache/dev-ruby/rack-test-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/rack-test/rack-test/archive/v1.1.0.tar.gz -> rack-test-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d8d855c9f881c0faf65be552d8e314bb
diff --git a/metadata/md5-cache/dev-ruby/radius-0.7.5 b/metadata/md5-cache/dev-ruby/radius-0.7.5
index 079ca1d99611..c2733966b726 100644
--- a/metadata/md5-cache/dev-ruby/radius-0.7.5
+++ b/metadata/md5-cache/dev-ruby/radius-0.7.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/radius-0.7.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b98375ff88d47a7df9723b75818184e4
diff --git a/metadata/md5-cache/dev-ruby/rails-5.2.6 b/metadata/md5-cache/dev-ruby/rails-5.2.6
index 2bf44b147dba..787b8d60b8bb 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.2.6
+++ b/metadata/md5-cache/dev-ruby/rails-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://rubygems.org/gems/rails-5.2.6.gem
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=26507be0ed860ab012244a6277c60b8c
diff --git a/metadata/md5-cache/dev-ruby/rails-6.0.4.1 b/metadata/md5-cache/dev-ruby/rails-6.0.4.1
index d7f8b0ba1e48..09b39c595857 100644
--- a/metadata/md5-cache/dev-ruby/rails-6.0.4.1
+++ b/metadata/md5-cache/dev-ruby/rails-6.0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://rubygems.org/gems/rails-6.0.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95937fe4dc37cea372215d03a326b8e7
diff --git a/metadata/md5-cache/dev-ruby/rails-6.1.4.1 b/metadata/md5-cache/dev-ruby/rails-6.1.4.1
index a1906f351b86..274d38d37b17 100644
--- a/metadata/md5-cache/dev-ruby/rails-6.1.4.1
+++ b/metadata/md5-cache/dev-ruby/rails-6.1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.1
 SRC_URI=https://rubygems.org/gems/rails-6.1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6279d37f7a7185724dd84279800f32da
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1 b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
index 8da7feffb30a..fb7ed889baf1 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rails-dom-testing-2.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c1653992ed8dd6a0ca1f1561afb9d10a
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1
index e11d54699f1f..5550c499e467 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rails-html-sanitizer-1.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4ac02ad66afde058e6fb617d815e93db
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.1 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.1
index 1152eb829060..ab608ff96270 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.1
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rails-html-sanitizer-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ca4c76cbb73d41b1905d8944235b6d66
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.2 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.2
index a307176785d6..03dfa2a65a71 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.2
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rails-html-sanitizer-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ca4c76cbb73d41b1905d8944235b6d66
diff --git a/metadata/md5-cache/dev-ruby/railties-5.2.6 b/metadata/md5-cache/dev-ruby/railties-5.2.6
index 7404a68d2b6b..09243186839b 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.2.6
+++ b/metadata/md5-cache/dev-ruby/railties-5.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2482b6309bc7f3c04a43708fc6c54d74
diff --git a/metadata/md5-cache/dev-ruby/railties-6.0.4.1 b/metadata/md5-cache/dev-ruby/railties-6.0.4.1
index d44e80d212d4..2775a1eefd72 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.0.4.1
+++ b/metadata/md5-cache/dev-ruby/railties-6.0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.4.1.tar.gz -> rails-6.0.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6bd195bf6b05fa4df90f7aa1a0622248
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.4.1 b/metadata/md5-cache/dev-ruby/railties-6.1.4.1
index 678e916bedff..f89875189f84 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.1.4.1
+++ b/metadata/md5-cache/dev-ruby/railties-6.1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6.1
 SRC_URI=https://github.com/rails/rails/archive/v6.1.4.1.tar.gz -> rails-6.1.4.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=af265ce4645447d3ac964bb749ec0b04
diff --git a/metadata/md5-cache/dev-ruby/rainbow-3.0.0 b/metadata/md5-cache/dev-ruby/rainbow-3.0.0
index e540ab8bcef3..d86d4bab4117 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-3.0.0
+++ b/metadata/md5-cache/dev-ruby/rainbow-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/sickill/rainbow/archive/v3.0.0.tar.gz -> rainbow-git-3.0.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b2ed6ab41078bcb1cc281870c9d8fc7d
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.3-r1 b/metadata/md5-cache/dev-ruby/rake-13.0.3-r1
index d1a56d2fbb69..ebe1c770528a 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v13.0.3.tar.gz -> rake-13.0.3.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c35578a5f46cdd37d953a0fc759f69a4
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.4 b/metadata/md5-cache/dev-ruby/rake-13.0.4
index b19565f5ebdf..bd73936729fa 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.4
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v13.0.4.tar.gz -> rake-13.0.4.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f1f8dc5748b050b972f5456415f01792
diff --git a/metadata/md5-cache/dev-ruby/rake-13.0.6 b/metadata/md5-cache/dev-ruby/rake-13.0.6
index 04c11eea6ad2..7575ec0c9c15 100644
--- a/metadata/md5-cache/dev-ruby/rake-13.0.6
+++ b/metadata/md5-cache/dev-ruby/rake-13.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rake/archive/v13.0.6.tar.gz -> rake-13.0.6.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e5eaf48595aefb8600a6c6582211e3fa
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1 b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
index ce1ecff52884..d073c1b9824c 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.1.1.tar.gz -> rake-compiler-1.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c03208528bca95144e06640819bc73f7
diff --git a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4 b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4
index 91eceb4faa26..e0a2f970f26a 100644
--- a/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4
+++ b/metadata/md5-cache/dev-ruby/rake-remote_task-2.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rake-remote_task-2.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=97169a930016040d16b700e018c28c59
diff --git a/metadata/md5-cache/dev-ruby/rantly-2.0.0 b/metadata/md5-cache/dev-ruby/rantly-2.0.0
index 8d9475dce97b..6ab5d7014644 100644
--- a/metadata/md5-cache/dev-ruby/rantly-2.0.0
+++ b/metadata/md5-cache/dev-ruby/rantly-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rantly-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ea9302531945f56d0ad9961f2629e6d2
diff --git a/metadata/md5-cache/dev-ruby/rash_alt-0.4.9 b/metadata/md5-cache/dev-ruby/rash_alt-0.4.9
index 09808ffe0158..7dacc7cd67e3 100644
--- a/metadata/md5-cache/dev-ruby/rash_alt-0.4.9
+++ b/metadata/md5-cache/dev-ruby/rash_alt-0.4.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rash_alt-0.4.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9a88c69025438a92458ee35fa06aeea2
diff --git a/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2 b/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2
index 942f052c30ef..ea7cdd88282e 100644
--- a/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2
+++ b/metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gsl-2.1.0.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=31032a6bc5d147887f359998da09ca6f
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1 b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
index cd22a2dac464..94994e88a2b1 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rb-inotify-0.10.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=324a2206538ca37c77b449d240ba1358
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-0.5.5 b/metadata/md5-cache/dev-ruby/rb-readline-0.5.5
index f6023c39d6bb..ef0d3c1b6175 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-0.5.5
+++ b/metadata/md5-cache/dev-ruby/rb-readline-0.5.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rb-readline-0.5.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5482a3e5eb76907bb0eb1a1509715c50
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-4.0.2-r1 b/metadata/md5-cache/dev-ruby/rbnacl-4.0.2-r1
index 761265dd0bc9..e98529530bd4 100644
--- a/metadata/md5-cache/dev-ruby/rbnacl-4.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/rbnacl-4.0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/rbnacl-4.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a2c56de159c987050b1006986506b77
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-7.1.1 b/metadata/md5-cache/dev-ruby/rbnacl-7.1.1
index 05542c3c1a98..3251766649bc 100644
--- a/metadata/md5-cache/dev-ruby/rbnacl-7.1.1
+++ b/metadata/md5-cache/dev-ruby/rbnacl-7.1.1
@@ -5,12 +5,12 @@ DESCRIPTION=Provides a high-level toolkit for building cryptographic systems and
 EAPI=7
 HOMEPAGE=https://github.com/cryptosphere/rbnacl
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/libsodium ruby_targets_ruby26? ( dev-ruby/ffi[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/ffi[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/ffi[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/rbnacl-7.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=19b1ef38e880b4f22567c45b751b6910
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=37e6ab052afb5940416f3f92f52b1cba
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2 b/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
index 8607663f0a22..9e53d570989c 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/naitoh/rbpdf/archive/1.20.1.tar.gz -> rbpdf-1.20.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a6fadf63bf7b9a7a7c6dd80a8a51a757
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1 b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1
index 5a96ddafe731..026f2ff31b95 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1
+++ b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rbpdf-font-1.19.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=36c1880cbaa42eac1c20643737adf823
diff --git a/metadata/md5-cache/dev-ruby/rbs-1.2.1 b/metadata/md5-cache/dev-ruby/rbs-1.2.1
index a16beedfcd95..64e34f461b23 100644
--- a/metadata/md5-cache/dev-ruby/rbs-1.2.1
+++ b/metadata/md5-cache/dev-ruby/rbs-1.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/v1.2.1.tar.gz -> rbs-1.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ffb5b5f9b25e5603860afe1fcad16e1
diff --git a/metadata/md5-cache/dev-ruby/rbs-1.3.3 b/metadata/md5-cache/dev-ruby/rbs-1.3.3
index 4275b4ca91b6..771aa0858eee 100644
--- a/metadata/md5-cache/dev-ruby/rbs-1.3.3
+++ b/metadata/md5-cache/dev-ruby/rbs-1.3.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/v1.3.3.tar.gz -> rbs-1.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=447353b7f556bf98bd415bc3c350549a
diff --git a/metadata/md5-cache/dev-ruby/rbs-1.5.1 b/metadata/md5-cache/dev-ruby/rbs-1.5.1
index 17f6f5bdb040..7604464b354d 100644
--- a/metadata/md5-cache/dev-ruby/rbs-1.5.1
+++ b/metadata/md5-cache/dev-ruby/rbs-1.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/v1.5.1.tar.gz -> rbs-1.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=447353b7f556bf98bd415bc3c350549a
diff --git a/metadata/md5-cache/dev-ruby/rbst-0.6.5 b/metadata/md5-cache/dev-ruby/rbst-0.6.5
index 8b254d1b87a1..dcd278ea5a60 100644
--- a/metadata/md5-cache/dev-ruby/rbst-0.6.5
+++ b/metadata/md5-cache/dev-ruby/rbst-0.6.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alphabetum/rbst/archive/0.6.5.tar.gz -> rbst-0.6.5.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4f9716f2fbaf8d535cccdba11724312
diff --git a/metadata/md5-cache/dev-ruby/rbtree-0.4.4 b/metadata/md5-cache/dev-ruby/rbtree-0.4.4
index 25fc263f0199..8978f069f857 100644
--- a/metadata/md5-cache/dev-ruby/rbtree-0.4.4
+++ b/metadata/md5-cache/dev-ruby/rbtree-0.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rbtree-0.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f58599e200a2b6d299b2537686d00052
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.16.5 b/metadata/md5-cache/dev-ruby/rcairo-1.16.5
index 7efa551487a4..0768c6a74af2 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.16.5
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.16.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cairo-1.16.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=31a618bb2ac1129488ab42f9dc77c00b
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.16.6 b/metadata/md5-cache/dev-ruby/rcairo-1.16.6
index 3d94972f7cbd..b209dcfd1add 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.16.6
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.16.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cairo-1.16.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=57f63b12d7cf1649cdc6c577d25886e5
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.17.5 b/metadata/md5-cache/dev-ruby/rcairo-1.17.5
index 4f03c33cd4e3..087444385336 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.17.5
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.17.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cairo-1.17.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a8a72646c2385096e4fefa0ab821984f
diff --git a/metadata/md5-cache/dev-ruby/rchardet-1.8.0 b/metadata/md5-cache/dev-ruby/rchardet-1.8.0
index 7d20d89bab19..665ef613c017 100644
--- a/metadata/md5-cache/dev-ruby/rchardet-1.8.0
+++ b/metadata/md5-cache/dev-ruby/rchardet-1.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/jmhodges/rchardet/archive/v1.8.0.tar.gz -> rchardet-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=192fe5c5d70f1723ece6879ac73eda3d
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
index 84a573c70788..fdbdd2bd0a4f 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdiscount-2.2.0.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=77d8eb8fa9f39d8c8a0ceab50a613b28
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2
index 5071d0622e70..46647bcba01f 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdiscount-2.2.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dc7b6ecf78d7e2b17e43b2a31eb5ad0a
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
index 7342e69c9990..507eb53ba6d5 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdiscount-2.2.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6b5b584a99a9bd13ecca45f729d579f5
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.3.2 b/metadata/md5-cache/dev-ruby/rdoc-6.3.2
index 57d6a78205b6..7d5b871c3894 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.3.2
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rdoc/archive/v6.3.2.tar.gz -> rdoc-6.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c4c8784c81bfd48e244d1e5848bfd0aa
diff --git a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2 b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
index b1b899ad0851..0c7b24cb6f4f 100644
--- a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
+++ b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdtool-0.6.38.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7732ac483460ba34953095ba5a2fe53f
diff --git a/metadata/md5-cache/dev-ruby/recog-2.3.19 b/metadata/md5-cache/dev-ruby/recog-2.3.19
index 355e9a7dcecc..5a5bc0256897 100644
--- a/metadata/md5-cache/dev-ruby/recog-2.3.19
+++ b/metadata/md5-cache/dev-ruby/recog-2.3.19
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/recog-2.3.19.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1e45531ecfcd95bb12884b9f11d74e2b
diff --git a/metadata/md5-cache/dev-ruby/recog-2.3.20 b/metadata/md5-cache/dev-ruby/recog-2.3.20
index 8edc27aa0422..6b7929e4c3b6 100644
--- a/metadata/md5-cache/dev-ruby/recog-2.3.20
+++ b/metadata/md5-cache/dev-ruby/recog-2.3.20
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/recog-2.3.20.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1e45531ecfcd95bb12884b9f11d74e2b
diff --git a/metadata/md5-cache/dev-ruby/red-colors-0.2.0 b/metadata/md5-cache/dev-ruby/red-colors-0.2.0
index cc07d2ba7fba..3057a18778d0 100644
--- a/metadata/md5-cache/dev-ruby/red-colors-0.2.0
+++ b/metadata/md5-cache/dev-ruby/red-colors-0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/red-colors-0.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cf90d4b9ed1d21fa941e2fdc93528e00
diff --git a/metadata/md5-cache/dev-ruby/red-colors-0.3.0 b/metadata/md5-cache/dev-ruby/red-colors-0.3.0
index ec0fa498eb6d..91f54b62634f 100644
--- a/metadata/md5-cache/dev-ruby/red-colors-0.3.0
+++ b/metadata/md5-cache/dev-ruby/red-colors-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/red-colors-0.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3b52a6fdcf018d62a023ba207d278f90
diff --git a/metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1 b/metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1
index a606dd8c9084..5381c199a6bc 100644
--- a/metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/red-colors-0.3.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/red-colors-0.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9e3f51882c02344a469bbe4c32d6da84
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.5.1 b/metadata/md5-cache/dev-ruby/redcarpet-3.5.1
index c113e517c3b7..286eabe8842a 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.5.1
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.5.1.tar.gz -> redcarpet-3.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=685ef91dc949d6f361e1fa12943d0218
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1 b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1
index 219528fd95e8..42aa1de41ee6 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/archive/v4.3.2.tar.gz -> RedCloth-4.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=d1169572f0755e3702ca3ed987bbb5f4
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r2 b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r2
index 859269c80bbe..f186320dccf4 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r2
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/archive/v4.3.2.tar.gz -> RedCloth-4.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=282bee112d5a159a0931623123540c66
diff --git a/metadata/md5-cache/dev-ruby/redis-4.1.4 b/metadata/md5-cache/dev-ruby/redis-4.1.4
index 1934b6160e87..d7b046adf2b0 100644
--- a/metadata/md5-cache/dev-ruby/redis-4.1.4
+++ b/metadata/md5-cache/dev-ruby/redis-4.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/redis/redis-rb/archive/v4.1.4.tar.gz -> redis-rb-4.1.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3e8d9f37c34a6d3f3164c6136e23ea28
diff --git a/metadata/md5-cache/dev-ruby/ref-2.0.0 b/metadata/md5-cache/dev-ruby/ref-2.0.0
index 7625c9e1d2f2..5f435b6555c3 100644
--- a/metadata/md5-cache/dev-ruby/ref-2.0.0
+++ b/metadata/md5-cache/dev-ruby/ref-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ruby-concurrency/ref/archive/v2.0.0.tar.gz -> ref-2.0.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2596fe0838905b4e18a13ae884d6103c
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-0.5.0 b/metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
index e98639795b50..36861c3dae49 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v0.5.0.tar.gz -> regexp_parser-0.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dccc4b490a8d7c3e0b163154cf4cc62c
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-1.8.2 b/metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
index 5f496252bb7b..18b04d6b3d62 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v1.8.2.tar.gz -> regexp_parser-1.8.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=342dc666070c5a23881919a35e543d58
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1 b/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1
index 4306493b11c9..5d73cc266ab6 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.1.1.tar.gz -> regexp_parser-2.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=87093e5ecf10c4b5fe9f9cf320539b3d
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1 b/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1
index 260de3a274fd..6fe6428563ec 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1
@@ -5,12 +5,12 @@ DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressio
 EAPI=7
 HOMEPAGE=https://github.com/ammar/regexp_parser
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.1.1.tar.gz -> regexp_parser-2.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1561b1c23bc11829d7101810ebf04470
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d4d0f1873566fab98e7c9c70ecfbcd92
diff --git a/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0 b/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0
index 5b7004d0c1ef..7313494f119e 100644
--- a/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0
+++ b/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/janosch-x/regexp_property_values/archive/v1.0.0.tar.gz -> regexp_property_values-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=18238f7072934657ae922f0a0fd7faef
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.5.0 b/metadata/md5-cache/dev-ruby/request_store-1.5.0
index fe6f9637ba81..6899e23489a7 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.5.0
+++ b/metadata/md5-cache/dev-ruby/request_store-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/request_store-1.5.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bcdd9622edcd12f133069d55de5a6d6d
diff --git a/metadata/md5-cache/dev-ruby/rest-client-2.1.0 b/metadata/md5-cache/dev-ruby/rest-client-2.1.0
index 0049ce35e036..5a8aa94540d6 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-2.1.0
+++ b/metadata/md5-cache/dev-ruby/rest-client-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rest-client-2.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b17c28aca1975321a2a947d25066d908
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.7 b/metadata/md5-cache/dev-ruby/rexical-1.0.7
index 2a5d76b8d4de..4cc47aa233f2 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.7
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rexical-1.0.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ce3639c1afb20a4322d9dbdf2bd411ed
diff --git a/metadata/md5-cache/dev-ruby/rexml-3.2.5 b/metadata/md5-cache/dev-ruby/rexml-3.2.5
index 3403628780a6..871dd7d930b4 100644
--- a/metadata/md5-cache/dev-ruby/rexml-3.2.5
+++ b/metadata/md5-cache/dev-ruby/rexml-3.2.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/ruby/rexml/archive/v3.2.5.tar.gz -> rexml-3.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b26d6fb9576c6707fba36db31a81c8e8
diff --git a/metadata/md5-cache/dev-ruby/rinku-2.0.6 b/metadata/md5-cache/dev-ruby/rinku-2.0.6
index d559f999577b..c25a334f5ed1 100644
--- a/metadata/md5-cache/dev-ruby/rinku-2.0.6
+++ b/metadata/md5-cache/dev-ruby/rinku-2.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rinku-2.0.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a9e83ddd895787156b6b49694294c034
diff --git a/metadata/md5-cache/dev-ruby/ritex-1.0.1 b/metadata/md5-cache/dev-ruby/ritex-1.0.1
index a45f3a24f274..f80508af3bb0 100644
--- a/metadata/md5-cache/dev-ruby/ritex-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ritex-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ritex-1.0.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=134631fa8569354e2d6c05c51afec799
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.6.4-r1 b/metadata/md5-cache/dev-ruby/rjb-1.6.4-r1
index 891d1f223c14..49c0b02ff4c1 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.6.4-r1
+++ b/metadata/md5-cache/dev-ruby/rjb-1.6.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rjb-1.6.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eaec1f06796d16aac9b8ec8e771f2bb7
diff --git a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7 b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
index 721275e7a26b..90d172800ae6 100644
--- a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
+++ b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rkelly-remix-0.0.7.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=098d498131c683e264fe3fb06ad4148c
diff --git a/metadata/md5-cache/dev-ruby/rmagick-3.2.0 b/metadata/md5-cache/dev-ruby/rmagick-3.2.0
index 4e6faaa2c6ca..70569bd33dae 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-3.2.0
+++ b/metadata/md5-cache/dev-ruby/rmagick-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rmagick-3.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=60d84807f197bdedb0471f0bccb2d59c
diff --git a/metadata/md5-cache/dev-ruby/rmagick-4.2.2 b/metadata/md5-cache/dev-ruby/rmagick-4.2.2
index 9a276b2c585e..7bbe65d35f83 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-4.2.2
+++ b/metadata/md5-cache/dev-ruby/rmagick-4.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rmagick/rmagick/archive/RMagick_4-2-2.tar.gz -> rmagick-4.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2c6e01a7ebaeb74869cbfbf90a3973c5
diff --git a/metadata/md5-cache/dev-ruby/rmagick-4.2.3 b/metadata/md5-cache/dev-ruby/rmagick-4.2.3
new file mode 100644
index 000000000000..00823f072b58
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rmagick-4.2.3
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=An interface between Ruby and the ImageMagick(TM) image processing library
+EAPI=8
+HOMEPAGE=https://github.com/rmagick/rmagick
+IUSE=doc ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=Artistic
+RDEPEND=>=media-gfx/imagemagick-6.9.0:= ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=4
+SRC_URI=https://github.com/rmagick/rmagick/archive/RMagick_4-2-3.tar.gz -> rmagick-4.2.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f608e3c70215df16dd2c0bed3615f10b
diff --git a/metadata/md5-cache/dev-ruby/roadie-4.0.0 b/metadata/md5-cache/dev-ruby/roadie-4.0.0
index 827f12c5e925..5f894dc3f003 100644
--- a/metadata/md5-cache/dev-ruby/roadie-4.0.0
+++ b/metadata/md5-cache/dev-ruby/roadie-4.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/Mange/roadie/archive/v4.0.0.tar.gz -> roadie-4.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=660aee3d989c4160155c800b483b5058
diff --git a/metadata/md5-cache/dev-ruby/roadie-rails-2.1.1 b/metadata/md5-cache/dev-ruby/roadie-rails-2.1.1
index c82cf4e35b9a..e77cd1804918 100644
--- a/metadata/md5-cache/dev-ruby/roadie-rails-2.1.1
+++ b/metadata/md5-cache/dev-ruby/roadie-rails-2.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/Mange/roadie-rails/archive/v2.1.1.tar.gz -> roadie-rails-2.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=71552077f581bc50fe933f86145608d5
diff --git a/metadata/md5-cache/dev-ruby/roadie-rails-2.2.0 b/metadata/md5-cache/dev-ruby/roadie-rails-2.2.0
index c7bb5a7bb6c7..b7e49025f369 100644
--- a/metadata/md5-cache/dev-ruby/roadie-rails-2.2.0
+++ b/metadata/md5-cache/dev-ruby/roadie-rails-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/Mange/roadie-rails/archive/v2.2.0.tar.gz -> roadie-rails-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3f83c4db2b4929d965432713e428eb6a
diff --git a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2 b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
index 0e1cff49542a..cb6dc60eec7d 100644
--- a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
+++ b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/robots-0.10.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f0c14e499642e7ad358da752adfbe330
diff --git a/metadata/md5-cache/dev-ruby/rotp-6.2.0 b/metadata/md5-cache/dev-ruby/rotp-6.2.0
index c3607e94984c..40b61a287c12 100644
--- a/metadata/md5-cache/dev-ruby/rotp-6.2.0
+++ b/metadata/md5-cache/dev-ruby/rotp-6.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mdp/rotp/archive/refs/tags/v6.2.0.tar.gz -> rotp-6.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e8877f4d28b83aa430db10d606cc65f6
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.26.0 b/metadata/md5-cache/dev-ruby/rouge-3.26.0
index 0501a5f3fc03..5ba2912717d1 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.26.0
+++ b/metadata/md5-cache/dev-ruby/rouge-3.26.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.26.0.tar.gz -> rouge-3.26.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ceb00bfec03a3474b452dae1a8c2f2b9
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.26.1 b/metadata/md5-cache/dev-ruby/rouge-3.26.1
index ba92d1a4d4aa..bad0a3b179cb 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.26.1
+++ b/metadata/md5-cache/dev-ruby/rouge-3.26.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.26.1.tar.gz -> rouge-3.26.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=94beefebd0538d6af0427afc794f641b
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-1.2.0 b/metadata/md5-cache/dev-ruby/rqrcode-1.2.0
index e686963c832c..568c52da8aa8 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-1.2.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whomwah/rqrcode/archive/v1.2.0.tar.gz -> rqrcode-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c36d5951fced0a7deffe21eb4656be5
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-2.0.0 b/metadata/md5-cache/dev-ruby/rqrcode-2.0.0
index ddc3450a1d12..861016addb83 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-2.0.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whomwah/rqrcode/archive/v2.0.0.tar.gz -> rqrcode-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d751c53c820ba1e6154a239d0dfb9f52
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-2.1.0 b/metadata/md5-cache/dev-ruby/rqrcode-2.1.0
index 5441765e16d2..0927b0075eac 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-2.1.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whomwah/rqrcode/archive/v2.1.0.tar.gz -> rqrcode-2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d5bd3e045dcd64f9f8316fc5221bdc6a
diff --git a/metadata/md5-cache/dev-ruby/rqrcode_core-0.2.0 b/metadata/md5-cache/dev-ruby/rqrcode_core-0.2.0
index 0170db3b8f5b..e8973ad98dba 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode_core-0.2.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode_core-0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whomwah/rqrcode_core/archive/v0.2.0.tar.gz -> rqrcode_core-0.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4b560259d92c32a6e258ee3a5d9dd4a2
diff --git a/metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0 b/metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0
index d83e46470e91..b2b6022d9281 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode_core-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/whomwah/rqrcode_core/archive/v1.1.0.tar.gz -> rqrcode_core-1.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=712370465b1f5ba80ffa02146c9e11ea
diff --git a/metadata/md5-cache/dev-ruby/rqrcode_core-1.2.0 b/metadata/md5-cache/dev-ruby/rqrcode_core-1.2.0
index 21329a026297..858102babda7 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode_core-1.2.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode_core-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/whomwah/rqrcode_core/archive/v1.2.0.tar.gz -> rqrcode_core-1.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0215ffdd6a12975403f2efc40be42ccf
diff --git a/metadata/md5-cache/dev-ruby/rr-1.2.1 b/metadata/md5-cache/dev-ruby/rr-1.2.1
index d9fdb9a3ec14..c3d76386ce40 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.2.1
+++ b/metadata/md5-cache/dev-ruby/rr-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v1.2.1.tar.gz -> rr-1.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=199fdc91a6b385d693d1228db43f6cf3
diff --git a/metadata/md5-cache/dev-ruby/rr-3.0.0 b/metadata/md5-cache/dev-ruby/rr-3.0.0
deleted file mode 100644
index f1533d9f31f2..000000000000
--- a/metadata/md5-cache/dev-ruby/rr-3.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby27(-)] dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A double framework featuring a selection of double techniques and a terse syntax
-EAPI=7
-HOMEPAGE=https://rr.github.io/rr
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rr/rr/archive/v3.0.0.tar.gz -> rr-3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b078706670a5585756d8be26ec236248
diff --git a/metadata/md5-cache/dev-ruby/rr-3.0.2 b/metadata/md5-cache/dev-ruby/rr-3.0.2
deleted file mode 100644
index b2f54c3fe282..000000000000
--- a/metadata/md5-cache/dev-ruby/rr-3.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/diff-lcs[ruby_targets_ruby26(-)] dev-ruby/test-unit-rr[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/diff-lcs[ruby_targets_ruby27(-)] dev-ruby/test-unit-rr[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/diff-lcs[ruby_targets_ruby30(-)] dev-ruby/test-unit-rr[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=A double framework featuring a selection of double techniques and a terse syntax
-EAPI=7
-HOMEPAGE=https://rr.github.io/rr
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rr/rr/archive/v3.0.2.tar.gz -> rr-3.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=43d1b9bbcc7197714e1bd93bb4f26950
diff --git a/metadata/md5-cache/dev-ruby/rr-3.0.5 b/metadata/md5-cache/dev-ruby/rr-3.0.5
deleted file mode 100644
index fa5f7bff79be..000000000000
--- a/metadata/md5-cache/dev-ruby/rr-3.0.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/diff-lcs[ruby_targets_ruby26(-)] dev-ruby/test-unit-rr[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/diff-lcs[ruby_targets_ruby27(-)] dev-ruby/test-unit-rr[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/diff-lcs[ruby_targets_ruby30(-)] dev-ruby/test-unit-rr[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=A double framework featuring a selection of double techniques and a terse syntax
-EAPI=7
-HOMEPAGE=https://rr.github.io/rr
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rr/rr/archive/v3.0.5.tar.gz -> rr-3.0.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=43d1b9bbcc7197714e1bd93bb4f26950
diff --git a/metadata/md5-cache/dev-ruby/rr-3.0.6 b/metadata/md5-cache/dev-ruby/rr-3.0.6
index 30ceb8b5f453..d7cc085ac8d8 100644
--- a/metadata/md5-cache/dev-ruby/rr-3.0.6
+++ b/metadata/md5-cache/dev-ruby/rr-3.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v3.0.6.tar.gz -> rr-3.0.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ca3bf9aacc9ddc846fefc1f1a41e4176
diff --git a/metadata/md5-cache/dev-ruby/rr-3.0.7 b/metadata/md5-cache/dev-ruby/rr-3.0.7
index 4603ee9c8fe1..ec274e97ed65 100644
--- a/metadata/md5-cache/dev-ruby/rr-3.0.7
+++ b/metadata/md5-cache/dev-ruby/rr-3.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v3.0.7.tar.gz -> rr-3.0.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c387bad1a1f4e9cd4ec6a4d792bab0fa
diff --git a/metadata/md5-cache/dev-ruby/rr-3.0.8 b/metadata/md5-cache/dev-ruby/rr-3.0.8
new file mode 100644
index 000000000000..fa3749bbd90a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rr-3.0.8
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/diff-lcs[ruby_targets_ruby26(-)] dev-ruby/test-unit-rr[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/diff-lcs[ruby_targets_ruby27(-)] dev-ruby/test-unit-rr[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/diff-lcs[ruby_targets_ruby30(-)] dev-ruby/test-unit-rr[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=A double framework featuring a selection of double techniques and a terse syntax
+EAPI=8
+HOMEPAGE=https://rr.github.io/rr
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rr/rr/archive/v3.0.8.tar.gz -> rr-3.0.8.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c387bad1a1f4e9cd4ec6a4d792bab0fa
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-2.99.0
index a588881b1153..fe5279b6797f 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-2.99.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rspec-2.99.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2b18a48a397d3e5f32e855e6f484713e
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.10.0 b/metadata/md5-cache/dev-ruby/rspec-3.10.0
index 05a0188304ed..e126c91b3d42 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.10.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rspec-3.10.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=137bb00ef315c630e5a2322e3aa2a0e2
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.9.0 b/metadata/md5-cache/dev-ruby/rspec-3.9.0
index 2e75c38d7850..840aaf8c98f7 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.9.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rspec-3.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c3b3c5ecfa980884062d2442e2bf7be4
diff --git a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0 b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0
index 50be5abaf992..5491b097e86a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0
+++ b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-collection_matchers-1.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=835acda928e845a2a7a72eb7b2140294
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2 b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
index bd327305e029..381a91692e93 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.99.2.tar.gz -> rspec-core-2.99.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0ad08844c333f9655cd75015d6208b7e
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.10.1 b/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
index 6d2ba8cf2bd0..b998d34b72d1 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.10.1.tar.gz -> rspec-core-3.10.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=807f00c65b934180678c1dce850cb5ab
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.9.3 b/metadata/md5-cache/dev-ruby/rspec-core-3.9.3
index 2821b4abd7bd..a97208c87c7e 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.9.3
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.9.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.9.3.tar.gz -> rspec-core-3.9.3-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5eb8d1b54fcc35074856af7a48fcce6c
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
index 7cec5d8c5cd6..0a95ba261e46 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.99.2.tar.gz -> rspec-expectations-2.99.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc78c8d8f28df343f863fc9fb992cb8c
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
index ca314a64514a..f0eca3d16326 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.10.1.tar.gz -> rspec-expectations-3.10.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=55fc1016d9bda076c9128805127c1364
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.9.4 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.9.4
index 35eb94cba351..fd9398ce4e9f 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.9.4
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.9.4.tar.gz -> rspec-expectations-3.9.4-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bdf7ec72ac0340bf107150247566de0f
diff --git a/metadata/md5-cache/dev-ruby/rspec-its-1.3.0-r1 b/metadata/md5-cache/dev-ruby/rspec-its-1.3.0-r1
index c709600b940c..62de19540b57 100644
--- a/metadata/md5-cache/dev-ruby/rspec-its-1.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-its-1.3.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-its-1.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6880faaa45826fe0e3f639666ccde2d1
diff --git a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0 b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0
index 6526e4fbcacf..b15a2f1d3d7f 100644
--- a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0
+++ b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-json_expectations-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bcd421b61c441ed00bd0afee950ca311
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
index 646429c3933b..ae3716113bf3 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.99.2.tar.gz -> rspec-mocks-2.99.2-git.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7a0be619a244ce68a3747a429a5d699b
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
index 5087d7584979..d207ea470210 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.10.2.tar.gz -> rspec-mocks-3.10.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d510b95abeedf47cccb398e66a297893
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.9.1 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.9.1
index 38adb2fc6115..749a34f0c3fc 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.9.1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.9.1.tar.gz -> rspec-mocks-3.9.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d39f15043434bb269eb9750f05aee31
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.9.1 b/metadata/md5-cache/dev-ruby/rspec-rails-3.9.1
index 0b377bc80a1b..ae5f1fe2270d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.9.1
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.9.1.tar.gz -> rspec-rails-3.9.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6fe0e6b3ba349479aec4da0c58cd611
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-4.0.2 b/metadata/md5-cache/dev-ruby/rspec-rails-4.0.2
index 65aa62f9d898..f095aaa2e51e 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-4.0.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-4.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v4.0.2.tar.gz -> rspec-rails-4.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f89c8c255e36572f5c987420dab3893
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2 b/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2
index 5e0b5bb09dd8..a4ac08cabdd4 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v4.1.2.tar.gz -> rspec-rails-4.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fb64696049e4f4768219a6ddea99c670
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-5.0.1 b/metadata/md5-cache/dev-ruby/rspec-rails-5.0.1
index a12e65e1045e..45b55c85eb41 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-5.0.1
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-5.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v5.0.1.tar.gz -> rspec-rails-5.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df30e99ff9e43daebb78d6c06d4ebdfc
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-5.0.2 b/metadata/md5-cache/dev-ruby/rspec-rails-5.0.2
index 0a3cd02550c0..fc1a8dee0f2d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-5.0.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-5.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v5.0.2.tar.gz -> rspec-rails-5.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=862151d6887e7c00384f5aad8fda3f48
diff --git a/metadata/md5-cache/dev-ruby/rspec-retry-0.6.2 b/metadata/md5-cache/dev-ruby/rspec-retry-0.6.2
index b4a1d2d07c97..78f19bd0f11d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-retry-0.6.2
+++ b/metadata/md5-cache/dev-ruby/rspec-retry-0.6.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rspec-retry-0.6.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=125efda5f6f5f16fc36d57e07deb0623
diff --git a/metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0 b/metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0
index c49ac616019c..d273212ac65d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0
+++ b/metadata/md5-cache/dev-ruby/rspec-stubbed_env-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-stubbed_env-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=10813546523e609c3c0e1335c58da1be
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.10.2 b/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
index c184307ba459..0ee1d5e2f301 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.10.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.10.2.tar.gz -> rspec-support-3.10.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dcc6b86ad3c80909dd819b0aaed2dca1
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.9.4 b/metadata/md5-cache/dev-ruby/rspec-support-3.9.4
index 75ac1a271998..ea46c465fe1d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.9.4
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.9.4.tar.gz -> rspec-support-3.9.4-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d3a8367995f96e6aaab9b0a82b4d249c
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1 b/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
index beb2b0fd18d6..121936fadd8f 100644
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
+++ b/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rspectacular-0.70.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0da90500554c1f485f71df7b7312abc5
diff --git a/metadata/md5-cache/dev-ruby/rss-0.2.9 b/metadata/md5-cache/dev-ruby/rss-0.2.9
index 3bb63afc3c9c..7482dd1b44d6 100644
--- a/metadata/md5-cache/dev-ruby/rss-0.2.9
+++ b/metadata/md5-cache/dev-ruby/rss-0.2.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rss-0.2.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b602e4ee2d7d52284c7ef27e112fa84a
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
index a5c8b604c5dc..0c2f9699b716 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0e45c1691b2fc39dd6d8e50c311304cb
diff --git a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3 b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
index ecd0f2e4deac..fa17f7956d25 100644
--- a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=http://download.augeas.net/ruby/ruby-augeas-0.5.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=36472186a07a73ac9a89813176ce0ffa
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
index 8b76426b58bd..ada9e1b05681 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b3a3bfde1b88e00c32462f3c2b5f013
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-3.4.3
index a63dc43ce2dd..7c68ddde3876 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=9219ec1a7dc03fde5ada071732075907
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.4.3
index 0d1cfbb0b2fa..946ccb34559a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6a3add72a981d0c7c27edd7711597709
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.4.3
index 063cac0dd57d..dc96fd2f601d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=d56a4875b3b2cf439dfeeee122300c76
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.4.3
index ee90516453e4..599b0fcccbac 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=7e8e1e9562bccfe51d2c7be4abb02a58
diff --git a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8 b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
index 33767ff41a7a..20003ad1be0b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Flameeyes/ruby-elf/archive/1.0.8.tar.gz -> ruby-elf-1.0.8.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dbeb4c2223fe9be4a38a6bd46ee6288d
diff --git a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.7 b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.7
index fccd112e8cb8..5a112fe50d98 100644
--- a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.7
+++ b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/feed2imap/ruby-feedparser/archive/v0.9.7.tar.gz -> ruby-feedparser-0.9.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=264e018e9ec1a89eab56c848ea0b849c
diff --git a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2 b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2
index 9287d2bc81a8..9347c06d150b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2
+++ b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-filemagic-0.7.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cd787aec0f909ed0838c2331a9c4c896
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.4.3
index 9e33c36cf683..bf9fc421b4c1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=26fe993c21f8a7b71c848ce13fac91b8
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
index 2db32c288789..1df28352051f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c014feff6743b2409f59e27bfd4a3a4
diff --git a/metadata/md5-cache/dev-ruby/ruby-gegl-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gegl-3.4.3
index 39fa4531229d..6e879fdfc134 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gegl-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gegl-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=436b0c157ef691cb85f11ff891ac87c5
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5
index d203191e3f7b..f7bc81747f32 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gettext-3.3.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6e72fd57dbce3c2ee1acee69e3faf5ac
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7
index b53bf7faaeb8..c0a3c93d8dfd 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gettext-3.3.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f92a2154e378b6f4f54036479550683a
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.1 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.1
index 9720e1e590d5..e821d4e70f96 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gettext-3.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=94189591f9289fd1d8a50d0008dc1268
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
index c5a26a6ac1b3..3bb191ad674a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8eb4e62efd2009bc97bc6a512db183a1
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
index 4a1240f0bd5b..5522bc5cc791 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b9c101f1dd09980e0b59f835a76360cc
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnumeric-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gnumeric-3.4.3
index 7a014343034a..9296240d4cdd 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnumeric-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gnumeric-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=0f4b13635743dfd7029cf43e979fe374
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
index 0b8c958b987f..b5bc487d6d7b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=709c1710707289c012fcfb0c8d66c182
diff --git a/metadata/md5-cache/dev-ruby/ruby-goffice-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-goffice-3.4.3
index 8b66a8ddf4dd..82c4b63ffb01 100644
--- a/metadata/md5-cache/dev-ruby/ruby-goffice-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-goffice-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=9e3f7cd4d38dac5a178dbd378de3ed64
diff --git a/metadata/md5-cache/dev-ruby/ruby-gsf-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gsf-3.4.3
index 0878749907f8..0dae61bee8b7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gsf-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gsf-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0d73b8eac709094cea24a7c1b26e5b7b
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.4.3
index 1a5ac1aad63d..f1cf3b7527c5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=3fc516fb7af14974e87d625ddcf5d5d2
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
index c0e7fc223ea5..a5aca7e0a1be 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=9ba1132313b38ce5b122c503a091ee13
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.4.3
index 2fb0cdbe9df6..0fd7e532e227 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=646a0bee3ee7e9ca46d0cc690274a57c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3
index cf27317c18da..08af15b00e1f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=e69f11f409daf1421dfbc8e1b29e799a
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3
index 6429e55408b2..b1643de3ea71 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=5d53605dfd3d799272e55f0a838a6914
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3
index 31b5d4556ad4..71195e5aedcb 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=922d5dedca169523ffca11a6014372e2
diff --git a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1 b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
index f010221fba5b..c1257e1cba8a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-hmac-0.4.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1c3cce27356865cdc56dec07a9501067
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20
index 716f7f14639a..d2db0b6ad544 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-ldap-0.9.20.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=239596cce02480eb0805a704040139fc
diff --git a/metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3
index e1a09f24c369..0ea79cea3e2c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2ba249c61dc417b9b610b28b0b245856
diff --git a/metadata/md5-cache/dev-ruby/ruby-macho-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-macho-2.2.0
index 6e9191d86d81..0ae39d3f99ec 100644
--- a/metadata/md5-cache/dev-ruby/ruby-macho-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-macho-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Homebrew/ruby-macho/archive/2.2.0.tar.gz -> ruby-macho-2.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5e77251ad0e18a46b5a8a98969c314de
diff --git a/metadata/md5-cache/dev-ruby/ruby-macho-2.3.0 b/metadata/md5-cache/dev-ruby/ruby-macho-2.3.0
index edf6f1161fb0..cb3b2e50615b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-macho-2.3.0
+++ b/metadata/md5-cache/dev-ruby/ruby-macho-2.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Homebrew/ruby-macho/archive/2.3.0.tar.gz -> ruby-macho-2.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2b6991ce26a27c270b02bcd59ebb626d
diff --git a/metadata/md5-cache/dev-ruby/ruby-macho-2.5.0 b/metadata/md5-cache/dev-ruby/ruby-macho-2.5.0
index 47818776c9aa..074b36671e70 100644
--- a/metadata/md5-cache/dev-ruby/ruby-macho-2.5.0
+++ b/metadata/md5-cache/dev-ruby/ruby-macho-2.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Homebrew/ruby-macho/archive/v2.5.0.tar.gz -> ruby-macho-2.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f2880820aca8743acbe6c984f5cdd44c
diff --git a/metadata/md5-cache/dev-ruby/ruby-macho-2.5.1 b/metadata/md5-cache/dev-ruby/ruby-macho-2.5.1
index 13153d49e7c7..c11e4b9d831a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-macho-2.5.1
+++ b/metadata/md5-cache/dev-ruby/ruby-macho-2.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Homebrew/ruby-macho/archive/v2.5.1.tar.gz -> ruby-macho-2.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=77b6967233824d7ffa6af8a4f458b457
diff --git a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10 b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10
index 2b124467c2e6..cdf82e09ce4e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10
+++ b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/moumar/ruby-mp3info/archive/v0.8.10.tar.gz -> ruby-mp3info-0.8.10-git.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2b17a3be59c20f3a0e276e88ed8ef8de
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.2 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.2
index ae05ab878ca0..0a802685274c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.2
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/net-ldap-0.16.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2d10158017efde21deeefd65c1b11b71
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.3 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.3
index 7d2e95b396e1..34aedea85d5f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.3
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/net-ldap-0.16.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=86cfe32cd794a1d8f2cb1da5ae0ce1a2
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0
index a4538062f58e..5adb4a34380d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-ldap/ruby-net-ldap/archive/v0.17.0.tar.gz -> ruby-net-ldap-0.17.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b7fabed627e9780b79994c86369f7396
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99999 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99999
index 0f62e8ea022c..0d803ee26bb0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99999
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99999
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.99999.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bf3d95117a4d9840026abfc3d3b6db88
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991
index 7ae480e6c337..e3383bc08633 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.999991
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.999991.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=742d39571627b5172f4759d44f6d4566
diff --git a/metadata/md5-cache/dev-ruby/ruby-oembed-0.15.0 b/metadata/md5-cache/dev-ruby/ruby-oembed-0.15.0
index 9bd44b126d09..da6da0cde41b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oembed-0.15.0
+++ b/metadata/md5-cache/dev-ruby/ruby-oembed-0.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-oembed-0.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8b653ab612196ada1e646846a742d27d
diff --git a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2 b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2
index 8fafa7528e9f..543e73216420 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2
+++ b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-ole-1.2.12.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d7b305e3fa67e7421b459b6040333e5
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
index a9884ce6db15..441c27a0dfb3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/opengl-0.10.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad9bdbe19cbf0ef3a818fafa61c6c688
diff --git a/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2 b/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
index 661efafe1af7..449fb4c58cd2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
+++ b/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openid/ruby-openid/archive/v2.9.2.tar.gz -> ruby-openid-2.9.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=787f59e034a777d2b21c8942f9e7a5c1
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
index db7b60b6a66b..0d3775efd2af 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c72e6ff3667b730995d8ba7c53be19a9
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
index 1cd09cce62ff..04ed69a28227 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=01fc4d39a36ac4cc47169761f78cfaef
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.2 b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.2
index 2a9ae76efe55..62e71e33261a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.2
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/1.4.2.tar.gz -> ruby-prof-1.4.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=09879b02fd1beaaed3192abde17e5853
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.3 b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.3
index efa7d6aaad18..2e24aab8951f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/1.4.3.tar.gz -> ruby-prof-1.4.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b3a42d7c8bc284ce457c8d2291de42bd
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
index 83e6e3885e5d..7694f3bb7971 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jfelchner/ruby-progressbar/archive/releases/v1.10.1.tar.gz -> ruby-progressbar-1.10.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c4c4f3ffbc2bb34f76e0a2672f0669be
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
index 5f54931a9c8a..2c3ff3883e14 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jfelchner/ruby-progressbar/archive/releases/v1.11.0.tar.gz -> ruby-progressbar-1.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5729658ff81433cff6ed2fdb946ee3c4
diff --git a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2 b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
index 6e0cbea5244b..bf6878282a31 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-rc4-0.1.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b85521b662d644de8610b11447b7fdc7
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.4.3
index 560727d0fb1c..940dbf02edcf 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=37379b365a9c4867be765ee58b9889bc
diff --git a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0 b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
index 10007ceddbe2..6ef766714ccf 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
+++ b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-shadow-2.5.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f83b2568807d4cdec12934c0b89c9cb5
diff --git a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2 b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2
deleted file mode 100644
index bdb20656686a..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=media-libs/libshout-2.0 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=A Ruby interface to libshout2
-EAPI=5
-HOMEPAGE=https://github.com/niko/ruby-shout
-IUSE=ruby_targets_ruby26 test
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=Ruby
-RDEPEND=>=media-libs/libshout-2.0 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/ruby-shout-2.2.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e47f76bebc1f6122b4bc0b2623af82b1
diff --git a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1 b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1
index addd78f99e02..d44cf949a908 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-shout-2.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=15a09d58bcbb83b56facc4808ad9a222
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1 b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
index 77f30d54f7df..261f7ec83690 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-termios-1.0.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=842486ab3a52d3d0db5126c8db73e4d4
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0 b/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0
index edb5aa447a40..3d27d2e74087 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-termios-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b0d3a4bfef5ed2831e1a9440895c122d
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-vte-3.4.3
index 33996a3e6bb1..008c5051c60f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5bad87adc3ccb63ac7f3d1546a7da8b9
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-vte3-3.4.3
index ffdc48a1e293..d40bc0f0fe12 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=443bb38ac0e26a7f91261e55fa094e8b
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.4.3
index d2eb64510aae..fc827bd562ca 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=f240019b3280cf236c6b754d5d8a79a0
diff --git a/metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3
index 5ff9d5928b01..98414b52624e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-ng-gnome2	33b76ee4d4784288d53e87556e26caf1	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
 _md5_=aaae1c7c85e4fefb9b4b610bb22961af
diff --git a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10 b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10
index 608cee771e51..5ce8f8f0e3c7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10
+++ b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-xslt-0.9.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=15f1656fcff2be4439f6440daff9c9ea
diff --git a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2 b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
index ce12390875ec..d1f0a964899f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-yadis-0.3.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bb347c1c408e690b2bc3e480d2db065b
diff --git a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.2 b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.2
index 26a732e334fe..4cdbbf65fb67 100644
--- a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0.0
 SRC_URI=https://rubygems.org/gems/ruby2_keywords-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ef7937c25f0839c5d169e8c459169b58
diff --git a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4 b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
index e64bcf6ea580..839d5aade23e 100644
--- a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
+++ b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0.0
 SRC_URI=https://rubygems.org/gems/ruby2_keywords-0.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1355e930bf7d92562ac015e1b407867d
diff --git a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5 b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
index a74fe30e158d..0fe753896e4c 100644
--- a/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
+++ b/metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0.0
 SRC_URI=https://rubygems.org/gems/ruby2_keywords-0.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fe20482d2f045f2a23323bd3cf7bfc0a
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
index 1b27c7919fd9..e01de2d87b61 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/ruby2ruby-2.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=56637e663920ab7a21249a32a90c0614
diff --git a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4 b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
index bb1d0cda981f..70beb66d6e04 100644
--- a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
+++ b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby_gntp-0.3.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d5a819059a0456e3a625187c1fea666
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2 b/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
index f51c36cdf48b..24881c884f5a 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.14.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=47642a395e045e78237e28b1a596c8ba
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.15.0 b/metadata/md5-cache/dev-ruby/ruby_parser-3.15.0
index 3c284c9e06da..8fdcb3ad655f 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.15.0
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=99fb589d11b4bf35a4ed36207cdee426
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.15.1 b/metadata/md5-cache/dev-ruby/ruby_parser-3.15.1
index 5f1ab6a5aba2..c33c72ce94e9 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.15.1
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.15.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.15.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e42b28d62dc040b7dc0cdd7a979bea1
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.16.0 b/metadata/md5-cache/dev-ruby/ruby_parser-3.16.0
index 1563284e643c..861affe6d3b8 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.16.0
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=14a4887a2c2427d92613befad7ffcf01
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.17.0 b/metadata/md5-cache/dev-ruby/ruby_parser-3.17.0
index 9eb204881917..4500c727762a 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.17.0
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.17.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e4b39b04140acadc144efbb919ae1e1c
diff --git a/metadata/md5-cache/dev-ruby/ruby_smb-1.1.0 b/metadata/md5-cache/dev-ruby/ruby_smb-1.1.0
index bcb9602010b7..d16356561410 100644
--- a/metadata/md5-cache/dev-ruby/ruby_smb-1.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby_smb-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/ruby_smb-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1d43308e4af2206c5cfde51f977e67a9
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.1.6 b/metadata/md5-cache/dev-ruby/rubygems-3.1.6
index 4ac2d0428108..98a3b1c11b05 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.1.6
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.1.6
@@ -5,7 +5,7 @@ DESCRIPTION=Centralized Ruby extension management system
 EAPI=7
 HOMEPAGE=https://rubygems.org/
 IUSE=server test ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 || ( Ruby MIT )
 PDEPEND=server? ( =dev-ruby/builder-3* )
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.1.6.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cbddf996d4b542b87c68668c805e7c05
+_md5_=567481a6b46dd5a9623ede481b0f618d
diff --git a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.3 b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.3
index 558a8ae710cc..2d8c48371011 100644
--- a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.3
+++ b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubyntlm-0.6.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df637b42e4cff19cc1de67cbab86d065
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.7.0 b/metadata/md5-cache/dev-ruby/rubypants-0.7.0
index 8c7b9a184408..7c875c94511f 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.7.0
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubypants-0.7.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ebdf08d4085ec1032e430e505fb8b08
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.7.1 b/metadata/md5-cache/dev-ruby/rubypants-0.7.1
index 02b50de25e66..ba22c64b6e0d 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.7.1
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.7.1
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=A Ruby port of the SmartyPants PHP library
 EAPI=7
 HOMEPAGE=https://leahneukirchen.org/repos/rubypants/README
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubypants-0.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=301a91ce08baca7550bb126326ed11ea
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6f4794f5668272dd8750cf5165d83813
diff --git a/metadata/md5-cache/dev-ruby/rubytest-0.8.1 b/metadata/md5-cache/dev-ruby/rubytest-0.8.1
index f0588515cc48..7e7a8540c25e 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-0.8.1
+++ b/metadata/md5-cache/dev-ruby/rubytest-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubytest-0.8.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fa1859c824d4f176554fa5b207e10185
diff --git a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0 b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
index d2c88e94429c..70999bd19d8e 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
+++ b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubytest-cli-0.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=969418935ca257c26e85b40d5fd34afc
diff --git a/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2 b/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2
index 33df157a48a4..334427766f34 100644
--- a/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2
+++ b/metadata/md5-cache/dev-ruby/rubytter-1.5.1-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rubytter-1.5.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=45176f57dd129772307f22e701b73d12
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.3.0 b/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
index 357ee597058d..b77e5a1c8173 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.3.0.tar.gz -> rubyzip-1.3.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2f7325262f0726e54031236396ac6a9
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-2.2.0 b/metadata/md5-cache/dev-ruby/rubyzip-2.2.0
index 1f29755ce3ef..059d378979c7 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-2.2.0
+++ b/metadata/md5-cache/dev-ruby/rubyzip-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v2.2.0.tar.gz -> rubyzip-2.2.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ed88f5f0470fc7d569916b545735077
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-2.3.0 b/metadata/md5-cache/dev-ruby/rubyzip-2.3.0
index 7a0f8a64e52d..9c10786df082 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-2.3.0
+++ b/metadata/md5-cache/dev-ruby/rubyzip-2.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v2.3.0.tar.gz -> rubyzip-2.3.0-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=86745bafcc0961f999af72d8d9ab8211
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-2.3.2 b/metadata/md5-cache/dev-ruby/rubyzip-2.3.2
index 34495d051c05..caf5e1824da4 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-2.3.2
+++ b/metadata/md5-cache/dev-ruby/rubyzip-2.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v2.3.2.tar.gz -> rubyzip-2.3.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=86745bafcc0961f999af72d8d9ab8211
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
index d37ae93df2dd..0499bc2b90d1 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/safe_yaml-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=abc76e97aa062fe5fd38fdf48b70bc58
diff --git a/metadata/md5-cache/dev-ruby/sanitize-5.2.1 b/metadata/md5-cache/dev-ruby/sanitize-5.2.1
index 30a032e3bf94..d105b69ba934 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-5.2.1
+++ b/metadata/md5-cache/dev-ruby/sanitize-5.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/rgrove/sanitize/archive/v5.2.1.tar.gz -> sanitize-5.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b97c473a8ba7fd6998c38e7d148693e8
diff --git a/metadata/md5-cache/dev-ruby/sanitize-5.2.2 b/metadata/md5-cache/dev-ruby/sanitize-5.2.2
index 9bfa4c00c52f..6e279b0cf9fc 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-5.2.2
+++ b/metadata/md5-cache/dev-ruby/sanitize-5.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/rgrove/sanitize/archive/v5.2.2.tar.gz -> sanitize-5.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b97c473a8ba7fd6998c38e7d148693e8
diff --git a/metadata/md5-cache/dev-ruby/sanitize-5.2.3 b/metadata/md5-cache/dev-ruby/sanitize-5.2.3
index 3930198ba69f..c5d0a3af0e1f 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-5.2.3
+++ b/metadata/md5-cache/dev-ruby/sanitize-5.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/rgrove/sanitize/archive/v5.2.3.tar.gz -> sanitize-5.2.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b97c473a8ba7fd6998c38e7d148693e8
diff --git a/metadata/md5-cache/dev-ruby/sanitize-6.0.0 b/metadata/md5-cache/dev-ruby/sanitize-6.0.0
index 690f382fdcf6..81c4ec909acc 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-6.0.0
+++ b/metadata/md5-cache/dev-ruby/sanitize-6.0.0
@@ -5,12 +5,12 @@ DESCRIPTION=Sanitize is a whitelist-based HTML sanitizer
 EAPI=8
 HOMEPAGE=https://github.com/rgrove/sanitize
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby26(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby27(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby30(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/rgrove/sanitize/archive/v6.0.0.tar.gz -> sanitize-6.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3240dbdd77c7686be56e6275957166a1
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ddcebe969ccf0da5ebe901dd24d03bf3
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.25 b/metadata/md5-cache/dev-ruby/sass-3.4.25
index 089e6af3fde7..f4cf9da9fde1 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.25
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.25
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.4
 SRC_URI=https://rubygems.org/gems/sass-3.4.25.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=1beb7fcbc7ae0e23e83b55091acbab74
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.25-r1 b/metadata/md5-cache/dev-ruby/sass-3.4.25-r1
index 635c034ef3fb..9afeaac841b6 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.25-r1
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.25-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.4
 SRC_URI=https://rubygems.org/gems/sass-3.4.25.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=f986ad5763f0a4536f86dd833e44af92
diff --git a/metadata/md5-cache/dev-ruby/sass-3.5.7 b/metadata/md5-cache/dev-ruby/sass-3.5.7
index bd721f3e66a2..fa8aeb35db18 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.5.7
+++ b/metadata/md5-cache/dev-ruby/sass-3.5.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.5
 SRC_URI=https://rubygems.org/gems/sass-3.5.7.gem
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bfd69e750c0383dcf2ecfe6cd8617ead
diff --git a/metadata/md5-cache/dev-ruby/sass-3.5.7-r1 b/metadata/md5-cache/dev-ruby/sass-3.5.7-r1
index 502995c84f03..d94bd0cb9948 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.5.7-r1
+++ b/metadata/md5-cache/dev-ruby/sass-3.5.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.5
 SRC_URI=https://rubygems.org/gems/sass-3.5.7.gem
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6a1fd6a0e7f49119dcfa24d034020ff
diff --git a/metadata/md5-cache/dev-ruby/sass-3.7.4 b/metadata/md5-cache/dev-ruby/sass-3.7.4
index 09eec34382c0..91c48b2b48db 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.7.4
+++ b/metadata/md5-cache/dev-ruby/sass-3.7.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.7
 SRC_URI=https://github.com/sass/ruby-sass/archive/3.7.4.tar.gz -> sass-3.7.4.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8fcf743302ec1be5383d78aeb1928a3e
diff --git a/metadata/md5-cache/dev-ruby/sass-listen-4.0.0 b/metadata/md5-cache/dev-ruby/sass-listen-4.0.0
index 525e00acec61..4a00319b7e65 100644
--- a/metadata/md5-cache/dev-ruby/sass-listen-4.0.0
+++ b/metadata/md5-cache/dev-ruby/sass-listen-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/sass/listen/archive/v4.0.0.tar.gz -> sass-listen-4.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=025a0bf44d161e49260f0407ec92aaee
diff --git a/metadata/md5-cache/dev-ruby/sass-listen-4.0.0-r1 b/metadata/md5-cache/dev-ruby/sass-listen-4.0.0-r1
new file mode 100644
index 000000000000..e4cb42bea3e9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sass-listen-4.0.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/thor[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/thor[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/thor[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Fork of guard/listen provides a stable API for users of the ruby Sass CLI
+EAPI=8
+HOMEPAGE=https://github.com/guard/listen
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=4
+SRC_URI=https://github.com/sass/listen/archive/v4.0.0.tar.gz -> sass-listen-4.0.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7be2ca21cefc8a7f8b16a8436986e80c
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.8 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.8
index 87c96e7f0fbf..4fb58b535b20 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.8
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.8.tar.gz -> sass-rails-5.0.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3af0be71d0ec15de835745925f7d61df
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.1.0 b/metadata/md5-cache/dev-ruby/sass-rails-5.1.0
index 2a678b77ea06..ac6bd53ea9e0 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.1.0
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=5.1
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.1.0.tar.gz -> sass-rails-5.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3af0be71d0ec15de835745925f7d61df
diff --git a/metadata/md5-cache/dev-ruby/sassc-2.4.0 b/metadata/md5-cache/dev-ruby/sassc-2.4.0
index ffe818246ec9..7a2cdc5ecba2 100644
--- a/metadata/md5-cache/dev-ruby/sassc-2.4.0
+++ b/metadata/md5-cache/dev-ruby/sassc-2.4.0
@@ -5,12 +5,12 @@ DESCRIPTION=Use libsass with Ruby
 EAPI=7
 HOMEPAGE=https://github.com/sass/sassc-ruby
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libsass-3.6.1 ruby_targets_ruby26? ( >=dev-ruby/ffi-1.9.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.9.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/sassc-2.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0b2b5e6c1e7e0435db9da1890af555bb
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5f6467fc6af08a45e2baee17db640e05
diff --git a/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1 b/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1
index 18db71aa8bc6..f7a616be8d38 100644
--- a/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/sassc-rails-2.1.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/sassc-rails-2.1.2.gem
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=45c3693a98e13f8305c0a1e822893d24
diff --git a/metadata/md5-cache/dev-ruby/sawyer-0.8.2 b/metadata/md5-cache/dev-ruby/sawyer-0.8.2
index 9b2ded8da494..da2e7292eab6 100644
--- a/metadata/md5-cache/dev-ruby/sawyer-0.8.2
+++ b/metadata/md5-cache/dev-ruby/sawyer-0.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lostisland/sawyer/archive/v0.8.2.tar.gz -> sawyer-0.8.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=28d22d749e690e05a518512a1c1e15b7
diff --git a/metadata/md5-cache/dev-ruby/sdoc-1.1.0 b/metadata/md5-cache/dev-ruby/sdoc-1.1.0
index de6938fa736d..00618435742d 100644
--- a/metadata/md5-cache/dev-ruby/sdoc-1.1.0
+++ b/metadata/md5-cache/dev-ruby/sdoc-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sdoc-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=00e362d96d4025f769912c721d313e02
diff --git a/metadata/md5-cache/dev-ruby/seed-fu-2.3.9 b/metadata/md5-cache/dev-ruby/seed-fu-2.3.9
index facf8eddb901..492405f177a3 100644
--- a/metadata/md5-cache/dev-ruby/seed-fu-2.3.9
+++ b/metadata/md5-cache/dev-ruby/seed-fu-2.3.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbleigh/seed-fu/archive/v2.3.9.tar.gz -> seed-fu-2.3.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4bc1f4a87adaafd9344057feddb4ea30
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
index 9517d7b0055d..087fc5f4d352 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/selenium-webdriver-3.142.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0dc5c57347aa3d8c1f8757a67713d0a4
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-4.0.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-4.0.0
new file mode 100644
index 000000000000..fdce3a28facf
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-4.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby26(-)] >=dev-ruby/rexml-3.2.5:3[ruby_targets_ruby26(-)] >=dev-ruby/rubyzip-1.2.2:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby27(-)] >=dev-ruby/rexml-3.2.5:3[ruby_targets_ruby27(-)] >=dev-ruby/rubyzip-1.2.2:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby30(-)] >=dev-ruby/rexml-3.2.5:3[ruby_targets_ruby30(-)] >=dev-ruby/rubyzip-1.2.2:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=This gem provides Ruby bindings for WebDriver
+EAPI=8
+HOMEPAGE=https://github.com/seleniumhq/selenium
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby26(-)] >=dev-ruby/rexml-3.2.5:3[ruby_targets_ruby26(-)] >=dev-ruby/rubyzip-1.2.2:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby27(-)] >=dev-ruby/rexml-3.2.5:3[ruby_targets_ruby27(-)] >=dev-ruby/rubyzip-1.2.2:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby30(-)] >=dev-ruby/rexml-3.2.5:3[ruby_targets_ruby30(-)] >=dev-ruby/rubyzip-1.2.2:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=4
+SRC_URI=https://rubygems.org/gems/selenium-webdriver-4.0.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e9bb51fbc01f52c78586b87a7e95ff40
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2 b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
index 1a4b106da4c3..d004cec4c867 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/semantic_puppet-1.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ebde591c66693df6f697bd1b60bd609
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.3 b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.3
index a15297719e02..b391e4548c18 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.3
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/semantic_puppet-1.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=81975a18a3499300418db602c7611b81
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4 b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
index fb141a96efc3..ed7a06a14969 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/semantic_puppet-1.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=62f0e93aaaa72166106d3d848533dcd1
diff --git a/metadata/md5-cache/dev-ruby/semver2-3.4.2 b/metadata/md5-cache/dev-ruby/semver2-3.4.2
index 10365eb13303..f47d24bfbf2d 100644
--- a/metadata/md5-cache/dev-ruby/semver2-3.4.2
+++ b/metadata/md5-cache/dev-ruby/semver2-3.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/haf/semver/archive/v3.4.2.tar.gz -> semver2-3.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ad7c25ae167938800c3514f8ea5f524
diff --git a/metadata/md5-cache/dev-ruby/serialport-1.3.1 b/metadata/md5-cache/dev-ruby/serialport-1.3.1
index ecd98409b258..99aece70ead1 100644
--- a/metadata/md5-cache/dev-ruby/serialport-1.3.1
+++ b/metadata/md5-cache/dev-ruby/serialport-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serialport-1.3.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3313a4e86accd5b7ec8c8e4136af40f1
diff --git a/metadata/md5-cache/dev-ruby/serialport-1.3.2 b/metadata/md5-cache/dev-ruby/serialport-1.3.2
index 027fdb352707..6333afff8965 100644
--- a/metadata/md5-cache/dev-ruby/serialport-1.3.2
+++ b/metadata/md5-cache/dev-ruby/serialport-1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serialport-1.3.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0432cbd7d2b3f2370d9a50cb545d0332
diff --git a/metadata/md5-cache/dev-ruby/serverengine-2.2.1 b/metadata/md5-cache/dev-ruby/serverengine-2.2.1
index ba5dab7eb57b..be7b3904b1c7 100644
--- a/metadata/md5-cache/dev-ruby/serverengine-2.2.1
+++ b/metadata/md5-cache/dev-ruby/serverengine-2.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serverengine-2.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=661486db1c78db70352f931b9a7cac74
diff --git a/metadata/md5-cache/dev-ruby/serverengine-2.2.2 b/metadata/md5-cache/dev-ruby/serverengine-2.2.2
index 37286ae9ce2c..0305e2e91512 100644
--- a/metadata/md5-cache/dev-ruby/serverengine-2.2.2
+++ b/metadata/md5-cache/dev-ruby/serverengine-2.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serverengine-2.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=894f35b67398f8bb58caaabe93df947b
diff --git a/metadata/md5-cache/dev-ruby/serverengine-2.2.3 b/metadata/md5-cache/dev-ruby/serverengine-2.2.3
index 96bf0036b809..5ae08ff46560 100644
--- a/metadata/md5-cache/dev-ruby/serverengine-2.2.3
+++ b/metadata/md5-cache/dev-ruby/serverengine-2.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serverengine-2.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c53e20fc40b00bcf44c5f9974663dd7b
diff --git a/metadata/md5-cache/dev-ruby/serverengine-2.2.4 b/metadata/md5-cache/dev-ruby/serverengine-2.2.4
new file mode 100644
index 000000000000..a408dbfc622b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/serverengine-2.2.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/sigdump-0.2.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sigdump-0.2.2:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A framework to implement robust multiprocess servers
+EAPI=8
+HOMEPAGE=https://github.com/fluent/serverengine
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/sigdump-0.2.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sigdump-0.2.2:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/serverengine-2.2.4.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6b0da6d5e9c3359272a814f938820eca
diff --git a/metadata/md5-cache/dev-ruby/set-1.0.1 b/metadata/md5-cache/dev-ruby/set-1.0.1
index 83c3709e9ca6..9547d6046503 100644
--- a/metadata/md5-cache/dev-ruby/set-1.0.1
+++ b/metadata/md5-cache/dev-ruby/set-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/set/archive/v1.0.1.tar.gz -> set-1.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bf6bed9f0dd53ae076b80d6686e23340
diff --git a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9 b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
index 50182b65913b..10b5a265fc17 100644
--- a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
+++ b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/settingslogic-2.0.9.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b12938721b8a29b6e50504b2ac01e3a7
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
index 5dea0ea04852..fcb10efde2f2 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7cb61dc31721aa8aae99cac362775bb0
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.1 b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.1
index 517736b6e4bf..e481c0dc8bda 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.1
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.15.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=25cc9c2c814c18f5d1919d46c27fa69b
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.2 b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.2
index f73d444fdd67..2a9b20e8c690 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.2
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.15.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dc380fd0d09c32737cdc16745de6df03
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.3 b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.3
index a61c35d91644..c2df8611e8c5 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.3
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.15.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dc380fd0d09c32737cdc16745de6df03
diff --git a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3 b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3
index 764f33030e6c..98eafa635dbe 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3
+++ b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/shoulda/tarball/v2.11.3 -> shoulda-2.11.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c3a331e269c2dcc77c493795dacffcf0
diff --git a/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1 b/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1
index 41b69634f135..86349bd7cbc9 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/thoughtbot/shoulda/archive/v3.6.0.tar.gz -> shoulda-3.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=901683567b6c5b1df7f9d4c73103c823
diff --git a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1 b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
index 30e1bf4b1a2d..6a2e321b9e4c 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/shoulda-context-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=418598b65657bd9b1094c511d0d12efc
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r1
index b47601b11338..431403ddae12 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/shoulda-matchers-3.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b6c3ae100654dd0bf15f088cc5ab0e97
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.3.0-r1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.3.0-r1
index 6ec980c91767..f01154ade34f 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.3.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v4.3.0.tar.gz -> shoulda-matchers-4.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b6e233f943c8a90d6619ec027be8271c
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1
index c07aa166d998..80d755c79318 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v4.4.1.tar.gz -> shoulda-matchers-4.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=499ac189158d1e67941696db0ce5abe9
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1
index b1320907127d..fa95e9ad0210 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-4.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/thoughtbot/shoulda-matchers/archive/v4.5.1.tar.gz -> shoulda-matchers-4.5.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0fd41feb46406849e8d98848db756ffa
diff --git a/metadata/md5-cache/dev-ruby/sigar-0.7.3 b/metadata/md5-cache/dev-ruby/sigar-0.7.3
index 5743fa757dec..f85cb92074a6 100644
--- a/metadata/md5-cache/dev-ruby/sigar-0.7.3
+++ b/metadata/md5-cache/dev-ruby/sigar-0.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sigar-0.7.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6d999e14a2aecc88c93773132af5822e
diff --git a/metadata/md5-cache/dev-ruby/sigdump-0.2.4 b/metadata/md5-cache/dev-ruby/sigdump-0.2.4
index 2a61634d1b8c..eded52fe2889 100644
--- a/metadata/md5-cache/dev-ruby/sigdump-0.2.4
+++ b/metadata/md5-cache/dev-ruby/sigdump-0.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sigdump-0.2.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4d758b103a702c440e7d3ff177270ad
diff --git a/metadata/md5-cache/dev-ruby/simple-rss-1.3.3 b/metadata/md5-cache/dev-ruby/simple-rss-1.3.3
index ef0dd5c1efa3..d66fb9d5be46 100644
--- a/metadata/md5-cache/dev-ruby/simple-rss-1.3.3
+++ b/metadata/md5-cache/dev-ruby/simple-rss-1.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/simple-rss-1.3.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be28eefbb91f55b31de1702a84f04ec8
diff --git a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1 b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
index 02133b896435..6eda79481cea 100644
--- a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
+++ b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/laserlemon/simple_oauth/archive/v0.3.1.tar.gz -> simple_oauth-0.3.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a9b4df1f06fa4559152267ee75f00dde
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.18.5 b/metadata/md5-cache/dev-ruby/simplecov-0.18.5
index c0056e3e80d6..2643a54cc87c 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.18.5
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.18.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.8
 SRC_URI=https://github.com/colszowka/simplecov/archive/v0.18.5.tar.gz -> simplecov-0.18.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8d583da5d8e60394d2f7066545d9cedd
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3fb2491060f5335fb87ab54d41c94d99
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.19.0 b/metadata/md5-cache/dev-ruby/simplecov-0.19.0
index 8a9083ee83d7..9336207e5ac0 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.19.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.19.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.8
 SRC_URI=https://github.com/simplecov-ruby/simplecov/archive/v0.19.0.tar.gz -> simplecov-0.19.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=54b26422bf07226a8a09e06a92d4d0b2
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8c3760872dc54d3c10b5c11e72d2177b
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.19.1 b/metadata/md5-cache/dev-ruby/simplecov-0.19.1
index b0d1d6ca4dc2..e718960da8aa 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.19.1
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.19.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/simplecov-html:0.12[ruby_targets_ruby26(-)] >=dev-ruby/docile-1.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/simplecov-html:0.12[ruby_targets_ruby27(-)] >=dev-ruby/docile-1.1:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/simplecov-html:0.12[ruby_targets_ruby26(-)] >=dev-ruby/docile-1.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/simplecov-html:0.12[ruby_targets_ruby27(-)] >=dev-ruby/docile-1.1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/simplecov-html:0.12[ruby_targets_ruby30(-)] >=dev-ruby/docile-1.1:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Code coverage with a configuration library and merging across test suites
 EAPI=7
 HOMEPAGE=https://github.com/simplecov-ruby/simplecov
-IUSE=doc test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=doc test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-ruby/simplecov-html:0.12[ruby_targets_ruby26(-)] >=dev-ruby/docile-1.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/simplecov-html:0.12[ruby_targets_ruby27(-)] >=dev-ruby/docile-1.1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/simplecov-html:0.12[ruby_targets_ruby26(-)] >=dev-ruby/docile-1.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/simplecov-html:0.12[ruby_targets_ruby27(-)] >=dev-ruby/docile-1.1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/simplecov-html:0.12[ruby_targets_ruby30(-)] >=dev-ruby/docile-1.1:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.8
 SRC_URI=https://github.com/simplecov-ruby/simplecov/archive/v0.19.1.tar.gz -> simplecov-0.19.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=54b26422bf07226a8a09e06a92d4d0b2
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7a078750fe205abf924765089805fd78
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.10.2 b/metadata/md5-cache/dev-ruby/simplecov-html-0.10.2
index 1253245d2d05..c67023f9368f 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.10.2
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.10.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0.10
 SRC_URI=https://rubygems.org/gems/simplecov-html-0.10.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d0f63fb6d0b25ab18292a5d490dedc98
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f2c87f7e80b01bb1c132c4e99846841e
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.11.0 b/metadata/md5-cache/dev-ruby/simplecov-html-0.11.0
index 5390b6b196d2..5b7b9e329037 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.11.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0.11
 SRC_URI=https://rubygems.org/gems/simplecov-html-0.11.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2c821948057a424b0659cb7e76c29d45
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=395d167c3bd045c2b8fc354e2c7f1e66
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.0 b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.0
index 53b49ea0117d..b6037bc7c5e5 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0.12
 SRC_URI=https://rubygems.org/gems/simplecov-html-0.12.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2c821948057a424b0659cb7e76c29d45
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=395d167c3bd045c2b8fc354e2c7f1e66
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.1 b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.1
index 7fd729e8bac5..ba866cb6187c 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.1
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0.12
 SRC_URI=https://rubygems.org/gems/simplecov-html-0.12.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2c821948057a424b0659cb7e76c29d45
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=395d167c3bd045c2b8fc354e2c7f1e66
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.2 b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.2
index 5bf7604494a4..10f5d5ae2ff6 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.2
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0.12
 SRC_URI=https://rubygems.org/gems/simplecov-html-0.12.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2c821948057a424b0659cb7e76c29d45
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=395d167c3bd045c2b8fc354e2c7f1e66
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3 b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
index 206f228966ec..d7d0fafcadc6 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Generates a HTML report of your SimpleCov ruby code coverage results
 EAPI=7
 HOMEPAGE=https://github.com/colszowka/simplecov
-IUSE=doc ruby_targets_ruby26 ruby_targets_ruby27 doc test
+IUSE=doc ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0.12
 SRC_URI=https://rubygems.org/gems/simplecov-html-0.12.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9acaf9a09c72a02f9c36507b1a8a7a92
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=90f171659d21a0706cbcdb4d9f8af0ea
diff --git a/metadata/md5-cache/dev-ruby/simpleidn-0.2.1 b/metadata/md5-cache/dev-ruby/simpleidn-0.2.1
index 11cf30019410..a6d5209649e7 100644
--- a/metadata/md5-cache/dev-ruby/simpleidn-0.2.1
+++ b/metadata/md5-cache/dev-ruby/simpleidn-0.2.1
@@ -5,12 +5,12 @@ DESCRIPTION=Allows easy conversion from punycode ACE to unicode UTF-8 strings an
 EAPI=7
 HOMEPAGE=https://github.com/mmriis/simpleidn
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/unf-0.1.4[ruby_targets_ruby26(-)] =dev-ruby/unf-0.1*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/unf-0.1.4[ruby_targets_ruby27(-)] =dev-ruby/unf-0.1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mmriis/simpleidn/archive/v0.2.1.tar.gz -> simpleidn-0.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7fdf0a26a24cca937e8761ef49d23ac0
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4168e1a2201457e3421f6c3cdf498423
diff --git a/metadata/md5-cache/dev-ruby/sinatra-2.1.0 b/metadata/md5-cache/dev-ruby/sinatra-2.1.0
index edb9a1d12da9..611ef0a53a41 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-2.1.0
+++ b/metadata/md5-cache/dev-ruby/sinatra-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/sinatra/sinatra/archive/v2.1.0.tar.gz -> sinatra-2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac60efa3b65ddfaca4e57558f7fa370f
diff --git a/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1 b/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1
index 252c9452651c..c91e9df4a6d2 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1
+++ b/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sinatra-partial-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7fb5f27b573bfae0f097c49805a6358d
diff --git a/metadata/md5-cache/dev-ruby/six-0.2.0 b/metadata/md5-cache/dev-ruby/six-0.2.0
index baf1398a3397..fdc917468b2d 100644
--- a/metadata/md5-cache/dev-ruby/six-0.2.0
+++ b/metadata/md5-cache/dev-ruby/six-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/randx/six/archive/v0.2.0.tar.gz -> six-0.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=48d4a891725ce50cdbfba8ab3f144f9c
diff --git a/metadata/md5-cache/dev-ruby/slim-3.0.9-r1 b/metadata/md5-cache/dev-ruby/slim-3.0.9-r1
index 2fa23fe161ec..16b2a0740f99 100644
--- a/metadata/md5-cache/dev-ruby/slim-3.0.9-r1
+++ b/metadata/md5-cache/dev-ruby/slim-3.0.9-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/slim-3.0.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7a3b6d0e30b3b7b3ee5a485f37b8a3bf
diff --git a/metadata/md5-cache/dev-ruby/slim-4.1.0 b/metadata/md5-cache/dev-ruby/slim-4.1.0
index 221f932f4564..ae1c358948cb 100644
--- a/metadata/md5-cache/dev-ruby/slim-4.1.0
+++ b/metadata/md5-cache/dev-ruby/slim-4.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/slim-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c75fda06fcc6fb7f2f88ccc0ad60f8bc
diff --git a/metadata/md5-cache/dev-ruby/slim-4.1.0-r1 b/metadata/md5-cache/dev-ruby/slim-4.1.0-r1
index a268c0bb85c3..a9a2b00fe6d9 100644
--- a/metadata/md5-cache/dev-ruby/slim-4.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/slim-4.1.0-r1
@@ -5,12 +5,12 @@ DESCRIPTION=A template language aiming to reduce the syntax to the essential par
 EAPI=7
 HOMEPAGE=http://slim-lang.com/
 IUSE=doc test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/tilt-2.0.6:*[ruby_targets_ruby26(-)] =dev-ruby/tilt-2.0*:*[ruby_targets_ruby26(-)] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby26(-)] !!<dev-ruby/slim-3.0.9-r1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/tilt-2.0.6:*[ruby_targets_ruby27(-)] =dev-ruby/tilt-2.0*:*[ruby_targets_ruby27(-)] >=dev-ruby/temple-0.7.6:0.7[ruby_targets_ruby27(-)] !!<dev-ruby/slim-3.0.9-r1[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/slim-4.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ed31fe9a4e62f4defd1d0f96f1081b13
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f49679df81c1634c432bf27211306bd4
diff --git a/metadata/md5-cache/dev-ruby/slop-4.8.1 b/metadata/md5-cache/dev-ruby/slop-4.8.1
index 340e621ec04c..9693a87b5973 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.8.1
+++ b/metadata/md5-cache/dev-ruby/slop-4.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.8.1.tar.gz -> slop-4.8.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=71df450defcc5a2787a1b3eb9194aa43
diff --git a/metadata/md5-cache/dev-ruby/slop-4.8.2 b/metadata/md5-cache/dev-ruby/slop-4.8.2
index 7c974dd3fccf..e2e07bbd0421 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.8.2
+++ b/metadata/md5-cache/dev-ruby/slop-4.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.8.2.tar.gz -> slop-4.8.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dca509b7a9eee040d8ae047e13f4864c
diff --git a/metadata/md5-cache/dev-ruby/slop-4.9.1 b/metadata/md5-cache/dev-ruby/slop-4.9.1
index 9cd495152148..8db637555f7a 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.9.1
+++ b/metadata/md5-cache/dev-ruby/slop-4.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.9.1.tar.gz -> slop-4.9.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=37c5342bdc03f3a9d1c50998c5797b71
diff --git a/metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0 b/metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0
index 4b227bcb4dc4..dbf996ce5466 100644
--- a/metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0
+++ b/metadata/md5-cache/dev-ruby/slow_enumerator_tools-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/slow_enumerator_tools-1.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e55bfbccc8d5b24d70dde760b8ec7702
diff --git a/metadata/md5-cache/dev-ruby/sorted_set-1.0.3 b/metadata/md5-cache/dev-ruby/sorted_set-1.0.3
index 956ae9749c09..009560fedd07 100644
--- a/metadata/md5-cache/dev-ruby/sorted_set-1.0.3
+++ b/metadata/md5-cache/dev-ruby/sorted_set-1.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/knu/sorted_set/archive/v1.0.3.tar.gz -> sorted_set-1.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3380235e4ce5f9f88145df5f012c1604
diff --git a/metadata/md5-cache/dev-ruby/sourcemap-0.1.1 b/metadata/md5-cache/dev-ruby/sourcemap-0.1.1
index f7f36b0f1b67..1366c74ce9e8 100644
--- a/metadata/md5-cache/dev-ruby/sourcemap-0.1.1
+++ b/metadata/md5-cache/dev-ruby/sourcemap-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sourcemap-0.1.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d59def00b46586bec87294421c74952
diff --git a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6 b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
index 6f07fd79013c..363e4f27ea77 100644
--- a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
+++ b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sparklines-0.5.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d12850f81c7330b2334ba0389e50bd53
diff --git a/metadata/md5-cache/dev-ruby/spreadsheet-1.2.6 b/metadata/md5-cache/dev-ruby/spreadsheet-1.2.6
index 9e133fb4f163..152795676bf0 100644
--- a/metadata/md5-cache/dev-ruby/spreadsheet-1.2.6
+++ b/metadata/md5-cache/dev-ruby/spreadsheet-1.2.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zdavatz/spreadsheet/archive/1.2.6.tar.gz -> spreadsheet-1.2.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=067d5ef924106ab8126a35f52ac7fc38
diff --git a/metadata/md5-cache/dev-ruby/spreadsheet-1.2.9 b/metadata/md5-cache/dev-ruby/spreadsheet-1.2.9
index 2d75a2d8172e..f461be2c082a 100644
--- a/metadata/md5-cache/dev-ruby/spreadsheet-1.2.9
+++ b/metadata/md5-cache/dev-ruby/spreadsheet-1.2.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zdavatz/spreadsheet/archive/1.2.9.tar.gz -> spreadsheet-1.2.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1992110f3358b021d13fca138b9d092a
diff --git a/metadata/md5-cache/dev-ruby/spreadsheet-1.3.0 b/metadata/md5-cache/dev-ruby/spreadsheet-1.3.0
index 962a7dafe996..2bca04d0b015 100644
--- a/metadata/md5-cache/dev-ruby/spreadsheet-1.3.0
+++ b/metadata/md5-cache/dev-ruby/spreadsheet-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zdavatz/spreadsheet/archive/1.3.0.tar.gz -> spreadsheet-1.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3d8f4bf4d20cc9c64fb60bac184813cc
diff --git a/metadata/md5-cache/dev-ruby/spring-2.1.1 b/metadata/md5-cache/dev-ruby/spring-2.1.1
index 76f2d37fc030..d4aaf511365b 100644
--- a/metadata/md5-cache/dev-ruby/spring-2.1.1
+++ b/metadata/md5-cache/dev-ruby/spring-2.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v2.1.1.tar.gz -> spring-2.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6cff63f653d8693f9d94117b7a8158ac
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.7.2 b/metadata/md5-cache/dev-ruby/sprockets-3.7.2
index 860932edd884..285a6b0fb35a 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.7.2
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.7.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.7.2.tar.gz -> sprockets-3.7.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=6cfdd1fd8bba97046a603720d7f66788
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r1 b/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r1
index 0816301c9399..3f506b7ce965 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r1
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.7.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.7.2.tar.gz -> sprockets-3.7.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=5f72ba992338d99644811a061e5aa1c3
diff --git a/metadata/md5-cache/dev-ruby/sprockets-4.0.2 b/metadata/md5-cache/dev-ruby/sprockets-4.0.2
index b6b6c4358f90..77f1683d801d 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-4.0.2
+++ b/metadata/md5-cache/dev-ruby/sprockets-4.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rails/sprockets/archive/v4.0.2.tar.gz -> sprockets-4.0.2-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9eb168216a6ee2bbaff377c570427e78
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.2 b/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.2
index 004e53b13d37..5cc3efacd8fc 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.2
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-3.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v3.2.2.tar.gz -> sprockets-rails-3.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ceae066d1f5711871febd05fa8170f0e
diff --git a/metadata/md5-cache/dev-ruby/spy-1.0.0 b/metadata/md5-cache/dev-ruby/spy-1.0.0
index 3689ad78d719..d85a07b80cbe 100644
--- a/metadata/md5-cache/dev-ruby/spy-1.0.0
+++ b/metadata/md5-cache/dev-ruby/spy-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/spy-1.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54a9a9c476b554b6419c32f56be0a401
diff --git a/metadata/md5-cache/dev-ruby/spy-1.0.1 b/metadata/md5-cache/dev-ruby/spy-1.0.1
index 65115027c137..48f0e0b50c1b 100644
--- a/metadata/md5-cache/dev-ruby/spy-1.0.1
+++ b/metadata/md5-cache/dev-ruby/spy-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/spy-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8b78626073ab4d673a1873436ac69987
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1 b/metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1
index 1caf35c17c61..48750cf7f18d 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.4.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sqlite3-1.4.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2af0c9a483352a40fd34110a2a985d01
diff --git a/metadata/md5-cache/dev-ruby/sshkey-2.0.0 b/metadata/md5-cache/dev-ruby/sshkey-2.0.0
index 3cfcb6a1592e..370a40090031 100644
--- a/metadata/md5-cache/dev-ruby/sshkey-2.0.0
+++ b/metadata/md5-cache/dev-ruby/sshkey-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sshkey-2.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c9908097a4fe20d34fff1d3e4ecb8687
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.21.0 b/metadata/md5-cache/dev-ruby/sshkit-1.21.0
index 8ec18b7d485c..fd984a9b1820 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.21.0
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.21.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sshkit-1.21.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=141c9a1574b1f8781db99dad828f3909
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.21.1 b/metadata/md5-cache/dev-ruby/sshkit-1.21.1
index d94bac5b4628..86b5be674a51 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.21.1
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.21.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sshkit-1.21.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=42a4ff1a8abb58a44a867253d8eb40a8
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.21.2 b/metadata/md5-cache/dev-ruby/sshkit-1.21.2
index 4efea3ce9721..55e1d08b59e6 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.21.2
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.21.2
@@ -5,12 +5,12 @@ DESCRIPTION=SSHKit makes it easy to write structured, testable SSH commands in R
 EAPI=7
 HOMEPAGE=https://github.com/capistrano/sshkit
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby26(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby27(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/sshkit-1.21.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=16548214e94edde210fdbae7f2ef346b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=543a0e88903c6511253d9f6af747ebb6
diff --git a/metadata/md5-cache/dev-ruby/stamp-0.6.0 b/metadata/md5-cache/dev-ruby/stamp-0.6.0
index c5de522f72cd..7bc6897a1d2c 100644
--- a/metadata/md5-cache/dev-ruby/stamp-0.6.0
+++ b/metadata/md5-cache/dev-ruby/stamp-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jeremyw/stamp/archive/v0.6.0.tar.gz -> stamp-0.6.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6f3084ed4dbe0d3c0966efd70cfc4bb0
diff --git a/metadata/md5-cache/dev-ruby/state_machine-1.2.0 b/metadata/md5-cache/dev-ruby/state_machine-1.2.0
index 13631189c934..9f9be8c2a537 100644
--- a/metadata/md5-cache/dev-ruby/state_machine-1.2.0
+++ b/metadata/md5-cache/dev-ruby/state_machine-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/state_machine-1.2.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=47967b9abbe5190830ecd3c7cae57af3
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.4.10 b/metadata/md5-cache/dev-ruby/stomp-1.4.10
index 396fe0652747..75a7c29b461a 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.4.10
+++ b/metadata/md5-cache/dev-ruby/stomp-1.4.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/stomp-1.4.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7f34f9cc6b48983582ece42901738804
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.4.9 b/metadata/md5-cache/dev-ruby/stomp-1.4.9
index 1a5b8ef45e76..417a8bc6d5c8 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.4.9
+++ b/metadata/md5-cache/dev-ruby/stomp-1.4.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/stomp-1.4.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d60fc2a6ec522ca1da38300076285184
diff --git a/metadata/md5-cache/dev-ruby/stringex-2.8.5 b/metadata/md5-cache/dev-ruby/stringex-2.8.5
index 1e0a76c4b2fc..c948c6140e5e 100644
--- a/metadata/md5-cache/dev-ruby/stringex-2.8.5
+++ b/metadata/md5-cache/dev-ruby/stringex-2.8.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/stringex-2.8.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6b5ddba3ea9ae6c93b8a1044865f0219
diff --git a/metadata/md5-cache/dev-ruby/strptime-0.2.5 b/metadata/md5-cache/dev-ruby/strptime-0.2.5
index de0dad41085f..48d0378f25a9 100644
--- a/metadata/md5-cache/dev-ruby/strptime-0.2.5
+++ b/metadata/md5-cache/dev-ruby/strptime-0.2.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nurse/strptime/archive/v0.2.5.tar.gz -> strptime-0.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e37e4a1ca15efdb59bcfefb22dd5b0c8
diff --git a/metadata/md5-cache/dev-ruby/strptime-0.2.5-r1 b/metadata/md5-cache/dev-ruby/strptime-0.2.5-r1
index 7cee8f1d347f..e5c6d48ece5f 100644
--- a/metadata/md5-cache/dev-ruby/strptime-0.2.5-r1
+++ b/metadata/md5-cache/dev-ruby/strptime-0.2.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nurse/strptime/archive/v0.2.5.tar.gz -> strptime-0.2.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dbbf90ba84c9e6b6e44bf94861c51168
diff --git a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r2 b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r2
index 8aaf58b41cb0..7bb6f6715475 100644
--- a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r2
+++ b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nulayer/subexec/archive/v0.2.3.tar.gz -> subexec-0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac56d63ab94789f28402b64a6779874f
diff --git a/metadata/md5-cache/dev-ruby/sync-0.5.0 b/metadata/md5-cache/dev-ruby/sync-0.5.0
index 64d105dec241..6afe1aaeff2c 100644
--- a/metadata/md5-cache/dev-ruby/sync-0.5.0
+++ b/metadata/md5-cache/dev-ruby/sync-0.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/sync/archive/v0.5.0.tar.gz -> sync-0.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4ccd6e4d4697f2292d165c2e241be3cd
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.2.2 b/metadata/md5-cache/dev-ruby/syntax-1.2.2
index ff6dc744bd30..d04f398f49a0 100644
--- a/metadata/md5-cache/dev-ruby/syntax-1.2.2
+++ b/metadata/md5-cache/dev-ruby/syntax-1.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dblock/syntax/archive/v1.2.2.tar.gz -> syntax-1.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a9a259c4263dbb3fe89c641c406d96c
diff --git a/metadata/md5-cache/dev-ruby/sys-uname-1.2.2 b/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
index cd54d0fb32f6..1c61d2375ec1 100644
--- a/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
+++ b/metadata/md5-cache/dev-ruby/sys-uname-1.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/sys-uname-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=29bfcbdfc64387fca4dbe67c425a5fd6
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.5 b/metadata/md5-cache/dev-ruby/syslogger-1.6.5
index aad2d15db296..99204ecc6415 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.5
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/syslogger-1.6.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2f0ed2dad3d118c6fd9b48303d8ec1a5
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1 b/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1
index 7593feef6e37..229d4c69a9f5 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/syslogger-1.6.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6aca22828496cf7f8c6c1c0e32a359f
diff --git a/metadata/md5-cache/dev-ruby/systemu-2.6.5 b/metadata/md5-cache/dev-ruby/systemu-2.6.5
index ac3415d78d3b..0fd597c98aa8 100644
--- a/metadata/md5-cache/dev-ruby/systemu-2.6.5
+++ b/metadata/md5-cache/dev-ruby/systemu-2.6.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/systemu-2.6.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e1f757167a33acad0b4a2ab88fbc3b61
diff --git a/metadata/md5-cache/dev-ruby/tdiff-0.3.4 b/metadata/md5-cache/dev-ruby/tdiff-0.3.4
index 5dc4415072c9..5dadabafb4f5 100644
--- a/metadata/md5-cache/dev-ruby/tdiff-0.3.4
+++ b/metadata/md5-cache/dev-ruby/tdiff-0.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tdiff-0.3.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=373856ba314e4d3e35e3d0204ff597e9
diff --git a/metadata/md5-cache/dev-ruby/temple-0.8.2 b/metadata/md5-cache/dev-ruby/temple-0.8.2
index a507b54276be..fa24cec42cfd 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.8.2
+++ b/metadata/md5-cache/dev-ruby/temple-0.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0.7
 SRC_URI=https://rubygems.org/gems/temple-0.8.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=50dfbe74ee1546c67aeeb54eccbcd922
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1
index 7f53bdc61ef2..5f76e875234f 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/term-ansicolor-1.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c53d8f49bf69f21a12f1568a76fd7fee
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1
index 09858ebed8b8..0e697248adbd 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/term-ansicolor-1.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=44f3bcacee968d61d1a82bd49234b8d1
diff --git a/metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2 b/metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2
index d0218cfe8134..0bdd5ce8ba54 100644
--- a/metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2
+++ b/metadata/md5-cache/dev-ruby/terminal-table-1.8.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tj/terminal-table/archive/v1.8.0.tar.gz -> terminal-table-1.8.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aa3ef94aefe2a0916d5ba63071c066f7
diff --git a/metadata/md5-cache/dev-ruby/terminal-table-2.0.0 b/metadata/md5-cache/dev-ruby/terminal-table-2.0.0
index 9acd56d7e387..67ac18c9d174 100644
--- a/metadata/md5-cache/dev-ruby/terminal-table-2.0.0
+++ b/metadata/md5-cache/dev-ruby/terminal-table-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/tj/terminal-table/archive/v2.0.0.tar.gz -> terminal-table-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d2d7c35e775a336621614288a946eb85
diff --git a/metadata/md5-cache/dev-ruby/terminal-table-3.0.0 b/metadata/md5-cache/dev-ruby/terminal-table-3.0.0
index fba4051fe4a4..10ab24876505 100644
--- a/metadata/md5-cache/dev-ruby/terminal-table-3.0.0
+++ b/metadata/md5-cache/dev-ruby/terminal-table-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/tj/terminal-table/archive/v3.0.0.tar.gz -> terminal-table-3.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=24eecda49ec008b51ca907bd2a9bd6e7
diff --git a/metadata/md5-cache/dev-ruby/terminal-table-3.0.1 b/metadata/md5-cache/dev-ruby/terminal-table-3.0.1
index d9c82fe6f714..39f121a61d0e 100644
--- a/metadata/md5-cache/dev-ruby/terminal-table-3.0.1
+++ b/metadata/md5-cache/dev-ruby/terminal-table-3.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/tj/terminal-table/archive/v3.0.1.tar.gz -> terminal-table-3.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3f3e786bcd7a794c37b2f886ddfcb252
diff --git a/metadata/md5-cache/dev-ruby/terminal-table-3.0.2 b/metadata/md5-cache/dev-ruby/terminal-table-3.0.2
index 72c4edccf952..ee5a91492314 100644
--- a/metadata/md5-cache/dev-ruby/terminal-table-3.0.2
+++ b/metadata/md5-cache/dev-ruby/terminal-table-3.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/tj/terminal-table/archive/v3.0.2.tar.gz -> terminal-table-3.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=634edc179ea32428dea0d57f825b24f0
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.3.9 b/metadata/md5-cache/dev-ruby/test-unit-3.3.9
index 001be32da023..9b01a30dd4c5 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.3.9
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.3.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/test-unit-3.3.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=878f4c457bc50b14089e698664f917b2
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.4.4 b/metadata/md5-cache/dev-ruby/test-unit-3.4.4
index 153c3534ddbb..e36f60a8fa6c 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.4.4
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/test-unit-3.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4db83fb4430d8c6d59e4528a7f6aa7e5
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.4.5 b/metadata/md5-cache/dev-ruby/test-unit-3.4.5
index 4015fee7bf64..abcedbcc5a4c 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.4.5
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.4.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/test-unit/test-unit/archive/3.4.5.tar.gz -> test-unit-3.4.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ebed982aae8f8339410f530a853ac07
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.4.6 b/metadata/md5-cache/dev-ruby/test-unit-3.4.6
index 79fcef6698c9..1baa2f6dfc3d 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.4.6
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.4.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/test-unit/test-unit/archive/3.4.6.tar.gz -> test-unit-3.4.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ebed982aae8f8339410f530a853ac07
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.4.7 b/metadata/md5-cache/dev-ruby/test-unit-3.4.7
index e1461994b4d3..11788627f674 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.4.7
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.4.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/test-unit/test-unit/archive/3.4.7.tar.gz -> test-unit-3.4.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1ebed982aae8f8339410f530a853ac07
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
index 3d73c4744d98..3aed597bb95e 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/test-unit-rr-1.0.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0a9cc173596464f93efb0a641f426a2e
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1
index 277d01119a19..778b39a80941 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/test-unit-rr-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d47a8cf5b5bf946bd84ce22ca8a74f2
diff --git a/metadata/md5-cache/dev-ruby/test_construct-2.0.2 b/metadata/md5-cache/dev-ruby/test_construct-2.0.2
index 42115d846e22..58680cc8fde0 100644
--- a/metadata/md5-cache/dev-ruby/test_construct-2.0.2
+++ b/metadata/md5-cache/dev-ruby/test_construct-2.0.2
@@ -4,12 +4,12 @@ DESCRIPTION=Creates temporary files and directories for testing
 EAPI=6
 HOMEPAGE=https://github.com/bhb/test_construct
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/test_construct-2.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4af7a35357abedbb4719a1fe8adc0ae8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=53b83b32a3655ce734eafff73539f6c3
diff --git a/metadata/md5-cache/dev-ruby/test_declarative-0.0.6 b/metadata/md5-cache/dev-ruby/test_declarative-0.0.6
index bd8145b67e06..60a72e9fa4c1 100644
--- a/metadata/md5-cache/dev-ruby/test_declarative-0.0.6
+++ b/metadata/md5-cache/dev-ruby/test_declarative-0.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/svenfuchs/test_declarative/tarball/v0.0.6 -> test_declarative-0.0.6.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7e46bbf5d0a8f86bbd59530bc4b00bee
diff --git a/metadata/md5-cache/dev-ruby/text-1.3.1 b/metadata/md5-cache/dev-ruby/text-1.3.1
index 2d1c683f708e..d4a3d2b5114f 100644
--- a/metadata/md5-cache/dev-ruby/text-1.3.1
+++ b/metadata/md5-cache/dev-ruby/text-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/text-1.3.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c7cbc51c03ea83d851ad145de29e8f61
diff --git a/metadata/md5-cache/dev-ruby/text-1.3.1-r1 b/metadata/md5-cache/dev-ruby/text-1.3.1-r1
index a500f5671220..2a2ce38a2062 100644
--- a/metadata/md5-cache/dev-ruby/text-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/text-1.3.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/text-1.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df99a228f22db52558281f62edba6419
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
index 727c1c99a21b..56471c052a4b 100644
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
+++ b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/text-hyphen-1.4.1.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4bc16381a35db9ab70aebd71b1994a16
diff --git a/metadata/md5-cache/dev-ruby/textpow-1.4.0 b/metadata/md5-cache/dev-ruby/textpow-1.4.0
index d122601d2901..ca09f1b119d6 100644
--- a/metadata/md5-cache/dev-ruby/textpow-1.4.0
+++ b/metadata/md5-cache/dev-ruby/textpow-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grosser/textpow/archive/v1.4.0.tar.gz -> textpow-1.4.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=318357794772f64c43f43c579f566d37
diff --git a/metadata/md5-cache/dev-ruby/thor-0.20.3-r1 b/metadata/md5-cache/dev-ruby/thor-0.20.3-r1
index 1c419c3c3ed8..b599f43ec271 100644
--- a/metadata/md5-cache/dev-ruby/thor-0.20.3-r1
+++ b/metadata/md5-cache/dev-ruby/thor-0.20.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/erikhuda/thor/archive/v0.20.3.tar.gz -> thor-git-0.20.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cc911a0c691659d3e5620633b02c6255
diff --git a/metadata/md5-cache/dev-ruby/thor-1.1.0 b/metadata/md5-cache/dev-ruby/thor-1.1.0
index 35e2d6e0c609..154cf7d00ef4 100644
--- a/metadata/md5-cache/dev-ruby/thor-1.1.0
+++ b/metadata/md5-cache/dev-ruby/thor-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/erikhuda/thor/archive/v1.1.0.tar.gz -> thor-git-1.1.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3800a0f895972940fa80e51fb6c091c4
diff --git a/metadata/md5-cache/dev-ruby/thread_order-1.1.1 b/metadata/md5-cache/dev-ruby/thread_order-1.1.1
index 8933f64c7c93..ccbca5cbb936 100644
--- a/metadata/md5-cache/dev-ruby/thread_order-1.1.1
+++ b/metadata/md5-cache/dev-ruby/thread_order-1.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/thread_order-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=489858a74167653251d90a2c33df8762
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
index 47ab10cbf151..e8dcffdc4d1b 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/thread_safe-0.3.6.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=20cfff97e64c0ba2d10a7feaee22f8ce
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1
index 76fef1f3651c..94f128c34c19 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/thread_safe-0.3.6.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=432c1365875026230f1e4f1210f9d8ab
diff --git a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3 b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3
index 500aea443b40..23b9373c0fd9 100644
--- a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3
+++ b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tidy-ext-0.1.14.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=faa9b3c4a036be4c5a502fda8582031a
diff --git a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r5 b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r5
index 5c077f500c4e..e8307a2d0308 100644
--- a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r5
+++ b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tidy_table-0.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6cecaaa032101307cc3f5c0685ea0884
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.0.10 b/metadata/md5-cache/dev-ruby/tilt-2.0.10
index 206d3865e0a5..31d42bcbd166 100644
--- a/metadata/md5-cache/dev-ruby/tilt-2.0.10
+++ b/metadata/md5-cache/dev-ruby/tilt-2.0.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rtomayko/tilt/archive/v2.0.10.tar.gz -> tilt-2.0.10.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c9cf5f0816c947866ea515d0ee7ab45
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.1 b/metadata/md5-cache/dev-ruby/timecop-0.9.1
index 5a84c6e3e0c8..df2d7f5f8f2d 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.1
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/timecop-0.9.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a9c6c6e4b502d14bcd6ef8bf3da0ec5c
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.2 b/metadata/md5-cache/dev-ruby/timecop-0.9.2
index d8df739325ba..5b459f970932 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.2
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/timecop-0.9.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fcf6d291ba4a52239539d21bbbce1683
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.3 b/metadata/md5-cache/dev-ruby/timecop-0.9.3
index 7f383e6d1ebd..6fa1d47c81d0 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.3
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/timecop-0.9.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f6a96c083f59b812f62079e921bc9f85
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.4 b/metadata/md5-cache/dev-ruby/timecop-0.9.4
index 92bd25620ec2..a218878e9d39 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.4
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/timecop-0.9.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=99f939eec50a68428845a7e64d471af2
diff --git a/metadata/md5-cache/dev-ruby/timers-4.3.3 b/metadata/md5-cache/dev-ruby/timers-4.3.3
index 8babdbf8b82b..6814e129712a 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.3.3
+++ b/metadata/md5-cache/dev-ruby/timers-4.3.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/tarcieri/timers/archive/v4.3.3.tar.gz -> timers-4.3.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a13a29effa5a676134011eb58f7fa4d
diff --git a/metadata/md5-cache/dev-ruby/tins-1.29.1 b/metadata/md5-cache/dev-ruby/tins-1.29.1
index f7556e0dabe8..c232bd4ff600 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.29.1
+++ b/metadata/md5-cache/dev-ruby/tins-1.29.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tins-1.29.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=42bee8576a84d661391f61b01732c892
diff --git a/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0 b/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
index cd7f19a77b8f..646b3ac28a09 100644
--- a/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
+++ b/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tokyocabinet-1.32.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=39ade17f45b3095f8e82ee85449989db
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-1.2.8 b/metadata/md5-cache/dev-ruby/tomlrb-1.2.8
index 238cfe08891f..b117dc7e7745 100644
--- a/metadata/md5-cache/dev-ruby/tomlrb-1.2.8
+++ b/metadata/md5-cache/dev-ruby/tomlrb-1.2.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/fbernier/tomlrb/archive/v1.2.8.tar.gz -> tomlrb-1.2.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=60f572f8b2f211030aa99213dcb6d79d
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-2.0.0 b/metadata/md5-cache/dev-ruby/tomlrb-2.0.0
index 7ef6dc19a635..34e4303a8e67 100644
--- a/metadata/md5-cache/dev-ruby/tomlrb-2.0.0
+++ b/metadata/md5-cache/dev-ruby/tomlrb-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fbernier/tomlrb/archive/v2.0.0.tar.gz -> tomlrb-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=49bcdcfed3ecb260f7a6302d3b90a800
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-2.0.1 b/metadata/md5-cache/dev-ruby/tomlrb-2.0.1
index 06b6b0bed5e4..49c4aeeb1926 100644
--- a/metadata/md5-cache/dev-ruby/tomlrb-2.0.1
+++ b/metadata/md5-cache/dev-ruby/tomlrb-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fbernier/tomlrb/archive/v2.0.1.tar.gz -> tomlrb-2.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9a9c42b3e8b99a9c9024f494c483196c
diff --git a/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0 b/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
index b70e0a75dd9b..aa97e6ea7e45 100644
--- a/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
+++ b/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/totoridipjp-0.1.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e2fb896ad4bcd4089a7410c8b1845f46
diff --git a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2 b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
index d5edfa9066c9..0c64d25a1bd8 100644
--- a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/transaction-simple-1.4.0.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e833df6f1419d17b94068a0f3a7030e6
diff --git a/metadata/md5-cache/dev-ruby/travis-1.10.0 b/metadata/md5-cache/dev-ruby/travis-1.10.0
index 1572d39166e6..6ac18bf93f5e 100644
--- a/metadata/md5-cache/dev-ruby/travis-1.10.0
+++ b/metadata/md5-cache/dev-ruby/travis-1.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/travis-1.10.0.gem
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4d4a8fa52ab67560aac69702a4f8719c
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.6.11 b/metadata/md5-cache/dev-ruby/treetop-1.6.11
index 49456c79d6a5..054a42dab6c1 100644
--- a/metadata/md5-cache/dev-ruby/treetop-1.6.11
+++ b/metadata/md5-cache/dev-ruby/treetop-1.6.11
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cjheath/treetop/archive/v1.6.11.tar.gz -> treetop-1.6.11.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e97f810f05a37d66b33995a0108fedf5
diff --git a/metadata/md5-cache/dev-ruby/trollop-2.9.10 b/metadata/md5-cache/dev-ruby/trollop-2.9.10
index 81f0a042ecf3..719c9c7e6fad 100644
--- a/metadata/md5-cache/dev-ruby/trollop-2.9.10
+++ b/metadata/md5-cache/dev-ruby/trollop-2.9.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/trollop-2.9.10.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ef4839bd8051b6b3d4e8516546a228b
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.5.1 b/metadata/md5-cache/dev-ruby/ttfunk-1.5.1
index c70db1931f31..608c00550beb 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.5.1
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.5
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.5.1.tar.gz -> ttfunk-1.5.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=58169e641ea11b51b26a701e3facaa51
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.6.2.1 b/metadata/md5-cache/dev-ruby/ttfunk-1.6.2.1
index f33273125d9f..c6723ea04491 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.6.2.1
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.6.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.6
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.6.2.1.tar.gz -> ttfunk-1.6.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=268900a5b311b574c4a84882decf9365
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.7.0 b/metadata/md5-cache/dev-ruby/ttfunk-1.7.0
index d8ab67438a1c..28261af1f8e3 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.7.0
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.7
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.7.0.tar.gz -> ttfunk-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d2456fac24d80ec980dc882fcdbee0a9
diff --git a/metadata/md5-cache/dev-ruby/tty-color-0.6.0 b/metadata/md5-cache/dev-ruby/tty-color-0.6.0
index d67dbc9ef85a..d15ce113eca3 100644
--- a/metadata/md5-cache/dev-ruby/tty-color-0.6.0
+++ b/metadata/md5-cache/dev-ruby/tty-color-0.6.0
@@ -5,12 +5,12 @@ DESCRIPTION=Terminal color capabilities detection
 EAPI=7
 HOMEPAGE=https://github.com/piotrmurach/tty-color
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-color/archive/v0.6.0.tar.gz -> tty-color-0.6.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f78808e9e880333ddc8ace6fb46c64ea
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=82001c823269487f5a5b68c3ccbe3165
diff --git a/metadata/md5-cache/dev-ruby/tty-command-0.10.1 b/metadata/md5-cache/dev-ruby/tty-command-0.10.1
index 9f62570e0b65..f49907a20876 100644
--- a/metadata/md5-cache/dev-ruby/tty-command-0.10.1
+++ b/metadata/md5-cache/dev-ruby/tty-command-0.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-command/archive/v0.10.1.tar.gz -> tty-command-0.10.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e3d6bf99e2f050cd8fde5bdef511b5f1
diff --git a/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1 b/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
index 5414e6e92c46..809b93c7cdbd 100644
--- a/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
+++ b/metadata/md5-cache/dev-ruby/tty-cursor-0.7.1
@@ -5,12 +5,12 @@ DESCRIPTION=Move the terminal cursor around and manipulate text using intuitive
 EAPI=7
 HOMEPAGE=https://github.com/piotrmurach/tty-cursor
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-cursor/archive/v0.7.1.tar.gz -> tty-cursor-0.7.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d04ab32eb3c05109703ce1144c209ca1
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d3fe585f53b04e3feeec8ef479e10ee5
diff --git a/metadata/md5-cache/dev-ruby/tty-editor-0.7.0 b/metadata/md5-cache/dev-ruby/tty-editor-0.7.0
index 367d48333833..af89fe14c1ef 100644
--- a/metadata/md5-cache/dev-ruby/tty-editor-0.7.0
+++ b/metadata/md5-cache/dev-ruby/tty-editor-0.7.0
@@ -5,12 +5,12 @@ DESCRIPTION=Opens a file or text in the user's preferred editor
 EAPI=8
 HOMEPAGE=https://github.com/piotrmurach/tty-editor
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/tty-prompt-0.22[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/tty-prompt-0.22[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-editor/archive/v0.7.0.tar.gz -> tty-editor-0.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eda3c7bd446cecabbee6cfa06e852c30
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4248e02770964bac48e62ad9a8389019
diff --git a/metadata/md5-cache/dev-ruby/tty-file-0.10.0 b/metadata/md5-cache/dev-ruby/tty-file-0.10.0
index 82f153ed1aea..6b1ed13cf866 100644
--- a/metadata/md5-cache/dev-ruby/tty-file-0.10.0
+++ b/metadata/md5-cache/dev-ruby/tty-file-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-file/archive/v0.10.0.tar.gz -> tty-file-0.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d76b629021827d1171e64114a9fb2777
diff --git a/metadata/md5-cache/dev-ruby/tty-platform-0.3.0 b/metadata/md5-cache/dev-ruby/tty-platform-0.3.0
index 367ec14e5ac5..50a13e613f5e 100644
--- a/metadata/md5-cache/dev-ruby/tty-platform-0.3.0
+++ b/metadata/md5-cache/dev-ruby/tty-platform-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-platform/archive/v0.3.0.tar.gz -> tty-platform-0.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f1500928a1017902c6e6f9acf81ed5ed
diff --git a/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1 b/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
index 38dee18111f7..6c9d5df77bdf 100644
--- a/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
+++ b/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
@@ -5,12 +5,12 @@ DESCRIPTION=A beautiful and powerful interactive command line prompt
 EAPI=7
 HOMEPAGE=https://github.com/piotrmurach/tty-prompt
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/pastel-0.8:0[ruby_targets_ruby26(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/pastel-0.8:0[ruby_targets_ruby27(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/pastel-0.8:0[ruby_targets_ruby30(-)] >=dev-ruby/tty-reader-0.8:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-prompt/archive/v0.23.1.tar.gz -> tty-prompt-0.23.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d0638a74493b81496071f5e90ba06bb2
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=982863d89ac4ac12494eeb43067831fb
diff --git a/metadata/md5-cache/dev-ruby/tty-reader-0.9.0 b/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
index 31ee9ed9dad8..dc961e3d9e27 100644
--- a/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
+++ b/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
@@ -5,12 +5,12 @@ DESCRIPTION=Methods for processing keyboard input in character, line and multili
 EAPI=7
 HOMEPAGE=https://github.com/piotrmurach/tty-reader
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/tty-cursor-0.7:0[ruby_targets_ruby26(-)] >=dev-ruby/tty-screen-0.8:0[ruby_targets_ruby26(-)] =dev-ruby/wisper-2*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/tty-cursor-0.7:0[ruby_targets_ruby27(-)] >=dev-ruby/tty-screen-0.8:0[ruby_targets_ruby27(-)] =dev-ruby/wisper-2*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/tty-cursor-0.7:0[ruby_targets_ruby30(-)] >=dev-ruby/tty-screen-0.8:0[ruby_targets_ruby30(-)] =dev-ruby/wisper-2*[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-reader/archive/v0.9.0.tar.gz -> tty-reader-0.9.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b550daad0128a3ee75fd96464414f339
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2cf014e12b1f7a6503aff4c7541a1c68
diff --git a/metadata/md5-cache/dev-ruby/tty-screen-0.7.1 b/metadata/md5-cache/dev-ruby/tty-screen-0.7.1
index 76a5d6802bad..f4db699913a8 100644
--- a/metadata/md5-cache/dev-ruby/tty-screen-0.7.1
+++ b/metadata/md5-cache/dev-ruby/tty-screen-0.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-screen/archive/v0.7.1.tar.gz -> tty-screen-0.7.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6226a66c6adb0b692e0311c402350664
diff --git a/metadata/md5-cache/dev-ruby/tty-screen-0.8.1 b/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
index 51d8a0b1ad97..bdd3132c4f50 100644
--- a/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
+++ b/metadata/md5-cache/dev-ruby/tty-screen-0.8.1
@@ -5,12 +5,12 @@ DESCRIPTION=Terminal screen size detection which works on Linux, OS X and Window
 EAPI=7
 HOMEPAGE=https://github.com/piotrmurach/tty-screen
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-screen/archive/v0.8.1.tar.gz -> tty-screen-0.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=be1d13ed8c31519a1a7070540ba81e30
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b28f38534a72286e15494e4662ac38b4
diff --git a/metadata/md5-cache/dev-ruby/tty-which-0.4.2 b/metadata/md5-cache/dev-ruby/tty-which-0.4.2
index 5730177b4280..15e9b33ff68f 100644
--- a/metadata/md5-cache/dev-ruby/tty-which-0.4.2
+++ b/metadata/md5-cache/dev-ruby/tty-which-0.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-which/archive/v0.4.2.tar.gz -> tty-which-0.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc0fb330e135d13abdc8c20e3830aa51
diff --git a/metadata/md5-cache/dev-ruby/tty-which-0.5.0 b/metadata/md5-cache/dev-ruby/tty-which-0.5.0
index ff98b8f34f07..74752c27bce9 100644
--- a/metadata/md5-cache/dev-ruby/tty-which-0.5.0
+++ b/metadata/md5-cache/dev-ruby/tty-which-0.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/piotrmurach/tty-which/archive/v0.5.0.tar.gz -> tty-which-0.5.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1c3a929a3c0bc6da297c82bd4dfa1004
diff --git a/metadata/md5-cache/dev-ruby/turbolinks-5.2.1 b/metadata/md5-cache/dev-ruby/turbolinks-5.2.1
index e7abdbbac0c1..16bed6ea9ff3 100644
--- a/metadata/md5-cache/dev-ruby/turbolinks-5.2.1
+++ b/metadata/md5-cache/dev-ruby/turbolinks-5.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/turbolinks-5.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ade34c76c0dc57c51f02a615c82ee5ad
diff --git a/metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0 b/metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0
index 9de8dc73e2bd..acbdf7242711 100644
--- a/metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0
+++ b/metadata/md5-cache/dev-ruby/turbolinks-source-5.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/turbolinks-source-5.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c3f60f8d399cf7f8e83e89d9de3c3f6
diff --git a/metadata/md5-cache/dev-ruby/twitter-7.0.0-r1 b/metadata/md5-cache/dev-ruby/twitter-7.0.0-r1
index 35ad11778ca0..6368261bc63d 100644
--- a/metadata/md5-cache/dev-ruby/twitter-7.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/twitter-7.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=7
 SRC_URI=https://github.com/sferik/twitter/archive/v7.0.0.tar.gz -> twitter-7.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e31016550b699962e395cbbce035e686
diff --git a/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1 b/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
index 8f74b3af8663..5720c2727877 100644
--- a/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3.1
 SRC_URI=https://rubygems.org/gems/twitter-text-3.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8622f17aad214d711c3dcd9d796436b5
diff --git a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1 b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
index f3d512eda59b..fcc131913ce9 100644
--- a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/typed-array-0.1.2.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2ecbd4eeeff6446dde423ce9e83105f5
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.13.0 b/metadata/md5-cache/dev-ruby/typeprof-0.13.0
index ae640ba8c40c..e42ec31cfb66 100644
--- a/metadata/md5-cache/dev-ruby/typeprof-0.13.0
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/typeprof/archive/v0.13.0.tar.gz -> typeprof-0.13.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c0d4ee9b33e08b27f2ccaf6a3fedf91
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.14.1 b/metadata/md5-cache/dev-ruby/typeprof-0.14.1
index 9d46b771a10e..807f0474272f 100644
--- a/metadata/md5-cache/dev-ruby/typeprof-0.14.1
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.14.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/typeprof/archive/v0.14.1.tar.gz -> typeprof-0.14.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0ce381da8b61269712931e598c350cba
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.15.1 b/metadata/md5-cache/dev-ruby/typeprof-0.15.1
index 6b35227cf4bb..9bfe66e09676 100644
--- a/metadata/md5-cache/dev-ruby/typeprof-0.15.1
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.15.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/typeprof/archive/v0.15.1.tar.gz -> typeprof-0.15.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=193b5428fdfe36ed7931a62bd72001b5
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.15.2 b/metadata/md5-cache/dev-ruby/typeprof-0.15.2
index 3877d612206f..f5bf3026ec5a 100644
--- a/metadata/md5-cache/dev-ruby/typeprof-0.15.2
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.15.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/typeprof/archive/v0.15.2.tar.gz -> typeprof-0.15.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=193b5428fdfe36ed7931a62bd72001b5
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-0.6.9-r1 b/metadata/md5-cache/dev-ruby/typhoeus-0.6.9-r1
index e0335e19f9b0..217cb621a63a 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-0.6.9-r1
+++ b/metadata/md5-cache/dev-ruby/typhoeus-0.6.9-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/typhoeus-0.6.9.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f5ea099e3009310bb784c1321210be5d
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-1.3.1 b/metadata/md5-cache/dev-ruby/typhoeus-1.3.1
index 2b12ac40936d..cb9a0e78066f 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-1.3.1
+++ b/metadata/md5-cache/dev-ruby/typhoeus-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/typhoeus-1.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=129bcc908bee9b3ef2184378dacb3302
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-1.4.0 b/metadata/md5-cache/dev-ruby/typhoeus-1.4.0
index fe6866292952..7115154524a5 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-1.4.0
+++ b/metadata/md5-cache/dev-ruby/typhoeus-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/typhoeus-1.4.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f656db08dae2b723db2552ef645b9895
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.8 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.8
index 217ec90447b4..4357a1ba7933 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.8
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/tzinfo-1.2.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=05e06b48c46b0fb7fb03636301875c07
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.9 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.9
index f02a019a1dfb..f7bc442eaeda 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.9
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/tzinfo-1.2.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2fd7cd56705408bd8f054aeebd1c7f07
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-2.0.4 b/metadata/md5-cache/dev-ruby/tzinfo-2.0.4
index 4a551c61df85..5d31321aacd8 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-2.0.4
+++ b/metadata/md5-cache/dev-ruby/tzinfo-2.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/tzinfo/tzinfo/archive/v2.0.4.tar.gz -> tzinfo-2.0.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1c0a3eabbd6825f18d3f0460c17648c3
diff --git a/metadata/md5-cache/dev-ruby/uglifier-4.2.0 b/metadata/md5-cache/dev-ruby/uglifier-4.2.0
index 1caf184d94e4..e0d9bdc90147 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-4.2.0
+++ b/metadata/md5-cache/dev-ruby/uglifier-4.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/lautis/uglifier/archive/v4.2.0.tar.gz -> uglifier-4.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bc0d081ffa6674b5d8fe11852a0bf8d8
diff --git a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1 b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1
index 644813d3463c..491b125a5685 100644
--- a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ultraviolet-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c164f78dc8fd28d1025f07d47ede8939
diff --git a/metadata/md5-cache/dev-ruby/unf-0.1.4 b/metadata/md5-cache/dev-ruby/unf-0.1.4
index 43dea65d1c85..499abbc29ddc 100644
--- a/metadata/md5-cache/dev-ruby/unf-0.1.4
+++ b/metadata/md5-cache/dev-ruby/unf-0.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf-0.1.4.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=464714e3a5f75bab6f806592dd132c56
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
index 34ef756e284c..9aab29ab778a 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.7-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf_ext-0.0.7.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1fd8143c194299377bc513a925f974e6
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.8 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.8
index 4284b533b283..1cf03609e731 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.8
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf_ext-0.0.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1cb04b24e461569c72d0a96bd5f792d1
diff --git a/metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0 b/metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0
index 77d865878cd6..480787abbcec 100644
--- a/metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0
+++ b/metadata/md5-cache/dev-ruby/unicode-display_width-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/janlelis/unicode-display_width/archive/v1.7.0.tar.gz -> unicode-display_width-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=27c62c6e71f8fd8d1b594e7f66d69519
diff --git a/metadata/md5-cache/dev-ruby/unicode-display_width-2.0.0 b/metadata/md5-cache/dev-ruby/unicode-display_width-2.0.0
index 47d1b756637d..e8d4db8ec6d8 100644
--- a/metadata/md5-cache/dev-ruby/unicode-display_width-2.0.0
+++ b/metadata/md5-cache/dev-ruby/unicode-display_width-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/janlelis/unicode-display_width/archive/v2.0.0.tar.gz -> unicode-display_width-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c4c830f2cc691de497086b9c6b9f8428
diff --git a/metadata/md5-cache/dev-ruby/unicode-display_width-2.1.0 b/metadata/md5-cache/dev-ruby/unicode-display_width-2.1.0
index c773fd2b3147..2b1c766696a8 100644
--- a/metadata/md5-cache/dev-ruby/unicode-display_width-2.1.0
+++ b/metadata/md5-cache/dev-ruby/unicode-display_width-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/janlelis/unicode-display_width/archive/v2.1.0.tar.gz -> unicode-display_width-2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=aee498c5130436a30a6b9dd7ce0d8ca5
diff --git a/metadata/md5-cache/dev-ruby/unindent-1.0 b/metadata/md5-cache/dev-ruby/unindent-1.0
index bc3c72630213..1df9de62f775 100644
--- a/metadata/md5-cache/dev-ruby/unindent-1.0
+++ b/metadata/md5-cache/dev-ruby/unindent-1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unindent-1.0.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b4f137c7a3b826aa6ce7781ee97cba68
diff --git a/metadata/md5-cache/dev-ruby/unindent-1.0-r1 b/metadata/md5-cache/dev-ruby/unindent-1.0-r1
index 3bcfcb6ea454..ce2e7de4c7cc 100644
--- a/metadata/md5-cache/dev-ruby/unindent-1.0-r1
+++ b/metadata/md5-cache/dev-ruby/unindent-1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unindent-1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a4e3500de60443bdb995f921c597ce7c
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
index fe23f6f4dcae..a1317084c483 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/uuidtools-2.1.5.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a179f969d0c22c93e9a4c7bf1acce85d
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.2.0 b/metadata/md5-cache/dev-ruby/uuidtools-2.2.0
index 1dea53c483d7..52a1d231c8a0 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.2.0
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/uuidtools-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=43e941d1f505fd3c05c09dd48363e5c1
diff --git a/metadata/md5-cache/dev-ruby/vagrant_cloud-2.0.3-r1 b/metadata/md5-cache/dev-ruby/vagrant_cloud-2.0.3-r1
index c700018ecccd..3e865b8fbad3 100644
--- a/metadata/md5-cache/dev-ruby/vagrant_cloud-2.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/vagrant_cloud-2.0.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant_cloud/archive/v2.0.3.tar.gz -> vagrant_cloud-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=24c85ccd9422c1337ae317921eb27fb2
diff --git a/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.2 b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.2
index 1d0680a65bce..2224de48854a 100644
--- a/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.2
+++ b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant_cloud/archive/v3.0.2.tar.gz -> vagrant_cloud-3.0.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1bf0098fd198cace20c0f1ff1c719435
diff --git a/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5 b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5
index d7663659f866..66a5693e9eed 100644
--- a/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5
+++ b/metadata/md5-cache/dev-ruby/vagrant_cloud-3.0.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vagrant_cloud/archive/v3.0.5.tar.gz -> vagrant_cloud-3.0.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bddad77b64d9e92af9b1543a05016315
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.2.16 b/metadata/md5-cache/dev-ruby/vcard-0.2.16
index 821a8511924c..6f95b5d56b46 100644
--- a/metadata/md5-cache/dev-ruby/vcard-0.2.16
+++ b/metadata/md5-cache/dev-ruby/vcard-0.2.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/vcard-0.2.16.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6364a17329983da1392dda44c9f5f4b3
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.3.0 b/metadata/md5-cache/dev-ruby/vcard-0.3.0
index 6ce7c21824a0..d138c5785ab4 100644
--- a/metadata/md5-cache/dev-ruby/vcard-0.3.0
+++ b/metadata/md5-cache/dev-ruby/vcard-0.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/vcard-0.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a034657c02551445be09e4599cf7881b
diff --git a/metadata/md5-cache/dev-ruby/vcr-4.0.0 b/metadata/md5-cache/dev-ruby/vcr-4.0.0
index ef3718146338..3efdbe59c7ea 100644
--- a/metadata/md5-cache/dev-ruby/vcr-4.0.0
+++ b/metadata/md5-cache/dev-ruby/vcr-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/vcr/vcr/archive/v4.0.0.tar.gz -> vcr-4.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=88030277d71136d556fda8610ebf4504
diff --git a/metadata/md5-cache/dev-ruby/vcr-5.1.0 b/metadata/md5-cache/dev-ruby/vcr-5.1.0
index 0849dc6429db..6dd9e4720efc 100644
--- a/metadata/md5-cache/dev-ruby/vcr-5.1.0
+++ b/metadata/md5-cache/dev-ruby/vcr-5.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/vcr/vcr/archive/v5.1.0.tar.gz -> vcr-5.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f1b8b928e4532f65d831ae7aef7b846d
diff --git a/metadata/md5-cache/dev-ruby/vcr-6.0.0 b/metadata/md5-cache/dev-ruby/vcr-6.0.0
index c5a6b79cfce8..24181852dbe6 100644
--- a/metadata/md5-cache/dev-ruby/vcr-6.0.0
+++ b/metadata/md5-cache/dev-ruby/vcr-6.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/vcr/vcr/archive/v6.0.0.tar.gz -> vcr-6.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c3b7edd497a52a1f44011f4913fd1d5f
diff --git a/metadata/md5-cache/dev-ruby/virtus-1.0.5 b/metadata/md5-cache/dev-ruby/virtus-1.0.5
index 445a0380f7c0..a583e8573669 100644
--- a/metadata/md5-cache/dev-ruby/virtus-1.0.5
+++ b/metadata/md5-cache/dev-ruby/virtus-1.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/virtus-1.0.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=024b8e9733798ba6e425c0e828f89739
diff --git a/metadata/md5-cache/dev-ruby/vlad-2.7.1 b/metadata/md5-cache/dev-ruby/vlad-2.7.1
index 74961cbf0063..c3614ae44ea6 100644
--- a/metadata/md5-cache/dev-ruby/vlad-2.7.1
+++ b/metadata/md5-cache/dev-ruby/vlad-2.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/vlad-2.7.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ad5558ed06dbab9573806db551365952
diff --git a/metadata/md5-cache/dev-ruby/warden-1.2.9 b/metadata/md5-cache/dev-ruby/warden-1.2.9
index fd64799494ff..3726faf8a0a6 100644
--- a/metadata/md5-cache/dev-ruby/warden-1.2.9
+++ b/metadata/md5-cache/dev-ruby/warden-1.2.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wardencommunity/warden/archive/v1.2.9.tar.gz -> warden-1.2.9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=adc112a27d299b7fc7db9ac8f7c7bfb4
diff --git a/metadata/md5-cache/dev-ruby/web-console-3.7.0 b/metadata/md5-cache/dev-ruby/web-console-3.7.0
index d4d0531a7f3a..bed892a311b5 100644
--- a/metadata/md5-cache/dev-ruby/web-console-3.7.0
+++ b/metadata/md5-cache/dev-ruby/web-console-3.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rails/web-console/archive/v3.7.0.tar.gz -> web-console-3.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed558ba797cbccafc3e792eb3ac6feae
diff --git a/metadata/md5-cache/dev-ruby/web-console-4.1.0 b/metadata/md5-cache/dev-ruby/web-console-4.1.0
index 75dc9c66143e..8150222ed40a 100644
--- a/metadata/md5-cache/dev-ruby/web-console-4.1.0
+++ b/metadata/md5-cache/dev-ruby/web-console-4.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rails/web-console/archive/v4.1.0.tar.gz -> web-console-4.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=91fc6aa6c8474af2144c4c2fdd928ace
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.14.0 b/metadata/md5-cache/dev-ruby/webmock-3.14.0
index 709f22a4b92f..600c116369e5 100644
--- a/metadata/md5-cache/dev-ruby/webmock-3.14.0
+++ b/metadata/md5-cache/dev-ruby/webmock-3.14.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby26(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby26(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby27(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby27(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby26(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby26(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby27(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby27(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby30(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby30(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Allows stubbing HTTP requests and setting expectations on HTTP requests
 EAPI=8
 HOMEPAGE=https://github.com/bblimke/webmock
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby26(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby26(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby27(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby27(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby26(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby26(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby27(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby27(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/addressable-2.8.0[ruby_targets_ruby30(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby30(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/webmock-3.14.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8a44cc0f178f9e880629c1de268ce827
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=84b2fe1a163edfddd82b7e1b7588898b
diff --git a/metadata/md5-cache/dev-ruby/webrick-1.7.0 b/metadata/md5-cache/dev-ruby/webrick-1.7.0
index 65e622b5b785..d03e6ede579f 100644
--- a/metadata/md5-cache/dev-ruby/webrick-1.7.0
+++ b/metadata/md5-cache/dev-ruby/webrick-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/webrick/archive/v1.7.0.tar.gz -> webrick-1.7.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54c58cb8a53c31fb36af7c8ff7bc2310
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2 b/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
index 230aca6ad798..f203a1985e43 100644
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/webrobots-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=02c4e9cdda5bbb437369f359da16f287
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.2.8 b/metadata/md5-cache/dev-ruby/websocket-1.2.8
index 7b2c80a4dc2f..4d405145dfd9 100644
--- a/metadata/md5-cache/dev-ruby/websocket-1.2.8
+++ b/metadata/md5-cache/dev-ruby/websocket-1.2.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/websocket-1.2.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=da4a511359b4a5ed302da3595a0a8451
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.2.9 b/metadata/md5-cache/dev-ruby/websocket-1.2.9
index 191b0a4eb84b..2eec1418aaa4 100644
--- a/metadata/md5-cache/dev-ruby/websocket-1.2.9
+++ b/metadata/md5-cache/dev-ruby/websocket-1.2.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/websocket-1.2.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=95a29971dd0f6386a8fa8c3e88c53e16
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1 b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1
index 13454680b067..ec7502afc0e4 100644
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1
+++ b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.6.5.tar.gz -> websocket-driver-0.6.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8c91f1c3a4a6480a69c09ac38ab2988b
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5 b/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
index 32958c7ba389..13e4bc3286a2 100644
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
+++ b/metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.7
 SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.7.5.tar.gz -> websocket-driver-0.7.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2914c101656b7c6edc0e7731252cb580
diff --git a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5 b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5
index 8532994049de..f9d0e98a5df3 100644
--- a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5
+++ b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-extensions-ruby/archive/0.1.5.tar.gz -> websocket-extensions-0.1.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eddda92eb51eb6f5896fcebb808359d5
diff --git a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1 b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
index 09a1882364fd..1c54808ac50f 100644
--- a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-extensions-ruby/archive/0.1.5.tar.gz -> websocket-extensions-0.1.5-r1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d8acc480fb76d2fdb569c0edfc87a4b
diff --git a/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1 b/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1
index f8b1e17d7cfa..d8c26f9aab8c 100644
--- a/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/whole_history_rating-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7a32304a19065fa2059b5a9a35ca7739
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.3.0 b/metadata/md5-cache/dev-ruby/will_paginate-3.3.0
index f887af50fb55..914f753b9040 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.3.0
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/will_paginate-3.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5fbcd53ddd8f043f3ac044f5bfdef1e0
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.3.1 b/metadata/md5-cache/dev-ruby/will_paginate-3.3.1
index 4adc0622a023..86c9efaffba1 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.3.1
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/will_paginate-3.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=246440a94a91b2962e752e3b8cdc5079
diff --git a/metadata/md5-cache/dev-ruby/windows_error-0.1.2 b/metadata/md5-cache/dev-ruby/windows_error-0.1.2
deleted file mode 100644
index f8801e2b77e8..000000000000
--- a/metadata/md5-cache/dev-ruby/windows_error-0.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=reference for standard Windows API Error Codes
-EAPI=6
-HOMEPAGE=https://github.com/rapid7/windows_error
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0.1
-SRC_URI=https://rubygems.org/gems/windows_error-0.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=54afd1fddf94385f22c94c259ec8f7a9
diff --git a/metadata/md5-cache/dev-ruby/windows_error-0.1.2-r1 b/metadata/md5-cache/dev-ruby/windows_error-0.1.2-r1
new file mode 100644
index 000000000000..a0eb5d7aed2a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/windows_error-0.1.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=reference for standard Windows API Error Codes
+EAPI=8
+HOMEPAGE=https://github.com/rapid7/windows_error
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0.1
+SRC_URI=https://rubygems.org/gems/windows_error-0.1.2.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a6e7ac33530adc8e69d6cd31d6a32360
diff --git a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4 b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
index 4d7b470188b4..d5b90d9a55c4 100644
--- a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
+++ b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/wirble-0.1.3.gem
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ee952fd297ca74cd70ba1a83715b605e
diff --git a/metadata/md5-cache/dev-ruby/wisper-2.0.1 b/metadata/md5-cache/dev-ruby/wisper-2.0.1
index a5f633e3b2e6..931db1b246b7 100644
--- a/metadata/md5-cache/dev-ruby/wisper-2.0.1
+++ b/metadata/md5-cache/dev-ruby/wisper-2.0.1
@@ -5,12 +5,12 @@ DESCRIPTION=A micro library providing objects with Publish-Subscribe capabilitie
 EAPI=7
 HOMEPAGE=https://github.com/krisleech/wisper
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~riscv ~sparc
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/wisper-2.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=67aac73b6a9f41576f2ed27c13dc636e
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=eb14b36c7bc4885a58e524a045b75dd1
diff --git a/metadata/md5-cache/dev-ruby/x25519-1.0.8 b/metadata/md5-cache/dev-ruby/x25519-1.0.8
index 7ec7254bc1a8..c53a5b6a1aea 100644
--- a/metadata/md5-cache/dev-ruby/x25519-1.0.8
+++ b/metadata/md5-cache/dev-ruby/x25519-1.0.8
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Key exchange via the X25519 (Curve25519) Elliptic Curve Diffie-Hellman function
 EAPI=7
 HOMEPAGE=https://github.com/crypto-rb/x25519
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/x25519/archive/v1.0.8.tar.gz -> x25519-1.0.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f489bffa31d38648bce42c824697498b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4586bb7b1304936b8fdd56b9e5ce953a
diff --git a/metadata/md5-cache/dev-ruby/xdr-3.0.1 b/metadata/md5-cache/dev-ruby/xdr-3.0.1
index 9f8dfc60fd48..8526270d5459 100644
--- a/metadata/md5-cache/dev-ruby/xdr-3.0.1
+++ b/metadata/md5-cache/dev-ruby/xdr-3.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.0.1
 SRC_URI=https://rubygems.org/gems/xdr-3.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e2501bdbd886988207bbc9a9e57d5f2
diff --git a/metadata/md5-cache/dev-ruby/xml-simple-1.1.5 b/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
index 4005b9acde65..5eca12a48cd7 100644
--- a/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
+++ b/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maik/xml-simple/archive/v1.1.5.tar.gz -> xml-simple-1.1.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=58a26806488a331a7c8c21faa701e5db
diff --git a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.0 b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.0
index 655a32d81471..7b9fb1847701 100644
--- a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.0
+++ b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/xmlrpc/archive/v0.3.0.tar.gz -> xmlrpc-0.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ee5610db40ce4be9c84245fa0792d01a
diff --git a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.1 b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.1
index 9e5149af3b4d..c1a754d3bfc4 100644
--- a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.1
+++ b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/xmlrpc/archive/v0.3.1.tar.gz -> xmlrpc-0.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=67de72cbdc181c0434212181bf75b356
diff --git a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2 b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2
index 3c1c87b57b86..708194cdc1a7 100644
--- a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2
+++ b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/xmlrpc/archive/v0.3.2.tar.gz -> xmlrpc-0.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1aee640b8d40eb4b2539eed2539791b7
diff --git a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2-r1 b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2-r1
index 7eced996b77c..f3a9c2866b2a 100644
--- a/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/xmlrpc-0.3.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/xmlrpc/archive/v0.3.2.tar.gz -> xmlrpc-0.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3ba35eb719a16041af2215649270365c
diff --git a/metadata/md5-cache/dev-ruby/xpath-3.2.0 b/metadata/md5-cache/dev-ruby/xpath-3.2.0
index db24fdd19664..45fb8daeee4d 100644
--- a/metadata/md5-cache/dev-ruby/xpath-3.2.0
+++ b/metadata/md5-cache/dev-ruby/xpath-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/xpath-3.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=46b6f5e8b5e2fd4e41948eba1e4e09a0
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1
index 57c009853639..0f225534e8b1 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/yajl-ruby-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3336e24216e40b8cc45d53831f79f473
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1-r1 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1-r1
index 1e818a3e8051..3b97109f594e 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/yajl-ruby-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c11c58abb7ff5e385639f28fe5ee42da
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.26 b/metadata/md5-cache/dev-ruby/yard-0.9.26
index c22145c7940a..a5d8ce97688b 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.26
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.26
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.26.tar.gz -> yard-0.9.26-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=16f7b76acd160ae011f97273b2e8af15
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2 b/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
index be922e7dfb7f..3cd456ae9cc4 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.4.2.tar.gz -> zeitwerk-2.4.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f3489ff427fdf5bfd7530ef12e032364
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.12.0 b/metadata/md5-cache/dev-ruby/zentest-4.12.0
index 40651597fa84..ed86a8b5010d 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.12.0
+++ b/metadata/md5-cache/dev-ruby/zentest-4.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ZenTest-4.12.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b1c56094b493fe627f5e38e55204f4ed
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 0f16d42b8d8f..f5e5ba331670 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/gauche-0.9.10-r1 b/metadata/md5-cache/dev-scheme/gauche-0.9.10-r1
index d03cdf942c2a..229c8d8d62b4 100644
--- a/metadata/md5-cache/dev-scheme/gauche-0.9.10-r1
+++ b/metadata/md5-cache/dev-scheme/gauche-0.9.10-r1
@@ -5,11 +5,11 @@ DESCRIPTION=A Unix system friendly Scheme Interpreter
 EAPI=7
 HOMEPAGE=http://practical-scheme.net/gauche/
 IUSE=ipv6 mbedtls test
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sys-libs/gdbm virtual/libcrypt:= mbedtls? ( net-libs/mbedtls:= )
 RESTRICT=!test? ( test )
 SLOT=0/0.97
 SRC_URI=mirror://sourceforge/gauche/Gauche-0.9.10.tgz https://dev.gentoo.org/~hattya/distfiles/gauche-0.9.10-sys-ctermid.patch.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4a9705385367e1e32e4200c937340d25
+_md5_=c744193812cf1f90cc2b0b78da78ee36
diff --git a/metadata/md5-cache/dev-scheme/gauche-0.9.9-r1 b/metadata/md5-cache/dev-scheme/gauche-0.9.9-r1
deleted file mode 100644
index a5fc5e329a0f..000000000000
--- a/metadata/md5-cache/dev-scheme/gauche-0.9.9-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/gdbm virtual/libcrypt:= mbedtls? ( net-libs/mbedtls:= ) test? ( dev-libs/openssl:0 )
-DESCRIPTION=A Unix system friendly Scheme Interpreter
-EAPI=7
-HOMEPAGE=http://practical-scheme.net/gauche/
-IUSE=ipv6 mbedtls test
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=sys-libs/gdbm virtual/libcrypt:= mbedtls? ( net-libs/mbedtls:= )
-RESTRICT=!test? ( test )
-SLOT=0/0.97
-SRC_URI=mirror://sourceforge/gauche/Gauche-0.9.9.tgz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f9d9c4c01a4802d5ce8af61cd0b463aa
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index d557217ecb97..236e3b77cdd0 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/tth-4.08 b/metadata/md5-cache/dev-tex/tth-4.08
index a9901bddf66d..37224ae42ccc 100644
--- a/metadata/md5-cache/dev-tex/tth-4.08
+++ b/metadata/md5-cache/dev-tex/tth-4.08
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Translate TEX into HTML
 EAPI=7
 HOMEPAGE=http://hutchinson.belmont.ma.us/tth/
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl media-libs/netpbm
 SLOT=0
 SRC_URI=mirror://sourceforge/tth/tth4.08.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=52f3d4b834df804f9e484e154876ccde
+_md5_=75a3d37d5ed41c02521bbaed425d903e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 6ee8c830198a..20485bde67bb 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/aruba-0.6.2-r2 b/metadata/md5-cache/dev-util/aruba-0.6.2-r2
index b16217fc1227..21272de1ac21 100644
--- a/metadata/md5-cache/dev-util/aruba-0.6.2-r2
+++ b/metadata/md5-cache/dev-util/aruba-0.6.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/aruba-0.6.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=19cad316a0b504cba01ad67a0a3e032e
diff --git a/metadata/md5-cache/dev-util/aruba-1.0.3-r1 b/metadata/md5-cache/dev-util/aruba-1.0.3-r1
index d05436c5ee6f..43109f6b5c23 100644
--- a/metadata/md5-cache/dev-util/aruba-1.0.3-r1
+++ b/metadata/md5-cache/dev-util/aruba-1.0.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/cucumber/aruba/archive/v1.0.3.tar.gz -> aruba-1.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9a31e86174aad224dfa3370e3c119ef6
diff --git a/metadata/md5-cache/dev-util/aruba-1.1.2-r1 b/metadata/md5-cache/dev-util/aruba-1.1.2-r1
index 8577fc4a8dcf..494f21dbb923 100644
--- a/metadata/md5-cache/dev-util/aruba-1.1.2-r1
+++ b/metadata/md5-cache/dev-util/aruba-1.1.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/cucumber/aruba/archive/v1.1.2.tar.gz -> aruba-1.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2ddfe83f7cefacd4ac52d0a902c6d1b5
diff --git a/metadata/md5-cache/dev-util/aruba-2.0.0 b/metadata/md5-cache/dev-util/aruba-2.0.0
index 1b75574e51ea..b03e037703a5 100644
--- a/metadata/md5-cache/dev-util/aruba-2.0.0
+++ b/metadata/md5-cache/dev-util/aruba-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/cucumber/aruba/archive/v2.0.0.tar.gz -> aruba-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1dd75f102e89cf336d65448c94e3ca38
diff --git a/metadata/md5-cache/dev-util/bcc-0.19.0-r1 b/metadata/md5-cache/dev-util/bcc-0.19.0-r1
index 07e5ce775051..9d8731bb7f7d 100644
--- a/metadata/md5-cache/dev-util/bcc-0.19.0-r1
+++ b/metadata/md5-cache/dev-util/bcc-0.19.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) lua? ( ^^
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.19.0.tar.gz -> bcc-0.19.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2500b9bc7c78a8fa6c22f66fcf51a487
diff --git a/metadata/md5-cache/dev-util/bcc-0.20.0-r1 b/metadata/md5-cache/dev-util/bcc-0.20.0-r1
index b59f3c706589..2a32f5d13c75 100644
--- a/metadata/md5-cache/dev-util/bcc-0.20.0-r1
+++ b/metadata/md5-cache/dev-util/bcc-0.20.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) lua? ( ^^
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.20.0.tar.gz -> bcc-0.20.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ec8a1354063214a97300edc2a1ca48b5
diff --git a/metadata/md5-cache/dev-util/bcc-0.22.0 b/metadata/md5-cache/dev-util/bcc-0.22.0
index 4fc124376dbc..bb7950e0fc46 100644
--- a/metadata/md5-cache/dev-util/bcc-0.22.0
+++ b/metadata/md5-cache/dev-util/bcc-0.22.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.22.0.tar.gz -> bcc-0.22.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1b1ceba46ce44ac364e00329f84bcd16
diff --git a/metadata/md5-cache/dev-util/bear-3.0.16 b/metadata/md5-cache/dev-util/bear-3.0.16-r2
index 3296f2a5723f..3296f2a5723f 100644
--- a/metadata/md5-cache/dev-util/bear-3.0.16
+++ b/metadata/md5-cache/dev-util/bear-3.0.16-r2
diff --git a/metadata/md5-cache/dev-util/bpftool-5.14.11 b/metadata/md5-cache/dev-util/bpftool-5.14.11
new file mode 100644
index 000000000000..606ccc26c717
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bpftool-5.14.11
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/patchutils || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-python/docutils
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=sys-libs/binutils-libs:= sys-libs/zlib:= virtual/libelf:= caps? ( sys-libs/libcap:= ) >=sys-kernel/linux-headers-5.8
+DESCRIPTION=Tool for inspection and simple manipulation of eBPF programs and maps
+EAPI=8
+HOMEPAGE=https://kernel.org/
+IUSE=caps kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/binutils-libs:= sys-libs/zlib:= virtual/libelf:= caps? ( sys-libs/libcap:= )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.14.11.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6d84bf73e5efc0bb3e8a9e752a07b5b1
diff --git a/metadata/md5-cache/dev-util/bpftool-5.14.6 b/metadata/md5-cache/dev-util/bpftool-5.14.6
deleted file mode 100644
index 6a3d128c5ded..000000000000
--- a/metadata/md5-cache/dev-util/bpftool-5.14.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/patchutils || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-python/docutils
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=sys-libs/binutils-libs:= sys-libs/zlib:= virtual/libelf:= caps? ( sys-libs/libcap:= ) >=sys-kernel/linux-headers-5.8
-DESCRIPTION=Tool for inspection and simple manipulation of eBPF programs and maps
-EAPI=8
-HOMEPAGE=https://kernel.org/
-IUSE=caps kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/binutils-libs:= sys-libs/zlib:= virtual/libelf:= caps? ( sys-libs/libcap:= )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.14.6.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6d84bf73e5efc0bb3e8a9e752a07b5b1
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.12.1-r1 b/metadata/md5-cache/dev-util/bpftrace-0.12.1-r1
index 39e67aa0a73b..e9a954ac3707 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.12.1-r1
+++ b/metadata/md5-cache/dev-util/bpftrace-0.12.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libbpf:= >=dev-util/bcc-0.13.0:= dev-util/systemtap >=sys-devel
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.12.1.tar.gz -> bpftrace-0.12.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=5b87e4aa3decaec4d3d16f4dbc0f6d22
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.13.0-r1 b/metadata/md5-cache/dev-util/bpftrace-0.13.0-r1
index 0af54ed68827..2c9ceb8ab252 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.13.0-r1
+++ b/metadata/md5-cache/dev-util/bpftrace-0.13.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libbpf:= >=dev-util/bcc-0.13.0:= dev-util/systemtap >=sys-devel
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.13.0.tar.gz -> bpftrace-0.13.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4844e202adec073e502f55f7710d2c30
diff --git a/metadata/md5-cache/dev-util/catalyst-9999 b/metadata/md5-cache/dev-util/catalyst-9999
index 8bc2b37c88e6..7110376375ef 100644
--- a/metadata/md5-cache/dev-util/catalyst-9999
+++ b/metadata/md5-cache/dev-util/catalyst-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/snakeoil-0.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/fasteners[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-apps/util-linux[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydecomp-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] app-arch/lbzip2 app-arch/pixz app-arch/tar[xattr] dev-vcs/git sys-fs/dosfstools sys-fs/squashfs-tools-ng[tools] iso? ( app-cdr/cdrtools dev-libs/libisoburn amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] sys-fs/mtools ) arm64? ( sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ia64? ( sys-boot/grub[grub_platforms_efi-64] sys-fs/mtools ) ppc? ( sys-boot/grub:2[grub_platforms_ieee1275] ) ppc64? ( sys-boot/grub:2[grub_platforms_ieee1275] ) sparc? ( sys-boot/grub:2[grub_platforms_ieee1275] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1767177dd0aaf4448815fc538d522f53
diff --git a/metadata/md5-cache/dev-util/chroot-wrapper-0.9.3 b/metadata/md5-cache/dev-util/chroot-wrapper-0.9.3
index 6664c3b7a5b6..e666e18c72bc 100644
--- a/metadata/md5-cache/dev-util/chroot-wrapper-0.9.3
+++ b/metadata/md5-cache/dev-util/chroot-wrapper-0.9.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-shells/bash-5.0 sys-apps/util-linux sys-apps/coreutils
 SLOT=0
 SRC_URI=https://github.com/chutz/chroot-wrapper/archive/0.9.3.tar.gz -> chroot-wrapper-0.9.3.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=91f8694e4e5f36ca23650d676c24e7f5
diff --git a/metadata/md5-cache/dev-util/chroot-wrapper-0.9.4 b/metadata/md5-cache/dev-util/chroot-wrapper-0.9.4
index e42ae459812b..c0652442d840 100644
--- a/metadata/md5-cache/dev-util/chroot-wrapper-0.9.4
+++ b/metadata/md5-cache/dev-util/chroot-wrapper-0.9.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-shells/bash-5.0 sys-apps/util-linux sys-apps/coreutils
 SLOT=0
 SRC_URI=https://github.com/chutz/chroot-wrapper/archive/0.9.4.tar.gz -> chroot-wrapper-0.9.4.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b69091e2a4202181ff95988ed52b30d0
diff --git a/metadata/md5-cache/dev-util/chroot-wrapper-0.9.8 b/metadata/md5-cache/dev-util/chroot-wrapper-0.9.8
index 9902a96b0cf7..7c192fc24e83 100644
--- a/metadata/md5-cache/dev-util/chroot-wrapper-0.9.8
+++ b/metadata/md5-cache/dev-util/chroot-wrapper-0.9.8
@@ -7,5 +7,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-shells/bash-5.0 sys-apps/util-linux sys-apps/coreutils
 SLOT=0
 SRC_URI=https://github.com/chutz/chroot-wrapper/archive/0.9.8.tar.gz -> chroot-wrapper-0.9.8.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fd10079c7f74f7e7119c7984c8fc4e59
diff --git a/metadata/md5-cache/dev-util/clazy-1.10 b/metadata/md5-cache/dev-util/clazy-1.10
index 4c334fb7fff2..4a1db9c506e6 100644
--- a/metadata/md5-cache/dev-util/clazy-1.10
+++ b/metadata/md5-cache/dev-util/clazy-1.10
@@ -10,4 +10,4 @@ RDEPEND=>=sys-devel/clang-8.0:= >=sys-devel/llvm-8.0:=
 SLOT=0
 SRC_URI=mirror://kde/stable/clazy/1.10/src/clazy-1.10.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ba828f87dadb5ec84db13ebc05af043d
+_md5_=fe50bf35818c6ba44163cac0c4c8ea04
diff --git a/metadata/md5-cache/dev-util/clippy-8.0.1 b/metadata/md5-cache/dev-util/clippy-8.0.1
index f8c49ec4d9b5..a5129360d525 100644
--- a/metadata/md5-cache/dev-util/clippy-8.0.1
+++ b/metadata/md5-cache/dev-util/clippy-8.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Standalone clippy tool built from FRR sources
 EAPI=8
 HOMEPAGE=https://frrouting.org/
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) virtual/libelf:=
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/FRRouting/frr/archive/frr-8.0.1.tar.gz -> clippy-8.0.1.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=858ee05cb3059dad539dc311d791aa13
+_md5_=12373be9edcd0a41b9294552c3e398ad
diff --git a/metadata/md5-cache/dev-util/cmake-3.21.2 b/metadata/md5-cache/dev-util/cmake-3.21.2
deleted file mode 100644
index a29741b5bad0..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.21.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Cross platform Make
-EAPI=7
-HOMEPAGE=https://cmake.org/
-IUSE=doc emacs ncurses qt5 test test
-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
-LICENSE=CMake
-RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://cmake.org/files/v3.21/cmake-3.21.2.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=229a4c6efbbdb05bdf1c29c74d770397
diff --git a/metadata/md5-cache/dev-util/cmake-3.22.0_rc1 b/metadata/md5-cache/dev-util/cmake-3.22.0_rc1
new file mode 100644
index 000000000000..162a85c5c5de
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cmake-3.22.0_rc1
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=Cross platform Make
+EAPI=8
+HOMEPAGE=https://cmake.org/
+IUSE=doc emacs ncurses qt5 test test
+LICENSE=CMake
+RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.22/cmake-3.22.0-rc1.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	elisp-common	cf4fd1b0835b9f3e638724840468064a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bd9f6908945c622d3716f72bbbb5f733
diff --git a/metadata/md5-cache/dev-util/codeblocks-20.03-r3 b/metadata/md5-cache/dev-util/codeblocks-20.03-r3
new file mode 100644
index 000000000000..9bc9ebd01d73
--- /dev/null
+++ b/metadata/md5-cache/dev-util/codeblocks-20.03-r3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=app-arch/zip >=dev-libs/tinyxml-2.6.2-r3 >=dev-util/astyle-3.1-r2:0/3.1 x11-libs/wxGTK:3.0-gtk3[X] contrib? ( app-admin/gamin app-text/hunspell dev-libs/boost:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The open source, cross platform, free C, C++ and Fortran IDE
+EAPI=7
+HOMEPAGE=https://codeblocks.org/
+IUSE=contrib debug fortran pch
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=app-arch/zip >=dev-libs/tinyxml-2.6.2-r3 >=dev-util/astyle-3.1-r2:0/3.1 x11-libs/wxGTK:3.0-gtk3[X] contrib? ( app-admin/gamin app-text/hunspell dev-libs/boost:= )
+SLOT=0
+SRC_URI=mirror://sourceforge/codeblocks/codeblocks-20.03.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-20.03-fortran.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-20.03-fortran-update-v1.7.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-20.03-fortran-update-v1.8.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-20.03-codecompletion-symbolbrowser-update.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b3eb1a475ca019d1bbcca03c8d5070cc
diff --git a/metadata/md5-cache/dev-util/cppcheck-2.4.1 b/metadata/md5-cache/dev-util/cppcheck-2.4.1
index 7025abba68ca..25decbe7b10a 100644
--- a/metadata/md5-cache/dev-util/cppcheck-2.4.1
+++ b/metadata/md5-cache/dev-util/cppcheck-2.4.1
@@ -5,11 +5,11 @@ DESCRIPTION=Static analyzer of C/C++ code
 EAPI=7
 HOMEPAGE=https://github.com/danmar/cppcheck
 IUSE=htmlreport pcre qt5 +z3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 sparc x86
 LICENSE=GPL-3+
 RDEPEND=htmlreport? ( dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp dev-qt/qtprintsupport:5 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/danmar/cppcheck/archive/refs/tags/2.4.1.tar.gz -> cppcheck-2.4.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9ff84e399b39b46a18a1806f50c66d66
+_md5_=6877c215d7da06bc1740cbc58d875e8c
diff --git a/metadata/md5-cache/dev-util/ctags-20210321.0-r1 b/metadata/md5-cache/dev-util/ctags-20210321.0-r1
index 6f6d0a7569e6..01626d83b9d8 100644
--- a/metadata/md5-cache/dev-util/ctags-20210321.0-r1
+++ b/metadata/md5-cache/dev-util/ctags-20210321.0-r1
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-2+
 RDEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
 SLOT=0
-SRC_URI=https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.20210321.0.tar.gz
+SRC_URI=https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.20210321.0.tar.gz -> ctags-20210321.0.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8653ca6b0b383731131bc7f62706f231
+_md5_=3006a2b96c2ed9dc92cc2d22f050b258
diff --git a/metadata/md5-cache/dev-util/ctags-20211017.0 b/metadata/md5-cache/dev-util/ctags-20211017.0
new file mode 100644
index 000000000000..f14e49957fd7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ctags-20211017.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/docutils virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
+DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
+EAPI=8
+HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
+IUSE=json xml yaml
+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
+LICENSE=GPL-2+
+RDEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
+SLOT=0
+SRC_URI=https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.20211017.0.tar.gz -> ctags-20211017.0.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dd6f080ac47867af5b6f5fa8f1e65960
diff --git a/metadata/md5-cache/dev-util/ctags-99999999 b/metadata/md5-cache/dev-util/ctags-99999999
index 9b7617f69f16..3c6c97f5d1f0 100644
--- a/metadata/md5-cache/dev-util/ctags-99999999
+++ b/metadata/md5-cache/dev-util/ctags-99999999
@@ -2,7 +2,7 @@ BDEPEND=dev-python/docutils virtual/pkgconfig sys-devel/gnuconfig >=app-portage/
 DEFINED_PHASES=configure install postinst postrm prepare unpack
 DEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
 DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
-EAPI=7
+EAPI=8
 HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
 IUSE=json xml yaml
 LICENSE=GPL-2+
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
 SLOT=0
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b17394d3d4854e9ca3eae555fa2f12f1
+_md5_=dd6f080ac47867af5b6f5fa8f1e65960
diff --git a/metadata/md5-cache/dev-util/cucumber-3.2.0 b/metadata/md5-cache/dev-util/cucumber-3.2.0
index eb17b5794dc3..09df041ca698 100644
--- a/metadata/md5-cache/dev-util/cucumber-3.2.0
+++ b/metadata/md5-cache/dev-util/cucumber-3.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.2.0.tar.gz -> cucumber-3.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c6151cf56697e8e8ef6b6c924b9053c6
diff --git a/metadata/md5-cache/dev-util/cucumber-6.1.0 b/metadata/md5-cache/dev-util/cucumber-6.1.0
index 90aad60298be..ec322b357069 100644
--- a/metadata/md5-cache/dev-util/cucumber-6.1.0
+++ b/metadata/md5-cache/dev-util/cucumber-6.1.0
@@ -5,12 +5,12 @@ DESCRIPTION=Executable feature scenarios
 EAPI=7
 HOMEPAGE=https://cucumber.io/
 IUSE=examples test test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/builder-3.2.4:3.2[ruby_targets_ruby26(-)] >=dev-util/cucumber-core-9.0.1:9[ruby_targets_ruby26(-)] dev-util/cucumber-create-meta:4[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-gherkin-18.1.0:18[ruby_targets_ruby26(-)] >=dev-util/cucumber-html-formatter-13.0.0:13[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] >=dev-util/cucumber-wire-5.0.1:5[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.4.4:0[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.3.1:3[ruby_targets_ruby26(-)] >=dev-ruby/multi_test-0.1.2:0[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/builder-3.2.4:3.2[ruby_targets_ruby27(-)] >=dev-util/cucumber-core-9.0.1:9[ruby_targets_ruby27(-)] dev-util/cucumber-create-meta:4[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-gherkin-18.1.0:18[ruby_targets_ruby27(-)] >=dev-util/cucumber-html-formatter-13.0.0:13[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] >=dev-util/cucumber-wire-5.0.1:5[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.4.4:0[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3.1:3[ruby_targets_ruby27(-)] >=dev-ruby/multi_test-0.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v6.1.0.tar.gz -> cucumber-6.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ce2e74f7f70acbb823d738df23aab2b8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8d060c89407522b550afec57aef92f9f
diff --git a/metadata/md5-cache/dev-util/cucumber-7.0.0 b/metadata/md5-cache/dev-util/cucumber-7.0.0
index d83bad12cacf..9cea39903795 100644
--- a/metadata/md5-cache/dev-util/cucumber-7.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-7.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v7.0.0.tar.gz -> cucumber-7.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b0e25e79bd39892a011f28f609132bc
diff --git a/metadata/md5-cache/dev-util/cucumber-7.0.0-r1 b/metadata/md5-cache/dev-util/cucumber-7.0.0-r1
index 430601635927..509979582161 100644
--- a/metadata/md5-cache/dev-util/cucumber-7.0.0-r1
+++ b/metadata/md5-cache/dev-util/cucumber-7.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v7.0.0.tar.gz -> cucumber-7.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=19378daf5e03ede7fea0576cebd86139
diff --git a/metadata/md5-cache/dev-util/cucumber-7.1.0 b/metadata/md5-cache/dev-util/cucumber-7.1.0
new file mode 100644
index 000000000000..6560e7f8371a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-7.1.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.12.5[ruby_targets_ruby26(-)] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby26(-)] dev-ruby/json[ruby_targets_ruby26(-)] >=dev-util/cucumber-3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.12.5[ruby_targets_ruby27(-)] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby27(-)] dev-ruby/json[ruby_targets_ruby27(-)] >=dev-util/cucumber-3[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby26? ( >=dev-ruby/builder-3.2.4:3.2[ruby_targets_ruby26(-)] >=dev-util/cucumber-core-10.1.0:10[ruby_targets_ruby26(-)] >=dev-util/cucumber-create-meta-6.0.1:6[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-14.0.0:14[ruby_targets_ruby26(-)] >=dev-util/cucumber-gherkin-22.0.0:22[ruby_targets_ruby26(-)] >=dev-util/cucumber-html-formatter-17.0.0:17[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby26(-)] >=dev-util/cucumber-wire-6.2.0:6[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.4.4:0[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.3.1:3[ruby_targets_ruby26(-)] >=dev-ruby/multi_test-0.1.2:0[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/builder-3.2.4:3.2[ruby_targets_ruby27(-)] >=dev-util/cucumber-core-10.1.0:10[ruby_targets_ruby27(-)] >=dev-util/cucumber-create-meta-6.0.1:6[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-14.0.0:14[ruby_targets_ruby27(-)] >=dev-util/cucumber-gherkin-22.0.0:22[ruby_targets_ruby27(-)] >=dev-util/cucumber-html-formatter-17.0.0:17[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby27(-)] >=dev-util/cucumber-wire-6.2.0:6[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.4.4:0[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3.1:3[ruby_targets_ruby27(-)] >=dev-ruby/multi_test-0.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Executable feature scenarios
+EAPI=8
+HOMEPAGE=https://cucumber.io/
+IUSE=examples test test ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/builder-3.2.4:3.2[ruby_targets_ruby26(-)] >=dev-util/cucumber-core-10.1.0:10[ruby_targets_ruby26(-)] >=dev-util/cucumber-create-meta-6.0.1:6[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-14.0.0:14[ruby_targets_ruby26(-)] >=dev-util/cucumber-gherkin-22.0.0:22[ruby_targets_ruby26(-)] >=dev-util/cucumber-html-formatter-17.0.0:17[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby26(-)] >=dev-util/cucumber-wire-6.2.0:6[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.4.4:0[ruby_targets_ruby26(-)] >=dev-ruby/mime-types-3.3.1:3[ruby_targets_ruby26(-)] >=dev-ruby/multi_test-0.1.2:0[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/builder-3.2.4:3.2[ruby_targets_ruby27(-)] >=dev-util/cucumber-core-10.1.0:10[ruby_targets_ruby27(-)] >=dev-util/cucumber-create-meta-6.0.1:6[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-14.0.0:14[ruby_targets_ruby27(-)] >=dev-util/cucumber-gherkin-22.0.0:22[ruby_targets_ruby27(-)] >=dev-util/cucumber-html-formatter-17.0.0:17[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby27(-)] >=dev-util/cucumber-wire-6.2.0:6[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.4.4:0[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-3.3.1:3[ruby_targets_ruby27(-)] >=dev-ruby/multi_test-0.1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v7.1.0.tar.gz -> cucumber-7.1.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=edd7701412e74c037b461af50b388ddf
diff --git a/metadata/md5-cache/dev-util/cucumber-core-10.0.0 b/metadata/md5-cache/dev-util/cucumber-core-10.0.0
index a70aff250169..c1632b607193 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-10.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-core-10.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=10
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v10.0.0.tar.gz -> cucumber-core-10.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e96ef38fef7458f55c54d4134a123c18
diff --git a/metadata/md5-cache/dev-util/cucumber-core-10.0.1 b/metadata/md5-cache/dev-util/cucumber-core-10.0.1
index de07eddd6bdc..d3e36ba2f69c 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-10.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-core-10.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=10
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v10.0.1.tar.gz -> cucumber-core-10.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=039c43bbef483376cb840e2eeac18361
diff --git a/metadata/md5-cache/dev-util/cucumber-core-10.1.0 b/metadata/md5-cache/dev-util/cucumber-core-10.1.0
new file mode 100644
index 000000000000..ba622b81a142
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-core-10.1.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby30(-)] ) ) test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-gherkin-22.0.0:22[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby26(-)] >=dev-util/cucumber-tag-expressions-4.0.2:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-gherkin-22.0.0:22[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby27(-)] >=dev-util/cucumber-tag-expressions-4.0.2:4[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-gherkin-22.0.0:22[ruby_targets_ruby30(-)] >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby30(-)] >=dev-util/cucumber-tag-expressions-4.0.2:4[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Executable feature scenarios
+EAPI=8
+HOMEPAGE=https://cucumber.io/
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-gherkin-22.0.0:22[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby26(-)] >=dev-util/cucumber-tag-expressions-4.0.2:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-gherkin-22.0.0:22[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby27(-)] >=dev-util/cucumber-tag-expressions-4.0.2:4[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-gherkin-22.0.0:22[ruby_targets_ruby30(-)] >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby30(-)] >=dev-util/cucumber-tag-expressions-4.0.2:4[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=10
+SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v10.1.0.tar.gz -> cucumber-core-10.1.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=595a873d555f7ad12d573805c99cb3d9
diff --git a/metadata/md5-cache/dev-util/cucumber-core-3.2.1 b/metadata/md5-cache/dev-util/cucumber-core-3.2.1
index df06e448036a..7928985cfbc2 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-3.2.1
+++ b/metadata/md5-cache/dev-util/cucumber-core-3.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.2
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v3.2.1.tar.gz -> cucumber-core-3.2.1.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6058a470933d5bdcda113433b67d4c8b
diff --git a/metadata/md5-cache/dev-util/cucumber-core-9.0.1 b/metadata/md5-cache/dev-util/cucumber-core-9.0.1
index 835b6d2b90a3..6db436818408 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-9.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-core-9.0.1
@@ -5,12 +5,12 @@ DESCRIPTION=Executable feature scenarios
 EAPI=7
 HOMEPAGE=https://cucumber.io/
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-gherkin-18.1.0:18[ruby_targets_ruby26(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-gherkin-18.1.0:18[ruby_targets_ruby27(-)] >=dev-util/cucumber-tag-expressions-3.0.1:3[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=9
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v9.0.1.tar.gz -> cucumber-core-9.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=84d40760a5f42787b14f4d89413eb1f0
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6a70a47253d6d75bc5d62f8b6b9512aa
diff --git a/metadata/md5-cache/dev-util/cucumber-create-meta-4.0.0 b/metadata/md5-cache/dev-util/cucumber-create-meta-4.0.0
index 41c54ee19951..65cb53439a7f 100644
--- a/metadata/md5-cache/dev-util/cucumber-create-meta-4.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-create-meta-4.0.0
@@ -5,12 +5,12 @@ DESCRIPTION=HTML formatter for Cucumber
 EAPI=7
 HOMEPAGE=https://cucumber.io/
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/cucumber-create-meta-4.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c8ae68a2e1f3eae1073adfb7109cbeed
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=362b5b5ff8a05badfd464a96e76a3d24
diff --git a/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.1 b/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.1
index 3e10d65e8f81..86869885c5b0 100644
--- a/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/cucumber-create-meta-6.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=415118ff20ea44f2a20000d3f95c5646
diff --git a/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.2 b/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.2
new file mode 100644
index 000000000000..0a8c7ddc3cd5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-create-meta-6.0.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby30(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=HTML formatter for Cucumber
+EAPI=8
+HOMEPAGE=https://cucumber.io/
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby26(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby27(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby30(-)] >=dev-ruby/sys-uname-1.2.2:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=6
+SRC_URI=https://rubygems.org/gems/cucumber-create-meta-6.0.2.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=864db6c5c0e2f3f4ab63e60aa0776d88
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.3.0 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.3.0
index bf9e638ca1b4..444110ad9a0a 100644
--- a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.3.0
+++ b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-10.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=10
 SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-10.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d1b77d4d5519f864e1b223d4ce6d3517
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.1 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.1
deleted file mode 100644
index 7c3fea3296a4..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=a simpler alternative to Regular Expressions
-EAPI=7
-HOMEPAGE=https://cucumber.io/
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=12
-SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-12.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1d9ee6c2175277377d53120dd6705607
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.2 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.2
deleted file mode 100644
index 42619d670800..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=a simpler alternative to Regular Expressions
-EAPI=8
-HOMEPAGE=https://cucumber.io/
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=12
-SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-12.1.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=892000a753933205a96d9d6e3213aeaa
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.3 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.3
index 6704f9c567b9..8c78b55b1a2e 100644
--- a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.3
+++ b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-12.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=12
 SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-12.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=892000a753933205a96d9d6e3213aeaa
diff --git a/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-14.0.0 b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-14.0.0
new file mode 100644
index 000000000000..02a2cc7f6aaa
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-cucumber-expressions-14.0.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=a simpler alternative to Regular Expressions
+EAPI=8
+HOMEPAGE=https://cucumber.io/
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=14
+SRC_URI=https://rubygems.org/gems/cucumber-cucumber-expressions-14.0.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=892000a753933205a96d9d6e3213aeaa
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1 b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
index 1199b5d30e7b..28c5c17440ad 100644
--- a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://rubygems.org/gems/cucumber-expressions-6.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1cb03291d66da40912ae9837e73decb2
diff --git a/metadata/md5-cache/dev-util/cucumber-gherkin-18.1.1 b/metadata/md5-cache/dev-util/cucumber-gherkin-18.1.1
index 0d600e849a3a..cb4f0dbfd607 100644
--- a/metadata/md5-cache/dev-util/cucumber-gherkin-18.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-gherkin-18.1.1
@@ -5,12 +5,12 @@ DESCRIPTION=Fast Gherkin lexer and parser
 EAPI=7
 HOMEPAGE=https://cucumber.io/
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=18
 SRC_URI=https://github.com/cucumber/common/archive/gherkin/v18.1.1.tar.gz -> cucumber-gherkin-18.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c6d6cd5208c996523ec5cd37dec8a414
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=156d38d04e8d9e3389b40f9301438176
diff --git a/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.0 b/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.0
deleted file mode 100644
index abf51a70c8f3..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Fast Gherkin lexer and parser
-EAPI=7
-HOMEPAGE=https://cucumber.io/
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.0:17[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=20
-SRC_URI=https://github.com/cucumber/common/archive/gherkin/v20.0.0.tar.gz -> cucumber-gherkin-20.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2a95c2fb4e71aef047be89b2115f641a
diff --git a/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.1 b/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.1
index 340390f1bfa4..a784fa35d310 100644
--- a/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-gherkin-20.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=20
 SRC_URI=https://github.com/cucumber/common/archive/gherkin/v20.0.1.tar.gz -> cucumber-gherkin-20.0.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df8af86f6f01368ce09fc13a884bb4c2
diff --git a/metadata/md5-cache/dev-util/cucumber-gherkin-22.0.0 b/metadata/md5-cache/dev-util/cucumber-gherkin-22.0.0
new file mode 100644
index 000000000000..5d5d162b41e9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-gherkin-22.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Fast Gherkin lexer and parser
+EAPI=8
+HOMEPAGE=https://cucumber.io/
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=22
+SRC_URI=https://github.com/cucumber/common/archive/gherkin/v22.0.0.tar.gz -> cucumber-gherkin-22.0.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4b0c2f2f857a4e91b950219f5514f6f3
diff --git a/metadata/md5-cache/dev-util/cucumber-html-formatter-13.0.0-r1 b/metadata/md5-cache/dev-util/cucumber-html-formatter-13.0.0-r1
deleted file mode 100644
index 7e0c8768ed46..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-html-formatter-13.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=HTML formatter for Cucumber
-EAPI=7
-HOMEPAGE=https://cucumber.io/
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=13
-SRC_URI=https://rubygems.org/gems/cucumber-html-formatter-13.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=56af0b2329af85c5609635967cc2dce3
diff --git a/metadata/md5-cache/dev-util/cucumber-html-formatter-13.0.0-r2 b/metadata/md5-cache/dev-util/cucumber-html-formatter-13.0.0-r2
index c3041a113a40..f5e560817c7c 100644
--- a/metadata/md5-cache/dev-util/cucumber-html-formatter-13.0.0-r2
+++ b/metadata/md5-cache/dev-util/cucumber-html-formatter-13.0.0-r2
@@ -5,12 +5,12 @@ DESCRIPTION=HTML formatter for Cucumber
 EAPI=8
 HOMEPAGE=https://cucumber.io/
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=13
 SRC_URI=https://rubygems.org/gems/cucumber-html-formatter-13.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=62415a87e97c79d2c466fe6ca6d51751
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c1a3a2e88a931eee408a088010476e9b
diff --git a/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1 b/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1
deleted file mode 100644
index b71b6bd79a72..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=HTML formatter for Cucumber
-EAPI=8
-HOMEPAGE=https://cucumber.io/
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=16
-SRC_URI=https://rubygems.org/gems/cucumber-html-formatter-16.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=84e0521ff5afd42372c5fe8cd637b377
diff --git a/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1-r1 b/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1-r1
index 31c3ac054d43..785d92499fd2 100644
--- a/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1-r1
+++ b/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16
 SRC_URI=https://rubygems.org/gems/cucumber-html-formatter-16.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c4a0712e100775df5ffd90a359f748a3
diff --git a/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1-r2 b/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1-r2
new file mode 100644
index 000000000000..3e717e121aac
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-html-formatter-16.0.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=HTML formatter for Cucumber
+EAPI=8
+HOMEPAGE=https://cucumber.io/
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby30(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=16
+SRC_URI=https://rubygems.org/gems/cucumber-html-formatter-16.0.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9125d54f983cb795e48a224dfa638e35
diff --git a/metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0 b/metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0
new file mode 100644
index 000000000000..33c530dcf898
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-html-formatter-17.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.1.0.1:17[ruby_targets_ruby26(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby26(-)] !<dev-util/cucumber-html-formatter-16.0.1-r2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.1.0.1:17[ruby_targets_ruby27(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby27(-)] !<dev-util/cucumber-html-formatter-16.0.1-r2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.1.0.1:17[ruby_targets_ruby30(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby30(-)] !<dev-util/cucumber-html-formatter-16.0.1-r2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=HTML formatter for Cucumber
+EAPI=8
+HOMEPAGE=https://cucumber.io/
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-messages-17.1.0.1:17[ruby_targets_ruby26(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby26(-)] !<dev-util/cucumber-html-formatter-16.0.1-r2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-messages-17.1.0.1:17[ruby_targets_ruby27(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby27(-)] !<dev-util/cucumber-html-formatter-16.0.1-r2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-messages-17.1.0.1:17[ruby_targets_ruby30(-)] !<dev-util/cucumber-html-formatter-13.0.0-r2[ruby_targets_ruby30(-)] !<dev-util/cucumber-html-formatter-16.0.1-r2[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=17
+SRC_URI=https://rubygems.org/gems/cucumber-html-formatter-17.0.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ba02c9d812c032b36ef3e8d542f19093
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-13.2.1 b/metadata/md5-cache/dev-util/cucumber-messages-13.2.1
index ee5395e5850a..7c6a94784159 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-13.2.1
+++ b/metadata/md5-cache/dev-util/cucumber-messages-13.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=13
 SRC_URI=https://rubygems.org/gems/cucumber-messages-13.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a60f795abc561e1cab930db40786a324
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-14.0.1 b/metadata/md5-cache/dev-util/cucumber-messages-14.0.1
index 8c1e9571b6b1..06c2524022c0 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-14.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-messages-14.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=14
 SRC_URI=https://rubygems.org/gems/cucumber-messages-14.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a60f795abc561e1cab930db40786a324
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-15.0.0 b/metadata/md5-cache/dev-util/cucumber-messages-15.0.0
index 90be781f54bc..8e1343c8a480 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-15.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-messages-15.0.0
@@ -5,12 +5,12 @@ DESCRIPTION=Protocol Buffer messages for Cucumber's inter-process communication
 EAPI=7
 HOMEPAGE=https://cucumber.io/
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/protobuf-cucumber-3.10.8:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=15
 SRC_URI=https://rubygems.org/gems/cucumber-messages-15.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4febb92dff47a3f228a9e8c5e0b2248f
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ad69afb32fd186f58dbc025154bb9f5a
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-17.0.0 b/metadata/md5-cache/dev-util/cucumber-messages-17.0.0
index 854891fd2866..41d10274c153 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-17.0.0
+++ b/metadata/md5-cache/dev-util/cucumber-messages-17.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://rubygems.org/gems/cucumber-messages-17.0.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5efd6f3f501f7bf11232158286dc9000
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-17.0.1 b/metadata/md5-cache/dev-util/cucumber-messages-17.0.1
index bc48562b7bdf..f7fb6a23f437 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-17.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-messages-17.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://rubygems.org/gems/cucumber-messages-17.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c04464432c17f8a528a42300602e492
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-17.1.0 b/metadata/md5-cache/dev-util/cucumber-messages-17.1.0
index b88a98078975..414d3471f995 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-17.1.0
+++ b/metadata/md5-cache/dev-util/cucumber-messages-17.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://rubygems.org/gems/cucumber-messages-17.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c04464432c17f8a528a42300602e492
diff --git a/metadata/md5-cache/dev-util/cucumber-messages-17.1.1 b/metadata/md5-cache/dev-util/cucumber-messages-17.1.1
index 72a519509458..c0a9780f3daa 100644
--- a/metadata/md5-cache/dev-util/cucumber-messages-17.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-messages-17.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://rubygems.org/gems/cucumber-messages-17.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3c04464432c17f8a528a42300602e492
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-1.8.0 b/metadata/md5-cache/dev-util/cucumber-rails-1.8.0
index 07cdfeb5af7e..5bdd3063e4ac 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-1.8.0
+++ b/metadata/md5-cache/dev-util/cucumber-rails-1.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/cucumber-rails-1.8.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d1a1e6e25961dedc9a6fced8c8694e4f
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-2.2.0 b/metadata/md5-cache/dev-util/cucumber-rails-2.2.0
index 87d99c46f13c..d94c09e8ca96 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-2.2.0
+++ b/metadata/md5-cache/dev-util/cucumber-rails-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/cucumber-rails-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a50fe44d1b4ef927acfca95ea593d971
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-2.3.0 b/metadata/md5-cache/dev-util/cucumber-rails-2.3.0
index b85c324457bf..b7aafb44b1a6 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-2.3.0
+++ b/metadata/md5-cache/dev-util/cucumber-rails-2.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/cucumber/cucumber-rails/archive/v2.3.0.tar.gz -> cucumber-rails-2.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bb6b8d1d43c729ce7d098301e93b74f0
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-2.4.0 b/metadata/md5-cache/dev-util/cucumber-rails-2.4.0
index 5fd8c7b383e2..077afacc69cf 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-2.4.0
+++ b/metadata/md5-cache/dev-util/cucumber-rails-2.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/cucumber/cucumber-rails/archive/v2.4.0.tar.gz -> cucumber-rails-2.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fbb18af2de9032ea76c868371c845088
diff --git a/metadata/md5-cache/dev-util/cucumber-tag-expressions-2.0.4 b/metadata/md5-cache/dev-util/cucumber-tag-expressions-2.0.4
index 41bd218c5142..4ab9854eee5a 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag-expressions-2.0.4
+++ b/metadata/md5-cache/dev-util/cucumber-tag-expressions-2.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/cucumber-tag-expressions-2.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f4b1cdf1fabda40426d00db6c0e8644d
diff --git a/metadata/md5-cache/dev-util/cucumber-tag-expressions-3.0.1 b/metadata/md5-cache/dev-util/cucumber-tag-expressions-3.0.1
index 67feb645d74e..fab9c1e5684f 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag-expressions-3.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-tag-expressions-3.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/cucumber-tag-expressions-3.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4f770bae50f449a7372c033f32853ddb
diff --git a/metadata/md5-cache/dev-util/cucumber-tag-expressions-4.1.0 b/metadata/md5-cache/dev-util/cucumber-tag-expressions-4.1.0
new file mode 100644
index 000000000000..24aec325c119
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-tag-expressions-4.1.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Cucumber tag expressions for ruby
+EAPI=8
+HOMEPAGE=https://cucumber.io/
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=4
+SRC_URI=https://rubygems.org/gems/cucumber-tag-expressions-4.1.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=54386d46d65c1c441e0db1f350551f7e
diff --git a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1 b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
index 997c83d87898..0da6d1336bbe 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/cucumber-tag_expressions-1.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=46af1ae9d04a30d6499950d2367a7452
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1 b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
index 555296e1565e..09e4ce263c31 100644
--- a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
+++ b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cucumber-wire-0.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cc606ea19aa95de1d8db17b03334664b
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-5.0.1 b/metadata/md5-cache/dev-util/cucumber-wire-5.0.1
index 3a278416b01b..20e021315795 100644
--- a/metadata/md5-cache/dev-util/cucumber-wire-5.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-wire-5.0.1
@@ -5,12 +5,12 @@ DESCRIPTION=Executable feature scenarios
 EAPI=7
 HOMEPAGE=https://cucumber.io/
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-core-9.0.1:9[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-core-9.0.1:9[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-15.0.0:15[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/cucumber-wire-5.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5e0b40f8a5292331a2f1a000de13643a
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=78617afc6f496966049c4f30a4974303
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-6.0.1 b/metadata/md5-cache/dev-util/cucumber-wire-6.0.1
deleted file mode 100644
index c7fa5a99b596..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-wire-6.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-util/cucumber[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-util/cucumber[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Executable feature scenarios
-EAPI=8
-HOMEPAGE=https://cucumber.io/
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=6
-SRC_URI=https://rubygems.org/gems/cucumber-wire-6.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=607bf7d57320cca8e08030b5f9bd7c6e
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-6.1.0 b/metadata/md5-cache/dev-util/cucumber-wire-6.1.0
deleted file mode 100644
index 4e06ea04ac12..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-wire-6.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-util/cucumber[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-util/cucumber[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Executable feature scenarios
-EAPI=8
-HOMEPAGE=https://cucumber.io/
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-core-10.0.1:10[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-12.1.1:12[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.0.1:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=6
-SRC_URI=https://rubygems.org/gems/cucumber-wire-6.1.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=607bf7d57320cca8e08030b5f9bd7c6e
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-6.1.1 b/metadata/md5-cache/dev-util/cucumber-wire-6.1.1
index c8c19a370da5..f856ffbc3d72 100644
--- a/metadata/md5-cache/dev-util/cucumber-wire-6.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-wire-6.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/cucumber-wire-6.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=607bf7d57320cca8e08030b5f9bd7c6e
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-6.2.0 b/metadata/md5-cache/dev-util/cucumber-wire-6.2.0
new file mode 100644
index 000000000000..00d2f85a8dd8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-wire-6.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-util/cucumber-core-10.1.0:10[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-14.0.0:14[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-core-10.1.0:10[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-14.0.0:14[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-util/cucumber[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-util/cucumber[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Executable feature scenarios
+EAPI=8
+HOMEPAGE=https://cucumber.io/
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( >=dev-util/cucumber-core-10.1.0:10[ruby_targets_ruby26(-)] >=dev-util/cucumber-cucumber-expressions-14.0.0:14[ruby_targets_ruby26(-)] >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-util/cucumber-core-10.1.0:10[ruby_targets_ruby27(-)] >=dev-util/cucumber-cucumber-expressions-14.0.0:14[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-17.1.1:17[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=6
+SRC_URI=https://rubygems.org/gems/cucumber-wire-6.2.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5c4e76e14425cc87b1fb893cb7c1a959
diff --git a/metadata/md5-cache/dev-util/cutter-2.0.2 b/metadata/md5-cache/dev-util/cutter-2.0.2
deleted file mode 100644
index c212ad536484..000000000000
--- a/metadata/md5-cache/dev-util/cutter-2.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-util/rizin graphviz? ( media-gfx/graphviz ) dev-qt/linguist-tools:5
-DESCRIPTION=A Qt and C++ GUI for rizin reverse engineering framework
-EAPI=7
-HOMEPAGE=https://cutter.re https://github.com/rizinorg/cutter/
-IUSE=graphviz python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-SA-3.0 GPL-3
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-util/rizin graphviz? ( media-gfx/graphviz )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/rizinorg/cutter/archive/v2.0.2.tar.gz -> cutter-2.0.2.tar.gz https://github.com/rizinorg/cutter-translations/archive/974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz -> cutter-translations-974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d6f5289658188401ea65fe13ccb19540
diff --git a/metadata/md5-cache/dev-util/cutter-2.0.3 b/metadata/md5-cache/dev-util/cutter-2.0.3
deleted file mode 100644
index bd5309f23eee..000000000000
--- a/metadata/md5-cache/dev-util/cutter-2.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-util/rizin graphviz? ( media-gfx/graphviz ) dev-qt/linguist-tools:5
-DESCRIPTION=A Qt and C++ GUI for rizin reverse engineering framework
-EAPI=7
-HOMEPAGE=https://cutter.re https://github.com/rizinorg/cutter/
-IUSE=graphviz python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-SA-3.0 GPL-3
-RDEPEND=python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-util/rizin graphviz? ( media-gfx/graphviz )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/rizinorg/cutter/archive/v2.0.3.tar.gz -> cutter-2.0.3.tar.gz https://github.com/rizinorg/cutter-translations/archive/974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz -> cutter-translations-974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7e607a8d9a1348e64329124bcc2ec0a5
diff --git a/metadata/md5-cache/dev-util/cutter-2.0.3-r1 b/metadata/md5-cache/dev-util/cutter-2.0.3-r1
new file mode 100644
index 000000000000..b6b17d8edb42
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cutter-2.0.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=dev-util/rizin-0.3.0 graphviz? ( media-gfx/graphviz ) dev-qt/linguist-tools:5
+DESCRIPTION=A Qt and C++ GUI for rizin reverse engineering framework
+EAPI=7
+HOMEPAGE=https://cutter.re https://github.com/rizinorg/cutter/
+IUSE=graphviz python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-SA-3.0 GPL-3
+RDEPEND=python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=dev-util/rizin-0.3.0 graphviz? ( media-gfx/graphviz )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/rizinorg/cutter/archive/v2.0.3.tar.gz -> cutter-2.0.3.tar.gz https://github.com/rizinorg/cutter-translations/archive/974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz -> cutter-translations-974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1662057bbf7825ae053c044a67d2630c
diff --git a/metadata/md5-cache/dev-util/cvise-2.4.0 b/metadata/md5-cache/dev-util/cvise-2.4.0
new file mode 100644
index 000000000000..b8fdcdb370a5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cvise-2.4.0
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) sys-devel/flex test? ( python_single_target_python3_8? ( dev-python/pebble[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pebble[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pebble[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( sys-devel/clang:13 sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) <sys-devel/clang-14:= !!sys-devel/llvm:0
+DESCRIPTION=Super-parallel Python port of the C-Reduce
+EAPI=7
+HOMEPAGE=https://github.com/marxin/cvise/
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=UoI-NCSA
+RDEPEND=|| ( sys-devel/clang:13 sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) <sys-devel/clang-14:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/pebble[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/pebble[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/pebble[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) dev-util/unifdef sys-devel/flex
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/marxin/cvise/archive/v2.4.0.tar.gz -> cvise-2.4.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=54c6eac75493e4fddbfa2c76d4acfa1f
diff --git a/metadata/md5-cache/dev-util/devhelp-40.1 b/metadata/md5-cache/dev-util/devhelp-40.1
index b53ec5f9b815..51788c548bc8 100644
--- a/metadata/md5-cache/dev-util/devhelp-40.1
+++ b/metadata/md5-cache/dev-util/devhelp-40.1
@@ -1,15 +1,15 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/libxml2:2 dev-util/glib-utils dev-util/itstool gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/libxml2:2 dev-util/glib-utils dev-util/itstool gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs/webkit-gtk-2.26:4[introspection?] >=gui-libs/amtk-5.0:5 gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=An API documentation browser for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Devhelp
-IUSE=+gedit gtk-doc +introspection python_single_target_python3_8 python_single_target_python3_9
+IUSE=+gedit gtk-doc +introspection python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm ~ppc64 ~sparc ~x86
 LICENSE=GPL-3+ CC-BY-SA-4.0
-RDEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs/webkit-gtk-2.26:4[introspection?] >=gui-libs/amtk-5.0:5 gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gedit? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( app-editors/gedit[introspection(+),python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-editors/gedit[introspection(+),python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_9(-)] ) )
-REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RDEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs/webkit-gtk-2.26:4[introspection?] >=gui-libs/amtk-5.0:5 gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gedit? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( app-editors/gedit[introspection(+),python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-editors/gedit[introspection(+),python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-editors/gedit[introspection(+),python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_10(-)] ) )
+REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0/3-6
 SRC_URI=mirror://gnome/sources/devhelp/40/devhelp-40.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cbba9f96aebecc409c0519c4b4afc9ac
+_md5_=fdaaf4a35cdac8b62134af406c39318b
diff --git a/metadata/md5-cache/dev-util/devhelp-41.2 b/metadata/md5-cache/dev-util/devhelp-41.2
index d4973e372ba0..53d9868e6380 100644
--- a/metadata/md5-cache/dev-util/devhelp-41.2
+++ b/metadata/md5-cache/dev-util/devhelp-41.2
@@ -1,15 +1,15 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/libxml2:2 dev-util/glib-utils dev-util/itstool gtk-doc? ( >=dev-util/gi-docgen-2021.6 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/libxml2:2 dev-util/glib-utils dev-util/itstool gtk-doc? ( >=dev-util/gi-docgen-2021.6 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs/webkit-gtk-2.26:4[introspection?] gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=An API documentation browser for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Devhelp
-IUSE=+gedit gtk-doc +introspection python_single_target_python3_8 python_single_target_python3_9
+IUSE=+gedit gtk-doc +introspection python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~arm ~ppc64 ~sparc ~x86
 LICENSE=GPL-3+ CC-BY-SA-4.0
-RDEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs/webkit-gtk-2.26:4[introspection?] gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gedit? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( app-editors/gedit[introspection(+),python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-editors/gedit[introspection(+),python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_9(-)] ) )
-REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) gtk-doc? ( introspection )
+RDEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs/webkit-gtk-2.26:4[introspection?] gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gedit? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( app-editors/gedit[introspection(+),python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-editors/gedit[introspection(+),python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-editors/gedit[introspection(+),python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_10(-)] ) )
+REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) gtk-doc? ( introspection )
 SLOT=0/3-6
 SRC_URI=mirror://gnome/sources/devhelp/41/devhelp-41.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b5367b1118e7484ed1bbd80708df5e36
+_md5_=40fdc2c89f9892f3964bbceb8ae11549
diff --git a/metadata/md5-cache/dev-util/diffoscope-177-r1 b/metadata/md5-cache/dev-util/diffoscope-177-r1
deleted file mode 100644
index ade8497be633..000000000000
--- a/metadata/md5-cache/dev-util/diffoscope-177-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( app-text/docx2txt media-libs/libcaca )
-DESCRIPTION=Will try to get to the bottom of what makes files or directories different
-EAPI=7
-HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
-IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/diffoscope/diffoscope-177.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9a3e5e984dc3f2eae4ffdefec10c50ed
diff --git a/metadata/md5-cache/dev-util/diffoscope-184 b/metadata/md5-cache/dev-util/diffoscope-184
deleted file mode 100644
index afa28692a210..000000000000
--- a/metadata/md5-cache/dev-util/diffoscope-184
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-text/docx2txt media-libs/libcaca ) test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Will try to get to the bottom of what makes files or directories different
-EAPI=8
-HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
-IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/diffoscope/diffoscope-184.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea9d32711afe9cd13a1b569c7d20cd59
diff --git a/metadata/md5-cache/dev-util/diffoscope-185 b/metadata/md5-cache/dev-util/diffoscope-185
deleted file mode 100644
index e7674a6bd62d..000000000000
--- a/metadata/md5-cache/dev-util/diffoscope-185
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-text/docx2txt media-libs/libcaca ) test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Will try to get to the bottom of what makes files or directories different
-EAPI=8
-HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
-IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/diffoscope/diffoscope-185.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea9d32711afe9cd13a1b569c7d20cd59
diff --git a/metadata/md5-cache/dev-util/diffoscope-186 b/metadata/md5-cache/dev-util/diffoscope-186
index 257ce6cfe431..88eb54a2d905 100644
--- a/metadata/md5-cache/dev-util/diffoscope-186
+++ b/metadata/md5-cache/dev-util/diffoscope-186
@@ -4,7 +4,7 @@ DESCRIPTION=Will try to get to the bottom of what makes files or directories dif
 EAPI=8
 HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
 IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/diffoscope/diffoscope-186.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea9d32711afe9cd13a1b569c7d20cd59
+_md5_=f89f594d6af638554a6003314e9c1279
diff --git a/metadata/md5-cache/dev-util/diffoscope-187 b/metadata/md5-cache/dev-util/diffoscope-187
new file mode 100644
index 000000000000..0d4f946e301a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffoscope-187
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-text/docx2txt media-libs/libcaca ) test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Will try to get to the bottom of what makes files or directories different
+EAPI=8
+HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/diffoscope/diffoscope-187.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ea9d32711afe9cd13a1b569c7d20cd59
diff --git a/metadata/md5-cache/dev-util/dropwatch-1.4_p20150706 b/metadata/md5-cache/dev-util/dropwatch-1.4_p20150706
index 4ec7a9efd2cc..5969197dfb70 100644
--- a/metadata/md5-cache/dev-util/dropwatch-1.4_p20150706
+++ b/metadata/md5-cache/dev-util/dropwatch-1.4_p20150706
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-libs/binutils-libs:= sys-libs/readline:=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/dropwatch-1.4_p20150706.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a29d77b03377844cb2c63e47a189f604
diff --git a/metadata/md5-cache/dev-util/geany-1.37 b/metadata/md5-cache/dev-util/geany-1.37
deleted file mode 100644
index 41f9c355d17e..000000000000
--- a/metadata/md5-cache/dev-util/geany-1.37
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.32:2 gtk2? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) ) dev-util/intltool sys-devel/gettext dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GTK+ based fast and lightweight IDE
-EAPI=7
-HOMEPAGE=https://www.geany.org
-IUSE=gtk2 +vte
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ HPND
-RDEPEND=>=dev-libs/glib-2.32:2 gtk2? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) )
-SLOT=0
-SRC_URI=https://download.geany.org/geany-1.37.tar.bz2
-_eclasses_=strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1506b0cc6351d5e7900a0057b0538055
diff --git a/metadata/md5-cache/dev-util/geany-1.38 b/metadata/md5-cache/dev-util/geany-1.38
new file mode 100644
index 000000000000..9e0578502eec
--- /dev/null
+++ b/metadata/md5-cache/dev-util/geany-1.38
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) dev-util/intltool sys-devel/gettext
+DESCRIPTION=GTK+ based fast and lightweight IDE
+EAPI=8
+HOMEPAGE=https://www.geany.org
+IUSE=+vte
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ HPND
+RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 )
+SLOT=0
+SRC_URI=https://download.geany.org/geany-1.38.tar.bz2
+_eclasses_=strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4da7fab0107a84e1a00e0510b3b23c86
diff --git a/metadata/md5-cache/dev-util/geany-9999 b/metadata/md5-cache/dev-util/geany-9999
index 1c9906527386..48bdd11a0502 100644
--- a/metadata/md5-cache/dev-util/geany-9999
+++ b/metadata/md5-cache/dev-util/geany-9999
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.32:2 gtk2? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) ) dev-util/intltool sys-devel/gettext dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) dev-util/intltool sys-devel/gettext
 DESCRIPTION=GTK+ based fast and lightweight IDE
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.geany.org
-IUSE=gtk2 +vte
+IUSE=+vte
 LICENSE=GPL-2+ HPND
 PROPERTIES=live
-RDEPEND=>=dev-libs/glib-2.32:2 gtk2? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) )
+RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 )
 SLOT=0
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1506b0cc6351d5e7900a0057b0538055
+_md5_=4da7fab0107a84e1a00e0510b3b23c86
diff --git a/metadata/md5-cache/dev-util/gertty-1.6.0-r1 b/metadata/md5-cache/dev-util/gertty-1.6.0-r1
index 3f1194367a10..6d8d859c8876 100644
--- a/metadata/md5-cache/dev-util/gertty-1.6.0-r1
+++ b/metadata/md5-cache/dev-util/gertty-1.6.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-0.11[python_targets_python3_8(-)?]
+DEPEND=>=dev-python/pbr-0.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DESCRIPTION=Gertty is a console-based interface to the Gerrit Code Review system.
 EAPI=7
 HOMEPAGE=https://pypi.org/project/gertty/
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-0.11[python_targets_python3_8(-)?] >=dev-python/urwid-1.2.1[python_targets_python3_8(-)?] >=dev-python/sqlalchemy-1.0.4[python_targets_python3_8(-)?] >=dev-python/GitPython-0.3.7[python_targets_python3_8(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?] >=dev-python/requests-2.5.3[python_targets_python3_8(-)?] <dev-python/requests-3.0.0[python_targets_python3_8(-)?] >=dev-python/alembic-0.6.4[python_targets_python3_8(-)?] >=dev-python/pyyaml-3.1.0[python_targets_python3_8(-)?] >=dev-python/voluptuous-0.7[python_targets_python3_8(-)?] >=dev-python/ply-3.4[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=>=dev-python/pbr-0.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/urwid-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlalchemy-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/GitPython-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/requests-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/alembic-0.6.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/voluptuous-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ply-3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gertty/gertty-1.6.0.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2ef2391bb50c3c4947c2a7b6efbfc6f1
+_md5_=df596ade31b25015089b2879e94c2d91
diff --git a/metadata/md5-cache/dev-util/gertty-9999 b/metadata/md5-cache/dev-util/gertty-9999
index 339f80e45586..ea46cdacd35b 100644
--- a/metadata/md5-cache/dev-util/gertty-9999
+++ b/metadata/md5-cache/dev-util/gertty-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/pbr-0.11[python_targets_python3_8(-)?]
+DEPEND=>=dev-python/pbr-0.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DESCRIPTION=Gertty is a console-based interface to the Gerrit Code Review system.
 EAPI=7
 HOMEPAGE=https://pypi.org/project/gertty/
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=>=dev-python/pbr-0.11[python_targets_python3_8(-)?] >=dev-python/urwid-1.2.1[python_targets_python3_8(-)?] >=dev-python/sqlalchemy-1.0.4[python_targets_python3_8(-)?] >=dev-python/GitPython-0.3.7[python_targets_python3_8(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?] >=dev-python/requests-2.5.3[python_targets_python3_8(-)?] <dev-python/requests-3.0.0[python_targets_python3_8(-)?] >=dev-python/alembic-0.6.4[python_targets_python3_8(-)?] >=dev-python/pyyaml-3.1.0[python_targets_python3_8(-)?] >=dev-python/voluptuous-0.7[python_targets_python3_8(-)?] >=dev-python/ply-3.4[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=>=dev-python/pbr-0.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/urwid-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlalchemy-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/GitPython-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] <dev-python/requests-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/alembic-0.6.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-3.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/voluptuous-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ply-3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=77f1156f7e5c2e5307f6b27347faeef8
+_md5_=daaf602247cf8e814d671fe932daf8e0
diff --git a/metadata/md5-cache/dev-util/gnome-builder-3.40.2 b/metadata/md5-cache/dev-util/gnome-builder-3.40.2
index 8ed990eb6017..57bbb274175b 100644
--- a/metadata/md5-cache/dev-util/gnome-builder-3.40.2
+++ b/metadata/md5-cache/dev-util/gnome-builder-3.40.2
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ) gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) test? ( dev-libs/appstream-glib sys-apps/dbus ) dev-util/desktop-file-utils dev-util/glib-utils >=dev-util/meson-0.49.2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=doc? ( python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ) gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) test? ( dev-libs/appstream-glib sys-apps/dbus ) dev-util/desktop-file-utils dev-util/glib-utils >=dev-util/meson-0.49.2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/libdazzle-3.37.0[introspection] >=dev-libs/glib-2.67.4:2 >=x11-libs/gtk+-3.22.26:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.19.91 >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-libs/template-glib-3.28.0[introspection] >=x11-libs/vte-0.40.2:2.91[introspection] >=net-libs/webkit-gtk-2.26:4=[introspection] >=dev-libs/libxml2-2.9.0 git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-0.28.0.1[ssh] ) dev-libs/libpcre:3 dev-libs/libpcre2 >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_8? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) glade? ( >=dev-util/glade-3.22.0:3.10= ) spell? ( >=app-text/gspell-1.8:0= app-text/enchant:2 ) sysprof? ( >=dev-util/sysprof-3.37.1:0/4[gtk] ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/libdazzle-3.37.0[introspection] >=dev-libs/glib-2.67.4:2 >=x11-libs/gtk+-3.22.26:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.19.91 >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] >=dev-libs/template-glib-3.28.0[introspection] >=x11-libs/vte-0.40.2:2.91[introspection] >=net-libs/webkit-gtk-2.26:4=[introspection] >=dev-libs/libxml2-2.9.0 git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-0.28.0.1[ssh] ) dev-libs/libpcre:3 dev-libs/libpcre2 >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_8? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) glade? ( >=dev-util/glade-3.22.0:3.10= ) spell? ( >=app-text/gspell-1.8:0= app-text/enchant:2 ) sysprof? ( >=dev-util/sysprof-3.37.1:0/4[gtk] ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=An IDE for writing GNOME-based software
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Builder
-IUSE=clang +devhelp doc +git +glade gtk-doc spell sysprof test python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=clang +devhelp doc +git +glade gtk-doc spell sysprof test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
-RDEPEND=>=dev-libs/libdazzle-3.37.0[introspection] >=dev-libs/glib-2.67.4:2 >=x11-libs/gtk+-3.22.26:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.19.91 >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-libs/template-glib-3.28.0[introspection] >=x11-libs/vte-0.40.2:2.91[introspection] >=net-libs/webkit-gtk-2.26:4=[introspection] >=dev-libs/libxml2-2.9.0 git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-0.28.0.1[ssh] ) dev-libs/libpcre:3 dev-libs/libpcre2 >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_8? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) glade? ( >=dev-util/glade-3.22.0:3.10= ) spell? ( >=app-text/gspell-1.8:0= app-text/enchant:2 ) sysprof? ( >=dev-util/sysprof-3.37.1:0/4[gtk] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-libs/libdazzle-3.37.0[introspection] >=dev-libs/glib-2.67.4:2 >=x11-libs/gtk+-3.22.26:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.19.91 >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] >=dev-libs/template-glib-3.28.0[introspection] >=x11-libs/vte-0.40.2:2.91[introspection] >=net-libs/webkit-gtk-2.26:4=[introspection] >=dev-libs/libxml2-2.9.0 git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-0.28.0.1[ssh] ) dev-libs/libpcre:3 dev-libs/libpcre2 >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_8? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) glade? ( >=dev-util/glade-3.22.0:3.10= ) spell? ( >=app-text/gspell-1.8:0= app-text/enchant:2 ) sysprof? ( >=dev-util/sysprof-3.37.1:0/4[gtk] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-builder/3.40/gnome-builder-3.40.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	llvm	19c0cdeff39b0e08d1454df31b588316	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b9e1cdbb836eac09d92184240b9e99bf
+_md5_=3b75195b751bf410d1a10754ebc050d1
diff --git a/metadata/md5-cache/dev-util/gprof2dot-2021.02.21-r1 b/metadata/md5-cache/dev-util/gprof2dot-2021.02.21-r1
new file mode 100644
index 000000000000..1ba4af468678
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gprof2dot-2021.02.21-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) python_targets_python3_10? ( dev-lang/python:3.10[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Converts profiling output to dot graphs
+EAPI=7
+HOMEPAGE=https://github.com/jrfonseca/gprof2dot
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) python_targets_python3_10? ( dev-lang/python:3.10[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/g/gprof2dot/gprof2dot-2021.2.21.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5907b573a9846459e94e10fb5b28bcab
diff --git a/metadata/md5-cache/dev-util/idea-community-2021.2.2.212.5284.40 b/metadata/md5-cache/dev-util/idea-community-2021.2.2.212.5284.40
deleted file mode 100644
index d70a46ab9367..000000000000
--- a/metadata/md5-cache/dev-util/idea-community-2021.2.2.212.5284.40
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=install prepare unpack
-DEPEND=|| ( >=dev-java/openjdk-11.0.11_p9-r1:11 >=dev-java/openjdk-bin-11.0.11_p9-r1:11 )
-DESCRIPTION=A complete toolset for web, mobile and enterprise development
-EAPI=7
-HOMEPAGE=https://www.jetbrains.com/idea
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
-RDEPEND=|| ( >=dev-java/openjdk-11.0.11_p9-r1:11 >=dev-java/openjdk-bin-11.0.11_p9-r1:11 ) dev-java/jansi-native dev-libs/libdbusmenu media-libs/harfbuzz =dev-util/lldb-10*
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://download.jetbrains.com/idea/ideaIC-2021.2.2-no-jbr.tar.gz?_ga=2.28899775.2679204.1629809316-850001349.1629809316 -> ideaIC-2.2.212.5284.40.tar.gz amd64? ( https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-11_0_11-linux-x64-b1504.12.tar.gz -> jbr-11_0_11-linux-x64-b1504.12.tar.gz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3727f75866cc6ef28fae22ab7e526152
diff --git a/metadata/md5-cache/dev-util/idea-community-2021.2.3.212.5457.46 b/metadata/md5-cache/dev-util/idea-community-2021.2.3.212.5457.46
new file mode 100644
index 000000000000..040d13e4ae22
--- /dev/null
+++ b/metadata/md5-cache/dev-util/idea-community-2021.2.3.212.5457.46
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=install prepare unpack
+DEPEND=|| ( >=dev-java/openjdk-11.0.11_p9-r1:11 >=dev-java/openjdk-bin-11.0.11_p9-r1:11 )
+DESCRIPTION=A complete toolset for web, mobile and enterprise development
+EAPI=7
+HOMEPAGE=https://www.jetbrains.com/idea
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
+RDEPEND=|| ( >=dev-java/openjdk-11.0.11_p9-r1:11 >=dev-java/openjdk-bin-11.0.11_p9-r1:11 ) dev-java/jansi-native dev-libs/libdbusmenu media-libs/harfbuzz
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://download.jetbrains.com/idea/ideaIC-2021.2.3-no-jbr.tar.gz?_ga=2.157861308.704681908.1634561297-1608238442.1631355834 -> ideaIC-2.3.212.5457.46.tar.gz amd64? ( https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-11_0_11-linux-x64-b1504.5.tar.gz -> jbr-11_0_11-linux-x64-b1504.5.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9f6a3ec84915cd7b427e24362a8bc7fe
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.8365-r1 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.8365-r1
deleted file mode 100644
index 2624d1ceb390..000000000000
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.8365-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=sys-devel/lld-10 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/opencl-clang:10= sys-devel/llvm:10= !!sys-devel/llvm:0
-DESCRIPTION=LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware
-EAPI=7
-HOMEPAGE=https://github.com/intel/intel-graphics-compiler
-IUSE=debug
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=dev-libs/opencl-clang:10= sys-devel/llvm:10=
-SLOT=0
-SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.8365.tar.gz -> intel-graphics-compiler-1.0.8365.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=13c43066e5f48b33a908d4f1369e5355
diff --git a/metadata/md5-cache/dev-util/kbuild-0.1.9998.3499 b/metadata/md5-cache/dev-util/kbuild-0.1.9998.3499
index 8b6379022946..128cd295b680 100644
--- a/metadata/md5-cache/dev-util/kbuild-0.1.9998.3499
+++ b/metadata/md5-cache/dev-util/kbuild-0.1.9998.3499
@@ -9,4 +9,4 @@ LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~polynomial-c/kbuild-0.1.9998.3499-src.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=be2b056454d931837b8680b9a7aee398
+_md5_=74b220df1c5cbf2f1437045e6c2d44c3
diff --git a/metadata/md5-cache/dev-util/kbuild-9999 b/metadata/md5-cache/dev-util/kbuild-9999
index 068e86741ad8..50f674647876 100644
--- a/metadata/md5-cache/dev-util/kbuild-9999
+++ b/metadata/md5-cache/dev-util/kbuild-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-3+
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	subversion	c74febd1baf21b1229704d6a953c27db	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=460dbefcd400f126930f6f01aaf65fec
+_md5_=95508841fd7f15969e1bbf7edd098e43
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.10.12-r1 b/metadata/md5-cache/dev-util/lttng-modules-2.10.12-r1
index 235b545f961c..25eb60235af3 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.10.12-r1
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.10.12-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/2.10
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.10.12.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=61d6957e67c17e6643143404e100ce61
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.11.0-r1 b/metadata/md5-cache/dev-util/lttng-modules-2.11.0-r1
index dbc064da1244..e37ba9fd21e9 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.11.0-r1
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.11.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/2.11
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.11.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=61d6957e67c17e6643143404e100ce61
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.11.8 b/metadata/md5-cache/dev-util/lttng-modules-2.11.8
index df519bd4dbad..5d6b64bcbe37 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.11.8
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.11.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/2.11
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.11.8.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3e9422dce2ef0f7c01dedd08f65bc2f6
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.12.5 b/metadata/md5-cache/dev-util/lttng-modules-2.12.5
index d1128991b167..dd004e2fbc3d 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.12.5
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.12.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/2.12
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.12.5.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=eb02ad59f26c4db1299d1c15d2f8d421
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.12.6 b/metadata/md5-cache/dev-util/lttng-modules-2.12.6
index 8878b4438795..68dc6adb3ec8 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.12.6
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.12.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/2.12
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.12.6.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=72e832555c6b5455db4cd7d50858d8ba
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.13.0 b/metadata/md5-cache/dev-util/lttng-modules-2.13.0
index f121d12c0578..8156c0ce1120 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.13.0
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.13.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/2.13
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.13.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=62f76927932c8a503d2c91306a18b041
diff --git a/metadata/md5-cache/dev-util/lttng-modules-2.7.1-r1 b/metadata/md5-cache/dev-util/lttng-modules-2.7.1-r1
index ae547506d1b1..38248d9b3b47 100644
--- a/metadata/md5-cache/dev-util/lttng-modules-2.7.1-r1
+++ b/metadata/md5-cache/dev-util/lttng-modules-2.7.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/2.7
 SRC_URI=https://lttng.org/files/lttng-modules/lttng-modules-2.7.1.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=142006e0e3165b1d581a9ffe08354ba7
diff --git a/metadata/md5-cache/dev-util/lttng-tools-2.11.6 b/metadata/md5-cache/dev-util/lttng-tools-2.11.6
index 05522d224bf7..10e187a1e7b3 100644
--- a/metadata/md5-cache/dev-util/lttng-tools-2.11.6
+++ b/metadata/md5-cache/dev-util/lttng-tools-2.11.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu:= dev-libs/popt dev-libs/libxml2 ust? ( >=dev-util/lttng-ust-2.12.0:= )
 SLOT=0/2.11
 SRC_URI=https://lttng.org/files/lttng-tools/lttng-tools-2.11.6.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e3f7f587fa4fa806b18170c1b8d15e6a
diff --git a/metadata/md5-cache/dev-util/lttng-tools-2.12.0 b/metadata/md5-cache/dev-util/lttng-tools-2.12.0
index 866056111c87..ffbacd3ad837 100644
--- a/metadata/md5-cache/dev-util/lttng-tools-2.12.0
+++ b/metadata/md5-cache/dev-util/lttng-tools-2.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu:= dev-libs/popt dev-libs/libxml2 ust? ( >=dev-util/lttng-ust-2.12.0:= )
 SLOT=0/2.12
 SRC_URI=https://lttng.org/files/lttng-tools/lttng-tools-2.12.0.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=41175a9773051681ef4f422254945cb4
diff --git a/metadata/md5-cache/dev-util/lttng-tools-2.12.3 b/metadata/md5-cache/dev-util/lttng-tools-2.12.3
index a5291bbee4fb..a145bd264044 100644
--- a/metadata/md5-cache/dev-util/lttng-tools-2.12.3
+++ b/metadata/md5-cache/dev-util/lttng-tools-2.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu:= dev-libs/popt dev-libs/libxml2 ust? ( >=dev-util/lttng-ust-2.12.0:= )
 SLOT=0/2.12
 SRC_URI=https://lttng.org/files/lttng-tools/lttng-tools-2.12.3.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=80419d047ae3a6730e21307e6fa09e70
diff --git a/metadata/md5-cache/dev-util/lttng-tools-2.7.1 b/metadata/md5-cache/dev-util/lttng-tools-2.7.1
index 39d85338e861..e92222a4b717 100644
--- a/metadata/md5-cache/dev-util/lttng-tools-2.7.1
+++ b/metadata/md5-cache/dev-util/lttng-tools-2.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/userspace-rcu:= dev-libs/popt dev-libs/libxml2 ust? ( dev-util/lttng-ust:= )
 SLOT=0/2.7
 SRC_URI=https://lttng.org/files/lttng-tools/lttng-tools-2.7.1.tar.bz2
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=947061150b44153c4aac846e4fb8b818
diff --git a/metadata/md5-cache/dev-util/maturin-0.10.6 b/metadata/md5-cache/dev-util/maturin-0.10.6
deleted file mode 100644
index aedf21fd9a32..000000000000
--- a/metadata/md5-cache/dev-util/maturin-0.10.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install setup test unpack
-DEPEND=test? ( || ( ( dev-lang/python:3.9 dev-python/cffi[python_targets_python3_9(-)] dev-python/pycparser[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/cffi[python_targets_python3_8(-)] dev-python/pycparser[python_targets_python3_8(-)] ) ) )
-DESCRIPTION=Build and publish crates with pyo3, rust-cpython and cffi bindings
-EAPI=7
-HOMEPAGE=https://github.com/PyO3/maturin
-IUSE=test debug
-KEYWORDS=~amd64
-LICENSE=|| ( Apache-2.0 MIT )
-PROPERTIES=test_network
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/PyO3/maturin/archive/refs/tags/v0.10.6.tar.gz -> maturin-0.10.6.tar.gz https://crates.io/api/v1/crates/addr2line/0.15.1/download -> addr2line-0.15.1.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.6.0/download -> aes-0.6.0.crate https://crates.io/api/v1/crates/aes-soft/0.6.4/download -> aes-soft-0.6.4.crate https://crates.io/api/v1/crates/aesni/0.10.0/download -> aesni-0.10.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.40/download -> anyhow-1.0.40.crate https://crates.io/api/v1/crates/ascii/0.9.3/download -> ascii-0.9.3.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.59/download -> backtrace-0.3.59.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-modes/0.7.0/download -> block-modes-0.7.0.crate https://crates.io/api/v1/crates/block-padding/0.2.1/download -> block-padding-0.2.1.crate https://crates.io/api/v1/crates/bumpalo/3.6.1/download -> bumpalo-3.6.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.0.1/download -> bytes-1.0.1.crate https://crates.io/api/v1/crates/bytesize/1.0.1/download -> bytesize-1.0.1.crate https://crates.io/api/v1/crates/bzip2/0.3.3/download -> bzip2-0.3.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.10+1.0.8/download -> bzip2-sys-0.1.10+1.0.8.crate https://crates.io/api/v1/crates/camino/1.0.4/download -> camino-1.0.4.crate https://crates.io/api/v1/crates/cargo-platform/0.1.1/download -> cargo-platform-0.1.1.crate https://crates.io/api/v1/crates/cargo_metadata/0.13.1/download -> cargo_metadata-0.13.1.crate https://crates.io/api/v1/crates/cbindgen/0.19.0/download -> cbindgen-0.19.0.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/charset/0.1.2/download -> charset-0.1.2.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/cipher/0.2.5/download -> cipher-0.2.5.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/combine/3.8.1/download -> combine-3.8.1.crate https://crates.io/api/v1/crates/configparser/2.0.1/download -> configparser-2.0.1.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/cpufeatures/0.1.4/download -> cpufeatures-0.1.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crypto-mac/0.10.0/download -> crypto-mac-0.10.0.crate https://crates.io/api/v1/crates/dbus/0.2.3/download -> dbus-0.2.3.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs/3.0.2/download -> dirs-3.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encoding_rs/0.8.28/download -> encoding_rs-0.8.28.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/fat-macho/0.4.3/download -> fat-macho-0.4.3.crate https://crates.io/api/v1/crates/filetime/0.2.14/download -> filetime-0.2.14.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fs-err/2.6.0/download -> fs-err-2.6.0.crate https://crates.io/api/v1/crates/futures-channel/0.3.15/download -> futures-channel-0.3.15.crate https://crates.io/api/v1/crates/futures-core/0.3.15/download -> futures-core-0.3.15.crate https://crates.io/api/v1/crates/futures-io/0.3.15/download -> futures-io-0.3.15.crate https://crates.io/api/v1/crates/futures-macro/0.3.15/download -> futures-macro-0.3.15.crate https://crates.io/api/v1/crates/futures-sink/0.3.15/download -> futures-sink-0.3.15.crate https://crates.io/api/v1/crates/futures-task/0.3.15/download -> futures-task-0.3.15.crate https://crates.io/api/v1/crates/futures-util/0.3.15/download -> futures-util-0.3.15.crate https://crates.io/api/v1/crates/generic-array/0.14.4/download -> generic-array-0.14.4.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gimli/0.24.0/download -> gimli-0.24.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/goblin/0.4.0/download -> goblin-0.4.0.crate https://crates.io/api/v1/crates/h2/0.3.3/download -> h2-0.3.3.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/heck/0.3.2/download -> heck-0.3.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/hkdf/0.10.0/download -> hkdf-0.10.0.crate https://crates.io/api/v1/crates/hmac/0.10.1/download -> hmac-0.10.1.crate https://crates.io/api/v1/crates/http/0.2.4/download -> http-0.2.4.crate https://crates.io/api/v1/crates/http-body/0.4.2/download -> http-body-0.4.2.crate https://crates.io/api/v1/crates/httparse/1.4.1/download -> httparse-1.4.1.crate https://crates.io/api/v1/crates/httpdate/1.0.0/download -> httpdate-1.0.0.crate https://crates.io/api/v1/crates/human-panic/1.0.3/download -> human-panic-1.0.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/hyper/0.14.7/download -> hyper-0.14.7.crate https://crates.io/api/v1/crates/hyper-rustls/0.22.1/download -> hyper-rustls-0.22.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indexmap/1.6.2/download -> indexmap-1.6.2.crate https://crates.io/api/v1/crates/indoc/1.0.3/download -> indoc-1.0.3.crate https://crates.io/api/v1/crates/ipnet/2.3.0/download -> ipnet-2.3.0.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/js-sys/0.3.51/download -> js-sys-0.3.51.crate https://crates.io/api/v1/crates/keyring/0.10.1/download -> keyring-0.10.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.94/download -> libc-0.2.94.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/llvm-bitcode/0.1.2/download -> llvm-bitcode-0.1.2.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mailparse/0.13.4/download -> mailparse-0.13.4.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.3/download -> mime_guess-2.0.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.7.11/download -> mio-0.7.11.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num/0.3.1/download -> num-0.3.1.crate https://crates.io/api/v1/crates/num-bigint/0.3.2/download -> num-bigint-0.3.2.crate https://crates.io/api/v1/crates/num-complex/0.3.1/download -> num-complex-0.3.1.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/num_enum/0.5.1/download -> num_enum-0.5.1.crate https://crates.io/api/v1/crates/num_enum_derive/0.5.1/download -> num_enum_derive-0.5.1.crate https://crates.io/api/v1/crates/object/0.24.0/download -> object-0.24.0.crate https://crates.io/api/v1/crates/once_cell/1.7.2/download -> once_cell-1.7.2.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/os_type/2.3.0/download -> os_type-2.3.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pin-project/1.0.7/download -> pin-project-1.0.7.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.7/download -> pin-project-internal-1.0.7.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.6/download -> pin-project-lite-0.2.6.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/0.1.0/download -> platform-info-0.1.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/pretty_env_logger/0.4.0/download -> pretty_env_logger-0.4.0.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro-nested/0.1.7/download -> proc-macro-nested-0.1.7.crate https://crates.io/api/v1/crates/proc-macro2/1.0.27/download -> proc-macro2-1.0.27.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/quoted_printable/0.4.3/download -> quoted_printable-0.4.3.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.8/download -> redox_syscall-0.2.8.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.11.3/download -> reqwest-0.11.3.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rpassword/5.0.1/download -> rpassword-5.0.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.19/download -> rustc-demangle-0.1.19.crate https://crates.io/api/v1/crates/rustls/0.19.1/download -> rustls-0.19.1.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scroll/0.10.2/download -> scroll-0.10.2.crate https://crates.io/api/v1/crates/scroll_derive/0.10.5/download -> scroll_derive-0.10.5.crate https://crates.io/api/v1/crates/sct/0.6.1/download -> sct-0.6.1.crate https://crates.io/api/v1/crates/secret-service/1.1.3/download -> secret-service-1.1.3.crate https://crates.io/api/v1/crates/security-framework/0.4.4/download -> security-framework-0.4.4.crate https://crates.io/api/v1/crates/security-framework-sys/0.4.3/download -> security-framework-sys-0.4.3.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver-parser/0.10.2/download -> semver-parser-0.10.2.crate https://crates.io/api/v1/crates/serde/1.0.126/download -> serde-1.0.126.crate https://crates.io/api/v1/crates/serde_derive/1.0.126/download -> serde_derive-1.0.126.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.0/download -> serde_urlencoded-0.7.0.crate https://crates.io/api/v1/crates/sha2/0.9.5/download -> sha2-0.9.5.crate https://crates.io/api/v1/crates/shlex/1.0.0/download -> shlex-1.0.0.crate https://crates.io/api/v1/crates/slab/0.4.3/download -> slab-0.4.3.crate https://crates.io/api/v1/crates/socket2/0.4.0/download -> socket2-0.4.0.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.21/download -> structopt-0.3.21.crate https://crates.io/api/v1/crates/structopt-derive/0.4.14/download -> structopt-derive-0.4.14.crate https://crates.io/api/v1/crates/subtle/2.4.0/download -> subtle-2.4.0.crate https://crates.io/api/v1/crates/syn/1.0.72/download -> syn-1.0.72.crate https://crates.io/api/v1/crates/tar/0.4.33/download -> tar-0.4.33.crate https://crates.io/api/v1/crates/target-lexicon/0.12.0/download -> target-lexicon-0.12.0.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.24/download -> thiserror-1.0.24.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.24/download -> thiserror-impl-1.0.24.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.2.0/download -> tinyvec-1.2.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tokio/1.6.0/download -> tokio-1.6.0.crate https://crates.io/api/v1/crates/tokio-rustls/0.22.0/download -> tokio-rustls-0.22.0.crate https://crates.io/api/v1/crates/tokio-util/0.6.7/download -> tokio-util-0.6.7.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/toml_edit/0.2.0/download -> toml_edit-0.2.0.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.26/download -> tracing-0.1.26.crate https://crates.io/api/v1/crates/tracing-core/0.1.18/download -> tracing-core-0.1.18.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/typenum/1.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.7/download -> unindent-0.1.7.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.2.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.74/download -> wasm-bindgen-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.74/download -> wasm-bindgen-backend-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.24/download -> wasm-bindgen-futures-0.4.24.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.74/download -> wasm-bindgen-macro-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.74/download -> wasm-bindgen-macro-support-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.74/download -> wasm-bindgen-shared-0.2.74.crate https://crates.io/api/v1/crates/web-sys/0.3.51/download -> web-sys-0.3.51.crate https://crates.io/api/v1/crates/webpki/0.21.4/download -> webpki-0.21.4.crate https://crates.io/api/v1/crates/webpki-roots/0.21.1/download -> webpki-roots-0.21.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winreg/0.7.0/download -> winreg-0.7.0.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/zip/0.5.12/download -> zip-0.5.12.crate test? ( https://crates.io/api/v1/crates/ctor/0.1.19/download -> ctor-0.1.19.crate https://crates.io/api/v1/crates/ctor/0.1.20/download -> ctor-0.1.20.crate https://crates.io/api/v1/crates/ghost/0.1.2/download -> ghost-0.1.2.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/inventory/0.1.10/download -> inventory-0.1.10.crate https://crates.io/api/v1/crates/inventory-impl/0.1.10/download -> inventory-impl-0.1.10.crate https://crates.io/api/v1/crates/libc/0.2.86/download -> libc-0.2.86.crate https://crates.io/api/v1/crates/libc/0.2.90/download -> libc-0.2.90.crate https://crates.io/api/v1/crates/libc/0.2.92/download -> libc-0.2.92.crate https://crates.io/api/v1/crates/lock_api/0.4.2/download -> lock_api-0.4.2.crate https://crates.io/api/v1/crates/lock_api/0.4.3/download -> lock_api-0.4.3.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/proc-macro2/1.0.26/download -> proc-macro2-1.0.26.crate https://crates.io/api/v1/crates/pyo3/0.13.2/download -> pyo3-0.13.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.13.2/download -> pyo3-macros-0.13.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.13.2/download -> pyo3-macros-backend-0.13.2.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/syn/1.0.60/download -> syn-1.0.60.crate https://crates.io/api/v1/crates/syn/1.0.64/download -> syn-1.0.64.crate https://crates.io/api/v1/crates/syn/1.0.68/download -> syn-1.0.68.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate )
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=44319b49dd833b87d97c06c83e21eb72
diff --git a/metadata/md5-cache/dev-util/maturin-0.11.5 b/metadata/md5-cache/dev-util/maturin-0.11.5
new file mode 100644
index 000000000000..91082de6466f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/maturin-0.11.5
@@ -0,0 +1,14 @@
+BDEPEND=test? ( || ( ( dev-lang/python:3.10 dev-python/cffi[python_targets_python3_10(-)] dev-python/virtualenv[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/cffi[python_targets_python3_9(-)] dev-python/virtualenv[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/cffi[python_targets_python3_8(-)] dev-python/virtualenv[python_targets_python3_8(-)] ) ) ) >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install setup test unpack
+DESCRIPTION=Build and publish crates with pyo3, rust-cpython and cffi bindings
+EAPI=8
+HOMEPAGE=https://github.com/pyo3/maturin
+IUSE=test debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0 openssl
+PROPERTIES=test_network
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/PyO3/maturin/archive/refs/tags/v0.11.5.tar.gz -> maturin-0.11.5.tar.gz https://crates.io/api/v1/crates/addr2line/0.16.0/download -> addr2line-0.16.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.6.0/download -> aes-0.6.0.crate https://crates.io/api/v1/crates/aes-soft/0.6.4/download -> aes-soft-0.6.4.crate https://crates.io/api/v1/crates/aesni/0.10.0/download -> aesni-0.10.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.44/download -> anyhow-1.0.44.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.61/download -> backtrace-0.3.61.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-modes/0.7.0/download -> block-modes-0.7.0.crate https://crates.io/api/v1/crates/block-padding/0.2.1/download -> block-padding-0.2.1.crate https://crates.io/api/v1/crates/bumpalo/3.7.1/download -> bumpalo-3.7.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/bytesize/1.1.0/download -> bytesize-1.1.0.crate https://crates.io/api/v1/crates/bzip2/0.4.3/download -> bzip2-0.4.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/camino/1.0.5/download -> camino-1.0.5.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo_metadata/0.14.0/download -> cargo_metadata-0.14.0.crate https://crates.io/api/v1/crates/cbindgen/0.20.0/download -> cbindgen-0.20.0.crate https://crates.io/api/v1/crates/cc/1.0.71/download -> cc-1.0.71.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/charset/0.1.2/download -> charset-0.1.2.crate https://crates.io/api/v1/crates/cipher/0.2.5/download -> cipher-0.2.5.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/configparser/2.1.0/download -> configparser-2.1.0.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/cpufeatures/0.2.1/download -> cpufeatures-0.2.1.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crypto-mac/0.10.1/download -> crypto-mac-0.10.1.crate https://crates.io/api/v1/crates/dbus/0.2.3/download -> dbus-0.2.3.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.28/download -> encoding_rs-0.8.28.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/fat-macho/0.4.4/download -> fat-macho-0.4.4.crate https://crates.io/api/v1/crates/filetime/0.2.15/download -> filetime-0.2.15.crate https://crates.io/api/v1/crates/flate2/1.0.22/download -> flate2-1.0.22.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fs-err/2.6.0/download -> fs-err-2.6.0.crate https://crates.io/api/v1/crates/futures-channel/0.3.17/download -> futures-channel-0.3.17.crate https://crates.io/api/v1/crates/futures-core/0.3.17/download -> futures-core-0.3.17.crate https://crates.io/api/v1/crates/futures-io/0.3.17/download -> futures-io-0.3.17.crate https://crates.io/api/v1/crates/futures-macro/0.3.17/download -> futures-macro-0.3.17.crate https://crates.io/api/v1/crates/futures-sink/0.3.17/download -> futures-sink-0.3.17.crate https://crates.io/api/v1/crates/futures-task/0.3.17/download -> futures-task-0.3.17.crate https://crates.io/api/v1/crates/futures-util/0.3.17/download -> futures-util-0.3.17.crate https://crates.io/api/v1/crates/generic-array/0.14.4/download -> generic-array-0.14.4.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gimli/0.25.0/download -> gimli-0.25.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/goblin/0.4.3/download -> goblin-0.4.3.crate https://crates.io/api/v1/crates/h2/0.3.6/download -> h2-0.3.6.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hkdf/0.10.0/download -> hkdf-0.10.0.crate https://crates.io/api/v1/crates/hmac/0.10.1/download -> hmac-0.10.1.crate https://crates.io/api/v1/crates/http/0.2.5/download -> http-0.2.5.crate https://crates.io/api/v1/crates/http-body/0.4.3/download -> http-body-0.4.3.crate https://crates.io/api/v1/crates/httparse/1.5.1/download -> httparse-1.5.1.crate https://crates.io/api/v1/crates/httpdate/1.0.1/download -> httpdate-1.0.1.crate https://crates.io/api/v1/crates/human-panic/1.0.3/download -> human-panic-1.0.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/hyper/0.14.13/download -> hyper-0.14.13.crate https://crates.io/api/v1/crates/hyper-rustls/0.22.1/download -> hyper-rustls-0.22.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/indoc/1.0.3/download -> indoc-1.0.3.crate https://crates.io/api/v1/crates/ipnet/2.3.1/download -> ipnet-2.3.1.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/js-sys/0.3.55/download -> js-sys-0.3.55.crate https://crates.io/api/v1/crates/keyring/0.10.1/download -> keyring-0.10.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.103/download -> libc-0.2.103.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mailparse/0.13.6/download -> mailparse-0.13.6.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.3/download -> mime_guess-2.0.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.7.13/download -> mio-0.7.13.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num/0.3.1/download -> num-0.3.1.crate https://crates.io/api/v1/crates/num-bigint/0.3.3/download -> num-bigint-0.3.3.crate https://crates.io/api/v1/crates/num-complex/0.3.1/download -> num-complex-0.3.1.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/object/0.26.2/download -> object-0.26.2.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/os_type/2.3.0/download -> os_type-2.3.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.7/download -> pin-project-lite-0.2.7.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.20/download -> pkg-config-0.3.20.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/0.1.0/download -> platform-info-0.1.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/pretty_env_logger/0.4.0/download -> pretty_env_logger-0.4.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro-nested/0.1.7/download -> proc-macro-nested-0.1.7.crate https://crates.io/api/v1/crates/proc-macro2/1.0.30/download -> proc-macro2-1.0.30.crate https://crates.io/api/v1/crates/pyproject-toml/0.2.0/download -> pyproject-toml-0.2.0.crate https://crates.io/api/v1/crates/python-pkginfo/0.5.0/download -> python-pkginfo-0.5.0.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.10/download -> quote-1.0.10.crate https://crates.io/api/v1/crates/quoted_printable/0.4.3/download -> quoted_printable-0.4.3.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.11.5/download -> reqwest-0.11.5.crate https://crates.io/api/v1/crates/rfc2047-decoder/0.1.2/download -> rfc2047-decoder-0.1.2.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rpassword/5.0.1/download -> rpassword-5.0.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustls/0.19.1/download -> rustls-0.19.1.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scroll/0.10.2/download -> scroll-0.10.2.crate https://crates.io/api/v1/crates/scroll_derive/0.10.5/download -> scroll_derive-0.10.5.crate https://crates.io/api/v1/crates/sct/0.6.1/download -> sct-0.6.1.crate https://crates.io/api/v1/crates/secret-service/1.1.3/download -> secret-service-1.1.3.crate https://crates.io/api/v1/crates/security-framework/0.4.4/download -> security-framework-0.4.4.crate https://crates.io/api/v1/crates/security-framework-sys/0.4.3/download -> security-framework-sys-0.4.3.crate https://crates.io/api/v1/crates/semver/1.0.4/download -> semver-1.0.4.crate https://crates.io/api/v1/crates/serde/1.0.130/download -> serde-1.0.130.crate https://crates.io/api/v1/crates/serde_derive/1.0.130/download -> serde_derive-1.0.130.crate https://crates.io/api/v1/crates/serde_json/1.0.68/download -> serde_json-1.0.68.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.0/download -> serde_urlencoded-0.7.0.crate https://crates.io/api/v1/crates/sha2/0.9.8/download -> sha2-0.9.8.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/slab/0.4.4/download -> slab-0.4.4.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.2/download -> socket2-0.4.2.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.23/download -> structopt-0.3.23.crate https://crates.io/api/v1/crates/structopt-derive/0.4.16/download -> structopt-derive-0.4.16.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.80/download -> syn-1.0.80.crate https://crates.io/api/v1/crates/tar/0.4.37/download -> tar-0.4.37.crate https://crates.io/api/v1/crates/target-lexicon/0.12.2/download -> target-lexicon-0.12.2.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/textwrap/0.14.2/download -> textwrap-0.14.2.crate https://crates.io/api/v1/crates/thiserror/1.0.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.5.0/download -> tinyvec-1.5.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tokio/1.12.0/download -> tokio-1.12.0.crate https://crates.io/api/v1/crates/tokio-rustls/0.22.0/download -> tokio-rustls-0.22.0.crate https://crates.io/api/v1/crates/tokio-util/0.6.8/download -> tokio-util-0.6.8.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.29/download -> tracing-0.1.29.crate https://crates.io/api/v1/crates/tracing-core/0.1.21/download -> tracing-core-0.1.21.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/typenum/1.14.0/download -> typenum-1.14.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.7/download -> unicode-bidi-0.3.7.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.2/download -> unicode-linebreak-0.1.2.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.7/download -> unindent-0.1.7.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.2.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.78/download -> wasm-bindgen-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.78/download -> wasm-bindgen-backend-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.28/download -> wasm-bindgen-futures-0.4.28.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.78/download -> wasm-bindgen-macro-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.78/download -> wasm-bindgen-macro-support-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.78/download -> wasm-bindgen-shared-0.2.78.crate https://crates.io/api/v1/crates/web-sys/0.3.55/download -> web-sys-0.3.55.crate https://crates.io/api/v1/crates/webpki/0.21.4/download -> webpki-0.21.4.crate https://crates.io/api/v1/crates/webpki-roots/0.21.1/download -> webpki-roots-0.21.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winreg/0.7.0/download -> winreg-0.7.0.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/zip/0.5.13/download -> zip-0.5.13.crate test? ( https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.11/download -> instant-0.1.11.crate https://crates.io/api/v1/crates/lock_api/0.4.5/download -> lock_api-0.4.5.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/proc-macro2/1.0.29/download -> proc-macro2-1.0.29.crate https://crates.io/api/v1/crates/pyo3/0.14.5/download -> pyo3-0.14.5.crate https://crates.io/api/v1/crates/pyo3-build-config/0.14.5/download -> pyo3-build-config-0.14.5.crate https://crates.io/api/v1/crates/pyo3-macros/0.14.5/download -> pyo3-macros-0.14.5.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.14.5/download -> pyo3-macros-backend-0.14.5.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.7.0/download -> smallvec-1.7.0.crate )
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=33dac4935657aa1581aa157e876aefc3
diff --git a/metadata/md5-cache/dev-util/meson-0.59.1-r1 b/metadata/md5-cache/dev-util/meson-0.59.1-r1
index 0e61b50fb138..e93991a62209 100644
--- a/metadata/md5-cache/dev-util/meson-0.59.1-r1
+++ b/metadata/md5-cache/dev-util/meson-0.59.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Open source build system
 EAPI=7
 HOMEPAGE=https://mesonbuild.com/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.59.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=81ab899f5f5607e4339bb75439303f34
+_md5_=3e5ae1a8f59416c4eb5c6b5a710a0218
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.2-r1 b/metadata/md5-cache/dev-util/ninja-1.10.2-r1
index 283be064cf53..1a09962446a6 100644
--- a/metadata/md5-cache/dev-util/ninja-1.10.2-r1
+++ b/metadata/md5-cache/dev-util/ninja-1.10.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
 DEFINED_PHASES=compile install postinst postrm setup test
 DESCRIPTION=A small build system similar to make
 EAPI=7
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.2.tar.gz -> ninja-1.10.2.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3718dd89b95c34334e2addf9eac9d69a
+_md5_=04a40155ac32bfda12e85372a746bf56
diff --git a/metadata/md5-cache/dev-util/ninja-9999 b/metadata/md5-cache/dev-util/ninja-9999
index 1db9091ad212..4064ddd7dbe6 100644
--- a/metadata/md5-cache/dev-util/ninja-9999
+++ b/metadata/md5-cache/dev-util/ninja-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst postrm setup test unpack
 DESCRIPTION=A small build system similar to make
 EAPI=7
@@ -10,4 +10,4 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=139af70ef1ff78e1e66d5793dec1a9f2
+_md5_=d4264d394a19b9d37cc395bf0bb6605c
diff --git a/metadata/md5-cache/dev-util/oprofile-1.4.0 b/metadata/md5-cache/dev-util/oprofile-1.4.0
index 8ed7b4b4af4a..7be8ffb02ac4 100644
--- a/metadata/md5-cache/dev-util/oprofile-1.4.0
+++ b/metadata/md5-cache/dev-util/oprofile-1.4.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs:= elibc_glibc? ( >=sys-libs/glibc-2.3.2-r1 ) ppc64? ( dev-libs/libpfm ) acct-user/oprofile acct-group/oprofile java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-1.4.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e41886d380c5bda8aa0eaf2ef80f2a95
diff --git a/metadata/md5-cache/dev-util/ostree-2019.5-r2 b/metadata/md5-cache/dev-util/ostree-2019.5-r2
deleted file mode 100644
index 1994f2678c86..000000000000
--- a/metadata/md5-cache/dev-util/ostree-2019.5-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils sys-devel/flex sys-devel/bison virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=archive? ( app-arch/libarchive:= ) app-crypt/gpgme app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup:2.4 ) dev-libs/libassuan dev-libs/libgpg-error dev-libs/glib:2 dracut? ( sys-kernel/dracut ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( dev-util/gtk-doc )
-DESCRIPTION=Operating system and container binary deployment and upgrades
-EAPI=7
-HOMEPAGE=https://ostree.readthedocs.io/en/latest/
-IUSE=archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl +soup systemd zeroconf
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=archive? ( app-arch/libarchive:= ) app-crypt/gpgme app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup:2.4 ) dev-libs/libassuan dev-libs/libgpg-error dev-libs/glib:2 dracut? ( sys-kernel/dracut ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] )
-REQUIRED_USE=httpd? ( || ( curl soup ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2019.5/libostree-2019.5.tar.xz -> ostree-2019.5.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=accad7199be34dfd1826a6d7bbe858f1
diff --git a/metadata/md5-cache/dev-util/ostree-2020.6-r2 b/metadata/md5-cache/dev-util/ostree-2020.6-r2
deleted file mode 100644
index aa9688dca441..000000000000
--- a/metadata/md5-cache/dev-util/ostree-2020.6-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils sys-devel/flex sys-devel/bison virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=archive? ( app-arch/libarchive:= ) app-crypt/gpgme app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup:2.4 ) dev-libs/libassuan dev-libs/libgpg-error dev-libs/glib:2 dracut? ( sys-kernel/dracut ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( dev-util/gtk-doc )
-DESCRIPTION=Operating system and container binary deployment and upgrades
-EAPI=7
-HOMEPAGE=https://ostree.readthedocs.io/en/latest/
-IUSE=archive curl doc dracut gnutls grub http2 httpd introspection libmount selinux ssl +soup systemd zeroconf
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=archive? ( app-arch/libarchive:= ) app-crypt/gpgme app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup:2.4 ) dev-libs/libassuan dev-libs/libgpg-error dev-libs/glib:2 dracut? ( sys-kernel/dracut ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] )
-REQUIRED_USE=httpd? ( || ( curl soup ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2020.6/libostree-2020.6.tar.xz -> ostree-2020.6.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c4aee48ef93185485538bceff1388af0
diff --git a/metadata/md5-cache/dev-util/ostree-2020.7-r2 b/metadata/md5-cache/dev-util/ostree-2020.7-r2
deleted file mode 100644
index cc01e8a667e9..000000000000
--- a/metadata/md5-cache/dev-util/ostree-2020.7-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils sys-devel/flex sys-devel/bison virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=archive? ( app-arch/libarchive:= ) app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup:2.4 ) dev-libs/libassuan dev-libs/glib:2 dracut? ( sys-kernel/dracut ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) sodium? ( >=dev-libs/libsodium-1.0.14:= ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( dev-util/gtk-doc )
-DESCRIPTION=Operating system and container binary deployment and upgrades
-EAPI=7
-HOMEPAGE=https://ostreedev.github.io/ostree/
-IUSE=archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=archive? ( app-arch/libarchive:= ) app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup:2.4 ) dev-libs/libassuan dev-libs/glib:2 dracut? ( sys-kernel/dracut ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) sodium? ( >=dev-libs/libsodium-1.0.14:= ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] )
-REQUIRED_USE=httpd? ( || ( curl soup ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2020.7/libostree-2020.7.tar.xz -> ostree-2020.7.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=562351a308fd8f72852a3f3d9df00871
diff --git a/metadata/md5-cache/dev-util/ostree-2020.8-r2 b/metadata/md5-cache/dev-util/ostree-2020.8-r2
deleted file mode 100644
index 7cd87218e457..000000000000
--- a/metadata/md5-cache/dev-util/ostree-2020.8-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils sys-devel/flex sys-devel/bison virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=archive? ( app-arch/libarchive:= ) app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup:2.4 ) dev-libs/libassuan dev-libs/glib:2 dracut? ( sys-kernel/dracut ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) sodium? ( >=dev-libs/libsodium-1.0.14:= ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( dev-util/gtk-doc )
-DESCRIPTION=Operating system and container binary deployment and upgrades
-EAPI=7
-HOMEPAGE=https://ostreedev.github.io/ostree/
-IUSE=archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=archive? ( app-arch/libarchive:= ) app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup:2.4 ) dev-libs/libassuan dev-libs/glib:2 dracut? ( sys-kernel/dracut ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) sodium? ( >=dev-libs/libsodium-1.0.14:= ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] )
-REQUIRED_USE=httpd? ( || ( curl soup ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2020.8/libostree-2020.8.tar.xz -> ostree-2020.8.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f7bfb588a6b225e379def915ae8dc28f
diff --git a/metadata/md5-cache/dev-util/ostree-2021.3-r2 b/metadata/md5-cache/dev-util/ostree-2021.3-r2
index 3978daa0d472..1c31d684e7b5 100644
--- a/metadata/md5-cache/dev-util/ostree-2021.3-r2
+++ b/metadata/md5-cache/dev-util/ostree-2021.3-r2
@@ -8,9 +8,9 @@ IUSE=archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=archive? ( app-arch/libarchive:= ) app-arch/xz-utils curl? ( net-misc/curl ) soup? ( net-libs/libsoup:2.4 ) dev-libs/libassuan dev-libs/glib:2 dracut? ( sys-kernel/dracut ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) >=sys-fs/fuse-2.9.2:0 sys-libs/zlib libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) sodium? ( >=dev-libs/libsodium-1.0.14:= ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] )
-REQUIRED_USE=httpd? ( || ( curl soup ) )
+REQUIRED_USE=dracut? ( systemd ) httpd? ( || ( curl soup ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2021.3/libostree-2021.3.tar.xz -> ostree-2021.3.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c7e3b5787b170ff712af6ee89b1616a8
+_md5_=46bd858e7f6372f5fb86969480e3b6ee
diff --git a/metadata/md5-cache/dev-util/ostree-2021.4 b/metadata/md5-cache/dev-util/ostree-2021.4
deleted file mode 100644
index 3da040f69789..000000000000
--- a/metadata/md5-cache/dev-util/ostree-2021.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils sys-devel/flex sys-devel/bison virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=app-arch/xz-utils dev-libs/libassuan dev-libs/glib:2 >=sys-fs/fuse-2.9.2:0 sys-libs/zlib archive? ( app-arch/libarchive:= ) curl? ( net-misc/curl ) dracut? ( sys-kernel/dracut ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) sodium? ( >=dev-libs/libsodium-1.0.14:= ) soup? ( net-libs/libsoup:2.4 ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( dev-util/gtk-doc )
-DESCRIPTION=Operating system and container binary deployment and upgrades
-EAPI=7
-HOMEPAGE=https://ostreedev.github.io/ostree/
-IUSE=archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=app-arch/xz-utils dev-libs/libassuan dev-libs/glib:2 >=sys-fs/fuse-2.9.2:0 sys-libs/zlib archive? ( app-arch/libarchive:= ) curl? ( net-misc/curl ) dracut? ( sys-kernel/dracut ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) sodium? ( >=dev-libs/libsodium-1.0.14:= ) soup? ( net-libs/libsoup:2.4 ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] )
-REQUIRED_USE=http2? ( curl ) httpd? ( || ( curl soup ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2021.4/libostree-2021.4.tar.xz -> ostree-2021.4.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4c6d2c24f470f167dcec59ba3b6eb22e
diff --git a/metadata/md5-cache/dev-util/ostree-2021.4-r1 b/metadata/md5-cache/dev-util/ostree-2021.4-r1
new file mode 100644
index 000000000000..2a9543f0b334
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ostree-2021.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils sys-devel/flex sys-devel/bison virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=app-arch/xz-utils dev-libs/libassuan dev-libs/glib:2 >=sys-fs/fuse-2.9.2:0 sys-libs/zlib archive? ( app-arch/libarchive:= ) curl? ( net-misc/curl ) dracut? ( sys-kernel/dracut ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) sodium? ( >=dev-libs/libsodium-1.0.14:= ) soup? ( net-libs/libsoup:2.4 ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( dev-util/gtk-doc )
+DESCRIPTION=Operating system and container binary deployment and upgrades
+EAPI=7
+HOMEPAGE=https://ostreedev.github.io/ostree/
+IUSE=archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=app-arch/xz-utils dev-libs/libassuan dev-libs/glib:2 >=sys-fs/fuse-2.9.2:0 sys-libs/zlib archive? ( app-arch/libarchive:= ) curl? ( net-misc/curl ) dracut? ( sys-kernel/dracut ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) sodium? ( >=dev-libs/libsodium-1.0.14:= ) soup? ( net-libs/libsoup:2.4 ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] )
+REQUIRED_USE=dracut? ( systemd ) http2? ( curl ) httpd? ( || ( curl soup ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2021.4/libostree-2021.4.tar.xz -> ostree-2021.4.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ef8ac524e7b095f7811ecfc787d30d83
diff --git a/metadata/md5-cache/dev-util/patdiff-0.14.0 b/metadata/md5-cache/dev-util/patdiff-0.14.0
deleted file mode 100644
index 3c5f60d85c74..000000000000
--- a/metadata/md5-cache/dev-util/patdiff-0.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Colored patience diffs with word-level refinement
-EAPI=7
-HOMEPAGE=https://github.com/janestreet/patdiff
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/ocaml-4.08.0:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/patience_diff:0/0.14 dev-ml/ppx_jane:= dev-ml/pcre-ocaml:= >=dev-ml/re-1.8.0 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0
-SRC_URI=https://github.com/janestreet/patdiff/archive/v0.14.0.tar.gz -> patdiff-0.14.0.tar.gz
-_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
-_md5_=8a0f287d86f21b3319168753e8a14a90
diff --git a/metadata/md5-cache/dev-util/patdiff-0.14.0-r1 b/metadata/md5-cache/dev-util/patdiff-0.14.0-r1
new file mode 100644
index 000000000000..1ef861feb902
--- /dev/null
+++ b/metadata/md5-cache/dev-util/patdiff-0.14.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4.08.0:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/patience_diff:0/0.14 dev-ml/ppx_jane:= dev-ml/pcre-ocaml:= >=dev-ml/re-1.8.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Colored patience diffs with word-level refinement
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/patdiff
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/ocaml-4.08.0:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/patience_diff:0/0.14 dev-ml/ppx_jane:= dev-ml/pcre-ocaml:= >=dev-ml/re-1.8.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0
+SRC_URI=https://github.com/janestreet/patdiff/archive/v0.14.0.tar.gz -> patdiff-0.14.0.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=a4d838f220a9ced37cfe3047cfa66bcc
diff --git a/metadata/md5-cache/dev-util/perf-5.10.16 b/metadata/md5-cache/dev-util/perf-5.10.16
index 0172d0210b7d..fc1401170e52 100644
--- a/metadata/md5-cache/dev-util/perf-5.10.16
+++ b/metadata/md5-cache/dev-util/perf-5.10.16
@@ -11,5 +11,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sy
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.16.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ff4b008c649a90f3a3d164f677b6eee8
diff --git a/metadata/md5-cache/dev-util/perf-5.11 b/metadata/md5-cache/dev-util/perf-5.11
index caabdb380281..0ad4d64f2da0 100644
--- a/metadata/md5-cache/dev-util/perf-5.11
+++ b/metadata/md5-cache/dev-util/perf-5.11
@@ -11,5 +11,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sy
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e6110d2d7d91e7826e6f35c8f19015eb
diff --git a/metadata/md5-cache/dev-util/perf-5.12 b/metadata/md5-cache/dev-util/perf-5.12
index 5d5d04a6f549..1a2890c73446 100644
--- a/metadata/md5-cache/dev-util/perf-5.12
+++ b/metadata/md5-cache/dev-util/perf-5.12
@@ -11,5 +11,5 @@ RDEPEND=audit? ( sys-process/audit ) babeltrace? ( dev-util/babeltrace ) crypt?
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f41c1d7f62ba4343c54c8bc4dbf0b934
diff --git a/metadata/md5-cache/dev-util/perf-5.8 b/metadata/md5-cache/dev-util/perf-5.8
index b7c4a2097591..e8af272dc73e 100644
--- a/metadata/md5-cache/dev-util/perf-5.8
+++ b/metadata/md5-cache/dev-util/perf-5.8
@@ -10,5 +10,5 @@ RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( <sy
 REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c24843544e3419ec451e83f497a3db5
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.1.9 b/metadata/md5-cache/dev-util/pkgdev-0.1.9
index cf48f3049b66..35cc64633897 100644
--- a/metadata/md5-cache/dev-util/pkgdev-0.1.9
+++ b/metadata/md5-cache/dev-util/pkgdev-0.1.9
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of tools for Gentoo development
 EAPI=8
 HOMEPAGE=https://github.com/pkgcore/pkgdev
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
 LICENSE=BSD MIT
 RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/pkgcheck-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgdev/pkgdev-0.1.9.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ac0742df5185a0d15ea7a014deb1e526
+_md5_=caaef9b70b6d4b425ddadb0337190290
diff --git a/metadata/md5-cache/dev-util/ply-2.1.1-r1 b/metadata/md5-cache/dev-util/ply-2.1.1-r1
index ff177c3c0029..fe93c0989363 100644
--- a/metadata/md5-cache/dev-util/ply-2.1.1-r1
+++ b/metadata/md5-cache/dev-util/ply-2.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-boot/plymouth
 SLOT=0
 SRC_URI=https://github.com/iovisor/ply/archive/2.1.1.tar.gz -> ply-2.1.1.tar.gz https://github.com/iovisor/ply/commit/1bc183af8703023e377f92716ecd3f339ffffd11.patch -> ply-2.1.1-arm-build-fix.patch
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6ee8cc0fcb41190a4efed1aa2e684a2b
diff --git a/metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8-r1 b/metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8-r1
index 24606d4e9efc..f52e1f54b643 100644
--- a/metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8-r1
+++ b/metadata/md5-cache/dev-util/protobuf-cucumber-3.10.8-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Google Protocol Buffers serialization and RPC implementation for Rub
 EAPI=8
 HOMEPAGE=https://github.com/ruby-protobuf/protobuf
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/activesupport-3.2:*[ruby_targets_ruby26(-)] dev-ruby/middleware[ruby_targets_ruby26(-)] dev-ruby/thor:*[ruby_targets_ruby26(-)] dev-ruby/thread_safe[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activesupport-3.2:*[ruby_targets_ruby27(-)] dev-ruby/middleware[ruby_targets_ruby27(-)] dev-ruby/thor:*[ruby_targets_ruby27(-)] dev-ruby/thread_safe[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/protobuf-cucumber-3.10.8.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b3c4b8ad4711ae377d1c598e769147db
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=891a3446f180373fce493eba51c5c46f
diff --git a/metadata/md5-cache/dev-util/rebar-bin-3.17.0 b/metadata/md5-cache/dev-util/rebar-bin-3.17.0
index 94aae3ecb5a9..f829482f08ff 100644
--- a/metadata/md5-cache/dev-util/rebar-bin-3.17.0
+++ b/metadata/md5-cache/dev-util/rebar-bin-3.17.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
 EAPI=8
 HOMEPAGE=https://rebar3.org https://github.com/erlang/rebar3
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/erlang/rebar3/releases/download/3.17.0/rebar3 -> rebar-bin-3.17.0
-_md5_=75e0136986a20751ec2fac1729632078
+_md5_=e0b2a194121ade60987f619dabd39673
diff --git a/metadata/md5-cache/dev-util/regexxer-0.10-r1 b/metadata/md5-cache/dev-util/regexxer-0.10-r1
index 63299fde71e4..be7aa4448bdb 100644
--- a/metadata/md5-cache/dev-util/regexxer-0.10-r1
+++ b/metadata/md5-cache/dev-util/regexxer-0.10-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-cpp/glibmm-2.28:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-util/intltool virtual/pkgconfig sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+BDEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=An interactive tool for performing search and replace operations
-EAPI=5
+EAPI=7
 HOMEPAGE=http://regexxer.sourceforge.net/
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-cpp/glibmm-2.28:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0
+RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0
 SLOT=0
 SRC_URI=mirror://sourceforge/regexxer/regexxer-0.10.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f2c9df757c7e28e1fa11702c9c8d7191
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7179ff7f9eca8f7c79664be0f048387f
diff --git a/metadata/md5-cache/dev-util/rizin-0.2.1 b/metadata/md5-cache/dev-util/rizin-0.2.1
deleted file mode 100644
index a3fa7bb94d17..000000000000
--- a/metadata/md5-cache/dev-util/rizin-0.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-apps/file app-arch/lz4:0= dev-libs/capstone:0= dev-libs/libuv:0= dev-libs/libzip:0= dev-libs/openssl:0= >=dev-libs/tree-sitter-0.19.0 dev-libs/xxhash sys-libs/zlib:0=
-DESCRIPTION=reverse engineering framework for binary analysis
-EAPI=7
-HOMEPAGE=https://rizin.re/
-IUSE=test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0 BSD LGPL-3 MIT
-RDEPEND=sys-apps/file app-arch/lz4:0= dev-libs/capstone:0= dev-libs/libuv:0= dev-libs/libzip:0= dev-libs/openssl:0= >=dev-libs/tree-sitter-0.19.0 dev-libs/xxhash sys-libs/zlib:0=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rizinorg/rizin/releases/download/v0.2.1/rizin-src-v0.2.1.tar.xz test? ( https://github.com/rizinorg/rizin-testbins/archive/a80fd0d56d538d07a05ef01e29c8cb430a4f9d72.tar.gz -> rizin-testbins-a80fd0d56d538d07a05ef01e29c8cb430a4f9d72.tar.gz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c2c0bd97c7fb4c4b3f56214f5d1ed484
diff --git a/metadata/md5-cache/dev-util/rr-5.5.0 b/metadata/md5-cache/dev-util/rr-5.5.0
index d582a6e4597e..bd8a42e2b569 100644
--- a/metadata/md5-cache/dev-util/rr-5.5.0
+++ b/metadata/md5-cache/dev-util/rr-5.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mozilla/rr/archive/5.5.0.tar.gz -> mozilla-rr-5.5.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=38aa820c7f5346c77573f26f87bd4dc0
diff --git a/metadata/md5-cache/dev-util/sccache-0.2.15 b/metadata/md5-cache/dev-util/sccache-0.2.15
index f301befb5367..d1621fc8f968 100644
--- a/metadata/md5-cache/dev-util/sccache-0.2.15
+++ b/metadata/md5-cache/dev-util/sccache-0.2.15
@@ -11,4 +11,4 @@ RDEPEND=app-arch/zstd dist-server? ( dev-libs/openssl:0= ) gcs? ( dev-libs/opens
 SLOT=0
 SRC_URI=https://github.com/mozilla/sccache/archive/v0.2.15.tar.gz -> sccache-0.2.15.tar.gz https://crates.io/api/v1/crates/addr2line/0.14.1/download -> addr2line-0.14.1.crate https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.37/download -> anyhow-1.0.37.crate https://crates.io/api/v1/crates/ar/0.8.0/download -> ar-0.8.0.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/ascii/0.8.7/download -> ascii-0.8.7.crate https://crates.io/api/v1/crates/assert_cmd/1.0.2/download -> assert_cmd-1.0.2.crate https://crates.io/api/v1/crates/async-channel/1.5.1/download -> async-channel-1.5.1.crate https://crates.io/api/v1/crates/async-executor/1.4.0/download -> async-executor-1.4.0.crate https://crates.io/api/v1/crates/async-global-executor/1.4.3/download -> async-global-executor-1.4.3.crate https://crates.io/api/v1/crates/async-io/1.3.1/download -> async-io-1.3.1.crate https://crates.io/api/v1/crates/async-mutex/1.4.0/download -> async-mutex-1.4.0.crate https://crates.io/api/v1/crates/async-std/1.8.0/download -> async-std-1.8.0.crate https://crates.io/api/v1/crates/async-task/4.0.3/download -> async-task-4.0.3.crate https://crates.io/api/v1/crates/async-trait/0.1.42/download -> async-trait-0.1.42.crate https://crates.io/api/v1/crates/atomic-waker/1.0.0/download -> atomic-waker-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.55/download -> backtrace-0.3.55.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bincode/0.8.0/download -> bincode-0.8.0.crate https://crates.io/api/v1/crates/bincode/1.3.1/download -> bincode-1.3.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/blake3/0.3.7/download -> blake3-0.3.7.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/blocking/1.0.2/download -> blocking-1.0.2.crate https://crates.io/api/v1/crates/boxfnonce/0.1.1/download -> boxfnonce-0.1.1.crate https://crates.io/api/v1/crates/buf_redux/0.8.4/download -> buf_redux-0.8.4.crate https://crates.io/api/v1/crates/bufstream/0.1.4/download -> bufstream-0.1.4.crate https://crates.io/api/v1/crates/bumpalo/3.4.0/download -> bumpalo-3.4.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.crate https://crates.io/api/v1/crates/bytes/0.5.6/download -> bytes-0.5.6.crate https://crates.io/api/v1/crates/bytes/1.0.0/download -> bytes-1.0.0.crate https://crates.io/api/v1/crates/cache-padded/1.1.1/download -> cache-padded-1.1.1.crate https://crates.io/api/v1/crates/case/0.1.0/download -> case-0.1.0.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/chunked_transfer/0.3.1/download -> chunked_transfer-0.3.1.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/combine/4.5.2/download -> combine-4.5.2.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/conhash/0.4.0/download -> conhash-0.4.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/cookie/0.12.0/download -> cookie-0.12.0.crate https://crates.io/api/v1/crates/cookie_store/0.7.0/download -> cookie_store-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/counted-array/0.1.2/download -> counted-array-0.1.2.crate https://crates.io/api/v1/crates/cpuid-bool/0.1.2/download -> cpuid-bool-0.1.2.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.1.2/download -> crossbeam-queue-0.1.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.3/download -> crossbeam-queue-0.2.3.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/crypto-mac/0.10.0/download -> crypto-mac-0.10.0.crate https://crates.io/api/v1/crates/crypto-mac/0.8.0/download -> crypto-mac-0.8.0.crate https://crates.io/api/v1/crates/daemonize/0.4.1/download -> daemonize-0.4.1.crate https://crates.io/api/v1/crates/derive-error/0.0.3/download -> derive-error-0.0.3.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/directories/3.0.1/download -> directories-3.0.1.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dtoa/0.4.7/download -> dtoa-0.4.7.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encoding_rs/0.8.26/download -> encoding_rs-0.8.26.crate https://crates.io/api/v1/crates/env_logger/0.8.2/download -> env_logger-0.8.2.crate https://crates.io/api/v1/crates/error-chain/0.12.4/download -> error-chain-0.12.4.crate https://crates.io/api/v1/crates/event-listener/2.5.1/download -> event-listener-2.5.1.crate https://crates.io/api/v1/crates/failure/0.1.8/download -> failure-0.1.8.crate https://crates.io/api/v1/crates/failure_derive/0.1.8/download -> failure_derive-0.1.8.crate https://crates.io/api/v1/crates/fastrand/1.4.0/download -> fastrand-1.4.0.crate https://crates.io/api/v1/crates/filetime/0.2.13/download -> filetime-0.2.13.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.0/download -> form_urlencoded-1.0.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.30/download -> futures-0.1.30.crate https://crates.io/api/v1/crates/futures/0.3.9/download -> futures-0.3.9.crate https://crates.io/api/v1/crates/futures-channel/0.3.9/download -> futures-channel-0.3.9.crate https://crates.io/api/v1/crates/futures-core/0.3.9/download -> futures-core-0.3.9.crate https://crates.io/api/v1/crates/futures-cpupool/0.1.8/download -> futures-cpupool-0.1.8.crate https://crates.io/api/v1/crates/futures-executor/0.3.9/download -> futures-executor-0.3.9.crate https://crates.io/api/v1/crates/futures-io/0.3.9/download -> futures-io-0.3.9.crate https://crates.io/api/v1/crates/futures-lite/1.11.3/download -> futures-lite-1.11.3.crate https://crates.io/api/v1/crates/futures-macro/0.3.9/download -> futures-macro-0.3.9.crate https://crates.io/api/v1/crates/futures-sink/0.3.9/download -> futures-sink-0.3.9.crate https://crates.io/api/v1/crates/futures-task/0.3.9/download -> futures-task-0.3.9.crate https://crates.io/api/v1/crates/futures-util/0.3.9/download -> futures-util-0.3.9.crate https://crates.io/api/v1/crates/generic-array/0.14.4/download -> generic-array-0.14.4.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/gimli/0.23.0/download -> gimli-0.23.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/gloo-timers/0.2.1/download -> gloo-timers-0.2.1.crate https://crates.io/api/v1/crates/h2/0.1.26/download -> h2-0.1.26.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/hmac/0.10.1/download -> hmac-0.10.1.crate https://crates.io/api/v1/crates/http/0.1.21/download -> http-0.1.21.crate https://crates.io/api/v1/crates/httparse/1.3.4/download -> httparse-1.3.4.crate https://crates.io/api/v1/crates/http-body/0.1.0/download -> http-body-0.1.0.crate https://crates.io/api/v1/crates/humantime/2.0.1/download -> humantime-2.0.1.crate https://crates.io/api/v1/crates/hyper/0.12.35/download -> hyper-0.12.35.crate https://crates.io/api/v1/crates/hyper-tls/0.3.2/download -> hyper-tls-0.3.2.crate https://crates.io/api/v1/crates/hyperx/0.12.0/download -> hyperx-0.12.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/indexmap/1.6.1/download -> indexmap-1.6.1.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.10.0/download -> itertools-0.10.0.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itoa/0.3.4/download -> itoa-0.3.4.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/jsonwebtoken/7.2.0/download -> jsonwebtoken-7.2.0.crate https://crates.io/api/v1/crates/js-sys/0.3.46/download -> js-sys-0.3.46.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/kv-log-macro/1.0.7/download -> kv-log-macro-1.0.7.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.82/download -> libc-0.2.82.crate https://crates.io/api/v1/crates/libmount/0.1.15/download -> libmount-0.1.15.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/local-encoding/0.2.0/download -> local-encoding-0.2.0.crate https://crates.io/api/v1/crates/lock_api/0.3.4/download -> lock_api-0.3.4.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/md5/0.3.8/download -> md5-0.3.8.crate https://crates.io/api/v1/crates/md-5/0.9.1/download -> md-5-0.9.1.crate https://crates.io/api/v1/crates/memcached-rs/0.4.2/download -> memcached-rs-0.4.2.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memoffset/0.5.6/download -> memoffset-0.5.6.crate https://crates.io/api/v1/crates/mime/0.2.6/download -> mime-0.2.6.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/1.8.8/download -> mime_guess-1.8.8.crate https://crates.io/api/v1/crates/mime_guess/2.0.3/download -> mime_guess-2.0.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.7/download -> mio-named-pipes-0.1.7.crate https://crates.io/api/v1/crates/mio-uds/0.6.8/download -> mio-uds-0.6.8.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/miow/0.3.6/download -> miow-0.3.6.crate https://crates.io/api/v1/crates/multipart/0.15.4/download -> multipart-0.15.4.crate https://crates.io/api/v1/crates/native-tls/0.2.7/download -> native-tls-0.2.7.crate https://crates.io/api/v1/crates/nb-connect/1.0.2/download -> nb-connect-1.0.2.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nix/0.14.1/download -> nix-0.14.1.crate https://crates.io/api/v1/crates/nix/0.19.1/download -> nix-0.19.1.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/num-bigint/0.2.6/download -> num-bigint-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.1.43/download -> num-traits-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/object/0.22.0/download -> object-0.22.0.crate https://crates.io/api/v1/crates/once_cell/1.5.2/download -> once_cell-1.5.2.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.32/download -> openssl-0.10.32.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.60/download -> openssl-sys-0.9.60.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.9.0/download -> parking_lot-0.9.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.6.2/download -> parking_lot_core-0.6.2.crate https://crates.io/api/v1/crates/pem/0.8.2/download -> pem-0.8.2.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.7.24/download -> phf-0.7.24.crate https://crates.io/api/v1/crates/phf_codegen/0.7.24/download -> phf_codegen-0.7.24.crate https://crates.io/api/v1/crates/phf_generator/0.7.24/download -> phf_generator-0.7.24.crate https://crates.io/api/v1/crates/phf_shared/0.7.24/download -> phf_shared-0.7.24.crate https://crates.io/api/v1/crates/pin-project-lite/0.1.11/download -> pin-project-lite-0.1.11.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.1/download -> pin-project-lite-0.2.1.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/polling/2.0.2/download -> polling-2.0.2.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/predicates/1.0.6/download -> predicates-1.0.6.crate https://crates.io/api/v1/crates/predicates-core/1.0.1/download -> predicates-core-1.0.1.crate https://crates.io/api/v1/crates/predicates-tree/1.0.1/download -> predicates-tree-1.0.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro-nested/0.1.6/download -> proc-macro-nested-0.1.6.crate https://crates.io/api/v1/crates/publicsuffix/1.5.4/download -> publicsuffix-1.5.4.crate https://crates.io/api/v1/crates/pulldown-cmark/0.0.3/download -> pulldown-cmark-0.0.3.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/1.0.8/download -> quote-1.0.8.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.5.6/download -> rand-0.5.6.crate https://crates.io/api/v1/crates/rand/0.6.5/download -> rand-0.6.5.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_jitter/0.1.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redis/0.17.0/download -> redis-0.17.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.4.2/download -> regex-1.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.21/download -> regex-syntax-0.6.21.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.9.24/download -> reqwest-0.9.24.crate https://crates.io/api/v1/crates/retry/1.2.0/download -> retry-1.2.0.crate https://crates.io/api/v1/crates/ring/0.16.19/download -> ring-0.16.19.crate https://crates.io/api/v1/crates/rouille/3.0.0/download -> rouille-3.0.0.crate https://crates.io/api/v1/crates/rust-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.18/download -> rustc-demangle-0.1.18.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/security-framework/2.0.0/download -> security-framework-2.0.0.crate https://crates.io/api/v1/crates/security-framework-sys/2.0.0/download -> security-framework-sys-2.0.0.crate https://crates.io/api/v1/crates/selenium-rs/0.1.2/download -> selenium-rs-0.1.2.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.118/download -> serde-1.0.118.crate https://crates.io/api/v1/crates/serde_derive/1.0.118/download -> serde_derive-1.0.118.crate https://crates.io/api/v1/crates/serde_json/1.0.61/download -> serde_json-1.0.61.crate https://crates.io/api/v1/crates/serde_urlencoded/0.5.5/download -> serde_urlencoded-0.5.5.crate https://crates.io/api/v1/crates/sha1/0.6.0/download -> sha1-0.6.0.crate https://crates.io/api/v1/crates/sha-1/0.9.2/download -> sha-1-0.9.2.crate https://crates.io/api/v1/crates/sha2/0.9.2/download -> sha2-0.9.2.crate https://crates.io/api/v1/crates/signal-hook-registry/1.3.0/download -> signal-hook-registry-1.3.0.crate https://crates.io/api/v1/crates/simple_asn1/0.4.1/download -> simple_asn1-0.4.1.crate https://crates.io/api/v1/crates/siphasher/0.2.3/download -> siphasher-0.2.3.crate https://crates.io/api/v1/crates/skeptic/0.4.0/download -> skeptic-0.4.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/0.6.13/download -> smallvec-0.6.13.crate https://crates.io/api/v1/crates/socket2/0.3.19/download -> socket2-0.3.19.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/string/0.2.1/download -> string-0.2.1.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/subtle/2.4.0/download -> subtle-2.4.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/1.0.58/download -> syn-1.0.58.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.12.4/download -> synstructure-0.12.4.crate https://crates.io/api/v1/crates/syslog/5.0.0/download -> syslog-5.0.0.crate https://crates.io/api/v1/crates/tar/0.4.30/download -> tar-0.4.30.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term/0.5.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.23/download -> thiserror-1.0.23.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.23/download -> thiserror-impl-1.0.23.crate https://crates.io/api/v1/crates/thread_local/1.1.0/download -> thread_local-1.1.0.crate https://crates.io/api/v1/crates/threadpool/1.8.1/download -> threadpool-1.8.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tiny_http/0.6.2/download -> tiny_http-0.6.2.crate https://crates.io/api/v1/crates/tinyvec/1.1.0/download -> tinyvec-1.1.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tokio/0.1.22/download -> tokio-0.1.22.crate https://crates.io/api/v1/crates/tokio/0.2.24/download -> tokio-0.2.24.crate https://crates.io/api/v1/crates/tokio-buf/0.1.1/download -> tokio-buf-0.1.1.crate https://crates.io/api/v1/crates/tokio-codec/0.1.2/download -> tokio-codec-0.1.2.crate https://crates.io/api/v1/crates/tokio-compat/0.1.6/download -> tokio-compat-0.1.6.crate https://crates.io/api/v1/crates/tokio-current-thread/0.1.7/download -> tokio-current-thread-0.1.7.crate https://crates.io/api/v1/crates/tokio-executor/0.1.10/download -> tokio-executor-0.1.10.crate https://crates.io/api/v1/crates/tokio-fs/0.1.7/download -> tokio-fs-0.1.7.crate https://crates.io/api/v1/crates/tokio-io/0.1.13/download -> tokio-io-0.1.13.crate https://crates.io/api/v1/crates/tokio-named-pipes/0.1.0/download -> tokio-named-pipes-0.1.0.crate https://crates.io/api/v1/crates/tokio-process/0.2.5/download -> tokio-process-0.2.5.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.12/download -> tokio-reactor-0.1.12.crate https://crates.io/api/v1/crates/tokio-serde/0.1.0/download -> tokio-serde-0.1.0.crate https://crates.io/api/v1/crates/tokio-serde-bincode/0.1.1/download -> tokio-serde-bincode-0.1.1.crate https://crates.io/api/v1/crates/tokio-signal/0.2.9/download -> tokio-signal-0.2.9.crate https://crates.io/api/v1/crates/tokio-sync/0.1.8/download -> tokio-sync-0.1.8.crate https://crates.io/api/v1/crates/tokio-tcp/0.1.4/download -> tokio-tcp-0.1.4.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.18/download -> tokio-threadpool-0.1.18.crate https://crates.io/api/v1/crates/tokio-timer/0.2.13/download -> tokio-timer-0.2.13.crate https://crates.io/api/v1/crates/tokio-udp/0.1.6/download -> tokio-udp-0.1.6.crate https://crates.io/api/v1/crates/tokio-uds/0.2.7/download -> tokio-uds-0.2.7.crate https://crates.io/api/v1/crates/tokio-util/0.3.1/download -> tokio-util-0.3.1.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tower/0.1.1/download -> tower-0.1.1.crate https://crates.io/api/v1/crates/tower-buffer/0.1.2/download -> tower-buffer-0.1.2.crate https://crates.io/api/v1/crates/tower-discover/0.1.0/download -> tower-discover-0.1.0.crate https://crates.io/api/v1/crates/tower-layer/0.1.0/download -> tower-layer-0.1.0.crate https://crates.io/api/v1/crates/tower-limit/0.1.3/download -> tower-limit-0.1.3.crate https://crates.io/api/v1/crates/tower-load-shed/0.1.0/download -> tower-load-shed-0.1.0.crate https://crates.io/api/v1/crates/tower-retry/0.1.0/download -> tower-retry-0.1.0.crate https://crates.io/api/v1/crates/tower-service/0.2.0/download -> tower-service-0.2.0.crate https://crates.io/api/v1/crates/tower-timeout/0.1.1/download -> tower-timeout-0.1.1.crate https://crates.io/api/v1/crates/tower-util/0.1.0/download -> tower-util-0.1.0.crate https://crates.io/api/v1/crates/tracing/0.1.22/download -> tracing-0.1.22.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.11/download -> tracing-attributes-0.1.11.crate https://crates.io/api/v1/crates/tracing-core/0.1.17/download -> tracing-core-0.1.17.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/try_from/0.3.2/download -> try_from-0.3.2.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/twoway/0.1.8/download -> twoway-0.1.8.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/unicase/1.4.2/download -> unicase-1.4.2.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.16/download -> unicode-normalization-0.1.16.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/unix_socket/0.5.0/download -> unix_socket-0.5.0.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/url/2.2.0/download -> url-2.2.0.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/uuid/0.7.4/download -> uuid-0.7.4.crate https://crates.io/api/v1/crates/uuid/0.8.1/download -> uuid-0.8.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec-arena/1.0.0/download -> vec-arena-1.0.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/version-compare/0.0.11/download -> version-compare-0.0.11.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/want/0.2.0/download -> want-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.69/download -> wasm-bindgen-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.69/download -> wasm-bindgen-backend-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.19/download -> wasm-bindgen-futures-0.4.19.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.69/download -> wasm-bindgen-macro-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.69/download -> wasm-bindgen-macro-support-0.2.69.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.69/download -> wasm-bindgen-shared-0.2.69.crate https://crates.io/api/v1/crates/web-sys/0.3.46/download -> web-sys-0.3.46.crate https://crates.io/api/v1/crates/wepoll-sys/3.0.1/download -> wepoll-sys-3.0.1.crate https://crates.io/api/v1/crates/which/4.0.2/download -> which-4.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/zip/0.5.9/download -> zip-0.5.9.crate https://crates.io/api/v1/crates/zstd/0.6.0+zstd.1.4.8/download -> zstd-0.6.0+zstd.1.4.8.crate https://crates.io/api/v1/crates/zstd-safe/3.0.0+zstd.1.4.8/download -> zstd-safe-3.0.0+zstd.1.4.8.crate https://crates.io/api/v1/crates/zstd-sys/1.4.19+zstd.1.4.8/download -> zstd-sys-1.4.19+zstd.1.4.8.crate
 _eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=89c7c714c056719e7f566f53e503ff48
+_md5_=d31468ff1cff2df6e1e403cbc392fe1f
diff --git a/metadata/md5-cache/dev-util/scons-4.2.0-r1 b/metadata/md5-cache/dev-util/scons-4.2.0-r1
index b7051fca4011..f83de91f3b66 100644
--- a/metadata/md5-cache/dev-util/scons-4.2.0-r1
+++ b/metadata/md5-cache/dev-util/scons-4.2.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Extensible Python-based build utility
 EAPI=8
 HOMEPAGE=https://www.scons.org/
 IUSE=doc test python_targets_python3_8 python_targets_python3_9
-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 ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/scons/scons/4.2.0/scons-4.2.0.tar.gz doc? ( https://www.scons.org/doc/4.2.0/PDF/scons-user.pdf -> scons-4.2.0-user.pdf https://www.scons.org/doc/4.2.0/HTML/scons-user.html -> scons-4.2.0-user.html ) test? ( https://github.com/scons/scons/archive/4.2.0.tar.gz -> scons-4.2.0.gh.tar.gz )
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3dc996b40628bea935efab2adea8aed5
+_md5_=df40a4f3556fe3ede6f26edda8122c7d
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0 b/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0
deleted file mode 100644
index 90bd7a07fe5c..000000000000
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/lit ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/clang:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=Bi-directional translator between SPIR-V and LLVM IR
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/SPIRV-LLVM-Translator
-IUSE=test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64
-LICENSE=UoI-NCSA
-RDEPEND=sys-devel/clang:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-REQUIRED_USE=test? ( tools )
-RESTRICT=!test? ( test )
-SLOT=10
-SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v10.0.0.tar.gz -> spirv-llvm-translator-10.0.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9a568572aa2f50096adf39144bfbe927
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0_p20200909 b/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0_p20200909
deleted file mode 100644
index 3738749081ca..000000000000
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0_p20200909
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/lit ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/clang:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=Bi-directional translator between SPIR-V and LLVM IR
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/SPIRV-LLVM-Translator
-IUSE=test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=UoI-NCSA
-RDEPEND=sys-devel/clang:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-REQUIRED_USE=test? ( tools )
-RESTRICT=test
-SLOT=10
-SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/4f1a3270f2431aa98f1bff30d1a32c9d8f4729bf.tar.gz -> spirv-llvm-translator-10.0.0_p20200909.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bcb41517ded20932fe9eb029489bfcd1
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-11.0.0 b/metadata/md5-cache/dev-util/spirv-llvm-translator-11.0.0
deleted file mode 100644
index 3582b41e8527..000000000000
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-11.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/lit ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/clang:11=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=Bi-directional translator between SPIR-V and LLVM IR
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/SPIRV-LLVM-Translator
-IUSE=test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=UoI-NCSA
-RDEPEND=sys-devel/clang:11=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-REQUIRED_USE=test? ( tools )
-RESTRICT=test
-SLOT=11
-SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/d6dc999eee381158a26f048a333467c9ce7e77f2.tar.gz -> spirv-llvm-translator-11.0.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8c2fe4b87f335b734a3afe12bc2496f9
diff --git a/metadata/md5-cache/dev-util/stripe-mock-0.103.0 b/metadata/md5-cache/dev-util/stripe-mock-0.103.0
deleted file mode 100644
index a9e49ea26bcf..000000000000
--- a/metadata/md5-cache/dev-util/stripe-mock-0.103.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=Mock HTTP server that responds like the real Stripe API
-EAPI=7
-HOMEPAGE=https://github.com/stripe/stripe-mock
-KEYWORDS=amd64 x86
-LICENSE=MIT ISC BSD-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/stripe/stripe-mock/archive/v0.103.0.tar.gz -> stripe-mock-0.103.0.tar.gz
-_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	f037bca330974d0c1a23c7390ddcba09	golang-vcs-snapshot	ee98df2c8a27c4347826db72f6dc2d50
-_md5_=edc7a7d9c151160b84af7379b6ae49f9
diff --git a/metadata/md5-cache/dev-util/stripe-mock-0.104.0 b/metadata/md5-cache/dev-util/stripe-mock-0.104.0
deleted file mode 100644
index 5e58ce521bcb..000000000000
--- a/metadata/md5-cache/dev-util/stripe-mock-0.104.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=Mock HTTP server that responds like the real Stripe API
-EAPI=7
-HOMEPAGE=https://github.com/stripe/stripe-mock
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT ISC BSD-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/stripe/stripe-mock/archive/v0.104.0.tar.gz -> stripe-mock-0.104.0.tar.gz
-_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	f037bca330974d0c1a23c7390ddcba09	golang-vcs-snapshot	ee98df2c8a27c4347826db72f6dc2d50
-_md5_=8c8ea1a8cbd7fa4eaf5ee80824e7625f
diff --git a/metadata/md5-cache/dev-util/stripe-mock-0.105.0 b/metadata/md5-cache/dev-util/stripe-mock-0.105.0
deleted file mode 100644
index b7ebd2c5dac6..000000000000
--- a/metadata/md5-cache/dev-util/stripe-mock-0.105.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=Mock HTTP server that responds like the real Stripe API
-EAPI=7
-HOMEPAGE=https://github.com/stripe/stripe-mock
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT ISC BSD-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/stripe/stripe-mock/archive/v0.105.0.tar.gz -> stripe-mock-0.105.0.tar.gz
-_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	f037bca330974d0c1a23c7390ddcba09	golang-vcs-snapshot	ee98df2c8a27c4347826db72f6dc2d50
-_md5_=8c8ea1a8cbd7fa4eaf5ee80824e7625f
diff --git a/metadata/md5-cache/dev-util/stripe-mock-0.106.0 b/metadata/md5-cache/dev-util/stripe-mock-0.106.0
deleted file mode 100644
index 748f88470f2e..000000000000
--- a/metadata/md5-cache/dev-util/stripe-mock-0.106.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=Mock HTTP server that responds like the real Stripe API
-EAPI=7
-HOMEPAGE=https://github.com/stripe/stripe-mock
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT ISC BSD-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/stripe/stripe-mock/archive/v0.106.0.tar.gz -> stripe-mock-0.106.0.tar.gz
-_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	f037bca330974d0c1a23c7390ddcba09	golang-vcs-snapshot	ee98df2c8a27c4347826db72f6dc2d50
-_md5_=8c8ea1a8cbd7fa4eaf5ee80824e7625f
diff --git a/metadata/md5-cache/dev-util/stripe-mock-0.107.0 b/metadata/md5-cache/dev-util/stripe-mock-0.107.0
deleted file mode 100644
index 006b73670ce7..000000000000
--- a/metadata/md5-cache/dev-util/stripe-mock-0.107.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=Mock HTTP server that responds like the real Stripe API
-EAPI=7
-HOMEPAGE=https://github.com/stripe/stripe-mock
-KEYWORDS=amd64 x86
-LICENSE=MIT ISC BSD-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/stripe/stripe-mock/archive/v0.107.0.tar.gz -> stripe-mock-0.107.0.tar.gz
-_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	f037bca330974d0c1a23c7390ddcba09	golang-vcs-snapshot	ee98df2c8a27c4347826db72f6dc2d50
-_md5_=edc7a7d9c151160b84af7379b6ae49f9
diff --git a/metadata/md5-cache/dev-util/stripe-mock-0.109.0 b/metadata/md5-cache/dev-util/stripe-mock-0.109.0
deleted file mode 100644
index 8f8f29e22a33..000000000000
--- a/metadata/md5-cache/dev-util/stripe-mock-0.109.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=Mock HTTP server that responds like the real Stripe API
-EAPI=7
-HOMEPAGE=https://github.com/stripe/stripe-mock
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT ISC BSD-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/stripe/stripe-mock/archive/v0.109.0.tar.gz -> stripe-mock-0.109.0.tar.gz
-_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	f037bca330974d0c1a23c7390ddcba09	golang-vcs-snapshot	ee98df2c8a27c4347826db72f6dc2d50
-_md5_=8c8ea1a8cbd7fa4eaf5ee80824e7625f
diff --git a/metadata/md5-cache/dev-util/stripe-mock-0.112.0 b/metadata/md5-cache/dev-util/stripe-mock-0.112.0
new file mode 100644
index 000000000000..2ae966357b5f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/stripe-mock-0.112.0
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=Mock HTTP server that responds like the real Stripe API
+EAPI=7
+HOMEPAGE=https://github.com/stripe/stripe-mock
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT ISC BSD-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/stripe/stripe-mock/archive/v0.112.0.tar.gz -> stripe-mock-0.112.0.tar.gz
+_eclasses_=golang-base	b8fb27dacacea08140c53857f439fc7d	golang-build	f037bca330974d0c1a23c7390ddcba09	golang-vcs-snapshot	ee98df2c8a27c4347826db72f6dc2d50
+_md5_=8c8ea1a8cbd7fa4eaf5ee80824e7625f
diff --git a/metadata/md5-cache/dev-util/sysdig-kmod-0.27.0 b/metadata/md5-cache/dev-util/sysdig-kmod-0.27.0
index 9a074701abe0..cd6b72fb2132 100644
--- a/metadata/md5-cache/dev-util/sysdig-kmod-0.27.0
+++ b/metadata/md5-cache/dev-util/sysdig-kmod-0.27.0
@@ -10,5 +10,5 @@ LICENSE=|| ( MIT GPL-2 )
 RDEPEND=!<=dev-util/sysdig-0.26.4[modules] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/draios/sysdig/archive/0.27.0.tar.gz -> sysdig-0.27.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=61741cb5f2da07566fea735d3cd01476
diff --git a/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1 b/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1
index 5010121c7358..cc3dbd703b82 100644
--- a/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1
+++ b/metadata/md5-cache/dev-util/sysdig-kmod-0.27.1
@@ -10,5 +10,5 @@ LICENSE=|| ( MIT GPL-2 )
 RDEPEND=!<=dev-util/sysdig-0.26.4[modules] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/draios/sysdig/archive/0.27.1.tar.gz -> sysdig-0.27.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=61741cb5f2da07566fea735d3cd01476
diff --git a/metadata/md5-cache/dev-util/systemtap-4.4 b/metadata/md5-cache/dev-util/systemtap-4.4
index 3f070563f041..84ec32155b94 100644
--- a/metadata/md5-cache/dev-util/systemtap-4.4
+++ b/metadata/md5-cache/dev-util/systemtap-4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-4.4.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=72ec240e14a479b4220100067a7c17ca
diff --git a/metadata/md5-cache/dev-util/systemtap-4.5 b/metadata/md5-cache/dev-util/systemtap-4.5
index 15a8b473e8aa..cc24b2a97915 100644
--- a/metadata/md5-cache/dev-util/systemtap-4.5
+++ b/metadata/md5-cache/dev-util/systemtap-4.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-4.5.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=03e6d03f4f7cbba35fd9fecf96cdceb2
diff --git a/metadata/md5-cache/dev-util/trace-cmd-2.9.1 b/metadata/md5-cache/dev-util/trace-cmd-2.9.1
index 4fb44f3f308d..238a544188b0 100644
--- a/metadata/md5-cache/dev-util/trace-cmd-2.9.1
+++ b/metadata/md5-cache/dev-util/trace-cmd-2.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) test
 SLOT=0/2.9.1
 SRC_URI=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v2.9.1.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=21d62ebda4dae5fb77e22a3c46cc3e2d
diff --git a/metadata/md5-cache/dev-util/tup-0.7.10 b/metadata/md5-cache/dev-util/tup-0.7.10
index 3f281c5596f3..2c718f57935d 100644
--- a/metadata/md5-cache/dev-util/tup-0.7.10
+++ b/metadata/md5-cache/dev-util/tup-0.7.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2 MIT public-domain BSD BSD-2
 RDEPEND=dev-db/sqlite:= dev-libs/libpcre:= sys-fs/fuse:3=
 SLOT=0
 SRC_URI=https://github.com/gittup/tup/archive/v0.7.10.tar.gz -> tup-0.7.10.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f6e0d4fc712c9243c18b76664bb8b9f2
diff --git a/metadata/md5-cache/dev-util/tup-0.7.8 b/metadata/md5-cache/dev-util/tup-0.7.8
index 58f5c2e15e0e..3a4dffa5f4b6 100644
--- a/metadata/md5-cache/dev-util/tup-0.7.8
+++ b/metadata/md5-cache/dev-util/tup-0.7.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2 MIT public-domain BSD BSD-2
 RDEPEND=dev-db/sqlite:= dev-libs/libpcre:= sys-fs/fuse:=
 SLOT=0
 SRC_URI=https://github.com/gittup/tup/archive/v0.7.8.tar.gz -> tup-0.7.8.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0b06a520620e39a95966f318fffe5f13
diff --git a/metadata/md5-cache/dev-util/tup-9999 b/metadata/md5-cache/dev-util/tup-9999
index 1437c63c7038..4e2ffdc86534 100644
--- a/metadata/md5-cache/dev-util/tup-9999
+++ b/metadata/md5-cache/dev-util/tup-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2 MIT public-domain BSD BSD-2
 PROPERTIES=live
 RDEPEND=dev-db/sqlite:= dev-libs/libpcre:= sys-fs/fuse:=
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=612056ff9358bdb4c37c34a7d3120b74
diff --git a/metadata/md5-cache/dev-util/uftrace-0.11 b/metadata/md5-cache/dev-util/uftrace-0.11
new file mode 100644
index 000000000000..ec7b134fc85e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/uftrace-0.11
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=sys-libs/ncurses:= virtual/libelf:= capstone? ( dev-libs/capstone:0= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) unwind? ( sys-libs/libunwind:= )
+DESCRIPTION=Function (graph) tracer for user-space
+EAPI=7
+HOMEPAGE=https://github.com/namhyung/uftrace
+IUSE=capstone lua python unwind +lua_single_target_luajit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:= virtual/libelf:= capstone? ( dev-libs/capstone:0= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) unwind? ( sys-libs/libunwind:= )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/namhyung/uftrace/archive/v0.11.tar.gz -> uftrace-0.11.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2990b77a7ece72c0e3d1a8e91fcd7f53
diff --git a/metadata/md5-cache/dev-util/umockdev-0.16.1-r1 b/metadata/md5-cache/dev-util/umockdev-0.16.1-r1
index a53a2aa6d3e7..0393a530e79f 100644
--- a/metadata/md5-cache/dev-util/umockdev-0.16.1-r1
+++ b/metadata/md5-cache/dev-util/umockdev-0.16.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Mock hardware devices for creating unit tests
 EAPI=7
 HOMEPAGE=https://github.com/martinpitt/umockdev/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gobject-introspection-1.32:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martinpitt/umockdev/releases/download/0.16.1/umockdev-0.16.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=17f00801623fb71d632b124f8b2778c6
+_md5_=f9cfe30549cad39f738cad4a7781cfe9
diff --git a/metadata/md5-cache/dev-util/valgrind-3.16.1 b/metadata/md5-cache/dev-util/valgrind-3.16.1
index 0b99d4d1e0ec..1bfd9d21f6de 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.16.1
+++ b/metadata/md5-cache/dev-util/valgrind-3.16.1
@@ -9,6 +9,6 @@ KEYWORDS=-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x6
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
-SRC_URI=ftp://sourceware.org/pub/valgrind/valgrind-3.16.1.tar.bz2
+SRC_URI=https://sourceware.org/pub/valgrind/valgrind-3.16.1.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e4394f309efd27368cfbc2b7c6284ce0
+_md5_=3e3fc15a5bb8513104fbe36ca05ff53e
diff --git a/metadata/md5-cache/dev-util/valgrind-3.17.0 b/metadata/md5-cache/dev-util/valgrind-3.17.0
index 0e9d147811a0..5a9aa318acff 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.17.0
+++ b/metadata/md5-cache/dev-util/valgrind-3.17.0
@@ -9,6 +9,6 @@ KEYWORDS=-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x6
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
-SRC_URI=ftp://sourceware.org/pub/valgrind/valgrind-3.17.0.tar.bz2
+SRC_URI=https://sourceware.org/pub/valgrind/valgrind-3.17.0.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7fb9334f17ab3b5eb22decbcf4f322fb
+_md5_=27f6d3c28aca30bbb33d1bc75e7ffde1
diff --git a/metadata/md5-cache/dev-util/valgrind-9999 b/metadata/md5-cache/dev-util/valgrind-9999
index 65ade9d3290a..4500cf40bc49 100644
--- a/metadata/md5-cache/dev-util/valgrind-9999
+++ b/metadata/md5-cache/dev-util/valgrind-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4f668c690dec1cb0ef159333ae4fe4a4
+_md5_=513b02353eaf2379a4c697aca298e898
diff --git a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.14.0 b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.14.0
deleted file mode 100644
index 5382a7e820ab..000000000000
--- a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.14.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/glib-2.42 virtual/pkgconfig
-DESCRIPTION=A set of scripts and m4/autoconf macros that ease build system maintenance
-EAPI=7
-HOMEPAGE=https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.42
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-dev-tools/4.14/xfce4-dev-tools-4.14.0.tar.bz2
-_md5_=c558ef4df5209dfea422df912f008c96
diff --git a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.15.1 b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.15.1
deleted file mode 100644
index e1e1e885e264..000000000000
--- a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.15.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/glib-2.42 virtual/pkgconfig
-DESCRIPTION=A set of scripts and m4/autoconf macros that ease build system maintenance
-EAPI=7
-HOMEPAGE=https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.42
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-dev-tools/4.15/xfce4-dev-tools-4.15.1.tar.bz2
-_md5_=355720e05fea94543d7630fca2936b2e
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 12684b112f16..5e13cbf12302 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-2.33.1 b/metadata/md5-cache/dev-vcs/git-2.33.1
new file mode 100644
index 000000000000..78177262211c
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.33.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=8
+HOMEPAGE=https://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+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
+LICENSE=GPL-2
+RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.33.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.33.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.33.1.tar.xz )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a449ce59e67cea39974eb0ffe3ad8054
diff --git a/metadata/md5-cache/dev-vcs/git-9999 b/metadata/md5-cache/dev-vcs/git-9999
index 3a8a4c5e1859..c416ae86fcdc 100644
--- a/metadata/md5-cache/dev-vcs/git-9999
+++ b/metadata/md5-cache/dev-vcs/git-9999
@@ -2,7 +2,7 @@ BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texi
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ebbd0c5e5264c3cc5b1f2d2ab035a6ec
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a449ce59e67cea39974eb0ffe3ad8054
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r1 b/metadata/md5-cache/dev-vcs/git-9999-r1
index 25d0abbf9108..c416ae86fcdc 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r1
+++ b/metadata/md5-cache/dev-vcs/git-9999-r1
@@ -2,7 +2,7 @@ BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texi
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4625ae53e78cea2dbca0b9ac2666fc13
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a449ce59e67cea39974eb0ffe3ad8054
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r2 b/metadata/md5-cache/dev-vcs/git-9999-r2
index 25d0abbf9108..c416ae86fcdc 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r2
+++ b/metadata/md5-cache/dev-vcs/git-9999-r2
@@ -2,7 +2,7 @@ BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texi
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4625ae53e78cea2dbca0b9ac2666fc13
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a449ce59e67cea39974eb0ffe3ad8054
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r3 b/metadata/md5-cache/dev-vcs/git-9999-r3
index d669711b34a3..c416ae86fcdc 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r3
+++ b/metadata/md5-cache/dev-vcs/git-9999-r3
@@ -2,7 +2,7 @@ BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texi
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c23996e0ae432a2419fe105bb474e020
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a449ce59e67cea39974eb0ffe3ad8054
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-2.10.1 b/metadata/md5-cache/dev-vcs/python-gitlab-2.10.1
new file mode 100644
index 000000000000..894f38c486d1
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-2.10.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/httmock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/requests-2.25.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-toolbelt-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python command line interface to gitlab API
+EAPI=8
+HOMEPAGE=https://github.com/python-gitlab/python-gitlab/
+IUSE=test test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=LGPL-3
+RDEPEND=>=dev-python/requests-2.25.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-toolbelt-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-2.10.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=44092033757fcc27d8daa5f94393ac80
diff --git a/metadata/md5-cache/dev-vcs/topgit-0.19.13 b/metadata/md5-cache/dev-vcs/topgit-0.19.13
new file mode 100644
index 000000000000..f39f947eb9a7
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/topgit-0.19.13
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl sys-apps/sed virtual/awk
+DEFINED_PHASES=compile install test
+DESCRIPTION=A different patch queue manager
+EAPI=8
+HOMEPAGE=https://mackyle.github.io/topgit/topgit.html https://github.com/mackyle/topgit
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-vcs/git-2.10.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mackyle/topgit/archive/topgit-0.19.13.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=77aeebd8645e4ce60fa5c9896d52ee9d
diff --git a/metadata/md5-cache/dev-vcs/topgit-0.9-r1 b/metadata/md5-cache/dev-vcs/topgit-0.9-r1
deleted file mode 100644
index 2152957bda97..000000000000
--- a/metadata/md5-cache/dev-vcs/topgit-0.9-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-apps/sed virtual/awk
-DESCRIPTION=A different patch queue manager
-EAPI=6
-HOMEPAGE=https://github.com/greenrd/topgit
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/greenrd/topgit/archive/topgit-0.9.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d2ad87922d14ad1088a5664a6f432a59
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index c57974a3c30c..fc47a149f523 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/descent1-data-1.4a b/metadata/md5-cache/games-action/descent1-data-1.4a
index fc27dbc2c40d..db54fa801b6a 100644
--- a/metadata/md5-cache/games-action/descent1-data-1.4a
+++ b/metadata/md5-cache/games-action/descent1-data-1.4a
@@ -4,7 +4,7 @@ DESCRIPTION=Data files for Descent 1
 EAPI=6
 HOMEPAGE=http://www.interplay.com/games/descent.php
 IUSE=doc cdinstall
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=descent-data
 PROPERTIES=cdinstall? ( interactive )
 RDEPEND=!games-action/descent1-demodata
@@ -12,4 +12,4 @@ RESTRICT=bindist !cdinstall? ( fetch )
 SLOT=0
 SRC_URI=cdinstall? ( http://www.dxx-rebirth.com/download/dxx/misc/descent-game-content-10to14a-patch.zip ) !cdinstall? ( setup_descent_1.4a_(16596).exe )
 _eclasses_=cdrom	96bb9b81542ce6da0c28603f1b5a98b7	estack	055c42df72f76a4f45ec92b35e83cd56	portability	d1186f1e621de7b27ddcae82e6253259
-_md5_=037a1ff5c0aefa1025d820155f77165a
+_md5_=04e7fbfdf54291664c47edb62c711f16
diff --git a/metadata/md5-cache/games-action/descent1-demodata-1.4-r1 b/metadata/md5-cache/games-action/descent1-demodata-1.4-r1
index 4901a6809773..f0ec9d118b7c 100644
--- a/metadata/md5-cache/games-action/descent1-demodata-1.4-r1
+++ b/metadata/md5-cache/games-action/descent1-demodata-1.4-r1
@@ -3,10 +3,10 @@ DEFINED_PHASES=install postinst unpack
 DESCRIPTION=Demo data files for Descent 1
 EAPI=7
 HOMEPAGE=http://www.interplay.com/games/descent.php
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=free-noncomm
 RDEPEND=!games-action/descent1-data
 SLOT=0
 SRC_URI=http://icculus.org/d2x/data/desc14sw.exe ftp://ftp.funet.fi/pub/msdos/games/interplay/desc14sw.exe
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=f76ac61ea0003a61ae4a3bc4dfb9f1d8
+_md5_=d3d9f679501e404f06c62a2863d46d85
diff --git a/metadata/md5-cache/games-action/descent1-freedata-1 b/metadata/md5-cache/games-action/descent1-freedata-1
index 213b48f14a4c..02f01e649962 100644
--- a/metadata/md5-cache/games-action/descent1-freedata-1
+++ b/metadata/md5-cache/games-action/descent1-freedata-1
@@ -3,10 +3,10 @@ DESCRIPTION=Free content for games-action/d1x-rebirth
 EAPI=7
 HOMEPAGE=https://www.dxx-rebirth.com/
 IUSE=l10n_de opl3-musicpack sc55-musicpack +textures
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=public-domain
 RDEPEND=!<games-action/dxx-rebirth-0.60 !games-action/d1x-rebirth
 REQUIRED_USE=|| ( l10n_de opl3-musicpack sc55-musicpack textures )
 SLOT=0
 SRC_URI=l10n_de? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.dxa ) opl3-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa ) sc55-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa ) textures? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa )
-_md5_=09477b9cb2e0cd5e0774b897ef377bd4
+_md5_=f8280da3a95088a0dd561d8884c4e94e
diff --git a/metadata/md5-cache/games-action/descent2-data-1.2 b/metadata/md5-cache/games-action/descent2-data-1.2
index ddc0662531e8..bd56b413614e 100644
--- a/metadata/md5-cache/games-action/descent2-data-1.2
+++ b/metadata/md5-cache/games-action/descent2-data-1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Data files for Descent 2
 EAPI=6
 HOMEPAGE=http://www.interplay.com/games/descent.php
 IUSE=doc videos cdinstall
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=descent-data
 PROPERTIES=cdinstall? ( interactive )
 RDEPEND=!<games-action/d2x-0.2.5-r3 !games-action/descent2-demodata
@@ -12,4 +12,4 @@ RESTRICT=bindist !cdinstall? ( fetch )
 SLOT=0
 SRC_URI=cdinstall? ( http://www.dxx-rebirth.com/download/dxx/misc/d2xptch12.tgz ) !cdinstall? ( setup_descent_2_1.1_(16596).exe )
 _eclasses_=cdrom	96bb9b81542ce6da0c28603f1b5a98b7	estack	055c42df72f76a4f45ec92b35e83cd56	portability	d1186f1e621de7b27ddcae82e6253259
-_md5_=dca7700696211dc1df8f330d2bb5cc49
+_md5_=6cfc1e49973b6f6dcbed1228086eafd0
diff --git a/metadata/md5-cache/games-action/descent2-demodata-1.0-r1 b/metadata/md5-cache/games-action/descent2-demodata-1.0-r1
index 8390897d872f..df9e681988e1 100644
--- a/metadata/md5-cache/games-action/descent2-demodata-1.0-r1
+++ b/metadata/md5-cache/games-action/descent2-demodata-1.0-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=install postinst unpack
 DESCRIPTION=Demo data files for Descent 2
 EAPI=7
 HOMEPAGE=http://www.interplay.com/games/descent.php
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=free-noncomm
 RDEPEND=!<games-action/d2x-0.2.5-r3 !games-action/descent2-data
 SLOT=0
 SRC_URI=ftp://ftp.funet.fi/pub/msdos/games/interplay/d2demo10.zip
-_md5_=58aa169312404ae929af638ab769da4f
+_md5_=947781f6dace46c7b784c40e980552cb
diff --git a/metadata/md5-cache/games-action/descent2-freedata-1 b/metadata/md5-cache/games-action/descent2-freedata-1
index 48233e464035..bff9dc25f55f 100644
--- a/metadata/md5-cache/games-action/descent2-freedata-1
+++ b/metadata/md5-cache/games-action/descent2-freedata-1
@@ -3,10 +3,10 @@ DESCRIPTION=Free content for games-action/d2x-rebirth
 EAPI=7
 HOMEPAGE=https://www.dxx-rebirth.com/
 IUSE=l10n_de opl3-musicpack sc55-musicpack
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=public-domain
 RDEPEND=!<games-action/dxx-rebirth-0.60 !games-action/d2x-rebirth
 REQUIRED_USE=|| ( l10n_de opl3-musicpack sc55-musicpack )
 SLOT=0
 SRC_URI=l10n_de? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.dxa ) opl3-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) sc55-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa )
-_md5_=09477b9cb2e0cd5e0774b897ef377bd4
+_md5_=f8280da3a95088a0dd561d8884c4e94e
diff --git a/metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20210623 b/metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20210623
index e9859c8acc0d..239ef67e5693 100644
--- a/metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20210623
+++ b/metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20210623
@@ -5,11 +5,11 @@ DESCRIPTION=Descent Rebirth - enhanced Descent 1 & 2 engine
 EAPI=7
 HOMEPAGE=https://www.dxx-rebirth.com/
 IUSE=+d1x +d2x +data debug editor +flac ipv6 +joystick l10n_de +midi +mp3 +music +opengl opl3-musicpack +png sc55-musicpack sdl2 tracker valgrind +vorbis
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=DXX-Rebirth GPL-3
 RDEPEND=dev-games/physfs[hog,mvl,zip] opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng ) !sdl2? ( media-libs/libsdl[joystick?,opengl?,sound,video] media-libs/sdl-image music? ( media-libs/sdl-mixer ) ) sdl2? ( media-libs/libsdl2[joystick?,opengl?,sound,video] media-libs/sdl2-image music? ( media-libs/sdl2-mixer ) ) !sdl2? ( music? ( media-libs/sdl-mixer[flac?,midi?,mp3?,vorbis?] ) ) sdl2? ( music? ( media-libs/sdl2-mixer[flac?,midi?,mp3?,vorbis?] ) ) d1x? ( !<games-action/d1x-rebirth-0.59.100 data? ( || ( games-action/descent1-data games-action/descent1-demodata ) ) l10n_de? ( games-action/descent1-freedata[l10n_de] ) opl3-musicpack? ( games-action/descent1-freedata[opl3-musicpack] ) sc55-musicpack? ( games-action/descent1-freedata[sc55-musicpack] ) ) d2x? ( !<games-action/d2x-rebirth-0.59.100 data? ( || ( games-action/descent2-data games-action/descent2-demodata ) ) l10n_de? ( games-action/descent2-freedata[l10n_de] ) opl3-musicpack? ( games-action/descent2-freedata[opl3-musicpack] ) sc55-musicpack? ( games-action/descent2-freedata[sc55-musicpack] ) )
 REQUIRED_USE=|| ( d1x d2x ) flac? ( music ) midi? ( music ) mp3? ( music ) vorbis? ( music ) opl3-musicpack? ( vorbis ) sc55-musicpack? ( vorbis ) sdl2? ( opengl )
 SLOT=0
 SRC_URI=https://www.dxx-rebirth.com/download/dxx/rebirth/dxx-rebirth_20210623-src.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e0196f327d2504d0f9e01af9de55a72d
+_md5_=56deb2192e9bd98f71ff24362d99e3f9
diff --git a/metadata/md5-cache/games-action/extreme-tuxracer-0.8.0 b/metadata/md5-cache/games-action/extreme-tuxracer-0.8.0
index 785b5b588b9b..0705909c4ce6 100644
--- a/metadata/md5-cache/games-action/extreme-tuxracer-0.8.0
+++ b/metadata/md5-cache/games-action/extreme-tuxracer-0.8.0
@@ -4,10 +4,10 @@ DEPEND=>=media-libs/libsfml-2.4:0= virtual/glu virtual/opengl
 DESCRIPTION=High speed arctic racing game based on Tux Racer
 EAPI=7
 HOMEPAGE=https://sourceforge.net/p/extremetuxracer/wiki/Home/
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=media-libs/libsfml-2.4:0= virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=https://download.sourceforge.net/extremetuxracer/etr-0.8.0.tar.xz -> extreme-tuxracer-0.8.0.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=94ba267bb22e2ec91c792bfb8b9fdfee
+_md5_=2b4122d06e2691d2122c0f3b0fca311e
diff --git a/metadata/md5-cache/games-action/minecraft-launcher-1035 b/metadata/md5-cache/games-action/minecraft-launcher-1035
new file mode 100644
index 000000000000..2731c6e405b8
--- /dev/null
+++ b/metadata/md5-cache/games-action/minecraft-launcher-1035
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=An open-world game whose gameplay revolves around breaking and placing blocks
+EAPI=8
+HOMEPAGE=https://www.minecraft.net/
+KEYWORDS=-* ~amd64
+LICENSE=Mojang
+RDEPEND=>=x11-libs/gtk+-2.24.32-r1[X(+)] app-crypt/libsecret dev-libs/nss dev-libs/libbsd || ( dev-libs/libffi-compat:7 dev-libs/libffi:0/7 ) dev-libs/libpcre media-libs/alsa-lib media-libs/openal net-libs/gnutls[idn] net-misc/curl[adns] net-print/cups sys-apps/dbus virtual/jre:1.8 virtual/opengl x11-apps/xrandr x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://launcher.mojang.com/v1/objects/ce9e6169550628003e22de8086e9fe1186c2285e/minecraft-launcher -> minecraft-launcher-1035 https://launcher.mojang.com/download/minecraft-launcher.svg
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=61698968c274223b50b8f2f0c8ec291b
diff --git a/metadata/md5-cache/games-action/minecraft-launcher-928-r4 b/metadata/md5-cache/games-action/minecraft-launcher-928-r4
deleted file mode 100644
index 2dfbc894ec39..000000000000
--- a/metadata/md5-cache/games-action/minecraft-launcher-928-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DESCRIPTION=An open-world game whose gameplay revolves around breaking and placing blocks
-EAPI=8
-HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* ~amd64
-LICENSE=Mojang
-RDEPEND=>=x11-libs/gtk+-2.24.32-r1[X(+)] app-crypt/libsecret dev-libs/nss dev-libs/libbsd || ( dev-libs/libffi-compat:7 dev-libs/libffi:0/7 ) dev-libs/libpcre media-libs/alsa-lib media-libs/openal net-libs/gnutls[idn] net-misc/curl[adns] net-print/cups sys-apps/dbus virtual/jre:1.8 virtual/opengl x11-apps/xrandr x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_928.tar.gz -> minecraft-launcher-928.tar.gz https://launcher.mojang.com/download/minecraft-launcher.svg
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=858207ceaf6b0b118904d2190d2538bd
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 08f19ab607d1..d920fbec98e1 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/cdogs-sdl-1.1.1 b/metadata/md5-cache/games-arcade/cdogs-sdl-1.1.1
new file mode 100644
index 000000000000..007b62592b3d
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/cdogs-sdl-1.1.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.10 dev-python/protobuf-python[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/protobuf-python[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/protobuf-python[python_targets_python3_8(-)] ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=media-libs/libsdl2[haptic,opengl] media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis,wav] net-libs/enet:1.3=
+DESCRIPTION=Classic overhead run-and-gun game
+EAPI=8
+HOMEPAGE=https://cxong.github.io/cdogs-sdl/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ BSD-2 CC0-1.0 CC-BY-3.0 CC-BY-SA-3.0 XMAME
+RDEPEND=media-libs/libsdl2[haptic,opengl] media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis,wav] net-libs/enet:1.3=
+SLOT=0
+SRC_URI=https://github.com/cxong/cdogs-sdl/archive/1.1.1.tar.gz -> cdogs-sdl-1.1.1.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2d9e05937e66b9eebc465c84561738a0
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 786818a6069a..c5d0ebba769c 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/caps-20071115 b/metadata/md5-cache/games-emulation/caps-20071115
deleted file mode 100644
index b95f0b2c6fad..000000000000
--- a/metadata/md5-cache/games-emulation/caps-20071115
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-arch/unzip
-DESCRIPTION=Support library for accessing and using C.A.P.S. images
-EAPI=5
-HOMEPAGE=http://www.softpres.org/
-IUSE=doc
-KEYWORDS=amd64 x86
-LICENSE=CAPS
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://gentoo/ipfdevlib_linux-20060612.tgz amd64? ( mirror://gentoo/ipflib_linux-amd64-20071115.tgz ) doc? ( mirror://gentoo/ipfdoc102a.zip ) mirror://gentoo/config_uae_ocs13_512c-512s.zip
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8431349037cc484d59d5e266ac3e2755
diff --git a/metadata/md5-cache/games-emulation/dosbox-staging-0.77.1 b/metadata/md5-cache/games-emulation/dosbox-staging-0.77.1
index 07b7fa6feedf..dc9303a06d4d 100644
--- a/metadata/md5-cache/games-emulation/dosbox-staging-0.77.1
+++ b/metadata/md5-cache/games-emulation/dosbox-staging-0.77.1
@@ -5,10 +5,10 @@ DESCRIPTION=Modernized DOSBox soft-fork
 EAPI=7
 HOMEPAGE=https://dosbox-staging.github.io/
 IUSE=+alsa debug dynrec +fluidsynth mt-32 network opengl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2+
 RDEPEND=alsa? ( media-libs/alsa-lib ) debug? ( sys-libs/ncurses:0= ) fluidsynth? ( media-sound/fluid-soundfont media-sound/fluidsynth ) mt-32? ( media-libs/munt-mt32emu ) network? ( media-libs/sdl2-net ) opengl? ( virtual/opengl ) media-libs/libpng:0= media-libs/libsdl2[joystick,opengl?,video,X] media-libs/opusfile sys-libs/zlib !games-emulation/dosbox
 SLOT=0
 SRC_URI=https://github.com/dosbox-staging/dosbox-staging/archive/v0.77.1.tar.gz -> dosbox-staging-0.77.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=557cc0ac63eeec6fcbc07838a76a6ed1
+_md5_=a7c39945fb780f77daa5aa7bb26e40a7
diff --git a/metadata/md5-cache/games-emulation/nestra-0.66-r3 b/metadata/md5-cache/games-emulation/nestra-0.66-r3
deleted file mode 100644
index 0a60556781e8..000000000000
--- a/metadata/md5-cache/games-emulation/nestra-0.66-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11[abi_x86_32(-)]
-DESCRIPTION=NES emulation for Linux/x86
-EAPI=7
-HOMEPAGE=http://nestra.linuxgames.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11[abi_x86_32(-)]
-SLOT=0
-SRC_URI=http://nestra.linuxgames.com/nestra-0.66.tar.gz mirror://debian/pool/contrib/n/nestra/nestra_0.66-10.diff.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8b726cb3a6923ca11fca2c7580dbfcba
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 6236a2c9620b..b695f85d9c8a 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/box2d-2.4.1 b/metadata/md5-cache/games-engines/box2d-2.4.1
index 16d79971a904..44e2432bcf7a 100644
--- a/metadata/md5-cache/games-engines/box2d-2.4.1
+++ b/metadata/md5-cache/games-engines/box2d-2.4.1
@@ -1,5 +1,6 @@
 BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-cpp/doctest )
 DESCRIPTION=C++ engine for simulating rigid bodies in 2D games
 EAPI=7
 HOMEPAGE=https://box2d.org/
@@ -10,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/erincatto/Box2D/archive/v2.4.1.tar.gz -> box2d-2.4.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=38c9380937e8cfcb9fde4fc4bb075c05
+_md5_=1dcf61d264db927336ed325e7a770143
diff --git a/metadata/md5-cache/games-engines/openmw-0.47.0 b/metadata/md5-cache/games-engines/openmw-0.47.0
new file mode 100644
index 000000000000..d955cd013985
--- /dev/null
+++ b/metadata/md5-cache/games-engines/openmw-0.47.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx ) test? ( dev-cpp/gtest ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-arch/lz4:= dev-games/mygui dev-games/recastnavigation:= dev-libs/boost:=[threads(+),zlib] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=Open source reimplementation of TES III: Morrowind
+EAPI=8
+HOMEPAGE=https://openmw.org/ https://gitlab.com/OpenMW/openmw
+IUSE=doc devtools +osg-fork test +qt5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 MIT BitstreamVera ZLIB
+RDEPEND=app-arch/lz4:= dev-games/mygui dev-games/recastnavigation:= dev-libs/boost:=[threads(+),zlib] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/OpenMW/openmw/archive/openmw-0.47.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=63d16427a8688236158fd6486e622dd3
diff --git a/metadata/md5-cache/games-engines/openmw-9999 b/metadata/md5-cache/games-engines/openmw-9999
index 520c60b79747..f51c1a872f3a 100644
--- a/metadata/md5-cache/games-engines/openmw-9999
+++ b/metadata/md5-cache/games-engines/openmw-9999
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[doc] dev-python/sphinx ) test? ( dev-cpp/gtest ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) app-arch/lz4 dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads(+),zlib] dev-libs/tinyxml:=[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) dev-cpp/sol2
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-python/sphinx ) test? ( dev-cpp/gtest ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) app-arch/lz4:= dev-games/mygui dev-games/recastnavigation:= dev-libs/boost:=[threads(+),zlib] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) dev-cpp/sol2
 DESCRIPTION=Open source reimplementation of TES III: Morrowind
-EAPI=7
+EAPI=8
 HOMEPAGE=https://openmw.org/ https://gitlab.com/OpenMW/openmw
 IUSE=doc devtools +osg-fork test +qt5 lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 LICENSE=GPL-3 MIT BitstreamVera ZLIB
 PROPERTIES=live
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) app-arch/lz4 dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads(+),zlib] dev-libs/tinyxml:=[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) app-arch/lz4:= dev-games/mygui dev-games/recastnavigation:= dev-libs/boost:=[threads(+),zlib] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl osg-fork? ( >=dev-games/openscenegraph-openmw-3.6:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[collada(-),ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f027b377f39f7e56abef76e20c5306c2
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bc584d69a9677952879b908671a8dd3c
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 96d2ae738c74..7eb4ad126961 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/gzdoom-4.6.0 b/metadata/md5-cache/games-fps/gzdoom-4.6.0
deleted file mode 100644
index b4af487c70ff..000000000000
--- a/metadata/md5-cache/games-fps/gzdoom-4.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2 media-libs/libsdl2[opengl] media-libs/openal media-libs/zmusic sys-libs/zlib virtual/jpeg:0 gtk? ( x11-libs/gtk+:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A modder-friendly OpenGL source port based on the DOOM engine
-EAPI=7
-HOMEPAGE=https://zdoom.org
-IUSE=debug gtk +non-free openmp
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )
-RDEPEND=app-arch/bzip2 media-libs/libsdl2[opengl] media-libs/openal media-libs/zmusic sys-libs/zlib virtual/jpeg:0 gtk? ( x11-libs/gtk+:3 )
-SLOT=0
-SRC_URI=https://github.com/coelckers/gzdoom/archive/g4.6.0.tar.gz -> gzdoom-4.6.0.tar.gz non-free? ( https://github.com/nashmuhandes/WidePix/archive/d458411db4795dfd1420cf1c6456f6d2999b3bad.tar.gz -> widepix-d458411.tar.gz )
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=806592e9fddd0a987b553ab578ebe5c7
diff --git a/metadata/md5-cache/games-fps/gzdoom-4.7.0 b/metadata/md5-cache/games-fps/gzdoom-4.7.0
new file mode 100644
index 000000000000..12754daa4dc8
--- /dev/null
+++ b/metadata/md5-cache/games-fps/gzdoom-4.7.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-arch/bzip2 media-libs/libsdl2[gles2?,opengl,vulkan?] media-libs/openal media-libs/zmusic sys-libs/zlib virtual/jpeg:0 gtk? ( x11-libs/gtk+:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A modder-friendly OpenGL source port based on the DOOM engine
+EAPI=7
+HOMEPAGE=https://zdoom.org
+IUSE=debug gles2 gtk +non-free openmp telemetry vulkan
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )
+RDEPEND=app-arch/bzip2 media-libs/libsdl2[gles2?,opengl,vulkan?] media-libs/openal media-libs/zmusic sys-libs/zlib virtual/jpeg:0 gtk? ( x11-libs/gtk+:3 )
+SLOT=0
+SRC_URI=https://github.com/coelckers/gzdoom/archive/g4.7.0.tar.gz -> gzdoom-4.7.0.tar.gz non-free? ( https://github.com/nashmuhandes/WidePix/archive/d458411db4795dfd1420cf1c6456f6d2999b3bad.tar.gz -> widepix-d458411.tar.gz )
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a49aa50acf94a425e332237616e34977
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 8c1a0d786c05..9c12bb6f7e32 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/lolcat-100.0.1-r1 b/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
index f35b479bc3c2..b8ee8560749a 100644
--- a/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
+++ b/metadata/md5-cache/games-misc/lolcat-100.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/lolcat-100.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=639783101ac74595f280afc0b7a9cbad
diff --git a/metadata/md5-cache/games-simulation/EmptyEpsilon-2021.06.23 b/metadata/md5-cache/games-simulation/EmptyEpsilon-2021.06.23
new file mode 100644
index 000000000000..a9eff9ee7644
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/EmptyEpsilon-2021.06.23
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=>=dev-cpp/json11-1.0.0 media-libs/libglvnd media-libs/libsfml >=media-libs/glm-0.9.9.8
+DESCRIPTION=A spaceship bridge simulator game.
+EAPI=8
+HOMEPAGE=https://daid.github.io/EmptyEpsilon/
+KEYWORDS=~amd64
+LICENSE=GPL-2 CC-BY-SA-3.0 MIT
+RDEPEND=>=dev-cpp/json11-1.0.0 media-libs/libglvnd media-libs/libsfml >=media-libs/glm-0.9.9.8
+SLOT=0
+SRC_URI=https://github.com/daid/EmptyEpsilon/archive/EE-2021.06.23.tar.gz -> EmptyEpsilon-2021.06.23.tar.gz https://github.com/daid/SeriousProton/archive/EE-2021.06.23.tar.gz -> SeriousProton-2021.06.23.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4d7bd71e7bbbdf71ef988c322b8bca22
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 1f6f2183ed17..52a7785e8f98 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
diff --git a/metadata/md5-cache/games-simulation/corsix-th-0.65.1 b/metadata/md5-cache/games-simulation/corsix-th-0.65.1
index f64ad49639b5..cc1e19b3a76c 100644
--- a/metadata/md5-cache/games-simulation/corsix-th-0.65.1
+++ b/metadata/md5-cache/games-simulation/corsix-th-0.65.1
@@ -5,11 +5,11 @@ DESCRIPTION=Open source clone of Theme Hospital
 EAPI=7
 HOMEPAGE=https://corsixth.com
 IUSE=doc +midi +sound +truetype +videos lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-1(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-1(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-3(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-3(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-4(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-4(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-4(-)] ) media-libs/libsdl2[opengl,video] sound? ( media-libs/sdl2-mixer[midi?] ) truetype? ( >=media-libs/freetype-2.5.3:2 ) videos? ( >=media-video/ffmpeg-2.2.3:0= )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
 SLOT=0
 SRC_URI=https://github.com/CorsixTH/CorsixTH/archive/v0.65.1.tar.gz -> corsix-th-0.65.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=02c439b740bb87bbbd1b074787d76561
+_md5_=57f4db241872e08075c6e385fd540360
diff --git a/metadata/md5-cache/games-sports/Manifest.gz b/metadata/md5-cache/games-sports/Manifest.gz
index 9393a747ffc2..55806133bf70 100644
--- a/metadata/md5-cache/games-sports/Manifest.gz
+++ b/metadata/md5-cache/games-sports/Manifest.gz
diff --git a/metadata/md5-cache/games-sports/dustrac-1.13.0 b/metadata/md5-cache/games-sports/dustrac-1.13.0
index 615ff88fba24..7bfaf0ecef03 100644
--- a/metadata/md5-cache/games-sports/dustrac-1.13.0
+++ b/metadata/md5-cache/games-sports/dustrac-1.13.0
@@ -5,11 +5,11 @@ DESCRIPTION=Tile-based, cross-platform 2D racing game
 EAPI=7
 HOMEPAGE=https://juzzlin.github.io/DustRacing2D/
 IUSE=test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtxml:5 media-fonts/ubuntu-font-family media-libs/libvorbis media-libs/openal virtual/opengl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/juzzlin/DustRacing2D/archive/1.13.0.tar.gz -> dustrac-1.13.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1e4a529658e4e6beedf5c8516dc7007a
+_md5_=a93719ee6d66f9b07c29dae862110078
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index f00f17cbb5fb..80e50a28e5b2 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r1 b/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r1
index 85131eb1f429..f7db54547c4d 100644
--- a/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r1
+++ b/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost:= dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libudev:= virtual/libusb:1 x11-libs/libX11
 SLOT=0
 SRC_URI=https://gitlab.com/xboxdrv/xboxdrv/-/archive/v0.8.8/xboxdrv-v0.8.8.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=0fb05663ae9a5e25e0bf7a9d1f00434d
diff --git a/metadata/md5-cache/games-util/xpadneo-0.9.1 b/metadata/md5-cache/games-util/xpadneo-0.9.1
index aa9a32f04863..4363fb83ca16 100644
--- a/metadata/md5-cache/games-util/xpadneo-0.9.1
+++ b/metadata/md5-cache/games-util/xpadneo-0.9.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/atar-axis/xpadneo/archive/v0.9.1.tar.gz -> xpadneo-0.9.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=471e422a5c45a00a7f7517854c7954e4
diff --git a/metadata/md5-cache/games-util/xpadneo-9999 b/metadata/md5-cache/games-util/xpadneo-9999
index 6f222893c0df..030d1124a1b1 100644
--- a/metadata/md5-cache/games-util/xpadneo-9999
+++ b/metadata/md5-cache/games-util/xpadneo-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c287faec1e1b2c5cff5b763ffef2dfc5
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 7d5c8da7d492..04b0aa1c76a1 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gdm-41.0 b/metadata/md5-cache/gnome-base/gdm-41.0
new file mode 100644
index 000000000000..5a3f75888874
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gdm-41.0
@@ -0,0 +1,16 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=gnome-base/dconf-0.20 >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( >=dev-libs/check-0.9.4 ) app-text/yelp-tools >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=virtual/udev >=dev-libs/glib-2.56:2 >=x11-libs/gtk+-2.91.1:3 >=media-libs/libcanberra-0.4[gtk3] >=sys-apps/accountsservice-0.6.35 x11-libs/libxcb sys-apps/keyutils:= selinux? ( sys-libs/libselinux ) x11-libs/libX11 x11-libs/libXau x11-base/xorg-server[-minimal] x11-libs/libXdmcp tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) systemd? ( >=sys-apps/systemd-186:0=[pam] ) elogind? ( >=sys-auth/elogind-239.3[pam] ) plymouth? ( sys-boot/plymouth ) audit? ( sys-process/audit ) sys-libs/pam sys-auth/pambase[elogind?,systemd?] >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas sys-apps/dbus >=x11-misc/xdg-utils-1.0.2-r3 >=dev-libs/gobject-introspection-0.9.12:= x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME Display Manager for managing graphical display servers and user logins
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GDM
+IUSE=accessibility audit bluetooth-sound branding elogind fprint ipv6 plymouth selinux systemd tcpd test wayland
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+ branding? ( CC-BY-SA-4.0 )
+RDEPEND=virtual/udev >=dev-libs/glib-2.56:2 >=x11-libs/gtk+-2.91.1:3 >=media-libs/libcanberra-0.4[gtk3] >=sys-apps/accountsservice-0.6.35 x11-libs/libxcb sys-apps/keyutils:= selinux? ( sys-libs/libselinux ) x11-libs/libX11 x11-libs/libXau x11-base/xorg-server[-minimal] x11-libs/libXdmcp tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) systemd? ( >=sys-apps/systemd-186:0=[pam] ) elogind? ( >=sys-auth/elogind-239.3[pam] ) plymouth? ( sys-boot/plymouth ) audit? ( sys-process/audit ) sys-libs/pam sys-auth/pambase[elogind?,systemd?] >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas sys-apps/dbus >=x11-misc/xdg-utils-1.0.2-r3 >=dev-libs/gobject-introspection-0.9.12:= acct-group/gdm acct-user/gdm >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd[pam] )
+REQUIRED_USE=^^ ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gdm/41/gdm-41.0.tar.xz https://dev.gentoo.org/~leio/distfiles/gdm-41.0-patchset.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7f92753c7cd5605096c5bb7a7c58a170
diff --git a/metadata/md5-cache/gnome-base/gnome-applets-3.36.4 b/metadata/md5-cache/gnome-base/gnome-applets-3.36.4
deleted file mode 100644
index 1178161f997f..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-applets-3.36.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-libs/gtk+-3.20.0:3[X] >=dev-libs/glib-2.44.0:2 >=gnome-base/gnome-panel-3.24.1 >=gnome-base/libgtop-2.11.92:= >=x11-libs/libwnck-3.14.1:3 >=x11-libs/libnotify-0.7 upower? ( >=sys-power/upower-0.99.8:= ) >=x11-themes/adwaita-icon-theme-3.14.0 >=dev-libs/libxml2-2.5.0:2 >=dev-libs/libgweather-3.28.0:2= >=gnome-extra/gucharmap-2.33.0:2.90 >=sys-auth/polkit-0.97 x11-libs/libX11 tracker? ( app-misc/tracker:0/2.0 ) app-text/docbook-sgml-utils app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.35.0 dev-util/itstool sys-devel/gettext x11-base/xorg-proto virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Applets for the GNOME Flashback Panel
-EAPI=6
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-applets/
-IUSE=ipv6 tracker upower
-KEYWORDS=~amd64
-LICENSE=GPL-2+ FDL-1.1
-RDEPEND=>=x11-libs/gtk+-3.20.0:3[X] >=dev-libs/glib-2.44.0:2 >=gnome-base/gnome-panel-3.24.1 >=gnome-base/libgtop-2.11.92:= >=x11-libs/libwnck-3.14.1:3 >=x11-libs/libnotify-0.7 upower? ( >=sys-power/upower-0.99.8:= ) >=x11-themes/adwaita-icon-theme-3.14.0 >=dev-libs/libxml2-2.5.0:2 >=dev-libs/libgweather-3.28.0:2= >=gnome-extra/gucharmap-2.33.0:2.90 >=sys-auth/polkit-0.97 x11-libs/libX11 tracker? ( app-misc/tracker:0/2.0 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-applets/3.36/gnome-applets-3.36.4.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=40c26d9f0071111aca592bbb5c69846d
diff --git a/metadata/md5-cache/gnome-base/gnome-applets-3.40.0 b/metadata/md5-cache/gnome-base/gnome-applets-3.40.0
deleted file mode 100644
index 321e187b10b8..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-applets-3.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-text/docbook-sgml-utils app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-libs/gtk+-3.20.0:3[X] >=dev-libs/glib-2.44.0:2 >=gnome-base/gnome-panel-3.37.0 >=gnome-base/libgtop-2.11.92:= >=x11-libs/libwnck-3.14.1:3 >=x11-libs/libnotify-0.7 >=x11-themes/adwaita-icon-theme-3.14.0 >=dev-libs/libxml2-2.5.0:2 >=dev-libs/libgweather-3.28.0:2= >=gnome-extra/gucharmap-2.33.0:2.90 >=sys-auth/polkit-0.97 x11-libs/libX11 tracker? ( app-misc/tracker:0/2.0 ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Applets for the GNOME Flashback Panel
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-applets/
-IUSE=tracker
-KEYWORDS=~amd64
-LICENSE=GPL-2+ FDL-1.1
-RDEPEND=>=x11-libs/gtk+-3.20.0:3[X] >=dev-libs/glib-2.44.0:2 >=gnome-base/gnome-panel-3.37.0 >=gnome-base/libgtop-2.11.92:= >=x11-libs/libwnck-3.14.1:3 >=x11-libs/libnotify-0.7 >=x11-themes/adwaita-icon-theme-3.14.0 >=dev-libs/libxml2-2.5.0:2 >=dev-libs/libgweather-3.28.0:2= >=gnome-extra/gucharmap-2.33.0:2.90 >=sys-auth/polkit-0.97 x11-libs/libX11 tracker? ( app-misc/tracker:0/2.0 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-applets/3.40/gnome-applets-3.40.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=76883de9501337a9257d7770a1c1410a
diff --git a/metadata/md5-cache/gnome-base/gnome-applets-3.40.0-r1 b/metadata/md5-cache/gnome-base/gnome-applets-3.40.0-r1
deleted file mode 100644
index 4a019d03e76b..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-applets-3.40.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-text/docbook-sgml-utils app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-libs/gtk+-3.20.0:3[X] >=dev-libs/glib-2.44.0:2 >=gnome-base/gnome-panel-3.37.0 >=gnome-base/libgtop-2.11.92:= >=x11-libs/libwnck-3.14.1:3 >=x11-libs/libnotify-0.7 >=x11-themes/adwaita-icon-theme-3.14.0 >=dev-libs/libxml2-2.5.0:2 >=dev-libs/libgweather-3.28.0:2= >=gnome-extra/gucharmap-2.33.0:2.90 >=sys-auth/polkit-0.97 x11-libs/libX11 tracker? ( app-misc/tracker:3 ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Applets for the GNOME Flashback Panel
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-applets/
-IUSE=tracker
-KEYWORDS=~amd64
-LICENSE=GPL-2+ FDL-1.1
-RDEPEND=>=x11-libs/gtk+-3.20.0:3[X] >=dev-libs/glib-2.44.0:2 >=gnome-base/gnome-panel-3.37.0 >=gnome-base/libgtop-2.11.92:= >=x11-libs/libwnck-3.14.1:3 >=x11-libs/libnotify-0.7 >=x11-themes/adwaita-icon-theme-3.14.0 >=dev-libs/libxml2-2.5.0:2 >=dev-libs/libgweather-3.28.0:2= >=gnome-extra/gucharmap-2.33.0:2.90 >=sys-auth/polkit-0.97 x11-libs/libX11 tracker? ( app-misc/tracker:3 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-applets/3.40/gnome-applets-3.40.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a6846907cddbf0debd9b32990f9880fa
diff --git a/metadata/md5-cache/gnome-base/gnome-applets-3.40.0-r2 b/metadata/md5-cache/gnome-base/gnome-applets-3.40.0-r2
new file mode 100644
index 000000000000..1735bc99c139
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-applets-3.40.0-r2
@@ -0,0 +1,14 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=x11-libs/gtk+-3.20.0:3[X] >=dev-libs/glib-2.44.0:2 >=gnome-base/gnome-panel-3.37.0 >=gnome-base/libgtop-2.11.92:= >=x11-libs/libwnck-3.14.1:3 >=x11-libs/libnotify-0.7 >=sys-power/upower-0.99.8:= >=x11-themes/adwaita-icon-theme-3.14.0 >=dev-libs/libxml2-2.5.0:2 >=dev-libs/libgweather-40.0:2= >=gnome-extra/gucharmap-2.33.0:2.90 >=sys-auth/polkit-0.97 x11-libs/libX11 tracker? ( app-misc/tracker:3 ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Applets for the GNOME Flashback Panel
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-applets/
+IUSE=tracker
+KEYWORDS=~amd64
+LICENSE=GPL-2+ FDL-1.1
+RDEPEND=>=x11-libs/gtk+-3.20.0:3[X] >=dev-libs/glib-2.44.0:2 >=gnome-base/gnome-panel-3.37.0 >=gnome-base/libgtop-2.11.92:= >=x11-libs/libwnck-3.14.1:3 >=x11-libs/libnotify-0.7 >=sys-power/upower-0.99.8:= >=x11-themes/adwaita-icon-theme-3.14.0 >=dev-libs/libxml2-2.5.0:2 >=dev-libs/libgweather-40.0:2= >=gnome-extra/gucharmap-2.33.0:2.90 >=sys-auth/polkit-0.97 x11-libs/libX11 tracker? ( app-misc/tracker:3 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-applets/3.40/gnome-applets-3.40.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a8616796ff65b21363b0797091e239e6
diff --git a/metadata/md5-cache/gnome-base/gnome-flashback-3.36.4 b/metadata/md5-cache/gnome-base/gnome-flashback-3.36.4
deleted file mode 100644
index 732195780680..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-flashback-3.36.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-libs/gdk-pixbuf-2.32.2:2 >=x11-libs/gtk+-3.22.0:3[X] >=gnome-base/gnome-desktop-3.12.0:3= >=gnome-base/gnome-panel-3.35.2 >=media-libs/libcanberra-0.13[gtk3] >=dev-libs/glib-2.44.0:2 >=gnome-base/gsettings-desktop-schemas-3.31.0 >=sys-auth/polkit-0.97 >=app-i18n/ibus-1.5.2 >=sys-power/upower-0.99.0:= >=x11-libs/libXrandr-1.5.0 >=x11-libs/libXxf86vm-1.1.4 x11-libs/libxcb x11-libs/libX11 gnome-base/gdm elogind? ( >=sys-auth/elogind-230 ) systemd? ( >=sys-apps/systemd-230:= ) net-wireless/gnome-bluetooth x11-libs/libXext >=x11-libs/libXi-1.6.0 x11-libs/pango x11-libs/libxkbfile x11-misc/xkeyboard-config x11-libs/libXfixes media-sound/pulseaudio[glib] sys-libs/pam dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 x11-base/xorg-proto virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME Flashback session
-EAPI=6
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-flashback/
-IUSE=elogind systemd
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=>=x11-libs/gdk-pixbuf-2.32.2:2 >=x11-libs/gtk+-3.22.0:3[X] >=gnome-base/gnome-desktop-3.12.0:3= >=gnome-base/gnome-panel-3.35.2 >=media-libs/libcanberra-0.13[gtk3] >=dev-libs/glib-2.44.0:2 >=gnome-base/gsettings-desktop-schemas-3.31.0 >=sys-auth/polkit-0.97 >=app-i18n/ibus-1.5.2 >=sys-power/upower-0.99.0:= >=x11-libs/libXrandr-1.5.0 >=x11-libs/libXxf86vm-1.1.4 x11-libs/libxcb x11-libs/libX11 gnome-base/gdm elogind? ( >=sys-auth/elogind-230 ) systemd? ( >=sys-apps/systemd-230:= ) net-wireless/gnome-bluetooth x11-libs/libXext >=x11-libs/libXi-1.6.0 x11-libs/pango x11-libs/libxkbfile x11-misc/xkeyboard-config x11-libs/libXfixes media-sound/pulseaudio[glib] sys-libs/pam x11-wm/metacity gnome-base/gnome-panel gnome-base/gnome-settings-daemon
-REQUIRED_USE=^^ ( elogind systemd )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-flashback/3.36/gnome-flashback-3.36.4.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5152969fd27c39d41e460c945ce95128
diff --git a/metadata/md5-cache/gnome-base/gnome-panel-3.36.2 b/metadata/md5-cache/gnome-base/gnome-panel-3.36.2
deleted file mode 100644
index 86f09608cb2d..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-panel-3.36.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=gnome-base/gnome-desktop-2.91.0:3= >=x11-libs/gdk-pixbuf-2.26.0:2 >=x11-libs/pango-1.15.4 >=dev-libs/glib-2.45.3:2 >=x11-libs/gtk+-3.22.0:3[X] >=x11-libs/libwnck-3.4.6:3 >=gnome-base/gnome-menus-3.7.90:3 eds? ( >=gnome-extra/evolution-data-server-3.33.2:= ) elogind? ( >=sys-auth/elogind-230 ) systemd? ( >=sys-apps/systemd-230:= ) >=x11-libs/cairo-1.0.0[X,glib] >=dev-libs/libgweather-3.28.0:2= >=gnome-base/dconf-0.13.4 >=x11-libs/libXrandr-1.3.0 gnome-base/gdm x11-libs/libX11 x11-libs/libXi sys-auth/polkit x11-libs/libXi app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The GNOME Flashback Panel
-EAPI=6
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-panel/
-IUSE=eds elogind systemd
-KEYWORDS=~amd64
-LICENSE=GPL-2+ FDL-1.1 LGPL-2.1+
-RDEPEND=>=gnome-base/gnome-desktop-2.91.0:3= >=x11-libs/gdk-pixbuf-2.26.0:2 >=x11-libs/pango-1.15.4 >=dev-libs/glib-2.45.3:2 >=x11-libs/gtk+-3.22.0:3[X] >=x11-libs/libwnck-3.4.6:3 >=gnome-base/gnome-menus-3.7.90:3 eds? ( >=gnome-extra/evolution-data-server-3.33.2:= ) elogind? ( >=sys-auth/elogind-230 ) systemd? ( >=sys-apps/systemd-230:= ) >=x11-libs/cairo-1.0.0[X,glib] >=dev-libs/libgweather-3.28.0:2= >=gnome-base/dconf-0.13.4 >=x11-libs/libXrandr-1.3.0 gnome-base/gdm x11-libs/libX11 x11-libs/libXi sys-auth/polkit x11-libs/libXi
-REQUIRED_USE=^^ ( elogind systemd )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-panel/3.36/gnome-panel-3.36.2.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=631ae52dd7e45e261edeefb259fc95bd
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-41.0-r1 b/metadata/md5-cache/gnome-base/gnome-shell-41.0-r1
new file mode 100644
index 000000000000..ba796e4761c1
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-shell-41.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.17 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.69.2 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-41.0:0/9[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-41_alpha[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:0/0.3 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) media-libs/mesa[X(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Provides core UI functions for the GNOME desktop
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
+IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+ LGPL-2+
+PDEPEND=>=gnome-base/gdm-3.5[introspection(+)] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
+RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.69.2 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-41.0:0/9[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-41_alpha[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:0/0.3 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] media-libs/graphene[introspection] >=dev-libs/libgweather-3.26:2[introspection] x11-libs/pango[introspection] net-libs/libsoup:2.4[introspection] >=sys-power/upower-0.99:=[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell sys-apps/xdg-desktop-portal-gtk
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ?? ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell/41/gnome-shell-41.0.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-shell-41.0-r1-patchset.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3fa994e1714dac78b0920e766cac160e
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-41.0 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-41.0
new file mode 100644
index 000000000000..8e4dab3312be
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-41.0
@@ -0,0 +1,13 @@
+BDEPEND=introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Collection of GSettings schemas for GNOME desktop
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas
+IUSE=+introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/41/gsettings-desktop-schemas-41.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fe137c9a1786668289f3d02b3340fb27
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 3fef53cd74c8..53c40d251385 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-5.0.5 b/metadata/md5-cache/gnome-extra/cinnamon-5.0.5
deleted file mode 100644
index 1f9f129ac7db..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-5.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-accessibility/at-spi2-atk:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0 >=gnome-extra/cjs-5.0[cairo] net-libs/libsoup:2.4[introspection] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 >=x11-wm/muffin-5.0[introspection] gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon
-IUSE=+gstreamer gtk-doc +nls +networkmanager python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-accessibility/at-spi2-atk:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0 >=gnome-extra/cjs-5.0[cairo] net-libs/libsoup:2.4[introspection] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 >=x11-wm/muffin-5.0[introspection] gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) >=app-accessibility/caribou-0.3 dev-libs/keybinder:3[introspection] dev-libs/libtimezonemap python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pexpect[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyinotify[python_targets_python3_8(-)] dev-python/pypam[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/tinycss2[python_targets_python3_8(-)] >=dev-python/xapp-2.2.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/pexpect[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] dev-python/pypam[python_targets_python3_9(-)] dev-python/pytz[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/tinycss2[python_targets_python3_9(-)] >=dev-python/xapp-2.2.0[python_targets_python3_9(-)] ) >=gnome-base/dconf-0.4.1 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-base/libgnomekbd-2.91.4 >=gnome-extra/cinnamon-control-center-5.0[networkmanager=] >=gnome-extra/cinnamon-screensaver-5.0 >=gnome-extra/cinnamon-session-5.0 >=gnome-extra/cinnamon-settings-daemon-5.0 >=gnome-extra/nemo-5.0 gnome-extra/polkit-gnome net-misc/wget sys-apps/accountsservice[introspection] sys-power/upower[introspection] >=x11-libs/xapps-2.2.0[introspection] x11-misc/xdg-utils x11-themes/adwaita-icon-theme x11-themes/gnome-themes-standard nls? ( >=gnome-extra/cinnamon-translations-5.0 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon/archive/5.0.5.tar.gz -> cinnamon-5.0.5.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=63b6cf8f1ad40d5623848524be8355b2
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-5.0.6 b/metadata/md5-cache/gnome-extra/cinnamon-5.0.6
new file mode 100644
index 000000000000..2123566b0d34
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-5.0.6
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-accessibility/at-spi2-atk:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0 >=gnome-extra/cjs-5.0[cairo] net-libs/libsoup:2.4[introspection] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 >=x11-wm/muffin-5.0[introspection] gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
+EAPI=7
+HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon
+IUSE=+gstreamer gtk-doc +nls +networkmanager python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-accessibility/at-spi2-atk:2 >=dev-libs/glib-2.52.0:2[dbus] >=dev-libs/gobject-introspection-1.29.15:= dev-libs/libxml2:2 >=gnome-extra/cinnamon-desktop-5.0:0= >=gnome-extra/cinnamon-menus-5.0 >=gnome-extra/cjs-5.0[cairo] net-libs/libsoup:2.4[introspection] sys-apps/dbus >=sys-auth/polkit-0.100[introspection] virtual/opengl x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.12.0:3[introspection] >=x11-libs/libnotify-0.7.3:0=[introspection] x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 >=x11-wm/muffin-5.0[introspection] gstreamer? ( media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) >=app-accessibility/caribou-0.3 dev-libs/keybinder:3[introspection] dev-libs/libtimezonemap python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pexpect[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyinotify[python_targets_python3_8(-)] dev-python/pypam[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] dev-python/tinycss2[python_targets_python3_8(-)] >=dev-python/xapp-2.2.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/pexpect[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] dev-python/pypam[python_targets_python3_9(-)] dev-python/pytz[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] dev-python/tinycss2[python_targets_python3_9(-)] >=dev-python/xapp-2.2.0[python_targets_python3_9(-)] ) >=gnome-base/dconf-0.4.1 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-base/libgnomekbd-2.91.4 >=gnome-extra/cinnamon-control-center-5.0[networkmanager=] >=gnome-extra/cinnamon-screensaver-5.0 >=gnome-extra/cinnamon-session-5.0 >=gnome-extra/cinnamon-settings-daemon-5.0 >=gnome-extra/nemo-5.0 gnome-extra/polkit-gnome net-misc/wget sys-apps/accountsservice[introspection] sys-power/upower[introspection] >=x11-libs/xapps-2.2.0[introspection] x11-misc/xdg-utils x11-themes/adwaita-icon-theme x11-themes/gnome-themes-standard nls? ( >=gnome-extra/cinnamon-translations-5.0 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon/archive/5.0.6.tar.gz -> cinnamon-5.0.6.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=63b6cf8f1ad40d5623848524be8355b2
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.0.6 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.0.6
deleted file mode 100644
index 44dd3d55cdaa..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/dbus-glib-0.78 >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-5.0:0= sys-apps/dbus sys-libs/pam >=x11-libs/gtk+-3.22:3[introspection] x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-themes/adwaita-icon-theme xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Screensaver for Cinnamon
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-screensaver
-IUSE=systemd xinerama python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/dbus-glib-0.78 >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-5.0:0= sys-apps/dbus sys-libs/pam >=x11-libs/gtk+-3.22:3[introspection] x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-themes/adwaita-icon-theme xinerama? ( x11-libs/libXinerama ) >=app-accessibility/caribou-0.3 sys-apps/accountsservice[introspection] python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] >=dev-python/xapp-2.2.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] >=dev-python/xapp-2.2.0[python_targets_python3_9(-)] ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( sys-auth/elogind )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/5.0.6.tar.gz -> cinnamon-screensaver-5.0.6.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fec78d12f9f5eeb71b534752801c9be2
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.0.7 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.0.7
new file mode 100644
index 000000000000..318bd537f873
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-5.0.7
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/dbus-glib-0.78 >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-5.0:0= sys-apps/dbus sys-libs/pam >=x11-libs/gtk+-3.22:3[introspection] x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-themes/adwaita-icon-theme xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Screensaver for Cinnamon
+EAPI=7
+HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-screensaver
+IUSE=systemd xinerama python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/dbus-glib-0.78 >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-5.0:0= sys-apps/dbus sys-libs/pam >=x11-libs/gtk+-3.22:3[introspection] x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-themes/adwaita-icon-theme xinerama? ( x11-libs/libXinerama ) >=app-accessibility/caribou-0.3 sys-apps/accountsservice[introspection] python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] >=dev-python/xapp-2.2.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] >=dev-python/xapp-2.2.0[python_targets_python3_9(-)] ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( sys-auth/elogind )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/5.0.7.tar.gz -> cinnamon-screensaver-5.0.7.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fec78d12f9f5eeb71b534752801c9be2
diff --git a/metadata/md5-cache/gnome-extra/cjs-5.0.0-r1 b/metadata/md5-cache/gnome-extra/cjs-5.0.0-r1
deleted file mode 100644
index 8bc668ae245d..000000000000
--- a/metadata/md5-cache/gnome-extra/cjs-5.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-lang/spidermonkey:78 >=dev-libs/glib-2.58.0:2 >=dev-libs/gobject-introspection-1.58.3:= >=dev-libs/libffi-3.2.1:0= cairo? ( x11-libs/cairo[glib,X] ) readline? ( sys-libs/readline:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) test? ( sys-apps/dbus gtk? ( x11-libs/gtk+:3[introspection] ) )
-DESCRIPTION=Linux Mint's fork of gjs for Cinnamon
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cjs
-IUSE=+cairo examples gtk readline sysprof test test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
-RDEPEND=dev-lang/spidermonkey:78 >=dev-libs/glib-2.58.0:2 >=dev-libs/gobject-introspection-1.58.3:= >=dev-libs/libffi-3.2.1:0= cairo? ( x11-libs/cairo[glib,X] ) readline? ( sys-libs/readline:0= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cjs/archive/5.0.0.tar.gz -> cjs-5.0.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=fb75f47d366c2f3a1baa8e088d4a932a
diff --git a/metadata/md5-cache/gnome-extra/cjs-5.0.1 b/metadata/md5-cache/gnome-extra/cjs-5.0.1
new file mode 100644
index 000000000000..6c80136528e0
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cjs-5.0.1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-lang/spidermonkey:78 >=dev-libs/glib-2.58.0:2 >=dev-libs/gobject-introspection-1.58.3:= >=dev-libs/libffi-3.2.1:0= cairo? ( x11-libs/cairo[glib,X] ) readline? ( sys-libs/readline:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) test? ( sys-apps/dbus gtk? ( x11-libs/gtk+:3[introspection] ) )
+DESCRIPTION=Linux Mint's fork of gjs for Cinnamon
+EAPI=7
+HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cjs
+IUSE=+cairo examples gtk readline sysprof test test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
+RDEPEND=dev-lang/spidermonkey:78 >=dev-libs/glib-2.58.0:2 >=dev-libs/gobject-introspection-1.58.3:= >=dev-libs/libffi-3.2.1:0= cairo? ( x11-libs/cairo[glib,X] ) readline? ( sys-libs/readline:0= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cjs/archive/5.0.1.tar.gz -> cjs-5.0.1.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=89412c237a5708668c4507937a38e79c
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.42.0 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.42.0
new file mode 100644
index 000000000000..f05848b6a1b2
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.42.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.58:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.16:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.28.0:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) net-libs/libsoup:2.4[vala] dev-libs/libical[vala] oauth? ( dev-libs/libgdata[vala] ) gnome-online-accounts? ( dev-libs/libgdata[vala] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Evolution groupware backend
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+IUSE=berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
+RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.58:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.16:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.28.0:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=test !test? ( test )
+SLOT=0/63-26-20
+SRC_URI=mirror://gnome/sources/evolution-data-server/3.42/evolution-data-server-3.42.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	db-use	063d3e7add942762a8203b52ec3066c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=35bf97367977b00810bfde786e0a1b04
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.42.0 b/metadata/md5-cache/gnome-extra/evolution-ews-3.42.0
new file mode 100644
index 000000000000..b42a7b7d0e0c
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.42.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.42.0:0= >=mail-client/evolution-3.42.0:2.0 >=net-libs/libsoup-2.58:2.4 >=x11-libs/gtk+-3.10:3 test? ( net-libs/uhttpmock ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.42.0:0= >=mail-client/evolution-3.42.0:2.0 >=net-libs/libsoup-2.58:2.4 >=x11-libs/gtk+-3.10:3
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/evolution-ews/3.42/evolution-ews-3.42.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=982aafe127e6c6d77f06c3466113c31a
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-40.2 b/metadata/md5-cache/gnome-extra/gnome-boxes-40.2
index 742b8189cb94..d9ee97499529 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-40.2
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-40.2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+ CC-BY-2.0
 RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] x11-libs/gtksourceview:4 >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.26.0:4 >=gui-libs/libhandy-1.0.0:1= >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= ) app-cdr/cdrtools app-misc/tracker-miners:3[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools sys-auth/polkit
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/40/gnome-boxes-40.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4e427c65592ed552cebaf6d803722d59
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-40.3 b/metadata/md5-cache/gnome-extra/gnome-boxes-40.3
index b423ba82b750..b97ec17dbbe2 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-40.3
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-40.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+ CC-BY-2.0
 RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] x11-libs/gtksourceview:4 >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.26.0:4 >=gui-libs/libhandy-1.0.0:1= >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= ) app-cdr/cdrtools app-misc/tracker-miners:3[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools sys-auth/polkit
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/40/gnome-boxes-40.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4e427c65592ed552cebaf6d803722d59
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-41.0 b/metadata/md5-cache/gnome-extra/gnome-calendar-41.0
new file mode 100644
index 000000000000..715a315d4fd7
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-41.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.33.2:=[gtk] net-libs/libsoup:2.4 >=dev-libs/libdazzle-3.33.1 >=gui-libs/libhandy-1.0.0:1= >=dev-libs/glib-2.67.5:2 >=x11-libs/gtk+-3.22.0:3 >=net-libs/gnome-online-accounts-3.2.0:= >=dev-libs/libgweather-40.0:= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.23 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Manage your online calendars with simple and modern interface
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.33.2:=[gtk] net-libs/libsoup:2.4 >=dev-libs/libdazzle-3.33.1 >=gui-libs/libhandy-1.0.0:1= >=dev-libs/glib-2.67.5:2 >=x11-libs/gtk+-3.22.0:3 >=net-libs/gnome-online-accounts-3.2.0:= >=dev-libs/libgweather-40.0:= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.23
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-calendar/41/gnome-calendar-41.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=776f942304a25d317c4f30188cc48e8c
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-41.0 b/metadata/md5-cache/gnome-extra/gnome-contacts-41.0
new file mode 100644
index 000000000000..c83ad3fc63f1
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-41.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) >=dev-libs/gobject-introspection-1.54 dev-libs/folks[vala(+)] net-libs/gnome-online-accounts[vala] gnome-extra/evolution-data-server[gtk,vala] telepathy? ( net-libs/telepathy-glib[vala] ) >=gui-libs/libhandy-1.1.0:1[vala] app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/appstream-glib dev-libs/libxml2:2 dev-libs/libxslt >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts] >=dev-libs/folks-0.11.4:=[eds,telepathy?] >=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8 >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.23.1:3 v4l? ( >=media-video/cheese-3.5.91:= ) telepathy? ( >=net-libs/telepathy-glib-0.22 ) >=gui-libs/libhandy-1.0.0:1 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME contact management application
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
+IUSE=telepathy v4l
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts] >=dev-libs/folks-0.11.4:=[eds,telepathy?] >=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8 >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.23.1:3 v4l? ( >=media-video/cheese-3.5.91:= ) telepathy? ( >=net-libs/telepathy-glib-0.22 ) >=gui-libs/libhandy-1.0.0:1
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-contacts/41/gnome-contacts-41.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6e8f47de96256cc763197b808aff2f66
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-36 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-36
new file mode 100644
index 000000000000..840bd8ca655b
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-36
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=Changes your wallpaper daily to the bing.com background image
+EAPI=7
+HOMEPAGE=https://github.com/neffo/bing-wallpaper-gnome-extension
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.28
+SLOT=0
+SRC_URI=https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v36.tar.gz -> gnome-shell-extension-bing-wallpaper-36.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8cc83d42f4bc1ca49bb818f6e0949b5a
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-48 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-48
new file mode 100644
index 000000000000..82574fd74086
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-48
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/glib:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=KDE Connect implementation for Gnome Shell
+EAPI=7
+HOMEPAGE=https://github.com/GSConnect/gnome-shell-extension-gsconnect
+IUSE=nautilus
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.68 =gnome-base/gnome-shell-41* gnome-base/gvfs gnome-extra/evolution-data-server || ( media-libs/libcanberra media-libs/gsound ) nautilus? ( dev-python/nautilus-python gnome-base/nautilus[introspection] )
+SLOT=0
+SRC_URI=https://github.com/GSConnect/gnome-shell-extension-gsconnect/archive/v48.tar.gz -> gnome-shell-extension-gsconnect-48.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=65892ee349f8af1a9df7b4bf653d28d9
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-41.0 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-41.0
new file mode 100644
index 000000000000..bd78cd37b251
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-41.0
@@ -0,0 +1,13 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=JavaScript extensions for GNOME Shell
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] =gnome-base/gnome-shell-41* media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme >=x11-wm/mutter-3.32[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell-extensions/41/gnome-shell-extensions-41.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2082ac2f85fb61271b18dfa6a21b21d2
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-40.2 b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-40.2
index 14e01fb5efe6..62a956166e43 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-40.2
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-40.2
@@ -4,7 +4,7 @@ EAPI=7
 HOMEPAGE=http://frippery.org/extensions/index.html
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.38 media-libs/clutter:1.0[introspection] x11-libs/pango[introspection]
+RDEPEND=app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= gui-libs/gtk:4[introspection] gnome-base/gnome-menus:3[introspection] =x11-wm/mutter-40*[introspection] =gnome-base/gnome-shell-40* media-libs/clutter:1.0[introspection] x11-libs/pango[introspection]
 SLOT=0
 SRC_URI=http://frippery.org/extensions/gnome-shell-frippery-40.2.tgz
-_md5_=3dc57e8078c4d17f3762514b162b2bb8
+_md5_=c3d5ccd931e8e88f9d8a385583d56c8b
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-41.1 b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-41.1
new file mode 100644
index 000000000000..937182b14572
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-41.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Unofficial extension pack providing GNOME 2-like features
+EAPI=7
+HOMEPAGE=http://frippery.org/extensions/index.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= gui-libs/gtk:4[introspection] gnome-base/gnome-menus:3[introspection] || ( =gnome-base/gnome-shell-41* =gnome-base/gnome-shell-40* ) media-libs/clutter:1.0[introspection] x11-libs/pango[introspection]
+SLOT=0
+SRC_URI=http://frippery.org/extensions/gnome-shell-frippery-41.1.tgz
+_md5_=89e63e91b1e23add13df7b3446dedc94
diff --git a/metadata/md5-cache/gnome-extra/nemo-5.0.3 b/metadata/md5-cache/gnome-extra/nemo-5.0.3
deleted file mode 100644
index 8ac603bafb36..000000000000
--- a/metadata/md5-cache/gnome-extra/nemo-5.0.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/gdbus-codegen-2.31.0 >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.45.7:2[dbus] >=dev-libs/gobject-introspection-0.9.12:= >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/libgsf >=x11-libs/gtk+-3.10.0:3[introspection] >=x11-libs/libnotify-0.7:= x11-libs/libX11 >=x11-libs/pango-1.40.0 >=x11-libs/xapps-2.2.0 exif? ( >=media-libs/libexif-0.6.20:= ) selinux? ( sys-libs/libselinux ) tracker? ( >=app-misc/tracker-2.0:0= ) xmp? ( >=media-libs/exempi-2.2.0:= ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo
-IUSE=doc exif +nls selinux test tracker xmp python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2+ FDL-1.1
-PDEPEND=>=gnome-base/gvfs-0.1.2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.45.7:2[dbus] >=dev-libs/gobject-introspection-0.9.12:= >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/libgsf >=x11-libs/gtk+-3.10.0:3[introspection] >=x11-libs/libnotify-0.7:= x11-libs/libX11 >=x11-libs/pango-1.40.0 >=x11-libs/xapps-2.2.0 exif? ( >=media-libs/libexif-0.6.20:= ) selinux? ( sys-libs/libselinux ) tracker? ( >=app-misc/tracker-2.0:0= ) xmp? ( >=media-libs/exempi-2.2.0:= ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-5.0 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/linuxmint/nemo/archive/5.0.3.tar.gz -> nemo-5.0.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=09dc65aefc4d2401828328f4d5d6d378
diff --git a/metadata/md5-cache/gnome-extra/nemo-5.0.4 b/metadata/md5-cache/gnome-extra/nemo-5.0.4
new file mode 100644
index 000000000000..0c04bee2dd8f
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/nemo-5.0.4
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/gdbus-codegen-2.31.0 >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.45.7:2[dbus] >=dev-libs/gobject-introspection-0.9.12:= >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/libgsf >=x11-libs/gtk+-3.10.0:3[introspection] >=x11-libs/libnotify-0.7:= x11-libs/libX11 >=x11-libs/pango-1.40.0 >=x11-libs/xapps-2.2.0 exif? ( >=media-libs/libexif-0.6.20:= ) selinux? ( sys-libs/libselinux ) tracker? ( >=app-misc/tracker-2.0:0= ) xmp? ( >=media-libs/exempi-2.2.0:= ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
+EAPI=7
+HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo
+IUSE=doc exif +nls selinux test tracker xmp python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2+ FDL-1.1
+PDEPEND=>=gnome-base/gvfs-0.1.2
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.45.7:2[dbus] >=dev-libs/gobject-introspection-0.9.12:= >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/libgsf >=x11-libs/gtk+-3.10.0:3[introspection] >=x11-libs/libnotify-0.7:= x11-libs/libX11 >=x11-libs/pango-1.40.0 >=x11-libs/xapps-2.2.0 exif? ( >=media-libs/libexif-0.6.20:= ) selinux? ( sys-libs/libselinux ) tracker? ( >=app-misc/tracker-2.0:0= ) xmp? ( >=media-libs/exempi-2.2.0:= ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-5.0 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/linuxmint/nemo/archive/5.0.4.tar.gz -> nemo-5.0.4.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=09dc65aefc4d2401828328f4d5d6d378
diff --git a/metadata/md5-cache/gnustep-apps/Manifest.gz b/metadata/md5-cache/gnustep-apps/Manifest.gz
index fa368174edc3..b64be510c396 100644
--- a/metadata/md5-cache/gnustep-apps/Manifest.gz
+++ b/metadata/md5-cache/gnustep-apps/Manifest.gz
diff --git a/metadata/md5-cache/gnustep-apps/simpleagenda-0.46 b/metadata/md5-cache/gnustep-apps/simpleagenda-0.46
new file mode 100644
index 000000000000..b7419596a7a2
--- /dev/null
+++ b/metadata/md5-cache/gnustep-apps/simpleagenda-0.46
@@ -0,0 +1,14 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=dev-libs/libical-0.27 >=virtual/gnustep-back-0.20.0 dbus? ( gnustep-libs/dbuskit ) virtual/gnustep-back
+DESCRIPTION=a simple calendar and agenda application
+EAPI=7
+HOMEPAGE=https://github.com/poroussel/simpleagenda
+IUSE=dbus debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libical-0.27 >=virtual/gnustep-back-0.20.0 dbus? ( gnustep-libs/dbuskit ) virtual/gnustep-back
+SLOT=0
+SRC_URI=https://github.com/poroussel/simpleagenda/archive/v0.46.tar.gz -> simpleagenda-0.46.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnustep-2	e62084c6f8a47a695801af9119a20761	gnustep-base	9572b3101ddfc57358483561c0439981	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=81c5c9c2ed0a99e65ada162103922e56
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index d7c53120a3b0..560cbee056e5 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/swayidle-1.6 b/metadata/md5-cache/gui-apps/swayidle-1.6
deleted file mode 100644
index 0663d51930dd..000000000000
--- a/metadata/md5-cache/gui-apps/swayidle-1.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-libs/wayland-protocols-1.14 virtual/pkgconfig man? ( app-text/scdoc ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd? ( >=sys-apps/systemd-237[policykit] )
-DESCRIPTION=Idle management daemon for Wayland
-EAPI=7
-HOMEPAGE=https://github.com/swaywm/swayidle
-IUSE=elogind +man systemd
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd? ( >=sys-apps/systemd-237[policykit] )
-REQUIRED_USE=?? ( elogind systemd )
-SLOT=0
-SRC_URI=https://github.com/swaywm/swayidle/archive/1.6.tar.gz -> swayidle-1.6.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cd8191bab3eb578b2f2792d09bac6b77
diff --git a/metadata/md5-cache/gui-apps/swayidle-1.7 b/metadata/md5-cache/gui-apps/swayidle-1.7
index e0cb7f1ed04c..b0019ed4650d 100644
--- a/metadata/md5-cache/gui-apps/swayidle-1.7
+++ b/metadata/md5-cache/gui-apps/swayidle-1.7
@@ -5,11 +5,11 @@ DESCRIPTION=Idle management daemon for Wayland
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/swayidle
 IUSE=elogind +man systemd
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd? ( >=sys-apps/systemd-237[policykit] )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/swaywm/swayidle/archive/1.7.tar.gz -> swayidle-1.7.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=710fa8a22eee2a01489c8cd9e0622a70
+_md5_=8b911bc696447dc90a662315223963f2
diff --git a/metadata/md5-cache/gui-apps/swayidle-9999 b/metadata/md5-cache/gui-apps/swayidle-9999
index faa95c3fc857..00c8e81391a9 100644
--- a/metadata/md5-cache/gui-apps/swayidle-9999
+++ b/metadata/md5-cache/gui-apps/swayidle-9999
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd?
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=694eabe2de1c9aecf67df84b29ab06c4
+_md5_=9dd84162a84479ca323c7c2187f3ef13
diff --git a/metadata/md5-cache/gui-apps/wl-clipboard-2.0.0 b/metadata/md5-cache/gui-apps/wl-clipboard-2.0.0
index 563d9cd99615..6a51b309dd5d 100644
--- a/metadata/md5-cache/gui-apps/wl-clipboard-2.0.0
+++ b/metadata/md5-cache/gui-apps/wl-clipboard-2.0.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/wayland
 DESCRIPTION=Wayland clipboard utilities
 EAPI=7
 HOMEPAGE=https://github.com/bugaevc/wl-clipboard
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/wayland
 SLOT=0
 SRC_URI=https://github.com/bugaevc/wl-clipboard/archive/v2.0.0.tar.gz -> wl-clipboard-2.0.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f94e7fa7885d599fe7cbe340e619c42
+_md5_=9eef8b904c49a368a6576ede1a8557c8
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 91810d0d47ea..c5dc58d1fa15 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/amtk-5.2.0 b/metadata/md5-cache/gui-libs/amtk-5.2.0
index 3db2752ac051..ecf8130ec119 100644
--- a/metadata/md5-cache/gui-libs/amtk-5.2.0
+++ b/metadata/md5-cache/gui-libs/amtk-5.2.0
@@ -1,14 +1,14 @@
 BDEPEND=>=sys-devel/gettext-0.19.6 dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22:3 introspection? ( >=dev-libs/gobject-introspection-1.42:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22:3 introspection? ( >=dev-libs/gobject-introspection-1.42:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Actions, Menus and Toolbars Kit for GTK+ applications
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Amtk
 IUSE=+introspection
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22:3 introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+RDEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22:3 introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 SLOT=5
 SRC_URI=mirror://gnome/sources/amtk/5.2/amtk-5.2.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6e5a96ded37476070d2abe00e3aedd4b
+_md5_=1065e5947a2c9ebb1458b5d4dde8737f
diff --git a/metadata/md5-cache/gui-libs/egl-wayland-1.1.9 b/metadata/md5-cache/gui-libs/egl-wayland-1.1.9
new file mode 100644
index 000000000000..7767963d8a33
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/egl-wayland-1.1.9
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/wayland-scanner >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=dev-libs/wayland !<x11-drivers/nvidia-drivers-470.57.02[wayland(-)] dev-libs/wayland-protocols gui-libs/eglexternalplatform >=media-libs/libglvnd-1.3.4
+DESCRIPTION=EGLStream-based Wayland external platform
+EAPI=8
+HOMEPAGE=https://github.com/NVIDIA/egl-wayland
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/wayland !<x11-drivers/nvidia-drivers-470.57.02[wayland(-)]
+SLOT=0
+SRC_URI=https://github.com/NVIDIA/egl-wayland/archive/1.1.9.tar.gz -> egl-wayland-1.1.9.tar.gz
+_eclasses_=meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4d46e7a74e99d99c2abf51a94a33f2e5
diff --git a/metadata/md5-cache/gui-libs/tepl-5.0.1-r1 b/metadata/md5-cache/gui-libs/tepl-5.0.1-r1
index 30129c645d51..0d87dc19993d 100644
--- a/metadata/md5-cache/gui-libs/tepl-5.0.1-r1
+++ b/metadata/md5-cache/gui-libs/tepl-5.0.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.6 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.6 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install test
-DEPEND=app-i18n/uchardet >=dev-libs/glib-2.64:2 >=dev-libs/gobject-introspection-1.42:= dev-libs/icu:= >=dev-libs/libxml2-2.5:2 >=gui-libs/amtk-5.0:5[introspection] >=x11-libs/gtk+-3.22:3[introspection] >=x11-libs/gtksourceview-4.0:4[introspection]
+DEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22:3[introspection] >=x11-libs/gtksourceview-4.0:4[introspection] >=gui-libs/amtk-5.0:5[introspection] dev-libs/icu:= >=dev-libs/gobject-introspection-1.42:=
 DESCRIPTION=GtkSourceView-based text editors and IDE helper library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Tepl
 IUSE=gtk-doc test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=app-i18n/uchardet >=dev-libs/glib-2.64:2 >=dev-libs/gobject-introspection-1.42:= dev-libs/icu:= >=dev-libs/libxml2-2.5:2 >=gui-libs/amtk-5.0:5[introspection] >=x11-libs/gtk+-3.22:3[introspection] >=x11-libs/gtksourceview-4.0:4[introspection]
+LICENSE=LGPL-3+
+RDEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22:3[introspection] >=x11-libs/gtksourceview-4.0:4[introspection] >=gui-libs/amtk-5.0:5[introspection] dev-libs/icu:= >=dev-libs/gobject-introspection-1.42:=
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://gnome/sources/tepl/5.0/tepl-5.0.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=5907f1a29f8043d21c47335532767d6b
+_md5_=1cdb97137e0e8dcb679e6d6e68ff74c6
diff --git a/metadata/md5-cache/gui-libs/tepl-6.00.0-r1 b/metadata/md5-cache/gui-libs/tepl-6.00.0-r1
index 768df179dc5f..57430f05add7 100644
--- a/metadata/md5-cache/gui-libs/tepl-6.00.0-r1
+++ b/metadata/md5-cache/gui-libs/tepl-6.00.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.6 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.6 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install test
-DEPEND=app-i18n/uchardet >=dev-libs/glib-2.64:2 >=dev-libs/gobject-introspection-1.42:= dev-libs/icu:= >=dev-libs/libxml2-2.5:2 >=gui-libs/amtk-5.0:5[introspection] >=x11-libs/gtk+-3.22:3[introspection] >=x11-libs/gtksourceview-4.0:4[introspection]
+DEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22:3[introspection] >=x11-libs/gtksourceview-4.0:4[introspection] >=gui-libs/amtk-5.0:5[introspection] dev-libs/icu:= >=dev-libs/gobject-introspection-1.42:=
 DESCRIPTION=GtkSourceView-based text editors and IDE helper library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Tepl
 IUSE=gtk-doc test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=app-i18n/uchardet >=dev-libs/glib-2.64:2 >=dev-libs/gobject-introspection-1.42:= dev-libs/icu:= >=dev-libs/libxml2-2.5:2 >=gui-libs/amtk-5.0:5[introspection] >=x11-libs/gtk+-3.22:3[introspection] >=x11-libs/gtksourceview-4.0:4[introspection]
+LICENSE=LGPL-3+
+RDEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22:3[introspection] >=x11-libs/gtksourceview-4.0:4[introspection] >=gui-libs/amtk-5.0:5[introspection] dev-libs/icu:= >=dev-libs/gobject-introspection-1.42:=
 RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=mirror://gnome/sources/tepl/6.00/tepl-6.00.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=e3ff8966fffe98bd02fbc4a2222fab40
+_md5_=b30e489c7ca37111e3ba3b116a98012e
diff --git a/metadata/md5-cache/gui-libs/wlroots-9999 b/metadata/md5-cache/gui-libs/wlroots-9999
index d9838bda8022..e521b70bc29c 100644
--- a/metadata/md5-cache/gui-libs/wlroots-9999
+++ b/metadata/md5-cache/gui-libs/wlroots-9999
@@ -1,13 +1,13 @@
-BDEPEND=>=dev-libs/wayland-protocols-1.17 >=dev-util/meson-0.58.1 virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-libs/wayland-protocols-1.23 >=dev-util/meson-0.58.1 virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst test unpack
-DEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.19.0 >=dev-libs/wayland-protocols-1.22 media-libs/mesa[egl,gles2,gbm] sys-auth/seatd:= virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
+DEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.19.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[egl,gles2,gbm] sys-auth/seatd:= virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
 DESCRIPTION=Pluggable, composable, unopinionated modules for building a Wayland compositor
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/wlroots
 IUSE=x11-backend X
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.19.0 >=dev-libs/wayland-protocols-1.22 media-libs/mesa[egl,gles2,gbm] sys-auth/seatd:= virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
+RDEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.19.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[egl,gles2,gbm] sys-auth/seatd:= virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
 SLOT=0/9999
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ad4fbc7e1f60ec7753bc34aebee1132f
+_md5_=eaec0f9f4fd97fbb629b12f5c489b81f
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index 0d4fca7ba897..9fdfda2fc0a8 100644
--- a/metadata/md5-cache/gui-wm/Manifest.gz
+++ b/metadata/md5-cache/gui-wm/Manifest.gz
diff --git a/metadata/md5-cache/gui-wm/sway-9999 b/metadata/md5-cache/gui-wm/sway-9999
index 00a844d5d8dc..f61f96ba61d0 100644
--- a/metadata/md5-cache/gui-wm/sway-9999
+++ b/metadata/md5-cache/gui-wm/sway-9999
@@ -1,5 +1,5 @@
-BDEPEND=>=dev-libs/wayland-protocols-1.14 >=dev-util/meson-0.53.0 virtual/pkgconfig man? ( ~app-text/scdoc-9999 ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
+BDEPEND=>=dev-libs/wayland-protocols-1.14 >=dev-util/meson-0.59.0 virtual/pkgconfig man? ( ~app-text/scdoc-9999 ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install test unpack
 DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[X=]
 DESCRIPTION=i3-compatible Wayland window manager
 EAPI=7
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= sys-auth/seatd:= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[X=]
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2481149f56011714e13fac935ed1927f
+_md5_=99861626a43df9fe703d37014a8b7d85
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 2019c0550e0d..720b6203c77c 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-21.08.2 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-21.08.2
index 0485f9e604a0..0f744757bb0d 100644
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-21.08.2
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-21.08.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
 EAPI=8
 HOMEPAGE=https://kde.org/
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=metapackage
 RDEPEND=>=app-accessibility/kontrast-21.08.2:5 >=kde-apps/kmag-21.08.2:5 >=kde-apps/kmousetool-21.08.2:5 >=kde-apps/kmouth-21.08.2:5
 SLOT=5
-_md5_=a924485a53830e01e87277c1adef89b8
+_md5_=1fd633edd0baa8cb0c4c17f43b7f3aaf
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-21.08.2 b/metadata/md5-cache/kde-apps/kdeadmin-meta-21.08.2
index 750e7be9ceb9..bf6b3d29bf7f 100644
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-21.08.2
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-21.08.2
@@ -3,8 +3,8 @@ DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derive
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=+cron
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ksystemlog-21.08.2:5 cron? ( >=kde-apps/kcron-21.08.2:5 )
 SLOT=5
-_md5_=5ebd79fb33f8ffa0d7287ebdcd6c736a
+_md5_=9e05985f871f90efd9debf9150d04f77
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-21.08.2 b/metadata/md5-cache/kde-apps/kdebugsettings-21.08.2
index 6bb2f0762ea2..605819a2ddba 100644
--- a/metadata/md5-cache/kde-apps/kdebugsettings-21.08.2
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-21.08.2
@@ -5,11 +5,11 @@ DESCRIPTION=Application to enable/disable qCDebug
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kdebugsettings/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kdbusaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kitemviews-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kdebugsettings-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=02897c5faefc7464d383972f91426bf9
+_md5_=e4c9510ed4bdcd21bbc5cc999a977b55
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-21.08.2 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-21.08.2
index b1bbb9f2cf5f..8458e0310fbe 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-21.08.2
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Library to support mobipocket ebooks
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=+thumbnail debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 thumbnail? ( >=kde-frameworks/kio-5.84.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kdegraphics-mobipocket-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8db8cc3a219270a05b79b7d5444c45e5
+_md5_=10d7b1736656e6140320973c8fc3a6b6
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-21.08.2 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-21.08.2
index 714a3e4fcb3f..0ffcd99f3a23 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-21.08.2
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Samba filesharing plugin for file properties
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kdenetwork_filesharing/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kdeclarative-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.84.0:5 net-fs/samba || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kdenetwork-filesharing-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d1f21e0570d5b8d7643286c117ec3e38
+_md5_=4d879e6276fceed0e5b7248cd582ae47
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-21.08.2 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-21.08.2
index 0fc040dbde64..e4ecd74d9982 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-21.08.2
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=kioslaves from kdesdk package
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kdesdk-kioslaves-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=04438fbb1fbfafc8b4f09e70766fbf57
+_md5_=d49f88ef76c96637c3b9559dd9a86324
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-21.08.2 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-21.08.2
index 5915b57e92c6..7f421403b596 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-21.08.2
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Thumbnail generator for PO files
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 sys-devel/gettext || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kdesdk-thumbnailers-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6a011537e3ba1779f46013cfe5821eee
+_md5_=321d8b803398623d7d2452f0bda2e805
diff --git a/metadata/md5-cache/kde-apps/kdf-21.08.2 b/metadata/md5-cache/kde-apps/kdf-21.08.2
index 29ad94160203..7f50a1736412 100644
--- a/metadata/md5-cache/kde-apps/kdf-21.08.2
+++ b/metadata/md5-cache/kde-apps/kdf-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=KDE free disk space utility
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kdf/ https://utils.kde.org/projects/kdf/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.84.0:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kdf-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2a1449d957a68a55f8c49112cf9c8bbe
+_md5_=62249a9944a8ff9cc3d097b3801d75d3
diff --git a/metadata/md5-cache/kde-apps/kdialog-21.08.2 b/metadata/md5-cache/kde-apps/kdialog-21.08.2
index d80f2a7820cc..8531cee06bd1 100644
--- a/metadata/md5-cache/kde-apps/kdialog-21.08.2
+++ b/metadata/md5-cache/kde-apps/kdialog-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kdialog/
 IUSE=X debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kdbusaddons-5.84.0:5 >=kde-frameworks/kguiaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kwindowsystem-5.84.0:5 X? ( x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kdialog-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7ae890a268126309909c5be337899a10
+_md5_=d3d619bed650fb04318cd09f5f7a0cfd
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-21.08.2 b/metadata/md5-cache/kde-apps/keditbookmarks-21.08.2
index b8a6886afdf1..8c8ac5383d08 100644
--- a/metadata/md5-cache/kde-apps/keditbookmarks-21.08.2
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-21.08.2
@@ -5,11 +5,11 @@ DESCRIPTION=Bookmarks editor based on KDE Frameworks
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=+man test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kbookmarks-5.84.0:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kparts-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kwindowsystem-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/keditbookmarks-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c18ce1ab76e3007399436a46782f87b5
+_md5_=c95b25a3c33243b258018625860a91bd
diff --git a/metadata/md5-cache/kde-apps/kfloppy-21.08.2 b/metadata/md5-cache/kde-apps/kfloppy-21.08.2
index 510f2ec714a5..65fa4713d833 100644
--- a/metadata/md5-cache/kde-apps/kfloppy-21.08.2
+++ b/metadata/md5-cache/kde-apps/kfloppy-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Straightforward graphical means to format 3.5" and 5.25" floppy disk
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kfloppy/ https://utils.kde.org/projects/kfloppy/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kfloppy-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=13e6862da32904da6d1ad82b6745f53e
+_md5_=438d16fbd121d0c50f74a9f7f0e01ceb
diff --git a/metadata/md5-cache/kde-apps/kgeography-21.08.2 b/metadata/md5-cache/kde-apps/kgeography-21.08.2
index 920ec900841b..a4057cf776c0 100644
--- a/metadata/md5-cache/kde-apps/kgeography-21.08.2
+++ b/metadata/md5-cache/kde-apps/kgeography-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Geography learning tool
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kgeography/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kitemviews-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kgeography-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3ad27c41099f46a3dd8a125a6065f351
+_md5_=9b485122b2f165f07e7d5746a15c093a
diff --git a/metadata/md5-cache/kde-apps/kget-21.08.2 b/metadata/md5-cache/kde-apps/kget-21.08.2
index a9325dded1c5..bcc62d7a2887 100644
--- a/metadata/md5-cache/kde-apps/kget-21.08.2
+++ b/metadata/md5-cache/kde-apps/kget-21.08.2
@@ -5,11 +5,11 @@ DESCRIPTION=Advanced download manager by KDE
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kget/
 IUSE=bittorrent gpg kde mms sqlite test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcmutils-5.84.0:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kdbusaddons-5.84.0:5 >=kde-frameworks/kdelibs4support-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kitemviews-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/knotifyconfig-5.84.0:5 >=kde-frameworks/kparts-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kwallet-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kwindowsystem-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 >=kde-frameworks/solid-5.84.0:5 bittorrent? ( >=net-libs/libktorrent-21.07.80:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( kde-plasma/libkworkspace:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kget-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7d6224a53a32b2556c371f146452adb1
+_md5_=ef49813dbc1eb5ddde423c7c9f5a955b
diff --git a/metadata/md5-cache/kde-apps/khangman-21.08.2 b/metadata/md5-cache/kde-apps/khangman-21.08.2
index 7f0a9243e86f..3f3f3f8c4c6a 100644
--- a/metadata/md5-cache/kde-apps/khangman-21.08.2
+++ b/metadata/md5-cache/kde-apps/khangman-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Classical hangman game by KDE
 EAPI=8
 HOMEPAGE=https://apps.kde.org/khangman/ https://edu.kde.org/khangman/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-apps/libkeduvocdocument-21.08.2:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/knewstuff-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 >=media-libs/phonon-4.11.0 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtmultimedia-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=kde-apps/kdeedu-data-21.08.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/khangman-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=893c43957dabc40d179759d9010c4aaa
+_md5_=23ec960e400f809d921e8cb332dc0005
diff --git a/metadata/md5-cache/kde-apps/kig-21.08.2 b/metadata/md5-cache/kde-apps/kig-21.08.2
index e699a761962a..41b44514c175 100644
--- a/metadata/md5-cache/kde-apps/kig-21.08.2
+++ b/metadata/md5-cache/kde-apps/kig-21.08.2
@@ -5,7 +5,7 @@ DESCRIPTION=KDE Interactive Geometry tool
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kig/ https://edu.kde.org/kig/
 IUSE=geogebra scripting python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.84.0:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kparts-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.15.2:5 ) scripting? ( python_single_target_python3_8? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-libs/boost-1.70:=[python,python_targets_python3_10(-)] ) ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kig-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=05c198f82f2acbb55340b7c7a2cdca9f
+_md5_=7f0268da416406be6166961773e0cc6e
diff --git a/metadata/md5-cache/kde-apps/kiten-21.08.2 b/metadata/md5-cache/kde-apps/kiten-21.08.2
index 7c5ea4ed4688..51501106ff80 100644
--- a/metadata/md5-cache/kde-apps/kiten-21.08.2
+++ b/metadata/md5-cache/kde-apps/kiten-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Japanese dictionary and reference
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kiten/ https://edu.kde.org/kiten/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.84.0:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/kparts-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 media-fonts/kanjistrokeorders || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kiten-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d68369bb6d920292a81b9308a650d761
+_md5_=ff49d4bcbc11162ff996ff8a27e79ac0
diff --git a/metadata/md5-cache/kde-apps/kldap-21.08.2 b/metadata/md5-cache/kde-apps/kldap-21.08.2
index 3c10774b67c5..823787ca0977 100644
--- a/metadata/md5-cache/kde-apps/kldap-21.08.2
+++ b/metadata/md5-cache/kde-apps/kldap-21.08.2
@@ -5,11 +5,11 @@ DESCRIPTION=Library for interacting with LDAP servers
 EAPI=8
 HOMEPAGE=https://api.kde.org/kdepim/kldap/html/index.html
 IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/cyrus-sasl dev-libs/qtkeychain:= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 net-nds/openldap || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kldap-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=98f45588f298592b3ca3e10952ff4d00
+_md5_=8de25b28dbfb9b736d80911c88da69ef
diff --git a/metadata/md5-cache/kde-apps/klettres-21.08.2 b/metadata/md5-cache/kde-apps/klettres-21.08.2
index 25dc45d86129..7009b8bf6c77 100644
--- a/metadata/md5-cache/kde-apps/klettres-21.08.2
+++ b/metadata/md5-cache/kde-apps/klettres-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Alphabet learning application
 EAPI=8
 HOMEPAGE=https://apps.kde.org/klettres/ https://edu.kde.org/klettres/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/knewstuff-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/klettres-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0820b3b541ad586802de4d3ce95f0b8e
+_md5_=4710465e176342a56bc772eb1c9ea3f5
diff --git a/metadata/md5-cache/kde-apps/kmag-21.08.2 b/metadata/md5-cache/kde-apps/kmag-21.08.2
index e8e2f12f85da..af2deef8be32 100644
--- a/metadata/md5-cache/kde-apps/kmag-21.08.2
+++ b/metadata/md5-cache/kde-apps/kmag-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=KDE screen magnifier
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kmag/
 IUSE=keyboardfocus debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kmag-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ccb8ba1011f2f922c9ff27b532a4286d
+_md5_=1d2c381a7304b74dfcc0fee75cec7df9
diff --git a/metadata/md5-cache/kde-apps/kmix-21.08.2 b/metadata/md5-cache/kde-apps/kmix-21.08.2
index c82a196d57f9..493f298abc18 100644
--- a/metadata/md5-cache/kde-apps/kmix-21.08.2
+++ b/metadata/md5-cache/kde-apps/kmix-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Volume control gui based on KDE Frameworks
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kmix/
 IUSE=alsa plasma pulseaudio debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kdbusaddons-5.84.0:5 >=kde-frameworks/kglobalaccel-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kwindowsystem-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 >=kde-frameworks/solid-5.84.0:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) plasma? ( >=kde-frameworks/plasma-5.84.0:5 ) pulseaudio? ( media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) kde-plasma/kde-cli-tools:5 pulseaudio? ( || ( media-video/pipewire media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] ) ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kmix-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6ec80edb2c2d21fd3e9b25f6bae3f5f5
+_md5_=64c8b853263a2003ddd3a6f8ba382b10
diff --git a/metadata/md5-cache/kde-apps/kmousetool-21.08.2 b/metadata/md5-cache/kde-apps/kmousetool-21.08.2
index 7c07ac1b667e..239253a82d3a 100644
--- a/metadata/md5-cache/kde-apps/kmousetool-21.08.2
+++ b/metadata/md5-cache/kde-apps/kmousetool-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=KDE program that clicks the mouse for you
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kmousetool/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kdbusaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXtst || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kmousetool-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=eba6e089a21c6857c659d4bff5f9553d
+_md5_=c0b64034348d9fa0803d798c605e7d73
diff --git a/metadata/md5-cache/kde-apps/kmouth-21.08.2 b/metadata/md5-cache/kde-apps/kmouth-21.08.2
index 8318a67cad15..722e0bde70d0 100644
--- a/metadata/md5-cache/kde-apps/kmouth-21.08.2
+++ b/metadata/md5-cache/kde-apps/kmouth-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Text-to-speech synthesizer front end
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kmouth/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtspeech-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kmouth-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=40fd556e4d42f7c65c1996c9a4f361ea
+_md5_=ff44bc103926615c812533361c5f91d7
diff --git a/metadata/md5-cache/kde-apps/kmplot-21.08.2 b/metadata/md5-cache/kde-apps/kmplot-21.08.2
index 35629ad1deaf..f2a1a2776151 100644
--- a/metadata/md5-cache/kde-apps/kmplot-21.08.2
+++ b/metadata/md5-cache/kde-apps/kmplot-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Mathematical function plotter
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kmplot/ https://edu.kde.org/kmplot/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/kguiaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kparts-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kmplot-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=98e7e158363f760fd1daea0116c16fcf
+_md5_=cfc1e476e2d6b9a1346b9a47729c0a79
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-21.08.2 b/metadata/md5-cache/kde-apps/kolourpaint-21.08.2
index fb6d90d12070..86dd6949f9bb 100644
--- a/metadata/md5-cache/kde-apps/kolourpaint-21.08.2
+++ b/metadata/md5-cache/kde-apps/kolourpaint-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Paint Program by KDE
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kolourpaint/
 IUSE=scanner debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kguiaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kjobwidgets-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 scanner? ( >=kde-apps/libksane-21.08.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kolourpaint-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4e9f295feccb56c4b2098b2292ed5071
+_md5_=e0fbaecb52650ee4911d95dbbb5a8492
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-21.08.2 b/metadata/md5-cache/kde-apps/kontactinterface-21.08.2
index e26195a88a67..9d40ea95918c 100644
--- a/metadata/md5-cache/kde-apps/kontactinterface-21.08.2
+++ b/metadata/md5-cache/kde-apps/kontactinterface-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Library for embedding KParts in a Kontact component
 EAPI=8
 HOMEPAGE=https://api.kde.org/kdepim/kontactinterface/html/index.html
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kparts-5.84.0:5 >=kde-frameworks/kwindowsystem-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kontactinterface-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=94c83572cfddc90aecfb0ca5b9972d6a
+_md5_=ea75c30f75f80be440f3b930e0570439
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-21.08.2 b/metadata/md5-cache/kde-apps/kqtquickcharts-21.08.2
index 687b5aa45e11..4ece2636250a 100644
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-21.08.2
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kqtquickcharts-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9d5992167ecd085119d21eecd975b379
+_md5_=336f3eeff4b3dae76ac646df5f872b91
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-21.08.2 b/metadata/md5-cache/kde-apps/kross-interpreters-21.08.2
index 477ff0344d38..291d1a8d01e6 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-21.08.2
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Kross interpreter plugins for programming languages
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kross-5.84.0:5 || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kross-interpreters-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	ruby-single	214d0508e74b80c85efcef39699cb9a2	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=68e3ed1fc6ead9364ce5a5c2ef3ee31d
+_md5_=9e634a7ef0308acd5f9b9cf6756ef7a5
diff --git a/metadata/md5-cache/kde-apps/kruler-21.08.2 b/metadata/md5-cache/kde-apps/kruler-21.08.2
index 067a2590f7d4..9799141e38cc 100644
--- a/metadata/md5-cache/kde-apps/kruler-21.08.2
+++ b/metadata/md5-cache/kde-apps/kruler-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Screen ruler for Plasma
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kruler/
 IUSE=X debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kwindowsystem-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kruler-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=35a249789a08099a225e3008803b14d7
+_md5_=111f458553943d7645415ada8c22695c
diff --git a/metadata/md5-cache/kde-apps/ksmtp-21.08.2 b/metadata/md5-cache/kde-apps/ksmtp-21.08.2
index 82153b21a345..1a89f1c5df3d 100644
--- a/metadata/md5-cache/kde-apps/ksmtp-21.08.2
+++ b/metadata/md5-cache/kde-apps/ksmtp-21.08.2
@@ -5,11 +5,11 @@ DESCRIPTION=Job-based library to send email through an SMTP server
 EAPI=8
 HOMEPAGE=https://api.kde.org/kdepim/ksmtp/html/index.html
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/ksmtp-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=64759939be4f125019cc0619646d3b6a
+_md5_=a0a94717693cf4bc571c7c51ee1e1f96
diff --git a/metadata/md5-cache/kde-apps/kteatime-21.08.2 b/metadata/md5-cache/kde-apps/kteatime-21.08.2
index 6636f3a09729..33dff4024228 100644
--- a/metadata/md5-cache/kde-apps/kteatime-21.08.2
+++ b/metadata/md5-cache/kde-apps/kteatime-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=KDE timer for making a fine cup of tea
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kteatime/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/knotifyconfig-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kteatime-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=778973ba494eb2323441bd14ecac2dbb
+_md5_=3a8945258efc9c5f218092b0e2c2b829
diff --git a/metadata/md5-cache/kde-apps/ktimer-21.08.2 b/metadata/md5-cache/kde-apps/ktimer-21.08.2
index a32f944d33d0..91f88dc03e53 100644
--- a/metadata/md5-cache/kde-apps/ktimer-21.08.2
+++ b/metadata/md5-cache/kde-apps/ktimer-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Little tool to execute programs after some time
 EAPI=8
 HOMEPAGE=https://apps.kde.org/ktimer/ https://utils.kde.org/projects/ktimer/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kdbusaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/ktimer-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6c5762f8863ce7b47a4c0ec6695f891f
+_md5_=692780ab65d090cf37a7a77457bdd502
diff --git a/metadata/md5-cache/kde-apps/ktouch-21.08.2 b/metadata/md5-cache/kde-apps/ktouch-21.08.2
index 937af0eea14a..a9c167afa9ff 100644
--- a/metadata/md5-cache/kde-apps/ktouch-21.08.2
+++ b/metadata/md5-cache/kde-apps/ktouch-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Program that helps to learn and practice touch typing
 EAPI=8
 HOMEPAGE=https://apps.kde.org/ktouch/
 IUSE=X debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kcmutils-5.84.0:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kitemviews-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libxkbfile ) >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-apps/kqtquickcharts-21.08.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/ktouch-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=81df10e7fef51cd9ed803cd2530b3106
+_md5_=e3112bbcc4c1c2c2f5a4a1b6fa23907f
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-21.08.2 b/metadata/md5-cache/kde-apps/ktp-auth-handler-21.08.2
index 18fc3c10e92f..ca95fcff8c07 100644
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-21.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Telepathy authentication handler
 EAPI=8
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kaccounts-integration-21.08.2:5 >=kde-apps/ktp-common-internals-21.08.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kwallet-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 net-libs/accounts-qt net-libs/signond >=net-libs/telepathy-qt-0.9.8 >=app-crypt/qca-2.3.0:2[ssl] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/ktp-auth-handler-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dc066a4e672837a5ffb78cb648ebf3be
+_md5_=1e43a1d1dc1efa522f0690021e5b527d
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-21.08.2 b/metadata/md5-cache/kde-apps/ktp-contact-runner-21.08.2
index e597b1c05893..4a730f2d2f4c 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-21.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Telepathy krunner plugin
 EAPI=8
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.08.2:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/krunner-5.84.0:5 >=net-libs/telepathy-qt-0.9.8 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/ktp-contact-runner-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9db117cd6fe0645108ab88826c7353ca
+_md5_=22047d28cb952ebbc2a915b19e94796e
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-21.08.2 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-21.08.2
index 73b7ad3119d7..4849445f09ba 100644
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-21.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
 EAPI=8
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kdeclarative-5.84.0:5 >=kde-frameworks/kwindowsystem-5.84.0:5 >=kde-frameworks/plasma-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/ktp-desktop-applets-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=43b311356a2df7240f453882f1354a6c
+_md5_=b00887493931fcf8e3b0afbdc5b7f817
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-21.08.2 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-21.08.2
index 3a24b3dae9e4..801bd943e29b 100644
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-21.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Telepathy file transfer handler
 EAPI=8
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.08.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=net-libs/telepathy-qt-0.9.8 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/ktp-filetransfer-handler-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9baa9ccc81a31e2afb61e61340b92e6a
+_md5_=bd4ecc5556b929cfecfcf6f8b85b26d0
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-21.08.2 b/metadata/md5-cache/kde-apps/ktp-kded-module-21.08.2
index 8b973fb76471..dd7194b4d957 100644
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-21.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Telepathy workspace integration
 EAPI=8
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.08.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kdbusaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kidletime-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=net-libs/telepathy-qt-0.9.8 >=kde-apps/signon-kwallet-extension-21.08.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/ktp-kded-module-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f9c4ec70633ccbee46780304d8e260b6
+_md5_=6962393c35901b95a0111a198df6762a
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-21.08.2 b/metadata/md5-cache/kde-apps/ktp-send-file-21.08.2
index da276bad0bdf..acf09e18c816 100644
--- a/metadata/md5-cache/kde-apps/ktp-send-file-21.08.2
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
 EAPI=8
 HOMEPAGE=https://community.kde.org/KTp
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/ktp-common-internals-21.08.2:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=net-libs/telepathy-qt-0.9.8 >=kde-apps/ktp-contact-list-21.08.2:5 >=kde-apps/ktp-filetransfer-handler-21.08.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/ktp-send-file-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=25629b5655db869937c441f45f19a9d1
+_md5_=fbc27d09c9fc13396c7d1dbeb2bdbc75
diff --git a/metadata/md5-cache/kde-apps/kturtle-21.08.2 b/metadata/md5-cache/kde-apps/kturtle-21.08.2
index 94b64c950e28..25e28c1ca8c3 100644
--- a/metadata/md5-cache/kde-apps/kturtle-21.08.2
+++ b/metadata/md5-cache/kde-apps/kturtle-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Educational programming environment using the Logo programming langu
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kturtle/ https://edu.kde.org/kturtle/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/knewstuff-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kturtle-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f63de7117f2e370c87fdae8d1fdee3c5
+_md5_=ff010782e8ea4772844728d0992d50db
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-21.08.2 b/metadata/md5-cache/kde-apps/kwalletmanager-21.08.2
index 78b1e45ba639..f581a1c399bb 100644
--- a/metadata/md5-cache/kde-apps/kwalletmanager-21.08.2
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Tool to manage the passwords on your system using KDE Wallet
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.84.0:5 >=kde-frameworks/kauth-5.84.0:5 >=kde-frameworks/kcmutils-5.84.0:5 >=kde-frameworks/kcodecs-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kdbusaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kitemviews-5.84.0:5 >=kde-frameworks/kjobwidgets-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kwallet-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kwindowsystem-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kwalletmanager-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=861a83749ad8022ad58c6388efdf8452
+_md5_=761542f0b49d15d33edc0c186d20ab1b
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-21.08.2 b/metadata/md5-cache/kde-apps/kwordquiz-21.08.2
index 59656c5ef908..6e3d89157d2e 100644
--- a/metadata/md5-cache/kde-apps/kwordquiz-21.08.2
+++ b/metadata/md5-cache/kde-apps/kwordquiz-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Powerful flashcard and vocabulary learning program
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kwordquiz/ https://edu.kde.org/kwordquiz/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libkeduvocdocument-21.08.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/kguiaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kitemviews-5.84.0:5 >=kde-frameworks/knewstuff-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/knotifyconfig-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kwindowsystem-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/kwordquiz-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=05de56a4ec033cfcd85b4fd8e29f83a8
+_md5_=0aa177eda6b06b71c8fa3dafa951c6e2
diff --git a/metadata/md5-cache/kde-apps/libkdepim-21.08.2 b/metadata/md5-cache/kde-apps/libkdepim-21.08.2
index 37ecf9a38004..457f334ed7a2 100644
--- a/metadata/md5-cache/kde-apps/libkdepim-21.08.2
+++ b/metadata/md5-cache/kde-apps/libkdepim-21.08.2
@@ -5,11 +5,11 @@ DESCRIPTION=Common PIM libraries
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kitemviews-5.84.0:5 >=kde-frameworks/kjobwidgets-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/libkdepim-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2a6d661f57eaa3ec7aa85b0a98f65dfb
+_md5_=b4a9259eab50551d2e44c99b24430d0c
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-21.08.2 b/metadata/md5-cache/kde-apps/libkexiv2-21.08.2
index faf45fed60a4..78d969d367b3 100644
--- a/metadata/md5-cache/kde-apps/libkexiv2-21.08.2
+++ b/metadata/md5-cache/kde-apps/libkexiv2-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Wrapper around exiv2 library
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=+xmp debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=media-gfx/exiv2-0.25:=[xmp=] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/libkexiv2-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4c6358596a3318dbb2703dab60a8a155
+_md5_=a8e1fe19021ec39e70da5e1638cd3f7a
diff --git a/metadata/md5-cache/kde-apps/libksane-21.08.2 b/metadata/md5-cache/kde-apps/libksane-21.08.2
index 5ce09d90af00..1636914a5560 100644
--- a/metadata/md5-cache/kde-apps/libksane-21.08.2
+++ b/metadata/md5-cache/kde-apps/libksane-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=SANE Library interface based on KDE Frameworks
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=kwallet debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.84.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/libksane-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d2a16a00b21cd549e57eee6514f8ae59
+_md5_=a3e769c02d2374df7f67f6ca5940b9e3
diff --git a/metadata/md5-cache/kde-apps/libktnef-21.08.2 b/metadata/md5-cache/kde-apps/libktnef-21.08.2
index 271d5875f54d..5da30b332385 100644
--- a/metadata/md5-cache/kde-apps/libktnef-21.08.2
+++ b/metadata/md5-cache/kde-apps/libktnef-21.08.2
@@ -5,11 +5,11 @@ DESCRIPTION=Library for handling TNEF data
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/kcalutils-21.08.2:5 >=kde-frameworks/kcalendarcore-5.84.0:5 >=kde-frameworks/kcontacts-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/ktnef-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=34b36973c541238293f2655f98c2d9e7
+_md5_=556429bf1de5f77434fa5dea44b872dc
diff --git a/metadata/md5-cache/kde-apps/minuet-21.08.2 b/metadata/md5-cache/kde-apps/minuet-21.08.2
index 8fc76b28514f..64d4e5d25b04 100644
--- a/metadata/md5-cache/kde-apps/minuet-21.08.2
+++ b/metadata/md5-cache/kde-apps/minuet-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Music Education software by KDE
 EAPI=8
 HOMEPAGE=https://minuet.kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 media-sound/fluidsynth:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/minuet-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4ac37102cf5c36b6af7a633e91128fa2
+_md5_=eb67f522939c8140c38188de02b47b10
diff --git a/metadata/md5-cache/kde-apps/poxml-21.08.2 b/metadata/md5-cache/kde-apps/poxml-21.08.2
index 9a2a9ff29e1a..4ab33c0d04bd 100644
--- a/metadata/md5-cache/kde-apps/poxml-21.08.2
+++ b/metadata/md5-cache/kde-apps/poxml-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtxml-5.15.2:5 sys-devel/gettext || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/poxml-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d9ae1d965955ba55f4ac9598b83d16fc
+_md5_=6ab3c5c32edb9e7172de8551212e2dd9
diff --git a/metadata/md5-cache/kde-apps/print-manager-21.08.2 b/metadata/md5-cache/kde-apps/print-manager-21.08.2
index 476eda560a0b..413ca9d1a5cd 100644
--- a/metadata/md5-cache/kde-apps/print-manager-21.08.2
+++ b/metadata/md5-cache/kde-apps/print-manager-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Manage print jobs and printers in Plasma
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=+gtk debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kdbusaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/knotifications-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kwindowsystem-5.84.0:5 >=kde-frameworks/plasma-5.84.0:5 net-print/cups >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kdeclarative-5.84.0:5 >=kde-plasma/kde-cli-tools-5.16.5:5 gtk? ( app-admin/system-config-printer ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/print-manager-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4c1308bd159831dda87abe17b1e9b28c
+_md5_=ae5bce1566660e4d1350a11a2edfd171
diff --git a/metadata/md5-cache/kde-apps/rocs-21.08.2 b/metadata/md5-cache/kde-apps/rocs-21.08.2
index a0da7dc49b5c..36b007356867 100644
--- a/metadata/md5-cache/kde-apps/rocs-21.08.2
+++ b/metadata/md5-cache/kde-apps/rocs-21.08.2
@@ -5,11 +5,11 @@ DESCRIPTION=Interface to work with Graph Theory
 EAPI=8
 HOMEPAGE=https://apps.kde.org/rocs/
 IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5[scripttools] >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/karchive-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kitemviews-5.84.0:5 >=kde-frameworks/kparts-5.84.0:5 >=kde-frameworks/kservice-5.84.0:5 >=kde-frameworks/ktexteditor-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 >=dev-qt/qtquickcontrols-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/rocs-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=98c9cc47f43286a9d2af43fa44b86802
+_md5_=3f01fc74e48fb9e68d8712e298e3f5ae
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-21.08.2 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-21.08.2
index 1c83ef3d2865..bed5c7509efd 100644
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-21.08.2
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=KWallet extension for signond
 EAPI=8
 HOMEPAGE=https://accounts-sso.gitlab.io/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kwallet-5.84.0:5 net-libs/signond || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/signon-kwallet-extension-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9d8c515e2fe3d65442f1e60cd217402a
+_md5_=4e901e7d593d31a7d98db48d9cf0fd6b
diff --git a/metadata/md5-cache/kde-apps/step-21.08.2 b/metadata/md5-cache/kde-apps/step-21.08.2
index 528bcd392d71..15a4715ea435 100644
--- a/metadata/md5-cache/kde-apps/step-21.08.2
+++ b/metadata/md5-cache/kde-apps/step-21.08.2
@@ -5,11 +5,11 @@ DESCRIPTION=Interactive physics simulator
 EAPI=8
 HOMEPAGE=https://apps.kde.org/step/ https://edu.kde.org/step/
 IUSE=+gsl nls +qalculate debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-cpp/eigen-3.2:3 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtopengl-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kiconthemes-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/knewstuff-5.84.0:5 >=kde-frameworks/kparts-5.84.0:5 >=kde-frameworks/kplotting-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/step-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=566b5eafcb2cb50c5fe4b45c49c44b65
+_md5_=34d5bb245778d773a8cb1bb8105fd1bf
diff --git a/metadata/md5-cache/kde-apps/svgpart-21.08.2 b/metadata/md5-cache/kde-apps/svgpart-21.08.2
index d997955bacb9..d2a3e1af905d 100644
--- a/metadata/md5-cache/kde-apps/svgpart-21.08.2
+++ b/metadata/md5-cache/kde-apps/svgpart-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Kpart for viewing SVGs
 EAPI=8
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kparts-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/svgpart-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c2173a6af27098050796acf334a1af80
+_md5_=f7809fc8484e71950ce80af8faf30241
diff --git a/metadata/md5-cache/kde-apps/sweeper-21.08.2 b/metadata/md5-cache/kde-apps/sweeper-21.08.2
index 331aadd49002..667050925ce4 100644
--- a/metadata/md5-cache/kde-apps/sweeper-21.08.2
+++ b/metadata/md5-cache/kde-apps/sweeper-21.08.2
@@ -5,10 +5,10 @@ DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
 EAPI=8
 HOMEPAGE=https://apps.kde.org/sweeper/ https://utils.kde.org/projects/sweeper/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-stats-5.84.0:5 >=kde-frameworks/kbookmarks-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/ktextwidgets-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/sweeper-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4ff091f2ecb7e1f64a2c7f4703752e71
+_md5_=60b74e4a89a6359921dbfee204e9bb26
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 554309dbdc55..0fc2ffc25545 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.86.0-r1 b/metadata/md5-cache/kde-frameworks/attica-5.86.0-r1
deleted file mode 100644
index d6ecddded789..000000000000
--- a/metadata/md5-cache/kde-frameworks/attica-5.86.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing access to Open Collaboration Services
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/attica-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=134f7389b183a845b421a658f7d0ff98
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.87.0 b/metadata/md5-cache/kde-frameworks/attica-5.87.0
new file mode 100644
index 000000000000..ee6117b071fe
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/attica-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing access to Open Collaboration Services
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/attica-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=350a3dfa1240d121908ca17ccd05ae5e
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.86.0 b/metadata/md5-cache/kde-frameworks/baloo-5.86.0
deleted file mode 100644
index 45a0e03c7c9e..000000000000
--- a/metadata/md5-cache/kde-frameworks/baloo-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kcrash-5.86*:5 =kde-frameworks/kdbusaddons-5.86*:5 =kde-frameworks/kfilemetadata-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kidletime-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/solid-5.86*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for searching and managing metadata
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kcrash-5.86*:5 =kde-frameworks/kdbusaddons-5.86*:5 =kde-frameworks/kfilemetadata-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kidletime-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/solid-5.86*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/baloo-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1558293f0427ebafbd999005e3f0a9d4
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.87.0 b/metadata/md5-cache/kde-frameworks/baloo-5.87.0
new file mode 100644
index 000000000000..f1a559a72a16
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kcrash-5.87*:5 =kde-frameworks/kdbusaddons-5.87*:5 =kde-frameworks/kfilemetadata-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kidletime-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/solid-5.87*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for searching and managing metadata
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kcrash-5.87*:5 =kde-frameworks/kdbusaddons-5.87*:5 =kde-frameworks/kfilemetadata-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kidletime-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/solid-5.87*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/baloo-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1558293f0427ebafbd999005e3f0a9d4
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.86.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.86.0
deleted file mode 100644
index de46dbbb3830..000000000000
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Qt wrapper for Bluez 5 DBus API
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/bluez-qt-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8c45cd4d250fb16fcd9a81e7441a745f
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.87.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.87.0
new file mode 100644
index 000000000000..6740a1ab9b2c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Qt wrapper for Bluez 5 DBus API
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/bluez-qt-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8c45cd4d250fb16fcd9a81e7441a745f
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.86.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.86.0
deleted file mode 100644
index 6984549245d4..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.86.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.86:5 test? ( app-misc/fdupes ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 )
-DESCRIPTION=Breeze SVG icon theme
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-3
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/breeze-icons-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=de1a90eb45047492cafc77e3b6d09150
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.87.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.87.0
new file mode 100644
index 000000000000..be91ba83da41
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.87.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.87:5 test? ( app-misc/fdupes ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare setup test unpack
+DEPEND=test? ( dev-qt/qttest:5 )
+DESCRIPTION=Breeze SVG icon theme
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/breeze-icons-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=de1a90eb45047492cafc77e3b6d09150
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.86.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.86.0
deleted file mode 100644
index 61a3efb89ccd..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.86.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.86:5 test? ( app-misc/fdupes ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 )
-DESCRIPTION=Breeze SVG icon theme binary resource
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-3
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/breeze-icons-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=824619e2a4c5b4ca1dac1aa9b3362e40
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.87.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.87.0
new file mode 100644
index 000000000000..380c2e7c706e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.87.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.87:5 test? ( app-misc/fdupes ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DEPEND=test? ( dev-qt/qttest:5 )
+DESCRIPTION=Breeze SVG icon theme binary resource
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/breeze-icons-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=824619e2a4c5b4ca1dac1aa9b3362e40
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.86.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.86.0
deleted file mode 100644
index 0248059308a3..000000000000
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.86.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) >=dev-qt/qthelp-5.15.2:5 ) test? ( >=dev-qt/linguist-tools-5.15.2:5 >=dev-qt/qtcore-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DESCRIPTION=Extra modules and scripts for CMake
-EAPI=8
-HOMEPAGE=https://invent.kde.org/frameworks/extra-cmake-modules
-IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=app-arch/libarchive[bzip2]
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/extra-cmake-modules-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=84e57729424addea4c7d958fa06e4d77
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.87.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.87.0
new file mode 100644
index 000000000000..8ea77099426a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.87.0
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) >=dev-qt/qthelp-5.15.2:5 ) test? ( >=dev-qt/linguist-tools-5.15.2:5 >=dev-qt/qtcore-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DESCRIPTION=Extra modules and scripts for CMake
+EAPI=8
+HOMEPAGE=https://invent.kde.org/frameworks/extra-cmake-modules
+IUSE=doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=app-arch/libarchive[bzip2]
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/extra-cmake-modules-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=84e57729424addea4c7d958fa06e4d77
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.86.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.86.0
deleted file mode 100644
index 427ee18b447f..000000000000
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/knewstuff-5.86*:5 =kde-frameworks/knotifications-5.86*:5 =kde-frameworks/kpackage-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/knewstuff-5.86*:5 =kde-frameworks/knotifications-5.86*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/frameworkintegration-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5a4ecf43b07651de51a0bac8146feb96
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.87.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.87.0
new file mode 100644
index 000000000000..dd589f655a41
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/knewstuff-5.87*:5 =kde-frameworks/knotifications-5.87*:5 =kde-frameworks/kpackage-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/knewstuff-5.87*:5 =kde-frameworks/knotifications-5.87*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/frameworkintegration-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5a4ecf43b07651de51a0bac8146feb96
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.86.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.86.0
deleted file mode 100644
index 4611e010b45b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for working with KDE activities
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 >=kde-plasma/kactivitymanagerd-5.16.5:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kactivities-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=298a44e3c545469fe121f311662535db
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.87.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.87.0
new file mode 100644
index 000000000000..d3e07125e18e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for working with KDE activities
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 >=kde-plasma/kactivitymanagerd-5.16.5:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kactivities-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=298a44e3c545469fe121f311662535db
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.86.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.86.0
deleted file mode 100644
index fe5dcc2a63b1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kactivities-5.86*:5 =kde-frameworks/kconfig-5.86*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for getting the usage statistics collected by the activities service
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kactivities-5.86*:5 =kde-frameworks/kconfig-5.86*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kactivities-stats-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=11923263fcff43f12c3d01bf1ec88371
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.87.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.87.0
new file mode 100644
index 000000000000..f4f28c28b15a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kactivities-5.87*:5 =kde-frameworks/kconfig-5.87*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for getting the usage statistics collected by the activities service
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kactivities-5.87*:5 =kde-frameworks/kconfig-5.87*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kactivities-stats-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=11923263fcff43f12c3d01bf1ec88371
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.86.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.86.0
deleted file mode 100644
index 945f2fa4d336..000000000000
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.86.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DESCRIPTION=Framework for building KDE API documentation in a standard format and style
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-doc/doxygen python_single_target_python3_8? ( dev-python/jinja[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jinja[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/jinja[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) media-gfx/graphviz[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kapidox-5.86.0.tar.xz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=baeb8a08e37dafc4ee57a08690a749f2
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.87.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.87.0
new file mode 100644
index 000000000000..64fc50de576b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.87.0
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DESCRIPTION=Framework for building KDE API documentation in a standard format and style
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=app-doc/doxygen python_single_target_python3_8? ( dev-python/jinja[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jinja[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/jinja[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) media-gfx/graphviz[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kapidox-5.87.0.tar.xz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=baeb8a08e37dafc4ee57a08690a749f2
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.86.0 b/metadata/md5-cache/kde-frameworks/karchive-5.86.0
deleted file mode 100644
index f67a29e2ec9f..000000000000
--- a/metadata/md5-cache/kde-frameworks/karchive-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=zstd? ( virtual/pkgconfig ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib zstd? ( app-arch/zstd:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+zstd debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib zstd? ( app-arch/zstd:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/karchive-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=afec82d5ffedeb232c2a94529ddb1d93
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.87.0 b/metadata/md5-cache/kde-frameworks/karchive-5.87.0
new file mode 100644
index 000000000000..25bb7f72b438
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=zstd? ( virtual/pkgconfig ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib zstd? ( app-arch/zstd:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+zstd debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib zstd? ( app-arch/zstd:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/karchive-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=afec82d5ffedeb232c2a94529ddb1d93
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.86.0 b/metadata/md5-cache/kde-frameworks/kauth-5.86.0
deleted file mode 100644
index 8db769de326b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kauth-5.86.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.86*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to let applications perform actions as a privileged user
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls +policykit test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.86*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kauth-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c97d9ccbf4685a029951338a46221e32
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.87.0 b/metadata/md5-cache/kde-frameworks/kauth-5.87.0
new file mode 100644
index 000000000000..4660229e601a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.87.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.87*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to let applications perform actions as a privileged user
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls +policykit test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.87*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kauth-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c97d9ccbf4685a029951338a46221e32
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.86.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.86.0
deleted file mode 100644
index 850f625b6807..000000000000
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 >=kde-frameworks/kconfigwidgets-5.86:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing bookmarks stored in XBEL format
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kbookmarks-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d4bf98d5905648bc8fa6c5b78bc0e570
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.87.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.87.0
new file mode 100644
index 000000000000..c14871f53dfb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 >=kde-frameworks/kconfigwidgets-5.87:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing bookmarks stored in XBEL format
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kbookmarks-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d4bf98d5905648bc8fa6c5b78bc0e570
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.86.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.86.0
deleted file mode 100644
index 65f431d383db..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for interfacing with calendars
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+ test? ( LGPL-3+ )
-RDEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.2:5 !kde-apps/kcalcore:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kcalendarcore-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ba9acf0fbc1bafb37c29adeebe598c8a
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.87.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.87.0
new file mode 100644
index 000000000000..ab1d2a7f800d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for interfacing with calendars
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+ test? ( LGPL-3+ )
+RDEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.2:5 !kde-apps/kcalcore:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kcalendarcore-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ba9acf0fbc1bafb37c29adeebe598c8a
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.86.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.86.0
deleted file mode 100644
index d41a11db51c8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kdeclarative-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to work with KDE System Settings modules
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kdeclarative-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kcmutils-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f3994b5868cbae76bf2bedfe9442ec76
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.87.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.87.0
new file mode 100644
index 000000000000..947d98163e31
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kdeclarative-5.87*:5 =kde-frameworks/kguiaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kitemviews-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to work with KDE System Settings modules
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kdeclarative-5.87*:5 =kde-frameworks/kguiaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kitemviews-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kcmutils-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f3994b5868cbae76bf2bedfe9442ec76
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.86.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.86.0
deleted file mode 100644
index d70513c52ba4..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for manipulating strings using various encodings
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kcodecs-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=31e47416b94436cc0cb5fe67e6eaca47
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.87.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.87.0
new file mode 100644
index 000000000000..4f88f8fcdf81
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for manipulating strings using various encodings
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kcodecs-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=31e47416b94436cc0cb5fe67e6eaca47
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.86.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.86.0
deleted file mode 100644
index ecac699d0dd0..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for common completion tasks such as filename or URL completion
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kcompletion-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c30b1aeea42df2572559de4f68d53afc
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.87.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.87.0
new file mode 100644
index 000000000000..503474a19178
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for common completion tasks such as filename or URL completion
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kcompletion-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c30b1aeea42df2572559de4f68d53afc
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.86.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.86.0
deleted file mode 100644
index 272be6fd8293..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 dbus? ( >=dev-qt/qtdbus-5.15.2:5 ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for reading and writing configuration
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=dbus nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 dbus? ( >=dev-qt/qtdbus-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kconfig-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c927e97b625a4312dd935ac63694cde7
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.87.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.87.0
new file mode 100644
index 000000000000..85e5fda06b77
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 dbus? ( >=dev-qt/qtdbus-5.15.2:5 ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for reading and writing configuration
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=dbus nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 dbus? ( >=dev-qt/qtdbus-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kconfig-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c927e97b625a4312dd935ac63694cde7
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.86.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.86.0
deleted file mode 100644
index 2c8b0d73b159..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.86:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.86*:5 =kde-frameworks/kcodecs-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing an assortment of configuration-related widgets
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+man test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.86*:5 =kde-frameworks/kcodecs-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kconfigwidgets-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f1cf4412b69667d6e84d7380562666b7
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.87.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.87.0
new file mode 100644
index 000000000000..1d9ce0969d02
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.87:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.87*:5 =kde-frameworks/kcodecs-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kguiaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing an assortment of configuration-related widgets
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+man test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.87*:5 =kde-frameworks/kcodecs-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kguiaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kconfigwidgets-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f1cf4412b69667d6e84d7380562666b7
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.86.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.86.0
deleted file mode 100644
index 07f6e8dc470a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcontacts-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kcodecs-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Address book API based on KDE Frameworks
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kcodecs-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 !kde-apps/kcontacts:5 app-text/iso-codes >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kcontacts-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bc8201a810b40164df2491d98f34e597
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.87.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.87.0
new file mode 100644
index 000000000000..8c1971aa4e24
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcontacts-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kcodecs-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Address book API based on KDE Frameworks
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kcodecs-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 !kde-apps/kcontacts:5 app-text/iso-codes >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kcontacts-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bc8201a810b40164df2491d98f34e597
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.86.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.86.0
deleted file mode 100644
index ef469982798b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.15.2:5[icu] fam? ( virtual/fam ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=fam nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.15.2:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kcoreaddons-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ce7e0e398fc912c1326e5567ebd1225d
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.87.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.87.0
new file mode 100644
index 000000000000..203addb9c8d6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.15.2:5[icu] fam? ( virtual/fam ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=fam nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtcore-5.15.2:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kcoreaddons-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ce7e0e398fc912c1326e5567ebd1225d
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.86.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.86.0
deleted file mode 100644
index 8a0c1a087735..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 x11-libs/libX11 x11-base/xorg-proto test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for intercepting and handling application crashes
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kcrash-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ab6c650fd02013ddfa8dbe17c07d0f00
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.87.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.87.0
new file mode 100644
index 000000000000..2002cd180d80
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5 x11-libs/libX11 x11-base/xorg-proto test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for intercepting and handling application crashes
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kcrash-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ab6c650fd02013ddfa8dbe17c07d0f00
diff --git a/metadata/md5-cache/kde-frameworks/kdav-5.86.0 b/metadata/md5-cache/kde-frameworks/kdav-5.86.0
deleted file mode 100644
index 642091d2dba6..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdav-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86:5 >=kde-frameworks/ki18n-5.86:5 >=kde-frameworks/kio-5.86:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=DAV protocol implemention with KJobs
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86:5 >=kde-frameworks/ki18n-5.86:5 >=kde-frameworks/kio-5.86:5 !kde-apps/kdav:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kdav-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7437eefa8e4b3c64887d21297b230b75
diff --git a/metadata/md5-cache/kde-frameworks/kdav-5.87.0 b/metadata/md5-cache/kde-frameworks/kdav-5.87.0
new file mode 100644
index 000000000000..e97427cdba46
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdav-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kcoreaddons-5.87:5 >=kde-frameworks/ki18n-5.87:5 >=kde-frameworks/kio-5.87:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=DAV protocol implemention with KJobs
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kcoreaddons-5.87:5 >=kde-frameworks/ki18n-5.87:5 >=kde-frameworks/kio-5.87:5 !kde-apps/kdav:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kdav-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7437eefa8e4b3c64887d21297b230b75
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.86.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.86.0
deleted file mode 100644
index 221b2f74b05d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for registering services and applications per freedesktop standards
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kdbusaddons-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4470193da78f0b1d88d558e782ea4ee7
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.87.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.87.0
new file mode 100644
index 000000000000..c1ec4ba60368
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for registering services and applications per freedesktop standards
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kdbusaddons-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4470193da78f0b1d88d558e782ea4ee7
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.86.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.86.0
deleted file mode 100644
index 2fd4ac5ac925..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.86.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kglobalaccel-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/knotifications-5.86*:5 =kde-frameworks/kpackage-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 media-libs/libepoxy doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing integration of QML and KDE work spaces
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kglobalaccel-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/knotifications-5.86*:5 =kde-frameworks/kpackage-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kdeclarative-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fb62014ca99bd5abe7c6c5b2e8dfeb4c
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.87.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.87.0
new file mode 100644
index 000000000000..bc0b2662cd5d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.87.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kglobalaccel-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/knotifications-5.87*:5 =kde-frameworks/kpackage-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5 media-libs/libepoxy doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing integration of QML and KDE work spaces
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kglobalaccel-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/knotifications-5.87*:5 =kde-frameworks/kpackage-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kdeclarative-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fb62014ca99bd5abe7c6c5b2e8dfeb4c
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.86.0 b/metadata/md5-cache/kde-frameworks/kded-5.86.0
deleted file mode 100644
index e8e62c99c7ca..000000000000
--- a/metadata/md5-cache/kde-frameworks/kded-5.86.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.86:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kcrash-5.86*:5 =kde-frameworks/kdbusaddons-5.86*:5 =kde-frameworks/kinit-5.86*:5 =kde-frameworks/kservice-5.86*:5 dev-qt/qtcore:5
-DESCRIPTION=Central daemon of KDE workspaces
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+man debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kcrash-5.86*:5 =kde-frameworks/kdbusaddons-5.86*:5 =kde-frameworks/kinit-5.86*:5 =kde-frameworks/kservice-5.86*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kded-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=058e6254f1e4eec71072e045a4798920
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.87.0 b/metadata/md5-cache/kde-frameworks/kded-5.87.0
new file mode 100644
index 000000000000..520973b32462
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kded-5.87.0
@@ -0,0 +1,14 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.87:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kcrash-5.87*:5 =kde-frameworks/kdbusaddons-5.87*:5 =kde-frameworks/kinit-5.87*:5 =kde-frameworks/kservice-5.87*:5 dev-qt/qtcore:5
+DESCRIPTION=Central daemon of KDE workspaces
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+man debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kcrash-5.87*:5 =kde-frameworks/kdbusaddons-5.87*:5 =kde-frameworks/kinit-5.87*:5 =kde-frameworks/kservice-5.87*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kded-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=058e6254f1e4eec71072e045a4798920
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.86.0-r1 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.86.0-r1
deleted file mode 100644
index 5b17c1d76f85..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.86.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/URI dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/docbook-xml-dtd:4.2 dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qttest-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.86*:5 =kde-frameworks/kcodecs-5.86*:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kcrash-5.86*:5 =kde-frameworks/kdbusaddons-5.86*:5 >=kde-frameworks/kded-5.86:5 =kde-frameworks/kdoctools-5.86*:5 =kde-frameworks/kemoticons-5.86*:5 =kde-frameworks/kglobalaccel-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kjobwidgets-5.86*:5 =kde-frameworks/knotifications-5.86*:5[X=] =kde-frameworks/kparts-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/ktextwidgets-5.86*:5 =kde-frameworks/kunitconversion-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5[X=] =kde-frameworks/kxmlgui-5.86*:5 =kde-frameworks/solid-5.86*:5 virtual/libintl X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=app-text/docbook-xml-dtd:4.2 dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qttest-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.86*:5 =kde-frameworks/kcodecs-5.86*:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kcrash-5.86*:5 =kde-frameworks/kdbusaddons-5.86*:5 >=kde-frameworks/kded-5.86:5 =kde-frameworks/kdoctools-5.86*:5 =kde-frameworks/kemoticons-5.86*:5 =kde-frameworks/kglobalaccel-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kjobwidgets-5.86*:5 =kde-frameworks/knotifications-5.86*:5[X=] =kde-frameworks/kparts-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/ktextwidgets-5.86*:5 =kde-frameworks/kunitconversion-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5[X=] =kde-frameworks/kxmlgui-5.86*:5 =kde-frameworks/solid-5.86*:5 virtual/libintl X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kinit-5.86*:5 =kde-frameworks/kitemmodels-5.86*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/portingAids/kdelibs4support-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f1ad8179e0006ca679c8813f6ab90d21
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.87.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.87.0
new file mode 100644
index 000000000000..64f04489b032
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/URI dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.87:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-text/docbook-xml-dtd:4.2 dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qttest-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.87*:5 =kde-frameworks/kcodecs-5.87*:5 =kde-frameworks/kcompletion-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kcrash-5.87*:5 =kde-frameworks/kdbusaddons-5.87*:5 >=kde-frameworks/kded-5.87:5 =kde-frameworks/kdoctools-5.87*:5 =kde-frameworks/kemoticons-5.87*:5 =kde-frameworks/kglobalaccel-5.87*:5 =kde-frameworks/kguiaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kitemviews-5.87*:5 =kde-frameworks/kjobwidgets-5.87*:5 =kde-frameworks/knotifications-5.87*:5[X=] =kde-frameworks/kparts-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/ktextwidgets-5.87*:5 =kde-frameworks/kunitconversion-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5[X=] =kde-frameworks/kxmlgui-5.87*:5 =kde-frameworks/solid-5.87*:5 virtual/libintl X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=app-text/docbook-xml-dtd:4.2 dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qttest-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.87*:5 =kde-frameworks/kcodecs-5.87*:5 =kde-frameworks/kcompletion-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kcrash-5.87*:5 =kde-frameworks/kdbusaddons-5.87*:5 >=kde-frameworks/kded-5.87:5 =kde-frameworks/kdoctools-5.87*:5 =kde-frameworks/kemoticons-5.87*:5 =kde-frameworks/kglobalaccel-5.87*:5 =kde-frameworks/kguiaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kitemviews-5.87*:5 =kde-frameworks/kjobwidgets-5.87*:5 =kde-frameworks/knotifications-5.87*:5[X=] =kde-frameworks/kparts-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/ktextwidgets-5.87*:5 =kde-frameworks/kunitconversion-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5[X=] =kde-frameworks/kxmlgui-5.87*:5 =kde-frameworks/solid-5.87*:5 virtual/libintl X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kinit-5.87*:5 =kde-frameworks/kitemmodels-5.87*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/portingAids/kdelibs4support-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f1ad8179e0006ca679c8813f6ab90d21
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.86.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.86.0
deleted file mode 100644
index 24816dd936c6..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kpty-5.86*:5 =kde-frameworks/kservice-5.86*:5 X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to handle super user actions
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2
-RDEPEND==kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kpty-5.86*:5 =kde-frameworks/kservice-5.86*:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kdesu-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=61c8606f3928d0aa7044f6b1ed077121
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.87.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.87.0
new file mode 100644
index 000000000000..ea899eb7553d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kpty-5.87*:5 =kde-frameworks/kservice-5.87*:5 X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to handle super user actions
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2
+RDEPEND==kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kpty-5.87*:5 =kde-frameworks/kservice-5.87*:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kdesu-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=61c8606f3928d0aa7044f6b1ed077121
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.86.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.86.0
deleted file mode 100644
index 43a93b6c747b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.15.2:5 zeroconf? ( >=dev-qt/qtdbus-5.15.2:5 net-dns/avahi[mdnsresponder-compat] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for network service discovery using Zeroconf
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls zeroconf debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 zeroconf? ( >=dev-qt/qtdbus-5.15.2:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kdnssd-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8d1acd363cc60d6589c8e8bce977c59e
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.87.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.87.0
new file mode 100644
index 000000000000..429b0b1c8343
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.15.2:5 zeroconf? ( >=dev-qt/qtdbus-5.15.2:5 net-dns/avahi[mdnsresponder-compat] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for network service discovery using Zeroconf
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls zeroconf debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 zeroconf? ( >=dev-qt/qtdbus-5.15.2:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kdnssd-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8d1acd363cc60d6589c8e8bce977c59e
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.86.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.86.0
deleted file mode 100644
index adbbae60e906..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/URI nls? ( >=kde-frameworks/ki18n-5.86:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.86*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Tools to generate documentation in various formats from DocBook files
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.86*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kdoctools-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d03007012aa8f9869fa688eda512bdce
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.87.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.87.0
new file mode 100644
index 000000000000..a2fec58fde69
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/URI nls? ( >=kde-frameworks/ki18n-5.87:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.87*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Tools to generate documentation in various formats from DocBook files
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.87*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kdoctools-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d03007012aa8f9869fa688eda512bdce
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.86.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.86.0
deleted file mode 100644
index cd2f4ffccb0c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kservice-5.86*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for converting text emoticons to graphical representations
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kservice-5.86*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kemoticons-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6565904200bda22d4256447aafb9945b
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.87.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.87.0
new file mode 100644
index 000000000000..a46102994955
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kservice-5.87*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for converting text emoticons to graphical representations
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kservice-5.87*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kemoticons-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6565904200bda22d4256447aafb9945b
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.86.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.86.0
deleted file mode 100644
index 40a4d7c96565..000000000000
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.86*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for extracting file metadata
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=epub exif ffmpeg kernel_linux office pdf taglib debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.86*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kfilemetadata-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=20f9b13aa8655c8ac1084ed6e8c17833
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.87.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.87.0
new file mode 100644
index 000000000000..c56804853709
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.87*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for extracting file metadata
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=epub exif ffmpeg kernel_linux office pdf taglib debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.87*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kfilemetadata-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=20f9b13aa8655c8ac1084ed6e8c17833
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.86.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.86.0
deleted file mode 100644
index 37561d38b4a6..000000000000
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kcrash-5.86*:5 =kde-frameworks/kdbusaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to handle global shortcuts
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kcrash-5.86*:5 =kde-frameworks/kdbusaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kglobalaccel-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=14573d59846aae3baadd92e1687b07b1
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.87.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.87.0
new file mode 100644
index 000000000000..0c897620b05e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kcrash-5.87*:5 =kde-frameworks/kdbusaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to handle global shortcuts
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kcrash-5.87*:5 =kde-frameworks/kdbusaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kglobalaccel-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=14573d59846aae3baadd92e1687b07b1
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.86.0-r1 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.86.0-r1
deleted file mode 100644
index bef54c9fc54e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.86.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 wayland? ( dev-libs/wayland >=dev-qt/qtgui-5.15.2:5=[wayland] >=dev-qt/qtwayland-5.15.2:5 ) x11-base/xorg-proto x11-libs/libxcb test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing assorted high-level user interface components
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=wayland test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 wayland? ( dev-libs/wayland >=dev-qt/qtgui-5.15.2:5=[wayland] >=dev-qt/qtwayland-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kguiaddons-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bd240a0370ab4da47800493ed752b645
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.87.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.87.0
new file mode 100644
index 000000000000..44a6990dd844
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 wayland? ( dev-libs/wayland >=dev-qt/qtgui-5.15.2:5=[wayland] >=dev-qt/qtwayland-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) x11-base/xorg-proto X? ( x11-libs/libxcb ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing assorted high-level user interface components
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=wayland X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 wayland? ( dev-libs/wayland >=dev-qt/qtgui-5.15.2:5=[wayland] >=dev-qt/qtwayland-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kguiaddons-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1483e8c5866d5990b24f0717e25e6a02
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.86.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.86.0
deleted file mode 100644
index c9f3e7189272..000000000000
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library to determine holidays and other special events for a geographical region
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kholidays-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=356bdff344ad6ca669da80568bbcdb87
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.87.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.87.0
new file mode 100644
index 000000000000..b634ca97360a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library to determine holidays and other special events for a geographical region
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kholidays-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=356bdff344ad6ca669da80568bbcdb87
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.86.0 b/metadata/md5-cache/kde-frameworks/khtml-5.86.0
deleted file mode 100644
index ab5fd052fd18..000000000000
--- a/metadata/md5-cache/kde-frameworks/khtml-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/gperf dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kcodecs-5.86*:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kglobalaccel-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kjobwidgets-5.86*:5 =kde-frameworks/kjs-5.86*:5 =kde-frameworks/knotifications-5.86*:5 =kde-frameworks/kparts-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/ktextwidgets-5.86*:5 =kde-frameworks/kwallet-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 =kde-frameworks/sonnet-5.86*:5 media-libs/giflib:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib virtual/jpeg:0 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) test? ( >=dev-qt/qtx11extras-5.15.2:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KHTML web rendering engine
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kcodecs-5.86*:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kglobalaccel-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kjobwidgets-5.86*:5 =kde-frameworks/kjs-5.86*:5 =kde-frameworks/knotifications-5.86*:5 =kde-frameworks/kparts-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/ktextwidgets-5.86*:5 =kde-frameworks/kwallet-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 =kde-frameworks/sonnet-5.86*:5 media-libs/giflib:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib virtual/jpeg:0 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/portingAids/khtml-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1f399a787b883123bb5ce92a57b38a71
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.87.0 b/metadata/md5-cache/kde-frameworks/khtml-5.87.0
new file mode 100644
index 000000000000..f4f7ca7e4789
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-util/gperf dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.87*:5 =kde-frameworks/kcodecs-5.87*:5 =kde-frameworks/kcompletion-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kglobalaccel-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kjobwidgets-5.87*:5 =kde-frameworks/kjs-5.87*:5 =kde-frameworks/knotifications-5.87*:5 =kde-frameworks/kparts-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/ktextwidgets-5.87*:5 =kde-frameworks/kwallet-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 =kde-frameworks/sonnet-5.87*:5 media-libs/giflib:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib virtual/jpeg:0 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) test? ( >=dev-qt/qtx11extras-5.15.2:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KHTML web rendering engine
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.87*:5 =kde-frameworks/kcodecs-5.87*:5 =kde-frameworks/kcompletion-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kglobalaccel-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kjobwidgets-5.87*:5 =kde-frameworks/kjs-5.87*:5 =kde-frameworks/knotifications-5.87*:5 =kde-frameworks/kparts-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/ktextwidgets-5.87*:5 =kde-frameworks/kwallet-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 =kde-frameworks/sonnet-5.87*:5 media-libs/giflib:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib virtual/jpeg:0 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/portingAids/khtml-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1f399a787b883123bb5ce92a57b38a71
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.86.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.86.0
deleted file mode 100644
index b096e7f126f9..000000000000
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.86.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-qt/qtdeclarative-5.15.2:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework based on Gettext for internationalizing user interface text
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-qt/qtdeclarative-5.15.2:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/ki18n-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=915f9df05593e5b23d26b9a549bd12d2
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.87.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.87.0
new file mode 100644
index 000000000000..4126c1742f81
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.87.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-qt/qtdeclarative-5.15.2:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework based on Gettext for internationalizing user interface text
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-qt/qtdeclarative-5.15.2:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/ki18n-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=915f9df05593e5b23d26b9a549bd12d2
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.86.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.86.0
deleted file mode 100644
index 57b58f776482..000000000000
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for icon theming and configuration
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kiconthemes-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b53ea36247dd2e70a4f1cb6f447e3ad2
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.87.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.87.0
new file mode 100644
index 000000000000..4269973c2590
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/karchive-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kitemviews-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for icon theming and configuration
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/karchive-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kitemviews-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kiconthemes-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b53ea36247dd2e70a4f1cb6f447e3ad2
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.86.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.86.0
deleted file mode 100644
index 4089db1e7df7..000000000000
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.2:5 x11-libs/libXScrnSaver ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for detection and notification of device idle time
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=X xscreensaver debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.2:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-REQUIRED_USE=xscreensaver? ( X )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kidletime-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d14e328883a5658b4fd3e256a43fe239
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.87.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.87.0
new file mode 100644
index 000000000000..820b9cb70f75
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.2:5 x11-libs/libXScrnSaver ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for detection and notification of device idle time
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=X xscreensaver debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.2:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+REQUIRED_USE=xscreensaver? ( X )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kidletime-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d14e328883a5658b4fd3e256a43fe239
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.86.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.86.0
deleted file mode 100644
index 8aca5901eeb6..000000000000
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/karchive-5.86*:5 avif? ( >=media-libs/libavif-0.8.2 ) eps? ( >=dev-qt/qtprintsupport-5.15.2:5 ) heif? ( >=media-libs/libheif-1.10.0:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing additional format plugins for Qt's image I/O system
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=avif eps heif openexr test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/karchive-5.86*:5 avif? ( >=media-libs/libavif-0.8.2 ) eps? ( >=dev-qt/qtprintsupport-5.15.2:5 ) heif? ( >=media-libs/libheif-1.10.0:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kimageformats-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=26c39dfc7e6b0ed3693f6e87fea68c0f
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.87.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.87.0
new file mode 100644
index 000000000000..d1830216ebdf
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/karchive-5.87*:5 avif? ( >=media-libs/libavif-0.8.2 ) eps? ( >=dev-qt/qtprintsupport-5.15.2:5 ) heif? ( >=media-libs/libheif-1.10.0:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing additional format plugins for Qt's image I/O system
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=avif eps heif openexr test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/karchive-5.87*:5 avif? ( >=media-libs/libavif-0.8.2 ) eps? ( >=dev-qt/qtprintsupport-5.15.2:5 ) heif? ( >=media-libs/libheif-1.10.0:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kimageformats-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=26c39dfc7e6b0ed3693f6e87fea68c0f
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.86.0 b/metadata/md5-cache/kde-frameworks/kinit-5.86.0
deleted file mode 100644
index 525248b0b47b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kinit-5.86.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.86:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kcrash-5.86*:5 =kde-frameworks/kdbusaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) dev-qt/qtcore:5
-DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+caps +man X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kcrash-5.86*:5 =kde-frameworks/kdbusaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kinit-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=182d04134053e6ec73ec60adf9332004
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.87.0 b/metadata/md5-cache/kde-frameworks/kinit-5.87.0
new file mode 100644
index 000000000000..1753ce335f73
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.87.0
@@ -0,0 +1,14 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.87:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kcrash-5.87*:5 =kde-frameworks/kdbusaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) dev-qt/qtcore:5
+DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+caps +man X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kcrash-5.87*:5 =kde-frameworks/kdbusaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kinit-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=182d04134053e6ec73ec60adf9332004
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.86.0 b/metadata/md5-cache/kde-frameworks/kio-5.86.0
deleted file mode 100644
index 22d94ec6cb41..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.86.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kauth-5.86*:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kbookmarks-5.86*:5 =kde-frameworks/kcodecs-5.86*:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kcrash-5.86*:5 =kde-frameworks/kdbusaddons-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kjobwidgets-5.86*:5 =kde-frameworks/knotifications-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/ktextwidgets-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 =kde-frameworks/solid-5.86*:5 sys-apps/util-linux acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.86*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.86*:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=dev-qt/qtconcurrent-5.15.2:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing transparent file and data management
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-PDEPEND=>=kde-frameworks/kded-5.86:5
-RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kauth-5.86*:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kbookmarks-5.86*:5 =kde-frameworks/kcodecs-5.86*:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kcrash-5.86*:5 =kde-frameworks/kdbusaddons-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kjobwidgets-5.86*:5 =kde-frameworks/knotifications-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/ktextwidgets-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 =kde-frameworks/solid-5.86*:5 sys-apps/util-linux acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.86*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.86*:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kio-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=800c3830de5b826523075d6481cab84e
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.87.0 b/metadata/md5-cache/kde-frameworks/kio-5.87.0
new file mode 100644
index 000000000000..397f0a59a72a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kio-5.87.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kauth-5.87*:5 =kde-frameworks/karchive-5.87*:5 =kde-frameworks/kbookmarks-5.87*:5 =kde-frameworks/kcodecs-5.87*:5 =kde-frameworks/kcompletion-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kcrash-5.87*:5 =kde-frameworks/kdbusaddons-5.87*:5 =kde-frameworks/kguiaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kitemviews-5.87*:5 =kde-frameworks/kjobwidgets-5.87*:5 =kde-frameworks/knotifications-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/ktextwidgets-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 =kde-frameworks/solid-5.87*:5 sys-apps/util-linux acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.87*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.87*:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=dev-qt/qtconcurrent-5.15.2:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing transparent file and data management
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+PDEPEND=>=kde-frameworks/kded-5.87:5
+RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kauth-5.87*:5 =kde-frameworks/karchive-5.87*:5 =kde-frameworks/kbookmarks-5.87*:5 =kde-frameworks/kcodecs-5.87*:5 =kde-frameworks/kcompletion-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kcrash-5.87*:5 =kde-frameworks/kdbusaddons-5.87*:5 =kde-frameworks/kguiaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kitemviews-5.87*:5 =kde-frameworks/kjobwidgets-5.87*:5 =kde-frameworks/knotifications-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/ktextwidgets-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 =kde-frameworks/solid-5.87*:5 sys-apps/util-linux acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.87*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.87*:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kio-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=800c3830de5b826523075d6481cab84e
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.86.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.86.0
deleted file mode 100644
index a43f5b35c04c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-qt/linguist-tools-5.15.2:5 dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
-EAPI=8
-HOMEPAGE=https://techbase.kde.org/Kirigami
-IUSE=debug examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kirigami2-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f706b5e3fd5993bcfe46c7bbfff102ab
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.87.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.87.0
new file mode 100644
index 000000000000..646ec9350e2b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-qt/linguist-tools-5.15.2:5 dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
+EAPI=8
+HOMEPAGE=https://techbase.kde.org/Kirigami
+IUSE=debug examples test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kirigami2-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f706b5e3fd5993bcfe46c7bbfff102ab
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.86.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.86.0
deleted file mode 100644
index 533745801bf8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=qml test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kitemmodels-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=560803764cf000ffe72331326c7a8a84
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.87.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.87.0
new file mode 100644
index 000000000000..5489309d49c4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=qml test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kitemmodels-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=560803764cf000ffe72331326c7a8a84
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.86.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.86.0
deleted file mode 100644
index e7bd14e126fe..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing additional widgets for item models
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kitemviews-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dc264f38d70d5e2a89704062e5140aba
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.87.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.87.0
new file mode 100644
index 000000000000..7d0102eb5494
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing additional widgets for item models
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kitemviews-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=dc264f38d70d5e2a89704062e5140aba
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.86.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.86.0
deleted file mode 100644
index a295ecca6508..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) X? ( x11-base/xorg-proto x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kjobwidgets-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7f9aed1c4dd42b5b614e47c146f98cad
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.87.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.87.0
new file mode 100644
index 000000000000..00f275cf9d1b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) X? ( x11-base/xorg-proto x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kjobwidgets-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7f9aed1c4dd42b5b614e47c146f98cad
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.86.0 b/metadata/md5-cache/kde-frameworks/kjs-5.86.0
deleted file mode 100644
index 67ba1061678e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjs-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libpcre test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=ECMAScipt compatible parser and engine
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=BSD-2 LGPL-2+
-RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/portingAids/kjs-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4473090c94f93ad8f8211b2593822e2f
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.87.0 b/metadata/md5-cache/kde-frameworks/kjs-5.87.0
new file mode 100644
index 000000000000..eb087751933c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.87:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libpcre test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=ECMAScipt compatible parser and engine
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD-2 LGPL-2+
+RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/portingAids/kjs-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4473090c94f93ad8f8211b2593822e2f
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.86.0-r2 b/metadata/md5-cache/kde-frameworks/knewstuff-5.86.0-r2
deleted file mode 100644
index 4784f2759a92..000000000000
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.86.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/attica-5.86*:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kpackage-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/ktextwidgets-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 opds? ( =kde-frameworks/syndication-5.86*:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for downloading and sharing additional application data
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=opds debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/attica-5.86*:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kpackage-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/ktextwidgets-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 opds? ( =kde-frameworks/syndication-5.86*:5 ) >=kde-frameworks/kirigami-5.86:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/knewstuff-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1e72892fb3fc1252e7e8848ee6a1250d
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.87.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.87.0
new file mode 100644
index 000000000000..ca382224ccea
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.87.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/attica-5.87*:5 =kde-frameworks/karchive-5.87*:5 =kde-frameworks/kcompletion-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kitemviews-5.87*:5 =kde-frameworks/kpackage-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/ktextwidgets-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 opds? ( =kde-frameworks/syndication-5.87*:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for downloading and sharing additional application data
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=opds debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/attica-5.87*:5 =kde-frameworks/karchive-5.87*:5 =kde-frameworks/kcompletion-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kitemviews-5.87*:5 =kde-frameworks/kpackage-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/ktextwidgets-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 opds? ( =kde-frameworks/syndication-5.87*:5 ) >=kde-frameworks/kirigami-5.87:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/knewstuff-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3d6925975b3e0530ab70de105ad2d541
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.86.0-r1 b/metadata/md5-cache/kde-frameworks/knotifications-5.86.0-r1
deleted file mode 100644
index 360debdd6e5a..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.86.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5[X=] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXtst ) X? ( x11-base/xorg-proto ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for notifying the user of an event
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=dbus nls phonon speech X debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5[X=] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/knotifications-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8e1894afe0f114354a3d896566f5c8a6
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.87.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.87.0
new file mode 100644
index 000000000000..a884d1d63b26
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.87.0
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5[X=] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXtst ) X? ( x11-base/xorg-proto ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for notifying the user of an event
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=dbus nls phonon speech X debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5[X=] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/knotifications-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8e1894afe0f114354a3d896566f5c8a6
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.86.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.86.0
deleted file mode 100644
index 301dce4fef89..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.86.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kio-5.86*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for configuring desktop notifications
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=phonon debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kio-5.86*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/knotifyconfig-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9a7e92da477f42915f9c64c7c202d8ef
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.87.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.87.0
new file mode 100644
index 000000000000..0c7a118fda0d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.87.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kio-5.87*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for configuring desktop notifications
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=phonon debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kio-5.87*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/knotifyconfig-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9a7e92da477f42915f9c64c7c202d8ef
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.86.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.86.0
deleted file mode 100644
index 18b8f6265014..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.86:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to install and load packages of non binary content
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kpackage-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a4b988bd67c723bcfb3d0d68b2ef5fa7
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.87.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.87.0
new file mode 100644
index 000000000000..3ee3e0d530ac
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.87:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 =kde-frameworks/karchive-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to install and load packages of non binary content
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 =kde-frameworks/karchive-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kpackage-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a4b988bd67c723bcfb3d0d68b2ef5fa7
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.86.0 b/metadata/md5-cache/kde-frameworks/kparts-5.86.0
deleted file mode 100644
index b9e95b742cac..000000000000
--- a/metadata/md5-cache/kde-frameworks/kparts-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kjobwidgets-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 >=kde-frameworks/ktextwidgets-5.86:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing elaborate user-interface components
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kjobwidgets-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kparts-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=31e08412ba2b9d7e963e0910f499fae1
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.87.0 b/metadata/md5-cache/kde-frameworks/kparts-5.87.0
new file mode 100644
index 000000000000..4c33bcfb4e8c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kjobwidgets-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 >=kde-frameworks/ktextwidgets-5.87:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing elaborate user-interface components
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kjobwidgets-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kparts-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=31e08412ba2b9d7e963e0910f499fae1
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.86.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.86.0
deleted file mode 100644
index 1bceefc1323f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE contact person abstraction library
-EAPI=8
-HOMEPAGE=https://invent.kde.org/frameworks/kpeople
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kpeople-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=16e65985267bafc473f732324dafa15b
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.87.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.87.0
new file mode 100644
index 000000000000..b8ddb8867059
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kitemviews-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE contact person abstraction library
+EAPI=8
+HOMEPAGE=https://invent.kde.org/frameworks/kpeople
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kitemviews-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kpeople-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=16e65985267bafc473f732324dafa15b
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.86.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.86.0
deleted file mode 100644
index 0ff139fe288a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing easy data-plotting functions
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kplotting-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=179142e7039171293728d45782a5bd04
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.87.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.87.0
new file mode 100644
index 000000000000..be5284138621
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing easy data-plotting functions
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kplotting-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=179142e7039171293728d45782a5bd04
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.86.0 b/metadata/md5-cache/kde-frameworks/kpty-5.86.0
deleted file mode 100644
index bf1982cf7b34..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpty-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 sys-libs/libutempter test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for pseudo terminal devices and running child processes
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kpty-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a813a06b8de609990b613793b29ab122
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.87.0 b/metadata/md5-cache/kde-frameworks/kpty-5.87.0
new file mode 100644
index 000000000000..91afc0795324
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 sys-libs/libutempter test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for pseudo terminal devices and running child processes
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kpty-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a813a06b8de609990b613793b29ab122
diff --git a/metadata/md5-cache/kde-frameworks/kquickcharts-5.86.0 b/metadata/md5-cache/kde-frameworks/kquickcharts-5.86.0
deleted file mode 100644
index 2ab7dc0ac24a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kquickcharts-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 examples? ( >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kdeclarative-5.86*:5 =kde-frameworks/kirigami-5.86*:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=QtQuick plugin providing high-performance charts
-EAPI=8
-HOMEPAGE=https://invent.kde.org/frameworks/kquickcharts
-IUSE=test debug examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 examples? ( >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kdeclarative-5.86*:5 =kde-frameworks/kirigami-5.86*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kquickcharts-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=33b2ca5b3120a04452e19cb9529104d0
diff --git a/metadata/md5-cache/kde-frameworks/kquickcharts-5.87.0 b/metadata/md5-cache/kde-frameworks/kquickcharts-5.87.0
new file mode 100644
index 000000000000..dfaf29883dc5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kquickcharts-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 examples? ( >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kdeclarative-5.87*:5 =kde-frameworks/kirigami-5.87*:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=QtQuick plugin providing high-performance charts
+EAPI=8
+HOMEPAGE=https://invent.kde.org/frameworks/kquickcharts
+IUSE=test debug examples test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 examples? ( >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kdeclarative-5.87*:5 =kde-frameworks/kirigami-5.87*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kquickcharts-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=33b2ca5b3120a04452e19cb9529104d0
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.86.0 b/metadata/md5-cache/kde-frameworks/kross-5.86.0
deleted file mode 100644
index 8b76c2ee1aab..000000000000
--- a/metadata/md5-cache/kde-frameworks/kross-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kparts-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 >=dev-qt/designer-5.15.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for embedding scripting into applications
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kparts-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/portingAids/kross-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f8c2af7bf5f89ad804c7f084514255b3
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.87.0 b/metadata/md5-cache/kde-frameworks/kross-5.87.0
new file mode 100644
index 000000000000..91a0a7c56041
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kross-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.87:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcompletion-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kparts-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 >=dev-qt/designer-5.15.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for embedding scripting into applications
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcompletion-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kparts-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/portingAids/kross-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f8c2af7bf5f89ad804c7f084514255b3
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.86.0 b/metadata/md5-cache/kde-frameworks/krunner-5.86.0
deleted file mode 100644
index d8ae7bf46496..000000000000
--- a/metadata/md5-cache/kde-frameworks/krunner-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/plasma-5.86*:5 =kde-frameworks/solid-5.86*:5 =kde-frameworks/threadweaver-5.86*:5 activities? ( =kde-frameworks/kactivities-5.86*:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for providing different actions given a string query
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=activities test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/plasma-5.86*:5 =kde-frameworks/solid-5.86*:5 =kde-frameworks/threadweaver-5.86*:5 activities? ( =kde-frameworks/kactivities-5.86*:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/krunner-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=37df2a65fcc7ac96e036f6d6cf63cebb
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.87.0 b/metadata/md5-cache/kde-frameworks/krunner-5.87.0
new file mode 100644
index 000000000000..12c9b1767374
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/plasma-5.87*:5 =kde-frameworks/solid-5.87*:5 =kde-frameworks/threadweaver-5.87*:5 activities? ( =kde-frameworks/kactivities-5.87*:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for providing different actions given a string query
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=activities test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/plasma-5.87*:5 =kde-frameworks/solid-5.87*:5 =kde-frameworks/threadweaver-5.87*:5 activities? ( =kde-frameworks/kactivities-5.87*:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/krunner-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=37df2a65fcc7ac96e036f6d6cf63cebb
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.86.0 b/metadata/md5-cache/kde-frameworks/kservice-5.86.0
deleted file mode 100644
index f4dcfc6f97fd..000000000000
--- a/metadata/md5-cache/kde-frameworks/kservice-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.86:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kdbusaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Advanced plugin and service introspection
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2 LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kdbusaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kservice-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c52b6c930e4114a1a69e7dd40c405a7b
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.87.0 b/metadata/md5-cache/kde-frameworks/kservice-5.87.0
new file mode 100644
index 000000000000..08cf630b7fba
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.87:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kdbusaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Advanced plugin and service introspection
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2 LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kdbusaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kservice-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c52b6c930e4114a1a69e7dd40c405a7b
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.86.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.86.0
deleted file mode 100644
index b1b6101b8580..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=kde-frameworks/kservice-5.86:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kauth-5.86*:5 =kde-frameworks/kcodecs-5.86*:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kjobwidgets-5.86*:5 =kde-frameworks/kparts-5.86*:5 =kde-frameworks/ktextwidgets-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 =kde-frameworks/sonnet-5.86*:5 =kde-frameworks/syntax-highlighting-5.86*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing a full text editor component
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+editorconfig git test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kauth-5.86*:5 =kde-frameworks/kcodecs-5.86*:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kjobwidgets-5.86*:5 =kde-frameworks/kparts-5.86*:5 =kde-frameworks/ktextwidgets-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 =kde-frameworks/sonnet-5.86*:5 =kde-frameworks/syntax-highlighting-5.86*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/ktexteditor-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=991d8affc558d088154ae7d76f48f3f6
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.87.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.87.0
new file mode 100644
index 000000000000..7e946892a227
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=kde-frameworks/kservice-5.87:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.87*:5 =kde-frameworks/kauth-5.87*:5 =kde-frameworks/kcodecs-5.87*:5 =kde-frameworks/kcompletion-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kguiaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kitemviews-5.87*:5 =kde-frameworks/kjobwidgets-5.87*:5 =kde-frameworks/kparts-5.87*:5 =kde-frameworks/ktextwidgets-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 =kde-frameworks/sonnet-5.87*:5 =kde-frameworks/syntax-highlighting-5.87*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing a full text editor component
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+editorconfig git test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.87*:5 =kde-frameworks/kauth-5.87*:5 =kde-frameworks/kcodecs-5.87*:5 =kde-frameworks/kcompletion-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kguiaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kitemviews-5.87*:5 =kde-frameworks/kjobwidgets-5.87*:5 =kde-frameworks/kparts-5.87*:5 =kde-frameworks/ktextwidgets-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 =kde-frameworks/sonnet-5.87*:5 =kde-frameworks/syntax-highlighting-5.87*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/ktexteditor-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=991d8affc558d088154ae7d76f48f3f6
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.86.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.86.0
deleted file mode 100644
index 786ec27fdc54..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/sonnet-5.86*:5 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=speech test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/sonnet-5.86*:5 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/ktextwidgets-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=67685900295ac92bfbe626adbb27d5f4
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.87.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.87.0
new file mode 100644
index 000000000000..0801e5a82979
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/sonnet-5.87*:5 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=speech test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/sonnet-5.87*:5 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/ktextwidgets-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=67685900295ac92bfbe626adbb27d5f4
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.86.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.86.0
deleted file mode 100644
index 8c635cbe1efa..000000000000
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.15.2:5 =kde-frameworks/ki18n-5.86*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for converting units
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 =kde-frameworks/ki18n-5.86*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kunitconversion-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=385c09fee2d6312526f6ae3e5ad7cc0a
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.87.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.87.0
new file mode 100644
index 000000000000..fe199fdc994d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.15.2:5 =kde-frameworks/ki18n-5.87*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for converting units
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 =kde-frameworks/ki18n-5.87*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kunitconversion-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=385c09fee2d6312526f6ae3e5ad7cc0a
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.86.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.86.0
deleted file mode 100644
index 07558b4260d8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.86:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kdbusaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/knotifications-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing desktop-wide storage for passwords
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=gpg +man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kdbusaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/knotifications-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kwallet-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bd8432aac7e12cd6c447b39fce432eef
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.87.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.87.0
new file mode 100644
index 000000000000..856e8dc3fb6b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.87:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kdbusaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/knotifications-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing desktop-wide storage for passwords
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=gpg +man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kdbusaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/knotifications-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kwallet-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bd8432aac7e12cd6c447b39fce432eef
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.86.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.86.0
deleted file mode 100644
index 9f737e91856c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/wayland-scanner-1.19.0 dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[egl] >=dev-qt/qtwayland-5.15.2:5 media-libs/libglvnd >=dev-libs/plasma-wayland-protocols-1.4.0 >=dev-libs/wayland-protocols-1.15 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
-EAPI=8
-HOMEPAGE=https://invent.kde.org/frameworks/kwayland
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[egl] >=dev-qt/qtwayland-5.15.2:5 media-libs/libglvnd >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kwayland-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=65b433682431f86d5d0afe0f41ff43b8
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.87.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.87.0
new file mode 100644
index 000000000000..1b147b3d2187
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/wayland-scanner-1.19.0 dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[egl] >=dev-qt/qtwayland-5.15.2:5 media-libs/libglvnd >=dev-libs/plasma-wayland-protocols-1.4.0 >=dev-libs/wayland-protocols-1.15 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
+EAPI=8
+HOMEPAGE=https://invent.kde.org/frameworks/kwayland
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[egl] >=dev-qt/qtwayland-5.15.2:5 media-libs/libglvnd >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kwayland-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=65b433682431f86d5d0afe0f41ff43b8
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.86.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.86.0
deleted file mode 100644
index 65c19050fda8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=An assortment of high-level widgets for common tasks
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kwidgetsaddons-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9bda9777a4830559c32931d8c0ca26e9
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.87.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.87.0
new file mode 100644
index 000000000000..457a46c4435b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=An assortment of high-level widgets for common tasks
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kwidgetsaddons-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9bda9777a4830559c32931d8c0ca26e9
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.86.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.86.0
deleted file mode 100644
index b50c3cae3f3f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) X? ( x11-base/xorg-proto ) test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing access to properties and features of the window manager
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kwindowsystem-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ac0b8480b465e6f49c99ad4059dfd135
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.87.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.87.0
new file mode 100644
index 000000000000..4ce6ad14c7ce
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) X? ( x11-base/xorg-proto ) test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing access to properties and features of the window manager
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kwindowsystem-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ac0b8480b465e6f49c99ad4059dfd135
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.86.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.86.0
deleted file mode 100644
index e384e38c1c08..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.15.2:5= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kglobalaccel-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.15.2:5= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kglobalaccel-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kitemviews-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/kxmlgui-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0eea6dcd1e2576029479207e6deb53cb
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.87.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.87.0
new file mode 100644
index 000000000000..52579722e65d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.15.2:5= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kglobalaccel-5.87*:5 =kde-frameworks/kguiaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kitemviews-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtcore-5.15.2:5= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kglobalaccel-5.87*:5 =kde-frameworks/kguiaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kitemviews-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/kxmlgui-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0eea6dcd1e2576029479207e6deb53cb
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.86.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.86.0
deleted file mode 100644
index bcbf7d0eec5f..000000000000
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 net-misc/modemmanager test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=ModemManager bindings for Qt
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/modemmanager-qt-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=72610f55eb2218db99da5031542fc091
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.87.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.87.0
new file mode 100644
index 000000000000..2c2dbb9bdc1e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 net-misc/modemmanager test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=ModemManager bindings for Qt
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/modemmanager-qt-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=72610f55eb2218db99da5031542fc091
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.86.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.86.0
deleted file mode 100644
index 065c59950726..000000000000
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=NetworkManager bindings for Qt
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=teamd debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] || ( >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/networkmanager-qt-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2f770d2a1560fe9b13184c6a39e15eeb
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.87.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.87.0
new file mode 100644
index 000000000000..3172d7cc7b1d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=NetworkManager bindings for Qt
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=teamd debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] || ( >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/networkmanager-qt-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2f770d2a1560fe9b13184c6a39e15eeb
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.86.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.86.0
deleted file mode 100644
index 5346913164b0..000000000000
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.86.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-qt/qtcore-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.86:5 test? ( app-misc/fdupes ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=test? ( >=dev-qt/qttest-5.15.2:5 )
-DESCRIPTION=Oxygen SVG icon theme
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=LGPL-3
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/oxygen-icons5-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e394707718f5355d46fc95ef35f0edd3
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.87.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.87.0
new file mode 100644
index 000000000000..6db36e1d671c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.87.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-qt/qtcore-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.87:5 test? ( app-misc/fdupes ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
+DEPEND=test? ( >=dev-qt/qttest-5.15.2:5 )
+DESCRIPTION=Oxygen SVG icon theme
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/oxygen-icons5-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e394707718f5355d46fc95ef35f0edd3
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.86.0-r1 b/metadata/md5-cache/kde-frameworks/plasma-5.86.0-r1
deleted file mode 100644
index c8111ece203b..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.86.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.86:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=,X=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.86*:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kdeclarative-5.86*:5 =kde-frameworks/kglobalaccel-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kirigami-5.86*:5 =kde-frameworks/knotifications-5.86*:5 =kde-frameworks/kpackage-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 !gles2-only? ( media-libs/libglvnd[X?] ) wayland? ( =kde-frameworks/kwayland-5.86*:5 media-libs/libglvnd ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma framework
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=gles2-only man wayland X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=,X=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.86*:5 =kde-frameworks/karchive-5.86*:5 =kde-frameworks/kconfig-5.86*:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/kdeclarative-5.86*:5 =kde-frameworks/kglobalaccel-5.86*:5 =kde-frameworks/kguiaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kirigami-5.86*:5 =kde-frameworks/knotifications-5.86*:5 =kde-frameworks/kpackage-5.86*:5 =kde-frameworks/kservice-5.86*:5 =kde-frameworks/kwidgetsaddons-5.86*:5 =kde-frameworks/kwindowsystem-5.86*:5 =kde-frameworks/kxmlgui-5.86*:5 !gles2-only? ( media-libs/libglvnd[X?] ) wayland? ( =kde-frameworks/kwayland-5.86*:5 media-libs/libglvnd ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/plasma-framework-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c2baf9849dd825b4ed5b6037e6f7d18f
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.87.0 b/metadata/md5-cache/kde-frameworks/plasma-5.87.0
new file mode 100644
index 000000000000..818928bc2ed2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.87:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=,X=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.87*:5 =kde-frameworks/karchive-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kdeclarative-5.87*:5 =kde-frameworks/kglobalaccel-5.87*:5 =kde-frameworks/kguiaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kirigami-5.87*:5 =kde-frameworks/knotifications-5.87*:5 =kde-frameworks/kpackage-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 !gles2-only? ( media-libs/libglvnd[X?] ) wayland? ( =kde-frameworks/kwayland-5.87*:5 media-libs/libglvnd ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma framework
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=gles2-only man wayland X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=,X=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.87*:5 =kde-frameworks/karchive-5.87*:5 =kde-frameworks/kconfig-5.87*:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/kdeclarative-5.87*:5 =kde-frameworks/kglobalaccel-5.87*:5 =kde-frameworks/kguiaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kirigami-5.87*:5 =kde-frameworks/knotifications-5.87*:5 =kde-frameworks/kpackage-5.87*:5 =kde-frameworks/kservice-5.87*:5 =kde-frameworks/kwidgetsaddons-5.87*:5 =kde-frameworks/kwindowsystem-5.87*:5 =kde-frameworks/kxmlgui-5.87*:5 !gles2-only? ( media-libs/libglvnd[X?] ) wayland? ( =kde-frameworks/kwayland-5.87*:5 media-libs/libglvnd ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/plasma-framework-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9468df342fbe07a6d4ddfabef53e7252
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.86.0 b/metadata/md5-cache/kde-frameworks/prison-5.86.0
deleted file mode 100644
index da3d1ff13f1a..000000000000
--- a/metadata/md5-cache/kde-frameworks/prison-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=QRCode and data matrix barcode library
-EAPI=8
-HOMEPAGE=https://invent.kde.org/frameworks/prison
-IUSE=qml debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/prison-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f9c91136dbe9b1d9116bab899bbbfb5b
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.87.0 b/metadata/md5-cache/kde-frameworks/prison-5.87.0
new file mode 100644
index 000000000000..77e02d1abfc0
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/prison-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) test? ( >=dev-qt/qtwidgets-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=QRCode and data matrix barcode library
+EAPI=8
+HOMEPAGE=https://invent.kde.org/frameworks/prison
+IUSE=qml debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/prison-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f9c91136dbe9b1d9116bab899bbbfb5b
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.86.0 b/metadata/md5-cache/kde-frameworks/purpose-5.86.0
deleted file mode 100644
index 26a17936ab62..000000000000
--- a/metadata/md5-cache/kde-frameworks/purpose-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kirigami-5.86*:5 =kde-frameworks/knotifications-5.86*:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for providing abstractions to get the developer's purposes fulfilled
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=bluetooth +kaccounts debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.86*:5 =kde-frameworks/ki18n-5.86*:5 =kde-frameworks/kio-5.86*:5 =kde-frameworks/kirigami-5.86*:5 =kde-frameworks/knotifications-5.86*:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kdeclarative-5.86:5 bluetooth? ( =kde-frameworks/bluez-qt-5.86*:5 ) kaccounts? ( net-libs/accounts-qml ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/purpose-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c77d69bf59f23af89882f451349f4252
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.87.0 b/metadata/md5-cache/kde-frameworks/purpose-5.87.0
new file mode 100644
index 000000000000..f0e0683c69b7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kirigami-5.87*:5 =kde-frameworks/knotifications-5.87*:5 =kde-frameworks/prison-5.87*:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for providing abstractions to get the developer's purposes fulfilled
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=bluetooth +kaccounts debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.87*:5 =kde-frameworks/ki18n-5.87*:5 =kde-frameworks/kio-5.87*:5 =kde-frameworks/kirigami-5.87*:5 =kde-frameworks/knotifications-5.87*:5 =kde-frameworks/prison-5.87*:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kdeclarative-5.87:5 bluetooth? ( =kde-frameworks/bluez-qt-5.87*:5 ) kaccounts? ( net-libs/accounts-qml ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/purpose-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=070767ec586cc4ebfc1b2738f357e1e3
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.86.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.86.0
deleted file mode 100644
index 79386044d8ce..000000000000
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kirigami-5.86*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=|| ( GPL-2+ LGPL-3+ )
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfigwidgets-5.86*:5 =kde-frameworks/kiconthemes-5.86*:5 =kde-frameworks/kirigami-5.86*:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/qqc2-desktop-style-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5b8e0bc5ac9021edab9b73b0caa96bd1
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.87.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.87.0
new file mode 100644
index 000000000000..fd0ae9970ac9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kirigami-5.87*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-2+ LGPL-3+ )
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfigwidgets-5.87*:5 =kde-frameworks/kiconthemes-5.87*:5 =kde-frameworks/kirigami-5.87*:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/qqc2-desktop-style-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5b8e0bc5ac9021edab9b73b0caa96bd1
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.86.0 b/metadata/md5-cache/kde-frameworks/solid-5.86.0
deleted file mode 100644
index f70c5b91a223..000000000000
--- a/metadata/md5-cache/kde-frameworks/solid-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-apps/util-linux sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=ios nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-apps/util-linux sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/solid-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e6bc04f4c44db02a58f399f3308b14ce
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.87.0 b/metadata/md5-cache/kde-frameworks/solid-5.87.0
new file mode 100644
index 000000000000..42f82e8a68c1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/solid-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-apps/util-linux sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) test? ( >=dev-qt/qtconcurrent-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=ios nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-apps/util-linux sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/solid-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e6bc04f4c44db02a58f399f3308b14ce
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.86.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.86.0
deleted file mode 100644
index 927278110e3a..000000000000
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=aspell +hunspell nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/sonnet-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a1eec0e8c462d2f3fae83e0a1f90a920
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.87.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.87.0
new file mode 100644
index 000000000000..139f9e9eba22
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=aspell +hunspell nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/sonnet-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a1eec0e8c462d2f3fae83e0a1f90a920
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.86.0 b/metadata/md5-cache/kde-frameworks/syndication-5.86.0
deleted file mode 100644
index cac22d53bee8..000000000000
--- a/metadata/md5-cache/kde-frameworks/syndication-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.86*:5 test? ( >=dev-qt/qtnetwork-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for parsing RSS and Atom feeds
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.86*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/syndication-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=167c77c250afa00fb40104530c7fcddf
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.87.0 b/metadata/md5-cache/kde-frameworks/syndication-5.87.0
new file mode 100644
index 000000000000..a1ea7427e51a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.87*:5 test? ( >=dev-qt/qtnetwork-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for parsing RSS and Atom feeds
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.87*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/syndication-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=167c77c250afa00fb40104530c7fcddf
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.86.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.86.0
deleted file mode 100644
index 7561b98345bd..000000000000
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for syntax highlighting
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/syntax-highlighting-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4b25f229ba17ddba7d44a8fad926f472
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.87.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.87.0
new file mode 100644
index 000000000000..2b0626f3015a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for syntax highlighting
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/syntax-highlighting-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2e42e33a9a26da58771e2f6d080fea86
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.86.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.86.0
deleted file mode 100644
index e02666d8524d..000000000000
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.86.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing threads using job and queue-based interfaces
-EAPI=8
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.86
-SRC_URI=mirror://kde/stable/frameworks/5.86/threadweaver-5.86.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=86fb59ea695eb04aff0cf3c32f4e08e5
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.87.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.87.0
new file mode 100644
index 000000000000..4b4331fadd55
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.87.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.87:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing threads using job and queue-based interfaces
+EAPI=8
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.87
+SRC_URI=mirror://kde/stable/frameworks/5.87/threadweaver-5.87.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=86fb59ea695eb04aff0cf3c32f4e08e5
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 9eab77b31486..9794ad6dd491 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/kio-fuse-5.0.1 b/metadata/md5-cache/kde-misc/kio-fuse-5.0.1
index 9feb5d98e284..bf0c669c0f4c 100644
--- a/metadata/md5-cache/kde-misc/kio-fuse-5.0.1
+++ b/metadata/md5-cache/kde-misc/kio-fuse-5.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/kio-fuse/5.0.1/kio-fuse-5.0.1.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=357e6f49db7753cb0e8d49fb59c74d4e
diff --git a/metadata/md5-cache/kde-misc/skanlite-21.08.2 b/metadata/md5-cache/kde-misc/skanlite-21.08.2
index 839f8ae2bbe4..88daa6a5d977 100644
--- a/metadata/md5-cache/kde-misc/skanlite-21.08.2
+++ b/metadata/md5-cache/kde-misc/skanlite-21.08.2
@@ -5,11 +5,11 @@ DESCRIPTION=Simple image scanning application based on libksane and KDE Framewor
 EAPI=8
 HOMEPAGE=https://apps.kde.org/skanlite/
 IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-apps/libksane-21.08.2:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kconfigwidgets-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/kjobwidgets-5.84.0:5 >=kde-frameworks/kwidgetsaddons-5.84.0:5 >=kde-frameworks/kxmlgui-5.84.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/skanlite-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9ac68fe8864d09f78bcf46092db0615f
+_md5_=cba87385bd9e50349dafec3aedba892b
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 027f0de4e224..9ec4b24f7ee8 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.22.90 b/metadata/md5-cache/kde-plasma/bluedevil-5.22.90
deleted file mode 100644
index ba7afbf83112..000000000000
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 dev-qt/qtcore:5
-DESCRIPTION=Bluetooth stack for KDE Plasma
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/bluedevil
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-plasma/kde-cli-tools-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/bluedevil-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a1d91672b8e285d76e3ee5fca8ec4c41
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.23.1 b/metadata/md5-cache/kde-plasma/bluedevil-5.23.1
new file mode 100644
index 000000000000..ad982c78b952
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=Bluetooth stack for KDE Plasma
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/bluedevil
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/bluedevil-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a1d91672b8e285d76e3ee5fca8ec4c41
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.22.90 b/metadata/md5-cache/kde-plasma/breeze-5.22.90
deleted file mode 100644
index 5e02afe30604..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-5.22.90
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.22.90:5 X? ( x11-libs/libxcb ) >=kde-frameworks/kpackage-5.86.0:5 dev-qt/qtcore:5
-DESCRIPTION=Breeze visual style for the Plasma desktop
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/breeze
-IUSE=X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-frameworks/breeze-icons-5.86.0:5 >=kde-plasma/kde-cli-tools-5.22.90:5
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.22.90:5 X? ( x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/breeze-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4f33e07eb88b329fecca3717713da1aa
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.23.1 b/metadata/md5-cache/kde-plasma/breeze-5.23.1
new file mode 100644
index 000000000000..da9a5e437051
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.23.1:5 X? ( x11-libs/libxcb ) >=kde-frameworks/kpackage-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=Breeze visual style for the Plasma desktop
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/breeze
+IUSE=X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-frameworks/breeze-icons-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.1:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.23.1:5 X? ( x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/breeze-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4f33e07eb88b329fecca3717713da1aa
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.22.90 b/metadata/md5-cache/kde-plasma/breeze-grub-5.22.90
deleted file mode 100644
index b5ceae703a09..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.22.90
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch prepare unpack
-DESCRIPTION=Breeze theme for GRUB
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3+
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/breeze-grub-5.22.90.tar.xz
-_eclasses_=kde.org	f95aaca4085d2d633c2b76abfd72208f
-_md5_=8888677d5f9ff2cb319575318c6e0dc9
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.23.1 b/metadata/md5-cache/kde-plasma/breeze-grub-5.23.1
new file mode 100644
index 000000000000..f380c897c885
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.23.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install nofetch prepare unpack
+DESCRIPTION=Breeze theme for GRUB
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/breeze-grub-5.23.1.tar.xz
+_eclasses_=kde.org	f95aaca4085d2d633c2b76abfd72208f
+_md5_=8888677d5f9ff2cb319575318c6e0dc9
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.22.90 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.22.90
deleted file mode 100644
index 621cc5014b4d..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/sassc || ( ( dev-lang/python:3.10 dev-python/pycairo[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pycairo[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pycairo[python_targets_python3_8(-)] ) ) >=dev-util/cmake-3.16 >=kde-plasma/breeze-5.22.90:5 dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtcore:5
-DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/breeze-gtk-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e0003a4cb0616a2b2466f956246d95a1
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.23.1 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.23.1
new file mode 100644
index 000000000000..55d56b65a012
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/sassc || ( ( dev-lang/python:3.10 dev-python/pycairo[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pycairo[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pycairo[python_targets_python3_8(-)] ) ) >=dev-util/cmake-3.16 >=kde-plasma/breeze-5.23.1:5 dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-qt/qtcore:5
+DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/breeze-gtk-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e0003a4cb0616a2b2466f956246d95a1
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.22.90 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.22.90
deleted file mode 100644
index 715048ecfe82..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.22.90
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=kde-frameworks/extra-cmake-modules-5.86.0:5 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=sys-boot/plymouth
-DESCRIPTION=Breeze theme for Plymouth
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=sys-boot/plymouth
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/breeze-plymouth-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b7c40ad78c6c268f8c2e28e79e8b352b
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.23.1 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.23.1
new file mode 100644
index 000000000000..6c703b9144c3
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.23.1
@@ -0,0 +1,13 @@
+BDEPEND=>=kde-frameworks/extra-cmake-modules-5.86.0:5 dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=sys-boot/plymouth
+DESCRIPTION=Breeze theme for Plymouth
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=sys-boot/plymouth
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/breeze-plymouth-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b7c40ad78c6c268f8c2e28e79e8b352b
diff --git a/metadata/md5-cache/kde-plasma/discover-5.22.90 b/metadata/md5-cache/kde-plasma/discover-5.22.90
deleted file mode 100644
index dfe1757ab572..000000000000
--- a/metadata/md5-cache/kde-plasma/discover-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.14.4:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma resources management GUI
-EAPI=8
-HOMEPAGE=https://userbase.kde.org/Discover
-IUSE=+firmware flatpak telemetry test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.14.4:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/discover-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1972f010ed91559addc14a517dbe2e6f
diff --git a/metadata/md5-cache/kde-plasma/discover-5.23.1 b/metadata/md5-cache/kde-plasma/discover-5.23.1
new file mode 100644
index 000000000000..ae101bd5ba40
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/discover-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.14.4:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma resources management GUI
+EAPI=8
+HOMEPAGE=https://userbase.kde.org/Discover
+IUSE=+firmware flatpak telemetry test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.14.4:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/discover-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1972f010ed91559addc14a517dbe2e6f
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.22.90 b/metadata/md5-cache/kde-plasma/drkonqi-5.22.90
deleted file mode 100644
index a02aba2721b6..000000000000
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/syntax-highlighting-5.86.0:5 >=dev-qt/qtconcurrent-5.15.2:5 dev-qt/qtcore:5
-DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/syntax-highlighting-5.86.0:5 || ( sys-devel/gdb dev-util/lldb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/drkonqi-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=58dd8150fc630f24874adc0556852c00
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.23.1 b/metadata/md5-cache/kde-plasma/drkonqi-5.23.1
new file mode 100644
index 000000000000..b78ba239d565
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/syntax-highlighting-5.86.0:5 >=dev-qt/qtconcurrent-5.15.2:5 dev-qt/qtcore:5
+DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/syntax-highlighting-5.86.0:5 || ( sys-devel/gdb dev-util/lldb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/drkonqi-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=58dd8150fc630f24874adc0556852c00
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.22.90 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.22.90
deleted file mode 100644
index b6a93c8b3ea9..000000000000
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 dev-libs/boost dev-qt/qtcore:5
-DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/kactivitymanagerd-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=460617b5842156e7986d53d998337c78
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.23.1 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.23.1
new file mode 100644
index 000000000000..3922ab46dc96
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 dev-libs/boost dev-qt/qtcore:5
+DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kactivitymanagerd-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=460617b5842156e7986d53d998337c78
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.22.90 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.22.90
deleted file mode 100644
index bda155168727..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.22.90
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/libkworkspace-5.22.90:5 kdesu? ( >=kde-frameworks/kdesu-5.86.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
-IUSE=kdesu X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/libkworkspace-5.22.90:5 kdesu? ( >=kde-frameworks/kdesu-5.86.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=kdesu? ( X )
-RESTRICT=test !test? ( test ) !test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/kde-cli-tools-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a68708dd0ecd88e42d2c032bbf3fe21a
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.23.1 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.23.1
new file mode 100644
index 000000000000..5f5a34b4995a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.23.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/libkworkspace-5.23.1:5 kdesu? ( >=kde-frameworks/kdesu-5.86.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
+IUSE=kdesu X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/libkworkspace-5.23.1:5 kdesu? ( >=kde-frameworks/kdesu-5.86.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=kdesu? ( X )
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kde-cli-tools-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a68708dd0ecd88e42d2c032bbf3fe21a
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.22.90 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.22.90
deleted file mode 100644
index 2969a59dbbba..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/sassc dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-plasma/kdecoration-5.22.90:5 x11-libs/gtk+:3 dev-qt/qtcore:5
-DESCRIPTION=Syncs KDE Plasma theme settings to GTK applications
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
-IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-3
-RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-plasma/kdecoration-5.22.90:5 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.22.90:5 x11-misc/xsettingsd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/kde-gtk-config-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4783dbd2ebb1533e79b20978fb4ded32
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.23.1 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.23.1
new file mode 100644
index 000000000000..019a73b240d0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/sassc dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-plasma/kdecoration-5.23.1:5 x11-libs/gtk+:3 dev-qt/qtcore:5
+DESCRIPTION=Syncs KDE Plasma theme settings to GTK applications
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-plasma/kdecoration-5.23.1:5 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.23.1:5 x11-misc/xsettingsd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kde-gtk-config-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4783dbd2ebb1533e79b20978fb4ded32
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.22.90 b/metadata/md5-cache/kde-plasma/kdecoration-5.22.90
deleted file mode 100644
index a1508cce979e..000000000000
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/ki18n-5.86.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugin based library to create window decorations
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/ki18n-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/kdecoration-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a199f7c472ac2e7b4bb1a5f16bba3a3b
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.23.1 b/metadata/md5-cache/kde-plasma/kdecoration-5.23.1
new file mode 100644
index 000000000000..f9685becd465
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/ki18n-5.86.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plugin based library to create window decorations
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/ki18n-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kdecoration-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a199f7c472ac2e7b4bb1a5f16bba3a3b
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.22.90 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.22.90
deleted file mode 100644
index 5d4276416cd9..000000000000
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kholidays-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 share? ( >=kde-frameworks/purpose-5.86.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) dev-qt/qtcore:5
-DESCRIPTION=Extra Plasma applets and engines
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=share webengine test debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kholidays-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 share? ( >=kde-frameworks/purpose-5.86.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-plasma/plasma-workspace-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/kdeplasma-addons-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=67d98292b40f449cf549ff05b6aedf7a
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.23.1 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.23.1
new file mode 100644
index 000000000000..3b408d6eafb0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kholidays-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 share? ( >=kde-frameworks/purpose-5.86.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) dev-qt/qtcore:5
+DESCRIPTION=Extra Plasma applets and engines
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=share webengine test debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kholidays-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 share? ( >=kde-frameworks/purpose-5.86.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-plasma/plasma-workspace-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kdeplasma-addons-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=67d98292b40f449cf549ff05b6aedf7a
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.22.90 b/metadata/md5-cache/kde-plasma/kgamma-5.22.90
deleted file mode 100644
index edfc321baf08..000000000000
--- a/metadata/md5-cache/kde-plasma/kgamma-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-qt/qtcore:5
-DESCRIPTION=Screen gamma values kcontrol module
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 x11-libs/libX11 x11-libs/libXxf86vm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/kgamma5-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6e9320c3f1ee6ceff47bc5e48c67ec3e
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.23.1 b/metadata/md5-cache/kde-plasma/kgamma-5.23.1
new file mode 100644
index 000000000000..4b2ebc59267f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-qt/qtcore:5
+DESCRIPTION=Screen gamma values kcontrol module
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 x11-libs/libX11 x11-libs/libXxf86vm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kgamma5-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6e9320c3f1ee6ceff47bc5e48c67ec3e
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.22.90 b/metadata/md5-cache/kde-plasma/khotkeys-5.22.90
deleted file mode 100644
index 83bfec505e4f..000000000000
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5[X] >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.22.90:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma workspace hotkey module
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5[X] >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.22.90:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.86.0:5 >=kde-plasma/kde-cli-tools-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/khotkeys-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2f544151b0adfcdf4bbf8c6b8736ac81
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.23.1 b/metadata/md5-cache/kde-plasma/khotkeys-5.23.1
new file mode 100644
index 000000000000..8d32201bb0c9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5[X] >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.23.1:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma workspace hotkey module
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5[X] >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.23.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/khotkeys-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2f544151b0adfcdf4bbf8c6b8736ac81
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.22.90 b/metadata/md5-cache/kde-plasma/kinfocenter-5.22.90
deleted file mode 100644
index cc526097c1a9..000000000000
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.22.90
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/libglvnd[X?] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) usb? ( virtual/libusb:1 ) wayland? ( >=kde-frameworks/kwayland-5.86.0:5 media-libs/mesa[egl(+)] ) X? ( x11-libs/libX11 ) dev-qt/qtcore:5
-DESCRIPTION=Utility providing information about the computer hardware
-EAPI=8
-HOMEPAGE=https://userbase.kde.org/KInfoCenter
-IUSE=gles2-only ieee1394 +opengl +pci usb wayland +X debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/libglvnd[X?] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) usb? ( virtual/libusb:1 ) wayland? ( >=kde-frameworks/kwayland-5.86.0:5 media-libs/mesa[egl(+)] ) X? ( x11-libs/libX11 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-plasma/kde-cli-tools-5.22.90:5 >=kde-plasma/systemsettings-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=opengl? ( X ) wayland? ( || ( opengl gles2-only ) )
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/kinfocenter-5.22.90.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3ec5dff78f30e7f3365f18e35fcde003
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.23.1 b/metadata/md5-cache/kde-plasma/kinfocenter-5.23.1
new file mode 100644
index 000000000000..9f12b7a99265
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/libglvnd[X?] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) usb? ( virtual/libusb:1 ) wayland? ( >=kde-frameworks/kwayland-5.86.0:5 media-libs/mesa[egl(+)] ) X? ( x11-libs/libX11 ) dev-qt/qtcore:5
+DESCRIPTION=Utility providing information about the computer hardware
+EAPI=8
+HOMEPAGE=https://userbase.kde.org/KInfoCenter
+IUSE=gles2-only ieee1394 +opengl +pci usb wayland +X debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/libglvnd[X?] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) usb? ( virtual/libusb:1 ) wayland? ( >=kde-frameworks/kwayland-5.86.0:5 media-libs/mesa[egl(+)] ) X? ( x11-libs/libX11 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.1:5 >=kde-plasma/systemsettings-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=opengl? ( X ) wayland? ( || ( opengl gles2-only ) )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kinfocenter-5.23.1.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3ec5dff78f30e7f3365f18e35fcde003
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.22.90 b/metadata/md5-cache/kde-plasma/kmenuedit-5.22.90
deleted file mode 100644
index 145efc37b36c..000000000000
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma menu editor
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/kmenuedit-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=21bd36c4407a82b9de7a24157cdbde28
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.23.1 b/metadata/md5-cache/kde-plasma/kmenuedit-5.23.1
new file mode 100644
index 000000000000..a64f4ccfe9b3
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma menu editor
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kmenuedit-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=21bd36c4407a82b9de7a24157cdbde28
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.22.90 b/metadata/md5-cache/kde-plasma/kscreen-5.22.90
deleted file mode 100644
index 5ac468622691..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreen-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/libkscreen-5.22.90:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma screen management
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kscreen
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/libkscreen-5.22.90:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-plasma/kde-cli-tools-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/kscreen-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=70b6ea386107397aad573f7798c26c43
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.23.1 b/metadata/md5-cache/kde-plasma/kscreen-5.23.1
new file mode 100644
index 000000000000..d4a2fc4a4bcc
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/libkscreen-5.23.1:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma screen management
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kscreen
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/libkscreen-5.23.1:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-plasma/kde-cli-tools-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kscreen-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=70b6ea386107397aad573f7798c26c43
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.22.90 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.22.90
deleted file mode 100644
index c6a8e3cf714b..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.22.90
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/wayland-scanner dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/layer-shell-qt-5.22.90:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library and components for secure lock screen architecture
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=+pam test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.22.90:5
-RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/layer-shell-qt-5.22.90:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) mirror test
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/kscreenlocker-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=18c33b1371b44fb7799491cb4025604b
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.23.1 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.23.1
new file mode 100644
index 000000000000..acf2d77893c8
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.23.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/wayland-scanner dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/layer-shell-qt-5.23.1:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library and components for secure lock screen architecture
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=+pam test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.23.1:5
+RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/layer-shell-qt-5.23.1:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kscreenlocker-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=18c33b1371b44fb7799491cb4025604b
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.22.90 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.22.90
deleted file mode 100644
index f1a46df4aa23..000000000000
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 dev-qt/qtcore:5
-DESCRIPTION=Implementation of ssh-askpass with KDE Wallet integration
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop https://invent.kde.org/plasma/ksshaskpass
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/ksshaskpass-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7042fc4702487f9f3b2f7fb0a06ce2c3
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.23.1 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.23.1
new file mode 100644
index 000000000000..a2a87af14321
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=Implementation of ssh-askpass with KDE Wallet integration
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop https://invent.kde.org/plasma/ksshaskpass
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/ksshaskpass-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7042fc4702487f9f3b2f7fb0a06ce2c3
diff --git a/metadata/md5-cache/kde-plasma/ksystemstats-5.22.90 b/metadata/md5-cache/kde-plasma/ksystemstats-5.22.90
deleted file mode 100644
index b5f92d1a9d01..000000000000
--- a/metadata/md5-cache/kde-plasma/ksystemstats-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libksysguard-5.22.90:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugin-based system monitoring daemon
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=networkmanager test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libksysguard-5.22.90:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) !<kde-plasma/ksysguard-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/ksystemstats-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e7099f4aec180e22f7925678c99cf9e8
diff --git a/metadata/md5-cache/kde-plasma/ksystemstats-5.23.1 b/metadata/md5-cache/kde-plasma/ksystemstats-5.23.1
new file mode 100644
index 000000000000..a58d49061eac
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksystemstats-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libksysguard-5.23.1:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plugin-based system monitoring daemon
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=networkmanager test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libksysguard-5.23.1:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) !<kde-plasma/ksysguard-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/ksystemstats-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e7099f4aec180e22f7925678c99cf9e8
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.22.90 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.22.90
deleted file mode 100644
index 9f3a75e56499..000000000000
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.86.0:5 sys-libs/pam dev-qt/qtcore:5
-DESCRIPTION=PAM module to not enter KWallet password again after login
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.86.0:5 sys-libs/pam net-misc/socat || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/kwallet-pam-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=543bf089d5e5110c2c8c064d1bf3c74d
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.23.1 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.23.1
new file mode 100644
index 000000000000..f1a3eb37842d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.86.0:5 sys-libs/pam dev-qt/qtcore:5
+DESCRIPTION=PAM module to not enter KWallet password again after login
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.86.0:5 sys-libs/pam net-misc/socat || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kwallet-pam-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=543bf089d5e5110c2c8c064d1bf3c74d
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.22.90 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.22.90
deleted file mode 100644
index cd0ada80b25b..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5= x11-libs/libxkbcommon test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/wayland-1.15 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5= x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/kwayland-integration-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=234a28835195781766db5bfcb7e802f1
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.23.1 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.23.1
new file mode 100644
index 000000000000..12195452fb8e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5= x11-libs/libxkbcommon test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/wayland-1.15 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5= x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kwayland-integration-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=234a28835195781766db5bfcb7e802f1
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.22.90 b/metadata/md5-cache/kde-plasma/kwayland-server-5.22.90
deleted file mode 100644
index 8e92fb6af976..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-server-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/wayland-scanner dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.86.0:5 media-libs/libglvnd >=dev-libs/plasma-wayland-protocols-1.3.0 >=dev-libs/wayland-protocols-1.21 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Wayland Server Components built on KDE Frameworks
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kwayland-server
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.86.0:5 media-libs/libglvnd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/kwayland-server-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=20b0aae6450cc0dc1d4a1e622b372b67
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.23.1 b/metadata/md5-cache/kde-plasma/kwayland-server-5.23.1
new file mode 100644
index 000000000000..32f46b355a87
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-server-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/wayland-scanner dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.86.0:5 media-libs/libglvnd >=dev-libs/plasma-wayland-protocols-1.3.0 >=dev-libs/wayland-protocols-1.21 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Wayland Server Components built on KDE Frameworks
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/kwayland-server
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.86.0:5 media-libs/libglvnd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kwayland-server-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=20b0aae6450cc0dc1d4a1e622b372b67
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.22.90 b/metadata/md5-cache/kde-plasma/kwin-5.22.90
deleted file mode 100644
index dece60e55c05..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.22.90
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5= >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5=[X] >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/breeze-5.22.90:5 >=kde-plasma/kdecoration-5.22.90:5 >=kde-plasma/kscreenlocker-5.22.90:5 >=kde-plasma/kwayland-server-5.22.90:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.86.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/designer-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 x11-base/xorg-proto test? ( >=dev-libs/wayland-protocols-1.19 >=dev-qt/qtwayland-5.15.2:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=accessibility caps gles2-only multimedia plasma screencast test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.22.90:5
-RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5= >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5=[X] >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/breeze-5.22.90:5 >=kde-plasma/kdecoration-5.22.90:5 >=kde-plasma/kscreenlocker-5.22.90:5 >=kde-plasma/kwayland-server-5.22.90:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.86.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtvirtualkeyboard-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5[qml] || ( x11-base/xwayland x11-base/xorg-server[wayland(-)] ) multimedia? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/kwin-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6db4891996355a88739656871e5a982d
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.23.1 b/metadata/md5-cache/kde-plasma/kwin-5.23.1
new file mode 100644
index 000000000000..e571a6106ef0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.23.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5= >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5=[X] >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/breeze-5.23.1:5 >=kde-plasma/kdecoration-5.23.1:5 >=kde-plasma/kscreenlocker-5.23.1:5 >=kde-plasma/kwayland-server-5.23.1:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.86.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/designer-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 x11-base/xorg-proto test? ( >=dev-libs/wayland-protocols-1.19 >=dev-qt/qtwayland-5.15.2:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=accessibility caps gles2-only multimedia plasma screencast test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+PDEPEND=>=kde-plasma/kde-cli-tools-5.23.1:5
+RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5= >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5= >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5=[X] >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-plasma/breeze-5.23.1:5 >=kde-plasma/kdecoration-5.23.1:5 >=kde-plasma/kscreenlocker-5.23.1:5 >=kde-plasma/kwayland-server-5.23.1:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.86.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtvirtualkeyboard-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5[qml] || ( x11-base/xwayland x11-base/xorg-server[wayland(-)] ) multimedia? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kwin-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6db4891996355a88739656871e5a982d
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.22.90 b/metadata/md5-cache/kde-plasma/kwrited-5.22.90
deleted file mode 100644
index 239958c87a68..000000000000
--- a/metadata/md5-cache/kde-plasma/kwrited-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpty-5.86.0:5 dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma daemon listening for wall and write messages
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpty-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/kwrited-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f7aa01fe0888b48ceec9944bb453e0b3
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.23.1 b/metadata/md5-cache/kde-plasma/kwrited-5.23.1
new file mode 100644
index 000000000000..ed035f88fae6
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpty-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma daemon listening for wall and write messages
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpty-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/kwrited-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f7aa01fe0888b48ceec9944bb453e0b3
diff --git a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.22.90 b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.22.90
deleted file mode 100644
index 6bf46506dd97..000000000000
--- a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/wayland-scanner virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.2:5 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwayland-5.15.2:5= x11-libs/libxkbcommon dev-libs/wayland-protocols dev-qt/qtcore:5
-DESCRIPTION=Qt component to allow applications make use of Wayland wl-layer-shell protocol
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.2:5 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwayland-5.15.2:5= x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/layer-shell-qt-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b80afbdc6c661b8b52ad398d16fff457
diff --git a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.23.1 b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.23.1
new file mode 100644
index 000000000000..8e6bc2431a90
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/wayland-scanner virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.2:5 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwayland-5.15.2:5= x11-libs/libxkbcommon dev-libs/wayland-protocols dev-qt/qtcore:5
+DESCRIPTION=Qt component to allow applications make use of Wayland wl-layer-shell protocol
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.2:5 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwayland-5.15.2:5= x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/layer-shell-qt-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b80afbdc6c661b8b52ad398d16fff457
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.22.90 b/metadata/md5-cache/kde-plasma/libkscreen-5.22.90
deleted file mode 100644
index fcdebe90b159..000000000000
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 x11-libs/libxcb test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma screen management library
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test ) mirror
-SLOT=5/7
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/libkscreen-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b77e1dd0a296a1878d0e5a8fc2a58246
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.23.1 b/metadata/md5-cache/kde-plasma/libkscreen-5.23.1
new file mode 100644
index 000000000000..fbfa4390b287
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 x11-libs/libxcb test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma screen management library
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5/7
+SRC_URI=mirror://kde/stable/plasma/5.23.1/libkscreen-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b77e1dd0a296a1878d0e5a8fc2a58246
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.22.90 b/metadata/md5-cache/kde-plasma/libksysguard-5.22.90
deleted file mode 100644
index 1279cd44697f..000000000000
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.86.0:5 X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Task management and system monitoring library
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=webengine X test debug designer test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) !<kde-plasma/ksysguard-5.21.90:5 !<kde-plasma/plasma-workspace-5.18.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) mirror
-SLOT=5/9
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/libksysguard-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b80d8d47d8d6570de716d3c6fb1cdf7c
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.23.1 b/metadata/md5-cache/kde-plasma/libksysguard-5.23.1
new file mode 100644
index 000000000000..63f1204c09f8
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.86.0:5 X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Task management and system monitoring library
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=webengine X test debug designer test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) !<kde-plasma/ksysguard-5.21.90:5 !<kde-plasma/plasma-workspace-5.18.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/9
+SRC_URI=mirror://kde/stable/plasma/5.23.1/libksysguard-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b80d8d47d8d6570de716d3c6fb1cdf7c
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.22.90 b/metadata/md5-cache/kde-plasma/libkworkspace-5.22.90
deleted file mode 100644
index 0a417ac8f552..000000000000
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kscreenlocker-5.22.90:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-frameworks/kinit-5.86.0:5 >=kde-plasma/kwin-5.22.90:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Workspace library to interact with the Plasma session manager
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kscreenlocker-5.22.90:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-workspace-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e903c2bcbc2bc6f1b3adcafed81e80d4
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.23.1 b/metadata/md5-cache/kde-plasma/libkworkspace-5.23.1
new file mode 100644
index 000000000000..96b31ecf6a1f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kscreenlocker-5.23.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-frameworks/kinit-5.86.0:5 >=kde-plasma/kwin-5.23.1:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Workspace library to interact with the Plasma session manager
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kscreenlocker-5.23.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-workspace-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e903c2bcbc2bc6f1b3adcafed81e80d4
diff --git a/metadata/md5-cache/kde-plasma/milou-5.22.90 b/metadata/md5-cache/kde-plasma/milou-5.22.90
deleted file mode 100644
index 093e8105dafa..000000000000
--- a/metadata/md5-cache/kde-plasma/milou-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Dedicated search application built on top of Baloo
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/milou
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/milou-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=786c6b7d5a076a5a760277a0cf503bd0
diff --git a/metadata/md5-cache/kde-plasma/milou-5.23.1 b/metadata/md5-cache/kde-plasma/milou-5.23.1
new file mode 100644
index 000000000000..3682d0ebad8e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/milou-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Dedicated search application built on top of Baloo
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/milou
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/milou-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=786c6b7d5a076a5a760277a0cf503bd0
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.22.90 b/metadata/md5-cache/kde-plasma/oxygen-5.22.90
deleted file mode 100644
index c28b58165ffb..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-5.22.90
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.22.90:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.86.0:5 ) >=kde-frameworks/kservice-5.86.0:5 dev-qt/qtcore:5
-DESCRIPTION=Oxygen visual style for the Plasma desktop
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/oxygen
-IUSE=wayland debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.22.90:5
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.22.90:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.86.0:5 ) !<kde-plasma/plasma-desktop-5.16.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/oxygen-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ea8939355bb79c85fd2255b372d9268b
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.23.1 b/metadata/md5-cache/kde-plasma/oxygen-5.23.1
new file mode 100644
index 000000000000..1330dbf132a0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.23.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.86.0:5 ) >=kde-frameworks/kservice-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=Oxygen visual style for the Plasma desktop
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/oxygen
+IUSE=wayland debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.23.1:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-plasma/kdecoration-5.23.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.86.0:5 ) !<kde-plasma/plasma-desktop-5.16.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/oxygen-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ea8939355bb79c85fd2255b372d9268b
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.22.90
deleted file mode 100644
index 1fb1ea37735e..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kfilemetadata-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/purpose-5.86.0:5 >=kde-plasma/plasma-workspace-5.22.90:5 dev-qt/qtcore:5
-DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop https://community.kde.org/Plasma/Browser_Integration
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kfilemetadata-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/purpose-5.86.0:5 >=kde-plasma/plasma-workspace-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-browser-integration-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=466e031f4e6d58eb0e5598bb52d82318
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.23.1 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.23.1
new file mode 100644
index 000000000000..5fe194002870
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kfilemetadata-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/purpose-5.86.0:5 >=kde-plasma/plasma-workspace-5.23.1:5 dev-qt/qtcore:5
+DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop https://community.kde.org/Plasma/Browser_Integration
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kfilemetadata-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/purpose-5.86.0:5 >=kde-plasma/plasma-workspace-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-browser-integration-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=466e031f4e6d58eb0e5598bb52d82318
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.22.90
deleted file mode 100644
index 92d642619b6e..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kparts-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 >=kde-plasma/kwin-5.22.90:5 >=kde-plasma/libksysguard-5.22.90:5 >=kde-plasma/libkworkspace-5.22.90:5 >=kde-plasma/plasma-workspace-5.22.90:5 >=media-libs/phonon-4.11.0 virtual/libcrypt:= x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.86.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-libs/boost x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma desktop
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kparts-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 >=kde-plasma/kwin-5.22.90:5 >=kde-plasma/libksysguard-5.22.90:5 >=kde-plasma/libkworkspace-5.22.90:5 >=kde-plasma/plasma-workspace-5.22.90:5 >=media-libs/phonon-4.11.0 virtual/libcrypt:= x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.86.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/qqc2-desktop-style-5.86.0:5 >=kde-plasma/kde-cli-tools-5.22.90:5 >=kde-plasma/oxygen-5.22.90:5 sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-desktop-5.22.90.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-1.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=968b842dc2efc32e9328afe1ebc3a13e
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.23.1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.23.1
new file mode 100644
index 000000000000..7621138fe387
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kparts-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 >=kde-plasma/kwin-5.23.1:5 >=kde-plasma/libksysguard-5.23.1:5 >=kde-plasma/libkworkspace-5.23.1:5 >=kde-plasma/plasma-workspace-5.23.1:5 >=media-libs/phonon-4.11.0 virtual/libcrypt:= x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.86.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-libs/boost x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma desktop
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.86.0:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kdelibs4support-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kparts-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-frameworks/sonnet-5.86.0:5 >=kde-plasma/kwin-5.23.1:5 >=kde-plasma/libksysguard-5.23.1:5 >=kde-plasma/libkworkspace-5.23.1:5 >=kde-plasma/plasma-workspace-5.23.1:5 >=media-libs/phonon-4.11.0 virtual/libcrypt:= x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.86.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/qqc2-desktop-style-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.1:5 >=kde-plasma/oxygen-5.23.1:5 sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-desktop-5.23.1.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=968b842dc2efc32e9328afe1ebc3a13e
diff --git a/metadata/md5-cache/kde-plasma/plasma-disks-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-disks-5.22.90
deleted file mode 100644
index 3c2c303bb97c..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-disks-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 sys-apps/smartmontools dev-qt/qtcore:5
-DESCRIPTION=Monitors S.M.A.R.T. capable devices for imminent failure
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/plasma-disks
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=|| ( GPL-3 GPL-2 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 sys-apps/smartmontools kde-plasma/kinfocenter:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-disks-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f84ade472bc5d40c7ae04c21c861beeb
diff --git a/metadata/md5-cache/kde-plasma/plasma-disks-5.23.1 b/metadata/md5-cache/kde-plasma/plasma-disks-5.23.1
new file mode 100644
index 000000000000..b0aeca2c7764
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-disks-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 sys-apps/smartmontools dev-qt/qtcore:5
+DESCRIPTION=Monitors S.M.A.R.T. capable devices for imminent failure
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/plasma-disks
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-3 GPL-2 )
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 sys-apps/smartmontools kde-plasma/kinfocenter:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-disks-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f84ade472bc5d40c7ae04c21c861beeb
diff --git a/metadata/md5-cache/kde-plasma/plasma-firewall-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-firewall-5.22.90
deleted file mode 100644
index ca1f5ed7176c..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-firewall-5.22.90
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 dev-qt/qtcore:5
-DESCRIPTION=Plasma frontend for Firewalld or UFW
-EAPI=8
-HOMEPAGE=https://invent.kde.org/network/plasma-firewall
-IUSE=firewalld +ufw debug python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) firewalld? ( net-firewall/firewalld ) ufw? ( net-firewall/ufw ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( firewalld ufw )
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-firewall-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c736633a08db8e257fbfea960719a841
diff --git a/metadata/md5-cache/kde-plasma/plasma-firewall-5.23.1 b/metadata/md5-cache/kde-plasma/plasma-firewall-5.23.1
new file mode 100644
index 000000000000..0b331c1095ed
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-firewall-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=Plasma frontend for Firewalld or UFW
+EAPI=8
+HOMEPAGE=https://invent.kde.org/network/plasma-firewall
+IUSE=firewalld +ufw debug python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) firewalld? ( net-firewall/firewalld ) ufw? ( net-firewall/ufw ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( firewalld ufw )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-firewall-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c736633a08db8e257fbfea960719a841
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-integration-5.22.90
deleted file mode 100644
index 76794667cf67..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/breeze-5.22.90:5 x11-libs/libXcursor x11-libs/libxcb dev-qt/qtcore:5
-DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/breeze-5.22.90:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-integration-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=dcffcf6b8d5ed3e8e061a7aff1a646ea
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.23.1 b/metadata/md5-cache/kde-plasma/plasma-integration-5.23.1
new file mode 100644
index 000000000000..63446cf12591
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/breeze-5.23.1:5 x11-libs/libXcursor x11-libs/libxcb dev-qt/qtcore:5
+DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/breeze-5.23.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-integration-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=dcffcf6b8d5ed3e8e061a7aff1a646ea
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-meta-5.22.90
deleted file mode 100644
index 7b5162c848be..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.22.90
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop/
-IUSE=accessibility bluetooth +browser-integration colord +crash-handler crypt +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt +wallpapers
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.22.90:5 >=kde-plasma/kactivitymanagerd-5.22.90:5 >=kde-plasma/kde-cli-tools-5.22.90:5 >=kde-plasma/kdecoration-5.22.90:5 >=kde-plasma/kdeplasma-addons-5.22.90:5 >=kde-plasma/kgamma-5.22.90:5 >=kde-plasma/khotkeys-5.22.90:5 >=kde-plasma/kinfocenter-5.22.90:5 >=kde-plasma/kmenuedit-5.22.90:5 >=kde-plasma/kscreen-5.22.90:5 >=kde-plasma/kscreenlocker-5.22.90:5 >=kde-plasma/ksshaskpass-5.22.90:5 >=kde-plasma/ksystemstats-5.22.90:5 >=kde-plasma/kwayland-integration-5.22.90:5 >=kde-plasma/kwayland-server-5.22.90:5 >=kde-plasma/kwin-5.22.90:5 >=kde-plasma/kwrited-5.22.90:5 >=kde-plasma/layer-shell-qt-5.22.90:5 >=kde-plasma/libkscreen-5.22.90:5 >=kde-plasma/libksysguard-5.22.90:5 >=kde-plasma/milou-5.22.90:5 >=kde-plasma/oxygen-5.22.90:5 >=kde-plasma/plasma-desktop-5.22.90:5 >=kde-plasma/plasma-integration-5.22.90:5 >=kde-plasma/plasma-systemmonitor-5.22.90:5 >=kde-plasma/plasma-workspace-5.22.90:5 >=kde-plasma/polkit-kde-agent-5.22.90:5 >=kde-plasma/powerdevil-5.22.90:5 >=kde-plasma/systemsettings-5.22.90:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.22.90:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.22.90:5 ) colord? ( x11-misc/colord ) crash-handler? ( >=kde-plasma/drkonqi-5.22.90:5 ) crypt? ( >=kde-plasma/plasma-vault-5.22.90:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.22.90:5 ) discover? ( >=kde-plasma/discover-5.22.90:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.22.90:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) elogind? ( sys-auth/elogind[pam] ) grub? ( >=kde-plasma/breeze-grub-5.22.90:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.22.90:5 >=kde-plasma/kde-gtk-config-5.22.90:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.22.90:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.22.90:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.22.90:5 net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-5.22.90:5 >=kde-plasma/plymouth-kcm-5.22.90:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.22.90:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.22.90:5 ) smart? ( >=kde-plasma/plasma-disks-5.22.90:5 ) systemd? ( sys-apps/systemd[pam] firewall? ( >=kde-plasma/plasma-firewall-5.22.90:5 ) ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.22.90:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.22.90:5 ) accessibility? ( app-accessibility/orca )
-REQUIRED_USE=^^ ( elogind systemd )
-SLOT=5
-_md5_=aeceaf88c206bc8aa10618ba977f82e5
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.23.1 b/metadata/md5-cache/kde-plasma/plasma-meta-5.23.1
new file mode 100644
index 000000000000..551772889aad
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.23.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop/
+IUSE=accessibility bluetooth +browser-integration colord +crash-handler crypt +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt +wallpapers
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-plasma/breeze-5.23.1:5 >=kde-plasma/kactivitymanagerd-5.23.1:5 >=kde-plasma/kde-cli-tools-5.23.1:5 >=kde-plasma/kdecoration-5.23.1:5 >=kde-plasma/kdeplasma-addons-5.23.1:5 >=kde-plasma/kgamma-5.23.1:5 >=kde-plasma/khotkeys-5.23.1:5 >=kde-plasma/kinfocenter-5.23.1:5 >=kde-plasma/kmenuedit-5.23.1:5 >=kde-plasma/kscreen-5.23.1:5 >=kde-plasma/kscreenlocker-5.23.1:5 >=kde-plasma/ksshaskpass-5.23.1:5 >=kde-plasma/ksystemstats-5.23.1:5 >=kde-plasma/kwayland-integration-5.23.1:5 >=kde-plasma/kwayland-server-5.23.1:5 >=kde-plasma/kwin-5.23.1:5 >=kde-plasma/kwrited-5.23.1:5 >=kde-plasma/layer-shell-qt-5.23.1:5 >=kde-plasma/libkscreen-5.23.1:5 >=kde-plasma/libksysguard-5.23.1:5 >=kde-plasma/milou-5.23.1:5 >=kde-plasma/oxygen-5.23.1:5 >=kde-plasma/plasma-desktop-5.23.1:5 >=kde-plasma/plasma-integration-5.23.1:5 >=kde-plasma/plasma-systemmonitor-5.23.1:5 >=kde-plasma/plasma-workspace-5.23.1:5 >=kde-plasma/polkit-kde-agent-5.23.1:5 >=kde-plasma/powerdevil-5.23.1:5 >=kde-plasma/systemsettings-5.23.1:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.23.1:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.23.1:5 ) colord? ( x11-misc/colord ) crash-handler? ( >=kde-plasma/drkonqi-5.23.1:5 ) crypt? ( >=kde-plasma/plasma-vault-5.23.1:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.23.1:5 ) discover? ( >=kde-plasma/discover-5.23.1:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.23.1:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) elogind? ( sys-auth/elogind[pam] ) grub? ( >=kde-plasma/breeze-grub-5.23.1:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.23.1:5 >=kde-plasma/kde-gtk-config-5.23.1:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.23.1:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.23.1:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.23.1:5 net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-5.23.1:5 >=kde-plasma/plymouth-kcm-5.23.1:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.23.1:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.23.1:5 ) smart? ( >=kde-plasma/plasma-disks-5.23.1:5 ) systemd? ( sys-apps/systemd[pam] firewall? ( >=kde-plasma/plasma-firewall-5.23.1:5 ) ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.23.1:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.23.1:5 ) accessibility? ( app-accessibility/orca )
+REQUIRED_USE=^^ ( elogind systemd )
+SLOT=5
+_md5_=aeceaf88c206bc8aa10618ba977f82e5
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-nm-5.22.90
deleted file mode 100644
index d5d0473b2eaa..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5[teamd=] >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.86.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma applet for NetworkManager
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=modemmanager openconnect teamd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5[teamd=] >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.86.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-plasma/kde-cli-tools-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-nm-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ba7e64c19c901a974bc44f1bd77d7ff1
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.23.1 b/metadata/md5-cache/kde-plasma/plasma-nm-5.23.1
new file mode 100644
index 000000000000..4cf8f26381c8
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5[teamd=] >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.86.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma applet for NetworkManager
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=modemmanager openconnect teamd debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5[teamd=] >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.86.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-plasma/kde-cli-tools-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-nm-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ba7e64c19c901a974bc44f1bd77d7ff1
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-pa-5.22.90
deleted file mode 100644
index 955da5de5bdc..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 media-libs/libcanberra media-sound/pulseaudio dev-qt/qtcore:5
-DESCRIPTION=Plasma applet for audio volume management using PulseAudio
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 media-libs/libcanberra media-sound/pulseaudio >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 || ( media-video/pipewire media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] ) x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-pa-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cd3ccce52ec8a72e0a7d8992e7859583
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.23.1 b/metadata/md5-cache/kde-plasma/plasma-pa-5.23.1
new file mode 100644
index 000000000000..6fa63fc8bb06
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 media-libs/libcanberra media-sound/pulseaudio dev-qt/qtcore:5
+DESCRIPTION=Plasma applet for audio volume management using PulseAudio
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 media-libs/libcanberra media-sound/pulseaudio >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 || ( media-video/pipewire media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] ) x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-pa-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=cd3ccce52ec8a72e0a7d8992e7859583
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.22.90
deleted file mode 100644
index 3c0ccb67c93d..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Useful applications for Plasma development
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-sdk-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=da6700bb8755307e56e734865e407ef9
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.23.1 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.23.1
new file mode 100644
index 000000000000..395d03fd2a56
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Useful applications for Plasma development
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-sdk-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=da6700bb8755307e56e734865e407ef9
diff --git a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.22.90
deleted file mode 100644
index df22be17e742..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-plasma/libksysguard-5.22.90:5 dev-qt/qtcore:5
-DESCRIPTION=Monitor system sensors, process information and other system resources
-EAPI=8
-HOMEPAGE=https://apps.kde.org/plasma-systemmonitor/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=|| ( GPL-3 GPL-2 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-plasma/libksysguard-5.22.90:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5[qml] >=kde-frameworks/kquickcharts-5.86.0:5 >=kde-plasma/ksystemstats-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-systemmonitor-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=de38d01bfc1a98b4cabb6a4300729b83
diff --git a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.23.1 b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.23.1
new file mode 100644
index 000000000000..cb1818aebb92
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-plasma/libksysguard-5.23.1:5 dev-qt/qtcore:5
+DESCRIPTION=Monitor system sensors, process information and other system resources
+EAPI=8
+HOMEPAGE=https://apps.kde.org/plasma-systemmonitor/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( GPL-3 GPL-2 )
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-plasma/libksysguard-5.23.1:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5[qml] >=kde-frameworks/kquickcharts-5.86.0:5 >=kde-plasma/ksystemstats-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-systemmonitor-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=de38d01bfc1a98b4cabb6a4300729b83
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.22.90
deleted file mode 100644
index 67f033770114..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma integration for controlling Thunderbolt devices
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/plasma-thunderbolt
-IUSE=debug test
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=|| ( GPL-2 GPL-3+ )
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 sys-apps/bolt || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-thunderbolt-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b09b8f86bc79489ae0e48ecd38611ce5
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.23.1 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.23.1
new file mode 100644
index 000000000000..4209f3b71dc6
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.23.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma integration for controlling Thunderbolt devices
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/plasma-thunderbolt
+IUSE=debug test
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=|| ( GPL-2 GPL-3+ )
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 sys-apps/bolt || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-thunderbolt-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b09b8f86bc79489ae0e48ecd38611ce5
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-vault-5.22.90
deleted file mode 100644
index 293c9aa3db0e..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-plasma/libksysguard-5.22.90:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma applet and services for creating encrypted vaults
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
-IUSE=networkmanager debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-plasma/libksysguard-5.22.90:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-vault-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3282524bf8fdf656528d9d7c549b58fa
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.23.1 b/metadata/md5-cache/kde-plasma/plasma-vault-5.23.1
new file mode 100644
index 000000000000..db905c0e64a8
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-plasma/libksysguard-5.23.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma applet and services for creating encrypted vaults
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
+IUSE=networkmanager debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kcodecs-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-plasma/libksysguard-5.23.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-vault-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3282524bf8fdf656528d9d7c549b58fa
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.5-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.5-r1
deleted file mode 100644
index 10aed0a3ed02..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.5-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kactivities-stats-5.82.0:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kbookmarks-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kded-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kinit-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/knotifyconfig-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kpeople-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktexteditor-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kunitconversion-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/prison-5.82.0:5[qml] >=kde-frameworks/solid-5.82.0:5 >=kde-plasma/breeze-5.22.5:5 >=kde-plasma/kscreenlocker-5.22.5:5 >=kde-plasma/kwin-5.22.5:5 >=kde-plasma/layer-shell-qt-5.22.5:5 >=kde-plasma/libkscreen-5.22.5:5 >=kde-plasma/libksysguard-5.22.5:5 >=kde-plasma/libkworkspace-5.22.5:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calculator? ( sci-libs/libqalculate:= ) calendar? ( >=kde-frameworks/kholidays-5.82.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.82.0:5 ) gps? ( sci-geosciences/gpsd ) screencast? ( >=dev-qt/qtgui-5.15.2:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.82.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-util/wayland-scanner-1.19.0 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma workspace
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=appstream +calculator +calendar +fontconfig geolocation gps screencast +semantic-desktop systemd telemetry test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.22.5:5
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kactivities-stats-5.82.0:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kbookmarks-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kded-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kinit-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/knotifyconfig-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kpeople-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktexteditor-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kunitconversion-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/prison-5.82.0:5[qml] >=kde-frameworks/solid-5.82.0:5 >=kde-plasma/breeze-5.22.5:5 >=kde-plasma/kscreenlocker-5.22.5:5 >=kde-plasma/kwin-5.22.5:5 >=kde-plasma/layer-shell-qt-5.22.5:5 >=kde-plasma/libkscreen-5.22.5:5 >=kde-plasma/libksysguard-5.22.5:5 >=kde-plasma/libkworkspace-5.22.5:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calculator? ( sci-libs/libqalculate:= ) calendar? ( >=kde-frameworks/kholidays-5.82.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.82.0:5 ) gps? ( sci-geosciences/gpsd ) screencast? ( >=dev-qt/qtgui-5.15.2:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.82.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtpaths-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5[widgets] >=dev-qt/qtquickcontrols2-5.15.2:5 kde-apps/kio-extras:5 >=kde-frameworks/kdesu-5.82.0:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/kquickcharts-5.82.0:5 >=kde-plasma/milou-5.22.5:5 >=kde-plasma/plasma-integration-5.22.5:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.22.5/plasma-workspace-5.22.5.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bdd6039747e2380c34e27bdb8351c636
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.5-r2 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.5-r2
index 9a6fb1e9ac58..f7b836c8fc20 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.5-r2
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.5-r2
@@ -5,7 +5,7 @@ DESCRIPTION=KDE Plasma workspace
 EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=appstream +calculator +calendar +fontconfig geolocation gps screencast +semantic-desktop systemd telemetry test debug +handbook test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.22.5:5
 RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kactivities-stats-5.82.0:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kbookmarks-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kded-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kinit-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/knotifyconfig-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kpeople-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktexteditor-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kunitconversion-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/prison-5.82.0:5[qml] >=kde-frameworks/solid-5.82.0:5 >=kde-plasma/breeze-5.22.5:5 >=kde-plasma/kscreenlocker-5.22.5:5 >=kde-plasma/kwin-5.22.5:5 >=kde-plasma/layer-shell-qt-5.22.5:5 >=kde-plasma/libkscreen-5.22.5:5 >=kde-plasma/libksysguard-5.22.5:5 >=kde-plasma/libkworkspace-5.22.5:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calculator? ( sci-libs/libqalculate:= ) calendar? ( >=kde-frameworks/kholidays-5.82.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.82.0:5 ) gps? ( sci-geosciences/gpsd ) screencast? ( >=dev-qt/qtgui-5.15.2:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.82.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtpaths-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5[widgets] >=dev-qt/qtquickcontrols2-5.15.2:5 kde-apps/kio-extras:5 >=kde-frameworks/kdesu-5.82.0:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/kquickcharts-5.82.0:5 >=kde-plasma/milou-5.22.5:5 >=kde-plasma/plasma-integration-5.22.5:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.22.5/plasma-workspace-5.22.5.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7293e91660e650994c981ff62963f911
+_md5_=5e3a1c8c2006953ce3f707f74cb448fc
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.90
deleted file mode 100644
index d8ce4a35a5c1..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.22.90
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kinit-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kpeople-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/prison-5.86.0:5[qml] >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/breeze-5.22.90:5 >=kde-plasma/kscreenlocker-5.22.90:5 >=kde-plasma/kwin-5.22.90:5 >=kde-plasma/layer-shell-qt-5.22.90:5 >=kde-plasma/libkscreen-5.22.90:5 >=kde-plasma/libksysguard-5.22.90:5 >=kde-plasma/libkworkspace-5.22.90:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calculator? ( sci-libs/libqalculate:= ) calendar? ( >=kde-frameworks/kholidays-5.86.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) gps? ( sci-geosciences/gpsd ) screencast? ( >=dev-qt/qtgui-5.15.2:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-util/wayland-scanner-1.19.0 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma workspace
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=appstream +calculator +calendar +fontconfig geolocation gps screencast +semantic-desktop systemd telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.22.90:5
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kinit-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kpeople-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/prison-5.86.0:5[qml] >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/breeze-5.22.90:5 >=kde-plasma/kscreenlocker-5.22.90:5 >=kde-plasma/kwin-5.22.90:5 >=kde-plasma/layer-shell-qt-5.22.90:5 >=kde-plasma/libkscreen-5.22.90:5 >=kde-plasma/libksysguard-5.22.90:5 >=kde-plasma/libkworkspace-5.22.90:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calculator? ( sci-libs/libqalculate:= ) calendar? ( >=kde-frameworks/kholidays-5.86.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) gps? ( sci-geosciences/gpsd ) screencast? ( >=dev-qt/qtgui-5.15.2:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtpaths-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5[widgets] >=dev-qt/qtquickcontrols2-5.15.2:5 kde-apps/kio-extras:5 >=kde-frameworks/kdesu-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kquickcharts-5.86.0:5 >=kde-plasma/milou-5.22.90:5 >=kde-plasma/plasma-integration-5.22.90:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/breeze-5.22.90:5 !<kde-plasma/plasma-desktop-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=test !test? ( test ) !test? ( test ) mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-workspace-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e0033098c27338d594d7c2463f1f1ead
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.23.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.23.1
new file mode 100644
index 000000000000..bc25e733fda5
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.23.1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kinit-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kpeople-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/prison-5.86.0:5[qml] >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/breeze-5.23.1:5 >=kde-plasma/kscreenlocker-5.23.1:5 >=kde-plasma/kwin-5.23.1:5 >=kde-plasma/layer-shell-qt-5.23.1:5 >=kde-plasma/libkscreen-5.23.1:5 >=kde-plasma/libksysguard-5.23.1:5 >=kde-plasma/libkworkspace-5.23.1:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calculator? ( sci-libs/libqalculate:= ) calendar? ( >=kde-frameworks/kholidays-5.86.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) gps? ( sci-geosciences/gpsd ) screencast? ( >=dev-qt/qtgui-5.15.2:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-util/wayland-scanner-1.19.0 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma workspace
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=appstream +calculator +calendar +fontconfig geolocation gps screencast +semantic-desktop systemd telemetry test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.23.1:5
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kbookmarks-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kded-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kinit-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/kjobwidgets-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/kpeople-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/ktexteditor-5.86.0:5 >=kde-frameworks/ktextwidgets-5.86.0:5 >=kde-frameworks/kunitconversion-5.86.0:5 >=kde-frameworks/kwallet-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=kde-frameworks/prison-5.86.0:5[qml] >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/breeze-5.23.1:5 >=kde-plasma/kscreenlocker-5.23.1:5 >=kde-plasma/kwin-5.23.1:5 >=kde-plasma/layer-shell-qt-5.23.1:5 >=kde-plasma/libkscreen-5.23.1:5 >=kde-plasma/libksysguard-5.23.1:5 >=kde-plasma/libkworkspace-5.23.1:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calculator? ( sci-libs/libqalculate:= ) calendar? ( >=kde-frameworks/kholidays-5.86.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.86.0:5 ) gps? ( sci-geosciences/gpsd ) screencast? ( >=dev-qt/qtgui-5.15.2:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.86.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtpaths-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5[widgets] >=dev-qt/qtquickcontrols2-5.15.2:5 kde-apps/kio-extras:5 >=kde-frameworks/kdesu-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kquickcharts-5.86.0:5 >=kde-plasma/milou-5.23.1:5 >=kde-plasma/plasma-integration-5.23.1:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/breeze-5.22.90:5 !<kde-plasma/plasma-desktop-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=gps? ( geolocation )
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-workspace-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e0033098c27338d594d7c2463f1f1ead
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.22.90 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.22.90
deleted file mode 100644
index 630817e14a1a..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.22.90
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DESCRIPTION=Wallpapers for the Plasma workspace
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-workspace-wallpapers-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f707c667fe08eac06576d3a5fed929ee
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.23.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.23.1
new file mode 100644
index 000000000000..405a218d3b22
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.23.1
@@ -0,0 +1,11 @@
+BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DESCRIPTION=Wallpapers for the Plasma workspace
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-workspace-wallpapers-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f707c667fe08eac06576d3a5fed929ee
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.22.90 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.22.90
deleted file mode 100644
index 092bc31f7efd..000000000000
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 sys-boot/plymouth dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma control module for Plymouth
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.22.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/plymouth-kcm-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6425d934e036af764e97225efb4c50b5
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.23.1 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.23.1
new file mode 100644
index 000000000000..6225b9cff040
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 sys-boot/plymouth dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma control module for Plymouth
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.23.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plymouth-kcm-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6425d934e036af764e97225efb4c50b5
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.22.90 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.22.90
deleted file mode 100644
index e511b24d017e..000000000000
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=sys-auth/polkit-qt-0.113.0 dev-qt/qtcore:5
-DESCRIPTION=PolKit agent module for KDE Plasma
-EAPI=8
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=sys-auth/polkit-qt-0.113.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/polkit-kde-agent-1-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=187c8ef7b3346402d5c1f00f9c798ad1
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.23.1 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.23.1
new file mode 100644
index 000000000000..a2e49f1cb3cb
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=sys-auth/polkit-qt-0.113.0 dev-qt/qtcore:5
+DESCRIPTION=PolKit agent module for KDE Plasma
+EAPI=8
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=sys-auth/polkit-qt-0.113.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/polkit-kde-agent-1-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=187c8ef7b3346402d5c1f00f9c798ad1
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.22.90 b/metadata/md5-cache/kde-plasma/powerdevil-5.22.90
deleted file mode 100644
index 6a08d309c8eb..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.22.90:5 >=kde-plasma/libkworkspace-5.22.90:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) dev-qt/qtcore:5
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/powerdevil
-IUSE=brightness-control caps +wireless debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.22.90:5 >=kde-plasma/libkworkspace-5.22.90:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) >=kde-plasma/kde-cli-tools-5.22.90:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/powerdevil-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=336b8b513f7e024165d1faada7e62538
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.23.1 b/metadata/md5-cache/kde-plasma/powerdevil-5.23.1
new file mode 100644
index 000000000000..270024888492
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.23.1:5 >=kde-plasma/libkworkspace-5.23.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) dev-qt/qtcore:5
+DESCRIPTION=Power management for KDE Plasma Shell
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/powerdevil
+IUSE=brightness-control caps +wireless debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.23.1:5 >=kde-plasma/libkworkspace-5.23.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) >=kde-plasma/kde-cli-tools-5.23.1:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/powerdevil-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=336b8b513f7e024165d1faada7e62538
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.22.90 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.22.90
deleted file mode 100644
index bb96cdfa4c7c..000000000000
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma control module for SDDM
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5[qml] >=kde-plasma/kde-cli-tools-5.22.90:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/sddm-kcm-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c2af6a8224ab4c9f044f0c64ea2b322b
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.23.1 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.23.1
new file mode 100644
index 000000000000..8ce38e371079
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma control module for SDDM
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knewstuff-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5[qml] >=kde-plasma/kde-cli-tools-5.23.1:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/sddm-kcm-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c2af6a8224ab4c9f044f0c64ea2b322b
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.22.90 b/metadata/md5-cache/kde-plasma/systemsettings-5.22.90
deleted file mode 100644
index 85f24058f07f..000000000000
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.22.90:5 dev-qt/qtcore:5
-DESCRIPTION=Control Center to configure KDE Plasma desktop
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.22.90:5 >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/systemsettings-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7a0809fd1f0d01e95aa0415b876fc4fe
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.23.1 b/metadata/md5-cache/kde-plasma/systemsettings-5.23.1
new file mode 100644
index 000000000000..82590edb4be4
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.23.1:5 dev-qt/qtcore:5
+DESCRIPTION=Control Center to configure KDE Plasma desktop
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kactivities-stats-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5 >=kde-frameworks/kcmutils-5.86.0:5 >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/kguiaddons-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kiconthemes-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/kitemmodels-5.86.0:5 >=kde-frameworks/kitemviews-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kpackage-5.86.0:5 >=kde-frameworks/krunner-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-plasma/libkworkspace-5.23.1:5 >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/systemsettings-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7a0809fd1f0d01e95aa0415b876fc4fe
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.22.90 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.22.90
deleted file mode 100644
index 0c52355255ca..000000000000
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.22.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.2:5 >=kde-frameworks/kwayland-5.86.0:5 dev-qt/qtcore:5
-DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 sys-apps/xdg-desktop-portal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/xdg-desktop-portal-kde-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=89933c1d0124314e68b2bc54f8e68f88
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.23.1 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.23.1
new file mode 100644
index 000000000000..ba8a81dae073
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.23.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.86.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.2:5 >=kde-frameworks/kwayland-5.86.0:5 dev-qt/qtcore:5
+DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kdeclarative-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/kirigami-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/plasma-5.86.0:5 sys-apps/xdg-desktop-portal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/xdg-desktop-portal-kde-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=89933c1d0124314e68b2bc54f8e68f88
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.22.90 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.22.90
deleted file mode 100644
index f5009d1f092f..000000000000
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.22.90
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image
-DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !kde-plasma/xembed-sni-proxy:0
-RESTRICT=mirror
-SLOT=5
-SRC_URI=mirror://kde/unstable/plasma/5.22.90/plasma-workspace-5.22.90.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8db3aa4f21e8858bac743389ae3ef689
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.23.1 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.23.1
new file mode 100644
index 000000000000..6446aa80991c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.23.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image
+DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
+EAPI=8
+HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.86.0:5 >=kde-frameworks/kwindowsystem-5.86.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !kde-plasma/xembed-sni-proxy:0
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.23.1/plasma-workspace-5.23.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8db3aa4f21e8858bac743389ae3ef689
diff --git a/metadata/md5-cache/lxde-base/Manifest.gz b/metadata/md5-cache/lxde-base/Manifest.gz
index 36bea7fec5f2..7169694684b3 100644
--- a/metadata/md5-cache/lxde-base/Manifest.gz
+++ b/metadata/md5-cache/lxde-base/Manifest.gz
diff --git a/metadata/md5-cache/lxde-base/lxterminal-0.4.0 b/metadata/md5-cache/lxde-base/lxterminal-0.4.0
index c9a3db09ca06..742edcc25f55 100644
--- a/metadata/md5-cache/lxde-base/lxterminal-0.4.0
+++ b/metadata/md5-cache/lxde-base/lxterminal-0.4.0
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x1
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxterminal-0.4.0.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c42e5b94eb72c7aba07ba84d18ae457b
+_md5_=86f5e58dfd454676f6b5c9d8fd25880c
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index e4b1fbac22f6..5562138c8a70 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/alpine-2.25 b/metadata/md5-cache/mail-client/alpine-2.25
new file mode 100644
index 000000000000..ef49779c05c9
--- /dev/null
+++ b/metadata/md5-cache/mail-client/alpine-2.25
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/ncurses:= virtual/libcrypt:= kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) spell? ( app-text/aspell ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=An easy to use text-based based mail and news client
+EAPI=8
+HOMEPAGE=http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/
+IUSE=+chappa ipv6 kerberos ldap nls onlyalpine passfile smime spell ssl threads
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=sys-libs/ncurses:= virtual/libcrypt:= kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) spell? ( app-text/aspell ) ssl? ( dev-libs/openssl:0= ) app-misc/mime-types
+REQUIRED_USE=chappa? ( ssl )
+SLOT=0
+SRC_URI=http://alpine.x10host.com/alpine/release/src/alpine-2.25.tar.xz https://repo.or.cz/alpine.git/patch/fb2217ac67706e4cbef69bea41041e2fb8b910e9 -> alpine-2.25-ssl.patch chappa? ( http://alpine.x10host.com/alpine/patches/alpine-2.25/all.patch.gz -> alpine-2.25-chappa.patch.gz )
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=944665a3fc1ecbf69e0353c71bf6c4a5
diff --git a/metadata/md5-cache/mail-client/evolution-3.42.0 b/metadata/md5-cache/mail-client/evolution-3.42.0
new file mode 100644
index 000000000000..a75b7a35cc2f
--- /dev/null
+++ b/metadata/md5-cache/mail-client/evolution-3.42.0
@@ -0,0 +1,14 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.18.3 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-2.2.0:2 >=dev-libs/glib-2.56:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.42.0:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.28.0:4[spell?] >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) ytnef? ( net-mail/ytnef ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Integrated mail, addressbook and calendaring functionality
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+IUSE=archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
+RDEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-2.2.0:2 >=dev-libs/glib-2.56:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.42.0:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.28.0:4[spell?] >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) ytnef? ( net-mail/ytnef ) highlight? ( app-text/highlight )
+SLOT=2.0
+SRC_URI=mirror://gnome/sources/evolution/3.42/evolution-3.42.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1dda9e84469ced76da6d0ca09c44cbdd
diff --git a/metadata/md5-cache/mail-client/neomutt-20211015 b/metadata/md5-cache/mail-client/neomutt-20211015
new file mode 100644
index 000000000000..6cb735f56ada
--- /dev/null
+++ b/metadata/md5-cache/mail-client/neomutt-20211015
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst test
+DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-1.13.1:= ) autocrypt? ( >=dev-db/sqlite-3 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( >=dev-libs/openssl-1.0.2u:0= ) lz4? ( app-arch/lz4 ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) dev-lang/tcl:= net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=7
+HOMEPAGE=https://neomutt.org/
+IUSE=autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet lmdb lz4 nls notmuch pgp-classic qdbm sasl selinux slang smime-classic ssl tokyocabinet test zlib zstd
+KEYWORDS=~amd64 ~ppc64 ~s390 ~x86
+LICENSE=GPL-2
+RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-1.13.1:= ) autocrypt? ( >=dev-db/sqlite-3 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( >=dev-libs/openssl-1.0.2u:0= ) lz4? ( app-arch/lz4 ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-mutt )
+REQUIRED_USE=autocrypt? ( gpgme )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/neomutt/neomutt/archive/20211015.tar.gz -> neomutt-20211015.tar.gz test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5667c0555888385b4f6e3bf799391da3
diff --git a/metadata/md5-cache/mail-client/roundcube-1.4.11 b/metadata/md5-cache/mail-client/roundcube-1.4.11
index a41b86a8f1c4..017b35da0e75 100644
--- a/metadata/md5-cache/mail-client/roundcube-1.4.11
+++ b/metadata/md5-cache/mail-client/roundcube-1.4.11
@@ -6,9 +6,9 @@ HOMEPAGE=https://roundcube.net
 IUSE=change-password enigma ldap mysql postgres sqlite ssl spell vhosts
 KEYWORDS=amd64 arm ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
-RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.4.0[filter,gd,iconv,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml] virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) >=app-admin/webapp-config-1.50.15
+RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.4.0[filter,gd,iconv,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml] <dev-lang/php-8 virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=1.4.11
 SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.4.11/roundcubemail-1.4.11-complete.tar.gz
 _eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=82de7098c919d67921d988577048732f
+_md5_=149ce59f5b6d13369208fe7d8ae6f343
diff --git a/metadata/md5-cache/mail-client/roundcube-1.5.0 b/metadata/md5-cache/mail-client/roundcube-1.5.0
new file mode 100644
index 000000000000..493f87fb5dfd
--- /dev/null
+++ b/metadata/md5-cache/mail-client/roundcube-1.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup unpack
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
+EAPI=7
+HOMEPAGE=https://roundcube.net
+IUSE=change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip vhosts
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
+RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.5.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?] virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=1.5.0
+SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.5.0/roundcubemail-1.5.0-complete.tar.gz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=922889af0ae175a706d79a9f965e5616
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index b5955fa22a1f..d173ee834a0a 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.16 b/metadata/md5-cache/mail-mta/msmtp-1.8.16
index 11d0195c6034..f3bfac168453 100644
--- a/metadata/md5-cache/mail-mta/msmtp-1.8.16
+++ b/metadata/md5-cache/mail-mta/msmtp-1.8.16
@@ -5,11 +5,11 @@ DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
 EAPI=8
 HOMEPAGE=https://marlam.de/msmtp/
 IUSE=daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax +filecaps
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) net-mail/mailbase daemon? ( acct-group/msmtpd acct-user/msmtpd ) mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] )
 REQUIRED_USE=daemon? ( filecaps )
 SLOT=0
 SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.8.16.tar.xz
 _eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150
-_md5_=7525020bf05f1649578b54530450c84d
+_md5_=d183a056c295287afaf1e0c4300e4aed
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index fd955cbcae0d..a3db52862a56 100644
--- a/metadata/md5-cache/mate-extra/Manifest.gz
+++ b/metadata/md5-cache/mate-extra/Manifest.gz
diff --git a/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0-r1 b/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0-r1
index 554e7b00479a..e56f040abb87 100644
--- a/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0-r1
+++ b/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/caja-dropbox-1.24.0.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	553f2bcf70c72d62970c216e3a74c24d	mate-desktop.org	a89e58659c8df5f186d0f8d89616e6f2	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	553f2bcf70c72d62970c216e3a74c24d	mate-desktop.org	a89e58659c8df5f186d0f8d89616e6f2	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a1c04e08e9fe290f9109093632bb3904
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index f41465328ba4..32883a086fd5 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/alembic-1.8.3 b/metadata/md5-cache/media-gfx/alembic-1.8.3
new file mode 100644
index 000000000000..ef36bc67ac13
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/alembic-1.8.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) || ( >=dev-libs/imath-3.0.1[python?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ( >=media-libs/ilmbase-2.5.5 python? ( >=dev-python/pyilmbase-2.5.5[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ) ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] >=sys-libs/zlib-1.2.11-r1 ) python? ( python_single_target_python3_8? ( dev-libs/boost[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost[python,python_targets_python3_10(-)] ) )
+DESCRIPTION=Open framework for storing and sharing scene data
+EAPI=8
+HOMEPAGE=https://www.alembic.io/
+IUSE=examples hdf5 python test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) || ( >=dev-libs/imath-3.0.1[python?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ( >=media-libs/ilmbase-2.5.5 python? ( >=dev-python/pyilmbase-2.5.5[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ) ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] >=sys-libs/zlib-1.2.11-r1 ) python? ( python_single_target_python3_8? ( dev-libs/boost[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost[python,python_targets_python3_10(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/alembic/alembic/archive/1.8.3.tar.gz -> alembic-1.8.3.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=846b615466837a0e9510242152400c38
diff --git a/metadata/md5-cache/media-gfx/chafa-1.6.1 b/metadata/md5-cache/media-gfx/chafa-1.6.1
deleted file mode 100644
index 522d95ad2fe4..000000000000
--- a/metadata/md5-cache/media-gfx/chafa-1.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 media-gfx/imagemagick:0= tools? ( >=media-libs/freetype-2.0.0 )
-DESCRIPTION=versatile and fast Unicode/ASCII/ANSI graphics renderer
-EAPI=8
-HOMEPAGE=https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa
-IUSE=+tools
-KEYWORDS=amd64 arm64 x86
-LICENSE=LGPL-3+
-RDEPEND=dev-libs/glib:2 media-gfx/imagemagick:0= tools? ( >=media-libs/freetype-2.0.0 )
-SLOT=0
-SRC_URI=https://hpjansson.org/chafa/releases/chafa-1.6.1.tar.xz
-_md5_=a03e54ae020825c0c07b59a5cb79e494
diff --git a/metadata/md5-cache/media-gfx/chafa-1.8.0 b/metadata/md5-cache/media-gfx/chafa-1.8.0
index 5d176d752bb1..2b32d40ba071 100644
--- a/metadata/md5-cache/media-gfx/chafa-1.8.0
+++ b/metadata/md5-cache/media-gfx/chafa-1.8.0
@@ -5,9 +5,9 @@ DESCRIPTION=versatile and fast Unicode/ASCII/ANSI graphics renderer
 EAPI=8
 HOMEPAGE=https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa
 IUSE=+tools
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-3+
 RDEPEND=dev-libs/glib:2 media-gfx/imagemagick:0= tools? ( >=media-libs/freetype-2.0.0 )
 SLOT=0
 SRC_URI=https://hpjansson.org/chafa/releases/chafa-1.8.0.tar.xz
-_md5_=f26ff2b6eb538a894abda27ffc210219
+_md5_=a03e54ae020825c0c07b59a5cb79e494
diff --git a/metadata/md5-cache/media-gfx/eog-plugins-3.26.7 b/metadata/md5-cache/media-gfx/eog-plugins-3.26.7
index 049fd13ea29c..46dc9cd791ad 100644
--- a/metadata/md5-cache/media-gfx/eog-plugins-3.26.7
+++ b/metadata/md5-cache/media-gfx/eog-plugins-3.26.7
@@ -1,15 +1,15 @@
 BDEPEND=>=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libpeas-0.7.4:= >=media-gfx/eog-3.15.90 >=x11-libs/gtk+-3.14:3 exif? ( >=media-libs/libexif-0.6.16 ) map? ( media-libs/libchamplain:0.12[gtk] >=media-libs/clutter-1.9.4:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 ) picasa? ( >=dev-libs/libgdata-0.9.1:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.32:2[dbus] dev-libs/libpeas:=[gtk,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) gnome-base/gsettings-desktop-schemas media-gfx/eog[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libpeas-0.7.4:= >=media-gfx/eog-3.15.90 >=x11-libs/gtk+-3.14:3 exif? ( >=media-libs/libexif-0.6.16 ) map? ( media-libs/libchamplain:0.12[gtk] >=media-libs/clutter-1.9.4:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 ) picasa? ( >=dev-libs/libgdata-0.9.1:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-libs/glib-2.32:2[dbus] dev-libs/libpeas:=[gtk,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) gnome-base/gsettings-desktop-schemas media-gfx/eog[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Eye of GNOME plugins
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome/Plugins
-IUSE=+exif map picasa +python python_single_target_python3_8 python_single_target_python3_9
+IUSE=+exif map picasa +python python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libpeas-0.7.4:= >=media-gfx/eog-3.15.90 >=x11-libs/gtk+-3.14:3 exif? ( >=media-libs/libexif-0.6.16 ) map? ( media-libs/libchamplain:0.12[gtk] >=media-libs/clutter-1.9.4:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 ) picasa? ( >=dev-libs/libgdata-0.9.1:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.32:2[dbus] dev-libs/libpeas:=[gtk,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) gnome-base/gsettings-desktop-schemas media-gfx/eog[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] )
-REQUIRED_USE=map? ( exif ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libpeas-0.7.4:= >=media-gfx/eog-3.15.90 >=x11-libs/gtk+-3.14:3 exif? ( >=media-libs/libexif-0.6.16 ) map? ( media-libs/libchamplain:0.12[gtk] >=media-libs/clutter-1.9.4:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 ) picasa? ( >=dev-libs/libgdata-0.9.1:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-libs/glib-2.32:2[dbus] dev-libs/libpeas:=[gtk,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) gnome-base/gsettings-desktop-schemas media-gfx/eog[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] )
+REQUIRED_USE=map? ( exif ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/eog-plugins/3.26/eog-plugins-3.26.7.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1ac179a0672cb2d74ce6ebeaf411728b
+_md5_=38fb1b801f62584c292445d3a3af6931
diff --git a/metadata/md5-cache/media-gfx/feh-3.7.2 b/metadata/md5-cache/media-gfx/feh-3.7.2
index 42fff1da42d1..90af6a4815c1 100644
--- a/metadata/md5-cache/media-gfx/feh-3.7.2
+++ b/metadata/md5-cache/media-gfx/feh-3.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=A fast, lightweight imageviewer using imlib2
 EAPI=7
 HOMEPAGE=https://feh.finalrewind.org/
 IUSE=debug curl exif test xinerama inotify
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86
 LICENSE=feh
 RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://feh.finalrewind.org/feh-3.7.2.tar.bz2
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=22f11047223baff2fe7e6a8509756f02
+_md5_=ef7b3eb38b93125b1f708c18c8e1621a
diff --git a/metadata/md5-cache/media-gfx/gifsicle-1.93 b/metadata/md5-cache/media-gfx/gifsicle-1.93
new file mode 100644
index 000000000000..af3bbb750f2a
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gifsicle-1.93
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=X? ( x11-libs/libX11 x11-libs/libXt ) X? ( x11-base/xorg-proto )
+DESCRIPTION=Create, manipulate, and optimize GIF images and animations
+EAPI=8
+HOMEPAGE=https://www.lcdf.org/~eddietwo/gifsicle/ https://github.com/kohler/gifsicle
+IUSE=X
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2 MIT
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libXt )
+SLOT=0
+SRC_URI=https://www.lcdf.org/~eddietwo/gifsicle/gifsicle-1.93.tar.gz
+_md5_=b8c29f5876e7168f9d212d5f4c40090a
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.22-r2 b/metadata/md5-cache/media-gfx/gimp-2.10.22-r2
deleted file mode 100644
index 9194a50863fa..000000000000
--- a/metadata/md5-cache/media-gfx/gimp-2.10.22-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.78 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.26:0.4[cairo] <media-libs/gegl-0.4.28:0.4 >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 sys-apps/findutils >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNU Image Manipulation Program
-EAPI=7
-HOMEPAGE=https://www.gimp.org/
-IUSE=aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.78 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.26:0.4[cairo] <media-libs/gegl-0.4.28:0.4 >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=mirror://gimp/v2.10/gimp-2.10.22.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5470563d9ef4f7c3fd64a3225167252c
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.22-r3 b/metadata/md5-cache/media-gfx/gimp-2.10.22-r3
new file mode 100644
index 000000000000..1000498745d1
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.22-r3
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.78 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.26:0.4[cairo] <media-libs/gegl-0.4.28:0.4 >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 sys-apps/findutils >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNU Image Manipulation Program
+EAPI=7
+HOMEPAGE=https://www.gimp.org/
+IUSE=aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse test
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.78 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.26:0.4[cairo] <media-libs/gegl-0.4.28:0.4 >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=mirror://gimp/v2.10/gimp-2.10.22.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=7fe6f8b24f95b87b4cb10697029a84a9
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.24 b/metadata/md5-cache/media-gfx/gimp-2.10.24
deleted file mode 100644
index 35d2d795d63f..000000000000
--- a/metadata/md5-cache/media-gfx/gimp-2.10.24
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.86 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.30:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 sys-apps/findutils >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNU Image Manipulation Program
-EAPI=7
-HOMEPAGE=https://www.gimp.org/
-IUSE=aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.86 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.30:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=mirror://gimp/v2.10/gimp-2.10.24.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3268946f800382301154923d72d42363
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.24-r1 b/metadata/md5-cache/media-gfx/gimp-2.10.24-r1
new file mode 100644
index 000000000000..f1af1503954e
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.24-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.86 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.30:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 sys-apps/findutils >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNU Image Manipulation Program
+EAPI=7
+HOMEPAGE=https://www.gimp.org/
+IUSE=aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.86 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.30:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=mirror://gimp/v2.10/gimp-2.10.24.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1c8600ee9352b553990ec2c7127b0d8f
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.28 b/metadata/md5-cache/media-gfx/gimp-2.10.28
deleted file mode 100644
index c0bcc8b8adb1..000000000000
--- a/metadata/md5-cache/media-gfx/gimp-2.10.28
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.88 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.32:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 sys-apps/findutils >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNU Image Manipulation Program
-EAPI=7
-HOMEPAGE=https://www.gimp.org/
-IUSE=aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.88 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.32:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=mirror://gimp/v2.10/gimp-2.10.28.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=06a69926500248ff1cf07e4b1d521623
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.28-r1 b/metadata/md5-cache/media-gfx/gimp-2.10.28-r1
new file mode 100644
index 000000000000..b6d8187815c3
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.28-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.88 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.32:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 sys-apps/findutils >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNU Image Manipulation Program
+EAPI=7
+HOMEPAGE=https://www.gimp.org/
+IUSE=aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.88 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.32:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=mirror://gimp/v2.10/gimp-2.10.28.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=64521643a448512e50fcb64cc0d145d2
diff --git a/metadata/md5-cache/media-gfx/gimp-2.99.6 b/metadata/md5-cache/media-gfx/gimp-2.99.6
deleted file mode 100644
index 8a46dc842e2c..000000000000
--- a/metadata/md5-cache/media-gfx/gimp-2.99.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.62.6:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.86[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.30:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.10.10 >=media-libs/harfbuzz-2.6.5 >=media-libs/lcms-2.9:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2 >=x11-libs/gtk+-3.24.16:3 x11-libs/libXcursor >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.30.3 >=dev-libs/appstream-glib-0.7.16 dev-util/gdbus-codegen dev-util/gtk-update-icon-cache >=dev-util/intltool-0.51.0 sys-apps/findutils >=sys-devel/autoconf-2.54 >=sys-devel/automake-1.11 >=sys-devel/gettext-0.21 >=sys-devel/libtool-2.4.6 doc? ( app-text/yelp-tools dev-libs/gobject-introspection[doctool] >=dev-util/gtk-doc-1.32 dev-util/gtk-doc-am ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNU Image Manipulation Program
-EAPI=7
-HOMEPAGE=https://www.gimp.org/
-IUSE=aalib alsa aqua doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +lua_single_target_luajit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
-KEYWORDS=~riscv
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.62.6:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.86[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.30:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.10.10 >=media-libs/harfbuzz-2.6.5 >=media-libs/lcms-2.9:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2 >=x11-libs/gtk+-3.24.16:3 x11-libs/libXcursor >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=mirror://gimp/v2.99/gimp-2.99.6.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d9e4711af2c77668169ec919373250ee
diff --git a/metadata/md5-cache/media-gfx/gimp-2.99.6-r1 b/metadata/md5-cache/media-gfx/gimp-2.99.6-r1
new file mode 100644
index 000000000000..a386e483c687
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gimp-2.99.6-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.62.6:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.86[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.30:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.10.10 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2 >=x11-libs/gtk+-3.24.16:3 x11-libs/libXcursor >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.30.3 >=dev-libs/appstream-glib-0.7.16 dev-util/gdbus-codegen dev-util/gtk-update-icon-cache >=dev-util/intltool-0.51.0 sys-apps/findutils >=sys-devel/autoconf-2.54 >=sys-devel/automake-1.11 >=sys-devel/gettext-0.21 >=sys-devel/libtool-2.4.6 doc? ( app-text/yelp-tools dev-libs/gobject-introspection[doctool] >=dev-util/gtk-doc-1.32 dev-util/gtk-doc-am ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNU Image Manipulation Program
+EAPI=7
+HOMEPAGE=https://www.gimp.org/
+IUSE=aalib alsa aqua doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +lua_single_target_luajit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+LICENSE=GPL-3 LGPL-3
+RDEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.62.6:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.86[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.30:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.10.10 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2 >=x11-libs/gtk+-3.24.16:3 x11-libs/libXcursor >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=mirror://gimp/v2.99/gimp-2.99.6.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=97e5b9a3c3d70e44391b02dc151b9fa0
diff --git a/metadata/md5-cache/media-gfx/gimp-9999 b/metadata/md5-cache/media-gfx/gimp-9999
index 7032bb1ba07a..195f91b1cae5 100644
--- a/metadata/md5-cache/media-gfx/gimp-9999
+++ b/metadata/md5-cache/media-gfx/gimp-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.62.6:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.86[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.30:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.10.10 >=media-libs/harfbuzz-2.6.5 >=media-libs/lcms-2.9:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2 >=x11-libs/gtk+-3.24.16:3 x11-libs/libXcursor >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.30.3 >=dev-libs/appstream-glib-0.7.16 dev-util/gdbus-codegen dev-util/gtk-update-icon-cache >=dev-util/intltool-0.51.0 sys-apps/findutils >=sys-devel/autoconf-2.54 >=sys-devel/automake-1.11 >=sys-devel/gettext-0.21 >=sys-devel/libtool-2.4.6 doc? ( >=dev-util/gtk-doc-1.32 dev-util/gtk-doc-am ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.62.6:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.86[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.30:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.10.10 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2 >=x11-libs/gtk+-3.24.16:3 x11-libs/libXcursor >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.30.3 >=dev-libs/appstream-glib-0.7.16 dev-util/gdbus-codegen dev-util/gtk-update-icon-cache >=dev-util/intltool-0.51.0 sys-apps/findutils >=sys-devel/autoconf-2.54 >=sys-devel/automake-1.11 >=sys-devel/gettext-0.21 >=sys-devel/libtool-2.4.6 doc? ( >=dev-util/gtk-doc-1.32 dev-util/gtk-doc-am ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GNU Image Manipulation Program
 EAPI=7
 HOMEPAGE=https://www.gimp.org/
 IUSE=aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +lua_single_target_luajit python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=GPL-3 LGPL-3
 PROPERTIES=live
-RDEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.62.6:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.86[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.30:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.10.10 >=media-libs/harfbuzz-2.6.5 >=media-libs/lcms-2.9:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2 >=x11-libs/gtk+-3.24.16:3 x11-libs/libXcursor >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+RDEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.34.1 >=dev-libs/glib-2.62.6:2 >=dev-libs/json-glib-1.4.4 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.21:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.86[introspection,lcms,vala?] >=media-libs/fontconfig-2.12.6 >=media-libs/freetype-2.10.2 >=media-libs/gegl-0.4.30:0.4[cairo,introspection,lcms,vala?] >=media-libs/gexiv2-0.10.10 >=media-libs/harfbuzz-2.6.5:= >=media-libs/lcms-2.9:2 >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.37:0= >=media-libs/tiff-4.1.0:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.16.0 >=x11-libs/gdk-pixbuf-2.40.0:2 >=x11-libs/gtk+-3.24.16:3 x11-libs/libXcursor >=x11-libs/pango-1.44.7 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_luajit? ( dev-lua/lgi[lua_targets_luajit(-)] ) ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-2.3.0:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c5a0fcb343de24cfb27f25d5ee082683
+_md5_=bd2e76ced553e448ed4498b6a45e251b
diff --git a/metadata/md5-cache/media-gfx/gnome-font-viewer-40.0 b/metadata/md5-cache/media-gfx/gnome-font-viewer-40.0
deleted file mode 100644
index dbe94738bf20..000000000000
--- a/metadata/md5-cache/media-gfx/gnome-font-viewer-40.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.1:3 >=gui-libs/libhandy-1.0.0:1= >=media-libs/harfbuzz-0.9.9 media-libs/fontconfig:1.0 media-libs/freetype:2 gnome-base/gnome-desktop:3= dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Font viewer utility for GNOME
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-font-viewer
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.1:3 >=gui-libs/libhandy-1.0.0:1= >=media-libs/harfbuzz-0.9.9 media-libs/fontconfig:1.0 media-libs/freetype:2 gnome-base/gnome-desktop:3=
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-font-viewer/40/gnome-font-viewer-40.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f2b34cc267f132f5b9c21bc22900d8c2
diff --git a/metadata/md5-cache/media-gfx/gnome-font-viewer-40.0-r1 b/metadata/md5-cache/media-gfx/gnome-font-viewer-40.0-r1
new file mode 100644
index 000000000000..474bc5c37965
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gnome-font-viewer-40.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.1:3 >=gui-libs/libhandy-1.0.0:1= >=media-libs/harfbuzz-0.9.9:= media-libs/fontconfig:1.0 media-libs/freetype:2 gnome-base/gnome-desktop:3= dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Font viewer utility for GNOME
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-font-viewer
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.1:3 >=gui-libs/libhandy-1.0.0:1= >=media-libs/harfbuzz-0.9.9:= media-libs/fontconfig:1.0 media-libs/freetype:2 gnome-base/gnome-desktop:3=
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-font-viewer/40/gnome-font-viewer-40.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c796c5a1b19c182cc1646cdac4cdf419
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.47.3 b/metadata/md5-cache/media-gfx/graphviz-2.47.3
deleted file mode 100644
index 8e65fc5ebb32..000000000000
--- a/metadata/md5-cache/media-gfx/graphviz-2.47.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/flex sys-devel/libtool x11-libs/gdk-pixbuf:2 virtual/pkgconfig doc? ( app-text/ghostscript-gpl sys-apps/groff ) guile? ( dev-lang/swig dev-scheme/guile ) java? ( dev-lang/swig >=virtual/jdk-1.8:* ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0= sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) guile? ( dev-scheme/guile ) java? ( >=virtual/jre-1.8:* ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Open Source Graph Visualization Software
-EAPI=7
-HOMEPAGE=https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
-IUSE=+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby svg tcl webp X elibc_FreeBSD java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris
-LICENSE=CPL-1.0
-RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0= sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) guile? ( dev-scheme/guile ) java? ( >=virtual/jre-1.8:* ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) pdf? ( cairo ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/2.47.3/graphviz-2.47.3.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a8a6aa8b64533ac2250e389d75346b3f
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.48.0 b/metadata/md5-cache/media-gfx/graphviz-2.48.0
deleted file mode 100644
index 864ed2a7b827..000000000000
--- a/metadata/md5-cache/media-gfx/graphviz-2.48.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/flex sys-devel/libtool x11-libs/gdk-pixbuf:2 virtual/pkgconfig doc? ( app-text/ghostscript-gpl sys-apps/groff ) guile? ( dev-lang/swig dev-scheme/guile ) java? ( dev-lang/swig >=virtual/jdk-1.8:* ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0= sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) guile? ( dev-scheme/guile ) java? ( >=virtual/jre-1.8:* ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Open Source Graph Visualization Software
-EAPI=7
-HOMEPAGE=https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
-IUSE=+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby svg tcl webp X elibc_FreeBSD java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris
-LICENSE=CPL-1.0
-RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0= sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) guile? ( dev-scheme/guile ) java? ( >=virtual/jre-1.8:* ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) pdf? ( cairo ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/2.48.0/graphviz-2.48.0.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ffac6cbf5399625612a5b5a67eae2f45
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.49.0 b/metadata/md5-cache/media-gfx/graphviz-2.49.0
index eba4e9d7c31a..895b461c7941 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.49.0
+++ b/metadata/md5-cache/media-gfx/graphviz-2.49.0
@@ -5,7 +5,7 @@ DESCRIPTION=Open Source Graph Visualization Software
 EAPI=7
 HOMEPAGE=https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
 IUSE=+cairo devil doc examples gtk gts guile java lasi lefty nls pdf perl postscript python qt5 ruby svg tcl webp X elibc_FreeBSD java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-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 ~x64-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 ~x64-solaris
 LICENSE=CPL-1.0
 RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0= sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) guile? ( dev-scheme/guile ) java? ( >=virtual/jre-1.8:* ) lasi? ( media-libs/lasi ) lefty? ( x11-libs/libXaw x11-libs/libXmu ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) pdf? ( cairo ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/2.49.0/graphviz-2.49.0.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e5b957d08bcce92ee29f3680d1edb210
+_md5_=2cd3cc36280a69972f1361135af30840
diff --git a/metadata/md5-cache/media-gfx/hugin-2020.0.0-r1 b/metadata/md5-cache/media-gfx/hugin-2020.0.0-r1
index f0241281b5c4..09591d29d6f7 100644
--- a/metadata/md5-cache/media-gfx/hugin-2020.0.0-r1
+++ b/metadata/md5-cache/media-gfx/hugin-2020.0.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:0= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GUI for the creation & processing of panoramic images
 EAPI=7
 HOMEPAGE=http://hugin.sf.net
 IUSE=debug lapack python raw sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2
-RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
+RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:0= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hugin/hugin-2020.0.0.tar.bz2
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9f7af1545ded7ccc4a2196d0d164c0d0
+_md5_=e95946337b585150e5ed7a25f84be4e6
diff --git a/metadata/md5-cache/media-gfx/hydrus-452 b/metadata/md5-cache/media-gfx/hydrus-452
deleted file mode 100644
index 414e0bcc4c8a..000000000000
--- a/metadata/md5-cache/media-gfx/hydrus-452
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cloudscraper[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) )
-DEFINED_PHASES=compile install postinst prepare setup test
-DESCRIPTION=A booru-like media organizer for the desktop
-EAPI=7
-HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
-IUSE=test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
-LICENSE=WTFPL-2 CC-BY-2.5
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cloudscraper[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v452.tar.gz -> hydrus-452.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7b6b287c0f03962da54dc626f5496c54
diff --git a/metadata/md5-cache/media-gfx/hydrus-453 b/metadata/md5-cache/media-gfx/hydrus-453
deleted file mode 100644
index 432f491b33fd..000000000000
--- a/metadata/md5-cache/media-gfx/hydrus-453
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cloudscraper[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) )
-DEFINED_PHASES=compile install postinst prepare setup test
-DESCRIPTION=A booru-like media organizer for the desktop
-EAPI=7
-HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
-IUSE=test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
-LICENSE=WTFPL-2 CC-BY-2.5
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cloudscraper[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v453.tar.gz -> hydrus-453.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7b6b287c0f03962da54dc626f5496c54
diff --git a/metadata/md5-cache/media-gfx/hydrus-457 b/metadata/md5-cache/media-gfx/hydrus-457
new file mode 100644
index 000000000000..678b5c1527b7
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/hydrus-457
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cloudscraper[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) )
+DEFINED_PHASES=compile install postinst prepare setup test
+DESCRIPTION=A booru-like media organizer for the desktop
+EAPI=7
+HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
+IUSE=test python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=WTFPL-2 CC-BY-2.5
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cloudscraper[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v457.tar.gz -> hydrus-457.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7b6b287c0f03962da54dc626f5496c54
diff --git a/metadata/md5-cache/media-gfx/hydrus-458 b/metadata/md5-cache/media-gfx/hydrus-458
new file mode 100644
index 000000000000..42f814b162b0
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/hydrus-458
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cloudscraper[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) )
+DEFINED_PHASES=compile install postinst prepare setup test
+DESCRIPTION=A booru-like media organizer for the desktop
+EAPI=7
+HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
+IUSE=test python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=WTFPL-2 CC-BY-2.5
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cloudscraper[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cloudscraper[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] media-video/ffmpeg media-video/mpv[libmpv,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v458.tar.gz -> hydrus-458.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7b6b287c0f03962da54dc626f5496c54
diff --git a/metadata/md5-cache/media-gfx/iscan-plugin-network-nt-1.1.3 b/metadata/md5-cache/media-gfx/iscan-plugin-network-nt-1.1.3
index 8ff55d18c782..b3b87f6003cc 100644
--- a/metadata/md5-cache/media-gfx/iscan-plugin-network-nt-1.1.3
+++ b/metadata/md5-cache/media-gfx/iscan-plugin-network-nt-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/iscan
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download2.ebz.epson.net/imagescanv3/centos/latest1/rpm/x64/imagescan-bundle-centos-8-3.62.0.x64.rpm.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d883ce675a5ed2f5da176e99f8199507
diff --git a/metadata/md5-cache/media-gfx/kgeotag-1.1.0 b/metadata/md5-cache/media-gfx/kgeotag-1.1.0
new file mode 100644
index 000000000000..1eac9f60a7ba
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/kgeotag-1.1.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.82.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 kde-apps/libkexiv2:5 kde-apps/marble:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 dev-qt/qtcore:5
+DESCRIPTION=Photo geotagging program
+EAPI=8
+HOMEPAGE=https://kgeotag.kde.org/ https://apps.kde.org/kgeotag/
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 kde-apps/libkexiv2:5 kde-apps/marble:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kgeotag/1.1.0/kgeotag-1.1.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8ca4cdfc5962d0cca5dcbba466fff304
diff --git a/metadata/md5-cache/media-gfx/luminance-hdr-2.6.0-r1 b/metadata/md5-cache/media-gfx/luminance-hdr-2.6.0-r1
index cae68cd112ef..13ecab4aae23 100644
--- a/metadata/md5-cache/media-gfx/luminance-hdr-2.6.0-r1
+++ b/metadata/md5-cache/media-gfx/luminance-hdr-2.6.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend test
-DEPEND=dev-libs/boost:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/ilmbase:= media-libs/lcms:2 media-libs/libpng:0= media-libs/libraw:= media-libs/openexr:= media-libs/tiff:0 sci-libs/fftw:3.0=[threads] sci-libs/gsl:= virtual/jpeg:0 fits? ( sci-libs/cfitsio:= ) dev-cpp/eigen:3 test? ( dev-cpp/gtest )
+DEPEND=dev-libs/boost:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/ilmbase:= media-libs/lcms:2 media-libs/libpng:0= media-libs/libraw:= media-libs/openexr:0= media-libs/tiff:0 sci-libs/fftw:3.0=[threads] sci-libs/gsl:= virtual/jpeg:0 fits? ( sci-libs/cfitsio:= ) dev-cpp/eigen:3 test? ( dev-cpp/gtest )
 DESCRIPTION=Graphical user interface that provides a workflow for HDR imaging
 EAPI=7
 HOMEPAGE=http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR
 IUSE=cpu_flags_x86_sse2 fits openmp test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/boost:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/ilmbase:= media-libs/lcms:2 media-libs/libpng:0= media-libs/libraw:= media-libs/openexr:= media-libs/tiff:0 sci-libs/fftw:3.0=[threads] sci-libs/gsl:= virtual/jpeg:0 fits? ( sci-libs/cfitsio:= )
+RDEPEND=dev-libs/boost:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/ilmbase:= media-libs/lcms:2 media-libs/libpng:0= media-libs/libraw:= media-libs/openexr:0= media-libs/tiff:0 sci-libs/fftw:3.0=[threads] sci-libs/gsl:= virtual/jpeg:0 fits? ( sci-libs/cfitsio:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/qtpfsgui/luminance-hdr-2.6.0.tar.bz2
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=98eedd1031707193635a721f87d1dbcd
+_md5_=06dbc2e6e7ac501d15d6afcc0a8bedb4
diff --git a/metadata/md5-cache/media-gfx/pqiv-2.11 b/metadata/md5-cache/media-gfx/pqiv-2.11
index ba276cf4ac81..c1eb74372c70 100644
--- a/metadata/md5-cache/media-gfx/pqiv-2.11
+++ b/metadata/md5-cache/media-gfx/pqiv-2.11
@@ -4,10 +4,10 @@ DESCRIPTION=powerful GTK 3 based command-line image viewer with a minimal UI
 EAPI=6
 HOMEPAGE=https://github.com/phillipberndt/pqiv http://www.pberndt.com/Programme/Linux/pqiv/
 IUSE=archive ffmpeg imagemagick kernel_linux pdf postscript webp kernel_linux
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/cairo-1.6 x11-libs/gtk+:3 archive? ( app-arch/libarchive:0= ) ffmpeg? ( media-video/ffmpeg:0= ) imagemagick? ( media-gfx/imagemagick:0= ) pdf? ( app-text/poppler:0= ) postscript? ( app-text/libspectre:0= ) webp? ( media-libs/libwebp:0= )
 SLOT=0
 SRC_URI=https://github.com/phillipberndt/pqiv/archive/2.11.tar.gz -> pqiv-2.11.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=36f0fc3e0139cf134c83361bf9162369
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=36ba2d63df6195ac98e56edc737530c6
diff --git a/metadata/md5-cache/media-gfx/pqiv-9999 b/metadata/md5-cache/media-gfx/pqiv-9999
index 5caf3cfe8f9e..abbfa61529ca 100644
--- a/metadata/md5-cache/media-gfx/pqiv-9999
+++ b/metadata/md5-cache/media-gfx/pqiv-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/cairo-1.6 x11-libs/gtk+:3 archive? ( app-arch/libarchive:0= ) ffmpeg? ( media-video/ffmpeg:0= ) imagemagick? ( media-gfx/imagemagick:0= ) pdf? ( app-text/poppler:0= ) postscript? ( app-text/libspectre:0= ) webp? ( media-libs/libwebp:0= )
 SLOT=0
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d34cdd4ff6f237f963b0a5d174d3585f
diff --git a/metadata/md5-cache/media-gfx/pstoedit-3.75 b/metadata/md5-cache/media-gfx/pstoedit-3.75
index 08ead60e02fc..e592229bc83e 100644
--- a/metadata/md5-cache/media-gfx/pstoedit-3.75
+++ b/metadata/md5-cache/media-gfx/pstoedit-3.75
@@ -5,10 +5,10 @@ DESCRIPTION=Translate PostScript and PDF graphics into other vector formats
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/pstoedit/
 IUSE=emf imagemagick plotutils pptx
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=app-text/ghostscript-gpl-8.71-r1 >=media-libs/gd-2.0.35-r1:= emf? ( >=media-libs/libemf-1.0.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2:=[cxx] ) plotutils? ( media-libs/plotutils ) pptx? ( dev-libs/libzip:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/pstoedit/pstoedit-3.75.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8942d831568f0f0f89094340691e2f2f
+_md5_=b9aa22095dac1c90b77cd28cd982f6e0
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.10.0 b/metadata/md5-cache/media-gfx/ristretto-0.10.0
deleted file mode 100644
index 2fea68eded1a..000000000000
--- a/metadata/md5-cache/media-gfx/ristretto-0.10.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst postrm
-DEPEND=>=dev-libs/glib-2.42:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.10:0= >=xfce-base/libxfce4util-4.10:0= >=xfce-base/xfconf-4.12.1:0= dev-util/intltool virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=A fast and lightweight picture viewer for Xfce
-EAPI=7
-HOMEPAGE=https://docs.xfce.org/apps/ristretto/start
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.42:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.10:0= >=xfce-base/libxfce4util-4.10:0= >=xfce-base/xfconf-4.12.1:0=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/ristretto/0.10/ristretto-0.10.0.tar.bz2
-_eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=426522413ec7a30389138a370ad70eab
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.11.0 b/metadata/md5-cache/media-gfx/ristretto-0.11.0
index 166c114338a6..62c13b28dad4 100644
--- a/metadata/md5-cache/media-gfx/ristretto-0.11.0
+++ b/metadata/md5-cache/media-gfx/ristretto-0.11.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.42:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo
 DESCRIPTION=A fast and lightweight picture viewer for Xfce
 EAPI=7
 HOMEPAGE=https://docs.xfce.org/apps/ristretto/start
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.42:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.10:0= >=xfce-base/libxfce4util-4.10:0= >=xfce-base/xfconf-4.12.1:0=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/ristretto/0.11/ristretto-0.11.0.tar.bz2
 _eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fd604cca5689fbf5580263249d393085
+_md5_=ed3e8f0f79146625b22fd595d00c88a6
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.12.0 b/metadata/md5-cache/media-gfx/ristretto-0.12.0
new file mode 100644
index 000000000000..165921ac33cb
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/ristretto-0.12.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gettext
+DEFINED_PHASES=postinst postrm
+DEPEND=>=dev-libs/glib-2.42:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.16:0= >=xfce-base/libxfce4util-4.16:0= >=xfce-base/xfconf-4.12.1:0=
+DESCRIPTION=A fast and lightweight picture viewer for Xfce
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/apps/ristretto/start
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.42:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.16:0= >=xfce-base/libxfce4util-4.16:0= >=xfce-base/xfconf-4.12.1:0=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/ristretto/0.12/ristretto-0.12.0.tar.bz2
+_eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=02a133c108724c4bf7aca931d4f8153d
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.32 b/metadata/md5-cache/media-gfx/sane-backends-1.0.32
new file mode 100644
index 000000000000..567205252a48
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.32
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=acct-group/scanner acct-user/saned gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_escl? ( app-text/poppler[cairo] || ( net-dns/avahi[dbus] net-dns/avahi[gtk] ) net-dns/avahi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snmp? ( net-analyzer/net-snmp:0= ) systemd? ( sys-apps/systemd:0= ) usb? ( >=virtual/libusb-1-r1:1=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/libxml2 v4l? ( sys-kernel/linux-headers )
+DESCRIPTION=Scanner Access Now Easy - Backends
+EAPI=7
+HOMEPAGE=http://www.sane-project.org/
+IUSE=gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr +sane_backends_canon_lide70 sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_escl +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pieusb +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_ricoh2 +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2 public-domain
+RDEPEND=acct-group/scanner acct-user/saned gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_escl? ( app-text/poppler[cairo] || ( net-dns/avahi[dbus] net-dns/avahi[gtk] ) net-dns/avahi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snmp? ( net-analyzer/net-snmp:0= ) systemd? ( sys-apps/systemd:0= ) usb? ( >=virtual/libusb-1-r1:1=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=sane_backends_escl? ( zeroconf ) sane_backends_kvs40xx? ( threads ) sane_backends_mustek_usb2? ( threads )
+SLOT=0
+SRC_URI=https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/sane-backends-1.0.32.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=141cf8d511c3932fe9098d1942ef2f56
diff --git a/metadata/md5-cache/media-gfx/scour-0.38.2 b/metadata/md5-cache/media-gfx/scour-0.38.2
index ccb6271ad9c7..55c53e08acf7 100644
--- a/metadata/md5-cache/media-gfx/scour-0.38.2
+++ b/metadata/md5-cache/media-gfx/scour-0.38.2
@@ -1,15 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DESCRIPTION=Take an SVG file and produce a cleaner and more concise file
 EAPI=7
 HOMEPAGE=https://github.com/scour-project/scour
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/scour-project/scour/archive/v0.38.2.tar.gz -> scour-0.38.2.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ed853603cbac3222b824b813ed965dbb
+_md5_=2457c43a7be12714e31e36131b16988e
diff --git a/metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1 b/metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1
index bf52404c2bf7..e00281d169eb 100644
--- a/metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1
+++ b/metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-libs/boost-1.49 media-libs/tiff:0 virtual/jpeg:0 app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/boost:= media-libs/tiff:0 virtual/jpeg:0
 DESCRIPTION=sff to bmp converter
-EAPI=5
+EAPI=8
 HOMEPAGE=http://sfftools.sourceforge.net/
 KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=HPND MIT
-RDEPEND=>=dev-libs/boost-1.49 media-libs/tiff:0 virtual/jpeg:0
+RDEPEND=dev-libs/boost:= media-libs/tiff:0 virtual/jpeg:0
 SLOT=0
 SRC_URI=mirror://sourceforge/sfftools/sfftobmp3_1_2_src.zip
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c96ae74ddd2eac322361f33dd2a1489c
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cb76bf73ce3ed84b01cb9578492caa7a
diff --git a/metadata/md5-cache/media-gfx/slic3r-9999 b/metadata/md5-cache/media-gfx/slic3r-9999
index 2edf7044c09a..f9936ae3c2a3 100644
--- a/metadata/md5-cache/media-gfx/slic3r-9999
+++ b/metadata/md5-cache/media-gfx/slic3r-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-lang/perl
+BDEPEND=!=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads(+)] dev-perl/Class-XSAccessor dev-perl/Devel-CheckLib dev-perl/Devel-Size >=dev-perl/Encode-Locale-1.50.0 dev-perl/IO-stringy >=dev-perl/Math-PlanePath-53.0.0 >=dev-perl/Moo-1.3.1 dev-perl/XML-SAX-ExpatXS virtual/perl-Carp virtual/perl-Encode virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-parent virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple virtual/perl-Thread-Semaphore >=virtual/perl-threads-1.960.0 virtual/perl-Time-HiRes virtual/perl-Unicode-Normalize virtual/perl-XSLoader gui? ( dev-perl/Class-Accessor dev-perl/Growl-GNTP dev-perl/libwww-perl dev-perl/Module-Pluggable dev-perl/Net-Bonjour dev-perl/Net-DBus dev-perl/OpenGL >=dev-perl/Wx-0.991.800 dev-perl/Wx-GLCanvas >=media-libs/freeglut-3 virtual/perl-Math-Complex >=virtual/perl-Socket-2.16.0 x11-libs/libXmu ) dev-libs/clipper dev-perl/Devel-CheckLib >=dev-perl/ExtUtils-CppGuess-0.70.0 >=dev-perl/ExtUtils-Typemaps-Default-1.50.0 >=dev-perl/ExtUtils-XSpp-0.170.0 >=dev-perl/Module-Build-0.380.0 >=dev-perl/Module-Build-WithXSpp-0.140.0 >=virtual/perl-ExtUtils-MakeMaker-6.800.0 >=virtual/perl-ExtUtils-ParseXS-3.220.0 test? ( virtual/perl-Test-Harness virtual/perl-Test-Simple ) dev-perl/Module-Build >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=!=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads(+)] dev-perl/Class-XSAccessor dev-perl/Devel-CheckLib dev-perl/Devel-Size >=dev-perl/Encode-Locale-1.50.0 dev-perl/IO-stringy >=dev-perl/Math-PlanePath-53.0.0 >=dev-perl/Moo-1.3.1 dev-perl/XML-SAX-ExpatXS virtual/perl-Carp virtual/perl-Encode virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-parent virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple virtual/perl-Thread-Semaphore >=virtual/perl-threads-1.960.0 virtual/perl-Time-HiRes virtual/perl-Unicode-Normalize virtual/perl-XSLoader gui? ( dev-perl/Class-Accessor dev-perl/Growl-GNTP dev-perl/libwww-perl dev-perl/Module-Pluggable dev-perl/Net-Bonjour dev-perl/Net-DBus dev-perl/OpenGL >=dev-perl/Wx-0.991.800 dev-perl/Wx-GLCanvas >=media-libs/freeglut-3 virtual/perl-Math-Complex >=virtual/perl-Socket-2.16.0 x11-libs/libXmu ) dev-libs/clipper dev-perl/Devel-CheckLib >=dev-perl/ExtUtils-CppGuess-0.70.0 >=dev-perl/ExtUtils-Typemaps-Default-1.50.0 >=dev-perl/ExtUtils-XSpp-0.170.0 >=dev-perl/Module-Build-0.380.0 >=dev-perl/Module-Build-WithXSpp-0.140.0 >=virtual/perl-ExtUtils-MakeMaker-6.800.0 >=virtual/perl-ExtUtils-ParseXS-3.220.0 test? ( virtual/perl-Test-Harness virtual/perl-Test-Simple ) dev-lang/perl
 DESCRIPTION=A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)
@@ -11,4 +11,4 @@ RDEPEND=!=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads(+)] dev-perl/Class-X
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=61221090d8fa445d21be630e19cd78c3
+_md5_=dd4ec57e661b985f8c2a7f18fe27074b
diff --git a/metadata/md5-cache/media-gfx/xpaint-3.1.4 b/metadata/md5-cache/media-gfx/xpaint-3.1.4
new file mode 100644
index 000000000000..5aeb29b7afc6
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/xpaint-3.1.4
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=media-libs/fontconfig media-libs/libjpeg-turbo:= media-libs/libpng:0= media-libs/netpbm x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2h[unicode] x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt pgf? ( media-libs/libpgf ) tiff? ( media-libs/tiff:0 )
+DESCRIPTION=Image editor with tiff, jpeg and png support
+EAPI=8
+HOMEPAGE=http://sf-xpaint.sourceforge.net/
+IUSE=pgf tiff
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/fontconfig media-libs/libjpeg-turbo:= media-libs/libpng:0= media-libs/netpbm x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2h[unicode] x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt pgf? ( media-libs/libpgf ) tiff? ( media-libs/tiff:0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/sf-xpaint/xpaint-3.1.4.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5d749c4bc2980db1f02b43b87a7768b0
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index c19b700234c3..52b7f31427e7 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/cal3d-0.11.0-r1 b/metadata/md5-cache/media-libs/cal3d-0.11.0-r1
index f951b86cb844..c56e528c69c8 100644
--- a/metadata/md5-cache/media-libs/cal3d-0.11.0-r1
+++ b/metadata/md5-cache/media-libs/cal3d-0.11.0-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen app-text/docbook-sgml-utils ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( app-doc/doxygen app-text/docbook-sgml-utils ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure prepare
 DESCRIPTION=Cal3D is a skeletal based character animation library
-EAPI=5
-HOMEPAGE=http://home.gna.org/cal3d
+EAPI=8
+HOMEPAGE=https://mp3butcher.github.io/Cal3D/
 IUSE=16bit-indices debug doc
 KEYWORDS=amd64 ~ia64 ppc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://download.gna.org/cal3d/sources/cal3d-0.11.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3bfb5a2022983e5c0526a9cd0a88294c
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=000fa6957526b322e8602890dcf90daf
diff --git a/metadata/md5-cache/media-libs/ctl-1.5.2-r1 b/metadata/md5-cache/media-libs/ctl-1.5.2-r1
index cba415113351..5d011aad8ee4 100644
--- a/metadata/md5-cache/media-libs/ctl-1.5.2-r1
+++ b/metadata/md5-cache/media-libs/ctl-1.5.2-r1
@@ -3,10 +3,10 @@ DEPEND=media-libs/ilmbase:= media-libs/openexr:= media-libs/tiff:= !media-libs/o
 DESCRIPTION=AMPAS' Color Transformation Language
 EAPI=6
 HOMEPAGE=https://github.com/ampas/CTL
-KEYWORDS=amd64 ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=amd64 ~ia64 ppc64 x86
 LICENSE=AMPAS
 RDEPEND=media-libs/ilmbase:= media-libs/openexr:= media-libs/tiff:= !media-libs/openexr_ctl
 SLOT=0
 SRC_URI=https://github.com/ampas/CTL/archive/ctl-1.5.2.tar.gz
 _eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e3b92119c7c460f3371f6ec929c50707
+_md5_=3e8e4ec539cfd0c700dedf833a326e83
diff --git a/metadata/md5-cache/media-libs/ctl-1.5.2-r2 b/metadata/md5-cache/media-libs/ctl-1.5.2-r2
index 4b376b649c63..833357d8cae8 100644
--- a/metadata/md5-cache/media-libs/ctl-1.5.2-r2
+++ b/metadata/md5-cache/media-libs/ctl-1.5.2-r2
@@ -5,11 +5,11 @@ DESCRIPTION=AMPAS' Color Transformation Language
 EAPI=7
 HOMEPAGE=https://github.com/ampas/CTL
 IUSE=test
-KEYWORDS=amd64 ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=amd64 ~ia64 ppc64 x86
 LICENSE=AMPAS
 RDEPEND=media-libs/ilmbase:= media-libs/openexr:0= media-libs/tiff:= !media-libs/openexr_ctl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ampas/CTL/archive/ctl-1.5.2.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=70691271cc8b78affb656fbc18a191a7
+_md5_=21876252a146913699883e75cc4c6e80
diff --git a/metadata/md5-cache/media-libs/embree-3.13.0-r1 b/metadata/md5-cache/media-libs/embree-3.13.0-r1
index 638d623d1650..92eac82b1cbc 100644
--- a/metadata/md5-cache/media-libs/embree-3.13.0-r1
+++ b/metadata/md5-cache/media-libs/embree-3.13.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/glfw-3.2.1 virtual/opengl ispc? ( dev-lang/ispc ) tbb? ( de
 RESTRICT=mirror
 SLOT=3
 SRC_URI=https://github.com/embree/embree/archive/v3.13.0.tar.gz -> embree-3.13.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6e1572bb2ea199acc59d28db4d4cc656
diff --git a/metadata/md5-cache/media-libs/exiftool-12.30 b/metadata/md5-cache/media-libs/exiftool-12.30
index 40715a61617b..d78bcf518270 100644
--- a/metadata/md5-cache/media-libs/exiftool-12.30
+++ b/metadata/md5-cache/media-libs/exiftool-12.30
@@ -5,10 +5,10 @@ DESCRIPTION=Read and write meta information in image, audio and video files
 EAPI=7
 HOMEPAGE=https://exiftool.org/
 IUSE=doc
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 arm64 ppc ppc64 x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=https://exiftool.org/Image-ExifTool-12.30.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=b96fe5a5c1fed6a4c20e18de050bcc1c
+_md5_=82886fab7077a9ba1ab41f9bb25d1fcd
diff --git a/metadata/md5-cache/media-libs/exiftool-12.33 b/metadata/md5-cache/media-libs/exiftool-12.33
new file mode 100644
index 000000000000..f1d401fe5d67
--- /dev/null
+++ b/metadata/md5-cache/media-libs/exiftool-12.33
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Read and write meta information in image, audio and video files
+EAPI=8
+HOMEPAGE=https://exiftool.org/
+IUSE=doc test
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://exiftool.org/Image-ExifTool-12.33.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=26996dfbae76e76db3f3e3d730061040
diff --git a/metadata/md5-cache/media-libs/flickcurl-1.26 b/metadata/md5-cache/media-libs/flickcurl-1.26
index 25e3a9a1d34c..b4e93d5d35cf 100644
--- a/metadata/md5-cache/media-libs/flickcurl-1.26
+++ b/metadata/md5-cache/media-libs/flickcurl-1.26
@@ -1,13 +1,14 @@
+BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=>=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/raptor:2 ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/raptor:2 )
 DESCRIPTION=C library for the Flickr API
-EAPI=5
+EAPI=8
 HOMEPAGE=http://librdf.org/flickcurl/
-IUSE=doc raptor static-libs
+IUSE=raptor
 KEYWORDS=amd64 arm64 x86
 LICENSE=|| ( LGPL-2.1 GPL-2 Apache-2.0 )
 RDEPEND=>=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/raptor:2 )
 SLOT=0
 SRC_URI=http://download.dajobe.org/flickcurl/flickcurl-1.26.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9df71c32eb5d0a194bbba37826a0e368
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=945059ee3c7c0d1ca098abf65b93e2e5
diff --git a/metadata/md5-cache/media-libs/harfbuzz-3.0.0 b/metadata/md5-cache/media-libs/harfbuzz-3.0.0
deleted file mode 100644
index 6d28aa507088..000000000000
--- a/metadata/md5-cache/media-libs/harfbuzz-3.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/gobject-introspection-common-1.34
-DESCRIPTION=An OpenType text shaping engine
-EAPI=8
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
-IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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
-LICENSE=Old-MIT ISC icu
-RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=introspection? ( glib )
-RESTRICT=!test? ( test )
-SLOT=0/0.9.18
-SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/3.0.0.tar.gz -> harfbuzz-3.0.0.tar.gz
-_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=aa9af7aa04a40f436a65ed59674b7be5
diff --git a/metadata/md5-cache/media-libs/harfbuzz-3.0.0-r1 b/metadata/md5-cache/media-libs/harfbuzz-3.0.0-r1
new file mode 100644
index 000000000000..6cee17087262
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-3.0.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/gobject-introspection-common-1.34
+DESCRIPTION=An OpenType text shaping engine
+EAPI=8
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+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
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+RESTRICT=!test? ( test )
+SLOT=0/3.0.0
+SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/3.0.0.tar.gz -> harfbuzz-3.0.0.tar.gz
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5d1a9fa3b2eb1fa5a11ab52b14d84f88
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index c5859978c74d..2b6c15aa9867 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -10,6 +10,6 @@ PROPERTIES=live
 RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
 RESTRICT=!test? ( test )
-SLOT=0/0.9.18
+SLOT=0/3.0.0
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fe71519d665b0bb1cd50351a54ad9fef
+_md5_=5d1a9fa3b2eb1fa5a11ab52b14d84f88
diff --git a/metadata/md5-cache/media-libs/libafterimage-1.20-r4 b/metadata/md5-cache/media-libs/libafterimage-1.20-r4
index 773ddb9ab427..4dec02a10329 100644
--- a/metadata/md5-cache/media-libs/libafterimage-1.20-r4
+++ b/metadata/md5-cache/media-libs/libafterimage-1.20-r4
@@ -5,11 +5,11 @@ DESCRIPTION=Afterstep's standalone generic image manipulation library
 EAPI=7
 HOMEPAGE=http://www.afterstep.org/afterimage/index.php
 IUSE=+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping svg tiff truetype
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=X? ( x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( gnome-base/librsvg:2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype )
 REQUIRED_USE=shaping? ( X ) shm? ( X )
 SLOT=0
 SRC_URI=ftp://ftp.afterstep.org/stable/libAfterImage/libAfterImage-1.20.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fdade009a3a82e24c6fb55000eecb647
+_md5_=0f84205bfd59f752d2820be033381253
diff --git a/metadata/md5-cache/media-libs/libdvbcsa-1.1.0-r1 b/metadata/md5-cache/media-libs/libdvbcsa-1.1.0-r1
index 237727e11aee..8f71c544bac6 100644
--- a/metadata/md5-cache/media-libs/libdvbcsa-1.1.0-r1
+++ b/metadata/md5-cache/media-libs/libdvbcsa-1.1.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Free implementation of the DVB Common Scrambling Algorithm - DVB/CSA
 EAPI=7
 HOMEPAGE=https://www.videolan.org/developers/libdvbcsa.html
 IUSE=cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse2 debug
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://download.videolan.org/pub/videolan/libdvbcsa/1.1.0/libdvbcsa-1.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=695375f56fee0f2747d42784878cafb4
+_md5_=b5c44c608102ef8390d502f25d43b52f
diff --git a/metadata/md5-cache/media-libs/libemf-1.0.13 b/metadata/md5-cache/media-libs/libemf-1.0.13
index 9c859397cdbf..20d40e4bba06 100644
--- a/metadata/md5-cache/media-libs/libemf-1.0.13
+++ b/metadata/md5-cache/media-libs/libemf-1.0.13
@@ -3,8 +3,8 @@ DESCRIPTION=Library implementation of ECMA-234 API for the generation of enhance
 EAPI=7
 HOMEPAGE=http://libemf.sourceforge.net/
 IUSE=doc static-libs
-KEYWORDS=amd64 -arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 -arm ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/libemf/libemf-1.0.13.tar.gz
-_md5_=bb1fa8d0794c255c959dfdad42bace38
+_md5_=bf3dbe2bbe834c741ee38ff560cfaa5f
diff --git a/metadata/md5-cache/media-libs/libexif-0.6.22_p20201105 b/metadata/md5-cache/media-libs/libexif-0.6.22_p20201105
deleted file mode 100644
index d773b7d0c7b3..000000000000
--- a/metadata/md5-cache/media-libs/libexif-0.6.22_p20201105
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=nls? ( virtual/libintl )
-DESCRIPTION=Library for parsing, editing, and saving EXIF data
-EAPI=7
-HOMEPAGE=https://libexif.github.io/
-IUSE=doc nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=https://github.com/libexif/libexif/archive/9266d14b5ca4e29b970fa03272318e5f99386e06.tar.gz -> libexif-0.6.22_p20201105.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=770120f68c3f471b03ad681de5e3a1fb
diff --git a/metadata/md5-cache/media-libs/libexif-0.6.23 b/metadata/md5-cache/media-libs/libexif-0.6.23
index 88f933e8c416..c4d358829a3f 100644
--- a/metadata/md5-cache/media-libs/libexif-0.6.23
+++ b/metadata/md5-cache/media-libs/libexif-0.6.23
@@ -5,10 +5,10 @@ DESCRIPTION=Library for parsing, editing, and saving EXIF data
 EAPI=7
 HOMEPAGE=https://libexif.github.io/
 IUSE=doc nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/libexif/libexif/releases/download/v0.6.23/libexif-0.6.23.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ba57260d834654c5f25ce8901a21c995
+_md5_=3dc1d157b402b9c9f83b08509fb1848a
diff --git a/metadata/md5-cache/media-libs/libfreeaptx-0.1.1 b/metadata/md5-cache/media-libs/libfreeaptx-0.1.1
index f75fa83058d1..0d38da788027 100644
--- a/metadata/md5-cache/media-libs/libfreeaptx-0.1.1
+++ b/metadata/md5-cache/media-libs/libfreeaptx-0.1.1
@@ -3,9 +3,9 @@ DESCRIPTION=Reverse-engineered aptX and aptX HD library (fork of libopenaptx)
 EAPI=7
 HOMEPAGE=https://github.com/iamthehorker/libfreeaptx
 IUSE=cpu_flags_x86_avx2
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/iamthehorker/libfreeaptx/archive/0.1.1.tar.gz -> libfreeaptx-0.1.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=337902f5a3eebc0952013738b6cc8e37
+_md5_=49ef96f804c41b143e5ce13160293bef
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.5.3-r4 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.5.3-r4
deleted file mode 100644
index 570175ca94d8..000000000000
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.5.3-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-macos? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-cygwin? ( || ( dev-lang/nasm dev-lang/yasm ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library
-EAPI=7
-HOMEPAGE=https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/
-IUSE=java static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD IJG ZLIB
-RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/0.1
-SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.5.3.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ab02e8117ecda9b88678fedacfc5fbad
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.0-r2 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.0-r2
deleted file mode 100644
index ce0e59fc0c3b..000000000000
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16.5 amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-macos? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-cygwin? ( || ( dev-lang/nasm dev-lang/yasm ) ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jdk-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library
-EAPI=7
-HOMEPAGE=https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/
-IUSE=cpu_flags_arm_neon java static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 elibc_FreeBSD java
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=BSD IJG ZLIB
-RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/0.2
-SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.1.0.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=5913348d2cc52fc0e5cdac2a74d30afd
diff --git a/metadata/md5-cache/media-libs/libkeyfinder-2.2.5 b/metadata/md5-cache/media-libs/libkeyfinder-2.2.5
index c4666aed5f69..2eea5d23174d 100644
--- a/metadata/md5-cache/media-libs/libkeyfinder-2.2.5
+++ b/metadata/md5-cache/media-libs/libkeyfinder-2.2.5
@@ -4,10 +4,10 @@ DEPEND=sci-libs/fftw:3.0
 DESCRIPTION=Musical key detection library for digital audio
 EAPI=7
 HOMEPAGE=https://github.com/mixxxdj/libkeyfinder
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=sci-libs/fftw:3.0
 SLOT=0
 SRC_URI=https://github.com/mixxxdj/libkeyfinder/archive/v2.2.5.tar.gz -> libkeyfinder-2.2.5.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d2cff1de1142eae2b2a820f4c5c3596a
+_md5_=2cd16e1da3fa3e590789493c0b5caa82
diff --git a/metadata/md5-cache/media-libs/libopenmpt-0.5.11 b/metadata/md5-cache/media-libs/libopenmpt-0.5.11
deleted file mode 100644
index 17d0fd1c982f..000000000000
--- a/metadata/md5-cache/media-libs/libopenmpt-0.5.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install test
-DEPEND=mp3? ( media-sound/mpg123[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Library to decode tracked music files (modules)
-EAPI=7
-HOMEPAGE=https://lib.openmpt.org/libopenmpt/
-IUSE=examples mp3 ogg static-libs test vorbis zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=mp3? ( media-sound/mpg123[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-0.5.11+release.autotools.tar.gz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0b38122ec0ce0ef8defbfd79d218c649
diff --git a/metadata/md5-cache/media-libs/libopenmpt-0.5.12 b/metadata/md5-cache/media-libs/libopenmpt-0.5.12
new file mode 100644
index 000000000000..f1ef59130a26
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libopenmpt-0.5.12
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=mp3? ( media-sound/mpg123[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Library to decode tracked music files (modules)
+EAPI=7
+HOMEPAGE=https://lib.openmpt.org/libopenmpt/
+IUSE=examples mp3 ogg static-libs test vorbis zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=mp3? ( media-sound/mpg123[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( media-libs/libogg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-0.5.12+release.autotools.tar.gz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0b38122ec0ce0ef8defbfd79d218c649
diff --git a/metadata/md5-cache/media-libs/libsamplerate-0.2.1 b/metadata/md5-cache/media-libs/libsamplerate-0.2.1
deleted file mode 100644
index 61a2d5856e15..000000000000
--- a/metadata/md5-cache/media-libs/libsamplerate-0.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio
-EAPI=7
-HOMEPAGE=https://libsndfile.github.io/libsamplerate/
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD-2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/libsndfile/libsamplerate/releases/download/0.2.1/libsamplerate-0.2.1.tar.bz2
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=63be4555d986593b191790669137d7a6
diff --git a/metadata/md5-cache/media-libs/libsamplerate-0.2.2 b/metadata/md5-cache/media-libs/libsamplerate-0.2.2
index da302dcea30c..a62d5bf448fd 100644
--- a/metadata/md5-cache/media-libs/libsamplerate-0.2.2
+++ b/metadata/md5-cache/media-libs/libsamplerate-0.2.2
@@ -5,10 +5,10 @@ DESCRIPTION=Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter fo
 EAPI=8
 HOMEPAGE=https://libsndfile.github.io/libsamplerate/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libsndfile/libsamplerate/releases/download/0.2.2/libsamplerate-0.2.2.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2d9852553ffb5d2fd9b10732c7ffe1c9
+_md5_=09a2955acfc29c5102a21036e54c8c1e
diff --git a/metadata/md5-cache/media-libs/libsdl-1.2.15_p20210224 b/metadata/md5-cache/media-libs/libsdl-1.2.15_p20210224
index 027925bb0deb..c91e3eedb838 100644
--- a/metadata/md5-cache/media-libs/libsdl-1.2.15_p20210224
+++ b/metadata/md5-cache/media-libs/libsdl-1.2.15_p20210224
@@ -11,4 +11,4 @@ RDEPEND=aalib? ( >=media-libs/aalib-1.4_rc5-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi
 SLOT=0
 SRC_URI=https://github.com/libsdl-org/SDL-1.2/archive/99d7f1d1c5492f0fb3c799255042ca7a3f4a5de4.tar.gz -> SDL-1.2.15_p20210224.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ca2d509123a318acc16905eee17024f4
+_md5_=0af910cedddc43e0829e7ee5d0a0219b
diff --git a/metadata/md5-cache/media-libs/libv4l-1.20.0 b/metadata/md5-cache/media-libs/libv4l-1.20.0
index 619f74fa4902..a1d0ce570f1f 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.20.0
+++ b/metadata/md5-cache/media-libs/libv4l-1.20.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dvb? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !elibc_glibc? ( sys-libs/argp-standalone ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0/0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.20.0.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=df272e05d47d820a7066aa56dedcf2fa
diff --git a/metadata/md5-cache/media-libs/libxmi-1.3-r1 b/metadata/md5-cache/media-libs/libxmi-1.3-r1
index a5e72ffb3155..f06f43c19081 100644
--- a/metadata/md5-cache/media-libs/libxmi-1.3-r1
+++ b/metadata/md5-cache/media-libs/libxmi-1.3-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=C/C++ function library for rasterizing 2-D vector graphics
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libxmi/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/libxmi-1.3.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b368b6e62e2ad4ff47f3687cf546b21c
+_md5_=28669a2f006a2cdf5e528c2329ba9892
diff --git a/metadata/md5-cache/media-libs/mesa-21.1.7 b/metadata/md5-cache/media-libs/mesa-21.1.7
index 1c1242fdc951..e1d26b2fcfe3 100644
--- a/metadata/md5-cache/media-libs/mesa-21.1.7
+++ b/metadata/md5-cache/media-libs/mesa-21.1.7
@@ -12,5 +12,5 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r60
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-21.1.7.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed9a7ebfda1c90f48fa2d62fc0d38369
diff --git a/metadata/md5-cache/media-libs/mesa-21.1.8-r1 b/metadata/md5-cache/media-libs/mesa-21.1.8-r1
index 1406c61a597a..3523a7337d38 100644
--- a/metadata/md5-cache/media-libs/mesa-21.1.8-r1
+++ b/metadata/md5-cache/media-libs/mesa-21.1.8-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r60
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-21.1.8.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=22249fe644d82f17816ea2018f19a1c8
diff --git a/metadata/md5-cache/media-libs/mesa-21.2.2 b/metadata/md5-cache/media-libs/mesa-21.2.2
index 184e2178fc24..7c50f04a7b54 100644
--- a/metadata/md5-cache/media-libs/mesa-21.2.2
+++ b/metadata/md5-cache/media-libs/mesa-21.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 vid
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-21.2.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e24b415d3cc2980a34921ee2f5876e34
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index bbdec6ff4975..239069562f86 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 REQUIRED_USE=d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) osmesa? ( gallium ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e24b415d3cc2980a34921ee2f5876e34
diff --git a/metadata/md5-cache/media-libs/munt-mt32emu-2.5.3-r1 b/metadata/md5-cache/media-libs/munt-mt32emu-2.5.3-r1
index 4a73d974dcb8..21658cfc70ca 100644
--- a/metadata/md5-cache/media-libs/munt-mt32emu-2.5.3-r1
+++ b/metadata/md5-cache/media-libs/munt-mt32emu-2.5.3-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Library for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I
 EAPI=7
 HOMEPAGE=https://github.com/munt/munt
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/munt/munt/archive/libmt32emu_2_5_3.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=645be0e4044d2e43b6be6209fa647f1e
+_md5_=3db78a6514db4f5071cbbe6706aed44b
diff --git a/metadata/md5-cache/media-libs/netpbm-10.86.22 b/metadata/md5-cache/media-libs/netpbm-10.86.22
deleted file mode 100644
index 7b3b86baca6b..000000000000
--- a/metadata/md5-cache/media-libs/netpbm-10.86.22
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/xz-utils sys-devel/flex virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.4:0 ) postscript? ( app-text/ghostscript-gpl ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
-DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats
-EAPI=7
-HOMEPAGE=http://netpbm.sourceforge.net/
-IUSE=doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.4:0 ) postscript? ( app-text/ghostscript-gpl ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=https://github.com/ceamac/netpbm-make-dist/releases/download/v10.86.22/netpbm-10.86.22.tar.xz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=73fcef3858c65a132bff1b20343e8a0c
diff --git a/metadata/md5-cache/media-libs/netpbm-10.86.24 b/metadata/md5-cache/media-libs/netpbm-10.86.24
new file mode 100644
index 000000000000..0bc8607e0cbf
--- /dev/null
+++ b/metadata/md5-cache/media-libs/netpbm-10.86.24
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/xz-utils sys-devel/flex virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=jbig? ( media-libs/jbigkit:= ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 )
+DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats
+EAPI=8
+HOMEPAGE=http://netpbm.sourceforge.net/
+IUSE=doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=jbig? ( media-libs/jbigkit:= ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 )
+SLOT=0
+SRC_URI=https://github.com/ceamac/netpbm-make-dist/releases/download/v10.86.24/netpbm-10.86.24.tar.xz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1d0de1680b19c537580289b36463b8f3
diff --git a/metadata/md5-cache/media-libs/nv-codec-headers-11.1.5.0 b/metadata/md5-cache/media-libs/nv-codec-headers-11.1.5.0
new file mode 100644
index 000000000000..fdd9b764fb9e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/nv-codec-headers-11.1.5.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=FFmpeg version of headers required to interface with Nvidias codec APIs
+EAPI=7
+HOMEPAGE=https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=x11-drivers/nvidia-drivers-470.57.02[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://github.com/FFmpeg/nv-codec-headers/releases/download/n11.1.5.0/nv-codec-headers-11.1.5.0.tar.gz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=87a414a8bb55850c33e3de0c125f12e4
diff --git a/metadata/md5-cache/media-libs/opencolorio-2.0.1 b/metadata/md5-cache/media-libs/opencolorio-2.0.1
index c112966ec950..e3088cbb37cc 100644
--- a/metadata/md5-cache/media-libs/opencolorio-2.0.1
+++ b/metadata/md5-cache/media-libs/opencolorio-2.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=A color management framework for visual effects and animation
 EAPI=7
 HOMEPAGE=https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO
 IUSE=cpu_flags_x86_sse2 doc opengl python static-libs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-cpp/pystring dev-python/pybind11 media-libs/ilmbase dev-cpp/yaml-cpp:= dev-libs/tinyxml opengl? ( media-libs/lcms:2 >=media-libs/openimageio-2.2.13.0 media-libs/glew:= media-libs/freeglut virtual/opengl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) )
 REQUIRED_USE=doc? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v2.0.1.tar.gz -> opencolorio-2.0.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b9a2a3e81f456ee3d440e8d9576eb25c
+_md5_=0c339e0fcab383203ea0bb73f5f53cba
diff --git a/metadata/md5-cache/media-libs/opencolorio-2.0.2 b/metadata/md5-cache/media-libs/opencolorio-2.0.2
index c6fd9fbbf861..284d7e14fd76 100644
--- a/metadata/md5-cache/media-libs/opencolorio-2.0.2
+++ b/metadata/md5-cache/media-libs/opencolorio-2.0.2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v2.0.2.tar.gz -> opencolorio-2.0.2.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=09fe404c0a9711f5b32500c817ebf6d5
+_md5_=ce1628fcc4654acaf0bbcaa470111fb9
diff --git a/metadata/md5-cache/media-libs/openexr-2.5.6 b/metadata/md5-cache/media-libs/openexr-2.5.6
index fce5bfc93fb2..d050e7951ffd 100644
--- a/metadata/md5-cache/media-libs/openexr-2.5.6
+++ b/metadata/md5-cache/media-libs/openexr-2.5.6
@@ -5,11 +5,11 @@ DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
 EAPI=7
 HOMEPAGE=https://www.openexr.com/
 IUSE=cpu_flags_x86_avx doc examples static-libs utils test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~ia64 -ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=~media-libs/ilmbase-2.5.6:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.6.tar.gz -> openexr-2.5.6.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d4cfef735069b2ba583d4b767d2eda5b
+_md5_=69c8f8a09de4a5b7f765f86914e41934
diff --git a/metadata/md5-cache/media-libs/openexr-2.5.7 b/metadata/md5-cache/media-libs/openexr-2.5.7
index 04a50ad40a69..fa85fc97c3ac 100644
--- a/metadata/md5-cache/media-libs/openexr-2.5.7
+++ b/metadata/md5-cache/media-libs/openexr-2.5.7
@@ -5,11 +5,11 @@ DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
 EAPI=7
 HOMEPAGE=https://www.openexr.com/
 IUSE=cpu_flags_x86_avx doc examples static-libs utils test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=~media-libs/ilmbase-2.5.7:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.7.tar.gz -> openexr-2.5.7.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=110d7030212900d2844647eb62b2cd6a
+_md5_=a883e8bef732fee96f76979c8b5c0010
diff --git a/metadata/md5-cache/media-libs/openexr-3.0.5 b/metadata/md5-cache/media-libs/openexr-3.0.5
deleted file mode 100644
index 952ad6435104..000000000000
--- a/metadata/md5-cache/media-libs/openexr-3.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-libs/imath-3.0.5:= sys-libs/zlib
-DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
-EAPI=7
-HOMEPAGE=https://www.openexr.com/
-IUSE=cpu_flags_x86_avx doc examples large-stack static-libs utils test threads
-KEYWORDS=~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=~dev-libs/imath-3.0.5:= sys-libs/zlib
-RESTRICT=!test? ( test )
-SLOT=3/29
-SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v3.0.5.tar.gz -> openexr-3.0.5.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=178783e3efa6d3813d0dc09dae325664
diff --git a/metadata/md5-cache/media-libs/openexr-3.1.1 b/metadata/md5-cache/media-libs/openexr-3.1.1
index 1df04fd6a9d7..9922a2d740bd 100644
--- a/metadata/md5-cache/media-libs/openexr-3.1.1
+++ b/metadata/md5-cache/media-libs/openexr-3.1.1
@@ -5,11 +5,11 @@ DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
 EAPI=7
 HOMEPAGE=https://www.openexr.com/
 IUSE=cpu_flags_x86_avx doc examples large-stack static-libs utils test threads
-KEYWORDS=~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 -ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-libs/imath-3.1.0:= sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=3/30
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v3.1.1.tar.gz -> openexr-3.1.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=480cdf2cd2cf96754104cedc548fb33f
+_md5_=1420807257c66d973f5b824c280d0ab7
diff --git a/metadata/md5-cache/media-libs/openexr-3.1.2 b/metadata/md5-cache/media-libs/openexr-3.1.2
new file mode 100644
index 000000000000..2c934a363e1b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openexr-3.1.2
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/breathe ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/imath-3.1.0:= sys-libs/zlib
+DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
+EAPI=8
+HOMEPAGE=https://www.openexr.com/
+IUSE=cpu_flags_x86_avx doc examples large-stack static-libs utils test threads
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=dev-libs/imath-3.1.0:= sys-libs/zlib
+RESTRICT=!test? ( test )
+SLOT=3/30
+SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v3.1.2.tar.gz -> openexr-3.1.2.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6da3297d2134075e80963e136932dc6d
diff --git a/metadata/md5-cache/media-libs/opensubdiv-3.4.4 b/metadata/md5-cache/media-libs/opensubdiv-3.4.4
new file mode 100644
index 000000000000..fc27ff35f0d7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opensubdiv-3.4.4
@@ -0,0 +1,15 @@
+BDEPEND=cuda? ( <sys-devel/gcc-9[cxx] ) sys-devel/make >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=media-libs/glew:= media-libs/glfw:= x11-libs/libXinerama cuda? ( dev-util/nvidia-cuda-toolkit:* ) opencl? ( virtual/opencl ) ptex? ( media-libs/ptex ) tbb? ( dev-cpp/tbb )
+DESCRIPTION=An Open-Source subdivision surface library
+EAPI=7
+HOMEPAGE=https://graphics.pixar.com/opensubdiv/docs/intro.html
+IUSE=cuda examples opencl openmp ptex tbb test tutorials
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=media-libs/glew:= media-libs/glfw:= x11-libs/libXinerama cuda? ( dev-util/nvidia-cuda-toolkit:* ) opencl? ( virtual/opencl ) ptex? ( media-libs/ptex )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v3_4_4.tar.gz -> opensubdiv-3.4.4.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=74d7a168b61f028f78b88830f96a426a
diff --git a/metadata/md5-cache/media-libs/pcaudiolib-1.1 b/metadata/md5-cache/media-libs/pcaudiolib-1.1
index 1c328aee4a89..6521e484c404 100644
--- a/metadata/md5-cache/media-libs/pcaudiolib-1.1
+++ b/metadata/md5-cache/media-libs/pcaudiolib-1.1
@@ -5,11 +5,11 @@ DESCRIPTION=Portable C Audio Library
 EAPI=7
 HOMEPAGE=https://github.com/espeak-ng/pcaudiolib
 IUSE=+alsa oss pulseaudio
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3+ ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.18 ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=|| ( alsa oss pulseaudio )
 SLOT=0
 SRC_URI=https://github.com/espeak-ng/pcaudiolib/archive/1.1.tar.gz -> pcaudiolib-1.1.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8074a9b33f9cd9d0b977b2cec07d55a8
+_md5_=30f8475c36836e52d88100d28c4321f2
diff --git a/metadata/md5-cache/media-libs/plotutils-2.6-r2 b/metadata/md5-cache/media-libs/plotutils-2.6-r2
index 12e40c459329..a1299493a005 100644
--- a/metadata/md5-cache/media-libs/plotutils-2.6-r2
+++ b/metadata/md5-cache/media-libs/plotutils-2.6-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Powerful C/C++ function library for exporting 2-D vector graphics
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/plotutils/
 IUSE=+png X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=media-libs/libxmi png? ( media-libs/libpng:0= sys-libs/zlib ) X? ( x11-libs/libXaw ) !<media-libs/plotutils-2.6
 SLOT=0
 SRC_URI=mirror://gnu/plotutils/plotutils-2.6.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7f751056673c3dba5b4ed8d5f46f6303
+_md5_=55113cf2766ec9b6324fe3c358bbb36d
diff --git a/metadata/md5-cache/media-libs/quesoglc-0.7.2 b/metadata/md5-cache/media-libs/quesoglc-0.7.2
deleted file mode 100644
index 980de91a5b16..000000000000
--- a/metadata/md5-cache/media-libs/quesoglc-0.7.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=virtual/opengl virtual/glu media-libs/fontconfig media-libs/freetype:2 dev-libs/fribidi virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=A free implementation of the OpenGL Character Renderer (GLC)
-EAPI=5
-HOMEPAGE=http://quesoglc.sourceforge.net/
-IUSE=doc examples static-libs
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=virtual/opengl virtual/glu media-libs/fontconfig media-libs/freetype:2 dev-libs/fribidi
-SLOT=0
-SRC_URI=mirror://sourceforge/quesoglc/quesoglc-0.7.2-free.tar.bz2
-_md5_=2102fc97b2159518685ca6b3241f010e
diff --git a/metadata/md5-cache/media-libs/quesoglc-0.7.2-r1 b/metadata/md5-cache/media-libs/quesoglc-0.7.2-r1
index 30b025fbee39..31f21e1b4ee4 100644
--- a/metadata/md5-cache/media-libs/quesoglc-0.7.2-r1
+++ b/metadata/md5-cache/media-libs/quesoglc-0.7.2-r1
@@ -5,9 +5,9 @@ DESCRIPTION=Free implementation of the OpenGL Character Renderer (GLC)
 EAPI=8
 HOMEPAGE=http://quesoglc.sourceforge.net/
 IUSE=doc
-KEYWORDS=amd64 ~ppc sparc x86
+KEYWORDS=amd64 ppc sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/fribidi media-libs/fontconfig media-libs/freetype:2 virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/quesoglc/quesoglc-0.7.2-free.tar.bz2
-_md5_=ce5356150250160bdafaae436c5b2478
+_md5_=a4f172024e083d0cdf623f674787294d
diff --git a/metadata/md5-cache/media-libs/sdl-terminal-1.1.3-r1 b/metadata/md5-cache/media-libs/sdl-terminal-1.1.3-r1
deleted file mode 100644
index 87a676c62f54..000000000000
--- a/metadata/md5-cache/media-libs/sdl-terminal-1.1.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=virtual/opengl virtual/glu >=media-libs/libsdl-1.2.4[opengl] media-libs/sdl-ttf sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=library that provides a pseudo-ansi color terminal that can be used with any SDL application
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/sdl-terminal/
-IUSE=static-libs
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl virtual/glu >=media-libs/libsdl-1.2.4[opengl] media-libs/sdl-ttf
-SLOT=0
-SRC_URI=mirror://gentoo/SDL_terminal-1.1.3.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e1e5778a486bd59f952b469d4d70b2a0
diff --git a/metadata/md5-cache/media-libs/svgalib-1.9.25-r8 b/metadata/md5-cache/media-libs/svgalib-1.9.25-r8
index 1979153e5b6f..29f9c6ee0a21 100644
--- a/metadata/md5-cache/media-libs/svgalib-1.9.25-r8
+++ b/metadata/md5-cache/media-libs/svgalib-1.9.25-r8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=http://www.arava.co.il/matan/svgalib/svgalib-1.9.25.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0a1469c20d656fc8c3b9587a616f4711
diff --git a/metadata/md5-cache/media-libs/tremor-0_pre20130223-r2 b/metadata/md5-cache/media-libs/tremor-0_pre20130223-r2
index 332cc7480230..d7c552e3ab16 100644
--- a/metadata/md5-cache/media-libs/tremor-0_pre20130223-r2
+++ b/metadata/md5-cache/media-libs/tremor-0_pre20130223-r2
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/libogg-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=media-libs/libogg-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=A fixed-point version of the Ogg Vorbis decoder (also known as libvorbisidec)
-EAPI=5
+EAPI=8
 HOMEPAGE=https://wiki.xiph.org/Tremor
-IUSE=low-accuracy static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=low-accuracy abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RDEPEND=>=media-libs/libogg-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ssuominen/tremor-0_pre20130223.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3a0ad266fdf1eb76bede305f06766f9f
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=61f6df941ac4a22520e8a08ea3b8ad45
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 1efd2e1b2ddc..d73f7a23569b 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.18.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.18.4-r1
index 7261f5d8c523..130490e65d9a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.18.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.18.4-r1
@@ -5,11 +5,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=|| ( media-sound/jack2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-video/pipewire[jack-sdk(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.18:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	14d07dff83e4ad39238e167648116e6c	meson	58dcef01376272b61b5c99ff57a11129	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8c5a79e660bcfb8a22e89d210ff9d5bb
+_md5_=fc893c968f54439d2d626da2e272b122
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.18.4 b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.18.4
index 3a4f44eaef59..2a90531a63fa 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.18.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.18.4
@@ -3,10 +3,10 @@ DESCRIPTION=Meta ebuild to pull in gst plugins for apps
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=metapackage
 RDEPEND=>=media-libs/gstreamer-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.18.4:1.0[alsa?,ogg?,theora?,vorbis?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] a52? ( >=media-plugins/gst-plugins-a52dec-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aac? ( >=media-plugins/gst-plugins-faad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-cdio-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dts? ( >=media-plugins/gst-plugins-dts-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dv? ( >=media-plugins/gst-plugins-dv-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dvb? ( >=media-plugins/gst-plugins-dvb-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dvd? ( >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-a52dec-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-dvdread-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-resindvd-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-plugins/gst-plugins-libav-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flac? ( >=media-plugins/gst-plugins-flac-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=media-plugins/gst-plugins-soup-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-plugins/gst-plugins-jack-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lame? ( >=media-plugins/gst-plugins-lame-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-plugins/gst-plugins-assrender-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libvisual? ( >=media-plugins/gst-plugins-libvisual-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mms? ( >=media-plugins/gst-plugins-libmms-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-plugins/gst-plugins-modplug-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-libs/gst-plugins-ugly-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-mpg123-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-plugins/gst-plugins-opus-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) oss? ( >=media-plugins/gst-plugins-oss-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) taglib? ( >=media-plugins/gst-plugins-taglib-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-plugins/gst-plugins-v4l2-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-plugins/gst-plugins-vaapi-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vcd? ( >=media-plugins/gst-plugins-mplex-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-plugins/gst-plugins-vpx-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-plugins/gst-plugins-wavpack-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-plugins/gst-plugins-x264-1.18.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=1.0
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f637aa561f9d822c67f2df142579d4d3
+_md5_=2deef321635fcbffe1cc92fede7e9e25
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-19.0.0 b/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-19.0.0
index 49fe8a2ad9af..2394ae6672be 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-19.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-ffmpegdirect-19.0.0
@@ -4,10 +4,10 @@ DEPEND=media-video/ffmpeg[encode,libxml2,zlib] virtual/libiconv app-arch/bzip2 =
 DESCRIPTION=Kodi's FFMpeg Direct Inputstream addon
 EAPI=7
 HOMEPAGE=https://github.com/xbmc/inputstream.ffmpegdirect
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-video/ffmpeg[encode,libxml2,zlib] virtual/libiconv app-arch/bzip2 =media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/inputstream.ffmpegdirect/archive/19.0.0-Matrix.tar.gz -> kodi-inputstream-ffmpegdirect-19.0.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kodi-addon	d24d54b5ee1b85a464e7ad83014106a9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9c86593bba86ecb40c6622461a907e3b
+_md5_=bf65a151be4dae0ffa39770724c6601a
diff --git a/metadata/md5-cache/media-plugins/live-2021.08.24 b/metadata/md5-cache/media-plugins/live-2021.08.24
new file mode 100644
index 000000000000..68d4d72ef01c
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/live-2021.08.24
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=Libraries for standards-based RTP/RTCP/RTSP multimedia streaming
+EAPI=8
+HOMEPAGE=http://www.live555.com/
+IUSE=ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=ssl? ( dev-libs/openssl:0= )
+SLOT=0/9
+SRC_URI=http://www.live555.com/liveMedia/public/live.2021.08.24.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9f23420cd8906d1674edb50180b4e234
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2 b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
index 47b9b66cd57f..2f2f6689f1cf 100644
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freetype virtual/udev media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/attachments/download/2086/vdr-imonlcd-1.0.2.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d0eeb9945a351e83ba54588853c10281
diff --git a/metadata/md5-cache/media-plugins/x42-plugins-20211016 b/metadata/md5-cache/media-plugins/x42-plugins-20211016
new file mode 100644
index 000000000000..9cb76ddf16d3
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/x42-plugins-20211016
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/glib media-fonts/dejavu media-libs/ftgl media-libs/glu media-libs/liblo media-libs/libsamplerate media-libs/libsndfile media-libs/libltc media-libs/lv2 media-libs/zita-convolver sci-libs/fftw:3.0 virtual/jack virtual/opengl x11-libs/cairo[X] x11-libs/pango sys-apps/help2man
+DESCRIPTION=Collection of LV2 plugins
+EAPI=7
+HOMEPAGE=https://github.com/x42/x42-plugins
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib media-fonts/dejavu media-libs/ftgl media-libs/glu media-libs/liblo media-libs/libsamplerate media-libs/libsndfile media-libs/libltc media-libs/lv2 media-libs/zita-convolver sci-libs/fftw:3.0 virtual/jack virtual/opengl x11-libs/cairo[X] x11-libs/pango
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://gareus.org/misc/x42-plugins/x42-plugins-20211016.tar.xz
+_md5_=c5d293b8db778102d25ba9f82e0c6fe3
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index f73677e5bc0b..a92ff6c6af02 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/flrig-1.4.2 b/metadata/md5-cache/media-radio/flrig-1.4.2
index cab4a3a96971..2d2b9f95efdf 100644
--- a/metadata/md5-cache/media-radio/flrig-1.4.2
+++ b/metadata/md5-cache/media-radio/flrig-1.4.2
@@ -1,4 +1,3 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=-
 DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext
 DESCRIPTION=Transceiver control program for Amateur Radio use
@@ -10,5 +9,4 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/flrig-1.4.2.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8f31a5912dee6a417ec9a86078788fdf
+_md5_=56731c097a09f2d78ca03289d9408273
diff --git a/metadata/md5-cache/media-radio/tucnak-4.30 b/metadata/md5-cache/media-radio/tucnak-4.30
index 8e1fca4f9fa9..2bd580a5a1ba 100644
--- a/metadata/md5-cache/media-radio/tucnak-4.30
+++ b/metadata/md5-cache/media-radio/tucnak-4.30
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsd
 SLOT=0
 SRC_URI=http://tucnak.nagano.cz/tucnak-4.30.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=28bf2a89e16e1cf9879d827c40966e5f
+_md5_=2849bd42da30c30ea2040b6dec2dbeb4
diff --git a/metadata/md5-cache/media-radio/tucnak-4.32 b/metadata/md5-cache/media-radio/tucnak-4.32
new file mode 100644
index 000000000000..bcabf0ae60d5
--- /dev/null
+++ b/metadata/md5-cache/media-radio/tucnak-4.32
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib:= ) virtual/pkgconfig
+DESCRIPTION=Amateur Radio VHF Contest Logbook
+EAPI=8
+HOMEPAGE=http://tucnak.nagano.cz
+IUSE=alsa fftw gpm hamlib suid
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib:= )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/tucnak-4.32.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2194034796071aeac829da2ea1a55f37
diff --git a/metadata/md5-cache/media-radio/unixcw-3.5.1-r1 b/metadata/md5-cache/media-radio/unixcw-3.5.1-r1
index 3197fb315e73..043f7c940df3 100644
--- a/metadata/md5-cache/media-radio/unixcw-3.5.1-r1
+++ b/metadata/md5-cache/media-radio/unixcw-3.5.1-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/unixcw/unixcw-3.5.1.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=028d6f3953a14faec96ee58fa2d4d27f
+_md5_=7176c70ff154fe2bd088267a87ba3ec8
diff --git a/metadata/md5-cache/media-radio/wsjtx-2.5.0 b/metadata/md5-cache/media-radio/wsjtx-2.5.0
new file mode 100644
index 000000000000..2e5c98d84b32
--- /dev/null
+++ b/metadata/md5-cache/media-radio/wsjtx-2.5.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/boost:=[nls,python] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtprintsupport:5 virtual/libusb:1 >=media-libs/hamlib-4.0:= media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc doc? ( dev-ruby/asciidoctor ) dev-qt/linguist-tools
+DESCRIPTION=Weak signal ham radio communication
+EAPI=8
+HOMEPAGE=http://physics.princeton.edu/pulsar/K1JT/wsjtx.html
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/boost:=[nls,python] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtprintsupport:5 virtual/libusb:1 >=media-libs/hamlib-4.0:= media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc doc? ( dev-ruby/asciidoctor )
+SLOT=0
+SRC_URI=mirror://sourceforge/wsjt/wsjtx-2.5.0.tgz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c1263cc015deebd75f723e35841e89af
diff --git a/metadata/md5-cache/media-radio/xastir-2.1.6 b/metadata/md5-cache/media-radio/xastir-2.1.6
index 59b117a83f0b..712b26bf1969 100644
--- a/metadata/md5-cache/media-radio/xastir-2.1.6
+++ b/metadata/md5-cache/media-radio/xastir-2.1.6
@@ -11,4 +11,4 @@ RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x1
 SLOT=0
 SRC_URI=https://github.com/Xastir/Xastir/archive/Release-2.1.6.tar.gz -> xastir-2.1.6.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e63cca00e28f864f49d592de97fb38b7
+_md5_=1fad310b89d08e694d975798d2e65cec
diff --git a/metadata/md5-cache/media-radio/xlog-2.0.24 b/metadata/md5-cache/media-radio/xlog-2.0.24
new file mode 100644
index 000000000000..922491b7dd45
--- /dev/null
+++ b/metadata/md5-cache/media-radio/xlog-2.0.24
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=media-libs/hamlib:= dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libpng:0 sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=An amateur radio logging program
+EAPI=8
+HOMEPAGE=https://www.nongnu.org/xlog
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/hamlib:= dev-libs/glib:2 x11-libs/gtk+:2
+SLOT=0
+SRC_URI=https://download.savannah.gnu.org/releases/xlog/xlog-2.0.24.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2039da11b2af9920225b5122b406cb23
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index fc54d09ff280..97f70f22d35a 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/abcmidi-2021.10.15 b/metadata/md5-cache/media-sound/abcmidi-2021.10.15
new file mode 100644
index 000000000000..e790d84008ae
--- /dev/null
+++ b/metadata/md5-cache/media-sound/abcmidi-2021.10.15
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DESCRIPTION=Programs for processing ABC music notation files
+EAPI=8
+HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2021.10.15.zip
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4f1f7243d91ded99640db6cf8ba8d7ce
diff --git a/metadata/md5-cache/media-sound/hydrogen-1.0.2 b/metadata/md5-cache/media-sound/hydrogen-1.0.2
deleted file mode 100644
index c0b464e1e54c..000000000000
--- a/metadata/md5-cache/media-sound/hydrogen-1.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Advanced drum machine
-EAPI=7
-HOMEPAGE=http://www.hydrogen-music.org/
-IUSE=alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2 ZLIB
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
-REQUIRED_USE=lash? ( alsa )
-SLOT=0
-SRC_URI=https://github.com/hydrogen-music/hydrogen/archive/1.0.2.tar.gz -> hydrogen-1.0.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fd072c5b592588488b9617eaaa61d53b
diff --git a/metadata/md5-cache/media-sound/hydrogen-1.1.0 b/metadata/md5-cache/media-sound/hydrogen-1.1.0
index 049de2bd414e..c94608795867 100644
--- a/metadata/md5-cache/media-sound/hydrogen-1.1.0
+++ b/metadata/md5-cache/media-sound/hydrogen-1.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=Advanced drum machine
 EAPI=7
 HOMEPAGE=http://www.hydrogen-music.org/
 IUSE=alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2 ZLIB
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=lash? ( alsa )
 SLOT=0
 SRC_URI=https://github.com/hydrogen-music/hydrogen/archive/1.1.0.tar.gz -> hydrogen-1.1.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=281dcde1c3214fd6584a44305326faeb
+_md5_=61ed7a58c47e3aea1cadc849748ab09e
diff --git a/metadata/md5-cache/media-sound/kmidimon-1.0.0 b/metadata/md5-cache/media-sound/kmidimon-1.0.0
deleted file mode 100644
index 0ac642cd85bb..000000000000
--- a/metadata/md5-cache/media-sound/kmidimon-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/unzip dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/alsa-lib >=media-sound/drumstick-2.0.0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=MIDI monitor for ALSA sequencer
-EAPI=7
-HOMEPAGE=https://kmidimon.sourceforge.io/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/alsa-lib >=media-sound/drumstick-2.0.0
-SLOT=0
-SRC_URI=mirror://sourceforge/kmidimon/kmidimon-1.0.0.tar.bz2
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=04c6d56a9b0b615b734bad18bb5f2244
diff --git a/metadata/md5-cache/media-sound/linuxsampler-2.2.0 b/metadata/md5-cache/media-sound/linuxsampler-2.2.0
index b45585cc1e10..f74bad52a4db 100644
--- a/metadata/md5-cache/media-sound/linuxsampler-2.2.0
+++ b/metadata/md5-cache/media-sound/linuxsampler-2.2.0
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( alsa jack )
 SLOT=0
 SRC_URI=https://download.linuxsampler.org/packages/linuxsampler-2.2.0.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4fb46bcf47fa04aa0dba7ddda7a97503
+_md5_=7b0d2cd0c6d63d5a455084336592b170
diff --git a/metadata/md5-cache/media-sound/linuxsampler-9999 b/metadata/md5-cache/media-sound/linuxsampler-9999
index 515752b2ae95..131dbcb7b22e 100644
--- a/metadata/md5-cache/media-sound/linuxsampler-9999
+++ b/metadata/md5-cache/media-sound/linuxsampler-9999
@@ -11,4 +11,4 @@ RDEPEND=media-libs/libgig media-libs/libsndfile[-minimal] alsa? ( media-libs/als
 REQUIRED_USE=|| ( alsa jack )
 SLOT=0
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	subversion	c74febd1baf21b1229704d6a953c27db	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a74b57b5877c2f6191fe0536ad615053
+_md5_=1f9077c72001301098cbdaf3e75887d7
diff --git a/metadata/md5-cache/media-sound/mixxx-2.2.4-r1 b/metadata/md5-cache/media-sound/mixxx-2.2.4-r1
index 4febae98a6a8..eb989bb17e5d 100644
--- a/metadata/md5-cache/media-sound/mixxx-2.2.4-r1
+++ b/metadata/md5-cache/media-sound/mixxx-2.2.4-r1
@@ -1,6 +1,6 @@
-BDEPEND=|| ( ( dev-lang/python:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) <dev-util/scons-4.2.0 virtual/pkgconfig || ( ( dev-lang/python:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) lv2? ( >=media-libs/lilv-0.24.2-r3 ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= ) virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 || ( dev-lang/python:3.9 dev-lang/python:3.8 )
+DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) lv2? ( >=media-libs/lilv-0.24.2-r3 ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= ) dev-qt/qttest:5 dev-qt/qtxmlpatterns:5
 DESCRIPTION=Advanced Digital DJ tool based on Qt
 EAPI=7
 HOMEPAGE=https://www.mixxx.org/
@@ -11,4 +11,4 @@ RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5
 SLOT=0
 SRC_URI=https://github.com/mixxxdj/mixxx/archive/release-2.2.4.tar.gz -> mixxx-2.2.4.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	scons-utils	fc8e53815030125602cc608cd1bff857	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=186b8b474200ad5e529b1036f6717081
+_md5_=2839183de53166abf8a824c20ca2f552
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.26-r1 b/metadata/md5-cache/media-sound/mpd-0.21.26-r1
index 1b8a1e499d76..fef8b5d54166 100644
--- a/metadata/md5-cache/media-sound/mpd-0.21.26-r1
+++ b/metadata/md5-cache/media-sound/mpd-0.21.26-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio sndio rec
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.26.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=afc58001db9e4d4ed80c79d21e3803bf
diff --git a/metadata/md5-cache/media-sound/mpd-0.22.10-r1 b/metadata/md5-cache/media-sound/mpd-0.22.10-r1
index 0a50cfd32057..61039e9e5c30 100644
--- a/metadata/md5-cache/media-sound/mpd-0.22.10-r1
+++ b/metadata/md5-cache/media-sound/mpd-0.22.10-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio sndio rec
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.22/mpd-0.22.10.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c8e0f5056dca034484d39b15ab8e2376
diff --git a/metadata/md5-cache/media-sound/mpd-0.22.11 b/metadata/md5-cache/media-sound/mpd-0.22.11
index 257a930c5dd3..5452318abf3e 100644
--- a/metadata/md5-cache/media-sound/mpd-0.22.11
+++ b/metadata/md5-cache/media-sound/mpd-0.22.11
@@ -5,12 +5,12 @@ DESCRIPTION=The Music Player Daemon (mpd)
 EAPI=7
 HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
 IUSE=+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz recorder samba selinux sid signalfd sndfile sndio soundcloud sqlite systemd test tidal twolame udisks vorbis wavpack webdav wildmidi upnp zeroconf zip zlib kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=acct-user/mpd sys-libs/liburing:= alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao:=[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) doc? ( dev-python/sphinx ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag:= ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) sndio? ( media-sound/sndio ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tidal? ( dev-libs/yajl net-misc/curl ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib:= ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder ) || ( audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) upnp? ( expat ) webdav? ( curl expat )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.22/mpd-0.22.11.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ff5cf5365a039c1aa49f384d56cb8a9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a733d6d6628e3a0f27bd6804ee2fec37
diff --git a/metadata/md5-cache/media-sound/mpd-0.22.3-r1 b/metadata/md5-cache/media-sound/mpd-0.22.3-r1
index a10d22e7850b..80b85fef996e 100644
--- a/metadata/md5-cache/media-sound/mpd-0.22.3-r1
+++ b/metadata/md5-cache/media-sound/mpd-0.22.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio sndio rec
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.22/mpd-0.22.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=12d58d3333adb91b8d8ae5b7e77d8384
diff --git a/metadata/md5-cache/media-sound/mpd-0.22.4-r2 b/metadata/md5-cache/media-sound/mpd-0.22.4-r2
index 30f384f99831..65fc6316477f 100644
--- a/metadata/md5-cache/media-sound/mpd-0.22.4-r2
+++ b/metadata/md5-cache/media-sound/mpd-0.22.4-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio sndio rec
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.22/mpd-0.22.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ea1a9f4dd98f795d17ec35b2feb2c8d2
diff --git a/metadata/md5-cache/media-sound/mpd-0.22.5-r1 b/metadata/md5-cache/media-sound/mpd-0.22.5-r1
index 82b053c061af..b7a1d1a14386 100644
--- a/metadata/md5-cache/media-sound/mpd-0.22.5-r1
+++ b/metadata/md5-cache/media-sound/mpd-0.22.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio sndio rec
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.22/mpd-0.22.5.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ea1a9f4dd98f795d17ec35b2feb2c8d2
diff --git a/metadata/md5-cache/media-sound/mpd-0.22.6-r1 b/metadata/md5-cache/media-sound/mpd-0.22.6-r1
index feae805e4902..eff2f7082bd1 100644
--- a/metadata/md5-cache/media-sound/mpd-0.22.6-r1
+++ b/metadata/md5-cache/media-sound/mpd-0.22.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio sndio rec
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.22/mpd-0.22.6.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ea1a9f4dd98f795d17ec35b2feb2c8d2
diff --git a/metadata/md5-cache/media-sound/mpd-0.22.8-r1 b/metadata/md5-cache/media-sound/mpd-0.22.8-r1
index 5c7bd9afb80d..e003656903b0 100644
--- a/metadata/md5-cache/media-sound/mpd-0.22.8-r1
+++ b/metadata/md5-cache/media-sound/mpd-0.22.8-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio sndio rec
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.22/mpd-0.22.8.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c8e0f5056dca034484d39b15ab8e2376
diff --git a/metadata/md5-cache/media-sound/mpd-0.22.9-r1 b/metadata/md5-cache/media-sound/mpd-0.22.9-r1
index c952be0943a9..f77bf8b6a436 100644
--- a/metadata/md5-cache/media-sound/mpd-0.22.9-r1
+++ b/metadata/md5-cache/media-sound/mpd-0.22.9-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio sndio rec
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.22/mpd-0.22.9.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=c8e0f5056dca034484d39b15ab8e2376
diff --git a/metadata/md5-cache/media-sound/mpdscribble-0.23 b/metadata/md5-cache/media-sound/mpdscribble-0.23
index 71f9857852c4..c934137311a5 100644
--- a/metadata/md5-cache/media-sound/mpdscribble-0.23
+++ b/metadata/md5-cache/media-sound/mpdscribble-0.23
@@ -4,10 +4,10 @@ DEPEND=dev-libs/boost dev-libs/libgcrypt:= media-libs/libmpdclient net-misc/curl
 DESCRIPTION=An MPD client that submits information to Audioscrobbler
 EAPI=8
 HOMEPAGE=https://www.musicpd.org/clients/mpdscribble/ https://github.com/MusicPlayerDaemon/mpdscribble
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost dev-libs/libgcrypt:= media-libs/libmpdclient net-misc/curl
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpdscribble/0.23/mpdscribble-0.23.tar.xz
 _eclasses_=meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=63877c7594b0225a65dba8908d186ef2
+_md5_=c2ef70afe17dc9e3be0c3b32ca8dd3a5
diff --git a/metadata/md5-cache/media-sound/mpg123-1.28.2-r1 b/metadata/md5-cache/media-sound/mpg123-1.28.2-r1
deleted file mode 100644
index a2889f05c54a..000000000000
--- a/metadata/md5-cache/media-sound/mpg123-1.28.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 )
-DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
-EAPI=8
-HOMEPAGE=https://www.mpg123.org/
-IDEPEND=app-eselect/eselect-mpg123
-IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 )
-SLOT=0
-SRC_URI=https://www.mpg123.org/download/mpg123-1.28.2.tar.bz2
-_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=068ce2eb4f412131161d0e3c5f3f5d2f
diff --git a/metadata/md5-cache/media-sound/mpg123-1.29.0 b/metadata/md5-cache/media-sound/mpg123-1.29.0
index d9a0521324ca..a2faa0d5d079 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.29.0
+++ b/metadata/md5-cache/media-sound/mpg123-1.29.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.mpg123.org/
 IDEPEND=app-eselect/eselect-mpg123
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 )
 SLOT=0
 SRC_URI=https://www.mpg123.org/download/mpg123-1.29.0.tar.bz2
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=06db1fcd44e98c38bce4ce0e0af0c372
+_md5_=068ce2eb4f412131161d0e3c5f3f5d2f
diff --git a/metadata/md5-cache/media-sound/openmpt123-0.5.11 b/metadata/md5-cache/media-sound/openmpt123-0.5.11
deleted file mode 100644
index c51eece07c94..000000000000
--- a/metadata/md5-cache/media-sound/openmpt123-0.5.11
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
-DEPEND=~media-libs/libopenmpt-0.5.11 flac? ( media-libs/flac ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( >=media-libs/libsdl2-2.0.4 ) sndfile? ( media-libs/libsndfile )
-DESCRIPTION=libopenmpt-based command line player for tracked music files (modules)
-EAPI=7
-HOMEPAGE=https://lib.openmpt.org/libopenmpt/
-IUSE=flac portaudio pulseaudio sdl sndfile
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=~media-libs/libopenmpt-0.5.11 flac? ( media-libs/flac ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( >=media-libs/libsdl2-2.0.4 ) sndfile? ( media-libs/libsndfile )
-SLOT=0
-SRC_URI=https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-0.5.11+release.autotools.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d766d42e8aad31eb26aabe3e933bbcc4
diff --git a/metadata/md5-cache/media-sound/openmpt123-0.5.12 b/metadata/md5-cache/media-sound/openmpt123-0.5.12
new file mode 100644
index 000000000000..60b46dc83634
--- /dev/null
+++ b/metadata/md5-cache/media-sound/openmpt123-0.5.12
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=~media-libs/libopenmpt-0.5.12 flac? ( media-libs/flac ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( >=media-libs/libsdl2-2.0.4 ) sndfile? ( media-libs/libsndfile )
+DESCRIPTION=libopenmpt-based command line player for tracked music files (modules)
+EAPI=7
+HOMEPAGE=https://lib.openmpt.org/libopenmpt/
+IUSE=flac portaudio pulseaudio sdl sndfile
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=~media-libs/libopenmpt-0.5.12 flac? ( media-libs/flac ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( >=media-libs/libsdl2-2.0.4 ) sndfile? ( media-libs/libsndfile )
+SLOT=0
+SRC_URI=https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-0.5.12+release.autotools.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d766d42e8aad31eb26aabe3e933bbcc4
diff --git a/metadata/md5-cache/media-sound/pulseaudio-13.0-r1 b/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
index 6e59028dc774..3c9a08af9238 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( elogind systemd ) bluetooth? ( dbus ) equalizer? ( dbus ) ofon
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-13.0.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=194a941790d36156a63c4e3a2bc27676
diff --git a/metadata/md5-cache/media-sound/qtractor-0.9.24 b/metadata/md5-cache/media-sound/qtractor-0.9.24
new file mode 100644
index 000000000000..bad166b00293
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qtractor-0.9.24
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Audio/MIDI multi-track sequencer written in C++ with the Qt framework
+EAPI=8
+HOMEPAGE=https://qtractor.sourceforge.io
+IUSE=aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=dssi? ( ladspa )
+SLOT=0
+SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.24.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=16137ab70131702254ed7ef486b3c22a
diff --git a/metadata/md5-cache/media-sound/rhythmbox-3.4.4 b/metadata/md5-cache/media-sound/rhythmbox-3.4.4
index 3681b203875a..b8243b5552d0 100644
--- a/metadata/md5-cache/media-sound/rhythmbox-3.4.4
+++ b/metadata/md5-cache/media-sound/rhythmbox-3.4.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.20.0:3[X,introspection] >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/gobject-introspection-0.10:= >=dev-libs/libpeas-0.7.3[gtk] >=dev-libs/totem-pl-parser-3.2 >=net-libs/libsoup-2.42:2.4 >=media-libs/gst-plugins-base-1.4:1.0[introspection] >=media-libs/gstreamer-1.4:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) ) udev? ( dev-libs/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 dev-util/itstool virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.20.0:3[X,introspection] >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/gobject-introspection-0.10:= >=dev-libs/libpeas-0.7.3[gtk] >=dev-libs/totem-pl-parser-3.2 >=net-libs/libsoup-2.42:2.4 >=media-libs/gst-plugins-base-1.4:1.0[introspection] >=media-libs/gstreamer-1.4:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[xml] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) ) udev? ( dev-libs/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 dev-util/itstool virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DESCRIPTION=Music management and playback software for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Rhythmbox
-IUSE=cdr daap dbus gnome-keyring ipod libnotify lirc mtp +python test +udev upnp-av python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=cdr daap dbus gnome-keyring ipod libnotify lirc mtp +python test +udev upnp-av python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.20.0:3[X,introspection] >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/gobject-introspection-0.10:= >=dev-libs/libpeas-0.7.3[gtk] >=dev-libs/totem-pl-parser-3.2 >=net-libs/libsoup-2.42:2.4 >=media-libs/gst-plugins-base-1.4:1.0[introspection] >=media-libs/gstreamer-1.4:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) ) udev? ( dev-libs/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-libmms:1.0 || ( media-plugins/gst-plugins-cdparanoia:1.0 media-plugins/gst-plugins-cdio:1.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( >=dev-libs/libpeas-0.7.3[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] net-libs/libsoup:2.4[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) ) upnp-av? ( >=media-libs/grilo-0.3:0.3 >=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
-REQUIRED_USE=ipod? ( udev ) mtp? ( udev ) dbus? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.20.0:3[X,introspection] >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/gobject-introspection-0.10:= >=dev-libs/libpeas-0.7.3[gtk] >=dev-libs/totem-pl-parser-3.2 >=net-libs/libsoup-2.42:2.4 >=media-libs/gst-plugins-base-1.4:1.0[introspection] >=media-libs/gstreamer-1.4:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[xml] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) ) udev? ( dev-libs/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-libmms:1.0 || ( media-plugins/gst-plugins-cdparanoia:1.0 media-plugins/gst-plugins-cdio:1.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( >=dev-libs/libpeas-0.7.3[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] net-libs/libsoup:2.4[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) ) upnp-av? ( >=media-libs/grilo-0.3:0.3 >=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
+REQUIRED_USE=ipod? ( udev ) mtp? ( udev ) dbus? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rhythmbox/3.4/rhythmbox-3.4.4.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a46258958cb3bd39ad3e69297cd1c8b6
+_md5_=7bca820d3b9d35a6be58ed290af1e820
diff --git a/metadata/md5-cache/media-sound/strawberry-1.0.0 b/metadata/md5-cache/media-sound/strawberry-1.0.0
new file mode 100644
index 000000000000..5ccf139ec402
--- /dev/null
+++ b/metadata/md5-cache/media-sound/strawberry-1.0.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib >=media-libs/chromaprint-1.4:= >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( >=media-libs/libgpod-0.8.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) >=dev-cpp/gtest-1.8.0 dev-libs/boost dev-qt/qtopengl:5 dev-qt/qttest:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5
+DESCRIPTION=Modern music player and library organizer based on Clementine and Qt
+EAPI=8
+HOMEPAGE=https://www.strawbs.org/
+IUSE=cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib >=media-libs/chromaprint-1.4:= >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( >=media-libs/libgpod-0.8.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( gstreamer vlc )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jonaski/strawberry/releases/download/1.0.0/strawberry-1.0.0.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9d5e02cf5d0c7c0e6830a9a1a5570438
diff --git a/metadata/md5-cache/media-sound/strawberry-9999 b/metadata/md5-cache/media-sound/strawberry-9999
index 31ec89673de6..258ed00e41fd 100644
--- a/metadata/md5-cache/media-sound/strawberry-9999
+++ b/metadata/md5-cache/media-sound/strawberry-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/chromaprint:= >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( >=media-libs/libgpod-0.8.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) >=dev-cpp/gtest-1.8.0 dev-libs/boost dev-qt/qtopengl:5 dev-qt/qttest:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib >=media-libs/chromaprint-1.4:= >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( >=media-libs/libgpod-0.8.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) >=dev-cpp/gtest-1.8.0 dev-libs/boost dev-qt/qtopengl:5 dev-qt/qttest:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5
 DESCRIPTION=Modern music player and library organizer based on Clementine and Qt
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.strawbs.org/
 IUSE=cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc test
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/chromaprint:= >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( >=media-libs/libgpod-0.8.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib >=media-libs/chromaprint-1.4:= >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( >=media-libs/libgpod-0.8.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( gstreamer vlc )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=da65c7eb593114d16f0382fc6fec4517
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9d5e02cf5d0c7c0e6830a9a1a5570438
diff --git a/metadata/md5-cache/media-sound/ttaenc-3.4.1-r1 b/metadata/md5-cache/media-sound/ttaenc-3.4.1-r1
index 0081fc861f2d..1e96416ca9a3 100644
--- a/metadata/md5-cache/media-sound/ttaenc-3.4.1-r1
+++ b/metadata/md5-cache/media-sound/ttaenc-3.4.1-r1
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/tta/ttaenc-3.4.1-src.tgz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=994b8ee0614e921377a04965f5bc84bd
+_md5_=aac11f6fa46b20954324445f207c710d
diff --git a/metadata/md5-cache/media-sound/xmms2-0.8_p20201016 b/metadata/md5-cache/media-sound/xmms2-0.8_p20201016
deleted file mode 100644
index 1f560ddb5b65..000000000000
--- a/metadata/md5-cache/media-sound/xmms2-0.8_p20201016
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) virtual/pkgconfig perl? ( virtual/perl-Pod-Parser ) python? ( python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) ) test? ( valgrind? ( dev-util/valgrind ) )
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-libs/glib:2 sys-libs/readline:= server? ( aac? ( media-libs/faad2 ) airplay? ( dev-libs/openssl:= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= media-libs/libdiscid ) curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) gme? ( media-libs/game-music-emu ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mad? ( media-libs/libmad ) mms? ( media-libs/libmms media-video/ffmpeg:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) ofa? ( dev-libs/expat media-libs/libofa sci-libs/fftw:3.0= ) opus? ( media-libs/libogg media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/libogg media-libs/speex ) tremor? ( media-libs/tremor ) vocoder? ( media-libs/libsamplerate sci-libs/fftw:3.0= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] net-misc/curl ) ) python? ( virtual/libcrypt:= ) cxx? ( dev-libs/boost ) test? ( dev-util/cunit )
-DESCRIPTION=X(cross)platform Music Multiplexing System, next generation of the XMMS player
-EAPI=8
-HOMEPAGE=https://github.com/XMMS2
-IUSE=cxx mlib-update perl python server test aac airplay alsa ao asf cdda curl ffmpeg flac fluidsynth gme ices jack mac +mad mms modplug mp3 musepack ofa opus oss pulseaudio samba sid sndfile speex tremor vocoder +vorbis wavpack xml zeroconf +server valgrind python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 ~arm ppc x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=dev-libs/glib:2 sys-libs/readline:= server? ( aac? ( media-libs/faad2 ) airplay? ( dev-libs/openssl:= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= media-libs/libdiscid ) curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) gme? ( media-libs/game-music-emu ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mad? ( media-libs/libmad ) mms? ( media-libs/libmms media-video/ffmpeg:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) ofa? ( dev-libs/expat media-libs/libofa sci-libs/fftw:3.0= ) opus? ( media-libs/libogg media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/libogg media-libs/speex ) tremor? ( media-libs/tremor ) vocoder? ( media-libs/libsamplerate sci-libs/fftw:3.0= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] net-misc/curl ) ) python? ( virtual/libcrypt:= ) perl? ( dev-lang/perl dev-perl/glib-perl virtual/perl-Carp virtual/perl-IO virtual/perl-Scalar-List-Utils ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/pygobject[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject[python_targets_python3_10(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test ) !server? ( test )
-SLOT=0
-SRC_URI=https://github.com/xmms2/xmms2-devel/archive/46da10f0e20c53fd2b40843617ed182c0cba4ebb.tar.gz -> xmms2-0.8_p20201016.tar.gz https://github.com/xmms2/s4/archive/652ac581df7a0bca04334da397f8bb4f86eb7b59.tar.gz -> xmms2-s4-0.8_p20201016.tar.gz https://waf.io/waf-2.0.22.tar.bz2
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=357e07fc7a8fcb20240f2a753a2f253f
diff --git a/metadata/md5-cache/media-sound/xmms2-0.8_p20201016-r1 b/metadata/md5-cache/media-sound/xmms2-0.8_p20201016-r1
new file mode 100644
index 000000000000..11ab641ff7e4
--- /dev/null
+++ b/metadata/md5-cache/media-sound/xmms2-0.8_p20201016-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) virtual/pkgconfig perl? ( dev-perl/Pod-Parser ) python? ( python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) ) test? ( valgrind? ( dev-util/valgrind ) )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-libs/glib:2 sys-libs/readline:= server? ( aac? ( media-libs/faad2 ) airplay? ( dev-libs/openssl:= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= media-libs/libdiscid ) curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) gme? ( media-libs/game-music-emu ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mad? ( media-libs/libmad ) mms? ( media-libs/libmms media-video/ffmpeg:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) ofa? ( dev-libs/expat media-libs/libofa sci-libs/fftw:3.0= ) opus? ( media-libs/libogg media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/libogg media-libs/speex ) tremor? ( media-libs/tremor ) vocoder? ( media-libs/libsamplerate sci-libs/fftw:3.0= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] net-misc/curl ) ) python? ( virtual/libcrypt:= ) cxx? ( dev-libs/boost ) test? ( dev-util/cunit )
+DESCRIPTION=X(cross)platform Music Multiplexing System, next generation of the XMMS player
+EAPI=8
+HOMEPAGE=https://github.com/XMMS2
+IUSE=cxx mlib-update perl python server test aac airplay alsa ao asf cdda curl ffmpeg flac fluidsynth gme ices jack mac +mad mms modplug mp3 musepack ofa opus oss pulseaudio samba sid sndfile speex tremor vocoder +vorbis wavpack xml zeroconf +server valgrind python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha amd64 ~arm ppc x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=dev-libs/glib:2 sys-libs/readline:= server? ( aac? ( media-libs/faad2 ) airplay? ( dev-libs/openssl:= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= media-libs/libdiscid ) curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) gme? ( media-libs/game-music-emu ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mad? ( media-libs/libmad ) mms? ( media-libs/libmms media-video/ffmpeg:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) ofa? ( dev-libs/expat media-libs/libofa sci-libs/fftw:3.0= ) opus? ( media-libs/libogg media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/libogg media-libs/speex ) tremor? ( media-libs/tremor ) vocoder? ( media-libs/libsamplerate sci-libs/fftw:3.0= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] net-misc/curl ) ) python? ( virtual/libcrypt:= ) perl? ( dev-lang/perl dev-perl/glib-perl virtual/perl-Carp virtual/perl-IO virtual/perl-Scalar-List-Utils ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/pygobject[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject[python_targets_python3_10(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test ) !server? ( test )
+SLOT=0
+SRC_URI=https://github.com/xmms2/xmms2-devel/archive/46da10f0e20c53fd2b40843617ed182c0cba4ebb.tar.gz -> xmms2-0.8_p20201016.tar.gz https://github.com/xmms2/s4/archive/652ac581df7a0bca04334da397f8bb4f86eb7b59.tar.gz -> xmms2-s4-0.8_p20201016.tar.gz https://waf.io/waf-2.0.22.tar.bz2
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=76afb0ad13256861fe7d0c6bc3992b5f
diff --git a/metadata/md5-cache/media-sound/xwax-1.8 b/metadata/md5-cache/media-sound/xwax-1.8
index 841b3a9e1523..8f3282827760 100644
--- a/metadata/md5-cache/media-sound/xwax-1.8
+++ b/metadata/md5-cache/media-sound/xwax-1.8
@@ -4,11 +4,11 @@ DESCRIPTION=Digital vinyl emulation software
 EAPI=7
 HOMEPAGE=https://xwax.org/
 IUSE=alsa jack oss cdda mp3 +fallback
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=media-fonts/dejavu media-libs/libsdl media-libs/sdl-ttf sys-libs/glibc sys-libs/pam alsa? ( media-libs/alsa-lib ) cdda? ( media-sound/cdparanoia ) fallback? ( media-video/ffmpeg ) jack? ( virtual/jack ) mp3? ( media-sound/mpg123 ) acct-group/xwax
 REQUIRED_USE=|| ( cdda mp3 fallback ) || ( alsa jack oss )
 SLOT=0
 SRC_URI=https://xwax.org/releases/xwax-1.8.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ac4a7f56f2658a5e1f2bd22879022c1f
+_md5_=531cb650ca5f8f4f3c20ed6ea226b649
diff --git a/metadata/md5-cache/media-sound/yoshimi-2.1.1.1 b/metadata/md5-cache/media-sound/yoshimi-2.1.1.1
new file mode 100644
index 000000000000..d3fcd7213a67
--- /dev/null
+++ b/metadata/md5-cache/media-sound/yoshimi-2.1.1.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/mxml media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Software synthesizer based on ZynAddSubFX
+EAPI=7
+HOMEPAGE=https://yoshimi.github.io/
+IUSE=+lv2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/mxml media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
+SLOT=0
+SRC_URI=https://github.com/Yoshimi/yoshimi/archive/2.1.1.1.tar.gz -> yoshimi-2.1.1.1.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=86aeeaa860c19a81e1f741dbf0027e61
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 9c7afdaffc07..7f726748932b 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430 b/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
index ed3252b07d64..3cc8e4a9ce1c 100644
--- a/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
+++ b/metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
@@ -3,8 +3,8 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Digital TV scan tables in v3 and v5 format
 EAPI=7
 HOMEPAGE=https://linuxtv.org/
-KEYWORDS=amd64 ~arm arm64 ~ppc x86
+KEYWORDS=amd64 arm arm64 ~ppc x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-2021-04-30-4181e93a30ab.tar.bz2
-_md5_=886c59bd4a3f703759d11a86a01044bd
+_md5_=dfbd4e8ce21c7e56cf2f57c617199ea4
diff --git a/metadata/md5-cache/media-tv/kodi-19.0-r1 b/metadata/md5-cache/media-tv/kodi-19.0-r1
index 5dbbf16d14b7..ff59d98eac1b 100644
--- a/metadata/md5-cache/media-tv/kodi-19.0-r1
+++ b/metadata/md5-cache/media-tv/kodi-19.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.1-Matrix-Beta1.tar.gz -> ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz ) https://github.com/xbmc/xbmc/archive/19.0-Matrix.tar.gz -> kodi-19.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=745772de39bb0331bcad1f88b6d72a77
diff --git a/metadata/md5-cache/media-tv/kodi-19.1-r1 b/metadata/md5-cache/media-tv/kodi-19.1-r1
index db729b9df277..4d8d41c9249a 100644
--- a/metadata/md5-cache/media-tv/kodi-19.1-r1
+++ b/metadata/md5-cache/media-tv/kodi-19.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.1.tar.gz -> ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz ) https://github.com/xbmc/xbmc/archive/v19.1.tar.gz -> kodi-19.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=95e7d4bdd99483289c5163fbab3b4254
diff --git a/metadata/md5-cache/media-tv/kodi-19.2 b/metadata/md5-cache/media-tv/kodi-19.2
index f32a714d78d0..8f9141d81ac1 100644
--- a/metadata/md5-cache/media-tv/kodi-19.2
+++ b/metadata/md5-cache/media-tv/kodi-19.2
@@ -11,6 +11,6 @@ RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.1.tar.gz -> ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz ) https://github.com/xbmc/xbmc/archive/v19.2-Matrix.tar.gz -> kodi-19.2-Matrix.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=35c84d757145d1ccbdc18adb98d0513c
+SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.1.tar.gz -> ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz ) https://github.com/xbmc/xbmc/archive/19.2-Matrix.tar.gz -> kodi-19.2-Matrix.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=947dc05587475e542799382229871339
diff --git a/metadata/md5-cache/media-tv/kodi-19.9999 b/metadata/md5-cache/media-tv/kodi-19.9999
index 7e2ad39d16fe..84cc49472ca1 100644
--- a/metadata/md5-cache/media-tv/kodi-19.9999
+++ b/metadata/md5-cache/media-tv/kodi-19.9999
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.1.tar.gz -> ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=35c84d757145d1ccbdc18adb98d0513c
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=947dc05587475e542799382229871339
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index d16f82d69960..553731165e33 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.4-N-Alpha1.tar.gz -> ffmpeg-kodi-4.4-N-Alpha1.tar.gz )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b44b1277bff97baf7c1e592865660a35
diff --git a/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1 b/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1
index acb04dddea21..52ae58a105fb 100644
--- a/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1
+++ b/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Small utils for DVB to scan, zap, view signal strength
 EAPI=7
 HOMEPAGE=https://www.linuxtv.org/
 IUSE=alevt usb
-KEYWORDS=amd64 ~arm arm64 ppc x86
+KEYWORDS=amd64 arm arm64 ppc x86
 LICENSE=GPL-2
 RDEPEND=alevt? ( !media-video/alevt media-libs/libpng:0= media-libs/zvbi[v4l] sys-libs/zlib x11-libs/libX11 ) usb? ( virtual/libusb:0 ) media-tv/dtv-scan-tables
 SLOT=0
 SRC_URI=https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> linuxtv-dvb-apps-1.1.1.20140321.tar.bz2
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=8b6af56187ff5eb4a9df16b1a5144091
+_md5_=d61c8663d20e5773be8f06c7aaf253ea
diff --git a/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2 b/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
index 6602f9d69857..5fb9e0a32008 100644
--- a/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
+++ b/metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Tvheadend is a TV streaming server and digital video recorder
 EAPI=7
 HOMEPAGE=https://tvheadend.org/
 IUSE=+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf zlib kernel_linux
-KEYWORDS=amd64 ~arm arm64 x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=GPL-3
 RDEPEND=acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) dvben50221? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( media-video/ffmpeg:0= ) hdhomerun? ( media-libs/libhdhomerun ) dev-libs/openssl:0= uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv )
 REQUIRED_USE=dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )
 SLOT=0
 SRC_URI=https://github.com/tvheadend/tvheadend/archive/v4.2.8.tar.gz -> tvheadend-4.2.8.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5dc70323a7d69c1c239760d7e76a654d
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a518185b96a884877b1a5155e31b71ad
diff --git a/metadata/md5-cache/media-tv/tvheadend-9999 b/metadata/md5-cache/media-tv/tvheadend-9999
index dc8ef10de5cb..1d4bca5d6806 100644
--- a/metadata/md5-cache/media-tv/tvheadend-9999
+++ b/metadata/md5-cache/media-tv/tvheadend-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) ffmpeg? ( media-video/ffmpeg:0=[opus?,vpx?,x264?,x265?] ) hdhomerun? ( media-libs/libhdhomerun ) dev-libs/openssl:0= uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv )
 REQUIRED_USE=ddci? ( dvb )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b79dd833226986919ad3eb388d8f16e4
diff --git a/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r5 b/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r5
index 2ba93ffcf6f2..c874123271f4 100644
--- a/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r5
+++ b/metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-firmware/tt-s2-6400-firmware kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://bitbucket.org/powARman/v4l-dvb-saa716x/get/83f3bfd93a95.tar.bz2 -> v4l-dvb-saa716x-0.0.1_p20160322.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a54bc9832ce6317f14386111b6aef4b8
diff --git a/metadata/md5-cache/media-tv/v4l-utils-1.20.0 b/metadata/md5-cache/media-tv/v4l-utils-1.20.0
index e02f728e64d1..625f05000bf7 100644
--- a/metadata/md5-cache/media-tv/v4l-utils-1.20.0
+++ b/metadata/md5-cache/media-tv/v4l-utils-1.20.0
@@ -5,10 +5,10 @@ DESCRIPTION=Separate utilities ebuild from upstream v4l-utils package
 EAPI=7
 HOMEPAGE=https://git.linuxtv.org/v4l-utils.git
 IUSE=+bpf dvb opengl qt5 +udev
-KEYWORDS=~alpha amd64 ~arm arm64 ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=media-libs/libv4l-1.20.0[dvb?,jpeg] >=virtual/jpeg-0-r2:0= bpf? ( virtual/libelf:= ) udev? ( virtual/libudev ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 opengl? ( dev-qt/qtopengl:5[-gles2(-)] virtual/opengl ) media-libs/alsa-lib ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.20.0.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=29eb79118762d410da79a8cce898e23c
+_md5_=24acb93b2b9980053f9aea893d66e06a
diff --git a/metadata/md5-cache/media-tv/xmltv-0.6.1-r1 b/metadata/md5-cache/media-tv/xmltv-0.6.1-r1
deleted file mode 100644
index 32c857efcc88..000000000000
--- a/metadata/md5-cache/media-tv/xmltv-0.6.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-lang/perl
-DESCRIPTION=Set of utilities to manage TV listings stored in the XMLTV format
-EAPI=7
-HOMEPAGE=http://wiki.xmltv.org/index.php/XMLTVProject https://github.com/XMLTV/xmltv
-IUSE=ar ch-search dk dtvla eu-dotmedia eu-epgdata eu-xmltvse fi fi-sv fr huro il is it na-dd na-dtv na-tvmedia pt-meo pt-vodafone se-swedb se-tvzon tr tv-check tv-combiner tv-pick-cgi uk-bleb uk-tvguide zz-sdjson zz-sdjson-sqlite
-KEYWORDS=amd64 ~arm arm64 ~ppc x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/Date-Manip dev-perl/File-Slurp dev-perl/JSON dev-perl/libwww-perl dev-perl/Lingua-Preferred dev-perl/PerlIO-gzip dev-perl/Term-ProgressBar dev-perl/TermReadKey dev-perl/XML-Parser dev-perl/XML-TreePP dev-perl/XML-Twig dev-perl/XML-Writer dev-perl/Unicode-String virtual/perl-Memoize virtual/perl-Storable virtual/perl-IO-Compress ar? ( dev-perl/DateTime dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/HTTP-Cookies ) ch-search? ( dev-perl/HTML-Tree dev-perl/HTML-Parser dev-perl/HTTP-Cookies dev-perl/URI ) dk? ( dev-perl/DateTime dev-perl/IO-stringy ) dtvla? ( dev-perl/DateTime dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/HTTP-Cookies ) eu-dotmedia? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy ) eu-epgdata? ( dev-perl/Archive-Zip dev-perl/DateTime dev-perl/DateTime-Format-Strptime dev-perl/HTML-Parser dev-perl/HTTP-Message ) eu-xmltvse? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy ) fi? ( dev-perl/HTML-Tree dev-perl/LWP-Protocol-https dev-perl/URI ) fi-sv? ( dev-perl/DateTime dev-perl/HTML-Tree dev-perl/IO-stringy ) fr? ( dev-perl/DateTime dev-perl/DateTime-TimeZone dev-perl/HTML-Parser dev-perl/HTML-Tree ) huro? ( dev-perl/HTML-Parser dev-perl/HTML-Tree ) il? ( dev-perl/DateTime ) is? ( dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/URI dev-perl/XML-DOM dev-perl/XML-LibXSLT ) it? ( dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/URI ) na-dd? ( dev-perl/SOAP-Lite ) na-dtv? ( dev-perl/DateTime dev-perl/HTTP-Cookies dev-perl/URI ) na-tvmedia? ( dev-perl/XML-LibXML ) pt-meo? ( dev-perl/DateTime dev-perl/XML-LibXML ) pt-vodafone? ( dev-perl/DateTime dev-perl/URI dev-perl/XML-LibXML ) se-swedb? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy dev-perl/XML-LibXML ) se-tvzon? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent ) tr? ( dev-perl/DateTime dev-perl/HTTP-Cache-Transparent dev-perl/HTTP-Cookies dev-perl/URI ) uk-bleb? ( dev-perl/Archive-Zip dev-perl/IO-stringy ) uk-tvguide? ( dev-perl/DateTime dev-perl/HTML-Tree dev-perl/HTTP-Cache-Transparent dev-perl/HTTP-Cookies dev-perl/URI ) zz-sdjson? ( dev-lang/perl dev-perl/DateTime virtual/perl-Digest-SHA dev-perl/HTTP-Message dev-perl/LWP-Protocol-https dev-perl/Try-Tiny dev-perl/XML-LibXML ) zz-sdjson-sqlite? ( dev-lang/perl dev-perl/DateTime dev-perl/DateTime-Format-ISO8601 dev-perl/DateTime-Format-SQLite dev-perl/DateTime-TimeZone dev-perl/DBD-SQLite dev-perl/DBI virtual/perl-Digest-SHA dev-perl/File-HomeDir dev-perl/File-Which dev-perl/List-MoreUtils dev-perl/LWP-UserAgent-Determined dev-perl/XML-LibXML ) tv-check? ( dev-perl/Tk dev-perl/Tk-TableMatrix ) tv-combiner? ( dev-perl/XML-LibXML ) tv-pick-cgi? ( dev-perl/CGI ) dev-lang/perl:=
-SLOT=0
-SRC_URI=https://github.com/XMLTV/xmltv/archive/v0.6.1.tar.gz -> xmltv-0.6.1.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=0d8c92cb252f3559289a7bd1420bfc9a
diff --git a/metadata/md5-cache/media-tv/xmltv-1.0.0 b/metadata/md5-cache/media-tv/xmltv-1.0.0
index 8147d070dae2..3db32bbb2ea5 100644
--- a/metadata/md5-cache/media-tv/xmltv-1.0.0
+++ b/metadata/md5-cache/media-tv/xmltv-1.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Set of utilities to manage TV listings stored in the XMLTV format
 EAPI=8
 HOMEPAGE=http://wiki.xmltv.org/index.php/XMLTVProject https://github.com/XMLTV/xmltv
 IUSE=ar ch-search eu-epgdata eu-xmltvse fi fi-sv fr huro is it it-dvb na-dd na-dtv na-tvmedia pt-vodafone tr tv-check tv-combiner tv-pick-cgi uk-tvguide zz-sdjson zz-sdjson-sqlite test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ppc x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-perl/Date-Manip dev-perl/File-Slurp dev-perl/JSON dev-perl/Lingua-Preferred dev-perl/LWP-Online dev-perl/PerlIO-gzip dev-perl/Term-ProgressBar dev-perl/TermReadKey dev-perl/XML-LibXML dev-perl/XML-Parser dev-perl/XML-TreePP dev-perl/XML-Twig dev-perl/XML-Writer dev-perl/Unicode-String virtual/perl-Memoize virtual/perl-Storable virtual/perl-IO-Compress ar? ( dev-perl/DateTime dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/HTTP-Cookies ) ch-search? ( dev-perl/HTML-Tree dev-perl/HTML-Parser dev-perl/HTTP-Cookies dev-perl/URI ) eu-epgdata? ( dev-perl/Archive-Zip dev-perl/DateTime dev-perl/DateTime-Format-Strptime dev-perl/HTML-Parser dev-perl/HTTP-Message ) eu-xmltvse? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy ) fi? ( dev-perl/HTML-Tree dev-perl/LWP-Protocol-https dev-perl/URI ) fi-sv? ( dev-perl/DateTime dev-perl/HTML-Tree dev-perl/IO-stringy ) fr? ( dev-perl/DateTime dev-perl/DateTime-TimeZone dev-perl/HTML-Parser dev-perl/HTML-Tree ) huro? ( dev-perl/HTML-Parser dev-perl/HTML-Tree ) is? ( dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/URI dev-perl/XML-DOM dev-perl/XML-LibXSLT ) it? ( dev-perl/HTML-Parser dev-perl/HTML-Tree dev-perl/URI ) it-dvb? ( virtual/perl-Data-Dumper ) na-dd? ( dev-perl/HTTP-Daemon dev-perl/SOAP-Lite ) na-dtv? ( dev-perl/DateTime dev-perl/HTTP-Cookies dev-perl/URI ) pt-vodafone? ( dev-perl/DateTime dev-perl/URI ) tr? ( dev-perl/DateTime dev-perl/HTTP-Cache-Transparent dev-perl/HTTP-Cookies dev-perl/URI ) uk-tvguide? ( dev-perl/DateTime dev-perl/HTML-Tree dev-perl/HTTP-Cache-Transparent dev-perl/HTTP-Cookies dev-perl/URI ) zz-sdjson? ( dev-lang/perl dev-perl/DateTime virtual/perl-Digest-SHA dev-perl/HTTP-Message dev-perl/LWP-Protocol-https dev-perl/Try-Tiny ) zz-sdjson-sqlite? ( dev-lang/perl dev-perl/DateTime dev-perl/DateTime-Format-ISO8601 dev-perl/DateTime-Format-SQLite dev-perl/DateTime-TimeZone dev-perl/DBD-SQLite dev-perl/DBI virtual/perl-Digest-SHA dev-perl/File-HomeDir dev-perl/File-Which dev-perl/List-MoreUtils dev-perl/LWP-UserAgent-Determined ) tv-check? ( dev-perl/Tk dev-perl/Tk-TableMatrix ) tv-pick-cgi? ( dev-perl/CGI ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/XMLTV/xmltv/archive/v1.0.0.tar.gz -> xmltv-1.0.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=d258cf0ba2406c61482d13f0bf698f1f
+_md5_=e57bd1b37a504b68b99b5a216b66b2b8
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 50097a21cbe0..188c639cda39 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/droidcam-1.8.0 b/metadata/md5-cache/media-video/droidcam-1.8.0
index 5a3912df0ed9..210af63b9288 100644
--- a/metadata/md5-cache/media-video/droidcam-1.8.0
+++ b/metadata/md5-cache/media-video/droidcam-1.8.0
@@ -11,5 +11,5 @@ RDEPEND=app-pda/libplist app-pda/libusbmuxd dev-libs/glib dev-libs/libappindicat
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dev47apps/droidcam/archive/v1.8.0.tar.gz -> droidcam-1.8.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f215efaa3953b91e0e4f07b50662cd1c
diff --git a/metadata/md5-cache/media-video/droidcam-1.8.0-r1 b/metadata/md5-cache/media-video/droidcam-1.8.0-r1
index 66e4a87acfa6..035b55d005d3 100644
--- a/metadata/md5-cache/media-video/droidcam-1.8.0-r1
+++ b/metadata/md5-cache/media-video/droidcam-1.8.0-r1
@@ -11,5 +11,5 @@ RDEPEND=app-pda/libplist app-pda/libusbmuxd dev-libs/glib dev-libs/libappindicat
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dev47apps/droidcam/archive/v1.8.0.tar.gz -> droidcam-1.8.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=589b7e6548f30ec307a1224a13abc4f2
diff --git a/metadata/md5-cache/media-video/handbrake-1.3.3-r3 b/metadata/md5-cache/media-video/handbrake-1.3.3-r3
new file mode 100644
index 000000000000..4fc62dfa4970
--- /dev/null
+++ b/metadata/md5-cache/media-video/handbrake-1.3.3-r3
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson:= dev-libs/libxml2 media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 >=media-libs/dav1d-0.5.1 media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8 nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) || ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/nasm dev-util/intltool
+DESCRIPTION=Open-source, GPL-licensed, multiplatform, multithreaded video transcoder
+EAPI=7
+HOMEPAGE=http://handbrake.fr/
+IUSE=+fdk gstreamer gtk libav-aac numa nvenc x265
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson:= dev-libs/libxml2 media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 >=media-libs/dav1d-0.5.1 media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8 nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?] gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-a52dec:1.0 media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-x264:1.0 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
+REQUIRED_USE=^^ ( fdk libav-aac )
+SLOT=0
+SRC_URI=https://github.com/HandBrake/HandBrake/releases/download/1.3.3/HandBrake-1.3.3-source.tar.bz2 -> handbrake-1.3.3.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8e7b3595a5be450823779a550c8e1731
diff --git a/metadata/md5-cache/media-video/handbrake-9999 b/metadata/md5-cache/media-video/handbrake-9999
index d8a68e200778..6c5b08f29811 100644
--- a/metadata/md5-cache/media-video/handbrake-9999
+++ b/metadata/md5-cache/media-video/handbrake-9999
@@ -11,4 +11,4 @@ RDEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson:= dev-libs/libxml2 m
 REQUIRED_USE=^^ ( fdk libav-aac )
 SLOT=0
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=59ffe80ae0ab338fc2f1e8e4a51b5883
+_md5_=f8aeb4ede5ca7ffee40ea18b77b71307
diff --git a/metadata/md5-cache/media-video/libva-utils-2.13.0 b/metadata/md5-cache/media-video/libva-utils-2.13.0
new file mode 100644
index 000000000000..de8c9cd4764e
--- /dev/null
+++ b/metadata/md5-cache/media-video/libva-utils-2.13.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=>=x11-libs/libva-2.13.0:=[drm?,wayland?,X?] wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libX11-1.6.2 )
+DESCRIPTION=Collection of utilities and tests for VA-API
+EAPI=7
+HOMEPAGE=https://01.org/linuxmedia/vaapi
+IUSE=+drm examples putsurface test test-va-api +vainfo wayland X
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=x11-libs/libva-2.13.0:=[drm?,wayland?,X?] wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libX11-1.6.2 )
+REQUIRED_USE=|| ( drm wayland X ) putsurface? ( || ( wayland X ) ) putsurface? ( drm ) || ( examples putsurface test-va-api vainfo )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/intel/libva-utils/archive/2.13.0.tar.gz -> libva-utils-2.13.0.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=596038af919ebbbecd4d1a03d662e3e3
diff --git a/metadata/md5-cache/media-video/libva-utils-9999 b/metadata/md5-cache/media-video/libva-utils-9999
index 05cc54943503..12dbd6855da8 100644
--- a/metadata/md5-cache/media-video/libva-utils-9999
+++ b/metadata/md5-cache/media-video/libva-utils-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( drm wayland X ) putsurface? ( || ( wayland X ) ) putsurface? (
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1dd4a99550d1f1ce0630d1570e0de643
+_md5_=596038af919ebbbecd4d1a03d662e3e3
diff --git a/metadata/md5-cache/media-video/makemkv-1.16.4 b/metadata/md5-cache/media-video/makemkv-1.16.4
index 2b8234aaa986..b87dea7d7f81 100644
--- a/metadata/md5-cache/media-video/makemkv-1.16.4
+++ b/metadata/md5-cache/media-video/makemkv-1.16.4
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat dev-libs/openssl:0=[-bindist(-)] >=media-video/ffmpeg-1.0
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.16.4.tar.gz http://www.makemkv.com/download/makemkv-bin-1.16.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a42fc98aa8259ee3a45c5b23acffe2be
diff --git a/metadata/md5-cache/media-video/oxine-0.7.1-r4 b/metadata/md5-cache/media-video/oxine-0.7.1-r4
deleted file mode 100644
index cb350271d408..000000000000
--- a/metadata/md5-cache/media-video/oxine-0.7.1-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/libcdio media-libs/xine-lib[v4l?,X,imagemagick] virtual/libcrypt:= curl? ( net-misc/curl ) dvb? ( media-libs/xine-lib[v4l] ) joystick? ( media-libs/libjsw ) jpeg? ( media-gfx/imagemagick media-libs/netpbm[jpeg,zlib] media-video/mjpegtools ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl sys-devel/gettext ) png? ( media-gfx/imagemagick media-libs/netpbm[png,zlib] media-video/mjpegtools ) X? ( x11-libs/libXext x11-libs/libX11 ) virtual/pkgconfig
-DESCRIPTION=OSD frontend for Xine
-EAPI=6
-HOMEPAGE=http://oxine.sourceforge.net/
-IUSE=curl debug dvb exif joystick jpeg lirc nls png v4l X
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libcdio media-libs/xine-lib[v4l?,X,imagemagick] virtual/libcrypt:= curl? ( net-misc/curl ) dvb? ( media-libs/xine-lib[v4l] ) joystick? ( media-libs/libjsw ) jpeg? ( media-gfx/imagemagick media-libs/netpbm[jpeg,zlib] media-video/mjpegtools ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl sys-devel/gettext ) png? ( media-gfx/imagemagick media-libs/netpbm[png,zlib] media-video/mjpegtools ) X? ( x11-libs/libXext x11-libs/libX11 ) sys-apps/util-linux
-SLOT=0
-SRC_URI=mirror://sourceforge/oxine/oxine-0.7.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=75d6a2ebccea3175385de97f86d07e00
diff --git a/metadata/md5-cache/media-video/oxine-0.7.1-r5 b/metadata/md5-cache/media-video/oxine-0.7.1-r5
new file mode 100644
index 000000000000..8a6a6c18cb4b
--- /dev/null
+++ b/metadata/md5-cache/media-video/oxine-0.7.1-r5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/libcdio media-libs/xine-lib[v4l?,X,imagemagick] virtual/libcrypt:= curl? ( net-misc/curl ) dvb? ( media-libs/xine-lib[v4l] ) joystick? ( media-libs/libjsw ) jpeg? ( media-gfx/imagemagick media-libs/netpbm[jpeg,zlib(+)] media-video/mjpegtools ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl sys-devel/gettext ) png? ( media-gfx/imagemagick media-libs/netpbm[png,zlib(+)] media-video/mjpegtools ) X? ( x11-libs/libXext x11-libs/libX11 ) virtual/pkgconfig
+DESCRIPTION=OSD frontend for Xine
+EAPI=6
+HOMEPAGE=http://oxine.sourceforge.net/
+IUSE=curl debug dvb exif joystick jpeg lirc nls png v4l X
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libcdio media-libs/xine-lib[v4l?,X,imagemagick] virtual/libcrypt:= curl? ( net-misc/curl ) dvb? ( media-libs/xine-lib[v4l] ) joystick? ( media-libs/libjsw ) jpeg? ( media-gfx/imagemagick media-libs/netpbm[jpeg,zlib(+)] media-video/mjpegtools ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl sys-devel/gettext ) png? ( media-gfx/imagemagick media-libs/netpbm[png,zlib(+)] media-video/mjpegtools ) X? ( x11-libs/libXext x11-libs/libX11 ) sys-apps/util-linux
+SLOT=0
+SRC_URI=mirror://sourceforge/oxine/oxine-0.7.1.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b9e5798ddaea4f7857e1feae3e28ccea
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.32 b/metadata/md5-cache/media-video/pipewire-0.3.32
deleted file mode 100644
index c23c3a0da7b0..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.32
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-doc/xmltoman virtual/pkgconfig || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-DESCRIPTION=Multimedia processing graphs
-EAPI=7
-HOMEPAGE=https://pipewire.org/
-IUSE=bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT LGPL-2.1+ GPL-2
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-REQUIRED_USE=jack-sdk? ( !jack-client )
-RESTRICT=!test? ( test )
-SLOT=0/0.3
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.32/pipewire-0.3.32.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=6d9fa103ad8b3a2f0ebd4c65867254d4
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.33-r1 b/metadata/md5-cache/media-video/pipewire-0.3.33-r1
deleted file mode 100644
index acc36c312f60..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.33-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-doc/xmltoman virtual/pkgconfig || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-DESCRIPTION=Multimedia processing graphs
-EAPI=7
-HOMEPAGE=https://pipewire.org/
-IUSE=bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT LGPL-2.1+ GPL-2
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-REQUIRED_USE=jack-sdk? ( !jack-client )
-RESTRICT=!test? ( test )
-SLOT=0/0.3
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.33/pipewire-0.3.33.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=06ed24bf98811c1e0695d733e62746b3
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.34 b/metadata/md5-cache/media-video/pipewire-0.3.34
deleted file mode 100644
index f1088e6d2d6a..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.34
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-doc/xmltoman >=dev-util/meson-0.59 virtual/pkgconfig || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-DESCRIPTION=Multimedia processing graphs
-EAPI=7
-HOMEPAGE=https://pipewire.org/
-IUSE=bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT LGPL-2.1+ GPL-2
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libopenaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-REQUIRED_USE=jack-sdk? ( !jack-client )
-RESTRICT=!test? ( test )
-SLOT=0/0.3
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.34/pipewire-0.3.34.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=2d8cba8a405c83cc249c1de819e92867
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.35 b/metadata/md5-cache/media-video/pipewire-0.3.35
deleted file mode 100644
index 9f2b4feb82b5..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.35
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-doc/xmltoman >=dev-util/meson-0.59 virtual/pkgconfig || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-DESCRIPTION=Multimedia processing graphs
-EAPI=7
-HOMEPAGE=https://pipewire.org/
-IUSE=bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~riscv
-LICENSE=MIT LGPL-2.1+ GPL-2
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
-REQUIRED_USE=jack-sdk? ( !jack-client )
-RESTRICT=!test? ( test )
-SLOT=0/0.3
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.35/pipewire-0.3.35.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=6fed3b8edb64997a555a10fc052976a5
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.36 b/metadata/md5-cache/media-video/pipewire-0.3.36
index 4b7f883cb22a..e6ace9ae4ff3 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.36
+++ b/metadata/md5-cache/media-video/pipewire-0.3.36
@@ -5,7 +5,7 @@ DESCRIPTION=Multimedia processing graphs
 EAPI=7
 HOMEPAGE=https://pipewire.org/
 IUSE=bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 ~riscv x86
 LICENSE=MIT LGPL-2.1+ GPL-2
 RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
 REQUIRED_USE=jack-sdk? ( !jack-client )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.36/pipewire-0.3.36.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=e874f5561adc9bd8144c0c3277f0f688
+_md5_=c171d3a7801a3dd7b383c0461e844942
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.38 b/metadata/md5-cache/media-video/pipewire-0.3.38
index cae1ed9d5fe1..a7f738e63626 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.38
+++ b/metadata/md5-cache/media-video/pipewire-0.3.38
@@ -5,7 +5,7 @@ DESCRIPTION=Multimedia processing graphs
 EAPI=7
 HOMEPAGE=https://pipewire.org/
 IUSE=bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT LGPL-2.1+ GPL-2
 RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
 REQUIRED_USE=jack-sdk? ( !jack-client )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.3
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.38/pipewire-0.3.38.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=d96b85ee630d1cde0a32f2c59c2126c5
+_md5_=b54897859ac06febd4f5479431517e67
diff --git a/metadata/md5-cache/media-video/sonic-snap-1.7-r1 b/metadata/md5-cache/media-video/sonic-snap-1.7-r1
index 5ee2364cf259..20cb928d846d 100644
--- a/metadata/md5-cache/media-video/sonic-snap-1.7-r1
+++ b/metadata/md5-cache/media-video/sonic-snap-1.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-1
 RDEPEND=x11-libs/fltk:1 mpeg? ( >=media-libs/libfame-0.9.1 ) sys-libs/zlib x11-libs/libXdmcp x11-libs/libXau x11-libs/libXrender x11-libs/libX11 x11-libs/libXext x11-libs/libXft
 SLOT=0
 SRC_URI=http://www.stolk.org/sonic-snap/downloads/sonic-snap-1.7.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0fcb0953e1e95f1cdfbbba7ec2a09932
diff --git a/metadata/md5-cache/media-video/totem-3.38.1 b/metadata/md5-cache/media-video/totem-3.38.1
index c819c8fe4dee..248bda5a645d 100644
--- a/metadata/md5-cache/media-video/totem-3.38.1
+++ b/metadata/md5-cache/media-video/totem-3.38.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-lang/perl gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.5 ) dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.19.4:3[introspection] >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[pango] >=media-libs/gst-plugins-good-1.6.0:1.0 >=media-libs/grilo-0.3.0:0.3[playlist] >=dev-libs/libpeas-1.1.0[gtk] >=dev-libs/totem-pl-parser-3.26.5:0=[introspection] >=media-libs/clutter-1.17.3:1.0[gtk] >=media-libs/clutter-gst-2.99.2:3.0 >=media-libs/clutter-gtk-1.8.1:1.0 gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 >=dev-libs/gobject-introspection-1.54:= python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_9(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.22.0:3[introspection] >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[pango] >=media-libs/gst-plugins-good-1.6.0:1.0 >=media-libs/grilo-0.3.0:0.3[playlist] >=dev-libs/libpeas-1.1.0[gtk] >=dev-libs/totem-pl-parser-3.26.5:0=[introspection] >=media-libs/clutter-1.17.3:1.0[gtk] >=media-libs/clutter-gst-2.99.2:3.0 >=media-libs/clutter-gtk-1.8.1:1.0 gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 >=dev-libs/gobject-introspection-1.54:= python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_10(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Videos
-IUSE=gtk-doc +python test test python_single_target_python3_8 python_single_target_python3_9
+IUSE=gtk-doc +python test test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.19.4:3[introspection] >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[pango] >=media-libs/gst-plugins-good-1.6.0:1.0 >=media-libs/grilo-0.3.0:0.3[playlist] >=dev-libs/libpeas-1.1.0[gtk] >=dev-libs/totem-pl-parser-3.26.5:0=[introspection] >=media-libs/clutter-1.17.3:1.0[gtk] >=media-libs/clutter-gst-2.99.2:3.0 >=media-libs/clutter-gtk-1.8.1:1.0 gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 >=dev-libs/gobject-introspection-1.54:= python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_9(-)] ) ) media-plugins/grilo-plugins:0.3 media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( x11-libs/pango[introspection] >=dev-libs/libpeas-1.1.0[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.22.0:3[introspection] >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[pango] >=media-libs/gst-plugins-good-1.6.0:1.0 >=media-libs/grilo-0.3.0:0.3[playlist] >=dev-libs/libpeas-1.1.0[gtk] >=dev-libs/totem-pl-parser-3.26.5:0=[introspection] >=media-libs/clutter-1.17.3:1.0[gtk] >=media-libs/clutter-gst-2.99.2:3.0 >=media-libs/clutter-gtk-1.8.1:1.0 gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 >=dev-libs/gobject-introspection-1.54:= python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_10(-)] ) ) media-plugins/grilo-plugins:0.3 media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( x11-libs/pango[introspection] >=dev-libs/libpeas-1.1.0[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/totem/3.38/totem-3.38.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=756348cc1584982488f14690dc5dd2e1
+_md5_=162046a4d7ac5ab60f19b94a4f92329c
diff --git a/metadata/md5-cache/media-video/v4l2loopback-0.12.5-r1 b/metadata/md5-cache/media-video/v4l2loopback-0.12.5-r1
index d4481150e8b8..ebf90830bea6 100644
--- a/metadata/md5-cache/media-video/v4l2loopback-0.12.5-r1
+++ b/metadata/md5-cache/media-video/v4l2loopback-0.12.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/umlaeute/v4l2loopback/archive/v0.12.5.tar.gz -> v4l2loopback-0.12.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=02b5be053888965f1a563550b8dbc2b8
diff --git a/metadata/md5-cache/media-video/v4l2loopback-9999 b/metadata/md5-cache/media-video/v4l2loopback-9999
index e306461ddd3d..9514388204a2 100644
--- a/metadata/md5-cache/media-video/v4l2loopback-9999
+++ b/metadata/md5-cache/media-video/v4l2loopback-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a6ecaa2e45e1b12c27631cea813a6698
diff --git a/metadata/md5-cache/media-video/vlc-3.0.14-r6 b/metadata/md5-cache/media-video/vlc-3.0.14-r6
deleted file mode 100644
index 04c5fba8f8cb..000000000000
--- a/metadata/md5-cache/media-video/vlc-3.0.14-r6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Media player and framework with support for most multimedia files and streaming
-EAPI=7
-HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +lua_single_target_lua5-1 test
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 -sparc x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
-REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
-RESTRICT=!test? ( test )
-SLOT=0/5-9
-SRC_URI=https://code.videolan.org/videolan/vlc-3.0/-/archive/3.0.14/vlc-3.0-3.0.14.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f6a39f63dd338d0cf7fca0ba9fc1d04b
diff --git a/metadata/md5-cache/media-video/vlc-3.0.14-r7 b/metadata/md5-cache/media-video/vlc-3.0.14-r7
new file mode 100644
index 000000000000..b66e9bf8ad43
--- /dev/null
+++ b/metadata/md5-cache/media-video/vlc-3.0.14-r7
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz:= virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Media player and framework with support for most multimedia files and streaming
+EAPI=7
+HOMEPAGE=https://www.videolan.org/vlc/
+IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +lua_single_target_lua5-1 test
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 -sparc x86
+LICENSE=LGPL-2.1 GPL-2
+RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz:= virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
+RESTRICT=!test? ( test )
+SLOT=0/5-9
+SRC_URI=https://code.videolan.org/videolan/vlc-3.0/-/archive/3.0.14/vlc-3.0-3.0.14.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=18608b1833f2fba8f51ba68b565c7a81
diff --git a/metadata/md5-cache/media-video/vlc-3.0.16-r6 b/metadata/md5-cache/media-video/vlc-3.0.16-r6
deleted file mode 100644
index 5217e4f5f505..000000000000
--- a/metadata/md5-cache/media-video/vlc-3.0.16-r6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Media player and framework with support for most multimedia files and streaming
-EAPI=7
-HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +lua_single_target_lua5-1 test
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv -sparc x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
-REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
-RESTRICT=!test? ( test )
-SLOT=0/5-9
-SRC_URI=https://get.videolan.org/vlc/3.0.16/vlc-3.0.16.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2349e184be858d7f49bd5f8d8d523c41
diff --git a/metadata/md5-cache/media-video/vlc-3.0.16-r7 b/metadata/md5-cache/media-video/vlc-3.0.16-r7
new file mode 100644
index 000000000000..44f5ab3d9e64
--- /dev/null
+++ b/metadata/md5-cache/media-video/vlc-3.0.16-r7
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz:= virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Media player and framework with support for most multimedia files and streaming
+EAPI=7
+HOMEPAGE=https://www.videolan.org/vlc/
+IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +lua_single_target_lua5-1 test
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv -sparc x86
+LICENSE=LGPL-2.1 GPL-2
+RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz:= virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2021.05.22:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
+RESTRICT=!test? ( test )
+SLOT=0/5-9
+SRC_URI=https://get.videolan.org/vlc/3.0.16/vlc-3.0.16.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1919d5a41f9a84fed25cfcf54a659690
diff --git a/metadata/md5-cache/media-video/vlc-3.0.9999 b/metadata/md5-cache/media-video/vlc-3.0.9999
index 84dab81a420e..435e22bd2d2e 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.9999
+++ b/metadata/md5-cache/media-video/vlc-3.0.9999
@@ -1,15 +1,15 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz:= virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer +gui ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +lua_single_target_lua5-1 test
 LICENSE=LGPL-2.1 GPL-2
 PROPERTIES=live
-RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz:= virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1a704ed21e6e6debf11c07921fc2e442
+_md5_=15f867ca2dc330cdc5b10446ae5eff27
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index 20e022c61019..20026fd6b0e7 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( >=media-libs/dav1d-0.5.0:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) loudness? ( >=media-libs/libebur128-1.2.4:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz:= virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( >=media-libs/dav1d-0.5.0:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) loudness? ( >=media-libs/libebur128-1.2.4:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer +gui ieee1394 jack jpeg kate kms libass libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc live loudness lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +lua_single_target_lua5-1 test
 LICENSE=LGPL-2.1 GPL-2
 PROPERTIES=live
-RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( >=media-libs/dav1d-0.5.0:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) loudness? ( >=media-libs/libebur128-1.2.4:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz:= virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( >=media-libs/dav1d-0.5.0:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:0= >=media-libs/libdvdread-6.1.2:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) loudness? ( >=media-libs/libebur128-1.2.4:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6] ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 RESTRICT=!test? ( test )
 SLOT=0/12-9
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=491c215b8915065057306a05a263bf41
+_md5_=897d76216c2d893622ec2bf270b75870
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.4 b/metadata/md5-cache/media-video/wireplumber-0.4.4
new file mode 100644
index 000000000000..fbe935b7f9e1
--- /dev/null
+++ b/metadata/md5-cache/media-video/wireplumber-0.4.4
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.37 virtual/libc elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+DESCRIPTION=Replacement for pipewire-media-session
+EAPI=7
+HOMEPAGE=https://gitlab.freedesktop.org/pipewire/wireplumber
+IUSE=elogind systemd test lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.37 virtual/libc elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0/0.4
+SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.4/wireplumber-0.4.4.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=04d0a328db1b2fd6a0f488990b8ab891
diff --git a/metadata/md5-cache/media-video/wireplumber-9999 b/metadata/md5-cache/media-video/wireplumber-9999
index 16ff0218fe36..97bc0a769160 100644
--- a/metadata/md5-cache/media-video/wireplumber-9999
+++ b/metadata/md5-cache/media-video/wireplumber-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst setup test unpack
-DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.32 virtual/libc systemd? ( sys-apps/systemd )
+DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.37 virtual/libc elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
 DESCRIPTION=Replacement for pipewire-media-session
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/pipewire/wireplumber
-IUSE=systemd test lua_single_target_lua5-3 lua_single_target_lua5-4
+IUSE=elogind systemd test lua_single_target_lua5-3 lua_single_target_lua5-4
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.32 virtual/libc systemd? ( sys-apps/systemd )
-REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 )
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.37 virtual/libc elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0e50fc258a7f81724906129ab4af4f3e
+_md5_=04d0a328db1b2fd6a0f488990b8ab891
diff --git a/metadata/md5-cache/media-video/xvattr-1.3-r3 b/metadata/md5-cache/media-video/xvattr-1.3-r3
index db208c0e9b20..931724a56137 100644
--- a/metadata/md5-cache/media-video/xvattr-1.3-r3
+++ b/metadata/md5-cache/media-video/xvattr-1.3-r3
@@ -1,7 +1,8 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXv x11-libs/libXext gtk? ( x11-libs/gtk+:2 ) x11-libs/libXt virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=x11-libs/libX11 x11-libs/libXv x11-libs/libXext gtk? ( x11-libs/gtk+:2 ) x11-libs/libXt
 DESCRIPTION=X11 XVideo Querying/Setting Tool from Ogle project
-EAPI=5
+EAPI=8
 HOMEPAGE=http://www.dtek.chalmers.se/groups/dvd
 IUSE=gtk
 KEYWORDS=~amd64 ~ppc ~x86
@@ -9,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXv x11-libs/libXext gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=http://www.dtek.chalmers.se/groups/dvd/dist/xvattr-1.3.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c87922d42150a1af14bae49ae1b9bc4f
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6f4dc5db7230fb559eb4818543e91f87
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 252af3ac5b85..aef7565fcf13 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/apinger-0.6.1 b/metadata/md5-cache/net-analyzer/apinger-0.6.1
index 1cefa9b046fd..689095704e0a 100644
--- a/metadata/md5-cache/net-analyzer/apinger-0.6.1
+++ b/metadata/md5-cache/net-analyzer/apinger-0.6.1
@@ -7,6 +7,6 @@ HOMEPAGE=https://github.com/Jajcus/apinger/
 KEYWORDS=~amd64
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/apinger-0.6.1.tar.gz
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/apinger-0.6.1.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d1e3fc26313be977b72b8dff039e7c60
+_md5_=e851a21613cf2ab2ed5d8ac98a912777
diff --git a/metadata/md5-cache/net-analyzer/arpoison-0.7 b/metadata/md5-cache/net-analyzer/arpoison-0.7
index 48fc2c165ec7..0285ddcce0cb 100644
--- a/metadata/md5-cache/net-analyzer/arpoison-0.7
+++ b/metadata/md5-cache/net-analyzer/arpoison-0.7
@@ -8,6 +8,6 @@ KEYWORDS=amd64 ~arm ppc ~riscv x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libnet:1.1
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/arpoison-0.7.tar.gz
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/arpoison-0.7.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=54345566122dbdf6145099685ae6ad94
+_md5_=886d67ddfa8f27729ad7926dcf60c3f5
diff --git a/metadata/md5-cache/net-analyzer/arpwatch-3.1-r4 b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r4
index bfb79f346f7b..f50186a76f47 100644
--- a/metadata/md5-cache/net-analyzer/arpwatch-3.1-r4
+++ b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r4
@@ -9,6 +9,6 @@ KEYWORDS=amd64 ~hppa ppc ~riscv sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=acct-group/arpwatch net-libs/libpcap sys-libs/ncurses:= acct-user/arpwatch selinux? ( sec-policy/selinux-arpwatch ) virtual/mta
 SLOT=0
-SRC_URI=https://ee.lbl.gov/downloads/arpwatch/arpwatch-3.1.tar.gz https://dev.gentoo.org/~jer/ethercodes.dat-20200628.xz
+SRC_URI=https://ee.lbl.gov/downloads/arpwatch/arpwatch-3.1.tar.gz https://dev.gentoo.org/~jsmolic/distfiles/ethercodes.dat-20200628.xz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c958e1dfb2571cbaed4d2868477036f8
+_md5_=cb190f5fa7e9c2b68bcd6b39701472eb
diff --git a/metadata/md5-cache/net-analyzer/barnyard-0.2.0-r7 b/metadata/md5-cache/net-analyzer/barnyard-0.2.0-r7
index ab3028a69d0f..7ba0fc3ed95f 100644
--- a/metadata/md5-cache/net-analyzer/barnyard-0.2.0-r7
+++ b/metadata/md5-cache/net-analyzer/barnyard-0.2.0-r7
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 -sparc ~x86
 LICENSE=QPL-1.0 GPL-2
 RDEPEND=net-libs/libpcap mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:*[server] ) sguil? ( dev-lang/tcl:0 ) net-analyzer/snort
 SLOT=0
-SRC_URI=mirror://sourceforge/barnyard/barnyard-0.2.0.tar.gz https://dev.gentoo.org/~jer/barnyard-0.2.0-patches.tar.xz
+SRC_URI=mirror://sourceforge/barnyard/barnyard-0.2.0.tar.gz https://dev.gentoo.org/~jsmolic/distfiles/barnyard-0.2.0-patches.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b231405a2a216ab196b15298b35d939a
+_md5_=62b305207b422174bc95bbfaa30f3e9e
diff --git a/metadata/md5-cache/net-analyzer/bigeye-0.3-r4 b/metadata/md5-cache/net-analyzer/bigeye-0.3-r4
index 9389fcf18c08..bbbb27df25ef 100644
--- a/metadata/md5-cache/net-analyzer/bigeye-0.3-r4
+++ b/metadata/md5-cache/net-analyzer/bigeye-0.3-r4
@@ -5,6 +5,6 @@ HOMEPAGE=http://violating.us/projects/bigeye/
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://violating.us/projects/bigeye/download/bigeye-0.3.tgz https://dev.gentoo.org/~jer/bigeye-0.3-gcc34.patch.xz
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/bigeye-0.3.tgz https://dev.gentoo.org/~jsmolic/distfiles/bigeye-0.3-gcc34.patch.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e19a338879629e16bb4e0752aa76d090
+_md5_=08f78f57d6ca69119bb954834f03bb1f
diff --git a/metadata/md5-cache/net-analyzer/bmon-4.0 b/metadata/md5-cache/net-analyzer/bmon-4.0
index d82ed459223d..53b15b44db86 100644
--- a/metadata/md5-cache/net-analyzer/bmon-4.0
+++ b/metadata/md5-cache/net-analyzer/bmon-4.0
@@ -10,5 +10,5 @@ LICENSE=BSD-2 MIT
 RDEPEND=>=sys-libs/ncurses-5.3-r2:0= dev-libs/confuse:= dev-libs/libnl:3
 SLOT=0
 SRC_URI=https://codeload.github.com/tgraf/bmon/tar.gz/v4.0 -> bmon-4.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f651b5f7d3d4b06808f479ae57177d5a
diff --git a/metadata/md5-cache/net-analyzer/bmon-999 b/metadata/md5-cache/net-analyzer/bmon-999
index dc891f3e19d9..e31ac4979cd1 100644
--- a/metadata/md5-cache/net-analyzer/bmon-999
+++ b/metadata/md5-cache/net-analyzer/bmon-999
@@ -9,5 +9,5 @@ LICENSE=BSD-2 MIT
 PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-5.3-r2:0= dev-libs/confuse:= dev-libs/libnl:3
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c08eda68d470598387fd53b33674f1e1
diff --git a/metadata/md5-cache/net-analyzer/cacti-1.2.16-r1 b/metadata/md5-cache/net-analyzer/cacti-1.2.16-r1
deleted file mode 100644
index 85c2137c36d6..000000000000
--- a/metadata/md5-cache/net-analyzer/cacti-1.2.16-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prerm setup
-DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Cacti is a complete frontend to rrdtool
-EAPI=7
-HOMEPAGE=https://www.cacti.net/
-IUSE=snmp doc vhosts
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[cli,mysql,pdo,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool[graph] virtual/cron snmp? ( >=net-analyzer/net-snmp-5.2.0 ) >=app-admin/webapp-config-1.50.15
-SLOT=1.2.16-r1
-SRC_URI=https://www.cacti.net/downloads/cacti-1.2.16.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=49cec2303826a8f0a73894e76ccf58be
diff --git a/metadata/md5-cache/net-analyzer/cnet-3.3.4 b/metadata/md5-cache/net-analyzer/cnet-3.3.4
index 06ae7d93d7f7..0b8dd16e1808 100644
--- a/metadata/md5-cache/net-analyzer/cnet-3.3.4
+++ b/metadata/md5-cache/net-analyzer/cnet-3.3.4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/tk-8.5 dev-libs/elfutils x11-libs/libX11
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/cnet-3.3.4.tgz
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/cnet-3.3.4.tgz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f9bd1d1f7f55c42fad3f9cbd03a2ae16
+_md5_=f612546caba53da75e098cb78857d9fc
diff --git a/metadata/md5-cache/net-analyzer/echoping-6.0.2_p434-r4 b/metadata/md5-cache/net-analyzer/echoping-6.0.2_p434-r4
index 873c3face30a..263022d9bfbe 100644
--- a/metadata/md5-cache/net-analyzer/echoping-6.0.2_p434-r4
+++ b/metadata/md5-cache/net-analyzer/echoping-6.0.2_p434-r4
@@ -11,6 +11,6 @@ RDEPEND=idn? ( net-dns/libidn ) ldap? ( net-nds/openldap ) postgres? ( dev-db/po
 REQUIRED_USE=gnutls? ( ssl )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/echoping-6.0.2_p434.tar.gz
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/echoping-6.0.2_p434.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=838ec80e7e73d70cbab341afd7751281
+_md5_=d458852b826f490190614e6f73371a90
diff --git a/metadata/md5-cache/net-analyzer/iplog-2.2.3-r3 b/metadata/md5-cache/net-analyzer/iplog-2.2.3-r3
index 600ef4c010b7..fa806fb07334 100644
--- a/metadata/md5-cache/net-analyzer/iplog-2.2.3-r3
+++ b/metadata/md5-cache/net-analyzer/iplog-2.2.3-r3
@@ -3,10 +3,10 @@ DEPEND=net-libs/libpcap
 DESCRIPTION=TCP/IP traffic logger
 EAPI=8
 HOMEPAGE=http://ojnk.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~mips ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~mips ppc sparc x86
 LICENSE=|| ( GPL-2 FDL-1.1 )
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/ojnk/iplog-2.2.3.tar.gz
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2c664ad87770c4981d4e73f05d71edbd
+_md5_=c12dd07d80d14ad192b126bd2a23f5b3
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r4 b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r4
index 546f24bdda03..b50b7551705b 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r4
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r4
@@ -11,6 +11,6 @@ RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0/40
-SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz https://dev.gentoo.org/~jer/net-snmp-5.9.tar.xz
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/net-snmp-5.7.3-patches-3.tar.xz https://dev.gentoo.org/~jsmolic/distfiles/net-snmp-5.9.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f931333fde8e5e738938c793eebf3935
+_md5_=6cb36d410e6c8865a698fa363a438354
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r5 b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r5
index 6c857adfdc2b..0e92ed353037 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r5
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r5
@@ -11,6 +11,6 @@ RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0/40
-SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz https://dev.gentoo.org/~jer/net-snmp-5.9.tar.xz
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/net-snmp-5.7.3-patches-3.tar.xz https://dev.gentoo.org/~jsmolic/distfiles/net-snmp-5.9.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c172cdb121d5118d2df4eb2d9f4dbc79
+_md5_=2218c431d401f8891c0133ae9b2e422c
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1 b/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1
index 3a1cc8dcb089..c3676c826c1e 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9.1-r1
@@ -11,6 +11,6 @@ RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0/40
-SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz https://github.com/net-snmp/net-snmp/archive/refs/tags/v5.9.1.tar.gz -> net-snmp-5.9.1.tar.gz
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/net-snmp-5.7.3-patches-3.tar.xz https://github.com/net-snmp/net-snmp/archive/refs/tags/v5.9.1.tar.gz -> net-snmp-5.9.1.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=14dcd0a47a0c0358cc90761f59c53559
+_md5_=5a60cb438fa30abaffa88de07a54ca61
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-99999999 b/metadata/md5-cache/net-analyzer/net-snmp-99999999
index ecca2b8bf61c..2bde9bd9b2c8 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-99999999
+++ b/metadata/md5-cache/net-analyzer/net-snmp-99999999
@@ -11,6 +11,6 @@ RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0/40
-SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/net-snmp-5.7.3-patches-3.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=95d7e525e06239df295800f22e5eed96
+_md5_=a49f27ff6a96b5bf1fa8cba16feff6cf
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.29.0 b/metadata/md5-cache/net-analyzer/netdata-1.29.0
index f15e96e13197..0bcba57a2a0e 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.29.0
+++ b/metadata/md5-cache/net-analyzer/netdata-1.29.0
@@ -11,5 +11,5 @@ RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 |
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/archive/v1.29.0.tar.gz -> netdata-1.29.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b526b9912ce1a0e640aa5ee9767c7992
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.29.1 b/metadata/md5-cache/net-analyzer/netdata-1.29.1
index 0c7380aeafd7..4bd1e143188a 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.29.1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.29.1
@@ -11,5 +11,5 @@ RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 |
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/archive/v1.29.1.tar.gz -> netdata-1.29.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b526b9912ce1a0e640aa5ee9767c7992
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.29.2 b/metadata/md5-cache/net-analyzer/netdata-1.29.2
index 0479456aefd8..47d2ea10a3a6 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.29.2
+++ b/metadata/md5-cache/net-analyzer/netdata-1.29.2
@@ -11,5 +11,5 @@ RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 |
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/archive/v1.29.2.tar.gz -> netdata-1.29.2.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b526b9912ce1a0e640aa5ee9767c7992
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.29.3 b/metadata/md5-cache/net-analyzer/netdata-1.29.3
index 52e48b33be09..55f57828449e 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.29.3
+++ b/metadata/md5-cache/net-analyzer/netdata-1.29.3
@@ -11,5 +11,5 @@ RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 |
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/archive/v1.29.3.tar.gz -> netdata-1.29.3.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b526b9912ce1a0e640aa5ee9767c7992
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.30.1-r1 b/metadata/md5-cache/net-analyzer/netdata-1.30.1-r1
index fb842c9658ad..84afeab1a514 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.30.1-r1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.30.1-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 |
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.30.1/netdata-v1.30.1.tar.gz -> netdata-1.30.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9ca26d731a2852c3d9b5f0ccccb3fed7
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.31.0 b/metadata/md5-cache/net-analyzer/netdata-1.31.0
index 7e25614790eb..a29d9d4fa1b8 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.31.0
+++ b/metadata/md5-cache/net-analyzer/netdata-1.31.0
@@ -11,5 +11,5 @@ RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 |
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.31.0/netdata-v1.31.0.tar.gz -> netdata-1.31.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dd90998344c38653eb46bd2e41777b5f
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.31.0-r1 b/metadata/md5-cache/net-analyzer/netdata-1.31.0-r1
index 16c0bccfa3e6..03f50de3ad09 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.31.0-r1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.31.0-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 |
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.31.0/netdata-v1.31.0.tar.gz -> netdata-1.31.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1a81dfd9e9768799703f438e550cf2f0
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.31.0-r2 b/metadata/md5-cache/net-analyzer/netdata-1.31.0-r2
index 748c068e39f8..aa85580beca8 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.31.0-r2
+++ b/metadata/md5-cache/net-analyzer/netdata-1.31.0-r2
@@ -11,5 +11,5 @@ RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 |
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.31.0/netdata-v1.31.0.tar.gz -> netdata-1.31.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a9f55c10953bfd6b37b01de07de33010
diff --git a/metadata/md5-cache/net-analyzer/netdata-9999 b/metadata/md5-cache/net-analyzer/netdata-9999
index 12d1f659a4ad..1d4ca9096267 100644
--- a/metadata/md5-cache/net-analyzer/netdata-9999
+++ b/metadata/md5-cache/net-analyzer/netdata-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) tor? ( python )
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a9f55c10953bfd6b37b01de07de33010
diff --git a/metadata/md5-cache/net-analyzer/netselect-0.4-r1 b/metadata/md5-cache/net-analyzer/netselect-0.4-r1
index 2c8e0faa7d2e..231a44ce3bae 100644
--- a/metadata/md5-cache/net-analyzer/netselect-0.4-r1
+++ b/metadata/md5-cache/net-analyzer/netselect-0.4-r1
@@ -6,6 +6,6 @@ IUSE=ipv6
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 SLOT=0
-SRC_URI=https://github.com/apenwarr/netselect/archive/netselect-0.4.tar.gz ipv6? ( https://dev.gentoo.org/~jer/netselect-0.4-ipv6.patch.xz )
+SRC_URI=https://github.com/apenwarr/netselect/archive/netselect-0.4.tar.gz ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/netselect-0.4-ipv6.patch.xz )
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bebddeffcd076da449dea6e1d9cde961
+_md5_=1249a2a3ca9d765c30c79981244c46d8
diff --git a/metadata/md5-cache/net-analyzer/netselect-0.4-r2 b/metadata/md5-cache/net-analyzer/netselect-0.4-r2
index 0d60e93c2b92..fad1f57c27ef 100644
--- a/metadata/md5-cache/net-analyzer/netselect-0.4-r2
+++ b/metadata/md5-cache/net-analyzer/netselect-0.4-r2
@@ -8,6 +8,6 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sp
 LICENSE=BSD
 RDEPEND=filecaps? ( sys-libs/libcap )
 SLOT=0
-SRC_URI=https://github.com/apenwarr/netselect/archive/netselect-0.4.tar.gz ipv6? ( https://dev.gentoo.org/~jer/netselect-0.4-ipv6.patch.xz )
+SRC_URI=https://github.com/apenwarr/netselect/archive/netselect-0.4.tar.gz ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/netselect-0.4-ipv6.patch.xz )
 _eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=18bda4746e5d04d5ac31ed718ad69eee
+_md5_=95a5eb0e4bb125a84f38f506d1906025
diff --git a/metadata/md5-cache/net-analyzer/netselect-9999 b/metadata/md5-cache/net-analyzer/netselect-9999
index 0502635cc896..9091f4df27f8 100644
--- a/metadata/md5-cache/net-analyzer/netselect-9999
+++ b/metadata/md5-cache/net-analyzer/netselect-9999
@@ -8,6 +8,6 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=filecaps? ( sys-libs/libcap )
 SLOT=0
-SRC_URI=ipv6? ( https://dev.gentoo.org/~jer/netselect-0.4-ipv6.patch.xz )
+SRC_URI=ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/netselect-0.4-ipv6.patch.xz )
 _eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c64a99c33267aed77e5b8e7cff7d5c42
+_md5_=41ee88d0ededbcfe6844e97f53a06496
diff --git a/metadata/md5-cache/net-analyzer/packit-1.7 b/metadata/md5-cache/net-analyzer/packit-1.7
index 748808a91d3e..a038518f105f 100644
--- a/metadata/md5-cache/net-analyzer/packit-1.7
+++ b/metadata/md5-cache/net-analyzer/packit-1.7
@@ -10,4 +10,4 @@ RDEPEND=net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=https://github.com/resurrecting-open-source-projects/packit/archive/1.7.tar.gz -> packit-1.7.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4f1ec69618fae6b35d00eb1ef9f88295
+_md5_=01e8eef01855cffcfebcb9b54df86a9d
diff --git a/metadata/md5-cache/net-analyzer/pathload-1.3.2-r1 b/metadata/md5-cache/net-analyzer/pathload-1.3.2-r1
index bfcdac3478c3..bb6302342c68 100644
--- a/metadata/md5-cache/net-analyzer/pathload-1.3.2-r1
+++ b/metadata/md5-cache/net-analyzer/pathload-1.3.2-r1
@@ -5,6 +5,6 @@ HOMEPAGE=https://www.cc.gatech.edu/fac/constantinos.dovrolis/bw-est/pathload.htm
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/pathload-1.3.2.tar.gz
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/pathload-1.3.2.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aec2e90a092bb0e81254cc9432fe72b8
+_md5_=e9cd48a35291f9e8641ff2403473f519
diff --git a/metadata/md5-cache/net-analyzer/scanlogd-2.2.8-r1 b/metadata/md5-cache/net-analyzer/scanlogd-2.2.8-r1
index fb50ed58a010..08720b7183b9 100644
--- a/metadata/md5-cache/net-analyzer/scanlogd-2.2.8-r1
+++ b/metadata/md5-cache/net-analyzer/scanlogd-2.2.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A port scan detection tool
 EAPI=7
 HOMEPAGE=https://www.openwall.com/scanlogd/
 IUSE=+nids pcap savedconfig
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ppc x86
 LICENSE=scanlogd GPL-2
 RDEPEND=nids? ( net-libs/libnids ) pcap? ( net-libs/libpcap ) acct-group/scanlogd acct-user/scanlogd
 REQUIRED_USE=?? ( nids pcap )
 SLOT=0
 SRC_URI=https://www.openwall.com/scanlogd/scanlogd-2.2.8.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=716b559a68aff0f13044f4a9f1c64a12
+_md5_=b67a0d499e846ad3ff0a80b402b37f91
diff --git a/metadata/md5-cache/net-analyzer/suricata-5.0.7-r2 b/metadata/md5-cache/net-analyzer/suricata-5.0.7-r2
index cc6d924b6496..3394d467fba7 100644
--- a/metadata/md5-cache/net-analyzer/suricata-5.0.7-r2
+++ b/metadata/md5-cache/net-analyzer/suricata-5.0.7-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-5.0.7.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fcdf6625f98cb5ef2382d97fbceaa7f9
diff --git a/metadata/md5-cache/net-analyzer/suricata-6.0.3-r2 b/metadata/md5-cache/net-analyzer/suricata-6.0.3-r2
index bfa3513e33ca..d5ab6b59d9ae 100644
--- a/metadata/md5-cache/net-analyzer/suricata-6.0.3-r2
+++ b/metadata/md5-cache/net-analyzer/suricata-6.0.3-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-6.0.3.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=84ef2e9117ef7169ca0bf9a18a76d189
diff --git a/metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p1 b/metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p1
index 49f1bc2fe430..5f0880d8257d 100644
--- a/metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p1
+++ b/metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p1
@@ -5,6 +5,6 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 ~arm ~ppc ~riscv x86
 LICENSE=BSD
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/traceroute-nanog_6.4.2.orig.tar.gz https://dev.gentoo.org/~jer/traceroute-nanog_6.4.2-1.diff.gz
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/traceroute-nanog_6.4.2.orig.tar.gz https://dev.gentoo.org/~jsmolic/distfiles/traceroute-nanog_6.4.2-1.diff.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6c7d166dc10aa0f709129345762a2225
+_md5_=3a952969bd8e2a75fa8da2a297985298
diff --git a/metadata/md5-cache/net-analyzer/ttcp-1.12-r2 b/metadata/md5-cache/net-analyzer/ttcp-1.12-r2
index c085fcf0c8cc..197341129da6 100644
--- a/metadata/md5-cache/net-analyzer/ttcp-1.12-r2
+++ b/metadata/md5-cache/net-analyzer/ttcp-1.12-r2
@@ -5,6 +5,6 @@ HOMEPAGE=http://ftp.arl.mil/~mike/ttcp.html http://www.netcore.fi/pekkas/linux/i
 KEYWORDS=~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=public-domain
 SLOT=0
-SRC_URI=mirror://gentoo/ttcp-1.12.tar.bz2 https://dev.gentoo.org/~jer/ttcp-1.12.c
+SRC_URI=mirror://gentoo/ttcp-1.12.tar.bz2 https://dev.gentoo.org/~jsmolic/distfiles/ttcp-1.12.c
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a7aa1b39377ff2b16519ffde5e98a1dd
+_md5_=20cee9b12ba045ec1037bf87941ce171
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.8 b/metadata/md5-cache/net-analyzer/wireshark-3.4.8
index de2066d24c3a..b71cc6ac8459 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.4.8
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.4.8
@@ -5,7 +5,7 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=7
 HOMEPAGE=https://www.wireshark.org/
 IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps +lua_single_target_lua5-1
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/3.4.8
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.4.8.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7d5f882f714be5d5eb7724f63c4b313e
+_md5_=7604cdbb6e3c7e18cbe4b845d6bfc93c
diff --git a/metadata/md5-cache/net-analyzer/zmap-2.1.1-r3 b/metadata/md5-cache/net-analyzer/zmap-2.1.1-r3
index b3534de0452a..052f958dcc9a 100644
--- a/metadata/md5-cache/net-analyzer/zmap-2.1.1-r3
+++ b/metadata/md5-cache/net-analyzer/zmap-2.1.1-r3
@@ -5,10 +5,10 @@ DESCRIPTION=Fast network scanner designed for Internet-wide network surveys
 EAPI=7
 HOMEPAGE=https://zmap.io/
 IUSE=mongo redis +filecaps
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:0 net-libs/libpcap dev-libs/json-c:= mongo? ( dev-db/mongodb dev-libs/mongo-c-driver ) redis? ( dev-libs/hiredis ) filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/zmap/zmap/archive/v2.1.1.tar.gz -> zmap-2.1.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=813bb1e11f4fe3ac7c36151f1ef9fe46
+_md5_=bc7d9f08632723d9413fe1a3a725c186
diff --git a/metadata/md5-cache/net-analyzer/zniper-1.0-r2 b/metadata/md5-cache/net-analyzer/zniper-1.0-r2
index 9dd432895414..7334b44ed263 100644
--- a/metadata/md5-cache/net-analyzer/zniper-1.0-r2
+++ b/metadata/md5-cache/net-analyzer/zniper-1.0-r2
@@ -7,6 +7,6 @@ KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=net-libs/libpcap sys-libs/ncurses:=
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/zniper-1.0.tgz
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/zniper-1.0.tgz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8e5b49a8bdbce863faf74b4b564bc3cc
+_md5_=70b370385ec679917604d620ee1c164f
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index a5abb0aac985..c32333eec9ec 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430 b/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
index e38ea54b2305..a6e4008f3afd 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
+++ b/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
@@ -12,5 +12,5 @@ RDEPEND=!libtomcrypt? ( dev-libs/openssl:0= ) libtomcrypt? ( dev-libs/libtomcryp
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) valgrind? ( debug )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/accel-ppp-1.12.0_p20210430.tar.bz2
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=aef4e5fb05bdef9f66608ed0ee59ecc5
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-9999 b/metadata/md5-cache/net-dialup/accel-ppp-9999
index 82a4ab80fe9a..2ab2985e7eab 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-9999
+++ b/metadata/md5-cache/net-dialup/accel-ppp-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=!libtomcrypt? ( dev-libs/openssl:0= ) libtomcrypt? ( dev-libs/libtomcrypt:0= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) postgres? ( dev-db/postgresql:* ) snmp? ( net-analyzer/net-snmp ) dev-libs/libpcre kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) valgrind? ( debug )
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3dbd579a08de4016eec7369a579625e1
diff --git a/metadata/md5-cache/net-dialup/linux-atm-2.5.2 b/metadata/md5-cache/net-dialup/linux-atm-2.5.2
index c7ecf4fa50e7..4683dfdbfbc1 100644
--- a/metadata/md5-cache/net-dialup/linux-atm-2.5.2
+++ b/metadata/md5-cache/net-dialup/linux-atm-2.5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-atm/linux-atm-2.5.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=25cb33bdc052d4639d0eb04401571e4e
diff --git a/metadata/md5-cache/net-dialup/openl2tp-1.8-r2 b/metadata/md5-cache/net-dialup/openl2tp-1.8-r2
index bf3fc8a61b54..ab9a2e4225b4 100644
--- a/metadata/md5-cache/net-dialup/openl2tp-1.8-r2
+++ b/metadata/md5-cache/net-dialup/openl2tp-1.8-r2
@@ -11,5 +11,5 @@ RDEPEND=>=net-dialup/ppp-2.4.5 >=net-libs/libtirpc-1.0.3 sys-libs/readline:= dma
 REQUIRED_USE=|| ( client server )
 SLOT=0
 SRC_URI=mirror://sourceforge/openl2tp/openl2tp-1.8.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8e4e3b66159800d82a9a267a7028ef85
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.9-r4 b/metadata/md5-cache/net-dialup/ppp-2.4.9-r4
index efe705c39c51..c7708e23a148 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.9-r4
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.9-r4
@@ -11,5 +11,5 @@ PDEPEND=net-dialup/ppp-scripts
 RDEPEND=dev-libs/openssl:0= virtual/libcrypt:= activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) gtk? ( x11-libs/gtk+:2 ) pam? ( sys-libs/pam ) !<net-misc/netifrc-0.7.1-r2
 SLOT=0/2.4.9
 SRC_URI=https://github.com/paulusmack/ppp/archive/ppp-2.4.9.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.9-patches-03.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b39e126c9f0f18196a9c4ddf5334b822
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.9-r5 b/metadata/md5-cache/net-dialup/ppp-2.4.9-r5
index 83648c3fa80c..ff1f5c216e81 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.9-r5
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.9-r5
@@ -11,5 +11,5 @@ PDEPEND=net-dialup/ppp-scripts
 RDEPEND=dev-libs/openssl:0= virtual/libcrypt:= activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) gtk? ( x11-libs/gtk+:2 ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) !<net-misc/netifrc-0.7.1-r2
 SLOT=0/2.4.9
 SRC_URI=https://github.com/paulusmack/ppp/archive/ppp-2.4.9.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.9-patches-03.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6fd865959d7829927cfb003169d43fb6
diff --git a/metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3 b/metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
index 0fecd54c249f..daa5854482df 100644
--- a/metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
+++ b/metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
@@ -9,5 +9,5 @@ LICENSE=SpeedTouch-USB-Firmware
 RDEPEND=net-dialup/ppp
 SLOT=0
 SRC_URI=http://www.speedtouch.com/download/drivers/USB/SpeedTouch330_firmware_3012.zip
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e40a517e19ffbd0f7f259dcc8336591a
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 56beb2b84cd4..1b787d99187f 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/avahi-0.8-r4 b/metadata/md5-cache/net-dns/avahi-0.8-r4
index 1425c4df6e6b..42cab20976e2 100644
--- a/metadata/md5-cache/net-dns/avahi-0.8-r4
+++ b/metadata/md5-cache/net-dns/avahi-0.8-r4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/glib-utils doc? ( app-doc/doxygen ) app-doc/xmltoman dev-util/intltool virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-libs/libdaemon dev-libs/libevent:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/expat dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gdbm? ( sys-libs/gdbm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 ) gtk? ( x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[gdbm] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[gdbm] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( bookmarks? ( >=dev-python/twisted-16.0.0[python_targets_python3_8(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( bookmarks? ( >=dev-python/twisted-16.0.0[python_targets_python3_9(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) ) )
+DEPEND=dev-libs/libdaemon dev-libs/libevent:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/expat dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gdbm? ( sys-libs/gdbm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 ) gtk? ( x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[gdbm] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[gdbm] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[gdbm] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( bookmarks? ( >=dev-python/twisted-16.0.0[python_targets_python3_8(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( bookmarks? ( >=dev-python/twisted-16.0.0[python_targets_python3_9(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( bookmarks? ( >=dev-python/twisted-16.0.0[python_targets_python3_10(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) ) )
 DESCRIPTION=System which facilitates service discovery on a local network
 EAPI=7
 HOMEPAGE=https://avahi.org/
-IUSE=autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux systemd test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9
+IUSE=autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux systemd test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=acct-user/avahi acct-group/avahi acct-group/netdev autoipd? ( acct-user/avahi-autoipd acct-group/avahi-autoipd ) dev-libs/libdaemon dev-libs/libevent:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/expat dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gdbm? ( sys-libs/gdbm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 ) gtk? ( x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[gdbm] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[gdbm] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( bookmarks? ( >=dev-python/twisted-16.0.0[python_targets_python3_8(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( bookmarks? ( >=dev-python/twisted-16.0.0[python_targets_python3_9(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) ) ) selinux? ( sec-policy/selinux-avahi )
-REQUIRED_USE=python? ( dbus gdbm ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) bookmarks? ( python ) mono? ( dbus ) howl-compat? ( dbus ) mdnsresponder-compat? ( dbus ) systemd? ( dbus )
+RDEPEND=acct-user/avahi acct-group/avahi acct-group/netdev autoipd? ( acct-user/avahi-autoipd acct-group/avahi-autoipd ) dev-libs/libdaemon dev-libs/libevent:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/expat dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gdbm? ( sys-libs/gdbm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 ) gtk? ( x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[gdbm] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[gdbm] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[gdbm] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( bookmarks? ( >=dev-python/twisted-16.0.0[python_targets_python3_8(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( bookmarks? ( >=dev-python/twisted-16.0.0[python_targets_python3_9(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( bookmarks? ( >=dev-python/twisted-16.0.0[python_targets_python3_10(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) ) ) selinux? ( sec-policy/selinux-avahi )
+REQUIRED_USE=python? ( dbus gdbm ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) bookmarks? ( python ) mono? ( dbus ) howl-compat? ( dbus ) mdnsresponder-compat? ( dbus ) systemd? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lathiat/avahi/archive/v0.8.tar.gz -> avahi-0.8.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3db2ae3576b0da31ecc00dc212872fc2
+_md5_=fa86181167c3b1329675ef8dc839c793
diff --git a/metadata/md5-cache/net-dns/nsd-4.3.6 b/metadata/md5-cache/net-dns/nsd-4.3.6
deleted file mode 100644
index 3ffcfd1a282a..000000000000
--- a/metadata/md5-cache/net-dns/nsd-4.3.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc systemd? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
-DESCRIPTION=An authoritative only, high performance, open source name server
-EAPI=7
-HOMEPAGE=http://www.nlnetlabs.nl/projects/nsd
-IUSE=bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.6.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=656d1eb9fe615e9c65efb4fe548dd25c
diff --git a/metadata/md5-cache/net-dns/nsd-4.3.7 b/metadata/md5-cache/net-dns/nsd-4.3.7
index 093639cb5a63..7ee877ca340d 100644
--- a/metadata/md5-cache/net-dns/nsd-4.3.7
+++ b/metadata/md5-cache/net-dns/nsd-4.3.7
@@ -5,10 +5,10 @@ DESCRIPTION=An authoritative only, high performance, open source name server
 EAPI=7
 HOMEPAGE=http://www.nlnetlabs.nl/projects/nsd
 IUSE=bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.7.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0841529ca81e3db977e5a63e08583e9e
+_md5_=656d1eb9fe615e9c65efb4fe548dd25c
diff --git a/metadata/md5-cache/net-dns/nsd-4.3.8 b/metadata/md5-cache/net-dns/nsd-4.3.8
new file mode 100644
index 000000000000..eb91374b315c
--- /dev/null
+++ b/metadata/md5-cache/net-dns/nsd-4.3.8
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/flex virtual/yacc systemd? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
+DESCRIPTION=An authoritative only, high performance, open source name server
+EAPI=8
+HOMEPAGE=http://www.nlnetlabs.nl/projects/nsd
+IUSE=bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd )
+SLOT=0
+SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.8.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6d42e43a1bc093820c4df5abb18ea3b2
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.5.6 b/metadata/md5-cache/net-dns/pdns-recursor-4.5.6
new file mode 100644
index 000000000000..f6cbd4a0ed7a
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.5.6
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dnstap? ( dev-libs/fstrm ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) dev-libs/openssl:= >=dev-libs/boost-1.35:=
+DESCRIPTION=The PowerDNS Recursor
+EAPI=7
+HOMEPAGE=https://www.powerdns.com/
+IUSE=debug dnstap snmp sodium systemd test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dnstap? ( dev-libs/fstrm ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) dev-libs/openssl:= >=dev-libs/boost-1.35:= !<net-dns/pdns-2.9.20-r1 acct-user/pdns acct-group/pdns
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.5.6.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b3888fa50ebdbf5cc62b38f6896666ef
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index f7e491a18497..60024d89b09e 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.5 b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.5
index 360a4aae6569..271182b1da9d 100644
--- a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.5
+++ b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_conntrack-1.0.7 cthelper? ( >=net-libs/libnetfilter_cthelper-1.0.0 ) cttimeout? ( >=net-libs/libnetfilter_cttimeout-1.0.0 ) >=net-libs/libnetfilter_queue-1.0.2 >=net-libs/libnfnetlink-1.0.1 !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc )
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.5.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e564bc589a9f04d9251b7bc3b2f72293
diff --git a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1 b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1
index 9e88c33aa7c2..0f0109bbf43e 100644
--- a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1
+++ b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_conntrack-1.0.8 >=net-libs/libnetfilter_queue-1.0.2 >=net-libs/libnfnetlink-1.0.1 net-libs/libtirpc cthelper? ( >=net-libs/libnetfilter_cthelper-1.0.0 ) cttimeout? ( >=net-libs/libnetfilter_cttimeout-1.0.0 ) systemd? ( >=sys-apps/systemd-227 )
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.6.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17914775ed64657d8a808a21e657967b
diff --git a/metadata/md5-cache/net-firewall/firehol-3.1.6-r2 b/metadata/md5-cache/net-firewall/firehol-3.1.6-r2
index 53db4aecc336..3186a05ab8cd 100644
--- a/metadata/md5-cache/net-firewall/firehol-3.1.6-r2
+++ b/metadata/md5-cache/net-firewall/firehol-3.1.6-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables sys-apps/iproute2[-minimal,ipv6?] sys-apps/kmod[tools] net-misc/iputils[ipv6?] net-misc/iprange net-analyzer/traceroute app-arch/gzip ipset? ( net-firewall/ipset )
 SLOT=0
 SRC_URI=https://github.com/firehol/firehol/releases/download/v3.1.6/firehol-3.1.6.tar.xz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=34f09675baf03e71b3a6cd07fd49b159
diff --git a/metadata/md5-cache/net-firewall/firehol-3.1.7 b/metadata/md5-cache/net-firewall/firehol-3.1.7
index 01ca29837769..f3ed823c7911 100644
--- a/metadata/md5-cache/net-firewall/firehol-3.1.7
+++ b/metadata/md5-cache/net-firewall/firehol-3.1.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables sys-apps/iproute2[-minimal,ipv6?] sys-apps/kmod[tools] net-misc/iputils[ipv6?] net-misc/iprange net-analyzer/traceroute app-arch/gzip ipset? ( net-firewall/ipset )
 SLOT=0
 SRC_URI=https://github.com/firehol/firehol/releases/download/v3.1.7/firehol-3.1.7.tar.xz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f56005aa9963ca69a44ec82f63cfb422
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.9.1-r1 b/metadata/md5-cache/net-firewall/firewalld-0.9.1-r1
index 7669490ad679..1713cfa9d2da 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.9.1-r1
+++ b/metadata/md5-cache/net-firewall/firewalld-0.9.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firewalld/firewalld/archive/v0.9.1.tar.gz -> firewalld-0.9.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6446de7303c723dccf777a7b855f30e2
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.9.3-r1 b/metadata/md5-cache/net-firewall/firewalld-0.9.3-r1
index db21148d8833..78de7205c4aa 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.9.3-r1
+++ b/metadata/md5-cache/net-firewall/firewalld-0.9.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firewalld/firewalld/archive/v0.9.3.tar.gz -> firewalld-0.9.3.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ee12179e13d555a3fdd81fd595c847b1
diff --git a/metadata/md5-cache/net-firewall/firewalld-1.0.1 b/metadata/md5-cache/net-firewall/firewalld-1.0.1
index b8cda4706765..52e5c4a924cb 100644
--- a/metadata/md5-cache/net-firewall/firewalld-1.0.1
+++ b/metadata/md5-cache/net-firewall/firewalld-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firewalld/firewalld/archive/v1.0.1.tar.gz -> firewalld-1.0.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=43aa1f0d35645e680b2eee331a04d6a8
diff --git a/metadata/md5-cache/net-firewall/fwbuilder-6.0.0_rc1 b/metadata/md5-cache/net-firewall/fwbuilder-6.0.0_rc1
index 91774eea4c9f..ffd5c4cf8924 100644
--- a/metadata/md5-cache/net-firewall/fwbuilder-6.0.0_rc1
+++ b/metadata/md5-cache/net-firewall/fwbuilder-6.0.0_rc1
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 net-analyzer/net-snmp test? ( dev-qt/qttest:5 )
 DESCRIPTION=A firewall management GUI for iptables, PF, Cisco routers and more
 EAPI=7
 HOMEPAGE=https://github.com/fwbuilder/fwbuilder
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+IUSE=test test
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 net-analyzer/net-snmp
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/fwbuilder/fwbuilder/archive/refs/tags/v6.0.0-rc1.tar.gz -> fwbuilder-6.0.0_rc1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c8cccd8d99d6971cccc7cd88c194d096
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=30f00b8f571661b8ba31446f6c375ec7
diff --git a/metadata/md5-cache/net-firewall/fwknop-2.6.10-r2 b/metadata/md5-cache/net-firewall/fwknop-2.6.10-r2
index c7ee70c6fb6f..b8fae95c391e 100644
--- a/metadata/md5-cache/net-firewall/fwknop-2.6.10-r2
+++ b/metadata/md5-cache/net-firewall/fwknop-2.6.10-r2
@@ -11,5 +11,5 @@ RDEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld ) gdb
 REQUIRED_USE=nfqueue? ( server ) server? ( ^^ ( firewalld iptables ) ) udp-server? ( server )
 SLOT=0
 SRC_URI=https://www.cipherdyne.org/fwknop/download/fwknop-2.6.10.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=29690a7e3c17286052b58be259a88d2b
diff --git a/metadata/md5-cache/net-firewall/ipset-7.11-r1 b/metadata/md5-cache/net-firewall/ipset-7.11-r1
index 8d286f8c7225..21806181aad6 100644
--- a/metadata/md5-cache/net-firewall/ipset-7.11-r1
+++ b/metadata/md5-cache/net-firewall/ipset-7.11-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl:= modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://ipset.netfilter.org/ipset-7.11.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fd251eec5abf386451d7cb839fc131de
diff --git a/metadata/md5-cache/net-firewall/ipset-7.15 b/metadata/md5-cache/net-firewall/ipset-7.15
index e5a73e1a97bf..3d0319b3b5ef 100644
--- a/metadata/md5-cache/net-firewall/ipset-7.15
+++ b/metadata/md5-cache/net-firewall/ipset-7.15
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl:= modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://ipset.netfilter.org/ipset-7.15.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8b05bb81c5b368657fbfd25eb459d7a6
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.6 b/metadata/md5-cache/net-firewall/ipt_netflow-2.6
index eca4fe48cb4e..7794479614b9 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.6
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-2.6
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/aabc/ipt-netflow/archive/v2.6.tar.gz -> ipt_netflow-2.6.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=89b0918337a2a84b07332ac17c770527
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-9999 b/metadata/md5-cache/net-firewall/ipt_netflow-9999
index ad1a34e868ea..0a8bec693bd1 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-9999
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=net-firewall/iptables:0= snmp? ( net-analyzer/net-snmp ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=49f9591580f69903667cee4ce153bde7
diff --git a/metadata/md5-cache/net-firewall/nfacct-1.0.2 b/metadata/md5-cache/net-firewall/nfacct-1.0.2
index 75982ecfd7f7..2ba623d2cba3 100644
--- a/metadata/md5-cache/net-firewall/nfacct-1.0.2
+++ b/metadata/md5-cache/net-firewall/nfacct-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl >=net-libs/libnetfilter_acct-1.0.3
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/nfacct/files/nfacct-1.0.2.tar.bz2
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7d803902867a872e9568c5c8a4003eb8
diff --git a/metadata/md5-cache/net-firewall/nftables-0.9.8-r1 b/metadata/md5-cache/net-firewall/nftables-0.9.8-r1
index f0f76832778d..2e8864b5b62f 100644
--- a/metadata/md5-cache/net-firewall/nftables-0.9.8-r1
+++ b/metadata/md5-cache/net-firewall/nftables-0.9.8-r1
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.1.9:0= gmp? ( dev-libs/
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://netfilter.org/projects/nftables/files/nftables-0.9.8.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fb2f55e91682ce207a7b4ce26491b986
diff --git a/metadata/md5-cache/net-firewall/nftables-0.9.9 b/metadata/md5-cache/net-firewall/nftables-0.9.9
index 306a14778825..8f3724dcad9b 100644
--- a/metadata/md5-cache/net-firewall/nftables-0.9.9
+++ b/metadata/md5-cache/net-firewall/nftables-0.9.9
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.0:0= gmp? ( dev-libs/
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) libedit? ( !readline )
 SLOT=0/1
 SRC_URI=https://netfilter.org/projects/nftables/files/nftables-0.9.9.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=96626ad26a40f16a93d4bb5ea1317d6f
diff --git a/metadata/md5-cache/net-firewall/nftables-1.0.0 b/metadata/md5-cache/net-firewall/nftables-1.0.0
index 8b177cba3302..65752ecb2304 100644
--- a/metadata/md5-cache/net-firewall/nftables-1.0.0
+++ b/metadata/md5-cache/net-firewall/nftables-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.0:0= gmp? ( dev-libs/
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) libedit? ( !readline )
 SLOT=0/1
 SRC_URI=https://netfilter.org/projects/nftables/files/nftables-1.0.0.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=b2c18fe43b4e56cb65b5e0e4cf959b9d
diff --git a/metadata/md5-cache/net-firewall/nftables-9999 b/metadata/md5-cache/net-firewall/nftables-9999
index 18ce65f8fa29..3bea7889a362 100644
--- a/metadata/md5-cache/net-firewall/nftables-9999
+++ b/metadata/md5-cache/net-firewall/nftables-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.0:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) readline? ( sys-libs/readline:0= ) xtables? ( >=net-firewall/iptables-1.6.1 )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) libedit? ( !readline )
 SLOT=0/1
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9f94c8569f50d57081c7d452dbcc21f4
diff --git a/metadata/md5-cache/net-firewall/nftlb-0.6 b/metadata/md5-cache/net-firewall/nftlb-0.6
index e0948793a17b..211c3eb7d765 100644
--- a/metadata/md5-cache/net-firewall/nftlb-0.6
+++ b/metadata/md5-cache/net-firewall/nftlb-0.6
@@ -11,5 +11,5 @@ RDEPEND=net-firewall/nftables:=[modern-kernel] dev-libs/jansson:= dev-libs/libev
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zevenet/nftlb/archive/v0.6.tar.gz -> nftlb-0.6.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac400f553096573b5598cf6747051b93
diff --git a/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006-r1 b/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006-r1
index c013d332614a..3d50e53edfa1 100644
--- a/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006-r1
+++ b/metadata/md5-cache/net-firewall/pglinux-2.3.1_p20171006-r1
@@ -11,5 +11,5 @@ RDEPEND=net-libs/libnetfilter_queue net-libs/libnfnetlink dbus? ( sys-apps/dbus
 REQUIRED_USE=qt5? ( dbus )
 SLOT=0
 SRC_URI=https://sourceforge.net/code-snapshots/git/p/pe/peerguardian/code.git/peerguardian-code-9d91ab6a8e6bc2b41e985aa698eb5c1eb364fea8.zip -> pglinux-2.3.1_p20171006.zip
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=96fe10e244222633743b2ed3c6508ebc
diff --git a/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3 b/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3
index 4d4fa3e25eb8..64d8b7da0616 100644
--- a/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3
+++ b/metadata/md5-cache/net-firewall/rtsp-conntrack-5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/maru-sama/rtsp-linux/archive/5.3.tar.gz -> rtsp-conntrack-5.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fcadb9d967f4d32041f708bee83655ae
diff --git a/metadata/md5-cache/net-firewall/sanewall-1.1.6-r3 b/metadata/md5-cache/net-firewall/sanewall-1.1.6-r3
index 839806c873a4..8c76c7f96cd7 100644
--- a/metadata/md5-cache/net-firewall/sanewall-1.1.6-r3
+++ b/metadata/md5-cache/net-firewall/sanewall-1.1.6-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=net-firewall/iptables[ipv6] sys-apps/iproute2[-minimal] sys-apps/kmod[tools] sys-apps/net-tools || ( net-misc/wget net-misc/curl )
 SLOT=0
 SRC_URI=https://download.sanewall.org/releases/1.1.6/sanewall-1.1.6.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5ffd28ae5af36acdf220b0fac81ba78f
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.8 b/metadata/md5-cache/net-firewall/shorewall-5.2.8
index 07bb87675896..12d3ed851c36 100644
--- a/metadata/md5-cache/net-firewall/shorewall-5.2.8
+++ b/metadata/md5-cache/net-firewall/shorewall-5.2.8
@@ -10,5 +10,5 @@ RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys
 REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
 SLOT=0
 SRC_URI=https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-core-5.2.8.tar.bz2 ipv4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-5.2.8.tar.bz2 ) ipv6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall6-5.2.8.tar.bz2 ) lite4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-lite-5.2.8.tar.bz2 ) lite6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall6-lite-5.2.8.tar.bz2 ) init? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-init-5.2.8.tar.bz2 ) doc? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-docs-html-5.2.8.tar.bz2 )
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1e25f32ed82400cd5f5be80d9e26cddf
diff --git a/metadata/md5-cache/net-firewall/ufw-0.36 b/metadata/md5-cache/net-firewall/ufw-0.36
index 0839147dfddd..124a8e94805b 100644
--- a/metadata/md5-cache/net-firewall/ufw-0.36
+++ b/metadata/md5-cache/net-firewall/ufw-0.36
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/ufw/0.36/0.36/+download/ufw-0.36.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0080ce8bc553768c006f49fd2dc915ad
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.13 b/metadata/md5-cache/net-firewall/xtables-addons-3.13
index f272938ea7d1..7f8d65977581 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.13
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://inai.de/files/xtables-addons/xtables-addons-3.13.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bfc52e2192755aacf546455ca8e360c9
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.18 b/metadata/md5-cache/net-firewall/xtables-addons-3.18
index 8cd27ae808b6..d3b972040b90 100644
--- a/metadata/md5-cache/net-firewall/xtables-addons-3.18
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://inai.de/files/xtables-addons/xtables-addons-3.18.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ed99e5010d70e6e5446bbd39e13b3919
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index a063ccec2b94..0704b7ee7c6a 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/autofs-5.1.6-r2 b/metadata/md5-cache/net-fs/autofs-5.1.6-r2
index f00990898d97..960e660e6e99 100644
--- a/metadata/md5-cache/net-fs/autofs-5.1.6-r2
+++ b/metadata/md5-cache/net-fs/autofs-5.1.6-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libnsl:= >=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) systemd? ( sys-apps/systemd ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-5.1.6.tar.xz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cc78f83ef545df3f738bfc749b4de1be
diff --git a/metadata/md5-cache/net-fs/autofs-5.1.7-r1 b/metadata/md5-cache/net-fs/autofs-5.1.7-r1
index a9c73fc941e2..21f7a5e98234 100644
--- a/metadata/md5-cache/net-fs/autofs-5.1.7-r1
+++ b/metadata/md5-cache/net-fs/autofs-5.1.7-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libnsl:= >=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) systemd? ( sys-apps/systemd ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-5.1.7.tar.xz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=63fb63efc435e4d679f74ccc7c83ae96
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4fe4348daf8e1d7d1525dc380b95deb2
diff --git a/metadata/md5-cache/net-fs/cifs-utils-6.13-r1 b/metadata/md5-cache/net-fs/cifs-utils-6.13-r1
index 16202ed9f29c..5fab41dab686 100644
--- a/metadata/md5-cache/net-fs/cifs-utils-6.13-r1
+++ b/metadata/md5-cache/net-fs/cifs-utils-6.13-r1
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=acl? ( ads ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.13.tar.bz2 https://dev.gentoo.org/~polynomial-c/cifs-utils-6.13-kerberos_mount_regression_fix.patch.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=66482a021f8e2d499e34af14da9bc492
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.8.1-r1 b/metadata/md5-cache/net-fs/cvmfs-2.8.1-r1
index db189686837c..5492dbd6a047 100644
--- a/metadata/md5-cache/net-fs/cvmfs-2.8.1-r1
+++ b/metadata/md5-cache/net-fs/cvmfs-2.8.1-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= <dev-libs/leveldb-1.23:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
 SLOT=0
 SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.8.1/source.tar.gz -> cvmfs-2.8.1.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=49c4c0545739f8fa28bc59697ee36cff
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.8.2 b/metadata/md5-cache/net-fs/cvmfs-2.8.2
index 876bd5e53385..96455fe4f1e3 100644
--- a/metadata/md5-cache/net-fs/cvmfs-2.8.2
+++ b/metadata/md5-cache/net-fs/cvmfs-2.8.2
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= <dev-libs/leveldb-1.23:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
 SLOT=0
 SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.8.2/source.tar.gz -> cvmfs-2.8.2.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=66452b728fba67b0818cf1db8d18e93c
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.5.3-r2 b/metadata/md5-cache/net-fs/nfs-utils-2.5.3-r2
index b5341cf1f5af..c96e91795247 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-2.5.3-r2
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.5.3-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=kerberos? ( nfsv4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.5.3.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d6b9b3fee86dbab6a988f94327a3ece6
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.5.4-r1 b/metadata/md5-cache/net-fs/nfs-utils-2.5.4-r1
deleted file mode 100644
index 98087438cd68..000000000000
--- a/metadata/md5-cache/net-fs/nfs-utils-2.5.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=net-libs/rpcsvc-proto virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-db/sqlite:3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux )
-DESCRIPTION=NFS client and server daemons
-EAPI=7
-HOMEPAGE=http://linux-nfs.org/
-IUSE=caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-db/sqlite:3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap !net-nds/portmap !<sys-apps/openrc-0.13.9 selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
-REQUIRED_USE=kerberos? ( nfsv4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.5.4.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0f0a8c7488c0963e866c765118490fab
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.5.4-r2 b/metadata/md5-cache/net-fs/nfs-utils-2.5.4-r2
new file mode 100644
index 000000000000..a5cd50b5dd3d
--- /dev/null
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.5.4-r2
@@ -0,0 +1,16 @@
+BDEPEND=net-libs/rpcsvc-proto virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-db/sqlite:3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux )
+DESCRIPTION=NFS client and server daemons
+EAPI=7
+HOMEPAGE=http://linux-nfs.org/
+IUSE=caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid kernel_linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite:3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap !net-nds/portmap !<sys-apps/openrc-0.13.9 selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
+REQUIRED_USE=kerberos? ( nfsv4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.5.4.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9a652faa3974dc967a502df6305a8723
diff --git a/metadata/md5-cache/net-fs/openafs-1.8.7 b/metadata/md5-cache/net-fs/openafs-1.8.7
index 8d4f16990400..febb1c5d1c21 100644
--- a/metadata/md5-cache/net-fs/openafs-1.8.7
+++ b/metadata/md5-cache/net-fs/openafs-1.8.7
@@ -10,5 +10,5 @@ LICENSE=IBM BSD openafs-krb5-a APSL-2
 RDEPEND=!net-fs/openafs-kernel virtual/libintl amd64? ( tsm? ( app-backup/tsm ) ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 ) fuse? ( sys-fs/fuse:0= ) kauth? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://openafs.org/dl/openafs/1.8.7/openafs-1.8.7-src.tar.bz2 https://openafs.org/dl/openafs/1.8.7/openafs-1.8.7-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20210116.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=68eb8364c85a0732d770855a425dc2d2
diff --git a/metadata/md5-cache/net-fs/samba-4.13.10-r2 b/metadata/md5-cache/net-fs/samba-4.13.10-r2
index 73b5e5830019..7d0ddcd3b294 100644
--- a/metadata/md5-cache/net-fs/samba-4.13.10-r2
+++ b/metadata/md5-cache/net-fs/samba-4.13.10-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.13.10.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3b3c2d69f030160d4798ecf8ed9c454a
diff --git a/metadata/md5-cache/net-fs/samba-4.13.11-r1 b/metadata/md5-cache/net-fs/samba-4.13.11-r1
index 6668ee89a8f9..fdf6ad567874 100644
--- a/metadata/md5-cache/net-fs/samba-4.13.11-r1
+++ b/metadata/md5-cache/net-fs/samba-4.13.11-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.13.11.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3b3c2d69f030160d4798ecf8ed9c454a
diff --git a/metadata/md5-cache/net-fs/samba-4.13.9-r3 b/metadata/md5-cache/net-fs/samba-4.13.9-r3
index aecaf846bc14..62d1e839aebd 100644
--- a/metadata/md5-cache/net-fs/samba-4.13.9-r3
+++ b/metadata/md5-cache/net-fs/samba-4.13.9-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.13.9.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3fec50d3d74bc11d0a1c0d0871d5669f
diff --git a/metadata/md5-cache/net-fs/samba-4.14.6-r2 b/metadata/md5-cache/net-fs/samba-4.14.6-r2
index bb1f786a55be..045d27578400 100644
--- a/metadata/md5-cache/net-fs/samba-4.14.6-r2
+++ b/metadata/md5-cache/net-fs/samba-4.14.6-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.14.6.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=984eb531ff4305dc3cfff50fae3d8181
diff --git a/metadata/md5-cache/net-fs/samba-4.14.7-r1 b/metadata/md5-cache/net-fs/samba-4.14.7-r1
index 1497e24b8776..ac9646e3d7d7 100644
--- a/metadata/md5-cache/net-fs/samba-4.14.7-r1
+++ b/metadata/md5-cache/net-fs/samba-4.14.7-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.14.7.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=984eb531ff4305dc3cfff50fae3d8181
diff --git a/metadata/md5-cache/net-fs/samba-4.15.0-r1 b/metadata/md5-cache/net-fs/samba-4.15.0-r1
index 701ced4fbc95..e925867d62f5 100644
--- a/metadata/md5-cache/net-fs/samba-4.15.0-r1
+++ b/metadata/md5-cache/net-fs/samba-4.15.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.15.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1821527f9fca9b15705c647074ef3001
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 5e5c688374f5..034b6de14db2 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.56.0 b/metadata/md5-cache/net-ftp/filezilla-3.56.0
new file mode 100644
index 000000000000..c941f0e24b54
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/filezilla-3.56.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.34.0:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) test? ( >=dev-util/cppunit-1.13.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=FTP client with lots of useful features and an intuitive interface
+EAPI=7
+HOMEPAGE=https://filezilla-project.org/
+IUSE=dbus nls test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.34.0:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.56.0_src.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f52665e8c3b7c1c9d6627474ef3ea0f6
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.7c b/metadata/md5-cache/net-ftp/proftpd-1.3.7c
new file mode 100644
index 000000000000..1e2cdbe0b5ed
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.7c
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=virtual/libcrypt:= acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) test? ( dev-libs/check )
+DESCRIPTION=An advanced and very configurable FTP server
+EAPI=7
+HOMEPAGE=http://www.proftpd.org/ http://www.castaglia.org/proftpd/ https://github.com/jbenden/mod_clamav http://gssmod.sourceforge.net/
+IUSE=acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/libcrypt:= acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) virtual/tmpfiles
+REQUIRED_USE=ban? ( ctrls ) msg? ( ctrls ) sftp? ( ssl ) shaper? ( ctrls ) mysql? ( ssl ) postgres? ( ssl ) sqlite? ( ssl )
+RESTRICT=test
+SLOT=0
+SRC_URI=ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.7c.tar.gz case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.7.tar.gz ) clamav? ( https://github.com/jbenden/mod_clamav/archive/v0.14rc2.tar.gz -> proftpd-mod_clamav-0.14rc2.tar.gz ) diskuse? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-diskuse-0.9.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.9.tar.gz ) msg? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-msg-0.4.1.tar.gz ) vroot? ( https://github.com/Castaglia/proftpd-mod_vroot/archive/v0.9.4.tar.gz -> mod_vroot-0.9.4.tar.gz )
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=eb47fd8231dc77e4f354a9e026539b15
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.8_rc2 b/metadata/md5-cache/net-ftp/proftpd-1.3.8_rc2
new file mode 100644
index 000000000000..d24abde5b708
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.8_rc2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=virtual/libcrypt:= acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) test? ( dev-libs/check )
+DESCRIPTION=An advanced and very configurable FTP server
+EAPI=7
+HOMEPAGE=http://www.proftpd.org/ http://www.castaglia.org/proftpd/ https://github.com/jbenden/mod_clamav http://gssmod.sourceforge.net/
+IUSE=acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/libcrypt:= acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) virtual/tmpfiles
+REQUIRED_USE=ban? ( ctrls ) msg? ( ctrls ) sftp? ( ssl ) shaper? ( ctrls ) mysql? ( ssl ) postgres? ( ssl ) sqlite? ( ssl )
+RESTRICT=test
+SLOT=0
+SRC_URI=ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.8rc2.tar.gz case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.7.tar.gz ) clamav? ( https://github.com/jbenden/mod_clamav/archive/v0.14rc2.tar.gz -> proftpd-mod_clamav-0.14rc2.tar.gz ) diskuse? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-diskuse-0.9.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.9.tar.gz ) msg? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-msg-0.4.1.tar.gz ) vroot? ( https://github.com/Castaglia/proftpd-mod_vroot/archive/v0.9.4.tar.gz -> mod_vroot-0.9.4.tar.gz )
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1517f2425ae0c5516a94081b292164e5
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.49-r5 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.49-r5
index 55284472f5cc..f875503d0292 100644
--- a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.49-r5
+++ b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.49-r5
@@ -5,11 +5,11 @@ DESCRIPTION=Fast, production-quality, standard-conformant FTP server
 EAPI=7
 HOMEPAGE=http://www.pureftpd.org/
 IUSE=anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=dev-libs/libsodium:= virtual/libcrypt:= caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
 REQUIRED_USE=implicittls? ( ssl )
 SLOT=0
 SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.49.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.49.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ab9757645d9b1cb4b058f37ad627b532
+_md5_=1f6a01775b6c694578eb31277972dc4e
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index b351a7a18e19..f3370015c8bd 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/dino-0.2.2 b/metadata/md5-cache/net-im/dino-0.2.2
new file mode 100644
index 000000000000..bc894369dd7e
--- /dev/null
+++ b/metadata/md5-cache/net-im/dino-0.2.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=|| ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) app-text/gspell[vala] dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu dev-libs/libgee:0.8 net-libs/glib-networking net-libs/libsignal-protocol-c x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango gpg? ( app-crypt/gpgme:1 ) http? ( net-libs/libsoup:2.4 ) omemo? ( dev-libs/libgcrypt:0 media-gfx/qrencode ) notification-sound? ( media-libs/libcanberra:0[sound] ) sys-devel/gettext dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Modern Jabber/XMPP Client using GTK+/Vala
+EAPI=7
+HOMEPAGE=https://dino.im
+IUSE=+gpg +http +omemo +notification-sound test
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-3
+RDEPEND=app-text/gspell[vala] dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu dev-libs/libgee:0.8 net-libs/glib-networking net-libs/libsignal-protocol-c x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango gpg? ( app-crypt/gpgme:1 ) http? ( net-libs/libsoup:2.4 ) omemo? ( dev-libs/libgcrypt:0 media-gfx/qrencode ) notification-sound? ( media-libs/libcanberra:0[sound] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dino/dino/releases/download/v0.2.2/dino-0.2.2.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=36bcb826a63b0d7009805aa7a202e9a6
diff --git a/metadata/md5-cache/net-im/discord-bin-0.0.16 b/metadata/md5-cache/net-im/discord-bin-0.0.16
deleted file mode 100644
index 31448292454a..000000000000
--- a/metadata/md5-cache/net-im/discord-bin-0.0.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=All-in-one voice and text chat for gamers
-EAPI=7
-HOMEPAGE=https://discordapp.com
-IUSE=kernel_linux
-KEYWORDS=~amd64
-LICENSE=all-rights-reserved
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig:1.0 media-libs/freetype:2 net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://dl.discordapp.net/apps/linux/0.0.16/discord-0.0.16.deb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=42a7354d1627ca29de91890788b939fb
diff --git a/metadata/md5-cache/net-im/discord-bin-0.0.16-r1 b/metadata/md5-cache/net-im/discord-bin-0.0.16-r1
new file mode 100644
index 000000000000..cdfa9a435ee5
--- /dev/null
+++ b/metadata/md5-cache/net-im/discord-bin-0.0.16-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup unpack
+DESCRIPTION=All-in-one voice and text chat for gamers
+EAPI=8
+HOMEPAGE=https://discordapp.com
+IUSE=kernel_linux
+KEYWORDS=~amd64
+LICENSE=all-rights-reserved
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=https://dl.discordapp.net/apps/linux/0.0.16/discord-0.0.16.deb
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
+_md5_=0d9ffbf7e171cfc461b86604c9bf1d6d
diff --git a/metadata/md5-cache/net-im/element-desktop-bin-1.8.4 b/metadata/md5-cache/net-im/element-desktop-bin-1.8.4
deleted file mode 100644
index 03a7089fad11..000000000000
--- a/metadata/md5-cache/net-im/element-desktop-bin-1.8.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=app-accessibility/at-spi2-atk:2 app-crypt/libsecret dev-db/sqlcipher dev-libs/atk dev-libs/expat dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango emoji? ( media-fonts/noto-emoji ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A glossy Matrix collaboration client for desktop (binary package)
-EAPI=7
-HOMEPAGE=https://element.io
-IUSE=+emoji
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-accessibility/at-spi2-atk:2 app-crypt/libsecret dev-db/sqlcipher dev-libs/atk dev-libs/expat dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango emoji? ( media-fonts/noto-emoji )
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://packages.riot.im/debian/pool/main/e/element-desktop/element-desktop_1.8.4_amd64.deb
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1324e6ad5226659d956113ed77b61867
diff --git a/metadata/md5-cache/net-im/element-desktop-bin-1.9.2 b/metadata/md5-cache/net-im/element-desktop-bin-1.9.2
new file mode 100644
index 000000000000..52b93f96a35e
--- /dev/null
+++ b/metadata/md5-cache/net-im/element-desktop-bin-1.9.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=app-accessibility/at-spi2-atk:2 app-crypt/libsecret dev-db/sqlcipher dev-libs/atk dev-libs/expat dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango emoji? ( media-fonts/noto-emoji )
+DESCRIPTION=A glossy Matrix collaboration client for desktop (binary package)
+EAPI=8
+HOMEPAGE=https://element.io
+IUSE=+emoji
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-accessibility/at-spi2-atk:2 app-crypt/libsecret dev-db/sqlcipher dev-libs/atk dev-libs/expat dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango emoji? ( media-fonts/noto-emoji )
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://packages.riot.im/debian/pool/main/e/element-desktop/element-desktop_1.9.2_amd64.deb
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=35784b7ee9f74ce7a1b96905a437da17
diff --git a/metadata/md5-cache/net-im/gajim-1.3.3 b/metadata/md5-cache/net-im/gajim-1.3.3
new file mode 100644
index 000000000000..06820918327d
--- /dev/null
+++ b/metadata/md5-cache/net-im/gajim-1.3.3
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1
+DESCRIPTION=Jabber client written in PyGTK
+EAPI=7
+HOMEPAGE=https://gajim.org/
+IUSE=+crypt geolocation jingle omemo remote rst +spell upnp +webp python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_8? ( dev-python/idna[python_targets_python3_8(-)] dev-python/precis-i18n[python_targets_python3_8(-)] dev-python/pyasn1[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pycurl[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] >=dev-python/python-nbxmpp-2.0.2[python_targets_python3_8(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_8(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_8(-)] dev-python/css-parser[python_targets_python3_8(-)] dev-python/packaging[python_targets_python3_8(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_8(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) omemo? ( dev-python/python-axolotl[python_targets_python3_8(-)] dev-python/qrcode[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_8(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_8(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/idna[python_targets_python3_9(-)] dev-python/precis-i18n[python_targets_python3_9(-)] dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pycurl[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] >=dev-python/python-nbxmpp-2.0.2[python_targets_python3_9(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_9(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_9(-)] dev-python/css-parser[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_9(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) omemo? ( dev-python/python-axolotl[python_targets_python3_9(-)] dev-python/qrcode[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_9(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_9(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://gajim.org/downloads/1.3/gajim-1.3.3.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=68837b90072ed22f4ff326b709d811be
diff --git a/metadata/md5-cache/net-im/mattermost-desktop-bin-5.0.0 b/metadata/md5-cache/net-im/mattermost-desktop-bin-5.0.0
new file mode 100644
index 000000000000..f048a581d29e
--- /dev/null
+++ b/metadata/md5-cache/net-im/mattermost-desktop-bin-5.0.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Mattermost Desktop application
+EAPI=8
+HOMEPAGE=https://about.mattermost.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 GPL-2+ LGPL-2.1+ MIT
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2[X] dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango
+SLOT=0
+SRC_URI=amd64? ( https://releases.mattermost.com/desktop/5.0.0/mattermost-desktop-5.0.0-linux-x64.tar.gz ) x86? ( https://releases.mattermost.com/desktop/5.0.0/mattermost-desktop-5.0.0-linux-ia32.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=c1ed0a0bfd5692c93e0c85f0716a24f7
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.5-r1 b/metadata/md5-cache/net-im/pidgin-2.14.5-r1
deleted file mode 100644
index 2ce97bdfd98b..000000000000
--- a/metadata/md5-cache/net-im/pidgin-2.14.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 sys-devel/gettext ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:=[unicode(+)] dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= ) gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GTK Instant Messenger client
-EAPI=7
-HOMEPAGE=https://pidgin.im/
-IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl tk +xscreensaver zephyr zeroconf python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:=[unicode(+)] dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= )
-REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0/2
-SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.5.tar.bz2 https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> pidgin-2.10.9-irc_join_sleep.patch
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4d5753da3051ff2c622f0ac3b26241c8
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.8 b/metadata/md5-cache/net-im/pidgin-2.14.8
new file mode 100644
index 000000000000..31e953d35af7
--- /dev/null
+++ b/metadata/md5-cache/net-im/pidgin-2.14.8
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 sys-devel/gettext ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:=[unicode(+)] dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= ) gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GTK Instant Messenger client
+EAPI=7
+HOMEPAGE=https://pidgin.im/
+IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl tk +xscreensaver zephyr zeroconf python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:=[unicode(+)] dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= )
+REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0/2
+SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.8.tar.bz2 https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> pidgin-2.10.9-irc_join_sleep.patch
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fd97828c04181558bd408700291f59be
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.19.0 b/metadata/md5-cache/net-im/signal-desktop-bin-5.19.0
deleted file mode 100644
index adff3b2d15f7..000000000000
--- a/metadata/md5-cache/net-im/signal-desktop-bin-5.19.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
-EAPI=7
-HOMEPAGE=https://signal.org/ https://github.com/signalapp/Signal-Desktop
-IUSE=+sound
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/gdk-pixbuf:2 x11-libs/cairo x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.19.0_amd64.deb
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=02cf4fd2d18eaeee9944e50b1bf5fa6d
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.20.0 b/metadata/md5-cache/net-im/signal-desktop-bin-5.20.0
new file mode 100644
index 000000000000..e07e0d595699
--- /dev/null
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-5.20.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
+EAPI=7
+HOMEPAGE=https://signal.org/ https://github.com/signalapp/Signal-Desktop
+IUSE=+sound
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/gdk-pixbuf:2 x11-libs/cairo x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.20.0_amd64.deb
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=02cf4fd2d18eaeee9944e50b1bf5fa6d
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.72.0.94 b/metadata/md5-cache/net-im/skypeforlinux-8.72.0.94
deleted file mode 100644
index 9e3b864bb1b2..000000000000
--- a/metadata/md5-cache/net-im/skypeforlinux-8.72.0.94
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/rpm2targz
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Instant messaging client, with support for audio and video
-EAPI=7
-HOMEPAGE=https://www.skype.com/
-IUSE=kernel_linux abi_x86_64
-KEYWORDS=-* ~amd64
-LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
-RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbcommon[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
-REQUIRED_USE=|| ( abi_x86_64 )
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.72.0.94-1.x86_64.rpm
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	pax-utils	fce6ad998516159787b92e8043167889	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b5c1028452f548c5c399caf319930425
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.73.0.129 b/metadata/md5-cache/net-im/skypeforlinux-8.73.0.129
index 358bc60a6f18..82bef4932dc8 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.73.0.129
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.73.0.129
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.73.0.129-1.x86_64.rpm
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	pax-utils	fce6ad998516159787b92e8043167889	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	pax-utils	fce6ad998516159787b92e8043167889	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b5c1028452f548c5c399caf319930425
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.73.0.92 b/metadata/md5-cache/net-im/skypeforlinux-8.73.0.92
index 961bdecabfb5..d3ff9995c5a5 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.73.0.92
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.73.0.92
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.73.0.92-1.x86_64.rpm
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	pax-utils	fce6ad998516159787b92e8043167889	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	pax-utils	fce6ad998516159787b92e8043167889	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b5c1028452f548c5c399caf319930425
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.74.0.152 b/metadata/md5-cache/net-im/skypeforlinux-8.74.0.152
index df7ba8fa6a30..f64cbf8aba0d 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.74.0.152
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.74.0.152
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.74.0.152-1.x86_64.rpm
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	pax-utils	fce6ad998516159787b92e8043167889	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	pax-utils	fce6ad998516159787b92e8043167889	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b5c1028452f548c5c399caf319930425
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.75.0.140 b/metadata/md5-cache/net-im/skypeforlinux-8.75.0.140
index 1a0b5ef01a02..6bc9d067f15b 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.75.0.140
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.75.0.140
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.75.0.140-1.x86_64.rpm
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	pax-utils	fce6ad998516159787b92e8043167889	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	pax-utils	fce6ad998516159787b92e8043167889	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b5c1028452f548c5c399caf319930425
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.77.0.90 b/metadata/md5-cache/net-im/skypeforlinux-8.77.0.90
new file mode 100644
index 000000000000..3b1232337fe8
--- /dev/null
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.77.0.90
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/rpm2targz
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Instant messaging client, with support for audio and video
+EAPI=7
+HOMEPAGE=https://www.skype.com/
+IUSE=kernel_linux abi_x86_64
+KEYWORDS=-* ~amd64
+LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbcommon[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
+REQUIRED_USE=|| ( abi_x86_64 )
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.77.0.90-1.x86_64.rpm
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	pax-utils	fce6ad998516159787b92e8043167889	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b5c1028452f548c5c399caf319930425
diff --git a/metadata/md5-cache/net-im/spectrum2-2.1.0 b/metadata/md5-cache/net-im/spectrum2-2.1.0
new file mode 100644
index 000000000000..9af4a0692f73
--- /dev/null
+++ b/metadata/md5-cache/net-im/spectrum2-2.1.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=acct-group/spectrum acct-user/spectrum dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= dev-libs/log4cxx dev-libs/jsoncpp:= dev-libs/openssl:0= dev-libs/popt dev-libs/protobuf:= net-dns/libidn:0= >=net-im/swift-4.0.2-r2:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) irc? ( net-im/libcommuni ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) postgres? ( dev-libs/libpqxx:= ) purple? ( dev-libs/glib net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) twitter? ( net-misc/curl ) whatsapp? ( net-im/transwhat ) doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
+DESCRIPTION=An open source instant messaging transport
+EAPI=7
+HOMEPAGE=https://www.spectrum.im
+IUSE=doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=acct-group/spectrum acct-user/spectrum dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= dev-libs/log4cxx dev-libs/jsoncpp:= dev-libs/openssl:0= dev-libs/popt dev-libs/protobuf:= net-dns/libidn:0= >=net-im/swift-4.0.2-r2:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) irc? ( net-im/libcommuni ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) postgres? ( dev-libs/libpqxx:= ) purple? ( dev-libs/glib net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) twitter? ( net-misc/curl ) whatsapp? ( net-im/transwhat ) virtual/tmpfiles
+REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( irc )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/SpectrumIM/spectrum2/archive/2.1.0.tar.gz -> spectrum2-2.1.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1254c8b1f2adb40a17cd399828326a84
diff --git a/metadata/md5-cache/net-im/teams-1.4.00.13653-r1 b/metadata/md5-cache/net-im/teams-1.4.00.13653-r1
index bba134bbb8b4..607cabdbde26 100644
--- a/metadata/md5-cache/net-im/teams-1.4.00.13653-r1
+++ b/metadata/md5-cache/net-im/teams-1.4.00.13653-r1
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-core:2 app-accessibility/at-spi2-atk:2 app-cry
 RESTRICT=bindist mirror splitdebug test
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.4.00.13653_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=4ad7bc027e632263d31c565ba3ec704c
diff --git a/metadata/md5-cache/net-im/teams-1.4.00.26453 b/metadata/md5-cache/net-im/teams-1.4.00.26453
index d1def24cde88..1678d87cd00c 100644
--- a/metadata/md5-cache/net-im/teams-1.4.00.26453
+++ b/metadata/md5-cache/net-im/teams-1.4.00.26453
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-core:2 app-accessibility/at-spi2-atk:2 app-cry
 RESTRICT=bindist mirror splitdebug test
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.4.00.26453_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0d4bbe43b1b2c1f117ed761f42e2dc00
diff --git a/metadata/md5-cache/net-im/teams-1.4.00.7556 b/metadata/md5-cache/net-im/teams-1.4.00.7556
index 19bcdc1f0244..04ad7eab3e61 100644
--- a/metadata/md5-cache/net-im/teams-1.4.00.7556
+++ b/metadata/md5-cache/net-im/teams-1.4.00.7556
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret dev-libs/atk dev-libs/
 RESTRICT=bindist mirror splitdebug test
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.4.00.7556_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=33efd8cc37b18d9ccd1221be428292bd
diff --git a/metadata/md5-cache/net-im/telegram-desktop-3.0.1-r1 b/metadata/md5-cache/net-im/telegram-desktop-3.0.1-r1
index 02e3a616105d..27781cd5fccd 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-3.0.1-r1
+++ b/metadata/md5-cache/net-im/telegram-desktop-3.0.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Official desktop client for Telegram
 EAPI=7
 HOMEPAGE=https://desktop.telegram.org
 IUSE=+dbus enchant +gtk +hunspell screencast +spell wayland webkit +X
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
 RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-cpp/glibmm:2 dev-libs/jemalloc:=[-lazy-lock] dev-libs/openssl:= dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210626[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?,wayland?] ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= )
 REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) ) gtk? ( dbus ) webkit? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v3.0.1/tdesktop-3.0.1-full.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=948bf642cc5d8f755f7da1312b0c4b56
+_md5_=bf44ac0eeee2838e4db32ff8b2e23f4e
diff --git a/metadata/md5-cache/net-im/telegram-desktop-3.1.0 b/metadata/md5-cache/net-im/telegram-desktop-3.1.0
deleted file mode 100644
index 152122d61603..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-3.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/cmake-3.16 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/jemalloc:=[-lazy-lock] dev-libs/openssl:= dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210914[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-cpp/glibmm:2 dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3* dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-IUSE=+dbus enchant +hunspell screencast +spell wayland webkit +X
-KEYWORDS=~amd64 ~ppc64
-LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
-RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/jemalloc:=[-lazy-lock] dev-libs/openssl:= dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210914[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-cpp/glibmm:2 dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= )
-REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) ) webkit? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v3.1.0/tdesktop-3.1.0-full.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e484a0e827b7d1ec0fc53187df2f7a56
diff --git a/metadata/md5-cache/net-im/telegram-desktop-3.1.8 b/metadata/md5-cache/net-im/telegram-desktop-3.1.8
new file mode 100644
index 000000000000..f991627c333c
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-3.1.8
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/cmake-3.16 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/jemalloc:=[-lazy-lock] dev-libs/openssl:= dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210914[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-cpp/glibmm:2 dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3* dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Official desktop client for Telegram
+EAPI=7
+HOMEPAGE=https://desktop.telegram.org
+IUSE=+dbus enchant +hunspell screencast +spell wayland webkit +X
+KEYWORDS=~amd64 ~ppc64
+LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
+RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/jemalloc:=[-lazy-lock] dev-libs/openssl:= dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20210302 >=media-libs/libtgvoip-2.4.4_p20210302-r2 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20210914[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-cpp/glibmm:2 dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= )
+REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) ) webkit? ( dbus )
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v3.1.8/tdesktop-3.1.8-full.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0de1f9d9fa6c997e930481eace803c19
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-3.0.1-r1 b/metadata/md5-cache/net-im/telegram-desktop-bin-3.0.1-r1
deleted file mode 100644
index ef9146883876..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-3.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram (binary package)
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3-with-openssl-exception
-RDEPEND=dev-libs/glib:2 >=media-libs/fontconfig-2.13 media-libs/freetype:2 sys-libs/zlib virtual/opengl x11-libs/libSM x11-libs/libdrm x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v3.0.1.tar.gz -> tdesktop-3.0.1.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.3.0.1.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	30ce9dec2b8943338c9b015bd32bac6a	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fa9593a77451a61d983ac5d586725a89
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-3.1.0-r1 b/metadata/md5-cache/net-im/telegram-desktop-bin-3.1.0-r1
deleted file mode 100644
index fc530d3bf2da..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-3.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram (binary package)
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3-with-openssl-exception
-RDEPEND=dev-libs/glib:2 >=media-libs/fontconfig-2.13 media-libs/freetype:2 virtual/opengl x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v3.1.0.tar.gz -> tdesktop-3.1.0.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.3.1.0.tar.xz )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	30ce9dec2b8943338c9b015bd32bac6a	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a1b59e6f32367f547c21ccd13a070512
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-3.1.8 b/metadata/md5-cache/net-im/telegram-desktop-bin-3.1.8
new file mode 100644
index 000000000000..98e633ba7900
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-3.1.8
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=Official desktop client for Telegram (binary package)
+EAPI=8
+HOMEPAGE=https://desktop.telegram.org
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3-with-openssl-exception
+RDEPEND=dev-libs/glib:2 >=media-libs/fontconfig-2.13 media-libs/freetype:2 virtual/opengl x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v3.1.8.tar.gz -> tdesktop-3.1.8.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.3.1.8.tar.xz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	30ce9dec2b8943338c9b015bd32bac6a	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=92d9cda8c4d615406c587cf8750e7093
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index a43329c9e926..b3b4d19d5e4b 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/inspircd-3.11.0 b/metadata/md5-cache/net-irc/inspircd-3.11.0
index eb2d8e751d23..05c2c28682ec 100644
--- a/metadata/md5-cache/net-irc/inspircd-3.11.0
+++ b/metadata/md5-cache/net-irc/inspircd-3.11.0
@@ -4,10 +4,10 @@ DESCRIPTION=Inspire IRCd - The Stable, High-Performance Modular IRCd
 EAPI=8
 HOMEPAGE=https://www.inspircd.org/
 IUSE=debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=acct-group/inspircd acct-user/inspircd dev-lang/perl gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) maxminddb? ( dev-libs/libmaxminddb ) mbedtls? ( net-libs/mbedtls:= ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) re2? ( dev-libs/re2:= ) sqlite? ( >=dev-db/sqlite-3.0 ) ssl? ( dev-libs/openssl:= ) tre? ( dev-libs/tre )
 SLOT=0
 SRC_URI=https://github.com/inspircd/inspircd/archive/v3.11.0.tar.gz -> inspircd-3.11.0.tar.gz https://github.com/clinew/gentoo-distfiles/raw/master/inspircd-3.11.0-fix-path-builds.patch.bz2
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=91a8472884da40ce104066b22ef2cd40
+_md5_=32a3e45498b3ccef7f4a05d365c54dc0
diff --git a/metadata/md5-cache/net-irc/quassel-0.13.1-r2 b/metadata/md5-cache/net-irc/quassel-0.13.1-r2
index 74d067688f34..13f2479dc564 100644
--- a/metadata/md5-cache/net-irc/quassel-0.13.1-r2
+++ b/metadata/md5-cache/net-irc/quassel-0.13.1-r2
@@ -1,15 +1,15 @@
 BDEPEND=dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
 DESCRIPTION=Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity
 EAPI=7
 HOMEPAGE=https://quassel-irc.org/
-IUSE=bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify +ssl syslog urlpreview X
+IUSE=bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell +ssl syslog urlpreview X
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~sparc-solaris
 LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
-REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) dbus ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
+REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( dbus spell ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) spell? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
 SLOT=0
 SRC_URI=https://quassel-irc.org/pub/quassel-0.13.1.tar.bz2
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e9f9a25a73d54e10b192c030ac82cb35
+_md5_=b237ce82d77ee3b1236ab45bff041e2a
diff --git a/metadata/md5-cache/net-irc/quassel-0.14_rc2 b/metadata/md5-cache/net-irc/quassel-0.14_rc2
new file mode 100644
index 000000000000..b6462038156b
--- /dev/null
+++ b/metadata/md5-cache/net-irc/quassel-0.14_rc2
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare test
+DEPEND=>=dev-libs/boost-1.54:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] sys-libs/zlib monolithic? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
+DESCRIPTION=Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity
+EAPI=7
+HOMEPAGE=https://quassel-irc.org/
+IUSE=bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.54:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] sys-libs/zlib monolithic? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
+REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( dbus spell ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) spell? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://github.com/quassel/quassel/archive/refs/tags/0.14-rc2.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d4e3590ebb5580bb72a06a563728b511
diff --git a/metadata/md5-cache/net-irc/quassel-9999 b/metadata/md5-cache/net-irc/quassel-9999
index 555c6246dd72..4e7ec044ba5d 100644
--- a/metadata/md5-cache/net-irc/quassel-9999
+++ b/metadata/md5-cache/net-irc/quassel-9999
@@ -1,14 +1,15 @@
 BDEPEND=dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile config configure install postinst postrm prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] sys-libs/zlib monolithic? ( acct-group/quassel acct-user/quassel crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( acct-group/quassel acct-user/quassel crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) ) dev-libs/boost
+DEPEND=>=dev-libs/boost-1.54:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] sys-libs/zlib monolithic? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
 DESCRIPTION=Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity
 EAPI=7
 HOMEPAGE=https://quassel-irc.org/
-IUSE=bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify syslog urlpreview X
+IUSE=bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] sys-libs/zlib monolithic? ( acct-group/quassel acct-user/quassel crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( acct-group/quassel acct-user/quassel crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
-REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) dbus ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
+RDEPEND=>=dev-libs/boost-1.54:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] sys-libs/zlib monolithic? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( acct-group/quassel acct-user/quassel dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
+REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( dbus spell ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) spell? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
+RESTRICT=!test? ( test ) test
 SLOT=0
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9ef5936563b2e10e262fd52ad973424b
+_md5_=d4e3590ebb5580bb72a06a563728b511
diff --git a/metadata/md5-cache/net-irc/weechat-3.1 b/metadata/md5-cache/net-irc/weechat-3.1
deleted file mode 100644
index 26a749ffe436..000000000000
--- a/metadata/md5-cache/net-irc/weechat-3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
-DESCRIPTION=Portable and multi-interface IRC client
-EAPI=7
-HOMEPAGE=https://weechat.org/
-IUSE=doc man nls selinux test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) test? ( nls )
-RESTRICT=!test? ( test )
-SLOT=0/3.1
-SRC_URI=https://weechat.org/files/src/weechat-3.1.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=28cfda2cabf6d8e104249622d73ebc88
diff --git a/metadata/md5-cache/net-irc/weechat-3.2 b/metadata/md5-cache/net-irc/weechat-3.2
deleted file mode 100644
index daea24a9bf2d..000000000000
--- a/metadata/md5-cache/net-irc/weechat-3.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
-DESCRIPTION=Portable and multi-interface IRC client
-EAPI=7
-HOMEPAGE=https://weechat.org/
-IUSE=doc man nls selinux test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) test? ( nls )
-RESTRICT=!test? ( test )
-SLOT=0/3.2
-SRC_URI=https://weechat.org/files/src/weechat-3.2.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2cd67bf1fa29b8f7271edfc7efad9547
diff --git a/metadata/md5-cache/net-irc/weechat-3.3 b/metadata/md5-cache/net-irc/weechat-3.3
index 387c4b7d6ce9..605766648cc3 100644
--- a/metadata/md5-cache/net-irc/weechat-3.3
+++ b/metadata/md5-cache/net-irc/weechat-3.3
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
+DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
 DESCRIPTION=Portable and multi-interface IRC client
 EAPI=7
 HOMEPAGE=https://weechat.org/
 IUSE=doc man nls selinux test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer +irc lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~x86 ~x64-macos
 LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) test? ( nls )
 RESTRICT=!test? ( test )
 SLOT=0/3.3
 SRC_URI=https://weechat.org/files/src/weechat-3.3.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b81c4358bad8c9746b113f3b68e6ac6f
+_md5_=af2e09fe303e93ff0570e271f9b81284
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index 79388df4289c..b0ebddb77c53 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
+DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
 DESCRIPTION=Portable and multi-interface IRC client
 EAPI=7
 HOMEPAGE=https://weechat.org/
-IUSE=doc man nls selinux test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9
+IUSE=doc man nls selinux test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer +irc lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) test? ( nls )
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2cd67bf1fa29b8f7271edfc7efad9547
+_md5_=dd8b9b36c3b62798b4ce34ba592adc8d
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index db60631c4367..8757dc7932e4 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/czmq-4.2.1 b/metadata/md5-cache/net-libs/czmq-4.2.1
new file mode 100644
index 000000000000..800db675d918
--- /dev/null
+++ b/metadata/md5-cache/net-libs/czmq-4.2.1
@@ -0,0 +1,13 @@
+BDEPEND=app-text/asciidoc app-text/xmlto virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=>=net-libs/zeromq-4:=[drafts?] http-client? ( net-misc/curl ) http-server? ( net-libs/libmicrohttpd:= ) lz4? ( app-arch/lz4:= ) nss? ( dev-libs/nspr dev-libs/nss ) systemd? ( sys-apps/systemd ) uuid? ( sys-apps/util-linux:0 )
+DESCRIPTION=High-level C Binding for ZeroMQ
+EAPI=8
+HOMEPAGE=http://czmq.zeromq.org
+IUSE=curl drafts http-client http-server lz4 nss static-libs systemd +uuid
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=net-libs/zeromq-4:=[drafts?] http-client? ( net-misc/curl ) http-server? ( net-libs/libmicrohttpd:= ) lz4? ( app-arch/lz4:= ) nss? ( dev-libs/nspr dev-libs/nss ) systemd? ( sys-apps/systemd ) uuid? ( sys-apps/util-linux:0 )
+SLOT=0/4
+SRC_URI=https://github.com/zeromq/czmq/releases/download/v4.2.1/czmq-4.2.1.tar.gz
+_md5_=fe810dad1a9b2062d7e0bb91873dc8d9
diff --git a/metadata/md5-cache/net-libs/libhackrf-2021.03.1 b/metadata/md5-cache/net-libs/libhackrf-2021.03.1
index cffcf3d01cd1..10a00d150ce5 100644
--- a/metadata/md5-cache/net-libs/libhackrf-2021.03.1
+++ b/metadata/md5-cache/net-libs/libhackrf-2021.03.1
@@ -5,10 +5,10 @@ DESCRIPTION=library for communicating with HackRF SDR platform
 EAPI=7
 HOMEPAGE=http://greatscottgadgets.com/hackrf/
 IUSE=+udev
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=BSD
 RDEPEND=virtual/libusb:1
 SLOT=0/2021.03.1
 SRC_URI=https://github.com/mossmann/hackrf/releases/download/v2021.03.1/hackrf-2021.03.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f81ffe34cf23ae29893c689d425b3639
+_md5_=8ad54c561a3c5dadd3d07832ac5e5c2d
diff --git a/metadata/md5-cache/net-libs/libktorrent-21.08.2 b/metadata/md5-cache/net-libs/libktorrent-21.08.2
index 6520a39d235b..7412e4343e79 100644
--- a/metadata/md5-cache/net-libs/libktorrent-21.08.2
+++ b/metadata/md5-cache/net-libs/libktorrent-21.08.2
@@ -5,11 +5,11 @@ DESCRIPTION=BitTorrent library based on KDE Frameworks
 EAPI=8
 HOMEPAGE=https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.84.0:5 >=kde-frameworks/kconfig-5.84.0:5 >=kde-frameworks/kcoreaddons-5.84.0:5 >=kde-frameworks/kcrash-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 >=kde-frameworks/kio-5.84.0:5 >=kde-frameworks/solid-5.84.0:5 !dev-libs/botan[gmp(-)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.2/src/libktorrent-21.08.2.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3ee6544dc9d6461a7c317489bc50e1c6
+_md5_=b0463242f4e6757b8b6f042ab81d12de
diff --git a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3 b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3
index dc79aab1339d..85bc9b982417 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3
+++ b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-libs/libmnl
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-1.0.3.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a73a7dba1854134ab2cb6709c9ece54a
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.6 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.6
index e2b3c2cf1e17..76d77b24eb82 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.6
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.6.tar.bz2
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=90c23281600d192f98e8d6be291ddce5
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.7 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.7
index 4f3a5e6bae0e..7b3b3cdce140 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.7
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.7.tar.bz2
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e2ba0befaba9a4ebb1d6f6b2dc51457a
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.8 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.8
index 53af9f1608ae..9d8ec75d17e3 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.8
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.8.tar.bz2
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e2ba0befaba9a4ebb1d6f6b2dc51457a
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1 b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
index 045b5d58c440..1bc18b2dbb67 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
+++ b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl:=
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.0.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6a9d6e67a3d2e6729b4f0ab4c4074db2
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1 b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
index 4a4e9701dab2..367ea8bbe0b6 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
+++ b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl:=
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ac7afbe07fed4200c29724f50f1477a4
diff --git a/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1 b/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
index b9642dae106f..3fa0bb6157c5 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
+++ b/metadata/md5-cache/net-libs/libnetfilter_log-1.0.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-1.0.1.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1dfe1a057a61a49db3549049fcd7767c
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
index 876f5bc5f4ae..668297dddfeb 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.3.tar.bz2
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7a48e2da763b6730c4fc560e279ef2ad
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.4 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.4
index 6151167a490b..4be5e64094fb 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.4
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.4.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=56b88c6c001dc6dd89cc919c55e95a09
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
index 7c32a8facbc5..fe445e18fcee 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.5.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=44730bb10f32d6b1acfb5ed7e7bf5204
diff --git a/metadata/md5-cache/net-libs/libnfnetlink-1.0.1 b/metadata/md5-cache/net-libs/libnfnetlink-1.0.1
index 595a80678b3f..4ba5b7f04197 100644
--- a/metadata/md5-cache/net-libs/libnfnetlink-1.0.1
+++ b/metadata/md5-cache/net-libs/libnfnetlink-1.0.1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-1.0.1.tar.bz2 https://git.alpinelinux.org/cgit/aports/plain/main/libnfnetlink/musl-fix-includes.patch -> 04aef8a4dedf267dd5744afb134ef8046e77f613-musl-fix-includes.patch
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=05c853e6cafc97ecfd9e8a47b59851b0
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.2.0-r1 b/metadata/md5-cache/net-libs/libnftnl-1.2.0-r1
index bfc2304eb051..027228ecfd5f 100644
--- a/metadata/md5-cache/net-libs/libnftnl-1.2.0-r1
+++ b/metadata/md5-cache/net-libs/libnftnl-1.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/libmnl-1.0.4:=
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.2.0.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
 _md5_=f55baa86e43a759990cafe5328589b63
diff --git a/metadata/md5-cache/net-libs/libnftnl-9999 b/metadata/md5-cache/net-libs/libnftnl-9999
index b3f1b9d60a06..b1654dae19b4 100644
--- a/metadata/md5-cache/net-libs/libnftnl-9999
+++ b/metadata/md5-cache/net-libs/libnftnl-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=net-libs/libmnl-1.0.4:=
 RESTRICT=!test? ( test )
 SLOT=0/11
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
 _md5_=accc2ec24241a78b119dacef4866e8a9
diff --git a/metadata/md5-cache/net-libs/libnids-1.24-r7 b/metadata/md5-cache/net-libs/libnids-1.24-r7
deleted file mode 100644
index ecd911f123d6..000000000000
--- a/metadata/md5-cache/net-libs/libnids-1.24-r7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!net-libs/libnids:1.1 net-libs/libpcap glib? ( dev-libs/glib:2 ) libnet? ( >=net-libs/libnet-1.1.0-r3 ) glib? ( virtual/pkgconfig )
-DESCRIPTION=an implementation of an E-component of Network Intrusion Detection System
-EAPI=7
-HOMEPAGE=http://libnids.sourceforge.net/
-IUSE=+glib +libnet static-libs
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=!net-libs/libnids:1.1 net-libs/libpcap glib? ( dev-libs/glib:2 ) libnet? ( >=net-libs/libnet-1.1.0-r3 )
-SLOT=1.2
-SRC_URI=mirror://sourceforge/libnids/libnids-1.24.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4390d62a9430554144f410eebc452d04
diff --git a/metadata/md5-cache/net-libs/libnids-1.24-r8 b/metadata/md5-cache/net-libs/libnids-1.24-r8
new file mode 100644
index 000000000000..39464ebe1a93
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnids-1.24-r8
@@ -0,0 +1,14 @@
+BDEPEND=glib? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=!net-libs/libnids:1.1 net-libs/libpcap glib? ( dev-libs/glib:2 ) libnet? ( >=net-libs/libnet-1.1.0-r3 )
+DESCRIPTION=an implementation of an E-component of Network Intrusion Detection System
+EAPI=7
+HOMEPAGE=http://libnids.sourceforge.net/
+IUSE=+glib +libnet static-libs
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=!net-libs/libnids:1.1 net-libs/libpcap glib? ( dev-libs/glib:2 ) libnet? ( >=net-libs/libnet-1.1.0-r3 )
+SLOT=1.2
+SRC_URI=mirror://sourceforge/libnids/libnids-1.24.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=69679933408f088235c6807081771bc2
diff --git a/metadata/md5-cache/net-libs/libssh2-1.10.0 b/metadata/md5-cache/net-libs/libssh2-1.10.0
index 0fb2d96e1f5c..f3f2671d3539 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.10.0
+++ b/metadata/md5-cache/net-libs/libssh2-1.10.0
@@ -5,7 +5,7 @@ DESCRIPTION=Library implementing the SSH2 protocol
 EAPI=7
 HOMEPAGE=https://www.libssh2.org
 IUSE=gcrypt mbedtls zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=?? ( gcrypt mbedtls )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.libssh2.org/download/libssh2-1.10.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a8b7e13edfb1fe8f532a1e2abb77f496
+_md5_=894c125e632d114f63a336181d854f7b
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.16.10 b/metadata/md5-cache/net-libs/mbedtls-2.16.10
deleted file mode 100644
index 50343a3781a8..000000000000
--- a/metadata/md5-cache/net-libs/mbedtls-2.16.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=programs? ( dev-libs/openssl:0= ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl )
-DESCRIPTION=Cryptographic library for embedded systems
-EAPI=7
-HOMEPAGE=https://tls.mbed.org/
-IUSE=cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=programs? ( dev-libs/openssl:0= ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/3.12.0
-SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.16.10.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d814947e6d501c6a9818804eb462fe53
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.16.11 b/metadata/md5-cache/net-libs/mbedtls-2.16.11
index c2d6e8fca6fa..de6e311b5d8b 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.16.11
+++ b/metadata/md5-cache/net-libs/mbedtls-2.16.11
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3.12.0
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.16.11.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d949fd8224165c6d09ad0ab742a0a220
+_md5_=4339a11dc5a39e46fd4cd8a1bf16d2ce
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.26.0 b/metadata/md5-cache/net-libs/mbedtls-2.26.0
deleted file mode 100644
index 614cef1ed973..000000000000
--- a/metadata/md5-cache/net-libs/mbedtls-2.26.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=programs? ( dev-libs/openssl:0= ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl )
-DESCRIPTION=Cryptographic library for embedded systems
-EAPI=7
-HOMEPAGE=https://tls.mbed.org/
-IUSE=cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=programs? ( dev-libs/openssl:0= ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/6.13.1
-SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.26.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7d4020e4a9a4f221b7d622989a7e5845
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.27.0-r1 b/metadata/md5-cache/net-libs/mbedtls-2.27.0-r1
index 9ba999ca95b5..61141c93cba7 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.27.0-r1
+++ b/metadata/md5-cache/net-libs/mbedtls-2.27.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Cryptographic library for embedded systems
 EAPI=7
 HOMEPAGE=https://tls.mbed.org/
 IUSE=cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=programs? ( dev-libs/openssl:0= ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/7.13.1
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.27.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ed2da9fdbe88a65f16927000d2673384
+_md5_=04feac0a27eed0bc166631c50bc96973
diff --git a/metadata/md5-cache/net-libs/mbedtls-3.0.0 b/metadata/md5-cache/net-libs/mbedtls-3.0.0
index f554c90921d5..54862f40ce31 100644
--- a/metadata/md5-cache/net-libs/mbedtls-3.0.0
+++ b/metadata/md5-cache/net-libs/mbedtls-3.0.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/10.16.4
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-3.0.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=71f7002f131fe14c88aa9411d4f156dc
+_md5_=660a06c58e1d7027f51ee3370219b70e
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.43.0-r3 b/metadata/md5-cache/net-libs/nghttp2-1.43.0-r3
deleted file mode 100644
index 1200abb04fdd..000000000000
--- a/metadata/md5-cache/net-libs/nghttp2-1.43.0-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=HTTP/2 C Library
-EAPI=7
-HOMEPAGE=https://nghttp2.org/
-IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/1.14
-SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.43.0/nghttp2-1.43.0.tar.xz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b4a522f50f3926e6fda38d04a5a29ec3
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.45.0-r1 b/metadata/md5-cache/net-libs/nghttp2-1.45.0-r1
deleted file mode 100644
index c91e5aed8035..000000000000
--- a/metadata/md5-cache/net-libs/nghttp2-1.45.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=HTTP/2 C Library
-EAPI=7
-HOMEPAGE=https://nghttp2.org/
-IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/1.14
-SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.45.0/nghttp2-1.45.0.tar.xz
-_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6fcfd7d713d0b66242011e35081e5efd
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.45.1-r1 b/metadata/md5-cache/net-libs/nghttp2-1.45.1-r1
index 38bcdf57e453..4fbde21084e6 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.45.1-r1
+++ b/metadata/md5-cache/net-libs/nghttp2-1.45.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=HTTP/2 C Library
 EAPI=7
 HOMEPAGE=https://nghttp2.org/
 IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/1.14
 SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.45.1/nghttp2-1.45.1.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6fcfd7d713d0b66242011e35081e5efd
+_md5_=5ff2602af502da2c72e72e5d24b7cc1f
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.46.0 b/metadata/md5-cache/net-libs/nghttp2-1.46.0
new file mode 100644
index 000000000000..23be85ecc1f2
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nghttp2-1.46.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=HTTP/2 C Library
+EAPI=8
+HOMEPAGE=https://nghttp2.org/
+IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/1.14
+SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.46.0/nghttp2-1.46.0.tar.xz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=26e0d362ec7e4ddb36be618526bf399c
diff --git a/metadata/md5-cache/net-libs/nghttp2-9999 b/metadata/md5-cache/net-libs/nghttp2-9999
index 7dcc16e7b7a8..00919ab15703 100644
--- a/metadata/md5-cache/net-libs/nghttp2-9999
+++ b/metadata/md5-cache/net-libs/nghttp2-9999
@@ -2,7 +2,7 @@ BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=HTTP/2 C Library
-EAPI=7
+EAPI=8
 HOMEPAGE=https://nghttp2.org/
 IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT
@@ -11,4 +11,4 @@ RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),abi_x86_32(-)?,abi_x86_64
 RESTRICT=!test? ( test )
 SLOT=0/1.14
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c7e04be0edd2ecbf87fc63d58c7dafd6
+_md5_=26e0d362ec7e4ddb36be618526bf399c
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.32.3 b/metadata/md5-cache/net-libs/webkit-gtk-2.32.3
deleted file mode 100644
index 905bded45dbf..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.32.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 dev-lang/ruby:3.0 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP gtk-doc? ( >=dev-util/gtk-doc-1.32 ) geolocation? ( dev-util/gdbus-codegen ) >=dev-util/cmake-3.10 dev-util/ninja >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Open source web browser engine
-EAPI=7
-HOMEPAGE=https://www.webkitgtk.org
-IUSE=aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X test
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-REQUIRED_USE=gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=4/37
-SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.32.3.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	ruby-single	214d0508e74b80c85efcef39699cb9a2	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c1568b972548a7469fe4af75d054e709
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index fd6c3c0b629d..123e5614733c 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/automx2-2021.5 b/metadata/md5-cache/net-mail/automx2-2021.5
new file mode 100644
index 000000000000..df3921202e5d
--- /dev/null
+++ b/metadata/md5-cache/net-mail/automx2-2021.5
@@ -0,0 +1,15 @@
+BDEPEND=acct-user/automx2 test? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-migrate[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-sqlalchemy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ldap3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Email client autoconfiguration service
+EAPI=7
+HOMEPAGE=https://automx.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-migrate[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-sqlalchemy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ldap3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rseichter/automx2/archive/2021.5.tar.gz -> automx2-2021.5.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9aa9312dd7ef5f829ff3aa6ebeec2f8a
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.4.2-r1 b/metadata/md5-cache/net-mail/cyrus-imapd-3.4.2-r1
index 1a7c1851dce7..1958dd6f36f8 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.4.2-r1
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.4.2-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.4.2/cyrus-imapd-3.4.2.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	ssl-cert	1283a22296251a63df6c137c9b929269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b1c30434696e84ee06e48e663541ba2d
+_md5_=cad57563e84aee96b8b0c25b6f55c0aa
diff --git a/metadata/md5-cache/net-mail/mailshears-0.0.4-r1 b/metadata/md5-cache/net-mail/mailshears-0.0.4-r1
index de066e11a591..a3990a0e4eb7 100644
--- a/metadata/md5-cache/net-mail/mailshears-0.0.4-r1
+++ b/metadata/md5-cache/net-mail/mailshears-0.0.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mailshears-0.0.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=508a816788dfd1c28fb7deffdc65b636
diff --git a/metadata/md5-cache/net-mail/mswatch-1.2.0-r1 b/metadata/md5-cache/net-mail/mswatch-1.2.0-r1
index 5842e41bd4f8..3037fd6bfaaf 100644
--- a/metadata/md5-cache/net-mail/mswatch-1.2.0-r1
+++ b/metadata/md5-cache/net-mail/mswatch-1.2.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/mswatch/mswatch-1.2.0.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a87863080541116a7bd05fcd188c05f
diff --git a/metadata/md5-cache/net-mail/mu-1.6.1 b/metadata/md5-cache/net-mail/mu-1.6.1
deleted file mode 100644
index e9127cf1aa40..000000000000
--- a/metadata/md5-cache/net-mail/mu-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm preinst
-DEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= sys-libs/readline emacs? ( >=app-editors/emacs-25.3:* ) guile? ( >=dev-scheme/guile-2.2:* ) mug? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3= )
-DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
-EAPI=8
-HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
-IUSE=emacs guile mug
-KEYWORDS=amd64 arm arm64 x86 ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= sys-libs/readline emacs? ( >=app-editors/emacs-25.3:* ) guile? ( >=dev-scheme/guile-2.2:* ) mug? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3= )
-SLOT=0
-SRC_URI=https://github.com/djcb/mu/releases/download/1.6.1/mu-1.6.1.tar.xz
-_eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=85ab08919f98aa778f8e08e359db6b86
diff --git a/metadata/md5-cache/net-mail/mu-1.6.3 b/metadata/md5-cache/net-mail/mu-1.6.3
deleted file mode 100644
index 637221d6ef6e..000000000000
--- a/metadata/md5-cache/net-mail/mu-1.6.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm preinst
-DEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) guile? ( >=dev-scheme/guile-2.2:* ) readline? ( sys-libs/readline:= )
-DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
-EAPI=8
-HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
-IUSE=emacs guile readline
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) guile? ( >=dev-scheme/guile-2.2:* ) readline? ( sys-libs/readline:= )
-SLOT=0
-SRC_URI=https://github.com/djcb/mu/releases/download/1.6.3/mu-1.6.3.tar.xz
-_eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=dbc54782caac006ecb74048f0d48ebe7
diff --git a/metadata/md5-cache/net-mail/mu-1.6.5 b/metadata/md5-cache/net-mail/mu-1.6.5
deleted file mode 100644
index 5d0aac2d5f8f..000000000000
--- a/metadata/md5-cache/net-mail/mu-1.6.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm preinst
-DEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) guile? ( >=dev-scheme/guile-2.2:* ) readline? ( sys-libs/readline:= )
-DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
-EAPI=8
-HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
-IUSE=emacs guile readline
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) guile? ( >=dev-scheme/guile-2.2:* ) readline? ( sys-libs/readline:= )
-SLOT=0
-SRC_URI=https://github.com/djcb/mu/releases/download/1.6.5/mu-1.6.5.tar.xz
-_eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=dbc54782caac006ecb74048f0d48ebe7
diff --git a/metadata/md5-cache/net-mail/mu-1.6.6 b/metadata/md5-cache/net-mail/mu-1.6.6
index 39c564f1bd40..082c14c880a7 100644
--- a/metadata/md5-cache/net-mail/mu-1.6.6
+++ b/metadata/md5-cache/net-mail/mu-1.6.6
@@ -5,10 +5,10 @@ DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and ind
 EAPI=8
 HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
 IUSE=emacs guile readline
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) guile? ( >=dev-scheme/guile-2.2:* ) readline? ( sys-libs/readline:= )
 SLOT=0
 SRC_URI=https://github.com/djcb/mu/releases/download/1.6.6/mu-1.6.6.tar.xz
 _eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=dbc54782caac006ecb74048f0d48ebe7
+_md5_=adedd445823687f4b4673c66f443f978
diff --git a/metadata/md5-cache/net-mail/mu-1.6.7 b/metadata/md5-cache/net-mail/mu-1.6.7
new file mode 100644
index 000000000000..081f02cc63a2
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mu-1.6.7
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure postinst postrm preinst
+DEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) guile? ( >=dev-scheme/guile-2.2:* ) readline? ( sys-libs/readline:= )
+DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
+EAPI=8
+HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
+IUSE=emacs guile readline
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) guile? ( >=dev-scheme/guile-2.2:* ) readline? ( sys-libs/readline:= )
+SLOT=0
+SRC_URI=https://github.com/djcb/mu/releases/download/1.6.7/mu-1.6.7.tar.xz
+_eclasses_=elisp-common	cf4fd1b0835b9f3e638724840468064a
+_md5_=dbc54782caac006ecb74048f0d48ebe7
diff --git a/metadata/md5-cache/net-mail/onionrouter-0.6.1 b/metadata/md5-cache/net-mail/onionrouter-0.6.1
deleted file mode 100644
index 5ce82b3aac7d..000000000000
--- a/metadata/md5-cache/net-mail/onionrouter-0.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( test? ( dev-python/pytest[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/pytest[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) ) test? ( python_single_target_python3_8? ( dev-python/dnspython[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=.onion discovery via SRV DNS lookups for use with postfix
-EAPI=7
-HOMEPAGE=https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/
-IUSE=test test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_8? ( dev-python/dnspython[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://pypi.io/packages/source/o/onionrouter/onionrouter-0.6.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fd2e1efbbced09714286f2a4cbf83a84
diff --git a/metadata/md5-cache/net-mail/onionrouter-0.6.2 b/metadata/md5-cache/net-mail/onionrouter-0.6.2
new file mode 100644
index 000000000000..fe3d07ad64f0
--- /dev/null
+++ b/metadata/md5-cache/net-mail/onionrouter-0.6.2
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( test? ( dev-python/pytest[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/pytest[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/pytest[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( dev-python/dnspython[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dnspython[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-4.5.0[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=.onion discovery via SRV DNS lookups for use with postfix
+EAPI=7
+HOMEPAGE=https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/
+IUSE=test test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_8? ( dev-python/dnspython[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dnspython[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://pypi.io/packages/source/o/onionrouter/onionrouter-0.6.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e507f59563fe938c3a14a3254aa30151
diff --git a/metadata/md5-cache/net-mail/onionrouter-9999 b/metadata/md5-cache/net-mail/onionrouter-9999
index 461dffa29fff..7ea39197b2b8 100644
--- a/metadata/md5-cache/net-mail/onionrouter-9999
+++ b/metadata/md5-cache/net-mail/onionrouter-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_single_target_python3_8? ( test? ( dev-python/pytest[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/pytest[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) ) test? ( python_single_target_python3_8? ( dev-python/dnspython[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_8? ( test? ( dev-python/pytest[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/pytest[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/pytest[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( dev-python/dnspython[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dnspython[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-4.5.0[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=.onion discovery via SRV DNS lookups for use with postfix
 EAPI=7
 HOMEPAGE=https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/
-IUSE=test test python_single_target_python3_8 python_single_target_python3_9
+IUSE=test test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( dev-python/dnspython[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/dnspython[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dnspython[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dnspython[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fd2e1efbbced09714286f2a4cbf83a84
+_md5_=e507f59563fe938c3a14a3254aa30151
diff --git a/metadata/md5-cache/net-mail/rss2email-3.13.1 b/metadata/md5-cache/net-mail/rss2email-3.13.1
index c6f323d712bb..c29e4914d6db 100644
--- a/metadata/md5-cache/net-mail/rss2email-3.13.1
+++ b/metadata/md5-cache/net-mail/rss2email-3.13.1
@@ -5,7 +5,7 @@ DESCRIPTION=A python script that converts RSS/Atom newsfeeds to email
 EAPI=7
 HOMEPAGE=https://github.com/rss2email/rss2email
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=dev-python/feedparser-6.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html2text-2020.1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rss2email/rss2email/archive/v3.13.1.tar.gz -> rss2email-3.13.1.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bd5216b454daafd7ade775a28f1de359
+_md5_=384246c5bb3fffb36eae947097908d40
diff --git a/metadata/md5-cache/net-mail/ytnef-2.0 b/metadata/md5-cache/net-mail/ytnef-2.0
index 7150277be4a8..d6f4d2041bf3 100644
--- a/metadata/md5-cache/net-mail/ytnef-2.0
+++ b/metadata/md5-cache/net-mail/ytnef-2.0
@@ -5,10 +5,10 @@ DESCRIPTION=Yeraze's TNEF Stream Reader - for winmail.dat files
 EAPI=8
 HOMEPAGE=https://github.com/Yeraze/ytnef
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=dev-perl/MIME-tools
 SLOT=0
 SRC_URI=https://github.com/Yeraze/ytnef/archive/v2.0.tar.gz -> ytnef-2.0.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8ac40f2995a1273c1e3a99893a849703
+_md5_=dadfe4c84fccada4fe7be38ccb52df6b
diff --git a/metadata/md5-cache/net-misc/AQtion-2.2.7-r1 b/metadata/md5-cache/net-misc/AQtion-2.2.7-r1
index d0701e4899d9..552ea983c29f 100644
--- a/metadata/md5-cache/net-misc/AQtion-2.2.7-r1
+++ b/metadata/md5-cache/net-misc/AQtion-2.2.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/Aquantia/AQtion/archive/e024a859ea828ced78db310328db90dbedea837a.tar.gz -> AQtion-2.2.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe8a3f9578194afaea21839a2352ec04
diff --git a/metadata/md5-cache/net-misc/AQtion-2.3.1-r1 b/metadata/md5-cache/net-misc/AQtion-2.3.1-r1
index 9d37f9283fb8..13b01123d353 100644
--- a/metadata/md5-cache/net-misc/AQtion-2.3.1-r1
+++ b/metadata/md5-cache/net-misc/AQtion-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/Aquantia/AQtion/archive/3c2a2a3abe3df6cb0c985a49cea9a359a83e3f75.tar.gz -> AQtion-2.3.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a58ce367c3719cef16fd1694636e5633
diff --git a/metadata/md5-cache/net-misc/AQtion-2.3.4-r1 b/metadata/md5-cache/net-misc/AQtion-2.3.4-r1
index 125509ce6049..43ea90d3abfa 100644
--- a/metadata/md5-cache/net-misc/AQtion-2.3.4-r1
+++ b/metadata/md5-cache/net-misc/AQtion-2.3.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/Aquantia/AQtion/archive/3b96f1b5f29d844151bc2dc38443de7a9a2f0cf3.tar.gz -> AQtion-2.3.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0ce0697dce2e19b7d6f6d33e7eef3874
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 5b9007c21f25..c1b0e5f7119a 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/aria2-1.35.0 b/metadata/md5-cache/net-misc/aria2-1.35.0
deleted file mode 100644
index f708e33e428b..000000000000
--- a/metadata/md5-cache/net-misc/aria2-1.35.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext )
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/zlib:0= adns? ( >=net-dns/c-ares-1.5.0:0= ) jemalloc? ( dev-libs/jemalloc ) libuv? ( >=dev-libs/libuv-1.13:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= nettle? ( >=dev-libs/nettle-2.4:0= bittorrent? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) !gnutls? ( dev-libs/openssl:0= ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0= bittorrent? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) test? ( >=dev-util/cppunit-1.12.0:0 )
-DESCRIPTION=A download utility with segmented downloading with BitTorrent support
-EAPI=7
-HOMEPAGE=https://aria2.github.io/
-IUSE=adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=sys-libs/zlib:0= adns? ( >=net-dns/c-ares-1.5.0:0= ) jemalloc? ( dev-libs/jemalloc ) libuv? ( >=dev-libs/libuv-1.13:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= nettle? ( >=dev-libs/nettle-2.4:0= bittorrent? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) !gnutls? ( dev-libs/openssl:0= ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0= bittorrent? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) nls? ( virtual/libiconv virtual/libintl ) scripts? ( dev-lang/ruby )
-REQUIRED_USE=?? ( jemalloc tcmalloc ) metalink? ( xmlrpc )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aria2/aria2/releases/download/release-1.35.0/aria2-1.35.0.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6f12868661cd9325d9430db997185164
diff --git a/metadata/md5-cache/net-misc/aria2-1.36.0 b/metadata/md5-cache/net-misc/aria2-1.36.0
index a0925100a3d4..e3bdf3a81bd9 100644
--- a/metadata/md5-cache/net-misc/aria2-1.36.0
+++ b/metadata/md5-cache/net-misc/aria2-1.36.0
@@ -5,7 +5,7 @@ DESCRIPTION=A download utility with segmented downloading with BitTorrent suppor
 EAPI=8
 HOMEPAGE=https://aria2.github.io/
 IUSE=adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=sys-libs/zlib:0= adns? ( >=net-dns/c-ares-1.5.0:0= ) jemalloc? ( dev-libs/jemalloc ) libuv? ( >=dev-libs/libuv-1.13:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= nettle? ( >=dev-libs/nettle-2.4:0= bittorrent? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) !gnutls? ( dev-libs/openssl:0= ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0= bittorrent? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) nls? ( virtual/libiconv virtual/libintl ) scripts? ( dev-lang/ruby )
 REQUIRED_USE=?? ( jemalloc tcmalloc ) metalink? ( xmlrpc )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aria2/aria2/releases/download/release-1.36.0/aria2-1.36.0.tar.xz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7a61b86262d87324f0def91b3ecce6cf
+_md5_=8f076ff0b6f9ba031ac3782ceb556dbe
diff --git a/metadata/md5-cache/net-misc/asterisk-13.38.3-r1 b/metadata/md5-cache/net-misc/asterisk-13.38.3-r1
index d95ff06fde99..0bcc6a1f2c99 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.38.3-r1
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.3-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0/13
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.3.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c609c8958fc81fed55c10bd893a4df0f
diff --git a/metadata/md5-cache/net-misc/asterisk-16.19.1-r1 b/metadata/md5-cache/net-misc/asterisk-16.19.1-r1
index baf67ccdd4a7..8998fd935011 100644
--- a/metadata/md5-cache/net-misc/asterisk-16.19.1-r1
+++ b/metadata/md5-cache/net-misc/asterisk-16.19.1-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=d
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0/16
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.19.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=01a7eff4fac3d5d03a23f68f1f96730c
diff --git a/metadata/md5-cache/net-misc/asterisk-16.20.0-r1 b/metadata/md5-cache/net-misc/asterisk-16.20.0-r1
index 1456dadaaf5d..24078ec35d15 100644
--- a/metadata/md5-cache/net-misc/asterisk-16.20.0-r1
+++ b/metadata/md5-cache/net-misc/asterisk-16.20.0-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=d
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0/16
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.20.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e5f026629f79d3083d94bcc2afd6c6aa
diff --git a/metadata/md5-cache/net-misc/asterisk-16.21.1 b/metadata/md5-cache/net-misc/asterisk-16.21.1
new file mode 100644
index 000000000000..a9e6fc92100a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-16.21.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=7
+HOMEPAGE=https://www.asterisk.org/
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
+REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
+SLOT=0/16
+SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.21.1.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e5f026629f79d3083d94bcc2afd6c6aa
diff --git a/metadata/md5-cache/net-misc/asterisk-18.5.1-r1 b/metadata/md5-cache/net-misc/asterisk-18.5.1-r1
index 93766e1d1d88..844780842166 100644
--- a/metadata/md5-cache/net-misc/asterisk-18.5.1-r1
+++ b/metadata/md5-cache/net-misc/asterisk-18.5.1-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=d
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) voicemail_storage_odbc? ( odbc )
 SLOT=0/18
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-18.5.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e645371db43f20ef522695243a0699cc
diff --git a/metadata/md5-cache/net-misc/asterisk-18.6.0-r1 b/metadata/md5-cache/net-misc/asterisk-18.6.0-r1
index ad7f0025eab6..b1983921e62e 100644
--- a/metadata/md5-cache/net-misc/asterisk-18.6.0-r1
+++ b/metadata/md5-cache/net-misc/asterisk-18.6.0-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=d
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) voicemail_storage_odbc? ( odbc )
 SLOT=0/18
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-18.6.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e645371db43f20ef522695243a0699cc
diff --git a/metadata/md5-cache/net-misc/asterisk-18.7.1 b/metadata/md5-cache/net-misc/asterisk-18.7.1
new file mode 100644
index 000000000000..761faf76dad7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-18.7.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=7
+HOMEPAGE=https://www.asterisk.org/
+IUSE=voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
+REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) voicemail_storage_odbc? ( odbc )
+SLOT=0/18
+SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-18.7.1.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e645371db43f20ef522695243a0699cc
diff --git a/metadata/md5-cache/net-misc/batctl-2021.1 b/metadata/md5-cache/net-misc/batctl-2021.1
index f508c5573bdd..942690b7e5fc 100644
--- a/metadata/md5-cache/net-misc/batctl-2021.1
+++ b/metadata/md5-cache/net-misc/batctl-2021.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 MIT ISC
 RDEPEND=dev-libs/libnl:3
 SLOT=0
 SRC_URI=https://downloads.open-mesh.org/batman/releases/batman-adv-2021.1/batctl-2021.1.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8bef0fc8fde8779fc76237fc54be31ed
diff --git a/metadata/md5-cache/net-misc/bird-2.0.7 b/metadata/md5-cache/net-misc/bird-2.0.7
index b4de3fe767a6..fde41c8b936f 100644
--- a/metadata/md5-cache/net-misc/bird-2.0.7
+++ b/metadata/md5-cache/net-misc/bird-2.0.7
@@ -4,9 +4,9 @@ DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6
 EAPI=7
 HOMEPAGE=http://bird.network.cz
 IUSE=+client debug
-KEYWORDS=~amd64 ~arm64 ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm64 ~x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=client? ( sys-libs/ncurses ) client? ( sys-libs/readline )
 SLOT=0
 SRC_URI=ftp://bird.network.cz/pub/bird/bird-2.0.7.tar.gz
-_md5_=ce3cb74453eebf01cd49e0a7ce92a7a7
+_md5_=3a809226d791a853ed625ed15d9dc9a7
diff --git a/metadata/md5-cache/net-misc/bridge-utils-1.6 b/metadata/md5-cache/net-misc/bridge-utils-1.6
index 545359ee2be6..4a242cc11f87 100644
--- a/metadata/md5-cache/net-misc/bridge-utils-1.6
+++ b/metadata/md5-cache/net-misc/bridge-utils-1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-brctl )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/net/bridge-utils/bridge-utils-1.6.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0d0908e80c77b7befbc566e2365415e2
diff --git a/metadata/md5-cache/net-misc/bridge-utils-1.7.1 b/metadata/md5-cache/net-misc/bridge-utils-1.7.1
index 9591a9d8840b..a8ac81e566f1 100644
--- a/metadata/md5-cache/net-misc/bridge-utils-1.7.1
+++ b/metadata/md5-cache/net-misc/bridge-utils-1.7.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-brctl )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/net/bridge-utils/bridge-utils-1.7.1.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=49b1cd3e90bfcea9150b94260e73e1b4
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.8.6 b/metadata/md5-cache/net-misc/cni-plugins-0.8.6
index 25abaa3e0625..d08ec266cd0b 100644
--- a/metadata/md5-cache/net-misc/cni-plugins-0.8.6
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.8.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/containernetworking/plugins/archive/v0.8.6.tar.gz -> cni-plugins-0.8.6.tar.gz
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e8114082106e912cd54816c631705ebc
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.8.7 b/metadata/md5-cache/net-misc/cni-plugins-0.8.7
index 4b29e1f17aca..cb317e37890c 100644
--- a/metadata/md5-cache/net-misc/cni-plugins-0.8.7
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.8.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/containernetworking/plugins/archive/v0.8.7.tar.gz -> cni-plugins-0.8.7.tar.gz
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=40325f5628dad3e089b30dda7ff225cb
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.9.0 b/metadata/md5-cache/net-misc/cni-plugins-0.9.0
index 98492bf8d3c2..3b8595940157 100644
--- a/metadata/md5-cache/net-misc/cni-plugins-0.9.0
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.9.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/containernetworking/plugins/archive/v0.9.0.tar.gz -> cni-plugins-0.9.0.tar.gz
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4c396bf9194eadcaabc1a5f3acbc5a9b
diff --git a/metadata/md5-cache/net-misc/cni-plugins-0.9.1 b/metadata/md5-cache/net-misc/cni-plugins-0.9.1
index 480a0feb3665..8b63447b6468 100644
--- a/metadata/md5-cache/net-misc/cni-plugins-0.9.1
+++ b/metadata/md5-cache/net-misc/cni-plugins-0.9.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/containernetworking/plugins/archive/v0.9.1.tar.gz -> cni-plugins-0.9.1.tar.gz
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0a78793b400d0592418126eb766609ea
diff --git a/metadata/md5-cache/net-misc/croc-9.2.1 b/metadata/md5-cache/net-misc/croc-9.2.1
deleted file mode 100644
index d01977d6d22f..000000000000
--- a/metadata/md5-cache/net-misc/croc-9.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install prepare test unpack
-DESCRIPTION=Easily and securely send things from one computer to another
-EAPI=7
-HOMEPAGE=https://github.com/schollz/croc
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0 BSD BSD-2 MIT
-RDEPEND=acct-group/croc acct-user/croc
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/schollz/croc/releases/download/v9.2.1/croc_9.2.1_src.tar.gz -> croc-9.2.1.tar.gz mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.1.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.1.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.zip -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.mod -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/k0kubun/go-ansi/@v/v0.0.0-20180517002512-3bf9e2903213.mod -> github.com%2Fk0kubun%2Fgo-ansi%2F@v%2Fv0.0.0-20180517002512-3bf9e2903213.mod mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.2.zip -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.2.mod -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.13.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.13.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.13.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.zip -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.mod -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.zip -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.zip mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.mod -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.mod mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.zip -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.mod -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.zip -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.mod -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/schollz/pake/v3/@v/v3.0.2.zip -> github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//github.com/schollz/pake/v3/@v/v3.0.2.mod -> github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.6.zip -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.6.zip mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.6.mod -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.6.mod mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.8.2.zip -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.2.zip mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.8.2.mod -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.2.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.mod -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.mod mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20210707234609-9bdfc483d499.zip -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20210707234609-9bdfc483d499.zip mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20210707234609-9bdfc483d499.mod -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20210707234609-9bdfc483d499.mod mirror://goproxy//github.com/twmb/murmur3/@v/v1.1.5.zip -> github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/twmb/murmur3/@v/v1.1.5.mod -> github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210616213533-5ff15b29337e.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210711020723-a769d52b0f97.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210711020723-a769d52b0f97.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210711020723-a769d52b0f97.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210711020723-a769d52b0f97.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210510120150-4163338589ed.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210805182204-aaa1db679c0d.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210805182204-aaa1db679c0d.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210805182204-aaa1db679c0d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210805182204-aaa1db679c0d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210511113859-b0526f3d8744.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210511113859-b0526f3d8744.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210616094352-59db8d763f22.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210806184541-e5e7981a1069.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210806184541-e5e7981a1069.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210806184541-e5e7981a1069.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210806184541-e5e7981a1069.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.zip -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.mod -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9a53dc388c6c0eb6e36eea54b6110f94
diff --git a/metadata/md5-cache/net-misc/croc-9.4.2 b/metadata/md5-cache/net-misc/croc-9.4.2
new file mode 100644
index 000000000000..06dba67da9cb
--- /dev/null
+++ b/metadata/md5-cache/net-misc/croc-9.4.2
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test unpack
+DESCRIPTION=Easily and securely send things from one computer to another
+EAPI=7
+HOMEPAGE=https://github.com/schollz/croc
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0 BSD BSD-2 MIT
+RDEPEND=acct-group/croc acct-user/croc
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/schollz/croc/releases/download/v9.4.2/croc_9.4.2_src.tar.gz -> croc-9.4.2.tar.gz mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.1.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.1.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.zip -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.mod -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/k0kubun/go-ansi/@v/v0.0.0-20180517002512-3bf9e2903213.mod -> github.com%2Fk0kubun%2Fgo-ansi%2F@v%2Fv0.0.0-20180517002512-3bf9e2903213.mod mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.2.zip -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.2.mod -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.14.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.13.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.13.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.zip -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.mod -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.zip -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.zip mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.mod -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.mod mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.zip -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.mod -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.zip -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.mod -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/schollz/pake/v3/@v/v3.0.2.zip -> github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//github.com/schollz/pake/v3/@v/v3.0.2.mod -> github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.9.zip -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.9.zip mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.9.mod -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.9.mod mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.8.3.zip -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.3.zip mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.8.3.mod -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.3.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.mod -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.mod mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20210707234609-9bdfc483d499.zip -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20210707234609-9bdfc483d499.zip mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20210707234609-9bdfc483d499.mod -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20210707234609-9bdfc483d499.mod mirror://goproxy//github.com/twmb/murmur3/@v/v1.1.5.mod -> github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/twmb/murmur3/@v/v1.1.6.zip -> github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/twmb/murmur3/@v/v1.1.6.mod -> github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.6.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210921155107-089bfa567519.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210921155107-089bfa567519.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210929193557-e81a3d93ecf6.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210929193557-e81a3d93ecf6.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210929193557-e81a3d93ecf6.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210929193557-e81a3d93ecf6.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210910150752-751e447fb3d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210910150752-751e447fb3d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20211002104244-808efd93c36d.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211002104244-808efd93c36d.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20211002104244-808efd93c36d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211002104244-808efd93c36d.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210927222741-03fcf44c2211.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210927222741-03fcf44c2211.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210927222741-03fcf44c2211.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210927222741-03fcf44c2211.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/text/@v/v0.3.7.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.7.zip mirror://goproxy//golang.org/x/text/@v/v0.3.7.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.zip -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.mod -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b6d2a60bf46c479ee9f3004537c3f7fd
diff --git a/metadata/md5-cache/net-misc/dahdi-3.1.0-r2 b/metadata/md5-cache/net-misc/dahdi-3.1.0-r2
index f318fd6e783d..9cbf101274c9 100644
--- a/metadata/md5-cache/net-misc/dahdi-3.1.0-r2
+++ b/metadata/md5-cache/net-misc/dahdi-3.1.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-3.1.0.tar.gz https://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=49db885ea4657a53aacd20481a8f34cc
diff --git a/metadata/md5-cache/net-misc/dahdi-3.1.0-r3 b/metadata/md5-cache/net-misc/dahdi-3.1.0-r3
index d80ed29f62f4..c6719ab78682 100644
--- a/metadata/md5-cache/net-misc/dahdi-3.1.0-r3
+++ b/metadata/md5-cache/net-misc/dahdi-3.1.0-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-3.1.0.tar.gz https://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7f0788193898d9132d7236320522e8a5
diff --git a/metadata/md5-cache/net-misc/dropbox-133.4.4089 b/metadata/md5-cache/net-misc/dropbox-133.4.4089
new file mode 100644
index 000000000000..60600177b630
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbox-133.4.4089
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/patchelf virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
+EAPI=7
+HOMEPAGE=https://www.dropbox.com/
+IUSE=selinux X
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
+RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcb
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-133.4.4089.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-133.4.4089.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5e792a6a58a299121e467bbadbd00e03
diff --git a/metadata/md5-cache/net-misc/ena-driver-2.0.3-r1 b/metadata/md5-cache/net-misc/ena-driver-2.0.3-r1
index fd40f17cc0a1..e4d80723f713 100644
--- a/metadata/md5-cache/net-misc/ena-driver-2.0.3-r1
+++ b/metadata/md5-cache/net-misc/ena-driver-2.0.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/amzn/amzn-drivers/archive/ena_linux_2.0.3.zip -> ena-driver-2.0.3-linux.zip
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=383b1881c2307159ca0b350a22a09a07
diff --git a/metadata/md5-cache/net-misc/ena-driver-2.2.3-r1 b/metadata/md5-cache/net-misc/ena-driver-2.2.3-r1
index 3fa8d11cf10b..1ee1adf0c0ac 100644
--- a/metadata/md5-cache/net-misc/ena-driver-2.2.3-r1
+++ b/metadata/md5-cache/net-misc/ena-driver-2.2.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/amzn/amzn-drivers/archive/ena_linux_2.2.3.tar.gz -> ena-driver-2.2.3-linux.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a5ed861bfe8533ae6ad66d6a0cbb02f8
diff --git a/metadata/md5-cache/net-misc/eventd-0.27.0-r1 b/metadata/md5-cache/net-misc/eventd-0.27.0-r1
index 10138ccdfed4..9276eb7e1ca6 100644
--- a/metadata/md5-cache/net-misc/eventd-0.27.0-r1
+++ b/metadata/md5-cache/net-misc/eventd-0.27.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=X? ( notification ) fbcon? ( notification ) notification? ( || ( X
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.eventd.org/download/eventd/eventd-0.27.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fe2dc8bb9bad2c8f8eebb601214b3f54
diff --git a/metadata/md5-cache/net-misc/frr-8.0.1 b/metadata/md5-cache/net-misc/frr-8.0.1
index f8d1f2f5cd2c..6c4e7219c4d9 100644
--- a/metadata/md5-cache/net-misc/frr-8.0.1
+++ b/metadata/md5-cache/net-misc/frr-8.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=The FRRouting Protocol Suite
 EAPI=7
 HOMEPAGE=https://frrouting.org/
 IUSE=doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-user/frr dev-libs/json-c:0= >=net-libs/libyang-2.0.0 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= grpc? ( net-libs/grpc:= ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) snmp? ( net-analyzer/net-snmp:= ) python_single_target_python3_8? ( dev-python/ipaddr[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/ipaddr[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/ipaddr[python_targets_python3_10(-)] ) !net-misc/quagga
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FRRouting/frr/archive/frr-8.0.1.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=484dfa31d2976118032dd9eb6469eae4
+_md5_=63c140a7d48249ec4e0c340eaadce7c7
diff --git a/metadata/md5-cache/net-misc/gerbera-1.8.2 b/metadata/md5-cache/net-misc/gerbera-1.8.2
index 1c73c9f92d3a..5fdb471f616f 100644
--- a/metadata/md5-cache/net-misc/gerbera-1.8.2
+++ b/metadata/md5-cache/net-misc/gerbera-1.8.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=acct-user/gerbera >=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml dev-libs/libfmt:0= mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape:= ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv
 SLOT=0
 SRC_URI=https://github.com/gerbera/gerbera/archive/v1.8.2.tar.gz -> gerbera-1.8.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=082ea0065a6b5831c357404ce6bb7f0b
diff --git a/metadata/md5-cache/net-misc/gerbera-1.9.2 b/metadata/md5-cache/net-misc/gerbera-1.9.2
index 746d8202b90a..2c451ff485df 100644
--- a/metadata/md5-cache/net-misc/gerbera-1.9.2
+++ b/metadata/md5-cache/net-misc/gerbera-1.9.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=acct-user/gerbera >=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml dev-libs/libfmt:0= dev-libs/libebml:= mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape:= ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska:= ) sys-apps/util-linux sys-libs/zlib virtual/libiconv
 SLOT=0
 SRC_URI=https://github.com/gerbera/gerbera/archive/v1.9.2.tar.gz -> gerbera-1.9.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=7793c09300b1585f75b30d44c1e2c807
diff --git a/metadata/md5-cache/net-misc/gerbera-9999 b/metadata/md5-cache/net-misc/gerbera-9999
index 239154d12af4..f43bdd5e8a9c 100644
--- a/metadata/md5-cache/net-misc/gerbera-9999
+++ b/metadata/md5-cache/net-misc/gerbera-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=acct-user/gerbera >=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml dev-libs/libfmt:0= mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape:= ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=082ea0065a6b5831c357404ce6bb7f0b
diff --git a/metadata/md5-cache/net-misc/gsutil-4.59-r1 b/metadata/md5-cache/net-misc/gsutil-4.59-r1
deleted file mode 100644
index 86c6822ef481..000000000000
--- a/metadata/md5-cache/net-misc/gsutil-4.59-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/argcomplete-1.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto-2.49.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/crcmod-1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fasteners-0.14.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/gcs-oauth2-boto-plugin-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-apitools-0.5.30[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-reauth-python-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/httplib2-0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyopenssl-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/retry-decorator-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=command line tool for interacting with cloud storage services
-EAPI=7
-HOMEPAGE=https://github.com/GoogleCloudPlatform/gsutil
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/argcomplete-1.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto-2.49.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/crcmod-1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fasteners-0.14.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/gcs-oauth2-boto-plugin-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-apitools-0.5.30[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-reauth-python-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/httplib2-0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyopenssl-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/retry-decorator-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) test
-SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.59.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=efb29386cee74ab5d25b2dde572de192
diff --git a/metadata/md5-cache/net-misc/gsutil-4.68 b/metadata/md5-cache/net-misc/gsutil-4.68
new file mode 100644
index 000000000000..cb558d573244
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gsutil-4.68
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/argcomplete-1.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto-2.49.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/crcmod-1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fasteners-0.14.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/gcs-oauth2-boto-plugin-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-apitools-0.5.32[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-reauth-python-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/httplib2-0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyopenssl-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/retry-decorator-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DESCRIPTION=command line tool for interacting with cloud storage services
+EAPI=7
+HOMEPAGE=https://github.com/GoogleCloudPlatform/gsutil
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/argcomplete-1.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/boto-2.49.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/crcmod-1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/fasteners-0.14.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/gcs-oauth2-boto-plugin-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-apitools-0.5.32[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-reauth-python-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/httplib2-0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyopenssl-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/retry-decorator-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/six-1.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.68.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a2ae255b8a2617b566d5cfa4cddf7a46
diff --git a/metadata/md5-cache/net-misc/gvrpcd-1.3 b/metadata/md5-cache/net-misc/gvrpcd-1.3
index ab418095f2a5..3bfd9ea9be6b 100644
--- a/metadata/md5-cache/net-misc/gvrpcd-1.3
+++ b/metadata/md5-cache/net-misc/gvrpcd-1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libnet:1.1
 SLOT=0
 SRC_URI=http://sokrates.mimuw.edu.pl/~sebek/gvrpcd/gvrpcd-1.3.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=24335f947d51738af10406a20865013d
diff --git a/metadata/md5-cache/net-misc/htbinit-0.8.5-r7 b/metadata/md5-cache/net-misc/htbinit-0.8.5-r7
index 476d3da1f4d4..67045f5edebf 100644
--- a/metadata/md5-cache/net-misc/htbinit-0.8.5-r7
+++ b/metadata/md5-cache/net-misc/htbinit-0.8.5-r7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/iproute2
 SLOT=0
 SRC_URI=mirror://sourceforge/htbinit/htb.init-v0.8.5
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e906ae36ca1cee9747c8f24265199248
diff --git a/metadata/md5-cache/net-misc/httpie-2.6.0 b/metadata/md5-cache/net-misc/httpie-2.6.0
new file mode 100644
index 000000000000..c820e28b0a20
--- /dev/null
+++ b/metadata/md5-cache/net-misc/httpie-2.6.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/charset_normalizer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-httpbin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/charset_normalizer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Modern command line HTTP client
+EAPI=7
+HOMEPAGE=https://httpie.io/ https://pypi.org/project/httpie/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/charset_normalizer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/httpie/httpie/archive/2.6.0.tar.gz -> httpie-2.6.0.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7a569b73cf0eed581661316d5f9f6e8c
diff --git a/metadata/md5-cache/net-misc/ifenslave-1.1.0-r6 b/metadata/md5-cache/net-misc/ifenslave-1.1.0-r6
index fa1c0a90fbe8..adb51cd5e925 100644
--- a/metadata/md5-cache/net-misc/ifenslave-1.1.0-r6
+++ b/metadata/md5-cache/net-misc/ifenslave-1.1.0-r6
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~mips ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/ifenslave-2.6/ifenslave-2.6_1.1.0.orig.tar.gz mirror://debian/pool/main/i/ifenslave-2.6/ifenslave-2.6_1.1.0-17.debian.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c8b02a22e749485eaa5267a6067caccd
diff --git a/metadata/md5-cache/net-misc/igmpproxy-0.3 b/metadata/md5-cache/net-misc/igmpproxy-0.3
index 5204a9c8e8aa..5b59d643e581 100644
--- a/metadata/md5-cache/net-misc/igmpproxy-0.3
+++ b/metadata/md5-cache/net-misc/igmpproxy-0.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/pali/igmpproxy/releases/download/0.3/igmpproxy-0.3.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=97d5c621d66037dd0c3c460b2c7eb879
diff --git a/metadata/md5-cache/net-misc/iputils-20210722-r1 b/metadata/md5-cache/net-misc/iputils-20210722-r1
new file mode 100644
index 000000000000..b71a36e2f75f
--- /dev/null
+++ b/metadata/md5-cache/net-misc/iputils-20210722-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig test? ( sys-apps/iproute2 ) nls? ( sys-devel/gettext ) filecaps? ( sys-libs/libcap ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=traceroute6? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) ) virtual/os-headers static? ( caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn2:=[static-libs(+)] ) nls? ( virtual/libintl[static-libs(+)] ) )
+DESCRIPTION=Network monitoring tools including ping and ping6
+EAPI=7
+HOMEPAGE=https://wiki.linuxfoundation.org/networking/iputils
+IUSE=+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6 +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD GPL-2+ rdisc
+RDEPEND=traceroute6? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) ) filecaps? ( sys-libs/libcap )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/iputils/iputils/archive/20210722.tar.gz -> iputils-20210722.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20210722.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=dbe5fe6ec460386b2853102a34135f97
diff --git a/metadata/md5-cache/net-misc/libteam-1.31-r1 b/metadata/md5-cache/net-misc/libteam-1.31-r1
index 26bf21fce6d3..e522063ef8d0 100644
--- a/metadata/md5-cache/net-misc/libteam-1.31-r1
+++ b/metadata/md5-cache/net-misc/libteam-1.31-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/jansson-2.4:= dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
 SLOT=0
 SRC_URI=https://github.com/jpirko/libteam/archive/v1.31.tar.gz -> libteam-1.31.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=74d61c9d81afebeeb5e33f802e460ece
diff --git a/metadata/md5-cache/net-misc/libteam-9999 b/metadata/md5-cache/net-misc/libteam-9999
index e848022316a9..fc0ac89f636c 100644
--- a/metadata/md5-cache/net-misc/libteam-9999
+++ b/metadata/md5-cache/net-misc/libteam-9999
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 PROPERTIES=live
 RDEPEND=>=dev-libs/jansson-2.4:= dev-libs/libdaemon >=dev-libs/libnl-3.2.19[utils] dbus? ( sys-apps/dbus ) zmq? ( >=net-libs/zeromq-3.2.0 ) syslog? ( virtual/logger )
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=592786e40fb35bc978137378c03e36a7
diff --git a/metadata/md5-cache/net-misc/linuxptp-2.0-r1 b/metadata/md5-cache/net-misc/linuxptp-2.0-r1
index 094319dfb9b7..911aad2c85b0 100644
--- a/metadata/md5-cache/net-misc/linuxptp-2.0-r1
+++ b/metadata/md5-cache/net-misc/linuxptp-2.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxptp/v2.0/linuxptp-2.0.tgz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2f33b78945ce03740e9cbdb913178164
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.19 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.19
index 8f8eef9a4a72..e24d177a0028 100644
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.19
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.19
@@ -10,5 +10,5 @@ LICENSE=|| ( GPL-2+ LGPL-2.1 )
 REQUIRED_USE=kernel_linux
 SLOT=0
 SRC_URI=https://github.com/sctp/lksctp-tools/archive/v1.0.19.tar.gz -> lksctp-tools-1.0.19.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e0576fcae8484815aa21f2a04478c0fd
diff --git a/metadata/md5-cache/net-misc/mcproxy-1.1.1-r1 b/metadata/md5-cache/net-misc/mcproxy-1.1.1-r1
index 7ad0a769be93..b5e601c8e2a5 100644
--- a/metadata/md5-cache/net-misc/mcproxy-1.1.1-r1
+++ b/metadata/md5-cache/net-misc/mcproxy-1.1.1-r1
@@ -9,5 +9,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/mcproxy/mcproxy/archive/v1.1.1.tar.gz -> mcproxy-1.1.1.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f21ae2dee15fc7e56dab41adfb643522
diff --git a/metadata/md5-cache/net-misc/mikutter-4.0.6-r1 b/metadata/md5-cache/net-misc/mikutter-4.0.6-r1
deleted file mode 100644
index b864a249c0ec..000000000000
--- a/metadata/md5-cache/net-misc/mikutter-4.0.6-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby26(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby26(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby26(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby26(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby26(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby26(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby26(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby26(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DESCRIPTION=Simple, powerful and moeful twitter client
-EAPI=7
-HOMEPAGE=https://mikutter.hachune.net/
-IUSE=+libnotify test ruby_targets_ruby26
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby26? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby26(-)] =dev-ruby/delayer-1.1*:1[ruby_targets_ruby26(-)] =dev-ruby/delayer-deferred-2.1*[ruby_targets_ruby26(-)] !<dev-ruby/delayer-deferred-2.1.3[ruby_targets_ruby26(-)] =dev-ruby/diva-1.0*[ruby_targets_ruby26(-)] !<dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] =dev-ruby/memoist-0.16*[ruby_targets_ruby26(-)] !<dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] =dev-ruby/pluggaloid-1.2*[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] =dev-ruby/ruby-gettext-3.3*[ruby_targets_ruby26(-)] !<dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] =dev-ruby/typed-array-0.1*[ruby_targets_ruby26(-)] !<dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://mikutter.hachune.net/bin/mikutter-4.0.6.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c31e22b53a6011aedd7ec1ae4523d823
diff --git a/metadata/md5-cache/net-misc/mikutter-4.1.5-r1 b/metadata/md5-cache/net-misc/mikutter-4.1.5-r1
deleted file mode 100644
index 74ac9b0b5638..000000000000
--- a/metadata/md5-cache/net-misc/mikutter-4.1.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby26(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby26(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby26(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby26(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby26(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby26(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby26(-)] dev-ruby/twitter-text[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby27(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby27(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby27(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby27(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby27(-)] dev-ruby/httpclient[ruby_targets_ruby27(-)] dev-ruby/json:2[ruby_targets_ruby27(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby27(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby27(-)] dev-ruby/moneta[ruby_targets_ruby27(-)] dev-ruby/nokogiri[ruby_targets_ruby27(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby27(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby27(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby27(-)] dev-ruby/rcairo[ruby_targets_ruby27(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby27(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby27(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby27(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby27(-)] dev-ruby/twitter-text[ruby_targets_ruby27(-)] virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-DESCRIPTION=Simple, powerful and moeful twitter client
-EAPI=7
-HOMEPAGE=https://mikutter.hachune.net/
-IUSE=+libnotify test ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby26? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby26(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby26(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby26(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby26(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby26(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby26(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby26(-)] dev-ruby/twitter-text[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby27(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby27(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby27(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby27(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby27(-)] dev-ruby/httpclient[ruby_targets_ruby27(-)] dev-ruby/json:2[ruby_targets_ruby27(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby27(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby27(-)] dev-ruby/moneta[ruby_targets_ruby27(-)] dev-ruby/nokogiri[ruby_targets_ruby27(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby27(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby27(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby27(-)] dev-ruby/rcairo[ruby_targets_ruby27(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby27(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby27(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby27(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby27(-)] dev-ruby/twitter-text[ruby_targets_ruby27(-)] virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://mikutter.hachune.net/bin/mikutter-4.1.5.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=46a05265b3dc559c3e166e3f611cd3b0
diff --git a/metadata/md5-cache/net-misc/mikutter-4.1.7 b/metadata/md5-cache/net-misc/mikutter-4.1.7
new file mode 100644
index 000000000000..ad3f1906fe0f
--- /dev/null
+++ b/metadata/md5-cache/net-misc/mikutter-4.1.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby26(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby26(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby26(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby26(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby26(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby26(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby26(-)] dev-ruby/twitter-text[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby27(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby27(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby27(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby27(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby27(-)] dev-ruby/httpclient[ruby_targets_ruby27(-)] dev-ruby/json:2[ruby_targets_ruby27(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby27(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby27(-)] dev-ruby/moneta[ruby_targets_ruby27(-)] dev-ruby/nokogiri[ruby_targets_ruby27(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby27(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby27(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby27(-)] dev-ruby/rcairo[ruby_targets_ruby27(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby27(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby27(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby27(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby27(-)] dev-ruby/twitter-text[ruby_targets_ruby27(-)] virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+DESCRIPTION=Simple, powerful and moeful twitter client
+EAPI=7
+HOMEPAGE=https://mikutter.hachune.net/
+IUSE=+libnotify test ruby_targets_ruby26 ruby_targets_ruby27
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby26? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby26(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby26(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby26(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby26(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby26(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby26(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby26(-)] dev-ruby/httpclient[ruby_targets_ruby26(-)] dev-ruby/json:2[ruby_targets_ruby26(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby26(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby26(-)] dev-ruby/moneta[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby26(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby26(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby26(-)] dev-ruby/rcairo[ruby_targets_ruby26(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby26(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby26(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby26(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby26(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby26(-)] dev-ruby/twitter-text[ruby_targets_ruby26(-)] virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/addressable-2.8*[ruby_targets_ruby27(-)] >=dev-ruby/delayer-1.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-2.0[ruby_targets_ruby27(-)] >=dev-ruby/delayer-deferred-2.2.0[ruby_targets_ruby27(-)] !>=dev-ruby/delayer-deferred-3.0[ruby_targets_ruby27(-)] >=dev-ruby/diva-1.0.2[ruby_targets_ruby27(-)] !>=dev-ruby/diva-2.0[ruby_targets_ruby27(-)] dev-ruby/httpclient[ruby_targets_ruby27(-)] dev-ruby/json:2[ruby_targets_ruby27(-)] >=dev-ruby/memoist-0.16.2[ruby_targets_ruby27(-)] !>=dev-ruby/memoist-0.17[ruby_targets_ruby27(-)] dev-ruby/moneta[ruby_targets_ruby27(-)] dev-ruby/nokogiri[ruby_targets_ruby27(-)] >=dev-ruby/oauth-0.5.4[ruby_targets_ruby27(-)] >=dev-ruby/pluggaloid-1.5.0[ruby_targets_ruby27(-)] !>=dev-ruby/pluggaloid-2.0[ruby_targets_ruby27(-)] dev-ruby/rcairo[ruby_targets_ruby27(-)] >=dev-ruby/ruby-gettext-3.3.5[ruby_targets_ruby27(-)] !>=dev-ruby/ruby-gettext-3.4[ruby_targets_ruby27(-)] =dev-ruby/ruby-gtk2-3.4*[ruby_targets_ruby27(-)] >=dev-ruby/typed-array-0.1.2[ruby_targets_ruby27(-)] !>=dev-ruby/typed-array-0.2[ruby_targets_ruby27(-)] dev-ruby/twitter-text[ruby_targets_ruby27(-)] virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://mikutter.hachune.net/bin/mikutter-4.1.7.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/30071c3008e4616e723cf4e734fc79254019af09/twitter_api_keys.rb
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=46a05265b3dc559c3e166e3f611cd3b0
diff --git a/metadata/md5-cache/net-misc/mstpd-0.1.0 b/metadata/md5-cache/net-misc/mstpd-0.1.0
new file mode 100644
index 000000000000..0bc2776a116f
--- /dev/null
+++ b/metadata/md5-cache/net-misc/mstpd-0.1.0
@@ -0,0 +1,11 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Multiple spanning tree protocol daemon
+EAPI=8
+HOMEPAGE=https://github.com/mstpd/mstpd
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/mstpd/mstpd/archive/0.1.0.tar.gz -> mstpd-0.1.0.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=89012b0938e28127f64f3c6aba2d1758
diff --git a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r13 b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r13
deleted file mode 100644
index dd42c12ac317..000000000000
--- a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r13
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/xz-utils filecaps? ( sys-libs/libcap )
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/ncurses:0= virtual/libcrypt:= pam? ( >=sys-auth/pambase-20080219.1 )
-DESCRIPTION=Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}
-EAPI=7
-HOMEPAGE=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
-IUSE=pam +filecaps
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=sys-libs/ncurses:0= virtual/libcrypt:= pam? ( >=sys-auth/pambase-20080219.1 ) filecaps? ( sys-libs/libcap )
-SLOT=0
-SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rsh-0.17.tar.gz mirror://gentoo/rexec-1.5.tar.gz mirror://gentoo/netkit-rsh-0.17-patches-3.tar.lzma
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6d72227359d3ba9cf201fa1bf5d98c12
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.10-r1 b/metadata/md5-cache/net-misc/networkmanager-1.32.10-r1
index f72f102f01ea..20530ebf6639 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.32.10-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-1.32.10-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nft
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.32/NetworkManager-1.32.10.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e0c9283e93e1c14e8a7eafafd29dde98
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.12 b/metadata/md5-cache/net-misc/networkmanager-1.32.12
new file mode 100644
index 000000000000..271cbfba3e5b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.32.12
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) test? ( >=dev-libs/jansson-2.7 || ( ( dev-lang/python:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( sys-libs/readline:0= >=dev-libs/newt-0.52.15 ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd kernel_linux psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( sys-libs/readline:0= >=dev-libs/newt-0.52.15 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
+REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) gtk-doc? ( introspection ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) ?? ( elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager/1.32/NetworkManager-1.32.12.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b930a45152ca7ec338edd38729ad0bcf
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.4-r1 b/metadata/md5-cache/net-misc/networkmanager-1.32.4-r1
index 82be3e448cb7..3b7cc2b9499c 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.32.4-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-1.32.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nft
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.32/NetworkManager-1.32.4.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0884bda5ec8d42cddddb671fbff1da2b
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.8-r1 b/metadata/md5-cache/net-misc/networkmanager-1.32.8-r1
index 236669adef2e..4503758de052 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.32.8-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-1.32.8-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nft
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.32/NetworkManager-1.32.8.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vala	5ef05fa2f1612e51f4aea8c92b09e08d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8f53d656eb91902866b6656eca7466e5
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p15 b/metadata/md5-cache/net-misc/ntp-4.2.8_p15
index b4731151a983..ab09df3c9bb2 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p15
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p15
@@ -12,4 +12,4 @@ RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[thr
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p15.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p15-manpages.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f54572cc1745625e969001880df5bacc
+_md5_=fd79393affeec4c09ae5372eceeb46df
diff --git a/metadata/md5-cache/net-misc/olsrd-0.9.8_p20210612 b/metadata/md5-cache/net-misc/olsrd-0.9.8_p20210612
new file mode 100644
index 000000000000..70b67a927cf4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/olsrd-0.9.8_p20210612
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) pud? ( sci-geosciences/gpsd )
+DESCRIPTION=An implementation of the Optimized Link State Routing protocol
+EAPI=7
+HOMEPAGE=http://www.olsr.org/
+IUSE=gtk pud
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD LGPL-2.1
+RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) pud? ( sci-geosciences/gpsd )
+SLOT=0
+SRC_URI=https://github.com/OLSR/olsrd/archive/4973feb538b5b98b9d8ac2f8f474202f6d73de78.tar.gz -> olsrd-0.9.8_p20210612.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=74cd83a3484988a96f49c9c58b1fa606
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.14.1 b/metadata/md5-cache/net-misc/openvswitch-2.14.1
index a446a63d7e04..9dd25df926a5 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.14.1
+++ b/metadata/md5-cache/net-misc/openvswitch-2.14.1
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python3_8? ( dev-lang/python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.14.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=45c204259f53d9aaf2c1426a5c722bdd
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.15.0 b/metadata/md5-cache/net-misc/openvswitch-2.15.0
index 314210929836..5383d09aeddb 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.15.0
+++ b/metadata/md5-cache/net-misc/openvswitch-2.15.0
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python3_8? ( dev-lang/python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.15.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=64395503faf8c187dfdcc993daecd4c2
diff --git a/metadata/md5-cache/net-misc/owncloud-client-2.7.6.3261 b/metadata/md5-cache/net-misc/owncloud-client-2.7.6.3261
deleted file mode 100644
index b54cbd0b17d0..000000000000
--- a/metadata/md5-cache/net-misc/owncloud-client-2.7.6.3261
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[gnome-keyring?,qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) test? ( dev-util/cmocka dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Synchronize files from ownCloud Server with your computer
-EAPI=7
-HOMEPAGE=https://owncloud.org/
-IUSE=doc dolphin gnome-keyring nautilus test
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-3.0 GPL-2
-RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[gnome-keyring?,qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.owncloud.com/desktop/ownCloud/stable/2.7.6.3261/source/ownCloud-2.7.6.3261.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=414de50c0a0c68943730b794af10b011
diff --git a/metadata/md5-cache/net-misc/owncloud-client-2.8.2.4246 b/metadata/md5-cache/net-misc/owncloud-client-2.8.2.4246
deleted file mode 100644
index ad5578604e4e..000000000000
--- a/metadata/md5-cache/net-misc/owncloud-client-2.8.2.4246
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[gnome-keyring?,qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) test? ( dev-util/cmocka dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Synchronize files from ownCloud Server with your computer
-EAPI=7
-HOMEPAGE=https://owncloud.org/
-IUSE=doc dolphin gnome-keyring nautilus test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=CC-BY-3.0 GPL-2
-RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[gnome-keyring?,qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.owncloud.com/desktop/ownCloud/stable/2.8.2.4246/source/ownCloud-2.8.2.4246.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cec1207ccdbb0305e50561917c39f8c8
diff --git a/metadata/md5-cache/net-misc/owncloud-client-2.9.1.5500 b/metadata/md5-cache/net-misc/owncloud-client-2.9.1.5500
new file mode 100644
index 000000000000..9aafc0252ac0
--- /dev/null
+++ b/metadata/md5-cache/net-misc/owncloud-client-2.9.1.5500
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[gnome-keyring?,qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules test? ( dev-util/cmocka dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Synchronize files from ownCloud Server with your computer
+EAPI=7
+HOMEPAGE=https://owncloud.org/
+IUSE=dolphin gnome-keyring nautilus test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CC-BY-3.0 GPL-2
+RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[gnome-keyring?,qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.owncloud.com/desktop/ownCloud/stable/2.9.1.5500/source/ownCloud-2.9.1.5500.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3203a418a1783702e1a0f392f76f7e8c
diff --git a/metadata/md5-cache/net-misc/r8168-8.048.03-r1 b/metadata/md5-cache/net-misc/r8168-8.048.03-r1
index f1fa71d0e96b..c35df4e5bb36 100644
--- a/metadata/md5-cache/net-misc/r8168-8.048.03-r1
+++ b/metadata/md5-cache/net-misc/r8168-8.048.03-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/r8168/r8168-8.048.03.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e9d01bab9d3678d05e9ff3ddc40fa9f1
diff --git a/metadata/md5-cache/net-misc/r8168-8.049.02 b/metadata/md5-cache/net-misc/r8168-8.049.02
index 5848e38be019..81eab45be2c5 100644
--- a/metadata/md5-cache/net-misc/r8168-8.049.02
+++ b/metadata/md5-cache/net-misc/r8168-8.049.02
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/r8168/r8168-8.049.02.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1688eb51187a1b3c8fd8d9070c79eadf
diff --git a/metadata/md5-cache/net-misc/r8168-8.049.02-r1 b/metadata/md5-cache/net-misc/r8168-8.049.02-r1
index f2e030ea9f2a..6ce7066e3a28 100644
--- a/metadata/md5-cache/net-misc/r8168-8.049.02-r1
+++ b/metadata/md5-cache/net-misc/r8168-8.049.02-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/r8168/r8168-8.049.02.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f1172b305e7905b766b74d0f77bc570f
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.8.14 b/metadata/md5-cache/net-misc/rabbitmq-server-3.8.14
deleted file mode 100644
index a94f77edbf09..000000000000
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.8.14
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install setup
-DEPEND=>=dev-lang/erlang-22[ssl] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto >=dev-lang/elixir-1.10.0 <dev-lang/elixir-1.12.0 dev-libs/libxslt || ( ( dev-lang/python:3.10 dev-python/simplejson[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/simplejson[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/simplejson[python_targets_python3_8(-)] ) )
-DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
-EAPI=7
-HOMEPAGE=https://www.rabbitmq.com/
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2 MPL-2.0
-RDEPEND=>=dev-lang/erlang-22[ssl]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.8.14/rabbitmq-server-3.8.14.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
-_md5_=3682a157dde8fc9083008a3e035cd9e0
diff --git a/metadata/md5-cache/net-misc/realtek-r8152-2.14.0 b/metadata/md5-cache/net-misc/realtek-r8152-2.14.0
index 8165c828e43c..ea336ec9e39e 100644
--- a/metadata/md5-cache/net-misc/realtek-r8152-2.14.0
+++ b/metadata/md5-cache/net-misc/realtek-r8152-2.14.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/slashbeast/realtek-r8152/archive/v2.14.0.tar.gz -> realtek-r8152-2.14.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9c60705b9948b0d32a672c73c0704b59
diff --git a/metadata/md5-cache/net-misc/realtek-r8152-2.15.0 b/metadata/md5-cache/net-misc/realtek-r8152-2.15.0
index c789b7eb55a7..3dd138c5fbea 100644
--- a/metadata/md5-cache/net-misc/realtek-r8152-2.15.0
+++ b/metadata/md5-cache/net-misc/realtek-r8152-2.15.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/slashbeast/realtek-r8152/archive/v2.15.0.tar.gz -> realtek-r8152-2.15.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=60aea47cbadec51c798366e9fadf9060
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.21 b/metadata/md5-cache/net-misc/remmina-1.4.21
new file mode 100644
index 000000000000..bee56c26c2ca
--- /dev/null
+++ b/metadata/md5-cache/net-misc/remmina-1.4.21
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libappindicator:3 dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= net-libs/libsoup:2.4 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) x2go? ( net-misc/pyhoca-cli ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A GTK+ RDP, SPICE, VNC and SSH client
+EAPI=7
+HOMEPAGE=https://remmina.org/
+IUSE=crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit x2go zeroconf
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+-with-openssl-exception
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libappindicator:3 dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= net-libs/libsoup:2.4 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile crypt? ( dev-libs/libgcrypt:0= ) gnome-keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) kwallet? ( kde-frameworks/kwallet ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] <net-misc/freerdp-3[X] cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) x2go? ( net-misc/pyhoca-cli ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.21/Remmina-v1.4.21.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=91919b04481c4855e2f558019439cf10
diff --git a/metadata/md5-cache/net-misc/s3cmd-2.2.0 b/metadata/md5-cache/net-misc/s3cmd-2.2.0
new file mode 100644
index 000000000000..6dcc23c1c5f9
--- /dev/null
+++ b/metadata/md5-cache/net-misc/s3cmd-2.2.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Command line client for Amazon S3
+EAPI=7
+HOMEPAGE=https://s3tools.org/s3cmd
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~ia64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=GPL-2
+RDEPEND=|| ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-apps/file[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://sourceforge/s3tools/s3cmd-2.2.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c8276a62cfe8a5d75fcf96b0fdc6f008
diff --git a/metadata/md5-cache/net-misc/sstp-client-1.0.12-r1 b/metadata/md5-cache/net-misc/sstp-client-1.0.12-r1
index 35e1ced79e1e..09b4e29f5e06 100644
--- a/metadata/md5-cache/net-misc/sstp-client-1.0.12-r1
+++ b/metadata/md5-cache/net-misc/sstp-client-1.0.12-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=dev-libs/libevent:= dev-libs/openssl:0= net-dialup/ppp:= acct-group/sstpc acct-user/sstpc
 SLOT=0
 SRC_URI=mirror://sourceforge/sstp-client/sstp-client-1.0.12.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=45c57f634c487d51464f4a7038786a82
diff --git a/metadata/md5-cache/net-misc/vinagre-3.22.0-r3 b/metadata/md5-cache/net-misc/vinagre-3.22.0-r3
index 5fe1a2010fb1..6fc82639f712 100644
--- a/metadata/md5-cache/net-misc/vinagre-3.22.0-r3
+++ b/metadata/md5-cache/net-misc/vinagre-3.22.0-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.32.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3(+)] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/hicolor-icon-theme rdp? ( >=net-misc/freerdp-1.1:= ) ssh? ( >=x11-libs/vte-0.20:2.91 ) spice? ( app-emulation/spice-protocol >=net-misc/spice-gtk-0.5[gtk3(+)] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/vinagre/3.22/vinagre-3.22.0.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=720a9cdb60ef9d4f60047bd5bf963715
diff --git a/metadata/md5-cache/net-misc/wget-1.21.2 b/metadata/md5-cache/net-misc/wget-1.21.2
index 68c19236b3f5..806c2fc94214 100644
--- a/metadata/md5-cache/net-misc/wget-1.21.2
+++ b/metadata/md5-cache/net-misc/wget-1.21.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.21.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0b3e446deb47a3667f0a4dcc102967fb
+_md5_=aefa340181f3653688d5e62e9b6913e9
diff --git a/metadata/md5-cache/net-misc/yt-dlp-2021.10.10 b/metadata/md5-cache/net-misc/yt-dlp-2021.10.10
new file mode 100644
index 000000000000..538685319fd4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/yt-dlp-2021.10.10
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websockets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/mutagen[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-video/ffmpeg >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=youtube-dl fork with additional features and fixes
+EAPI=8
+HOMEPAGE=https://github.com/yt-dlp/yt-dlp
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=Unlicense
+RDEPEND=dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websockets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/mutagen[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-video/ffmpeg python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/y/yt-dlp/yt-dlp-2021.10.10.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5347a9ab089ac9a50e291d0b6c56c691
diff --git a/metadata/md5-cache/net-misc/yt-dlp-2021.9.1 b/metadata/md5-cache/net-misc/yt-dlp-2021.9.1
index 98dbd8f66f48..6b322870d74d 100644
--- a/metadata/md5-cache/net-misc/yt-dlp-2021.9.1
+++ b/metadata/md5-cache/net-misc/yt-dlp-2021.9.1
@@ -4,7 +4,7 @@ DESCRIPTION=A youtube-dl fork with additional features and fixes
 EAPI=7
 HOMEPAGE=https://github.com/yt-dlp/yt-dlp
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=public-domain
 RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/mutagen[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websockets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-video/ffmpeg python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yt-dlp/yt-dlp-2021.9.1.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1b7084643ac644b7ace98198021d65e6
+_md5_=74e85fd3583baf920eb7d4f0af635b0e
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 1a74a88e8f7b..9adf4f82d0d3 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.58-r2 b/metadata/md5-cache/net-nds/openldap-2.4.58-r2
index 2f1620e3a371..5ef1c18e0ba7 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.58-r2
+++ b/metadata/md5-cache/net-nds/openldap-2.4.58-r2
@@ -5,7 +5,7 @@ DESCRIPTION=LDAP suite of application and development tools
 EAPI=7
 HOMEPAGE=https://www.OpenLDAP.org/
 IUSE=crypt samba tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs test smbkrb5passwd kerberos kinit pbkdf2 sha2 cxx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=OPENLDAP GPL-2
 RDEPEND=ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( dev-libs/libltdl sys-fs/e2fsprogs >=dev-db/lmdb-0.9.18:= crypt? ( virtual/libcrypt:= ) tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( dev-libs/openssl:0= ) berkdb? ( <sys-libs/db-6.0:= || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 ) ) smbkrb5passwd? ( dev-libs/openssl:0= kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) selinux? ( sec-policy/selinux-ldap ) virtual/tmpfiles
 REQUIRED_USE=cxx? ( sasl ) pbkdf2? ( ssl ) test? ( berkdb ) ?? ( test minimal )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.58.tgz http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/openldap-2.4.58.tgz http://repository.linagora.org/OpenLDAP/openldap-release/openldap-2.4.58.tgz http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.58.tgz mirror://gentoo/rfc2307bis.schema-20140524
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	db-use	063d3e7add942762a8203b52ec3066c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	ssl-cert	1283a22296251a63df6c137c9b929269	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2e69ed7e03bf7b89f2ca4b0fdea4ccd5
+_md5_=88f3201faad00721c127ebea7cff95a7
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index 594ca297c8e0..d461aba7d197 100644
--- a/metadata/md5-cache/net-nntp/Manifest.gz
+++ b/metadata/md5-cache/net-nntp/Manifest.gz
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.4.2 b/metadata/md5-cache/net-nntp/sabnzbd-3.4.2
new file mode 100644
index 000000000000..ab6b0995a68e
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/sabnzbd-3.4.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst setup
+DEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6[python_targets_python3_8(-)] >=dev-python/guessit-3.1.0[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] dev-python/puremagic[python_targets_python3_8(-)] >=dev-python/sabyenc-4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] >=dev-python/sabyenc-4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] >=dev-python/sabyenc-4[python_targets_python3_10(-)] )
+DESCRIPTION=Binary newsgrabber with web-interface
+EAPI=8
+HOMEPAGE=https://sabnzbd.org/
+IUSE=+7za +rar unzip python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
+RDEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6[python_targets_python3_8(-)] >=dev-python/guessit-3.1.0[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] dev-python/puremagic[python_targets_python3_8(-)] >=dev-python/sabyenc-4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] >=dev-python/sabyenc-4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] >=dev-python/sabyenc-4[python_targets_python3_10(-)] ) >=app-arch/par2cmdline-0.4 net-misc/wget 7za? ( app-arch/p7zip ) rar? ( || ( app-arch/unrar app-arch/rar ) ) unzip? ( >=app-arch/unzip-5.5.2 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.4.2/SABnzbd-3.4.2-src.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5fc313be5d92c0ec075877ecb67212d8
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 2555ddd9dc57..59d58fe4e15b 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/rtorrent-0.9.7 b/metadata/md5-cache/net-p2p/rtorrent-0.9.7
index bd99d5865e5e..db360eef45d4 100644
--- a/metadata/md5-cache/net-p2p/rtorrent-0.9.7
+++ b/metadata/md5-cache/net-p2p/rtorrent-0.9.7
@@ -10,5 +10,5 @@ RDEPEND=~net-libs/libtorrent-0.13.7 >=dev-libs/libsigc++-2.2.2:2 >=net-misc/curl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/rtorrent-0.9.7.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d8df0e938325bc9fed4aa7d1a02da14
diff --git a/metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1 b/metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1
index 4bf5dc165f35..5f01a1368f42 100644
--- a/metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1
+++ b/metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1
@@ -10,5 +10,5 @@ RDEPEND=~net-libs/libtorrent-0.13.7 >=dev-libs/libsigc++-2.2.2:2 >=net-misc/curl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/rtorrent-0.9.7.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5811d52a2ce3aa6435c8a3fec25fa1fe
diff --git a/metadata/md5-cache/net-p2p/rtorrent-0.9.8 b/metadata/md5-cache/net-p2p/rtorrent-0.9.8
index 5fa6dabfbd60..f5a84ff652a6 100644
--- a/metadata/md5-cache/net-p2p/rtorrent-0.9.8
+++ b/metadata/md5-cache/net-p2p/rtorrent-0.9.8
@@ -10,5 +10,5 @@ RDEPEND=~net-libs/libtorrent-0.13.8 >=net-misc/curl-7.19.1 sys-libs/ncurses:0= x
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/rtorrent-0.9.8.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=43ba36df7936b27e0111e027835829be
diff --git a/metadata/md5-cache/net-p2p/tremc-0.9.2-r1 b/metadata/md5-cache/net-p2p/tremc-0.9.2-r1
deleted file mode 100644
index 76412d6a7f12..000000000000
--- a/metadata/md5-cache/net-p2p/tremc-0.9.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DESCRIPTION=Ncurses interface for the Transmission BitTorrent client
-EAPI=7
-HOMEPAGE=https://github.com/tremc/tremc
-IUSE=+python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[ncurses] >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/tremc/tremc/archive/0.9.2.tar.gz -> tremc-0.9.2.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d57af7e8763772c8c138f2659aabb50e
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index a2a810d924f9..7acb6717179a 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/cups-2.3.3-r4 b/metadata/md5-cache/net-print/cups-2.3.3-r4
index ded1274b2ca3..c4d20cb826bd 100644
--- a/metadata/md5-cache/net-print/cups-2.3.3-r4
+++ b/metadata/md5-cache/net-print/cups-2.3.3-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/cups/releases/download/v2.3.3/cups-2.3.3-source.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=32c7cc534fd856186b53e979527e2b54
diff --git a/metadata/md5-cache/net-print/cups-2.3.3_p2-r2 b/metadata/md5-cache/net-print/cups-2.3.3_p2-r2
index 3b7fce2f499c..232b889c5fdd 100644
--- a/metadata/md5-cache/net-print/cups-2.3.3_p2-r2
+++ b/metadata/md5-cache/net-print/cups-2.3.3_p2-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/cups/releases/download/v2.3.3op2/cups-2.3.3op2-source.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=534fe9a928c95e9035e28fff5acfc799
diff --git a/metadata/md5-cache/net-print/cups-9999 b/metadata/md5-cache/net-print/cups-9999
index fcf707a2bc18..3a79e8dd0675 100644
--- a/metadata/md5-cache/net-print/cups-9999
+++ b/metadata/md5-cache/net-print/cups-9999
@@ -12,5 +12,5 @@ RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-
 REQUIRED_USE=usb? ( threads )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=8099e1e33c38d83dd33613ad2c1a7e2a
diff --git a/metadata/md5-cache/net-print/cups-pdf-3.0.1-r2 b/metadata/md5-cache/net-print/cups-pdf-3.0.1-r2
index 6a47176bbfdc..8e4fb9a43fda 100644
--- a/metadata/md5-cache/net-print/cups-pdf-3.0.1-r2
+++ b/metadata/md5-cache/net-print/cups-pdf-3.0.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Provides a virtual printer for CUPS to produce PDF files
 EAPI=7
 HOMEPAGE=https://www.cups-pdf.de/
 IUSE=+ppds
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=net-print/cups >=app-text/ghostscript-gpl-9.54
 SLOT=0
 SRC_URI=https://www.cups-pdf.de/src/cups-pdf_3.0.1.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c3b0ad513afb2b6d79d959b1ddd9e00d
+_md5_=c903b7f543990ac0ff49f9389670823a
diff --git a/metadata/md5-cache/net-print/hplip-3.20.11-r2 b/metadata/md5-cache/net-print/hplip-3.20.11-r2
index 3405082af1c1..310dbbc356b2 100644
--- a/metadata/md5-cache/net-print/hplip-3.20.11-r2
+++ b/metadata/md5-cache/net-print/hplip-3.20.11-r2
@@ -11,5 +11,5 @@ RDEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filt
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.20.11.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.20.11-patches-2.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=fbeda7744a5094b1b940d8b84d0f4708
diff --git a/metadata/md5-cache/net-print/hplip-3.21.6 b/metadata/md5-cache/net-print/hplip-3.21.6
index 8ffab983bd49..855a8b29ed29 100644
--- a/metadata/md5-cache/net-print/hplip-3.21.6
+++ b/metadata/md5-cache/net-print/hplip-3.21.6
@@ -11,5 +11,5 @@ RDEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filt
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.21.6.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.21.4-patches-1.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=6877dbcdba66091847207ade876a793e
diff --git a/metadata/md5-cache/net-print/hplip-3.21.8 b/metadata/md5-cache/net-print/hplip-3.21.8
index 6b0c8bd812b6..a48f6fbb81a5 100644
--- a/metadata/md5-cache/net-print/hplip-3.21.8
+++ b/metadata/md5-cache/net-print/hplip-3.21.8
@@ -11,5 +11,5 @@ RDEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filt
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.21.8.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.21.4-patches-1.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=6877dbcdba66091847207ade876a793e
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.21.8 b/metadata/md5-cache/net-print/hplip-plugin-3.21.8
new file mode 100644
index 000000000000..0606d1fad69e
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.21.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Proprietary plugins and firmware for HPLIP
+EAPI=8
+HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing/plugins
+IUSE=orblite
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=hplip-plugin
+RDEPEND=~net-print/hplip-3.21.8 virtual/udev orblite? ( media-gfx/sane-backends >=sys-libs/glibc-2.26 virtual/libusb:0 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.21.8-plugin.run
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
+_md5_=1c307770e10c6a6ea4e52cf93c35f37d
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 7d6fb2453acd..30f37ed69f1e 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.24 b/metadata/md5-cache/net-proxy/haproxy-2.0.24
index 7082297a3186..4363afaf1ef3 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.24
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.24
@@ -11,5 +11,5 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-l
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.0
 SRC_URI=http://haproxy.1wt.eu/download/2.0/src/haproxy-2.0.24.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c12399c90d87854e8c22701bf6ae9568
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.25 b/metadata/md5-cache/net-proxy/haproxy-2.0.25
index c12d140efa5d..1e92b401d61e 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.25
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.25
@@ -11,5 +11,5 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-l
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.0
 SRC_URI=http://haproxy.1wt.eu/download/2.0/src/haproxy-2.0.25.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=de200cd48039f30909ff4e3ee7e8cd49
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.9999 b/metadata/md5-cache/net-proxy/haproxy-2.0.9999
index 4975572b3cb6..1a2f37665fd7 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e412af4ec490882c7dc5a77bef38d2f2
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.16 b/metadata/md5-cache/net-proxy/haproxy-2.2.16
index d2a19fc9e344..036556c8969f 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.16
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.16
@@ -11,5 +11,5 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-l
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.2
 SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.16.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c12399c90d87854e8c22701bf6ae9568
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.17 b/metadata/md5-cache/net-proxy/haproxy-2.2.17
index 3603081c32b1..25b5ca0fe607 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.17
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.17
@@ -11,5 +11,5 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-l
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.2
 SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.17.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=de200cd48039f30909ff4e3ee7e8cd49
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.9999 b/metadata/md5-cache/net-proxy/haproxy-2.2.9999
index 5c17350a605c..bd4cc692f84f 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e412af4ec490882c7dc5a77bef38d2f2
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.3.14 b/metadata/md5-cache/net-proxy/haproxy-2.3.14
index 167417e510f3..0a32efeb5731 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.3.14
+++ b/metadata/md5-cache/net-proxy/haproxy-2.3.14
@@ -11,5 +11,5 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-l
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.3
 SRC_URI=http://haproxy.1wt.eu/download/2.3/src/haproxy-2.3.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=98441c16797ae78308cdfae268b62a63
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.3.9999 b/metadata/md5-cache/net-proxy/haproxy-2.3.9999
index d448ff850383..2b093259a5f5 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.3.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.3.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.3
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=98441c16797ae78308cdfae268b62a63
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.4 b/metadata/md5-cache/net-proxy/haproxy-2.4.4
index 1318eafa0203..f6864bd0f575 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.4
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.4
@@ -11,5 +11,5 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-l
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.4
 SRC_URI=http://haproxy.1wt.eu/download/2.4/src/haproxy-2.4.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=36591896ea85c87f288acf41ecde1588
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.7 b/metadata/md5-cache/net-proxy/haproxy-2.4.7
index 7200cb71000b..1e60b548df9d 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.7
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.7
@@ -11,5 +11,5 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-l
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.4
 SRC_URI=http://haproxy.1wt.eu/download/2.4/src/haproxy-2.4.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4e37ffa1bc2d6be91bb0dcebfb04326b
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.9999 b/metadata/md5-cache/net-proxy/haproxy-2.4.9999
index cc2fa4288c75..1e80a1a721fb 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
 SLOT=0/2.4
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4e37ffa1bc2d6be91bb0dcebfb04326b
diff --git a/metadata/md5-cache/net-proxy/squid-4.15-r2 b/metadata/md5-cache/net-proxy/squid-4.15-r2
index 904c8061ced0..f8f8e14ba7ac 100644
--- a/metadata/md5-cache/net-proxy/squid-4.15-r2
+++ b/metadata/md5-cache/net-proxy/squid-4.15-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v4/squid-4.15.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=35cba7421e33003a2b8875176ed4eb4c
diff --git a/metadata/md5-cache/net-proxy/sshuttle-1.0.5 b/metadata/md5-cache/net-proxy/sshuttle-1.0.5
index 7f99b3540d93..2b0d2e6d9cb3 100644
--- a/metadata/md5-cache/net-proxy/sshuttle-1.0.5
+++ b/metadata/md5-cache/net-proxy/sshuttle-1.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sshuttle/sshuttle-1.0.5.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=87cae0c55960e84107e18a511c7fc0fa
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 518aec24b525..19d00f018947 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/iodine-0.7.0-r2 b/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
index 8ccdcd5ac99b..1b7a7d7bae13 100644
--- a/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
+++ b/metadata/md5-cache/net-vpn/iodine-0.7.0-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://code.kryo.se/iodine/iodine-0.7.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=137c596d8f03e492664849e23c36c613
diff --git a/metadata/md5-cache/net-vpn/isatapd-0.9.7-r2 b/metadata/md5-cache/net-vpn/isatapd-0.9.7-r2
index e4e75455d371..a3f163a701af 100644
--- a/metadata/md5-cache/net-vpn/isatapd-0.9.7-r2
+++ b/metadata/md5-cache/net-vpn/isatapd-0.9.7-r2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.saschahlusiak.de/linux/isatapd-0.9.7.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d6830d0a8204610df2c1be4cc466957d
diff --git a/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.198 b/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.198
index 314abd3ee4a7..5e5659369d3c 100644
--- a/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.198
+++ b/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.198
@@ -10,5 +10,5 @@ RDEPEND=!net-misc/hamachi
 RESTRICT=mirror
 SLOT=0
 SRC_URI=x86? ( https://www.vpn.net/installers/logmein-hamachi-2.1.0.198-x86.tgz ) amd64? ( https://www.vpn.net/installers/logmein-hamachi-2.1.0.198-x64.tgz )
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=81339f1cb7ab9aba1e10fae2bbdc2a40
diff --git a/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.203 b/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.203
index 0e839b46dc40..11f6bf3765a8 100644
--- a/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.203
+++ b/metadata/md5-cache/net-vpn/logmein-hamachi-2.1.0.203
@@ -10,5 +10,5 @@ RDEPEND=!net-misc/hamachi
 RESTRICT=mirror
 SLOT=0
 SRC_URI=x86? ( https://www.vpn.net/installers/logmein-hamachi-2.1.0.203-x86.tgz ) amd64? ( https://www.vpn.net/installers/logmein-hamachi-2.1.0.203-x64.tgz )
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1fc13d215b7831850723c93830ac9043
diff --git a/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.3.90 b/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.3.90
index 005b50a83ff3..616165184e3e 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.3.90
+++ b/metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.3.90
@@ -5,10 +5,10 @@ DESCRIPTION=NetworkManager Fortinet SSLVPN compatible plugin
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+
 RDEPEND=net-dialup/ppp >=net-vpn/openfortivpn-1.2.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-fortisslvpn/1.3/NetworkManager-fortisslvpn-1.3.90.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=67cb2a98bc399368dcc8fa2082a39ec8
+_md5_=8bd680450b539bb2f729d647bd789f15
diff --git a/metadata/md5-cache/net-vpn/nstx-1.1_beta6-r3 b/metadata/md5-cache/net-vpn/nstx-1.1_beta6-r3
index 1b5c0df391ce..1943cfa9d15a 100644
--- a/metadata/md5-cache/net-vpn/nstx-1.1_beta6-r3
+++ b/metadata/md5-cache/net-vpn/nstx-1.1_beta6-r3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://dereference.de/nstx/nstx-1.1-beta6.tgz mirror://debian/pool/main/n/nstx/nstx_1.1-beta6-5.diff.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bf3f260ef0ebee04f2c995a349d77754
diff --git a/metadata/md5-cache/net-vpn/openconnect-8.09-r3 b/metadata/md5-cache/net-vpn/openconnect-8.09-r3
index c77f327e6b84..9e9323b7c756 100644
--- a/metadata/md5-cache/net-vpn/openconnect-8.09-r3
+++ b/metadata/md5-cache/net-vpn/openconnect-8.09-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0= )
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-8.09.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20200226.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=174a4f95406d5913774098492bd58bd5
diff --git a/metadata/md5-cache/net-vpn/openconnect-8.10 b/metadata/md5-cache/net-vpn/openconnect-8.10
index 93ee59df5956..5c8101d0ae76 100644
--- a/metadata/md5-cache/net-vpn/openconnect-8.10
+++ b/metadata/md5-cache/net-vpn/openconnect-8.10
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0= )
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-8.10.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20200930.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=67013cf639f51d7d20ed08715b6f93b5
diff --git a/metadata/md5-cache/net-vpn/openconnect-8.10-r4 b/metadata/md5-cache/net-vpn/openconnect-8.10-r4
deleted file mode 100644
index 6bf1d284e845..000000000000
--- a/metadata/md5-cache/net-vpn/openconnect-8.10-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( || ( dev-lang/python:3.10[xml] dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext ) test? ( net-libs/socket_wrapper net-vpn/ocserv sys-libs/uid_wrapper )
-DEFINED_PHASES=configure install prepare pretend setup test unpack
-DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0= ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken )
-DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
-EAPI=7
-HOMEPAGE=http://www.infradead.org/openconnect.html
-IUSE=doc +gnutls gssapi libproxy lz4 nls smartcard stoken test kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0= ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 net-vpn/vpnc-scripts
-RESTRICT=!test? ( test )
-SLOT=0/5
-SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-8.10.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4def117840a7fe45fea20d0ef0e72671
diff --git a/metadata/md5-cache/net-vpn/openconnect-8.10-r5 b/metadata/md5-cache/net-vpn/openconnect-8.10-r5
new file mode 100644
index 000000000000..659611353c58
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/openconnect-8.10-r5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( || ( dev-lang/python:3.10[xml] dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext ) test? ( net-libs/socket_wrapper net-vpn/ocserv sys-libs/uid_wrapper )
+DEFINED_PHASES=configure install prepare pretend setup test unpack
+DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0= ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken )
+DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
+EAPI=7
+HOMEPAGE=http://www.infradead.org/openconnect.html
+IUSE=doc +gnutls gssapi libproxy lz4 nls smartcard stoken test kernel_linux
+KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
+LICENSE=LGPL-2.1 GPL-2
+RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0= ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 >=net-vpn/vpnc-scripts-20210402-r1
+RESTRICT=!test? ( test )
+SLOT=0/5
+SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-8.10.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9e65657473f91ff0c33bdf9c02950cf1
diff --git a/metadata/md5-cache/net-vpn/openconnect-9999 b/metadata/md5-cache/net-vpn/openconnect-9999
index d2f0a3a0b17e..4e9ed909a2ea 100644
--- a/metadata/md5-cache/net-vpn/openconnect-9999
+++ b/metadata/md5-cache/net-vpn/openconnect-9999
@@ -7,8 +7,8 @@ HOMEPAGE=http://www.infradead.org/openconnect.html
 IUSE=doc +gnutls gssapi libproxy lz4 nls smartcard stoken test kernel_linux
 LICENSE=LGPL-2.1 GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0= ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 net-vpn/vpnc-scripts
+RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0= ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) sys-apps/iproute2 >=net-vpn/vpnc-scripts-20210402-r1
 RESTRICT=!test? ( test )
 SLOT=0/5
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4def117840a7fe45fea20d0ef0e72671
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a86967666a22dd19c000aebf6ea332c4
diff --git a/metadata/md5-cache/net-vpn/openfortivpn-1.13.2 b/metadata/md5-cache/net-vpn/openfortivpn-1.13.2
index 9a098a70a388..ec1410a5cec9 100644
--- a/metadata/md5-cache/net-vpn/openfortivpn-1.13.2
+++ b/metadata/md5-cache/net-vpn/openfortivpn-1.13.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3-with-openssl-exception openssl
 RDEPEND=net-dialup/ppp dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.13.2.tar.gz -> openfortivpn-1.13.2.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=708b2f8e6600f02704c87c62b486f60b
diff --git a/metadata/md5-cache/net-vpn/openfortivpn-1.15.0 b/metadata/md5-cache/net-vpn/openfortivpn-1.15.0
index aee811b1764a..f5fa192c8da9 100644
--- a/metadata/md5-cache/net-vpn/openfortivpn-1.15.0
+++ b/metadata/md5-cache/net-vpn/openfortivpn-1.15.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3-with-openssl-exception openssl
 RDEPEND=net-dialup/ppp dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.15.0.tar.gz -> openfortivpn-1.15.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee576cbe628f0a3a0021a3a4152a7b0f
diff --git a/metadata/md5-cache/net-vpn/openfortivpn-1.16.0 b/metadata/md5-cache/net-vpn/openfortivpn-1.16.0
index 45ec10b02dd4..07a3d4037db9 100644
--- a/metadata/md5-cache/net-vpn/openfortivpn-1.16.0
+++ b/metadata/md5-cache/net-vpn/openfortivpn-1.16.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3-with-openssl-exception openssl
 RDEPEND=net-dialup/ppp dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.16.0.tar.gz -> openfortivpn-1.16.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ee576cbe628f0a3a0021a3a4152a7b0f
diff --git a/metadata/md5-cache/net-vpn/openfortivpn-1.17.0 b/metadata/md5-cache/net-vpn/openfortivpn-1.17.0
new file mode 100644
index 000000000000..fe805d8912e1
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/openfortivpn-1.17.0
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare setup
+DEPEND=net-dialup/ppp dev-libs/openssl:0=
+DESCRIPTION=Fortinet compatible VPN client
+EAPI=7
+HOMEPAGE=https://github.com/adrienverge/openfortivpn
+IUSE=kernel_linux
+KEYWORDS=~amd64
+LICENSE=GPL-3-with-openssl-exception openssl
+RDEPEND=net-dialup/ppp dev-libs/openssl:0=
+SLOT=0
+SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.17.0.tar.gz -> openfortivpn-1.17.0.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ee576cbe628f0a3a0021a3a4152a7b0f
diff --git a/metadata/md5-cache/net-vpn/openfortivpn-1.17.1 b/metadata/md5-cache/net-vpn/openfortivpn-1.17.1
new file mode 100644
index 000000000000..b44ec506970b
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/openfortivpn-1.17.1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare setup
+DEPEND=net-dialup/ppp dev-libs/openssl:0=
+DESCRIPTION=Fortinet compatible VPN client
+EAPI=7
+HOMEPAGE=https://github.com/adrienverge/openfortivpn
+IUSE=kernel_linux
+KEYWORDS=~amd64
+LICENSE=GPL-3-with-openssl-exception openssl
+RDEPEND=net-dialup/ppp dev-libs/openssl:0=
+SLOT=0
+SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.17.1.tar.gz -> openfortivpn-1.17.1.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3b860c682e5cca304e43cda7b1b656f7
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.5.2-r2 b/metadata/md5-cache/net-vpn/openvpn-2.5.2-r2
index 323bd297feed..0d3480dfdda8 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.5.2-r2
+++ b/metadata/md5-cache/net-vpn/openvpn-2.5.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( openssl mbedtls ) pkcs11? ( !mbedtls ) !plugins? ( !pam !down-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://build.openvpn.net/downloads/releases/openvpn-2.5.2.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0e5f724b909c8a312d2332d4ed01ca0d
diff --git a/metadata/md5-cache/net-vpn/openvpn-9999 b/metadata/md5-cache/net-vpn/openvpn-9999
index 485d0ab97d87..643e617d8d53 100644
--- a/metadata/md5-cache/net-vpn/openvpn-9999
+++ b/metadata/md5-cache/net-vpn/openvpn-9999
@@ -11,5 +11,5 @@ RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) ) lz4? ( app-a
 REQUIRED_USE=^^ ( openssl mbedtls ) pkcs11? ( !mbedtls ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4c66c6d6b2d55da2c790d297f0d1337b
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.9.2-r1 b/metadata/md5-cache/net-vpn/strongswan-5.9.2-r1
index cb9e57b8ee6b..4b968a5b74fb 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.9.2-r1
+++ b/metadata/md5-cache/net-vpn/strongswan-5.9.2-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 RSA DES
 RDEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=https://download.strongswan.org/strongswan-5.9.2.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d0a1a0fb535c729dd31511c6db853e4c
diff --git a/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550-r2 b/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550-r2
index dd1bdacb0817..88f4dcf82e9c 100644
--- a/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550-r2
+++ b/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl dev-libs/libgcrypt:0= >=sys-apps/iproute2-2.6.19.20061214[
 RESTRICT=!gnutls? ( bindist )
 SLOT=0
 SRC_URI=https://github.com/streambinder/vpnc/archive/fa0689c.tar.gz -> vpnc-0.5.3_p550-r2.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=1bdb5a2a72dd3f1992bb67024c3639dc
diff --git a/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550-r3 b/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550-r3
new file mode 100644
index 000000000000..f2d733d96940
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/vpnc-0.5.3_p550-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup unpack
+DEPEND=dev-lang/perl dev-libs/libgcrypt:0= >=sys-apps/iproute2-2.6.19.20061214[-minimal] gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= )
+DESCRIPTION=Free client for Cisco VPN routing software
+EAPI=7
+HOMEPAGE=https://www.unix-ag.uni-kl.de/~massar/vpnc/
+IUSE=resolvconf +gnutls selinux kernel_linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
+LICENSE=GPL-2 BSD
+RDEPEND=dev-lang/perl dev-libs/libgcrypt:0= >=sys-apps/iproute2-2.6.19.20061214[-minimal] gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) >=net-vpn/vpnc-scripts-20210402-r1 resolvconf? ( virtual/resolvconf ) selinux? ( sec-policy/selinux-vpn ) virtual/tmpfiles
+RESTRICT=!gnutls? ( bindist )
+SLOT=0
+SRC_URI=https://github.com/streambinder/vpnc/archive/fa0689c.tar.gz -> vpnc-0.5.3_p550-r2.tar.gz
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=9f76334826b0ee57d77c55e459060f2b
diff --git a/metadata/md5-cache/net-vpn/vpnc-scripts-20210402 b/metadata/md5-cache/net-vpn/vpnc-scripts-20210402
deleted file mode 100644
index 0e0876e27cb5..000000000000
--- a/metadata/md5-cache/net-vpn/vpnc-scripts-20210402
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Connect scripts for use with vpnc and openconnect (and similar clients)
-EAPI=8
-HOMEPAGE=https://gitlab.com/openconnect/vpnc-scripts
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20210402.tar.gz
-_md5_=7aa4c1789f2d049bca3b719c0ed1a2f4
diff --git a/metadata/md5-cache/net-vpn/vpnc-scripts-20210402-r1 b/metadata/md5-cache/net-vpn/vpnc-scripts-20210402-r1
new file mode 100644
index 000000000000..32125172d2ae
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/vpnc-scripts-20210402-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Connect scripts for use with vpnc and openconnect (and similar clients)
+EAPI=8
+HOMEPAGE=https://gitlab.com/openconnect/vpnc-scripts
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
+LICENSE=GPL-2+
+RDEPEND=!<net-vpn/vpnc-0.5.3_p550-r3
+SLOT=0
+SRC_URI=ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20210402.tar.gz
+_md5_=fb6d6eb3251dc0d8deafbb9211bdd722
diff --git a/metadata/md5-cache/net-vpn/vpnc-scripts-99999999 b/metadata/md5-cache/net-vpn/vpnc-scripts-99999999
index ef4e80ce248d..6dd04bf5f0fd 100644
--- a/metadata/md5-cache/net-vpn/vpnc-scripts-99999999
+++ b/metadata/md5-cache/net-vpn/vpnc-scripts-99999999
@@ -5,6 +5,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/openconnect/vpnc-scripts
 LICENSE=GPL-2+
 PROPERTIES=live
+RDEPEND=!<net-vpn/vpnc-0.5.3_p550-r3
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da
-_md5_=7aa4c1789f2d049bca3b719c0ed1a2f4
+_md5_=b6b6724563d52f349a431dd9cb75d2df
diff --git a/metadata/md5-cache/net-vpn/vtun-3.0.3-r2 b/metadata/md5-cache/net-vpn/vtun-3.0.3-r2
index 90e1727ab560..866159c48331 100644
--- a/metadata/md5-cache/net-vpn/vtun-3.0.3-r2
+++ b/metadata/md5-cache/net-vpn/vtun-3.0.3-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=lzo? ( dev-libs/lzo:2 ) socks5? ( net-proxy/dante ) ssl? ( dev-libs/openssl:0= ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/vtun/vtun-3.0.3.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e1a9629499af817eb9f822757d95adde
diff --git a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606 b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606
index dcfc6214832d..cd7df69875bc 100644
--- a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606
+++ b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=module? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20210606.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50125427e4d052d0666f6f50dc2c2d03
diff --git a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210424 b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210424
index 923045fdd3d8..791de1dd3a77 100644
--- a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210424
+++ b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210424
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=wg-quick? ( || ( net-firewall/nftables net-firewall/iptables ) virtual/resolvconf ) selinux? ( sec-policy/selinux-wireguard )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20210424.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c41e82b50ea9aa29e6e1c10e0650c35b
diff --git a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210914 b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210914
index 0d3650721a63..837522f4283b 100644
--- a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210914
+++ b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210914
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=wg-quick? ( || ( net-firewall/nftables net-firewall/iptables ) virtual/resolvconf ) selinux? ( sec-policy/selinux-wireguard )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20210914.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d09bbbbf9fc48c3a0b115d048ab17240
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index f2d50239bfc4..25b112942869 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/blueman-2.2.2 b/metadata/md5-cache/net-wireless/blueman-2.2.2
index 96be41290c08..8a9116985ffa 100644
--- a/metadata/md5-cache/net-wireless/blueman-2.2.2
+++ b/metadata/md5-cache/net-wireless/blueman-2.2.2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/blueman-project/blueman/releases/download/2.2.2/blueman-2.2.2.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0f4a8619b6efa8bfba94e18d52800a54
diff --git a/metadata/md5-cache/net-wireless/blueman-9999 b/metadata/md5-cache/net-wireless/blueman-9999
index 51f7ceecd0e5..d615319afac7 100644
--- a/metadata/md5-cache/net-wireless/blueman-9999
+++ b/metadata/md5-cache/net-wireless/blueman-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) appindicator? ( dev-libs/libappindicator:3[introspection] ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio[bluetooth] media-sound/pulseaudio-modules-bt ) )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=a123fa9d778b60c96c57a05cd00a57c5
diff --git a/metadata/md5-cache/net-wireless/bluez-5.58-r1 b/metadata/md5-cache/net-wireless/bluez-5.58-r1
deleted file mode 100644
index 5eb0d32001a4..000000000000
--- a/metadata/md5-cache/net-wireless/bluez-5.58-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/dbus-python-1[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 )
-DESCRIPTION=Bluetooth Tools and System Daemons for Linux
-EAPI=7
-HOMEPAGE=http://www.bluez.org
-IUSE=btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session kernel_linux python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/dbus-python-1[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) )
-REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) test-programs? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.58.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=71d7b632d0021813bd72571e576f8dd4
diff --git a/metadata/md5-cache/net-wireless/bluez-5.60 b/metadata/md5-cache/net-wireless/bluez-5.60
deleted file mode 100644
index 45249145ccf8..000000000000
--- a/metadata/md5-cache/net-wireless/bluez-5.60
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/docutils virtual/pkgconfig test? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/dbus-python-1[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/dbus-python-1[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 )
-DESCRIPTION=Bluetooth Tools and System Daemons for Linux
-EAPI=7
-HOMEPAGE=http://www.bluez.org
-IUSE=btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session kernel_linux python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/dbus-python-1[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/dbus-python-1[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) )
-REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) test-programs? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.60.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=88b6d313c665f469a52fad94184fe9eb
diff --git a/metadata/md5-cache/net-wireless/bluez-5.61 b/metadata/md5-cache/net-wireless/bluez-5.61
index 3b66866d29c9..7c018c2ce8e1 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.61
+++ b/metadata/md5-cache/net-wireless/bluez-5.61
@@ -12,5 +12,5 @@ REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_tar
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.61.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=b0df79cf3105e4383aabb59ae7c933eb
diff --git a/metadata/md5-cache/net-wireless/bluez-5.62 b/metadata/md5-cache/net-wireless/bluez-5.62
new file mode 100644
index 000000000000..60301d0a5dbc
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/bluez-5.62
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/docutils virtual/pkgconfig test? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/dbus-python-1[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/dbus-python-1[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 )
+DESCRIPTION=Bluetooth Tools and System Daemons for Linux
+EAPI=8
+HOMEPAGE=http://www.bluez.org
+IUSE=btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session kernel_linux python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/dbus-python-1[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/dbus-python-1[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) )
+REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) test-programs? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.62.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=61f4ee91e5ffadd610a885a18bdbb032
diff --git a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r6 b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r6
index 9581df708077..4a643c2a14a6 100644
--- a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r6
+++ b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r6
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=mirror
 SLOT=0
 SRC_URI=x86? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz ) amd64? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz ) https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_6.30.223.271.txt -> README-broadcom-sta-6.30.223.271.txt
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2da30aceccc2acac0c0561d6212d9728
diff --git a/metadata/md5-cache/net-wireless/dump1090-5.0 b/metadata/md5-cache/net-wireless/dump1090-5.0
index f07f71069e41..ff8b3d440aaf 100644
--- a/metadata/md5-cache/net-wireless/dump1090-5.0
+++ b/metadata/md5-cache/net-wireless/dump1090-5.0
@@ -5,10 +5,10 @@ DESCRIPTION=simple Mode S decoder for RTLSDR devices
 EAPI=7
 HOMEPAGE=https://github.com/flightaware/dump1090
 IUSE=bladerf hackrf +rtlsdr minimal
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses:=[tinfo] bladerf? ( net-wireless/bladerf:= virtual/libusb:1 ) hackrf? ( net-libs/libhackrf:= virtual/libusb:1 ) rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/flightaware/dump1090/archive/v5.0.tar.gz -> dump1090-5.0.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=99b3ccef9fb85d39131575178a4fbb80
+_md5_=b372921d03ba23c78a5783e36486cae7
diff --git a/metadata/md5-cache/net-wireless/dump1090-6.1 b/metadata/md5-cache/net-wireless/dump1090-6.1
new file mode 100644
index 000000000000..148d45d40d23
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/dump1090-6.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=sys-libs/ncurses:=[tinfo] bladerf? ( net-wireless/bladerf:= virtual/libusb:1 ) hackrf? ( net-libs/libhackrf:= virtual/libusb:1 ) rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 )
+DESCRIPTION=simple Mode S decoder for RTLSDR devices
+EAPI=7
+HOMEPAGE=https://github.com/flightaware/dump1090
+IUSE=bladerf hackrf +rtlsdr minimal
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=sys-libs/ncurses:=[tinfo] bladerf? ( net-wireless/bladerf:= virtual/libusb:1 ) hackrf? ( net-libs/libhackrf:= virtual/libusb:1 ) rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 ) virtual/tmpfiles
+SLOT=0
+SRC_URI=https://github.com/flightaware/dump1090/archive/v6.1.tar.gz -> dump1090-6.1.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2182729910fd7f098d9ac50e54fefe82
diff --git a/metadata/md5-cache/net-wireless/iwd-1.15 b/metadata/md5-cache/net-wireless/iwd-1.15
index 0956798265d9..194b38068e5d 100644
--- a/metadata/md5-cache/net-wireless/iwd-1.15
+++ b/metadata/md5-cache/net-wireless/iwd-1.15
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.41 net-wireless/wireless-regdb crda? ( net-wireless/crda ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.15.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ee04a3f624dbbfa62641eef606dad1c3
diff --git a/metadata/md5-cache/net-wireless/iwd-1.18 b/metadata/md5-cache/net-wireless/iwd-1.18
index fe99f193e352..a92906efb89a 100644
--- a/metadata/md5-cache/net-wireless/iwd-1.18
+++ b/metadata/md5-cache/net-wireless/iwd-1.18
@@ -4,11 +4,11 @@ DEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.44
 DESCRIPTION=Wireless daemon for linux
 EAPI=7
 HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
-IUSE=+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 standalone systemd kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+IUSE=+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +crda elibc_musl +monitor ofono standalone systemd wired kernel_linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.44 net-wireless/wireless-regdb crda? ( net-wireless/crda ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.18.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=346d380a25c536b9fa17df0c5e08bc88
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fc767c3819797b60d34d6337cb094eba
diff --git a/metadata/md5-cache/net-wireless/iwd-9999 b/metadata/md5-cache/net-wireless/iwd-9999
index 7e5b7eb5afd9..93d4a618aab8 100644
--- a/metadata/md5-cache/net-wireless/iwd-9999
+++ b/metadata/md5-cache/net-wireless/iwd-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) net-wireless/wireless-regdb crda? ( net-wireless/crda ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) )
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ad9146f73e73e29cd17c1f01bfaf7b3f
diff --git a/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1 b/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
index ce0c3ba0af99..3ca6391fc994 100644
--- a/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
+++ b/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://madwimax.googlecode.com/files/madwimax-0.1.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d3c3d892f5865b3c656203697a0ac0b4
diff --git a/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1 b/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
index db6656415a0f..974af7431395 100644
--- a/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
+++ b/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
@@ -10,5 +10,5 @@ PDEPEND=media-sound/sox sys-apps/pv
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://git.osmocom.org/osmo-fl2k/snapshot/v0.1.1.tar.gz -> osmo-fl2k-0.1.1.tar.gz
-_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=e3cc55fd56ae9956c36042de19fe36e7
diff --git a/metadata/md5-cache/net-wireless/osmo-fl2k-9999 b/metadata/md5-cache/net-wireless/osmo-fl2k-9999
index d2d6b46c10be..d9d8144b2714 100644
--- a/metadata/md5-cache/net-wireless/osmo-fl2k-9999
+++ b/metadata/md5-cache/net-wireless/osmo-fl2k-9999
@@ -9,5 +9,5 @@ PDEPEND=media-sound/sox sys-apps/pv
 PROPERTIES=live
 RDEPEND=virtual/libusb:1
 SLOT=0
-_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=04fe125a75a871c3b7adb069df6efdba
diff --git a/metadata/md5-cache/net-wireless/qdmr-0.8.1 b/metadata/md5-cache/net-wireless/qdmr-0.8.1
index 1b04dcbb4eb4..1983ce43cf3c 100644
--- a/metadata/md5-cache/net-wireless/qdmr-0.8.1
+++ b/metadata/md5-cache/net-wireless/qdmr-0.8.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtserialport:5 virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/hmatuschek/qdmr/archive/refs/tags/v0.8.1.tar.gz -> qdmr-0.8.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=30e18a650296167b9d612ca1184ca65f
diff --git a/metadata/md5-cache/net-wireless/qdmr-0.9.0_alpha2 b/metadata/md5-cache/net-wireless/qdmr-0.9.0_alpha2
deleted file mode 100644
index 65c5de2eca44..000000000000
--- a/metadata/md5-cache/net-wireless/qdmr-0.9.0_alpha2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/yaml-cpp:= dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtserialport:5 virtual/libusb:1 dev-qt/linguist-tools:5
-DESCRIPTION=GUI application for configuring and programming cheap DMR radios
-EAPI=7
-HOMEPAGE=https://dm3mat.darc.de/qdmr/
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-cpp/yaml-cpp:= dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtserialport:5 virtual/libusb:1
-SLOT=0
-SRC_URI=https://github.com/hmatuschek/qdmr/archive/refs/tags/v0.9.0-alpha2.tar.gz -> qdmr-0.9.0_alpha2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=12962f8f17ddf453b38985cbec9eb70a
diff --git a/metadata/md5-cache/net-wireless/qdmr-0.9.0_alpha3 b/metadata/md5-cache/net-wireless/qdmr-0.9.0_alpha3
new file mode 100644
index 000000000000..e5a1080d2de3
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/qdmr-0.9.0_alpha3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-cpp/yaml-cpp:= dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtserialport:5 virtual/libusb:1 dev-qt/linguist-tools:5
+DESCRIPTION=GUI application for configuring and programming cheap DMR radios
+EAPI=7
+HOMEPAGE=https://dm3mat.darc.de/qdmr/
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-cpp/yaml-cpp:= dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtserialport:5 virtual/libusb:1
+SLOT=0
+SRC_URI=https://github.com/hmatuschek/qdmr/archive/refs/tags/v0.9.0-alpha3.tar.gz -> qdmr-0.9.0_alpha3.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=12962f8f17ddf453b38985cbec9eb70a
diff --git a/metadata/md5-cache/net-wireless/qdmr-9999 b/metadata/md5-cache/net-wireless/qdmr-9999
index 0ff88fab578b..74d90c8f1ef4 100644
--- a/metadata/md5-cache/net-wireless/qdmr-9999
+++ b/metadata/md5-cache/net-wireless/qdmr-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=dev-cpp/yaml-cpp:= dev-qt/designer:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtserialport:5 virtual/libusb:1
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=12962f8f17ddf453b38985cbec9eb70a
diff --git a/metadata/md5-cache/net-wireless/uhd-4.0.0.0 b/metadata/md5-cache/net-wireless/uhd-4.0.0.0
deleted file mode 100644
index 912ab12f5bd7..000000000000
--- a/metadata/md5-cache/net-wireless/uhd-4.0.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) doc? ( app-doc/doxygen ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] ) app-arch/unzip app-arch/gzip sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
-EAPI=6
-HOMEPAGE=https://kb.ettus.com
-IUSE=+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
-RESTRICT=!test? ( test )
-SLOT=0/4.0.0
-SRC_URI=https://github.com/EttusResearch/uhd/archive/v4.0.0.0.tar.gz -> EttusResearch-UHD-4.0.0.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v4.0.0.0/uhd-images_4.0.0.0.tar.xz
-_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=9dbf2ff7377e73648c114df28ef78ccf
diff --git a/metadata/md5-cache/net-wireless/uhd-4.1.0.4 b/metadata/md5-cache/net-wireless/uhd-4.1.0.4
new file mode 100644
index 000000000000..ef053dc0e1bf
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/uhd-4.1.0.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) doc? ( app-doc/doxygen ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] ) app-arch/unzip app-arch/gzip sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
+EAPI=6
+HOMEPAGE=https://kb.ettus.com
+IUSE=+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+RESTRICT=!test? ( test )
+SLOT=0/4.1.0
+SRC_URI=https://github.com/EttusResearch/uhd/archive/v4.1.0.4.tar.gz -> EttusResearch-UHD-4.1.0.4.tar.gz https://github.com/EttusResearch/uhd/releases/download/v4.1.0.4/uhd-images_4.1.0.4.tar.xz
+_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=5f2c1d6acc4ca5b4d3ea81bf8df18ad0
diff --git a/metadata/md5-cache/net-wireless/unifi-6.4.54-r1 b/metadata/md5-cache/net-wireless/unifi-6.4.54-r1
new file mode 100644
index 000000000000..4c5b3041f8fa
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-6.4.54-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=7
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+KEYWORDS=-* ~amd64 ~arm64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/6.4
+SRC_URI=https://dl.ui.com/unifi/6.4.54-bdf9275f33/UniFi.unix.zip -> unifi-6.4.54.zip
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4a02132b88e65883c6835b7cb4c9f2f7
diff --git a/metadata/md5-cache/net-wireless/unifi-6.5.42-r1 b/metadata/md5-cache/net-wireless/unifi-6.5.42-r1
new file mode 100644
index 000000000000..c249cfc3ced8
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-6.5.42-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=7
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+KEYWORDS=-* ~amd64 ~arm64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/6.5
+SRC_URI=https://dl.ui.com/unifi/6.5.42-7bfe5b2ead/UniFi.unix.zip -> unifi-6.5.42.zip
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=426404f9a90211c2d8e53f0914f79110
diff --git a/metadata/md5-cache/net-wireless/unifi-6.5.45-r1 b/metadata/md5-cache/net-wireless/unifi-6.5.45-r1
new file mode 100644
index 000000000000..a90f19cbf6ed
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-6.5.45-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=7
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+KEYWORDS=-* ~amd64 ~arm64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/6.5
+SRC_URI=https://dl.ui.com/unifi/6.5.45-c8122c1151/UniFi.unix.zip -> unifi-6.5.45.zip
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e383d77a8fc691f6fe29a3504d93f1fa
diff --git a/metadata/md5-cache/net-wireless/wavemon-0.9.3-r1 b/metadata/md5-cache/net-wireless/wavemon-0.9.3-r1
index 50d20d143522..9f90ce3bc21c 100644
--- a/metadata/md5-cache/net-wireless/wavemon-0.9.3-r1
+++ b/metadata/md5-cache/net-wireless/wavemon-0.9.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libnl:3 sys-libs/ncurses:0= caps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/uoaerg/wavemon/archive/v0.9.3.tar.gz -> wavemon-0.9.3.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=000510544e874b201e2da84f16fa43f3
diff --git a/metadata/md5-cache/net-wireless/wavemon-0.9.4 b/metadata/md5-cache/net-wireless/wavemon-0.9.4
index 106b8641603e..2c6985e395df 100644
--- a/metadata/md5-cache/net-wireless/wavemon-0.9.4
+++ b/metadata/md5-cache/net-wireless/wavemon-0.9.4
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libnl:3[utils] sys-libs/ncurses:0= caps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/uoaerg/wavemon/archive/v0.9.4.tar.gz -> wavemon-0.9.4.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=17647c515ce16d6a772a71240c182d4b
diff --git a/metadata/md5-cache/perl-core/File-Temp-0.230.900 b/metadata/md5-cache/perl-core/File-Temp-0.230.900
deleted file mode 100644
index 74fbfbec9634..000000000000
--- a/metadata/md5-cache/perl-core/File-Temp-0.230.900
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=File::Temp can be used to create and open temporary files in a safe way
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/File-Temp
-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
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2309.tar.gz
-_eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=fb0092e0fafc7344bcaf882161c8efe7
diff --git a/metadata/md5-cache/perl-core/Manifest.gz b/metadata/md5-cache/perl-core/Manifest.gz
index 4c913b3eb429..1422a519a52f 100644
--- a/metadata/md5-cache/perl-core/Manifest.gz
+++ b/metadata/md5-cache/perl-core/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 2a9273db4b03..d4af6f16d3a5 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/bcftools-1.10.2 b/metadata/md5-cache/sci-biology/bcftools-1.10.2
deleted file mode 100644
index 2c8e81e16a13..000000000000
--- a/metadata/md5-cache/sci-biology/bcftools-1.10.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=dev-lang/perl python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) =sci-libs/htslib-1.10.2*:= sys-libs/zlib:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-DESCRIPTION=Utilities for variant calling and manipulating VCF and BCF files
-EAPI=7
-HOMEPAGE=http://www.htslib.org
-IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/perl python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) =sci-libs/htslib-1.10.2*:= sys-libs/zlib:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/samtools/bcftools/releases/download/1.10.2/bcftools-1.10.2.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=73b8ffce0b88618f264d8ad775c675d5
diff --git a/metadata/md5-cache/sci-biology/pysam-0.16.0.1 b/metadata/md5-cache/sci-biology/pysam-0.16.0.1
deleted file mode 100644
index 75642acd46a4..000000000000
--- a/metadata/md5-cache/sci-biology/pysam-0.16.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( =sci-biology/bcftools-1.10* =sci-biology/samtools-1.10* ) test? ( =sci-libs/htslib-1.10*:= >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==sci-libs/htslib-1.10*:= dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Python interface for the SAM/BAM sequence alignment and mapping format
-EAPI=7
-HOMEPAGE=https://github.com/pysam-developers/pysam https://pypi.org/project/pysam/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND==sci-libs/htslib-1.10*:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pysam-developers/pysam/archive/v0.16.0.1.tar.gz -> pysam-0.16.0.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=24cbd77fb49bf7dfa36311bf5973256d
diff --git a/metadata/md5-cache/sci-biology/samtools-1.10-r1 b/metadata/md5-cache/sci-biology/samtools-1.10-r1
deleted file mode 100644
index e7de4e749ae9..000000000000
--- a/metadata/md5-cache/sci-biology/samtools-1.10-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl =sci-libs/htslib-1.10* sys-libs/ncurses:=[unicode(+)] sys-libs/zlib:=
-DESCRIPTION=Utilities for analysing and manipulating the SAM/BAM alignment formats
-EAPI=7
-HOMEPAGE=http://www.htslib.org/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-lang/perl =sci-libs/htslib-1.10* sys-libs/ncurses:=[unicode(+)] sys-libs/zlib:=
-SLOT=0
-SRC_URI=mirror://sourceforge/samtools/samtools-1.10.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=421db8c182476986b3e15d19e2ec8922
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index f61a990f17c9..9531f29e5dee 100644
--- a/metadata/md5-cache/sci-calculators/Manifest.gz
+++ b/metadata/md5-cache/sci-calculators/Manifest.gz
diff --git a/metadata/md5-cache/sci-calculators/bc-gh-5.1.1 b/metadata/md5-cache/sci-calculators/bc-gh-5.1.1
new file mode 100644
index 000000000000..09fe92e101be
--- /dev/null
+++ b/metadata/md5-cache/sci-calculators/bc-gh-5.1.1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure
+DESCRIPTION=Implementation of POSIX bc with GNU extensions
+EAPI=7
+HOMEPAGE=https://git.yzena.com/gavin/bc
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://github.com/gavinhoward/bc/releases/download/5.1.1/bc-5.1.1.tar.xz
+_md5_=ae4c814a04f9f5430a23d6e9aa101bb8
diff --git a/metadata/md5-cache/sci-calculators/qalculate-gtk-3.21.0 b/metadata/md5-cache/sci-calculators/qalculate-gtk-3.21.0
new file mode 100644
index 000000000000..fea30273f184
--- /dev/null
+++ b/metadata/md5-cache/sci-calculators/qalculate-gtk-3.21.0
@@ -0,0 +1,13 @@
+BDEPEND=app-text/rarian dev-util/gdbus-codegen dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-3.21.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Modern multi-purpose calculator
+EAPI=7
+HOMEPAGE=https://qalculate.github.io/
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-3.21.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
+SLOT=0
+SRC_URI=https://github.com/Qalculate/qalculate-gtk/releases/download/v3.21.0/qalculate-gtk-3.21.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=78a949bbb1725e91ab5d7cad16a5e847
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 06d43f2d79ae..fb937e2852bc 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/chemex-2018.10.3 b/metadata/md5-cache/sci-chemistry/chemex-2018.10.3
deleted file mode 100644
index ee9d24c21c04..000000000000
--- a/metadata/md5-cache/sci-chemistry/chemex-2018.10.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_8? ( >=dev-python/asteval-0.9.11[python_targets_python3_8(-)] >=dev-python/lmfit-0.9.11[python_targets_python3_8(-)] >=dev-python/matplotlib-1.1[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/setuptools_scm[python_targets_python3_8(-)] >=dev-python/scipy-0.11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.11[python_targets_python3_9(-)] >=dev-python/lmfit-0.9.11[python_targets_python3_9(-)] >=dev-python/matplotlib-1.1[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_9(-)] >=dev-python/scipy-0.11[python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-python/asteval-0.9.11[python_targets_python3_8(-)] >=dev-python/lmfit-0.9.11[python_targets_python3_8(-)] >=dev-python/matplotlib-1.1[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/setuptools_scm[python_targets_python3_8(-)] >=dev-python/scipy-0.11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.11[python_targets_python3_9(-)] >=dev-python/lmfit-0.9.11[python_targets_python3_9(-)] >=dev-python/matplotlib-1.1[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_9(-)] >=dev-python/scipy-0.11[python_targets_python3_9(-)] )
-DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
-EAPI=7
-HOMEPAGE=https://github.com/gbouvignies/chemex
-IUSE=test test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_single_target_python3_8? ( >=dev-python/asteval-0.9.11[python_targets_python3_8(-)] >=dev-python/lmfit-0.9.11[python_targets_python3_8(-)] >=dev-python/matplotlib-1.1[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/setuptools_scm[python_targets_python3_8(-)] >=dev-python/scipy-0.11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.11[python_targets_python3_9(-)] >=dev-python/lmfit-0.9.11[python_targets_python3_9(-)] >=dev-python/matplotlib-1.1[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_9(-)] >=dev-python/scipy-0.11[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/gbouvignies/chemex/archive/2018.10.3.tar.gz -> chemex-2018.10.3.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3275627c04cf126235173404b2fc026c
diff --git a/metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p4 b/metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p4
new file mode 100644
index 000000000000..6765fec3fe8a
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/chemex-2021.4.0_p4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_single_target_python3_8? ( >=dev-python/asteval-0.9.25[python_targets_python3_8(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_8(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_8(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_8(-)] >=dev-python/numpy-1.21.2[python_targets_python3_8(-)] dev-python/setuptools_scm[python_targets_python3_8(-)] >=dev-python/scipy-1.7.0[python_targets_python3_8(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_8(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_9(-)] >=dev-python/numpy-1.21.2[python_targets_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_9(-)] >=dev-python/scipy-1.7.0[python_targets_python3_9(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_9(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_10(-)] >=dev-python/numpy-1.21.2[python_targets_python3_10(-)] dev-python/setuptools_scm[python_targets_python3_10(-)] >=dev-python/scipy-1.7.0[python_targets_python3_10(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_10(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-4.5.0[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pyproject2setuppy-18[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-python/asteval-0.9.25[python_targets_python3_8(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_8(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_8(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_8(-)] >=dev-python/numpy-1.21.2[python_targets_python3_8(-)] dev-python/setuptools_scm[python_targets_python3_8(-)] >=dev-python/scipy-1.7.0[python_targets_python3_8(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_8(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_9(-)] >=dev-python/numpy-1.21.2[python_targets_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_9(-)] >=dev-python/scipy-1.7.0[python_targets_python3_9(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_9(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_10(-)] >=dev-python/numpy-1.21.2[python_targets_python3_10(-)] dev-python/setuptools_scm[python_targets_python3_10(-)] >=dev-python/scipy-1.7.0[python_targets_python3_10(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_10(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_10(-)] )
+DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
+EAPI=8
+HOMEPAGE=https://github.com/gbouvignies/chemex
+IUSE=test test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( >=dev-python/asteval-0.9.25[python_targets_python3_8(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_8(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_8(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_8(-)] >=dev-python/numpy-1.21.2[python_targets_python3_8(-)] dev-python/setuptools_scm[python_targets_python3_8(-)] >=dev-python/scipy-1.7.0[python_targets_python3_8(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_8(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_9(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_9(-)] >=dev-python/numpy-1.21.2[python_targets_python3_9(-)] dev-python/setuptools_scm[python_targets_python3_9(-)] >=dev-python/scipy-1.7.0[python_targets_python3_9(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_9(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/jsonschema-4.1.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.0.3[python_targets_python3_10(-)] >=dev-python/matplotlib-3.4.3[python_targets_python3_10(-)] >=dev-python/numpy-1.21.2[python_targets_python3_10(-)] dev-python/setuptools_scm[python_targets_python3_10(-)] >=dev-python/scipy-1.7.0[python_targets_python3_10(-)] >=dev-python/tomlkit-0.7.2[python_targets_python3_10(-)] >=dev-python/tqdm-4.61.1[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gbouvignies/chemex/archive/2021.4.0-dev4.tar.gz -> chemex-2021.4.0_p4.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0b7e209cc57132087f5a9f6e5364096d
diff --git a/metadata/md5-cache/sci-chemistry/dssp-4.0.1_p20210831 b/metadata/md5-cache/sci-chemistry/dssp-4.0.1_p20210831
index 5cb43de5b5e1..cf90fecbb81b 100644
--- a/metadata/md5-cache/sci-chemistry/dssp-4.0.1_p20210831
+++ b/metadata/md5-cache/sci-chemistry/dssp-4.0.1_p20210831
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=The protein secondary structure standard
 EAPI=7
 HOMEPAGE=https://swift.cmbi.umcn.nl/gv/dssp/ https://github.com/PDB-REDO/dssp
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/boost-1.70.0:=[bzip2,zlib,threads(+)] >=sci-libs/libcifpp-1.1.1
 SLOT=0
 SRC_URI=https://github.com/PDB-REDO/dssp/archive/728cc7c6c8d95460d8db453cf7adb25a89ba15f6.tar.gz -> dssp-4.0.1_p20210831.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7a45d93dbfdfa7dbb289908f227a465d
+_md5_=e414eedce8c7008570f0d0c4d146f89b
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.3 b/metadata/md5-cache/sci-chemistry/gromacs-2021.3
index e63b39f85b41..643360c531f4 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.3
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.3
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2021.3
 SRC_URI=http://ftp.gromacs.org/gromacs/gromacs-2021.3.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2021.3.pdf ) test? ( http://ftp.gromacs.org/regressiontests/regressiontests-2021.3.tar.gz )
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	252d4f554e611b0af601160a9c7be049	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=adb6251fbb96f3c367dd89945e17f505
+_md5_=92e1e7fac8f8f9d0b658245cc8976f56
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
index e2deb141a643..84fb70944a32 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cud
 RESTRICT=!test? ( test )
 SLOT=0/2021.9999
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=51ff5bfd02d9afe75f75c9e2345bbc03
+_md5_=1dbccfb8c8e885d1cdfe137ea31011bb
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-9999 b/metadata/md5-cache/sci-chemistry/gromacs-9999
index b356e532a305..bbc6ceefeb29 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cud
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=51ff5bfd02d9afe75f75c9e2345bbc03
+_md5_=1dbccfb8c8e885d1cdfe137ea31011bb
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index ef4a2275c951..e13e187ff16f 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/xoscope-2.2 b/metadata/md5-cache/sci-electronics/xoscope-2.2
index 4023c17cc873..f5bd7afec2c0 100644
--- a/metadata/md5-cache/sci-electronics/xoscope-2.2
+++ b/metadata/md5-cache/sci-electronics/xoscope-2.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/fftw:3.0= virtual/man x11-libs/gtkdatabox
 SLOT=0
 SRC_URI=mirror://sourceforge/project/xoscope/xoscope/2.2/xoscope-2.2.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6b727fad109d20a2e4f6836ca86d6b70
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 5debd4d0e109..7b441c5a1d3c 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/gpsprune-bin-20.4 b/metadata/md5-cache/sci-geosciences/gpsprune-bin-20.4
new file mode 100644
index 000000000000..b7d3690c92c6
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gpsprune-bin-20.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=virtual/jre:*
+DESCRIPTION=An application for viewing, editing and converting GPS data.
+EAPI=8
+HOMEPAGE=http://activityworkshop.net/software/gpsprune/index.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/jre:*
+SLOT=0
+SRC_URI=http://activityworkshop.net/software/gpsprune/gpsprune_20.4.jar
+_md5_=f2952b81935d76902767996d55cd7045
diff --git a/metadata/md5-cache/sci-geosciences/grass-7.8.6 b/metadata/md5-cache/sci-geosciences/grass-7.8.6
new file mode 100644
index 000000000000..93523a905112
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/grass-7.8.6
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig X? ( dev-lang/swig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-admin/eselect-1.2 python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sci-libs/proj sci-libs/xdrfile sys-libs/zlib blas? ( virtual/cblas[eselect-ldso(+)] virtual/blas[eselect-ldso(+)] ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) lapack? ( virtual/lapack[eselect-ldso(+)] ) liblas? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:4.0 x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) zstd? ( app-arch/zstd ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A free GIS with raster and vector functionality, as well as 3D vizualization
+EAPI=7
+HOMEPAGE=https://grass.osgeo.org/
+IUSE=blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-admin/eselect-1.2 python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sci-libs/proj sci-libs/xdrfile sys-libs/zlib blas? ( virtual/cblas[eselect-ldso(+)] virtual/blas[eselect-ldso(+)] ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) lapack? ( virtual/lapack[eselect-ldso(+)] ) liblas? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:4.0 x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) zstd? ( app-arch/zstd )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) opengl? ( X )
+SLOT=0/7.8.0
+SRC_URI=https://grass.osgeo.org/grass78/source/grass-7.8.6.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9b6d566943c2a62275f442d2e034f5ed
diff --git a/metadata/md5-cache/sci-geosciences/grass-9999 b/metadata/md5-cache/sci-geosciences/grass-9999
index 7d8306c2d3a5..1c5537ac87f6 100644
--- a/metadata/md5-cache/sci-geosciences/grass-9999
+++ b/metadata/md5-cache/sci-geosciences/grass-9999
@@ -11,4 +11,4 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0/7.9
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=96bcee84837b826e40374f60dacc9733
+_md5_=913ccbca087acbac278296f9d8fd04b3
diff --git a/metadata/md5-cache/sci-geosciences/mapserver-7.6.2-r1 b/metadata/md5-cache/sci-geosciences/mapserver-7.6.2-r1
index 6d432e809f3f..b6424d5f9c36 100644
--- a/metadata/md5-cache/sci-geosciences/mapserver-7.6.2-r1
+++ b/metadata/md5-cache/sci-geosciences/mapserver-7.6.2-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/mapserver/mapserver-7.6.2.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cmake	11fee991ab428a3370e5c20fa8231fb6	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	perl-functions	fea344a91ebf37efadf172c6a3de5a72	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	webapp	cd327e73cdb307ceb80dcca6b8ad8b52	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d9d9e91a3aa2e888c7bd0c9cab32d4f1
+_md5_=9664543934fe926343fe49f1eefe7799
diff --git a/metadata/md5-cache/sci-geosciences/mapserver-7.6.4 b/metadata/md5-cache/sci-geosciences/mapserver-7.6.4
new file mode 100644
index 000000000000..d1b7e663c60f
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/mapserver-7.6.4
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig perl? ( >=dev-lang/swig-4.0 ) php? ( >=dev-lang/swig-4.0 ) python? ( >=dev-lang/swig-4.0 >=dev-python/setuptools-44.1.0 ) dev-util/ninja >=dev-util/cmake-3.20.5 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
+DEPEND=>=dev-libs/expat-2.2.8 dev-libs/libxml2:2= dev-libs/libxslt[crypt] >=dev-libs/protobuf-c-1.3.2:= >=media-libs/freetype-2.9.1-r3 >=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib] >=media-libs/giflib-5.2.1:= >=media-libs/libpng-1.6.37:= >=net-misc/curl-7.69.1 >=sci-libs/gdal-3.0.4:=[oracle?] >=sci-libs/proj-6.2.1:= virtual/jpeg virtual/libiconv >=x11-libs/agg-2.5-r3 apache? ( app-admin/webapp-config dev-libs/fcgi ) bidi? ( dev-libs/fribidi media-libs/harfbuzz:= ) cairo? ( x11-libs/cairo ) geos? ( sci-libs/geos ) mysql? ( dev-db/mysql-connector-c:= ) oracle? ( dev-db/oracle-instantclient:= ) perl? ( dev-lang/perl:= ) postgis? ( dev-db/postgis dev-db/postgresql:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) apache? ( =www-servers/apache-2* ) php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
+DESCRIPTION=Development environment for building spatially enabled webapps
+EAPI=7
+HOMEPAGE=https://mapserver.org/
+IUSE=apache bidi cairo geos mysql oracle perl php postgis python apache php_targets_php7-3 php_targets_php7-4 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Boost-1.0 BSD BSD-2 ISC MIT tcltk
+RDEPEND=>=dev-libs/expat-2.2.8 dev-libs/libxml2:2= dev-libs/libxslt[crypt] >=dev-libs/protobuf-c-1.3.2:= >=media-libs/freetype-2.9.1-r3 >=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib] >=media-libs/giflib-5.2.1:= >=media-libs/libpng-1.6.37:= >=net-misc/curl-7.69.1 >=sci-libs/gdal-3.0.4:=[oracle?] >=sci-libs/proj-6.2.1:= virtual/jpeg virtual/libiconv >=x11-libs/agg-2.5-r3 apache? ( app-admin/webapp-config dev-libs/fcgi ) bidi? ( dev-libs/fribidi media-libs/harfbuzz:= ) cairo? ( x11-libs/cairo ) geos? ( sci-libs/geos ) mysql? ( dev-db/mysql-connector-c:= ) oracle? ( dev-db/oracle-instantclient:= ) perl? ( dev-lang/perl:= ) postgis? ( dev-db/postgis dev-db/postgresql:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) apache? ( =www-servers/apache-2* ) php? ( php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) php? ( || ( php_targets_php7-3 php_targets_php7-4 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.osgeo.org/mapserver/mapserver-7.6.4.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cmake	11fee991ab428a3370e5c20fa8231fb6	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	perl-functions	fea344a91ebf37efadf172c6a3de5a72	php-ext-source-r3	b61f3cc83a4e875e5eaf215d17ad83ef	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	webapp	cd327e73cdb307ceb80dcca6b8ad8b52	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=911ef27f903688b1937ca299c75f416c
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.18.3 b/metadata/md5-cache/sci-geosciences/qgis-3.18.3
index 23a40fb54d37..6de9b8b313a4 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-3.18.3
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.18.3
@@ -5,7 +5,7 @@ DESCRIPTION=User friendly Geographic Information System
 EAPI=7
 HOMEPAGE=https://www.qgis.org/en/site/
 IUSE=3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=>=app-crypt/qca-2.3.0:2[ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= dev-libs/qtkeychain:= dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-6.3.1:= sys-libs/zlib >=x11-libs/qscintilla-2.10.3:= >=x11-libs/qwt-6.1.3-r2:6=[svg] 3d? ( dev-qt/qt3d:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r2 ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/httplib2[python_targets_python3_8(-)] dev-python/jinja[python_targets_python3_8(-)] dev-python/markupsafe[python_targets_python3_8(-)] dev-python/owslib[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] >=dev-python/qscintilla-python-2.10.3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/sip-5:=[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_8(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/httplib2[python_targets_python3_9(-)] dev-python/jinja[python_targets_python3_9(-)] dev-python/markupsafe[python_targets_python3_9(-)] dev-python/owslib[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] dev-python/pytz[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] >=dev-python/qscintilla-python-2.10.3[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/sip-5:=[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_9(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) ) ) qml? ( dev-qt/qtdeclarative:5 ) serial? ( dev-qt/qtserialport:5 ) sci-geosciences/gpsbabel
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) mapserver? ( python )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://qgis.org/downloads/qgis-3.18.3.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2600be010cb83fae7aebe9fd824b0a4f
+_md5_=0fa6950440de3e99579a91ddf65c65a6
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.20.2 b/metadata/md5-cache/sci-geosciences/qgis-3.20.2
index f60b0900f71b..80a5e2bfa2eb 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-3.20.2
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.20.2
@@ -5,7 +5,7 @@ DESCRIPTION=User friendly Geographic Information System
 EAPI=7
 HOMEPAGE=https://www.qgis.org/
 IUSE=3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= dev-libs/qtkeychain[qt5(+)] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 dev-qt/qtserialport:5 dev-qt/qtsvg:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= sys-libs/zlib >=sci-libs/proj-4.9.3:= >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( dev-qt/qt3d:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] dev-python/httplib2[python_targets_python3_8(-)] dev-python/jinja[python_targets_python3_8(-)] dev-python/markupsafe[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/owslib[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[designer,network,sql,svg,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/sip-5:=[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_8(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] dev-python/httplib2[python_targets_python3_9(-)] dev-python/jinja[python_targets_python3_9(-)] dev-python/markupsafe[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/owslib[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/PyQt5[designer,network,sql,svg,python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] dev-python/pytz[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/sip-5:=[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_9(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) ) ) qml? ( dev-qt/qtdeclarative:5 ) serial? ( dev-qt/qtserialport:5 ) sci-geosciences/gpsbabel
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) mapserver? ( python )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://qgis.org/downloads/qgis-3.20.2.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4d124c4b90760eb806cfac91be7a3563
+_md5_=b411e8df11fa2647d4b7fc79aa230e6d
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 34f426d4a323..eaf2e17c347a 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/armadillo-10.7.1 b/metadata/md5-cache/sci-libs/armadillo-10.7.1
new file mode 100644
index 000000000000..5db523eeea95
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/armadillo-10.7.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 ) arpack? ( virtual/pkgconfig ) blas? ( virtual/pkgconfig ) hdf5? ( sci-libs/hdf5 ) lapack? ( virtual/pkgconfig ) mkl? ( sci-libs/mkl )
+DESCRIPTION=Streamlined C++ linear algebra library
+EAPI=7
+HOMEPAGE=http://arma.sourceforge.net/
+IUSE=arpack blas doc examples hdf5 lapack mkl superlu test
+KEYWORDS=~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+PDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 ) hdf5? ( sci-libs/hdf5 ) mkl? ( sci-libs/mkl )
+RDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 )
+REQUIRED_USE=test? ( lapack )
+RESTRICT=!test? ( test )
+SLOT=0/10
+SRC_URI=mirror://sourceforge/arma/armadillo-10.7.1.tar.xz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=69e572ece0a69979721028bc30ee9e34
diff --git a/metadata/md5-cache/sci-libs/avogadrolibs-1.93.0 b/metadata/md5-cache/sci-libs/avogadrolibs-1.93.0
index aed29ff6f5a4..13c728a27f47 100644
--- a/metadata/md5-cache/sci-libs/avogadrolibs-1.93.0
+++ b/metadata/md5-cache/sci-libs/avogadrolibs-1.93.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenChemistry/avogadrolibs/archive/1.93.0.tar.gz -> avogadrolibs-1.93.0.tar.gz vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern -> linux64-genXrdPattern-avogadrolibs-1.93.0 )
 _eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cdf516b2c1c0043e60c5c6e0153db915
+_md5_=878f8f666f254907dcd570cef4df7497
diff --git a/metadata/md5-cache/sci-libs/cartopy-0.19.0 b/metadata/md5-cache/sci-libs/cartopy-0.19.0
new file mode 100644
index 000000000000..46c22743e7af
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/cartopy-0.19.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/pyshp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/gdal[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/pyshp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/gdal[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/geos <sci-libs/proj-8 test? ( dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flufl-lock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+DESCRIPTION=Python package for geospatial data processing and analysis
+EAPI=8
+HOMEPAGE=https://scitools.org.uk/cartopy
+IUSE=test test python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/pyshp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/gdal[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/SciTools/cartopy/archive/v0.19.0.tar.gz -> cartopy-0.19.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=c7a895c0d5b456a4285608bda04c4d93
diff --git a/metadata/md5-cache/sci-libs/cln-1.3.6 b/metadata/md5-cache/sci-libs/cln-1.3.6
index 8f9e8d5cb4fe..d77a9e745898 100644
--- a/metadata/md5-cache/sci-libs/cln-1.3.6
+++ b/metadata/md5-cache/sci-libs/cln-1.3.6
@@ -4,10 +4,10 @@ DESCRIPTION=Class library (C++) for numbers
 EAPI=7
 HOMEPAGE=https://www.ginac.de/CLN/
 IUSE=doc examples
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0=
 SLOT=1
 SRC_URI=https://www.ginac.de/CLN/cln-1.3.6.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5c11acf7c7d0d1200ef63c1d1a07bf6f
+_md5_=efecfede7d57c87bc61d8bd7358b85f2
diff --git a/metadata/md5-cache/sci-libs/cxsparse-3.2.0 b/metadata/md5-cache/sci-libs/cxsparse-3.2.0
index a3155776975b..26b4c719acbc 100644
--- a/metadata/md5-cache/sci-libs/cxsparse-3.2.0
+++ b/metadata/md5-cache/sci-libs/cxsparse-3.2.0
@@ -5,10 +5,10 @@ DESCRIPTION=Extended sparse matrix package
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=sci-libs/suitesparseconfig-5.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/cxsparse-3.2.0.tar.bz2
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=41e6116a1c053ffebe84450e22f4e31f
+_md5_=782292480e30a2a2ba05f9ad894beaee
diff --git a/metadata/md5-cache/sci-libs/gdal-3.3.2 b/metadata/md5-cache/sci-libs/gdal-3.3.2
deleted file mode 100644
index bd75a811a3ef..000000000000
--- a/metadata/md5-cache/sci-libs/gdal-3.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) java? ( dev-java/ant-core dev-lang/swig:0 >=virtual/jdk-1.8:* ) perl? ( dev-lang/swig:0 ) python? ( dev-lang/swig:0 dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Translator library for raster geospatial data formats (includes OGR support)
-EAPI=7
-HOMEPAGE=https://gdal.org/
-IUSE=armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 elibc_FreeBSD java
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD Info-ZIP MIT
-RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) spatialite? ( sqlite )
-SLOT=0/3.3
-SRC_URI=https://download.osgeo.org/gdal/3.3.2/gdal-3.3.2.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=28709aea96fe2f54e3fcdfe316a77ddb
diff --git a/metadata/md5-cache/sci-libs/gdal-3.3.2-r1 b/metadata/md5-cache/sci-libs/gdal-3.3.2-r1
new file mode 100644
index 000000000000..f4e042934880
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/gdal-3.3.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) java? ( dev-java/ant-core dev-lang/swig:0 >=virtual/jdk-1.8:* ) perl? ( dev-lang/swig:0 ) python? ( dev-lang/swig:0 dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Translator library for raster geospatial data formats (includes OGR support)
+EAPI=7
+HOMEPAGE=https://gdal.org/
+IUSE=armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 elibc_FreeBSD java
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD Info-ZIP MIT
+RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) spatialite? ( sqlite )
+SLOT=0/3.3
+SRC_URI=https://download.osgeo.org/gdal/3.3.2/gdal-3.3.2.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d9d657790371467b7873e0f86865eb2d
diff --git a/metadata/md5-cache/sci-libs/h5hut-1.99.13 b/metadata/md5-cache/sci-libs/h5hut-1.99.13
deleted file mode 100644
index 78eb6a2a4534..000000000000
--- a/metadata/md5-cache/sci-libs/h5hut-1.99.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=virtual/mpi sci-libs/hdf5[mpi] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=High-Performance I/O Library for Particle-based Simulations
-EAPI=6
-HOMEPAGE=http://www-vis.lbl.gov/Research/H5hut/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=virtual/mpi sci-libs/hdf5[mpi]
-SLOT=0
-SRC_URI=https://amas.psi.ch/H5hut/raw-attachment/wiki/DownloadSources/H5hut-1.99.13.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=226b3979dbccb30102891de69f9f2c87
diff --git a/metadata/md5-cache/sci-libs/h5hut-1.99.13-r1 b/metadata/md5-cache/sci-libs/h5hut-1.99.13-r1
new file mode 100644
index 000000000000..9bd29ee24e04
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/h5hut-1.99.13-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=virtual/mpi <sci-libs/hdf5-1.12[mpi] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=High-Performance I/O Library for Particle-based Simulations
+EAPI=6
+HOMEPAGE=http://www-vis.lbl.gov/Research/H5hut/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=virtual/mpi <sci-libs/hdf5-1.12[mpi]
+SLOT=0
+SRC_URI=https://amas.psi.ch/H5hut/raw-attachment/wiki/DownloadSources/H5hut-1.99.13.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=78af0cb00c62d21d4f6f22e87dc64324
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.12.1-r1 b/metadata/md5-cache/sci-libs/hdf5-1.12.1-r1
index a43258eb5f30..44ed799d9e6b 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.12.1-r1
+++ b/metadata/md5-cache/sci-libs/hdf5-1.12.1-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.12.1
 SRC_URI=https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-1.12.1/src/hdf5-1.12.1.tar.bz2
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=566c66dbc515ad2f0e1fafc622ffcbea
+_md5_=335f8b7e1144dac092810486cbec9cff
diff --git a/metadata/md5-cache/sci-libs/htslib-1.10.2 b/metadata/md5-cache/sci-libs/htslib-1.10.2
deleted file mode 100644
index 60a3de45ac7f..000000000000
--- a/metadata/md5-cache/sci-libs/htslib-1.10.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=bzip2? ( app-arch/bzip2:= ) curl? ( net-misc/curl ) lzma? ( app-arch/xz-utils:= )
-DESCRIPTION=C library for high-throughput sequencing data formats
-EAPI=7
-HOMEPAGE=http://www.htslib.org/
-IUSE=+bzip2 curl +lzma
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=bzip2? ( app-arch/bzip2:= ) curl? ( net-misc/curl ) lzma? ( app-arch/xz-utils:= )
-SLOT=0/3
-SRC_URI=mirror://sourceforge/samtools/1.10.2/htslib-1.10.2.tar.bz2
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=23b94cf7e1e965cd1a0196a498381a08
diff --git a/metadata/md5-cache/sci-libs/libcifpp-1.1.1 b/metadata/md5-cache/sci-libs/libcifpp-1.1.1
index 36fc77f19cbb..2bd12f3635de 100644
--- a/metadata/md5-cache/sci-libs/libcifpp-1.1.1
+++ b/metadata/md5-cache/sci-libs/libcifpp-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Code to work with mmCIF and PDB files
 EAPI=8
 HOMEPAGE=https://github.com/PDB-REDO/libcifpp
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PDB-REDO/libcifpp/archive/refs/tags/v1.1.1.tar.gz -> libcifpp-1.1.1.tar.gz ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz -> components-1.1.1.cif.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e23307910044901b796ae79300343f7c
+_md5_=f061953d5a7fcbdd76f419954cae0292
diff --git a/metadata/md5-cache/sci-libs/libcifpp-2.0.3 b/metadata/md5-cache/sci-libs/libcifpp-2.0.3
new file mode 100644
index 000000000000..e881ef360bc1
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libcifpp-2.0.3
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-libs/boost-1.70.0:0=[threads(+)] dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Code to work with mmCIF and PDB files
+EAPI=8
+HOMEPAGE=https://github.com/PDB-REDO/libcifpp
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PDB-REDO/libcifpp/archive/refs/tags/v2.0.3.tar.gz -> libcifpp-2.0.3.tar.gz ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz -> components-2.0.3.cif.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=734818503181aaafaa95940205cc19c0
diff --git a/metadata/md5-cache/sci-libs/libqalculate-3.21.0 b/metadata/md5-cache/sci-libs/libqalculate-3.21.0
new file mode 100644
index 000000000000..615dbcebe7f0
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libqalculate-3.21.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/gmp:0= dev-libs/libxml2:2 dev-libs/mpfr:0= virtual/libiconv curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= )
+DESCRIPTION=A modern multi-purpose calculator library
+EAPI=8
+HOMEPAGE=https://qalculate.github.io/
+IUSE=curl icu gnuplot readline
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:0= dev-libs/libxml2:2 dev-libs/mpfr:0= virtual/libiconv curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) gnuplot? ( >=sci-visualization/gnuplot-3.7 )
+SLOT=0/22
+SRC_URI=https://github.com/Qalculate/libqalculate/releases/download/v3.21.0/libqalculate-3.21.0.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8cd2cffb01c3fb2e961ef609be1d881d
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.3-r1 b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.3-r1
index 6907ec4ef06f..300a58353734 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.3-r1
+++ b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/gpib !<sci-libs/linux-gpib-4.2.0_rc1 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.3.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c8498b92847c4cc16977e7532d55d320
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4 b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4
index 4c1fe2ce23d8..a7a08132daad 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4
+++ b/metadata/md5-cache/sci-libs/linux-gpib-modules-4.3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/gpib !<sci-libs/linux-gpib-4.2.0_rc1 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.3.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c8498b92847c4cc16977e7532d55d320
diff --git a/metadata/md5-cache/sci-libs/netcdf-cxx-4.3.1 b/metadata/md5-cache/sci-libs/netcdf-cxx-4.3.1
index 7f6e1bd75374..e198fdeeb0a7 100644
--- a/metadata/md5-cache/sci-libs/netcdf-cxx-4.3.1
+++ b/metadata/md5-cache/sci-libs/netcdf-cxx-4.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=C++ library for netCDF
 EAPI=7
 HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
 IUSE=examples
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=UCAR-Unidata
 RDEPEND=>=sci-libs/netcdf-4.2:=[hdf5]
 RESTRICT=test
 SLOT=0/1
 SRC_URI=https://github.com/Unidata/netcdf-cxx4/archive/v4.3.1.tar.gz -> netcdf-cxx-4.3.1.tar.gz
-_md5_=26072c72761e9731143a12ef702ca66a
+_md5_=4efbe251a45129eeff60bb47e0851f9e
diff --git a/metadata/md5-cache/sci-libs/openlibm-0.8.0 b/metadata/md5-cache/sci-libs/openlibm-0.8.0
new file mode 100644
index 000000000000..ed4f5d466f74
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/openlibm-0.8.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=High quality system independent, open source libm
+EAPI=8
+HOMEPAGE=https://github.com/JuliaLang/openlibm
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=public-domain MIT ISC BSD-2 LGPL-2.1+
+SLOT=0/4
+SRC_URI=https://github.com/JuliaMath/openlibm/archive/v0.8.0.tar.gz -> openlibm-0.8.0.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1ed122fba85924e0859ebc9c98f3e2f6
diff --git a/metadata/md5-cache/sci-libs/qrupdate-1.1.2-r2 b/metadata/md5-cache/sci-libs/qrupdate-1.1.2-r2
index 7488f1b4db39..6924e7f57992 100644
--- a/metadata/md5-cache/sci-libs/qrupdate-1.1.2-r2
+++ b/metadata/md5-cache/sci-libs/qrupdate-1.1.2-r2
@@ -4,10 +4,10 @@ DEPEND=virtual/lapack virtual/fortran
 DESCRIPTION=Library for updating of QR and Cholesky decompositions
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/qrupdate
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=virtual/lapack virtual/fortran
 SLOT=0
 SRC_URI=mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=64f107e39552a1878cf70d07812b8c33
+_md5_=a9ea1d17538b622f8c46ee2853f852eb
diff --git a/metadata/md5-cache/sci-libs/rocRAND-4.3.0 b/metadata/md5-cache/sci-libs/rocRAND-4.3.0
new file mode 100644
index 000000000000..0c408cd2c193
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocRAND-4.3.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-cpp/gtest ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip:0/4.3 >=dev-util/rocm-cmake-4.3.0
+DESCRIPTION=Generate pseudo-random and quasi-random numbers
+EAPI=7
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocRAND
+IUSE=benchmark test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip:0/4.3
+RESTRICT=!test? ( test )
+SLOT=0/4.3
+SRC_URI=https://github.com/ROCmSoftwarePlatform/rocRAND/archive/rocm-4.3.0.tar.gz -> rocRAND-4.3.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=4b61fcf8cbadc95f7d7eda4d4dc667ca
diff --git a/metadata/md5-cache/sci-libs/rocSPARSE-4.3.0-r1 b/metadata/md5-cache/sci-libs/rocSPARSE-4.3.0-r1
new file mode 100644
index 000000000000..cde07c79638b
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocSPARSE-4.3.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-cpp/gtest || ( ( dev-lang/python:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/pyyaml[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pyyaml[python_targets_python3_8(-)] ) ) ) benchmark? ( app-admin/chrpath ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-util/hip:0/4.3 sci-libs/rocPRIM:0/4.3
+DESCRIPTION=Basic Linear Algebra Subroutines for sparse computation
+EAPI=7
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocSPARSE
+IUSE=benchmark test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip:0/4.3 sci-libs/rocPRIM:0/4.3
+RESTRICT=!test? ( test )
+SLOT=0/4.3
+SRC_URI=https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-4.3.0.tar.gz -> rocSPARSE-4.3.0.tar.gz test? ( https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> rocSPARSE_amazon0312.tar.gz https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> rocSPARSE_Chebyshev4.tar.gz https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> rocSPARSE_sme3Dc.tar.gz https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> rocSPARSE_webbase-1M.tar.gz https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> rocSPARSE_rma10.tar.gz https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> rocSPARSE_bibd_22_8.tar.gz https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> rocSPARSE_mac_econ_fwd500.tar.gz https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> rocSPARSE_mc2depi.tar.gz https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> rocSPARSE_scircuit.tar.gz https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> rocSPARSE_ASIC_320k.tar.gz https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> rocSPARSE_bmwcra_1.tar.gz https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> rocSPARSE_nos1.tar.gz https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> rocSPARSE_nos2.tar.gz https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> rocSPARSE_nos3.tar.gz https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> rocSPARSE_nos4.tar.gz https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> rocSPARSE_nos5.tar.gz https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> rocSPARSE_nos6.tar.gz https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> rocSPARSE_nos7.tar.gz https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> rocSPARSE_shipsec1.tar.gz https://sparse.tamu.edu/MM/Cote/mplate.tar.gz -> rocSPARSE_mplate.tar.gz https://sparse.tamu.edu/MM/Bai/qc2534.tar.gz -> rocSPARSE_qc2534.tar.gz https://sparse.tamu.edu/MM/Chevron/Chevron2.tar.gz -> rocSPARSE_Chevron2.tar.gz https://sparse.tamu.edu/MM/Chevron/Chevron3.tar.gz -> rocSPARSE_Chevron3.tar.gz https://sparse.tamu.edu/MM/Chevron/Chevron4.tar.gz -> rocSPARSE_Chevron4.tar.gz )
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0577dd6ccd4926f547e3c2a290c34c9c
diff --git a/metadata/md5-cache/sci-libs/scotch-6.1.1 b/metadata/md5-cache/sci-libs/scotch-6.1.1
new file mode 100644
index 000000000000..5b2f0f26654e
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/scotch-6.1.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=sys-libs/zlib mpi? ( virtual/mpi )
+DESCRIPTION=Software for graph, mesh and hypergraph partitioning
+EAPI=7
+HOMEPAGE=https://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/ https://gitlab.inria.fr/scotch/scotch
+IUSE=doc int64 mpi static-libs test tools threads
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=CeCILL-2
+RDEPEND=sys-libs/zlib mpi? ( virtual/mpi )
+REQUIRED_USE=test? ( threads )
+RESTRICT=!test? ( test )
+SLOT=0/6
+SRC_URI=https://gitlab.inria.fr/scotch/scotch/-/archive/v6.1.1/scotch-v6.1.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6b04251905a1966dd5ba54e51a3c9ac1
diff --git a/metadata/md5-cache/sci-libs/sundials-5.8.0 b/metadata/md5-cache/sci-libs/sundials-5.8.0
index c8eef4376de7..a2ba40f69409 100644
--- a/metadata/md5-cache/sci-libs/sundials-5.8.0
+++ b/metadata/md5-cache/sci-libs/sundials-5.8.0
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.20.5 fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=lapack? ( virtual/lapack ) mpi? ( sci-libs/hypre:=[fortran?,mpi?] virtual/mpi[fortran?] ) sparse? ( sci-libs/klu ) superlumt? ( sci-libs/superlu_mt:= ) fortran? ( virtual/fortran )
+DEPEND=lapack? ( virtual/lapack ) mpi? ( sci-libs/hypre:=[fortran?,mpi?] virtual/mpi[fortran?] ) sparse? ( sci-libs/klu ) superlumt? ( sci-libs/superlu_mt:=[int64=] ) fortran? ( virtual/fortran )
 DESCRIPTION=Suite of nonlinear solvers
 EAPI=8
-HOMEPAGE=https://computation.llnl.gov/projects/sundials
-IUSE=doc examples fortran hypre lapack mpi openmp sparse +static-libs superlumt threads
+HOMEPAGE=https://computing.llnl.gov/projects/sundials
+IUSE=doc examples fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=lapack? ( virtual/lapack ) mpi? ( sci-libs/hypre:=[fortran?,mpi?] virtual/mpi[fortran?] ) sparse? ( sci-libs/klu ) superlumt? ( sci-libs/superlu_mt:= ) fortran? ( virtual/fortran )
+RDEPEND=lapack? ( virtual/lapack ) mpi? ( sci-libs/hypre:=[fortran?,mpi?] virtual/mpi[fortran?] ) sparse? ( sci-libs/klu ) superlumt? ( sci-libs/superlu_mt:=[int64=] ) fortran? ( virtual/fortran )
 REQUIRED_USE=fortran? ( static-libs ) hypre? ( mpi )
 SLOT=0/5
 SRC_URI=https://github.com/LLNL/sundials/releases/download/v5.8.0/sundials-5.8.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a6bab4bd83ede26f1a0bc7602aac6cd2
+_md5_=e52a243e3f0adf4590b3df8dc9dbe161
diff --git a/metadata/md5-cache/sci-libs/superlu-5.3.0 b/metadata/md5-cache/sci-libs/superlu-5.3.0
index fffc39ead0bd..9e5e623a339d 100644
--- a/metadata/md5-cache/sci-libs/superlu-5.3.0
+++ b/metadata/md5-cache/sci-libs/superlu-5.3.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=virtual/blas virtual/fortran
 DESCRIPTION=Sparse LU factorization library
 EAPI=8
-HOMEPAGE=https://crd-legacy.lbl.gov/~xiaoye/SuperLU/
+HOMEPAGE=https://portal.nersc.gov/project/sparse/superlu/
 IUSE=doc examples test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/xiaoyeli/superlu/archive/refs/tags/v5.3.0.tar.gz -> superlu-5.3.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=54a6efdf6c49de398feaa292cf58619a
+_md5_=a10c2a68bfde903e3028e1698dd33d25
diff --git a/metadata/md5-cache/sci-libs/superlu_mt-3.1 b/metadata/md5-cache/sci-libs/superlu_mt-3.1
index 20efd1a93abf..77a33849b044 100644
--- a/metadata/md5-cache/sci-libs/superlu_mt-3.1
+++ b/metadata/md5-cache/sci-libs/superlu_mt-3.1
@@ -1,8 +1,9 @@
+BDEPEND=virtual/pkgconfig test? ( app-shells/tcsh )
 DEFINED_PHASES=compile install prepare setup test
-DEPEND=virtual/blas virtual/pkgconfig test? ( app-shells/tcsh )
+DEPEND=virtual/blas
 DESCRIPTION=Multithreaded sparse LU factorization library
-EAPI=6
-HOMEPAGE=http://crd.lbl.gov/~xiaoye/SuperLU/
+EAPI=8
+HOMEPAGE=https://portal.nersc.gov/project/sparse/superlu/
 IUSE=doc examples int64 openmp static-libs test threads
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -10,6 +11,6 @@ RDEPEND=virtual/blas
 REQUIRED_USE=|| ( openmp threads )
 RESTRICT=!test? ( test )
 SLOT=0/3
-SRC_URI=http://crd.lbl.gov/~xiaoye/SuperLU/superlu_mt_3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=e5464f5029047a47b6d2ac102d7b5a9b
+SRC_URI=https://portal.nersc.gov/project/sparse/superlu/superlu_mt_3.1.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bf569f0e362ba10d537aea979aef6c0d
diff --git a/metadata/md5-cache/sci-libs/szip-2.1-r2 b/metadata/md5-cache/sci-libs/szip-2.1-r2
deleted file mode 100644
index 24e980576644..000000000000
--- a/metadata/md5-cache/sci-libs/szip-2.1-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Extended-Rice lossless compression algorithm implementation
-EAPI=6
-HOMEPAGE=https://www.hdfgroup.org/doc_resource/SZIP/
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=szip
-RDEPEND=!sci-libs/libaec[szip]
-SLOT=0/2
-SRC_URI=ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz
-_md5_=601b8b39d916a3e4d929c89762fc8f2e
diff --git a/metadata/md5-cache/sci-libs/szip-2.1.1 b/metadata/md5-cache/sci-libs/szip-2.1.1
index b27a1bf5b42e..8782bd6a136e 100644
--- a/metadata/md5-cache/sci-libs/szip-2.1.1
+++ b/metadata/md5-cache/sci-libs/szip-2.1.1
@@ -3,9 +3,9 @@ DESCRIPTION=Extended-Rice lossless compression algorithm implementation
 EAPI=8
 HOMEPAGE=https://www.hdfgroup.org/doc_resource/SZIP/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=szip
 RDEPEND=!sci-libs/libaec[szip]
 SLOT=0/2
 SRC_URI=https://support.hdfgroup.org/ftp/lib-external/szip/2.1.1/src/szip-2.1.1.tar.gz
-_md5_=698109cc092f823c019d9368b4dea661
+_md5_=5ad814f832d8c9cfb983cdd878379152
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.5.0-r2 b/metadata/md5-cache/sci-libs/tensorflow-2.5.0-r2
new file mode 100644
index 000000000000..de6bf3db667d
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.5.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip >=dev-libs/protobuf-3.8.0 dev-java/java-config >=dev-util/bazel-3.7.2 cuda? ( >=dev-util/nvidia-cuda-toolkit-9.1[profiler] ) !python? ( dev-lang/python ) python? ( dev-python/cython dev-python/mock >=dev-python/grpcio-tools-1.28 ) >=dev-util/bazel-0.20
+DEFINED_PHASES=compile configure install prepare pretend setup unpack
+DEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev-libs/icu:= >=dev-libs/jsoncpp-1.9.2 dev-libs/libpcre dev-libs/nsync dev-libs/openssl:0= >=dev-libs/protobuf-3.13.0:= >=dev-libs/re2-0.2019.06.01:= media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 <net-libs/grpc-1.39:= net-misc/curl sys-libs/zlib >=sys-apps/hwloc-2 cuda? ( =dev-util/nvidia-cuda-toolkit-11*[profiler] =dev-libs/cudnn-8* ) mpi? ( virtual/mpi ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/flatbuffers-1.12.0:= dev-python/absl-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astor-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/astunparse[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dill[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flatbuffers[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/gast-0.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-pasta-0.1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/opt-einsum-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/protobuf-python-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/grpcio-1.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wrapt-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=net-libs/google-cloud-cpp-0.10.0 >=sci-libs/keras-applications-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/keras-preprocessing-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-visualization/tensorboard-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python? ( dev-python/mock dev-python/setuptools )
+DESCRIPTION=Computation framework using data flow graphs for scalable machine learning
+EAPI=7
+HOMEPAGE=https://www.tensorflow.org/
+IUSE=cuda mpi +python xla cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+PDEPEND=python? ( >=sci-libs/tensorflow-estimator-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev-libs/icu:= >=dev-libs/jsoncpp-1.9.2 dev-libs/libpcre dev-libs/nsync dev-libs/openssl:0= >=dev-libs/protobuf-3.13.0:= >=dev-libs/re2-0.2019.06.01:= media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 <net-libs/grpc-1.39:= net-misc/curl sys-libs/zlib >=sys-apps/hwloc-2 cuda? ( =dev-util/nvidia-cuda-toolkit-11*[profiler] =dev-libs/cudnn-8* ) mpi? ( virtual/mpi ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/flatbuffers-1.12.0:= dev-python/absl-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/astor-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/astunparse[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dill[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flatbuffers[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/gast-0.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/google-pasta-0.1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/opt-einsum-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/protobuf-python-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/grpcio-1.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/wrapt-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=net-libs/google-cloud-cpp-0.10.0 >=sci-libs/keras-applications-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-libs/keras-preprocessing-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sci-visualization/tensorboard-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=0
+SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.5.0.tar.gz -> tensorflow-2.5.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.5.0-r2.tar.bz2 https://github.com/abseil/abseil-cpp/archive/6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz -> abseil-cpp-6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz https://github.com/google/ruy/archive/54774a7a2cf85963777289193629d4bd42de4a59.zip -> ruy-54774a7a2cf85963777289193629d4bd42de4a59.zip https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz -> llvm-1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz -> llvmorg-10.0.1-openmp-10.0.1.src.tar.xz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/oneapi-src/oneDNN/archive/v2.2.tar.gz -> oneDNN-v2.2.tar.gz https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.zip -> pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz https://github.com/tensorflow/toolchains/archive/v1.1.10.tar.gz -> tensorflow-toolchains-v1.1.10.tar.gz https://gitlab.com/libeigen/eigen/-/archive/f612df273689a19d25b45ca4f8269463207c4fee/eigen-f612df273689a19d25b45ca4f8269463207c4fee.tar.gz cuda? ( https://github.com/NVIDIA/cudnn-frontend/archive/360d6e7164dfb7c802493fd1c0464f0d815b852a.zip -> cudnn-frontend-360d6e7164dfb7c802493fd1c0464f0d815b852a.zip https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip https://github.com/nvidia/nccl/archive/v2.8.3-1.tar.gz -> nvidia-nccl-v2.8.3-1.tar.gz ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
+_eclasses_=bazel	59a065fda63cffd0092d61c79599e1c2	check-reqs	bfb51de63b0462097e40436214dd43c8	cuda	8d9c9803e990e31a336935435383ac43	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=60ee305d0c61fb64ebfc5742b5f46ef5
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 6cd8705e961e..ac1ddad575db 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/gimps-30.6.4 b/metadata/md5-cache/sci-mathematics/gimps-30.6.4
deleted file mode 100644
index 3bdefabb964a..000000000000
--- a/metadata/md5-cache/sci-mathematics/gimps-30.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=The Great Internet Mersenne Prime Search
-EAPI=7
-HOMEPAGE=https://www.mersenne.org/
-KEYWORDS=-* ~amd64
-LICENSE=GIMPS
-RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2 virtual/tmpfiles
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v306b4.linux64.tar.gz -> gimps-30.6.4.linux64.tar.gz )
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fa502a8d23a582fbd32a485a2943a1f0
diff --git a/metadata/md5-cache/sci-mathematics/gimps-30.7.5 b/metadata/md5-cache/sci-mathematics/gimps-30.7.5
new file mode 100644
index 000000000000..c0d632a9c80c
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/gimps-30.7.5
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=The Great Internet Mersenne Prime Search
+EAPI=7
+HOMEPAGE=https://www.mersenne.org/
+KEYWORDS=-* ~amd64
+LICENSE=GIMPS
+RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2 virtual/tmpfiles
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v307b5.linux64.tar.gz -> gimps-30.7.5.linux64.tar.gz )
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=fa502a8d23a582fbd32a485a2943a1f0
diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r2 b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r2
deleted file mode 100644
index e6ebaaadbae7..000000000000
--- a/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure pretend
-DEPEND=dev-libs/gmp:=
-DESCRIPTION=Elliptic Curve Method for Integer Factorization
-EAPI=7
-HOMEPAGE=http://ecm.gforge.inria.fr/
-IUSE=+custom-tune openmp static-libs cpu_flags_x86_sse2
-KEYWORDS=amd64 ~arm ~arm64 x86 ~ppc-macos ~x64-macos
-LICENSE=GPL-3 LGPL-3
-RDEPEND=dev-libs/gmp:=
-SLOT=0
-SRC_URI=https://gforge.inria.fr/frs/download.php/file/36224/gmp-ecm-7.0.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b97fe6bb8f1e9bde5035c336fc9732b5
diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r4 b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r4
index 5ce97972eee4..f866470b08cc 100644
--- a/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r4
+++ b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4-r4
@@ -5,10 +5,10 @@ DESCRIPTION=Elliptic Curve Method for Integer Factorization
 EAPI=7
 HOMEPAGE=https://gitlab.inria.fr/zimmerma/ecm
 IUSE=+custom-tune openmp static-libs cpu_flags_x86_sse2
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/gmp:=
 SLOT=0
 SRC_URI=https://gitlab.inria.fr/zimmerma/ecm/uploads/9cd422ec80268f8a885e499e17f98056/ecm-7.0.4.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7bfc822324b4bea605f4df9884eb751d
+_md5_=e3c6026de1681532a379e729df126256
diff --git a/metadata/md5-cache/sci-mathematics/octave-6.3.0 b/metadata/md5-cache/sci-mathematics/octave-6.3.0
index aa9e8bf875ef..b5be473fcf52 100644
--- a/metadata/md5-cache/sci-mathematics/octave-6.3.0
+++ b/metadata/md5-cache/sci-mathematics/octave-6.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=High-level interactive language for numerical computations
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/octave/
 IUSE=curl doc fftw +glpk gnuplot gui hdf5 java opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X zlib elibc_FreeBSD java
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl sys-apps/texinfo dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) ssl? ( dev-libs/openssl:0= ) sundials? ( >=sci-libs/sundials-4:0= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/6.3.0
 SRC_URI=mirror://gnu/octave/octave-6.3.0.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=ba1f15c944b48b85ef696a11194de38d
+_md5_=9b31c9771a740218301e71a6d3efe041
diff --git a/metadata/md5-cache/sci-mathematics/petsc-3.15.0 b/metadata/md5-cache/sci-mathematics/petsc-3.15.0
index 0220c7f1ce7f..4878195adc6d 100644
--- a/metadata/md5-cache/sci-mathematics/petsc-3.15.0
+++ b/metadata/md5-cache/sci-mathematics/petsc-3.15.0
@@ -1,6 +1,6 @@
 BDEPEND=virtual/fortran
 DEFINED_PHASES=configure install setup
-DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[cxx?,fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[mpi?] ) sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) || ( dev-lang/python:3.8 ) virtual/pkgconfig dev-util/cmake sys-apps/which virtual/fortran
+DEPEND=virtual/blas virtual/lapack afterimage? ( media-libs/libafterimage ) boost? ( dev-libs/boost ) fftw? ( sci-libs/fftw:3.0[mpi?] ) hdf5? ( sci-libs/hdf5[mpi?] ) hypre? ( >=sci-libs/hypre-2.18.0[mpi?] ) metis? ( >=sci-libs/parmetis-4 ) mpi? ( virtual/mpi[cxx?,fortran?] ) mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) scotch? ( sci-libs/scotch[mpi?] ) sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) superlu? ( >=sci-libs/superlu-5 ) X? ( x11-libs/libX11 ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig dev-util/cmake sys-apps/which virtual/fortran
 DESCRIPTION=Portable, Extensible Toolkit for Scientific Computation
 EAPI=7
 HOMEPAGE=https://www.mcs.anl.gov/petsc/
@@ -12,4 +12,4 @@ REQUIRED_USE=afterimage? ( X ) complex-scalars? ( !hypre !superlu ) hdf5? ( mpi
 SLOT=0
 SRC_URI=http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.15.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9986667c37d7e3633870170fe0d735d4
+_md5_=fee04ae81895ef7dc5d47104ea8c8a87
diff --git a/metadata/md5-cache/sci-mathematics/slepc-3.15.0 b/metadata/md5-cache/sci-mathematics/slepc-3.15.0
index ba593e89398c..e970faed37b1 100644
--- a/metadata/md5-cache/sci-mathematics/slepc-3.15.0
+++ b/metadata/md5-cache/sci-mathematics/slepc-3.15.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install setup
-DEPEND==sci-mathematics/petsc-3.15*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi=] mpi? ( virtual/mpi ) || ( dev-lang/python:3.8 ) virtual/pkgconfig dev-util/cmake
+DEPEND==sci-mathematics/petsc-3.15*:=[mpi=,complex-scalars=] sci-libs/arpack[mpi=] mpi? ( virtual/mpi ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig dev-util/cmake
 DESCRIPTION=Scalable Library for Eigenvalue Problem Computations
 EAPI=7
 HOMEPAGE=https://slepc.upv.es/
@@ -10,4 +10,4 @@ RDEPEND==sci-mathematics/petsc-3.15*:=[mpi=,complex-scalars=] sci-libs/arpack[mp
 SLOT=0
 SRC_URI=https://slepc.upv.es/download/distrib/slepc-3.15.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9c9ad2a8464dd031479a2a5ad4e2d536
+_md5_=d842584f9dc73050aa04c8a1d5d551c3
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.11b b/metadata/md5-cache/sci-mathematics/z3-4.8.11b
index 3fe0d8bff47a..fe40275eacf4 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.11b
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.11b
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=An efficient theorem prover
 EAPI=7
 HOMEPAGE=https://github.com/Z3Prover/z3/
-IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 elibc_FreeBSD java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0/4.8
 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.11b.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=af345887507eecf3733afdad75da8b31
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d87c334e1356acf618da448872a0929c
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 2e3684db9172..4f943a46143b 100644
--- a/metadata/md5-cache/sci-misc/Manifest.gz
+++ b/metadata/md5-cache/sci-misc/Manifest.gz
diff --git a/metadata/md5-cache/sci-misc/boinc-7.16.17 b/metadata/md5-cache/sci-misc/boinc-7.16.17
index cb4161a858dd..983a432a6bd7 100644
--- a/metadata/md5-cache/sci-misc/boinc-7.16.17
+++ b/metadata/md5-cache/sci-misc/boinc-7.16.17
@@ -11,5 +11,5 @@ RDEPEND=acct-group/boinc acct-user/boinc >=app-misc/ca-certificates-20080809 cud
 REQUIRED_USE=^^ ( curl_ssl_gnutls curl_ssl_openssl )
 SLOT=0
 SRC_URI=X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> boinc.tif ) https://github.com/BOINC/boinc/archive/client_release/7.16/7.16.17.tar.gz -> boinc-7.16.17.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=773d97cec7832b085e518fbcdd9c873a
diff --git a/metadata/md5-cache/sci-misc/boinc-9999 b/metadata/md5-cache/sci-misc/boinc-9999
index 3829bfd33ccf..517972613465 100644
--- a/metadata/md5-cache/sci-misc/boinc-9999
+++ b/metadata/md5-cache/sci-misc/boinc-9999
@@ -11,5 +11,5 @@ RDEPEND=acct-group/boinc acct-user/boinc >=app-misc/ca-certificates-20080809 cud
 REQUIRED_USE=^^ ( curl_ssl_gnutls curl_ssl_openssl )
 SLOT=0
 SRC_URI=X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> boinc.tif )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=917fad3bc673c756e26e98632f62cbbb
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index ccbe362bd2f7..5a6bf65863b0 100644
--- a/metadata/md5-cache/sci-physics/Manifest.gz
+++ b/metadata/md5-cache/sci-physics/Manifest.gz
diff --git a/metadata/md5-cache/sci-physics/root-6.22.08-r2 b/metadata/md5-cache/sci-physics/root-6.22.08-r2
index 340a4750000d..f20e9970bad1 100644
--- a/metadata/md5-cache/sci-physics/root-6.22.08-r2
+++ b/metadata/md5-cache/sci-physics/root-6.22.08-r2
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5 fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig fortran? ( virtual/fortran )
+DEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi[fortran?] ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig fortran? ( virtual/fortran )
 DESCRIPTION=C++ data analysis framework and interpreter from CERN
 EAPI=7
 HOMEPAGE=https://root.cern
 IUSE=+X aqua +asimage c++11 c++14 +c++17 cuda cudnn +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran vc vmc +xml xrootd python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
-RDEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
+RDEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi[fortran?] ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
 REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !opengl !qt5 ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
 RESTRICT=!test? ( test )
 SLOT=6.22/08
 SRC_URI=https://root.cern/download/root_v6.22.08.source.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=52cba8241251c04b47452876828fe9fa
+_md5_=49c8b2cd643e03996196106670c3f2b6
diff --git a/metadata/md5-cache/sci-physics/root-6.24.06 b/metadata/md5-cache/sci-physics/root-6.24.06
index ae2b6dd09df6..2924c920a988 100644
--- a/metadata/md5-cache/sci-physics/root-6.24.06
+++ b/metadata/md5-cache/sci-physics/root-6.24.06
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5 fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-cpp/nlohmann_json dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) uring? ( sys-libs/liburing ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig fortran? ( virtual/fortran )
+DEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-cpp/nlohmann_json dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi[fortran?] ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) uring? ( sys-libs/liburing ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig fortran? ( virtual/fortran )
 DESCRIPTION=C++ data analysis framework and interpreter from CERN
 EAPI=7
 HOMEPAGE=https://root.cern
 IUSE=+X aqua +asimage c++11 c++14 +c++17 cuda cudnn +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring vc vmc +xml xrootd python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
-RDEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-cpp/nlohmann_json dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) uring? ( sys-libs/liburing ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
+RDEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-cpp/nlohmann_json dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi[fortran?] ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) uring? ( sys-libs/liburing ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
 REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !opengl !qt5 ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl ) uring? ( root7 )
 RESTRICT=!test? ( test )
 SLOT=6.24/06
 SRC_URI=https://root.cern/download/root_v6.24.06.source.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c2f71e14d408db375be84886234230f7
+_md5_=6e0bd341dcb315896782aed2cf106721
diff --git a/metadata/md5-cache/sci-physics/root-6.24.9999 b/metadata/md5-cache/sci-physics/root-6.24.9999
index 4157c11579ad..eafce5b85f3a 100644
--- a/metadata/md5-cache/sci-physics/root-6.24.9999
+++ b/metadata/md5-cache/sci-physics/root-6.24.9999
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5 fortran? ( virtual/fortran ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-cpp/nlohmann_json dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) uring? ( sys-libs/liburing ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig fortran? ( virtual/fortran )
+DEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-cpp/nlohmann_json dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi[fortran?] ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) uring? ( sys-libs/liburing ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig fortran? ( virtual/fortran )
 DESCRIPTION=C++ data analysis framework and interpreter from CERN
 EAPI=7
 HOMEPAGE=https://root.cern
 IUSE=+X aqua +asimage c++11 c++14 +c++17 cuda cudnn +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring vc vmc +xml xrootd python_single_target_python3_8 python_single_target_python3_9
 LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
 PROPERTIES=live
-RDEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-cpp/nlohmann_json dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) uring? ( sys-libs/liburing ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
+RDEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-cpp/nlohmann_json dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi[fortran?] ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) uring? ( sys-libs/liburing ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
 REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !opengl !qt5 ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl ) uring? ( root7 )
 RESTRICT=!test? ( test )
 SLOT=6.24/9999
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0eb5a6a12ef343242a6f62382c6ad630
+_md5_=ed8e0a8e5d2ffe36cf761028a482c3d3
diff --git a/metadata/md5-cache/sci-physics/root-9999 b/metadata/md5-cache/sci-physics/root-9999
index c8e4d01510da..d9ea1acec874 100644
--- a/metadata/md5-cache/sci-physics/root-9999
+++ b/metadata/md5-cache/sci-physics/root-9999
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/make >=dev-util/cmake-3.20.5 fortran? ( virtual/fortran ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-cpp/nlohmann_json dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) uring? ( sys-libs/liburing ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig fortran? ( virtual/fortran )
+DEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-cpp/nlohmann_json dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi[fortran?] ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) uring? ( sys-libs/liburing ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig fortran? ( virtual/fortran )
 DESCRIPTION=C++ data analysis framework and interpreter from CERN
 EAPI=7
 HOMEPAGE=https://root.cern
 IUSE=+X aqua +asimage c++11 c++14 +c++17 cuda cudnn +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit mpi mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit +root7 shadow sqlite +ssl +tbb test +tmva +unuran uring vc vmc +xml xrootd python_single_target_python3_8 python_single_target_python3_9
 LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
 PROPERTIES=live
-RDEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-cpp/nlohmann_json dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) uring? ( sys-libs/liburing ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
+RDEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-cpp/nlohmann_json dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= virtual/libcrypt:= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) cudnn? ( dev-libs/cudnn ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mpi? ( virtual/mpi[fortran?] ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) R? ( dev-lang/R ) shadow? ( sys-apps/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) uring? ( sys-libs/liburing ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
 REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !opengl !qt5 ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl ) uring? ( root7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cuda	8d9c9803e990e31a336935435383ac43	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	cf4fd1b0835b9f3e638724840468064a	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0eb5a6a12ef343242a6f62382c6ad630
+_md5_=ed8e0a8e5d2ffe36cf761028a482c3d3
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 1dfdfc5dfedd..68684ddb95b8 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.4.2 b/metadata/md5-cache/sci-visualization/gnuplot-5.4.2
deleted file mode 100644
index d3daf98a83e6..000000000000
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-langgreek dev-texlive/texlive-mathscience app-text/ghostscript-gpl ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3 ) X? ( x11-libs/libXaw )
-DESCRIPTION=Command-line driven interactive plotting program
-EAPI=8
-HOMEPAGE=http://www.gnuplot.info/
-IDEPEND=latex? ( virtual/latex-base )
-IUSE=aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=gnuplot
-RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3 ) X? ( x11-libs/libXaw )
-REQUIRED_USE=doc? ( gd ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.4.2.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
-_md5_=0c67ab7dae725d566b98eb2e1fa4fd57
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.4.2-r1 b/metadata/md5-cache/sci-visualization/gnuplot-5.4.2-r1
new file mode 100644
index 000000000000..85d3ab139d12
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.4.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-langgreek dev-texlive/texlive-mathscience app-text/ghostscript-gpl ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3 ) X? ( x11-libs/libXaw )
+DESCRIPTION=Command-line driven interactive plotting program
+EAPI=8
+HOMEPAGE=http://www.gnuplot.info/
+IDEPEND=latex? ( virtual/latex-base )
+IUSE=aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=gnuplot
+RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3 ) X? ( x11-libs/libXaw )
+REQUIRED_USE=doc? ( gd ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.4.2.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa
+_md5_=d8aaed645bf30ee69f90ee6b02095c07
diff --git a/metadata/md5-cache/sci-visualization/quickplot-1.0.1_rc b/metadata/md5-cache/sci-visualization/quickplot-1.0.1_rc
index 88cfb7fe33e3..1eeb8c143de6 100644
--- a/metadata/md5-cache/sci-visualization/quickplot-1.0.1_rc
+++ b/metadata/md5-cache/sci-visualization/quickplot-1.0.1_rc
@@ -1,4 +1,4 @@
-BDEPEND=media-gfx/imagemagick[png] virtual/pkgconfig www-client/lynx dev-vcs/git sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/imagemagick-tools[png] virtual/pkgconfig www-client/lynx dev-vcs/git sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=media-libs/libsndfile:= >=sys-libs/readline-0.6.2:0= x11-libs/gtk+:3
 DESCRIPTION=A fast interactive 2D plotter
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libsndfile:= >=sys-libs/readline-0.6.2:0= x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/lanceman2/quickplot/archive/quickplot-1.0.1rc.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9add2029b3fc64ea3743c3f2366e748d
+_md5_=f76336095060b730f60b07aa12b6ae2b
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 8ea677b99d44..63ab1e12ad3a 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/ack-3.5.0 b/metadata/md5-cache/sys-apps/ack-3.5.0
index f95ba046b434..8a5f261c6040 100644
--- a/metadata/md5-cache/sys-apps/ack-3.5.0
+++ b/metadata/md5-cache/sys-apps/ack-3.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=ack is a tool like grep, optimized for programmers
 EAPI=7
 HOMEPAGE=https://beyondgrep.com
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/File-Next-1.180.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/ack-v3.5.0.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=50da7ebdabd76fa31e948bbd91073046
+_md5_=51eb23041cadc94d788fb31c83aa62fe
diff --git a/metadata/md5-cache/sys-apps/bat-0.18.3 b/metadata/md5-cache/sys-apps/bat-0.18.3
index c0b9dfc78d89..eea5dca670af 100644
--- a/metadata/md5-cache/sys-apps/bat-0.18.3
+++ b/metadata/md5-cache/sys-apps/bat-0.18.3
@@ -5,10 +5,10 @@ DESCRIPTION=cat(1) clone with syntax highlighting and Git integration
 EAPI=8
 HOMEPAGE=https://github.com/sharkdp/bat
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB
 RDEPEND=>=dev-libs/libgit2-1.1.0:=[threads] dev-libs/oniguruma:= !>app-backup/bacula-9.2[qt5]
 SLOT=0
 SRC_URI=https://github.com/sharkdp/bat/archive/v0.18.3.tar.gz -> bat-0.18.3.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_colours/1.0.4/download -> ansi_colours-1.0.4.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/assert_cmd/1.0.5/download -> assert_cmd-1.0.5.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.16/download -> bstr-0.2.16.crate https://crates.io/api/v1/crates/bugreport/0.4.1/download -> bugreport-0.4.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/clircle/0.3.0/download -> clircle-0.3.0.crate https://crates.io/api/v1/crates/console/0.14.1/download -> console-0.14.1.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/error-chain/0.12.4/download -> error-chain-0.12.4.crate https://crates.io/api/v1/crates/fancy-regex/0.3.5/download -> fancy-regex-0.3.5.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/git-version/0.3.4/download -> git-version-0.3.4.crate https://crates.io/api/v1/crates/git-version-macro/0.3.4/download -> git-version-macro-0.3.4.crate https://crates.io/api/v1/crates/git2/0.13.20/download -> git2-0.13.20.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.8/download -> globset-0.4.8.crate https://crates.io/api/v1/crates/grep-cli/0.1.6/download -> grep-cli-0.1.6.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indexmap/1.6.2/download -> indexmap-1.6.2.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.22/download -> jobserver-0.1.22.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.95/download -> libc-0.2.95.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.21+1.1.0/download -> libgit2-sys-0.12.21+1.1.0.crate https://crates.io/api/v1/crates/libz-sys/1.1.3/download -> libz-sys-1.1.3.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/lock_api/0.4.4/download -> lock_api-0.4.4.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/memoffset/0.6.4/download -> memoffset-0.6.4.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/nix/0.21.0/download -> nix-0.21.0.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/onig/6.1.1/download -> onig-6.1.1.crate https://crates.io/api/v1/crates/onig_sys/69.6.0/download -> onig_sys-69.6.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download -> parking_lot_core-0.8.3.crate https://crates.io/api/v1/crates/path_abs/0.5.1/download -> path_abs-0.5.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plist/1.1.0/download -> plist-1.1.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/predicates/1.0.8/download -> predicates-1.0.8.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.2/download -> predicates-tree-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.26/download -> proc-macro2-1.0.26.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.8/download -> redox_syscall-0.2.8.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver-parser/0.10.2/download -> semver-parser-0.10.2.crate https://crates.io/api/v1/crates/serde/1.0.126/download -> serde-1.0.126.crate https://crates.io/api/v1/crates/serde_derive/1.0.126/download -> serde_derive-1.0.126.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/serde_yaml/0.8.17/download -> serde_yaml-0.8.17.crate https://crates.io/api/v1/crates/serial_test/0.5.1/download -> serial_test-0.5.1.crate https://crates.io/api/v1/crates/serial_test_derive/0.5.1/download -> serial_test_derive-0.5.1.crate https://crates.io/api/v1/crates/shell-escape/0.1.5/download -> shell-escape-0.1.5.crate https://crates.io/api/v1/crates/shell-words/1.0.0/download -> shell-words-1.0.0.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/std_prelude/0.2.12/download -> std_prelude-0.2.12.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.72/download -> syn-1.0.72.crate https://crates.io/api/v1/crates/syntect/4.5.0/download -> syntect-4.5.0.crate https://crates.io/api/v1/crates/sys-info/0.9.0/download -> sys-info-0.9.0.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/terminal_size/0.1.16/download -> terminal_size-0.1.16.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/tinyvec/1.2.0/download -> tinyvec-1.2.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.12/download -> vcpkg-0.2.12.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wild/2.0.4/download -> wild-2.0.4.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
 _eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e71abcc29a430e9e0a035459bb32e1d1
+_md5_=2cee3cb82c0f0fc910cc94b3da8a4cb6
diff --git a/metadata/md5-cache/sys-apps/bolt-0.9.1 b/metadata/md5-cache/sys-apps/bolt-0.9.1
index 7a845c953474..df029cd89e29 100644
--- a/metadata/md5-cache/sys-apps/bolt-0.9.1
+++ b/metadata/md5-cache/sys-apps/bolt-0.9.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.56.0:2 dev-util/glib-utils virtual/libudev virtual/udev dev-util/umockdev sys-auth/polkit[introspection] systemd? ( sys-apps/systemd ) doc? ( app-text/asciidoc )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.9.1/bolt-0.9.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bdad39470988b8df04d02bbd61915dde
diff --git a/metadata/md5-cache/sys-apps/bubblewrap-0.4.1 b/metadata/md5-cache/sys-apps/bubblewrap-0.4.1
index 1dfe3fd129f0..5c92d7f42eed 100644
--- a/metadata/md5-cache/sys-apps/bubblewrap-0.4.1
+++ b/metadata/md5-cache/sys-apps/bubblewrap-0.4.1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/bubblewrap/releases/download/v0.4.1/bubblewrap-0.4.1.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=70626adb8292465490c7885a74a37d38
diff --git a/metadata/md5-cache/sys-apps/bubblewrap-0.5.0 b/metadata/md5-cache/sys-apps/bubblewrap-0.5.0
index 8f8272550733..2c86d1c131e4 100644
--- a/metadata/md5-cache/sys-apps/bubblewrap-0.5.0
+++ b/metadata/md5-cache/sys-apps/bubblewrap-0.5.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/bubblewrap/releases/download/v0.5.0/bubblewrap-0.5.0.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=139cdf97392a53164e56b86f2760b599
diff --git a/metadata/md5-cache/sys-apps/busybox-1.33.1-r2 b/metadata/md5-cache/sys-apps/busybox-1.33.1-r2
index 74e58cbff9c4..06a2525d2847 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.33.1-r2
+++ b/metadata/md5-cache/sys-apps/busybox-1.33.1-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Utilities for rescue and embedded systems
 EAPI=7
 HOMEPAGE=https://www.busybox.net/
 IUSE=debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd savedconfig
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virtual/libcrypt:= mdev? ( !<sys-apps/openrc-0.13 )
 REQUIRED_USE=pam? ( !static )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.busybox.net/downloads/busybox-1.33.1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ef70ef84e618056490b7a1dfbaf0fbfa
+_md5_=269cf15442a31f23c6184cfc2bd5bef6
diff --git a/metadata/md5-cache/sys-apps/cpint-2.5.3 b/metadata/md5-cache/sys-apps/cpint-2.5.3
index 9edc5716b383..d8d00871e030 100644
--- a/metadata/md5-cache/sys-apps/cpint-2.5.3
+++ b/metadata/md5-cache/sys-apps/cpint-2.5.3
@@ -7,5 +7,5 @@ KEYWORDS=~s390
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://linuxvm.org/Patches/s390/cpint253.tgz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3a3876009aabb4ae1846f3c7ee91eef2
diff --git a/metadata/md5-cache/sys-apps/dbus-1.12.20-r3 b/metadata/md5-cache/sys-apps/dbus-1.12.20-r3
index 90d455decc03..cffb89f6adbe 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.12.20-r3
+++ b/metadata/md5-cache/sys-apps/dbus-1.12.20-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.12.20.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=59853e60f1af4095a3f20a0e66c8206d
diff --git a/metadata/md5-cache/sys-apps/debianutils-5.5 b/metadata/md5-cache/sys-apps/debianutils-5.5
new file mode 100644
index 000000000000..54792a50dbc1
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/debianutils-5.5
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=A selection of tools from Debian
+EAPI=7
+HOMEPAGE=https://packages.qa.debian.org/d/debianutils.html
+IUSE=+installkernel static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=BSD GPL-2 SMAIL
+PDEPEND=installkernel? ( || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_5.5.orig.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2274c813c7ed04a30ff9d0479542629f
diff --git a/metadata/md5-cache/sys-apps/edid-decode-0_pre20211012 b/metadata/md5-cache/sys-apps/edid-decode-0_pre20211012
new file mode 100644
index 000000000000..c47fa5d244cc
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/edid-decode-0_pre20211012
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Decode EDID data in a human-readable format
+EAPI=8
+HOMEPAGE=https://git.linuxtv.org/edid-decode.git/
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~conikost/files/edid-decode-0_pre20211012.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7f52643d0ad051e17c249440a40ef64b
diff --git a/metadata/md5-cache/sys-apps/epoch-1.2.1 b/metadata/md5-cache/sys-apps/epoch-1.2.1
index 7b1532ac67b1..6b2585409211 100644
--- a/metadata/md5-cache/sys-apps/epoch-1.2.1
+++ b/metadata/md5-cache/sys-apps/epoch-1.2.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/Subsentient/epoch/archive/1.2.1.tar.gz -> epoch-1.2.1.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fd66e1c2ac3919723646e3a1a645a401
diff --git a/metadata/md5-cache/sys-apps/epoch-1.2.2 b/metadata/md5-cache/sys-apps/epoch-1.2.2
index 16c5226f3c93..f290d68f05eb 100644
--- a/metadata/md5-cache/sys-apps/epoch-1.2.2
+++ b/metadata/md5-cache/sys-apps/epoch-1.2.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://universe2.us/epoch_1.2.2.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=bcea35598373cb8c690a99d309f89646
diff --git a/metadata/md5-cache/sys-apps/epoch-1.3.0 b/metadata/md5-cache/sys-apps/epoch-1.3.0
index 4750caeb6bb9..1d4b8b6c471b 100644
--- a/metadata/md5-cache/sys-apps/epoch-1.3.0
+++ b/metadata/md5-cache/sys-apps/epoch-1.3.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://universe2.us/epoch_1.3.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=769df7b7a39b12e477afe32dc624fadd
diff --git a/metadata/md5-cache/sys-apps/epoch-9999 b/metadata/md5-cache/sys-apps/epoch-9999
index 87726ff44417..2905f4c6b613 100644
--- a/metadata/md5-cache/sys-apps/epoch-9999
+++ b/metadata/md5-cache/sys-apps/epoch-9999
@@ -7,5 +7,5 @@ IUSE=kernel_linux
 LICENSE=public-domain
 PROPERTIES=live
 SLOT=0
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9de17d62ef7e7a3bdb9bc18036b3c1b4
diff --git a/metadata/md5-cache/sys-apps/file-5.41 b/metadata/md5-cache/sys-apps/file-5.41
new file mode 100644
index 000000000000..9bc5648b80c5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/file-5.41
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=identify a file's format by scanning binary data for patterns
+EAPI=7
+HOMEPAGE=https://www.darwinsys.com/file/
+IUSE=bzip2 lzma python seccomp static-libs zlib python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+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
+LICENSE=BSD-2
+RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( sys-libs/libseccomp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+SLOT=0
+SRC_URI=ftp://ftp.astron.com/pub/file/file-5.41.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=df57bd59978941f26d1193103df3fa3f
diff --git a/metadata/md5-cache/sys-apps/firejail-0.9.64.4 b/metadata/md5-cache/sys-apps/firejail-0.9.64.4
index f9c757bba822..77df1a433895 100644
--- a/metadata/md5-cache/sys-apps/firejail-0.9.64.4
+++ b/metadata/md5-cache/sys-apps/firejail-0.9.64.4
@@ -11,5 +11,5 @@ REQUIRED_USE=contrib? ( ^^ ( python_single_target_python3_8 python_single_target
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netblue30/firejail/releases/download/0.9.64.4/firejail-0.9.64.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cc669f2c61577aa5f48977a9510f949f
diff --git a/metadata/md5-cache/sys-apps/firejail-0.9.66 b/metadata/md5-cache/sys-apps/firejail-0.9.66
index a44f3922487e..6011f92707e2 100644
--- a/metadata/md5-cache/sys-apps/firejail-0.9.66
+++ b/metadata/md5-cache/sys-apps/firejail-0.9.66
@@ -11,5 +11,5 @@ REQUIRED_USE=contrib? ( ^^ ( python_single_target_python3_8 python_single_target
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netblue30/firejail/releases/download/0.9.66/firejail-0.9.66.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=660d63410bdde3b5d2f07a93969aa824
diff --git a/metadata/md5-cache/sys-apps/firejail-9999 b/metadata/md5-cache/sys-apps/firejail-9999
index 7e9471d08d66..529aaa4efe3f 100644
--- a/metadata/md5-cache/sys-apps/firejail-9999
+++ b/metadata/md5-cache/sys-apps/firejail-9999
@@ -11,5 +11,5 @@ RDEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) contrib? ( pyt
 REQUIRED_USE=contrib? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=660d63410bdde3b5d2f07a93969aa824
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.10.0 b/metadata/md5-cache/sys-apps/flatpak-1.10.0
deleted file mode 100644
index 41a59611cc43..000000000000
--- a/metadata/md5-cache/sys-apps/flatpak-1.10.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/automake-1.13.4 >=sys-devel/gettext-0.18.2 virtual/pkgconfig dev-util/gdbus-codegen sys-devel/bison introspection? ( >=dev-libs/gobject-introspection-1.40 ) doc? ( >=dev-util/gtk-doc-1.20 dev-libs/libxslt ) || ( ( dev-lang/python:3.9 dev-python/pyparsing[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pyparsing[python_targets_python3_8(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare setup
-DEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy x11-apps/xauth x11-libs/gdk-pixbuf:2= x11-libs/libXau:= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Linux application sandboxing and distribution framework
-EAPI=7
-HOMEPAGE=https://flatpak.org/
-IUSE=doc gtk kde introspection policykit seccomp systemd kernel_linux
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+
-PDEPEND=gtk? ( sys-apps/xdg-desktop-portal-gtk ) kde? ( kde-plasma/xdg-desktop-portal-kde )
-RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy x11-apps/xauth x11-libs/gdk-pixbuf:2= x11-libs/libXau:= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.10.0/flatpak-1.10.0.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7ff7513ee97aa7afcc64860dda74c91c
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.10.2 b/metadata/md5-cache/sys-apps/flatpak-1.10.2
deleted file mode 100644
index 00ca851a3a63..000000000000
--- a/metadata/md5-cache/sys-apps/flatpak-1.10.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/automake-1.13.4 >=sys-devel/gettext-0.18.2 virtual/pkgconfig dev-util/gdbus-codegen sys-devel/bison introspection? ( >=dev-libs/gobject-introspection-1.40 ) doc? ( >=dev-util/gtk-doc-1.20 dev-libs/libxslt ) || ( ( dev-lang/python:3.9 dev-python/pyparsing[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pyparsing[python_targets_python3_8(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare setup
-DEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy x11-apps/xauth x11-libs/gdk-pixbuf:2= x11-libs/libXau:= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Linux application sandboxing and distribution framework
-EAPI=7
-HOMEPAGE=https://flatpak.org/
-IUSE=doc gtk kde introspection policykit seccomp systemd kernel_linux
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+
-PDEPEND=gtk? ( sys-apps/xdg-desktop-portal-gtk ) kde? ( kde-plasma/xdg-desktop-portal-kde )
-RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy x11-apps/xauth x11-libs/gdk-pixbuf:2= x11-libs/libXau:= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.10.2/flatpak-1.10.2.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7ff7513ee97aa7afcc64860dda74c91c
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.10.3 b/metadata/md5-cache/sys-apps/flatpak-1.10.3
deleted file mode 100644
index ae4fa2ed85dc..000000000000
--- a/metadata/md5-cache/sys-apps/flatpak-1.10.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/automake-1.13.4 >=sys-devel/gettext-0.18.2 virtual/pkgconfig dev-util/gdbus-codegen sys-devel/bison introspection? ( >=dev-libs/gobject-introspection-1.40 ) doc? ( >=dev-util/gtk-doc-1.20 dev-libs/libxslt ) || ( ( dev-lang/python:3.9 dev-python/pyparsing[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pyparsing[python_targets_python3_8(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare setup
-DEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy x11-apps/xauth x11-libs/gdk-pixbuf:2= x11-libs/libXau:= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Linux application sandboxing and distribution framework
-EAPI=7
-HOMEPAGE=https://flatpak.org/
-IUSE=doc gtk kde introspection policykit seccomp systemd kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-PDEPEND=gtk? ( sys-apps/xdg-desktop-portal-gtk ) kde? ( kde-plasma/xdg-desktop-portal-kde )
-RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy x11-apps/xauth x11-libs/gdk-pixbuf:2= x11-libs/libXau:= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.10.3/flatpak-1.10.3.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=511bd2c66c74f87e79822e0e50ec3812
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.10.5 b/metadata/md5-cache/sys-apps/flatpak-1.10.5
new file mode 100644
index 000000000000..4ce97b9ff312
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/flatpak-1.10.5
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/automake-1.13.4 >=sys-devel/gettext-0.18.2 virtual/pkgconfig dev-util/gdbus-codegen sys-devel/bison introspection? ( >=dev-libs/gobject-introspection-1.40 ) doc? ( >=dev-util/gtk-doc-1.20 dev-libs/libxslt ) || ( ( dev-lang/python:3.9 dev-python/pyparsing[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pyparsing[python_targets_python3_8(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare setup
+DEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy x11-apps/xauth x11-libs/gdk-pixbuf:2= x11-libs/libXau:= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=Linux application sandboxing and distribution framework
+EAPI=7
+HOMEPAGE=https://flatpak.org/
+IUSE=doc gtk kde introspection policykit seccomp systemd kernel_linux
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
+LICENSE=LGPL-2.1+
+PDEPEND=gtk? ( sys-apps/xdg-desktop-portal-gtk ) kde? ( kde-plasma/xdg-desktop-portal-kde )
+RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy x11-apps/xauth x11-libs/gdk-pixbuf:2= x11-libs/libXau:= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.10.5/flatpak-1.10.5.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c0bafcab460c70cc0e36708d0eba26b2
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.11.1 b/metadata/md5-cache/sys-apps/flatpak-1.11.1
deleted file mode 100644
index b5994e99a08a..000000000000
--- a/metadata/md5-cache/sys-apps/flatpak-1.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/automake-1.13.4 >=sys-devel/gettext-0.18.2 virtual/pkgconfig dev-util/gdbus-codegen sys-devel/bison introspection? ( >=dev-libs/gobject-introspection-1.40 ) doc? ( >=dev-util/gtk-doc-1.20 dev-libs/libxslt ) || ( ( dev-lang/python:3.9 dev-python/pyparsing[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pyparsing[python_targets_python3_8(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare setup
-DEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy x11-apps/xauth x11-libs/gdk-pixbuf:2= x11-libs/libXau:= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Linux application sandboxing and distribution framework
-EAPI=7
-HOMEPAGE=https://flatpak.org/
-IUSE=doc gtk kde introspection policykit seccomp systemd kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-PDEPEND=gtk? ( sys-apps/xdg-desktop-portal-gtk ) kde? ( kde-plasma/xdg-desktop-portal-kde )
-RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy x11-apps/xauth x11-libs/gdk-pixbuf:2= x11-libs/libXau:= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.11.1/flatpak-1.11.1.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=511bd2c66c74f87e79822e0e50ec3812
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.11.3 b/metadata/md5-cache/sys-apps/flatpak-1.11.3
deleted file mode 100644
index 42dbbac33c88..000000000000
--- a/metadata/md5-cache/sys-apps/flatpak-1.11.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/automake-1.13.4 >=sys-devel/gettext-0.18.2 virtual/pkgconfig dev-util/gdbus-codegen sys-devel/bison introspection? ( >=dev-libs/gobject-introspection-1.40 ) doc? ( >=dev-util/gtk-doc-1.20 dev-libs/libxslt ) || ( ( dev-lang/python:3.9 dev-python/pyparsing[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pyparsing[python_targets_python3_8(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare setup
-DEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy x11-apps/xauth x11-libs/gdk-pixbuf:2= x11-libs/libXau:= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Linux application sandboxing and distribution framework
-EAPI=7
-HOMEPAGE=https://flatpak.org/
-IUSE=doc gtk kde introspection policykit seccomp systemd kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-PDEPEND=gtk? ( sys-apps/xdg-desktop-portal-gtk ) kde? ( kde-plasma/xdg-desktop-portal-kde )
-RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy x11-apps/xauth x11-libs/gdk-pixbuf:2= x11-libs/libXau:= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.11.3/flatpak-1.11.3.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=511bd2c66c74f87e79822e0e50ec3812
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.12.2 b/metadata/md5-cache/sys-apps/flatpak-1.12.2
new file mode 100644
index 000000000000..b80821fcede5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/flatpak-1.12.2
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/automake-1.13.4 >=sys-devel/gettext-0.18.2 virtual/pkgconfig dev-util/gdbus-codegen sys-devel/bison introspection? ( >=dev-libs/gobject-introspection-1.40 ) doc? ( >=dev-util/gtk-doc-1.20 dev-libs/libxslt ) || ( ( dev-lang/python:3.9 dev-python/pyparsing[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pyparsing[python_targets_python3_8(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare setup
+DEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy x11-apps/xauth x11-libs/gdk-pixbuf:2= x11-libs/libXau:= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=Linux application sandboxing and distribution framework
+EAPI=7
+HOMEPAGE=https://flatpak.org/
+IUSE=doc gtk kde introspection policykit seccomp systemd kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+PDEPEND=gtk? ( sys-apps/xdg-desktop-portal-gtk ) kde? ( kde-plasma/xdg-desktop-portal-kde )
+RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy x11-apps/xauth x11-libs/gdk-pixbuf:2= x11-libs/libXau:= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.12.2/flatpak-1.12.2.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=511bd2c66c74f87e79822e0e50ec3812
diff --git a/metadata/md5-cache/sys-apps/frandom-1.1-r1 b/metadata/md5-cache/sys-apps/frandom-1.1-r1
index 59c82e264aa4..3de94d1171e4 100644
--- a/metadata/md5-cache/sys-apps/frandom-1.1-r1
+++ b/metadata/md5-cache/sys-apps/frandom-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/frandom//frandom-1.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=540ce3a8f3e440e10b912cf9e4444d66
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.5.9-r1 b/metadata/md5-cache/sys-apps/fwupd-1.5.9-r1
index 53802a4cd900..b3d1a4d44cd9 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.5.9-r1
+++ b/metadata/md5-cache/sys-apps/fwupd-1.5.9-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd/archive/1.5.9.tar.gz -> fwupd-1.5.9.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ddd491b525a31828d01761c220448e32
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.6.2 b/metadata/md5-cache/sys-apps/fwupd-1.6.2
index 5a6b5a7d2904..90d9e4005e81 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.6.2
+++ b/metadata/md5-cache/sys-apps/fwupd-1.6.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd/archive/1.6.2.tar.gz -> fwupd-1.6.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0c5d134d9b0d4854447d4691b53741cd
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.6.3 b/metadata/md5-cache/sys-apps/fwupd-1.6.3
index 7403384a9d59..d45b2bbe1be6 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.6.3
+++ b/metadata/md5-cache/sys-apps/fwupd-1.6.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd/archive/1.6.3.tar.gz -> fwupd-1.6.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=cf1eb48512f3f2cdc6849bca7257edc9
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.6.4-r1 b/metadata/md5-cache/sys-apps/fwupd-1.6.4-r1
index 0d0b8c809ffc..3c5b625c12eb 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.6.4-r1
+++ b/metadata/md5-cache/sys-apps/fwupd-1.6.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd/archive/1.6.4.tar.gz -> fwupd-1.6.4.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=747f3837f6d0804056f0ce83e11bc3a7
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.7.0 b/metadata/md5-cache/sys-apps/fwupd-1.7.0
new file mode 100644
index 000000000000..2dc917e9ec9a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fwupd-1.7.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=app-arch/gcab-1.0 dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/libelf:0= virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
+EAPI=7
+HOMEPAGE=https://fwupd.org
+IUSE=agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi kernel_linux python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=app-arch/gcab-1.0 dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/libelf:0= virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) minimal? ( !introspection ) spi? ( lzma ) synaptics? ( gnutls ) uefi? ( gnutls )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fwupd/fwupd/archive/1.7.0.tar.gz -> fwupd-1.7.0.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=71e3962a818d2b2281e4cbeb2caed77b
diff --git a/metadata/md5-cache/sys-apps/hd-idle-1.05-r1 b/metadata/md5-cache/sys-apps/hd-idle-1.05-r1
index ccb847e4838d..c114d426dc45 100644
--- a/metadata/md5-cache/sys-apps/hd-idle-1.05-r1
+++ b/metadata/md5-cache/sys-apps/hd-idle-1.05-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/hd-idle/hd-idle-1.05.tgz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=38e42bd4d0e8286b306ee07589c9d9a1
diff --git a/metadata/md5-cache/sys-apps/hw-probe-1.6 b/metadata/md5-cache/sys-apps/hw-probe-1.6
new file mode 100644
index 000000000000..6d38033efd28
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hw-probe-1.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=A tool to probe for hardware, check it's operability and find drivers
+EAPI=8
+HOMEPAGE=https://github.com/linuxhw/hw-probe/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-lang/perl dev-perl/Digest-SHA1 net-misc/curl sys-apps/dmidecode sys-apps/edid-decode sys-apps/hwinfo sys-apps/pciutils sys-apps/smartmontools sys-apps/usbutils virtual/perl-Data-Dumper
+SLOT=0
+SRC_URI=https://github.com/linuxhw/hw-probe/archive/1.6.tar.gz -> hw-probe-1.6.tar.gz
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=cc31834b7147d9d735a5f88a9e2c6775
diff --git a/metadata/md5-cache/sys-apps/hwloc-2.5.0 b/metadata/md5-cache/sys-apps/hwloc-2.5.0
index 6feb643fe745..3440a625dac7 100644
--- a/metadata/md5-cache/sys-apps/hwloc-2.5.0
+++ b/metadata/md5-cache/sys-apps/hwloc-2.5.0
@@ -5,10 +5,10 @@ DESCRIPTION=displays the hardware topology in convenient formats
 EAPI=7
 HOMEPAGE=https://www.open-mpi.org/projects/hwloc/
 IUSE=cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) netloc? ( !sys-apps/netloc ) nvml? ( x11-drivers/nvidia-drivers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pci? ( >=sys-apps/pciutils-3.3.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/15
 SRC_URI=https://www.open-mpi.org/software/hwloc/v2.5/downloads/hwloc-2.5.0.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f42b772b790fdcb042e80845ba672776
+_md5_=de46bac49793890f0679e47d63463165
diff --git a/metadata/md5-cache/sys-apps/irqbalance-1.8.0-r1 b/metadata/md5-cache/sys-apps/irqbalance-1.8.0-r1
index 9fca44be386b..d0ce94ccb991 100644
--- a/metadata/md5-cache/sys-apps/irqbalance-1.8.0-r1
+++ b/metadata/md5-cache/sys-apps/irqbalance-1.8.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) tui? ( sys-libs/ncurses:=[unicode(+)] ) selinux? ( sec-policy/selinux-irqbalance )
 SLOT=0
 SRC_URI=https://github.com/Irqbalance/irqbalance/archive/v1.8.0.tar.gz -> irqbalance-1.8.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9cb5f158ea411ac5f90abe539090a7c0
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-2.0.22 b/metadata/md5-cache/sys-apps/kexec-tools-2.0.22
index 58d2dadbd013..fd6503ff08f9 100644
--- a/metadata/md5-cache/sys-apps/kexec-tools-2.0.22
+++ b/metadata/md5-cache/sys-apps/kexec-tools-2.0.22
@@ -11,5 +11,5 @@ RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=lzma? ( zlib )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.22.tar.xz
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a67d26d686861efbf14fd01bc9ee22ee
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-9999 b/metadata/md5-cache/sys-apps/kexec-tools-9999
index b127d3700a9c..c30c32c03b13 100644
--- a/metadata/md5-cache/sys-apps/kexec-tools-9999
+++ b/metadata/md5-cache/sys-apps/kexec-tools-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=lzma? ( zlib )
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=02f5c6da678de1f1e2823a81ee7ef582
diff --git a/metadata/md5-cache/sys-apps/keyutils-1.6.1 b/metadata/md5-cache/sys-apps/keyutils-1.6.1
index fff66884e979..fc7f0bb71eee 100644
--- a/metadata/md5-cache/sys-apps/keyutils-1.6.1
+++ b/metadata/md5-cache/sys-apps/keyutils-1.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/1.9
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-1.6.1.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
 _md5_=1c23239984417af5839e60f59a5a171a
diff --git a/metadata/md5-cache/sys-apps/keyutils-1.6.3 b/metadata/md5-cache/sys-apps/keyutils-1.6.3
index 95574d8df355..ee07da4dfbf4 100644
--- a/metadata/md5-cache/sys-apps/keyutils-1.6.3
+++ b/metadata/md5-cache/sys-apps/keyutils-1.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RESTRICT=!test? ( test )
 SLOT=0/1.9
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-1.6.3.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
 _md5_=958b5d2cb3ad1212bf1ac23fc5abd495
diff --git a/metadata/md5-cache/sys-apps/likwid-4.3.4 b/metadata/md5-cache/sys-apps/likwid-4.3.4
index 9f62eedc395c..9efbccf29119 100644
--- a/metadata/md5-cache/sys-apps/likwid-4.3.4
+++ b/metadata/md5-cache/sys-apps/likwid-4.3.4
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) filecaps? (
 REQUIRED_USE=^^ ( lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://ftp.fau.de/pub/likwid/likwid-4.3.4.tar.gz
-_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	linux-info	0979a3f84b9948fbe2a553beb6b5f505	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2e45d804ed79ec12750fd4e07c45bd5f
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-5.8 b/metadata/md5-cache/sys-apps/linux-misc-apps-5.8
index 5c6a6c617c11..1439947639fe 100644
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-5.8
+++ b/metadata/md5-cache/sys-apps/linux-misc-apps-5.8
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/hwids >=dev-libs/glib-2.6 >=sys-kernel/linux-headers-5.8 usbip? ( !net-misc/usbip tcpd? ( sys-apps/tcp-wrappers ) virtual/libudev ) !sys-power/pmtools
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-5.8.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c66aded6ad1a968772b3bbcb329102f4
diff --git a/metadata/md5-cache/sys-apps/lm-sensors-3.6.0 b/metadata/md5-cache/sys-apps/lm-sensors-3.6.0
index 076551312c93..11a5eacd725e 100644
--- a/metadata/md5-cache/sys-apps/lm-sensors-3.6.0
+++ b/metadata/md5-cache/sys-apps/lm-sensors-3.6.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2.1
 RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl !<sys-apps/openrc-0.36
 SLOT=0/5.0.0
 SRC_URI=https://github.com/lm-sensors/lm-sensors/archive/V3-6-0.tar.gz -> lm-sensors-3.6.0.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ed52e9bb9e9f5f765ac1d609edf875de
diff --git a/metadata/md5-cache/sys-apps/minijail-12 b/metadata/md5-cache/sys-apps/minijail-12
index b6a32f051ad8..6aa6362bd38f 100644
--- a/metadata/md5-cache/sys-apps/minijail-12
+++ b/metadata/md5-cache/sys-apps/minijail-12
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/libcap-ng:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/minijail/archive/linux-v12.tar.gz -> minijail-12.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=187193167638af5f47f8d7cf6c3db5b9
diff --git a/metadata/md5-cache/sys-apps/minijail-17 b/metadata/md5-cache/sys-apps/minijail-17
index 67a1a53de717..ec9a2924d104 100644
--- a/metadata/md5-cache/sys-apps/minijail-17
+++ b/metadata/md5-cache/sys-apps/minijail-17
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/libcap-ng:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/minijail/archive/linux-v17.tar.gz -> minijail-17.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=187193167638af5f47f8d7cf6c3db5b9
diff --git a/metadata/md5-cache/sys-apps/msr-tools-1.3 b/metadata/md5-cache/sys-apps/msr-tools-1.3
index 0003aa42060c..360035bf9a86 100644
--- a/metadata/md5-cache/sys-apps/msr-tools-1.3
+++ b/metadata/md5-cache/sys-apps/msr-tools-1.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/downloads/msr-tools/msr-tools-1.3.zip
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fecfd715b71422998d998c02382118bd
diff --git a/metadata/md5-cache/sys-apps/opal-utils-6.7 b/metadata/md5-cache/sys-apps/opal-utils-6.7
index f269524848bd..ed486586fa15 100644
--- a/metadata/md5-cache/sys-apps/opal-utils-6.7
+++ b/metadata/md5-cache/sys-apps/opal-utils-6.7
@@ -8,5 +8,5 @@ KEYWORDS=ppc64
 LICENSE=Apache-2.0 GPL-2+
 SLOT=0
 SRC_URI=https://github.com/open-power/skiboot/archive/v6.7.tar.gz -> opal-utils-6.7.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=723f78e58fbf4bf1ae0d1684267209c5
diff --git a/metadata/md5-cache/sys-apps/opal-utils-6.8 b/metadata/md5-cache/sys-apps/opal-utils-6.8
index a54e18613d26..568075833b9d 100644
--- a/metadata/md5-cache/sys-apps/opal-utils-6.8
+++ b/metadata/md5-cache/sys-apps/opal-utils-6.8
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/open-power/skiboot/archive/v6.8.tar.gz -> opal-utils-6.8.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c8a3be924df503b7b26d58afa8dfd119
diff --git a/metadata/md5-cache/sys-apps/openrc-0.43.5-r1 b/metadata/md5-cache/sys-apps/openrc-0.43.5-r1
new file mode 100644
index 000000000000..34534d00c500
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrc-0.43.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare
+DEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc !<sys-process/procps-3.3.9-r2 selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
+DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
+EAPI=7
+HOMEPAGE=https://github.com/openrc/openrc/
+IUSE=audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=BSD-2
+PDEPEND=netifrc? ( net-misc/netifrc )
+RDEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc !<sys-process/procps-3.3.9-r2 selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 bash? ( app-shells/bash ) !prefix? ( sysv-utils? ( !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) virtual/tmpfiles ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
+SLOT=0
+SRC_URI=https://github.com/openrc/openrc/archive/0.43.5.tar.gz -> openrc-0.43.5.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e09b9eac8290ad6649acd0f33c2b278e
diff --git a/metadata/md5-cache/sys-apps/openrc-0.44.6-r1 b/metadata/md5-cache/sys-apps/openrc-0.44.6-r1
new file mode 100644
index 000000000000..ff002e42263a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrc-0.44.6-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst preinst test
+DEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc !<sys-process/procps-3.3.9-r2 selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
+DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
+EAPI=7
+HOMEPAGE=https://github.com/openrc/openrc/
+IUSE=audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD-2
+PDEPEND=netifrc? ( net-misc/netifrc )
+RDEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc !<sys-process/procps-3.3.9-r2 selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 bash? ( app-shells/bash ) !prefix? ( sysv-utils? ( !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) virtual/tmpfiles ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
+SLOT=0
+SRC_URI=https://github.com/OpenRC/openrc/archive/0.44.6.tar.gz -> openrc-0.44.6.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9d8435957687e61677d714a26c5c62ae
diff --git a/metadata/md5-cache/sys-apps/openrc-0.44.7 b/metadata/md5-cache/sys-apps/openrc-0.44.7
new file mode 100644
index 000000000000..2334d4a1e362
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrc-0.44.7
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst preinst test
+DEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc !<sys-process/procps-3.3.9-r2 selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
+DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
+EAPI=7
+HOMEPAGE=https://github.com/openrc/openrc/
+IUSE=audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD-2
+PDEPEND=netifrc? ( net-misc/netifrc )
+RDEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc !<sys-process/procps-3.3.9-r2 selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 bash? ( app-shells/bash ) !prefix? ( sysv-utils? ( !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) virtual/tmpfiles ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
+SLOT=0
+SRC_URI=https://github.com/OpenRC/openrc/archive/0.44.7.tar.gz -> openrc-0.44.7.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=773ecfa1851bf3b49f7f9721c6f48313
diff --git a/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r3 b/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r3
index e12a00afdf88..e367a5198938 100644
--- a/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r3
+++ b/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/kmod[tools]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/pcmciautils/pcmciautils_018.orig.tar.gz mirror://debian/pool/main/p/pcmciautils/pcmciautils_018-8.debian.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d6779884f59b0a3fdfb675c03f5e13a2
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.9.4 b/metadata/md5-cache/sys-apps/pcsc-lite-1.9.4
new file mode 100644
index 000000000000..87df06eddae3
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.9.4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/libudev:= ) policykit? ( >=sys-auth/polkit-0.111 ) acct-group/openct acct-group/pcscd acct-user/pcscd python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+DESCRIPTION=PC/SC Architecture smartcard middleware library
+EAPI=8
+HOMEPAGE=https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC
+IUSE=doc embedded libusb policykit selinux systemd +udev python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD ISC MIT GPL-3+ GPL-2
+RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/libudev:= ) policykit? ( >=sys-auth/polkit-0.111 ) acct-group/openct acct-group/pcscd acct-user/pcscd python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) selinux? ( sec-policy/selinux-pcscd )
+REQUIRED_USE=^^ ( udev libusb ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://pcsclite.apdu.fr/files/pcsc-lite-1.9.4.tar.bz2
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=a6934fb15b9fe76376cd1c6c221b3ccc
diff --git a/metadata/md5-cache/sys-apps/plocate-1.1.10 b/metadata/md5-cache/sys-apps/plocate-1.1.10
index efe8630213d2..64cfce5976f9 100644
--- a/metadata/md5-cache/sys-apps/plocate-1.1.10
+++ b/metadata/md5-cache/sys-apps/plocate-1.1.10
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=acct-group/locate app-arch/zstd:= io-uring? ( sys-libs/liburing:= ) !sys-apps/mlocate
 SLOT=0
 SRC_URI=https://plocate.sesse.net/download/plocate-1.1.10.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=54266cc0bb235f6cccf65c5eb5106857
diff --git a/metadata/md5-cache/sys-apps/plocate-1.1.11 b/metadata/md5-cache/sys-apps/plocate-1.1.11
index 3c67faa3d9e2..556056544a50 100644
--- a/metadata/md5-cache/sys-apps/plocate-1.1.11
+++ b/metadata/md5-cache/sys-apps/plocate-1.1.11
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=acct-group/locate app-arch/zstd:= io-uring? ( sys-libs/liburing:= ) !sys-apps/mlocate
 SLOT=0
 SRC_URI=https://plocate.sesse.net/download/plocate-1.1.11.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c2fc49878a79ef7201be4e55d769e3b4
diff --git a/metadata/md5-cache/sys-apps/plocate-1.1.8 b/metadata/md5-cache/sys-apps/plocate-1.1.8
index f1118665aee5..140573e2665e 100644
--- a/metadata/md5-cache/sys-apps/plocate-1.1.8
+++ b/metadata/md5-cache/sys-apps/plocate-1.1.8
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=acct-group/locate app-arch/zstd:= io-uring? ( sys-libs/liburing:= ) !sys-apps/mlocate
 SLOT=0
 SRC_URI=https://plocate.sesse.net/download/plocate-1.1.8.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d6d455a97992558ccf72342ce548775e
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.18 b/metadata/md5-cache/sys-apps/portage-3.0.18
index 5309fd8c231d..7ff05a02fbcc 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.18
+++ b/metadata/md5-cache/sys-apps/portage-3.0.18
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-3.0.18.tar.xz https://dev.gentoo.org/~zmedico/portage/archives/portage-3.0.18.tar.xz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=951c72dfff8a555eaf45b4e435552946
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.20-r6 b/metadata/md5-cache/sys-apps/portage-3.0.20-r6
index f40d871a3381..e1ad04aebf3f 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.20-r6
+++ b/metadata/md5-cache/sys-apps/portage-3.0.20-r6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/portage/portage-3.0.20.tar.gz https://github.com/gentoo/portage/commit/a4d882964ee1931462f911d0c46a80e27e59fa48.patch -> portage-3.0.20-bug-777492-a4d8829.patch https://github.com/gentoo/portage/commit/209be9a8bee13384dd04a4762436b4c2a5e35bc6.patch -> portage-3.0.20-bug-777492-209be9a.patch https://github.com/gentoo/portage/compare/8e47286b7082aac21fe25402a1f9d03db968cd30...693f6bf5a54e2424e2ad49e1838b61f76bf78e40.patch -> portage-3.0.20-bug-796584-693f6bf.patch https://github.com/gentoo/portage/commit/2ce11f06e48290efb2d4b6743c8edf01c176b0fc.patch -> portage-3.0.20-bug-796812-2ce11f0.patch https://github.com/gentoo/portage/compare/2ce11f06e48290efb2d4b6743c8edf01c176b0fc...c3e4919fd004ce0f5c91c67ea377bbda83558ca9.patch -> portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6f9dec5a77eef2f9b38947f878231533
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.28 b/metadata/md5-cache/sys-apps/portage-3.0.28
index c78de775a0af..3ed6413bcc97 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.28
+++ b/metadata/md5-cache/sys-apps/portage-3.0.28
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.28.tar.bz2
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7efbfbf4db12ddacf93cf7ced9200987
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index 261a91bf7b1c..42c54b7470fe 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -12,5 +12,5 @@ RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=eb4d20d94f6d2bf5085901a0a478fa7d
diff --git a/metadata/md5-cache/sys-apps/progress-0.15-r1 b/metadata/md5-cache/sys-apps/progress-0.15-r1
index d9b41e3efd26..dabd1d1e8b6c 100644
--- a/metadata/md5-cache/sys-apps/progress-0.15-r1
+++ b/metadata/md5-cache/sys-apps/progress-0.15-r1
@@ -4,10 +4,10 @@ DEPEND=sys-libs/ncurses:=
 DESCRIPTION=Coreutils Viewer: show progress for cp, rm, dd, and so forth
 EAPI=7
 HOMEPAGE=https://github.com/Xfennec/progress
-KEYWORDS=amd64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://github.com/Xfennec/progress/archive/v0.15.tar.gz -> progress-0.15.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dd59403dff23fcc566957aef69bf5967
+_md5_=d6439c48e8a2ce5661d693ac30137c99
diff --git a/metadata/md5-cache/sys-apps/pv-1.6.20 b/metadata/md5-cache/sys-apps/pv-1.6.20
index 1eccb7046e7d..dfe653725d2f 100644
--- a/metadata/md5-cache/sys-apps/pv-1.6.20
+++ b/metadata/md5-cache/sys-apps/pv-1.6.20
@@ -3,9 +3,9 @@ DESCRIPTION=Pipe Viewer: a tool for monitoring the progress of data through a pi
 EAPI=8
 HOMEPAGE=https://www.ivarch.com/programs/pv.shtml
 IUSE=debug nls kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x86-solaris
 LICENSE=Artistic-2
 SLOT=0
 SRC_URI=https://www.ivarch.com/programs/sources/pv-1.6.20.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	plocale	89c6aac5da68423465e6fd79fb4ad5fb	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e9261a0177ba7ceed13a9364f03211d6
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	plocale	89c6aac5da68423465e6fd79fb4ad5fb	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bb4d061eed8584f8712119211de135be
diff --git a/metadata/md5-cache/sys-apps/pv-1.6.6 b/metadata/md5-cache/sys-apps/pv-1.6.6
deleted file mode 100644
index 07889ff3c8cd..000000000000
--- a/metadata/md5-cache/sys-apps/pv-1.6.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure prepare setup test
-DESCRIPTION=Pipe Viewer: a tool for monitoring the progress of data through a pipe
-EAPI=6
-HOMEPAGE=https://www.ivarch.com/programs/pv.shtml
-IUSE=debug nls kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x86-solaris
-LICENSE=Artistic-2
-SLOT=0
-SRC_URI=https://www.ivarch.com/programs/sources/pv-1.6.6.tar.bz2
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9b309cd8747fcbe3cd0a41101a3271b7
diff --git a/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r4 b/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r4
index 857661d55a28..b20a15aff40f 100644
--- a/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r4
+++ b/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r4
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=bindist fetch mirror
 SLOT=0
 SRC_URI=sum_driver_V1.6.0_20151201.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0554c7bd099776e712f0c99fa89b640f
diff --git a/metadata/md5-cache/sys-apps/systemd-249.4-r4 b/metadata/md5-cache/sys-apps/systemd-249.4-r4
index a622808d2b82..26b2a4b3cc1a 100644
--- a/metadata/md5-cache/sys-apps/systemd-249.4-r4
+++ b/metadata/md5-cache/sys-apps/systemd-249.4-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality?
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v249.4/systemd-stable-249.4.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ba3fff7f778c373829631280de637748
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=376fcf255cddefe9d35e35310b4824ad
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index d8e29691615c..c1090ea03da8 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality? ( homed )
 RESTRICT=!test? ( test )
 SLOT=0/2
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=62fc2a4041962bdddb5c3ee2917cfba3
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f1bd98ca83ebab2a4fd2fbd693459662
diff --git a/metadata/md5-cache/sys-apps/tas-1.6.0.200601 b/metadata/md5-cache/sys-apps/tas-1.6.0.200601
index f717db5b0f24..ee5fb2bf855b 100644
--- a/metadata/md5-cache/sys-apps/tas-1.6.0.200601
+++ b/metadata/md5-cache/sys-apps/tas-1.6.0.200601
@@ -10,5 +10,5 @@ RDEPEND=net-misc/networkmanager sys-apps/ethtool sys-apps/net-tools sys-apps/sma
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://www.supermicro.com/wftp/utility/TAS/TAS_1.6.0_build.200601.zip
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=8de67d64297ad343216b6e0424bd5ad5
diff --git a/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3-r1 b/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3-r1
index e4bdd4060cea..9dd04b65c2d9 100644
--- a/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3-r1
+++ b/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=
 SLOT=0
 SRC_URI=https://github.com/intel/thunderbolt-software-user-space/archive/v0.9.3.tar.gz -> thunderbolt-software-user-space-0.9.3.tar.gz https://dev.gentoo.org/~asturm/distfiles/thunderbolt-software-user-space-0.9.3-tbtadm.1.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f07df4ba1b33cd7131af37d7e2ee85aa
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.6.1 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.6.1
index 5b175a1ea400..5e748757c291 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.6.1
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.6.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/libusb:1
 SLOT=0
 SRC_URI=https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.6.1.tar.bz2 https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20191128.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=49580782164d2c120d084b16580caf71
diff --git a/metadata/md5-cache/sys-apps/x86info-1.30_p20190617 b/metadata/md5-cache/sys-apps/x86info-1.30_p20190617
index 371e5bdb08d4..47c81f7e125c 100644
--- a/metadata/md5-cache/sys-apps/x86info-1.30_p20190617
+++ b/metadata/md5-cache/sys-apps/x86info-1.30_p20190617
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils:=
 SLOT=0
 SRC_URI=https://github.com/kernelslacker/x86info/archive/8ea5ed19fae1d209eba9257171a10f7afd474618.tar.gz -> x86info-1.30_p20190617.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f5893fa53b85c5d476db0a5d216a5a37
diff --git a/metadata/md5-cache/sys-apps/yarn-1.22.17 b/metadata/md5-cache/sys-apps/yarn-1.22.17
new file mode 100644
index 000000000000..a0ab1ddd9a4f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/yarn-1.22.17
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=!dev-util/cmdtest net-libs/nodejs
+DESCRIPTION=Fast, reliable, and secure node dependency management
+EAPI=7
+HOMEPAGE=https://yarnpkg.com
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=!dev-util/cmdtest net-libs/nodejs
+SLOT=0
+SRC_URI=https://github.com/yarnpkg/yarn/releases/download/v1.22.17/yarn-v1.22.17.tar.gz
+_md5_=63b43b6af688767a358485411b5cba83
diff --git a/metadata/md5-cache/sys-apps/yarn-1.22.5 b/metadata/md5-cache/sys-apps/yarn-1.22.5
deleted file mode 100644
index d718d22223c1..000000000000
--- a/metadata/md5-cache/sys-apps/yarn-1.22.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!dev-util/cmdtest net-libs/nodejs
-DESCRIPTION=Fast, reliable, and secure node dependency management
-EAPI=7
-HOMEPAGE=https://yarnpkg.com
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=!dev-util/cmdtest net-libs/nodejs
-SLOT=0
-SRC_URI=https://github.com/yarnpkg/yarn/releases/download/v1.22.5/yarn-v1.22.5.tar.gz
-_md5_=fa55070cef814c452ec508b4819626e2
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 0d0c6f1bce11..d6548d98f515 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/elogind-246.10-r1 b/metadata/md5-cache/sys-auth/elogind-246.10-r1
index ff74098e73e1..96ce2c2dda70 100644
--- a/metadata/md5-cache/sys-auth/elogind-246.10-r1
+++ b/metadata/md5-cache/sys-auth/elogind-246.10-r1
@@ -11,5 +11,5 @@ PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
 RDEPEND=audit? ( sys-process/audit ) sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v246.10.tar.gz -> elogind-246.10.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=792c0971d9da6de63567f6f5b770f305
diff --git a/metadata/md5-cache/sys-auth/fprintd-1.92.0 b/metadata/md5-cache/sys-auth/fprintd-1.92.0
new file mode 100644
index 000000000000..608ffcacf442
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/fprintd-1.92.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( dev-libs/libxml2 dev-libs/libxslt dev-util/gtk-doc ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint:2 sys-auth/polkit pam? ( sys-libs/pam systemd? ( sys-apps/systemd ) !systemd? ( sys-auth/elogind ) ) test? ( || ( ( dev-lang/python:3.10 dev-python/python-dbusmock[python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] pam? ( sys-libs/pam_wrapper[python_targets_python3_10(-)] ) ) ( dev-lang/python:3.9 dev-python/python-dbusmock[python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] pam? ( sys-libs/pam_wrapper[python_targets_python3_9(-)] ) ) ( dev-lang/python:3.8 dev-python/python-dbusmock[python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] pam? ( sys-libs/pam_wrapper[python_targets_python3_8(-)] ) ) ) )
+DESCRIPTION=D-Bus service to access fingerprint readers
+EAPI=7
+HOMEPAGE=https://gitlab.freedesktop.org/libfprint/fprintd
+IUSE=doc pam systemd test
+KEYWORDS=~amd64 ~ia64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint:2 sys-auth/polkit pam? ( sys-libs/pam systemd? ( sys-apps/systemd ) !systemd? ( sys-auth/elogind ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v1.92.0/fprintd-v1.92.0.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9a4611d1569fbdf003318e3fc210141a
diff --git a/metadata/md5-cache/sys-auth/libfprint-1.90.6 b/metadata/md5-cache/sys-auth/libfprint-1.90.6
deleted file mode 100644
index afa5a61e55c3..000000000000
--- a/metadata/md5-cache/sys-auth/libfprint-1.90.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig introspection? ( dev-libs/gobject-introspection ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/glib:2 >=dev-libs/libgusb-0.3.1 dev-libs/nss virtual/libusb:1= x11-libs/gtk+:3 x11-libs/pixman x11-libs/libX11 x11-libs/libXv !>=sys-auth/libfprint-1.90:0
-DESCRIPTION=library to add support for consumer fingerprint readers
-EAPI=7
-HOMEPAGE=https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint
-IUSE=examples +introspection
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 >=dev-libs/libgusb-0.3.1 dev-libs/nss virtual/libusb:1= x11-libs/gtk+:3 x11-libs/pixman x11-libs/libX11 x11-libs/libXv !>=sys-auth/libfprint-1.90:0
-SLOT=2
-SRC_URI=https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v1.90.6/libfprint-v1.90.6.tar.gz -> libfprint-1.90.6.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=88b12f276bd7d8d0c2b901f570602ebc
diff --git a/metadata/md5-cache/sys-auth/libfprint-1.92.0 b/metadata/md5-cache/sys-auth/libfprint-1.92.0
new file mode 100644
index 000000000000..cfc408d30bc1
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/libfprint-1.92.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/glib:2 dev-libs/libgusb dev-libs/nss virtual/libusb:1= x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXv x11-libs/pixman !>=sys-auth/libfprint-1.90:0
+DESCRIPTION=Library to add support for consumer fingerprint readers
+EAPI=7
+HOMEPAGE=https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint
+IUSE=examples gtk-doc +introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/glib:2 dev-libs/libgusb dev-libs/nss virtual/libusb:1= x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXv x11-libs/pixman !>=sys-auth/libfprint-1.90:0
+SLOT=2
+SRC_URI=https://github.com/freedesktop/libfprint/archive/refs/tags/v1.92.0.tar.gz -> libfprint-1.92.0.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=2dfe7220b8a13e7abb2a4217b81c04b4
diff --git a/metadata/md5-cache/sys-auth/libyubikey-1.13 b/metadata/md5-cache/sys-auth/libyubikey-1.13
index 3a1b8db935ba..e04baa93f51e 100644
--- a/metadata/md5-cache/sys-auth/libyubikey-1.13
+++ b/metadata/md5-cache/sys-auth/libyubikey-1.13
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Yubico C low-level library
 EAPI=7
 HOMEPAGE=https://github.com/Yubico/yubico-c
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://opensource.yubico.com/yubico-c/releases/libyubikey-1.13.tar.gz
-_md5_=c9ffbde0ab886791bdf6051953ba0d19
+_md5_=97fa27c20484933e278a6fe06f0c7a9d
diff --git a/metadata/md5-cache/sys-auth/rtkit-0.13-r1 b/metadata/md5-cache/sys-auth/rtkit-0.13-r1
index 01a19bfa8fad..147463a20091 100644
--- a/metadata/md5-cache/sys-auth/rtkit-0.13-r1
+++ b/metadata/md5-cache/sys-auth/rtkit-0.13-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3 BSD
 RDEPEND=acct-group/rtkit acct-user/rtkit sys-apps/dbus sys-auth/polkit sys-libs/libcap systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://github.com/heftig/rtkit/releases/download/v0.13/rtkit-0.13.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9bd19efcbff5fadf8c5bc17e71dba70b
diff --git a/metadata/md5-cache/sys-auth/seatd-0.6.2 b/metadata/md5-cache/sys-auth/seatd-0.6.2
deleted file mode 100644
index a8dfa5f84432..000000000000
--- a/metadata/md5-cache/sys-auth/seatd-0.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-text/scdoc-1.9.7 >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install test
-DEPEND=elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Minimal seat management daemon and universal library
-EAPI=8
-HOMEPAGE=https://sr.ht/~kennylevinsen/seatd
-IUSE=builtin elogind +server systemd
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
-REQUIRED_USE=?? ( elogind systemd )
-SLOT=0/1
-SRC_URI=https://git.sr.ht/~kennylevinsen/seatd/archive/0.6.2.tar.gz -> seatd-0.6.2.tar.gz
-_eclasses_=meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=da7d64d6ff145fb3e941492e537b83e8
diff --git a/metadata/md5-cache/sys-auth/seatd-0.6.2-r1 b/metadata/md5-cache/sys-auth/seatd-0.6.2-r1
new file mode 100644
index 000000000000..82214dbb38ef
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/seatd-0.6.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-text/scdoc-1.9.7 >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+DESCRIPTION=Minimal seat management daemon and universal library
+EAPI=8
+HOMEPAGE=https://sr.ht/~kennylevinsen/seatd
+IUSE=builtin elogind +server systemd
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) server? ( acct-group/seat )
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0/1
+SRC_URI=https://git.sr.ht/~kennylevinsen/seatd/archive/0.6.2.tar.gz -> seatd-0.6.2.tar.gz
+_eclasses_=meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=19124dbf5d522b58edf0fbe16ad0345c
diff --git a/metadata/md5-cache/sys-auth/sssd-2.3.1-r2 b/metadata/md5-cache/sys-auth/sssd-2.3.1-r2
index f53b1bf3faff..2d5e0f0cd5b7 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.3.1-r2
+++ b/metadata/md5-cache/sys-auth/sssd-2.3.1-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=pac? ( samba ) python? ( ^^ ( python_single_target_python3_8 python
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SSSD/sssd/releases/download/sssd-2_3_1/sssd-2.3.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=61e0f13c6f683398b2196402a54377fe
diff --git a/metadata/md5-cache/sys-auth/sssd-2.5.2-r1 b/metadata/md5-cache/sys-auth/sssd-2.5.2-r1
index dec3614aa05f..13027c93e458 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.5.2-r1
+++ b/metadata/md5-cache/sys-auth/sssd-2.5.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SSSD/sssd/releases/download/2.5.2/sssd-2.5.2.tar.gz https://dev.gentoo.org/~sam/distfiles/sys-auth/sssd/sssd-2.5.2-CVE-2021-3621.patch.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=16d1e0d6351ed674d5968de44c37924c
diff --git a/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3 b/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
index f28c5b5451eb..f9f1cbbdd47a 100644
--- a/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
+++ b/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 pam? ( sys-libs/pam ) acct-group/fingerprint
 SLOT=0
 SRC_URI=mirror://sourceforge/thinkfinger/thinkfinger-0.3.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c2446fbefac0f0bc1cfcd032422c209d
diff --git a/metadata/md5-cache/sys-auth/ykpers-1.20.0 b/metadata/md5-cache/sys-auth/ykpers-1.20.0
index 5e4e77da79d9..ec6521001efb 100644
--- a/metadata/md5-cache/sys-auth/ykpers-1.20.0
+++ b/metadata/md5-cache/sys-auth/ykpers-1.20.0
@@ -5,10 +5,10 @@ DESCRIPTION=Library and tool for personalization of Yubico's YubiKey
 EAPI=7
 HOMEPAGE=https://github.com/Yubico/yubikey-personalization
 IUSE=static-libs
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/json-c:= >=sys-auth/libyubikey-1.6 virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/Yubico/yubikey-personalization/archive/v1.20.0.tar.gz -> ykpers-1.20.0.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=2eac5f2fedfd60cdc0d23189dc521c74
+_md5_=14a54557e114196d43d79f77cb236158
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index e79297859f62..4e2686ecbffa 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/arcconf-2.01.22270-r1 b/metadata/md5-cache/sys-block/arcconf-2.01.22270-r1
index 993ae41de015..ef73ec2c9710 100644
--- a/metadata/md5-cache/sys-block/arcconf-2.01.22270-r1
+++ b/metadata/md5-cache/sys-block/arcconf-2.01.22270-r1
@@ -9,5 +9,5 @@ LICENSE=Microsemi
 RESTRICT=fetch mirror bindist
 SLOT=0
 SRC_URI=http://download.adaptec.com/raid/storage_manager/arcconf_v2_01_22270.zip
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6549ce169cefcdbad01c4ab8b7e2b5a8
diff --git a/metadata/md5-cache/sys-block/arcconf-3.07.23971 b/metadata/md5-cache/sys-block/arcconf-3.07.23971
index ba18cc4f2d7c..79e188c38982 100644
--- a/metadata/md5-cache/sys-block/arcconf-3.07.23971
+++ b/metadata/md5-cache/sys-block/arcconf-3.07.23971
@@ -9,5 +9,5 @@ LICENSE=Microsemi
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://download.adaptec.com/raid/storage_manager/arcconf_v3_07_23971.zip
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3d2c42bde78b547f8aac9d2039f1a8b8
diff --git a/metadata/md5-cache/sys-block/blktrace-1.3.0 b/metadata/md5-cache/sys-block/blktrace-1.3.0
index b1327d05c0de..4085b6d03847 100644
--- a/metadata/md5-cache/sys-block/blktrace-1.3.0
+++ b/metadata/md5-cache/sys-block/blktrace-1.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libaio
 SLOT=0
 SRC_URI=https://brick.kernel.dk/snaps/blktrace-1.3.0.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0f20173508c783b9f080cd6be1ad082
diff --git a/metadata/md5-cache/sys-block/mbuffer-20211004 b/metadata/md5-cache/sys-block/mbuffer-20211004
new file mode 100644
index 000000000000..e28836439f23
--- /dev/null
+++ b/metadata/md5-cache/sys-block/mbuffer-20211004
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst prepare test
+DEPEND=ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=M(easuring)buffer is a replacement for buffer with additional functionality
+EAPI=7
+HOMEPAGE=https://www.maier-komor.de/mbuffer.html
+IUSE=debug ssl test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=ssl? ( dev-libs/openssl:0= )
+REQUIRED_USE=test? ( ssl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.maier-komor.de/software/mbuffer/mbuffer-20211004.tgz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=de380f2bd6f563abcef40cb890e8a222
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.1.4-r1 b/metadata/md5-cache/sys-block/open-iscsi-2.1.4-r1
index 4e80034e2648..3ec7524eeae3 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.1.4-r1
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.1.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband?
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0/0.2
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.1.4.tar.gz -> open-iscsi-2.1.4.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ed5f16a964f126610a727f14f17a83ac
diff --git a/metadata/md5-cache/sys-block/targetcli-fb-2.1.53 b/metadata/md5-cache/sys-block/targetcli-fb-2.1.53
index ee85f47bcace..13eff9a5ca8b 100644
--- a/metadata/md5-cache/sys-block/targetcli-fb-2.1.53
+++ b/metadata/md5-cache/sys-block/targetcli-fb-2.1.53
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Command shell for managing Linux LIO kernel target
 EAPI=7
 HOMEPAGE=https://github.com/open-iscsi/targetcli-fb
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/configshell-fb[python_targets_python3_8(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?] >=dev-python/rtslib-fb-2.1.73[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] sys-apps/dbus python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-python/configshell-fb[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rtslib-fb-2.1.73[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-apps/dbus python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/targetcli-fb/archive/v2.1.53.tar.gz -> targetcli-fb-2.1.53.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=816cab89c8348b7d67c5afefe6228c42
+_md5_=7872a3f30752357566686e891d6f050c
diff --git a/metadata/md5-cache/sys-block/targetcli-fb-2.1.54 b/metadata/md5-cache/sys-block/targetcli-fb-2.1.54
new file mode 100644
index 000000000000..00ed38a16ad3
--- /dev/null
+++ b/metadata/md5-cache/sys-block/targetcli-fb-2.1.54
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Command shell for managing Linux LIO kernel target
+EAPI=7
+HOMEPAGE=https://github.com/open-iscsi/targetcli-fb
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/configshell-fb[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rtslib-fb-2.1.73[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-apps/dbus python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/open-iscsi/targetcli-fb/archive/v2.1.54.tar.gz -> targetcli-fb-2.1.54.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ad6fdc1bc7865009483f121cfdb9e78e
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index b929187a7abf..351ac2f1f6c4 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/corosync-3.1.0 b/metadata/md5-cache/sys-cluster/corosync-3.1.0
index b8cccf913a15..930d17b89cd2 100644
--- a/metadata/md5-cache/sys-cluster/corosync-3.1.0
+++ b/metadata/md5-cache/sys-cluster/corosync-3.1.0
@@ -10,5 +10,5 @@ LICENSE=BSD-2 public-domain
 RDEPEND=dev-libs/nss >=sys-cluster/libqb-2.0.0:= sys-cluster/kronosnet:= augeas? ( app-admin/augeas ) dbus? ( sys-apps/dbus ) snmp? ( net-analyzer/net-snmp ) systemd? ( sys-apps/systemd:= ) watchdog? ( sys-kernel/linux-headers )
 SLOT=0
 SRC_URI=https://github.com/corosync/corosync/archive/v3.1.0.tar.gz -> corosync-3.1.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ff97d571c53d81782702c715159d3777
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1 b/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
index 1678db08185e..bbf19b51c871 100644
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
+++ b/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:* dev-libs/libnl:= >=dev-libs/popt-1.16
 SLOT=0
 SRC_URI=https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.27.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a62f5e41c2d55321bc28d9a0df736553
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.28-r1 b/metadata/md5-cache/sys-cluster/ipvsadm-1.28-r1
index cb70e4e68e5f..939a692ad74b 100644
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.28-r1
+++ b/metadata/md5-cache/sys-cluster/ipvsadm-1.28-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:* dev-libs/libnl:= >=dev-libs/popt-1.16
 SLOT=0
 SRC_URI=https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.28.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=537ba07be93b24c94e2b05c581f9ddc2
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.31 b/metadata/md5-cache/sys-cluster/ipvsadm-1.31
index efa0ce11a6c3..3cc9235a3c48 100644
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.31
+++ b/metadata/md5-cache/sys-cluster/ipvsadm-1.31
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:* dev-libs/libnl:= >=dev-libs/popt-1.16
 SLOT=0
 SRC_URI=https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.31.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=75985ae5ea53d5cb04e7904f9b64a777
diff --git a/metadata/md5-cache/sys-cluster/k3s-1.19.10-r1 b/metadata/md5-cache/sys-cluster/k3s-1.19.10-r1
deleted file mode 100644
index 05c2362fd656..000000000000
--- a/metadata/md5-cache/sys-cluster/k3s-1.19.10-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=net-firewall/conntrack-tools rootless? ( app-emulation/slirp4netns )
-DESCRIPTION=Lightweight Kubernetes
-EAPI=7
-HOMEPAGE=https://k3s.io
-IUSE=+kubectl-symlink rootless kernel_linux
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=kubectl-symlink? ( !sys-cluster/kubectl )
-REQUIRED_USE=|| ( amd64 )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/k3s-io/k3s/archive/refs/tags/v1.19.10+k3s1.tar.gz -> k3s-1.19.10.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.zip -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.zip mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//bitbucket.org/bertimus9/systemstat/@v/v0.0.0-20180207000608-0eeff89b0690.zip -> bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.zip mirror://goproxy//bitbucket.org/bertimus9/systemstat/@v/v0.0.0-20180207000608-0eeff89b0690.mod -> bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ajstarks/svgo/@v/v0.0.0-20180226025133-644b8db467af.mod -> github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.zip -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.zip mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.mod -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod mirror://goproxy//github.com/andreyvit/diff/@v/v0.0.0-20170406064948-c7f18ee00883.mod -> github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/auth0/go-jwt-middleware/@v/v0.0.0-20170425171159-5493cabe49f7.zip -> github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.zip mirror://goproxy//github.com/auth0/go-jwt-middleware/@v/v0.0.0-20170425171159-5493cabe49f7.mod -> github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.12.54.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.12.54.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.28.2.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.28.2.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.28.2.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.28.2.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.6.10.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.6.10.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.2.1+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v43.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv43.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v43.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv43.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.6.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.6.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.6.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.6.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.8.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20160804104726-4c0e84591b9a.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bifurcation/mint/@v/v0.0.0-20180715133206-93c51c6ce115.mod -> github.com%2Fbifurcation%2Fmint%2F@v%2Fv0.0.0-20180715133206-93c51c6ce115.mod mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.mod -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20171013065002-4d72634a2f11.mod -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20171013065002-4d72634a2f11.mod mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20190828090544-27d02f80ba40.zip -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20190828090544-27d02f80ba40.zip mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20190828090544-27d02f80ba40.mod -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20190828090544-27d02f80ba40.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v0.4.1.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.zip -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.zip mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.mod mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.mod -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.mod -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.mod -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/caddyserver/caddy/@v/v1.0.3.zip -> github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/caddyserver/caddy/@v/v1.0.3.mod -> github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/canonical/go-dqlite/@v/v1.5.1.zip -> github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/canonical/go-dqlite/@v/v1.5.1.mod -> github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.1.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.1.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.zip -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.zip mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.0.2.zip -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.0.2.zip mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.0.2.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.1.0.zip -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.1.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/cheekybits/genny/@v/v0.0.0-20170328200008-9127e812e1e9.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv0.0.0-20170328200008-9127e812e1e9.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.29.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200507155900-a9f01edf17e3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200507155900-a9f01edf17e3.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200601085316-9f1617e5c574.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200601085316-9f1617e5c574.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200702112145-1c8d4c9ef775.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200702112145-1c8d4c9ef775.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/clusterhq/flocker-go/@v/v0.0.0-20160920122132-2b8b7259d313.zip -> github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.zip mirror://goproxy//github.com/clusterhq/flocker-go/@v/v0.0.0-20160920122132-2b8b7259d313.mod -> github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codegangsta/negroni/@v/v1.0.0.zip -> github.com%2Fcodegangsta%2Fnegroni%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/codegangsta/negroni/@v/v1.0.0.mod -> github.com%2Fcodegangsta%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20191030083217-371312c1e31c.zip -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20191030083217-371312c1e31c.zip mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20191030083217-371312c1e31c.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20191030083217-371312c1e31c.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20201111183144-404b9149801e.zip -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.zip mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20201111183144-404b9149801e.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190717030353-c4b9ac5c7601.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190717030353-c4b9ac5c7601.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.zip mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200710171044-318312a37340.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.zip mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200710171044-318312a37340.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20181022165439-0650fd9eeb50.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20181022165439-0650fd9eeb50.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191206165004-02ecf6a7291e.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/console/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.2.10.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.2.10.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20180307165137-3d5202aec260.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20180307165137-3d5202aec260.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.zip mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190816180239-bda0ff6ed73c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20200410184934-f15a3290365b.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.zip mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20200410184934-f15a3290365b.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20190911050354-e029b79d8cda.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20190911050354-e029b79d8cda.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.zip -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.zip mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828172938-92c8520ef9f8.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828172938-92c8520ef9f8.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.zip mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20191030014035-9abf673ca6ff.zip -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20191030014035-9abf673ca6ff.zip mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20191030014035-9abf673ca6ff.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20191030014035-9abf673ca6ff.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.zip -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.zip mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.0.1.zip -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containers/ocicrypt/@v/v1.0.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.2.0.zip -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.2.0.mod -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.10.zip -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.10.mod -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.1.11+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.1.11+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.0.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20161114122254-48702e0da86b.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20161114122254-48702e0da86b.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.zip -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.mod -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.zip -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.zip mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.mod -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.zip -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.zip mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.mod -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.zip -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.zip mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.mod -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.zip -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.zip mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170629053852-f6cab0c35083.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170629053852-f6cab0c35083.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20190125010748-a747050bb1ba.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20170104182250-a601269ab70c.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20190905152932-14b96e55d84c.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20190905152932-14b96e55d84c.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v0.7.3-0.20190327010347-be7ac8be2ae0.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv0.7.3-0.20190327010347-be7ac8be2ae0.mod mirror://goproxy//github.com/docker/docker/@v/v1.13.1.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.13.1.zip mirror://goproxy//github.com/docker/docker/@v/v1.13.1.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.13.1.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20200309214505-aa6a9891b09c.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200309214505-aa6a9891b09c.zip mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20200309214505-aa6a9891b09c.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200309214505-aa6a9891b09c.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20170721190031-9461782956ad.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20170721190031-9461782956ad.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.zip -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.zip mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.0-20180209012529-399ea8c73916.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.zip -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/erikdubbelboer/gspt/@v/v0.0.0-20190125194910-e68493906b83.zip -> github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.zip mirror://goproxy//github.com/erikdubbelboer/gspt/@v/v0.0.0-20190125194910-e68493906b83.mod -> github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.mod mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.zip -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.mod -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.zip -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.mod -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.zip -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fogleman/gg/@v/v1.2.1-0.20190220221249-0403632d5b90.mod -> github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.10.2.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.2.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.10.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.2.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/fullsailor/pkcs7/@v/v0.0.0-20190404230743-d7302db945fa.zip -> github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.zip mirror://goproxy//github.com/fullsailor/pkcs7/@v/v0.0.0-20190404230743-d7302db945fa.mod -> github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.mod mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/go-acme/lego/@v/v2.5.0+incompatible.mod -> github.com%2Fgo-acme%2Flego%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.1+incompatible.zip -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.zip mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.1+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.2+incompatible.zip -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.zip mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.2+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20151105175453-c7fdd8b5cd55.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20151105175453-c7fdd8b5cd55.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.2.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.3.2.zip -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/googleapis/@v/v1.3.2.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.28.1.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.28.1.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.9.0.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/golang/freetype/@v/v0.0.0-20170609003504-e2365dfdc4a0.mod -> github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golangplus/bytes/@v/v0.0.0-20160111154220-45c989fe5450.zip -> github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.zip mirror://goproxy//github.com/golangplus/bytes/@v/v0.0.0-20160111154220-45c989fe5450.mod -> github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod mirror://goproxy//github.com/golangplus/fmt/@v/v0.0.0-20150411045040-2a5d6d7d2995.zip -> github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.zip mirror://goproxy//github.com/golangplus/fmt/@v/v0.0.0-20150411045040-2a5d6d7d2995.mod -> github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.mod mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.zip -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.zip mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170426233943-68f4ded48ba9.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170426233943-68f4ded48ba9.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/cadvisor/@v/v0.37.2.mod -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.37.2.mod mirror://goproxy//github.com/google/cadvisor/@v/v0.37.5.zip -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.37.5.zip mirror://goproxy//github.com/google/cadvisor/@v/v0.37.5.mod -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.37.5.mod mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20200415212048-7901bc822317.zip -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20200415212048-7901bc822317.zip mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20200415212048-7901bc822317.mod -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20200415212048-7901bc822317.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-containerregistry/@v/v0.0.0-20190617215043-876b8855d23c.mod -> github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.0.0-20190617215043-876b8855d23c.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.0.0-20180825180245-b006789cd277.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.zip -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.zip mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.zip -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.zip mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.0.0-20180920151709-4f900dc2ade9.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.zip -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.zip mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-ozzo/ozzo-validation/@v/v3.5.0+incompatible.zip -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.zip mirror://goproxy//github.com/go-ozzo/ozzo-validation/@v/v3.5.0+incompatible.mod -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.zip -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/handlers/@v/v0.0.0-20150720190736-60c7bfde3e33.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.4.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.4.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.4.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.4.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.zip mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.0.0-20180201235237-0fb14efe8c47.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.0.0-20180201235237-0fb14efe8c47.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/heketi/heketi/@v/v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.zip -> github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.zip mirror://goproxy//github.com/heketi/heketi/@v/v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod -> github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.zip -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.zip mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.mod -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/insomniacslk/dhcp/@v/v0.0.0-20200420235442-ed3125c2efe7.mod -> github.com%2Finsomniacslk%2Fdhcp%2F@v%2Fv0.0.0-20200420235442-ed3125c2efe7.mod mirror://goproxy//github.com/ishidawataru/sctp/@v/v0.0.0-20190723014705-7c296d48a2b5.zip -> github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20190723014705-7c296d48a2b5.zip mirror://goproxy//github.com/ishidawataru/sctp/@v/v0.0.0-20190723014705-7c296d48a2b5.mod -> github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20190723014705-7c296d48a2b5.mod mirror://goproxy//github.com/jamescun/tuntap/@v/v0.0.0-20190712092105-cb1fb277045c.mod -> github.com%2Fjamescun%2Ftuntap%2F@v%2Fv0.0.0-20190712092105-cb1fb277045c.mod mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.zip -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.zip mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.mod -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.mod mirror://goproxy//github.com/jetstack/cert-manager/@v/v0.7.2.mod -> github.com%2Fjetstack%2Fcert-manager%2F@v%2Fv0.7.2.mod mirror://goproxy//github.com/jimstudt/http-authentication/@v/v0.0.0-20140401203705-3eca13d6893a.mod -> github.com%2Fjimstudt%2Fhttp-authentication%2F@v%2Fv0.0.0-20140401203705-3eca13d6893a.mod mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.zip -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.zip mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.mod -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/joho/godotenv/@v/v0.0.0-20161216230537-726cc8b906e3.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv0.0.0-20161216230537-726cc8b906e3.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jung-kurt/gofpdf/@v/v1.0.3-0.20190309125859-24315acbbda5.mod -> github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod mirror://goproxy//github.com/k3s-io/containerd/@v/v1.4.4-k3s1.zip -> github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.4.4-k3s1.zip mirror://goproxy//github.com/k3s-io/containerd/@v/v1.4.4-k3s1.mod -> github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.4.4-k3s1.mod mirror://goproxy//github.com/k3s-io/continuity/@v/v0.0.0-20210309170710-f93269e0d5c1.zip -> github.com%2Fk3s-io%2Fcontinuity%2F@v%2Fv0.0.0-20210309170710-f93269e0d5c1.zip mirror://goproxy//github.com/k3s-io/continuity/@v/v0.0.0-20210309170710-f93269e0d5c1.mod -> github.com%2Fk3s-io%2Fcontinuity%2F@v%2Fv0.0.0-20210309170710-f93269e0d5c1.mod mirror://goproxy//github.com/k3s-io/cri/@v/v1.4.0-k3s.5.zip -> github.com%2Fk3s-io%2Fcri%2F@v%2Fv1.4.0-k3s.5.zip mirror://goproxy//github.com/k3s-io/cri/@v/v1.4.0-k3s.5.mod -> github.com%2Fk3s-io%2Fcri%2F@v%2Fv1.4.0-k3s.5.mod mirror://goproxy//github.com/k3s-io/etcd/@v/v0.5.0-alpha.5.0.20201208200253-50621aee4aea.zip -> github.com%2Fk3s-io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20201208200253-50621aee4aea.zip mirror://goproxy//github.com/k3s-io/etcd/@v/v0.5.0-alpha.5.0.20201208200253-50621aee4aea.mod -> github.com%2Fk3s-io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20201208200253-50621aee4aea.mod mirror://goproxy//github.com/k3s-io/helm-controller/@v/v0.8.3.zip -> github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/k3s-io/helm-controller/@v/v0.8.3.mod -> github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/api/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/api/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/@v/v1.19.10-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.19.10-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/@v/v1.19.10-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.19.10-k3s1.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.7.5.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.7.5.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.7.5.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.7.5.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/knative/build/@v/v0.6.0.mod -> github.com%2Fknative%2Fbuild%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/knative/pkg/@v/v0.0.0-20190514205332-5e4512dcb2ca.mod -> github.com%2Fknative%2Fpkg%2F@v%2Fv0.0.0-20190514205332-5e4512dcb2ca.mod mirror://goproxy//github.com/knative/serving/@v/v0.6.1.mod -> github.com%2Fknative%2Fserving%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.zip -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.mod -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.8.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.8.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.zip -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.mod -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.zip -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.mod -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lpabon/godbc/@v/v0.1.1.zip -> github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/lpabon/godbc/@v/v0.1.1.mod -> github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/lucas-clemente/aes12/@v/v0.0.0-20171027163421-cd47fb39b79f.mod -> github.com%2Flucas-clemente%2Faes12%2F@v%2Fv0.0.0-20171027163421-cd47fb39b79f.mod mirror://goproxy//github.com/lucas-clemente/quic-clients/@v/v0.1.0.mod -> github.com%2Flucas-clemente%2Fquic-clients%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lucas-clemente/quic-go-certificates/@v/v0.0.0-20160823095156-d2f86524cced.mod -> github.com%2Flucas-clemente%2Fquic-go-certificates%2F@v%2Fv0.0.0-20160823095156-d2f86524cced.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.10.2.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/marstr/guid/@v/v1.1.0.mod -> github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.2.3.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/mattbaird/jsonpatch/@v/v0.0.0-20171005235357-81af80346b1a.mod -> github.com%2Fmattbaird%2Fjsonpatch%2F@v%2Fv0.0.0-20171005235357-81af80346b1a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.4.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.4.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.4.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/mholt/certmagic/@v/v0.6.2-0.20190624175158-6a42ef9fe8c2.mod -> github.com%2Fmholt%2Fcertmagic%2F@v%2Fv0.6.2-0.20190624175158-6a42ef9fe8c2.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20200803203718-d80bc7196cb0.zip -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20200803203718-d80bc7196cb0.zip mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20200803203718-d80bc7196cb0.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20200803203718-d80bc7196cb0.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.10-0.20200715222032-5eafd1556990.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.10-0.20200715222032-5eafd1556990.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.10-0.20200715222032-5eafd1556990.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.10-0.20200715222032-5eafd1556990.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7-0.20190325164909-8abdbb8205e4.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7-0.20190325164909-8abdbb8205e4.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.9.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.9.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.3.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.zip -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.zip mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.mod -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.mod mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.zip -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.mod -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.7.zip -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.zip mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.7.mod -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/minio/sio/@v/v0.2.1.mod -> github.com%2Fminio%2Fsio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.zip -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.zip mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.mod -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.zip -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.mod -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.1.3.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.1.3.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.mod mirror://goproxy//github.com/moby/vpnkit/@v/v0.4.0.mod -> github.com%2Fmoby%2Fvpnkit%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170603005431-491d3605edfb.zip -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.zip mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170603005431-491d3605edfb.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20171103030105-7d4729fb3618.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20171103030105-7d4729fb3618.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20200520151820-abd8a0e76976.zip -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20200520151820-abd8a0e76976.zip mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20200520151820-abd8a0e76976.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20200520151820-abd8a0e76976.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.zip -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.zip mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod mirror://goproxy//github.com/mvdan/xurls/@v/v1.1.0.zip -> github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mvdan/xurls/@v/v1.1.0.mod -> github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.zip -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.mod -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/naoina/toml/@v/v0.1.1.mod -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/natefinch/lumberjack/@v/v2.0.0+incompatible.zip -> github.com%2Fnatefinch%2Flumberjack%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/natefinch/lumberjack/@v/v2.0.0+incompatible.mod -> github.com%2Fnatefinch%2Flumberjack%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20151202141238-7f8ab55aaf3b.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20151202141238-7f8ab55aaf3b.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20151007035656-2152b45fa28a.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.zip mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20151007035656-2152b45fa28a.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.zip mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20170106003457-a6d0ee40d420.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc90.0.20200616040943-82d2fa4eb069.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc90.0.20200616040943-82d2fa4eb069.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc91.0.20200707015106-819fcc687efb.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc91.0.20200707015106-819fcc687efb.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc91.0.20200707015106-819fcc687efb.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc91.0.20200707015106-819fcc687efb.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc92.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc92.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc92.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc92.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2-0.20190207185410-29686dbc5559.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20190207185410-29686dbc5559.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200520003142-237cc4f519e2.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200520003142-237cc4f519e2.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200520003142-237cc4f519e2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200520003142-237cc4f519e2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200710190001-3e4195d92445.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200710190001-3e4195d92445.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200710190001-3e4195d92445.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200710190001-3e4195d92445.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200728170252-4d89ac9fbff6.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200728170252-4d89ac9fbff6.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200728170252-4d89ac9fbff6.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200728170252-4d89ac9fbff6.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.5.1.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.5.2.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.5.2.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.6.0.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.6.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.1.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.0.0-20180209125602-c332b6f63c06.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20171117100541-99fa1f4be8e5.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180110214958-89604d197083.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/quobyte/api/@v/v0.1.2.zip -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/quobyte/api/@v/v0.1.2.mod -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/rakelkar/gonetsh/@v/v0.0.0-20190930180311-e5c5ffe4bdf0.zip -> github.com%2Frakelkar%2Fgonetsh%2F@v%2Fv0.0.0-20190930180311-e5c5ffe4bdf0.zip mirror://goproxy//github.com/rakelkar/gonetsh/@v/v0.0.0-20190930180311-e5c5ffe4bdf0.mod -> github.com%2Frakelkar%2Fgonetsh%2F@v%2Fv0.0.0-20190930180311-e5c5ffe4bdf0.mod mirror://goproxy//github.com/rancher/cri-tools/@v/v1.19.0-k3s1.zip -> github.com%2Francher%2Fcri-tools%2F@v%2Fv1.19.0-k3s1.zip mirror://goproxy//github.com/rancher/cri-tools/@v/v1.19.0-k3s1.mod -> github.com%2Francher%2Fcri-tools%2F@v%2Fv1.19.0-k3s1.mod mirror://goproxy//github.com/rancher/dynamiclistener/@v/v0.2.2.zip -> github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/rancher/dynamiclistener/@v/v0.2.2.mod -> github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/rancher/flannel/@v/v0.12.0-k3s1.zip -> github.com%2Francher%2Fflannel%2F@v%2Fv0.12.0-k3s1.zip mirror://goproxy//github.com/rancher/flannel/@v/v0.12.0-k3s1.mod -> github.com%2Francher%2Fflannel%2F@v%2Fv0.12.0-k3s1.mod mirror://goproxy//github.com/rancher/go-powershell/@v/v0.0.0-20200701182037-6845e6fcfa79.zip -> github.com%2Francher%2Fgo-powershell%2F@v%2Fv0.0.0-20200701182037-6845e6fcfa79.zip mirror://goproxy//github.com/rancher/go-powershell/@v/v0.0.0-20200701182037-6845e6fcfa79.mod -> github.com%2Francher%2Fgo-powershell%2F@v%2Fv0.0.0-20200701182037-6845e6fcfa79.mod mirror://goproxy//github.com/rancher/go-powershell/@v/v0.0.0-20200701184732-233247d45373.zip -> github.com%2Francher%2Fgo-powershell%2F@v%2Fv0.0.0-20200701184732-233247d45373.zip mirror://goproxy//github.com/rancher/go-powershell/@v/v0.0.0-20200701184732-233247d45373.mod -> github.com%2Francher%2Fgo-powershell%2F@v%2Fv0.0.0-20200701184732-233247d45373.mod mirror://goproxy//github.com/rancher/kine/@v/v0.5.1.zip -> github.com%2Francher%2Fkine%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/rancher/kine/@v/v0.5.1.mod -> github.com%2Francher%2Fkine%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/rancher/moq/@v/v0.0.0-20190404221404-ee5226d43009.mod -> github.com%2Francher%2Fmoq%2F@v%2Fv0.0.0-20190404221404-ee5226d43009.mod mirror://goproxy//github.com/rancher/remotedialer/@v/v0.2.0.zip -> github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rancher/remotedialer/@v/v0.2.0.mod -> github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.2.0.mod -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.6.0.zip -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.6.0.mod -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.1.4.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.4.0.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.0.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.1.zip -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.1.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.2.zip -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.2.zip mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.2.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.2.mod mirror://goproxy//github.com/remyoudompheng/bigfft/@v/v0.0.0-20170806203942-52369c62f446.mod -> github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.zip -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.mod -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.zip -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.mod -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/robfig/cron/v3/@v/v3.0.1.zip -> github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/robfig/cron/v3/@v/v3.0.1.mod -> github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.10.0.zip -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.10.0.mod -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.zip -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.zip -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.zip mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.mod -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.mod mirror://goproxy//github.com/russross/blackfriday/@v/v0.0.0-20170610170232-067529f716f4.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv0.0.0-20170610170232-067529f716f4.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.zip -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.zip mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.zip -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.mod -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.zip mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/storageos/go-api/@v/v0.0.0-20180912212459-343b3eff91fc.zip -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv0.0.0-20180912212459-343b3eff91fc.zip mirror://goproxy//github.com/storageos/go-api/@v/v0.0.0-20180912212459-343b3eff91fc.mod -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv0.0.0-20180912212459-343b3eff91fc.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.0.0-20180129172003-8a3f7159479f.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.0.0-20180129172003-8a3f7159479f.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20180303142811-b89eecf5ca5d.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20180303142811-b89eecf5ca5d.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.zip mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.zip -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.zip mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.3.0+incompatible.zip -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.zip mirror://goproxy//github.com/tchap/go-patricia/@v/v2.3.0+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.mod mirror://goproxy//github.com/tektoncd/pipeline/@v/v0.4.0.mod -> github.com%2Ftektoncd%2Fpipeline%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/thecodeteam/goscaleio/@v/v0.1.0.zip -> github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/thecodeteam/goscaleio/@v/v0.1.0.mod -> github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.zip -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/ugorji/go/@v/v0.0.0-20170107133203-ded73eae5db7.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20170107133203-ded73eae5db7.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.21.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.21.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.zip -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.mod -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/u-root/u-root/@v/v6.0.0+incompatible.mod -> github.com%2Fu-root%2Fu-root%2F@v%2Fv6.0.0+incompatible.mod mirror://goproxy//github.com/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20170220200719-fe3b5664d23a.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20170220200719-fe3b5664d23a.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20181108222139-023a6dafdcdf.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20181108222139-023a6dafdcdf.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20170219233438-54f0e4339ce7.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20170219233438-54f0e4339ce7.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200520041808-52d707b772fe.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200520041808-52d707b772fe.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200520041808-52d707b772fe.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200520041808-52d707b772fe.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11-0.20200630133818-d5bec3311243.zip -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.zip mirror://goproxy//github.com/willf/bitset/@v/v1.1.11-0.20200630133818-d5bec3311243.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/handysort/@v/v0.0.0-20150421192137-fb3537ed64a1.zip -> github.com%2Fxlab%2Fhandysort%2F@v%2Fv0.0.0-20150421192137-fb3537ed64a1.zip mirror://goproxy//github.com/xlab/handysort/@v/v0.0.0-20150421192137-fb3537ed64a1.mod -> github.com%2Fxlab%2Fhandysort%2F@v%2Fv0.0.0-20150421192137-fb3537ed64a1.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.mod -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.mod -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.mod -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181009213950-7c1a557ab941.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181009213950-7c1a557ab941.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190123085648-057139ce5d2b.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190123085648-057139ce5d2b.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190320223903-b7391e95e576.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190320223903-b7391e95e576.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190617133340-57b3e21c3d56.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180321215751-8460e604b9de.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180807140117-3d87b88a115f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190312203227-4b39c73a6495.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20180708004352-c73c2afc3b81.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181005035420-146acd28ed58.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181005035420-146acd28ed58.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190320064053-1272bf9dcd53.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190328230028-74de082e2cca.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190124100055-b90733256f2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190124100055-b90733256f2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190228124157-a34e9553db1e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190321052220-f7bb7a8bee54.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190321052220-f7bb7a8bee54.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190602015325-4c4f7f33c9ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190812073006-9eafafc0a87e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190812073006-9eafafc0a87e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191115151921-52ab43148777.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200217220822-9197077df867.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200217220822-9197077df867.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200327173247-9dae0f8f5775.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200327173247-9dae0f8f5775.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190920225731-5eefd052ad72.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190920225731-5eefd052ad72.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191017205301-920acffc3e65.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191017205301-920acffc3e65.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191017205301-920acffc3e65.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191017205301-920acffc3e65.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200616133436-c1934b75d054.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200616133436-c1934b75d054.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.zip -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.zip mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20180816165407-929014505bf4.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20190331200053-3d26580ed485.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.zip -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.zip mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.zip -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.zip mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod mirror://goproxy//gonum.org/v1/plot/@v/v0.0.0-20190515093506-e2840ee46a6b.mod -> gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20160322025152-9bf6e6e569ff.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.1.zip -> google.golang.org%2Fapi%2F@v%2Fv0.15.1.zip mirror://goproxy//google.golang.org/api/@v/v0.15.1-0.20200106000736-b8fc810ca6b5.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.1-0.20200106000736-b8fc810ca6b5.mod mirror://goproxy//google.golang.org/api/@v/v0.15.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/cloud/@v/v0.0.0-20151119220103-975617b05ea8.mod -> google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/grpc/@v/v0.0.0-20160317175043-d3ddb4469d5a.mod -> google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.zip -> go.opencensus.io%2F@v%2Fv0.22.2.zip mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20141024133853-64131543e789.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.zip -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.zip mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.zip -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.zip mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod mirror://goproxy//gopkg.in/mcuadros/go-syslog.v2/@v/v2.2.1.mod -> gopkg.in%2Fmcuadros%2Fgo-syslog.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.zip -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.zip mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.zip -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.zip mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.18.0.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.18.0.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.19.5.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.0.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.0.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.19.5.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.5.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.19.5.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/apiserver/@v/v0.18.0.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/apiserver/@v/v0.19.5.zip -> k8s.io%2Fapiserver%2F@v%2Fv0.19.5.zip mirror://goproxy//k8s.io/apiserver/@v/v0.19.5.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/api/@v/v0.18.0.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/api/@v/v0.18.0.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/api/@v/v0.19.5.zip -> k8s.io%2Fapi%2F@v%2Fv0.19.5.zip mirror://goproxy//k8s.io/api/@v/v0.19.5.mod -> k8s.io%2Fapi%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.0.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.0.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/client-go/@v/v0.19.5.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.19.5.zip mirror://goproxy//k8s.io/client-go/@v/v0.19.5.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.19.5.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/cloud-provider/@v/v0.19.5.mod -> k8s.io%2Fcloud-provider%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/cluster-bootstrap/@v/v0.19.5.mod -> k8s.io%2Fcluster-bootstrap%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/code-generator/@v/v0.18.0.zip -> k8s.io%2Fcode-generator%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/code-generator/@v/v0.18.0.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/code-generator/@v/v0.19.5.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/component-base/@v/v0.18.0.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/component-base/@v/v0.19.5.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/cri-api/@v/v0.19.5.zip -> k8s.io%2Fcri-api%2F@v%2Fv0.19.5.zip mirror://goproxy//k8s.io/cri-api/@v/v0.19.5.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/csi-translation-lib/@v/v0.19.5.mod -> k8s.io%2Fcsi-translation-lib%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190327210449-e17681d19d3a.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190327210449-e17681d19d3a.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20191120174120-e74f70b9b27e.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20191120174120-e74f70b9b27e.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200114144118-36b2048a9120.zip -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.zip mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200114144118-36b2048a9120.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200428234225-8167cfdcfc14.zip -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200428234225-8167cfdcfc14.zip mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200428234225-8167cfdcfc14.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200428234225-8167cfdcfc14.mod mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.zip -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.zip mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.mod -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.zip -> k8s.io%2Fklog%2F@v%2Fv0.3.0.zip mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//k8s.io/kube-aggregator/@v/v0.18.0.mod -> k8s.io%2Fkube-aggregator%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/kube-aggregator/@v/v0.19.5.mod -> k8s.io%2Fkube-aggregator%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kube-controller-manager/@v/v0.19.5.mod -> k8s.io%2Fkube-controller-manager%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kubectl/@v/v0.19.5.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kubelet/@v/v0.19.5.mod -> k8s.io%2Fkubelet%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190502190224-411b2483e503.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190502190224-411b2483e503.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200121204235-bf4fb3bd569c.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200121204235-bf4fb3bd569c.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200805222855-6aeccd4b50c6.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200805222855-6aeccd4b50c6.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200805222855-6aeccd4b50c6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200805222855-6aeccd4b50c6.mod mirror://goproxy//k8s.io/kube-proxy/@v/v0.19.5.mod -> k8s.io%2Fkube-proxy%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.19.5.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.19.5.mod mirror://goproxy//k8s.io/kube-scheduler/@v/v0.19.5.mod -> k8s.io%2Fkube-scheduler%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/legacy-cloud-providers/@v/v0.19.5.mod -> k8s.io%2Flegacy-cloud-providers%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/metrics/@v/v0.19.5.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/sample-apiserver/@v/v0.19.5.mod -> k8s.io%2Fsample-apiserver%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/system-validators/@v/v1.1.2.zip -> k8s.io%2Fsystem-validators%2F@v%2Fv1.1.2.zip mirror://goproxy//k8s.io/system-validators/@v/v1.1.2.mod -> k8s.io%2Fsystem-validators%2F@v%2Fv1.1.2.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190506122338-8fab8cb257d5.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190506122338-8fab8cb257d5.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200414100711-2df71ebbae66.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200414100711-2df71ebbae66.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200729134348-d5654de09c73.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200729134348-d5654de09c73.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.mod mirror://goproxy//modernc.org/cc/@v/v1.0.0.mod -> modernc.org%2Fcc%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/golex/@v/v1.0.0.mod -> modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/mathutil/@v/v1.0.0.mod -> modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/strutil/@v/v1.0.0.mod -> modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/xc/@v/v1.0.0.mod -> modernc.org%2Fxc%2F@v%2Fv1.0.0.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.15.zip -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.zip mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.15.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.7.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.7.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.9.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.9.mod mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.zip -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.mod -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190426204423-ea680f03cc65.zip -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190426204423-ea680f03cc65.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190426204423-ea680f03cc65.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190426204423-ea680f03cc65.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.1.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.1.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.1.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.3.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.3.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.3.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.3.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//vbom.ml/util/@v/v0.0.0-20160121211510-db5cfe13f5cc.zip -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.zip mirror://goproxy//vbom.ml/util/@v/v0.0.0-20160121211510-db5cfe13f5cc.mod -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod https://charts.helm.sh/stable/packages/traefik-1.81.0.tgz https://github.com/rancher/plugins/archive/refs/tags/v0.8.6-k3s1.tar.gz -> k3s-cni-plugins-0.8.6.tar.gz amd64? ( https://github.com/rancher/k3s-root/releases/download/v0.6.0-rc3/k3s-root-amd64.tar -> k3s-root-amd64-0.6.0-rc3.tar )
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e464037c0eef88c2687ca91ac0d1d9d8
diff --git a/metadata/md5-cache/sys-cluster/k3s-1.19.15 b/metadata/md5-cache/sys-cluster/k3s-1.19.15
new file mode 100644
index 000000000000..dd2a7f02f690
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/k3s-1.19.15
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare setup unpack
+DEPEND=net-firewall/conntrack-tools rootless? ( app-emulation/slirp4netns )
+DESCRIPTION=Lightweight Kubernetes
+EAPI=7
+HOMEPAGE=https://k3s.io
+IUSE=+kubectl-symlink rootless kernel_linux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=kubectl-symlink? ( !sys-cluster/kubectl )
+REQUIRED_USE=|| ( amd64 )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/k3s-io/k3s/archive/refs/tags/v1.19.15+k3s1.tar.gz -> k3s-1.19.15.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//bitbucket.org/bertimus9/systemstat/@v/v0.0.0-20180207000608-0eeff89b0690.mod -> bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.2.1+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v43.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv43.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v43.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv43.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.8.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.6.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.6.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.6.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.6.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20200415212048-7901bc822317.zip -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20200415212048-7901bc822317.zip mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20200415212048-7901bc822317.mod -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20200415212048-7901bc822317.mod mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.zip -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.zip mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.mod -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210211115548-6eac466e5fa3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210324224401-5516f17a5958.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210324224401-5516f17a5958.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.19.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.19.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.19.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.19.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.16.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.16.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.16.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.16.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.20.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.20.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.20.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.20.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20201218223536-d3e5debf77da.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20201218223536-d3e5debf77da.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20210227013316-43a75bb4edd3.zip -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20210227013316-43a75bb4edd3.zip mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20210227013316-43a75bb4edd3.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20210227013316-43a75bb4edd3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.zip -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.mod -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.mod -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ajstarks/svgo/@v/v0.0.0-20180226025133-644b8db467af.mod -> github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.mod -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod mirror://goproxy//github.com/andreyvit/diff/@v/v0.0.0-20170406064948-c7f18ee00883.mod -> github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/auth0/go-jwt-middleware/@v/v0.0.0-20170425171159-5493cabe49f7.mod -> github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.6.10.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.6.10.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.12.54.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.12.54.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.28.2.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.28.2.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.28.2.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.28.2.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20160804104726-4c0e84591b9a.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bifurcation/mint/@v/v0.0.0-20180715133206-93c51c6ce115.mod -> github.com%2Fbifurcation%2Fmint%2F@v%2Fv0.0.0-20180715133206-93c51c6ce115.mod mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.mod -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20171013065002-4d72634a2f11.mod -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20171013065002-4d72634a2f11.mod mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20190828090544-27d02f80ba40.zip -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20190828090544-27d02f80ba40.zip mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20190828090544-27d02f80ba40.mod -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20190828090544-27d02f80ba40.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v0.4.1.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.mod mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.mod -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.mod -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.mod -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod mirror://goproxy//github.com/caddyserver/caddy/@v/v1.0.3.mod -> github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/canonical/go-dqlite/@v/v1.5.1.zip -> github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/canonical/go-dqlite/@v/v1.5.1.mod -> github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.1.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.1.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.zip -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.zip mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.1.0.zip -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.1.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v5/@v/v5.0.0.zip -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.zip mirror://goproxy//github.com/checkpoint-restore/go-criu/v5/@v/v5.0.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.mod mirror://goproxy//github.com/cheekybits/genny/@v/v0.0.0-20170328200008-9127e812e1e9.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv0.0.0-20170328200008-9127e812e1e9.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.29.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200601085316-9f1617e5c574.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200601085316-9f1617e5c574.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200702112145-1c8d4c9ef775.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.2.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.4.0.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.4.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.5.0.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.5.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/clusterhq/flocker-go/@v/v0.0.0-20160920122132-2b8b7259d313.mod -> github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codegangsta/negroni/@v/v1.0.0.mod -> github.com%2Fcodegangsta%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20200908144142-dab0cbea06f4.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20200908144142-dab0cbea06f4.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20201003224125-76a6863f2989.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20201003224125-76a6863f2989.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20210316121734-20793ff83c97.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20210316121734-20793ff83c97.mod mirror://goproxy//github.com/containerd/aufs/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/aufs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20201111183144-404b9149801e.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20210316141732-918d888fb676.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20210316141732-918d888fb676.mod mirror://goproxy//github.com/containerd/btrfs/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/btrfs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190717030353-c4b9ac5c7601.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190717030353-c4b9ac5c7601.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200710171044-318312a37340.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200824123100-0b889c03f102.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200824123100-0b889c03f102.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20210114181951-8a68de567b68.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20210114181951-8a68de567b68.mod mirror://goproxy//github.com/containerd/cgroups/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/cgroups/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20181022165439-0650fd9eeb50.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20181022165439-0650fd9eeb50.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191206165004-02ecf6a7291e.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/console/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.2.10.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.2.10.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.1-0.20191213020239-082f7e3aed57.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.0-beta.2.0.20200729163537-40b22ef07410.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.0-beta.2.0.20200729163537-40b22ef07410.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.4.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.4.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20180307165137-3d5202aec260.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20180307165137-3d5202aec260.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20200410184934-f15a3290365b.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20201026212402-0724c46b320c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20201026212402-0724c46b320c.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20210316144830-115abcc95a1d.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20210316144830-115abcc95a1d.mod mirror://goproxy//github.com/containerd/fifo/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/fifo/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20190911050354-e029b79d8cda.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20190911050354-e029b79d8cda.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20201020171139-16b287bc67d0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20201020171139-16b287bc67d0.mod mirror://goproxy//github.com/containerd/go-runc/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/go-runc/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.4-0.20210301171431-0ae5c75f59ba.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.4-0.20210301171431-0ae5c75f59ba.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1.zip -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1-0.20210312161619-7ed62a527887.zip -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1-0.20210312161619-7ed62a527887.zip mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1-0.20210312161619-7ed62a527887.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1-0.20210312161619-7ed62a527887.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/containerd/nri/@v/v0.0.0-20201007170849-eb1350a75164.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20201007170849-eb1350a75164.mod mirror://goproxy//github.com/containerd/nri/@v/v0.0.0-20210316161719-dbaa18c31c14.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20210316161719-dbaa18c31c14.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828172938-92c8520ef9f8.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828172938-92c8520ef9f8.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20191028202541-4f1b8fe65a5c.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20191028202541-4f1b8fe65a5c.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20190911142611-5eb25027c9fd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190911142611-5eb25027c9fd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20200918131355-0a33824f23a2.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20200918131355-0a33824f23a2.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20210301145711-11e8f1707f62.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210301145711-11e8f1707f62.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20210315114300-dde8f0fda960.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210315114300-dde8f0fda960.mod mirror://goproxy//github.com/containerd/zfs/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/zfs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.1.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.zip -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.zip mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.9.1.zip -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/containernetworking/plugins/@v/v0.9.1.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.0.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.0.zip -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.0.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.1.zip -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.2.0.zip -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.2.0.mod -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.10.mod -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.1.11+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.1.11+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.0.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.5.0.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.5.0.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20161114122254-48702e0da86b.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20161114122254-48702e0da86b.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.1.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.1.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.mod -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.mod -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.mod -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.mod -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.zip -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.zip mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170629053852-f6cab0c35083.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170629053852-f6cab0c35083.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20190125010748-a747050bb1ba.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20170104182250-a601269ab70c.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20190905152932-14b96e55d84c.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20190905152932-14b96e55d84c.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20170721190031-9461782956ad.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20170721190031-9461782956ad.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.zip -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.zip mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.0-20180209012529-399ea8c73916.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.zip -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/erikdubbelboer/gspt/@v/v0.0.0-20190125194910-e68493906b83.zip -> github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.zip mirror://goproxy//github.com/erikdubbelboer/gspt/@v/v0.0.0-20190125194910-e68493906b83.mod -> github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.mod mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.zip -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.mod -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.zip -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.mod -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.zip -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fogleman/gg/@v/v1.2.1-0.20190220221249-0403632d5b90.mod -> github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/fullsailor/pkcs7/@v/v0.0.0-20190404230743-d7302db945fa.mod -> github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.mod mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20151105175453-c7fdd8b5cd55.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20151105175453-c7fdd8b5cd55.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.2.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.zip -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golangplus/bytes/@v/v0.0.0-20160111154220-45c989fe5450.zip -> github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.zip mirror://goproxy//github.com/golangplus/bytes/@v/v0.0.0-20160111154220-45c989fe5450.mod -> github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod mirror://goproxy//github.com/golangplus/fmt/@v/v0.0.0-20150411045040-2a5d6d7d2995.zip -> github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.zip mirror://goproxy//github.com/golangplus/fmt/@v/v0.0.0-20150411045040-2a5d6d7d2995.mod -> github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.mod mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.zip -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.zip mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.mod mirror://goproxy//github.com/golang/freetype/@v/v0.0.0-20170609003504-e2365dfdc4a0.mod -> github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170426233943-68f4ded48ba9.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170426233943-68f4ded48ba9.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/cadvisor/@v/v0.37.5.zip -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.37.5.zip mirror://goproxy//github.com/google/cadvisor/@v/v0.37.5.mod -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.37.5.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-containerregistry/@v/v0.0.0-20190617215043-876b8855d23c.mod -> github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.0.0-20190617215043-876b8855d23c.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/handlers/@v/v0.0.0-20150720190736-60c7bfde3e33.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.4.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.4.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.4.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.4.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-acme/lego/@v/v2.5.0+incompatible.mod -> github.com%2Fgo-acme%2Flego%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.1+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.2+incompatible.zip -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.zip mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.2+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.9.0.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.28.1.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.28.1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.0.0-20180825180245-b006789cd277.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.zip -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.zip mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.zip -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.zip mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.0.0-20180920151709-4f900dc2ade9.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.zip -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.zip mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-ozzo/ozzo-validation/@v/v3.5.0+incompatible.mod -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.0.0-20180201235237-0fb14efe8c47.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.0.0-20180201235237-0fb14efe8c47.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/heketi/heketi/@v/v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod -> github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.mod -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.10.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.10.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/insomniacslk/dhcp/@v/v0.0.0-20200420235442-ed3125c2efe7.mod -> github.com%2Finsomniacslk%2Fdhcp%2F@v%2Fv0.0.0-20200420235442-ed3125c2efe7.mod mirror://goproxy//github.com/ishidawataru/sctp/@v/v0.0.0-20190723014705-7c296d48a2b5.mod -> github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20190723014705-7c296d48a2b5.mod mirror://goproxy//github.com/jamescun/tuntap/@v/v0.0.0-20190712092105-cb1fb277045c.mod -> github.com%2Fjamescun%2Ftuntap%2F@v%2Fv0.0.0-20190712092105-cb1fb277045c.mod mirror://goproxy//github.com/jetstack/cert-manager/@v/v0.7.2.mod -> github.com%2Fjetstack%2Fcert-manager%2F@v%2Fv0.7.2.mod mirror://goproxy//github.com/jimstudt/http-authentication/@v/v0.0.0-20140401203705-3eca13d6893a.mod -> github.com%2Fjimstudt%2Fhttp-authentication%2F@v%2Fv0.0.0-20140401203705-3eca13d6893a.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/joho/godotenv/@v/v0.0.0-20161216230537-726cc8b906e3.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv0.0.0-20161216230537-726cc8b906e3.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jung-kurt/gofpdf/@v/v1.0.3-0.20190309125859-24315acbbda5.mod -> github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.mod -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.mod mirror://goproxy//github.com/k3s-io/containerd/@v/v1.4.9-k3s1.zip -> github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.4.9-k3s1.zip mirror://goproxy//github.com/k3s-io/containerd/@v/v1.4.9-k3s1.mod -> github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.4.9-k3s1.mod mirror://goproxy//github.com/k3s-io/continuity/@v/v0.0.0-20210309170710-f93269e0d5c1.zip -> github.com%2Fk3s-io%2Fcontinuity%2F@v%2Fv0.0.0-20210309170710-f93269e0d5c1.zip mirror://goproxy//github.com/k3s-io/continuity/@v/v0.0.0-20210309170710-f93269e0d5c1.mod -> github.com%2Fk3s-io%2Fcontinuity%2F@v%2Fv0.0.0-20210309170710-f93269e0d5c1.mod mirror://goproxy//github.com/k3s-io/cri/@v/v1.4.0-k3s.7.zip -> github.com%2Fk3s-io%2Fcri%2F@v%2Fv1.4.0-k3s.7.zip mirror://goproxy//github.com/k3s-io/cri/@v/v1.4.0-k3s.7.mod -> github.com%2Fk3s-io%2Fcri%2F@v%2Fv1.4.0-k3s.7.mod mirror://goproxy//github.com/k3s-io/etcd/@v/v0.5.0-alpha.5.0.20201208200253-50621aee4aea.zip -> github.com%2Fk3s-io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20201208200253-50621aee4aea.zip mirror://goproxy//github.com/k3s-io/etcd/@v/v0.5.0-alpha.5.0.20201208200253-50621aee4aea.mod -> github.com%2Fk3s-io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20201208200253-50621aee4aea.mod mirror://goproxy//github.com/k3s-io/helm-controller/@v/v0.10.5.zip -> github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.10.5.zip mirror://goproxy//github.com/k3s-io/helm-controller/@v/v0.10.5.mod -> github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.10.5.mod mirror://goproxy//github.com/k3s-io/kine/@v/v0.6.2.zip -> github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.6.2.zip mirror://goproxy//github.com/k3s-io/kine/@v/v0.6.2.mod -> github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.6.2.mod mirror://goproxy//github.com/k3s-io/kubernetes/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/api/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/api/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/@v/v1.19.15-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.19.15-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver/@v/v1.19.15-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv1.19.15-k3s1.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.7.5.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.7.5.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.7.5.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.7.5.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.3.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/knative/build/@v/v0.6.0.mod -> github.com%2Fknative%2Fbuild%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/knative/pkg/@v/v0.0.0-20190514205332-5e4512dcb2ca.mod -> github.com%2Fknative%2Fpkg%2F@v%2Fv0.0.0-20190514205332-5e4512dcb2ca.mod mirror://goproxy//github.com/knative/serving/@v/v0.6.1.mod -> github.com%2Fknative%2Fserving%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.mod -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.8.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.8.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.zip -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.mod -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.zip -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.mod -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lpabon/godbc/@v/v0.1.1.mod -> github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/lucas-clemente/aes12/@v/v0.0.0-20171027163421-cd47fb39b79f.mod -> github.com%2Flucas-clemente%2Faes12%2F@v%2Fv0.0.0-20171027163421-cd47fb39b79f.mod mirror://goproxy//github.com/lucas-clemente/quic-clients/@v/v0.1.0.mod -> github.com%2Flucas-clemente%2Fquic-clients%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.10.2.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/lucas-clemente/quic-go-certificates/@v/v0.0.0-20160823095156-d2f86524cced.mod -> github.com%2Flucas-clemente%2Fquic-go-certificates%2F@v%2Fv0.0.0-20160823095156-d2f86524cced.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/marstr/guid/@v/v1.1.0.mod -> github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.2.3.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/mattbaird/jsonpatch/@v/v0.0.0-20171005235357-81af80346b1a.mod -> github.com%2Fmattbaird%2Fjsonpatch%2F@v%2Fv0.0.0-20171005235357-81af80346b1a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.4.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.4.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.4.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/mholt/certmagic/@v/v0.6.2-0.20190624175158-6a42ef9fe8c2.mod -> github.com%2Fmholt%2Fcertmagic%2F@v%2Fv0.6.2-0.20190624175158-6a42ef9fe8c2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.3.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.zip -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.mod -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.zip -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.zip mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.mod -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.mod mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.zip -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.mod -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.7.zip -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.zip mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.7.mod -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/minio/sio/@v/v0.2.1.mod -> github.com%2Fminio%2Fsio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.zip -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.zip mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.mod -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.zip -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.mod -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.1.3.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.1.3.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.0.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/moby/sys/symlink/@v/v0.1.0.mod -> github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.mod mirror://goproxy//github.com/moby/vpnkit/@v/v0.4.0.mod -> github.com%2Fmoby%2Fvpnkit%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170603005431-491d3605edfb.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20200520151820-abd8a0e76976.zip -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20200520151820-abd8a0e76976.zip mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20200520151820-abd8a0e76976.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20200520151820-abd8a0e76976.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.zip -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.zip -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.zip mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod mirror://goproxy//github.com/mvdan/xurls/@v/v1.1.0.mod -> github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.zip -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.mod -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/naoina/toml/@v/v0.1.1.mod -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/natefinch/lumberjack/@v/v2.0.0+incompatible.zip -> github.com%2Fnatefinch%2Flumberjack%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/natefinch/lumberjack/@v/v2.0.0+incompatible.mod -> github.com%2Fnatefinch%2Flumberjack%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20151202141238-7f8ab55aaf3b.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20151007035656-2152b45fa28a.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20170106003457-a6d0ee40d420.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc92.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc92.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc92.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc92.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc94.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc94.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc94.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc94.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2-0.20190207185410-29686dbc5559.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20190207185410-29686dbc5559.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200728170252-4d89ac9fbff6.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200728170252-4d89ac9fbff6.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200728170252-4d89ac9fbff6.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200728170252-4d89ac9fbff6.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200929063507-e6143ca7d51d.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210326190908-1c3f411f0417.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210326190908-1c3f411f0417.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.5.2.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.6.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.0.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.1.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.0.0-20180209125602-c332b6f63c06.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20171117100541-99fa1f4be8e5.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180110214958-89604d197083.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/quobyte/api/@v/v0.1.2.mod -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/rakelkar/gonetsh/@v/v0.0.0-20190930180311-e5c5ffe4bdf0.zip -> github.com%2Frakelkar%2Fgonetsh%2F@v%2Fv0.0.0-20190930180311-e5c5ffe4bdf0.zip mirror://goproxy//github.com/rakelkar/gonetsh/@v/v0.0.0-20190930180311-e5c5ffe4bdf0.mod -> github.com%2Frakelkar%2Fgonetsh%2F@v%2Fv0.0.0-20190930180311-e5c5ffe4bdf0.mod mirror://goproxy//github.com/rancher/cri-tools/@v/v1.19.0-k3s1.zip -> github.com%2Francher%2Fcri-tools%2F@v%2Fv1.19.0-k3s1.zip mirror://goproxy//github.com/rancher/cri-tools/@v/v1.19.0-k3s1.mod -> github.com%2Francher%2Fcri-tools%2F@v%2Fv1.19.0-k3s1.mod mirror://goproxy//github.com/rancher/dynamiclistener/@v/v0.2.2.zip -> github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/rancher/dynamiclistener/@v/v0.2.2.mod -> github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/rancher/flannel/@v/v0.12.0-k3s1.zip -> github.com%2Francher%2Fflannel%2F@v%2Fv0.12.0-k3s1.zip mirror://goproxy//github.com/rancher/flannel/@v/v0.12.0-k3s1.mod -> github.com%2Francher%2Fflannel%2F@v%2Fv0.12.0-k3s1.mod mirror://goproxy//github.com/rancher/go-powershell/@v/v0.0.0-20200701182037-6845e6fcfa79.zip -> github.com%2Francher%2Fgo-powershell%2F@v%2Fv0.0.0-20200701182037-6845e6fcfa79.zip mirror://goproxy//github.com/rancher/go-powershell/@v/v0.0.0-20200701182037-6845e6fcfa79.mod -> github.com%2Francher%2Fgo-powershell%2F@v%2Fv0.0.0-20200701182037-6845e6fcfa79.mod mirror://goproxy//github.com/rancher/go-powershell/@v/v0.0.0-20200701184732-233247d45373.zip -> github.com%2Francher%2Fgo-powershell%2F@v%2Fv0.0.0-20200701184732-233247d45373.zip mirror://goproxy//github.com/rancher/go-powershell/@v/v0.0.0-20200701184732-233247d45373.mod -> github.com%2Francher%2Fgo-powershell%2F@v%2Fv0.0.0-20200701184732-233247d45373.mod mirror://goproxy//github.com/rancher/moq/@v/v0.0.0-20190404221404-ee5226d43009.mod -> github.com%2Francher%2Fmoq%2F@v%2Fv0.0.0-20190404221404-ee5226d43009.mod mirror://goproxy//github.com/rancher/remotedialer/@v/v0.2.0.zip -> github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rancher/remotedialer/@v/v0.2.0.mod -> github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.1.4.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.4.0.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.0.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.1.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.2.zip -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.2.zip mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.2.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.2.mod mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.2.0.mod -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.6.0.zip -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.6.0.mod -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/remyoudompheng/bigfft/@v/v0.0.0-20170806203942-52369c62f446.mod -> github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.zip -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.mod -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/robfig/cron/v3/@v/v3.0.1.zip -> github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/robfig/cron/v3/@v/v3.0.1.mod -> github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.10.0.zip -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.10.0.mod -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.zip -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.zip -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.zip mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.mod -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.mod mirror://goproxy//github.com/russross/blackfriday/@v/v0.0.0-20170610170232-067529f716f4.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv0.0.0-20170610170232-067529f716f4.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.zip -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stefanberger/go-pkcs11uri/@v/v0.0.0-20201008174630-78d3cae3a980.zip -> github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.zip mirror://goproxy//github.com/stefanberger/go-pkcs11uri/@v/v0.0.0-20201008174630-78d3cae3a980.mod -> github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.mod mirror://goproxy//github.com/storageos/go-api/@v/v0.0.0-20180912212459-343b3eff91fc.mod -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv0.0.0-20180912212459-343b3eff91fc.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.0.0-20180129172003-8a3f7159479f.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.0.0-20180129172003-8a3f7159479f.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20180303142811-b89eecf5ca5d.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20180303142811-b89eecf5ca5d.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.zip mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.zip mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.zip -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.zip mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.3.0+incompatible.zip -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.zip mirror://goproxy//github.com/tchap/go-patricia/@v/v2.3.0+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.mod mirror://goproxy//github.com/tektoncd/pipeline/@v/v0.4.0.mod -> github.com%2Ftektoncd%2Fpipeline%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/thecodeteam/goscaleio/@v/v0.1.0.mod -> github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.zip -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/ugorji/go/@v/v0.0.0-20170107133203-ded73eae5db7.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20170107133203-ded73eae5db7.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.21.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.21.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.mod -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/u-root/u-root/@v/v6.0.0+incompatible.mod -> github.com%2Fu-root%2Fu-root%2F@v%2Fv6.0.0+incompatible.mod mirror://goproxy//github.com/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20170220200719-fe3b5664d23a.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20170220200719-fe3b5664d23a.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20181108222139-023a6dafdcdf.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.1-0.20201029203352-d40f9887b852.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.1-0.20201029203352-d40f9887b852.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.1-0.20201029203352-d40f9887b852.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.1-0.20201029203352-d40f9887b852.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20170219233438-54f0e4339ce7.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20170219233438-54f0e4339ce7.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200520041808-52d707b772fe.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200520041808-52d707b772fe.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11.zip -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/willf/bitset/@v/v1.1.11-0.20200630133818-d5bec3311243.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/handysort/@v/v0.0.0-20150421192137-fb3537ed64a1.zip -> github.com%2Fxlab%2Fhandysort%2F@v%2Fv0.0.0-20150421192137-fb3537ed64a1.zip mirror://goproxy//github.com/xlab/handysort/@v/v0.0.0-20150421192137-fb3537ed64a1.mod -> github.com%2Fxlab%2Fhandysort%2F@v%2Fv0.0.0-20150421192137-fb3537ed64a1.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.mod -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.mod -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.mod -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181009213950-7c1a557ab941.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180321215751-8460e604b9de.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180807140117-3d87b88a115f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190312203227-4b39c73a6495.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20180708004352-c73c2afc3b81.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210224082022-3d97a244fca7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210224082022-3d97a244fca7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210224082022-3d97a244fca7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210224082022-3d97a244fca7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190522044717-8097e1b27ff5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190522044717-8097e1b27ff5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190602015325-4c4f7f33c9ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190812073006-9eafafc0a87e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190812073006-9eafafc0a87e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191115151921-52ab43148777.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200622214017-ed371f2e16b4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200622214017-ed371f2e16b4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200817155316-9781c653f443.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200817155316-9781c653f443.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200909081042-eff7692f9009.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200916030750-2334cc1a136f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916030750-2334cc1a136f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200922070232-aee5d888a860.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200922070232-aee5d888a860.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201202213521-69691e467435.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201202213521-69691e467435.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210225134936-a50acf3fe073.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210225134936-a50acf3fe073.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210225134936-a50acf3fe073.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210225134936-a50acf3fe073.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210324051608-47abb6519492.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426230700-d19ff857e887.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426230700-d19ff857e887.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190920225731-5eefd052ad72.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191017205301-920acffc3e65.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191017205301-920acffc3e65.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20180816165407-929014505bf4.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20190331200053-3d26580ed485.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.zip -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.zip mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.zip -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.zip mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod mirror://goproxy//gonum.org/v1/plot/@v/v0.0.0-20190515093506-e2840ee46a6b.mod -> gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20160322025152-9bf6e6e569ff.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.1.zip -> google.golang.org%2Fapi%2F@v%2Fv0.15.1.zip mirror://goproxy//google.golang.org/api/@v/v0.15.1-0.20200106000736-b8fc810ca6b5.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.1-0.20200106000736-b8fc810ca6b5.mod mirror://goproxy//google.golang.org/api/@v/v0.15.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/cloud/@v/v0.0.0-20151119220103-975617b05ea8.mod -> google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/grpc/@v/v0.0.0-20160317175043-d3ddb4469d5a.mod -> google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.zip mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20141024133853-64131543e789.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.zip -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.zip mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod mirror://goproxy//gopkg.in/mcuadros/go-syslog.v2/@v/v2.2.1.mod -> gopkg.in%2Fmcuadros%2Fgo-syslog.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.zip -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.zip mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.zip -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.zip mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.zip -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.zip mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.zip -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.zip mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.mod -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.19.10.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.10.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.19.10.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/apiserver/@v/v0.19.10.zip -> k8s.io%2Fapiserver%2F@v%2Fv0.19.10.zip mirror://goproxy//k8s.io/apiserver/@v/v0.19.10.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/api/@v/v0.19.10.zip -> k8s.io%2Fapi%2F@v%2Fv0.19.10.zip mirror://goproxy//k8s.io/api/@v/v0.19.10.mod -> k8s.io%2Fapi%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/client-go/@v/v0.19.10.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.19.10.zip mirror://goproxy//k8s.io/client-go/@v/v0.19.10.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/component-base/@v/v0.19.10.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/cri-api/@v/v0.19.10.zip -> k8s.io%2Fcri-api%2F@v%2Fv0.19.10.zip mirror://goproxy//k8s.io/cri-api/@v/v0.19.10.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190327210449-e17681d19d3a.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190327210449-e17681d19d3a.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20191120174120-e74f70b9b27e.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20191120174120-e74f70b9b27e.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200114144118-36b2048a9120.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200428234225-8167cfdcfc14.zip -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200428234225-8167cfdcfc14.zip mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200428234225-8167cfdcfc14.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200428234225-8167cfdcfc14.mod mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.zip -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.zip mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.mod -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190502190224-411b2483e503.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190502190224-411b2483e503.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200805222855-6aeccd4b50c6.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200805222855-6aeccd4b50c6.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200805222855-6aeccd4b50c6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200805222855-6aeccd4b50c6.mod mirror://goproxy//k8s.io/system-validators/@v/v1.1.2.mod -> k8s.io%2Fsystem-validators%2F@v%2Fv1.1.2.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190506122338-8fab8cb257d5.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190506122338-8fab8cb257d5.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200414100711-2df71ebbae66.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200414100711-2df71ebbae66.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200729134348-d5654de09c73.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200729134348-d5654de09c73.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//modernc.org/cc/@v/v1.0.0.mod -> modernc.org%2Fcc%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/golex/@v/v1.0.0.mod -> modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/mathutil/@v/v1.0.0.mod -> modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/strutil/@v/v1.0.0.mod -> modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/xc/@v/v1.0.0.mod -> modernc.org%2Fxc%2F@v%2Fv1.0.0.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.15.zip -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.zip mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.15.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.mod mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.zip -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.mod -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190426204423-ea680f03cc65.zip -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190426204423-ea680f03cc65.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190426204423-ea680f03cc65.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190426204423-ea680f03cc65.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.1.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.3.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.3.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.3.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.3.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.2.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.2.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.2.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//vbom.ml/util/@v/v0.0.0-20160121211510-db5cfe13f5cc.zip -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.zip mirror://goproxy//vbom.ml/util/@v/v0.0.0-20160121211510-db5cfe13f5cc.mod -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod https://github.com/opencontainers/runc/archive/refs/tags/v1.0.0-rc95.tar.gz -> k3s-runc-v1.0.0-rc95.tar.gz https://charts.helm.sh/stable/packages/traefik-1.81.0.tgz https://github.com/rancher/plugins/archive/refs/tags/v0.9.1-k3s1.tar.gz -> k3s-cni-plugins-0.9.1.tar.gz amd64? ( https://github.com/rancher/k3s-root/releases/download/v0.9.1/k3s-root-amd64.tar -> k3s-root-amd64-0.9.1.tar )
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=10c1b1f3907827325f6f41de48883aca
diff --git a/metadata/md5-cache/sys-cluster/k3s-1.20.11 b/metadata/md5-cache/sys-cluster/k3s-1.20.11
new file mode 100644
index 000000000000..654af46bb7ae
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/k3s-1.20.11
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare setup unpack
+DEPEND=net-firewall/conntrack-tools rootless? ( app-emulation/slirp4netns )
+DESCRIPTION=Lightweight Kubernetes
+EAPI=7
+HOMEPAGE=https://k3s.io
+IUSE=+kubectl-symlink rootless kernel_linux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=kubectl-symlink? ( !sys-cluster/kubectl )
+REQUIRED_USE=|| ( amd64 )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/k3s-io/k3s/archive/refs/tags/v1.20.11+k3s1.tar.gz -> k3s-1.20.11.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//bitbucket.org/bertimus9/systemstat/@v/v0.0.0-20180207000608-0eeff89b0690.mod -> bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!akihiro!suda/containerd-fuse-overlayfs/@v/v1.0.0.zip -> github.com%2F!akihiro!suda%2Fcontainerd-fuse-overlayfs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/!akihiro!suda/containerd-fuse-overlayfs/@v/v1.0.0.mod -> github.com%2F!akihiro!suda%2Fcontainerd-fuse-overlayfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.2.1+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v43.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv43.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v43.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv43.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.8.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.6.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.6.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20200415212048-7901bc822317.zip -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20200415212048-7901bc822317.zip mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20200415212048-7901bc822317.mod -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20200415212048-7901bc822317.mod mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.zip -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.zip mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.mod -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210211115548-6eac466e5fa3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210324224401-5516f17a5958.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210324224401-5516f17a5958.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.19.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.19.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.19.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.19.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.16.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.16.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.16.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.16.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.20.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.20.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.20.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.20.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20201218223536-d3e5debf77da.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20201218223536-d3e5debf77da.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20210227013316-43a75bb4edd3.zip -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20210227013316-43a75bb4edd3.zip mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20210227013316-43a75bb4edd3.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20210227013316-43a75bb4edd3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.zip -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.mod -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.mod -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ajstarks/svgo/@v/v0.0.0-20180226025133-644b8db467af.mod -> github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.mod -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod mirror://goproxy//github.com/andreyvit/diff/@v/v0.0.0-20170406064948-c7f18ee00883.mod -> github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/auth0/go-jwt-middleware/@v/v0.0.0-20170425171159-5493cabe49f7.mod -> github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.12.54.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.12.54.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.35.24.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.24.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.35.24.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.24.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20160804104726-4c0e84591b9a.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bifurcation/mint/@v/v0.0.0-20180715133206-93c51c6ce115.mod -> github.com%2Fbifurcation%2Fmint%2F@v%2Fv0.0.0-20180715133206-93c51c6ce115.mod mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.mod -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20171013065002-4d72634a2f11.mod -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20171013065002-4d72634a2f11.mod mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20190828090544-27d02f80ba40.zip -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20190828090544-27d02f80ba40.zip mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20190828090544-27d02f80ba40.mod -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20190828090544-27d02f80ba40.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v0.4.1.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.mod mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.mod -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.mod -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.mod -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod mirror://goproxy//github.com/caddyserver/caddy/@v/v1.0.3.mod -> github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/canonical/go-dqlite/@v/v1.5.1.zip -> github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/canonical/go-dqlite/@v/v1.5.1.mod -> github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.1.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.1.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.zip -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.zip mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.1.0.zip -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.1.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v5/@v/v5.0.0.zip -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.zip mirror://goproxy//github.com/checkpoint-restore/go-criu/v5/@v/v5.0.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.mod mirror://goproxy//github.com/cheekybits/genny/@v/v0.0.0-20170328200008-9127e812e1e9.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv0.0.0-20170328200008-9127e812e1e9.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.29.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200702112145-1c8d4c9ef775.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.2.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.4.0.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.4.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.5.0.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.5.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/clusterhq/flocker-go/@v/v0.0.0-20160920122132-2b8b7259d313.mod -> github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codegangsta/negroni/@v/v1.0.0.mod -> github.com%2Fcodegangsta%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20200908144142-dab0cbea06f4.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20200908144142-dab0cbea06f4.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20201003224125-76a6863f2989.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20201003224125-76a6863f2989.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20210316121734-20793ff83c97.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20210316121734-20793ff83c97.mod mirror://goproxy//github.com/containerd/aufs/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/aufs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20201111183144-404b9149801e.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20210316141732-918d888fb676.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20210316141732-918d888fb676.mod mirror://goproxy//github.com/containerd/btrfs/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/btrfs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190717030353-c4b9ac5c7601.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190717030353-c4b9ac5c7601.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200710171044-318312a37340.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200824123100-0b889c03f102.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200824123100-0b889c03f102.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20210114181951-8a68de567b68.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20210114181951-8a68de567b68.mod mirror://goproxy//github.com/containerd/cgroups/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/cgroups/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20181022165439-0650fd9eeb50.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20181022165439-0650fd9eeb50.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191206165004-02ecf6a7291e.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/console/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.2.10.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.2.10.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.1-0.20191213020239-082f7e3aed57.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.0-beta.2.0.20200729163537-40b22ef07410.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.0-beta.2.0.20200729163537-40b22ef07410.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.4.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.4.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20180307165137-3d5202aec260.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20180307165137-3d5202aec260.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20200410184934-f15a3290365b.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20201026212402-0724c46b320c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20201026212402-0724c46b320c.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20210316144830-115abcc95a1d.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20210316144830-115abcc95a1d.mod mirror://goproxy//github.com/containerd/fifo/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/fifo/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20190911050354-e029b79d8cda.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20190911050354-e029b79d8cda.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20201020171139-16b287bc67d0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20201020171139-16b287bc67d0.mod mirror://goproxy//github.com/containerd/go-runc/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/go-runc/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.4-0.20210301171431-0ae5c75f59ba.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.4-0.20210301171431-0ae5c75f59ba.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1.zip -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1-0.20210312161619-7ed62a527887.zip -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1-0.20210312161619-7ed62a527887.zip mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1-0.20210312161619-7ed62a527887.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1-0.20210312161619-7ed62a527887.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/containerd/nri/@v/v0.0.0-20201007170849-eb1350a75164.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20201007170849-eb1350a75164.mod mirror://goproxy//github.com/containerd/nri/@v/v0.0.0-20210316161719-dbaa18c31c14.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20210316161719-dbaa18c31c14.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828172938-92c8520ef9f8.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828172938-92c8520ef9f8.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20191028202541-4f1b8fe65a5c.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20191028202541-4f1b8fe65a5c.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20190911142611-5eb25027c9fd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190911142611-5eb25027c9fd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20200918131355-0a33824f23a2.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20200918131355-0a33824f23a2.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20210301145711-11e8f1707f62.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210301145711-11e8f1707f62.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20210315114300-dde8f0fda960.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210315114300-dde8f0fda960.mod mirror://goproxy//github.com/containerd/zfs/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/zfs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.1.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.zip -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.zip mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.9.1.zip -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/containernetworking/plugins/@v/v0.9.1.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.0.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.0.zip -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.0.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.1.zip -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.2.0.zip -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.2.0.mod -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.10.mod -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.1.11+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.1.11+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.0.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.5.0.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.5.0.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20161114122254-48702e0da86b.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20161114122254-48702e0da86b.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.1.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.1.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.mod -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.mod -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.mod -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.mod -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.zip -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.zip mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170629053852-f6cab0c35083.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170629053852-f6cab0c35083.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20190125010748-a747050bb1ba.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20170104182250-a601269ab70c.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20190905152932-14b96e55d84c.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20190905152932-14b96e55d84c.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20170721190031-9461782956ad.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20170721190031-9461782956ad.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.zip -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.zip mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.0-20180209012529-399ea8c73916.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.zip -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/erikdubbelboer/gspt/@v/v0.0.0-20190125194910-e68493906b83.zip -> github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.zip mirror://goproxy//github.com/erikdubbelboer/gspt/@v/v0.0.0-20190125194910-e68493906b83.mod -> github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.mod mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.zip -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.mod -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.zip -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.mod -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.zip -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fogleman/gg/@v/v1.2.1-0.20190220221249-0403632d5b90.mod -> github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/fullsailor/pkcs7/@v/v0.0.0-20190404230743-d7302db945fa.mod -> github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.mod mirror://goproxy//github.com/fvbommel/sortorder/@v/v1.0.1.zip -> github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/fvbommel/sortorder/@v/v1.0.1.mod -> github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20151105175453-c7fdd8b5cd55.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20151105175453-c7fdd8b5cd55.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.2.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.zip -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golangplus/bytes/@v/v0.0.0-20160111154220-45c989fe5450.zip -> github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.zip mirror://goproxy//github.com/golangplus/bytes/@v/v0.0.0-20160111154220-45c989fe5450.mod -> github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod mirror://goproxy//github.com/golangplus/fmt/@v/v0.0.0-20150411045040-2a5d6d7d2995.zip -> github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.zip mirror://goproxy//github.com/golangplus/fmt/@v/v0.0.0-20150411045040-2a5d6d7d2995.mod -> github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.mod mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.zip -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.zip mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.mod mirror://goproxy//github.com/golang/freetype/@v/v0.0.0-20170609003504-e2365dfdc4a0.mod -> github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.3.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.3.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170426233943-68f4ded48ba9.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170426233943-68f4ded48ba9.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/cadvisor/@v/v0.38.8.zip -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.38.8.zip mirror://goproxy//github.com/google/cadvisor/@v/v0.38.8.mod -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.38.8.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-containerregistry/@v/v0.0.0-20190617215043-876b8855d23c.mod -> github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.0.0-20190617215043-876b8855d23c.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/handlers/@v/v0.0.0-20150720190736-60c7bfde3e33.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.4.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.4.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/go-acme/lego/@v/v2.5.0+incompatible.mod -> github.com%2Fgo-acme%2Flego%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.1+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.2+incompatible.zip -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.zip mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.2+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.28.1.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.28.1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.0.0-20180825180245-b006789cd277.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.zip -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.zip mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.zip -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.zip mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.0.0-20180920151709-4f900dc2ade9.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.zip -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.zip mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-ozzo/ozzo-validation/@v/v3.5.0+incompatible.mod -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.0.0-20180201235237-0fb14efe8c47.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.0.0-20180201235237-0fb14efe8c47.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/heketi/heketi/@v/v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod -> github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.mod -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.10.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.10.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/insomniacslk/dhcp/@v/v0.0.0-20200420235442-ed3125c2efe7.mod -> github.com%2Finsomniacslk%2Fdhcp%2F@v%2Fv0.0.0-20200420235442-ed3125c2efe7.mod mirror://goproxy//github.com/ishidawataru/sctp/@v/v0.0.0-20190723014705-7c296d48a2b5.mod -> github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20190723014705-7c296d48a2b5.mod mirror://goproxy//github.com/jamescun/tuntap/@v/v0.0.0-20190712092105-cb1fb277045c.mod -> github.com%2Fjamescun%2Ftuntap%2F@v%2Fv0.0.0-20190712092105-cb1fb277045c.mod mirror://goproxy//github.com/jetstack/cert-manager/@v/v0.7.2.mod -> github.com%2Fjetstack%2Fcert-manager%2F@v%2Fv0.7.2.mod mirror://goproxy//github.com/jimstudt/http-authentication/@v/v0.0.0-20140401203705-3eca13d6893a.mod -> github.com%2Fjimstudt%2Fhttp-authentication%2F@v%2Fv0.0.0-20140401203705-3eca13d6893a.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v0.0.0-20161216230537-726cc8b906e3.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv0.0.0-20161216230537-726cc8b906e3.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jung-kurt/gofpdf/@v/v1.0.3-0.20190309125859-24315acbbda5.mod -> github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.mod -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.mod mirror://goproxy//github.com/k3s-io/containerd/@v/v1.4.9-k3s1.zip -> github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.4.9-k3s1.zip mirror://goproxy//github.com/k3s-io/containerd/@v/v1.4.9-k3s1.mod -> github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.4.9-k3s1.mod mirror://goproxy//github.com/k3s-io/continuity/@v/v0.0.0-20210309170710-f93269e0d5c1.zip -> github.com%2Fk3s-io%2Fcontinuity%2F@v%2Fv0.0.0-20210309170710-f93269e0d5c1.zip mirror://goproxy//github.com/k3s-io/continuity/@v/v0.0.0-20210309170710-f93269e0d5c1.mod -> github.com%2Fk3s-io%2Fcontinuity%2F@v%2Fv0.0.0-20210309170710-f93269e0d5c1.mod mirror://goproxy//github.com/k3s-io/cri/@v/v1.4.0-k3s.7.zip -> github.com%2Fk3s-io%2Fcri%2F@v%2Fv1.4.0-k3s.7.zip mirror://goproxy//github.com/k3s-io/cri/@v/v1.4.0-k3s.7.mod -> github.com%2Fk3s-io%2Fcri%2F@v%2Fv1.4.0-k3s.7.mod mirror://goproxy//github.com/k3s-io/cri-tools/@v/v1.20.0-k3s1.zip -> github.com%2Fk3s-io%2Fcri-tools%2F@v%2Fv1.20.0-k3s1.zip mirror://goproxy//github.com/k3s-io/cri-tools/@v/v1.20.0-k3s1.mod -> github.com%2Fk3s-io%2Fcri-tools%2F@v%2Fv1.20.0-k3s1.mod mirror://goproxy//github.com/k3s-io/etcd/@v/v0.5.0-alpha.5.0.20201208200253-50621aee4aea.zip -> github.com%2Fk3s-io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20201208200253-50621aee4aea.zip mirror://goproxy//github.com/k3s-io/etcd/@v/v0.5.0-alpha.5.0.20201208200253-50621aee4aea.mod -> github.com%2Fk3s-io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20201208200253-50621aee4aea.mod mirror://goproxy//github.com/k3s-io/flannel/@v/v0.12.0-k3s2.zip -> github.com%2Fk3s-io%2Fflannel%2F@v%2Fv0.12.0-k3s2.zip mirror://goproxy//github.com/k3s-io/flannel/@v/v0.12.0-k3s2.mod -> github.com%2Fk3s-io%2Fflannel%2F@v%2Fv0.12.0-k3s2.mod mirror://goproxy//github.com/k3s-io/go-powershell/@v/v0.0.0-20200701182037-6845e6fcfa79.zip -> github.com%2Fk3s-io%2Fgo-powershell%2F@v%2Fv0.0.0-20200701182037-6845e6fcfa79.zip mirror://goproxy//github.com/k3s-io/go-powershell/@v/v0.0.0-20200701182037-6845e6fcfa79.mod -> github.com%2Fk3s-io%2Fgo-powershell%2F@v%2Fv0.0.0-20200701182037-6845e6fcfa79.mod mirror://goproxy//github.com/k3s-io/go-powershell/@v/v0.0.0-20201118222746-51f4c451fbd7.zip -> github.com%2Fk3s-io%2Fgo-powershell%2F@v%2Fv0.0.0-20201118222746-51f4c451fbd7.zip mirror://goproxy//github.com/k3s-io/go-powershell/@v/v0.0.0-20201118222746-51f4c451fbd7.mod -> github.com%2Fk3s-io%2Fgo-powershell%2F@v%2Fv0.0.0-20201118222746-51f4c451fbd7.mod mirror://goproxy//github.com/k3s-io/helm-controller/@v/v0.10.5.zip -> github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.10.5.zip mirror://goproxy//github.com/k3s-io/helm-controller/@v/v0.10.5.mod -> github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.10.5.mod mirror://goproxy//github.com/k3s-io/kine/@v/v0.6.2.zip -> github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.6.2.zip mirror://goproxy//github.com/k3s-io/kine/@v/v0.6.2.mod -> github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.6.2.mod mirror://goproxy//github.com/k3s-io/kubernetes/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/api/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/api/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils/@v/v1.20.11-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.20.11-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver/@v/v1.20.11-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv1.20.11-k3s1.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.3.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.12.2.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.2.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.12.2.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.2.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/knative/build/@v/v0.6.0.mod -> github.com%2Fknative%2Fbuild%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/knative/pkg/@v/v0.0.0-20190514205332-5e4512dcb2ca.mod -> github.com%2Fknative%2Fpkg%2F@v%2Fv0.0.0-20190514205332-5e4512dcb2ca.mod mirror://goproxy//github.com/knative/serving/@v/v0.6.1.mod -> github.com%2Fknative%2Fserving%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.mod -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.8.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.8.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.zip -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.mod -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.zip -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.mod -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lpabon/godbc/@v/v0.1.1.mod -> github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/lucas-clemente/aes12/@v/v0.0.0-20171027163421-cd47fb39b79f.mod -> github.com%2Flucas-clemente%2Faes12%2F@v%2Fv0.0.0-20171027163421-cd47fb39b79f.mod mirror://goproxy//github.com/lucas-clemente/quic-clients/@v/v0.1.0.mod -> github.com%2Flucas-clemente%2Fquic-clients%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.10.2.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/lucas-clemente/quic-go-certificates/@v/v0.0.0-20160823095156-d2f86524cced.mod -> github.com%2Flucas-clemente%2Fquic-go-certificates%2F@v%2Fv0.0.0-20160823095156-d2f86524cced.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/marstr/guid/@v/v1.1.0.mod -> github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.2.3.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/mattbaird/jsonpatch/@v/v0.0.0-20171005235357-81af80346b1a.mod -> github.com%2Fmattbaird%2Fjsonpatch%2F@v%2Fv0.0.0-20171005235357-81af80346b1a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.4.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.4.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.4.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/mholt/certmagic/@v/v0.6.2-0.20190624175158-6a42ef9fe8c2.mod -> github.com%2Fmholt%2Fcertmagic%2F@v%2Fv0.6.2-0.20190624175158-6a42ef9fe8c2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.3.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.zip -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.mod -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.zip -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.zip mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.mod -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.mod mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.zip -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.mod -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.7.zip -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.zip mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.7.mod -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/minio/sio/@v/v0.2.1.mod -> github.com%2Fminio%2Fsio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.zip -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.zip mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.mod -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.zip -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.mod -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.1.3.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.1.3.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.0.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/moby/sys/symlink/@v/v0.1.0.mod -> github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.mod mirror://goproxy//github.com/moby/vpnkit/@v/v0.4.0.mod -> github.com%2Fmoby%2Fvpnkit%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170603005431-491d3605edfb.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20200520151820-abd8a0e76976.zip -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20200520151820-abd8a0e76976.zip mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20200520151820-abd8a0e76976.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20200520151820-abd8a0e76976.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.zip -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.zip -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.zip mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod mirror://goproxy//github.com/mvdan/xurls/@v/v1.1.0.mod -> github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.zip -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.mod -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/naoina/toml/@v/v0.1.1.mod -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/natefinch/lumberjack/@v/v2.0.0+incompatible.zip -> github.com%2Fnatefinch%2Flumberjack%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/natefinch/lumberjack/@v/v2.0.0+incompatible.mod -> github.com%2Fnatefinch%2Flumberjack%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20151202141238-7f8ab55aaf3b.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.2.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.2.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.2.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.2.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20151007035656-2152b45fa28a.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20170106003457-a6d0ee40d420.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc92.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc92.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc92.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc92.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc94.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc94.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc94.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc94.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2-0.20190207185410-29686dbc5559.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20190207185410-29686dbc5559.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200728170252-4d89ac9fbff6.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200728170252-4d89ac9fbff6.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200728170252-4d89ac9fbff6.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200728170252-4d89ac9fbff6.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200929063507-e6143ca7d51d.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210326190908-1c3f411f0417.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210326190908-1c3f411f0417.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.6.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.0.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.1.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.0.0-20180209125602-c332b6f63c06.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20171117100541-99fa1f4be8e5.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180110214958-89604d197083.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/quobyte/api/@v/v0.1.8.mod -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/rakelkar/gonetsh/@v/v0.0.0-20190930180311-e5c5ffe4bdf0.zip -> github.com%2Frakelkar%2Fgonetsh%2F@v%2Fv0.0.0-20190930180311-e5c5ffe4bdf0.zip mirror://goproxy//github.com/rakelkar/gonetsh/@v/v0.0.0-20190930180311-e5c5ffe4bdf0.mod -> github.com%2Frakelkar%2Fgonetsh%2F@v%2Fv0.0.0-20190930180311-e5c5ffe4bdf0.mod mirror://goproxy//github.com/rancher/dynamiclistener/@v/v0.2.2.zip -> github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/rancher/dynamiclistener/@v/v0.2.2.mod -> github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/rancher/moq/@v/v0.0.0-20190404221404-ee5226d43009.mod -> github.com%2Francher%2Fmoq%2F@v%2Fv0.0.0-20190404221404-ee5226d43009.mod mirror://goproxy//github.com/rancher/remotedialer/@v/v0.2.0.zip -> github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rancher/remotedialer/@v/v0.2.0.mod -> github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.1.4.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.4.0.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.0.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.1.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.2.zip -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.2.zip mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.2.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.2.mod mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.2.0.mod -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.6.0.zip -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.6.0.mod -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/remyoudompheng/bigfft/@v/v0.0.0-20170806203942-52369c62f446.mod -> github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.zip -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.mod -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/robfig/cron/v3/@v/v3.0.1.zip -> github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/robfig/cron/v3/@v/v3.0.1.mod -> github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.10.0.zip -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.10.0.mod -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.zip -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.zip -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.zip mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.mod -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.mod mirror://goproxy//github.com/russross/blackfriday/@v/v0.0.0-20170610170232-067529f716f4.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv0.0.0-20170610170232-067529f716f4.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.zip -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stefanberger/go-pkcs11uri/@v/v0.0.0-20201008174630-78d3cae3a980.zip -> github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.zip mirror://goproxy//github.com/stefanberger/go-pkcs11uri/@v/v0.0.0-20201008174630-78d3cae3a980.mod -> github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.mod mirror://goproxy//github.com/storageos/go-api/@v/v2.2.0+incompatible.mod -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.0.0-20180129172003-8a3f7159479f.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.0.0-20180129172003-8a3f7159479f.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20180303142811-b89eecf5ca5d.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20180303142811-b89eecf5ca5d.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.zip mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.zip mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.zip -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.zip mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.3.0+incompatible.zip -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.zip mirror://goproxy//github.com/tchap/go-patricia/@v/v2.3.0+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.mod mirror://goproxy//github.com/tektoncd/pipeline/@v/v0.4.0.mod -> github.com%2Ftektoncd%2Fpipeline%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/thecodeteam/goscaleio/@v/v0.1.0.mod -> github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.zip -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/ugorji/go/@v/v0.0.0-20170107133203-ded73eae5db7.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20170107133203-ded73eae5db7.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.21.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.21.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.mod -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/u-root/u-root/@v/v6.0.0+incompatible.mod -> github.com%2Fu-root%2Fu-root%2F@v%2Fv6.0.0+incompatible.mod mirror://goproxy//github.com/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20170220200719-fe3b5664d23a.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20170220200719-fe3b5664d23a.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20181108222139-023a6dafdcdf.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.1-0.20201029203352-d40f9887b852.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.1-0.20201029203352-d40f9887b852.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.1-0.20201029203352-d40f9887b852.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.1-0.20201029203352-d40f9887b852.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20170219233438-54f0e4339ce7.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20170219233438-54f0e4339ce7.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11.zip -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/willf/bitset/@v/v1.1.11-0.20200630133818-d5bec3311243.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.mod -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.mod -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.mod -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181009213950-7c1a557ab941.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180321215751-8460e604b9de.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180807140117-3d87b88a115f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190312203227-4b39c73a6495.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20180708004352-c73c2afc3b81.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210224082022-3d97a244fca7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210224082022-3d97a244fca7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210224082022-3d97a244fca7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210224082022-3d97a244fca7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190522044717-8097e1b27ff5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190522044717-8097e1b27ff5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190602015325-4c4f7f33c9ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190812073006-9eafafc0a87e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190812073006-9eafafc0a87e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191115151921-52ab43148777.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200622214017-ed371f2e16b4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200622214017-ed371f2e16b4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200817155316-9781c653f443.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200817155316-9781c653f443.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200909081042-eff7692f9009.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200916030750-2334cc1a136f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916030750-2334cc1a136f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200922070232-aee5d888a860.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200922070232-aee5d888a860.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201202213521-69691e467435.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201202213521-69691e467435.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210225134936-a50acf3fe073.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210225134936-a50acf3fe073.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210225134936-a50acf3fe073.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210225134936-a50acf3fe073.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210324051608-47abb6519492.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426230700-d19ff857e887.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426230700-d19ff857e887.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190920225731-5eefd052ad72.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191017205301-920acffc3e65.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191017205301-920acffc3e65.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200505023115-26f46d2f7ef8.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200505023115-26f46d2f7ef8.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20180816165407-929014505bf4.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20190331200053-3d26580ed485.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.zip -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.zip mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.zip -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.zip mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod mirror://goproxy//gonum.org/v1/plot/@v/v0.0.0-20190515093506-e2840ee46a6b.mod -> gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20160322025152-9bf6e6e569ff.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.1-0.20200106000736-b8fc810ca6b5.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.1-0.20200106000736-b8fc810ca6b5.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.zip mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/cloud/@v/v0.0.0-20151119220103-975617b05ea8.mod -> google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/grpc/@v/v0.0.0-20160317175043-d3ddb4469d5a.mod -> google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.zip mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20141024133853-64131543e789.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.zip -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.zip mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod mirror://goproxy//gopkg.in/mcuadros/go-syslog.v2/@v/v2.2.1.mod -> gopkg.in%2Fmcuadros%2Fgo-syslog.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.zip -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.zip mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.zip -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.zip mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.zip -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.zip mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.zip -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.zip mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.mod -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.19.10.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.10.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.19.10.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/apiserver/@v/v0.19.10.zip -> k8s.io%2Fapiserver%2F@v%2Fv0.19.10.zip mirror://goproxy//k8s.io/apiserver/@v/v0.19.10.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/api/@v/v0.19.10.zip -> k8s.io%2Fapi%2F@v%2Fv0.19.10.zip mirror://goproxy//k8s.io/api/@v/v0.19.10.mod -> k8s.io%2Fapi%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/client-go/@v/v0.19.10.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.19.10.zip mirror://goproxy//k8s.io/client-go/@v/v0.19.10.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/component-base/@v/v0.19.10.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/cri-api/@v/v0.19.10.zip -> k8s.io%2Fcri-api%2F@v%2Fv0.19.10.zip mirror://goproxy//k8s.io/cri-api/@v/v0.19.10.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190327210449-e17681d19d3a.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190327210449-e17681d19d3a.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20191120174120-e74f70b9b27e.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20191120174120-e74f70b9b27e.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200114144118-36b2048a9120.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20201113003025-83324d819ded.zip -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20201113003025-83324d819ded.zip mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20201113003025-83324d819ded.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20201113003025-83324d819ded.mod mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.zip -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.zip mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.mod -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190502190224-411b2483e503.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190502190224-411b2483e503.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200805222855-6aeccd4b50c6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200805222855-6aeccd4b50c6.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.mod mirror://goproxy//k8s.io/system-validators/@v/v1.2.0.mod -> k8s.io%2Fsystem-validators%2F@v%2Fv1.2.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190506122338-8fab8cb257d5.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190506122338-8fab8cb257d5.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200729134348-d5654de09c73.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//modernc.org/cc/@v/v1.0.0.mod -> modernc.org%2Fcc%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/golex/@v/v1.0.0.mod -> modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/mathutil/@v/v1.0.0.mod -> modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/strutil/@v/v1.0.0.mod -> modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/xc/@v/v1.0.0.mod -> modernc.org%2Fxc%2F@v%2Fv1.0.0.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.15.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.22.zip -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.22.zip mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.22.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.22.mod mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.zip -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.mod -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190426204423-ea680f03cc65.zip -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190426204423-ea680f03cc65.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190426204423-ea680f03cc65.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190426204423-ea680f03cc65.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.1.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.3.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.3.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.3.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.3.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.2.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.2.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.2.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod https://github.com/opencontainers/runc/archive/refs/tags/v1.0.0-rc95.tar.gz -> k3s-runc-v1.0.0-rc95.tar.gz https://charts.helm.sh/stable/packages/traefik-1.81.0.tgz https://github.com/rancher/plugins/archive/refs/tags/v0.9.1-k3s1.tar.gz -> k3s-cni-plugins-0.9.1.tar.gz amd64? ( https://github.com/rancher/k3s-root/releases/download/v0.9.1/k3s-root-amd64.tar -> k3s-root-amd64-0.9.1.tar )
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9a8f79e90326a2ac9593c4c3de5b2869
diff --git a/metadata/md5-cache/sys-cluster/k3s-1.20.6 b/metadata/md5-cache/sys-cluster/k3s-1.20.6
deleted file mode 100644
index 69a95c151db6..000000000000
--- a/metadata/md5-cache/sys-cluster/k3s-1.20.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=net-firewall/conntrack-tools rootless? ( app-emulation/slirp4netns )
-DESCRIPTION=Lightweight Kubernetes
-EAPI=7
-HOMEPAGE=https://k3s.io
-IUSE=+kubectl-symlink rootless kernel_linux
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=kubectl-symlink? ( !sys-cluster/kubectl )
-REQUIRED_USE=|| ( amd64 )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/k3s-io/k3s/archive/refs/tags/v1.20.6+k3s1.tar.gz -> k3s-1.20.6.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.zip -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.zip mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//bitbucket.org/bertimus9/systemstat/@v/v0.0.0-20180207000608-0eeff89b0690.zip -> bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.zip mirror://goproxy//bitbucket.org/bertimus9/systemstat/@v/v0.0.0-20180207000608-0eeff89b0690.mod -> bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//github.com/!akihiro!suda/containerd-fuse-overlayfs/@v/v1.0.0.zip -> github.com%2F!akihiro!suda%2Fcontainerd-fuse-overlayfs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/!akihiro!suda/containerd-fuse-overlayfs/@v/v1.0.0.mod -> github.com%2F!akihiro!suda%2Fcontainerd-fuse-overlayfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.2.1+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v43.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv43.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v43.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv43.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.8.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.6.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.6.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20200415212048-7901bc822317.zip -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20200415212048-7901bc822317.zip mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20200415212048-7901bc822317.mod -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20200415212048-7901bc822317.mod mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.zip -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.zip mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.mod -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.10-0.20200715222032-5eafd1556990.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.10-0.20200715222032-5eafd1556990.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.10-0.20200715222032-5eafd1556990.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.10-0.20200715222032-5eafd1556990.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6-0.20190129145542-bc49f75c7221.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6-0.20190129145542-bc49f75c7221.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6-0.20190129145542-bc49f75c7221.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6-0.20190129145542-bc49f75c7221.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7-0.20190325164909-8abdbb8205e4.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7-0.20190325164909-8abdbb8205e4.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.9.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.9.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20200803203718-d80bc7196cb0.zip -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20200803203718-d80bc7196cb0.zip mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20200803203718-d80bc7196cb0.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20200803203718-d80bc7196cb0.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.zip -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.mod -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.mod -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ajstarks/svgo/@v/v0.0.0-20180226025133-644b8db467af.mod -> github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.zip -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.zip mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.mod -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod mirror://goproxy//github.com/andreyvit/diff/@v/v0.0.0-20170406064948-c7f18ee00883.mod -> github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/auth0/go-jwt-middleware/@v/v0.0.0-20170425171159-5493cabe49f7.zip -> github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.zip mirror://goproxy//github.com/auth0/go-jwt-middleware/@v/v0.0.0-20170425171159-5493cabe49f7.mod -> github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.12.54.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.12.54.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.12.54.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.12.54.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.28.2.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.28.2.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.35.24.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.24.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.35.24.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.24.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.6.10.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.6.10.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20160804104726-4c0e84591b9a.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bifurcation/mint/@v/v0.0.0-20180715133206-93c51c6ce115.mod -> github.com%2Fbifurcation%2Fmint%2F@v%2Fv0.0.0-20180715133206-93c51c6ce115.mod mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.mod -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20171013065002-4d72634a2f11.zip -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20171013065002-4d72634a2f11.zip mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20171013065002-4d72634a2f11.mod -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20171013065002-4d72634a2f11.mod mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20190828090544-27d02f80ba40.zip -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20190828090544-27d02f80ba40.zip mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20190828090544-27d02f80ba40.mod -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20190828090544-27d02f80ba40.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v0.4.1.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.zip -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.zip mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.mod mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.mod -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.mod -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.mod -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod mirror://goproxy//github.com/caddyserver/caddy/@v/v1.0.3.zip -> github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/caddyserver/caddy/@v/v1.0.3.mod -> github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/canonical/go-dqlite/@v/v1.5.1.zip -> github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/canonical/go-dqlite/@v/v1.5.1.mod -> github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.1.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.1.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.zip -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.zip mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.0.2.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.1.0.zip -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.1.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/cheekybits/genny/@v/v0.0.0-20170328200008-9127e812e1e9.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv0.0.0-20170328200008-9127e812e1e9.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.29.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200507155900-a9f01edf17e3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200507155900-a9f01edf17e3.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200601085316-9f1617e5c574.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200601085316-9f1617e5c574.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200702112145-1c8d4c9ef775.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200702112145-1c8d4c9ef775.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/clusterhq/flocker-go/@v/v0.0.0-20160920122132-2b8b7259d313.zip -> github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.zip mirror://goproxy//github.com/clusterhq/flocker-go/@v/v0.0.0-20160920122132-2b8b7259d313.mod -> github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codegangsta/negroni/@v/v1.0.0.zip -> github.com%2Fcodegangsta%2Fnegroni%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/codegangsta/negroni/@v/v1.0.0.mod -> github.com%2Fcodegangsta%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.2.0.zip -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.2.0.mod -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20191030083217-371312c1e31c.zip -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20191030083217-371312c1e31c.zip mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20191030083217-371312c1e31c.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20191030083217-371312c1e31c.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20201111183144-404b9149801e.zip -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.zip mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20201111183144-404b9149801e.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190717030353-c4b9ac5c7601.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190717030353-c4b9ac5c7601.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.zip mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200710171044-318312a37340.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.zip mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200710171044-318312a37340.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20181022165439-0650fd9eeb50.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20181022165439-0650fd9eeb50.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191206165004-02ecf6a7291e.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/console/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.2.10.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.2.10.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.1.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.4.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20180307165137-3d5202aec260.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20180307165137-3d5202aec260.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20200410184934-f15a3290365b.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.zip mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20200410184934-f15a3290365b.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20190911050354-e029b79d8cda.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20190911050354-e029b79d8cda.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.zip -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.zip mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828172938-92c8520ef9f8.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828172938-92c8520ef9f8.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20191030014035-9abf673ca6ff.zip -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20191030014035-9abf673ca6ff.zip mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20191030014035-9abf673ca6ff.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20191030014035-9abf673ca6ff.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.zip -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.zip mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.0.1.zip -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containers/ocicrypt/@v/v1.0.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.10.zip -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.10.mod -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.1.11+incompatible.zip -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.1.11+incompatible.zip mirror://goproxy//github.com/coreos/etcd/@v/v3.1.11+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.1.11+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.0.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.0.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20161114122254-48702e0da86b.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20161114122254-48702e0da86b.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20161114122254-48702e0da86b.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20161114122254-48702e0da86b.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.zip -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.zip mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.mod -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.zip -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.mod -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.zip -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.zip mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.mod -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.zip -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.zip mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.mod -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.zip -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.zip mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170629053852-f6cab0c35083.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170629053852-f6cab0c35083.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170629053852-f6cab0c35083.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170629053852-f6cab0c35083.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20190125010748-a747050bb1ba.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20170104182250-a601269ab70c.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20190905152932-14b96e55d84c.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20190905152932-14b96e55d84c.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v0.7.3-0.20190327010347-be7ac8be2ae0.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv0.7.3-0.20190327010347-be7ac8be2ae0.mod mirror://goproxy//github.com/docker/docker/@v/v1.13.1.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.13.1.zip mirror://goproxy//github.com/docker/docker/@v/v1.13.1.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.13.1.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20200309214505-aa6a9891b09c.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200309214505-aa6a9891b09c.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v20.10.0-beta1.0.20201108103107-c7109494fe65+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.0-beta1.0.20201108103107-c7109494fe65+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v20.10.0-beta1.0.20201108103107-c7109494fe65+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.0-beta1.0.20201108103107-c7109494fe65+incompatible.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20170721190031-9461782956ad.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20170721190031-9461782956ad.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.zip -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.zip mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.0-20180209012529-399ea8c73916.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.zip mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.zip -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/erikdubbelboer/gspt/@v/v0.0.0-20190125194910-e68493906b83.zip -> github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.zip mirror://goproxy//github.com/erikdubbelboer/gspt/@v/v0.0.0-20190125194910-e68493906b83.mod -> github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.mod mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.zip -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.mod -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.zip -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.mod -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.zip -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fogleman/gg/@v/v1.2.1-0.20190220221249-0403632d5b90.mod -> github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.10.2.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.2.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.10.2.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.2.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/fullsailor/pkcs7/@v/v0.0.0-20190404230743-d7302db945fa.zip -> github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.zip mirror://goproxy//github.com/fullsailor/pkcs7/@v/v0.0.0-20190404230743-d7302db945fa.mod -> github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.mod mirror://goproxy//github.com/fvbommel/sortorder/@v/v1.0.1.zip -> github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/fvbommel/sortorder/@v/v1.0.1.mod -> github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/go-acme/lego/@v/v2.5.0+incompatible.mod -> github.com%2Fgo-acme%2Flego%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.1+incompatible.zip -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.zip mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.1+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.2+incompatible.zip -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.zip mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.2+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.28.1.zip -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.28.1.zip mirror://goproxy//github.com/go-ini/ini/@v/v1.28.1.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.28.1.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.9.0.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.0.0-20180825180245-b006789cd277.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.zip -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.zip mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.zip -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.zip mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.0.0-20180920151709-4f900dc2ade9.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.zip -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.zip mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-ozzo/ozzo-validation/@v/v3.5.0+incompatible.zip -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.zip mirror://goproxy//github.com/go-ozzo/ozzo-validation/@v/v3.5.0+incompatible.mod -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20151105175453-c7fdd8b5cd55.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20151105175453-c7fdd8b5cd55.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.7.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.2.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.3.2.zip -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/googleapis/@v/v1.3.2.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/freetype/@v/v0.0.0-20170609003504-e2365dfdc4a0.mod -> github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golangplus/bytes/@v/v0.0.0-20160111154220-45c989fe5450.zip -> github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.zip mirror://goproxy//github.com/golangplus/bytes/@v/v0.0.0-20160111154220-45c989fe5450.mod -> github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod mirror://goproxy//github.com/golangplus/fmt/@v/v0.0.0-20150411045040-2a5d6d7d2995.zip -> github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.zip mirror://goproxy//github.com/golangplus/fmt/@v/v0.0.0-20150411045040-2a5d6d7d2995.mod -> github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.mod mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.zip -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.zip mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/cadvisor/@v/v0.37.2.mod -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.37.2.mod mirror://goproxy//github.com/google/cadvisor/@v/v0.38.5.mod -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.38.5.mod mirror://goproxy//github.com/google/cadvisor/@v/v0.38.8.zip -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.38.8.zip mirror://goproxy//github.com/google/cadvisor/@v/v0.38.8.mod -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.38.8.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-containerregistry/@v/v0.0.0-20190617215043-876b8855d23c.mod -> github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.0.0-20190617215043-876b8855d23c.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170426233943-68f4ded48ba9.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170426233943-68f4ded48ba9.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.zip -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/handlers/@v/v0.0.0-20150720190736-60c7bfde3e33.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.4.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.4.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.zip mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.0.0-20180201235237-0fb14efe8c47.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.0.0-20180201235237-0fb14efe8c47.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/heketi/heketi/@v/v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.zip -> github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.zip mirror://goproxy//github.com/heketi/heketi/@v/v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod -> github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.zip -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.zip mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.mod -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/insomniacslk/dhcp/@v/v0.0.0-20200420235442-ed3125c2efe7.mod -> github.com%2Finsomniacslk%2Fdhcp%2F@v%2Fv0.0.0-20200420235442-ed3125c2efe7.mod mirror://goproxy//github.com/ishidawataru/sctp/@v/v0.0.0-20190723014705-7c296d48a2b5.zip -> github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20190723014705-7c296d48a2b5.zip mirror://goproxy//github.com/ishidawataru/sctp/@v/v0.0.0-20190723014705-7c296d48a2b5.mod -> github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20190723014705-7c296d48a2b5.mod mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.zip -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.zip mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.mod -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.mod mirror://goproxy//github.com/jamescun/tuntap/@v/v0.0.0-20190712092105-cb1fb277045c.mod -> github.com%2Fjamescun%2Ftuntap%2F@v%2Fv0.0.0-20190712092105-cb1fb277045c.mod mirror://goproxy//github.com/jetstack/cert-manager/@v/v0.7.2.mod -> github.com%2Fjetstack%2Fcert-manager%2F@v%2Fv0.7.2.mod mirror://goproxy//github.com/jimstudt/http-authentication/@v/v0.0.0-20140401203705-3eca13d6893a.mod -> github.com%2Fjimstudt%2Fhttp-authentication%2F@v%2Fv0.0.0-20140401203705-3eca13d6893a.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v0.0.0-20161216230537-726cc8b906e3.zip -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv0.0.0-20161216230537-726cc8b906e3.zip mirror://goproxy//github.com/joho/godotenv/@v/v0.0.0-20161216230537-726cc8b906e3.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv0.0.0-20161216230537-726cc8b906e3.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jung-kurt/gofpdf/@v/v1.0.3-0.20190309125859-24315acbbda5.mod -> github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod mirror://goproxy//github.com/k3s-io/containerd/@v/v1.4.4-k3s1.zip -> github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.4.4-k3s1.zip mirror://goproxy//github.com/k3s-io/containerd/@v/v1.4.4-k3s1.mod -> github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.4.4-k3s1.mod mirror://goproxy//github.com/k3s-io/continuity/@v/v0.0.0-20210309170710-f93269e0d5c1.zip -> github.com%2Fk3s-io%2Fcontinuity%2F@v%2Fv0.0.0-20210309170710-f93269e0d5c1.zip mirror://goproxy//github.com/k3s-io/continuity/@v/v0.0.0-20210309170710-f93269e0d5c1.mod -> github.com%2Fk3s-io%2Fcontinuity%2F@v%2Fv0.0.0-20210309170710-f93269e0d5c1.mod mirror://goproxy//github.com/k3s-io/cri/@v/v1.4.0-k3s.5.zip -> github.com%2Fk3s-io%2Fcri%2F@v%2Fv1.4.0-k3s.5.zip mirror://goproxy//github.com/k3s-io/cri/@v/v1.4.0-k3s.5.mod -> github.com%2Fk3s-io%2Fcri%2F@v%2Fv1.4.0-k3s.5.mod mirror://goproxy//github.com/k3s-io/cri-tools/@v/v1.20.0-k3s1.zip -> github.com%2Fk3s-io%2Fcri-tools%2F@v%2Fv1.20.0-k3s1.zip mirror://goproxy//github.com/k3s-io/cri-tools/@v/v1.20.0-k3s1.mod -> github.com%2Fk3s-io%2Fcri-tools%2F@v%2Fv1.20.0-k3s1.mod mirror://goproxy//github.com/k3s-io/etcd/@v/v0.5.0-alpha.5.0.20201208200253-50621aee4aea.zip -> github.com%2Fk3s-io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20201208200253-50621aee4aea.zip mirror://goproxy//github.com/k3s-io/etcd/@v/v0.5.0-alpha.5.0.20201208200253-50621aee4aea.mod -> github.com%2Fk3s-io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20201208200253-50621aee4aea.mod mirror://goproxy//github.com/k3s-io/flannel/@v/v0.12.0-k3s2.zip -> github.com%2Fk3s-io%2Fflannel%2F@v%2Fv0.12.0-k3s2.zip mirror://goproxy//github.com/k3s-io/flannel/@v/v0.12.0-k3s2.mod -> github.com%2Fk3s-io%2Fflannel%2F@v%2Fv0.12.0-k3s2.mod mirror://goproxy//github.com/k3s-io/go-powershell/@v/v0.0.0-20200701182037-6845e6fcfa79.zip -> github.com%2Fk3s-io%2Fgo-powershell%2F@v%2Fv0.0.0-20200701182037-6845e6fcfa79.zip mirror://goproxy//github.com/k3s-io/go-powershell/@v/v0.0.0-20200701182037-6845e6fcfa79.mod -> github.com%2Fk3s-io%2Fgo-powershell%2F@v%2Fv0.0.0-20200701182037-6845e6fcfa79.mod mirror://goproxy//github.com/k3s-io/go-powershell/@v/v0.0.0-20201118222746-51f4c451fbd7.zip -> github.com%2Fk3s-io%2Fgo-powershell%2F@v%2Fv0.0.0-20201118222746-51f4c451fbd7.zip mirror://goproxy//github.com/k3s-io/go-powershell/@v/v0.0.0-20201118222746-51f4c451fbd7.mod -> github.com%2Fk3s-io%2Fgo-powershell%2F@v%2Fv0.0.0-20201118222746-51f4c451fbd7.mod mirror://goproxy//github.com/k3s-io/helm-controller/@v/v0.8.3.zip -> github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/k3s-io/helm-controller/@v/v0.8.3.mod -> github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/k3s-io/kine/@v/v0.6.0.zip -> github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/k3s-io/kine/@v/v0.6.0.mod -> github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/k3s-io/kubernetes/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/api/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/api/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils/@v/v1.20.6-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.20.6-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver/@v/v1.20.6-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv1.20.6-k3s1.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.7.5.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.7.5.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.zip -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.7.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.7.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.11.7.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.7.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/knative/build/@v/v0.6.0.mod -> github.com%2Fknative%2Fbuild%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/knative/pkg/@v/v0.0.0-20190514205332-5e4512dcb2ca.mod -> github.com%2Fknative%2Fpkg%2F@v%2Fv0.0.0-20190514205332-5e4512dcb2ca.mod mirror://goproxy//github.com/knative/serving/@v/v0.6.1.mod -> github.com%2Fknative%2Fserving%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/lib/pq/@v/v1.8.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.8.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.zip -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.mod -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.zip -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.mod -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.zip -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.mod -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lpabon/godbc/@v/v0.1.1.zip -> github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/lpabon/godbc/@v/v0.1.1.mod -> github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/lucas-clemente/aes12/@v/v0.0.0-20171027163421-cd47fb39b79f.mod -> github.com%2Flucas-clemente%2Faes12%2F@v%2Fv0.0.0-20171027163421-cd47fb39b79f.mod mirror://goproxy//github.com/lucas-clemente/quic-clients/@v/v0.1.0.mod -> github.com%2Flucas-clemente%2Fquic-clients%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.10.2.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/lucas-clemente/quic-go-certificates/@v/v0.0.0-20160823095156-d2f86524cced.mod -> github.com%2Flucas-clemente%2Fquic-go-certificates%2F@v%2Fv0.0.0-20160823095156-d2f86524cced.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/marstr/guid/@v/v1.1.0.mod -> github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.2.3.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/mattbaird/jsonpatch/@v/v0.0.0-20171005235357-81af80346b1a.mod -> github.com%2Fmattbaird%2Fjsonpatch%2F@v%2Fv0.0.0-20171005235357-81af80346b1a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.4.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.4.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.4.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/mholt/certmagic/@v/v0.6.2-0.20190624175158-6a42ef9fe8c2.mod -> github.com%2Fmholt%2Fcertmagic%2F@v%2Fv0.6.2-0.20190624175158-6a42ef9fe8c2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.3.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.zip -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.zip mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.mod -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.mod mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.zip -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.mod -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.7.zip -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.zip mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.7.mod -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/minio/sio/@v/v0.2.1.mod -> github.com%2Fminio%2Fsio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.zip -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.zip mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.mod -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.zip -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.mod -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.1.3.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.1.3.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.mod mirror://goproxy//github.com/moby/vpnkit/@v/v0.4.0.mod -> github.com%2Fmoby%2Fvpnkit%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170603005431-491d3605edfb.zip -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.zip mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170603005431-491d3605edfb.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20171103030105-7d4729fb3618.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20171103030105-7d4729fb3618.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20200520151820-abd8a0e76976.zip -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20200520151820-abd8a0e76976.zip mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20200520151820-abd8a0e76976.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20200520151820-abd8a0e76976.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.zip -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.zip mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod mirror://goproxy//github.com/mvdan/xurls/@v/v1.1.0.zip -> github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mvdan/xurls/@v/v1.1.0.mod -> github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.zip -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.mod -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/naoina/toml/@v/v0.1.1.mod -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/natefinch/lumberjack/@v/v2.0.0+incompatible.zip -> github.com%2Fnatefinch%2Flumberjack%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/natefinch/lumberjack/@v/v2.0.0+incompatible.mod -> github.com%2Fnatefinch%2Flumberjack%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20151202141238-7f8ab55aaf3b.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20151202141238-7f8ab55aaf3b.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.2.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.2.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.2.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.2.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20151007035656-2152b45fa28a.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.zip mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20151007035656-2152b45fa28a.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.zip mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20170106003457-a6d0ee40d420.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc90.0.20200616040943-82d2fa4eb069.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc90.0.20200616040943-82d2fa4eb069.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc91.0.20200707015106-819fcc687efb.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc91.0.20200707015106-819fcc687efb.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc92.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc92.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc92.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc92.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2-0.20190207185410-29686dbc5559.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20190207185410-29686dbc5559.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200520003142-237cc4f519e2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200520003142-237cc4f519e2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200710190001-3e4195d92445.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200710190001-3e4195d92445.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200710190001-3e4195d92445.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200710190001-3e4195d92445.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200728170252-4d89ac9fbff6.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200728170252-4d89ac9fbff6.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200728170252-4d89ac9fbff6.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200728170252-4d89ac9fbff6.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.5.1.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.5.2.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.6.0.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.6.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.zip -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.1.zip -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/pborman/uuid/@v/v1.2.1.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.0.0-20180209125602-c332b6f63c06.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20171117100541-99fa1f4be8e5.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180110214958-89604d197083.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/quobyte/api/@v/v0.1.2.mod -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/quobyte/api/@v/v0.1.8.zip -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/quobyte/api/@v/v0.1.8.mod -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/rakelkar/gonetsh/@v/v0.0.0-20190930180311-e5c5ffe4bdf0.zip -> github.com%2Frakelkar%2Fgonetsh%2F@v%2Fv0.0.0-20190930180311-e5c5ffe4bdf0.zip mirror://goproxy//github.com/rakelkar/gonetsh/@v/v0.0.0-20190930180311-e5c5ffe4bdf0.mod -> github.com%2Frakelkar%2Fgonetsh%2F@v%2Fv0.0.0-20190930180311-e5c5ffe4bdf0.mod mirror://goproxy//github.com/rancher/dynamiclistener/@v/v0.2.2.zip -> github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/rancher/dynamiclistener/@v/v0.2.2.mod -> github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/rancher/go-powershell/@v/v0.0.0-20200701182037-6845e6fcfa79.zip -> github.com%2Francher%2Fgo-powershell%2F@v%2Fv0.0.0-20200701182037-6845e6fcfa79.zip mirror://goproxy//github.com/rancher/go-powershell/@v/v0.0.0-20200701182037-6845e6fcfa79.mod -> github.com%2Francher%2Fgo-powershell%2F@v%2Fv0.0.0-20200701182037-6845e6fcfa79.mod mirror://goproxy//github.com/rancher/go-powershell/@v/v0.0.0-20200701184732-233247d45373.zip -> github.com%2Francher%2Fgo-powershell%2F@v%2Fv0.0.0-20200701184732-233247d45373.zip mirror://goproxy//github.com/rancher/go-powershell/@v/v0.0.0-20200701184732-233247d45373.mod -> github.com%2Francher%2Fgo-powershell%2F@v%2Fv0.0.0-20200701184732-233247d45373.mod mirror://goproxy//github.com/rancher/moq/@v/v0.0.0-20190404221404-ee5226d43009.mod -> github.com%2Francher%2Fmoq%2F@v%2Fv0.0.0-20190404221404-ee5226d43009.mod mirror://goproxy//github.com/rancher/remotedialer/@v/v0.2.0.zip -> github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rancher/remotedialer/@v/v0.2.0.mod -> github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.1.4.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.4.0.zip -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/rancher/wrangler/@v/v0.4.0.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.0.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.1.zip -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.1.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.2.zip -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.2.zip mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.2.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.2.mod mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.2.0.mod -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.6.0.zip -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.6.0.mod -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/remyoudompheng/bigfft/@v/v0.0.0-20170806203942-52369c62f446.mod -> github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.zip -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.mod -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/robfig/cron/v3/@v/v3.0.1.zip -> github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/robfig/cron/v3/@v/v3.0.1.mod -> github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.10.0.zip -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.10.0.mod -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.zip -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.zip -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.zip mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.mod -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.mod mirror://goproxy//github.com/russross/blackfriday/@v/v0.0.0-20170610170232-067529f716f4.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv0.0.0-20170610170232-067529f716f4.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.zip -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.zip mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.zip -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.zip mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/storageos/go-api/@v/v0.0.0-20180912212459-343b3eff91fc.mod -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv0.0.0-20180912212459-343b3eff91fc.mod mirror://goproxy//github.com/storageos/go-api/@v/v2.2.0+incompatible.zip -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/storageos/go-api/@v/v2.2.0+incompatible.mod -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.0.0-20180129172003-8a3f7159479f.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.0.0-20180129172003-8a3f7159479f.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20180303142811-b89eecf5ca5d.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20180303142811-b89eecf5ca5d.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.zip mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.zip -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.zip mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.3.0+incompatible.zip -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.zip mirror://goproxy//github.com/tchap/go-patricia/@v/v2.3.0+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.mod mirror://goproxy//github.com/tektoncd/pipeline/@v/v0.4.0.mod -> github.com%2Ftektoncd%2Fpipeline%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/thecodeteam/goscaleio/@v/v0.1.0.zip -> github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/thecodeteam/goscaleio/@v/v0.1.0.mod -> github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.zip -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/u-root/u-root/@v/v6.0.0+incompatible.mod -> github.com%2Fu-root%2Fu-root%2F@v%2Fv6.0.0+incompatible.mod mirror://goproxy//github.com/ugorji/go/@v/v0.0.0-20170107133203-ded73eae5db7.zip -> github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20170107133203-ded73eae5db7.zip mirror://goproxy//github.com/ugorji/go/@v/v0.0.0-20170107133203-ded73eae5db7.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20170107133203-ded73eae5db7.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.21.0.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.21.0.zip mirror://goproxy//github.com/urfave/cli/@v/v1.21.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.21.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.zip -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.mod -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20170220200719-fe3b5664d23a.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20170220200719-fe3b5664d23a.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20170220200719-fe3b5664d23a.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20170220200719-fe3b5664d23a.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20181108222139-023a6dafdcdf.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20181108222139-023a6dafdcdf.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20170219233438-54f0e4339ce7.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20170219233438-54f0e4339ce7.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20170219233438-54f0e4339ce7.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20170219233438-54f0e4339ce7.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200520041808-52d707b772fe.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200520041808-52d707b772fe.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11-0.20200630133818-d5bec3311243.zip -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.zip mirror://goproxy//github.com/willf/bitset/@v/v1.1.11-0.20200630133818-d5bec3311243.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/handysort/@v/v0.0.0-20150421192137-fb3537ed64a1.mod -> github.com%2Fxlab%2Fhandysort%2F@v%2Fv0.0.0-20150421192137-fb3537ed64a1.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.mod -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.mod -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.mod -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200910180754-dd1b699fc489.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200910180754-dd1b699fc489.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.zip -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.zip mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.zip -> go.opencensus.io%2F@v%2Fv0.21.0.zip mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.zip -> go.opencensus.io%2F@v%2Fv0.22.2.zip mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181009213950-7c1a557ab941.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181009213950-7c1a557ab941.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190123085648-057139ce5d2b.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190123085648-057139ce5d2b.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190320223903-b7391e95e576.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190320223903-b7391e95e576.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190617133340-57b3e21c3d56.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180321215751-8460e604b9de.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180807140117-3d87b88a115f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190312203227-4b39c73a6495.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20180708004352-c73c2afc3b81.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181005035420-146acd28ed58.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181005035420-146acd28ed58.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190320064053-1272bf9dcd53.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190328230028-74de082e2cca.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201006153459-a7d1128ccaa0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201006153459-a7d1128ccaa0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190124100055-b90733256f2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190124100055-b90733256f2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190228124157-a34e9553db1e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190321052220-f7bb7a8bee54.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190321052220-f7bb7a8bee54.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190602015325-4c4f7f33c9ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190812073006-9eafafc0a87e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190812073006-9eafafc0a87e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191115151921-52ab43148777.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200217220822-9197077df867.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200217220822-9197077df867.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200327173247-9dae0f8f5775.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200327173247-9dae0f8f5775.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201110211018-35f3e6cf4a65.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201110211018-35f3e6cf4a65.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190920225731-5eefd052ad72.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190920225731-5eefd052ad72.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191017205301-920acffc3e65.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191017205301-920acffc3e65.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191017205301-920acffc3e65.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191017205301-920acffc3e65.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200505023115-26f46d2f7ef8.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200505023115-26f46d2f7ef8.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200616133436-c1934b75d054.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200616133436-c1934b75d054.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20180816165407-929014505bf4.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20190331200053-3d26580ed485.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.zip -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.zip mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.zip -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.zip mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod mirror://goproxy//gonum.org/v1/plot/@v/v0.0.0-20190515093506-e2840ee46a6b.mod -> gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20160322025152-9bf6e6e569ff.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.1-0.20200106000736-b8fc810ca6b5.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.1-0.20200106000736-b8fc810ca6b5.mod mirror://goproxy//google.golang.org/api/@v/v0.15.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.1.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.zip mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.zip mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/cloud/@v/v0.0.0-20151119220103-975617b05ea8.mod -> google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200117163144-32f20d992d24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201110150050-8816d57aaa9a.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201110150050-8816d57aaa9a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.mod mirror://goproxy//google.golang.org/grpc/@v/v0.0.0-20160317175043-d3ddb4469d5a.mod -> google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.zip mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20141024133853-64131543e789.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.zip -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.zip mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.zip -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.zip mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod mirror://goproxy//gopkg.in/mcuadros/go-syslog.v2/@v/v2.2.1.mod -> gopkg.in%2Fmcuadros%2Fgo-syslog.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.zip -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.zip mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.zip -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.zip mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//k8s.io/api/@v/v0.17.0.mod -> k8s.io%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/api/@v/v0.18.0.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/api/@v/v0.18.0.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/api/@v/v0.18.5.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.5.zip mirror://goproxy//k8s.io/api/@v/v0.18.5.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.5.mod mirror://goproxy//k8s.io/api/@v/v0.19.5.zip -> k8s.io%2Fapi%2F@v%2Fv0.19.5.zip mirror://goproxy//k8s.io/api/@v/v0.19.5.mod -> k8s.io%2Fapi%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.17.0.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.18.0.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.18.0.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.19.5.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.17.0.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.0.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.0.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.5.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.5.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.5.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.5.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.19.5.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.5.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.19.5.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/apiserver/@v/v0.17.0.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/apiserver/@v/v0.18.0.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/apiserver/@v/v0.19.5.zip -> k8s.io%2Fapiserver%2F@v%2Fv0.19.5.zip mirror://goproxy//k8s.io/apiserver/@v/v0.19.5.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.19.5.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/client-go/@v/v0.17.0.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.0.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.0.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.5.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.5.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.5.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.5.mod mirror://goproxy//k8s.io/client-go/@v/v0.19.5.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.19.5.zip mirror://goproxy//k8s.io/client-go/@v/v0.19.5.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/cloud-provider/@v/v0.19.5.mod -> k8s.io%2Fcloud-provider%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/cluster-bootstrap/@v/v0.19.5.mod -> k8s.io%2Fcluster-bootstrap%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/code-generator/@v/v0.17.0.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/code-generator/@v/v0.18.0.zip -> k8s.io%2Fcode-generator%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/code-generator/@v/v0.18.0.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/code-generator/@v/v0.19.5.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/component-base/@v/v0.17.0.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/component-base/@v/v0.18.0.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/component-base/@v/v0.19.5.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/cri-api/@v/v0.19.5.zip -> k8s.io%2Fcri-api%2F@v%2Fv0.19.5.zip mirror://goproxy//k8s.io/cri-api/@v/v0.19.5.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/csi-translation-lib/@v/v0.19.5.mod -> k8s.io%2Fcsi-translation-lib%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190327210449-e17681d19d3a.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190327210449-e17681d19d3a.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190822140433-26a664648505.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20191120174120-e74f70b9b27e.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20191120174120-e74f70b9b27e.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200114144118-36b2048a9120.zip -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.zip mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200114144118-36b2048a9120.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200428234225-8167cfdcfc14.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200428234225-8167cfdcfc14.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20201113003025-83324d819ded.zip -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20201113003025-83324d819ded.zip mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20201113003025-83324d819ded.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20201113003025-83324d819ded.mod mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.zip -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.zip mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.mod -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.zip -> k8s.io%2Fklog%2F@v%2Fv0.3.0.zip mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.mod mirror://goproxy//k8s.io/kube-aggregator/@v/v0.18.0.mod -> k8s.io%2Fkube-aggregator%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/kube-aggregator/@v/v0.19.5.mod -> k8s.io%2Fkube-aggregator%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kube-controller-manager/@v/v0.19.5.mod -> k8s.io%2Fkube-controller-manager%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190502190224-411b2483e503.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190502190224-411b2483e503.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20191107075043-30be4d16710a.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200121204235-bf4fb3bd569c.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200121204235-bf4fb3bd569c.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200805222855-6aeccd4b50c6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200805222855-6aeccd4b50c6.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20201113171705-d219536bb9fd.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.mod mirror://goproxy//k8s.io/kube-proxy/@v/v0.19.5.mod -> k8s.io%2Fkube-proxy%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kube-scheduler/@v/v0.19.5.mod -> k8s.io%2Fkube-scheduler%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kubectl/@v/v0.19.5.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kubelet/@v/v0.19.5.mod -> k8s.io%2Fkubelet%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.19.5.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.19.5.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.20.0.zip -> k8s.io%2Fkubernetes%2F@v%2Fv1.20.0.zip mirror://goproxy//k8s.io/kubernetes/@v/v1.20.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.20.0.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/api/@v/v0.0.0-20201204214525-af46c47ce925.zip -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.zip mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/api/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/apimachinery/@v/v0.0.0-20201204214525-af46c47ce925.zip -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.zip mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/apimachinery/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/apiserver/@v/v0.0.0-20201204214525-af46c47ce925.zip -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.zip mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/apiserver/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/client-go/@v/v0.0.0-20201204214525-af46c47ce925.zip -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.zip mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/client-go/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/code-generator/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/component-base/@v/v0.0.0-20201204214525-af46c47ce925.zip -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.zip mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/component-base/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/component-helpers/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/controller-manager/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/cri-api/@v/v0.0.0-20201204214525-af46c47ce925.zip -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.zip mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/cri-api/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/kubectl/@v/v0.0.0-20201204214525-af46c47ce925.zip -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.zip mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/kubectl/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/kubelet/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/metrics/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/mount-utils/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver/@v/v0.0.0-20201204214525-af46c47ce925.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod mirror://goproxy//k8s.io/legacy-cloud-providers/@v/v0.19.5.mod -> k8s.io%2Flegacy-cloud-providers%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/metrics/@v/v0.19.5.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/sample-apiserver/@v/v0.19.5.mod -> k8s.io%2Fsample-apiserver%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/system-validators/@v/v1.1.2.mod -> k8s.io%2Fsystem-validators%2F@v%2Fv1.1.2.mod mirror://goproxy//k8s.io/system-validators/@v/v1.2.0.zip -> k8s.io%2Fsystem-validators%2F@v%2Fv1.2.0.zip mirror://goproxy//k8s.io/system-validators/@v/v1.2.0.mod -> k8s.io%2Fsystem-validators%2F@v%2Fv1.2.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190506122338-8fab8cb257d5.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190506122338-8fab8cb257d5.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191114184206-e782cd3c129f.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200414100711-2df71ebbae66.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200414100711-2df71ebbae66.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200729134348-d5654de09c73.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200729134348-d5654de09c73.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//modernc.org/cc/@v/v1.0.0.mod -> modernc.org%2Fcc%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/golex/@v/v1.0.0.mod -> modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/mathutil/@v/v1.0.0.mod -> modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/strutil/@v/v1.0.0.mod -> modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/xc/@v/v1.0.0.mod -> modernc.org%2Fxc%2F@v%2Fv1.0.0.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.14.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.14.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.15.zip -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.zip mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.15.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.7.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.7.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.9.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.9.mod mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.zip -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.mod -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190426204423-ea680f03cc65.zip -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190426204423-ea680f03cc65.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190426204423-ea680f03cc65.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190426204423-ea680f03cc65.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v1.0.1-0.20191108220359-b1b620dd3f06.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv1.0.1-0.20191108220359-b1b620dd3f06.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.1.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.1.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.1.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.3.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.3.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.3.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.3.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//vbom.ml/util/@v/v0.0.0-20160121211510-db5cfe13f5cc.mod -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod https://charts.helm.sh/stable/packages/traefik-1.81.0.tgz https://github.com/rancher/plugins/archive/refs/tags/v0.8.6-k3s1.tar.gz -> k3s-cni-plugins-0.8.6.tar.gz amd64? ( https://github.com/rancher/k3s-root/releases/download/v0.8.1/k3s-root-amd64.tar -> k3s-root-amd64-0.8.1.tar )
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d1aef314b7fd3e14db09ba7fbc2972e3
diff --git a/metadata/md5-cache/sys-cluster/k3s-1.21.0 b/metadata/md5-cache/sys-cluster/k3s-1.21.0
deleted file mode 100644
index a33d8e4836ff..000000000000
--- a/metadata/md5-cache/sys-cluster/k3s-1.21.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=net-firewall/conntrack-tools rootless? ( app-emulation/slirp4netns )
-DESCRIPTION=Lightweight Kubernetes
-EAPI=7
-HOMEPAGE=https://k3s.io
-IUSE=+kubectl-symlink rootless kernel_linux
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=kubectl-symlink? ( !sys-cluster/kubectl )
-REQUIRED_USE=|| ( amd64 )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/k3s-io/k3s/archive/refs/tags/v1.21.0+k3s1.tar.gz -> k3s-1.21.0.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.zip -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.zip mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//bitbucket.org/bertimus9/systemstat/@v/v0.0.0-20180207000608-0eeff89b0690.zip -> bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.zip mirror://goproxy//bitbucket.org/bertimus9/systemstat/@v/v0.0.0-20180207000608-0eeff89b0690.mod -> bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20201218220906-28db891af037.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20201218220906-28db891af037.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.2.1+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v43.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv43.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v43.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv43.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.8.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.12.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.12.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.12.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.12.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.6.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.6.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20200415212048-7901bc822317.zip -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20200415212048-7901bc822317.zip mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20200415212048-7901bc822317.mod -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20200415212048-7901bc822317.mod mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.zip -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.zip mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.mod -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15-0.20190919025122-fc70bd9a86b5.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.10-0.20200715222032-5eafd1556990.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.10-0.20200715222032-5eafd1556990.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.10-0.20200715222032-5eafd1556990.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.10-0.20200715222032-5eafd1556990.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7-0.20190325164909-8abdbb8205e4.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7-0.20190325164909-8abdbb8205e4.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.7.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.9.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.9.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20200803203718-d80bc7196cb0.zip -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20200803203718-d80bc7196cb0.zip mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20200803203718-d80bc7196cb0.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20200803203718-d80bc7196cb0.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.zip -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.mod -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.mod -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ajstarks/svgo/@v/v0.0.0-20180226025133-644b8db467af.mod -> github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.zip -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.zip mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.mod -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod mirror://goproxy//github.com/andreyvit/diff/@v/v0.0.0-20170406064948-c7f18ee00883.mod -> github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/auth0/go-jwt-middleware/@v/v0.0.0-20170425171159-5493cabe49f7.zip -> github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.zip mirror://goproxy//github.com/auth0/go-jwt-middleware/@v/v0.0.0-20170425171159-5493cabe49f7.mod -> github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.12.54.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.12.54.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.28.2.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.28.2.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.35.24.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.24.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.35.24.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.24.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.6.10.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.6.10.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20160804104726-4c0e84591b9a.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bifurcation/mint/@v/v0.0.0-20180715133206-93c51c6ce115.mod -> github.com%2Fbifurcation%2Fmint%2F@v%2Fv0.0.0-20180715133206-93c51c6ce115.mod mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.mod -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20171013065002-4d72634a2f11.mod -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20171013065002-4d72634a2f11.mod mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20190828090544-27d02f80ba40.zip -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20190828090544-27d02f80ba40.zip mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20190828090544-27d02f80ba40.mod -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20190828090544-27d02f80ba40.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v0.4.1.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.zip -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.zip mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.mod mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.mod -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.mod -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.mod -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod mirror://goproxy//github.com/caddyserver/caddy/@v/v1.0.3.zip -> github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/caddyserver/caddy/@v/v1.0.3.mod -> github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/canonical/go-dqlite/@v/v1.5.1.zip -> github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/canonical/go-dqlite/@v/v1.5.1.mod -> github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.1.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.1.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.zip -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.zip mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.0.2.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.1.0.zip -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//github.com/checkpoint-restore/go-criu/v4/@v/v4.1.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v5/@v/v5.0.0.zip -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.zip mirror://goproxy//github.com/checkpoint-restore/go-criu/v5/@v/v5.0.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.mod mirror://goproxy//github.com/cheekybits/genny/@v/v0.0.0-20170328200008-9127e812e1e9.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv0.0.0-20170328200008-9127e812e1e9.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.29.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200110133405-4032b1d8aae3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200507155900-a9f01edf17e3.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200507155900-a9f01edf17e3.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200601085316-9f1617e5c574.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200601085316-9f1617e5c574.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200702112145-1c8d4c9ef775.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200702112145-1c8d4c9ef775.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.2.0.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.2.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.5.0.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.5.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/clusterhq/flocker-go/@v/v0.0.0-20160920122132-2b8b7259d313.zip -> github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.zip mirror://goproxy//github.com/clusterhq/flocker-go/@v/v0.0.0-20160920122132-2b8b7259d313.mod -> github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/codegangsta/negroni/@v/v1.0.0.mod -> github.com%2Fcodegangsta%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.2.0.mod -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.3.0.zip -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.3.0.mod -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20191030083217-371312c1e31c.zip -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20191030083217-371312c1e31c.zip mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20191030083217-371312c1e31c.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20191030083217-371312c1e31c.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20201111183144-404b9149801e.zip -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.zip mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20201111183144-404b9149801e.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190717030353-c4b9ac5c7601.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190717030353-c4b9ac5c7601.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190919134610-bf292b21730f.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.zip mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200531161412-0dbf7f05ba59.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200710171044-318312a37340.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.zip mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200710171044-318312a37340.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20180822173158-c12b1e7919c1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20181022165439-0650fd9eeb50.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20181022165439-0650fd9eeb50.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191206165004-02ecf6a7291e.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/console/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/console/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/console/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.2.10.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.2.10.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.4.zip -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/containerd/containerd/@v/v1.4.4.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20190426062206-aaeac12a7ffc.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20180307165137-3d5202aec260.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20180307165137-3d5202aec260.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20190226154929-a9fb20d87448.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20200410184934-f15a3290365b.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.zip mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20200410184934-f15a3290365b.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.mod mirror://goproxy//github.com/containerd/fuse-overlayfs-snapshotter/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Ffuse-overlayfs-snapshotter%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/fuse-overlayfs-snapshotter/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Ffuse-overlayfs-snapshotter%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20190911050354-e029b79d8cda.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20190911050354-e029b79d8cda.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.zip -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.zip mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828172938-92c8520ef9f8.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828172938-92c8520ef9f8.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20191030014035-9abf673ca6ff.zip -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20191030014035-9abf673ca6ff.zip mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20191030014035-9abf673ca6ff.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20191030014035-9abf673ca6ff.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.zip -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.zip mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.0.1.zip -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containers/ocicrypt/@v/v1.0.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.10.mod -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.11.zip -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.11.zip mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.11.mod -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.11.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.1.11+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.1.11+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20161114122254-48702e0da86b.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20161114122254-48702e0da86b.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.1.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.1.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180108230652-97fdf19511ea.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.11.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.11.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.zip -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.zip mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.mod -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.zip -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.mod -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.zip -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.zip mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.mod -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.zip -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.zip mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.mod -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.zip -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.zip mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170629053852-f6cab0c35083.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170629053852-f6cab0c35083.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20190125010748-a747050bb1ba.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20170104182250-a601269ab70c.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20190905152932-14b96e55d84c.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20190905152932-14b96e55d84c.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v0.7.3-0.20190327010347-be7ac8be2ae0.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv0.7.3-0.20190327010347-be7ac8be2ae0.mod mirror://goproxy//github.com/docker/docker/@v/v1.13.1.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.13.1.zip mirror://goproxy//github.com/docker/docker/@v/v1.13.1.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.13.1.mod mirror://goproxy//github.com/docker/docker/@v/v1.4.2-0.20200309214505-aa6a9891b09c.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200309214505-aa6a9891b09c.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v20.10.2+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.2+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v20.10.2+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.2+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v20.10.5+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.5+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v20.10.5+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.5+incompatible.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20170721190031-9461782956ad.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20170721190031-9461782956ad.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.zip -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.zip mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.0-20180209012529-399ea8c73916.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.zip -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210217033140-668b12f5399d.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/erikdubbelboer/gspt/@v/v0.0.0-20190125194910-e68493906b83.zip -> github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.zip mirror://goproxy//github.com/erikdubbelboer/gspt/@v/v0.0.0-20190125194910-e68493906b83.mod -> github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.mod mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.zip -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.mod -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.zip -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.mod -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod mirror://goproxy//github.com/fanliao/go-promise/@v/v0.0.0-20141029170127-1890db352a72.mod -> github.com%2Ffanliao%2Fgo-promise%2F@v%2Fv0.0.0-20141029170127-1890db352a72.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.zip -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/flannel-io/flannel/@v/v0.13.1-rc2.0.20210324170423-273b36ca57dc.zip -> github.com%2Fflannel-io%2Fflannel%2F@v%2Fv0.13.1-rc2.0.20210324170423-273b36ca57dc.zip mirror://goproxy//github.com/flannel-io/flannel/@v/v0.13.1-rc2.0.20210324170423-273b36ca57dc.mod -> github.com%2Fflannel-io%2Fflannel%2F@v%2Fv0.13.1-rc2.0.20210324170423-273b36ca57dc.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fogleman/gg/@v/v1.2.1-0.20190220221249-0403632d5b90.mod -> github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/fullsailor/pkcs7/@v/v0.0.0-20190404230743-d7302db945fa.zip -> github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.zip mirror://goproxy//github.com/fullsailor/pkcs7/@v/v0.0.0-20190404230743-d7302db945fa.mod -> github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.mod mirror://goproxy//github.com/fvbommel/sortorder/@v/v1.0.1.zip -> github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/fvbommel/sortorder/@v/v1.0.1.mod -> github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/go-acme/lego/@v/v2.5.0+incompatible.mod -> github.com%2Fgo-acme%2Flego%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.1+incompatible.zip -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.zip mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.1+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.2+incompatible.zip -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.zip mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.2+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.zip -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.28.1.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.28.1.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.9.0.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.0.0-20180825180245-b006789cd277.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.0.0-20180920151709-4f900dc2ade9.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.8.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.8.mod mirror://goproxy//github.com/go-ozzo/ozzo-validation/@v/v3.5.0+incompatible.zip -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.zip mirror://goproxy//github.com/go-ozzo/ozzo-validation/@v/v3.5.0+incompatible.mod -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-task/slim-sprig/@v/v0.0.0-20210107165309-348f09dbbbc0.zip -> github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.zip mirror://goproxy//github.com/go-task/slim-sprig/@v/v0.0.0-20210107165309-348f09dbbbc0.mod -> github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.mod mirror://goproxy//github.com/gobuffalo/here/@v/v0.6.0.mod -> github.com%2Fgobuffalo%2Fhere%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20151105175453-c7fdd8b5cd55.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20151105175453-c7fdd8b5cd55.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20190422162347-ade71ed3457e.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.8.0.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.8.0.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.2.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.3.2.zip -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/googleapis/@v/v1.3.2.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/freetype/@v/v0.0.0-20170609003504-e2365dfdc4a0.mod -> github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/golangplus/bytes/@v/v0.0.0-20160111154220-45c989fe5450.mod -> github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod mirror://goproxy//github.com/golangplus/fmt/@v/v0.0.0-20150411045040-2a5d6d7d2995.mod -> github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.mod mirror://goproxy//github.com/golangplus/fmt/@v/v1.0.0.mod -> github.com%2Fgolangplus%2Ffmt%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.zip -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.zip mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.mod mirror://goproxy//github.com/golangplus/testing/@v/v1.0.0.zip -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/golangplus/testing/@v/v1.0.0.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/cadvisor/@v/v0.37.2.mod -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.37.2.mod mirror://goproxy//github.com/google/cadvisor/@v/v0.39.0.zip -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.39.0.zip mirror://goproxy//github.com/google/cadvisor/@v/v0.39.0.mod -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.39.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-containerregistry/@v/v0.0.0-20190617215043-876b8855d23c.mod -> github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.0.0-20190617215043-876b8855d23c.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170426233943-68f4ded48ba9.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170426233943-68f4ded48ba9.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/handlers/@v/v0.0.0-20150720190736-60c7bfde3e33.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.zip mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.0.0-20180201235237-0fb14efe8c47.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.0.0-20180201235237-0fb14efe8c47.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/heketi/heketi/@v/v10.2.0+incompatible.zip -> github.com%2Fheketi%2Fheketi%2F@v%2Fv10.2.0+incompatible.zip mirror://goproxy//github.com/heketi/heketi/@v/v10.2.0+incompatible.mod -> github.com%2Fheketi%2Fheketi%2F@v%2Fv10.2.0+incompatible.mod mirror://goproxy//github.com/heketi/heketi/@v/v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod -> github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.zip -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.zip mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.mod -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hugelgupf/socketpair/@v/v0.0.0-20190730060125-05d35a94e714.mod -> github.com%2Fhugelgupf%2Fsocketpair%2F@v%2Fv0.0.0-20190730060125-05d35a94e714.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/insomniacslk/dhcp/@v/v0.0.0-20210120172423-cc9239ac6294.mod -> github.com%2Finsomniacslk%2Fdhcp%2F@v%2Fv0.0.0-20210120172423-cc9239ac6294.mod mirror://goproxy//github.com/ishidawataru/sctp/@v/v0.0.0-20190723014705-7c296d48a2b5.zip -> github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20190723014705-7c296d48a2b5.zip mirror://goproxy//github.com/ishidawataru/sctp/@v/v0.0.0-20190723014705-7c296d48a2b5.mod -> github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20190723014705-7c296d48a2b5.mod mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.zip -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.zip mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.mod -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.mod mirror://goproxy//github.com/jamescun/tuntap/@v/v0.0.0-20190712092105-cb1fb277045c.mod -> github.com%2Fjamescun%2Ftuntap%2F@v%2Fv0.0.0-20190712092105-cb1fb277045c.mod mirror://goproxy//github.com/jetstack/cert-manager/@v/v0.7.2.mod -> github.com%2Fjetstack%2Fcert-manager%2F@v%2Fv0.7.2.mod mirror://goproxy//github.com/jimstudt/http-authentication/@v/v0.0.0-20140401203705-3eca13d6893a.mod -> github.com%2Fjimstudt%2Fhttp-authentication%2F@v%2Fv0.0.0-20140401203705-3eca13d6893a.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v0.0.0-20161216230537-726cc8b906e3.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv0.0.0-20161216230537-726cc8b906e3.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201009170750-9c6f07d100c1.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201110080708-d2c240429e6c.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201110080708-d2c240429e6c.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jung-kurt/gofpdf/@v/v1.0.3-0.20190309125859-24315acbbda5.mod -> github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod mirror://goproxy//github.com/k3s-io/containerd/@v/v1.4.4-k3s1.zip -> github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.4.4-k3s1.zip mirror://goproxy//github.com/k3s-io/containerd/@v/v1.4.4-k3s1.mod -> github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.4.4-k3s1.mod mirror://goproxy//github.com/k3s-io/continuity/@v/v0.0.0-20210309170710-f93269e0d5c1.zip -> github.com%2Fk3s-io%2Fcontinuity%2F@v%2Fv0.0.0-20210309170710-f93269e0d5c1.zip mirror://goproxy//github.com/k3s-io/continuity/@v/v0.0.0-20210309170710-f93269e0d5c1.mod -> github.com%2Fk3s-io%2Fcontinuity%2F@v%2Fv0.0.0-20210309170710-f93269e0d5c1.mod mirror://goproxy//github.com/k3s-io/cri/@v/v1.4.0-k3s.5.zip -> github.com%2Fk3s-io%2Fcri%2F@v%2Fv1.4.0-k3s.5.zip mirror://goproxy//github.com/k3s-io/cri/@v/v1.4.0-k3s.5.mod -> github.com%2Fk3s-io%2Fcri%2F@v%2Fv1.4.0-k3s.5.mod mirror://goproxy//github.com/k3s-io/cri-tools/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fcri-tools%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/cri-tools/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fcri-tools%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/etcd/@v/v0.5.0-alpha.5.0.20201208200253-50621aee4aea.zip -> github.com%2Fk3s-io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20201208200253-50621aee4aea.zip mirror://goproxy//github.com/k3s-io/etcd/@v/v0.5.0-alpha.5.0.20201208200253-50621aee4aea.mod -> github.com%2Fk3s-io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20201208200253-50621aee4aea.mod mirror://goproxy//github.com/k3s-io/helm-controller/@v/v0.8.3.zip -> github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.8.3.zip mirror://goproxy//github.com/k3s-io/helm-controller/@v/v0.8.3.mod -> github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/k3s-io/kine/@v/v0.6.0.zip -> github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/k3s-io/kine/@v/v0.6.0.mod -> github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/k3s-io/kubernetes/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/api/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/api/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/protobuf/@v/v1.4.3-k3s1.zip -> github.com%2Fk3s-io%2Fprotobuf%2F@v%2Fv1.4.3-k3s1.zip mirror://goproxy//github.com/k3s-io/protobuf/@v/v1.4.3-k3s1.mod -> github.com%2Fk3s-io%2Fprotobuf%2F@v%2Fv1.4.3-k3s1.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.7.5.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.7.5.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.7.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.7.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.11.7.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.7.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/knative/build/@v/v0.6.0.mod -> github.com%2Fknative%2Fbuild%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/knative/pkg/@v/v0.0.0-20190514205332-5e4512dcb2ca.mod -> github.com%2Fknative%2Fpkg%2F@v%2Fv0.0.0-20190514205332-5e4512dcb2ca.mod mirror://goproxy//github.com/knative/serving/@v/v0.6.1.mod -> github.com%2Fknative%2Fserving%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/lib/pq/@v/v1.8.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.8.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.zip -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.mod -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.zip -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.mod -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.zip -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.mod -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lpabon/godbc/@v/v0.1.1.zip -> github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/lpabon/godbc/@v/v0.1.1.mod -> github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/lucas-clemente/aes12/@v/v0.0.0-20171027163421-cd47fb39b79f.mod -> github.com%2Flucas-clemente%2Faes12%2F@v%2Fv0.0.0-20171027163421-cd47fb39b79f.mod mirror://goproxy//github.com/lucas-clemente/quic-clients/@v/v0.1.0.mod -> github.com%2Flucas-clemente%2Fquic-clients%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.10.2.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/lucas-clemente/quic-go-certificates/@v/v0.0.0-20160823095156-d2f86524cced.mod -> github.com%2Flucas-clemente%2Fquic-go-certificates%2F@v%2Fv0.0.0-20160823095156-d2f86524cced.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.zip -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/markbates/pkger/@v/v0.17.1.mod -> github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.1.mod mirror://goproxy//github.com/marstr/guid/@v/v1.1.0.mod -> github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.2.3.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/mattbaird/jsonpatch/@v/v0.0.0-20171005235357-81af80346b1a.mod -> github.com%2Fmattbaird%2Fjsonpatch%2F@v%2Fv0.0.0-20171005235357-81af80346b1a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.zip -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.4.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.4.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.4.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/mdlayher/ethernet/@v/v0.0.0-20190606142754-0394541c37b7.mod -> github.com%2Fmdlayher%2Fethernet%2F@v%2Fv0.0.0-20190606142754-0394541c37b7.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mdlayher/raw/@v/v0.0.0-20190606142536-fef19f00fc18.mod -> github.com%2Fmdlayher%2Fraw%2F@v%2Fv0.0.0-20190606142536-fef19f00fc18.mod mirror://goproxy//github.com/mdlayher/raw/@v/v0.0.0-20191009151244-50f2db8cc065.mod -> github.com%2Fmdlayher%2Fraw%2F@v%2Fv0.0.0-20191009151244-50f2db8cc065.mod mirror://goproxy//github.com/mholt/certmagic/@v/v0.6.2-0.20190624175158-6a42ef9fe8c2.mod -> github.com%2Fmholt%2Fcertmagic%2F@v%2Fv0.6.2-0.20190624175158-6a42ef9fe8c2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.3.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.35.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.35.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.35.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.35.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.4.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.zip -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.zip mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.mod -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.mod mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.zip -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.mod -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.7.zip -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.zip mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.7.mod -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/minio/sio/@v/v0.2.1.mod -> github.com%2Fminio%2Fsio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.zip -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.zip mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.mod -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.zip -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.mod -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/spdystream/@v/v0.2.0.zip -> github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/moby/spdystream/@v/v0.2.0.mod -> github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.1.3.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.0.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.0.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/moby/sys/symlink/@v/v0.1.0.zip -> github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/moby/sys/symlink/@v/v0.1.0.mod -> github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20201216013528-df9cb8a40635.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20201216013528-df9cb8a40635.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.mod mirror://goproxy//github.com/moby/vpnkit/@v/v0.5.0.mod -> github.com%2Fmoby%2Fvpnkit%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170603005431-491d3605edfb.zip -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.zip mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170603005431-491d3605edfb.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.mod mirror://goproxy//github.com/monochromegane/go-gitignore/@v/v0.0.0-20200626010858-205db1a8cc00.zip -> github.com%2Fmonochromegane%2Fgo-gitignore%2F@v%2Fv0.0.0-20200626010858-205db1a8cc00.zip mirror://goproxy//github.com/monochromegane/go-gitignore/@v/v0.0.0-20200626010858-205db1a8cc00.mod -> github.com%2Fmonochromegane%2Fgo-gitignore%2F@v%2Fv0.0.0-20200626010858-205db1a8cc00.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20171103030105-7d4729fb3618.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20171103030105-7d4729fb3618.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.0.0-20200520151820-abd8a0e76976.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20200520151820-abd8a0e76976.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.zip -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.zip -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.zip mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod mirror://goproxy//github.com/mvdan/xurls/@v/v1.1.0.zip -> github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mvdan/xurls/@v/v1.1.0.mod -> github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.zip -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.mod -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/naoina/toml/@v/v0.1.1.mod -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/natefinch/lumberjack/@v/v2.0.0+incompatible.zip -> github.com%2Fnatefinch%2Flumberjack%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/natefinch/lumberjack/@v/v2.0.0+incompatible.mod -> github.com%2Fnatefinch%2Flumberjack%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.8.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.8.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20151202141238-7f8ab55aaf3b.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20151202141238-7f8ab55aaf3b.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.1.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.1.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20151007035656-2152b45fa28a.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.zip mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20151007035656-2152b45fa28a.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.zip mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.11.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.11.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20170106003457-a6d0ee40d420.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v0.0.0-20190115041553-12f6a991201f.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc90.0.20200616040943-82d2fa4eb069.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc90.0.20200616040943-82d2fa4eb069.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc91.0.20200707015106-819fcc687efb.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc91.0.20200707015106-819fcc687efb.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc92.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc92.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc92.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc92.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc93.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc93.0.20210414171415-3397a09ee932.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.0.20210414171415-3397a09ee932.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc93.0.20210414171415-3397a09ee932.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.0.20210414171415-3397a09ee932.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc93.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v0.1.2-0.20190507144316-5b71a03e2700.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2-0.20190207185410-29686dbc5559.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20190207185410-29686dbc5559.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200520003142-237cc4f519e2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200520003142-237cc4f519e2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200728170252-4d89ac9fbff6.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200728170252-4d89ac9fbff6.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200728170252-4d89ac9fbff6.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200728170252-4d89ac9fbff6.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200929063507-e6143ca7d51d.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200929063507-e6143ca7d51d.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210316141917-a8c4a9ee0f6b.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210316141917-a8c4a9ee0f6b.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210316141917-a8c4a9ee0f6b.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210316141917-a8c4a9ee0f6b.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210326190908-1c3f411f0417.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210326190908-1c3f411f0417.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.5.1.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.5.2.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.6.0.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.6.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.0.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.1.zip -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/pborman/uuid/@v/v1.2.1.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.5.2+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.0.0-20180209125602-c332b6f63c06.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20171117100541-99fa1f4be8e5.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180110214958-89604d197083.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.5.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/quobyte/api/@v/v0.1.2.mod -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/quobyte/api/@v/v0.1.8.zip -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/quobyte/api/@v/v0.1.8.mod -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/rancher/dynamiclistener/@v/v0.2.3.zip -> github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/rancher/dynamiclistener/@v/v0.2.3.mod -> github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/rancher/moq/@v/v0.0.0-20190404221404-ee5226d43009.mod -> github.com%2Francher%2Fmoq%2F@v%2Fv0.0.0-20190404221404-ee5226d43009.mod mirror://goproxy//github.com/rancher/remotedialer/@v/v0.2.0.zip -> github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rancher/remotedialer/@v/v0.2.0.mod -> github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.1.4.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.4.0.zip -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/rancher/wrangler/@v/v0.4.0.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.0.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.1.zip -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.1.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.2.zip -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.2.zip mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.2.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.2.mod mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.2.0.mod -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.6.0.zip -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.6.0.mod -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/remyoudompheng/bigfft/@v/v0.0.0-20170806203942-52369c62f446.mod -> github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.zip -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.mod -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/robfig/cron/v3/@v/v3.0.1.zip -> github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/robfig/cron/v3/@v/v3.0.1.mod -> github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.14.0.zip -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.0.zip mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.14.0.mod -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.zip -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.zip -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.zip mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.mod -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.mod mirror://goproxy//github.com/russross/blackfriday/@v/v0.0.0-20170610170232-067529f716f4.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv0.0.0-20170610170232-067529f716f4.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.zip -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.zip mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.zip -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.zip -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.zip mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.zip -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/storageos/go-api/@v/v0.0.0-20180912212459-343b3eff91fc.mod -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv0.0.0-20180912212459-343b3eff91fc.mod mirror://goproxy//github.com/storageos/go-api/@v/v2.2.0+incompatible.zip -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/storageos/go-api/@v/v2.2.0+incompatible.mod -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.0.0-20180129172003-8a3f7159479f.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.0.0-20180129172003-8a3f7159479f.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20180303142811-b89eecf5ca5d.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20180303142811-b89eecf5ca5d.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.zip -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.zip mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.zip mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.zip -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.zip mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.3.0+incompatible.zip -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.zip mirror://goproxy//github.com/tchap/go-patricia/@v/v2.3.0+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.mod mirror://goproxy//github.com/tektoncd/pipeline/@v/v0.4.0.mod -> github.com%2Ftektoncd%2Fpipeline%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v1.0.67.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv1.0.67.mod mirror://goproxy//github.com/thecodeteam/goscaleio/@v/v0.1.0.zip -> github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/thecodeteam/goscaleio/@v/v0.1.0.mod -> github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/u-root/u-root/@v/v7.0.0+incompatible.mod -> github.com%2Fu-root%2Fu-root%2F@v%2Fv7.0.0+incompatible.mod mirror://goproxy//github.com/ugorji/go/@v/v0.0.0-20170107133203-ded73eae5db7.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20170107133203-ded73eae5db7.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/urfave/cli/@v/v0.0.0-20171014202726-7bc6a0acffa5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.21.0.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.21.0.zip mirror://goproxy//github.com/urfave/cli/@v/v1.21.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.21.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.zip -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.mod -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20181108222139-023a6dafdcdf.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20181108222139-023a6dafdcdf.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200520041808-52d707b772fe.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200520041808-52d707b772fe.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11.zip -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/willf/bitset/@v/v1.1.11-0.20200630133818-d5bec3311243.zip -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.zip mirror://goproxy//github.com/willf/bitset/@v/v1.1.11-0.20200630133818-d5bec3311243.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/handysort/@v/v0.0.0-20150421192137-fb3537ed64a1.mod -> github.com%2Fxlab%2Fhandysort%2F@v%2Fv0.0.0-20150421192137-fb3537ed64a1.mod mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20181112141820-a009c3971eca.zip -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20181112141820-a009c3971eca.zip mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20181112141820-a009c3971eca.mod -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20181112141820-a009c3971eca.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.mod -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.mod -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.mod -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200910180754-dd1b699fc489.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200910180754-dd1b699fc489.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.zip -> go.opencensus.io%2F@v%2Fv0.22.2.zip mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.starlark.net/@v/v0.0.0-20200306205701-8dd3e2ee1dd5.zip -> go.starlark.net%2F@v%2Fv0.0.0-20200306205701-8dd3e2ee1dd5.zip mirror://goproxy//go.starlark.net/@v/v0.0.0-20200306205701-8dd3e2ee1dd5.mod -> go.starlark.net%2F@v%2Fv0.0.0-20200306205701-8dd3e2ee1dd5.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181009213950-7c1a557ab941.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181009213950-7c1a557ab941.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190123085648-057139ce5d2b.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190123085648-057139ce5d2b.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190320223903-b7391e95e576.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190320223903-b7391e95e576.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190617133340-57b3e21c3d56.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190820162420-60c769a6c586.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180321215751-8460e604b9de.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180807140117-3d87b88a115f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190312203227-4b39c73a6495.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190731235908-ec7cb31e5a56.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190731235908-ec7cb31e5a56.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20210220032938-85be41e4509f.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20210220032938-85be41e4509f.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20210220032938-85be41e4509f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20210220032938-85be41e4509f.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20180708004352-c73c2afc3b81.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20201217150744-e6ae53a27f4f.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20201217150744-e6ae53a27f4f.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191209134235-331c550502dd.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191209134235-331c550502dd.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.1-0.20200828183125-ce943fd02449.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.1-0.20200828183125-ce943fd02449.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.1-0.20200828183125-ce943fd02449.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.1-0.20200828183125-ce943fd02449.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181005035420-146acd28ed58.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181005035420-146acd28ed58.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190320064053-1272bf9dcd53.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190328230028-74de082e2cca.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201202161906-c7110b5ffcbb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201202161906-c7110b5ffcbb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210224082022-3d97a244fca7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210224082022-3d97a244fca7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210224082022-3d97a244fca7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210224082022-3d97a244fca7.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190124100055-b90733256f2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190124100055-b90733256f2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190228124157-a34e9553db1e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190321052220-f7bb7a8bee54.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190321052220-f7bb7a8bee54.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190514135907-3a4b5fb9f71f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190602015325-4c4f7f33c9ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190812073006-9eafafc0a87e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190812073006-9eafafc0a87e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191002063906-3421d5a6bb1c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191002063906-3421d5a6bb1c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191115151921-52ab43148777.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200217220822-9197077df867.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200217220822-9197077df867.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200327173247-9dae0f8f5775.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200327173247-9dae0f8f5775.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200831180312-196b9ba8737a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200909081042-eff7692f9009.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200916030750-2334cc1a136f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916030750-2334cc1a136f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210112080510-489259a85091.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210112080510-489259a85091.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210225134936-a50acf3fe073.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210225134936-a50acf3fe073.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210225134936-a50acf3fe073.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210225134936-a50acf3fe073.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210220033141-f8bda1e9f3ba.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210220033141-f8bda1e9f3ba.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190920225731-5eefd052ad72.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190920225731-5eefd052ad72.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191017205301-920acffc3e65.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191017205301-920acffc3e65.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191017205301-920acffc3e65.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191017205301-920acffc3e65.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117012304-6edc0a871e69.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117012304-6edc0a871e69.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200505023115-26f46d2f7ef8.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200505023115-26f46d2f7ef8.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200616133436-c1934b75d054.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200616133436-c1934b75d054.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201224043029-2b0845dc783e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201224043029-2b0845dc783e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20180816165407-929014505bf4.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20190331200053-3d26580ed485.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.zip -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.zip mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.zip -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.zip mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod mirror://goproxy//gonum.org/v1/plot/@v/v0.0.0-20190515093506-e2840ee46a6b.mod -> gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20160322025152-9bf6e6e569ff.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.1-0.20200106000736-b8fc810ca6b5.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.1-0.20200106000736-b8fc810ca6b5.mod mirror://goproxy//google.golang.org/api/@v/v0.15.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.1.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.zip mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/cloud/@v/v0.0.0-20151119220103-975617b05ea8.mod -> google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200117163144-32f20d992d24.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200513103714-09dca8ec2884.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200513103714-09dca8ec2884.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201110150050-8816d57aaa9a.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201110150050-8816d57aaa9a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.mod mirror://goproxy//google.golang.org/grpc/@v/v0.0.0-20160317175043-d3ddb4469d5a.mod -> google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20141024133853-64131543e789.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.zip -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.zip mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.zip -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.zip mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod mirror://goproxy//gopkg.in/mcuadros/go-syslog.v2/@v/v2.2.1.mod -> gopkg.in%2Fmcuadros%2Fgo-syslog.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.zip -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.zip mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.zip -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.zip mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//k8s.io/api/@v/v0.17.0.mod -> k8s.io%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/api/@v/v0.18.0.zip -> k8s.io%2Fapi%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/api/@v/v0.18.0.mod -> k8s.io%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/api/@v/v0.19.5.zip -> k8s.io%2Fapi%2F@v%2Fv0.19.5.zip mirror://goproxy//k8s.io/api/@v/v0.19.5.mod -> k8s.io%2Fapi%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.17.0.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.18.0.zip -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.18.0.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/apiextensions-apiserver/@v/v0.19.5.mod -> k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.17.0.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.0.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.0.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.19.5.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.5.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.19.5.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/apiserver/@v/v0.17.0.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/apiserver/@v/v0.18.0.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/apiserver/@v/v0.19.5.zip -> k8s.io%2Fapiserver%2F@v%2Fv0.19.5.zip mirror://goproxy//k8s.io/apiserver/@v/v0.19.5.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/cli-runtime/@v/v0.19.5.mod -> k8s.io%2Fcli-runtime%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/client-go/@v/v0.17.0.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/client-go/@v/v0.18.0.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/client-go/@v/v0.18.0.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/client-go/@v/v0.19.5.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.19.5.zip mirror://goproxy//k8s.io/client-go/@v/v0.19.5.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/cloud-provider/@v/v0.19.5.mod -> k8s.io%2Fcloud-provider%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/cluster-bootstrap/@v/v0.19.5.mod -> k8s.io%2Fcluster-bootstrap%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/code-generator/@v/v0.17.0.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/code-generator/@v/v0.18.0.zip -> k8s.io%2Fcode-generator%2F@v%2Fv0.18.0.zip mirror://goproxy//k8s.io/code-generator/@v/v0.18.0.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/code-generator/@v/v0.19.5.mod -> k8s.io%2Fcode-generator%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/component-base/@v/v0.17.0.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.17.0.mod mirror://goproxy//k8s.io/component-base/@v/v0.18.0.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/component-base/@v/v0.19.5.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/cri-api/@v/v0.19.5.zip -> k8s.io%2Fcri-api%2F@v%2Fv0.19.5.zip mirror://goproxy//k8s.io/cri-api/@v/v0.19.5.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/csi-translation-lib/@v/v0.19.5.mod -> k8s.io%2Fcsi-translation-lib%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190327210449-e17681d19d3a.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190327210449-e17681d19d3a.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190822140433-26a664648505.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20191120174120-e74f70b9b27e.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20191120174120-e74f70b9b27e.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200114144118-36b2048a9120.zip -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.zip mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200114144118-36b2048a9120.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200428234225-8167cfdcfc14.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200428234225-8167cfdcfc14.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20201214224949-b6c5ce23f027.zip -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20201214224949-b6c5ce23f027.zip mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20201214224949-b6c5ce23f027.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20201214224949-b6c5ce23f027.mod mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.zip -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.zip mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.mod -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.zip -> k8s.io%2Fklog%2F@v%2Fv0.3.0.zip mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.8.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.8.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.8.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.8.0.mod mirror://goproxy//k8s.io/kube-aggregator/@v/v0.18.0.mod -> k8s.io%2Fkube-aggregator%2F@v%2Fv0.18.0.mod mirror://goproxy//k8s.io/kube-aggregator/@v/v0.19.5.mod -> k8s.io%2Fkube-aggregator%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kube-controller-manager/@v/v0.19.5.mod -> k8s.io%2Fkube-controller-manager%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190502190224-411b2483e503.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190502190224-411b2483e503.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20191107075043-30be4d16710a.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200121204235-bf4fb3bd569c.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200121204235-bf4fb3bd569c.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200805222855-6aeccd4b50c6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200805222855-6aeccd4b50c6.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20210305001622-591a79e4bda7.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210305001622-591a79e4bda7.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20210305001622-591a79e4bda7.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210305001622-591a79e4bda7.mod mirror://goproxy//k8s.io/kube-proxy/@v/v0.19.5.mod -> k8s.io%2Fkube-proxy%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kube-scheduler/@v/v0.19.5.mod -> k8s.io%2Fkube-scheduler%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kubectl/@v/v0.19.5.mod -> k8s.io%2Fkubectl%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kubelet/@v/v0.19.5.mod -> k8s.io%2Fkubelet%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.19.5.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.19.5.mod mirror://goproxy//k8s.io/kubernetes/@v/v1.21.0.zip -> k8s.io%2Fkubernetes%2F@v%2Fv1.21.0.zip mirror://goproxy//k8s.io/kubernetes/@v/v1.21.0.mod -> k8s.io%2Fkubernetes%2F@v%2Fv1.21.0.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/api/@v/v0.0.0-20210408162405-cb303e613a12.zip -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.zip mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/api/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/apimachinery/@v/v0.0.0-20210408162405-cb303e613a12.zip -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.zip mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/apimachinery/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/apiserver/@v/v0.0.0-20210408162405-cb303e613a12.zip -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.zip mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/apiserver/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/client-go/@v/v0.0.0-20210408162405-cb303e613a12.zip -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.zip mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/client-go/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/code-generator/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/component-base/@v/v0.0.0-20210408162405-cb303e613a12.zip -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.zip mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/component-base/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/component-helpers/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/controller-manager/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/cri-api/@v/v0.0.0-20210408162405-cb303e613a12.zip -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.zip mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/cri-api/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/kubectl/@v/v0.0.0-20210408162405-cb303e613a12.zip -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.zip mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/kubectl/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/kubelet/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/metrics/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/mount-utils/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver/@v/v0.0.0-20210408162405-cb303e613a12.mod -> k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod mirror://goproxy//k8s.io/legacy-cloud-providers/@v/v0.19.5.mod -> k8s.io%2Flegacy-cloud-providers%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/metrics/@v/v0.19.5.mod -> k8s.io%2Fmetrics%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/sample-apiserver/@v/v0.19.5.mod -> k8s.io%2Fsample-apiserver%2F@v%2Fv0.19.5.mod mirror://goproxy//k8s.io/system-validators/@v/v1.1.2.mod -> k8s.io%2Fsystem-validators%2F@v%2Fv1.1.2.mod mirror://goproxy//k8s.io/system-validators/@v/v1.4.0.zip -> k8s.io%2Fsystem-validators%2F@v%2Fv1.4.0.zip mirror://goproxy//k8s.io/system-validators/@v/v1.4.0.mod -> k8s.io%2Fsystem-validators%2F@v%2Fv1.4.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190506122338-8fab8cb257d5.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190506122338-8fab8cb257d5.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191114184206-e782cd3c129f.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200414100711-2df71ebbae66.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200414100711-2df71ebbae66.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200729134348-d5654de09c73.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200729134348-d5654de09c73.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//modernc.org/cc/@v/v1.0.0.mod -> modernc.org%2Fcc%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/golex/@v/v1.0.0.mod -> modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/mathutil/@v/v1.0.0.mod -> modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/strutil/@v/v1.0.0.mod -> modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/xc/@v/v1.0.0.mod -> modernc.org%2Fxc%2F@v%2Fv1.0.0.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.15.zip -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.zip mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.15.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.7.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.7.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.9.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.9.mod mirror://goproxy//sigs.k8s.io/kustomize/@v/v2.0.3+incompatible.mod -> sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//sigs.k8s.io/kustomize/api/@v/v0.8.5.zip -> sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.8.5.zip mirror://goproxy//sigs.k8s.io/kustomize/api/@v/v0.8.5.mod -> sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.8.5.mod mirror://goproxy//sigs.k8s.io/kustomize/cmd/config/@v/v0.9.7.mod -> sigs.k8s.io%2Fkustomize%2Fcmd%2Fconfig%2F@v%2Fv0.9.7.mod mirror://goproxy//sigs.k8s.io/kustomize/kustomize/v4/@v/v4.0.5.zip -> sigs.k8s.io%2Fkustomize%2Fkustomize%2Fv4%2F@v%2Fv4.0.5.zip mirror://goproxy//sigs.k8s.io/kustomize/kustomize/v4/@v/v4.0.5.mod -> sigs.k8s.io%2Fkustomize%2Fkustomize%2Fv4%2F@v%2Fv4.0.5.mod mirror://goproxy//sigs.k8s.io/kustomize/kyaml/@v/v0.10.15.zip -> sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.10.15.zip mirror://goproxy//sigs.k8s.io/kustomize/kyaml/@v/v0.10.15.mod -> sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.10.15.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190426204423-ea680f03cc65.zip -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190426204423-ea680f03cc65.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190426204423-ea680f03cc65.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190426204423-ea680f03cc65.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v1.0.1-0.20191108220359-b1b620dd3f06.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv1.0.1-0.20191108220359-b1b620dd3f06.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.1.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.1.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.1.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//vbom.ml/util/@v/v0.0.0-20160121211510-db5cfe13f5cc.mod -> vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod https://helm.traefik.io/traefik/traefik-9.18.2.tgz https://github.com/rancher/plugins/archive/refs/tags/v0.8.6-k3s1.tar.gz -> k3s-cni-plugins-0.8.6.tar.gz amd64? ( https://github.com/rancher/k3s-root/releases/download/v0.8.1/k3s-root-amd64.tar -> k3s-root-amd64-0.8.1.tar )
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6d9e0bcfc5f8e743d259e10b74058ac6
diff --git a/metadata/md5-cache/sys-cluster/k3s-1.21.5 b/metadata/md5-cache/sys-cluster/k3s-1.21.5
new file mode 100644
index 000000000000..b33ef7d244e9
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/k3s-1.21.5
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare setup unpack
+DEPEND=app-misc/yq net-firewall/conntrack-tools rootless? ( app-emulation/slirp4netns )
+DESCRIPTION=Lightweight Kubernetes
+EAPI=7
+HOMEPAGE=https://k3s.io
+IUSE=+kubectl-symlink rootless kernel_linux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=kubectl-symlink? ( !sys-cluster/kubectl )
+REQUIRED_USE=|| ( amd64 )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/k3s-io/k3s/archive/refs/tags/v1.21.5+k3s1.tar.gz -> k3s-1.21.5.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//bitbucket.org/bertimus9/systemstat/@v/v0.0.0-20180207000608-0eeff89b0690.mod -> bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20201218220906-28db891af037.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20201218220906-28db891af037.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.2.1+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v43.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv43.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v43.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv43.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.8.1+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.6.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.6.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.12.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.12.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.12.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.12.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.5.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20200415212048-7901bc822317.zip -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20200415212048-7901bc822317.zip mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20200415212048-7901bc822317.mod -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20200415212048-7901bc822317.mod mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.zip -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.zip mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.mod -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210211115548-6eac466e5fa3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210324224401-5516f17a5958.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210324224401-5516f17a5958.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.19.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.19.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.19.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.19.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.16.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.16.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.16.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.16.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.20.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.20.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.20.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.20.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20201218223536-d3e5debf77da.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20201218223536-d3e5debf77da.mod mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20210227013316-43a75bb4edd3.zip -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20210227013316-43a75bb4edd3.zip mirror://goproxy//github.com/!microsoft/hcsshim/test/@v/v0.0.0-20210227013316-43a75bb4edd3.mod -> github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20210227013316-43a75bb4edd3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.zip -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.mod -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!shopify/logrus-bugsnag/@v/v0.0.0-20171204204709-577dee27f20d.mod -> github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ajstarks/svgo/@v/v0.0.0-20180226025133-644b8db467af.mod -> github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.mod -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod mirror://goproxy//github.com/andreyvit/diff/@v/v0.0.0-20170406064948-c7f18ee00883.mod -> github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/auth0/go-jwt-middleware/@v/v0.0.0-20170425171159-5493cabe49f7.mod -> github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.12.54.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.12.54.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.35.24.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.24.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.35.24.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.24.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20160804104726-4c0e84591b9a.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bifurcation/mint/@v/v0.0.0-20180715133206-93c51c6ce115.mod -> github.com%2Fbifurcation%2Fmint%2F@v%2Fv0.0.0-20180715133206-93c51c6ce115.mod mirror://goproxy//github.com/bitly/go-simplejson/@v/v0.5.0.mod -> github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/bits-and-blooms/bitset/@v/v1.2.0.zip -> github.com%2Fbits-and-blooms%2Fbitset%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/bits-and-blooms/bitset/@v/v1.2.0.mod -> github.com%2Fbits-and-blooms%2Fbitset%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/blang/semver/@v/v3.1.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/bmizerany/assert/@v/v0.0.0-20160611221934-b7ed37b82869.mod -> github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20171013065002-4d72634a2f11.mod -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20171013065002-4d72634a2f11.mod mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20190828090544-27d02f80ba40.zip -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20190828090544-27d02f80ba40.zip mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20190828090544-27d02f80ba40.mod -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20190828090544-27d02f80ba40.mod mirror://goproxy//github.com/bshuster-repo/logrus-logstash-hook/@v/v0.4.1.mod -> github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.mod mirror://goproxy//github.com/bugsnag/bugsnag-go/@v/v0.0.0-20141110184014-b1d153021fcd.mod -> github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod mirror://goproxy//github.com/bugsnag/osext/@v/v0.0.0-20130617224835-0dd3f918b21b.mod -> github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod mirror://goproxy//github.com/bugsnag/panicwrap/@v/v0.0.0-20151223152923-e2c28503fcd0.mod -> github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod mirror://goproxy//github.com/caddyserver/caddy/@v/v1.0.3.mod -> github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/canonical/go-dqlite/@v/v1.5.1.zip -> github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/canonical/go-dqlite/@v/v1.5.1.mod -> github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.1.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.1.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.zip -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.zip mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v5/@v/v5.0.0.zip -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.zip mirror://goproxy//github.com/checkpoint-restore/go-criu/v5/@v/v5.0.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.mod mirror://goproxy//github.com/cheekybits/genny/@v/v0.0.0-20170328200008-9127e812e1e9.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv0.0.0-20170328200008-9127e812e1e9.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.29.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.0.0-20200702112145-1c8d4c9ef775.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.2.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.4.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.5.0.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.5.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.6.2.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.6.2.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/clusterhq/flocker-go/@v/v0.0.0-20160920122132-2b8b7259d313.mod -> github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20200908144142-dab0cbea06f4.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20200908144142-dab0cbea06f4.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20201003224125-76a6863f2989.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20201003224125-76a6863f2989.mod mirror://goproxy//github.com/containerd/aufs/@v/v0.0.0-20210316121734-20793ff83c97.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20210316121734-20793ff83c97.mod mirror://goproxy//github.com/containerd/aufs/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/aufs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20201111183144-404b9149801e.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.mod mirror://goproxy//github.com/containerd/btrfs/@v/v0.0.0-20210316141732-918d888fb676.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20210316141732-918d888fb676.mod mirror://goproxy//github.com/containerd/btrfs/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/btrfs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20190717030353-c4b9ac5c7601.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190717030353-c4b9ac5c7601.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200710171044-318312a37340.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20200824123100-0b889c03f102.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200824123100-0b889c03f102.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20210114181951-8a68de567b68.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20210114181951-8a68de567b68.mod mirror://goproxy//github.com/containerd/cgroups/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/cgroups/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20181022165439-0650fd9eeb50.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20181022165439-0650fd9eeb50.mod mirror://goproxy//github.com/containerd/console/@v/v0.0.0-20191206165004-02ecf6a7291e.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/console/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.2.10.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.2.10.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.0.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.1-0.20191213020239-082f7e3aed57.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.3.2.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.0-beta.2.0.20200729163537-40b22ef07410.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.0-beta.2.0.20200729163537-40b22ef07410.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.4.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.1.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.1.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.3.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.3.mod mirror://goproxy//github.com/containerd/containerd/@v/v1.5.0-beta.4.mod -> github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.4.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20180307165137-3d5202aec260.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20180307165137-3d5202aec260.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20200410184934-f15a3290365b.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20201026212402-0724c46b320c.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20201026212402-0724c46b320c.mod mirror://goproxy//github.com/containerd/fifo/@v/v0.0.0-20210316144830-115abcc95a1d.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20210316144830-115abcc95a1d.mod mirror://goproxy//github.com/containerd/fifo/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/fifo/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/fuse-overlayfs-snapshotter/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Ffuse-overlayfs-snapshotter%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/fuse-overlayfs-snapshotter/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Ffuse-overlayfs-snapshotter%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20180907222934-5a6d9f37cfa3.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20190911050354-e029b79d8cda.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20190911050354-e029b79d8cda.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20200220073739-7016d3ce2328.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20201020171139-16b287bc67d0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20201020171139-16b287bc67d0.mod mirror://goproxy//github.com/containerd/go-runc/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/go-runc/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.0.4-0.20210301171431-0ae5c75f59ba.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.4-0.20210301171431-0ae5c75f59ba.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1.zip -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1-0.20210312161619-7ed62a527887.zip -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1-0.20210312161619-7ed62a527887.zip mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1-0.20210312161619-7ed62a527887.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1-0.20210312161619-7ed62a527887.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/containerd/nri/@v/v0.0.0-20201007170849-eb1350a75164.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20201007170849-eb1350a75164.mod mirror://goproxy//github.com/containerd/nri/@v/v0.0.0-20210316161719-dbaa18c31c14.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20210316161719-dbaa18c31c14.mod mirror://goproxy//github.com/containerd/stargz-snapshotter/estargz/@v/v0.4.1.mod -> github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828154514-0e0f228740de.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20190828172938-92c8520ef9f8.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828172938-92c8520ef9f8.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v0.0.0-20191028202541-4f1b8fe65a5c.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20191028202541-4f1b8fe65a5c.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20180627222232-a93fcdb778cd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v0.0.0-20190911142611-5eb25027c9fd.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190911142611-5eb25027c9fd.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20200918131355-0a33824f23a2.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20200918131355-0a33824f23a2.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20210301145711-11e8f1707f62.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210301145711-11e8f1707f62.mod mirror://goproxy//github.com/containerd/zfs/@v/v0.0.0-20210315114300-dde8f0fda960.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210315114300-dde8f0fda960.mod mirror://goproxy//github.com/containerd/zfs/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/zfs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.zip -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.zip mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.0.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.0.zip -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.0.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.1.zip -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.3.0.zip -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.3.0.mod -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.11.mod -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.11.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.1.11+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.1.11+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20161114122254-48702e0da86b.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20161114122254-48702e0da86b.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.0.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.1.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.1.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.2.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.2.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.zip -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.11.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.11.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.mod -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.mod -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.mod -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.mod -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.zip -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.zip mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170629053852-f6cab0c35083.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170629053852-f6cab0c35083.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20190125010748-a747050bb1ba.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v0.0.0-20170104182250-a601269ab70c.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20191017083524-a8ff7f821017.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20191017083524-a8ff7f821017.zip mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20191017083524-a8ff7f821017.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20191017083524-a8ff7f821017.mod mirror://goproxy//github.com/docker/distribution/@v/v0.0.0-20190905152932-14b96e55d84c.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20190905152932-14b96e55d84c.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v20.10.2+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.2+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v20.10.2+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.2+incompatible.mod mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.zip -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.zip mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.mod -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20170721190031-9461782956ad.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20170721190031-9461782956ad.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.zip -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.zip mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.0-20180209012529-399ea8c73916.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/libtrust/@v/v0.0.0-20150114040149-fa567046d9b1.mod -> github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.zip -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/erikdubbelboer/gspt/@v/v0.0.0-20190125194910-e68493906b83.zip -> github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.zip mirror://goproxy//github.com/erikdubbelboer/gspt/@v/v0.0.0-20190125194910-e68493906b83.mod -> github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.mod mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.zip -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.mod -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.9.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.zip -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.mod -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod mirror://goproxy//github.com/fanliao/go-promise/@v/v0.0.0-20141029170127-1890db352a72.mod -> github.com%2Ffanliao%2Fgo-promise%2F@v%2Fv0.0.0-20141029170127-1890db352a72.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.zip -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/flannel-io/flannel/@v/v0.14.0.zip -> github.com%2Fflannel-io%2Fflannel%2F@v%2Fv0.14.0.zip mirror://goproxy//github.com/flannel-io/flannel/@v/v0.14.0.mod -> github.com%2Fflannel-io%2Fflannel%2F@v%2Fv0.14.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fogleman/gg/@v/v1.2.1-0.20190220221249-0403632d5b90.mod -> github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.1.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.1.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/fullsailor/pkcs7/@v/v0.0.0-20190404230743-d7302db945fa.mod -> github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.mod mirror://goproxy//github.com/fvbommel/sortorder/@v/v1.0.1.zip -> github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/fvbommel/sortorder/@v/v1.0.1.mod -> github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/garyburd/redigo/@v/v0.0.0-20150301180006-535138d7bcd7.mod -> github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/gobuffalo/here/@v/v0.6.0.mod -> github.com%2Fgobuffalo%2Fhere%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20151105175453-c7fdd8b5cd55.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20151105175453-c7fdd8b5cd55.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.8.0.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.8.0.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.2.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.zip -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golangplus/bytes/@v/v0.0.0-20160111154220-45c989fe5450.mod -> github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod mirror://goproxy//github.com/golangplus/fmt/@v/v1.0.0.mod -> github.com%2Fgolangplus%2Ffmt%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.mod mirror://goproxy//github.com/golangplus/testing/@v/v1.0.0.zip -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/golangplus/testing/@v/v1.0.0.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/golang/freetype/@v/v0.0.0-20170609003504-e2365dfdc4a0.mod -> github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.3.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.3.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170426233943-68f4ded48ba9.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170426233943-68f4ded48ba9.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/cadvisor/@v/v0.39.0.zip -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.39.0.zip mirror://goproxy//github.com/google/cadvisor/@v/v0.39.0.mod -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.39.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-containerregistry/@v/v0.0.0-20190617215043-876b8855d23c.mod -> github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.0.0-20190617215043-876b8855d23c.mod mirror://goproxy//github.com/google/go-containerregistry/@v/v0.5.0.zip -> github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/google/go-containerregistry/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/handlers/@v/v0.0.0-20150720190736-60c7bfde3e33.mod -> github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/go-acme/lego/@v/v2.5.0+incompatible.mod -> github.com%2Fgo-acme%2Flego%2F@v%2Fv2.5.0+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.1+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.2+incompatible.zip -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.zip mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.2+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.zip -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.28.1.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.28.1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.0.0-20180825180245-b006789cd277.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.0.0-20180920151709-4f900dc2ade9.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.8.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.8.mod mirror://goproxy//github.com/go-ozzo/ozzo-validation/@v/v3.5.0+incompatible.mod -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-task/slim-sprig/@v/v0.0.0-20210107165309-348f09dbbbc0.mod -> github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v0.0.0-20141028054710-7554cd9344ce.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.0.0-20180201235237-0fb14efe8c47.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.0.0-20180201235237-0fb14efe8c47.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v0.0.0-20161216184304-ed905158d874.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/heketi/heketi/@v/v10.2.0+incompatible.mod -> github.com%2Fheketi%2Fheketi%2F@v%2Fv10.2.0+incompatible.mod mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.mod -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hugelgupf/socketpair/@v/v0.0.0-20190730060125-05d35a94e714.mod -> github.com%2Fhugelgupf%2Fsocketpair%2F@v%2Fv0.0.0-20190730060125-05d35a94e714.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.10.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.10.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/insomniacslk/dhcp/@v/v0.0.0-20210120172423-cc9239ac6294.mod -> github.com%2Finsomniacslk%2Fdhcp%2F@v%2Fv0.0.0-20210120172423-cc9239ac6294.mod mirror://goproxy//github.com/ishidawataru/sctp/@v/v0.0.0-20190723014705-7c296d48a2b5.mod -> github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20190723014705-7c296d48a2b5.mod mirror://goproxy//github.com/jamescun/tuntap/@v/v0.0.0-20190712092105-cb1fb277045c.mod -> github.com%2Fjamescun%2Ftuntap%2F@v%2Fv0.0.0-20190712092105-cb1fb277045c.mod mirror://goproxy//github.com/jetstack/cert-manager/@v/v0.7.2.mod -> github.com%2Fjetstack%2Fcert-manager%2F@v%2Fv0.7.2.mod mirror://goproxy//github.com/jimstudt/http-authentication/@v/v0.0.0-20140401203705-3eca13d6893a.mod -> github.com%2Fjimstudt%2Fhttp-authentication%2F@v%2Fv0.0.0-20140401203705-3eca13d6893a.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joefitzgerald/rainbow-reporter/@v/v0.1.0.mod -> github.com%2Fjoefitzgerald%2Frainbow-reporter%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joho/godotenv/@v/v0.0.0-20161216230537-726cc8b906e3.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv0.0.0-20161216230537-726cc8b906e3.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201009170750-9c6f07d100c1.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201110080708-d2c240429e6c.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201110080708-d2c240429e6c.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/jung-kurt/gofpdf/@v/v1.0.3-0.20190309125859-24315acbbda5.mod -> github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.mod -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.mod mirror://goproxy//github.com/k3s-io/containerd/@v/v1.4.9-k3s1.zip -> github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.4.9-k3s1.zip mirror://goproxy//github.com/k3s-io/containerd/@v/v1.4.9-k3s1.mod -> github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.4.9-k3s1.mod mirror://goproxy//github.com/k3s-io/continuity/@v/v0.0.0-20210309170710-f93269e0d5c1.zip -> github.com%2Fk3s-io%2Fcontinuity%2F@v%2Fv0.0.0-20210309170710-f93269e0d5c1.zip mirror://goproxy//github.com/k3s-io/continuity/@v/v0.0.0-20210309170710-f93269e0d5c1.mod -> github.com%2Fk3s-io%2Fcontinuity%2F@v%2Fv0.0.0-20210309170710-f93269e0d5c1.mod mirror://goproxy//github.com/k3s-io/cri/@v/v1.4.0-k3s.7.zip -> github.com%2Fk3s-io%2Fcri%2F@v%2Fv1.4.0-k3s.7.zip mirror://goproxy//github.com/k3s-io/cri/@v/v1.4.0-k3s.7.mod -> github.com%2Fk3s-io%2Fcri%2F@v%2Fv1.4.0-k3s.7.mod mirror://goproxy//github.com/k3s-io/cri-tools/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fcri-tools%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/cri-tools/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fcri-tools%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/etcd/@v/v0.5.0-alpha.5.0.20201208200253-50621aee4aea.zip -> github.com%2Fk3s-io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20201208200253-50621aee4aea.zip mirror://goproxy//github.com/k3s-io/etcd/@v/v0.5.0-alpha.5.0.20201208200253-50621aee4aea.mod -> github.com%2Fk3s-io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20201208200253-50621aee4aea.mod mirror://goproxy//github.com/k3s-io/helm-controller/@v/v0.10.5.zip -> github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.10.5.zip mirror://goproxy//github.com/k3s-io/helm-controller/@v/v0.10.5.mod -> github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.10.5.mod mirror://goproxy//github.com/k3s-io/kine/@v/v0.6.2.zip -> github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.6.2.zip mirror://goproxy//github.com/k3s-io/kine/@v/v0.6.2.mod -> github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.6.2.mod mirror://goproxy//github.com/k3s-io/kubernetes/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/api/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/api/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils/@v/v1.21.5-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.21.5-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver/@v/v1.21.5-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv1.21.5-k3s1.mod mirror://goproxy//github.com/k3s-io/protobuf/@v/v1.4.3-k3s1.zip -> github.com%2Fk3s-io%2Fprotobuf%2F@v%2Fv1.4.3-k3s1.zip mirror://goproxy//github.com/k3s-io/protobuf/@v/v1.4.3-k3s1.mod -> github.com%2Fk3s-io%2Fprotobuf%2F@v%2Fv1.4.3-k3s1.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.3.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.12.2.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.2.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.12.2.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.2.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/knative/build/@v/v0.6.0.mod -> github.com%2Fknative%2Fbuild%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/knative/pkg/@v/v0.0.0-20190514205332-5e4512dcb2ca.mod -> github.com%2Fknative%2Fpkg%2F@v%2Fv0.0.0-20190514205332-5e4512dcb2ca.mod mirror://goproxy//github.com/knative/serving/@v/v0.6.1.mod -> github.com%2Fknative%2Fserving%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.mod -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.8.0.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/lib/pq/@v/v1.8.0.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.zip -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.mod -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.zip -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.mod -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lpabon/godbc/@v/v0.1.1.mod -> github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/lucas-clemente/aes12/@v/v0.0.0-20171027163421-cd47fb39b79f.mod -> github.com%2Flucas-clemente%2Faes12%2F@v%2Fv0.0.0-20171027163421-cd47fb39b79f.mod mirror://goproxy//github.com/lucas-clemente/quic-clients/@v/v0.1.0.mod -> github.com%2Flucas-clemente%2Fquic-clients%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.10.2.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.10.2.mod mirror://goproxy//github.com/lucas-clemente/quic-go-certificates/@v/v0.0.0-20160823095156-d2f86524cced.mod -> github.com%2Flucas-clemente%2Fquic-go-certificates%2F@v%2Fv0.0.0-20160823095156-d2f86524cced.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/markbates/pkger/@v/v0.17.1.mod -> github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.1.mod mirror://goproxy//github.com/marstr/guid/@v/v1.1.0.mod -> github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/marten-seemann/qtls/@v/v0.2.3.mod -> github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/mattbaird/jsonpatch/@v/v0.0.0-20171005235357-81af80346b1a.mod -> github.com%2Fmattbaird%2Fjsonpatch%2F@v%2Fv0.0.0-20171005235357-81af80346b1a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.4.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.4.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.4.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/maxbrunsfeld/counterfeiter/v6/@v/v6.2.2.mod -> github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.2.2.mod mirror://goproxy//github.com/mdlayher/ethernet/@v/v0.0.0-20190606142754-0394541c37b7.mod -> github.com%2Fmdlayher%2Fethernet%2F@v%2Fv0.0.0-20190606142754-0394541c37b7.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mdlayher/raw/@v/v0.0.0-20190606142536-fef19f00fc18.mod -> github.com%2Fmdlayher%2Fraw%2F@v%2Fv0.0.0-20190606142536-fef19f00fc18.mod mirror://goproxy//github.com/mdlayher/raw/@v/v0.0.0-20191009151244-50f2db8cc065.mod -> github.com%2Fmdlayher%2Fraw%2F@v%2Fv0.0.0-20191009151244-50f2db8cc065.mod mirror://goproxy//github.com/mholt/certmagic/@v/v0.6.2-0.20190624175158-6a42ef9fe8c2.mod -> github.com%2Fmholt%2Fcertmagic%2F@v%2Fv0.6.2-0.20190624175158-6a42ef9fe8c2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.3.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.35.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.35.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.35.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.35.mod mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.zip -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.mod -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.zip -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.zip mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.mod -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.mod mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.zip -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.mod -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.7.zip -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.zip mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.7.mod -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/minio/sio/@v/v0.2.1.mod -> github.com%2Fminio%2Fsio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.zip -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.zip mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/osext/@v/v0.0.0-20151018003038-5e2d6d41470f.mod -> github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.zip -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.mod -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/spdystream/@v/v0.2.0.zip -> github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/moby/spdystream/@v/v0.2.0.mod -> github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.0.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/moby/sys/symlink/@v/v0.1.0.zip -> github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/moby/sys/symlink/@v/v0.1.0.mod -> github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20200312100748-672ec06f55cd.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20201216013528-df9cb8a40635.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20201216013528-df9cb8a40635.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.mod mirror://goproxy//github.com/moby/vpnkit/@v/v0.5.0.mod -> github.com%2Fmoby%2Fvpnkit%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170603005431-491d3605edfb.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.mod mirror://goproxy//github.com/monochromegane/go-gitignore/@v/v0.0.0-20200626010858-205db1a8cc00.zip -> github.com%2Fmonochromegane%2Fgo-gitignore%2F@v%2Fv0.0.0-20200626010858-205db1a8cc00.zip mirror://goproxy//github.com/monochromegane/go-gitignore/@v/v0.0.0-20200626010858-205db1a8cc00.mod -> github.com%2Fmonochromegane%2Fgo-gitignore%2F@v%2Fv0.0.0-20200626010858-205db1a8cc00.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.zip -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.zip -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.zip mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod mirror://goproxy//github.com/mvdan/xurls/@v/v1.1.0.mod -> github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.zip -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.mod -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/naoina/toml/@v/v0.1.1.mod -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/natefinch/lumberjack/@v/v2.0.0+incompatible.zip -> github.com%2Fnatefinch%2Flumberjack%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/natefinch/lumberjack/@v/v2.0.0+incompatible.mod -> github.com%2Fnatefinch%2Flumberjack%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/ncw/swift/@v/v1.0.47.mod -> github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.8.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.8.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20151202141238-7f8ab55aaf3b.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.1.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.1.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20151007035656-2152b45fa28a.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.11.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.11.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v0.0.0-20170106003457-a6d0ee40d420.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.0.20180430190053-c9281466c8b2.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20180430190053-c9281466c8b2.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0-rc1.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc94.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc94.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.0-rc94.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc94.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.2.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2-0.20190207185410-29686dbc5559.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20190207185410-29686dbc5559.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200929063507-e6143ca7d51d.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210316141917-a8c4a9ee0f6b.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210316141917-a8c4a9ee0f6b.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210316141917-a8c4a9ee0f6b.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210316141917-a8c4a9ee0f6b.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210326190908-1c3f411f0417.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210326190908-1c3f411f0417.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.mod mirror://goproxy//github.com/opencontainers/runtime-tools/@v/v0.0.0-20181011054405-1d69bd0f9c39.mod -> github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.6.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.0.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.2.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.2.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.2.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.2.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.1.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.6.0+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.6.0+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.6.0+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.6.0+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.0.0-20180209125602-c332b6f63c06.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20171117100541-99fa1f4be8e5.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180110214958-89604d197083.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180125133057-cb4147076ac7.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/quobyte/api/@v/v0.1.8.mod -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/rancher/dynamiclistener/@v/v0.2.3.zip -> github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/rancher/dynamiclistener/@v/v0.2.3.mod -> github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/rancher/moq/@v/v0.0.0-20190404221404-ee5226d43009.mod -> github.com%2Francher%2Fmoq%2F@v%2Fv0.0.0-20190404221404-ee5226d43009.mod mirror://goproxy//github.com/rancher/remotedialer/@v/v0.2.0.zip -> github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rancher/remotedialer/@v/v0.2.0.mod -> github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rancher/wharfie/@v/v0.3.4.zip -> github.com%2Francher%2Fwharfie%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/rancher/wharfie/@v/v0.3.4.mod -> github.com%2Francher%2Fwharfie%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.1.4.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.4.0.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.0.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.1.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.2.zip -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.2.zip mirror://goproxy//github.com/rancher/wrangler/@v/v0.6.2.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.2.mod mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.2.0.mod -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.6.0.zip -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/rancher/wrangler-api/@v/v0.6.0.mod -> github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/remyoudompheng/bigfft/@v/v0.0.0-20170806203942-52369c62f446.mod -> github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.zip -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/robfig/cron/@v/v1.1.0.mod -> github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/robfig/cron/v3/@v/v3.0.1.zip -> github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/robfig/cron/v3/@v/v3.0.1.mod -> github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.14.0.zip -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.0.zip mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.14.0.mod -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.zip -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.zip -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.zip mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.mod -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.mod mirror://goproxy//github.com/russross/blackfriday/@v/v0.0.0-20170610170232-067529f716f4.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv0.0.0-20170610170232-067529f716f4.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sclevine/spec/@v/v1.2.0.mod -> github.com%2Fsclevine%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.zip -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stefanberger/go-pkcs11uri/@v/v0.0.0-20201008174630-78d3cae3a980.zip -> github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.zip mirror://goproxy//github.com/stefanberger/go-pkcs11uri/@v/v0.0.0-20201008174630-78d3cae3a980.mod -> github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.mod mirror://goproxy//github.com/storageos/go-api/@v/v2.2.0+incompatible.mod -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.0.0-20180129172003-8a3f7159479f.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.0.0-20180129172003-8a3f7159479f.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20180303142811-b89eecf5ca5d.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20180303142811-b89eecf5ca5d.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20170704070218-db04d3cc01c8.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20180916011248-d98352740cb2.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.zip mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.zip -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.zip mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.3.0+incompatible.zip -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.zip mirror://goproxy//github.com/tchap/go-patricia/@v/v2.3.0+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.mod mirror://goproxy//github.com/tektoncd/pipeline/@v/v0.4.0.mod -> github.com%2Ftektoncd%2Fpipeline%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v1.0.67.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv1.0.67.mod mirror://goproxy//github.com/thecodeteam/goscaleio/@v/v0.1.0.mod -> github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/ugorji/go/@v/v0.0.0-20170107133203-ded73eae5db7.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20170107133203-ded73eae5db7.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.21.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.21.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.mod -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/u-root/u-root/@v/v7.0.0+incompatible.mod -> github.com%2Fu-root%2Fu-root%2F@v%2Fv7.0.0+incompatible.mod mirror://goproxy//github.com/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20181108222139-023a6dafdcdf.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11.zip -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/willf/bitset/@v/v1.1.11-0.20200630133818-d5bec3311243.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v0.0.0-20180618132009-1d523034197f.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20181112141820-a009c3971eca.zip -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20181112141820-a009c3971eca.zip mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20181112141820-a009c3971eca.mod -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20181112141820-a009c3971eca.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yvasiyarov/gorelic/@v/v0.0.0-20141212073537-a9bba5b9ab50.mod -> github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod mirror://goproxy//github.com/yvasiyarov/go-metrics/@v/v0.0.0-20140926110328-57bccd1ccd43.mod -> github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod mirror://goproxy//github.com/yvasiyarov/newrelic_platform_go/@v/v0.0.0-20140908184405-b21fdbd4370f.mod -> github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181009213950-7c1a557ab941.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180321215751-8460e604b9de.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180807140117-3d87b88a115f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190312203227-4b39c73a6495.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190731235908-ec7cb31e5a56.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190731235908-ec7cb31e5a56.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20210220032938-85be41e4509f.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20210220032938-85be41e4509f.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20210220032938-85be41e4509f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20210220032938-85be41e4509f.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20180708004352-c73c2afc3b81.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20201217150744-e6ae53a27f4f.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20201217150744-e6ae53a27f4f.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191209134235-331c550502dd.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191209134235-331c550502dd.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.1-0.20200828183125-ce943fd02449.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.1-0.20200828183125-ce943fd02449.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.1-0.20200828183125-ce943fd02449.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.1-0.20200828183125-ce943fd02449.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181011144130-49bb7cea24b1.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210224082022-3d97a244fca7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210224082022-3d97a244fca7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210224082022-3d97a244fca7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210224082022-3d97a244fca7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190522044717-8097e1b27ff5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190522044717-8097e1b27ff5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190602015325-4c4f7f33c9ed.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190616124812-15dcb6c0061f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190812073006-9eafafc0a87e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190812073006-9eafafc0a87e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191115151921-52ab43148777.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200622214017-ed371f2e16b4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200622214017-ed371f2e16b4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200817155316-9781c653f443.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200817155316-9781c653f443.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200909081042-eff7692f9009.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200916030750-2334cc1a136f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916030750-2334cc1a136f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200922070232-aee5d888a860.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200922070232-aee5d888a860.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201112073958-5cba982894dd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201202213521-69691e467435.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201202213521-69691e467435.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210225134936-a50acf3fe073.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210225134936-a50acf3fe073.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210225134936-a50acf3fe073.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210225134936-a50acf3fe073.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210324051608-47abb6519492.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426230700-d19ff857e887.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426230700-d19ff857e887.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210220033141-f8bda1e9f3ba.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210220033141-f8bda1e9f3ba.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190706070813-72ffa07ba3db.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190706070813-72ffa07ba3db.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190920225731-5eefd052ad72.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191017205301-920acffc3e65.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191017205301-920acffc3e65.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117012304-6edc0a871e69.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117012304-6edc0a871e69.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200505023115-26f46d2f7ef8.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200505023115-26f46d2f7ef8.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200916195026-c9a70fc28ce3.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200916195026-c9a70fc28ce3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201224043029-2b0845dc783e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201224043029-2b0845dc783e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20180816165407-929014505bf4.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20190331200053-3d26580ed485.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.zip -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.zip mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.zip -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.zip mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod mirror://goproxy//gonum.org/v1/plot/@v/v0.0.0-20190515093506-e2840ee46a6b.mod -> gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20160322025152-9bf6e6e569ff.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.1-0.20200106000736-b8fc810ca6b5.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.1-0.20200106000736-b8fc810ca6b5.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.zip mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/cloud/@v/v0.0.0-20151119220103-975617b05ea8.mod -> google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200513103714-09dca8ec2884.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200513103714-09dca8ec2884.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/grpc/@v/v0.0.0-20160317175043-d3ddb4469d5a.mod -> google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.24.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.zip mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20141024133853-64131543e789.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.zip -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.zip mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod mirror://goproxy//gopkg.in/mcuadros/go-syslog.v2/@v/v2.2.1.mod -> gopkg.in%2Fmcuadros%2Fgo-syslog.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.zip -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.zip mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.zip -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.zip mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.zip -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.zip mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.mod -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.starlark.net/@v/v0.0.0-20200306205701-8dd3e2ee1dd5.zip -> go.starlark.net%2F@v%2Fv0.0.0-20200306205701-8dd3e2ee1dd5.zip mirror://goproxy//go.starlark.net/@v/v0.0.0-20200306205701-8dd3e2ee1dd5.mod -> go.starlark.net%2F@v%2Fv0.0.0-20200306205701-8dd3e2ee1dd5.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.19.10.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.10.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.19.10.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/apiserver/@v/v0.19.10.zip -> k8s.io%2Fapiserver%2F@v%2Fv0.19.10.zip mirror://goproxy//k8s.io/apiserver/@v/v0.19.10.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/api/@v/v0.19.10.zip -> k8s.io%2Fapi%2F@v%2Fv0.19.10.zip mirror://goproxy//k8s.io/api/@v/v0.19.10.mod -> k8s.io%2Fapi%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/client-go/@v/v0.19.10.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.19.10.zip mirror://goproxy//k8s.io/client-go/@v/v0.19.10.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/component-base/@v/v0.19.10.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/cri-api/@v/v0.19.10.zip -> k8s.io%2Fcri-api%2F@v%2Fv0.19.10.zip mirror://goproxy//k8s.io/cri-api/@v/v0.19.10.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.19.10.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190327210449-e17681d19d3a.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190327210449-e17681d19d3a.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20191120174120-e74f70b9b27e.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20191120174120-e74f70b9b27e.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200114144118-36b2048a9120.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20201113003025-83324d819ded.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20201113003025-83324d819ded.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20201214224949-b6c5ce23f027.zip -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20201214224949-b6c5ce23f027.zip mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20201214224949-b6c5ce23f027.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20201214224949-b6c5ce23f027.mod mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.zip -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.zip mirror://goproxy//k8s.io/heapster/@v/v1.2.0-beta.1.mod -> k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.2.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.4.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.8.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.8.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.8.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.8.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190502190224-411b2483e503.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190502190224-411b2483e503.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200805222855-6aeccd4b50c6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200805222855-6aeccd4b50c6.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20210305001622-591a79e4bda7.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210305001622-591a79e4bda7.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20210305001622-591a79e4bda7.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210305001622-591a79e4bda7.mod mirror://goproxy//k8s.io/system-validators/@v/v1.4.0.mod -> k8s.io%2Fsystem-validators%2F@v%2Fv1.4.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190506122338-8fab8cb257d5.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190506122338-8fab8cb257d5.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200729134348-d5654de09c73.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//modernc.org/cc/@v/v1.0.0.mod -> modernc.org%2Fcc%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/golex/@v/v1.0.0.mod -> modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/mathutil/@v/v1.0.0.mod -> modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/strutil/@v/v1.0.0.mod -> modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/xc/@v/v1.0.0.mod -> modernc.org%2Fxc%2F@v%2Fv1.0.0.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.15.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.22.zip -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.22.zip mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.22.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.22.mod mirror://goproxy//sigs.k8s.io/kustomize/api/@v/v0.8.8.zip -> sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.8.8.zip mirror://goproxy//sigs.k8s.io/kustomize/api/@v/v0.8.8.mod -> sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.8.8.mod mirror://goproxy//sigs.k8s.io/kustomize/cmd/config/@v/v0.9.10.mod -> sigs.k8s.io%2Fkustomize%2Fcmd%2Fconfig%2F@v%2Fv0.9.10.mod mirror://goproxy//sigs.k8s.io/kustomize/kustomize/v4/@v/v4.1.2.zip -> sigs.k8s.io%2Fkustomize%2Fkustomize%2Fv4%2F@v%2Fv4.1.2.zip mirror://goproxy//sigs.k8s.io/kustomize/kustomize/v4/@v/v4.1.2.mod -> sigs.k8s.io%2Fkustomize%2Fkustomize%2Fv4%2F@v%2Fv4.1.2.mod mirror://goproxy//sigs.k8s.io/kustomize/kyaml/@v/v0.10.17.zip -> sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.10.17.zip mirror://goproxy//sigs.k8s.io/kustomize/kyaml/@v/v0.10.17.mod -> sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.10.17.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190426204423-ea680f03cc65.zip -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190426204423-ea680f03cc65.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190426204423-ea680f03cc65.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190426204423-ea680f03cc65.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.1.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.3.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.3.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.3.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.3.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.2.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.2.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.2.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod https://github.com/opencontainers/runc/archive/refs/tags/v1.0.0-rc95.tar.gz -> k3s-runc-v1.0.2.tar.gz https://helm.traefik.io/traefik/traefik-9.18.2.tgz https://github.com/rancher/plugins/archive/refs/tags/v0.9.1-k3s1.tar.gz -> k3s-cni-plugins-0.9.1.tar.gz amd64? ( https://github.com/rancher/k3s-root/releases/download/v0.9.1/k3s-root-amd64.tar -> k3s-root-amd64-0.9.1.tar )
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9ef23222f51e627b626716fd8d1258fa
diff --git a/metadata/md5-cache/sys-cluster/k3s-1.22.2 b/metadata/md5-cache/sys-cluster/k3s-1.22.2
new file mode 100644
index 000000000000..eabd3c242daa
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/k3s-1.22.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare setup unpack
+DEPEND=app-misc/yq net-firewall/conntrack-tools rootless? ( app-emulation/slirp4netns )
+DESCRIPTION=Lightweight Kubernetes
+EAPI=7
+HOMEPAGE=https://k3s.io
+IUSE=+kubectl-symlink rootless kernel_linux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=kubectl-symlink? ( !sys-cluster/kubectl )
+REQUIRED_USE=|| ( amd64 )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/k3s-io/k3s/archive/refs/tags/v1.22.2+k3s1.tar.gz -> k3s-1.22.2.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//bitbucket.org/bertimus9/systemstat/@v/v0.0.0-20180207000608-0eeff89b0690.mod -> bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.51.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.51.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20201218220906-28db891af037.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20201218220906-28db891af037.mod mirror://goproxy//github.com/360!ent!sec!group-!skylar/excelize/@v/v1.4.1.mod -> github.com%2F360!ent!sec!group-!skylar%2Fexcelize%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v55.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv55.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v55.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv55.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20210608223527-2377c96fe795.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210608223527-2377c96fe795.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20210617225240-d185dfc1b5a1.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210617225240-d185dfc1b5a1.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20210617225240-d185dfc1b5a1.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210617225240-d185dfc1b5a1.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.18.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.18.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20200415212048-7901bc822317.zip -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20200415212048-7901bc822317.zip mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v0.0.0-20200415212048-7901bc822317.mod -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv0.0.0-20200415212048-7901bc822317.mod mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.zip -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.zip mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.mod -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210211115548-6eac466e5fa3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210324224401-5516f17a5958.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210324224401-5516f17a5958.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.16.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.16.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.18.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.18.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.18.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.18.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.20.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.20.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.20.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.20.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/goquery/@v/v1.5.0.mod -> github.com%2F!puerkito!bio%2Fgoquery%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.zip -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.mod -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ajstarks/svgo/@v/v0.0.0-20180226025133-644b8db467af.mod -> github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.mod -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod mirror://goproxy//github.com/andreyvit/diff/@v/v0.0.0-20170406064948-c7f18ee00883.mod -> github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod mirror://goproxy//github.com/andybalholm/cascadia/@v/v1.0.0.mod -> github.com%2Fandybalholm%2Fcascadia%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/antihax/optional/@v/v1.0.0.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/auth0/go-jwt-middleware/@v/v1.0.1.mod -> github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.12.54.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.12.54.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.35.24.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.24.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.49.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.49.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.49.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.49.mod mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.3.zip -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.3.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bits-and-blooms/bitset/@v/v1.2.0.zip -> github.com%2Fbits-and-blooms%2Fbitset%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/bits-and-blooms/bitset/@v/v1.2.0.mod -> github.com%2Fbits-and-blooms%2Fbitset%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20201105010758-936f38b697fd.zip -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20201105010758-936f38b697fd.zip mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20201105010758-936f38b697fd.mod -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20201105010758-936f38b697fd.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.mod mirror://goproxy//github.com/canonical/go-dqlite/@v/v1.5.1.zip -> github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/canonical/go-dqlite/@v/v1.5.1.mod -> github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20191021191039-0944d244cd40.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20191021191039-0944d244cd40.mod mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20200922220541-2c3bb06c6054.zip -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20200922220541-2c3bb06c6054.zip mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20200922220541-2c3bb06c6054.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20200922220541-2c3bb06c6054.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.zip -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.zip mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v5/@v/v5.0.0.zip -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.zip mirror://goproxy//github.com/checkpoint-restore/go-criu/v5/@v/v5.0.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.29.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.2.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.4.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.5.0.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.5.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.6.2.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.6.2.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/clusterhq/flocker-go/@v/v0.0.0-20160920122132-2b8b7259d313.mod -> github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20200714090401-bf6692d28da5.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20200714090401-bf6692d28da5.zip mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20200714090401-bf6692d28da5.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20200714090401-bf6692d28da5.mod mirror://goproxy//github.com/cockroachdb/errors/@v/v1.2.4.zip -> github.com%2Fcockroachdb%2Ferrors%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/cockroachdb/errors/@v/v1.2.4.mod -> github.com%2Fcockroachdb%2Ferrors%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/cockroachdb/logtags/@v/v0.0.0-20190617123548-eb05cc24525f.zip -> github.com%2Fcockroachdb%2Flogtags%2F@v%2Fv0.0.0-20190617123548-eb05cc24525f.zip mirror://goproxy//github.com/cockroachdb/logtags/@v/v0.0.0-20190617123548-eb05cc24525f.mod -> github.com%2Fcockroachdb%2Flogtags%2F@v%2Fv0.0.0-20190617123548-eb05cc24525f.mod mirror://goproxy//github.com/containerd/aufs/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/aufs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/btrfs/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/btrfs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20210114181951-8a68de567b68.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20210114181951-8a68de567b68.mod mirror://goproxy//github.com/containerd/cgroups/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/cgroups/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/console/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20210208174643-50096c924a4e.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20210208174643-50096c924a4e.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.1.0.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.1.0.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/containerd/fifo/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/fifo/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/fuse-overlayfs-snapshotter/@v/v1.0.3.zip -> github.com%2Fcontainerd%2Ffuse-overlayfs-snapshotter%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/containerd/fuse-overlayfs-snapshotter/@v/v1.0.3.mod -> github.com%2Fcontainerd%2Ffuse-overlayfs-snapshotter%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20201020171139-16b287bc67d0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20201020171139-16b287bc67d0.mod mirror://goproxy//github.com/containerd/go-runc/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/go-runc/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1.zip -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/containerd/nri/@v/v0.1.0.zip -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/containerd/nri/@v/v0.1.0.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/containerd/stargz-snapshotter/@v/v0.8.0.zip -> github.com%2Fcontainerd%2Fstargz-snapshotter%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/containerd/stargz-snapshotter/@v/v0.8.0.mod -> github.com%2Fcontainerd%2Fstargz-snapshotter%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/containerd/stargz-snapshotter/estargz/@v/v0.4.1.mod -> github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/containerd/stargz-snapshotter/estargz/@v/v0.8.0.zip -> github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/containerd/stargz-snapshotter/estargz/@v/v0.8.0.mod -> github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/zfs/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/zfs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.1.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.9.1.zip -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/containernetworking/plugins/@v/v0.9.1.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.1.zip -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.5.0.zip -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.5.0.mod -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/coredns/caddy/@v/v1.1.0.mod -> github.com%2Fcoredns%2Fcaddy%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.12.mod -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.12.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.1.11+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.1.11+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.5.0.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.5.0.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.1.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.1.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.2.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.2.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.11.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.11.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.mod -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.mod -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.mod -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.mod -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod mirror://goproxy//github.com/danieljoos/wincred/@v/v1.1.0.mod -> github.com%2Fdanieljoos%2Fwincred%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.zip -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.zip mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170629053852-f6cab0c35083.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170629053852-f6cab0c35083.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/cli/@v/v0.0.0-20191017083524-a8ff7f821017.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20191017083524-a8ff7f821017.mod mirror://goproxy//github.com/docker/cli/@v/v20.10.8+incompatible.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.8+incompatible.zip mirror://goproxy//github.com/docker/cli/@v/v20.10.8+incompatible.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.8+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker/@v/v20.10.2+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.2+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v20.10.2+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.2+incompatible.mod mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.3.mod -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.mod mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.4.zip -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.4.zip mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.4.mod -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.4.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.zip -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.zip mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/dustmop/soup/@v/v1.1.2-0.20190516214245-38228baa104e.mod -> github.com%2Fdustmop%2Fsoup%2F@v%2Fv1.1.2-0.20190516214245-38228baa104e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.zip -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210217033140-668b12f5399d.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/erikdubbelboer/gspt/@v/v0.0.0-20190125194910-e68493906b83.zip -> github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.zip mirror://goproxy//github.com/erikdubbelboer/gspt/@v/v0.0.0-20190125194910-e68493906b83.mod -> github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.mod mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.zip -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.mod -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.11.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.11.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.11.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.11.0+incompatible.mod mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.zip -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.mod -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod mirror://goproxy//github.com/fanliao/go-promise/@v/v0.0.0-20141029170127-1890db352a72.mod -> github.com%2Ffanliao%2Fgo-promise%2F@v%2Fv0.0.0-20141029170127-1890db352a72.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.zip -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/felixge/httpsnoop/@v/v1.0.1.zip -> github.com%2Ffelixge%2Fhttpsnoop%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/felixge/httpsnoop/@v/v1.0.1.mod -> github.com%2Ffelixge%2Fhttpsnoop%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/flannel-io/flannel/@v/v0.14.1-0.20210827074410-fca1560c91cc.zip -> github.com%2Fflannel-io%2Fflannel%2F@v%2Fv0.14.1-0.20210827074410-fca1560c91cc.zip mirror://goproxy//github.com/flannel-io/flannel/@v/v0.14.1-0.20210827074410-fca1560c91cc.mod -> github.com%2Fflannel-io%2Fflannel%2F@v%2Fv0.14.1-0.20210827074410-fca1560c91cc.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fogleman/gg/@v/v1.2.1-0.20190220221249-0403632d5b90.mod -> github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.3+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.3+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.3+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.3+incompatible.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.1.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.1.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/fvbommel/sortorder/@v/v1.0.1.zip -> github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/fvbommel/sortorder/@v/v1.0.1.mod -> github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.zip -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.mod -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.8.1.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.8.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/gofrs/uuid/@v/v4.0.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv4.0.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v4.0.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv4.0.0+incompatible.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.3.2.zip -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/googleapis/@v/v1.3.2.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.zip -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golangplus/bytes/@v/v0.0.0-20160111154220-45c989fe5450.mod -> github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod mirror://goproxy//github.com/golangplus/fmt/@v/v1.0.0.mod -> github.com%2Fgolangplus%2Ffmt%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.mod mirror://goproxy//github.com/golangplus/testing/@v/v1.0.0.zip -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/golangplus/testing/@v/v1.0.0.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/golang/freetype/@v/v0.0.0-20170609003504-e2365dfdc4a0.mod -> github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20180513044358-24b0969c4cb7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20180513044358-24b0969c4cb7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.3.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.5.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.5.5.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.5.5.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/btree/@v/v1.0.1.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/google/btree/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/cadvisor/@v/v0.39.2.zip -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.39.2.zip mirror://goproxy//github.com/google/cadvisor/@v/v0.39.2.mod -> github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.39.2.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/google/go-containerregistry/@v/v0.5.0.zip -> github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/google/go-containerregistry/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.3.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.3.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20200217142428-fce0ec30dd00.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20200217142428-fce0ec30dd00.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20200217142428-fce0ec30dd00.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20200217142428-fce0ec30dd00.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.4.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.4.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.2+incompatible.zip -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.zip mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.2+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.zip -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.28.1.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.28.1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/log/@v/v0.1.0.mod -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/zapr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Fzapr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.0.0-20180825180245-b006789cd277.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.0.0-20180920151709-4f900dc2ade9.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.14.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.14.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.8.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.8.mod mirror://goproxy//github.com/go-ozzo/ozzo-validation/@v/v3.5.0+incompatible.mod -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.6.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.6.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-task/slim-sprig/@v/v0.0.0-20210107165309-348f09dbbbc0.mod -> github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.3.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.3.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.16.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.16.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.mod mirror://goproxy//github.com/hanwen/go-fuse/@v/v1.0.0.zip -> github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hanwen/go-fuse/@v/v1.0.0.mod -> github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hanwen/go-fuse/v2/@v/v2.1.0.zip -> github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/hanwen/go-fuse/v2/@v/v2.1.0.mod -> github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/heketi/heketi/@v/v10.3.0+incompatible.mod -> github.com%2Fheketi%2Fheketi%2F@v%2Fv10.3.0+incompatible.mod mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.mod -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hugelgupf/socketpair/@v/v0.0.0-20190730060125-05d35a94e714.mod -> github.com%2Fhugelgupf%2Fsocketpair%2F@v%2Fv0.0.0-20190730060125-05d35a94e714.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.12.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.12.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.12.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.12.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/insomniacslk/dhcp/@v/v0.0.0-20210120172423-cc9239ac6294.mod -> github.com%2Finsomniacslk%2Fdhcp%2F@v%2Fv0.0.0-20210120172423-cc9239ac6294.mod mirror://goproxy//github.com/ishidawataru/sctp/@v/v0.0.0-20190723014705-7c296d48a2b5.mod -> github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20190723014705-7c296d48a2b5.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joefitzgerald/rainbow-reporter/@v/v0.1.0.mod -> github.com%2Fjoefitzgerald%2Frainbow-reporter%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joho/godotenv/@v/v0.0.0-20161216230537-726cc8b906e3.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv0.0.0-20161216230537-726cc8b906e3.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.2.2.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.2.2.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.zip -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.mod -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201009170750-9c6f07d100c1.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201110080708-d2c240429e6c.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201110080708-d2c240429e6c.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jung-kurt/gofpdf/@v/v1.0.3-0.20190309125859-24315acbbda5.mod -> github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.mod -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.mod mirror://goproxy//github.com/k3s-io/containerd/@v/v1.5.5-k3s1.zip -> github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.5.5-k3s1.zip mirror://goproxy//github.com/k3s-io/containerd/@v/v1.5.5-k3s1.mod -> github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.5.5-k3s1.mod mirror://goproxy//github.com/k3s-io/continuity/@v/v0.0.0-20210309170710-f93269e0d5c1.zip -> github.com%2Fk3s-io%2Fcontinuity%2F@v%2Fv0.0.0-20210309170710-f93269e0d5c1.zip mirror://goproxy//github.com/k3s-io/continuity/@v/v0.0.0-20210309170710-f93269e0d5c1.mod -> github.com%2Fk3s-io%2Fcontinuity%2F@v%2Fv0.0.0-20210309170710-f93269e0d5c1.mod mirror://goproxy//github.com/k3s-io/cri-tools/@v/v1.21.0-k3s1.zip -> github.com%2Fk3s-io%2Fcri-tools%2F@v%2Fv1.21.0-k3s1.zip mirror://goproxy//github.com/k3s-io/cri-tools/@v/v1.21.0-k3s1.mod -> github.com%2Fk3s-io%2Fcri-tools%2F@v%2Fv1.21.0-k3s1.mod mirror://goproxy//github.com/k3s-io/etcd/api/v3/@v/v3.5.0-k3s2.zip -> github.com%2Fk3s-io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0-k3s2.zip mirror://goproxy//github.com/k3s-io/etcd/api/v3/@v/v3.5.0-k3s2.mod -> github.com%2Fk3s-io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0-k3s2.mod mirror://goproxy//github.com/k3s-io/etcd/client/v3/@v/v3.5.0-k3s2.zip -> github.com%2Fk3s-io%2Fetcd%2Fclient%2Fv3%2F@v%2Fv3.5.0-k3s2.zip mirror://goproxy//github.com/k3s-io/etcd/client/v3/@v/v3.5.0-k3s2.mod -> github.com%2Fk3s-io%2Fetcd%2Fclient%2Fv3%2F@v%2Fv3.5.0-k3s2.mod mirror://goproxy//github.com/k3s-io/etcd/etcdutl/v3/@v/v3.5.0-k3s2.zip -> github.com%2Fk3s-io%2Fetcd%2Fetcdutl%2Fv3%2F@v%2Fv3.5.0-k3s2.zip mirror://goproxy//github.com/k3s-io/etcd/etcdutl/v3/@v/v3.5.0-k3s2.mod -> github.com%2Fk3s-io%2Fetcd%2Fetcdutl%2Fv3%2F@v%2Fv3.5.0-k3s2.mod mirror://goproxy//github.com/k3s-io/etcd/server/v3/@v/v3.5.0-k3s2.zip -> github.com%2Fk3s-io%2Fetcd%2Fserver%2Fv3%2F@v%2Fv3.5.0-k3s2.zip mirror://goproxy//github.com/k3s-io/etcd/server/v3/@v/v3.5.0-k3s2.mod -> github.com%2Fk3s-io%2Fetcd%2Fserver%2Fv3%2F@v%2Fv3.5.0-k3s2.mod mirror://goproxy//github.com/k3s-io/helm-controller/@v/v0.11.5.zip -> github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.11.5.zip mirror://goproxy//github.com/k3s-io/helm-controller/@v/v0.11.5.mod -> github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.11.5.mod mirror://goproxy//github.com/k3s-io/kine/@v/v0.8.0.zip -> github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/k3s-io/kine/@v/v0.8.0.mod -> github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/k3s-io/klog/@v/v1.0.0-k3s1.zip -> github.com%2Fk3s-io%2Fklog%2F@v%2Fv1.0.0-k3s1.zip mirror://goproxy//github.com/k3s-io/klog/@v/v1.0.0-k3s1.mod -> github.com%2Fk3s-io%2Fklog%2F@v%2Fv1.0.0-k3s1.mod mirror://goproxy//github.com/k3s-io/klog/v2/@v/v2.9.0-k3s1.zip -> github.com%2Fk3s-io%2Fklog%2Fv2%2F@v%2Fv2.9.0-k3s1.zip mirror://goproxy//github.com/k3s-io/klog/v2/@v/v2.9.0-k3s1.mod -> github.com%2Fk3s-io%2Fklog%2Fv2%2F@v%2Fv2.9.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/api/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/api/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission/@v/v1.22.2-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fpod-security-admission%2F@v%2Fv1.22.2-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fpod-security-admission%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver/@v/v1.22.2-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv1.22.2-k3s1.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.11.13.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.13.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.11.13.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.13.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.12.2.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.2.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.13.5.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.13.5.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.13.5.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.13.5.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.mod -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.10.2.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.10.2.zip mirror://goproxy//github.com/lib/pq/@v/v1.10.2.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.10.2.mod mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.zip -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.mod -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.zip -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.mod -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lpabon/godbc/@v/v0.1.1.mod -> github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.8.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.8.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.8.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.8.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/maxbrunsfeld/counterfeiter/v6/@v/v6.2.2.mod -> github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.2.2.mod mirror://goproxy//github.com/mdlayher/ethernet/@v/v0.0.0-20190606142754-0394541c37b7.mod -> github.com%2Fmdlayher%2Fethernet%2F@v%2Fv0.0.0-20190606142754-0394541c37b7.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mdlayher/raw/@v/v0.0.0-20190606142536-fef19f00fc18.mod -> github.com%2Fmdlayher%2Fraw%2F@v%2Fv0.0.0-20190606142536-fef19f00fc18.mod mirror://goproxy//github.com/mdlayher/raw/@v/v0.0.0-20191009151244-50f2db8cc065.mod -> github.com%2Fmdlayher%2Fraw%2F@v%2Fv0.0.0-20191009151244-50f2db8cc065.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.zip -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.mod -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.zip -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.zip mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.mod -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.mod mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.zip -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.mod -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.7.zip -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.zip mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.7.mod -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/minio/sio/@v/v0.2.1.mod -> github.com%2Fminio%2Fsio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.zip -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.zip mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.zip -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.mod -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/locker/@v/v1.0.1.zip -> github.com%2Fmoby%2Flocker%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/moby/locker/@v/v1.0.1.mod -> github.com%2Fmoby%2Flocker%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/spdystream/@v/v0.2.0.zip -> github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/moby/spdystream/@v/v0.2.0.mod -> github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/moby/sys/symlink/@v/v0.1.0.zip -> github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/moby/sys/symlink/@v/v0.1.0.mod -> github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20201216013528-df9cb8a40635.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20210610120745-9d4ed1856297.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20210610120745-9d4ed1856297.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20210610120745-9d4ed1856297.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20210610120745-9d4ed1856297.mod mirror://goproxy//github.com/moby/vpnkit/@v/v0.5.0.mod -> github.com%2Fmoby%2Fvpnkit%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170603005431-491d3605edfb.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170929034955-c48cc78d4826.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170929034955-c48cc78d4826.mod mirror://goproxy//github.com/monochromegane/go-gitignore/@v/v0.0.0-20200626010858-205db1a8cc00.zip -> github.com%2Fmonochromegane%2Fgo-gitignore%2F@v%2Fv0.0.0-20200626010858-205db1a8cc00.zip mirror://goproxy//github.com/monochromegane/go-gitignore/@v/v0.0.0-20200626010858-205db1a8cc00.mod -> github.com%2Fmonochromegane%2Fgo-gitignore%2F@v%2Fv0.0.0-20200626010858-205db1a8cc00.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.zip -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.zip -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.zip mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod mirror://goproxy//github.com/mvdan/xurls/@v/v1.1.0.mod -> github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.zip -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/natefinch/lumberjack/@v/v2.0.0+incompatible.zip -> github.com%2Fnatefinch%2Flumberjack%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/natefinch/lumberjack/@v/v2.0.0+incompatible.mod -> github.com%2Fnatefinch%2Flumberjack%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.8.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.8.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20151202141238-7f8ab55aaf3b.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.4.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.4.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.4.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.4.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.4.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20151007035656-2152b45fa28a.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.3.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.8.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.9.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.11.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.11.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20210819154149-5ad6f50d6283.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20210819154149-5ad6f50d6283.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20210819154149-5ad6f50d6283.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20210819154149-5ad6f50d6283.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.1.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.2.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200929063507-e6143ca7d51d.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210316141917-a8c4a9ee0f6b.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210316141917-a8c4a9ee0f6b.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210316141917-a8c4a9ee0f6b.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210316141917-a8c4a9ee0f6b.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210326190908-1c3f411f0417.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210326190908-1c3f411f0417.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.0.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.0.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.2.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.2.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.2.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/paulmach/orb/@v/v0.1.3.mod -> github.com%2Fpaulmach%2Forb%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.1.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.1.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.8.1.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.3.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.3.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.6.0+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.6.0+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.6.0+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.6.0+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/qri-io/starlib/@v/v0.4.2-0.20200213133954-ff2e8cd5ef8d.mod -> github.com%2Fqri-io%2Fstarlib%2F@v%2Fv0.4.2-0.20200213133954-ff2e8cd5ef8d.mod mirror://goproxy//github.com/quobyte/api/@v/v0.1.8.mod -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/rancher/dynamiclistener/@v/v0.2.6.zip -> github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.6.zip mirror://goproxy//github.com/rancher/dynamiclistener/@v/v0.2.6.mod -> github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.6.mod mirror://goproxy//github.com/rancher/lasso/@v/v0.0.0-20210616224652-fc3ebd901c08.zip -> github.com%2Francher%2Flasso%2F@v%2Fv0.0.0-20210616224652-fc3ebd901c08.zip mirror://goproxy//github.com/rancher/lasso/@v/v0.0.0-20210616224652-fc3ebd901c08.mod -> github.com%2Francher%2Flasso%2F@v%2Fv0.0.0-20210616224652-fc3ebd901c08.mod mirror://goproxy//github.com/rancher/remotedialer/@v/v0.2.0.zip -> github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rancher/remotedialer/@v/v0.2.0.mod -> github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rancher/wharfie/@v/v0.3.4.zip -> github.com%2Francher%2Fwharfie%2F@v%2Fv0.3.4.zip mirror://goproxy//github.com/rancher/wharfie/@v/v0.3.4.mod -> github.com%2Francher%2Fwharfie%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.8.5.zip -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.8.5.zip mirror://goproxy//github.com/rancher/wrangler/@v/v0.8.5.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.8.5.mod mirror://goproxy//github.com/remyoudompheng/bigfft/@v/v0.0.0-20170806203942-52369c62f446.mod -> github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod mirror://goproxy//github.com/robfig/cron/v3/@v/v3.0.1.zip -> github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/robfig/cron/v3/@v/v3.0.1.mod -> github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.14.5.zip -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.5.zip mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.14.5.mod -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.5.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/xid/@v/v1.3.0.zip -> github.com%2Frs%2Fxid%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/rs/xid/@v/v1.3.0.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.zip -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.zip mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.mod -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sclevine/spec/@v/v1.2.0.mod -> github.com%2Fsclevine%2Fspec%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.zip -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.1.0.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v1.1.0.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.5.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.5.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.5.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/songgao/water/@v/v0.0.0-20200317203138-2b4b6d7c09d8.mod -> github.com%2Fsonggao%2Fwater%2F@v%2Fv0.0.0-20200317203138-2b4b6d7c09d8.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/stefanberger/go-pkcs11uri/@v/v0.0.0-20201008174630-78d3cae3a980.zip -> github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.zip mirror://goproxy//github.com/stefanberger/go-pkcs11uri/@v/v0.0.0-20201008174630-78d3cae3a980.mod -> github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.mod mirror://goproxy//github.com/stoewer/go-strcase/@v/v1.2.0.mod -> github.com%2Fstoewer%2Fgo-strcase%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/storageos/go-api/@v/v2.2.0+incompatible.mod -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.3-0.20181224173747-660f15d67dbb.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.3-0.20181224173747-660f15d67dbb.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.zip mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.zip -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.zip mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.3.0+incompatible.zip -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.zip mirror://goproxy//github.com/tchap/go-patricia/@v/v2.3.0+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v1.0.67.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv1.0.67.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20201229170055-e5319fda7802.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20201229170055-e5319fda7802.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20201229170055-e5319fda7802.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20201229170055-e5319fda7802.mod mirror://goproxy//github.com/ugorji/go/@v/v0.0.0-20170107133203-ded73eae5db7.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20170107133203-ded73eae5db7.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.21.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.21.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.mod -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/u-root/u-root/@v/v7.0.0+incompatible.mod -> github.com%2Fu-root%2Fu-root%2F@v%2Fv7.0.0+incompatible.mod mirror://goproxy//github.com/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20181108222139-023a6dafdcdf.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.1-0.20201029203352-d40f9887b852.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.1-0.20201029203352-d40f9887b852.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.1-0.20201029203352-d40f9887b852.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.1-0.20201029203352-d40f9887b852.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.mod mirror://goproxy//github.com/willf/bitset/@v/v1.1.11.zip -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/willf/bitset/@v/v1.1.11.mod -> github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20181112141820-a009c3971eca.zip -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20181112141820-a009c3971eca.zip mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20181112141820-a009c3971eca.mod -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20181112141820-a009c3971eca.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180321215751-8460e604b9de.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180807140117-3d87b88a115f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190312203227-4b39c73a6495.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190731235908-ec7cb31e5a56.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190731235908-ec7cb31e5a56.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20210220032938-85be41e4509f.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20210220032938-85be41e4509f.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20210220032938-85be41e4509f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20210220032938-85be41e4509f.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20180708004352-c73c2afc3b81.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20201217150744-e6ae53a27f4f.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20201217150744-e6ae53a27f4f.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191209134235-331c550502dd.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191209134235-331c550502dd.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.1-0.20200828183125-ce943fd02449.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.1-0.20200828183125-ce943fd02449.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.2.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201006153459-a7d1128ccaa0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201006153459-a7d1128ccaa0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201202161906-c7110b5ffcbb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201202161906-c7110b5ffcbb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210520170846-37e1c6afe023.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210520170846-37e1c6afe023.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210520170846-37e1c6afe023.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210520170846-37e1c6afe023.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191115151921-52ab43148777.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200217220822-9197077df867.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200217220822-9197077df867.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200831180312-196b9ba8737a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200909081042-eff7692f9009.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200916030750-2334cc1a136f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916030750-2334cc1a136f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200922070232-aee5d888a860.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200922070232-aee5d888a860.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200923182605-d9f96fdee20d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200923182605-d9f96fdee20d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201117170446-d9b008d0a637.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201117170446-d9b008d0a637.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210324051608-47abb6519492.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210403161142-5e06dd20ab57.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426230700-d19ff857e887.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426230700-d19ff857e887.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210603081109-ebe580a85c40.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210616094352-59db8d763f22.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210616094352-59db8d763f22.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20171227012246-e19ae1496984.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20171227012246-e19ae1496984.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200416051211-89c76fbcd5d1.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210220033141-f8bda1e9f3ba.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210723032227-1f47c861a9ac.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210723032227-1f47c861a9ac.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210723032227-1f47c861a9ac.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210723032227-1f47c861a9ac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190706070813-72ffa07ba3db.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190706070813-72ffa07ba3db.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191017205301-920acffc3e65.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191017205301-920acffc3e65.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117012304-6edc0a871e69.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117012304-6edc0a871e69.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200505023115-26f46d2f7ef8.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200505023115-26f46d2f7ef8.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200916195026-c9a70fc28ce3.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200916195026-c9a70fc28ce3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201224043029-2b0845dc783e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201224043029-2b0845dc783e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.2.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gomodules.xyz/jsonpatch/v2/@v/v2.0.1.mod -> gomodules.xyz%2Fjsonpatch%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20180816165407-929014505bf4.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20190331200053-3d26580ed485.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.zip -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.zip mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.zip -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.zip mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod mirror://goproxy//gonum.org/v1/plot/@v/v0.0.0-20190515093506-e2840ee46a6b.mod -> gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.1-0.20200106000736-b8fc810ca6b5.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.1-0.20200106000736-b8fc810ca6b5.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.zip mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.38.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.38.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.zip -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.zip mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.zip -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.zip mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.zip -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.zip mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20191120175047-4206685974f2.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20191120175047-4206685974f2.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200121175148-a6ecf24a6d71.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.6.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.6.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.6.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.6.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.etcd.io/etcd/api/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/client/pkg/v3/@v/v3.5.0.zip -> go.etcd.io%2Fetcd%2Fclient%2Fpkg%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//go.etcd.io/etcd/client/pkg/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fpkg%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/client/v2/@v/v2.305.0.zip -> go.etcd.io%2Fetcd%2Fclient%2Fv2%2F@v%2Fv2.305.0.zip mirror://goproxy//go.etcd.io/etcd/client/v2/@v/v2.305.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fv2%2F@v%2Fv2.305.0.mod mirror://goproxy//go.etcd.io/etcd/client/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/pkg/v3/@v/v3.5.0.zip -> go.etcd.io%2Fetcd%2Fpkg%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//go.etcd.io/etcd/pkg/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fpkg%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/raft/v3/@v/v3.5.0.zip -> go.etcd.io%2Fetcd%2Fraft%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//go.etcd.io/etcd/raft/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fraft%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/server/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fserver%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.zip -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.zip mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.mod -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.zip -> go.opencensus.io%2F@v%2Fv0.22.3.zip mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opentelemetry.io/contrib/@v/v0.20.0.zip -> go.opentelemetry.io%2Fcontrib%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/contrib/@v/v0.20.0.mod -> go.opentelemetry.io%2Fcontrib%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/@v/v0.20.0.zip -> go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fgoogle.golang.org%2Fgrpc%2Fotelgrpc%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/@v/v0.20.0.mod -> go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fgoogle.golang.org%2Fgrpc%2Fotelgrpc%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/@v/v0.20.0.zip -> go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fnet%2Fhttp%2Fotelhttp%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/@v/v0.20.0.mod -> go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fnet%2Fhttp%2Fotelhttp%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/exporters/otlp/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fexporters%2Fotlp%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/exporters/otlp/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fexporters%2Fotlp%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/export/metric/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fsdk%2Fexport%2Fmetric%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/sdk/export/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2Fexport%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/metric/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fsdk%2Fmetric%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/sdk/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/proto/otlp/@v/v0.7.0.zip -> go.opentelemetry.io%2Fproto%2Fotlp%2F@v%2Fv0.7.0.zip mirror://goproxy//go.opentelemetry.io/proto/otlp/@v/v0.7.0.mod -> go.opentelemetry.io%2Fproto%2Fotlp%2F@v%2Fv0.7.0.mod mirror://goproxy//go.starlark.net/@v/v0.0.0-20190528202925-30ae18b8564f.mod -> go.starlark.net%2F@v%2Fv0.0.0-20190528202925-30ae18b8564f.mod mirror://goproxy//go.starlark.net/@v/v0.0.0-20200306205701-8dd3e2ee1dd5.zip -> go.starlark.net%2F@v%2Fv0.0.0-20200306205701-8dd3e2ee1dd5.zip mirror://goproxy//go.starlark.net/@v/v0.0.0-20200306205701-8dd3e2ee1dd5.mod -> go.starlark.net%2F@v%2Fv0.0.0-20200306205701-8dd3e2ee1dd5.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.17.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.17.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.17.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.17.0.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//inet.af/tcpproxy/@v/v0.0.0-20200125044825-b6bb9b5b8252.zip -> inet.af%2Ftcpproxy%2F@v%2Fv0.0.0-20200125044825-b6bb9b5b8252.zip mirror://goproxy//inet.af/tcpproxy/@v/v0.0.0-20200125044825-b6bb9b5b8252.mod -> inet.af%2Ftcpproxy%2F@v%2Fv0.0.0-20200125044825-b6bb9b5b8252.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.22.0.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.22.0.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.22.0.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.22.0.mod mirror://goproxy//k8s.io/apiserver/@v/v0.22.0.zip -> k8s.io%2Fapiserver%2F@v%2Fv0.22.0.zip mirror://goproxy//k8s.io/apiserver/@v/v0.22.0.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.22.0.mod mirror://goproxy//k8s.io/api/@v/v0.22.0.zip -> k8s.io%2Fapi%2F@v%2Fv0.22.0.zip mirror://goproxy//k8s.io/api/@v/v0.22.0.mod -> k8s.io%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//k8s.io/client-go/@v/v0.22.0.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.22.0.zip mirror://goproxy//k8s.io/client-go/@v/v0.22.0.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.22.0.mod mirror://goproxy//k8s.io/component-base/@v/v0.22.0.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.22.0.zip mirror://goproxy//k8s.io/component-base/@v/v0.22.0.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.22.0.mod mirror://goproxy//k8s.io/cri-api/@v/v0.22.0.zip -> k8s.io%2Fcri-api%2F@v%2Fv0.22.0.zip mirror://goproxy//k8s.io/cri-api/@v/v0.22.0.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.22.0.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200114144118-36b2048a9120.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20201113003025-83324d819ded.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20201113003025-83324d819ded.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20201214224949-b6c5ce23f027.zip -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20201214224949-b6c5ce23f027.zip mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20201214224949-b6c5ce23f027.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20201214224949-b6c5ce23f027.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.9.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.9.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.9.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.9.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20210421082810-95288971da7e.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210421082810-95288971da7e.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20210421082810-95288971da7e.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210421082810-95288971da7e.mod mirror://goproxy//k8s.io/system-validators/@v/v1.5.0.mod -> k8s.io%2Fsystem-validators%2F@v%2Fv1.5.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191114184206-e782cd3c129f.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20210707171843-4b05e18ac7d9.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20210707171843-4b05e18ac7d9.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20210707171843-4b05e18ac7d9.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20210707171843-4b05e18ac7d9.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20210819203725-bdf08cb9a70a.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20210819203725-bdf08cb9a70a.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20210819203725-bdf08cb9a70a.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20210819203725-bdf08cb9a70a.mod mirror://goproxy//modernc.org/cc/@v/v1.0.0.mod -> modernc.org%2Fcc%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/golex/@v/v1.0.0.mod -> modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/mathutil/@v/v1.0.0.mod -> modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/strutil/@v/v1.0.0.mod -> modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/xc/@v/v1.0.0.mod -> modernc.org%2Fxc%2F@v%2Fv1.0.0.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.22.zip -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.22.zip mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.22.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.22.mod mirror://goproxy//sigs.k8s.io/cli-utils/@v/v0.16.0.mod -> sigs.k8s.io%2Fcli-utils%2F@v%2Fv0.16.0.mod mirror://goproxy//sigs.k8s.io/controller-runtime/@v/v0.4.0.mod -> sigs.k8s.io%2Fcontroller-runtime%2F@v%2Fv0.4.0.mod mirror://goproxy//sigs.k8s.io/kustomize/api/@v/v0.8.11.zip -> sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.8.11.zip mirror://goproxy//sigs.k8s.io/kustomize/api/@v/v0.8.11.mod -> sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.8.11.mod mirror://goproxy//sigs.k8s.io/kustomize/cmd/config/@v/v0.9.13.mod -> sigs.k8s.io%2Fkustomize%2Fcmd%2Fconfig%2F@v%2Fv0.9.13.mod mirror://goproxy//sigs.k8s.io/kustomize/kustomize/v4/@v/v4.2.0.zip -> sigs.k8s.io%2Fkustomize%2Fkustomize%2Fv4%2F@v%2Fv4.2.0.zip mirror://goproxy//sigs.k8s.io/kustomize/kustomize/v4/@v/v4.2.0.mod -> sigs.k8s.io%2Fkustomize%2Fkustomize%2Fv4%2F@v%2Fv4.2.0.mod mirror://goproxy//sigs.k8s.io/kustomize/kyaml/@v/v0.4.0.mod -> sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.4.0.mod mirror://goproxy//sigs.k8s.io/kustomize/kyaml/@v/v0.11.0.zip -> sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.11.0.zip mirror://goproxy//sigs.k8s.io/kustomize/kyaml/@v/v0.11.0.mod -> sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.11.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.2.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.2.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.2.mod mirror://goproxy//sigs.k8s.io/testing_frameworks/@v/v0.1.2.mod -> sigs.k8s.io%2Ftesting_frameworks%2F@v%2Fv0.1.2.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod https://github.com/opencontainers/runc/archive/refs/tags/v1.0.0-rc95.tar.gz -> k3s-runc-v1.0.1.tar.gz https://helm.traefik.io/traefik/traefik-10.3.0.tgz https://github.com/rancher/plugins/archive/refs/tags/v0.9.1-k3s1.tar.gz -> k3s-cni-plugins-0.9.1.tar.gz amd64? ( https://github.com/rancher/k3s-root/releases/download/v0.9.1/k3s-root-amd64.tar -> k3s-root-amd64-0.9.1.tar )
+_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e11ff004133c05ee4e32cd1aaec276f0
diff --git a/metadata/md5-cache/sys-cluster/knem-1.1.3-r2 b/metadata/md5-cache/sys-cluster/knem-1.1.3-r2
index 016ee49c4b24..6ac475b05dea 100644
--- a/metadata/md5-cache/sys-cluster/knem-1.1.3-r2
+++ b/metadata/md5-cache/sys-cluster/knem-1.1.3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-apps/hwloc sys-apps/kmod[tools] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=http://gforge.inria.fr/frs/download.php/37186/knem-1.1.3.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=187abcc725dad1fc9b8c30b7b271fbc1
diff --git a/metadata/md5-cache/sys-cluster/knem-9999 b/metadata/md5-cache/sys-cluster/knem-9999
index 0c2bb3255376..69465b94a2d9 100644
--- a/metadata/md5-cache/sys-cluster/knem-9999
+++ b/metadata/md5-cache/sys-cluster/knem-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 PROPERTIES=live
 RDEPEND=sys-apps/hwloc sys-apps/kmod[tools] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a622f266083559ed52e869609cd8746f
diff --git a/metadata/md5-cache/sys-cluster/lustre-2.13.0-r1 b/metadata/md5-cache/sys-cluster/lustre-2.13.0-r1
index effa23e6ae7d..bb2cf326117d 100644
--- a/metadata/md5-cache/sys-cluster/lustre-2.13.0-r1
+++ b/metadata/md5-cache/sys-cluster/lustre-2.13.0-r1
@@ -11,5 +11,5 @@ RDEPEND=virtual/awk dlc? ( dev-libs/libyaml ) readline? ( sys-libs/readline:0 )
 REQUIRED_USE=client? ( modules ) server? ( modules )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~alexxy/distfiles/lustre-2.13.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=18a9fabd1e957b97fcb12d130a74d48f
diff --git a/metadata/md5-cache/sys-cluster/mpich-3.0.4 b/metadata/md5-cache/sys-cluster/mpich-3.0.4
deleted file mode 100644
index 9f0c187507ac..000000000000
--- a/metadata/md5-cache/sys-cluster/mpich-3.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=dev-libs/libaio <sys-apps/hwloc-2 romio? ( net-fs/nfs-utils ) dev-lang/perl sys-devel/libtool fortran? ( virtual/fortran )
-DESCRIPTION=A high performance and portable MPI implementation
-EAPI=5
-HOMEPAGE=http://www.mpich.org/
-IUSE=+cxx doc fortran mpi-threads romio threads
-KEYWORDS=amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=mpich2
-RDEPEND=dev-libs/libaio <sys-apps/hwloc-2 romio? ( net-fs/nfs-utils ) !sys-cluster/mpich2 !sys-cluster/openmpi fortran? ( virtual/fortran )
-SLOT=0
-SRC_URI=http://www.mpich.org/static/downloads/3.0.4/mpich-3.0.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f63b3c61a813103aaab52fd44c52fd69
diff --git a/metadata/md5-cache/sys-cluster/mpich-3.0.4-r1 b/metadata/md5-cache/sys-cluster/mpich-3.0.4-r1
new file mode 100644
index 000000000000..f6c790302f14
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/mpich-3.0.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup test
+DEPEND=dev-libs/libaio <sys-apps/hwloc-2 romio? ( net-fs/nfs-utils ) dev-lang/perl sys-devel/libtool fortran? ( virtual/fortran )
+DESCRIPTION=A high performance and portable MPI implementation
+EAPI=5
+HOMEPAGE=http://www.mpich.org/
+IUSE=+cxx doc fortran mpi-threads romio threads
+KEYWORDS=amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=mpich2
+RDEPEND=dev-libs/libaio <sys-apps/hwloc-2 romio? ( net-fs/nfs-utils ) !sys-cluster/mpich2 !sys-cluster/openmpi fortran? ( virtual/fortran )
+SLOT=0
+SRC_URI=http://www.mpich.org/static/downloads/3.0.4/mpich-3.0.4.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=588b3680fda8d61fd2d220cdac5face9
diff --git a/metadata/md5-cache/sys-cluster/mpich-3.4.2 b/metadata/md5-cache/sys-cluster/mpich-3.4.2
new file mode 100644
index 000000000000..e35923a44fc7
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/mpich-3.4.2
@@ -0,0 +1,15 @@
+BDEPEND=fortran? ( virtual/fortran )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/libaio-0.3.109-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] romio? ( net-fs/nfs-utils ) dev-lang/perl sys-devel/libtool fortran? ( virtual/fortran )
+DESCRIPTION=A high performance and portable MPI implementation
+EAPI=7
+HOMEPAGE=https://www.mpich.org/
+IUSE=+cxx doc fortran mpi-threads +romio threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=mpich2
+RDEPEND=>=dev-libs/libaio-0.3.109-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] romio? ( net-fs/nfs-utils ) !sys-cluster/mpich2 !sys-cluster/openmpi !sys-cluster/nullmpi fortran? ( virtual/fortran )
+REQUIRED_USE=mpi-threads? ( threads )
+SLOT=0
+SRC_URI=https://www.mpich.org/static/downloads/3.4.2/mpich-3.4.2.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a7e039d03bb7e89dd59fb4e9a689c7b7
diff --git a/metadata/md5-cache/sys-cluster/mpich2-1.5 b/metadata/md5-cache/sys-cluster/mpich2-1.5
deleted file mode 100644
index b0bf2b019aca..000000000000
--- a/metadata/md5-cache/sys-cluster/mpich2-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=dev-libs/libaio net-libs/libnsl:0= sys-apps/hwloc romio? ( net-fs/nfs-utils ) dev-lang/perl sys-devel/libtool fortran? ( virtual/fortran )
-DESCRIPTION=A high performance and portable MPI implementation
-EAPI=5
-HOMEPAGE=http://www.mcs.anl.gov/research/projects/mpich2/index.php
-IUSE=+cxx doc fortran mpi-threads romio threads
-KEYWORDS=amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=mpich2
-RDEPEND=dev-libs/libaio net-libs/libnsl:0= sys-apps/hwloc romio? ( net-fs/nfs-utils ) !sys-cluster/mpich !sys-cluster/openmpi fortran? ( virtual/fortran )
-SLOT=0
-SRC_URI=http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/1.5/mpich2-1.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=19240b508b00422795049c1bf9d515b6
diff --git a/metadata/md5-cache/sys-cluster/mpich2-1.5-r1 b/metadata/md5-cache/sys-cluster/mpich2-1.5-r1
new file mode 100644
index 000000000000..bd89e0a2e601
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/mpich2-1.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup test
+DEPEND=dev-libs/libaio net-libs/libnsl:0= sys-apps/hwloc romio? ( net-fs/nfs-utils ) dev-lang/perl sys-devel/libtool fortran? ( virtual/fortran )
+DESCRIPTION=A high performance and portable MPI implementation
+EAPI=5
+HOMEPAGE=http://www.mcs.anl.gov/research/projects/mpich2/index.php
+IUSE=+cxx doc fortran mpi-threads romio threads
+KEYWORDS=amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=mpich2
+RDEPEND=dev-libs/libaio net-libs/libnsl:0= sys-apps/hwloc romio? ( net-fs/nfs-utils ) !sys-cluster/mpich !sys-cluster/openmpi fortran? ( virtual/fortran )
+SLOT=0
+SRC_URI=http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/1.5/mpich2-1.5.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e8fc9e0809a46223a3527478f4fa0fb9
diff --git a/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1 b/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
index d2c084f902f4..b20f8dbd4320 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.0.5-r1
@@ -5,11 +5,11 @@ DESCRIPTION=A high-performance message passing library (MPI)
 EAPI=7
 HOMEPAGE=https://www.open-mpi.org
 IUSE=cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) ) java? ( >=virtual/jre-1.8:* ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.5.tar.bz2
 _eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f1b2b2ef6a45b70d20a98615f29ab41a
+_md5_=2afea1f8ce682f939b0830fe92ddf7d2
diff --git a/metadata/md5-cache/sys-cluster/openmpi-4.0.6 b/metadata/md5-cache/sys-cluster/openmpi-4.0.6
new file mode 100644
index 000000000000..7d691d0c561f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.0.6
@@ -0,0 +1,15 @@
+BDEPEND=fortran? ( virtual/fortran )
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) ) java? ( >=virtual/jdk-1.8:* ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A high-performance message passing library (MPI)
+EAPI=7
+HOMEPAGE=https://www.open-mpi.org
+IUSE=cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) ) java? ( >=virtual/jre-1.8:* ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
+SLOT=0
+SRC_URI=https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.6.tar.bz2
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b52223f6b79d97a3a784fa40455e8e44
diff --git a/metadata/md5-cache/sys-cluster/openmpi-4.1.1 b/metadata/md5-cache/sys-cluster/openmpi-4.1.1
new file mode 100644
index 000000000000..ecb16ad2e49c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.1.1
@@ -0,0 +1,15 @@
+BDEPEND=fortran? ( virtual/fortran )
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) ) java? ( >=virtual/jdk-1.8:* ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A high-performance message passing library (MPI)
+EAPI=7
+HOMEPAGE=https://www.open-mpi.org
+IUSE=cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) ) java? ( >=virtual/jre-1.8:* ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
+SLOT=0
+SRC_URI=https://www.open-mpi.org/software/ompi/v4.1/downloads/openmpi-4.1.1.tar.bz2
+_eclasses_=cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=166b2b3066310d4ba133d3d0560b4b78
diff --git a/metadata/md5-cache/sys-cluster/sanlock-3.8.2 b/metadata/md5-cache/sys-cluster/sanlock-3.8.2
index 7153f0c4d807..3536dd3b6274 100644
--- a/metadata/md5-cache/sys-cluster/sanlock-3.8.2
+++ b/metadata/md5-cache/sys-cluster/sanlock-3.8.2
@@ -10,5 +10,5 @@ RDEPEND=acct-user/sanlock acct-group/sanlock dev-libs/libaio sys-apps/util-linux
 REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://releases.pagure.org/sanlock/sanlock-3.8.2.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2fdf33183bc7541f6fbc10c39114c8a1
diff --git a/metadata/md5-cache/sys-cluster/sanlock-3.8.4 b/metadata/md5-cache/sys-cluster/sanlock-3.8.4
new file mode 100644
index 000000000000..b1b8bd7f3d6e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/sanlock-3.8.4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install setup
+DEPEND=acct-user/sanlock acct-group/sanlock dev-libs/libaio sys-apps/util-linux python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DESCRIPTION=shared storage lock manager
+EAPI=8
+HOMEPAGE=https://pagure.io/sanlock
+IUSE=python kernel_linux python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2+ GPL-2 GPL-2+
+RDEPEND=acct-user/sanlock acct-group/sanlock dev-libs/libaio sys-apps/util-linux python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+SLOT=0
+SRC_URI=https://releases.pagure.org/sanlock/sanlock-3.8.4.tar.gz
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f7c93f31acb38e252b0d44c0522dadc1
diff --git a/metadata/md5-cache/sys-cluster/singularity-3.8.0 b/metadata/md5-cache/sys-cluster/singularity-3.8.0
index bbf95679dbd7..17553e218d22 100644
--- a/metadata/md5-cache/sys-cluster/singularity-3.8.0
+++ b/metadata/md5-cache/sys-cluster/singularity-3.8.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/libseccomp sys-fs/squashfs-tools
 SLOT=0
 SRC_URI=https://github.com/hpcng/singularity/releases/download/v3.8.0/singularity-3.8.0.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=01609083305c1c0c779fef6910a38cfd
diff --git a/metadata/md5-cache/sys-cluster/singularity-3.8.3 b/metadata/md5-cache/sys-cluster/singularity-3.8.3
index 1df2ff77ccc8..3a9611e63c51 100644
--- a/metadata/md5-cache/sys-cluster/singularity-3.8.3
+++ b/metadata/md5-cache/sys-cluster/singularity-3.8.3
@@ -5,10 +5,10 @@ DESCRIPTION=Application containers for Linux
 EAPI=8
 HOMEPAGE=https://sylabs.io
 IUSE=examples +network +suid kernel_linux
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sys-libs/libseccomp sys-fs/squashfs-tools
 SLOT=0
 SRC_URI=https://github.com/hpcng/singularity/releases/download/v3.8.3/singularity-3.8.3.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=174daa507b91de8554bc1f637f72b9bd
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=07b3e803001d561cdd704054ec4749b9
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101 b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
deleted file mode 100644
index d57fb062f093..000000000000
--- a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= dev-libs/glib:2= sys-libs/readline:0= html? ( sys-apps/man2html ) dev-lang/perl
-DESCRIPTION=A Highly Scalable Resource Manager
-EAPI=7
-HOMEPAGE=https://www.schedmd.com https://github.com/SchedMD/slurm
-IUSE=debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X lua_single_target_lua5-1 lua_single_target_lua5-3
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= dev-libs/glib:2= sys-libs/readline:0= acct-user/slurm acct-group/slurm dev-libs/libcgroup dev-lang/perl:= virtual/tmpfiles
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) ) torque? ( perl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-11-0-1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bccb729a6ba2c6ed57fc73711c1fc83c
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r102 b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r102
new file mode 100644
index 000000000000..a5c4c0340dd4
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r102
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) ) hdf5? ( <sci-libs/hdf5-1.12:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= dev-libs/glib:2= sys-libs/readline:0= html? ( sys-apps/man2html ) dev-lang/perl
+DESCRIPTION=A Highly Scalable Resource Manager
+EAPI=7
+HOMEPAGE=https://www.schedmd.com https://github.com/SchedMD/slurm
+IUSE=debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X lua_single_target_lua5-1 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) ) ) munge? ( sys-auth/munge ) pam? ( sys-libs/pam ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) ) hdf5? ( <sci-libs/hdf5-1.12:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) ucx? ( sys-cluster/ucx ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= dev-libs/glib:2= sys-libs/readline:0= acct-user/slurm acct-group/slurm dev-libs/libcgroup dev-lang/perl:= virtual/tmpfiles
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) ) torque? ( perl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-11-0-1.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=22e300fe7103db1685b1bb4f9f861834
diff --git a/metadata/md5-cache/sys-cluster/torque-4.1.7-r1 b/metadata/md5-cache/sys-cluster/torque-4.1.7-r1
index c1028718e783..d0562013c62b 100644
--- a/metadata/md5-cache/sys-cluster/torque-4.1.7-r1
+++ b/metadata/md5-cache/sys-cluster/torque-4.1.7-r1
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/openssl:0= cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash
 SLOT=0
 SRC_URI=http://www.adaptivecomputing.com/index.php?wpfb_dl=1690 -> torque-4.1.7.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0adffec8df6cd263c81fe0a533f98255
diff --git a/metadata/md5-cache/sys-cluster/torque-4.2.10-r1 b/metadata/md5-cache/sys-cluster/torque-4.2.10-r1
index 9ad18dff6cfa..392d60f1798a 100644
--- a/metadata/md5-cache/sys-cluster/torque-4.2.10-r1
+++ b/metadata/md5-cache/sys-cluster/torque-4.2.10-r1
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 dev-libs/openssl:0= cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash
 SLOT=0
 SRC_URI=https://github.com/adaptivecomputing/torque/archive/ddf5c4f40091b6157164a8846e5b60f42a5ae7f6.tar.gz -> torque-4.2.10-gh-20150517.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1f03836c8f3894d013d968db7ff3bf8f
diff --git a/metadata/md5-cache/sys-cluster/torque-6.0.4-r1 b/metadata/md5-cache/sys-cluster/torque-6.0.4-r1
index 8df3f430524f..4e7a6f534ad6 100644
--- a/metadata/md5-cache/sys-cluster/torque-6.0.4-r1
+++ b/metadata/md5-cache/sys-cluster/torque-6.0.4-r1
@@ -9,5 +9,5 @@ LICENSE=torque-2.5
 RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 >=dev-libs/boost-1.41 cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash
 SLOT=0
 SRC_URI=https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> torque-6.0.4-gh-20170829.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3eb9d1de126b08db4a029d0396fc0bae
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 58b02845ee47..782553e941ea 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.71-r1 b/metadata/md5-cache/sys-devel/autoconf-2.71-r1
index 14f1c0217923..782252e02938 100644
--- a/metadata/md5-cache/sys-devel/autoconf-2.71-r1
+++ b/metadata/md5-cache/sys-devel/autoconf-2.71-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Used to create autoconfiguration files
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
 IUSE=emacs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 PDEPEND=emacs? ( app-emacs/autoconf-mode )
 RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 >=sys-devel/autoconf-wrapper-15 sys-devel/gnuconfig !~sys-devel/autoconf-2.71:2.5
 SLOT=2.71
 SRC_URI=mirror://gnu/autoconf/autoconf-2.71.tar.xz -> autoconf-2.71.tar.xz https://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.71.tar.xz -> autoconf-2.71.tar.xz
 _eclasses_=toolchain-autoconf	c85a87c2280cd1204e1433d3e1123e41
-_md5_=581c4b95fa86adf699c66bb8735b5b91
+_md5_=0d764ed45ce60200f1316066ae1cd173
diff --git a/metadata/md5-cache/sys-devel/gcc-10.3.0-r2 b/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
index bcba302c3fa2..0288a8e93e9d 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
@@ -11,6 +11,6 @@ PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=10
-SRC_URI=mirror://gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz mirror://gentoo/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=mirror://gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz mirror://gentoo/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-3.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7722abdebe2153278072e823f2cf14d1
diff --git a/metadata/md5-cache/sys-devel/gcc-10.3.1_pre9999 b/metadata/md5-cache/sys-devel/gcc-10.3.1_pre9999
index a7cc97efcd67..bb2348c4ecca 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.3.1_pre9999
+++ b/metadata/md5-cache/sys-devel/gcc-10.3.1_pre9999
@@ -11,6 +11,6 @@ PROPERTIES=live
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=10
-SRC_URI=mirror://gentoo/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=mirror://gentoo/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-1.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e292546d4839eca2e919d2a37705e392
diff --git a/metadata/md5-cache/sys-devel/gcc-11.2.0 b/metadata/md5-cache/sys-devel/gcc-11.2.0
index 39ac5fcdceee..97b69499a1fe 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.2.0
+++ b/metadata/md5-cache/sys-devel/gcc-11.2.0
@@ -5,12 +5,12 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto zstd valgrind custom-cflags
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=11
-SRC_URI=mirror://gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz mirror://gentoo/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-11.2.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a8bad3083dcda1a940040476ead3b966
+SRC_URI=mirror://gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz mirror://gentoo/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-11.2.0-patches-1.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=04fe54a7f66a027b386a00067ccb407b
diff --git a/metadata/md5-cache/sys-devel/gcc-11.2.1_pre9999 b/metadata/md5-cache/sys-devel/gcc-11.2.1_pre9999
index b9489d54dd0f..514272f5cadc 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.2.1_pre9999
+++ b/metadata/md5-cache/sys-devel/gcc-11.2.1_pre9999
@@ -11,6 +11,6 @@ PROPERTIES=live
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=11
-SRC_URI=mirror://gentoo/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-11.2.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=mirror://gentoo/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-11.2.0-patches-1.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=58b3deebeac6423c709570df91505378
diff --git a/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999 b/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
index a94bcc5dc3cb..24d76829be02 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
+++ b/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
@@ -11,6 +11,6 @@ PROPERTIES=live
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=12
-SRC_URI=mirror://gentoo/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-12.0.0-patches-2.tar.bz2
-_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+SRC_URI=mirror://gentoo/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-12.0.0-patches-2.tar.bz2
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=af519d281c076dbc0332244398a2ac83
diff --git a/metadata/md5-cache/sys-devel/gcc-6.5.0-r4 b/metadata/md5-cache/sys-devel/gcc-6.5.0-r4
index bbfe80cb73d0..38b8c87c25f9 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.5.0-r4
+++ b/metadata/md5-cache/sys-devel/gcc-6.5.0-r4
@@ -11,6 +11,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=6.5.0
-SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-6.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-6.5.0-patches-6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-6.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f8f43a350a54709604645df150d2db6b
diff --git a/metadata/md5-cache/sys-devel/gcc-7.5.0-r2 b/metadata/md5-cache/sys-devel/gcc-7.5.0-r2
index 12c8d841620a..60065c12a7b7 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.5.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-7.5.0-r2
@@ -11,6 +11,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=7.5.0
-SRC_URI=mirror://gnu/gcc/gcc-7.5.0/gcc-7.5.0.tar.xz mirror://gentoo/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.5.0-patches-4.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=mirror://gnu/gcc/gcc-7.5.0/gcc-7.5.0.tar.xz mirror://gentoo/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-7.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.5.0-patches-4.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f27156fb5bdc447364253107591e28f1
diff --git a/metadata/md5-cache/sys-devel/gcc-8.5.0-r1 b/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
index 22aad77e602c..1ed08e0d2013 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
@@ -11,6 +11,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=8.5.0
-SRC_URI=mirror://gnu/gcc/gcc-8.5.0/gcc-8.5.0.tar.xz mirror://gentoo/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.5.0-patches-2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=mirror://gnu/gcc/gcc-8.5.0/gcc-8.5.0.tar.xz mirror://gentoo/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.5.0-patches-2.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5db021f282348ebe91be240970a0c178
diff --git a/metadata/md5-cache/sys-devel/gcc-9.4.0 b/metadata/md5-cache/sys-devel/gcc-9.4.0
index f51b0604738c..44cfed5fddfa 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.4.0
+++ b/metadata/md5-cache/sys-devel/gcc-9.4.0
@@ -11,6 +11,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=9.4.0
-SRC_URI=mirror://gnu/gcc/gcc-9.4.0/gcc-9.4.0.tar.xz mirror://gentoo/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.4.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=mirror://gnu/gcc/gcc-9.4.0/gcc-9.4.0.tar.xz mirror://gentoo/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.4.0-patches-1.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=382774bfde8167c04ea52a72ba3b719c
diff --git a/metadata/md5-cache/sys-devel/gcc-9.4.1_pre9999 b/metadata/md5-cache/sys-devel/gcc-9.4.1_pre9999
new file mode 100644
index 000000000000..824c3b3682cd
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-9.4.1_pre9999
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=7
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+PROPERTIES=live
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RESTRICT=!test? ( test )
+SLOT=9.4.1
+SRC_URI=mirror://gentoo/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.4.0-patches-1.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=d7fc00eeb48f9964d7dbffaf9aa6df18
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
index f19ff9cdf6d3..d9cc67532c34 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=!test? ( test ) strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/gcc-apple-4.2.1_p5646-gfortran.patch )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe049e2fdb356ee5ec3a248f2b5445a8
diff --git a/metadata/md5-cache/sys-devel/gdb-10.2 b/metadata/md5-cache/sys-devel/gdb-10.2
index b075982c7647..920e3ac121d4 100644
--- a/metadata/md5-cache/sys-devel/gdb-10.2
+++ b/metadata/md5-cache/sys-devel/gdb-10.2
@@ -5,7 +5,7 @@ DESCRIPTION=GNU debugger
 EAPI=7
 HOMEPAGE=https://sourceware.org/gdb/
 IUSE=cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -13,4 +13,4 @@ RESTRICT=ia64? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-10.2.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-10.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b7fc168f77ecf6df3ebf25a986d2b856
+_md5_=b34394a81a1b16c917a8f3bcb23de0c6
diff --git a/metadata/md5-cache/sys-devel/kgcc64-10.3.0 b/metadata/md5-cache/sys-devel/kgcc64-10.3.0
index cec1c8abee23..d4cf13fd6aaa 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-10.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-10.3.0
@@ -11,6 +11,6 @@ PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
 RESTRICT=!test? ( test )
 SLOT=10
-SRC_URI=mirror://gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz mirror://gentoo/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=mirror://gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz mirror://gentoo/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-1.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=499c3e296cb44fae1926c95e7fac1e3b
diff --git a/metadata/md5-cache/sys-devel/kgcc64-11.1.0 b/metadata/md5-cache/sys-devel/kgcc64-11.1.0
index 731402ec498b..ec75e7ffbd06 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-11.1.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-11.1.0
@@ -11,6 +11,6 @@ PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
 RESTRICT=!test? ( test )
 SLOT=11
-SRC_URI=mirror://gnu/gcc/gcc-11.1.0/gcc-11.1.0.tar.xz mirror://gentoo/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-11.1.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=mirror://gnu/gcc/gcc-11.1.0/gcc-11.1.0.tar.xz mirror://gentoo/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-11.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-11.1.0-patches-1.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7c819679af79cb7ed395c6f91baf6357
diff --git a/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2 b/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
index cc51c2a8e6dc..2fa12daad932 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
+++ b/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
@@ -11,6 +11,6 @@ PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
 RESTRICT=!test? ( test )
 SLOT=9.3.0
-SRC_URI=mirror://gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz mirror://gentoo/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.3.0-patches-3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	23d3620e77b8be7de3b9ac354983c6dc	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+SRC_URI=mirror://gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz mirror://gentoo/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.3.0-patches-3.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	3dce869c26b5806d36d84be95de2a975	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3aeb65e537bc37427af84e711e14e1d8
diff --git a/metadata/md5-cache/sys-devel/pmake-1.111.3.3 b/metadata/md5-cache/sys-devel/pmake-1.111.3.3
index 6a177d769a17..eedc75a6c09a 100644
--- a/metadata/md5-cache/sys-devel/pmake-1.111.3.3
+++ b/metadata/md5-cache/sys-devel/pmake-1.111.3.3
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/pmake/pmake_1.111.orig.tar.gz mirror://debian/pool/main/p/pmake/pmake_1.111-3.3.debian.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d75eec43b318e62de488e08f40060ffe
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 26b2fc15904c..67890cdee602 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116-r1 b/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116-r1
index 9d6473b17a3f..8e94f35c4f9f 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116-r1
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20201112_p20201116-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( initramfs split-ucode )
 RESTRICT=binchecks bindist mirror strip
 SLOT=0
 SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20201112.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20201116.tar.xz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=5d4c59c2ca809d0a52c3d675c2ba165e
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210221 b/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210221
index ca75723a09bc..1ec5855a5827 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210221
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210221
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( initramfs split-ucode )
 RESTRICT=binchecks bindist mirror strip
 SLOT=0
 SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20210216.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20210221.tar.xz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58ad5fc2332b379a591fb60b044db65e
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210514 b/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210514
index b626db9e9b55..d81d16f064e2 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210514
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210514
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( initramfs split-ucode )
 RESTRICT=binchecks bindist mirror strip
 SLOT=0
 SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20210216.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20210514.tar.xz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58ad5fc2332b379a591fb60b044db65e
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210608 b/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210608
index 34218a43f178..33c7a75b8aca 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210608
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210608
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( initramfs split-ucode )
 RESTRICT=binchecks bindist mirror strip
 SLOT=0
 SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20210608.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20210608.tar.xz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58ad5fc2332b379a591fb60b044db65e
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210830 b/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210830
index 02e2ded87871..ef4955def02e 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210830
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20210608_p20210830
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( initramfs split-ucode )
 RESTRICT=binchecks bindist mirror strip
 SLOT=0
 SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20210608.tar.gz https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/raw/437f382b1be4412b9d03e2bbdcda46d83d581242/intel-ucode/06-4e-03 -> intel-ucode-sig_0x406e3-rev_0xd6.bin https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20210830.tar.xz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=58ad5fc2332b379a591fb60b044db65e
diff --git a/metadata/md5-cache/sys-firmware/ipw2100-firmware-1.3 b/metadata/md5-cache/sys-firmware/ipw2100-firmware-1.3
index 7fb3482fdbd7..6fc1a17a4618 100644
--- a/metadata/md5-cache/sys-firmware/ipw2100-firmware-1.3
+++ b/metadata/md5-cache/sys-firmware/ipw2100-firmware-1.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Firmware for the Intel PRO/Wireless 2100 3B miniPCI adapter
 EAPI=5
 HOMEPAGE=http://ipw2100.sourceforge.net/
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=ipw2100-fw
 SLOT=1.3
 SRC_URI=mirror://gentoo/ipw2100-fw-1.3.tgz
-_md5_=35bb495d2d3a5af0edec5d6037909db3
+_md5_=498aec967139aa192d7485ba39ba09ec
diff --git a/metadata/md5-cache/sys-firmware/ipw2200-firmware-3.1 b/metadata/md5-cache/sys-firmware/ipw2200-firmware-3.1
index 71e50d03595f..b1e070660c07 100644
--- a/metadata/md5-cache/sys-firmware/ipw2200-firmware-3.1
+++ b/metadata/md5-cache/sys-firmware/ipw2200-firmware-3.1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Firmware for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI
 EAPI=5
 HOMEPAGE=http://ipw2200.sourceforge.net/
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=ipw2200-fw
 SLOT=0
 SRC_URI=http://www.bughost.org/firmware/ipw2200-fw-3.1.tgz
-_md5_=628675776019f88a10db4f91fd684686
+_md5_=ed682637226366137c9b46733144152f
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2 b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
index 922ac00c3339..f56f5b899f9c 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
+++ b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
 SRC_URI=mirror://gentoo/iwl3160-7260-bt-ucode-37.8.10_p2.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=9f1242ed5f4b471d97bf5e46a56f56de
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414
index efaea9213552..bee32a694fee 100644
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414
+++ b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.16.242414
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=16
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-16.242414.0.tgz -> iwl3160-ucode-0.16.242414.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=80eaf1d50670511dab8ab70bd5b663e8
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414
index 84acdebc770f..aa6b56a0de9d 100644
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414
+++ b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.16.242414
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
 SLOT=16
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-16.242414.0.tgz -> iwl7260-ucode-0.16.242414.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
 _md5_=80eaf1d50670511dab8ab70bd5b663e8
diff --git a/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0 b/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0
index 7eec2566e363..aa0a417b5961 100644
--- a/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0
+++ b/metadata/md5-cache/sys-firmware/iwl8000-ucode-16.242414.0
@@ -8,5 +8,5 @@ LICENSE=ipw3945
 RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
 SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-8000-ucode-16.242414.0.tgz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=a148adbff178027a90f38e51621a9fec
diff --git a/metadata/md5-cache/sys-firmware/midisport-firmware-1.2-r1 b/metadata/md5-cache/sys-firmware/midisport-firmware-1.2-r1
index aeb365c19dd4..1f968cb9a6ca 100644
--- a/metadata/md5-cache/sys-firmware/midisport-firmware-1.2-r1
+++ b/metadata/md5-cache/sys-firmware/midisport-firmware-1.2-r1
@@ -9,5 +9,5 @@ LICENSE=Midisport
 RDEPEND=sys-apps/fxload virtual/udev
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/usb-midi-fw/midisport-firmware-1.2.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=21562b9b4c2355d319700848b81297c8
diff --git a/metadata/md5-cache/sys-firmware/sof-firmware-1.4.2 b/metadata/md5-cache/sys-firmware/sof-firmware-1.4.2
deleted file mode 100644
index e4325db579e2..000000000000
--- a/metadata/md5-cache/sys-firmware/sof-firmware-1.4.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Sound Open Firmware (SOF) binary files
-EAPI=7
-HOMEPAGE=https://www.sofproject.org
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/thesofproject/sof/releases/download/v1.4.2/sof-apl-v1.4.2.ldc -> sof-firmware-1.4.2-sof-apl-v1.4.2.ldc https://github.com/thesofproject/sof/releases/download/v1.4.2/sof-apl-v1.4.2.ri -> sof-firmware-1.4.2-sof-apl-v1.4.2.ri https://github.com/thesofproject/sof/releases/download/v1.4.2/sof-bdw.ldc -> sof-firmware-1.4.2-sof-bdw.ldc https://github.com/thesofproject/sof/releases/download/v1.4.2/sof-bdw.ri -> sof-firmware-1.4.2-sof-bdw.ri https://github.com/thesofproject/sof/releases/download/v1.4.2/sof-byt.ldc -> sof-firmware-1.4.2-sof-byt.ldc https://github.com/thesofproject/sof/releases/download/v1.4.2/sof-byt.ri -> sof-firmware-1.4.2-sof-byt.ri https://github.com/thesofproject/sof/releases/download/v1.4.2/sof-cht.ldc -> sof-firmware-1.4.2-sof-cht.ldc https://github.com/thesofproject/sof/releases/download/v1.4.2/sof-cht.ri -> sof-firmware-1.4.2-sof-cht.ri https://github.com/thesofproject/sof/releases/download/v1.4.2/sof-cnl-v1.4.2.ldc -> sof-firmware-1.4.2-sof-cnl-v1.4.2.ldc https://github.com/thesofproject/sof/releases/download/v1.4.2/sof-cnl-v1.4.2.ri -> sof-firmware-1.4.2-sof-cnl-v1.4.2.ri https://github.com/thesofproject/sof/releases/download/v1.4.2/sof-icl-v1.4.2.ldc -> sof-firmware-1.4.2-sof-icl-v1.4.2.ldc https://github.com/thesofproject/sof/releases/download/v1.4.2/sof-icl-v1.4.2.ri -> sof-firmware-1.4.2-sof-icl-v1.4.2.ri https://github.com/thesofproject/sof/releases/download/v1.4.2/sof-imx8.ldc -> sof-firmware-1.4.2-sof-imx8.ldc https://github.com/thesofproject/sof/releases/download/v1.4.2/sof-imx8.ri -> sof-firmware-1.4.2-sof-imx8.ri
-_md5_=9cc0da04d3c243a23486c223b607f124
diff --git a/metadata/md5-cache/sys-firmware/sof-firmware-1.5.1 b/metadata/md5-cache/sys-firmware/sof-firmware-1.5.1
deleted file mode 100644
index c63296e5d50a..000000000000
--- a/metadata/md5-cache/sys-firmware/sof-firmware-1.5.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Sound Open Firmware (SOF) binary files
-EAPI=7
-HOMEPAGE=https://www.sofproject.org https://github.com/thesofproject/sof https://github.com/thesofproject/sof-bin
-KEYWORDS=amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/thesofproject/sof-bin/archive/stable-v1.5.1.tar.gz -> sof-firmware-1.5.1.tar.gz
-_md5_=ead1bfda39c8c80da0f43102afc73f88
diff --git a/metadata/md5-cache/sys-firmware/sof-firmware-1.9 b/metadata/md5-cache/sys-firmware/sof-firmware-1.9
new file mode 100644
index 000000000000..4a28a75b5e4f
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/sof-firmware-1.9
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Sound Open Firmware (SOF) binary files
+EAPI=8
+HOMEPAGE=https://www.sofproject.org https://github.com/thesofproject/sof https://github.com/thesofproject/sof-bin
+KEYWORDS=~amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/thesofproject/sof-bin/releases/download/v1.9/sof-bin-v1.9.tar.gz -> sof-firmware-1.9.tar.gz
+_md5_=5d7bd703e69bc7787e2e67ad1539f2d1
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index c6d4a62fcd40..d3d6bc9655dd 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603 b/metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603
index d36f2dcf0f93..e7a6389e8691 100644
--- a/metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603
+++ b/metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-4.14_p20190603.tar.xz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=942f860bca1d1700cd24b01960883808
diff --git a/metadata/md5-cache/sys-fs/bees-0.6.5-r1 b/metadata/md5-cache/sys-fs/bees-0.6.5-r1
index f23b1ce97d46..3203fd575244 100644
--- a/metadata/md5-cache/sys-fs/bees-0.6.5-r1
+++ b/metadata/md5-cache/sys-fs/bees-0.6.5-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
 SLOT=0
 SRC_URI=https://github.com/Zygo/bees/archive/v0.6.5.tar.gz -> bees-0.6.5.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ae8bd71c091282daeeef12f2d83ddc15
diff --git a/metadata/md5-cache/sys-fs/bees-9999 b/metadata/md5-cache/sys-fs/bees-9999
index 3829c92ef4eb..378312e0ceec 100644
--- a/metadata/md5-cache/sys-fs/bees-9999
+++ b/metadata/md5-cache/sys-fs/bees-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=78e6e3b702edc6b09123681345c54164
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.13.1-r1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.13.1-r1
deleted file mode 100644
index e4c105c7bf20..000000000000
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.13.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
-DESCRIPTION=Btrfs filesystem utilities
-EAPI=7
-HOMEPAGE=https://btrfs.wiki.kernel.org
-IUSE=+convert doc python reiserfs static static-libs +zstd python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-RESTRICT=test
-SLOT=0/0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.13.1.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6cc6c64bec9daa2d137dedf82dbb6a59
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.14-r1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.14-r1
deleted file mode 100644
index a7cf10525cd3..000000000000
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.14-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
-DESCRIPTION=Btrfs filesystem utilities
-EAPI=7
-HOMEPAGE=https://btrfs.wiki.kernel.org
-IUSE=+convert doc python reiserfs static static-libs +zstd python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-RESTRICT=test
-SLOT=0/0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.14.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=305d9910882b05518339e2288c24a104
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.14.2 b/metadata/md5-cache/sys-fs/btrfs-progs-5.14.2
new file mode 100644
index 000000000000..8d674031b3b8
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.14.2
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
+DESCRIPTION=Btrfs filesystem utilities
+EAPI=7
+HOMEPAGE=https://btrfs.wiki.kernel.org
+IUSE=+convert doc python reiserfs static static-libs +zstd python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) zstd? ( app-arch/zstd:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RESTRICT=test
+SLOT=0/0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.14.2.tar.xz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=305d9910882b05518339e2288c24a104
diff --git a/metadata/md5-cache/sys-fs/clamfs-1.2.0 b/metadata/md5-cache/sys-fs/clamfs-1.2.0
index ec39c22d7652..54cd04df46ac 100644
--- a/metadata/md5-cache/sys-fs/clamfs-1.2.0
+++ b/metadata/md5-cache/sys-fs/clamfs-1.2.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.33 dev-libs/poco dev-libs/rlog sys-fs/fuse:3 app-antivirus/clamav
 SLOT=0
 SRC_URI=https://github.com/burghardt/clamfs/releases/download/clamfs-1.2.0/clamfs-1.2.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d4628148acabb95daf37eb3f5d0d1b4a
diff --git a/metadata/md5-cache/sys-fs/cryfs-0.10.2-r1 b/metadata/md5-cache/sys-fs/cryfs-0.10.2-r1
deleted file mode 100644
index 7f55fcd521d9..000000000000
--- a/metadata/md5-cache/sys-fs/cryfs-0.10.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.65.1:= >=dev-libs/crypto++-8.2.0:= net-misc/curl:= >=sys-fs/fuse-2.8.6:0 dev-libs/openssl:0= test? ( dev-cpp/gtest )
-DESCRIPTION=Encrypted FUSE filesystem that conceals metadata
-EAPI=7
-HOMEPAGE=https://www.cryfs.org/
-IUSE=debug test kernel_linux
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=LGPL-3 MIT
-RDEPEND=>=dev-libs/boost-1.65.1:= >=dev-libs/crypto++-8.2.0:= net-misc/curl:= >=sys-fs/fuse-2.8.6:0 dev-libs/openssl:0=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cryfs/cryfs/releases/download/0.10.2/cryfs-0.10.2.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4831dab704c67a1a11a5fce3d7dfdcf1
diff --git a/metadata/md5-cache/sys-fs/cryfs-0.10.3-r1 b/metadata/md5-cache/sys-fs/cryfs-0.10.3-r1
index de337fcf6a03..37829332d6f4 100644
--- a/metadata/md5-cache/sys-fs/cryfs-0.10.3-r1
+++ b/metadata/md5-cache/sys-fs/cryfs-0.10.3-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Encrypted FUSE filesystem that conceals metadata
 EAPI=7
 HOMEPAGE=https://www.cryfs.org/
 IUSE=debug test kernel_linux
-KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-3 MIT
 RDEPEND=>=dev-libs/boost-1.65.1:= >=dev-libs/crypto++-8.2.0:= net-misc/curl:= >=sys-fs/fuse-2.8.6:0 dev-libs/openssl:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cryfs/cryfs/releases/download/0.10.3/cryfs-0.10.3.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8705fa5f066d17a9081bebcf67c4d57e
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=ff03185285323065429e886648e7b990
diff --git a/metadata/md5-cache/sys-fs/cryptmount-5.3.3 b/metadata/md5-cache/sys-fs/cryptmount-5.3.3
index ce323909f2e9..3dec896b59db 100644
--- a/metadata/md5-cache/sys-fs/cryptmount-5.3.3
+++ b/metadata/md5-cache/sys-fs/cryptmount-5.3.3
@@ -11,5 +11,5 @@ RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) luks? ( sys-fs/cryptsetup ) openssl? (
 REQUIRED_USE=luks? ( gcrypt ) openssl? ( gcrypt )
 SLOT=0
 SRC_URI=mirror://sourceforge/cryptmount/cryptmount-5.3.3.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c4beee0a99c7e6b75cde0bbaccbe268
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.3.6-r2 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.6-r2
index 083f1ad1c5b0..100750082e8d 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.3.6-r2
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.3.6-r2
@@ -11,5 +11,5 @@ RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[s
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) static? ( !gcrypt !udev )
 SLOT=0/12
 SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.6.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1feaaad052f4c6b8ebe98aac67edb382
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.4.1-r1 b/metadata/md5-cache/sys-fs/cryptsetup-2.4.1-r1
index 816e23c2b2ff..b10d98ad70c7 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.4.1-r1
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.4.1-r1
@@ -11,5 +11,5 @@ RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/popt[static-li
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) static? ( !gcrypt !udev )
 SLOT=0/12
 SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.1.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cc404f20d1d3873ecc81a3bdb8bd7be2
diff --git a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5 b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
index 45aa1b7bb761..74ab3b974431 100644
--- a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
+++ b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/lvm2-2.02.45
 SLOT=0
 SRC_URI=https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e7c02d7bf32eee5f572a38ecab5b3832
diff --git a/metadata/md5-cache/sys-fs/ecryptfs-utils-111_p20170609-r1 b/metadata/md5-cache/sys-fs/ecryptfs-utils-111_p20170609-r1
index c250ab1c3235..1130dd12e768 100644
--- a/metadata/md5-cache/sys-fs/ecryptfs-utils-111_p20170609-r1
+++ b/metadata/md5-cache/sys-fs/ecryptfs-utils-111_p20170609-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libgcrypt-1.2.0:0= dev-libs/nss >=sys-apps/keyutils-1.5.11-r1:= sys-process/lsof gpg? ( app-crypt/gpgme:= ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7:= ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7:= >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bkohler/dist/ecryptfs-utils-111_p20170609.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3684b6430a61f2f7c13b895322ced54f
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.10 b/metadata/md5-cache/sys-fs/eudev-3.2.10
index c0e5281c5298..4853be5cf7d0 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.10
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.10
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-lib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c7a3d4064368201a1a7c4ef1ea84525f
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.10-r1 b/metadata/md5-cache/sys-fs/eudev-3.2.10-r1
index 4d94d1c06738..93056c55f4a8 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.10-r1
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.10-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-lib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=99d3c1e79ae03c30a6cfab8e81a2c6f2
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.5 b/metadata/md5-cache/sys-fs/eudev-3.2.5
index b6d646db5a6d..07fea0acdabe 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.5
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.5
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-lib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.5.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9b7c081607a0b86b478fedc7706a2992
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.7-r2 b/metadata/md5-cache/sys-fs/eudev-3.2.7-r2
index 3a98b8b712cc..12f53932bddf 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.7-r2
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.7-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-lib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.7.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f21f394c9153233093be4b3b1ac5684e
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.8 b/metadata/md5-cache/sys-fs/eudev-3.2.8
index 6c138005bd1d..85781b0b4eef 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.8
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.8
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-lib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.8.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f21f394c9153233093be4b3b1ac5684e
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.9 b/metadata/md5-cache/sys-fs/eudev-3.2.9
index 677054ea32f8..d6d7ecc0adcd 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.9
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.9
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-lib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/eudev/eudev-3.2.9.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c7a3d4064368201a1a7c4ef1ea84525f
diff --git a/metadata/md5-cache/sys-fs/eudev-4.9999 b/metadata/md5-cache/sys-fs/eudev-4.9999
index 38bf43ffd4c5..f806c62682a5 100644
--- a/metadata/md5-cache/sys-fs/eudev-4.9999
+++ b/metadata/md5-cache/sys-fs/eudev-4.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=38b8e6a3812c9406075229d1b4e9efb3
diff --git a/metadata/md5-cache/sys-fs/eudev-9999 b/metadata/md5-cache/sys-fs/eudev-9999
index 6fe85c92bf66..19be25c091ec 100644
--- a/metadata/md5-cache/sys-fs/eudev-9999
+++ b/metadata/md5-cache/sys-fs/eudev-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.20 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b4e4ff3a8dfbfb45a259add1a67393b4
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.9-r1 b/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
index 52d59ff77e68..0f56b7b35dd7 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
@@ -10,5 +10,5 @@ PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
 RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz https://dev.gentoo.org/~sam/distfiles/sys-fs/fuse/iconv.m4.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=baafe0f4d5b40f374a9f212262f3f16c
diff --git a/metadata/md5-cache/sys-fs/loop-aes-3.7t b/metadata/md5-cache/sys-fs/loop-aes-3.7t
deleted file mode 100644
index a5e1f5d5891d..000000000000
--- a/metadata/md5-cache/sys-fs/loop-aes-3.7t
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=app-crypt/loop-aes-losetup kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Linux kernel module to encrypt disk partitions with AES cipher
-EAPI=7
-HOMEPAGE=http://loop-aes.sourceforge.net/loop-AES.README
-IUSE=cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock kernel_linux kernel_linux dist-kernel
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.7t.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=44498b1c65f6316c7bae423452563c72
diff --git a/metadata/md5-cache/sys-fs/loop-aes-3.7v b/metadata/md5-cache/sys-fs/loop-aes-3.7v
index 0e755a0b32ab..f83960adfcb9 100644
--- a/metadata/md5-cache/sys-fs/loop-aes-3.7v
+++ b/metadata/md5-cache/sys-fs/loop-aes-3.7v
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.7v.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0d9238287c0f192e554ae2fd4cd2bd17
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.188-r2 b/metadata/md5-cache/sys-fs/lvm2-2.02.188-r2
index 9b56323d980e..e1cd4b26d268 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.188-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.188-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !
 REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) static? ( !systemd !udev ) static-libs? ( !udev ) systemd? ( udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.188.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.188.tgz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6d7529ec8a72f8d9394c9937fb0fdc76
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.03.13-r2 b/metadata/md5-cache/sys-fs/lvm2-2.03.13-r2
index d4eec4508699..0ae8f6530368 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.03.13-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.03.13-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !
 REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) static? ( !systemd !udev ) static-libs? ( !udev ) systemd? ( udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.03.13.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.03.13.tgz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=37be258ac42de782aa0328d4742f8994
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.8.6-r1 b/metadata/md5-cache/sys-fs/multipath-tools-0.8.6-r1
index e6c0a789c39e..dc2b2ad3e7e3 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.8.6-r1
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.8.6-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu:= >=sys-fs/lvm2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/opensvc/multipath-tools/archive/refs/tags/0.8.6.tar.gz -> multipath-tools-0.8.6.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=0758434d325ee07c8c96ce0c2da8c8bd
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.8.7 b/metadata/md5-cache/sys-fs/multipath-tools-0.8.7
index 4de483d93a84..de572d2ddd85 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.8.7
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.8.7
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu:= >=sys-fs/lvm2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/opensvc/multipath-tools/archive/refs/tags/0.8.7.tar.gz -> multipath-tools-0.8.7.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=a0854ba5c8591754df2042e7455eb76b
diff --git a/metadata/md5-cache/sys-fs/nilfs-utils-2.1.5-r2 b/metadata/md5-cache/sys-fs/nilfs-utils-2.1.5-r2
index f72cd8850c46..87eb5ad55a91 100644
--- a/metadata/md5-cache/sys-fs/nilfs-utils-2.1.5-r2
+++ b/metadata/md5-cache/sys-fs/nilfs-utils-2.1.5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-fs/e2fsprogs sys-apps/util-linux
 SLOT=0
 SRC_URI=http://nilfs.sourceforge.net/download/nilfs-utils-2.1.5.tar.bz2
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e4bdb31f325015636e55cf379d93a54e
diff --git a/metadata/md5-cache/sys-fs/nilfs-utils-2.2.2-r1 b/metadata/md5-cache/sys-fs/nilfs-utils-2.2.2-r1
index d3d176bc515d..b84ad8008099 100644
--- a/metadata/md5-cache/sys-fs/nilfs-utils-2.2.2-r1
+++ b/metadata/md5-cache/sys-fs/nilfs-utils-2.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-fs/e2fsprogs sys-apps/util-linux
 SLOT=0
 SRC_URI=http://nilfs.sourceforge.net/download/nilfs-utils-2.2.2.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=07c584d33da82d13c34c97e846f08aa0
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5-r1 b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5-r1
index d1cb28dbac76..363db913b320 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5-r1
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux:0= ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 )
 SLOT=0/885
 SRC_URI=https://jp-andre.pagesperso-orange.fr/ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2ffcd9900e1273e0930d0e77b4eab8d3
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2021.8.22 b/metadata/md5-cache/sys-fs/ntfs3g-2021.8.22
index d01d44c6bc1b..193f43d0940b 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2021.8.22
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2021.8.22
@@ -5,10 +5,10 @@ DESCRIPTION=Open source read-write NTFS driver that runs under FUSE
 EAPI=7
 HOMEPAGE=https://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html
 IUSE=acl debug ntfsdecrypt +ntfsprogs static-libs suid xattr kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux:0= sys-fs/fuse:0 ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 )
 SLOT=0/89
 SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2021.8.22.tgz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=90a097f96e554eda155c7898813939ad
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7d1b5e85e4907c2d6e9cfc31f2de06d2
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-4.5_p20210914 b/metadata/md5-cache/sys-fs/squashfs-tools-4.5_p20210914
new file mode 100644
index 000000000000..d47912693c57
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-4.5_p20210914
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=sys-libs/zlib lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) zstd? ( app-arch/zstd )
+DESCRIPTION=tools to create and extract Squashfs filesystems
+EAPI=8
+HOMEPAGE=https://github.com/plougher/squashfs-tools/
+IUSE=debug lz4 lzma lzo xattr zstd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) zstd? ( app-arch/zstd )
+SLOT=0
+SRC_URI=https://github.com/plougher/squashfs-tools/archive/19fcc9365dcdb2c22d232d42d11012940df64b7c.tar.gz -> squashfs-tools-4.5_p20210914.tar.gz
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9017515bf49b5ca36b77fba19931d9a7
diff --git a/metadata/md5-cache/sys-fs/udev-249-r3 b/metadata/md5-cache/sys-fs/udev-249-r3
index 46d4f1daf902..382ea990b16c 100644
--- a/metadata/md5-cache/sys-fs/udev-249-r3
+++ b/metadata/md5-cache/sys-fs/udev-249-r3
@@ -12,5 +12,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v249/systemd-249.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-249.1-r1.tar.xz https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-249.1-r1.tar.xz )
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4c29aa0f90d43d3b3cd70bfafdb3bbe6
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 3667ccff21b2..0f50bd800369 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-15 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/systemd
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=25a3151c593adb9c0e73701cf09a84e2
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.3 b/metadata/md5-cache/sys-fs/udisks-2.9.3
index 4a344c634b69..9e5d5a0521d7 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.9.3
+++ b/metadata/md5-cache/sys-fs/udisks-2.9.3
@@ -11,5 +11,5 @@ RDEPEND=>=sys-auth/polkit-0.114 >=sys-libs/libblockdev-2.25[cryptsetup,lvm?,vdo?
 REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon ) zram? ( systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.3/udisks-2.9.3.tar.bz2
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0b10193d8dc7d66bd035f510f1a214a4
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.4 b/metadata/md5-cache/sys-fs/udisks-2.9.4
index 534635f410f4..966ac04d0802 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.9.4
+++ b/metadata/md5-cache/sys-fs/udisks-2.9.4
@@ -11,5 +11,5 @@ RDEPEND=>=sys-auth/polkit-0.114 >=sys-libs/libblockdev-2.25[cryptsetup,lvm?,vdo?
 REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon ) zram? ( systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.4/udisks-2.9.4.tar.bz2
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2a7b7c66b7b0d0eafd22103ccbce7059
diff --git a/metadata/md5-cache/sys-fs/vhba-20200106-r1 b/metadata/md5-cache/sys-fs/vhba-20200106-r1
index 73e99fe57da8..b3a6cc8ee1d2 100644
--- a/metadata/md5-cache/sys-fs/vhba-20200106-r1
+++ b/metadata/md5-cache/sys-fs/vhba-20200106-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/udev kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/vhba-module/vhba-module-20200106.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cd6f7c22f3a1666b639f42fd657c108a
diff --git a/metadata/md5-cache/sys-fs/vhba-20210418 b/metadata/md5-cache/sys-fs/vhba-20210418
index 45783fe66d41..71e9d17f1916 100644
--- a/metadata/md5-cache/sys-fs/vhba-20210418
+++ b/metadata/md5-cache/sys-fs/vhba-20210418
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/udev kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/vhba-module/vhba-module-20210418.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=d18f19fb882ce03976b8ff903de46f3e
diff --git a/metadata/md5-cache/sys-fs/xfsdump-3.1.9-r1 b/metadata/md5-cache/sys-fs/xfsdump-3.1.9-r1
index 6453d52703aa..4e8a8869eda8 100644
--- a/metadata/md5-cache/sys-fs/xfsdump-3.1.9-r1
+++ b/metadata/md5-cache/sys-fs/xfsdump-3.1.9-r1
@@ -5,10 +5,10 @@ DESCRIPTION=xfs dump/restore utilities
 EAPI=7
 HOMEPAGE=https://xfs.wiki.kernel.org/
 IUSE=ncurses nls
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/attr-2.4.19 sys-apps/util-linux sys-fs/e2fsprogs >=sys-fs/xfsprogs-3.2.0 ncurses? ( sys-libs/ncurses:0= )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/xfsdump-3.1.9.tar.xz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4a043f211af65cf7e569c40fe38e0507
+_md5_=b94c68ac3cdb589ae40a2ba2c361d20f
diff --git a/metadata/md5-cache/sys-fs/zfs-0.8.6-r1 b/metadata/md5-cache/sys-fs/zfs-0.8.6-r1
index 3f93bbae8c7d..3a8d5c951477 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.8.6-r1
+++ b/metadata/md5-cache/sys-fs/zfs-0.8.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-0.8.6/zfs-0.8.6.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=f9482f3ec38dd665ddcac3b0d51229bf
diff --git a/metadata/md5-cache/sys-fs/zfs-2.0.6-r1 b/metadata/md5-cache/sys-fs/zfs-2.0.6-r1
index 26cf890f9caa..5ed5d4b05fb6 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.0.6-r1
+++ b/metadata/md5-cache/sys-fs/zfs-2.0.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9
 RESTRICT=test
 SLOT=0/4
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.6/zfs-2.0.6.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.0.6/zfs-2.0.6.tar.gz.asc )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7e59626d1d422a54d9afe353791292b0
diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.1-r2 b/metadata/md5-cache/sys-fs/zfs-2.1.1-r2
index 8f3ebcf20fe4..a4074de8503a 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.1.1-r2
+++ b/metadata/md5-cache/sys-fs/zfs-2.1.1-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9
 RESTRICT=test
 SLOT=0/5
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.1/zfs-2.1.1.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.1/zfs-2.1.1.tar.gz.asc )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=09cf0c6c3c6cc73713b1d3647786f79a
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index c3630edf29e8..d4e30b54cd36 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -11,5 +11,5 @@ RDEPEND=net-libs/libtirpc sys-apps/util-linux sys-libs/zlib virtual/libudev:= de
 REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) python? ( !minimal ) test-suite? ( !minimal )
 RESTRICT=test
 SLOT=0/5
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pam	41ce39f668e11d31ff4734f3b5794f7d	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=91f3a397379f39b4e2a485ec12b449d3
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.8.6 b/metadata/md5-cache/sys-fs/zfs-kmod-0.8.6
index 9f20a5990cb8..4b095220a119 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.8.6
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.8.6
@@ -12,5 +12,5 @@ RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virt
 RESTRICT=debug? ( strip ) test
 SLOT=0/0.8.6
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-0.8.6/zfs-0.8.6.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fe5dfc9e4f46729604613a078038a081
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.6 b/metadata/md5-cache/sys-fs/zfs-kmod-2.0.6
index c69ee14f3f53..d220a0948e4b 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.6
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.0.6
@@ -12,5 +12,5 @@ RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virt
 RESTRICT=debug? ( strip ) test
 SLOT=0/2.0.6
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.6/zfs-2.0.6.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.0.6/zfs-2.0.6.tar.gz.asc )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0b847cabad7c4e331091bc642e4a7cf6
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.1 b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.1
index 81350a4daa00..3f7168ae88c7 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.1
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.1
@@ -12,5 +12,5 @@ RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virt
 RESTRICT=debug? ( strip ) test
 SLOT=0/2.1.1
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.1/zfs-2.1.1.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.1/zfs-2.1.1.tar.gz.asc )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e93eebac0e910a42894a092308a4cd2b
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index b5bba6dba1ca..a638f687bb03 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 RESTRICT=debug? ( strip ) test
 SLOT=0/9999
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2dd69a30ae351cfe318b9ddf3e369cb1
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 4df89b4474af..646bfcd3e691 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/cryptodev-1.11 b/metadata/md5-cache/sys-kernel/cryptodev-1.11
index e55f83d9506c..326d58a4ffbc 100644
--- a/metadata/md5-cache/sys-kernel/cryptodev-1.11
+++ b/metadata/md5-cache/sys-kernel/cryptodev-1.11
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cryptodev-linux/cryptodev-linux/archive/cryptodev-linux-1.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=196f68d751106c3912e66af73e531658
diff --git a/metadata/md5-cache/sys-kernel/cryptodev-1.12 b/metadata/md5-cache/sys-kernel/cryptodev-1.12
index d41aaac72e5d..04be38111b97 100644
--- a/metadata/md5-cache/sys-kernel/cryptodev-1.12
+++ b/metadata/md5-cache/sys-kernel/cryptodev-1.12
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cryptodev-linux/cryptodev-linux/archive/cryptodev-linux-1.12.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b62f3fa76164a74d1cd4c4cb69d65b91
diff --git a/metadata/md5-cache/sys-kernel/cryptodev-9999 b/metadata/md5-cache/sys-kernel/cryptodev-9999
index ff9610458931..027e6d030a8f 100644
--- a/metadata/md5-cache/sys-kernel/cryptodev-9999
+++ b/metadata/md5-cache/sys-kernel/cryptodev-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a63ac6e762c33048f8484829a3e757ea
diff --git a/metadata/md5-cache/sys-kernel/dracut-053-r1 b/metadata/md5-cache/sys-kernel/dracut-053-r1
index 0f8ee055a140..10031fcae8ca 100644
--- a/metadata/md5-cache/sys-kernel/dracut-053-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-053-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-053.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=92ee7226528c22aacd6099ded139bb7d
diff --git a/metadata/md5-cache/sys-kernel/dracut-055-r3 b/metadata/md5-cache/sys-kernel/dracut-055-r3
index 1d4022fa62a1..4d2e029a0c8f 100644
--- a/metadata/md5-cache/sys-kernel/dracut-055-r3
+++ b/metadata/md5-cache/sys-kernel/dracut-055-r3
@@ -11,5 +11,5 @@ RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-055.tar.xz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1bcbf6e2714bc7e753b213157d2dc90b
diff --git a/metadata/md5-cache/sys-kernel/dracut-9999 b/metadata/md5-cache/sys-kernel/dracut-9999
index 107aa5630723..9d506dbf1a32 100644
--- a/metadata/md5-cache/sys-kernel/dracut-9999
+++ b/metadata/md5-cache/sys-kernel/dracut-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys-apps/kmod-23[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/openrc[sysv-utils(-),selinux?] sys-apps/systemd[sysv-utils] ) >=sys-apps/util-linux-2.21 virtual/pkgconfig virtual/udev elibc_musl? ( sys-libs/fts-standalone ) selinux? ( sec-policy/selinux-dracut sys-libs/libselinux sys-libs/libsepol )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6599a55209812928df0da855f7221b69
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.72 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.72
new file mode 100644
index 000000000000..a56bc0bb9281
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.72
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.72
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.72 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.72
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-78.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-78.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9ce444a5985b1e8fdbe9bd011db5f9d1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.73 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.73
new file mode 100644
index 000000000000..094c9ab77001
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.73
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.73
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.73 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.73
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-79.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-79.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8ffb4a4dcc5fc59f0b577ad490a3608b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.74 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.74
new file mode 100644
index 000000000000..1a21d63d23fd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.74
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.74
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.74 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.74
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-80.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-80.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.42.tar.gz -> gentoo-kernel-config-5.10.42.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9ce444a5985b1e8fdbe9bd011db5f9d1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.11 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.11
new file mode 100644
index 000000000000..c1550fcf6563
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.11
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.14.11
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.14.11 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.14.11
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-12.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-12.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.6 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.6 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.6 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.6 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=88a0228ae13ac193f37e4fc3a82245f1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.12
new file mode 100644
index 000000000000..a63272b1a405
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.12
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.14.12
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.14.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.14.12
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-13.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-13.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.6 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.6 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.6 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.6 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d81ad41ece6ceb06944eef1f5877f8be
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.13 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.13
new file mode 100644
index 000000000000..efba2d934fe2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.14.13
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.14.13
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.14.13 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.14.13
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-14.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-14.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.6 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.6 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.6 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.6 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=88a0228ae13ac193f37e4fc3a82245f1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.152 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.152
new file mode 100644
index 000000000000..734c1a78e1fc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.152
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.152
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.152 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.152
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-156.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-156.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=90061225b63ee2e6e582dba6f3d5f21a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.153 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.153
new file mode 100644
index 000000000000..89c3e86027ed
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.153
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.153
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.153 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.153
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-157.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-157.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=72a334ddbfa724fb31c9721207dde971
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.154 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.154
new file mode 100644
index 000000000000..f63edd75618d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.154
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.154
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.154 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.154
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-158.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-158.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=90061225b63ee2e6e582dba6f3d5f21a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.72 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.72
new file mode 100644
index 000000000000..e93a6039e649
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.72
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.72
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.72 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.72
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-78.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-78.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.72-1.xpak -> gentoo-kernel-5.10.72-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.72-1.xpak -> gentoo-kernel-5.10.72-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=57a69e56a2a0ddd314c54789b46ea687
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.72-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.72-r1
new file mode 100644
index 000000000000..705711bb2fe1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.72-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.72
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.72 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.72
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-78.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-78.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.72-1.xpak -> gentoo-kernel-5.10.72-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cbd6a10587fe60af32bfea202e62c1d7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.73 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.73
new file mode 100644
index 000000000000..5e4906aff600
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.73
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.73
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.73 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.73
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-79.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-79.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.73-1.xpak -> gentoo-kernel-5.10.73-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.73-1.xpak -> gentoo-kernel-5.10.73-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ed3e26bb73eb3c21bbdda8988b4d9149
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.73-r2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.73-r2
new file mode 100644
index 000000000000..47664f9f1313
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.73-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.73
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.73 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.73
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-79.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-79.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.73-1.xpak -> gentoo-kernel-5.10.73-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8a6cad9d398951d916863421de29941e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.74 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.74
new file mode 100644
index 000000000000..2e20b61c9922
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.74
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.74
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.74 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.74
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-80.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-80.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.74-1.xpak -> gentoo-kernel-5.10.74-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.74-1.xpak -> gentoo-kernel-5.10.74-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=57a69e56a2a0ddd314c54789b46ea687
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.74-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.74-r1
new file mode 100644
index 000000000000..ca0d52f1bb37
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.74-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.74
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.74 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.74
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-80.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-80.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.74-1.xpak -> gentoo-kernel-5.10.74-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=cbd6a10587fe60af32bfea202e62c1d7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.10-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.10-r1
new file mode 100644
index 000000000000..15ea0a151903
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.10-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.14.10
+RDEPEND=!sys-kernel/gentoo-kernel:5.14.10 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.14.10
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-11.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-11.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.10-1.xpak -> gentoo-kernel-5.14.10-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f1818b14a55cf755fbde13fe1c88a9ee
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.11 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.11
new file mode 100644
index 000000000000..c8055517675d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.11
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.14.11
+RDEPEND=!sys-kernel/gentoo-kernel:5.14.11 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.14.11
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-12.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-12.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.11-1.xpak -> gentoo-kernel-5.14.11-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.11-1.xpak -> gentoo-kernel-5.14.11-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17647ae32aae091a1fc3068d824145d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.11-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.11-r1
new file mode 100644
index 000000000000..33da09bb6d20
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.11-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.14.11
+RDEPEND=!sys-kernel/gentoo-kernel:5.14.11 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.14.11
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-12.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-12.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.11-1.xpak -> gentoo-kernel-5.14.11-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f1818b14a55cf755fbde13fe1c88a9ee
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.12
new file mode 100644
index 000000000000..b37fccc47863
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.12
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.14.12
+RDEPEND=!sys-kernel/gentoo-kernel:5.14.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.14.12
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-13.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-13.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.12-1.xpak -> gentoo-kernel-5.14.12-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.12-1.xpak -> gentoo-kernel-5.14.12-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0605f98f246f76e8d57493b387f90b32
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.12-r2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.12-r2
new file mode 100644
index 000000000000..d3682d745261
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.12-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.14.12
+RDEPEND=!sys-kernel/gentoo-kernel:5.14.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.14.12
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-13.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-13.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.12-1.xpak -> gentoo-kernel-5.14.12-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5a74dd8c38b9ec1b9b827720f5c57902
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.13 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.13
new file mode 100644
index 000000000000..365487a79d5e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.13
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.14.13
+RDEPEND=!sys-kernel/gentoo-kernel:5.14.13 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.14.13
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-14.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-14.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.13-1.xpak -> gentoo-kernel-5.14.13-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.13-1.xpak -> gentoo-kernel-5.14.13-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17647ae32aae091a1fc3068d824145d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.13-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.13-r1
new file mode 100644
index 000000000000..5eacb790f06e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.13-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.14.13
+RDEPEND=!sys-kernel/gentoo-kernel:5.14.13 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.14.13
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-14.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-14.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.13-1.xpak -> gentoo-kernel-5.14.13-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=5f429b3df382c51ad556ccb4307fe9c6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.152 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.152
new file mode 100644
index 000000000000..b693f4f6394d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.152
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.152
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.152 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.152
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-156.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-156.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.152-1.xpak -> gentoo-kernel-5.4.152-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.152-1.xpak -> gentoo-kernel-5.4.152-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=70de02a54cbc49b1ccfa306794e5ceb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.152-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.152-r1
new file mode 100644
index 000000000000..6a68003c31f7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.152-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.152
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.152 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.152
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-156.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-156.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.152-1.xpak -> gentoo-kernel-5.4.152-1.arm64-r1.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=588b9a16742c74e96021338561c7a300
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.153 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.153
new file mode 100644
index 000000000000..e80f60ed6d33
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.153
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.153
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.153 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.153
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-157.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-157.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.153-1.xpak -> gentoo-kernel-5.4.153-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.153-1.xpak -> gentoo-kernel-5.4.153-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=95f703e2817767b31828e67652bef959
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.153-r2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.153-r2
new file mode 100644
index 000000000000..7f65d42b6c4c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.153-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.153
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.153 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.153
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-157.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-157.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.153-1.xpak -> gentoo-kernel-5.4.153-1.arm64-r1.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6b5cc90015a20a91ff79eb406defd2c0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.154 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.154
new file mode 100644
index 000000000000..c2211da1257a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.154
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.154
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.154 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.154
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-158.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-158.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.154-1.xpak -> gentoo-kernel-5.4.154-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.154-1.xpak -> gentoo-kernel-5.4.154-1.x86.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=70de02a54cbc49b1ccfa306794e5ceb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.154-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.154-r1
new file mode 100644
index 000000000000..480b35c469c1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.154-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.154
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.154 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.154
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-158.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-158.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.154-1.xpak -> gentoo-kernel-5.4.154-1.arm64.xpak )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=65b0dcce347739bcba48c9db3d787501
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.250 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.250
new file mode 100644
index 000000000000..45695ec92341
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.250
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.250
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-260.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-260.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-260.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-260.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-260.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-260.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-260.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-260.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-260.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=39a66a840e56d5d940344351cb1cdf63
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.251 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.251
new file mode 100644
index 000000000000..ddd1d23d7cf4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.251
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.251
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-261.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-261.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-261.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-261.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-261.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-261.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-261.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-261.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-261.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7380b06ec41d6c81515066642c742707
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.210 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.210
new file mode 100644
index 000000000000..2dc42e5cd7f9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.210
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.210
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-209.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-209.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-209.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-209.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-209.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-209.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-209.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-209.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-209.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2e8861c2b1cd9d6303c7554db8dd59d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.211 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.211
new file mode 100644
index 000000000000..0167517e5da1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.211
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.211
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-210.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-210.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-210.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-210.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-210.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-210.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-210.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-210.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-210.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bbe8150de99016014fa14897ed9f6aa6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.212 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.212
new file mode 100644
index 000000000000..d6cdfecb11d4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.212
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.212
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-211.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-211.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-211.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-211.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-211.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-211.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-211.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-211.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-211.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bc06a5e07ee08dc24e4ba3775922f883
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.288 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.288
new file mode 100644
index 000000000000..9044ac1e89a9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.288
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.4.288
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-290.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-290.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-290.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-290.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-290.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-290.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-290.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-290.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-290.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e9d709b2eb1d5ed3af989b5f2f8d3fa5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.289 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.289
new file mode 100644
index 000000000000..2ec3d437cb9b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.289
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.4.289
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-291.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-291.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-291.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-291.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-291.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-291.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-291.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-291.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-291.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=32c122573a465b439feeebfab0416042
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.286 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.286
new file mode 100644
index 000000000000..6ee36bcd0d6a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.286
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.9.286
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-290.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-290.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-290.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-290.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-290.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-290.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-290.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-290.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-290.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e9d709b2eb1d5ed3af989b5f2f8d3fa5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.287 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.287
new file mode 100644
index 000000000000..a7d07fd06b93
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.287
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.9.287
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-291.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-291.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-291.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-291.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-291.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-291.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-291.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-291.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-291.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=32c122573a465b439feeebfab0416042
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.72 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.72
new file mode 100644
index 000000000000..ca233421e9e6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.72
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.72
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-78.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-78.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-78.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-78.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-78.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-78.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-78.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-78.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-78.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6b2685858a8cf100c15de13205f73f33
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.73 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.73
new file mode 100644
index 000000000000..dde47bb56017
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.73
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.73
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-79.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-79.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-79.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-79.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-79.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-79.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-79.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-79.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-79.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a80cfdb023f11531fdd3121f5b5f431e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.74 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.74
new file mode 100644
index 000000000000..2d68c8f28aa7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.74
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.74
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-80.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-80.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-80.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-80.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-80.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-80.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-80.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-80.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-80.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=f88ee7afa6d188dc21c8a64c17f49c02
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.11 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.11
new file mode 100644
index 000000000000..fae51e8fe41c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.11
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.14 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.14.11
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-12.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-12.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-12.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-12.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-12.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-12.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-12.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-12.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-12.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0e8aedd0d018d5ebdcd162767fb0a18d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.12 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.12
new file mode 100644
index 000000000000..e9ea26dcacb6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.12
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.14 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.14.12
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-13.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-13.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-13.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-13.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-13.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-13.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-13.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-13.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e62af13ea39d9fb98db97c7224997c6a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.13 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.13
new file mode 100644
index 000000000000..fd58f5a51441
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.14.13
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.14 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.14.13
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-14.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-14.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-14.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-14.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-14.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-14.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.14-14.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-14.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.14-14.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b82b37fd0fecf0aa01e24f337d118731
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.152 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.152
new file mode 100644
index 000000000000..9b5af1120b26
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.152
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.152
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-156.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-156.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-156.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-156.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-156.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-156.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-156.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-156.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-156.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e3332283d468e950ef828b894e754358
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.153 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.153
new file mode 100644
index 000000000000..a2d90b645e80
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.153
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.153
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-157.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-157.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-157.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-157.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-157.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-157.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-157.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-157.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-157.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=aa3f44a30012a80fadd650ef1aba614d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.154 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.154
new file mode 100644
index 000000000000..c437fcfe6d4c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.154
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.154
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-158.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-158.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-158.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-158.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-158.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-158.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-158.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-158.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-158.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=93e8bfa0b1694de3998af0b6867e0f9c
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.15_rc5 b/metadata/md5-cache/sys-kernel/git-sources-5.15_rc5
new file mode 100644
index 000000000000..67181ff6b62f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.15_rc5
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=7
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.15_rc5
+SRC_URI=https://git.kernel.org/torvalds/p/v5.15-rc5/v5.14 -> patch-5.15-rc5.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=75ad86d5d7ebcf1e44d5a3549e457e2b
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.15_rc6 b/metadata/md5-cache/sys-kernel/git-sources-5.15_rc6
new file mode 100644
index 000000000000..ea2fb20f92a3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.15_rc6
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=7
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.15_rc6
+SRC_URI=https://git.kernel.org/torvalds/p/v5.15-rc6/v5.14 -> patch-5.15-rc6.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=75ad86d5d7ebcf1e44d5a3549e457e2b
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.6.3-r1 b/metadata/md5-cache/sys-kernel/kpatch-0.6.3-r1
index 09ed8f38f8f6..14b0fee63384 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-0.6.3-r1
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.6.3-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/pesign dev-libs/openssl:0= sys-libs/zlib sys-apps/pciutils ker
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dynup/kpatch/archive/v0.6.3.tar.gz -> kpatch-0.6.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=de1732dc40cfe36c0695f5fb4462229f
diff --git a/metadata/md5-cache/sys-kernel/kpatch-0.7.1-r1 b/metadata/md5-cache/sys-kernel/kpatch-0.7.1-r1
index 3c1ad15ff803..12fb43a0f0b4 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-0.7.1-r1
+++ b/metadata/md5-cache/sys-kernel/kpatch-0.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/pesign sys-libs/zlib sys-apps/pciutils kernel_linux? ( sys-app
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dynup/kpatch/archive/v0.7.1.tar.gz -> kpatch-0.7.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6f376bf5b90ee3fb2c99d88d3d421e56
diff --git a/metadata/md5-cache/sys-kernel/kpatch-9999 b/metadata/md5-cache/sys-kernel/kpatch-9999
index 423feeafcfc9..74fb3149ae6d 100644
--- a/metadata/md5-cache/sys-kernel/kpatch-9999
+++ b/metadata/md5-cache/sys-kernel/kpatch-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-crypt/pesign sys-libs/zlib sys-apps/pciutils kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a25433b28f077894415b8b4d5562f956
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.14_p5 b/metadata/md5-cache/sys-kernel/pf-sources-5.14_p5
new file mode 100644
index 000000000000..c235c372da22
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.14_p5
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=7
+HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.14_p5
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.14...v5.14-pf5.diff -> pf-sources-5.14_p5.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.14-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.14-1.extras.tar.xz https://gitlab.com/alfredchen/projectc/-/raw/master/5.14/prjc_v5.14-r3.patch https://dev.gentoo.org/~mpagano/genpatches/trunk/5.14/5021_BMQ-and-PDS-gentoo-defaults.patch -> 5021_BMQ-and-PDS-gentoo-defaults-5.14.patch
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9d19472d5675e0fc1040fc2266ed123d
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
index bec7cd25eecf..14043c328735 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
@@ -10,5 +10,5 @@ RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-d
 RESTRICT=binchecks strip
 SLOT=5.10.11_p20210201
 SRC_URI=https://github.com/raspberrypi/linux/archive/raspberrypi-kernel_1.20210201-1.tar.gz -> linux-5.10.11_p20210201-raspberrypi.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=f408429b8eb45b734c4b4bd49ea7da9d
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
index 69f0faa0f8f7..a02c62e09a2b 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-d
 RESTRICT=binchecks strip
 SLOT=5.4.79_p20201201-r1
 SRC_URI=https://github.com/raspberrypi/linux/archive/raspberrypi-kernel_1.20201201-1.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=513f8481a3f12153bd34040a052635b2
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.72 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.72
new file mode 100644
index 000000000000..c29c49b92848
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.72
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.72
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.72 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.72
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.72.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.72.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.73 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.73
new file mode 100644
index 000000000000..5bc6b704d109
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.73
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.73
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.73 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.73
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.73.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.73.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.74 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.74
new file mode 100644
index 000000000000..31450b0d4340
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.74
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.74
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.74 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.74
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.74.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.32.tar.gz -> gentoo-kernel-config-5.10.32.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.74.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=0e2aa050cf08fac5e8c9917b602638a0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.11 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.11
new file mode 100644
index 000000000000..80a41e41bc70
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.11
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.14.11
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.14.11 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.14.11
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.11.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.11.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.6 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.6 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.6 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.6 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=d73397fd55b61134e77acd90384acf8e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.12 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.12
new file mode 100644
index 000000000000..20a090883ad5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.12
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.14.12
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.14.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.14.12
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.12.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.12.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.6 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.6 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.6 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.6 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=d73397fd55b61134e77acd90384acf8e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.13 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.13
new file mode 100644
index 000000000000..6c860a2a1cbb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.14.13
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.14.13
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.14.13 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.14.13
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.13.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.13.4.tar.gz -> gentoo-kernel-config-5.13.4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.13.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.14.6 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.14.6 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.14.6 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/416de8884575795f040923fb460e7fc5e5d67102/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.14.6 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=d73397fd55b61134e77acd90384acf8e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.152 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.152
new file mode 100644
index 000000000000..34ac3e7c327a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.152
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.152
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.152 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.152
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.152.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.152.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.153 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.153
new file mode 100644
index 000000000000..720e77c7002a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.153
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.153
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.153 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.153
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.153.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.153.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.154 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.154
new file mode 100644
index 000000000000..d1058830705a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.154
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.154
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.154 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.154
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.154.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.114.tar.gz -> gentoo-kernel-config-5.4.114.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.154.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	5f5dcb152079b8fd5773b438c9397f0b	kernel-install	b039e9a58c3e7d14248a2d8bed02a7ed	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	portability	d1186f1e621de7b27ddcae82e6253259	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=1a652dd3004bcc73801b4c105824aafb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.249 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.249
deleted file mode 100644
index bc4fddc3b2fb..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.249
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.14.249
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.249.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.251 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.251
new file mode 100644
index 000000000000..3ab8df9eafbe
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.251
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=8
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.251
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.251.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.209 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.209
deleted file mode 100644
index 14492cc23251..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.209
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.19.209
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.209.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.212 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.212
new file mode 100644
index 000000000000..a880fe13bf06
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.212
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=8
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.212
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.212.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.287 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.287
deleted file mode 100644
index 1651016feeb5..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.287
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.4.287
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.287.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.289 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.289
new file mode 100644
index 000000000000..6cd14850e770
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.289
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=8
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.4.289
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.289.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.285 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.285
deleted file mode 100644
index b70b85870b6c..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.285
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.9.285
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.285.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.287 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.287
new file mode 100644
index 000000000000..b80ac4378819
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.287
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=8
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.9.287
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.287.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.71 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.71
deleted file mode 100644
index 6bc7228d3c26..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.71
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.10.71
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.71.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.74 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.74
new file mode 100644
index 000000000000..0a861884eb92
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.74
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=8
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.74
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.74.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.19 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.19
deleted file mode 100644
index 40329e7ba6f6..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.13.19
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.13.19
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.13.19.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.14.10 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.14.10
deleted file mode 100644
index 85af0e6b132f..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.14.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.14.10
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.14.10.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.14.13 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.14.13
new file mode 100644
index 000000000000..b73948b92006
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.14.13
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=8
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.14.13
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.14.13.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.151 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.151
deleted file mode 100644
index 05200804963b..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.151
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.4.151
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.151.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.154 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.154
new file mode 100644
index 000000000000..add0c8aefc6c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.154
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=8
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.154
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.154.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	558643172ab02bb7cb88b95070b91f12	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=17b1428a7ba233579d7e54be907b28ad
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index e3bc4458ec3a..01fea9924b23 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.19 b/metadata/md5-cache/sys-libs/gdbm-1.19
deleted file mode 100644
index d5c8345ba986..000000000000
--- a/metadata/md5-cache/sys-libs/gdbm-1.19
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Standard GNU database libraries
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/gdbm/
-IUSE=+berkdb nls +readline static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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
-LICENSE=GPL-3
-RDEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/6
-SRC_URI=mirror://gnu/gdbm/gdbm-1.19.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3d30a9bfbcd595d6e18cac8f4c09edab
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.22 b/metadata/md5-cache/sys-libs/gdbm-1.22
new file mode 100644
index 000000000000..51219fb720f6
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/gdbm-1.22
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Standard GNU database libraries
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/gdbm/
+IUSE=+berkdb nls +readline static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+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
+LICENSE=GPL-3
+RDEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/6
+SRC_URI=mirror://gnu/gdbm/gdbm-1.22.tar.gz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e2323cc62a76bbc215de6dc41315563d
diff --git a/metadata/md5-cache/sys-libs/gpm-1.20.7-r3 b/metadata/md5-cache/sys-libs/gpm-1.20.7-r3
index cc256ef725b8..651fdf0380a5 100644
--- a/metadata/md5-cache/sys-libs/gpm-1.20.7-r3
+++ b/metadata/md5-cache/sys-libs/gpm-1.20.7-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] selinux? ( sec-policy/selinux-gpm )
 SLOT=0
 SRC_URI=https://www.nico.schottelius.org/software/gpm/archives/gpm-1.20.7.tar.lzma mirror://gentoo/gpm-1.20.7-docs.patch.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
 _md5_=8fd64d65dd8bdd036170ac017dffdc3a
diff --git a/metadata/md5-cache/sys-libs/ldb-2.3.0-r1 b/metadata/md5-cache/sys-libs/ldb-2.3.0-r1
index d6a9370e88a3..f7c6a89be010 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.3.0-r1
+++ b/metadata/md5-cache/sys-libs/ldb-2.3.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=LDAP-like embedded database
 EAPI=7
 HOMEPAGE=https://ldb.samba.org
 IUSE=doc ldap +lmdb python test python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) test? ( python )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.3.0
 SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.3.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887
-_md5_=c27954e35054dcfec6e680b01fe5d1d3
+_md5_=90eef97f4a5435e6ef9b4fe37e8534c6
diff --git a/metadata/md5-cache/sys-libs/libomp-10.0.1 b/metadata/md5-cache/sys-libs/libomp-10.0.1
index 4fb8f5ffc878..42fce67a7cbd 100644
--- a/metadata/md5-cache/sys-libs/libomp-10.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-10.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fb0fe7a1427178d3fce2af3995f868a7
diff --git a/metadata/md5-cache/sys-libs/libomp-11.1.0 b/metadata/md5-cache/sys-libs/libomp-11.1.0
index dbde14547faf..c0066bed36d5 100644
--- a/metadata/md5-cache/sys-libs/libomp-11.1.0
+++ b/metadata/md5-cache/sys-libs/libomp-11.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=890dd5a7b0c2f8e4f3c5c2cd44442336
diff --git a/metadata/md5-cache/sys-libs/libomp-12.0.1 b/metadata/md5-cache/sys-libs/libomp-12.0.1
index 8651061b0cc9..68032bce273d 100644
--- a/metadata/md5-cache/sys-libs/libomp-12.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-12.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-12.0.1.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=fc2b813f969855168041bd28429a1d14
diff --git a/metadata/md5-cache/sys-libs/libomp-13.0.0 b/metadata/md5-cache/sys-libs/libomp-13.0.0
index a38e2476dc3f..dbcd1977886c 100644
--- a/metadata/md5-cache/sys-libs/libomp-13.0.0
+++ b/metadata/md5-cache/sys-libs/libomp-13.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=cuda? ( llvm_targets_NVPTX ) offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-13.0.0-r1.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=479540bf409af6c65326735e82172c13
diff --git a/metadata/md5-cache/sys-libs/libomp-13.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-13.0.0.9999
index 565b0f613b00..79b24b328b2a 100644
--- a/metadata/md5-cache/sys-libs/libomp-13.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-13.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 REQUIRED_USE=cuda? ( llvm_targets_NVPTX ) offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f5fd55c5fbe8f5b9f4117e767071bd1f
diff --git a/metadata/md5-cache/sys-libs/libomp-14.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-14.0.0.9999
index d026ec382481..cfcddd04c8b1 100644
--- a/metadata/md5-cache/sys-libs/libomp-14.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-14.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 REQUIRED_USE=cuda? ( llvm_targets_NVPTX ) offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f5fd55c5fbe8f5b9f4117e767071bd1f
diff --git a/metadata/md5-cache/sys-libs/liburing-2.1 b/metadata/md5-cache/sys-libs/liburing-2.1
index da9782628f4f..a97447b679d0 100644
--- a/metadata/md5-cache/sys-libs/liburing-2.1
+++ b/metadata/md5-cache/sys-libs/liburing-2.1
@@ -9,4 +9,4 @@ RESTRICT=test
 SLOT=0/2
 SRC_URI=https://git.kernel.dk/cgit/liburing/snapshot/liburing-2.1.tar.bz2
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5cf0ff8e94160d6fbc45feb0dcae0cb5
+_md5_=b39fa8cb3626df50f4eda978304ea49d
diff --git a/metadata/md5-cache/sys-libs/pam_wrapper-1.1.3-r2 b/metadata/md5-cache/sys-libs/pam_wrapper-1.1.3-r2
new file mode 100644
index 000000000000..8517041c897c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/pam_wrapper-1.1.3-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-libs/pam:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( dev-util/cmocka[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=A tool to test PAM applications and PAM modules
+EAPI=7
+HOMEPAGE=https://cwrap.org/pam_wrapper.html
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-libs/pam:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.samba.org/ftp/pub/cwrap/pam_wrapper-1.1.3.tar.gz https://ftp.samba.org/pub/cwrap/pam_wrapper-1.1.3.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8db788bf875d91d9b583f5b73ffbd212
diff --git a/metadata/md5-cache/sys-libs/readline-8.1_p1-r1 b/metadata/md5-cache/sys-libs/readline-8.1_p1-r1
index e3b6b8eb5864..238e7c6b2d82 100644
--- a/metadata/md5-cache/sys-libs/readline-8.1_p1-r1
+++ b/metadata/md5-cache/sys-libs/readline-8.1_p1-r1
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,abi_x86_32(-)?,abi_
 SLOT=0/8
 SRC_URI=mirror://gnu/readline/readline-8.1.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-001 mirror://gnu/readline/readline-8.1-patches/readline81-001
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=352c754a30bc413daf5638ab0ab989ce
+_md5_=a8b7318eecae25744670945580a395e4
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 9fc3c42e9488..214dbcdc0112 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/acpi_call-1.2.1 b/metadata/md5-cache/sys-power/acpi_call-1.2.1
index f7b1971162e8..606132c6bc16 100644
--- a/metadata/md5-cache/sys-power/acpi_call-1.2.1
+++ b/metadata/md5-cache/sys-power/acpi_call-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/nix-community/acpi_call/archive/v1.2.1.tar.gz -> acpi_call-1.2.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e4f3be2e569e2cfda93d31b17f79a323
diff --git a/metadata/md5-cache/sys-power/acpi_call-1.2.2 b/metadata/md5-cache/sys-power/acpi_call-1.2.2
index 668a164e4ec6..fc709cc2c43f 100644
--- a/metadata/md5-cache/sys-power/acpi_call-1.2.2
+++ b/metadata/md5-cache/sys-power/acpi_call-1.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/nix-community/acpi_call/archive/v1.2.2.tar.gz -> acpi_call-1.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7172c3c6ea120695245a43c5f0f3f36b
diff --git a/metadata/md5-cache/sys-power/acpi_call-9999 b/metadata/md5-cache/sys-power/acpi_call-9999
index e4db6c7e9d00..fc60b8abba22 100644
--- a/metadata/md5-cache/sys-power/acpi_call-9999
+++ b/metadata/md5-cache/sys-power/acpi_call-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=44f3263fe4c9b633d47006925fbb1dbf
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.32-r2 b/metadata/md5-cache/sys-power/acpid-2.0.32-r2
index 69e4ae49d455..d5d371c1c626 100644
--- a/metadata/md5-cache/sys-power/acpid-2.0.32-r2
+++ b/metadata/md5-cache/sys-power/acpid-2.0.32-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-apm )
 SLOT=0
 SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.32.tar.xz https://dev.gentoo.org/~andrey_utkin/distfiles/sys-power_acpid_2.0.32-r2_extras.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7c758e9404c2dcf84e62e675a1b2a318
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r3 b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r3
index 09ba7096cd4a..db1b6796c7c8 100644
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r3
+++ b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.23[tty-helpers(-)] cgi? ( >=media-libs/gd-1.8.4 ) modbus? ( usb? ( virtual/libusb:0 ) ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) virtual/mailx virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.14.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=8598938e719fa537c3c670a9706e0d1b
diff --git a/metadata/md5-cache/sys-power/bbswitch-0.8_p20200526 b/metadata/md5-cache/sys-power/bbswitch-0.8_p20200526
index 9e54d49c7a13..423a88419c7d 100644
--- a/metadata/md5-cache/sys-power/bbswitch-0.8_p20200526
+++ b/metadata/md5-cache/sys-power/bbswitch-0.8_p20200526
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/bbswitch/archive/ddbd243638c7bc2baecf43a78aff46cdc12e9b2e.tar.gz -> bbswitch-0.8_p20200526.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=83172471fbb2d9c15ea63006f98b8c6a
diff --git a/metadata/md5-cache/sys-power/bbswitch-9999 b/metadata/md5-cache/sys-power/bbswitch-9999
index 1f1b14818f10..d468d88c1892 100644
--- a/metadata/md5-cache/sys-power/bbswitch-9999
+++ b/metadata/md5-cache/sys-power/bbswitch-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8ccdbf62c0054a7eaf09de8b1e3c618b
diff --git a/metadata/md5-cache/sys-power/intel-undervolt-1.7-r1 b/metadata/md5-cache/sys-power/intel-undervolt-1.7-r1
index 4f8414c3a85d..f698f45c22c7 100644
--- a/metadata/md5-cache/sys-power/intel-undervolt-1.7-r1
+++ b/metadata/md5-cache/sys-power/intel-undervolt-1.7-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=elogind? ( sys-auth/elogind )
 SLOT=0
 SRC_URI=https://github.com/kitsunyan/intel-undervolt/archive/1.7.tar.gz -> intel-undervolt-1.7.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=01b51b5f7814703aca3c4ad6625057cc
diff --git a/metadata/md5-cache/sys-power/intel-undervolt-9999 b/metadata/md5-cache/sys-power/intel-undervolt-9999
index b564492ba322..c34e643b1e4c 100644
--- a/metadata/md5-cache/sys-power/intel-undervolt-9999
+++ b/metadata/md5-cache/sys-power/intel-undervolt-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=elogind? ( sys-auth/elogind )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=01b51b5f7814703aca3c4ad6625057cc
diff --git a/metadata/md5-cache/sys-power/powernowd-1.00-r5 b/metadata/md5-cache/sys-power/powernowd-1.00-r5
index ffca250a27cd..d385df72d19d 100644
--- a/metadata/md5-cache/sys-power/powernowd-1.00-r5
+++ b/metadata/md5-cache/sys-power/powernowd-1.00-r5
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.deater.net/john/powernowd-1.00.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=525c3102d0276060fa835a8608206f58
diff --git a/metadata/md5-cache/sys-power/powertop-2.13-r2 b/metadata/md5-cache/sys-power/powertop-2.13-r2
index 98c7098d66ea..dac4894c68c5 100644
--- a/metadata/md5-cache/sys-power/powertop-2.13-r2
+++ b/metadata/md5-cache/sys-power/powertop-2.13-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode(+)?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
 SRC_URI=https://github.com/fenrus75/powertop/archive/v2.13.tar.gz -> powertop-2.13.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=91cf36bed8d8ecf6375c1893e5c08367
diff --git a/metadata/md5-cache/sys-power/powertop-2.14 b/metadata/md5-cache/sys-power/powertop-2.14
index f51fe3b686c2..4d9bc30644b1 100644
--- a/metadata/md5-cache/sys-power/powertop-2.14
+++ b/metadata/md5-cache/sys-power/powertop-2.14
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode(+)?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
 SRC_URI=https://github.com/fenrus75/powertop/archive/v2.14.tar.gz -> powertop-2.14.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=93f72d9578d402c30157bc2ee9b3e8e6
diff --git a/metadata/md5-cache/sys-power/powertop-9999 b/metadata/md5-cache/sys-power/powertop-9999
index a97e7ecb6599..fe7d5239a839 100644
--- a/metadata/md5-cache/sys-power/powertop-9999
+++ b/metadata/md5-cache/sys-power/powertop-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode(+)?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=6c27867c56b52711a779d4e82eebeaa3
diff --git a/metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4-r1 b/metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4-r1
index aab4f438c3a4..fec40baf151e 100644
--- a/metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4-r1
+++ b/metadata/md5-cache/sys-power/tuxedo-cc-wmi-0.1.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/tuxedocomputers/tuxedo-cc-wmi/archive/v0.1.4.tar.gz -> tuxedo-cc-wmi-0.1.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3e3bd07426308af786957898aa17e828
diff --git a/metadata/md5-cache/sys-power/upower-0.99.12-r1 b/metadata/md5-cache/sys-power/upower-0.99.12-r1
index 7774635df30b..51c8a60866be 100644
--- a/metadata/md5-cache/sys-power/upower-0.99.12-r1
+++ b/metadata/md5-cache/sys-power/upower-0.99.12-r1
@@ -5,10 +5,10 @@ DESCRIPTION=D-Bus abstraction for enumerating power devices, querying history an
 EAPI=8
 HOMEPAGE=https://upower.freedesktop.org/
 IUSE=doc +introspection ios kernel_FreeBSD kernel_linux selinux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.38:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( >=dev-libs/libgudev-236:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-2:= ) ) selinux? ( sec-policy/selinux-devicekit )
 SLOT=0/3
 SRC_URI=https://gitlab.freedesktop.org/upower/upower/uploads/244f5966c58773bbd3b4c507c549560f/upower-0.99.12.tar.xz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e3a0fe5486c2bfc788508ebe09dcfbea
+_md5_=dbd85e457131b4bf688f2f01a7cfc4a8
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 5e5fa57f886a..336441bf9948 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/acct-6.6.4-r3 b/metadata/md5-cache/sys-process/acct-6.6.4-r3
index b4c65ae8b879..8196794aced0 100644
--- a/metadata/md5-cache/sys-process/acct-6.6.4-r3
+++ b/metadata/md5-cache/sys-process/acct-6.6.4-r3
@@ -3,9 +3,9 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=GNU system accounting utilities
 EAPI=7
 HOMEPAGE=https://savannah.gnu.org/projects/acct/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/acct/acct-6.6.4.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ef69ce7a5240fac3fe900b61e72276e1
+_md5_=342c4d3818a2bd7c67b787c8c9b846e6
diff --git a/metadata/md5-cache/sys-process/atop-2.6.0 b/metadata/md5-cache/sys-process/atop-2.6.0
index f7c7b236215b..da978be156f6 100644
--- a/metadata/md5-cache/sys-process/atop-2.6.0
+++ b/metadata/md5-cache/sys-process/atop-2.6.0
@@ -5,10 +5,10 @@ DESCRIPTION=Resource-specific view of processes
 EAPI=7
 HOMEPAGE=https://www.atoptool.nl/ https://github.com/Atoptool/atop
 IUSE=kernel_linux
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= >=sys-process/acct-6.6.4-r1
 SLOT=0
 SRC_URI=https://github.com/Atoptool/atop/archive/v2.6.0.tar.gz -> atop-2.6.0.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6a47567a11d679fbe607e82834c26bc4
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=588f73764d6d397d47f0494e43f159ad
diff --git a/metadata/md5-cache/sys-process/audit-3.0 b/metadata/md5-cache/sys-process/audit-3.0
index 4c20dbfabe55..cfa447a94b71 100644
--- a/metadata/md5-cache/sys-process/audit-3.0
+++ b/metadata/md5-cache/sys-process/audit-3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-3.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
 _md5_=bb0c7cecb338ef7c565244dca008ce41
diff --git a/metadata/md5-cache/sys-process/audit-3.0.1 b/metadata/md5-cache/sys-process/audit-3.0.1
index 704b99634d85..3728111cb095 100644
--- a/metadata/md5-cache/sys-process/audit-3.0.1
+++ b/metadata/md5-cache/sys-process/audit-3.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-3.0.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
 _md5_=520454c8163062a7ac0fd8b9cdf69fac
diff --git a/metadata/md5-cache/sys-process/audit-3.0.2 b/metadata/md5-cache/sys-process/audit-3.0.2
index 8bc15a5203cf..2f3eb32e8661 100644
--- a/metadata/md5-cache/sys-process/audit-3.0.2
+++ b/metadata/md5-cache/sys-process/audit-3.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://people.redhat.com/sgrubb/audit/audit-3.0.2.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156
 _md5_=f47f6c2a73a027c1152536fe7417e815
diff --git a/metadata/md5-cache/sys-process/bashtop-0.9.25 b/metadata/md5-cache/sys-process/bashtop-0.9.25
index ae884a333337..197e90ebe00e 100644
--- a/metadata/md5-cache/sys-process/bashtop-0.9.25
+++ b/metadata/md5-cache/sys-process/bashtop-0.9.25
@@ -2,9 +2,9 @@ DEFINED_PHASES=postinst prepare
 DESCRIPTION=Resource monitor that shows usage and stats
 EAPI=7
 HOMEPAGE=https://github.com/aristocratos/bashtop
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/aristocratos/bashtop/archive/v0.9.25.tar.gz -> bashtop-0.9.25.tar.gz
 _eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
-_md5_=4d074addf71c049c7b3fca8c0a4c67bf
+_md5_=53e5753bdb48d4fc17351c4f51e01ba8
diff --git a/metadata/md5-cache/sys-process/bottom-0.6.4 b/metadata/md5-cache/sys-process/bottom-0.6.4
index c058e01a4534..122f1218d334 100644
--- a/metadata/md5-cache/sys-process/bottom-0.6.4
+++ b/metadata/md5-cache/sys-process/bottom-0.6.4
@@ -4,9 +4,9 @@ DESCRIPTION=A graphical process/system monitor with a customizable interface
 EAPI=8
 HOMEPAGE=https://github.com/ClementTsang/bottom
 IUSE=+battery debug
-KEYWORDS=~amd64 ~arm64 ~ppc64
+KEYWORDS=amd64 arm64 ppc64
 LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 MIT MPL-2.0 Unlicense ZLIB
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/addr2line/0.15.1/download -> addr2line-0.15.1.crate https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.40/download -> anyhow-1.0.40.crate https://crates.io/api/v1/crates/assert_cmd/1.0.3/download -> assert_cmd-1.0.3.crate https://crates.io/api/v1/crates/async-channel/1.5.1/download -> async-channel-1.5.1.crate https://crates.io/api/v1/crates/async-executor/1.4.0/download -> async-executor-1.4.0.crate https://crates.io/api/v1/crates/async-fs/1.5.0/download -> async-fs-1.5.0.crate https://crates.io/api/v1/crates/async-io/1.3.1/download -> async-io-1.3.1.crate https://crates.io/api/v1/crates/async-lock/2.3.0/download -> async-lock-2.3.0.crate https://crates.io/api/v1/crates/async-net/1.5.0/download -> async-net-1.5.0.crate https://crates.io/api/v1/crates/async-process/1.0.1/download -> async-process-1.0.1.crate https://crates.io/api/v1/crates/async-task/4.0.3/download -> async-task-4.0.3.crate https://crates.io/api/v1/crates/atomic-waker/1.0.0/download -> atomic-waker-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.59/download -> backtrace-0.3.59.crate https://crates.io/api/v1/crates/battery/0.7.8/download -> battery-0.7.8.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blocking/1.0.2/download -> blocking-1.0.2.crate https://crates.io/api/v1/crates/bottom/0.6.4/download -> bottom-0.6.4.crate https://crates.io/api/v1/crates/bstr/0.2.15/download -> bstr-0.2.15.crate https://crates.io/api/v1/crates/byteorder/1.4.2/download -> byteorder-1.4.2.crate https://crates.io/api/v1/crates/cache-padded/1.1.1/download -> cache-padded-1.1.1.crate https://crates.io/api/v1/crates/cargo-husky/1.5.0/download -> cargo-husky-1.5.0.crate https://crates.io/api/v1/crates/cassowary/0.3.0/download -> cassowary-0.3.0.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/const_fn/0.4.4/download -> const_fn-0.4.4.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.0/download -> crossbeam-channel-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.1/download -> crossbeam-epoch-0.9.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.1/download -> crossbeam-utils-0.8.1.crate https://crates.io/api/v1/crates/crossterm/0.18.2/download -> crossterm-0.18.2.crate https://crates.io/api/v1/crates/crossterm_winapi/0.6.2/download -> crossterm_winapi-0.6.2.crate https://crates.io/api/v1/crates/ctrlc/3.1.9/download -> ctrlc-3.1.9.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/3.0.2/download -> dirs-3.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/event-listener/2.5.1/download -> event-listener-2.5.1.crate https://crates.io/api/v1/crates/fastrand/1.4.0/download -> fastrand-1.4.0.crate https://crates.io/api/v1/crates/fern/0.6.0/download -> fern-0.6.0.crate https://crates.io/api/v1/crates/flate2/1.0.20/download -> flate2-1.0.20.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/futures/0.3.14/download -> futures-0.3.14.crate https://crates.io/api/v1/crates/futures-channel/0.3.14/download -> futures-channel-0.3.14.crate https://crates.io/api/v1/crates/futures-core/0.3.14/download -> futures-core-0.3.14.crate https://crates.io/api/v1/crates/futures-executor/0.3.14/download -> futures-executor-0.3.14.crate https://crates.io/api/v1/crates/futures-io/0.3.14/download -> futures-io-0.3.14.crate https://crates.io/api/v1/crates/futures-lite/1.11.2/download -> futures-lite-1.11.2.crate https://crates.io/api/v1/crates/futures-macro/0.3.14/download -> futures-macro-0.3.14.crate https://crates.io/api/v1/crates/futures-sink/0.3.14/download -> futures-sink-0.3.14.crate https://crates.io/api/v1/crates/futures-task/0.3.14/download -> futures-task-0.3.14.crate https://crates.io/api/v1/crates/futures-timer/3.0.2/download -> futures-timer-3.0.2.crate https://crates.io/api/v1/crates/futures-util/0.3.14/download -> futures-util-0.3.14.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gimli/0.24.0/download -> gimli-0.24.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/heim/0.1.0-rc.1/download -> heim-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-common/0.1.0-rc.1/download -> heim-common-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-cpu/0.1.0-rc.1/download -> heim-cpu-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-disk/0.1.0-rc.1/download -> heim-disk-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-memory/0.1.0-rc.1/download -> heim-memory-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-net/0.1.0-rc.1/download -> heim-net-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-runtime/0.1.0-rc.1/download -> heim-runtime-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-sensors/0.1.0-rc.1/download -> heim-sensors-0.1.0-rc.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/indexmap/1.6.2/download -> indexmap-1.6.2.crate https://crates.io/api/v1/crates/instant/0.1.9/download -> instant-0.1.9.crate https://crates.io/api/v1/crates/itertools/0.10.0/download -> itertools-0.10.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.94/download -> libc-0.2.94.crate https://crates.io/api/v1/crates/lock_api/0.4.2/download -> lock_api-0.4.2.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/macaddr/1.0.1/download -> macaddr-1.0.1.crate https://crates.io/api/v1/crates/mach/0.3.2/download -> mach-0.3.2.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/memoffset/0.6.1/download -> memoffset-0.6.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/mio/0.7.6/download -> mio-0.7.6.crate https://crates.io/api/v1/crates/miow/0.3.6/download -> miow-0.3.6.crate https://crates.io/api/v1/crates/nb-connect/1.0.2/download -> nb-connect-1.0.2.crate https://crates.io/api/v1/crates/nix/0.19.1/download -> nix-0.19.1.crate https://crates.io/api/v1/crates/nix/0.20.0/download -> nix-0.20.0.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/object/0.24.0/download -> object-0.24.0.crate https://crates.io/api/v1/crates/once_cell/1.5.2/download -> once_cell-1.5.2.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.1/download -> parking_lot-0.11.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.1/download -> parking_lot_core-0.8.1.crate https://crates.io/api/v1/crates/pin-project-lite/0.1.11/download -> pin-project-lite-0.1.11.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.4/download -> pin-project-lite-0.2.4.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/polling/2.0.2/download -> polling-2.0.2.crate https://crates.io/api/v1/crates/predicates/1.0.8/download -> predicates-1.0.8.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro-nested/0.1.6/download -> proc-macro-nested-0.1.6.crate https://crates.io/api/v1/crates/proc-macro2/1.0.27/download -> proc-macro2-1.0.27.crate https://crates.io/api/v1/crates/procfs/0.10.1/download -> procfs-0.10.1.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rayon/1.5.0/download -> rayon-1.5.0.crate https://crates.io/api/v1/crates/rayon-core/1.9.0/download -> rayon-core-1.9.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.8/download -> redox_syscall-0.2.8.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.18/download -> rustc-demangle-0.1.18.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.125/download -> serde-1.0.125.crate https://crates.io/api/v1/crates/serde_derive/1.0.125/download -> serde_derive-1.0.125.crate https://crates.io/api/v1/crates/signal-hook/0.1.16/download -> signal-hook-0.1.16.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.2/download -> signal-hook-registry-1.2.2.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/smol/1.2.5/download -> smol-1.2.5.crate https://crates.io/api/v1/crates/socket2/0.3.17/download -> socket2-0.3.17.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.72/download -> syn-1.0.72.crate https://crates.io/api/v1/crates/sysinfo/0.18.2/download -> sysinfo-0.18.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.24/download -> thiserror-1.0.24.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.24/download -> thiserror-impl-1.0.24.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/tui/0.14.0/download -> tui-0.14.0.crate https://crates.io/api/v1/crates/typed-builder/0.9.0/download -> typed-builder-0.9.0.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/uom/0.30.0/download -> uom-0.30.0.crate https://crates.io/api/v1/crates/vec-arena/1.0.0/download -> vec-arena-1.0.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wepoll-sys/3.0.1/download -> wepoll-sys-3.0.1.crate https://crates.io/api/v1/crates/widestring/0.4.3/download -> widestring-0.4.3.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f78372a95b88f958460735a7e222398b
+_md5_=9a1f85a22b8f5d8b531daa45d0834256
diff --git a/metadata/md5-cache/sys-process/bpytop-1.0.67 b/metadata/md5-cache/sys-process/bpytop-1.0.67
index 1d33a7f5a5eb..16eae80bcfc7 100644
--- a/metadata/md5-cache/sys-process/bpytop-1.0.67
+++ b/metadata/md5-cache/sys-process/bpytop-1.0.67
@@ -4,7 +4,7 @@ DESCRIPTION=Linux/OSX/FreeBSD resource monitor
 EAPI=7
 HOMEPAGE=https://github.com/aristocratos/bpytop
 IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/psutil-5.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aristocratos/bpytop/archive/v1.0.67.tar.gz -> bpytop-1.0.67.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=940826024fb755f80e82ed0b23deb005
+_md5_=7c464af604e3f5f0fc8be25252e6fbe6
diff --git a/metadata/md5-cache/sys-process/criu-3.14-r2 b/metadata/md5-cache/sys-process/criu-3.14-r2
index 1596bafd5615..66421c5a872d 100644
--- a/metadata/md5-cache/sys-process/criu-3.14-r2
+++ b/metadata/md5-cache/sys-process/criu-3.14-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.openvz.org/criu/criu-3.14.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=453c08817ad3d828731e9c52f4f414be
diff --git a/metadata/md5-cache/sys-process/criu-3.15 b/metadata/md5-cache/sys-process/criu-3.15
index 6d417436151f..4a613ce046e8 100644
--- a/metadata/md5-cache/sys-process/criu-3.15
+++ b/metadata/md5-cache/sys-process/criu-3.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.openvz.org/criu/criu-3.15.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e7874e0428b5c93f8c3cfc423f64150c
diff --git a/metadata/md5-cache/sys-process/criu-3.15-r1 b/metadata/md5-cache/sys-process/criu-3.15-r1
index f86ce8578e78..9896be29c12c 100644
--- a/metadata/md5-cache/sys-process/criu-3.15-r1
+++ b/metadata/md5-cache/sys-process/criu-3.15-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.openvz.org/criu/criu-3.15.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=340cc83edabbdc7125bc1925aa35390f
diff --git a/metadata/md5-cache/sys-process/fcron-3.2.1-r7 b/metadata/md5-cache/sys-process/fcron-3.2.1-r7
new file mode 100644
index 000000000000..80a0f88c52dd
--- /dev/null
+++ b/metadata/md5-cache/sys-process/fcron-3.2.1-r7
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst prepare setup
+DEPEND=acct-group/fcron acct-user/fcron virtual/libcrypt:= audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux )
+DESCRIPTION=A command scheduler with extended capabilities over cron and anacron
+EAPI=7
+HOMEPAGE=http://fcron.free.fr/
+IUSE=audit debug pam selinux l10n_fr +mta +system-crontab readline
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/fcron acct-user/fcron virtual/libcrypt:= audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux ) app-misc/editor-wrapper mta? ( virtual/mta ) pam? ( sys-auth/pambase ) >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
+SLOT=0
+SRC_URI=http://fcron.free.fr/archives/fcron-3.2.1.src.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cron	be3d08eb2cdfb330f694bb07c6affc03	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6f425c7395825817881fde98040b6c14
diff --git a/metadata/md5-cache/sys-process/fcron-3.3.0_beta-r4 b/metadata/md5-cache/sys-process/fcron-3.3.0_beta-r4
new file mode 100644
index 000000000000..d6b8159558d8
--- /dev/null
+++ b/metadata/md5-cache/sys-process/fcron-3.3.0_beta-r4
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst prepare setup
+DEPEND=acct-group/fcron acct-user/fcron virtual/libcrypt:= audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux )
+DESCRIPTION=A command scheduler with extended capabilities over cron and anacron
+EAPI=7
+HOMEPAGE=http://fcron.free.fr/
+IUSE=audit debug pam selinux l10n_fr +mta +system-crontab readline
+KEYWORDS=~riscv
+LICENSE=GPL-2
+RDEPEND=acct-group/fcron acct-user/fcron virtual/libcrypt:= audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux ) app-misc/editor-wrapper mta? ( virtual/mta ) pam? ( sys-auth/pambase ) >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
+SLOT=0
+SRC_URI=http://fcron.free.fr/archives/fcron-3.3.0.src.tar.gz -> fcron-3.3.0_beta.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cron	be3d08eb2cdfb330f694bb07c6affc03	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user-info	2e75eaea3582b052ec16d9d5aa74ced3	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=698e8cd4d558d72476092d11c15cf720
diff --git a/metadata/md5-cache/sys-process/ftop-1.0-r1 b/metadata/md5-cache/sys-process/ftop-1.0-r1
index 9654f80bb4a5..17abea69b358 100644
--- a/metadata/md5-cache/sys-process/ftop-1.0-r1
+++ b/metadata/md5-cache/sys-process/ftop-1.0-r1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0= sys-devel/gnuconfig >=app-portage/elt-patches-2017081
 DESCRIPTION=Monitor open files and filesystems
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ~hppa ~x86
+KEYWORDS=amd64 ~hppa ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/ftop-1.0.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3791a950047ef22b4ae8b1068a3061bb
+_md5_=f60baf0567ab84010ef251b8e167b088
diff --git a/metadata/md5-cache/sys-process/glances-3.2.1 b/metadata/md5-cache/sys-process/glances-3.2.1
index acfb00271b8c..33ef32014ebb 100644
--- a/metadata/md5-cache/sys-process/glances-3.2.1
+++ b/metadata/md5-cache/sys-process/glances-3.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.2.1.tar.gz -> glances-3.2.1.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4a6f6e967f3d4ebccf98ae4fa45d0ccb
diff --git a/metadata/md5-cache/sys-process/glances-3.2.2 b/metadata/md5-cache/sys-process/glances-3.2.2
index 9fbe2d642156..46aa5b37af4b 100644
--- a/metadata/md5-cache/sys-process/glances-3.2.2
+++ b/metadata/md5-cache/sys-process/glances-3.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.2.2.tar.gz -> glances-3.2.2.tar.gz
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=0cba2d2c795575f874cdb8444820d26a
diff --git a/metadata/md5-cache/sys-process/htop-3.0.5-r1 b/metadata/md5-cache/sys-process/htop-3.0.5-r1
index bbf19cfbeb48..3c99bd2fc74e 100644
--- a/metadata/md5-cache/sys-process/htop-3.0.5-r1
+++ b/metadata/md5-cache/sys-process/htop-3.0.5-r1
@@ -10,5 +10,5 @@ LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses:=[unicode(+)?] hwloc? ( sys-apps/hwloc ) lm-sensors? ( sys-apps/lm-sensors )
 SLOT=0
 SRC_URI=https://github.com/htop-dev/htop/archive/3.0.5.tar.gz -> htop-3.0.5.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b6ebcfc5608f4b9827fdd9168ffc1831
diff --git a/metadata/md5-cache/sys-process/htop-3.1.0 b/metadata/md5-cache/sys-process/htop-3.1.0
index ea154b7348a1..115bd3d485a1 100644
--- a/metadata/md5-cache/sys-process/htop-3.1.0
+++ b/metadata/md5-cache/sys-process/htop-3.1.0
@@ -10,5 +10,5 @@ LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses:=[unicode(+)?] hwloc? ( sys-apps/hwloc ) kernel_linux? ( caps? ( sys-libs/libcap ) delayacct? ( dev-libs/libnl:3 ) lm-sensors? ( sys-apps/lm-sensors ) )
 SLOT=0
 SRC_URI=https://github.com/htop-dev/htop/archive/3.1.0.tar.gz -> htop-3.1.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=1fdc792b1b8548397c62eb99c24b5551
diff --git a/metadata/md5-cache/sys-process/htop-3.1.1 b/metadata/md5-cache/sys-process/htop-3.1.1
new file mode 100644
index 000000000000..610b7f28a597
--- /dev/null
+++ b/metadata/md5-cache/sys-process/htop-3.1.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst postrm prepare setup
+DEPEND=sys-libs/ncurses:=[unicode(+)?] hwloc? ( sys-apps/hwloc ) kernel_linux? ( caps? ( sys-libs/libcap ) delayacct? ( dev-libs/libnl:3 ) lm-sensors? ( sys-apps/lm-sensors ) ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 )
+DESCRIPTION=interactive process viewer
+EAPI=8
+HOMEPAGE=https://htop.dev/ https://github.com/htop-dev/htop
+IUSE=caps debug delayacct hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD GPL-2+
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] hwloc? ( sys-apps/hwloc ) kernel_linux? ( caps? ( sys-libs/libcap ) delayacct? ( dev-libs/libnl:3 ) lm-sensors? ( sys-apps/lm-sensors ) )
+SLOT=0
+SRC_URI=https://github.com/htop-dev/htop/archive/3.1.1.tar.gz -> htop-3.1.1.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=f8ee6ea991e49003f400c34f506304e4
diff --git a/metadata/md5-cache/sys-process/incron-0.5.12_p20191114-r1 b/metadata/md5-cache/sys-process/incron-0.5.12_p20191114-r1
index c3b4ffb13d08..d5b975086f40 100644
--- a/metadata/md5-cache/sys-process/incron-0.5.12_p20191114-r1
+++ b/metadata/md5-cache/sys-process/incron-0.5.12_p20191114-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm64 ppc ~riscv x86
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/ar-/incron/archive/1eedfbc9b318372efd119fd17f4abdbde561a53d.tar.gz -> incron-0.5.12_p20191114.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5028c484db16ae6ebcb5060c945dbeed
diff --git a/metadata/md5-cache/sys-process/iotop-0.6 b/metadata/md5-cache/sys-process/iotop-0.6
index d105a8a39560..c54b93c1fc2b 100644
--- a/metadata/md5-cache/sys-process/iotop-0.6
+++ b/metadata/md5-cache/sys-process/iotop-0.6
@@ -10,5 +10,5 @@ RDEPEND=!sys-process/iotop-c python_targets_python3_8? ( dev-lang/python:3.8[ncu
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=http://guichaz.free.fr/iotop/files/iotop-0.6.tar.bz2
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e7ab1a1941c7e7720afbdb65c64333d0
diff --git a/metadata/md5-cache/sys-process/iotop-c-1.18 b/metadata/md5-cache/sys-process/iotop-c-1.18
deleted file mode 100644
index a289eac93f93..000000000000
--- a/metadata/md5-cache/sys-process/iotop-c-1.18
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=sys-libs/ncurses:= !sys-process/iotop
-DESCRIPTION=top utility for IO (C port)
-EAPI=8
-HOMEPAGE=https://github.com/Tomas-M/iotop
-IUSE=+filecaps kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=sys-libs/ncurses:= !sys-process/iotop
-SLOT=0
-SRC_URI=https://github.com/Tomas-M/iotop/archive/v1.18.tar.gz -> iotop-c-1.18.tar.gz
-_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3838b57c16cd56d7b0c306cfda8154c1
diff --git a/metadata/md5-cache/sys-process/iotop-c-1.19 b/metadata/md5-cache/sys-process/iotop-c-1.19
index e80d5f50bbe4..45c27989650c 100644
--- a/metadata/md5-cache/sys-process/iotop-c-1.19
+++ b/metadata/md5-cache/sys-process/iotop-c-1.19
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=sys-libs/ncurses:= !sys-process/iotop
 SLOT=0
 SRC_URI=https://github.com/Tomas-M/iotop/archive/v1.19.tar.gz -> iotop-c-1.19.tar.gz
-_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=3838b57c16cd56d7b0c306cfda8154c1
diff --git a/metadata/md5-cache/sys-process/iotop-c-1.20 b/metadata/md5-cache/sys-process/iotop-c-1.20
index 5cb182d13bdd..7d1086c1f6ba 100644
--- a/metadata/md5-cache/sys-process/iotop-c-1.20
+++ b/metadata/md5-cache/sys-process/iotop-c-1.20
@@ -5,10 +5,10 @@ DESCRIPTION=top utility for IO (C port)
 EAPI=8
 HOMEPAGE=https://github.com/Tomas-M/iotop
 IUSE=+filecaps kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+
 RDEPEND=sys-libs/ncurses:= !sys-process/iotop
 SLOT=0
 SRC_URI=https://github.com/Tomas-M/iotop/archive/v1.20.tar.gz -> iotop-c-1.20.tar.gz
-_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3838b57c16cd56d7b0c306cfda8154c1
+_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1727089a9ca1c7e2fc0ff1cdc47a8aeb
diff --git a/metadata/md5-cache/sys-process/iotop-c-9999 b/metadata/md5-cache/sys-process/iotop-c-9999
index 397dc9220bc3..958414519f63 100644
--- a/metadata/md5-cache/sys-process/iotop-c-9999
+++ b/metadata/md5-cache/sys-process/iotop-c-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=sys-libs/ncurses:= !sys-process/iotop
 SLOT=0
-_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=836c3d1d624b4ce10629c3be6020d2fe
diff --git a/metadata/md5-cache/sys-process/latencytop-0.5-r1 b/metadata/md5-cache/sys-process/latencytop-0.5-r1
index df94fae106da..cdeff2ee4927 100644
--- a/metadata/md5-cache/sys-process/latencytop-0.5-r1
+++ b/metadata/md5-cache/sys-process/latencytop-0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gtk? ( x11-libs/gtk+:2 ) sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gentoo/latencytop-0.5.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=be3c2cd9ef4098d5f821c174e5eadce5
diff --git a/metadata/md5-cache/sys-process/numad-0.5-r3 b/metadata/md5-cache/sys-process/numad-0.5-r3
index f2df82c83157..a0fdb1e1ef4e 100644
--- a/metadata/md5-cache/sys-process/numad-0.5-r3
+++ b/metadata/md5-cache/sys-process/numad-0.5-r3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 -arm arm64 ~ppc64 ~s390 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://gentoo/numad-0.5-334278f.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=114e3112fd84991fabc37b0d48a1822c
diff --git a/metadata/md5-cache/sys-process/numad-9999 b/metadata/md5-cache/sys-process/numad-9999
index 226492936c97..932ae0ee6e46 100644
--- a/metadata/md5-cache/sys-process/numad-9999
+++ b/metadata/md5-cache/sys-process/numad-9999
@@ -7,5 +7,5 @@ IUSE=kernel_linux
 LICENSE=LGPL-2.1
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=36a528727db9da1ae87777aee028d67d
diff --git a/metadata/md5-cache/sys-process/rtirq-20180209 b/metadata/md5-cache/sys-process/rtirq-20180209
index 93c9d96ba287..e7618d11efda 100644
--- a/metadata/md5-cache/sys-process/rtirq-20180209
+++ b/metadata/md5-cache/sys-process/rtirq-20180209
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://www.rncbc.org/archive/old/rtirq-20180209.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=69db64712cd70cb0e9aec93e134c4b99
diff --git a/metadata/md5-cache/sys-process/rtirq-20191121 b/metadata/md5-cache/sys-process/rtirq-20191121
index 1d7d39f52e31..2936bcef75dd 100644
--- a/metadata/md5-cache/sys-process/rtirq-20191121
+++ b/metadata/md5-cache/sys-process/rtirq-20191121
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://www.rncbc.org/archive/rtirq-20191121.tar.gz https://www.rncbc.org/archive/old/rtirq-20191121.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=23b92dc96aff270463db13356dc1ab74
diff --git a/metadata/md5-cache/sys-process/tiptop-2.3.1_p4 b/metadata/md5-cache/sys-process/tiptop-2.3.1_p4
new file mode 100644
index 000000000000..e4f756b27e76
--- /dev/null
+++ b/metadata/md5-cache/sys-process/tiptop-2.3.1_p4
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=sys-libs/ncurses:= dev-libs/libxml2:2
+DESCRIPTION=top for performance counters
+EAPI=7
+HOMEPAGE=http://tiptop.gforge.inria.fr/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:= dev-libs/libxml2:2
+SLOT=0
+SRC_URI=http://tiptop.gforge.inria.fr/releases/tiptop-2.3.1.tar.gz http://deb.debian.org/debian/pool/main/t/tiptop/tiptop_2.3.1-4.debian.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=72f506f1f9b3a4253e246cbb2e0a78df
diff --git a/metadata/md5-cache/sys-process/uksmd-0_pre20200505 b/metadata/md5-cache/sys-process/uksmd-0_pre20200505
index 56af43dec163..7ab0c05d1232 100644
--- a/metadata/md5-cache/sys-process/uksmd-0_pre20200505
+++ b/metadata/md5-cache/sys-process/uksmd-0_pre20200505
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/libcap-ng sys-process/procps:=
 SLOT=0
 SRC_URI=https://gitlab.com/post-factum/uksmd/-/archive/b6af35cb9a772f643fd1bd703f4d1f6c6c6d3b79/uksmd-b6af35cb9a772f643fd1bd703f4d1f6c6c6d3b79.tar.bz2 -> uksmd-0_pre20200505.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=ddcef07fb81db9553ceadf4b7a8f3b60
diff --git a/metadata/md5-cache/sys-process/usbtop-1.0 b/metadata/md5-cache/sys-process/usbtop-1.0
index 87eefd8757dd..5006dc3335ff 100644
--- a/metadata/md5-cache/sys-process/usbtop-1.0
+++ b/metadata/md5-cache/sys-process/usbtop-1.0
@@ -5,10 +5,10 @@ DESCRIPTION=utility that shows an estimated instantaneous bandwidth on USB buses
 EAPI=7
 HOMEPAGE=https://github.com/aguinet/usbtop
 IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=net-libs/libpcap:=[usb] dev-libs/boost:=
 SLOT=0
 SRC_URI=https://github.com/aguinet/usbtop/archive/release-1.0.tar.gz -> usbtop-1.0.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=44e2ddae25651efdd2d00577196ee727
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bd482f64010b3edc51ab49c73fdae3a1
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 0e0dd9c5656e..ad6c59001e51 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.72 b/metadata/md5-cache/virtual/dist-kernel-5.10.72
new file mode 100644
index 000000000000..6044cbc88c40
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.72
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.72 ~sys-kernel/gentoo-kernel-bin-5.10.72 ~sys-kernel/vanilla-kernel-5.10.72 )
+SLOT=0/5.10.72
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.73 b/metadata/md5-cache/virtual/dist-kernel-5.10.73
new file mode 100644
index 000000000000..c8e5afe5e6d8
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.73
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.73 ~sys-kernel/gentoo-kernel-bin-5.10.73 ~sys-kernel/vanilla-kernel-5.10.73 )
+SLOT=0/5.10.73
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.74 b/metadata/md5-cache/virtual/dist-kernel-5.10.74
new file mode 100644
index 000000000000..905fd1090216
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.74
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.74 ~sys-kernel/gentoo-kernel-bin-5.10.74 ~sys-kernel/vanilla-kernel-5.10.74 )
+SLOT=0/5.10.74
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.14.11 b/metadata/md5-cache/virtual/dist-kernel-5.14.11
new file mode 100644
index 000000000000..4973031a45f0
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.14.11
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.14.11 ~sys-kernel/gentoo-kernel-bin-5.14.11 ~sys-kernel/vanilla-kernel-5.14.11 )
+SLOT=0/5.14.11
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.14.12 b/metadata/md5-cache/virtual/dist-kernel-5.14.12
new file mode 100644
index 000000000000..06d368c8aa2e
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.14.12
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.14.12 ~sys-kernel/gentoo-kernel-bin-5.14.12 ~sys-kernel/vanilla-kernel-5.14.12 )
+SLOT=0/5.14.12
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.14.13 b/metadata/md5-cache/virtual/dist-kernel-5.14.13
new file mode 100644
index 000000000000..9ea3c6fdee7f
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.14.13
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.14.13 ~sys-kernel/gentoo-kernel-bin-5.14.13 ~sys-kernel/vanilla-kernel-5.14.13 )
+SLOT=0/5.14.13
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.152 b/metadata/md5-cache/virtual/dist-kernel-5.4.152
new file mode 100644
index 000000000000..f1176a64ad3d
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.152
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.152 ~sys-kernel/gentoo-kernel-bin-5.4.152 ~sys-kernel/vanilla-kernel-5.4.152 )
+SLOT=0/5.4.152
+_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.153 b/metadata/md5-cache/virtual/dist-kernel-5.4.153
new file mode 100644
index 000000000000..5bed23729a17
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.153
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.153 ~sys-kernel/gentoo-kernel-bin-5.4.153 ~sys-kernel/vanilla-kernel-5.4.153 )
+SLOT=0/5.4.153
+_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.154 b/metadata/md5-cache/virtual/dist-kernel-5.4.154
new file mode 100644
index 000000000000..f1d95a40ba55
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.154
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.154 ~sys-kernel/gentoo-kernel-bin-5.4.154 ~sys-kernel/vanilla-kernel-5.4.154 )
+SLOT=0/5.4.154
+_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/jdk-17 b/metadata/md5-cache/virtual/jdk-17
new file mode 100644
index 000000000000..e088cc10a5e8
--- /dev/null
+++ b/metadata/md5-cache/virtual/jdk-17
@@ -0,0 +1,8 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Java Development Kit (JDK)
+EAPI=8
+IUSE=headless-awt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+RDEPEND=|| ( dev-java/openjdk-bin:17[gentoo-vm(+),headless-awt=] dev-java/openjdk:17[gentoo-vm(+),headless-awt=] )
+SLOT=17
+_md5_=bbaf911c990c9af915ea3e7ce82547b6
diff --git a/metadata/md5-cache/virtual/jre-17 b/metadata/md5-cache/virtual/jre-17
new file mode 100644
index 000000000000..a371f069b67d
--- /dev/null
+++ b/metadata/md5-cache/virtual/jre-17
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Java Runtime Environment (JRE)
+EAPI=8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+RDEPEND=|| ( virtual/jdk:17 dev-java/openjdk-jre-bin:17[gentoo-vm(+)] )
+SLOT=17
+_md5_=145a6d321700e45eb417917931645db5
diff --git a/metadata/md5-cache/virtual/mpi-2.0-r5 b/metadata/md5-cache/virtual/mpi-2.0-r5
index 21ab6a89b51e..fa677d7ae339 100644
--- a/metadata/md5-cache/virtual/mpi-2.0-r5
+++ b/metadata/md5-cache/virtual/mpi-2.0-r5
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Message Passing Interface (MPI) v2.0 implementation
 EAPI=7
 IUSE=cxx fortran romio threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=|| ( >=sys-cluster/openmpi-1.10.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx?,fortran?,romio?,threads(+)?] >=sys-cluster/mpich-3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx?,fortran?,romio?,threads?] sys-cluster/mpich2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx?,fortran?,romio?,threads?] sys-cluster/nullmpi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx(-)?,fortran(-)?,romio(-)?,threads(-)?] sys-cluster/native-mpi )
 SLOT=0
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b6381728eb198bbd3a387ec474e18176
+_md5_=1460b5f8057df758e52d5abd848d9de9
diff --git a/metadata/md5-cache/virtual/perl-Archive-Tar-2.360.0 b/metadata/md5-cache/virtual/perl-Archive-Tar-2.360.0
deleted file mode 100644
index a20c1c58bda8..000000000000
--- a/metadata/md5-cache/virtual/perl-Archive-Tar-2.360.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Archive-Tar
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Archive-Tar-2.360.0 ) dev-lang/perl:= !<perl-core/Archive-Tar-2.360.0 !>perl-core/Archive-Tar-2.360.0-r999
-SLOT=0
-_md5_=3a474ca01b19963c0c6d4f8dd7ac43ab
diff --git a/metadata/md5-cache/virtual/perl-CPAN-2.270.0 b/metadata/md5-cache/virtual/perl-CPAN-2.270.0
deleted file mode 100644
index e22683eb83b1..000000000000
--- a/metadata/md5-cache/virtual/perl-CPAN-2.270.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for CPAN
-EAPI=6
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/CPAN-2.270.0 ) dev-lang/perl:= !<perl-core/CPAN-2.270.0 !>perl-core/CPAN-2.270.0-r999
-SLOT=0
-_md5_=02d3478dd0062fcecf85e36305187128
diff --git a/metadata/md5-cache/virtual/perl-Carp-1.500.0-r3 b/metadata/md5-cache/virtual/perl-Carp-1.500.0-r3
deleted file mode 100644
index befe768b6f37..000000000000
--- a/metadata/md5-cache/virtual/perl-Carp-1.500.0-r3
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Carp
-EAPI=6
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/Carp-1.500.0 ) dev-lang/perl:= !<perl-core/Carp-1.500.0 !>perl-core/Carp-1.500.0-r999
-SLOT=0
-_md5_=cb89441146246fd1102caab98fd63dae
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.93.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.93.0
deleted file mode 100644
index 25202129880d..000000000000
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.93.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Compress-Raw-Bzip2
-EAPI=6
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Compress-Raw-Bzip2-2.93.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Bzip2-2.93.0 !>perl-core/Compress-Raw-Bzip2-2.93.0-r999
-SLOT=0
-_md5_=02d3478dd0062fcecf85e36305187128
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.93.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.93.0
deleted file mode 100644
index 48f007f2bf39..000000000000
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.93.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Compress-Raw-Zlib
-EAPI=6
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Compress-Raw-Zlib-2.93.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Zlib-2.93.0 !>perl-core/Compress-Raw-Zlib-2.93.0-r999
-SLOT=0
-_md5_=02d3478dd0062fcecf85e36305187128
diff --git a/metadata/md5-cache/virtual/perl-DB_File-1.853.0 b/metadata/md5-cache/virtual/perl-DB_File-1.853.0
deleted file mode 100644
index 234c73e39cf8..000000000000
--- a/metadata/md5-cache/virtual/perl-DB_File-1.853.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for DB_File
-EAPI=6
-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
-RDEPEND=|| ( =dev-lang/perl-5.32*[berkdb] ~perl-core/DB_File-1.853.0 ) dev-lang/perl:= !<perl-core/DB_File-1.853.0 !>perl-core/DB_File-1.853.0-r999
-SLOT=0
-_md5_=cdb54b3bdca6cba7f0fd4509e06b2057
diff --git a/metadata/md5-cache/virtual/perl-Data-Dumper-2.174.10_rc b/metadata/md5-cache/virtual/perl-Data-Dumper-2.174.10_rc
deleted file mode 100644
index 9cd98e9af148..000000000000
--- a/metadata/md5-cache/virtual/perl-Data-Dumper-2.174.10_rc
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Data-Dumper
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32.1* ~perl-core/Data-Dumper-2.174.10_rc ) dev-lang/perl:= !<perl-core/Data-Dumper-2.174.10_rc !>perl-core/Data-Dumper-2.174.10_rc-r999
-SLOT=0
-_md5_=32c161208494231b383f0a0a779c121a
diff --git a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.570.0 b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.570.0
deleted file mode 100644
index f6f5d4eab077..000000000000
--- a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.570.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Devel-PPPort
-EAPI=6
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Devel-PPPort-3.570.0 ) dev-lang/perl:= !<perl-core/Devel-PPPort-3.570.0 !>perl-core/Devel-PPPort-3.570.0-r999
-SLOT=0
-_md5_=02d3478dd0062fcecf85e36305187128
diff --git a/metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r10 b/metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r10
deleted file mode 100644
index 993521059bf2..000000000000
--- a/metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r10
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Digest
-EAPI=6
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/Digest-1.170.100_rc ) dev-lang/perl:= !<perl-core/Digest-1.170.100_rc !>perl-core/Digest-1.170.100_rc-r999
-SLOT=0
-_md5_=cb89441146246fd1102caab98fd63dae
diff --git a/metadata/md5-cache/virtual/perl-Digest-MD5-2.550.100_rc b/metadata/md5-cache/virtual/perl-Digest-MD5-2.550.100_rc
deleted file mode 100644
index 8b0bf4091b63..000000000000
--- a/metadata/md5-cache/virtual/perl-Digest-MD5-2.550.100_rc
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Digest-MD5
-EAPI=6
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Digest-MD5-2.550.100_rc ) dev-lang/perl:= !<perl-core/Digest-MD5-2.550.100_rc !>perl-core/Digest-MD5-2.550.100_rc-r999
-SLOT=0
-_md5_=02d3478dd0062fcecf85e36305187128
diff --git a/metadata/md5-cache/virtual/perl-Encode-3.60.0 b/metadata/md5-cache/virtual/perl-Encode-3.60.0
deleted file mode 100644
index 6a404f2cf3b6..000000000000
--- a/metadata/md5-cache/virtual/perl-Encode-3.60.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Encode
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Encode-3.60.0 ) dev-lang/perl:= !<perl-core/Encode-3.60.0 !>perl-core/Encode-3.60.0-r999
-SLOT=0
-_md5_=3a474ca01b19963c0c6d4f8dd7ac43ab
diff --git a/metadata/md5-cache/virtual/perl-Exporter-5.740.0 b/metadata/md5-cache/virtual/perl-Exporter-5.740.0
deleted file mode 100644
index f13ff860d6f5..000000000000
--- a/metadata/md5-cache/virtual/perl-Exporter-5.740.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Exporter
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Exporter-5.740.0 ) dev-lang/perl:= !<perl-core/Exporter-5.740.0 !>perl-core/Exporter-5.740.0-r999
-SLOT=0
-_md5_=3a474ca01b19963c0c6d4f8dd7ac43ab
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.234 b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.234
deleted file mode 100644
index 3496ebcb8a48..000000000000
--- a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.234
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for ExtUtils-CBuilder
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/ExtUtils-CBuilder-0.280.234 ) dev-lang/perl:= !<perl-core/ExtUtils-CBuilder-0.280.234 !>perl-core/ExtUtils-CBuilder-0.280.234-r999
-SLOT=0
-_md5_=3a474ca01b19963c0c6d4f8dd7ac43ab
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r3 b/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r3
deleted file mode 100644
index 12d4169d5af3..000000000000
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r3
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for ExtUtils-Install
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/ExtUtils-Install-2.140.0 ) dev-lang/perl:= !<perl-core/ExtUtils-Install-2.140.0 !>perl-core/ExtUtils-Install-2.140.0-r999
-SLOT=0
-_md5_=d21b18c0f038e1523008c9e007d5ee64
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.440.0 b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.440.0
deleted file mode 100644
index d7984220b1e0..000000000000
--- a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.440.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for ExtUtils-MakeMaker
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/ExtUtils-MakeMaker-7.440.0 ) dev-lang/perl:= !<perl-core/ExtUtils-MakeMaker-7.440.0 !>perl-core/ExtUtils-MakeMaker-7.440.0-r999
-SLOT=0
-_md5_=3a474ca01b19963c0c6d4f8dd7ac43ab
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.720.0-r1 b/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.720.0-r1
deleted file mode 100644
index a9737194e57a..000000000000
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.720.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for ExtUtils-Manifest
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/ExtUtils-Manifest-1.720.0 ) dev-lang/perl:= !<perl-core/ExtUtils-Manifest-1.720.0 !>perl-core/ExtUtils-Manifest-1.720.0-r999
-SLOT=0
-_md5_=1e0fa0a436c08d38e92cabc6bbb4621a
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.400.0-r1 b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.400.0-r1
deleted file mode 100644
index 3bd3029cda5d..000000000000
--- a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.400.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for ExtUtils-ParseXS
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/ExtUtils-ParseXS-3.400.0 ) dev-lang/perl:= !<perl-core/ExtUtils-ParseXS-3.400.0 !>perl-core/ExtUtils-ParseXS-3.400.0-r999
-SLOT=0
-_md5_=1e0fa0a436c08d38e92cabc6bbb4621a
diff --git a/metadata/md5-cache/virtual/perl-File-Path-2.160.0-r1 b/metadata/md5-cache/virtual/perl-File-Path-2.160.0-r1
deleted file mode 100644
index dd5eb98a21ba..000000000000
--- a/metadata/md5-cache/virtual/perl-File-Path-2.160.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for File-Path
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/File-Path-2.160.0 ) dev-lang/perl:= !<perl-core/File-Path-2.160.0 !>perl-core/File-Path-2.160.0-r999
-SLOT=0
-_md5_=1e0fa0a436c08d38e92cabc6bbb4621a
diff --git a/metadata/md5-cache/virtual/perl-File-Spec-3.780.0-r1 b/metadata/md5-cache/virtual/perl-File-Spec-3.780.0-r1
deleted file mode 100644
index 94d3ddbafd79..000000000000
--- a/metadata/md5-cache/virtual/perl-File-Spec-3.780.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for File-Spec
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/File-Spec-3.780.0 ) dev-lang/perl:= !<perl-core/File-Spec-3.780.0 !>perl-core/File-Spec-3.780.0-r999
-SLOT=0
-_md5_=1e0fa0a436c08d38e92cabc6bbb4621a
diff --git a/metadata/md5-cache/virtual/perl-File-Temp-0.230.900 b/metadata/md5-cache/virtual/perl-File-Temp-0.230.900
deleted file mode 100644
index 6358639cb056..000000000000
--- a/metadata/md5-cache/virtual/perl-File-Temp-0.230.900
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for File-Temp
-EAPI=6
-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
-RDEPEND=~perl-core/File-Temp-0.230.900 dev-lang/perl:=
-SLOT=0
-_md5_=22638720080c2766d10bdeb10b32eba6
diff --git a/metadata/md5-cache/virtual/perl-Getopt-Long-2.510.0 b/metadata/md5-cache/virtual/perl-Getopt-Long-2.510.0
deleted file mode 100644
index db3f328bf333..000000000000
--- a/metadata/md5-cache/virtual/perl-Getopt-Long-2.510.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Getopt-Long
-EAPI=6
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Getopt-Long-2.510.0 ) dev-lang/perl:= !<perl-core/Getopt-Long-2.510.0 !>perl-core/Getopt-Long-2.510.0-r999
-SLOT=0
-_md5_=02d3478dd0062fcecf85e36305187128
diff --git a/metadata/md5-cache/virtual/perl-I18N-LangTags-0.440.0 b/metadata/md5-cache/virtual/perl-I18N-LangTags-0.440.0
deleted file mode 100644
index f91bd08573f2..000000000000
--- a/metadata/md5-cache/virtual/perl-I18N-LangTags-0.440.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for I18N-LangTags
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/I18N-LangTags-0.440.0 ) dev-lang/perl:= !<perl-core/I18N-LangTags-0.440.0 !>perl-core/I18N-LangTags-0.440.0-r999
-SLOT=0
-_md5_=212a27b0b92a2e8442ece8b962bd1401
diff --git a/metadata/md5-cache/virtual/perl-IO-1.430.0 b/metadata/md5-cache/virtual/perl-IO-1.430.0
deleted file mode 100644
index a3e4ac4e8019..000000000000
--- a/metadata/md5-cache/virtual/perl-IO-1.430.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for IO
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/IO-1.430.0 ) dev-lang/perl:= !<perl-core/IO-1.430.0 !>perl-core/IO-1.430.0-r999
-SLOT=0
-_md5_=3a474ca01b19963c0c6d4f8dd7ac43ab
diff --git a/metadata/md5-cache/virtual/perl-IO-Compress-2.93.0 b/metadata/md5-cache/virtual/perl-IO-Compress-2.93.0
deleted file mode 100644
index 61b04aa35e4c..000000000000
--- a/metadata/md5-cache/virtual/perl-IO-Compress-2.93.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for IO-Compress
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/IO-Compress-2.93.0 ) dev-lang/perl:= !<perl-core/IO-Compress-2.93.0 !>perl-core/IO-Compress-2.93.0-r999 >=virtual/perl-Compress-Raw-Zlib-2.93.0 >=virtual/perl-Compress-Raw-Bzip2-2.93.0
-SLOT=0
-_md5_=4d79f939692576841386eb2e7b59bb35
diff --git a/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.390.0-r3 b/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.390.0-r3
deleted file mode 100644
index 1bdf84257a18..000000000000
--- a/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.390.0-r3
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for IO-Socket-IP
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/IO-Socket-IP-0.390.0 ) dev-lang/perl:= !<perl-core/IO-Socket-IP-0.390.0 !>perl-core/IO-Socket-IP-0.390.0-r999
-SLOT=0
-_md5_=1e0fa0a436c08d38e92cabc6bbb4621a
diff --git a/metadata/md5-cache/virtual/perl-IO-Zlib-1.100.0-r14 b/metadata/md5-cache/virtual/perl-IO-Zlib-1.100.0-r14
deleted file mode 100644
index 7d7b98575b38..000000000000
--- a/metadata/md5-cache/virtual/perl-IO-Zlib-1.100.0-r14
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for IO-Zlib
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/IO-Zlib-1.100.0 ) dev-lang/perl:= !<perl-core/IO-Zlib-1.100.0 !>perl-core/IO-Zlib-1.100.0-r999
-SLOT=0
-_md5_=1e0fa0a436c08d38e92cabc6bbb4621a
diff --git a/metadata/md5-cache/virtual/perl-JSON-PP-4.40.0 b/metadata/md5-cache/virtual/perl-JSON-PP-4.40.0
deleted file mode 100644
index 9bef04fbe7fa..000000000000
--- a/metadata/md5-cache/virtual/perl-JSON-PP-4.40.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for JSON-PP
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/JSON-PP-4.40.0 ) dev-lang/perl:= !<perl-core/JSON-PP-4.40.0 !>perl-core/JSON-PP-4.40.0-r999
-SLOT=0
-_md5_=3a474ca01b19963c0c6d4f8dd7ac43ab
diff --git a/metadata/md5-cache/virtual/perl-MIME-Base64-3.150.0-r7 b/metadata/md5-cache/virtual/perl-MIME-Base64-3.150.0-r7
deleted file mode 100644
index a3747e18c13c..000000000000
--- a/metadata/md5-cache/virtual/perl-MIME-Base64-3.150.0-r7
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for MIME-Base64
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/MIME-Base64-3.150.0 ) dev-lang/perl:= !<perl-core/MIME-Base64-3.150.0 !>perl-core/MIME-Base64-3.150.0-r999
-SLOT=0
-_md5_=1e0fa0a436c08d38e92cabc6bbb4621a
diff --git a/metadata/md5-cache/virtual/perl-Math-Complex-1.590.100-r4 b/metadata/md5-cache/virtual/perl-Math-Complex-1.590.100-r4
deleted file mode 100644
index 4ce533944a60..000000000000
--- a/metadata/md5-cache/virtual/perl-Math-Complex-1.590.100-r4
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Math-Complex
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/Math-Complex-1.590.100 ) dev-lang/perl:= !<perl-core/Math-Complex-1.590.100 !>perl-core/Math-Complex-1.590.100-r999
-SLOT=0
-_md5_=4a33286acd4697afa3135c557ad8c918
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.101.230 b/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.101.230
deleted file mode 100644
index 3920dfbec1fc..000000000000
--- a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.101.230
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Module-CoreList
-EAPI=6
-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
-RDEPEND=|| ( =dev-lang/perl-5.32.1* ~perl-core/Module-CoreList-5.202.101.230 ) dev-lang/perl:= !<perl-core/Module-CoreList-5.202.101.230 !>perl-core/Module-CoreList-5.202.101.230-r999
-SLOT=0
-_md5_=49232c7783d8e6353f335330105bae5d
diff --git a/metadata/md5-cache/virtual/perl-Module-Load-0.340.0-r1 b/metadata/md5-cache/virtual/perl-Module-Load-0.340.0-r1
deleted file mode 100644
index 9aba2fa1d2a9..000000000000
--- a/metadata/md5-cache/virtual/perl-Module-Load-0.340.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Module-Load
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/Module-Load-0.340.0 ) dev-lang/perl:= !<perl-core/Module-Load-0.340.0 !>perl-core/Module-Load-0.340.0-r999
-SLOT=0
-_md5_=1e0fa0a436c08d38e92cabc6bbb4621a
diff --git a/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.700.0 b/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.700.0
deleted file mode 100644
index 9622abd17b4b..000000000000
--- a/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.700.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Module-Load-Conditional
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Module-Load-Conditional-0.700.0 ) dev-lang/perl:= !<perl-core/Module-Load-Conditional-0.700.0 !>perl-core/Module-Load-Conditional-0.700.0-r999
-SLOT=0
-_md5_=3a474ca01b19963c0c6d4f8dd7ac43ab
diff --git a/metadata/md5-cache/virtual/perl-Net-Ping-2.720.0 b/metadata/md5-cache/virtual/perl-Net-Ping-2.720.0
deleted file mode 100644
index 242b4705a6d9..000000000000
--- a/metadata/md5-cache/virtual/perl-Net-Ping-2.720.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Net-Ping
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Net-Ping-2.720.0 ) dev-lang/perl:= !<perl-core/Net-Ping-2.720.0 !>perl-core/Net-Ping-2.720.0-r999
-SLOT=0
-_md5_=3a468d17ec10a0758c962e1c547280b4
diff --git a/metadata/md5-cache/virtual/perl-Pod-Simple-3.400.0 b/metadata/md5-cache/virtual/perl-Pod-Simple-3.400.0
deleted file mode 100644
index 9eee1357f435..000000000000
--- a/metadata/md5-cache/virtual/perl-Pod-Simple-3.400.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Pod-Simple
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Pod-Simple-3.400.0 ) dev-lang/perl:= !<perl-core/Pod-Simple-3.400.0 !>perl-core/Pod-Simple-3.400.0-r999
-SLOT=0
-_md5_=3a474ca01b19963c0c6d4f8dd7ac43ab
diff --git a/metadata/md5-cache/virtual/perl-Safe-2.410.100_rc b/metadata/md5-cache/virtual/perl-Safe-2.410.100_rc
deleted file mode 100644
index 185914047b44..000000000000
--- a/metadata/md5-cache/virtual/perl-Safe-2.410.100_rc
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Safe
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32.1* ~perl-core/Safe-2.410.100_rc ) dev-lang/perl:= !<perl-core/Safe-2.410.100_rc !>perl-core/Safe-2.410.100_rc-r999
-SLOT=0
-_md5_=32c161208494231b383f0a0a779c121a
diff --git a/metadata/md5-cache/virtual/perl-Socket-2.29.0 b/metadata/md5-cache/virtual/perl-Socket-2.29.0
deleted file mode 100644
index 07f3e3174553..000000000000
--- a/metadata/md5-cache/virtual/perl-Socket-2.29.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Socket
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Socket-2.29.0 ) dev-lang/perl:= !<perl-core/Socket-2.29.0 !>perl-core/Socket-2.29.0-r999
-SLOT=0
-_md5_=3a474ca01b19963c0c6d4f8dd7ac43ab
diff --git a/metadata/md5-cache/virtual/perl-Storable-3.210.0 b/metadata/md5-cache/virtual/perl-Storable-3.210.0
deleted file mode 100644
index bb0e4c28ca51..000000000000
--- a/metadata/md5-cache/virtual/perl-Storable-3.210.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Storable
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Storable-3.210.0 ) dev-lang/perl:= !<perl-core/Storable-3.210.0 !>perl-core/Storable-3.210.0-r999
-SLOT=0
-_md5_=3a474ca01b19963c0c6d4f8dd7ac43ab
diff --git a/metadata/md5-cache/virtual/perl-Test-Harness-3.420.0-r3 b/metadata/md5-cache/virtual/perl-Test-Harness-3.420.0-r3
deleted file mode 100644
index c952f339ae4f..000000000000
--- a/metadata/md5-cache/virtual/perl-Test-Harness-3.420.0-r3
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Test-Harness
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/Test-Harness-3.420.0 ) dev-lang/perl:= !<perl-core/Test-Harness-3.420.0 !>perl-core/Test-Harness-3.420.0-r999
-SLOT=0
-_md5_=1e0fa0a436c08d38e92cabc6bbb4621a
diff --git a/metadata/md5-cache/virtual/perl-Test-Simple-1.302.175 b/metadata/md5-cache/virtual/perl-Test-Simple-1.302.175
deleted file mode 100644
index 426c96d924da..000000000000
--- a/metadata/md5-cache/virtual/perl-Test-Simple-1.302.175
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Test-Simple
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Test-Simple-1.302.175 ) dev-lang/perl:= !<dev-perl/Test-Tester-0.114.0 !<dev-perl/Test-use-ok-0.160.0
-SLOT=0
-_md5_=72a20f78f082edf58ebbf50d52f065d3
diff --git a/metadata/md5-cache/virtual/perl-Text-Balanced-2.30.0-r7 b/metadata/md5-cache/virtual/perl-Text-Balanced-2.30.0-r7
deleted file mode 100644
index 45cb68454d21..000000000000
--- a/metadata/md5-cache/virtual/perl-Text-Balanced-2.30.0-r7
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Text-Balanced
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/Text-Balanced-2.30.0 ) dev-lang/perl:= !<perl-core/Text-Balanced-2.30.0 !>perl-core/Text-Balanced-2.30.0-r999
-SLOT=0
-_md5_=1e0fa0a436c08d38e92cabc6bbb4621a
diff --git a/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r12 b/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r12
deleted file mode 100644
index 39cd48aed25a..000000000000
--- a/metadata/md5-cache/virtual/perl-Tie-RefHash-1.390.0-r12
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Tie-RefHash
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/Tie-RefHash-1.390.0 ) dev-lang/perl:= !<perl-core/Tie-RefHash-1.390.0 !>perl-core/Tie-RefHash-1.390.0-r999
-SLOT=0
-_md5_=1e0fa0a436c08d38e92cabc6bbb4621a
diff --git a/metadata/md5-cache/virtual/perl-Time-HiRes-1.976.400 b/metadata/md5-cache/virtual/perl-Time-HiRes-1.976.400
deleted file mode 100644
index 2032d9d6b018..000000000000
--- a/metadata/md5-cache/virtual/perl-Time-HiRes-1.976.400
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Time-HiRes
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Time-HiRes-1.976.400 ) dev-lang/perl:= !<perl-core/Time-HiRes-1.976.400 !>perl-core/Time-HiRes-1.976.400-r999
-SLOT=0
-_md5_=3a474ca01b19963c0c6d4f8dd7ac43ab
diff --git a/metadata/md5-cache/virtual/perl-Time-Local-1.280.0-r1 b/metadata/md5-cache/virtual/perl-Time-Local-1.280.0-r1
deleted file mode 100644
index 66aef390ed03..000000000000
--- a/metadata/md5-cache/virtual/perl-Time-Local-1.280.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Time-Local
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/Time-Local-1.280.0 ) dev-lang/perl:= !<perl-core/Time-Local-1.280.0 !>perl-core/Time-Local-1.280.0-r999
-SLOT=0
-_md5_=1e0fa0a436c08d38e92cabc6bbb4621a
diff --git a/metadata/md5-cache/virtual/perl-Unicode-Collate-1.270.0-r1 b/metadata/md5-cache/virtual/perl-Unicode-Collate-1.270.0-r1
deleted file mode 100644
index 159b74513813..000000000000
--- a/metadata/md5-cache/virtual/perl-Unicode-Collate-1.270.0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Unicode-Collate
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/Unicode-Collate-1.270.0 ) dev-lang/perl:= !<perl-core/Unicode-Collate-1.270.0 !>perl-core/Unicode-Collate-1.270.0-r999
-SLOT=0
-_md5_=1e0fa0a436c08d38e92cabc6bbb4621a
diff --git a/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.270.0 b/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.270.0
deleted file mode 100644
index 028dfdda9346..000000000000
--- a/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.270.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Unicode-Normalize
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Unicode-Normalize-1.270.0 ) dev-lang/perl:= !<perl-core/Unicode-Normalize-1.270.0 !>perl-core/Unicode-Normalize-1.270.0-r999
-SLOT=0
-_md5_=3a474ca01b19963c0c6d4f8dd7ac43ab
diff --git a/metadata/md5-cache/virtual/perl-autodie-2.320.0 b/metadata/md5-cache/virtual/perl-autodie-2.320.0
deleted file mode 100644
index ea564cc618fd..000000000000
--- a/metadata/md5-cache/virtual/perl-autodie-2.320.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for autodie
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/autodie-2.320.0 ) dev-lang/perl:= !<perl-core/autodie-2.320.0 !>perl-core/autodie-2.320.0-r999
-SLOT=0
-_md5_=3a474ca01b19963c0c6d4f8dd7ac43ab
diff --git a/metadata/md5-cache/virtual/perl-if-0.60.800-r3 b/metadata/md5-cache/virtual/perl-if-0.60.800-r3
deleted file mode 100644
index d04ac3d859a4..000000000000
--- a/metadata/md5-cache/virtual/perl-if-0.60.800-r3
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for if
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/if-0.60.800 ) dev-lang/perl:= !<perl-core/if-0.60.800 !>perl-core/if-0.60.800-r999
-SLOT=0
-_md5_=1e0fa0a436c08d38e92cabc6bbb4621a
diff --git a/metadata/md5-cache/virtual/perl-libnet-3.110.0-r4 b/metadata/md5-cache/virtual/perl-libnet-3.110.0-r4
deleted file mode 100644
index bdf7226db4aa..000000000000
--- a/metadata/md5-cache/virtual/perl-libnet-3.110.0-r4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for libnet
-EAPI=7
-IUSE=+ssl
-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
-PDEPEND=ssl? ( >=dev-perl/IO-Socket-SSL-2.7.0 )
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/libnet-3.110.0 ) dev-lang/perl:= !<perl-core/libnet-3.110.0 !>perl-core/libnet-3.110.0-r999
-SLOT=0
-_md5_=9523dc09c757449b7728205cfdb6e6d0
diff --git a/metadata/md5-cache/virtual/perl-threads-2.250.0 b/metadata/md5-cache/virtual/perl-threads-2.250.0
deleted file mode 100644
index 5f29b9600d85..000000000000
--- a/metadata/md5-cache/virtual/perl-threads-2.250.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for threads
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32*[ithreads] ~perl-core/threads-2.250.0 ) dev-lang/perl:= !<perl-core/threads-2.250.0 !>perl-core/threads-2.250.0-r999
-SLOT=0
-_md5_=1ba90d0ace244f8b8b91eedf932ec668
diff --git a/metadata/md5-cache/virtual/perl-threads-shared-1.610.0 b/metadata/md5-cache/virtual/perl-threads-shared-1.610.0
deleted file mode 100644
index 75f379569bc4..000000000000
--- a/metadata/md5-cache/virtual/perl-threads-shared-1.610.0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for threads-shared
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/threads-shared-1.610.0 ) dev-lang/perl:= !<perl-core/threads-shared-1.610.0 !>perl-core/threads-shared-1.610.0-r999
-SLOT=0
-_md5_=3a474ca01b19963c0c6d4f8dd7ac43ab
diff --git a/metadata/md5-cache/virtual/perl-version-0.992.400-r1 b/metadata/md5-cache/virtual/perl-version-0.992.400-r1
deleted file mode 100644
index a861f5a0b83a..000000000000
--- a/metadata/md5-cache/virtual/perl-version-0.992.400-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for version
-EAPI=7
-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
-RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/version-0.992.400 ) dev-lang/perl:= !<perl-core/version-0.992.400 !>perl-core/version-0.992.400-r999
-SLOT=0
-_md5_=1e0fa0a436c08d38e92cabc6bbb4621a
diff --git a/metadata/md5-cache/virtual/rubygems-16 b/metadata/md5-cache/virtual/rubygems-16
index f5817a7510d8..b29118012a3c 100644
--- a/metadata/md5-cache/virtual/rubygems-16
+++ b/metadata/md5-cache/virtual/rubygems-16
@@ -4,9 +4,9 @@ DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lan
 DESCRIPTION=Virtual ebuild for rubygems
 EAPI=7
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/rubygems-3.0.1[ruby_targets_ruby26] ) ruby_targets_ruby27? ( >=dev-ruby/rubygems-3.1.0[ruby_targets_ruby27] ) ruby_targets_ruby30? ( >=dev-ruby/rubygems-3.2.0[ruby_targets_ruby30] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=19a5a5f242f5b683054fcf36dff1aa23
+_md5_=cbccecf739c7f0fcba407902b0a80b3f
diff --git a/metadata/md5-cache/virtual/skkserv-0 b/metadata/md5-cache/virtual/skkserv-0
deleted file mode 100644
index 78d9da552f1c..000000000000
--- a/metadata/md5-cache/virtual/skkserv-0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for SKK server
-EAPI=7
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-RDEPEND=|| ( app-i18n/skkserv app-i18n/dbskkd-cdb app-i18n/mecab-skkserv app-i18n/multiskkserv app-i18n/yaskkserv )
-SLOT=0
-_md5_=89ac26eea413752b686f64ae3e8a4c54
diff --git a/metadata/md5-cache/virtual/skkserv-0-r1 b/metadata/md5-cache/virtual/skkserv-0-r1
new file mode 100644
index 000000000000..094218c6f5ec
--- /dev/null
+++ b/metadata/md5-cache/virtual/skkserv-0-r1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for SKK server
+EAPI=7
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+RDEPEND=|| ( app-i18n/skkserv app-i18n/dbskkd-cdb app-i18n/mecab-skkserv app-i18n/multiskkserv app-i18n/yaskkserv app-i18n/yaskkserv2 )
+SLOT=0
+_md5_=59c8734e885f71d27f804830efa9cf78
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index f09cf2a20cdf..ba6f99f1538a 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_jk-1.2.48 b/metadata/md5-cache/www-apache/mod_jk-1.2.48
index 8f5742f214e1..1becc1997bef 100644
--- a/metadata/md5-cache/www-apache/mod_jk-1.2.48
+++ b/metadata/md5-cache/www-apache/mod_jk-1.2.48
@@ -1,13 +1,13 @@
-BDEPEND=dev-lang/perl
+BDEPEND=dev-lang/perl sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=dev-libs/apr:1= =www-servers/apache-2*
 DESCRIPTION=Provides an AJP Apache2-JK-connector for the Tomcat servlet engine
 EAPI=7
 HOMEPAGE=https://tomcat.apache.org/connectors-doc/
-KEYWORDS=amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= =www-servers/apache-2*
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.48-src.tar.gz
-_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	depend.apache	d54e0d0bd6b36c476594edc2cee2e332
-_md5_=de07110eec97eedbdc0a1a2e561bc059
+_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	autotools	c9df06c186913b43eb211100ef5fe2cf	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=63f3d7eab128763b387054c8f3d0e1c0
diff --git a/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1 b/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
index 00c0ba24a3f7..4171d44a419d 100644
--- a/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
+++ b/metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=sys-libs/libcap >=www-servers/apache-2.4.7[-threads] =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=http://mpm-itk.sesse.net/mpm-itk-2.4.7-04.tar.gz
-_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e2302fb4dc670544053645a47efc57a2
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 910777e75382..1ea668fe3011 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-94.0.4606.61 b/metadata/md5-cache/www-apps/chromedriver-bin-94.0.4606.61
deleted file mode 100644
index 8068e6b3e507..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-94.0.4606.61
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=7
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/94.0.4606.61/chromedriver_linux64.zip -> chromedriver-bin-94.0.4606.61.linux64.zip )
-_md5_=4cb81edcf5c8b86f5b8175bc58c4fb97
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-95.0.4638.17 b/metadata/md5-cache/www-apps/chromedriver-bin-95.0.4638.17
new file mode 100644
index 000000000000..216f2f3a07ae
--- /dev/null
+++ b/metadata/md5-cache/www-apps/chromedriver-bin-95.0.4638.17
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=WebDriver for Chrome
+EAPI=7
+HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
+KEYWORDS=~amd64
+LICENSE=google-chrome
+RDEPEND=!www-client/chromium www-client/google-chrome
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/95.0.4638.17/chromedriver_linux64.zip -> chromedriver-bin-95.0.4638.17.linux64.zip )
+_md5_=4cb81edcf5c8b86f5b8175bc58c4fb97
diff --git a/metadata/md5-cache/www-apps/element-1.9.2 b/metadata/md5-cache/www-apps/element-1.9.2
new file mode 100644
index 000000000000..cb3fa03beaea
--- /dev/null
+++ b/metadata/md5-cache/www-apps/element-1.9.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A glossy Matrix collaboration client for the web
+EAPI=7
+HOMEPAGE=https://element.io/
+IUSE=vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-admin/webapp-config-1.50.15
+SLOT=1.9.2
+SRC_URI=https://github.com/vector-im/element-web/releases/download/v1.9.2/element-v1.9.2.tar.gz
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=162eb12efcdb368044c72d136d0c95ba
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.8.3 b/metadata/md5-cache/www-apps/icingaweb2-2.8.3
deleted file mode 100644
index c40ae0bd1851..000000000000
--- a/metadata/md5-cache/www-apps/icingaweb2-2.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config install postinst setup
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
-DESCRIPTION=Icinga Web 2 - Frontend for icinga2
-EAPI=7
-HOMEPAGE=http://www.icinga.org/
-IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
-SLOT=0
-SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.8.3 -> icingaweb2-2.8.3.tar.gz
-_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=13839dddca773149da6aa4e4c3c121c8
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.8.4 b/metadata/md5-cache/www-apps/icingaweb2-2.8.4
deleted file mode 100644
index e976c9c5e682..000000000000
--- a/metadata/md5-cache/www-apps/icingaweb2-2.8.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config install postinst setup
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
-DESCRIPTION=Icinga Web 2 - Frontend for icinga2
-EAPI=7
-HOMEPAGE=http://www.icinga.org/
-IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
-SLOT=0
-SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.8.4 -> icingaweb2-2.8.4.tar.gz
-_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3d74192f386d2a874e3ef602a3797a14
diff --git a/metadata/md5-cache/www-apps/jekyll-4.1.1 b/metadata/md5-cache/www-apps/jekyll-4.1.1
index 083b8c430616..6cab549eb0a9 100644
--- a/metadata/md5-cache/www-apps/jekyll-4.1.1
+++ b/metadata/md5-cache/www-apps/jekyll-4.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll/archive/v4.1.1.tar.gz -> jekyll-4.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=81bdfb689d8ace8db9770399f0d6ca04
diff --git a/metadata/md5-cache/www-apps/jekyll-4.2.0 b/metadata/md5-cache/www-apps/jekyll-4.2.0
index 76fc7486395a..708510e6a59e 100644
--- a/metadata/md5-cache/www-apps/jekyll-4.2.0
+++ b/metadata/md5-cache/www-apps/jekyll-4.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll/archive/v4.2.0.tar.gz -> jekyll-4.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=cae9f7dca05c3fbc2f411a2ae832237b
diff --git a/metadata/md5-cache/www-apps/jekyll-4.2.0-r1 b/metadata/md5-cache/www-apps/jekyll-4.2.0-r1
index 08bc670d3dbf..0081973f467a 100644
--- a/metadata/md5-cache/www-apps/jekyll-4.2.0-r1
+++ b/metadata/md5-cache/www-apps/jekyll-4.2.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll/archive/v4.2.0.tar.gz -> jekyll-4.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7867c592d59f625ac40606a95b76f6a6
diff --git a/metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0 b/metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0
index b91916f88d52..70e3bb2c6c01 100644
--- a/metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0
+++ b/metadata/md5-cache/www-apps/jekyll-coffeescript-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-coffeescript/archive/v2.0.0.tar.gz -> jekyll-coffeescript-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=1066b81d4ba870485bd9d5ee1f9c7c3b
diff --git a/metadata/md5-cache/www-apps/jekyll-sass-converter-2.1.0 b/metadata/md5-cache/www-apps/jekyll-sass-converter-2.1.0
index 12dd2e663eed..126cd14c6cc5 100644
--- a/metadata/md5-cache/www-apps/jekyll-sass-converter-2.1.0
+++ b/metadata/md5-cache/www-apps/jekyll-sass-converter-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-sass-converter/archive/v2.1.0.tar.gz -> jekyll-sass-converter-2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4e977c737dc7f1f5c94c91a333b5d7a3
diff --git a/metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0 b/metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0
index 333a87b1802f..0f7475b2c9fb 100644
--- a/metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0
+++ b/metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-sitemap/archive/v1.4.0.tar.gz -> jekyll-sitemap-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=83975df9f34ff2c2766810daf81781b7
diff --git a/metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1 b/metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1
index a2fb569c590c..5ace322e014a 100644
--- a/metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1
+++ b/metadata/md5-cache/www-apps/jekyll-watch-2.2.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-watch/archive/v2.2.1.tar.gz -> jekyll-watch-2.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=faa3481cc57531afe75f91288c8b5f9b
diff --git a/metadata/md5-cache/www-apps/nanoc-4.11.12 b/metadata/md5-cache/www-apps/nanoc-4.11.12
index 41b60d2576a2..9254cc63d415 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.11.12
+++ b/metadata/md5-cache/www-apps/nanoc-4.11.12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.11.12.tar.gz -> nanoc-4.11.12.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=00b115d4e9692e1db9a75091e947596e
diff --git a/metadata/md5-cache/www-apps/nanoc-4.12.2 b/metadata/md5-cache/www-apps/nanoc-4.12.2
index 7fe62b7910c6..892efec66f82 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.12.2
+++ b/metadata/md5-cache/www-apps/nanoc-4.12.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.2.tar.gz -> nanoc-4.12.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=dedad9787f298166afdde6668e19f045
diff --git a/metadata/md5-cache/www-apps/nanoc-checking-1.0.1 b/metadata/md5-cache/www-apps/nanoc-checking-1.0.1
index 267906445761..b77d91721aca 100644
--- a/metadata/md5-cache/www-apps/nanoc-checking-1.0.1
+++ b/metadata/md5-cache/www-apps/nanoc-checking-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/nanoc-checking-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4010153055d73d94bfa4b902f8c6faa4
diff --git a/metadata/md5-cache/www-apps/nanoc-cli-4.12.2 b/metadata/md5-cache/www-apps/nanoc-cli-4.12.2
index a625ba9bc0a7..5fa2603cf6a0 100644
--- a/metadata/md5-cache/www-apps/nanoc-cli-4.12.2
+++ b/metadata/md5-cache/www-apps/nanoc-cli-4.12.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.2.tar.gz -> nanoc-4.12.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7a971ab8c8ab2e0f6b1fa676f3422f5b
diff --git a/metadata/md5-cache/www-apps/nanoc-core-4.11.12 b/metadata/md5-cache/www-apps/nanoc-core-4.11.12
index cfd5a6f857dc..8a10656eff00 100644
--- a/metadata/md5-cache/www-apps/nanoc-core-4.11.12
+++ b/metadata/md5-cache/www-apps/nanoc-core-4.11.12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.11.12.tar.gz -> nanoc-core-4.11.12.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=fa47af58425809a1d7096da0b01506aa
diff --git a/metadata/md5-cache/www-apps/nanoc-core-4.12.2 b/metadata/md5-cache/www-apps/nanoc-core-4.12.2
index 6a57f34a9831..0dda4b32a267 100644
--- a/metadata/md5-cache/www-apps/nanoc-core-4.12.2
+++ b/metadata/md5-cache/www-apps/nanoc-core-4.12.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.2.tar.gz -> nanoc-core-4.12.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=d2279824a1c7c62af1df1192c60d5e37
diff --git a/metadata/md5-cache/www-apps/nanoc-deploying-1.0.1 b/metadata/md5-cache/www-apps/nanoc-deploying-1.0.1
index d4b416a3e564..e8150739e2c0 100644
--- a/metadata/md5-cache/www-apps/nanoc-deploying-1.0.1
+++ b/metadata/md5-cache/www-apps/nanoc-deploying-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/nanoc-deploying-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4adf53e07aa0d4b42cf72a367e2f15ee
diff --git a/metadata/md5-cache/www-apps/nanoc-spec-0.0.2 b/metadata/md5-cache/www-apps/nanoc-spec-0.0.2
index 2f9c9a3b7986..12b2f83c4029 100644
--- a/metadata/md5-cache/www-apps/nanoc-spec-0.0.2
+++ b/metadata/md5-cache/www-apps/nanoc-spec-0.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nanoc-spec-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=2ae54e6953c801a8f01f4e0e36e987b4
diff --git a/metadata/md5-cache/www-apps/phpBB-3.3.4 b/metadata/md5-cache/www-apps/phpBB-3.3.4
deleted file mode 100644
index bc6e9cd1e6c3..000000000000
--- a/metadata/md5-cache/www-apps/phpBB-3.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=An open-source PHP-based bulletin board package
-EAPI=7
-HOMEPAGE=https://www.phpbb.com/
-IUSE=ftp gd mssql mysqli postgres sqlite zlib vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=|| ( ( virtual/httpd-php:8.0 dev-lang/php:8.0[ftp?,gd?,json(+),mssql?,mysqli?,postgres?,sqlite?,xml,zlib?] ) ( virtual/httpd-php:7.4 dev-lang/php:7.4[ftp?,gd?,json(+),mssql?,mysqli?,postgres?,sqlite?,xml,zlib?] ) ( virtual/httpd-php:7.3 dev-lang/php:7.3[ftp?,gd?,json(+),mssql?,mysqli?,postgres?,sqlite?,xml,zlib?] ) ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mssql mysqli postgres sqlite )
-SLOT=3.3.4
-SRC_URI=https://download.phpbb.com/pub/release/3.3/3.3.4/phpBB-3.3.4.tar.bz2
-_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
-_md5_=5c2731e1473e7d2403f793c684b0f86f
diff --git a/metadata/md5-cache/www-apps/phpBB-3.3.5 b/metadata/md5-cache/www-apps/phpBB-3.3.5
new file mode 100644
index 000000000000..4b368eac25fd
--- /dev/null
+++ b/metadata/md5-cache/www-apps/phpBB-3.3.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=An open-source PHP-based bulletin board package
+EAPI=7
+HOMEPAGE=https://www.phpbb.com/
+IUSE=ftp gd mssql mysqli postgres sqlite zlib vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=|| ( ( virtual/httpd-php:8.0 dev-lang/php:8.0[ftp?,gd?,json(+),mssql?,mysqli?,postgres?,sqlite?,xml,zlib?] ) ( virtual/httpd-php:7.4 dev-lang/php:7.4[ftp?,gd?,json(+),mssql?,mysqli?,postgres?,sqlite?,xml,zlib?] ) ( virtual/httpd-php:7.3 dev-lang/php:7.3[ftp?,gd?,json(+),mssql?,mysqli?,postgres?,sqlite?,xml,zlib?] ) ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mssql mysqli postgres sqlite )
+SLOT=3.3.5
+SRC_URI=https://download.phpbb.com/pub/release/3.3/3.3.5/phpBB-3.3.5.tar.bz2
+_eclasses_=webapp	cd327e73cdb307ceb80dcca6b8ad8b52
+_md5_=5c2731e1473e7d2403f793c684b0f86f
diff --git a/metadata/md5-cache/www-apps/redmine-4.1.4 b/metadata/md5-cache/www-apps/redmine-4.1.4
deleted file mode 100644
index 88c64e20af50..000000000000
--- a/metadata/md5-cache/www-apps/redmine-4.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby26(-)] ) imagemagick? ( dev-ruby/mini_magick[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-net-ldap[ruby_targets_ruby26(-)] ) markdown? ( >=dev-ruby/redcarpet-3.5.1[ruby_targets_ruby26(-)] ) mysql? ( >=dev-ruby/mysql2-0.5.0:0.5[ruby_targets_ruby26(-)] ) passenger? ( www-apache/passenger[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-1.1.4:1[ruby_targets_ruby26(-)] ) sqlite? ( >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby26(-)] ) dev-ruby/actionpack-xml_parser:2[ruby_targets_ruby26(-)] dev-ruby/csv:3[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.6.0:1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1[ruby_targets_ruby26(-)] dev-ruby/marcel[ruby_targets_ruby26(-)] dev-ruby/mimemagic[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-1.0.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.11.1[ruby_targets_ruby26(-)] dev-ruby/rails:5.2[ruby_targets_ruby26(-)] >=dev-ruby/rbpdf-1.20.0[ruby_targets_ruby26(-)] dev-ruby/request_store:0[ruby_targets_ruby26(-)] >=dev-ruby/roadie-rails-2.1.0[ruby_targets_ruby26(-)] >=dev-ruby/rouge-3.12.0[ruby_targets_ruby26(-)] >=dev-ruby/ruby-openid-2.9.2[ruby_targets_ruby26(-)] dev-ruby/rack-openid[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
-EAPI=7
-HOMEPAGE=https://www.redmine.org/
-IUSE=imagemagick fastcgi ldap markdown mysql passenger postgres sqlite ruby_targets_ruby26
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=acct-group/redmine acct-user/redmine ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
-SLOT=0
-SRC_URI=https://www.redmine.org/releases/redmine-4.1.4.tar.gz
-_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ae135468e865595c97590eaabdc31b63
diff --git a/metadata/md5-cache/www-apps/redmine-4.1.5 b/metadata/md5-cache/www-apps/redmine-4.1.5
new file mode 100644
index 000000000000..721363a9bcf3
--- /dev/null
+++ b/metadata/md5-cache/www-apps/redmine-4.1.5
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby26? ( fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby26(-)] ) imagemagick? ( dev-ruby/mini_magick[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-net-ldap[ruby_targets_ruby26(-)] ) markdown? ( >=dev-ruby/redcarpet-3.5.1[ruby_targets_ruby26(-)] ) mysql? ( >=dev-ruby/mysql2-0.5.0:0.5[ruby_targets_ruby26(-)] ) passenger? ( www-apache/passenger[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-1.1.4:1[ruby_targets_ruby26(-)] ) sqlite? ( >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby26(-)] ) dev-ruby/actionpack-xml_parser:2[ruby_targets_ruby26(-)] dev-ruby/csv:3[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.6.0:1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1[ruby_targets_ruby26(-)] dev-ruby/marcel[ruby_targets_ruby26(-)] dev-ruby/mimemagic[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-1.0.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.11.1[ruby_targets_ruby26(-)] dev-ruby/rails:5.2[ruby_targets_ruby26(-)] >=dev-ruby/rbpdf-1.20.0[ruby_targets_ruby26(-)] dev-ruby/request_store:0[ruby_targets_ruby26(-)] >=dev-ruby/roadie-rails-2.1.0[ruby_targets_ruby26(-)] >=dev-ruby/rouge-3.12.0[ruby_targets_ruby26(-)] >=dev-ruby/ruby-openid-2.9.2[ruby_targets_ruby26(-)] dev-ruby/rack-openid[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
+EAPI=7
+HOMEPAGE=https://www.redmine.org/
+IUSE=imagemagick fastcgi ldap markdown mysql passenger postgres sqlite ruby_targets_ruby26
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=acct-group/redmine acct-user/redmine ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=|| ( ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://www.redmine.org/releases/redmine-4.1.5.tar.gz
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=ae135468e865595c97590eaabdc31b63
diff --git a/metadata/md5-cache/www-apps/redmine-4.2.2 b/metadata/md5-cache/www-apps/redmine-4.2.2
deleted file mode 100644
index 673b3a11268b..000000000000
--- a/metadata/md5-cache/www-apps/redmine-4.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-net-ldap[ruby_targets_ruby26(-)] ) minimagick? ( dev-ruby/mini_magick[ruby_targets_ruby26(-)] ) markdown? ( >=dev-ruby/redcarpet-3.5.1[ruby_targets_ruby26(-)] ) mysql? ( >=dev-ruby/mysql2-0.5.0:0.5[ruby_targets_ruby26(-)] ) passenger? ( www-apache/passenger[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-1.1.4:1[ruby_targets_ruby26(-)] ) sqlite? ( >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby26(-)] ) dev-ruby/actionpack-xml_parser:2[ruby_targets_ruby26(-)] dev-ruby/addressable[ruby_targets_ruby26(-)] dev-ruby/csv:3[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.8.2:1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1[ruby_targets_ruby26(-)] dev-ruby/marcel[ruby_targets_ruby26(-)] dev-ruby/mimemagic[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-1.0.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.11.1[ruby_targets_ruby26(-)] dev-ruby/rack-openid[ruby_targets_ruby26(-)] dev-ruby/rails:5.2[ruby_targets_ruby26(-)] >=dev-ruby/rbpdf-1.20.0[ruby_targets_ruby26(-)] >=dev-ruby/request_store-1.5.0:0[ruby_targets_ruby26(-)] >=dev-ruby/roadie-rails-2.2.0[ruby_targets_ruby26(-)] dev-ruby/rotp[ruby_targets_ruby26(-)] >=dev-ruby/rouge-3.26.0[ruby_targets_ruby26(-)] dev-ruby/rqrcode[ruby_targets_ruby26(-)] >=dev-ruby/ruby-openid-2.9.2[ruby_targets_ruby26(-)] >=dev-ruby/rubyzip-2.3.0:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
-EAPI=7
-HOMEPAGE=https://www.redmine.org/
-IUSE=fastcgi imagemagick ldap markdown +minimagick mysql passenger pdf postgres sqlite ruby_targets_ruby26
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=acct-group/redmine acct-user/redmine imagemagick? ( media-gfx/imagemagick ) pdf? ( app-text/ghostscript-gpl media-gfx/imagemagick ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
-SLOT=0
-SRC_URI=https://www.redmine.org/releases/redmine-4.2.2.tar.gz
-_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3ffe84e28e18efcecf3e4234f0080438
diff --git a/metadata/md5-cache/www-apps/redmine-4.2.3 b/metadata/md5-cache/www-apps/redmine-4.2.3
new file mode 100644
index 000000000000..b6e9b3986b8e
--- /dev/null
+++ b/metadata/md5-cache/www-apps/redmine-4.2.3
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby26? ( fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-net-ldap[ruby_targets_ruby26(-)] ) minimagick? ( dev-ruby/mini_magick[ruby_targets_ruby26(-)] ) markdown? ( >=dev-ruby/redcarpet-3.5.1[ruby_targets_ruby26(-)] ) mysql? ( >=dev-ruby/mysql2-0.5.0:0.5[ruby_targets_ruby26(-)] ) passenger? ( www-apache/passenger[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-1.1.4:1[ruby_targets_ruby26(-)] ) sqlite? ( >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby26(-)] ) dev-ruby/actionpack-xml_parser:2[ruby_targets_ruby26(-)] dev-ruby/addressable[ruby_targets_ruby26(-)] dev-ruby/csv:3[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.8.2:1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1[ruby_targets_ruby26(-)] dev-ruby/marcel[ruby_targets_ruby26(-)] dev-ruby/mimemagic[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-1.0.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.11.1[ruby_targets_ruby26(-)] dev-ruby/rack-openid[ruby_targets_ruby26(-)] dev-ruby/rails:5.2[ruby_targets_ruby26(-)] >=dev-ruby/rbpdf-1.20.0[ruby_targets_ruby26(-)] >=dev-ruby/request_store-1.5.0:0[ruby_targets_ruby26(-)] >=dev-ruby/roadie-rails-2.2.0[ruby_targets_ruby26(-)] dev-ruby/rotp[ruby_targets_ruby26(-)] >=dev-ruby/rouge-3.26.0[ruby_targets_ruby26(-)] dev-ruby/rqrcode[ruby_targets_ruby26(-)] >=dev-ruby/ruby-openid-2.9.2[ruby_targets_ruby26(-)] >=dev-ruby/rubyzip-2.3.0:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DESCRIPTION=Flexible project management web application using the Ruby on Rails framework
+EAPI=7
+HOMEPAGE=https://www.redmine.org/
+IUSE=fastcgi imagemagick ldap markdown +minimagick mysql passenger pdf postgres sqlite ruby_targets_ruby26
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=acct-group/redmine acct-user/redmine imagemagick? ( media-gfx/imagemagick ) pdf? ( app-text/ghostscript-gpl media-gfx/imagemagick ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=|| ( ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://www.redmine.org/releases/redmine-4.2.3.tar.gz
+_eclasses_=depend.apache	d54e0d0bd6b36c476594edc2cee2e332	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3ffe84e28e18efcecf3e4234f0080438
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index dcb02318356f..ce93759d7bcb 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-94.0.4606.71 b/metadata/md5-cache/www-client/chromium-94.0.4606.71
deleted file mode 100644
index 497ca5837a80..000000000000
--- a/metadata/md5-cache/www-client/chromium-94.0.4606.71
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) || ( ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] ) media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=https://chromium.org/
-IUSE=component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=amd64 arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] ) media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
-REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-94.0.4606.71.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-94-patchset-3/chromium-94-patchset-3.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=db3ee4b4b9909600e461dd914a0c7577
diff --git a/metadata/md5-cache/www-client/chromium-94.0.4606.81 b/metadata/md5-cache/www-client/chromium-94.0.4606.81
index 4aab568a419b..fbd7017c46d8 100644
--- a/metadata/md5-cache/www-client/chromium-94.0.4606.81
+++ b/metadata/md5-cache/www-client/chromium-94.0.4606.81
@@ -5,11 +5,11 @@ DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=7
 HOMEPAGE=https://chromium.org/
 IUSE=component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 ~x86
 LICENSE=BSD
 RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] ) media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
 REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-94.0.4606.81.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-94-patchset-3/chromium-94-patchset-3.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=33e1a5cd4501ab0f14615a3e0a8263aa
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=08e59bc4eb1cafb9b2b17e5dcdf48899
diff --git a/metadata/md5-cache/www-client/chromium-95.0.4638.40 b/metadata/md5-cache/www-client/chromium-95.0.4638.40
deleted file mode 100644
index ef21c185fb5f..000000000000
--- a/metadata/md5-cache/www-client/chromium-95.0.4638.40
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) || ( ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] ) media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=https://chromium.org/
-IUSE=component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] ) media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
-REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-95.0.4638.40.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-95-patchset-4/chromium-95-patchset-4.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=30721beba904fa60e76353fe94166d38
diff --git a/metadata/md5-cache/www-client/chromium-95.0.4638.54 b/metadata/md5-cache/www-client/chromium-95.0.4638.54
new file mode 100644
index 000000000000..23781181f80a
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-95.0.4638.54
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) || ( ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] ) media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=https://chromium.org/
+IUSE=component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] ) media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-95.0.4638.54.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-95-patchset-4/chromium-95-patchset-4.tar.xz
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=966f377c86a1563f348c7ac8b4e76dbd
diff --git a/metadata/md5-cache/www-client/chromium-96.0.4655.0 b/metadata/md5-cache/www-client/chromium-96.0.4655.0
deleted file mode 100644
index 9df235f4038b..000000000000
--- a/metadata/md5-cache/www-client/chromium-96.0.4655.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) || ( ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] ) media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=https://chromium.org/
-IUSE=component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] ) media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
-REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-96.0.4655.0.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-96-patchset-2/chromium-96-patchset-2.tar.xz
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=29089506790b1faf75ff6697a66d4564
diff --git a/metadata/md5-cache/www-client/chromium-96.0.4664.9 b/metadata/md5-cache/www-client/chromium-96.0.4664.9
new file mode 100644
index 000000000000..77f4bf2e997b
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-96.0.4664.9
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10[xml] dev-lang/python:3.9[xml] dev-lang/python:3.8[xml] ) || ( ( dev-lang/python:3.10[xml] dev-python/setuptools[python_targets_python3_10(-)] ) ( dev-lang/python:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( dev-lang/python:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 dev-lang/perl >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] ) media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=8
+HOMEPAGE=https://chromium.org/
+IUSE=component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] ) media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm(+)] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-96.0.4664.9.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-96-patchset-4/chromium-96-patchset-4.tar.xz
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8137359d83bdd05a1ceb90b14d662b8b
diff --git a/metadata/md5-cache/www-client/dillo-3.1_pre20181005 b/metadata/md5-cache/www-client/dillo-3.1_pre20181005
index 40b4aaad65e1..828a8f7ab74d 100644
--- a/metadata/md5-cache/www-client/dillo-3.1_pre20181005
+++ b/metadata/md5-cache/www-client/dillo-3.1_pre20181005
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/fltk-1.3 sys-libs/zlib jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( net-libs/mbedtls:= )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/dillo-3.1_pre20181005.tar.xz mirror://gentoo/dillo.png
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/dillo-3.1_pre20181005.tar.xz mirror://gentoo/dillo.png
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fbd79df021288884ede854a1912153bd
+_md5_=31428443831d3ad20880cee09d32cbf4
diff --git a/metadata/md5-cache/www-client/firefox-78.13.0 b/metadata/md5-cache/www-client/firefox-78.13.0
deleted file mode 100644
index a402da9af55a..000000000000
--- a/metadata/md5-cache/www-client/firefox-78.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.21.0 virtual/pkgconfig >=virtual/rust-1.41.0 || ( ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Firefox Web Browser
-EAPI=7
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux pgo
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland ) wifi? ( dbus )
-SLOT=0/esr78
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/source/firefox-78.13.0esr.source.tar.xz -> firefox-78.13.0esr.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-16.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-16.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-16.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ach.xpi -> firefox-78.13.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/af.xpi -> firefox-78.13.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/an.xpi -> firefox-78.13.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ar.xpi -> firefox-78.13.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ast.xpi -> firefox-78.13.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/az.xpi -> firefox-78.13.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/be.xpi -> firefox-78.13.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/bg.xpi -> firefox-78.13.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/bn.xpi -> firefox-78.13.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/br.xpi -> firefox-78.13.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/bs.xpi -> firefox-78.13.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.13.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ca.xpi -> firefox-78.13.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/cak.xpi -> firefox-78.13.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/cs.xpi -> firefox-78.13.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/cy.xpi -> firefox-78.13.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/da.xpi -> firefox-78.13.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/de.xpi -> firefox-78.13.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.13.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/el.xpi -> firefox-78.13.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.13.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.13.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/eo.xpi -> firefox-78.13.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.13.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.13.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.13.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.13.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/et.xpi -> firefox-78.13.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/eu.xpi -> firefox-78.13.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/fa.xpi -> firefox-78.13.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ff.xpi -> firefox-78.13.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/fi.xpi -> firefox-78.13.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/fr.xpi -> firefox-78.13.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.13.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.13.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/gd.xpi -> firefox-78.13.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/gl.xpi -> firefox-78.13.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/gn.xpi -> firefox-78.13.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.13.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/he.xpi -> firefox-78.13.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.13.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/hr.xpi -> firefox-78.13.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.13.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/hu.xpi -> firefox-78.13.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.13.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ia.xpi -> firefox-78.13.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/id.xpi -> firefox-78.13.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/is.xpi -> firefox-78.13.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/it.xpi -> firefox-78.13.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ja.xpi -> firefox-78.13.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ka.xpi -> firefox-78.13.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/kab.xpi -> firefox-78.13.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/kk.xpi -> firefox-78.13.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/km.xpi -> firefox-78.13.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/kn.xpi -> firefox-78.13.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ko.xpi -> firefox-78.13.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/lij.xpi -> firefox-78.13.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/lt.xpi -> firefox-78.13.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/lv.xpi -> firefox-78.13.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/mk.xpi -> firefox-78.13.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/mr.xpi -> firefox-78.13.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ms.xpi -> firefox-78.13.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/my.xpi -> firefox-78.13.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.13.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.13.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/nl.xpi -> firefox-78.13.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.13.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/oc.xpi -> firefox-78.13.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.13.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/pl.xpi -> firefox-78.13.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.13.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.13.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/rm.xpi -> firefox-78.13.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ro.xpi -> firefox-78.13.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ru.xpi -> firefox-78.13.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/si.xpi -> firefox-78.13.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/sk.xpi -> firefox-78.13.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/sl.xpi -> firefox-78.13.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/son.xpi -> firefox-78.13.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/sq.xpi -> firefox-78.13.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/sr.xpi -> firefox-78.13.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.13.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ta.xpi -> firefox-78.13.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/te.xpi -> firefox-78.13.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/th.xpi -> firefox-78.13.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/tl.xpi -> firefox-78.13.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/tr.xpi -> firefox-78.13.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/trs.xpi -> firefox-78.13.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/uk.xpi -> firefox-78.13.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/ur.xpi -> firefox-78.13.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/uz.xpi -> firefox-78.13.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/vi.xpi -> firefox-78.13.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/xh.xpi -> firefox-78.13.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.13.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.13.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.13.0esr-zh-TW.xpi )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8db4342eae8210c079f5ca60e0b96308
diff --git a/metadata/md5-cache/www-client/firefox-78.14.0 b/metadata/md5-cache/www-client/firefox-78.14.0
deleted file mode 100644
index 2c5ac901b39e..000000000000
--- a/metadata/md5-cache/www-client/firefox-78.14.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.21.0 virtual/pkgconfig >=virtual/rust-1.41.0 || ( ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Firefox Web Browser
-EAPI=7
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux pgo
-KEYWORDS=amd64 arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland ) wifi? ( dbus )
-SLOT=0/esr78
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/source/firefox-78.14.0esr.source.tar.xz -> firefox-78.14.0esr.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-17.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-17.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-17.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ach.xpi -> firefox-78.14.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/af.xpi -> firefox-78.14.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/an.xpi -> firefox-78.14.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ar.xpi -> firefox-78.14.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ast.xpi -> firefox-78.14.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/az.xpi -> firefox-78.14.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/be.xpi -> firefox-78.14.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/bg.xpi -> firefox-78.14.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/bn.xpi -> firefox-78.14.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/br.xpi -> firefox-78.14.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/bs.xpi -> firefox-78.14.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.14.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ca.xpi -> firefox-78.14.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/cak.xpi -> firefox-78.14.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/cs.xpi -> firefox-78.14.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/cy.xpi -> firefox-78.14.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/da.xpi -> firefox-78.14.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/de.xpi -> firefox-78.14.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.14.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/el.xpi -> firefox-78.14.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.14.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.14.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/eo.xpi -> firefox-78.14.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.14.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.14.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.14.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.14.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/et.xpi -> firefox-78.14.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/eu.xpi -> firefox-78.14.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/fa.xpi -> firefox-78.14.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ff.xpi -> firefox-78.14.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/fi.xpi -> firefox-78.14.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/fr.xpi -> firefox-78.14.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.14.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.14.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/gd.xpi -> firefox-78.14.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/gl.xpi -> firefox-78.14.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/gn.xpi -> firefox-78.14.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.14.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/he.xpi -> firefox-78.14.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.14.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/hr.xpi -> firefox-78.14.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.14.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/hu.xpi -> firefox-78.14.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.14.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ia.xpi -> firefox-78.14.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/id.xpi -> firefox-78.14.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/is.xpi -> firefox-78.14.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/it.xpi -> firefox-78.14.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ja.xpi -> firefox-78.14.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ka.xpi -> firefox-78.14.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/kab.xpi -> firefox-78.14.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/kk.xpi -> firefox-78.14.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/km.xpi -> firefox-78.14.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/kn.xpi -> firefox-78.14.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ko.xpi -> firefox-78.14.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/lij.xpi -> firefox-78.14.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/lt.xpi -> firefox-78.14.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/lv.xpi -> firefox-78.14.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/mk.xpi -> firefox-78.14.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/mr.xpi -> firefox-78.14.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ms.xpi -> firefox-78.14.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/my.xpi -> firefox-78.14.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.14.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.14.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/nl.xpi -> firefox-78.14.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.14.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/oc.xpi -> firefox-78.14.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.14.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/pl.xpi -> firefox-78.14.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.14.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.14.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/rm.xpi -> firefox-78.14.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ro.xpi -> firefox-78.14.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ru.xpi -> firefox-78.14.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/si.xpi -> firefox-78.14.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/sk.xpi -> firefox-78.14.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/sl.xpi -> firefox-78.14.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/son.xpi -> firefox-78.14.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/sq.xpi -> firefox-78.14.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/sr.xpi -> firefox-78.14.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.14.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ta.xpi -> firefox-78.14.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/te.xpi -> firefox-78.14.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/th.xpi -> firefox-78.14.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/tl.xpi -> firefox-78.14.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/tr.xpi -> firefox-78.14.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/trs.xpi -> firefox-78.14.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/uk.xpi -> firefox-78.14.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/ur.xpi -> firefox-78.14.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/uz.xpi -> firefox-78.14.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/vi.xpi -> firefox-78.14.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/xh.xpi -> firefox-78.14.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.14.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.14.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.14.0esr-zh-TW.xpi )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c14118b9948e7ac643961177cf7aa4d6
diff --git a/metadata/md5-cache/www-client/firefox-78.15.0 b/metadata/md5-cache/www-client/firefox-78.15.0
index 75b8992acf7a..371a6c274196 100644
--- a/metadata/md5-cache/www-client/firefox-78.15.0
+++ b/metadata/md5-cache/www-client/firefox-78.15.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >
 REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland ) wifi? ( dbus )
 SLOT=0/esr78
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/source/firefox-78.15.0esr.source.tar.xz -> firefox-78.15.0esr.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-18.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-18.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-18.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ach.xpi -> firefox-78.15.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/af.xpi -> firefox-78.15.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/an.xpi -> firefox-78.15.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ar.xpi -> firefox-78.15.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ast.xpi -> firefox-78.15.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/az.xpi -> firefox-78.15.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/be.xpi -> firefox-78.15.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/bg.xpi -> firefox-78.15.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/bn.xpi -> firefox-78.15.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/br.xpi -> firefox-78.15.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/bs.xpi -> firefox-78.15.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.15.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ca.xpi -> firefox-78.15.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/cak.xpi -> firefox-78.15.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/cs.xpi -> firefox-78.15.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/cy.xpi -> firefox-78.15.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/da.xpi -> firefox-78.15.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/de.xpi -> firefox-78.15.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.15.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/el.xpi -> firefox-78.15.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.15.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.15.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/eo.xpi -> firefox-78.15.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.15.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.15.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.15.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.15.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/et.xpi -> firefox-78.15.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/eu.xpi -> firefox-78.15.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/fa.xpi -> firefox-78.15.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ff.xpi -> firefox-78.15.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/fi.xpi -> firefox-78.15.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/fr.xpi -> firefox-78.15.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.15.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.15.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/gd.xpi -> firefox-78.15.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/gl.xpi -> firefox-78.15.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/gn.xpi -> firefox-78.15.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.15.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/he.xpi -> firefox-78.15.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.15.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/hr.xpi -> firefox-78.15.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.15.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/hu.xpi -> firefox-78.15.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.15.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ia.xpi -> firefox-78.15.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/id.xpi -> firefox-78.15.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/is.xpi -> firefox-78.15.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/it.xpi -> firefox-78.15.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ja.xpi -> firefox-78.15.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ka.xpi -> firefox-78.15.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/kab.xpi -> firefox-78.15.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/kk.xpi -> firefox-78.15.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/km.xpi -> firefox-78.15.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/kn.xpi -> firefox-78.15.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ko.xpi -> firefox-78.15.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/lij.xpi -> firefox-78.15.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/lt.xpi -> firefox-78.15.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/lv.xpi -> firefox-78.15.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/mk.xpi -> firefox-78.15.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/mr.xpi -> firefox-78.15.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ms.xpi -> firefox-78.15.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/my.xpi -> firefox-78.15.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.15.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.15.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/nl.xpi -> firefox-78.15.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.15.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/oc.xpi -> firefox-78.15.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.15.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/pl.xpi -> firefox-78.15.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.15.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.15.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/rm.xpi -> firefox-78.15.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ro.xpi -> firefox-78.15.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ru.xpi -> firefox-78.15.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/si.xpi -> firefox-78.15.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/sk.xpi -> firefox-78.15.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/sl.xpi -> firefox-78.15.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/son.xpi -> firefox-78.15.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/sq.xpi -> firefox-78.15.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/sr.xpi -> firefox-78.15.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.15.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ta.xpi -> firefox-78.15.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/te.xpi -> firefox-78.15.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/th.xpi -> firefox-78.15.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/tl.xpi -> firefox-78.15.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/tr.xpi -> firefox-78.15.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/trs.xpi -> firefox-78.15.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/uk.xpi -> firefox-78.15.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ur.xpi -> firefox-78.15.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/uz.xpi -> firefox-78.15.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/vi.xpi -> firefox-78.15.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/xh.xpi -> firefox-78.15.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.15.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.15.0esr-zh-TW.xpi )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=f83649c51eae6d04d1de628d1f7c6bf7
diff --git a/metadata/md5-cache/www-client/firefox-91.0.1 b/metadata/md5-cache/www-client/firefox-91.0.1
deleted file mode 100644
index 3d54f20ac6f2..000000000000
--- a/metadata/md5-cache/www-client/firefox-91.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10[ncurses,sqlite,ssl] dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.19.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.51.0 || ( ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.68 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Firefox Web Browser
-EAPI=7
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_szl l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.68 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
-SLOT=0/91
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/91.0.1/source/firefox-91.0.1.source.tar.xz -> firefox-91.0.1.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-91-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-91-patches-02.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-91-patches-02.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ach.xpi -> firefox-91.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/af.xpi -> firefox-91.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/an.xpi -> firefox-91.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ar.xpi -> firefox-91.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ast.xpi -> firefox-91.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/az.xpi -> firefox-91.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/be.xpi -> firefox-91.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/bg.xpi -> firefox-91.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/bn.xpi -> firefox-91.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/br.xpi -> firefox-91.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/bs.xpi -> firefox-91.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-91.0.1-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ca.xpi -> firefox-91.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/cak.xpi -> firefox-91.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/cs.xpi -> firefox-91.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/cy.xpi -> firefox-91.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/da.xpi -> firefox-91.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/de.xpi -> firefox-91.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-91.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/el.xpi -> firefox-91.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-91.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-91.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/eo.xpi -> firefox-91.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-91.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-91.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-91.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-91.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/et.xpi -> firefox-91.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/eu.xpi -> firefox-91.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/fa.xpi -> firefox-91.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ff.xpi -> firefox-91.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/fi.xpi -> firefox-91.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/fr.xpi -> firefox-91.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-91.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-91.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/gd.xpi -> firefox-91.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/gl.xpi -> firefox-91.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/gn.xpi -> firefox-91.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-91.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/he.xpi -> firefox-91.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-91.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/hr.xpi -> firefox-91.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-91.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/hu.xpi -> firefox-91.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-91.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ia.xpi -> firefox-91.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/id.xpi -> firefox-91.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/is.xpi -> firefox-91.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/it.xpi -> firefox-91.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ja.xpi -> firefox-91.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ka.xpi -> firefox-91.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/kab.xpi -> firefox-91.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/kk.xpi -> firefox-91.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/km.xpi -> firefox-91.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/kn.xpi -> firefox-91.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ko.xpi -> firefox-91.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/lij.xpi -> firefox-91.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/lt.xpi -> firefox-91.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/lv.xpi -> firefox-91.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/mk.xpi -> firefox-91.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/mr.xpi -> firefox-91.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ms.xpi -> firefox-91.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/my.xpi -> firefox-91.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-91.0.1-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-91.0.1-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/nl.xpi -> firefox-91.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-91.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/oc.xpi -> firefox-91.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-91.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/pl.xpi -> firefox-91.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-91.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-91.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/rm.xpi -> firefox-91.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ro.xpi -> firefox-91.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ru.xpi -> firefox-91.0.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/si.xpi -> firefox-91.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/sk.xpi -> firefox-91.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/sl.xpi -> firefox-91.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/son.xpi -> firefox-91.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/sq.xpi -> firefox-91.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/sr.xpi -> firefox-91.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-91.0.1-sv-SE.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/szl.xpi -> firefox-91.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ta.xpi -> firefox-91.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/te.xpi -> firefox-91.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/th.xpi -> firefox-91.0.1-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/tl.xpi -> firefox-91.0.1-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/tr.xpi -> firefox-91.0.1-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/trs.xpi -> firefox-91.0.1-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/uk.xpi -> firefox-91.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/ur.xpi -> firefox-91.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/uz.xpi -> firefox-91.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/vi.xpi -> firefox-91.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/xh.xpi -> firefox-91.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-91.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/91.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-91.0.1-zh-TW.xpi )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=93fc472f7b7e7fd9d0aa45bbbf4f987c
diff --git a/metadata/md5-cache/www-client/firefox-91.0.2 b/metadata/md5-cache/www-client/firefox-91.0.2
deleted file mode 100644
index 24f79e10e96a..000000000000
--- a/metadata/md5-cache/www-client/firefox-91.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10[ncurses,sqlite,ssl] dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.19.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.51.0 || ( ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.68 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Firefox Web Browser
-EAPI=7
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sco l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_szl l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.68 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
-SLOT=0/91
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/91.0.2/source/firefox-91.0.2.source.tar.xz -> firefox-91.0.2.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-91-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-91-patches-03.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-91-patches-03.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ach.xpi -> firefox-91.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/af.xpi -> firefox-91.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/an.xpi -> firefox-91.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ar.xpi -> firefox-91.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ast.xpi -> firefox-91.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/az.xpi -> firefox-91.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/be.xpi -> firefox-91.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/bg.xpi -> firefox-91.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/bn.xpi -> firefox-91.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/br.xpi -> firefox-91.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/bs.xpi -> firefox-91.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-91.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ca.xpi -> firefox-91.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/cak.xpi -> firefox-91.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/cs.xpi -> firefox-91.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/cy.xpi -> firefox-91.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/da.xpi -> firefox-91.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/de.xpi -> firefox-91.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-91.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/el.xpi -> firefox-91.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-91.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-91.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/eo.xpi -> firefox-91.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-91.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-91.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-91.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-91.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/et.xpi -> firefox-91.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/eu.xpi -> firefox-91.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/fa.xpi -> firefox-91.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ff.xpi -> firefox-91.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/fi.xpi -> firefox-91.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/fr.xpi -> firefox-91.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-91.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-91.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/gd.xpi -> firefox-91.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/gl.xpi -> firefox-91.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/gn.xpi -> firefox-91.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-91.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/he.xpi -> firefox-91.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-91.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/hr.xpi -> firefox-91.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-91.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/hu.xpi -> firefox-91.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-91.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ia.xpi -> firefox-91.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/id.xpi -> firefox-91.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/is.xpi -> firefox-91.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/it.xpi -> firefox-91.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ja.xpi -> firefox-91.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ka.xpi -> firefox-91.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/kab.xpi -> firefox-91.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/kk.xpi -> firefox-91.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/km.xpi -> firefox-91.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/kn.xpi -> firefox-91.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ko.xpi -> firefox-91.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/lij.xpi -> firefox-91.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/lt.xpi -> firefox-91.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/lv.xpi -> firefox-91.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/mk.xpi -> firefox-91.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/mr.xpi -> firefox-91.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ms.xpi -> firefox-91.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/my.xpi -> firefox-91.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-91.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-91.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/nl.xpi -> firefox-91.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-91.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/oc.xpi -> firefox-91.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-91.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/pl.xpi -> firefox-91.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-91.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-91.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/rm.xpi -> firefox-91.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ro.xpi -> firefox-91.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ru.xpi -> firefox-91.0.2-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sco.xpi -> firefox-91.0.2-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/si.xpi -> firefox-91.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sk.xpi -> firefox-91.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sl.xpi -> firefox-91.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/son.xpi -> firefox-91.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sq.xpi -> firefox-91.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sr.xpi -> firefox-91.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-91.0.2-sv-SE.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/szl.xpi -> firefox-91.0.2-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ta.xpi -> firefox-91.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/te.xpi -> firefox-91.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/th.xpi -> firefox-91.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/tl.xpi -> firefox-91.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/tr.xpi -> firefox-91.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/trs.xpi -> firefox-91.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/uk.xpi -> firefox-91.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/ur.xpi -> firefox-91.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/uz.xpi -> firefox-91.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/vi.xpi -> firefox-91.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/xh.xpi -> firefox-91.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-91.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/91.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-91.0.2-zh-TW.xpi )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=40da21501c8b6abd9279cc6f92251620
diff --git a/metadata/md5-cache/www-client/firefox-92.0 b/metadata/md5-cache/www-client/firefox-92.0
deleted file mode 100644
index 173cf695bb98..000000000000
--- a/metadata/md5-cache/www-client/firefox-92.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10[ncurses,sqlite,ssl] dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.19.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.51.0 || ( ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.69 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Firefox Web Browser
-EAPI=7
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sco l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_szl l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.69 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
-SLOT=0/92
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/92.0/source/firefox-92.0.source.tar.xz -> firefox-92.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-92-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-92-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-92-patches-01.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ach.xpi -> firefox-92.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/af.xpi -> firefox-92.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/an.xpi -> firefox-92.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ar.xpi -> firefox-92.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ast.xpi -> firefox-92.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/az.xpi -> firefox-92.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/be.xpi -> firefox-92.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/bg.xpi -> firefox-92.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/bn.xpi -> firefox-92.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/br.xpi -> firefox-92.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/bs.xpi -> firefox-92.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-92.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ca.xpi -> firefox-92.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/cak.xpi -> firefox-92.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/cs.xpi -> firefox-92.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/cy.xpi -> firefox-92.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/da.xpi -> firefox-92.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/de.xpi -> firefox-92.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/dsb.xpi -> firefox-92.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/el.xpi -> firefox-92.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/en-CA.xpi -> firefox-92.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/en-GB.xpi -> firefox-92.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/eo.xpi -> firefox-92.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/es-AR.xpi -> firefox-92.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/es-CL.xpi -> firefox-92.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/es-ES.xpi -> firefox-92.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/es-MX.xpi -> firefox-92.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/et.xpi -> firefox-92.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/eu.xpi -> firefox-92.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/fa.xpi -> firefox-92.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ff.xpi -> firefox-92.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/fi.xpi -> firefox-92.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/fr.xpi -> firefox-92.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-92.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-92.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/gd.xpi -> firefox-92.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/gl.xpi -> firefox-92.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/gn.xpi -> firefox-92.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-92.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/he.xpi -> firefox-92.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-92.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/hr.xpi -> firefox-92.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/hsb.xpi -> firefox-92.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/hu.xpi -> firefox-92.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-92.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ia.xpi -> firefox-92.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/id.xpi -> firefox-92.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/is.xpi -> firefox-92.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/it.xpi -> firefox-92.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ja.xpi -> firefox-92.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ka.xpi -> firefox-92.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/kab.xpi -> firefox-92.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/kk.xpi -> firefox-92.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/km.xpi -> firefox-92.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/kn.xpi -> firefox-92.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ko.xpi -> firefox-92.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/lij.xpi -> firefox-92.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/lt.xpi -> firefox-92.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/lv.xpi -> firefox-92.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/mk.xpi -> firefox-92.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/mr.xpi -> firefox-92.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ms.xpi -> firefox-92.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/my.xpi -> firefox-92.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-92.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-92.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/nl.xpi -> firefox-92.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-92.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/oc.xpi -> firefox-92.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-92.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/pl.xpi -> firefox-92.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-92.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-92.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/rm.xpi -> firefox-92.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ro.xpi -> firefox-92.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ru.xpi -> firefox-92.0-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/sco.xpi -> firefox-92.0-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/si.xpi -> firefox-92.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/sk.xpi -> firefox-92.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/sl.xpi -> firefox-92.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/son.xpi -> firefox-92.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/sq.xpi -> firefox-92.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/sr.xpi -> firefox-92.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-92.0-sv-SE.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/szl.xpi -> firefox-92.0-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ta.xpi -> firefox-92.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/te.xpi -> firefox-92.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/th.xpi -> firefox-92.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/tl.xpi -> firefox-92.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/tr.xpi -> firefox-92.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/trs.xpi -> firefox-92.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/uk.xpi -> firefox-92.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/ur.xpi -> firefox-92.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/uz.xpi -> firefox-92.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/vi.xpi -> firefox-92.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/xh.xpi -> firefox-92.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-92.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/92.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-92.0-zh-TW.xpi )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0c08a4e26c159da41b9369fe61e9cf9f
diff --git a/metadata/md5-cache/www-client/firefox-92.0.1 b/metadata/md5-cache/www-client/firefox-92.0.1
deleted file mode 100644
index 8a7c90ae354f..000000000000
--- a/metadata/md5-cache/www-client/firefox-92.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10[ncurses,sqlite,ssl] dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.19.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.51.0 || ( ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.69 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Firefox Web Browser
-EAPI=7
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sco l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_szl l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.69 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
-SLOT=0/92
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/92.0.1/source/firefox-92.0.1.source.tar.xz -> firefox-92.0.1.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-92-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-92-patches-02.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-92-patches-02.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ach.xpi -> firefox-92.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/af.xpi -> firefox-92.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/an.xpi -> firefox-92.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ar.xpi -> firefox-92.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ast.xpi -> firefox-92.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/az.xpi -> firefox-92.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/be.xpi -> firefox-92.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/bg.xpi -> firefox-92.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/bn.xpi -> firefox-92.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/br.xpi -> firefox-92.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/bs.xpi -> firefox-92.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-92.0.1-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ca.xpi -> firefox-92.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/cak.xpi -> firefox-92.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/cs.xpi -> firefox-92.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/cy.xpi -> firefox-92.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/da.xpi -> firefox-92.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/de.xpi -> firefox-92.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-92.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/el.xpi -> firefox-92.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-92.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-92.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/eo.xpi -> firefox-92.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-92.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-92.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-92.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-92.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/et.xpi -> firefox-92.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/eu.xpi -> firefox-92.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/fa.xpi -> firefox-92.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ff.xpi -> firefox-92.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/fi.xpi -> firefox-92.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/fr.xpi -> firefox-92.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-92.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-92.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/gd.xpi -> firefox-92.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/gl.xpi -> firefox-92.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/gn.xpi -> firefox-92.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-92.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/he.xpi -> firefox-92.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-92.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/hr.xpi -> firefox-92.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-92.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/hu.xpi -> firefox-92.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-92.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ia.xpi -> firefox-92.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/id.xpi -> firefox-92.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/is.xpi -> firefox-92.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/it.xpi -> firefox-92.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ja.xpi -> firefox-92.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ka.xpi -> firefox-92.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/kab.xpi -> firefox-92.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/kk.xpi -> firefox-92.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/km.xpi -> firefox-92.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/kn.xpi -> firefox-92.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ko.xpi -> firefox-92.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/lij.xpi -> firefox-92.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/lt.xpi -> firefox-92.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/lv.xpi -> firefox-92.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/mk.xpi -> firefox-92.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/mr.xpi -> firefox-92.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ms.xpi -> firefox-92.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/my.xpi -> firefox-92.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-92.0.1-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-92.0.1-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/nl.xpi -> firefox-92.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-92.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/oc.xpi -> firefox-92.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-92.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/pl.xpi -> firefox-92.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-92.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-92.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/rm.xpi -> firefox-92.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ro.xpi -> firefox-92.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ru.xpi -> firefox-92.0.1-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/sco.xpi -> firefox-92.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/si.xpi -> firefox-92.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/sk.xpi -> firefox-92.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/sl.xpi -> firefox-92.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/son.xpi -> firefox-92.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/sq.xpi -> firefox-92.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/sr.xpi -> firefox-92.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-92.0.1-sv-SE.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/szl.xpi -> firefox-92.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ta.xpi -> firefox-92.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/te.xpi -> firefox-92.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/th.xpi -> firefox-92.0.1-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/tl.xpi -> firefox-92.0.1-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/tr.xpi -> firefox-92.0.1-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/trs.xpi -> firefox-92.0.1-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/uk.xpi -> firefox-92.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/ur.xpi -> firefox-92.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/uz.xpi -> firefox-92.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/vi.xpi -> firefox-92.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/xh.xpi -> firefox-92.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-92.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/92.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-92.0.1-zh-TW.xpi )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0caf5795d02cb3104a18841b935ab503
diff --git a/metadata/md5-cache/www-client/firefox-93.0 b/metadata/md5-cache/www-client/firefox-93.0
index 028ba33cec1c..da848193dbf6 100644
--- a/metadata/md5-cache/www-client/firefox-93.0
+++ b/metadata/md5-cache/www-client/firefox-93.0
@@ -1,6 +1,6 @@
 BDEPEND=|| ( dev-lang/python:3.10[ncurses,sqlite,ssl] dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.19.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.51.0 || ( ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.70 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/nss-3.70 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Firefox Web Browser
 EAPI=7
 HOMEPAGE=https://www.mozilla.com/firefox
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/nss-3.70 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x
 REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
 SLOT=0/93
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/93.0/source/firefox-93.0.source.tar.xz -> firefox-93.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-93-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-93-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-93-patches-01.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ach.xpi -> firefox-93.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/af.xpi -> firefox-93.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/an.xpi -> firefox-93.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ar.xpi -> firefox-93.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ast.xpi -> firefox-93.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/az.xpi -> firefox-93.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/be.xpi -> firefox-93.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/bg.xpi -> firefox-93.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/bn.xpi -> firefox-93.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/br.xpi -> firefox-93.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/bs.xpi -> firefox-93.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-93.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ca.xpi -> firefox-93.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/cak.xpi -> firefox-93.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/cs.xpi -> firefox-93.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/cy.xpi -> firefox-93.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/da.xpi -> firefox-93.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/de.xpi -> firefox-93.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/dsb.xpi -> firefox-93.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/el.xpi -> firefox-93.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/en-CA.xpi -> firefox-93.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/en-GB.xpi -> firefox-93.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/eo.xpi -> firefox-93.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/es-AR.xpi -> firefox-93.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/es-CL.xpi -> firefox-93.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/es-ES.xpi -> firefox-93.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/es-MX.xpi -> firefox-93.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/et.xpi -> firefox-93.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/eu.xpi -> firefox-93.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/fa.xpi -> firefox-93.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ff.xpi -> firefox-93.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/fi.xpi -> firefox-93.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/fr.xpi -> firefox-93.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-93.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-93.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/gd.xpi -> firefox-93.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/gl.xpi -> firefox-93.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/gn.xpi -> firefox-93.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-93.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/he.xpi -> firefox-93.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-93.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/hr.xpi -> firefox-93.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/hsb.xpi -> firefox-93.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/hu.xpi -> firefox-93.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-93.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ia.xpi -> firefox-93.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/id.xpi -> firefox-93.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/is.xpi -> firefox-93.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/it.xpi -> firefox-93.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ja.xpi -> firefox-93.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ka.xpi -> firefox-93.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/kab.xpi -> firefox-93.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/kk.xpi -> firefox-93.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/km.xpi -> firefox-93.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/kn.xpi -> firefox-93.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ko.xpi -> firefox-93.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/lij.xpi -> firefox-93.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/lt.xpi -> firefox-93.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/lv.xpi -> firefox-93.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/mk.xpi -> firefox-93.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/mr.xpi -> firefox-93.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ms.xpi -> firefox-93.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/my.xpi -> firefox-93.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-93.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-93.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/nl.xpi -> firefox-93.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-93.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/oc.xpi -> firefox-93.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-93.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/pl.xpi -> firefox-93.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-93.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-93.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/rm.xpi -> firefox-93.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ro.xpi -> firefox-93.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ru.xpi -> firefox-93.0-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/sco.xpi -> firefox-93.0-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/si.xpi -> firefox-93.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/sk.xpi -> firefox-93.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/sl.xpi -> firefox-93.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/son.xpi -> firefox-93.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/sq.xpi -> firefox-93.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/sr.xpi -> firefox-93.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-93.0-sv-SE.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/szl.xpi -> firefox-93.0-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ta.xpi -> firefox-93.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/te.xpi -> firefox-93.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/th.xpi -> firefox-93.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/tl.xpi -> firefox-93.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/tr.xpi -> firefox-93.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/trs.xpi -> firefox-93.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/uk.xpi -> firefox-93.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ur.xpi -> firefox-93.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/uz.xpi -> firefox-93.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/vi.xpi -> firefox-93.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/xh.xpi -> firefox-93.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-93.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-93.0-zh-TW.xpi )
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=25d0b1508fed39498fad168fc4e6db1b
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=a893cd906aec938464af554ca2c6ee21
diff --git a/metadata/md5-cache/www-client/firefox-bin-78.15.0 b/metadata/md5-cache/www-client/firefox-bin-78.15.0
index 87d35ace5964..4716b7a0f69e 100644
--- a/metadata/md5-cache/www-client/firefox-bin-78.15.0
+++ b/metadata/md5-cache/www-client/firefox-bin-78.15.0
@@ -11,5 +11,5 @@ RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus
 RESTRICT=strip
 SLOT=0/esr78
 SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/en-US/firefox-78.15.0esr.tar.bz2 -> firefox-bin_x86_64-78.15.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-i686/en-US/firefox-78.15.0esr.tar.bz2 -> firefox-bin_i686-78.15.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ach.xpi -> firefox-78.15.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/af.xpi -> firefox-78.15.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/an.xpi -> firefox-78.15.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ar.xpi -> firefox-78.15.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ast.xpi -> firefox-78.15.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/az.xpi -> firefox-78.15.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/be.xpi -> firefox-78.15.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/bg.xpi -> firefox-78.15.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/bn.xpi -> firefox-78.15.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/br.xpi -> firefox-78.15.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/bs.xpi -> firefox-78.15.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.15.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ca.xpi -> firefox-78.15.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/cak.xpi -> firefox-78.15.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/cs.xpi -> firefox-78.15.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/cy.xpi -> firefox-78.15.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/da.xpi -> firefox-78.15.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/de.xpi -> firefox-78.15.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.15.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/el.xpi -> firefox-78.15.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.15.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.15.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/eo.xpi -> firefox-78.15.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.15.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.15.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.15.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.15.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/et.xpi -> firefox-78.15.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/eu.xpi -> firefox-78.15.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/fa.xpi -> firefox-78.15.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ff.xpi -> firefox-78.15.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/fi.xpi -> firefox-78.15.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/fr.xpi -> firefox-78.15.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.15.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.15.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/gd.xpi -> firefox-78.15.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/gl.xpi -> firefox-78.15.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/gn.xpi -> firefox-78.15.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.15.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/he.xpi -> firefox-78.15.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.15.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/hr.xpi -> firefox-78.15.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.15.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/hu.xpi -> firefox-78.15.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.15.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ia.xpi -> firefox-78.15.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/id.xpi -> firefox-78.15.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/is.xpi -> firefox-78.15.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/it.xpi -> firefox-78.15.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ja.xpi -> firefox-78.15.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ka.xpi -> firefox-78.15.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/kab.xpi -> firefox-78.15.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/kk.xpi -> firefox-78.15.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/km.xpi -> firefox-78.15.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/kn.xpi -> firefox-78.15.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ko.xpi -> firefox-78.15.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/lij.xpi -> firefox-78.15.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/lt.xpi -> firefox-78.15.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/lv.xpi -> firefox-78.15.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/mk.xpi -> firefox-78.15.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/mr.xpi -> firefox-78.15.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ms.xpi -> firefox-78.15.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/my.xpi -> firefox-78.15.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.15.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.15.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/nl.xpi -> firefox-78.15.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.15.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/oc.xpi -> firefox-78.15.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.15.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/pl.xpi -> firefox-78.15.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.15.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.15.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/rm.xpi -> firefox-78.15.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ro.xpi -> firefox-78.15.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ru.xpi -> firefox-78.15.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/si.xpi -> firefox-78.15.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/sk.xpi -> firefox-78.15.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/sl.xpi -> firefox-78.15.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/son.xpi -> firefox-78.15.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/sq.xpi -> firefox-78.15.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/sr.xpi -> firefox-78.15.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.15.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ta.xpi -> firefox-78.15.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/te.xpi -> firefox-78.15.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/th.xpi -> firefox-78.15.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/tl.xpi -> firefox-78.15.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/tr.xpi -> firefox-78.15.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/trs.xpi -> firefox-78.15.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/uk.xpi -> firefox-78.15.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/ur.xpi -> firefox-78.15.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/uz.xpi -> firefox-78.15.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/vi.xpi -> firefox-78.15.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/xh.xpi -> firefox-78.15.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.15.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.15.0esr-zh-TW.xpi )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=703b728d79212d7fddf5f753511b713b
diff --git a/metadata/md5-cache/www-client/firefox-bin-93.0 b/metadata/md5-cache/www-client/firefox-bin-93.0
index 0b917a6b41f1..8d5f5b2320b8 100644
--- a/metadata/md5-cache/www-client/firefox-bin-93.0
+++ b/metadata/md5-cache/www-client/firefox-bin-93.0
@@ -11,5 +11,5 @@ RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus
 RESTRICT=strip
 SLOT=0/93
 SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/en-US/firefox-93.0.tar.bz2 -> firefox-bin_x86_64-93.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-i686/en-US/firefox-93.0.tar.bz2 -> firefox-bin_i686-93.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ach.xpi -> firefox-93.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/af.xpi -> firefox-93.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/an.xpi -> firefox-93.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ar.xpi -> firefox-93.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ast.xpi -> firefox-93.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/az.xpi -> firefox-93.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/be.xpi -> firefox-93.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/bg.xpi -> firefox-93.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/bn.xpi -> firefox-93.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/br.xpi -> firefox-93.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/bs.xpi -> firefox-93.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-93.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ca.xpi -> firefox-93.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/cak.xpi -> firefox-93.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/cs.xpi -> firefox-93.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/cy.xpi -> firefox-93.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/da.xpi -> firefox-93.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/de.xpi -> firefox-93.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/dsb.xpi -> firefox-93.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/el.xpi -> firefox-93.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/en-CA.xpi -> firefox-93.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/en-GB.xpi -> firefox-93.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/eo.xpi -> firefox-93.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/es-AR.xpi -> firefox-93.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/es-CL.xpi -> firefox-93.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/es-ES.xpi -> firefox-93.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/es-MX.xpi -> firefox-93.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/et.xpi -> firefox-93.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/eu.xpi -> firefox-93.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/fa.xpi -> firefox-93.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ff.xpi -> firefox-93.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/fi.xpi -> firefox-93.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/fr.xpi -> firefox-93.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-93.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-93.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/gd.xpi -> firefox-93.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/gl.xpi -> firefox-93.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/gn.xpi -> firefox-93.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-93.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/he.xpi -> firefox-93.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-93.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/hr.xpi -> firefox-93.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/hsb.xpi -> firefox-93.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/hu.xpi -> firefox-93.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-93.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ia.xpi -> firefox-93.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/id.xpi -> firefox-93.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/is.xpi -> firefox-93.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/it.xpi -> firefox-93.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ja.xpi -> firefox-93.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ka.xpi -> firefox-93.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/kab.xpi -> firefox-93.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/kk.xpi -> firefox-93.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/km.xpi -> firefox-93.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/kn.xpi -> firefox-93.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ko.xpi -> firefox-93.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/lij.xpi -> firefox-93.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/lt.xpi -> firefox-93.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/lv.xpi -> firefox-93.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/mk.xpi -> firefox-93.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/mr.xpi -> firefox-93.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ms.xpi -> firefox-93.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/my.xpi -> firefox-93.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-93.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-93.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/nl.xpi -> firefox-93.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-93.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/oc.xpi -> firefox-93.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-93.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/pl.xpi -> firefox-93.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-93.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-93.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/rm.xpi -> firefox-93.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ro.xpi -> firefox-93.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ru.xpi -> firefox-93.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/si.xpi -> firefox-93.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/sk.xpi -> firefox-93.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/sl.xpi -> firefox-93.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/son.xpi -> firefox-93.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/sq.xpi -> firefox-93.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/sr.xpi -> firefox-93.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-93.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ta.xpi -> firefox-93.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/te.xpi -> firefox-93.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/th.xpi -> firefox-93.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/tl.xpi -> firefox-93.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/tr.xpi -> firefox-93.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/trs.xpi -> firefox-93.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/uk.xpi -> firefox-93.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/ur.xpi -> firefox-93.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/uz.xpi -> firefox-93.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/vi.xpi -> firefox-93.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/xh.xpi -> firefox-93.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-93.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/93.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-93.0-zh-TW.xpi )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=6ae8f9d47d9417e78c1e651ab8fb9a53
diff --git a/metadata/md5-cache/www-client/google-chrome-94.0.4606.81 b/metadata/md5-cache/www-client/google-chrome-94.0.4606.81
deleted file mode 100644
index 7790847d0ef7..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-94.0.4606.81
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=8
-HOMEPAGE=https://www.google.com/chrome
-IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_94.0.4606.81-1_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=25a765c9195f622e934537d38506b698
diff --git a/metadata/md5-cache/www-client/google-chrome-95.0.4638.54 b/metadata/md5-cache/www-client/google-chrome-95.0.4638.54
new file mode 100644
index 000000000000..557da38a0231
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-95.0.4638.54
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=8
+HOMEPAGE=https://www.google.com/chrome
+IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_95.0.4638.54-1_amd64.deb
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=25a765c9195f622e934537d38506b698
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-95.0.4638.40 b/metadata/md5-cache/www-client/google-chrome-beta-95.0.4638.40
deleted file mode 100644
index 82e60b11da54..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-95.0.4638.40
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=8
-HOMEPAGE=https://www.google.com/chrome
-IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_95.0.4638.40-1_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b2d4718df4c59a52b966de28f55f366c
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-95.0.4638.54 b/metadata/md5-cache/www-client/google-chrome-beta-95.0.4638.54
new file mode 100644
index 000000000000..c543ec683dd0
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-95.0.4638.54
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=8
+HOMEPAGE=https://www.google.com/chrome
+IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_95.0.4638.54-1_amd64.deb
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b2d4718df4c59a52b966de28f55f366c
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-96.0.4655.0 b/metadata/md5-cache/www-client/google-chrome-unstable-96.0.4655.0
deleted file mode 100644
index 9b80795238cf..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-96.0.4655.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=8
-HOMEPAGE=https://www.google.com/chrome
-IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_96.0.4655.0-1_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b2d4718df4c59a52b966de28f55f366c
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-96.0.4664.9 b/metadata/md5-cache/www-client/google-chrome-unstable-96.0.4664.9
new file mode 100644
index 000000000000..55f8e40c8b8e
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-96.0.4664.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=8
+HOMEPAGE=https://www.google.com/chrome
+IUSE=selinux kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_96.0.4664.9-1_amd64.deb
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b2d4718df4c59a52b966de28f55f366c
diff --git a/metadata/md5-cache/www-client/links-2.24 b/metadata/md5-cache/www-client/links-2.24
index 8f1f258f8dba..c19c3f46ffe6 100644
--- a/metadata/md5-cache/www-client/links-2.24
+++ b/metadata/md5-cache/www-client/links-2.24
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://links.twibright.com/
 IDEPEND=X? ( dev-util/desktop-file-utils )
 IUSE=brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode X zlib zstd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) freetype? ( media-libs/fontconfig media-libs/freetype ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzip? ( app-arch/lzip ) lzma? ( app-arch/xz-utils ) ssl? ( dev-libs/openssl:0= ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
 REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
 SLOT=2
 SRC_URI=http://links.twibright.com/download/links-2.24.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=7002a5e3eef4f053c9e0b0bb528b1c3f
+_md5_=150d357fa74866991aa4f0a80455fb6b
diff --git a/metadata/md5-cache/www-client/lynx-2.9.0_pre9 b/metadata/md5-cache/www-client/lynx-2.9.0_pre9
index 43553422bcb7..b443acf2b595 100644
--- a/metadata/md5-cache/www-client/lynx-2.9.0_pre9
+++ b/metadata/md5-cache/www-client/lynx-2.9.0_pre9
@@ -4,9 +4,9 @@ DESCRIPTION=An excellent console-based web browser with ssl support
 EAPI=8
 HOMEPAGE=https://lynx.invisible-island.net/
 IUSE=bzip2 cjk gnutls idn nls ssl
-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
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:=[unicode(+)] sys-libs/zlib bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn:0= ) nls? ( virtual/libintl ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2.6.4:= ) )
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/lynx/tarballs/lynx2.9.0dev.9.tar.bz2
-_md5_=5b41abb73c97695712dcd19dc83ec24a
+_md5_=5b3db4388cb09d65e482285e65c6c3fa
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-94.0.992.31 b/metadata/md5-cache/www-client/microsoft-edge-beta-94.0.992.31
deleted file mode 100644
index a7e65be2fe63..000000000000
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-94.0.992.31
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Microsoft
-EAPI=7
-HOMEPAGE=https://www.microsoft.com/en-us/edge
-IUSE=kernel_linux
-KEYWORDS=-* ~amd64
-LICENSE=microsoft-edge
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_94.0.992.31-1_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cb79728769d82d0c18e5a479daecae2d
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.14 b/metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.14
index ada5ceeed0f4..3e3c5637c020 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.14
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.14
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_95.0.1020.14-1_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0add9c6b20bf831441de3c6359e81181
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.20 b/metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.20
new file mode 100644
index 000000000000..b0b2cd3f0c67
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Microsoft
+EAPI=8
+HOMEPAGE=https://www.microsoft.com/en-us/edge
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64
+LICENSE=microsoft-edge
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_95.0.1020.20-1_amd64.deb
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0add9c6b20bf831441de3c6359e81181
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.9 b/metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.9
index 52809c0a5ec7..aa11301c8d71 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.9
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-95.0.1020.9
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_95.0.1020.9-1_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0add9c6b20bf831441de3c6359e81181
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-95.0.1020.5 b/metadata/md5-cache/www-client/microsoft-edge-dev-95.0.1020.5
deleted file mode 100644
index 48ebec3b275d..000000000000
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-95.0.1020.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The web browser from Microsoft
-EAPI=7
-HOMEPAGE=https://www.microsoft.com/en-us/edge
-IUSE=kernel_linux
-KEYWORDS=-* ~amd64
-LICENSE=microsoft-edge
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_95.0.1020.5-1_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cb79728769d82d0c18e5a479daecae2d
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-96.0.1028.0 b/metadata/md5-cache/www-client/microsoft-edge-dev-96.0.1028.0
index d3c89c9ac014..0409802cee0d 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-96.0.1028.0
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-96.0.1028.0
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_96.0.1028.0-1_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0add9c6b20bf831441de3c6359e81181
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-96.0.1032.0 b/metadata/md5-cache/www-client/microsoft-edge-dev-96.0.1032.0
index d6f732f08023..63ebd2eeae2b 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-96.0.1032.0
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-96.0.1032.0
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-mis
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_96.0.1032.0-1_amd64.deb
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=0add9c6b20bf831441de3c6359e81181
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-96.0.1043.1 b/metadata/md5-cache/www-client/microsoft-edge-dev-96.0.1043.1
new file mode 100644
index 000000000000..6d99832de492
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-96.0.1043.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Microsoft
+EAPI=8
+HOMEPAGE=https://www.microsoft.com/en-us/edge
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64
+LICENSE=microsoft-edge
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_96.0.1043.1-1_amd64.deb
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=0add9c6b20bf831441de3c6359e81181
diff --git a/metadata/md5-cache/www-client/opera-80.0.4170.16 b/metadata/md5-cache/www-client/opera-80.0.4170.16
deleted file mode 100644
index bf4accc61da7..000000000000
--- a/metadata/md5-cache/www-client/opera-80.0.4170.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst pretend setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=8
-HOMEPAGE=https://www.opera.com/
-IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64
-LICENSE=OPERA-2018
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/80.0.4170.16/linux/opera-stable_80.0.4170.16_amd64.deb https://download2.operacdn.com/pub/opera/desktop/80.0.4170.16/linux/opera-stable_80.0.4170.16_amd64.deb https://download3.operacdn.com/pub/opera/desktop/80.0.4170.16/linux/opera-stable_80.0.4170.16_amd64.deb https://download4.operacdn.com/pub/opera/desktop/80.0.4170.16/linux/opera-stable_80.0.4170.16_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-94.0.4603.0.tar.xz )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=21b332bdd157adacc07e77ae07776a04
diff --git a/metadata/md5-cache/www-client/opera-80.0.4170.40 b/metadata/md5-cache/www-client/opera-80.0.4170.40
new file mode 100644
index 000000000000..2d9ba7d09d39
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-80.0.4170.40
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst pretend setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=8
+HOMEPAGE=https://www.opera.com/
+IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* amd64
+LICENSE=OPERA-2018
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/80.0.4170.40/linux/opera-stable_80.0.4170.40_amd64.deb https://download2.operacdn.com/pub/opera/desktop/80.0.4170.40/linux/opera-stable_80.0.4170.40_amd64.deb https://download3.operacdn.com/pub/opera/desktop/80.0.4170.40/linux/opera-stable_80.0.4170.40_amd64.deb https://download4.operacdn.com/pub/opera/desktop/80.0.4170.40/linux/opera-stable_80.0.4170.40_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-94.0.4603.0.tar.xz )
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=21b332bdd157adacc07e77ae07776a04
diff --git a/metadata/md5-cache/www-client/opera-beta-80.0.4170.11 b/metadata/md5-cache/www-client/opera-beta-80.0.4170.11
index fcfe3db703b4..d511075a4365 100644
--- a/metadata/md5-cache/www-client/opera-beta-80.0.4170.11
+++ b/metadata/md5-cache/www-client/opera-beta-80.0.4170.11
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-beta/80.0.4170.11/linux/opera-beta_80.0.4170.11_amd64.deb https://download2.operacdn.com/pub/opera-beta/80.0.4170.11/linux/opera-beta_80.0.4170.11_amd64.deb https://download3.operacdn.com/pub/opera-beta/80.0.4170.11/linux/opera-beta_80.0.4170.11_amd64.deb https://download4.operacdn.com/pub/opera-beta/80.0.4170.11/linux/opera-beta_80.0.4170.11_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-94.0.4603.0.tar.xz )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3ce7245490299a0b169fb4e794bb84e0
diff --git a/metadata/md5-cache/www-client/opera-beta-80.0.4170.4 b/metadata/md5-cache/www-client/opera-beta-80.0.4170.4
deleted file mode 100644
index a6b093a96e9a..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-80.0.4170.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst pretend setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=8
-HOMEPAGE=https://www.opera.com/
-IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=OPERA-2018
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-beta/80.0.4170.4/linux/opera-beta_80.0.4170.4_amd64.deb https://download2.operacdn.com/pub/opera-beta/80.0.4170.4/linux/opera-beta_80.0.4170.4_amd64.deb https://download3.operacdn.com/pub/opera-beta/80.0.4170.4/linux/opera-beta_80.0.4170.4_amd64.deb https://download4.operacdn.com/pub/opera-beta/80.0.4170.4/linux/opera-beta_80.0.4170.4_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-94.0.4603.0.tar.xz )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3ce7245490299a0b169fb4e794bb84e0
diff --git a/metadata/md5-cache/www-client/opera-beta-80.0.4170.7 b/metadata/md5-cache/www-client/opera-beta-80.0.4170.7
index 4bfd8723e90c..71aebee726fe 100644
--- a/metadata/md5-cache/www-client/opera-beta-80.0.4170.7
+++ b/metadata/md5-cache/www-client/opera-beta-80.0.4170.7
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-beta/80.0.4170.7/linux/opera-beta_80.0.4170.7_amd64.deb https://download2.operacdn.com/pub/opera-beta/80.0.4170.7/linux/opera-beta_80.0.4170.7_amd64.deb https://download3.operacdn.com/pub/opera-beta/80.0.4170.7/linux/opera-beta_80.0.4170.7_amd64.deb https://download4.operacdn.com/pub/opera-beta/80.0.4170.7/linux/opera-beta_80.0.4170.7_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-94.0.4603.0.tar.xz )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3ce7245490299a0b169fb4e794bb84e0
diff --git a/metadata/md5-cache/www-client/opera-beta-81.0.4196.11 b/metadata/md5-cache/www-client/opera-beta-81.0.4196.11
new file mode 100644
index 000000000000..55fef79f027b
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-81.0.4196.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst pretend setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=8
+HOMEPAGE=https://www.opera.com/
+IUSE=+proprietary-codecs suid kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=OPERA-2018
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera-beta/81.0.4196.11/linux/opera-beta_81.0.4196.11_amd64.deb https://download2.operacdn.com/pub/opera-beta/81.0.4196.11/linux/opera-beta_81.0.4196.11_amd64.deb https://download3.operacdn.com/pub/opera-beta/81.0.4196.11/linux/opera-beta_81.0.4196.11_amd64.deb https://download4.operacdn.com/pub/opera-beta/81.0.4196.11/linux/opera-beta_81.0.4196.11_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-94.0.4603.0.tar.xz )
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3ce7245490299a0b169fb4e794bb84e0
diff --git a/metadata/md5-cache/www-client/opera-developer-81.0.4175.0 b/metadata/md5-cache/www-client/opera-developer-81.0.4175.0
index 697075448a4a..bc492ae17241 100644
--- a/metadata/md5-cache/www-client/opera-developer-81.0.4175.0
+++ b/metadata/md5-cache/www-client/opera-developer-81.0.4175.0
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-developer/81.0.4175.0/linux/opera-developer_81.0.4175.0_amd64.rpm https://download2.operacdn.com/pub/opera-developer/81.0.4175.0/linux/opera-developer_81.0.4175.0_amd64.rpm https://download3.operacdn.com/pub/opera-developer/81.0.4175.0/linux/opera-developer_81.0.4175.0_amd64.rpm https://download4.operacdn.com/pub/opera-developer/81.0.4175.0/linux/opera-developer_81.0.4175.0_amd64.rpm proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-94.0.4603.0.tar.xz )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=92784f25e3b3f88b20c586b92647b423
diff --git a/metadata/md5-cache/www-client/opera-developer-81.0.4189.0 b/metadata/md5-cache/www-client/opera-developer-81.0.4189.0
index 4d370ec3c518..a1883626d43e 100644
--- a/metadata/md5-cache/www-client/opera-developer-81.0.4189.0
+++ b/metadata/md5-cache/www-client/opera-developer-81.0.4189.0
@@ -10,5 +10,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-developer/81.0.4189.0/linux/opera-developer_81.0.4189.0_amd64.rpm https://download2.operacdn.com/pub/opera-developer/81.0.4189.0/linux/opera-developer_81.0.4189.0_amd64.rpm https://download3.operacdn.com/pub/opera-developer/81.0.4189.0/linux/opera-developer_81.0.4189.0_amd64.rpm https://download4.operacdn.com/pub/opera-developer/81.0.4189.0/linux/opera-developer_81.0.4189.0_amd64.rpm proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-94.0.4603.0.tar.xz )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=92784f25e3b3f88b20c586b92647b423
diff --git a/metadata/md5-cache/www-client/opera-developer-81.0.4196.0 b/metadata/md5-cache/www-client/opera-developer-81.0.4196.0
index d34d31dae890..583725581eab 100644
--- a/metadata/md5-cache/www-client/opera-developer-81.0.4196.0
+++ b/metadata/md5-cache/www-client/opera-developer-81.0.4196.0
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-lib
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera-developer/81.0.4196.0/linux/opera-developer_81.0.4196.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/81.0.4196.0/linux/opera-developer_81.0.4196.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/81.0.4196.0/linux/opera-developer_81.0.4196.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/81.0.4196.0/linux/opera-developer_81.0.4196.0_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-94.0.4603.0.tar.xz )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=3ce7245490299a0b169fb4e794bb84e0
diff --git a/metadata/md5-cache/www-client/qutebrowser-2.2.3-r1 b/metadata/md5-cache/www-client/qutebrowser-2.2.3-r1
deleted file mode 100644
index db4583cc0e02..000000000000
--- a/metadata/md5-cache/www-client/qutebrowser-2.2.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/asciidoc test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markupsafe[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,libyaml] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] adblock? ( dev-python/adblock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
-EAPI=7
-HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
-IUSE=+adblock test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markupsafe[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,libyaml] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] adblock? ( dev-python/adblock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v2.2.3/qutebrowser-2.2.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b75c6a60dd345c917354d2c0896aa2c9
diff --git a/metadata/md5-cache/www-client/qutebrowser-2.3.0 b/metadata/md5-cache/www-client/qutebrowser-2.3.0
deleted file mode 100644
index be67b7100033..000000000000
--- a/metadata/md5-cache/www-client/qutebrowser-2.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/asciidoc test? ( >=dev-python/colorama-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)?] ) >=dev-python/jinja-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/markupsafe-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,libyaml] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] adblock? ( dev-python/adblock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
-EAPI=7
-HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
-IUSE=+adblock test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-python/colorama-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)?] ) >=dev-python/jinja-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/markupsafe-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,libyaml] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] adblock? ( dev-python/adblock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v2.3.0/qutebrowser-2.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8cfbb6090e2eb071494a821d65aace10
diff --git a/metadata/md5-cache/www-client/qutebrowser-2.3.1 b/metadata/md5-cache/www-client/qutebrowser-2.3.1
deleted file mode 100644
index 7b8a81d46930..000000000000
--- a/metadata/md5-cache/www-client/qutebrowser-2.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/asciidoc test? ( >=dev-python/colorama-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)?] ) >=dev-python/jinja-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/markupsafe-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,libyaml] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] adblock? ( dev-python/adblock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DESCRIPTION=Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
-EAPI=8
-HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
-IUSE=+adblock test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-python/colorama-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)?] ) >=dev-python/jinja-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/markupsafe-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,libyaml] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] adblock? ( dev-python/adblock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v2.3.1/qutebrowser-2.3.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=87316684e9a89be031006c3d19580b47
diff --git a/metadata/md5-cache/www-client/qutebrowser-2.3.1-r1 b/metadata/md5-cache/www-client/qutebrowser-2.3.1-r1
new file mode 100644
index 000000000000..696a501ac565
--- /dev/null
+++ b/metadata/md5-cache/www-client/qutebrowser-2.3.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-text/asciidoc test? ( >=dev-python/colorama-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)?] ) >=dev-python/jinja-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/markupsafe-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,libyaml(+)] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] adblock? ( dev-python/adblock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DESCRIPTION=Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
+EAPI=8
+HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
+IUSE=+adblock test test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-python/colorama-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)?] ) >=dev-python/jinja-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/markupsafe-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,libyaml(+)] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] adblock? ( dev-python/adblock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v2.3.1/qutebrowser-2.3.1.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=697d0499f6513fb18a6ef0fd1dafe4b7
diff --git a/metadata/md5-cache/www-client/qutebrowser-2.3.1-r2 b/metadata/md5-cache/www-client/qutebrowser-2.3.1-r2
new file mode 100644
index 000000000000..d653d99a9abb
--- /dev/null
+++ b/metadata/md5-cache/www-client/qutebrowser-2.3.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=app-text/asciidoc python_single_target_python3_8? ( test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cheroot[python_targets_python3_8(-)] dev-python/flask[python_targets_python3_8(-)] dev-python/hypothesis[python_targets_python3_8(-)] dev-python/pytest-bdd[python_targets_python3_8(-)] dev-python/pytest-mock[python_targets_python3_8(-)] dev-python/pytest-qt[python_targets_python3_8(-)] dev-python/pytest-rerunfailures[python_targets_python3_8(-)] dev-python/pytest-xvfb[python_targets_python3_8(-)] dev-python/tldextract[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cheroot[python_targets_python3_9(-)] dev-python/flask[python_targets_python3_9(-)] dev-python/hypothesis[python_targets_python3_9(-)] dev-python/pytest-bdd[python_targets_python3_9(-)] dev-python/pytest-mock[python_targets_python3_9(-)] dev-python/pytest-qt[python_targets_python3_9(-)] dev-python/pytest-rerunfailures[python_targets_python3_9(-)] dev-python/pytest-xvfb[python_targets_python3_9(-)] dev-python/tldextract[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cheroot[python_targets_python3_10(-)] dev-python/flask[python_targets_python3_10(-)] dev-python/hypothesis[python_targets_python3_10(-)] dev-python/pytest-bdd[python_targets_python3_10(-)] dev-python/pytest-mock[python_targets_python3_10(-)] dev-python/pytest-qt[python_targets_python3_10(-)] dev-python/pytest-rerunfailures[python_targets_python3_10(-)] dev-python/pytest-xvfb[python_targets_python3_10(-)] dev-python/tldextract[python_targets_python3_10(-)] ) ) test? ( dev-qt/qtcore:5[icu] dev-qt/qtgui:5[png] python_single_target_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)] ) python_single_target_python3_8? ( >=dev-python/colorama-0.4.4[python_targets_python3_8(-)] >=dev-python/jinja-3.0.1[python_targets_python3_8(-)] >=dev-python/markupsafe-2.0.1[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[python_targets_python3_8(-),dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)] >=dev-python/pyyaml-5.4.1[python_targets_python3_8(-),libyaml(+)] dev-python/typing-extensions[python_targets_python3_8(-)] dev-python/zipp[python_targets_python3_8(-)] adblock? ( dev-python/adblock[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( >=dev-python/colorama-0.4.4[python_targets_python3_9(-)] >=dev-python/jinja-3.0.1[python_targets_python3_9(-)] >=dev-python/markupsafe-2.0.1[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/PyQt5[python_targets_python3_9(-),dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_9(-)] >=dev-python/pyyaml-5.4.1[python_targets_python3_9(-),libyaml(+)] dev-python/typing-extensions[python_targets_python3_9(-)] dev-python/zipp[python_targets_python3_9(-)] adblock? ( dev-python/adblock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/colorama-0.4.4[python_targets_python3_10(-)] >=dev-python/jinja-3.0.1[python_targets_python3_10(-)] >=dev-python/markupsafe-2.0.1[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/PyQt5[python_targets_python3_10(-),dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_10(-)] >=dev-python/pyyaml-5.4.1[python_targets_python3_10(-),libyaml(+)] dev-python/typing-extensions[python_targets_python3_10(-)] dev-python/zipp[python_targets_python3_10(-)] adblock? ( dev-python/adblock[python_targets_python3_10(-)] ) ) widevine? ( www-plugins/chrome-binary-plugins ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-4.5.0[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DESCRIPTION=Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
+EAPI=8
+HOMEPAGE=https://www.qutebrowser.org/
+IUSE=+adblock widevine test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5[icu] dev-qt/qtgui:5[png] python_single_target_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)] ) python_single_target_python3_8? ( >=dev-python/colorama-0.4.4[python_targets_python3_8(-)] >=dev-python/jinja-3.0.1[python_targets_python3_8(-)] >=dev-python/markupsafe-2.0.1[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[python_targets_python3_8(-),dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)] >=dev-python/pyyaml-5.4.1[python_targets_python3_8(-),libyaml(+)] dev-python/typing-extensions[python_targets_python3_8(-)] dev-python/zipp[python_targets_python3_8(-)] adblock? ( dev-python/adblock[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( >=dev-python/colorama-0.4.4[python_targets_python3_9(-)] >=dev-python/jinja-3.0.1[python_targets_python3_9(-)] >=dev-python/markupsafe-2.0.1[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/PyQt5[python_targets_python3_9(-),dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_9(-)] >=dev-python/pyyaml-5.4.1[python_targets_python3_9(-),libyaml(+)] dev-python/typing-extensions[python_targets_python3_9(-)] dev-python/zipp[python_targets_python3_9(-)] adblock? ( dev-python/adblock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/colorama-0.4.4[python_targets_python3_10(-)] >=dev-python/jinja-3.0.1[python_targets_python3_10(-)] >=dev-python/markupsafe-2.0.1[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/PyQt5[python_targets_python3_10(-),dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_10(-)] >=dev-python/pyyaml-5.4.1[python_targets_python3_10(-),libyaml(+)] dev-python/typing-extensions[python_targets_python3_10(-)] dev-python/zipp[python_targets_python3_10(-)] adblock? ( dev-python/adblock[python_targets_python3_10(-)] ) ) widevine? ( www-plugins/chrome-binary-plugins ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v2.3.1/qutebrowser-2.3.1.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=14f48a91278c1afc9780c7abfb55a734
diff --git a/metadata/md5-cache/www-client/qutebrowser-9999 b/metadata/md5-cache/www-client/qutebrowser-9999
index 2bda4e817852..0ea03f948cb2 100644
--- a/metadata/md5-cache/www-client/qutebrowser-9999
+++ b/metadata/md5-cache/www-client/qutebrowser-9999
@@ -1,14 +1,14 @@
-BDEPEND=app-text/asciidoc test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cssutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markupsafe[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pypeg2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,libyaml] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+BDEPEND=app-text/asciidoc python_single_target_python3_8? ( test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cheroot[python_targets_python3_8(-)] dev-python/flask[python_targets_python3_8(-)] dev-python/hypothesis[python_targets_python3_8(-)] dev-python/pytest-bdd[python_targets_python3_8(-)] dev-python/pytest-mock[python_targets_python3_8(-)] dev-python/pytest-qt[python_targets_python3_8(-)] dev-python/pytest-rerunfailures[python_targets_python3_8(-)] dev-python/pytest-xvfb[python_targets_python3_8(-)] dev-python/tldextract[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cheroot[python_targets_python3_9(-)] dev-python/flask[python_targets_python3_9(-)] dev-python/hypothesis[python_targets_python3_9(-)] dev-python/pytest-bdd[python_targets_python3_9(-)] dev-python/pytest-mock[python_targets_python3_9(-)] dev-python/pytest-qt[python_targets_python3_9(-)] dev-python/pytest-rerunfailures[python_targets_python3_9(-)] dev-python/pytest-xvfb[python_targets_python3_9(-)] dev-python/tldextract[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cheroot[python_targets_python3_10(-)] dev-python/flask[python_targets_python3_10(-)] dev-python/hypothesis[python_targets_python3_10(-)] dev-python/pytest-bdd[python_targets_python3_10(-)] dev-python/pytest-mock[python_targets_python3_10(-)] dev-python/pytest-qt[python_targets_python3_10(-)] dev-python/pytest-rerunfailures[python_targets_python3_10(-)] dev-python/pytest-xvfb[python_targets_python3_10(-)] dev-python/tldextract[python_targets_python3_10(-)] ) ) test? ( dev-qt/qtcore:5[icu] dev-qt/qtgui:5[png] python_single_target_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)] ) python_single_target_python3_8? ( >=dev-python/colorama-0.4.4[python_targets_python3_8(-)] >=dev-python/jinja-3.0.2[python_targets_python3_8(-)] >=dev-python/markupsafe-2.0.1[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[python_targets_python3_8(-),dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)] >=dev-python/pyyaml-5.4.1[python_targets_python3_8(-),libyaml(+)] >=dev-python/typing-extensions-3.10.0.2[python_targets_python3_8(-)] >=dev-python/zipp-3.6.0[python_targets_python3_8(-)] adblock? ( dev-python/adblock[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( >=dev-python/colorama-0.4.4[python_targets_python3_9(-)] >=dev-python/jinja-3.0.2[python_targets_python3_9(-)] >=dev-python/markupsafe-2.0.1[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/PyQt5[python_targets_python3_9(-),dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_9(-)] >=dev-python/pyyaml-5.4.1[python_targets_python3_9(-),libyaml(+)] >=dev-python/typing-extensions-3.10.0.2[python_targets_python3_9(-)] >=dev-python/zipp-3.6.0[python_targets_python3_9(-)] adblock? ( dev-python/adblock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/colorama-0.4.4[python_targets_python3_10(-)] >=dev-python/jinja-3.0.2[python_targets_python3_10(-)] >=dev-python/markupsafe-2.0.1[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/PyQt5[python_targets_python3_10(-),dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_10(-)] >=dev-python/pyyaml-5.4.1[python_targets_python3_10(-),libyaml(+)] >=dev-python/typing-extensions-3.10.0.2[python_targets_python3_10(-)] >=dev-python/zipp-3.6.0[python_targets_python3_10(-)] adblock? ( dev-python/adblock[python_targets_python3_10(-)] ) ) widevine? ( www-plugins/chrome-binary-plugins ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-4.5.0[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] ) >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 DESCRIPTION=Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
 EAPI=8
-HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
-IUSE=scripts test test python_targets_python3_8 python_targets_python3_9
+HOMEPAGE=https://www.qutebrowser.org/
+IUSE=+adblock widevine test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cssutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/markupsafe[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pypeg2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-5.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,libyaml] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
+RDEPEND=dev-qt/qtcore:5[icu] dev-qt/qtgui:5[png] python_single_target_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)] ) python_single_target_python3_8? ( >=dev-python/colorama-0.4.4[python_targets_python3_8(-)] >=dev-python/jinja-3.0.2[python_targets_python3_8(-)] >=dev-python/markupsafe-2.0.1[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[python_targets_python3_8(-),dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)] >=dev-python/pyyaml-5.4.1[python_targets_python3_8(-),libyaml(+)] >=dev-python/typing-extensions-3.10.0.2[python_targets_python3_8(-)] >=dev-python/zipp-3.6.0[python_targets_python3_8(-)] adblock? ( dev-python/adblock[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( >=dev-python/colorama-0.4.4[python_targets_python3_9(-)] >=dev-python/jinja-3.0.2[python_targets_python3_9(-)] >=dev-python/markupsafe-2.0.1[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/PyQt5[python_targets_python3_9(-),dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_9(-)] >=dev-python/pyyaml-5.4.1[python_targets_python3_9(-),libyaml(+)] >=dev-python/typing-extensions-3.10.0.2[python_targets_python3_9(-)] >=dev-python/zipp-3.6.0[python_targets_python3_9(-)] adblock? ( dev-python/adblock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/colorama-0.4.4[python_targets_python3_10(-)] >=dev-python/jinja-3.0.2[python_targets_python3_10(-)] >=dev-python/markupsafe-2.0.1[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/PyQt5[python_targets_python3_10(-),dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_10(-)] >=dev-python/pyyaml-5.4.1[python_targets_python3_10(-),libyaml(+)] >=dev-python/typing-extensions-3.10.0.2[python_targets_python3_10(-)] >=dev-python/zipp-3.6.0[python_targets_python3_10(-)] adblock? ( dev-python/adblock[python_targets_python3_10(-)] ) ) widevine? ( www-plugins/chrome-binary-plugins ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=cffa093d8867746d8c2fdf5732c07ef9
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1ec0a646d3e16d27bcf0392ef6bd8fbf
diff --git a/metadata/md5-cache/www-client/surf-2.1 b/metadata/md5-cache/www-client/surf-2.1
index 0a6df1a57977..ced77da63da1 100644
--- a/metadata/md5-cache/www-client/surf-2.1
+++ b/metadata/md5-cache/www-client/surf-2.1
@@ -5,10 +5,10 @@ DESCRIPTION=a simple web browser based on WebKit/GTK+
 EAPI=7
 HOMEPAGE=https://surf.suckless.org/
 IUSE=tabbed savedconfig
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11 !sci-chemistry/surf !savedconfig? ( net-misc/curl x11-apps/xprop x11-misc/dmenu x11-terms/st ) tabbed? ( x11-misc/tabbed )
 SLOT=0
 SRC_URI=https://dl.suckless.org/surf/surf-2.1.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ef647d762a1ff8df860c549e2bbe3f8f
+_md5_=de657817d86a328a46cb6d790fa50045
diff --git a/metadata/md5-cache/www-client/vivaldi-3.7.2218.58 b/metadata/md5-cache/www-client/vivaldi-3.7.2218.58
index 5db55cef99a6..7d8d1cdc7558 100644
--- a/metadata/md5-cache/www-client/vivaldi-3.7.2218.58
+++ b/metadata/md5-cache/www-client/vivaldi-3.7.2218.58
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/als
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.7.2218.58-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.7.2218.58-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.7.2218.58-1_arm64.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.7.2218.58-1_i386.deb )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=2a86855f8f06cc5b1276b0f5f7dbeff2
diff --git a/metadata/md5-cache/www-client/vivaldi-4.1.2369.21 b/metadata/md5-cache/www-client/vivaldi-4.1.2369.21
index 49d87db4b411..c0e284e93213 100644
--- a/metadata/md5-cache/www-client/vivaldi-4.1.2369.21
+++ b/metadata/md5-cache/www-client/vivaldi-4.1.2369.21
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/als
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.1.2369.21-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.1.2369.21-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.1.2369.21-1_arm64.deb )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=85d450b4be07e6001b151344ae41d3bf
diff --git a/metadata/md5-cache/www-client/vivaldi-4.3.2439.39 b/metadata/md5-cache/www-client/vivaldi-4.3.2439.39
index dcab8c877fda..b77b5edecbea 100644
--- a/metadata/md5-cache/www-client/vivaldi-4.3.2439.39
+++ b/metadata/md5-cache/www-client/vivaldi-4.3.2439.39
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/als
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.3.2439.39-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.3.2439.39-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.3.2439.39-1_arm64.deb )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d5055ba9336d4f5cb457c4118545ba02
diff --git a/metadata/md5-cache/www-client/vivaldi-4.3.2439.44 b/metadata/md5-cache/www-client/vivaldi-4.3.2439.44
new file mode 100644
index 000000000000..9b5b9ddd816e
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-4.3.2439.44
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DESCRIPTION=A browser for our friends
+EAPI=8
+HOMEPAGE=https://vivaldi.com/
+IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg-chromium:94 ) widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.3.2439.44-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.3.2439.44-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_4.3.2439.44-1_arm64.deb )
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d5055ba9336d4f5cb457c4118545ba02
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-4.3.2439.41 b/metadata/md5-cache/www-client/vivaldi-snapshot-4.3.2439.41
index c93d6e1cf8fb..d81007ca5ac6 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-4.3.2439.41
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-4.3.2439.41
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/als
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.3.2439.41-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.3.2439.41-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.3.2439.41-1_arm64.deb )
-_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=d5055ba9336d4f5cb457c4118545ba02
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index f25c4c3e5723..5e973a7e15b5 100644
--- a/metadata/md5-cache/www-misc/Manifest.gz
+++ b/metadata/md5-cache/www-misc/Manifest.gz
diff --git a/metadata/md5-cache/www-misc/buku-4.5 b/metadata/md5-cache/www-misc/buku-4.5
deleted file mode 100644
index ed49b948c351..000000000000
--- a/metadata/md5-cache/www-misc/buku-4.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/beautifulsoup4-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/py-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyyaml-4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/vcrpy-4.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
-DESCRIPTION=Powerful command-line bookmark manager
-EAPI=7
-HOMEPAGE=https://github.com/jarun/buku
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-python/beautifulsoup4-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jarun/buku/archive/v4.5.tar.gz -> buku-4.5.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dc805633eef2f90facc36496ac2ed66f
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 847f0baa2050..cb9ca77776e7 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-94.0.4606.81 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-94.0.4606.81
deleted file mode 100644
index 9ae22d60bdbb..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-94.0.4606.81
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=8
-HOMEPAGE=https://www.google.com/chrome
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_94.0.4606.81-1_amd64.deb
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=46c5306777c1d85adde0e74978989a7d
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-95.0.4638.40_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-95.0.4638.40_beta
deleted file mode 100644
index cf414fa9d548..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-95.0.4638.40_beta
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=8
-HOMEPAGE=https://www.google.com/chrome
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_95.0.4638.40-1_amd64.deb
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=a3bf49fa2bf74776e84f08fb8eeebda7
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-95.0.4638.54 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-95.0.4638.54
new file mode 100644
index 000000000000..89cdb1ab91fe
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-95.0.4638.54
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=8
+HOMEPAGE=https://www.google.com/chrome
+KEYWORDS=-* amd64
+LICENSE=google-chrome
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=stable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_95.0.4638.54-1_amd64.deb
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
+_md5_=46c5306777c1d85adde0e74978989a7d
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-95.0.4638.54_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-95.0.4638.54_beta
new file mode 100644
index 000000000000..c37e3f624d57
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-95.0.4638.54_beta
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=8
+HOMEPAGE=https://www.google.com/chrome
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=beta
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_95.0.4638.54-1_amd64.deb
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
+_md5_=a3bf49fa2bf74776e84f08fb8eeebda7
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-96.0.4655.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-96.0.4655.0_alpha
deleted file mode 100644
index 2d1d6d2d5a68..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-96.0.4655.0_alpha
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=8
-HOMEPAGE=https://www.google.com/chrome
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
-RESTRICT=bindist mirror strip
-SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_96.0.4655.0-1_amd64.deb
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=a3bf49fa2bf74776e84f08fb8eeebda7
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-96.0.4664.9_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-96.0.4664.9_alpha
new file mode 100644
index 000000000000..db31cac5a050
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-96.0.4664.9_alpha
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=8
+HOMEPAGE=https://www.google.com/chrome
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
+RESTRICT=bindist mirror strip
+SLOT=unstable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_96.0.4664.9-1_amd64.deb
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
+_md5_=a3bf49fa2bf74776e84f08fb8eeebda7
diff --git a/metadata/md5-cache/www-plugins/passff-host-1.2.2 b/metadata/md5-cache/www-plugins/passff-host-1.2.2
new file mode 100644
index 000000000000..88735b8a1c8a
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/passff-host-1.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup unpack
+DESCRIPTION=Host app for the PassFF WebExtension
+EAPI=7
+HOMEPAGE=https://github.com/passff/passff-host
+IUSE=chrome chromium +firefox vivaldi python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( chrome chromium firefox vivaldi )
+SLOT=0
+SRC_URI=https://github.com/passff/passff-host/releases/download/1.2.2/passff.py -> passff-host-1.2.2.py https://github.com/passff/passff-host/releases/download/1.2.2/passff.json -> passff-host-1.2.2.json
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2899de59fef19a1e84df478f69789c39
diff --git a/metadata/md5-cache/www-plugins/pdfjs-2.10.377 b/metadata/md5-cache/www-plugins/pdfjs-2.10.377
index 279d5579117c..f5fa3a8fd3c7 100644
--- a/metadata/md5-cache/www-plugins/pdfjs-2.10.377
+++ b/metadata/md5-cache/www-plugins/pdfjs-2.10.377
@@ -3,8 +3,8 @@ DEFINED_PHASES=install
 DESCRIPTION=A PDF reader in JavaScript
 EAPI=7
 HOMEPAGE=https://mozilla.github.io/pdf.js/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mozilla/pdf.js/releases/download/v2.10.377/pdfjs-2.10.377-dist.zip -> pdfjs-2.10.377.zip
-_md5_=bd481478d9bd9f47adf5a431849e47e5
+_md5_=348edd18481f76098a10d6020f593425
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index b0607fa95197..e38fdc3c9cd0 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/adsf-1.4.3 b/metadata/md5-cache/www-servers/adsf-1.4.3
index ff55f4640302..550629c36362 100644
--- a/metadata/md5-cache/www-servers/adsf-1.4.3
+++ b/metadata/md5-cache/www-servers/adsf-1.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ddfreyne/adsf/archive/1.4.3.tar.gz -> adsf-1.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=4c454e31df1dc1ba75765500bd74cf48
diff --git a/metadata/md5-cache/www-servers/adsf-1.4.5 b/metadata/md5-cache/www-servers/adsf-1.4.5
index f74492a11dd7..602eb7111f7d 100644
--- a/metadata/md5-cache/www-servers/adsf-1.4.5
+++ b/metadata/md5-cache/www-servers/adsf-1.4.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ddfreyne/adsf/archive/1.4.5.tar.gz -> adsf-1.4.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c97d2de6872157110bad48ad96fab9d6
diff --git a/metadata/md5-cache/www-servers/adsf-1.4.6 b/metadata/md5-cache/www-servers/adsf-1.4.6
index cb8e55151ed5..5e9b974eedc1 100644
--- a/metadata/md5-cache/www-servers/adsf-1.4.6
+++ b/metadata/md5-cache/www-servers/adsf-1.4.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ddfreyne/adsf/archive/1.4.6.tar.gz -> adsf-1.4.6.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c97d2de6872157110bad48ad96fab9d6
diff --git a/metadata/md5-cache/www-servers/caddy-2.4.5 b/metadata/md5-cache/www-servers/caddy-2.4.5
new file mode 100644
index 000000000000..779b03d96c35
--- /dev/null
+++ b/metadata/md5-cache/www-servers/caddy-2.4.5
@@ -0,0 +1,15 @@
+BDEPEND=filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-user/http acct-group/http
+DESCRIPTION=Fast, cross-platform HTTP/2 web server with automatic HTTPS
+EAPI=7
+HOMEPAGE=https://caddyserver.com
+IUSE=+filecaps
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD ECL-2.0 MIT
+RDEPEND=acct-user/http acct-group/http filecaps? ( sys-libs/libcap )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/caddyserver/caddy/archive/v2.4.5.tar.gz -> caddy-2.4.5.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20180421153158-65cc252bf669.mod mirror://goproxy//bitbucket.org/creachadair/shell/@v/v0.0.6.mod -> bitbucket.org%2Fcreachadair%2Fshell%2F@v%2Fv0.0.6.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.31.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.37.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.37.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.39.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.72.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.74.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.75.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.75.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.78.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.79.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.81.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.83.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.83.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.83.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.83.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/spanner/@v/v1.17.0.mod -> cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.17.0.mod mirror://goproxy//cloud.google.com/go/spanner/@v/v1.18.0.mod -> cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.18.0.mod mirror://goproxy//cloud.google.com/go/spanner/@v/v1.20.0.mod -> cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.20.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//code.gitea.io/sdk/gitea/@v/v0.11.3.mod -> code.gitea.io%2Fsdk%2Fgitea%2F@v%2Fv0.11.3.mod mirror://goproxy//contrib.go.opencensus.io/exporter/aws/@v/v0.0.0-20181029163544-2befc13012d0.mod -> contrib.go.opencensus.io%2Fexporter%2Faws%2F@v%2Fv0.0.0-20181029163544-2befc13012d0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/ocagent/@v/v0.5.0.mod -> contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.5.0.mod mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.12.1.mod -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.mod mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.13.5.mod -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.13.5.mod mirror://goproxy//contrib.go.opencensus.io/exporter/stackdriver/@v/v0.13.7.mod -> contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.13.7.mod mirror://goproxy//contrib.go.opencensus.io/integrations/ocsql/@v/v0.1.4.mod -> contrib.go.opencensus.io%2Fintegrations%2Focsql%2F@v%2Fv0.1.4.mod mirror://goproxy//contrib.go.opencensus.io/resource/@v/v0.1.1.mod -> contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.1.1.mod mirror://goproxy//dmitri.shuralyov.com/app/changes/@v/v0.0.0-20180602232624-0a106ad413e3.mod -> dmitri.shuralyov.com%2Fapp%2Fchanges%2F@v%2Fv0.0.0-20180602232624-0a106ad413e3.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//dmitri.shuralyov.com/html/belt/@v/v0.0.0-20180602232347-f7d459c86be0.mod -> dmitri.shuralyov.com%2Fhtml%2Fbelt%2F@v%2Fv0.0.0-20180602232347-f7d459c86be0.mod mirror://goproxy//dmitri.shuralyov.com/service/change/@v/v0.0.0-20181023043359-a85b471d5412.mod -> dmitri.shuralyov.com%2Fservice%2Fchange%2F@v%2Fv0.0.0-20181023043359-a85b471d5412.mod mirror://goproxy//dmitri.shuralyov.com/state/@v/v0.0.0-20180228185332-28bcc343414c.mod -> dmitri.shuralyov.com%2Fstate%2F@v%2Fv0.0.0-20180228185332-28bcc343414c.mod mirror://goproxy//git.apache.org/thrift.git/@v/v0.0.0-20180902110319-2566ecd5d999.mod -> git.apache.org%2Fthrift.git%2F@v%2Fv0.0.0-20180902110319-2566ecd5d999.mod mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190825152654-46b345b51c96.zip -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190825152654-46b345b51c96.zip mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190825152654-46b345b51c96.mod -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190825152654-46b345b51c96.mod mirror://goproxy//github.com/!azure/azure-amqp-common-go/v2/@v/v2.1.0.mod -> github.com%2F!azure%2Fazure-amqp-common-go%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/!azure/azure-pipeline-go/@v/v0.2.1.mod -> github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v29.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv29.0.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v30.1.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv30.1.0+incompatible.mod mirror://goproxy//github.com/!azure/azure-service-bus-go/@v/v0.9.1.mod -> github.com%2F!azure%2Fazure-service-bus-go%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/!azure/azure-storage-blob-go/@v/v0.8.0.mod -> github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v12.0.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.0.0+incompatible.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.1.mod -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/!data!dog/zstd/@v/v1.4.5.mod -> github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.5.mod mirror://goproxy//github.com/!google!cloud!platform/cloudsql-proxy/@v/v0.0.0-20191009163259-e802c2cb94ae.mod -> github.com%2F!google!cloud!platform%2Fcloudsql-proxy%2F@v%2Fv0.0.0-20191009163259-e802c2cb94ae.mod mirror://goproxy//github.com/!knetic/govaluate/@v/v3.0.1-0.20171022003610-9aa49832a739+incompatible.mod -> github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod mirror://goproxy//github.com/!masterminds/glide/@v/v0.13.2.mod -> github.com%2F!masterminds%2Fglide%2F@v%2Fv0.13.2.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.1.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.1.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.4.2.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.0.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.1.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.1.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.1.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.1.mod mirror://goproxy//github.com/!masterminds/sprig/@v/v2.15.0+incompatible.mod -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.15.0+incompatible.mod mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.zip -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.zip mirror://goproxy//github.com/!masterminds/sprig/@v/v2.22.0+incompatible.mod -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.mod mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.1.0.mod -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.2.2.zip -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.2.2.zip mirror://goproxy//github.com/!masterminds/sprig/v3/@v/v3.2.2.mod -> github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.2.2.mod mirror://goproxy//github.com/!masterminds/vcs/@v/v1.13.0.mod -> github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.14.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!shopify/sarama/@v/v1.19.0.mod -> github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod mirror://goproxy//github.com/!shopify/toxiproxy/@v/v2.1.4+incompatible.mod -> github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod mirror://goproxy//github.com/!thales!ignite/crypto11/@v/v1.2.4.mod -> github.com%2F!thales!ignite%2Fcrypto11%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/!thomas!rooney/gexpect/@v/v0.0.0-20161231170123-5482f0350944.mod -> github.com%2F!thomas!rooney%2Fgexpect%2F@v%2Fv0.0.0-20161231170123-5482f0350944.mod mirror://goproxy//github.com/!vivid!cortex/gohistogram/@v/v1.0.0.mod -> github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/afex/hystrix-go/@v/v0.0.0-20180502004556-fa1af6a1f4f5.mod -> github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod mirror://goproxy//github.com/alcortesm/tgz/@v/v0.0.0-20161220082320-9c5fe88206d7.mod -> github.com%2Falcortesm%2Ftgz%2F@v%2Fv0.0.0-20161220082320-9c5fe88206d7.mod mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.zip -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip mirror://goproxy//github.com/alecthomas/assert/@v/v0.0.0-20170929043011-405dbfeb8e38.mod -> github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.7.2-0.20200305040604-4f3623dce67a.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200305040604-4f3623dce67a.mod mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.2.zip -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/alecthomas/chroma/@v/v0.9.2.mod -> github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.zip -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip mirror://goproxy//github.com/alecthomas/colour/@v/v0.0.0-20160524082231-60882d9e2721.mod -> github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod mirror://goproxy//github.com/alecthomas/kingpin/@v/v2.2.6+incompatible.mod -> github.com%2Falecthomas%2Fkingpin%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.1-0.20190708041108-0548c6b1afae.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod mirror://goproxy//github.com/alecthomas/kong/@v/v0.2.4.mod -> github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.zip -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip mirror://goproxy//github.com/alecthomas/repr/@v/v0.0.0-20180818092828-117648cd9897.mod -> github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/antihax/optional/@v/v1.0.0.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200503195918-621b933c7a7f.zip -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200503195918-621b933c7a7f.zip mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20200503195918-621b933c7a7f.mod -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200503195918-621b933c7a7f.mod mirror://goproxy//github.com/aokoli/goutils/@v/v1.0.1.mod -> github.com%2Faokoli%2Fgoutils%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/apache/beam/@v/v2.28.0+incompatible.mod -> github.com%2Fapache%2Fbeam%2F@v%2Fv2.28.0+incompatible.mod mirror://goproxy//github.com/apache/beam/@v/v2.30.0+incompatible.mod -> github.com%2Fapache%2Fbeam%2F@v%2Fv2.30.0+incompatible.mod mirror://goproxy//github.com/apache/thrift/@v/v0.12.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/apache/thrift/@v/v0.13.0.mod -> github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.0.mod mirror://goproxy//github.com/apex/log/@v/v1.1.4.mod -> github.com%2Fapex%2Flog%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/apex/logs/@v/v0.0.4.mod -> github.com%2Fapex%2Flogs%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/aphistic/golf/@v/v0.0.0-20180712155816-02c07f170c5a.mod -> github.com%2Faphistic%2Fgolf%2F@v%2Fv0.0.0-20180712155816-02c07f170c5a.mod mirror://goproxy//github.com/aphistic/sweet/@v/v0.2.0.mod -> github.com%2Faphistic%2Fsweet%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/aryann/difflib/@v/v0.0.0-20170710044230-e206f873d14a.mod -> github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod mirror://goproxy//github.com/aryann/difflib/@v/v0.0.0-20210328193216-ff5ff6dc229b.zip -> github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20210328193216-ff5ff6dc229b.zip mirror://goproxy//github.com/aryann/difflib/@v/v0.0.0-20210328193216-ff5ff6dc229b.mod -> github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20210328193216-ff5ff6dc229b.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/aws/aws-lambda-go/@v/v1.13.3.mod -> github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.15.27.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.27.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.19.18.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.18.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.19.45.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.45.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.20.6.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.20.6.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.23.20.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.23.20.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.11.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.11.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.27.0.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.30.29.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.29.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.0.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.0.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.37.0.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.0.mod mirror://goproxy//github.com/aws/aws-sdk-go-v2/@v/v0.18.0.mod -> github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/aybabtme/rgbterm/@v/v0.0.0-20170906152045-cc83f3b3ce59.mod -> github.com%2Faybabtme%2Frgbterm%2F@v%2Fv0.0.0-20170906152045-cc83f3b3ce59.mod mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.3.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/benbjohnson/clock/@v/v1.1.0.zip -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/benbjohnson/clock/@v/v1.1.0.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/boombuler/barcode/@v/v1.0.1.mod -> github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bradfitz/go-smtpd/@v/v0.0.0-20170404230938-deb6d6237625.mod -> github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20181115193947-bf1c66bbce23.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20181115193947-bf1c66bbce23.mod mirror://goproxy//github.com/caarlos0/ctrlc/@v/v1.0.0.mod -> github.com%2Fcaarlos0%2Fctrlc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/caddyserver/certmagic/@v/v0.14.5.zip -> github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.14.5.zip mirror://goproxy//github.com/caddyserver/certmagic/@v/v0.14.5.mod -> github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.14.5.mod mirror://goproxy//github.com/campoy/unique/@v/v0.0.0-20180121183637-88950e537e7e.mod -> github.com%2Fcampoy%2Funique%2F@v%2Fv0.0.0-20180121183637-88950e537e7e.mod mirror://goproxy//github.com/casbin/casbin/v2/@v/v2.1.2.mod -> github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.mod -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.mod mirror://goproxy//github.com/cenkalti/backoff/@v/v2.2.1+incompatible.mod -> github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.0.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.3.0.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20191021191039-0944d244cd40.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20191021191039-0944d244cd40.mod mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20200922220541-2c3bb06c6054.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20200922220541-2c3bb06c6054.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.zip -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.zip -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/clbanning/x2j/@v/v0.0.0-20191024224557-825249438eec.mod -> github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200629203442-efcf912fb354.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20200714090401-bf6692d28da5.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20200714090401-bf6692d28da5.mod mirror://goproxy//github.com/cockroachdb/errors/@v/v1.2.4.mod -> github.com%2Fcockroachdb%2Ferrors%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/cockroachdb/logtags/@v/v0.0.0-20190617123548-eb05cc24525f.mod -> github.com%2Fcockroachdb%2Flogtags%2F@v%2Fv0.0.0-20190617123548-eb05cc24525f.mod mirror://goproxy//github.com/codahale/hdrhistogram/@v/v0.0.0-20161010025455-3a0bb77429bd.mod -> github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod mirror://goproxy//github.com/codegangsta/cli/@v/v1.20.0.mod -> github.com%2Fcodegangsta%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20181012123002-c6f51f82210d.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.2.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/corpix/uarand/@v/v0.1.1.mod -> github.com%2Fcorpix%2Fuarand%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.11.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.zip -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip mirror://goproxy//github.com/danwakefield/fnmatch/@v/v0.0.0-20160403171240-cbb64ac3d964.mod -> github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20161028175848-04cdfd42973b.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20161028175848-04cdfd42973b.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/devigned/tab/@v/v0.1.1.mod -> github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.2.zip -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.2.zip mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.2.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.0.1-rc1.0.20201003150343-5d1bab4fc658.mod -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.1-rc1.0.20201003150343-5d1bab4fc658.mod mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.2007.4.zip -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.2007.4.zip mirror://goproxy//github.com/dgraph-io/badger/v2/@v/v2.2007.4.mod -> github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.2007.4.mod mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.2.mod -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.3-0.20200630154024-f66de99634de.mod -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.3-0.20200630154024-f66de99634de.mod mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.4-0.20200906165740-41ebdbffecfd.zip -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.4-0.20200906165740-41ebdbffecfd.zip mirror://goproxy//github.com/dgraph-io/ristretto/@v/v0.0.4-0.20200906165740-41ebdbffecfd.mod -> github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.4-0.20200906165740-41ebdbffecfd.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20200201041132-a6ae2369ad13.zip -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20200201041132-a6ae2369ad13.zip mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20200201041132-a6ae2369ad13.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20200201041132-a6ae2369ad13.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.1.6.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.2.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/dlclark/regexp2/@v/v1.4.0.zip -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/dlclark/regexp2/@v/v1.4.0.mod -> github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.1-0.20200219035652-afde56e7acac.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.1-0.20200219035652-afde56e7acac.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.1-0.20200219035652-afde56e7acac.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.1-0.20200219035652-afde56e7acac.mod mirror://goproxy//github.com/eapache/go-resiliency/@v/v1.1.0.mod -> github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/eapache/go-xerial-snappy/@v/v0.0.0-20180814174437-776d5712da21.mod -> github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod mirror://goproxy//github.com/eapache/queue/@v/v1.1.0.mod -> github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/edsrzf/mmap-go/@v/v1.0.0.mod -> github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/emirpasic/gods/@v/v1.12.0.mod -> github.com%2Femirpasic%2Fgods%2F@v%2Fv1.12.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.6.9.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.7.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210217033140-668b12f5399d.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.3.0-java.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.3.0-java.mod mirror://goproxy//github.com/etcd-io/gofail/@v/v0.0.0-20190801230047-ad7f989257ca.mod -> github.com%2Fetcd-io%2Fgofail%2F@v%2Fv0.0.0-20190801230047-ad7f989257ca.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.3+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.3+incompatible.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.2.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/fortytw2/leaktest/@v/v1.3.0.mod -> github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/francoispqt/gojay/@v/v1.2.13.mod -> github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.mod mirror://goproxy//github.com/franela/goblin/@v/v0.0.0-20200105215937-c9ffbefa60db.mod -> github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod mirror://goproxy//github.com/franela/goreq/@v/v0.0.0-20171204163338-bcd34c9993f8.mod -> github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/fullstorydev/grpcurl/@v/v1.8.0.mod -> github.com%2Ffullstorydev%2Fgrpcurl%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/fullstorydev/grpcurl/@v/v1.8.1.mod -> github.com%2Ffullstorydev%2Fgrpcurl%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.mod -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.1.1.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/go-chi/chi/@v/v4.0.2+incompatible.mod -> github.com%2Fgo-chi%2Fchi%2F@v%2Fv4.0.2+incompatible.mod mirror://goproxy//github.com/go-chi/chi/@v/v4.1.2+incompatible.zip -> github.com%2Fgo-chi%2Fchi%2F@v%2Fv4.1.2+incompatible.zip mirror://goproxy//github.com/go-chi/chi/@v/v4.1.2+incompatible.mod -> github.com%2Fgo-chi%2Fchi%2F@v%2Fv4.1.2+incompatible.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.25.4.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.4.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.zip -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/go-kit/kit/@v/v0.10.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/go-kit/log/@v/v0.1.0.mod -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.zip -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-piv/piv-go/@v/v1.7.0.mod -> github.com%2Fgo-piv%2Fpiv-go%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/go-redis/redis/@v/v6.15.9+incompatible.mod -> github.com%2Fgo-redis%2Fredis%2F@v%2Fv6.15.9+incompatible.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.4.1.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.5.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.6.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.6.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.6.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-task/slim-sprig/@v/v0.0.0-20210107165309-348f09dbbbc0.zip -> github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.zip mirror://goproxy//github.com/go-task/slim-sprig/@v/v0.0.0-20210107165309-348f09dbbbc0.mod -> github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.0.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.mod mirror://goproxy//github.com/golang/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/mock/@v/v1.5.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.6.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.6.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.0-20180518054509-2e65f85255db.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.2.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.3.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.3.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/btree/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/cel-go/@v/v0.7.3.zip -> github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.7.3.zip mirror://goproxy//github.com/google/cel-go/@v/v0.7.3.mod -> github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.7.3.mod mirror://goproxy//github.com/google/cel-spec/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fcel-spec%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/certificate-transparency-go/@v/v1.0.21.mod -> github.com%2Fgoogle%2Fcertificate-transparency-go%2F@v%2Fv1.0.21.mod mirror://goproxy//github.com/google/certificate-transparency-go/@v/v1.1.2-0.20210422104406-9f33727a7a18.mod -> github.com%2Fgoogle%2Fcertificate-transparency-go%2F@v%2Fv1.1.2-0.20210422104406-9f33727a7a18.mod mirror://goproxy//github.com/google/certificate-transparency-go/@v/v1.1.2-0.20210512142713-bed466244fa6.mod -> github.com%2Fgoogle%2Fcertificate-transparency-go%2F@v%2Fv1.1.2-0.20210512142713-bed466244fa6.mod mirror://goproxy//github.com/google/certificate-transparency-go/@v/v1.1.2-0.20210623111010-a50f74f4ce95.mod -> github.com%2Fgoogle%2Fcertificate-transparency-go%2F@v%2Fv1.1.2-0.20210623111010-a50f74f4ce95.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/google/go-github/@v/v17.0.0+incompatible.mod -> github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod mirror://goproxy//github.com/google/go-github/v28/@v/v28.1.1.mod -> github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.mod mirror://goproxy//github.com/google/go-licenses/@v/v0.0.0-20210329231322-ce1d9163b77d.mod -> github.com%2Fgoogle%2Fgo-licenses%2F@v%2Fv0.0.0-20210329231322-ce1d9163b77d.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-replayers/grpcreplay/@v/v0.1.0.mod -> github.com%2Fgoogle%2Fgo-replayers%2Fgrpcreplay%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/go-replayers/httpreplay/@v/v0.1.0.mod -> github.com%2Fgoogle%2Fgo-replayers%2Fhttpreplay%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/licenseclassifier/@v/v0.0.0-20210325184830-bb04aff29e72.mod -> github.com%2Fgoogle%2Flicenseclassifier%2F@v%2Fv0.0.0-20210325184830-bb04aff29e72.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/@v/v2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.2.1.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.2.1.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201023163331-3e6fc7fc9c4c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201203190320-1bf35d6f28c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201218002935-b9804c9f04c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201218002935-b9804c9f04c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210122040257-d980be63207e.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210226084205-cbba55b83ad5.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.mod -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.mod mirror://goproxy//github.com/google/subcommands/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/trillian/@v/v1.3.14-0.20210409160123-c5ea3abd4a41.mod -> github.com%2Fgoogle%2Ftrillian%2F@v%2Fv1.3.14-0.20210409160123-c5ea3abd4a41.mod mirror://goproxy//github.com/google/trillian/@v/v1.3.14-0.20210511103300-67b5f349eefa.mod -> github.com%2Fgoogle%2Ftrillian%2F@v%2Fv1.3.14-0.20210511103300-67b5f349eefa.mod mirror://goproxy//github.com/google/trillian/@v/v1.3.14-0.20210622121126-870e0cdde059.mod -> github.com%2Fgoogle%2Ftrillian%2F@v%2Fv1.3.14-0.20210622121126-870e0cdde059.mod mirror://goproxy//github.com/google/uuid/@v/v0.0.0-20161128191214-064e2069ce9c.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv0.0.0-20161128191214-064e2069ce9c.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.3.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.3.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/google/wire/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fwire%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.0+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.zip -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.zip mirror://goproxy//github.com/googleapis/gax-go/@v/v2.0.2+incompatible.mod -> github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.3.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.3.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gordonklaus/ineffassign/@v/v0.0.0-20200309095847-7953dde2c7bf.mod -> github.com%2Fgordonklaus%2Fineffassign%2F@v%2Fv0.0.0-20200309095847-7953dde2c7bf.mod mirror://goproxy//github.com/goreleaser/goreleaser/@v/v0.134.0.mod -> github.com%2Fgoreleaser%2Fgoreleaser%2F@v%2Fv0.134.0.mod mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.2.1.mod -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gorilla/context/@v/v0.0.0-20160226214623-1ea25387ff6f.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv0.0.0-20160226214623-1ea25387ff6f.mod mirror://goproxy//github.com/gorilla/context/@v/v1.1.1.mod -> github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.6.2.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/groob/finalizer/@v/v0.0.0-20170707115354-4c2ed49aabda.mod -> github.com%2Fgroob%2Ffinalizer%2F@v%2Fv0.0.0-20170707115354-4c2ed49aabda.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.2.2.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.3.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.5.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.8.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.2.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.2.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.14.6.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.14.6.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.16.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.3.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.6.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.4.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.0.0.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.2.0.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.1.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.3.1.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/hudl/fargo/@v/v1.3.0.mod -> github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/icrowley/fake/@v/v0.0.0-20180203215853-4178557ae428.mod -> github.com%2Ficrowley%2Ffake%2F@v%2Fv0.0.0-20180203215853-4178557ae428.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.4.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.9.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.11.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/influxdata/influxdb1-client/@v/v0.0.0-20191209144304-8bf82d3c094d.mod -> github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v1.0.5.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/jbenet/go-context/@v/v0.0.0-20150711004518-d14ea06fba99.mod -> github.com%2Fjbenet%2Fgo-context%2F@v%2Fv0.0.0-20150711004518-d14ea06fba99.mod mirror://goproxy//github.com/jellevandenhooff/dkim/@v/v0.0.0-20150330215556-f50fe3d243e1.mod -> github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/jhump/protoreflect/@v/v1.6.1.mod -> github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/jhump/protoreflect/@v/v1.8.2.mod -> github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.8.2.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160202185014-0b12d6b521d8.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.3.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/joho/godotenv/@v/v1.3.0.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.2.2.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/jpillora/backoff/@v/v0.0.0-20180909062703-3050d21c67d7.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/juju/ansiterm/@v/v0.0.0-20180109212912-720a0952cc2a.zip -> github.com%2Fjuju%2Fansiterm%2F@v%2Fv0.0.0-20180109212912-720a0952cc2a.zip mirror://goproxy//github.com/juju/ansiterm/@v/v0.0.0-20180109212912-720a0952cc2a.mod -> github.com%2Fjuju%2Fansiterm%2F@v%2Fv0.0.0-20180109212912-720a0952cc2a.mod mirror://goproxy//github.com/juju/ratelimit/@v/v1.0.1.mod -> github.com%2Fjuju%2Fratelimit%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kevinburke/ssh_config/@v/v0.0.0-20190725054713-01f96b0aa0cd.mod -> github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20190725054713-01f96b0aa0cd.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.12.3.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.3.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.13.4.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.13.4.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.13.4.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.13.4.mod mirror://goproxy//github.com/klauspost/cpuid/v2/@v/v2.0.6.mod -> github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.6.mod mirror://goproxy//github.com/klauspost/cpuid/v2/@v/v2.0.9.zip -> github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.9.zip mirror://goproxy//github.com/klauspost/cpuid/v2/@v/v2.0.9.mod -> github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.9.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.3.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.8.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v1.1.0.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/letsencrypt/pkcs11key/v4/@v/v4.0.0.mod -> github.com%2Fletsencrypt%2Fpkcs11key%2Fv4%2F@v%2Fv4.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/libdns/libdns/@v/v0.2.1.zip -> github.com%2Flibdns%2Flibdns%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/libdns/libdns/@v/v0.2.1.mod -> github.com%2Flibdns%2Flibdns%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-common/golang/gogo/@v/v0.0.0-20190605223551-bc2310a04743.mod -> github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod mirror://goproxy//github.com/lightstep/lightstep-tracer-go/@v/v0.18.1.mod -> github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.23.0.zip -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.23.0.zip mirror://goproxy//github.com/lucas-clemente/quic-go/@v/v0.23.0.mod -> github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.23.0.mod mirror://goproxy//github.com/lunixbochs/vtclean/@v/v0.0.0-20180621232353-2d01aacdc34a.mod -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv0.0.0-20180621232353-2d01aacdc34a.mod mirror://goproxy//github.com/lunixbochs/vtclean/@v/v1.0.0.zip -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/lunixbochs/vtclean/@v/v1.0.0.mod -> github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lyft/protoc-gen-validate/@v/v0.0.13.mod -> github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/manifoldco/promptui/@v/v0.8.0.zip -> github.com%2Fmanifoldco%2Fpromptui%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/manifoldco/promptui/@v/v0.8.0.mod -> github.com%2Fmanifoldco%2Fpromptui%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/marten-seemann/qpack/@v/v0.2.1.zip -> github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/marten-seemann/qpack/@v/v0.2.1.mod -> github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-15/@v/v0.1.4.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-16/@v/v0.1.4.zip -> github.com%2Fmarten-seemann%2Fqtls-go1-16%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/marten-seemann/qtls-go1-16/@v/v0.1.4.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-16%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/marten-seemann/qtls-go1-17/@v/v0.1.0.zip -> github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/marten-seemann/qtls-go1-17/@v/v0.1.0.mod -> github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.1.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-ieproxy/@v/v0.0.0-20190610004146-91bb50d98149.mod -> github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.13.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.13.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.13.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.10.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/mattn/go-zglob/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/mholt/acmez/@v/v1.0.0.zip -> github.com%2Fmholt%2Facmez%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mholt/acmez/@v/v1.0.0.mod -> github.com%2Fmholt%2Facmez%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.1.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/micromdm/scep/v2/@v/v2.0.0.zip -> github.com%2Fmicromdm%2Fscep%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/micromdm/scep/v2/@v/v2.0.0.mod -> github.com%2Fmicromdm%2Fscep%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.42.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.42.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.42.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.42.mod mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.2.mod -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3-0.20190429190417-a667d056470f.mod -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3-0.20190429190417-a667d056470f.mod mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.mod -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170929034955-c48cc78d4826.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170929034955-c48cc78d4826.mod mirror://goproxy//github.com/mreiferson/go-httpclient/@v/v0.0.0-20160630210159-31f0106b4474.mod -> github.com%2Fmreiferson%2Fgo-httpclient%2F@v%2Fv0.0.0-20160630210159-31f0106b4474.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/mwitkow/go-proto-validators/@v/v0.0.0-20180403085117-0950a7990007.mod -> github.com%2Fmwitkow%2Fgo-proto-validators%2F@v%2Fv0.0.0-20180403085117-0950a7990007.mod mirror://goproxy//github.com/mwitkow/go-proto-validators/@v/v0.2.0.mod -> github.com%2Fmwitkow%2Fgo-proto-validators%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.zip -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/naoina/go-stringutil/@v/v0.1.0.mod -> github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/naoina/toml/@v/v0.1.1.zip -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/naoina/toml/@v/v0.1.1.mod -> github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.0.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.2.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/nats-io/nats-server/v2/@v/v2.1.2.mod -> github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod mirror://goproxy//github.com/nats-io/nats.go/@v/v1.9.1.mod -> github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.0.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.3.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/nats-io/nuid/@v/v1.0.1.mod -> github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/neelance/astrewrite/@v/v0.0.0-20160511093645-99348263ae86.mod -> github.com%2Fneelance%2Fastrewrite%2F@v%2Fv0.0.0-20160511093645-99348263ae86.mod mirror://goproxy//github.com/neelance/sourcemap/@v/v0.0.0-20151028013722-8c68805598ab.mod -> github.com%2Fneelance%2Fsourcemap%2F@v%2Fv0.0.0-20151028013722-8c68805598ab.mod mirror://goproxy//github.com/newrelic/go-agent/@v/v2.15.0+incompatible.mod -> github.com%2Fnewrelic%2Fgo-agent%2F@v%2Fv2.15.0+incompatible.mod mirror://goproxy//github.com/ngdinhtoan/glide-cleanup/@v/v0.2.0.mod -> github.com%2Fngdinhtoan%2Fglide-cleanup%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/nishanths/predeclared/@v/v0.0.0-20200524104333-86fad755b4d3.mod -> github.com%2Fnishanths%2Fpredeclared%2F@v%2Fv0.0.0-20200524104333-86fad755b4d3.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.8.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.8.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.mod mirror://goproxy//github.com/oklog/oklog/@v/v0.3.2.mod -> github.com%2Foklog%2Foklog%2F@v%2Fv0.3.2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.7.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.2.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.2.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.4.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.4.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.4.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.4.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.13.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.13.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.13.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.13.0.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/opentracing-contrib/go-observer/@v/v0.0.0-20170622124052-a52f23424492.mod -> github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod mirror://goproxy//github.com/opentracing/basictracer-go/@v/v1.0.0.mod -> github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.0.2.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/openzipkin-contrib/zipkin-go-opentracing/@v/v0.4.5.mod -> github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.1.6.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.1.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/openzipkin/zipkin-go/@v/v0.2.2.mod -> github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/otiai10/copy/@v/v1.2.0.mod -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/otiai10/curr/@v/v0.0.0-20150429015615-9b4961190c95.mod -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.mod mirror://goproxy//github.com/otiai10/curr/@v/v1.0.0.mod -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/otiai10/mint/@v/v1.3.0.mod -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/otiai10/mint/@v/v1.3.1.mod -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/pact-foundation/pact-go/@v/v1.0.4.mod -> github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-buffruneio/@v/v0.2.0.mod -> github.com%2Fpelletier%2Fgo-buffruneio%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/performancecopilot/speed/@v/v3.0.0+incompatible.mod -> github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v1.0.2-0.20190131084431-473cd7ce01a1.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/profile/@v/v1.2.1.mod -> github.com%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/pquerna/otp/@v/v1.0.0.mod -> github.com%2Fpquerna%2Fotp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.8.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3-0.20190127221311-3c4408c8b829.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.3.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.5.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.10.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190115171406-56726106282f.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.1.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20180801064454-c7de2306084e.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.7.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.18.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20180725123919-05ee40e3a273.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180725123919-05ee40e3a273.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190117184657-bf6a532e95b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/pseudomuto/protoc-gen-doc/@v/v1.4.1.mod -> github.com%2Fpseudomuto%2Fprotoc-gen-doc%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/pseudomuto/protokit/@v/v0.2.0.mod -> github.com%2Fpseudomuto%2Fprotokit%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rcrowley/go-metrics/@v/v0.0.0-20181016184325-3113b8401b8a.mod -> github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.1.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rs/cors/@v/v1.7.0.mod -> github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.zip -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/samfoo/ansi/@v/v0.0.0-20160124022901-b6bd2ded7189.zip -> github.com%2Fsamfoo%2Fansi%2F@v%2Fv0.0.0-20160124022901-b6bd2ded7189.zip mirror://goproxy//github.com/samfoo/ansi/@v/v0.0.0-20160124022901-b6bd2ded7189.mod -> github.com%2Fsamfoo%2Fansi%2F@v%2Fv0.0.0-20160124022901-b6bd2ded7189.mod mirror://goproxy//github.com/samuel/go-zookeeper/@v/v0.0.0-20190923202752-2cc03de413da.mod -> github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.mod -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.2.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.2.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.zip -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/shopspring/decimal/@v/v1.2.0.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/shurcoo!l/component/@v/v0.0.0-20170202220835-f88ec8f54cc4.mod -> github.com%2Fshurcoo!l%2Fcomponent%2F@v%2Fv0.0.0-20170202220835-f88ec8f54cc4.mod mirror://goproxy//github.com/shurcoo!l/events/@v/v0.0.0-20181021180414-410e4ca65f48.mod -> github.com%2Fshurcoo!l%2Fevents%2F@v%2Fv0.0.0-20181021180414-410e4ca65f48.mod mirror://goproxy//github.com/shurcoo!l/github_flavored_markdown/@v/v0.0.0-20181002035957-2122de532470.mod -> github.com%2Fshurcoo!l%2Fgithub_flavored_markdown%2F@v%2Fv0.0.0-20181002035957-2122de532470.mod mirror://goproxy//github.com/shurcoo!l/go/@v/v0.0.0-20180423040247-9e1955d9fb6e.mod -> github.com%2Fshurcoo!l%2Fgo%2F@v%2Fv0.0.0-20180423040247-9e1955d9fb6e.mod mirror://goproxy//github.com/shurcoo!l/go-goon/@v/v0.0.0-20170922171312-37c2f522c041.mod -> github.com%2Fshurcoo!l%2Fgo-goon%2F@v%2Fv0.0.0-20170922171312-37c2f522c041.mod mirror://goproxy//github.com/shurcoo!l/gofontwoff/@v/v0.0.0-20180329035133-29b52fc0a18d.mod -> github.com%2Fshurcoo!l%2Fgofontwoff%2F@v%2Fv0.0.0-20180329035133-29b52fc0a18d.mod mirror://goproxy//github.com/shurcoo!l/gopherjslib/@v/v0.0.0-20160914041154-feb6d3990c2c.mod -> github.com%2Fshurcoo!l%2Fgopherjslib%2F@v%2Fv0.0.0-20160914041154-feb6d3990c2c.mod mirror://goproxy//github.com/shurcoo!l/highlight_diff/@v/v0.0.0-20170515013008-09bb4053de1b.mod -> github.com%2Fshurcoo!l%2Fhighlight_diff%2F@v%2Fv0.0.0-20170515013008-09bb4053de1b.mod mirror://goproxy//github.com/shurcoo!l/highlight_go/@v/v0.0.0-20181028180052-98c3abbbae20.mod -> github.com%2Fshurcoo!l%2Fhighlight_go%2F@v%2Fv0.0.0-20181028180052-98c3abbbae20.mod mirror://goproxy//github.com/shurcoo!l/home/@v/v0.0.0-20181020052607-80b7ffcb30f9.mod -> github.com%2Fshurcoo!l%2Fhome%2F@v%2Fv0.0.0-20181020052607-80b7ffcb30f9.mod mirror://goproxy//github.com/shurcoo!l/htmlg/@v/v0.0.0-20170918183704-d01228ac9e50.mod -> github.com%2Fshurcoo!l%2Fhtmlg%2F@v%2Fv0.0.0-20170918183704-d01228ac9e50.mod mirror://goproxy//github.com/shurcoo!l/httperror/@v/v0.0.0-20170206035902-86b7830d14cc.mod -> github.com%2Fshurcoo!l%2Fhttperror%2F@v%2Fv0.0.0-20170206035902-86b7830d14cc.mod mirror://goproxy//github.com/shurcoo!l/httpfs/@v/v0.0.0-20171119174359-809beceb2371.mod -> github.com%2Fshurcoo!l%2Fhttpfs%2F@v%2Fv0.0.0-20171119174359-809beceb2371.mod mirror://goproxy//github.com/shurcoo!l/httpgzip/@v/v0.0.0-20180522190206-b1c53ac65af9.mod -> github.com%2Fshurcoo!l%2Fhttpgzip%2F@v%2Fv0.0.0-20180522190206-b1c53ac65af9.mod mirror://goproxy//github.com/shurcoo!l/issues/@v/v0.0.0-20181008053335-6292fdc1e191.mod -> github.com%2Fshurcoo!l%2Fissues%2F@v%2Fv0.0.0-20181008053335-6292fdc1e191.mod mirror://goproxy//github.com/shurcoo!l/issuesapp/@v/v0.0.0-20180602232740-048589ce2241.mod -> github.com%2Fshurcoo!l%2Fissuesapp%2F@v%2Fv0.0.0-20180602232740-048589ce2241.mod mirror://goproxy//github.com/shurcoo!l/notifications/@v/v0.0.0-20181007000457-627ab5aea122.mod -> github.com%2Fshurcoo!l%2Fnotifications%2F@v%2Fv0.0.0-20181007000457-627ab5aea122.mod mirror://goproxy//github.com/shurcoo!l/octicon/@v/v0.0.0-20181028054416-fa4f57f9efb2.mod -> github.com%2Fshurcoo!l%2Focticon%2F@v%2Fv0.0.0-20181028054416-fa4f57f9efb2.mod mirror://goproxy//github.com/shurcoo!l/reactions/@v/v0.0.0-20181006231557-f2e0b4ca5b82.mod -> github.com%2Fshurcoo!l%2Freactions%2F@v%2Fv0.0.0-20181006231557-f2e0b4ca5b82.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v0.0.0-20170918181015-86672fcb3f95.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv0.0.0-20170918181015-86672fcb3f95.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/users/@v/v0.0.0-20180125191416-49c67e49c537.mod -> github.com%2Fshurcoo!l%2Fusers%2F@v%2Fv0.0.0-20180125191416-49c67e49c537.mod mirror://goproxy//github.com/shurcoo!l/webdavfs/@v/v0.0.0-20170829043945-18c3829fa133.mod -> github.com%2Fshurcoo!l%2Fwebdavfs%2F@v%2Fv0.0.0-20170829043945-18c3829fa133.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.3.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/smallstep/assert/@v/v0.0.0-20180720014142-de77670473b5.mod -> github.com%2Fsmallstep%2Fassert%2F@v%2Fv0.0.0-20180720014142-de77670473b5.mod mirror://goproxy//github.com/smallstep/assert/@v/v0.0.0-20200723003110-82e2b9b3b262.zip -> github.com%2Fsmallstep%2Fassert%2F@v%2Fv0.0.0-20200723003110-82e2b9b3b262.zip mirror://goproxy//github.com/smallstep/assert/@v/v0.0.0-20200723003110-82e2b9b3b262.mod -> github.com%2Fsmallstep%2Fassert%2F@v%2Fv0.0.0-20200723003110-82e2b9b3b262.mod mirror://goproxy//github.com/smallstep/certificates/@v/v0.16.0.mod -> github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.16.0.mod mirror://goproxy//github.com/smallstep/certificates/@v/v0.16.4.zip -> github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.16.4.zip mirror://goproxy//github.com/smallstep/certificates/@v/v0.16.4.mod -> github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.16.4.mod mirror://goproxy//github.com/smallstep/certinfo/@v/v1.5.1.mod -> github.com%2Fsmallstep%2Fcertinfo%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/smallstep/cli/@v/v0.16.1.zip -> github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.16.1.zip mirror://goproxy//github.com/smallstep/cli/@v/v0.16.1.mod -> github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.16.1.mod mirror://goproxy//github.com/smallstep/nosql/@v/v0.3.6.mod -> github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/smallstep/nosql/@v/v0.3.8.zip -> github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/smallstep/nosql/@v/v0.3.8.mod -> github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/smallstep/truststore/@v/v0.9.6.zip -> github.com%2Fsmallstep%2Ftruststore%2F@v%2Fv0.9.6.zip mirror://goproxy//github.com/smallstep/truststore/@v/v0.9.6.mod -> github.com%2Fsmallstep%2Ftruststore%2F@v%2Fv0.9.6.mod mirror://goproxy//github.com/smallstep/zcrypto/@v/v0.0.0-20200203191936-fbc32cf76bce.mod -> github.com%2Fsmallstep%2Fzcrypto%2F@v%2Fv0.0.0-20200203191936-fbc32cf76bce.mod mirror://goproxy//github.com/smallstep/zlint/@v/v0.0.0-20180727184541-d84eaafe274f.mod -> github.com%2Fsmallstep%2Fzlint%2F@v%2Fv0.0.0-20180727184541-d84eaafe274f.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.0.0.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/smartystreets/go-aws-auth/@v/v0.0.0-20180515143844-0c1422d1fdb9.mod -> github.com%2Fsmartystreets%2Fgo-aws-auth%2F@v%2Fv0.0.0-20180515143844-0c1422d1fdb9.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/smartystreets/gunit/@v/v1.0.0.mod -> github.com%2Fsmartystreets%2Fgunit%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.5-0.20210205191134-5ec6847320e5.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.5-0.20210205191134-5ec6847320e5.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.5.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/sony/gobreaker/@v/v0.4.1.mod -> github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/sourcegraph/annotate/@v/v0.0.0-20160123013949-f4cad6c6324d.mod -> github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod mirror://goproxy//github.com/sourcegraph/syntaxhighlight/@v/v0.0.0-20170531221838-bd320f5d308e.mod -> github.com%2Fsourcegraph%2Fsyntaxhighlight%2F@v%2Fv0.0.0-20170531221838-bd320f5d308e.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.zip -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/src-d/gcfg/@v/v1.4.0.mod -> github.com%2Fsrc-d%2Fgcfg%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stoewer/go-strcase/@v/v1.2.0.zip -> github.com%2Fstoewer%2Fgo-strcase%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/stoewer/go-strcase/@v/v1.2.0.mod -> github.com%2Fstoewer%2Fgo-strcase%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190404075320-75d898a42a94.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod mirror://goproxy//github.com/streadway/amqp/@v/v0.0.0-20190827072141-edfb9018d271.mod -> github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod mirror://goproxy//github.com/streadway/handy/@v/v0.0.0-20190108123426-d5acb3125c2a.mod -> github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20170130113145-4d4bfba8f1d1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20170130113145-4d4bfba8f1d1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/tarm/serial/@v/v0.0.0-20180830185346-98f6abe2eb07.mod -> github.com%2Ftarm%2Fserial%2F@v%2Fv0.0.0-20180830185346-98f6abe2eb07.mod mirror://goproxy//github.com/thales-e-security/pool/@v/v0.0.2.mod -> github.com%2Fthales-e-security%2Fpool%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/tj/assert/@v/v0.0.0-20171129193455-018094318fb0.mod -> github.com%2Ftj%2Fassert%2F@v%2Fv0.0.0-20171129193455-018094318fb0.mod mirror://goproxy//github.com/tj/go-elastic/@v/v0.0.0-20171221160941-36157cbbebc2.mod -> github.com%2Ftj%2Fgo-elastic%2F@v%2Fv0.0.0-20171221160941-36157cbbebc2.mod mirror://goproxy//github.com/tj/go-kinesis/@v/v0.0.0-20171128231115-08b17f58cb1b.mod -> github.com%2Ftj%2Fgo-kinesis%2F@v%2Fv0.0.0-20171128231115-08b17f58cb1b.mod mirror://goproxy//github.com/tj/go-spin/@v/v1.1.0.mod -> github.com%2Ftj%2Fgo-spin%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20200427203606-3cfed13b9966.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20200427203606-3cfed13b9966.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20201229170055-e5319fda7802.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20201229170055-e5319fda7802.mod mirror://goproxy//github.com/tomasen/realip/@v/v0.0.0-20180522021738-f0c99a92ddce.mod -> github.com%2Ftomasen%2Frealip%2F@v%2Fv0.0.0-20180522021738-f0c99a92ddce.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.7.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.4.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.4.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.5.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.5.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.mod mirror://goproxy//github.com/viant/assertly/@v/v0.4.8.mod -> github.com%2Fviant%2Fassertly%2F@v%2Fv0.4.8.mod mirror://goproxy//github.com/viant/toolbox/@v/v0.24.0.mod -> github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod mirror://goproxy//github.com/weppos/publicsuffix-go/@v/v0.4.0.mod -> github.com%2Fweppos%2Fpublicsuffix-go%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/xanzy/go-gitlab/@v/v0.31.0.mod -> github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.31.0.mod mirror://goproxy//github.com/xanzy/ssh-agent/@v/v0.2.1.mod -> github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.mod -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.6.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.6.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.4.0.zip -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/yuin/goldmark/@v/v1.4.0.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20210516132338-9216f9c5aa01.zip -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20210516132338-9216f9c5aa01.zip mirror://goproxy//github.com/yuin/goldmark-highlighting/@v/v0.0.0-20210516132338-9216f9c5aa01.mod -> github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20210516132338-9216f9c5aa01.mod mirror://goproxy//github.com/zmap/rc2/@v/v0.0.0-20131011165748-24b9757f5521.mod -> github.com%2Fzmap%2Frc2%2F@v%2Fv0.0.0-20131011165748-24b9757f5521.mod mirror://goproxy//github.com/zmap/rc2/@v/v0.0.0-20190804163417-abaa70531248.mod -> github.com%2Fzmap%2Frc2%2F@v%2Fv0.0.0-20190804163417-abaa70531248.mod mirror://goproxy//github.com/zmap/zcertificate/@v/v0.0.0-20180516150559-0e3d58b1bac4.mod -> github.com%2Fzmap%2Fzcertificate%2F@v%2Fv0.0.0-20180516150559-0e3d58b1bac4.mod mirror://goproxy//github.com/zmap/zcertificate/@v/v0.0.0-20190521191901-30e388164f71.mod -> github.com%2Fzmap%2Fzcertificate%2F@v%2Fv0.0.0-20190521191901-30e388164f71.mod mirror://goproxy//github.com/zmap/zcrypto/@v/v0.0.0-20190329181646-dff83107394d.mod -> github.com%2Fzmap%2Fzcrypto%2F@v%2Fv0.0.0-20190329181646-dff83107394d.mod mirror://goproxy//github.com/zmap/zlint/@v/v0.0.0-20190516161541-9047d02cf65a.mod -> github.com%2Fzmap%2Fzlint%2F@v%2Fv0.0.0-20190516161541-9047d02cf65a.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.6.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.6.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.6.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.6.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//go.etcd.io/etcd/api/v3/@v/v3.5.0-alpha.0.mod -> go.etcd.io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0-alpha.0.mod mirror://goproxy//go.etcd.io/etcd/api/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/client/pkg/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fpkg%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/client/v2/@v/v2.305.0-alpha.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fv2%2F@v%2Fv2.305.0-alpha.0.mod mirror://goproxy//go.etcd.io/etcd/client/v2/@v/v2.305.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fv2%2F@v%2Fv2.305.0.mod mirror://goproxy//go.etcd.io/etcd/client/v3/@v/v3.5.0-alpha.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fv3%2F@v%2Fv3.5.0-alpha.0.mod mirror://goproxy//go.etcd.io/etcd/client/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/etcdctl/v3/@v/v3.5.0-alpha.0.mod -> go.etcd.io%2Fetcd%2Fetcdctl%2Fv3%2F@v%2Fv3.5.0-alpha.0.mod mirror://goproxy//go.etcd.io/etcd/etcdctl/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fetcdctl%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/etcdutl/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fetcdutl%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/pkg/v3/@v/v3.5.0-alpha.0.mod -> go.etcd.io%2Fetcd%2Fpkg%2Fv3%2F@v%2Fv3.5.0-alpha.0.mod mirror://goproxy//go.etcd.io/etcd/pkg/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fpkg%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/raft/v3/@v/v3.5.0-alpha.0.mod -> go.etcd.io%2Fetcd%2Fraft%2Fv3%2F@v%2Fv3.5.0-alpha.0.mod mirror://goproxy//go.etcd.io/etcd/raft/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fraft%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/server/v3/@v/v3.5.0-alpha.0.mod -> go.etcd.io%2Fetcd%2Fserver%2Fv3%2F@v%2Fv3.5.0-alpha.0.mod mirror://goproxy//go.etcd.io/etcd/server/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fserver%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/tests/v3/@v/v3.5.0-alpha.0.mod -> go.etcd.io%2Fetcd%2Ftests%2Fv3%2F@v%2Fv3.5.0-alpha.0.mod mirror://goproxy//go.etcd.io/etcd/tests/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Ftests%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/v3/@v/v3.5.0-alpha.0.mod -> go.etcd.io%2Fetcd%2Fv3%2F@v%2Fv3.5.0-alpha.0.mod mirror://goproxy//go.etcd.io/etcd/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.zip -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.zip mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.mod -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.mod mirror://goproxy//go.opencensus.io/@v/v0.15.0.mod -> go.opencensus.io%2F@v%2Fv0.15.0.mod mirror://goproxy//go.opencensus.io/@v/v0.18.0.mod -> go.opencensus.io%2F@v%2Fv0.18.0.mod mirror://goproxy//go.opencensus.io/@v/v0.20.1.mod -> go.opencensus.io%2F@v%2Fv0.20.1.mod mirror://goproxy//go.opencensus.io/@v/v0.20.2.mod -> go.opencensus.io%2F@v%2Fv0.20.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.opencensus.io/@v/v0.22.6.mod -> go.opencensus.io%2F@v%2Fv0.22.6.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.zip -> go.opencensus.io%2F@v%2Fv0.23.0.zip mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.opentelemetry.io/contrib/@v/v0.20.0.mod -> go.opentelemetry.io%2Fcontrib%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/@v/v0.20.0.mod -> go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fgoogle.golang.org%2Fgrpc%2Fotelgrpc%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/exporters/otlp/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fexporters%2Fotlp%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/export/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2Fexport%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/proto/otlp/@v/v0.7.0.mod -> go.opentelemetry.io%2Fproto%2Fotlp%2F@v%2Fv0.7.0.mod mirror://goproxy//go.step.sm/cli-utils/@v/v0.4.1.zip -> go.step.sm%2Fcli-utils%2F@v%2Fv0.4.1.zip mirror://goproxy//go.step.sm/cli-utils/@v/v0.4.1.mod -> go.step.sm%2Fcli-utils%2F@v%2Fv0.4.1.mod mirror://goproxy//go.step.sm/crypto/@v/v0.9.0.zip -> go.step.sm%2Fcrypto%2F@v%2Fv0.9.0.zip mirror://goproxy//go.step.sm/crypto/@v/v0.9.0.mod -> go.step.sm%2Fcrypto%2F@v%2Fv0.9.0.mod mirror://goproxy//go.step.sm/linkedca/@v/v0.0.0-20210611183751-27424aae8d25.zip -> go.step.sm%2Flinkedca%2F@v%2Fv0.0.0-20210611183751-27424aae8d25.zip mirror://goproxy//go.step.sm/linkedca/@v/v0.0.0-20210611183751-27424aae8d25.mod -> go.step.sm%2Flinkedca%2F@v%2Fv0.0.0-20210611183751-27424aae8d25.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.5.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.6.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.3.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.5.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/tools/@v/v0.0.0-20190618225709-2cfd321de3ee.mod -> go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.13.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.15.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.15.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.16.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.16.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.17.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.17.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.19.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.19.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.19.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.19.0.mod mirror://goproxy//go4.org/@v/v0.0.0-20180809161055-417644f6feb5.mod -> go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod mirror://goproxy//gocloud.dev/@v/v0.19.0.mod -> gocloud.dev%2F@v%2Fv0.19.0.mod mirror://goproxy//golang.org/x/build/@v/v0.0.0-20190111050920-041ab4dc3f9d.mod -> golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180501155221-613d6eafa307.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180501155221-613d6eafa307.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181030102418-4d3f4d9ffa16.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190219172222-a4c6cb3142f2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190313024323-a1f597ede03a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190426145343-a29dc8fdc734.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190701094942-4def268fd1a4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191117063200-497ca9f6d64f.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191117063200-497ca9f6d64f.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200221231518-2aa609cf4a9d.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200414173820-0848c9571904.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200414173820-0848c9571904.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200728195943-123391ffb6de.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201016220609-9e8e0b390897.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210513164829-c07d793c2f9a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210616213533-5ff15b29337e.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210616213533-5ff15b29337e.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200331195152-e8c3332aa8e5.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200331195152-e8c3332aa8e5.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20180702182130-06c8688daad7.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20210508222113-6edffad5e616.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20210508222113-6edffad5e616.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20210508222113-6edffad5e616.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20210508222113-6edffad5e616.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.2.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170726083632-f5079bd7f6f7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170726083632-f5079bd7f6f7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181029044818-c44066c5c816.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181029044818-c44066c5c816.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181106065722-10aee1819953.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181108082009-03003ca0c849.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181108082009-03003ca0c849.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190125091013-d26f9f9a57f3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190301231341-16b79f2e4e95.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190301231341-16b79f2e4e95.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190313220215-9f648a60d977.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190313220215-9f648a60d977.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190619014844-b5b0513f8c1b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190628185345-da137c7871d7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191002035440-2ec189313ef0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191119073136-fc4aabc6c914.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191119073136-fc4aabc6c914.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200421231249-e086a090c8fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200506145744-7e3656a0809f.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520182314-0ba52f642ac2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201031054903-ff519b6c9102.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201202161906-c7110b5ffcbb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201202161906-c7110b5ffcbb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201209123823-ac852fbbde11.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210119194325-5f4716e94777.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210316092652-d523dce5a7f4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210428140749-89ef3d95e781.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210428140749-89ef3d95e781.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210503060351-7fd8e65b6420.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210503060351-7fd8e65b6420.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210525063256-abc453219eb5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210614182718-04defd469f4e.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210614182718-04defd469f4e.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210614182718-04defd469f4e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210614182718-04defd469f4e.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181017192945-9dcd33a902f4.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181017192945-9dcd33a902f4.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181106182150-f42d05182288.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181106182150-f42d05182288.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20181203162652-d668ce993890.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190402181905-9f3314589c9a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210126194326-f9ce19ea3013.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210126194326-f9ce19ea3013.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210220000619-9bb904979d93.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210413134643-5e61552d6c78.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210413134643-5e61552d6c78.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210427180440-81ed05c6b58c.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210427180440-81ed05c6b58c.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210514164344-f6687ab2804c.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210514164344-f6687ab2804c.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.mod mirror://goproxy//golang.org/x/perf/@v/v0.0.0-20180704124530-6e6d33e29852.mod -> golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190412183630-56d357773e84.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190412183630-56d357773e84.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170728174421-0f826bdd13b5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170728174421-0f826bdd13b5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181029174526-d69651ed3497.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181029174526-d69651ed3497.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181122145206-62eef0e2fa9b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181128092732-4ed8d59d0b35.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181128092732-4ed8d59d0b35.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190221075227-b4e8571b14e0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190316082340-a2f829d7f35f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190316082340-a2f829d7f35f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190620070143-6f217b454f45.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190620070143-6f217b454f45.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191119060738-e882bf8e40c2.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191119060738-e882bf8e40c2.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191220142924-d4481acd189f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200331124033-c3d80250170d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200413165638-669c56c373c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200420163511-1957bb5e6d1f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501052902-10377860bb8e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200511232937-7e40ca221e25.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200515095857-1151b9dac4a9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200523222454-059865788121.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200803210538-64077c9b5642.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200828194041-157a740278f4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200828194041-157a740278f4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200905004654-be1d3432aa8f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200923182605-d9f96fdee20d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200923182605-d9f96fdee20d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201009025420-dfb3f7c4e634.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210104204734-6f8348627aad.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210112080510-489259a85091.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210112080510-489259a85091.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210220050731-9a76102bfb43.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210305230114-8fe3ee5dd75b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210309074719-68d13333faf2.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210309074719-68d13333faf2.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210315160823-c6e025ad8005.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210320140829-1e4c9ba3b0c4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210403161142-5e06dd20ab57.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210412220455-f1c623a9e750.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210412220455-f1c623a9e750.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210503080704-8803ae5d1324.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210503080704-8803ae5d1324.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210510120138-977fb7262007.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210514084401-e8d321eab015.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210603081109-ebe580a85c40.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210603125802-9665404d3644.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603125802-9665404d3644.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210503060354-a79de5458b56.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210503060354-a79de5458b56.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210503060354-a79de5458b56.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210503060354-a79de5458b56.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20200630173020-3af7569d3a1e.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210220033141-f8bda1e9f3ba.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180828015842-6cd1fcedba52.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030000716-a0a13e073c7b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030000716-a0a13e073c7b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190422233926-fe54fb35175b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190422233926-fe54fb35175b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190729092621-ff9f1409240a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190729092621-ff9f1409240a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191010075000-0337d82405ff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191010075000-0337d82405ff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029041327-9cc4af7d6b2c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191029190741-b9c20aec41a5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191118222007-07fc4c7f2b98.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191118222007-07fc4c7f2b98.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200103221440-774c71fcf114.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200426102838-f3a5411a4c3b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200426102838-f3a5411a4c3b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200522201501-cb1345f3a375.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200522201501-cb1345f3a375.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200717024301-6ddee64345a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200717024301-6ddee64345a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201014170642-d1624618ad65.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201014170642-d1624618ad65.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201110124207-079ba7bd75cd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201201161351-ac6f37ff4c2a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201224043029-2b0845dc783e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201224043029-2b0845dc783e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210105154028-b0ab187a4818.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210108195828-e2f9c7f1fc8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210108195828-e2f9c7f1fc8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.1.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.1.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.3.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.3.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.3.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.3.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180910000450-7ca32eb868bf.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180910000450-7ca32eb868bf.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20181030000543-1d582fd0359e.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181030000543-1d582fd0359e.mod mirror://goproxy//google.golang.org/api/@v/v0.1.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.1.0.mod mirror://goproxy//google.golang.org/api/@v/v0.3.1.mod -> google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.5.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod mirror://goproxy//google.golang.org/api/@v/v0.6.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.6.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/api/@v/v0.10.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.10.0.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.35.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod mirror://goproxy//google.golang.org/api/@v/v0.36.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod mirror://goproxy//google.golang.org/api/@v/v0.37.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.37.0.mod mirror://goproxy//google.golang.org/api/@v/v0.40.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod mirror://goproxy//google.golang.org/api/@v/v0.41.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod mirror://goproxy//google.golang.org/api/@v/v0.43.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.43.0.mod mirror://goproxy//google.golang.org/api/@v/v0.45.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.45.0.mod mirror://goproxy//google.golang.org/api/@v/v0.46.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.46.0.mod mirror://goproxy//google.golang.org/api/@v/v0.47.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.47.0.mod mirror://goproxy//google.golang.org/api/@v/v0.48.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.48.0.zip mirror://goproxy//google.golang.org/api/@v/v0.48.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.48.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.2.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.3.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.2.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.2.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20170818010345-ee236bd376b0.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20170818010345-ee236bd376b0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180831171423-11092d34479b.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180831171423-11092d34479b.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181029155118-b69ba1387ce2.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181029155118-b69ba1387ce2.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181107211654-5fc9ac540362.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181107211654-5fc9ac540362.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20181202183823-bd91e49a0898.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181202183823-bd91e49a0898.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190306203927-b5d61aea6440.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190306203927-b5d61aea6440.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190508193815-b515fa19cec8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190530194941-fb225487d101.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190620144150-6af8c5fc6601.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190620144150-6af8c5fc6601.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190801165951-fa694d86fc64.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190911173649-1774047e7e51.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191108220845-16a3f7862a1a.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191115194625-c23dd37a84c9.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191216164720-4f79533eabd1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20191230161307-f3c370f40bfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200115191322-ca5a22157cba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200122232147-0452cf42e150.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200204135345-fa8e72b47b90.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200212174721-66ed5ce911ce.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200228133532-8c2c7df3a383.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200305110556-506484158171.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200312145019-da6875a35672.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200331122359-1ee6d9798940.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200423170343-7949de9c1215.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200423170343-7949de9c1215.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200430143042-b979b6f78d84.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200511104702-f5ebc3bea380.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200513103714-09dca8ec2884.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200515170657-fc4c6c6a6587.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200526211855-cb27e3aa2013.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200618031413-b414f8b61790.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200729003335-053ba62fc06f.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200804131852-c06518451d9c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200825200019-8632dd797987.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200904004341-0bd0a958aa1d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201102152239-715cce707fb0.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201102152239-715cce707fb0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201109203340-2640f1f9cdfb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201201144952-b05cb90ed32e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201210142538-e3217bee35cc.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201210142538-e3217bee35cc.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20201214200347-8c77b98c765d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210108203827-ffc7fda8c3d7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210108203827-ffc7fda8c3d7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210126160654-44e461bb6506.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210126160654-44e461bb6506.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210222152913-aa3ee6e6a81c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210222152913-aa3ee6e6a81c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210303154014-9728d6b83eeb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210310155132-4ce2db91004e.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210310155132-4ce2db91004e.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210319143718-93e7006c17a6.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210331142528-b7513248f0ba.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210331142528-b7513248f0ba.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210402141018-6c239bbf2bb1.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210402141018-6c239bbf2bb1.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210413151531-c14fb6ef47c3.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210413151531-c14fb6ef47c3.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210427215850-f767ed18ee4d.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210427215850-f767ed18ee4d.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210429181445-86c259c2b4ab.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210429181445-86c259c2b4ab.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210513213006-bf773b8c8384.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210513213006-bf773b8c8384.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210602131652-f16073e35f0c.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210602131652-f16073e35f0c.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210604141403-392c879c8b08.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210604141403-392c879c8b08.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210604141403-392c879c8b08.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210604141403-392c879c8b08.mod mirror://goproxy//google.golang.org/grpc/@v/v1.8.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.8.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.16.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.17.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.28.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.30.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.31.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.32.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.32.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.34.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.35.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.37.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.38.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.38.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.mod mirror://goproxy//google.golang.org/grpc/cmd/protoc-gen-go-grpc/@v/v1.1.0.mod -> google.golang.org%2Fgrpc%2Fcmd%2Fprotoc-gen-go-grpc%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.1-0.20200526195155-81db48ad09cc.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.24.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.1-0.20200805231151-a709e31e5d12.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.1-0.20200805231151-a709e31e5d12.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.27.1.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.27.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.27.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.28.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.28.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.3.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.zip -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.zip mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/src-d/go-billy.v4/@v/v4.3.2.mod -> gopkg.in%2Fsrc-d%2Fgo-billy.v4%2F@v%2Fv4.3.2.mod mirror://goproxy//gopkg.in/src-d/go-git-fixtures.v3/@v/v3.5.0.mod -> gopkg.in%2Fsrc-d%2Fgo-git-fixtures.v3%2F@v%2Fv3.5.0.mod mirror://goproxy//gopkg.in/src-d/go-git.v4/@v/v4.13.1.mod -> gopkg.in%2Fsrc-d%2Fgo-git.v4%2F@v%2Fv4.13.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.2.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//grpc.go4.org/@v/v0.0.0-20170609214715-11d0a25b4919.mod -> grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20180728063816-88497007e858.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.zip -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.mod -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.mod mirror://goproxy//pack.ag/amqp/@v/v0.11.2.mod -> pack.ag%2Famqp%2F@v%2Fv0.11.2.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod mirror://goproxy//software.sslmate.com/src/go-pkcs12/@v/v0.0.0-20201103104416-57fc603b7f52.mod -> software.sslmate.com%2Fsrc%2Fgo-pkcs12%2F@v%2Fv0.0.0-20201103104416-57fc603b7f52.mod mirror://goproxy//sourcegraph.com/sourcegraph/appdash/@v/v0.0.0-20190731080439-ebfcffb1b5c0.mod -> sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod mirror://goproxy//sourcegraph.com/sourcegraph/go-diff/@v/v0.5.0.mod -> sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod mirror://goproxy//sourcegraph.com/sqs/pbtypes/@v/v0.0.0-20180604144634-d3ebe8f20ae4.mod -> sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod
+_eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	go-module	34c2d0a98b291ac9acda0cb54c9ffd61	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a210a8a112717d27b8756e2b6f80bb7b
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.59-r1 b/metadata/md5-cache/www-servers/lighttpd-1.4.59-r1
index 0bd32e37a96e..427a32081ac1 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.59-r1
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.59-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Lightweight high-performance web server
 EAPI=7
 HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
 IUSE=brotli bzip2 dbi doc gdbm gnutls ipv6 kerberos ldap libev lua maxminddb mbedtls mmap memcached mysql nss pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib zstd lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=acct-group/lighttpd acct-user/lighttpd virtual/libcrypt:= brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi mysql? ( dev-db/libdbi-drivers[mysql] ) postgres? ( dev-db/libdbi-drivers[postgres] ) sqlite? ( dev-db/libdbi-drivers[sqlite] ) ) gdbm? ( sys-libs/gdbm:= ) gnutls? ( net-libs/gnutls ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) maxminddb? ( dev-libs/libmaxminddb ) mbedtls? ( net-libs/mbedtls ) memcached? ( dev-libs/libmemcached ) nss? ( dev-libs/nss ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.7:0= ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-apache ) virtual/tmpfiles
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) mysql? ( dbi ) postgres? ( dbi ) sqlite? ( dbi ) webdav? ( sqlite )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.59.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=06fef0306e425de7f624e773fa5d7bba
+_md5_=d0179d1ea089b7ced7f23c4c68f13431
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.25.0-r2 b/metadata/md5-cache/www-servers/nginx-unit-1.25.0-r2
new file mode 100644
index 000000000000..27df7dbb7f8c
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.25.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
+DEPEND=perl? ( dev-lang/perl:= ) php7-3? ( dev-lang/php:7.3[embed] ) php7-4? ( dev-lang/php:7.4[embed] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
+DESCRIPTION=Dynamic web and application server
+EAPI=8
+HOMEPAGE=https://unit.nginx.org
+IUSE=perl python ruby php7-3 php7-4 ssl python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=perl? ( dev-lang/perl:= ) php7-3? ( dev-lang/php:7.3[embed] ) php7-4? ( dev-lang/php:7.4[embed] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
+REQUIRED_USE=|| ( perl python ruby php7-3 php7-4 ssl ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=https://unit.nginx.org/download/unit-1.25.0.tar.gz -> nginx-unit-1.25.0.tar.gz
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=9ba3409b41484493bcfcec7b6679ac2c
diff --git a/metadata/md5-cache/www-servers/puma-5.3.2-r1 b/metadata/md5-cache/www-servers/puma-5.3.2-r1
index e278cf17bd10..43ee6c93eefb 100644
--- a/metadata/md5-cache/www-servers/puma-5.3.2-r1
+++ b/metadata/md5-cache/www-servers/puma-5.3.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v5.3.2.tar.gz -> puma-5.3.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=7052b16ab7df080f0b24b434a6ca34d4
diff --git a/metadata/md5-cache/www-servers/puma-5.4.0 b/metadata/md5-cache/www-servers/puma-5.4.0
index 248f9d26e0d0..38a7868c41db 100644
--- a/metadata/md5-cache/www-servers/puma-5.4.0
+++ b/metadata/md5-cache/www-servers/puma-5.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v5.4.0.tar.gz -> puma-5.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=e9f14eae18951062ef1ad9d7b62bea33
diff --git a/metadata/md5-cache/www-servers/thin-1.8.1 b/metadata/md5-cache/www-servers/thin-1.8.1
index 641660bd7e39..ac2a1e4aa16a 100644
--- a/metadata/md5-cache/www-servers/thin-1.8.1
+++ b/metadata/md5-cache/www-servers/thin-1.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/macournoyer/thin/archive/v1.8.1.tar.gz -> thin-1.8.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	38058c97fbf1ce2a00f4ab8670ed5b54	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	78af56c35604aab62ec93223e5654246	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=53dceede38562aee0365701ad9d0c6be
diff --git a/metadata/md5-cache/www-servers/tomcat-10.0.10 b/metadata/md5-cache/www-servers/tomcat-10.0.10
deleted file mode 100644
index 6640d24d85f4..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-10.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.10:5.0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core virtual/jdk:1.8 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD doc source test
-KEYWORDS=~amd64 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.10:5.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=10
-SRC_URI=mirror://apache/tomcat/tomcat-9/v10.0.10/src/apache-tomcat-10.0.10-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
-_eclasses_=java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=27d1ae4b63ecc376abe0a67070a719d4
diff --git a/metadata/md5-cache/www-servers/tomcat-10.0.11 b/metadata/md5-cache/www-servers/tomcat-10.0.11
deleted file mode 100644
index e322f5504e89..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-10.0.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.11:5.0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core virtual/jdk:1.8 test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD doc source test
-KEYWORDS=~amd64 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 dev-java/jakartaee-migration:0 ~dev-java/tomcat-servlet-api-10.0.11:5.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=10
-SRC_URI=mirror://apache/tomcat/tomcat-9/v10.0.11/src/apache-tomcat-10.0.11-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
-_eclasses_=java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=27d1ae4b63ecc376abe0a67070a719d4
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.70 b/metadata/md5-cache/www-servers/tomcat-8.5.70
deleted file mode 100644
index 9ccf1b159f28..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.5.70
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.70:3.1 app-admin/pwgen dev-java/ant-core virtual/jdk:1.8 doc? ( dev-java/glassfish-xmlrpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD doc source test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.70:3.1 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=8.5
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.70/src/apache-tomcat-8.5.70-src.tar.gz
-_eclasses_=java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3f7e14674b55bc6c97420a9a72c22843
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.71 b/metadata/md5-cache/www-servers/tomcat-8.5.71
deleted file mode 100644
index 3f8dd15d155a..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.5.71
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.71:3.1 app-admin/pwgen dev-java/ant-core virtual/jdk:1.8 doc? ( dev-java/glassfish-xmlrpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD doc source test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.71:3.1 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=8.5
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.71/src/apache-tomcat-8.5.71-src.tar.gz
-_eclasses_=java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c8342ad182cce8844d89c373dc5d9699
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.72 b/metadata/md5-cache/www-servers/tomcat-8.5.72
new file mode 100644
index 000000000000..790af0333bc8
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.72
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.72:3.1 app-admin/pwgen dev-java/ant-core virtual/jdk:1.8 doc? ( dev-java/glassfish-xmlrpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=extra-webapps elibc_FreeBSD doc source test
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.72:3.1 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=8.5
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.72/src/apache-tomcat-8.5.72-src.tar.gz
+_eclasses_=java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=3f7e14674b55bc6c97420a9a72c22843
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.52 b/metadata/md5-cache/www-servers/tomcat-9.0.52
deleted file mode 100644
index 205542c30258..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-9.0.52
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.52:4.0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 virtual/jdk:1.8 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD doc source test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.52:4.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=9
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.52/src/apache-tomcat-9.0.52-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
-_eclasses_=java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7027599b7c59f2650e4b048f450a3abe
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.53 b/metadata/md5-cache/www-servers/tomcat-9.0.53
deleted file mode 100644
index aed5011099f4..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-9.0.53
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.53:4.0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 virtual/jdk:1.8 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD doc source test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.53:4.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=9
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.53/src/apache-tomcat-9.0.53-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
-_eclasses_=java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7027599b7c59f2650e4b048f450a3abe
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 06033dce12e8..848e8f7fcd30 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.144 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.144
index 209f966e1803..c6780ce26edc 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.144
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.144
@@ -10,5 +10,5 @@ LICENSE=GPL-2 MIT NVIDIA-r2
 RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/390
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/390.144/NVIDIA-Linux-x86_64-390.144.run ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/390.144/NVIDIA-Linux-x86-390.144.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.144.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.144.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.144.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.144.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.144.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4f87c926c1af9f67f1632d8de39a4667
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2325d6693800ebcc831f37a88b09070b
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03 b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03
index 04007ba0a675..ebeeee175e10 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03
@@ -10,5 +10,5 @@ LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
 RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/460
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/460.91.03/NVIDIA-Linux-x86_64-460.91.03.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/460.91.03/NVIDIA-Linux-aarch64-460.91.03.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-460.91.03.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	optfeature	30ce9dec2b8943338c9b015bd32bac6a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=caf731fad15cbae21a269c54bb7dfab0
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	optfeature	30ce9dec2b8943338c9b015bd32bac6a	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=834bf6c47fac3f6891606840c5a1dc72
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.05 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.05
new file mode 100644
index 000000000000..0941fe70ed28
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.05
@@ -0,0 +1,14 @@
+BDEPEND=app-misc/pax-utils virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
+DEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc:= tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=7
+HOMEPAGE=https://www.nvidia.com/download/index.aspx
+IUSE=+X +driver static-libs +tools wayland kernel_linux kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64
+LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
+RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc:= tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=gui-libs/egl-wayland-1.1.7-r1 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
+SLOT=0/vulkan
+SRC_URI=https://developer.nvidia.com/vulkan-beta-4706205-linux -> NVIDIA-Linux-x86_64-470.62.05.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.63.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.63.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.63.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.63.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.63.01.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=240b69390dcdde63133ed927f7919557
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.63.01 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.63.01
index a2c2668022f8..3507b2588a45 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.63.01
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.63.01
@@ -10,5 +10,5 @@ LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
 RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=gui-libs/egl-wayland-1.1.7-r1 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/470
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/470.63.01/NVIDIA-Linux-x86_64-470.63.01.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/470.63.01/NVIDIA-Linux-aarch64-470.63.01.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.63.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.63.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.63.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.63.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.63.01.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5a8a0574168fba5f1f135f02a1307f10
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7ce8babf099b6ca792d8e38ab5bf4b61
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.74 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.74
index 5ddde1bd7654..df4878cce184 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.74
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.74
@@ -10,5 +10,5 @@ LICENSE=GPL-2 MIT NVIDIA-r2 ZLIB
 RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc:= tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=gui-libs/egl-wayland-1.1.7-r1 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/470
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/470.74/NVIDIA-Linux-x86_64-470.74.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/470.74/NVIDIA-Linux-aarch64-470.74.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.74.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.74.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.74.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.74.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.74.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	0979a3f84b9948fbe2a553beb6b5f505	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b4fbb76e11c6bec732f471337955b65d
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9d9f657719e194b60130f3b757dae99a
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-495.29.05-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-495.29.05-r1
new file mode 100644
index 000000000000..4966256ad75f
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-495.29.05-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-misc/pax-utils virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
+DEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc:= tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=7
+HOMEPAGE=https://www.nvidia.com/download/index.aspx
+IUSE=+X +driver static-libs +tools wayland kernel_linux kernel_linux dist-kernel driver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64
+LICENSE=NVIDIA-r2 BSD GPL-2 MIT ZLIB
+RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc:= tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=gui-libs/egl-wayland-1.1.7-r1 media-libs/libglvnd >=media-libs/mesa-21.2[gbm(+)] x11-libs/libdrm ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
+SLOT=0/495
+SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/495.29.05/NVIDIA-Linux-x86_64-495.29.05.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/495.29.05/NVIDIA-Linux-aarch64-495.29.05.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-495.29.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-495.29.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-495.29.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-495.29.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-495.29.05.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	42a7a0aa05c4a383593bdaad7958058a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2caebe156bffa7f93f56275b737a2b60
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
index f506ef57b009..de6de3ceab67 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev virtual/libudev:= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-evdev-2.10.6.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
 _md5_=d51cf5c0b12c4a9be4b86f2e35697477
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.1.0 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.1.0
index 5e398db85188..7e7d32fbae24 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.1.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.1.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.11.0:0= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-1.1.0.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
 _md5_=f7f3411a12fa37b0234ea24b6ae9e229
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.0 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.0
index 6698a9aab4d5..ce3a2ce9f08b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.11.0:0= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-1.2.0.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
 _md5_=074380feca90858f93a255602d36eb8c
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1 b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
index 17f62371b2d5..9b80c2de8e5f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.14 >=x11-libs/libXi-1.2 >=x11-libs/libXtst-1.1.0 kernel_linux? ( >=dev-libs/libevdev-0.4 ) x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
 _md5_=4956441a358aee8663a86791c0233fe5
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.40.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.40.0
index 255d302516d5..5f40eecf4ffd 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.40.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.40.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libwacom virtual/libudev:= >=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-0.40.0/xf86-input-wacom-0.40.0.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
 _md5_=943897cea583a0ba101e9d6f67f78f61
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-19.1.0 b/metadata/md5-cache/x11-drivers/xf86-video-ati-19.1.0
index 5a2b2a5bcb7f..ab7937dfd4ff 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-19.1.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-19.1.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.89[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-ati-19.1.0.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
 _md5_=63b71bb49878a9f9d257182e63e957f9
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-9999 b/metadata/md5-cache/x11-drivers/xf86-video-ati-9999
index f20fb09864ed..1bfbc18d0982 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-9999
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=x11-libs/libdrm-2.4.89[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
 _md5_=4ccd23c9fc15559658ab120527013da2
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200310 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200310
index 5fd7bed65998..88cf869c588b 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200310
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200310
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pi
 REQUIRED_USE=|| ( sna uxa )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/652d93cbbdc159c0883f1b626ea48e28bac63ae3/xf86-video-intel-2.99.917_p20200310.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
 _md5_=76c076377237352c977156e99a84a9d9
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200515 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200515
index 494cee38912a..0c9c7fb63ad9 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200515
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20200515
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pi
 REQUIRED_USE=|| ( sna uxa )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc/xf86-video-intel-2.99.917_p20200515.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
 _md5_=67a5ef9c6ce55209912fe530ca93987a
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20201215 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20201215
index d0f831239338..45d1a1644d88 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20201215
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20201215
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pi
 REQUIRED_USE=|| ( sna uxa )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/a511f22cdec56504913b457a2e60dafee8e2b570/xf86-video-intel-2.99.917_p20201215.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
 _md5_=0f8793bdc17af305141771840410d08f
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-9999 b/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
index d1398214e507..112d0ec2ff94 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.52[video_cards_intel] >=x11-base/xorg-server-1.18 tools? ( x11-libs/libX11 x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst ) udev? ( virtual/libudev:= ) xvmc? ( >=x11-libs/libXvMC-1.0.12-r1 >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 REQUIRED_USE=|| ( sna uxa )
 SLOT=0
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
 _md5_=27c3a41bb2277dfdba67e8e3fb669569
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.5.0 b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.5.0
index 16132f799636..e1e5e25b078d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.5.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-vesa-2.5.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.6 >=x11-libs/libpciaccess-0.12.901 x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-vesa-2.5.0.tar.bz2
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	021ee7e69b18b204b0d81fe0427c4273
 _md5_=47c632ffe765a2e8171e74196b05cb52
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 53ce57ff790c..f962383ba83c 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/gl2ps-1.4.2 b/metadata/md5-cache/x11-libs/gl2ps-1.4.2
index 4857fdc561e4..2635a3fc8eff 100644
--- a/metadata/md5-cache/x11-libs/gl2ps-1.4.2
+++ b/metadata/md5-cache/x11-libs/gl2ps-1.4.2
@@ -5,10 +5,10 @@ DESCRIPTION=OpenGL to PostScript printing library
 EAPI=7
 HOMEPAGE=http://www.geuz.org/gl2ps/
 IUSE=doc png zlib
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2
 RDEPEND=media-libs/freeglut x11-libs/libXmu png? ( media-libs/libpng:0= ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://geuz.org/gl2ps/src/gl2ps-1.4.2.tgz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=be2c4b7aa68ac66a24c01d9627efc818
+_md5_=3fb5196a6f930f40ad644da5f164f640
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.107 b/metadata/md5-cache/x11-libs/libdrm-2.4.107
index 4f35d295aea1..aefb4e8d14f3 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.107
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.107
@@ -1,5 +1,5 @@
-BDEPEND=>=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
 DEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind )
 DESCRIPTION=X.Org libdrm library
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.107.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3f0d41c88ab4b2205638193f43121d9d
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=bee187656cdbb20910eaa098df738afe
diff --git a/metadata/md5-cache/x11-libs/libdrm-9999 b/metadata/md5-cache/x11-libs/libdrm-9999
index df8af08ac690..82323f691b25 100644
--- a/metadata/md5-cache/x11-libs/libdrm-9999
+++ b/metadata/md5-cache/x11-libs/libdrm-9999
@@ -1,5 +1,5 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test unpack
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) || ( ( dev-lang/python:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test unpack
 DEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind )
 DESCRIPTION=X.Org libdrm library
 EAPI=7
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=f152a88c7190400c7ebe65553ea42e2d
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	meson	58dcef01376272b61b5c99ff57a11129	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dc5f2558590cd425833114bab8768fac
diff --git a/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.3.5 b/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.3.5
new file mode 100644
index 000000000000..c93eab1074d6
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libva-intel-media-driver-21.3.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/gmmlib-21.3.1 >=x11-libs/libva-2.13.0[X?]
+DESCRIPTION=Intel Media Driver for VAAPI (iHD)
+EAPI=7
+HOMEPAGE=https://github.com/intel/media-driver
+IUSE=+custom-cflags set-as-default test X
+KEYWORDS=~amd64
+LICENSE=MIT BSD
+RDEPEND=>=media-libs/gmmlib-21.3.1 >=x11-libs/libva-2.13.0[X?]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/intel/media-driver/archive/intel-media-21.3.5.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b7b9369fc9fa725cddfd707971bc3897
diff --git a/metadata/md5-cache/x11-libs/libva-intel-media-driver-9999 b/metadata/md5-cache/x11-libs/libva-intel-media-driver-9999
index 8b8ab99e84e3..bcb22ffdc5f0 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-media-driver-9999
+++ b/metadata/md5-cache/x11-libs/libva-intel-media-driver-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=media-libs/gmmlib-21.1.3 >=x11-libs/libva-2.11.0[X?]
+DEPEND=>=media-libs/gmmlib-21.3.1 >=x11-libs/libva-2.13.0[X?]
 DESCRIPTION=Intel Media Driver for VAAPI (iHD)
 EAPI=7
 HOMEPAGE=https://github.com/intel/media-driver
 IUSE=+custom-cflags set-as-default test X
 LICENSE=MIT BSD
 PROPERTIES=live
-RDEPEND=>=media-libs/gmmlib-21.1.3 >=x11-libs/libva-2.11.0[X?]
+RDEPEND=>=media-libs/gmmlib-21.3.1 >=x11-libs/libva-2.13.0[X?]
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c2d1297eea21a7bcbdd811536bc13b55
+_md5_=b7b9369fc9fa725cddfd707971bc3897
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.13.0 b/metadata/md5-cache/x11-libs/qscintilla-2.13.0
index a22d1e456c02..ec7f6e4d1237 100644
--- a/metadata/md5-cache/x11-libs/qscintilla-2.13.0
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=Qt port of Neil Hodgson's Scintilla C++ editor control
 EAPI=8
 HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
 IUSE=designer doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
 SLOT=0/15
 SRC_URI=https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.13.0/QScintilla_src-2.13.0.tar.gz
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d320842b73b00f7ff2639a5fe93c4ddc
+_md5_=73f4330badbbf8adbd68252c566e4827
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.13.1 b/metadata/md5-cache/x11-libs/qscintilla-2.13.1
new file mode 100644
index 000000000000..c7c14be96971
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.13.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
+DESCRIPTION=Qt port of Neil Hodgson's Scintilla C++ editor control
+EAPI=8
+HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
+IUSE=designer doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
+SLOT=0/15
+SRC_URI=https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.13.1/QScintilla_src-2.13.1.tar.gz
+_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=73f4330badbbf8adbd68252c566e4827
diff --git a/metadata/md5-cache/x11-libs/qwt-5.2.3_p20210211 b/metadata/md5-cache/x11-libs/qwt-5.2.3_p20210211
index 68e85d5195e1..38f2742e25ff 100644
--- a/metadata/md5-cache/x11-libs/qwt-5.2.3_p20210211
+++ b/metadata/md5-cache/x11-libs/qwt-5.2.3_p20210211
@@ -4,10 +4,10 @@ DESCRIPTION=2D plotting library for Qt5
 EAPI=7
 HOMEPAGE=https://qwt.sourceforge.io/ https://github.com/SciDAVis/qwt5-qt5
 IUSE=designer examples
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=qwt
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 designer? ( dev-qt/designer:5 )
 SLOT=5
 SRC_URI=https://github.com/SciDAVis/qwt5-qt5/archive/2a9f1ae2f394abf3a000906b507a0d925b1e4b25.tar.gz -> qwt-5.2.3_p20210211.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=27b4cca6aaed7fcf0808cd1759b8f4c0
+_md5_=4cc8f53d4ecde771c2a3d9cb80ba4248
diff --git a/metadata/md5-cache/x11-libs/xapps-2.2.3 b/metadata/md5-cache/x11-libs/xapps-2.2.3
deleted file mode 100644
index 13f97d8b5eb0..000000000000
--- a/metadata/md5-cache/x11-libs/xapps-2.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.40.6 sys-devel/gettext gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/glib-2.44.0:2 dev-libs/gobject-introspection:0= dev-libs/libdbusmenu[gtk3] gnome-base/libgnomekbd x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile
-DESCRIPTION=Cross-desktop libraries and common resources
-EAPI=7
-HOMEPAGE=https://github.com/linuxmint/xapp/
-IUSE=gtk-doc introspection static-libs python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/glib-2.44.0:2 dev-libs/gobject-introspection:0= dev-libs/libdbusmenu[gtk3] gnome-base/libgnomekbd x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/xapp/archive/2.2.3.tar.gz -> xapps-2.2.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c6d812675310e0fbd1c5245976d8bdb9
diff --git a/metadata/md5-cache/x11-libs/xapps-2.2.4 b/metadata/md5-cache/x11-libs/xapps-2.2.4
new file mode 100644
index 000000000000..a90e5387980c
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/xapps-2.2.4
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.40.6 sys-devel/gettext gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/glib-2.44.0:2 dev-libs/gobject-introspection:0= dev-libs/libdbusmenu[gtk3] gnome-base/libgnomekbd x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile
+DESCRIPTION=Cross-desktop libraries and common resources
+EAPI=7
+HOMEPAGE=https://github.com/linuxmint/xapp/
+IUSE=gtk-doc introspection static-libs python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-libs/glib-2.44.0:2 dev-libs/gobject-introspection:0= dev-libs/libdbusmenu[gtk3] gnome-base/libgnomekbd x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/xapp/archive/2.2.4.tar.gz -> xapps-2.2.4.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=c6d812675310e0fbd1c5245976d8bdb9
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 4752abbc6bca..16ce90c3d666 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/cbatticon-1.6.10 b/metadata/md5-cache/x11-misc/cbatticon-1.6.10
index defb342b457f..b42521ca56fe 100644
--- a/metadata/md5-cache/x11-misc/cbatticon-1.6.10
+++ b/metadata/md5-cache/x11-misc/cbatticon-1.6.10
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight and fast battery icon that sits in your system tray
 EAPI=6
 HOMEPAGE=https://github.com/valr/cbatticon
 IUSE=libnotify
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 libnotify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=https://github.com/valr/cbatticon/archive/1.6.10.tar.gz -> cbatticon-1.6.10.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d4c0b7d7e89c7d12bf0038558b54ca3b
+_md5_=777ae836a148acf6bd341d6fbd9e5dfd
diff --git a/metadata/md5-cache/x11-misc/compose-tables-1.7.2 b/metadata/md5-cache/x11-misc/compose-tables-1.7.2-r1
index 8ec0c572efdd..8ec0c572efdd 100644
--- a/metadata/md5-cache/x11-misc/compose-tables-1.7.2
+++ b/metadata/md5-cache/x11-misc/compose-tables-1.7.2-r1
diff --git a/metadata/md5-cache/x11-misc/copyq-5.0.0 b/metadata/md5-cache/x11-misc/copyq-5.0.0
new file mode 100644
index 000000000000..f538b182c322
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/copyq-5.0.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/wayland dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwayland:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/knotifications:5 x11-libs/libX11 x11-libs/libXtst test? ( dev-qt/qttest:5 )
+DESCRIPTION=Clipboard manager with advanced features
+EAPI=7
+HOMEPAGE=https://github.com/hluk/CopyQ
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=dev-libs/wayland dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwayland:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/knotifications:5 x11-libs/libX11 x11-libs/libXtst
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hluk/CopyQ/archive/v5.0.0.tar.gz -> copyq-5.0.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=08ad633dbd4b0ff8d59451da4d9a0a04
diff --git a/metadata/md5-cache/x11-misc/fireflies-2.08-r1 b/metadata/md5-cache/x11-misc/fireflies-2.08-r1
index be04ba400324..81527c1ebf95 100644
--- a/metadata/md5-cache/x11-misc/fireflies-2.08-r1
+++ b/metadata/md5-cache/x11-misc/fireflies-2.08-r1
@@ -1,12 +1,13 @@
+BDEPEND=sys-devel/autoconf-archive sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsdl[X,opengl,video] virtual/glu virtual/opengl x11-libs/libX11 sys-devel/autoconf-archive sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/libsdl[X,opengl,video] virtual/glu virtual/opengl x11-libs/libX11
 DESCRIPTION=Fireflies screensaver: Wicked cool eye candy
-EAPI=5
+EAPI=8
 HOMEPAGE=https://github.com/mpcomplete/fireflies
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2 icu
 RDEPEND=media-libs/libsdl[X,opengl,video] virtual/glu virtual/opengl x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/mpcomplete/fireflies/archive/v2.08.tar.gz -> fireflies-2.08.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=693e8bc740305aa2caebef7d544686fb
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c165ba4b8402d3fff2cf8ca292823d7b
diff --git a/metadata/md5-cache/x11-misc/gtkdialog-0.8.3_p20200202 b/metadata/md5-cache/x11-misc/gtkdialog-0.8.3_p20200202
index 28ed9ac0936e..ac338f86f798 100644
--- a/metadata/md5-cache/x11-misc/gtkdialog-0.8.3_p20200202
+++ b/metadata/md5-cache/x11-misc/gtkdialog-0.8.3_p20200202
@@ -9,6 +9,6 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=gtk2? ( x11-libs/gtk+:2 x11-libs/vte:0= ) !gtk2? ( x11-libs/gtk+:3 x11-libs/vte:2.91= )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/gtkdialog-0.8.3_p20200202.tar.xz
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/gtkdialog-0.8.3_p20200202.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=97a1473ef6cddf88de5354179232ac11
+_md5_=7252b374c064323da31642970072cae1
diff --git a/metadata/md5-cache/x11-misc/kbdd-0.7.1 b/metadata/md5-cache/x11-misc/kbdd-0.7.1
index 9960885d39e9..dae1be43286d 100644
--- a/metadata/md5-cache/x11-misc/kbdd-0.7.1
+++ b/metadata/md5-cache/x11-misc/kbdd-0.7.1
@@ -1,13 +1,14 @@
+BDEPEND=dev-util/glib-utils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare unpack
-DEPEND=dev-libs/glib:2= x11-libs/libX11:0= dbus? ( sys-apps/dbus:0= >=dev-libs/dbus-glib-0.86:0= ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/glib:2 x11-libs/libX11 dbus? ( sys-apps/dbus dev-libs/dbus-glib )
 DESCRIPTION=Very simple layout switcher
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/qnikst/kbdd
 IUSE=dbus
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2= x11-libs/libX11:0= dbus? ( sys-apps/dbus:0= >=dev-libs/dbus-glib-0.86:0= )
+RDEPEND=dev-libs/glib:2 x11-libs/libX11 dbus? ( sys-apps/dbus dev-libs/dbus-glib )
 SLOT=0
-SRC_URI=https://github.com/qnikst/kbdd/tarball/v0.7.1 -> kbdd-0.7.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7a883bc7373ad1de42fca0018322ec63
+SRC_URI=https://github.com/qnikst/kbdd/archive/v0.7.1.tar.gz -> kbdd-0.7.1.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=9771341903a648730f0ff4b8e600da91
diff --git a/metadata/md5-cache/x11-misc/parcellite-1.2.1 b/metadata/md5-cache/x11-misc/parcellite-1.2.1
index bd7c49712824..2e971652cefe 100644
--- a/metadata/md5-cache/x11-misc/parcellite-1.2.1
+++ b/metadata/md5-cache/x11-misc/parcellite-1.2.1
@@ -1,13 +1,14 @@
-DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2 x11-misc/xdotool virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-misc/xdotool
 DESCRIPTION=A lightweight GTK+ based clipboard manager
-EAPI=5
+EAPI=8
 HOMEPAGE=http://parcellite.sourceforge.net/
 IUSE=nls
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2 x11-misc/xdotool
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-misc/xdotool
 SLOT=0
 SRC_URI=mirror://sourceforge/parcellite/parcellite-1.2.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a52eaf1c99998e199d3cbf678c7347cd
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=2249f7c9dd056cc40c94c5d1008bc69b
diff --git a/metadata/md5-cache/x11-misc/picom-8.2-r2 b/metadata/md5-cache/x11-misc/picom-8.2-r2
index 8d29854fcdca..f5b2e37664d2 100644
--- a/metadata/md5-cache/x11-misc/picom-8.2-r2
+++ b/metadata/md5-cache/x11-misc/picom-8.2-r2
@@ -5,7 +5,7 @@ DESCRIPTION=A lightweight compositor for X11 (previously a compton fork)
 EAPI=7
 HOMEPAGE=https://github.com/yshui/picom
 IUSE=+config-file dbus +doc +drm opengl pcre test test
-KEYWORDS=amd64 ~ppc64 x86
+KEYWORDS=amd64 ~ppc64 ~riscv x86
 LICENSE=MPL-2.0 MIT
 RDEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton
 REQUIRED_USE=test? ( dbus )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/yshui/picom/archive/v8.2.tar.gz -> picom-8.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8f2f37d130ee0d5daf9bc5e469f4e671
+_md5_=b8da54a5b5847ab6c10c414087c04c92
diff --git a/metadata/md5-cache/x11-misc/projecteur-0.9.2 b/metadata/md5-cache/x11-misc/projecteur-0.9.2
new file mode 100644
index 000000000000..ad13251dcbcf
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/projecteur-0.9.2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/udev x11-libs/libX11
+DESCRIPTION=Linux Desktop Application for the Logitech Spotlight device
+EAPI=8
+HOMEPAGE=https://github.com/jahnf/Projecteur
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/udev x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/jahnf/Projecteur/archive/v0.9.2.tar.gz -> projecteur-0.9.2.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=bcf7898d245817b9faa71b6274cbaf9d
diff --git a/metadata/md5-cache/x11-misc/read-edid-3.0.2-r1 b/metadata/md5-cache/x11-misc/read-edid-3.0.2-r1
index f983d9b640f5..188c1df76052 100644
--- a/metadata/md5-cache/x11-misc/read-edid-3.0.2-r1
+++ b/metadata/md5-cache/x11-misc/read-edid-3.0.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Program that can get information from a PnP monitor
 EAPI=7
 HOMEPAGE=http://www.polypux.org/projects/read-edid/
 IUSE=vbe-mode kernel_linux
-KEYWORDS=amd64 ppc ~sparc x86
+KEYWORDS=amd64 ppc ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=vbe-mode? ( >=dev-libs/libx86-1.1 )
 SLOT=0
 SRC_URI=http://www.polypux.org/projects/read-edid/read-edid-3.0.2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=772085c569116cd8f3e94812d53f04e1
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9535a84c763d6d284c17954616c54db1
diff --git a/metadata/md5-cache/x11-misc/redshift-1.12-r5 b/metadata/md5-cache/x11-misc/redshift-1.12-r5
index 869aac898085..4cc0cdb64e00 100644
--- a/metadata/md5-cache/x11-misc/redshift-1.12-r5
+++ b/metadata/md5-cache/x11-misc/redshift-1.12-r5
@@ -4,11 +4,11 @@ DESCRIPTION=A screen color temperature adjusting software
 EAPI=6
 HOMEPAGE=http://jonls.dk/redshift/
 IUSE=appindicator geoclue gtk nls python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm appindicator? ( dev-libs/libappindicator:3[introspection] ) geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) gtk? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) gtk? ( dev-python/pygobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] x11-libs/gtk+:3[introspection] dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?] )
 REQUIRED_USE=gtk? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/jonls/redshift/archive/v1.12.tar.gz -> redshift-1.12.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=396dddf9fd7141e06b71c490cdcd23f6
+_md5_=2ff70219409b91b886e66a9949a97a1f
diff --git a/metadata/md5-cache/x11-misc/revelation-0.5.4-r1 b/metadata/md5-cache/x11-misc/revelation-0.5.4-r1
index 1e117721d898..131ff1683f18 100644
--- a/metadata/md5-cache/x11-misc/revelation-0.5.4-r1
+++ b/metadata/md5-cache/x11-misc/revelation-0.5.4-r1
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] dev-python/pygobject[python_targets_python3_8(-)] dev-libs/libpwquality[python,python_targets_python3_8(-)] ) x11-libs/gtk+:3 dev-libs/glib dev-libs/gobject-introspection dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] dev-python/pygobject[python_targets_python3_8(-)] dev-libs/libpwquality[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] dev-python/pygobject[python_targets_python3_9(-)] dev-libs/libpwquality[python,python_targets_python3_9(-)] ) x11-libs/gtk+:3 dev-libs/glib dev-libs/gobject-introspection dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A password manager for GNOME
 EAPI=7
 HOMEPAGE=https://revelation.olasagasti.info/ https://github.com/mikelolasagasti/revelation
-IUSE=+python_single_target_python3_8
+IUSE=python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] dev-python/pygobject[python_targets_python3_8(-)] dev-libs/libpwquality[python,python_targets_python3_8(-)] ) x11-libs/gtk+:3 dev-libs/glib dev-libs/gobject-introspection
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] dev-python/pygobject[python_targets_python3_8(-)] dev-libs/libpwquality[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] dev-python/pygobject[python_targets_python3_9(-)] dev-libs/libpwquality[python,python_targets_python3_9(-)] ) x11-libs/gtk+:3 dev-libs/glib dev-libs/gobject-introspection
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mikelolasagasti/revelation/releases/download/revelation-0.5.4/revelation-0.5.4.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b7a122ce87f41b80e5bd30e269bda0b3
+_md5_=b677f8c1102b0f94fd04c8ef8d7a24df
diff --git a/metadata/md5-cache/x11-misc/rofi-1.6.1 b/metadata/md5-cache/x11-misc/rofi-1.6.1
deleted file mode 100644
index a315a887d238..000000000000
--- a/metadata/md5-cache/x11-misc/rofi-1.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
-DESCRIPTION=A window switcher, run dialog and dmenu replacement
-EAPI=7
-HOMEPAGE=https://github.com/davatorium/rofi
-IUSE=+drun test +windowmode
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/davatorium/rofi/releases/download/1.6.1/rofi-1.6.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=355b6cdfd5bfe49aefdc5b1703be2acf
diff --git a/metadata/md5-cache/x11-misc/rofi-1.6.1-r1 b/metadata/md5-cache/x11-misc/rofi-1.6.1-r1
new file mode 100644
index 000000000000..3d455431a2d6
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/rofi-1.6.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
+DESCRIPTION=A window switcher, run dialog and dmenu replacement
+EAPI=7
+HOMEPAGE=https://github.com/davatorium/rofi
+IUSE=+drun test +windowmode
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=MIT
+RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/davatorium/rofi/releases/download/1.6.1/rofi-1.6.1.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=45ec3b2e40ea7aa223c27c94ef2a151c
diff --git a/metadata/md5-cache/x11-misc/rofi-1.7.0-r1 b/metadata/md5-cache/x11-misc/rofi-1.7.0-r1
new file mode 100644
index 000000000000..063463d46e84
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/rofi-1.7.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst prepare
+DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
+DESCRIPTION=A window switcher, run dialog and dmenu replacement
+EAPI=8
+HOMEPAGE=https://github.com/davatorium/rofi
+IUSE=+drun test +windowmode
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/davatorium/rofi/releases/download/1.7.0/rofi-1.7.0.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=dda4ef56d9172e5cf36d06c3ff198788
diff --git a/metadata/md5-cache/x11-misc/rofi-99999 b/metadata/md5-cache/x11-misc/rofi-99999
index 9ec67b1c7483..81717352c72a 100644
--- a/metadata/md5-cache/x11-misc/rofi-99999
+++ b/metadata/md5-cache/x11-misc/rofi-99999
@@ -1,14 +1,14 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare unpack
-DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm virtual/pkgconfig x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
+DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
 DESCRIPTION=A window switcher, run dialog and dmenu replacement
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/davatorium/rofi
-IUSE=test windowmode
+IUSE=+drun test +windowmode
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
+RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=7a85ad04df245e612e25ad2b09df5c11
+_md5_=826de0619078000e60e7568add1d6833
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.1.3-r1 b/metadata/md5-cache/x11-misc/safeeyes-2.1.3-r1
index 8bd74b646c23..0c762ccb0032 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.1.3-r1
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.1.3-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Linux alternative to EyeLeo
 EAPI=7
 HOMEPAGE=https://github.com/slgobinath/SafeEyes
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libappindicator:3[introspection] dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/croniter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-xlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-sound/alsa-utils x11-apps/xprop x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-misc/xprintidle python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.1.3.tar.gz
 _eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=19a30805e3ae0d19d0648ede9b3cf5cb
+_md5_=6ed100a6dbba469ae77c3c2b6d157876
diff --git a/metadata/md5-cache/x11-misc/shutter-0.97 b/metadata/md5-cache/x11-misc/shutter-0.97
deleted file mode 100644
index 9b05922bb046..000000000000
--- a/metadata/md5-cache/x11-misc/shutter-0.97
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Feature-rich screenshot program
-EAPI=7
-HOMEPAGE=https://shutter-project.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl dev-perl/Carp-Always dev-perl/libxml-perl dev-perl/libwww-perl dev-perl/Glib-Object-Introspection dev-perl/GooCanvas2 dev-perl/GooCanvas2-CairoTypes dev-perl/Gtk3 >=dev-perl/Gtk3-ImageView-9 dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Net-DBus dev-perl/Number-Bytes-Human dev-perl/Pango dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple virtual/imagemagick-tools[perl] x11-libs/libwnck:3[introspection]
-SLOT=0
-SRC_URI=https://github.com/shutter-project/shutter/archive/v0.97.tar.gz -> shutter-0.97.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	30ce9dec2b8943338c9b015bd32bac6a	prefix	d04f14b297013ad1410550c0757f14f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6c5f5fe46f36bedc6c6194dd001680c8
diff --git a/metadata/md5-cache/x11-misc/shutter-0.98 b/metadata/md5-cache/x11-misc/shutter-0.98
deleted file mode 100644
index 1499f1f3b8dc..000000000000
--- a/metadata/md5-cache/x11-misc/shutter-0.98
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Feature-rich screenshot program
-EAPI=7
-HOMEPAGE=https://shutter-project.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl dev-perl/Carp-Always dev-perl/libxml-perl dev-perl/libwww-perl dev-perl/Glib-Object-Introspection dev-perl/GooCanvas2 dev-perl/GooCanvas2-CairoTypes dev-perl/Gtk3 >=dev-perl/Gtk3-ImageView-9 dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Net-DBus dev-perl/Number-Bytes-Human dev-perl/Pango dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple virtual/imagemagick-tools[perl] x11-libs/libwnck:3[introspection]
-SLOT=0
-SRC_URI=https://github.com/shutter-project/shutter/archive/v0.98.tar.gz -> shutter-0.98.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	30ce9dec2b8943338c9b015bd32bac6a	prefix	d04f14b297013ad1410550c0757f14f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6c5f5fe46f36bedc6c6194dd001680c8
diff --git a/metadata/md5-cache/x11-misc/shutter-0.99 b/metadata/md5-cache/x11-misc/shutter-0.99
index d4e33c894e36..6afa2b373a84 100644
--- a/metadata/md5-cache/x11-misc/shutter-0.99
+++ b/metadata/md5-cache/x11-misc/shutter-0.99
@@ -3,10 +3,10 @@ DEFINED_PHASES=install postinst postrm preinst prepare
 DESCRIPTION=Feature-rich screenshot program
 EAPI=8
 HOMEPAGE=https://shutter-project.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl dev-perl/Carp-Always dev-perl/libxml-perl dev-perl/libwww-perl dev-perl/Glib-Object-Introspection dev-perl/GooCanvas2 dev-perl/GooCanvas2-CairoTypes dev-perl/Gtk3 >=dev-perl/Gtk3-ImageView-9 dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Net-DBus dev-perl/Number-Bytes-Human dev-perl/Pango dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple virtual/imagemagick-tools[perl] x11-libs/libwnck:3[introspection]
 SLOT=0
 SRC_URI=https://github.com/shutter-project/shutter/archive/v0.99.tar.gz -> shutter-0.99.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	30ce9dec2b8943338c9b015bd32bac6a	prefix	d04f14b297013ad1410550c0757f14f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e8bdc2cca087c744d88f437babbf9781
+_md5_=3a8bb7765b6cd5367e402c68177cafa6
diff --git a/metadata/md5-cache/x11-misc/shutter-0.99.1 b/metadata/md5-cache/x11-misc/shutter-0.99.1
new file mode 100644
index 000000000000..bb7f8b549b5f
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/shutter-0.99.1
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gettext
+DEFINED_PHASES=install postinst postrm preinst prepare
+DESCRIPTION=Feature-rich screenshot program
+EAPI=8
+HOMEPAGE=https://shutter-project.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-lang/perl dev-perl/Carp-Always dev-perl/libxml-perl dev-perl/libwww-perl dev-perl/Glib-Object-Introspection dev-perl/GooCanvas2 dev-perl/GooCanvas2-CairoTypes dev-perl/Gtk3 >=dev-perl/Gtk3-ImageView-10 dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Net-DBus dev-perl/Number-Bytes-Human dev-perl/Pango dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple virtual/imagemagick-tools[perl] x11-libs/libwnck:3[introspection]
+SLOT=0
+SRC_URI=https://github.com/shutter-project/shutter/archive/v0.99.1.tar.gz -> shutter-0.99.1.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	30ce9dec2b8943338c9b015bd32bac6a	prefix	d04f14b297013ad1410550c0757f14f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=e68ca011a00944d065a81c4329b8981d
diff --git a/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1 b/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1
index 831b4907eea7..503f106783f2 100644
--- a/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1
+++ b/metadata/md5-cache/x11-misc/spacefm-1.0.6-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils virtual/udev virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification ) video-thumbnails? ( media-video/ffmpegthumbnailer )
 SLOT=0
 SRC_URI=https://github.com/IgnorantGuru/spacefm/archive/1.0.6.tar.gz -> spacefm-1.0.6.tar.gz
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ecd3ebc43b87e990a42fa0297e125e1f
diff --git a/metadata/md5-cache/x11-misc/spacefm-9999 b/metadata/md5-cache/x11-misc/spacefm-9999
index 1fc3b0ed6f15..31edd8a316cd 100644
--- a/metadata/md5-cache/x11-misc/spacefm-9999
+++ b/metadata/md5-cache/x11-misc/spacefm-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils virtual/udev virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification ) video-thumbnails? ( media-video/ffmpegthumbnailer )
 SLOT=0
-_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=ecd3ebc43b87e990a42fa0297e125e1f
diff --git a/metadata/md5-cache/x11-misc/sxhkd-0.6.1 b/metadata/md5-cache/x11-misc/sxhkd-0.6.1
deleted file mode 100644
index d73226d48db8..000000000000
--- a/metadata/md5-cache/x11-misc/sxhkd-0.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libxcb x11-libs/xcb-util-keysyms x11-libs/xcb-util
-DESCRIPTION=Simple X hotkey daemon
-EAPI=7
-HOMEPAGE=https://github.com/baskerville/sxhkd/
-KEYWORDS=amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=x11-libs/libxcb x11-libs/xcb-util-keysyms
-SLOT=0
-SRC_URI=https://github.com/baskerville/sxhkd/archive/0.6.1.tar.gz -> sxhkd-0.6.1.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=93167f8d491ae3f08b802f82b61ced86
diff --git a/metadata/md5-cache/x11-misc/tabbed-0.6-r1 b/metadata/md5-cache/x11-misc/tabbed-0.6-r1
index b150586bb8f9..7844f62df450 100644
--- a/metadata/md5-cache/x11-misc/tabbed-0.6-r1
+++ b/metadata/md5-cache/x11-misc/tabbed-0.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple generic tabbed fronted to xembed aware applications
 EAPI=7
 HOMEPAGE=https://tools.suckless.org/tabbed
 IUSE=savedconfig
-KEYWORDS=amd64 arm64 ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/tabbed-0.6.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5bea8a5fd3a814bb6c2a39a40191c4a9
+_md5_=34e6fae507939013f07fe2d9554de6b5
diff --git a/metadata/md5-cache/x11-misc/xdotool-3.20210903.1 b/metadata/md5-cache/x11-misc/xdotool-3.20210903.1
index 85fb89d9d6f7..b2db0c238094 100644
--- a/metadata/md5-cache/x11-misc/xdotool-3.20210903.1
+++ b/metadata/md5-cache/x11-misc/xdotool-3.20210903.1
@@ -5,11 +5,11 @@ DESCRIPTION=Simulate keyboard input and mouse activity, move and resize windows
 EAPI=8
 HOMEPAGE=https://www.semicomplete.com/projects/xdotool/
 IUSE=examples
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=x11-libs/libX11 x11-libs/libXi x11-libs/libXinerama x11-libs/libXtst x11-libs/libxkbcommon
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jordansissel/xdotool/releases/download/v3.20210903.1/xdotool-3.20210903.1.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=16404c97ebe1efd623b81e6f28408dc6
+_md5_=eb4273cbfb6b37760b401f21d6c6e9cf
diff --git a/metadata/md5-cache/x11-misc/xfishtank-2.5 b/metadata/md5-cache/x11-misc/xfishtank-2.5
index ff1d4f3f088f..c183d0a06506 100644
--- a/metadata/md5-cache/x11-misc/xfishtank-2.5
+++ b/metadata/md5-cache/x11-misc/xfishtank-2.5
@@ -8,6 +8,6 @@ KEYWORDS=amd64 ppc ppc64 x86 ~x86-linux
 LICENSE=public-domain
 RDEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXt
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/xfishtank-2.5.tar.gz
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/xfishtank-2.5.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=fcb5cf396ae4d2288d6f8802485c6524
+_md5_=d5a62994fa8b2016273207ceb3e81482
diff --git a/metadata/md5-cache/x11-misc/xprintidle-2.1 b/metadata/md5-cache/x11-misc/xprintidle-2.1
index 6499bec7154e..31cf9f88cd66 100644
--- a/metadata/md5-cache/x11-misc/xprintidle-2.1
+++ b/metadata/md5-cache/x11-misc/xprintidle-2.1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=-
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver
 DESCRIPTION=Prints user's X server idle time in milliseconds
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/lucianposton/xprintidle
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver
 SLOT=0
 SRC_URI=https://github.com/lucianposton/xprintidle/archive/v2.1.tar.gz -> xprintidle-2.1.tar.gz
-_md5_=415ef61a8db6ee46d44b220255a75024
+_md5_=32300658be5effeb7a325674f98c9157
diff --git a/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r2 b/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r2
index 4802ddff4ef8..693f54ef64f6 100644
--- a/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r2
+++ b/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r2
@@ -7,6 +7,6 @@ KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXtst
 SLOT=0
-SRC_URI=ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/xsetleds-0.1.3.tar.gz https://dev.gentoo.org/~jer/xsetleds-0.1.3.tar.gz
+SRC_URI=ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/xsetleds-0.1.3.tar.gz https://dev.gentoo.org/~jsmolic/distfiles/xsetleds-0.1.3.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=148c90e9a3e6be5fa36dca2921ebdd1f
+_md5_=d6964b379aae3454d1968d06a45f771e
diff --git a/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1 b/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
index 62b8a588bfad..0dd829443c7c 100644
--- a/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
+++ b/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
@@ -9,6 +9,6 @@ KEYWORDS=amd64 ppc x86
 LICENSE=Artistic-2
 RDEPEND=x11-libs/gdk-pixbuf-xlib x11-libs/libX11 x11-libs/libXpm x11-libs/libXt svg? ( dev-libs/glib:2 gnome-base/librsvg:2 x11-libs/gtk+:2 )
 SLOT=0
-SRC_URI=mirror://sourceforge/xxkb/xxkb-1.11.1-src.tar.gz svg? ( https://dev.gentoo.org/~jer/xxkb-flags.tar.bz2 )
+SRC_URI=mirror://sourceforge/xxkb/xxkb-1.11.1-src.tar.gz svg? ( https://dev.gentoo.org/~jsmolic/distfiles/xxkb-flags.tar.bz2 )
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=53920838e5b7e59c3ac710a492fa718f
+_md5_=b263387af11b0d0f277746bbe26166a8
diff --git a/metadata/md5-cache/x11-misc/zim-0.74.2 b/metadata/md5-cache/x11-misc/zim-0.74.2
new file mode 100644
index 000000000000..6c9441b9e64a
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/zim-0.74.2
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) x11-libs/gtk+:3[introspection] x11-misc/xdg-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A desktop wiki
+EAPI=7
+HOMEPAGE=https://zim-wiki.org/ https://github.com/zim-desktop-wiki/zim-desktop-wiki
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD GPL-2+
+RDEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.74.2.tar.gz -> zim-0.74.2.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1401e893a6991d8e25975419188fa7fe
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 3af6171998c2..1b3a0bc3ff40 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/wmfsm-0.36 b/metadata/md5-cache/x11-plugins/wmfsm-0.36
deleted file mode 100644
index 60a0bf7e758f..000000000000
--- a/metadata/md5-cache/x11-plugins/wmfsm-0.36
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXpm x11-base/xorg-proto sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=dockapp for monitoring filesystem usage
-EAPI=5
-HOMEPAGE=https://www.dockapps.net/wmfsm
-KEYWORDS=amd64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXpm
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmfsm-0.36.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c77cbe7d362b4ea67dc62fbc367d7886
diff --git a/metadata/md5-cache/x11-plugins/wmfsm-0.36-r1 b/metadata/md5-cache/x11-plugins/wmfsm-0.36-r1
index 953ad4043fa4..79f573e1c8ab 100644
--- a/metadata/md5-cache/x11-plugins/wmfsm-0.36-r1
+++ b/metadata/md5-cache/x11-plugins/wmfsm-0.36-r1
@@ -1,12 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=prepare
-DEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXpm x11-base/xorg-proto sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=dockapp for monitoring filesystem usage
-EAPI=5
+EAPI=8
 HOMEPAGE=https://www.dockapps.net/wmfsm
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXpm
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmfsm-0.36.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=605dffe0bf27e10a0634e1b1dda0ecbc
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8766dee4c508f224fab9ade6067b1874
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 925b5d203530..981a82114efa 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/guake-3.8.0 b/metadata/md5-cache/x11-terms/guake-3.8.0
new file mode 100644
index 000000000000..49571f3cf975
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/guake-3.8.0
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-python/pbr[python_targets_python3_8(-)] test? ( dev-python/pyfakefs[python_targets_python3_8(-)] dev-python/pytest-mock[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/pbr[python_targets_python3_9(-)] test? ( dev-python/pyfakefs[python_targets_python3_9(-)] dev-python/pytest-mock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/pbr[python_targets_python3_10(-)] test? ( dev-python/pyfakefs[python_targets_python3_10(-)] dev-python/pytest-mock[python_targets_python3_10(-)] ) ) dev-libs/glib:2 gnome-base/gsettings-desktop-schemas sys-devel/gettext test? ( python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) dev-libs/keybinder:3[introspection] x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-4.5.0[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DESCRIPTION=Drop-down terminal for GNOME
+EAPI=7
+HOMEPAGE=http://guake-project.org/
+IUSE=utempter test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) dev-libs/keybinder:3[introspection] x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Guake/guake/archive/refs/tags/3.8.0.tar.gz -> guake-3.8.0.tar.gz
+_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8152f159b88cbdf26d0077557cb91703
diff --git a/metadata/md5-cache/x11-terms/guake-9999 b/metadata/md5-cache/x11-terms/guake-9999
deleted file mode 100644
index eb6a648d67c2..000000000000
--- a/metadata/md5-cache/x11-terms/guake-9999
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=gnome-base/gsettings-desktop-schemas sys-devel/gettext python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pbr[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pbr[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter )
-DESCRIPTION=Drop-down terminal for GNOME
-EAPI=7
-HOMEPAGE=https://github.com/Guake/guake/ https://pypi.org/project/guake/
-IUSE=utempter python_single_target_python3_8 python_single_target_python3_9
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pbr[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pbr[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-_eclasses_=distutils-r1	252d4f554e611b0af601160a9c7be049	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	355c758ccc0d6df60d43a066640e642c	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=898d8cea70d11b725f5b65209208fc2d
diff --git a/metadata/md5-cache/x11-terms/kitty-0.19.3 b/metadata/md5-cache/x11-terms/kitty-0.19.3
deleted file mode 100644
index d29af0c3d903..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-0.19.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= media-libs/lcms media-libs/libcanberra media-libs/libpng:0= sys-apps/dbus sys-libs/zlib x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-terms/kitty-terminfo wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) media-libs/mesa[X] sys-libs/ncurses dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
-EAPI=7
-HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug wayland +python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= media-libs/lcms media-libs/libcanberra media-libs/libpng:0= sys-apps/dbus sys-libs/zlib x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-terms/kitty-terminfo wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.19.3/kitty-0.19.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=a583bd712eaebc08d2fd7ce0119d367c
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.19.3 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.19.3
deleted file mode 100644
index e19a50a3cda5..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-terminfo-0.19.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=|| ( dev-lang/python:3.8 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Terminfo for kitty, an OpenGL-based terminal emulator
-EAPI=7
-HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.19.3/kitty-0.19.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4397b640a2218503f172ad4e457b299c
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.20.1 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.20.1
deleted file mode 100644
index 7ee0e6932112..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-terminfo-0.20.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=|| ( dev-lang/python:3.8 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Terminfo for kitty, an OpenGL-based terminal emulator
-EAPI=7
-HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.20.1/kitty-0.20.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=0d1b70b9610f83776b8be616103ce425
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.20.3 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.20.3
deleted file mode 100644
index da27b027ca08..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-terminfo-0.20.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Terminfo for kitty, an OpenGL-based terminal emulator
-EAPI=7
-HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.20.3/kitty-0.20.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bfabdc8957c0f5d7ed02adeff8669c46
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.23.1 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.23.1
index a1ded22588b6..26e621f3ba7c 100644
--- a/metadata/md5-cache/x11-terms/kitty-terminfo-0.23.1
+++ b/metadata/md5-cache/x11-terms/kitty-terminfo-0.23.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Terminfo for kitty, an OpenGL-based terminal emulator
 EAPI=7
 HOMEPAGE=https://github.com/kovidgoyal/kitty
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.23.1/kitty-0.23.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bfabdc8957c0f5d7ed02adeff8669c46
+_md5_=191e17e4c245d8b32e7bc4d339070b32
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-9999 b/metadata/md5-cache/x11-terms/kitty-terminfo-9999
index 9abae8125e6f..1c38b4fdc192 100644
--- a/metadata/md5-cache/x11-terms/kitty-terminfo-9999
+++ b/metadata/md5-cache/x11-terms/kitty-terminfo-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=|| ( dev-lang/python:3.8 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Terminfo for kitty, an OpenGL-based terminal emulator
 EAPI=7
 HOMEPAGE=https://github.com/kovidgoyal/kitty
@@ -10,4 +10,4 @@ PROPERTIES=live
 RESTRICT=test
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=fb3152efbcbf5a53be9a838a3b6f2282
+_md5_=f7b34c84dd88244d2d3eda488c816c93
diff --git a/metadata/md5-cache/x11-terms/root-tail-1.2-r4 b/metadata/md5-cache/x11-terms/root-tail-1.2-r4
index 27e6282c80a8..02d015b739f2 100644
--- a/metadata/md5-cache/x11-terms/root-tail-1.2-r4
+++ b/metadata/md5-cache/x11-terms/root-tail-1.2-r4
@@ -5,10 +5,10 @@ DESCRIPTION=Terminal to display (multiple) log files on the root window
 EAPI=7
 HOMEPAGE=http://oldhome.schmorp.de/marc/root-tail.html
 IUSE=kde debug
-KEYWORDS=amd64 ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXext x11-libs/libX11
 SLOT=0
 SRC_URI=http://oldhome.schmorp.de/marc/data/root-tail-1.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0eb19d4227cdd6488faa3f9fc214b9df
+_md5_=974eebfa67db34f9226cab8e5129740d
diff --git a/metadata/md5-cache/x11-terms/st-0.8.4-r1 b/metadata/md5-cache/x11-terms/st-0.8.4-r1
new file mode 100644
index 000000000000..4161282cee61
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/st-0.8.4-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXft x11-base/xorg-proto
+DESCRIPTION=Simple terminal implementation for X
+EAPI=7
+HOMEPAGE=https://st.suckless.org/
+IUSE=savedconfig savedconfig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86
+LICENSE=MIT-with-advertising
+RDEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXft
+SLOT=0
+SRC_URI=https://dl.suckless.org/st/st-0.8.4.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=0b91d42eb568d86600f8d005530a3b48
diff --git a/metadata/md5-cache/x11-terms/st-9999 b/metadata/md5-cache/x11-terms/st-9999
index 898749836a81..16ce424d63a9 100644
--- a/metadata/md5-cache/x11-terms/st-9999
+++ b/metadata/md5-cache/x11-terms/st-9999
@@ -1,6 +1,6 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXft virtual/pkgconfig x11-base/xorg-proto
+DEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXft x11-base/xorg-proto
 DESCRIPTION=simple terminal implementation for X
 EAPI=7
 HOMEPAGE=https://st.suckless.org/
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-6.0:0= media-libs/fontconfig x11-libs/libX11 x11-libs/libXft
 SLOT=0
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	portability	d1186f1e621de7b27ddcae82e6253259	savedconfig	ed1a8cb208fa9ffa1861271194406651	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d23864ea1166311df653225ae4ecc590
+_md5_=4ebf885873a10531010d37161d779247
diff --git a/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.9.2 b/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.9.2
deleted file mode 100644
index 5226b2dde3dd..000000000000
--- a/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.9.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=dev-libs/glib-2.38:2= >=x11-libs/gtk+-3.20.8:3= x11-libs/libX11:= >=x11-libs/vte-0.38:2.91= >=xfce-base/libxfce4ui-4.10:=[gtk3(+)] utempter? ( sys-libs/libutempter:= ) dev-libs/libxml2 dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A terminal emulator for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://docs.xfce.org/apps/terminal/start
-IUSE=utempter
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.38:2= >=x11-libs/gtk+-3.20.8:3= x11-libs/libX11:= >=x11-libs/vte-0.38:2.91= >=xfce-base/libxfce4ui-4.10:=[gtk3(+)] utempter? ( sys-libs/libutempter:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-0.8.9.2.tar.bz2
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24
-_md5_=35ddb681142e248a4fc9752c5e4f11ea
diff --git a/metadata/md5-cache/x11-terms/xfce4-terminal-0.9.0 b/metadata/md5-cache/x11-terms/xfce4-terminal-0.9.0
new file mode 100644
index 000000000000..44d5f1da9153
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/xfce4-terminal-0.9.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/libxml2 dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.22:3= x11-libs/libX11:= >=x11-libs/vte-0.46:2.91= >=xfce-base/libxfce4ui-4.14:=[gtk3(+)] >=xfce-base/xfconf-4.14:= utempter? ( sys-libs/libutempter:= )
+DESCRIPTION=A terminal emulator for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/apps/terminal/start
+IUSE=utempter
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.22:3= x11-libs/libX11:= >=x11-libs/vte-0.46:2.91= >=xfce-base/libxfce4ui-4.14:=[gtk3(+)] >=xfce-base/xfconf-4.14:= utempter? ( sys-libs/libutempter:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfce4-terminal/0.9/xfce4-terminal-0.9.0.tar.bz2
+_eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=6df6bb60e17b854c4f4b26446d7fb390
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index add2eb8620d2..6500797e4bdc 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/fvwm-crystal-3.7.1 b/metadata/md5-cache/x11-themes/fvwm-crystal-3.7.1
new file mode 100644
index 000000000000..3d3d275a53b7
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/fvwm-crystal-3.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst setup
+DESCRIPTION=Configurable FVWM theme with transparency and freedesktop compatible menu
+EAPI=8
+HOMEPAGE=http://fvwm-crystal.sourceforge.net/
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) acct-group/fvwm-crystal >=x11-wm/fvwm-2.6.9[png] virtual/imagemagick-tools || ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer ) || ( x11-misc/hsetroot media-gfx/feh ) sys-apps/sed sys-devel/bc virtual/awk x11-apps/xwd media-sound/alsa-utils
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=mirror://sourceforge/fvwm-crystal/fvwm-crystal-3.7.1.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	655fe65f186504e455c2f3116808fda8	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=2964ca1b9ffeb9e484f6a896e72f9d3c
diff --git a/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r3 b/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r3
deleted file mode 100644
index 326116b2d45b..000000000000
--- a/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A high quality set of animated mouse cursors
-EAPI=7
-HOMEPAGE=https://store.kde.org/p/999966/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=x11-libs/libXcursor
-SLOT=0
-SRC_URI=mirror://gentoo/5533-Silver-XCursors-3D-0.4.tar.bz2
-_md5_=70acc2e196ea0cf1b889d70b2fdf2d3b
diff --git a/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r4 b/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r4
new file mode 100644
index 000000000000..9c12f18c4fb4
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=A high quality set of animated mouse cursors
+EAPI=7
+HOMEPAGE=https://store.kde.org/p/999966/
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=x11-libs/libXcursor
+SLOT=0
+SRC_URI=mirror://gentoo/5533-Silver-XCursors-3D-0.4.tar.bz2
+_md5_=91d51a987ccc28e5fcf464772dc94562
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index b2ee068f5871..3c14ae292c4a 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/i3-4.19.2 b/metadata/md5-cache/x11-wm/i3-4.19.2
index e0ad3b1551df..3174f89ee443 100644
--- a/metadata/md5-cache/x11-wm/i3-4.19.2
+++ b/metadata/md5-cache/x11-wm/i3-4.19.2
@@ -5,11 +5,11 @@ DESCRIPTION=An improved dynamic tiling window manager
 EAPI=7
 HOMEPAGE=https://i3wm.org/
 IUSE=doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://i3wm.org/downloads/i3-4.19.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-utils-r1	655fe65f186504e455c2f3116808fda8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=aac752da7940ab85febe793dd5d0880b
+_md5_=d655ec438d92c0d3d2f5cb3a93e8c6b5
diff --git a/metadata/md5-cache/x11-wm/icewm-2.7.0 b/metadata/md5-cache/x11-wm/icewm-2.7.0
index 8d2193325d58..c153eee0968c 100644
--- a/metadata/md5-cache/x11-wm/icewm-2.7.0
+++ b/metadata/md5-cache/x11-wm/icewm-2.7.0
@@ -5,7 +5,7 @@ DESCRIPTION=Ice Window Manager with Themes
 EAPI=7
 HOMEPAGE=https://ice-wm.org/ https://github.com/ice-wm/icewm
 IUSE=+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama
-KEYWORDS=amd64 ~ppc ~ppc64 sparc x86
+KEYWORDS=amd64 ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender dev-libs/glib:2 x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) !gdk-pixbuf? ( imlib? ( gnome-base/librsvg:2 media-libs/imlib2 ) !imlib? ( media-libs/libpng:0= virtual/jpeg ) ) xinerama? ( x11-libs/libXinerama )
 REQUIRED_USE=|| ( alsa ao )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ice-wm/icewm/releases/download/2.7.0/icewm-2.7.0.tar.lz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4
-_md5_=9a623b16de2ff4d1773e8f61a81ed48c
+_md5_=4ac06f1d07e8b8dfc66075ed2f059d77
diff --git a/metadata/md5-cache/x11-wm/metacity-3.36.1 b/metadata/md5-cache/x11-wm/metacity-3.36.1
deleted file mode 100644
index 1ed5d6b00b56..000000000000
--- a/metadata/md5-cache/x11-wm/metacity-3.36.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.44.0:2 >=x11-libs/gtk+-3.22.0:3[X] >=x11-libs/pango-1.2.0 >=x11-libs/libXcomposite-0.3 >=gnome-base/gsettings-desktop-schemas-3.3.0 x11-libs/libXfixes x11-libs/libXrender x11-libs/libXdamage libcanberra? ( media-libs/libcanberra[gtk3] ) >=x11-libs/startup-notification-0.7 x11-libs/libXcursor gnome-base/libgtop:2= x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) x11-libs/libXrandr x11-libs/libXext x11-libs/libICE x11-libs/libSM gnome-extra/zenity vulkan? ( media-libs/vulkan-loader ) vulkan? ( dev-util/vulkan-headers ) dev-util/glib-utils >=sys-devel/gettext-0.19.4 x11-base/xorg-proto virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME Flashback window manager
-EAPI=6
-HOMEPAGE=https://gitlab.gnome.org/GNOME/metacity/
-IUSE=+libcanberra vulkan xinerama
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.44.0:2 >=x11-libs/gtk+-3.22.0:3[X] >=x11-libs/pango-1.2.0 >=x11-libs/libXcomposite-0.3 >=gnome-base/gsettings-desktop-schemas-3.3.0 x11-libs/libXfixes x11-libs/libXrender x11-libs/libXdamage libcanberra? ( media-libs/libcanberra[gtk3] ) >=x11-libs/startup-notification-0.7 x11-libs/libXcursor gnome-base/libgtop:2= x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) x11-libs/libXrandr x11-libs/libXext x11-libs/libICE x11-libs/libSM gnome-extra/zenity vulkan? ( media-libs/vulkan-loader )
-SLOT=0
-SRC_URI=mirror://gnome/sources/metacity/3.36/metacity-3.36.1.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=34af5da6af56a613b70d48e5d7492e27
diff --git a/metadata/md5-cache/x11-wm/muffin-5.0.1-r1 b/metadata/md5-cache/x11-wm/muffin-5.0.1-r1
deleted file mode 100644
index 339916fb80d0..000000000000
--- a/metadata/md5-cache/x11-wm/muffin-5.0.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/glib-utils dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=configure install postinst postrm prepare test
-DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=dev-libs/json-glib-1.0 >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/zenity >=media-libs/libcanberra-0.26[gtk3] virtual/opengl >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=x11-libs/libXcomposite-0.3 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.6.0 >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender >=x11-libs/pango-1.14.0[X,introspection?] >=x11-libs/startup-notification-0.7:= x11-misc/xkeyboard-config introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 )
-DESCRIPTION=Compositing window manager forked from Mutter for use with Cinnamon
-EAPI=7
-HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin
-IUSE=+introspection test xinerama test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=dev-libs/json-glib-1.0 >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/zenity >=media-libs/libcanberra-0.26[gtk3] virtual/opengl >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=x11-libs/libXcomposite-0.3 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.6.0 >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender >=x11-libs/pango-1.14.0[X,introspection?] >=x11-libs/startup-notification-0.7:= x11-misc/xkeyboard-config introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) xinerama? ( x11-libs/libXinerama )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/muffin/archive/5.0.1.tar.gz -> muffin-5.0.1.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=1ff181e36f3b9f2fd513350e8306070e
diff --git a/metadata/md5-cache/x11-wm/muffin-5.0.2 b/metadata/md5-cache/x11-wm/muffin-5.0.2
new file mode 100644
index 000000000000..7e45e080896a
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/muffin-5.0.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=configure install postinst postrm prepare test
+DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=dev-libs/json-glib-1.0 >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/zenity >=media-libs/libcanberra-0.26[gtk3] virtual/opengl >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=x11-libs/libXcomposite-0.3 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.6.0 >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender >=x11-libs/pango-1.14.0[X,introspection?] >=x11-libs/startup-notification-0.7:= x11-misc/xkeyboard-config introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 )
+DESCRIPTION=Compositing window manager forked from Mutter for use with Cinnamon
+EAPI=7
+HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin
+IUSE=+introspection test xinerama test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=dev-libs/json-glib-1.0 >=gnome-extra/cinnamon-desktop-5.0:0= gnome-extra/zenity >=media-libs/libcanberra-0.26[gtk3] virtual/opengl >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=x11-libs/libXcomposite-0.3 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.6.0 >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender >=x11-libs/pango-1.14.0[X,introspection?] >=x11-libs/startup-notification-0.7:= x11-misc/xkeyboard-config introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) xinerama? ( x11-libs/libXinerama )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/muffin/archive/5.0.2.tar.gz -> muffin-5.0.2.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=1ff181e36f3b9f2fd513350e8306070e
diff --git a/metadata/md5-cache/x11-wm/mutter-40.5-r1 b/metadata/md5-cache/x11-wm/mutter-40.5-r1
new file mode 100644
index 000000000000..248ce01845b6
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/mutter-40.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/wayland dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 || ( x11-libs/libxcvt <x11-base/xorg-server-1.20.11-r3[xorg,-minimal] ) ) app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] >=dev-libs/glib-2.67.3:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) wayland? ( >=dev-libs/wayland-protocols-1.19 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.15.0 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) x11-base/xorg-proto sysprof? ( >=dev-util/sysprof-common-3.38.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME compositing window manager based on Clutter
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
+IUSE=elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] >=dev-libs/glib-2.67.3:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) wayland? ( >=dev-libs/wayland-protocols-1.19 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.15.0 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gnome-extra/zenity
+REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
+RESTRICT=!test? ( test )
+SLOT=0/8
+SRC_URI=mirror://gnome/sources/mutter/40/mutter-40.5.tar.xz https://dev.gentoo.org/~leio/distfiles/mutter-40.5-r1-patchset.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3bdeb93f07a553b4c0f024b0895a0e2b
diff --git a/metadata/md5-cache/x11-wm/mutter-41.0-r1 b/metadata/md5-cache/x11-wm/mutter-41.0-r1
new file mode 100644
index 000000000000..7729ff2eb694
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/mutter-41.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/wayland dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.5 x11-misc/xvfb-run ) wayland? ( >=sys-kernel/linux-headers-4.4 || ( x11-libs/libxcvt <x11-base/xorg-server-1.20.11-r3[xorg,-minimal] ) ) app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.21 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.18.0 elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) x11-base/xorg-proto sysprof? ( >=dev-util/sysprof-common-3.38.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME compositing window manager based on Clutter
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
+IUSE=elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.21 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.18.0 elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gnome-extra/zenity
+REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
+RESTRICT=!test? ( test )
+SLOT=0/9
+SRC_URI=mirror://gnome/sources/mutter/41/mutter-41.0.tar.xz https://dev.gentoo.org/~leio/distfiles/mutter-41.0-r1-patchset.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	58dcef01376272b61b5c99ff57a11129	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=049d221d50f03c9e12c9982c59c97da9
diff --git a/metadata/md5-cache/x11-wm/page-1.9.9-r3 b/metadata/md5-cache/x11-wm/page-1.9.9-r3
index 096bb8637c77..89284b0a4a65 100644
--- a/metadata/md5-cache/x11-wm/page-1.9.9-r3
+++ b/metadata/md5-cache/x11-wm/page-1.9.9-r3
@@ -9,4 +9,4 @@ RDEPEND=>=x11-libs/libxcb-1.11[xkb] >=x11-libs/xcb-util-0.4.0 >=x11-libs/libXfix
 SLOT=0
 SRC_URI=http://www.hzog.net/pub/page-1.9.9-r1.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ca02c71b33e671ea9138020a97997536
+_md5_=4237cad1857572525d1a2ae52dd8b509
diff --git a/metadata/md5-cache/x11-wm/pekwm-0.1.17-r3 b/metadata/md5-cache/x11-wm/pekwm-0.1.17-r3
index e553007c6912..872d30e34d20 100644
--- a/metadata/md5-cache/x11-wm/pekwm-0.1.17-r3
+++ b/metadata/md5-cache/x11-wm/pekwm-0.1.17-r3
@@ -9,6 +9,6 @@ KEYWORDS=amd64 ~mips ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0= virtual/jpeg:0 x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender truetype? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
-SRC_URI=https://github.com/pekdon/pekwm/archive/release-0.1.17.tar.gz -> pekwm-0.1.17.tar.gz themes? ( https://dev.gentoo.org/~jer/pekwm-themes.tar.bz2 )
+SRC_URI=https://github.com/pekdon/pekwm/archive/release-0.1.17.tar.gz -> pekwm-0.1.17.tar.gz themes? ( https://dev.gentoo.org/~jsmolic/distfiles/pekwm-themes.tar.bz2 )
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=00fa3c27cc15a38d79cb1a73f7811d79
+_md5_=6206ef19de348b89acc882672f0866de
diff --git a/metadata/md5-cache/x11-wm/pekwm-0.1.18 b/metadata/md5-cache/x11-wm/pekwm-0.1.18
index 261884a45789..044dbea8c9b9 100644
--- a/metadata/md5-cache/x11-wm/pekwm-0.1.18
+++ b/metadata/md5-cache/x11-wm/pekwm-0.1.18
@@ -9,6 +9,6 @@ KEYWORDS=amd64 ~mips ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0= virtual/jpeg:0 x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender truetype? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
-SRC_URI=https://github.com/pekdon/pekwm/archive/release-0.1.18.tar.gz -> pekwm-0.1.18.tar.gz themes? ( https://dev.gentoo.org/~jer/pekwm-themes.tar.bz2 )
+SRC_URI=https://github.com/pekdon/pekwm/archive/release-0.1.18.tar.gz -> pekwm-0.1.18.tar.gz themes? ( https://dev.gentoo.org/~jsmolic/distfiles/pekwm-themes.tar.bz2 )
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b0231011f1eb084ec067547c25f08ee2
+_md5_=8c70b0ebb85cde315b7d0abab7991fd8
diff --git a/metadata/md5-cache/x11-wm/subtle-0.11.3244 b/metadata/md5-cache/x11-wm/subtle-0.11.3244
deleted file mode 100644
index 8defe75c0d24..000000000000
--- a/metadata/md5-cache/x11-wm/subtle-0.11.3244
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( ruby_targets_ruby26? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-DESCRIPTION=A manual tiling window manager
-EAPI=7
-HOMEPAGE=https://subforge.org/projects/subtle/wiki
-IUSE=debug doc +xft xinerama xpm +xrandr +xtest test ruby_targets_ruby26
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) ruby_targets_ruby26? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
-REQUIRED_USE=|| ( ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~radhermit/dist/subtle-0.11.3244.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=58af8881943b5be9628c8b24d712201b
diff --git a/metadata/md5-cache/x11-wm/wmfs-20180520 b/metadata/md5-cache/x11-wm/wmfs-20180520
index 1bca4847f34c..3a742aca9d1b 100644
--- a/metadata/md5-cache/x11-wm/wmfs-20180520
+++ b/metadata/md5-cache/x11-wm/wmfs-20180520
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=media-libs/freetype media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/wmfs-20180520.tar.xz
+SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/wmfs-20180520.tar.xz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6ba0613d890a7a82876664dacd98430b
+_md5_=e38900d13be1d569ab9315d4aae3fc19
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 4f35b542342e..316e6375a147 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/exo-4.17.0 b/metadata/md5-cache/xfce-base/exo-4.17.0
deleted file mode 100644
index ee1e523ccb9d..000000000000
--- a/metadata/md5-cache/xfce-base/exo-4.17.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/gtk-doc-am dev-util/intltool >=dev-util/xfce4-dev-tools-4.16.0 sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:=
-DESCRIPTION=Extensions, widgets and framework library with session support for Xfce
-EAPI=7
-HOMEPAGE=https://www.xfce.org/projects/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/exo/4.17/exo-4.17.0.tar.bz2
-_eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=8bfece1d3c90a3b3988f8906bec7bb7f
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.16.1 b/metadata/md5-cache/xfce-base/libxfce4ui-4.16.1
index efd853e5226a..7390b978d12a 100644
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.16.1
+++ b/metadata/md5-cache/xfce-base/libxfce4ui-4.16.1
@@ -5,11 +5,11 @@ DESCRIPTION=Unified widget and session management libs for Xfce
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=debug glade +introspection startup-notification system-info vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.16/libxfce4ui-4.16.1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=4b27d110f4e0217c135f08f9c545b9ff
+_md5_=d7f11c0dd683af3103be49274b8c9f68
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.17.0 b/metadata/md5-cache/xfce-base/libxfce4ui-4.17.0
deleted file mode 100644
index cb3651c44610..000000000000
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.17.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) )
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
-DESCRIPTION=Unified widget and session management libs for Xfce
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=debug glade +introspection startup-notification system-info vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.17/libxfce4ui-4.17.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=f93b3c149b3db7c80254dcf27e531759
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.17.0 b/metadata/md5-cache/xfce-base/libxfce4util-4.17.0
deleted file mode 100644
index 1a8e32704040..000000000000
--- a/metadata/md5-cache/xfce-base/libxfce4util-4.17.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 ) )
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.50 introspection? ( dev-libs/gobject-introspection:= )
-DESCRIPTION=A basic utility library for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://git.xfce.org/xfce/libxfce4util/
-IUSE=+introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=dev-libs/glib-2.50 introspection? ( dev-libs/gobject-introspection:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0/7
-SRC_URI=https://archive.xfce.org/src/xfce/libxfce4util/4.17/libxfce4util-4.17.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	5ef05fa2f1612e51f4aea8c92b09e08d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=98dafee444f8b430a7d3d6aa947f6e57
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index ad109b94bda0..e70ab4a3194b 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.4 b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.4
index fc113d5d8408..d73a89261a22 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/gtk+-3.16:3 >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.12:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-1.1.4.tar.bz2
-_eclasses_=linux-info	0979a3f84b9948fbe2a553beb6b5f505	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
 _md5_=b5f1521f087fd4a1e2edb8a2d19b0742
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.5 b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.5
new file mode 100644
index 000000000000..c164cbe2c71d
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.5
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:=
+DESCRIPTION=A system load plug-in for the Xfce panel
+EAPI=8
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2 GPL-2+
+RDEPEND=>=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-1.2.5.tar.bz2
+_eclasses_=xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=268621bc7370edd0d3057546f2a67a11
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.6.1 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.6.1
new file mode 100644
index 000000000000..375bad7204a6
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.6.1
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=virtual/libintl x11-libs/gtk+:3 xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
+DESCRIPTION=Alternate application launcher for Xfce
+EAPI=8
+HOMEPAGE=https://gottcode.org/xfce4-whiskermenu-plugin/
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=virtual/libintl x11-libs/gtk+:3 xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.6/xfce4-whiskermenu-plugin-2.6.1.tar.bz2
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=fa16ecf3aa2a4b455380d56323e7caed
diff --git a/metadata/news/2021-09-29-possible-failure-to-preserve-libraries/2021-09-29-possible-failure-to-preserve-libraries.en.txt b/metadata/news/2021-09-29-possible-failure-to-preserve-libraries/2021-09-29-possible-failure-to-preserve-libraries.en.txt
index cfff10629da0..7154bc497e2e 100644
--- a/metadata/news/2021-09-29-possible-failure-to-preserve-libraries/2021-09-29-possible-failure-to-preserve-libraries.en.txt
+++ b/metadata/news/2021-09-29-possible-failure-to-preserve-libraries/2021-09-29-possible-failure-to-preserve-libraries.en.txt
@@ -44,7 +44,7 @@ Fixing a broken system is not always straightforward. It is strongly
 recommended to take a backup of your full system before proceeding,
 as well as a copy of /var/db/pkg (the VDB):
 
-1. A tool has been developed [5] to attempt to fix the consistency
+Step 1. A tool has been developed [5] to attempt to fix the consistency
   of the Portage database. Using this tool to modify the VDB is NOT
   mandatory (read the full news item before proceeding) - you can skip
   to Step 2 if you wish, but fixing the integrity of the VDB
@@ -72,23 +72,28 @@ as well as a copy of /var/db/pkg (the VDB):
   # into your real /var/db/pkg/ directory tree.
   ```
 
-2. Attempt to rebuild the affected packages, first upgrading
+Step 2. Attempt to rebuild the affected packages, first upgrading
   app-misc/pax-utils to the latest version:
   ```
   $ emerge --ask --verbose --oneshot ">=app-misc/pax-utils-1.3.3"
   $ emerge --ask --verbose --oneshot --usepkg=n $(grep -v '#' broken_vdb_packages)
   ```
 
-Given that there are possible other side-effects of the corruption/bug,
-it is strongly recommended that if any corruption is detected, all
-packages on the system should be rebuilt, after following the above
-steps:
-```
-$ emerge --ask --emptytree --usepkg=n @world
-```
+  It's possible that the relevant versions have disappeared from the tree, so
+  if the emerge command fails, please attempt a normal world upgrade.
+
+Step 3. Given that there are possible other side-effects of the corruption/bug,
+  it is strongly recommended that if any corruption is detected, all
+  packages on the system should be rebuilt, after following the above
+  steps:
+  ```
+  $ emerge --ask --emptytree --usepkg=n @world
+  ```
+
+  Note that binary packages may need to be discarded given they may
+  contain corrupt metadata.
 
-Note that binary packages may need to be discarded given they may
-contain corrupt metadata.
+  If no libraries were broken, it is likely safe to skip this step.
 
 Please see the wiki [0] for a full description of the background
 of this problem and handling corner cases such as e.g. already
diff --git a/metadata/news/2021-10-18-libxcrypt-migration-stable/2021-10-18-libxcrypt-migration-stable.en.txt b/metadata/news/2021-10-18-libxcrypt-migration-stable/2021-10-18-libxcrypt-migration-stable.en.txt
new file mode 100644
index 000000000000..ccfcdddcff09
--- /dev/null
+++ b/metadata/news/2021-10-18-libxcrypt-migration-stable/2021-10-18-libxcrypt-migration-stable.en.txt
@@ -0,0 +1,64 @@
+Title: migrating from glibc[crypt] to libxcrypt in stable
+Author: Andreas K. Hüttel <dilfridge@gentoo.org>
+Author: Sam James <sam@gentoo.org>
+Posted: 2021-10-18
+Revision: 1
+News-Item-Format: 2.0
+
+The implementation of libcrypt.so within glibc has been deprecated
+for a long time and will be removed in the near future.
+
+For this reason, we are following other distributions (where
+this has been tested for years already) and switching to the 
+external libxcrypt implementation, now also in stable installations.
+
+This will be a regular update, and in nearly all cases you
+will not have to take any action and not observe any problems.
+
+We do recommend, however, that your system is *fully* up
+to date first. This is a standard recommendation but in this
+specific case, it is useful to have a simplified depgraph
+to ensure that Portage is able to smoothly calculate
+an upgrade path.
+
+That is, please take the opportunity to fully upgrade your
+systems now, before the migration occurs, to simplify matters.
+
+This change will occur on 2021-11-01 for stable users.
+~arch users by default should already have switched.
+
+If for whatever reason you do *not* wish to switch now -
+which is only delaying the inevitable - you
+need to take the following steps:
+* unmask and enable the crypt USE flag of sys-libs/glibc
+* mask the system USE flag of sys-libs/libxcrypt
+* mask >=virtual/libcrypt-2
+
+If you wish to manually migrate now, there are a series
+of steps described on the wiki (see below), but the outline is:
+* unforce the crypt USE flag of sys-libs/glibc and disable it
+* unmask the system and split-usr (if applicable) USE flag of sys-libs/libxcrypt
+and enable it
+* unmask ~virtual/libcrypt-2
+
+Please note that if you last changed your password before ~2008,
+it may be using md5crypt or similar other weak mechanisms in /etc/shadow;
+a bug in PAM [0][1] may mean that you were unable to login. We recommend
+using "passwd" to change/refresh your password so it is using modern
+methods. A new version of PAM has been added to the tree to resolve this issue.
+
+In some cases, Portage may schedule a rebuild of certain packages in an
+incorrect order [2]. If building a package fails, please try upgrading
+libcrypt and libxcrypt first:
+
+# emerge -v1 virtual/libcrypt sys-libs/libxcrypt
+
+And then continue the world upgrade with Portage's "--keep-going=y".
+
+For more information or troubleshooting tips, please see:
+* https://wiki.gentoo.org/wiki/Project:Toolchain/libcrypt_implementation
+* https://bugs.gentoo.org/699422
+
+[0] https://bugs.gentoo.org/802267
+[1] https://bugs.gentoo.org/802807
+[2] https://bugs.gentoo.org/802210
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e3d4b556ee85..bd041fc3c49a 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 14971 BLAKE2B 0578b32f5b0537515d3ef03ad7acb73b8f538c7a615cf9e8371b504090d7cc3b904fa94540c3424ad809552b5ac11e96460fad2c549f2af264a2ec3f3b8943ed SHA512 650a45f215d64b5e852661abdd99d8dc8f43eaa4990a133bdf4a91c1434ac36639b30c58a6c4544ed30f70efce92346154faa946356ad9d79c3eb6f26799f408
-TIMESTAMP 2021-10-08T21:09:18Z
+MANIFEST Manifest.files.gz 15146 BLAKE2B 544d56e683470530af65f9eec9a368467f037f5ad498dd07d0325faece25bc763ceae502793dc487d11e392fb1ecf4404ead0971c9ab5745581a3829ffcc76f4 SHA512 4e0fd74724c703bac8a5f0a508b382ac63305cd36d647fc2cf8cc42e25e9073c19f879786bff0124653c75ef975a6dbb8c9625bbaaa830083ddbeda57584927f
+TIMESTAMP 2021-10-20T08:38:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFgs35fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmFv1aNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBxZRAAqOxnESfrsRKNTrROz8m9CGJws6NbPEJURbu3c57ioG3Yx+r0jL78e46c
-DjLnqkyr+CZIcyCQYvsCjMdB3XD8nEJusAL5xi15BBrVWnPPU9tGxb//2qE4dqnC
-uDLRHfxwuBw3KmKhzEZmE++cuOzCWiBPCC6S0VkW5rnFClZnWzbaNGgb6JE7mOVu
-oQlF8NTPAdDWczSo5oQk93xd1ut51s49Fk3m1yhn8Q9Gr/FRiwHE23Wo6sCkzagO
-YT8s5DDSA0aeVJikUxFeKweHYlnQtXIMmOfb0LkHKExXgGF2I1xy5NvYNiiuVdJZ
-asvFR+z3y9PchI+LzWsLXFRUyE/IEauHCFuy/4w3CQzSnegzs0aWwV4hjGPkEisJ
-ac16kKby+b51Ma7TB6clvunM34lJ3akadRe8ra1NvJ1ce4KdFPhmqegq/6cOlKY4
-FK06GMCFfhQDlFZD7kB4HAW4ehtRV+CkC37Icjz6GBN2CIMcgAL6Huls8p0b+CDs
-vM1+XHZYO6e2dGnPbDiS9BzW/ZGAM7FpiAtmLTvzc7kZh/RCHIw2sZSADqX06+SD
-1078c9Zad8Z0n8vhN6t1GdZ5tZrZYcwJtaKtXXP5+IIJtsdwRaAR4GtLvCIkYIof
-VqY8NTqGgZSv1Lkb7Kqxcmn6PNvDehWIn7xfauzZeZ9/z2Piw2E=
-=on7i
+klDMiQ//R6iXxAa+W4Fw9+hXhveSLxOXwr8Oq4xCgbTHH+29r7XKJZnFitXmgWDp
+V4zlZafuwsuUMwzzJza4MUYo0SDSDX9lafcoxlVf1VcDfvkbMgIGEwH47Dn+TkAO
+uQ9EZA4+M+/tbCguQG9ZFqgyQyymWpmHf5CXOicO7kzHEaajlHwLoUBYdpHIxQvt
+FO8XqUqkT/wKl6pE4/VACfZrEjyWO0RYTZiuTTN+LHF9FfIfnsiXNtxukbBEtRgq
+aTdo6h9i7NRUIwy52tUWdpzj4XPFtaE70Cg2wEzrhwZxE/zOBG9Ysl7KKsKnYGLI
+U7gKkiztrlgmUmq+p7yftbqd45fsdHUpY3qXSy3DLhdm/GecG3F5RWzs62f3QmEd
+GwtrUfoakouMq/aoAKYFuYmefQ1blvxqMPJjL8wiz38xitcC6SkzIJWs6OUgJ5E6
+pkBEQYf6WjTtb4l9jgNSLqk8U6JaM2v+3mKBUpuCkHuQyWe2SpdpOoH/Z2UU3jyX
+u1+NEF1IBEaCOEc5mlAqfMRszbxMGRDF+NXYB4qPm4Yi3HbMsx1/KhoFgmU2VYgY
+gapOE+biEdSP52qpGlYCxcUbMOZUQ38Z5ePODX1/NYjMGRlmK+/+Xylu66kb5mar
+ZZSZNtgCmf2YuLrNUMkFBJhaHAn4FheZEFkx52LuAva/91kM5Go=
+=Pm63
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 4f6424fa3c93..6aef58828444 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 1990ad495263..55124f1121c8 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 08 Oct 2021 21:09:13 +0000
+Wed, 20 Oct 2021 08:38:55 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index e79a158b207c..e5ad41e982df 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-8dea6aa24c3ec9ee9a391fb602733c1a803a1ad1 1633714096 2021-10-08T17:28:16+00:00
+232dd42f93031207d628903f6ad4d5c9a96267af 1634589909 2021-10-18T20:45:09+00:00
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 7b70980252ad..25fa8bd1fbda 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -2959,6 +2959,10 @@
       <email>amynka@gentoo.org</email>
       <name>Amy Liffey</name>
     </member>
+    <member>
+      <email>hattya@gentoo.org</email>
+      <name>Akinori Hattori</name>
+    </member>
   </project>
   <project>
     <email>sci@gentoo.org</email>
diff --git a/metadata/timestamp b/metadata/timestamp
index a273c93620ed..6188b127b390 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Oct  8 09:09:13 PM UTC 2021
+Wed Oct 20 08:38:55 AM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2e1f914317ff..8c03eba036c1 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 08 Oct 2021 21:15:01 +0000
+Wed, 20 Oct 2021 08:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 7d4ffe2aae55..f2254b0381d3 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-937163a02fd0674f641c8de36539c896f19bb143 1633722983 2021-10-08T19:56:23+00:00
+e89d45212dbf6a8656d22a0c687fc0c5ee5e4418 1634715014 2021-10-20T07:30:14+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f62df0561758..713268eb1837 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1633727101 Fri 08 Oct 2021 09:05:01 PM UTC
+1634718901 Wed 20 Oct 2021 08:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 1990ad495263..55124f1121c8 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 08 Oct 2021 21:09:13 +0000
+Wed, 20 Oct 2021 08:38:55 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c4e3559ebf5d..3769ea973dbf 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/apinger/Manifest b/net-analyzer/apinger/Manifest
index 7300d72803eb..c6d76cfc86ce 100644
--- a/net-analyzer/apinger/Manifest
+++ b/net-analyzer/apinger/Manifest
@@ -1,5 +1,5 @@
 AUX apinger-0.4.1-fno-common.patch 193 BLAKE2B c13aa8e654dc58b9802a4b2b56b2bb4f9004a5556c46997dcee1e028b67d226057d9e09e779f91d08629bb5ff447ed6cc70739d8bcd5da39b5e59fa3bedf3e38 SHA512 f80653f38f9d4e5d6196f3c4d7643c8b9ed4198b56125a1348ea458faba7e202ffce8d36b5cc58223b76bbb5a4957405b4087d26cc67e203b55be7fe1eb1bf7a
 AUX apinger-0.4.1-stray-backslash.patch 435 BLAKE2B 1a2cd0437152455ae965cdc86220a2eba3a3f30b8bb7515077982c03ba44a17a0e4de059432e0bcefc790d190d69bd128c192c01addc938a249a9573080fcaa2 SHA512 433521183c32c6bd414d5317e9c69fa2b28f3afeadaf47fdccb238a24cc245d347581d021e167bb58b191825547e349bee8b07d8a071f30771262e0abb62bb09
 DIST apinger-0.6.1.tar.gz 134127 BLAKE2B 8f54d5514a5410973b5f44166741582fc16a2b0b1398eab001943e2924704ae5400e2c0ce4ca1694cadfc6fa3e47d395aa3d6affd7e4873fb172bf027c26c251 SHA512 eca6cee186d538200619188d9481154114ef9d7eae4f11f389eb61382f507d108bc64622fe99b1bae17ecc3ca7b2bc4ff4d0a3156ebf2913803e7be24b0d3f94
-EBUILD apinger-0.6.1.ebuild 653 BLAKE2B ec8919aa06aed60b9d708db4cebc956f33b1edd4cfe3a9747ab18692cac5e6e3e87d25d7cb35a87c6bf6dbffc6e91a74660bab96c53527ac9c4b0050dfdd2a7b SHA512 35a1debe8187771a35beea8771698bea355e3f27388b2c4bd4efc3d53a34f49fe67a007f5f2555b13b1aebbc18a58fd9beb3d5be407d149cd99743c4d91c1770
+EBUILD apinger-0.6.1.ebuild 667 BLAKE2B cb8d81bd6d599dc9b26ddfdfa93bbd3c69d5c7a6e8c0748dc7e3114c911f95a9c69a742db3dd1c83eefcaa6b2d9416033af5558cc15a321348fb03bb82a72bc0 SHA512 8be9c8f6f311a65bff735d1a0b4aa09b0f450986868d2371f1aa49a147c02c9f06137ca68dbde7b19dca56d612921ae55304ef40dbe394d9c5e5f741c0efe122
 MISC metadata.xml 360 BLAKE2B 9588386f8e58873088c5846c8245612753d38ecbd96938c2329dc9175a34081aea587c9a320754eb6fabadbb947b6bfeacc4910e8b23f5dee52a47c9f73735be SHA512 83084dc04447a49b02e1e0449051780f878d5b92692368ba2f0a09d383f4b8cad8873e9be1a97e043d7aa441864c90a7e2d5f2c9d5c420bdfbf241bcaf806664
diff --git a/net-analyzer/apinger/apinger-0.6.1.ebuild b/net-analyzer/apinger/apinger-0.6.1.ebuild
index 46661a8ba3e7..f57c2ae57160 100644
--- a/net-analyzer/apinger/apinger-0.6.1.ebuild
+++ b/net-analyzer/apinger/apinger-0.6.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
@@ -7,7 +7,7 @@ inherit autotools
 DESCRIPTION="Alarm Pinger"
 HOMEPAGE="https://github.com/Jajcus/apinger/"
 SRC_URI="
-	https://dev.gentoo.org/~jer/${P}.tar.gz
+	https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz
 "
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/arpoison/Manifest b/net-analyzer/arpoison/Manifest
index ae584e89c4d0..56d9aeedc280 100644
--- a/net-analyzer/arpoison/Manifest
+++ b/net-analyzer/arpoison/Manifest
@@ -1,3 +1,3 @@
 DIST arpoison-0.7.tar.gz 8458 BLAKE2B b0050aa6f3246fec9fb4db8bbb3f9f5f1d52b5b6c37851f0c6bec8b6c89fabd7f1811ae40a4c81af6eae16761f38fb749d0f2a58311645ef360d798b6ccbbb50 SHA512 d5af078c8e2c64eb721da75b5d6659ca017267f146d0dca7e0f1ba77bfd93a0f56363428c198e9c46537768d3568d813c150bfbc091430fc355a269f9327108f
-EBUILD arpoison-0.7.ebuild 689 BLAKE2B 06b8e83b18b207b64463c8e880a4fdb2e794167a006e806695a471e9368e95e59aa2119ee47eef2573b4ac315f1b80eb47a4b2cc6e782c425be206081f4209da SHA512 2acb0792c5ec6a251acff5fd58ef4ed06410fc44fe4f68c30786eb41cfaf184ce8950804ad3f1a18d8960c95657d93ff476a430793038eec07cd00f02c366b7c
+EBUILD arpoison-0.7.ebuild 703 BLAKE2B 11b20022bf6f81343f739d43fc3f9b98581d6887cb4fa28d778d51bbe7a740572d5f670e374a6dff7ceae7caf430ab823183ebe1eb884bed5750001a58b159b2 SHA512 1a5cdc0766c1e6e968b0b335ccfe31bd003dcd63d913efab5c22e34ae980cfc082ad9cb8cebc092130bd8839e11a173079287977893fc9c97e7acf008a3bd604
 MISC metadata.xml 359 BLAKE2B a850a908f091a7833a10206ca9ec2ea66bb02830ac93ef1b30aa785c2639e2b772116c2e86efa123fc4a853c5f6505bffb8e4d59ae7c92aea3647a559be97da1 SHA512 d5000b395c3bc2a94e079b30b8e834b4074cf55a0ad4e699545cc46f26135eed5913b749c06afcc82680d7b4defed934a49088c02f0e77233d03e0efe5cea49c
diff --git a/net-analyzer/arpoison/arpoison-0.7.ebuild b/net-analyzer/arpoison/arpoison-0.7.ebuild
index edd9d089302e..625d227a73fc 100644
--- a/net-analyzer/arpoison/arpoison-0.7.ebuild
+++ b/net-analyzer/arpoison/arpoison-0.7.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="A utility to poison ARP caches"
 HOMEPAGE="http://arpoison.sourceforge.net/ http://www.arpoison.net/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index 1d2a0fc951a4..7f41f06ec104 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -4,5 +4,5 @@ AUX arpwatch.initd-r2 828 BLAKE2B fc9836855074520ab6e8e4d7412f9094677fe25dba61bb
 AUX arpwatch.service 362 BLAKE2B 45e527e7b5261a8009acdca0665077422235d5b21ebbb6818d878e21e4869fdf69317306bc4ef02617b8989a38f50a9467d69d904ada80fde1be61f77b806e2c SHA512 06424dea166eac23d4686fb96b1f14bdd46965bf400028f870ea2260e7d54a54663987c62e34e93730e6dea42e0e662578268252b31f29c26c0975bb4cb6873f
 DIST arpwatch-3.1.tar.gz 117196 BLAKE2B 35afd3dc563ebbc8136000d5c2d53da85b9615df5cbe8a3da5b77f20da7cbee706f6fd404c2bda6f3626aaa496d9ec9439596acbdfd559c01b8c0d01d6703e46 SHA512 2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282
 DIST ethercodes.dat-20200628.xz 239028 BLAKE2B e702b9109ef3ccce73e2637f96126bf19e7dfa533774c0bd623042b3609f147981263b84397ec155a65ae12fa57247c32644e1e7e57c2c749ef768156d853027 SHA512 2edc05d384f387e6b43d07da99038625f9c55c8044b5a48d1bcf9f657df691bf413a97fb9ca915f04dbdafab23f919edd15d906c4ce8bff12be0b255a6717f07
-EBUILD arpwatch-3.1-r4.ebuild 1907 BLAKE2B 01289c40c54d5256b4a0126ed6a47f1867b3e3c09eaae502cb99f380db186df6cab0afb62506ff57730c7e8a4f85e8f8256ef03be5f4d6cdd87d41c865898d77 SHA512 a98018fed7d74aa617991db685a16894a2d3c2c06458bf39a3368a745ba651ee18c9e31a74a64ed0e9a8c788bb0c6ef860680b14d452fa4218950e7b92451b58
+EBUILD arpwatch-3.1-r4.ebuild 1921 BLAKE2B 3b3b77407becf8aa321ee2d5527aff8e02c3350d1a65c5a683b2641fa371cf81a31e36ea0bde0b9af0c117b3cc5cfe51edf68fde6048b93d875ce4cf7481ecac SHA512 89c34eb210c7d8f613e1873818096e0d1a63dddb15ef13cbf9997f581db069f90d16fa7b9ec4f959e61a47218a4afa090030e27a8fe1920d3926fb259f4029be
 MISC metadata.xml 742 BLAKE2B 6450c555cd2d073840a7b55b986dd06ef9bfcca83284747f960eec06bb2e4e20e3b60cf3f8321f7d737b1a9a45e256eca89a117466e0470ae30d90e49250d31d SHA512 f34b7397a71cad7092481bf0a4127aabc1bf28e9c781bf076610a3f11522053d7e3bd135ca3f983c8b0aa6802237015ea967a85e3dc207d67f04b063e1a482f1
diff --git a/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild b/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild
index da747fae6e86..880939a9d30f 100644
--- a/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 ETHERCODES_DATE=20200628
 SRC_URI="
 	https://ee.lbl.gov/downloads/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~jer/ethercodes.dat-${ETHERCODES_DATE}.xz
+	https://dev.gentoo.org/~jsmolic/distfiles/ethercodes.dat-${ETHERCODES_DATE}.xz
 "
 
 KEYWORDS="amd64 ~hppa ppc ~riscv sparc x86"
diff --git a/net-analyzer/barnyard/Manifest b/net-analyzer/barnyard/Manifest
index f042c4f46607..ff0bc249d2f7 100644
--- a/net-analyzer/barnyard/Manifest
+++ b/net-analyzer/barnyard/Manifest
@@ -2,5 +2,5 @@ AUX barnyard.confd 663 BLAKE2B 23d63eb8f96f17b74179aa10e51aa7a92a8f10f548043fc67
 AUX barnyard.rc6 620 BLAKE2B 7b59c2919d04b236e817fbe43baded639a5b918718585e07b73b01f96627370e7db44214a74c8bd535c6461585d2076c6640ca701abf7ebba1c82302fbe86ae3 SHA512 8dacb73e749b49fe3dbef061a8d5dea5d3f3861a290c846a892264eb2ebf75034121efaff91a352b6ab4639fab76ff11eeb39ce31f407a4d617c9c114e1862f5
 DIST barnyard-0.2.0-patches.tar.xz 13152 BLAKE2B d68aa5298938e50bb1102628cd8ebc0fae55c12fd4094e86306a86aeab3786a096906e4b0612b3dbb0a2de6a8aeba8161fdcfccf3a6915f5492401892eaa8b57 SHA512 9ff4f45e12d12a6b33f22f32be5f258cc9352a53c91d4415c292231ee5e5b03d58ed988011df5d3f13ac0046dd02ff36e0f92b4b0044181f695856118bb9228a
 DIST barnyard-0.2.0.tar.gz 161543 BLAKE2B 07f5fa6b2e01e1b421ea772b8ea0c72b6c8f66569caf176a57d3f4fce438c2dd4b2a8a61dddc4faf27c85b15d002205f1cc3627fe88d523fd25d716cc78747e7 SHA512 73424acf2e0c620b2f8f2f407d74812f7740234ce523e37557273998108c131311fffb16cfc2cea0f652d6b21072431081bad35b045f5654e2245786d27568e6
-EBUILD barnyard-0.2.0-r7.ebuild 2195 BLAKE2B c8a2a80cd488ce4c0c4a9ce65445aec02a7eebd293c780ade9cdd31ad363296884d467586e0cece948d615bb1ee642af223c6d6745eda1e18d6ef80a8a5c7ec0 SHA512 2c55b97644140469ebbdc14672f9b243f24baca24ce2ca0db5ad27036f12feff156b2b873c5d479818dd8a87b3bb9df98ba25fe97469083a0abe7f096d8e7f22
+EBUILD barnyard-0.2.0-r7.ebuild 2209 BLAKE2B 5ade973f314f3bbb1f64ffea378235877c03ad972826157df0911f8980208551dcfd2008c442b084e88dbbcadaf1292332f01e23f0cb1b984bc06f9c8211d6eb SHA512 76f6d87b40186f268c212c6717f8e078a603b2eeb9b4fd64e557e43c8c28000a8b291f499439c16cd9e9c2b24252e3ca16721134f0bd53d6442a5e863954d280
 MISC metadata.xml 477 BLAKE2B 2ab3e607a6cc5179827136af00eee7c3591b57906cb623a46ad533baa449de2c94dfc65758d660e57013d988c81c83259c55d457f5c249920d418714f12e1b73 SHA512 b7a26a97898fa4cc05baa15d0a43558f8ae9cfe6189a1bcfbbff48299febe2230d964612b368e2b40ac1f975d1e0fcfd018b530ae81583d6d7485f9866c6c2b3
diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild
index e6c4d3a4e926..94966b420485 100644
--- a/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Fast output system for Snort"
 HOMEPAGE="https://sourceforge.net/projects/barnyard"
 SRC_URI="
 	mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz
-	https://dev.gentoo.org/~jer/${P}-patches.tar.xz
+	https://dev.gentoo.org/~jsmolic/distfiles/${P}-patches.tar.xz
 "
 
 SLOT="0"
diff --git a/net-analyzer/bigeye/Manifest b/net-analyzer/bigeye/Manifest
index 4401fd6157e2..0b3fa614a350 100644
--- a/net-analyzer/bigeye/Manifest
+++ b/net-analyzer/bigeye/Manifest
@@ -1,5 +1,5 @@
 AUX bigeye-0.3-overflow.patch 364 BLAKE2B 35f659abba86474fb2d87eeb926952ba0e9c394770c17a964cc8d723de700484a889469f33b3d66f3c40df184dbfcd3d953c29c2ec13a4c4d833231fc0e97dbe SHA512 4076e00b11c5c11d432f52a536f6d32a6329b8946ea6a8db64d61c395728483e9631fd93d136390d3e34e7c05ce113f3b2e7ef2113f686bd0184b8a5cb436d18
 DIST bigeye-0.3-gcc34.patch.xz 2564 BLAKE2B 17508c780f339aa2409616aa2bd4e37c3e9f8ba48626e9a3782ea60da2989d4a8543c8a97cecef34554265385b13019d3bc04a05c8809870e0cba20c72a76bf8 SHA512 c7005975a7b798521f0d8f7b646f168ff215c1b5a760e303f7cad8bb78e2324e8303f77a724bc6902ef7ee525d7e6dd5ccfdf366c39abcc436fc6edf503205af
 DIST bigeye-0.3.tgz 32462 BLAKE2B 509e958852d958f5fbb7197e567f8ebd1d7004027e4d8f3fe868d3af6719f76e445890a241d4438609b12695bd403fa246cec03b382a2c339d23c1456aa198e0 SHA512 73a146fd2f5df86a3d16dec05cf3f278393347f341a5cc319feccf6d23e1f2fe9d29070ac154a5b2336ade146843ab163e3545e9aefad1a0fa8903928d9b1ed0
-EBUILD bigeye-0.3-r4.ebuild 872 BLAKE2B 081eea9dbbcbd4c068be2d8839f9604019dbc8014f854474f67d83c35b2c43b8ad4da0af0e0eeb3a19ea1341326987001344e3bbed54b9305f765cfcbd18e280 SHA512 cc2df3f8ec764e8cec4a0d426f3eb7cf50d6f7bb57679109282b4132cb7f4e9f88cc67e11efed4482d9793161eb2792adc4c091bfa2f746ebcfe4d6a98bed51f
+EBUILD bigeye-0.3-r4.ebuild 883 BLAKE2B 5de9fcc71ed2c278548dfbd921e18583fd37f1f1310f202635a6d14a803d761f9ee384719a215482b76f9874e1e4138d128c46eb0aaf3b9076eaea9ba447f05f SHA512 1d4214795f1c8b088db64ef9cbc7642c0c82908f9d8bbdb05a3649b9fd646ac263f911a72209b9ff45ad423539d36e7f4e16956344437568fa2ec9a927d6c71d
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/bigeye/bigeye-0.3-r4.ebuild b/net-analyzer/bigeye/bigeye-0.3-r4.ebuild
index e9382d08ec47..f1e171347c51 100644
--- a/net-analyzer/bigeye/bigeye-0.3-r4.ebuild
+++ b/net-analyzer/bigeye/bigeye-0.3-r4.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
@@ -7,8 +7,8 @@ inherit flag-o-matic toolchain-funcs
 DESCRIPTION="network utility dump and simple honeypot utility"
 HOMEPAGE="http://violating.us/projects/bigeye/"
 SRC_URI="
-	http://violating.us/projects/bigeye/download/${P}.tgz
-	https://dev.gentoo.org/~jer/${P}-gcc34.patch.xz
+	https://dev.gentoo.org/~jsmolic/distfiles/${P}.tgz
+	https://dev.gentoo.org/~jsmolic/distfiles/${P}-gcc34.patch.xz
 "
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index daa0c26b23bb..9ce5de6b4346 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,8 +1,4 @@
-AUX cacti-1.2.16-CVE-2020-35701.patch 706 BLAKE2B 746fca9b32bc863fd701f86df53f22284de9ffec7d0ad42d7eb0376e27b9e482d82a482d937f40ec61fff41d3a7cec0fcda6e3282087c9597c32a4147e0a9c1e SHA512 f909820f8c57ca61571b15d2304567d3333563520cb5611f8f01c22c22e155104fa6958eda3605d66af7ba29b756ff826a259faf587b63e04ba20bcd09f8a9cd
-AUX cacti-1.2.16-XSS-issue-4019.patch 19600 BLAKE2B 3a9f2c7474a633c8633fdaaa5db71c124c486e796dbdbbfdc5ed53ece7cd0f45652b1e62a4355855f8512b03e5a4ca9189ee50dd2784cbd0e8d84ee9f131d0fc SHA512 f002b947c27c3b2a6ba8300eae456fca771d5283bfd9a7516239745e41b7b6521b7affed6122ffc3c8f7108a4de70cfbf2411970065bd47a9164b0a849656947
 AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005c41f91ba7e7da690e8b3734312b7df5ef506aea771284264035517a73c12d37be1e9479dea7e6e5a99d4 SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623
-DIST cacti-1.2.16.tar.gz 29197220 BLAKE2B 19939d0ff79c895b481aeb7ffec8331d8b9c10a6b7e0dbda6532e06ef0322f21cf02f4bf53a9522e1f672dd04b343f5550e2f34f08b3af2050e1f72465cffc43 SHA512 fe22acf4dea8ab6ec79825d66a84ad4c43fdce2815e7327536d182bc04400ed7b1d268209bbbca8b307c4779ee5bf7369a617ec1f052d8805757c2ca9b30cc35
 DIST cacti-1.2.17.tar.gz 38344112 BLAKE2B e555fc99560d10e94181c38b50e6f839532fb3dc66ff688b36a7efd10c15304e7636c9b4b483763fcea751317bcb283bb2bd8f813d5759c98aed6bbf02fd256a SHA512 94ae75b2494a91c536906c7bbeaa948d16c7ad96ed3a62c1eb21175f92c01787c6849960bbc791e04b3df46edbfd3cd787eb825bb423ce0814c0904edb2c915d
-EBUILD cacti-1.2.16-r1.ebuild 1111 BLAKE2B 15341dcd648cf686bd1f840538494b700d96df84a924b5badfe8034d03f2ce859bf9b498b45031459e23a8cc26127ab7454f85c697c4d26cced5d1862232a6a4 SHA512 94639a653783ce6589f523f5506bc6f15abc8f9f21b585b39fa168b3ed8404d34b257673a870dca10c9d99d85425735c5c4527fd54e8f62ed94ff668d47402a6
 EBUILD cacti-1.2.17.ebuild 1016 BLAKE2B 3fd84d213f5f184e06eb129880a19efa6442e1004534688a7f68a2a72387beded0b1a27e0c7763e7b7c849a50c61400f0a0a2cae4341780c9dd2b011b7481d34 SHA512 33d434610d58e3962fc3f61b17b47bbf9aab2f00176053d497a4572ee2029a493aec9f27639f134ccacdaf1ff4b28cea2ca29699e136a409b30a26a0b3786f53
 MISC metadata.xml 935 BLAKE2B f600d10bd7dfd3bce36a092f31a12a750548866bac21b5b66ff4fc4a876c554ee26d5c4f467830bd3fdcdaf63b0c20c53bf5ca1fb98d6497f84a04b3d8474a81 SHA512 309b48d93e91560458b50ef3c96f1da32a7b7d2dbf38eb4bdaad7b6acb4301528fb9f50b2e79398c7c6026f19efb66d2c79a46afe8e38ecd01f0a4d2d9310ca0
diff --git a/net-analyzer/cacti/cacti-1.2.16-r1.ebuild b/net-analyzer/cacti/cacti-1.2.16-r1.ebuild
deleted file mode 100644
index 78185ebd73d0..000000000000
--- a/net-analyzer/cacti/cacti-1.2.16-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit edos2unix webapp
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-
-DESCRIPTION="Cacti is a complete frontend to rrdtool"
-HOMEPAGE="https://www.cacti.net/"
-SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="snmp doc"
-
-need_httpd
-
-RDEPEND="
-	dev-lang/php[cli,mysql,pdo,session,sockets,xml]
-	dev-php/adodb
-	net-analyzer/rrdtool[graph]
-	virtual/cron
-	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-CVE-2020-35701.patch"
-	"${FILESDIR}/${P}-XSS-issue-4019.patch"
-)
-
-src_compile() { :; }
-
-src_install() {
-	dodoc CHANGELOG
-	dodoc -r docs
-	mv docs .. || die
-
-	webapp_src_preinst
-
-	edos2unix `find -type f -name '*.php'`
-
-	dodir ${MY_HTDOCSDIR}
-	cp -r . "${ED}"${MY_HTDOCSDIR}
-
-	webapp_serverowned ${MY_HTDOCSDIR}/rra
-	webapp_serverowned ${MY_HTDOCSDIR}/log
-	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
diff --git a/net-analyzer/cacti/files/cacti-1.2.16-CVE-2020-35701.patch b/net-analyzer/cacti/files/cacti-1.2.16-CVE-2020-35701.patch
deleted file mode 100644
index f55b7b0a40df..000000000000
--- a/net-analyzer/cacti/files/cacti-1.2.16-CVE-2020-35701.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/765019
-https://github.com/Cacti/cacti/commit/565e0604a53f4988dc5b544d01f4a631eaa80d82
-
-From 565e0604a53f4988dc5b544d01f4a631eaa80d82 Mon Sep 17 00:00:00 2001
-From: TheWitness <thewitness@cacti.net>
-Date: Thu, 24 Dec 2020 10:39:50 -0500
-Subject: [PATCH] Fixing Issue #4022
-
-SQL Injection in data_debug.php
---- a/data_debug.php
-+++ b/data_debug.php
-@@ -35,6 +35,8 @@
- 
- set_default_action();
- 
-+validate_request_vars();
-+
- switch (get_request_var('action')) {
- 	case 'actions':
- 		form_actions();
-@@ -123,8 +125,6 @@
- 
- 		break;
- 	default:
--		validate_request_vars();
--
- 		$refresh = array(
- 			'seconds' => get_request_var('refresh'),
- 			'page'    => 'data_debug.php?header=false',
diff --git a/net-analyzer/cacti/files/cacti-1.2.16-XSS-issue-4019.patch b/net-analyzer/cacti/files/cacti-1.2.16-XSS-issue-4019.patch
deleted file mode 100644
index 1f09e572c860..000000000000
--- a/net-analyzer/cacti/files/cacti-1.2.16-XSS-issue-4019.patch
+++ /dev/null
@@ -1,360 +0,0 @@
-https://github.com/Cacti/cacti/issues/4019
-
-From ef10fe1c340ed932dc18b6a566b21f9dd15933c2 Mon Sep 17 00:00:00 2001
-From: TheWitness <thewitness@cacti.net>
-Date: Wed, 23 Dec 2020 16:33:27 -0500
-Subject: [PATCH] Fixing Issue #4019
-
-* In a recent audit of core Cacti code, there were a few stored XSS issues that can be exposed
-* Also removed a few spurious title_trims, that should no longer be a problem.
---- a/automation_devices.php
-+++ b/automation_devices.php
-@@ -485,7 +485,7 @@ function draw_filter() {
- 							<?php
- 							if (cacti_sizeof($networks)) {
- 								foreach ($networks as $key => $name) {
--									print "<option value='" . $key . "'"; if (get_request_var('network') == $key) { print ' selected'; } print '>' . $name . "</option>";
-+									print "<option value='" . html_escape($key) . "'"; if (get_request_var('network') == $key) { print ' selected'; } print '>' . html_escape($name) . "</option>";
- 								}
- 							}
- 							?>
-@@ -515,7 +515,7 @@ function draw_filter() {
- 							<?php
- 							if (cacti_sizeof($status_arr)) {
- 								foreach ($status_arr as $st) {
--									print "<option value='" . $st . "'"; if (get_request_var('status') == $st) { print ' selected'; } print '>' . $st . "</option>";
-+									print "<option value='" . html_escape($st) . "'"; if (get_request_var('status') == $st) { print ' selected'; } print '>' . html_escape($st) . "</option>";
- 								}
- 							}
- 							?>
-@@ -530,7 +530,7 @@ function draw_filter() {
- 							<?php
- 							if (cacti_sizeof($os_arr)) {
- 								foreach ($os_arr as $st) {
--									print "<option value='" . $st . "'"; if (get_request_var('os') == $st) { print ' selected'; } print '>' . $st . "</option>";
-+									print "<option value='" . html_escape($st) . "'"; if (get_request_var('os') == $st) { print ' selected'; } print '>' . html_escape($st) . "</option>";
- 								}
- 							}
- 							?>
-@@ -545,7 +545,7 @@ function draw_filter() {
- 							<?php
- 							if (cacti_sizeof($status_arr)) {
- 								foreach ($status_arr as $st) {
--									print "<option value='" . $st . "'"; if (get_request_var('snmp') == $st) { print ' selected'; } print '>' . $st . "</option>";
-+									print "<option value='" . html_escape($st) . "'"; if (get_request_var('snmp') == $st) { print ' selected'; } print '>' . html_escape($st) . "</option>";
- 								}
- 							}
- 							?>
-@@ -560,7 +560,7 @@ function draw_filter() {
- 							<?php
- 							if (cacti_sizeof($item_rows) > 0) {
- 								foreach ($item_rows as $key => $value) {
--									print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . "</option>";
-+									print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . html_escape($value) . "</option>";
- 								}
- 							}
- 							?>
---- a/data_debug.php
-+++ b/data_debug.php
-@@ -969,7 +969,7 @@ function data_debug_filter() {
- 
- 							if (cacti_sizeof($templates) > 0) {
- 								foreach ($templates as $template) {
--									print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . title_trim(html_escape($template['name']), 40) . "</option>";
-+									print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . html_escape($template['name']) . '</option>';
- 								}
- 							}
- 							?>
-@@ -997,7 +997,7 @@ function data_debug_filter() {
- 							$profiles = array_rekey(db_fetch_assoc('SELECT id, name FROM data_source_profiles ORDER BY name'), 'id', 'name');
- 							if (cacti_sizeof($profiles)) {
- 								foreach ($profiles as $key => $value) {
--									print "<option value='" . $key . "'"; if (get_request_var('profile') == $key) { print ' selected'; } print '>' . html_escape($value) . "</option>";
-+									print "<option value='" . $key . "'"; if (get_request_var('profile') == $key) { print ' selected'; } print '>' . html_escape($value) . '</option>';
- 								}
- 							}
- 							?>
-@@ -1063,7 +1063,7 @@ function data_debug_filter() {
- 							<?php
- 							if (cacti_sizeof($item_rows) > 0) {
- 								foreach ($item_rows as $key => $value) {
--									print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . html_escape($value) . "</option>";
-+									print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . html_escape($value) . '</option>';
- 								}
- 							}
- 							?>
---- a/data_sources.php
-+++ b/data_sources.php
-@@ -1361,7 +1361,7 @@ function clearFilter() {
- 
- 							if (cacti_sizeof($templates)) {
- 								foreach ($templates as $template) {
--									print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . title_trim(html_escape($template['name']), 40) . '</option>';
-+									print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . html_escape($template['name']) . '</option>';
- 								}
- 							}
- 							?>
---- a/lib/api_automation.php
-+++ b/lib/api_automation.php
-@@ -154,7 +154,7 @@ function clearDeviceFilter() {
- 
- 								if (cacti_sizeof($host_templates)) {
- 									foreach ($host_templates as $host_template) {
--										print "<option value='" . $host_template['id'] . "'"; if (get_request_var('host_template_id') == $host_template['id']) { print ' selected'; } print '>' . $host_template['name'] . "</option>\n";
-+										print "<option value='" . $host_template['id'] . "'"; if (get_request_var('host_template_id') == $host_template['id']) { print ' selected'; } print '>' . html_escape($host_template['name']) . '</option>';
- 									}
- 								}
- 								?>
-@@ -184,7 +184,7 @@ function clearDeviceFilter() {
- 								<?php
- 								if (cacti_sizeof($item_rows)) {
- 									foreach ($item_rows as $key => $value) {
--										print "<option value='". $key . "'"; if (get_request_var('rowsd') == $key) { print ' selected'; } print '>' . $value . '</option>\n';
-+										print "<option value='". $key . "'"; if (get_request_var('rowsd') == $key) { print ' selected'; } print '>' . $value . '</option>';
- 									}
- 								}
- 								?>
-@@ -432,7 +432,7 @@ function clearFilter() {
- 								$hosts = get_allowed_devices();
- 								if (cacti_sizeof($hosts)) {
- 									foreach ($hosts as $host) {
--										print "<option value='" . $host['id'] . "'"; if (get_request_var('host_id') == $host['id']) { print ' selected'; } print '>' . html_escape($host['description']) . "</option>\n";
-+										print "<option value='" . $host['id'] . "'"; if (get_request_var('host_id') == $host['id']) { print ' selected'; } print '>' . html_escape($host['description']) . '</option>';
- 									}
- 								}
- 								?>
-@@ -453,7 +453,7 @@ function clearFilter() {
- 
- 								if (cacti_sizeof($templates) > 0) {
- 									foreach ($templates as $template) {
--										print "<option value=' " . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . title_trim($template['name'], 40) . "</option>\n";
-+										print "<option value=' " . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . html_escape($template['name']) . '</option>';
- 									}
- 								}
- 								?>
-@@ -484,7 +484,7 @@ function clearFilter() {
- 								<?php
- 								if (cacti_sizeof($item_rows)) {
- 									foreach ($item_rows as $key => $value) {
--										print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . "</option>\n";
-+										print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . '</option>';
- 									}
- 								}
- 								?>
-@@ -718,7 +718,7 @@ function clearObjectFilter() {
- 								<?php
- 								if (cacti_sizeof($item_rows)) {
- 									foreach ($item_rows as $key => $value) {
--										print "<option value='". $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . '</option>\n';
-+										print "<option value='". $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . '</option>';
- 									}
- 								}
- 								?>
-@@ -1078,10 +1078,10 @@ function clearFilter() {
- 							<?php
- 							$host_templates = db_fetch_assoc('select id,name from host_template order by name');
- 
--							if (cacti_sizeof($host_templates) > 0) {
--							foreach ($host_templates as $host_template) {
--								print "<option value='" . $host_template['id'] . "'"; if (get_request_var('host_template_id') == $host_template['id']) { print ' selected'; } print '>' . $host_template['name'] . "</option>\n";
--							}
-+							if (cacti_sizeof($host_templates)) {
-+								foreach ($host_templates as $host_template) {
-+									print "<option value='" . $host_template['id'] . "'"; if (get_request_var('host_template_id') == $host_template['id']) { print ' selected'; } print '>' . html_escape($host_template['name']) . '</option>';
-+								}
- 							}
- 							?>
- 						</select>
-@@ -1110,7 +1110,7 @@ function clearFilter() {
- 							<?php
- 							if (cacti_sizeof($item_rows)) {
- 								foreach ($item_rows as $key => $value) {
--									print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . "</option>\n";
-+									print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . '</option>';
- 								}
- 							}
- 							?>
---- a/lib/html.php
-+++ b/lib/html.php
-@@ -998,7 +998,7 @@ function html_create_list($form_data, $column_display, $column_id, $form_previou
- 					print ' selected';
- 				}
- 
--				print '>' . title_trim(null_out_substitutions(html_escape($form_data[$id])), 75) . '</option>';
-+				print '>' . html_escape(null_out_substitutions($form_data[$id])) . '</option>';
- 			}
- 		}
- 	} else {
-@@ -1011,9 +1011,9 @@ function html_create_list($form_data, $column_display, $column_id, $form_previou
- 				}
- 
- 				if (isset($row['host_id'])) {
--					print '>' . title_trim(html_escape($row[$column_display]), 75) . '</option>';
-+					print '>' . html_escape($row[$column_display]) . '</option>';
- 				} else {
--					print '>' . title_trim(null_out_substitutions(html_escape($row[$column_display])), 75) . '</option>';
-+					print '>' . html_escape(null_out_substitutions($row[$column_display])) . '</option>';
- 				}
- 			}
- 		}
-@@ -2010,7 +2010,7 @@ function html_host_filter($host_id = '-1', $call_back = 'applyFilter', $sql_wher
- 
- 				if (cacti_sizeof($devices)) {
- 					foreach ($devices as $device) {
--						print "<option value='" . $device['id'] . "'"; if ($host_id == $device['id']) { print ' selected'; } print '>' . title_trim(html_escape(strip_domain($device['description'])), 40) . '</option>';
-+						print "<option value='" . $device['id'] . "'"; if ($host_id == $device['id']) { print ' selected'; } print '>' . html_escape(strip_domain($device['description'])) . '</option>';
- 					}
- 				}
- 				?>
-@@ -2385,6 +2385,7 @@ function html_common_header($title, $selectedTheme = '') {
- 	<meta name='apple-mobile-web-app-capable' content='yes'>
- 	<meta name='description' content='Monitoring tool of the Internet'>
- 	<meta name='mobile-web-app-capable' content='yes'>
-+	<meta name="theme-color" content="#161616"/>
- 	<meta http-equiv="Content-Security-Policy" content="default-src *; img-src 'self' <?php print $alternates;?> data: blob:; style-src 'self' 'unsafe-inline' <?php print $alternates;?>; script-src 'self' <?php print $script_policy;?> 'unsafe-inline' <?php print $alternates;?>; worker-src 'self'">
- 	<meta name='robots' content='noindex,nofollow'>
- 	<title><?php print $title; ?></title>
---- a/lib/html_graph.php
-+++ b/lib/html_graph.php
-@@ -212,9 +212,9 @@ function html_graph_preview_filter($page, $action, $devices_where = '', $templat
- 						<select id='graphs' onChange='applyGraphFilter()'>
- 							<?php
- 							if (cacti_sizeof($graphs_per_page)) {
--							foreach ($graphs_per_page as $key => $value) {
--								print "<option value='" . $key . "'"; if (get_request_var('graphs') == $key) { print ' selected'; } print '>' . $value . "</option>\n";
--							}
-+								foreach ($graphs_per_page as $key => $value) {
-+									print "<option value='" . $key . "'"; if (get_request_var('graphs') == $key) { print ' selected'; } print '>' . $value . "</option>\n";
-+								}
- 							}
- 							?>
- 						</select>
-@@ -260,7 +260,7 @@ function html_graph_preview_filter($page, $action, $devices_where = '', $templat
- 
- 							if (cacti_sizeof($graph_timespans)) {
- 								foreach($graph_timespans as $value => $text) {
--									print "<option value='$value'"; if ($_SESSION['sess_current_timespan'] == $value) { print ' selected'; } print '>' . $text . "</option>\n";
-+									print "<option value='$value'"; if ($_SESSION['sess_current_timespan'] == $value) { print ' selected'; } print '>' . html_escape($text) . '</option>';
- 								}
- 							}
- 							?>
-@@ -293,7 +293,7 @@ function html_graph_preview_filter($page, $action, $devices_where = '', $templat
- 								$end_val = cacti_sizeof($graph_timeshifts)+1;
- 								if (cacti_sizeof($graph_timeshifts) > 0) {
- 									for ($shift_value=$start_val; $shift_value < $end_val; $shift_value++) {
--										print "<option value='$shift_value'"; if ($_SESSION['sess_current_timeshift'] == $shift_value) { print ' selected'; } print '>' . title_trim($graph_timeshifts[$shift_value], 40) . "</option>\n";
-+										print "<option value='$shift_value'"; if ($_SESSION['sess_current_timeshift'] == $shift_value) { print ' selected'; } print '>' . html_escape($graph_timeshifts[$shift_value]) . '</option>';
- 									}
- 								}
- 								?>
---- a/lib/html_tree.php
-+++ b/lib/html_tree.php
-@@ -1138,7 +1138,7 @@ function grow_right_pane_tree($tree_id, $leaf_id, $host_group_data) {
- 
- 							if (cacti_sizeof($graph_timespans)) {
- 								foreach($graph_timespans as $value => $text) {
--									print "<option value='$value'"; if ($_SESSION['sess_current_timespan'] == $value) { print ' selected'; } print '>' . $text . '</option>';
-+									print "<option value='$value'"; if ($_SESSION['sess_current_timespan'] == $value) { print ' selected'; } print '>' . html_escape($text) . '</option>';
- 								}
- 							}
- 							?>
-@@ -1171,7 +1171,7 @@ function grow_right_pane_tree($tree_id, $leaf_id, $host_group_data) {
- 								$end_val = cacti_sizeof($graph_timeshifts)+1;
- 								if (cacti_sizeof($graph_timeshifts)) {
- 									for ($shift_value=$start_val; $shift_value < $end_val; $shift_value++) {
--										print "<option value='$shift_value'"; if ($_SESSION['sess_current_timeshift'] == $shift_value) { print ' selected'; } print '>' . title_trim($graph_timeshifts[$shift_value], 40) . '</option>';
-+										print "<option value='$shift_value'"; if ($_SESSION['sess_current_timeshift'] == $shift_value) { print ' selected'; } print '>' . html_escape($graph_timeshifts[$shift_value]) . '</option>';
- 									}
- 								}
- 								?>
---- a/managers.php
-+++ b/managers.php
-@@ -483,7 +483,7 @@ function clearFilter() {
- 								<?php
- 								if (cacti_sizeof($mibs)) {
- 									foreach ($mibs as $mib) {
--										print "<option value='" . $mib['mib'] . "'"; if (get_request_var('mib') == $mib['mib']) { print ' selected'; } print '>' . $mib['mib'] . '</option>';
-+										print "<option value='" . html_escape($mib['mib']) . "'"; if (get_request_var('mib') == $mib['mib']) { print ' selected'; } print '>' . html_escape($mib['mib']) . '</option>';
- 									}
- 								}
- 								?>
---- a/utilities.php
-+++ b/utilities.php
-@@ -812,7 +812,7 @@ function applyFilter() {
- 
- 							if (cacti_sizeof($users)) {
- 								foreach ($users as $user) {
--									print "<option value='" . $user['username'] . "'"; if (get_request_var('username') == $user['username']) { print ' selected'; } print '>' . $user['username'] . '</option>';
-+									print "<option value='" . html_escape($user['username']) . "'"; if (get_request_var('username') == $user['username']) { print ' selected'; } print '>' . html_escape($user['username']) . '</option>';
- 								}
- 							}
- 							?>
-@@ -1034,19 +1034,19 @@ function utilities_view_logfile() {
- 
- 	$logfile = basename(get_nfilter_request_var('filename'));
- 	$logbase = basename(read_config_option('path_cactilog'));
--	
-+
- 	if ($logfile == '') {
- 		$logfile = $logbase;
- 	}
--	
-+
- 	if ($logfile == '') {
- 		$logfile = 'cacti.log';
- 	}
--	
-+
- 	$logname = '';
- 	$logpath = '';
- 
--	if (!clog_validate_filename($logfile, $logpath, $logname, true)) {	
-+	if (!clog_validate_filename($logfile, $logpath, $logname, true)) {
- 		raise_message('clog_invalid');
- 		header('Location: utilities.php?action=view_logfile&filename=' . $logbase);
- 		exit(0);
-@@ -1171,7 +1171,7 @@ function clearFilter() {
- 
- 							if (cacti_sizeof($logFileArray)) {
- 								foreach ($logFileArray as $logFile) {
--									print "<option value='" . $logFile . "'";
-+									print "<option value='" . html_escape($logFile) . "'";
- 
- 									if (get_nfilter_request_var('filename') == $logFile) {
- 										print ' selected';
-@@ -1182,7 +1182,7 @@ function clearFilter() {
- 									$logDate = cacti_count($logParts) < 2 ? '' : $logParts[1] . (isset($logParts[2]) ? '-' . $logParts[2]:'');
- 									$logName = $logParts[0];
- 
--									print '>' . $logName . ($logDate != '' ? ' [' . substr($logDate,4) . ']':'') . '</option>';
-+									print '>' . html_escape($logName . ($logDate != '' ? ' [' . substr($logDate,4) . ']':'')) . '</option>';
- 								}
- 							}
- 							?>
-@@ -1807,7 +1807,7 @@ function clearFilter() {
- 
- 							if (cacti_sizeof($templates)) {
- 								foreach ($templates as $template) {
--									print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . title_trim(html_escape($template['name']), 40) . '</option>';
-+									print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . html_escape($template['name']) . '</option>';
- 								}
- 							}
- 							?>
-@@ -2540,7 +2540,7 @@ function clearFilter() {
- 								<?php
- 								if (cacti_sizeof($mibs) > 0) {
- 									foreach ($mibs as $mib) {
--										print "<option value='" . $mib['mib'] . "'"; if (get_request_var('mib') == $mib['mib']) { print ' selected'; } print '>' . html_escape($mib['mib']) . '</option>';
-+										print "<option value='" . html_escape($mib['mib']) . "'"; if (get_request_var('mib') == $mib['mib']) { print ' selected'; } print '>' . html_escape($mib['mib']) . '</option>';
- 									}
- 								}
- 								?>
-@@ -2804,7 +2804,7 @@ function purgeFilter() {
- 								<option value='-1'<?php if (get_request_var('receiver') == '-1') {?> selected<?php }?>><?php print __('Any');?></option>
- 								<?php
- 								foreach ($receivers as $receiver) {
--									print "<option value='" . $receiver['manager_id'] . "'"; if (get_request_var('receiver') == $receiver['manager_id']) { print ' selected'; } print '>' . $receiver['hostname'] . '</option>';
-+									print "<option value='" . $receiver['manager_id'] . "'"; if (get_request_var('receiver') == $receiver['manager_id']) { print ' selected'; } print '>' . html_escape($receiver['hostname']) . '</option>';
- 								}
- 								?>
- 							</select>
diff --git a/net-analyzer/cnet/Manifest b/net-analyzer/cnet/Manifest
index d758fa6a940b..f979d2b726ac 100644
--- a/net-analyzer/cnet/Manifest
+++ b/net-analyzer/cnet/Manifest
@@ -1,5 +1,5 @@
 AUX cnet-3.3.1-tcl.patch 350 BLAKE2B 87816729c1705cb8d22676af3fe7172ae651fd565ba96f8fc0665c4e041c9f2844a6833b76f7a297d7b12ff94c4077ba4c337e374283619ae49c3c3a2a64a9d8 SHA512 c35ef7b83b161d258f75c61466aeccbb0ccfdadb839e6d7b9cd60cb4aaa6a5df9c5eb0a5067ee1e17fb46974b409220a4e5d35d3a490013eb270febdd0405fb1
 AUX cnet-3.3.4-gentoo.patch 4898 BLAKE2B 5a50a13c33b83717ee73b3c7c70d1cce2b913c35819bb62ef14bea9131d1aebd8e122c8cae837b891025c0c0a3e6d0d151af499b9e2e777d332708ce9a1ff7ec SHA512 58efef31fdb88ed401ba1aa26e8afce506ab77da47207cf2730c2f2efe47efa8dd916578eab34c6c2dc38f499073e14bf16d3c7d03b4412d1fb1fab0eb26614c
 DIST cnet-3.3.4.tgz 2687235 BLAKE2B dec8b4510cfb9a39ade046dee56955d4ab39094d07acf373b056ce1917f3bbddcf22cf5feefe864b472be4c4a47da3147a3b977cdbf8b0295e0c3a8da95a8420 SHA512 51457541d1023e49bdad4df3502c51d11ea6d62e3e6ae857becfb60229626ba777226b2b42d313d95b982b2790c6b1f80b39e344d9d4bcd4c38ccc31b055d8f9
-EBUILD cnet-3.3.4.ebuild 923 BLAKE2B 218c669fc7d05192fdcd72617c634402da1f2bc3a76f91f6c33a6e997bc091372bb5cf1f0df5aadc92690661f30e51f386d38b0ae250fb9df03b16db761188d9 SHA512 3a856014e2eb6abdfcd9beecfdf86d76a1908d1ca5bdfa7ddde4cbd14164477bcc7422ca3c7dd572b0fb7084fdfbf439689d581d4cc02695d631daaba6231d97
+EBUILD cnet-3.3.4.ebuild 937 BLAKE2B 09b702b9266496c2b6e4985a07fd50d4abdee67ff771b22782cfe6d22618d21ac16296f2d87daa8a8ee92a868b3756aec5468dcddd358c237569cc0aaa040f48 SHA512 e4ab222f9a9cb2924e8cce13c6946b3cd0d48785c3e6ee891f6dd1ce786a72c016823e1fe21d32c3b4cb0e47f1064899b8f59e41947b417473cb7cff45bfe176
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/cnet/cnet-3.3.4.ebuild b/net-analyzer/cnet/cnet-3.3.4.ebuild
index e5c251413259..2685af53c5bd 100644
--- a/net-analyzer/cnet/cnet-3.3.4.ebuild
+++ b/net-analyzer/cnet/cnet-3.3.4.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Network simulation tool"
 HOMEPAGE="https://www.csse.uwa.edu.au/cnet3/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/echoping/Manifest b/net-analyzer/echoping/Manifest
index 28d9548dbae1..1d3a4619917e 100644
--- a/net-analyzer/echoping/Manifest
+++ b/net-analyzer/echoping/Manifest
@@ -3,5 +3,5 @@ AUX echoping-6.0.2_p434-fno-common.patch 2751 BLAKE2B fe623ef782dbefafc28399af33
 AUX echoping-6.0.2_p434-gnutls_certificate_type_set_priority.patch 595 BLAKE2B 76363f96ff38ad793ef55707b59e102c7fac3c75a4437d51d32245f4e06539004cd7303884edf905c4f32d23c7e138ee9d3997c306f7a14167655c599d5f1709 SHA512 4bec1c8a77f17a163437dca9ce2ef49a355db041b08df7eb087352e03eede069f869e271d9414fc62d88a5e36687787e4719e7405f4b5ba96bbf8534af06ca52
 AUX echoping-6.0.2_p434-gnutls_session.patch 492 BLAKE2B 4a3841f87c70147c120b2fb15227c18d18d2db38ae984306c17c83fcc6405ef98417de7c13e6c2b6c23454a27b7d846f98b327298ddff3c0489c5f53465c9b92 SHA512 99362748feb0ab02172ee4f21c9630c505b899c78483077ef4f056e136854037ea165dd57d2637bed791ff3e8407b08733efab864d68e726b0d31d31a4c17525
 DIST echoping-6.0.2_p434.tar.gz 74568 BLAKE2B 881cc0e3d0be0f704968cbc02e4ac6abe73fe1ccf7019bb33dc522934d2f50f2ba5f70845c81024d3f4101c0acc5837599e05ba7a44f34b1453b470ca30d4b9b SHA512 1b4f5f1ea6ba000c558cab3b8e86758d6c539d8cd237620000d837b468861a177ac733441c885eb8ec1c35b49baa33a82e34e3f8b14b05429a075b72233d5799
-EBUILD echoping-6.0.2_p434-r4.ebuild 1394 BLAKE2B 591a3a4d5eb3057e3af156ce5c2696e947ba516cb20edd63fc37f2c8d8efc8d201a96f76fc74096913916646e78043073e9464eb4b61389e4a290e2a8a456be0 SHA512 91d2b2542a733262f5770574781c927bad4396eb42bf42b3964c7a863b05f699218b4322d42b515be5eca3bd874ff542b94ee5a8c6db6ac8c2d7b2d5254b3a38
+EBUILD echoping-6.0.2_p434-r4.ebuild 1408 BLAKE2B 31e8f9cf8d08ae22ac47cfdc7b05db308cbc432db3a1e4309d415eb820660dbe338b249b5e3374a8ef33b88dbd3c0523248eec81173c362cc2fc088441f2f059 SHA512 ea08c421b48791dc6f79d39f4a6c4214f18ea26f21147d42799a5f6fb0d8ba1629ad85108250a6d3130a85c50cbf800d5315ce287a25eaa8c71840a570c1d18f
 MISC metadata.xml 703 BLAKE2B bda0e570028e3805432e43b1cd39a98e2e4d21c79a10a741038e66d7a24cb1f8d09361243c67fb970621e698ea3341ba8e68de7080cb3919f333efa089692510 SHA512 0246ee26042adcfaaeae171861eb9c8344430958d5bda151427b3c3007cb4db65c604ac115fa072f7e015a56cc06f8163adcb0cdf878dd86c0a17b3327c9b87c
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
index d71c50abb9f0..c623eb8d0390 100644
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
@@ -6,7 +6,7 @@ inherit autotools
 
 DESCRIPTION="Small program to test performances of remote servers"
 HOMEPAGE="http://echoping.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
diff --git a/net-analyzer/iplog/Manifest b/net-analyzer/iplog/Manifest
index 84e24123edc3..9486c2cb945e 100644
--- a/net-analyzer/iplog/Manifest
+++ b/net-analyzer/iplog/Manifest
@@ -2,5 +2,5 @@ AUX 2.2.3-DLT_LINUX_SSL.patch 7265 BLAKE2B a20edebe47d65d066b1b3e214d8365b4a5811
 AUX iplog.rc6 776 BLAKE2B fba34208b2d16ba508cc9c3592e21eb7f0a479a89bf4617320bd9627047024f0cadde7fef55304baf25f7ccc56836e899b71801141b1802facc8b885b9b121ad SHA512 f0c3965810f7005e1ae183a2f3ed66ba06c054fcfd78da6277eaa364518ebffb9f44a0c99200b0d3042a63d4c57141d5b29823e8bc1d3f030e00d8e913021a34
 DIST iplog-2.2.3.tar.gz 133639 BLAKE2B f8108259f3f9b662297785988c40711d9d4ce6381377ed9a797f441c84fd1dcd9f0c3832e07ed9a660ddcc41bc52777136204274de873b72bce151327738ec2d SHA512 d7669e39b728af366b5199c58d396c6907496b4895ffb1ba0cba54fae0646f9792170f932de1eae9634b5ac356644a5d6d0ccaf7bc77a62641695992245c9aed
 EBUILD iplog-2.2.3-r2.ebuild 711 BLAKE2B d316c3319b05b81dc972e9bbfaa9b995de0d8efc184d4452ad9d88391f62a115db5f3ab9efee212dd2fd20d99f4fec7f41cfd14b03cfb455274dbe5bd9e2761a SHA512 bd905fd7a0a16565c57fc1e127756deef649c3b5ac8ff9f362bc305190070be9aab391db1bde97b4f7f8d5c8a9687d05aa611222d0bde46b1d992ded2022d106
-EBUILD iplog-2.2.3-r3.ebuild 705 BLAKE2B 6c0684735df2d67fdc627638ebc444c040cafb26fc545f00f6f4d3c76ac2899245ffc6cd5373da2a2d6130837b343f625fe5cd694e0058e00525c1e67ac4188e SHA512 8427570ca75e36dcbc79e711c9fab08d1ea24bf71b9d3d90e6980ccbe64c5233452ef12e87aa4996144665b966d30ca7e1cb826d63dbb176de6d7fbc1d8e6d99
+EBUILD iplog-2.2.3-r3.ebuild 702 BLAKE2B 6abe0ac6b74916e30436bb9f7bddb61e0ff63361f68c39befe0d88f335c19679640ea852e8608dd35ad21ac36ff08dde4216bca4fa512d5ac08332be7147fd09 SHA512 6e4001f8e8d268c42b62ce99ab9803de6d1c1776c7fc83af304547d25974b1ba7fc1c32953744c313a642e329eb6e89b15997d3994f47e6c5e40ff6dd1eeadc6
 MISC metadata.xml 355 BLAKE2B 337b9d3630275e047ddd52222f2a94827901805a8e43cc316633048ab5ddf091f4300188d54f3eed58867b5a0f0efbbb5aa559f8182568104bb00bf2f4833afc SHA512 ae66cec4d69d91d7962a8b3b282fb429d008f6218e671d351dfae2dfc78310e066aa93e1a68dc00cd0b1ae61d0831ce6161fb5016edd6f1aa9120cb57903d384
diff --git a/net-analyzer/iplog/iplog-2.2.3-r3.ebuild b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild
index 09cfb969491a..8733fa8e1a59 100644
--- a/net-analyzer/iplog/iplog-2.2.3-r3.ebuild
+++ b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 FDL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~mips ppc sparc x86"
 
 DEPEND="net-libs/libpcap"
 RDEPEND="${DEPEND}"
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 71a1d790a227..7bb2dc3bfd85 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -17,8 +17,8 @@ AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.9.1.tar.gz 6781346 BLAKE2B 4242ca77372005f995dfd228bec51d35b6b0f8c0ab0e44ed40cdb3cc0578b64e97444ffcb074dceca30739deadb46e68f1c75e87d3f1768d81b5e084b0fc0f5f SHA512 ae158ab41961ee2064d85187337979e6ff6ba90f3136b8a960e9ae46ee1408d9d2f0c5c4dfc3a3302e6dbb357cddf1221489435288c4f52182a03e94a9e450c3
 DIST net-snmp-5.9.tar.xz 4082580 BLAKE2B 9dfd5a7dfe4ca18b16c71c9f5cb70c540d16aa36a0b2dacd3ddc465934f96ac473f77490af78d202bf6dad4eddea5d75665a770df74132aafda39f5f3a87d835 SHA512 3f1e27caa8e5306d451b61b08c2daf007929a850661962fcd29b528a80332a980184303a7e87c96d8d2774181758889dc825cb08e3c3b353c5e7ca1ebcc09173
-EBUILD net-snmp-5.9-r4.ebuild 5621 BLAKE2B 4e7a0bcacd7d35addc863f2527cb8ce9c6c777ecfe2fc336b072b2b25eed7a388eeff3be3e3a52abb9c705f6bfbe17446e7ed2153867f29174c3093692bfb6f9 SHA512 c7d3fbb129a6c79675a002c0bd96728a60ed4d8d94d51f6c1b82d381c3df30cd9e86d76701bec87cfd1dae0cd7e2c7500ada0b07e7f311083bcab64088f78063
-EBUILD net-snmp-5.9-r5.ebuild 5660 BLAKE2B 4e06816e0f73142b1910c6e887c130e2ef60d8bdbcc948740fb4a330229152655da1dc04bb5bed5d6c505b15172d55daf304a4bd06ca1d560e67b1a4e70b78ad SHA512 fda3983d5c28f2bab36aa11b197990605f5677dfd698dcb398957085261aa7a30a4bac9cdffa89cddb8c263475c09f94ddd6fef320afb333dee18f2c03effcb3
-EBUILD net-snmp-5.9.1-r1.ebuild 5632 BLAKE2B c25017fad18ca6bd3cb935a20b3413c623bb3a92969f0571fdc15b4850f866c95036e98f17ccd04c2d6ff8767c75493127165e8b368180f186e7d9309e733e66 SHA512 9f661d5916033b30768699bc2ec2255a559c9ec6d95d8baa19f3af3659d67191180eede1b8c45ef9bcaf8ef7855fa2322bffc5fd90285952fcadbe2608919c86
-EBUILD net-snmp-99999999.ebuild 5567 BLAKE2B f2398dac2eec806c1a25335c3345220394eb26de535a9253c53c6690469727cbf6148a7e46a67193189678be6794e634a8627aca152d24166fe1658db2fd3cd3 SHA512 50ce4be6511a7a70f9f4e0e48101774fa4a4ceb1f39a0b3c615264a02b0f01049855f50822bac6e5cfabc312e6404570476667d3455c11627eba565cec864fff
+EBUILD net-snmp-5.9-r4.ebuild 5649 BLAKE2B 2ad2368c5417c17042296e2cd80ca3d1ff10d63396d47bf1ee134ce129440089c3c9615d25f4a0b63d86a608860d3052d0a9f86079da741bd454f09d24b21dd9 SHA512 8083919efe15a3a50ded5a9a2fa44775af327e09d59040a48af08319de756f3e4307eb15a69f1c75dd7e5559aff0afdf501a3799ae58075c7e9c4492f1d59952
+EBUILD net-snmp-5.9-r5.ebuild 5688 BLAKE2B 8c744f465bc65ea9b17d9b0549232bc28f65e9908b4c2481c189e84e68b6e62a2320bd2731a6e45ad83abdb7c22b2fb017929129318b1907ccd75852bcbc6d6e SHA512 a5d55867b08440fb09de40cc032b6fa53d434ae505cd0880fb04f12d0778993cfa8c43480d4bcce3a26f1d2af82a71037629ea7a115692f3165827d3f5a99cca
+EBUILD net-snmp-5.9.1-r1.ebuild 5646 BLAKE2B 8128a57b3e20c4ac78f3be7c1720145d97972bfc5e03151e9b2ecc43eb53a2aed72845e2fcce75bd4df669764909e30a4fdf6f554b60e6b39b77668119defe56 SHA512 32bd7bf425a899ca1a0dcbc0df578bebc6dd78a34128950962084ebeb1c1123708c4f6a77f4988aa4d5a7ec0c411840f70fa29c29f8271a5c8b9abc965b9ac5a
+EBUILD net-snmp-99999999.ebuild 5581 BLAKE2B 987b5729bee9b2fe0d3594dcd5a3b90952325f3148b20fd447e9a6534fc87b3ee4a83185d43d2664d91bcf482429fead1683033316a6c8549711cf3733823932 SHA512 b7597f0b472ef5aeaaa3b22969e44a942c33005a136250aa2a754b027437103a3e86546b025a3bab11a2c1467418bcd4138aecb0a99046332c1087afce0836a3
 MISC metadata.xml 1384 BLAKE2B 7482ef34aa0a5fb60c32a11449e6eb53bcebc7852c013650151392401532ff66f56e0c43dc98ad8a47e8166c97ce04d24bbe1d8a2ee21b934a19983d0847d941 SHA512 9ed265ee76578df5f4edb04d7fbc3eacfab7c27603bac65a3ae5086a31d3a9ce4f128cc751d63e1c27fd13e16fcb83a7966771b73026b7339663802ce51023e4
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild
index c2fac1bf01c8..98e333c0842a 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild
@@ -14,8 +14,8 @@ inherit autotools distutils-r1 perl-module systemd
 DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://www.net-snmp.org/"
 SRC_URI="
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
-	https://dev.gentoo.org/~jer/${P}.tar.xz
+	https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz
+	https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz
 "
 
 # GPL-2 for the init scripts
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild
index 790f91e2ff2d..3480413cfc4b 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild
@@ -14,8 +14,8 @@ inherit autotools distutils-r1 perl-module systemd
 DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://www.net-snmp.org/"
 SRC_URI="
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
-	https://dev.gentoo.org/~jer/${P}.tar.xz
+	https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz
+	https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz
 "
 
 # GPL-2 for the init scripts
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
index f04571172e6c..b46d354f22d4 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
@@ -14,7 +14,7 @@ inherit autotools distutils-r1 perl-module systemd
 DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://www.net-snmp.org/"
 SRC_URI="
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
+	https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz
 	https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 "
 
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index 3d8752a4e2c9..41b0c6eba4d0 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
@@ -14,7 +14,7 @@ inherit autotools distutils-r1 git-r3 perl-module systemd
 DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://www.net-snmp.org/"
 EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
-SRC_URI="https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
 
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index b5cc73918666..12cbf37c9eab 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -2,7 +2,7 @@ AUX netselect-0.4-bsd.patch 1573 BLAKE2B 62405aa2962ffe74fce014341433d114f6785fd
 AUX netselect-0.4-flags.patch 172 BLAKE2B 17acc10b64404c9d8525147f5ca526f661a2b2c2b7e7ae31b19186784ef4b4714b14e43ccb77d318016b60c6ff80e381acf9b006487f0d9ebed06e70cb026a3a SHA512 3f665743859e243126de95340da5b9dd42ff671d82f3809e294b752a568b7ede96b13f6a63e18cc522ce19d1537b137d5c05e0e49ce533e8fc337922e18ea74a
 DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a2ff1b4276dde48405de2d2bcfdcef066c4f3eeff174f766af23d2807085f97e459dbffc87b2a2950a472e7964f2e3fc SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea
 DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa
-EBUILD netselect-0.4-r1.ebuild 953 BLAKE2B 4fec5029b683d5c90616c2fd162a604984634f97e43b50b529d2fdcb01a557633fe63650bbedc796714e1accb9bd0743b9f69fcb3a459f1e8eb8f8c6a8e5f1c4 SHA512 4452e6d1342bc9456e023bd6e43d9ba0ce67af855e8d685a921cd111d19970d95481e22ab7159b636216a8d756e2264ff6f5037397cfba76068032bf9233f13d
-EBUILD netselect-0.4-r2.ebuild 1203 BLAKE2B b963ff6d6fe466517aba510de63f3d9ede48de1010d01dae72f72fdf8cf3c13db6ac29efe60acae128e67006d6871933111d1386c8b23ec4c0b5b0c9e7506328 SHA512 111e4cf8a5bafb438e1d1f3b0dcbfc350b50d29eb22e54021b6c3baf9dae34de764ecf9e41566b56635c62ad1679d19a907f1f43158bad2d310bf3ec8b01d10a
-EBUILD netselect-9999.ebuild 1144 BLAKE2B 56afffb99197144cfa811f79b15bcff52992ea6bb539e4eb51a7fc45330f5662476c9ddb14db54e2ebe868ea32ddf0c319eb8b6514dce089b0ef23f6586f32f3 SHA512 5478562b06da2080c5aebecaa267318afa19abd5b2dae30db2ccff0d329e8e0ecf55d548d1b4eb878cd35592f715154f6d958cf080bbfa91f9fb31d9c44e0bb9
+EBUILD netselect-0.4-r1.ebuild 967 BLAKE2B 4edc8e62bd917b2ab07b025dc1fd1bc2915f8b0c99c392e79c5bea64099f30f00ddbbcf84fb0d740d574867f10ef1b14318efa415510ef2d1defb993bb36b0e4 SHA512 fe9e8346cfdaf06fd8f99e46e0dda904ed4a293b3be6a0075d70554f185ba73057907f6297585dd294f70f06f5429a392b4809c0a538eccf11a7a4d24279b283
+EBUILD netselect-0.4-r2.ebuild 1217 BLAKE2B 083b5b932b5d4d95245511f4ae77a7c1c5ae420bef4d6bb0371ab83b08a50a550f22763878eda1841459d818283d9bf4d6e9c8d658656a47f800b3d86b6ef843 SHA512 a27fe0f38f9e38239d77bc921d3b06a8581ad904d9d655ff96384823e85d330bbe3126bcf0e459a7efcac5c67e6b53161080bdf36d369593ac6a74a3657676d5
+EBUILD netselect-9999.ebuild 1158 BLAKE2B bbfb32456f76e7a360e5b796c5bd6cda89cff53e3bbdefd37038655d38da420bb29d1b2e6179acb57c1c74c4ed1d48b23ae12e91177de1388d48887986394858 SHA512 928a53ecf818469203ee1d674d264ba7dd9f74206dd45f0d811b144f148ceb29e0c5016cd49d11f2db4ed8e6f81f7772333674d4fc9951ca391168737944ef81
 MISC metadata.xml 364 BLAKE2B 488b33eefda9653419ada58299197665494566461fbb659916e6d345007c21262567f5953525e3f0eafcc45427e252cf54ad85a2f2cfa07d3ab535ac63238a4a SHA512 eaa99f81f964c01dacdbb0eaf29bff94ee589a42023031bad6d24d15e23515c15ade496383726bfb543e3f6d66636b0822968425820fa472a4c7094fdb15903a
diff --git a/net-analyzer/netselect/netselect-0.4-r1.ebuild b/net-analyzer/netselect/netselect-0.4-r1.ebuild
index cf688a073401..80066a138a33 100644
--- a/net-analyzer/netselect/netselect-0.4-r1.ebuild
+++ b/net-analyzer/netselect/netselect-0.4-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Ultrafast implementation of ping"
 HOMEPAGE="http://apenwarr.ca/netselect/"
 SRC_URI="
 	https://github.com/apenwarr/${PN}/archive/${P}.tar.gz
-	ipv6? ( https://dev.gentoo.org/~jer/${P}-ipv6.patch.xz )
+	ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/${P}-ipv6.patch.xz )
 "
 
 LICENSE="BSD"
diff --git a/net-analyzer/netselect/netselect-0.4-r2.ebuild b/net-analyzer/netselect/netselect-0.4-r2.ebuild
index 12cedb9b9205..c9f3a3a436d4 100644
--- a/net-analyzer/netselect/netselect-0.4-r2.ebuild
+++ b/net-analyzer/netselect/netselect-0.4-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Ultrafast implementation of ping"
 HOMEPAGE="http://apenwarr.ca/netselect/"
 SRC_URI="
 	https://github.com/apenwarr/${PN}/archive/${P}.tar.gz
-	ipv6? ( https://dev.gentoo.org/~jer/${P}-ipv6.patch.xz )
+	ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/${P}-ipv6.patch.xz )
 "
 S="${WORKDIR}/${PN}-${P}"
 
diff --git a/net-analyzer/netselect/netselect-9999.ebuild b/net-analyzer/netselect/netselect-9999.ebuild
index 7fee270c477b..5ed3fc2fde64 100644
--- a/net-analyzer/netselect/netselect-9999.ebuild
+++ b/net-analyzer/netselect/netselect-9999.ebuild
@@ -8,7 +8,7 @@ inherit fcaps git-r3 toolchain-funcs
 DESCRIPTION="Ultrafast implementation of ping"
 HOMEPAGE="http://apenwarr.ca/netselect/"
 EGIT_REPO_URI="https://github.com/apenwarr/${PN}"
-SRC_URI="ipv6? ( https://dev.gentoo.org/~jer/${PN}-0.4-ipv6.patch.xz )"
+SRC_URI="ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/${PN}-0.4-ipv6.patch.xz )"
 S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest
index ae28a041ab63..5be4a990e976 100644
--- a/net-analyzer/packit/Manifest
+++ b/net-analyzer/packit/Manifest
@@ -1,5 +1,6 @@
 AUX packit-1.0-noopt.patch 214 BLAKE2B a0f981b13b21f9e6f37f87f69e36aa41c68c6c3fefc3337a7864d7e554315de555304c0f76227870a0b498d5301438038c175f66d908e5cd470407c79717fe40 SHA512 a4d0bcdb8947d219459d1a5687cdcadb7f8e9792bad2adabe8a402d42e19c5ca9e6e808bd6d832490af271d58d555d18c5f4949758233b47f27d7e115d36e6f3
+AUX packit-1.7-configure.patch 2331 BLAKE2B 0d679c4361d9cc66bb15dcb4d8d6df86d6c4790919bc49f898ec9f489a6e7535db9d1887db30664c6119948701d048cbd0dfd3272be7ecab89fc04b5fb01d41b SHA512 dd82380b482e72fbbf8678cfc21e4117512b35e62946f9600f57710158f45152b61e712e487c07100fa2b5ce1a84f86af7c5092bcaba5bdea9308ea076119d41
 DIST packit-1.7.tar.gz 53192 BLAKE2B f5a7fcd0790e05be593be47c2339c3ecb14b2fd45308a273ecc9d5398087698605c2174a8440e870ccf35fd9d560bea11ca720e44045115c15757f6f98d00ac4 SHA512 4e7d13ef5387dc446e718792562dbf84f9e0b611196a3590ea8e8b4411ae30694b48f28ab632a0b692935adffb44757e65a4eb5ab942b5d625acbdc08d34aefd
-EBUILD packit-1.7.ebuild 654 BLAKE2B ec4aa17e5bc33fa3279f9b04145ef3f58161b05375bfd12ad42c23a3f1b17a3109d8ce3e92ad3113e5b0207c998d26d285c4c98ef6b0ea910b6370ac3562f4ab SHA512 7da31bfabc6ab3147ad4e6a9f2e70b382091d1aca47a7e04e3080597c438611f3f6d8b20e782cff63acc66edf549e5b35eb1a2ba5db4b0f843ae379eb3795913
+EBUILD packit-1.7.ebuild 696 BLAKE2B 79f017339ebf1f13cbad3d3520700602667d85e1e56fb6018cf0f71ae75aa46618336ea23a578e7e4a600c469f08c5adc46b1f2068d18b0f30eaaa1a601025fb SHA512 00dc5a054a9ec939fab3ba7f5b01bdc665045b9ec5cbf2a2ec8ae9db78d51d9e45878eca34ffa8acf1cd0b245ef3b20f49a89d6184b1e375b9dd788f1c4dd464
 EBUILD packit-9999.ebuild 582 BLAKE2B a7015c50254810d82f6dcb12a2cdd05ca8893b39ef0de4d59acf8a54147b026821c23947228832d2303a128cea35c068f14b2da1cfa4e681fe2ee1647760baa4 SHA512 4d332811932801f9f330247ffc136b3c869d4c0788d7c1433be903cc3faf44916c0f219197e367cfe175829facd7bd988aab6307a5cbf9a27e034b607f44cb16
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/packit/files/packit-1.7-configure.patch b/net-analyzer/packit/files/packit-1.7-configure.patch
new file mode 100644
index 000000000000..0f87f0408d8e
--- /dev/null
+++ b/net-analyzer/packit/files/packit-1.7-configure.patch
@@ -0,0 +1,67 @@
+https://github.com/resurrecting-open-source-projects/packit/pull/19
+https://bugs.gentoo.org/816753
+
+From 030cdc3f6ded1d206ca16dacc19aef181adba708 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 14 Oct 2021 08:11:24 +0100
+Subject: [PATCH 1/2] configure.ac: fix autoreconf with newer automake
+
+Newer automake forbids repeated calls to AM_INIT_AUTOMAKE.
+
+Bug: https://bugs.gentoo.org/816753
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,7 +29,6 @@
+ AC_PREREQ([2.69])
+ AC_INIT([packit], [1.7], [https://github.com/resurrecting-open-source-projects/packit/issues])
+ AC_CONFIG_SRCDIR([src/main.c])
+-AM_INIT_AUTOMAKE
+ AC_CONFIG_HEADERS(config.h)
+ AC_MSG_RESULT(beginning auto-configuration process for packit...)
+ AC_PREFIX_DEFAULT(/usr/local)
+
+From f62d3d40ff99ac39e7cbdea9991bec639a16d3a0 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 14 Oct 2021 08:12:14 +0100
+Subject: [PATCH 2/2] configure.ac: don't ignore failure to find packages
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,7 +146,7 @@ AC_CHECK_HEADERS(libnet.h,, LIBNET="no")
+ if test "$LIBNET" = "no"; then
+     echo ""
+     echo "Error: Can't find libnet 1.1.0 or greater. Visit https://github.com/sam-github/libnet for the latest version."
+-    exit;
++    exit 1;
+ fi
+ 
+ AC_ARG_WITH(libpcap_includes,
+@@ -161,7 +161,7 @@ AC_CHECK_HEADERS(pcap.h,, LIBPCAP="no")
+ if test "$LIBNET" = "no"; then
+     echo ""
+     echo "Error: Can't find Libpcap. Visit https://github.com/the-tcpdump-group/libpcap for the latest version."
+-    exit;
++    exit 1;
+ fi
+ 
+ dnl Checks for library functions.
+@@ -181,7 +181,7 @@ AC_CHECK_LIB(net, libnet_build_ipv4,, LIBNET="no")
+ if test "$LIBNET" = "no"; then
+     echo ""
+     echo "Error: Can't find libnet 1.1.0 or greater. Visit https://github.com/sam-github/libnet for the latest version."
+-    exit;
++    exit 1;
+ fi
+ 
+ AC_ARG_WITH(libpcap_libraries,
+@@ -196,7 +196,7 @@ AC_CHECK_LIB(pcap, pcap_open_live,, LIBPCAP="no")
+ if test "$LIBPCAP" = "no"; then
+     echo ""
+     echo "Error: Can't find Libpcap. Visit https://github.com/the-tcpdump-group/libpcap for the latest version."
+-    exit;
++    exit 1;
+ else
+     AC_CHECK_LIB(pcap, pcap_setnonblock,, SETNONBLOCK="no")
+     if test "$SETNONBLOCK" = "no"; then
diff --git a/net-analyzer/packit/packit-1.7.ebuild b/net-analyzer/packit/packit-1.7.ebuild
index 6f454fbc9ba2..a1576a6b050e 100644
--- a/net-analyzer/packit/packit-1.7.ebuild
+++ b/net-analyzer/packit/packit-1.7.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="network packet generator and capture tool"
@@ -19,6 +20,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0-noopt.patch
+	"${FILESDIR}"/${PN}-1.7-configure.patch
 )
 
 src_prepare() {
diff --git a/net-analyzer/pathload/Manifest b/net-analyzer/pathload/Manifest
index 9d1d56168644..c72e2ccbbfbb 100644
--- a/net-analyzer/pathload/Manifest
+++ b/net-analyzer/pathload/Manifest
@@ -1,4 +1,4 @@
 AUX pathload-1.3.2-make.patch 509 BLAKE2B 317ae2327725e2405802f08110055c970d430db0710ed82594bea5d1148bdb1f224ee335692d73713f8efcb2032d0efe54fba40a474f2f20f23fbefa76322c7e SHA512 b7e4ae8a952f9d0e8cc1ff038bbecda8164817da0d38a3d73b55cecadc550784731aa2664e2f63322b7a38fe35440d01ad12663409d7b4b67d8c5a25f844a234
 DIST pathload-1.3.2.tar.gz 68524 BLAKE2B 0ea27000647c292e4d04c92574dc2d63fcdd9c16be57d9af49df8651e6f8905561c70f48b9854c69a16c4b3d16fc8bec61ffed3cbbdad7e1f18e2209e9b4f199 SHA512 9fef51c86b8aa2c28a33effe5a5bff36eebc0812f6d6744fac93df46ec0cbce8f5977d24b6ac52442386fb263550fe46e639c4a3ff4612fe92ad09d6595e5d7f
-EBUILD pathload-1.3.2-r1.ebuild 610 BLAKE2B 77da658a903ba4d575d266be9ae035e9986751cc1377c4185232c547349536bc765c65b87b307b7231fd92dad535150c34ae558d75e2bbcde38bb841141e2905 SHA512 f40a17da4ae2e6995079a658b2008a172057c9fda72f485031461bbc211bab041b82920ac85b937fce898925059338cdc6b5cfcd73d3e03459448f7c8bb999c5
+EBUILD pathload-1.3.2-r1.ebuild 624 BLAKE2B ac9f2f8b5e93eafef43766259cdff75e5d456857fefda65fdb99c27e15b42e107ed97dd6add36f6d20e99240d0b551a7d7138be579d957625a0a69d7e825b1e8 SHA512 3b4698669cec7d6ff16c5016ad31f93540a0716b149af04961883c70e1ca2d783a72671080da34f945025f2dcdc181c21f55be807ae845f3981fb02303e9e943
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/pathload/pathload-1.3.2-r1.ebuild b/net-analyzer/pathload/pathload-1.3.2-r1.ebuild
index 27b8252d8e52..47f7848cc5a8 100644
--- a/net-analyzer/pathload/pathload-1.3.2-r1.ebuild
+++ b/net-analyzer/pathload/pathload-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Non-intrusive utility for estimation of available bandwidth of Internet paths"
 HOMEPAGE="https://www.cc.gatech.edu/fac/constantinos.dovrolis/bw-est/pathload.html"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/scanlogd/Manifest b/net-analyzer/scanlogd/Manifest
index 35d35f25920a..0230e0669553 100644
--- a/net-analyzer/scanlogd/Manifest
+++ b/net-analyzer/scanlogd/Manifest
@@ -3,5 +3,5 @@ AUX scanlogd.rc 382 BLAKE2B 086a833826e21d94c5e8d8bca522dcd69f8a1d42164094b0bcbf
 DIST scanlogd-2.2.7.tar.gz 11352 BLAKE2B 480e1ef78ac35ff04fb44961aa501f997786e20a3501f54f74b9e5761edba4736341d364a9a10772d795cb6025b88399bf3b56b0a980a0d2d0787f7a66eeeb22 SHA512 56238cb91a33524a9512914568984ed0d066eb84bea1c08551fbc4e02c9643a3f9535d59b364db00d538e4d9bcd9650ac24f2042584d3a9c639f99eb77ba1a7b
 DIST scanlogd-2.2.8.tar.gz 12190 BLAKE2B 26396c3174de3d3cceed9833354cae7d7bbcf3078a81472ae1fa28856f011e6984fa8182a994d5a10632c19f15f86e31f1ee73309273cad04e05fec942afa0a4 SHA512 92f7a28dd40593dad6afae4fd0572efeceea3f43f334ff82c349538d4a28e9ab624912f82fc5c102a4a9937009bbf7b76a81029588e2815ff9b305144143572a
 EBUILD scanlogd-2.2.7-r1.ebuild 903 BLAKE2B 81092044beb603269002db1767c42c2d9a1028842307f012699ca8f2d2c5673f7d4ffe30346e349e667b9c7d0a3e901fbdaf7ea5eddbbb75b52a4e68807a7625 SHA512 eceb8f2d589dbcc0e4786a34e6f8c9ef3a7037715cdfa133da2e4e1b697222ae224056a537124b95e7032e684165c99e47661561d9342a8d64d5c1e0342ca3f7
-EBUILD scanlogd-2.2.8-r1.ebuild 919 BLAKE2B b0b643c645c3158a1d221a0783ab975667818a01c72aa2782348a45c5c53be6c4f2389485e204ed5044f1c722f85ef9a0bb47acabcd8bab2c5669cd7453bc4bc SHA512 197f6aba10a39537aa2d561df78fdd44ac770de8f65a49d2526d46787b4a8c4bbcfbfd4c73f5d9e90623bc23291e8fb7f52ae022912c8a79f9d7c03e425bd806
+EBUILD scanlogd-2.2.8-r1.ebuild 917 BLAKE2B 68d4b6ee3ef7b23c02f38656f199be2c346ccc49426b36f8dfbfc013d61b5f4a339b9a453a678e1575f517128ce341910b9c3ce3745ee65bb8ee3a1f4a02fe80 SHA512 1c1d6719679b061aa361fbdf3170416adfcaf1c7464fd1699fb40345e32038a59a8b6f279da6f06bb2d8e439e758232bc06b4595a04063dd725cd7cbda40a2dd
 MISC metadata.xml 444 BLAKE2B 311531fa01cf8b3e80b424f6bdabc9bf95ff66bed3953f24c978f36a98f5e08ecd674a5b7b414d2bb626bdda800e9d81f0388af5f11408b27f5bf6a7a097dcae SHA512 6def253f68d2423834a6d13b9b99f03a511da11a831a4b83151d3d310a769ad56ad9d848a02f4b2d3f2806117f1d7a47c5c2fe444e365d622f0fce0bb65d3b68
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild
index df7a9b460ecc..0e6c20df4bec 100644
--- a/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild
+++ b/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.openwall.com/scanlogd/"
 
 LICENSE="scanlogd GPL-2" # GPL-2 for initscript
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="+nids pcap"
 REQUIRED_USE="?? ( nids pcap )"
 
diff --git a/net-analyzer/traceroute-nanog/Manifest b/net-analyzer/traceroute-nanog/Manifest
index 1276a0591945..f311186d8a3b 100644
--- a/net-analyzer/traceroute-nanog/Manifest
+++ b/net-analyzer/traceroute-nanog/Manifest
@@ -1,4 +1,4 @@
 DIST traceroute-nanog_6.4.2-1.diff.gz 18417 BLAKE2B eec999aae1e728e9c255715042ee7be66bc32c19eff3ab32b85fecd281032d24eea27fa19d27793d9820b61539791ed82b0a0a7845636970a8d2433d0e3ba40a SHA512 62c2df3db292ab263a2d076689b80ff156bd4a3b4f604974ad8210a700bee80055e21165909eeff138d03570ffe4a44b983ed0cf5ba0c6a914af1928ae82038e
 DIST traceroute-nanog_6.4.2.orig.tar.gz 34429 BLAKE2B 427a7af1f65271b1b4f46522d76da00628e1c6b877b576ff571dc09d7c1bd0232abd626296b46a16785cccaf091b086ea61b5081035572b846e04fff97d0dafb SHA512 1cd4c98404e7b25b2c1f1e4018fc1774f09822df8e597022c7b31b9cf20ce3c5649fd90337c62c65d163fb9c896bd9e19277febb5312d4afe347eac328c6e304
-EBUILD traceroute-nanog-6.4.2_p1.ebuild 967 BLAKE2B 1e7e46eb3e693abfd58787468ff7c6ae3e7b77896c27f7022fbaaa9589bd962c3f9f99121c517151be2707dc967771d8296271ef246bca4b7d8eb2408a612bf6 SHA512 40cfcfc62e8b66c3b0c8d7dab4b9fa591653817f4a135efde647cdaeb7ed1074e89d73bdf346c41d9e160110aab72432df51606a2a5af1a63e0c438749f49d54
+EBUILD traceroute-nanog-6.4.2_p1.ebuild 995 BLAKE2B 7c7660cd46a9e8803c0efc13f3b8025d537f8c2d9971820e487158faf642a26ce5c5a26a6b4683cd8f7a447d1268f6bf83923f864f7bcc12d7430c8f3544a790 SHA512 fb8d94c007e173085b258ea2b8c8b16a52f42ae0bb0b76826d19b4e5d8f7abbe2aced03cf6c2f200e26bdb6c546d656b48513198e764721ffc812507484582c6
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
index d40f8a60a493..84675a594205 100644
--- a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
+++ b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
@@ -8,8 +8,8 @@ DEB_PL="1"
 DESCRIPTION="Traceroute with AS lookup, TOS support, MTU discovery and other features"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="
-	https://dev.gentoo.org/~jer/${PN}_${PV/_p*}.orig.tar.gz
-	https://dev.gentoo.org/~jer/${PN}_${PV/_p*}-${PV/*_p}.diff.gz
+	https://dev.gentoo.org/~jsmolic/distfiles/${PN}_${PV/_p*}.orig.tar.gz
+	https://dev.gentoo.org/~jsmolic/distfiles/${PN}_${PV/_p*}-${PV/*_p}.diff.gz
 "
 
 LICENSE="BSD"
diff --git a/net-analyzer/ttcp/Manifest b/net-analyzer/ttcp/Manifest
index 377b07b5e2b0..45ed518954be 100644
--- a/net-analyzer/ttcp/Manifest
+++ b/net-analyzer/ttcp/Manifest
@@ -1,4 +1,4 @@
 DIST ttcp-1.12.c 23690 BLAKE2B 972869da1e2e945702e6852648166eefae224b39715ef8495526ec7cd33cdb1e69fa10bb356a96e701f8b597c547b3090956320f947a02f1fad0b12d027b7e32 SHA512 8fc800b05fcf3590d15a87983ac7abc3646c6d4a89f7cc6b91e495066a90a6ce21f7bd7b6ab21e09f07bfa20c39bdc7bcec479449d7cd2b88639dc6cca4a432e
 DIST ttcp-1.12.tar.bz2 8086 BLAKE2B 42ec3d82d56ef28527c096be7b6ea568997f0028ebf51811974fec8c444a39785996b0a51eedff6cec6c53f215e4300a3dee91e45f54dbe979d1d1c42e792ab1 SHA512 2218f801a04964dcc684bac2957f892569e4458eb7770e26d4ac5a9a5beebb16b9191cacd8e60cceee306b8fe53000248b52457cb679a3d12ad4308bb0066dbb
-EBUILD ttcp-1.12-r2.ebuild 622 BLAKE2B f12a128da60eb5d3ad277970ddc6ae2fd71aababc01f0da558b069c88c683c8cd0ad07a5c4c7dc85b9ec45878352d966c5274bd7de4d6da35af08d746c12df0c SHA512 b5a90bbf1163e6c829377dc21b64aabe666310611d9e703d46108411556772b0277f3dcd1e5f56972b41ba538fa8a1d835884540fa34689f1f834fdf3d0ecfa7
+EBUILD ttcp-1.12-r2.ebuild 633 BLAKE2B dd298aa4886a2d70ec6d7969fc0dc4aa08b43d8b680c29364e0746b659477e6f13965a7420e4a0895d84b77dba706be6ffddbb730094a32bb8f654b5a245b49b SHA512 40e90723480e231afb4c3ee51fd791ee672d4c8248d24cdc228986c66a208dba2f09b2ad5dfd04d608fcf8dcd72b7b4cca490a417ef3cffab259cc353e42d476
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/ttcp/ttcp-1.12-r2.ebuild b/net-analyzer/ttcp/ttcp-1.12-r2.ebuild
index 49e46e02dbd4..6ef77f5b49cc 100644
--- a/net-analyzer/ttcp/ttcp-1.12-r2.ebuild
+++ b/net-analyzer/ttcp/ttcp-1.12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SRC_URI="
 	mirror://gentoo/${P}.tar.bz2
-	https://dev.gentoo.org/~jer/${P}.c
+	https://dev.gentoo.org/~jsmolic/distfiles/${P}.c
 "
 src_compile() {
 	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} "${DISTDIR}"/${P}.c || die
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index ef6c006f3c63..1c2e73bb8aa0 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,7 +5,7 @@ DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 0a6112ed667739935417350660e31d64747
 DIST wireshark-3.4.8.tar.xz 32314976 BLAKE2B bdd70b77b2582339fc563c91596b0419789f08c6a9e4895910cc703ba5726229acceeccdcf41b3c5831df711f3d635217f123759b86055d1b03742afed7c68e5 SHA512 962ab4d85ca0686c69470a63e516c0e46fbd8f9eb09e1c5f689f37b5c804c6da3e50b96144adc8e2bff6af67e1c9435db54581c8f1ec5908e27e348691bda1c8
 DIST wireshark-3.4.9.tar.xz 32335284 BLAKE2B 95b3e6804225af7043fa1f4e5dc53785d939b56c81983a010a579c61b10eed989e695601c7ac67eb3aa00f9314236dd03e1e9ebb35c17ca81b832bad654523de SHA512 479abcf7b44504a269b73201da5aabac0d7770cd779a325df3214b6df5dc37e175f2889165a933c2902001a06c8141768f35cd8ca35cc55fc6cf30a482ea27eb
 EBUILD wireshark-3.4.7-r1.ebuild 7218 BLAKE2B 455d0e7f02eeacc08e69f0fd9783ccb72268904f87588a9196ed5b8b6cc813a81b5ec7da2bccb253c3c938462082e3457dde1c3bf44b99c18c7688f914f3acf4 SHA512 a90633a35895f79526a6d56380fc4930159a0e2c315b8f4fed800a8dd707fc377350311b64cb251d9591983b3d864d546eb1c7076bcc5c6f28053cb7e15bc0d6
-EBUILD wireshark-3.4.8.ebuild 7267 BLAKE2B 88640570a30e4f768cde22e9465db4f3f88103f59c481315ecca850e823c6860854cf7e35168aabcb01e03e6800503b1c06d5dcbf642a84ac9ccb064c5fc2c14 SHA512 3d236e853889a637ef9e6445373f7a7500a024777f2ef979855d8d60659e1265e3d3dae6965733bdc5a346ddeba2a18363ca32b8eec89c086b2a4f8b6056f280
+EBUILD wireshark-3.4.8.ebuild 7266 BLAKE2B a25fc049d2b849bc87b8e2237a79c1d26a9ce29f39429a9fc7d1f50a2f4248a3c245dd7ceee36cf508a35789becb91faaac9cd74418e9ffa8413b0bda7bd0be4 SHA512 ce1533bd0618150d5640d35cd6711c5c596ef839c8f63b610d3a493d2e2c80ef70ad7320897c213d3879cb2df72f1fbb665054c6bcb6960ee67d608efc113283
 EBUILD wireshark-3.4.9.ebuild 7271 BLAKE2B 3251502459142ab9115b5c3d8a598c61a1a3adad28ad9ace5ec1911e33b9022df22b790eb79973b1d6b0cad6f1c203f17698266d0ce0a1e2552bd322fb8a8a2e SHA512 2db3952ce3bfb7c21cd9fdd5d0530a4b34d21129a246d3b4c45e63622690b538888965eeadc4071842bc46a5282166ee8360638f032966ade6ed2bc3ac8943f5
 EBUILD wireshark-9999.ebuild 7271 BLAKE2B 3251502459142ab9115b5c3d8a598c61a1a3adad28ad9ace5ec1911e33b9022df22b790eb79973b1d6b0cad6f1c203f17698266d0ce0a1e2552bd322fb8a8a2e SHA512 2db3952ce3bfb7c21cd9fdd5d0530a4b34d21129a246d3b4c45e63622690b538888965eeadc4071842bc46a5282166ee8360638f032966ade6ed2bc3ac8943f5
 MISC metadata.xml 5328 BLAKE2B a030872929b89f0ead3794d8bbff20354b3a1b7a35aa7c3ce37baf5170ced9d39bdc665bd23e03e70d94550085a88224ec6cd260679b2d01501b272c595442d0 SHA512 cbadc90c858ef008b763253ef548e3634643b98bf90069b3fa34bd4f947d93ee8d4a2f3c6d9c7fe4c93b4169e34681e00905b28e64f8edcff02f23867d75b265
diff --git a/net-analyzer/wireshark/wireshark-3.4.8.ebuild b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
index 470019b2ab7b..68cb4ab7a929 100644
--- a/net-analyzer/wireshark/wireshark-3.4.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest
index 0b45e999b17a..d2b6f5cd3508 100644
--- a/net-analyzer/zmap/Manifest
+++ b/net-analyzer/zmap/Manifest
@@ -1,4 +1,4 @@
 DIST zmap-2.1.1.tar.gz 131689 BLAKE2B c4bcea835b080dca879c227691230ad135d1822db0b81245ea60963b0a78ac71fd64df7ddca5d5a762c3d7dc67f2d689fd9d0d13e0ee9be21033de75c61ebd1f SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857
-EBUILD zmap-2.1.1-r3.ebuild 972 BLAKE2B f43eb3b18197a55705a1d7ca880534b1c729b4198dab34edb1c56f6a95b9cd7731d976282a6bd264aad63838c72084c837c0fab42c766a075e3ca33a9ff26eb3 SHA512 7c95d6a696c8b0b38785c87b42670fddac9000dd30d3e305f6185788a952ceb5964ebccbd183d0bb52b887b7c1b0a902c07a3adeb61844ec6d14128c9bbaac92
+EBUILD zmap-2.1.1-r3.ebuild 979 BLAKE2B 3f7bd68fc3e7e1d4fc0142f7b5504fdaa601ac06419a2069bcc9b380af201e010a3fc1fff51f58dc92bac1864ee8ed9ec265b4b25b8ef2ae079e33ef042ef57e SHA512 1c51a0bd4f222088c83b788f6be64cd2b4df5e9c0c386d91c896f520f717d0570fcedeafb1f6b6c8e20cc4fb0ac07ec76d4a2f73b9eed91cadf7334c3efe8eb6
 EBUILD zmap-9999.ebuild 695 BLAKE2B 5706610795e68a00509c8202bfbbd977e8d77aa41083289aa8cdc5ea41034258c21e20efd7793fa423e43a0c1db9cb380d138b5228b4a99d689ee87af7c0f007 SHA512 a4a48dc87a2dfd6a6c49cbf91609ab259c7c1e894d25404202399d6bdf5dfdbc0eb6b0acc48840de0c35f29dc8b44008a053b1f277587a4902207401a914869d
 MISC metadata.xml 1103 BLAKE2B e4f1a96e95895158f2ae5eddfd27705b3838a50b3b2188f6ab1b6ea8cf1713d1e7519e3ba61c87f82acccf59c172f559f68fb55f2d8885cd99ae1450475f483d SHA512 090657110d0e299669504e3f021147d2c4601783a9240326d2cd5c7965c7ffeecef6512455f57f54c7056a9da8b312a8f89b18ed7c309a797ea044e80a506f66
diff --git a/net-analyzer/zmap/zmap-2.1.1-r3.ebuild b/net-analyzer/zmap/zmap-2.1.1-r3.ebuild
index bd667e0454d8..cb72b0462e21 100644
--- a/net-analyzer/zmap/zmap-2.1.1-r3.ebuild
+++ b/net-analyzer/zmap/zmap-2.1.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zmap/zmap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="mongo redis"
 
 RDEPEND="dev-libs/gmp:0
diff --git a/net-analyzer/zniper/Manifest b/net-analyzer/zniper/Manifest
index 0402ccca4489..b426b6c7f7ed 100644
--- a/net-analyzer/zniper/Manifest
+++ b/net-analyzer/zniper/Manifest
@@ -1,3 +1,3 @@
 DIST zniper-1.0.tgz 20324 BLAKE2B ac13d55e6b59128a0336a27b73b356800d7cc4f1aea82997aee967f26b33e05f62e740ae034bea54ffb15109e3841fe503591d631be843f123466e941461037b SHA512 052683628c8094c402fd042b6329ca799bab594debf35c4e8b4f422e58b67f1acba8b40b335e519f1d2f1baca6c716be40718fd1089020a86c97c011da7003d1
-EBUILD zniper-1.0-r2.ebuild 795 BLAKE2B c5459301bba31d31208298a02d0654470d38377b18d204b8f92c8590f803231cfedd7d0b50e4ccccbe184fd8936b39ce71b9bc3c2feee8247b6eae19d6b8da8e SHA512 5459bd929d95c60ae95b01f813e7e3971facb5b953f124d247edf08bb34d96dc7374d1f3a13a73ba53b7f41c4096c74655d479d82b09b43e55be3471b1f72f94
+EBUILD zniper-1.0-r2.ebuild 809 BLAKE2B 4ad11929b81f13e1146f30c23de81062779b45ba52061401d4ca7ba23a17db9dd40e413b823752ea2ad97e682aecde1e1f6b1aa22db8d8e2ff663e6d0239a4cf SHA512 c70f4b0d381c87c7f92083985ca587e79aa7cdb868792227f72479b2fecd0e5ef75bf0964344b04a32bfec3999e1ec0d63f3d81184b6fe58313f43328e54b4ac
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/zniper/zniper-1.0-r2.ebuild b/net-analyzer/zniper/zniper-1.0-r2.ebuild
index 86991e258434..e96de82264dd 100644
--- a/net-analyzer/zniper/zniper-1.0-r2.ebuild
+++ b/net-analyzer/zniper/zniper-1.0-r2.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Displays and kill active TCP connections seen by the selected interface"
 HOMEPAGE="http://www.signedness.org/tools/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index b1eeafe9fca2..fb7b05b3cff4 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 2b5fc594717e..2baa2d552d90 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -2,5 +2,5 @@ AUX autoipd-openrc.sh 700 BLAKE2B e71e5583db890f8ee1bbe9c03fc42285871089b2ea2d45
 AUX autoipd.sh 1271 BLAKE2B 815c5776afff71489826eb8338535df1af6fbf02f3d42eedb6ebb69e5fff181e7252060818dd2dd67141a40c097ded8b7ac4210cb9929bab4b68ea99533bcf26 SHA512 0bff9ca7e32212aef0246db5baf10ee4f7e93a987b7c591b21ed9f116a1c662a84be9d784fc919205c1fecb5cd8421b81a0eb590c3cc066c6b1b9265b98f1ea3
 AUX avahi-0.8-disable-avahi-ui-sharp.patch 1397 BLAKE2B b04324648b09fdd69f017d0be068556ed443f888b56a0567c3f9647c80f959ddcaa7d2ee0022d6a9a8d6bdd60673ffe7086ae4f5065a47d7b62f5aa287931306 SHA512 1d824f16fffcc41015b507e8210f4daa127c9915387b0695d2e27a46a2d480783b679735ea1ffdd198f52470300e4ae9cfc731c62496ad6a3d7c8408c3ffd8dd
 DIST avahi-0.8.tar.gz 953319 BLAKE2B ddede1b8790ff3057ea5f4bb710e95578229e078a7abac83121e043017dda1ab3d971c723f920fdd4f3d98b88bd2cf21f9645bec1b7bbd2ea194cb399a5f5b46 SHA512 27bba9a551152dfc7e721f326042e7bfce55d227044a6cbaee04d6fb0e3f59c36e159c2b7a4dd42d1c955cdf37cc1c303e91991c08928bbded91d796e9a22abe
-EBUILD avahi-0.8-r4.ebuild 5328 BLAKE2B a47d2060e1c5a477c109905d650eaeea9d8b40240c2ae802d6b492c8ceec36b36b64f1e35d93f8434f7bcf990a266eb26cbf7b703e05e9f44449ba03b2262a66 SHA512 83f59ddc42b91d4833d7ee15b4f0966133394e00c1ad8292277603d35f74cf419d040483a2c72dc0e1b147a5647e9cb14a8c3806ecaff711c4a7fd4c555bd2b1
+EBUILD avahi-0.8-r4.ebuild 5329 BLAKE2B 2d8dc626e3f9490d2cf1ed3d551593a63815faa6f1c82e71647d70c2c88b38eac1aa98708c40f380d0bffe3f4391b80d17a4fa71b572ec68957a107c105b7ca5 SHA512 e0c0ee1febdb50396b004fe691968f8eb33ddc5902faf5f60c8bef3da866a83919e468280c578a2049340140922cf194a2b1234ce6e471bbf50ba7950f5dbe0e
 MISC metadata.xml 866 BLAKE2B 1bbb5863a98c0f5aa6b3b7337c7f8c3ae21b5701f780fb53fa036dde754582462f2bc09d3999bdda524616951c3dcef5153ed77a27ec0877673cab782f480691 SHA512 775872c0491b4b7c448a70336d112e2c7435baddc18c851bb93bd3e2aa0138290e9952b3cb2abff60df78d03c7aad23d4ee5d704ba6afe30f489b76e5ba2e132
diff --git a/net-dns/avahi/avahi-0.8-r4.ebuild b/net-dns/avahi/avahi-0.8-r4.ebuild
index 44eb0f463240..9d623e4c624c 100644
--- a/net-dns/avahi/avahi-0.8-r4.ebuild
+++ b/net-dns/avahi/avahi-0.8-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="gdbm"
 inherit autotools flag-o-matic multilib-minimal mono-env python-single-r1 systemd
 
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 8ffe3676fd48..7ad34c6f157b 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -2,8 +2,8 @@ AUX nsd.initd-r1 1383 BLAKE2B b90de2ebef09a4f9050f6e95f5faf659c62910462aba1179da
 AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1df39ceb58b92a44c48cb21583a480e622f72d07650f410f2e0703f1d16af08152aed16982ab8da2 SHA512 c06d0b035387e7be79cfa8fedf8afb3900772146c6d4090ac39ea2ef165772d875b222ef467bd73422078ef57818bcc931ca67fa290bd99a7a9456efa5448853
 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
-DIST nsd-4.3.6.tar.gz 1197835 BLAKE2B 943ae0700a2f49fffa9414f1d2718fef5e6a2f181373cc0a17ebe04433bce22d3863c8f17bd4d0412264503a80720d6dea9ce0d3ad6305f54dc3a2496118c90f SHA512 d87837b483ab37fde5d3eae7dca4c9e2672a718a1f49847db13232358108a5e0d6395c07d3fac72092a949d3c9861cd1dbed3e9bd0342ba6cbe7ca32feba09d0
 DIST nsd-4.3.7.tar.gz 1221215 BLAKE2B 79bd49324f62812a7f0f5800a686d09600620d1dc87ed9e7d4c1f2822c68700b73f5c58c328927fdf7f4af61a401033e39a8e59e054e53c564acfefc86d68bde SHA512 ef5fbcbeccba7e90cc7eed32c6a6f61f5471e13bfb74e5dd072cc9be7af67ebf97c93c0902e115efeda89489399e0543566a6847788ea7bebf13b9007f2c6193
-EBUILD nsd-4.3.6.ebuild 3049 BLAKE2B d84f9df0a35e63354adaf78ac2b579a79db4e31626105907b85d1c376713b51b4e8e017a37ea90eac9fda4276a53aa568360a45888feeeae02e4a53d848b78ea SHA512 a1acc0e770919a4165d7c98fbf750e12f711c4f7da11e01dfa645c8ac541f9c21e134cf065797e89a5e4d709e7575759688780a794add1044ceaa85cb911e498
-EBUILD nsd-4.3.7.ebuild 3051 BLAKE2B afc4b9d56ae956f6849ac89a83f5492af4f13b95a2117bba8f80bfcbe3e80aea24e84f80c06e7f8fea3bd2f8e9fb0d03dbc645aa57d3b99e207cdffde8d10384 SHA512 13df4a616e144d059757bd4cf9fa4fa642edf8d160dd5014c3cc2694c32004079c352a97ccb50b2283d1d8a4ac429b2246ca5514f56cddd2f3d923b3424b8e8a
+DIST nsd-4.3.8.tar.gz 1225840 BLAKE2B 19d014f130844aab5b7c6224658c6e5a4a7d8d337ceb11e1641bceb367fe76b46be146c703296a12cec834020992eabec0e1ee8f3cb6211333ac8c4c7029fef5 SHA512 aec892f85a6757bfdf537c6f0b4bc3d60c564b3062b582af14df800b24261edc96bedcd0b6649444a46b198b9018397e356b919a871364032c8a2db6256b9268
+EBUILD nsd-4.3.7.ebuild 3049 BLAKE2B d84f9df0a35e63354adaf78ac2b579a79db4e31626105907b85d1c376713b51b4e8e017a37ea90eac9fda4276a53aa568360a45888feeeae02e4a53d848b78ea SHA512 a1acc0e770919a4165d7c98fbf750e12f711c4f7da11e01dfa645c8ac541f9c21e134cf065797e89a5e4d709e7575759688780a794add1044ceaa85cb911e498
+EBUILD nsd-4.3.8.ebuild 3051 BLAKE2B 686c31379f5cf6a8d8b84c9bd0ec391a67fa04bca99033ea49c91dbecd1d93e09b339084904d10fa7867e58a0a5009d5effc1393eedb2b4efc802052dd55e92b SHA512 831727a9e4f2a26bc5598945e856741a63fc0039788ae6bbe743f8fc2240093c6d7c5ca4b90e8072d8b2f82f8d4324d557bed29e65a154e505d1e0d5b2b2ce62
 MISC metadata.xml 1161 BLAKE2B 6037692448c406d47a6e38ad0bf7be0c9b308c27815739efdaf71895e4c7de7f17c6d3eeb81270a5cde6435523db2bdca13c6ee48d7e912222cca0c15f6fc879 SHA512 001d819aee1e6bcccf443a957597bcc28754060d5cf682d5d4ccdc5e2962b654d831671b4866659ec47345f789d0b443e1e54bdea9a4e1905a5fdb7fb87efffb
diff --git a/net-dns/nsd/nsd-4.3.6.ebuild b/net-dns/nsd/nsd-4.3.6.ebuild
deleted file mode 100644
index 21733815a1e3..000000000000
--- a/net-dns/nsd/nsd-4.3.6.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-MY_PV="${PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 x86"
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-	acct-group/nsd
-	acct-user/nsd
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	libevent? ( dev-libs/libevent )
-	munin? ( net-analyzer/munin )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	systemd? ( virtual/pkgconfig )
-"
-
-PATCHES=(
-	# Fix the paths in the munin plugin to match our install
-	"${FILESDIR}"/nsd_munin_.patch
-)
-
-src_prepare() {
-	default
-	# Required to get correct pkg-config macros with USE="systemd"
-	# see bugs #663618 and #758050
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-largefile
-		--enable-pie
-		--enable-relro-now
-		--enable-tcp-fastopen
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
-		--with-logfile="${EPREFIX}"/var/log/nsd.log
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
-		--with-xfrdir="${EPREFIX}"/var/db/nsd
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd
-		$(use_enable bind8-stats)
-		$(use_enable bind8-stats zone-stats)
-		$(use_enable dnstap)
-		$(use_enable ipv6)
-		$(use_enable minimal-responses)
-		$(use_enable mmap)
-		$(use_enable nsec3)
-		$(use_enable ratelimit)
-		$(use_enable root-server)
-		$(use_enable runtime-checks checking)
-		$(use_enable systemd)
-		$(use_with libevent)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED}"/run || die "Failed to remove /run"
-
-	keepdir /var/db/${PN}
-}
-
-pkg_postinst() {
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
-}
diff --git a/net-dns/nsd/nsd-4.3.7.ebuild b/net-dns/nsd/nsd-4.3.7.ebuild
index 729d48122082..21733815a1e3 100644
--- a/net-dns/nsd/nsd-4.3.7.ebuild
+++ b/net-dns/nsd/nsd-4.3.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-dns/nsd/nsd-4.3.8.ebuild b/net-dns/nsd/nsd-4.3.8.ebuild
new file mode 100644
index 000000000000..77567aaed614
--- /dev/null
+++ b/net-dns/nsd/nsd-4.3.8.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
+MY_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="An authoritative only, high performance, open source name server"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="
+	acct-group/nsd
+	acct-user/nsd
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
+	libevent? ( dev-libs/libevent )
+	munin? ( net-analyzer/munin )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	systemd? ( virtual/pkgconfig )
+"
+
+PATCHES=(
+	# Fix the paths in the munin plugin to match our install
+	"${FILESDIR}"/nsd_munin_.patch
+)
+
+src_prepare() {
+	default
+	# Required to get correct pkg-config macros with USE="systemd"
+	# see bugs #663618 and #758050
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-largefile
+		--enable-pie
+		--enable-relro-now
+		--enable-tcp-fastopen
+		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
+		--with-logfile="${EPREFIX}"/var/log/nsd.log
+		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
+		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
+		--with-xfrdir="${EPREFIX}"/var/db/nsd
+		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
+		--with-zonesdir="${EPREFIX}"/var/lib/nsd
+		$(use_enable bind8-stats)
+		$(use_enable bind8-stats zone-stats)
+		$(use_enable dnstap)
+		$(use_enable ipv6)
+		$(use_enable minimal-responses)
+		$(use_enable mmap)
+		$(use_enable nsec3)
+		$(use_enable ratelimit)
+		$(use_enable root-server)
+		$(use_enable runtime-checks checking)
+		$(use_enable systemd)
+		$(use_with libevent)
+		$(use_with ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
+
+	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
+
+	# install munin plugin and config
+	if use munin ; then
+		exeinto /usr/libexec/munin/plugins
+		doexe contrib/nsd_munin_
+		insinto /etc/munin/plugin-conf.d
+		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
+	fi
+
+	systemd_dounit "${FILESDIR}"/nsd.service
+
+	# remove the /run directory that usually resides on tmpfs and is
+	# being taken care of by the nsd init script anyway (checkpath)
+	rm -r "${ED}"/run || die "Failed to remove /run"
+
+	keepdir /var/db/${PN}
+}
+
+pkg_postinst() {
+	# database directory, writable by nsd for database updates and zone transfers
+	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
+
+	# zones directory, writable by nsd for zone file updates (nsd-control write)
+	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
+}
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index f4634fc3b24f..885b3ef94dda 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -2,7 +2,9 @@ AUX pdns-recursor-r2 1426 BLAKE2B 4407525f88d6e4299acdaa015e13866b70b2f697493218
 DIST pdns-recursor-4.4.5.tar.bz2 1400394 BLAKE2B a373d15987860bd6b890e5aa5900f28623ff763a711e527b05c3de950c7fbec186dc5e085100008a8ee89bab24140b0f993357349ec04d968e7f386156cdefbc SHA512 21f4172bb8908cfb53e8d457533a85940b13da6733c2da3972b587e64a0f6d52bfd52b85d5d65769c33dd479ce89b6306bdd105c120ab99b32963e7f0cfbc2e2
 DIST pdns-recursor-4.4.6.tar.bz2 1403882 BLAKE2B 2f860128849cce29131300cbda2f2646c7fbaeeb704a6131933d3bbe205bdf1dddd45f9f79f74345b2dea34e56d145b9ef878c0cd6280ceeb075c196afe53d5e SHA512 0ac897da628fb133bd7cd3932e0a1d362c88c55cb07dc2d5d645f731dc8dbf5d18993967654a60156cba7eaac7869ee10a67987a2a492c0c239de9788188caf4
 DIST pdns-recursor-4.5.5.tar.bz2 1472089 BLAKE2B 408bd0d11b0945de15fe22b290b127a9b7f9f053359a0269fb9e478ae536ed5c4b5ad3b5fa8b15d7786fdd0cdd8721d5a5cb66d46f816105e37ecd9fc9557854 SHA512 7df2e89eea55e870724370753b39d867e2b32fc8bcbdb3efaefa824917b16b9d382817dce7d551dc16d8ad0b0c04b3021cba310b47de969fe54c395eafe7706b
+DIST pdns-recursor-4.5.6.tar.bz2 1474500 BLAKE2B 9d1f0ce83b4d57d6443cf0107d76c4408aee019b571d807167429b56ce543809732610b0ca1f2d406224de33d1bcb747e00b572178ef6748282dc6a62fcafe78 SHA512 43c866a29bd72175bad71450dc20678183f6b11f60d54a174627501be52c79dc91819196be63e6859af086f42cc7297d7a3a6100088a2efe3c99eb8f5fd73e71
 EBUILD pdns-recursor-4.4.5.ebuild 2009 BLAKE2B 2ac02e0feb23ea88dd1a3cb11501b936df84e479ed6a12d091dc6969d541ed11172a5b62ee60fadf543904c79acbb9c55501cbce3e613fbee6ae5eaab26b9725 SHA512 e61b5b4daa36c405397827d522cc70d9923c9f4294b551b485759f549448b00b0613356a769696240c8a7f9dafbce8645b51b96200c2321f7c5f51ac49b4000f
 EBUILD pdns-recursor-4.4.6.ebuild 2011 BLAKE2B e7b7a322ac34dc9c09ca150973aeee17642c76ec9910cd9fd0c8678fb8a85c23c19e89ff4336a8723b2d4350bb5cb79f7cb234056dcc12ba36d5a428b0cbfffd SHA512 011b7d7dffc0d27e4f4cdcb31f0fb4cbabdeeca82f112aa3fc39cf1a47eb569e65f7e6870e41dab7194eed5175e52f746299a79ebef264e8f028f212c7cabb90
 EBUILD pdns-recursor-4.5.5.ebuild 1882 BLAKE2B 9bac176affd6cb7cdacf908de6b1ffb36615606102840d0c52053f21863a62ff69f3d2cc2756c68b46278b17f6498f07909a6b6c6fec1dd751a8a713c2b58eb5 SHA512 7a51c74ea284045cf6872db7a4ba9b697d1416972a405273411b3fa1c0b220e78849651e5df8f08077de95882a376b331079dd83b8f1a8d450c3665f3583ce3d
+EBUILD pdns-recursor-4.5.6.ebuild 1883 BLAKE2B 2ecec2518d4676d838dbdb0cc41a8c0dfd551b15e87ea212594bff2a0d1507746b592684339cf21c08257501c632d157e3edb5ab79b55221c658deae2a83096a SHA512 a26b2d6eb3c97bd485c4e56b93f719e01752c7f5c14019d436260e514cc77ceb644526c210c0ad96cd329e8a0daae862671944501f305ff7a2b59b7c3188fa80
 MISC metadata.xml 1009 BLAKE2B a35c31c4e5478addf07b90464caf1068c7780801f2da35023fb8226e2d64b055378b8020e4dedc9b7795cf8df94500cfd116ebb3196ee27f1ebe83befb453e89 SHA512 2b0ea758d5ab725c1142c9e5abf66fcb7c7fb7916f76a0871e975624de415ba48fbd2a45bcff4afc4cf19bb40f978f1093b4db356e83d8312fda860565d28497
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.5.6.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.5.6.ebuild
new file mode 100644
index 000000000000..391869be2aec
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.5.6.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug dnstap snmp sodium systemd test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}
+	dnstap? ( dev-libs/fstrm )
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1
+	acct-user/pdns
+	acct-group/pdns"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	lua-single_pkg_setup
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-nod-cache-dir=/var/lib/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-lua="${ELUA}" \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(use_enable test unit-tests) \
+		$(use_with sodium libsodium) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index f5ef5fd3a52a..c9c8423ba99f 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 8c3fd8f9f31f..d6b9618c461a 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -5,5 +5,5 @@ AUX fwbuilder-6.0.0_rc1-fix_version.patch 516 BLAKE2B e544ceceda6890f55a33eae0a1
 DIST fwbuilder-5.3.7.tar.gz 7332419 BLAKE2B 130c5ab413263b61b7a78dfabe8d0db861ddfd8bfcee62eb11b9ac8c229c9a9e2b6d8a22e296a12e0e9d0fd9b503882eb06e62f7dc0f62487d760191fce8b553 SHA512 d6504ddab17e80cb332f005b6bbb16c15a7b4735361733f0e0437cb94059a5c9039e563be6e0e8d328954db2416b2c0bdbb8afa36cd946f61e7c7edaee47453b
 DIST fwbuilder-6.0.0_rc1.tar.gz 7281841 BLAKE2B 4adfb2c1ba22d781e98de2e02cc7cca6a1c214d3b63e156b76a351d1a7e399afaf0227ced4c9fa228c637c37247dd1cb6e88a0cc4231a3827ba2e5bd0b8a4c5e SHA512 11126c23d8b9f68e7cdcf0a6d3de1678f1b0c879959cef5484b30c2d41ab0377c70dce432d014331cfd376a5fd20e384db7342745a066e8159c2ae275d5bdec4
 EBUILD fwbuilder-5.3.7.ebuild 1482 BLAKE2B bf0f2d7e38908e69777f00c75b7139be568dce47dd94c346194af67443ba87d0167eee826243f4ec44b72ef8f8e858bc2272ac093972aa2f753d7ed2e367feae SHA512 6e0ae543d68a35816123b304da2eba45c901bee18e08c54dd5bc5684f94ffaa827d3ab2ee2a23f5955c45396d0da57a533dd1c7cb54cfa8a53c4094e91128000
-EBUILD fwbuilder-6.0.0_rc1.ebuild 1014 BLAKE2B a1b7347e1e2923a015d70471d68377e9fc18bdbe96da23289483333e43153c77717def717e177471138424de7b6409a36024876d01fe9ba10282d2de1080bf5d SHA512 5289924e9a0efed9fe18600bcdbc414f23f5a7898b4c692d5088c55b81380d9e1a9c0b677b442dd1b64a64b3934be30c1bc131dafc81035b68bcc62fc4642ab6
+EBUILD fwbuilder-6.0.0_rc1.ebuild 1477 BLAKE2B 7f96cfb2fa4ed9a355f72e1df7134cb65c0bb642c48213fa1848d14b5d18076f05d7154c241bbb508794d547c1914bc09e8aed8de5dd226f735ae5734c2a06c9 SHA512 6e857373e92da2f021660441cfa1ab5ea2682d02947b16f650a515635e7dbc300300c1b407eb9bf2839b9049f1f77a2cdf0a6c44e4e3dacf26f5a9d52f964a9f
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
index f7a064139185..7fc8236ca0fb 100644
--- a/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake
+inherit cmake virtualx
 
 DESCRIPTION="A firewall management GUI for iptables, PF, Cisco routers and more"
 HOMEPAGE="https://github.com/fwbuilder/fwbuilder"
@@ -12,9 +12,9 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
-RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test ) test"
 
 RDEPEND="
 	dev-libs/libxml2
@@ -34,6 +34,18 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix_version.patch
 )
 
+src_prepare() {
+	# Hangs
+	sed -i \
+		-e '/add_subdirectory(.*Dialog.*Test)/d' \
+		-e '/add_subdirectory(RuleSetViewTest)/d' \
+		-e '/add_subdirectory(ObjectManipulatorTest)/d' \
+		-e '/add_subdirectory(RuleSetViewContextMenuTest)/d' \
+		src/unit_tests/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
@@ -42,6 +54,11 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	cp "${BUILD_DIR}"/src/libfwbuilder/etc/fwbuilder.dtd "${S}"/src/res || die
+	TEST_VERBOSE=1 FWB_RES_DIR="${S}/src/res" virtx cmake_src_test
+}
+
 src_install() {
 	cmake_src_install
 	docompress -x /usr/share/man
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index dbd613e39b62..7c2f3ca9c8cc 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 7292ea8bdb9a..1c4370558df5 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,11 +1,12 @@
 AUX autofs-5.1.6-glibc.patch 2797 BLAKE2B b6ea2fc98c0634208103208fe562f77d3cd77e212215a0a346b2a1b9997fd1dc95bf8b42bd899884fd12d735219801308e0934a31553dfda275dc3eef9e07db0 SHA512 83d4808c4f5fe811d675372f7af59c6369d93818bfdb5aac26d5372baf1ef45f71208206fe6176b577294df8ce0dac145d7afe335f028f0a0cf3e6787dfb0bbc
 AUX autofs-5.1.6-musl.patch 215 BLAKE2B 885442f26b482ec28734452d3a987759d761c8d21a4e1457fe9c04be928422473f9a1743b0355c5616486e74bd457faf170eb12b7bb3f790b33314205968f20a SHA512 643fb4453d89269cb2252c9e23f09da657fde4f0c14b8933b950e03c14b8723ec848ec2d5a44da4980895ff6d1cb63c3dfc6074de629a694a370410b270b3886
 AUX autofs-5.1.6-pid.patch 453 BLAKE2B 292388f1d192a1e8763402dbc4d5738d112fbbf4409a9fc8215a3ba9987639381fa0ccc29b28f5fe794dc44c98ebc0177d3ecd28177ff6657201f8ba478febda SHA512 78dfd13e06a7adec4336b18a03a1c0bd9d651ce01bf5e716a75d5574e033db9c3fff3baf660c4a6ad757403db5242a7abecf68cdb4cc9bb4d005992b6fe44ca6
+AUX autofs-5.1.7-glibc-2.34.patch 3439 BLAKE2B 9ad024413e1bbb0c2d953ee9355dc6ac6fbf13d4475a14f9183c5092c4850441a7b7f1809452c96d0020b4fb4105f6724e3f04b817ad5b143b9074662f35a87b SHA512 e22fa260123823fa6109d8b2737877a39e15c696ab1e506a8bdeb2a1feebaec965a577a645c9e9edd19547a2b2237e06191f91107b8025b985b7f4f3137685fa
 AUX autofs-5.1.7-glibc.patch 2393 BLAKE2B 3b38f6c869c5dbd29ca7835e4a46b285b6f8dd9e915b8bb0a3a13978e23675b4e695c43d8404f574f4f82a71effa5cf5cad86578893b4e148d0f69241ea3e80f SHA512 6e38ba59e2ce1d3c64ca19e3766438220fb89f3880a59443b6b3dc057f90b6b7ebf003a5cdc34fb12cf1fdc4eba990b02045bf6ee6888b9c49cfb249a77305ed
 AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd
 AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa
 DIST autofs-5.1.6.tar.xz 315316 BLAKE2B 0c5e2351462505c6de0b12e510f0c08a625a0235e1ff8eeaff825946c4530c258449d26aaf6a3794aa82a97e8860711226168f434dd31bfb8a4e70287beb3ca4 SHA512 dc8b2bd86c140905dd1bc461bfc469f92363d9c2687fe422e1e751cc7ad64c0733b011c80bf4840e510e5909176cd1a066968b9a5ba835b62c4cf27537863cf2
 DIST autofs-5.1.7.tar.xz 327752 BLAKE2B bff290048fb2849dd4c7099718f6824eac7e4f700909342f82b79a3baa752c4efe7f45be3492578fa15df6d959751be5d7fae5aafe129b52425c0d9ab19eaccc SHA512 cf994d0e68d5f6a5647235000743811a791150ece0a90ed9e1cb9bb131259f52769371c6a06d968b7191b10e709c9c90de611cc3ee310fbbea87f60034b3d4e1
 EBUILD autofs-5.1.6-r2.ebuild 3141 BLAKE2B 48811e587d6a4637f6e07e9add7e3943e5063456ad91610e18a9deb379d09187d8eb62506dcafa21f06ad932b1f3c6c3fdccbbdb18befbd33e16ae724383a5a1 SHA512 e37770f987c646a2b44477f4fa50a357e2ceece27441f4a75dc3ed8b0564d3f778ba8c162c9a7f3c6fc4c78ed41f557475dda7963c6ab5e2f3297b9fac59d75d
-EBUILD autofs-5.1.7-r1.ebuild 3161 BLAKE2B bfdd13133c120fddae775680c51c6aa65ccd41d69f57c62e492c2581b67ff2047bb7905f5f6abf3b8dc12746e6f6de3a355103f7c98e67b139f3dfa38b638025 SHA512 619b95e4c8b3727a1dedb53be0a59d6f79da0768d745b37d52851dfbefbd6c815252ae1761824b317047243db866b40c4d3c2fd8ba4af73da59bd887da11bc81
+EBUILD autofs-5.1.7-r1.ebuild 3239 BLAKE2B a329da93036678a45676f230d85ad83f88f473fccfada7d836b8c3cdd413dcc364eff7c5d2a7944336fbfa32c42a457a942ac1f29404e3fd6a6cdf019f11914d SHA512 f1e9e6aa768400a13663e15fa2c9b3a5dea0b427df1020bffa14cdadd4d941249c114156e6385748d2210c5d608647ab5b546c4e0e7ebc59d23a3351121b425d
 MISC metadata.xml 870 BLAKE2B d2813cbc47232ecb5d5726672d038d72e9e5dd3078e915552f566a61bb2db7909d8b4d7d135d7c3ebba9c8f827121de2f42bd25c7c9fd975190f8bb67635affd SHA512 b1ee8b21924f1b6ade69603deff4ff5dc954f4f9161dce592b1676cad1e01dc2a0b4802877f8d4922a037f3e10b2f2085128f86cd2cf21f691c568d6a1f3a25d
diff --git a/net-fs/autofs/autofs-5.1.7-r1.ebuild b/net-fs/autofs/autofs-5.1.7-r1.ebuild
index cb4a90168667..dc05275932e3 100644
--- a/net-fs/autofs/autofs-5.1.7-r1.ebuild
+++ b/net-fs/autofs/autofs-5.1.7-r1.ebuild
@@ -43,6 +43,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-glibc.patch"
 	"${FILESDIR}/${PN}-5.1.6-musl.patch"
 	"${FILESDIR}/${PN}-5.1.6-pid.patch"
+	"${FILESDIR}/${PN}-5.1.7-glibc-2.34.patch"
 )
 
 pkg_setup() {
@@ -90,7 +91,8 @@ src_configure() {
 		--enable-ignore-busy
 		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
 	)
-	econf "${myeconfargs[@]}"
+
+	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
 }
 
 src_compile() {
diff --git a/net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch b/net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch
new file mode 100644
index 000000000000..8b0ddd75eb23
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch
@@ -0,0 +1,107 @@
+https://src.fedoraproject.org/rpms/autofs/raw/rawhide/f/autofs-5.1.7-use-default-stack-size-for-threads.patch
+https://bugzilla.redhat.com/show_bug.cgi?id=1984813
+https://bugs.gentoo.org/803938
+
+autofs-5.1.7 - use default stack size for threads
+
+From: Ian Kent <raven@themaw.net>
+
+autofs uses PTHREAD_STACK_MIN to set the stack size for threads it
+creates.
+
+In two cases it is used to reduce the stack size for long running
+service threads while it's used to allocate a larger stack for worker
+threads that can have larger memory requirements.
+
+In recent glibc releases PTHREAD_STACK_MIN is no longer a constant
+which can lead to unexpectedly different stack sizes on different
+architectures and the autofs assumption it's a constant causes a
+compile failure.
+
+The need to alter the stack size was due to observed stack overflow
+which was thought to be due the thread stack being too small for autofs
+and glibc alloca(3) usage.
+
+Quite a bit of that alloca(3) usage has been eliminated from autofs now,
+particularly those that might be allocating largish amounts of storage,
+and there has been a lot of change in glibc too so using the thread
+default stack should be ok.
+
+Signed-off-by: Ian Kent <raven@themaw.net>
+--- a/daemon/automount.c
++++ b/daemon/automount.c
+@@ -84,7 +84,6 @@ static size_t kpkt_len;
+ /* Attributes for creating detached and joinable threads */
+ pthread_attr_t th_attr;
+ pthread_attr_t th_attr_detached;
+-size_t detached_thread_stack_size = PTHREAD_STACK_MIN * 144;
+ 
+ struct master_readmap_cond mrc = {
+ 	PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, NULL, 0, 0, 0, 0};
+@@ -2620,34 +2619,6 @@ int main(int argc, char *argv[])
+ 		exit(1);
+ 	}
+ 
+-#ifdef _POSIX_THREAD_ATTR_STACKSIZE
+-	if (pthread_attr_setstacksize(
+-			&th_attr_detached, detached_thread_stack_size)) {
+-		logerr("%s: failed to set stack size thread attribute!",
+-		       program);
+-		if (start_pipefd[1] != -1) {
+-			res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat));
+-			close(start_pipefd[1]);
+-		}
+-		release_flag_file();
+-		macro_free_global_table();
+-		exit(1);
+-	}
+-#endif
+-
+-	if (pthread_attr_getstacksize(
+-			&th_attr_detached, &detached_thread_stack_size)) {
+-		logerr("%s: failed to get detached thread stack size!",
+-		       program);
+-		if (start_pipefd[1] != -1) {
+-			res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat));
+-			close(start_pipefd[1]);
+-		}
+-		release_flag_file();
+-		macro_free_global_table();
+-		exit(1);
+-	}
+-
+ 	info(logging, "Starting automounter version %s, master map %s",
+ 		version, master_list->name);
+ 	info(logging, "using kernel protocol version %d.%02d",
+--- a/daemon/state.c
++++ b/daemon/state.c
+@@ -1177,12 +1177,8 @@ int st_start_handler(void)
+ 	status = pthread_attr_init(pattrs);
+ 	if (status)
+ 		pattrs = NULL;
+-	else {
++	else
+ 		pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED);
+-#ifdef _POSIX_THREAD_ATTR_STACKSIZE
+-		pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4);
+-#endif
+-	}
+ 
+ 	status = pthread_create(&thid, pattrs, st_queue_handler, NULL);
+ 
+--- a/lib/alarm.c
++++ b/lib/alarm.c
+@@ -270,12 +270,8 @@ int alarm_start_handler(void)
+ 	status = pthread_attr_init(pattrs);
+ 	if (status)
+ 		pattrs = NULL;
+-	else {
++	else
+ 		pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED);
+-#ifdef _POSIX_THREAD_ATTR_STACKSIZE
+-		pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4);
+-#endif
+-	}
+ 
+ 	status = pthread_condattr_init(&condattrs);
+ 	if (status)
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 9df3597f6ea2..771510c7c450 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,5 +1,6 @@
 AUX exports 66 BLAKE2B 8ddc8e1b7888570cf7ce21ecebf0fb390ab394d25e60f1d914406396b23cb3cbf243a15a199f30608ac7e3c0abde73f48e0ccea605a3dadad654dfd8d6572dcd SHA512 fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220
 AUX nfs-utils-2.5.2-no-werror.patch 1907 BLAKE2B 8d9ac90d445dd029d8db80ff39559d3f4f25f7560c17ce72a62b489998e1d4d4875d574b27fe057388bcd7f0062703b812ce043b23dfe46fdabc9ba53591edcb SHA512 9cabbfa67d193c2c944c257089d67bc33230fb804d3a350ee2bcd5595594ff35ba6485c1ab240b956f5c08c40a41a0adc87c9ad9f967d2b7eb1d2dd51c9a6e9e
+AUX nfs-utils-2.5.4-kernel-5.3-nfsv4.patch 1106 BLAKE2B 6b433e2e283f06947fd790153d5d1eeae4a4155f2af6a8ff14f25d60513a937393c15a2055b9e25147e57dfec1688bfb0a8cbb44e154390f3d74d32ff4428c26 SHA512 b144bf464c67fbbe63c00340d246db851d4ebed65caa9ada03f01134719fb106e0cd40fcd89e0bab71665e8a5e0a94c760daad74d32e5a873514884d62c17e9b
 AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535
 AUX nfs.initd 4010 BLAKE2B 002a2df50cafec59caf05db520afc1432501b1fc86c51299f941417f3c9ea6af59849c3fa2656bd7b68cc6ffeb1b88e89fcd7bc38e8b76bb30e60f3fcd39be32 SHA512 14fa9ec9b58855539b0c4a8246041c1b607412a7e7030305bfa8315cd18ddcad6011ffea911e20db710f23d009b15183dc03bf1acc35a833bf114134ea998d0c
 AUX nfsclient.confd 592 BLAKE2B b661b726aa50f904752ec73a201a088f403a1e0f8d11181615e794da259a03b98131fff68e27645d4371564c796bb44915d6a13db9dc5a909294c4d1613c429d SHA512 f12e67728ac4e76357685e2fe38bd7f6fcd90064165758ffeca145e6962ac44d4ff9d8d57e18cc6925a6ada8e95ad8321e9fc355931a804dd455aae1e4850e92
@@ -13,5 +14,5 @@ AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf9342
 DIST nfs-utils-2.5.3.tar.bz2 937544 BLAKE2B 817af2c302cf110519e64353a507645137ffd3b93b46eb94e71d45a1869c9e831e344f0baa33b1b39514962798cca542cf56a2830520c67e96e78995f2bf901f SHA512 3be82f42c5da2bbbca4429459c858c58ae7333725749213c824d0c01b78f0beb7384455f314fc1cc1799968f9f40fd616297c7baf3514ca0e31d4686e9d6e732
 DIST nfs-utils-2.5.4.tar.bz2 943373 BLAKE2B 72ed871613701f5b035941a7aed957771fe3b6a19fefee203130442c292bbbefde35721f2287fef19046d2d837faeda43b06a93a5acdb8ac6240eef90e6dd12c SHA512 b1395c5b06a06246666c48174594b1e08b71cf40b8f94b533497bd92625401a669e2c40e48dbd665891ad2247bc94d7d604d0c5d0f0b66bfe957b03d42e5d305
 EBUILD nfs-utils-2.5.3-r2.ebuild 5780 BLAKE2B 7465645f72e7882744a2336c0ca59e3a68efe334f9e81596c448abcc36adbc00448a6cf9e5d56ae4e06d36e14e6cd598e52a529619f37cbfd5d6b7c2f5c97fcf SHA512 7bce17cb7d41a5fa98f47cd8292ce90e82dd7e7a486d24da44a3c6d04363e895aca050cbe211e62792f4c2d810f95581d224bfae431eb59035c7b45b9c720bd4
-EBUILD nfs-utils-2.5.4-r1.ebuild 5969 BLAKE2B 238047c014497db83cdb5b8fb75602dc704305eada5595a6454741b89e79206df1da1f3b15d4bebfe109da77802a0ae3bc0a638e99c3920a56fa99343b823f5a SHA512 928e55f7662d0ec7edf253f072dca89940f9e95426eb537c77c987bf3bf7ab97eb28e91af0468a76603e0d32284c13014ae629df28d8d96e85454e70cb6a4a57
+EBUILD nfs-utils-2.5.4-r2.ebuild 6042 BLAKE2B 74893698ecacfa6b979074bb79c9f1aca3524da426d4a4af01a8cbcd2b3e15264146458f71832050a87dbb8b23025149f781a2f29d07c66ee83a0fc2dcc2d7bb SHA512 22870d0838356ecb33c72596c0956f693f29d41e7d97b6f6430fbfeb5808a3421686279dbde7a08ac30a76f360c8dd94286b7851b64ecb57c571ca8b956e24c2
 MISC metadata.xml 866 BLAKE2B 9bed3ad112962947235d7b03372ab0d0d8a35d57fee9500cc4cfe56dc4182634752878767a03760e06880862910b9c5e6abb91b174a624d1e72682bd6515abd3 SHA512 e7797d23c963836eb16bbea897c9ca761794308bb57e23dd10513e009a36d0ed6bf7e095975cf4f68c7f91ea5b6e9a89c1df1d301613383ef799c545e0c9ff3b
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.5.4-kernel-5.3-nfsv4.patch b/net-fs/nfs-utils/files/nfs-utils-2.5.4-kernel-5.3-nfsv4.patch
new file mode 100644
index 000000000000..c9a543191b5d
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.5.4-kernel-5.3-nfsv4.patch
@@ -0,0 +1,32 @@
+https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=feb3dfc7127cf1337530ccb06ed90e818b026a07#patch1
+https://bugzilla.redhat.com/show_bug.cgi?id=1979816
+https://bugs.gentoo.org/808183
+
+Slightly rebased by sam@ to account for version.h moving around.
+
+From feb3dfc7127cf1337530ccb06ed90e818b026a07 Mon Sep 17 00:00:00 2001
+From: Steve Dickson <steved@redhat.com>
+Date: Wed, 22 Sep 2021 11:31:56 -0400
+Subject: [PATCH] mountd: only do NFSv4 logging on supported kernels.
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1979816
+Signed-off-by: Steve Dickson <steved@redhat.com>
+--- a/support/export/v4clients.c
++++ b/support/export/v4clients.c
+@@ -10,6 +10,7 @@
+ #include <sys/inotify.h>
+ #include <errno.h>
+ #include "export.h"
++#include "../../utils/mount/version.h"
+ 
+ /* search.h declares 'struct entry' and nfs_prot.h
+  * does too.  Easiest fix is to trick search.h into
+@@ -23,6 +24,8 @@ static int clients_fd = -1;
+ 
+ void v4clients_init(void)
+ {
++	if (linux_version_code() < MAKE_VERSION(5, 3, 0))
++		return;
+ 	if (clients_fd >= 0)
+ 		return;
+ 	clients_fd = inotify_init1(IN_NONBLOCK);
diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
deleted file mode 100644
index 1001f5922722..000000000000
--- a/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-
-if [[ "${PV}" = *_rc* ]] ; then
-	MY_PV="$(ver_rs 1- -)"
-	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-else
-	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-RESTRICT="test" #315573
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-DEPEND="
-	dev-db/sqlite:3
-	dev-libs/libxml2
-	net-libs/libtirpc:=
-	>=net-nds/rpcbind-0.2.4
-	sys-fs/e2fsprogs
-	caps? ( sys-libs/libcap )
-	ldap? (
-		net-nds/openldap
-		sasl? (
-			app-crypt/mit-krb5
-			dev-libs/cyrus-sasl:2
-		)
-	)
-	libmount? ( sys-apps/util-linux )
-	nfsv4? (
-		dev-libs/libevent:=
-		>=sys-apps/keyutils-1.5.9:=
-		kerberos? (
-			>=net-libs/libtirpc-0.2.4-r1[kerberos]
-			app-crypt/mit-krb5
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}
-	!net-libs/libnfsidmap
-	!net-nds/portmap
-	!<sys-apps/openrc-0.13.9
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-"
-BDEPEND="
-	net-libs/rpcsvc-proto
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.5.2-no-werror.patch )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then
-		ewarn "Your NFS server will be unable to track clients across server restarts!"
-		ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode"
-		ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to"
-		ewarn "support the legacy, in-kernel client tracker."
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
-		-i utils/*/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-
-	# SASL is consumed in a purely automagic way
-	export ac_cv_header_sasl_h=no
-	export ac_cv_header_sasl_sasl_h=$(usex sasl)
-
-	local myeconfargs=(
-		--disable-static
-		--with-statedir="${EPREFIX}"/var/lib/nfs
-		--enable-tirpc
-		--with-tirpcinclude="${ESYSROOT}"/usr/include/tirpc/
-		--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
-		--with-rpcgen
-		--with-systemd="$(systemd_get_systemunitdir)"
-		--without-gssglue
-		$(use_enable caps)
-		$(use_enable ipv6)
-		$(use_enable junction)
-		$(use_enable kerberos gss)
-		$(use_enable kerberos svcgss)
-		$(use_enable ldap)
-		$(use_enable libmount libmount-mount)
-		$(use_enable nfsdcld nfsdcltrack)
-		$(use_enable nfsv4)
-		$(use_enable nfsv41)
-		$(use_enable uuid)
-		$(use_with tcpd tcp-wrappers)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs README
-
-	# Don't overwrite existing xtab/etab, install the original
-	# versions somewhere safe...  more info in pkg_postinst
-	keepdir /var/lib/nfs/{,sm,sm.bak}
-	mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
-
-	# Install some client-side binaries in /sbin
-	dodir /sbin
-	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
-
-	if use nfsv4 && use nfsidmap ; then
-		insinto /etc
-		doins support/nfsidmap/idmapd.conf
-
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-	keepdir /etc/exports.d
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
-	for f in nfs nfsclient ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-
-	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
-	sed -i \
-		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
-		"${ED}${systemd_systemunitdir}"/* || die
-
-	keepdir /var/lib/nfs #368505
-	keepdir /var/lib/nfs/v4recovery #603628
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# Install default xtab and friends if there's none existing.  In
-	# src_install we put them in /usr/lib/nfs for safe-keeping, but
-	# the daemons actually use the files in /var/lib/nfs.  #30486
-	local f
-	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
-		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
-	done
-
-	if systemd_is_booted; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 1.3.0; then
-				ewarn "We have switched to upstream systemd unit files. Since"
-				ewarn "they got renamed, you should probably enable the new ones."
-				ewarn "You can run 'equery files nfs-utils | grep systemd'"
-				ewarn "to know what services you need to enable now."
-			fi
-		done
-	else
-		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
-		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
-		ewarn "same runlevel as nfsmount."
-	fi
-}
diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild
new file mode 100644
index 000000000000..704a37b9d642
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4-r2.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/"
+
+if [[ "${PV}" = *_rc* ]] ; then
+	MY_PV="$(ver_rs 1- -)"
+	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+else
+	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid"
+REQUIRED_USE="kerberos? ( nfsv4 )"
+RESTRICT="test" #315573
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+DEPEND="
+	dev-db/sqlite:3
+	dev-libs/libxml2
+	net-libs/libtirpc:=
+	>=net-nds/rpcbind-0.2.4
+	sys-fs/e2fsprogs
+	caps? ( sys-libs/libcap )
+	ldap? (
+		net-nds/openldap
+		sasl? (
+			app-crypt/mit-krb5
+			dev-libs/cyrus-sasl:2
+		)
+	)
+	libmount? ( sys-apps/util-linux )
+	nfsv4? (
+		dev-libs/libevent:=
+		>=sys-apps/keyutils-1.5.9:=
+		kerberos? (
+			>=net-libs/libtirpc-0.2.4-r1[kerberos]
+			app-crypt/mit-krb5
+		)
+	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	uuid? ( sys-apps/util-linux )"
+RDEPEND="${DEPEND}
+	!net-libs/libnfsidmap
+	!net-nds/portmap
+	!<sys-apps/openrc-0.13.9
+	selinux? (
+		sec-policy/selinux-rpc
+		sec-policy/selinux-rpcbind
+	)
+"
+BDEPEND="
+	net-libs/rpcsvc-proto
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.2-no-werror.patch
+	# Upstream, see bug #808183
+	"${FILESDIR}"/${P}-kernel-5.3-nfsv4.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then
+		ewarn "Your NFS server will be unable to track clients across server restarts!"
+		ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode"
+		ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to"
+		ewarn "support the legacy, in-kernel client tracker."
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+		-i utils/*/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
+	export ac_cv_header_keyutils_h=$(usex nfsidmap)
+
+	# SASL is consumed in a purely automagic way
+	export ac_cv_header_sasl_h=no
+	export ac_cv_header_sasl_sasl_h=$(usex sasl)
+
+	local myeconfargs=(
+		--disable-static
+		--with-statedir="${EPREFIX}"/var/lib/nfs
+		--enable-tirpc
+		--with-tirpcinclude="${ESYSROOT}"/usr/include/tirpc/
+		--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
+		--with-rpcgen
+		--with-systemd="$(systemd_get_systemunitdir)"
+		--without-gssglue
+		$(use_enable caps)
+		$(use_enable ipv6)
+		$(use_enable junction)
+		$(use_enable kerberos gss)
+		$(use_enable kerberos svcgss)
+		$(use_enable ldap)
+		$(use_enable libmount libmount-mount)
+		$(use_enable nfsdcld nfsdcltrack)
+		$(use_enable nfsv4)
+		$(use_enable nfsv41)
+		$(use_enable uuid)
+		$(use_with tcpd tcp-wrappers)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# remove compiled files bundled in the tarball
+	emake clean
+	default
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs README
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	keepdir /var/lib/nfs/{,sm,sm.bak}
+	mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
+
+	if use nfsv4 && use nfsidmap ; then
+		insinto /etc
+		doins support/nfsidmap/idmapd.conf
+
+		# Install a config file for idmappers in newer kernels. #415625
+		insinto /etc/request-key.d
+		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
+		doins id_resolver.conf
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+	keepdir /etc/exports.d
+
+	local f list=() opt_need=""
+	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
+		list+=( rpc.idmapd rpc.pipefs )
+		use kerberos && list+=( rpc.gssd rpc.svcgssd )
+	fi
+	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f}
+	done
+	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
+	for f in nfs nfsclient ; do
+		newconfd "${FILESDIR}"/${f}.confd ${f}
+	done
+	sed -i \
+		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+		"${ED}"/etc/conf.d/nfs || die #234132
+
+	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
+	sed -i \
+		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
+		"${ED}${systemd_systemunitdir}"/* || die
+
+	keepdir /var/lib/nfs #368505
+	keepdir /var/lib/nfs/v4recovery #603628
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# Install default xtab and friends if there's none existing.  In
+	# src_install we put them in /usr/lib/nfs for safe-keeping, but
+	# the daemons actually use the files in /var/lib/nfs.  #30486
+	local f
+	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
+		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
+	done
+
+	if systemd_is_booted; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 1.3.0; then
+				ewarn "We have switched to upstream systemd unit files. Since"
+				ewarn "they got renamed, you should probably enable the new ones."
+				ewarn "You can run 'equery files nfs-utils | grep systemd'"
+				ewarn "to know what services you need to enable now."
+			fi
+		done
+	else
+		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
+		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
+		ewarn "same runlevel as nfsmount."
+	fi
+}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index bfb232c40fc5..2acfa154769f 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 4120ba91da1b..8e3a46d18a4e 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -6,8 +6,10 @@ DIST FileZilla_3.53.1_src.tar.bz2 4844262 BLAKE2B 1ae9bab7b3812df106340a2267d563
 DIST FileZilla_3.54.1_src.tar.bz2 4847815 BLAKE2B 86d219e6c26c15bfd5597e486fafc7892aa3d085d62e6780fb0518a0e10f984a2e7f562666149fd8650f3cd00ad86901daf459095c542460f3bc229c047fa3e2 SHA512 d41b9fb303c11c81ceb0577fa5d40d6f5d9d1dc70a6a6bb6dac5c4cb7f8fc22cf06c2cf2e7415d922d11d5d4262832db89647acc34fa9a6cd92105b7700901df
 DIST FileZilla_3.55.0_src.tar.bz2 4910040 BLAKE2B 9955ddff5bfdd7fe7fadf5dad73638c8fd32bfe52411e6b7ad5f147bd076d6e184ed7deec5ff127f0de904a0ecd01c1c3ae770c70a6d6dd6491366f2af1fe7eb SHA512 8a1221e97719610be900d66f7feba90d1c5053a618b38084e93e8f2b11e51fc523336e11e110f51828eba3f17f60cea1fcd8060bd0cc5e7fdb3d24f35a4c1732
 DIST FileZilla_3.55.1_src.tar.bz2 4910935 BLAKE2B 7a901f7c73c6223c92100138989cedc83f8abf0f9657e08b31e8454892c39f2dccf6880350bb42742639dcec0326f50c46d1afd2d9d931529f11378f7e18bfa0 SHA512 07f1ccc596cac64aca0e82a97725f2ade26de78116441ba5aefaa8bd1396a483be88d9820820b9767e77686abbfd0eb6190684303e1f4d9ec45ef0b1f2cf0170
+DIST FileZilla_3.56.0_src.tar.bz2 4918048 BLAKE2B c671f1a2d0164f7083841d03e6e3780e778b620cf9525b96c15c7c86fc2ca4a4e5908b7bbe30a37b44209f30494c6adedc9292ae0ee5cf03043e18c73dc6e036 SHA512 390aceee80151bbf5e8f00cdfe48fafc20afdfab8b78f627a96215e74bc7d4ff7310dd67400b1deb531dde0fa4a100ac4cd04ff4e6166860badac68438ed23db
 EBUILD filezilla-3.53.1-r1.ebuild 1571 BLAKE2B dd9d203963419932e93af9455b7a445dc6df94523d9f6b5c2f127e774ba7d428d996dcd03c2689bc8220882581fbb0b2a72b041d96e41f4b5ab3dcd0f475beb9 SHA512 3d462010456db814b7a043cfb6af5e31e3c4f1670f8cee8932edf4a69dcb4632516aec829c89dbb9ff8fc637b9c63f4176a4ffea3872e044520d14db8ea2fc85
 EBUILD filezilla-3.54.1.ebuild 1575 BLAKE2B 5c88143cc929ddcebb2c98828a8f9337fc55a7bffee83aa12096d9b3d7ba4283c00eb26715abfb48bfeca93af509c71f7890b1f1066505422638f5d0447b02ce SHA512 9110f108f3a2e47ece4eec3933b3c137a03de8f1bb4cae66bca913abd6fb252220fab2ccf50ce186cda7860eec7c3c60b4c5891d7eb9dd9080d547c0d952d80b
 EBUILD filezilla-3.55.0.ebuild 1575 BLAKE2B 2d02d23713d4dca30ab3a8044d711b52b8cb31d2aa1742b615ff63862a2cdaaf99711d1bf18ceacec9413b6543a441e2e2384d76f99bce769faad7bfd2d02b5c SHA512 7313ec741aca650db99b3acee996de1d1d67e53e9eeb599c448d20a2597752ea5d7cc1e08d371f7d56dbbf7dbd1a54dff6f43883b6ca741de87134b8799a2478
 EBUILD filezilla-3.55.1.ebuild 1575 BLAKE2B 5b04084b76567e4da05930aa1d9bf65648f072c7042b62b18fb48de24042605b8378a422f0d634c7cf666526de02e229b0fd592efab2fd28a9b5477b1d417c21 SHA512 27a8211978188750665bc5fe2e232474a96ce61aefbdcb489f0ef0940811f20ac483065b8f03547048e786e5d474c0de90adcfb37f5be7dfe8b07aced877f89e
+EBUILD filezilla-3.56.0.ebuild 1575 BLAKE2B f28646fdfa607ddc764edd52f1e8fc8579782ecb1a2a15e2ffcf3c75feb6fb569b0059c99ca6e21b4888cef3f74249570bd538615185eac4b4147d3e9df4371d SHA512 83f219692ebd35de23cd6922440e324b293e491a79406fedebba0a3d8b1ef1c472fe969db00195871aa05c263718142d831535d70c7f05aeb70b0de185110f6e
 MISC metadata.xml 460 BLAKE2B 7690f57ee9bf1ea095d672904d4361d4563969d28fc61a9afbf9efaa4965eb1aee775c6555b7959fb2bd17ae80827cd84874dbc79657cd8884b96b7e6740dfe4 SHA512 4afeb15bd88c8926ff25032d2c1cfcd4915cfba862fed4f54e68b471249e03da9d487ab1c0a05350cd4a289eb5b06cab1cc597e5aeab226655405e49a1088338
diff --git a/net-ftp/filezilla/filezilla-3.56.0.ebuild b/net-ftp/filezilla/filezilla-3.56.0.ebuild
new file mode 100644
index 000000000000..84d30c5e5865
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.56.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic wxwidgets xdg
+
+MY_PV="${PV/_/-}"
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="https://filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="dbus nls test"
+RESTRICT="!test? ( test )"
+
+# pugixml 1.7 minimal dependency is for c++11 proper configuration
+RDEPEND="
+	>=app-eselect/eselect-wxwidgets-0.7-r1
+	>=dev-libs/nettle-3.1:=
+	>=dev-db/sqlite-3.7
+	>=dev-libs/libfilezilla-0.34.0:=
+	>=dev-libs/pugixml-1.7
+	>=net-libs/gnutls-3.5.7
+	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
+	x11-misc/xdg-utils
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cppunit-1.13.0 )"
+BDEPEND="
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.22.1-debug.patch
+	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
+	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
+	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	local myeconfargs=(
+		--disable-autoupdatecheck
+		--with-pugixml=system
+		$(use_enable nls locales)
+		$(use_with dbus)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index f6a7a1fd70fa..2d5e4de69672 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -18,12 +18,16 @@ DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B f957fa465f9a9b06ceb9c190ab60c7f67fdeeef
 DIST mod_vroot-0.9.4.tar.gz 29461 BLAKE2B eb4d3f6425ab0a1a61ca607e4655b5f8ff6ea342ca49d49598e7a4c5596382aa2c1d4e8228a1cdcfff324feb92dac80fcc58e35bbb77155069749afdd7cc41fb SHA512 f5de392c9fe39f0a03b0783a7092bbfe17ea6db991f4b4e4a2d8f092f073d27ef2c64dd6484d5665b5abc808c0caba016d4fc3fab3da3810f5ebe5249bb4cbce
 DIST proftpd-1.3.7a.tar.gz 20414571 BLAKE2B 829f3ff79cf74bc9cacfc611877cd1373daefb022b10eb427be56325d455dc7ba2f87a7dbefed06dca0c4cf06597043aac9141e4156e775a4f343bbb07a29375 SHA512 abb53c494677001b6d8d5a15af4ae47e2527025c952667b8c42e144452266d2b7f89b57e68c96177e6054733eb5e5d04cc1c0cf61ff7c3697910e0a525a9de87
 DIST proftpd-1.3.7b.tar.gz 20422741 BLAKE2B 9234d395348778c208307928ae7d673078edf01d9d4e46501b2f46dc051bb0debb1cae0d81ac1564b4e6828a07dae6bdd1b5e708449bb2e21acf6ee1aedfb1f2 SHA512 c25dbd3d5359a41d9f2bc81f130af5c9448000626b27e9e9228efcfdd4c01e109bb19bdb7de46d7368911114b135a43c8b0ad4170c9215a87e93e56108de889a
+DIST proftpd-1.3.7c.tar.gz 20428648 BLAKE2B c8c02774be97e05ed6952c6765d908dd27e64891e709ccb5c737501da3d4857dc151c19a9b428b490b7963f3c3ad5d206a6e5ac6408bfafd333a373ec54fcef2 SHA512 f9268e521e68cebaf1947cbfe1cc57f282ea09d59410c1722cd9a68c99d643b90b837c1fa840fdb894597c7429b0eb62bc4ac324915ffac04366daa2f104e88d
 DIST proftpd-1.3.8rc1.tar.gz 20469318 BLAKE2B 5385c013ecc123802163cd632eb1c87b0feb9bfac278f9d419ff4fc76380f415bee1726e6ac37929aff804bf4bdf0f9b525a250b9ac8e8679f772672c78a639a SHA512 9c0fda5c870a7e84227d5ee6e1b331e0150c4cad297d6bd640e9ccfa838bd98e8620e542c40fc80d0f1c5f82ed3e2e2b5af7d3a7c371d96fb4e37d5472e24032
+DIST proftpd-1.3.8rc2.tar.gz 20485204 BLAKE2B fc79d56dfe61e2b7b0b2a8da52237f402212389b424c92142e24d4caa8688598ca26d2e2956e1ce5fa9c5ac7467aa7f61ebecc6e4ffe73a74118ab242049b68f SHA512 0d98fb2a3044c4426aaf47f483e7af09c736d641ab7334e5f0f32088be1c904bc9ca00aae8977e496c951c63071deb20c282f53f43c1664bc4978a66215a774a
 DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7a0d75e154288e5afb3a1c3d686e635093df9501cc1c9b077f87c14326e31e8b9f751803dfca1eae9643f12333eb633f SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975
 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11 SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012
 DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
 EBUILD proftpd-1.3.7a-r2.ebuild 8687 BLAKE2B ecf464d70fa397ed811646fb64c30dd683ff1ec7301cb87e383dcde7260ce864f7213fff321ea0d33ef60399995c9c2ae2ccad9031ae9f04c796723c4d596741 SHA512 af6b398a662486a6c96bfa380fbb2f42d9d2037bf5c6c54765fe68baf8e332279c44fded734d48dfe112d3a4ac5a5a22e24cef77bcc71c9515e55dd10f5b6538
 EBUILD proftpd-1.3.7b-r1.ebuild 8626 BLAKE2B 14f24c5e784d1a5b63523cb0936bb7f0ce93649ec59ccbe9f22340a41f3416e393e30b0470030eeaa149e1766883d116cb3f721e58fdd8b344d0b5931dcee04a SHA512 3594c8d39811a685e1b8c14d9358905752331918eb8f2694699537277c5dbf901b41e9180fe53567d830d3383c74148838fdd83ca32ed1a70598284f93aa3b56
+EBUILD proftpd-1.3.7c.ebuild 8626 BLAKE2B 14f24c5e784d1a5b63523cb0936bb7f0ce93649ec59ccbe9f22340a41f3416e393e30b0470030eeaa149e1766883d116cb3f721e58fdd8b344d0b5931dcee04a SHA512 3594c8d39811a685e1b8c14d9358905752331918eb8f2694699537277c5dbf901b41e9180fe53567d830d3383c74148838fdd83ca32ed1a70598284f93aa3b56
 EBUILD proftpd-1.3.8_rc1-r1.ebuild 8583 BLAKE2B 2e25a1ce0ca4b30f5da48c9e0a37474caf2ca1aec4b97ab2529f12586ffcb3d59b9e55a2eab66af680d4d57515bd2428f9e885265dbfc7dcc9b5a78d7d58c0b1 SHA512 49d97bb3ba7f8f6d30fc76bc786103019efe875552e6db65b1852a495a90df8073c139f72e63c18d07c3559f2a6ce7eb580c9a2de2d8f81641ef282fd9e3cc96
+EBUILD proftpd-1.3.8_rc2.ebuild 8583 BLAKE2B 2e25a1ce0ca4b30f5da48c9e0a37474caf2ca1aec4b97ab2529f12586ffcb3d59b9e55a2eab66af680d4d57515bd2428f9e885265dbfc7dcc9b5a78d7d58c0b1 SHA512 49d97bb3ba7f8f6d30fc76bc786103019efe875552e6db65b1852a495a90df8073c139f72e63c18d07c3559f2a6ce7eb580c9a2de2d8f81641ef282fd9e3cc96
 MISC metadata.xml 2890 BLAKE2B 8d8df910c291d064a62eab80f05ba0524fbfc777eae7a0dc65809bd01eccc23f356dbbe4a1af4df43f2d83d964370cd38eb40421c7851dd130aefc5011eb6722 SHA512 99679d7d9c8ed947aa736e79da5031fccf4555a558ea8891b059f4a2989037e6a266a197d5e168f7a9c4d787f8dafb53277bcd4418532d91d8f089e3e56a57c9
diff --git a/net-ftp/proftpd/proftpd-1.3.7c.ebuild b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
new file mode 100644
index 000000000000..3bb9b6ecaeac
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd tmpfiles toolchain-funcs
+
+MOD_CASE="0.7"
+MOD_CLAMAV="0.14rc2"
+MOD_DISKUSE="0.9"
+MOD_GSS="1.3.9"
+MOD_MSG="0.4.1"
+MOD_VROOT="0.9.4"
+
+DESCRIPTION="An advanced and very configurable FTP server"
+HOMEPAGE="http://www.proftpd.org/
+	http://www.castaglia.org/proftpd/
+	https://github.com/jbenden/mod_clamav
+	http://gssmod.sourceforge.net/"
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
+	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
+	clamav? ( https://github.com/jbenden/mod_clamav/archive/v${MOD_CLAMAV}.tar.gz -> ${PN}-mod_clamav-${MOD_CLAMAV}.tar.gz )
+	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
+	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
+	msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
+	vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/v${MOD_VROOT}.tar.gz -> mod_vroot-${MOD_VROOT}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
+	kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
+	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( ssl )
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
+
+CDEPEND="virtual/libcrypt:=
+	acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	memcache? ( >=dev-libs/libmemcached-0.41 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nls? ( virtual/libiconv )
+	ncurses? ( sys-libs/ncurses:0= )
+	ssl? ( dev-libs/openssl:0= )
+	pam? ( sys-libs/pam )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:= )
+	sodium? ( dev-libs/libsodium:0= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftp )"
+
+S="${WORKDIR}/${P/_/}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.6-use-trace.patch
+	"${FILESDIR}"/${PN}-1.3.7a-slibtool.patch
+)
+
+RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
+
+in_dir() {
+	pushd "${WORKDIR}/${1}" || die
+	shift
+	"$@"
+	popd
+}
+
+src_prepare() {
+	# Skip 'install-conf' / Support LINGUAS
+	sed -i -e "/install-all/s/ install-conf//" Makefile.in || die
+	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in || die
+
+	# Prepare external modules
+	if use case; then
+		cp -v "${WORKDIR}"/mod_case/mod_case.c contrib || die
+		cp -v "${WORKDIR}"/mod_case/mod_case.html doc/contrib || die
+	fi
+
+	if use clamav ; then
+		cp -v "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib || die
+		eapply -p0 "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/001-add-mod_clamav-to-tests.patch
+	fi
+
+	if use diskuse; then
+		in_dir mod_diskuse eapply "${FILESDIR}"/${PN}-1.3.6_rc4-diskuse-refresh-api.patch
+
+		# ./configure will modify files. Symlink them instead of copying
+		ln -sv "${WORKDIR}"/mod_diskuse/mod_diskuse.h "${S}"/contrib || die
+
+		cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.c "${S}"/contrib || die
+		cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.html "${S}"/doc/contrib || die
+	fi
+
+	if use msg; then
+		in_dir mod_msg eapply "${FILESDIR}"/${PN}-1.3.6_rc4-msg-refresh-api.patch
+
+		cp -v "${WORKDIR}"/mod_msg/mod_msg.c contrib || die
+		cp -v "${WORKDIR}"/mod_msg/mod_msg.html doc/contrib || die
+	fi
+
+	if use vroot; then
+		in_dir ${PN}-mod_vroot-${MOD_VROOT} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-vroot-refresh-api.patch
+
+		cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.c contrib || die
+		cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.html doc/contrib || die
+	fi
+
+	if use kerberos ; then
+		# in_dir mod_gss-${MOD_GSS} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-gss-refresh-api.patch
+
+		# Support app-crypt/heimdal / Gentoo Bug #284853
+		sed -i -e "s/krb5_principal2principalname/_\0/" "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c.in || die
+
+		# Remove obsolete DES / Gentoo Bug #324903
+		# Replace 'rpm' lookups / Gentoo Bug #391021
+		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
+			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
+			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" "${WORKDIR}"/mod_gss-${MOD_GSS}/configure{,.ac}  || die
+
+		# ./configure will modify files. Symlink them instead of copying
+		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c "${S}"/contrib || die
+		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.c "${S}"/contrib || die
+		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.h "${S}"/include || die
+
+		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/README.mod_{auth_gss,gss} "${S}" || die
+		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.html "${S}"/doc/contrib || die
+		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/rfc{1509,2228}.txt "${S}"/doc/rfc || die
+	fi
+
+	default
+
+	tc-export CC
+}
+
+src_configure() {
+	local c m
+
+	use acl && m="${m}:mod_facl"
+	use ban && m="${m}:mod_ban"
+	use case && m="${m}:mod_case"
+	use clamav && m="${m}:mod_clamav"
+	use copy && m="${m}:mod_copy"
+	use ctrls && m="${m}:mod_ctrls_admin"
+	use deflate && m="${m}:mod_deflate"
+	if use diskuse ; then
+		in_dir mod_diskuse econf
+		m="${m}:mod_diskuse"
+	fi
+	use dynmasq && m="${m}:mod_dynmasq"
+	use exec && m="${m}:mod_exec"
+	use ifsession && m="${m}:mod_ifsession"
+	use ifversion && m="${m}:mod_ifversion"
+	if use kerberos ; then
+		in_dir mod_gss-${MOD_GSS} econf
+		m="${m}:mod_gss:mod_auth_gss"
+	fi
+	use ldap && m="${m}:mod_ldap"
+	use log-forensic && m="${m}:mod_log_forensic"
+	use msg && m="${m}:mod_msg"
+	if use mysql || use postgres || use sqlite ; then
+		m="${m}:mod_sql:mod_sql_passwd"
+		use mysql && m="${m}:mod_sql_mysql"
+		use postgres && m="${m}:mod_sql_postgres"
+		use sqlite && m="${m}:mod_sql_sqlite"
+	fi
+	use qos && m="${m}:mod_qos"
+	use radius && m="${m}:mod_radius"
+	use ratio && m="${m}:mod_ratio"
+	use readme && m="${m}:mod_readme"
+	use rewrite && m="${m}:mod_rewrite"
+	if use sftp ; then
+		m="${m}:mod_sftp"
+		use pam && m="${m}:mod_sftp_pam"
+		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
+	fi
+	use shaper && m="${m}:mod_shaper"
+	use sitemisc && m="${m}:mod_site_misc"
+	use snmp && m="${m}:mod_snmp"
+	if use softquota ; then
+		m="${m}:mod_quotatab:mod_quotatab_file"
+		use ldap && m="${m}:mod_quotatab_ldap"
+		use radius && m="${m}:mod_quotatab_radius"
+		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
+	fi
+	if use ssl ; then
+		m="${m}:mod_tls:mod_tls_shmcache"
+		use memcache && m="${m}:mod_tls_memcache"
+	fi
+	if use tcpd ; then
+		m="${m}:mod_wrap2:mod_wrap2_file"
+		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
+	fi
+	use unique-id && m="${m}:mod_unique_id"
+	use vroot && m="${m}:mod_vroot"
+
+	if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then
+		einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'"
+		m="${m}:${PROFTP_CUSTOM_MODULES}"
+	fi
+
+	[[ -z ${m} ]] || c="${c} --with-modules=${m:1}"
+
+	econf --localstatedir=/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
+		$(use_enable acl facl) \
+		$(use_enable authfile auth-file) \
+		$(use_enable caps cap) \
+		$(use_enable ctrls) \
+		$(use_enable dso) \
+		$(use_enable ident) \
+		$(use_enable ipv6) \
+		$(use_enable memcache) \
+		$(use_enable ncurses) \
+		$(use_enable nls) \
+		$(use_enable ssl openssl) \
+		$(use_enable pam auth-pam) \
+		$(use_enable pcre) \
+		$(use_enable sodium) \
+		$(use_enable test tests) \
+		--enable-trace \
+		$(use_enable userland_GNU shadow) \
+		$(use_enable userland_GNU autoshadow) \
+		${c:1}
+}
+
+src_test() {
+	emake api-tests -C tests
+}
+
+src_install() {
+	default
+	[[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale
+	rm -rf "${ED}"/run "${ED}"/var/run
+
+	newinitd "${FILESDIR}"/proftpd.initd-r1 proftpd
+	insinto /etc/proftpd
+	doins "${FILESDIR}"/proftpd.conf.sample
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/proftpd.xinetd proftpd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
+
+	docinto html
+	dodoc doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
+
+	docinto rfc
+	dodoc doc/rfc/*.txt
+
+	systemd_dounit       "${FILESDIR}"/${PN}.service
+	newtmpfiles "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf
+}
+
+pkg_postinst() {
+	# Create /var/run files at package merge time: bug #650000
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
new file mode 100644
index 000000000000..f44c0ca053cc
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd tmpfiles toolchain-funcs
+
+MOD_CASE="0.7"
+MOD_CLAMAV="0.14rc2"
+MOD_DISKUSE="0.9"
+MOD_GSS="1.3.9"
+MOD_MSG="0.4.1"
+MOD_VROOT="0.9.4"
+
+DESCRIPTION="An advanced and very configurable FTP server"
+HOMEPAGE="http://www.proftpd.org/
+	http://www.castaglia.org/proftpd/
+	https://github.com/jbenden/mod_clamav
+	http://gssmod.sourceforge.net/"
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
+	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
+	clamav? ( https://github.com/jbenden/mod_clamav/archive/v${MOD_CLAMAV}.tar.gz -> ${PN}-mod_clamav-${MOD_CLAMAV}.tar.gz )
+	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
+	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
+	msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
+	vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/v${MOD_VROOT}.tar.gz -> mod_vroot-${MOD_VROOT}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
+	kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
+	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( ssl )
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
+
+CDEPEND="virtual/libcrypt:=
+	acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	memcache? ( >=dev-libs/libmemcached-0.41 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nls? ( virtual/libiconv )
+	ncurses? ( sys-libs/ncurses:0= )
+	ssl? ( dev-libs/openssl:0= )
+	pam? ( sys-libs/pam )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:= )
+	sodium? ( dev-libs/libsodium:0= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftp )"
+
+S="${WORKDIR}/${P/_/}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.6-use-trace.patch
+)
+
+RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
+
+in_dir() {
+	pushd "${WORKDIR}/${1}" || die
+	shift
+	"$@"
+	popd
+}
+
+src_prepare() {
+	# Skip 'install-conf' / Support LINGUAS
+	sed -i -e "/install-all/s/ install-conf//" Makefile.in || die
+	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in || die
+
+	# Prepare external modules
+	if use case; then
+		cp -v "${WORKDIR}"/mod_case/mod_case.c contrib || die
+		cp -v "${WORKDIR}"/mod_case/mod_case.html doc/contrib || die
+	fi
+
+	if use clamav ; then
+		cp -v "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib || die
+		eapply -p0 "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/001-add-mod_clamav-to-tests.patch
+	fi
+
+	if use diskuse; then
+		in_dir mod_diskuse eapply "${FILESDIR}"/${PN}-1.3.6_rc4-diskuse-refresh-api.patch
+
+		# ./configure will modify files. Symlink them instead of copying
+		ln -sv "${WORKDIR}"/mod_diskuse/mod_diskuse.h "${S}"/contrib || die
+
+		cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.c "${S}"/contrib || die
+		cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.html "${S}"/doc/contrib || die
+	fi
+
+	if use msg; then
+		in_dir mod_msg eapply "${FILESDIR}"/${PN}-1.3.6_rc4-msg-refresh-api.patch
+
+		cp -v "${WORKDIR}"/mod_msg/mod_msg.c contrib || die
+		cp -v "${WORKDIR}"/mod_msg/mod_msg.html doc/contrib || die
+	fi
+
+	if use vroot; then
+		in_dir ${PN}-mod_vroot-${MOD_VROOT} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-vroot-refresh-api.patch
+
+		cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.c contrib || die
+		cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.html doc/contrib || die
+	fi
+
+	if use kerberos ; then
+		# in_dir mod_gss-${MOD_GSS} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-gss-refresh-api.patch
+
+		# Support app-crypt/heimdal / Gentoo Bug #284853
+		sed -i -e "s/krb5_principal2principalname/_\0/" "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c.in || die
+
+		# Remove obsolete DES / Gentoo Bug #324903
+		# Replace 'rpm' lookups / Gentoo Bug #391021
+		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
+			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
+			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" "${WORKDIR}"/mod_gss-${MOD_GSS}/configure{,.ac}  || die
+
+		# ./configure will modify files. Symlink them instead of copying
+		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c "${S}"/contrib || die
+		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.c "${S}"/contrib || die
+		ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.h "${S}"/include || die
+
+		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/README.mod_{auth_gss,gss} "${S}" || die
+		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.html "${S}"/doc/contrib || die
+		cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/rfc{1509,2228}.txt "${S}"/doc/rfc || die
+	fi
+
+	default
+
+	tc-export CC
+}
+
+src_configure() {
+	local c m
+
+	use acl && m="${m}:mod_facl"
+	use ban && m="${m}:mod_ban"
+	use case && m="${m}:mod_case"
+	use clamav && m="${m}:mod_clamav"
+	use copy && m="${m}:mod_copy"
+	use ctrls && m="${m}:mod_ctrls_admin"
+	use deflate && m="${m}:mod_deflate"
+	if use diskuse ; then
+		in_dir mod_diskuse econf
+		m="${m}:mod_diskuse"
+	fi
+	use dynmasq && m="${m}:mod_dynmasq"
+	use exec && m="${m}:mod_exec"
+	use ifsession && m="${m}:mod_ifsession"
+	use ifversion && m="${m}:mod_ifversion"
+	if use kerberos ; then
+		in_dir mod_gss-${MOD_GSS} econf
+		m="${m}:mod_gss:mod_auth_gss"
+	fi
+	use ldap && m="${m}:mod_ldap"
+	use log-forensic && m="${m}:mod_log_forensic"
+	use msg && m="${m}:mod_msg"
+	if use mysql || use postgres || use sqlite ; then
+		m="${m}:mod_sql:mod_sql_passwd"
+		use mysql && m="${m}:mod_sql_mysql"
+		use postgres && m="${m}:mod_sql_postgres"
+		use sqlite && m="${m}:mod_sql_sqlite"
+	fi
+	use qos && m="${m}:mod_qos"
+	use radius && m="${m}:mod_radius"
+	use ratio && m="${m}:mod_ratio"
+	use readme && m="${m}:mod_readme"
+	use rewrite && m="${m}:mod_rewrite"
+	if use sftp ; then
+		m="${m}:mod_sftp"
+		use pam && m="${m}:mod_sftp_pam"
+		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
+	fi
+	use shaper && m="${m}:mod_shaper"
+	use sitemisc && m="${m}:mod_site_misc"
+	use snmp && m="${m}:mod_snmp"
+	if use softquota ; then
+		m="${m}:mod_quotatab:mod_quotatab_file"
+		use ldap && m="${m}:mod_quotatab_ldap"
+		use radius && m="${m}:mod_quotatab_radius"
+		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
+	fi
+	if use ssl ; then
+		m="${m}:mod_tls:mod_tls_shmcache"
+		use memcache && m="${m}:mod_tls_memcache"
+	fi
+	if use tcpd ; then
+		m="${m}:mod_wrap2:mod_wrap2_file"
+		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
+	fi
+	use unique-id && m="${m}:mod_unique_id"
+	use vroot && m="${m}:mod_vroot"
+
+	if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then
+		einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'"
+		m="${m}:${PROFTP_CUSTOM_MODULES}"
+	fi
+
+	[[ -z ${m} ]] || c="${c} --with-modules=${m:1}"
+
+	econf --localstatedir=/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
+		$(use_enable acl facl) \
+		$(use_enable authfile auth-file) \
+		$(use_enable caps cap) \
+		$(use_enable ctrls) \
+		$(use_enable dso) \
+		$(use_enable ident) \
+		$(use_enable ipv6) \
+		$(use_enable memcache) \
+		$(use_enable ncurses) \
+		$(use_enable nls) \
+		$(use_enable ssl openssl) \
+		$(use_enable pam auth-pam) \
+		$(use_enable pcre) \
+		$(use_enable sodium) \
+		$(use_enable test tests) \
+		--enable-trace \
+		$(use_enable userland_GNU shadow) \
+		$(use_enable userland_GNU autoshadow) \
+		${c:1}
+}
+
+src_test() {
+	emake api-tests -C tests
+}
+
+src_install() {
+	default
+	[[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale
+	rm -rf "${ED}"/run "${ED}"/var/run
+
+	newinitd "${FILESDIR}"/proftpd.initd-r1 proftpd
+	insinto /etc/proftpd
+	doins "${FILESDIR}"/proftpd.conf.sample
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/proftpd.xinetd proftpd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
+
+	docinto html
+	dodoc doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
+
+	docinto rfc
+	dodoc doc/rfc/*.txt
+
+	systemd_dounit       "${FILESDIR}"/${PN}.service
+	newtmpfiles "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf
+}
+
+pkg_postinst() {
+	# Create /var/run files at package merge time: bug #650000
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 636a891920d2..2768c127f8a5 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -8,6 +8,6 @@ AUX pure-ftpd.rc11 2018 BLAKE2B 1783228b5179b6d11fd6b06bc722e15f6f81e6c8443dd516
 AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d
 DIST pure-ftpd-1.0.49.tar.bz2 487958 BLAKE2B bd5f10a49b533eb6c257032659e97aa7ae16ec9402704d8ee06c92938e217b748b390ccf0e31b3640f41cb7a93f85b29c8ddcdc296f214391b1d92da9d701a7c SHA512 b44896d6fe2cda9169b1db93c5260bb892af14a173f2d25e60dd6530afe85d8e9156985609e35da7e5550dc123afb42bc5012beb9fca9011054cf0ed8b2eddef
 EBUILD pure-ftpd-1.0.49-r4.ebuild 4305 BLAKE2B 9d8789fdc25ef75df2c424498fb4a91967d37322f4613bf78f48082bbb58d691641f34ca5e751d852ac8339e36dddb6d96435441ead33b14138612c30477d653 SHA512 5a396221a666abefdca147103171ffca208f564f330d23f696d0d8e7f373cc638893bd5914fcc34e458c9822135cae4ca4a3ab891a00903d12115835444c2553
-EBUILD pure-ftpd-1.0.49-r5.ebuild 4397 BLAKE2B f36c1a924aa02752a136c0a7d9be2ff1adc3ee8efe636b1573270aa6a18a0f6f6e0f9500eda2d8c6c6a692656bc800092d882af545c55c846d4666bcee400f29 SHA512 93c87092af3950c04120bb801c1bbb6e60d83ebda024f22ff74585988a950e7d19a57b45d84497bfbca9499351840b0643712e7f44379fb57708cdebf8695d66
+EBUILD pure-ftpd-1.0.49-r5.ebuild 4391 BLAKE2B cdad0056b5e568fe0856b534b43d06519f3ab0b21ff1448eef8c6f24312d4588b1118c63c85256cbfd9890add9d3517a8909e2340db649fb66e4dbe40c919dc7 SHA512 0b5d673ddd4f41a46cc371130658037029c51378e35b602295f3ce1f09f22c2d526ea570d792b4b8f50ca82b5ccffb0b46e8472453a0db603ad683ec9a04924f
 EBUILD pure-ftpd-9999.ebuild 4100 BLAKE2B bfea3ea19aa899478581e2b024ee0e464d4732ab554f620f1a966d7afbe5bcc14df73e874c132434d9a69ff0cc5cfff8594aa66a7c16f28bd65d7a4426f0856d SHA512 8f10922e2fe91528a7736ad28bd6a9f1773f444fe024a98e989713bf3b4c5547b7fb307866155d051a1bd637b58c9eab47b9288a1aec2ca6b818b1eb77429b9e
 MISC metadata.xml 1177 BLAKE2B 7662da71f87d60d342e0a304c73c02f95a1006a0e6614c40ee3f3333a01430cb0a50ebd7e190569fcac25f9cefdd48fef68649c97006846977a2596333d78c34 SHA512 6c79218bba944381fbf0bfc86e27adde1e95e5e2ac5e7e2c5d637820f8fb4bb1bbd5e91a53f6fbc4ef641d03be6490e1d137895176576f7e2da798662590fb0a
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r5.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r5.ebuild
index 62d4cedc6909..a502b2414044 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r5.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r5.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
 		http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 fi
 
 LICENSE="BSD"
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 3c05ab877ea5..8a0f804b832f 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest
index a442e5700ddb..74c55ebea3fc 100644
--- a/net-im/dino/Manifest
+++ b/net-im/dino/Manifest
@@ -1,4 +1,6 @@
 DIST dino-0.2.1.tar.gz 514504 BLAKE2B 42fae18bb7cda276c1eadeefdea130069f9929dfde62855f00ab6b88912fe9db3374315f40ff8f53350cf38e45fe61b0fd6256ef390cdbed6a65a3f2d79ac80a SHA512 b71497ec115945eadf7d33bb973f68465a20284aa75f37f1ae25fc30c1c423ce28cb10f7e9123c47f82e77e97170b8fa72c75389dacc3a2aa3d487a9c9610d49
+DIST dino-0.2.2.tar.gz 514648 BLAKE2B 54110f3767b5d1d3d4bffc82b767d3c92114c55449ad10705ed10b8815ecc9c337016348886acc3df21d5f27be5d93bbe3c203173167146ff9859bd03f0be7a6 SHA512 6c973b0b88e2c8aecbab694b456762973c5f60217bbf6bc81f4d81226fe8124596bddfe7c190f35307ec3ad6376858ce8f686c74aaebec133124377d8a9e4898
 EBUILD dino-0.2.1.ebuild 1648 BLAKE2B a060d33c0d9b8ea88a6fedadb7ce4964bfb0c51f7a79fcce46f8f2bb77b32b48f41eca7113f7ccbe5e58d57bd262cc89930b41c0c597c6e5bd12550bb91747b4 SHA512 6f9ba82b543c598ce897917e7d12126d87d9dd1925748dfe55ac61f891dab216ebb5c1efd6fbdf02741be85d16f210e4f90888972bd75342ff3ac99eda72e8e0
+EBUILD dino-0.2.2.ebuild 1650 BLAKE2B 0062e108a6c191c1049ce076e81d09d0860b743b08f9a33a168936492c2901d15f21862a699693d9cf4fd856cd6540a5611fa07ef48db4af906373bedc27e68c SHA512 62fd08158864ab5e8b624b0ec45c340f7a319ae3cf6952c5411b6b7db9eb37a5cab6e508b137a2e881eadd5f6905458282cc8c8ada3e413aacf6e146cbd96ecb
 EBUILD dino-9999.ebuild 1697 BLAKE2B a129d51469bb007a1c023ef216ebe6076bce93cd24ae24e541fc14654151662db336bc3a22b0efa2e6d7991123a395d4d5ee58c4df4fbb00f9d768580874f2e1 SHA512 8d01a975b53058c4df68ccff058d24f47b6f072d6f98c06cc4fb4764abc7bc2f9b4143eb4472149fe1908220f7e61f964b7e24fd51e04f7b32014b331da979f9
 MISC metadata.xml 642 BLAKE2B 31f8929e6bbcc03672e487d70a37b3796ced84e17cfdfb7d55026aa97c8a001d6f666ec5de4894ff5648c3b8bcbe856866986baffaff5305636cc1fce2c201a1 SHA512 db7adb8b4a47f7129b01783605983e87d93b3bfc6f7add5256bdd72d88090923730c56697ad95a0e19071ed96d85e1f16acf44e3aa6ab5cbbcc19684bf9dc895
diff --git a/net-im/dino/dino-0.2.2.ebuild b/net-im/dino/dino-0.2.2.ebuild
new file mode 100644
index 000000000000..169e9707eef1
--- /dev/null
+++ b/net-im/dino/dino-0.2.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+VALA_MIN_API_VERSION="0.34"
+inherit cmake vala xdg
+
+DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
+HOMEPAGE="https://dino.im"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+gpg +http +omemo +notification-sound test"
+RESTRICT="!test? ( test )"
+
+MY_REPO_URI="https://github.com/dino/dino"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="${MY_REPO_URI}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm64"
+	SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz"
+fi
+
+RDEPEND="
+	app-text/gspell[vala]
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/icu
+	dev-libs/libgee:0.8
+	net-libs/glib-networking
+	net-libs/libsignal-protocol-c
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+	gpg? ( app-crypt/gpgme:1 )
+	http? ( net-libs/libsoup:2.4 )
+	omemo? (
+		dev-libs/libgcrypt:0
+		media-gfx/qrencode
+	)
+	notification-sound? ( media-libs/libcanberra:0[sound] )
+"
+DEPEND="
+	$(vala_depend)
+	${RDEPEND}
+	sys-devel/gettext
+"
+
+src_prepare() {
+	cmake_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local disabled_plugins=(
+		$(usex gpg "" "openpgp")
+		$(usex omemo "" "omemo")
+		$(usex http  "" "http-files")
+	)
+	local enabled_plugins=(
+		$(usex notification-sound "notification-sound" "")
+	)
+	local mycmakeargs+=(
+		"-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")"
+		"-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")"
+		"-DVALA_EXECUTABLE=${VALAC}"
+		"-DBUILD_TESTS=$(usex test)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	"${BUILD_DIR}"/xmpp-vala-test || die
+}
diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
index 3a69e28b2cb3..9d77306e2646 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1,3 +1,3 @@
 DIST discord-0.0.16.deb 77079990 BLAKE2B 17cb04baa4eab3494593c54bc556a8e1d01352aa1ba7d1d27da722e53f5445386054b038b57281c5955f46416eccef9fc3521c1b91b3b593c495c29e2537d0c0 SHA512 4ea06420b27cc6dff813798c23d44478bbe4fea2919011796d271f94fcc2e25bae65e7c5c952a6723daa928d3ac99b913198a8500c76a0eef56138dda610c5de
-EBUILD discord-bin-0.0.16.ebuild 1874 BLAKE2B 7ab8b632507ca38850996fdd6c946e6c77ed273f8e56ad04fb9b484fda20143298f2a5b44f339435383671063676ba7d7ff8a3d2544e5ce181a186d507c9d197 SHA512 3d3d5c4d4f2dc84b4701856985cece726cfda69dd352eeb262fc10998b6ef4dd8c64c4bc24e1e9f4518d754074b39a498762866158313d4720097e771ba0509e
-MISC metadata.xml 246 BLAKE2B 9ee65595d2ce7d0c82f8bfa5110c981e55be2592e0ab8beb2abf163268dcbbe4ac2c1825bc1f3619c26fd447ef95a3153ce7ca7f627ca806030c217493fd51f0 SHA512 79818ad9d4436efa7bbeb3c302aee6b3c72ceadb118aab6d390fc4431110d2fdbc6cfe2d2c3c4e360688449279001e52acc9ace257b5ac401eb5c401e299bec1
+EBUILD discord-bin-0.0.16-r1.ebuild 1956 BLAKE2B df411fbe1d0ea38a8b14465586bcc1c9a3cea6a31a6138c38b30ee8c0956288873aa6eb8c7a66655b53a98423da498b7a89711cac89de9c0d6763eb1476b247c SHA512 0ca4375909deff933cf1a84658b41caa2f1a129f2273f4e7d2cbcc604f336611a4d10c98e9d408934efe2b92f40f5324732798ebb7f97344bb1876ad7054f4a8
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-im/discord-bin/discord-bin-0.0.16-r1.ebuild b/net-im/discord-bin/discord-bin-0.0.16-r1.ebuild
new file mode 100644
index 000000000000..dc38d87ff9f5
--- /dev/null
+++ b/net-im/discord-bin/discord-bin-0.0.16-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN%-bin}"
+MY_BIN="${MY_PN^}"
+
+inherit desktop linux-info optfeature pax-utils unpacker
+
+DESCRIPTION="All-in-one voice and text chat for gamers"
+HOMEPAGE="https://discordapp.com"
+SRC_URI="https://dl.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb"
+S="${WORKDIR}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror bindist"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	opt/discord/${MY_BIN}
+	opt/discord/chrome-sandbox
+	opt/discord/libffmpeg.so
+	opt/discord/libvk_swiftshader.so
+	opt/discord/libvulkan.so
+	opt/discord/libEGL.so
+	opt/discord/libGLESv2.so
+	opt/discord/libVkICD_mock_icd.so
+	opt/discord/swiftshader/libEGL.so
+	opt/discord/swiftshader/libGLESv2.so
+	opt/discord/swiftshader/libvk_swiftshader.so
+"
+
+CONFIG_CHECK="~USER_NS"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:/usr/share/discord/Discord:discord:" \
+		usr/share/${MY_PN}/${MY_PN}.desktop || die
+}
+
+src_install() {
+	doicon usr/share/${MY_PN}/${MY_PN}.png
+	domenu usr/share/${MY_PN}/${MY_PN}.desktop
+
+	insinto /opt/${MY_PN}
+	doins -r usr/share/${MY_PN}/.
+	fperms +x /opt/${MY_PN}/${MY_BIN}
+	dosym -r /opt/${MY_PN}/${MY_BIN} /usr/bin/${MY_PN}
+
+	pax-mark -m "${ED}"/opt/${MY_PN}/${MY_PN}
+}
+
+pkg_postinst() {
+	optfeature "sound support" \
+		media-sound/pulseaudio media-sound/apulse[sdk] media-video/pipewire
+	optfeature "system tray support" dev-libs/libappindicator
+}
diff --git a/net-im/discord-bin/discord-bin-0.0.16.ebuild b/net-im/discord-bin/discord-bin-0.0.16.ebuild
deleted file mode 100644
index 085aa80b0b9c..000000000000
--- a/net-im/discord-bin/discord-bin-0.0.16.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${PN/-bin/}
-MY_BIN="D${MY_PN/d/}"
-
-inherit desktop linux-info pax-utils unpacker xdg
-
-DESCRIPTION="All-in-one voice and text chat for gamers"
-HOMEPAGE="https://discordapp.com"
-SRC_URI="https://dl.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror bindist"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="
-	opt/discord/${MY_BIN}
-	opt/discord/chrome-sandbox
-	opt/discord/libffmpeg.so
-	opt/discord/libvk_swiftshader.so
-	opt/discord/libvulkan.so
-	opt/discord/libEGL.so
-	opt/discord/libGLESv2.so
-	opt/discord/libVkICD_mock_icd.so
-	opt/discord/swiftshader/libEGL.so
-	opt/discord/swiftshader/libGLESv2.so
-	opt/discord/swiftshader/libvk_swiftshader.so
-"
-
-CONFIG_CHECK="~USER_NS"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:/usr/share/discord/Discord:/opt/${MY_PN}/${MY_BIN}:g" \
-		usr/share/${MY_PN}/${MY_PN}.desktop || die
-}
-
-src_install() {
-	doicon usr/share/${MY_PN}/${MY_PN}.png
-	domenu usr/share/${MY_PN}/${MY_PN}.desktop
-
-	insinto /opt/${MY_PN}
-	doins -r usr/share/${MY_PN}/.
-	fperms +x /opt/${MY_PN}/${MY_BIN}
-	dosym ../../opt/${MY_PN}/${MY_BIN} usr/bin/${MY_PN}
-
-	pax-mark -m "${ED}"/opt/${MY_PN}/${MY_PN}
-}
diff --git a/net-im/discord-bin/metadata.xml b/net-im/discord-bin/metadata.xml
index be2af7044308..115e9d64a669 100644
--- a/net-im/discord-bin/metadata.xml
+++ b/net-im/discord-bin/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index 7cf2a5485b6d..ee94301e1540 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST element-desktop_1.8.4_amd64.deb 81717076 BLAKE2B 50888c86ea6ea7378bbc6daaefbe139b0fedab221a057c0f5764570050100333cf7f85cae60a425c3c22c6107c776581961469f39cfb7ae152fb8bf88cc71cbc SHA512 1140854a1d214ef6aefd2d8fd20ff90cc30534924f088226cf8a5aa4e781d607ba38b4d9d4c83c7bf470e9809b78710afac5c503a6544b74e9faf702fc29f3b7
-EBUILD element-desktop-bin-1.8.4.ebuild 1775 BLAKE2B fcad580d6600d42ce5ed10431ab199ee7c7d1557d2f3848235403874f0f5ea93d6a0dc6e781afab8472114b6e6b93993342353735bbdd627b47420a5a54b52d3 SHA512 c8f174c0c675bba2c115c100de73f297534285d3b602d7fd7d65db83753788973c4ed38ee2f1567da32b5362fed4b19bb4efbb8fc1721962b941f9cac4eaa7cf
+DIST element-desktop_1.9.2_amd64.deb 81260260 BLAKE2B 3ae8e5d6f369a32c08616b67576bac2d90078b2af0e528da40e074fec5f91086a1f905bab8dd7cbe1ec3d1fad5590bdaeeefec70c44ec470f7cf4f6904253129 SHA512 a219d2d85fc13128c29ab989096d8893a3d9f95914c1da11764d8f3695b1c8be12f7f8e6abe62c59daf81a858d210779b2aab87307b2c563bca8bc40fa4d4570
+EBUILD element-desktop-bin-1.9.2.ebuild 1775 BLAKE2B fceebd338ba37c6b99e77173d1fc46a72ea0d31a99874cce4d8049d61d6d18a1a5d68f2d30fa76e97d8d6940a4ad00ca346b7fdab08fa9f79a2df4b0a7037a99 SHA512 ea696a699ad1d7b53dd98be0f2eaa91929c56b12f9bb36e534ceb8e2984cd1250ab9a569231221d76336d4f787057b691aa9a2e5297b6f476660573b21468539
 MISC metadata.xml 350 BLAKE2B 050eceeb985e81547b5f0c590916c9f8bdb33558e0adfbd4f3a648abafcf12e07e1942be0151b1ac1dd1e637cfb6fd5ba68e549ed1982e044896e07c18522917 SHA512 55e9b181e332a870595c816bea6093007d60642b0271a88e047cc85e820311340d609618070643accd77cfb5df335b90187a01c15c349cb65e9d96b6f188978c
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.8.4.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.8.4.ebuild
deleted file mode 100644
index acb8fc1ce31c..000000000000
--- a/net-im/element-desktop-bin/element-desktop-bin-1.8.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker xdg
-
-MY_PN="element-desktop"
-
-DESCRIPTION="A glossy Matrix collaboration client for desktop (binary package)"
-HOMEPAGE="https://element.io"
-SRC_URI="https://packages.riot.im/debian/pool/main/e/element-desktop/${MY_PN}_${PV}_amd64.deb"
-S="${WORKDIR}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+emoji"
-RESTRICT="splitdebug"
-
-RDEPEND="app-accessibility/at-spi2-atk:2
-	app-crypt/libsecret
-	dev-db/sqlcipher
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa
-	net-print/cups
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-	emoji? ( media-fonts/noto-emoji )"
-DEPEND="${RDEPEND}"
-
-QA_PREBUILT="opt/Element/chrome-sandbox
-	opt/Element/element-desktop
-	opt/Element/libEGL.so
-	opt/Element/libGLESv2.so
-	opt/Element/libffmpeg.so
-	opt/Element/libvk_swiftshader.so
-	opt/Element/libvulkan.so.1
-	opt/Element/swiftshader/libEGL.so
-	opt/Element/swiftshader/libGLESv2.so"
-
-src_prepare() {
-	default
-	rm opt/Element/{LICENSE.electron.txt,LICENSES.chromium.html} || die
-}
-
-src_install() {
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	insinto /
-	doins -r usr
-	doins -r opt
-	local f
-	for f in ${QA_PREBUILT}; do
-		fperms +x "/${f}"
-	done
-	fperms u+s /opt/Element/chrome-sandbox
-
-	dosym ../../opt/Element/${MY_PN} /usr/bin/${MY_PN}
-	dosym ${MY_PN} /usr/bin/riot-desktop
-}
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.9.2.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.9.2.ebuild
new file mode 100644
index 000000000000..52197085f09a
--- /dev/null
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.9.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker xdg
+
+MY_PN="element-desktop"
+
+DESCRIPTION="A glossy Matrix collaboration client for desktop (binary package)"
+HOMEPAGE="https://element.io"
+SRC_URI="https://packages.riot.im/debian/pool/main/e/element-desktop/${MY_PN}_${PV}_amd64.deb"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+emoji"
+RESTRICT="splitdebug"
+
+RDEPEND="app-accessibility/at-spi2-atk:2
+	app-crypt/libsecret
+	dev-db/sqlcipher
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXScrnSaver
+	x11-libs/pango
+	emoji? ( media-fonts/noto-emoji )"
+DEPEND="${RDEPEND}"
+
+QA_PREBUILT="opt/Element/chrome-sandbox
+	opt/Element/element-desktop
+	opt/Element/libEGL.so
+	opt/Element/libGLESv2.so
+	opt/Element/libffmpeg.so
+	opt/Element/libvk_swiftshader.so
+	opt/Element/libvulkan.so.1
+	opt/Element/swiftshader/libEGL.so
+	opt/Element/swiftshader/libGLESv2.so"
+
+src_prepare() {
+	default
+	rm opt/Element/{LICENSE.electron.txt,LICENSES.chromium.html} || die
+}
+
+src_install() {
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	insinto /
+	doins -r usr
+	doins -r opt
+	local f
+	for f in ${QA_PREBUILT}; do
+		fperms +x "/${f}"
+	done
+	fperms u+s /opt/Element/chrome-sandbox
+
+	dosym ../../opt/Element/${MY_PN} /usr/bin/${MY_PN}
+	dosym ${MY_PN} /usr/bin/riot-desktop
+}
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index bb1f1e4a3c4c..f52125bbd991 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,6 +1,8 @@
 AUX gajim-1.3.2-fix-historymanager.diff 1315 BLAKE2B b3520b7730f3b408759003498963fe6dd77bb0b4b313a3cf49ce4f77fde99763ee0c8616c839aed6edfe2e47a5aa992b7c71f1e3b9ba5e8bb04599137e6fb90c SHA512 5708f62c7f3903ff8b01808d955e51930281dc1e9d818897681e5368464b191b2c24f76a82ad015711e60b59504c43db21db5f54fa684f6d78b48acfa961e5b6
 DIST gajim-1.3.1-2.tar.gz 9538193 BLAKE2B 2517b3eeaf3d8b9304e72c82e533d7424b7deb48d2543f366b91b8cf9a3e278f5b4d271d9128529f8e623f6b6fa26b5b97932112598118bf4ec24f97c4199669 SHA512 01d0e77e856935c7d388144fdc8c33271f41752a3544f713eb0ffe070bb7aee6fb3ae28aeddcda69298e405de21bc2ef004e8d7f4c59b3b09eb9366bbd6b0642
 DIST gajim-1.3.2.tar.gz 9538320 BLAKE2B 9af561d4316a34480d073dcbf95fbc04ffd30bb4195633141ad1e9fa96145e61b54acff32891aadbdb93d0a775d69f2491e56f97fc67d2a1b2a76fcaab09f7ef SHA512 92c86d1fa2fab51b402b6ddc0b838f321ab744c9c2add743b3f1820215eef84cafabc50227606088d077bdd9f52998f4ca6f98ad153346b9fb37691b71e9c267
+DIST gajim-1.3.3.tar.gz 9886175 BLAKE2B 27c4163a5762e8fa72524f91d846439b5bd54aff8ec0c4f8ffe4061295540d986b71fc333a2d65110e87821efc5a96ce0dc8a519236c5d71df9a722c65851296 SHA512 b1b6ed1eeb9ce01c26240a0a0c1ff3991ac305787e2ed49ecf7ed9cc75789da2d0ec1c3a1fda6dc67fe440fa7aa143af9be1a837acfc94255d7027f63f55ced2
 EBUILD gajim-1.3.1_p2.ebuild 2393 BLAKE2B 29e9137608241890d52a59ce27beec4f38f9789e66627c7d03d8646614149adeaaa1ea728a59b6ee62f3fe3b6b9eacc63f186b779abd29d6dc1687dedf373837 SHA512 809c01bfb5cd847ebdfa087877695be7d644ace122e546df1e47c1b2b848a02029dd42fd2735ec00b575f4822d4c8a755836afabfd0e8109e88854dd4b72c747
 EBUILD gajim-1.3.2.ebuild 2680 BLAKE2B 7c42ef6db2251790a159475c9ad6235f2329c700316cee4487b008546467bac85ab1efc206bfe5cfa93ec0fca63bba0b88337905a6c6dc0cb2dca69c78452eb5 SHA512 e5a9fef65f8415d8510888a2d4bac393115cb969d246f23eb0504891979f5e53e305e11d7456121fc89c240d80ae10323eb00595800d4b4708e15c016d8ff78a
+EBUILD gajim-1.3.3.ebuild 2529 BLAKE2B bd059956e73f69d101248040b2da5e1b33d0f53d45797a259a5526e48f855998954d628d0e91e4283b78e6e5548e98ed28ce944c1fbc0c64fd476910a695e463 SHA512 8168fe18f19b3c74232b993f05ab709e3cc03a171f9acc577a7a5fbeefe64704008dc916de30355acec5af0ff674707ded7338dc77ba3bff22ff7c73ff11e70e
 MISC metadata.xml 867 BLAKE2B b7dcc46c99a2c04f9382cd7eeb34b416a422baae8e8123369bb9809c89204413cc9a93c51979fd50f542aed29caff5e6bb18e3ea3a077814f89826972d778837 SHA512 e56580db1a6734f1e219eeb61176ba60e5c85895e0cf7699643f82c928d7f083d519cf3d490b0750b0cbe875cf1428e67e35961ad006c38f62829f04090af134
diff --git a/net-im/gajim/gajim-1.3.3.ebuild b/net-im/gajim/gajim-1.3.3.ebuild
new file mode 100644
index 000000000000..66d76d4a1c83
--- /dev/null
+++ b/net-im/gajim/gajim-1.3.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://gajim.org/"
+SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
+S="${WORKDIR}/${PN}-${P}"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo(+)]
+	>=x11-libs/gtk+-3.22:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/precis-i18n[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/python-nbxmpp-2.0.2[${PYTHON_USEDEP}]
+		x11-libs/libXScrnSaver
+		app-crypt/libsecret[crypt,introspection]
+		dev-python/keyring[${PYTHON_USEDEP}]
+		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
+		dev-python/css-parser[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		net-libs/libsoup[introspection]
+		media-libs/gsound[introspection]
+		crypt? (
+			dev-python/pycryptodome[${PYTHON_USEDEP}]
+			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+		geolocation? ( app-misc/geoclue[introspection] )
+		jingle? (
+			net-libs/farstream:0.2[introspection]
+			media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-base:1.0[introspection]
+			media-libs/gst-plugins-ugly:1.0
+			media-plugins/gst-plugins-gtk
+		)
+		omemo? (
+			dev-python/python-axolotl[${PYTHON_USEDEP}]
+			dev-python/qrcode[${PYTHON_USEDEP}]
+			dev-python/cryptography[${PYTHON_USEDEP}]
+		)
+		remote? (
+			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+			sys-apps/dbus[X]
+		)
+		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
+		spell? (
+			app-text/gspell[introspection]
+			app-text/hunspell
+		)
+		upnp? ( net-libs/gupnp-igd[introspection] )
+		webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	')"
+
+src_install() {
+	distutils-r1_src_install
+
+	# avoid precompressed man pages
+	rm -r "${D}/usr/share/man"
+	doman data/*.1
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index c2db4085d34a..84ea17e422ca 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -2,6 +2,9 @@ DIST mattermost-desktop-4.7.1-linux-ia32.tar.gz 83083553 BLAKE2B 75a914adab3d080
 DIST mattermost-desktop-4.7.1-linux-x64.tar.gz 84864146 BLAKE2B f0166d52fa49babd4ab13258edabd567f5114544af9dc9c59f094d5751cc3bfc26085523fa345d9cd252f7bc81763ecbeac55b921988a4ca9571fec9e5d5321e SHA512 2698e2fab7bf53554138618b20c54a70feb022d4a0d822f3e65d800cd9de8d0cdf53145f79074f7beb3dc29168c5a9c67f05dae3b3e628db1881c7cdd6c699b6
 DIST mattermost-desktop-4.7.2-linux-ia32.tar.gz 83097780 BLAKE2B a348655796bb84f5c31f5c4c964a6adac804db3b14f28a0c1b7dc103eb94b98eff8ecf1457206401268701e37070ca68c12a1582c6ce9a03fb029bff68505fd6 SHA512 e0eba172e49e5ebe74a7f901f0f4b383d8004171b8cc18e349e945adfa080803ad06b4dcef97c52fc182f1d1376bbb1d999b8c1ccef25f81dfbe7b209557c61d
 DIST mattermost-desktop-4.7.2-linux-x64.tar.gz 84872358 BLAKE2B e82497c1fe15ccff40649b1fe7410b04d48b5bc7ecf934cc210fbdc5c316e4eeaf265cab5784980a0687cb69e7c0078b0066adaa3632b2e2625080442bcc272a SHA512 04a82af251caeb7a59538d2b1ebbebd3a914d9d9f6317fdac2ab3c1950d315783153850fe8f61b8ef354da566442b147fe5496985d8f52fd5c21dccbef29c2d0
+DIST mattermost-desktop-5.0.0-linux-ia32.tar.gz 86955404 BLAKE2B 7c28fd55390c5a216cb2dc902809c230a7eb6fc3da6ee22fb3644c3e1891098322bd2147dfa06654a57bf12c75c909e0a23011f2390fa4ba64865849764dee53 SHA512 afcff8617fb3b267df455f8b56da552272719daac2f63d05bcbf2369dc42301b93c5fc031c1350ab6bb7280e259354e8b27bb0755d16a87aa4cb345921b0166e
+DIST mattermost-desktop-5.0.0-linux-x64.tar.gz 87313050 BLAKE2B 1993f2d42b288ac5fc396489645fae90f5c94dd71647eba06f2b30035b5c8bc3b131b4a6174da2c010a64f83cd2fc3121651be475429321a5c5e4e7c9ea3aeaa SHA512 6fcef95e93074a1338c1953fb7c8124f77abaecedf2c9b5b3b8db07f6fbdd4ebf9c1598707843886d12875944095da407ec526620d0fd4af6aa5b5cd1dd9c511
 EBUILD mattermost-desktop-bin-4.7.1.ebuild 1837 BLAKE2B b306cf73988e92ccb7e04de3f985eebaf6d70ea00b3f56db70241b16f9ebc9465667cd27514fa48c409e07da27ea4bbb3f01ab10f9ce679cb2ea746614795c8e SHA512 e84a09c0c2111d02d458f599b13a1159a84a962c22cb9a53383f684e249aaf3e1c89fa92b43e25d2036ab1707316955cbb57be6f19ddc3fa33c209d7cc66f6e6
 EBUILD mattermost-desktop-bin-4.7.2.ebuild 1837 BLAKE2B b306cf73988e92ccb7e04de3f985eebaf6d70ea00b3f56db70241b16f9ebc9465667cd27514fa48c409e07da27ea4bbb3f01ab10f9ce679cb2ea746614795c8e SHA512 e84a09c0c2111d02d458f599b13a1159a84a962c22cb9a53383f684e249aaf3e1c89fa92b43e25d2036ab1707316955cbb57be6f19ddc3fa33c209d7cc66f6e6
+EBUILD mattermost-desktop-bin-5.0.0.ebuild 1837 BLAKE2B b306cf73988e92ccb7e04de3f985eebaf6d70ea00b3f56db70241b16f9ebc9465667cd27514fa48c409e07da27ea4bbb3f01ab10f9ce679cb2ea746614795c8e SHA512 e84a09c0c2111d02d458f599b13a1159a84a962c22cb9a53383f684e249aaf3e1c89fa92b43e25d2036ab1707316955cbb57be6f19ddc3fa33c209d7cc66f6e6
 MISC metadata.xml 486 BLAKE2B b4d9156a6a958b7ce307e104f7491e99534b1e33328c5899db2b7583ecc7d5cca411cabb8e21085a4138a78dd88056032b5412ea9a19fe7445a72b8e4faf6692 SHA512 369f7df04ae2c994c25fcb082a16b0dff78c255ad859c88f2e15b0b3463a25b2241518cf1e2259a8da3fd05c468ac96201a2421285f5b3fc1d499f2b9c9cb67f
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.0.0.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.0.0.ebuild
new file mode 100644
index 000000000000..e767c09c1e07
--- /dev/null
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.0.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN%-*}"
+
+inherit desktop
+
+DESCRIPTION="Mattermost Desktop application"
+HOMEPAGE="https://about.mattermost.com/"
+
+SRC_URI="
+	amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
+	x86?   ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
+"
+
+LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2[X]
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	opt/mattermost-desktop/mattermost-desktop
+	opt/mattermost-desktop/libnode.so
+	opt/mattermost-desktop/libffmpeg.so
+	opt/mattermost-desktop/libGLESv2.so
+	opt/mattermost-desktop/libEGL.so
+	opt/mattermost-desktop/libvk_swiftshader.so
+"
+
+DOCS=(
+	NOTICE.txt
+)
+
+S="${WORKDIR}"
+
+src_install() {
+	if use amd64; then
+		cd "${WORKDIR}/mattermost-desktop-${PV}-linux-x64" || die
+	elif use x86; then
+		cd "${WORKDIR}/mattermost-desktop-${PV}-linux-ia32" || die
+	fi
+
+	insinto "/opt/${MY_PN}/locales"
+	doins locales/*.pak
+
+	insinto "/opt/${MY_PN}/resources"
+	doins resources/*.asar
+
+	insinto "/opt/${MY_PN}"
+	doins *.pak *.bin *.dat
+	exeinto "/opt/${MY_PN}"
+	doexe *.so "${MY_PN}"
+
+	dosym "../../opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
+
+	make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
+
+	einstalldocs
+}
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 4f98e20442c9..3246605451cb 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,10 +1,9 @@
-AUX pidgin-2.10.11-tinfo.patch 892 BLAKE2B 50e16a86ed29510c8632a8d6d2021236ba125a4f8fc4cd5c0408b2c0fcfe8187a4d72df512a2e224fbf801df88cb8f39c2d63487ba0f04934be09315d1306ac1 SHA512 019148522e6851e1e52cf52a3b855f0d5fb10dd5a3e7236e5abfe21f270b9feb1b998aaaa668768c85e855019eb69f7b7458c220ca06a189aba3e77947b158db
 AUX pidgin-2.13.0-disable-one-jid-test.patch 872 BLAKE2B 648d92b095dba563e9dd3c6499208192d51d2dc92c06570eb131abfc07d5775d1e28db6ed27c41a4d945b9f3869f17db890ddeac69debbd465ac2e57db27ed47 SHA512 2358af54f9d63e75660f19898f25035ed331571d73a6cf5d09f42df60c82743a22dde84d2ddfcf7706df4e0226d0f6e0689a784fca0e84627edbf3616070d993
 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
-DIST pidgin-2.14.5.tar.bz2 8696780 BLAKE2B 4563b6aabdaba8af7dd7a1f8978418bcdcc347fc10731606e44de537d2a451c9cec17d17c44d88e0eefda110927c471788ae6128a7e006666603bdc6d842c9b1 SHA512 3aa00156e73643c7a23bc3a1ff26ecd7ee89c0d91571a23bf00e54aa87f25d2b604990d33263e8f74f6499d8e08646aa524e14063e8000e60d1b49d74c5cc784
 DIST pidgin-2.14.6.tar.bz2 8672222 BLAKE2B d2e6428728f18096c957b10d7cc5e79704c0fbb403967e3968f59393db125307fc6fc84c90d66788b4a27bd9707b126c1f0df532c2a1e7d1b62356127e87371c SHA512 19ea12b6c9e99b6215a7d955f02d52ad19de8c4beb00806276c8c184d5cc338db119197e0cc9f4685705bd8b83f35c8f63565095b49a319f9696aab37735951b
 DIST pidgin-2.14.7.tar.bz2 8713379 BLAKE2B d48670c8b7419df67c6dddedf8eb15c0c4d61877386f65793b1423b659c6131d92eb58ae6cf63a31432426c8a09da0bdab0be8770517436bae51610a60886b59 SHA512 189b02b5500ca3560972cad9c84e94007e1c8cedd56d39214293412b31ee38bc2dbb33ab2f9320338bb226131f51cc8a1f6a4c66ba889a0f55d91edc15ac7465
-EBUILD pidgin-2.14.5-r1.ebuild 7569 BLAKE2B e9093afec931c7a48d730f0cc531f904001a7e9d0f80f4f7d771b5dc9bf14ed669457996ec0ee50fd7ae1d993243ae1ee1b860a815927b13d9bb705abbfa72c7 SHA512 33ff1a4da14c4fdd6f6d66b96397641b8d9c836f6589eb519e9080ff26bb6709d4f153f9a9c76bd3aed5df4dc128ef636be51a4beeb9a649c361a5b8dd98a41a
+DIST pidgin-2.14.8.tar.bz2 8683281 BLAKE2B 757ae81cc17db61bb5d434920f230d18c25639179c0584346b2bc6f34620d5ef499fd564ded5bfb649cf619700bbfd7eab6a222fdaf0324903bb92d81f77d182 SHA512 23975501b07d14829edab7b92628703962d7a8f90849b303e2a765ec6e47d1fcbdeff62539811e26682e300a2f94520193369844de3b1c0e87f99721ca0255e6
 EBUILD pidgin-2.14.6-r1.ebuild 7581 BLAKE2B 95dc79537fe7b113c4a4e3057098883da2935ee6ea9d3b5c1c66b8339c763c825fd5b8b279149405d878a9eae63c5259ea1c269bf530b6cd2ca01c83cfc1e716 SHA512 ff080f92cda74ba178dd3d565b1a27809ecc7c48dfaa6f1752c9a9f1d14e051b8d300475916c3b91aca2fc9403c77170714444457f26ea68590293bc469df747
 EBUILD pidgin-2.14.7.ebuild 7524 BLAKE2B e96334e50940ab294f6f1da6ebb63c6e8b5fce110b96ce4a23d772f3cdae60398ab4d22b4a23a151e85e38db29ecce3a55d3028bb872f201904d6ee296cf4cee SHA512 a360b21703c418b7ad5d31c34a81e913e8c4b3e68abfedc284c9c68f5b9cbb9d54571b5f5178f43b84eb59d319f61c1e2b7b9f9e1db6201efe9f041b25d8f0b8
+EBUILD pidgin-2.14.8.ebuild 7524 BLAKE2B e96334e50940ab294f6f1da6ebb63c6e8b5fce110b96ce4a23d772f3cdae60398ab4d22b4a23a151e85e38db29ecce3a55d3028bb872f201904d6ee296cf4cee SHA512 a360b21703c418b7ad5d31c34a81e913e8c4b3e68abfedc284c9c68f5b9cbb9d54571b5f5178f43b84eb59d319f61c1e2b7b9f9e1db6201efe9f041b25d8f0b8
 MISC metadata.xml 1419 BLAKE2B 6b87c11749b1e15503eddb0d73d18ed264e86d8d8e515cd30ba6787117401f8f07ea5030accd5cbf86da7c059eaf4f4d2fa3ff5d0c2bf5db1f987f5f536ac448 SHA512 c7bc589c6ddd1fb628832105691f08555f0fd7e5578bd3c5905a6b082198c36a34f86182a8772b8e8aa14b75f2b99eeba99c2c77ef480f3d80fa199aa792067d
diff --git a/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch b/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch
deleted file mode 100644
index 370ac62a6e23..000000000000
--- a/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
- configure.ac | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 51471b1..81c57ff 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -635,6 +635,8 @@ AC_ARG_WITH(ncurses-headers, [AC_HELP_STRING([--with-ncurses-headers=DIR],
- 		[compile finch against the ncurses includes in DIR])],
- 		[ac_ncurses_includes="$withval"], [ac_ncurses_includes=""])
- if test "x$enable_consoleui" = "xyes"; then
-+	PKG_CHECK_MODULES([GNT], [ncursesw panelw], [], [
-+	PKG_CHECK_MODULES([GNT], [ncurses panel], [], [
- 	AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_consoleui=no])
- 	AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"],
- 	    [enable_consoleui=no], [$GNT_LIBS])
-@@ -699,6 +701,7 @@ if test "x$enable_consoleui" = "xyes"; then
- 			fi
- 		fi
- 	fi
-+	])])
- fi
- 
- if test "x$force_finch" = "xyes" -a "x$enable_consoleui" != "xyes"; then
diff --git a/net-im/pidgin/pidgin-2.14.5-r1.ebuild b/net-im/pidgin/pidgin-2.14.5-r1.ebuild
deleted file mode 100644
index b3ff977ba24c..000000000000
--- a/net-im/pidgin/pidgin-2.14.5-r1.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="https://pidgin.im/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
-
-LICENSE="GPL-2"
-SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
-meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
-tk +xscreensaver zephyr zeroconf"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.6.18
-	ncurses? (
-		>=dev-libs/libgnt-$(ver_cut 1-2)
-		sys-libs/ncurses:=[unicode(+)]
-		dbus? ( ${PYTHON_DEPS} )
-		python? ( ${PYTHON_DEPS} )
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.10:2[aqua=]
-		x11-libs/libSM
-		>=x11-libs/pango-1.4.0
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		spell? ( >=app-text/gtkspell-2.0.2:2 )
-		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
-		prediction? ( >=dev-db/sqlite-3.3:3 )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		>=net-libs/farstream-0.2.7:0.2
-	)
-	zeroconf? ( net-dns/avahi[dbus] )
-	dbus? (
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.90
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-		')
-	)
-	perl? ( >=dev-lang/perl-5.16:= )
-	gadu? ( >=net-libs/libgadu-1.11.0 )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/nspr
-		dev-libs/nss
-	)
-	meanwhile? ( net-libs/meanwhile )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
-	idn? ( net-dns/libidn:= )
-"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="${RDEPEND}
-	gtk? (
-		x11-base/xorg-proto
-		${NLS_DEPEND}
-	)
-	dbus? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	!gtk? ( nls? ( ${NLS_DEPEND} ) )
-"
-
-DOCS=( AUTHORS HACKING NEWS README ChangeLog )
-
-REQUIRED_USE="
-	dbus? ( ${PYTHON_REQUIRED_USE} )
-	networkmanager? ( dbus )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,simple"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#	x11-plugins/msn-pecan
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgintex
-#   x11-plugins/pidgin-libnotify
-#	x11-plugins/pidgin-mbpurple
-#	x11-plugins/pidgin-bot-sentry
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-#	x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-#	x11-plugins/pidgin-audacious-remote
-#	x11-plugins/pidgin-autoanswer
-#	x11-plugins/pidgin-birthday-reminder
-#	x11-plugins/pidgin-blinklight
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-embeddedvideo
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-gfire
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-sendscreenshot
-#	x11-plugins/pidgimpd
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10.11-tinfo.patch"
-	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
-	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
-)
-
-pkg_pretend() {
-	if ! use gtk && ! use ncurses ; then
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-	fi
-
-	# dbus is enabled, no way to disable linkage with python => python is enabled
-	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
-	if use gtk && ! use nls ; then
-		ewarn "gtk build => nls is enabled!"
-	fi
-	if use dbus && ! use python ; then
-		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
-	fi
-}
-
-pkg_setup() {
-	if use python || use dbus ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-	use pie && append-cflags -fPIE -pie
-
-	use gadu 	&& DYNAMIC_PRPLS+=",gg"
-	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
-	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
-	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
-	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
-
-	local myconf=(
-		--disable-mono
-		--disable-static
-		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
-		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
-		--x-includes="${EPREFIX}"/usr/include/X11
-		$(use_enable ncurses consoleui)
-		$(use_enable gtk gtkui)
-		$(use_enable gtk sm)
-		$(usex gtk '--enable-nls' "$(use_enable nls)")
-		$(use gtk && use_enable xscreensaver screensaver)
-		$(use gtk && use_enable prediction cap)
-		$(use gtk && use_enable eds gevolution)
-		$(use gtk && use_enable spell gtkspell)
-		$(use_enable perl)
-		$(use_enable tk)
-		$(use_enable tcl)
-		$(use_enable debug)
-		$(use_enable dbus)
-		$(use_enable meanwhile)
-		$(use_enable gstreamer)
-		$(use_with gstreamer gstreamer 1.0)
-		$(use_enable gstreamer farstream)
-		$(use_enable gstreamer vv)
-		$(use_enable sasl cyrus-sasl )
-		$(use_enable doc doxygen)
-		$(use_enable networkmanager nm)
-		$(use_enable zeroconf avahi)
-		$(use_enable idn)
-	)
-
-	if use gnutls; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf+=(
-			--enable-nss=no
-			--enable-gnutls=yes
-			--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
-			--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf+=(
-			--enable-gnutls=no
-			--enable-nss=yes
-		)
-	fi
-
-	if use dbus || { use ncurses && use python ; } ; then
-		myconf+=( --with-python3=${PYTHON} )
-	else
-		myconf+=( --without-python3 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	# setting this here because gnome2.eclass is not EAPI-7 ready
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	default
-
-	if use gtk ; then
-		# Fix tray paths for e16 (x11-wm/enlightenment) and other
-		# implementations that are not compliant with new hicolor theme yet, #323355
-		local d f pixmapdir
-		for d in 16 22 32 48 ; do
-			pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions"
-			mkdir "${pixmapdir}" || die
-			pushd "${pixmapdir}" >/dev/null || die
-			for f in ../status/*; do
-				ln -s ${f} || die
-			done
-			popd >/dev/null || die
-		done
-	fi
-	use perl && perl_delete_localpod
-
-	use dbus && python_fix_shebang "${ED}"
-	if use python || use dbus ; then
-		python_optimize
-	fi
-
-	dodoc ${DOCS[@]} finch/plugins/pietray.py
-	docompress -x /usr/share/doc/${PF}/pietray.py
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-src_test() {
-	# make default build logs slightly more useful
-	emake check VERBOSE=1
-}
-
-pkg_preinst() {
-	gnome2_gconf_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/net-im/pidgin/pidgin-2.14.8.ebuild b/net-im/pidgin/pidgin-2.14.8.ebuild
new file mode 100644
index 000000000000..5cd269016d6a
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.14.8.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="https://pidgin.im/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
+
+LICENSE="GPL-2"
+SLOT="0/2" # libpurple version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
+meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
+tk +xscreensaver zephyr zeroconf"
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+	>=dev-libs/glib-2.16
+	>=dev-libs/libxml2-2.6.18
+	ncurses? (
+		>=dev-libs/libgnt-$(ver_cut 1-2)
+		sys-libs/ncurses:=[unicode(+)]
+		dbus? ( ${PYTHON_DEPS} )
+		python? ( ${PYTHON_DEPS} )
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.10:2[aqua=]
+		x11-libs/libSM
+		>=x11-libs/pango-1.4.0
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		spell? ( >=app-text/gtkspell-2.0.2:2 )
+		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
+		prediction? ( >=dev-db/sqlite-3.3:3 )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		>=net-libs/farstream-0.2.7:0.2
+	)
+	zeroconf? ( net-dns/avahi[dbus] )
+	dbus? (
+		>=dev-libs/dbus-glib-0.71
+		>=sys-apps/dbus-0.90
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
+	perl? ( >=dev-lang/perl-5.16:= )
+	gadu? ( >=net-libs/libgadu-1.11.0 )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	meanwhile? ( net-libs/meanwhile )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	networkmanager? ( net-misc/networkmanager )
+	idn? ( net-dns/libidn:= )
+"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="${RDEPEND}
+	gtk? (
+		x11-base/xorg-proto
+		${NLS_DEPEND}
+	)
+	dbus? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	!gtk? ( nls? ( ${NLS_DEPEND} ) )
+"
+
+DOCS=( AUTHORS HACKING NEWS README ChangeLog )
+
+REQUIRED_USE="
+	dbus? ( ${PYTHON_REQUIRED_USE} )
+	networkmanager? ( dbus )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,simple"
+
+# List of plugins
+#   app-accessibility/pidgin-festival
+#   net-im/librvp
+#   x11-plugins/guifications
+#	x11-plugins/msn-pecan
+#   x11-plugins/pidgin-encryption
+#   x11-plugins/pidgin-extprefs
+#   x11-plugins/pidgin-hotkeys
+#   x11-plugins/pidgin-latex
+#   x11-plugins/pidgintex
+#   x11-plugins/pidgin-libnotify
+#	x11-plugins/pidgin-mbpurple
+#	x11-plugins/pidgin-bot-sentry
+#   x11-plugins/pidgin-otr
+#   x11-plugins/pidgin-rhythmbox
+#   x11-plugins/purple-plugin_pack
+#   x11-themes/pidgin-smileys
+#	x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+#	x11-plugins/pidgin-audacious-remote
+#	x11-plugins/pidgin-autoanswer
+#	x11-plugins/pidgin-birthday-reminder
+#	x11-plugins/pidgin-blinklight
+#	x11-plugins/pidgin-convreverse
+#	x11-plugins/pidgin-embeddedvideo
+#	x11-plugins/pidgin-extended-blist-sort
+#	x11-plugins/pidgin-gfire
+#	x11-plugins/pidgin-lastfm
+#	x11-plugins/pidgin-sendscreenshot
+#	x11-plugins/pidgimpd
+
+PATCHES=(
+	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
+)
+
+pkg_pretend() {
+	if ! use gtk && ! use ncurses ; then
+		elog "You did not pick the ncurses or gtk use flags, only libpurple"
+		elog "will be built."
+	fi
+
+	# dbus is enabled, no way to disable linkage with python => python is enabled
+	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+	if use gtk && ! use nls ; then
+		ewarn "gtk build => nls is enabled!"
+	fi
+	if use dbus && ! use python ; then
+		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+	fi
+}
+
+pkg_setup() {
+	if use python || use dbus ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	# Stabilize things, for your own good
+	strip-flags
+	replace-flags -O? -O2
+	use pie && append-cflags -fPIE -pie
+
+	use gadu 	&& DYNAMIC_PRPLS+=",gg"
+	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
+	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
+	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
+	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
+
+	local myconf=(
+		--disable-mono
+		--disable-static
+		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
+		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
+		--x-includes="${EPREFIX}"/usr/include/X11
+		$(use_enable ncurses consoleui)
+		$(use_enable gtk gtkui)
+		$(use_enable gtk sm)
+		$(usex gtk '--enable-nls' "$(use_enable nls)")
+		$(use gtk && use_enable xscreensaver screensaver)
+		$(use gtk && use_enable prediction cap)
+		$(use gtk && use_enable eds gevolution)
+		$(use gtk && use_enable spell gtkspell)
+		$(use_enable perl)
+		$(use_enable tk)
+		$(use_enable tcl)
+		$(use_enable debug)
+		$(use_enable dbus)
+		$(use_enable meanwhile)
+		$(use_enable gstreamer)
+		$(use_with gstreamer gstreamer 1.0)
+		$(use_enable gstreamer farstream)
+		$(use_enable gstreamer vv)
+		$(use_enable sasl cyrus-sasl )
+		$(use_enable doc doxygen)
+		$(use_enable networkmanager nm)
+		$(use_enable zeroconf avahi)
+		$(use_enable idn)
+	)
+
+	if use gnutls; then
+		einfo "Disabling NSS, using GnuTLS"
+		myconf+=(
+			--enable-nss=no
+			--enable-gnutls=yes
+			--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
+			--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
+		)
+	else
+		einfo "Disabling GnuTLS, using NSS"
+		myconf+=(
+			--enable-gnutls=no
+			--enable-nss=yes
+		)
+	fi
+
+	if use dbus || { use ncurses && use python ; } ; then
+		myconf+=( --with-python3=${PYTHON} )
+	else
+		myconf+=( --without-python3 )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	# setting this here because gnome2.eclass is not EAPI-7 ready
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+	default
+
+	if use gtk ; then
+		# Fix tray paths for e16 (x11-wm/enlightenment) and other
+		# implementations that are not compliant with new hicolor theme yet, #323355
+		local d f pixmapdir
+		for d in 16 22 32 48 ; do
+			pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions"
+			mkdir "${pixmapdir}" || die
+			pushd "${pixmapdir}" >/dev/null || die
+			for f in ../status/*; do
+				ln -s ${f} || die
+			done
+			popd >/dev/null || die
+		done
+	fi
+	use perl && perl_delete_localpod
+
+	use dbus && python_fix_shebang "${ED}"
+	if use python || use dbus ; then
+		python_optimize
+	fi
+
+	dodoc ${DOCS[@]} finch/plugins/pietray.py
+	docompress -x /usr/share/doc/${PF}/pietray.py
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+src_test() {
+	# make default build logs slightly more useful
+	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
+	emake check VERBOSE=1
+}
+
+pkg_preinst() {
+	gnome2_gconf_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 84c41189f45a..19e42258e223 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_5.19.0_amd64.deb 114386092 BLAKE2B 08d56087ed02b868f32fa02b098bd237fcd4807fe94d4ccc7cfb50b2532d23083ec838c09c0b1963aa1471d8d54834479a5e1969d387dac8669dc559abd423d4 SHA512 96eb61127a2acdc6a6ed9862f86980e53446f19b0c5d9c2c4b6ef6a81e5ea74537867f51865d72552072f4310cc51b9370dcb44d89abd3d8400ba788c2020c0e
-EBUILD signal-desktop-bin-5.19.0.ebuild 2797 BLAKE2B 86692e71e23c026cb930c541a7fe4307c420fc6f83a3603bd17cebef303e5d33a1c54a76973bb1c256f3bc5a1a19585ab0e366330f1779b19287eb8a909f83ca SHA512 567e1b7e7a5cdf1690b75778e092323c757aceca61a9b54f7e573fc960495f91e37e727af2b429198c81ff9ab1ca4fc941f281b02ef7c3e4b9082c08495c6627
+DIST signal-desktop_5.20.0_amd64.deb 114463244 BLAKE2B f0414f17e5486493bcc40c37f7fc88348cbc9b09f7cd849b426ababe48840bc772b2ad0231331b866a56de72072250f2aca3c12746e54ae6f7d401083e61d094 SHA512 64b81c1b96cb3e4d5954ae930a034376c66b2d5743ab8cd21ba4b330e275bd9183d15169119c66ef1406a503495170284a627e503a9014039d0c4c3ed2d7d92b
+EBUILD signal-desktop-bin-5.20.0.ebuild 2797 BLAKE2B 86692e71e23c026cb930c541a7fe4307c420fc6f83a3603bd17cebef303e5d33a1c54a76973bb1c256f3bc5a1a19585ab0e366330f1779b19287eb8a909f83ca SHA512 567e1b7e7a5cdf1690b75778e092323c757aceca61a9b54f7e573fc960495f91e37e727af2b429198c81ff9ab1ca4fc941f281b02ef7c3e4b9082c08495c6627
 MISC metadata.xml 397 BLAKE2B 8b09559d9ab0428415fb6301596386acc0983bb312f099c6c5299492043f59d6b2e1145f29885e9fc429f4e0d28fccac19cdd7afb5c5ed5f70383a9075d0e466 SHA512 8fa1b372993842145229779dc730c574f688411efd3da415b00928d81947a91c1dabb7c53412aa3c413a5e1071d113b182c54b113a933c0d5ddf3de08869267b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.19.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.20.0.ebuild
index e6ca382563fa..e6ca382563fa 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.19.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.20.0.ebuild
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 12e50a9a44fd..793536d826c6 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,11 +1,11 @@
-DIST skypeforlinux_8.72.0.94-1.x86_64.rpm 118230043 BLAKE2B 9d7d8609c117947fbab4e2ac68a9bbe909f94f2ae82bc910cad66412aaced2ba13f35ce785a4f0d95690125c42789cbc4bbec6831bc0038add7fe7a98469f20b SHA512 349550d69efce07e3c9fa92ea659fc0d4b87e4e110c0bdfac9ecd365685b4d5623362b315cb3eaab7eb91078dde7e1c286165ce487e8b93585e59272e8cca3e3
 DIST skypeforlinux_8.73.0.129-1.x86_64.rpm 123370656 BLAKE2B 831188ea01a8ae27b6c5b557f7e752740a3f32928bd113bd6d8fffd31badfbff4a8f088e8e0b8fdc1b1b133ff5e6b692db3b83df4669da5d92725847a3555280 SHA512 153afbf9e7b3ad8d3ca9002835d54038e8450868df2506a61cd278ddfe3329241a913d0caef9ad0179c3f8a6a2d8f7138e4fff74c7ef7b12ddbdbe60f78e58a2
 DIST skypeforlinux_8.73.0.92-1.x86_64.rpm 119323419 BLAKE2B e201be43c6f331555d3759e9484d13c1d0613dd9e60ce67c3dafec27fa9d183ddc89e1c23feb1722ace2fd492185f8402be6abec80c748e6ad1f666878a72025 SHA512 dc6b72dc43443ad7747a30adef7b08afb50b4cc40a61cff2eb8989c9f68ae817c221d4ce2812d5d54cb9a4ac5f2accfe350efdfab622096d2d0805953fbddd13
 DIST skypeforlinux_8.74.0.152-1.x86_64.rpm 123390893 BLAKE2B 746f1ac2f777ff79a47444052fdad86d2a67f7278eb809d57fedc681ca5648320d16b32e100b50b36bcaea853dff266eb0b47bdb9c8ba48582c63a09b3eeabda SHA512 f1c40c58305cecec899f9be1a477103ff9dc7e0d02ea68a9ebc15b4e80292d5a3925fbcf6451cae0c2b854b3b3f74abe101715a7f3afdc2ea954e18759cab37d
 DIST skypeforlinux_8.75.0.140-1.x86_64.rpm 123300996 BLAKE2B a1b0d4696489be33721fb38a832756edc0a437b93c269e512aba6ccd882e66fc9c84ba7d7a741e2761a097d7697985e32b0a65766c556cf17045a26fec6fc010 SHA512 21eb3cea11878e41f0694951dbf6447d225983c026ab7572ed8a9a5f31c38231c7b7f3ca7363535f27ef958c58db500c6d61ddfb95056145500500a9f0b30aed
-EBUILD skypeforlinux-8.72.0.94.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
+DIST skypeforlinux_8.77.0.90-1.x86_64.rpm 123643165 BLAKE2B 12c578f99f482012f54d5f9faa2d017358376902aa6879fd35ce6eba1b16e3458d4831450574158c69436b9c6103a8dd00233451b56415542e2b6e81eb9346b8 SHA512 ee1fdae1ad10f1fba91886bea52eef261151463e184746af288150bebb69d4bf0dd87d0ac4030d8d11f86054f7b2cb663b8647ce795b1bf924f23c2b7559574b
 EBUILD skypeforlinux-8.73.0.129.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
 EBUILD skypeforlinux-8.73.0.92.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
 EBUILD skypeforlinux-8.74.0.152.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
 EBUILD skypeforlinux-8.75.0.140.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
+EBUILD skypeforlinux-8.77.0.90.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
 MISC metadata.xml 461 BLAKE2B 9bcbfe1d6892c40ce917a76c600baad338b5b86967e5656f79b9bf29e75c3ba474dc11444d8e347769f37934610a971097f96b22ae171ea46cd3f1aef2e9f3e5 SHA512 81df3ef175eafabad357f3d5792c71534b85ffd2c1bd9280ea7ef9cbea17aceb396bc7ac65abdb09e5fba8c3d98384c0d67c58a8daa2d42a657e1a7b150b52e7
diff --git a/net-im/skypeforlinux/skypeforlinux-8.72.0.94.ebuild b/net-im/skypeforlinux/skypeforlinux-8.77.0.90.ebuild
index a44feb7c8927..a44feb7c8927 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.72.0.94.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.77.0.90.ebuild
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index beed6dd7b39d..6b6711e4dc09 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -4,5 +4,7 @@ AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
 DIST spectrum2-2.0.13.tar.gz 840234 BLAKE2B 45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792 SHA512 8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7
+DIST spectrum2-2.1.0.tar.gz 837296 BLAKE2B 3cff3cf700b08b3c061114e736b31f9ec1c44c6626173daacde3992d72c12e45c9ac60f57dc1fc426108aeb8b7d72a9d83a2aac3af64835f5f5155ecd0405f45 SHA512 53499b327edf280a87bdb334e3de2b54f8fc8ebc6a9a425e75676438561e47d144ae562d3c0c41d76330f0480a29cf08a0927de04158791f6d14671edc411321
 EBUILD spectrum2-2.0.13-r2.ebuild 2476 BLAKE2B a564a421adb89943b03d8877401effceab8c26d69d13fba8da20f4d259f67cc752b477a187df0f925980fd34b419607ceb37cd8d162ebb5d264e4d92f0b3115d SHA512 3a96447634d3197f58afc15815e5d6ee7520a974edf503b1879f5ae7210decf15d3556be687900c26eac7632f1401a20d260e7b6fcc8a1e857ac04a1d8c07a53
+EBUILD spectrum2-2.1.0.ebuild 2369 BLAKE2B fac0ea3acc36ae31d57746b4248be22b3220a8e032ad564fb95dac1a669749ff65034ea3ce63cc386d527fad5ddaaad7b4a06659f7c66df0d92553e35653d3a4 SHA512 18c9d5f6ae609b328e8f957c54f329818886301d92f1aa01b6025b871c6338e5d4cf4c564089c6360a8635c088b41c4f7e9296f99253a3350942989355e97ad8
 MISC metadata.xml 1141 BLAKE2B 8964184caabc03f6c5da13842bc5219b0d563baa5d9a1fc52020d686756953a2321d80ede5c5e9aa8321cad1f9a4ea753847c63230b8fb55c8c52e0b61bded23 SHA512 13c244aba5cf70af7e2555a05ba604e28b042d95f879a9f747702b13da7484d6ca3a941ee16d5ad0db864eceb51b55509d0a0761c9f8f7ab11328d67cbe8886c
diff --git a/net-im/spectrum2/spectrum2-2.1.0.ebuild b/net-im/spectrum2/spectrum2-2.1.0.ebuild
new file mode 100644
index 000000000000..2f4fdacf2aed
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.1.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd tmpfiles
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im"
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
+REQUIRED_USE="
+	|| ( mysql postgres sqlite )
+	test? ( irc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/spectrum
+	acct-user/spectrum
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/libev:=
+	dev-libs/log4cxx
+	dev-libs/jsoncpp:=
+	dev-libs/openssl:0=
+	dev-libs/popt
+	dev-libs/protobuf:=
+	net-dns/libidn:0=
+	>=net-im/swift-4.0.2-r2:=
+	net-misc/curl
+	sys-libs/zlib:=
+	frotz? ( !games-engines/frotz )
+	irc? ( net-im/libcommuni )
+	mysql? (
+		|| (
+			dev-db/mariadb-connector-c
+			dev-db/mysql-connector-c
+		)
+	)
+	postgres? ( dev-libs/libpqxx:= )
+	purple? (
+		dev-libs/glib
+		net-im/pidgin:=
+	)
+	sms? ( app-mobilephone/smstools )
+	sqlite? ( dev-db/sqlite:3 )
+	twitter? ( net-misc/curl )
+	whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+	# Respect users LDFLAGS
+	sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS="$(usex doc)"
+		-DENABLE_FROTZ="$(usex frotz)"
+		-DENABLE_IRC="$(usex irc)"
+		-DENABLE_MYSQL="$(usex mysql)"
+		-DENABLE_PQXX="$(usex postgres)"
+		-DENABLE_PURPLE="$(usex purple)"
+		$(usex irc '-DENABLE_QT4=OFF' '')
+		-DENABLE_SMSTOOLS3="$(usex sms)"
+		-DENABLE_SQLITE3="$(usex sqlite)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_TWITTER="$(usex twitter)"
+		-DENABLE_XMPP="$(usex xmpp)"
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}/tests/libtransport" || die
+	./libtransport_test || die
+}
+
+src_install() {
+	cmake_src_install
+
+	diropts -o spectrum -g spectrum
+	keepdir /var/log/spectrum2 /var/lib/spectrum2
+	diropts
+
+	newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+	systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+	newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	tmpfiles_process spectrum2.conf
+}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index e17c3ae63244..d694e664f03a 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,10 +1,7 @@
-DIST tdesktop-3.0.1.tar.gz 15202460 BLAKE2B aa81844c2cef095089371a65a9784f0f6f5bff1923a31ad3fd5a06ebbc6fb8e11a23dd4eec7baca656297dfd3838ee378dc6dc05de4db5c646d8cc1f7479f6c0 SHA512 1d913be9c557953610197b068d778d682fd00a1967e82ff02dac75fa899dcf1eaab9be0e6441c58e131c282674dcd13dd60aac573f24c93be49752194cf1c92f
-DIST tdesktop-3.1.0.tar.gz 16117688 BLAKE2B 2b3b32c5353ddf67705fafa6e0a8e66779747674ea902ce800b1dd6b76dc2dff5c1fe1a5bb74fc4332640962dbecd57a539bf6b7825021626567b6c59eeee598 SHA512 e29fd9ff77ca022bf71ccf9dc34b9a8089e54f20892974302286685300d7d44aeb3f7bf4e1cacae6a3653eedf1766f9d70eaf1b31ee2eb34593ab94db4abf4f6
 DIST tdesktop-3.1.1.tar.gz 16116770 BLAKE2B 7352164a9800cb12dbf4f473cf604648f750e590038940c0a13f40a240cf9c15a7c6d616512a401f076611b6f8992be8a24e4f2659abb2b0238b2ba13c74c33b SHA512 39ccc0f54cd3ca304cf4afcf026f6721c6f7f06135a4fe0b4a4e150808236f7183a670405f76b65e90704a4ef0fe3e75398c227777756f7eacf4cb0c608b6ee2
-DIST tsetup.3.0.1.tar.xz 39191516 BLAKE2B e48189962e618ce4678bffc09f75c53bb4dec71b2d65e7cfdf0f6662c09b7999ab5512262a84fa14a22a60a011c595b6216385771185dba4035d930730dd00fd SHA512 870eda7af0ca25712eee15b45c5958d8e1be012fda46ac6c3ebdc622067dda98896eaff969574e120b7d33dad06cef9a323cf0c08cbb33a3b542e9691740cbb0
-DIST tsetup.3.1.0.tar.xz 38188512 BLAKE2B ae6d29e8f8a1e06c3cc9fb67f29852cacff3d60a033730e248deae104b055dfe5906217ac1ce699b7b6f1a0c07e92e6e0895b69fc6e8048e01d30135eba5edd7 SHA512 d0722eda91b7dd3714d746b4b05dfb5883a937b47ad9bd6f79a7472aeb38c9e3a2bc7137af1b37d646354459443dd66ac9893521cdf0dfb4faec02b156ce1d70
+DIST tdesktop-3.1.8.tar.gz 16141828 BLAKE2B add5fa113baee0ba945c5f6355c4c6faa95ea0832d4b4866350b5eb12cd0e109e3d0d07c57740f9f42808c99760ef060a7e0f8a47ad3b8b0cfcd51f661ded2d3 SHA512 90d3cba93af7752815624f0cf7b004393e286f934d059f11ce7f83380e4595482c1d8f21b06d07ff260232442adb6e50284bd58ecbe70b20eec6b2ae6d4f961c
 DIST tsetup.3.1.1.tar.xz 37505484 BLAKE2B ca9d33055d57f741b3b432072315e87f0910ec584f2d7a92e71080b094e5e2b34edddce688345c83da510607957fa60d27ae116a36acbf4914942b61f420bb7a SHA512 3fe99bd0131845261b42028bfb4695bf21f8ca7b0a30c978c1c1093e0fc33dd210d4b97777c1ab356932e4ff078acd3d570f0e2c641b33bc09c8ec802d273be3
-EBUILD telegram-desktop-bin-3.0.1-r1.ebuild 1250 BLAKE2B 23abc28522e96079d53c8af12810f5405a09e15f03329bda1cc9f8a0d7584a91d2e295a01df55394bfbcc3171a6833f0f4067e500c0f11fddea77620ebbf7b67 SHA512 2a0fddfa40d62a1c12fbffa87466e666ffdd2a6fd16fa646f356332510af77d872b0897e0218668b3036c60d88253f530e4d2b0784baca1b95226d0eb2c35c5d
-EBUILD telegram-desktop-bin-3.1.0-r1.ebuild 1202 BLAKE2B 1ae0b7f1a461f374b60acfe1cb8cad3d75aa779ac899efa0268de5171e27e36d20c780f8e89d3260a7d04a602e7873e785c67cf8abacab257d930c317b8596ef SHA512 430022002a1a62395dd334e1f3e34f0cee4cb39abf77d0c98e4d21dba3c16ed0d33cee7e5caff15507ebef85cf8f2cf6801b0f0ec0335bef2271c701f6cc9018
+DIST tsetup.3.1.8.tar.xz 38670944 BLAKE2B 33479660ef3e73de9612e5dbc3d95fa0b0d9bff9b8cd43ebae62e5969f012b6d288ee8b8709bd6698672ed983125c6c0835482df15ae464ab190f1202a5a1f1e SHA512 f690d548cf05792d87c981141f9507e49ec9f4ec2d0653129f7f6cbab726c1ab333714ccbb4de4e227e452b0a08cc4acddd85b1000df724e8276f53a711d1781
 EBUILD telegram-desktop-bin-3.1.1-r1.ebuild 1202 BLAKE2B 08907be9fbe8435e8976c8dec97fe30c94900a3a493b2a0eed70f1abf3666fb1e12af9df29b7ed946a9d6b5b5328b2ef030343e504cb128eb582e7b87a39c4ae SHA512 bf748ef0559f940d6dd9f688a84421667ea01146008eaf3260d9a6b44f21565dc216c9a67334d47ea97040ed90ce55b022f1b2ca01777a02d0234b0e6a6b3315
+EBUILD telegram-desktop-bin-3.1.8.ebuild 1202 BLAKE2B 08907be9fbe8435e8976c8dec97fe30c94900a3a493b2a0eed70f1abf3666fb1e12af9df29b7ed946a9d6b5b5328b2ef030343e504cb128eb582e7b87a39c4ae SHA512 bf748ef0559f940d6dd9f688a84421667ea01146008eaf3260d9a6b44f21565dc216c9a67334d47ea97040ed90ce55b022f1b2ca01777a02d0234b0e6a6b3315
 MISC metadata.xml 617 BLAKE2B 5aed21ce280bfc0d23ba9c4e75dbc8841637ef702cb67686ee91b46dc0830308ab6ff687bed89274d3217f665f989295341735f506182a0461f968d05af187b3 SHA512 ec61f9dec317a9625ffcc0e1aaf2dbf323f218a6705375cd23a14827e1bc30bb496849efdebbe2a8f4fd7a28d37e170e87f0f6d6f49c56d6292220c955a27a0a
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1-r1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1-r1.ebuild
deleted file mode 100644
index 6f908ad66faa..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop optfeature xdg
-
-DESCRIPTION="Official desktop client for Telegram (binary package)"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="
-	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
-	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
-"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT="usr/bin/telegram-desktop"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=media-libs/fontconfig-2.13
-	media-libs/freetype:2
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libSM
-	x11-libs/libdrm
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10[xkb]
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	newbin Telegram telegram-desktop
-
-	insinto /etc/tdesktop
-	newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
-
-	local icon_size
-	for icon_size in 16 32 48 64 128 256 512; do
-		newicon -s "${icon_size}" \
-			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
-			telegram.png
-	done
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "spell checker support" app-text/enchant
-}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0-r1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0-r1.ebuild
deleted file mode 100644
index ed873795842e..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop optfeature xdg
-
-DESCRIPTION="Official desktop client for Telegram (binary package)"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="
-	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
-	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
-"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT="usr/bin/telegram-desktop"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=media-libs/fontconfig-2.13
-	media-libs/freetype:2
-	virtual/opengl
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10[xkb]
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	newbin Telegram telegram-desktop
-
-	insinto /etc/tdesktop
-	newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
-
-	local icon_size
-	for icon_size in 16 32 48 64 128 256 512; do
-		newicon -s "${icon_size}" \
-			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
-			telegram.png
-	done
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "spell checker support" app-text/enchant
-}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.8.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.8.ebuild
new file mode 100644
index 000000000000..015193a01c6f
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/bin/telegram-desktop"
+
+RDEPEND="
+	dev-libs/glib:2
+	>=media-libs/fontconfig-2.13
+	media-libs/freetype:2
+	virtual/opengl
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	newbin Telegram telegram-desktop
+
+	insinto /etc/tdesktop
+	newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "spell checker support" app-text/enchant
+}
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 4b4dc82bf440..34b73f8e5590 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -4,8 +4,8 @@ AUX tdesktop-3.1.0-fix-openssl3.patch 641 BLAKE2B 0354e0c8931311e5b6561c601cd0e7
 AUX tdesktop-3.1.0-jemalloc-only-telegram.patch 1136 BLAKE2B 06811696df84c1648f63843e937d18542ec5185aee6c3fde99dcfabe982aaad49e97387910882e405ec0ec9e8a12bef615f6f920c7f603224bce347bbff3bf22 SHA512 59c3f508c4be10e182fca52e4069e88af8cd26d150625dbe14214e505f9a5461e1492450896b1e9e229444a4f403eff43e4066d7f0c866bc9631c76f2c1f847e
 DIST tdesktop-2.9.3-full.tar.gz 37335782 BLAKE2B 197583ba6568c455218c51f590c1ba1a3f10c390caa4fd03657098f499ce113a4f5f57ca9dd53bc4baba31992d4229768ed35e68ad6b0685010bc335817edcac SHA512 810cfac5d7e6ce9413b1b2406927e89c1383ea5b725233a68b2cb29dd374b4c3386c22186640afde4492c844516c88889a5db8e5b167a09d6d6c1270ac965ac4
 DIST tdesktop-3.0.1-full.tar.gz 37531917 BLAKE2B c139501f23c742f76d4acd43def69963413ffafef1be584f13d7359b3c20625def7ec283a981556c795aa4dc5ad2e117e1f8aada28cd4815f66f02510e607435 SHA512 6bff6be5f2c0c7a17df61dccc5a3216dcbb95a1c6d3176442c530e2c1b525e6d15079b230d40751f20684da2a1067d4518a9a1ab90d49d1a7338d3e05239d447
-DIST tdesktop-3.1.0-full.tar.gz 38465279 BLAKE2B c9442507d3ec6f6e36e68d44ec86a9c1dfb864498ee90eef5f50b12482de4e1c93256352fc21bf997c38cda0dfce03f53776c47afe1a3066b109c1675ffc8749 SHA512 7fbb5722917c482aed820154e425642c4a3c7649defebae7076e48ac25da8744933877b70539d5cd6952e9f80493ccc5f144bf2c0c01083bade3473f00a23ec4
+DIST tdesktop-3.1.8-full.tar.gz 38494235 BLAKE2B 50da0fdfe48f6492dc255c0fdfdb584750fd137ab0f847d226f9f62012ed1c34cc1a597f97735ca6aae1ba7e262562be2c88b92fe22c2868ed2cda437341a1f9 SHA512 787c92d6aaad2998d7195f2e1c98eddc6e87c3cb04a0d9ab80ea9a4a2dd1a798004109f8cc1ad82136c511ae191cea5b15cc23cc541ce86ccdb79dbc65367f09
 EBUILD telegram-desktop-2.9.3-r1.ebuild 4378 BLAKE2B e93eb591dfb85de579398166b565d473d51edcbe5da9463b6e495ef4190574780ad626e5542019a032dff09de4fed94eb35f2029ae3860ad700eb6451093d45e SHA512 6f2b955352ad244d39286af4c1001e4bb67101d4dd9fa42bf338ac90cc5c15ae3f8b6fb09f8a955a447b5f13e963f4ac33624e3c5197e36936fabdb8e6bd8dc0
-EBUILD telegram-desktop-3.0.1-r1.ebuild 4326 BLAKE2B c5643127d791d9bab485163fd6b4d38771750f6c2e1457d02b0d40012421aad5ec3b6bf94fe9f08e08920f121aba827d057a7c62f5ab889a88a250345df62f77 SHA512 23ebe675b4d967ebc083fcbd6bf2363cf15bf646df2bd7a38240291f6764e1354c8206819819a0c9f88c051ed4f700aed5fdc2b122ae583d291acf936392db48
-EBUILD telegram-desktop-3.1.0.ebuild 4372 BLAKE2B 36240b358bb02e5a4dd43bebd5ef27598db90207b4d242083ded672d0c8704fd57b02761d60c253558cf4ce38a019df8ade44141e227fc32cf8681eb0db26943 SHA512 7442d197978235bb587c422b1f3052e7bfb2a904cfc23c138f180134220856ec843c9024e13b11e878e051b1f70dedc48d38e0c8e014b266dc59c4603db06ab2
+EBUILD telegram-desktop-3.0.1-r1.ebuild 4374 BLAKE2B 1bec2055cdc156572815286d0050aeacd2c388a7cd62d3b60af8140902c0b2dec0ba03a64c8ecc8e143949bcaafe24c84a4e3c79b90593c6246129ff0f60db7d SHA512 754094c452ce7c7e81034c816bab884a6b95f092e619f5774fe887fd4627db0209198e9ef666ed174ee22a3aae78f17c3373c2556c14ef94bca41a7688a90487
+EBUILD telegram-desktop-3.1.8.ebuild 4359 BLAKE2B 7410ce5fa9f3d8548525dd6b38d6eaece35cfdf3986e8c0f076139fe2d581736b3ee1d94a5138043ac8389faa530621b0a5e38438075d9751347052cb83d051a SHA512 49464cdeff4d99bbab809b66f742d5851c19bab0fc3d809067571da45a6ac3960277da168bed539a374cf17057cb9169146a18ca847558676339540feac7f433
 MISC metadata.xml 709 BLAKE2B 02eee6916528198d1b28ebf883f84a94cb979f507d559d74e1b9a4e4f7b8b82930fd19a30c2f86a3e71ec2b6aa93e7836faf64ab23e23c59850b5b5260b305e8 SHA512 3c26cde38da1cb3e6700b52a50bb91d1b41230b89f7603d19d25156a1ae53603906cbf94b3257e189c6d24b5cd5627729b652ed412d9c3ac94dedbde5a721f5e
diff --git a/net-im/telegram-desktop/telegram-desktop-3.0.1-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.0.1-r1.ebuild
index f17835c3420d..090b6a2773bc 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.0.1-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.0.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${
 
 LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="+dbus enchant +gtk +hunspell screencast +spell wayland webkit +X"
 REQUIRED_USE="
 	spell? (
@@ -75,6 +75,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}/tdesktop-2.9.3-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch"
 )
 
 pkg_pretend() {
diff --git a/net-im/telegram-desktop/telegram-desktop-3.1.0.ebuild b/net-im/telegram-desktop/telegram-desktop-3.1.0.ebuild
deleted file mode 100644
index 675c8aefaa4d..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-3.1.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit xdg cmake python-any-r1 flag-o-matic
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-
-MY_P="tdesktop-${PV}-full"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="+dbus enchant +hunspell screencast +spell wayland webkit +X"
-REQUIRED_USE="
-	spell? (
-		^^ ( enchant hunspell )
-	)
-	webkit? ( dbus )
-"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	dev-cpp/abseil-cpp:=
-	dev-libs/jemalloc:=[-lazy-lock]
-	dev-libs/openssl:=
-	dev-libs/xxhash
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
-	>=dev-qt/qtimageformats-5.15:5
-	>=dev-qt/qtnetwork-5.15:5[ssl]
-	>=dev-qt/qtsvg-5.15:5
-	>=dev-qt/qtwidgets-5.15:5[png,X?]
-	media-fonts/open-sans
-	media-libs/fontconfig:=
-	~media-libs/libtgvoip-2.4.4_p20210302
-	>=media-libs/libtgvoip-2.4.4_p20210302-r2
-	media-libs/openal
-	media-libs/opus:=
-	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20210914[screencast=,X=]
-	media-video/ffmpeg:=[opus]
-	sys-libs/zlib:=[minizip]
-	dbus? (
-		dev-cpp/glibmm:2
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	wayland? ( kde-frameworks/kwayland:= )
-	webkit? ( net-libs/webkit-gtk:= )
-	X? ( x11-libs/libxcb:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/range-v3
-	=dev-cpp/ms-gsl-3*
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch"
-	"${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch"
-)
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# no explicit toggle, doesn't build with the system one #752417
-	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
-		cmake/external/rlottie/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
-	local mycmakeargs=(
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
-
-		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes)
-		-DDESKTOP_APP_DISABLE_WEBKITGTK=$(usex webkit no yes)
-		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes)  # enables hunspell (recommended)
-		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! use X && ! use screencast; then
-		elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!"
-	fi
-	if has_version '<dev-qt/qtcore-5.15.2-r10'; then
-		ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram"
-		ewarn "to crash when pasting big images from the clipboard."
-	fi
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild b/net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild
new file mode 100644
index 000000000000..65f4899c98bf
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild
@@ -0,0 +1,146 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit xdg cmake python-any-r1
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+
+MY_P="tdesktop-${PV}-full"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+dbus enchant +hunspell screencast +spell wayland webkit +X"
+REQUIRED_USE="
+	spell? (
+		^^ ( enchant hunspell )
+	)
+	webkit? ( dbus )
+"
+
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	dev-cpp/abseil-cpp:=
+	dev-libs/jemalloc:=[-lazy-lock]
+	dev-libs/openssl:=
+	dev-libs/xxhash
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
+	>=dev-qt/qtimageformats-5.15:5
+	>=dev-qt/qtnetwork-5.15:5[ssl]
+	>=dev-qt/qtsvg-5.15:5
+	>=dev-qt/qtwidgets-5.15:5[png,X?]
+	media-fonts/open-sans
+	media-libs/fontconfig:=
+	~media-libs/libtgvoip-2.4.4_p20210302
+	>=media-libs/libtgvoip-2.4.4_p20210302-r2
+	media-libs/openal
+	media-libs/opus:=
+	media-libs/rnnoise
+	~media-libs/tg_owt-0_pre20210914[screencast=,X=]
+	media-video/ffmpeg:=[opus]
+	sys-libs/zlib:=[minizip]
+	dbus? (
+		dev-cpp/glibmm:2
+		dev-qt/qtdbus:5
+		dev-libs/libdbusmenu-qt[qt5(+)]
+	)
+	enchant? ( app-text/enchant:= )
+	hunspell? ( >=app-text/hunspell-1.7:= )
+	wayland? ( kde-frameworks/kwayland:= )
+	webkit? ( net-libs/webkit-gtk:= )
+	X? ( x11-libs/libxcb:= )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/range-v3
+	=dev-cpp/ms-gsl-3*
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch"
+)
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# no explicit toggle, doesn't build with the system one #752417
+	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
+		cmake/external/rlottie/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
+	local mycmakeargs=(
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
+
+		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
+		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes)
+		-DDESKTOP_APP_DISABLE_WEBKITGTK=$(usex webkit no yes)
+		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes)  # enables hunspell (recommended)
+		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! use X && ! use screencast; then
+		elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!"
+	fi
+	if has_version '<dev-qt/qtcore-5.15.2-r10'; then
+		ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram"
+		ewarn "to crash when pasting big images from the clipboard."
+	fi
+}
diff --git a/net-im/webex/Manifest b/net-im/webex/Manifest
index a96de0148012..de09fd4e641c 100644
--- a/net-im/webex/Manifest
+++ b/net-im/webex/Manifest
@@ -4,4 +4,4 @@ DIST webex-41.6.1.19162.1.rpm 210334860 BLAKE2B a5b9a3fb1254527ccceb75852b21f46b
 EBUILD webex-41.5.0.18815.1-r2.ebuild 1450 BLAKE2B 00bf47091dbfc6422400b498a81158ad4cbc190268ff01b89e5a2c7089f5fd3f852e4d12e3f33a1c9e4dd812153526413e2484aaa10b5f6d288d4c819b2c2b87 SHA512 7a099261fad39de65e585e94530f7e9c4062d511d64b485abeacab9b50b46557ea41e0a28cf28f603068073dfa9b2f05c8e6b932c87c542645b133e3444bed7f
 EBUILD webex-41.5.0.18911.1-r2.ebuild 1450 BLAKE2B 00bf47091dbfc6422400b498a81158ad4cbc190268ff01b89e5a2c7089f5fd3f852e4d12e3f33a1c9e4dd812153526413e2484aaa10b5f6d288d4c819b2c2b87 SHA512 7a099261fad39de65e585e94530f7e9c4062d511d64b485abeacab9b50b46557ea41e0a28cf28f603068073dfa9b2f05c8e6b932c87c542645b133e3444bed7f
 EBUILD webex-41.6.1.19162.1.ebuild 1450 BLAKE2B 00bf47091dbfc6422400b498a81158ad4cbc190268ff01b89e5a2c7089f5fd3f852e4d12e3f33a1c9e4dd812153526413e2484aaa10b5f6d288d4c819b2c2b87 SHA512 7a099261fad39de65e585e94530f7e9c4062d511d64b485abeacab9b50b46557ea41e0a28cf28f603068073dfa9b2f05c8e6b932c87c542645b133e3444bed7f
-MISC metadata.xml 255 BLAKE2B 4126840e4c5ef0d5669e923458adafa3e4e4f23ad9ed34e890a7c44631222c599e932eca4c8653a3abc976d495226245a666d53ccd846aa474b2c965b106024c SHA512 288b2ec4a0f95ab1bc76c893dc96761ba538330df4368de244ba37db87d0dc870c9af76be202c44441c1ccac4ea34454c69471cd41a37068698e82c074d2dde5
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-im/webex/metadata.xml b/net-im/webex/metadata.xml
index 812e210e6bd3..115e9d64a669 100644
--- a/net-im/webex/metadata.xml
+++ b/net-im/webex/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dilfridge@gentoo.org</email>
-		<name>Andreas K. Huettel</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 38e083968ba5..d615d559d657 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 1147317c62b0..80221f8061d4 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -5,5 +5,5 @@ DIST inspircd-3.10.0.tar.gz 854024 BLAKE2B b6aed621c6c5c4ea082d07605c6a9fe8be5fc
 DIST inspircd-3.11.0-fix-path-builds.patch.bz2 4564 BLAKE2B 5414c6bff651f179bb7f214198d13c08ce1e92b6946729d617a56a2dd451a239520bc946823603b2e3ab0a78577f077c1d566bfa6771d6c9866ef5249269653c SHA512 92feddfa23acac2f1813539f9fae0e1c6c7332565c5d63df02e6f800b4457ed1ac1eff4f3aee8fb155dbae5b6d1d16536b435734549f740ae294382330837d5c
 DIST inspircd-3.11.0.tar.gz 859767 BLAKE2B a0924d302577dcb471e22c0df21b7259c5b68b1ee2080233c31e84bc5cf8c32fbe134a359bf4d7f7541f512e078a9e75717df2dc7178670b3e3d7c7dfb2930b7 SHA512 59a277de041f1b0d44204c36190b6bd728f981997ba377f5bf9b7745fce122271e3df35223ff11d8d31d70f1f378977ea6603963ff2bb1a4fbaac958903b0da3
 EBUILD inspircd-3.10.0.ebuild 3708 BLAKE2B 44d2808570c41a0bd8c9f713ba89b41ab8a6563b80d459ffb551d1efbd7d532bf00915e0d5eda978fced1a383b16272fc778f6ab3daf46818a66e3afbc3479c4 SHA512 3ee1c48b313f8a217dc26d43c7f9757924d0156c1179c10392793d00a81be4132f943dde5c1af4ff02b9c173e82901c03377c0813bf029ef4a0e69c4a2d0edac
-EBUILD inspircd-3.11.0.ebuild 3717 BLAKE2B ccf2ee49f27d10463cc9be40fd98fa5b2056ea4c4a973e26730883c864b956edb052433737e6b602f187552ac25bbceba829dbb61f5847d841f917c927e443d8 SHA512 f693b83fbd2352f612b6dbb61aa3763191965b99adb7f29a23fc2fcb98f5b5735fd603dd4799d6389b743875e02a9bce3964106d1019e4a2a259fce4a2b4e626
+EBUILD inspircd-3.11.0.ebuild 3715 BLAKE2B 61f99c98cf1cd27bb97d637a3d1acde8947259ee6a961f8ae4a422580c4f4b1b7f3b6cc5a7bc6d1398f10304c6a41f924d8150938286e193eade456f22fea54d SHA512 0530c0f26cbe82327da62ea29c05511da5f4f7f5de1fc1a06eb429ba75beb9aaf1581127d22f88eb8e1c755e2c85095259bcfdc33cb606177bbf1217a00132c7
 MISC metadata.xml 1878 BLAKE2B 2c85eb9c5a0db82398ede6b597627d226b139b7758135777068bc9b84f4b2c8303243f9591fe12e0dfb3957b7d6abe638421dce936d58c7182fa3bccfa7ddf9c SHA512 25a287fd0ac8a18a751d6920395868eaf0c73e8bf13f28ffcc187f9a5ee04520677ffeb0506b5541436ac4a9ed0f493331a09ed24d7249376493cc626eecf857
diff --git a/net-irc/inspircd/inspircd-3.11.0.ebuild b/net-irc/inspircd/inspircd-3.11.0.ebuild
index d013d22d99d8..b8aa1c3f23b4 100644
--- a/net-irc/inspircd/inspircd-3.11.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://github.com/clinew/gentoo-distfiles/raw/master/inspircd-${PV}-
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
 
 RDEPEND="
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 6300f3f4b1ea..e7a1c223869e 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -3,7 +3,9 @@ AUX quassel.logrotate 105 BLAKE2B 16a8b32885a77817d39f14deb7d1cf2cb7788c9ecd6d17
 AUX quasselcore.conf-r1 333 BLAKE2B 67586dc8a62e94131d11d81502f09387026f98b7452a501c5048904867382ac8bbc133ab3c7fd84751f8b8b5c9a0037dba0d862209515004773241bd546cd6ff SHA512 7d3f320b5d5c9cc27db399a5460ea37f33688d523340d4509ebd2fcf20620b43d4b1a05cdb91fa07931798b18a2bdcee9f4f29c75e867bd4b5a7f170cd02ba90
 AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c350ac3356b1e92859786a242da52103acb4692bd32d647983d2b5a758b847db66041791dac5bf531cf448a SHA512 6b050c6bafa2c49ab92f8e7c77be3c6868b58040b4df8b2cc3bbc217c4bf9d69fa63a7efe9e1c9e3b055de170d79af6470fa58828c5291e0b3d6b6eb7044aff3
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
+DIST 0.14-rc2.tar.gz 6163941 BLAKE2B 6e9033ec71553c0f5d9cdd7e3c356cc3504a7a1b1d49536f6897a4b30b50a1b85fe43a0e677a910cdea61867b425120f2538a6e168b652a54558c98deb2585ea SHA512 57abd32d5e6b604cca753e34aedb3b7d134537bc25b984982c5eb39b2492019e8e8e4774ae3dd4b9658e946e1627220e146ecb70008577558a749f235efeed2a
 DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd SHA512 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
-EBUILD quassel-0.13.1-r2.ebuild 4700 BLAKE2B a508275b48c7314155d9a133caadfac6745206bac3d92a9d667dfbdf6bc03215b58cecbe2c7fb78b6ea3d8d511e98ca20914ce5e7234be460c22056357816037 SHA512 42eda8c70edfc642e0e011d9111eae7b98a3715ff85129f14a0b15348aa107494fce4d79f7d65ee869b89ab884de804353288436f376f86186d59f0d8787205b
-EBUILD quassel-9999.ebuild 4583 BLAKE2B 59c518587b305ad28b40594af715e2aa54396feb6f596a9273b884b4280bed8152649bc7da6f662a7762d5d01b16d798160e1414d5e5649662d2b18c0bd9863d SHA512 c0de1abaa3fd51e64378c15d425371f9214ebfd0933f4cb64d8dbf4684fbcead6ce19049593ed1b7bbc6d60d6b661d8f0afd6e9e9600ad272c7432aa6bbe2d08
+EBUILD quassel-0.13.1-r2.ebuild 4778 BLAKE2B 906e990217903529c054351347469bfc278372928539ad3d206192981222d45821cc0e7e1921fadcf3fa0451f679b3bb285c5a0d9b89d0fdc7be3a5ced605986 SHA512 86e0f40fb13d71e2bbefcc82aa39148ee4f6d3e497ca0f1ea58521caae6d9310b0e918e7979f6e3864d7e08f3009944d0b811dad44c0c803349dbae31501bf4f
+EBUILD quassel-0.14_rc2.ebuild 4938 BLAKE2B 28c85696c8aea0a8df45eca4643921606952b691d84f0c65a19a688ace3a8db3fa4edfab2b29e2a873f9b847345401f60fb9e25d8bc6aba12256843a73bb8073 SHA512 a17eceb2b33336817b38841720b11666a51c629d3c64a6493d236830bf59885470ef2e1bd3880b627414275074ee4927354166ee20a95c33d6b89d1d4817e317
+EBUILD quassel-9999.ebuild 4938 BLAKE2B 28c85696c8aea0a8df45eca4643921606952b691d84f0c65a19a688ace3a8db3fa4edfab2b29e2a873f9b847345401f60fb9e25d8bc6aba12256843a73bb8073 SHA512 a17eceb2b33336817b38841720b11666a51c629d3c64a6493d236830bf59885470ef2e1bd3880b627414275074ee4927354166ee20a95c33d6b89d1d4817e317
 MISC metadata.xml 1727 BLAKE2B 6c24bd6b8689db443c7e1838cd427c54fae128001704570f2a9756d6cc27770ba54f4fd237fe64c4134d21e5ee409dacb4f3e3ebb0a7a38eed9fbb465d64b8c2 SHA512 743c8e1c4b5ad3100ed71142033ad0eb7102bd275dbb3e616845059cebdc90f76a370dd99043e46a34807b1d80db175212748585895af3f5a8fba05e9515d678
diff --git a/net-irc/quassel/quassel-0.13.1-r2.ebuild b/net-irc/quassel/quassel-0.13.1-r2.ebuild
index 5a78333a8ff8..c51a64ccdeff 100644
--- a/net-irc/quassel/quassel-0.13.1-r2.ebuild
+++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://quassel-irc.org/"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
-snorenotify +ssl syslog urlpreview X"
+snorenotify spell +ssl syslog urlpreview X"
 
 SERVER_DEPEND="
 	acct-group/quassel
@@ -53,9 +53,9 @@ GUI_DEPEND="
 		kde-frameworks/ktextwidgets:5
 		kde-frameworks/kwidgetsaddons:5
 		kde-frameworks/kxmlgui:5
-		kde-frameworks/sonnet:5
 	)
 	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+	spell? ( kde-frameworks/sonnet:5 )
 	urlpreview? ( dev-qt/qtwebengine:5[widgets] )
 "
 
@@ -83,10 +83,11 @@ DOCS=( AUTHORS ChangeLog README.md )
 REQUIRED_USE="
 	|| ( X server monolithic )
 	crypt? ( || ( server monolithic ) )
-	kde? ( || ( X monolithic ) dbus )
+	kde? ( dbus spell )
 	ldap? ( || ( server monolithic ) )
 	postgres? ( || ( server monolithic ) )
 	snorenotify? ( || ( X monolithic ) )
+	spell? ( || ( X monolithic ) )
 	syslog? ( || ( server monolithic ) )
 "
 
@@ -109,6 +110,7 @@ src_configure() {
 		-DWITH_OXYGEN_ICONS=$(usex oxygen)
 		-DWANT_CORE=$(usex server)
 		$(cmake_use_find_package snorenotify LibsnoreQt5)
+		$(cmake_use_find_package spell KF5Sonnet)
 		-DWITH_WEBENGINE=$(usex urlpreview)
 		-DWANT_QTCLIENT=$(usex X)
 	)
diff --git a/net-irc/quassel/quassel-0.14_rc2.ebuild b/net-irc/quassel/quassel-0.14_rc2.ebuild
new file mode 100644
index 000000000000..fce90ab6e53b
--- /dev/null
+++ b/net-irc/quassel/quassel-0.14_rc2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils pax-utils systemd
+
+if [[ ${PV} != *9999* ]]; then
+	MY_P=${PN}-${PV/_/-}
+	if [[ ${PV} ==  *_rc* ]] ; then
+		SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz"
+	else
+		SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
+		KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~sparc-solaris"
+	fi
+	S="${WORKDIR}/${MY_P}"
+else
+	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" )
+	inherit git-r3
+fi
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
+HOMEPAGE="https://quassel-irc.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X"
+# Can't seem to find itself (libraries)
+RESTRICT="!test? ( test ) test"
+
+SERVER_DEPEND="acct-group/quassel
+	acct-user/quassel
+	dev-qt/qtscript:5
+	crypt? ( app-crypt/qca:2[ssl] )
+	ldap? ( net-nds/openldap )
+	postgres? ( dev-qt/qtsql:5[postgres] )
+	!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
+	syslog? ( virtual/logger )"
+GUI_DEPEND="dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	!bundled-icons? (
+		kde-frameworks/breeze-icons:5
+		oxygen? ( kde-frameworks/oxygen-icons:5 )
+	)
+	dbus? (
+		>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619
+		dev-qt/qtdbus:5
+	)
+	kde? (
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/knotifyconfig:5
+		kde-frameworks/ktextwidgets:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kxmlgui:5
+	)
+	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+	spell? ( kde-frameworks/sonnet:5 )
+	urlpreview? ( dev-qt/qtwebengine:5[widgets] )"
+DEPEND=">=dev-libs/boost-1.54:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	sys-libs/zlib
+	monolithic? (
+		${SERVER_DEPEND}
+		${GUI_DEPEND}
+	)
+	!monolithic? (
+		server? ( ${SERVER_DEPEND} )
+		X? ( ${GUI_DEPEND} )
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules:5"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+REQUIRED_USE="|| ( X server monolithic )
+	crypt? ( || ( server monolithic ) )
+	kde? ( dbus spell )
+	ldap? ( || ( server monolithic ) )
+	postgres? ( || ( server monolithic ) )
+	snorenotify? ( || ( X monolithic ) )
+	spell? ( || ( X monolithic ) )
+	syslog? ( || ( server monolithic ) )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DUSE_CCACHE=OFF
+		-DCMAKE_SKIP_RPATH=ON
+		-DEMBED_DATA=OFF
+		-DWITH_WEBKIT=OFF
+		-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
+		$(cmake_use_find_package dbus dbusmenu-qt5)
+		$(cmake_use_find_package dbus Qt5DBus)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_LDAP=$(usex ldap)
+		-DWANT_MONO=$(usex monolithic)
+		-DWITH_OXYGEN_ICONS=$(usex oxygen)
+		-DWANT_CORE=$(usex server)
+		$(cmake_use_find_package snorenotify LibsnoreQt5)
+		$(cmake_use_find_package spell KF5Sonnet)
+		-DWITH_WEBENGINE=$(usex urlpreview)
+		-DWANT_QTCLIENT=$(usex X)
+	)
+
+	if use server || use monolithic ; then
+		mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server ; then
+		# Needs PaX marking, bug #346255
+		pax-mark m "${ED}"/usr/bin/quasselcore
+
+		# Init scripts & systemd unit
+		newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
+		systemd_dounit "${FILESDIR}"/quasselcore.service
+
+		# logrotate
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/quassel.logrotate quassel
+	fi
+}
+
+pkg_postinst() {
+	if use monolithic ; then
+		elog "Information on how to enable SSL support for client/core connections"
+		elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support."
+	fi
+
+	if use server ; then
+		einfo "If you want to generate SSL certificate remember to run:"
+		einfo "	emerge --config =${CATEGORY}/${PF}"
+	fi
+
+	if use server || use monolithic ; then
+		einfo "Quassel can use net-misc/oidentd package if installed on your system."
+		einfo "Consider installing it if you want to run quassel within identd daemon."
+	fi
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
+
+pkg_config() {
+	if use server ; then
+		# Generate the pem file only when it does not already exist
+		QUASSEL_DIR="${EROOT}"/var/lib/${PN}
+
+		if [[ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]] ; then
+			einfo "Generating Quassel SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
+			openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
+				-keyout "${QUASSEL_DIR}/quasselCert.pem" \
+				-out "${QUASSEL_DIR}/quasselCert.pem"
+
+			# Permissions for the key
+			chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem"
+			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
+		else
+			einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
+			einfo "Remove it if you want to create new one."
+		fi
+	fi
+}
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 68d94a9e3ea2..fce90ab6e53b 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.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
@@ -7,8 +7,12 @@ inherit cmake xdg-utils pax-utils systemd
 
 if [[ ${PV} != *9999* ]]; then
 	MY_P=${PN}-${PV/_/-}
-	SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
+	if [[ ${PV} ==  *_rc* ]] ; then
+		SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz"
+	else
+		SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
+		KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~sparc-solaris"
+	fi
 	S="${WORKDIR}/${MY_P}"
 else
 	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" )
@@ -17,23 +21,22 @@ fi
 
 DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
 HOMEPAGE="https://quassel-irc.org/"
+
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
-snorenotify syslog urlpreview X"
+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X"
+# Can't seem to find itself (libraries)
+RESTRICT="!test? ( test ) test"
 
-SERVER_DEPEND="
-	acct-group/quassel
+SERVER_DEPEND="acct-group/quassel
 	acct-user/quassel
+	dev-qt/qtscript:5
 	crypt? ( app-crypt/qca:2[ssl] )
 	ldap? ( net-nds/openldap )
 	postgres? ( dev-qt/qtsql:5[postgres] )
 	!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-	syslog? ( virtual/logger )
-"
-
-GUI_DEPEND="
-	dev-qt/qtgui:5
+	syslog? ( virtual/logger )"
+GUI_DEPEND="dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtwidgets:5
 	!bundled-icons? (
@@ -52,13 +55,11 @@ GUI_DEPEND="
 		kde-frameworks/ktextwidgets:5
 		kde-frameworks/kwidgetsaddons:5
 		kde-frameworks/kxmlgui:5
-		kde-frameworks/sonnet:5
 	)
 	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-	urlpreview? ( dev-qt/qtwebengine:5[widgets] )
-"
-
-RDEPEND="
+	spell? ( kde-frameworks/sonnet:5 )
+	urlpreview? ( dev-qt/qtwebengine:5[widgets] )"
+DEPEND=">=dev-libs/boost-1.54:=
 	dev-qt/qtcore:5
 	dev-qt/qtnetwork:5[ssl]
 	sys-libs/zlib
@@ -69,30 +70,25 @@ RDEPEND="
 	!monolithic? (
 		server? ( ${SERVER_DEPEND} )
 		X? ( ${GUI_DEPEND} )
-	)
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	kde-frameworks/extra-cmake-modules:5
-"
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules:5"
 
 DOCS=( AUTHORS ChangeLog README.md )
 
-REQUIRED_USE="
-	|| ( X server monolithic )
+REQUIRED_USE="|| ( X server monolithic )
 	crypt? ( || ( server monolithic ) )
-	kde? ( || ( X monolithic ) dbus )
+	kde? ( dbus spell )
 	ldap? ( || ( server monolithic ) )
 	postgres? ( || ( server monolithic ) )
 	snorenotify? ( || ( X monolithic ) )
-	syslog? ( || ( server monolithic ) )
-"
+	spell? ( || ( X monolithic ) )
+	syslog? ( || ( server monolithic ) )"
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
 		-DUSE_CCACHE=OFF
 		-DCMAKE_SKIP_RPATH=ON
 		-DEMBED_DATA=OFF
@@ -106,11 +102,12 @@ src_configure() {
 		-DWITH_OXYGEN_ICONS=$(usex oxygen)
 		-DWANT_CORE=$(usex server)
 		$(cmake_use_find_package snorenotify LibsnoreQt5)
+		$(cmake_use_find_package spell KF5Sonnet)
 		-DWITH_WEBENGINE=$(usex urlpreview)
 		-DWANT_QTCLIENT=$(usex X)
 	)
 
-	if use server || use monolithic; then
+	if use server || use monolithic ; then
 		mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )
 	fi
 
@@ -120,28 +117,28 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
-	if use server; then
-		# needs PAX marking wrt bug#346255
-		pax-mark m "${ED}/usr/bin/quasselcore"
+	if use server ; then
+		# Needs PaX marking, bug #346255
+		pax-mark m "${ED}"/usr/bin/quasselcore
 
-		# init scripts & systemd unit
+		# Init scripts & systemd unit
 		newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
 		newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
 		systemd_dounit "${FILESDIR}"/quasselcore.service
 
 		# logrotate
 		insinto /etc/logrotate.d
-		newins "${FILESDIR}/quassel.logrotate" quassel
+		newins "${FILESDIR}"/quassel.logrotate quassel
 	fi
 }
 
 pkg_postinst() {
-	if use monolithic; then
+	if use monolithic ; then
 		elog "Information on how to enable SSL support for client/core connections"
 		elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support."
 	fi
 
-	if use server; then
+	if use server ; then
 		einfo "If you want to generate SSL certificate remember to run:"
 		einfo "	emerge --config =${CATEGORY}/${PF}"
 	fi
@@ -159,15 +156,17 @@ pkg_postrm() {
 }
 
 pkg_config() {
-	if use server; then
-		# generate the pem file only when it does not already exist
-		QUASSEL_DIR=/var/lib/${PN}
-		if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
-			einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
+	if use server ; then
+		# Generate the pem file only when it does not already exist
+		QUASSEL_DIR="${EROOT}"/var/lib/${PN}
+
+		if [[ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]] ; then
+			einfo "Generating Quassel SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
 			openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
 				-keyout "${QUASSEL_DIR}/quasselCert.pem" \
 				-out "${QUASSEL_DIR}/quasselCert.pem"
-			# permissions for the key
+
+			# Permissions for the key
 			chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem"
 			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
 		else
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 8b1a1a5d0079..5092614007c6 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,10 +1,5 @@
-AUX weechat-3.0-cmake_lua_version.patch 272 BLAKE2B 3c88a0aad5d0ad9c5067062039fd147c9356923324089d74ebd5987e6f5a67bc1da785a12b863dffafc8e63af18b52b5ed6aba97cacec105b04f7b70ac0b3e5c SHA512 81a3143acfeb35ccd8e913efa0b881165459049bdbb3e7bf96b41c7f764fe37647349599d3bceadb966ae52f2156cba5170926ba7af7ed667f7664f8adb920aa
 AUX weechat-3.3-cmake_lua_version.patch 292 BLAKE2B 1eb735429ece6431ad190e63beea3e036659ee7c2c1462601ed102f1f5e7df982807df741ee49eb1a3e9dc37de415ae927e59c8204d3735af8c593489ae3b13c SHA512 c8bced50df1119311d8db38f586d99d805a3f13d5bf8e4e3098c486906bb847a67446ec60f0819c410e7f57d33c5789ab8f948ba62d4caf0b25b8afe59d48821
-DIST weechat-3.1.tar.xz 2230316 BLAKE2B 95ce8c6107351676b64c368484baf2245bd17093c90552339d35d058a3caff7a0c4bb8e7692757bcf8c2d7617621961b5bc118806c5084cc212283d6982bd896 SHA512 1eb3f5a0e4d3f6777970fc60c816e7bc9be5e5cf91b9e072f6c77003f284c7bdbabfae7058cb5083915a2adf7f4c651a9afb8cc8ae17cac950e7f2ef9608ed78
-DIST weechat-3.2.tar.xz 2261376 BLAKE2B 6f9fcc72b4b36275e056f824a46d8640a45b1d78b9b6f0eaa5327fc2a965f891698982fade86c6d4e96d1f5c472ac4a82d036d478f37989f738f2ccd6e2f7002 SHA512 b4ad5cd6e678795d9093ddfa5aac0d396a7dbf994d04a6b9b083460b1639c851f1b9539cf7b97bd300154871d5df2c29f82fae387c42da840a1c3eb35c4a3660
 DIST weechat-3.3.tar.xz 2564280 BLAKE2B 9cb119c2506ff5f9b4844b8016790af34347e300a1217762afc1307191cd0831c2c23e019a024c8161ff2e46607eddf94f94b3db9bd351bc51b7f057ddb375eb SHA512 18bbaa93620185ead64f64833e4c5df6a1cbc49dc6f60362614e955947221b78baaa93a2748f153bbb6f7867c7760f7a8fa8d6d9ed30040ad5e12af127526e13
-EBUILD weechat-3.1.ebuild 4249 BLAKE2B 15a46be0155555c65876a4058242d341fe48c4e24c730386a0730176862a217b83eed569e7d6ff48d18806e53b4888ed264aa9b6f7a0cc5eb7348bf17db18d8e SHA512 c0d2ede5f5a684368bb6f78c38a2b0a0c93e50aeedc238623e5a30b5d7121fa1c9bc6f6a0da40699286e4cabae09cb181f12f829bb7392c357ad1f7c6b9c4a87
-EBUILD weechat-3.2.ebuild 4252 BLAKE2B cf426dcc508110f7902cbbf9447dd6ec6bdb99d1d522cfe8a48296d81f7aa06b578da5e7e94060f8d9218bf10600253f79348d8c607ab73aadae4a41e2e9d8e6 SHA512 87bff86ac7a3fced70cb1935c7ee152eb2f91cb5e2954ac3a0a3ed0cd9606068571b7e3f53ad720dc7e519ae634f3cea6723e91c32c648c6ee90247f7e37aeb7
-EBUILD weechat-3.3.ebuild 4293 BLAKE2B 6371e879fa0430afbeb912104902ca0367dc97360d59650f84449b9481d06e514cd0d6e867ad265cbff176392c1701de3a898b614c5fa35cf131c4c1a3c2b60f SHA512 c0759eb67f2f81502397f8d7c4608671b93cb175725006a8fd2a9f59cea31df2516a64259a41e15fda46ccb15f834c4fdc3dc591e650cc0a4854d2203f12e38c
-EBUILD weechat-9999.ebuild 4252 BLAKE2B cf426dcc508110f7902cbbf9447dd6ec6bdb99d1d522cfe8a48296d81f7aa06b578da5e7e94060f8d9218bf10600253f79348d8c607ab73aadae4a41e2e9d8e6 SHA512 87bff86ac7a3fced70cb1935c7ee152eb2f91cb5e2954ac3a0a3ed0cd9606068571b7e3f53ad720dc7e519ae634f3cea6723e91c32c648c6ee90247f7e37aeb7
+EBUILD weechat-3.3.ebuild 4272 BLAKE2B e4540d53a1e0f73ffb18e013a308e41fbf70af0ede0569287eb3b25b8fcf228b2bd1ccd61c70bc4325f9044919ea4df990d5008418d4c0518b5bc669fadfd4a8 SHA512 8d6e65d1dd7fef873769ade1296dee98927c9ae7b4003e029f2082d509e0f998a88c5fc50a4044e9ac80d2bf340cc779f6c874c50fe1292929115e5f63acd82c
+EBUILD weechat-9999.ebuild 4275 BLAKE2B a3ee8fb32029caa078f3e6944912bce563458c115b6bf27dc67df67d9543356bc66adf432d3bdcf0c861866344c15c4926ae1df889d2e49379c705b88626cd02 SHA512 f8ff1a1de890f3284dc2c20f31a0e091e77addbe49c6d572d9188a0e429c4964e1f41cabaab05993420572f32a58428669752b037b895863aefc832dc7dd8792
 MISC metadata.xml 985 BLAKE2B dfb7631e6013d342f1622f582aaa6e485cc5964d4558377987599cc3eff2270a085db1c911aff9978decd7e26c96b7a350a95701da460ec93100e88bcd1e3d3a SHA512 fe353b1581b45779f8851de08d5886514d4fddbf6098e42a290f9907aa268c0c0d5fe7f25b0d53a85d951857c00bab8bdea4aa9d912778aa3dc83970b0a5d37c
diff --git a/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch b/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch
deleted file mode 100644
index 6ed16efbd064..000000000000
--- a/net-irc/weechat/files/weechat-3.0-cmake_lua_version.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/cmake/FindLua.cmake
-+++ b/cmake/FindLua.cmake
-@@ -35,5 +35,5 @@
- 
- find_package(PkgConfig)
- if(PKG_CONFIG_FOUND)
--  pkg_search_module(LUA lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
-+  pkg_search_module(LUA lua)
- endif()
diff --git a/net-irc/weechat/weechat-3.1.ebuild b/net-irc/weechat/weechat-3.1.ebuild
deleted file mode 100644
index a5a2514719df..000000000000
--- a/net-irc/weechat/weechat-3.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake lua-single python-single-r1 xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
-LANGS=" cs de es fr it ja pl ru"
-IUSE="doc man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( nls )
-"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-libs/gnutls:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	net-misc/curl[ssl]
-	charset? ( virtual/libiconv )
-	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( ${LUA_DEPS} )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	php? ( >=dev-lang/php-7.0:*[embed] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
-	selinux? ( sec-policy/selinux-irc )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-
-DEPEND="${RDEPEND}
-	test? ( dev-util/cpputest )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
-	man? ( >=dev-ruby/asciidoctor-1.5.4 )
-	nls? ( >=sys-devel/gettext-0.15 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch
-)
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# install only required translations
-	local i
-	for i in ${LANGS} ; do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e "/${i}.po/d" \
-				po/CMakeLists.txt || die
-		fi
-	done
-
-	# install only required documentation ; en always
-	for i in $(grep add_subdirectory doc/CMakeLists.txt \
-			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e '/add_subdirectory('${i}')/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-
-	# install docs in correct directory
-	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# fix linking error on Darwin
-		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
-			cmake/FindPython.cmake || die
-		# allow to find the plugins by default
-		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
-			src/core/wee-config.c || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		-DENABLE_JAVASCRIPT=OFF
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_NCURSES=ON
-		-DENABLE_ALIAS=$(usex alias)
-		-DENABLE_BUFLIST=$(usex buflist)
-		-DENABLE_CHARSET=$(usex charset)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_EXEC=$(usex exec)
-		-DENABLE_FIFO=$(usex fifo)
-		-DENABLE_FSET=$(usex fset)
-		-DENABLE_GUILE=$(usex guile)
-		-DENABLE_IRC=$(usex irc)
-		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_MAN=$(usex man)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_PHP=$(usex php)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RELAY=$(usex relay)
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_SPELL=$(usex spell)
-		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_TRIGGER=$(usex trigger)
-		-DENABLE_XFER=$(usex xfer)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if $(locale -a | grep -iq "en_US\.utf.*8"); then
-		cmake_src_test -V
-	else
-		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
-		die "required locale missing"
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-irc/weechat/weechat-3.2.ebuild b/net-irc/weechat/weechat-3.2.ebuild
deleted file mode 100644
index f9ced9e04ddd..000000000000
--- a/net-irc/weechat/weechat-3.2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake lua-single python-single-r1 xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
-LANGS=" cs de es fr it ja pl ru"
-IUSE="doc man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( nls )
-"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-libs/gnutls:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	net-misc/curl[ssl]
-	charset? ( virtual/libiconv )
-	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( ${LUA_DEPS} )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	php? ( >=dev-lang/php-7.0:*[embed] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
-	selinux? ( sec-policy/selinux-irc )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-
-DEPEND="${RDEPEND}
-	test? ( dev-util/cpputest )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
-	man? ( >=dev-ruby/asciidoctor-1.5.4 )
-	nls? ( >=sys-devel/gettext-0.15 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch
-)
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# install only required translations
-	local i
-	for i in ${LANGS} ; do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e "/${i}.po/d" \
-				po/CMakeLists.txt || die
-		fi
-	done
-
-	# install only required documentation ; en always
-	for i in $(grep add_subdirectory doc/CMakeLists.txt \
-			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e '/add_subdirectory('${i}')/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-
-	# install docs in correct directory
-	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# fix linking error on Darwin
-		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
-			cmake/FindPython.cmake || die
-		# allow to find the plugins by default
-		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
-			src/core/wee-config.c || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		-DENABLE_JAVASCRIPT=OFF
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_NCURSES=ON
-		-DENABLE_ALIAS=$(usex alias)
-		-DENABLE_BUFLIST=$(usex buflist)
-		-DENABLE_CHARSET=$(usex charset)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_EXEC=$(usex exec)
-		-DENABLE_FIFO=$(usex fifo)
-		-DENABLE_FSET=$(usex fset)
-		-DENABLE_GUILE=$(usex guile)
-		-DENABLE_IRC=$(usex irc)
-		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_MAN=$(usex man)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_PHP=$(usex php)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RELAY=$(usex relay)
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_SPELL=$(usex spell)
-		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_TRIGGER=$(usex trigger)
-		-DENABLE_XFER=$(usex xfer)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if $(locale -a | grep -iq "en_US\.utf.*8"); then
-		cmake_src_test -V
-	else
-		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
-		die "required locale missing"
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-irc/weechat/weechat-3.3.ebuild b/net-irc/weechat/weechat-3.3.ebuild
index 48fd4089957f..8db7e46b2ae8 100644
--- a/net-irc/weechat/weechat-3.3.ebuild
+++ b/net-irc/weechat/weechat-3.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
 	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
@@ -48,7 +48,7 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	php? ( >=dev-lang/php-7.0:*[embed] )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
+	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) )
 	selinux? ( sec-policy/selinux-irc )
 	spell? ( app-text/aspell )
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index f9ced9e04ddd..b93780811d94 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -23,7 +23,7 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer"
+PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer"
 # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
 SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
 LANGS=" cs de es fr it ja pl ru"
@@ -48,7 +48,7 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	php? ( >=dev-lang/php-7.0:*[embed] )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
+	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) )
 	selinux? ( sec-policy/selinux-irc )
 	spell? ( app-text/aspell )
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
@@ -66,7 +66,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch
+	"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
 )
 
 DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
@@ -144,6 +144,7 @@ src_configure() {
 		-DENABLE_TCL=$(usex tcl)
 		-DENABLE_TESTS=$(usex test)
 		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_TYPING=$(usex typing)
 		-DENABLE_XFER=$(usex xfer)
 	)
 	cmake_src_configure
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index e7ef528ab0d0..f982ec10072e 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest
index dd74e3ff7c75..4a3e91368209 100644
--- a/net-libs/czmq/Manifest
+++ b/net-libs/czmq/Manifest
@@ -1,4 +1,6 @@
 AUX version.sh 736 BLAKE2B 6f79aba490d6ac467b0f45ae1b3404692c24e897aece8b40f0ba4d6bcd31d980283c6e8f2307bec19d442d45687fad1ca126e50a6443d3eee2ce75b0d9f5c5a8 SHA512 e7c0c49477a7bc8e01bb84a133bef817a5942e8c13db3cbab05f8fd1a5abcbd821dab4016634363b077c869b93becce4ec1431b3e1d28fa969169cf0b9f6051a
 DIST czmq-4.2.0.tar.gz 1522824 BLAKE2B 2b2ec308f37a122d5478f63ed029c5ac01d8da40e676e812ec321e039839c7d364fef3eef67df928e6514f0fd2cd65ae35ba89347ead2b44c610812a012364dd SHA512 a3716efbece193196355fb7055b7e81067d29551765de2533178804ca5d85f98cd8cd01f88b4eecbea905adf3b7513e3b8a7e78e350adf1a6e69edbea5f6260c
+DIST czmq-4.2.1.tar.gz 1617066 BLAKE2B 5b635ccd7e85f05cd4f81f1ddaef80f7478feccfb916b1a7317f539354d0a4dabb7bf14a9dbee4dae3f6fbfcaf402c51ee9ba9810d952fc837c03c14304d4dab SHA512 776c524ffeba3dbe2534351f91623a6f9db31268aa2e794e29b7eca99c9fd0a726de0f7fba4376a5b3d7321b1033314e86644efaa5a9c7226fc1f06805f7aa9f
 EBUILD czmq-4.2.0.ebuild 1167 BLAKE2B 6aeb3a671a4ec525a361ba558848cbe65bab7bc9e831f04a3eb3b2c4470207460f15385e304e2293ad260967ac5ef9fe39a2e943315ef3783fb17d82bfa4f4d8 SHA512 a31dd593f9d2537e71e16320eefcd6785f9338395cb51a30de30b3d9ffdfa41f143174934d0ec794f67f2b06d35ceb10151846dadecd2fdce8dc8a314bf4a99f
-MISC metadata.xml 686 BLAKE2B 55be8f598357ed89149c78c91686b78766f9de76fc3f5594b4241bf9e65aa9d50aab0b0fb24daa5d5fb22423b9596031898f51d92022e0b48f61cd9b02414817 SHA512 4c74eca95f87584a3cedb6b4164249a01e98df7a43f1725a05f566ff1bc144178971f83fff7ee2af530edb7058cc9a1413e7031d18467173edcda02dd06fd855
+EBUILD czmq-4.2.1.ebuild 1241 BLAKE2B 1c12101965f679c95c09b020c20d8a23076e76a685fea160c210b71a44bf3257aa97b5e9917db768f1739f2158e574b1626e230be08d0dd0d8e3d1028e245e05 SHA512 5692e9a199e75224436e632bb8c0ecbea0bd22a59c8112e3b0e36e86e3e74afcb589f6419ee9e7c53b6d669762250ad9a0bbebf621faf412505234cfd31dc6ad
+MISC metadata.xml 786 BLAKE2B 0b02a6b39b849b994c1c1e053b8156795804fcbfaefaaaa74895215f9f3394c131888a561798abafbf3a16f46bfbf00f1609ebeac3c1e5b63b1d25d6616eec09 SHA512 1dc7f022ee9fe463b647a750e13442254b6b9dbc144068401fd76ece667a1c570bca99e0558fb29738c6de68365d87584b7c4aa922e69c1ce47c903116c0fe10
diff --git a/net-libs/czmq/czmq-4.2.1.ebuild b/net-libs/czmq/czmq-4.2.1.ebuild
new file mode 100644
index 000000000000..4811dcd20d22
--- /dev/null
+++ b/net-libs/czmq/czmq-4.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="High-level C Binding for ZeroMQ"
+HOMEPAGE="http://czmq.zeromq.org"
+SRC_URI="https://github.com/zeromq/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+IUSE="curl drafts http-client http-server lz4 nss static-libs systemd +uuid"
+
+BDEPEND="app-text/asciidoc
+	app-text/xmlto
+	virtual/pkgconfig"
+
+RDEPEND=">=net-libs/zeromq-4:=[drafts?]
+	http-client? ( net-misc/curl )
+	http-server? ( net-libs/libmicrohttpd:= )
+	lz4? ( app-arch/lz4:= )
+	nss? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	systemd? ( sys-apps/systemd )
+	uuid? ( sys-apps/util-linux:0 )"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README.md )
+
+src_configure() {
+	local myeconfargs=(
+		--enable-drafts=$(usex drafts)
+		--with-docs=no
+		--with-uuid=$(usex uuid)
+		--with-libcurl=$(usex http-client)
+		--with-libmicrohttpd=$(usex http-server)
+		--with-libsystemd=$(usex systemd)
+		--with-liblz4=$(usex lz4)
+		--with-nss=$(usex nss)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if ! use static-libs ; then
+		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+}
diff --git a/net-libs/czmq/metadata.xml b/net-libs/czmq/metadata.xml
index 25a5bec4901f..bbd0bd05fd80 100644
--- a/net-libs/czmq/metadata.xml
+++ b/net-libs/czmq/metadata.xml
@@ -10,6 +10,7 @@
 		</flag>
 		<flag name="http-client">Build support for HTTP client using <pkg>net-misc/curl</pkg></flag>
 		<flag name="http-server">Build support for HTTP server using <pkg>net-libs/libmicrohttpd</pkg></flag>
+		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for SHA instead of an internal implementation</flag>
 		<flag name="uuid">Enable UUID support using <pkg>sys-apps/util-linux</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 09e26bd435bf..24ffa39ba912 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,4 +1,3 @@
-AUX grpc-1.41.0-link-system-gtest.patch 623 BLAKE2B 5619ee7d605a15baa0a2b362f1083d1d00afe5c9f70808638b29faa04b12efd96377fc6e6c38cc64335ab28adc0964ae4bc6c50f9cc924b0b220f29ceae15619 SHA512 a2ce0b529472d9228e5d6fa7a779c2fed852ce241b38afe682fe20fbec5af659229dcef2e3c250c453438b8ee9bbc5180b3ff14c538182dcc13279727bdf5cf7
 DIST grpc-1.37.1.tar.gz 8212731 BLAKE2B c306fbe60f5191fe957efb35c75574e00b1948777795e7d116a1d0a47238b53e73055e7c173e69afcf97b77e593f55001141bbef8fb09b9787420203d935eb85 SHA512 fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7
 DIST grpc-1.38.1.tar.gz 8294961 BLAKE2B dca22ef4517ad122815522985e0d1c9b35789302056ea896c3ccc1163725835cf1f925b344467185edd6c86a65808bbe8243721834c0fd4f209216109b7c2fe7 SHA512 1f9b6baea4790836d32da6a27ec1491c015d47f2a48ef8732dada0ef45f4dfed412597c8a09dfc0778b16c7300618d42013679094e05cb5922bfae57adedaaa2
 DIST grpc-1.41.0.tar.gz 8347643 BLAKE2B e8c0e32d3cfc75413bfcd0bfbd95a5dc592d11f629e63618619ba307a76a62668c1c21efda45836aef8fb6a1912da0c300f3d4cd41f8b93344fa1768a86df6e6 SHA512 bc353bfd8cc10d8b992e4cf680c656ef6ddbcecbaa640c94e9255664d532926e48f3839afc98ef6278ae4e2eb54d166ac67fec7315dc1d08640845ed8120d902
diff --git a/net-libs/grpc/files/grpc-1.41.0-link-system-gtest.patch b/net-libs/grpc/files/grpc-1.41.0-link-system-gtest.patch
deleted file mode 100644
index 4901678bfd6c..000000000000
--- a/net-libs/grpc/files/grpc-1.41.0-link-system-gtest.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0e8fbdee8b..3662aabdfe 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2309,6 +2309,7 @@ target_include_directories(grpc_test_util
-     ${_gRPC_ZLIB_INCLUDE_DIR}
- )
- target_link_libraries(grpc_test_util
-+    PRIVATE
-   ${_gRPC_ALLTARGETS_LIBRARIES}
-   absl::failure_signal_handler
-   absl::stacktrace
-@@ -2322,7 +2323,8 @@ endif()
- 
- endif()
- if(gRPC_BUILD_TESTS)
--
-+find_package(GTest REQUIRED)
-+target_link_libraries(grpc_test_util PUBLIC GTest::gtest GTest::gmock)
- add_library(grpc_test_util_unsecure
-   test/core/util/cmdline.cc
-   test/core/util/fuzzer_util.cc
diff --git a/net-libs/libhackrf/Manifest b/net-libs/libhackrf/Manifest
index 4f872285c8ae..a97c1ad7a047 100644
--- a/net-libs/libhackrf/Manifest
+++ b/net-libs/libhackrf/Manifest
@@ -1,4 +1,4 @@
 DIST hackrf-2021.03.1.tar.xz 13661964 BLAKE2B 0a00b2d24cc6ac7ca36f66e8f5b3029cfd446a6c5b5427f7d25db6dd191693c1e1c010abd85907813d55c6bd367780c70860b4f7e7f83fb9970d425311893780 SHA512 4a88b877a9f6fee0c8d9496eb265655af4baa678e862ca6147596cd3a1d85dd50315da6531efa54d050847ce5068c4726393b4897d40576888d10a898ad57139
-EBUILD libhackrf-2021.03.1.ebuild 995 BLAKE2B 0208bfdc780b55dddae07348cd34ff9d4f7e4080e3e1494dc894fd4dff858d94b09dfc33e74cac0b8c3965d6dab015b52d0ed7b7407b471f795fd9968fbca7f9 SHA512 f1a49089308790edc0547d870adb9a7c75c7a7017026f3b5501cebd29881a7547bd5721fd0ffec3b41dfadc4efb5173cfcf4ea5e598336754b6c1831eb875281
+EBUILD libhackrf-2021.03.1.ebuild 993 BLAKE2B 3eae69695b801a91c18fb55e235516219f8c2cf69e9f1b0524bf9f8132ddcb9cf9ad7bb017dc175440d1e31708ab14d4325920b9d1cf26b230fe66d706720a16 SHA512 2298ed53c62680d114db9a84845bbe2851b52c37338ee7218e3b6029f256a6906176de4682fa6dfd1c2ca514f9e61629873063140256e885f053684521bf5c9a
 EBUILD libhackrf-9999.ebuild 995 BLAKE2B 0208bfdc780b55dddae07348cd34ff9d4f7e4080e3e1494dc894fd4dff858d94b09dfc33e74cac0b8c3965d6dab015b52d0ed7b7407b471f795fd9968fbca7f9 SHA512 f1a49089308790edc0547d870adb9a7c75c7a7017026f3b5501cebd29881a7547bd5721fd0ffec3b41dfadc4efb5173cfcf4ea5e598336754b6c1831eb875281
 MISC metadata.xml 478 BLAKE2B b9dc4d583a6d8d6f4f495b4c9cf911f127133087f00ebf696be9f603ce3be1e93f5f112dd57fa557602daf67709176ab082cf07f7945cc6abc396fb445da5bc0 SHA512 11196ffe3e3b7a746be9191dc28188b56fa5e1238c26bfb878ee891e3564f7360e7169c469797e199bc77a1b1c1d8ab951891e4830f266ff4d19d71c33b919b2
diff --git a/net-libs/libhackrf/libhackrf-2021.03.1.ebuild b/net-libs/libhackrf/libhackrf-2021.03.1.ebuild
index fd72ef016bea..68fc002026d0 100644
--- a/net-libs/libhackrf/libhackrf-2021.03.1.ebuild
+++ b/net-libs/libhackrf/libhackrf-2021.03.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
 	SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc x86"
 fi
 
 LICENSE="BSD"
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 18c582c0cdc7..959c3fcb440d 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,5 +1,5 @@
 DIST libktorrent-21.04.3.tar.xz 607516 BLAKE2B 5dfea2102fc865d61f2ebf2b1f7045c7ce0f542830f9c7e511d5139f910ff3797a949f85a593a17c56287c3433c086a198f96353a61a4cfc923d96aa30ab4545 SHA512 2c8ee156b0b1e51b96b2670c5fe3f00aa131a34bcebdfdd69898a723fd01a8d2da52a94a1914c13e82b7362a71beaefc03b27eb450dbc84bc43953771bf9b886
 DIST libktorrent-21.08.2.tar.xz 607048 BLAKE2B fe095e15c0b3bb522a9d7b22e03962051b2314696fc25744caa717af60ec0484f112f61213babd72d267420c6074b7c735dedae0d27f48a6ea5b41ed35e9b9b6 SHA512 84d3e59b381d7bbb4515ae4bc989110adf955603a9dbf0970ad47311a4e0c3dc4f20e52752e1d3a33374e46353149da88507014fc096f5643691485b55db3781
 EBUILD libktorrent-21.04.3.ebuild 1437 BLAKE2B 066e9af041e881c1a4e45c69cff5e671eba2f96933dd1d3054f06895a3b662c18baee17407f77ce9136ff7551d50ada8a77b414046a2a9fc9ecb16141e30a883 SHA512 7c6ff4abd4bf4a2baaf131cf10c353f5a78355dd2930e61867341fd9bc5f48ad20f6122604f46f6df26ac83c595e6319f544135807aad5a1acdf5b350eddea09
-EBUILD libktorrent-21.08.2.ebuild 1447 BLAKE2B 9ad0b9676d4ff070eb845987bb1e7f985c51d7e0ea8a691907bd97d40ca20e9f692e8c5b51e4c17d230080b320600d09908575f4b78d081b0433c79d9277c148 SHA512 1865250f93ffc65f966fa79ed8ea048468b165a6316250a698e9b154f3dfc9f3611b29149be5df44bc84e4f5e93dc51cd283bfd72571b3e29b786be133d4e6ec
+EBUILD libktorrent-21.08.2.ebuild 1454 BLAKE2B 53f3c39d69d59d343190475829e4ef5f83a01d2b3a11ac1cbcfb6039ebff664ac43fffcdd2a24051c18d43d9db538de1a7af1d07e967b88b7057224f745a9918 SHA512 7c28bf7a037cbf669c3cc299066bf4fb7966ce615ac0f1bf99afd5d8ff850ef30414ccf5bfae5fefd2f889e44427c0523598ca5d0ab7db7a027ba1d2cc4851a8
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-libs/libktorrent/libktorrent-21.08.2.ebuild b/net-libs/libktorrent/libktorrent-21.08.2.ebuild
index 7c6b14babcfc..29b3a843561b 100644
--- a/net-libs/libktorrent/libktorrent-21.08.2.ebuild
+++ b/net-libs/libktorrent/libktorrent-21.08.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/ktorrent/ https://userbase.kde.org/KTorrent"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index e92663dcf87d..9c06944f128b 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -1,6 +1,7 @@
 AUX libnids-1.24-ldflags.patch 422 BLAKE2B 407953c925cb226aa324e22ee5fa7d68022633b751a94844c8bc29ae0e741775f50eeaed10af06c25c493acae58aa881df4e66de359fcfc2b0e9e28ee55a9e69 SHA512 080a982ee45d69419fb45f8fc35eb53febfc098d24f5c52476933dae1333a11ffe3bffafa5dde302af308840ce17a4ed8fa210a87d6c65e16f78993d23492481
 AUX libnids-1.24-libdir.patch 1614 BLAKE2B 7fd082ee26ba798bdc61049c65b7e7a50118c7eaedc23c5a70a34cf592081ba559e2b03ab4684bef7d6f8bf4c3d640374e516e466721a3e75d7ae540f5e28949 SHA512 de76de95ce3f10e36c15cce31c9743a3caf96445a9d38e7d922710d5d482d9f09e73fccefa75285f200086bd0d2476a4f59a1bbcdfca807ed84873d8726554da
+AUX libnids-1.24-no-inline.patch 1259 BLAKE2B 1ac7190a455e71617df1297f64d718ebb099cc6ad113a27de65f59b6eaf65225999a10dcb6adc524365580dc9662758a7cc452b81951f3b1d4942c29eed87254 SHA512 95e632891a4aea8792ab88f78d3bc2cdae203ad23b86033b829b743071a08ef57ee78256eb2958483d2946a2fa40582a7003c8b5471b5500591373ae789a2a14
 AUX libnids-1.24-static-libs.patch 1018 BLAKE2B 6e3e691ca350233074e662d04b269d710a6d85d51de138072d021f96319ec7a3853dda117075d0eea07e913bf11280d93541848e592f4e0a34656c0ed917e9f1 SHA512 975354be03729c54f33340c7aa8ddd7d6d4f1eba19ee6096433a7e69b90ed84ab20f654ee28877b6db3b7f07cbdf29a20229784f69f1d7d8a29a81128554179e
 DIST libnids-1.24.tar.gz 151021 BLAKE2B ce545a8e3f4b61284ef7f2e6d1ce37aa537adef2686281468b4aaa509479d58073b9f6a5fbb7f03e33fa28ec18c01c8af49e0ce8a2d314ba5da5cbbba0fd7dcc SHA512 2046900023e853d7dbd7061c9f47d8a8ba26320991ca34198249019c1b9a6f75010574f9f022d02976272a384cf769394c4cc3ae536fc6164716cadc4770bb53
-EBUILD libnids-1.24-r7.ebuild 1157 BLAKE2B d85ff2648f8dcada0a038b80b0fb6d590fc8986188d9caa83a059a2fa83327872ae2e36b3bb33be6592ea1a5d7a6d752c4153feec6a1c21121d19333ff83491d SHA512 964d2666d84d2e1a1d591a3080f00bac8db51a1201e42dbc8926d311f23a1d1ae515351fd997c0b8e565f213fd6834ce6f028116767b04e37426fd872cbdd999
+EBUILD libnids-1.24-r8.ebuild 1199 BLAKE2B e961b542b65561c290c50b7760a7a08f2393aaae0a9b1e45b2a00550e005a4e404c2b6bf83c611ed1b5a84f2bbef3505c41df51e63e3e809bb22e333e50a1552 SHA512 693b40bfa675398ef8752ea3b2b1827150d1a89661fa9ff390ceac5e23683dd9700ebf283380abd8a098c2d409b974fbef6ccb3d9570fea0df50979622b63159
 MISC metadata.xml 689 BLAKE2B 427b3b74135ded960a4018145565bf5102432068f16272ee77c222a61a2a2b1c71000c2891e73d108036929ebe371c627cbd4704c21b5e16d14690843b6be67a SHA512 886e1ebf913dfb9e71b97effb737545b8e06dff2780ee92fd90ef86061a06b28f7f3f76eb8ead3bfbef8694184988ca91fd9a6a31ade302d84ac2740d53d98f7
diff --git a/net-libs/libnids/files/libnids-1.24-no-inline.patch b/net-libs/libnids/files/libnids-1.24-no-inline.patch
new file mode 100644
index 000000000000..8a57c6354d3c
--- /dev/null
+++ b/net-libs/libnids/files/libnids-1.24-no-inline.patch
@@ -0,0 +1,43 @@
+https://src.fedoraproject.org/rpms/libnids/raw/rawhide/f/libnids-1.24-inline.patch
+https://bugs.gentoo.org/818517
+
+Patch by Robert Scheck <robert@fedoraproject.org> for libnids <= 1.24 which
+avoids making the functions ip_fast_csum, ip_compute_csum, my_tcp_check and
+my_udp_check inline, see https://github.com/aol/moloch/issues/440 as well.
+
+--- a/src/checksum.c
++++ b/src/checksum.c
+@@ -120,7 +120,7 @@
+   By Jorge Cwik <jorge@laser.satlink.net>, adapted for linux by Arnt
+   Gulbrandsen.
+ */
+-inline u_short ip_fast_csum(u_char * iph, u_int ihl)
++u_short ip_fast_csum(u_char * iph, u_int ihl)
+ {
+   u_int sum;
+   if (dontchksum(((struct ip*)iph)->ip_src.s_addr))
+@@ -191,13 +191,13 @@
+   this routine is used for miscellaneous IP-like checksums, mainly in
+   icmp.c
+ */
+-inline u_short
++u_short
+ ip_compute_csum(u_char * buff, int len)
+ {
+   return (csum_fold(csum_partial(buff, len, 0)));
+ }
+ 
+-inline u_short
++u_short
+ my_tcp_check(struct tcphdr *th, int len, u_int saddr, u_int daddr)
+ {
+   if (dontchksum(saddr))
+@@ -205,7 +205,7 @@
+   return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_TCP,
+ 			   csum_partial((u_char *)th, len, 0));
+ }
+-inline u_short
++u_short
+ my_udp_check(void *u, int len, u_int saddr, u_int daddr)
+ {
+   if (dontchksum(saddr))
diff --git a/net-libs/libnids/libnids-1.24-r7.ebuild b/net-libs/libnids/libnids-1.24-r7.ebuild
deleted file mode 100644
index aec872f32866..000000000000
--- a/net-libs/libnids/libnids-1.24-r7.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
-HOMEPAGE="http://libnids.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.2"
-KEYWORDS="amd64 ppc x86"
-IUSE="+glib +libnet static-libs"
-
-RDEPEND="
-	!net-libs/libnids:1.1
-	net-libs/libpcap
-	glib? ( dev-libs/glib:2 )
-	libnet? ( >=net-libs/libnet-1.1.0-r3 )
-"
-DEPEND="
-	${RDEPEND}
-	glib? ( virtual/pkgconfig )
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-ldflags.patch
-	"${FILESDIR}"/${P}-libdir.patch
-	"${FILESDIR}"/${P}-static-libs.patch
-)
-
-src_prepare() {
-	default
-	eautoconf
-}
-
-src_configure() {
-	tc-export AR
-	append-flags -fno-strict-aliasing
-
-	econf \
-		--enable-shared \
-		$(usex glib '' --disable-libglib) \
-		$(use_enable libnet)
-}
-
-src_compile() {
-	emake shared $(usex static-libs static '')
-}
-
-src_install() {
-	local tgt
-	for tgt in _installshared $(usex static-libs _install ''); do
-		emake install_prefix="${D}" ${tgt}
-	done
-
-	dodoc CHANGES CREDITS MISC README doc/*
-}
diff --git a/net-libs/libnids/libnids-1.24-r8.ebuild b/net-libs/libnids/libnids-1.24-r8.ebuild
new file mode 100644
index 000000000000..a993c8d91295
--- /dev/null
+++ b/net-libs/libnids/libnids-1.24-r8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
+HOMEPAGE="http://libnids.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1.2"
+KEYWORDS="amd64 ppc x86"
+IUSE="+glib +libnet static-libs"
+
+RDEPEND="!net-libs/libnids:1.1
+	net-libs/libpcap
+	glib? ( dev-libs/glib:2 )
+	libnet? ( >=net-libs/libnet-1.1.0-r3 )"
+DEPEND="${RDEPEND}"
+BDEPEND="glib? ( virtual/pkgconfig )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-libdir.patch
+	"${FILESDIR}"/${P}-static-libs.patch
+	"${FILESDIR}"/${P}-no-inline.patch
+)
+
+src_prepare() {
+	default
+	eautoconf
+}
+
+src_configure() {
+	tc-export AR
+
+	append-flags -fno-strict-aliasing
+
+	econf \
+		--enable-shared \
+		$(usex glib '' --disable-libglib) \
+		$(use_enable libnet)
+}
+
+src_compile() {
+	emake shared $(usex static-libs static '')
+}
+
+src_install() {
+	local tgt
+	for tgt in _installshared $(usex static-libs _install ''); do
+		emake install_prefix="${D}" ${tgt}
+	done
+
+	dodoc CHANGES CREDITS MISC README doc/*
+}
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index d511b5fd6b6f..48cb4cb34dbb 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,7 +1,7 @@
 AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a
 DIST libssh2-1.10.0.tar.gz 965044 BLAKE2B 0e6f571cc723e0050bf7ba7492f361ef222547dcbc311019cb6762f01405b4906e0418207a7d484c5170bee5e6f666827a7ea0d0cf233f684f999f896ce0b415 SHA512 e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30
 DIST libssh2-1.9.0_p20200614.tar.gz 482698 BLAKE2B a93c3e61ecba564263e5aa1c10769bd07b5d16def9e6948262e5bbe32d86ae39784b63c608ad4d8a4aa0fcb14c8b55742f90cd2856e043bea5b3d052a31dc871 SHA512 fa34c598149d28b12f5cefbee4816f30a807a1bde89faa3be469f690057cf2ea7dd1a83191b2a2cae3794e307d676efebd7a31d70d9587e42e0926f82a1ae73d
-EBUILD libssh2-1.10.0.ebuild 1322 BLAKE2B f36eddacbf1b356878bb5766631a5f0bf73863b4e62602b1ad27048db191d99bd52d3d184ab6bb0d80d47eb3d3b4d320d157a8e07c58a03adf315b130ce80ca1 SHA512 f862ce07a46e453629e21b47772d3759d85b7532121d3bceebfc9bcc3e5ea621b5eb716988b47f143c1e0c179ab3c4bddaf19436c53db6d5f4e29c49c5c661b9
+EBUILD libssh2-1.10.0.ebuild 1314 BLAKE2B e58d79dd103034825ea7a67bcc69c3ae5b4cba9ec180bbfb00c08e11474bdb8e17619806f81745e777c15264577bd0aa39e82db4b7bef9d08178afd0e792bb4a SHA512 0e2842331b687eaa5086a998d6d110e54f464b47886817c793eacabc232800f3c18cd6661f891d7f81338566b78e4b2ae63253f92a9564206258a99186f65aef
 EBUILD libssh2-1.9.0_p20200614-r1.ebuild 1421 BLAKE2B 37519a216486fb45b11fda8d1d1913bcde8d87161d871a91e3bcab8f5b5d35c1e0c118802de8e0a8d1bfa5bb44d3012661139d6e009d033df844dbc327ba33a8 SHA512 b2fbcc7ef09762597fc637e8a0df46df2b5caca586a5e4f7cdfaa3f0508278e89fa67792a90231c767efe45e8fb1a61ccb6717eb8f6fcfa4299e6862c6fc25e1
 EBUILD libssh2-9999.ebuild 1171 BLAKE2B bf50faa5cc98d82483b1bef3f640d9bd112ecc18e8478477b46ef070fc817646227c0a235d2ab0215fd4f2ef2ae2ec95e6a15eb947664f97a74da2f3f0bc20b6 SHA512 3a79004b8e22ae696db0e47754bd011576ff70b06fc15405b8c8968cec96992b7379bfb4c270cc7fa3c8d221e615633f2a4431319a0e2345d837f0c7b41bc8a3
 MISC metadata.xml 533 BLAKE2B e4c675e12d0d2e906d061b66dd698081dff4560e5e055f2a88c9d77f8502460241e995d6ca6572f4404f20d2bdd3afa26d241756f97c9ef7dd6610c30fa3bac5 SHA512 7cdb591fc1ca9db8428a402a0ca8805ef28589c7af015d59debd7700ca46f2cc0bab8c18e3acaa5cbd773ce4bba1c675376eaf5c5f9be07aa75256864533de2a
diff --git a/net-libs/libssh2/libssh2-1.10.0.ebuild b/net-libs/libssh2/libssh2-1.10.0.ebuild
index 309a9aac8403..ff53c9234667 100644
--- a/net-libs/libssh2/libssh2-1.10.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.libssh2.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 # Tests try to set containers up using docker (and fail for some reason).
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 1896dc784893..75d889111ec9 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,11 +1,7 @@
-DIST mbedtls-2.16.10.tar.gz 2677333 BLAKE2B 5f94003547d5c4ba8daec8270b6e91fea1bbcc94aa7a7417018ec57b8807fbdbd057640fda24cf65171bf7dd872eb091d21e7508df28b57ddfc512736f9c6482 SHA512 13837316b04fab6bebacdd283f437b5f246df0785c866cf3d94019d040ab0edf417e0b409653f5abf98a4944345eb088010658c9de10f9e96a5624d33741898a
 DIST mbedtls-2.16.11.tar.gz 2692209 BLAKE2B 9d7bccfc0d1bc5a038b6dcb866722a27362c229a5f1b515396aabbb53e77cfe36525446fb2557c817772810f24335a51c9a5c45bcfa866d8a07ff4e96498dbde SHA512 b35de49ce596b549b5e85b6affdf2cf1360fb8b0d4e551636a91a4923b1cb212dce7880d575d40c73d5682afe8bb893312d803798ce8f807842a2aab8e2ba2ee
-DIST mbedtls-2.26.0.tar.gz 4080986 BLAKE2B 549f00db4bfbba4a88de0ff76f32140d7421ad3ab58e3cdf08ec40e0a3da5dcc7a1bcb6eb1ce491ebb544dcd15eb6bc634f04e6ab0f773dc89fa44b6843542ad SHA512 959f6dd0759bfd8dcc497a0527b8b9e9975adb9fee01461e6bcc37475cf9e4eae597687e05e077dfe51d0542c81bc3b90e6d9a692353dca331e020e02d642196
 DIST mbedtls-2.27.0.tar.gz 4212185 BLAKE2B 31840e5a518643495f319cac8e0c876bdca5dbdee6524d30cace3538d5fb5ba7847dd653f61f775f5c3c384ac0533afdbf6172b3e523db515eceecc29fadd2da SHA512 9503ef75f08d2574e0800b2e3b6f030461cbd97c74863a20e5688ced7558b0b6f87cbe33cbd003e69c825d0321393fe9b00b0be190ab408138414b99d5102994
 DIST mbedtls-3.0.0.tar.gz 4163127 BLAKE2B 5d94124a251dbcc38de614319f93c6f0346de516fd944c765ab3e60d46fba8fbbdba7a6f9e00f5f0550137301b4de98795851df788e367c4fcf03abb981d3c63 SHA512 be11878d82fc93d0847718514f4887c68d7b186c54682316c4a01082583a917b81f9760bb708aab72bf37148581a8dbc9f7048faf745cd2e1cd7e5bf8c48abad
-EBUILD mbedtls-2.16.10.ebuild 2436 BLAKE2B 0d76524a1be47d488c732ba0a3d4ea76a5eeb915e0f83575ae498fffc5629f2b86e399e3f00ed5418fe14ca2204febcf4a23d2e9a3a5338630b9f67bc027e8cf SHA512 d54f04f7988457506fc2abe03fb8e97b6abb7555c72bc852917e33aa6ece7b291c96cb6dabd5806cd19d5407806279981e660a1ff371b37b94535d7ddfdd99cc
-EBUILD mbedtls-2.16.11.ebuild 2435 BLAKE2B 8389041b06224e6244c8031c8bad2f49cad98026e1105464fd41995afcf267ec6dea95a483b40b1d379fb641399b9cc8bf396f499c7b223e37de6e21e4f3e842 SHA512 1fe3727c58052c3fa007a5e4d1966c6921d2f41e8491b7a0c5f4423e726468bdf5e37067297a4325103e13c45e1d21d855c760134743b1aac66c81b5f92649da
-EBUILD mbedtls-2.26.0.ebuild 2502 BLAKE2B 6f7f727b0466a0d091596f5c187222b095a21fa61d6b70073db7014f17539440781f70e763bf17c5451e832db6795d3289528f1cb9cec53450da120a5b5ffb0b SHA512 ffed411ce59d0476563af7393dd9733d0b44eebc7e232cc6f88b2788af4a98c7511dafb1238874fa941df57ec3de7acede0459353103973ec0ddb03274053c41
-EBUILD mbedtls-2.27.0-r1.ebuild 2503 BLAKE2B ae8f22b9aa45cf427fc35c6c9e8664c8fb661e34a98885ecd7f5388cdeb13b6564c7714df56e6157d56b923cbc8276eeec8030d3cd2c3d50c2ee92d625ad5e96 SHA512 39e9c8221f9cfdb5709a8ad725ae551c73f42ee4e94136e244bf6d1aa0695d4b10859c6f2ca3562b66b821e5af17c69d4f8629389415c1a0a53e423d71b509ba
-EBUILD mbedtls-3.0.0.ebuild 2303 BLAKE2B fc3b11e2295fc79a2368e26c0ef0fa3a05de3e8187be3ee23a8e6ad8375ae0553559d29701bc887130928f057b99fae64bc3b897814636f134d42dbfd87a7b66 SHA512 d54986230f6e43923ef4bbf35d85bc80f65af4542e6f15f7894af0bb505778ed7cacd27a5cda4697868b43473a7572bec69fea9a8f63f73427e2a35641fce3c1
+EBUILD mbedtls-2.16.11.ebuild 2591 BLAKE2B 13fcba2f6e4b3397df3629dd1f302de9730eacaa78f850a527ef4ddd4f6daebfbc01d8b8203b5453da0e820b5b584210197ef89de685e211105f27c04b7e09f6 SHA512 7de94d90b5f9dc757a3570e60cc2971c58f555d1e230ad0767b8c5bc525e6b0723757371756109038078d32114ceae2f7b69eda94c85388a972301e5b2096276
+EBUILD mbedtls-2.27.0-r1.ebuild 2658 BLAKE2B 0f8abad89ee22296b4493419f537ed484065ade24d014061d90c304644286692d1f774149de8c62a7e3634caa4d9060a38d147a808f1a4d0c674d2f5085f513e SHA512 637c754102dc34304984c7c9909089b788fc967a8ea44821e9941de34650e166292c7776964bf2a74e174645389ef87976c111852d0f2346a31c1f5e6a825832
+EBUILD mbedtls-3.0.0.ebuild 2416 BLAKE2B 1f10d91faee5f4d8db8a3dd82da4308e156a280ffd1860764726189212cda26f5d4c8f71abf2de81002c16b5335f39ba5a08605c9eb023668cb25b7b6bb6add1 SHA512 95baf23bb04e80b76c4a394d30712a28dd7575b68aa84730b9293733492dc463b6b3533c620608551828d3c48c39a2b7eccf7832ac4e59afffb06b0b550285fa
 MISC metadata.xml 750 BLAKE2B 9adfb9c0b5ce5ac9b3a56878b7d0d4b0dc883c911b92b00ed772242293b7181b0a43760341ad01d897c2022f507b193145220a8a1c16f0fce8fc64e08486e8a1 SHA512 66092068631e2812b1c3bca713d43ef502ee29a22532a12b204d47f86b3dddc2182c4c41b15200e89ee24f25c976508b602492e9cce02c88dbbb9f35e7aa54a2
diff --git a/net-libs/mbedtls/mbedtls-2.16.10.ebuild b/net-libs/mbedtls/mbedtls-2.16.10.ebuild
deleted file mode 100644
index ce4c7c2ec070..000000000000
--- a/net-libs/mbedtls/mbedtls-2.16.10.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		dev-libs/openssl:0=
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.16.11.ebuild b/net-libs/mbedtls/mbedtls-2.16.11.ebuild
index 3aaf46463bbe..8ddca1907c00 100644
--- a/net-libs/mbedtls/mbedtls-2.16.11.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.11.ebuild
@@ -63,6 +63,13 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
+	# psa isn't ready yet, it might be in 3.x(?) but certainly not
+	# at the moment.
+	# bug #718390
+	local myctestargs=(
+		-E "(psa_crypto|psa_its-suite)"
+	)
+
 	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
 		cmake_src_test
 }
diff --git a/net-libs/mbedtls/mbedtls-2.26.0.ebuild b/net-libs/mbedtls/mbedtls-2.26.0.ebuild
deleted file mode 100644
index 6b1ea5194f12..000000000000
--- a/net-libs/mbedtls/mbedtls-2.26.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/6.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		dev-libs/openssl:0=
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
index 7681b2953ece..fc18e8b6b047 100644
--- a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/7.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
@@ -64,6 +64,13 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
+	# psa isn't ready yet, it might be in 3.x(?) but certainly not
+	# at the moment.
+	# bug #718390
+	local myctestargs=(
+		-E "(psa_crypto|psa_its-suite)"
+	)
+
 	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
 		cmake_src_test
 }
diff --git a/net-libs/mbedtls/mbedtls-3.0.0.ebuild b/net-libs/mbedtls/mbedtls-3.0.0.ebuild
index 41a81c85e7d0..54ef48f6e4fa 100644
--- a/net-libs/mbedtls/mbedtls-3.0.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-3.0.0.ebuild
@@ -60,6 +60,12 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
+	# psa isn't ready yet, even in 3.0.0.
+	# bug #718390
+	local myctestargs=(
+		-E "(psa_crypto|psa_its-suite)"
+	)
+
 	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
 		cmake_src_test
 }
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 76573545919b..193d0e5dfdf8 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,10 +1,8 @@
-DIST nghttp2-1.43.0.tar.xz 3973500 BLAKE2B 0e6c674486c484558a55822501a13ac93c4e890cf62749bc8519690f468912701329b7b9e83b0b68c3f35b72442b1ed47a90050cccd3fc05d79622e1e26634dc SHA512 eac69ba356870a1cba420a06771082897be8dd40a68f4e04223f41f3d22626e4f5b3766d3dbcc496dd212be01f64c3ac280a2ebddd31dd88f7350c20f56e5d39
 DIST nghttp2-1.44.0.tar.xz 3972832 BLAKE2B 13afbf6e2e242f5a7a5475c3d0f0380170cc5f50a0fac87951173393e79cb7140ea52e5f4918a8207216cc5826534d8fa550e48c06ee7c61b74a54f2de23727c SHA512 756b78665ef9fe8765332e7f0b249029d845a6b635c00a27f4c3716a1354f98bcc34df4da74179213497f6bfc2647d3773ecff2b192c63427447e37cf6393f6c
-DIST nghttp2-1.45.0.tar.xz 4023840 BLAKE2B 779fb55110bce0a8c0cd955cf33afb7059f548c0eeb3310f726e82b0e62c5c55bc33f48a9f39296bf63a05854494542405695dff6f0fa6448dadc9421fbedcaf SHA512 e97f5ee9c468083582396bb4772f39cf13db415747c6b4118e6961d7e8da0e5302053884ed39386ad48aa4fcd2452f6e23868164b976b127e105762bb4567038
 DIST nghttp2-1.45.1.tar.xz 4017852 BLAKE2B 17bc5e0a6270494a0296da7f1394d0b89666ca42ad04bcce097740da2b30cdc575f17e681a8320dc2a2161eeebb753f22f228a340fc7cd690fa883d29149bcd8 SHA512 320a8c9f29b58c55df98be4312d415bc406edbdfb0765aa37570cdb472a84f40c4f95a51c44c5488363c16ad6815c75b5503b32e43d94724c54117ff583c7150
-EBUILD nghttp2-1.43.0-r3.ebuild 2010 BLAKE2B d3614234303f1f085350894e881637d18d9802d38b004e2283c6ada601603ae57858a6c00cff18c15fcede1a5debf30671c37531b01fd94ca73f7709238c29ab SHA512 1f278beb4fa0e3dc2b2a709ff05704360d1b21117f41b2e7491f3f31c0268ca0ea4f9ec4f56270443f6f043a7d1fa4dfaeb9e18848a42218b5e1d35bf05a623d
+DIST nghttp2-1.46.0.tar.xz 4024972 BLAKE2B 85fe1259b791ff7cda163265f553e0aac8a10ef6674cf6152d5bc7747c7f4f3bc6e9d9c0472534dd7185f093936efed1b4632da64d426b6a7ac432657e8579a1 SHA512 fcf3573bcc421705190c7cf0e3230f6f3028b669cb2976d29cfeb73e706deaae91ce60d0a615472e3f296454049ea5798f1e8defdd260a98895e94fea6a7a16b
 EBUILD nghttp2-1.44.0-r1.ebuild 2010 BLAKE2B d3614234303f1f085350894e881637d18d9802d38b004e2283c6ada601603ae57858a6c00cff18c15fcede1a5debf30671c37531b01fd94ca73f7709238c29ab SHA512 1f278beb4fa0e3dc2b2a709ff05704360d1b21117f41b2e7491f3f31c0268ca0ea4f9ec4f56270443f6f043a7d1fa4dfaeb9e18848a42218b5e1d35bf05a623d
-EBUILD nghttp2-1.45.0-r1.ebuild 2018 BLAKE2B df4620080f09810ed673e0bb904b1f9f44114274e82c90ab71ec96fc66c39cc4b6ab1f9b8172709d1bf4e1e76b73bbf0bb90c8713e4f85048b4fcd35946d31f1 SHA512 1df9e86a91bb0790d8b721b6303aaf9db113520b4865f11de9d511ee23db60e7a47f821959498ea99f568bfee94ceac6be9986c14bc36576d922c627e2d84e78
-EBUILD nghttp2-1.45.1-r1.ebuild 2018 BLAKE2B df4620080f09810ed673e0bb904b1f9f44114274e82c90ab71ec96fc66c39cc4b6ab1f9b8172709d1bf4e1e76b73bbf0bb90c8713e4f85048b4fcd35946d31f1 SHA512 1df9e86a91bb0790d8b721b6303aaf9db113520b4865f11de9d511ee23db60e7a47f821959498ea99f568bfee94ceac6be9986c14bc36576d922c627e2d84e78
-EBUILD nghttp2-9999.ebuild 1981 BLAKE2B 7ea2358d8340ba890109eb5f0c97005b0c8f14681548f7110c738b68dd234355cd9b40141c1f683382bca17748c97034ebd526e77dc4968722fea8ee215f28e4 SHA512 b614027807d25668bd4d1a1127b7e8bd7c54288d2f618cb1f9ae7dce7cf629c2568ba2702487b0666cd110728e468c8d59cd59d722fb0d558d5d398069606c43
+EBUILD nghttp2-1.45.1-r1.ebuild 2011 BLAKE2B 4ff4e001225911986047a2906febb19c6c80d396d5be6fd00ea3078d5e41af338eda7c445d6650caa02ecd9efe018ad0f54c6713bd0921ee6d6db3ecf0f4d30a SHA512 69aba6818013e13894d3e796a058f43f53658e14619c9873e1fa730b322afca34a26040229d71cf3ecb8a277bacee4a538f0424ed4de3ef03cadb0a64d68893b
+EBUILD nghttp2-1.46.0.ebuild 2026 BLAKE2B 286f6dac885f0b8903c8b3a325cc18481e362ae45a950bb5d274b45e5c55030ec05e98b77810de212a16f979c76233e99c2c8c0438b5c5ee506f17d5cbeb62a4 SHA512 05d32a9cdf1b761d086cdcd545cf6038f819ab0ef8a18743e83ebb8b4b3333f57e68718ed63f1b52fed5a7c02fa94e93fa2db603fb10fa40de1087db16e5d6a8
+EBUILD nghttp2-9999.ebuild 2026 BLAKE2B 286f6dac885f0b8903c8b3a325cc18481e362ae45a950bb5d274b45e5c55030ec05e98b77810de212a16f979c76233e99c2c8c0438b5c5ee506f17d5cbeb62a4 SHA512 05d32a9cdf1b761d086cdcd545cf6038f819ab0ef8a18743e83ebb8b4b3333f57e68718ed63f1b52fed5a7c02fa94e93fa2db603fb10fa40de1087db16e5d6a8
 MISC metadata.xml 493 BLAKE2B daffa7d9a21815507215b560815358be5bdfb984eab2fdc28ae872ce2e7fb4f43339bed4b8426ecd7e09ac8c79a19b33427b8a4de68123bf127e88a3a178a6a2 SHA512 85224aae10478e7a6bb2442d595b0bb750503272f281ef4526d976a620316ef0fb5cc7d1d3ae88fd2da05faab1d67b7d93d1bdbc97195ae5bfdf182bd180cc15
diff --git a/net-libs/nghttp2/nghttp2-1.43.0-r3.ebuild b/net-libs/nghttp2/nghttp2-1.43.0-r3.ebuild
deleted file mode 100644
index f79b1b5a91ea..000000000000
--- a/net-libs/nghttp2/nghttp2-1.43.0-r3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
-
-RESTRICT="!test? ( test )"
-
-SSL_DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5:= )
-	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-python-bindings
-		--disable-werror
-		--without-cython
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/net-libs/nghttp2/nghttp2-1.45.0-r1.ebuild b/net-libs/nghttp2/nghttp2-1.45.0-r1.ebuild
deleted file mode 100644
index 33f0539ba850..000000000000
--- a/net-libs/nghttp2/nghttp2-1.45.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
-
-RESTRICT="!test? ( test )"
-
-SSL_DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5:= )
-	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-python-bindings
-		--disable-werror
-		--without-cython
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild b/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild
index 33f0539ba850..142836527b15 100644
--- a/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-1.46.0.ebuild b/net-libs/nghttp2/nghttp2-1.46.0.ebuild
new file mode 100644
index 000000000000..6d92e5272f14
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.46.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=8
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
+
+RESTRICT="!test? ( test )"
+
+SSL_DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
+	)
+	hpack-tools? ( >=dev-libs/jansson-2.5:= )
+	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-python-bindings
+		--disable-werror
+		--without-cython
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}"/usr -type f -name '*.la' -delete || die
+	fi
+}
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 71186bfd3600..6d92e5272f14 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -3,7 +3,7 @@
 
 # TODO: Add python support.
 
-EAPI=7
+EAPI=8
 
 inherit multilib-minimal
 
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
@@ -71,6 +71,6 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
+		find "${ED}"/usr -type f -name '*.la' -delete || die
 	fi
 }
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 6f17cffc886a..a683b49afb3c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,6 +1,4 @@
 AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f235290225982c98b8aba1fd58836ebd588c1df4465f92eec8adbc12d410928b559dc2e50bf928d3b15f3d63b644d7c3aa59456954a SHA512 f424fcf62c308f47c322a7322189cbdeab0cced46d1855c0727748996fe0253c5ce1e65819142f75b8435b330a7193c11569f4257cd9522d334153c0e58a1edd
-DIST webkitgtk-2.32.3.tar.xz 23323972 BLAKE2B da6f71214935fa13ee4d3214e3c34b636c2894f579539f0de4165e2fa51611cf8f57d40de9e3285a195b7e9f55fb9f5967722e01dcc78f9458b4fb74bc3e7e4a SHA512 473f89c6d56f6718e3e352a023d12188365b67cbe6535025205594729a10d792122275257b81ebe8e504a98814aa4e2a663616ffb13fea445df2b06929d89ebe
 DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b
-EBUILD webkit-gtk-2.32.3.ebuild 9134 BLAKE2B 1493ae541df4cc7f7983f7ce82013a65b64b708e90580ab870d8ccd3033415b7faf6e6e327669e122b18a40eedddc80bd9876d836d32fa2613d7854f657001dd SHA512 66cd69e1ae0258bab69b0c94e00d6562144fb23906d536f019bcab027a26264042c418520371167094109d283c1adc0ecd976936ae9d096078f9784a6b0d5fdc
 EBUILD webkit-gtk-2.32.4.ebuild 9134 BLAKE2B 1493ae541df4cc7f7983f7ce82013a65b64b708e90580ab870d8ccd3033415b7faf6e6e327669e122b18a40eedddc80bd9876d836d32fa2613d7854f657001dd SHA512 66cd69e1ae0258bab69b0c94e00d6562144fb23906d536f019bcab027a26264042c418520371167094109d283c1adc0ecd976936ae9d096078f9784a6b0d5fdc
 MISC metadata.xml 650 BLAKE2B 071251dfaa08b7043a9f689bae707ba831ca1eab0b8fed986507b48dfa14766c450663ffedd25a4fa3ed8570f23cd590b8c3f7ed4a102e3c93ce44ab4a03c247 SHA512 a15c21eb92736520129ddc7be6f39e806ea6bb2361cbad7db95d06fbc64ecc5323a1e8be312575b90ca699670ae4ba95ed062f19cf494473991e0ab2a0a31a8f
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
deleted file mode 100644
index 2dd5eb64206c..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.5.0:1.0
-	>=gui-libs/wpebackend-fdo-1.7.0:1.0
-"
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-60.2:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-unset wpe_depend
-DEPEND="${RDEPEND}"
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_OPENGL_OR_ES=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		# Supported only under ANGLE, see
-		# https://bugs.webkit.org/show_bug.cgi?id=225563
-		# https://bugs.webkit.org/show_bug.cgi?id=224888
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index c2ba77020c00..87062db75bfa 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index 97163393b3de..5a0ab7fc5fed 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -1,6 +1,9 @@
 AUX conf 721 BLAKE2B 976a2936da5e9eef71d9d08f7f12c51151549c23c27918de28da355e87e4927f84cc63904ab0feb0d10a11326ce6e44cc11531d65f6abe3d1ce213ea2e632e24 SHA512 f931acb2e5060872219709b525d64cae630062eb842e55614d57324ff5e801b4b9a99faf47c706ffe67822b29a7fb680ed59db550470afa9ded80621d4bbe3b8
 AUX confd 213 BLAKE2B 2573f19bdc9022357f2f92ff17d84a1e77078c6c05a46a09b6e57ab7132d1f1078fb5003640f83213f746f94e3ab5b482b01d92feb94684665eb4e796a642841 SHA512 6c04de3ef26fd132269532c7bdca3263e95cebf5078ddd57e8ebff62229fabfb64b8ad4d988dfe99c9611c5d1081b4d3862f09d11c08aa1aabc1d5bc7c987439
 AUX init 611 BLAKE2B f84cd718a1ecfe2ed36fb875bde156e6b1700da5ddd115fb841a5d8cae638369238779647c113e1fea50a36069bdb1528917b31ca93b6d8d72686eedd7315c7a SHA512 3fccc3567428e1493daabc0bae87fb769bf7d8d807775ca7d1d3d7e4fdc982b176b3985f8b3b86a1dcbcab001227c685fdba7e08a8a343a2540ee3913412c721
+AUX init-r1 608 BLAKE2B 7d2b93482c62fe0219c7194279ee495274e4b0b8319ccf2d24e7816abe7eb23452bc21c01305283deeb8224c3668641b1bd5a7f3fbf8fe783a28e58268511ace SHA512 4a1ed2c45e1414734b8e5cbb731377da2087bd4f1a1075b4acb81b5057a65c0557e9e1a05cdf6856da35067a589d9c56fcf13156e8872facfc8f161bb3cade0f
 DIST automx2-2021.4.tar.gz 170903 BLAKE2B 9c8e9bc95eeac9a8a59430248d532d540e70a40c4d61f006d5d2649198e856e4b404ed75df745cfb06887c58049a9a233a597059e2f2971bf9f1c8ce65a34f3d SHA512 f306bfdca10dc884bef404e5ff24181dc9adfb8514fd0e0d984bac84ca4996f0978eda7161be46f1b3d93a9c0e61aaabdfb4b2886012570a51ad0aaf2286dd2c
+DIST automx2-2021.5.tar.gz 172317 BLAKE2B 501dea5561d780fed538676e41dac46da01bae24388f477afa66e1b27e8a271e48bd6bddc8f9a4e0f5e7b3eb9f58fca9a9b2adaf78de2f7cd2feacfc8f85c9a4 SHA512 00281f32df6b117690d9780b8a587907518e2485dc37450765c3f35acb92a27da73ecd4e35cd05e0a5307d179ba3edaa1dec80900a059c975589ae904456c565
 EBUILD automx2-2021.4.ebuild 1201 BLAKE2B 757048d7aae1e660219a7ad146e258d6d59138cc71d15ddf63395f305468e3c943e2c9818d3577efa957b163beffdab8f1d16fcfcb267bc53bc83cc6687f60c5 SHA512 2c91a5c291483e62bd7e1e9ce1e67f66aaab37491313cd1f56aff426d7340b280799cbb221df2266125cbdd21685e86724d663542822fe6b659206da46b401e2
+EBUILD automx2-2021.5.ebuild 1155 BLAKE2B 5b9dc245ea033a3d7d2d29c5e09c299dd8f95bcca7cdc8287c465ee15027c00066a7e0cc49e87dd45639bf2d929e748aeabc0cddb040d1583326bb4f21b7e661 SHA512 252be12596b4616b2476f7876f0b46f7e32d95b98e8265d5d9024bd922eb3d2a1eaace554e3a1d318aa3ef44f59dcf171bf4a90d942269d45665d5fed86d392b
 MISC metadata.xml 918 BLAKE2B 8f693feed959a0394e8be4a0f489c4913e142aaec8e71920fc0ace1e3ef1f8b5c79a312139bca612c3d204854f6e222252b25b1343539829f3950d1ae344483c SHA512 77e8f20c9af068189d12ba06ac566d03f8b86435b3c88682c6819975fc0636e4e427ab07b76db9d0e32a5b51b7861715c60209f6ee5ae0d4fb0a19a53c4b98a0
diff --git a/net-mail/automx2/automx2-2021.5.ebuild b/net-mail/automx2/automx2-2021.5.ebuild
new file mode 100644
index 000000000000..053aba45a4d9
--- /dev/null
+++ b/net-mail/automx2/automx2-2021.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Email client autoconfiguration service"
+HOMEPAGE="https://automx.org/"
+SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="acct-user/automx2"
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-migrate[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/ldap3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	sed -i -e "/('scripts'/d" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	export AUTOMX2_CONF="tests/unittest.conf"
+	${EPYTHON} -m unittest discover tests/ || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( ${S}/docs/*.adoc ${S}/contrib/*sample.conf )
+	local HTML_DOCS=( ${S}/docs/*.{html,svg} )
+	newconfd "${FILESDIR}/confd" "${PN}"
+	newinitd "${FILESDIR}/init-r1" "${PN}"
+	insinto /etc
+	newins "${FILESDIR}/conf" "${PN}.conf"
+	distutils-r1_python_install_all
+}
diff --git a/net-mail/automx2/files/init-r1 b/net-mail/automx2/files/init-r1
new file mode 100644
index 000000000000..56878e8ca379
--- /dev/null
+++ b/net-mail/automx2/files/init-r1
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${AUTOMX2_CONF:="/etc/${RC_SVCNAME}.conf"}
+: ${AUTOMX2_USER:="automx2"}
+: ${AUTOMX2_ARGS:="--port 4243"}
+
+command="/usr/bin/python"
+command_args="/usr/bin/flask run ${AUTOMX2_ARGS}"
+command_background="true"
+command_user="${AUTOMX2_USER}"
+pidfile="/run/${RC_SVCNAME}.pid"
+required_files="${AUTOMX2_CONF}"
+
+depend() {
+	use logger net
+	before nginx
+}
+
+start_pre() {
+	export AUTOMX2_CONF
+	export EPYTHON="python"
+	export FLASK_APP="automx2.server:app"
+	export FLASK_ENV="production"
+}
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 52d4ad920b88..9e66e68be95d 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -14,5 +14,5 @@ EBUILD cyrus-imapd-3.0.13-r3.ebuild 6066 BLAKE2B b2cfa376a54a4887ecf91a93f94139f
 EBUILD cyrus-imapd-3.0.14-r3.ebuild 6027 BLAKE2B 60f6bd7e02f8ab0edae948c5312e1a18cb1c0b57d026f9280061821173fbf2a4268f558b0d07953210fc051bde5d1d36dac770bd2c817978946a8572e0ef81ef SHA512 539e6596d182291897c5ded61a233b5f308758c8ba2dd5e4ad1fa35cc30bea15d69869148ffafbada3f8da7193ea1b05f11d81107e7bdc0f25dad4ee508fcaaf
 EBUILD cyrus-imapd-3.0.15-r3.ebuild 6013 BLAKE2B cf79eaae8908beae050bad456db821a41930b9dcce2d65934c248dcb0323e53a5088922185c654cb44e411e41465eb9ad3572314bb8e8c1af192aced1dfa40ec SHA512 e104cf0720a00588f4a244d52d918b3bad1b7138b0d707900882be46c6ef96c78c743b0922abec470a92152d7fe2b8db2fef2a4fa6bd38bff3e6f56cf4bf2a16
 EBUILD cyrus-imapd-3.0.16-r1.ebuild 6013 BLAKE2B cf79eaae8908beae050bad456db821a41930b9dcce2d65934c248dcb0323e53a5088922185c654cb44e411e41465eb9ad3572314bb8e8c1af192aced1dfa40ec SHA512 e104cf0720a00588f4a244d52d918b3bad1b7138b0d707900882be46c6ef96c78c743b0922abec470a92152d7fe2b8db2fef2a4fa6bd38bff3e6f56cf4bf2a16
-EBUILD cyrus-imapd-3.4.2-r1.ebuild 5953 BLAKE2B 18b097df3d03ee087538f1259f57273b7411f31eb533f4af4ba379eec74d01eb280f4b8273a83ebb795cd45acc0fb630d1e0ce7a4098d33cba4c2661ad910b73 SHA512 9bb22987fd209fe739b43a5370a54b4af6242cad3ac2c3cc16bf2f402d0216daab114fdea640ea6a9a127a13fbdedf385bf0f53cccbc564d135cd3f870b2dced
+EBUILD cyrus-imapd-3.4.2-r1.ebuild 5963 BLAKE2B f83308c2130f8aafd106cae53a8a078b7538c9aac0ac9729026b51afde2bfa2581c60c2b2284134dac5aadbabddc907019010ea119ce40afad82a79c123ce795 SHA512 da95de2fa59db1adad3a1782355820afabb259b170833be9882cde5df2baa1c7a491f9c75ea8cf8801942cb525c94ac9daf5b61a037daf7f524784a14818bf24
 MISC metadata.xml 756 BLAKE2B e67e371c0daf545e354680a35bbfda109d5bac966c75d048f3fef045def983410926fb02bd9f36906251b32696cba41733969912c0d5a5496717de0626fd10ae SHA512 0e558ce2562227134bb7c5ebc95b44b353b2e4361744366862708ff8942a1cddffb931d58811fa6c511b7057a083e05c47c76453ba3dfba89d77ba8db0402b7b
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
index 314a790e39a4..3c1ae3f5e26a 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
@@ -114,7 +114,6 @@ src_configure() {
 	# - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
 	# - post-emerge message re lmdb removal?
 	econf \
-		--enable-unit-tests \
 		--enable-murder \
 		--enable-idled \
 		--enable-autocreate \
@@ -149,6 +148,7 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_with tcpd libwrap) \
 		$(use_enable xapian) \
+		$(use_enable test unit-tests) \
 		${myconf}
 }
 
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index c1095c804c8e..8f13d0e656db 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,10 +1,6 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
-DIST mu-1.6.1.tar.xz 866044 BLAKE2B ed6464e2ef63d37c42783235a0537cd20c7442333d4a6b59af0d257db8e3e6d85db7106ae2f89aa5f1536e50afadd40c89a8215a288080130d14e3ceb79b1638 SHA512 d894f302cabef86ff6b1d85eb945b2aca27729eaa6558598076c8f065d584592d5e601fe6a6045cea9b8a1466320c838f995ffdfd564447683538a5e48f8d7b0
-DIST mu-1.6.3.tar.xz 867224 BLAKE2B dffe67df4731028fa5e77d62d32fb787639b25d43a48aaac0c0e446c14cd3c5f79ad5559968446603782f1a7df9c129b2c3e1c3576e01d162a59693a2abd960e SHA512 73bfc85561cbc31d8c8ba6043ad79b7c17ac33edbbfcb3f09d460b291454c7696b282ee98c7738e05a9842963169c3f87eff56c3f6729cb22cdb6136ae8b95e3
-DIST mu-1.6.5.tar.xz 867240 BLAKE2B d3e8ad88b38f1329e4a5716f981c97e62c2042835e81910dab02b1219abfc670fe84a68f992fd08dce282a3288aaa91a465ce881f79e7ece917ba089c2ad0348 SHA512 b25203d281fa43b22abacb442caa56d797489d32bfc1dde874d23035510cbc8fb331b45574ea74d4a01e4af0a706c1a84656d8b8d6e60f518b2ea75fa27361ea
 DIST mu-1.6.6.tar.xz 866724 BLAKE2B 3417d4b3e5bfae943558fbc936ca0207be912f9548621b1599437484e94f3b49271aa1e97e7cc2b5b6027b8e0cf97d3b96d2052772f7783d897b4fa0dcf03184 SHA512 07daf9864bfd1ff4278aee98a0ae9c4fc3be94468e3b2022ae801f048f339b5becdb9ad8ebb2e12b9131e0e6dfcfb541bdca8288657dc19d47b0e510831f54eb
-EBUILD mu-1.6.1.ebuild 1389 BLAKE2B ffaaa365678a15bb5c7bd38e1a0026175af64402ebdd8dfcf6912042999d9939091c0b76a071dfd174bb886e9c028e2d571fa1ee7933ce6b45b91358faad4a2a SHA512 3a1cb5891cb864503718de657b0d9a3078c25678955a59b9181c068459cfa045aaa973442e2bc33e75f8ea0a36c8206f58926e31f0c834d5a70f4c387a5532a3
-EBUILD mu-1.6.3.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
-EBUILD mu-1.6.5.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
-EBUILD mu-1.6.6.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
-MISC metadata.xml 926 BLAKE2B 14f872d6b63bbb9547b44759bca864546e040ebe1e4a9b8d3bc827e39251a1166cf893aa80926ff33949d9039f755cb9a68075ab1efbca820bbacce5972a8818 SHA512 bd0b0fe8182aefb2a8feb9dde074aa4d8b5a700914e318a9982cf696a72ff38e5ca8d9c8b600f31d3ff618fc5a87cd7a964d0dc55ef5d082bbee23040e69d0af
+DIST mu-1.6.7.tar.xz 867136 BLAKE2B 12b19d15c01a7101e3a936b12ee87fa5519c0e047e354f2fd1d481939dd5dffa34a94a5e7f3fda20e27771377e78524065cf5f93f7a2f818e202cdc93090ebff SHA512 ceae7b4508fc607dcda0fc20e9fb92b3533b1ba7ef94823cba2cd3a6ad3f18ccd3d2ea7da20e4c190e53f2d00ccdd3e1d25e12b89a08bf5233f5656be90b3c14
+EBUILD mu-1.6.6.ebuild 1362 BLAKE2B ca704ccd04361f92723d13c12a9a97f744ad2715f79a406b1dd40848984a7ff256aa73f9e8c8656c7ca67b51a7a699ccce366ff0c2e5dc9a6cbbc57dce27219a SHA512 05b1a606d2821b1cfbd65e3c6377e30d82ae1d6878e276685d70e7b76d80183d14292d6131c3e28d4f1a4f59c80234bc1e41cb5092dfcdceb1e88c243047c7a5
+EBUILD mu-1.6.7.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
+MISC metadata.xml 853 BLAKE2B 3439781265eac626261d1717e8ebf8a34a9263b4eaabd37f3a886d1c563c2ae539051741c84b47e8621dfe4513e5213248ba8bcac35dc846bb8676ef5b7239a3 SHA512 4f602ca074a2456393de9394a66de51000351022ef3ad19dd0a2e95d00b70c538f9d96042a979e9e7f714ea9441ca3c52503a4018b15534e0abf1d8a55c7534e
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index 9bbd2af15171..a47ba60ed555 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -15,7 +15,6 @@
 	</longdescription>
 	<use>
 		<flag name="emacs">Install the mu4e mail client</flag>
-		<flag name="mug">Install the mug toy client, not for normal use</flag>
 	</use>
 	<upstream>
 		<remote-id type="google-code">mu0</remote-id>
diff --git a/net-mail/mu/mu-1.6.1.ebuild b/net-mail/mu/mu-1.6.1.ebuild
deleted file mode 100644
index 6724af7d5012..000000000000
--- a/net-mail/mu/mu-1.6.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
-IUSE="emacs guile mug"
-
-DEPEND="
-	dev-libs/glib:2=
-	dev-libs/gmime:3.0=
-	>=dev-libs/xapian-1.4:=
-	sys-libs/readline
-	emacs? ( >=app-editors/emacs-25.3:* )
-	guile? ( >=dev-scheme/guile-2.2:* )
-	mug? (
-		net-libs/webkit-gtk:4=
-		x11-libs/gtk+:3=
-	)"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable emacs mu4e)
-		$(use_enable mug gtk)
-		$(use_enable mug webkit)
-		$(use_enable guile)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.6.5.ebuild b/net-mail/mu/mu-1.6.5.ebuild
deleted file mode 100644
index 94eaeb52fa23..000000000000
--- a/net-mail/mu/mu-1.6.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="emacs guile readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	guile? ( >=dev-scheme/guile-2.2:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable emacs mu4e)
-		$(use_enable guile)
-		$(use_enable readline)
-		--disable-gtk
-		--disable-webkit
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.6.6.ebuild b/net-mail/mu/mu-1.6.6.ebuild
index 94eaeb52fa23..d61ad8bf9f92 100644
--- a/net-mail/mu/mu-1.6.6.ebuild
+++ b/net-mail/mu/mu-1.6.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
 IUSE="emacs guile readline"
 
 DEPEND="
diff --git a/net-mail/mu/mu-1.6.3.ebuild b/net-mail/mu/mu-1.6.7.ebuild
index 94eaeb52fa23..94eaeb52fa23 100644
--- a/net-mail/mu/mu-1.6.3.ebuild
+++ b/net-mail/mu/mu-1.6.7.ebuild
diff --git a/net-mail/onionrouter/Manifest b/net-mail/onionrouter/Manifest
index e0b5be9a2306..42a3d49b26d4 100644
--- a/net-mail/onionrouter/Manifest
+++ b/net-mail/onionrouter/Manifest
@@ -1,5 +1,5 @@
 AUX onionrouter.service 462 BLAKE2B 83f048d1111167fd99ff2a3bfd791ac8435c01f9a262320ab260bf11d5b66b06453d2b4ea3176bfb6991f34c0d47bfeb5ccfcaafa21063aa4de7aeb0739d1c98 SHA512 8d84a028869a92f746b93eaa5ff6e1544a731893c96f223a67cd9fef8d15c00ba9922a6633e3e2d9cc094f722ccf7a3133ce923ef0b3478bf4e9d2d7d327ae11
-DIST onionrouter-0.6.1.tar.gz 26584 BLAKE2B e1d722ba4e7ec617e39fda54299cd71d9d47bbd34fd44a19ffef8f2349f9b238251b47d01c369223393a9d7f2e0a05c5d8b7dc9f991c7d386ba800086b8cc226 SHA512 5d08e7a7310e69e29eaba2098a62cef4b5044c207f4a78b4cfebfd2a9d18bd812b485793ff7395186d4949ad9604b4e82dc0e9b1200abf03108466bf531a6d15
-EBUILD onionrouter-0.6.1.ebuild 1162 BLAKE2B 14195482f1a67442979a5cc7daa6f513b3a3deb2a3801d6664f464793b28a04f64f991cfde7fe2405fd28e484f81814fb0ed742070028cf61e4a4f3a74287a6e SHA512 01b96089281280ef29c27f0a40d52ccb6f07dc707741e0b041b50533a3f636254bf6ba04e2b62f7404d9c2ab88377b3f428cb587ffd40bb0a783ec8af5534cab
-EBUILD onionrouter-9999.ebuild 1162 BLAKE2B 14195482f1a67442979a5cc7daa6f513b3a3deb2a3801d6664f464793b28a04f64f991cfde7fe2405fd28e484f81814fb0ed742070028cf61e4a4f3a74287a6e SHA512 01b96089281280ef29c27f0a40d52ccb6f07dc707741e0b041b50533a3f636254bf6ba04e2b62f7404d9c2ab88377b3f428cb587ffd40bb0a783ec8af5534cab
+DIST onionrouter-0.6.2.tar.gz 27920 BLAKE2B e9158fe7e066968d9569fb84085a85300774f6b2a2f070216755a3444c6a0352da847a7a383bed4cd792083c1fc8d71039c2c7b3e4c0c21aeca6bcb0c440de44 SHA512 4d5db2f856d6a52dfd43b7d3fea4317a1238ba6410c1da953e1cb59519ef8c18e3b73f676beff9612a853030762570f386dca24a7d7be4add23493e0b344535e
+EBUILD onionrouter-0.6.2.ebuild 1165 BLAKE2B be0203a11cd994b48b4752234e95499aea773b73d8fc0e3568730bcb73061cc0fe094b79088807fc423c13d0622dd28926226f3575ead7077fe27f0a89efe677 SHA512 0413e5b71c394bb57437ac80ca63f52688c9d28b3e20f1a1791e8d4556443ad17c80fdec33e1940f6f7ad3a7cf78be99a14f1b97b619c386e03499ac08b03a3d
+EBUILD onionrouter-9999.ebuild 1165 BLAKE2B be0203a11cd994b48b4752234e95499aea773b73d8fc0e3568730bcb73061cc0fe094b79088807fc423c13d0622dd28926226f3575ead7077fe27f0a89efe677 SHA512 0413e5b71c394bb57437ac80ca63f52688c9d28b3e20f1a1791e8d4556443ad17c80fdec33e1940f6f7ad3a7cf78be99a14f1b97b619c386e03499ac08b03a3d
 MISC metadata.xml 384 BLAKE2B cc0cd420628df9badff886104cd30a8a4a249aae3e1bc1de0570fec33f58c799e666b9aa6667245fca89e34142b08165e03df62aedae88c938e4b2aec89ffba7 SHA512 984030a405735e43032ea9205ea5f0eaf6a0ef52d48c6b3b61ba1fa29883cb4b3f6393e18d80b19c999ee171737a42066451e26a65b7b62f4479d2a3c7bd3951
diff --git a/net-mail/onionrouter/onionrouter-0.6.1.ebuild b/net-mail/onionrouter/onionrouter-0.6.1.ebuild
deleted file mode 100644
index 2efd032bc84b..000000000000
--- a/net-mail/onionrouter/onionrouter-0.6.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 systemd
-
-DESCRIPTION=".onion discovery via SRV DNS lookups for use with postfix"
-HOMEPAGE="https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/ehloonion/onionrouter.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://pypi.io/packages/source/${PN::1}/${PN}/${P}.tar.gz"
-fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="$(python_gen_cond_dep '
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-')"
-BDEPEND="$(python_gen_cond_dep '
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-')"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	insinto /etc/onionrouter
-	doins "${S}/onionrouter/configs/onionrouter.ini"
-}
diff --git a/net-mail/onionrouter/onionrouter-0.6.2.ebuild b/net-mail/onionrouter/onionrouter-0.6.2.ebuild
new file mode 100644
index 000000000000..396599972a75
--- /dev/null
+++ b/net-mail/onionrouter/onionrouter-0.6.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 systemd
+
+DESCRIPTION=".onion discovery via SRV DNS lookups for use with postfix"
+HOMEPAGE="https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/ehloonion/onionrouter.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://pypi.io/packages/source/${PN::1}/${PN}/${P}.tar.gz"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="$(python_gen_cond_dep '
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+')"
+BDEPEND="$(python_gen_cond_dep '
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+')"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	insinto /etc/onionrouter
+	doins "${S}/onionrouter/configs/onionrouter.ini"
+}
diff --git a/net-mail/onionrouter/onionrouter-9999.ebuild b/net-mail/onionrouter/onionrouter-9999.ebuild
index 2efd032bc84b..396599972a75 100644
--- a/net-mail/onionrouter/onionrouter-9999.ebuild
+++ b/net-mail/onionrouter/onionrouter-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 146e56331b49..cb77a35b3be3 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -4,6 +4,6 @@ DIST rss2email-3.13.1.tar.gz 159108 BLAKE2B 4651765d97f4b5c35559511765e7f1697f9f
 DIST rss2email-3.13.tar.gz 157303 BLAKE2B 907d8f11af6c547287fcaf3fa6063850a98b560db112a047a1c860f82d818b08d4eebc174da8d83ed73673cf5c0105ab7fb7b8fd13c27280535de13f85d843f8 SHA512 548919d11762e751c2ae7ab84135aa8571104a616f0e516faf8bd9c340777972273e6642a91180387d0125300c89d6212a9da7b901f15b430f7b58284d896e98
 EBUILD rss2email-3.12.2-r1.ebuild 769 BLAKE2B 89df0b5714085967eed8d19ff839f12ee764ada6d8d96d1399dc17621ae8c29a6b326fab67ff38ccc0e226ee81c8b276d722aacc9bf7dfa86f590298af8116a2 SHA512 b45fe99e4c1ccfbcb6dddb4fe96764653449a8a2c2df652821770541110954afb76b4e69cef0e75f6d1617f7682eba25554e9a62c071e868d8c80422678cd870
 EBUILD rss2email-3.12.3.ebuild 732 BLAKE2B f7e222d4ec1264c9f6d347067f82b8894a44de914949cae3e7f3f67ea21770222fc873892dfad4353fefda33bd5a43f3f0f23580f17f430cf2369ff07312016f SHA512 097694250cebd769d4139d48804558fadbe2da633c22403b03f1b34355b19b75e34e09ed6ad09dac10b7abb7c7443c387a41283864299fd150aeeb80e27edbfb
-EBUILD rss2email-3.13.1.ebuild 764 BLAKE2B 3ab540f84331d05eedd7d83a883e1cf397d945ee612ba9e3d4cda075841f908224a167106559fb0f3b7c141f5a579ecc6b67a961232e78dcc6b52354d575820c SHA512 ce3a9532055e1cb9488a916caf548b58179a61f77404495b5e73d30ee718c7c17a0dd1e67288fc93e6c1a9ae30ff67a5b9a0dd15b690d1b48449fcfd4eb4d908
+EBUILD rss2email-3.13.1.ebuild 762 BLAKE2B 8795bc26445e81d6dfda3f87bd1d27a6b8dc21cd11d57f475d7f7d04287fe2ad642f2e9cf6ed2b00b7f050387e3e6f57a0b95409a45513c433ab42bdcb52cce6 SHA512 930f9197b7ebaf5cc9c76815075b1192a63a6cfbe6b121f88e4ddb8fff284885098e586aa76068b32eb83b8588471eab4677063b509fab0f4d4fc111228fc16b
 EBUILD rss2email-3.13.ebuild 876 BLAKE2B 177963d767cd34d9972435b2f30fa0b396709064a5c45ba354a315d08d9538ada18e4e2d1843345b98474135e20149f1fe36bbf546d4922cfd42e99e27b99bc3 SHA512 5ba0bd61956e96c7c52b5dcd4eb3ccac311a381af6827bdc1222c58e5a116251763450f050bab8bd7aea077ce78746a77ada1f3491424cdffc4af4ce93f1dc14
 MISC metadata.xml 460 BLAKE2B d6c729983475469d59109d1975ef8cb0bc7f07a4d3b55e03828682246d0140b31b019b3b614a6104acff8f78049cf86a6474dbd2465808f585ab193456915d61 SHA512 aa01aa301922fe3ad7c526a9cf7cd71edf4f86ee5d699a686549468c09c613afac1935ecb646a7bf55e5994ef04fe0c5d96aa5d384dc020bf401e28e47b1cf9c
diff --git a/net-mail/rss2email/rss2email-3.13.1.ebuild b/net-mail/rss2email/rss2email-3.13.1.ebuild
index 0f911616e722..6df1cca3885f 100644
--- a/net-mail/rss2email/rss2email-3.13.1.ebuild
+++ b/net-mail/rss2email/rss2email-3.13.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=dev-python/feedparser-6.0.5[${PYTHON_USEDEP}]
 	>=dev-python/html2text-2020.1.16[${PYTHON_USEDEP}]
diff --git a/net-mail/ytnef/Manifest b/net-mail/ytnef/Manifest
index ad5803593382..b6c198afc991 100644
--- a/net-mail/ytnef/Manifest
+++ b/net-mail/ytnef/Manifest
@@ -1,5 +1,5 @@
 DIST ytnef-1.9.3.tar.gz 301338 BLAKE2B 2a70453225c1c6acaa4a73f0d50e9be3076e0fd1e8dcf79029fe6f23dacbd94046b88d62e561c24914d44121eefbc968523c02302d2d5c6eb95ab68d2620560c SHA512 be0a46e79561a5ff34f812b892a781809606cc7e38c6bfed15bae7773f952b4b55aed0fa784922e72839121672c540496db1bac602630c5a83141f8517a4a543
 DIST ytnef-2.0.tar.gz 301906 BLAKE2B 3d42cf3bfc311a8d227424939cdb1e7b37a038314655b24ce54e26fbc0e5a0a7aa9fad0d4592297a5c521d3957c753b492e9724edb06c449d654faf68c7f43e7 SHA512 9ceba15a774f552911779859b7de11baddb7f980b0e8751c02a0c27275fa5624a4d4d24177bb4edba243acf3a9c5b89ddbbed1e759a330794bed8b2da63ffeb6
 EBUILD ytnef-1.9.3.ebuild 656 BLAKE2B 42b30acd8f24496c334f32464cabdd6e1c27e98139a5f099d299949529ee3964fc580de113676461cb7c46dbd3e8faf1bb4194ff42d7c3e3ccc5fc184a7b88e7 SHA512 78888fd6143639cd63b63921d29cef8ab61e48db330c0722ad1f703475238d189560368466d71528991074ee216016b63037371fc47df5e3efb25fa0c08ece5d
-EBUILD ytnef-2.0.ebuild 669 BLAKE2B 6632a7126dca4f06f886f0283010d4b5eb6c9da137bc6a78f0a72ff4ff77bb6b2943f6b8accc93d04287c2ef9929b4357adf147ccd6d344e2fbaaf2f02a28b14 SHA512 da099c5bcc73aab8a06bd4936e810cab33a5b3758317e2eff824fdfdaf16d2453b3847b05b72eebb6375969f501326da3f3cff3f774071b09168c10365d0135a
+EBUILD ytnef-2.0.ebuild 663 BLAKE2B b729093667e91ccc8b48f5ee4645b90280ddd256ab32495418f1f47a27ce05e3201b60d619aac79601323be945e7d73dfa3e72a53ca48ac049096dc259d83ffb SHA512 601f592a1c9ed61093841032ee11371af9f52154aa7b48b172374bee8fa03054ac2532e12820ee567e17449ae9639b9b310cf0bd55e0242150c15dde34fe0186
 MISC metadata.xml 339 BLAKE2B 79e43f2b239bfac12ef7299f3b3ff7acd72d6b07eb96f3639e47d3ade39b166501d85740a23a3fb022e3b4b3d3854fc5f6262aad893864f94cd8250c07c6243d SHA512 4af83ab6ff0de7bfdb54c14098fd328855c6b0d433e827c6c17e4f49c8a6bb31c0643752844d8988b36fb8b4f500f9c51af573128ecc894d1938c3fe4674f40b
diff --git a/net-mail/ytnef/ytnef-2.0.ebuild b/net-mail/ytnef/ytnef-2.0.ebuild
index 46b675827984..102dea01756b 100644
--- a/net-mail/ytnef/ytnef-2.0.ebuild
+++ b/net-mail/ytnef/ytnef-2.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/Yeraze/ytnef"
 SRC_URI="https://github.com/Yeraze/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 973e4fa8263a..77593519123c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index fcae62c89e84..144e4c0a7f69 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,5 +1,3 @@
-DIST aria2-1.35.0.tar.xz 1534460 BLAKE2B fc207ad0054e211b79ee1c6302c6bf83d0638fd5659d19dbd63d7cfb31101feb7d1a661b989ec42552c9a5c072dd660d2f7203063c3c1e14f53d5ce4c5a3c317 SHA512 82b49cecd61064ae33b4a422a2320d533f54afea8fab0f014072a46afdc05972d2e9c603e843960c097410adf87290df65849f4ee05e047403618ae50db151ef
 DIST aria2-1.36.0.tar.xz 1619036 BLAKE2B 7894ec705f6fefdbc6c4844efa8a645b3e7674e36d04535ac96b9daf5098a453d047109bad0db16e6fd656f63a3ec0bab5746e8ba7d549149e2364395a94399f SHA512 8203dbb75274455a78c50dd4f894e631de6931ac889f26896dceed78ec38c98cdbcf07e164744f308f2bfffeae1016beec1bfdbe8cad7f3280d11376aa0c2542
-EBUILD aria2-1.35.0.ebuild 5074 BLAKE2B 775f7d972e19016a586fda1f381803908d7f6ba0ab9631b0521653a92171c5e39b427f83f008c50dd33302920aab53aa0aa1e4417991248ff66a3889d0c5b8a2 SHA512 c94f8e082089352bc4bd3a331e485aa8776ec623f31ad29f22726f645c014bed2271ae870df9621e6fce036f0362f021c7c1ddfecf4edcfa4fbc5ded5d08808d
-EBUILD aria2-1.36.0.ebuild 5081 BLAKE2B 84c002818212cf0242b1d01b5d83404f18e6ed6dd0c42115f6fac84513a86032a2c02c62082882df6339a793258ad85f3ecdea0c1dd3b0c0ea4c128b58329c28 SHA512 a87b27f203c225b00b6f7211fe59e3bdd499affd980d3da5cd9e7c8c68887319fce877cb4a91eb1e0ce7c65ca7a27e1a3643354b768bca72cc355b63183fa403
+EBUILD aria2-1.36.0.ebuild 5079 BLAKE2B 28a36b8aad56a4f380b97f406a6b1f100ec81fabcc87303830bb4dd155560c2729a58c45f2bf062ac9b720967cb53433f2c66bcdff52cccbcea4fb2cc02dcaa7 SHA512 c4c1a1337d326ace51be27a562e1c8bd1c21005bc9a9a51ea66d0074170bff76314f4e19c50033f82804c680c4ea8ce50d37740589cd8b1154b4621ee1ad9b5e
 MISC metadata.xml 1326 BLAKE2B 3ac9bf38699dc1fbde6888fca4fbc4374d44e53d7c323fcf35e9303929502473dba40503c7ce3deaf232f6057d184e19bbf5ff7cbc5908d79ee3e6de7dc6a097 SHA512 5367b67da846fbcb0175b1ee4a3a532731e6b5285b8c3f244a175515b557a64732e58a8db67d4a691c28e707511ff894afe746366efd74c06353fa1df8efcf8b
diff --git a/net-misc/aria2/aria2-1.35.0.ebuild b/net-misc/aria2/aria2-1.35.0.ebuild
deleted file mode 100644
index 49c783dfe046..000000000000
--- a/net-misc/aria2/aria2-1.35.0.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit bash-completion-r1
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="https://aria2.github.io/"
-SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
-# xmlrpc has no explicit switch, it's turned out by any XML library
-# so metalink implicitly forces it on
-REQUIRED_USE="?? ( jemalloc tcmalloc )
-	metalink? ( xmlrpc )"
-RESTRICT="!test? ( test )"
-
-# Crazy GnuTLS/OpenSSL/etc. logic below:
-# 1. Those libraries are used for two purposes: TLS & MD.
-# 2. Upstream preferences are:
-#    1) gnutls [tls]
-#    2) !gnutls? -> openssl [tls+md]
-#    3) !openssl? -> nettle [md]
-#    4) !openssl? !nettle? -> gcrypt [md]
-#    5) !*? -> bundled md routines (we don't use them)
-# 3. There's also gmp usage for bittorrent with nettle.
-# 4. You can't really control features, just dependencies.
-# (we are skipping native Apple/Windows TLS support)
-#
-# We map this into:
-# ssl? -> openssl || (gnutls + (nettle || libgcrypt ))
-# !ssl? -> nettle || libgcrypt
-RDEPEND="sys-libs/zlib:0=
-	adns? ( >=net-dns/c-ares-1.5.0:0= )
-	jemalloc? ( dev-libs/jemalloc )
-	libuv? ( >=dev-libs/libuv-1.13:0= )
-	metalink? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )
-	sqlite? ( dev-db/sqlite:3= )
-	ssh? ( net-libs/libssh2:= )
-	ssl? (
-		app-misc/ca-certificates
-		gnutls? (
-			>=net-libs/gnutls-1.2.9:0=
-			nettle? (
-				>=dev-libs/nettle-2.4:0=
-				bittorrent? (
-					>=dev-libs/nettle-2.4:0=[gmp]
-					>=dev-libs/gmp-6:0=
-				)
-			)
-			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= )
-		)
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	!ssl? (
-		nettle? (
-			>=dev-libs/nettle-2.4:0=
-			bittorrent? (
-				>=dev-libs/nettle-2.4:0=[gmp]
-				>=dev-libs/gmp-6:0=
-			)
-		)
-		!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	)
-	tcmalloc? ( dev-util/google-perftools )
-	xmlrpc? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )"
-
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cppunit-1.12.0:0 )"
-RDEPEND+="
-	nls? ( virtual/libiconv virtual/libintl )
-	scripts? ( dev-lang/ruby )"
-BDEPEND="app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if use scripts && ! use xmlrpc; then
-		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
-		ewarn "and aria2mon scripts against the local aria2."
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-	# Fails with USE=bittorrent && FEATURES=network-sandbox
-	sed -i -E \
-		-e '/^@ENABLE_BITTORRENT_TRUE@	LpdMessageDispatcherTest/d' \
-		-e '/^@ENABLE_BITTORRENT_TRUE@	LpdMessageReceiverTest/d' \
-		test/Makefile.in || die
-}
-
-src_configure() {
-	local myconf=(
-		# threads, epoll: check for best portability
-
-		# do not try to compile and run a test LIBXML program
-		--disable-xmltest
-		# enable the shared library
-		--enable-libaria2
-		# zlib should always be available anyway
-		--with-libz
-		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
-		# optional features
-		$(use_enable bittorrent)
-		$(use_enable metalink)
-		$(use_enable nls)
-		$(use_with adns libcares)
-		$(use_with jemalloc)
-		$(use_with libuv)
-		$(use_with sqlite sqlite3)
-		$(use_with ssh libssh2)
-		$(use_with tcmalloc)
-	)
-
-	# See TLS/MD logic described above deps.
-	if use ssl && ! use gnutls; then
-		# 1. if ssl & !gnutls, use openssl and disable gnutls
-		myconf+=( --without-gnutls --with-openssl )
-	else
-		myconf+=(
-			# 2. otherwise, disable openssl
-			--without-openssl
-			# 3. if ssl & gnutls, use gnutls
-			$(use_with ssl gnutls)
-
-			# 4. switch between nettle & libgcrypt
-			$(use_with nettle libnettle)
-			$(use_with !nettle libgcrypt)
-		)
-
-		# 5. if bittorrent is used along with nettle, use libgmp
-		if use bittorrent && use nettle; then
-			myconf+=( --with-libgmp )
-		else
-			myconf+=( --without-libgmp )
-		fi
-	fi
-
-	# metalink+xmlrpc := libxml2 / expat
-	# USE=(metalink || xmlrpc)
-	#  + USE=libxml2 -> libxml2
-	#  + USE=-libxml2 -> expat
-
-	if use metalink || use xmlrpc; then
-		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
-	else
-		myconf+=( --without-libexpat --without-libxml2 )
-	fi
-
-	# Note:
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -r "${ED}"/usr/share/doc/${PF}/README{,.html} || die
-
-	dobashcomp doc/bash_completion/aria2c
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
-	if use xmlrpc; then
-		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
-		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
-	fi
-}
diff --git a/net-misc/aria2/aria2-1.36.0.ebuild b/net-misc/aria2/aria2-1.36.0.ebuild
index d47f746e8ee0..88356647df78 100644
--- a/net-misc/aria2/aria2-1.36.0.ebuild
+++ b/net-misc/aria2/aria2-1.36.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://aria2.github.io/"
 SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+-with-openssl-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
 # xmlrpc has no explicit switch, it's turned out by any XML library
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 2385b555d813..d72722453423 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -17,11 +17,15 @@ AUX initd-16.16.2-r1 9986 BLAKE2B 4b1c9537ef85c9de1d0064a851472163576480f08b5738
 DIST asterisk-13.38.3.tar.gz 33711458 BLAKE2B a1f37c210e7e95962665310b542d9a3b682ecc5e90188e8272a0cd6e22ebfa963ed5af46f0f85c2074bc0bbe34d72473343ff3437d80b58e5383eb80385d0b89 SHA512 dd67f73704f1c68639313852ba1508165c7b525f0f4156c776258e27ee19a0ee87293ae7805178b0f37188fca91b861c52b5206cbba754a6181492d0efb7e895
 DIST asterisk-16.19.1.tar.gz 27870922 BLAKE2B e7b2ceac60f9db19802acc6c69b233556834815e1a9a3d17b2fd331d2577beb356f31a531a6d8fde70f78e9362bd8b6dbc796f906557c82bcd4847a612c788a3 SHA512 7b74fedce91ac597f3cc7a03b401ae7506bc6479faf008f3ea9c0f4783d85c5ce06d71bf73333d4bc1609a2cb96511d931d79f3bc8613906f370f9b4015b30b9
 DIST asterisk-16.20.0.tar.gz 27888074 BLAKE2B 74f7812db787e5dcb041850fc7e80229e05ef0849cf373be29f9a3ac2eb0f2244fc6f2bd2a3f411c4d37d968184dfbc140e55ad62de53e6beb0b2340179b831c SHA512 0e270c2d00eda1aea3135eba427a77ac2abe66a31c868cf700d5cc26bde65fded6f2191d5e4af361b2e055ae04f2943611ca1fa19815a4a690076a83fb899148
+DIST asterisk-16.21.1.tar.gz 27912610 BLAKE2B 75b93fbde52d72906bb613b1d42b7fe592fac9a6af76aabb11dab1bb15b2ad8134f8cfe0a9a58f5f72928e046b0b6111d8e899909d6baca3fd820b583c6acd35 SHA512 399875d3e70e2ebae8b27edc9d97b485d7acfe7a99c1f6e2a6212ccac9cd77fd4e720ccb1cf4d16a441fb8f894d8b9a64785c48bc606a0cfd105d2b7ab16d766
 DIST asterisk-18.5.1.tar.gz 27953748 BLAKE2B 543f2bfbe1527f3a168dc73d3d9f20e80e95be9de9532a97ff6a5c70a548d525c39ce5251b80dbcd1c0e31c066fc48520e6c373b1404bf24a00b0a48ad134bcd SHA512 95f30c14602587827c7d7bc4652639163f4fe6338fade35d533525aa8825d7a5082c9d6fa4671a5f4f89bd90a0d657ce7e51fd4216558bd367abcb10b25aeb23
 DIST asterisk-18.6.0.tar.gz 27970531 BLAKE2B a2eaecc962b236e6e455b8d305c05f33fab8e4d6c63eae1506b8354710d6e3e0e3c6da59600555d880520bb58a13950f830057ac03bc82628ab27b2627de52c9 SHA512 17ad7e4dc86f75d4e70f779b6fe6958ee544233b20a36847a6624a7f07b135ddb415f5dca245843ea359e9a6a7c75bfc40ce36fca1df5a7a12549ae522fa2590
+DIST asterisk-18.7.1.tar.gz 27995503 BLAKE2B edc13b33243507114fbf2a514fb67d462ca2f8095e4eba95dccd194b4495c3be256ddff280b7400182fed7ffc4d0a462c687f5a23e2162933e0603464e851d54 SHA512 5e08ed7e95d00538fd24ed46644818d690fe8c5b8f8d6b9a7d01120c7de28138372f8e166950730b65bd0ffc3e1028af89377bde598bee549ca86d369f9427df
 EBUILD asterisk-13.38.3-r1.ebuild 10844 BLAKE2B 6b9c6791acac5777bc063b9bc228ae1af6e5af641f257772cf2087281c3bc1459e5b2334cc0cabae45191a0de78d91b9fc67ccdd5498c4b14aba35496b8f7bd7 SHA512 c47dcade8239df4075842249aaf0fd3b3e3089b9fc0b3a3ecbce30c6a12b82e02bd7a3eeb51eeab346f520432907a95c79ca303af08d253d767af81fca1e26cd
 EBUILD asterisk-16.19.1-r1.ebuild 11250 BLAKE2B c187f9a9ace7b0b27cf7f435a821be029a958a3b223c9e57dc37dc2aafdfd10cac7c401726bd3afdc25dc97692b061ec96429d390321a812d7f1c9a9510bbf90 SHA512 3397e1de8591eb3ce5c83f8d123369c0bffe96e7b33c318508ae1b1b5cbdbc552bc5887c1a6f24aa161750f81d682e0e832d5ad09b78f570c850d35278bd879e
 EBUILD asterisk-16.20.0-r1.ebuild 11252 BLAKE2B 0ec58a25537e2be301ab08745848dc82c195c429dd9b942ad02893fd3845345d3281087d56335ac9aaf4b0e72176c86b06e7bc51f0de86eb15dce98141a19714 SHA512 56fcb729fe283d66d0ee8442b8261b568654a7a841daf9fb7308091718f1176672c876f5f4bf9560d720cd7b03b7acf993dbdba72dbb2062285dc7ce60e342c4
+EBUILD asterisk-16.21.1.ebuild 11252 BLAKE2B 0ec58a25537e2be301ab08745848dc82c195c429dd9b942ad02893fd3845345d3281087d56335ac9aaf4b0e72176c86b06e7bc51f0de86eb15dce98141a19714 SHA512 56fcb729fe283d66d0ee8442b8261b568654a7a841daf9fb7308091718f1176672c876f5f4bf9560d720cd7b03b7acf993dbdba72dbb2062285dc7ce60e342c4
 EBUILD asterisk-18.5.1-r1.ebuild 11225 BLAKE2B 09e5c7e0d8df81ca8ad6778429a22ac3665f34d7fa1639eebd017126020fd7b68d6c0af28b9e848e88a860719d48fe6eb7d43c15f38c1d0dd1764794376609d7 SHA512 50fd30b5acf04f27e3b58b9e1a2cbe9421dfc51132467ba613b1bb18d9ab897bcd12c9265242692d75b3102c7c8293909d0b31542b04e4703bf2802b06a223b8
 EBUILD asterisk-18.6.0-r1.ebuild 11225 BLAKE2B 09e5c7e0d8df81ca8ad6778429a22ac3665f34d7fa1639eebd017126020fd7b68d6c0af28b9e848e88a860719d48fe6eb7d43c15f38c1d0dd1764794376609d7 SHA512 50fd30b5acf04f27e3b58b9e1a2cbe9421dfc51132467ba613b1bb18d9ab897bcd12c9265242692d75b3102c7c8293909d0b31542b04e4703bf2802b06a223b8
+EBUILD asterisk-18.7.1.ebuild 11225 BLAKE2B 09e5c7e0d8df81ca8ad6778429a22ac3665f34d7fa1639eebd017126020fd7b68d6c0af28b9e848e88a860719d48fe6eb7d43c15f38c1d0dd1764794376609d7 SHA512 50fd30b5acf04f27e3b58b9e1a2cbe9421dfc51132467ba613b1bb18d9ab897bcd12c9265242692d75b3102c7c8293909d0b31542b04e4703bf2802b06a223b8
 MISC metadata.xml 1483 BLAKE2B 00aa83418aa9cf46f9ac04f2281157abd02f6e0d77b18e10ec0e516a116d92c87b6bb70a4c595dd5e2553f522f8ebd4ef6b102f30cd02fe8ce261f3fa049ddd0 SHA512 65f32411b7a6ed223a9e12d9f43fc975de7fa00c42e93b6302dbcf50a44c4805d1a116ddea0749d17e28dfc0fe6897ecccd0873a76e6dbf4f9580e2ff6df2149
diff --git a/net-misc/asterisk/asterisk-16.21.1.ebuild b/net-misc/asterisk/asterisk-16.21.1.ebuild
new file mode 100644
index 000000000000..236daff8745d
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.21.1.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11:=
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libcrypt:=
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
+	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d <&3; do
+		keepdir "${d#${ED}}"
+	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+	tmpfiles_process asterisk.conf
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-18.7.1.ebuild b/net-misc/asterisk/asterisk-18.7.1.ebuild
new file mode 100644
index 000000000000..456bc7d82990
--- /dev/null
+++ b/net-misc/asterisk/asterisk-18.7.1.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11:=
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libcrypt:=
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	_menuselect --enable app_voicemail menuselect.makeopts
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-headers install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
+	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d <&3; do
+		keepdir "${d#${ED}}"
+	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+	tmpfiles_process asterisk.conf
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/astmanproxy/Manifest b/net-misc/astmanproxy/Manifest
index 070afbc90b7b..ee0a3f66a05f 100644
--- a/net-misc/astmanproxy/Manifest
+++ b/net-misc/astmanproxy/Manifest
@@ -3,4 +3,4 @@ AUX astmanproxy-1.28.2-gentoo.diff 1322 BLAKE2B d625d0068ac8436aa868171ee3bf5911
 AUX astmanproxy.rc6 366 BLAKE2B ea8105b396342b1993c95851073dce4dcd0d7bb9d4538eddd36bd859ad8435de3bfed37c549f6bee7a86579951c55b00c95c611e178ce9a47550dd1d593e7adc SHA512 ad9f5a180ce5f2a63efd1a9f050d963ff2504c306e177562821ab80a62daad50d2a0077a4078094991d5fa85129708cf6970ad60adacf06989980fc46012559e
 DIST astmanproxy-1.28.2.tar.gz 65506 BLAKE2B b3aa3ca00f376d1030d96b4498880e55741a3e33bbd72b74e2ac52f9186c93bfb8f1c9d540ca51b122600e6ec519144184ef19e6e04f34a977a617b1c4c73052 SHA512 a37caaca42649b19d40b9b0cfe61c6a0e31d7d0de50378565a6add1b27ba09dd6044c7ac2d9b38c424f143fc12acbfa0931c59492399ee34db063ed73cce9293
 EBUILD astmanproxy-1.28.2.ebuild 829 BLAKE2B ccf60dd4309900fbb11690fc1a9558a34017d4fa36ef521996511eb036cc3774a4922cbe7aa4fe619568eea6bbd82439c685a5b3a7f1af33cb7fbc3903699ce8 SHA512 f4b9b75851f5bd93b8125d656c46fe8f89b2810edda2a2deebfa99a5b5a522765ab92642ce2cc1df7d3390cd4cc1b68b43b9ea69a7ab874b84a76c02e492d58f
-MISC metadata.xml 254 BLAKE2B 25f70c7fd14f82702190902b1e55e04fcfdd75bc083574adc550c6f4de16df8d2c445da58deadb924d7c052e9618b6d40e573fbb3b882487bccd31138974e5bc SHA512 53cbadddad97b7a48c4902ce48675c0d7d776b194dcd6d0bf1e884d213d2f4c145dfd3f601179f4836ec9ce0c565438d90f6d4154d9116d4cd25acb610f9a571
+MISC metadata.xml 474 BLAKE2B 90e2e4cc35094f840ca3439cdaa511be4c508de5bc0a89e753430e8dfdaaa9f5973beda35a3bf9cd6e1ed855091f1aead06232d2e0848e4d8562df4bd5009edf SHA512 2e0181603cec30e7220e041c1b91eeb2e9edcee48b257eede6bc9b6bec7966cde21268ef7aecb39594b24e701330c79e3464823f3e4ef48288232ff0fc429f89
diff --git a/net-misc/astmanproxy/metadata.xml b/net-misc/astmanproxy/metadata.xml
index 083741122f13..6aeb95f27d7b 100644
--- a/net-misc/astmanproxy/metadata.xml
+++ b/net-misc/astmanproxy/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">davies147/astmanproxy</remote-id>
 	</upstream>
diff --git a/net-misc/bgpq3/Manifest b/net-misc/bgpq3/Manifest
index 2b15047f77e2..99caee24b1ee 100644
--- a/net-misc/bgpq3/Manifest
+++ b/net-misc/bgpq3/Manifest
@@ -2,4 +2,4 @@ DIST bgpq3-0.1.33.tar.gz 82696 BLAKE2B d6a8b950747ed0889d2e67873f4b029127d49b730
 DIST bgpq3-0.1.35.tar.gz 87066 BLAKE2B b217d490ed74e9174cbbd70ed5d1dd4bc72b136a23d583b6b9cede8fd38d8b579a463d8a146313f9eec1904e836ac4db0b75a2c1554c00c5df79a8d0d32f950f SHA512 a41a424fc0230a0ab7d64ff017b9c1a52e32d7deae542ba096d4815e0e5ce76342ad55c204bbcc22ae4c47ad486917410c53b0dbb2306d40fa5c5a5cf93fcd01
 EBUILD bgpq3-0.1.33.ebuild 664 BLAKE2B fa4f5ef98778f944f52763cb7332a2975166c94628e8c433e926f228930413ec1a2443c68a48425a98feaee39b5d91379680a4c690eebd136a0fc92f6b8eebab SHA512 88ebf2c7d1d5f7759ab110f4814bee2b3411608391757245ef137512451b80f1f25e708e932fe3c16c30fbc2f45728e822875524346fe101c9207839c0d21868
 EBUILD bgpq3-0.1.35.ebuild 763 BLAKE2B 356204c1be56f704623b2ef4ab34429cff34d4d77609a06a68a8fc0cbd7bc92c7319e414d32ffca9f8d5c15481c13dfdb5f9d0582dd17ba5bc318169d71265aa SHA512 a70368e3812e344fd12b186b07c543ef36277ee6c55e7d332fed6a99a795fb2a7af303d039917d8ebbbbed3647e7d0ccefcd0ff7ed224f90c772856ffff97f4c
-MISC metadata.xml 1188 BLAKE2B 0c8aec32496ef013cadb95b439b4e4a88c633e3cc605b8b5ea58579c471fe10fbb2b01135092515ce51992bd00e60b07076bb8056d670065e8e0b5383ddf4dc6 SHA512 c36152337a6c40318d5a7095f2cd7bd9ae677fb5327e198d743317b27bf4b615daac636075535c517e4ac8d62b67543d9a01c04ff526421cc25bea25102a556c
+MISC metadata.xml 1408 BLAKE2B 0f7677c7bdd843b18f1457cc3865ed62f7d841cafb71effe4d0b785a7d3d016c5a567f5d60c1ad3ad23c6c0f2ea4d143de5d8effffc032d441998c8a1f0ce77a SHA512 fb9d053b8e370b9433dd23a51064a7babfa411712430df55f89c2695bb5245d8654841bd9a9f59e76029584a83cca57db1797440212ca7ec628fc59194e7af27
diff --git a/net-misc/bgpq3/metadata.xml b/net-misc/bgpq3/metadata.xml
index 528a5f5abc71..129babe352bb 100644
--- a/net-misc/bgpq3/metadata.xml
+++ b/net-misc/bgpq3/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		bgpq3 allows to generate different config entries with prefix lists, useful for Cisco/Juniper routers and their software analogs, such as Quagga.
 		This program is a successor of bgpq from same author, main difference - it supports IPv6.
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 81904a9bb8f2..525b36def8f5 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -3,6 +3,6 @@ AUX confd-bird-2 231 BLAKE2B 9be6c9b94ede8233e6b249d6543b236f3bba2f065bd3bd811c4
 AUX initd-bird-2 1433 BLAKE2B d89a6d48e36736f8dc8d21df7213f5edc0702f2a4e64f5321a8a4b0b3e1501755553f35e4f6270be707a50538defb806658dee00453835bcac86a633c60fb8c7 SHA512 bd3eec06701c86eaa7c89e75a963656be6081415f93f7844bba272e3f1feccbd90081ea0b711ac51c6d7c1e337e8325a27879b336f20204ad225d0c7dafa3b68
 DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35
 DIST bird-2.0.8.tar.gz 1135228 BLAKE2B 4b36688ac85967ad8c39d9c37dc717d77b1cb5c3ec44a0cf4e84ff38b8d1710d10653a1333b50cd2ede79fd7f012ec86de0baefc9ac18435693ec5b3e43b8a3a SHA512 5f8ad63b1dcdcfdfd4c98f55601dda3a07dea3099fc51b52a340650ca475bd943ee6aac31a1e7735b7596b279e338697c65728754b97108ae687a05f566c94e2
-EBUILD bird-2.0.7.ebuild 809 BLAKE2B e5fe5d1bc763c46d9249d87460112134f108fa92aa05b7b4c7e6715fe4695beaf0d00de044432e79534647ef9340b5a95326b5b837c2332b55cf4071bc0577e5 SHA512 31c7e720b065945f46a1d9ffd704bb31164d1f886e03d518abad23bc15deed66a923b5ceac1f3da21f9d7e806182783306b71dc27244bf4f0a2fa639948c05bc
+EBUILD bird-2.0.7.ebuild 808 BLAKE2B 7ce2db0fee210a80a196f111b8690e0b347cf9224255b41479b2a831058cc0fb931b7c1ef13f7e347f654b5222d73faafec8d0126c4b02a396866406d0752751 SHA512 f9b5fc2788d6b53ac9f317bf6ae91a864dbea79e42338d87c1c8bde4558109ab948f3ef9e37d92d663e3740db3e39b96102b418f63bd32fdbfd2569127f8780f
 EBUILD bird-2.0.8.ebuild 1257 BLAKE2B 3b9fe5cd1fbdd48497fbd5df6660a8fd212e5e3f7ab2ed54b20a4b564a879e63c2eae6a52bfe59c1d6e710d49c801af7a5184b4dd64b316b8f54e52c4beb8def SHA512 2988f25efd01b765bb9b4c12527da4b6e8c182499cd5ccdd562c481d73e3ed280e3365eac1c73aae652e5f3908508585d8659ca8a099759d4b59657834ae0891
 MISC metadata.xml 582 BLAKE2B f2fca917d013e377c042ad09e99a53bda1bd27673e27dc17ed683aec7b691e40e405fef758a3243f6d53804f23ab495ccc7692712d9d941d2517d141b33c0a50 SHA512 0d03e6149698726621a62436740e83b6fcd6c6951d201eead7453ea0b565dcd72d6d54f961e40b1598a1d0b499a5166d84c4208de5c0a6b4134e3d32f84d9eae
diff --git a/net-misc/bird/bird-2.0.7.ebuild b/net-misc/bird/bird-2.0.7.ebuild
index d2f563e29758..e1b3892ab3f7 100644
--- a/net-misc/bird/bird-2.0.7.ebuild
+++ b/net-misc/bird/bird-2.0.7.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
@@ -9,7 +9,7 @@ SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm64 ~x86 ~x64-macos"
 IUSE="+client debug"
 
 RDEPEND="client? ( sys-libs/ncurses )
diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest
index a5cbe252125c..a2c69e4ba4b2 100644
--- a/net-misc/croc/Manifest
+++ b/net-misc/croc/Manifest
@@ -1,6 +1,7 @@
+AUX croc-9.4.2-tcp-const.patch 1572 BLAKE2B b301b110167c4aa20d6486a5c540d0b52b626f36d4a8b1ea4cf25733b5c749ef7a9d780650745d9cf242eb9ec18951a109ba10f7b61e6ab0d1d357a6e4fe0a9a SHA512 4641184ec4b34c41b493823c518737757e566969b0770873929d63f3cecbd09c5c2a5768ff6e19c7990f8fc20af4dc2a5365322156d3750efb76924e2bd34c7f
 AUX croc-disable-network-tests-r1.patch 763 BLAKE2B daf8248adb801bd16f1a567d1ce16746877617a83a2f63ab640312abf3b1089105e8b71b4fcb21ccdf8cd59987ac4e5826463680634c44d417d8bf5c2b514b35 SHA512 659936bafed02bc2274ee7a9a482c711850a08ed1e871584d978930e5b38b019b42b3308a3550e388e04cbdcd92964cb5326fc5825b7b377c11e6ba99660f772
-DIST croc-9.2.1.tar.gz 2790290 BLAKE2B 2bd3f676b2285e09d07e0774aa22979780318b5324ef88a7232d145563f6331a22031ab454123431655f878a783137792ad4ceba1ac7e4fec7cbd80a2a1c12ac SHA512 cad8aa7ba864b1cdc8e03f838fd4fe007420a6ed13ec47568069a0ebfe9108515318768cb1470fbd933e4d2b1f83c268151aad686bfdcfdb35bbd22c8304f16e
 DIST croc-9.3.0.tar.gz 2792714 BLAKE2B eaedd895ec6965567bed75cdce39bce215b343f837a656541f300eae5e9ac551fb2159f8ec96563dd88a4d7e6e7275b8bd32197ac4ce526e35209aad76dba85c SHA512 732a1f1252e2958ea7c9e8273c6c2930da01a4ea71a2ac1056711371235caf6b8200ffafcb73086903ee80fe83948d452e783f49a1c25fdee1089830c148337f
+DIST croc-9.4.2.tar.gz 2807224 BLAKE2B dce3d065e9e367f9ed472728692f624b759930eb1dd6fa96dbe901efc17d1cf88073ccc68d690610bd5db498f18dc245d2b4f74e56c4f42f3028b68bd5c5afcb SHA512 8207c5c25e9775ec25bdbab7d87ac353e459bda93874122b014e618d173ccff0fbe54a547ba7a36da93e47a6f7532dba5e21df9f1b7339e11d2faf7977eb8b33
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod 43 BLAKE2B 60ec6257dc0098e3dabfb32b6c668db9159d69dfc7daa06b9d7f9089f4a6dfc11d2b6d39393e1b990f6ca126019baa1b3d99364fe8a6df9ae323626c8d82494c SHA512 be1111b482157b8c8dda0f45a71e587b51ef78cc9676db4cb560bf0e71c112f45bd048bab7f1b0a64651777bb395c0ce210cf3df20a4afe08e66a42b6da89765
@@ -24,6 +25,7 @@ DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7cce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.13.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.mod 104 BLAKE2B e859512911c1621e5ba3e46249c5b9b5e4b0bae854bb3a18d7e39d6da27c93e133d43851d5e6bf2ede44fdee31801b19fe274b55a1f37b1291bf27262e2f2385 SHA512 23b01eb4023ff5018437ff98b55ada053eba49feab2777eed36d033f426c5456b143f3defbc3131dad1251205f3ffb3553e3c10bd98de80f0a462e8450d6d56c
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.mod 84 BLAKE2B d78cb89b5321a10aed4ad5abd88952a190c5051dedea0c9f43f06881be807892152edb9be4ecc9eddfc3cd7b75a441ab85559e25c60feeaf560baf829af373ff SHA512 b96cca212a7024f0039ddd3a744fe818ab2e028b8ac2fd4472ce76ee9b496de3abb0960718c1106a98cf7e6df652dcf2884fe5ed95979bd9016399ea4abd324d
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.zip 20978 BLAKE2B 1114ba9e7289e1a1423e81c4e0ff52860d9232f7e55a626e32282dfbf7a45ef53c21b843f4b6870be92e710db9c619d96f9c197eda0d8c28dac3764160e92105 SHA512 e86a3b69601be1a0a15d7bfd5d93fce8d8c06b52c55c941a9ed62b44f05d3062e436d817661af14bb42838efc45875a63eb6042b196e1684db36e0fe6ed42a7f
 DIST github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod 40 BLAKE2B 0f9e6ab0f72f5158dd93a5c57ac4be060f15d7be491b8bca4c5ce0844d79756d25b78a70e5258e77db4d7b9ea7dc39e7eb0ffdf41e0cf6ab193c71a5192d9ebc SHA512 54abe3375058c36dc4e31eca46d3d4a3382ddd027afb15ab161cf2ee32d6e14d5ae643a75d7a911d55f3c065bde539cb24ec9e9366cb6f365b541a72b62d677a
@@ -45,8 +47,12 @@ DIST github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.mod 200 BLAKE2B ac3886b13c5b
 DIST github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.zip 11584 BLAKE2B 436025438469ea00bca4fd958a604a29d688bf0c9c205e651d814458a35728d065c7c1af9f5bf3d39b61bf629581656578b9453fb788cbd9c71af83c7f9416be SHA512 c16986d2d0ecda2c9b119abfb4565eab79c829d8eaf0c2be00079f21b4f4988fb13bcd3e61add4a5781511aecbd1411d6a9da3aea12401db89ad41a67c409522
 DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.6.mod 216 BLAKE2B e378f4d4364d5f51bac5b116951e65725ee56e03fa8833fbcb91d148b9b58f3948fe97004fddf81912a84814d15225d23796098bef4bb9f881460b441d670a00 SHA512 30bdd048cc41acc7f7ff4ef9d6e69143174eaf9f8deb43e8bd5cd1097a3934b3f04d17753b59eab892a8575129bca0fe1187b098ce9ad4beae465469a24e75ed
 DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.6.zip 9435 BLAKE2B 1e91624d47801581cc1e8f13ad64be4178c6f23d4cc2a78691933cd0602e14265116bcb9fb8399dc868bfa1f0f91240624ba630e86f6ac1e6879c8e9b4d2f900 SHA512 45cb7b90f6328a46824d701a33a11960e4e26fe513a05b95d6f487e1e9471ca8ac8cd522fcb45ae84f9766dc983bc9bafa10b5df89915389827a0b5474839f4e
+DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.9.mod 216 BLAKE2B 64dc481114d5b023c2dcce61c230585dc4e78b94918f5273aafffb60a58f750398c627515ce3a3aa43af3574a8ed7c7e502b65c9d45c547e90def848c2b143d2 SHA512 678e2acfe4a5296ac99974a8d50136adc1ccc7d987c356bbd2315685d4b2e865bf22404e55e7f5b8d7e24ce46d9fff9c09a6a24f5a8f8fa9a6ec48cdad88f2ae
+DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.9.zip 9468 BLAKE2B 295f884ea1aa05f7db137c6b6087b8da0ea66f41782cc5da1ed61772c3a88d699209238299d0668af4d9a3de98b3b48ed9114cb1c7e6a1d85aea272d19f85d81 SHA512 8ee5004248c49a1b035d8b9c189be1c2e84e0bc08a54a781d6fa3a25a83e99bd1217d5829ccdfbf166eb798fdfe215a81d82ec61a7089c87a8b978f503579ee2
 DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.2.mod 552 BLAKE2B 80c630b3d610ea7da515316a83785276ac7df410dbf822e70c82fabaf2002a56a979ec11f8e4f5264ebbd96f03e531851b0984ae90414f30f34adc16c7fbe5ac SHA512 562e559e022330500cc3c8728bfd2f35b2228de8323f98b231d8337dc92d5bae2f223d97691e0bc2b853defc8078e11390f4d2cebd25cb6b26b7ef827e5d7764
 DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.2.zip 606662 BLAKE2B 0fbce0316a291b9562c376c6b578f99673f2febff74a02c8609cebdf2d8aa54ef0bb6a9f8424cca4df2e16d2e212668356eeebaa2f5335f3f2c8e476fa838650 SHA512 b9a86393bb3bb07ae03dbdd30a4f2c8a1e1fc41247e098af89678123625f8660c67de6a5d3f9db1a8becfb4f846bf23dd1734ec15e5c3329bc4a5781db0461bb
+DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.3.mod 552 BLAKE2B 4198583a40acaddcb10be35144f3d278a41e7cfbd67defeb4a028e5196cd5826171108dc2d0589dab341af8a85b735c436e122442e5d8ac6661dbc91fab4132b SHA512 2cb9b6c9e1a74f18c08a9d65f9523cbfe74299514d6dcf9c4bb81c3ee32dd0dd27f15031bfc5df929ebba5697633a825025f5bacb9fe13f4920e9b94fd78e8fa
+DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.3.zip 606672 BLAKE2B e70ea26b06f35a20fce029fe08660e4cc8bbc9cb914715689939576b4cfe93995c1e721489fef3e5d3d65056966d5727f2c877b592159bcbaf7f108172f87b82 SHA512 f63f3d66b90e6aae2eca380b94fd0cfeb80ef656d182c7ddf5d016e0b858f2f42e638ecb1357d747017abf047a1b0b814bbbdc465d94afbf5154755a26020f07
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
@@ -60,34 +66,40 @@ DIST github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20210707234609-9bdfc483d499.mod
 DIST github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20210707234609-9bdfc483d499.zip 73692 BLAKE2B 14a73df1ad17271b125d43db3533c7980937625c6c73f2e66bf77cbb16c456115f6d9e541b3c6f88531bc433788f005e85c8335deef1b392ecf56721ccb2b6b2 SHA512 ac10585e471e7109f1b4368211dd3251ecbcdc586bbc33da26e6ba6356bb50778ec4b1375b1a8265c3d8cf33fc43c36650be7943c1dc4a356d17e1216925997f
 DIST github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.5.mod 40 BLAKE2B 0d12dc1fd09b245563e86708118ecc00ddb9712b290b444c1239c190358ff523f24118c5f69c5ad1861d9056bbeafc5d04f038d6ab4df82d64019c489175716b SHA512 1cece428d8224cbbb52f74138f441ba00fdaa13105a523d6374c7674c6b40e1c784782f105ce6ef9dcf3fcbebd4c8342a81674cace5211d73e5d108d1e9f16a7
 DIST github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.5.zip 18374 BLAKE2B 6e50720c2fab931d282011fa0025c42f26942871a932fd0631aeae3ff256a18a7bdee8cd254e1cde12af4e65f56f0c6588505832e5e181fee23c2e5342eabef6 SHA512 e2270a2e07692e777b933b64b72dcf47b2cd1b24c2d1eaac3d9190f2d4cea930202e67ed73c23e29e4c0e7ca52671266de027ef2e9e034913ffdc6f09b33278d
+DIST github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.6.mod 40 BLAKE2B 0d12dc1fd09b245563e86708118ecc00ddb9712b290b444c1239c190358ff523f24118c5f69c5ad1861d9056bbeafc5d04f038d6ab4df82d64019c489175716b SHA512 1cece428d8224cbbb52f74138f441ba00fdaa13105a523d6374c7674c6b40e1c784782f105ce6ef9dcf3fcbebd4c8342a81674cace5211d73e5d108d1e9f16a7
+DIST github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.6.zip 18380 BLAKE2B e6a082e9d919f1b442b77137e223cff934a24026f0da5981446a28788837159879ec8465c3c0f830c10243398d497f08f4cd27553bd63b578ab86540c0ec4ccf SHA512 61b2fd87fb9817fc990cff7d23547b6a259d4eea8bd9f327ef461a3e4cde4add511919ded2a19f932fcd810d72ace567bdde99f59c856296e44480167fff2dd5
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210711020723-a769d52b0f97.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210711020723-a769d52b0f97.zip 1874721 BLAKE2B f6374336811be4922eca9207154b37d67479968a570768a88d77c3fdaef70e4573e59ae3e2bc09e15262651e414eeb1d0c5a9c5faf558f013e355693cb1589c5 SHA512 dde077a273c3b6851385e64c5621a084287b92b62e2a96ef6586cc2fb7e8e84517a54ce1d6354a0b64d8d3df1de6c3081699730a30ca61dd0b082f0993725f86
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210813211128-0a44fdfbc16e.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210813211128-0a44fdfbc16e.zip 1875913 BLAKE2B 91081f4364a6aa27bea7a7a730fa78ddfad45bf3da7f12be4deb3fbdb3f2ca020a1915c91494cf48479e87672f1b7418f41b25aa4f373d969a8b1c1255242c1f SHA512 11e1202dc8cd3762d91ed7b854cb33239ee81a87303a961eb77dcae710eeefc72e332036e1df9311defc1a303254e90a66a2b63543f6388a13c5397bf9777eb0
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.zip 1878482 BLAKE2B 0eef87d2e4c8998450fa976e54b3d00625faad61125a442e3c824763e803257061a05d9046e3c95659cb3a18f8c0f37bea529bcf53c79fc5f7034f1f6d9d1130 SHA512 c49fad474be5b84f99f2cf45970bf1bbdf02f4ed6c8c9d6aab8d672e49972059d4f6f0535bae7647b2d5c40c7a2168a20a0557e1cb29d30811b719f50aa6b226
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210805182204-aaa1db679c0d.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210805182204-aaa1db679c0d.zip 1569952 BLAKE2B 1abf4b924979131bceb8d01718f5dc05d27abebc3a4595ab7be45d13c9b62db7f057b8b5acdfb5a290d090d5dc248667282bbacd4e9928862369fd5549c6ad3e SHA512 ca3b67bea5a44f03ec76c982ef4583932d562c2ff46f4888d18285b75b5d1fecb3523f53352ff00e68333ad78f6ac3fc7c8228e1130bc41a192aa8b2449cb559
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210813160813-60bc85c4be6d.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210813160813-60bc85c4be6d.zip 1569434 BLAKE2B ec6e0c47cdd5b0115e6dadc7d12843955a674049747ae93dfb86f9fc691b223db80b17536051d9ad9385c729d88da354297dabbbf05d84ade886ee3a9ff8276c SHA512 f40a677cc24328c4e448cab36e70f6b3a51b72e949485f0394a87b2c6bbfbdedde491ff70cb8046f23b228194bb7c7eccea7c15c6c7290160504d01f955fda29
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210929193557-e81a3d93ecf6.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210929193557-e81a3d93ecf6.zip 1576003 BLAKE2B fdefd86810dcfe675adef45315c41659e2d43c91530bfa963072aa0339c3e5723610f6dab17d9805e4300104321505f3fc7f09372beb7e9501f9d82b77ec78c2 SHA512 17153262f765100d4fa7f544887827e2160962c6a8a62ab4230f16a1aa382ec9d77ae55289e68130bf354af699a6db2504fa68e4b3abb470c525489753aef930
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210511113859-b0526f3d8744.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210806184541-e5e7981a1069.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210806184541-e5e7981a1069.zip 1648243 BLAKE2B 1754089636a59b7da73b9636b9e3cdf9d01202744fa7105571869d85097af699b075435097febc2c4a688a69c1b7c87c23336e78b014786dc4e911b0c083f40d SHA512 25f9cbcf82de113d0822601147cfdded9a0ce7b4d9a19ead115755499fbfc4cf40860ef0176ea4f87c7b416e3e58c5cfa24a76224649e5106cb919cec4f55de5
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210816183151-1e6c022a8912.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210816183151-1e6c022a8912.zip 1649597 BLAKE2B 5b841fbad5d193dc0c494f12b9d788de280e895188ce43274961b4ded0f77b35e4cde2157e096e1262cd68f1b4b17b0c6766b10f25c498bf0d5f3d7a1ee54b99 SHA512 7d5cab16c856191e3ca2d5c3121f9c72cc9e04064891d0542351f4e98b2bc374dddc7b15bfc7d4dc53eb73888bdaba787823f25d366aa988599b442a5c5268fe
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210910150752-751e447fb3d0.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211002104244-808efd93c36d.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211002104244-808efd93c36d.zip 1662575 BLAKE2B a40b19411acdba8dc351204a81a40a3c1e132f2a00c2bd6dd6c2139d64a89f99ab34091a1cec9a3a1a00b5fba973b937e7356c395909eb4aa1b9766ff206a334 SHA512 4cd9489cde94b383388f325620a8e9279306e3fc680dbf1c804d08adf298179ba4397817bc4d8b58c7aa8e4c4525905aaaebce1a7dcc89501d313b349834b343
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.mod 95 BLAKE2B 1d166082ebb4ba2dc69bdce6b84f285aa98967551bbfc1cbadeb2db086ef01b66455cd86b78deeec5ae998a7057c7e4f12026b2e02a9c5053093b9f644a59d1f SHA512 81f571821c669188c4482da38b6921ac4c2c1747f8a803a6846531127cfde25dd04819d971f08f601c2d2cee2e636644c1648eff55dd24d89dfb3777e90fe9a0
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.zip 21403 BLAKE2B f95e96b20328a04dd2a3a20985bf54d0d859a88e45f5f61eaee3f2bc22b575ae37c8ccf7275dbd68ac2851fd0d374f7ff8874ecc44c51629199a846154ed93d8 SHA512 82711ee27037e2ec090919fe58efb173626b31b4bc9e0118d732eb585ba4a16de6f1ee994b97ae78b7ff1cb89c34f6aa7392ff4b3432cf1cf2c56d101c64fec8
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210927222741-03fcf44c2211.mod 95 BLAKE2B 1d166082ebb4ba2dc69bdce6b84f285aa98967551bbfc1cbadeb2db086ef01b66455cd86b78deeec5ae998a7057c7e4f12026b2e02a9c5053093b9f644a59d1f SHA512 81f571821c669188c4482da38b6921ac4c2c1747f8a803a6846531127cfde25dd04819d971f08f601c2d2cee2e636644c1648eff55dd24d89dfb3777e90fe9a0
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210927222741-03fcf44c2211.zip 21653 BLAKE2B 53f26212f031a9dd420c6e87a1f3e58bd78715475f1e33b7bc2eb65b556d95c8901819ce02be5e7ce6a8842fce670167e302e3311f9c47a9f1ec79bf272c770e SHA512 2f7ff46b02b31f30a73e1d574fafce089e51df788a2b34b18d505d1c191149a70f222b462664218c5451a7beaa7efaf4178470703887f2e438a4455603f359a3
 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.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip 8610726 BLAKE2B 78870544de29f5cd9216befa8822c2387654c3987e09994dccf55d210ad7c517edb93bddcc68bd981f2c083a4ec5e012d558b0164901e2d74f6f447e75edfadf SHA512 494d58f2bc02819ec24d8e55f668a06694568e63bc4b41064a7e44aefcb2778c74983fc9126b50277845da8e6739e83fc1334aed989981e8e53b869878803d17
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.7.mod 97 BLAKE2B cba29395bf9693152732776bde498cfd90a27c053feb5d1ca655e5e792ff68b9cd0a519bdff559450491e918a171c8a4fdbd4c0b4bcc9b578182f63ca37754db SHA512 e77211a503c35d8b6c392fc1b44daed580659b997673cd312ae8e579d1d715d7a53f8f0f0dd2d4dedbc6c5ca5ab7e3d52269a6536a42824cce267c89eb29cbbd
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.7.zip 8610883 BLAKE2B 768763b6da537c25448ff274da90261ad33a527e58a5749108d9d889b326051f7bb86a64ffea0a8dc2850260223a8b60ada4615290a9ba1b9a0725bb03c3323c SHA512 fb5d646d5f23fbb33acfe486714d647d7da091fc47cc7ec805afa4f78b070ed3ccc0022428f4672280ff85a7b4d8af3543647647f00ce62f2f3a18a6d425f863
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -99,6 +111,6 @@ DIST gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip 6816 BLAKE2B 44b63e4a425a5b5250
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
-EBUILD croc-9.2.1.ebuild 5537 BLAKE2B 31773f3eef666917b7f1c2f88bd178b3e56a5cfb264b0f5de09e29443a936fcb55d66a3e54ed32ab464dcad80b8883ebca1aad9ed88fe75f486d346ac3ced177 SHA512 7a115a428f59b983fd270cf882d0f7e0484618123b569f2468971b06cd339d94ca0afd4a71c495c28a944e9bc03d7b7387ba0556a247f8e244c997d702c8681b
 EBUILD croc-9.3.0.ebuild 5572 BLAKE2B 6de584e8f75f6f618dcb9eb44e2b90e841f0260449050b59e1f1cf287358b7329e36f88350f2a781187f0fbd1196d6180aed4ee05d67dfb760058f72cb1e4876 SHA512 0523031cde909b66d406508fd29df6f0c548e5364e1e3add3c599699ca334173a7881ebc5ce9495d3339556f2202c9e35172f5edeb9eee1fc1b18a36684687b9
+EBUILD croc-9.4.2.ebuild 5588 BLAKE2B 7891b61e229cd1d8e1dd0e445f5c880fe9dec4499f75ced3485801dad626b11c92c737fe0a8e7ef6e15b7b68de0648171db69f8bcb7215ce1600f0199a8b63b6 SHA512 6f59f276383cfbf5795439f05a1775beddb48201b417115871b0c3679c4df0b9205a1d8c3c01b7f4470ddbf4154e185b4b891712d1847fd336a754e70e3e7ee0
 MISC metadata.xml 327 BLAKE2B f52f36927c80520e4bebaf1e63792cbbf31642eb2a7a4d233446a8328a2c02a69e8662e4f2c0de85228ea2331997f9c432c38d2073a8e1e51f4c024366a8c537 SHA512 531ac4904fbd95dced03613bc852e0d531e8f8498b49741edeefb396be44b8931f716007aaa36cdd1fb257735186a7be9fb6be994881f613dcde5ad6470212a0
diff --git a/net-misc/croc/croc-9.2.1.ebuild b/net-misc/croc/croc-9.2.1.ebuild
deleted file mode 100644
index d38d83e5b963..000000000000
--- a/net-misc/croc/croc-9.2.1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 go-module systemd
-
-DESCRIPTION="Easily and securely send things from one computer to another"
-HOMEPAGE="https://github.com/schollz/croc"
-
-EGO_SUM=(
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.5"
-	"github.com/OneOfOne/xxhash v1.2.5/go.mod"
-	"github.com/cespare/xxhash v1.1.0"
-	"github.com/cespare/xxhash v1.1.0/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.1"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/denisbrodbeck/machineid v1.0.1"
-	"github.com/denisbrodbeck/machineid v1.0.1/go.mod"
-	"github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod"
-	"github.com/kalafut/imohash v1.0.2"
-	"github.com/kalafut/imohash v1.0.2/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/mattn/go-isatty v0.0.13/go.mod"
-	"github.com/mattn/go-runewidth v0.0.13"
-	"github.com/mattn/go-runewidth v0.0.13/go.mod"
-	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
-	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/rivo/uniseg v0.2.0"
-	"github.com/rivo/uniseg v0.2.0/go.mod"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/russross/blackfriday/v2 v2.1.0"
-	"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
-	"github.com/schollz/cli/v2 v2.2.1"
-	"github.com/schollz/cli/v2 v2.2.1/go.mod"
-	"github.com/schollz/logger v1.2.0"
-	"github.com/schollz/logger v1.2.0/go.mod"
-	"github.com/schollz/mnemonicode v1.0.1"
-	"github.com/schollz/mnemonicode v1.0.1/go.mod"
-	"github.com/schollz/pake/v3 v3.0.2"
-	"github.com/schollz/pake/v3 v3.0.2/go.mod"
-	"github.com/schollz/peerdiscovery v1.6.6"
-	"github.com/schollz/peerdiscovery v1.6.6/go.mod"
-	"github.com/schollz/progressbar/v3 v3.8.2"
-	"github.com/schollz/progressbar/v3 v3.8.2/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-	"github.com/spaolacci/murmur3 v1.1.0"
-	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.6.1"
-	"github.com/stretchr/testify v1.6.1/go.mod"
-	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod"
-	"github.com/tscholl2/siec v0.0.0-20210707234609-9bdfc483d499"
-	"github.com/tscholl2/siec v0.0.0-20210707234609-9bdfc483d499/go.mod"
-	"github.com/twmb/murmur3 v1.1.5"
-	"github.com/twmb/murmur3 v1.1.5/go.mod"
-	"golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod"
-	"golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97"
-	"golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod"
-	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
-	"golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod"
-	"golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d"
-	"golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
-	"golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744/go.mod"
-	"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
-	"golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod"
-	"golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069"
-	"golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod"
-	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-	"golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b"
-	"golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.3/go.mod"
-	"golang.org/x/text v0.3.6"
-	"golang.org/x/text v0.3.6/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/tylerb/is.v1 v1.1.2"
-	"gopkg.in/tylerb/is.v1 v1.1.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	)
-go-module_set_globals
-
-SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	acct-group/croc
-	acct-user/croc
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-disable-network-tests-r1.patch"
-)
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-	# Replace User=nobody with User=croc
-	sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die
-	# Rename bash completion function
-	sed -i -e "s|_cli_bash_autocomplete|_croc|g" \
-		src/install/bash_autocomplete || die
-}
-
-src_compile() {
-	go build || die
-}
-
-src_install() {
-	dobin croc
-	systemd_dounit croc.service
-	newbashcomp src/install/bash_autocomplete croc
-	einstalldocs
-}
-
-src_test() {
-	go test -work ./... || die
-}
diff --git a/net-misc/croc/croc-9.4.2.ebuild b/net-misc/croc/croc-9.4.2.ebuild
new file mode 100644
index 000000000000..0b58de198139
--- /dev/null
+++ b/net-misc/croc/croc-9.4.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Easily and securely send things from one computer to another"
+HOMEPAGE="https://github.com/schollz/croc"
+
+EGO_SUM=(
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.5"
+	"github.com/OneOfOne/xxhash v1.2.5/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.1"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/denisbrodbeck/machineid v1.0.1"
+	"github.com/denisbrodbeck/machineid v1.0.1/go.mod"
+	"github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod"
+	"github.com/kalafut/imohash v1.0.2"
+	"github.com/kalafut/imohash v1.0.2/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/mattn/go-isatty v0.0.14/go.mod"
+	"github.com/mattn/go-runewidth v0.0.13"
+	"github.com/mattn/go-runewidth v0.0.13/go.mod"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/rivo/uniseg v0.2.0"
+	"github.com/rivo/uniseg v0.2.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/russross/blackfriday/v2 v2.1.0"
+	"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
+	"github.com/schollz/cli/v2 v2.2.1"
+	"github.com/schollz/cli/v2 v2.2.1/go.mod"
+	"github.com/schollz/logger v1.2.0"
+	"github.com/schollz/logger v1.2.0/go.mod"
+	"github.com/schollz/mnemonicode v1.0.1"
+	"github.com/schollz/mnemonicode v1.0.1/go.mod"
+	"github.com/schollz/pake/v3 v3.0.2"
+	"github.com/schollz/pake/v3 v3.0.2/go.mod"
+	"github.com/schollz/peerdiscovery v1.6.9"
+	"github.com/schollz/peerdiscovery v1.6.9/go.mod"
+	"github.com/schollz/progressbar/v3 v3.8.3"
+	"github.com/schollz/progressbar/v3 v3.8.3/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spaolacci/murmur3 v1.1.0"
+	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod"
+	"github.com/tscholl2/siec v0.0.0-20210707234609-9bdfc483d499"
+	"github.com/tscholl2/siec v0.0.0-20210707234609-9bdfc483d499/go.mod"
+	"github.com/twmb/murmur3 v1.1.5/go.mod"
+	"github.com/twmb/murmur3 v1.1.6"
+	"github.com/twmb/murmur3 v1.1.6/go.mod"
+	"golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod"
+	"golang.org/x/crypto v0.0.0-20210921155107-089bfa567519"
+	"golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6"
+	"golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+	"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
+	"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod"
+	"golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod"
+	"golang.org/x/sys v0.0.0-20211002104244-808efd93c36d"
+	"golang.org/x/sys v0.0.0-20211002104244-808efd93c36d/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod"
+	"golang.org/x/term v0.0.0-20210927222741-03fcf44c2211"
+	"golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.6/go.mod"
+	"golang.org/x/text v0.3.7"
+	"golang.org/x/text v0.3.7/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/tylerb/is.v1 v1.1.2"
+	"gopkg.in/tylerb/is.v1 v1.1.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	)
+go-module_set_globals
+
+SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	acct-group/croc
+	acct-user/croc
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-disable-network-tests-r1.patch"
+	"${FILESDIR}/${P}-tcp-const.patch"
+)
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+	# Replace User=nobody with User=croc
+	sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die
+	# Rename bash completion function
+	sed -i -e "s|_cli_bash_autocomplete|_croc|g" \
+		src/install/bash_autocomplete || die
+}
+
+src_compile() {
+	go build || die
+}
+
+src_install() {
+	dobin croc
+	systemd_dounit croc.service
+	newbashcomp src/install/bash_autocomplete croc
+	einstalldocs
+}
+
+src_test() {
+	go test -work ./... || die
+}
diff --git a/net-misc/croc/files/croc-9.4.2-tcp-const.patch b/net-misc/croc/files/croc-9.4.2-tcp-const.patch
new file mode 100644
index 000000000000..bcd6823983b9
--- /dev/null
+++ b/net-misc/croc/files/croc-9.4.2-tcp-const.patch
@@ -0,0 +1,49 @@
+From 2ffb20201c00a4de9c8082c909e2428c2b46d5c2 Mon Sep 17 00:00:00 2001
+From: jolheiser <john.olheiser@gmail.com>
+Date: Sun, 3 Oct 2021 16:23:29 -0500
+Subject: [PATCH] Fix TCP constant
+
+Signed-off-by: jolheiser <john.olheiser@gmail.com>
+---
+ src/tcp/tcp.go      | 7 +++----
+ src/tcp/tcp_test.go | 4 ++--
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/tcp/tcp.go b/src/tcp/tcp.go
+index 2714e5f1..d271756b 100644
+--- a/src/tcp/tcp.go
++++ b/src/tcp/tcp.go
+@@ -37,10 +37,9 @@ type roomMap struct {
+ 	sync.Mutex
+ }
+ 
+-const (
+-	timeToRoomDeletion = 10 * time.Minute
+-	pingRoom           = "pinglkasjdlfjsaldjf"
+-)
++const pingRoom = "pinglkasjdlfjsaldjf"
++
++var timeToRoomDeletion = 10 * time.Minute
+ 
+ // Run starts a tcp listener, run async
+ func Run(debugLevel, host, port, password string, banner ...string) (err error) {
+diff --git a/src/tcp/tcp_test.go b/src/tcp/tcp_test.go
+index 165f9537..6ba99677 100644
+--- a/src/tcp/tcp_test.go
++++ b/src/tcp/tcp_test.go
+@@ -25,13 +25,13 @@ func TestTCP(t *testing.T) {
+ 	log.SetLevel("error")
+ 	timeToRoomDeletion = 100 * time.Millisecond
+ 	go Run("debug", "localhost", "8281", "pass123", "8282")
+-	time.Sleep(100 * time.Millisecond)
++	time.Sleep(timeToRoomDeletion)
+ 	err := PingServer("localhost:8281")
+ 	assert.Nil(t, err)
+ 	err = PingServer("localhost:8333")
+ 	assert.NotNil(t, err)
+ 
+-	time.Sleep(100 * time.Millisecond)
++	time.Sleep(timeToRoomDeletion)
+ 	c1, banner, _, err := ConnectToTCPServer("localhost:8281", "pass123", "testRoom", 1*time.Minute)
+ 	assert.Equal(t, banner, "8282")
+ 	assert.Nil(t, err)
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 197f6e320a80..f288f04f87f7 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -3,8 +3,11 @@ AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af00
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST dropbox-lnx.x86-131.4.3968.tar.gz 99373510 BLAKE2B f9db71b392218b09d1428729af8ad83353c9c9b045342af7fcb19d63e318d260cf35ec8ce52ab14eabd6f5c5e094f9f6fb14517fed806381ee5d6f1f61e16ae8 SHA512 3b220c9768199e7cafafde5b73c0ea5a976aa73ed2b9bba9fcc116c25a0da362b1cff65d86f71c3c75a7ba82337c4d4673abf56934ad0e4b4a6c797e7664f4c5
 DIST dropbox-lnx.x86-132.4.3800.tar.gz 99450051 BLAKE2B c765236721e462a1f0a1b1d48bfc1bb80c8347a0b64b0fb37a68a03fc10ff69274e84065802d31419d5810324a41e638eabeafc1563b2b464770fafd40b5be1d SHA512 8a132623b4dde39e0e39d88a4ca90c88c6349236a7e3941be77f1784fd1a289a803a211f532b78d7805c5e765d0f358a20745a6300ad4c1e16f385fb82b01625
+DIST dropbox-lnx.x86-133.4.4089.tar.gz 99659191 BLAKE2B d13af3f0ff0f763773969292470165c2e0695a1341bf78f69227048f245bcbd0cd520f748c40062661e9c1a95bf290fb3ff72d5d960fa86db03c70e7892d36d7 SHA512 716e9c387c19424e75b8fa164ce978ed9cfb0b5a26ff425162183293c26a6a09e33e76432f9f6badd5fb6d80ae658cb310d69345cb74861df474f3628a2023bc
 DIST dropbox-lnx.x86_64-131.4.3968.tar.gz 101176952 BLAKE2B da7470b1f401792874e6fd1c0fb2546d38f111f0db232f20adb9488ee844c7cbe469362f1ccb74b8708da43fd7389642ca5ba5579de60ae340c13f833add63cd SHA512 1a6b9262f31f540c4aa718058106dafc990694ef26f247d0f43e32592a2bfcc831dd2f1009feed634299546034aba4451fc7ce621f8574bb83510b783011b78e
 DIST dropbox-lnx.x86_64-132.4.3800.tar.gz 101246481 BLAKE2B 9ad48da71e42810dcd898fb3f52e5b0a6c0791be03a41ab54a5a97c88c635542ccfb528e2b8d6165b9d8497ac48002d62139eaad649fb4fac694975542dc295a SHA512 e4b7fdcfe8aeb67f523f2ce320dba7e689e9947d741f2ae21a0a12a3f25dab6e3e9a67394d312149b5e181207d0c2b28d417684b739d3462c9984ccca3fba3c3
+DIST dropbox-lnx.x86_64-133.4.4089.tar.gz 101463037 BLAKE2B 561efbfa7adb5b173112d36e63e92c31bbc6e4cdc87671817222c55c5b3beebe0195d8f566e0da6a1196ecd75f6148a6307ebd998c77b41760b0596f3fae8e70 SHA512 8b7509d813653478ecf86addb00f8b8f2739976e716c94a67f5f471396a656c43cafab9104722bd238e42965d3ef34cc6273aa92af5a0ea9076da0a5fb40b1c2
 EBUILD dropbox-131.4.3968.ebuild 2673 BLAKE2B 6e031fb04250842de2b31700ca9f5c68a2ee605ed8d55a0a1b07247fafc85179968da4cca5f55e7231a6024d5cdc7c8d691003cdf00e3352985aa245e3ddea59 SHA512 fda0adb204f8899a4355e9d618989b0772ae987fd2694e7a099aad4b8ec3c6f45cc6af63d74bf68728668724251ee56e83eecf7452b084c89c50a10191189869
 EBUILD dropbox-132.4.3800.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
+EBUILD dropbox-133.4.4089.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-133.4.4089.ebuild b/net-misc/dropbox/dropbox-133.4.4089.ebuild
new file mode 100644
index 000000000000..be2fed244fff
--- /dev/null
+++ b/net-misc/dropbox/dropbox-133.4.4089.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		x11-themes/hicolor-icon-theme
+	)
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/glib:2
+	dev-libs/libffi-compat:6
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/wget
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libxcb
+"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+	# we supply all of these in RDEPEND
+	rm -vf libGL.so.1 libX11* libffi.so.6 || die
+	# some of these do not appear to be used
+	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
+		wmctrl libdrm.so.2 libpopt.so.0 || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_postinst() {
+	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
+	einfo " your user's home directory.  To prevent this, run the following as"
+	einfo " each user who will run dropbox:"
+	einfo ""
+	einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 384859b38580..370bd5ae3c72 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -2,5 +2,5 @@ AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285eb
 AUX frr-openrc-v1 7068 BLAKE2B c790c783ea9c289110b1e85aa23a1adccba36122524cde36798f26c31f82e5381eefb3e5e16b497e84a5aa2faf5bf1f59d12fe8f9b7b3c5d0f504c26ce13fb86 SHA512 34e371bb9bb34e494536091a811084d543c18b302489ce0a56ec3e69c805c22d84d7a928e24e17eba5d4fe6d4e33ac847060da95ded5a02975ba2a2e5a568243
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
 DIST frr-8.0.1.tar.gz 8206852 BLAKE2B ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a SHA512 d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f
-EBUILD frr-8.0.1.ebuild 3540 BLAKE2B 1c4726be6328f9591129ec0cae9af25cd81c9e5cc64d460163eff0d8bd3a07d45e1ffd14e6e222142ee528bb28f72f1629b7669a595d2985397289fd5b2ff391 SHA512 9e872c47d9fe753d2dc8880e91ba2381e179a386ad0a27746be77bbb055ad252741097b248e7a17ca5dc1d3caec983661caa011e5c271d53671153dbb72d478f
+EBUILD frr-8.0.1.ebuild 3538 BLAKE2B f4c2a6bc1901bc776f0266ece3a0daf04ab716b63a55c32e634f387e2482d18b3c1446785294fab12be08c1d97eb07f56dbcaad22bc20d354befa7c08489fee1 SHA512 4ebdd4c6bbf0770f7c478a1c85a47e8d78237d709240bdeaa7f4bace13ef0b59bc5bf715c899977ba8c712c63a1cf14685fd7e5056cddd2af254fe0e8de8a9d7
 MISC metadata.xml 767 BLAKE2B ce7920e238d443a1ede5f38b323c86dc2f4e24d5efeb6603a59e8ec9a0d083cdc8e6162d7d3e9463b29bf786b26e00aac19c549ddf943b16175897fb94265516 SHA512 29dd8aa5ad6706a53e00c14feea8e7a75d10ec453dec715a495a75a0390661c268d5a5fc10acdb26d050a0d804162930de79bf0e41a499b803a4762442b8a108
diff --git a/net-misc/frr/frr-8.0.1.ebuild b/net-misc/frr/frr-8.0.1.ebuild
index 2f581241e3ed..75fd3b38166f 100644
--- a/net-misc/frr/frr-8.0.1.ebuild
+++ b/net-misc/frr/frr-8.0.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index ac84ed2c6431..a95805e3233c 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -2,8 +2,8 @@ AUX dummy.boto 128 BLAKE2B f366c006392ef65857a3af2334f6776ce9609841fab260e27c155
 AUX gsutil-4.41-tests.patch 810 BLAKE2B 93a2e7163d0684c8ad03ce03ae94aebc168922861ac89958e0a13a1fc3e53635b03d08531bd29b8301772c0a724647c33e5091af47e1c4bcf4c0478b4487fad6 SHA512 85fad475926755f32c4d08eaad9b023c9808c4ef696a2a7da4c61a68101d781c207c4f5817cda286f123e0c50477e8f7bf032a03d40420004d1aee412ef8375a
 AUX gsutil-4.50-boto-tests.patch 1483 BLAKE2B 9d40250f7a836535297da411bda76430dc844128f68f67d2817c6ffd2189b6cd5e40357ed15580f5bdd68a68148faf77c49198040e767af4c57f49163c5903f0 SHA512 53c20d01d60be0d560c5e15f26bbe206bba59ad97df486b8c24409e2a58b13093b09a4601f6d8add9ec4f5f01faf9e5c3ecee00e9818e5de84f7df7d39b5127a
 AUX gsutil-4.50-tests.patch 2451 BLAKE2B d84d1cd31eeabb3c0ecbb4b4850ec30d5f96e641b135b6c7fe6e7442edcfc4d2d076858b6fe1365f9424d32c81d9b818885df03f66405dfb8ca4d2149ee33ab5 SHA512 007e07b54a5f4182586f3defbc070f5883356214cb0e28861df66509c414d8bbde5718fd8598bcf023e9971331a34b2f1aefd89350e6d3c97e93ae80176b2d5a
-DIST gsutil_4.59.tar.gz 4024669 BLAKE2B 4317cd3787adae2d7d066d7c8d5c62cfe77749d4efc8b5451e87ac6294de0e6f13c085795de30a891f2d7b58cd7e0724234cf14b4308542c8d050856a868c5cf SHA512 c86b957a2630f3a80869e3105c0baa7bf1297b84698e756fed28b28adf36345cf1dd28d4216ec395de6bfee5b118dd70040ff964a2938f22d8af15a5c3485c48
 DIST gsutil_4.60.tar.gz 4012900 BLAKE2B d3d1b57d5b0d42b1b454944efe8d62855b665d3772817c636568ef49c79ae2c566ef08c4c6e1bd3c9829471561865b64b3beec8d3911d6766748337aa1b1fc3e SHA512 18ab701cbb60513d66e8b96ced28cfe65dc0f210435fb5ffbcbfab3541ec7ed051db726e52239796d9579d0928953f610064279a3ee1e5b5c06cec963493804c
-EBUILD gsutil-4.59-r1.ebuild 3072 BLAKE2B 267dbbd52f525a90532b151eac417b5ad3abc88705b698c84ba765a4f71494ba39e858c0912dbba1f33fb56ed83f7e055d710d2330563c3d74838c134de01aa3 SHA512 c4c536f87b66a699b8b28da4b26245f923b9132e2f69369cc53dbe0baa051e15089a92b03031428b742b1f7ec035a2b09148746aff80822c508191f07fdbe93b
+DIST gsutil_4.68.tar.gz 4459899 BLAKE2B 9855d379ba0483f1a33e4e05546444ff492c72d241ff0e5ca4f6c798c91b0c8d729247bf5fbaa39c411eb7a7e3f1fa701363898b903ba11c1bdf41c7e969c44d SHA512 b4af124808f34b5c0aa1d31b6d1bdbdeb451d39a246d4f2876ef664b6b485cdc5dc63bc3992ca4b7b33c72a00fc5119b931625e2c3230970bf0baa6389715e39
 EBUILD gsutil-4.60-r1.ebuild 3072 BLAKE2B 267dbbd52f525a90532b151eac417b5ad3abc88705b698c84ba765a4f71494ba39e858c0912dbba1f33fb56ed83f7e055d710d2330563c3d74838c134de01aa3 SHA512 c4c536f87b66a699b8b28da4b26245f923b9132e2f69369cc53dbe0baa051e15089a92b03031428b742b1f7ec035a2b09148746aff80822c508191f07fdbe93b
+EBUILD gsutil-4.68.ebuild 3037 BLAKE2B 0fc9cdc2fbb439682e80a3c3333c3ddb79a9065285f36e94199a4601eeae16d7471002fb5d3af3291bf77122aee40bc4658ded78c0f15234e0f3848412bb1bee SHA512 fff0bf4340e89fc6803725e569e68314ffe96f7113ba5d8c7d29c46e158b2dbb6567f79f1b321949c143dbfc12bf9d46e13711c33abc56e4d80a09e975aab1c0
 MISC metadata.xml 515 BLAKE2B 3e6c5322e5a945b1ea9e073ba98e135fdebf5d28f34bd6e5116f11668bf3505a6b8ab6f770348f2318c2bd3aa3aef782738e14ef6de60ee7c6fc1413a4a5a9c0 SHA512 53a143192dd605277e3ac4b8875400fbbcb892964e521de8768894f40580169d8ffd68f715a97f692b881ae6dc578a79e8d4573528bbdd881ffe4112d0d59734
diff --git a/net-misc/gsutil/gsutil-4.59-r1.ebuild b/net-misc/gsutil/gsutil-4.59-r1.ebuild
deleted file mode 100644
index 7cd73f33bffb..000000000000
--- a/net-misc/gsutil/gsutil-4.59-r1.ebuild
+++ /dev/null
@@ -1,98 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.49.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-2.7[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.30[${PYTHON_USEDEP}]
-	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.18[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/gsutil-4.41-tests.patch"
-	"${FILESDIR}/gsutil-4.50-boto-tests.patch"
-	"${FILESDIR}/gsutil-4.50-tests.patch"
-)
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( README.md CHANGES.md )
-
-# needs to talk to Google to run tests
-RESTRICT+=" test"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# NB: We don't delete all of boto/ because the tests are imported by the
-	# production code.  The same reason we can't delete gslib/tests/.  We can
-	# delete the main boto library and use the system version though.
-	rm -r gslib/vendored/boto/boto || die
-
-	# failes to compile with py3
-	rm gslib/vendored/boto/tests/mturk/cleanup_tests.py || die
-
-	# monotonic is only used by bundled fasteners that we do not install
-	sed -i \
-		-e 's/mock==/mock>=/' \
-		-e '/monotonic/d' \
-		setup.py || die
-	# Sanity check we didn't miss any updates.
-	grep '==' setup.py && die "Need to update version requirements"
-
-	# For debugging purposes, temporarily uncomment this in order to
-	# show hidden tracebacks.
-	#sed -e 's/^  except OSError as e:$/&\n    raise/' \
-	#	-e 's/def _HandleUnknownFailure(e):/&\n  raise/' \
-	#	-i gslib/__main__.py || die
-
-	# create_bucket raised ResponseNotReady
-	sed -i \
-		-e 's/test_cp_unwritable_tracker_file/_&/' \
-		-e 's/test_cp_unwritable_tracker_file_download/_&/' \
-		gslib/tests/test_cp.py || die
-
-	sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \
-		gslib/commands/test.py || die
-
-	# IOError: close() called during concurrent operation on the same file object.
-	sed -i -e 's/sys.stderr.close()/#&/' \
-		gslib/tests/testcase/unit_testcase.py || die
-}
-
-python_compile() {
-	2to3 --write --nobackups --no-diffs -j "$(makeopts_jobs "${MAKEOPTS}" INF)" \
-		gslib/vendored/boto/tests || die "2to3 on boto tests failed"
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	BOTO_CONFIG="${FILESDIR}/dummy.boto" \
-		"${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}"
-}
diff --git a/net-misc/gsutil/gsutil-4.68.ebuild b/net-misc/gsutil/gsutil-4.68.ebuild
new file mode 100644
index 000000000000..e907dba14782
--- /dev/null
+++ b/net-misc/gsutil/gsutil-4.68.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="command line tool for interacting with cloud storage services"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
+SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.49.0[${PYTHON_USEDEP}]
+	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/gcs-oauth2-boto-plugin-2.7[${PYTHON_USEDEP}]
+	>=dev-python/google-apitools-0.5.32[${PYTHON_USEDEP}]
+	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.18[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/gsutil-4.41-tests.patch"
+	"${FILESDIR}/gsutil-4.50-boto-tests.patch"
+	"${FILESDIR}/gsutil-4.50-tests.patch"
+)
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( README.md CHANGES.md )
+
+# Needs to talk to Google to run tests.
+RESTRICT+=" test"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# NB: We don't delete all of boto/ because the tests are imported by the
+	# production code.  The same reason we can't delete gslib/tests/.  We can
+	# delete the main boto library and use the system version though.
+	rm -r gslib/vendored/boto/boto test || die
+
+	# Fails to compile with py3.
+	rm gslib/vendored/boto/tests/mturk/cleanup_tests.py || die
+
+	# monotonic is only used by bundled fasteners that we do not install.
+	sed -i \
+		-e 's/mock==/mock>=/' \
+		-e '/monotonic/d' \
+		setup.py || die
+	# Sanity check we didn't miss any updates.
+	grep '==' setup.py && die "Need to update version requirements"
+
+	# For debugging purposes, temporarily uncomment this in order to
+	# show hidden tracebacks.
+	#sed -e 's/^  except OSError as e:$/&\n    raise/' \
+	#	-e 's/def _HandleUnknownFailure(e):/&\n  raise/' \
+	#	-i gslib/__main__.py || die
+
+	# create_bucket raised ResponseNotReady.
+	sed -i \
+		-e 's/test_cp_unwritable_tracker_file/_&/' \
+		-e 's/test_cp_unwritable_tracker_file_download/_&/' \
+		gslib/tests/test_cp.py || die
+
+	sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \
+		gslib/commands/test.py || die
+
+	# IOError: close() called during concurrent operation on the same file object.
+	sed -i -e 's/sys.stderr.close()/#&/' \
+		gslib/tests/testcase/unit_testcase.py || die
+}
+
+python_compile() {
+	2to3 --write --nobackups --no-diffs -j "$(makeopts_jobs "${MAKEOPTS}" INF)" \
+		gslib/vendored/boto/tests || die "2to3 on boto tests failed"
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	BOTO_CONFIG="${FILESDIR}/dummy.boto" \
+		"${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}"
+}
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index e38e97ae1a6d..da1ac978284d 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -1,5 +1,7 @@
 DIST httpie-2.4.0.tar.gz 1772537 BLAKE2B 111451cc7dc353d5b586554f98ac715a3198f03e74d261944a5f021d2dcc948455500800222b323d182a2a067d0549bda7c318ab3a6c934b9a9beec64aff2db2 SHA512 44cc7ff4fe0f3d8c53a7dd750465f6b56c36f5bbac06d22b760579bd60949039e82313845699669a659ec91adc69dbeac22c06ddd63af64e6f2e0edecf3e732a
 DIST httpie-2.5.0.tar.gz 1105177 BLAKE2B 6e16868c81522d4e6d2fc0a4e093c190f18ced720b35217930865ae3f8e168193cc33dfecc13c5d310f52647d6e79d17b247f56e56e8586d633a2d9502be66a7 SHA512 f14aa23fea7578181b9bd6ededea04de9ddf0b2f697b23f76d2d96e2c17b95617318c711750bad6af550400dbc03732ab17fdf84e59d577f33f073e600a55330
+DIST httpie-2.6.0.tar.gz 1133495 BLAKE2B 3ac61fc68ab59ac7523b030a8c7af85c4af05357aa19282b514b813351efabe783f47ab82d292117e0a9170ff793b71356941dc4eb159c585629cae3adec9b5a SHA512 acd7dc847b67e27909c49ccddec84321c4d73fa5b49f06ce3d94d790093a8f168a1c6627bc4921ca8c0e48b9904f38e17935b645495e2313d16ac2eecf659038
 EBUILD httpie-2.4.0.ebuild 1577 BLAKE2B 09c82238242dd6bc2bfede83fd47e219ca29f34ca848b660f097156f4576d65ba6a575bd08c98ccf70a8113638d73195207e7f1f2f91a9ffe6e7a18ecf47075f SHA512 68a57ce1e74b68e0245a8370531ce9382b899f0ae732412eace4988cb068aedff5eb98a2bab04c3a8c0dd16bdcd15077c435958b7035dff5081add48ad7efa93
 EBUILD httpie-2.5.0.ebuild 1076 BLAKE2B bc703c118eaa94b490676b198e4807c749dc54ff93d2a8a4a1582b46c7813051af3a153e7d90febc4ed2f6a7254f3abedc7b13e48a4a30d2bf5df804d81b2759 SHA512 c3a3b70c43e563b30414527e36b2519cfe899a0a7d16ccebfae7a5e59e65353c16041a4e091a7d4d5003b1e3cee6840e824e710978784826759a0ae00d4e6c4d
+EBUILD httpie-2.6.0.ebuild 1125 BLAKE2B 85f3ac8ece9cbea6d0a66e76aa5cdcf7f40d350bee9ece10632fe14389266120ca08ee6ee648091fbb5182fa7360aedf71384cea35de073d98353f4444188d32 SHA512 18ce841ff29a0c8f11281cb261788d53e1f8a48c23a29a74b66e2e2ec49d9c05d794d5d7faf1da2e0304accaa0685f8d10f2315abaddde668b4410a7bce9a368
 MISC metadata.xml 1165 BLAKE2B 38bffb922e5057ecaef199ed37d2908776056fa851d24ff9c3fb798e124de4a8edd3c8f0c74f3175cab852f97bbaf634a27aec90162d7749da73fa3dbac18ab4 SHA512 e63434bfdefb4eebe1971f2b92df5a478134fa3be286db6fff6bbfed1e2c8c457a3941facb9bef68f25bb5db97ab4d0dce0ecfc68459fab33564a872c7eeeb47
diff --git a/net-misc/httpie/httpie-2.6.0.ebuild b/net-misc/httpie/httpie-2.6.0.ebuild
new file mode 100644
index 000000000000..a663fcd882b5
--- /dev/null
+++ b/net-misc/httpie/httpie-2.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Modern command line HTTP client"
+HOMEPAGE="https://httpie.io/ https://pypi.org/project/httpie/"
+SRC_URI="https://github.com/httpie/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/charset_normalizer[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	newbashcomp extras/httpie-completion.bash http
+	insinto /usr/share/fish/vendor_completions.d
+	newins extras/httpie-completion.fish http.fish
+	distutils-r1_python_install_all
+}
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 615a1da40136..57174f78a5af 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,9 +1,11 @@
+AUX iputils-20210722-fix-no-ipv6-ping.patch 2038 BLAKE2B ac403da299a9e407482396c1fb232bc16d388aec0f53954214ba9af982fb37f60140c179bd6a547a079bca63a9a9ccf1f0660ec6bee184a5db544959df94b103 SHA512 3d2bcc77d7e3cc433bdf9d7d84deb1471b6860167dbc0b0937b688762a183c7e8da5285a5c8fb09252322511601133721148f06edc64ee6f3e8f741d02182851
 AUX iputils-20210722-optional-tests.patch 5276 BLAKE2B c485d39b06916acdaaec6f98ffeb718afbfd630af7220c7dfb408855a8862c2b121bbf4482621f633b86f1b94df78afc54157d99f2ff28cff833ae263aae5e78 SHA512 59d7ff881c03d7c03f5f41d2015f03175456487d9802999173f4705b3cfd7819957258e68a0b932fd9901f418bca866252d4a673d66f08b9e179a07ae84e8c40
 DIST iputils-20210202.tar.gz 513055 BLAKE2B 37f3c10ff3918d40fe2eae1e4b19ed711b97c30cd2d682e42f484a11a28ab7c93975a51fbb7a8b1c1d725fc9051ae773bc2e81b9d80a2dd0e6ff55867d54875d SHA512 af600fe74e1b78c0da66c378f55eb468d62206aaae1864693f7ec79833c9c0de95843573d1792627695f08ecfcdb4e79c354065daf178d393fcc6ef9a8a5d526
 DIST iputils-20210722.tar.gz 530745 BLAKE2B 4d6a2afaea1027e7992d374bbaa300f952f56225c998ecc6c3d332fef046dd8032e5afaff1cdc916d048f9d84cc8a85736a26a3176e66e111e02c9dbfcb0f195 SHA512 8f85bf468f8ef1e2832e9bbf9009552df4a6d723dd130fa0d5b2aa3bae617c972f936143c2370c3b4ce2ba2499828c91a299ee42cf81fa81aabe10552db2b328
 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1
 DIST iputils-manpages-20210722.tar.xz 19208 BLAKE2B 7d6b126debeee2a4e5437b7d26a9fee5c759ae72fa9b7acb1a04bb673f14af742f5580aad6ae1c34048933d95d09c4adcf024fabdc20851297131877cbfa10d0 SHA512 c1521e76f5b8cb99d7226ca1bd916b1861b6c0f9655ad0e396dd8d997be6cdc37ee0e81ac325ea4ebb3b349b394e7f1c45081ddc25b778fd294928a7b2dc0415
 EBUILD iputils-20210202.ebuild 4210 BLAKE2B b090f1cd2ceff44eefe1491c796ee6851bfdc78aff2cdadadd808fdc554b6876e164d5d4c89819401e6f2c25b0177d9886700c3abaae042f52fbe707df156a29 SHA512 83f5a2327619765b9d768534ea688fde8099e45162209da26465ef6abe6f49483255ce9c1c862d3f9f2e18eeeffae7f3af0ca8291f2e0a744bee0f88669c3670
+EBUILD iputils-20210722-r1.ebuild 4589 BLAKE2B b87aacd353a2a9c3b55b981b17ca232a4b83641f2cb6a1517d0761c3c77995202aedd51709545068116ad11e75639cac6c3fd32a52f4921375bce161e74e383c SHA512 99aaa84707dc893fa3e9af8a4d326d342e098654efe28bbfccad1d7ca92ef0df7f2afa1d58a41bd8684169c7d009798ba456741df6322b398549268343b11879
 EBUILD iputils-20210722.ebuild 4513 BLAKE2B 5d94157b66c766964d395df24eef93068f17ee892592e28412fa0f28596e30f07ce8c10654fd641fc8954a7faa9f97c677d09e20d6700ee3788e0ab56f2e6919 SHA512 32be9ad976dd770b14fa267a97171e21f44723afa4c413c1ba49819a6504e75b271c4f17c541f9d92d5791234960ecb7e75977a889cf0338ae95ede75ccc7b39
 EBUILD iputils-99999999.ebuild 4440 BLAKE2B e752bc9085ee4a631a7c93b6f5a533bc2ea88009020aa336add86167cb68296a418e436af05469e06e8d11f6c49bf7bff9534e8258258d8eda5674e7011481bf SHA512 2b30c9bd6a5470381d016ab68338de9da471ebb0f351a19585543a33b77ab4f586a13590f592fc7b5c92a976d04ee9988c6da3d7d83ff15a55f295535021ac52
 MISC metadata.xml 1510 BLAKE2B 773a096616c325fdef0d4fc5e5cc887d47ab3433be7efdcbfaf99e4d04f82d589ab759a7493e1cd10e80cc047c5288ee2200f7b21cfa24ab801f5b84688f5fd8 SHA512 4e207561d2d42f4bd07b6ded0729688883b6f8fa38d15734ab42ca66b1baac98bf283a71fb80f210f7a1732611e987e85084e615c4ef727126faa29acd154ae9
diff --git a/net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch b/net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch
new file mode 100644
index 000000000000..61f9f5c03fd6
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch
@@ -0,0 +1,47 @@
+https://github.com/iputils/iputils/commit/79d713eab6181e219bf932b404706f6f59ff2539.patch
+https://bugs.gentoo.org/818022
+
+From: Byron Stanoszek <gandalf@winds.org>
+Date: Thu, 16 Sep 2021 23:38:54 +0200
+Subject: [PATCH] ping: Remove 'unsupported IPv6' warning on disabled IPv6
+
+Regression was introduced in d141cb6 as introduced condition
+
+if ((errno == EAFNOSUPPORT && socktype == AF_INET6) || options & F_VERBOSE || requisite)
+
+was wrong, it should have been:
+
+if ((errno == EAFNOSUPPORT && family == AF_INET6 && requisite) || options & F_VERBOSE)
+
+but bug was hidden as `family == AF_INET6' was always false until
+otherwise correct fix 904cdb6 ("ping: AF_INET6 is address family not
+socket type [lgtm scan]") propagated the error.
+
+Tested on kernel booted with ipv6.disable=1 (disabling via sysctl, i.e.
+sysctl -w net.ipv6.conf.all.disable_ipv6=1; sysctl -w net.ipv6.conf.default.disable_ipv6=1
+does not trigger the issue as it exit with "socket: Address family not
+supported by protocol" - errno EADDRNOTAVAIL).
+
+Fixes: d141cb6 ("ping: work with older kernels that don't support ping sockets")
+Closes: https://github.com/iputils/iputils/issues/293
+Closes: https://github.com/iputils/iputils/pull/370
+
+Reported-by: lekto <lekto@o2.pl>
+Reviewed-by: Andrew Clayton <andrew@digital-domain.net>
+Reviewed-by: Petr Vorel <pvorel@suse.cz>
+Signed-off-by: Byron Stanoszek <gandalf@winds.org>
+[ pvorel: create commit from Byron's patch on the issue, do analysis and wrote commit message ]
+Signed-off-by: Petr Vorel <pvorel@suse.cz>
+--- a/ping/ping.c
++++ b/ping/ping.c
+@@ -150,8 +150,8 @@ static void create_socket(struct ping_rts *rts, socket_st *sock, int family,
+ 		/* Report error related to disabled IPv6 only when IPv6 also failed or in
+ 		 * verbose mode. Report other errors always.
+ 		 */
+-		if ((errno == EAFNOSUPPORT && family == AF_INET6) ||
+-		    rts->opt_verbose || requisite)
++		if ((errno == EAFNOSUPPORT && family == AF_INET6 && requisite) ||
++		    rts->opt_verbose)
+ 			error(0, errno, "socket");
+ 		if (requisite)
+ 			exit(2);
diff --git a/net-misc/iputils/iputils-20210722-r1.ebuild b/net-misc/iputils/iputils-20210722-r1.ebuild
new file mode 100644
index 000000000000..7d70dc9970a2
--- /dev/null
+++ b/net-misc/iputils/iputils-20210722-r1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors.  This avoids ugly issues while
+# building stages, and reduces dependencies.
+# To regenerate man/html pages emerge iputils-99999999[doc] with
+# EGIT_COMMIT set to release tag, all USE flags enabled and
+# tar ${S}/doc folder.
+
+EAPI="7"
+
+PLOCALES="de fr ja pt_BR tr uk zh_CN"
+
+inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+LICENSE="BSD GPL-2+ rdisc"
+SLOT="0"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( sys-apps/iproute2 )
+	nls? ( sys-devel/gettext )
+"
+
+LIB_DEPEND="
+	caps? ( sys-libs/libcap[static-libs(+)] )
+	idn? ( net-dns/libidn2:=[static-libs(+)] )
+	nls? ( virtual/libintl[static-libs(+)] )
+"
+
+RDEPEND="
+	traceroute6? ( !net-analyzer/traceroute )
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+	static? ( ${LIB_DEPEND} )
+"
+
+if [[ ${PV} == "99999999" ]] ; then
+	BDEPEND+="
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-ns-stylesheets
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt:0
+	"
+fi
+
+PATCHES=(
+	# Upstream; drop on bump
+	"${FILESDIR}"/${P}-optional-tests.patch
+	# Upstream; drop on bump
+	"${FILESDIR}"/${P}-fix-no-ipv6-ping.patch
+)
+
+src_prepare() {
+	default
+
+	plocale_get_locales > po/LINGUAS || die
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	local emesonargs=(
+		-DUSE_CAP="$(usex caps true false)"
+		-DUSE_IDN="$(usex idn true false)"
+		-DBUILD_ARPING="$(usex arping true false)"
+		-DBUILD_CLOCKDIFF="$(usex clockdiff true false)"
+		-DBUILD_PING="true"
+		-DBUILD_RARPD="$(usex rarpd true false)"
+		-DBUILD_RDISC="$(usex rdisc true false)"
+		-DENABLE_RDISC_SERVER="$(usex rdisc true false)"
+		-DBUILD_TFTPD="$(usex tftpd true false)"
+		-DBUILD_TRACEPATH="$(usex tracepath true false)"
+		-DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)"
+		-DBUILD_NINFOD="false"
+		-DNINFOD_MESSAGES="false"
+		-DNO_SETCAP_OR_SUID="true"
+		-Dsystemdunitdir="$(systemd_get_systemunitdir)"
+		-DUSE_GETTEXT="$(usex nls true false)"
+		$(meson_use !test SKIP_TESTS)
+	)
+
+	if [[ "${PV}" == 99999999 ]] ; then
+		emesonargs+=(
+			-DBUILD_HTML_MANS="$(usex doc true false)"
+			-DBUILD_MANS="true"
+		)
+	else
+		emesonargs+=(
+			-DBUILD_HTML_MANS="false"
+			-DBUILD_MANS="false"
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_compile() {
+	tc-export CC
+	meson_src_compile
+}
+
+src_test() {
+	if [[ ${EUID} != 0 ]]; then
+		einfo "Tests require root privileges; Skipping ..."
+		return
+	fi
+
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	dodir /bin
+	local my_bin
+	for my_bin in $(usex arping arping '') ping ; do
+		mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die
+	done
+	dosym ping /bin/ping4
+
+	if use tracepath ; then
+		dosym tracepath /usr/bin/tracepath4
+	fi
+
+	if use ipv6 ; then
+		dosym ping /bin/ping6
+
+		if use tracepath ; then
+			dosym tracepath /usr/bin/tracepath6
+			dosym tracepath.8 /usr/share/man/man8/tracepath6.8
+		fi
+	fi
+
+	if [[ "${PV}" != 99999999 ]] ; then
+		local -a man_pages
+		local -a html_man_pages
+
+		while IFS= read -r -u 3 -d $'\0' my_bin
+		do
+			my_bin=$(basename "${my_bin}")
+			[[ -z "${my_bin}" ]] && continue
+
+			if [[ -f "${S}/doc/${my_bin}.8" ]] ; then
+				man_pages+=( ${my_bin}.8 )
+			fi
+
+			if [[ -f "${S}/doc/${my_bin}.html" ]] ; then
+				html_man_pages+=( ${my_bin}.html )
+			fi
+		done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
+
+		pushd doc &>/dev/null || die
+		doman "${man_pages[@]}"
+		if use doc ; then
+			docinto html
+			dodoc "${html_man_pages[@]}"
+		fi
+		popd &>/dev/null || die
+	else
+		if use doc ; then
+			mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	fcaps cap_net_raw \
+		bin/ping \
+		$(usex arping 'bin/arping' '') \
+		$(usex clockdiff 'usr/bin/clockdiff' '')
+}
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index 1bf09bf868bd..dcf69856c236 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -1,8 +1,6 @@
 AUX mikutter 137 BLAKE2B f76eb22d6492f8737ce7de92068f551ece304a7d983a922555db1d6bd36ad895376c7812840afe579959a122c7619ef02c209cb7dc06da1011bc95b9b8d9fe74 SHA512 bbf70ab03b994f9593ea3854d1911f23d1a78d155e6aa755b2456f138ef6f7f2ca5ad7aea477beca487dac43a2e5472ca7f2e7d1503a57aaa93f41f06cafccba
-DIST mikutter-4.0.6.tar.gz 2322108 BLAKE2B 46d0cda2bc173ee971e516f017f66e26e9f7a4abd7330111ef66cd40bd0c6dd407b3d6988fa5955ca33a2c375cb77b4c234c8439dc27b6baf43dfcc9a34f4052 SHA512 16dca21bf7f989d2af71a8acc26816dbd7ebff7866b65d4c376b87cf2ba7757d8978a25483cb548448e3341c51d7767b638775e2696f64484b4f5ec8cdce050e
-DIST mikutter-4.1.5.tar.gz 2331485 BLAKE2B 25113ed59cad43094b77bacdf2e42079d9fb5a641a0b2e7ac9529e66183b6f7f953182350cf1d7f8703c10dda0a973edddd54b6c092fc3bf4c3ffe1cc243c2bf SHA512 a8d4be8fb4bf73a9b383ee0d18a6a6c91b6a4ad4ff5837c483da6274b70e4390600d729e303e00a3d4068791e80e0c83619760a3b885cbc4e3717eefb48b3c7c
+DIST mikutter-4.1.7.tar.gz 2331574 BLAKE2B a60918f2bfe3a56087536c0b3313f454cdee61fd4c988008581f8a9e3373a76d78e8c93d051ff21b45874e9d4944522c2feafc4ec06fd669e7568b8f9864911c SHA512 bb7fa2ebb22484e6244c2ac6747b811d0ebc1eadca9997c9b272c6378149f63f01b9f1b5c30b36150b38997c973233b8f7b9c3f310c5e36e3ee23edec67eddc5
 DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4
-EBUILD mikutter-4.0.6-r1.ebuild 2842 BLAKE2B 368b17c9ada5dd40769217aa855a0d0a15effe69e57079dce86a0367a9b260ab0af3b554a755e052767978056bbf796de8fd222cfc487b99ba962b693596ae79 SHA512 ce83f8171810471109b22af7b28361af1bb787e4827431028e1b8f13dc0b3b2a079e8f28269c408c0726388515108f584cf45fc371c08eb6a5eb174ad1f161c0
-EBUILD mikutter-4.1.5-r1.ebuild 2913 BLAKE2B 36e99d05b7da8ad19460a0c079406228125a17363609c4887e5053b8ffb058e09c01c3780dc75b1eb43eadf6d66287c3d95d36985593b9b6133291a233088e0c SHA512 595a6d4cb91b9358574002382b1dc26afc46e4d6bef44c824a078aafe5248916f8ae8fc78062c312aabb85a55cf40ebf02feecb1e261543cabb2b2e4cff32938
+EBUILD mikutter-4.1.7.ebuild 2913 BLAKE2B 36e99d05b7da8ad19460a0c079406228125a17363609c4887e5053b8ffb058e09c01c3780dc75b1eb43eadf6d66287c3d95d36985593b9b6133291a233088e0c SHA512 595a6d4cb91b9358574002382b1dc26afc46e4d6bef44c824a078aafe5248916f8ae8fc78062c312aabb85a55cf40ebf02feecb1e261543cabb2b2e4cff32938
 EBUILD mikutter-9999.ebuild 2913 BLAKE2B 36e99d05b7da8ad19460a0c079406228125a17363609c4887e5053b8ffb058e09c01c3780dc75b1eb43eadf6d66287c3d95d36985593b9b6133291a233088e0c SHA512 595a6d4cb91b9358574002382b1dc26afc46e4d6bef44c824a078aafe5248916f8ae8fc78062c312aabb85a55cf40ebf02feecb1e261543cabb2b2e4cff32938
 MISC metadata.xml 215 BLAKE2B b8deb40f472148c0470ad5a4a39aba042d968cd059c2e8e1adf9cc530ff5c3fe45435fdd71034e2fbaf2f725fdb65367e1179e09019bacdd886f917bebfb2302 SHA512 973c3da0775f8f2ed293f7c3e548804d4ff19e04da7e6a03a30265b7365f704acaf1cd4534fb4513d81b85e6c79aa31b01c42bf716903beccf53b715331c8965
diff --git a/net-misc/mikutter/mikutter-4.0.6-r1.ebuild b/net-misc/mikutter/mikutter-4.0.6-r1.ebuild
deleted file mode 100644
index 0a87e3d4a471..000000000000
--- a/net-misc/mikutter/mikutter-4.0.6-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-inherit desktop ruby-ng
-
-PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09"
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git
-		https://github.com/toshia/twitter_api_keys.git"
-	inherit git-r3
-	SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/all"
-else
-	SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz
-		https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Simple, powerful and moeful twitter client"
-HOMEPAGE="https://mikutter.hachune.net/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+libnotify"
-
-DEPEND=""
-RDEPEND="
-	libnotify? ( x11-libs/libnotify )
-	media-sound/alsa-utils"
-
-ruby_add_rdepend "=dev-ruby/addressable-2.8*
-	=dev-ruby/delayer-1.1*:1
-	=dev-ruby/delayer-deferred-2.1*
-	!<dev-ruby/delayer-deferred-2.1.3
-	=dev-ruby/diva-1.0*
-	!<dev-ruby/diva-1.0.2
-	dev-ruby/httpclient
-	dev-ruby/json:2
-	=dev-ruby/memoist-0.16*
-	!<dev-ruby/memoist-0.16.2
-	dev-ruby/moneta
-	dev-ruby/nokogiri
-	>=dev-ruby/oauth-0.5.4
-	=dev-ruby/pluggaloid-1.2*
-	dev-ruby/rcairo
-	=dev-ruby/ruby-gettext-3.3*
-	!<dev-ruby/ruby-gettext-3.3.5
-	=dev-ruby/ruby-gtk2-3.4*
-	=dev-ruby/typed-array-0.1*
-	!<dev-ruby/typed-array-0.1.2
-	virtual/ruby-ssl"
-
-all_ruby_unpack() {
-	if [ "${PV}" = "9999" ];then
-		git-3_src_unpack
-	else
-		default
-	fi
-}
-
-all_ruby_install() {
-	local rubyversion
-
-	if use ruby_targets_ruby26; then
-		rubyversion=ruby26
-	elif use ruby_targets_ruby25; then
-		rubyversion=ruby25
-	fi
-
-	exeinto /usr/share/mikutter
-	doexe mikutter.rb
-	insinto /usr/share/mikutter
-	doins -r core plugin
-	sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \
-		| newbin - mikutter
-	dodoc README
-	make_desktop_entry mikutter Mikutter \
-		/usr/share/mikutter/core/skin/data/icon.png
-
-	insinto /usr/share/mikutter/plugin/twitter_api_keys
-	newins "${DISTDIR}"/twitter_api_keys.rb twitter_api_keys.rb.in
-}
-
-pkg_postinst() {
-	echo
-	elog "To use Twitter, you need to setup your Consumer Key/Consumer Secret by running"
-	elog "  emerge --config =${PF}"
-}
-
-pkg_config() {
-	local PLUGIN_DIR="${EROOT}"/usr/share/mikutter/plugin
-	local CK CS
-
-	echo
-	einfon "Please input your Consumer Key for Twitter: "
-	read -r CK
-
-	echo
-	einfon "Please input your Consumer Secret for Twitter: "
-	read -r CS
-
-	if [ -z "${CK}" -o -z "${CS}" ]; then
-		eerror "Consumer Key or Consumer Secret is missing."
-		return
-	fi
-
-	sed -e "/consumer_key = /s!''!'${CK}'!" \
-		-e "/consumer_secret = /s!''!'${CS}'!" \
-		${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb.in > \
-			${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb
-
-	echo
-	einfo "Consuker Key/Consumer secret is set."
-}
diff --git a/net-misc/mikutter/mikutter-4.1.5-r1.ebuild b/net-misc/mikutter/mikutter-4.1.7.ebuild
index e6080f7b5c7a..e6080f7b5c7a 100644
--- a/net-misc/mikutter/mikutter-4.1.5-r1.ebuild
+++ b/net-misc/mikutter/mikutter-4.1.7.ebuild
diff --git a/net-misc/mstpd/Manifest b/net-misc/mstpd/Manifest
index f89fbf73695c..414f5d328354 100644
--- a/net-misc/mstpd/Manifest
+++ b/net-misc/mstpd/Manifest
@@ -1,3 +1,5 @@
 DIST mstpd-0.0.9.tar.gz 113711 BLAKE2B 93ff0213a634fcbbb613c79227d737c3961f4de669e0ac2c7351fa1c22842669edc652ba0deb24917a44df5a465a4e905a98e46ab7ccc7e4ebfd13039e6acfe0 SHA512 1d4a926d8437b7c41c69d2a047718181ca6245f3150e4aeb631f437edaaafe0c40b29802a6c9ea38c9f1dfb1b94149934b473f550358be10bb796295fa632e1e
+DIST mstpd-0.1.0.tar.gz 115670 BLAKE2B d0b666f16941ebb161cf91ad849da9d8f1927e90052f02cbab759685864bdd6040525bcbb69ca3e602140fa7245f1a48eed00d7e8515eb849ae0bd586f41588d SHA512 c3f7e1045e89eaad05b212993e4fb79e3662d247e371340276c59b92e33c732a9d82ed3490ce3b51e79c666db9f999916667d2be5da1f928e1624b288b0295bb
 EBUILD mstpd-0.0.9-r1.ebuild 733 BLAKE2B 564c91acdbcab65c4bd1806da02dd052d8bcf619fbc5102e27219ec9a3abb50d38a329330a507dfde911062663f308fdd9a93ee4c7feff834e3b8039c7dbf3b9 SHA512 d16f59418b6884c3d335dad2c8c2ee9e11ec468fcdaf0a1707e430e1f074aade0d3fd78d1cd3e0b8ef28681e97d8c426b7698594aad63d0df756f925956c417f
+EBUILD mstpd-0.1.0.ebuild 733 BLAKE2B 990abdcd2c89d7a82a7fd308289e479a6c828935aebd1d6a78b6522727cae140e9e62d1c33e887bbb7a79ff781e353056507c96a5afd432673faaa7bd6cfb9ec SHA512 2c554f3655906a5ff648626b0ec7eb3d0be7d74e5061bad6227907824400f1b7e246af22236274190947ea3925e2a6b8d97763e86858c630e210a824fe4d06fa
 MISC metadata.xml 324 BLAKE2B ef9e36b394aac8a3f2bb74d5b9ebcc8fc6bed743cad7afc6937b9efdcb1b0389d13d59f5b6f8d23cbc5ed3f15a98b66cb9265e71ac875d7a0466e909d6d7e60d SHA512 e518c69f5f7d9a294a88ea36e2b9f01c1362759decb2779290349e359c47ac0c641cab4e7c50cf7e8e8358db90fd7598b90203e282068b0cb49473ebdc1dcb18
diff --git a/net-misc/mstpd/mstpd-0.1.0.ebuild b/net-misc/mstpd/mstpd-0.1.0.ebuild
new file mode 100644
index 000000000000..c8603cd165e9
--- /dev/null
+++ b/net-misc/mstpd/mstpd-0.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 systemd
+
+DESCRIPTION="Multiple spanning tree protocol daemon"
+HOMEPAGE="https://github.com/mstpd/mstpd"
+SRC_URI="https://github.com/mstpd/mstpd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-bashcompletiondir="$(get_bashcompdir)" \
+		--with-systemdunitdir="$(systemd_get_systemunitdir)" \
+		--localstatedir="${EPREFIX}"/
+}
+
+src_install() {
+	default
+	dosym ../../sbin/bridge-stp /lib/mstpctl-utils/mstpctl_restart_config
+	dosym bridge-stp /sbin/mstp_restart
+}
diff --git a/net-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest
index a25c6c4533e9..d00e65a9e62b 100644
--- a/net-misc/netkit-rsh/Manifest
+++ b/net-misc/netkit-rsh/Manifest
@@ -28,9 +28,7 @@ AUX rlogin.pamd-pambase 343 BLAKE2B cc9aadbbb9ec6d9bdbba996e4388ec75292b137f7843
 AUX rlogin.xinetd 282 BLAKE2B 35a5412dfc8836bc9f2906faabedd42b8f2647660df0ea2d49d0286a998a8e22206fbf445a58e95a2d9f622911ff526f3de4804d1fe310f0bef564f1397ade80 SHA512 2e8a468420cb2cb08111d0d9a6498b02e6c768682bf9ea9d06a7dcbe1b12336fea25265e2705f2fa028d91cf453ca5fc1a9245f1d03a83e4d99064b078a2f322
 AUX rsh.pamd-pambase 365 BLAKE2B bb469c2d31e70a8b448b0ed282b0d66e23f68daae5958ea6f43fedda6dd79682e58d3c8deb99c3d31a002fd6567d8bbb564e791b2b98b1a8e323365b90fd8efe SHA512 cbf7af64773b39254136d04e5195ac3737815ff7c033278b3bfd6173ec3a0ae569393c86d5def38da11072718c004a5aeb75733b1910ec9dc0125c72edaa915b
 AUX rsh.xinetd 279 BLAKE2B db403023417d537fb944c677553f71e782d80dfe08dc5f938815617350c91ee50dda082c632577ec1c37ca8b40de6441a5d5fe07d3799ef1cd1f4cdf0a8d9982 SHA512 3c6b29e51adf5766ba417ef85763d5c85384be653109e02df307ed61047eb4d4706980da56b121f3bcc63b74b842c5e8ecaaf2629d18e5d2723b3aac08e0282d
-DIST netkit-rsh-0.17-patches-3.tar.lzma 13875 BLAKE2B 80470c4a9fdbfebd351217e48ec178c1d2c58e49f454eadd514ed76e3653fde1d21cd19f7a3400762e6fb4d4bb2f9cfefebbf042ef5bf1903d67ebbe17254515 SHA512 0d9c6a8a8d13264b8f2eb6b62e6c65b67cf8b09bd36043acae405c7b2154724733db15d653e4f7ac7d21feebcfa6cd365ca89993fc77eabc5a709d7a6383b187
 DIST netkit-rsh-0.17.tar.gz 58268 BLAKE2B 7790a91f95c51f4aa538ad614e65ecba5a565e4761c7d8167f4d175bb8bcc27cb48b569f93064285dad983e602f03bcb816da58b02b54290adcd9cabe73cd88e SHA512 0d8da4a779da137f7b3f158ad010b71f2357c86a2160dbd19331cbf45f86a46110cdfdfd3c4ba2d19ddf3634917bf981eb91bfde02c3cdbc946df8695db75218
 DIST rexec-1.5.tar.gz 18469 BLAKE2B cbb694520332a0768b8337e854baf232271a30ac328dcf4b8b16d28dc3710ad58173e135cb9eb9726b07709bcd78ef627cea550c98e00dc86bea7c64e52aa3d1 SHA512 7ed455a921ad71749154bd8e586ac2a624f357b56be17db73b9ed7c1ca1bc19cfb9aee748f79cc649184dfb535ffe5e887643b73a25c3fb6520d4e19fae7333a
-EBUILD netkit-rsh-0.17-r13.ebuild 1778 BLAKE2B ec51ebf68d2bb3fa775677a7901980df01305190c3581e6bfbc8deb5a5f880ff6e05f43c1cedb7145d0348fa18faf327ec5458c1e138b0eaa0c0bcfa6a9c6f63 SHA512 1f0c4bc1b2c3a052b30efe2c118f8120d8f04503ca0c8f6d66b69da93cb252b9f5372bd7f7ba0b823e6fee0bdd48b19d4ca330e7420c9285f835716501339732
 EBUILD netkit-rsh-0.17-r14.ebuild 1748 BLAKE2B 6a3757f61e0cd8d47bb2a4fbb93c6fae5df85dc6283514bdf87982c715d0a1e324ed1190251890137ea24e9515e751d910b828acf86bec6264f92050a0c8dbcc SHA512 15effd09a82ea36d1ba89ab25211e3fbf1f86cc409c5772e16537f05229f27c87512902c24d412bd829eb7e0d4424c66c3b744ad4b342cf5432d199fa9125cec
 MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r13.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r13.ebuild
deleted file mode 100644
index be9d9cee75a6..000000000000
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r13.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam toolchain-funcs fcaps
-
-PATCHVER="3"
-
-DESCRIPTION="Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}"
-HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
-	mirror://gentoo/rexec-1.5.tar.gz
-	mirror://gentoo/${P}-patches-${PATCHVER}.tar.lzma"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="pam"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	virtual/libcrypt:=
-	pam? ( >=sys-auth/pambase-20080219.1 )"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/xz-utils"
-
-FILECAPS=( cap_net_bind_service usr/bin/r{cp,login,sh} )
-
-src_prepare() {
-	rm -r rexec || die
-	mv ../rexec rexec || die
-
-	[[ -n ${PATCHVER} ]] && eapply "${WORKDIR}"/patch
-	eapply_user
-
-	if tc-is-cross-compiler ; then
-		# Can't do runtime tests when cross-compiling
-		sed -i -e "s|./__conftest|: ./__conftest|" configure || die
-	fi
-}
-
-src_configure() {
-	tc-export CC
-	${CONFIG_SHELL:-/bin/sh} ./configure $(usex pam '' '--without-pam') || die
-
-	sed -i \
-		-e "s:-pipe -O2:${CFLAGS}:" \
-		-e "/^LDFLAGS=$/d" \
-		-e "s:-Wpointer-arith::" \
-		MCONFIG || die
-}
-
-src_install() {
-	insinto /etc/xinetd.d
-
-	local b
-	for b in rcp rexec{,d} rlogin{,d} rsh{,d} ; do
-		if [[ ${b} == *d ]] ; then
-			dosbin ${b}/${b}
-			dosym ${b} /usr/sbin/in.${b}
-			doman ${b}/${b}.8
-		else
-			dobin ${b}/${b}
-			doman ${b}/${b}.1
-			if [[ ${b} != rcp ]]; then
-				newins "${FILESDIR}"/${b}.xinetd ${b}
-
-				if use pam; then
-					newpamd "${FILESDIR}/${b}.pamd-pambase" ${b}
-				fi
-			fi
-		fi
-	done
-
-	dodoc README ChangeLog BUGS
-	newdoc rexec/README README.rexec
-}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index f5707ec6b9d8..1e5470f4629c 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -3,9 +3,11 @@ AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4
 DIST NetworkManager-1.32.10.tar.xz 5353296 BLAKE2B af176abd4dd8f725741cc8fde10245606d1b00cb6b11cde11b2e3bce74a33980fdf76fab5c6c769a4275c5168098cb2531a0a03909db8eef5fa502d464d59bd1 SHA512 c4eb9114869efba197c3ec1e99d7d5bc54222d9c7118cf699fe61130952a20376a760b86909290d6312a4a23016d51f9ff90ba8eadbbcda84ce811e441293d8d
+DIST NetworkManager-1.32.12.tar.xz 5373452 BLAKE2B 29ca1f1c2aea60e4ddc7e3d5464604b329c8b740a2a143266c0bc05ec6a16079cfdf67770fc75afe523664e2e4234189031a8ffa2f51c0f02d4760f3ab20e04a SHA512 b8dfa409302781fdab19790afeb7f4396875e282d6983e2c5775294c8c13d3c1036dee69a37bf6e4fb2a2e80504c8e792780b6a9c1262616e57860da5ebc0e61
 DIST NetworkManager-1.32.4.tar.xz 5250412 BLAKE2B 6c0931d50a8666f88865d4ca5281e1570dd230156e30bb27822c9ea3d93b3b3b24f336e154787794e7edd7c00296f9f7c5761136cac0c0eacf142a0371cbfe81 SHA512 95be90d4c8f8f9f58a3c7ad8d8c9b592d2b77f283df58b495fe1b673c4fadd4409f4fc00fc9766343e3ac240dd805583db4f05e6d1f0b367fe22b306227fc684
 DIST NetworkManager-1.32.8.tar.xz 5255076 BLAKE2B 5f1bc55e3b9e6864c05421c8506ac202162deaf5081450e5d50f52699abc2d9bfb6e89b6f48c9874cccdc11fe754a5063a63e830702e211cf178ce7df0d628fb SHA512 328733f3dce9e52e680e464b60112995439f94dfeaea3b6c2082b323e85418483db6c6dc9e43f52176ff7c1291b226db77fe5acab9935dad7735c4397f5e9b83
 EBUILD networkmanager-1.32.10-r1.ebuild 11700 BLAKE2B b4c9637d6b137a997dbc04f67b83d1e8fa9558a50b59792aa3ec855f546c8ba908fd6e92addad7801b8be1d45c42654faf99bd0061d2a15940ee2bb2d4586cfd SHA512 029d913e260792f39e674a33ffe7cb36765e5fc95f9229f0139bf846cb1c9a1de1ecb9c1838adc36bf4006907c8425104dd578e4517bbe971d78af14db3bff63
+EBUILD networkmanager-1.32.12.ebuild 11973 BLAKE2B cb84cd0969914f4373c8162a8d51580fd3555b4ab8028de641ee6f8749a4ad5cc39ad1af3385663654ac67e1f26de7bc1c837f9e94b7549a777014bd8b75bded SHA512 60de1b88e8b0e464e0bbbdb858640af6e73dd77d8a698f649b4e5151e39f54617f2827cd617375a7fff34e5d0ac0612df3688d75a8cbf9b6c0cb18939d46b2f8
 EBUILD networkmanager-1.32.4-r1.ebuild 11371 BLAKE2B 5ad40b864ffd1ded48fd148267362ffaca2b1139332a1fd7e632909ef617b9549b4cf913be4dd43bdd8c862b6eb77a284aa75863c10bba4e0859bd3ee9dc8808 SHA512 e44332cfac5c3e9cd2931e5f5a40c3b219c0f55684c0bced16432ba40ebacf2dffe368a741f521014cbac4a16eb04d88c985fdbfd6c1f4c9da8f31ddfe919a9e
 EBUILD networkmanager-1.32.8-r1.ebuild 11384 BLAKE2B 8ba69b4605e75af3d6ae5cdded420ab18aba256b9ea4dee03885d068f0715e405c8fa6698a7c8bce9f6578293d37ca357829f801cebcef55cc3982c197b22648 SHA512 01ef6f7183dcf8d0876a725f729d8d064b492c295ec12345465fe74823d26a14dfd03a4f0331283dcd8d98c8606bc46ca2c8d1ab10385b5516ac1f02a8904667
 MISC metadata.xml 2377 BLAKE2B e665210ad074426373296d0164654cd793c0fad1eb71ba68ede73ecbcbb17c1636722a7676bc5ccde93d0a8b7c75c170a3cc0bfe1f06305984dc630e8c0e0b2b SHA512 e43a86d9af9ff0dbc2d701b59f29ffca279f9a3adaf3fd3473f170827c15e77a454e6f5df554028c300e13dd536fdee0528acab62eb706f7061a3600b2e9dad3
diff --git a/net-misc/networkmanager/networkmanager-1.32.12.ebuild b/net-misc/networkmanager/networkmanager-1.32.12.ebuild
new file mode 100644
index 000000000000..e158bf041108
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.32.12.ebuild
@@ -0,0 +1,392 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="NetworkManager"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd kernel_linux psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	connection-sharing? ( || ( iptables nftables ) )
+	gtk-doc? ( introspection )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( gnutls nss )
+	?? ( elogind systemd )
+	?? ( dhclient dhcpcd )
+	?? ( syslog systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+COMMON_DEPEND="
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	elogind? ( >=sys-auth/elogind-219 )
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	sys-apps/dbus
+	net-libs/libndp
+	systemd? ( >=sys-apps/systemd-209:0= )
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	selinux? ( sys-libs/libselinux )
+	audit? ( sys-process/audit )
+	teamd? (
+		>=dev-libs/jansson-2.7:=
+		>=net-misc/libteam-1.9
+	)
+	policykit? ( >=sys-auth/polkit-0.106 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	gnutls? (
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
+	)
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	modemmanager? (
+		net-misc/mobile-broadband-provider-info
+		>=net-misc/modemmanager-0.7.991:0=
+	)
+	bluetooth? ( >=net-wireless/bluez-5 )
+	ofono? ( net-misc/ofono )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
+	ovs? ( >=dev-libs/jansson-2.7:= )
+	resolvconf? ( net-dns/openresolv )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		iptables? ( net-firewall/iptables )
+		nftables? ( net-firewall/nftables )
+	)
+	psl? ( net-libs/libpsl )
+	concheck? ( net-misc/curl )
+	tools? (
+		sys-libs/readline:0=
+		>=dev-libs/newt-0.52.15
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.18
+	net-libs/libndp[${MULTILIB_USEDEP}]
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		>=dev-libs/jansson-2.7
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+
+	# bug 809695
+	if tc-is-clang && use lto; then
+		eerror "Clang does not support -flto-partition"
+		die "Please use gcc or turn off USE=lto flag when building with clang"
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	default
+	use vala && vala_src_prepare
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		--localstatedir="${EPREFIX}/var"
+
+		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
+		-Dsystem_ca_path=/etc/ssl/certs
+		-Dudev_dir=$(get_udevdir)
+		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
+		-Dkernel_firmware_dir=/lib/firmware
+		-Diptables=/sbin/iptables
+		-Dnft=/sbin/nft
+		-Ddnsmasq=/usr/sbin/dnsmasq
+		#-Ddnssec_trigger=
+
+		-Ddist_version=${PVR}
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool policykit config_auth_polkit_default)
+		-Dmodify_system=true
+		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool systemd systemd_journal)
+		-Dhostname_persist=gentoo
+		-Dlibaudit=$(multilib_native_usex audit)
+
+		$(meson_native_use_bool wext)
+		$(meson_native_use_bool wifi)
+		$(meson_native_use_bool iwd)
+		$(meson_native_use_bool ppp)
+		-Dpppd=/usr/sbin/pppd
+		$(meson_native_use_bool modemmanager modem_manager)
+		$(meson_native_use_bool ofono)
+		$(meson_native_use_bool concheck)
+		$(meson_native_use_bool teamd teamdctl)
+		$(meson_native_use_bool ovs)
+		$(meson_native_use_bool tools nmcli)
+		$(meson_native_use_bool tools nmtui)
+		$(meson_native_use_bool tools nm_cloud_setup)
+		$(meson_native_use_bool bluetooth bluez5_dun)
+		-Debpf=true
+
+		-Dconfig_plugins_default=keyfile
+		-Difcfg_rh=false
+		-Difupdown=false
+
+		$(meson_native_use_feature resolvconf)
+		-Dnetconfig=disable
+		-Dconfig_dns_rc_manager_default=symlink
+
+		$(meson_feature dhclient)
+		-Ddhcpcanon=disable
+		$(meson_feature dhcpcd)
+
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc docs)
+		-Dtests=$(multilib_native_usex test)
+		$(meson_native_true firewalld_zone)
+		-Dmore_asserts=0
+		$(meson_use debug more_logging)
+		-Dvalgrind=no
+		-Dvalgrind_suppressions=
+		-Dld_gc=false
+		$(meson_native_use_bool psl libpsl)
+		-Dqt=false
+
+		$(meson_use lto b_lto)
+	)
+
+	if multilib_is_native_abi && use systemd; then
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=systemd )
+		emesonargs+=( -Dsuspend_resume=systemd )
+	elif multilib_is_native_abi && use elogind; then
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=elogind )
+		emesonargs+=( -Dsuspend_resume=elogind )
+	else
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=no )
+		emesonargs+=( -Dsuspend_resume=auto )
+	fi
+
+	if multilib_is_native_abi && use syslog; then
+		emesonargs+=( -Dconfig_logging_backend_default=syslog )
+	elif multilib_is_native_abi && use systemd; then
+		emesonargs+=( -Dconfig_logging_backend_default=journal )
+	else
+		emesonargs+=( -Dconfig_logging_backend_default=default )
+	fi
+
+	if multilib_is_native_abi && use dhclient; then
+		emesonargs+=( -Dconfig_dhcp_default=dhclient )
+	elif multilib_is_native_abi && use dhcpcd; then
+		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
+	else
+		emesonargs+=( -Dconfig_dhcp_default=internal )
+	fi
+
+	if use nss; then
+		emesonargs+=( -Dcrypto=nss )
+	else
+		emesonargs+=( -Dcrypto=gnutls )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx meson_src_test
+	fi
+}
+
+multilib_src_install() {
+	meson_src_install
+	if ! multilib_is_native_abi; then
+		rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules
+
+	insinto /usr/lib/NetworkManager/conf.d #702476
+	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
+	rmdir "${ED}"/usr/share/doc/NetworkManager || die
+
+	# Empty
+	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index a92c15728412..33118b57947f 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -6,6 +6,7 @@ AUX ntp-4.2.8-sntp-test-pthreads.patch 325 BLAKE2B eb4d7c8b6723d0f5d17670d8ca2e9
 AUX ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch 1305 BLAKE2B b92635ce5512c9907b974ba2a07c567219783192379f1da8fef445637a3d36f9d52cd1be055d7e5df733448ddd41b490b02210ed8aec5770f84dc63d46650636 SHA512 6d6e3d98ff3b76575df8c5fa57e9ed4f7f9a4e12c2ffcfafe762a5f93ca3af8a807fd08a1cbb7c276748384702d98b60e160795cc0875fa73a3304bbe0038ba9
 AUX ntp-4.2.8_p14-add_cap_ipc_lock.patch 474 BLAKE2B 5045ea1d6b07de0bd3ea46e0dc63a424f01f34241414f192cd73cb09ff080864ca1b94600d0f494772b06df87db1e7adc32c5bfc3c88c57efb2b04fd2cafee41 SHA512 8a852794095c650ce75707d2fb5ded1e575b7d2167d5c0ef79c1007a3bb45f6b21f8a5bd4deb0e966b7ed9b8941e5c7746eef73b1f0f6e5fd4f7d8e32a6b007f
 AUX ntp-4.2.8_p15-gcc10.patch 2019 BLAKE2B df64e28c70d7aa1cf2513b594dc5f79f0be862c6dd0ba3e3e75e6bce394eeaff2bd994e65ad4435d212bd1b2c406e49e587c72a6c8f9fc1f63fa166dac717844 SHA512 15f2756c1ac370f4896ffc1d8bd340bb7c09869c47a78edc66da855855c9dca0adeef0e03d262ace9c7ae408c2bcb080d6e01e4fc32783518fb8db28b08200b7
+AUX ntp-4.2.8_p15-glibc-2.34.patch 928 BLAKE2B 993f2c6ab2b4e6242811d553e0021911bbae37ba5febbbf9914bef5481c3b1472c273fc04a6d6f1e420bed2b4eb3193bc4a9532faa6b23e9f2a2802b1664e187 SHA512 474f50f92b105cbd3e9b3700418114ea65c3998e28ddb7a11d45602a7865bdcad07ee251176bf2e4012e3a15792a4334ee85aca198cbb98c757fc12cdd09747d
 AUX ntp-client.confd 776 BLAKE2B 7c65232560d4443f21bea7e5e0e8183f8397e092b6c489faa18188b9df9f8678244cd816e6d8d6e12b8d89a2b33873b9d0a2173957217879320db20744b3876c SHA512 2d6b9d96c55787cf4556332054a61399368dcf37cf76a14aaba3f8e2e4fdd47ce25808f9babda2ca1f2a6e7387c043e023251ba2b99786426c875bd7cb6592a6
 AUX ntp-client.rc 720 BLAKE2B 5662d2f6635b8d5bb07fbc82c259a8af7871b8312ebff0184005d3ea24f239a1d3e2b63a5a7e9eef8f385a72fcd9370a2e68031a7c54bf3ef28e8c26c97c0298 SHA512 557cb44fc911dcf34d21227c5d92c2ab56ca3fd855a5d2715c5f7343ae45a91c4b5492a84ac01a712bc251ea2a83810f4eb33e467b456b42c79052454a68dc81
 AUX ntp.conf 1614 BLAKE2B 88158ad4270a7b3f42de7d3dcaa5a2dc5f7900171c0259834ff781372bdb0e6b06d46c009890a0a2ab4b60b6759bc650324994a2b81ef9b9d0bc922047add9bc SHA512 b21afb9d2b9302edf702fce536218fa916e810e916c207dd6f2f09a9a793a465bc929b9a36108d49ddb3552e221b57cbb2e9f916eba78662b19c4b9c2b3e806c
@@ -20,5 +21,5 @@ AUX sntp.service-r3 320 BLAKE2B b47a7a4dab78c0ea9f85b861d7f5f2926e5302839db34b92
 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028
 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794
-EBUILD ntp-4.2.8_p15.ebuild 4460 BLAKE2B 2b8af143ba2ca9e9f6c4897b0f6d7754ec9f98faa17806ca8f1a3808ba715238daa5a0694793b615144ace4af72c30c655160278b8fdca7829ad05fad26afdc6 SHA512 28aa913b4692f39f967ada7b5ac0930c6180a6e7daffcf0fe80a04add468c20a37d28e8a8b74391eca45e3bdb20c7215ea883cafc7d6b9334068e0d2f01462ef
+EBUILD ntp-4.2.8_p15.ebuild 4508 BLAKE2B 77ef2a82b948ba41a9faa70fa224b28003cf902cfdb9b6da4f3da9ac356f7be5a16286e358a7a762c1820749b16641b66366247e38afa525ba6eb08512a6ddba SHA512 aaa55e1de4599ab2509d93106dda077d931e25262017a78f09c4dfe1a32c22850d4dd8615c9cdef7cc0e354722dad6b99895dd9fa0917ecdeca83dcaa3e80fd4
 MISC metadata.xml 1015 BLAKE2B e03bcac085561ec53ec02230b618fa01e26dd6167635f0af06434213305d5f4b966f94f0280db24a509990eaade216e7c7a853d9990969de26a8444088c5a444 SHA512 b00dc21b9b06f909812028bbad340d6b1c68b105fec664476cd4222947c687fc16f1925d77fb14e23b31c84a26849dc397acc7657726abfc35a43dfafc10589b
diff --git a/net-misc/ntp/files/ntp-4.2.8_p15-glibc-2.34.patch b/net-misc/ntp/files/ntp-4.2.8_p15-glibc-2.34.patch
new file mode 100644
index 000000000000..a32f3adabd8b
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8_p15-glibc-2.34.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/806358
+https://patchwork.openembedded.org/patch/180019/
+
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 31 Jul 2021 10:51:41 -0700
+Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc
+
+In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which
+could mean different stack sizes at runtime on different architectures
+and it also causes compile failure. Default glibc thread stack size
+or 64Kb set by ntp should be good in glibc these days.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/libntp/work_thread.c
++++ b/libntp/work_thread.c
+@@ -41,7 +41,7 @@
+ #ifndef THREAD_MINSTACKSIZE
+ # define THREAD_MINSTACKSIZE	(64U * 1024)
+ #endif
+-#ifndef __sun
++#if !defined(__sun) && !defined(__GLIBC__)
+ #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN
+ # undef THREAD_MINSTACKSIZE
+ # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN
+--
+2.32.0
+
diff --git a/net-misc/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild
index 0809ce703a5f..7e9d8bc04c23 100644
--- a/net-misc/ntp/ntp-4.2.8_p15.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p15.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
 	"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
 	"${FILESDIR}"/${PN}-4.2.8_p15-gcc10.patch #759409
+	"${FILESDIR}"/${PN}-4.2.8_p15-glibc-2.34.patch
 )
 
 src_prepare() {
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 78c3d3728cf5..2a9a4716506b 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -3,6 +3,8 @@ AUX olsrd-0.9.0.2-gtk.patch 926 BLAKE2B af444d476ed31190454fc89bd6802a6c41f33625
 AUX olsrd-0.9.6-gpsd.patch 537 BLAKE2B 841d0d92106a620aec47d781cf0a79e669e4aa3e6ba304c023a98c7776fc1df53e6bee5c080deb784106b05273a702d093617c9dc33bfa427a6f3b20c444234e SHA512 d3f89ead360acb8d1c26884ec7559c21dd1b7fbc40eb17d7d3fc2313e17d4f160b507d4b6271ed458d7b74fc7a7f1d9482fcb953d2762734fc963a1fb0e94f88
 DIST olsrd-0.9.6.1.tar.bz2 908871 BLAKE2B 180a30039607fd5c16676c62d0d1045bc5ce2a13675b34ca192f1f19127facb12428f6ba631e45fc42b191693a6ef987271745d769a74062ce682e1796b83dc9 SHA512 06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a
 DIST olsrd-0.9.8.tar.gz 14416300 BLAKE2B 67477d9359686cb163221f5f354f330b38811e9e77bd71379e359bbfba2b55e917009ac537b845420a5bb73284ac83e0b91495e011c810f8169e4edb6bea940f SHA512 cf3066310c4ea644ba1f482e847aa073ad006000308bfa993cecda4ccf4e9919a9005680b3c1d98e34f0c13818213f208e8dc93c8b060eeaaac160fc3df4ce8c
+DIST olsrd-0.9.8_p20210612.tar.gz 14446761 BLAKE2B ef841fcf81ae25acb3c47d70f15e34c614b17c28688e0f718aa45ebabea68844f825a4187bbf5468daa4763c8a2b8c87f5f5a502ce0c5fde1b940f9aa3c6ca5e SHA512 466b762ea1f9ecc4ded3298700d1786b893d87fbcc2e457c75f5adfaaf543e6cea5ab2e63d34814a7c2f65cab895fb19c4cb5a7ec5347b13d0e18703a641126e
 EBUILD olsrd-0.9.6.1.ebuild 2243 BLAKE2B c8c1227e9cb3c445c59c37bc88f567fe0d6f931fa02c3972c9eb0288eec57eb797877d411706c01ac7782ceee55f7b8143186af0d1fff028712e668b18b39e05 SHA512 f28e2701e44d7e6b6e9a5ab1044d337a1c9a456d6c35e85986e7fec9a2df9143d2a18b27c7f3a275d42cbcb78ad6a0894c212f42415bf3b041009e2f0792ec48
 EBUILD olsrd-0.9.8.ebuild 2411 BLAKE2B 0cda86cfb22e55060a58fc5e73e73997c4db95525eb12bcc12df80587f8c5d61b74bd32c51f2869a8aaa28f9b60e96441775bf40c5b2e13343df92bd74b9af59 SHA512 3d4cfb163509c3d2c71f51c5cf6bb2a9d11af4663856e6e5193233708747c35928d82aa03b89cfdaf299b7cc1b3858994b555bf6f1a85002bc119ac2583fb04e
+EBUILD olsrd-0.9.8_p20210612.ebuild 2608 BLAKE2B c17459c56b43e2707e67bc371b294fa42d3f9ed108fb96917f43f8ac4105b94c3ea732ad51de29877a23af06b847002072ee8d20873de0a50ebf99b596bc0882 SHA512 f28fdaf972b2a94a48d7dbc3e6f8b46f90f7d18641e49ce96880889c36bf1c4c6164931d101201332e51402e6fe39ca13f39ea24ef18bdf273102b49b57b2b92
 MISC metadata.xml 244 BLAKE2B c96f92863f59c5672e9fd06a833d19ac4884039c1a6b4550b167f4e228b663963c2f98534e9865cd039561345d1097edb52b4c5614417b46accc48c2acbab668 SHA512 c044670830d2077e8075125980c7502a96fc956fcdb24ac01d390afebe4780cf6b7f79b4a8749e57ae436fc5e8f7af976c02765ab5f6575de01a5f0881008c4c
diff --git a/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild b/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
new file mode 100644
index 000000000000..f106d0346a35
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+# Snapshot to fix build failure with >= bison 3.7
+# bug #735572
+MY_COMMIT="4973feb538b5b98b9d8ac2f8f474202f6d73de78"
+DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
+HOMEPAGE="http://www.olsr.org/"
+SRC_URI="https://github.com/OLSR/olsrd/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+#SRC_URI="https://github.com/OLSR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk pud"
+
+DEPEND="
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	pud? ( sci-geosciences/gpsd )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
+)
+
+src_prepare() {
+	default
+
+	# fix parallel make
+	# respect AR
+	# verbose build
+	# fix default prefix, bug #453440
+	sed -i \
+		-e '/@echo "\[/d' \
+		-e 's|$(MAKECMD)|$(MAKE)|g' \
+		-e 's|@$(CC)|$(CC)|g' \
+		-e 's|@ar |$(AR) |g' \
+		-e '/^prefix/s:/usr/local:/usr:' \
+		$( find -name 'Makefile*' ) || die
+
+	# respect LDFLAGS
+	sed -i \
+		-e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \
+		lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die
+}
+
+src_configure() {
+	if ! use pud; then
+		sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die
+	fi
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+
+	emake \
+		CC="$(tc-getCC)" \
+		LIBDIR="/usr/$(get_libdir)/${PN}" \
+		OLSRD_LDFLAGS="${LDFLAGS}" \
+		OS=linux \
+		VERBOSE=1 \
+		build_all
+
+	if use gtk; then
+		emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)"
+	fi
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		DOCDIR_OLSRD="${D}/usr/share/doc/${PF}" \
+		LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+		OS=linux \
+		STRIP=true \
+		install_all
+
+	if use gtk; then
+		emake -C gui/linux-gtk \
+			DESTDIR="${D}" \
+			LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+			install
+	fi
+
+	doinitd "${FILESDIR}"/${PN}
+
+	gzip -d \
+		"${ED}"/usr/share/man/man5/olsrd.conf.5.gz \
+		"${ED}"/usr/share/man/man8/olsrd.8.gz \
+		|| die
+
+	dodoc CHANGELOG \
+		valgrind-howto.txt files/olsrd.conf.default.rfc \
+		files/olsrd.conf.default.lq \
+		lib/arprefresh/README_ARPREFRESH \
+		lib/bmf/README_BMF \
+		lib/dot_draw/README_DOT_DRAW \
+		lib/dyn_gw/README_DYN_GW \
+		lib/dyn_gw_plain/README_DYN_GW_PLAIN \
+		lib/httpinfo/README_HTTPINFO \
+		lib/mini/README_MINI \
+		lib/nameservice/README_NAMESERVICE \
+		lib/pgraph/README_PGRAPH \
+		lib/quagga/README_QUAGGA \
+		lib/secure/README_SECURE \
+		lib/txtinfo/README_TXTINFO \
+		lib/watchdog/README_WATCHDOG
+}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 07d392edece9..db988590c81c 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,7 +1,5 @@
-DIST ownCloud-2.7.6.3261.tar.xz 14237692 BLAKE2B 914b069b10fa2f169677768e1578c5b8569836eb574889c72c0ea1ca3e16e6b7c65bcdd1f4a5ce4259eab6ec56110e3b45799d010921e47c7f64ccfd0ed545bf SHA512 1f647dd0b33472e31719651fa22b5864867d98fa1e2f11f9eadb6ce15382f5f97ac49d726af079716b6fac573367485a6f11a5b2e5e5c95d4d063f6caab51dcd
-DIST ownCloud-2.8.2.4246.tar.xz 15044652 BLAKE2B ee1ee412667266273a9a9722940559562c6c43213b013fe7c21328e04ac967afb16f460e6fa711f37d1d4ea7d0fc15fc398d835cf6a939f4c8dfd54cd4846fed SHA512 0ab2ef72191cc2d5c2621c97c09cb1d25472a30f511235a190465e246a8312f13a255011abb9690c481887f2f15094414c87ce594252eb8debcb39b9cbc8a178
 DIST ownCloud-2.9.0.5150.tar.xz 5775740 BLAKE2B c43044dd383d66dd212bcd3efd818fad289ac51b082eaa7b47db03778cdfc87725efbdffc567e416bf5444d7e58f795606f093a782ca783cefc2d4994df3fb2a SHA512 c183b2d4340dc8880d2bf31aedaffb96da518fdb60f1e8c857ee2f8d02c36cb69552475fdbf536f7ecebd9af2a7732f52a9e02f20450452c78d346910be3cf57
-EBUILD owncloud-client-2.7.6.3261.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b
-EBUILD owncloud-client-2.8.2.4246.ebuild 1859 BLAKE2B 424772bdbf79268cd0f5fbd26fe3fdac8cfa2d39407a6d89ee787c446ab8f0ceebf742dbbfa395beddc06d52f6768c1433fe70f19a3ffa6c5bdc6877f3d3fea9 SHA512 75a68396594feb6f1e4cedcea377b90e9b4c1e2ac0926985632e5d1b0473a60885f3ecd545518751b1a738b4fc1563b74468aba6e0793bf36b44791362aad0ab
+DIST ownCloud-2.9.1.5500.tar.xz 5787048 BLAKE2B 6f7df0c1ca13e6074bbd75caaee838ddb822f9284a4f5cc95e1b2c1432adf2969e2413607bebc1542d4bc7790bd6e61edfba758d2205a23fbede6873b7e22316 SHA512 5c78cd0318b7cd35f32721cf364d6e807d32eb1f3651e7f22ff3f3c7737967193ad089062965b3dcee24c23c14cc0d7acdfc95094f4f90f8aaf718f45f22e18a
 EBUILD owncloud-client-2.9.0.5150.ebuild 1541 BLAKE2B 5703093f44e5c8cbdfb96c94b798578f438d2d6fad50997feea985a86860dfbe2dd70b84d59fb2cc125e78bcc544ecd5fa147a0378f7cee7dabf47fc7ce067fb SHA512 ed7fd1391484791c428d97a7a21a6544198836c9f036ae1fe5acf45819a0184b9c075a418ed74bf1dcef61492017207aa5a4a56098fdfac4f0a57b2fe493290c
+EBUILD owncloud-client-2.9.1.5500.ebuild 1541 BLAKE2B 5703093f44e5c8cbdfb96c94b798578f438d2d6fad50997feea985a86860dfbe2dd70b84d59fb2cc125e78bcc544ecd5fa147a0378f7cee7dabf47fc7ce067fb SHA512 ed7fd1391484791c428d97a7a21a6544198836c9f036ae1fe5acf45819a0184b9c075a418ed74bf1dcef61492017207aa5a4a56098fdfac4f0a57b2fe493290c
 MISC metadata.xml 432 BLAKE2B 1009c05cb07872e37fa6f8113a0586840454e09e07a8c7c40c9c4f879577e3ba1d36a7832f0789ae77fe8b882f9ccc8d2346de40c13ea77cc1404e78e8b15e6d SHA512 9f1c221258a82d7b1e6311b51cdbd5a72ff9cf4c80fdc075b3219581cd008a6a83f4066868f014ed33640bbfad68a4f4504cd9efb65119dcd176d34dc07e6ee9
diff --git a/net-misc/owncloud-client/owncloud-client-2.7.6.3261.ebuild b/net-misc/owncloud-client/owncloud-client-2.7.6.3261.ebuild
deleted file mode 100644
index 4afe35f947d5..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.7.6.3261.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-MY_PN="ownCloud"
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="https://owncloud.org/"
-SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin gnome-keyring nautilus test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[gnome-keyring?,qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	kde-frameworks/extra-cmake-modules
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-	xdg_pkg_postinst
-}
diff --git a/net-misc/owncloud-client/owncloud-client-2.8.2.4246.ebuild b/net-misc/owncloud-client/owncloud-client-2.8.2.4246.ebuild
deleted file mode 100644
index 36e5f6e64222..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.8.2.4246.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-MY_PN="ownCloud"
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="https://owncloud.org/"
-SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin gnome-keyring nautilus test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[gnome-keyring?,qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	kde-frameworks/extra-cmake-modules
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-	xdg_pkg_postinst
-}
diff --git a/net-misc/owncloud-client/owncloud-client-2.9.1.5500.ebuild b/net-misc/owncloud-client/owncloud-client-2.9.1.5500.ebuild
new file mode 100644
index 000000000000..ef8aeb7b1ca8
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.9.1.5500.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+MY_PN="ownCloud"
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="https://owncloud.org/"
+SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="dolphin gnome-keyring nautilus test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[gnome-keyring?,qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)"
+
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 0bb3742ccc6e..ee51da8156da 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,8 +1,6 @@
 AUX rabbitmq-script-wrapper 1855 BLAKE2B ee6fe4ab1688edfdf4933754d192a851c2e585628a82954c9cabe2548a33dc5742e111a92335443332b705214bc908d7d1b15d89408f0ef585be92c6c522c736 SHA512 bd124a7291b146623b3491c9be2ba4f82420a54ef668fb26128dc153daf1ed2ba7555a1afc9181c68a30543aa397a0c042efd027c8836a5bbf76d1e8e1b036ab
 AUX rabbitmq-server.init-r4 656 BLAKE2B 0ec16b0b5f7c17d4e12e08382ac12f1ec0f8c94b63b05bc2066b66ee46afc1e246f76833f75b6a9c56572ccd348a50bbab0416bac07f29784ceb84c7333fc907 SHA512 1d16de0cb21527b8ac4db54a2d4f4f9ef07d8fbd744370f0ee311a2cd77da63e17dc160796bfb99a4d95f4743fcd1ff9819a5a3d14e18cfe38b337fdd4b7b04e
 AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33218027f9895e91ebca76ad8ba450ca6ca01568c4c67f035b14a912a2352922f7ed7287e27627f9569 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457
-DIST rabbitmq-server-3.8.14.tar.xz 3187648 BLAKE2B 53dc32a4b798e79d4c523f13e3d6edeaeabae251221875c464d4ae53fb5d80883807d615591cf8b7a9aae862b182637a2a0bbe1966025791560b3e8f6dab73f5 SHA512 19326fb7ce42241c22541dadd73a147d0b1e6c01d3c7748486fb1d666d76e2ba7835d2a39c200294808ef1a7af5f885fbbe8c7c2a81e561922bd6f8574e5fb91
 DIST rabbitmq-server-3.8.19.tar.xz 3263712 BLAKE2B 3dc990d3720883fe2b6b61d48122b64c81564124f48f0a0e6aa2dc1d0837f6dce0bf174b4044c39dc0c8da64b2f78499922c58c90d7e7f80e50b80b4535f55c7 SHA512 05c789dc25e2f236d9643e582792c8a9ab90129247d9306e60c303fa3a707e68dcbe685460b255b6f610c8ab55d48cb7b372ea51ce1d3c86d8d770e4e4f7cfea
-EBUILD rabbitmq-server-3.8.14.ebuild 2123 BLAKE2B 517cf859914216b94b892632ffa73671323044a4b8a726faa8916f156f024295075503356cdad523c5f353efb4838bec810fb7a989c65cd690ed5b58bff6e956 SHA512 7865ffd3400a7c7302536323ac9b70a71fd181c0af91321c42b2aaead3080cf9d6c6aaa90d80802c1f95a9cbb3cad9655e1f829aef1305878c9f057d693d2213
 EBUILD rabbitmq-server-3.8.19-r1.ebuild 2098 BLAKE2B 012958ff734a8efa975274ea6ef7cbe615d4285d60b802b3c1ba2f1019868e443f1f157cf6b40ff0b159dfe66f7167ff774886d2d2419d13121b6f2a71183e94 SHA512 1720f0317e808a45a915fa6a543ca821d215b4cc6f68e624c4e85c095bcf057a53489b035a0250109e820322f26a6fd51c341f34b4487d6c5758dfc8b3e0efef
 MISC metadata.xml 244 BLAKE2B 7a5cfcea42b430285e098019ccdf99eccf96c5ba82feeb5354a023aeb0c197c9e7c138b8329bc20a0080cc028c546a0fc52b74c383a64645aef2eea22b894522 SHA512 04757d267b2495bcc0f50cd5354a9bf2f5093ca396744f4cbcdb4eed249e94333226c52e346261ba8da975d3d5fc7bde3c50a5627875a15247b338bb1eddc2e7
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild
deleted file mode 100644
index 44349a5e36a0..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit python-any-r1 systemd user
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="https://www.rabbitmq.com/"
-SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
-
-LICENSE="GPL-2 MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=">=dev-lang/erlang-22[ssl]"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	>=dev-lang/elixir-1.10.0 <dev-lang/elixir-1.12.0
-	dev-libs/libxslt
-	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
-"
-
-pkg_setup() {
-	enewgroup rabbitmq
-	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
-	python-any-r1_pkg_setup
-}
-
-src_compile() {
-	emake all docs dist
-}
-
-src_install() {
-	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
-
-	einfo "Setting correct RABBITMQ_HOME in scripts"
-	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
-		-i deps/rabbit/scripts/rabbitmq-env || die
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r deps/rabbit/ebin deps/rabbit/include deps/rabbit/priv escript plugins
-
-	einfo "Installing server scripts to /usr/sbin"
-	rm -v deps/rabbit/scripts/*.bat
-	exeinto /usr/libexec/rabbitmq
-	for script in deps/rabbit/scripts/*; do
-		doexe ${script}
-		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
-	done
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	dodoc deps/rabbit/docs/*.example
-	dodoc deps/rabbit/README.md
-	doman deps/rabbit/docs/*.5
-	doman deps/rabbit/docs/*.8
-
-	# create the directory where our log file will go.
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/log/rabbitmq /etc/rabbitmq
-
-	# create the mnesia directory
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/lib/rabbitmq{,/mnesia}
-}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 1d53aa2ce538..9ebefbf0cfe9 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,3 +1,5 @@
 DIST Remmina-v1.4.20.tar.gz 2489535 BLAKE2B 8d557dfc8629572d3fc930aea85e62fdc6294521c4997e1d211b8aac385f1bab3a13f082cff7f40e3add839d3922b4884736a9a50eb3e043df4c6314d3e456c5 SHA512 27a4bfbcb77f1cebe527bdcdd78f1dedb703c888c9452bdac7162e18e7eee0bf2e49143f3a3f98d451d4c1cf7cd6b9f89ae9fb67755930501e4f08e08d311892
+DIST Remmina-v1.4.21.tar.gz 2982350 BLAKE2B d076db92290ead724e6b5c13beba2ef94d16e8209c5095e5db754a8b25ee236ed7a87b5ce29ac0b9424d3c55e5443467b1cc628fb80a0f63c59d915d9fc7839e SHA512 3fb7a29bf9e001203bdc5c176a0cf11a5c98638d605a02e2edbb16669b9e85526706c11e15bd2c308919ee6ef14217356bbafa0328ce337053bba20da6f2905a
 EBUILD remmina-1.4.20-r1.ebuild 2285 BLAKE2B eb136311307b897702cb30f7db66008752e7c8c3ad319ef6f4bf441e4778cb4e80d2001ce8e2bc95376f82f88b55848dd1ec7975d4d228f13eb80617ad764354 SHA512 1da2e08d976d20e949d38d584f7e34697b3f2c2f2e1de0c9c557b07693a2fce2dff3b8db5f2f5eab7ef79c95a71b161a7393e6073f17fa02e6b21c690348a0d1
-MISC metadata.xml 1123 BLAKE2B 658714c247c6fbec6118a88bc5493a67aca30e949249407d421592b956c15b439b6d96c682d2d6d7cc9f1eb2dfdcc902c4c463c6a208af4bb9196656723f220a SHA512 cbf00348e2da27acbe9890ac2d6b19d5731496cf1aab303d64f036700fb779587cb7fe81a95d3a25f9ec5dcb79e2e7e880e345fc1ac267acd25da89844ab6f21
+EBUILD remmina-1.4.21.ebuild 2350 BLAKE2B 8b8bc5827409208c0be511b0afec5264d940b9f2808ec8ca3c5b0aadf13eb26377a809a8b1a6b0dac156a8d511123cf114f9369befc0a06ea6d7888fdb96ef4c SHA512 83acf682b8291b7c0e3e16df06f117bfe68974a4db3c919e0c6d70d41b5edf8d126a8d1a54a7dd72eedae34756290756da6690ab2c52fdb309877687f1d0354f
+MISC metadata.xml 1174 BLAKE2B 03a647f7a881a228a2123e269567394dcf5d8e908d223dcc30b87f11e7447ffbadcda0e4a29d9126b6d15c35ddb07a7a4b9b49631156d8efc2de3f460d202bf8 SHA512 fd1632f13bffe28ca6b2349dcd32641393c0fa9fe1dd6b629b2e6d8b88a3f7f1adce8f4dfe0adce7243e5fe485da9eeaf6042ea4f532e086c97cf5d21f34a91b
diff --git a/net-misc/remmina/metadata.xml b/net-misc/remmina/metadata.xml
index 2aa71df8ae84..78554c55848c 100644
--- a/net-misc/remmina/metadata.xml
+++ b/net-misc/remmina/metadata.xml
@@ -18,6 +18,7 @@
 		<flag name="kwallet">Enable KDE Wallet plugin</flag>
 		<flag name="spice">Support connecting to SPICE-enabled virtual machines</flag>
 		<flag name="ssh">Enable support for SSH/SFTP protocol</flag>
+		<flag name="x2go">Enable support for X2Go</flag>
 	</use>
 	<upstream>
 		<remote-id type="gitlab">Remmina/Remmina</remote-id>
diff --git a/net-misc/remmina/remmina-1.4.21.ebuild b/net-misc/remmina/remmina-1.4.21.ebuild
new file mode 100644
index 000000000000..5c9f28ce599d
--- /dev/null
+++ b/net-misc/remmina/remmina-1.4.21.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake optfeature xdg
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit x2go zeroconf"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libappindicator:3
+	dev-libs/libpcre2
+	dev-libs/libsodium:=
+	dev-libs/openssl:0=
+	net-libs/libsoup:2.4
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	crypt? ( dev-libs/libgcrypt:0= )
+	gnome-keyring? ( app-crypt/libsecret )
+	gvnc? ( net-libs/gtk-vnc )
+	kwallet? ( kde-frameworks/kwallet )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
+		<net-misc/freerdp-3[X]
+		cups? ( net-print/cups:= ) )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	vnc? ( net-libs/libvncserver[jpeg] )
+	webkit? ( net-libs/webkit-gtk:4 )
+	x2go? ( net-misc/pyhoca-cli )
+	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="
+	${DEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	xdg_environment_reset
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_FREERDP3=OFF
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_KF5WALLET=$(usex kwallet)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_NEWS=$(usex telemetry)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_UPDATE_DESKTOP_DB=OFF
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_X2GO=$(usex x2go)
+		# when this feature is stable, add python eclass usage to optionally enable
+		-DWITH_PYTHON=OFF
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+}
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index b28668170a70..e16e3f3fc676 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,5 +1,7 @@
 AUX s3cmd-2.1.0-fix-compatibility-with-Python-3.9.patch 1927 BLAKE2B 76d18015437f5b9b2ec0ed2a573189a711ec055366dfe44d8a6557d0b240b9aad4f1f9a145b845a692acb93f3ab0c27b5cf70fa3626b90c6822ff026144e8801 SHA512 57302dc8238980ef28a273c2d91f5a099aad25855c246bf0dff2e64fede9efb8a6ad9ccd1a23df5e753e620080ac7ee4c02ce0f0c3c867210e5b49d53697e796
 DIST s3cmd-2.1.0.tar.gz 127120 BLAKE2B 4282f616eb7ca97fa0d529a2c5acc1359f88888d182b62e1fa7d3f7401a93852a4e0724363a4c6f0a6520d6aef290d64e1775cb252fc0fbaa4b94762402c381e SHA512 98156218c4379e233185662d29fa4299b4a4e45a0fe143a145f30ff7d03362a4558b5fff5e5da0da850f5cce2c760fcd031bcf5ff7a6bd2c6352259e791d65e6
+DIST s3cmd-2.2.0.tar.gz 134390 BLAKE2B d578aa13a7b8599c70dc6daa5d21950331b0b07278479d1f3947e6be78a9bd108c7f8ea6f198fa518dfa6ad44d907d979a29d5d9f1a15e4f73484fcebb118225 SHA512 07b2410554233b435b3476e09fd14354abaa19374cc1211f861147023470599483c18d213a44b5c9aee32d71b5a4bc5d9ce25721fb077cbadfd208d457e13845
 EBUILD s3cmd-2.1.0-r1.ebuild 620 BLAKE2B 9efd86f09d044b2a1f5d272da0a0b2f64084ac9085307f75696d10fee99a09385bdbf02597188fc66f4c75328bff67ee67832cee33d0d1037198cff612d009ae SHA512 15bd3d78cc1b72079c149c09f3f2df30a773e0a6f00c100fadf3f1381217ba08f602d9423bf31da0f70baf861f13762df947da3af511a66ebef89504ee9de419
 EBUILD s3cmd-2.1.0.ebuild 548 BLAKE2B e3ed8df8e2c54fa963b625bd9394a89dc326403470eaac824e64d6bd2b912dee1a7bc3bdc46a0a488304a86e2f472abe0ac8e6a1163df128cffc80b16e4d37e5 SHA512 da0b560f6ed2acf6d7cd00c6f8c8bbb825f32e49f25e6f05503928e0bbbec7c6803b39cae35ff17e5a75bc9a6896015a0e5d713eb1ee6c3ebb08ef730d57580b
+EBUILD s3cmd-2.2.0.ebuild 700 BLAKE2B a1c71ad076aeb5b0df8545ae94b9f888d621a0113431ae1606aaef744996532c2b3603c22eec323e68de1e4502e73ab19bfd1069f5a03797fe1cd1bb4028ddc9 SHA512 448660d4a96cf58156b7fcd84b139937d6668d8c15a53cf98c939dafdb555d786a62d4bb57d201eaf444870f327be212392a8f8623c1672a4bd3e82b0bc5f314
 MISC metadata.xml 740 BLAKE2B aaef2fbdbec728e8f2bfd822f7d1682d8dddaf2bb18441f2dba6686bf016ba74cee34f2f4869ef9bd6e08a687039aeb144a0803615716104a1286a0e0d744545 SHA512 6c49dba068f4033ce09feaa822254d6d004784ff383ac5de95d0d9054f349db6193d8e197e2ed062f984fde68fd5b087616d108d645e3648f32080754220727b
diff --git a/net-misc/s3cmd/s3cmd-2.2.0.ebuild b/net-misc/s3cmd/s3cmd-2.2.0.ebuild
new file mode 100644
index 000000000000..e69e258d6648
--- /dev/null
+++ b/net-misc/s3cmd/s3cmd-2.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+DESCRIPTION="Command line client for Amazon S3"
+HOMEPAGE="https://s3tools.org/s3cmd"
+SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x64-macos"
+
+RDEPEND="
+	|| (
+		dev-python/python-magic[${PYTHON_USEDEP}]
+		sys-apps/file[python,${PYTHON_USEDEP}]
+	)
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=( )
+
+src_install() {
+	distutils-r1_src_install
+	rm -rf "${ED}/usr/share/doc/packages"
+}
diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest
index 2da1d33ec9fc..a52c6e9d3883 100644
--- a/net-misc/sshpass/Manifest
+++ b/net-misc/sshpass/Manifest
@@ -1,3 +1,3 @@
 DIST sshpass-1.06.tar.gz 112205 BLAKE2B 9bae7ba60ca627664d12bcccb9a9bb76bc92752490458e4d4fdde27cdb14a0d71c94eeeefe83d95810c1cbe0fff0c9ac8a9d6fb8a90e2cd834c387ac2527875b SHA512 fc08fcca5aaa5e4958f16d38116d828739a5d53f8e2a83506ef78ee602941a7bfc0e3f07154dc390660df490dbdf7601e0c7ec17c68c9627d72d565e4c6717f8
 EBUILD sshpass-1.06.ebuild 413 BLAKE2B d078f03a1f5709a8902847ab7de93ef4ed46d8beb7a88cba1c18696130845ff81128397be048eae88ba26525fe99273a020cbf6d308e2afadb8dbb7f47d3eeaa SHA512 2fa9fd5a920282e3565b74c78b100b7e9774a4c79f008d674f9871246e72defac78649c9873c90af516cce293f6dca9738ff2245ea78880933e2684b8b325bf5
-MISC metadata.xml 323 BLAKE2B fb86d0ed8c8e02040ae20c1cb2ee5425c892acbb56a7b4654193571b61360f0a1d7523f69af1e93bc31eb4169c331b4b21df59d88842d256018207cb93d20193 SHA512 72eb91941526098e8c54a7369e268996dc576b6a3640ee24568631ab98490a1e2a5f753d2c2a29f190a3bc5c50f5d34eabaf69ed93f9524ca92c346865c34a96
+MISC metadata.xml 245 BLAKE2B 742dd0549c543a09d1713679990f7aed20165c67c2ecca674c272200e3d4f64d7f1b663d4669792dd476eeb7fc8960e87429f702ee1db96563fb816d3ef8ccee SHA512 f88712849405e0e495d0b476eeeb43814f569db2ec6a24b36ef8065f166c2cc977fbc4c64cf3a7fadf145bedbaa25af2ae3a280e6abaa29a7ad4a010c08f19c5
diff --git a/net-misc/sshpass/metadata.xml b/net-misc/sshpass/metadata.xml
index 455043e757c8..7f374cfb1e3d 100644
--- a/net-misc/sshpass/metadata.xml
+++ b/net-misc/sshpass/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">sshpass</remote-id>
 	</upstream>
diff --git a/net-misc/stuntman/Manifest b/net-misc/stuntman/Manifest
index bad33103fbf7..2f74762c940e 100644
--- a/net-misc/stuntman/Manifest
+++ b/net-misc/stuntman/Manifest
@@ -2,4 +2,4 @@ AUX stuntman.confd 403 BLAKE2B 203ee17a4ae188486d8b8fc431d2cbf29eb821f5f2b0bff3d
 AUX stuntman.initd 272 BLAKE2B 2be96dcc81b0681bba279341c5d25ea30b56e5698007d1dfa53c057ce5ed0a5ef1c53b0b34365a8c36160a59ebff3053b61e37d3598e2edbcdc9748b6761cebc SHA512 e8cb2d80573a57e582f4fd68f3772a93c74eb7abf96539acb1441eb1e94a6dcc7fad84f65d13d7ca7a4130801b69af9314fc78c4089c6d0f05a3b0366abedb18
 DIST stunserver-1.2.15.tgz 124675 BLAKE2B fc59a400dea30382aec80d6b634ed7c2a1823712788b7775c1bbf8511fa62173224084ae9b05a402e0efb11f0077087e515d9639eb9eec5d0ced48ce37c20cef SHA512 8af5341cd3a78bd3a68f75e2da1b6d5e75de94c9baa4f48824667e2c50f9b8323a60d33711c658c7e628e2a170cea7584e4d4012603736ad7140fe1a37ad9b66
 EBUILD stuntman-1.2.15.ebuild 658 BLAKE2B 85e189a811bbaadc35977214e4cd6241cc5fbc243b060ddddf3075424456aa69881ab5d41cfb4af07dbf9471e887caf8c948ef5cd0135adff3fe3b17c436f82f SHA512 24ce4620a1e0602276cfc8ee0f953330d11347cb7354bf67d8040d010989c2dd4bb2163bdff4ec4a11b23daa731d4de4f04370fa6b7361dc5a1d51a2b7f947fb
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
+MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/net-misc/stuntman/metadata.xml b/net-misc/stuntman/metadata.xml
index bef24d2c2337..6aebbc46f559 100644
--- a/net-misc/stuntman/metadata.xml
+++ b/net-misc/stuntman/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 356bbf273f53..a4da1928e36d 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,5 +1,5 @@
 DIST wget-1.21.1.tar.gz 4884887 BLAKE2B 28a3044f33df1d24e13900e8018a38cabae21fb41dd2e089bdbfd759b4adee3771ab558b84f5a8b6f546bc84a3387c973903f9fe06562093d3566e22d1528587 SHA512 784efbf9fe43a1671109e32a9c36237eb2d5c19cf756bf6f6e65517fb21464d3d94b1d6f491852d23b3ddff63e38fe6b60df9125c91b139993af59875e3a0712
 DIST wget-1.21.2.tar.gz 5004576 BLAKE2B e11c3a2b89ab26834dc4cbb445bcc6122d3a6b2a5b9c6de1ce9e8f062281f9e5aa1f80ca37a44791ba5aaf6a447015a26afef2199cdb75f1931d5e1ffb1f406b SHA512 3e35f92604486ca459f26df97d392579f1d83a9254519e8ce249b410bacf70dddf716d6caa3b29fd4865163f60410b2b8ad1ca1f7bb3dbb2456386b7647b988d
 EBUILD wget-1.21.1.ebuild 3474 BLAKE2B 61fa48665cd3fba01a0d83529c3e0087941e2d9fc97732409b27077305be0950fb5bc319a3c65c7bfda4c55ffbb231696dfa0568057829669e9f61fb6a0daa1f SHA512 5c5699eb526c63b185cbc95e94c5f68bd1c2b1c6220627b40d85e0f133a96fe45cf43c888baa97dd544fc37c5b7a07e81e41c66e9950ca8a30de034b94a09b3c
-EBUILD wget-1.21.2.ebuild 3482 BLAKE2B ac50120b7656ac61c82dec60d8c5a9d19264830ace1ea71595517879ac60030c338bfd4b1cf4e8ad70f07c9dcd64a6db46400e3244cda2469b02d8ce447c50d1 SHA512 183241d3248c38109fe04a28d458646ff985371e09a09dfba624d8e1cac8abe02e74af4b3f81637d3793befda83a152dbb91b65ca00c2aef793969c0cfd39728
+EBUILD wget-1.21.2.ebuild 3594 BLAKE2B 4526793337e1bac52ee10d931dac8e8ae12a3bdc823265e1193911c72fbe5d53628ef99e4535944143317f4126348c07e851054e339fde8a61ddbf38c8dc9d31 SHA512 a62cb9feb4169556643dbc1435e1a22abcf3f759e84859495e8899c168fed4f32cba6e649294c6afdbd97f533e1f4a28efd950ae26e2c48ad427499632ff12ae
 MISC metadata.xml 740 BLAKE2B edacdb0309ad76e024fe551f53c21c87f2f8242879fbc59f6a9ad2e8cef7741e44a75bc9cb211b0a1f11fc2c89868fed7f1325132d3b30fad6a648d2aa9e5414 SHA512 563748bfa80727d7782f6a084fdbf7578eaaceb8501a2a349422fb38026d288eb72df4103173733a88345f22b43f30bdf45ea2dfe516a5e1724ca89ec2a67608
diff --git a/net-misc/wget/wget-1.21.2.ebuild b/net-misc/wget/wget-1.21.2.ebuild
index 5dee2e984f60..27f69c718b3b 100644
--- a/net-misc/wget/wget-1.21.2.ebuild
+++ b/net-misc/wget/wget-1.21.2.ebuild
@@ -68,6 +68,14 @@ src_prepare() {
 			-e 's/^  LIBICONV=$/:/' \
 			configure || die
 	fi
+
+	if [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -le 17 ]] ; then
+		# Fix older Darwin inline definition problem
+		# fixed upstream
+		# https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=29d79d473f52b0ec58f50c95ef782c66fc0ead21
+		sed -i -e '/define _GL_EXTERN_INLINE_STDHEADER_BUG/s/_BUG/_DISABLE/' \
+			src/config.h.in || die
+	fi
 }
 
 src_configure() {
@@ -75,12 +83,6 @@ src_configure() {
 	# the included gnutls -- force ioctl.h to include this header
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
 
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html
-		# https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html
-		append-cppflags '-D__nonnull\(X\)='
-	fi
-
 	if use static ; then
 		append-ldflags -static
 		tc-export PKG_CONFIG
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 5d0be2ea9612..b42c95742f50 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,7 +1,9 @@
+DIST yt-dlp-2021.10.10.tar.gz 1913112 BLAKE2B 05c6f56a633311b99834f077b1dd3be6374144d5cf5dfdcc38cbd7fa246e380f2f8f7b667dde9e83f6f0270bac38e21f4183726c9ced922dc0c3ca96175c15db SHA512 c53cc4458b294dc579de37e9d603cd32bb1890ed921270097bfe04e4e8769b91f6594cd4834e7094c706a7c9f447854438b33ab28ddd7247af585837c5ca76b1
 DIST yt-dlp-2021.8.10.tar.gz 1807968 BLAKE2B 664f9f5680c18531bb1c194e6e26a31b6be62894a88c6748bf146fbba79164fec6f5e6db017785daf6c8f5a2c1b7cfc0c2ee6c0d437b9d7bb4e1835eff73650f SHA512 fb321d308e634f6358f046762cc3e827b036083b4764d495bbcef253d06ce445152f4a330c51b5aac1eb3b21a8a345fc791f0fdbdc01089ea2a414b1cd457f20
 DIST yt-dlp-2021.9.1.tar.gz 1846252 BLAKE2B 2cb056b89d1c3f5dfe442c96e983b2500185ade621c285669ef513d0fe9af9aabea3ad121344d1c521b6c89eddc77bf7698edb48d92f6f5f7b58b8939c80817d SHA512 26f778bf63b9be9e487b96f098e56abf65c7c7a89e9c5754755cf73d55e441638174d7b0e7220e994e40c0740edbd792e1fee28b44946cab8197dfaae2eee26e
 DIST yt-dlp-2021.9.25.tar.gz 1890559 BLAKE2B 9573fc4214fa8654a4b1ca44dd40b81f590f08ffe56225d8ad9923e4c3d188be406a59443e9ec134a1eef523e39e33cecba9ba76ef05edb908713d72d1ac233d SHA512 2c1fc18f05108420caaae9ca4072fc1ee0c67932ac144ee69c3e412850e1f1873938e302b9e0953bea29678bd2c512e58c124088243818ce0662449bcfa92175
+EBUILD yt-dlp-2021.10.10.ebuild 1001 BLAKE2B a5baab2dc005b8706279caf49ae749eb463f4e4ae324fc508c5a65c11ba4fe337b660baab0cd657121feaeac84100882347a07f521cd67938067031a0f095c90 SHA512 3de4ddc9959b6a97468843af26a3a01b73fde17a90e1c399dd0dc0617d1fe7c8d1a68738c16f89912ee74b53bd74855f84e1ec09fc5b90af9dad3047a771c2cc
 EBUILD yt-dlp-2021.8.10.ebuild 1133 BLAKE2B d08de5fd6d20d47c9687c28691225cc3b74d0745d195017afbb3959764a90162b788fb1bee6e6330f6c55a849fc9e53fbd3e51663d01768d1df20ae0719504a0 SHA512 bb5e06e853bbeeacbf7bd2e317d629867761d07d2ba6be8f5099158d30108be754c76b436eeec5d06ad64ab8d9396071ac4df05434690d31e9df9b4f841068c5
-EBUILD yt-dlp-2021.9.1.ebuild 1133 BLAKE2B d08de5fd6d20d47c9687c28691225cc3b74d0745d195017afbb3959764a90162b788fb1bee6e6330f6c55a849fc9e53fbd3e51663d01768d1df20ae0719504a0 SHA512 bb5e06e853bbeeacbf7bd2e317d629867761d07d2ba6be8f5099158d30108be754c76b436eeec5d06ad64ab8d9396071ac4df05434690d31e9df9b4f841068c5
+EBUILD yt-dlp-2021.9.1.ebuild 1131 BLAKE2B 75a09269e874dd723959481fc123ad9116bd2e94633a3b71fd288e405f2536ad2a751c938912928bca8be9011aca18736239d51bc3e19a805154cd8e9fe05091 SHA512 9350dfa756115e0642fc59780f33a3f9472ec3455ee3930e8bb6b0c46d91ada5df059b0363ca98bcefac41f210c5a707079326f385e5922e510adbba59dd07a4
 EBUILD yt-dlp-2021.9.25.ebuild 1133 BLAKE2B d08de5fd6d20d47c9687c28691225cc3b74d0745d195017afbb3959764a90162b788fb1bee6e6330f6c55a849fc9e53fbd3e51663d01768d1df20ae0719504a0 SHA512 bb5e06e853bbeeacbf7bd2e317d629867761d07d2ba6be8f5099158d30108be754c76b436eeec5d06ad64ab8d9396071ac4df05434690d31e9df9b4f841068c5
-MISC metadata.xml 331 BLAKE2B d8b22c2f9ee7d9ad61dcdef8335fe14a1324de7131930eda4306e450077a25da2cf7e038131e16c01e3a0ed80fcdca22dab5895dac823cbfde48dcc3ce5597c5 SHA512 c7fa3393bdaf6e2c2d8ee37842ae6091e2c06f94b15776e6e0c434523eddb38856d2d9f654f0c9d24072b36975877a7e2cd13ae7d4bf0325024fb137b4984728
+MISC metadata.xml 461 BLAKE2B cf54d866278b449c8551d3d1681df0c08315b3863fb2e61ece2613b9a263f9fc122b54028f6f6cce5442db62b49e8c422c5b0baccd57a79b63f926efcbb1a85b SHA512 bb30935bab43083ba0328512acf204d8494571b00ee08caadc53a300ffccef2ae63bab8852166d9c158ce554f15493deeffef17ae52f7fe82734f9ef6bbf07ff
diff --git a/net-misc/yt-dlp/metadata.xml b/net-misc/yt-dlp/metadata.xml
index db1fe174e12d..1fbaa63f2ecb 100644
--- a/net-misc/yt-dlp/metadata.xml
+++ b/net-misc/yt-dlp/metadata.xml
@@ -5,6 +5,11 @@
 		<email>slashbeast@gentoo.org</email>
 		<name>Piotr Karbowski</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">yt-dlp/yt-dlp</remote-id>
 	</upstream>
diff --git a/net-misc/yt-dlp/yt-dlp-2021.10.10.ebuild b/net-misc/yt-dlp/yt-dlp-2021.10.10.ebuild
new file mode 100644
index 000000000000..ed4cc85dbe9e
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2021.10.10.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="youtube-dl fork with additional features and fixes"
+HOMEPAGE="https://github.com/yt-dlp/yt-dlp"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/websockets[${PYTHON_USEDEP}]
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	media-video/ffmpeg"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -m 'not download'
+}
+
+python_install_all() {
+	dodoc README.md Changelog.md supportedsites.md
+	doman yt-dlp.1
+
+	dobashcomp completions/bash/yt-dlp
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/yt-dlp.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_yt-dlp
+
+	rm -r "${ED}"/usr/share/doc/yt_dlp || die
+}
diff --git a/net-misc/yt-dlp/yt-dlp-2021.9.1.ebuild b/net-misc/yt-dlp/yt-dlp-2021.9.1.ebuild
index 4c0bfc7cd619..8672a05a7221 100644
--- a/net-misc/yt-dlp/yt-dlp-2021.9.1.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2021.9.1.ebuild
@@ -9,7 +9,7 @@ inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
 DESCRIPTION="A youtube-dl fork with additional features and fixes"
 HOMEPAGE="https://github.com/yt-dlp/yt-dlp"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 LICENSE="public-domain"
 SLOT="0"
 
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 5684ad1fc70b..d0f4d4175272 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 2c5cd76798bf..f2d21452fcba 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -26,7 +26,7 @@ DIST openldap-2.4.59.tgz 5886272 BLAKE2B a2a8bed1d2af97fd41d651668152fd4740871bc
 DIST openldap-2.5.4.tgz 6415235 BLAKE2B 16e466d01dc7642786bb88a101854513f1239f1e817fd05145e89deb54bc1b911a5dc5f42b132747f14bdd2a3355e7c398b8b14937e7093361f4a96bfb7e9197 SHA512 00b57c9179acf3b1bde738e91604f3b09b5f5309106362bb947154d131868f233713eaa75c9af9771bfad731902d67406e8fb429851bad227fc48054cace16a8
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
 EBUILD openldap-2.4.57-r2.ebuild 29103 BLAKE2B 176097aa953f53efffa29785125bdeddd2922836a7b1ce9fd36d537c6065833463f6800e0e52a6293c27d74b98c91189b6a3a4c0d195b39d33268383f82e639f SHA512 6828adbfaa6d4d9ec6f16322a965195422c2c0d018d2673dd3bc23b26314ce0a43ab7787f51f22d503298a533c7260a0a782e5091e1dbe716c13cee81be01574
-EBUILD openldap-2.4.58-r2.ebuild 29111 BLAKE2B 4f842320fa48255cc5284a0b3707b2b0381a1334fd9720657c867869954f3af7efe6a085fe608ca29f50d81c1aacc4378f70a2ce2d3c3329921d948c2e747881 SHA512 ebaa4d6f3858d4ae055af9b30f927f3d265f6c58397edd4ee9decfe5fdb130a9410a05047ad37eb48edfcf90029f9705bfc3cda550da2fc7912015394d9593d6
+EBUILD openldap-2.4.58-r2.ebuild 29108 BLAKE2B 123c4aeaebf2b42d29e9c85cbea4eaec1491a3b457bc34e7f1bb023d3daf61b6118ffcf211b8ba470c022dc879c294b6c8007b6e223e29635d4e8c10ccae228b SHA512 64b05fece0c33fbf6cb04aaa4afe2f3f62da022539e0c4b465bd10127a6e3206d08f5ffe80c7b66867f00d85842e4f02b1a39f9e8146a796810ee78862728e95
 EBUILD openldap-2.4.59-r2.ebuild 29111 BLAKE2B 4f842320fa48255cc5284a0b3707b2b0381a1334fd9720657c867869954f3af7efe6a085fe608ca29f50d81c1aacc4378f70a2ce2d3c3329921d948c2e747881 SHA512 ebaa4d6f3858d4ae055af9b30f927f3d265f6c58397edd4ee9decfe5fdb130a9410a05047ad37eb48edfcf90029f9705bfc3cda550da2fc7912015394d9593d6
 EBUILD openldap-2.5.4-r1.ebuild 27222 BLAKE2B b1ef40472c11ba9be316e56c3422530cf996d258df72d540b6bb13b9831e6261a2820a52d75defc2751ec401eca48af0004e6c4978800219e51e8d5cd4a3e361 SHA512 ab682204181ba86498cfa5b40cb33cabaeb086a779aea34fea04903b6758a2dbeab07fa9149a71d75d28317fb3f6473b4ea3396a2493e3fa3ed66ab80aa0de85
 MISC metadata.xml 1031 BLAKE2B 1e98f23b8035c52190d99b0b009ce4fa65d1e64902a3af2472f5866028f02ae3e599eb05ed2a45393118368786d64b8d30b77044c2a4019da4e7866c626a99aa SHA512 0feee9e685a5f4a2dd61ca9f0845de8c65e83ba08a67a3a90e8c97e0bf4ccf72b969b0328fa84ba9ec34fafd8bd97a448e9a3f3d2a2b3238e6dd7a2b38932293
diff --git a/net-nds/openldap/openldap-2.4.58-r2.ebuild b/net-nds/openldap/openldap-2.4.58-r2.ebuild
index 440319751d1e..f6159cec2ea9 100644
--- a/net-nds/openldap/openldap-2.4.58-r2.ebuild
+++ b/net-nds/openldap/openldap-2.4.58-r2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="OPENLDAP GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE_DAEMON="crypt samba tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 6226e4250b9a..72f78fa24ecb 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index ef1ad6e5d25e..156ca033c543 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -4,6 +4,8 @@ AUX sabnzbd.confd 156 BLAKE2B 8cd006eedf4f6614fa00ad9bfee6411dbfb99e1e487c19c4b3
 AUX sabnzbd_at.service 185 BLAKE2B bedc84a8dec50c230bd2d4041d3e56dd33fdd7814488e3a6b53fbb8e0c7df2100ac13ee746e4b6cd45b384acfe6a9478df3a3d1f75bfc70dc41f51ac8f018916 SHA512 e5e6882c8520d26c21583fd2b9895248a777fa7519dc3588726dcccf689f81d604f2ef883681e54f6b212a51a8d8e690570ab60742d8b0232af73e98d61d6d34
 DIST SABnzbd-3.3.1-src.tar.gz 2786705 BLAKE2B 1ce58c2fd51304395402e2ad4379556e9f1a1471d524d1b3b969b9b201edf15dece1f12d9891695e9dbb02664014c2540ed9fce02b4418fc3100cd3bb2717983 SHA512 0ab7001935f19c8e1829051949965977b895456b83ee26b6379fd9c7024d114d5bdd0701d747c8935bb46a829d46379e4406012007a9039c43fb99e4db3ee920
 DIST SABnzbd-3.4.1-src.tar.gz 2978066 BLAKE2B d7fc9df71ccf0ee8d9282fb7ec7a088e5f9d4cf99f07d120a1e89ae18f1f3c5e34bd4717bdb79dd097f219021e10c56150b95faf6a43bc896060c1249f63dcaf SHA512 befc5d26860702d0a0b945e0fde35244869e2a766ae6819aafd642bad0897ff439830b5c72f914c139c3f8bfad7fccd9bced9bced8db6349a341f9c3be302fe8
+DIST SABnzbd-3.4.2-src.tar.gz 2979084 BLAKE2B 2e75212226221c283e46533c46dd6eb3f880d636d73d8e3620650068d9ad67f3f1f55a9a418cdc74876f7e12a37c94a3dbcd79112f46fd322301d93bfbdf9063 SHA512 d34a59540c9bb371de912dd0501b3e6dfa392da4d833cfcaf3b550bd11342439a2b64b2205207cd0d0a9c3947cdd1b43ca90d41b130d21e28cede5bf362fd5ae
 EBUILD sabnzbd-3.3.1.ebuild 3073 BLAKE2B 6f85938c8574ce35c310e9689a1e7e6e9fa0e1361a37ff0870be146c0e6a870452f6ff54af8f3e08e06efe871009f95b38835b861ed0ec3df6f6ca0ab371ad62 SHA512 997ea6ae8ae26dbb88e02360ee87352b1f3afa0f5b1b27be156f036ca7ae4b510565190c99cbfdea2ac2bb514e34837c6e0242cd1185c93c03741c1ce798101a
 EBUILD sabnzbd-3.4.1-r1.ebuild 3163 BLAKE2B aae8176e1e6db9708af9379681afe1519ea5354dd6f14bae87fdf5fcde13e663cccb3e021efb2799bb70e7297250cb59039c63d2deb08e947a790f6ce45e57f1 SHA512 e653642dd76bbfb4682a15cfcb5612213584e58583a969c010194c594604c410f27e96edab80ec85757b1c901bb6189ebdcbce9a48e9edfc4040f5818d5952dd
+EBUILD sabnzbd-3.4.2.ebuild 3163 BLAKE2B aae8176e1e6db9708af9379681afe1519ea5354dd6f14bae87fdf5fcde13e663cccb3e021efb2799bb70e7297250cb59039c63d2deb08e947a790f6ce45e57f1 SHA512 e653642dd76bbfb4682a15cfcb5612213584e58583a969c010194c594604c410f27e96edab80ec85757b1c901bb6189ebdcbce9a48e9edfc4040f5818d5952dd
 MISC metadata.xml 538 BLAKE2B ea127a1fc7ca13e6642703a0cdacbc9dc20b341f24906f704a1ad5a501b01fe9a8fe4ec49b965e0f6abd5952c85ccfaf943554cce9d864e23addbc59fdb5b345 SHA512 94f241c468bec52fad72ce3bec6caf926e72d398df3dbcf142818276737b60a4da2669ac100325bec6d4f831f843851e0ab972937ac8bde10176d485efcab712
diff --git a/net-nntp/sabnzbd/sabnzbd-3.4.2.ebuild b/net-nntp/sabnzbd/sabnzbd-3.4.2.ebuild
new file mode 100644
index 000000000000..f491417916f3
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-3.4.2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+# Require python-2 with sqlite USE flag
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 systemd
+
+MY_PV="${PV/_rc/RC}"
+MY_PV="${MY_PV//_pre*}"
+
+MY_P="${PN/sab/SAB}-${MY_PV}"
+
+DESCRIPTION="Binary newsgrabber with web-interface"
+HOMEPAGE="https://sabnzbd.org/"
+SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
+
+# Sabnzbd is GPL-2 but bundles software with the following licenses.
+LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+7za +rar unzip"
+
+# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not
+# be in python's sitedir.  See: https://sabnzbd.org/wiki/advanced/unix-packaging
+
+COMMON_DEPS="
+	acct-user/sabnzbd
+	acct-group/sabnzbd
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/cherrypy[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-6[${PYTHON_USEDEP}]
+		>=dev-python/guessit-3.1.0[${PYTHON_USEDEP}]
+		dev-python/notify2[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/puremagic[${PYTHON_USEDEP}]
+		>=dev-python/sabyenc-4[${PYTHON_USEDEP}]
+	')
+"
+
+DEPEND="${COMMON_DEPS}"
+
+RDEPEND="
+	${COMMON_DEPS}
+	>=app-arch/par2cmdline-0.4
+	net-misc/wget
+	7za? ( app-arch/p7zip )
+	rar? ( || ( app-arch/unrar app-arch/rar ) )
+	unzip? ( >=app-arch/unzip-5.5.2 )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	MY_HOMEDIR="/var/lib/${PN}"
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	local d
+
+	for d in email icons interfaces locale po sabnzbd scripts tools; do
+		insinto "/usr/share/${PN}/${d}"
+		doins -r ${d}/*
+	done
+
+	exeinto "/usr/share/${PN}"
+	doexe SABnzbd.py
+
+	python_fix_shebang "${ED}/usr/share/${PN}"
+	python_optimize "${ED}/usr/share/${PN}"
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	diropts -o "${PN}" -g "${PN}"
+	dodir "/etc/${PN}"
+	keepdir "/var/log/${PN}"
+
+	insinto "/etc/${PN}"
+	insopts -m 0600 -o "${PN}" -g "${PN}"
+	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
+
+	dodoc ISSUES.txt README.mkd
+
+	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		einfo "Default directory: ${MY_HOMEDIR}"
+		einfo
+		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
+		einfo
+		einfo "    usermod -a -G sabnzbd <user>"
+		einfo
+		einfo "By default, SABnzbd will listen on TCP port 8080."
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 3; then
+				ewarn
+				ewarn "Due to changes in this release, the queue will be converted when ${PN}"
+				ewarn "is started for the first time. Job order, settings and data will be"
+				ewarn "preserved, but all jobs will be unpaused and URLs that did not finish"
+				ewarn "fetching before the upgrade will be lost!"
+				ewarn
+				break
+			fi
+		done
+	fi
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 069f49952b06..c950d7105857 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/tremc/Manifest b/net-p2p/tremc/Manifest
index e0c272b87b7c..6c0cccb78444 100644
--- a/net-p2p/tremc/Manifest
+++ b/net-p2p/tremc/Manifest
@@ -1,5 +1,3 @@
-DIST tremc-0.9.2.tar.gz 315631 BLAKE2B f5ed154fbfcbdb3e77b678a5827d3f68a6be4033530d6d4e451d57808d43cd5737fff32cf62445d246bfce4d8f02e4cac0c1156603e220e228e61b725d6deaf8 SHA512 d6d6d155ddac918d329226d5c3b53c63fd4fa0b98e30f1eb2cd2226ea598bd7dd81d72f747dc11f4a508bcc0453d90d774c1d8db6dac05ae1ecbc217290b7db3
 DIST tremc-0.9.2_p20201101.tar.gz 334602 BLAKE2B 916274775cb51948b3322f0d037d3130e2032ef31acdbbd2b7c42b17c639a82b9dccfe413db4936e9bd580caa7c1ec140091ad09b06058138e8fc0e4882b6c21 SHA512 acae099b2fd24362c02f24b5a6aca85e5b6b0608080a79e0a9a6950a3f61135e271415d0db60d04e39195272ea6e2e494ee85345db454811d6de430c75b5bece
-EBUILD tremc-0.9.2-r1.ebuild 1006 BLAKE2B afba07f87bbfe372d381096523924163343d3e5a79db726090fed1f1a01253428c70b252226be20417d579142ba2fbeee1c004c3dd1f865ab1bf29b96d19fb0e SHA512 f91a587a8e3fff5b6f57754718da225ca66f880bc8fa718058c936b382ddff129e2ecc1573bb50e6d9abe672a6dcf6e356693eb12c27b1a9ee5ac6c5539f7b03
 EBUILD tremc-0.9.2_p20201101.ebuild 1095 BLAKE2B 41add7b051f40fa68d4891f88ece304309567b1a0a0ce4dfb1613997366f9c104ab7da3c75c08a93e34a58b6d78f20d5bae775032055ae48205a35f4ff953c90 SHA512 e6f0a89e5bfc42b266835a1ff7788927ea69f03023f471cdb8586fc1d55482c99b0d2bc27dc4f5fcd03fc723d2dd8de31bb6300b71113ee7a302f798dc9932bc
 MISC metadata.xml 324 BLAKE2B 1a9314ffb5310792eb521599d96d9ae4e8b48dfb32ecbaa8c0e7eb88c0c286246d6a25ceefe74709cb9f8d383731a7c9a36c60d0920e817cd9db3c17ae03de21 SHA512 85f57f99c57254d742c5122489f27f2467444b1bf02eabba57df455b5d2159caace65f889b2bb8013149758c1dc9dcdcdd94c347cd3ece24ddd4e123146a213a
diff --git a/net-p2p/tremc/tremc-0.9.2-r1.ebuild b/net-p2p/tremc/tremc-0.9.2-r1.ebuild
deleted file mode 100644
index 1609aa817fe3..000000000000
--- a/net-p2p/tremc/tremc-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="ncurses"
-inherit bash-completion-r1 optfeature python-single-r1
-
-DESCRIPTION="Ncurses interface for the Transmission BitTorrent client"
-HOMEPAGE="https://github.com/tremc/tremc"
-SRC_URI="https://github.com/tremc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-
-# Specify a no-op src_compile so upstream's broken Makefile doesn't get used
-src_compile() {
-	:
-}
-
-src_install() {
-	python_doscript tremc
-	newbashcomp completion/bash/tremc.sh tremc
-	insinto /usr/share/zsh/site-functions
-	doins completion/zsh/_tremc
-	doman tremc.1
-	dodoc NEWS README.md
-}
-
-pkg_postinst() {
-	optfeature "GeoIP support" dev-python/geoip-python
-	optfeature "Extract ipv4 from ipv6 addresses" dev-python/ipy
-	optfeature "Clipboard support" dev-python/pyperclip
-}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 04d72a347fef..42f09e8b1a86 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-pdf/Manifest b/net-print/cups-pdf/Manifest
index 47169f578792..e31ee3234284 100644
--- a/net-print/cups-pdf/Manifest
+++ b/net-print/cups-pdf/Manifest
@@ -1,5 +1,5 @@
 AUX cups-pdf-3.0.1-ghostscript-gpl-9.54-compat.patch 2328 BLAKE2B fa03f0a69cbafe03387777645528132721a42d364df3d70bcf6abee1492ac6c4a74c27c30d2c66c395ad5939cbae7895d4470b7faafa59e65c67c158e096fbbf SHA512 679fa1229e34378e809699ae89024bdd624d54b22565cbc23029f01e9a3ba3fde37c0d6b52b9365cd3436a234055a5c1cc80d1c2a5482d4b2649a929ee89b3c7
 DIST cups-pdf_3.0.1.tar.gz 29754 BLAKE2B f964358c5e465447e703848a697f6c801624a1836e2a0a4026c507c66048cf4bef92327508598ec7e9a356d4f57894a6b610e55b7a9a34e942cf2b88c6c55b85 SHA512 a06580f3056dddbb883c8db0c71b37b883482ae1ac8aa9bcfd85e679c4dcb44278006b7110d2988173d0eeb05b0f19fb39081fad49bf26839235e97fbe27a818
 EBUILD cups-pdf-3.0.1-r1.ebuild 899 BLAKE2B 4602a2a84fd40676884649eac0a19efc3b33cc020566902c93d769d9fb310d69bb5e6ff711c2835327c99ebd958dd2f0e7427ed1488c138a1b2f0ec49f8cc5fa SHA512 475cd35f72f173bddfd30abec814d2d3287c00413c7f46a31c53d020761491a5f69321ffc660ec18d0ebe48507ef35b35ce9466f24ba6d104a62fd0830456772
-EBUILD cups-pdf-3.0.1-r2.ebuild 989 BLAKE2B 1716a98afcb5b05204523ff0af9848febb4a39428db655db79617c4c06b076d7d2925f96857df341ea2fa8af17798d4828558de25f40035f7dfda6b354eb6e25 SHA512 745bfcacd1e0d8dcbbe657b5737e8f82fdaf76a692ca5fc145f14d1926175a376428f80a7fdd0ba66f116637e9d80187262d1e390820cb8eb0d23c22f45b521f
+EBUILD cups-pdf-3.0.1-r2.ebuild 988 BLAKE2B f0f278fe196de4f9e0b70e000d27431cdf9bb6cc11bdc7b850d62617654deecbdb005b4b88363ca94b8e59078198d34ccf5042e051ddf760e8987f0e18603b2e SHA512 ed911466a4d73c3ab38d01423202ec624399297cdcba8faff1731335a73fe6a89c4f1e8148bcc83543e0ff3f1bd30d2effa2883fa25528ff52bd74a77cea8899
 MISC metadata.xml 256 BLAKE2B 16ea76357721c3ab7d672ade29d27338ddf9da983571e4ca4efe2520c741fc71315d9609b711850b00c19ed4eea848dea0d5b3955eecb401c42c4db257c300bf SHA512 2748afab7ffea0b3ddadf72dc720f7d83a1d76453fa569091abffe834ec187144a47f9365ccb4a97f676dbcfd799a6be92671f283b179fe4589d95486d7fd24d
diff --git a/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild b/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild
index eb1bfa417558..d95f554289f9 100644
--- a/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild
+++ b/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${PV/_}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="+ppds"
 
 DEPEND="net-print/cups"
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 82731e260606..cfff9ab751ab 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,5 +1,7 @@
 DIST hplip-3.20.11-plugin.run 11514293 BLAKE2B b3b7698a45e5e68a25ec1216e736484d26546b657f4a519a153acf0280847667e7ca81afc988f722668746281857d51d9e1703857514ffe5b57dea85f2bae4d3 SHA512 9075c1ac8e8f6e12d33b81b633025259f54352ea00271eec07ee898fd9a164445519608fc9ea61a7157845a4a03f87c28f486c7994f0d7db81d11d3fe51f1876
 DIST hplip-3.21.6-plugin.run 11514013 BLAKE2B 3ce0aea3642579838fc683a26a2ef16ce3477b3b664487764895504d1f488fa1246ece0ee19889403e6f22f18ebbe16a7ccd689ae6bbc48197179365dbeb672d SHA512 aa5620687a4b3ac1ff4c8278ac8d51bb38cedf6ea79782bd7c11e71beb0fe75672761874f271ff33e73a394f2a3aa04e1976455688b0f850b57ad7bc1eea3af8
+DIST hplip-3.21.8-plugin.run 11513942 BLAKE2B cbc5614b28a2032ade7fe9906ba5e93c773129121c5b6be950d8d04fd3edeaa97224cee6db4db72fbee6312151d4340b54c04753d03fea36a1772c961a3a0eba SHA512 5042e210d9c084e73a971d605a2eee5e96f2309101859fca09efbd09d60b6ae4959e54cdb334589f36a7aea16fb9eb23eb02bf2b330fab2e4c5a710cb0ec55e1
 EBUILD hplip-plugin-3.20.11.ebuild 1447 BLAKE2B 4833b0498319b3d1aa1bfcda87335d708efde09be0831cfc07bd9e0dc08bcfe5f3a98aad6f0828ca461dfaf271e920d8a0e33ce6abd33e6ecd72a8b561166e3c SHA512 cd1989698ea448e5e1b630d93bb164c856fa055783a3f00b7bac5a33b0c6597d3261260c8d267f7a43c15b0b89893c7245ba078014851be5345380615dcdda53
 EBUILD hplip-plugin-3.21.6.ebuild 1482 BLAKE2B 8c66152fa1c69e7de4262d46420427333cafd100287bd26a990fccb04c7044f8a12a289b0ebdc1a52c90ba155b70d5abaec239718366f9e5ca40673c04966d94 SHA512 75669d62756cba3607135ef952b4f2d00a7437db61de5e3d47553a8b4e744843a052e495d73cab02fca84cd7fcf0ec55549b525b56b18d701a54de8b1ebc63bb
+EBUILD hplip-plugin-3.21.8.ebuild 1482 BLAKE2B 8e0c160738053c605c2473891f4f146c18e630aa1789d009cf21daf6246e59f14d1d537294ae073878be753759ce1d6293ecf1ef604cae12e2899de3475e3d21 SHA512 ffd6cf68e9afc89cf45c616ac3f9d2ada6118e89f4bd172d08e896e9baec3d23a28cc6bffde9f000fabc18e89565c73159131a953e9480b864a60cf4103baf63
 MISC metadata.xml 523 BLAKE2B 396a3e3f19f1929ac628fd3301f7de077e34d80b88f0f65dd4035a55b8ff16be6a89dc94b47085dafc7a8a2def19353aa52996a12e51e94154a61ba1329f8c91 SHA512 9d5abebbd6fdac76142c70aa911c4ac55eb5388fd39e010d72e8e6253f51a7924eda2a675cd8ce3475fea76b307805644cf8f7140b265e66b4fcd65a8546fd96
diff --git a/net-print/hplip-plugin/hplip-plugin-3.21.8.ebuild b/net-print/hplip-plugin/hplip-plugin-3.21.8.ebuild
new file mode 100644
index 000000000000..66a474795496
--- /dev/null
+++ b/net-print/hplip-plugin/hplip-plugin-3.21.8.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="Proprietary plugins and firmware for HPLIP"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins"
+SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run"
+LICENSE="hplip-plugin"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="orblite"
+
+RDEPEND="
+	~net-print/hplip-${PV}
+	virtual/udev
+	orblite? (
+		media-gfx/sane-backends
+		>=sys-libs/glibc-2.26
+		virtual/libusb:0
+	)
+"
+DEPEND=""
+
+S=${WORKDIR}
+
+HPLIP_HOME=/usr/share/hplip
+
+# Binary prebuilt package
+QA_PREBUILT="${HPLIP_HOME}/*.so"
+
+# License does not allow us to redistribute the "source" package
+RESTRICT="mirror"
+
+src_install() {
+	local hplip_arch
+	case "${ARCH}" in
+		amd64) hplip_arch="x86_64" ;;
+		arm)   hplip_arch="arm32"  ;;
+		arm64) hplip_arch="arm64"  ;;
+		x86)   hplip_arch="x86_32" ;;
+		*)     die "Unsupported architecture." ;;
+	esac
+
+	insinto "${HPLIP_HOME}"/data/firmware
+	doins *.fw.gz
+
+	for plugin in *-${hplip_arch}.so; do
+		local plugin_type=prnt
+		case "${plugin}" in
+			bb_orblite-*)
+				use orblite || continue
+				plugin_type=scan ;;
+			bb_*)
+				plugin_type=scan ;;
+			fax_*)
+				plugin_type=fax ;;
+		esac
+
+		exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
+		newexe ${plugin} ${plugin/-${hplip_arch}}
+	done
+
+	insinto /var/lib/hp
+	newins - hplip.state <<-_EOF_
+		[plugin]
+		installed = 1
+		eula = 1
+		version = ${PV}
+	_EOF_
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index fdda793b9f21..0ae684c6f121 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-fortisslvpn/Manifest b/net-vpn/networkmanager-fortisslvpn/Manifest
index fc4401fb9743..1ce7846a3d7a 100644
--- a/net-vpn/networkmanager-fortisslvpn/Manifest
+++ b/net-vpn/networkmanager-fortisslvpn/Manifest
@@ -3,5 +3,5 @@ DIST NetworkManager-fortisslvpn-1.2.8.tar.xz 325100 BLAKE2B 9449bbec99ee50c2c0b9
 DIST NetworkManager-fortisslvpn-1.3.90.tar.xz 375416 BLAKE2B d2e07a2f79685cb600b6c0abca52a54911ff41534c152e9c5befe25d436757ba517d84cc474ff5c200ae62ca019296871fc29dc8342788295b3e59be55fa8198 SHA512 98b3e524cbb33c8dcdb325b10d227f88534948d98ca8009f770e48b87d42637762ba5343f081ac583b77c3387cb47f2660be0f60430ede237f812a2af8d9a7aa
 EBUILD networkmanager-fortisslvpn-1.2.10.ebuild 865 BLAKE2B ac01c51df4c7cd3f0026c7a303c6c81e84190a30549f40075eef2fb0870ba6fc36b8c3bc629f1b4029d40ac9e2002116357f392ce90adb75f793ba9f20455cd3 SHA512 f7330641874fee8b36f1cf95b08bb9ef5de95c4058d0debeae2ceafdf6b899885e76919f9075e1e6c7e1ffb7adf9f820f77abd1d34ef15b0a8dae840a16961af
 EBUILD networkmanager-fortisslvpn-1.2.8-r2.ebuild 884 BLAKE2B 52e053b236facdd5eb8ff392b40d7f90e95402b458d5eefacff9605dff8de252ac3a8d9cc6e7266e04a6e7f9588516da2cd8bb3e1cd6aef142a7d0380645e78a SHA512 1298ade8a40e7c0790b7682431f7895ad729c4bc94308a8851a6777f4b34d2691a1dbd52a3c9f804df918e60f5806da8177ff1a5f56aa298aed87293d2cc1c6a
-EBUILD networkmanager-fortisslvpn-1.3.90.ebuild 1072 BLAKE2B 57fec0072095a0e512c40c95a67ffdff5a1e3731ac6d9359ccf83eb6dbc1dbd9d09810721c150127cba42207eeace06a1501b84f33c215105028362b7eb0ebc6 SHA512 363d021128c9146c0c220761ac9cdf426cc99d5ff27075926db0d835e21994e5fdf0a530c402f3e9ec8dd1586d1cbb1421384873f80c5d6fa0d60acde0a54ee0
+EBUILD networkmanager-fortisslvpn-1.3.90.ebuild 1071 BLAKE2B b4ba9a550c464b4b9f2e9e6468415b26645a002c2106346a48f2f6122a32bf44707956abfe0c8415ee3573325dfbb2b4a746a3d6c93b321da16ac9ac4a800e20 SHA512 ae8f948778c018a5ecda4e973935c3cba416a3596df01d9ebe59261e095115ccb78a7497c89b541a12ed9cc454a315e837da3cdd350a7d6af08f69e72942b916
 MISC metadata.xml 411 BLAKE2B 2a68544a08639f4ee73732a7c1663614694c6aeabd6fb93e9a25f94b4667cfa3470bea7e40f3da181d985775362e7122dcc64f96b3ee96879b2137c3722f105c SHA512 e490c46a95e3ad932a325519831cdc74a356137a014d02f8e602821955ec81a0e523022a80d9e1f1412dcaa9b1ef17a8e2a0ec608e67c0ee58aa02f9165fa40c
diff --git a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.3.90.ebuild b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.3.90.ebuild
index 81b8594e7f8e..ac552106e156 100644
--- a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.3.90.ebuild
+++ b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.3.90.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="gtk"
 
 DEPEND="
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index 1e14ba2ba9bd..ea3ade64a98c 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -11,7 +11,7 @@ DIST openconnect-8.10.tar.gz 2084534 BLAKE2B 98ad0e24e09bc565f359139540f60eb9b6b
 DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5 SHA512 3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a
 DIST vpnc-scripts-20200930.tar.gz 22305 BLAKE2B 5db809ef674cb3cb8f1c775adc1e83debbda28fdcf47e0b0527efe6d1cea09781ef02b2827d9704140b884a85e7ec51fba497f47f6793520b471a7bba0dde6b6 SHA512 5f42bc7b168b5fdfc3ebd4bae52a42a654f102982852cc74240972e16e77fe0b54d82175e2a067e1d7e408bd14c3f465f7eb82b23b41885cb25a813d9587fd3d
 EBUILD openconnect-8.09-r3.ebuild 3079 BLAKE2B 030c6f46ebb04966924f6e51487608660e4d2157ae5364d413db5f8cf6c12d50b7b771c640a60047f14a2df1a33dbfc97ff6bf8e07916c496a844d47766aaef0 SHA512 5eabd5db4a6fff49744f8005a98f91f7b9eb0e1ad704cb63451fbd49b6564b294a2c39b3d8c887ebaaacfdaac780f4f255f0f46bba24186e31d9880524a156f1
-EBUILD openconnect-8.10-r4.ebuild 2777 BLAKE2B d621381a1a18c76e2276a5e5b6a18e4e1aa5bb95d0feca1ad6dc4a893e0a5b17943393ba25ca618be3f317b96f487b0de0c6db78c1f46d7a2b58542424437ebc SHA512 d200381113555b49deb99600df0e99c6c568ecb4b532c6e34fdf10fa76c78a9abc0d79f1858cdba6e6d080fb791cd653c3e6f4d49e0b26305ddf1d1b7236c469
+EBUILD openconnect-8.10-r5.ebuild 2778 BLAKE2B d92b86c623f8added6049222af6dd26083f83ced603bdf8cab34a3681e47928f9999d7518b48ed1ad92e9243db4f10a25df11eb2cbb34934bdaddf3c28dcb71d SHA512 5d778bef6808f0f0dc6ea5ba83ad515dc14de58fdca74a9c051507c7b7b4303a1da38c0c7dc736eaaf3b20181f2e40dd149dbc68f037db78e8561aec1f388ab5
 EBUILD openconnect-8.10.ebuild 3014 BLAKE2B ef2a3c2d603c2bfc155fc502009d49e0b6240e625ad7655dba2efb807531767d49ffdbc258ea24ebbd1654b36b36d156c52e3c9e900e1baad942243b74e686f7 SHA512 4c5afe5f42e3befa0aa5e5fc8a788ab1c7c637f1e7981102df9b51aff685f18a9302164edc8c2b5365ed439d2f605a3b74ec6392b61f2c19b0f4fe8c54ed8ae8
-EBUILD openconnect-9999.ebuild 2777 BLAKE2B d621381a1a18c76e2276a5e5b6a18e4e1aa5bb95d0feca1ad6dc4a893e0a5b17943393ba25ca618be3f317b96f487b0de0c6db78c1f46d7a2b58542424437ebc SHA512 d200381113555b49deb99600df0e99c6c568ecb4b532c6e34fdf10fa76c78a9abc0d79f1858cdba6e6d080fb791cd653c3e6f4d49e0b26305ddf1d1b7236c469
+EBUILD openconnect-9999.ebuild 2783 BLAKE2B 2e78bffa405e1d6a010abcdfdf4b7182c1189c3d5402aa8cc4f954b9a58efd48a9153ea7ab2c7a6e39da38fe7e863df9edf50f4840237aed852e08846d988567 SHA512 d3a65bbd01236738bd499ba13abd1d9b7cb752ed5e51de0582617828fd83109899ce55885c8ed8f359d9a3b2ae62cc6cb51f912b7a1c62e5e5cbb7aa67ce46dd
 MISC metadata.xml 524 BLAKE2B 8c9fc21b88e3dac2cd58d754d25dca9f12c835937c6265536767d242670ed6e12240ba2d9fc54e87ea265edd637c923eb97d03414f5846733076535126748cf4 SHA512 08d9d5104712ad4c311e87b18013868168f8fe5fc46f555c70e1bbfd8c066918ec1fa7f46ecd09b3b40db485da7f0155b1dde336e8baf48eccd5ea95abeabe79
diff --git a/net-vpn/openconnect/openconnect-8.10-r4.ebuild b/net-vpn/openconnect/openconnect-8.10-r4.ebuild
deleted file mode 100644
index 13c3da231bad..000000000000
--- a/net-vpn/openconnect/openconnect-8.10-r4.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
-
-inherit linux-info python-any-r1
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
-HOMEPAGE="http://www.infradead.org/openconnect.html"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5"
-IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/libxml2
-	sys-libs/zlib
-	!gnutls? (
-		>=dev-libs/openssl-1.0.1h:0=
-	)
-	gnutls? (
-		app-crypt/trousers
-		app-misc/ca-certificates
-		dev-libs/nettle
-		>=net-libs/gnutls-3.6.13:0=
-		dev-libs/libtasn1:0=
-		app-crypt/tpm2-tss
-	)
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	lz4? ( app-arch/lz4:= )
-	nls? ( virtual/libintl )
-	smartcard? ( sys-apps/pcsc-lite:0= )
-	stoken? ( app-crypt/stoken )
-"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2
-	net-vpn/vpnc-scripts
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( ${PYTHON_DEPS} sys-apps/groff )
-	nls? ( sys-devel/gettext )
-	test? (
-		net-libs/socket_wrapper
-		net-vpn/ocserv
-		sys-libs/uid_wrapper
-	)
-"
-
-CONFIG_CHECK="~TUN"
-
-pkg_pretend() {
-	check_extra_config
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if use doc; then
-		python_setup
-	else
-		export ac_cv_path_PYTHON=
-	fi
-
-	# Used by tests if userpriv is disabled
-	addwrite /run/netns
-
-	local myconf=(
-		--disable-dsa-tests
-		$(use_enable nls)
-		--disable-static
-		$(use_with !gnutls openssl)
-		$(use_with gnutls)
-		$(use_with libproxy)
-		$(use_with lz4)
-		$(use_with gssapi)
-		$(use_with smartcard libpcsclite)
-		$(use_with stoken)
-		--with-vpnc-script="${EPREFIX}/etc/vpnc-scripts/vpnc-script"
-		--without-java
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local charset
-	for charset in UTF-8 ISO8859-2; do
-		if [[ $(LC_ALL=cs_CZ.${charset} locale charmap 2>/dev/null) != ${charset} ]]; then
-			# If we don't have valid cs_CZ locale data, auth-nonascii will fail.
-			# Force a test skip by exiting with status 77.
-			sed -i -e '2i exit 77' tests/auth-nonascii || die
-			break
-		fi
-	done
-	default
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	dodoc "${FILESDIR}"/README.OpenRC
-
-	newconfd "${FILESDIR}"/openconnect.confd openconnect
-	newinitd "${FILESDIR}"/openconnect.initd openconnect
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openconnect.logrotate openconnect
-
-	keepdir /var/log/openconnect
-}
diff --git a/net-vpn/openconnect/openconnect-8.10-r5.ebuild b/net-vpn/openconnect/openconnect-8.10-r5.ebuild
new file mode 100644
index 000000000000..d8210a2b00ad
--- /dev/null
+++ b/net-vpn/openconnect/openconnect-8.10-r5.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+
+inherit linux-info python-any-r1
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
+fi
+
+DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
+HOMEPAGE="http://www.infradead.org/openconnect.html"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5"
+IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/libxml2
+	sys-libs/zlib
+	!gnutls? (
+		>=dev-libs/openssl-1.0.1h:0=
+	)
+	gnutls? (
+		app-crypt/trousers
+		app-misc/ca-certificates
+		dev-libs/nettle
+		>=net-libs/gnutls-3.6.13:0=
+		dev-libs/libtasn1:0=
+		app-crypt/tpm2-tss
+	)
+	gssapi? ( virtual/krb5 )
+	libproxy? ( net-libs/libproxy )
+	lz4? ( app-arch/lz4:= )
+	nls? ( virtual/libintl )
+	smartcard? ( sys-apps/pcsc-lite:0= )
+	stoken? ( app-crypt/stoken )
+"
+RDEPEND="${DEPEND}
+	sys-apps/iproute2
+	>=net-vpn/vpnc-scripts-20210402-r1
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( ${PYTHON_DEPS} sys-apps/groff )
+	nls? ( sys-devel/gettext )
+	test? (
+		net-libs/socket_wrapper
+		net-vpn/ocserv
+		sys-libs/uid_wrapper
+	)
+"
+
+CONFIG_CHECK="~TUN"
+
+pkg_pretend() {
+	check_extra_config
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	fi
+	default
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	if use doc; then
+		python_setup
+	else
+		export ac_cv_path_PYTHON=
+	fi
+
+	# Used by tests if userpriv is disabled
+	addwrite /run/netns
+
+	local myconf=(
+		--disable-dsa-tests
+		$(use_enable nls)
+		--disable-static
+		$(use_with !gnutls openssl)
+		$(use_with gnutls)
+		$(use_with libproxy)
+		$(use_with lz4)
+		$(use_with gssapi)
+		$(use_with smartcard libpcsclite)
+		$(use_with stoken)
+		--with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script"
+		--without-java
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local charset
+	for charset in UTF-8 ISO8859-2; do
+		if [[ $(LC_ALL=cs_CZ.${charset} locale charmap 2>/dev/null) != ${charset} ]]; then
+			# If we don't have valid cs_CZ locale data, auth-nonascii will fail.
+			# Force a test skip by exiting with status 77.
+			sed -i -e '2i exit 77' tests/auth-nonascii || die
+			break
+		fi
+	done
+	default
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	dodoc "${FILESDIR}"/README.OpenRC
+
+	newconfd "${FILESDIR}"/openconnect.confd openconnect
+	newinitd "${FILESDIR}"/openconnect.initd openconnect
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openconnect.logrotate openconnect
+
+	keepdir /var/log/openconnect
+}
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild
index 13c3da231bad..b2332da693ea 100644
--- a/net-vpn/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
@@ -47,7 +47,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	sys-apps/iproute2
-	net-vpn/vpnc-scripts
+	>=net-vpn/vpnc-scripts-20210402-r1
 "
 BDEPEND="
 	virtual/pkgconfig
@@ -105,7 +105,7 @@ src_configure() {
 		$(use_with gssapi)
 		$(use_with smartcard libpcsclite)
 		$(use_with stoken)
-		--with-vpnc-script="${EPREFIX}/etc/vpnc-scripts/vpnc-script"
+		--with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script"
 		--without-java
 	)
 
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index 353d9ed79ac1..a8431dfe2768 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -1,7 +1,12 @@
+AUX systemd_substitute_bin_and_sysconfig_dirs.patch 490 BLAKE2B 071747a713f2b155959768d827b9b256842a6f587d23992a06be9ab7a701a6b4bc6b86b56fe0853f04ff81dc43f739d07f8cf60ba37c0bc9da2712a23d8a7f5a SHA512 511e8179a7f36a5e5bd2b4a07e62812aac8065b34b767992b823b5f4135addaf662f8a6061215898281dc128b8386b166f614307680416aaeba183db3ef5e2cb
 DIST openfortivpn-1.13.2.tar.gz 82977 BLAKE2B 5daf2fdacaf2f9c3bc0a4bc3fc26543ed0ab424b70d2795e7b3d74b38cba53b1a8a9823564198ea5292b63f872c12f17ed3f65111a7024faee19640fff765cd7 SHA512 6be456784618d0af26190bad4af20a5f7163d3d984e3317fa3aac04b605ddd39f8973b192cf35fc8a371bf5ca4cbff8f644991b0cc031f558bf7881066fe8ec2
 DIST openfortivpn-1.15.0.tar.gz 157951 BLAKE2B 051dbc5ab5c003926fa4424b9c69e899bc9602aabab7749953743d1d81e0ebd90ebdf157921cabc016cf93263279eab111ed1b9763fb4ba50a11f463659be2dd SHA512 8ec6454c197925a031a454e3983ed98d93d48514d86ebb09483157872e299d9c6b36a966ac6c67cd85d203223460998cdc0e6af9d5389357d4a55789aa5e2083
 DIST openfortivpn-1.16.0.tar.gz 163878 BLAKE2B 003460ca6012b90ddea41b1fe533c3b6899fa8528ef656e6d1b4a200f01d3a476749405294fc2c3c4ba489a41d7e72738d540632922fe2ae2d2344f5fc5750e3 SHA512 bd57bc076f89604077c0c6f538090b33707e2534f83ae7e01ee0604b044b2f1083b65f7d0241fb4fc38eabe8462689137c66bf59dac12b21408b8453f5b2cc5a
+DIST openfortivpn-1.17.0.tar.gz 166943 BLAKE2B f6372eac056ce0b9c1d3ea46d6af3d5da2323ecc96273b37efb9eccb13d31f607b1bc5843b2d33b3a722901530109a6cf0b270d6d4e31433045e6bca6041279a SHA512 fb92e07468c6a4232977506eb42e416a32612a0bd78b705588c66e7ae68c712e2d245ee4eac6806dfb7cab5fcf10739ed9002358a425a8dbb75fb1cdc15e4c98
+DIST openfortivpn-1.17.1.tar.gz 167127 BLAKE2B 4b8f9fb82c4f7c8ffcecf9f14c576d73c999712b7b183b74f9d60d59c67017080a3d16d95ae74fa7f07188e9b28bdf8384f9b41ea7a4ce8e24813044d27216b9 SHA512 9d8be1043833bfa0eba6e4032c767946e88d079d329f8039964ea659c4dffb54a5a3b2a6431b66bd86590eaca8bf598a110c368714ecd7ea00312ee97f329085
 EBUILD openfortivpn-1.13.2.ebuild 694 BLAKE2B f64b845c7ad2e3b71757e0ed2c0ec8dce68cf144e201979ac3a89cb9bf1267fc0e34277b1233c44ccd3e9f62e4f6c2189abf44815207c19c4bd98c15c858a80f SHA512 4d92182d916e1b732b9a973429a63d5dd66aa74dc43188da1795e4f80575adc286cf7b45af5401c8ed7d50f9f6dcaba036a4a31c42a086462378933601f6971f
 EBUILD openfortivpn-1.15.0.ebuild 695 BLAKE2B 3454dcfd7632f8754b0867ec187b4d36049c59ebbb9147493e3c2f499b0ac49f2e347916f229bea18ca235c4432fe7ace8477c37e9bc2c1957068b5b2c41eae4 SHA512 5d54c16219eea51d4700749cc635b6be09727cffb858695dfca028e8ef2ac979b1f64486387dc43e53b5a24d01c8312d6fa2e1a9fb982274e3d1ed847e8b3885
 EBUILD openfortivpn-1.16.0.ebuild 695 BLAKE2B 3454dcfd7632f8754b0867ec187b4d36049c59ebbb9147493e3c2f499b0ac49f2e347916f229bea18ca235c4432fe7ace8477c37e9bc2c1957068b5b2c41eae4 SHA512 5d54c16219eea51d4700749cc635b6be09727cffb858695dfca028e8ef2ac979b1f64486387dc43e53b5a24d01c8312d6fa2e1a9fb982274e3d1ed847e8b3885
-MISC metadata.xml 335 BLAKE2B 6ff1bb309e2742b91289aad7fa5b0c6968452b99e922140f4dc0bb7614fc05daf251ed059fae3a16366c16e4722d151749928b4e658af36f01bdd12b8c2d485a SHA512 9a42d2b0eb2c8b9c67b9288211e2751521e459a08c16663088295aed2194add1ce2da7d4621f6b9d987221a34beb87514907c7cf3d0fd0b500691ca390cd0f69
+EBUILD openfortivpn-1.17.0.ebuild 695 BLAKE2B 3454dcfd7632f8754b0867ec187b4d36049c59ebbb9147493e3c2f499b0ac49f2e347916f229bea18ca235c4432fe7ace8477c37e9bc2c1957068b5b2c41eae4 SHA512 5d54c16219eea51d4700749cc635b6be09727cffb858695dfca028e8ef2ac979b1f64486387dc43e53b5a24d01c8312d6fa2e1a9fb982274e3d1ed847e8b3885
+EBUILD openfortivpn-1.17.1.ebuild 771 BLAKE2B 52693a48ffcc0c89f6043b7d0acc15a817a8881bd0f1613a926fd469626285f4399cece75935e71a67bad4ed7702ed1e2fb1c4fef33a105237c9575d90e8530a SHA512 c0bcc220a493d91c20d5be104a205cfa68a4081784b5fa9b1b8aca88cae26e1a31697d009d75d228fdf1a9bdba625647786eb662d45ed7b923daa0be6d9bff2c
+MISC metadata.xml 257 BLAKE2B f87135c9aedf98ef822404eb43e8214ed1e6d3cfc71db8d1aece9c3f8c30fda5b63f1de77b8d8d98b9b6b8d671e164199bcd810a34fe71939b836b164261ec2e SHA512 7719a7bd4abd3115b6279c4446e87c0c552f8b7dadd7429cbd8844ee2fe2509b712287f2d2e5926d6711dbe21efaebb289d187ebc297be770bb538f8bf799d31
diff --git a/net-vpn/openfortivpn/files/systemd_substitute_bin_and_sysconfig_dirs.patch b/net-vpn/openfortivpn/files/systemd_substitute_bin_and_sysconfig_dirs.patch
new file mode 100644
index 000000000000..4cfe57c46545
--- /dev/null
+++ b/net-vpn/openfortivpn/files/systemd_substitute_bin_and_sysconfig_dirs.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/systemd/system/openfortivpn@.service.in b/lib/systemd/system/openfortivpn@.service.in
+index 6c30230..3ff3d7c 100644
+--- a/lib/systemd/system/openfortivpn@.service.in
++++ b/lib/systemd/system/openfortivpn@.service.in
+@@ -6,7 +6,7 @@ Documentation=man:openfortivpn(1)
+ [Service]
+ Type=simple
+ PrivateTmp=true
+-ExecStart=@BINDIR@/openfortivpn -c @SYSCONFDIR@/openfortivpn/%I.conf
++ExecStart=/usr/bin/openfortivpn -c /etc/openfortivpn/%I.conf
+ OOMScoreAdjust=-100
+ 
+ [Install]
diff --git a/net-vpn/openfortivpn/metadata.xml b/net-vpn/openfortivpn/metadata.xml
index 6670f0c556ba..592ca36a0245 100644
--- a/net-vpn/openfortivpn/metadata.xml
+++ b/net-vpn/openfortivpn/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">adrienverge/openfortivpn</remote-id>
 	</upstream>
diff --git a/net-vpn/openfortivpn/openfortivpn-1.17.0.ebuild b/net-vpn/openfortivpn/openfortivpn-1.17.0.ebuild
new file mode 100644
index 000000000000..0c64cdfd137f
--- /dev/null
+++ b/net-vpn/openfortivpn/openfortivpn-1.17.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+DESCRIPTION="Fortinet compatible VPN client"
+HOMEPAGE="https://github.com/adrienverge/openfortivpn"
+SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception openssl"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	net-dialup/ppp
+	dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~PPP ~PPP_ASYNC"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' Makefile.am || die "Failed to remove -Werror from Makefile.am"
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	keepdir /etc/openfortivpn
+}
diff --git a/net-vpn/openfortivpn/openfortivpn-1.17.1.ebuild b/net-vpn/openfortivpn/openfortivpn-1.17.1.ebuild
new file mode 100644
index 000000000000..634f0884bc80
--- /dev/null
+++ b/net-vpn/openfortivpn/openfortivpn-1.17.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+DESCRIPTION="Fortinet compatible VPN client"
+HOMEPAGE="https://github.com/adrienverge/openfortivpn"
+SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception openssl"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	net-dialup/ppp
+	dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~PPP ~PPP_ASYNC"
+
+PATCHES=(
+	"${FILESDIR}/systemd_substitute_bin_and_sysconfig_dirs.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' Makefile.am || die "Failed to remove -Werror from Makefile.am"
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	keepdir /etc/openfortivpn
+}
diff --git a/net-vpn/vpnc-scripts/Manifest b/net-vpn/vpnc-scripts/Manifest
index 5b0aeb256a5e..78ba4eb74af0 100644
--- a/net-vpn/vpnc-scripts/Manifest
+++ b/net-vpn/vpnc-scripts/Manifest
@@ -1,4 +1,4 @@
 DIST vpnc-scripts-20210402.tar.gz 39925 BLAKE2B 2bc8a274773e51ba48e402588fdf5b51d20360f610afe5608f91dfe2466644b68d891a60c27e4c6938b4ed5da1f193ddb7a8ac955c8f02e6bf91437dc5c47620 SHA512 5f9fc5ab1a5a2607f807700536c4a8e71c551052e72979c1cdd02b15906615be33a297b873b0806f269e51645f10f1c02a7acfed2501148bfa2797250582920d
-EBUILD vpnc-scripts-20210402.ebuild 594 BLAKE2B fe8d8a629332563b792285af44ef9b4199200cba23471ee3deeb5dc748ca55f009cebf35d024a22b5b0b1a4b7ddaf9be3ea4b68bb1cafcbbfab0954957d54dbb SHA512 4dea57427a334d1c6a349c3461a6ee50e5202475e218435ba5d6fb4d6ca15cbdd2e8317fcde4a2aca8a4a766e4729c43caf552aa1d0e262b609fe688e8710630
-EBUILD vpnc-scripts-99999999.ebuild 594 BLAKE2B fe8d8a629332563b792285af44ef9b4199200cba23471ee3deeb5dc748ca55f009cebf35d024a22b5b0b1a4b7ddaf9be3ea4b68bb1cafcbbfab0954957d54dbb SHA512 4dea57427a334d1c6a349c3461a6ee50e5202475e218435ba5d6fb4d6ca15cbdd2e8317fcde4a2aca8a4a766e4729c43caf552aa1d0e262b609fe688e8710630
+EBUILD vpnc-scripts-20210402-r1.ebuild 631 BLAKE2B 507c97ac7045f64c8bb3967764460c7b32eb1c59a2e9862658df5e33486d3bc96e554b54d22e0c9487ba538ca047b859ff160847dc4ed9bb18c8c60bfd40ca45 SHA512 8981765b5faf7aff9624d5d818f0537e0612ab9956ec53839d847dd5e519f06a598416acc2ec3b0674b5b27ab7f9009fa318b8c86b74b04d2bee6ca082a5974d
+EBUILD vpnc-scripts-99999999.ebuild 638 BLAKE2B 97d210225c16d3b48309e172d14d239a999f8f7f9ebd74166aae22f36e6d72c9c6c6ec66ff77d60b5e06a9f01affab6df88a1e8f71e8147eb83015d7cbc52308 SHA512 e63e68a7e4b7673f090eda3e4044d9109a8b772bee5e5ca0ac03fcb33638ec5d480b00e5ad12b2a6f5c65d23e082e897fbce557f27cd02d1b82e7270783b359b
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/net-vpn/vpnc-scripts/vpnc-scripts-20210402-r1.ebuild b/net-vpn/vpnc-scripts/vpnc-scripts-20210402-r1.ebuild
new file mode 100644
index 000000000000..ebab1afc4cac
--- /dev/null
+++ b/net-vpn/vpnc-scripts/vpnc-scripts-20210402-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 99999999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/openconnect/vpnc-scripts.git"
+else
+	SRC_URI="ftp://ftp.infradead.org/pub/vpnc-scripts/${P}.tar.gz"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+fi
+
+DESCRIPTION="Connect scripts for use with vpnc and openconnect (and similar clients)"
+HOMEPAGE="https://gitlab.com/openconnect/vpnc-scripts"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="!<net-vpn/vpnc-0.5.3_p550-r3"
+
+src_install() {
+	exeinto /etc/vpnc
+	doexe vpnc-script{,-{ptrtd,sshd}}
+}
diff --git a/net-vpn/vpnc-scripts/vpnc-scripts-20210402.ebuild b/net-vpn/vpnc-scripts/vpnc-scripts-20210402.ebuild
deleted file mode 100644
index 83fa0467d1d8..000000000000
--- a/net-vpn/vpnc-scripts/vpnc-scripts-20210402.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == 99999999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/openconnect/vpnc-scripts.git"
-else
-	SRC_URI="ftp://ftp.infradead.org/pub/vpnc-scripts/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Connect scripts for use with vpnc and openconnect (and similar clients)"
-HOMEPAGE="https://gitlab.com/openconnect/vpnc-scripts"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-src_install() {
-	exeinto /etc/vpnc-scripts
-	doexe vpnc-script{,-{ptrtd,sshd}}
-}
diff --git a/net-vpn/vpnc-scripts/vpnc-scripts-99999999.ebuild b/net-vpn/vpnc-scripts/vpnc-scripts-99999999.ebuild
index 83fa0467d1d8..99aefb4e0087 100644
--- a/net-vpn/vpnc-scripts/vpnc-scripts-99999999.ebuild
+++ b/net-vpn/vpnc-scripts/vpnc-scripts-99999999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 99999999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/openconnect/vpnc-scripts.git"
 else
 	SRC_URI="ftp://ftp.infradead.org/pub/vpnc-scripts/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Connect scripts for use with vpnc and openconnect (and similar clients)"
@@ -17,7 +17,9 @@ HOMEPAGE="https://gitlab.com/openconnect/vpnc-scripts"
 LICENSE="GPL-2+"
 SLOT="0"
 
+RDEPEND="!<net-vpn/vpnc-0.5.3_p550-r3"
+
 src_install() {
-	exeinto /etc/vpnc-scripts
+	exeinto /etc/vpnc
 	doexe vpnc-script{,-{ptrtd,sshd}}
 }
diff --git a/net-vpn/vpnc/Manifest b/net-vpn/vpnc/Manifest
index c2fcad65087e..951ff93a4bef 100644
--- a/net-vpn/vpnc/Manifest
+++ b/net-vpn/vpnc/Manifest
@@ -5,4 +5,5 @@ AUX vpnc.confd 123 BLAKE2B 313d5999586f56b3b88f8473d1f6f07e69994c620ddf3d8cfb9e2
 AUX vpnc.service 517 BLAKE2B 3fa2eaeea6a28fdf8826d936e1fe93dccade383411df395d69971312c9e062299af8b9f7514875a79a7d4e916efa4b4cf83ab0fb29eedbf52da31af3bc0fff63 SHA512 d580ad4fadbe6ea733f42eda53516e1766ba028f610653c62ba211d4a9ee05a6bf1d8676405a7a3ffede3432d75f9c4dcc72d1fab2a9215150f41a74269850c5
 DIST vpnc-0.5.3_p550-r2.tar.gz 133339 BLAKE2B d4f09a62edbe3b4014c4903d908eecf27ee09705017f715aadc869592fb80d7f4482f08e4681dd9e9c22ae16ae185404e09572800de8cb76419c20f5bf8e17d1 SHA512 3adaf4c73c14c328ca9702c1e3d3c333b0a589f99b52990febf7b22ac87f666f1fc0a1d62e9831ec645567ca01425ea476a7bb62fee214012c97651e0e99b732
 EBUILD vpnc-0.5.3_p550-r2.ebuild 2229 BLAKE2B fcd7c82681987e3f766980bb8b7cccfb069b1c51234518a750a074eb73fa3734eac52e84aaa1a385d8c36f2f4a2bc049fd45fa9e1f2fb46778a251ee5b8e04ef SHA512 71b10eea902d6bcb4f472b4e80f0597f697bee4aea45a1900c4e85a33894ed9e46e5e31db516d468954ac854e2f0ec250527c5592461e28ca461ed06c44e32eb
+EBUILD vpnc-0.5.3_p550-r3.ebuild 2299 BLAKE2B f16d4c12cb5ae5373a2017ab2220bd9f52bac52e13d9ca43c54184d395f50b4d4bc9481606bcf4c1fd41a666c09362fdd68bdd69b35ec93faf603113aa149c07 SHA512 0d37011d53ed0acf1b9768ed544511d543c8299e01b5c565ae00897e12fec297b36b9cd135265aa0ff36040a0367659088642e58202fd1ceeba7f9f0ad2a8272
 MISC metadata.xml 365 BLAKE2B 9505bbae63099cc965f4eb072819ef593e9d5d564002f550db6bfc277f12201dc1ac7cfd9d511d5ceaae501b308755004b2a2618059e122bd64e7b6d5109bd76 SHA512 d0925c0a1863f6de571a81ebbbc6b59eabaa73aa88c73162c4ea735a3cafcaac7c3ecacf05b9038f4aeb07e911865dc5c72f5ead3c1b2861dd3cf4c2cd3a2d84
diff --git a/net-vpn/vpnc/vpnc-0.5.3_p550-r3.ebuild b/net-vpn/vpnc/vpnc-0.5.3_p550-r3.ebuild
new file mode 100644
index 000000000000..ffead8b84325
--- /dev/null
+++ b/net-vpn/vpnc/vpnc-0.5.3_p550-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd tmpfiles toolchain-funcs vcs-snapshot
+
+DESCRIPTION="Free client for Cisco VPN routing software"
+HOMEPAGE="https://www.unix-ag.uni-kl.de/~massar/vpnc/"
+MY_P="${P}-r2"
+SRC_URI="https://github.com/streambinder/vpnc/archive/fa0689c.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+IUSE="resolvconf +gnutls selinux"
+RESTRICT="!gnutls? ( bindist )"
+
+DEPEND="
+	dev-lang/perl
+	dev-libs/libgcrypt:0=
+	>=sys-apps/iproute2-2.6.19.20061214[-minimal]
+	gnutls? ( net-libs/gnutls:0= )
+	!gnutls? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}
+	>=net-vpn/vpnc-scripts-20210402-r1
+	resolvconf? ( virtual/resolvconf )
+	selinux? ( sec-policy/selinux-vpn )"
+
+CONFIG_CHECK="~TUN"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${MY_P}-var-run-fhs-3.0.patch )
+
+src_configure() {
+	tc-export CC
+	export OPENSSL_GPL_VIOLATION=$(usex !gnutls)
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${ED}" install
+	dodoc README.md TODO VERSION
+
+	keepdir /etc/vpnc/scripts.d
+	newinitd "${FILESDIR}"/vpnc-3.init vpnc
+	newconfd "${FILESDIR}"/vpnc.confd vpnc
+	# Use the newer version from net-vpn/vpnc-scripts
+	rm "${ED}"/etc/vpnc/vpnc-script || die
+
+	dotmpfiles "${FILESDIR}"/vpnc-tmpfiles.conf
+	systemd_newunit "${FILESDIR}"/vpnc.service vpnc@.service
+
+	# COPYING file resides here, should not be installed
+	rm -r "${ED}"/usr/share/doc/vpnc/ || die
+}
+
+pkg_postinst() {
+	tmpfiles_process vpnc-tmpfiles.conf
+
+	elog "You can generate a configuration file from the original Cisco profiles of your"
+	elog "connection by using /usr/bin/pcf2vpnc to convert the .pcf file"
+	elog "A guide is available at https://wiki.gentoo.org/wiki/Vpnc"
+
+	if use gnutls; then
+		elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries."
+		elog "See the Makefile itself and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+	else
+		ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that"
+		ewarn "you are not allowed to re-distibute the binaries due to conflicts between BSD license and GPL,"
+		ewarn "see the vpnc Makefile and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+	fi
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 2e3aa5d3cade..cb29c5b54e73 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 58788d7bfb98..7b86553b89e8 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -2,13 +2,10 @@ AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch 1912 BLA
 AUX 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch 1252 BLAKE2B ce6d00ea244d91e76b696e60ddb9096aa48572b68474f321f05b0e3e9525932e6fdaeacc3b141dc4b118d5fa305b7a0510e9c57c935e489a9c159dcd826ad870 SHA512 774f1d9cd49dd3fc0e9f02ad93876c59d78f88f149591f384cf5d2e3541d237ce390552c8bc2cb4d4ad7e5dcc295df49220565f0b0e686a2f8b3404f68323d32
 AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7a35c9930d32441a89f742993e993e3003f9bcb5e3ee9adde2ab1cbe33b27245b1b1e91e7c3dc1a0b SHA512 45befd3fb42ea3462fa6e1ee9f3ee9591e197d4925a4c9df6733bacfe44cf44f54ed3aad6fd7a6a2953da54b93460a1cf0ea1cadf0d7e47f811e4c3182af74d5
 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96
-AUX bluez-5.58-rfkill.patch 2475 BLAKE2B 0f4cfd4aa97a2e4479c4b109533b4ca39cd6155a1f0a1ee854e2e972dbf294eb870a3371dfebc6fde53cfb2f45d05e0721a3d137511e8822d8628a37570713fd SHA512 094858b34c2f60dafc70ccf0aec5971c47c656c9f74dce54a68e59ca0d3a8fb2902f597588b4f64fc47a6377ef9f3198a194f09c018c9881d1df70a9f652b531
 AUX bluez-5.60-glibc-2.34.patch 1511 BLAKE2B 59035b078414358bf3ab66f92884dcef1d3795780d3ecad2d036dbfe7ee78dab027c9eb34185013ab89f5cbe2a6a0006e4d9420217f3231e27aafd2c5b92a9ec SHA512 ea78ae3771be72b269626c0c119d8d8f8d9b0874379bfd3ada58c9087aac3c55a7ab52a08503964aa397c03791beb918362bc35d0e87e74f5feca0c30bac0e0b
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
-DIST bluez-5.58.tar.xz 2060368 BLAKE2B 157780f83181d89fb126face5e9794bc0de8196f43d57d079fc09ae7e45e7ef21bf404e834d844da28d06f9a29cb92f11c310dbbcb7f60e845a335a558d7190c SHA512 159b554e0afd56af5da6f8333383f2fdf96d77a0e82d762bf4b37786e7312b7e61fbbae0f18b26442a606e0a232f48e0f45a4b38b95de36c7daf384f582315a3
-DIST bluez-5.60.tar.xz 2124312 BLAKE2B 52cd08192cbfb7adc2e11f270442af62307dbf3cb940554f77e1ec4c30036ca1c05970d7d48719d3036173135f2b14123f2d0aad8147f0a919773d211238a11e SHA512 069e054360b4ab72f1daa033572f0fd822fb0f47e52069f4f3dcdfecfa312b9a5366cc04967e639aef39b980c0e1007389f1ee757e7c3bae43a5e66f8ed21a6b
 DIST bluez-5.61.tar.xz 2137412 BLAKE2B 2fc1b44f726d48b4a0e8bbecc664077db1db69bbc87c66e9d7ac85d7b2e066de8b349c18597a5ba140c5fcb1ef867ee3980ebdd839ded69ae30491fb7b836940 SHA512 a2318637258f9db0bf05fecbfbea2c3ca5e21867378e28ab4c77f658fe42f10c8c607939f2b437ec40d1ceb00b99f7916c0275faaedd9edd247f7dc91329937a
-EBUILD bluez-5.58-r1.ebuild 9352 BLAKE2B 5a61262e6209c7b9422ccab76eb64a16a0671d3fd3d10f8eceeb5189e5a8296a7929b54fde2ccf94e113abe63271be420c612c66be0832b861d823628b15186a SHA512 d3af406292d2c2aa1e05e4060436ef80b3c72170f03a61fbec149ef1a2254a6ad1f9ea4d620e6fae5f3504769b75f913257ff714049872f9ede92f27ca1de5ca
-EBUILD bluez-5.60.ebuild 9391 BLAKE2B f139cda7de10f4bd73872f5cbf68febb08e728680a8156aba5bdfdc11a7965d3ec7fba4f171caf1e3bcc56ac26d512b35af9b4fef242a0e9921481fabe0a9fb1 SHA512 255a69f09619f19df01ce1166b9d99a0313f05ef2dc0b32774f32feaa88c05647045793067eff40eb37cb56c6058f316abe60fdc175c349da4df40e8040e6475
+DIST bluez-5.62.tar.xz 2149348 BLAKE2B db99b36a230fc0be15275d2eda9864b686326ba50648f66b19087ea4309a76d234ab4f1dcb6975f1513a898978b1d5b9332542f5dcee22efd898b79658434a70 SHA512 8fb0b81e1d929d3eee3d70f457ce75dbcff4c2a8a728247fc950bbe11e84d83582345bfd433d2e2df7b5588eb0e42f286658a83c7332be84819d9df49a5707e8
 EBUILD bluez-5.61.ebuild 9385 BLAKE2B 8ae4bf939cffe5d42440ae677aff36f98777f3e7f154c62c68fb2b53e13a6df305d4f47b4e86f25be250bf2325084549dab6075d9642b69086efa8cf3c9c845a SHA512 b9a5944f27d19aa5e8a0e34058946e1432e706f9c94be99337aca9d478ebd7edd2a016ad2da64cf9042ab43cb3b7ba486ab9aef88536c4925f5fe1950d5d416f
+EBUILD bluez-5.62.ebuild 9285 BLAKE2B bdf223d01048d569bc030f1cec1502e5ced6dc348b102e1413831e3d1fed69c90beb23d7648739d8bb176d292b8927ea035a8a83d2b1100e365d86c9a9fc071e SHA512 a71ef65fdfd3caa163dec8be0d33eb6b51a9cb6f5217c61a08b30d0a8c6c135be71fc4a96daccfabbc7b36aea05a365831fbd8b2faebd245989b20b44f22120a
 MISC metadata.xml 1212 BLAKE2B 0b5305cc11d8a158397c71913b66be82b72db0e08cecdc98a2e24d2b77882a39752a2415a75758425fdfe4c06bfb98ab6526e55c2af2da2ddd697bab0d383b39 SHA512 f8fccab91d82cf6eced451e7f6d20ee721ba8199aa36f8771b79ef1707f5fb9239e9b7034cff4798c8ace0f209cca7c4d7d5f2f5744728f18c4c1e398c09dcd3
diff --git a/net-wireless/bluez/bluez-5.58-r1.ebuild b/net-wireless/bluez/bluez-5.58-r1.ebuild
deleted file mode 100644
index 18c11b1754e9..000000000000
--- a/net-wireless/bluez/bluez-5.58-r1.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 x86"
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
-
-# Since this release all remaining extra-tools need readline support, but this could
-# change in the future, hence, this REQUIRED_USE constraint could be dropped
-# again in the future.
-REQUIRED_USE="
-	extra-tools? ( deprecated readline )
-	test? ( ${PYTHON_REQUIRED_USE} )
-	test-programs? ( ${PYTHON_REQUIRED_USE} )
-"
-
-TEST_DEPS="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${TEST_DEPS} )
-"
-DEPEND="
-	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
-	>=sys-apps/hwids-20121202.2
-	btpclient? ( >=dev-libs/ell-0.39 )
-	cups? ( net-print/cups:= )
-	mesh? (
-		>=dev-libs/ell-0.39
-		>=dev-libs/json-c-0.13:=
-		sys-libs/readline:0=
-	)
-	midi? ( media-libs/alsa-lib )
-	obex? ( dev-libs/libical:= )
-	readline? ( sys-libs/readline:0= )
-	systemd? (
-		>=sys-apps/dbus-1.6:=[user-session=]
-		sys-apps/systemd
-	)
-	!systemd? ( >=sys-apps/dbus-1.6:= )
-	udev? ( >=virtual/udev-172 )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bluetooth )
-	test-programs? ( ${TEST_DEPS} )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# rfkill: Fix reading from rfkill socket
-	"${FILESDIR}"/${P}-rfkill.patch
-
-	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
-	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
-	# https://bugs.gentoo.org/539844
-	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
-
-	# Fedora patches
-	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
-	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-)
-
-pkg_setup() {
-	# From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
-	# to prevent bugs like:
-	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER
-				~BT_BNEP_PROTO_FILTER ~BT_HIDP ~RFKILL ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER"
-	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	# https://bugzilla.kernel.org/show_bug.cgi?id=206815
-	if use mesh || use test; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER
-		~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_USER_API_HASH
-		~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC"
-	fi
-	linux-info_pkg_setup
-
-	if use test || use test-programs; then
-		python-single-r1_pkg_setup
-	fi
-
-	if ! use udev; then
-		ewarn
-		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
-		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
-		ewarn "and hid2hci will not be available."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	if ! use user-session || ! use systemd; then
-		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
-	fi
-
-	eautoreconf
-
-	if use cups; then
-		# Only not .am to not need to run eautoreconf only because of this
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
-			Makefile.{in,tools} || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# readline is automagic when client is enabled
-		# --enable-client always needs readline, bug #504038
-		# --enable-mesh is handled in the same way
-		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
-		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# deps not used for the library
-			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
-		)
-	fi
-
-	econf \
-		--localstatedir=/var \
-		--disable-android \
-		--enable-datafiles \
-		--enable-optimization \
-		$(use_enable debug) \
-		--enable-pie \
-		--enable-threads \
-		--enable-library \
-		--enable-tools \
-		--enable-manpages \
-		--enable-monitor \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(multilib_native_use_enable btpclient) \
-		$(multilib_native_use_enable btpclient external-ell) \
-		$(multilib_native_use_enable cups) \
-		$(multilib_native_use_enable deprecated) \
-		$(multilib_native_use_enable experimental) \
-		$(multilib_native_use_enable mesh) \
-		$(multilib_native_use_enable mesh external-ell) \
-		$(multilib_native_use_enable midi) \
-		$(multilib_native_use_enable obex) \
-		$(multilib_native_use_enable readline client) \
-		$(multilib_native_use_enable systemd) \
-		$(multilib_native_use_enable test-programs test) \
-		$(multilib_native_use_enable udev) \
-		$(multilib_native_use_enable udev hid2hci) \
-		$(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -f Makefile -f - libs \
-			<<<'libs: $(lib_LTLIBRARIES)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-
-		# Only install extra-tools when relevant USE flag is enabled
-		if use extra-tools; then
-			ewarn "Upstream doesn't support using this tools and their bugs are"
-			ewarn "likely to be ignored forever, also they can break without"
-			ewarn "previous announcement."
-			ewarn "Upstream also states all this tools are not really needed,"
-			ewarn "then, if you still need to rely on them, you must ask them"
-			ewarn "to either install that tool by default or add the needed"
-			ewarn "functionality to the existing 'official' tools."
-			ewarn "Please report this issues to:"
-			ewarn "http://www.bluez.org/development/lists/"
-
-			# Upstream doesn't install this, bug #524640
-			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
-			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
-			dobin tools/btmgmt
-			# gatttool is only built with readline, bug #530776
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1141909
-			# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
-			# https://bugs.archlinux.org/task/37686
-			dobin attrib/gatttool
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
-			dobin tools/avinfo
-		fi
-
-		# Not installed by default after being built, bug #666756
-		use btpclient && dobin tools/btpclient
-
-		# Unittests are not that useful once installed, so make them optional
-		if use test-programs; then
-			# Drop python2 only test tools
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206819
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206821
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206823
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server	|| die
-
-			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
-
-			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
-				dosym "${i}" /usr/bin/bluez-"${i##*/}"
-			done
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-pkgincludeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	# We need to ensure obexd can be spawned automatically by systemd
-	# when user-session is enabled:
-	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
-	# https://bugs.gentoo.org/show_bug.cgi?id=577842
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
-	# https://bugs.archlinux.org/task/45816
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
-	if use user-session && use systemd; then
-		ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	keepdir /var/lib/bluetooth
-
-	# Upstream don't want people to play with them
-	# But we keep installing them due to 'historical' reasons
-	insinto /etc/bluetooth
-	local d
-	for d in input network; do
-		doins profiles/${d}/${d}.conf
-	done
-	# Setup auto enable as Fedora does for allowing to use
-	# keyboards/mouse as soon as possible
-	sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
-	doins src/main.conf
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth
-	newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth
-
-	einstalldocs
-	use doc && dodoc doc/*.txt
-	# Install .json files as examples to be used by meshctl
-	if use mesh; then
-		dodoc tools/mesh-gatt/*.json
-		local DOC_CONTENTS="Some example .json files were installed into
-		/usr/share/doc/${PF} to be used with meshctl. Feel free to
-		uncompress and copy them to ~/.config/meshctl to use them."
-		readme.gentoo_create_doc
-	fi
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	systemd_reenable bluetooth.service
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
-	use mesh && readme.gentoo_print_elog
-}
diff --git a/net-wireless/bluez/bluez-5.60.ebuild b/net-wireless/bluez/bluez-5.60.ebuild
deleted file mode 100644
index a86c0dde25ae..000000000000
--- a/net-wireless/bluez/bluez-5.60.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86"
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
-
-# Since this release all remaining extra-tools need readline support, but this could
-# change in the future, hence, this REQUIRED_USE constraint could be dropped
-# again in the future.
-REQUIRED_USE="
-	extra-tools? ( deprecated readline )
-	test? ( ${PYTHON_REQUIRED_USE} )
-	test-programs? ( ${PYTHON_REQUIRED_USE} )
-"
-
-TEST_DEPS="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	dev-python/docutils
-	virtual/pkgconfig
-	test? ( ${TEST_DEPS} )
-"
-DEPEND="
-	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
-	>=sys-apps/hwids-20121202.2
-	btpclient? ( >=dev-libs/ell-0.39 )
-	cups? ( net-print/cups:= )
-	mesh? (
-		>=dev-libs/ell-0.39
-		>=dev-libs/json-c-0.13:=
-		sys-libs/readline:0=
-	)
-	midi? ( media-libs/alsa-lib )
-	obex? ( dev-libs/libical:= )
-	readline? ( sys-libs/readline:0= )
-	systemd? (
-		>=sys-apps/dbus-1.6:=[user-session=]
-		sys-apps/systemd
-	)
-	!systemd? ( >=sys-apps/dbus-1.6:= )
-	udev? ( >=virtual/udev-172 )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bluetooth )
-	test-programs? ( ${TEST_DEPS} )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
-	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
-	# https://bugs.gentoo.org/539844
-	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
-
-	# Fedora patches
-	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
-	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
-	# https://marc.info/?l=linux-bluetooth&m=161498090629584&w=2
-	"${FILESDIR}"/${PN}-5.60-glibc-2.34.patch
-)
-
-pkg_setup() {
-	# From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
-	# to prevent bugs like:
-	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER
-		~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER ~RFKILL"
-	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	# https://bugzilla.kernel.org/show_bug.cgi?id=206815
-	if use mesh || use test; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER
-		~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC"
-	fi
-	linux-info_pkg_setup
-
-	if use test || use test-programs; then
-		python-single-r1_pkg_setup
-	fi
-
-	if ! use udev; then
-		ewarn
-		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
-		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
-		ewarn "and hid2hci will not be available."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	if ! use user-session || ! use systemd; then
-		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
-	fi
-
-	eautoreconf
-
-	if use cups; then
-		# Only not .am to not need to run eautoreconf only because of this
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
-			Makefile.{in,tools} || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# readline is automagic when client is enabled
-		# --enable-client always needs readline, bug #504038
-		# --enable-mesh is handled in the same way
-		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
-		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# deps not used for the library
-			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
-		)
-	fi
-
-	econf \
-		--localstatedir=/var \
-		--disable-android \
-		--enable-datafiles \
-		--enable-optimization \
-		$(use_enable debug) \
-		--enable-pie \
-		--enable-threads \
-		--enable-library \
-		--enable-tools \
-		--enable-manpages \
-		--enable-monitor \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(multilib_native_use_enable btpclient) \
-		$(multilib_native_use_enable btpclient external-ell) \
-		$(multilib_native_use_enable cups) \
-		$(multilib_native_use_enable deprecated) \
-		$(multilib_native_use_enable experimental) \
-		$(multilib_native_use_enable mesh) \
-		$(multilib_native_use_enable mesh external-ell) \
-		$(multilib_native_use_enable midi) \
-		$(multilib_native_use_enable obex) \
-		$(multilib_native_use_enable readline client) \
-		$(multilib_native_use_enable systemd) \
-		$(multilib_native_use_enable test-programs test) \
-		$(multilib_native_use_enable udev) \
-		$(multilib_native_use_enable udev hid2hci) \
-		$(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -f Makefile -f - libs \
-			<<<'libs: $(lib_LTLIBRARIES)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-
-		# Only install extra-tools when relevant USE flag is enabled
-		if use extra-tools; then
-			ewarn "Upstream doesn't support using this tools and their bugs are"
-			ewarn "likely to be ignored forever, also they can break without"
-			ewarn "previous announcement."
-			ewarn "Upstream also states all this tools are not really needed,"
-			ewarn "then, if you still need to rely on them, you must ask them"
-			ewarn "to either install that tool by default or add the needed"
-			ewarn "functionality to the existing 'official' tools."
-			ewarn "Please report this issues to:"
-			ewarn "http://www.bluez.org/development/lists/"
-
-			# Upstream doesn't install this, bug #524640
-			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
-			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
-			dobin tools/btmgmt
-			# gatttool is only built with readline, bug #530776
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1141909
-			# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
-			# https://bugs.archlinux.org/task/37686
-			dobin attrib/gatttool
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
-			dobin tools/avinfo
-		fi
-
-		# Not installed by default after being built, bug #666756
-		use btpclient && dobin tools/btpclient
-
-		# Unittests are not that useful once installed, so make them optional
-		if use test-programs; then
-			# Drop python2 only test tools
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206819
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206821
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206823
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server	|| die
-
-			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
-
-			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
-				dosym "${i}" /usr/bin/bluez-"${i##*/}"
-			done
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-pkgincludeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	# We need to ensure obexd can be spawned automatically by systemd
-	# when user-session is enabled:
-	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
-	# https://bugs.gentoo.org/show_bug.cgi?id=577842
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
-	# https://bugs.archlinux.org/task/45816
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
-	if use user-session && use systemd; then
-		ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	keepdir /var/lib/bluetooth
-
-	# Upstream don't want people to play with them
-	# But we keep installing them due to 'historical' reasons
-	insinto /etc/bluetooth
-	local d
-	for d in input network; do
-		doins profiles/${d}/${d}.conf
-	done
-	# Setup auto enable as Fedora does for allowing to use
-	# keyboards/mouse as soon as possible
-	sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
-	doins src/main.conf
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth
-	newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth
-
-	einstalldocs
-	use doc && dodoc doc/*.txt
-	# Install .json files as examples to be used by meshctl
-	if use mesh; then
-		dodoc tools/mesh-gatt/*.json
-		local DOC_CONTENTS="Some example .json files were installed into
-		/usr/share/doc/${PF} to be used with meshctl. Feel free to
-		uncompress and copy them to ~/.config/meshctl to use them."
-		readme.gentoo_create_doc
-	fi
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	systemd_reenable bluetooth.service
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
-	use mesh && readme.gentoo_print_elog
-}
diff --git a/net-wireless/bluez/bluez-5.62.ebuild b/net-wireless/bluez/bluez-5.62.ebuild
new file mode 100644
index 000000000000..1cf0b131ea8d
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.62.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org"
+SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
+
+# Since this release all remaining extra-tools need readline support, but this could
+# change in the future, hence, this REQUIRED_USE constraint could be dropped
+# again in the future.
+REQUIRED_USE="
+	extra-tools? ( deprecated readline )
+	test? ( ${PYTHON_REQUIRED_USE} )
+	test-programs? ( ${PYTHON_REQUIRED_USE} )
+"
+
+TEST_DEPS="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	dev-python/docutils
+	virtual/pkgconfig
+	test? ( ${TEST_DEPS} )
+"
+DEPEND="
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	>=sys-apps/hwids-20121202.2
+	btpclient? ( >=dev-libs/ell-0.39 )
+	cups? ( net-print/cups:= )
+	mesh? (
+		>=dev-libs/ell-0.39
+		>=dev-libs/json-c-0.13:=
+		sys-libs/readline:0=
+	)
+	midi? ( media-libs/alsa-lib )
+	obex? ( dev-libs/libical:= )
+	readline? ( sys-libs/readline:0= )
+	systemd? (
+		>=sys-apps/dbus-1.6:=[user-session=]
+		sys-apps/systemd
+	)
+	!systemd? ( >=sys-apps/dbus-1.6:= )
+	udev? ( >=virtual/udev-172 )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bluetooth )
+	test-programs? ( ${TEST_DEPS} )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+	# https://bugs.gentoo.org/539844
+	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
+
+	# Fedora patches
+	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+)
+
+pkg_setup() {
+	# From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
+	# to prevent bugs like:
+	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
+	CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER
+		~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER ~RFKILL"
+	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
+	# https://bugzilla.kernel.org/show_bug.cgi?id=206815
+	if use mesh || use test; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER
+		~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC"
+	fi
+	linux-info_pkg_setup
+
+	if use test || use test-programs; then
+		python-single-r1_pkg_setup
+	fi
+
+	if ! use udev; then
+		ewarn
+		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
+		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
+		ewarn "and hid2hci will not be available."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	default
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+	if ! use user-session || ! use systemd; then
+		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
+	fi
+
+	eautoreconf
+
+	if use cups; then
+		# Only not .am to not need to run eautoreconf only because of this
+		sed -i \
+			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
+			Makefile.{in,tools} || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# readline is automagic when client is enabled
+		# --enable-client always needs readline, bug #504038
+		# --enable-mesh is handled in the same way
+		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
+		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# deps not used for the library
+			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	econf \
+		--localstatedir=/var \
+		--disable-android \
+		--enable-datafiles \
+		--enable-optimization \
+		$(use_enable debug) \
+		--enable-pie \
+		--enable-threads \
+		--enable-library \
+		--enable-tools \
+		--enable-manpages \
+		--enable-monitor \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		$(multilib_native_use_enable btpclient) \
+		$(multilib_native_use_enable btpclient external-ell) \
+		$(multilib_native_use_enable cups) \
+		$(multilib_native_use_enable deprecated) \
+		$(multilib_native_use_enable experimental) \
+		$(multilib_native_use_enable mesh) \
+		$(multilib_native_use_enable mesh external-ell) \
+		$(multilib_native_use_enable midi) \
+		$(multilib_native_use_enable obex) \
+		$(multilib_native_use_enable readline client) \
+		$(multilib_native_use_enable systemd) \
+		$(multilib_native_use_enable test-programs test) \
+		$(multilib_native_use_enable udev) \
+		$(multilib_native_use_enable udev hid2hci) \
+		$(multilib_native_use_enable udev sixaxis)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -f Makefile -f - libs \
+			<<<'libs: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+
+		# Only install extra-tools when relevant USE flag is enabled
+		if use extra-tools; then
+			ewarn "Upstream doesn't support using this tools and their bugs are"
+			ewarn "likely to be ignored forever, also they can break without"
+			ewarn "previous announcement."
+			ewarn "Upstream also states all this tools are not really needed,"
+			ewarn "then, if you still need to rely on them, you must ask them"
+			ewarn "to either install that tool by default or add the needed"
+			ewarn "functionality to the existing 'official' tools."
+			ewarn "Please report this issues to:"
+			ewarn "http://www.bluez.org/development/lists/"
+
+			# Upstream doesn't install this, bug #524640
+			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
+			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
+			dobin tools/btmgmt
+			# gatttool is only built with readline, bug #530776
+			# https://bugzilla.redhat.com/show_bug.cgi?id=1141909
+			# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
+			# https://bugs.archlinux.org/task/37686
+			dobin attrib/gatttool
+			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
+			dobin tools/avinfo
+		fi
+
+		# Not installed by default after being built, bug #666756
+		use btpclient && dobin tools/btpclient
+
+		# Unittests are not that useful once installed, so make them optional
+		if use test-programs; then
+			# Drop python2 only test tools
+			# https://bugzilla.kernel.org/show_bug.cgi?id=206819
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die
+			# https://bugzilla.kernel.org/show_bug.cgi?id=206821
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die
+			# https://bugzilla.kernel.org/show_bug.cgi?id=206823
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server	|| die
+
+			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
+
+			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
+				dosym "${i}" /usr/bin/bluez-"${i##*/}"
+			done
+		fi
+	else
+		emake DESTDIR="${D}" \
+			install-pkgincludeHEADERS \
+			install-libLTLIBRARIES \
+			install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	# We need to ensure obexd can be spawned automatically by systemd
+	# when user-session is enabled:
+	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
+	# https://bugs.gentoo.org/show_bug.cgi?id=577842
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
+	# https://bugs.archlinux.org/task/45816
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
+	if use user-session && use systemd; then
+		ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	keepdir /var/lib/bluetooth
+
+	# Upstream don't want people to play with them
+	# But we keep installing them due to 'historical' reasons
+	insinto /etc/bluetooth
+	local d
+	for d in input network; do
+		doins profiles/${d}/${d}.conf
+	done
+	# Setup auto enable as Fedora does for allowing to use
+	# keyboards/mouse as soon as possible
+	sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
+	doins src/main.conf
+
+	newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth
+	newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth
+
+	einstalldocs
+	use doc && dodoc doc/*.txt
+	# Install .json files as examples to be used by meshctl
+	if use mesh; then
+		dodoc tools/mesh-gatt/*.json
+		local DOC_CONTENTS="Some example .json files were installed into
+		/usr/share/doc/${PF} to be used with meshctl. Feel free to
+		uncompress and copy them to ~/.config/meshctl to use them."
+		readme.gentoo_create_doc
+	fi
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+	systemd_reenable bluetooth.service
+
+	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
+	use mesh && readme.gentoo_print_elog
+}
diff --git a/net-wireless/bluez/files/bluez-5.58-rfkill.patch b/net-wireless/bluez/files/bluez-5.58-rfkill.patch
deleted file mode 100644
index dd7f2f978e72..000000000000
--- a/net-wireless/bluez/files/bluez-5.58-rfkill.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 382646b490c1c336dd32f9186293616ceb4d808b Mon Sep 17 00:00:00 2001
-From: Benjamin Berg <bberg@redhat.com>
-Date: Mon, 3 May 2021 14:45:00 +0200
-Subject: [PATCH 1/2] rfkill: Fix reading from rfkill socket
-
-The kernel will always send exactly one event, but the size of the
-passed struct will depend on the length of the submitted read() and the
-kernel version. i.e. the interface can be extended and we need to expect
-for a read to be longer than expected if we ask for it.
-
-Fix this by only requesting the needed length and explicitly check the
-length against the V1 version of the structure to make the code a bit
-more future proof in case the internal copy of the struct is updated to
-contain new fields.
----
- src/rfkill.c | 24 +++++++++++-------------
- 1 file changed, 11 insertions(+), 13 deletions(-)
-
-diff --git a/src/rfkill.c b/src/rfkill.c
-index ec9fcdfdd..2099c5ac5 100644
---- a/src/rfkill.c
-+++ b/src/rfkill.c
-@@ -53,12 +53,12 @@ struct rfkill_event {
- 	uint8_t  soft;
- 	uint8_t  hard;
- };
-+#define RFKILL_EVENT_SIZE_V1    8
- 
- static gboolean rfkill_event(GIOChannel *chan,
- 				GIOCondition cond, gpointer data)
- {
--	unsigned char buf[32];
--	struct rfkill_event *event = (void *) buf;
-+	struct rfkill_event event = { 0 };
- 	struct btd_adapter *adapter;
- 	char sysname[PATH_MAX];
- 	ssize_t len;
-@@ -69,34 +69,32 @@ static gboolean rfkill_event(GIOChannel *chan,
- 
- 	fd = g_io_channel_unix_get_fd(chan);
- 
--	memset(buf, 0, sizeof(buf));
--
--	len = read(fd, buf, sizeof(buf));
-+	len = read(fd, &event, sizeof(event));
- 	if (len < 0) {
- 		if (errno == EAGAIN)
- 			return TRUE;
- 		return FALSE;
- 	}
- 
--	if (len != sizeof(struct rfkill_event))
-+	if (len < RFKILL_EVENT_SIZE_V1)
- 		return TRUE;
- 
- 	DBG("RFKILL event idx %u type %u op %u soft %u hard %u",
--					event->idx, event->type, event->op,
--						event->soft, event->hard);
-+					event.idx, event.type, event.op,
-+						event.soft, event.hard);
- 
--	if (event->soft || event->hard)
-+	if (event.soft || event.hard)
- 		return TRUE;
- 
--	if (event->op != RFKILL_OP_CHANGE)
-+	if (event.op != RFKILL_OP_CHANGE)
- 		return TRUE;
- 
--	if (event->type != RFKILL_TYPE_BLUETOOTH &&
--					event->type != RFKILL_TYPE_ALL)
-+	if (event.type != RFKILL_TYPE_BLUETOOTH &&
-+					event.type != RFKILL_TYPE_ALL)
- 		return TRUE;
- 
- 	snprintf(sysname, sizeof(sysname) - 1,
--			"/sys/class/rfkill/rfkill%u/name", event->idx);
-+			"/sys/class/rfkill/rfkill%u/name", event.idx);
- 
- 	fd = open(sysname, O_RDONLY);
- 	if (fd < 0)
--- 
-2.31.1
-
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 87054da8b7cd..7b8e548f3ea3 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -2,7 +2,7 @@ AUX crda-4.14-do-not-compress-doc.patch 1367 BLAKE2B 021a25a898dc225e52bee293ba9
 AUX crda-4.14-openssl-1.1.0-compatibility.patch 8616 BLAKE2B c6c34a7575e79f67e3efca21c25aad489c1adb3c612d886b68c49c06b7c516bdfcf0f94a0838ca83c4e082ee9b3a4ffc382ff5de4c724febca5b59d21268f415 SHA512 ce8430b03a7315eb339d4d7b845cb28ea970010e47eba9a6a9199c67bb370fa7811ea1dcc2431790b2954d72fafbbb31bdcc691228e6e88b9dd066c51c2f06ef
 AUX crda-4.14-python-3.patch 3022 BLAKE2B b6d78c1a09ec0f848654139e0ba778f5d65d814b9d7c84df3013aec43baf55f9c23367b15454218e39d3a0959355b4fd030dd4584b7420f6835a8ef421dd72c9 SHA512 b953be9da2ed770d89c905257c2e3f04451ce9ee2a61ee9cc18285b3d8209f8665f5f0a2a4ffb8a5211445cb45fe66dc4e3d302e90c4c0030c293c978dd443c6
 AUX crda-cflags.patch 895 BLAKE2B 0a8d8acb268ff58656a5b66a77744c14fd9f92fd6a660132f2a86a88a3cd5bde4bf39709c38f2705fe999bca312a991304b673d4d12a540cecffd1fcc4ec5cc1 SHA512 c4914cd0d4b0d3f0d16aaf4ff3cd91f961870bc0376f90998b1ec149f145dd347ff79763e8da12b5865a1c6e507a0ee8d306886ffe96fa80426c3bd914a5889d
-AUX crda-ldflags.patch 388 BLAKE2B 57d3ce3fccba1db8ad8bbfae2ba8e8dcd03bdd94c424761902bc2ea552c006c3e4ef1d8b913f095ba3601895bc29917d01c1e8f046a159b2b006b174bed7bf62 SHA512 3a53d3567fa9b3ff85d4e443124ea2637e5eb489ade4f160d8f1de92553a3a33c3eb9f9d80005ceac03b50e5c4aa7f0990bca3547c145644ab66985548c32e9f
+AUX crda-ldflags.patch 797 BLAKE2B f1a8a47ef981c59c46c5f441812d238b8e3b80f75b93726b1b507bf9e143c094fc0525abe1bbcbe719868ee67843a3b2095c8d1a25e9dcca65ec13464643972e SHA512 f882826e2d8e8ca72e66a2c240953a0a35e83c775428f928a59fe334ba35526a6a89f5eb6868db6ae633b28e169c52da24ad194af0dd6c32eb633d35b9c843d8
 AUX crda-libreg-link.patch 908 BLAKE2B 60d9307ba43235cbce089835ae7406313b9f68a90fbe503130e81fb423e04d3f257e1a1d78db9fef605e42a4d9571c54e8ac9cb8a2569d3c3cd3f5c6d542a295 SHA512 41c98f1e4ca0ae3d22b08086eb54aefd4ec95fed5a6e5fafd55fb6a9b9649ec18f5f65003a1424cf59bf99e266fddf110c92d9e46a4b40a18be5931fc7bbbbeb
 AUX crda-no-ldconfig.patch 748 BLAKE2B 1ef8aff911a5f4af14fb321782cfb40abc8a946dc80af95ec2c2d50e509f318d84be36190c5b899c882b6173617746600b04bf6d0c282a59c568c44e2f255d16 SHA512 faea7d4bfc0b1a4a674cb6c285975805985dc4211c43ca47da38102cb79a1d6d770aa6267e85d811998f9a13799335cfb6116f272ed40c4ecd6b3f813ca93a28
 AUX crda-no-werror.patch 916 BLAKE2B 2e7c79e14ae0ab05cbf032f104747eeea0df165197ba1ff8039fb14de43880894b03e59e14fe2d906b7f99c8d910cef701c1abcb68d9558cfd37d4455ce03501 SHA512 ab521bbc47826bb9356c8b96bee24f6e6d7f03a98036398627e840b89e7245329115664fc740d2b3c0d3a497ef638e3be3fa9d1e991a7e03a0753e078c8019e9
diff --git a/net-wireless/crda/files/crda-ldflags.patch b/net-wireless/crda/files/crda-ldflags.patch
index 5ba9165c7adc..13592127e928 100644
--- a/net-wireless/crda/files/crda-ldflags.patch
+++ b/net-wireless/crda/files/crda-ldflags.patch
@@ -1,11 +1,18 @@
---- /Makefile
-+++ /Makefile
-@@ -115,7 +115,7 @@
+# https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/patch/?id=9856751feaf7b102547cea678a5da6c94252d83d
+# https://bugs.gentoo.org/678450
+# https://bugs.gentoo.org/596352
+
+--- a/Makefile
++++ b/Makefile
+@@ -114,9 +114,9 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
+ 	$(NQ) '  Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem)
+ 	$(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
  
- $(LIBREG): regdb.h reglib.h reglib.c
+-$(LIBREG): regdb.h reglib.h reglib.c
++$(LIBREG): reglib.c regdb.h reglib.h
  	$(NQ) '  CC  ' $@
 -	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(filter-out -lreg,$(LDLIBS))
-+	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(filter-out -lreg,$(LDLIBS))
++	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(filter-out -lreg,$(LDLIBS))
  
  install-libreg-headers:
  	$(NQ) '  INSTALL  libreg-headers'
diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index 3c4736b8bfbe..ae220792fcfd 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -1,10 +1,13 @@
 AUX dump1090-5.0-32bit-fix.patch 610 BLAKE2B cca8cab42380856503831c59cfec13f996132869ea4263594acf6966a96a8d99f1b1c936106c6d74b1a741a83afa121abe4fbebe7129ef3c29b8278739e38717 SHA512 f6d404a0e814e8f1f1cfe8a8d17ed93cf6586d3434130b4adad8c096ad37ca2280d86df8331766f2a8bac793f13c937d0d0de6c6c43a74ce055be4be4b5e2ee7
+AUX dump1090-5.0-further-32bit-fix.patch 1742 BLAKE2B 2cc502d6a88f4dd79a70efca538a8daaf9bbfa0cb122f7ae562943112b635ce19ca01197a4dce79bf0f81bbc5339f340534cfc6e7223510b6877c38f513212b1 SHA512 b3c3d3c8f63a1c3c149f5e44164c43b00d56829fe89a51ecbffc07fe201b7e88df9a49499c0d52add2f2a5d15f3ee80e7c4d287e863ca34453966487f2f7a587
 AUX dump1090-5.0.confd 927 BLAKE2B 144a8c2f51ba714b7c41a50ae58e893c1cfa2e9494a962c9033201c09fc889411b4b868b16934521709fe7402e593767be77ad6c43c0a4b4a9fba8b231756f58 SHA512 930267650aedb8012c2a92c1555d318789cf29ab42568109a9935a7d83a13fba4482cffff91b27062f74d9fde514e95060e0a53cb9438d39ede292ea9ca15b90
 AUX dump1090-5.0.initd 372 BLAKE2B f4e1ca0db565f56c104401b221af77966f499ad00f1fba5c804ee529fbc61fd75149c3d2d503d4a5e119784fcc10998ebbbad80cb09c1a27dba804a0d8a86c24 SHA512 0f9717d3f161658aefcd29f135bd3401bb539a0e83f40fdacf7326b48a96782d211dde1fc9237a822ee3d09a8b5b17ab22da63f6e93aceb526ff22c02eaa300e
 AUX tmpfilesd-dump1090-5.0.conf 212 BLAKE2B 081b8340377a40adbb3a9dfa87ede06729979ad50a138cb3caf6b0dac55203222df6c71714103c096b6fbdcd2b115dd2c40bd767b7e5ff1dd0360addc021882a SHA512 d44170620addbc3590d524ae540c38be31115d22f69fd55a075877ab482c0bbcdfe86e2eac3c3007c5476408c18623a0e179fadd2247beab01d1df296d7467b6
 DIST dump1090-4.0.tar.gz 6663754 BLAKE2B bf0a6c8dfd8b2da5ed0e7ae5f7b862c57a54e5d48bc24b29e42ebffec4e0606604fbe4b8502e85df60a3a618568bf9e2eba88e5ad2fdec7fb93043b823435362 SHA512 97dc872e4d0ac8df2f46e17b590e970a62a78baf81e18a9beeb23d37a4401a2e52591ca96cc01e1465b22aa234cf9e88f84a7b0f27d0144b3afeac62f6252c95
 DIST dump1090-5.0.tar.gz 10124422 BLAKE2B d6b26a444f73cccd002558b6863431537078e1fe9f61e4e240d4a5f06181b9ff713387aad623c2ee8257c2568bd4dd373746606c356ac3ff0f27f411d4949997 SHA512 1104982308db788993bf5dc130a5ca369c8bfaaae56cd5a435bbd22ed99b0633594789334d7f256bad2b288c4906923baf8bc73e2f7b7f9f52f7068b9b519142
+DIST dump1090-6.1.tar.gz 9879362 BLAKE2B 716c1abe6df7958fb5ec94c35ed6af75fdb6180a56cdfba72443a7b34d1614cede6ec29aaac22a1e15f31d05bf1d1971eebccdff21cf9442ae69617e7c535ae6 SHA512 5f20d52f1fda754e33774faab852252d802ae5da8694e768cbf92df56f7693cd2da788df9e0a422f1801603e62498fb0af0143f5ea3292e9d607296cd5983dc2
 EBUILD dump1090-4.0.ebuild 1250 BLAKE2B acd1dc457eced589b99528333cdbfa5bb0c29bacac3cb0eb18c6daaa902f3c5f498c7c6a6810c83f92155b87f6e3511fd87d1dff51fb46e462b48af47fa66948 SHA512 27c238ddb2d0d2223f1cbc286c0bf6860706d6ef6c76902af25c3c542deb6382ac71c5ab2f9b8576b2d0906633bd1acb72b6ba870f8cb62b9b353d96818cc5d9
-EBUILD dump1090-5.0.ebuild 2584 BLAKE2B ee5aa34518399253f157b2cbd3c119248d1816421368e7cbd73c9d9c5872b4fb72f1fcd2ef7aa09bb51e859b72256076db0ddd67ce45ecf389f8a0f5888b6797 SHA512 4ad7981ce1f041f4b91313e3b0bef8bf2c60bc1b2e8d3cd17ee4820330eeb6fe7c4c8f24d41616a87407dd67571dc4eb780a95a56178b72a764d964a38ee8702
+EBUILD dump1090-5.0.ebuild 2626 BLAKE2B dececa48e1b48005a4855cd056977490a1e0d6bdc412463b777ad006e3c96f74648e17362801b74ee9b751e38d58ff184390bd3c1142f8699b909677fc25c73d SHA512 36765019ee228703a9fc6798323323cf685a5647c8bac66557e095203b7e3ea3042ef8e7ee62f0d8897a53d09e5f90120a4a642ed4a2c0fb1e6b434a4dd513c1
+EBUILD dump1090-6.1.ebuild 2535 BLAKE2B 5560a564b3dbf4e3d89441afa783aa9f00e463dc68e11a3f6036ee18e81844477f3aaa79330ac61da5c381f81f355bd67e90e4b70e2fa987eb52d317ce555cd4 SHA512 e4f883236856a078c28fadddab095a2da894ad165ff0a200fdefd94b33dc3b1d54c0afc8942ae36fdfb1683e48ff977cc1fc0b8dd03703be8ec6d069abc49743
 EBUILD dump1090-9999.ebuild 2535 BLAKE2B 5560a564b3dbf4e3d89441afa783aa9f00e463dc68e11a3f6036ee18e81844477f3aaa79330ac61da5c381f81f355bd67e90e4b70e2fa987eb52d317ce555cd4 SHA512 e4f883236856a078c28fadddab095a2da894ad165ff0a200fdefd94b33dc3b1d54c0afc8942ae36fdfb1683e48ff977cc1fc0b8dd03703be8ec6d069abc49743
 MISC metadata.xml 658 BLAKE2B 6dd0aec90915a420b69849188a8b29211db8cad5824442d4c1d1c07cf1bd88c4d477a3fa35481b745c2dbfd7ea1c8459751cc2c037932430d230a6f24ccfbb64 SHA512 fb0c280c0bf81c614f91ff9a4dad532ac61db9419c48e335e86ed37a592183fd8181fe0f6ade7e165a16e734b1be50b05db57efc1f1b27c01ec38be68565a61d
diff --git a/net-wireless/dump1090/dump1090-5.0.ebuild b/net-wireless/dump1090/dump1090-5.0.ebuild
index 9c76ce811944..00364313d593 100644
--- a/net-wireless/dump1090/dump1090-5.0.ebuild
+++ b/net-wireless/dump1090/dump1090-5.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
@@ -30,6 +30,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}-32bit-fix.patch"
+	"${FILESDIR}/${P}-further-32bit-fix.patch"
 )
 
 src_prepare() {
diff --git a/net-wireless/dump1090/dump1090-6.1.ebuild b/net-wireless/dump1090/dump1090-6.1.ebuild
new file mode 100644
index 000000000000..04ee546dcf91
--- /dev/null
+++ b/net-wireless/dump1090/dump1090-6.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit tmpfiles toolchain-funcs
+
+DESCRIPTION="simple Mode S decoder for RTLSDR devices"
+HOMEPAGE="https://github.com/flightaware/dump1090"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="bladerf hackrf +rtlsdr minimal"
+
+DEPEND="
+	sys-libs/ncurses:=[tinfo]
+	bladerf? ( net-wireless/bladerf:= virtual/libusb:1 )
+	hackrf? ( net-libs/libhackrf:= virtual/libusb:1 )
+	rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	sed -i -e '/CFLAGS/s# -O3 -g -Wall -Wmissing-declarations -Werror -W # #' Makefile || die
+	sed -i -e "/LIBS_CURSES/s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		BLADERF=$(usex bladerf) \
+		RTLSDR=$(usex rtlsdr) \
+		HACKRF=$(usex hackrf) \
+		CPUFEATURES=yes \
+		LIMESDR=no
+}
+
+src_install() {
+	dobin ${PN}
+	dobin view1090
+	dodoc README.md README-json.md
+	# DSP config for bladerf
+	if use bladerf; then
+		insinto usr/share/${PN}/bladerf
+		doins bladerf/*
+	fi
+
+	newtmpfiles "${FILESDIR}"/tmpfilesd-dump1090-5.0.conf ${PN}.conf
+	newconfd "${FILESDIR}"/dump1090-5.0.confd ${PN}
+	newinitd "${FILESDIR}"/dump1090-5.0.initd ${PN}
+
+	if use !minimal; then
+		insinto /usr/share/${PN}
+		doins -r tools
+
+		# Some tooling expects the -fa variant directory to contain the files
+		dosym ../../usr/share/${PN} /usr/share/dump1090-fa
+
+		# Older HTML
+		insinto /usr/share/${PN}/html
+		doins -r public_html/*
+		# Newer HTML
+		insinto /usr/share/skyaware/html
+		doins -r public_html_merged/*
+
+		# One of these this should be included into other lighttpd configs
+		insinto /usr/share/${PN}/lighttpd
+		# Old style:
+		doins debian/lighttpd/89-dump1090-fa.conf
+		doins debian/lighttpd/88-dump1090-fa-statcache.conf
+		# New style:
+		doins debian/lighttpd/89-skyaware.conf
+
+		# See README.md for how to use custom wisdom files
+		exeinto /usr/share/${PN}/wisdom
+		doexe debian/generate-wisdom
+		insinto /usr/share/${PN}/wisdom
+		doins wisdom.*
+		doins wisdom/wisdom.*
+		# For /etc/dump1090-fa/wisdom.local
+		keepdir /etc/dump1090-fa/
+
+		# Tooling to generate custom wisdom:
+		exeinto /usr/libexec/${PN}
+		doexe starch-benchmark
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch b/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch
new file mode 100644
index 000000000000..bfcea2e4f88f
--- /dev/null
+++ b/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch
@@ -0,0 +1,52 @@
+https://github.com/flightaware/dump1090/commit/462dee56f3a339bc4d83fea264fe89a1ced5bd22.patch
+https://github.com/flightaware/dump1090/commit/455896e86db84d10a197f5a3f88d13c0539ad470.patch
+https://bugs.gentoo.org/818130
+
+From 462dee56f3a339bc4d83fea264fe89a1ced5bd22 Mon Sep 17 00:00:00 2001
+From: Oliver Jowett <oliver.jowett@flightaware.com>
+Date: Sat, 13 Mar 2021 12:49:40 +0800
+Subject: [PATCH] Fix builds on 32-bit x86
+
+---
+ Makefile.cpufeatures | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures
+index 099714e08..12377ad81 100644
+--- a/Makefile.cpufeatures
++++ b/Makefile.cpufeatures
+@@ -17,7 +17,11 @@ ifeq ($(CPUFEATURES_UNAME),Darwin)
+   CPUFEATURES_CFLAGS += -DHAVE_SYSCTLBYNAME
+ endif
+ 
+-ifeq ($(CPUFEATURES_ARCH), x86_64)
++ifeq ($(CPUFEATURES_ARCH),x86_64)
++  CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o
++endif
++
++ifneq ($(filter-out $(CPUFEATURES_ARCH),i%86),)
+   CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o
+ endif
+ 
+From 455896e86db84d10a197f5a3f88d13c0539ad470 Mon Sep 17 00:00:00 2001
+From: Oliver Jowett <oliver.jowett@flightaware.com>
+Date: Wed, 17 Mar 2021 02:21:18 +0800
+Subject: [PATCH] Fix broken 32-bit x86 test that broke builds on non-x86
+
+---
+ Makefile.cpufeatures | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures
+index 12377ad81..8c3b8418d 100644
+--- a/Makefile.cpufeatures
++++ b/Makefile.cpufeatures
+@@ -21,7 +21,7 @@ ifeq ($(CPUFEATURES_ARCH),x86_64)
+   CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o
+ endif
+ 
+-ifneq ($(filter-out $(CPUFEATURES_ARCH),i%86),)
++ifneq (,$(filter i%86,$(CPUFEATURES_ARCH)))
+   CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o
+ endif
+ 
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 866e33a75ed3..0b380418488e 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,10 +1,11 @@
 AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060719bfe0038ca75d9b0e79d78a234627a15c53da16151094c6cc6d48a049ae6ac3c9b1714a2 SHA512 1b39b25736a11870f5e740b5702b6f18b1714cc06df7e3462cd74d116cfaa82175801f336141f3fdf86be33aa97fcebf32d9c080d80419bbc548ad540ab7bd7d
 AUX iwd-1.17-fix-tests.patch 1358 BLAKE2B f399c13ce1c8594bcbe5a4bb84c7cbcf51121cd431dea492ff559b2b768bec56a2e6025771449838ad2a8929fa0a2c8e52495a44d6b7adb5ccaf4b52ecfc8486 SHA512 f63886a0844619442d0c9c662629a46c8075c859fb6fc614c09900ff3ea18335ec5369b50427983f34e8fe86ec13546f5a179770b1482cda0326a041c50ad1da
+AUX iwd-1.18-musl-backport.patch 1014 BLAKE2B 47c89ce3f2d39c5c416be8b43a076cb914d5bb2431ea88e437d9966c608786ea00d71d713f143a2c6a957030b806e33c1d9a1ef739836430863f5b362c9f4e8c SHA512 7fc86e71f1c372052051c0ab73df7d301ff7498a8b70d95830bc099f0f4745a247ee54dc93de2e0173b284ac35f73fcad4cec04f1eb2dbe6ed1923d8e14e3035
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
 DIST iwd-1.15.tar.xz 940724 BLAKE2B 6dae8a71e15136bcc9d8bb44cc6b152848207d89af2f447f48e834a3feda72a0a018dd1db3cb3a0e92c834cb2a19d8f9e4a9c900d91f96df378772d220205d65 SHA512 71e1f5f1b9d4e09a158b9bf801cee8af5ed8a19a3e80ad677e28ccab29ae10a79ebb7dbeaed60dd24283b6a40dbda8c212400b6d5ac659ed6056588a8663f0d4
 DIST iwd-1.18.tar.xz 961392 BLAKE2B 3c7b0a7996590435d8f8033ab0b6283b2860409064c8617eda51ecbd73102134bbced66bb4e1323b64563e21d52beaa7f88ae5168747a5a2a38355e266f9c3a4 SHA512 85c3e16bb8eb8e564072fab66b30d1636c853706546fcb35723b4b3339bcf969f08ca07bcd458521f044f407513f5d793724b316af4b7819def8400ed88f0d3b
 EBUILD iwd-1.15.ebuild 4928 BLAKE2B bbaf00a83a66e02df79499ebefd5591750f27daadf1c7b98c34c6095ef8281d1de08066e7f92b87f798b1b777dd9d398978e6b2a390b57da748cfbfe93a4822c SHA512 99df966cf16d483672803644533d9efcbd69521f8f5eb31cc5c96698fd05f617299cf1648259dfa09b81800060d591dc108de1dd31843c48e76e00d3890716a7
-EBUILD iwd-1.18.ebuild 4993 BLAKE2B 9fe39f41fe538aa53efedfee45c59adfc786389119c3997b3e49de090e4885f065c527f20a415fafafcdf052102a5cc74e5691ddb7dd0e513b16ae95ab5db08e SHA512 fea2645b93aadd33d50fc62a6895426fa13635184d9d5bca26d8d75bbc580eabf67c19645960b5bafc2db634ef091296123a61b8ef1a97192cdc5ff6f3cb7785
+EBUILD iwd-1.18.ebuild 5067 BLAKE2B c7f171ba3bd4b71fb0904d5f81e4c51e22c91515ae2c7de67aee586335516524dc0f189c653d82f40127b4c38a0d69899f0934712b5b406d7a2f5b3750a2b39a SHA512 d7b995827494fc42f192ed74611bab0ade76a4257b221dbe1ead1fa688765b08681fbbc59eb6f01da5fddf1aeb309d663ebf0f066a87064a5bd04c969ec69f44
 EBUILD iwd-9999.ebuild 4930 BLAKE2B ef4e6abb91312e52edc376f99664863d83ff87340a7a83e617b826d48fd85c8b70c95e0929a1c3461ec03bc45724ace0f287ce5b03cb381e6221b9414f38b93e SHA512 485aaca5116e7f13b5a76816bf0b98731c95f305b69e40ae717bad2da2760b8759eb2043c8f6888fa790854ed5f8b0039d920572af5e6396fd297aa2e2d06256
 MISC metadata.xml 833 BLAKE2B ac036ef071fa52d3f5f5cb89abdc26c968de304e5398ef80361c3f48f963abb8e1200968ee6cf4741ea4977169774fc24885ca57372dff21f1a615390c9de651 SHA512 e64143df3c17e38f9ce8f154fc1ff1ee6df8596d4bc1c277e925bda9ee767d1d812b2b5e71472221f9b804d7b6501f817ad7e8693dd401bd9c257db65f14dfcf
diff --git a/net-wireless/iwd/files/iwd-1.18-musl-backport.patch b/net-wireless/iwd/files/iwd-1.18-musl-backport.patch
new file mode 100644
index 000000000000..99371ca3bb4e
--- /dev/null
+++ b/net-wireless/iwd/files/iwd-1.18-musl-backport.patch
@@ -0,0 +1,30 @@
+From 42bd5ba7c2665c5bf95ba102a8115c4cf01d31d7 Mon Sep 17 00:00:00 2001
+From: Andrew Zaborowski <andrew.zaborowski@intel.com>
+Date: Thu, 16 Sep 2021 01:58:29 +0200
+Subject: netconfig: Remove usage of in6_addr.__in6_u
+
+in6_addr.__in6_u.__u6_addr8 is glibc-specific and named differently in
+the headers shipped with musl libc for example.  The POSIX compliant and
+universal way of accessing it is in6_addr.s6_addr.
+---
+ src/netconfig.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/netconfig.c')
+
+diff --git a/src/netconfig.c b/src/netconfig.c
+index ce95db0b..421270c9 100644
+--- a/src/netconfig.c
++++ b/src/netconfig.c
+@@ -171,7 +171,7 @@ static inline char *netconfig_ipv6_to_string(const uint8_t *addr)
+ 	struct in6_addr in6_addr;
+ 	char *addr_str = l_malloc(INET6_ADDRSTRLEN);
+ 
+-	memcpy(in6_addr.__in6_u.__u6_addr8, addr, 16);
++	memcpy(in6_addr.s6_addr, addr, 16);
+ 
+ 	if (L_WARN_ON(unlikely(!inet_ntop(AF_INET6, &in6_addr, addr_str,
+ 						INET6_ADDRSTRLEN)))) {
+-- 
+cgit 1.2.3-1.el7
+
diff --git a/net-wireless/iwd/iwd-1.18.ebuild b/net-wireless/iwd/iwd-1.18.ebuild
index baedea95574d..92aca7db05e3 100644
--- a/net-wireless/iwd/iwd-1.18.ebuild
+++ b/net-wireless/iwd/iwd-1.18.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 	MYRST2MAN="RST2MAN=:"
 fi
 
@@ -22,8 +22,8 @@ HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3
-standalone systemd"
+IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +crda elibc_musl +monitor ofono
+standalone systemd wired"
 
 DEPEND="
 	sys-apps/dbus
@@ -131,6 +131,7 @@ src_unpack() {
 
 src_prepare() {
 	default
+	use elibc_musl && eapply "${FILESDIR}"/iwd-1.18-musl-backport.patch
 	if [[ ${PV} == *9999* ]] ; then
 		eautoreconf
 	fi
diff --git a/net-wireless/qdmr/Manifest b/net-wireless/qdmr/Manifest
index 1275f0e2de13..6ad980235827 100644
--- a/net-wireless/qdmr/Manifest
+++ b/net-wireless/qdmr/Manifest
@@ -1,6 +1,6 @@
 DIST qdmr-0.8.1.tar.gz 3870631 BLAKE2B 3be78a398a41cb105abac07b2a3c3ddaf0a5e51b5af855860c5ea06a407447d71ae89d4f3be5d46ba8fd50c38baec42663977373c643813f4db193ab034cfb88 SHA512 068eaad49393dca4384146b5254342d57921fd2e3f972057dd0f6abc1f8ce1412ae544ab09f50ce0ffa50f48f7fb2145fc36e82c2c8f9cf534fedb60e947130d
-DIST qdmr-0.9.0_alpha2.tar.gz 5560663 BLAKE2B dfbc09001990ed7b464ea7f58e8528d9c5c3ec890cdb8d0859a7f79f3cf2567b9c6fbaa81cf0fc7474320e200f1de98807c2f5232261261fd3f9950723ab6e70 SHA512 51c31ea3985d9e22437f5e4543633f4b0c866e0875152c65fc3dba429a650c013bd3b81425d373768a4e26783ccffd7339430087c1f0a3a756b041c0bd87ed6f
+DIST qdmr-0.9.0_alpha3.tar.gz 5630070 BLAKE2B 5ba3a0f885bce39be88528541704d4dd7644588d689d28aba033e06174d677ae930c4ed2bc16f25bb0a2355a733d41d22c82dfaee3cd420acb788597a6fef350 SHA512 fb7c0689f2a03b632a305ebbc3a5ad3e5609bd6eec6490638ffce1534032110417e834863f3dd1c99a2cae92de7c7cb1d2a408ddcb5c5887cf0d31352cbf377c
 EBUILD qdmr-0.8.1.ebuild 1258 BLAKE2B 39b8677ddda9f3917bc9cd113960dd4fa7358eecfe7196e5bb3267d32d85cba420de00dcf75d78e9cb6527d523fdd1f9a924f44159f7369ecb900c789d15d6b4 SHA512 8486f6f701abf48abfdcf1ed30d95b4bde8be46fab6f31313394ffe4a5ee99fea7da8f4d20a174954d2038fd369b0837f6677c53a8453ef3e137cd1dd415009a
-EBUILD qdmr-0.9.0_alpha2.ebuild 1333 BLAKE2B ca4c64386d6deb373b18ad7b13c73c28a34af22e0205d5a0bafca86f9e81db144d1808e2136147076cee62a34f0d04cb3b7176b3a04e8bb811d5321a00a3c04a SHA512 d75c019dcb65af2bc49ea8d380a646749e2d36e942549d5b852af2fcaff1512158efd2767f1addd351d1ebbcfb643222e26b09920ff049354ef0a7eee0ae31db
+EBUILD qdmr-0.9.0_alpha3.ebuild 1333 BLAKE2B ca4c64386d6deb373b18ad7b13c73c28a34af22e0205d5a0bafca86f9e81db144d1808e2136147076cee62a34f0d04cb3b7176b3a04e8bb811d5321a00a3c04a SHA512 d75c019dcb65af2bc49ea8d380a646749e2d36e942549d5b852af2fcaff1512158efd2767f1addd351d1ebbcfb643222e26b09920ff049354ef0a7eee0ae31db
 EBUILD qdmr-9999.ebuild 1333 BLAKE2B ca4c64386d6deb373b18ad7b13c73c28a34af22e0205d5a0bafca86f9e81db144d1808e2136147076cee62a34f0d04cb3b7176b3a04e8bb811d5321a00a3c04a SHA512 d75c019dcb65af2bc49ea8d380a646749e2d36e942549d5b852af2fcaff1512158efd2767f1addd351d1ebbcfb643222e26b09920ff049354ef0a7eee0ae31db
 MISC metadata.xml 319 BLAKE2B 1ce9d4701527c9ba9f8d990413aa07b22bea984360611162da0baa235a71fffcd16fe13cd5ce6c8f4192e9533e0886358f40890756d9220cae5a6d6af7e903fb SHA512 b59a65526d21586cc142876a59fea232d8d8e34cc9faf85a05b17b45ea3e98383e3e4be92d639e489ec5c62c74c53253a4de26adf4151b877135c754cb08de70
diff --git a/net-wireless/qdmr/qdmr-0.9.0_alpha2.ebuild b/net-wireless/qdmr/qdmr-0.9.0_alpha3.ebuild
index d80ff7599869..d80ff7599869 100644
--- a/net-wireless/qdmr/qdmr-0.9.0_alpha2.ebuild
+++ b/net-wireless/qdmr/qdmr-0.9.0_alpha3.ebuild
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index e5576088f5cc..d6493e8990af 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -2,9 +2,9 @@ AUX uhd-3.13.1.0-tinfo.patch 2099 BLAKE2B d48ed54fbff7350aaf33a2551ae891384365a6
 AUX uhd-4.0.0.0-boost-1.76.patch 2412 BLAKE2B dec44ca0a3e743627c9d68f822623b16325c0829df96e513b9096f3ff03d949fe61a6d5975c302703c178dd0e5090807f4d4c1fa299ce45f5507fa19d23fee4d SHA512 29f554ee4ad1340e0652a6e697340b27f6aa5b1a750c2d67c6068db5d995f325662f13090ec92f7c3e3120f4b4f70690e439fe1884076e083dac5f2cbb1c1681
 AUX uhd-4.0.0.0-tinfo.patch 2163 BLAKE2B b1575290096e85c107772963deaed3f85b8612ad1e1b7b8a800e01d036822e18866cb35249321ad27cfe1c90291894463f0186692f8c20ca8f6ae2242301cc0f SHA512 289c720f465a78f20626c5b17605fe06f33634f225cd3d84834a6fb46448d5e11812fe5997a07141f87f014abb26e3d08afdba0c36335f7640c5db290269439c
 DIST EttusResearch-UHD-3.15.0.0.tar.gz 12895934 BLAKE2B 75bf474120a09ffe1268684659c8bbc8e781060db96b82e42a4d3463265e2a3df5e60da77d835587e6650795ae50bcab8bdecccf0f2bdd32fe77bbd6ce1ec5c8 SHA512 ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0
-DIST EttusResearch-UHD-4.0.0.0.tar.gz 33942895 BLAKE2B 632e701420c3a1165f2e1f0e2766b457595326141cb42c5701b247857e699dbfd6f8dbbcc668184d87bf0764516213044f79a5acde5db3d3c1c387335474f5fc SHA512 1f897397467111e634428e807c2c6748e9fc33e5b09083372139cd6e4445fbd71c48f43e18d0c3faef483d448879e40bc9a5a63df4e908b1bec65454ed67a6dd
+DIST EttusResearch-UHD-4.1.0.4.tar.gz 37913211 BLAKE2B 28cd3892490aaa8ec01ca8233c4f0500fd49a3184be74f77dbb8a5fdafc08d74144eb01485e5059d8c115406606024261f851fa7c592687637a5906e12d42b2e SHA512 f3ada2f2b114b1e8d0eca71da7ed5494191364c864adb1498314255ba280c7c747f2f5d118c98ae1f7ae96f3ef0e4aafd86955fb7e6271c800b359f95703fcd6
 DIST uhd-images_3.15.0.0.tar.xz 110161052 BLAKE2B 681b5ab0d79bbd2e5661bbfe5c975fdda83e7749f1c3b8a5ac2ba4088009a69c58f9b6a4e4c697c5ac90bdb809bc859937b3b63c9daf0984636bafaeee10e977 SHA512 ec7aa9740e0eda90bbee3751f5c65d5998e67d2bf74d36aa912041be8818e3ad03e5dfbf26ad340261f72fc98048ab5a90c56f6dff8efdd38cf0501585554033
-DIST uhd-images_4.0.0.0.tar.xz 111748176 BLAKE2B 2924cf1b3f150c0afd3c31a03c44f509047fb7122e55faec07860ffa56b95e1ad84d4768a0608ee32403a8b31ae5efd16abdc3469779674faedaf13778335a4d SHA512 32bc47ad48b2c9228df452c90d9cd4625fafd0c5d202f5fdfc49d2d9b14154ef7101035f403de56c369956df4f5901f6c653a3ae92c64797dd5e005f954a2a1f
+DIST uhd-images_4.1.0.4.tar.xz 118536976 BLAKE2B 6ac9b0b4aff5cbe1336edcb07a450dba3e050bf36c87af37fdbb2e83c472d86a2a8b51720fad3046d4f58d5ad1b6a836d35d1d7c57e1a36171161c22f2c7fe30 SHA512 6dfd612d794281e01739e6d2623c89d1a516e6a770cc39ce7536d6b760a51a4e2e09453d80791c417d635d3f76326a397875e04dd08418ed724b4d0679f2961b
 EBUILD uhd-3.15.0.0-r100.ebuild 3782 BLAKE2B 8d34e440265462624ab04b6106e7bcc44e855a8da6aa278b784fb873e852a1592c37035f6f2376aff16c2fc724658278fb28aec37d0ec60960c6ef40c141853b SHA512 9d01069eee1a35e81bef70e4261f56b011ff7b10904e598f8ae85f48418a9f97d4acb0c23c3b230880299c896abb93f94e9df461d0c2f63fe515fd1be64db1ba
-EBUILD uhd-4.0.0.0.ebuild 3718 BLAKE2B a4a2c28e9c9e49ce3e50da41ae0d6390daeba6b1894f0c110ffc85c66aa7f27015e96b5db5aa21a4c38cf023a503a68e3384a8d1c52c6c02dd081503ac93b762 SHA512 648ccbadcd35c4baa0d8c3f2663e306c9b8f9ebbf46ca96c1fe35ffef9ea829e6a7a9df7b5f91e090d94f9cc26a87d7b537213cc9c61a08fca535471c50d928c
+EBUILD uhd-4.1.0.4.ebuild 3672 BLAKE2B 8c2789803925d42bcad7ff54f5daa1766ce17c828b5d3c8050c535d71d158e9ca2fab66677d450201a2dbcf3509f80a4801d42200e052d3e6940987fab3398b3 SHA512 294f1c61407bbc17a8c2dfc3f725f80a2741a0a79f528626874df759a6378e51fd116da4555a3bb30764b6794e9e029df3d9206b52a3839d691677e4e5187c76
 MISC metadata.xml 1160 BLAKE2B 0bcd5e0ea7008a4847cd0ec47e900eaad894c1b37f9917197ed408edb6525f3526fce2086fa318d66f9fe3a355a8a3d5b92dcdffd2518439fb4813f9cdec5b8a SHA512 b53864ec397c266c6c914c9d7bf44eb30187585fac7d5c871b54e91e7909186c756bcd49850343a28093e77148b506bbab5583834a0a125cefe9280c2e324c4d
diff --git a/net-wireless/uhd/uhd-4.0.0.0.ebuild b/net-wireless/uhd/uhd-4.0.0.0.ebuild
deleted file mode 100644
index c93dca6d407a..000000000000
--- a/net-wireless/uhd/uhd-4.0.0.0.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-#not sure why, but eapi 7 fails
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
-	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-			b100? ( usb )
-			b200? ( usb )
-			usrp1? ( usb )
-			usrp2? ( usb )
-			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
-	e300? ( virtual/udev )
-	usb? ( virtual/libusb:1 )
-	dev-libs/boost:=
-	sys-libs/ncurses:0[tinfo]
-	$(python_gen_cond_dep '
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	')
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	$(python_gen_cond_dep '
-	dev-python/mako[${PYTHON_USEDEP}]
-	')
-	app-arch/unzip
-	app-arch/gzip
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0.0-tinfo.patch"
-	"${FILESDIR}/${PN}-4.0.0.0-boost-1.76.patch"
-)
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
-	default
-	mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#rpath is set for apple and no one else, just remove the conditional
-	sed -i -e '/if(APPLE)/d' -e '/endif(APPLE)/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_LIBUHD=ON
-		-DENABLE_C_API=ON
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MAN_PAGE_COMPRESSION=OFF
-		-DENABLE_EXAMPLES="$(usex examples)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_USB="$(usex usb)"
-		-DENABLE_UTILS="$(usex utils)"
-		-DENABLE_MANUAL="$(usex doc)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_B100="$(usex b100)"
-		-DENABLE_B200="$(usex b200)"
-		-DENABLE_E300="$(usex e300)"
-		-DENABLE_USRP1="$(usex usrp1)"
-		-DENABLE_USRP2="$(usex usrp2)"
-		-DENABLE_X300="$(usex x300)"
-		-DENABLE_MPMD="$(usex mpmd)"
-		-DENABLE_OCTOCLOCK="$(usex octoclock)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	python_optimize
-	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	if [ "${PV}" != "9999" ]; then
-		rm -rf "${ED}/usr/bin/uhd_images_downloader"
-		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1"
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${S}/utils/uhd-usrp.rules"
-
-	rm -rf "${WORKDIR}/images/winusb_driver"
-	if ! use b100; then
-		rm "${WORKDIR}"/images/usrp_b100* || die
-	fi
-	if ! use b200; then
-		rm "${WORKDIR}"/images/usrp_b2[01]* || die
-	fi
-	if ! use e300; then
-		rm "${WORKDIR}"/images/usrp_e3* || die
-	fi
-	if ! use mpmd; then
-		rm "${WORKDIR}"/images/usrp_n310* || die
-	fi
-	if ! use n230; then
-		rm "${WORKDIR}"/images/usrp_n230* || die
-	fi
-	if ! use octoclock; then
-		rm "${WORKDIR}"/images/octoclock* || die
-	fi
-	if ! use usrp1; then
-		rm "${WORKDIR}"/images/usrp1* || die
-	fi
-	if ! use usrp2; then
-		rm "${WORKDIR}"/images/usrp2* || die
-		rm "${WORKDIR}"/images/usrp_n2[01]* || die
-		rm -r "${WORKDIR}"/images/bit || die
-	fi
-	if ! use x300; then
-		rm "${WORKDIR}/"images/usrp_x3* || die
-	fi
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/images"
-}
-
-src_test() {
-	#we can disable the python tests
-	#ctest -E 'py*'
-	PYTHON_PATH=python/ cmake-utils_src_test
-}
diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild
new file mode 100644
index 000000000000..e74d51a15c92
--- /dev/null
+++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+#not sure why, but eapi 7 fails
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="https://kb.ettus.com"
+
+SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
+	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+			b100? ( usb )
+			b200? ( usb )
+			usrp1? ( usb )
+			usrp2? ( usb )
+			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
+
+RDEPEND="${PYTHON_DEPS}
+	e300? ( virtual/udev )
+	usb? ( virtual/libusb:1 )
+	dev-libs/boost:=
+	sys-libs/ncurses:0[tinfo]
+	$(python_gen_cond_dep '
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	')
+"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	$(python_gen_cond_dep '
+	dev-python/mako[${PYTHON_USEDEP}]
+	')
+	app-arch/unzip
+	app-arch/gzip
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.0.0-tinfo.patch"
+)
+
+S="${WORKDIR}/${P}/host"
+
+src_unpack() {
+	default
+	mv "uhd-images_${PV}" images || die
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	gnome2_environment_reset #534582
+
+	#rpath is set for apple and no one else, just remove the conditional
+	sed -i -e '/if(APPLE)/d' -e '/endif(APPLE)/d' CMakeLists.txt || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_LIBUHD=ON
+		-DENABLE_C_API=ON
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MAN_PAGE_COMPRESSION=OFF
+		-DENABLE_EXAMPLES="$(usex examples)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_USB="$(usex usb)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DENABLE_MANUAL="$(usex doc)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_B100="$(usex b100)"
+		-DENABLE_B200="$(usex b200)"
+		-DENABLE_E300="$(usex e300)"
+		-DENABLE_USRP1="$(usex usrp1)"
+		-DENABLE_USRP2="$(usex usrp2)"
+		-DENABLE_X300="$(usex x300)"
+		-DENABLE_MPMD="$(usex mpmd)"
+		-DENABLE_OCTOCLOCK="$(usex octoclock)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake-utils_src_configure
+}
+src_install() {
+	cmake-utils_src_install
+	python_optimize
+	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+	if [ "${PV}" != "9999" ]; then
+		rm -rf "${ED}/usr/bin/uhd_images_downloader"
+		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1"
+	fi
+
+	insinto /lib/udev/rules.d/
+	doins "${S}/utils/uhd-usrp.rules"
+
+	rm -rf "${WORKDIR}/images/winusb_driver"
+	if ! use b100; then
+		rm "${WORKDIR}"/images/usrp_b100* || die
+	fi
+	if ! use b200; then
+		rm "${WORKDIR}"/images/usrp_b2[01]* || die
+	fi
+	if ! use e300; then
+		rm "${WORKDIR}"/images/usrp_e3* || die
+	fi
+	if ! use mpmd; then
+		rm "${WORKDIR}"/images/usrp_n310* || die
+	fi
+	if ! use n230; then
+		rm "${WORKDIR}"/images/usrp_n230* || die
+	fi
+	if ! use octoclock; then
+		rm "${WORKDIR}"/images/octoclock* || die
+	fi
+	if ! use usrp1; then
+		rm "${WORKDIR}"/images/usrp1* || die
+	fi
+	if ! use usrp2; then
+		rm "${WORKDIR}"/images/usrp2* || die
+		rm "${WORKDIR}"/images/usrp_n2[01]* || die
+		rm -r "${WORKDIR}"/images/bit || die
+	fi
+	if ! use x300; then
+		rm "${WORKDIR}/"images/usrp_x3* || die
+	fi
+	insinto /usr/share/${PN}
+	doins -r "${WORKDIR}/images"
+}
+
+src_test() {
+	#we can disable the python tests
+	#ctest -E 'py*'
+	PYTHON_PATH=python/ cmake-utils_src_test
+}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 858b04dc6b24..e570e99cb82f 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -4,7 +4,10 @@ AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9
 DIST unifi-6.4.54.zip 158992649 BLAKE2B 90f98b1349a5fca3e6d85ef42823c5beaff0a3ac4697622a0387259421fdcfa891b094acb66f798a97b4397a27d477d6fe10d53bed03e15081f4d63abafb9d8e SHA512 d0502f87fe6827cdfabbffce7c7b0159aaad2ac032b59d04d5f233ada279fb90d5e21e043de518260c3380c7e23ff561f04040433a441866421dbe9b2db540c0
 DIST unifi-6.5.42.zip 161190627 BLAKE2B 9eca9169167ce09b27925e02d0ae9a7e96748be7821a920ca438c1ae76ddb7d45547c97b0066a22e66accbfd59a2a40e981ef772a4266c53c4630d1e36ca50dd SHA512 bbbdc046eb1a1e59c0d030c048fba268e1673053de9d8efed1c085a71b376ec2fc0840d08e6f226648629b1370fe9ea7bab147a7584e3fb32fc44d10bf791b86
 DIST unifi-6.5.45.zip 158061910 BLAKE2B 16b24ae67c9c649c5b7b008afa3b503dd5492e6da45107ac1be81707940623e20d111a350c32dae45a11a5a53de041b8e6b60f246af509b00bf933e36a1e9002 SHA512 ab408506055cbdca5e3f2bb7ca8bfbd4106e57621f8d741b789dba983dcd65f126435d40a5995e453ebfabaa32c3d493940bc5115c344d9f29c8ae10f265b850
+EBUILD unifi-6.4.54-r1.ebuild 2226 BLAKE2B c856925f1e2c086190612c425255a5a276413c1c377d2f6593f5195cf34503ca43c5dc65faf71acd86aae63f05e6925a93cc775d4505cec5aaa2d0e5aaae303b SHA512 879ba8af6b1fa0cf9f264cdbdc297261371e99c9aa95271542a923a3effbd4aa3d65b761dbbed3adcc66112539ee8df89508abda753e74a518e1f203d933e0ba
 EBUILD unifi-6.4.54.ebuild 1576 BLAKE2B 0bec65374520f4f332ba0235559346e7c5cc5c6f010ce7a3d633f47ebc3416f8427cdf0ed864f2e313cf4cdc2cbc01d944adb2ecec2762c90929e57292929609 SHA512 f4d31f319708b44357e0b105aa9dcf1c4ae73885f37ea985d2dd2c2ad87df2ea7b07e4ab6a536aa742ba1c39cf841a2c04368b36c03ad08c1e67af4b96f70dbd
+EBUILD unifi-6.5.42-r1.ebuild 2226 BLAKE2B 9f729d765309b749032f1472259da77ee3e2484d5118521643dd8503a1a7af68a7046c27600bd28f5f31f3dcf2453531c38cef7f7d79e240745899e76329404d SHA512 d12064dc68ace830329eec8c1bc8da74853f0ece11a5d1c651f41b65121529cce0937d0cf52b116060844aceada60d76c8ad230ca1f9c8894e16f5b452e18938
 EBUILD unifi-6.5.42.ebuild 1577 BLAKE2B 94b07baf3cb368d0a66766f6c8d7acc2f103480f908819c5530c127d32e60183999107f05a34cfb25a499089a5a021499426c2ec9929966d6b3c5cf0913ed78a SHA512 85a0fd9cb3274dda3597c6b36844ce0c44fad7f3d838fdeec283a84444b574e8e005ebeb6ddab6e725bfe16e8865f9a17443e7e5154162cc98552eef6b31d90e
+EBUILD unifi-6.5.45-r1.ebuild 2226 BLAKE2B 7e5ecdeb913606a5df706bff8edacedb0048d43bb48f5163aa29d915b40be54d8ec49895d4f091055e13eedb8c3e7376151c811e57d25db6119576cbba49f9fd SHA512 905e24eebcd72bf5d639a45cc446e9a5adcb646dda482a33f85c2f19985fd2bfe30f032c4fa6ceeb1f2b239be074dd4df1a44398483236450a5a4a5e75944a2c
 EBUILD unifi-6.5.45.ebuild 1577 BLAKE2B d3d42fc99457eae53e204ca93502921bc3e59f42923c763c780fdf406e57a1c427284759894616f01ef38cc5f0ebe6781461a10cd07726372b6a745d0c4019e2 SHA512 12a10d63186ed48b127bfaea531b7cb1fd083aac18aa51e6133f00fe6cb114aa59b823cdf0235ebf0cec543c02988fbedc34e30af354275c837b606b19b08fdd
 MISC metadata.xml 684 BLAKE2B 3c8638e2b38691bc33fd9c9cb8a79bb9b7421ec5f6d01cb6411f8cfdf8451b37855662c6e9e0dd519eda4a08b0c8e7543c2f358bf78a9dc41d52ba0cf7664600 SHA512 2f5bc4a8d9ecc37c85c6685aa1f201678a0f1236d65d8f1c72137a4ffb03ed82ed0d44c6c7231405467f77b5dbcfb375477c8cb0c0a6d8924bac822391fc2f3c
diff --git a/net-wireless/unifi/unifi-6.4.54-r1.ebuild b/net-wireless/unifi/unifi-6.4.54-r1.ebuild
new file mode 100644
index 000000000000..091b58c0e924
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.4.54-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Set this var for any releases except stable
+RC_SUFFIX="-bdf9275f33"
+
+inherit systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="-* ~amd64 ~arm64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="systemd"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Mac and Windows
+	rm -r lib/native/{Mac,Windows} || die
+
+	if [[ ${CHOST} != aarch64* ]]; then
+		rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries"
+	fi
+	if [[ ${CHOST} != armv7* ]]; then
+		rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries"
+	fi
+	if [[ ${CHOST} != x86_64* ]]; then
+		rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries"
+	fi
+
+	if [[ ${CHOST} == aarch64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == armv7* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/armv7/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == x86_64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+
+	default
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r bin dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/unifi/unifi-6.5.42-r1.ebuild b/net-wireless/unifi/unifi-6.5.42-r1.ebuild
new file mode 100644
index 000000000000..dda4cf11fedd
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.5.42-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Set this var for any releases except stable
+RC_SUFFIX="-7bfe5b2ead"
+
+inherit systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="-* ~amd64 ~arm64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="systemd"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Mac and Windows
+	rm -r lib/native/{Mac,Windows} || die
+
+	if [[ ${CHOST} != aarch64* ]]; then
+		rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries"
+	fi
+	if [[ ${CHOST} != armv7* ]]; then
+		rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries"
+	fi
+	if [[ ${CHOST} != x86_64* ]]; then
+		rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries"
+	fi
+
+	if [[ ${CHOST} == aarch64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == armv7* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/armv7/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == x86_64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+
+	default
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r bin dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/unifi/unifi-6.5.45-r1.ebuild b/net-wireless/unifi/unifi-6.5.45-r1.ebuild
new file mode 100644
index 000000000000..737b3c88d17b
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.5.45-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Set this var for any releases except stable
+RC_SUFFIX="-c8122c1151"
+
+inherit systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="-* ~amd64 ~arm64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="systemd"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Mac and Windows
+	rm -r lib/native/{Mac,Windows} || die
+
+	if [[ ${CHOST} != aarch64* ]]; then
+		rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries"
+	fi
+	if [[ ${CHOST} != armv7* ]]; then
+		rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries"
+	fi
+	if [[ ${CHOST} != x86_64* ]]; then
+		rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries"
+	fi
+
+	if [[ ${CHOST} == aarch64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == armv7* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/armv7/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == x86_64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+
+	default
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r bin dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/perl-core/File-Temp/File-Temp-0.230.900.ebuild b/perl-core/File-Temp/File-Temp-0.230.900.ebuild
deleted file mode 100644
index 1b90ecfc7978..000000000000
--- a/perl-core/File-Temp/File-Temp-0.230.900.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ETHER
-DIST_VERSION=0.2309
-inherit perl-module
-
-DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way"
-
-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=""
-
-# bug 390719
-PATCHES=( "${FILESDIR}/${PN}-0.230.0-symlink-safety.patch" )
diff --git a/perl-core/File-Temp/Manifest b/perl-core/File-Temp/Manifest
index 8cbfc53e801f..f2850e3b580d 100644
--- a/perl-core/File-Temp/Manifest
+++ b/perl-core/File-Temp/Manifest
@@ -1,6 +1,4 @@
 AUX File-Temp-0.230.0-symlink-safety.patch 1120 BLAKE2B f12300564dc761ae438ebef6260858219bbd2de3400cdaae3933826c62bedac9593cb602f923e8bfbd7d6cd0926eabd90a7d09a699792aee5cd5c8e9d5bce710 SHA512 273fe8f86b8ddc91224c84091f6c37396d1c116dc0c6d97162945955ecdd605c884971c24cd260be18ea7a412c8b9c2b2737026182cd7bf97040e648480d0e48
-DIST File-Temp-0.2309.tar.gz 74840 BLAKE2B ae197c11648c20715880f23eb2e8af3ab43ae28e4cc8e3a6f8528c6be5793dc39cdc409740537c56e495e26de97d90fe17c35297e6725a56aeed2356fe108c54 SHA512 9812e35d561ccff310262dc5bc50a9612fb3bbf7765a715c8fcad7653de977d08382733e38978586d47f943152b4a9619b76357c2f823c13f78dbf9b4eb4cd65
 DIST File-Temp-0.2311.tar.gz 76988 BLAKE2B d867a5c391fb8bdf1534469ad67f3e122666fd857c3cabda67fcc216896159cb95b31a4885ee47c803e147fa246defc12608780e7814ede8e5662c8f8ffd3d0e SHA512 2db3f03f4d25013c60585cd3e6aa7e68fe9bb26f1957adf6674e9cae9e963a41c559d36862943703f567d116c82747b4fae0612253a784addeb53d7867a232d1
-EBUILD File-Temp-0.230.900.ebuild 557 BLAKE2B d7adf9e7111598442eba167920ec729bf86965266fa6938beafc5fcefcccc346ca5518611025834b4b2039073c36fc66860a109428c2a869f39a35563632c158 SHA512 8a78e943d188bb9d6e2b0c2016323b80a01c106f6a43c4ffd6d6ec55d128b9ac4c20f652c32e723a1e1dd985441688cdfc9c5a7cff386ce1cbeda020da47f9e4
 EBUILD File-Temp-0.231.100.ebuild 557 BLAKE2B bfc6205c00ba443f56df47cecb20abd9185176347d3175d2de9a8ee7357b475a6e160b8f223210bc47f93a568ca1dadc177d52dbe06610334c7874938e2296a5 SHA512 a06ddf08e1ae6f8eb2adfc2b4e46b8d770803096a9bd351e727329f365b906e8e41b47c5b5c94a18fb0cc39e03b5634f5213fc5c81eba5da917a99d43e2be835
 MISC metadata.xml 453 BLAKE2B f3ed0e78c9a72ae5f2eaf7e4ae7fd7052a2d087e11d84e4bc84154ffef98d7dd92953bb9655567c91e203598901e577fc0be096ec13b6b4adf0d0966dd0e8f2f SHA512 1e1e9195ed6c48b279a0d56d2ebc78c3e9345f2463fca28e784513d799f87c33720e78885b2a3cc24d094a757824ba7300d354e4e54e8abad399c80dede19c95
diff --git a/perl-core/Manifest.gz b/perl-core/Manifest.gz
index 32304f549f6b..b23d9b38d15e 100644
--- a/perl-core/Manifest.gz
+++ b/perl-core/Manifest.gz
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 69e8a285fdde..49be2484053d 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index afe2ba0ad010..775103c63ac8 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="amd64"
@@ -38,7 +38,7 @@ LDFLAGS_x32="-m elf32_x86_64"
 CHOST_x32="x86_64-pc-linux-gnux32"
 
 # Simon Stelling <blubb@gentoo.org> (2006-10-24)
-# They are masked, but we can enable them anyway for those who have 
+# They are masked, but we can enable them anyway for those who have
 # >=portage-2.1.2_pre3-r4
 CPU_FLAGS_X86="mmx mmxext sse sse2"
 
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index d753dcd3504a..e4411cb89cb1 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -59,9 +59,7 @@ games-arcade/dynamitejack
 games-arcade/gish-demo
 games-arcade/jardinains
 games-arcade/thinktanks-demo
-games-emulation/caps
 games-emulation/gens
-games-emulation/nestra
 <games-emulation/pcsx2-9999
 games-emulation/vgba
 games-emulation/zinc
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 16eb9ca985ee..7498557f1796 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Marek Szuba <marecki@gentoo.org> (2021-10-10)
+# Does work on amd64 and x86
+x11-misc/read-edid -vbe-mode
+
 # Lars Wendler <polynomial-c@gentoo.org> (2021-08-27)
 # media-libs/webrtc-audio-processing only has amd64 and x86 keywords
 media-video/pipewire -echo-cancel
diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index 70dc565bdd34..8c15da959c05 100644
--- a/profiles/arch/arm/make.defaults
+++ b/profiles/arch/arm/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Main ARM profile
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index ddc7dccfcf54..de20b104f51b 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ben Kohler <bkohler@gentoo.org> (2021-10-18)
+# missing keywords on net-misc/pyhoca-cli and its deps
+net-misc/remmina x2go
+
 # Jakov Smolić <jsmolic@gentoo.org> (2021-10-07)
 # dev-libs/mongo-c-driver is not keyworded here
 net-analyzer/zmap mongo
@@ -31,10 +35,6 @@ dev-util/diffoscope pascal
 # and media-plugins/zam-plugins not keyworded here
 media-sound/easyeffects rnnoise webrtc zamaudio
 
-# Stefan Strogin <steils@gentoo.org> (2021-06-27)
-# Requires dev-python/adblock which is not keyworded on arm64 yet
-www-client/qutebrowser adblock
-
 # Sam James <sam@gentoo.org> (2021-04-14)
 # Supports 64-bit NEON
 # Note: libpng-compat 1.5.30 does NOT seem to.
@@ -299,6 +299,7 @@ net-fs/samba dmapi
 sci-libs/gdal armadillo netcdf
 sys-fs/btrfs-progs reiserfs
 www-client/chromium widevine
+www-client/qutebrowser widevine
 www-client/vivaldi widevine
 www-client/vivaldi-snapshot widevine
 
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index 4da39eeda983..5ae3874285d7 100644
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -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
 
 ARCH="hppa"
@@ -24,3 +24,7 @@ CHOST_hppa="${CHOST}"
 # Donnie Berkholz <dberkholz@gentoo.org> (2006-08-18)
 # Defaults for video drivers
 VIDEO_CARDS="fbdev"
+
+# Hans de Graaff <graaff@gentoo.org> (2021-10-10)
+# Temporary override base default to support the ruby27 stable bug 801289
+RUBY_TARGETS="ruby26"
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 691bef98f0ce..8157e119deba 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Sam James <sam@gentoo.org> (2021-10-16)
+# Avoid unkeyworded dependencies
+x11-libs/gtk+ cloudprint
+
 # Sam James <sam@gentoo.org> (2021-09-14)
 # fdk-aac, libfreeaptx not keyworded here
 # nor is jack2
@@ -295,7 +299,7 @@ sci-mathematics/octave hdf5 qhull
 
 # Jeroen Roovers <jer@gentoo.org> (2012-07-08)
 # media-libs/devil has not been fully tested on HPPA
-media-gfx/graphviz devil
+media-gfx/graphviz devil lefty
 
 # Jeroen Roovers <jer@gentoo.org> (2012-07-03)
 # Mask USE=connman for net-libs/gupnp (bug #424225)
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 9d8cdc717833..eec8e480fd60 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -7,6 +7,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Sam James <sam@gentoo.org> (2021-10-16)
+# media-libs/openexr is not keyworded.
+openexr
+
 # James Le Cuirot <chewi@gentoo.org> (2021-08-10)
 # media-video/pipewire is not keyworded. Bug #807616.
 bluetooth
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 25572505eec8..dac2cc77e55d 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -4,6 +4,21 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Sam James <sam@gentoo.org> (2021-10-16)
+# Avoid large number of dependencies which often
+# have to be stabilised.
+doc
+
+# Sam James <sam@gentoo.org> (2021-10-16)
+# Avoid stabling chunks of GNOME and such as much as possible.
+# bug #807637
+colord
+introspection
+
+# Hans de Graaff <graaff@gentoo.org> (2021-10-10)
+# Temporary entry to support the ruby27 stable bug 801289
+ruby_targets_ruby27
+
 # Matt Turner <mattst88@gentoo.org> (2021-09-22)
 # media-libs/libsamplerate is not stable on hppa
 libsamplerate
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 1905e7a6b62a..639176a9f265 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-10-17)
+# media-libs/libheif not keyworded here
+sci-libs/gdal heif
+
 # Sam James <sam@gentoo.org> (2021-09-14)
 # JACK2 isn't keyworded here
 # bug #807616
diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index 46b593ce2868..0332427d751e 100644
--- a/profiles/arch/powerpc/ppc32/make.defaults
+++ b/profiles/arch/powerpc/ppc32/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # All extra USE/etc should be specified in sub-profiles.
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 7aca7703286c..637b5a7129af 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-10-17)
+# media-libs/libheif not keyworded here
+sci-libs/gdal heif
+
 # Marek Szuba <marecki@gentoo.org> (2021-08-11)
 # dev-ruby/tty-editor not keyworded here yet (Bug #807685)
 app-text/htmltidy test
@@ -27,11 +31,6 @@ dev-python/diskcache test
 # bug #708344
 sys-devel/llvm gold
 
-# Marek Szuba <marecki@gentoo.org> (2021-05-07)
-# Legacy interface that depends on kernel headers not available on this arch
-# as well as currently-unkeyworded dev-libs/libx86
-x11-misc/read-edid vbe-mode
-
 # Sam James <sam@gentoo.org> (2021-03-11)
 # media-libs/libheif isn't keyworded here
 # media-libs/libavif isn't keyworded here
diff --git a/profiles/arch/powerpc/ppc32/use.mask b/profiles/arch/powerpc/ppc32/use.mask
index 61833043490e..760fc9331531 100644
--- a/profiles/arch/powerpc/ppc32/use.mask
+++ b/profiles/arch/powerpc/ppc32/use.mask
@@ -1,9 +1,19 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -ppc
 
+# Sam James <sam@gentoo.org> (2021-10-16)
+# media-libs/openexr doesn't work on BE (bug #818424)
+# ...and openscenegraph needs openexr.
+openexr
+osg
+
+# Sam James <sam@gentoo.org> (2021-10-11)
+# sys-libs/llvm-libunwind isn't keyworded here
+llvm-libunwind
+
 # Matt Turner <mattst88@gentoo.org> (07-25-2021)
 # gnome-shell requires rustified librsvg.
 gnome-shell
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask
index caf4ed631a0a..29cc18c63a1b 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -1,6 +1,26 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-10-16)
+# (un)mask for media-libs/openexr and its reverse dependencies.
+# Broken on big endian, but should be fine on le.
+# bug #818424
+-dev-games/openscenegraph
+-dev-games/openscenegraph-qt
+-media-libs/openexr
+-media-libs/ctl
+-media-gfx/openvdb
+-media-libs/embree
+-media-libs/opencolorio
+-media-libs/openimageio
+-media-libs/osl
+
+# Sam James <sam@gentoo.org> (2021-10-16)
+# Fails with "No byte-swap function available on big-endian platform." on be
+# but fine on le.
+# bug #711940
+-dev-db/mysql-connector-c++
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-17)↲
 # chromium works on ppc64le
 -www-client/chromium
diff --git a/profiles/arch/powerpc/ppc64/64le/use.mask b/profiles/arch/powerpc/ppc64/64le/use.mask
index 208423630f7b..1e05b89c6963 100644
--- a/profiles/arch/powerpc/ppc64/64le/use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-10-16)
+# media-libs/openexr doesn't work on BE, but should on LE.
+# ...and openscenegraph needs openexr.
+-openexr
+-osg
+
 # Michał Górny <mgorny@gentoo.org> (2021-01-07)
 # Prebuilt kernels are supported here.
 -dist-kernel
diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults
index b4dbccd021c3..ff2526a25304 100644
--- a/profiles/arch/powerpc/ppc64/make.defaults
+++ b/profiles/arch/powerpc/ppc64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # All extra USE/etc should be specified in sub-profiles.
diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask
index 8ba483baa4cb..36a972da57c5 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -1,6 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-10-16)
+# Mask for media-libs/openexr and its reverse dependencies.
+# Broken on big endian.
+# bug #818424
+dev-games/openscenegraph
+dev-games/openscenegraph-qt
+media-libs/openexr
+media-libs/ctl
+media-gfx/openvdb
+media-libs/embree
+media-libs/opencolorio
+media-libs/openimageio
+media-libs/osl
+
+# Sam James <sam@gentoo.org> (2021-10-16)
+# Fails with "No byte-swap function available on big-endian platform."
+# bug #711940
+dev-db/mysql-connector-c++
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-17)
 # chromium does not work on ppc64be
 www-client/chromium
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 8e183aa4544c..2d390aafe9c0 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-10-17)
+# Go doesn't support pie on ppc64, bug #818529
+net-dns/dnscrypt-proxy pie
+
 # Sam James <sam@gentoo.org> (2021-09-23)
 # Needs media-libs/libldac which builds on ppc64le, but not be
 media-video/pipewire -bluetooth
diff --git a/profiles/arch/powerpc/ppc64/use.mask b/profiles/arch/powerpc/ppc64/use.mask
index 4c7c76de9252..63cd97f2d51e 100644
--- a/profiles/arch/powerpc/ppc64/use.mask
+++ b/profiles/arch/powerpc/ppc64/use.mask
@@ -1,8 +1,14 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ### THIS FILE IS ONLY FOR PACKAGES MASKED ON BOTH 64-BIT AND 32-BIT USERLAND!!!
 
+# Sam James <sam@gentoo.org> (2021-10-16)
+# media-libs/openexr doesn't work on BE (bug #818424)
+# ...and openscenegraph needs openexr.
+openexr
+osg
+
 # Michał Górny <mgorny@gentoo.org> (2014-06-27)
 # Unmask multilib flag for the ABI.
 -abi_ppc_64
diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask
index 40076c2d9879..270d61458e3c 100644
--- a/profiles/arch/powerpc/ppc64/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 3db64c002a9d..2800f41f088f 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Alex Fan <alexfanqi@yahoo.com> (2021-10-11)
+# sci-libs/sundials fails several tests #817680
+sci-mathematics/octave sundials
+
 # Alex Fan <alexfanqi@yahoo.com> (2021-09-27)
 # depends on mysql
 kde-apps/akonadi mysql
@@ -26,6 +30,7 @@ sys-cluster/ceph pmdk
 # Sam James <sam@gentoo.org> (2021-09-12)
 # Marek Szuba <marecki@gentoo.org> (2021-07-05)
 # dev-ruby/asciidoctor isn't keyworded here
+app-admin/keepassxc doc
 dev-libs/nanomsg doc
 dev-util/ccache doc
 net-misc/chrony html
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 41d01f6982b6..584be81c8c45 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="sparc"
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 86f94003e25a..aa196241bf1a 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-10-16)
+# Requires dev-db/mariadb which, at last check, was broken on sparc.
+# bug #814719
+dev-python/mysqlclient test
+
 # Sam James <sam@gentoo.org> (2021-09-14)
 # jack2 not keyworded here
 # bug #807616
@@ -28,11 +33,6 @@ dev-python/diskcache test
 # bug #760803
 dev-cpp/eigen test
 
-# Marek Szuba <marecki@gentoo.org> (2021-05-07)
-# Legacy interface that depends on kernel headers not available on this arch
-# as well as currently-unkeyworded dev-libs/libx86
-x11-misc/read-edid vbe-mode
-
 # Sam James <sam@gentoo.org> (2021-04-27)
 # Deps not yet tested/keyworded.
 sys-devel/clang default-compiler-rt default-libcxx default-lld
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index 0d34b5fdc638..78b3f2e1e15a 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -sparc
 
+# Sam James <sam@gentoo.org> (2021-10-16)
+# media-libs/openexr doesn't work on BE.
+openexr
+
 # James Le Cuirot <chewi@gentoo.org> (2021-08-10)
 # media-video/pipewire is not keyworded. Bug #807616.
 pipewire
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index 651f15426c69..fec578b5e9ab 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -40,7 +40,7 @@ sbcl
 
 # Pacho Ramos <pacho@gentoo.org> (2014-04-17)
 # Dropped stable keywords after the discussion caused by
-# Gnome 3.8/3.10 stabilization on this arch   
+# Gnome 3.8/3.10 stabilization on this arch
 devhelp
 dia
 eds
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index 2c3d14cf5e75..4a9685fa276e 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # All extra USE/etc should be specified in sub-profiles.
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index f8dbe499da81..f6a56f5514de 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-10-10)
+# Does work on amd64 and x86
+x11-misc/read-edid -vbe-mode
+
 # Lars Wendler <polynomial-c@gentoo.org> (2021-08-27)
 # media-libs/webrtc-audio-processing only has amd64 and x86 keywords
 media-video/pipewire -echo-cancel
@@ -39,10 +43,6 @@ media-video/obs-studio browser
 x11-base/xwayland video_cards_nvidia
 x11-wm/mutter video_cards_nvidia
 
-# Stefan Strogin <steils@gentoo.org> (2021-06-27)
-# Requires dev-python/adblock which is not keyworded on x86 yet
-www-client/qutebrowser adblock
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-04-25)
 # Depends on either unkeyworded dev-java/openjdk:11
 # or unavailable >=dev-java/icedtea-4, bug #785640
@@ -303,6 +303,7 @@ dev-db/mariadb -jdbc
 # Mike Gilbert <floppym@gentoo.org> (2016-03-03)
 # chrome-binary-plugins dropped x86 support
 www-client/chromium widevine
+www-client/qutebrowser widevine
 www-client/vivaldi widevine
 www-client/vivaldi-snapshot widevine
 
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index db1bba9bb64d..4aa838bae261 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -101,8 +101,8 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 
 # Manuel Rüger <mrueg@gentoo.org> (2015-09-09)
 # Default Ruby build target(s)
-# Updated to include ruby26 on 2020-09-14
-RUBY_TARGETS="ruby26"
+# Updated to include ruby27 on 2021-10-10
+RUBY_TARGETS="ruby26 ruby27"
 
 # Enable extended filesystem attribute support by default.
 # https://archives.gentoo.org/gentoo-dev/message/ba0e3457e4b807e79816f0df03566af0
diff --git a/profiles/base/package.use b/profiles/base/package.use
index 2eb93144eb97..578d19fbb242 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-10-14)
+# Unconditional dependency on >= Lua 5.3, so let's just pick 5.4
+>=app-arch/rpm-4.17.0 lua_single_target_lua5-4
+
 # Niklāvs Koļesņikovs <89q1r14hd@relay.firefox.com> (2021-09-13)
 # WirePlumber obligatory links and embeds either Lua 5.3 or 5.4
 # interpreter with the later being the upstream default.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 646cbed4a0ae..7aef25d015e5 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,25 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-10-16)
+# openjfx for openjdk17 is not yet available
+dev-java/openjdk:17 javafx
+
+# Sam James <sam@gentoo.org> (2021-10-16)
+# Fails to compile, bug #787134
+=sys-fs/dd-rescue-1.99.11 cpu_flags_x86_avx2
+
+# Marek Szuba <marecki@gentoo.org> (2021-10-10)
+# Legacy interface that depends on dev-libs/libx86 and specific kernel
+# headers, both of which are only available on certain arches.
+x11-misc/read-edid vbe-mode
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-10-09)
+# ld.gold is essentially abandoned; using it as default may have
+# unintended consequences. Disabling this feature in future ebuilds.
+>sys-devel/binutils-2.37_p1 default-gold
+>sys-devel/binutils-hppa64-2.37_p1 default-gold
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-10-07)
 # parallel-compiler feature is not tested by upstream
 # and is not recommended for general usage and may silently
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 80c9e923ffde..525f6417906f 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Sergey Popov <pinkbyte@gentoo.org> (2021-10-14)
+# net-libs/grpc is not yet stabilized,
+# so mask optional use flag on net-misc/frr
+net-misc/frr grpc
+
 # Joonas Niilola <juippis@gentoo.org> (2021-08-13)
 # dev-libs/efl is only stabilized on two arches.
 app-crypt/pinentry efl
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 218e736762fc..07b55fe4e694 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -13,7 +13,6 @@ darcs
 python_targets_pypy3
 python_single_target_pypy3
 
-# Hans de Graaff <graaff@gentoo.org> (2020-12-26)
+# Hans de Graaff <graaff@gentoo.org> (2021-10-10)
 # Currently in testing and not ready to go stable yet.
-ruby_targets_ruby27
 ruby_targets_ruby30
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index b3990d527505..c0b4d10a84cc 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -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
 
 sys-libs/uclibc-ng
@@ -35,7 +35,6 @@ games-arcade/barbarian-bin
 games-arcade/dynamitejack
 games-arcade/jardinains
 games-arcade/thinktanks-demo
-games-emulation/nestra
 games-emulation/zinc
 games-emulation/zsnes
 games-fps/etqw-demo
diff --git a/profiles/features/musl/make.defaults b/profiles/features/musl/make.defaults
index a55eb81dd102..80a8fdf9240f 100644
--- a/profiles/features/musl/make.defaults
+++ b/profiles/features/musl/make.defaults
@@ -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
 
 PORTAGE_LIBC="musl"
@@ -15,4 +15,5 @@ FEATURES="-multilib-strict"
 
 # TODO: fix so musl doesn't generate this for all packages
 # that use a charset, it causes package collisons.
-INSTALL_MASK="charset.alias locale.alias"
+# Note: we use a full path for locale.alias for bug #799437
+INSTALL_MASK="charset.alias /usr/share/locale/locale.alias"
diff --git a/profiles/package.mask b/profiles/package.mask
index c73ae18e286f..00b1dfb635e6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,155 @@
 
 #--- END OF EXAMPLES ---
 
+# David Seifert <soap@gentoo.org> (2021-10-17)
+# Broken since pretty much forever, last release 17 years ago, already
+# removed by Fedora. Bug #386275, #731042, #762346, removal in 30 days.
+media-sound/cdcd
+
+# Hans de Graaff <graaff@gentoo.org> (2021-10-17)
+# Obsolete package, replaced by dev-ruby/minitar.
+# No reverse dependencies left. Masked for removal in 30 days.
+dev-ruby/archive-tar-minitar
+
+# Sam James <sam@gentoo.org> (2021-10-17)
+# Fails to build with glibc 2.34 and no reverse dependencies.
+# bug #806508
+# Removal on 2021-11-17.
+dev-cpp/rttr
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-10-16)
+# Binary-only package, cannot be distributed, download
+# is an unversioned URL which changes content. In brief,
+# a pain. Unmaintained from now on. If you pick it up,
+# you'll have to watch it closely. Removal in 30 days
+# otherwise. Bug 794700.
+net-im/webex
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-10-16)
+# Outdated virtual; the respective module was removed
+# from core Perl with Perl 5.32. Use dev-perl/Pod-Parser
+# instead. Removal in 30days.
+virtual/perl-Pod-Parser
+
+# David Seifert <soap@gentoo.org> (2021-10-16)
+# EAPI 5, open bugs, practically maintainer-needed,
+# abandoned upstream, no other distro carries this.
+# Bug #632237, bug #656818, removal in 30 days.
+x11-themes/gtk-engines-flat
+
+# David Seifert <soap@gentoo.org> (2021-10-16)
+# EAPI 5, fails to compile with OpenSSL 1.1, bug #719974.
+# Removal in 30 days.
+mail-filter/spamdyke
+
+# David Seifert <soap@gentoo.org> (2021-10-16)
+# EAPI 5, fails to compile with OpenSSL 1.1, bug #674242.
+# Removal in 30 days.
+dev-java/netty-tcnative
+
+# David Seifert <soap@gentoo.org> (2021-10-16)
+# EAPI 5, fails to compile, QA issues, .NET team is
+# abandoned, bug #643452, bug #688404.
+# Removal in 30 days.
+dev-dotnet/dbus-sharp
+dev-dotnet/dbus-sharp-glib
+
+# Sam James <sam@gentoo.org> (2021-10-16)
+# Fails to compile with modern OCaml
+# bug #704464, bug #780090
+# Removal on 2021-11-16.
+app-text/htmlc
+
+# Sam James <sam@gentoo.org> (2021-10-15)
+# Drop broken packages with no reverse dependencies
+# Removal on 2021-11-15. bug #817965, bug #771756, bug #767196
+dev-ml/async_ssl
+dev-ml/ppx_tools_versioned
+
+# Andreas K. Huettel <dilfridge@gentoo.org> (2021-10-14)
+# Unused and outdated packages; the version in core Perl is
+# newer. Removal in 30 days.
+perl-core/Locale-Maketext-Simple
+perl-core/Math-BigInt
+perl-core/Math-Complex
+perl-core/Memoize
+perl-core/MIME-Base64
+
+# Jaco Kroon <jaco@uls.co.za> (2021-10-05)
+# Masked for removal in 30 days.
+# Last upstream release in 2012.
+# Looks to be broken (iax-config --libs references not installed libiax.so).
+# No consumers in ::gentoo. Bug #817989
+net-libs/iax
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2021-10-10)
+# Archived upstream, and no longer maintained. Has issues with
+# python 3.9 and python 3.10.
+# Extra bugs: #798348 #798351 #812908
+# Removal on 2021-11-09.  Bug #817401.
+dev-python/python-ceilometerclient
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2021-10-10)
+# Inactive upstream with reported bugs. Has issues with python 3.9
+# and python 3.10.
+# Extra bugs: #798252 #812734
+# Removal on 2021-11-09.  Bug #817392.
+dev-python/onkyo-eiscp
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2021-10-10)
+# Archived upstream repo, and deprecated by Microsoft. Doesn't work
+# with the latest Visual Studio. Has issues with python 3.9 and
+# python 3.10.
+# Extra bugs: #798192 #723741 #727212 #730330
+# Removal on 2021-11-09.  Bug #817389.
+dev-python/ptvsd
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2021-10-10)
+# Inactive upstream with reported bugs. Has issues with python 3.9
+# and python 3.10.
+# Removal on 2021-11-09.  Bug #817386.
+dev-python/pipfile
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2021-10-10)
+# Upstream lost to history. Web archive finds a very broken repo.
+# Has issues with python 3.9 and python 3.10.
+# Extra Bugs: Bug #696674, Bug #814572
+# Removal on 2021-11-09.  Bug #817383.
+dev-db/sadisplay
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2021-10-10)
+# Old project, has problems with symlinks in repo. Fails for new
+# GitHub projects.
+# Removal on 2021-11-09.  Bug #817380.
+dev-vcs/github-pages-publish
+
+# Joonas Niilola <juippis@gentoo.org> (2021-10-10)
+# Development stopped by upstream. Switch to its actively developed
+# fork, x11-misc/picom. Bug #817338. Removal in ~30 days.
+x11-misc/compton
+
+# Joonas Niilola <juippis@gentoo.org> (2021-10-10)
+# LiveOnlyPackage with no maintainer. Upstream has multiple releases.
+# Bug #817320. Removal in ~30 days.
+dev-vcs/gti
+
+# Sam James <sam@gentoo.org> (2021-10-10)
+# Needs upstream build system fixes (currently in progress).
+# Python toggles don't work correctly right now.
+# Masking this development release for now.
+=media-libs/gexiv2-0.13.0
+
+# Patrice Clement <monsieurp@gentoo.org> (2021-10-09)
+# Obsolete and unmaintained. Please switch to app-text/htmltidy.
+# Bug #564884. Masked for removal in 30 days.
+app-text/tidy-html5
+
+# Ionen Wolkens <ionen@gentoo.org> (2021-10-09)
+# Vulkan beta driver branch aimed at Vulkan developers for testing
+# new features. Beside vulkan, it is typically behind the main branch
+# and may be buggier or less secure. Only unmask if really wanted.
+x11-drivers/nvidia-drivers:0/vulkan
+
 # Fabian Groffen <grobian@gentoo.org> (2021-10-03)
 # Masked for erratic behaviour
 # https://bugs.exim.org/show_bug.cgi?id=2813
@@ -50,63 +199,6 @@ dev-ruby/thor:0
 # Bug #776895. Removal in ~30 days.
 dev-libs/rapidxml
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-10-01)
-# KDE Plasma 5.22.90 (5.23 Beta) mask - Pre-release version
-# See also: https://kde.org/announcements/plasma/5/5.22.90/
-# KDE Plasma Beta Review Day on 2021-10-01: https://tinyurl.com/kdereview
-~kde-plasma/bluedevil-5.22.90
-~kde-plasma/breeze-5.22.90
-~kde-plasma/breeze-grub-5.22.90
-~kde-plasma/breeze-gtk-5.22.90
-~kde-plasma/breeze-plymouth-5.22.90
-~kde-plasma/discover-5.22.90
-~kde-plasma/drkonqi-5.22.90
-~kde-plasma/kactivitymanagerd-5.22.90
-~kde-plasma/kde-cli-tools-5.22.90
-~kde-plasma/kde-gtk-config-5.22.90
-~kde-plasma/kdecoration-5.22.90
-~kde-plasma/kdeplasma-addons-5.22.90
-~kde-plasma/kgamma-5.22.90
-~kde-plasma/khotkeys-5.22.90
-~kde-plasma/kinfocenter-5.22.90
-~kde-plasma/kmenuedit-5.22.90
-~kde-plasma/kscreen-5.22.90
-~kde-plasma/kscreenlocker-5.22.90
-~kde-plasma/ksshaskpass-5.22.90
-~kde-plasma/ksystemstats-5.22.90
-~kde-plasma/kwallet-pam-5.22.90
-~kde-plasma/kwayland-integration-5.22.90
-~kde-plasma/kwayland-server-5.22.90
-~kde-plasma/kwin-5.22.90
-~kde-plasma/kwrited-5.22.90
-~kde-plasma/layer-shell-qt-5.22.90
-~kde-plasma/libkscreen-5.22.90
-~kde-plasma/libksysguard-5.22.90
-~kde-plasma/libkworkspace-5.22.90
-~kde-plasma/milou-5.22.90
-~kde-plasma/oxygen-5.22.90
-~kde-plasma/plasma-browser-integration-5.22.90
-~kde-plasma/plasma-desktop-5.22.90
-~kde-plasma/plasma-disks-5.22.90
-~kde-plasma/plasma-firewall-5.22.90
-~kde-plasma/plasma-integration-5.22.90
-~kde-plasma/plasma-meta-5.22.90
-~kde-plasma/plasma-nm-5.22.90
-~kde-plasma/plasma-pa-5.22.90
-~kde-plasma/plasma-sdk-5.22.90
-~kde-plasma/plasma-systemmonitor-5.22.90
-~kde-plasma/plasma-thunderbolt-5.22.90
-~kde-plasma/plasma-workspace-5.22.90
-~kde-plasma/plasma-workspace-wallpapers-5.22.90
-~kde-plasma/plasma-vault-5.22.90
-~kde-plasma/plymouth-kcm-5.22.90
-~kde-plasma/polkit-kde-agent-5.22.90
-~kde-plasma/powerdevil-5.22.90
-~kde-plasma/sddm-kcm-5.22.90
-~kde-plasma/systemsettings-5.22.90
-~kde-plasma/xdg-desktop-portal-kde-5.22.90
-~kde-plasma/xembed-sni-proxy-5.22.90
-
 # Alfredo Tupone <tupone@gentoo.org> (2021-09-30)
 # Deprecated upstream
 # bug #815466.
@@ -162,23 +254,11 @@ media-libs/webrtc-audio-processing:1
 # Removal on 2021-10-23.  Bug #814449.
 dev-python/python-jwt
 
-# Louis Sautier <sbraz@gentoo.org> (2021-09-19)
-# Last release in 2019, no reverse dependencies.
-# dev-python/isort provides similar functionality.
-# Removal on 2021-10-19, bug #813918.
-dev-python/flake8-import-order
-
 # Alfredo Tupone <tupone@gentoo.org> (2021-09-19)
 # Mask gnat-gpl-2018 and gnat-gpl-2019. Please switch
 # to a fresher gnat-gpl branch.
 <dev-lang/gnat-gpl-2019
 
-# Sam James <sam@gentoo.org> (2021-09-18)
-# Drops an unstable API which some projects were using
-# including Chromium. Masked to avoid runtime breakage.
-# bug #813705, bug #813711.
-=media-libs/harfbuzz-3.0.0
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2021-09-18)
 # sys-devel/automake version 1.11 is EOL and is only useful for testing
 # old de-ANSI-fication/ansi2knr/AM_C_PROTOTYPES code. Please uninstall.
@@ -204,75 +284,6 @@ sys-devel/automake:1.11
 # Migration to it is expected for GNOME 42, NOT to be unmasked with GNOME 41.
 net-libs/libsoup:3.0
 
-# Ionen Wolkens <ionen@gentoo.org> (2021-09-12)
-# No reverse dependencies, stuck on EAPI-5.
-# Replaced by dev-libs/spsdeclib.
-# Removal on 2021-10-12. bug #812806
-games-emulation/caps
-
-# Ionen Wolkens <ionen@gentoo.org> (2021-09-12)
-# No reverse dependencies, stuck on EAPI-5, last release in 2006.
-# Please report if anyone still need this.
-# Removal on 2021-10-12. bug #776904
-media-libs/sdl-terminal
-
-# Ionen Wolkens <ionen@gentoo.org> (2021-09-12)
-# Stuck on x86 / amd64-multilib, no upstream, code relies on
-# several implicit constructs and undefined behavior, ebuild
-# semi-broken and runtime seems broken even if built.
-# Removal on 2021-10-12. bug #701414, bug #739188.
-games-emulation/nestra
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2021-09-11)
-# No reverse dependencies. Implements ordered set, which was needed
-# for the python 2.6 era, and since python 2.7 isn't needed and is
-# builtin in the language. Upstream isn't active at all.
-# No other distros package it anymore.
-# Removal on 2021-10-11.  Bug #812554
-dev-python/oset
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2021-09-11)
-# No reverse dependencies. Has issues with porting to python 3.10.
-# Has known upstream issues with latest GitHub's markdown parsing.
-# Last year upstream planned to archive the repository, no activity
-# since. No other distros package it anymore.
-# Extra bug: #798195
-# Removal on 2021-10-11.  Bug #812530.
-dev-python/py-gfm
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2021-09-11)
-# Upstream repository was archived. No reverse dependencies (only blocked
-# by one other package). Implements GitHub API in python, while better and
-# maintained packages are in tree. Has non trivial issues with bump to
-# python 3.10. No other distros package it anymore.
-# Extra bugs: #791673, #723542, #802999
-# Removal on 2021-10-11.  Bug #812521.
-dev-python/txgithub
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-09-09)
-# Relies on setuptools' deprecated use_2to3 option.
-# Last release in 2019, no revdeps.
-# Removal on 2021-10-09. Bug #812236
-dev-python/sparql-wrapper
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-09-09)
-# Relies on setuptools' deprecated use_2to3 option.
-# Last release in 2019, no revdeps.
-# Removal on 2021-10-09. Bug #812233
-dev-python/pybluez
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-09-09)
-# Relies on setuptools' deprecated use_2to3 option.
-# Last release in 2015, no revdeps.
-# Removal on 2021-10-09. Bug #812224
-dev-python/lcdproc
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-09-09)
-# Relies on setuptools' use_2to3 option.
-# Last release in 2017, no revdeps.
-# Removal on 2021-10-09. Bug #812221
-dev-python/fudge
-
 # Anna Vyalkova <cyber+gentoo@sysrq.in> (2021-09-07)
 # Mask backwards-incompatible version to avoid autodeletion of previous one.
 # Data migration is not supported upstream and can't be done automatically.
@@ -280,12 +291,6 @@ dev-python/fudge
 # https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md#migratt
 >=net-news/rssguard-4.0.0
 
-# Louis Sautier <sbraz@gentoo.org> (2021-09-09)
-# No reverse dependencies, no upstream activity for more than 3 years.
-# dev-python/oauthlib is maintained and provides the same functionality.
-# Removal on 2021-10-09.
-dev-python/oauth2
-
 # Thomas Deutschmann <whissi@gentoo.org> (2021-09-07)
 # Masked while being tested and reverse deps aren't fully compatible
 # bug #797325.
@@ -297,9 +302,12 @@ dev-python/oauth2
 =dev-libs/gost-engine-3.0*
 
 # Ionen Wolkens <ionen@gentoo.org> (2021-09-03)
-# Currently may not function with kde-plasma/kwin (black screen),
-# so keeping masked for testing due to being a primary consumer.
-# Should be safe to unmask if you are using x11-wm/mutter instead.
+# Known to break plasma, and several other applications on EGLStream
+# wayland, and egl-wayland-1.1.7-r1 is still usable with newer drivers.
+# While it does not prevent using wlroots-based compositors with GBM,
+# it's needed to use some features with it (unmask if wanted).
+# https://github.com/NVIDIA/egl-wayland/issues/40
+# https://github.com/NVIDIA/egl-wayland/issues/41
 >=gui-libs/egl-wayland-1.1.8
 
 # Alexey Sokolov <alexey+gentoo@asokolov.org> (2021-08-30)
@@ -321,19 +329,6 @@ games-puzzle/gnudoku
 # breaks if not all at least many revdeps. #805011 for tracker bug.
 >=net-libs/mbedtls-3.0.0
 
-# Craig Andrews <candrews@gentoo.org> (2021-07-10)
-# Masked until November, 2021
-# This release adds enforcement of the Taproot protocol change to the Bitcoin
-# rules, beginning in November. Protocol changes require user consent to be
-# effective, and if enforced inconsistently within the community may compromise
-# your security or others! If you do not know what you are doing, learn more
-# before November. (You must make a decision either way - simply not upgrading
-# is insecure in all scenarios.)
-# To learn more, see https://bitcointaproot.cc
->=net-p2p/bitcoind-0.21.1
->=net-p2p/bitcoin-qt-0.21.1
->=net-libs/libbitcoinconsensus-0.21.1
-
 # Lars Wendler <polynomial-c@gentoo.org> (2021-07-10)
 # Masked for testing
 # bug #802186
@@ -498,12 +493,15 @@ app-office/texmacs
 ~net-libs/rpcsvc-proto-0
 
 # James Le Cuirot <chewi@gentoo.org> (2017-12-17)
-# Java 11 is not yet fully supported on Gentoo. Packages cannot depend
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-10-16)
+# Java 11+ is not yet fully supported on Gentoo. Packages cannot depend
 # on it so these virtuals are not yet required. If you wish to use
-# Java 11 then install openjdk-(jdk|jre)-bin directly.
+# Java 11+ then install openjdk-(jdk|jre)-bin directly.
 # bug #697014
 virtual/jdk:11
 virtual/jre:11
+virtual/jdk:17
+virtual/jre:17
 
 # Nicolas Bock <nicolasbock@gentoo.org> (2017-10-31)
 # There are multiple unresolved upstream issues with >=jabref-bin-4.0 (#636036).
@@ -528,7 +526,7 @@ virtual/jre:11
 # switch the compiler / the binutils) ASAP. If you need them for a specific
 # (isolated) use case, feel free to unmask them on your system.
 <sys-libs/glibc-2.33
-<sys-devel/binutils-2.36.1-r2
+<sys-devel/binutils-2.37_p1
 
 # Michael Orlitzky <mjo@gentoo.org> (2017-01-07)
 # This package has some dangerous quality and security issues, but
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 22253bcb816e..12a4a5d4824c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -184,11 +184,13 @@ app-admin/ulogd:ulog - Build ULOG input plugin to support deprecated packet-base
 app-admin/vault:webui - Enable the Web UI
 app-admin/webalizer:xtended - Include the 404 extension
 app-admin/webapp-config:portage - Propagate python_targets dependencies to sys-apps/portage
+app-antivirus/clamav:clamapp - Build applications (clamscan, clamd, clamdscan, clamonacc (also has its own USE flag), sigtool, clambc, clamav-milter (also requires milter USE flag), clamdtop, clamsubmit, clamconf).
 app-antivirus/clamav:clamdtop - A Top like tool which shows what clamd is currently scanning amongst other things
 app-antivirus/clamav:clamonacc - Build the clamonacc on-access scanner
 app-antivirus/clamav:clamsubmit - A tool to submit false positives / negatives
 app-antivirus/clamav:libclamav-only - Bypass building of libfreshclam and the ClamAV CLI applications.
 app-antivirus/clamav:metadata-analysis-api - Enables collection of file property metadata using ClamAV API for analysis by ClamAV bytecode programs.
+app-antivirus/clamav:rar - RAR support
 app-antivirus/clamav:xml - DMG and XAR support
 app-antivirus/clamtk:kde - Install the Dolphin plugin.
 app-antivirus/clamtk:nautilus - Install the Nautilus plugin.
@@ -394,6 +396,7 @@ app-editors/gedit-plugins:git - Shows document changes related to git's HEAD
 app-editors/gedit-plugins:terminal - Embed a terminal in the bottom pane
 app-editors/gnome-latex:latexmk - Install dev-tex/latexmk (used by default for the build tools)
 app-editors/gnome-latex:rubber - Install dev-tex/rubber (can be used for the build tools)
+app-editors/gvim:crypt - Use dev-libs/libsodium for crypto support
 app-editors/gvim:cscope - Enable cscope interface
 app-editors/gvim:gtk2 - Enable GTK+2 interface
 app-editors/gvim:netbeans - Include netbeans external editor integration support
@@ -415,6 +418,7 @@ app-editors/tea:aspell - Enable spellchecking using app-text/aspell
 app-editors/tea:hunspell - Enable spellchecking using app-text/hunspell
 app-editors/tea:qml - Enable support for plugins using QML
 app-editors/vim:X - Link console vim against X11 libraries to enable title and clipboard features in xterm
+app-editors/vim:crypt - Use dev-libs/libsodium for crypto support
 app-editors/vim:cscope - Enable cscope interface
 app-editors/vim:ipv6 - Enable IPv6 support in channel
 app-editors/vim:racket - Enable support for Scheme using dev-scheme/racket
@@ -494,6 +498,7 @@ app-emulation/fuse:backend-sdl - Use SDL rendering backend
 app-emulation/fuse:backend-svga - Use svgalib rendering backend
 app-emulation/fuse:memlimit - Add compile-time memory usage limiting
 app-emulation/fuse-utils:gcrypt - Use dev-libs/libgcrypt for low-level crypto of some features, including logfiles.
+app-emulation/grub-xen-host:pvh - Build an additional grub bin for pvh.
 app-emulation/hyperd:libvirt - Enable support for KVM via libvirt
 app-emulation/hyperd:xen - Enable support for the Xen Hypervisor
 app-emulation/libcacard:passthrough - Enable smartcard passthrough support via sys-apps/pcsc-lite
@@ -554,6 +559,7 @@ app-emulation/q4wine:wineappdb - Enable Wine AppDB browser support
 app-emulation/qemu:accessibility - Adds support for braille displays using brltty
 app-emulation/qemu:aio - Enables support for Linux's Async IO
 app-emulation/qemu:alsa - Enable alsa output for sound emulation
+app-emulation/qemu:bpf - Enable eBPF support for RSS implementation.
 app-emulation/qemu:capstone - Enable disassembly support with dev-libs/capstone
 app-emulation/qemu:curl - Support ISOs / -cdrom directives via HTTP or HTTPS.
 app-emulation/qemu:fdt - Enables firmware device tree support
@@ -734,7 +740,6 @@ app-i18n/ibus-libpinyin:boost - Compile against dev-libs/boost libraries
 app-i18n/ibus-libpinyin:opencc - Enable support for app-i18n/opencc
 app-i18n/ibus-pinyin:boost - Enable support for dev-libs/boost
 app-i18n/ibus-sunpinyin:gui - Install graphical user interface tool (ibus-setup-sunpinyin)
-app-i18n/ibus-unikey:gtk2 - Enable support for x11-libs/gtk+:2
 app-i18n/im-chooser:gtk2 - Build with x11-libs/gtk+:2 instead of x11-libs/gtk+:3
 app-i18n/im-chooser:xfce - Enable support for XFCE panel
 app-i18n/imsettings:gconf - Enable support for gnome-base/gconf
@@ -777,6 +782,7 @@ app-metrics/collectd:xfs - Enable optional capability to filter on XFS file syst
 app-misc/blink1:mini-tool - Build and install command-line mini-tool blink1-mini-tool (normally used for embedded devices)
 app-misc/blink1:server - Build and install REST API server (currently hard-coded to TCP port 8080)
 app-misc/blink1:tool - Build and install command-line tool blink1-tool
+app-misc/broot:X - X11 clipboard interaction
 app-misc/byobu:screen - Use app-misc/screen as the default backend
 app-misc/ca-certificates:cacert - Include root/class3 certs from CAcert (https://www.cacert.org/)
 app-misc/carbon-c-relay:lz4 - add support for LZ4 compressed transport
@@ -851,12 +857,12 @@ app-misc/lcd4linux:w1retap - Enable the w1retap plugin.
 app-misc/lcd4linux:wireless - Enable the wireless plugin, to get wireless statistics.
 app-misc/lcdproc:ethlcd - Enable support for ethlcd in the hd44780 driver.
 app-misc/lcdproc:extra-charmaps - Enable extra language specific charmaps.
-app-misc/lcdproc:freetype - Enable support for media-libs/freetype in the glcd driver.
 app-misc/lcdproc:menu - Enable menu support in the lcdproc client.
 app-misc/lcdproc:nfs - Display NFS filesystem stats in the lcdproc client.
 app-misc/lcdproc:png - Enable support for media-libs/libpng in the glcd driver.
 app-misc/lcdproc:samba - Display SMBFS filesystem stats in the lcdproc client.
 app-misc/lcdproc:test-menu - Enable test menu support for the lcdproc server.
+app-misc/lcdproc:truetype - Enable support for media-libs/freetype in the glcd driver.
 app-misc/libdatovka:openssl - Use openssl backend
 app-misc/lirc:audio - Support using an audio device connected to an IR receiver
 app-misc/lirc:devinput - Support the devinput input device
@@ -2409,7 +2415,6 @@ dev-python/cvxopt:glpk - Use GNU Linear Programming Kit sci-mathematics/glpk
 dev-python/drf-yasg:validation - Enable swagger spec validation using swagger-spec-validator
 dev-python/editorconfig-core-py:cli - Install command line interface as well as python library
 dev-python/elasticsearch-py:async - Add async support
-dev-python/falcon:cython - Build cython-based python modules
 dev-python/gevent:events - Enables the gevent events system which is required by libraries that use gevent monkey patching. This adds dev-python/zope-event and dev-python/zope-interface as runtime dependencies.
 dev-python/hiredis:system-libs - Use dev-libs/hiredis from system
 dev-python/hypothesis:cli - Install a CLI tool used to write tests.
@@ -2424,8 +2429,6 @@ dev-python/mpmath:matplotlib - Add support for dev-python/matplotlib
 dev-python/msgpack:native-extensions - Compiles native "C" extensions (speedups, instead of using python fallback code).
 dev-python/nbdime:webtools - Install web-based diff and merge tools.
 dev-python/netaddr:cli - Enable netaddr shell with dev-python/ipython
-dev-python/networkx:extras - Provide graph drawing and graph layout algorithms along with shapefile format reading and writing
-dev-python/networkx:yaml - Provides YAML format reading and writing
 dev-python/nltk-data:extra - Install the complete set of data files. Otherwise, only files required by tests are installed.
 dev-python/numexpr:mkl - Enable support for Intel Vector Math Library, part of sci-libs/mkl.
 dev-python/pandas:full-support - Pull all packages to give pandas full support
@@ -2440,7 +2443,6 @@ dev-python/py-amqp:extras - Install extra tools to generate initial Python mod f
 dev-python/pygame:midi - Enable midi support using media-libs/portmidi
 dev-python/pyglet:image - Enable support for image formats other than PNG and BMP
 dev-python/pyilmbase:exceptions - Enable runtime floating point exceptions in PyIMath.
-dev-python/pyilmbase:numpy - Add bindings for dev-python/numpy use.
 dev-python/pyocr:cuneiform - Enable support for the app-text/cuneiform OCR engine
 dev-python/pyocr:tesseract - Enable support for the app-text/tesseract OCR engine
 dev-python/pypax:ptpax - Enable PT_PAX_FLAGS support.
@@ -3097,7 +3099,9 @@ games-fps/eduke32:voidsw - Enable support for Shadow Warrior (Classic) through V
 games-fps/eduke32:voxels - Install the Duke Nukem 3D Voxels Pack.
 games-fps/eduke32:vpx - Enable support for media-libs/libvpx.
 games-fps/eduke32:xmp - Enable support for media-libs/exempi.
+games-fps/gzdoom:gles2 - Enable GLES2 backend
 games-fps/gzdoom:non-free - Enable non-free components
+games-fps/gzdoom:vulkan - Enable Vulkan support
 games-fps/nexuiz:maps - Install the community map pack
 games-fps/prboom-plus:dumb - Enable support for various tracker-style music formats via media-libs/dumb
 games-fps/prboom-plus:fluidsynth - Enable support for MIDI via media-sound/fluidsynth
@@ -4868,31 +4872,23 @@ media-tv/tvheadend:xmltv - Use media-tv/xmltv
 media-tv/v4l-utils:bpf - Enables support for IR BPF decoders.
 media-tv/xmltv:ar - Argentina tv listing grabber
 media-tv/xmltv:ch-search - Grabber for Switzerland
-media-tv/xmltv:dk - Denmark tv listing grabber
-media-tv/xmltv:dtvla - Latin America digital tv listing grabber
-media-tv/xmltv:eu-dotmedia - Grabber for Europe (xmltv.se / dotmedia)
 media-tv/xmltv:eu-epgdata - include fanart URLs for some European countries.
 media-tv/xmltv:eu-xmltvse - Grabbber for Europe [replaces eu-dotmedia and se-tvzon]
 media-tv/xmltv:fi - Finland tv listing grabber (0.6.1 add ampparit telsu)
 media-tv/xmltv:fi-sv - Grabber for Finland (Swedish)
 media-tv/xmltv:fr - France tv listing grabber
 media-tv/xmltv:huro - Hungarian tv listing grabber
-media-tv/xmltv:il - Israel tv listing grabber
 media-tv/xmltv:is - Iceland tv listing grabber
 media-tv/xmltv:it - Italy tv listing grabber (RUV)
 media-tv/xmltv:it-dvb - Italy tv listing grabber
 media-tv/xmltv:na-dd - North America tv listing grabber
 media-tv/xmltv:na-dtv - North America Direct TV grabber
 media-tv/xmltv:na-tvmedia - Grabber for North America (TVMedia)
-media-tv/xmltv:pt-meo - Grabber for Portugal (MEO)
 media-tv/xmltv:pt-vodafone - Grabber for Portugal (Vodafone)
-media-tv/xmltv:se-swedb - Sweden tv listing grabber
-media-tv/xmltv:se-tvzon - Sweden (tvzon.se) tv listing grabber
 media-tv/xmltv:tr - Turkey (Digiturk) tv listing grabber
 media-tv/xmltv:tv-check - enable GUI checking
 media-tv/xmltv:tv-combiner - enable grabbers combiner
 media-tv/xmltv:tv-pick-cgi - enable CGI support
-media-tv/xmltv:uk-bleb - Britain tv listing grabber
 media-tv/xmltv:uk-tvguide - UK and Ireland tv listing grabber using TV Guide website
 media-tv/xmltv:zz-sdjson - Grabber for schedulesDirect.org SD-JSON service (many countries)
 media-tv/xmltv:zz-sdjson-sqlite - Grabber for schedulesDirect.org SD-JSON service (sqlite DB)
@@ -5973,6 +5969,7 @@ net-libs/cvm:vpopmail - Enable vpopmail support
 net-libs/czmq:drafts - Build draft API, which may change at any time without any notice, and is therefore not recommended for normal use. (requires draft support in net-libs/zeromq as well)
 net-libs/czmq:http-client - Build support for HTTP client using net-misc/curl
 net-libs/czmq:http-server - Build support for HTTP server using net-libs/libmicrohttpd
+net-libs/czmq:nss - Use dev-libs/nss for SHA instead of an internal implementation
 net-libs/czmq:uuid - Enable UUID support using sys-apps/util-linux
 net-libs/daq:afpacket - Build the AFPacket data acquisition module. Functions similar to the PCAP module but with better performance. Snort can run unprivileged when using this module. AFpacket supports both inline and passive modes.
 net-libs/daq:dump - Build the Dump data acquisition module. The dump DAQ allows you to test the various inline mode features available in 2.9 Snort like injection and normalization.
@@ -6171,7 +6168,6 @@ net-mail/mailutils:servers - Build server programs - imap4d pop3d comsatd
 net-mail/mailutils:tokyocabinet - Enable Tokyo Cabinet database support
 net-mail/mboxgrep:dmalloc - Enable debugging using dev-libs/dmalloc
 net-mail/mu:emacs - Install the mu4e mail client
-net-mail/mu:mug - Install the mug toy client, not for normal use
 net-mail/notmuch:apidoc - Provide doxygen generated API docs
 net-mail/notmuch:crypt - Support decryption and verification of PGP/MIME messages and in Emacs UI - encryption; support also S/MIME signature verification since version 0.22
 net-mail/notmuch:doc - Install API documentation
@@ -6587,6 +6583,7 @@ net-misc/remmina:gvnc - Enable GVNC plugin using gtk-vnc, suitable for KVM and V
 net-misc/remmina:kwallet - Enable KDE Wallet plugin
 net-misc/remmina:spice - Support connecting to SPICE-enabled virtual machines
 net-misc/remmina:ssh - Enable support for SSH/SFTP protocol
+net-misc/remmina:x2go - Enable support for X2Go
 net-misc/rsync:stunnel - Provide helper scripts for using rsync via >=net-misc/stunnel-4
 net-misc/rsync:system-zlib - Use system zlib instead of bundled one. This is incompatible with older rsync releases!
 net-misc/rsync:xxhash - Enable dev-libs/xxhash support for hashing
@@ -7259,6 +7256,7 @@ sci-libs/gdal:aux-xml - Enable Portable Auxilliary Metadata generation
 sci-libs/gdal:fits - Enable support for NASA's sci-libs/cfitsio library
 sci-libs/gdal:geos - Add support for geometry engine (sci-libs/geos)
 sci-libs/gdal:gml - Enable support for dev-libs/xerces-c C++ API
+sci-libs/gdal:heif - Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using media-libs/libheif
 sci-libs/gdal:mdb - Enable support for Microsoft Access database
 sci-libs/gdal:ogdi - Enable support for the open geographic datastore interface (sci-libs/ogdi)
 sci-libs/gdal:opencl - Enable OpenCL support
@@ -7363,6 +7361,7 @@ sci-libs/proj:europe - Install the PROJ collection of European grids and init-fi
 sci-libs/rocBLAS:benchmark - Build and install rocblas-bench.
 sci-libs/rocBLAS:test - Perform rocblas-test to compare the result between rocBLAS and system BLAS.
 sci-libs/rocPRIM:benchmark - Build and install benchmark programs.
+sci-libs/rocRAND:benchmark - Build and install benchmark programs.
 sci-libs/rocSPARSE:benchmark - Build and install rocblas-bench.
 sci-libs/rtabmap:openni2 - Adds support for Kinect-like 3D sensors devices with dev-libs/OpenNI2.
 sci-libs/scotch:int64 - Build the 64 bits integer library (needed for > 2^31 vertices)
@@ -7375,6 +7374,7 @@ sci-libs/suitesparse:cuda - Enable nvidia cuda toolkit for speeding up computati
 sci-libs/suitesparse:partition - Enable graph partitioning and graph-partition-based orderings through sci-libs/metis or sci-libs/parmetis
 sci-libs/suitesparse:tbb - Enable multithreading with the Intel Threads Building Block dev-cpp/tbb
 sci-libs/sundials:hypre - Build with sci-libs/hypre conditioners
+sci-libs/sundials:int64 - Use index size of 64 rather than 32 bits
 sci-libs/sundials:sparse - Enable support for sci-libs/klu sparse solver
 sci-libs/sundials:superlumt - Build with sci-libs/superlu_mt
 sci-libs/superlu_mt:int64 - Build the 64 bits integer library
@@ -7708,6 +7708,7 @@ sys-apps/fwupd:archive - Use app-arch/libarchive for archives support
 sys-apps/fwupd:dell - Enable Dell-specific support.
 sys-apps/fwupd:flashrom - Enable flashrom plugin via sys-apps/flashrom
 sys-apps/fwupd:gusb - Enable dev-libs/libgusb support
+sys-apps/fwupd:logitech - Build and install Logitech bulk controller plugin
 sys-apps/fwupd:modemmanager - Build and install Modem Manager plugin
 sys-apps/fwupd:nvme - Build and install NVMe plugin
 sys-apps/fwupd:spi - Install Intel-SPI plugin
@@ -8569,7 +8570,7 @@ www-client/opera:proprietary-codecs - Enable codecs for patent-encumbered audio
 www-client/opera-beta:proprietary-codecs - Enable codecs for patent-encumbered audio and video formats.
 www-client/opera-developer:proprietary-codecs - Enable codecs for patent-encumbered audio and video formats.
 www-client/qutebrowser:adblock - Enable Brave's ABP-style adblocker library for improved adblocking
-www-client/qutebrowser:scripts - Installs userscripts from the misc/userscripts directory to /usr/share/qutebrowser/userscripts.
+www-client/qutebrowser:widevine - Unsupported closed-source DRM capability (required by Netflix VOD)
 www-client/seamonkey:chatzilla - Build Mozilla's IRC client (default on)
 www-client/seamonkey:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
 www-client/seamonkey:gmp-autoupdate - Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index fbc00040d679..d128b0b8d2d3 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/bcftools/Manifest b/sci-biology/bcftools/Manifest
index 359793c2e6bc..572ee9298e8a 100644
--- a/sci-biology/bcftools/Manifest
+++ b/sci-biology/bcftools/Manifest
@@ -1,5 +1,3 @@
-DIST bcftools-1.10.2.tar.bz2 3702679 BLAKE2B 51acce94d463868562199206504dc8afb50c671c11139c5a96f52cedf135bb7a46115c69411b9943b970a2395e3c866275c85e345a4a40a90194d1094698314e SHA512 f07e405efa16b9b1b18521342df3eaf840ed1b3028b736a6b4d139012ea85769ddfb3cd3a2c94958415d984d07805dfcd3d4bbec0db401b3f071b861a56d1300
 DIST bcftools-1.13.tar.bz2 6906796 BLAKE2B 4c02d65733d28684f9a976e082913d79dbac4463c9471fc26d8ee0cbe7ad25af429cf7d01b9771bc34309386ccd2d77ebd54fbf64ed4183d1c2ebfbc0e727afb SHA512 aa533233dd2fec2279859204be39430c4fc630137a91d57fe917fd7a220044d5202ddc3d44bcffc3bd5bd5bb64f6ea4c8ec3c31e5e1ec72399998f1e6f23a55a
-EBUILD bcftools-1.10.2.ebuild 864 BLAKE2B b98c493d6e50d982917ecbf32c424a45231c3f512a49a0c9cd675cbb3d5f21a57d62cc53a20556663b6fd1d58a68df01a9ed56185dd5f400b8ee5b5c7b5497fd SHA512 c8c3173376a35824ce10413e7cba172d6a90dae91352a292df5603f1a7e17cd5987fc91b463b030221b577bce5424ae7a219625cb684cb3fa2f6777581bb19bb
 EBUILD bcftools-1.13.ebuild 896 BLAKE2B 74b1387b81ec75926bd76d62033d7cf0708ac3b9a0b0b0573fec1c70efb47b84bd3fa626f3ff3144e380f07822bd3d9e56f4ddb1e09a4a09082cb1d6d3229b39 SHA512 bb0f18c2102fbfa8d5ee636c81308ea8a0ef6de80943423377846ebd2180881ca745e7eddd94be7ad7b34a2313acc43553d8a31ee474542de5d29d4874e935e4
 MISC metadata.xml 344 BLAKE2B 37f8e82e8a5a9ad572580a7e5ae6daa6911d672f17b8526f81b236cbc2e50a32c4cd2566aaed9f5feee016d7e2de7db2a40b60616e86c3e8cae307d60cebc70e SHA512 0160c9606089d610613d71dc0aa9c9c5e5266483fdc9c407b6e0ed911eac8f8b32ffaf5a49bbb427393c8240e9868df51f0fc68b2f45467f65d9b3d54b0ddde1
diff --git a/sci-biology/bcftools/bcftools-1.10.2.ebuild b/sci-biology/bcftools/bcftools-1.10.2.ebuild
deleted file mode 100644
index a484f69133e5..000000000000
--- a/sci-biology/bcftools/bcftools-1.10.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit python-single-r1
-
-DESCRIPTION="Utilities for variant calling and manipulating VCF and BCF files"
-HOMEPAGE="http://www.htslib.org"
-SRC_URI="https://github.com/samtools/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-lang/perl
-	$(python_gen_cond_dep '
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	')
-	=sci-libs/htslib-${PV}*:=
-	sys-libs/zlib:=
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	python_fix_shebang misc/{guess-ploidy,plot-roh}.py
-
-	# remove bundled htslib
-	rm -r htslib-* || die
-}
-
-src_configure() {
-	econf \
-		--disable-bcftools-plugins \
-		--disable-libgsl \
-		--with-htslib=system
-}
diff --git a/sci-biology/pysam/Manifest b/sci-biology/pysam/Manifest
index 3647402b6949..c990614486e8 100644
--- a/sci-biology/pysam/Manifest
+++ b/sci-biology/pysam/Manifest
@@ -1,6 +1,3 @@
-AUX pysam-0.16.0.1-fix-tests.patch 1128 BLAKE2B 8e395496c23186b29622b8e87369f910326724b70b63f3eccfd6d4b6cea86abf8b34a712a931f205711e2c5a6e76c9572a93aa9bd994f915312c55dcc888da52 SHA512 e725143c72d04fc0e2e37e607e6d9b85b4c883bcc5a530ff3c92e3bbd45d7d7fb09c315766a19254bea2a19a2d00a5f64220094a4e9b1090e412b26ea489b530
-DIST pysam-0.16.0.1.tar.gz 3294073 BLAKE2B 8df1c9b061b0d4b3962ff4b0e30f1589e02d7df41ce362bff861596d3599bf800bb16b2fa4de326fc07102dc7801b48c6b821e5d47e694a3536bec2c5b1cfece SHA512 5cebb9f3bc8dc6186a629e91423a3c8cb802af6529b943fcd880e056661ec6ee2a00de789cf144c9e40b9d1ef2459c0e06ce27a1b9eab8e2875d2087f275af28
 DIST pysam-0.17.0.tar.gz 3579324 BLAKE2B 6b88fe771350f20fa7c90a4c02c60fefd6a34d979c687fce1e34a17e1ff203c7d2d07e36b64f7a73f99676b805334df7f049932ce15e26362a5214da03435d64 SHA512 16740f08fb68a1f24656454b834dd9ac52ad9f864f307564566fc244bbd2efb7cb17107b2e85ca5c56af817918a138d1c071533de1b80e5bba42b01bbad7f552
-EBUILD pysam-0.16.0.1.ebuild 1393 BLAKE2B 1b68d4d351483c8082905460185395d560a9c3157d10f2cb5b2eee76d8828e7e50252f1eb920b9411761c4081f11b293de2c87cede8e9d5e22b568cee0691cfc SHA512 b8e2b792eefbc12e30e51ae01fa48977dfd904abcaf7fcbbd5b5148da76fb5411d0b412f0f0aae060ddf462eb4b69269f362d00dfa1371bda4a38dcce0a6baca
 EBUILD pysam-0.17.0.ebuild 1586 BLAKE2B 38351a74c0a57348fdc1999f35b10cd8645160175386b94885e49bbd99bc64f577c326d04e09ba56abce0c0c01331276ebef080fbf519dbfbae41960b6ccc61a SHA512 bd0e336603727c67cd363c628daa9aa9b95e6fe2dbcc06425fcbcf03bd8bd4bd79e651b637434cdbbecd85ebc2841647863910e31f94dd9641694fb4c68de8d4
 MISC metadata.xml 442 BLAKE2B e3d339868a09d8930ff6d83f414f8166ed283a66d83d5b0fed0031024db151b17b1347f5e015f2b9c2152a041e2beb70696362be9b4e3fc225078bc5c520ad58 SHA512 4b1d08c5524e1bb04129e0d38f0584654b34979024afd2cf15bd482654ca8fac9c82e6db0661f7370f9fefa6949f1291ba3c18a9dca5d5041bd6f76554fa33c7
diff --git a/sci-biology/pysam/files/pysam-0.16.0.1-fix-tests.patch b/sci-biology/pysam/files/pysam-0.16.0.1-fix-tests.patch
deleted file mode 100644
index 9d269878e651..000000000000
--- a/sci-biology/pysam/files/pysam-0.16.0.1-fix-tests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/tests/pysam_data/Makefile
-+++ b/tests/pysam_data/Makefile
-@@ -3,7 +3,7 @@
- BAI=$(BAM:%.bam=%.bam.bai)
- CRAM=ex1.cram ex2.cram ex3.cram
- CRAI=$(CRAM:%.cram=%.cram.crai)
--NO_PG:=$(findstring --no-PG,$(shell samtools view))
-+NO_PG:=--no-PG
- 
- # ex2.bam - bam file without index
- 
---- a/tests/tabix_test.py
-+++ b/tests/tabix_test.py
-@@ -14,6 +14,7 @@
- import subprocess
- import glob
- import re
-+import pytest
- from TestUtils import checkBinaryEqual, checkGZBinaryEqual, check_url, \
-     load_and_convert, TABIX_DATADIR, get_temp_filename
- 
-@@ -1014,6 +1015,7 @@
-     globals()[n] = type(n, (TestVCFFromVariantFile,), dict(filename=vcf_file,))
- 
- 
-+@pytest.mark.skip(reason="requires internet connectivity")
- class TestRemoteFileHTTP(unittest.TestCase):
- 
-     url = "http://genserv.anat.ox.ac.uk/downloads/pysam/test/example.gtf.gz"
-@@ -1053,6 +1055,7 @@
-         self.assertEqual(list(self.local_file.header), [])
- 
- 
-+@pytest.mark.skip(reason="requires internet connectivity")
- class TestRemoteFileHTTPWithHeader(TestRemoteFileHTTP):
- 
-     url = "http://genserv.anat.ox.ac.uk/downloads/pysam/test/example_comments.gtf.gz"
diff --git a/sci-biology/pysam/pysam-0.16.0.1.ebuild b/sci-biology/pysam/pysam-0.16.0.1.ebuild
deleted file mode 100644
index ec09bbe1f8c9..000000000000
--- a/sci-biology/pysam/pysam-0.16.0.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface for the SAM/BAM sequence alignment and mapping format"
-HOMEPAGE="
-	https://github.com/pysam-developers/pysam
-	https://pypi.org/project/pysam/"
-SRC_URI="https://github.com/pysam-developers/pysam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="=sci-libs/htslib-1.10*:="
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		=sci-biology/bcftools-1.10*
-		=sci-biology/samtools-1.10*
-	)"
-
-distutils_enable_tests pytest
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# unbundle htslib
-	export HTSLIB_MODE="external"
-	export HTSLIB_INCLUDE_DIR="${EPREFIX}"/usr/include
-	export HTSLIB_LIBRARY_DIR="${EPREFIX}"/usr/$(get_libdir)
-	rm -r htslib || die
-
-	# prevent setup.py from adding RPATHs (except $ORIGIN)
-	sed -e '/runtime_library_dirs=htslib_library_dirs/d' \
-		-i setup.py || die
-
-	eapply "${FILESDIR}"/${PN}-0.16.0.1-fix-tests.patch
-
-	if use test; then
-		einfo "Building test data"
-		emake -C tests/pysam_data
-		emake -C tests/cbcf_data
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	# breaks with parallel build
-	local MAKEOPTS=-j1
-	distutils-r1_python_compile
-}
diff --git a/sci-biology/samtools/Manifest b/sci-biology/samtools/Manifest
index 258415bacb57..e81f2187923a 100644
--- a/sci-biology/samtools/Manifest
+++ b/sci-biology/samtools/Manifest
@@ -1,8 +1,6 @@
 AUX samtools-0.1.20-buildsystem.patch 6737 BLAKE2B 71445f57735903bccc2720a32f42b27093f670e383d2d194b5692b1ba536e3df44204711cf4574b3933e5ce00605b661b1a36d79ca7f193ce36816271a3f8214 SHA512 ecb05971fbea4570ec161a165cb581b38ed727bb7e5b769862984bf035414cd564ab809882dc3272f8b192feeb86e29247d7327afa73ff668b01c03c58bb177d
 DIST samtools-0.1.20.tar.gz 566387 BLAKE2B a62d74c408877754af50f5e5fea0e2289ec1e0c9f25013ed0d039bfe8ef61108600d917f8c9d356e98aca632795b4eb0f01ea1b54526a652577fb74a38a433c2 SHA512 15bd8cf401d14c1ab4faa591b6054f5ea9731c4e966f37f71d33d9081a270cfeb91e8a3d80c631e0725b49da81387f824c206e8c21553ad554d0cfc5c238a6e5
-DIST samtools-1.10.tar.bz2 4721173 BLAKE2B 103c71ec5740eac151a4fc40d67286ee00123c7befd5f654cf5c89812bda44f82b38ab662a4a3216ac84434cabab49500b903612137f97f89a7ea38063e8fc08 SHA512 828ec2638592b440e06b81eafc57634416ab54dac6caaecb06f22a90e9bf99da1fd8bb54509cb98591899c4e097ac9038ee5d57ea7bfe1a18967cde4018d840a
 DIST samtools-1.13.tar.bz2 7984998 BLAKE2B e46161c43d4ea51c3ef1d9ed74c40c21b70aef80aa903a49b94b3d468f9211e9147281204eb61b9843c071f09ead08c924e3d624d4df76a1d02ba9ceb318399a SHA512 647fbad2935dfc3e4f85da257a6ee59af40078024a3b77f117dada5f55846e381a096db3cf62a63c04ae95dfc9fadb1d515b8d618e6388bc93f0b2ac85eaf6ea
 EBUILD samtools-0.1.20-r4.ebuild 2049 BLAKE2B d377712eaca931258b37645e6a6b3cc379fdb550ef83a0c272a3eb564d7753185fea53416973e4fdf2c25b79475a81ae72b646ce22c570c934e4eabce8a9ded6 SHA512 c0d387f715ebf1f746ea4e4a7eab85a86ef0bff646c9a69639b17ef02e93c39982941d7eb811a6d67b0e635c9c4e05924d2b89a6809c3bd0592db91894dab4aa
-EBUILD samtools-1.10-r1.ebuild 993 BLAKE2B 69080337f15d653be56680f3183c2eab3c1813805e3ffc3be1d6dc0e04264a063ae758b694ccb1ff097e952cad736a387de02905ca4f7d4af779233d9e1fced2 SHA512 15dab01b933e56fc83b71f68b2c52c69b115df19f72599e4b4d9d959f9035a468e3ad825cb2e12a80ba558b953879d1b6f8e9dc50922d099c375312dd7580040
 EBUILD samtools-1.13.ebuild 886 BLAKE2B e96ccbff6d7310e4691118bc191a020525a92aa49dd24478be11185e1767788849bae9d575d59dc139f77b0c977222684c82a45487b4d10d77da20347f5170b5 SHA512 3eb07532ae9d7995279663d8e09602e30a5055b13388ceb83aa369e52bb2291f21014f60dccc5569825f6e7683801b737557539270007bc16a12015d86c17fec
 MISC metadata.xml 409 BLAKE2B c94eab9ebda4844beb471694106e353ccbbaca53e69de680301c6cfab3f3b6224ec94fcd631c9de2811d309463e5ee6decf2e443bfc68921f3362c6a312cd3af SHA512 fb2d3686e1ee70e4e80266a26603b3e52b680b1537a4569493a3a0511b93e2acdb2be3136df7ae54905a9f86fb7e53fa054607262751ebd8f54903f1905dad24
diff --git a/sci-biology/samtools/samtools-1.10-r1.ebuild b/sci-biology/samtools/samtools-1.10-r1.ebuild
deleted file mode 100644
index 940895616906..000000000000
--- a/sci-biology/samtools/samtools-1.10-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Utilities for analysing and manipulating the SAM/BAM alignment formats"
-HOMEPAGE="http://www.htslib.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-lang/perl
-	=sci-libs/htslib-${PV}*
-	sys-libs/ncurses:=[unicode(+)]
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# remove bundled htslib
-	rm -r htslib-* || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-ncurses \
-		--with-htslib=system \
-		CURSES_LIB="$($(tc-getPKG_CONFIG) --libs ncursesw)"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_test() {
-	# the tview test diffs expect 80-columns output
-	unset COLUMNS
-
-	default
-}
-
-src_install() {
-	default
-
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index e2b6ff823c0e..ebb25c60e82e 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/bc-gh/Manifest b/sci-calculators/bc-gh/Manifest
index 8f85f146e0c4..2b68f4c85047 100644
--- a/sci-calculators/bc-gh/Manifest
+++ b/sci-calculators/bc-gh/Manifest
@@ -1,5 +1,7 @@
 DIST bc-4.0.2.tar.xz 235464 BLAKE2B 8a0a2a77bdeba924994060ba8b1dd8e6f7fbbc9ac850f58e98fdfcf2bc50890772b1f8cc344ed2e05a936487a693a26f6a2a349b93e520c01a7ac7ad0465d66d SHA512 f3564cb953bca2003c9fd565b3114a2701de4437c6db3cace29edab186d3270cd98f66f3eb1a45fd074a44736fef39f78675959f400c1c23a4a2e930d469c059
 DIST bc-5.0.0.tar.xz 429376 BLAKE2B 8e184270e18ccabe2c1b6b95df7110dfd29cb4357667380fb5d71991b98f78c48f49e0f9176df89e058b00d2998a727ff95c166ce69085f17bb1914e957d870e SHA512 3ac4639922398e633aae3c3679ee3e53f3688da3992c55c120165b5718860f9857b7f46c43a9e18da0dd67ac92c8855f7449dfdfdfd11c419dc4ab6683550740
+DIST bc-5.1.1.tar.xz 433944 BLAKE2B d46ae9de6358b3acd1afe9f7013286d8678e26a985664d65e78b51077b494d2b1c1271044170d3488ececeaed5e97df15da2734070a2fbf39b33ab9c01543558 SHA512 d8774fb1e654520abdf7d790783d4a3c04fa8f4982fc1cd0d92331e7e4b5889efa022cafb5e1286b6c82a74c9388f47657c7b9d78888b5d8056fa40d3d5e5c69
 EBUILD bc-gh-4.0.2.ebuild 471 BLAKE2B 59d8ecc8cc875c25d44d971c5e858d9ef084e759b5e0d9a4ccb4a32508ca39ea5fc7a1f7ba04e5f65507514f90adadebe687568ec28bf2a8bd916732dd9074db SHA512 b49c1986d4b90c016bd4ab55de598053c982aca11c74fa123ad73ce166aa5eb7cf46aca9948d26e4c3b03a5b353de1a3398a292fd8a65f4cdb56de7da3ad1cf6
 EBUILD bc-gh-5.0.0.ebuild 497 BLAKE2B e4a9ebdd7889572a28c6d7ff606de35d162f858478b42451552fc55bf1eb57ed717ed06e997f0283e0b7fb8d5294b6440632b7f0581fc27418fe6e3430e94da5 SHA512 fff00599da592750c235a6441bbf9ca5f921c4829268e6e6e40b74e549250fb123a31eabebe39cbee8503a47fc8e9a76fe747b8884c067697e37002e3f5f8777
+EBUILD bc-gh-5.1.1.ebuild 497 BLAKE2B e4a9ebdd7889572a28c6d7ff606de35d162f858478b42451552fc55bf1eb57ed717ed06e997f0283e0b7fb8d5294b6440632b7f0581fc27418fe6e3430e94da5 SHA512 fff00599da592750c235a6441bbf9ca5f921c4829268e6e6e40b74e549250fb123a31eabebe39cbee8503a47fc8e9a76fe747b8884c067697e37002e3f5f8777
 MISC metadata.xml 972 BLAKE2B 3246d762ce2c9c182efd7aaf1595cde2fddf6d81c59f88f9105443585b4b15fc9fcc583b5b767c3022b96fe8639ca679fa0ea76beb36e0bacd4fc0103e3a103c SHA512 a5400b2c288574c75c9598be449ddfdc878e047261388512cdc95b9077ec9e605471438c253551fde37c8b78918716e3523893aeba091db6d389b92184215f13
diff --git a/sci-calculators/bc-gh/bc-gh-5.1.1.ebuild b/sci-calculators/bc-gh/bc-gh-5.1.1.ebuild
new file mode 100644
index 000000000000..47aaece3ed37
--- /dev/null
+++ b/sci-calculators/bc-gh/bc-gh-5.1.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Implementation of POSIX bc with GNU extensions"
+HOMEPAGE="https://git.yzena.com/gavin/bc"
+SRC_URI="https://github.com/gavinhoward/bc/releases/download/${PV}/bc-${PV}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+S="${WORKDIR}/bc-${PV}"
+
+src_configure() {
+	EXECSUFFIX="-gh" PREFIX="${EPREFIX}/usr" ./configure.sh -GTl -sbc.banner -sdc.tty_mode || die
+}
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index c8430eed23c7..c35b39994c79 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST qalculate-gtk-3.20.1.tar.gz 2547876 BLAKE2B d357ba4c03f39d504c2dda0e3d48b443ca05f5dd092bfef35f688947bf5c73eabef4756c7f53280cfd382e78c283f90a99dfa5d9727c5a9addce1c65c0ec9fb4 SHA512 5cdb5154a329514ed9d9c2081d15bfad4f12e2fc837ee3c32313a88492b06cb1139e1774ab3b3c3d4018a6a1d875022fafbf6ca904f8e8f56b60eda2450ef1e5
+DIST qalculate-gtk-3.21.0.tar.gz 2550604 BLAKE2B ab3a8e76f23ba20adf023a467f460876d5c1227fc46f8cbc636b2eea82cd2e319ab8c9ef17c1a0c475477f8624363236a8c6a1d450b3490df2657939c23047ca SHA512 c850e09ea6aebbe7bbd074e31f462a02dac64c1ef9fb3a26df8ae6355f79f3d8aec5b3f7af071801d05486511f1515abd67674561e30e68199adb7eac3c61444
 EBUILD qalculate-gtk-3.20.1.ebuild 863 BLAKE2B 7925a2a7624c3919de3544a2f05b49424c191302f4b5054809938ebc2a3a58a68359509dedf57c422c74b7e91f6f73e3e742d9aa0092478c693571a7c2d2c247 SHA512 6b43b1973d2a47a4c893e6281e397b71d2669d3fbac98ecb78410b2468110f18535f9411193a72248556163c760af985d78344cf9a689c2a91b7e44a439c7047
+EBUILD qalculate-gtk-3.21.0.ebuild 866 BLAKE2B 8a61e66fe13f84014e3a395117393a3fae12297f7d9c81cf348b9c545855018a6274609097132817af5c439ad1df98cb1e31aa77e394645ec67b46efdaf0fd50 SHA512 4b195628f6a688934cfb546ba2c3324c5fec6961cf581562abd04ccf3b71f43b32bfc223079c107037cae5757552182472e0b634ced26a0065a7cee19b622102
 MISC metadata.xml 607 BLAKE2B 7572be504616d69914849d6bdd53a9768fa649606f7f64f3a5ce136f0971ed57b410bf90796091f95f94c73dfdfe8748f31e30a656765de82e68e3d40abc48c3 SHA512 fba3a4df947551ec5421975ec33830e2c3c30b26030abf13a3ba1d524cb64f92adbf77015683142457ea715883a39198f3fb83a932629b887d077ab9b34d77d4
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-3.21.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.21.0.ebuild
new file mode 100644
index 000000000000..37cc084599d6
--- /dev/null
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-3.21.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2
+
+DESCRIPTION="Modern multi-purpose calculator"
+HOMEPAGE="https://qalculate.github.io/"
+SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-libs/glib:2
+	>=sci-libs/libqalculate-${PV}:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}"
+BDEPEND="app-text/rarian
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Required by src_test() and `make check`
+	cat >po/POTFILES.skip <<-EOF || die
+		# Required by make check
+		data/calendarconversion.ui
+		data/periodictable.ui
+	EOF
+
+	gnome2_src_prepare
+}
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index a0b7688fa224..9179b0b9fb77 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/chemex/Manifest b/sci-chemistry/chemex/Manifest
index e4c35fa87574..fd297d8394a5 100644
--- a/sci-chemistry/chemex/Manifest
+++ b/sci-chemistry/chemex/Manifest
@@ -1,5 +1,5 @@
-DIST chemex-2018.10.3.tar.gz 546696 BLAKE2B d283cfb94118686f1974780249641e0ea6f86cdb854c4a256897e361a300a94506813a5035ee2f300fca13263e8452b77e7a0817436cbd620ba16d801a541af7 SHA512 784bd03b354724d6aa52d663c6f661f865d4ef7ca345573bc8aae9ef63e5dbb3e65abba364de3ff441b78adfa588344c718809c5880b3fc70d8ed24be06a0826
 DIST chemex-2021.4.0_p2.tar.gz 2384471 BLAKE2B 1eb609c4e4ad9ac0f7cac8ab523e72e8ab9c12d40671fd598cd26b8de2a3d6e68dfdcaee9202521fc583068f591377842b3e7b9f0e1f95e6cba8da9b0c6d63a4 SHA512 568072eaf0d1c666de2aedacc50cd98da15631e0ef15ba60414be671ac97a50967e5b4d6d00340b1263f730b3a803ccc8995fbb86cfc47517b9521c9920641c8
-EBUILD chemex-2018.10.3.ebuild 1007 BLAKE2B 9b231e246e6401185db827f7cc808be6c1955a569f00b156b7b3ef43645cb51596865551df05c176bfa916128dd40953d933a54e7c10548c37fb08acbb8fb62c SHA512 82f4719818573b63cbdc8d7ffac0968204357f705655e327df0866ea6296c03fb38b8b05133b301fb88fdbaec693814c55c6fea935f7dc4a507eeee5fe0493f3
+DIST chemex-2021.4.0_p4.tar.gz 2387888 BLAKE2B 26b4467756ba1b31775c554906a2ce09556e1fb99dd2ff294620a12b92246f441a2daa07e6bad7cedf903bd18e6ecc0613b6473f54d27d89ed9117ddc6a27269 SHA512 7d93f213317e4cb5a987c0b3cfcce146fb02a15ac9efbde74f9d3fc56a5e86c89ca6b606f45013bf08ed10f3de17cc72fa010ce0e42c5cb746119ede0ce4d38f
 EBUILD chemex-2021.4.0_p2.ebuild 1184 BLAKE2B a7ab020a416e46f232ce5b9bd140d7af6c925b8e0da5b2dfe629e7f50533692700c183cf1068be6fa0cee7cd3141eee6f684a936fea9b034f0a68b8f0f080358 SHA512 06067c09038bcc2629ac272a5005acd1f11fce5014ceb2fb9eb8fa9f7c6d900d9ccdc07a90e54fde11e5399baed2b12def1facdfaf7e929e603e6c334b463a04
+EBUILD chemex-2021.4.0_p4.ebuild 1279 BLAKE2B dc10ef290d4dac75119a4b215da0b1fea01cbfc7558c6fc78f46801ec5cb0514d6d2ae7cbd58028ce4da2903109d25b0fd02637d4b3a6570b819696fc4c15348 SHA512 faaa7006bd9ee86684de6afaceb25695c63dc1514abb21201172c0338068abf0787ae67c935b12e10dcacac2c30652f513458c9f6e0284d94b1b57b53dc7e310
 MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
diff --git a/sci-chemistry/chemex/chemex-2018.10.3.ebuild b/sci-chemistry/chemex/chemex-2018.10.3.ebuild
deleted file mode 100644
index 19f50cce7be7..000000000000
--- a/sci-chemistry/chemex/chemex-2018.10.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_SINGLE_IMPL="yes"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
-HOMEPAGE="https://github.com/gbouvignies/chemex"
-SRC_URI="https://github.com/gbouvignies/chemex/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/asteval-0.9.11[${PYTHON_USEDEP}]
-		>=dev-python/lmfit-0.9.11[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-1.1[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
-		>=dev-python/scipy-0.11[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-S="${WORKDIR}/ChemEx-${PV}"
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-	distutils-r1_src_prepare
-}
diff --git a/sci-chemistry/chemex/chemex-2021.4.0_p4.ebuild b/sci-chemistry/chemex/chemex-2021.4.0_p4.ebuild
new file mode 100644
index 000000000000..3a331d48eba7
--- /dev/null
+++ b/sci-chemistry/chemex/chemex-2021.4.0_p4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_SINGLE_IMPL="yes"
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+
+inherit distutils-r1
+
+DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
+HOMEPAGE="https://github.com/gbouvignies/chemex"
+SRC_URI="https://github.com/gbouvignies/chemex/archive/${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="test"
+
+#RESTRICT="!test? ( test )"
+# FIXME: Restrict until we figure out how to run tests properly, bug #815079
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/asteval-0.9.25[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-4.1.0[${PYTHON_USEDEP}]
+		>=dev-python/lmfit-1.0.3[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-3.4.3[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.21.2[${PYTHON_USEDEP}]
+		dev-python/setuptools_scm[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/tomlkit-0.7.2[${PYTHON_USEDEP}]
+		>=dev-python/tqdm-4.61.1[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
+
+S="${WORKDIR}/ChemEx-${PV/_p/-dev}"
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	distutils-r1_src_prepare
+}
diff --git a/sci-chemistry/dssp/Manifest b/sci-chemistry/dssp/Manifest
index ba167e11628e..cd68455be0ea 100644
--- a/sci-chemistry/dssp/Manifest
+++ b/sci-chemistry/dssp/Manifest
@@ -8,6 +8,6 @@ DIST dssp-4.0.3.tar.gz 122872 BLAKE2B f88c330370645b4bd4e89656ad676e443a33c38d78
 EBUILD dssp-2.2.1-r2.ebuild 962 BLAKE2B 4badf2ae8647aab9c5e359d9e0763d051388afe3bf5763c8eeb99cb21b30283d72ace619f1b65c5ee248c42f8264cb31c2c1c079f75eacda1568cc4352cec5e3 SHA512 4a599b6e7cd068175bd89f4ea948ad1267df783c240ab46d3c6109bf3f2853de714ecf1e5776722309688599f28af545287fe5cb98d8b7a5f46d319df953b926
 EBUILD dssp-2.2.1-r3.ebuild 880 BLAKE2B 057a862fbc9ff19fbf487f9df0faf661a7db5406c28e6cb91d5e38dfaa2e9d24eead9ba78d4e92b5b5022e2be5c69b30ff6c386aeac8160062b5f7f35b449889 SHA512 747ac74fd95400759569e657db85c3dc5c5a7ee0753761bc4b4927f4d119d168f0d5dcbd9ca16f37486358e7117e773d812034fb07953aae88c63ac1e706f8f7
 EBUILD dssp-3.0.11.ebuild 825 BLAKE2B 020ea517127ffc1167cbff3a9362e5ff255b25664769ef2ac8f7f3060e34e0bec29e965df46e65bab8943cbf5fb11175d70b1b9f9e7d71bdbf92a4c54a903367 SHA512 b81dbe1cb9f7b66c5268485dc262bb705b12d250e2ec778c80fddbc584a38e36b64cb93e92385c178fdeca0e593c45ce25aef16480bfa9eb230bdd2b8a82fa53
-EBUILD dssp-4.0.1_p20210831.ebuild 849 BLAKE2B 0d6089c63608b85c98f67136cfd275098272985f689ac0e6338c7ee6cd158a851901815d0dab988a2ab65ff63a1bfbcd689577daa98c2c91bc04c95f2a95420b SHA512 35d5e67754a7a7b3d3021c16d57d1b4e5c8a2316606b7ebed08bb543e647794d87b64e4ba04db3d86d34f13999e04af08b4df8cbe4d8d5843c1f3f26c491b0b0
+EBUILD dssp-4.0.1_p20210831.ebuild 854 BLAKE2B 0900056de41489970920f7bc190df755478a719ee19d9afcc9bfcebd666e0e6abe3bc03ce93a6ce5b4c426401f4243114e576a7eba4b84a84ea63c0c73f1f78e SHA512 4d2deb26d537014238592d7062b7d9ad6ce3350d09c9e422c47f70df7c9320235e141e05290635b63d66c65aebc8c964604b9269bf423bf09a2e90e87e70015f
 EBUILD dssp-4.0.3.ebuild 769 BLAKE2B 406a817ed8545b7b85524cd36a0f7016b75639a0dd15971639eba0e55a2eb78b68817d0892149d8b6781d6b4ed9a767d7e508d236023a1bd16663fc289bc6399 SHA512 2dbd1aa4e76d6bc58a42ed4dc848c7e87afd3079d5f2bd21652288b38ef7ad0d5c5804a52532e33cd2519652d3a94cc2f9fc462e8488aee42309edb2a40dc156
 MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
diff --git a/sci-chemistry/dssp/dssp-4.0.1_p20210831.ebuild b/sci-chemistry/dssp/dssp-4.0.1_p20210831.ebuild
index a5e5af9c7424..ca051ca5a0d2 100644
--- a/sci-chemistry/dssp/dssp-4.0.1_p20210831.ebuild
+++ b/sci-chemistry/dssp/dssp-4.0.1_p20210831.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 11c5547a7590..ceeb952dad3e 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -23,7 +23,7 @@ EBUILD gromacs-2019.6.ebuild 7264 BLAKE2B 6196f750a81562c82f1004ba3e4be05193aa91
 EBUILD gromacs-2020.4.ebuild 10134 BLAKE2B efc77b2cb0981ebf3f90fbe531d54020be2e82b464dace3ab8d07d41cae060c5e073a8a3f641b4bb0431ec2717a5f990a2a6f08ceed6a805bde82742b9eba487 SHA512 f7af8d31c43abe23b9c92ce6afd0dbea4219fe48dad3d91bf19f50f80a520cb0ab98949d4f2653679de751853755e793fd0e84ad73ebf13bef17fc255d693001
 EBUILD gromacs-2020.6.ebuild 10137 BLAKE2B e5f058493f7757ffcff53c892445a3ea2dd15ebb83bbd7fd186a56d85e785be75277e8329487a182d27e23f7756b02618c227ef40c2aaf0243f2a1fbeda232c6 SHA512 37df9d310ab597ce4bb69bd3d77ec20d4b6e0b825b341e5fe78b139164fd02a43b5e3d012530fd9a62500d4a63d2efa05fcbc1219ef5edcb93bf232d563af821
 EBUILD gromacs-2021.2.ebuild 10361 BLAKE2B 925ad220aa14d1e0ec8ad0bc2a1b5f887c2dc7e3e419ef54b009026fa8dd251ef91821acd82e12a3126a065d709dde9a9df14f026323373d0b2909b750795b50 SHA512 15e159486ff136633fc6de6f32a5efd14b7d7276197db7bd0e83dfdf8c57ecc2374c8021783726de9b0d99512ccb8f0980506ceb53cdaaee1cecd847a699caf0
-EBUILD gromacs-2021.3.ebuild 10269 BLAKE2B 90f318b96a6a5a4ce24753d6ea610dabe2cbd59670db5f4ee61c9d9b282fd79e6db0d2e758834fdb563c8c3b27876f63c619306f8c25a669ac9fa8153d71b0fc SHA512 7eaeff9d5468e3c51d7277b18588250aedae6c5c023793c91f0d9583608c85ee11da6278e293a0597d29ea408b7a86d17448c118f7f52c6b575be9ec137b4d5a
-EBUILD gromacs-2021.9999.ebuild 10271 BLAKE2B 59d6173d1c82cfa1c084528edf2e9cf9bab8e6eefb5e3cc7c05fc43654c7be9463a24cd62a8c764afcddb9fe29fad2643cf60222608f0cdbe72eedd6c41337f2 SHA512 8434cfaf918264c8ad1e0c87f2876c6531a70d330c1205378ac65f537a562e2a72208cffca41bc85773ff1f2eb73653a4c5b1cb992f007c03bab125aa13ae4f6
-EBUILD gromacs-9999.ebuild 10271 BLAKE2B 59d6173d1c82cfa1c084528edf2e9cf9bab8e6eefb5e3cc7c05fc43654c7be9463a24cd62a8c764afcddb9fe29fad2643cf60222608f0cdbe72eedd6c41337f2 SHA512 8434cfaf918264c8ad1e0c87f2876c6531a70d330c1205378ac65f537a562e2a72208cffca41bc85773ff1f2eb73653a4c5b1cb992f007c03bab125aa13ae4f6
+EBUILD gromacs-2021.3.ebuild 10288 BLAKE2B 051f7c792d1138cbf14b0c2986d51216650e852ff72e99eaba599710f0b101345c83cb3a513c0a4949fb402ed0ff19f6ff7459134e521107741e6fa122691365 SHA512 a8612408e6beae5bde8d13749086721696c2a3d7620e5fd259d35bc17b3e843031ac682394fcdad37898fcaf77492a2dc7f0fc6de9426aad31849ff03c5f57de
+EBUILD gromacs-2021.9999.ebuild 10290 BLAKE2B 5253608d15b6230ef26d8d795367efe86223c15731470893232abd9f2c657774f1fc63ed884450402344c692cf31f441b72aa34fee703089f0fab218f430c2e3 SHA512 10a06dab21f41a9866fd7871251009a93f02e1510ba297c2434c14b237be01744aeca7e3163667b74c992b4c485c50219212aed7979672ae61917025fd187e1b
+EBUILD gromacs-9999.ebuild 10290 BLAKE2B 5253608d15b6230ef26d8d795367efe86223c15731470893232abd9f2c657774f1fc63ed884450402344c692cf31f441b72aa34fee703089f0fab218f430c2e3 SHA512 10a06dab21f41a9866fd7871251009a93f02e1510ba297c2434c14b237be01744aeca7e3163667b74c992b4c485c50219212aed7979672ae61917025fd187e1b
 MISC metadata.xml 1224 BLAKE2B dc6de7f135e5cbd7bdb94bc630d3c7344f5f5387305ada4f3f0fd3f027f9fa4e2c5e44120c8eab8e983fcda314680ac3d140ab61873ab21b839f912a52b21dde SHA512 d036cffac5fd3c4b8d26efdee0f4b4db8d3520f771754a0859f8e99f64d558795b6cab1efba1d4f1700027707a05a724ae96a7e257434d3894ef5fa6eed7ccba
diff --git a/sci-chemistry/gromacs/gromacs-2021.3.ebuild b/sci-chemistry/gromacs/gromacs-2021.3.ebuild
index e77091aa53d1..12b437ed37ee 100644
--- a/sci-chemistry/gromacs/gromacs-2021.3.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.3.ebuild
@@ -161,17 +161,18 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs_pre=( ) extra fft_opts=( )
+	local acce="AUTO"
 
 	if use custom-cflags; then
 		#go from slowest to fastest acceleration
-		local acce="None"
+		acce="None"
 		if (use amd64 || use x86); then
-		use cpu_flags_x86_sse2 && acce="SSE2"
-		use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-		use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-		use cpu_flags_x86_avx && acce="AVX_256"
-		use cpu_flags_x86_avx2 && acce="AVX2_256"
-		use cpu_flags_x86_avx512f && acce="AVX_512"
+			use cpu_flags_x86_sse2 && acce="SSE2"
+			use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+			use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+			use cpu_flags_x86_avx && acce="AVX_256"
+			use cpu_flags_x86_avx2 && acce="AVX2_256"
+			use cpu_flags_x86_avx512f && acce="AVX_512"
 		elif (use arm); then
 			use cpu_flags_arm_neon && acce="ARM_NEON"
 		elif (use arm64); then
diff --git a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
index ebd3a798340c..ac7420b81358 100644
--- a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
@@ -161,17 +161,18 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs_pre=( ) extra fft_opts=( )
+	local acce="AUTO"
 
 	if use custom-cflags; then
 		#go from slowest to fastest acceleration
-		local acce="None"
+		acce="None"
 		if (use amd64 || use x86); then
-		use cpu_flags_x86_sse2 && acce="SSE2"
-		use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-		use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-		use cpu_flags_x86_avx && acce="AVX_256"
-		use cpu_flags_x86_avx2 && acce="AVX2_256"
-		use cpu_flags_x86_avx512f && acce="AVX_512"
+			use cpu_flags_x86_sse2 && acce="SSE2"
+			use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+			use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+			use cpu_flags_x86_avx && acce="AVX_256"
+			use cpu_flags_x86_avx2 && acce="AVX2_256"
+			use cpu_flags_x86_avx512f && acce="AVX_512"
 		elif (use arm); then
 			use cpu_flags_arm_neon && acce="ARM_NEON"
 		elif (use arm64); then
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild
index ebd3a798340c..ac7420b81358 100644
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -161,17 +161,18 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs_pre=( ) extra fft_opts=( )
+	local acce="AUTO"
 
 	if use custom-cflags; then
 		#go from slowest to fastest acceleration
-		local acce="None"
+		acce="None"
 		if (use amd64 || use x86); then
-		use cpu_flags_x86_sse2 && acce="SSE2"
-		use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-		use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-		use cpu_flags_x86_avx && acce="AVX_256"
-		use cpu_flags_x86_avx2 && acce="AVX2_256"
-		use cpu_flags_x86_avx512f && acce="AVX_512"
+			use cpu_flags_x86_sse2 && acce="SSE2"
+			use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+			use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+			use cpu_flags_x86_avx && acce="AVX_256"
+			use cpu_flags_x86_avx2 && acce="AVX2_256"
+			use cpu_flags_x86_avx512f && acce="AVX_512"
 		elif (use arm); then
 			use cpu_flags_arm_neon && acce="ARM_NEON"
 		elif (use arm64); then
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index f6c3c0293cf7..3580acbb4470 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/foxtrotgps/Manifest b/sci-geosciences/foxtrotgps/Manifest
index 5c4de42a3450..f911d6b6ce64 100644
--- a/sci-geosciences/foxtrotgps/Manifest
+++ b/sci-geosciences/foxtrotgps/Manifest
@@ -1,4 +1,4 @@
-AUX foxtrotgps-1.2.2-fix-some-receivers.patch 1098 BLAKE2B 33591dbe0c0b2d2704ec286535a7043cf8052fb0facccbfb345605edec94cbf8b6b2be7420d1ae0556fc0367d3bfadf4bae9abe8bd7fce3a05618830b66f24a3 SHA512 c3484641c627d518fbf0f12580e690de150c5b196e48e6313c86ac9498fad7572c95645d20c0b6e3587ce68dfdb05fdc7aa0ffb21f5e1bcd969df88fa803457f
+AUX foxtrotgps-1.2.2-fix-some-receivers.patch 1439 BLAKE2B b84bac776f7a55af7ee52d18e960ef1fa1016c811baea874e1f7ce6e73150c0e61d4dd5ed9374d087ac73ee176616328cd8f1ac99045c669248f3a635c7f2856 SHA512 62a0ba6521e423590c22e7391f4f24b8a62044d6aea219356ae7fad3ac3d95d63b34890c53fc18347efed122b96340e3f7e7c525a2de37da13887007cafb08d0
 AUX foxtrotgps-1.2.2-gcc10.patch 591 BLAKE2B fac2f1f2f3ddbde8c1a959c58600183eacde1a541731d50da22c7e8ba5eb4c3bd64d1d5a6b92e6f85001d4bafb4eb0865421e72d9e48108ebf6e2fb2eec3d6e5 SHA512 b9dff10263f033021d89dfba583b7f0f7e34c06c8340126cf36a1d8145b2fd9e449edd64e7a9bb83d058597a8669567cda896521130c6804afc4286c54756e8b
 AUX foxtrotgps-1.2.2-gpsd-api9.patch 1178 BLAKE2B 9ca91432862f1b488b497d44a7252be373d560287c0751363b306dca32d1c21f9de93dfa6987e3b67ff35e340f626943c9c6843b715071e6fe4fdec6e22598b2 SHA512 a2c89485f1bfaa9053a1a8ee47e3803345334a1504ce7a6af2add8dd0ab7d17e9651651263e8141e27f21ab32c3bd5852e96ac42934e6422f9d236782b7b7cd8
 DIST foxtrotgps-1.2.2.tar.xz 1692120 BLAKE2B a8a70948992cd25609189caae3ec4136d056f86c85dc8b6e9610e935f60499f7bd78f083cc3f3e0904ec56eadb492babb7c8016e0270ea3285dadd99b32fcca8 SHA512 57b436221698fd81e58052f847e19999783e8dd1a165b196c80616591f22b36896454a87dd5a3c2c25bdd4654b8110dc0f320f70f0592ed58210fcc0be98f2ff
diff --git a/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch
index 23930212f31f..76d0c2d04a6d 100644
--- a/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch
+++ b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch
@@ -1,33 +1,41 @@
-From ea27c684924b8d8a560ca6fe1f25443624d54a93 Mon Sep 17 00:00:00 2001
+https://bugs.gentoo.org/739568
+https://bugs.gentoo.org/806986
+https://bugs.gentoo.org/808883
+https://bugs.gentoo.org/818268
+
+From 86989085a3010cb83a094a788cd83a4654c9eb3c Mon Sep 17 00:00:00 2001
 From: Sam James <sam@gentoo.org>
 Date: Wed, 18 Aug 2021 20:18:03 +0100
-Subject: [PATCH] Fix some GPS receivers
+Subject: [PATCH] Fix some GPS receivers (and fix build with newer gpsd API 12)
 
 Rebased version of upstream patch:
 https://bazaar.launchpad.net/~foxtrotgps-team/foxtrotgps/trunk/revision/329
 
-Conservatively added an extra API version check for gpsd.
+See https://github.com/ntpsec/gpsd/commit/d4a4d8d3606fd50f10bcd20096a8a0cdb8b2d427
+re API change.
 
 Bug: https://bugs.gentoo.org/808883
 ---
- src/gps_functions.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ src/gps_functions.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/gps_functions.c b/src/gps_functions.c
-index 602b06e..4f30cbb 100644
+index 602b06e..0baea81 100644
 --- a/src/gps_functions.c
 +++ b/src/gps_functions.c
-@@ -762,7 +762,9 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition, gpointer data)
+@@ -762,8 +762,10 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition, gpointer data)
  		{
  			gpsdata->fix.time = (time_t) 0;
  		}
 -#if GPSD_API_MAJOR_VERSION >= 9
-+#if GPSD_API_MAJOR_VERSION >= 10
+-		gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX);
++#if GPSD_API_MAJOR_VERSION >= 12 && defined(STATUS_UNK)
++		gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_UNK || libgps_gpsdata.fix.mode >= MODE_2D);
++#elif GPSD_API_MAJOR_VERSION >= 10
 +		gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX || libgps_gpsdata.fix.mode >= MODE_2D);
-+#elif GPSD_API_MAJOR_VERSION >= 9
- 		gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX);
  #else
  		gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX);
+ #endif
 -- 
-2.33.0
+2.33.1
 
diff --git a/sci-geosciences/gpsprune-bin/Manifest b/sci-geosciences/gpsprune-bin/Manifest
new file mode 100644
index 000000000000..bd68039bea7c
--- /dev/null
+++ b/sci-geosciences/gpsprune-bin/Manifest
@@ -0,0 +1,3 @@
+DIST gpsprune_20.4.jar 1269002 BLAKE2B 616e19f69ce81d26c68714240beae154d66e181067385fa35e0c790c7614d9ec6a1a672d67494c96c443d4c30b20fc7122d2a88f8608ca407f5f5b22fa0cf8e6 SHA512 78347793982e8e39f9747a20d1f366376bed93099c84f2e168dc3ffdee041ff7c3e90e48d3f076637d83f8f5f1e84bd18dbe2a35bef68ce972a4f541315a2f64
+EBUILD gpsprune-bin-20.4.ebuild 1561 BLAKE2B a88e3f7e2c65593cd48f3bd0cc22041dbcd1d37f275c302dfabc9002a7bff6c80c0391086de3f85eed4e60ec636df7fe2e9761cafc9e44dbd62f4cf716be9729 SHA512 548a972c3995249d694f460b93ba8837e182e60b7b2a47acaeef9eac2446ffed44f0d97f72b34031e09dacec2d2b5d58eb0a2f3885b5cccf43538dfff8546ee2
+MISC metadata.xml 261 BLAKE2B 36ef7307b8c913ceda7118a783c7f0c263e94e804f7c75e34007573f82dcddf62cfd202716bf5fb6e0adcad28a5a453d516f4caf4d2ca2eed6d076c6f7824afb SHA512 c24567fd3f715c867c52662d520fbf423d407a2a364d4ea9e5e66610cabb3728b494610106110abfac2b36554c4ad4b63f640e92f8d1b22bdea512037e461602
diff --git a/sci-geosciences/gpsprune-bin/gpsprune-bin-20.4.ebuild b/sci-geosciences/gpsprune-bin/gpsprune-bin-20.4.ebuild
new file mode 100644
index 000000000000..68975bc30884
--- /dev/null
+++ b/sci-geosciences/gpsprune-bin/gpsprune-bin-20.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="An application for viewing, editing and converting GPS data."
+HOMEPAGE="http://activityworkshop.net/software/gpsprune/index.html"
+SRC_URI="http://activityworkshop.net/software/gpsprune/gpsprune_${PV}.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/jre:*"
+RDEPEND="${DEPEND}"
+
+gpsprune_bin="${WORKDIR}/gpsprune"
+gpsprune_desktop="${WORKDIR}/gpsprune.desktop"
+
+S="${WORKDIR}"
+
+src_prepare()
+{
+	default
+
+	# Provide the necessary files
+	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
+	for size in 128 96 72 64 48 36 32 24 22 16; do
+		mkdir -p "${WORKDIR}/icons/$size"
+		cp "${WORKDIR}/tim/prune/gui/images/window_icon_${size}.png" "${WORKDIR}/icons/$size/gpsprune.png" || die
+	done
+
+	# Generate an executable
+	cat <<-EOF > "${gpsprune_bin}" || die
+	#!/bin/sh
+	java -jar /opt/gpsprune/gpsprune_${PV}.jar \$@
+	EOF
+
+	# Generate a .desktop file
+	cat <<-EOF > "${gpsprune_desktop}" || die
+	[Desktop Entry]
+	Name=GpsPrune
+	Type=Application
+	Comment=Application for viewing, editing and converting coordinate data from GPS systems
+	Exec=gpsprune
+	Icon=gpsprune
+	Categories=Science;Geoscience;
+	EOF
+}
+
+src_install()
+{
+	insinto /opt/gpsprune
+	doins "gpsprune_${PV}.jar"
+	exeinto /usr/bin
+	doexe "${gpsprune_bin}"
+
+	for size in 128 96 72 64 48 36 32 24 22 16; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		doins "icons/${size}/gpsprune.png"
+	done
+
+	insinto /usr/share/applications
+	doins gpsprune.desktop
+}
diff --git a/sci-geosciences/gpsprune-bin/metadata.xml b/sci-geosciences/gpsprune-bin/metadata.xml
new file mode 100644
index 000000000000..382e03b1550d
--- /dev/null
+++ b/sci-geosciences/gpsprune-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina (Zero_Chaos)</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 3cdc35ee0b04..3213fdf1e8bf 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,6 +1,8 @@
 AUX grass-7.8-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c
 AUX grass-7.8.5-bool.patch 4472 BLAKE2B b48a2138b9299e91eb15ebe62f29f0a677dfc690477c2997c36fb5e3261ae64d1d3445b3fb4a241a39c504591b07af121e92f1ef9f9efb3ade01e82974f8955a SHA512 1dc95cddca38ea5e8200176a92bb412f4a3295eae18e770a6db3aa0d8cfbf11116dce1c9970bd03d78ee69d23254d2e85637f0a00208aff7aa428e52d631121b
 DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65
+DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
 EBUILD grass-7.8.5.ebuild 6993 BLAKE2B a772460a6bc1ce8c2b50bd68dafb4b98c0771bab4ed72e99f685064081f7f9e1edb3abfc9fb308579e864f12beb282383029e89455ab73e4c235ebdc5ec81117 SHA512 cf69543c0883fe7d93bedb72280d04ca8055c6659bc84a6016a86c58c273487aba68948c84b6bc5ff3c84223c375d5ac4c32f7ca53dd175c2e19ded5c2a223b6
-EBUILD grass-9999.ebuild 6912 BLAKE2B 7bd4ff92016a41bfc90117141715552cdcba802c108d15de90c2ae94a4df25200e0a5df636e9db5b796fa1620ee2816ce39cbdd86e1e6e9290ced2c41a7c8706 SHA512 5705e43a5087fe307d3d9d1b5551beff4f9b56de9a75757d478d60508faf4be29eb6d1bcae3bcce6a01900ce6a62ba105c9211654ba94b6beacbfeb5b7942edf
+EBUILD grass-7.8.6.ebuild 7051 BLAKE2B 6ec47fc0cd471ceafcfb36a20ec8838d404ee4afc4e4bd6ae128e75f1b0da1664904f66d444d98a8ffd5cc3f56c156bb85f31366ccc6ede3c5d17fbd0f7b22f0 SHA512 45ec6d127211da1f4759a3b27569da68c49c6c26b41e43a9ecd585ca06078cfd163e2a1b13a8e6b2dd6e503209281462e22f7792a9dbeae6de3bc27ad05420c3
+EBUILD grass-9999.ebuild 6892 BLAKE2B 1396540d588329e56f3b9eef76efcdcae283aad5904bf633d8931312fba180c6d498fb967fc4a9f4b459f269fbbaa11ddb166f4ad55a24fc522817c8cde68ff1 SHA512 cf7162d2b39b396d4b701ba0bfd13a01003a98f857756dc62bd55ee5ecea472603f36e7589c2989f0ee066bb644402df74e4303b1e90311f5ce09f045f04497d
 MISC metadata.xml 1165 BLAKE2B 5cfa38c94f3855681ac0f61ae88c58de766eab048601d8c45324f192de975287088ab424030857f4a84ae6eea01fc0e9033ab36c00e679645545cd857722d060 SHA512 58a86942daa71543093c95015366a08f75fa88075330ffda2431e47d93d79f60c8f60b90c05e2a068283045f54db8f8f45dcb36664268a1207e90fa90bd6d63b
diff --git a/sci-geosciences/grass/grass-7.8.6.ebuild b/sci-geosciences/grass/grass-7.8.6.ebuild
new file mode 100644
index 000000000000..3cb671b723e1
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.8.6.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"  # bug 572440
+WANT_AUTOCONF="2.5"
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg
+
+MY_PM=${PN}$(ver_cut 1-2 ${PV})
+MY_PM=${MY_PM/.}
+MY_P=${P/_rc/RC}
+
+DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
+HOMEPAGE="https://grass.osgeo.org/"
+SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7.8.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	opengl? ( X )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=app-admin/eselect-1.2
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	')
+	sci-libs/gdal
+	sys-libs/gdbm
+	sys-libs/ncurses:0=
+	sci-libs/proj
+	sci-libs/xdrfile
+	sys-libs/zlib
+	blas? (
+		virtual/cblas[eselect-ldso(+)]
+		virtual/blas[eselect-ldso(+)]
+	)
+	fftw? ( sci-libs/fftw:3.0= )
+	geos? ( sci-libs/geos )
+	lapack? ( virtual/lapack[eselect-ldso(+)] )
+	liblas? ( sci-geosciences/liblas )
+	mysql? ( dev-db/mysql-connector-c:= )
+	netcdf? ( sci-libs/netcdf )
+	odbc? ( dev-db/unixODBC )
+	opencl? ( virtual/opencl )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	readline? ( sys-libs/readline:0= )
+	sqlite? ( dev-db/sqlite:3 )
+	tiff? ( media-libs/tiff:0= )
+	truetype? ( media-libs/freetype:2 )
+	X? (
+		dev-python/wxpython:4.0
+		x11-libs/cairo[X,opengl?]
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	zstd? ( app-arch/zstd )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? ( dev-lang/swig )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# bug 746590
+	"${FILESDIR}/${PN}-7.8-flock.patch"
+)
+
+pkg_setup() {
+	if use lapack; then
+		local mylapack=$(eselect lapack show)
+		if [[ -z "${mylapack/.*reference.*/}" ]] && \
+			[[ -z "${mylapack/.*atlas.*/}" ]]; then
+			ewarn "You need to set lapack to atlas or reference. Do:"
+			ewarn "   eselect lapack set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	if use blas; then
+		local myblas=$(eselect blas show)
+		if [[ -z "${myblas/.*reference.*/}" ]] && \
+			[[ -z "${myblas/.*atlas.*/}" ]]; then
+			ewarn "You need to set blas to atlas or reference. Do:"
+			ewarn "   eselect blas set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix unversioned python calls
+	sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die
+	sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
+
+	default
+	eautoreconf
+
+	ebegin "Fixing python shebangs"
+	python_fix_shebang -q "${S}"
+	eend $?
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	local ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	if use X; then
+		local WX_BUILD=yes
+		setup-wxwidgets
+	fi
+
+	addwrite /dev/dri/renderD128
+
+	local myeconfargs=(
+		--enable-shared
+		--disable-w11
+		--without-opendwg
+		--with-regex
+		--with-gdal="${EPREFIX}"/usr/bin/gdal-config
+		--with-proj-includes="${EPREFIX}"/usr/include/proj
+		--with-proj-libs="${EPREFIX}"/usr/$(get_libdir)
+		--with-proj-share="${EPREFIX}"/usr/share/proj/
+		$(use_with cxx)
+		$(use_with tiff)
+		$(use_with png)
+		$(use_with postgres)
+		$(use_with mysql)
+		$(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)
+		$(use_with sqlite)
+		$(use_with opengl)
+		$(use_with odbc)
+		$(use_with fftw)
+		$(use_with blas)
+		$(use_with lapack)
+		$(use_with X cairo)
+		$(use_with truetype freetype)
+		$(use_with truetype freetype-includes "${EPREFIX}"/usr/include/freetype2)
+		$(use_with nls)
+		$(use_with readline)
+		$(use_with threads pthread)
+		$(use_with openmp)
+		$(use_with opencl)
+		$(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config)
+		$(use_with X wxwidgets "${WX_CONFIG}")
+		$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
+		$(use_with geos geos "${EPREFIX}"/usr/bin/geos-config)
+		$(use_with X x)
+		$(use_with zstd)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# we don't want to link against embedded mysql lib
+	emake CC="$(tc-getCC)" MYSQLDLIB=""
+}
+
+src_install() {
+	emake DESTDIR="${ED}" \
+		INST_DIR=/usr/$(get_libdir)/${MY_PM} \
+		prefix=/usr/ BINDIR=/usr/bin \
+		install
+
+	pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
+
+	local HTML_DOCS=( docs/html/. )
+	einstalldocs
+
+	# translations
+	if use nls; then
+		insinto /usr/share/locale
+		doins -r locale/.
+	fi
+
+	popd >/dev/null || die
+
+	# link libraries in the ~standard~ place
+	local f file
+	for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do
+		file="${f##*/}"
+		dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file}
+	done
+
+	# link headers in the ~standard~ place
+	dodir /usr/include/
+	dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass
+
+	# fix paths in addons makefile includes
+	local scriptMakeDir="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/
+	for f in "${scriptMakeDir}"/*; do
+		file="${f##*/}"
+		echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
+		sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
+	done
+
+	# get proper folder for grass path in script
+	local gisbase=/usr/$(get_libdir)/${MY_PM}
+	sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\
+GISBASE = os.path.normpath(\"${gisbase}\"):" \
+		-i "${ED}"/usr/bin/${MY_PM} || die
+
+	# get proper fonts path for fontcap
+	sed -i \
+		-e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
+		"${ED}"${gisbase}/etc/fontcap || die
+
+	# set proper python interpreter
+	sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
+os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
+		-i "${ED}"/usr/bin/${MY_PM} || die
+
+	# set proper GISDBASE directory path in the demolocation .grassrc78 file
+	sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
+		-i "${ED}"${gisbase}/demolocation/.grassrc78 || die
+
+	if use X; then
+		local GUI="-gui"
+		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
+		make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
+		doicon -s 48 gui/icons/${PN}-48x48.png
+	fi
+
+	# install .pc file so other apps know where to look for grass
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins grass.pc
+
+	# fix weird +x on tcl scripts
+	find "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
+}
+
+pkg_postinst() {
+	use X && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	use X && xdg_pkg_postrm
+}
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 68ab67f5dad5..965bd4beb28c 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -5,7 +5,6 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"  # bug 572440
-WANT_AUTOCONF="2.5"
 WX_GTK_VER="3.0-gtk3"
 
 inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index d112e541c9ce..7b1ee38cf5f4 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,4 +1,6 @@
 AUX mapserver-7.6.2-proj8.patch 544 BLAKE2B 607130bce382bfb4198d8ef4f45048d1091d842cab29730f85149e7250b9659ebe93ac47b79e2addddbfc480d11c5a30d5f07b91479dedcfc9678d7a69404fb1 SHA512 5b2e2a33027c23e812fbd4c358320980886fd16ea1a127bf8945dff396a1038b79f1a139f304c16469117794d227bf7ce0863caaca85a3be518f3807fcb8ce0d
 DIST mapserver-7.6.2.tar.gz 2715806 BLAKE2B 230e4f52c526d72ac7f46cfe4ef8e547d7ae74c01d75637ad301d4e69b90d301f02ecb8fe7d838c9ee15c022ed7980aa2f9236e08a6daedafb65a2499a9473e5 SHA512 842c2cf891df6c8dc630fac5419caa31701d732a748264f7d5b6cceaf192fa420f1863fdd18cc791a417dcdc800fed5c3e5c43ac688142f32a1a6edda4c9f791
-EBUILD mapserver-7.6.2-r1.ebuild 7112 BLAKE2B 40fa1ca799cf844b29320b78e5ec776dac0b414c9332c08cbcc404b9c925c8851c9abd903456646d637cf58ead3cdf729f2c56fdb0c5525d5bcbab5dda77bd3e SHA512 0acc19957a1cb900b915045507edb652ff57168eb150a1314e44fab41ef6da04b0d29f150aead83ec3e4e87b19d6b64951fa13749ae039a39978acd4258b2e3b
+DIST mapserver-7.6.4.tar.gz 2718735 BLAKE2B 4d9fc6d215a55af32e0cc125f6119e0e477ddc5a5b2dbea6df1cc7e1ffaf6319f3a855329749aa07f1bca88e79a71c67cb2e8bd62e30bd60e44ecc1b8283d4ce SHA512 ccca87b650df3c1784ba82ca4a58960585d72fb4004fcea43c0dcabf03b9617ba51870bc63dbb2238a7eeb8d4337b6ff152587150912a74eeaf4a3e3d2d584ce
+EBUILD mapserver-7.6.2-r1.ebuild 7139 BLAKE2B f3c1edf9684fe5ed5facdaddf7686be91900afcd5733b7c213f30b8abff1cf61937e009d1be4ad45fe2451d82e80be191f33ad610f403242fd586ca04cf0e7e6 SHA512 981ce99b170ebce3d1598e3ffe6cc3e1a6fae5cf4e0c938923506c6338afeb1bc2b47e45774bca8046986075087fed25cd72a384fdc6facff7b1157b638d02de
+EBUILD mapserver-7.6.4.ebuild 7094 BLAKE2B da923b5b442dbcdeb178d0cd11b90fbca9979e419ed678a6e292dbcc40063f888ae66fe57e01fb03ecc4d5c0727a5ab4a4f556096cf0be9ca713e530fef94422 SHA512 e951a58133f85b14fec7fbba72fea7c8e6882371b413a6fd2d12b107c8db7cf380f401bb1c25b72415147dac77be22e0778d7106235c830e802540c97b8246ad
 MISC metadata.xml 497 BLAKE2B b0517aa597d42116849e9f7ecdbf2cb2b479f5c57c7f0fe413dab870555abe82ac5dc07c624cabf769bfd2332300f2860e40cfd1ed375bafa109a347b670232b SHA512 3d58797fb05f9c45359e9ac2302a2432e9b61d300f1c01b27ef562da860311e777b7675b0f162eb2c490cdea0440c9f7b9a3323a89feef01589385ec30a5b64d
diff --git a/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
index b6827ae663d0..090466afc3ca 100644
--- a/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
@@ -7,6 +7,7 @@ EAPI=7
 PHP_EXT_OPTIONAL_USE="php"
 PHP_EXT_NAME="php_mapscriptng"
 PHP_EXT_SKIP_PHPIZE="yes"
+PHP_EXT_SKIP_PATCHES="yes"
 
 USE_PHP="php7-3 php7-4"
 PYTHON_COMPAT=( python3_{7,8,9} )
diff --git a/sci-geosciences/mapserver/mapserver-7.6.4.ebuild b/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
new file mode 100644
index 000000000000..4a23194cd84a
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Variables for the miscellaneous bindings we provide
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_NAME="php_mapscriptng"
+PHP_EXT_SKIP_PHPIZE="yes"
+PHP_EXT_SKIP_PATCHES="yes"
+
+USE_PHP="php7-3 php7-4"
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+WEBAPP_MANUAL_SLOT=yes
+WEBAPP_OPTIONAL=yes
+
+inherit cmake depend.apache perl-functions php-ext-source-r3 python-r1 webapp
+
+DESCRIPTION="Development environment for building spatially enabled webapps"
+HOMEPAGE="https://mapserver.org/"
+SRC_URI="https://download.osgeo.org/mapserver/${P}.tar.gz"
+
+LICENSE="Boost-1.0 BSD BSD-2 ISC MIT tcltk"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+# NOTE: opengl removed for now as no support for it in upstream CMake
+IUSE="apache bidi cairo geos mysql oracle perl php postgis python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Tests:
+# Included tests (tests/*) are seriously outdated
+# Upstream's main test suite (msautotest/*) is not in the release tarball,
+# and upstream sets 'export-ignore' for that directory.
+#
+# The eclasses used normally try to run test suites themselves,
+# or skip if nothing was found.
+# However, because of the php-ext-* eclass usage, this fails and would
+# cause errors running non-existent tests, so we have to restrict here.
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/expat-2.2.8
+	dev-libs/libxml2:2=
+	dev-libs/libxslt[crypt]
+	>=dev-libs/protobuf-c-1.3.2:=
+	>=media-libs/freetype-2.9.1-r3
+	>=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib]
+	>=media-libs/giflib-5.2.1:=
+	>=media-libs/libpng-1.6.37:=
+	>=net-misc/curl-7.69.1
+	>=sci-libs/gdal-3.0.4:=[oracle?]
+	>=sci-libs/proj-6.2.1:=
+	virtual/jpeg
+	virtual/libiconv
+	>=x11-libs/agg-2.5-r3
+	apache? (
+		app-admin/webapp-config
+		dev-libs/fcgi
+	)
+	bidi? (
+		dev-libs/fribidi
+		media-libs/harfbuzz:=
+	)
+	cairo? ( x11-libs/cairo )
+	geos? ( sci-libs/geos )
+	mysql? ( dev-db/mysql-connector-c:= )
+	oracle? ( dev-db/oracle-instantclient:=	)
+	perl? ( dev-lang/perl:= )
+	postgis? (
+		dev-db/postgis
+		dev-db/postgresql:=
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	perl? ( >=dev-lang/swig-4.0 )
+	php? ( >=dev-lang/swig-4.0 )
+	python? (
+		>=dev-lang/swig-4.0
+		>=dev-python/setuptools-44.1.0
+	)
+"
+
+want_apache2 apache
+
+pkg_setup() {
+	use apache && webapp_pkg_setup
+	use perl && perl_set_version
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	use php && php-ext-source-r3_src_prepare
+	use python && python_copy_sources
+}
+
+_generate_cmake_args() {
+	# Provides a simple, bare config for bindings to build upon
+	# Need WITH_WMS=ON or build fails
+	local args=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
+		"-DWITH_CAIRO=OFF"
+		"-DWITH_FCGI=OFF"
+		"-DWITH_FRIBIDI=OFF"
+		"-DWITH_GEOS=OFF"
+		"-DWITH_GIF=OFF"
+		"-DWITH_HARFBUZZ=OFF"
+		"-DWITH_ICONV=OFF"
+		"-DWITH_PROTOBUFC=OFF"
+		"-DWITH_POSTGIS=OFF"
+		"-DWITH_WMS=ON"
+		"-DWITH_WCS=OFF"
+		"-DWITH_WFS=OFF"
+	)
+
+	echo "${args[@]}"
+}
+
+src_configure() {
+	# NOTE: We could make this based on _generate_cmake_args, but
+	# then we wouldn't be as-explicit about what is enabled/not,
+	# and reliant on defaults not changing.
+	# Readability and maintainability is better this way.
+	local mycmakeargs=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
+		"-DWITH_CLIENT_WMS=ON"
+		"-DWITH_CLIENT_WFS=ON"
+		"-DWITH_CURL=ON"
+		"-DWITH_GIF=ON"
+		"-DWITH_ICONV=ON"
+		"-DWITH_KML=ON"
+		"-DWITH_LIBXML2=ON"
+		"-DWITH_PHPNG=OFF"
+		"-DWITH_PROTOBUFC=ON"
+		"-DWITH_SOS=ON"
+		"-DWITH_WMS=ON"
+		"-DWITH_WFS=ON"
+		"-DWITH_WCS=ON"
+		"-DWITH_XMLMAPFILE=ON"
+		"-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
+		"-DWITH_CAIRO=$(usex cairo ON OFF)"
+		"-DWITH_FCGI=$(usex apache ON OFF)"
+		"-DWITH_GEOS=$(usex geos ON OFF)"
+		"-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
+		"-DWITH_MYSQL=$(usex mysql ON OFF)"
+		"-DWITH_FRIBIDI=$(usex bidi ON OFF)"
+		"-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
+		"-DWITH_POSTGIS=$(usex postgis ON OFF)"
+		"-DWITH_PERL=$(usex perl ON OFF)"
+	)
+
+	use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" )
+
+	# Configure the standard build first
+	cmake_src_configure
+
+	# Minimal build for bindings
+	# Note that we use _generate_cmake_args to get a clean config each time, then add
+	# in options as appropriate. Otherwise we'd get contamination between bindings.
+	if use python ; then
+		mycmakeargs=(
+			$(_generate_cmake_args)
+			"-DWITH_PYTHON=ON"
+		)
+
+		python_foreach_impl cmake_src_configure
+		python_foreach_impl python_optimize
+	fi
+
+	if use php ; then
+		local slot=
+		for slot in $(php_get_slots) ; do
+			# Switch to the slot's build dir
+			php_init_slot_env "${slot}"
+
+			# Take a blank config each time
+			# Add in only *this* slot's PHP includes dir, etc
+			mycmakeargs=(
+				$(_generate_cmake_args)
+				"-DWITH_PHPNG=ON"
+				"-DPHP_CONFIG_EXECUTABLE=${PHPCONFIG}"
+				"-DPHP_INCLUDES=${PHPPREFIX}"
+			)
+
+			BUILD_DIR="${S}/php${slot}" cmake_src_configure
+
+			# Return to where we left off, in case we add more
+			# to this phase.
+			cd "${S}" || die
+		done
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python ; then
+		python_foreach_impl cmake_src_compile
+	fi
+
+	if use php ; then
+		local slot=
+		for slot in $(php_get_slots) ; do
+			# Switch to the slot's build dir
+			php_init_slot_env "${slot}"
+
+			# Force cmake to build in it
+			BUILD_DIR="${S}/php${slot}" cmake_src_compile
+
+			# Return to where we left off, in case we add more
+			# to this phase.
+			cd "${S}" || die
+		done
+	fi
+}
+
+src_install() {
+	# Needs to be first
+	use apache && webapp_src_preinst
+
+	if use python ; then
+		python_foreach_impl cmake_src_install
+		python_foreach_impl python_optimize
+	fi
+
+	if use php ; then
+		php-ext-source-r3_createinifiles
+
+		local slot=
+		for slot in $(php_get_slots) ; do
+			php_init_slot_env "${slot}"
+
+			BUILD_DIR="${S}/php${slot}" cmake_src_install
+
+			cd "${S}" || die
+		done
+	fi
+
+	# Install this last because this build is the most "fully-featured"
+	cmake_src_install
+
+	if use apache ; then
+		# We need a mapserver symlink available in cgi-bin
+		dosym ../../../../../../../usr/bin/mapserv /usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/mapserv
+		webapp_src_install
+	fi
+}
+
+pkg_preinst() {
+	# We need to cache the value here of HAD_PHP because we want the
+	# original package version, not the result of us installing a new one
+	HAD_PHP=
+	has_version 'sci-geosciences/mapserver[php]' && HAD_PHP=1
+}
+
+pkg_postinst() {
+	use apache && webapp_pkg_postinst
+
+	# Let upgrading (from a pre-rewrite version) users know that the PHP module changed
+	local replacing_version=
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "7.6.0" -gt "${replacing_version}" ; then
+			if use php && [[ ${HAD_PHP} -eq 1 ]] ; then
+				elog "Note that MapServer has deprecated the old PHP extension"
+				elog "You can read more at: "
+				elog "URL: https://mapserver.org/MIGRATION_GUIDE.html#mapserver-7-2-to-7-4-migration"
+				elog "This may involve porting some of your PHP scripts to use the new module."
+			fi
+
+			# Only show the message once
+			break
+		fi
+	done
+}
+
+pkg_prerm() {
+	use apache && webapp_pkg_prerm
+}
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 09c2b64eb75b..8468cade4277 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -6,9 +6,9 @@ DIST qgis-3.20.0.tar.bz2 131619071 BLAKE2B c6644b6e858a38c5b15846d39293d5b92b849
 DIST qgis-3.20.2.tar.bz2 132063211 BLAKE2B 4482cb84e258d26313bab7fd045e3e0fee8541d6857de8f2192a351b51256b94e2c945c4e117d6394ee178c16b8e5a2f15cc1a51f99600e789a32ae14edb9601 SHA512 64d78fe16db1ae17dd22c5f05e83dac4ba50185a1c76e8dfe3205eeb39aa11d970ca59c83db72ff9828dc1610076fceab5a9fc797d6be2314165e95d3d9f2087
 DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91 SHA512 abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
-EBUILD qgis-3.18.3.ebuild 5333 BLAKE2B bc87c4fed5e992e5ff9e87879a77e8b8dcff0808da1faa2ce8755a9e8305e7625ad6b66c5403a618ea8f3454b2349dc9cf5f01393acd6ad40628370841dca45a SHA512 39ba707d2e9daf9766b174b663496200981bf48d306517985be7d8d94175d02f3fe5d19525234cc94f2d36bad3b2d15a779de75046c1b1e611ef04b475cfe029
+EBUILD qgis-3.18.3.ebuild 5334 BLAKE2B d913ed8bc2ebb13f0d3dc61a6a50d1e8895efc557eb4951649591c9e9428f4121136826ea24a017d6c40e154fb21a61de32526309e51a765ddf46774272c7ed0 SHA512 9ab03ed7a1cd3c83392016c0f61ab7f7d38f661a9fbbd3673153dd7ec15e3335b3b0eca98708df3d21bd93a7a7a5602ad12cb8e1901efca0b2c32ce9ac7202f6
 EBUILD qgis-3.20.0-r1.ebuild 5360 BLAKE2B e994dabd1c8cd67cfb0626397c00f383ee5ddab639724a4d9998678e2c73cf07e5065578f8f7b75ceeea777ebf4177e7005a2f092ed9051192736496b55ec825 SHA512 21a5645d6bcf9466f37cf88681d6d75f35b375ae76ec246588a8b206f1fcc4060d43b8988b6eb5c69f92e2ed45a0b7db73ba4e0409b4473befe8a6fdf1c73db2
-EBUILD qgis-3.20.2.ebuild 5405 BLAKE2B c7116b756fd1f40ba49bfebb3db77837f93c1498572e1d932a7e874ee0d10163efdb0781252a9f515936d7ea5d5b0adf065983946dd7beb7927fd10413f3c31a SHA512 aa4faadf0078c7ea8f7a7a958dec0d6af35984e1fdafb61816c5e2aa85a91644d80f6bd295b60504bc630d5a9c0670b3f96066ffb35cf07f375dd86bd09cfd4b
+EBUILD qgis-3.20.2.ebuild 5406 BLAKE2B 18e5609b1263927d2b1f0f1ed8712dd8ad719267ad595206f95e1774d398f42b09521ae96b69bce0839693eca54777b92f33280c250330a95cd9c7472c1f87c1 SHA512 debe458992dee9469651793e442b1452504fa30442c9e82c2b52cf1c6702e47a0545930a2c97225422ec171695652f665015f26096efc94fd761f188a833a499
 EBUILD qgis-3.20.3.ebuild 5407 BLAKE2B 3cddce4905a0f00a26469a02fe24960b6125c986e9a975ee793d9661f2b4af4f5754303e29166ed51057f4e86cf338c3e9c6f0cf25c62dd5f19efd7f47b8ea19 SHA512 58f769971c285e20d64c74b52e8baceed9475ea7ea07951b9959b5054db1c9af815183c516e499fa1a5dfa0b5deb47bd2c07ee629f58b991f1552fc496090cfd
 EBUILD qgis-9999.ebuild 5407 BLAKE2B 3cddce4905a0f00a26469a02fe24960b6125c986e9a975ee793d9661f2b4af4f5754303e29166ed51057f4e86cf338c3e9c6f0cf25c62dd5f19efd7f47b8ea19 SHA512 58f769971c285e20d64c74b52e8baceed9475ea7ea07951b9959b5054db1c9af815183c516e499fa1a5dfa0b5deb47bd2c07ee629f58b991f1552fc496090cfd
 MISC metadata.xml 1483 BLAKE2B 7e376bf280c7004be4e1122616586c105c0eef696e787586736f19565e8df31d994d3b4fddde3344432adf1ffb99afaac2acfe1f70cd5cd8ee5344fe1f65dc48 SHA512 cbc63fa480c07625e1e6317fcc98dababb209ee65a9aa461ab1897aab861df7d5db0cad9f4a20e8787c11ea6300f90f73706bf7ca7dc65965681731ac23cff1c
diff --git a/sci-geosciences/qgis/qgis-3.18.3.ebuild b/sci-geosciences/qgis/qgis-3.18.3.ebuild
index d8e8430113f6..9f48c0bfa4e3 100644
--- a/sci-geosciences/qgis/qgis-3.18.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.18.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]]; then
 else
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 
diff --git a/sci-geosciences/qgis/qgis-3.20.2.ebuild b/sci-geosciences/qgis/qgis-3.20.2.ebuild
index 51cd2ec672ea..c9e0381c5f2e 100644
--- a/sci-geosciences/qgis/qgis-3.20.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 37056209ff63..fd7d8d4658f7 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index f72e695b32e7..eee94cfa80da 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,5 +1,7 @@
 DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d468673c99e036ef9b4a4436be47d24a37664dfa88ff9effa08a4c868bd212d03c204dda09cd26038a0f8ccbf61375 SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd
 DIST armadillo-10.3.0.tar.xz 6214388 BLAKE2B 212d543e8d1845c974cf11302a944a151f63c7f301046910da6b2f27684080df520e5be10f8490a1cc27071ec84b1a91a2431e33960b561c56b291575bb003e8 SHA512 99877ff6581d3effea282d1c4e258883618f4107d84cfe85ed877afc62ba445793e760693c0c6c2113a1822881160cb10adb90087e97b4e31d3a1e64344a6353
+DIST armadillo-10.7.1.tar.xz 6258792 BLAKE2B cc820638dd7b571b5654e14bb82ced3586cb2950b1fb5aebf6bdd9439151353c4750296aaa4d15144ade6ed13e52743ac41e3cf34b824809931c3c031804bddf SHA512 b9be6a38165a4d23a61715a3c3f970dcb9b813bebd51b7372a4e8349ab2c351cd5c74f662d860911b30b2b816f2eb1255768fab1497ec087a63a07f56f74327f
 EBUILD armadillo-10.2.0-r1.ebuild 3485 BLAKE2B 1fe0375dd7c2e12d9698301d64506dab980fc772e45113375cdd1b8de4760545c8530f1b9ae83b53aa25d9b85e8127e046c7e5cc77e4d485383eb4bb4bf5e8e1 SHA512 09bcd99b2d3cca9519cf6e7236f9eef292995aacde116f71539d3e54c016f74e0f3584079bcbfd44bd30820ed6b9cb76433fe19a5a82c5673db0015950ae8650
 EBUILD armadillo-10.3.0-r1.ebuild 3495 BLAKE2B e22dcf3555f066406eb908e430b39a96640b5774adf2265d8b52d6e9af1d605a26db8c5d448a9559fabbbcdc77ad37bd832d55e90f926a4abfad50d8a5a68ebf SHA512 573eeaed666e2270bf56954945359dd57825c389e715480cd1f93d83cb88a5841d2957bfe77727cc88b5e6b93a452304c7d8712a293f5f4cb04cab93991686ec
+EBUILD armadillo-10.7.1.ebuild 3495 BLAKE2B e22dcf3555f066406eb908e430b39a96640b5774adf2265d8b52d6e9af1d605a26db8c5d448a9559fabbbcdc77ad37bd832d55e90f926a4abfad50d8a5a68ebf SHA512 573eeaed666e2270bf56954945359dd57825c389e715480cd1f93d83cb88a5841d2957bfe77727cc88b5e6b93a452304c7d8712a293f5f4cb04cab93991686ec
 MISC metadata.xml 1456 BLAKE2B 52019d7f250025250936fe57ef43e3f1d999eb3eb88949606f6c14e33b99615d3cf33e1073215b805259f2118f571052d40558ee60bddff524475b721b040a37 SHA512 be4692d066e500becba90262b74f17dc97d3c32248bf91aee1ffe2321a0611968855e8806da51f61b5f7e1e32efb541895b29630a302f756ea338aa62cf819c0
diff --git a/sci-libs/armadillo/armadillo-10.7.1.ebuild b/sci-libs/armadillo/armadillo-10.7.1.ebuild
new file mode 100644
index 000000000000..d85588ffb610
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-10.7.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake toolchain-funcs multilib
+
+DESCRIPTION="Streamlined C++ linear algebra library"
+HOMEPAGE="http://arma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack blas doc examples hdf5 lapack mkl superlu test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( lapack )"
+
+#	atlas? ( sci-libs/atlas[lapack] )
+
+RDEPEND="
+	dev-libs/boost
+	arpack? ( sci-libs/arpack )
+	blas? ( virtual/blas )
+	lapack? ( virtual/lapack )
+	superlu? ( >=sci-libs/superlu-5.2 )
+"
+
+DEPEND="${RDEPEND}
+	arpack? ( virtual/pkgconfig )
+	blas? ( virtual/pkgconfig )
+	hdf5? ( sci-libs/hdf5 )
+	lapack? ( virtual/pkgconfig )
+	mkl? ( sci-libs/mkl )
+"
+PDEPEND="${RDEPEND}
+	hdf5? ( sci-libs/hdf5 )
+	mkl? ( sci-libs/mkl )
+"
+
+src_prepare() {
+	# avoid the automagic cmake macros...
+	sed -i -e 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die
+
+	# ... except for mkl, since without a license it's hard to figure out what to do there
+	if use mkl; then
+		sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+	if use arpack; then
+		mycmakeargs+=(
+			-DARPACK_FOUND=ON
+			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
+		)
+	else
+		mycmakeargs+=(
+			-DARPACK_FOUND=OFF
+		)
+	fi
+#	if use atlas; then
+#		local c=atlas-cblas l=atlas-clapack
+#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
+#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
+#		mycmakeargs+=(
+#			-DCBLAS_FOUND=ON
+#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
+#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
+#			-DCLAPACK_FOUND=ON
+#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
+#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
+#		)
+#	fi
+	if use blas; then
+		mycmakeargs+=(
+			-DBLAS_FOUND=ON
+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+		)
+	else
+		mycmakeargs+=(
+			-DBLAS_FOUND=OFF
+		)
+	fi
+	if use hdf5; then
+		mycmakeargs+=(
+			-DDETECT_HDF5=ON
+			-DHDF5_LIBRARIES="-lhdf5"
+			-DHDF5_INCLUDE_DIRS=/usr/include
+		)
+	else
+		mycmakeargs+=(
+			-DDETECT_HDF5=OFF
+		)
+	fi
+	if use lapack; then
+		mycmakeargs+=(
+			-DLAPACK_FOUND=ON
+			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
+		)
+	else
+		mycmakeargs+=(
+			-DLAPACK_FOUND=OFF
+		)
+	fi
+	if use superlu; then
+		mycmakeargs+=(
+			-DSuperLU_FOUND=ON
+			-DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
+			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
+		)
+	else
+		mycmakeargs+=(
+			-DSuperLU_FOUND=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	pushd examples > /dev/null
+	emake \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
+		LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
+	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
+	emake clean
+	popd > /dev/null
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc README.md
+	use doc && dodoc *pdf *html
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index d51b4daac2ad..313c0ef35af1 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -2,5 +2,5 @@ AUX avogadrolibs-1.91.0_pre20180406-bundled-genxrdpattern.patch 1644 BLAKE2B 3b2
 AUX avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch 695 BLAKE2B 40feb1bfe132fe5ddbef435b4d611a55650c0348c943f0796a87fc0761c99c4aebcbc54fb4d29e545c66384ad7352067f3ff5549e9e26bdd2cfe602974f56425 SHA512 7e5198bb3b6c7e83372bd6b54d3f50347ff8519fd24adcb0c59fdc50593be1c08cc2b1d7d12dc530de10c80bfaacad17679a6b1b90ded82947fe94d6dfa51f56
 DIST avogadrolibs-1.93.0.tar.gz 2735862 BLAKE2B b5d696f23aeeab27358ee390a30b2cf146e7119185a0d2e8d71b34d2744e534cd8b50b36d12928b5aa723118db470272b6428514593d64770d172c4bde730cf6 SHA512 1af220e5614cbd96656679c2879cb7f7c46acd135b4e6f2e5f8d0ba98601ce004e78f019a0a71c643f005451309bd194eb73eb9f66707685e5855b47e95f7eae
 DIST linux64-genXrdPattern-avogadrolibs-1.93.0 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
-EBUILD avogadrolibs-1.93.0.ebuild 2422 BLAKE2B 911019bbe695b030064bd0c23159402d22ddfae058f3a7bcbc87427b76616b125ae283ab0ed35afe16d915957f7468974afc74b8dfb8c4ff3bbb976987ea918e SHA512 a360095e50bee771e34c4be736a1afd5ccf6ad4687a8f0294093a18a095cf2bea6ec4443b79bae2e75ae3edcbeb77439af54d3d0d1a32930554727b7d62acdfc
+EBUILD avogadrolibs-1.93.0.ebuild 2647 BLAKE2B df0837f311d0acca43d12920c6d9e34df7e225a59f9ed959ac92c70764a483174693529ea49644fa3355ff30f816b7225dd406a780cb7fef22436e6333e3b1fd SHA512 93453289e331bfd812b3a199df45657ee4815ae137c09a0eece04790bc53b2aafbb39af43b9982ac385dd4833f154925c4146c5dcb29c10d3bba5360235748a6
 MISC metadata.xml 580 BLAKE2B 6947845054474e20335743a41d96511981b4eb0bf9ae1c4ab23cb20fc2ead0dff6055c406ae96604312fe348d636f4b9557e98b051ddcf33ba13e9d68df01045 SHA512 81e34367a52b6d1ce417ce086d11e72e071ca7193862bfac1b6c7e4160716e50aaf40a157f3e05dfd0a18a00388fe39a254332c548e101c478d93aa8b38b8e4c
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
index a2872894639d..4db9d9a0c2b9 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.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
@@ -62,6 +62,11 @@ src_unpack() {
 }
 
 src_configure() {
+	# Seems to be what upstream are using too. Apply the old hdf5lib workaround.
+	# https://github.com/OpenChemistry/avogadrolibs/commit/32e3dd8ce9f48f74e3960dc9afcc614496d87c7f
+	# bug #810505
+	append-cppflags -DH5_USE_110_API
+
 	# -DBUILD_STATIC_PLUGINS=$(usex static-plugins)
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 03fbe4e650d2..bcf168ef5d0d 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,3 +1,5 @@
 DIST cartopy-0.18.0.tar.gz 14191937 BLAKE2B bb10791ef2534dad404cc492e378161a4a078813b09d6e2c16d0d465c7dcfbaa7f24d3818cfe0f1f46e7683bdf2e00440640534835ce064492d5321489e355bc SHA512 912d5ab57c96b9e6c51b3ad26f94d77e495eb9c3a8fb8a68bdd957c11b1bc8a3ddc97e76e0d8a5ec9afca9302b01fe5753f4208ec3829df8741ee0ebbaafe30f
+DIST cartopy-0.19.0.tar.gz 11738107 BLAKE2B 129a32850947e3439505812655b0feb25f33e3b45a909be56a0093cba41acbf777be7e899b528cc910e044fc8844438283eff4d20a1433ab5ea3c58f240efa0f SHA512 5019c752fed18295048cdbe927e28040b61327414262c67c079572969e8ec3abd76f4cb0e6dd1f8ee4cfb88426cbd926ff9a2e934e8d47b8a3180bf748bd7364
 EBUILD cartopy-0.18.0.ebuild 1708 BLAKE2B ba4dccb35ad843290b8ec0cf9433dbb640a1422011589c50e709004388e0b9787771b307789c5787c0b7b98c2081ed7c97dcc4256a52ab882ec42e01ae44adaf SHA512 ed9fb4e0abbab15feb9e4a21a7e4b2c04a4a76bbd0763b9239c4cb4148de894d9f8d048d514f60275388a4ae6e30bdc3d744fca100cdb5838c86f16482eb1c29
+EBUILD cartopy-0.19.0.ebuild 1833 BLAKE2B 97c1bc9e16e40c882a9236294dc06120aa668edd7c467d258276dd2e4486c4acb5c9ad2082ba6c371db70a3760049ad49be1c3d0dcab4f87bb59deabf651ab0a SHA512 35f5d1dce3a2ec606d6b5322329b3a5b8345a7e5ad2d57fb17d485b00193c847e014e96cb94e119d679414408a45530d823e4dc4b6e1ece77bd0ec13847cd086
 MISC metadata.xml 603 BLAKE2B dc4da38fb25d4785362faa8475edb2d3b44aa99c0ce3f3f21ee3c1812a385a715a0d18ece3d58b63e298f997fdebd4762f8395335042bbac6e6fc2aadefee695 SHA512 3fb87e6057c17a7430519fc5e434847cfe13bdf06fa4aab6ed3b6aefe574a078c8750915c65a9d1ed12cecc8c25353e1218aae69dbe0a9e661b9d7499994dea3
diff --git a/sci-libs/cartopy/cartopy-0.19.0.ebuild b/sci-libs/cartopy/cartopy-0.19.0.ebuild
new file mode 100644
index 000000000000..613c5da6a598
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.19.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 virtualx
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Python package for geospatial data processing and analysis"
+HOMEPAGE="https://scitools.org.uk/cartopy"
+SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/pyshp[${PYTHON_USEDEP}]
+	sci-libs/shapely[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
+	sci-libs/gdal[python,${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	sci-libs/geos
+	<sci-libs/proj-8
+"
+
+distutils_enable_tests pytest
+
+DEPEND+="test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/flufl-lock[$PYTHON_USEDEP]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	# drop test file requiring network access, which got not covered by markers
+	rm "${S}"/lib/cartopy/tests/mpl/test_crs.py || die
+	rm "${S}"/lib/cartopy/tests/mpl/test_gridliner.py || die
+	# prepare matplotlib backend for test suite
+	export MPLCONFIGDIR="${T}"
+	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd "${BUILD_DIR}"
+	# drop all tests needing network access
+	virtx pytest -vv -m "not network and not natural_earth" || die "test failed"
+}
diff --git a/sci-libs/cln/Manifest b/sci-libs/cln/Manifest
index 217a90f62e28..0f2105c08dd6 100644
--- a/sci-libs/cln/Manifest
+++ b/sci-libs/cln/Manifest
@@ -1,3 +1,3 @@
 DIST cln-1.3.6.tar.bz2 1330815 BLAKE2B 89ddd0079ac746b262dac01ae0fc1ceb250956c530883d93430e62866e09fdd964c4f96edb21260f9aa40f739450996e1bf21503a30cc02fffaba08a1bd45264 SHA512 a32a1449c5f0edac1444e58f500ef1a72ffab8dad65125082eff0995cc9855b45f38b89c7f754e3d4487756a8cd3f7db1e534865b8d0384fd28246f444ed7d14
-EBUILD cln-1.3.6.ebuild 1215 BLAKE2B ac20e7073ee6094ab8ffc70cc8ccff9ec3d01ea3b64d3fab27aa41d3fc43bfc0fff6f762f34d74feffba78d074dcc13f6f8328ac15985c97471f88a8dc8273de SHA512 c3b4ed1486a26a9d3f42b3f515c6e32aaad4c9bbe11f1ce1890e4f4884f7e70f60de1c54fb371dc00105ece0855e6daf6c33400cce008a4bdc03503716810647
+EBUILD cln-1.3.6.ebuild 1222 BLAKE2B f9d9d50713197cd6e907cda50beb4e913839d2ea7a60f76b3fdef93ab90e2c87cfa3bbe7420e93c7bf6b808175bbc666fd75dff7e6164562680c8ad6c43c83fc SHA512 ccfb34f06148cb1f5d42094077e2213bc30c0cb6d1907537dba17a7d57d800d7e63b1518173940bcd11a24ac4e53be8ffcca120f82a5eff1cc36a11ddddb639b
 MISC metadata.xml 703 BLAKE2B 8385b6d49e14fc8cd29e014a40029040b1d05932d2d6fcb934b324b3c7e6c020d098251e165dda96d960c6b1e624cdbbc7017503054d648f471459cc3c3d53a2 SHA512 cd4540af0eb5dac571c76af2083e3c550b9878b79ca78d2c3fbb4f1133b350431612c0b41caf9b7a26f4208de919c8484c88970e771191eea9c94ae11b237384
diff --git a/sci-libs/cln/cln-1.3.6.ebuild b/sci-libs/cln/cln-1.3.6.ebuild
index 88ac5650e971..bb01f5560a4b 100644
--- a/sci-libs/cln/cln-1.3.6.ebuild
+++ b/sci-libs/cln/cln-1.3.6.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,7 +11,7 @@ SRC_URI="https://www.ginac.de/CLN/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="dev-libs/gmp:0="
diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
index 84ee8ff99876..123e56027cf3 100644
--- a/sci-libs/cxsparse/Manifest
+++ b/sci-libs/cxsparse/Manifest
@@ -1,4 +1,4 @@
 AUX cxsparse-3.2.0-header.patch 531 BLAKE2B 7b8738c26a48aa01541db4978cc195f093da3e5d81536ff5819334ac847cd5d5a0e7ea5d2b1891183015ff449d98ba96ad360c4097369a70adab72a5419c471f SHA512 2340a350af044bcded3a592fde76ee885c02a3047772a02d91bfa0b43e7b6a04d7102893ba8d3e2394435fa6194d767812a3896359581c4d789890d2d35a78e0
 DIST cxsparse-3.2.0.tar.bz2 2080196 BLAKE2B 9b89469c45e518077c4348ad3efd8d89d248e4c039057c0286ee44b493ab595075894d01530cbfbe845b91ef5e43cfbfdd102721cfeefe943a1cb4bc5f171843 SHA512 9931dac5b319b61a39ccb5f34309acb4240602b5f55d029c790ed0b7319a373cb925c4b83994526af4bc5b19b88c723f04581068d1fc80960a290c9d6d1e1aef
-EBUILD cxsparse-3.2.0.ebuild 753 BLAKE2B 1aef0b6e6b6db2116ccfa566909299b0893add76ca93eb333e1e0482949dec774b378aa1edb5336069d909e1332334526e5603491195aabf7a5ceb36ed1277b9 SHA512 cb676f18256b067b035322b0a5f019e613f7b0824d363b25299c2ae4b3ee0a5b9fc5655faff56a3a4f8aba2c43dbc4e8c5ffade537e02b14557e1f64e4cbba80
+EBUILD cxsparse-3.2.0.ebuild 760 BLAKE2B 3be49112e69ffcbf2cf8baecc1c6d3a80bf612309f95d2602ad958358ddfcd6c08f4d5b84860942419dbe80925b460fec8c0233f50e3b1e6199d07401b533ddb SHA512 42bf362643a01cb8b7b4543efc9e9137a2c1c576b1c9c9f9a2931cee914a40a1a9a723ae7ebc1af5fd3a2f9d062a6c7c297c8dd81843b5915bf6e5b2d1d8a188
 MISC metadata.xml 450 BLAKE2B 06f645dd4abefdc2442fd56a7b4ba79ad4251e39e58938b53f848c68736e7cad82f7d1ca268106034e66ceb900dcd1fb91ba110a19ee08eca5409e19e37e104a SHA512 ba5b18e97e038f65590e260a0a5fbf3e933736a316b2ad764e07d2b6acb0bc2a010cfdd7f132e303f3abef5f853f9f62cd8653d5114e6e7dd159b0aff05a37f5
diff --git a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
index fa44cb7a77cd..f52f3c13d2d4 100644
--- a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
+++ b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=sci-libs/suitesparseconfig-5.4.0[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 5cff134ac254..7015bdf45ff7 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -15,5 +15,5 @@ EBUILD gdal-3.2.2.ebuild 7723 BLAKE2B 1223e7a57447dc0e948abe14863417b3dc4fbd3154
 EBUILD gdal-3.2.3.ebuild 7728 BLAKE2B 781ae5b6c49720232778e17c4f8e814961d4d14d3694cef31f19ab2d2b775fe376459aadc5e2dbb0bafda3ab31e99d667ee2805401ca28af03cdc610c477ad59 SHA512 d615affabf2762783d899264863297b5bae4e10956bdbb297f4aa0102298babbae0ab9400c0cecae1fd017f36787ce29b70d357e8ee3d6b471216291fb60a904
 EBUILD gdal-3.3.0.ebuild 7695 BLAKE2B 5e8638c7baa7d50e7e87d9a845712171151bfd1d2a5a1cc4bb3e004f7ab58a50916ed4d88db363dff71058317ed81d14b552de685e091e7b198e645126190b33 SHA512 618f06c7f1ef77c55f0309d55ed7f93ce77daf36faccf4f6ab19559c4e2536c3d21ad31b063358efe8aa3ba4079e7dbccbb26adbe6f7908f6ba0d33e8588cb09
 EBUILD gdal-3.3.1.ebuild 7639 BLAKE2B 652fd54f5831da35e2c1c72e2a4f426aa35e3f0ff229c86206f3b46837819c58906bb9430505ce43ef84bdd9574ce8ae51f8c17e03eb0608bc4777fd8dce5996 SHA512 50d16549833be758b5e25bb689ed9f4d45d52dbf8b581fd323f2c50f0e228552e8fffdc6440c9b78102cc567e448f2a63c60a56a706737e3b2b8ac2039fd9a90
-EBUILD gdal-3.3.2.ebuild 7689 BLAKE2B 84fd125cdf4a06cded33ec93147816e0a5aebc2a85a84f7a4c577d1e9a501475fe5a78fd0f5ed212907bf751b7f479f8073a277a5ab4746886a5e3dea87d986d SHA512 298ccb2e24c1823d692f0f03c30e5856f62246bec9c22a70547a53e3a14f337066489c7e8b9ad89f084c2503cdc8905638b9e166012ee74dc24091bf46211208
-MISC metadata.xml 1496 BLAKE2B c1a8afb6d3d7d4626fd7dad8e35f2628187b68aa2e4948515fd3f2a4e6e4f230a7476bb95b62dfce6f2e1897b77a1045c0eaf441d12d5f1056d5d7ad180e6f58 SHA512 f57bc301b23541e356b7c2336779e654e76b12bc727bb17051c392823d794d7bca028d8a330f55b779a011e8161cccdf96b041b7970b51d5dcdd541518b4a966
+EBUILD gdal-3.3.2-r1.ebuild 7742 BLAKE2B 13f29567e52ef6d8e8d5b82a3675739fb0284e4d65984d15be7865280892f9e0ead777dba9f687b0e7fd25d10bd4e6c3fe7a7895283a5df629ef64341affafe2 SHA512 d414f487b9490249d7feb54bc0fae8e471f5eb7036535c248124f2d88c716127459e4c8ed7af2b70e54f38c5462f8b81c6569f67fc7a1f19693e65119b5a01b5
+MISC metadata.xml 1623 BLAKE2B af7c9d5cc3c16ffef6fa9ef5dd5cf54ffcd34229d1e82b90e310f9eeccf5a5b4fa2119112b5427b520ce6e964e368aef7313edb3837940bed4b960ced7714fc3 SHA512 ed206877adac0b8b190e0edfb04f48c435d698fd523a14d54a14638b908c9e9452b1a2d394046093f5aa86cb48c611790f56ae511807855eb80bfcd4cc1d425c
diff --git a/sci-libs/gdal/gdal-3.3.2-r1.ebuild b/sci-libs/gdal/gdal-3.3.2-r1.ebuild
new file mode 100644
index 000000000000..75f85938c60c
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.3.2-r1.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_OPTIONAL=1
+inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0/3.3"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+
+REQUIRED_USE="
+	mdb? ( java )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	spatialite? ( sqlite )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	java? (
+		dev-java/ant-core
+		dev-lang/swig:0
+		>=virtual/jdk-1.8:*
+	)
+	perl? ( dev-lang/swig:0 )
+	python? (
+		dev-lang/swig:0
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-libs/expat
+	dev-libs/json-c:=
+	dev-libs/libpcre
+	dev-libs/libxml2:2
+	dev-libs/openssl:=
+	media-libs/tiff
+	>=sci-libs/libgeotiff-1.5.1-r1:=
+	>=sci-libs/proj-6.0.0:=
+	sys-libs/zlib[minizip(+)]
+	armadillo? ( sci-libs/armadillo:=[lapack] )
+	curl? ( net-misc/curl )
+	fits? ( sci-libs/cfitsio:= )
+	geos? ( >=sci-libs/geos-3.8.0 )
+	gif? ( media-libs/giflib:= )
+	gml? ( >=dev-libs/xerces-c-3.1 )
+	heif? ( media-libs/libheif:= )
+	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+	jpeg? ( virtual/jpeg:0= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
+	mdb? ( dev-java/jackcess:1 )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	ogdi? ( sci-libs/ogdi )
+	opencl? ( virtual/opencl )
+	oracle? ( dev-db/oracle-instantclient:= )
+	pdf? ( app-text/poppler:= )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	spatialite? ( dev-db/spatialite )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+	xls? ( dev-libs/freexl )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.3-soname.patch"
+	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+	"${FILESDIR}/${PN}-3.3.0-libdir.patch"
+	"${FILESDIR}/${P}-poppler-21.10.0.patch"
+)
+
+src_prepare() {
+	default
+
+	# Drop a --prefix hack in the upstream build system
+	# We don't want the line at all, so let's just drop it rather than
+	# trying to put in the right libdir value.
+	# bug #696106
+	sed -e '/\$ADD_PREFIX\/lib/d' \
+		-i configure.ac || die
+
+	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+		-i configure.ac || die
+
+	sed -e 's:^ar:$(AR):g' \
+		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+	# SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
+	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
+		-i swig/python/GNUmakefile || die "sed python makefile failed"
+
+	# autoconf 2.70+
+	# bug #775209
+	config_rpath_update .
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# charls - not packaged in Gentoo ebuild repository
+		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+		# bsb - legal issues
+		# ingres - same story as oracle oci
+		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
+		# podofo - we use poppler instead they are exclusive for each other
+		# tiff is a hard dep
+		--includedir="${EPREFIX}"/usr/include/${PN}
+		--disable-lto
+		--disable-static
+		--disable-driver-bsb
+		--disable-driver-mrf
+		--disable-pdf-plugin
+		--enable-shared
+		--enable-driver-grib
+		--with-bash-completion="$(get_bashcompdir)"
+		--with-cpp14
+		--with-crypto
+		--with-cryptopp=no
+		--with-expat
+		--with-geotiff
+		--with-gnm
+		--with-hide-internal-symbols
+		--with-libjson-c="${EPREFIX}"/usr
+		--with-libtiff
+		--with-libtool
+		--with-libz="${EPREFIX}"/usr
+		--without-charls
+		--without-dods-root
+		--without-ecw
+		--without-fgdb
+		--without-fme
+		--without-gta
+		--without-grass
+		--without-hdf4
+		--without-idb
+		--without-ingres
+		--without-jasper
+		--without-jp2lura
+		--without-jp2mrsid
+		--without-kakadu
+		--without-kea
+		--without-libkml
+		--without-mongocxx
+		--without-mrsid
+		--without-mrsid_lidar
+		--without-msg
+		--without-rasdaman
+		--without-rasterlite2
+		--without-pcraster
+		--without-pdfium
+		--without-perl
+		--without-podofo
+		--without-python
+		--without-qhull
+		--without-sfcgal
+		--without-sosi
+		--without-teigha
+		$(use_enable debug)
+		$(use_with armadillo)
+		$(use_with aux-xml pam)
+		$(use_with curl)
+		$(use_with cpu_flags_x86_avx avx)
+		$(use_with cpu_flags_x86_sse sse)
+		$(use_with cpu_flags_x86_ssse3 ssse3)
+		$(use_with fits cfitsio)
+		$(use_with geos)
+		$(use_with gif)
+		$(use_with gml xerces)
+		$(use_with heif)
+		$(use_with hdf5)
+		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
+		$(use_with jpeg)
+		$(use_with jpeg2k openjpeg)
+		$(use_with lzma liblzma)
+		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
+		$(use_with netcdf)
+		$(use_with oracle oci)
+		$(use_with odbc)
+		$(use_with ogdi ogdi "${EPREFIX}"/usr)
+		$(use_with opencl)
+		$(use_with pdf poppler)
+		$(use_with png)
+		$(use_with postgres pg)
+		$(use_with spatialite)
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+		$(use_with threads)
+		$(use_with webp)
+		$(use_with xls freexl)
+		$(use_with zstd)
+	)
+
+	tc-export AR RANLIB
+
+	if use java; then
+		myconf+=(
+			--with-java=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-lib=dlopen
+			$(use_with mdb)
+		)
+	else
+		myconf+=( --without-java --without-mdb )
+	fi
+
+	if use sqlite; then
+		append-libs -lsqlite3
+	fi
+
+	# bug #632660
+	if use ogdi; then
+		append-cflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+		append-cxxflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# mysql-config puts this in (and boy is it a PITA to get it out)
+	if use mysql; then
+		sed -e "s: -rdynamic : :" \
+			-i GDALmake.opt || die "sed LIBS failed"
+	fi
+}
+
+src_compile() {
+	if use perl; then
+		rm "${S}"/swig/perl/*_wrap.cpp || die
+		emake -C "${S}"/swig/perl generate
+	fi
+
+	# gdal-config needed before generating Python bindings
+	default
+
+	if use java; then
+		pushd "${S}"/swig/java > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+
+	if use perl; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null || die
+	fi
+
+	if use python; then
+		rm -f "${S}"/swig/python/*_wrap.cpp || die
+		emake -C "${S}"/swig/python generate
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+
+	use doc && emake docs
+}
+
+src_install() {
+	local DOCS=( NEWS )
+	use doc && local HTML_DOCS=( html/. )
+
+	default
+
+	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
+
+	if use perl; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		myinst=( DESTDIR="${D}" )
+		perl-module_src_install
+		popd > /dev/null || die
+		perl_delete_localpod
+	fi
+
+	if use python; then
+		# Don't clash with gdal's docs
+		unset DOCS HTML_DOCS
+
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+
+		newdoc swig/python/README.rst README-python.rst
+	fi
+
+	doman "${S}"/man/man*/*
+	find "${ED}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-libs/gdal/gdal-3.3.2.ebuild b/sci-libs/gdal/gdal-3.3.2.ebuild
deleted file mode 100644
index 216917c266d1..000000000000
--- a/sci-libs/gdal/gdal-3.3.2.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{8,9,10} )
-DISTUTILS_OPTIONAL=1
-inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="https://gdal.org/"
-SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/3.3"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
-
-REQUIRED_USE="
-	mdb? ( java )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	java? (
-		dev-java/ant-core
-		dev-lang/swig:0
-		>=virtual/jdk-1.8:*
-	)
-	perl? ( dev-lang/swig:0 )
-	python? (
-		dev-lang/swig:0
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libpcre
-	dev-libs/libxml2:2
-	dev-libs/openssl:=
-	media-libs/tiff
-	>=sci-libs/libgeotiff-1.5.1-r1:=
-	>=sci-libs/proj-6.0.0:=
-	sys-libs/zlib[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-3.8.0 )
-	gif? ( media-libs/giflib:= )
-	gml? ( >=dev-libs/xerces-c-3.1 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lzma? ( || (
-		app-arch/xz-utils
-		app-arch/lzma
-	) )
-	mdb? ( dev-java/jackcess:1 )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	opencl? ( virtual/opencl )
-	oracle? ( dev-db/oracle-instantclient:= )
-	pdf? ( app-text/poppler:= )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	spatialite? ( dev-db/spatialite )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-	xls? ( dev-libs/freexl )
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-	"${FILESDIR}/${PN}-3.3.0-libdir.patch"
-	"${FILESDIR}/${P}-poppler-21.10.0.patch"
-)
-
-src_prepare() {
-	default
-
-	# Drop a --prefix hack in the upstream build system
-	# We don't want the line at all, so let's just drop it rather than
-	# trying to put in the right libdir value.
-	# bug #696106
-	sed -e '/\$ADD_PREFIX\/lib/d' \
-		-i configure.ac || die
-
-	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.ac || die
-
-	sed -e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
-	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-i swig/python/GNUmakefile || die "sed python makefile failed"
-
-	# autoconf 2.70+
-	# bug #775209
-	config_rpath_update .
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		# charls - not packaged in Gentoo ebuild repository
-		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-		# bsb - legal issues
-		# ingres - same story as oracle oci
-		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
-		# podofo - we use poppler instead they are exclusive for each other
-		# tiff is a hard dep
-		--includedir="${EPREFIX}"/usr/include/${PN}
-		--disable-lto
-		--disable-static
-		--disable-driver-bsb
-		--disable-driver-mrf
-		--disable-pdf-plugin
-		--enable-shared
-		--enable-driver-grib
-		--with-bash-completion="$(get_bashcompdir)"
-		--with-cpp14
-		--with-crypto
-		--with-cryptopp=no
-		--with-expat
-		--with-geotiff
-		--with-gnm
-		--with-hide-internal-symbols
-		--with-libjson-c="${EPREFIX}"/usr
-		--with-libtiff
-		--with-libtool
-		--with-libz="${EPREFIX}"/usr
-		--without-charls
-		--without-dods-root
-		--without-ecw
-		--without-fgdb
-		--without-fme
-		--without-gta
-		--without-grass
-		--without-hdf4
-		--without-idb
-		--without-ingres
-		--without-jasper
-		--without-jp2lura
-		--without-jp2mrsid
-		--without-kakadu
-		--without-kea
-		--without-libkml
-		--without-mongocxx
-		--without-mrsid
-		--without-mrsid_lidar
-		--without-msg
-		--without-rasdaman
-		--without-rasterlite2
-		--without-pcraster
-		--without-pdfium
-		--without-perl
-		--without-podofo
-		--without-python
-		--without-qhull
-		--without-sfcgal
-		--without-sosi
-		--without-teigha
-		$(use_enable debug)
-		$(use_with armadillo)
-		$(use_with aux-xml pam)
-		$(use_with curl)
-		$(use_with cpu_flags_x86_avx avx)
-		$(use_with cpu_flags_x86_sse sse)
-		$(use_with cpu_flags_x86_ssse3 ssse3)
-		$(use_with fits cfitsio)
-		$(use_with geos)
-		$(use_with gif)
-		$(use_with gml xerces)
-		$(use_with hdf5)
-		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
-		$(use_with jpeg)
-		$(use_with jpeg2k openjpeg)
-		$(use_with lzma liblzma)
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
-		$(use_with netcdf)
-		$(use_with oracle oci)
-		$(use_with odbc)
-		$(use_with ogdi ogdi "${EPREFIX}"/usr)
-		$(use_with opencl)
-		$(use_with pdf poppler)
-		$(use_with png)
-		$(use_with postgres pg)
-		$(use_with spatialite)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-		$(use_with threads)
-		$(use_with webp)
-		$(use_with xls freexl)
-		$(use_with zstd)
-	)
-
-	tc-export AR RANLIB
-
-	if use java; then
-		myconf+=(
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-lib=dlopen
-			$(use_with mdb)
-		)
-	else
-		myconf+=( --without-java --without-mdb )
-	fi
-
-	if use sqlite; then
-		append-libs -lsqlite3
-	fi
-
-	# bug #632660
-	if use ogdi; then
-		append-cflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
-		append-cxxflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -e "s: -rdynamic : :" \
-			-i GDALmake.opt || die "sed LIBS failed"
-	fi
-}
-
-src_compile() {
-	if use perl; then
-		rm "${S}"/swig/perl/*_wrap.cpp || die
-		emake -C "${S}"/swig/perl generate
-	fi
-
-	# gdal-config needed before generating Python bindings
-	default
-
-	if use java; then
-		pushd "${S}"/swig/java > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-
-	if use perl; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-
-	if use python; then
-		rm -f "${S}"/swig/python/*_wrap.cpp || die
-		emake -C "${S}"/swig/python generate
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-
-	use doc && emake docs
-}
-
-src_install() {
-	local DOCS=( NEWS )
-	use doc && local HTML_DOCS=( html/. )
-
-	default
-
-	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
-
-	if use perl; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		myinst=( DESTDIR="${D}" )
-		perl-module_src_install
-		popd > /dev/null || die
-		perl_delete_localpod
-	fi
-
-	if use python; then
-		# Don't clash with gdal's docs
-		unset DOCS HTML_DOCS
-
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		newdoc swig/python/README.rst README-python.rst
-	fi
-
-	doman "${S}"/man/man*/*
-	find "${ED}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/gdal/metadata.xml b/sci-libs/gdal/metadata.xml
index f505485ec713..ba24c3b77d31 100644
--- a/sci-libs/gdal/metadata.xml
+++ b/sci-libs/gdal/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag>
 		<flag name="geos">Add support for geometry engine (<pkg>sci-libs/geos</pkg>)</flag>
 		<flag name="gml">Enable support for <pkg>dev-libs/xerces-c</pkg> C++ API</flag>
+		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
 		<flag name="mdb">Enable support for Microsoft Access database</flag>
 		<flag name="ogdi">Enable support for the open geographic datastore interface (<pkg>sci-libs/ogdi</pkg>)</flag>
 		<flag name="opencl">Enable OpenCL support</flag>
diff --git a/sci-libs/h5hut/Manifest b/sci-libs/h5hut/Manifest
index 6c9d460379f7..86795017b301 100644
--- a/sci-libs/h5hut/Manifest
+++ b/sci-libs/h5hut/Manifest
@@ -1,5 +1,5 @@
 AUX h5hut-1.99.13-autotools.patch 2809 BLAKE2B de8b47ec4dd418cd3c6e5c7670c11fb913c40d92a6ad9dbd75125443e5e827fecb4d21b5551f69355c5da6acb2159a095f448c2e063ac5014138de3321b830f8 SHA512 05200ef8073c1c39e322015e9d4b9764c470336f704c8f86e056d1936de669f256c64baf94307d84f4574d1204f914abffa9b134942e354f474c51dc0b78c05c
 AUX h5hut-1.99.13-mpio.patch 574 BLAKE2B 063729a01cd992fab481871210e0f6c63f2b93cd8f41e7ee11d84e2572e46945b1934a52514376700c4f4e25b142279591698f53067b9398f1290113be5e3399 SHA512 9335f2d84c4353123e1c1af5f82a729322cacd6f0bfa95ccbe042b76693f035c5b2860d788d31063299e3705addd6160b4b985be88beba341bee56a397387919
 DIST H5hut-1.99.13.tar.gz 3029357 BLAKE2B 555d1f89ff60fbd72763026643ae76d5f68bb9d76bfd2fb29d846e3c777184db3be1bae98763ae683e72566e2624678118eea0da8d0bc1e57b84fd0b4777abe7 SHA512 c2590795c45ecf5e642308f5b36c4e573fdcbb6e985f5867c13fd9e1f0ddd9b48fbc423ad0165b8f047256e42a1eb54d508c9322a593bcfad3a2769547d2887a
-EBUILD h5hut-1.99.13.ebuild 726 BLAKE2B 6e19142b2f82e849dae6259b10ac59c379047c8e65862403fc36c7ef871a4af891fc4a3d626d3ebceba2ed7f6399b366e0f9ebb10cdb04d71626735adb803962 SHA512 1c89b5d2554f5aa1e0365d1591fcf76632fd965a0db6ca580b1be26f23761f617530fb01d554bcdf27c259858bc02e9cd263a189bf5beebec9b678bc42fa255b
+EBUILD h5hut-1.99.13-r1.ebuild 790 BLAKE2B 09575e246784c9824cf00cc85660544a9c6edfe280677bdaae9531491a793e0af2e2dfdfc146dd90417a32d1c7c60dfbea4af05d2c469db8625b7428446dd558 SHA512 5541f0e4b059dfb8e77b0aface99028545b5e89459784186de315fd3b4866c9021ece71f6df28ba83ca1168a6aa8aa9eb23c95f8e24064d02edb528085a469f5
 MISC metadata.xml 368 BLAKE2B 41a4fdcd35d6ab16960378ea85a83bd575875f47efd542967a0385dc259237dc774d0af238546b1a68f105e5181d4d96e441ef6e8a25d0e7c9ba40a0634a7c2f SHA512 728a27ced9c287be3b8647603d958330416cb601eb28c974d1b6ed95a8b611141ff272792cb2a098d931f9743f7a9cade84369017c982fd1a3bbdeeb69c1a02d
diff --git a/sci-libs/h5hut/h5hut-1.99.13-r1.ebuild b/sci-libs/h5hut/h5hut-1.99.13-r1.ebuild
new file mode 100644
index 000000000000..8401f6468846
--- /dev/null
+++ b/sci-libs/h5hut/h5hut-1.99.13-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="${P^h}"
+DESCRIPTION="High-Performance I/O Library for Particle-based Simulations"
+HOMEPAGE="http://www-vis.lbl.gov/Research/H5hut/"
+SRC_URI="https://amas.psi.ch/H5hut/raw-attachment/wiki/DownloadSources/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# < dep on hdf5 because of bug #809221
+# Needs a proper fix.
+DEPEND="
+	virtual/mpi
+	<sci-libs/hdf5-1.12[mpi]
+	"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-mpio.patch"
+	"${FILESDIR}/${P}-autotools.patch"
+	)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-parallel --enable-shared --disable-static CC=mpicc CXX=mpicxx
+}
diff --git a/sci-libs/h5hut/h5hut-1.99.13.ebuild b/sci-libs/h5hut/h5hut-1.99.13.ebuild
deleted file mode 100644
index 5eca8e34f1dc..000000000000
--- a/sci-libs/h5hut/h5hut-1.99.13.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P="${P^h}"
-DESCRIPTION="High-Performance I/O Library for Particle-based Simulations"
-HOMEPAGE="http://www-vis.lbl.gov/Research/H5hut/"
-SRC_URI="https://amas.psi.ch/H5hut/raw-attachment/wiki/DownloadSources/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	virtual/mpi
-	sci-libs/hdf5[mpi]
-	"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-mpio.patch"
-	"${FILESDIR}/${P}-autotools.patch"
-	)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-parallel --enable-shared --disable-static CC=mpicc CXX=mpicxx
-}
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 0f4a7f6a7ab2..e39490452c26 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -6,6 +6,6 @@ DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2a
 DIST hdf5-1.12.1.tar.bz2 9724309 BLAKE2B cc75ba497188b33972218d02a7601acad1a0443bdb934ecd1641ef5996076fe120e3b72dba3a99d99f919fb4e478d1e531414448de9a7b97a0afde58a4c7c23f SHA512 158a067ee284ccb9e2c4db12e9d37cf187d90d9ef1bed7a6303e2c3a2fd216d7b13a46c5f46018b097511281c4246156b6f917633ca88872f10f0ad04be285fd
 EBUILD hdf5-1.10.5-r1.ebuild 2883 BLAKE2B ddfc519217494eb2f3a2cd2a37f70d9e2005cd049299fbaf2386414db0eac65a2655b39fba85231896cd2f2ef42fd15d57273b77fa53e0d492a889fc6db51fbe SHA512 007a97a089002e330569913ce42afd92b63d659b9d9f4fabe85170d7633950da025cfc55273f564faf1aec52d3ad4c704825cc501bd441d522f65238ff44ad88
 EBUILD hdf5-1.10.5.ebuild 2712 BLAKE2B 56dc60e54a2e3758b32eba9977bb96e67bcdec38670579e985733ecede749f638370bee98959986a76e841c8adf4a92740fae6b8c8ed36e5e0ba2814a2f82537 SHA512 ebf92105b2d149f1947dd0d95b2ef5da85b4d57a51eeb4e5c8d9535e706b06e6c46910ee8671f1d44021636cec71070755aa7d7e62db4f9e1fb39d7e0d7d4fbd
-EBUILD hdf5-1.12.1-r1.ebuild 3158 BLAKE2B 7017b7915fe0b3d489ff261ef54ab8e01cf33a0709a7105272607e84b3347ab469605e3629f874e3f96667c1adce0891901213156ad8e4b8169193787d250941 SHA512 33072c3b6efd4c9d83167961e7a038e0c218be8c1ca66d497751b4b3e8b204422d49223092ef4019db8e2c57f6c0f46db72cdc71398163b46136775317ed89d9
+EBUILD hdf5-1.12.1-r1.ebuild 3379 BLAKE2B c8071ed6c8443f0aa06848eab9d8e5719de69216b200ea588f82e33e7e8dd71c6260e2bf5c1e45cc261e48518a65252b3e7d3a57313be5102f22febe50923d9d SHA512 34c4ec92af1a43f6b8978ebf38360c8372559ee204d9b737560671122879c3818e040f374c735366a45756dd7298d32414b90d07dfb90338209e283275a50a54
 EBUILD hdf5-1.12.1.ebuild 3061 BLAKE2B a21c786534715cbfdb57208a021c6f48ff89417db20490673bb86c362b7065280f810135a6b60ca20d6cbb6a7bcc6f332f64cada97ca8fe25a52bf9e868f905a SHA512 0f809656f7088844eaeca31695877919cf3aae466bf93e1b3c9bd72474712415dca62f39bc51c6e2265c2f64427a5c1274fbb18092d614ee32c0f29d6068c0c9
 MISC metadata.xml 935 BLAKE2B b9195ac707556cdb2ee2c4d032fabd88aad674ad4fa52a60fbeb31c47ae51b9511bb097d4271d19b05d1dbc3b59b3cafb3b7d407bd9b8095bfd449fa8728ab6a SHA512 57c4694ea2c024c7babdf34474a61b92165b6c322fa11ec7fefdf16d66b44f91f66d63eeb355311b121fbeec8da810e393e3e785a4c434ff658c7b4bd7baf22b
diff --git a/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild b/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
index 9a0d092cd1fa..a445755a1291 100644
--- a/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
@@ -67,6 +67,10 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		# Workaround needed to allow build with USE=fortran when an older
+		# version is installed. See bug #808633 and
+		# https://github.com/HDFGroup/hdf5/issues/1027 upstream.
+		-DCMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE=ON
 		-DBUILD_STATIC_LIBS=OFF
 		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
 		-DHDF5_BUILD_EXAMPLES=OFF
diff --git a/sci-libs/htslib/Manifest b/sci-libs/htslib/Manifest
index 7c854624e360..475aad140a52 100644
--- a/sci-libs/htslib/Manifest
+++ b/sci-libs/htslib/Manifest
@@ -1,5 +1,3 @@
-DIST htslib-1.10.2.tar.bz2 1306320 BLAKE2B f877bd9c160921f498f4160f687094a1a369732bc9f61cd94a3c9ca311fa9f865505a205e38e0d348a1010b627f1ef07b590cd7e69c945df1d804133b17b2fd1 SHA512 3ecb83b0abccf731cd42b889e352e10dd922524f6e78bcafb04f8c6c71457b0dc1f5f22690b36f03cce7d97a6a905db286243ef4858138068dcac368e4ae1075
 DIST htslib-1.13.tar.bz2 4226834 BLAKE2B ae1f64e564f0f7bea80ea9d276b5d5b2b04fa3c8bd58f2c68966225b4324962f34d8a26b74267ab90dc530dfced1b9c01702d25918fd7a7c74e13913f00d5007 SHA512 16a3d61c115b71406bc4411a0c1176909166b52c4f7bb11614e398df4defaec4d09763413053e4d0d5916921c866d20019096d8fed866e77f9f1cafbd1e95b16
-EBUILD htslib-1.10.2.ebuild 1041 BLAKE2B 12d35fa9397f441d9e1ee444abca8c56cf87bf16aa2b82b0d6d0bad6ec27546dccdb4b540eaca322f5208eb7c0a6b9f6de5cfa8762641d73a3f40fd8bee5ea47 SHA512 99c54c20f1f01fc243bc7cb25325265e1d959fdc23a3d2db4c2cef29fb9f74cc423835a25d9f5fa1b5af027413caeb6ee8fff2f517ae2dbe8119b80c504b87d9
 EBUILD htslib-1.13.ebuild 1052 BLAKE2B 1d219220299500bce4aaf8927bde67beba02afda02319527cae8f3aa7ccce131a21c0b27e9eaa0ade634d99d910915108abd48385a9686a95795b74733f3c0ce SHA512 3d5bc8e165e27b5a5f1e0d87c7802e65c2de55bc7754cb13d5bcd5f2c211de37ecd81e8ebfa0377158eea196449d9b71858c08372ab73f30614e6e787af47005
 MISC metadata.xml 350 BLAKE2B 6512256a4c692625cb824d90fc8b85942f88db717fd265548b97a5b535158fc65e1f2e74df4ebd3c2a259dfd3a4244a13493fc410b1663b8054b29a14995787d SHA512 926efc676b0619ae901253f2207c8ba948ebe3db560377a55edecd9cd58cd2ec806bcdff875e9c5c9a170921c44818271e8ddd691fe1a84ed651f7aca75265ec
diff --git a/sci-libs/htslib/htslib-1.10.2.ebuild b/sci-libs/htslib/htslib-1.10.2.ebuild
deleted file mode 100644
index 67a341be70e3..000000000000
--- a/sci-libs/htslib/htslib-1.10.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="C library for high-throughput sequencing data formats"
-HOMEPAGE="http://www.htslib.org/"
-SRC_URI="mirror://sourceforge/samtools/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bzip2 curl +lzma"
-
-RDEPEND="
-	bzip2? ( app-arch/bzip2:= )
-	curl? ( net-misc/curl )
-	lzma? ( app-arch/xz-utils:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# upstream injects LDFLAGS into the .pc file,
-	# which is a big nono for QA
-	sed -e '/^\(static_l\|Libs.private\|Requires.private\)/d' \
-		-i htslib.pc.in || die
-}
-
-src_configure() {
-	econf \
-		--disable-gcs \
-		--disable-plugins \
-		--disable-s3 \
-		$(use_enable bzip2 bz2) \
-		$(use_enable curl libcurl) \
-		$(use_enable lzma)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	# doesn't use libtool, can't disable static libraries
-	find "${ED}" -name '*.a' -delete || die
-}
diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest
index 42716af35f6e..bbaa77be9906 100644
--- a/sci-libs/libcifpp/Manifest
+++ b/sci-libs/libcifpp/Manifest
@@ -1,7 +1,10 @@
 DIST components-1.1.1.cif.gz 80378687 BLAKE2B 0776d79f733762ad19177bc93a5587e90966a7862f84174ede23a5875ae4633b519168b24b1c02d7afb30f9049d48434921a70c097a7e8238a5745f1676dcc78 SHA512 fc68513b37871677beb60855e82ed5831e10b08340697a97bbc7113d4c898b8e8382d097d36793346e34b97f0b5def5312fe7eb81ab4f120ad3908ee8d6d1aa3
 DIST components-2.0.0.cif.gz 80878869 BLAKE2B 183c1227f403466fa543575243176d84e72bf224a70500876c77a52f0c8e1af80e99ed8cd8b428c7adc822e7006501a0cfc414e60a2896b1f53b98a116e3e4d8 SHA512 b1212155b8d6c593593013b1b39b9c711e85c1bf9b68d412dda25720ab94d82ace4445f47f832a66901d0ed5773e2d2cc5dde7a9170b9294c506edd6843d6d66
+DIST components-2.0.3.cif.gz 81156388 BLAKE2B 00a70db993a5cea859e9839fa7e76bbe59f7e8568bf4d69c7550fd8b5afbb85c8efc577c3a2d58e1c472ce5658fc9ece874d827ce20d4214377576bab6bf8577 SHA512 2a686161a39383efe0a21da600b51dad125262f04a51c74ab780df06425b657cc487c82e9816ad129997ad1f81c008e60bcb9a23095fa479c7dff2fb3d6df6aa
 DIST libcifpp-1.1.1.tar.gz 978553 BLAKE2B 750cf80bac769a3db86b3be03924402da0254e69206a15222a5dfaa23a7eadcac1f57eb054f2fc783c287bfed86dab0a75d2994b031cc3cd3c2431a26e250d17 SHA512 e74419dada21ea12423c404c34eeb0b410fdb0b26827cd4451375329668909879b6d4795451c6f7c2b2ffc8d282dfcff2f1800630a3487111404335be4cb338f
 DIST libcifpp-2.0.0.tar.gz 996947 BLAKE2B 58568f18b17d79d8f3e2487035b505d814e0343bb56a2b18665651a3788b54d5330309c3c27b6f4636ab5e9bf3f85ebdb1a4fc8ed67adc7941559c481135f873 SHA512 8ca3f0445dad758f7fd63a0039fbe3267420d2b51036cd67a38d925b498c8ac580b86a9900317c63b4705a4a9fc9c3ef1036d40fd3f20f8eff2d6e6e5da7b735
-EBUILD libcifpp-1.1.1.ebuild 797 BLAKE2B 7b1a06a06e05a7f909c5a08e829436ecb3460c1ae82f0c0ca7606a98e91e763ca1f476da5f09bf5982249566843be97533a752ae4b382f148b89a9215ade36db SHA512 6fafc36be05ec5f8a2bc6bbb06af5d43b4a043129a2410e459cce6d09948ee845a3f06415e5517595b7ef47d40a96a6f0aeda39030be2800da7604107868b843
+DIST libcifpp-2.0.3.tar.gz 959697 BLAKE2B 40f04926ec307260ab9d552aa3fa646cd776b48e84c1bf2ca64769b8726f647cd0f3f81da80a2d94b4cd0b26e438106db5626319a245c769a56f42ab32273d03 SHA512 7d0ebf70be1a1debe22a0dc2404b78c766d1d263ed556c47a9b77da510f1a8112d0a5ff61706f697245916534900e2791ef2b927b439cbecda6558c84c133a0e
+EBUILD libcifpp-1.1.1.ebuild 802 BLAKE2B b1687027d5241d1f0736c149f9325a3b82cac8223c16f7e387be3fe16aa809b25bf84b3a743ba448405e79ac57f808c9545230fc24714c649963b3d26ed48e4a SHA512 f42b7e7eb47150320358e2cbe916cd25aee36ddb96a784771dbaf678f6fd5417e492e6d5496af1bfc96364b503b587371efdc69ef9b0b8d08be68113f88b20d0
 EBUILD libcifpp-2.0.0.ebuild 797 BLAKE2B 7b1a06a06e05a7f909c5a08e829436ecb3460c1ae82f0c0ca7606a98e91e763ca1f476da5f09bf5982249566843be97533a752ae4b382f148b89a9215ade36db SHA512 6fafc36be05ec5f8a2bc6bbb06af5d43b4a043129a2410e459cce6d09948ee845a3f06415e5517595b7ef47d40a96a6f0aeda39030be2800da7604107868b843
+EBUILD libcifpp-2.0.3.ebuild 761 BLAKE2B d619db8fa0d30c8353fe303a22aaad764cd131421053a77bc494ccd73b4e58864c32fcbec5ed1826fc1374db73e7b80c4292721f4c9494e5eacca026552ee9e3 SHA512 1e92802a4f4fe3c65cd89ef917daf0988bbdaed890ba0edbc549ac9350eae394db0a16bb783faf84d55b16b388edc9c1f6fbf9d1acfd83a4b25385d1b2f14f85
 MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
diff --git a/sci-libs/libcifpp/libcifpp-1.1.1.ebuild b/sci-libs/libcifpp/libcifpp-1.1.1.ebuild
index 1f190d58f576..33da8b38c37f 100644
--- a/sci-libs/libcifpp/libcifpp-1.1.1.ebuild
+++ b/sci-libs/libcifpp/libcifpp-1.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/libcifpp/libcifpp-2.0.3.ebuild b/sci-libs/libcifpp/libcifpp-2.0.3.ebuild
new file mode 100644
index 000000000000..1cbb3962edf8
--- /dev/null
+++ b/sci-libs/libcifpp/libcifpp-2.0.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="Code to work with mmCIF and PDB files"
+HOMEPAGE="https://github.com/PDB-REDO/libcifpp"
+SRC_URI="
+	https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz -> components-${PV}.cif.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-libs/boost-1.70.0:0=[threads(+)]
+"
+DEPEND=""
+RDEPEND=""
+
+src_configure() {
+	cp "${WORKDIR}"/components-${PV}.cif data/components.cif || die
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DCIFPP_BUILD_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/liborigin/Manifest b/sci-libs/liborigin/Manifest
index 00d5f25ab385..ecdbbeb4ea50 100644
--- a/sci-libs/liborigin/Manifest
+++ b/sci-libs/liborigin/Manifest
@@ -1,7 +1,3 @@
-AUX liborigin-3.0.0-buildsystem.patch 5563 BLAKE2B c9905687284e0a81b504d765ff237bc89c0023816c7ac1a8636971ff43db62d894b3add5d5d3427966ff627125fbd524240d2fa3f9da716c221d87dc83eb44d0 SHA512 2d63a85c22f86a30b11414712c0d7b4871332e83c81a1995cb8efb8cfd717ab15747ab70f178808b8191379bc49b1f0219f87f0112c97e51d044d1f454fd6e75
-AUX liborigin-3.0.0-missing-header.patch 978 BLAKE2B 717a5bc981d5695688a5ae588c87da7501fa97e76fc8df4a71da57021d75a8e33c8696ea9ef606854a8943431debc0fcb998913f4d09ddd7833e6c7029ad83b0 SHA512 d515977558b0938a0d0453a6c1e4c9c506a7cafeeac39cc881d748ca3d8ff0e6153f8552b2efd5f2c0e478bf8b2075fc225bfc1d0b9f4542c3b6848918e88203
-AUX liborigin-3.0.0-no-exit-calls.patch 2452 BLAKE2B d635890d02f2605d52b869e09522bbb2aae9062eee9403c0f6e9639620229f983dc1031301d926617b63dbfa8cb0c163988119cf17b82db1786425499efe56bf SHA512 db491659f27168c2a4ce27517abcf5464fdc75ca9356500dde7a22987f5a766015e843c1b0c0b4f3d9bbf74c53d7b840a9aab64090173c2433e1176eefc816ec
-AUX liborigin-3.0.0-no-standard-streams.patch 7649 BLAKE2B 2f9c933d2d6ee65477ac0e23ad317d3b569bfe4eb37876c954501b93cf17be67cd1f3070724762a30c9bc1f9687880a5f5da8513e3cce4e2ae365ec1401c9123 SHA512 31f64c5a9c7156d19f2109be2768e4bae24b0547416da372b4c7dac24fbe6a026c3767372f778823f053af1bd4a2b85160457ebb101f06c22e2add4e15bb1d04
 AUX liborigin-3.0.1-buildsystem.patch 1479 BLAKE2B 3a199d9c15031a692ce6c1148e13db0fae713105e872fad3da1354263869d4363362e37ce40e0b62f635c2d2ec51514dcff0f02acc1484ffaf07a741d73bb2e6 SHA512 f9e6c3fabf45b422482349fc113a7e86846ef78550b91779dd5108b7dd04a8b0cad3aab7f24b6cee209a4c540ed2cac5e676cf01586056d1fa20965e98e054c9
 AUX liborigin-3.0.1-missing-header.patch 624 BLAKE2B 22444e21cfd17a7e32531cad8715cb7de9fbc7ead88de560ffdd62da9321e3666d1107da07cd0cf2aea6799241a34a3b8b567de577ba6120c60f0dc9b0eb021f SHA512 598988e0da6bc26dd845b86ca5251f5f88221f74b68487e500afa91979340807cd278e8365d5039d9720c56ee37f3e65305328bfa8346689dad5c338e0004120
 DIST liborigin-3.0.1.tar.gz 156842 BLAKE2B 2c88d0419c4c7be1ff6d3aaba1f794fe67174e02e591878c754a32d9b2789bd8594d39f4786d9ac04884b443b528086617a9e1fdbca8815089c8ebb400dd321c SHA512 c3fde3549bce462ea38b961885d6c835aac53db64375645db1d3636eb78396b3353c5bcc9ea3313dac3ffb436de35677ecec6fddb2fcf1eb37eaf6a78e2a31f8
diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch b/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch
deleted file mode 100644
index d8444dedafed..000000000000
--- a/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From a751f00ebba9fa226860ed4e2c1ae5fa35622e89 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 20 May 2020 22:33:08 +0200
-Subject: [PATCH 1/4] Don't install bundled tree.hh
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17c613b..a6b4b8a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,7 +25,6 @@ set (devel-headers
- 	OriginObj.h
- 	OriginFile.h
- 	OriginParser.h
--	tree.hh
- 	)
- 
- # LIB_SUFFIX can either be defined at cmake command line: cmake -DLIB_SUFFIX:STRING=64 ...
--- 
-2.26.2
-
-
-From 0b4fa1ce0946bc293d798484c609c6a7ac5ab50a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 20 May 2020 22:35:02 +0200
-Subject: [PATCH 2/4] No static target, compile opj2dat against the shared lib
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a6b4b8a..6f2d87b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,22 +52,16 @@ set_target_properties(origin PROPERTIES
- 	VERSION ${LIBORIGIN_VERSION_MAJOR}.${LIBORIGIN_VERSION_MINOR}.${LIBORIGIN_VERSION_BUGFIX}
- 	SOVERSION ${LIBORIGIN_VERSION_MAJOR} )
- 
--# static library
--add_library (origin-static STATIC ${sources})
--set_target_properties(origin-static PROPERTIES OUTPUT_NAME "origin" POSITION_INDEPENDENT_CODE ON)
--
- # inform on log setting
- if (DEFINED GENERATE_CODE_FOR_LOG)
-     message("File parsing will be logged.")
-     target_compile_definitions(origin PRIVATE GENERATE_CODE_FOR_LOG=${GENERATE_CODE_FOR_LOG})
--    target_compile_definitions(origin-static PRIVATE GENERATE_CODE_FOR_LOG=${GENERATE_CODE_FOR_LOG})
- else()
-     message("File parsing will NOT be logged. Define GENERATE_CODE_FOR_LOG to activate logging.")
- endif ()
- 
- # install libraries
- install(TARGETS origin DESTINATION lib${LIB_SUFFIX} OPTIONAL)
--install(TARGETS origin-static DESTINATION lib${LIB_SUFFIX} OPTIONAL)
- 
- # install headers
- install(FILES ${devel-headers} DESTINATION include/liborigin)
-@@ -77,7 +71,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION lib${LIB_SUFF
- 
- # command line util
- add_executable(opj2dat opj2dat.cpp)
--target_link_libraries (opj2dat origin-static)
-+target_link_libraries (opj2dat origin)
- 
- install(TARGETS opj2dat DESTINATION bin OPTIONAL)
- 
--- 
-2.26.2
-
-
-From 5f4c497408a6f144e581dd17fb3e49963e8b6b2b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 20 May 2020 22:43:52 +0200
-Subject: [PATCH 3/4] Don't install README COPYING etc., distro package does
- that
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6f2d87b..4fc16e0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,7 +76,6 @@ target_link_libraries (opj2dat origin)
- install(TARGETS opj2dat DESTINATION bin OPTIONAL)
- 
- # documentation
--install(FILES COPYING FORMAT README DESTINATION share/doc/liborigin OPTIONAL)
- configure_file(doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
- find_package(Doxygen)
- if(DOXYGEN_FOUND)
--- 
-2.26.2
-
-
-From bb554d88b78e7575c04cf3e79098f35b776c3878 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 20 May 2020 22:47:22 +0200
-Subject: [PATCH 4/4] Drop 'OPTIONAL' from install targets, add ENABLE_TOOLS
- option
-
-I've never seen an optional install of library.
-ENABLE_TOOLS takes care of the binary.
-Doxygen is already optional.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4fc16e0..1759eee 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,6 +9,8 @@ set(LIBORIGIN_VERSION_MAJOR 3)
- set(LIBORIGIN_VERSION_MINOR 0)
- set(LIBORIGIN_VERSION_BUGFIX 0)
- 
-+option(ENABLE_TOOLS "Install opj2dat command line util" ON)
-+
- # compile-time configuration variables to be linked in
- configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
-@@ -61,7 +63,7 @@ else()
- endif ()
- 
- # install libraries
--install(TARGETS origin DESTINATION lib${LIB_SUFFIX} OPTIONAL)
-+install(TARGETS origin DESTINATION lib${LIB_SUFFIX})
- 
- # install headers
- install(FILES ${devel-headers} DESTINATION include/liborigin)
-@@ -70,10 +72,12 @@ install(FILES ${devel-headers} DESTINATION include/liborigin)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
- 
- # command line util
--add_executable(opj2dat opj2dat.cpp)
--target_link_libraries (opj2dat origin)
-+if(ENABLE_TOOLS)
-+    add_executable(opj2dat opj2dat.cpp)
-+    target_link_libraries (opj2dat origin)
- 
--install(TARGETS opj2dat DESTINATION bin OPTIONAL)
-+    install(TARGETS opj2dat DESTINATION bin)
-+endif()
- 
- # documentation
- configure_file(doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-@@ -82,5 +86,5 @@ if(DOXYGEN_FOUND)
- 	add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
- 		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- 	set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/html)
--	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/liborigin OPTIONAL)
-+	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/liborigin)
- endif(DOXYGEN_FOUND)
--- 
-2.26.2
-
diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-missing-header.patch b/sci-libs/liborigin/files/liborigin-3.0.0-missing-header.patch
deleted file mode 100644
index 162dd93c3c5e..000000000000
--- a/sci-libs/liborigin/files/liborigin-3.0.0-missing-header.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 78da3c4456cef15c91b5e5fcc1e82ca2364ea654 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 20 May 2020 22:28:21 +0200
-Subject: [PATCH] Add missing header
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- OriginAnyParser.cpp | 1 +
- opj2dat.cpp         | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
-index 07a619e..c90f6e4 100644
---- a/OriginAnyParser.cpp
-+++ b/OriginAnyParser.cpp
-@@ -22,6 +22,7 @@
- #include "OriginAnyParser.h"
- #include <sstream>
- #include <cinttypes>
-+#include <iostream>
- 
- /* define a macro to get an int (or uint) from a istringstream in binary mode */
- #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-diff --git a/opj2dat.cpp b/opj2dat.cpp
-index 230ac84..67b0815 100644
---- a/opj2dat.cpp
-+++ b/opj2dat.cpp
-@@ -31,6 +31,7 @@
- #include <cmath>
- #include <fstream>
- #include <sstream>
-+#include <iostream>
- #include <string>
- 
- using namespace std;
--- 
-2.26.2
-
diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-no-exit-calls.patch b/sci-libs/liborigin/files/liborigin-3.0.0-no-exit-calls.patch
deleted file mode 100644
index 44b56a296fde..000000000000
--- a/sci-libs/liborigin/files/liborigin-3.0.0-no-exit-calls.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From a8b25b489b48086e2616df98688969f89e63fa69 Mon Sep 17 00:00:00 2001
-From: Miquel Garriga <gbmiquel@gmail.com>
-Date: Fri, 23 Nov 2018 00:15:04 +0100
-Subject: [PATCH] Remove exit() calls
-
----
- OriginFile.cpp | 15 ++++++++++-----
- OriginFile.h   |  2 +-
- opj2dat.cpp    |  2 ++
- 3 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/OriginFile.cpp b/OriginFile.cpp
-index f6c41b4..bcdcccb 100644
---- a/OriginFile.cpp
-+++ b/OriginFile.cpp
-@@ -33,14 +33,15 @@
- #include <string>
- 
- OriginFile::OriginFile(const string& fileName)
--:	fileVersion(0)
-+:	fileVersion(0), ioError(0)
- {
- 	ifstream file(fileName.c_str(), ios_base::binary);
- 
- 	if (!file.is_open())
- 	{
--		cerr <<  "Could not open " << fileName.c_str() << "!" << endl;
--		exit(EXIT_FAILURE);
-+		cerr << endl << "liborigin: " << strerror(errno) << ": " << fileName.c_str() << endl;
-+		ioError = errno;
-+		return;
- 	}
- 
- #ifdef GENERATE_CODE_FOR_LOG
-@@ -48,8 +49,9 @@ OriginFile::OriginFile(const string& fileName)
- 	logfile = fopen("./opjfile.log", "w");
- 	if (logfile == nullptr)
- 	{
--		cerr <<  "Could not open opjfile.log !" << endl;
--		exit(EXIT_FAILURE);
-+		cerr << endl <<  "liborigin: " << strerror(errno) << ": opjfile.log" << endl;
-+		ioError = errno;
-+		return;
- 	}
- #endif // GENERATE_CODE_FOR_LOG
- 
-@@ -152,10 +154,13 @@ OriginFile::OriginFile(const string& fileName)
- 	fclose(logfile);
- #endif // GENERATE_CODE_FOR_LOG
- 	parser.reset(createOriginAnyParser(fileName));
-+	ioError=0;
- }
- 
- bool OriginFile::parse()
- {
-+	if (ioError != 0)
-+		return false;
- 	parser->buildVersion = buildVersion;
- 	parser->fileVersion = fileVersion;
- 	return parser->parse();
-diff --git a/OriginFile.h b/OriginFile.h
-index 80b6ff2..3a49395 100644
---- a/OriginFile.h
-+++ b/OriginFile.h
-@@ -70,7 +70,7 @@ public:
- 	string resultsLogString() const;													//!< get Results Log
- 
- private:
--	unsigned int fileVersion, buildVersion;
-+	unsigned int fileVersion, buildVersion, ioError;
- 	unique_ptr<OriginParser> parser;
- };
- 
-diff --git a/opj2dat.cpp b/opj2dat.cpp
-index ff53309..230ac84 100644
---- a/opj2dat.cpp
-+++ b/opj2dat.cpp
-@@ -54,6 +54,8 @@ int main(int argc, char *argv[]) {
- 	OriginFile opj(inputfile);
- 	int status = opj.parse();
- 	cout << "Parsing status = " << status << endl;
-+	if (! status)
-+		return -1;
- 	cout << "OPJ PROJECT \"" << inputfile.c_str() << "\" VERSION = " <<  opj.version() << endl;
- 
- 	cout << "number of datasets     = " << opj.datasetCount() << endl;
--- 
-2.26.2
-
diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-no-standard-streams.patch b/sci-libs/liborigin/files/liborigin-3.0.0-no-standard-streams.patch
deleted file mode 100644
index 227ce7b14d5e..000000000000
--- a/sci-libs/liborigin/files/liborigin-3.0.0-no-standard-streams.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From 6cb6d9b328195e11c1f168f6e4b915b522c7089f Mon Sep 17 00:00:00 2001
-From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
-Date: Wed, 15 May 2019 23:16:09 +0200
-Subject: [PATCH 1/3] do not output to standard streams (cout,
- cerr) by default
-
-it might be better to hide all such usage behind #ifdefs,
-since the streams might not belong to the shared library
-
-provided by Ivan Krylov (Ropj)
----
- OriginAnyParser.cpp | 11 +++++------
- OriginAnyParser.h   |  2 +-
- OriginFile.cpp      |  2 --
- 3 files changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
-index d45026b..ff7b8f7 100644
---- a/OriginAnyParser.cpp
-+++ b/OriginAnyParser.cpp
-@@ -756,7 +756,7 @@ void OriginAnyParser::readProjectTree() {
- 
- 	// log info on project tree
- #ifdef GENERATE_CODE_FOR_LOG
--	outputProjectTree();
-+	outputProjectTree(cout);
- #endif // GENERATE_CODE_FOR_LOG
- 
- 	return;
-@@ -2835,7 +2835,6 @@ void OriginAnyParser::getColorMap(ColorMap& cmap, const string& cmapdata, unsign
- 	// check we have enough data to fill the map
- 	unsigned int minDataSize = cmoffset + 0x114 + (colorMapSize+2)*0x38;
- 	if (minDataSize > cmapdatasz) {
--		cerr << "WARNING: Too few data while getting ColorMap. Needed: at least " << minDataSize << " bytes. Have: " << cmapdatasz << " bytes." << endl;
- 		LOG_PRINT(logfile, "WARNING: Too few data while getting ColorMap. Needed: at least %d bytes. Have: %d bytes.\n", minDataSize, cmapdatasz)
- 		return;
- 	}
-@@ -2988,15 +2987,15 @@ void OriginAnyParser::getProjectFolderProperties(tree<ProjectNode>::iterator cur
- 	(*current_folder).modificationDate = doubleToPosixTime(modificationDate);
- }
- 
--void OriginAnyParser::outputProjectTree() {
-+void OriginAnyParser::outputProjectTree(std::ostream & out) {
- 	size_t windowsCount = spreadSheets.size()+matrixes.size()+excels.size()+graphs.size()+notes.size();
- 
--	cout << "Project has " << windowsCount << " windows." << endl;
--	cout << "Origin project Tree" << endl;
-+	out << "Project has " << windowsCount << " windows." << endl;
-+	out << "Origin project Tree" << endl;
- 
- 	char cdsz[21];
- 	for (tree<ProjectNode>::iterator it = projectTree.begin(projectTree.begin()); it != projectTree.end(projectTree.begin()); ++it) {
- 		strftime(cdsz, sizeof(cdsz), "%F %T", gmtime(&(*it).creationDate));
--		cout <<  string(projectTree.depth(it) - 1, ' ') <<  (*it).name.c_str() << "\t" << cdsz << endl;
-+		out <<  string(projectTree.depth(it) - 1, ' ') <<  (*it).name.c_str() << "\t" << cdsz << endl;
- 	}
- }
-diff --git a/OriginAnyParser.h b/OriginAnyParser.h
-index ed62bbb..bd7c1ae 100644
---- a/OriginAnyParser.h
-+++ b/OriginAnyParser.h
-@@ -68,7 +68,7 @@ protected:
- 	void getZcolorsMap(ColorMap&, const string&, unsigned int);
- 	void getProjectLeafProperties(tree<ProjectNode>::iterator, const string&, unsigned int);
- 	void getProjectFolderProperties(tree<ProjectNode>::iterator, const string&, unsigned int);
--	void outputProjectTree();
-+	void outputProjectTree(std::ostream &);
- 
- 	inline time_t doubleToPosixTime(double jdt)
- 	{
-diff --git a/OriginFile.cpp b/OriginFile.cpp
-index 5ac8e22..dba050f 100644
---- a/OriginFile.cpp
-+++ b/OriginFile.cpp
-@@ -39,7 +39,6 @@ OriginFile::OriginFile(const string& fileName)
- 
- 	if (!file.is_open())
- 	{
--		cerr << endl << "liborigin: " << strerror(errno) << ": " << fileName.c_str() << endl;
- 		ioError = errno;
- 		return;
- 	}
-@@ -49,7 +48,6 @@ OriginFile::OriginFile(const string& fileName)
- 	logfile = fopen("./opjfile.log", "w");
- 	if (logfile == nullptr)
- 	{
--		cerr << endl <<  "liborigin: " << strerror(errno) << ": opjfile.log" << endl;
- 		ioError = errno;
- 		return;
- 	}
--- 
-2.26.2
-
-
-From 588bbc357cd34b9d353470ed6c0632b6f00805f5 Mon Sep 17 00:00:00 2001
-From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
-Date: Wed, 15 May 2019 23:28:46 +0200
-Subject: [PATCH 2/3] fix bugs found by UBSan
-
- - check values before casting to enum Attach
- - default-initialize sensitive struct elements
-
-provided by Ivan Krylov (Ropj)
----
- OriginAnyParser.cpp | 1 +
- OriginObj.h         | 5 ++++-
- README              | 3 +++
- 3 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
-index ff7b8f7..9f9731c 100644
---- a/OriginAnyParser.cpp
-+++ b/OriginAnyParser.cpp
-@@ -1543,6 +1543,7 @@ void OriginAnyParser::getAnnotationProperties(const string& anhd, unsigned int a
- 		GET_SHORT(stmp, r.bottom)
- 
- 		unsigned char attach = anhd[0x28];
-+		if (attach >= (unsigned char)Attach::End_) attach = Attach::Frame;
- 		unsigned char border = anhd[0x29];
- 
- 		Color color = getColor(anhd.substr(0x33,4));
-diff --git a/OriginObj.h b/OriginObj.h
-index 3a9f719..aeeeb6b 100644
---- a/OriginObj.h
-+++ b/OriginObj.h
-@@ -67,7 +67,7 @@ namespace Origin
- 	enum DayOfWeekFormat {DAY_DDD = 0, DAY_DDDD = 1, DAY_LETTER = 2};
- 
- 	enum NumericDisplayType {DefaultDecimalDigits = 0, DecimalPlaces = 1, SignificantDigits = 2};
--	enum Attach {Frame = 0, Page = 1, Scale = 2};
-+	enum Attach {Frame = 0, Page = 1, Scale = 2, End_};
- 	enum BorderType {BlackLine = 0, Shadow = 1, DarkMarble = 2, WhiteOut = 3, BlackOut = 4, None = -1};
- 	enum FillPattern {NoFill = 0, BDiagDense = 1, BDiagMedium = 2, BDiagSparse = 3, FDiagDense = 4, FDiagMedium = 5, FDiagSparse = 6,
- 		DiagCrossDense = 7, DiagCrossMedium = 8, DiagCrossSparse = 9, HorizontalDense = 10, HorizontalMedium = 11, HorizontalSparse = 12,
-@@ -345,6 +345,7 @@ namespace Origin
- 		,	width(8)
- 		,	index(_index)
- 		,	view(DataView)
-+		,	colorMap()
- 		{coordinates.push_back(10.0);coordinates.push_back(10.0);coordinates.push_back(1.0);coordinates.push_back(1.0);};
- 	};
- 
-@@ -895,9 +896,11 @@ namespace Origin
- 		GraphLayer()
- 		:	backgroundColor({Color::Regular, {Color::White}})
- 		,	borderType(BlackLine)
-+		,	xAxis(), yAxis(), zAxis()
- 		,	histogramBin(0.5)
- 		,	histogramBegin(0.0)
- 		,	histogramEnd(10.0)
-+		,	colorMap()
- 		,	xAngle(0)
- 		,	yAngle(0)
- 		,	zAngle(0)
-diff --git a/README b/README
-index 1dd56ef..598eacc 100644
---- a/README
-+++ b/README
-@@ -7,6 +7,9 @@ It is based on the code at
- 	http://sourceforge.net/projects/liborigin
- 	http://soft.proindependent.com/liborigin2
- 
-+Additionally, some fixes were applied to silence UBSan warnings caused by
-+uninitialised POD struct members.
-+
- AUTHORS:  Knut Franke, Miquel Garriga, Stefan Gerlach, Alex Kargovsky, Russell Standish, Ion Vasilief
- 
- DEPENDENCIES: tree.hh (included) http://tree.phi-sci.com/
--- 
-2.26.2
-
-
-From 88b4de31e1860b8b5de6e3eea4a32e92f2e58c71 Mon Sep 17 00:00:00 2001
-From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
-Date: Wed, 15 May 2019 23:32:50 +0200
-Subject: [PATCH 3/3] readProjectTree: provide root node to append
- to
-
-append_child() is not supposed to work on an empty tree,
-and I couldn't find any initialization before its use.
-All inserted nodes seemed to end up below tree_node::feet
-(or something) and were not cleaned up by the destructor.
-
-Using insert() to create a dummy node for others to be
-children of fixes the leak.
-
-provided by Ivan Krylov (Ropj)
----
- OriginAnyParser.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
-index 9f9731c..4a79423 100644
---- a/OriginAnyParser.cpp
-+++ b/OriginAnyParser.cpp
-@@ -743,7 +743,10 @@ void OriginAnyParser::readProjectTree() {
- 	string pte_pre2 = readObjectAsString(pte_pre2_size);
- 
- 	// root element and children
--	unsigned int rootfolder = readFolderTree(projectTree.begin(), pte_depth);
-+	unsigned int rootfolder = readFolderTree(
-+		projectTree.insert(projectTree.begin(), ProjectNode("", ProjectNode::Folder)),
-+		pte_depth
-+	);
- 	if (rootfolder > 0) {
- 		LOG_PRINT(logfile, "Number of files at root: %d\n", rootfolder)
- 	}
--- 
-2.26.2
-
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 2dc5dd6a88d3..72685ecdcd3b 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,3 +1,5 @@
 DIST libqalculate-3.20.1.tar.gz 2107300 BLAKE2B 79314cbe2adb183a17f96947b8ad4fa0bbfea665f7b9afda67785059e9bc0d94599b05cd55999302fc5e1216929b4ed98db4e2a6ae0c6fc74ebdd37dc6dcb72e SHA512 65a723c257c9e2419fc60ca254c23a7a7dd4d9a31beaa9c8fcf41a1e252e5f3be08e1160dcc72a0a407fe3ffd3e73353b141e40019871677a490d8c810c96931
+DIST libqalculate-3.21.0.tar.gz 2117414 BLAKE2B eaf8b886e716a6f8e9631dbda6533906cc7c5ed986233d75b9384aefb4123479914715d37268db5e1d403d1ee1835cde77314abe5380768fce5c266d1c253ca3 SHA512 7ca876ffe359ab2c6c6ae266007f489f9cd26f6650d6ace4e1d80cc660d16294cce601ed81046baca25cc4ec41668498af0a555fddc47c4118241e72af039614
 EBUILD libqalculate-3.20.1-r1.ebuild 1609 BLAKE2B bd23938bca6883b4216aeeee4089135397d503cbbbab4fb3b839cb8c10adec7780adc5591f202fc03cd042c598a7a6193d2353652af38a09f68b658723f2b041 SHA512 df46c547e21e416ff03f73571098b474bdba5ea5c797a03b8f0c46f2edbe6163d30c2c6039ede337c538708d46f549ce2f7c97ad2b7e41ae6faa10c13ac32002
+EBUILD libqalculate-3.21.0.ebuild 1615 BLAKE2B 9b9bcfa9320e58705629113ea7dec433dd1e63904f09a687036d5ff41219ef9ac330e3643ce85107fec7b77644145e2f917333fec14ac7a07c705e72c196f1ff SHA512 e177b95d170ca9da253e946c7c1a375a24cacb180436e2cfa8bc3b8a8f35cd7c8c056d48a59577659fdd2a58517bf07983655307def142907f13d6c3890cec11
 MISC metadata.xml 413 BLAKE2B 40f271cbe3f5ca30aa6ec6320d382faef0864e064ae57599a6da937da85b4de9d57eeec6f8b737698ede76d663149b13247d1edf8b5b291de19ac3d6b5266492 SHA512 053e75b77c4ff628535db22d9763e27c32cee904f0b268d2d507f367c938aff5bdd75a66e3f4c2316dc1d3db579d721564d3a12e139740a3a0d50c36f8d52e94
diff --git a/sci-libs/libqalculate/libqalculate-3.21.0.ebuild b/sci-libs/libqalculate/libqalculate-3.21.0.ebuild
new file mode 100644
index 000000000000..65c9f8a2022c
--- /dev/null
+++ b/sci-libs/libqalculate/libqalculate-3.21.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A modern multi-purpose calculator library"
+HOMEPAGE="https://qalculate.github.io/"
+SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/22"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl icu gnuplot readline"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libxml2:2
+	dev-libs/mpfr:0=
+	virtual/libiconv
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+	readline? ( sys-libs/readline:0= )"
+RDEPEND="${DEPEND}
+	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
+BDEPEND="dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	cat >po/POTFILES.skip <<-EOF || die
+		# Required by make check
+		data/currencies.xml.in
+		data/datasets.xml.in
+		data/elements.xml.in
+		data/functions.xml.in
+		data/planets.xml.in
+		data/prefixes.xml.in
+		data/units.xml.in
+		data/variables.xml.in
+		src/defs2doc.cc
+	EOF
+}
+
+src_configure() {
+	# Needed for po-defs/Makefile
+	export CXX_FOR_BUILD="$(tc-getBUILD_CXX)"
+	export CXXCPP_FOR_BUILD="$(tc-getBUILD_CXX) -E"
+
+	# bug #792027
+	tc-export CC
+
+	econf \
+		--disable-static \
+		$(use_with curl libcurl) \
+		$(use_with gnuplot gnuplot-call) \
+		$(use_with icu) \
+		$(use_with readline)
+}
+
+src_install() {
+	# docs/reference/Makefile.am -> referencedir=
+	emake \
+		DESTDIR="${D}" \
+		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		install
+
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest
index c9127f95af43..e2445ff6844a 100644
--- a/sci-libs/metis/Manifest
+++ b/sci-libs/metis/Manifest
@@ -1,4 +1,3 @@
-AUX metis-5.1.0-datatype.patch 388 BLAKE2B 038a62dd53d383c9c8f62067bf2f93a13f269f386ec898f2831df34a493379ce2c982d5bb97cad9f9571eab2e1d49d5cc58fa1f608ce6def9125c098913ec8c1 SHA512 0b7b10b0d0c958573668f847c2765435a1d9da22fe063430f75fb6ea005ce687d1eaa06879f3c494ea96b6877c1a94df5aa9e538bf02832af3a765cd7687a843
 AUX metis-5.1.0-multilib.patch 579 BLAKE2B 3e9edf7809a43026bfc7a320b1ff37f2e00a04dbdbcb8c3acb62016d8c41b4e68301ab3053fa1fb0fcb2a6bf3b48818175fdbf4b4fe2a23c0b4cb814d512f092 SHA512 5aa179b6de17ac24eb25ddc9377b5adea7b794405ba332de23096daac9231ab5c603268a24ad9219b3a9c598b9cdad33082f31a2cdc957b784d09d92e50f4941
 AUX metis-5.1.0-remove-GKlib-O3.patch 267 BLAKE2B ef39556238377c12a311685ca96188f8b4c3db1398b55941d273592ff40cad49d3ec5c7606177edacad25af4684d9ae65dacaa9a7ca9ad957d326b874b87f3cf SHA512 8b4f4eb0753063e64533e0101b9e78bf2a711e6b2d080607ab06025ad681788225abe7555db28edee00a98ba41badc41341bb3cec2bd654fc738d63d78867968
 AUX metis-5.1.0-shared-GKlib.patch 590 BLAKE2B 63a10fd00f21cff949660c598fa4519432559965c72f31c35d2a726dbbdfb9d2591c99e92c9520c2021e8ce0c485aa9834445e9f5dfe388f93106e49eee562af SHA512 3157e364f56661c7bc896016b2cda83658f2b00fe7c936e732e80e366ccf6421a1ab6f95d5a74fdb790f4ec8789d048aab9d68b0ccf1eb03f94621f78adb1a3a
diff --git a/sci-libs/metis/files/metis-5.1.0-datatype.patch b/sci-libs/metis/files/metis-5.1.0-datatype.patch
deleted file mode 100644
index cbca8904ff73..000000000000
--- a/sci-libs/metis/files/metis-5.1.0-datatype.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/include/metis.h
-+++ b/include/metis.h
-@@ -30,7 +30,7 @@
-  GCC does provides these definitions in stdint.h, but it may require some
-  modifications on other architectures.
- --------------------------------------------------------------------------*/
--#define IDXTYPEWIDTH 32
-+#define IDXTYPEWIDTH 64
- 
- 
- /*--------------------------------------------------------------------------
-
diff --git a/sci-libs/netcdf-cxx/Manifest b/sci-libs/netcdf-cxx/Manifest
index 10982eb9d120..1ad0c1e582c7 100644
--- a/sci-libs/netcdf-cxx/Manifest
+++ b/sci-libs/netcdf-cxx/Manifest
@@ -4,5 +4,5 @@ DIST netcdf-cxx-4.3.0.tar.gz 985897 BLAKE2B 89cfd85764ff8fc730c7cb4187df21a4245c
 DIST netcdf-cxx-4.3.1.tar.gz 607679 BLAKE2B 68677ba72e66d351bf6d33a2584a3a1edd9da98b41ed66e3f51f8d3d358bfd84bad3e2e06403edf76d26b2c76807ae40859995d8817725e531a27680d04f2501 SHA512 404711eb80d5e78968c0f6cbdcb08855a2778d7fd94e7ee94bdc9d1cd72848ac3327613c6437a7634349f26bc463b950092a2999abb34ddab0a47ad185547d22
 EBUILD netcdf-cxx-4.2-r301.ebuild 601 BLAKE2B 1f34dc4d3e47669081a647df6da7474f5e1f37d3a67287ddf9470b6b2b729588b4dcb4acd753b0a1750cf69f1283b8d774a553e029c429a36576a42280b7a6bc SHA512 16973d6fab5e25df249f6b737e10834acd1424d2c197bd0c96deb56f388d015e8545f77c3f273c9c076a74137a2b6cfad3ab0cafc0f8052213a2347ce0d15805
 EBUILD netcdf-cxx-4.3.0.ebuild 645 BLAKE2B 92c277b2e7407e5a1bad17ee753899dadb922cea93e88a89c7938d8314c1434a267d2e2e032475260f508658462e0b9cf6233352d18e2ccb32ce6ea4b2220652 SHA512 ba13805248e038ee1932ca78c8abd99fcf3ccf6ce8cd8882fb1174f7edbb3a7286c45b3dbe396ee9971a61a39c80b9ecfa2297331a0833e71db7397bb5e0ed85
-EBUILD netcdf-cxx-4.3.1.ebuild 755 BLAKE2B fb497c0ffc15f795d2685819b5f6b93c1098502070e483d6de3482497ed4cd66275f7de323a8ec7a5a2e3cb81b44c24e06e327cfc4505ebe501dbecd4797bb66 SHA512 551957e18d605656d4e00cd31a7ec8437572c7041726340667d23981a60f4bce0031d9674e8dd5a848584916be0ff7ef44e15ff7d508043295943d995a235436
+EBUILD netcdf-cxx-4.3.1.ebuild 753 BLAKE2B cc55b7c87f0f19a021fe90c3cbeeb8602d509691b3c2d7c1c88a525df215a4471ae8be26f4cf0c73f561f77fe77bedce118a47054caaae26c8bc5564bc6e408e SHA512 55020de4aacde4db532e654d875d1d29cb3e7d915819929b46f267ed9d289f6d86d111bcc5f8270fd5151b281ca71196ce704c0cf9d72332ce437c6429a082eb
 MISC metadata.xml 839 BLAKE2B 2cda1c652d7d7e83ebb67f70db48dc7b9a11908813739a646cb5798dd232f8eff5754c10adb0fbd206be6280fd599aacd6f63181b658623d55e17d6e73b0f4f0 SHA512 7e8f0b88ef5ad2cba94369ad26f2b27a648831b6433e05d127e4bc72ccfe6afc5eba7695f5c3cabc426a9913e599ce9b0455a087f9d606471cd351c8be5190d6
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
index 11abdd911ef6..47e1c0f9bb27 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="UCAR-Unidata"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 # 6 out of 9 fail, reported upstream
 RESTRICT="test"
diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest
index e82964812ba7..d8be3f557999 100644
--- a/sci-libs/openlibm/Manifest
+++ b/sci-libs/openlibm/Manifest
@@ -1,3 +1,5 @@
 DIST openlibm-0.7.5.tar.gz 366889 BLAKE2B cd892965122237783cc288e57c965ae56d26fdcce93d89dd764ba659d292ade20baa754af303f04b831902f62f95388e2e7e11c050a0712a235bbc5793f2a9c4 SHA512 fe5797f49e9f9ac70485c53c6096ac273c33c7b44fbb694788717f0e427fe9a8e121939c4c1334f2d20f2fe1f440d952cc20cbdd49717996a2fb9a1045b05799
+DIST openlibm-0.8.0.tar.gz 367130 BLAKE2B e516fee18203040b8f3cdffab10c4ca22df638551b420ec7e679ff373221973a013c93520b29395c61c8ef0f0f6c87516c1d4a9885c3bbb5e8cae8900efee6ea SHA512 336dfac1fd4ab6ce256aa0129a211c3556eac46d2e775e5cec9626dc5bbcb4d5e65c86617d72e531694e8c8e6320a0fabc76600a02b0ac9f1d652774d0a94440
 EBUILD openlibm-0.7.5.ebuild 820 BLAKE2B de0436b2b7598936c32951ad3063a4eea11d4f34f16abb30c675d387948cd44eb832c25b7ae6004bba879061d56fd97684761a06eb47619c7d408b0f1384a7d4 SHA512 3d96a505d1f15647ab229e5ef1f1e60f1b1ff9cdb063af2bc20e07b6eee49d76ac2e61939f2f948e311fef034af7c42c75b465110ef748dd770aefcc343d3862
+EBUILD openlibm-0.8.0.ebuild 820 BLAKE2B b9442e382ea27ff82c360496b3030565292a7a81c156227b61b9cfc5ae2cb8d234349cb358040f3ca9067645b47ffafab3c17491a86a8534667031589cf2af1b SHA512 ba0d04a55d5d7a7192b4e70415c7cfac24c47d0ccba41815bb242d2b0b2b4fdceddbf3b8e343c6717f7ecf743c2204bde5d342677fc85a534bb59893779de986
 MISC metadata.xml 771 BLAKE2B 2b74181a48c3fa5fd2376d864856e06cb8b970c438514c4b1b52ac3d188f8d626b00d72cc4e4fbbe63ab9247a6c20caf3c192e23a910398c6f84ed143029b7ba SHA512 f837da2378363560ac051fad9247b0f9a0769bb49a9b34c4f8f4d2f507609cb9c90536c93059928724340a7d1a299f7a75b75df1aea34dff217317a196f99df8
diff --git a/sci-libs/openlibm/openlibm-0.8.0.ebuild b/sci-libs/openlibm/openlibm-0.8.0.ebuild
new file mode 100644
index 000000000000..ba45cbd625fb
--- /dev/null
+++ b/sci-libs/openlibm/openlibm-0.8.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="High quality system independent, open source libm"
+HOMEPAGE="https://github.com/JuliaLang/openlibm"
+SRC_URI="https://github.com/JuliaMath/openlibm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+"
+# See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+src_prepare() {
+	default
+	sed -e "/^OLM_LIBS :=/s/^/#/" \
+		-e "/install: /s/install-static//" \
+	-i Makefile || die
+}
+
+src_configure() {
+	tc-export CC CXX FC AR LD
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" install
+	dodoc README.md
+}
diff --git a/sci-libs/qrupdate/Manifest b/sci-libs/qrupdate/Manifest
index 3d5c0eef92c2..88bec559659c 100644
--- a/sci-libs/qrupdate/Manifest
+++ b/sci-libs/qrupdate/Manifest
@@ -1,5 +1,5 @@
 AUX qrupdate-1.1.1-Makefiles.patch 2134 BLAKE2B 36e3a94684bcbf7c6738f7af5a990102a56ee5250255c809b2f59bd4c1e96dd48476c9814fb8d33f914dbef5e4d3b70c455e015bd4fd323cd8c7ab6693a63216 SHA512 66b86960f90bce81839ef85a27ad0815b3f8417a0fd44b8027a02bce536aa6db4c250c665566d269150b504afdfb2fbad44b3344497947a193f961c33e63db8e
 AUX qrupdate-1.1.2-install.patch 1210 BLAKE2B 311a21fd3c99b875aca96d9bbb2c0432abb1867a47d58c32d33a423c91bc8460460bacf99fea97230fd3456830fef93c80539a6aca4315d73d949f61a7a0bf97 SHA512 3f53b1b0bbf04415a5f14f18f28a8264725296b4dcdc28c4d3e13852a4f12f3f2466df7ba58233b1e7279ec9d8075b0dd01fcf2d00bc9c13cf5d21f40f98f0f4
 DIST qrupdate-1.1.2.tar.gz 49734 BLAKE2B e5bf9fb39f6c97ee4b4084e664f929d95bee407f9f11ea4dc6da2bdb06d1694eddc1f2f52e5f673f22d097d11addb293b6dc0fd7c30d09acc84dd050fd1d72e9 SHA512 cc4e466ea91958e15c66be82b0c4c8ad813fbe4643f21259a9cb3ca8e0a411dd764bb2397ece848a7045f322d30316801d1540c4ebf7912030bef6995b44917c
-EBUILD qrupdate-1.1.2-r2.ebuild 1268 BLAKE2B f60dc8f1cb4dc70fce8fd55dd8825823df377d50c7c620a357eac063ae10a8bcb0c5d45ad908d353ca55ac596119624133595b7dd4cafd427bc72bec77d421fc SHA512 78f771cbe7a2a74f3039646377307bd95136044df5609e20c2fc4af2cf0b975e52a98eb635a94c46d2752bb1d04425288de5c3fc68094dcd76f6994f35bf80d2
+EBUILD qrupdate-1.1.2-r2.ebuild 1275 BLAKE2B 2cc0f8e743cd79dc738c31304011b9fc90db2ec862db2f24b4c0b9cb0950ae84bfc16615bec5778fa32cd29bc08dfb54d11d9f88047ee57ed6106204aa74b54d SHA512 933ff8a25f181d9b327b3d2af7eaf9e83f6c6665f32dff3a03d3cbd2472b3a37bc4f4fc0d56db417218a65342b059d35b770b70ba8d45128c876f27be3a9ece5
 MISC metadata.xml 332 BLAKE2B dda33ed8f8a63591e183723ca80d1550d104a4996cba185dbef3bbd2f57e287b1f0c1776296e324e3648f39378cc8fd17225cdb04962c99adda59bb0024f09e7 SHA512 5f787098bc13a29f7905d07e27464a966766fdd65e19ee07fa2ea96517b38da6cb77187fb4b60ed40c81a962a405ad4dcd472f114c7849c5aee730c405062f2e
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
index 9d471abf2886..6ff21cac1a8a 100644
--- a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
+++ b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos"
 
 RDEPEND="virtual/lapack"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest
index 87f2d912da12..0f49fb480678 100644
--- a/sci-libs/rocRAND/Manifest
+++ b/sci-libs/rocRAND/Manifest
@@ -1,3 +1,5 @@
 DIST rocRAND-4.0.0.tar.gz 3105585 BLAKE2B 0466d88c286290a9cd179fac61209051f7db5323457ccad9c5f0b579439662e1fe2b8951f85101c7c31bd058bc1448e839a19dc9a3a2d4ca42eb4e0b2baf4eb4 SHA512 c02bc32a9cf7660739ecf7ef99262fb14efa2c76afb3476105eedc4264dec987351ebd461c13c9e0aef9e640b42960b2a63295479664b83924cf0d5c34a157e8
+DIST rocRAND-4.3.0.tar.gz 3107367 BLAKE2B 23cfac271c1cd4e4edcfd315aa775d4d62e6a50ffa3b9a3372d4ae427a02def52486e88b3f4f89daaa539f2653cf76c8d44afec70d8d916268bc9f27534bda4c SHA512 3eefeb55014a8ee681e1cee73e0e092bd29a81767e772e712f8f871e94380a772a433e93a59276b0cd5a364fc4e482186771809d67ebdab24b2e3020173f5e18
 EBUILD rocRAND-4.0.0-r1.ebuild 1063 BLAKE2B 69823e3904b62ed811a7ea68c28b95c09e1059134e17fd62f006352e5870d2e3e9e111fbf8a1647cba517135ac46dcb829cabd98c91344bbfc1e38d7b996420a SHA512 06b4732ae433bc0996bd07fda884c7a302a4f33f92bde4b0c73eb684c8d793c3c9a0252e9961874e0fb4ab456ef584da7c47a98651fb704adf72f02e202b8c63
-MISC metadata.xml 601 BLAKE2B 3ffcac5814fe9bb976bee3669a9956e58a923a9055b11dddddff760b66220ad654a7f56305641e4d35c6635f45cd71d5c75c72f72d03293c3c73c84b5154c337 SHA512 5188fcf9add9b0640200e2042b51ed100673abc751557375a13eb438633b96888139b6130ca67364d1008fc93a7f15cc071071b9e309428544a1573f7c2fb5b7
+EBUILD rocRAND-4.3.0.ebuild 1725 BLAKE2B a4f72473430dc7b9f52421ad974aa95f2fba68665536da5a60b976896d98ca0d0e88623c7569f75531f08315b7e57951f6d715b3044db4b07020cc974152ae76 SHA512 60bc0b7e0d19d8c929c9f2874d4ad2200361d48e4acfa53d68969c7752eb0116df81a5fb4cc2a5ae10923ee23757874e0d6a8d86576006c7565d5199780f9486
+MISC metadata.xml 698 BLAKE2B fd85075e1414d7756cb16ed17f79cfc8302db5319df3a0862d7ce9006277c33a392e1a37aa7f2b2bcb80fbae4589240dd43751eebdeb5688a90a868299c3ecad SHA512 645a284a2c3b0f95df57110a04d5f131f28e3d673ba12eb5b3f3d5e7ee30e3099a022187b86ed458d5b4d6bed1451bd3dfe620debe0e8c480aee35f57bc878eb
diff --git a/sci-libs/rocRAND/metadata.xml b/sci-libs/rocRAND/metadata.xml
index d9a40bdc1ec3..dfea5b6e3584 100644
--- a/sci-libs/rocRAND/metadata.xml
+++ b/sci-libs/rocRAND/metadata.xml
@@ -16,4 +16,7 @@
   <upstream>
     <remote-id type="github">ROCmSoftwarePlatform/rocRAND</remote-id>
   </upstream>
+    <use>
+        <flag name="benchmark">Build and install benchmark programs.</flag>
+    </use>
 </pkgmetadata>
diff --git a/sci-libs/rocRAND/rocRAND-4.3.0.ebuild b/sci-libs/rocRAND/rocRAND-4.3.0.ebuild
new file mode 100644
index 000000000000..926f784a0249
--- /dev/null
+++ b/sci-libs/rocRAND/rocRAND-4.3.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Generate pseudo-random and quasi-random numbers"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocRAND"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocRAND/archive/rocm-${PV}.tar.gz -> rocRAND-${PV}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="benchmark test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip:${SLOT}"
+DEPEND="${RDEPEND}
+>=dev-util/rocm-cmake-${PV}"
+BDEPEND="test? ( dev-cpp/gtest )"
+
+S="${WORKDIR}/rocRAND-rocm-${PV}"
+
+src_prepare() {
+	sed -r -e "s:(hip|roc)rand/lib:\${CMAKE_INSTALL_LIBDIR}:" \
+		-e "s:(hip|roc)rand/include:include/\1rand:" \
+		-e "/INSTALL_RPATH/d" -i library/CMakeLists.txt || die
+
+	# remove GIT dependency
+	sed -e "/find_package(Git/,+4d" -i cmake/Dependencies.cmake || die
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+		-DCMAKE_SKIP_RPATH=TRUE
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+		-D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP"
+	)
+
+	cmake_src_configure
+	# do not rerun cmake and the build process in src_install
+	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
+}
+
+src_test() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addwrite /dev/dri/
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}"/benchmark
+		dobin benchmark_rocrand_*
+	fi
+}
diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest
index c4b70a6382cc..bd17fb733d1d 100644
--- a/sci-libs/rocSPARSE/Manifest
+++ b/sci-libs/rocSPARSE/Manifest
@@ -26,5 +26,6 @@ DIST rocSPARSE_shipsec1.tar.gz 22175245 BLAKE2B f1d34482b8c3d3ee48033097d7d6f9b6
 DIST rocSPARSE_sme3Dc.tar.gz 42483568 BLAKE2B f0d16b58f6ea28e67727637697a812a0b10d524c73aeb82f702411b9ebaea3670780e762ed0701aae80c6829e950233f74555523ef2d6c5740b007c7a65c03d4 SHA512 c5a0be2db919a45310a73ea1dd96d0d30168135f887a8c5c3d7ca11e2c3d12ea7d1331be20968d0135bd18da4ef2b043db68eeb7567b6f0f8daf782b87083c3a
 DIST rocSPARSE_webbase-1M.tar.gz 11360460 BLAKE2B 01b1d06adb5fb32fa402ed888d25a7e52a34779b078fc2e21c60e688d03579bb4ca8694f5ee4a824f7859952d55590a1fd9449dc80d6fe894d7b662b918882d4 SHA512 6401a965b8f6dd5392879956fde3c94f77fe1801a4a43428c03b6d639031575c647eab47b1babe53f4ecc2c3b8fc183e8339536b78dcd0d94ce62bfedd87c161
 EBUILD rocSPARSE-4.0.0-r1.ebuild 1166 BLAKE2B fc45fdaaf8d5f20afcc0d477eac01d30100a3ac3355ddae786ee934f46ef55b4f6ac3b284875fc905f75452cbfbb655ad4cfb9f916905e1a6091e8b97a14f141 SHA512 221e3aea6c45e7d7a6edc3b96db32ed9d2deb040f1f4cafa9cbb139a146aa7500d4619e6e8db39683fed9c0bc34053dc8ede22525340457c1774f6ea90297a98
+EBUILD rocSPARSE-4.3.0-r1.ebuild 5002 BLAKE2B 61c889cc81ceccc5b628bddef68c5a5df2d789bb6c30a2445ee47d7e4271c8e8a3363fbc523b35c9df9d66dd15292a490f4332ff3f5b296d4eb42a1b0c5468ec SHA512 f7447eed601b528a132a406df80056f760ff09fc67c7b32bc453527b5429df1bb1f42ddd34ab647e04aadf44760d4916de0d6087bd8a9efc09d32858eaafc8b1
 EBUILD rocSPARSE-4.3.0.ebuild 4557 BLAKE2B 0ca53de6d519bc369b25ba573c6aacc5adf7a554bad514698a719c4794af236909cc4be8650bf84327ed6965d7e86ca9a96fd31240c06a1e49723f7b303001e5 SHA512 f746cda86084c8e6ccfc7ff9635332440663ffec3082ddb78052204f5210110a81edc0fb19d6616166bea1962d20c746e0ee92160468aa670433bfd1d567ba9f
 MISC metadata.xml 695 BLAKE2B db1c67ff216cd9c9a972c9b388f85f6e762e0a7bddffca1336219ce6ebe39f6a841da4c8c78084d91f48a5bb6a26ad0047a2a1a60915da5110b3a41977f3b641 SHA512 2f246ec382d78e414a00aedcd7a2c871ccf5b74d25d160a0f7d6012feb51c6c12861b5152cac32d3e46d0d1acea7e8b10f42f4b501abb9d778cd3c886331f59c
diff --git a/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r1.ebuild b/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..a196780e222e
--- /dev/null
+++ b/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit cmake python-any-r1 toolchain-funcs
+
+DESCRIPTION="Basic Linear Algebra Subroutines for sparse computation"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSPARSE"
+
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-${PV}.tar.gz -> rocSPARSE-${PV}.tar.gz
+test? (
+https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> ${PN}_amazon0312.tar.gz
+https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> ${PN}_Chebyshev4.tar.gz
+https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> ${PN}_sme3Dc.tar.gz
+https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> ${PN}_webbase-1M.tar.gz
+https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> ${PN}_rma10.tar.gz
+https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> ${PN}_bibd_22_8.tar.gz
+https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> ${PN}_mac_econ_fwd500.tar.gz
+https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> ${PN}_mc2depi.tar.gz
+https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> ${PN}_scircuit.tar.gz
+https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> ${PN}_ASIC_320k.tar.gz
+https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> ${PN}_bmwcra_1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> ${PN}_nos1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> ${PN}_nos2.tar.gz
+https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> ${PN}_nos3.tar.gz
+https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> ${PN}_nos4.tar.gz
+https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> ${PN}_nos5.tar.gz
+https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> ${PN}_nos6.tar.gz
+https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> ${PN}_nos7.tar.gz
+https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> ${PN}_shipsec1.tar.gz
+https://sparse.tamu.edu/MM/Cote/mplate.tar.gz -> ${PN}_mplate.tar.gz
+https://sparse.tamu.edu/MM/Bai/qc2534.tar.gz -> ${PN}_qc2534.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron2.tar.gz -> ${PN}_Chevron2.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron3.tar.gz -> ${PN}_Chevron3.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron4.tar.gz -> ${PN}_Chevron4.tar.gz
+)"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-util/hip:${SLOT}
+	sci-libs/rocPRIM:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND="test? (
+	dev-cpp/gtest
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+)
+benchmark? ( app-admin/chrpath )
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/rocSPARSE-rocm-${PV}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.3.0-remove-matrices-unpacking.patch" )
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	eapply_user
+	sed -e "s/PREFIX rocsparse//" \
+		-e "/<INSTALL_INTERFACE/s,include,include/rocsparse," \
+		-e "/rocm_install_symlink_subdir(rocsparse)/d" \
+		-e "s:rocsparse/include:include/rocsparse:" \
+		-i "${S}/library/CMakeLists.txt" || die
+
+	# remove GIT dependency
+	sed -e "/find_package(Git/d" -i cmake/Dependencies.cmake || die
+
+	# use python interpreter specifyied by python-any-r1
+	sed -e "/COMMAND ..\/common\/rocsparse_gentest.py/s,COMMAND ,COMMAND ${EPYTHON} ," -i clients/tests/CMakeLists.txt || die
+
+	# Test need download data from https://sparse.tamu.edu (or other mirror site), check MD5, unpack and convert them into csr format
+	# This process is handled default by ${S}/cmake/ClientMatrices.cmake, but should be the responsibility of portage.
+	if use test; then
+		mkdir -p "${BUILD_DIR}"/matrices
+		# compile and use the mtx2csr converter. Do not use any optimization flags, because it causes error!
+		ebegin "$(tc-getCXX) deps/convert.cpp -o deps/convert"
+		$(tc-getCXX) deps/convert.cpp -o deps/convert
+		eend $?
+		find "${WORKDIR}" -maxdepth 2 -regextype egrep -regex ".*/(.*)/\1\.mtx" -print0 |
+			while IFS= read -r -d '' mtxfile; do
+				destination=${BUILD_DIR}/matrices/$(basename -s '.mtx' ${mtxfile}).csr
+				ebegin "Converting ${mtxfile} to ${destination}"
+				deps/convert ${mtxfile} ${destination}
+				eend $?
+			done
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device to omit a sandbox violation
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocsparse"
+		-DCMAKE_SKIP_RPATH="ON"
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+		-D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	addwrite /dev/kfd
+	addwrite /dev/dri/
+	cd "${BUILD_DIR}/clients/staging" || die
+	./rocsparse-test || die
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		local rocsparse_bench="${BUILD_DIR}/clients/staging/rocsparse-bench"
+		chrpath -d "${rocsparse_bench}" || die
+		dobin "${rocsparse_bench}"
+	fi
+}
diff --git a/sci-libs/scikit-image/Manifest b/sci-libs/scikit-image/Manifest
index 87543aa52f5e..84c35afc0cea 100644
--- a/sci-libs/scikit-image/Manifest
+++ b/sci-libs/scikit-image/Manifest
@@ -1,3 +1,3 @@
 DIST scikit-image-0.17.2.tar.gz 29818001 BLAKE2B 360c5f8c23b8441d145029c09a3b1d1407d4103463497c63274583e6c03d1fc57baa3e6c53909cfaa5daba54d5909fc106e84dc7036f0240ad8de93804ef9f65 SHA512 3ca2511f03d533ac7f1850d72de396dc5493831bce6200f30d426c3f47eff9b25ec9b69e141100dc56e03f2310aab255f92ff4aff8bc7b80d15d669cbe2ebb5e
 EBUILD scikit-image-0.17.2.ebuild 1184 BLAKE2B fc412848b0397707b368c09d216fe01b6ee3cebb05abbd94876b7fa067ba0ad447559c77dd39eebfc2ca2dd2bdf31ac1cf279c526a805d08eb92d2ead3e60714 SHA512 786c8e96bbdad4fcc09b42064304f5a13a8e1b5f1e464d3baed112ef70023ff0c8b3d0bd2b83e4100f660c6be3da6b8bb350c572f3c4ec2f390784a7cbc2a123
-MISC metadata.xml 628 BLAKE2B db6987cd4f2243c855d486cd86cecda507cbc8b31551a867067548369d8c754a2a11116560492c32db22356c82f6ef91fe8a288d5158084656770e2f498c072e SHA512 5b0a10f5af538045f5e8c8c3093783f74b4700aa9d50c2a088f42fa85b2e5704dd9473235695ab0484666dc6a080f99ffdffc6a6b78e98b19ba9fecf7e707829
+MISC metadata.xml 695 BLAKE2B 11487b964bde2ce1a39a8680bc3cc62045c4a7e2e17844de830d5f0e043660c431cd002a2a0fc19acb4c0262289ee280195475dd1f8b35f6a51ce0df369871f8 SHA512 fca83587d443373fc7219911900105676bdba5a7ced07ac00a9ab5cbe361d8ca1175b02b04fa53cdbde6f198a986b21f989baf32139cd76b7d1b2b78034d3142
diff --git a/sci-libs/scikit-image/metadata.xml b/sci-libs/scikit-image/metadata.xml
index aaf8e423ee6c..132691d57cb8 100644
--- a/sci-libs/scikit-image/metadata.xml
+++ b/sci-libs/scikit-image/metadata.xml
@@ -13,5 +13,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">scikit-image</remote-id>
+    <remote-id type="github">scikit-image/scikit-image</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index 913aa0340ed7..2b463f13fbce 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -1,8 +1,10 @@
 AUX scotch-6.0.4-as-needed.patch 6168 BLAKE2B 5b008f9035379d91cd8ffde6d64a22b021fd5070a106592abefac78a0522282fbd0dd7f8b439b0452c0d15c57891c9d4eb4415120ea95788fe74e149e6069fc3 SHA512 cd58425866a1726f776318e3792e72d7250686f033ceeda57f0f007fdb4c5e1c2bc3c9346630e39f16023f2a3d70cd106b357c21e5406a1c44b49a316655d8dd
 AUX scotch-6.0.4-flex-2.6.3-fix.patch 1623 BLAKE2B 9d86299eb543147ce7e736779b05c3b8113c12b54fbaf46a2b99a6cef2b670fc1b448d059858f954f37acf72c7c268acf1793de89f193d02f8b61d3f5d4ca1e5 SHA512 1a2a5a363e1dd59e1cced76928da15132cd1c8af57d6d0ad0eec04e02d029c6ae275e202e8c87bc65ff0188f41e379865829b5b61e4f1e44a885d48c4462b09e
 DIST scotch-v6.1.0.tar.gz 6292006 BLAKE2B 5b76b01c0fa752468a36830a15c190cd78efc851c3b6831eb2d16b7cf34a71d55463b266ffdee4c6addd4e66ca7caf75e63825051e600ee8a32494e5033cabbd SHA512 e6d217a23e39635f8749811a3fc64c8da14d0396a71b4042a4f8f3ce32ff1f0b4ed033ebae90f3785443dae9b35ded68ea512ed1e3e7f9ea9a471a499ae26b89
+DIST scotch-v6.1.1.tar.gz 6363384 BLAKE2B 337c81608fd245dde5b19bb6c79924e0ee80181ce3c935ae37e6248be2511a2f4d70bdda5b9217e5e1ed79fc00269de15755c3b6829579aa190ca6da9c3c2dac SHA512 daa62463f25416764250fe0452ae84bc6a2e485ee62a387418b4686c2ab93a2ca2d5a12cba922857c99a1c9ec67fc82951b0f9563ab97f5f3a6b86bb9da22b0c
 DIST scotch_6.0.4_esmumps.tar.gz 4804966 BLAKE2B 63c058fac9206e70975463b1748eb5ce7cd2ba01d9fcbb28eba8f5914ac49a71fcf87941fafd6047712fa519f3b5523ce199bdf5228a8b094bbb465dd64a1083 SHA512 0fcf639ab1a09451256444005f1a4a739403159e3ab22c34fbcedc481be387cd4c86be6fb029b4b5816220564f64f662434bf7f1d3921ed18be081ae2a7a9ee2
 EBUILD scotch-6.0.4-r2.ebuild 5045 BLAKE2B 6e67c4623fd0d718d9f4b83fe5e4c36ebb296e5a746a356257fd853bd499df2bdfa7019d2da597867926bedd1dd4ecf8e899eb5dc69696b95bc9d0d2ba817a88 SHA512 2cda8cd3fac970a8fb637f49a6fe8def310e6af30a3491021a0d3662c704020f52a7cdbfd36106444b955a0c46d85edf9ace500477da0c31ecb0122faee28edc
 EBUILD scotch-6.1.0-r1.ebuild 4954 BLAKE2B 6f3067d0ffa3e230bdcdf6748dac63153f4978f4b018527efb7fa92eaf3fbd361bcc257d36559936a2c5be25c2591eb26fb1a266b1b1208c4a722f0ce126712b SHA512 ca7f02520153c68aafbcb687fd85a548ed5aa6df44b5c086063a6507152737b58b2b1c987676526882524f6d120939c88b4c16d193a8819049b1e5f76bef8e80
 EBUILD scotch-6.1.0.ebuild 4942 BLAKE2B abbe129155d654ca4bf9ea5be27a703f44beb31bf2626042f763120ecdf70aad3a145e2dee2068b34038d92d634d29fe189353176eed242f37487aa62cf2f874 SHA512 4364a04ccfd41d423d439072a45be468ce844b916fd2f302e0e4dc7585217ff39ed0e52406fb96016e5b457606175b64c118f9d525629ed506bf11c700548d9e
+EBUILD scotch-6.1.1.ebuild 4956 BLAKE2B 90be76fd85e027e5649cf580e683168dc07010b1e4369a6c642d2b94aeb191b9f9944f416160d19117507dccab39dc643a3bb0db130ec691174adefef1129d33 SHA512 be8ef59bf19d25ccf85f4d5aa705f05f6d226f48e05d7d2b65d3fe52297ee6bbd944130119b781a1109fb1c47dbb2de95490c1c555c1058d9b972b06b9230463
 MISC metadata.xml 1169 BLAKE2B 33a4a76609e0b19a5b6f90556abc534dd36dc8b0c3baa1111197aaa0d8ff0bb29302ac52f67deb6b3f625eaad59fe18a25fb966086c67c53778202fc10d3e06c SHA512 282c23c6725a838a36b1f9a28ae3c96d2854cb988ba2563440d07f45adeb0c6dca642aa41d8ca88165a5d9e5ebeebf350e61b6466bdb785aa5669e7310d4374b
diff --git a/sci-libs/scotch/scotch-6.1.1.ebuild b/sci-libs/scotch/scotch-6.1.1.ebuild
new file mode 100644
index 000000000000..659fc047fa82
--- /dev/null
+++ b/sci-libs/scotch/scotch-6.1.1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib
+
+SOVER=$(ver_cut 1)
+
+DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
+HOMEPAGE="https://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/ https://gitlab.inria.fr/scotch/scotch"
+SRC_URI="https://gitlab.inria.fr/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="CeCILL-2"
+SLOT="0/${SOVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc int64 mpi static-libs test tools threads"
+# bug #532620
+REQUIRED_USE="test? ( threads )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/zlib
+	mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+static_to_shared() {
+	local libstatic=${1}; shift
+	local libname=$(basename ${libstatic%.a})
+	local soname=${libname}$(get_libname ${SOVER})
+	local libdir=$(dirname ${libstatic})
+
+	einfo "Making ${soname} from ${libstatic}"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
+			-Wl,-all_load -Wl,${libstatic} \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+	else
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-shared -Wl,-soname=${soname} \
+			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+		VERS_COMP=${PV//.}
+		[[ "${#VERS_COMP}" -gt 1 ]] && \
+			ln -s ${soname} ${libdir}/${libname}$(get_libname ${SOVER})
+		ln -s ${soname} ${libdir}/${libname}$(get_libname)
+	fi
+}
+
+src_prepare() {
+	default
+	use int64 && append-cflags -DIDXSIZE64
+	if use threads; then
+		append-cflags "-DSCOTCH_PTHREAD_NUMBER=$(nproc)"
+	else
+		append-cflags "-DSCOTCH_PTHREAD_NUMBER=1"
+		sed -i \
+			-e 's/ -DSCOTCH_PTHREAD//' \
+			src/Make.inc/Makefile.inc.i686_pc_linux3 || die
+	fi
+
+	# Be careful with replacing here, bug #577272
+	sed -e "s/= gcc$/= $(tc-getCC)/" \
+		-e "s/-O3/${CFLAGS} -pthread/" \
+		-e "s/= ar$/= $(tc-getAR)/" \
+		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
+		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
+		-e "/^LDFLAGS/ s/$/ ${LDFLAGS}/" \
+		src/Make.inc/Makefile.inc.i686_pc_linux3 > src/Makefile.inc || die
+}
+
+src_compile() {
+	emake -C src CLIBFLAGS=-fPIC scotch esmumps
+	static_to_shared lib/libscotcherr.a
+	static_to_shared lib/libscotcherrexit.a
+	static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lpthread -lscotcherr
+	static_to_shared lib/libesmumps.a -Llib -lscotch
+	static_to_shared lib/libscotchmetis.a -Llib -lscotch
+
+	if use mpi; then
+		emake -C src CLIBFLAGS=-fPIC ptscotch ptesmumps
+		export LINK=mpicc
+		static_to_shared lib/libptscotcherr.a
+		static_to_shared lib/libptscotcherrexit.a
+		static_to_shared lib/libptscotch.a -Llib -lscotch -lptscotcherr -lz -lm -lrt
+		static_to_shared lib/libptesmumps.a -Llib -lscotch -lptscotch
+		static_to_shared lib/libptscotchparmetis.a -Llib -lscotch -lptscotch
+	fi
+	if use static-libs; then
+		emake -C src clean
+		emake -C src
+		use mpi && emake -C src ptscotch
+	fi
+}
+
+src_test() {
+	tc-export FC
+	LD_LIBRARY_PATH="${S}/lib" emake -C src check
+}
+
+src_install() {
+	dolib.so lib/lib*$(get_libname)*
+	use static-libs && dolib.a lib/*.a
+
+	#install metis headers into a subdir
+	#to allow usage of real metis and scotch
+	#in the same code
+	insinto /usr/include/scotch/metis
+	doins include/*metis*
+	rm include/*metis*
+	insinto /usr/include/scotch
+	doins include/*
+
+	cat <<-EOF > scotchmetis.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: scotchmetis
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch
+		Private: -lm -lz -lrt
+		Cflags: -I\${includedir}/scotch/metis
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins scotchmetis.pc
+
+	# not sure it is actually a full replacement of metis
+	#alternatives_for metis scotch 0 \
+	#	/usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc
+
+	if use mpi; then
+		cat <<-EOF > ptscotchparmetis.pc
+			prefix=${EPREFIX}/usr
+			libdir=\${prefix}/$(get_libdir)
+			includedir=\${prefix}/include
+			Name: ptscotchparmetis
+			Description: ${DESCRIPTION}
+			Version: ${PV}
+			URL: ${HOMEPAGE}
+			Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch
+			Private: -lm -lz -lrt
+			Cflags: -I\${includedir}/scotch/metis
+			Requires: scotchmetis
+		EOF
+			insinto /usr/$(get_libdir)/pkgconfig
+			doins ptscotchparmetis.pc
+			# not sure it is actually a full replacement of parmetis
+			#alternatives_for metis-mpi ptscotch 0 \
+			#	/usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc
+	fi
+
+	dodoc README.txt
+
+	if use tools; then
+		local b m
+		pushd bin > /dev/null || die
+		for b in *; do
+			newbin ${b} scotch_${b}
+		done
+		popd > /dev/null || die
+
+		pushd man/man1 > /dev/null || die
+		for m in *.1; do
+			newman ${m} scotch_${m}
+		done
+		popd > /dev/null || die
+	fi
+
+	use doc && dodoc doc/*.pdf
+}
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 36bf5e279c61..100cf31a2b09 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -3,5 +3,5 @@ AUX sundials-5.8.0-fix-license-install-path.patch 874 BLAKE2B 134158ced2c1850aed
 DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
 DIST sundials-5.8.0.tar.gz 24012815 BLAKE2B f707ad7465218532f3dc4df7627b87933b2bc52be6f1ad290b91ab83a3414ae83bc64503126af8772daa000f58a89855d7ca35fe74fa21bd91180695582442c7 SHA512 d22e699aaddaeef026e91e18dd070d06278c75b6980b36c6fb2e50203ba6445420e4a8e0612a6317dcaa521aeffbdf62ab88737be235ef70cef3a8be02a13dbb
 EBUILD sundials-5.2.0.ebuild 2191 BLAKE2B 522ba0de818acec9ae05b929a032b6ae43389b215d53ff84ef296024fe18c893d60af374d3a1433ca8c46b5e32f0163c4142b1ba5d00ce3ffe76acc7bdf6e3b2 SHA512 4c1b05f3c4bb9160d20bff5e43a1b7d1d05529cacc8676f19056a7865f52081d1c9e07b8c535b7e8b8ad2c163f76622c5063d43003ee365f7cb591dcfdd2a9ef
-EBUILD sundials-5.8.0.ebuild 2712 BLAKE2B 1ee3ce42085318b74dfc64299c6323c81fa18a57adb809994e732dbd445f7342832ab761eba74e16b748b3280cfc9e626a0f4525c3be407302702742ef5d0098 SHA512 1a7ce334cacdddd40ffeb0f73be4b9f5aec8b16663ed4c7d5cedd201c4f145d0d5e978df86f80866db2701bb8140a70c7d1ba7a12cdfe437453160fcb6edf0db
-MISC metadata.xml 1060 BLAKE2B 279da603d6a362703f8142772042d94eca792aa1690988f1fa8efc16d7e125cb70408f11ba26bdabf2e3e121f2a71e09dc7d467f82475eee6dc72696ccf74316 SHA512 6bc695f162e38e409f71185a4ce57a6b87c456aee1c63c62135ed89293c5affeefb9dd87d2e6e8296f6c5c4385cfbf3a914cacc5570d340915617cc52ce8a82f
+EBUILD sundials-5.8.0.ebuild 2771 BLAKE2B 7a8767a6aeddd815229a2899bdd337f2c5c5930a451e3b753c0a503acd0f822305ec98e7011563eb5187c90cc645ccbb1dec03bbcb62c7efdbf5864ff8383c74 SHA512 67026fdd45685a685eb2bf9410de8d2575ad9c34d13f21a98dd665b762f472eecb9c208eef366bb3c58af948a8655feb706bd45f867287bc4976854d8c5776f3
+MISC metadata.xml 1131 BLAKE2B f898dfbe0da057432c5c0549d850293224137cb07d234721894752821b638f3002a1d17a06c4258b94fbc2d0e4ce5e9ee2b06c1099c473989de36b62001f2d63 SHA512 f53a7aec4b5ebc0f7737938f811e4c87842a07b03c423715296ad2992e353f661022eb2bb344e33fb03d70af6e4ffdf1908a34bdbafc3ebe9d30fa7f4bd7cad1
diff --git a/sci-libs/sundials/metadata.xml b/sci-libs/sundials/metadata.xml
index ad709aab336f..7e8359df0301 100644
--- a/sci-libs/sundials/metadata.xml
+++ b/sci-libs/sundials/metadata.xml
@@ -16,6 +16,7 @@
   </longdescription>
   <use>
     <flag name="hypre">Build with <pkg>sci-libs/hypre</pkg> conditioners</flag>
+    <flag name="int64">Use index size of 64 rather than 32 bits</flag>
     <flag name="sparse">Enable support for <pkg>sci-libs/klu</pkg> sparse solver</flag>
     <flag name="superlumt">Build with <pkg>sci-libs/superlu_mt</pkg></flag>
   </use>
diff --git a/sci-libs/sundials/sundials-5.8.0.ebuild b/sci-libs/sundials/sundials-5.8.0.ebuild
index 894e7ef201cf..9d6837a1479e 100644
--- a/sci-libs/sundials/sundials-5.8.0.ebuild
+++ b/sci-libs/sundials/sundials-5.8.0.ebuild
@@ -11,13 +11,13 @@ FORTRAN_STANDARD="77 90 2003"
 inherit cmake flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
+HOMEPAGE="https://computing.llnl.gov/projects/sundials"
 SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fortran hypre lapack mpi openmp sparse +static-libs superlumt threads"
+IUSE="doc examples fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads"
 REQUIRED_USE="
 	fortran? ( static-libs )
 	hypre? ( mpi )
@@ -31,7 +31,7 @@ RDEPEND="
 		virtual/mpi[fortran?]
 	)
 	sparse? ( sci-libs/klu )
-	superlumt? ( sci-libs/superlu_mt:= )
+	superlumt? ( sci-libs/superlu_mt:=[int64=] )
 "
 DEPEND="${RDEPEND}"
 
@@ -69,6 +69,7 @@ src_configure() {
 		-DENABLE_SUPERLUMT=$(usex superlumt)
 		-DEXAMPLES_INSTALL=ON
 		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+		-DSUNDIALS_INDEX_SIZE="$(usex int64 64 32)"
 		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
 		-DSUPERLUMT_LIBRARY="-lsuperlu_mt"
 		-DUSE_GENERIC_MATH=ON
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index c7169c772a3d..34d49bfcf0af 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -6,5 +6,5 @@ DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c84
 DIST superlu_5.2.2.tar.gz 2481538 BLAKE2B db9d6437c8012f1aeeb3313212298a77e4ef04405c6ec853ceeef8b80426ea80d8b9fc30a0ca2dd7288131a0e21c43e17cafafaa7fb615d6d825b54f4beb84a2 SHA512 091928a3df3433b337ebdacdb28de341d6d29d655965de6ffd656a6de18cf11171555bfd3af73082af62b1cead6835b4c11e4ba524a32db7f7d28db47c9d490c
 EBUILD superlu-4.3-r2.ebuild 1641 BLAKE2B b11715c747a425f2a7e04568a994ca9973c228b2f811423d7e502659ce6bcc723899645aaf883ed9ef9b3a696645d0263c92ba7ea988efc3a32d297498ac5f37 SHA512 0d667b80c3f443786fe0e8b6fb93c20617b0ac8a2c1393204bd1a0fb1d9a3b6612fc47af48a089e2e99daf728441e3fca07b0cc4404b249d761e188f678f5d76
 EBUILD superlu-5.2.2.ebuild 1176 BLAKE2B 652712da2a495689e09e6aa3a0ee2c57d98f576d4c043d88c93c8aed7b380e278ed9ebbe60c3653191090ebc78cf23a4139844df7cf4b15a27cfad463dc98170 SHA512 c0a3a7aede1ad66ba964f32c5d5e5235df9119cb261cb6a48c68872cb0b5425665cf9beac930a7823bda7fc999a904a673faf905b59feafaa3e5bc3b532a61a3
-EBUILD superlu-5.3.0.ebuild 1204 BLAKE2B ac0a603cb9c00ddc690b9c04536c0c19a9bc16909b327636e5025a024c827e0a3e18aff4189ac0d6e03d999cbd1ef75858b092ca4b6cd10096cf92ed175dc1bf SHA512 b8842e9eb21c387914afc6206277cd3648c206aa63b9822f26aca52da3affe68a2ac87e4460ad9168902729c847a28e541ac83921738ccf3143afddd6a2dbd41
+EBUILD superlu-5.3.0.ebuild 1209 BLAKE2B 929faf5db2ee3704daa313a89e0101cb41a49cd3ed4c8eb9993a56b241aa4bd82d6f85fdd8f947ceb35e3d4fbea31a6d579e2e28554b1587a991f3dac248c25d SHA512 f3cd7dccef3044baf01fbe371ffa3914971c2296d14030d1abe35d09992af8d865c9c8f35d7abed0cc7dc8512211f70943a1a10942923b6f41fd139364bd98f8
 MISC metadata.xml 1405 BLAKE2B 37c946ec0b73a5bdbd2b856cf571475ed8e85e220f200bde8028278dafb8ace158c21d42c9a4a2e7c3373ac4c5bdd4e39cef7947113d99baea5bd86992912dd0 SHA512 6e07a544afc19f7704a7babf09441a223b24f7772bbf856e06889ffac2ac09f20ef9e8a03003407e0ce372db42850cd075560c4b006082f4fcc569786bf868ad
diff --git a/sci-libs/superlu/superlu-5.3.0.ebuild b/sci-libs/superlu/superlu-5.3.0.ebuild
index e9e68e0bab56..063ffceaf18f 100644
--- a/sci-libs/superlu/superlu-5.3.0.ebuild
+++ b/sci-libs/superlu/superlu-5.3.0.ebuild
@@ -8,7 +8,7 @@ FORTRAN_STANDARD=77
 inherit cmake fortran-2
 
 DESCRIPTION="Sparse LU factorization library"
-HOMEPAGE="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
+HOMEPAGE="https://portal.nersc.gov/project/sparse/superlu/"
 SRC_URI="https://github.com/xiaoyeli/superlu/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/superlu_mt/Manifest b/sci-libs/superlu_mt/Manifest
index 32039b52c573..77e0cb9ba6df 100644
--- a/sci-libs/superlu_mt/Manifest
+++ b/sci-libs/superlu_mt/Manifest
@@ -1,4 +1,4 @@
 AUX superlu_mt-3.1-duplicate-symbols.patch 7284 BLAKE2B 6402f745b280c02dfb4b0fadee120c9def38819d01c5e00406f68a812a06f3d86d4ac0ee799e3abe7b081737d2566bfb6ad981f7768ac29b3a2ad0b0bc147ee1 SHA512 b233677071ce175116454614b6289faa80f60ef0dfeee728bc4a1a7603ce8490c93e63ba635d1db231c92a055dee5cdbeff2793a2e138fa688efc18bd72b693f
 DIST superlu_mt_3.1.tar.gz 1824440 BLAKE2B 6355c624eca13a6ad7fa0e6100b3a548215d93aafc5958b9a0e693b3333006e4b1e98facddf352f62ef1632c8528cb39a85ca15509abf046d32f8d97335749c5 SHA512 41b8d9808f6a9c3f8d9e983ab253b0c5aec486df1cc419d043a201bd950034fa4bdd5465410e1198a2314d072b92cb388fc117165a06f820922f04060c755971
-EBUILD superlu_mt-3.1.ebuild 2599 BLAKE2B 4eff4966f84ca878bb35a520cecc489d9ce35e3c42b32e144f7755a9ff967b2c8de729a5132a1a2ef2b200524a7c7ae50e7ed5c78f2babdf74793d69ac6c6509 SHA512 ce01e3cb4363856ef16473ab6a46fd8df956d2145958bb858928fbbee6a0224079ba047bfd76b5ede06f2e0dc69df1304898d7290572989817c97fecc9c838c8
+EBUILD superlu_mt-3.1.ebuild 2593 BLAKE2B 0a92790424e62a3de4bcc3f7dbf061a54b524c38b2a8f342ae4b4e62739d712c26979f796795969b077c1485ae898cddee46748d2e734888135413da56645e84 SHA512 4a2e60dbb4adda66ae2f96ab15ea8d3fa7803baef7137ae90a1008fd9a15fab1198d52c6ce68e9a6811eabb7fbe056add23e0e86c7b8303164e91347ca5a1363
 MISC metadata.xml 1472 BLAKE2B 75500639996e0b9e541913a3e8c65b094f38e79615e8cc07cb99c6b889259458c0cff14414004452fe320034bb7c442efa112b9eab75a853890a0c780b4850b8 SHA512 914c5f3d6e8e00e678db0c266278971a7586f7ddc06441954c6b31c272efb2e45fce7e5d93017fdee3075337a0b01f653d4d1854fc028a8e850f448ba729d969
diff --git a/sci-libs/superlu_mt/superlu_mt-3.1.ebuild b/sci-libs/superlu_mt/superlu_mt-3.1.ebuild
index 54397230e5cb..f631900a16d9 100644
--- a/sci-libs/superlu_mt/superlu_mt-3.1.ebuild
+++ b/sci-libs/superlu_mt/superlu_mt-3.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit toolchain-funcs versionator
+inherit toolchain-funcs
 
-MYPN=SuperLU_MT
-SOVERSION=$(get_major_version)
+MY_PN=SuperLU_MT
+SOVERSION=$(ver_cut 1)
 
 DESCRIPTION="Multithreaded sparse LU factorization library"
-HOMEPAGE="http://crd.lbl.gov/~xiaoye/SuperLU/"
-SRC_URI="http://crd.lbl.gov/~xiaoye/SuperLU/${PN}_${PV}.tar.gz"
+HOMEPAGE="https://portal.nersc.gov/project/sparse/superlu/"
+SRC_URI="https://portal.nersc.gov/project/sparse/superlu/${PN}_${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${SOVERSION}"
@@ -20,13 +20,13 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( openmp threads )"
 
 RDEPEND="virtual/blas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
 	test? ( app-shells/tcsh )"
 
-S="${WORKDIR}/${MYPN}_${PV}"
+S="${WORKDIR}/${MY_PN}_${PV}"
 
-PATCHES=( "${FILESDIR}"/${P}-duplicate-symbols.patch )
+PATCHES=( "${FILESDIR}"/${PN}-3.1-duplicate-symbols.patch )
 
 pkg_setup() {
 	if use openmp && ! use threads; then
@@ -71,10 +71,10 @@ src_prepare() {
 src_compile() {
 	# shared library
 	emake PIC="-fPIC" \
-		  ARCH="echo" \
-		  ARCHFLAGS="" \
-		  RANLIB="echo" \
-		  superlulib
+		ARCH="echo" \
+		ARCHFLAGS="" \
+		RANLIB="echo" \
+		superlulib
 	$(tc-getCC) ${LDFLAGS} ${LDTHREADS} -shared -Wl,-soname=${SONAME} SRC/*.o \
 				$($(tc-getPKG_CONFIG) --libs blas) -lm -o lib/${SONAME} || die
 	ln -s ${SONAME} lib/libsuperlu_mt.so || die
@@ -97,7 +97,7 @@ src_install() {
 	dodoc README
 	use doc && dodoc DOC/ug.pdf
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r EXAMPLE/* make.inc
+		docinto /examples
+		dodoc -r EXAMPLE/* make.inc
 	fi
 }
diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index 3443ba9bcf76..668a837459f7 100644
--- a/sci-libs/szip/Manifest
+++ b/sci-libs/szip/Manifest
@@ -1,5 +1,3 @@
 DIST szip-2.1.1.tar.gz 415774 BLAKE2B e0f8d1f6528801c422a4db0f0cad43dd2c17f913dfff85962f4b4d448176903bcb385f631d32c5328cfb114527220baa9fb7d560364f700a61d4930ce799a7a4 SHA512 ada6406efb096cd8a2daf8f9217fe9111a96dcae87e29d1c31f58ddd2ad2aa7bac03f23c7205dc9360f3b62d259461759330c7189ef0c2fe559704b1ea9d40dd
-DIST szip-2.1.tar.gz 383219 BLAKE2B 84e10763bcec885a423d64c2c3cff0632d7a6a39c8cd177cf607f549cb4cd02a4ca03362464c2c4ec4539c80149493329427f529f5d6daea4a35b91af6fa1538 SHA512 bb7e0af6dfaaaaa85013ef52e6901d5b7b6159795338d285c2e843bd2879230a6397fb072662fdfeda5690981db4e9af94782c057bf993f92516d92a8934cb75
-EBUILD szip-2.1-r2.ebuild 721 BLAKE2B 158b84da0268e40008349a0c99448b28ede89802cbafebea5d85f3aa055f614ec7417cc0a0f4d93b16678e93c37dd25bd7463f79d2d0123008a72b76a4ecfcbf SHA512 25e9de35c1298ff24cb3476084102cad0bfd1effe2c79f24b147846eeb5906222325ef719d125de41b15d6db007ea962a018472840b0f7446ec6eae0f39f5ec1
-EBUILD szip-2.1.1.ebuild 729 BLAKE2B 3edd5c408bc7d78b26a9295aa5c0d0eb46ecfad6dd445aabd53aa3602c3023da67fecdef5615f7939a28bd97df0046e196d97894341170b908185bcefc05f19f SHA512 db8e2adad3a5afd925662b8025492dce8ae347d00858b65e7225b5079e8c427e93a5439a79b8e7f4aad523cf09bbeaebc1d9d0b1f70d4f7a38c55d10288038e7
+EBUILD szip-2.1.1.ebuild 728 BLAKE2B f01d55e6d6f2c18d182394a397d315586ef4db534a7125cbab0c042fe325f3cb4b48eb7d650180d65adf8e9ba2d2a842ca368bafeeecf5fd687f8bee77f23e38 SHA512 f3b1ab6f6af202649ff7dbb49c96d19338891575afb393b7a1f8b0341120aef5899050cebb3945957c6f4afab39cfb49d2e5517d622af82d20bdcb8cf558490c
 MISC metadata.xml 766 BLAKE2B bd0e35e752baadb4deefad410c7e1d554cd412744af4a91acbeae68c04491b248d51f8169b81e529dfcc76b33ff8c2534f4b2dfadbda747309d3537de6ce5df2 SHA512 69ffab49952e563f8697a906f810ef7f8ae96bff70287b0f0a1f4c2b01212e6a3ba4fd89068948648979e53fd6efe1cc3c80e18584c54fdb6a8dc61cee21e14e
diff --git a/sci-libs/szip/szip-2.1-r2.ebuild b/sci-libs/szip/szip-2.1-r2.ebuild
deleted file mode 100644
index 7d7d1addd355..000000000000
--- a/sci-libs/szip/szip-2.1-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Extended-Rice lossless compression algorithm implementation"
-HOMEPAGE="https://www.hdfgroup.org/doc_resource/SZIP/"
-SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
-
-LICENSE="szip"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="!sci-libs/libaec[szip]"
-DEPEND=""
-
-DOCS=( RELEASE.txt HISTORY.txt examples/example.c )
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/sci-libs/szip/szip-2.1.1.ebuild b/sci-libs/szip/szip-2.1.1.ebuild
index c40a4a6bb077..ebfb026a668f 100644
--- a/sci-libs/szip/szip-2.1.1.ebuild
+++ b/sci-libs/szip/szip-2.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://support.hdfgroup.org/ftp/lib-external/${PN}/${PV}/src/${P}.tar.
 
 LICENSE="szip"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="!sci-libs/libaec[szip]"
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 96921d2ba696..ad0886bd773a 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -33,6 +33,8 @@ DIST sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz 2569603 BLAKE2B
 DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856
 DIST tensorflow-2.5.0.tar.gz 55999506 BLAKE2B 0f1f29ed9ff6e5fd3fc0c98419bca636f48085810f934290885b3469c45817b2ce17e9dbd3d93d70b09ec7975088edd0973f147449f527a8f2e23b388e2592ce SHA512 637c63b1bed1c0eb7bb018f1ff7f29f7f0d78e75dac384df4ecb5dfb92bbcb28209e3d3d2204145abddf88e3247d8c31bbb4cea032a73b7122b2ef3eb0d2b947
 DIST tensorflow-patches-2.5.0-r1.tar.bz2 5180 BLAKE2B aafebb5cc4616ad93982e0fd8299f91c22063b96841b920a98a4cb54bcdc0cad51011f943ca62055239a0c21ed69d1f5b985710dcf0c28346b7ba12114583842 SHA512 38acd53136f3f1e061b71624cc5a1cefbdcb1d897b7728bc93462e8f52e998c3d72453ca9c94fa53dd28279cae5c591b7cbe9f61684784ff94c451a641524f31
+DIST tensorflow-patches-2.5.0-r2.tar.bz2 5538 BLAKE2B df289d77a79bb2143ebe26685f3c8f2efe64819a2fd6bd9866bc05638d2c19e822ddb90df3f342f1fc27827b3799531ad4ed280f9cc5291e75b1c2042a61603f SHA512 4f5ecb4efb56e735ee79dd07e0e8737f535da4e9ba8f63f769d548813e5aa7017e03cd1bd0d661e1958fa2916df7c7f25a7c0d141dbfe9716586ca82c021169f
 DIST tensorflow-toolchains-v1.1.10.tar.gz 137512 BLAKE2B 774b22a599070564c0f77ed0da79f6a96359b196dd3007370be885b796c236b9a29c01597507a3049f82cf489824c8016740b778cacb2b8cd859500f9ecb1887 SHA512 1daf4684f5b364a89b3cc475cf2d13d0d0622fc14d2b32d7ad8518932538e716782d755cfcedc98d129a3986bc7c38bfc7854c8ad596891e397510b75ae2f93e
 EBUILD tensorflow-2.5.0-r1.ebuild 15608 BLAKE2B 6719de1a01b17354c17e5648ecf52ce77d296bbeceaafefef4ca4f03651fbfb097629cdf2fc68aa355cdcf3f6dc20d38cbad91ca1e2fd9330761db46fac75c47 SHA512 ae9c082b8c7d251cfdbf15d153b504865c10a1e86087155df158ee187df88f7779c0505c019806b162fbc214b12d7424e58cbff733c55713be3506c986407742
+EBUILD tensorflow-2.5.0-r2.ebuild 15607 BLAKE2B 75450401229fda615b38dab3d3cbd56d18114a13fcf0b58c1b6b45cd319048a1efad85bdd0263cff5f197ebde1aecf06b6a7e8cf3eb9695dbbefa7b2f4d93279 SHA512 b34bf5612e9ba415e3d3211912eb0ab011709ce507a0754defdda51985cbe9af86189f664f509f7e4035c99b506b3c12492e729ad95250975acc8a7273b0344a
 MISC metadata.xml 501 BLAKE2B 16095ae1e7ff9fdd7efe0bb5184ce1d7e46cb5c8f98a650ec4f69742262c678b9945d35b12ba518f8a9b36cad8cd23483a95aca0141ddbe07e4210cef16d2949 SHA512 d1f08e9360ab7c4ec516787807cc53f795d99dde6287b7024535bae4dae4a0107117548784bb25ac07cee15ad1676d98e9c9d472ec97023dfc3e0bdd72a26d28
diff --git a/sci-libs/tensorflow/tensorflow-2.5.0-r2.ebuild b/sci-libs/tensorflow/tensorflow-2.5.0-r2.ebuild
new file mode 100644
index 000000000000..3bfe94d961f9
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-2.5.0-r2.ebuild
@@ -0,0 +1,413 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit bazel check-reqs cuda distutils-r1 flag-o-matic prefix toolchain-funcs
+
+DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda mpi +python xla"
+CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
+for i in $CPU_USE_FLAGS_X86; do
+	IUSE+=" cpu_flags_x86_${i}"
+done
+
+# distfiles that bazel uses for the workspace, will be copied to basel-distdir
+bazel_external_uris="
+	https://github.com/abseil/abseil-cpp/archive/6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz -> abseil-cpp-6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz
+	https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz
+	https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz
+	https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip
+	https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip
+	https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz
+	https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz
+	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
+	https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz
+	https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz
+	https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz
+	https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz
+	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
+	https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip
+	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
+	https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz
+	https://github.com/google/ruy/archive/54774a7a2cf85963777289193629d4bd42de4a59.zip -> ruy-54774a7a2cf85963777289193629d4bd42de4a59.zip
+	https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz
+	https://github.com/llvm/llvm-project/archive/1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz -> llvm-1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz -> llvmorg-10.0.1-openmp-10.0.1.src.tar.xz
+	https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
+	https://github.com/oneapi-src/oneDNN/archive/v2.2.tar.gz -> oneDNN-v2.2.tar.gz
+	https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz
+	https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.zip -> pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip
+	https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz
+	https://github.com/tensorflow/toolchains/archive/v1.1.10.tar.gz -> tensorflow-toolchains-v1.1.10.tar.gz
+	https://gitlab.com/libeigen/eigen/-/archive/f612df273689a19d25b45ca4f8269463207c4fee/eigen-f612df273689a19d25b45ca4f8269463207c4fee.tar.gz
+	cuda? (
+		https://github.com/NVIDIA/cudnn-frontend/archive/360d6e7164dfb7c802493fd1c0464f0d815b852a.zip -> cudnn-frontend-360d6e7164dfb7c802493fd1c0464f0d815b852a.zip
+		https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip
+		https://github.com/nvidia/nccl/archive/v2.8.3-1.tar.gz -> nvidia-nccl-v2.8.3-1.tar.gz
+	)
+	python? (
+		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz
+		https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt
+		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
+	)"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
+		${bazel_external_uris}"
+
+RDEPEND="
+	app-arch/snappy
+	dev-db/lmdb
+	dev-db/sqlite
+	dev-libs/double-conversion
+	dev-libs/icu:=
+	>=dev-libs/jsoncpp-1.9.2
+	dev-libs/libpcre
+	dev-libs/nsync
+	dev-libs/openssl:0=
+	>=dev-libs/protobuf-3.13.0:=
+	>=dev-libs/re2-0.2019.06.01:=
+	media-libs/giflib
+	media-libs/libjpeg-turbo
+	media-libs/libpng:0
+	<net-libs/grpc-1.39:=
+	net-misc/curl
+	sys-libs/zlib
+	>=sys-apps/hwloc-2
+	cuda? (
+		=dev-util/nvidia-cuda-toolkit-11*[profiler]
+		=dev-libs/cudnn-8*
+	)
+	mpi? ( virtual/mpi )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/flatbuffers-1.12.0:=
+		dev-python/absl-py[${PYTHON_USEDEP}]
+		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
+		dev-python/astunparse[${PYTHON_USEDEP}]
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/flatbuffers[${PYTHON_USEDEP}]
+		>=dev-python/gast-0.3.3[${PYTHON_USEDEP}]
+		dev-python/h5py[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+		>=dev-python/google-pasta-0.1.8[${PYTHON_USEDEP}]
+		>=dev-python/opt-einsum-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		>=dev-python/grpcio-1.28[${PYTHON_USEDEP}]
+		>=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}]
+		>=net-libs/google-cloud-cpp-0.10.0
+		>=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}]
+		>=sci-libs/keras-preprocessing-1.1.2[${PYTHON_USEDEP}]
+		>=sci-visualization/tensorboard-2.5.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	python? (
+		dev-python/mock
+		dev-python/setuptools
+	)"
+PDEPEND="python? (
+		>=sci-libs/tensorflow-estimator-2.5.0[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.8.0
+	dev-java/java-config
+	>=dev-util/bazel-3.7.2
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
+	)
+	!python? ( dev-lang/python )
+	python? (
+		dev-python/cython
+		dev-python/mock
+		>=dev-python/grpcio-tools-1.28
+	)"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/0008-patch-ruy-for-gcc-11.patch"
+)
+DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="10G"
+
+get-cpu-flags() {
+	local i f=()
+	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
+	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
+		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
+	done
+	use cpu_flags_x86_fma3 && f+=( -mfma )
+	echo "${f[*]}"
+}
+
+pkg_setup() {
+	ewarn "TensorFlow 2.0 is a major release that contains some incompatibilities"
+	ewarn "with TensorFlow 1.x. For more information about migrating to TF2.0 see:"
+	ewarn "https://www.tensorflow.org/guide/migrate"
+
+	local num_pythons_enabled
+	num_pythons_enabled=0
+	count_impls() {
+		num_pythons_enabled=$((${num_pythons_enabled} + 1))
+	}
+	use python && python_foreach_impl count_impls
+
+	# 10G to build C/C++ libs, 5G per python impl
+	CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack "${P}.tar.gz"
+	unpack tensorflow-patches-${PVR}.tar.bz2
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	append-flags $(get-cpu-flags)
+	append-cxxflags -std=c++14 # bug 787938
+	filter-flags '-fvtable-verify=@(std|preinit)'
+	bazel_setup_bazelrc
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	# Relax version checks in setup.py
+	sed -i "/^    '/s/==/>=/g" tensorflow/tools/pip_package/setup.py || die
+	sed -i "/config_googleapis/d" tensorflow/workspace0.bzl || die
+
+	# Prefixify hard-coded command locations
+	hprefixify -w /host_compiler_prefix/ third_party/gpus/cuda_configure.bzl
+
+	default
+	use python && python_copy_sources
+
+	use cuda && cuda_add_sandbox
+}
+
+src_configure() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
+
+	do_configure() {
+		export CC_OPT_FLAGS=" "
+		export TF_ENABLE_XLA=$(usex xla 1 0)
+		export TF_NEED_OPENCL_SYCL=0
+		export TF_NEED_OPENCL=0
+		export TF_NEED_COMPUTECPP=0
+		export TF_NEED_ROCM=0
+		export TF_NEED_MPI=$(usex mpi 1 0)
+		export TF_SET_ANDROID_WORKSPACE=0
+
+		if use python; then
+			export PYTHON_BIN_PATH="${PYTHON}"
+			export PYTHON_LIB_PATH="$(python_get_sitedir)"
+		else
+			export PYTHON_BIN_PATH="$(which python)"
+			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
+		fi
+
+		export TF_NEED_CUDA=$(usex cuda 1 0)
+		export TF_DOWNLOAD_CLANG=0
+		export TF_CUDA_CLANG=0
+		export TF_NEED_TENSORRT=0
+		if use cuda; then
+			export TF_CUDA_PATHS="${EPREFIX}/opt/cuda"
+			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
+			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
+			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
+			einfo "Setting CUDA version: $TF_CUDA_VERSION"
+			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+
+			if [[ $(cuda-config -s) != *$(gcc-version)* ]]; then
+				ewarn "TensorFlow is being built with Nvidia CUDA support. Your default compiler"
+				ewarn "version is not supported by the currently installed CUDA. TensorFlow will"
+				ewarn "instead be compiled using: ${GCC_HOST_COMPILER_PATH}."
+				ewarn "If the build fails with linker errors try rebuilding the relevant"
+				ewarn "dependencies using the same compiler version."
+			fi
+
+			if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then
+				ewarn "WARNING: TensorFlow is being built with its default CUDA compute capabilities: 3.5 and 7.0."
+				ewarn "These may not be optimal for your GPU."
+				ewarn ""
+				ewarn "To configure TensorFlow with the CUDA compute capability that is optimal for your GPU,"
+				ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow."
+				ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5"
+				ewarn ""
+				ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus"
+				ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'"
+			fi
+		fi
+
+		# com_googlesource_code_re2 weird branch using absl, doesnt work with released re2
+		#com_github_googleapis_googleapis
+		local SYSLIBS=(
+			absl_py
+			astor_archive
+			astunparse_archive
+			boringssl
+			com_github_googlecloudplatform_google_cloud_cpp
+			com_github_grpc_grpc
+			com_google_protobuf
+			curl
+			cython
+			dill_archive
+			double_conversion
+			enum34_archive
+			flatbuffers
+			functools32_archive
+			gast_archive
+			gif
+			hwloc
+			icu
+			jsoncpp_git
+			libjpeg_turbo
+			lmdb
+			nasm
+			nsync
+			opt_einsum_archive
+			org_sqlite
+			pasta
+			pcre
+			png
+			pybind11
+			six_archive
+			snappy
+			tblib_archive
+			termcolor_archive
+			typing_extensions_archive
+			wrapt
+			zlib
+		)
+
+		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
+		export TF_IGNORE_MAX_BAZEL_VERSION=1
+
+		# This is not autoconf
+		./configure || die
+
+		echo 'build --config=noaws --config=nohdfs' >> .bazelrc || die
+		echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die
+		echo "build --action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die
+		echo "build --host_action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die
+
+		for cflag in $($(tc-getPKG_CONFIG) jsoncpp --cflags)
+		do
+			echo "build --copt=\"${cflag}\"" >> .bazelrc || die
+			echo "build --host_copt=\"${cflag}\"" >> .bazelrc || die
+		done
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_configure
+	else
+		do_configure
+	fi
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
+
+	if use python; then
+		python_setup
+		BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}"
+	fi
+
+	# fail early if any deps are missing
+	ebazel build -k --nobuild \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so \
+		//tensorflow:libtensorflow_cc.so \
+		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
+
+	ebazel build \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so
+	ebazel build //tensorflow:libtensorflow_cc.so
+
+	do_compile() {
+		ebazel build //tensorflow/tools/pip_package:build_pip_package
+	}
+	BUILD_DIR="${S}"
+	cd "${BUILD_DIR}"
+	use python && python_foreach_impl run_in_build_dir do_compile
+	ebazel shutdown
+}
+
+src_install() {
+	local i l
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
+
+	do_install() {
+		einfo "Installing ${EPYTHON} files"
+		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
+		cd "${srcdir}" || die
+		esetup.py install
+
+		# libtensorflow_framework.so is in /usr/lib already
+		rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die
+		rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die
+		python_optimize
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir do_install
+
+		# Symlink to python-exec scripts
+		for i in "${ED}"/usr/lib/python-exec/*/*; do
+			n="${i##*/}"
+			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
+		done
+
+		python_setup
+		local BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}" || die
+	fi
+
+	einfo "Installing headers"
+	ebazel build //tensorflow:install_headers
+	ebazel shutdown
+	insinto /usr/include/${PN}/
+	doins -r bazel-bin/tensorflow/include/*
+
+	einfo "Installing libs"
+	# Generate $(tc-getPKG_CONFIG) file
+	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc ${PN}_cc.pc
+
+	for l in libtensorflow{,_framework,_cc}.so; do
+		dolib.so bazel-bin/tensorflow/${l}
+		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1)
+		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3)
+	done
+
+	einstalldocs
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 983853cfc069..b544b159a811 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index 2d46909459a8..28efeb1c68cf 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -3,12 +3,12 @@ AUX gimps-25.6-conf.d 254 BLAKE2B 44cbf88e3bba505846396c87a68c879d03f76f7f0d0334
 AUX gimps-28.9-init.d 722 BLAKE2B 8d55dfbb4166da76e2621097c85165ef49ade916d4ac76576b2abb249d79e0dcd7e37e060a0996576993e6510c051099d6bb7bed6da4ec8800f51b964803c3a8 SHA512 8a7501d8347aa0974268c910890550a2ce5a3d11606670dd69d5e5ccb1046e2994bc5b1f04f9e9dae89174a5a69f9158757079b835fbff50fd25f983190521e9
 AUX gimps.service 283 BLAKE2B db6c0c777d514aa0216c1af087418ead25561ffa950752e237e1633a6b6414b56732b84aabd11533ea3dab34f8657358370d21c4730f551d0ff5cf03006b7ad3 SHA512 710c7d075d5542364746b837f2b62257011abb8f45862bf0a1fabd53adb182b5fd969256c7f3221506fef38e81ab1b0f4698efafc1ca7908d9e2d42dee386d8b
 AUX gimps.tmpfiles 38 BLAKE2B c306d739ed0a0cc8bb4c80c7051ad93326cf0054d3f7fd61c4ed8a7d518356d521f7d3c3202d0b8b69723b8e7178457a34c65e92732eb15e8e64c3dff468ae2a SHA512 61c5eda13289175cdf55704442ceab4d5391d24cfa49f04155799fc2798e5ad5f1e624802e1c04b99685b1560f9898d1b0fc0c15c82251d1a765dd5de93024d8
-DIST gimps-30.6.4.linux64.tar.gz 7282669 BLAKE2B 7621ebd8f55660dcdb9f7b892c1963b3de1af72b186053386c4847fdf4ce9b2d7fc9e113bca99d9afccb9574b935ade4a66c485c97f67224def284b0a16ad601 SHA512 20268be0b94b86d62fc2b46f7add1a4353188638fcf9e647b294484bd049ddcaa046fbe284d48c3a263389366ff9edda024ef122faf33d0e78c6f20820f8cf0a
+DIST gimps-30.7.5.linux64.tar.gz 7101084 BLAKE2B 3096cd8aaedca34e3056a5ee9202c7d012c7d60e718dcfa06b2c3d9f43597f634c7bdec3c3e3ae8ca3ef36c86a06df404bb37b5a1d0cc8aa6355665cd0f1cf4f SHA512 a26da7886521d935f3599295411159b805ee0b38b9359791a6d9158cbf26407e4bdeae6c63f629315730d716d62abc1aba896c9942dbcc58a09666d60bc0a382
 DIST p95v303b6.linux32.tar.gz 5702312 BLAKE2B 728c8b8e7e2b5187dc8126bccc5e2c165fbfbc0900d6c35517cd21b78e5292df143641e3766cc0146918062039b1eecab568f9b278f64b1b9197ee2f775603b9 SHA512 3e06fb77be07334949ece3ae152bdf5491f0b7f8e33e0e8ed2af3c34332841975a9514d1993ed2355abfa4e09f93e42093d02f96dc30c3471ae9f974cc2de11a
 DIST p95v303b6.linux64.tar.gz 7046127 BLAKE2B 9cde9c2670203071cfc463434a47c8123064cb232bfeb25d8767cad2c25ea75b395e2ec135b7b4a6dc9616e9d6b05ead371e1083274a82468f62a0e1de93c98f SHA512 6d6ded9a1724993d42adee28d400b0337835c52a4ce42271e62efb37134adfc6f017f55475860fbc1224e377a227ef8547b8852a35c082c37e996f4a1c1b570c
 DIST p95v305b2.linux32.tar.gz 5695951 BLAKE2B d97f5b553e0a0563d51a08049c08fe31231e2689cfe6ec979b832603bace334755e947be2d7a106d4f4b807070568746f2cdabf869c5c4c6e125155c332b10bf SHA512 b5caa642e742438f10b5ee89d27213834755051679fe0d4d452e446b2f7628c8a874227971473d4319b8841f47a0bb32e7de9731d8b45e808356efb11922716e
 DIST p95v305b2.linux64.tar.gz 7165963 BLAKE2B 3ae20e8e29273650e94ff8774f973240c6b57d7a54e1674e7f741a9d366d3fdad98bb91b8e2abfcf7e1df6319476aa116e921171f2b585a568ee7d5038635531 SHA512 5fe250f7dcc35767fd5f4529219351095d1076f631528d80fa09498e27fa211abc621ef070548c398402143bec5e1d6e6e974155f50eb9f42af0ca179e4e03a8
 EBUILD gimps-30.3.6.ebuild 1808 BLAKE2B 3483a73734d0b0008c992a946d36558f1e8ac93872a46bf80d79bb21ae65720c5614df1e1380fb15c2db2537559bc1969fc90dba0614afef1c2f8a6419ea996d SHA512 0dd32cf22373ec922a2716afc7f60ed5af2b0f76ba8f91b94eef891b1137b1dc597f0aca3609f76cb56b3f90b973953decd946d37e02cb6a1db1df1fd81c55a4
 EBUILD gimps-30.5.2.ebuild 1884 BLAKE2B ab8a5f9fec9a8cef6bdd4284364201fd29bb7a25070170f4de072e18be7749a7e0406a37f8a5321cbeb5709f1cfb2f1d4d655914d0032d9ee2ec67c59d720b62 SHA512 d2f7e56482733997dc72872e83e0b64a47d15ff1985b61bde6be2aec8c3543a97638d625125e4b30ec4a057e748f3fb422fc06c0c8d25c22a74a221bb675fcc9
-EBUILD gimps-30.6.4.ebuild 1821 BLAKE2B 748341f70cbe142cfe193c48c32a1254d881a3a518621499572e7b72442c4b2e466929018789f03454068c90cd483c8848a2545d82b4ccc05a6b3b510bd7720a SHA512 5f59cfdb4b50d55ce5268f7115bdad851b78e079ad6fdc499e72e211130f25612c6c3cf6c0f5db7cf18579aac0a1dfbef12da9ad43a169f1e51d86025bcd51e6
+EBUILD gimps-30.7.5.ebuild 1821 BLAKE2B 748341f70cbe142cfe193c48c32a1254d881a3a518621499572e7b72442c4b2e466929018789f03454068c90cd483c8848a2545d82b4ccc05a6b3b510bd7720a SHA512 5f59cfdb4b50d55ce5268f7115bdad851b78e079ad6fdc499e72e211130f25612c6c3cf6c0f5db7cf18579aac0a1dfbef12da9ad43a169f1e51d86025bcd51e6
 MISC metadata.xml 560 BLAKE2B 01b265f54acd4ad1c9e1d23043d4ce2020fd41843a0efb09003046ea835989393df9935edcc3320eff43d552e47c2bb5afc688ddb96e9e6088c1e1c3a38fca64 SHA512 ba744b0b86d81acf54ed31c70e19be7ee315b6976b29cf0a40e79a7a227b8f68f4262ac2eecd696ddf051dd13de2019dae5df43706ca629bceca738e0e501175
diff --git a/sci-mathematics/gimps/gimps-30.6.4.ebuild b/sci-mathematics/gimps/gimps-30.7.5.ebuild
index f1cf70e083a8..f1cf70e083a8 100644
--- a/sci-mathematics/gimps/gimps-30.6.4.ebuild
+++ b/sci-mathematics/gimps/gimps-30.7.5.ebuild
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 979234487232..8946c63a44fc 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,7 +1,5 @@
 AUX gmp-ecm-7.0.4-execstack.patch 1568 BLAKE2B ccf8b74074bf357e74bc6126c505ebc77c389c851ee0ec35743c99270b6f36fa92d26c9df4b1f1a20e125a3b6dbd53522fa441d91fc4f8427d3b6d6ab50be07a SHA512 874924dd2f81c2e85dd4cdb0d8a14d1e22a9aca0c3883a9e16f1888f61b5af9b26a8c80469b65566a4becefce6a1d37ecdbba029648b4d62dc320f9e5a776453
 AUX gmp-ecm-7.0.4-openmp.patch 795 BLAKE2B 2a857cba5e0bc4e7dfe710c250bcb721dd2fd5e0c9c049987f8505d2efc758ff026b313bc92a2b18472bbebc320c8d1187c8506eaea6d2f1f6d51da284bca3ae SHA512 063d20e5a4cf088aaed31eb79c6b253ef4747d3d449c70936b4079c519480767f4f19dc259894422dc6d5783c9c360fc2c3a9fda4bb9b2a124a0e7bd90c08554
 DIST ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
-DIST gmp-ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
-EBUILD gmp-ecm-7.0.4-r2.ebuild 1215 BLAKE2B c018b48131e2baeb0f373993b32c2a1e05b9669932ac54ece52ba30b8e0b63a6e59ff4506cbcd85bcb1d7e3ace665d993d4bae830ecb9f2909530fc41d3a78db SHA512 912183343a5a87f9fb27934de2e729a4eef66dec2a72ef6afbdb59eff91da2e2222647976b4304d186c40ef65a79a3536103527fbf0d9346419a46ddc3e5b476
-EBUILD gmp-ecm-7.0.4-r4.ebuild 2006 BLAKE2B 103f94466d63669a880d9b883799e2fbefb4f3d887eef3711569bf6e55aca319599c91b2b1b1979f922d9633e9491df3276037ff7f7100e85ed091001dc54b3b SHA512 c66648073d3097233010fccbcf55c16437910833cf521d8aad0cd22f272a0b65ea008809750abfecb1fe96d88828041382b3541a1740e6e35757593dd8003c40
+EBUILD gmp-ecm-7.0.4-r4.ebuild 2004 BLAKE2B 60f412108fdab2ca5ba1d06218e29311fad9899d5ad12cb7e50c39b4194dafc70b9c6e73d68b07cf2dc1f938744b37320e91d2d025b60d868397c26407dacc27 SHA512 b23a5852c8f28b9b8c857572ea6e864b8ae3fd91b07748636a3e575a6eb274f80051daaae981c1159829dcc5fd21874b9c4087f686f88d4ccaaddb9ca13768dd
 MISC metadata.xml 643 BLAKE2B 90da8b09f30dd8bd8d4df3dcc388663e52d57ea7b2974becede9ed0c592eaacb33958d202cee33988b79364e058ef84676e995b9d8467beb1f7d89ad8b177136 SHA512 e2f0d6f286440543ed15531183671b30f0044c38685e58617d004286b596ba1b898c470dc39e2ebe95db10c83be9430f1a010539ba2b0231883fe6bf4b0b97a8
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
deleted file mode 100644
index ee5812002ccf..000000000000
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Elliptic Curve Method for Integer Factorization"
-HOMEPAGE="http://ecm.gforge.inria.fr/"
-SRC_URI="https://gforge.inria.fr/frs/download.php/file/36224/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-macos ~x64-macos"
-IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
-
-DEPEND="dev-libs/gmp:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/ecm-${PV}"
-
-pkg_pretend() {
-	use openmp && tc-check-openmp
-}
-
-src_compile() {
-	default
-	if use custom-tune; then
-		# One "emake" was needed to build the library. Now we can find
-		# the best set of parameters, and then run "emake" one more time
-		# to rebuild the library with the custom parameters. See the
-		# project's README or INSTALL-ecm. The build targets don't depend
-		# on ecm-params.h, so we need to "make clean" to force a rebuild.
-		emake ecm-params && emake clean && emake
-	fi
-}
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable openmp) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable custom-tune asm-redc)
-}
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
index 800fcf6b3584..d090e6592b6d 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/9cd422ec80268f8a885e499e17
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-macos ~x64-macos"
 IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 35e497b3539e..b8e03b538908 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -7,5 +7,5 @@ DIST octave-6.2.0.tar.gz 32620419 BLAKE2B 55fd06336263b43f921ef30cac4fb82951a6be
 DIST octave-6.3.0.tar.gz 32859335 BLAKE2B 032f0e74b2fcd41358db1adc7f7274f6c8e327f5f86a32739864078bf236af26544f5988e774ebdd2ed28a6906e86556ce44ecd4bc5d3e710d839ecf5dcad9d9 SHA512 9582d7a7d84beef2a22d3dfaf45aee4778fc0dfc0ec1831c5bcb863dd0062e996e5b7aaaa40519c23d2c730c3408e26745b9dbf73db5127ebae22da0b2532788
 EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c01945957a56b6b5b79ac2e194ebaf01194dc96d53d0cff2ec79da04aa888f0999dd9df448cda0a6bfe1de61bbfb340 SHA512 eca18c92da4e6a76639ba1d421e648f8ed6b2fb903be02bb466038746ced17ad2c1e0cd3cea6a6ce467ba23728b5df1eb5e6bd6c9bd37d112cc63183cbc0aeda
 EBUILD octave-6.2.0.ebuild 5384 BLAKE2B 2069e4642fdbfc3f9fc8f1f32cc7f8158f8b19b895078649e2c7d6b3a8a3a4a90974416acf4d63d8d3eddeffcdaa6c0fea19adc41d45746b24dbaade8f425ab7 SHA512 3bcf79a1f9836a8a24e94e4b637030bd573e4c90f090a76807e0dbd1dc53b5417c6669bf760852f628b6836f96b0ae452d81596ff6ee42aada95c6d04f85eda3
-EBUILD octave-6.3.0.ebuild 5134 BLAKE2B fd44f94ae9fbfb79d14454a226f125e4d80a0f266f2f36ac3339870a995258780edfe16077dfec8719a5222989ca1adbd7f469afc3bac207b870a48e487da423 SHA512 a0ed121465799575865f4a5227b34f0626c5c92954cdfed3f1daa7a2f72422be2fcfde43f449a13d34f16760d5af7a7068db54932b893ed7d5b5157ffeabc7e2
+EBUILD octave-6.3.0.ebuild 5141 BLAKE2B b71e881edee3c2870506b3f671c2164257ab0eaa6b89088f7b150cfb1785d754b1c54426a725013f7330570e6db6f709c430663bb6c90e601224444d949bfd5b SHA512 7357f59c466707efa991eee029e140d283e03c6576ca02078b0483002e3b3d21044acb12ba50d2be1e86753558ac7840e2fc3f33f85c9cf7af1b705e2604809c
 MISC metadata.xml 1154 BLAKE2B 34f491369b5ef047f0540be74994b9d6507310db475dc25868e2320e5c4474ebeaba2f80ba90759df53c15294c71ad9631e5f98ad81d2098d3e86e308d5c9eaf SHA512 9f73af69e5318693db98720836f0df25518c4bc3ac9ff72071aa04aaca1147e2c21d14a299b199689e926bff059c33c20f39b9f85062d1e1227e466b2b8b3446
diff --git a/sci-mathematics/octave/octave-6.3.0.ebuild b/sci-mathematics/octave/octave-6.3.0.ebuild
index 0b1370942764..5c1ff358633d 100644
--- a/sci-mathematics/octave/octave-6.3.0.ebuild
+++ b/sci-mathematics/octave/octave-6.3.0.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
 	portaudio postscript +qhull +qrupdate readline sndfile +sparse
 	ssl static-libs sundials X zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
diff --git a/sci-mathematics/petsc/Manifest b/sci-mathematics/petsc/Manifest
index 2c3a35771c34..3425c368f176 100644
--- a/sci-mathematics/petsc/Manifest
+++ b/sci-mathematics/petsc/Manifest
@@ -7,5 +7,5 @@ DIST petsc-3.14.6.tar.gz 39719179 BLAKE2B d3047baf87c67eb64ef02c0c54d6313ea06f09
 DIST petsc-3.15.0.tar.gz 15976488 BLAKE2B babfbeb05321c9cb2f7d70ef8ffca974a016eae73ca1a3359d9a8d38aa5aa90ff34571169a5711627d738b93f89fdee3d0a0ff1bd0e51cb7300bbb9b0a8675cb SHA512 d1565823d8a5ce5e1c2c576bbe1b4ebf467cef20bbd8e0cf6c303c6c2af2bf902b66c79468f4e125496f9242be4bd6ac162535ee30252cfb902c0d906a6f27c0
 EBUILD petsc-3.13.1.ebuild 5441 BLAKE2B 4667cec337591f42d271ec0560e7552e770fac5f0763840086bbe7c29b03c68f6668bfda76c4541e21b55be5ef5b9f9a6ff8e636b190b0db967c1a222e9a6a44 SHA512 81440b0d64bef9334378d30956e9d9b509a67724f3c3b45d94ef3ca74daae1c87d2653df34083e6f6e337be164d8dd75d89f8f2e8268db1d29c83e65973b9317
 EBUILD petsc-3.14.6.ebuild 5333 BLAKE2B 8e831ca2e5196debbdbc15cdb67c492fdf23842450e46f1b9b8d6213614bbff4eba784b5ce7e64bc298752db63d3fb32aad0cedfcd966be4070dd5a672a6e6ce SHA512 a3f5e32ac5399b0a037381e7a649326eb6a0baf4a85b3865a2f449a38d379f2f176a3a596336bf9e62b812612c09407c1fc59824f9a4f0fcb48832bdca06a55a
-EBUILD petsc-3.15.0.ebuild 5253 BLAKE2B 6516dbec2cc2ea7adb05bc0b5d7feef770ea9d24ad3e9680e84a8d04117434e7555b22b760d69c74a247b48282532955dab71314e5939de4406e25ebb2322363 SHA512 49aa26b5019f9f992dec1bd4c6ff5c97ff9a0c6f5e05bef492c41e99831979791704adb21b8e11ab0cd61e60a74e1bed25e35128d320ce2d1518f831e396188e
+EBUILD petsc-3.15.0.ebuild 5255 BLAKE2B 41d04984205966ed4a05d5ea222ca4cfba15694ec4beeaec2fffe3963063a022257b06a2705ae1b101e86a45a037b6e2eec1678004c24f5bb5dbac422ae0a48c SHA512 715207f30704835e5c868d005d6acf6e769eba6037cd1bdaf61d7cca5bc889d8179721cd89168484737591b574c5d831e1ad50f83125fa9120b002589aa9ead9
 MISC metadata.xml 1132 BLAKE2B 97f06bc09680f9133b4c693b4d564dcf0e45a839114be1d49bda6a2adc5521b7b4236af50fab81603212456a428406a7eb78f9266be1f28367f032ce6f526cb1 SHA512 1ea1407782022a64ee166b9cb1b9408ca1c30f13fc94c3da1f2484a8ea3ae79ebe109f4c3cacaef3152360fd8eb8a2e6d9383d307b35d0e36dd193f5ec10478d
diff --git a/sci-mathematics/petsc/petsc-3.15.0.ebuild b/sci-mathematics/petsc/petsc-3.15.0.ebuild
index f1f095b8b2cc..b728a0178015 100644
--- a/sci-mathematics/petsc/petsc-3.15.0.ebuild
+++ b/sci-mathematics/petsc/petsc-3.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
 
diff --git a/sci-mathematics/slepc/Manifest b/sci-mathematics/slepc/Manifest
index a5e824208036..2b7c9b42733f 100644
--- a/sci-mathematics/slepc/Manifest
+++ b/sci-mathematics/slepc/Manifest
@@ -3,5 +3,5 @@ DIST slepc-3.14.2.tar.gz 4865497 BLAKE2B d6fd0b45368383fad03b17f9d7f0ef26215b745
 DIST slepc-3.15.0.tar.gz 5191730 BLAKE2B 2fcdfbe25f59a80390478059ef0a8b066ac39b57e99fe65ab4fe4814507fdc78d1feb245df5f7542f08c151d20f2e2a6168c4bc2624f78ab5058627816bb6696 SHA512 f815f0805db3f3e329324778c172ba301ebb5d2fc8f8f4c5dd17e574a2cbed5c0f8015715bc908dfcbd4050fade8dab7ae3b312bae746c41d84c57bc5d101929
 EBUILD slepc-3.13.1.ebuild 1581 BLAKE2B 291e731de8209dfb55923816e77edd14017ffec77db4cc96c51fb4d9af14fb273141e424059d77cd123ccaf1d29d436eaa17d8b8e0e5b09eceaa580b52711d7f SHA512 2b59fb26a733c4f1ccb9bdc894cf0534dc0a9d6e150b70a22dd456082d6db7961704be5dade2fc4761930931aa845f486d66db72b0eedae63b21bb9e69054aa2
 EBUILD slepc-3.14.2.ebuild 1581 BLAKE2B 291e731de8209dfb55923816e77edd14017ffec77db4cc96c51fb4d9af14fb273141e424059d77cd123ccaf1d29d436eaa17d8b8e0e5b09eceaa580b52711d7f SHA512 2b59fb26a733c4f1ccb9bdc894cf0534dc0a9d6e150b70a22dd456082d6db7961704be5dade2fc4761930931aa845f486d66db72b0eedae63b21bb9e69054aa2
-EBUILD slepc-3.15.0.ebuild 1581 BLAKE2B 291e731de8209dfb55923816e77edd14017ffec77db4cc96c51fb4d9af14fb273141e424059d77cd123ccaf1d29d436eaa17d8b8e0e5b09eceaa580b52711d7f SHA512 2b59fb26a733c4f1ccb9bdc894cf0534dc0a9d6e150b70a22dd456082d6db7961704be5dade2fc4761930931aa845f486d66db72b0eedae63b21bb9e69054aa2
+EBUILD slepc-3.15.0.ebuild 1583 BLAKE2B 1897d8420f72f8732d604981f73fc00770749195cc8310b3ca4c464a2e07793b0445549dd68f14bb48973f686b39f95639388478cd0b2189251f4c1952d2272c SHA512 e9cec56f0df9015ddadd844392f50d0cc8faaf2929c717f07089af0b2dc73a43ed9d3fdffa23c49a254e445dfec034d62026242780392404b49ae79e7a0508dd
 MISC metadata.xml 452 BLAKE2B 88f38d59fe707307721dce331ce359fb394e246e86c9acffe2bca8dcbd08f02f843ecb1c3812ed15af022edb2ccb4132e16067da9ac58129dfdef4119cc00738 SHA512 37974d7da3a3b4ae085ac3430c85ff74d4fafe453b9ef32cccebf893cdcc3074d89f4560056e7e54145ed24fa4f76a2126baf9a01b6a5477babd4fcb412f792c
diff --git a/sci-mathematics/slepc/slepc-3.15.0.ebuild b/sci-mathematics/slepc/slepc-3.15.0.ebuild
index b30b13af2da9..0cd112cb1f08 100644
--- a/sci-mathematics/slepc/slepc-3.15.0.ebuild
+++ b/sci-mathematics/slepc/slepc-3.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit flag-o-matic python-any-r1 toolchain-funcs
 
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index de8c4942f1aa..bd5a04b1bcea 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,3 @@
 DIST z3-4.8.11b.tar.gz 4801435 BLAKE2B 903a04246fe4dedc96fda653fa9e3a57a80b951d20b992306bd07bc778cf0a94cf36fe4ed3f178bb26196a1ca294834c784a117fe906d52b82f874a43869d110 SHA512 dfcfc85209dd00aa5f07de0a7e7186a33442b72b94b05c01f53350b9281551be2a2c21ad5e7814bc2c52a3329be8df578e6be8c387cbfdc3a9d3bef0611d6613
-EBUILD z3-4.8.11b.ebuild 2429 BLAKE2B 68983cb9280cf7f92358c76088b5bb8986fdb1e18bc8168353588aa3dce5ae730f85ac5a5edd74d5bf08e3f71fdc53a56a40b606cf0cbc9279f4590cdb810c34 SHA512 ac16f7be8563ab8d98be87f8aa9788e4674742f79475a03d1083b8a538d96d68ba018c441c6a07b694177bdab8de7627632387998688f2a5230a27f49d76b350
+EBUILD z3-4.8.11b.ebuild 2610 BLAKE2B 62e0920d9e4ba69c65fff37bdc74c70f7177853f3b8ff61b2f4a50dd09d72d0f42ffcf71da152e2c5b80d1ff4e26b96d683f10a439c8a8270cc8f6dc50fb3faf SHA512 457a93cfee6bb224e5d1987a7ecaeba18f3f478ac26a222ed4c93e249225c46834d07800e9049931833e01d8ce1e5fadca09ab24df261fbc4b1165e1290845f9
 MISC metadata.xml 617 BLAKE2B f940ac3d7c159dadf4398164b749eaded84c12af5553a154d97fd9bfb939c72e3122e08e11c1c9764514f59a87695534daff6628bd15be4de834c7cfdb65d7f9 SHA512 758df481a60606de12c5a450162ee89fd2f68f842675b3bf280f024fcd61232228476ac889e60c09e42ebae01ad855b32ad77793ba7fa5714861ccc5ca52bfc7
diff --git a/sci-mathematics/z3/z3-4.8.11b.ebuild b/sci-mathematics/z3/z3-4.8.11b.ebuild
index d4386c546aac..aec3b57fd997 100644
--- a/sci-mathematics/z3/z3-4.8.11b.ebuild
+++ b/sci-mathematics/z3/z3-4.8.11b.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit cmake-multilib python-single-r1 toolchain-funcs
+inherit cmake-multilib java-pkg-opt-2 python-single-r1 toolchain-funcs
 
 DESCRIPTION="An efficient theorem prover"
 HOMEPAGE="https://github.com/Z3Prover/z3/"
@@ -28,6 +28,11 @@ BDEPEND="
 
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
+src_prepare() {
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
@@ -40,6 +45,8 @@ multilib_src_configure() {
 		-DZ3_INCLUDE_GIT_HASH=OFF
 	)
 
+	multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" )
+
 	cmake_src_configure
 }
 
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 4fc256151f39..a9f115aaf2e8 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index b6357270b88b..fbba8bbfffa4 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,8 +1,8 @@
 AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58
 DIST root_v6.22.08.source.tar.gz 173079716 BLAKE2B 0b3c15dfedd0215334dcd59db133aa9097709996e0e9cc20a1ae96f954ee607cad314291148f78a31f24ba78dee84204e617e17a6ed8a390503b068e8120e9f3 SHA512 2355e20b8c4d7ad747c31956a3ad0f6e7b70039f3e6613182bd7c53d0e8776267ee85fc1d8aad9ed0d942e28f4124ad79a7dc1082bb1ea7974be2cb6a8a85b39
 DIST root_v6.24.06.source.tar.gz 185205236 BLAKE2B 6b3343ad8d86373de3abd328480eaa89825bca46ebb5ccc16ddcb8c1060fa023eeb8be3d1832e3ce2ad0beaafe66334f20ed8344ffb6df72d89c6622aa1c947a SHA512 356d6287df2900de9e831347d9513f444bf7cbd29c39fbb5841051ae877dac1e22dc255c64166cd3925b82aac860ae67ef6ce171732c16fd23d7919a47e7cb5a
-EBUILD root-6.22.08-r2.ebuild 7549 BLAKE2B bc4922e1df99554dcdb864aee4825abe01e0e082434bad558b7f08d95a68684b9971cc60dd83bbacbb3a3cffcae242ff599b6aad763216432fd1ec91054210ac SHA512 95c26e0f519cfc60e68e631e6798239ceb74ff879cc6fe6de8e5ca5f2b7622a2a1e3d3d1208a1c002a80bd2fa879a1886e7309dd6badc1124c9f4ebc71a36ed2
-EBUILD root-6.24.06.ebuild 7788 BLAKE2B 1a95495c58a99a6293882f5aa183a79371e2591955dfca3fc14030c285de64794a88f66ac61b35fee72e92f7a9c0a33d77df2baaedb5f3180fd590feca756658 SHA512 843936f1a6a0748493165b963f64cd48d6cc44396cf070b790e43d3218854901ea743dfafcca5cc2a1fadcc84d313edbc6e496c805260ff002c09a64c853cf79
-EBUILD root-6.24.9999.ebuild 8259 BLAKE2B c1b814b1e90ec14576f17d3f611ebc95a32cae022c5b34b012a0ec29b03d7df6257a37717593023706397bd822f7803f40a6f9a47c3c3fa10f1ce8e5268168f8 SHA512 9c13e27417e84e806ccce0c0f3c3efc0962889da31df9ec098a8ccc51885e584c6f12dad1dc58b7b9fde95bf0fd9a31d6d34d7b882b58a3cdd1b1e618c9aee16
-EBUILD root-9999.ebuild 8259 BLAKE2B c1b814b1e90ec14576f17d3f611ebc95a32cae022c5b34b012a0ec29b03d7df6257a37717593023706397bd822f7803f40a6f9a47c3c3fa10f1ce8e5268168f8 SHA512 9c13e27417e84e806ccce0c0f3c3efc0962889da31df9ec098a8ccc51885e584c6f12dad1dc58b7b9fde95bf0fd9a31d6d34d7b882b58a3cdd1b1e618c9aee16
+EBUILD root-6.22.08-r2.ebuild 7559 BLAKE2B 7e06cf004966de98ec1a80d911aa15d3a3bb65805a9a4c5e2ca327ecbd842c08fd6245361eea2cb8fc69e9b3cc80c4266e89b39b28613e47e930b5d67831c2ff SHA512 39896a1b04328cfff72e9a464cdf899802bd8d8fa87fed96dc1fb4e44e0d304544db3b6fe087a3a2b2dc5e011c0db7e1a647693bb19ace8c5da4bdb4d41f2447
+EBUILD root-6.24.06.ebuild 7798 BLAKE2B 7a1cfa4684bd0e7225066440450a4952ef38586ae16e6713efeb69f97ee5e67092bbdd01742abb41bc944d94951d4d88980f9887531dbfb4aa7d37eb54bfa8de SHA512 2201df0c66ff2ec45c548005c4708a32fda6d5c3a302835ed140fd5157dd3bc83aea66e61ba2dc7bb4ed0016ea64bcb6a7df4d7b7ee26ffdee3b0dd0e626ee0e
+EBUILD root-6.24.9999.ebuild 8269 BLAKE2B 7458c83da306ab7feb17f0df2033f871db1dad740a711c153c9ed2757eb06cc2012cc0bade7763a7535f6da5a74d192b44e75c86bce760e3e74a85724565ef77 SHA512 060cc1e6e0ce253c4c48ef8a7c5d57b1932c9175b4553ffdf880326d6a96bf1c9fecc0539125d278521ee8a216b9469ade5d228d07f926d0e84cdcdb223615c1
+EBUILD root-9999.ebuild 8269 BLAKE2B 7458c83da306ab7feb17f0df2033f871db1dad740a711c153c9ed2757eb06cc2012cc0bade7763a7535f6da5a74d192b44e75c86bce760e3e74a85724565ef77 SHA512 060cc1e6e0ce253c4c48ef8a7c5d57b1932c9175b4553ffdf880326d6a96bf1c9fecc0539125d278521ee8a216b9469ade5d228d07f926d0e84cdcdb223615c1
 MISC metadata.xml 3150 BLAKE2B eb4fbf007e655d2a0bc80d8ef608f0ba19324ddea1af595dfa4ff5115e8d62409be4bfbf262cd1e3d9a400bd4f658224aac40690bdae072a870f8e1739e481d3 SHA512 3f3ff439a879e22319e4b97dfbbd01fe62e36904a8152507553ead043833218d59b6ecf87c5ebed339fb36af6573e6a171469e8158364db1f2b92cca97dedff3
diff --git a/sci-physics/root/root-6.22.08-r2.ebuild b/sci-physics/root/root-6.22.08-r2.ebuild
index 17ce327af5dd..49b680c70017 100644
--- a/sci-physics/root/root-6.22.08-r2.ebuild
+++ b/sci-physics/root/root-6.22.08-r2.ebuild
@@ -81,7 +81,7 @@ CDEPEND="
 	libcxx? ( sys-libs/libcxx )
 	unuran? ( sci-mathematics/unuran:0= )
 	minuit? ( !sci-libs/minuit )
-	mpi? ( virtual/mpi )
+	mpi? ( virtual/mpi[fortran?] )
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? (
 		|| (
diff --git a/sci-physics/root/root-6.24.06.ebuild b/sci-physics/root/root-6.24.06.ebuild
index 19bce3d18d03..708fc6d4c7bc 100644
--- a/sci-physics/root/root-6.24.06.ebuild
+++ b/sci-physics/root/root-6.24.06.ebuild
@@ -83,7 +83,7 @@ CDEPEND="
 	libcxx? ( sys-libs/libcxx )
 	unuran? ( sci-mathematics/unuran:0= )
 	minuit? ( !sci-libs/minuit )
-	mpi? ( virtual/mpi )
+	mpi? ( virtual/mpi[fortran?] )
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? (
 		|| (
diff --git a/sci-physics/root/root-6.24.9999.ebuild b/sci-physics/root/root-6.24.9999.ebuild
index cc894943f89b..769f8a4eb086 100644
--- a/sci-physics/root/root-6.24.9999.ebuild
+++ b/sci-physics/root/root-6.24.9999.ebuild
@@ -94,7 +94,7 @@ CDEPEND="
 	libcxx? ( sys-libs/libcxx )
 	unuran? ( sci-mathematics/unuran:0= )
 	minuit? ( !sci-libs/minuit )
-	mpi? ( virtual/mpi )
+	mpi? ( virtual/mpi[fortran?] )
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? (
 		|| (
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index cc894943f89b..769f8a4eb086 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -94,7 +94,7 @@ CDEPEND="
 	libcxx? ( sys-libs/libcxx )
 	unuran? ( sci-mathematics/unuran:0= )
 	minuit? ( !sci-libs/minuit )
-	mpi? ( virtual/mpi )
+	mpi? ( virtual/mpi[fortran?] )
 	mysql? ( dev-db/mysql-connector-c )
 	odbc? (
 		|| (
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 925389f627f2..09c118227aa7 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index c25265d744c7..d624968a9ddb 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,8 +1,9 @@
 AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c
+AUX gnuplot-5.4.2-signed-char.patch 911 BLAKE2B 1387aee900be9686906743e3f98e011164a913744b4fb1b9617e9a9235a35a1e39456a97372f41aa1767603164be11a36a602fa986848b770fcde08e4ff0baf7 SHA512 ce89ff63565640aa3764d39056430dbabf7bba7bc73ebff5a9f9fd2ad8d6a570d01629dca13fb46a293f86b240cdc6e4d7cdcb820bf497383a085137f0360d85
 AUX gnuplot-5.5-no-picins.patch 830 BLAKE2B 8e0a303ff5306f3afa07a585b220fe65440432c455710fc5abd67f7afe73dc923e5b796a3dc184f2195709a9def277933678c05c804cebd9686a6b0353f9a53b SHA512 9ca6c6f53a4940cda8634078556052be966a7f62d1b33566ce42dad066265b65970034f38c0abff66230531b49af4feda5301f6af270b0dd622b28b251b3cf5a
 DIST gnuplot-5.4.1.tar.gz 5608076 BLAKE2B 7b2c30acd16b1aec3be9341c019449882a9231afe196bb05dc5d7925681296986de2be3463ca19d62ff1cea6dece0586b6bc8a54881c4fc2ec372635264ebb3d SHA512 2371830636d4c9ee93e9d6566dc2889e96ece3660b63ef4cfb6514e233510e5abaf4f93863bbe9a418f11db8e3b12a15242556aae52bb69591ad7d26e6581121
 DIST gnuplot-5.4.2.tar.gz 5640202 BLAKE2B 42bdbe569a4dcd9e65010aff3d0b7428f1c3485bc64429ac0f2c4f157d43c4d640aa2b191430428ec01cb289bd1d43eb95b4167b5b9d236002d54e48b45c0a2a SHA512 e69ca74335cdd69c6013a254ac785dc67cc82713308460971cf6e0a66438716d8892a37344611d1841563efbc4b2b8c5692c13c7b06cff4f30f8d43e2ddfd7d4
 EBUILD gnuplot-5.4.1-r2.ebuild 5042 BLAKE2B 6fa53714315ccba15617f2d1432b16954fdd1ae4149092b969d3e290ee3c6db4ec25bcde7c2df8463c8869b2a41b18498b1a7032bf5b7ca88a6f12d289363e01 SHA512 9da90847f61f7ae65c0c277c4e7acbf9a6f4526fd00910c74e1b425014d112a641ab0bc0239f6de6ffccaf3feb61991568216b75181e139f6f62e36df477f4e3
-EBUILD gnuplot-5.4.2.ebuild 5096 BLAKE2B bc29b277ef40de413d55353622d0966ac6858282e42f5abb11b5a813ef67f6706fd31d8cdaadbc33eed46b1d323d1aae33ccc79f4d2f68ef5b4ef596835f5f38 SHA512 d0158630db9c0da56c2f10785be76fd70b8d408384b029992d966e848906692cb299137b43df1d741351e53e8da091d3be90628434323ca3963c3d36f26045d2
+EBUILD gnuplot-5.4.2-r1.ebuild 5132 BLAKE2B d62973527e704672085b63a389504f604ea72b0c21a7b057eaa6340799fc6b859c62dfb6f434b74dcf260572fbbbad4f099b2c0ab998e5f98ff5fcc7f6751426 SHA512 fbab1c26a64d601fb73222460a0a269853d9380aa58a7a448c22cdbdaf34572601936bf44dd9c9025d4ea90c74bfa9411c69ca2afb6e7a4b72b0cdf4ff71695c
 EBUILD gnuplot-5.5.9999-r1.ebuild 5091 BLAKE2B 70e126dfefdf64242cd31672e9a783f98b0f85d45d29f5efcc0f92447258b8aa2d1185f981bec5b50eccd56777eac3fa5a35b84ee162e68104fd7156b9304baa SHA512 bd590b42775e62687c335e967cc025095847f6c1237c96ad657bc2fa910069854833d2dcc80aeff1b3b2506ce6223e3d2be76f2a720d632de46be6298e7dfd07
 MISC metadata.xml 1070 BLAKE2B 92ac6f016dedc1ee0aced2792c735e692efac0b0c045b7119d6f2268ed9a7ee3c2437a4038ff45799670265e01f74d8470e3c0abf45b35980a4e761fcd802d19 SHA512 04100f29255dd4d3caf3c81a39f7d6f8ad341598e89555219ba054e980484da00835c2226f35a2b63ec5f27238a97003c7bdac28ca504aed68af0fad737beb8a
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.2-signed-char.patch b/sci-visualization/gnuplot/files/gnuplot-5.4.2-signed-char.patch
new file mode 100644
index 000000000000..091dbbc88d8a
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.4.2-signed-char.patch
@@ -0,0 +1,27 @@
+char defaults to unsigned on ARM, causing a test failure.
+Patch from upstream.
+https://bugs.gentoo.org/811927
+https://sourceforge.net/p/gnuplot/bugs/2467/
+
+--- a/src/marching_cubes.h
++++ b/src/marching_cubes.h
+@@ -58,7 +58,7 @@ static const short cube_edge_flags[256]=
+          First official public domain release
+               Version 3.00 dated 8-6-94
+  */
+-static char triangle_table[256][13]=
++static signed char triangle_table[256][13]=
+ {
+     {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
+     { 8, 3, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
+--- a/src/qt_table.h
++++ b/src/qt_table.h
+@@ -10,7 +10,7 @@
+  *     collapsed them into quadrangles.
+  *     So there is room for improvement in this table.
+  */ 
+-static char qt_table[256][13] = 
++static signed char qt_table[256][13] = 
+ {
+     {  -1, -1, -1, -1,  -1, -1, -1, -1,  -1, -1, -1, -1,  -1},
+     {   8,  3,  0, -1,  -1, -1, -1, -1,  -1, -1, -1, -1,  -1},
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild
new file mode 100644
index 000000000000..bc1482bf1048
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.4.2-r1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1,2,3,4} )
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
+	EGIT_BRANCH="master"
+	MY_P="${PN}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
+else
+	MY_P="${P/_/.}"
+	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="gnuplot"
+SLOT="0"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
+REQUIRED_USE="
+	doc? ( gd )
+	lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
+	ggi? ( media-libs/libggi )
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
+			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+	libcaca? ( media-libs/libcaca )
+	lua? ( ${LUA_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5=
+		dev-qt/qtgui:5=
+		dev-qt/qtnetwork:5=
+		dev-qt/qtprintsupport:5=
+		dev-qt/qtsvg:5=
+		dev-qt/qtwidgets:5= )
+	readline? ( sys-libs/readline:0= )
+	libcerf? ( sci-libs/libcerf )
+	wxwidgets? (
+		x11-libs/wxGTK:${WX_GTK_VER}[X]
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gtk+:3 )
+	X? ( x11-libs/libXaw )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-langgreek
+		dev-texlive/texlive-mathscience
+		app-text/ghostscript-gpl )
+	qt5? ( dev-qt/linguist-tools:5 )"
+
+IDEPEND="latex? ( virtual/latex-base )"
+
+GP_VERSION="${PV%.*}"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+	"${FILESDIR}"/${P}-signed-char.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV##*.} = 9999 ]]; then
+		local dir
+		for dir in config demo m4 term tutorial; do
+			emake -C "$dir" -f Makefile.am.in Makefile.am
+		done
+	fi
+
+	# Add special version identification as required by provision 2
+	# of the gnuplot license
+	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+	eautoreconf
+
+	# Make sure we don't mix build & host flags.
+	sed -i \
+		-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
+		-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
+		-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
+		-e 's:@CC@:$(CC_FOR_BUILD):' \
+		docs/Makefile.in || die
+}
+
+src_configure() {
+	if ! use latex; then
+		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+	fi
+
+	use wxwidgets && setup-wxwidgets
+
+	tc-export CC CXX			#453174
+	tc-export_build_env BUILD_CC
+	export CC_FOR_BUILD=${BUILD_CC}
+
+	econf \
+		--with-texdir="${TEXMF}/tex/latex/${PN}" \
+		--with-readline=$(usex readline gnu builtin) \
+		$(use_with bitmap bitmap-terminals) \
+		$(use_with cairo) \
+		$(use_with gd) \
+		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
+		$(use_with libcerf) \
+		$(use_with lua) \
+		$(use_with regis) \
+		$(use_with X x) \
+		--enable-stats \
+		$(use_with qt5 qt qt5) \
+		$(use_enable wxwidgets) \
+		DIST_CONTACT="https://bugs.gentoo.org/" \
+		EMACS=no
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	export VARTEXFONTS="${T}/fonts"
+
+	emake all
+
+	if use doc; then
+		# Avoid sandbox violation in epstopdf/ghostscript
+		addpredict /var/cache/fontconfig
+		if use cairo; then
+			emake -C docs pdf
+		else
+			ewarn "Cannot build figures unless cairo is enabled."
+			ewarn "Building documentation without figures."
+			emake -C docs pdf_nofig
+			mv docs/nofigures.pdf docs/gnuplot.pdf || die
+		fi
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES
+	newdoc term/PostScript/README README-ps
+	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
+
+	local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can
+		use the "pdfcairo" terminal for PDF output.'
+	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
+	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
+		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+		environment variables. See the FAQ file in /usr/share/doc/${PF}/
+		for more information."
+	readme.gentoo_create_doc
+
+	if use examples; then
+		# Demo files
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo
+		rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary{1,2,3} || die
+		rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/plugin/*.{o,so} || die
+	fi
+
+	if use doc; then
+		# Manual, FAQ
+		dodoc docs/gnuplot.pdf FAQ.pdf
+		# Documentation for making PostScript files
+		docinto psdoc
+		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+}
+
+src_test() {
+	emake check GNUTERM="dumb"
+}
+
+pkg_postinst() {
+	use latex && texmf-update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use latex && texmf-update
+}
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.2.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.2.ebuild
deleted file mode 100644
index e5291b4e9988..000000000000
--- a/sci-visualization/gnuplot/gnuplot-5.4.2.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1,2,3,4} )
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
-	EGIT_BRANCH="master"
-	MY_P="${PN}"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
-else
-	MY_P="${P/_/.}"
-	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="gnuplot"
-SLOT="0"
-IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
-REQUIRED_USE="
-	doc? ( gd )
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
-	cairo? (
-		x11-libs/cairo
-		x11-libs/pango )
-	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
-	ggi? ( media-libs/libggi )
-	latex? (
-		virtual/latex-base
-		lua? (
-			dev-tex/pgf
-			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
-	libcaca? ( media-libs/libcaca )
-	lua? ( ${LUA_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5=
-		dev-qt/qtgui:5=
-		dev-qt/qtnetwork:5=
-		dev-qt/qtprintsupport:5=
-		dev-qt/qtsvg:5=
-		dev-qt/qtwidgets:5= )
-	readline? ( sys-libs/readline:0= )
-	libcerf? ( sci-libs/libcerf )
-	wxwidgets? (
-		x11-libs/wxGTK:${WX_GTK_VER}[X]
-		x11-libs/cairo
-		x11-libs/pango
-		x11-libs/gtk+:3 )
-	X? ( x11-libs/libXaw )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-langgreek
-		dev-texlive/texlive-mathscience
-		app-text/ghostscript-gpl )
-	qt5? ( dev-qt/linguist-tools:5 )"
-
-IDEPEND="latex? ( virtual/latex-base )"
-
-GP_VERSION="${PV%.*}"
-TEXMF="${EPREFIX}/usr/share/texmf-site"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV##*.} = 9999 ]]; then
-		local dir
-		for dir in config demo m4 term tutorial; do
-			emake -C "$dir" -f Makefile.am.in Makefile.am
-		done
-	fi
-
-	# Add special version identification as required by provision 2
-	# of the gnuplot license
-	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
-	eautoreconf
-
-	# Make sure we don't mix build & host flags.
-	sed -i \
-		-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
-		-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
-		-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
-		-e 's:@CC@:$(CC_FOR_BUILD):' \
-		docs/Makefile.in || die
-}
-
-src_configure() {
-	if ! use latex; then
-		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
-	fi
-
-	use wxwidgets && setup-wxwidgets
-
-	tc-export CC CXX			#453174
-	tc-export_build_env BUILD_CC
-	export CC_FOR_BUILD=${BUILD_CC}
-
-	econf \
-		--with-texdir="${TEXMF}/tex/latex/${PN}" \
-		--with-readline=$(usex readline gnu builtin) \
-		$(use_with bitmap bitmap-terminals) \
-		$(use_with cairo) \
-		$(use_with gd) \
-		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
-		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
-		$(use_with libcerf) \
-		$(use_with lua) \
-		$(use_with regis) \
-		$(use_with X x) \
-		--enable-stats \
-		$(use_with qt5 qt qt5) \
-		$(use_enable wxwidgets) \
-		DIST_CONTACT="https://bugs.gentoo.org/" \
-		EMACS=no
-}
-
-src_compile() {
-	# Prevent access violations, see bug 201871
-	export VARTEXFONTS="${T}/fonts"
-
-	emake all
-
-	if use doc; then
-		# Avoid sandbox violation in epstopdf/ghostscript
-		addpredict /var/cache/fontconfig
-		if use cairo; then
-			emake -C docs pdf
-		else
-			ewarn "Cannot build figures unless cairo is enabled."
-			ewarn "Building documentation without figures."
-			emake -C docs pdf_nofig
-			mv docs/nofigures.pdf docs/gnuplot.pdf || die
-		fi
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES
-	newdoc term/PostScript/README README-ps
-	newdoc term/js/README README-js
-	use lua && newdoc term/lua/README README-lua
-
-	local DOC_CONTENTS='Gnuplot no longer links against pdflib. You can
-		use the "pdfcairo" terminal for PDF output.'
-	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
-	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
-		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
-		environment variables. See the FAQ file in /usr/share/doc/${PF}/
-		for more information."
-	readme.gentoo_create_doc
-
-	if use examples; then
-		# Demo files
-		insinto /usr/share/${PN}/${GP_VERSION}
-		doins -r demo
-		rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary{1,2,3} || die
-		rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/plugin/*.{o,so} || die
-	fi
-
-	if use doc; then
-		# Manual, FAQ
-		dodoc docs/gnuplot.pdf FAQ.pdf
-		# Documentation for making PostScript files
-		docinto psdoc
-		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
-	fi
-}
-
-src_test() {
-	emake check GNUTERM="dumb"
-}
-
-pkg_postinst() {
-	use latex && texmf-update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use latex && texmf-update
-}
diff --git a/sci-visualization/quickplot/Manifest b/sci-visualization/quickplot/Manifest
index 4464bd52171c..23bd263fb423 100644
--- a/sci-visualization/quickplot/Manifest
+++ b/sci-visualization/quickplot/Manifest
@@ -2,5 +2,5 @@ AUX quickplot-1.0.1_rc-automake.patch 544 BLAKE2B ba3a3a2c6a8351a71a8fee0e8e9b66
 DIST quickplot-0.10.6.tar.xz 445172 BLAKE2B bcb2c694cc6a3777b7d88a5fbd6562d2612f76b0fabde67562ddba44708db0674336b72f5223aa6043524e9c6cb057e518b076086f2c05370bef6eb54b07e8bf SHA512 10b5277d8d0b8febc3c663256f3912bdd9d879b3038a5fdd3a7adc223419893ee56b825f04b5bee29883f30acb3b6a329d8e314b049fef26d6220192767d4adb
 DIST quickplot-1.0.1rc.tar.gz 303055 BLAKE2B 52c8b60b0f79171358d81691f8824e39c1e3bafc1c084c3a52037e8cd1148e8bf68027ccc90593eca15fcbee0074d42ad7def1eb9d1f5c656b86e12adb6cfdcc SHA512 9cfaaafb7db379fb43b2975d588464288ac18eb21b3248fb02e5a30b0fa0950313a9818cfec23821046f9819d78255f02dff9970668a4b4ed8c4f452d6df3451
 EBUILD quickplot-0.10.6-r1.ebuild 913 BLAKE2B ffbddeef6843c940e33fad83c0f2445e7e9e28b8094085307d24bef00753ba81c109afd28ed354c562ca04005d1b8d2a02212c64ab1bd2b4038593d3efd1ef75 SHA512 08a9c86b2a0fda0edd61124765a5d53220dcfb0ad960b420d878cd34a84b6374b23b74b3784b10f6caf9eec985c3458177b716619616c4014acbde4a07def11a
-EBUILD quickplot-1.0.1_rc.ebuild 1045 BLAKE2B 5259ca25ce3b38513b2e59bd3a926f0091a755c45bcba3287aa322838fd0851e444ff317d9d019268466c812de1bde30f3a2e648bdd3ddc85febbc0cb8a91a79 SHA512 ae4cc45a02c89bda473e90c02f0f787aaf2e1fd36bab9a9c15b01b38766ab7c3ad8b5cb2c93b24bd6ec6f4d3f5955a10c4b3618238deadc1882cd4b2d31e499a
+EBUILD quickplot-1.0.1_rc.ebuild 1049 BLAKE2B 95da406e7bbf6ba8d6a58e0b0f04c93d14db32885999940cf90a6aba396d4b0216d9eb7dacf4918f0f78c2ca051c76714ce6aaa3d1571216036d17976aa08b65 SHA512 747c65570b6a7d49bbbabaf2c1a256300bf15c0d7e4959269f38ec3fe6fa0e220e0b96d3f7f32015583a2f846506cacda7601dd39bcd0163602c2544ca36a884
 MISC metadata.xml 854 BLAKE2B 4e2e7c92a5714b9caf303651c86572e1e4ba1a600d37a094ec75c6565497e73babe209be92c60c04b79add70b1784284a4061b094baed4d3a5583da461164934 SHA512 df7c990e32ce3f14d741d2b701e406a1bc6a1655d318d7ac50cf661fbe4a1a3be8c8ffa64322f66dea201f1886fb604fef6245a666f1a8f79b0d7739eb233710
diff --git a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
index 688dc57516ed..08a6ff3d92ce 100644
--- a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
+++ b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	x11-libs/gtk+:3"
 DEPEND="${RDEPEND}"
 BDEPEND="
-	media-gfx/imagemagick[png]
+	virtual/imagemagick-tools[png]
 	virtual/pkgconfig
 	www-client/lynx
 	dev-vcs/git"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 479b21138555..e9bcac82b2b5 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index f630bfb90fd8..846316f9c4ad 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -2,5 +2,5 @@ AUX ack-3.3.0-gentoo.patch 315 BLAKE2B 8fb44f3540a3567519f626c954f52c37945a48644
 DIST ack-v3.4.0.tar.gz 251106 BLAKE2B 192d1e851ef5bd3547e21fe49cf276180eb278af783209046c02e4a1ae1471c7b24aaf6825223aad96dedea9fd266576a2021dcb808b0e229312e8237e2f7afd SHA512 cc8de5a784f63a8f48b9548e930972578866d0fcc520febc6002d1ce4f9b55aabb0c8e87860586a668d94b5091c66194c05a07c584fe30fad2c5d786aee95db5
 DIST ack-v3.5.0.tar.gz 249718 BLAKE2B dedd11b424f7274c45dabfd0ddf2c92ee9d15ccf40d251c79159aef6e93071c963291722a2024db1d4828ae02c1310d3fec366ca8bd5f249da2c0c73f7e303cb SHA512 f5b9321fc62cf2ab86fa7dc933dd44245314ebd26bee2d8769f85c15fc8b4493d0757ca4430708f0ebea5692f9c73ad17cc00bc46d1f611b8489b30811df307d
 EBUILD ack-3.4.0.ebuild 817 BLAKE2B 8c6ea1cbe26c32e24e89bc28da057ea62b8cfb39af9b2d47abd91b6468c42c2389e0cc81b4ba3e905128b3dd3fd5046f07639f5870385e01dff2ad23801d083d SHA512 c2b0cf0c6147bea5bf242e0041ce7156aa87ec6c4b3c82ae07694d6167b99570123da0aa581bd40369c4ff267fe0117556635f7462c5252b3e099e0e992eeb5a
-EBUILD ack-3.5.0.ebuild 817 BLAKE2B 8c6ea1cbe26c32e24e89bc28da057ea62b8cfb39af9b2d47abd91b6468c42c2389e0cc81b4ba3e905128b3dd3fd5046f07639f5870385e01dff2ad23801d083d SHA512 c2b0cf0c6147bea5bf242e0041ce7156aa87ec6c4b3c82ae07694d6167b99570123da0aa581bd40369c4ff267fe0117556635f7462c5252b3e099e0e992eeb5a
+EBUILD ack-3.5.0.ebuild 824 BLAKE2B 37d847da5aa42702402ee167cfe3eb23abacc46531a4797c262cd7dddaaa60c783e302f37876e81384404d63905f445cec5278937ed1463421b00bf9d7f0aebc SHA512 916ab826c95d963cade68077ca0b990c5875e2aea738306b835133225af3c9b31ddd0250c4e21197e512285d82e48857b1e5213333fa20ef682de5102399d61b
 MISC metadata.xml 1750 BLAKE2B 4c431f95146db206d87d2be9bfa147d0fcf00adbcb0f03fea0458d96339466b37ad6f99adc3158d15c47786a4b3eb0deaee1ead644ab803366d7094a215c9802 SHA512 5ec8e33d0f21431cdcccc5382adf485a5e462e387253681115ba520900afd1459878e5b695becc1e16a1adec43a919ce177adc17161cb5e7a02049143696edc7
diff --git a/sys-apps/ack/ack-3.5.0.ebuild b/sys-apps/ack/ack-3.5.0.ebuild
index 054e17840055..af03295ad884 100644
--- a/sys-apps/ack/ack-3.5.0.ebuild
+++ b/sys-apps/ack/ack-3.5.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://beyondgrep.com"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/bat/Manifest b/sys-apps/bat/Manifest
index 3fcfd64c1089..0563ca3e1b78 100644
--- a/sys-apps/bat/Manifest
+++ b/sys-apps/bat/Manifest
@@ -251,5 +251,5 @@ DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD bat-0.17.1-r1.ebuild 3825 BLAKE2B 0e3129e4e0a406384f96b0669836708e20c655b782bc8cdf31772c3adb487018c89f794a319092901b3497e85625260db3680a5b7dd813b7461fd58c3d20ed63 SHA512 3d4d476f9c020c583c681752c0d039fc7abbc31c9ecfe5ef4fef04786e3b77a27ae619f2231c4fb54de4c60bc79d2b74668bca5fd45d5111f916f5e18df6d4dc
 EBUILD bat-0.18.1.ebuild 4216 BLAKE2B 7242e6acaba30ecd35dcc0ed855c362016804e14e6dbd1eed62c3a038a9034b1a37c231cef490a99a114a7f4bb0da5631ce2b1bcea3e9814b5a730fe73891fa1 SHA512 5a4442df4a899821261324a486b38882ede10b8d88b5c3846d0600f545de53df0f9ae8fd66f94012eee47cbb480b29a01f50df53a78d4d0e4a1c1ae9c7343f2c
-EBUILD bat-0.18.3.ebuild 4266 BLAKE2B 7be42345b0f96e6c49b29cbe62317072034e26b009939af8a9610f966a4a8e12a26022ef71953ea7563a4f0e585ac703372405fea38f3415c69dc8dc783cf9f8 SHA512 1028bf6131741f96679952edd7ba451569d3351746603231a52f77361c293af3a7fbdd284a7754c4c859e6358f06823f5585a27746e2cd5e27908ea2da498247
+EBUILD bat-0.18.3.ebuild 4271 BLAKE2B 2237107a561039b64b42afa1d974d5bc5779eec37567ee18209de900b31d84baad7d5d8c1eb3089b0cde333ef2f7bd9f625eea22e202f8af24db3b569957791c SHA512 ce1e4d33170c3d365c343bcf16e7d4cbaa6f711c3fc68834b305cc9a8cddfcee7cbce0fa2f450fec4794bd35e654e2d6639f13e62d90eea0b2373c5bab7f4174
 MISC metadata.xml 849 BLAKE2B 5c57de94ef22a5be55abec3a0fe429b40d24605bbc49322cd607baf4a3efcb34edd4ac4370ae60c377055800134722166d70d1f39a4a959f3c5f6844b2444e93 SHA512 18a02a2d6a13c23415d57c7303170413b4466c4f35138b3d9ceeba0acae94bea9b7d7443feda1d9611d8812665d915007e13fca5df3051073905050734a8b626
diff --git a/sys-apps/bat/bat-0.18.3.ebuild b/sys-apps/bat/bat-0.18.3.ebuild
index e39b326ba9a5..98c5f4a06cde 100644
--- a/sys-apps/bat/bat-0.18.3.ebuild
+++ b/sys-apps/bat/bat-0.18.3.ebuild
@@ -164,7 +164,7 @@ SRC_URI+=" $(cargo_crate_uris ${CRATES})"
 
 LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index d4c82de24c4d..2b609960462e 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -17,7 +17,7 @@ DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb
 DIST busybox-1.33.1.tar.bz2 2453694 BLAKE2B 2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632 SHA512 d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a
 DIST busybox-1.34.1.tar.bz2 2476932 BLAKE2B 1f45f58db26ae0bae2eb728db3a7d49680d611f489c4633d1fdf2827d3c33285721e232f722ac1f80f2ad7616352df9fd6b8880bcb5fa0dc6787b70c897dd033 SHA512 fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d
 EBUILD busybox-1.32.1-r1.ebuild 9640 BLAKE2B 1bf881647d58a197e690e068b81aa2522fdbecf69784862b1842d54ea1caedff7fa4d6bec8b69388bd8fbddfdd76d48d36b07b7147ebf7f5368df3219efb135e SHA512 c163d435a5bac776c519a539f1760134973314434e75c84dd9f427ea0a7c5fd9c41216db61444c97931b86a6cb6ae17fdc1f0d1c5f36118fc5006c89a3599b7d
-EBUILD busybox-1.33.1-r2.ebuild 10000 BLAKE2B 9073abc218b9a5917df838e37931502ffe9a6065c10fcca5bad2c192b399376dc1c04a50c8499fd4fcbe3f30ce6d05d743a6f6b6db13ca51840b95dc01cea34f SHA512 77c432a8ddd39ce7901e981e41d95c1cd21c9598a40e02ad7ecb292406875064d97ff58b4698dec7fbb06ed1d5da83547b09336b41aeb584625e2052782b09f4
+EBUILD busybox-1.33.1-r2.ebuild 9998 BLAKE2B 59394c0faf07f5e0a50c6ef4cb71b267623f87c3bf9d59f5ef1c101cd09f712bf8fd30f49068d1b31a5f2972217f7a3d0f17d608cfe8b14f1af208f0eb3cc013 SHA512 2b044d19940ca6b0dd40f8453a7bad6795102bb9137e53bd798110d4d0122093226bf4b17ae4cffbb8b7967fbcf0cd3ffe3828bfd4e53a457e01153fefe90663
 EBUILD busybox-1.33.1.ebuild 9648 BLAKE2B 59715aafaca840cdac5b941fb5ad66619510b5cffc2fd252c2b1c8068638449c6ea7bff34f7262e64728b39c663185483db6ee74cedea07c669f6a4528ec4741 SHA512 c1b22a7535b4441ed47e53cac5a27dda04a6b58bdc8eaa96de558ae88cb4e2d10d720473284e569d3a93a53f14214566401bf7766c4fa5fe2a4d46a3a3803406
 EBUILD busybox-1.34.1.ebuild 9937 BLAKE2B fb48a1a27b71ca855ec7a0aa450216210316613cfa9bce696fbc0779f6cb0ba633ae102b10324e35a168cfb0b00ce05cf7bc1a61eca45089e61d504988557ac8 SHA512 ea9f0493291b6b1439add09f0d39ebf11c637a264e51432d026148ac667c00df9a9a3d7fe144595d2eeb2d82bd8013c6fcb10cb24f11aca929d053fa485476e5
 EBUILD busybox-9999.ebuild 9937 BLAKE2B fb48a1a27b71ca855ec7a0aa450216210316613cfa9bce696fbc0779f6cb0ba633ae102b10324e35a168cfb0b00ce05cf7bc1a61eca45089e61d504988557ac8 SHA512 ea9f0493291b6b1439add09f0d39ebf11c637a264e51432d026148ac667c00df9a9a3d7fe144595d2eeb2d82bd8013c6fcb10cb24f11aca929d053fa485476e5
diff --git a/sys-apps/busybox/busybox-1.33.1-r2.ebuild b/sys-apps/busybox/busybox-1.33.1-r2.ebuild
index 3c04d7136121..e66cc1864b40 100644
--- a/sys-apps/busybox/busybox-1.33.1-r2.ebuild
+++ b/sys-apps/busybox/busybox-1.33.1-r2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index e20a8745b6a5..66f945ac7181 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,4 +1,4 @@
 AUX cpuid-20200203-makefile.patch 1341 BLAKE2B 54d2d82710d88d4f095f712b19488bdc44376aeeeb9395e7d9061ea4f8b33e4a38818937e29dbcf4f48455aca568c3d362b2898fadbfd0ba9b11edfee78878c6 SHA512 ced9f8b91c67b0a9a7aeb7f581cd101a1161810a1de0d876b417e55a56f13c775005f3879c576fed318b2f4809a40db3347dc456d73d9e529d10ff8ab51e1e79
 DIST cpuid-20201006.src.tar.gz 118994 BLAKE2B 05c547858358a92b0c9270066dc33e08693922e4ba765edcba7aca201811c54074a0cd683edb3e9dedf2bb0fd23682b3cc5725e4067b27ec27e0fe979eb22f56 SHA512 f037c1707b49e92f1bd605ec87a0995ae36215d075bcbadfed1d11f5fefda43391b48f10d2517334574aa7e243f0b73d22f1fcbfe1fb133aaf5bad1046e8ba5e
 EBUILD cpuid-20201006-r1.ebuild 597 BLAKE2B 3f7d8c98a6796dcfe78c80365f0d2238f1018cbc85a683ad9a28b3b70f936a99185427b4645073bb2d313821053e7c7d0d2c1c94a00b5330c8d66665690ea648 SHA512 5e3ac12a35b36d088e134b92f652723d8f466287a927cead8162ce321d974f53bb51bf964e9a6f66b42557413eaded47f47d18a6730bd6bb1874155cbd8564f0
-MISC metadata.xml 638 BLAKE2B 4083a5345a86f777dc0edb0357a1c5cec512de8c0de321aa2b0b1c69b6a662b424062bb44b9311fa8fd0f8b34885e22e5485d34a9300315d4becc68c9058ef08 SHA512 102f4d67cb9ca229b96bfecebee519845f65f3d0e2b01acfab4759b50539c0b5a395df85a5dc34e5a44b4d765b98934b7558bf99696f216051d665a585bba997
+MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/metadata.xml b/sys-apps/cpuid/metadata.xml
index d62e2fcf80ac..e13a97c088b5 100644
--- a/sys-apps/cpuid/metadata.xml
+++ b/sys-apps/cpuid/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
diff --git a/sys-apps/daemonize/Manifest b/sys-apps/daemonize/Manifest
index 29ac6bdd7bf1..91f332ac2680 100644
--- a/sys-apps/daemonize/Manifest
+++ b/sys-apps/daemonize/Manifest
@@ -1,3 +1,3 @@
 DIST daemonize-1.7.8.tar.gz 66009 BLAKE2B 323b98357c1750ae051378d8d432a4997fb3d162f65f102a3f7d5e1c0271eec77aad7f5253c4712209c9c2cba1c725b3daeaf1c240dca31be13990d3a833fbc0 SHA512 77cb7f6d41fd3484222831540aa8dedcd1f3cbb2f4be2a9b5e0bc1c848fb1392b616ff30b9ff3bb46f3decd1ff2829dbf7130887f81ed66a7cd2c710755a0836
 EBUILD daemonize-1.7.8.ebuild 527 BLAKE2B 9db600c45da6ce7a3ae3d313c6eb9b4c587b30b2acb7f0ff0a283f7f422b1b8ea281a39cc2fd9f709cd786c7ea82e8a62bd2bc61b67bf595a0e9e8df5a7d08e5 SHA512 891abb31a94ff492db6bf4d111ce3012c0d879e6d362f2a7d82c71042c15d8526e724b143aa25c452619dcc9b8d36ae7a03d2d74e90be921b8df608ce8ffaa45
-MISC metadata.xml 324 BLAKE2B dff6081ee6e786a9f5029afec089d5fd7cf46c0801c2192e37d7cf075cc301e363aa3a483d8c26863595a896398f480be6a911b1519340020bbfba9dd7169f00 SHA512 6238ef43fe3ac36012c69219fa0d9141c3781881bcc4d3adc952660b741667b3f45b099377e0900547c57012a3315d6b3a715bb6aa2db830d6e82b49deb42400
+MISC metadata.xml 246 BLAKE2B 2ed97744eec9b524dcddde6477471f603e6a1f29eb23aea98b08aa247eb09d269b3aff31363c82797c21486b281790adcd1b557bba0809539b1a83e97bdfae58 SHA512 10a8487babc616439de96562c6068b462b2e3c28d3522e7a5a992a7db1f432c6a2f9e89fbdc18ed98db4e2812f3691ef7d21f47c9b3bb6b6b95e305d9a4b6815
diff --git a/sys-apps/daemonize/metadata.xml b/sys-apps/daemonize/metadata.xml
index 071db5359e2b..512ee969340e 100644
--- a/sys-apps/daemonize/metadata.xml
+++ b/sys-apps/daemonize/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">bmc/daemonize</remote-id>
 	</upstream>
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 773e5779c166..ba1bcc4117f8 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,6 +1,8 @@
 AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
 DIST debianutils_4.11.2.tar.xz 158132 BLAKE2B c2a95c90b4267e3b1d61c21db562f960b4666982c488e69a757fb0a7a42e8e739d44f553edd8cf532df30c492e999920ab63ec3580479de7de5d901d75de76fc SHA512 0bd9098beee78b3c8dae839f0c29e9f142cbb22f2ced473cf7ae47a14d9493ba882c1829eba213780392a87a3223b3689729754c8ded80a091efaef3f6f903fd
 DIST debianutils_5.4.orig.tar.xz 103640 BLAKE2B ac59ffcf7ef9523a67127e5565cb87eb694a0297eb81acba53a5ca00a2f16d024e21ba1ef6eff5079194c2cc751712fe9ad5814603deeeaa05d28343ff79a409 SHA512 a5501bdc46e203bd0cf357e5c83bb556ea7294ee603498399427dd49536848e006b21967f6239c3d808c8b9653d65f28536cf388dd18b749e54a235cc9326850
+DIST debianutils_5.5.orig.tar.xz 104448 BLAKE2B 707c9072ddf1fa0c61fc66f84aea26bac7bf6f31948880ad4711e89f8f4a665ae4104e998f27e53e288b3453a71876ef44038f8e954f19055ed1049eb9b9981c SHA512 230310428ee7c145c74bb666ae729754352295230f38ef4e22f7566970c5186d607cd827a5603a678815bd48d4a1eb2716f55c32494ec75eb665651da6a56e6a
 EBUILD debianutils-4.11.2.ebuild 935 BLAKE2B b02267258f6285fe997d10d55b0d66b7b57b9cf06fed5b569272cc9b43c4276867e637de35b94eb8887136182b360f5a9e87cd2e2fee40f670e7d9e102624a39 SHA512 062c35544f1c3dd8e876fba48a9afd234857e3494401cac2774f966a45d8ff61325f25d1a65ba4ee6d19cf455312c796ac8f3da1009d4d3877bcf7a41437dfdc
 EBUILD debianutils-5.4.ebuild 904 BLAKE2B 9b413759ceb25b6a3bf136e40016ab6dd42170b39649fe651ea514a7f4d1178d4bad352f6c63d467df168a040e878d9762b06e60d32415602f84966f12557a0b SHA512 3e2f9c50297b1741497ae0dfb98d22d4cbbff9171ccc5966088887193e4b7ef6a83a64e4a4797066e8e552616e7192b8abe35d0fa52746b5f63e06048443bda9
+EBUILD debianutils-5.5.ebuild 1045 BLAKE2B 30d9f5dd334c2b16692c8d11fd1443b6fbca6d83935b63c5d21066b94334e6c225b29a79b946300d553f97c8b08499884249ed0a4a10c70fe970a7f88c0a5da4 SHA512 bae4a140ccfde8a1a81f5e5ee531c0746a647f37f6121a34b7d04f25f4b9aa58797ee869bb8f0aa978dd6705de7d2b9ffb8ea540fe04411e738345be7ac5b018
 MISC metadata.xml 446 BLAKE2B a681b76916f27a5d016fa34c6c6ce4abe887c1f46232cb6cd759ba699eca0cba865ff7b0d33900b1f9e858e016532815b18bf86cc211b97f57a1c0a56580d125 SHA512 c080d8ae5511a0870aa778f744518a2482e7d61ff9e653a808b3959571b8bb47dc90b1b1f2feaccc323df0521f4ae91efb43fa31bd6c8a72075c8b2e9dfeb829
diff --git a/sys-apps/debianutils/debianutils-5.5.ebuild b/sys-apps/debianutils/debianutils-5.5.ebuild
new file mode 100644
index 000000000000..d0de1167825f
--- /dev/null
+++ b/sys-apps/debianutils/debianutils-5.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A selection of tools from Debian"
+HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.orig.tar.xz"
+
+LICENSE="BSD GPL-2 SMAIL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+installkernel static"
+
+PDEPEND="
+	installkernel? (
+		|| (
+			sys-kernel/installkernel-gentoo
+			sys-kernel/installkernel-systemd-boot
+		)
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
+
+src_prepare() {
+	# Avoid adding po4a dependency, upstream refreshes manpages.
+	sed -i -e '/SUBDIRS/s|po4a||' Makefile.am || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	default
+}
+
+src_install() {
+	into /
+	dobin run-parts
+
+	into /usr
+	dobin ischroot
+	dosbin savelog
+
+	doman ischroot.1 run-parts.8 savelog.8
+
+	dodoc CHANGELOG
+}
diff --git a/sys-apps/edid-decode/Manifest b/sys-apps/edid-decode/Manifest
index 8555fc9c21f0..892499f1839a 100644
--- a/sys-apps/edid-decode/Manifest
+++ b/sys-apps/edid-decode/Manifest
@@ -1,4 +1,6 @@
 DIST edid-decode-0_pre20201230.tar.gz 110090 BLAKE2B ffd43a26060bcfdd35cc174a7a1a4d6e21e8206f5ca16fd4bd0237f3e6887597fa95fe2f70e9168ae73db68350348cff0a65d81d311e417b841defe882fd3ef4 SHA512 f459c7e37fd2890fbaab4180b85ccb48c6d8443841e627cadabddd09ca486cb8b2c8645510b91c9ffdbc4ac5ae3d482834a32eea7c7f306120823e610280d421
+DIST edid-decode-0_pre20211012.tar.gz 130090 BLAKE2B 22fcfeee726cf33c22ebeac38648145735d493fa211ef5e8536198549ea80e31fa676a9aa4c55db21019f255426be67a1123524ffa92f44e1a7efa541c8ea24f SHA512 276047a626569e0fc3e8a21764cc580a0b9fb210be1c924cf8a7bec34a436f0cfab5d84b324cb31723bced66ce44e08f99ae58a2c5b09dc2bc4b8084114b915b
 EBUILD edid-decode-0_pre20201230.ebuild 670 BLAKE2B af3b34e5b5bcc498ce1eb1745e53efa95eb5c86b7d4cc47eb586ebf6f386a83b9e7088f8821af82b0ec737c21ac608dd012c5d70d399e1cd9a7a5abf7260be6b SHA512 429f4ad3cc489cd81225d8ae6659b31a1f8949103fbc96f0244811447efc2597002fc97b4d66234d9cb760773908430bdb06852c06d522c003c4c9c6bb46e420
+EBUILD edid-decode-0_pre20211012.ebuild 671 BLAKE2B 4f9c983d8566041e86658ed7ae638e47d0f7b8757e2fa21cf4545637158617e8c3aca465dd536d3c834970c6394dea82d0801ecdd27e062da700d807b4b1fbcf SHA512 76d9dd96854bb0cc8a6db49282f367ad7deafcc1df49a3ccfd5b87255186f06454ef124be83e96a016a10bf65fbaabba9988c923a0e687d06bb63bd060b28fa5
 EBUILD edid-decode-9999.ebuild 550 BLAKE2B 6e79eb700ebfe891bcd2f5451ecb80a27bcbb29af23d0126f5105f984372986c23527e7781b5f5db1737fd1c6c3efe8688e2de6c84e1515f7ad6cbaf7b783739 SHA512 c913ea25760f4ef10d56c1467f3de2a9c79bac6f0f25768989207aab8354dc0fa8903d100773fb81cfdc0118d8ae6762ab9436db11c0cfba7e270fbd17bc3d76
 MISC metadata.xml 647 BLAKE2B 42d8d41db31a4748f5ffad976c0ad35ff483073c286236d77f3c6fc91e854844e519bc8d4761a02880e116faca88c43c16bea37c008719c8adb8f55f4226ac83 SHA512 c7c46f576fd17b42a06a6b241d3a5b6f5dfb9597e824f00ff311feba48a587ecd821285ecc3fb46d3533b6bdd352b34a69ec8886e0e7e8da38dbd29055effbad
diff --git a/sys-apps/edid-decode/edid-decode-0_pre20211012.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20211012.ebuild
new file mode 100644
index 000000000000..b36f30c8fad8
--- /dev/null
+++ b/sys-apps/edid-decode/edid-decode-0_pre20211012.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+EGIT_COMMIT="985024f0ccb7eb0014397f2d562ecebfdd340c3b"
+MY_P="${PN}-${EGIT_COMMIT}"
+
+DESCRIPTION="Decode EDID data in a human-readable format"
+HOMEPAGE="https://git.linuxtv.org/edid-decode.git/"
+SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+src_compile() {
+	tc-export CXX
+	default
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	einstalldocs
+
+	if use examples; then
+		insinto /usr/share/edid-decode/examples
+		doins data/*
+	fi
+}
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 6e07f651f153..998681feb843 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -5,6 +5,8 @@ AUX file-5.40-seccomp-fstatat64-musl.patch 723 BLAKE2B cb6e5151b863328a4764f38f4
 AUX file-5.40-seccomp-fstatat64.patch 727 BLAKE2B 164574b98126ad8804c7a3ef51c80567a83d89c609b731b84f2d5e0b8fe54d060f45b6db38258ece2e2af1e0d0674e4fdf5b62df6217695d06042bb86ad72f5b SHA512 5e5364659e2c96e438000e698f9099be1d2bee94890c51ed849f6e0d139ba637a8026d975200476636cd8282791b6c3e5b71326fb8519323d6c07604975b5b0c
 AUX file-5.40-xz_magic.patch 1277 BLAKE2B 3af2322360ab9d7b3340dd34a2190e249dac5d0dc91843efd07e9fdd92f48ebab0a67decae23e68d9dc6a5fae38880d56977dfa4b3a72d74e362c8f3aab42fee SHA512 4e9e64c1ac0e7e95a113577a32be0fe2f2c2d9acbbe323622c2409d2e1b9f9a6cb3e8572569bbef156ca06c6470ee7db38d2579582622f224919eb37243319e5
 DIST file-5.40.tar.gz 1004214 BLAKE2B 4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074eeeeb3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf SHA512 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb
+DIST file-5.41.tar.gz 1064097 BLAKE2B 56fe8a58d9497bb1bfe3ed6b3ce5df70dd27cc308eb0cfdac8e91ba81c733a96aa622c120ac59079986c6d84901c6f2d82fa24f698d481d7f77e6cfdd432d648 SHA512 bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654
 EBUILD file-5.40-r3.ebuild 3556 BLAKE2B 52835f37e7c4c78cc5239e86a2b096da50200e2cee7d07d904242f7c42eaa8369d1e4ed5b9239d53708e4bc7bfd54a55e7856c0850e8247a471bf68f529a8d71 SHA512 03fe26852e181ecd4ffd456482abb31717eaa3d3190a33a116cb9b3abac66532b7802d1dfe3bfaeac8a30c45d9a683ee0529e5d200a6e83c41ca7c3cfa16b14b
+EBUILD file-5.41.ebuild 3355 BLAKE2B 750df996eaf9a5384e80f6a188eca765945ddc22be2555fe7d5bfd4f9d5da845d24d7b7d263607f0fb169f197fc24d6953881bfa1e96d90c20c100542f167d14 SHA512 b818b49befa9dd286123cb462ee091edaaa7066b4ff14ce8fc373f2281fbd08e0f0c6407eafd1efbfdd4ee3a3476e3fa03171ac736e778393fbec3db2f25ba39
 EBUILD file-9999.ebuild 3273 BLAKE2B 691dabede60ccb8f756ee3a03a5e2db17f58e556cc19f28493685996ac637e7343803a5667e591fc1b336611458b8550c222238983d797fa21e1fe66c60d1625 SHA512 20a7db1cd42cb5c47d5a0c7a607b3e547e1e76b6fe3effd8a456425929312981b47d940c4deee82f14b20e6be50416206aae4b32cbab80bbdf459cce76443347
 MISC metadata.xml 382 BLAKE2B 204b7440b6a18907045d7eae05e8c99d017fa57b5178462125b998d8b3af3e2be656353f5c69823f3b5ea4d86e7e6c028229af27abaf2f7ace6f181f9ebf4153 SHA512 0e56117ac1957f2393ab47dc875e5f07851f3866014388418f84668f5f9767f6ca83963547442606e1c637ed3bcbb81b317cf994de4a04cd28725d8f6cb49b5e
diff --git a/sys-apps/file/file-5.41.ebuild b/sys-apps/file/file-5.41.ebuild
new file mode 100644
index 000000000000..cb9244c374de
--- /dev/null
+++ b/sys-apps/file/file-5.41.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit autotools git-r3
+else
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )
+	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+	"${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
+
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README.md python/README.python.md || die
+	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-fsect-man5
+		$(use_enable bzip2 bzlib)
+		$(use_enable lzma xzlib)
+		$(use_enable seccomp libseccomp)
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+	local myeconfargs=(
+		--disable-shared
+		--disable-libseccomp
+		--disable-bzlib
+		--disable-xzlib
+		--disable-zlib
+	)
+	tc-env_build econf "${myeconfargs[@]}"
+}
+
+need_build_file() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+	local ECONF_SOURCE="${S}"
+
+	if need_build_file ; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		build_src_configure
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if need_build_file ; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		local -x PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT # README
+
+	# Required for `file -C`
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 039b41c54689..03106dee8726 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,11 +1,5 @@
-DIST flatpak-1.10.0.tar.xz 1504300 BLAKE2B 213fb5449b075250cbec9f43ea5b02afae809b8e58d3be0afd39a70d78431f7efc7912462ce46061a53aa4dc2ef8f5e9504cdaffe4b39d2f53292736442ceb3d SHA512 8eaabd66cbd26f5288fb72cddcd195ea4702243e9f5ceff425836b5f305e2b7a4172e67d30cc0e74ad97937c007e8f4ab81080a7ada3f528d05f74845c923aeb
-DIST flatpak-1.10.2.tar.xz 1507856 BLAKE2B b19b04d536b43a7bbb7f479e495538137402ff46bee3be5d180d12983c4e69b8726628bb69aea64917163a4722a34987b631a073c94083cae50d79dd7d74db20 SHA512 c932b9aa2803aa5b453917174bf282d82924aca7341d72555e2557fc588ccefa0eaf32b956f75752c17cd8f73b687d4a688ebd64df36680b80b5ff5750468597
-DIST flatpak-1.10.3.tar.xz 1507484 BLAKE2B 862d42db1395b8542bee0c9502392fe617d9dc17d002f70c95a168a23aaf31ae9ab8cbb72b63234fab95f3ed2e165362ebdfc4f0694152a1740aa2643dfece1d SHA512 ff51383d4ead0f39926125eec706e5a4d38a739874a9d499adf432cfa05685643cfa411f7a247c8512ec10af8440deda0be06f4cc0808e8ba80941b07e49b633
-DIST flatpak-1.11.1.tar.xz 1534700 BLAKE2B 811ac946fe6616d201ffc621881b396b6787ce435bdceb34c9fa3e162f20eba966d88695bcd6e3716b1f949976ac628a085249785c4e39989be5139cd89fdfaf SHA512 0121b4fcf159311c7480d1be29cd169a39ae61fcea9532f25b266b585038a07a930ff418a9c5b9645aab2510de78ad32c8ae8556991c8d2d7c08ab1e3cc819d1
-DIST flatpak-1.11.3.tar.xz 1544504 BLAKE2B 7a2f8e2dbbddf3e0afb355b98d3995f1276c7ff1b27ef873a3f262f8b34024c191d61c1dca33d58f50e19c18b2557b7de61a732f188470f4cfa751e5f3b64479 SHA512 5f0f6e42c8aec80fda348782742075dfaabf00c516c610e08f89a053a818011d52d5a459887d6f7490b1cc58899544e7ceb300e86cce8da55f24e1c53ee9dd17
-EBUILD flatpak-1.10.0.ebuild 2343 BLAKE2B ac0c0593efb4dd67708f92eb67b3d8967822e7052cea13bde89620b8548a9952e933a851a47dc4898994ad9c001088b4997730c7e32d4a104634a71567eecb99 SHA512 318b49b5bdd1ff3c0a84b3c23e1c27161a57a5a8e9e27cb483b28da4f2acc8f1566ce89c6c3bd9ffef44bb8b0478520f4a55a4095c0e6f85639f248a7a08fa5c
-EBUILD flatpak-1.10.2.ebuild 2343 BLAKE2B ac0c0593efb4dd67708f92eb67b3d8967822e7052cea13bde89620b8548a9952e933a851a47dc4898994ad9c001088b4997730c7e32d4a104634a71567eecb99 SHA512 318b49b5bdd1ff3c0a84b3c23e1c27161a57a5a8e9e27cb483b28da4f2acc8f1566ce89c6c3bd9ffef44bb8b0478520f4a55a4095c0e6f85639f248a7a08fa5c
-EBUILD flatpak-1.10.3.ebuild 2351 BLAKE2B 95c29f8d377f935d0bd73262fad8c5c045abc78c0bdaa05672b27085a3ec2018f4411101dc004d093ff8ab717a57731110d7345718a5c4af2d0034ce58758466 SHA512 b60ef6b60442dd48ef3e4bfd01b4b4c8f527fa40f47711ac7d26a622eae1bfe8ce1fd2084a0ca29d3798d0e64bf683098158d214b566fc555e7f7c48e7558a0e
-EBUILD flatpak-1.11.1.ebuild 2351 BLAKE2B 95c29f8d377f935d0bd73262fad8c5c045abc78c0bdaa05672b27085a3ec2018f4411101dc004d093ff8ab717a57731110d7345718a5c4af2d0034ce58758466 SHA512 b60ef6b60442dd48ef3e4bfd01b4b4c8f527fa40f47711ac7d26a622eae1bfe8ce1fd2084a0ca29d3798d0e64bf683098158d214b566fc555e7f7c48e7558a0e
-EBUILD flatpak-1.11.3.ebuild 2351 BLAKE2B 95c29f8d377f935d0bd73262fad8c5c045abc78c0bdaa05672b27085a3ec2018f4411101dc004d093ff8ab717a57731110d7345718a5c4af2d0034ce58758466 SHA512 b60ef6b60442dd48ef3e4bfd01b4b4c8f527fa40f47711ac7d26a622eae1bfe8ce1fd2084a0ca29d3798d0e64bf683098158d214b566fc555e7f7c48e7558a0e
+DIST flatpak-1.10.5.tar.xz 1511032 BLAKE2B 704ce0b5828728f1bb438dca2c1cd0b84277547fbb08400fe11abf243f5d9b5a6219c79188b362174f2a61eea42ae548d4279646838f3de3e4e75b8782f3dabe SHA512 8c2e365ce442a092c15178a8b39daecf21bfe162078c9a323e68d53194413f174e329812dd01d8da6bbfba3b0087aeb4d92a44067df3f6fa0253e33014d138ae
+DIST flatpak-1.12.2.tar.xz 1541068 BLAKE2B 78162c9ccf0b7b18e69c2594865999fc052a507b255b855f3879cdac0c86dbfcabc6a282f0a4de548d3e85142b0b3c8c26d21825f35e6a2f25ebc1aa13ff2b8b SHA512 4887fe540a821f2c8539fbe1fd89b1cc350126a6fa90c1acf070e08db0de1073406a061f5483bc7a7ef9b07f73409beb7bc02d055d4b3ae1c33ba5c318e11b6f
+EBUILD flatpak-1.10.5.ebuild 2348 BLAKE2B 5a49a2773e347ef5a6a7f29f617069565f2f9ee34b5ff6f1f30ab5b3084be12b1370752124dc407cf8d936925e5f347d4fc592cfd7de79d47dea7df0a663504a SHA512 283da0b5ffd7c1e234296eb415de1e6671c28c335fde59651bfdae53439dac4dd0d034e4ceb16c02b0ec96b5f439bb2d971b98398b2bdba7d1239deebeb0d867
+EBUILD flatpak-1.12.2.ebuild 2351 BLAKE2B 95c29f8d377f935d0bd73262fad8c5c045abc78c0bdaa05672b27085a3ec2018f4411101dc004d093ff8ab717a57731110d7345718a5c4af2d0034ce58758466 SHA512 b60ef6b60442dd48ef3e4bfd01b4b4c8f527fa40f47711ac7d26a622eae1bfe8ce1fd2084a0ca29d3798d0e64bf683098158d214b566fc555e7f7c48e7558a0e
 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/flatpak-1.10.0.ebuild b/sys-apps/flatpak/flatpak-1.10.0.ebuild
deleted file mode 100644
index 62dc9a6edd2e..000000000000
--- a/sys-apps/flatpak/flatpak-1.10.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools linux-info python-any-r1
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="doc gtk kde introspection policykit seccomp systemd"
-RESTRICT+=" test"
-
-RDEPEND="
-	acct-group/flatpak
-	acct-user/flatpak
-	>=app-arch/libarchive-2.8:=
-	app-arch/zstd:=
-	>=app-crypt/gpgme-1.1.8:=
-	>=dev-libs/appstream-glib-0.5.10:=
-	>=dev-libs/glib-2.56:2=
-	>=dev-libs/libxml2-2.4:=
-	dev-libs/json-glib:=
-	dev-libs/libassuan:=
-	>=dev-util/ostree-2020.8:=[gpg(+)]
-	|| (
-		dev-util/ostree[curl]
-		dev-util/ostree[soup]
-	)
-	>=gnome-base/dconf-0.26:=
-	>=net-libs/libsoup-2.4:=
-	sys-apps/bubblewrap
-	sys-apps/dbus
-	>=sys-fs/fuse-2.9.9:0=
-	sys-apps/xdg-dbus-proxy
-	x11-apps/xauth
-	x11-libs/gdk-pixbuf:2=
-	x11-libs/libXau:=
-	policykit? ( >=sys-auth/polkit-0.98:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/automake-1.13.4
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	sys-devel/bison
-	introspection? ( >=dev-libs/gobject-introspection-1.40 )
-	doc? (
-		>=dev-util/gtk-doc-1.20
-		dev-libs/libxslt
-	)
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-"
-
-PDEPEND="
-	gtk? ( sys-apps/xdg-desktop-portal-gtk )
-	kde? ( kde-plasma/xdg-desktop-portal-kde )
-"
-
-python_check_deps() {
-	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~USER_NS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# This line fails because locales are in /usr/lib/locale/locale-archive.
-	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sandboxed-triggers
-		--enable-xauth
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		$(use_enable doc documentation)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable policykit system-helper)
-		$(use_enable seccomp)
-		$(use_with systemd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/flatpak/flatpak-1.10.2.ebuild b/sys-apps/flatpak/flatpak-1.10.2.ebuild
deleted file mode 100644
index 62dc9a6edd2e..000000000000
--- a/sys-apps/flatpak/flatpak-1.10.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools linux-info python-any-r1
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="doc gtk kde introspection policykit seccomp systemd"
-RESTRICT+=" test"
-
-RDEPEND="
-	acct-group/flatpak
-	acct-user/flatpak
-	>=app-arch/libarchive-2.8:=
-	app-arch/zstd:=
-	>=app-crypt/gpgme-1.1.8:=
-	>=dev-libs/appstream-glib-0.5.10:=
-	>=dev-libs/glib-2.56:2=
-	>=dev-libs/libxml2-2.4:=
-	dev-libs/json-glib:=
-	dev-libs/libassuan:=
-	>=dev-util/ostree-2020.8:=[gpg(+)]
-	|| (
-		dev-util/ostree[curl]
-		dev-util/ostree[soup]
-	)
-	>=gnome-base/dconf-0.26:=
-	>=net-libs/libsoup-2.4:=
-	sys-apps/bubblewrap
-	sys-apps/dbus
-	>=sys-fs/fuse-2.9.9:0=
-	sys-apps/xdg-dbus-proxy
-	x11-apps/xauth
-	x11-libs/gdk-pixbuf:2=
-	x11-libs/libXau:=
-	policykit? ( >=sys-auth/polkit-0.98:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/automake-1.13.4
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	sys-devel/bison
-	introspection? ( >=dev-libs/gobject-introspection-1.40 )
-	doc? (
-		>=dev-util/gtk-doc-1.20
-		dev-libs/libxslt
-	)
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-"
-
-PDEPEND="
-	gtk? ( sys-apps/xdg-desktop-portal-gtk )
-	kde? ( kde-plasma/xdg-desktop-portal-kde )
-"
-
-python_check_deps() {
-	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~USER_NS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# This line fails because locales are in /usr/lib/locale/locale-archive.
-	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sandboxed-triggers
-		--enable-xauth
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		$(use_enable doc documentation)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable policykit system-helper)
-		$(use_enable seccomp)
-		$(use_with systemd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/flatpak/flatpak-1.10.5.ebuild b/sys-apps/flatpak/flatpak-1.10.5.ebuild
new file mode 100644
index 000000000000..b8320f23f5c4
--- /dev/null
+++ b/sys-apps/flatpak/flatpak-1.10.5.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit autotools linux-info python-any-r1
+
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+DESCRIPTION="Linux application sandboxing and distribution framework"
+HOMEPAGE="https://flatpak.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+IUSE="doc gtk kde introspection policykit seccomp systemd"
+RESTRICT+=" test"
+
+RDEPEND="
+	acct-group/flatpak
+	acct-user/flatpak
+	>=app-arch/libarchive-2.8:=
+	app-arch/zstd:=
+	>=app-crypt/gpgme-1.1.8:=
+	>=dev-libs/appstream-glib-0.5.10:=
+	>=dev-libs/glib-2.56:2=
+	>=dev-libs/libxml2-2.4:=
+	dev-libs/json-glib:=
+	dev-libs/libassuan:=
+	>=dev-util/ostree-2020.8:=[gpg(+)]
+	|| (
+		dev-util/ostree[curl]
+		dev-util/ostree[soup]
+	)
+	>=gnome-base/dconf-0.26:=
+	>=net-libs/libsoup-2.4:=
+	sys-apps/bubblewrap
+	sys-apps/dbus
+	>=sys-fs/fuse-2.9.9:0=
+	sys-apps/xdg-dbus-proxy
+	x11-apps/xauth
+	x11-libs/gdk-pixbuf:2=
+	x11-libs/libXau:=
+	policykit? ( >=sys-auth/polkit-0.98:= )
+	seccomp? ( sys-libs/libseccomp:= )
+	systemd? ( sys-apps/systemd:= )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/automake-1.13.4
+	>=sys-devel/gettext-0.18.2
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	sys-devel/bison
+	introspection? ( >=dev-libs/gobject-introspection-1.40 )
+	doc? (
+		>=dev-util/gtk-doc-1.20
+		dev-libs/libxslt
+	)
+	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
+"
+
+PDEPEND="
+	gtk? ( sys-apps/xdg-desktop-portal-gtk )
+	kde? ( kde-plasma/xdg-desktop-portal-kde )
+"
+
+python_check_deps() {
+	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	local CONFIG_CHECK="~USER_NS"
+	linux-info_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# This line fails because locales are in /usr/lib/locale/locale-archive.
+	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-sandboxed-triggers
+		--enable-xauth
+		--localstatedir="${EPREFIX}"/var
+		--with-system-bubblewrap
+		--with-system-dbus-proxy
+		$(use_enable doc documentation)
+		$(use_enable doc gtk-doc)
+		$(use_enable introspection)
+		$(use_enable policykit system-helper)
+		$(use_enable seccomp)
+		$(use_with systemd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/flatpak/flatpak-1.11.1.ebuild b/sys-apps/flatpak/flatpak-1.11.1.ebuild
deleted file mode 100644
index a931e50425ab..000000000000
--- a/sys-apps/flatpak/flatpak-1.11.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit autotools linux-info python-any-r1
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="doc gtk kde introspection policykit seccomp systemd"
-RESTRICT+=" test"
-
-RDEPEND="
-	acct-group/flatpak
-	acct-user/flatpak
-	>=app-arch/libarchive-2.8:=
-	app-arch/zstd:=
-	>=app-crypt/gpgme-1.1.8:=
-	>=dev-libs/appstream-glib-0.5.10:=
-	>=dev-libs/glib-2.56:2=
-	>=dev-libs/libxml2-2.4:=
-	dev-libs/json-glib:=
-	dev-libs/libassuan:=
-	>=dev-util/ostree-2020.8:=[gpg(+)]
-	|| (
-		dev-util/ostree[curl]
-		dev-util/ostree[soup]
-	)
-	>=gnome-base/dconf-0.26:=
-	>=net-libs/libsoup-2.4:=
-	sys-apps/bubblewrap
-	sys-apps/dbus
-	>=sys-fs/fuse-2.9.9:0=
-	sys-apps/xdg-dbus-proxy
-	x11-apps/xauth
-	x11-libs/gdk-pixbuf:2=
-	x11-libs/libXau:=
-	policykit? ( >=sys-auth/polkit-0.98:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/automake-1.13.4
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	sys-devel/bison
-	introspection? ( >=dev-libs/gobject-introspection-1.40 )
-	doc? (
-		>=dev-util/gtk-doc-1.20
-		dev-libs/libxslt
-	)
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-"
-
-PDEPEND="
-	gtk? ( sys-apps/xdg-desktop-portal-gtk )
-	kde? ( kde-plasma/xdg-desktop-portal-kde )
-"
-
-python_check_deps() {
-	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~USER_NS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# This line fails because locales are in /usr/lib/locale/locale-archive.
-	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sandboxed-triggers
-		--enable-xauth
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		$(use_enable doc documentation)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable policykit system-helper)
-		$(use_enable seccomp)
-		$(use_with systemd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/flatpak/flatpak-1.11.3.ebuild b/sys-apps/flatpak/flatpak-1.11.3.ebuild
deleted file mode 100644
index a931e50425ab..000000000000
--- a/sys-apps/flatpak/flatpak-1.11.3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit autotools linux-info python-any-r1
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="doc gtk kde introspection policykit seccomp systemd"
-RESTRICT+=" test"
-
-RDEPEND="
-	acct-group/flatpak
-	acct-user/flatpak
-	>=app-arch/libarchive-2.8:=
-	app-arch/zstd:=
-	>=app-crypt/gpgme-1.1.8:=
-	>=dev-libs/appstream-glib-0.5.10:=
-	>=dev-libs/glib-2.56:2=
-	>=dev-libs/libxml2-2.4:=
-	dev-libs/json-glib:=
-	dev-libs/libassuan:=
-	>=dev-util/ostree-2020.8:=[gpg(+)]
-	|| (
-		dev-util/ostree[curl]
-		dev-util/ostree[soup]
-	)
-	>=gnome-base/dconf-0.26:=
-	>=net-libs/libsoup-2.4:=
-	sys-apps/bubblewrap
-	sys-apps/dbus
-	>=sys-fs/fuse-2.9.9:0=
-	sys-apps/xdg-dbus-proxy
-	x11-apps/xauth
-	x11-libs/gdk-pixbuf:2=
-	x11-libs/libXau:=
-	policykit? ( >=sys-auth/polkit-0.98:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/automake-1.13.4
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	sys-devel/bison
-	introspection? ( >=dev-libs/gobject-introspection-1.40 )
-	doc? (
-		>=dev-util/gtk-doc-1.20
-		dev-libs/libxslt
-	)
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-"
-
-PDEPEND="
-	gtk? ( sys-apps/xdg-desktop-portal-gtk )
-	kde? ( kde-plasma/xdg-desktop-portal-kde )
-"
-
-python_check_deps() {
-	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~USER_NS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# This line fails because locales are in /usr/lib/locale/locale-archive.
-	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sandboxed-triggers
-		--enable-xauth
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		$(use_enable doc documentation)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable policykit system-helper)
-		$(use_enable seccomp)
-		$(use_with systemd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/flatpak/flatpak-1.10.3.ebuild b/sys-apps/flatpak/flatpak-1.12.2.ebuild
index a931e50425ab..a931e50425ab 100644
--- a/sys-apps/flatpak/flatpak-1.10.3.ebuild
+++ b/sys-apps/flatpak/flatpak-1.12.2.ebuild
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 785f510206a3..9394f3b4079c 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,13 +1,16 @@
 AUX fwupd-1.5.7-logind_plugin.patch 265 BLAKE2B 7959a4cb059a2207b0048f474ff9e0a3e3ab625d6db5e7dacafb7b6190c9718bd8659760579c6ee16fe22fefcc9ec4837f7b2635b1ff5f555ffda36cefacab48 SHA512 a809831e307549f109fbc2c705b80535d885db92a96b72d07f9ef7a954e52ffa2204331e608bc719d41ad038888adfeb23f6ed708c6a769c436f81b4086fedbb
 AUX fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch 1105 BLAKE2B 898f70b2baa27de6678b415ffe9671e2599ff69d9f1ad52cfcefd271d5c5c936bf32276970ef36a88464f11ea1956d90bedd64989adeb9f87be6a2e4d82bcd14 SHA512 106112dedd1c205604b6588ad08092cdb5bcdc1bab3f2e415526faf7af3075ed442d61b3f31a3d0421b683d6f772fb196f93131d3f2f8227b65a6dc781ec6461
 AUX fwupd-1.6.2-dell-dock-requires-gusb.patch 716 BLAKE2B 470db7243fa0e7398778ef8c5d716013e04ef6429e1b4a35b644c3f4bca7148f3bb9f2fc08814b82edc50e1605dc00feb2691f3f1c09b371afdeb1b838181a6c SHA512 08546194d1dfe27a09b10feb6d63a1f29cae881a0ac23bd1497b91eea44fff21559bb67ab5feac3b5613d4f99626708dade0127cb6c7f5ea4c842612c0323ec3
+AUX fwupd-1.7.0-elanfp-requires-gusb.patch 641 BLAKE2B 54dd8413a9608a9e1711622af3422ad874839c7083009c964f8cb2d198103e551d9bb262fc87da3dec0913829defbff358a2777aed1b11c0a42463d930a6f35b SHA512 fbe76f0db8364dd62b86fffaac16d8cf79eb65cbe71862030641c56d9b779c579f4528d176fbc382f055bee144fed5b2c9823486d3354d7de41240035307eacf
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
 DIST fwupd-1.6.2.tar.gz 3885963 BLAKE2B 183abc4d620b884a276dece39ad1e57f606c2237a5fa03b76ede2e1c93bb9548d6641e35490d96e22abbbfb3c1852697a688091f62086f6b2e9d3366e796888e SHA512 a743b37c5969939cc3eb708b0af2e8f6c665848868473c29edf9db110cef5ac62da3c042cfa9617a2f10b2a9d153d0d4146a1832a18bc71fadcbf9a7b5cea1b0
 DIST fwupd-1.6.3.tar.gz 3888812 BLAKE2B 08d24fde80010d50e2396f59d743a00e640c1fcc06f6ada566ebcff48d25f1dc33676a40d13e1b684e45fd9483af1d9755ef3ac00bdaa8a37236589c03bb8a4c SHA512 837bcfe57873315ade8f3ff82d290d492dcb047387db5a642e6e7fc8e9ff7c3cabe5892692e2d4b5b0c5bd69f8a253bc364c61f23013c161a350b39de7d58e67
 DIST fwupd-1.6.4.tar.gz 3891113 BLAKE2B b4f3a629c0594ee69a0e2ea727c8080f63e970a6e9964b53d007e490d6b538f5441a65de20412673ded181611342c7c1c1ec16eb0d05c69c149f635fed325269 SHA512 d0c788313f8cf00c6e0e238436668ab5885133933cd74202d3eb4a3377d1b123689dd7f3827d45853c92b98196d5d896027b471117af461356e2f3c3ec82f58e
+DIST fwupd-1.7.0.tar.gz 4102985 BLAKE2B 9a29621e029c526d513304863294ee69f14ff1cf069b388fe5dc6037b2f030ea24136f18d9096abcc449376295996e3184c1c969f8dda329f2786622ba1300a7 SHA512 148f161f0e8d008fa20091c747baf4a205bc2e76ddc5dbb3676e3f2a15ca5d6d1454b572ea0336f185b5ef3a8ca8bfd3ad1098649e095a58c9822d4dbffe2987
 EBUILD fwupd-1.5.9-r1.ebuild 4380 BLAKE2B f47d3b9dc882649c85549f3139ea2cd6473c21eee0a1750076b7dfad7c04caa6641f36704bc9bf978e047e16f9a07f12fcc862b22697ae4091c7f5cac31c2256 SHA512 f5d965dc302cd77877f13c0ccc3a952c71a6463b56b5d7aafce11ef4d673e46f9c486159be6e2ccfd1229d42ea014598705b867d7aa7795a5c9e0caf51a76506
 EBUILD fwupd-1.6.2.ebuild 4560 BLAKE2B f85eebae29ee6e20705e7db84bbf8ebc33d109a1fc063c6225c24faf70e1289ae693da3ba6bb36c53ab56e5cfefe39c99a684bbf5393abca8c94b082ce5c9a50 SHA512 f9556caeb5e6678a7bded64b97523e5917a81500a2f7791963c18c769e7e650e3d435c4fd0efe4bb3a0e771d95e294be28bee28a798c974abfaa252de90eb5ea
 EBUILD fwupd-1.6.3.ebuild 4504 BLAKE2B 78cb6e9716c4109fcf2e26cad2c8d5d84d952a1514827f2b48106b8b15d9a65085468396fee88584bc498441ed230dba5b150f682326e982c2fe45620aa3c1ed SHA512 01927eff188e8bf7fa80d394f9666bcc47266bf7e685264da4484ab4c7966adab92669007473c1602b31253cb35ec9bef44737bf4ba78d0ac8b1cb4d9799c255
 EBUILD fwupd-1.6.4-r1.ebuild 4504 BLAKE2B a5efb85ec19fd9484769314b6fcdcdffd1a7d331150496385e1f071421eaa20580c3b7590e52d83e36f752e8953fb6415873cff29fca9a70ea2e66722d4cf105 SHA512 f79dea7b0732564e976507863d39ea2af2d02a4218efc683476f9be1a18248ec8a25f1ff7729a44d5ff0171dc725cac3ebc3057b25c8704365c127a9ac6b9cde
-MISC metadata.xml 1348 BLAKE2B 118050b55b34009e6c684f563e70801decdbbb72d74fa2f4f3f2f9fc1451dd2bf2ddb63d3303ca9d2f85eba14e9fe302cb4bdf6e487d9fd4883e62e61adc398f SHA512 28988ca295040f8a4abb56a6993c115378e13ef15c6abe96417ad475ad622738663c49b8875eee0e515f767290e2d903f2a483b37a7694f9b91a3d0475627468
+EBUILD fwupd-1.7.0.ebuild 4652 BLAKE2B 48b044c4754efbecee6eca050b64b3678f03dff3e8bdbe9ac3ddc6dd127c4dd73324ca65af97785892208356bdfef913798bcc3c380465180ff60f5dc34753ff SHA512 ed311b4b86b348db0132679ae6f959ec6785917ca48cc31d67fef1ea8b443a7b9a980e478df477a7ccdc8e3089d9f5c77b19ae3de3cc5cb374a1f21e68676763
+MISC metadata.xml 1429 BLAKE2B be825264920779449312aca9b1de8aff1811c6d8a2f7e46b184214e41f7658b2af9731172f6950e146bcf9fe175a757b814ea97cab8cbc835c76d57b714f0f15 SHA512 824e5d791e4b631af5b2559cc99f43e19acd6f07e33bb540c1e1bce3ff7eaa336a1c5f325317c79958907a581cab61f53f2465c23927323dcf44dcd179e224c0
diff --git a/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch b/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch
new file mode 100644
index 000000000000..fec6aab4a3ce
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch
@@ -0,0 +1,22 @@
+commit fa403db414301c247aef1bc895795a04b06d9298
+Author:     Thomas Deutschmann <whissi@gentoo.org>
+AuthorDate: Fri Oct 15 15:45:55 2021 +0200
+Commit:     Thomas Deutschmann <whissi@gentoo.org>
+CommitDate: Fri Oct 15 15:45:55 2021 +0200
+
+    elanfp plugin requires gusb
+
+diff --git a/plugins/elanfp/meson.build b/plugins/elanfp/meson.build
+index e8bb8255..2b5d7fde 100644
+--- a/plugins/elanfp/meson.build
++++ b/plugins/elanfp/meson.build
+@@ -1,3 +1,4 @@
++if get_option('gusb')
+ cargs = ['-DG_LOG_DOMAIN="FuPluginElanfp"']
+ 
+ install_data(['elanfp.quirk'],
+@@ -27,3 +28,4 @@ shared_module('fu_plugin_elanfp',
+     plugin_deps,
+   ],
+ )
++endif
diff --git a/sys-apps/fwupd/fwupd-1.7.0.ebuild b/sys-apps/fwupd/fwupd-1.7.0.ebuild
new file mode 100644
index 000000000000..2e580029d434
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.7.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit linux-info meson python-single-r1 vala xdg
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( elogind minimal systemd )
+	dell? ( uefi )
+	minimal? ( !introspection )
+	spi? ( lzma )
+	synaptics? ( gnutls )
+	uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+	man? (
+		app-text/docbook-sgml-utils
+		sys-apps/help2man
+	)
+	test? (
+		thunderbolt? ( dev-util/umockdev )
+		net-libs/gnutls[tools]
+	)
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-arch/gcab-1.0
+	dev-db/sqlite
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/json-glib
+	dev-libs/libgpg-error
+	dev-libs/libgudev:=
+	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
+	>=dev-libs/libxmlb-0.1.13:=[introspection?]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+	>=net-libs/libsoup-2.51.92:2.4[introspection?]
+	net-misc/curl
+	virtual/libelf:0=
+	virtual/udev
+	archive? ( app-arch/libarchive:= )
+	dell? ( >=sys-libs/libsmbios-2.4.0 )
+	elogind? ( >=sys-auth/elogind-211 )
+	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+	gnutls? ( net-libs/gnutls )
+	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
+	logitech? ( dev-libs/protobuf-c:= )
+	lzma? ( app-arch/xz-utils )
+	modemmanager? ( net-misc/modemmanager[qmi] )
+	policykit? ( >=sys-auth/polkit-0.103 )
+	systemd? ( >=sys-apps/systemd-211 )
+	tpm? ( app-crypt/tpm2-tss )
+	uefi? (
+		sys-apps/fwupd-efi
+		sys-boot/efibootmgr
+		sys-fs/udisks
+		sys-libs/efivar
+	)
+"
+# Block sci-chemistry/chemical-mime-data for bug #701900
+RDEPEND="
+	!<sci-chemistry/chemical-mime-data-0.1.94-r4
+	${COMMON_DEPEND}
+	sys-apps/dbus
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/pango[introspection]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
+	"${FILESDIR}"/${P}-elanfp-requires-gusb.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use nvme ; then
+		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+	fi
+}
+
+src_prepare() {
+	default
+	# c.f. https://github.com/fwupd/fwupd/issues/1414
+	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+		-i plugins/thunderbolt/meson.build || die
+
+	sed -e '/platform-integrity/d' \
+		-i plugins/meson.build || die #753521
+
+	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
+		-i data/builder/meson.build || die
+
+	vala_src_prepare
+}
+
+src_configure() {
+	local plugins=(
+		$(meson_use amt plugin_amt)
+		$(meson_use dell plugin_dell)
+		$(meson_use flashrom plugin_flashrom)
+		$(meson_use gusb plugin_altos)
+		$(meson_use logitech plugin_logitech_bulkcontroller)
+		$(meson_use modemmanager plugin_modem_manager)
+		$(meson_use nvme plugin_nvme)
+		$(meson_use spi plugin_intel_spi)
+		$(meson_use synaptics plugin_synaptics_mst)
+		$(meson_use synaptics plugin_synaptics_rmi)
+		$(meson_use thunderbolt plugin_thunderbolt)
+		$(meson_use tpm plugin_tpm)
+		$(meson_use uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_capsule_splash)
+		$(meson_use uefi plugin_uefi_pk)
+	)
+	use ppc64 && plugins+=( -Dplugin_msr="false" )
+	use riscv && plugins+=( -Dplugin_msr="false" )
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dbuild="$(usex minimal standalone all)"
+		-Dconsolekit="false"
+		-Dcurl="true"
+		-Ddocs="$(usex gtk-doc gtkdoc none)"
+		-Defi_binary="false"
+		-Dsupported_build="true"
+		$(meson_use agent)
+		$(meson_use archive libarchive)
+		$(meson_use bluetooth bluez)
+		$(meson_use elogind)
+		$(meson_use gnutls)
+		$(meson_use gusb)
+		$(meson_use lzma)
+		$(meson_use man)
+		$(meson_use introspection)
+		$(meson_use policykit polkit)
+		$(meson_use systemd)
+		$(meson_use test tests)
+
+		${plugins[@]}
+	)
+	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+	export CACHE_DIRECTORY="${T}"
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use minimal ; then
+		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
+
+		if ! use systemd ; then
+			# Don't timeout when fwupd is running (#673140)
+			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+				-i "${ED}"/etc/${PN}/daemon.conf || die
+		fi
+	fi
+}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 4d30edc6fd6b..d1dfe55c1e5e 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="dell">Enable Dell-specific support.</flag>
 		<flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag>
 		<flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support</flag>
+		<flag name="logitech">Build and install Logitech bulk controller plugin</flag>
 		<flag name="nvme">Build and install NVMe plugin</flag>
 		<flag name="modemmanager">Build and install Modem Manager plugin</flag>
 		<flag name="spi">Install Intel-SPI plugin</flag>
diff --git a/sys-apps/hw-probe/Manifest b/sys-apps/hw-probe/Manifest
index df32c0b55853..22cbfde9c5ff 100644
--- a/sys-apps/hw-probe/Manifest
+++ b/sys-apps/hw-probe/Manifest
@@ -1,5 +1,7 @@
 AUX README.gentoo 296 BLAKE2B df18c0796912c5cfe6e8f88427ea690512bfd519aa3502528df6f6936571497937a22f8edcd9e9143d915e648f9b341043141cc6d0ae35de55d22d44c0335f6e SHA512 4ae61b89352a4bbe70f4ea1b85eb19e58c2b81475722dda25c289fbe15e7e6e07df51b08471c5d3c5d7a3b12cc09ba599e0d2158dee68c9c66f60908d57b4326
 AUX hw-probe-1.5-disable-automatic-upload.patch 1140 BLAKE2B 47ae86326941c5a86f9efd7614509a9af36261c51ef85f21ea1172ae91c3966c113aa51f8841a56005f75b0370b57dff6196fe49a77c766ce1efd9003ee0e249 SHA512 7cbe2dc17cb513086f85052b43349fb64bd12a0f3671bb37109a20d62cf565f8bc8d9e798a7d0a7e53896d187e8c575f850861e381885f2ac1f40d2c0c919063
+DIST hw-probe-1.6.tar.gz 158879 BLAKE2B 96d36be283d497df8aed944f3ba14c620e3abc7d3dd728c274f3ebaca3f064d1ac92bd4d47cbae51500264d785feda25082950fde6fdbd6c1b35f48736015659 SHA512 9ef51c0acc450d1f2073c03885e097231a745a456ae384825c56804f94c62ac85bf4c795627e6ea738636fa83d50d7ef60e20c6dd9621247ff06c51461d91249
 DIST hw-probe-1.6_beta2.tar.gz 143569 BLAKE2B fc7b7562f86eb1b26fef32a8ed9b4a8d01c5621bedbc7e810d5a011c53d528b000ff9df312cf5e3f0ab455558e08e2b9a3ddcd543cd6856208466721f9a0e13c SHA512 2727e7b0fe449cbb6dd21fc112660df4ec666be845bbfd21037b41372a499dfb80c8c2dc37bd222032c68faadff91192a6d6f5229353cb0fc63b8e3dbd715f5d
+EBUILD hw-probe-1.6.ebuild 2380 BLAKE2B 284ca257c11e56bd355a9fdd030e9f4c5814ecf0d3aec8b090ed3141342a37aad0f86e774d08570fc88c83ecf439611372415bf04457fcd6d4008c2f311e1145 SHA512 84a4f07b78f065179efdbc30251940e3f4e57b4a06bbaa0bf5f4ebfc8e6c83f740d4fecf83165340e4364450b8e69934fb92196c1f49b899e6f69de50469aa17
 EBUILD hw-probe-1.6_beta2-r1.ebuild 2447 BLAKE2B df0aa62976532b17319cf17259211cc493008be2478855574979eb73b3f8cb471eae04ee8b315c49a5eefc828a7be6896b6d2dbe8114a584be42c6b878bd6318 SHA512 43d9118e85be8fdf07b96c1e32c3cdaa27b5e3b2da9b9780fe133481b087be04b33b276618283ec596fc381ead99b7f1765175f89ca04793641065aefc496e0c
 MISC metadata.xml 647 BLAKE2B 522741fd8d5f7b64d686ce02dd5ccd7d9ba42df1e50a3e51921fa17c110c6db114ee22d5a903c8bb61a2a5f3884fad5e8b1a929a062af111fd52faf047638ab1 SHA512 ef6e4af1150d72b3cc26ba56267dae006ae8a19a8df2606a9f02df0dc6b091f0bd3dd9caee2171e896dd7b5e582b853f228e899dbd9281dd07b435a1da1f6b7b
diff --git a/sys-apps/hw-probe/hw-probe-1.6.ebuild b/sys-apps/hw-probe/hw-probe-1.6.ebuild
new file mode 100644
index 000000000000..504704b069f7
--- /dev/null
+++ b/sys-apps/hw-probe/hw-probe-1.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="${PV/_/-}"
+MY_PV_BETA="${MY_PV/2/}"
+
+inherit optfeature readme.gentoo-r1
+
+DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers"
+HOMEPAGE="https://github.com/linuxhw/hw-probe/"
+SRC_URI="https://github.com/linuxhw/hw-probe/archive/${MY_PV_BETA}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV_BETA}"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Digest-SHA1
+	net-misc/curl
+	sys-apps/dmidecode
+	sys-apps/edid-decode
+	sys-apps/hwinfo
+	sys-apps/pciutils
+	sys-apps/smartmontools
+	sys-apps/usbutils
+	virtual/perl-Data-Dumper
+"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	default
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	optfeature "showing Machine Check Exceptions." app-admin/mcelog
+	optfeature "showing additional I/O statistics." app-admin/sysstat
+	optfeature "showing display data channel (ddc) information." app-misc/ddcutil
+	optfeature "showing smart card (reader) information." dev-libs/opensc
+	optfeature "showing Vulkan GPU hardware information." dev-util/vulkan-tools
+	optfeature "showing information of attached scanners." media-gfx/sane-backends
+	optfeature "showing GPU information provided by MESA." media-libs/mesa
+	optfeature "showing zeroconf statistics." net-dns/avahi
+	optfeature "showing HP printer statistics." net-print/hplip
+	optfeature "showing status about rfkill switches on communication devices." net-wireless/rfkill
+	optfeature "showing additional CPU capabilities." sys-apps/cpuid
+	optfeature "showing hard disk (HDD, SSD, ..) capabilities." sys-apps/hdparm
+	optfeature "showing available I2C sensors." sys-apps/i2c-tools
+	optfeature "showing additional hardware and system information detected by inxi." sys-apps/inxi
+	optfeature "showing information about tested memory for faults." sys-apps/memtester
+	optfeature "showing 'Plug & Play' devices." sys-apps/pnputils
+	optfeature "showing systemd boot process information." sys-apps/systemd
+	optfeature "showing ACPI statistics and tables." sys-power/iasl
+	optfeature "showing information about NUMA." sys-process/numactl
+	optfeature "showing additional GPU information provided by MESA progs." x11-apps/mesa-progs
+	optfeature "showing available Xinput devices." x11-apps/xinput
+}
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 957276ed197a..7dcc47219b00 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -4,5 +4,5 @@ DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 60bc80ae73d0ae9ff9a438474efe682dfff2814
 DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
 EBUILD hwloc-1.11.13.ebuild 2167 BLAKE2B 0518fb6472ee433835781125b914e68c788e5d219c5a120ddf99df6d3770de279c769a0c4fdfa6638a0b747190adf9f32e090cf1f4ecfc5d678a8f09dcb22058 SHA512 cad8bbd45d68521c0e5aa1fbdbdb763eeafdcb7b406aed1fd1d61dde9285d523da2e031c907f9dc5729d921298dafff126a1b493b66b21f0c7bd00e67f50d03a
 EBUILD hwloc-2.3.0.ebuild 2926 BLAKE2B 42a8053f8baa463ccc1805d3586698d7e99e57498d14ff2c633148b258133a6ddd6f0370a15e6dc3d0ea87827f4229e40b23e1f21e8aaa1d1a9a282fa2883bae SHA512 8f855c6dca0daf997c37f0dac6f295698b2c3037c270ba12a20978ac61d82f98485bb082c68407c0609fdc1c585dabf491d653bb188ea9d4f90d82a931d55bb0
-EBUILD hwloc-2.5.0.ebuild 2933 BLAKE2B 29056c11f00907327a283b9a42ca73824c90dd75de0bf6d12ee7101ab37ae98478b8d265ac7f316e1fffa79d3af42134f06dc0302644dc4730621ad3ca247101 SHA512 a8f6ea94b0026eb3260f152d3ee50b4985bcaf564f302df367e3e5fffacb1368c396e09933db8f37a17d5d6f27197ebc450da07305ffb6a666a7011a2061087a
+EBUILD hwloc-2.5.0.ebuild 2929 BLAKE2B d2700b93da84746f22b26ff5b37b63fe7dfa25a33a4bc6e5deda9695241807ceb3a58c4dc787cc8fcf841a5070ca5435f20e2d54a834d5184d2a953b31de74e4 SHA512 99aa8785173360b31b3bfb1503902c911abe9600f559519c90c3b85bd02d165bf0de210d2d4a24898d559ddd007c8fc41c9c3649298cd89f079714b87a84f144
 MISC metadata.xml 1704 BLAKE2B 4b0dde09ca25988c711048ffef54dcb0ec39e3afde391bb68a288b13232f18339a6b2391c942a2ce261777f4575b973e7517e69277e7be852f44c807db62d5ed SHA512 70b020e6cc65180537d11e9f55f033e1c56cb5c708e7b643e38e83eab9e84bf0f4b8460b3b81e9b6cbb701a7be4a554214a1c6aac3bdb31be4e580321c798317
diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index 7142d8ae3ffa..0134baeceb16 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 5a5bb62ce2df..ffb5a753fcb1 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,10 +1,15 @@
+AUX openrc-0.44.6-fix-checkpath.patch 862 BLAKE2B 35aac37270c8ee779d2e3f0291e2f2e659cbebd6ab8e9cb4a7a0295a1a99331b94c86e411ddac98f415839781d2415771c7cc81d12749a6efed5396f54933581 SHA512 187f318b652d779252371812ae2b154e79e109fc1d4eadb8e86c9c83d639c1b03a106e2e982c4365b2204321abfb561421e8a239f1fd71281ee6dbad4e775e80
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.43.5.tar.gz 242146 BLAKE2B 993d3895588e8f1383049006834f944faaae0f889d3afcae5bff697db9f26383712f18aba52ce07d835f1d2bbe8ef19ef116ad60141d1eb0650767430d1d9967 SHA512 680c1549a8a37eb3a719f3e026888d045d26c98357d6e6eaf09069a23a001272deaca8cac4a9b8fd79f489c4cfb4fe2c7b5d481d1469798a8f5ec470d0cadbe3
 DIST openrc-0.44.5.tar.gz 253815 BLAKE2B e0d1ed26a18f59a226a44b3cf041c9b8017fbbe304aa5986d8e5ada17530594ac1a8099bf392ee6cd41c6668ce69a51ee1776817745b568e182bfbeac3a01799 SHA512 95b9399168522ead967a9f1de8ddce3826de997ff0e1acd56b342dc41cf18ea527598ea316e0e377916582a4f6a109a12233bd302e72ae93b3f1bcb81bfe7a4a
 DIST openrc-0.44.6.tar.gz 253905 BLAKE2B 3a1b337fde50e54fa6d7cabf4f1103889dbda8b04dd98c1ef19ec6ed778a4a1006afb8c9bcc6944b12219f2a2adf2f4dd5afe6243b7a69c23d5effed77cb4224 SHA512 203e48781d5c6d1c0839439823f0f26d2fcd44cd03512379993df684693098080cf7253cffaafca76032551146c36c6fff7bc0d7c848725dc2bccf7519da6d3a
+DIST openrc-0.44.7.tar.gz 255444 BLAKE2B 8058e1fd8fcce46f53e73b56ec8da5eec9ba0807d657aef4ece2d49056c02a451c41155df96b167ff157863a85d77eb63796715b5191dd1c6c631c8f859d3090 SHA512 c6b3e2e30615d97a5185320a140ced881bc59ba31ea8dff5d80440396166af237826de6ffc7836ec141e305c92176cd9cc3dabff7e42ac0d80e5238513fefdb7
+EBUILD openrc-0.43.5-r1.ebuild 5066 BLAKE2B b3e56275bd07558fa1b3a67e76c343d4368803ff8c806872e1fe7351667848640b722de86c5cac410d76e02d69a5adb764a942aafa180e22c4d79d7c90533e6e SHA512 8214a366eeb208c3f05302ec0f35a0bc9fb500951d102faa3010c0b8dc005d2d4a04609efd89351c76984ed18b0013e16367a0d257d809b667f69f981164dd46
 EBUILD openrc-0.43.5.ebuild 5005 BLAKE2B a3725838bfd17681923474879383e3ec0b08cea121ea1e0c7ec62c83f726ac5deb35d82143217f7a2ffca3190ee058accfe770b89c1a3294be65a394c7c3b5e3 SHA512 f0fe7ceaf9a2066abe235fc6bd857045c354a4e33c2e9e41c2a65f02e03364ff6fc331a1b6f41627da9edcddf4b9f72bc2af1f31c711a9dafe3d6c3b4c8ae277
 EBUILD openrc-0.44.5.ebuild 4534 BLAKE2B c9e833d7b41f15e76dc1877493f06567d22bfcab7f9e62abaa30b8540b1d2d46fa83098259368ffd3ab2b93881f973d4335128c1ed70b937d465ec611c0e27db SHA512 0cc39723a7bf28ef6bcdda6893ac8ce1f3c06050f6754afeb81832635d56525c28d0af4d479b8d3199792e084165f515b32eab3747cb64a635cc552087550fb5
+EBUILD openrc-0.44.6-r1.ebuild 4587 BLAKE2B 166de8659e2af23277ac62880e0bed31bcc59c28a774c63e94523f2e0523ccb5ba4708962df4533c1b876d74484d79d282831f457d698ca2d9c725966c084619 SHA512 505249633af31bab11d0fbbf01f618286ca9d8fcc587403a3348b47c2373b6aea9ac8afd94da771dca6d80fb50245874c2bfd9ef5b1be8c2a71380e39b980ab2
 EBUILD openrc-0.44.6.ebuild 4534 BLAKE2B c9e833d7b41f15e76dc1877493f06567d22bfcab7f9e62abaa30b8540b1d2d46fa83098259368ffd3ab2b93881f973d4335128c1ed70b937d465ec611c0e27db SHA512 0cc39723a7bf28ef6bcdda6893ac8ce1f3c06050f6754afeb81832635d56525c28d0af4d479b8d3199792e084165f515b32eab3747cb64a635cc552087550fb5
+EBUILD openrc-0.44.7.ebuild 4534 BLAKE2B c9e833d7b41f15e76dc1877493f06567d22bfcab7f9e62abaa30b8540b1d2d46fa83098259368ffd3ab2b93881f973d4335128c1ed70b937d465ec611c0e27db SHA512 0cc39723a7bf28ef6bcdda6893ac8ce1f3c06050f6754afeb81832635d56525c28d0af4d479b8d3199792e084165f515b32eab3747cb64a635cc552087550fb5
 EBUILD openrc-9999.ebuild 4535 BLAKE2B 7320f6dc00ac1df21449846c389bc6cba8797da82bebb2b2055eb83e79351e593a0a9137222dca1f02de05ca6e1fe86f05531c51793aff2f0ee3376bc35ef91d SHA512 e59d13f838fbf466855c6049f8d743c952aa22cb97f1c617aff167db36069fc1e5c6aac283aa4920c33ca95ec2f0ec3598b1501c5aaf06cb8bbec69d8129031f
 MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37
diff --git a/sys-apps/openrc/files/openrc-0.44.6-fix-checkpath.patch b/sys-apps/openrc/files/openrc-0.44.6-fix-checkpath.patch
new file mode 100644
index 000000000000..e1ef97d981dc
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.44.6-fix-checkpath.patch
@@ -0,0 +1,33 @@
+From cc45b55f895d0c21b5ac3e5a65b0bf00f76adeb7 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 8 Oct 2021 04:52:55 +0100
+Subject: [PATCH 1/2] checkpath: fix allocation size of path buffer
+
+strlen's return value isn't enough to be used
+directly for (x)malloc; it doesn't include
+the null byte at the end of the string.
+
+X-Gentoo-Bug: 816900
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/816900
+Fixes: #459
+Fixes: #462
+---
+ src/rc/checkpath.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rc/checkpath.c b/src/rc/checkpath.c
+index bab22692..c4dd7d9d 100644
+--- a/src/rc/checkpath.c
++++ b/src/rc/checkpath.c
+@@ -151,7 +151,7 @@ static char *clean_path(char *path)
+ 	char *ch;
+ 	char *ch2;
+ 	char *str;
+-	str = xmalloc(strlen(path));
++	str = xmalloc(strlen(path) + 1);
+ 	ch = path;
+ 	ch2 = str;
+ 	while (true) {
+-- 
+2.32.0
+
diff --git a/sys-apps/openrc/openrc-0.43.5-r1.ebuild b/sys-apps/openrc/openrc-0.43.5-r1.ebuild
new file mode 100644
index 000000000000..98648ccc0246
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.43.5-r1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode"
+
+COMMON_DEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? ( sys-libs/pam )
+	audit? ( sys-process/audit )
+	sys-process/psmisc
+	!<sys-process/procps-3.3.9-r2
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	bash? ( app-shells/bash )
+	!prefix? (
+		sysv-utils? (
+			!sys-apps/systemd[sysv-utils(-)]
+			!sys-apps/sysvinit
+		)
+		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
+		virtual/tmpfiles
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.44.6-fix-checkpath.patch
+)
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBDIR=${EPREFIX}/$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/lib/rc
+		MKBASHCOMP=yes
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKSYSVINIT=$(usex sysv-utils)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=no
+		MKZSHCOMP=yes
+		OS=Linux
+		SH=$(usex bash /bin/bash /bin/sh)"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+export BRANDING="Gentoo Linux"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	keepdir /lib/rc/tmp
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/etc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	if use pam; then
+		# install gentoo pam.d files
+		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+	fi
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+pkg_preinst() {
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+	return 0
+}
+
+pkg_postinst() {
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
+		fi
+	fi
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/openrc/openrc-0.44.6-r1.ebuild b/sys-apps/openrc/openrc-0.44.6-r1.ebuild
new file mode 100644
index 000000000000..4886ab05cc4a
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.44.6-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic meson pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} =~ ^9{4,}$ ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode"
+
+COMMON_DEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? ( sys-libs/pam )
+	audit? ( sys-process/audit )
+	sys-process/psmisc
+	!<sys-process/procps-3.3.9-r2
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	bash? ( app-shells/bash )
+	!prefix? (
+		sysv-utils? (
+			!sys-apps/systemd[sysv-utils(-)]
+			!sys-apps/sysvinit
+		)
+		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
+		virtual/tmpfiles
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-checkpath.patch
+)
+
+src_configure() {
+	local emesonargs=(
+	$(meson_feature audit)
+	"-Dbranding=\"Gentoo Linux\""
+		$(meson_use newnet)
+		-Dos=Linux
+		$(meson_use pam)
+		$(meson_feature selinux)
+		-Dshell=$(usex bash /bin/bash /bin/sh)
+		$(meson_use sysv-utils sysvinit)
+		-Dtermcap=$(usev ncurses)
+	)
+	# export DEBUG=$(usev debug)
+	meson_src_configure
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	meson_install
+
+	keepdir /lib/rc/tmp
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/etc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	if use pam; then
+		# install gentoo pam.d files
+		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+	fi
+
+	# install documentation
+	dodoc ChangeLog *.md
+}
+
+pkg_preinst() {
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+	return 0
+}
+
+pkg_postinst() {
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
+		fi
+	fi
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/openrc/openrc-0.44.7.ebuild b/sys-apps/openrc/openrc-0.44.7.ebuild
new file mode 100644
index 000000000000..8edadaf9e4e1
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.44.7.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic meson pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} =~ ^9{4,}$ ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode"
+
+COMMON_DEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? ( sys-libs/pam )
+	audit? ( sys-process/audit )
+	sys-process/psmisc
+	!<sys-process/procps-3.3.9-r2
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	bash? ( app-shells/bash )
+	!prefix? (
+		sysv-utils? (
+			!sys-apps/systemd[sysv-utils(-)]
+			!sys-apps/sysvinit
+		)
+		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
+		virtual/tmpfiles
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_configure() {
+	local emesonargs=(
+	$(meson_feature audit)
+	"-Dbranding=\"Gentoo Linux\""
+		$(meson_use newnet)
+		-Dos=Linux
+		$(meson_use pam)
+		$(meson_feature selinux)
+		-Dshell=$(usex bash /bin/bash /bin/sh)
+		$(meson_use sysv-utils sysvinit)
+		-Dtermcap=$(usev ncurses)
+	)
+	# export DEBUG=$(usev debug)
+	meson_src_configure
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	meson_install
+
+	keepdir /lib/rc/tmp
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/etc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	if use pam; then
+		# install gentoo pam.d files
+		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+	fi
+
+	# install documentation
+	dodoc ChangeLog *.md
+}
+
+pkg_preinst() {
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+	return 0
+}
+
+pkg_postinst() {
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
+		fi
+	fi
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 1985af1a26ac..77bf1c474f61 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -5,6 +5,8 @@ AUX pcscd-init.7 408 BLAKE2B 54e4995a169b7f816b0de9b409ae94a8328e792b50872d58398
 AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19b37c8677001e9b1b3701df8246bf051c6cf8b5c971f86bf1f580bfcbff270b8937328ca887d SHA512 06b672135fda9f83af4f030ff8078f8e1194ced529334c17c1a93f81ee9a5d4448bcea5ffec398f01d957a6607fbde7f69fbc23d727bb3ffad48a305cefe5c26
 DIST pcsc-lite-1.9.0.tar.bz2 755963 BLAKE2B 30d027ac61aba1f57224c88ffc4ec8568dcc2747f3f7e24be07e7ce52bd23ad7a71b6a2f78d912f827a4c02a22c13ff16bc1450c02bafd92bc87ac0e34a2bbcb SHA512 35c85b15ab54c14403a080d6671b3d986910372651d46a5477111172d42c6d2cf58f4a3ce95427e7a84f6b4d3bee30ea57bf69b855f753160a3c6e72f93e34f3
 DIST pcsc-lite-1.9.1.tar.bz2 763525 BLAKE2B b85364f5e2a92450b020bfc28439774c6a6ffb9016ea4072d1925fbc1cef76cd370b298c0b414ba322205d859018308bd7101ef89c5b6f96b97e4f223035ac35 SHA512 4f59ea6acb5b258092018f10609987e12b8e601049e6ffed4b4b82abd3c4b35c38a60e1cda28fdc884202e694d1bc3a3b5d930c5b1e9c1b9c309bd17ef463e63
+DIST pcsc-lite-1.9.4.tar.bz2 776581 BLAKE2B fb870fab3bfc7ae372a62c678a0321445f14c36c84c4fff8b7bf4e17f14b64575128fdcf7c8642cd03cb3586d6846845196a93d02b037090f49b88bbee896caa SHA512 d812fd4c6e906f277a73863c4170d96c30245c5fd0a8329e78923533320d71c6591b3f282695bcd69823c8cc381d8d438736bb7ab2262ab24c9d89434368659e
 EBUILD pcsc-lite-1.9.0.ebuild 3167 BLAKE2B 9172b138a531936e2de9bd0d9d961d252f88d57950ae414b6ea3816f0d25f60406ede13d3d1e17159bf33681d7294526e9778f42a10292aaf846a70c6978c208 SHA512 baacae6682f43ce2ab5d89c5e278d11cc9cc5420d14821bbaa7b03e000884953d9aa1cda9df634d090444ba16af9fb7e2ed7e12d5b6d568ab4808960f5ee16da
 EBUILD pcsc-lite-1.9.1.ebuild 3181 BLAKE2B 5d67ccc4a2705aa85746347ff32f6d15e6613ea40ea244d7c810061a3dd5c023606f070b6d73544e4ef9f86ddfe4444e37c335177d65eb2a02ba06d4abb8ce0a SHA512 c8fee2822eada5dd7cbbe334be1ca72318a009fde315c8dc46fb9380f8f76a0965445bfc858bbadff1baae6bf80353223b59eb4990c9097970d8d891d07f9a02
+EBUILD pcsc-lite-1.9.4.ebuild 3177 BLAKE2B fd18ffc059482439a4a8e3f098687824a7b65d6905de5fa33da384459234dad3a17af1f3028f47e0f26c2017d4e510310cf6c7d0d1155880dadfe3354491d343 SHA512 3a0e0cdef7ee44ee9fc4fb80cdea1bdad870278eafa292236387c711d80d3205f6a898384ca7d58839c55bc521479fa9bbe27b331e5abd3f4e87c6cd0e298761
 MISC metadata.xml 1083 BLAKE2B 8dc3fe1bbd660b4ea9db99fb8f82b905843d96005928f42aa4007e13aa6e0a75af83f1552b434136c8584b98ddae6a0c68776fbb1096da29433864536405fdf3 SHA512 da7d9e3842429795970dd73ffab39e031188e6fd585d144e6348007c55eeb67dcb8e5e04aea1115796f73ff1d455887e0c00301da2b9e689551fef8144c2f388
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild
new file mode 100644
index 000000000000..8ff5b8ae62e2
--- /dev/null
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python{3_8,3_9} )
+
+inherit python-single-r1 systemd udev multilib-minimal
+
+DESCRIPTION="PC/SC Architecture smartcard middleware library"
+HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
+
+SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
+
+# GPL-2 is there for the init script; everything else comes from
+# upstream.
+LICENSE="BSD ISC MIT GPL-3+ GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# This is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="doc embedded libusb policykit selinux systemd +udev"
+
+REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
+
+# No dependencies need the MULTILIB_DEPS because the libraries are actually
+# standalone, the deps are only needed for the daemon itself.
+DEPEND="libusb? ( virtual/libusb:1 )
+	udev? ( virtual/libudev:= )
+	policykit? ( >=sys-auth/polkit-0.111 )
+	acct-group/openct
+	acct-group/pcscd
+	acct-user/pcscd
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-pcscd )"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
+)
+
+DOCS=( AUTHORS HELP README SECURITY ChangeLog )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-maintainer-mode \
+		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
+		--enable-ipcdir=/run/pcscd \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$(use_enable doc documentation) \
+		$(multilib_native_use_enable embedded) \
+		$(multilib_native_use_enable systemd  libsystemd) \
+		$(multilib_native_use_enable udev libudev) \
+		$(multilib_native_use_enable libusb) \
+		$(multilib_native_use_enable policykit polkit)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
+
+	if use udev; then
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/pcscd-udev pcscd.sh
+
+		insinto "$(get_udevdir)"/rules.d
+		newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
+	fi
+
+	python_fix_shebang "${ED}"/usr/bin/pcsc-spy
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
+	elog "the pcscd group, to avoid running as root."
+	elog ""
+	elog "This also means you need the newest drivers available so that the"
+	elog "devices get the proper owner."
+	elog ""
+	elog "Furthermore, a conf.d file is no longer installed by default, as"
+	elog "the default configuration does not require one. If you need to"
+	elog "pass further options to pcscd, create a file and set the"
+	elog "EXTRA_OPTS variable."
+	elog ""
+	if use udev; then
+		elog "Hotplug support is provided by udev rules."
+		elog "When using OpenRC you additionally need to tell it to hotplug"
+		elog "pcscd by setting this variable in /etc/rc.conf:"
+		elog ""
+		elog "    rc_hotplug=\"pcscd\""
+	fi
+}
diff --git a/sys-apps/progress/Manifest b/sys-apps/progress/Manifest
index 722345fe8a82..1ccd974a315c 100644
--- a/sys-apps/progress/Manifest
+++ b/sys-apps/progress/Manifest
@@ -1,3 +1,3 @@
 DIST progress-0.15.tar.gz 58549 BLAKE2B a75d9b4cb965419cc1677ff80d1990c2b2069031e71e982ff6e83381cbac53aee37e9cc22984e132929c0502dc89f860022def62b886e7b6122f2111aa314fc6 SHA512 8b446d04e156b8d3d905caf9a8c9eac2ff2d24ca3b118ebdf6b2aa9f9f99d0d219c026020c33bc3f2fff936f4a29d95f89fe1cbc1ab66b7b33f5e32bf18710ca
-EBUILD progress-0.15-r1.ebuild 591 BLAKE2B ed72cfda89caacafd3670c75e5277ec6ebb044e3c7bfb4b8889bf7d99515cef15b0568cc41f00ce370a025f86dc94689d0ddcbb8ee9a11aa38f1d064de564bf1 SHA512 5019e992a0a5a5597e29d62f566540f25127a1d53172ec71ccc7e677b44a8f1fdd38c7def686fefc653e7e70eebceace83553c3b772b89e7172e2c3b947066de
+EBUILD progress-0.15-r1.ebuild 603 BLAKE2B 13889ceb6a1c988a53a73f31f3e73dd468a3ac4b2ad7feb4837bde5542a022898f5e131ab569acdf3bcb3ca411c328e76d39987dac7672e015515dd1b1d3bc44 SHA512 0eb3bf8abb98102cebf61fa374f940aa98984d459962a3fcfdbffbe88406f38f6e78adac3d5dccb046bee1c806ff26eed43b426db624970ffb57f3fc2e8df141
 MISC metadata.xml 336 BLAKE2B 19a9d6403f36544172a2a88261882161345a4d7f7f90bc053083267a4d4c207f43afa8c4fa28d703c1f0d72a9ea388ee12f35cbcd836a280f9db9c5711bb35d2 SHA512 7fbcf150daa720dd08d18dc1c81076c581920add07297574578deaa441ae88c3f013186e72dbebcee14221609776a9f1170d21ba901bcbe39438febbd4aebc65
diff --git a/sys-apps/progress/progress-0.15-r1.ebuild b/sys-apps/progress/progress-0.15-r1.ebuild
index 7b1766238200..f1294e6e643a 100644
--- a/sys-apps/progress/progress-0.15-r1.ebuild
+++ b/sys-apps/progress/progress-0.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Xfennec/progress/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest
index 8560df761d52..9543c28b6239 100644
--- a/sys-apps/pv/Manifest
+++ b/sys-apps/pv/Manifest
@@ -1,5 +1,3 @@
 DIST pv-1.6.20.tar.bz2 115310 BLAKE2B b50623f623231e8e8615f960bad83d10e12d5274c57d23ea843d16fce30b3e690284b2d9b01f82a16b9790e2bf26f80f560e226589a62ca677a2cf90ea007691 SHA512 e445f91b298ed285ddab54a3f8a6b5d5297e2e2eb8ad7b2ee2cbacca4adda9c6ca2bf3c77bf2a93373d3875c5b3b0b345d3945cbd91fc2647c6c25f1661a6752
-DIST pv-1.6.6.tar.bz2 109220 BLAKE2B 1cfb60e49f6301f0d990467a58013522bbc1e28e2936a1a2141918af05149b59b6cc494f290d99ee7072247b8f0e230b799cd5dae6f8aa59d116691319e952cb SHA512 cc841b4bd00e4e8fcaed97da094ebac4a11af1c3f843ce5f73d0c3ab20aca29498c6b1a224c653d40127304d8269d96f413df66b980809e9278ff9544c834a26
-EBUILD pv-1.6.20.ebuild 1487 BLAKE2B 444c26d4cdf1a65eb57bd3488e67a215f0015f0ef03ff7206d9498dccc0454a3c0533c68a146190629d435622d9ea423670c82d675eb600d91549dcace0f8a19 SHA512 6d22d56a9505d69d2d4fc6a684e9498bc4be276832af9bd306c97b5b649841e900882666dca94c051ad65de0a43822b3bb2dcb0b9ac8a5e655f78f75c2ac3ac1
-EBUILD pv-1.6.6.ebuild 1379 BLAKE2B 0f3f018c0325aaef297dce38a6ae1917f9b53eb2499f38a020666d5d3da567c18f23ba173af6d805977450a6bf4c01bc25dd340728ad435ed46fb040508621c6 SHA512 f0cf93a3f5ee11c5327e640b3965da60b66115fe293016e7b35f57ea704a65b7dbe4844a2ec4d75176e4aa2901a2d342b1e2ef9485dcc52a6696ac0a730b345a
+EBUILD pv-1.6.20.ebuild 1487 BLAKE2B 922c6e85bab5f80bbe8d3a1b79e8d00b1513ad70423b5ffbf54beabe387bde343fcac3e8189b5178d38522c0e92de382d2e0a962b4d5de4a08775448a99fa501 SHA512 60f73e5601b002d656028440343f46adb55517b6fa373d9953d8817fad4c53ec0972ee0a60166c4fa5a66dc6fc5b37ea2de7151c876c46b4ac82a85f4f689a2c
 MISC metadata.xml 483 BLAKE2B c6240298c7a79c7d5839c593b0139c990477ce67aeb92b585bbb09a07d51bbe9bd75aaeac678ddd81c05cc6f9e36860ad8cfc889204e835019f854477a5bc7bf SHA512 082cac9d7bcff373929e3c0a7af524b65c48cc427755232f981ccd4947466f2f3325a75f691f1bf79e74eebde3e53b4ebd4c904b40affc0d7fbd243f8ab36605
diff --git a/sys-apps/pv/pv-1.6.20.ebuild b/sys-apps/pv/pv-1.6.20.ebuild
index 86f4bf74e302..5d9b8a174726 100644
--- a/sys-apps/pv/pv-1.6.20.ebuild
+++ b/sys-apps/pv/pv-1.6.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ivarch.com/programs/sources/${P}.tar.bz2"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x86-solaris"
 IUSE="debug nls"
 
 PLOCALES="de fr pl pt"
diff --git a/sys-apps/pv/pv-1.6.6.ebuild b/sys-apps/pv/pv-1.6.6.ebuild
deleted file mode 100644
index 6b7c79cfe1ab..000000000000
--- a/sys-apps/pv/pv-1.6.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="Pipe Viewer: a tool for monitoring the progress of data through a pipe"
-HOMEPAGE="https://www.ivarch.com/programs/pv.shtml"
-SRC_URI="https://www.ivarch.com/programs/sources/${P}.tar.bz2"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x86-solaris"
-IUSE="debug nls"
-
-PV_LINGUAS=( de fr pl pt )
-
-DOCS=( README doc/NEWS doc/TODO )
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="~SYSVIPC"
-		ERROR_SYSVIPC="You will need to enable CONFIG_SYSVIPC in your kernel to use the --remote option."
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i configure -e 's|CFLAGS="-g -Wall"|:|g' || die
-
-	# These should produce the same end result (working `pv`).
-	sed -i \
-		-e 's:$(LD) $(LDFLAGS) -o:$(AR) rc:' \
-		autoconf/make/modules.mk~ || die
-}
-
-src_configure() {
-	tc-export AR
-	local lingua
-	for lingua in ${PV_LINGUAS[@]}; do
-		if ! has ${lingua} ${LINGUAS-${lingua}}; then
-			sed -i configure -e "/ALL_LINGUAS=/s:${lingua}::g" || die
-		fi
-	done
-	econf $(use_enable debug debugging) $(use_enable nls)
-}
-
-src_test() {
-	sed -i -e 's:usleep 200000 || ::g' tests/019-remote-cksum || die
-	default
-}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 4137449b17d5..b7bd541d2db1 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -8,6 +8,6 @@ AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed8
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
 DIST systemd-stable-249.4.tar.gz 10593723 BLAKE2B 466b3cb27c4bc6c85c9ba50f6614175b2c31a4c177d452542faa1395e99511440029b1a093dc80a5a1a0135eed09d8b1849572f36dba4e18a1396230bfc31adb SHA512 5b9ec28102538bc3dcb632ee16389ff20dccf4b723186f6ae2da119a1809d84db0d8bcecf9b75c5e2da8427f5543e1da281bbed1a154e529d8a82ea5128c465c
-EBUILD systemd-249.4-r4.ebuild 15113 BLAKE2B 0763088cbb5f3b1f1fff8f17f0596f37d43f4a9d9bec7c6fab0eb09d8140848bd65c47449ad69d86398dd52a6bc3eb822dcc1a6f9044e3523b4b9eb2fad5ec59 SHA512 b649eebb835a2b04ae6ee23e0577a9f0f6e4f11214e32251a9a951c23e9c8635c36eddbac4c6766344c1f1924b162a505a30c76959f7ff54b4eaaa7363656807
-EBUILD systemd-9999.ebuild 14959 BLAKE2B 5c7c194f8c77192ebeac60008869d391bbb244e365049b04b67ecf8aa65d22eb75332ccdb891259f410bc18105751c3833ddee6338be7916c4040e1ffa218563 SHA512 4d55ba26f3cb034504f809e7ead7d5f271f3b47550def41ec96fbb877c45b847763af3182c29afff8e4f54906709f83c2384958fcaa9d92f04695c21720131d7
+EBUILD systemd-249.4-r4.ebuild 15099 BLAKE2B 7076124a49b1beeb8153cbca7868a1e828cb0ae9b2c0e5e3fa60db5473f2f1d3870a7010d5b9dda71acb81d98cff970758595d32b2944761c4f59dcd7f65463f SHA512 e4be3bdf1c30aa36b02ffcda10502371543bc616988ad8cd558651f01efc55a813532af9ad42590e13831be8025f674af273e0001fe670929b9442319c812bf2
+EBUILD systemd-9999.ebuild 14945 BLAKE2B b427e2f0c2fc28fe9d67432426dbcc2aa83893aae17c9cdf3ca25dfebb0b3e8ef194ab6964bdc8d7a71afb8f0b6e509ad15579889dd8d8c9c9fc4ff7a8df3d01 SHA512 16aac9a616c40e08414f71a704f3866ef98d830fb0751fc503e719e184b42334b5a4f43a940034f48372ccbbecff4218886c2d4ec26d636e63e1fc8f46081c5a
 MISC metadata.xml 2468 BLAKE2B 62d58ff16df9bc0ea157279e4fe750cff42d02bc61a8d545671adf01da4de5359184a3247c2423b49fd9a104efdbdc879fe5a4e46f5ddc5810d6046cf8896473 SHA512 99408e7635e3deb8ceb2c58a56632d0ee1947865729b56eca9ce6626e61ef201c5b42e9d4baf6784bd6021380f8d592b01be00ea488ce475310be63c3501407c
diff --git a/sys-apps/systemd/systemd-249.4-r4.ebuild b/sys-apps/systemd/systemd-249.4-r4.ebuild
index e0cb67e37c96..01503d4fcf00 100644
--- a/sys-apps/systemd/systemd-249.4-r4.ebuild
+++ b/sys-apps/systemd/systemd-249.4-r4.ebuild
@@ -177,7 +177,7 @@ pkg_pretend() {
 		fi
 
 		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~KCMP ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
 			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index fa00fa787b42..8348517478b6 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -177,7 +177,7 @@ pkg_pretend() {
 		fi
 
 		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~KCMP ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
 			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index 4d2ed880ae4b..63cd755379ca 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -1,7 +1,7 @@
 DIST yarn-v1.22.10.tar.gz 1244965 BLAKE2B 6a9471a6905d89481665c099f00a985daacc8c7953327ee12b3d70f3f42dc304ceca01446281964d1af7a005ecae4a12ca55df637732e52821b4ecb9cdce6418 SHA512 d75dccd318f280abcbfd8d78b63546e11e7a8459c5dd737d0c8da2742cd5d7e3d7a5e668ce680234b0c09e71d128787777061d24c6e3ae4b6626086461e3ce25
+DIST yarn-v1.22.17.tar.gz 1246198 BLAKE2B ae0b86cdb248a0f81d1a4a23d15ef9aab185fcda7ef7f8873959c3e54dfc305219afb2416264911098c4e3a6a65a33d248ff97c8e0ca043b118de64e003c3d9b SHA512 1f4a76e35057687d1437d21e1fffd14fcdad9793df36b695a52a44a16f844fb966a29342eb5799f80f880ef53c14ce86a39bf1d7ad929dc0cbf09d598d106b89
 DIST yarn-v1.22.4.tar.gz 1244785 BLAKE2B 1f1eeb829096eaf19a8fdb48b46fa736769d9d3c247759e434413665186e4cccb750024afa836dae8a0130fc472df3c01805d263d81346e1dd7509e1b106e88a SHA512 a1833b862fe52169bd6c2a033045a07df5bc6a23595c259e675fed1b2d035ab37abe6ce309720abb6636d68f03615054b6292dc0a70da31c8697fda228b50d18
-DIST yarn-v1.22.5.tar.gz 1244837 BLAKE2B cf5054893c8937ceb6788c27f23005386449664b36dc31c6c0c3548438f1fdc5c5ec4b1b1642786c4d8732faf46ab58d2784d3768e12233f241b9b1c6f173734 SHA512 c33c040ed57eb05c04905b8996db31a34099f0c18dbf1818959c5592514abc99f1180592561ec5d3e760c084dbcf2dcdf3ebb4fe8918f082b6aa089cf10921bb
 EBUILD yarn-1.22.10.ebuild 1069 BLAKE2B 362375e59c35e3a4a8c8d8990bbc9662ac2a0da9ce389007b824c8cd2c6369dce2e6a4ddd3bb85934a689829b9dcbdb74fd35bff11d00f26eb88546af5e86eac SHA512 7886b477b9e87d0c7cc67d219693564d17ec018c391f99ce874ffe0726bb9c5e9137755af58bac5151238e8099096ca246c644c29c08adf2d681a6df28c08f2f
+EBUILD yarn-1.22.17.ebuild 1070 BLAKE2B 930b0fa3571b98ec24310ba4e15677191c2fe01682a9144a72dc00ae72c6f1f5056f5a23e11839fa35fdb8caa56e3a8c9f91e5a47b76c2bb02c74ccb40e888e4 SHA512 f1dc152e76face546f46a622fffe23894d4569c1f66e239efd130b5aa50e9ede28bfa7fcf8597ab84870ee5a5bb75b0f1b2459cb5ee5dd10db57ba67b4016e97
 EBUILD yarn-1.22.4.ebuild 1057 BLAKE2B 40ca4f1e345f8914a672817c21b0a5974ac314b9bc10f54937dd7d607f492725e7e41632d4b75a0ab62b43607a2aa90b6f2ea83b4a1844ae098f0f12cefc7b45 SHA512 a50ec0902a9a509918b979a634350e048d9ba5f768cceab11b1b2af08076aaa85cd2e22174934f010330eb9ce0c08402ac77cfb7a58d6e33d7162e27784c261b
-EBUILD yarn-1.22.5.ebuild 1058 BLAKE2B cc521c197011573800b7671b187d0f5507df0dfb9283f4f5355cb29fc9c1f72a7e5e34589928bab4fea27a2d26f735b6274b011486efa70c6f347ff51327c4cd SHA512 ccdce002d42bd31f614e92bb8703eeba3c713504b1e2feb03120d76c35475328ff40772c1b3b237c48e87e09a86f4ba149bf3f38aed3d52a3a6f303b33621dc4
 MISC metadata.xml 685 BLAKE2B 9957b4bfeb2729a4cb8bb0f717a431fb0713e5b198565245037369c6f7892ef3a51aee4b5fc650b91728baa49ef5d05b518a3f0b0f52897de861fc57c275d386 SHA512 ba7ecb814fb0888255afb243394f55cb7c4489fa5c8843c1ea6f9e0c24f21c30247a39150f1cfc51aed86010201f2f201d9fd9c09e7ce93b6d498a4a3f3c16d1
diff --git a/sys-apps/yarn/yarn-1.22.17.ebuild b/sys-apps/yarn/yarn-1.22.17.ebuild
new file mode 100644
index 000000000000..1c2aa5d2cfdf
--- /dev/null
+++ b/sys-apps/yarn/yarn-1.22.17.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Fast, reliable, and secure node dependency management"
+HOMEPAGE="https://yarnpkg.com"
+SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="!dev-util/cmdtest
+	net-libs/nodejs"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
+}
+
+src_install() {
+	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
+	insinto "${install_dir}"
+	doins -r .
+	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
+	dosym "../$(get_libdir)/node_modules/yarn/bin/yarnpkg" "/usr/bin/yarnpkg"
+
+	while read -r -d '' path; do
+		read -r shebang < "${ED}${path}" || die
+		[[ "${shebang}" == \#\!* ]] || continue
+		fperms +x "${path}"
+	done < <(find "${ED}" -type f -printf '/%P\0' || die)
+}
diff --git a/sys-apps/yarn/yarn-1.22.5.ebuild b/sys-apps/yarn/yarn-1.22.5.ebuild
deleted file mode 100644
index 706453936e75..000000000000
--- a/sys-apps/yarn/yarn-1.22.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
-}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarnpkg" "/usr/bin/yarnpkg"
-
-	while read -r -d '' path; do
-		read -r shebang < "${ED}${path}" || die
-		[[ "${shebang}" == \#\!* ]] || continue
-		fperms +x "${path}"
-	done < <(find "${ED}" -type f -printf '/%P\0' || die)
-}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 022485b84f02..6add7fb5a222 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index 725686c4154d..f1f5c234500d 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -4,7 +4,9 @@ AUX fprintd-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch 1144
 DIST fprintd-0.8.1.tar.bz2 75254 BLAKE2B bf59c47c3d0186677bfd180e472e13773afebd4c3438e0e8e8cce34156df1c64c142b73d541fa876b96d4881e6967745a8c29be310dd33a509cb1863c836634e SHA512 438098fb677b742fdb279f3df85a1f2c800fce7498130c09b7408f21656ff256323b3bce4c22a2499e52c2ca7cddbc7f26033be7869939d23f9b5c436aa1f252
 DIST fprintd-v1.90.8.tar.bz2 635139 BLAKE2B 4f9e5c395c32dd5de3f5ed4d17e81c28a55de0f411deb3ccbc5d1330129be2bc8263c63c61a5e4910f74e49ebbbf508e858f5ee131eb4552e2ea8ab167bc6021 SHA512 0f38e0ce9f7c1459ba5359d0834569fe5d3f5ec3c9499d008dc39b9c869bbfa1cb293b1d96d22f9f36708f26984a1b3f0776685d628df69f1ed6db14de04a489
 DIST fprintd-v1.90.9.tar.bz2 636538 BLAKE2B 8a2150887282aae722d143ec96a9c0c3b5dd066e4cba30c41d49b6f6afe95c26c585aec2d9b074d65dd1a3efd462dae294a98965a020c4e55a8cda7c00a827bb SHA512 2b0f3e5812dd29df2b78ff6082c75981c28af71fc07e19e7eb4743842562e7d5bfc0655d5fbb66bfb167bc3087100bd0f154257ad936eab03e9e8ccc2410481f
+DIST fprintd-v1.92.0.tar.bz2 651377 BLAKE2B 39db660e3203b08c1233b9711f56c5b4539f1dff4f8cd9554dce4ce055e2fd2a63dc5e8792808232f86906bf1b7d15a7f155e67ddd49a98ff92ac75b4bd712f4 SHA512 e3fcf948321bf82398f06cca33cb29745c7fc38421025c9340dc85ba2ffb87e63f9546aae721ae72ad0c6f4268a856d60cd57089238d5c92e14b31de215f17d1
 EBUILD fprintd-0.8.1-r3.ebuild 1633 BLAKE2B 1787260f8a5bc98eb1c9c0f6f96f5c540c5223ada65faf93dc543faaed2a1916e85441f4f27d67c1f46e797d9fb6a09ee16596f94052a689fc3f5f7d107d37ea SHA512 0c02ceca9be196fb9d9f92b8929a64a96b34fa4c6e40c73931aa5ab61a8979f543729f7f9d43e5ca33afe2cfc1c4d6ea00774ff2cd5fb67ba4673a70bb1e4d1c
 EBUILD fprintd-1.90.8.ebuild 1616 BLAKE2B 6c34b97ff30d9d1b1e249779e74f403b78692b61cf3cb87bd12a513e63ef6017ad101d06136c209470dbf172bb34fe5170b754087ff3f5ba78fa3e6374bb6402 SHA512 6964e4b0287b10a177316295698df06a0488500a4f8d3bd70a735d7a98bd2645da608a50faea8f28f2ba074ab8419c38dd21f64aa4917fd1441ff0ca147a3d1c
 EBUILD fprintd-1.90.9.ebuild 1646 BLAKE2B ebdbca6dd9bef2a51b60cb24d9ae8e614081ace89ae84b4007c88d8a6853ac20a0b1667aacd5ac5373aa7fe0fac46c5eadc2bd3f1aaf3a5d23b770c2e311eb50 SHA512 3a68129c63d411d1b2bb8343bbdc150229f88e0124b705e1716c5b6b0cf1f9f6a0cd6f1dac04a3349a2d6b9896c2ebcb5eacd830bb8aaa77843199ef611e2dcd
+EBUILD fprintd-1.92.0.ebuild 2129 BLAKE2B 1d878f82b504870b82dbe74590ca50fc5c6237f6e14f32c43a5cf2a9c6a9a64092b61cfa8e7a06e56892907f8c8267b7e1c0ef7b5df15753ccdcf385085924e0 SHA512 f2f779cdd6f8569e16475c77033fe90137e8c784dd10e12e3d2d3feebbb81ec6eb021dd2d43b9412095144d284108c6bc4173b4f6ad66936da0c4bd42c4b9713
 MISC metadata.xml 270 BLAKE2B 0f6d61908167c717898b4ba7602bf3b429736afea65a4367231066bb481a2923d25760b31741774b37727f3dcf41ea748340899e7b4a865901036d9bdf52cf0e SHA512 f93613d657594e747e743541df6df87ef7152ccf381f343bc30ac55966bc7ea212697e350d454ddc2f7c91d9485aace053084a668a69a20d6ee74340cbfe1f25
diff --git a/sys-auth/fprintd/fprintd-1.92.0.ebuild b/sys-auth/fprintd/fprintd-1.92.0.ebuild
new file mode 100644
index 000000000000..db5a0d6162f2
--- /dev/null
+++ b/sys-auth/fprintd/fprintd-1.92.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson pam python-any-r1 systemd
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="D-Bus service to access fingerprint readers"
+HOMEPAGE="https://gitlab.freedesktop.org/libfprint/fprintd"
+SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
+IUSE="doc pam systemd test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	sys-auth/libfprint:2
+	sys-auth/polkit
+	pam? (
+		sys-libs/pam
+		systemd? ( sys-apps/systemd )
+		!systemd? ( sys-auth/elogind )
+	)"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_any_dep '
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			pam? ( sys-libs/pam_wrapper[${PYTHON_USEDEP}] )
+		')
+	)"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		dev-util/gtk-doc
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.90.7_0001-add-test-feature-and-make-tests-optional.patch"
+	"${FILESDIR}/${PN}-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	if use test; then
+		has_version -d "sys-libs/pam_wrapper[${PYTHON_USEDEP}]"
+	fi
+	has_version -d "dev-python/dbusmock[${PYTHON_USEDEP}]" &&
+	has_version -d "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+	has_version -d "dev-python/pycairo[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+		local emesonargs=(
+			$(meson_feature test)
+			$(meson_use pam)
+			-Dgtk_doc=$(usex doc true false)
+			-Dman=true
+			-Dsystemd_system_unit_dir=$(systemd_get_systemunitdir)
+			-Dpam_modules_dir=$(getpam_mod_dir)
+			-Dlibsystemd=$(usex systemd libsystemd libelogind)
+		)
+		meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	dodoc AUTHORS NEWS README TODO
+	newdoc pam/README README.pam_fprintd
+}
+
+pkg_postinst() {
+	elog "Please take a look at README.pam_fprintd for integration docs."
+}
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 82e6802320db..55edd2112487 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,8 +1,8 @@
 AUX libfprint-0.8.2-fix-implicit-declaration.patch 4831 BLAKE2B ec61d1ee189549f4456634b5b0157f32c61b2255330681b96bc50c73d9a5d51c1058f4f82b979ca4695d9d1065b0623e86be943f98c1582725bcddda0630156b SHA512 afd4e7c5ee65a91b17aa8bec4c6a0ba5b972e9f2586a0cfa7adc823d2a1f8d2378ed28928c5108870d2347f3edb2f343a24b2eaef6c015b7650834b4d76ceb73
 DIST libfprint-1.0.tar.gz 475347 BLAKE2B cb560898cec11861c4529c0c37c328f74eaf271c1932ca5126b7bd6c82fafee24aff393c0fe223fef018a34a409647065d5f98a999c00f0e7a879e33bdfcd3cb SHA512 2d7f569368035cce0a579ef3412a1961c28aab254ae6174ce9ad11ce97b3dce824d0c6123adac12718cb074439e4d5b93bf978e5341824f179231d1faa219a26
-DIST libfprint-1.90.6.tar.gz 6375191 BLAKE2B 0e6300da25eb910dc50c3752731f877ad26093bd901a8de222ec21965596fe88e643b0923edc4e100d96e3910595bb00c3935ef8b19840ac5c4ff1d9405f2d09 SHA512 91ce2bbc5bed17d8a343fa78cede3d0f14a83706a9c950334db98933ceea5c11c3af81f9692108bf49b3a31f91a4be34812f27a7703f164ebffdbc29eb73fac8
 DIST libfprint-1.90.7.tar.gz 6375722 BLAKE2B d0cb085c3846e870ff31dc346b8e138ab994f03e428aa1887066e56243d10179f3674538841edc75e02c8b58fc9a2ea1e97999fa919bad033aa52c88742948fd SHA512 2781ebb337cbd37affe203a7d054651abc7de4f2f450cddfb78a29e4f93e6a698dd950cc9be7112f43c5a892309e75b11e46cdcb60359859aae3811468adc8af
+DIST libfprint-1.92.0.tar.gz 8434928 BLAKE2B eba5d103a7ffc1d297bc276baac1f55dcc308bc18a4507fa53552044eb1a57bdb04cab0d81ee1b4022b5407f3cea06f72a686eac1b1cc5b178258b33e81b9216 SHA512 5f802aa65525bbe1c057053f9752052fe8f4e614ec22d373339cba42396a4e7ffe9cbdf7a7b732729e9aac7a4cde42fb5156949e83c574a30c0ad7b23ae4bc38
 EBUILD libfprint-1.0.ebuild 1063 BLAKE2B a486982077da190caacf146bd9831146087cdc4da4ccf8debb5bbeef1641b72fc21bc16de6ce8b69dd82262e6911ece105840f78991eeed34e6c300099564e42 SHA512 bf1e942f98ffa922bbb3e5110ee87106ca56a2f646be2afc9441ed0d15cea0bbc04daddd92bb9169c02619c8571fd02705be7229ea09716d8298ca0b5904f021
-EBUILD libfprint-1.90.6.ebuild 1233 BLAKE2B fe6ca6c080481351de8fcffeb81ea58e158d9233b03b31e5660ef9fea44dc134487d81492c5939f0b39d3476d8c19f8abef8e188e29e4c05001c327c07d8325a SHA512 ee88c8b1c6d3d2a19790d9964c7749197dc3180d346843a6f16bc87ec3b90b19821c89912ed49e121e34a19f720e3377801412c6fa46fcec3524ec262217101c
 EBUILD libfprint-1.90.7.ebuild 1248 BLAKE2B c8f159d22cf23171dc0ee53fdc21b5069e833edcd6b4d24771529e1238ce886b8c523714bb844ff424b16b17144f2bb3692ef4400981b825b05ff0dfa5c77b29 SHA512 dc1b7483cd7a1d7bd4bb491c44728aa3b04d44500e1753e5525823e8718809257d9b95275c9380f85db914a9cda75e00bf1a372d3a989916aeeb4adbd3c4ba04
+EBUILD libfprint-1.92.0.ebuild 1250 BLAKE2B 0e60d1aa997167a3f5cea3893ff3ac144ce4a34586035b9a63ee2d60d1ac24ce5fb7a4d54366d3c6eafb45145e9167244456a7b1e0c6442b5a29c60e3638be91 SHA512 dcf160b67756b9410db2a75866134a3572d40cffeae27989c6e137276d6e82bc851979678df877007bca9e0c5817a2e2ae67183f5a051d521e430923b0dfbf35
 MISC metadata.xml 275 BLAKE2B 20edfbe69300bfaf17dcd8e55ed6576d69e44c4e41a27a6211eb613b1bef6e97b0ccca036d9a55ff318faa6ff0679fa387d115109935a4e144fa3dc9c0aaf847 SHA512 9d3975cfeeb4e4e3101c291081d5da73124002d03f016f8ac79931cbba20d3c28d7a08769b4c845cd8d8a2d9be537b68f429fe3691136f851b01bb8b5233f406
diff --git a/sys-auth/libfprint/libfprint-1.90.6.ebuild b/sys-auth/libfprint/libfprint-1.90.6.ebuild
deleted file mode 100644
index 2b84a6e80819..000000000000
--- a/sys-auth/libfprint/libfprint-1.90.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson udev
-
-DESCRIPTION="library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint"
-SRC_URI="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE="examples +introspection"
-
-RDEPEND="dev-libs/glib:2
-	>=dev-libs/libgusb-0.3.1
-	dev-libs/nss
-	virtual/libusb:1=
-	x11-libs/gtk+:3
-	x11-libs/pixman
-	x11-libs/libX11
-	x11-libs/libXv
-	!>=${CATEGORY}/${PN}-1.90:0"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig
-	introspection? ( dev-libs/gobject-introspection )"
-
-PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_configure() {
-		local emesonargs=(
-			-Ddoc=false
-			$(meson_use examples gtk-examples)
-			$(meson_use introspection)
-			-Ddrivers=all
-			-Dudev_rules=true
-			-Dudev_rules_dir=$(get_udevdir)/rules.d
-			--libdir=/usr/$(get_libdir)
-		)
-		meson_src_configure
-}
diff --git a/sys-auth/libfprint/libfprint-1.92.0.ebuild b/sys-auth/libfprint/libfprint-1.92.0.ebuild
new file mode 100644
index 000000000000..9d699670ec9e
--- /dev/null
+++ b/sys-auth/libfprint/libfprint-1.92.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson udev
+
+DESCRIPTION="Library to add support for consumer fingerprint readers"
+HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint"
+SRC_URI="https://github.com/freedesktop/libfprint/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples gtk-doc +introspection"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgusb
+	dev-libs/nss
+	virtual/libusb:1=
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXv
+	x11-libs/pixman
+	!>=sys-auth/libfprint-1.90:0
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+"
+
+PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
+
+src_configure() {
+		local emesonargs=(
+			$(meson_use examples gtk-examples)
+			$(meson_use gtk-doc doc)
+			$(meson_use introspection)
+			-Ddrivers=all
+			-Dudev_rules=enabled
+			-Dudev_rules_dir=$(get_udevdir)/rules.d
+			--libdir=/usr/$(get_libdir)
+		)
+		meson_src_configure
+}
diff --git a/sys-auth/libyubikey/Manifest b/sys-auth/libyubikey/Manifest
index ba413e1c8c81..f521e7869f56 100644
--- a/sys-auth/libyubikey/Manifest
+++ b/sys-auth/libyubikey/Manifest
@@ -1,3 +1,3 @@
 DIST libyubikey-1.13.tar.gz 347337 BLAKE2B 99bbcc16115d913ffd548625f3366405879b0537c4dbcb9f6cebc406a057de642ae621d5793f1828056bfac266eb56b9a409cde44eb26753f955c9da6bcf8c0e SHA512 28f45cb9817c30a70d168ae507d3f8014051058d730eed92b31d92e96784138dea291bda4275511c5f92a6427cb4249d76c802b8abb867cec50e62fb770950f2
-EBUILD libyubikey-1.13.ebuild 468 BLAKE2B 9dfe88e6db341c3b3e829a1a8b2d43c90487570a419f51dc684b897d7655f9b19818dde65802d56946fc1592c3f7613270d3e047544e34cf7a5c2c2d1c45af07 SHA512 4719b7ee02fe2bab234662bb9f33424372e779e20a606f49c7c35ff7a039b32ea031c1875e87a2d889fa64cbb0db4b19f1397f920d73930425e44047630918ff
+EBUILD libyubikey-1.13.ebuild 475 BLAKE2B ad2a4639abde0b006e7c75823bd6c0ff2570def43ae3960ad19591bb3208a2169f607e01b79ebea757f48ad86ba1e042c477aa6c09d9e5b17f6024930005e369 SHA512 63aec104623ccc6e654863d1cde8a09fa3368942c834a0c45fab13f2f8ab96da2e92688c0d8ec8ae049dd61d1ea143d7e1a71ca97b620f11a6af6cf34dbfa658
 MISC metadata.xml 379 BLAKE2B 53f88bb5545b975d9b065f302ac1f03d4ff8b1aee8b9c492e166847b2bb57a2105ce37adabd6317c3d0bed420236123ced9de5c1f29ae369525955fdf29d4f59 SHA512 54ccbf977aeb24ad1864a54ae368e3324d477c21fe8c008f8a6ed588bce9aa6a5ecf60015865fe27a7a066aad83921ac550936bf5bbf66a0753c80029129317d
diff --git a/sys-auth/libyubikey/libyubikey-1.13.ebuild b/sys-auth/libyubikey/libyubikey-1.13.ebuild
index 6fbe9d923189..ca3ecbd23b6f 100644
--- a/sys-auth/libyubikey/libyubikey-1.13.ebuild
+++ b/sys-auth/libyubikey/libyubikey-1.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://opensource.yubico.com/yubico-c/releases/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 
 src_configure() {
 	econf --disable-static
diff --git a/sys-auth/seatd/Manifest b/sys-auth/seatd/Manifest
index 32276ca36e14..655d8e136059 100644
--- a/sys-auth/seatd/Manifest
+++ b/sys-auth/seatd/Manifest
@@ -3,6 +3,6 @@ DIST seatd-0.5.0.tar.gz 34762 BLAKE2B 054bd64800b734f6092f856540217e5ea4872c5a36
 DIST seatd-0.6.2.tar.gz 37713 BLAKE2B 001c6269bcc83488099f9237a3412b61f89cf653fcb5b0d1ada3f5fbdb17ec604d881ce3d835ff1ea3bc683bb143bab75de88d67b55f508e6a9dd2e958347567 SHA512 47e3aec819f43e72913be1cac2c0db26287f1ef8ecc738845d3591b3e2b4fee3441ac50ea45ac75a5da774e5305a18a02b8375f76f71644c8c07e95bcad52762
 EBUILD seatd-0.5.0-r1.ebuild 1149 BLAKE2B 5d2dea641973020351e6eceda0c32c6d91d8548406cee5b3713cd64a850c08975c2e1bd8be7a2b4f09581d4b88ed11b8fd103e81c30b70c3b101f70d7437f29e SHA512 d60e0a835c74ccd649dc41011d26b4fb5d0a7241b3a5ec17cca3ba1461510bfb2635f5a70a564648de54697625ab6b66d0edbe03ce69a60554b919bb45d31145
 EBUILD seatd-0.5.0.ebuild 1049 BLAKE2B d3e8166eb298e7b7cc6c2263bc95b011a2eaf02957a2e0af9fec7cfcdd71d0275e3ec7576a817e8a4acf022cfe7ec3231be532cf6205ef0941b0b3ca68a795a0 SHA512 609f6607bbad760600413e46a69aa0a349b139e7f6c7cff461b77a676b00561241da9cb31fd1debcdb48b65c23dee1e0c8ae5e0c3b0fff2e89ed5647568fbb2a
-EBUILD seatd-0.6.2.ebuild 1234 BLAKE2B 411a2db76f7676393aa193a95eba5001ddfea1c98731fe48e57a9c012ece2c58b0f47bb0bd474ccd99a891feb889d56ef0a9ec659ca893d39a77638be1951ff1 SHA512 868642571e7ead729f9aa75e7d60b01666ddd85436ef91851329b1ee44460c0818a476f4aa743c4e05dd2c1d13c5c8163a84b4906682bee26bd6324cd720ae40
+EBUILD seatd-0.6.2-r1.ebuild 1264 BLAKE2B cbc90f21e86f8430f2d1d7fd2b1a96659e7700e5438d0786ea4629b7b4e211a44f557efc998d943009a13e5694566a7fd48d22cbfed73bcbe6e59e6ef04485e3 SHA512 71c292c38490a4125054d0259f77acf26b77aeccc87c72e0f4f87203e0e66c77bf14bc02adc6e798378353e6b09b896491c968d256226331066f4a03c55d4899
 EBUILD seatd-9999.ebuild 1234 BLAKE2B 411a2db76f7676393aa193a95eba5001ddfea1c98731fe48e57a9c012ece2c58b0f47bb0bd474ccd99a891feb889d56ef0a9ec659ca893d39a77638be1951ff1 SHA512 868642571e7ead729f9aa75e7d60b01666ddd85436ef91851329b1ee44460c0818a476f4aa743c4e05dd2c1d13c5c8163a84b4906682bee26bd6324cd720ae40
 MISC metadata.xml 537 BLAKE2B 470177aa653458ce1a00df3640bd16932a0b7d71b6fef66e853edbc04b7d483a878bcdb395255068b9971753ec1335bfb467aca1be5e3e34ee676f636d087441 SHA512 8695c2958e8ebcb3c7f593815691bfab7c3198c85793f8039ed2cd5b8760546d1ac9929cc5ef6f8ba0a84add2c1b078868a9f19cc454ea379cfedecf7087cbcd
diff --git a/sys-auth/seatd/seatd-0.6.2-r1.ebuild b/sys-auth/seatd/seatd-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..2c8b264374b9
--- /dev/null
+++ b/sys-auth/seatd/seatd-0.6.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson systemd
+
+DESCRIPTION="Minimal seat management daemon and universal library"
+HOMEPAGE="https://sr.ht/~kennylevinsen/seatd"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/seatd"
+else
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	SRC_URI="https://git.sr.ht/~kennylevinsen/seatd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+LICENSE="MIT"
+SLOT="0/1"
+IUSE="builtin elogind +server systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}
+	server? ( acct-group/seat )
+"
+BDEPEND=">=app-text/scdoc-1.9.7"
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=enabled
+		-Dwerror=false
+		$(meson_feature builtin libseat-builtin)
+		$(meson_feature server)
+	)
+
+	if use elogind ; then
+		emesonargs+=( -Dlibseat-logind=elogind )
+	elif use systemd; then
+		emesonargs+=( -Dlibseat-logind=systemd )
+	else
+		emesonargs+=( -Dlibseat-logind=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use server; then
+		newinitd "${FILESDIR}/seatd.initd" seatd
+		systemd_dounit contrib/systemd/seatd.service
+	fi
+}
diff --git a/sys-auth/seatd/seatd-0.6.2.ebuild b/sys-auth/seatd/seatd-0.6.2.ebuild
deleted file mode 100644
index 8513ea785669..000000000000
--- a/sys-auth/seatd/seatd-0.6.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson systemd
-
-DESCRIPTION="Minimal seat management daemon and universal library"
-HOMEPAGE="https://sr.ht/~kennylevinsen/seatd"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/seatd"
-else
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-	SRC_URI="https://git.sr.ht/~kennylevinsen/seatd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-LICENSE="MIT"
-SLOT="0/1"
-IUSE="builtin elogind +server systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}"
-BDEPEND=">=app-text/scdoc-1.9.7"
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=enabled
-		-Dwerror=false
-		$(meson_feature builtin libseat-builtin)
-		$(meson_feature server)
-	)
-
-	if use elogind ; then
-		emesonargs+=( -Dlibseat-logind=elogind )
-	elif use systemd; then
-		emesonargs+=( -Dlibseat-logind=systemd )
-	else
-		emesonargs+=( -Dlibseat-logind=disabled )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use server; then
-		newinitd "${FILESDIR}/seatd.initd" seatd
-		systemd_dounit contrib/systemd/seatd.service
-	fi
-}
diff --git a/sys-auth/ykpers/Manifest b/sys-auth/ykpers/Manifest
index a5f2dcf93ebc..1d32da30a705 100644
--- a/sys-auth/ykpers/Manifest
+++ b/sys-auth/ykpers/Manifest
@@ -1,5 +1,5 @@
 AUX ykpers-1.20.0-fix-gcc10-fno-common.patch 308 BLAKE2B 720da4ac3f20c4512987b47068d7589ac70db0450306ddd16aec8ce5dde2e36e0d58c6ca0e7ffa5765b9b7a85b53a120078a117782ac6e8bf76066db52dd78ca SHA512 762bea78a6c6c2e43221374c6baf20828741e01532fd2bdc420ab197e96bcbc0eb6a1b157971ac58da7e1a7d8b4717cd1a1be84af23b473f51adfe4af57d1f4b
 AUX ykpers-1.20.0-json-boolean.patch 3572 BLAKE2B 684b9dab508b8d100d4e9237d833cb9160c33314a4076476b9342858844627acccc8f7025da0f22524251ca4541feceededd0f663e03810e53935ea809d1e556 SHA512 a8bc7ae71d0a05476688abfaea070ca7dc2eaa68e033524d4a1b2b6240eec2932d867e9eeaa248874a04f254618cd79bf9ebaa17421938b0c2e62502bf90c055
 DIST ykpers-1.20.0.tar.gz 127975 BLAKE2B 8753332be4df3eeb6ef0489782037fca12883a263d5697cfaee901763e4698ca5415953da1c2f8b3512de041c1e78735c03a5e6ea2101c71ada36d4e6d5d3d2d SHA512 a38b26700793f0a801e5f5889bbbce4a3f728d22aaecf8d0890f1b5135e67bed16a78b7a36dbc323c5d296901f6dd420fa658a982492a0cd9f0bbf95a5fbc823
-EBUILD ykpers-1.20.0.ebuild 1089 BLAKE2B 306ae3a6de0b2d26022f7a4f98a11830045e173ca61e1e3a47fca4d25065961f90fa1bfd415dfb43f2a3aed90725a2792f0d1a62b70ec51d44253e2968751331 SHA512 bfe7a8f56c8b31e6ede3150bf9c8107434ec6e7e3ed92a532bad464e4b84fd1338d786023bc1374e4613711354f2590435c5b59abff9ffc85252718bc661a397
+EBUILD ykpers-1.20.0.ebuild 1096 BLAKE2B 88adc37fd2dcd2e783a656e1e6ad15d0fb3aae9d15f72f3ba03cd8fbe1103f1b1b2505ef3b9fe135aabf8d9ed5fa2b0dfe4596a03b493cfb97df5529e43668c9 SHA512 1e66409f3fb4d9fdebe9ae8872f9e56fd4e64d2f40473f0a996755d949ee025249ca667f3eb006ea24d907532baea4c767b5c0e596ae0df4e36b208af08e2702
 MISC metadata.xml 419 BLAKE2B b4788083b4ed4628976fedb8c9ffb419e90f32eed892f4e360582ceade32353171364874f6dcc3f6b858a2df7e3c5b05675973a216b0338bea431ac999e55b20 SHA512 dd7fe5d412333da982aa9f9ae51e4d0d1d86ce527a8306c62b5a3c68a7f09958d53ce9f9aad64c564ac8b2df7118a917d1dc644f4a96f500c409f84cb0fa8c0d
diff --git a/sys-auth/ykpers/ykpers-1.20.0.ebuild b/sys-auth/ykpers/ykpers-1.20.0.ebuild
index d2134a082324..a77b20b63462 100644
--- a/sys-auth/ykpers/ykpers-1.20.0.ebuild
+++ b/sys-auth/ykpers/ykpers-1.20.0.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
@@ -9,7 +9,7 @@ DESCRIPTION="Library and tool for personalization of Yubico's YubiKey"
 SRC_URI="https://github.com/Yubico/yubikey-personalization/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 HOMEPAGE="https://github.com/Yubico/yubikey-personalization"
 
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 SLOT="0"
 LICENSE="BSD-2"
 IUSE="static-libs"
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 3b62f886aafd..954644806494 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/buffer/Manifest b/sys-block/buffer/Manifest
index 17be81ef5a2e..c47f161b2d79 100644
--- a/sys-block/buffer/Manifest
+++ b/sys-block/buffer/Manifest
@@ -1,4 +1,3 @@
-AUX 1.19-deb-gentoo.patch 8422 BLAKE2B d1c1628ae74f2454e17d176602610dd5356365e18e260f5ca32f26d8a19dd857be144c4116de244b5c143c61c4176582d4e3713c8c584a3a17b4d3ad1c1320ac SHA512 791d7990f900d70a229d77ea0eda67c99ea81697ca65f83bceea1131d0d5da94484c796ad601d8031da72fe24b2add6b0e4e86956c0ddb2fbe76cee6574ccb34
 DIST buffer_1.19-12.debian.tar.xz 9924 BLAKE2B 9f6591e00d596257956e3230cbdf8e58392aa3666d7900c30ea26d103f03d25071ff1033fa72e7be799021ed4c32d43e0e5ad69d1457a5ee22c33e3ae6f8c058 SHA512 3bc9d8c281268d38c1cc3ac40727d747c91b605fc3128e285d24663f97396292a0ec40ede9205702793b5d090c4e172b0df28321921b000aa0fdcb2660319367
 DIST buffer_1.19.orig.tar.gz 17753 BLAKE2B 68e2026f29cb00c48c8f3638d97adeeee0d194d7a6db96cbded251b3f97d36ba2ac32a60660df8aa1d2c7b79dd774b543d3a460a5d76ab6ca408606a013b5648 SHA512 b724d8c3e21f29890659c95a61db8667846e49614455411995160bc8d5af8a37af91465ad5d882e6bd7883dbd7886215a8c1d530f7392c98cdcead4f4377aa7f
 EBUILD buffer-1.19-r4.ebuild 1209 BLAKE2B 68ed16e51abfd72cb0d5e3b8e4efa8101525487a990051cf1c3331b9f9304b785e7d228f313489c1be7097ccdffd59ed3c4b5b2c109e9e4b09fabd518442914b SHA512 d71e593a13b06fffa9a27a439ad4890349be4735d415d8e6527a38698a9a70c2b9def9eab8fc0fd1e4130bc1e9723d32c1abf9da9e5c7291e4d6c237ca4f2b4f
diff --git a/sys-block/buffer/files/1.19-deb-gentoo.patch b/sys-block/buffer/files/1.19-deb-gentoo.patch
deleted file mode 100644
index 66ea66433bc6..000000000000
--- a/sys-block/buffer/files/1.19-deb-gentoo.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-diff -ur buffer-1.19.orig/buffer.c buffer-1.19/buffer.c
---- buffer-1.19.orig/buffer.c	2004-08-21 01:45:29.938082048 -0400
-+++ buffer-1.19/buffer.c	2004-08-21 01:45:39.444118464 -0400
-@@ -109,6 +109,9 @@
-  * Initial revision
-  * 
-  */
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
- #include <unistd.h>
- #include <stdio.h>
- #include <signal.h>
-@@ -120,6 +123,7 @@
- #include <sys/shm.h>
- #include <sys/sem.h>
- #include <sys/wait.h>
-+#include <sys/time.h>
- #include "sem.h"
- 
- #ifndef lint
-@@ -127,8 +131,8 @@
- #endif
- 
--#ifndef __alpha
-+#ifndef __linux__
- extern char *shmat();
--#endif /* __alpha */
-+#endif /* __linux__ */
- 
- /* General macros */
- #define TRUE 1
-@@ -136,6 +140,14 @@
- #define K *1024
- #define M *1024*1024
- 
-+#if defined __GNUC__ || __STDC_VERSION__ >= 199901L
-+#define NUM_K_TYPE unsigned long long
-+#define NUM_K_FMT "llu"
-+#else
-+#define NUM_K_TYPE unsigned long
-+#define NUM_K_FMT "lu"
-+#endif
-+
- /* Some forward declarations */
- void byee();
- void start_reader_and_writer();
-@@ -250,7 +262,9 @@
- 
- char print_total = 0;
- /* Number of K output */
--unsigned long outk = 0;
-+NUM_K_TYPE outk = 0;
-+
-+struct timeval starttime;
- 
- int
- main( argc, argv )
-@@ -262,6 +276,8 @@
- 	set_handlers();
- 
- 	buffer_allocate();
-+	
-+	gettimeofday(&starttime, NULL);
- 
- 	start_reader_and_writer();
- 
-@@ -384,8 +400,8 @@
- 			fprintf( stderr, "Usage: %s [-B] [-t] [-S size] [-m memsize] [-b blocks] [-p percent] [-s blocksize] [-u pause] [-i infile] [-o outfile] [-z size]\n",
- 				progname );
- 			fprintf( stderr, "-B = blocked device - pad out last block\n" );
--			fprintf( stderr, "-t = show total amount writen at end\n" );
--			fprintf( stderr, "-S size = show amount writen every size bytes\n" );
-+			fprintf( stderr, "-t = show total amount written at end\n" );
-+			fprintf( stderr, "-S size = show amount written every size bytes\n" );
- 			fprintf( stderr, "-m size = size of shared mem chunk to grab\n" );
- 			fprintf( stderr, "-b num = number of blocks in queue\n" );
- 			fprintf( stderr, "-p percent = don't start writing until percent blocks filled\n" );
-@@ -397,6 +413,11 @@
- 			byee( -1 );
- 		}
- 	}
-+	
-+	if (argc > optind) {
-+		fprintf( stderr, "too many arguments\n" );
-+		byee( -1 );
-+	}
- 
- 	if (zflag) showevery = blocksize;
- 
-@@ -507,9 +528,9 @@
- 	get_buffer();
- 
- 	if( debug )
--		fprintf( stderr, "%s pbuffer is 0x%08x, buffer_size is %d [%d x %d]\n",
-+		fprintf( stderr, "%s pbuffer is 0x%08lx, buffer_size is %d [%d x %d]\n",
- 			proc_string,
--			(char *)pbuffer, buffer_size, blocks, blocksize );
-+			(unsigned long)pbuffer, buffer_size, blocks, blocksize );
- 
- #ifdef SYS5
- 	memset( (char *)pbuffer, '\0', buffer_size );
-@@ -528,7 +549,17 @@
- 	pbuffer->blocks_free_lock = 1;
- 	/* start this off so lock() can be called on it for each block
- 	 * till all the blocks are used up */
-+	/* Initializing the semaphore to "blocks - 1" causes a hang when using option
-+	 * "-p 100" because it always keeps one block free, so we'll never reach 100% fill
-+	 * level. However, there doesn't seem to be a good reason to keep one block free,
-+	 * so we initialize the semaphore to "blocks" instead.
-+	 * <mbuck@debian.org> 2004-01-11
-+	 */	
-+#if 0
- 	sem_set( pbuffer->semid, pbuffer->blocks_free_lock, blocks - 1 );
-+#else
-+	sem_set( pbuffer->semid, pbuffer->blocks_free_lock, blocks );
-+#endif
- 
- 	/* Detattach the shared memory so the fork doesnt do anything odd */
- 	shmdt( (char *)pbuffer );
-@@ -648,7 +679,7 @@
- int
- fill_block()
- {
--	int bytes;
-+	int bytes = 0;
- 	char *start;
- 	int toread;
- 	static char eof_reached = 0;
-@@ -707,7 +738,7 @@
- {
- 	int filled = 0;
- 	int maxfilled = (blocks * percent) / 100;
--	int first_block;
-+	int first_block = 0;
- 
- 	if( debug )
- 		fprintf( stderr, "\tW: Entering writer\n blocks = %d\n maxfilled = %d\n",
-@@ -742,7 +773,7 @@
- 	}
- 
- 	if( print_total ){
--		fprintf( stderr, "Kilobytes Out %lu\n", outk );
-+		fprintf( stderr, "Kilobytes Out %" NUM_K_FMT "\n", outk );
- 	}
- 
- 	if( debug )
-@@ -783,14 +814,14 @@
- void
- write_block_to_stdout()
- {
--	static unsigned long out = 0;
-+	unsigned long out = 0;
- 	static unsigned long last_gb = 0;
--	static unsigned long next_k = 0;
-+	static NUM_K_TYPE next_k = 0;
- 	int written;
- 
- 	if( next_k == 0 && showevery ){
- 		if( debug > 3 )
--			fprintf( stderr, "W: next_k = %lu showevery = %d\n", next_k, showevery );
-+			fprintf( stderr, "W: next_k = %" NUM_K_FMT " showevery = %d\n", next_k, showevery );
- 		showevery = showevery / 1024;
- 		next_k = showevery;
- 	}
-@@ -798,7 +829,7 @@
- 	if( (written = write( fdout, curr_block->data, curr_block->bytes )) != curr_block->bytes ){
- 		report_proc();
- 		perror( "write of data failed" );
--		fprintf( stderr, "bytes to write=%d, bytes written=%d, total written %10luK\n", curr_block->bytes, written, outk );
-+		fprintf( stderr, "bytes to write=%d, bytes written=%d, total written %10" NUM_K_FMT "K\n", curr_block->bytes, written, outk );
- 		byee( -1 );
- 	}
- 
-@@ -825,7 +856,7 @@
- 	}
- 	if( showevery ){
- 		if( debug > 3 )
--			fprintf( stderr, "W: outk = %lu, next_k = %lu\n",
-+			fprintf( stderr, "W: outk = %" NUM_K_FMT ", next_k = %" NUM_K_FMT "\n",
- 				outk, next_k );
- 		if( outk >= next_k ){
- 			pr_out();
-@@ -914,13 +945,12 @@
- do_size( arg )
- 	char *arg;
- {
--	char format[ 20 ];
--	int ret;
-+	int ret = 0;
- 
--	*format = '\0';
--	sscanf( arg, "%d%s", &ret, format );
-+	char unit = '\0';
-+	sscanf( arg, "%d%c", &ret, &unit );
- 
--	switch( *format ){
-+	switch( unit ){
- 	case 'm':
- 	case 'M':
- 		ret = ret K K;
-@@ -941,7 +971,36 @@
- void
- pr_out()
- {
--	fprintf( stderr, " %10luK\r", outk );
-+	struct timeval now;
-+	unsigned long ms_delta, k_per_s;
-+	
-+	gettimeofday(&now, NULL);
-+	ms_delta = (now.tv_sec - starttime.tv_sec) * 1000
-+		   + (now.tv_usec - starttime.tv_usec) / 1000;
-+	if (ms_delta) {
-+		/* Use increased accuracy for small amounts of data,
-+		 * decreased accuracy for *huge* throughputs > 4.1GB/s
-+		 * to avoid division by 0. This will overflow if your
-+		 * machine's throughput exceeds 4TB/s - you deserve to
-+		 * loose if you're still using 32 bit longs on such a
-+		 * beast ;-)
-+		 * <mbuck@debian.org>
-+		 */
-+		if (outk < ULONG_MAX / 1000) {
-+			k_per_s = (outk * 1000) / ms_delta;
-+		} else if (ms_delta >= 1000) {
-+			k_per_s = outk / (ms_delta / 1000);
-+		} else {
-+			k_per_s = (outk / ms_delta) * 1000;
-+		}
-+		fprintf( stderr, " %10" NUM_K_FMT "K, %10luK/s\r", outk, k_per_s );
-+	} else {
-+		if (outk) {
-+			fprintf( stderr, " %10" NUM_K_FMT "K,          ?K/s\r", outk );
-+		} else {
-+			fprintf( stderr, "          0K,          0K/s\r");
-+		}
-+	}
- }
- 
- #ifdef SYS5
-diff -ur buffer-1.19.orig/buffer.man buffer-1.19/buffer.man
---- buffer-1.19.orig/buffer.man	2004-08-21 01:45:29.935085504 -0400
-+++ buffer-1.19/buffer.man	2004-08-21 01:45:39.441121920 -0400
-@@ -37,7 +37,8 @@
- Use the given file as the output file.  The default is stdout.
- .TP
- .B \-S size
--After every chunk this size has been writen print out how much been writen so far.
-+After every chunk of this size has been written, print out how much has
-+been written so far. Also prints the total througput.
- By default this is not set.
- .TP
- .B \-s size
-@@ -71,9 +72,9 @@
- throughput on some drives.)
- .TP
- .B \-B
--Force each block writen to be padded out to the blocksize.  This is needed by some tape
-+Force each block written to be padded out to the blocksize.  This is needed by some tape
- and cartridge drives.  Defaults to unpadded.  This only affects the
--last block writen.
-+last block written.
- .TP
- .B \-t
- On exiting print to stderr a brief message showing the total number of
-@@ -82,7 +83,7 @@
- .B \-Z
- If reading/writing directly to a character device (like a tape drive)
- then after each gigabyte perform an lseek to the start of the file.
--Use this flag with extreme care.  If can only be used on devices where
-+Use this flag with extreme care.  It can only be used on devices where
- an lseek does not rewind the tape but does reset the kernels position
- flags.  It is used to allow more than 2 gigabytes to be written.
- .PP
-diff -ur buffer-1.19.orig/sem.c buffer-1.19/sem.c
---- buffer-1.19.orig/sem.c	2004-08-21 01:45:29.939080896 -0400
-+++ buffer-1.19/sem.c	2004-08-21 01:47:41.265618240 -0400
-@@ -27,6 +27,7 @@
-  * semaphores */
- 
- #include <stdio.h>
-+#include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ipc.h>
-@@ -95,7 +96,7 @@
- 	return sem;
- }
- 
--static
-+static void
- do_sem( sem_id, pbuf, err )
- 	int sem_id;
- 	struct sembuf *pbuf;
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index e448880b10ba..75896333f3c9 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -2,6 +2,8 @@ AUX mbuffer-20180410-sysconfdir.patch 897 BLAKE2B 1fc57be6f5ce11f483d43dc69c9e41
 AUX mbuffer-20200929-find-OBJDUMP.patch 279 BLAKE2B f22f74549eb2fba1061141616097fc01b987c846302a0fd59aaf8a0236a291207a02f0a85ec542fb217377eb40eb0983cd450aaf9a56f3df7838c29f31ab663a SHA512 20a9969de11f6eaf398627a306465df6b43ccb640176c4743ce8e8aa59b06f1837b0ef968223a0770c7aa1cf1959713526fa064f3eb54bbfabb067d834e510c0
 DIST mbuffer-20210328.tgz 148009 BLAKE2B b369fdae908cfa239e70d092f512f1613215f1a38e5f2dba9403edeb5579fe14a099f0b9950572c1e294c7d5938bd5a363a1cc3239b4553ecd24c6b805fbfe27 SHA512 69f7cac7fe49a86944092d642c6138455ba95da8e6d00abd41b37d126a9f03c3252e69795c5fb5bf8e56d0ce1461bde6b51f48c5eb7073ee49ee4e6df83d834d
 DIST mbuffer-20210829.tgz 148786 BLAKE2B af4d47eab143861a10fa5e9f86cc0066594b675baf37dd63ba71dffb4a22a4bd057ea4a03d50ba210af8c1021dad258a33d46525a11c7cc2ad0dd852839f3b9a SHA512 67b7398c27fb4539d36437b5224a7305216c32af140d5dd9d4af734227bb4bb4c9e8c577e05e315534c5e1cf65a87a9a7a32a212cc4faef17e3c387b3895ef47
+DIST mbuffer-20211004.tgz 149261 BLAKE2B 81427f9684266de53a7e76e33378ff94c9af08768d2105ee1481399d88180c3ef358c21c99716d82ef965ba809e3814029a3c9f844c987ab812d8e5624ba8e67 SHA512 d5914b5c59ec1fee92af6915d8abebc71459461a2d8acd0d93060f3799b5a4104f08d29349b3500553d532a279804d22a40ef0ff001c45a2bdb72d3966c2d7a8
 EBUILD mbuffer-20210328.ebuild 1520 BLAKE2B 118ca53f14fbcd0f01b3c1bc6cc75eec9a879c65c3721f1366c3fe1bc18ccb65bfe64f5c4916358ddea8d54a4cb966e6630605172bc3ebad23896c97ce9fc8d0 SHA512 15b13c98138583bbf9046a06d30a84812d661e53cd2ec460f36869d5769185a0cc046883aa0af1b316630c40a75a705e4cd7eaf36f07ff834b4ef9a1dfcbafb6
 EBUILD mbuffer-20210829.ebuild 1525 BLAKE2B 7e679c246ce656064853ec65561a425f0e0d2c74980008e9d1213d72c0320d1b0bd0d3e8b513b45a2e46cd516d9bdbf9eef6eba313ec927e6039e551dafa4399 SHA512 02c9cb2c90a0cf0561704fa688449296182ae3e3e74452013fcc1e719be525e6bb72e36dcc99efb2689e49b3e5672fe4d0e850dfdcb72c04bd589badbf36649c
+EBUILD mbuffer-20211004.ebuild 1525 BLAKE2B 7e679c246ce656064853ec65561a425f0e0d2c74980008e9d1213d72c0320d1b0bd0d3e8b513b45a2e46cd516d9bdbf9eef6eba313ec927e6039e551dafa4399 SHA512 02c9cb2c90a0cf0561704fa688449296182ae3e3e74452013fcc1e719be525e6bb72e36dcc99efb2689e49b3e5672fe4d0e850dfdcb72c04bd589badbf36649c
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-block/mbuffer/mbuffer-20211004.ebuild b/sys-block/mbuffer/mbuffer-20211004.ebuild
new file mode 100644
index 000000000000..b5df3c74c1a2
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20211004.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
+HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
+SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="debug ssl test"
+
+REQUIRED_USE="test? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="ssl? (
+		dev-libs/openssl:0=
+	)"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
+	"${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
+)
+
+src_prepare() {
+	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
+
+	default
+
+	mv configure.in configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable ssl md5)
+		$(use_enable debug)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
+		ewarn "Some tests may fail with FEATURES=usersandbox or"
+		ewarn "FEATURES=network-sandbox; Skipping tests because"
+		ewarn "test suite would hang forever in such environments!"
+		return 0;
+	fi
+
+	# Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
+	# using same port and src_install may have problems (with /etc folder)
+	local -x MAKEOPTS=-j1
+
+	default
+}
+
+pkg_postinst() {
+	if ! has_version "app-arch/mt-st"; then
+		elog ""
+		elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
+	fi
+}
diff --git a/sys-block/targetcli-fb/Manifest b/sys-block/targetcli-fb/Manifest
index 123700ae821a..1a1788d8967d 100644
--- a/sys-block/targetcli-fb/Manifest
+++ b/sys-block/targetcli-fb/Manifest
@@ -1,3 +1,5 @@
 DIST targetcli-fb-2.1.53.tar.gz 39586 BLAKE2B 35e5cea72580ba26b8397027e92446c129af5a94ab9458eed63ec731289065bcce759a77558a022c41b4ed73eefe865000e60b4e17816836f13056cb07071069 SHA512 acefa7f8df8ee901cae8f04cbeb264d6024100e2d8b8343024bc52842af88a23d1bf5dd880ff2c77046bd8da8493630b4e357103617c02d1a90947e42c3a7c92
-EBUILD targetcli-fb-2.1.53.ebuild 721 BLAKE2B a43c18f7f0951e2c9aaa7971faeb2a0cefda3f81ae6e16ee1d804c6d78f7a2cf77be9fc4671d99f4e6d016fa8f840ff0fd6d410b2be8455287e87dcfec981670 SHA512 7b57be73dbf1c490628280728f018be2600514bbcb4f9cf837734da365c0a6f672fc3059a6f07f1daab5a4212143b577a1cce1b9d41a8156bffa463b9c248171
+DIST targetcli-fb-2.1.54.tar.gz 39565 BLAKE2B 6eeb7da39fb047f9123fe12ea92a41d8e6fbd6728fdde8e1315e0c0224ad8abfa29df798680949d89cad6ff5afcac8112bbcc63b019f6245eff12089ea7b64d3 SHA512 dd008b8c47acc095078454c94b0c6f19ba88f86ddf1b5335eb050abf61d89ce1ffb7411ff3a174de60ed9759e6337206253aa9b2def6497b85c884a0a111308d
+EBUILD targetcli-fb-2.1.53.ebuild 722 BLAKE2B 3bf4c7bec7c29dd77a2b5932c8c0404f203682badf9ee584328be1fb5856e5edbac312709ca51c1c761b89e46267b5bd19cf04dc45ddbe0c96a80eb95e60d16e SHA512 dd69231c84a1efb39996e0f8288e07610c3564eff60a3e6d69857ed0aac485fbd65ecaff33f3f372d3eddd8dad0f0cfb1085fe608c663c8d154c928604b4d7e5
+EBUILD targetcli-fb-2.1.54.ebuild 784 BLAKE2B b29ca6b17f5ea53550944d13bc273e304ef0cd9ad4cb1ed3e7503301f3fcb4cc62f924b185502b71f10b8304d221742a4b3a68e8c2c924941e0855c0e856f3ea SHA512 b86cc706e963a2a5cbef87cecc0fe329a0488f99e31acd046c4063aa2170a7b146dbb36d98a7b9ae07be0a1d33f956e030784dd32c383e6d0b8e7658fe7d13aa
 MISC metadata.xml 766 BLAKE2B 2586ab9e1959ac6f42f93181e9f7491be744952d7165cbaca338d783af9bf9a7c486430a73cc4b03d5db08470679931d7b95f57ddce920fb3a744037c8c2abef SHA512 88a10d8316bcda83b916de5d799a13c993e98f51dbb3ceef0a6dce0406bfb26f2656effcc70e7cddcdb1ccd135d8ec1ce642b04b43c5a0330b6721c258a371a9
diff --git a/sys-block/targetcli-fb/targetcli-fb-2.1.53.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.53.ebuild
index 7008cee2d863..e4c4816ab706 100644
--- a/sys-block/targetcli-fb/targetcli-fb-2.1.53.ebuild
+++ b/sys-block/targetcli-fb/targetcli-fb-2.1.53.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="Command shell for managing Linux LIO kernel target"
diff --git a/sys-block/targetcli-fb/targetcli-fb-2.1.54.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.54.ebuild
new file mode 100644
index 000000000000..5392599bfcad
--- /dev/null
+++ b/sys-block/targetcli-fb/targetcli-fb-2.1.54.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1 systemd
+
+DESCRIPTION="Command shell for managing Linux LIO kernel target"
+HOMEPAGE="https://github.com/open-iscsi/targetcli-fb"
+SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/configshell-fb[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.73[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	sys-apps/dbus"
+
+src_install() {
+	distutils-r1_src_install
+
+	keepdir /etc/target /etc/target/backup
+	doman targetcli.8
+	systemd_dounit systemd/targetclid.{service,socket}
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 10252257868f..cd00768860ea 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/k3s/Manifest b/sys-cluster/k3s/Manifest
index 069750aa16ec..20bcb5ce9903 100644
--- a/sys-cluster/k3s/Manifest
+++ b/sys-cluster/k3s/Manifest
@@ -3,13 +3,10 @@ AUX k3s.initd 986 BLAKE2B 85634e38eaa785ae2343abc6d090e0979410ef7644fa7540905c89
 AUX k3s.logrotated 37 BLAKE2B 8e106b2ae826d1724adb3cf6970cb46b53247ce77a8206ce9ffdaea372ee36f164f38ae8044afe814f9a3aa24d1f3c8d8d75452949ffaee0644948a6ae92fb52 SHA512 f0732ad9d003df155ab9f919909db8c62024c546412f77b3fc6c1a94faf150c532de61e73421a880b7be55edaa4367e01084f59b6f99211a3dcaac1a38f28d68
 AUX k3s.service 597 BLAKE2B 067ea095d2ad948a59e6fcc6ecc569d3f8fa4e802e381e5ccc48988c70c5e8e9e4335afc7cf5a2e830d22bd89cabffbc6fb9161da73599be75b305eb28bea14a SHA512 9741575f844da8ed96e230c443ec6662bff22be8602b420eb74fc6a72d09f36a5fddb8426894e63b7a8c2918a36fc717a38dfbcf003b56f47c13c06c4fc96825
 DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod 22 BLAKE2B c2b56c0b043a2c0225c3b4142f179a2d2e4938dad64b95c8662a6d641e69a455b50ed79c66a3bcc10982792d3b7742ac96a2d74eefa7fec40a7c3146e5c949cd SHA512 7b3ef87f98485bb9ec325680f57d43a9bd76e90bdcfb1e798458f28f7d3addf91dbb6a07b654749468860981413ad2267df2d5f3535c85579e9f79d9328d355c
-DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.zip 220662 BLAKE2B 376eb9b0220068094cfd563c90dff0f54607a0bf4b88748b368550335d1ede4278c9d39bb84974a18194deb9d1b6ff7005804d0cd9517539f5220d787d0e54e0 SHA512 ff7667cb995251235ec8db10f931867bccef2c4617fac71b11a1ba9ba4ed9b418d345c27af0c4da2d65708f279ca06918d094b75c9b6009b9e7a5a8a9c882491
 DIST bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.mod 42 BLAKE2B ebde002e2c03188c594fa3cdfc530a5caef34296e7c88e1da18770407c01d8ea2bb4259f7a4a493526abc23bb30d0773935d97c132c0544c9b6c6562e0f6ba33 SHA512 76e5e25a5eef22d4af4425416b389bc878264d7be9ba920d1bc05831e30b322f74fafe29d892982d71897d5b6b006b0711597bf63e1c1003525a7dd00151664a
-DIST bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.zip 19691 BLAKE2B 175d066df1c29e47188c2ad045a781235b2bd8fc278eb14753b3cec4d3911a4f186de94295be579689ad56ebaa9abf1ddbb798e25bc4281a783f25c407ccda87 SHA512 f53c1567852e419bc8ddf026414d6d21bf24c73c098ba83c2bc0cbc2f8f2b349f4042913f47ab97d24da40ba8e73018085f8e4e9af2f97d8281f793cb02c03bc
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
-DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip 2721920 BLAKE2B f3fde8f5cc53496dc314bcae822a415cf00950da0a03b968de00685371e7a2e84ffa304fb176e791c85c930728859687e768ff785829f0751ae919546bd3326d SHA512 8981a08b1ba0226854567b0977d8a349abe2b58420421ab1dccdaf9c98e7657cb2140ad1a38767d25cb54249b61f162ecd51d401374a29f7368a550b19196595
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea
@@ -21,6 +18,8 @@ DIST cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod 1226 BLAKE2B d0544ce288b6beec6b76b
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod 1149 BLAKE2B bc4e8c16d0c809b4f5d46d8b29112192ff51066e7df99242923eed643339599ca3d1180afe571c3e826d656d935ccc9ff1ba1b79701de859cc15364415bb35ae SHA512 de15381b36dd6691bf40592be83b4ae5b58fc92111a3ccb8cb4b540e1230dc0798d86c149884e8dfb6f93ec827447acdd7ccca2f2942c81aeafd1b035f5c482a
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod 982 BLAKE2B 9e5e32bacbfe15d8c72b4ee66a6e4124a3d58b989ecf022cdcda38e99b83924382f412067de8f6bdf3b1ecf8deffdf8fc74a8be671221f39fc2c8b11b2919e88 SHA512 86e2e042bcb371780189029b21afe24ba8ee166a9c0a4eacc314444844cfca3dfdace1678b01a213b7452cd69acd1d46b7051614569b99ac6fed84887b0e3097
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.54.0.zip 1318291 BLAKE2B 9661d100ccc33b7418c3028b6d526345b1906387599266717201ff4e96535b45cbdbf08cf32a2ca1ac9419955e5802370cec2c275a9628b855da1b38e075162a SHA512 801cba98eafb97f22b461fcf44419e4d2cd92d7b655aead6b59b16ae8c4fbeed489c633a606aa0413bb178228cc6748381426c0e8160892b23dc34b5d96d9ca9
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod 1096 BLAKE2B 6e3982479d332fbcf74ee167d41289e6f4cb4c2982e85e0631bb4b2bad291d3b76d86a8c4e18b7aec9e6494b54e67a0ff2b2b65ff3f113f530501ba964f93e60 SHA512 cbd08504799b151d34a9f3594f0713077ed5b421ef9c0fe9dd90b773638617e6f6aa153e6241dbbffa891fdaad4b14e0523834cb45e84d28f7e213b007e7e08c
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.57.0.zip 1396865 BLAKE2B 33ee2da4c2a3cb80edfa74ce9b5affc21204a3ad0c08e497f98182d61c2ef9399d46115fab3c47d0b6915b578d6fb88a5b5f5e5ada3e5ac99141249078b3c096 SHA512 6ac9d4aefbc03a5c0e4a7f9def1e618cbadd72aee7a3ae28dca74f34794d7edd0517271d1b46e406db585ad39725e8a48504d066604a8e10420a3ef78d6250a0
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod 555 BLAKE2B 6707e248be1fa35970275388888eb7692f976a8fca6ddc7cf02e355f8d44264c7eef6d093d90c115670b7a3b495658b79e622c47d1c90b95684b8d32547d7342 SHA512 2df2dbf07037f027100f8beba6416c00fc115fcde2dce19ea4c0fe4a036e8f66f7ae278e9765d0fc80149a330e6dd90eee8e9a0c93aecfe16da65d02320aabd1
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod 631 BLAKE2B f7d342f7b6a9e0cc3249d9133a5408e9738957c57cedb13a64bd54d638cf85a17902bade3b452660b5e8b6aa6dbd76e0e93f0b0e4f5711856916879049f28e13 SHA512 3de4d1cf52d35112353c8d7e76df9915e92ba8addcbcf4c72e6d24c677bb642ff0b1011fca4e17dd9d364a03443710f452effb51965d95fd1571358b9aed7039
@@ -40,8 +39,13 @@ DIST github.com%2F!akihiro!suda%2Fcontainerd-fuse-overlayfs%2F@v%2Fv1.0.0.zip 27
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.2.1+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv43.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv43.0.0+incompatible.zip 39123534 BLAKE2B b404c83c7adb04346ff2abcff04934c2174dbe75fccdea31372d8ae2a1b2b7acb05558c540eaae71ab0548ebd6498d5fbcb01cdad8f2bd5ff0515dc724d4173f SHA512 96bb1b4d4f512d1e8d7a672c36f8c962c634115389da7bec6cf8f7ee7faff306f1291a15923406317d579eb4bbdae71e346d9307f7344a7b2f25e5669bc540a5
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv55.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv55.0.0+incompatible.zip 54871163 BLAKE2B 8bb5ec6b3f4b7d3f61e69b3072dd13d510ebf681cc76553428cb73a29f3705105478b6459a495bcda94ede8a0fd6d027e6b0ddfc5f7f7db88209a7adaf8a9c3c SHA512 cbb14946844b6c5204bbf197e57a261d7f6e493b3ae78c5906480657294c4d34aa8180176b1933159a239d7dd231b8f933fb66d6b8faf25ad3d7f69dab6af8c9
 DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod 36 BLAKE2B 52a2c5272e004524397df00dfa03b4c2d2ebd985a0c974236aad6b847d6b2b4b7c9b69ef48e263f4c67983b845b020d2004fe749b46fee3c0525da0416b20f3e SHA512 350a16c68553738ce8c2f4a6ac8beba66a7dcf2386a42aff938ebaa3bdc526bda8e5c51c493331eda4666cbcf8411ee7ca3aeb0768cc4f557f34585960f9eb84
 DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.zip 32735 BLAKE2B 5de266d7400ae80c027f209cea91c911e22b0ff4fc6a2e964e8906f1a86cc6905b9c12d2588d5fdc91d0d8e9501a0ddf2f7a376cca9935d21943386c3ef31979 SHA512 72621865ffc0cadd27603e2f4032f1cd9c9d8bdcb920b3ca9fd02dbf88e52876a6f092c5b74eceb136021c514b68dc599f0cbbf18ed1620b827d46462aa55e32
+DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210608223527-2377c96fe795.mod 36 BLAKE2B 52a2c5272e004524397df00dfa03b4c2d2ebd985a0c974236aad6b847d6b2b4b7c9b69ef48e263f4c67983b845b020d2004fe749b46fee3c0525da0416b20f3e SHA512 350a16c68553738ce8c2f4a6ac8beba66a7dcf2386a42aff938ebaa3bdc526bda8e5c51c493331eda4666cbcf8411ee7ca3aeb0768cc4f557f34585960f9eb84
+DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210617225240-d185dfc1b5a1.mod 106 BLAKE2B 9972b1d0c688fa76ac59768ddf33e159556f54ed776babf06c15d8fa562c201748a0d2d5e011b07adb2fcf5ee120e348ff6643baabb53fdc61c7e5c339a6c64e SHA512 ff8b1d90d4e4a62c86c2540c22cf472dc432f29768b3387d2e39b333deee1c19b24752f8642684624ba483c699d77128f619d3d880ceac7003294e7a3a27cfaa
+DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210617225240-d185dfc1b5a1.zip 34145 BLAKE2B adf1ef98583a39129b844c3e639ee8d6832f75f68e33d6a17e35e26575a843be589f4829da2ea6f9fa3674cbab92072175aa57fce5ea9e203d79800fc435d758 SHA512 c99d74ac69a1eab02263c6a5273204ecdc0ec7857af7f66912de94658f26cb1214f0bedda384038b1c19f40028bb2a7825d6599c4ef5e0406dbd16a03b1c320a
 DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.8.1+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
 DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
 DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip 24733 BLAKE2B 66be4a311f84fec9bf833da384747f93cded83fb7cfe07481ef9a8a5747b626c3da56437e24b687524403d463463599c193a0e4dd367f4afd4b7c41fee7dbea9 SHA512 b5615d6e8b8e3d1550218258027891063d3296af88918fd63559d2c108a5faad4ee1281c57dbbe51057f1c417ba94895a59e969550acc0ed276a7cf648ff6ac7
@@ -49,6 +53,8 @@ DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.mod 366 BLAKE2B
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.1.zip 107327 BLAKE2B fd1ff89ea4441b4d4b64c3890428cd0ce12e8f0e999a646e0389ffce695c8e4e095396dc84913b3e4b20330e2b2707f0e216fe5e3610db3651bea6889e904f42 SHA512 c2cb590fa0c5f008ad03cd4b43571e0c8f3e53125bb8679ad4ccee7805efd56853b329a4b000c71718d24575777a630bc274e0c4b92f18d9cdf6f905f25d4a32
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.12.mod 366 BLAKE2B 74f1d402b4fc7bb6bf54c6467067256504fe2e37419de2a5be55b9c105ca2d1c7951ece398fac6cf98d02b990da9ad0d2aa1f4d12c17dd99ad3b6df068d4e727 SHA512 67b890270798e538335a74754514d4f2fde7e012f1201d30d3450087866612b88c5613185a5dbc899af84d65fb4265fec59ea064eec3e9362aeecd1187dbfd30
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.12.zip 108506 BLAKE2B 0e7d6c446744ed6be39f2427b0509c2c495cd9156a58ba6ba516beaf8d88ab2c435c5c88a4ea08d17375f92120e53414f9cdd9bfb4170210a3b1e6ab0445377f SHA512 98c93f8c32d039df45b77ba6cae5d18976d3e507371f6ff5f583e9cc6342a87ce5fe9a17876a6cbb22c234647a244d498dd14574b8e8a73365a6c69772b5a1ee
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.mod 367 BLAKE2B c2bcb0e7c4abd9be609740163521e205aadb8f07ba624a313356f59ba2ad0ae452f40f28b78579670b5b2ea861490340e42773e8fc9b04571581c9b1231794b1 SHA512 87bf6ed1a08ab82817e95baa6b605c56d368bfcc859edbc3b16200700beacfc92a413f59052ae59988d24fbffa66aa5acc20d5f0b1c0f784b3ecf0e6179d893f
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.zip 112025 BLAKE2B b3eb6a781432ae32e384e4bdcee16fee0117038ace90fccd959573ac3bc057805972fc54983c5e9eca32006163ede3aa46beda59b5cf2d4946e0e70cd3e09d42 SHA512 1083a5f773d78d0f79f121222d2853b9ffa5cbbbe80538a4c14217bf67d551918e9f35ff0d2b446113db60756c6d0d6676604171426ded48d93f122d49c4b9dc
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.6.mod 315 BLAKE2B 649b180d4b41279bde5a3ad4e7a8380b3e23d9428af2b2904612abfce99e5abf53ab7fa27ac7805faff0be8c2d52d685c7edc1380b909ad2c033beaae87be7f3 SHA512 eca3516d2491afa621522aae14e0e5c8632b984d8c6daff3a69df9b2b46416eeacdbd11de8cbc2247fb1119051466d24a4c178b065b630a684be8476be1ef15c
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.6.zip 106169 BLAKE2B 477f3c4b4986c714ada8f437a22d13b63e5acad3497932d26328954e38ea3c3972a0b6ba9c7ec20a0014ad738d3745439ed7df9dd23a51d1e5e97f87426a01d6 SHA512 567276aa7c37b3bb0ef1685537afd344862085478ec9c1731f909fe749cdc52165f02457b692741c25452e69b12f19a032813b3c93d992b66b99adc17e5fe5d9
@@ -56,6 +62,8 @@ DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod 325 B
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod 371 BLAKE2B 778ec4567ccf1533e9815f0f855933c94c2a4aed6285f10815258c71a39fb706ed130db03c85f8b944b764978ae584f7cc675cdd3688e6a93961f4437bf3aca2 SHA512 02605c296a8277e72074a0b3049ef0ee87597b67ba8d1e008d17746ee2dfc2551e2517e60f972135d368b27b899452e1c768c3b13afb9315da48173733450fe7
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip 40633 BLAKE2B 8ffe2bba80daeadc1a27198e4c6cbe39bf4219340686899460c4c217966d97583bcbe10ff7182a0bb27ad01550690ccdd12a1b53a91264bdaf3d6febe30adfd5 SHA512 d0f6392ef14fde8128709adaeeae7c4109a2c81830bbc107b8fca4ea6145bf68434a171f1d145536d78ea5e2fbc316cd21fabbb99008604a276974405274bea6
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod 376 BLAKE2B f7e3a3f97b6a61ca9d5497ff96984c9f445d2c138f9d90157658cc697d9531cace1a87f6e2a18414ee2f7f54eee81d7652b3006b8be6c0137a2c794d37bf845b SHA512 684a7c8f51caebd1bb90c7eac482ebf9a52228c57a5b31ea1b3d3019864bf669688742bf5f9159995e5a6ddb3786aad9dd10c37925767ce9f38641c9a7448e3b
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.mod 424 BLAKE2B 19dd207fb48b9175da4fb2afa17012cc48a2da5eea52ba9e2f32250b291ddaebc5fd8ffb42d19c8fb8fd1265ac2f7ae5525863010f6502c1c86616ca22600bcc SHA512 873698094ff3f392a54d01ae2b5744cbdce84e10b7c28b930aa7366d72dde4ece9636e168b003c46f8a21eeebddab150e687626338f6d938798b99c35bb62ced
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.zip 47890 BLAKE2B 3c86cf8b8a9be463073e3ea7eb96770a12f5d662532a4706b3c4c1ba30605ce1016662c9cdb7f95b8e30a9dfb26b612ef941ac8bf008b0ef2191fbef67e46909 SHA512 2c78eb875092f1cd18289c1e5f0585324bac3e534dfc0967c3f5c14dc1063b0b1ed3e602a121a750cc24110dffc6eba8d738a4f2055c1730221418857aa8d484
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod 380 BLAKE2B b6ea0cb491b11963174850acd4d525607eec5b63196c774afd73f974048a9a99d0ad6209fff72bab5238109d80d7498b4f8bb126b3c8a170f34373d69d96f4ba SHA512 63536f9954ee05c36e35abee4e91f9791fa97e10a945bb51c710cb2aeaf3a567d999193f968ce54e8d530be617fb55dd6e3a0c0b88f8edc96d1f92d348b13cac
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.zip 44530 BLAKE2B f8ebc327a6385e0b8d63287d19b62577f88ddc40a0fa211d473704d23aabbe8a2c2ad6bf5a1ce1811494cc6a08feddfe4c4807cb52dc461ebbefe3a914a4fb65 SHA512 6b7107c7a40630425b6f5221e8f82fc0488cbce249f14a03bcf0c3bda6e3a4ea6747318023718bc75c6711fb6334b96fe5f98ff3272b5d601a6acf2a803c77c0
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod 59 BLAKE2B 7816ef9919ec514b2eafce6a859edeae85735475da10c34c64ecaf9a53a07748b02a424bd0a16b0413c499a2eacea0fcd6ce7807b651acd9f67ecd00b5fe55ce SHA512 d5eb17738399f8b8e1a1be409ba5b24520b848b3be5fced46c726499f9df5bf5a54233c6c0c9b8fe896834bcf5132f39ba0b91bac0ce6347b9aef7c8bf93f912
@@ -72,12 +80,16 @@ DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod 119
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip 9299 BLAKE2B ade95bdf956e40a7c5a6e44d75d4b1b999aa02ef7b3a8bb6c33dac291d2ba06d4c691dc87ddedd6c3218b67b1fbb512529eea41d2d62a18226a82de2e01c0df6 SHA512 ff018e85092e3aaf288aba57d453088eaf24d22638f57f0d494dfa36899070c07938e50362d22267f1b40a65a69e7930a3214ea29f02ba6406a1de2b3c770de5
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.mod 57 BLAKE2B 943afb01beaa46a8b9f7b3ec18cf3e497376cbb1fa0a2d1b259a6bc127a85373ad15725efdfc27982798b597c57e870fcf7c192ce492ccebccecad1c04ee819e SHA512 785331243801e29ecc1ee2f3c28d665eb5faaca6e734468f378f26626ebd93d4c2a4768a7056982e18d650a108d7afd5b82f13a68263c9b18a95a79601248ec8
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.2.0.zip 6952 BLAKE2B 6e09b7dabfa1789de1d13df03d6b77168aba9b0b61bdaa96dea8fb16a81edcd6636d959fa25856944b5c924379c79e1f7ead21d645141ee72ea88bcc79b6add0 SHA512 3e6375343e88c4624d7268d6342d363c8a46ccbadb43fb95709f42ebf618ba1da32fcce0012a7374aada67cf7b2a2e5ffe5da8e05a6bfef207453c981343aace
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod 116 BLAKE2B 064d7cb8cabde1b322a8bc6d6bcf80acb5e25573d4bb50d0b9753421412ffb140f8db409903aff01a67d399773c94a0eac85734f05dae36b98402d4bb2fc5bfd SHA512 1b6a8f2c23e225f4f83de03e4e23e2ad31357785ec5e8d23e8300f249048f7d8e14419f991b509f6a3c8a05cd5ffd61e2385703e950cf1eafffdab95df4a8b02
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip 8129 BLAKE2B 235415e90169c74bc7a78bafbc4e98751fd7a57a6676e74bc05152d0c40b211cf7e9b27ebfb510952fa890c0e66d43f76e8585bdd12aea4ef0fad47df96b40c9 SHA512 4198cfaca3923afd7dfd6eb7ab5ea3fc01a03543b771995d38000f0bddf2ce02cc44f77782878ae05ab44f121bcf7ab4c5ba046e49807ca306883e9db410c8ad
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod 109 BLAKE2B faf0cee9d111fe3b2cc1b152bc70ae800cc1c562680b054b5d8ac93706fc0e3ef7db3779584838cbd37d6ae65154fb7bccbd1d9bfd6465f7a08be0b28700aa61 SHA512 1f82cdcde2070ecdfb57ba52deca35fe758ef4c6c48c924d3590fe036d99a228dc92d736e6fc58f272b88688c817f7763d70c47a223c6be69d7be288932f98b0
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.zip 14608 BLAKE2B fad300e37d768645ab304ed200fd5a1bc601d489840fa6afd892d23a243fb401192ecc415c3f661f05f5a442b76488a034170364df7f7f2c313d59c0e34c321f SHA512 2078a2a7db282ceb6b04188a1824d8e20f7ab162573affab6795903590c3228e6a21480a8d12898544fd209a5363c9e567354d7dce5c5ee718507496d65c5f72
 DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod 52 BLAKE2B 83e3b09b165e45af373e2e62dc0b7799ac204794e1922b4134ebbeba4cf6cd9b6d883f6035624f2421e8ae613d071a2e281379ee4935e55b73540ad8104d79cd SHA512 ad433e42696f3b605cdb12c70438d3b1a4d4d52890cb28b8e76cb26bf1ae51f324e6dbe2043bd74bc9086efe743da65b8cbddd10618f4b59d27858e0898279d5
 DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip 9362 BLAKE2B aef4f369994d869906ca45a1051cc706579525324b8fe2a5c98dd4d80d4181366ff7e3cbb08f3274762a6f2ab2259a2770fa11a9b088b07ff3abf1a241d01814 SHA512 f81a070b61e026440ddd9b29174fd1d59241eb32d1fb4a2202c38fe80022aaff07b389ed6d75eff27da9408a7832f74c51f3c53866774cd9125e83c9f258bb61
 DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod 111 BLAKE2B d97433a5745f1479d4c0aa7ed6b6cdf09827fe8cfb41ec000a0aa6162ba01629c76abf9491904397650b65ff74caceae9255faa97f54d0fde0756cfb1b09b494 SHA512 bc44b8d16bbfa4fb5e5f6ad015165f03ca8c747096d4618aac083a22313451fb283f0061fab90e6148e5a52279e839101561feb358cfa77e26028fcfa5a4fc9d
 DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip 10521 BLAKE2B 0b4ff7f99d953966ccf4f17cc32b3f0875bf7087ea5caf7bbeaece451fc8cb9fc4285e5d79d2880165e70f738edffe709efc54a32367a3c666d2a1b383b139c7 SHA512 45e35c16a3e2d0ba3e765f85e80ed2d8ac65c227bc260df910f0959a8642bf0bafd1ba20a2dcf0b69fc6a371bb4a4c8026e54bf15628119d68df4d063756bc3e
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.mod 111 BLAKE2B d97433a5745f1479d4c0aa7ed6b6cdf09827fe8cfb41ec000a0aa6162ba01629c76abf9491904397650b65ff74caceae9255faa97f54d0fde0756cfb1b09b494 SHA512 bc44b8d16bbfa4fb5e5f6ad015165f03ca8c747096d4618aac083a22313451fb283f0061fab90e6148e5a52279e839101561feb358cfa77e26028fcfa5a4fc9d
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.zip 10631 BLAKE2B 23199c0e4bffb67d890f4ac5729c97f3546e178e53f65c725fcf3728f625696ad96a6bbdd13fba9c45da6c849eed44e5143e6efd174c8dc0dc0b2a9345f61929 SHA512 974649535e3db11c2ac0ae8f3a3b401f0d967ce3562c55f92c41af6a9aaad69cc22066d00c15d8be17ac545e1b39689e35b3377eaae8d48571a961f86476e59f
 DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod 53 BLAKE2B 6fab3fdcfa8f595bbd52845b0b4f7b0e47df93fc624820a661b38bff1d51e0a57c89b678e0cf271ac6575b6a77c48d3ca93d5307d6cad98b35f79f1142a27795 SHA512 b1f9bd825933cac8ecd5416f86748f26e5cde3fe87266e35ee794cd1f59ce0fa81c0e62169e838e70afa71b0680a89fd8f2beafb3c1411eceadf48a154a08f9d
 DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip 6278 BLAKE2B 1c42d23c77848911af642fd38f79aab655056e731f015a62374a23cdaade84b53f61b80f65f9416bd4f0e4b72a0b42203b56d659d30a44bb244a6ed5ed1869eb SHA512 f1a334ef91dd9410c57efbeece2ebef6ea326485e790e47de67efc9495d3e252cd7e981bd9da3f94f2f7e35c1bad9a8d5153e671a9b81758ad0584883c916155
 DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod 112 BLAKE2B 37e4e4987feb544f6382e506e0721975c975cfd239138221555dd238350b534400256fa7118705a7ded177877f3ead64275789839cbeff8c175aa3e4f8b9c8e5 SHA512 a513562aef7037e4f62d099d2fb3ee2015bb43d6bb32b734ef2597d32642d7cf7eb13f1e9a71edf424e274912d90de5db5c038b8cdc4276836740bc045cd1a90
@@ -92,29 +104,30 @@ DIST github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0
 DIST github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod 38 BLAKE2B 176ac3e371386c6a43148aabcf75084c43038decec0062e623c4a7baa194bf7c654f59cddf9f8b413209cbdc03372c790ea91d8f3f6e3d393ced5eff1e903100 SHA512 3057fdb8ea9b349e253361877f132c1808099cccff5eecfc8cb95274bfdf219a466c26ddaceded7867f0cf47f605728c417961d37a3f40695b720967c61973f8
 DIST github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip 5595 BLAKE2B 72d6d4e22f8aae9443e52fea0b8b01f704c7d58812c3a52ec4cccb2848f360f995e72b29fb393c333abe92e571e0b2e32a7e328e46e91d1a490b97d4d9ec93fc SHA512 258e6875c1a5c8b700cbb95bea37af6886766cc30b70aa5fd78cb18a92bbbf073ee918bac7699e0bb86c6cdbd4b25f5ba4aff8c95087ad845f8efc84f715c8d3
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod 37 BLAKE2B 21cbcf43ce9e4dc3485c260f4b20ae34fa1aa41676ccdc1f4bd28fdbd9402db8c1f77d4c644e5044a0f2cc44e06a6109791f6d6cc4620b32e1d2c36426df65a5 SHA512 752909cad98e7eafe9ff00951c27d955242d3d76c99c3e52427987f1c81720af76ad1da5e4d67e31bc192822b7de299edeb2077b248c0f070b6adfde4e9b8ec2
-DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.zip 101282 BLAKE2B 6f158a6a4244c73e1472fd37278fb4bf29edde45361462e069e5c08a116e22b67b520e8a48ff38f286888b4debe179c9b7cef9b589152914b9faf52ca5cf5948 SHA512 ecd8c8fb335e62744eb7ceebbf6ab9517b605032b1b103e7b2fb4d2ea617980ce17b30215b5a42d893dfa1381049bdf2f6d0e0ac23e3b8cdd974278f1984c4e3
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod 177 BLAKE2B 1b5b5169436173ec669c16023c6993e233f5fadbb574533e7e2db2140c2db22cd9b8697135a46fe7d8787b8e5ae8c16019f15e5cd7a8c4ad59a46f6e6db9bb5e SHA512 83b5d04d488db971f78cd1853903e7f5cb1d547d5b5270bcaf35aff4240f0b96c300ce311014775028e1424c6fad714991c27f0c676d8b8eb37aaa62330450ec
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod 177 BLAKE2B f2d2eb41aaa0f3f47a75ab260a461e6df690c34e7e817ec61afc7854ae26bec641cddf4f4481b5b3b27394e303d1fb1c4a9864f4de2d6c01f33e3fa0521b05bc SHA512 584c9a707b6115caac28ff373974faa59d12531962997f9640a4172b020f72c5d527355f035449a767d65ce426fc9705c143a7bd8afb5058c9ece241c9ad5d1f
-DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.zip 162259 BLAKE2B 71daa9e2a01282e0f29e7f47081f8e5cebb59a31837b2e70b2b52d1ab371b351f6f00a8a0cdf33efaf0529f6ea5e0230ef9a35209dcd7600ad1204cadefa53a2 SHA512 31cef74693dcc7ff3e5e3542654b4174eb8ce7fd3a8a763df52414c99e01679404f2a5e6a1ab9cdbfed958b588e6584feeb8676ef9e149c4d24ae095dd654b64
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15.mod 177 BLAKE2B f2d2eb41aaa0f3f47a75ab260a461e6df690c34e7e817ec61afc7854ae26bec641cddf4f4481b5b3b27394e303d1fb1c4a9864f4de2d6c01f33e3fa0521b05bc SHA512 584c9a707b6115caac28ff373974faa59d12531962997f9640a4172b020f72c5d527355f035449a767d65ce426fc9705c143a7bd8afb5058c9ece241c9ad5d1f
-DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15.zip 110372 BLAKE2B d9fae557dc6b44cafe9f777ae704d6a2e4b10ad11bbfc3465d98cd69661d7f8068a570ebc8213c56d76879fd453f85c87e6e30ed8108203a74a2c782eb755099 SHA512 ff9ef4d7d872be27cc00aa33a20a0377cb75b2c40291d920402f13103d956512f703c42eefe91e7e17bde3cce6e1fb3fe6d202e99b1817801d98c38b495b1751
-DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.10-0.20200715222032-5eafd1556990.mod 1658 BLAKE2B f5932d922932694bf4eecef7d9d123ca91f30b075fff495ad0a646eaba02b225eb4faaced3d0c39977a0129b677e4b73f2ced749db983b82722ae00ee8811235 SHA512 dc025dc4d8ff0bb1ce1823b5cf229420d728d99faf818c7f94685a4a1caa2c20765722ce7522b033e0a8a77d904bc355730841c0ca71951152450ac48b8a3793
-DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.10-0.20200715222032-5eafd1556990.zip 521361 BLAKE2B 1d2b9ac8a834acd7e51fa0698c27181667bb29f2193b11a0b208ba4d5cb0471f760e44119e5901885388d81abfc3839b49f05e916402ecdff8aeb127a910e516 SHA512 1dd08c3a50166e856bd686c8fdf8ca1551cdfc5ebe387cadb49c91d7324400dbea254af473d02bf23e5a5c1f09c6acce8c3e06ecdb1bdf8a9535f9b2357e1035
-DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6-0.20190129145542-bc49f75c7221.mod 36 BLAKE2B b225c59078b955a08b32e04bef09ef99df1befd791c66b6e8c1e97c820aa16bba520e2d9f31af170cfec4546a53b9f49eb59112e3ad5cb9f4ec1e32c570576cd SHA512 3035f5c6d6b72168b77140776f5a15d9ec7a81bacb1f0433d4595ad240c79d69466c6e2e4b2c025b30af68c88ebebe4fd011b04a8a82789401af4503a9cee29e
-DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6-0.20190129145542-bc49f75c7221.zip 410042 BLAKE2B 903e4e56bd4dd09c26f8fac480678ed54365d881ad6534d9416c8fdabb9a9e6053f8514d8b609e286ac1f54e8fcb9f6cc9ee5c75cfbe217609cc92bb30e46310 SHA512 2d43be9b0dc582c8e099583726f1c8ee2a2579a0498a39902ce3669227fd914352ac2146b5e74d69ed10e530439163379cc536d5ae83d6df082513b1a9f2413e
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.mod 177 BLAKE2B 1abd608ff82193394b1553334bad24f5062c68fbc1b773733d4e69d121e4c23879207bee0211488307dd055def52bf24464b2be9685f10efdb23d63f8745bcf7 SHA512 5a32f55d6a4c3269cfa12d67a4f083477dfc5743b80911055c9e415bcc7cf477077478286fee918c154309d1420d19f811b8222e022df09ba2b7a3e1c93ffb38
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210324224401-5516f17a5958.mod 177 BLAKE2B 1abd608ff82193394b1553334bad24f5062c68fbc1b773733d4e69d121e4c23879207bee0211488307dd055def52bf24464b2be9685f10efdb23d63f8745bcf7 SHA512 5a32f55d6a4c3269cfa12d67a4f083477dfc5743b80911055c9e415bcc7cf477077478286fee918c154309d1420d19f811b8222e022df09ba2b7a3e1c93ffb38
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17.mod 177 BLAKE2B 1abd608ff82193394b1553334bad24f5062c68fbc1b773733d4e69d121e4c23879207bee0211488307dd055def52bf24464b2be9685f10efdb23d63f8745bcf7 SHA512 5a32f55d6a4c3269cfa12d67a4f083477dfc5743b80911055c9e415bcc7cf477077478286fee918c154309d1420d19f811b8222e022df09ba2b7a3e1c93ffb38
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17.zip 116037 BLAKE2B 950370d7e7af06a573c636bd7a99cb09882cd5a03f1f5ea8a1fee5ba6b64103e9a14b30261bf672efdb8abaa35f9a821d886164c8728355a6822c128b799f480 SHA512 e7f3f9ef96f80b0eeff77f75c668ed711583ea158d52e1d93daa413779d650d7796120a14fcf179b144716dd6b8f7df9c3044455b3b4742f34a39682732416c7
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.19.mod 177 BLAKE2B 1abd608ff82193394b1553334bad24f5062c68fbc1b773733d4e69d121e4c23879207bee0211488307dd055def52bf24464b2be9685f10efdb23d63f8745bcf7 SHA512 5a32f55d6a4c3269cfa12d67a4f083477dfc5743b80911055c9e415bcc7cf477077478286fee918c154309d1420d19f811b8222e022df09ba2b7a3e1c93ffb38
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.19.zip 115469 BLAKE2B 00d537282d736213ac68145e9d12652aac514b610fea5f7c179975777a97f495b686a97526362559444ca6f4907d6416b38c2b985fba6949f859e67ffa4e3f20 SHA512 7b2912a1aba8757cef7185b7fa1a23f2e9be729ec55f306da82d5e431a29b2458a3802f1583b8a0890d1dad06ba1b1789c9c24a007542f50379d00c7b2de5cfb
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.16.mod 790 BLAKE2B b2ede5d12e92b5594a854db2327c085d200ba72590a474cd5a2b5a030371ef3a9ceee584db1942891826993d80ba74ab4d7b70b0611184a120322860b66c9b39 SHA512 7cc7aa119bd7385db8a90e7770a6bcbcd2bd3f138a4562da3e0545893ccfccd1c5e4ae930fd0a645b1687e3e78264561647bb6540f2d501ceb2d89180d7d6437
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.16.zip 676527 BLAKE2B 94c0310f019ec80c48a68dbec00c3903e50cd9bd3d4083366a09bfa54e36c868bb3c2b7a1e0c660e16a46392f42b404c41594d4f0e196e870e7c2aceaf672121 SHA512 7cb2fa7c18812b2f9af5787fa2c11c92ab175057f484209792d91645e1e3d081d712d77270fc5b9d297ea0ee352030b59e8df5914da3b9e0382651e385a2a487
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.18.mod 861 BLAKE2B 55f6b9763f5a966750b22b56cd428c1b4d385a60b5018ebce5959de182110ac3c223fa5cdf4a5e580dcc6f46632c354930701aa728d4dbd20c2404a54881463d SHA512 c9a070f5889052905faeb9095f5a9d5d921345ffb59b05aa1eed070e32526fd61855c84da26e04ccc823564832f60e0668940f6f3fc5538a5c733c964342b420
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.18.zip 724008 BLAKE2B 63b431b8148a5a5edcf27e2768354e0a3e7f81fe24f42e0f6bc4b3fc5b2e7ea93eddf463024c0a0d50c7d2c4cf1967121275d41d3cc6679e21c8095258f77bbe SHA512 ecbf676cf574de038369236a7233d05964f7d6a6c25b895991bf3c9ce226a4a7d5389532f61095629478e8ed7dc4a1111a5a23fe5cd083d3087052b95cb4163c
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.20.mod 861 BLAKE2B 55f6b9763f5a966750b22b56cd428c1b4d385a60b5018ebce5959de182110ac3c223fa5cdf4a5e580dcc6f46632c354930701aa728d4dbd20c2404a54881463d SHA512 c9a070f5889052905faeb9095f5a9d5d921345ffb59b05aa1eed070e32526fd61855c84da26e04ccc823564832f60e0668940f6f3fc5538a5c733c964342b420
+DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.20.zip 724010 BLAKE2B faa9461f94b96a8d0088d6405adb80fa36bd598fefa314dc5f5fdbedb0e90894955ace0848b83ae4ea29e63b04b200812973d33b101889e234828f5cd950bde3 SHA512 21a4fd581e0a89301efbfa87626673da9cfb4a29ac4525a88fc71c7bcadcbfb60b31ecf11a3f03df0add79f8a8a4f43051f117028e1953cbb34776567c2f6c02
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod 36 BLAKE2B b225c59078b955a08b32e04bef09ef99df1befd791c66b6e8c1e97c820aa16bba520e2d9f31af170cfec4546a53b9f49eb59112e3ad5cb9f4ec1e32c570576cd SHA512 3035f5c6d6b72168b77140776f5a15d9ec7a81bacb1f0433d4595ad240c79d69466c6e2e4b2c025b30af68c88ebebe4fd011b04a8a82789401af4503a9cee29e
-DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.zip 390334 BLAKE2B 74641c8bcbd7e7d869dfb30ee03f932e01193a88a38f76268419636ee26ffd743323a654b6ebf5c1f8d692049521f1b818bf0ca84439732627360c3120662e3b SHA512 ac875efbf7b4b18b1379d46fbfda100f822c6246fb3f201fbc2288762e4272e7bfd8191a3a2d84aa7585320a38e93e6635ad3ba5a5da855b82fa8ba057ab144b
-DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7-0.20190325164909-8abdbb8205e4.mod 36 BLAKE2B b225c59078b955a08b32e04bef09ef99df1befd791c66b6e8c1e97c820aa16bba520e2d9f31af170cfec4546a53b9f49eb59112e3ad5cb9f4ec1e32c570576cd SHA512 3035f5c6d6b72168b77140776f5a15d9ec7a81bacb1f0433d4595ad240c79d69466c6e2e4b2c025b30af68c88ebebe4fd011b04a8a82789401af4503a9cee29e
-DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod 1988 BLAKE2B e89ecdb4644e50e2cd545eb43452729d909745705f5254a59547420baf3da357e77bf5d73b220da6899fe08a4eb034b0d1815702dceda20ada57e277b83b9954 SHA512 67df97dbec1c4a0c0f84551ea80df88a827c9ff4467614ef61544a611e19de6d063af40cf33673621f2e52e198595b61c8d6e5d732fe87f00eb7c5bd653e0399
-DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.mod 1715 BLAKE2B 2404c8d3fa21fbaaa7f43c4799c320c9c251dfe3f630f7b6d85696c270baa6c4cb017087a4ddc7f7da0b29b94239fc20399616ef1c5f3ce76f05e937779425da SHA512 9d9ed47cb1b8c51ddf79159682aeb99a043532f912514c2ef6574883f5bcb24f1c77c8cdc6238eba436bf3a6ffd095e53956ea1b28eef9fb5dec3646b5549efe
-DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.zip 477269 BLAKE2B c47ecb41bf2d747e9df605dd7021361f2f3db6107a17dc78cb394effbd565cecdf08abcb29a7788161c5f06c4cc99779b2481abd394412ef561eca8ca4723429 SHA512 9ee1a4d8f9ee1e8a1f75904114073c1a0d2d936d39ea453c924e7a602a02881dfbe580742299e069dcb97883528b13b45b89423f940cf910cc0fc1b4b49a9aea
-DIST github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20200803203718-d80bc7196cb0.mod 1606 BLAKE2B d06175ae750e16d7e4cf0316e0447411fa2daade71ffa2806b0735259e79000461471838ebbd370b00bbf7d3375eed90f36b7948c4d91f20d76f71393b3ca2c1 SHA512 cd96391eba37a3c16f2a4c66cbe33411c7f82492afb2bb9373cd6787b0bce0ee459d27d34fb2c10083ddef652f1fcdf92f5d1a6676bf3e2aaab752cf4aa605ef
-DIST github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20200803203718-d80bc7196cb0.zip 122294 BLAKE2B a233fac62a75f75d9ff4f8944ee2d31fac009f01a5ea6b6b1cd38c975ad72ea6c7ed41befc946eb176e1c9d328085c66cec0ac734ecb5cf96a9f97946ba52c0a SHA512 87dd943efae534dcc1a0e93c40efeccd53823340518b27369abd22aaff0142bc05c6d84e2b7cad9bac6f3e1b2f2b6df8cc6ae381b0c0453465201049ce79993c
+DIST github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20201218223536-d3e5debf77da.mod 1606 BLAKE2B c0aabd6a401ab80282ac34b81828ecc7ee87098a6d5e781f78d8eb8df3ec193d5dbf9481d3dcef4fa101e99b6559ef13c137a211feb8c06e0e3bcc660a8da496 SHA512 ab7474c1c38a1382ddb5553089543c71da0f8fbfb0425bbba70694f22346525405e89a3edc5b2ac271fa41aa97104c99812e7e5bf2beba066abf592731edab8f
+DIST github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20210227013316-43a75bb4edd3.mod 764 BLAKE2B 5532c4d9382a512ddd2668e766baef1e7e6294f64bcc071598067ee8528e427c5eef89a8175c1d86c4ed4114c661f5a3b9af37f9c3b562646b322568b9b0781b SHA512 6172ec1bf31743800440da645d133ca67f63f1f1495ffd60e5da7ba0e484ae827a2c718fcd802dde1321cded675b9ff2fa24dd0dbd71f784d96329767121d85e
+DIST github.com%2F!microsoft%2Fhcsshim%2Ftest%2F@v%2Fv0.0.0-20210227013316-43a75bb4edd3.zip 154277 BLAKE2B 6f0ae30bac969e8571a5e364ca5b2bea34fd914896d5cb67c8ebbb1e3c58641e4be482c18a5c82bedf673de0b17d6adcbd3b499043f61d671043dc47dcc72f49 SHA512 0d0c0ef9673455e51de4385a240fe1ab2423a3559c6e313fb343d5bd6f1d7a39a7edd3f7e8f1f84dc99b6ae4a3a49170bb670a8c6457a8bb0d8d2e3c13a24b35
 DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod 38 BLAKE2B 3f0ac051b31c84f5e98663c1e6245a4e2bde2be5c0be61ec80764d753bef5479251bbad3cedf6fb998d1a4a4e66a80beeafa6f3291ed45f46d643f7be109004a SHA512 aa1f503fe0c19002da21ae30df5393c15f2b2243ff415493420204d11032a562d5d40047705b1644d031523881dbbf284d3c56ce8106a2a969d2610504426762
-DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.zip 48225 BLAKE2B c86fedfca22f95ff6f1e7f08d3cdb34d32ee9875917ac14dc1d7e0c7881028cd4b19977aeda5e6a58187f683f9c76689c1bc1eee2f80933941174d34a55b066d SHA512 62826d9c7aa1871288a5d6c5a2c075ab5b20c442aac3bdcf2d32f906c39a02b5d749226125d72365101e2e6b54c8ebc567e795abf4627178cdfccfa7f4a1b31d
 DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod 91 BLAKE2B 4b450a7c1f230f8be959f6c2edfd47669015738deea7de2ac6347699a1671ec7e0bd66d134fd5fad079ebd9fd64eb4000ada8c91b2fe9193048eb4ac3c36735f SHA512 0e1988e2b81b9f2c0531c5fba44524f81fada3338c323141b1e4b49f5474c16b8ccb60bee17d204f17afaef228fcf4dda47ef125b48ff209ca49eb9d6a233745
 DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.zip 55401 BLAKE2B 7604f64a9d9941b2d4f8430aedfaf02570a99d2b4321760574e777ab1ab87029af2cb629634fbae3859a478471591c0f66e4452445f40d556bd6ee9cdcc01570 SHA512 01c31a36b6c9dcdd10558f1341741d4b3ff181b16ea45114fb06598831690503e131b91d5a9b3e531102d6ad0e645c733c7bc50121932da470035677bae21ff4
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2F!puerkito!bio%2Fgoquery%2F@v%2Fv1.5.0.mod 144 BLAKE2B 697ea637ab372d31315109fde93c9e7a31a15b2bd9863a263598adf7a14eafce6f94bfdac407dc995c200be5649c34244f2ad08c4e5570c04425ed7f733fbb46 SHA512 0605efb2351884a32add4a5d4946b9c50fa102530f17c8364e4f82841a27277b5a65dfb4a2e37f096b0669682d90beda3d736236a9b1c012f7d743557c9ee0d1
 DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
 DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
 DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
@@ -125,15 +138,18 @@ DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad45
 DIST github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.mod 31 BLAKE2B 012006f0261236f5728b4c28b3f8aa7e4d0bf60599990328b81e9db5f11ed24fd8d82c3b2cf3c72f35bac3f31dd0f41dd4768b27d379a67346d968b32e814c75 SHA512 68c463f83b740db632f4e26bee20bfa047d1c4b3ca49dabc2dbd0d684f82bab86fc7368eed0abcaf970d1d46f86b22fe063c97dc563bc12e96656df79fdeaf17
 DIST github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.zip 11036 BLAKE2B 487c1802d67d59c2a0d1317dab3ad1e0392e29262565214e5417879fcdb4d580299a278a6ec3f724f7e1829c8ffe90927542d64dfe2a2bb3e0261656e3b9970d SHA512 ff710087a168f3aac93026e6ad1b2f86853f55ec3a2c38ce2444283ac1e335d58329dc7ee3d0df5911138e564a3593133a5a0aac8bffec6b36b52b828b2692a3
 DIST github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod 41 BLAKE2B 3f9f665454c79b0807b44cf10f69fb0e5c31364865412f19d8b146fc9a0b12d7e5a6282812c7ac70940470a3ed3f2cd9c2e6bca7eb51e43a4b14ad5e723d76f3 SHA512 f9f36e700dbfd7c997b79e527ec2a4d91e5ccf2f4bc7ad6a9298a9cbebe05263bcf8776bd2f3dd258f292790928a20cf45184e7af00140b2940af322897a59fc
+DIST github.com%2F360!ent!sec!group-!skylar%2Fexcelize%2F@v%2Fv1.4.1.mod 287 BLAKE2B 990863d0a1591dafd0cd747cb42d7bf9a2e1548da345ea2436e1d18d85536476e30adfa783edfe5272d0f9785f146f89e6f4a0f8b620e7ddee9ad707af0e5385 SHA512 a39e93feda6a05e49b9baa350a3910e412b951d8e955ebb7a049e8e1b9f4200adb860ff94aad5e7b4a37ba4fe72ce0361c5c2eb6e8497331eea3373810ef15d3
 DIST github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod 39 BLAKE2B fb2e961ec1914554769b3294f08059e7d8d934938062fed87c404166ce6128f35bd8ab14243fe5e5923e20bf17e0d97937c94f699bf6b5a7839d23bd1d3da7d5 SHA512 2687e2246613ee595f475b33c7bb216a7d8776e415196e4a271e4725a2331e661f2d3128d23f0102f5dbcf2b76f5780e02d673b6336db186932bcfcad35380cc
 DIST github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod 32 BLAKE2B b8647c299d1f9a1c4f8ade152cfcb58f73d4bba4b6803f7fed7e0584607c6da369f9f622e70c1a415af2f5f53cdd1c8de7f29a7843b3ce505821ff1ffacaaec7 SHA512 031c2c2f683d57f81b504c68d24aa328a8f03af7d3ab9021b0acffd541d9a295a80cc7b1c9051d19ba30caad619d3e454ec5b804f14e24e9e39b008ec27dfaf5
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod 79 BLAKE2B 51cb1c2c33300626f74f843ce56c333b194b9a46230d3befe94343fe9daa62314a59b74a6d78c97415f839997fb42700c762fe02ef76240924ba52d18f723ad6 SHA512 df2dd357e057bb1fc65ef4869f64149f6446257406886e89a39f7dbc7e6c9da25a8c17567b14c8d3adefaf21fba98e0f2663924c7d32a4f82d30377ab4032162
 DIST github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod 41 BLAKE2B bf54fa1827896179238ee6b907fa2222300f47daa86e06332ebd77710873d776ee3195eb506fe2aa5eda4c5b66e6a4121d362c99801ec59b8daf804944279657 SHA512 0c4cd8838cfda0eb234cb8eebc06b0c60bc6696add9d7ec918dfb05bbfafd0230dea107790ca5213a33baeb36d1bc48e4f837bb4000a5447211fbf380a6b83f4
-DIST github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.zip 4750 BLAKE2B 95e56601fc93e3dc060a18867201463dbff51287329f2c2af41bedefdabb171910b805702976d7d52734a1e714ff75102088c73dc3e457b494ef607b611c85d2 SHA512 bed43049bb94d64024019caafa2d2a93a17d73ec812acf148c289cc7a6476f8de08f50e8e244dd060f82b8e2811326ef385e2bd8f10693bb50b81534f7387a3a
 DIST github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod 33 BLAKE2B 5aced043cac582e67e8d3ddfef0a54dae0f7e4792dba23d7c6cb18fe687be98649a90e9aa46f591385003f945a2ffc192aca18bf1ef0516ac22fe1526d2e3b85 SHA512 8960a9c2dcaa7ab5225d3d10fbba4264032ff9bba80fd8efe2ecda6f9b925dab4db320a4650fba43c0d9c61d31005c6045eec4a650411bb549c60792f31c3b09
+DIST github.com%2Fandybalholm%2Fcascadia%2F@v%2Fv1.0.0.mod 104 BLAKE2B 4c31df7c74fd283936098d04af236f06cdf09c1049006e2b863c213c20c367810e3a1673591fe622924de7aa96aca4ec6209f2c85eec081c110c9b6baa344373 SHA512 c074ecf5b1d5c9d30a61c44b089b1fe635b70373d7eb1e81a1a2aaad6d31f6439f59207900a5f1256c4ac24999253658e8dbbda9daa448b666cff0eb1049b56c
+DIST github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.0.mod 44 BLAKE2B 9ee187c88e6e4eba0b58dc16701725ff50dfc3af729ff9b58c3dcd200854af59d50689ffc51caafbe6af5685d5796331fc69dcb4a1813f6124c4e6f1a0bb5725 SHA512 e594fe55205c9dd96af55f58d011e5ef916c66eb057f7c0cb73fda0388133b6b476bce423969f85c1b95eb87ed9ed48bce7570fdbd131e0ad5e7ac6010514c58
 DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
 DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip 3902 BLAKE2B 8662340cd5095c6ccf535a54e79af09fe46640ba0b119b44a29052ad012519d9b5886bd4ea81f4946d0c4573f63538b450ee864a48d8c04e1c9e7358c2588e8a SHA512 c73ff22440aa8f5825b7e6820c270582d5512cc096e69b6ee034ed67ec3eb87b3266b82eacf37b985e872a693256be6f377814d3cc604180ea939b42971ebe80
 DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
@@ -143,26 +159,28 @@ DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3
 DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
 DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.zip 59688 BLAKE2B 30de541318005736d121fe47b75f2d7941c94069d123e3818bc70fa41628492ac60f91c9579555e35b7a365b02f50cd1ac8c426e74ed9e5cae76d8c3d963cdde SHA512 6e3b4851e20ea19500af601ca473c16e13a52845e53047bc04b7af788a7033d3e7eef794f978322992ea0772050ea314d89c82d406d45b8887b3e8144f40d93d
 DIST github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.mod 42 BLAKE2B 3af8e0fc1a9b49cec5f336ee11de0c44d9009f7eb4162e015bc6397296f9423198bf98e7dfe1adf5a4fc177d2f5905360ac5bd4693c1e89ef2e0c05480ea8a0f SHA512 8b201304753023e173caa52520f77ab33d02e024f277c32d7ff8c85d396af368b7fa013e58ecbfa6922434aa8ad5535d31735d2e4cbb097249b2aa937159264a
-DIST github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv0.0.0-20170425171159-5493cabe49f7.zip 12582 BLAKE2B ce6e3118ef6217c5b974b3408efd8ab4f3f878863ec5e58865aa1ddf05ed49e619be6b197dfbfc13371f8db25414f6ba72496eab130c338904ac9312edaac7e8 SHA512 ba8888fe8c2f5a3c37f5c41d510f85e3553349150575d589d1708a7349b623d9785bfd5d42682fe5c8a92ba9e8f5b36214e594613d72ae9bacfe31b964f6bfdc
+DIST github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv1.0.1.mod 357 BLAKE2B ff7af0eafbaf8ee0cfd6d228184542f32cd3ad53b72f67171b449d273a494da858d0ed28c6e30f8ad74d40868bcc19bfe91c11f9d53274afdae54025006dbf53 SHA512 af5f7fbc29c56df42debf8f4e03c0afab6d0a6003d38ab309425726087d12179b4cae1b4b3b2f00885fd847556a7579d9f0b65ae99fe947a5f43bbc0bb1974c9
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.12.54.mod 33 BLAKE2B 6d4b4fe348c4fc9c7572c5b5b701116eb294cb4879799b76e31b538cd27822723e789e9db75468cb93c150c7d427b4db38d33899fc42a0d930413785524fe8cf SHA512 3f13e3b470e58f31e1a5b158363e141fa75bb44f639d268aca11cc82ebe41a12e840f978c14966dab8642652e2a1f564df3ff532dbfdd06fc27b1defbb002fca
-DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.12.54.zip 9282474 BLAKE2B 5be87c31eae234c75fae672b71ab942ce96eb478c436432de5de4afe06c48510d304ad5275211a89204f79f80bba209774603ea0244bccc71462903912ea0571 SHA512 f1e7dbaa3885695194c559f4197eff76838e65942494d6e30edeaa1779e7c64c58d4fd5a429fa292ccb0d9a9e14bb24924b4506f70d412d9663216f6a6abcc06
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod 145 BLAKE2B f28dde209c4d43940897c3dc758b088b19b38db865cba75b246477b497c1303301de7cfbfbea2a7eb1b124021967e4ead6dcfa8475ad240a7381bc7ec256b565 SHA512 00cbada20d24a2d08b1f06e0da060140820972c9718e707f0cce56ad62f1ab7344a969cefece18bee79f6b92dfc390e496d6a4af7c95eea0b66d27cc0f59f3f8
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.28.2.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.28.2.zip 15512987 BLAKE2B 641c3f7e57e1b367a5ba64edabdc8c85dd9453bb319e59ec46d7b3492f10bb4b4033c48d023118b6050f60004656d93fd61dc2fc0d24bc78fda18eb23ef8e882 SHA512 e097293c5aee9089625e5d965ca6ef119d87a574333f9bc394359cf13afe2d1a3bf95785fd953189696d25081bdaaf9f2c6fd648f3dd591060082b28e9a07e7f
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.24.mod 178 BLAKE2B 95450a9bd94c3ce6dbbcdd4b49276f41ba740e24052ca39fedc20528936a7f9663f5ca236806ef9301bec3377087abed1950188d8e1c57476c2aa84e8ecd37aa SHA512 bb8285955b0a6f9f0dc24b3096ec889a9c7d7684344a894fd7f389e1ab31cc048bd5dbbe5fe71db03feb6e2bb3e46bba5005fce6221237cb17757ef41a807dc1
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.24.zip 18098087 BLAKE2B 42a6d2c90e9c0a77293f965dce32b2c7ad2d6f7df6d8d07920c49b59c92e94f0107ebd4b2c2add572efff449681f6d376cf60d1ffc5f500cf0ab878d53dcbc2c SHA512 3b8af1121bb744d70a5635f30c867cdf52ecf124e7296a258e2aef990644699b849bcfc35ce8f8e5b8750846a2b7a9390664b056d88f4152bf9003e6d0beacc1
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.49.mod 178 BLAKE2B 1aa7ac654a0577f654dd63b5950fe13b02c6b0cce274f43cef0c850b44e507fe37a78286cb3326a5eb1c6ce15e969381dee14ff2a474f7a183cc40e56d81efa3 SHA512 376db876c55dce630bbe0b3bc3898bbcca0169965e8d12a76a1018da34301e1654159957142b4e6f103c0d9e1713e9e158fcf598e5c87131a3904e4452f12a7b
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.49.zip 20982483 BLAKE2B 4778d0282b08a0e799c08c59bbdb92e30a07fe85cdc3d7006412ab89e262431b79a7992ffa0525acbccd7d1d86e3fb3568325078d3f1926373fd772c5635f37f SHA512 dead2e9ca09187e28c9787721d836e8a1853c15343494c3bbfe18b7ce593dfa9f7b9e19323ab08182760a831676f0731871c8f39473be60105b1ecec3d8405b8
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.6.10.mod 33 BLAKE2B 6d4b4fe348c4fc9c7572c5b5b701116eb294cb4879799b76e31b538cd27822723e789e9db75468cb93c150c7d427b4db38d33899fc42a0d930413785524fe8cf SHA512 3f13e3b470e58f31e1a5b158363e141fa75bb44f639d268aca11cc82ebe41a12e840f978c14966dab8642652e2a1f564df3ff532dbfdd06fc27b1defbb002fca
+DIST github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.mod 45 BLAKE2B 57350526cf25f10ae2018fd72f9944dae239a72c2a44db02f0a7414d802cd03b48e58d3c63fea3cf02cffc26e6c7b334190b2f7a76b7e24ec50aaecdeba1a442 SHA512 d17d2e4a7184b75fde3ef47d7158c9913611ae55dc2e67ad2d0db87afaaf894d0eaf5f0f5b027e2d888c592735dec2d381c83c7992576eb164492e98b24b5f1d
+DIST github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.zip 7220 BLAKE2B 0a7e9be6781be8c5c8726ac7acdce2d55c4b6690c151954442577b7a10005329261b1bac7d0ec9e0b15dd712762ad81c9614d90e03f7d32541eb99de904c8e2d SHA512 acb1039ee94aedeaab9cb25b218a2b7953ba22352198260630a168b1341f1d04dff827142a968b039cc03295055d2528fda134c696573ec1bee02648915ab22c
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
-DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 15013 BLAKE2B daecbcbb12a60a1423c4f419db44a0d63108fe622cf843593abb16fd75dcea703b3cf56f1c13433959eccbfb2a9bd5640f837f4be3296220366438dd7ed04f86 SHA512 44ccb3d6134742a80ac15830613c169d1b0d43e6ce40c2f2fdea07203bec134e1ba80dc57c6d14a007014ea141dca311b3ebe61b12d2181311665a9ffe83ca39
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
-DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip 14678 BLAKE2B 3f95d78aa356a314f8da501f8085a880201766e184abb6c222c45e09c0c3b5e1e1eb7b89cc8ed46b77b09be8860fdf3e28525d9a451964ad64a96c6ee848a41d SHA512 be60a4c8059a9cb07ceb12e079b1224b6f871ecb1d7953906ab303cfe86d00cb979e203299f00fe828b2f6d2a3f5d55814c50809e9b872ab6d96db73f3771498
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf
 DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
-DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip 9262 BLAKE2B 50feca006319c5a8d957976be1c02a0a6a7247441fa0e903b1a03de85859f2afd0c93cf8599f60974686f47bdb7f0c94e58c6ec01ffa3fc33cf5d04da3bfd08d SHA512 0e52838ad73009c795d6a43d7d52d082b0ec134e0f07015fa51caab7d1dd141b19df7807a7ab146312848567f8635966c6ce7ac22b934a630e0131383caef9cf
 DIST github.com%2Fbifurcation%2Fmint%2F@v%2Fv0.0.0-20180715133206-93c51c6ce115.mod 35 BLAKE2B dba40238a1cc8d006decf8f91a2da0da2de08aad54514d99caa9fe3adcc9d30b648b5e2ad06346af4e921afa3035fa17e9598c3f26fc386cbf5826c64acf4b07 SHA512 70e77c59aa79899f548ec55f25c0d55b5c8644dc3bbb6b012572ed6e3da4037146469c6c1e5ef777860cb2fb9bf0ceaa4bc8390e44bad14b588d6936c2305a2c
 DIST github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod 38 BLAKE2B f6ad4f22436471512ed4037c3f4c8dec4e0f7cb9191ddda23a2f5a5135785a6c5af99dd9005218bf196e0f48db755d040c894f6c5f2c1c338580597eca5eecd8 SHA512 05b70033a965ce6a70ea5fe7c635768c2c665942e04b17e47fba03b70cd977a8cbc292faacc3e10bd785523a43c61d42811c20513669592f308830863cfab56d
+DIST github.com%2Fbits-and-blooms%2Fbitset%2F@v%2Fv1.2.0.mod 50 BLAKE2B 4079755fe411598597b92696843fe84c0e2d7237e3c97b7fc74fbb12801f12c1f0c6202a6dbe69a30ae0c533bdd8946f89e8135771f92e98996033ac36a94d72 SHA512 5302c9bdc76781f7395c82a9c9498fd082069d0e26cd03dbe6c0a260a1c6aca19f5f54579fa5c156c19a7ff1e2bb724a81b339b2a4e40c2917b97b332378283b
+DIST github.com%2Fbits-and-blooms%2Fbitset%2F@v%2Fv1.2.0.zip 25750 BLAKE2B 3caa8f889cae05483330730d033df92d3125817ce224ab84e0e611a354842e751697a7a5848617939b159858730c20248f9d18d7c0254e43ef40afae22db493f SHA512 bff4203c835b18907cf115d368303777c822695018e94dec2cac597a18250ad86078c98f0380ad3943e14a8df2a0f774661128849d69ac765bab463f494a4a9d
 DIST github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod 568 BLAKE2B a2769032d81e02d8f4945648d36e862a996841d0e138077fd190b47b700fa08cd4e8e8d300925fcae5ebe48ea972afed0dcde81870f3673a3227ba90beb5e341 SHA512 262ec838f5c4b97bc186533c20456e62633038ae74747c7b884788bd06ce01863a59237557877d35f37338ebc018d2c1c8ae963e4a42dd42e0823a5b3ec81bb3
 DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
 DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
@@ -171,31 +189,30 @@ DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod 31 BLAKE2B 15785
 DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip 19948 BLAKE2B 3f604e82647eb2a4a4c309622080fd07701d032a430999f13da727cc01d455cd3d0e31a7079e0bd833fd17d84a228f9e3f588719c4491ba83e50aa442080acf3 SHA512 e1c0c9251b0c7f05bcfad6f73cab4215cbd550d98065ccf8553dc04a56d7f6153ee70a477230a0e7cd8adc3707c8bfba279676902300537eb056fd912d75b51c
 DIST github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod 35 BLAKE2B 253b8f5c57339e04a68fcd945f25b655ae0d9b6a265fc3e02c9ab2a5cd0e41d68f5866e80aad321eda2e3fe0ae8b311ec0c4eb922d67e0c7f425ebff5d6dba69 SHA512 c19ab1ccc5297aae6bc7e3536b97091f3f877b1b76e5d93b89842e48ae3c9d4cf49a471ecf72ce6e2da001bd51ef3eb126a83bf5a35e50acc30a43db4d37c301
 DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod 30 BLAKE2B bf7d457fdd333781e403b93aac891f5a0a8e202c62983ec6e34ab559ea5624c3e6cc525416fe400c7a0af20a3f647b49eac5717aa749d9ff79b02fe994c36d42 SHA512 7a1ef7d0fc6d5a3a8530b44dd5aa23d4248d952fd573b9f0f6f630b1bc38fa5c9c65ecc4894734c7115a8a0c7c71e8d0e2da0773ed4c5779c23f7f294e1e7d5f
-DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip 99852 BLAKE2B 9151e6475685ff3b550d1ae1291778a01793f691a3ddb007d64fa49f02ee85927c834ad709dee5fcba0f071630cd62504a65fd4344d4ea5b9fb713787bf6b725 SHA512 837cbbdb0a91efd765e697e01bc64f0206897d6363b303c96ba53062d674623b19d8c86d96a867529f1dfd6689240e18ae7c25dee268542d46e2877dcbf83848
 DIST github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20171013065002-4d72634a2f11.mod 46 BLAKE2B 2d5916fda5dee40886c00a030b52823f311f8f2f99f47a1e00a84c52d2aa01495f21f333aefa8cb9be5fb9480d46685394ec65638e8150189850e9dfcfdc3395 SHA512 2dde18f71c025556e3e4d03a0980ed046d47702240c1600ef1f00cbdff5de05d424f525ddcec4cb678af5c11ba49652094d3b20ef0e93f16dc5ab528d4789769
-DIST github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20171013065002-4d72634a2f11.zip 19319 BLAKE2B 8127b49a45efaceb35746bc12bdb938f3245621c143acf8aa44d86a41411b3eba9c7c7af8d1f0c900a57a30edc3597e2b26b769fa473bace78ca9351b18b8b8e SHA512 12761d255f4434ca7e5f6de6792cab6ed3039ae51283aae6afdf784a44ea3763845b255e667fe5857680d318eeb30e886de8826127a7ff1efa2196ae3c211b5f
 DIST github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20190828090544-27d02f80ba40.mod 192 BLAKE2B 4b6562d2f8c3292a0b2b42ce7313a67991681272c582043e58235e2ba330102daa344e4bc0569f1d0efda53189ee22cd7748c2cfee5d351bec7d378c77ed04bb SHA512 908417f3196f7d2f281ff307aff9336b2b1ee1a4a566c3e5cc83d9eda84dfafe0864f0681b739bc84913a9e54f533c07edeaf0383429d41009a5305700403809
 DIST github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20190828090544-27d02f80ba40.zip 25090 BLAKE2B 6fa7c323d1118610c743978780054febc823aadf6a9daf09d96066a3f80d2c0161cf4cd2d37e1517b8a00cc75316ad863a7957636a00074672bedd8168e379a5 SHA512 bd8f8cb4206f913702bf9da5d15ad962d90ad6e2b7c3a469d9e7c5f1ba0eee90b11bf6a11bcbe43dd72df3c515d0d12184ab17dcba63e484e8d916320356b48c
+DIST github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20201105010758-936f38b697fd.mod 192 BLAKE2B 4b6562d2f8c3292a0b2b42ce7313a67991681272c582043e58235e2ba330102daa344e4bc0569f1d0efda53189ee22cd7748c2cfee5d351bec7d378c77ed04bb SHA512 908417f3196f7d2f281ff307aff9336b2b1ee1a4a566c3e5cc83d9eda84dfafe0864f0681b739bc84913a9e54f533c07edeaf0383429d41009a5305700403809
+DIST github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20201105010758-936f38b697fd.zip 25719 BLAKE2B 95bea29d0e27933cc25fd0b4e06b2518fada5f1a5fed0f27e86c7bffa7b8e8840f2c5521350a67d8ffaa7f3d534a3803ea3f7476c87c8eb4d62c35dbbe0f92d3 SHA512 0f65ec8d23262d927487a04cd5af82b1df4a124ba39e3ba3901752e9c8291f147fed4f5739b1114b8cb7c427776b7e0c8277886a421b7b8dea4d68c4016131c6
 DIST github.com%2Fbshuster-repo%2Flogrus-logstash-hook%2F@v%2Fv0.4.1.mod 53 BLAKE2B 099610d4ac9528646136a6214a5816a721da42afd273e8e2e7ce40bb4afde2ee7ee3de02e0c04a92808ebedba623d47715e61e8deac2bef77aa9eddce5bc1036 SHA512 fe08dc8aa742ec64dde4481a917d19c5a64d68ab7a373ad0e8a3064978f8c76c5429d9a18a4a52d0b49b035ca9a4b5f96a24fc86df475a1fd725f7cbc0da814b
 DIST github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.mod 35 BLAKE2B 87fd74b3a198f0c8a9897797611b73c9017378af758bc559464b3e91a6f57ecc39752ad6ea9d73ec0df128a794a3caa6384cf1092808275fe6a55731b6f0bf8b SHA512 082d6dfd13dc8bbe32bb5fc0c8c7e0e2d8fe412397df32f87639179374e57eed96f7eea00a3cda8c0c9a78b354f9275c0be3fcea4b6c797aa627dec71870a41a
-DIST github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.zip 57136 BLAKE2B fbc3ed918bf2af5a06ee89077e59e6cd8d3ab3d654cb1cba62ed78471be44034cea9677522bc53f907f04d1df431cac72be3c2da7a9f5019eae6a9e33ca8b6e5 SHA512 94d052acf747043266c6da44353a6162829703e77809446ced434dda1eab7cb4828ee288180fac7559d4e94d807aefdb941a7eeb93f677d44d7c61b41be9e6a2
 DIST github.com%2Fbugsnag%2Fbugsnag-go%2F@v%2Fv0.0.0-20141110184014-b1d153021fcd.mod 37 BLAKE2B 9dbf4e5a299c30b356177f7b76d96328e3f35affc49bbac79607fce63bcc72476a8220f773d3c5ae9a6aa0d5fa567b10e6392c68036aef5218253d409dfbc244 SHA512 ebe7fe07551e5a485d47502d69cf84978be13de26484f7541945be2113698bf11ee375a19718cc01af81074ada64803ce8ab78a5bc08fc389eae78fd9455572e
 DIST github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod 32 BLAKE2B 879ed9071c4044f638be3ff367074c7b456ebdd04a6b298b81240662e105635e778f6668870ea711daa2be5bf45086511170df20a43f811d41cb5b1ea439169e SHA512 6eac336db439692e7c478978d290ef8ac9128a31d4535744b0b55331dce7cef6284058b5acb164a6b749a60449cdabeb131142dc5ee3d0222d443c4f292f9683
 DIST github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod 36 BLAKE2B 8937677f3b8473d8d71c79e9d3e420bae0476de69d366765ba5f9a4c42d14a8cd18a49f4ad2911673c80276bdd47dbf019a62fc0aaadbffa72647cac046c362d SHA512 b23603768dd8994a9b735ae81f119d2ac2e33a1b54e6328044f92ebf03f905210e54692752076413dc45217b0a400870a5da8ebd75856bf6b74272d0a301484e
 DIST github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.mod 963 BLAKE2B d871aba59e67ac0338b643dcb051a0e0667941b9e4d4354b4d6c0f7167eb7eb57b4340af5cefff5c10a7f3ebd33e483b0fec605107e09ac796be788dfe0b1588 SHA512 963e57476aa2dde7ead77ddc5c325916a89248f361a74e8b66731c5eb6f6d8ba114f95e9d95fd0c089513b3f19482169da61e28d7e6e092c3584d2215667e687
-DIST github.com%2Fcaddyserver%2Fcaddy%2F@v%2Fv1.0.3.zip 560005 BLAKE2B 16575d4bc41aadb9ecb927ee25364b1aad15fe7ebfb04a967f3819a81a96289037ad03467b7c71f5f35fd05ab82f28642ec0a170a92488b43d059e5d83ddb6dc SHA512 97ba0accdd02d24085e9db9eb3bb3d8b7e9455941662581329c5f848f6f15b3622eafc73345da9d52fd3997ef8ec183a22c4ba6d1e7ae421a36ef820e0de85f7
 DIST github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.mod 38 BLAKE2B dbe481b34fd87a0fad26e8def3534b32a74517e24cccc8d34cca8ab20aecc0ec84dec89fd9b6b6ad52f943e67c9f7e6c14cee9fc82e0f06afddfc8bc22bee7e8 SHA512 14046fd2463d35400cb9dbfe85a7e0a6f4f11ce401e1297c6a930868149f739bfcd7325996f91718295b1b1fec2414f6986b35aef1d6ab598da50dde5fc69300
 DIST github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.zip 77283 BLAKE2B 8c7c79af3e337ecf72a82afad4e6780c8d777ef9bf04a74af5add8863685641b720d6d8c93af954d360d52b812171cb889aa1d7d9ebf8a450abbe02cc60b8e5d SHA512 7c3d04cd97adb30fa8cfd03d2d10977f69121eae9553023e1ed9269aebed49613edd241a29ec67a06fa106f35332ee70aa69c5483bf20ca58e9f13152ddaf0b1
 DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.1.1+incompatible.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20191021191039-0944d244cd40.mod 45 BLAKE2B c21093aebb1ef513bf84d13f3cc94ca5ed3dedfcb396d07a0e146031984a72d1ff488473cc8868303906fb397842b105bd81c8f725120eb80c17d59762ddeba3 SHA512 c1ab1e40d352c16aff7a2b91123ecab7500817522ca8cad2e5ed3c45d6dde6e63cf153f124ad3317c0ff4f6b74491d952e01fc3b329d0827b472878a6f001c10
+DIST github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20200922220541-2c3bb06c6054.mod 45 BLAKE2B c21093aebb1ef513bf84d13f3cc94ca5ed3dedfcb396d07a0e146031984a72d1ff488473cc8868303906fb397842b105bd81c8f725120eb80c17d59762ddeba3 SHA512 c1ab1e40d352c16aff7a2b91123ecab7500817522ca8cad2e5ed3c45d6dde6e63cf153f124ad3317c0ff4f6b74491d952e01fc3b329d0827b472878a6f001c10
+DIST github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20200922220541-2c3bb06c6054.zip 160134 BLAKE2B dddc0f17e3319db4c6e1a1d3499796d53a5f07bb78fd16670ebea4cc107a241393d02605603466508c081b63a4df4156e337d59ef4697c889d580bcdba7b69f6 SHA512 242da15e7bf049254e74a18974dce49cb2eae9f2e7abfbaf3a55ded4816906efca1959597bdf0775427a1407b8cae0651ba5fad77919977d27853d589e1d6fe0
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
 DIST github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod 38 BLAKE2B d8a847320562a5d1158e868d3ade028d83059898bad409051f8a342843ec21d8df4305b50b35b7ba7fddad63b53f38c5689f4f7053cfa510a2b222a043880748 SHA512 b3a401f05d85f8d687fa8387b475211ec627c7d2c80f5fe1b5a4d97a41df7707d0cc0dab634bcab246f43058f204f10b45ee4cea5f61d8e7cb88c4ba8f085dd4
 DIST github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.zip 869905 BLAKE2B cd45fcd9a35be062a91d10adbeee7d2a955427c7ea68a436cadc3681824e4867d59131d622c153b4d8bd25607bf2d01b2b6f186068716075e0f5737fe1583e61 SHA512 4aba7c43896ec1029343ec89366d8d2556c59eaf94eb08a9d9c0766ec1c539ca5491bbe44e71dba0fdb6a34261f052ccb440af775ffc0dba6b1f08c01790bf7c
-DIST github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.0.2.mod 100 BLAKE2B e85f41fdbe685d35c78d22042afb1addb6e7b05a82f3818199928f68b95c3e188e80fc6f3f630c994f3e2b6a1724df5f8b4d407440e34adcc4b2c2c8cb55c53d SHA512 3b92bfd3d83eeec84259d527fc8fbb1854649b8fad658082e1f35044ac097b96f37ab6acbbd83fbe8915f4189bb2249364172d79b75b8d684a88e2c8744be0f3
-DIST github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.0.2.zip 33324 BLAKE2B 2c0f967022c182a8fc83f8b115ccc59168c72e8f0e89ddf604f383cfdd3ac14232f3aaecc61dac87f49d128abb769c66d9789c2006f134c105e55b93384edd11 SHA512 9d2e7369b50517ba05621aeb25931866bc170cb1d645d1d5e00dcb7ecfc6c98d2680c6b6c24a288bf593b03339de0a66094e90c4121ad63e5b3143153135dee5
 DIST github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.mod 100 BLAKE2B e85f41fdbe685d35c78d22042afb1addb6e7b05a82f3818199928f68b95c3e188e80fc6f3f630c994f3e2b6a1724df5f8b4d407440e34adcc4b2c2c8cb55c53d SHA512 3b92bfd3d83eeec84259d527fc8fbb1854649b8fad658082e1f35044ac097b96f37ab6acbbd83fbe8915f4189bb2249364172d79b75b8d684a88e2c8744be0f3
 DIST github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv4%2F@v%2Fv4.1.0.zip 36532 BLAKE2B af1e04575a71d991b96d885f4761c8f1100f8dfd171e62272cebb2b5e3376039599565267e316af075fad5acc5d1da53056f1bef2f7a6e6c5667dc2095b6824c SHA512 e51c55f848262a00502220fbd0ea123f682a1357ea73bcf4a8d4cda3b3d052b336d3ed657b062ef4f17bd8e7022b9f268451cccedda610bfc655d70ce5076abc
 DIST github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.mod 194 BLAKE2B f83b4b8137ffece2fb4b6adc36ec7e3f64bcd112a63fdb8f32f9d486c28ab01e5e05b903e9888b9dd95bdd00496daafa178d78757d7c8bb3e08f40989854d2af SHA512 2d1cfdabd0a874430b31c1885a332f7f383ea0bf9643ccc34e9ff46444ca5a6a126848ed459e4d62eafd4eea05413c0e7bb15abf65a79ca38ef80e719015f296
@@ -205,137 +222,163 @@ DIST github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.mod 212 BLAKE2B 96a3430ed3030a25f
 DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
 DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
 DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
-DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200110133405-4032b1d8aae3.mod 135 BLAKE2B 1b785fb4e0af530378f15100e4523543e22b2f5f7f350eb46cb16290c1e2f55b18a9f8894024a472c7e9d45deacb1e7a3828a54368ce1ef83095916e2262c194 SHA512 242e8e3859ac02adf7d059da6d2fd5f774892e8a11b69d8e22bd2de43c534f7d4a472e9b3bde5e5bac106211f41546614cefd078ac23115557e26c3d8457d7d0
-DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200507155900-a9f01edf17e3.mod 162 BLAKE2B 32a3d35037635cd9addb4cef5c73cb75d38b129aa103daa82fa04308496fd9f315c1d674988d1b009c515f24f6ce19807746dd0b90c99d3c749883561eba04f1 SHA512 228f31845416e4a30ad47c0a7a0e71f19040b70c9337aedc80e94bfc97ae4fcee98042927c99b8029051ecd4d418c512de63326cfbc47f97adec1feb3599aaa6
 DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200601085316-9f1617e5c574.mod 162 BLAKE2B 32a3d35037635cd9addb4cef5c73cb75d38b129aa103daa82fa04308496fd9f315c1d674988d1b009c515f24f6ce19807746dd0b90c99d3c749883561eba04f1 SHA512 228f31845416e4a30ad47c0a7a0e71f19040b70c9337aedc80e94bfc97ae4fcee98042927c99b8029051ecd4d418c512de63326cfbc47f97adec1feb3599aaa6
 DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.mod 100 BLAKE2B a7a92e487b14e5f8e8bddffe2cba32e8876b9dfdafb1786b62b2cb1cb93ed646aa98a5093d7e488c00fccf9beb98c078e22d8dca5362618cdb5f4c3515113087 SHA512 ff846fd599947276853b6388db9d0af7ee90dacb6b7dacfe99d8540cb857ee4a530d9beb894f830c52b687f76e69a02347333f635d37498c8fb5ded3b06bc562
-DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.0.0-20200702112145-1c8d4c9ef775.zip 984532 BLAKE2B e665ab2a5bc6f2eb1571fbf52a61f30c6bedad1afdfd169b4acbfffa0d5b5ddd4a1a293caeb5080731906b047dd3620e61889d2a661fd9755986aa00f1825705 SHA512 5594559e4c79d8af7d84ff8f22d9ca6d5aecc4a9ef5d12c9b73536f442ede7148b1ae00ce4f63630a562c3c882879978f551eadfc47859bd9c5a332a26736b58
 DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod 138 BLAKE2B a94aeebc267e5d2869c162c5f672be9d76d68dab9968373a51c2da4ea9367f6049ad3ac9fbfae36192a4fed13d176c92675017d1d9ac67d267a0697987cedefb SHA512 ef0515f57df8f50eff19dda46cc3d167bb700d90c7e1080b3f0e7bc07657ed41169d77ec8a4de208b0115c07df42a7ce1cac9bc245ef5cd2688aedc259ba09d3
-DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.zip 1011277 BLAKE2B 117a3c94aa74aa55601142d6ab1bd9f79c2fd31eb2f268f6b293ee036a2de5c59cfe83e845a49d6e041ba8e754e50e99f78f7a7779a86688fd12844cdefb343f SHA512 340ea2c12bc1213af8e06117655932a21a1850b6929dda1e54d474cf483e97bb0ad4179c347b7ae5c71d2f1ba27d635b1af5ddb7e30dda58b02076dd25df99eb
+DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.4.0.mod 177 BLAKE2B 0b2b115bd8498c8e4fe3c848cc9b8f1379165c4b1ee7abdb94733e3964ae15450bb6df4d8b959a03679d285cefac8862e0b57a9230f7d6137293c35d72366c54 SHA512 6e8fc3bc808aa947132c3fff22b4aa817fe2fae56fcdb5fb07445816fe45dd84db964dda36a795e9641dd2ce2a4df5487454884e42b0106603dfd7558e5928e9
+DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.4.0.zip 1387006 BLAKE2B d9df16a6640a7465eb5639a090cdc8085fb80b6f29f6a61e1a67ee2ed5ced9aa86455d84f12320b1b4592bf3d19672399a56907879a64604861688d4fc3604a4 SHA512 36c371abbb876304bbc62e5c4f238333c3d501e030b0d842c3a5452fc73c84b1ff4959aa2aab97ec17f9ec5e135c84d380eeeb97bc2b69d0535611ccb6772519
 DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.mod 177 BLAKE2B 0b2b115bd8498c8e4fe3c848cc9b8f1379165c4b1ee7abdb94733e3964ae15450bb6df4d8b959a03679d285cefac8862e0b57a9230f7d6137293c35d72366c54 SHA512 6e8fc3bc808aa947132c3fff22b4aa817fe2fae56fcdb5fb07445816fe45dd84db964dda36a795e9641dd2ce2a4df5487454884e42b0106603dfd7558e5928e9
 DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.5.0.zip 1405833 BLAKE2B 5fe8dc1d05b9ebb228424b0d1072e6d833921113625af93a6b5ef5fa795d22a3c33575113f821de64e7f80ea9d058bc67a1235fe725c1f5cee464d5cb403549a SHA512 e44bb8c5fab454b989dfbfa3480bf3b80cfab677dde8b2194193da12b908f97f41c5853492915be85970d0c2b72d9158b693e44620245f0e7c08667cdd4708fb
+DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.mod 177 BLAKE2B 0b2b115bd8498c8e4fe3c848cc9b8f1379165c4b1ee7abdb94733e3964ae15450bb6df4d8b959a03679d285cefac8862e0b57a9230f7d6137293c35d72366c54 SHA512 6e8fc3bc808aa947132c3fff22b4aa817fe2fae56fcdb5fb07445816fe45dd84db964dda36a795e9641dd2ce2a4df5487454884e42b0106603dfd7558e5928e9
+DIST github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.zip 1437780 BLAKE2B 3d95c9b416c708e291f63c19f80a0fbf1f1b6b99d1daca5d495af9450ce4788982f7a1d1dafd6e441e61ab5669ef6dc938123d542ff76bdd527052305209394e SHA512 3c3bc0ea9702a6b61675ba257dc83d6388b72dffdd0ca9bef7e485304986775b8e40a5241d1ff3242f1f76ff91202751fd6adb449a0854cd07e5f9fc157b2b51
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
 DIST github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.mod 39 BLAKE2B a88f3c0086242036da29be76cd8fca01d0f80c1373227435b19c7d7bcd96bfb8fd8ddab055052bb7bf5afe9c11630df81f34d3942ec90af9ecfe688859ef6e7a SHA512 1b0195dde4d131a1b1dc9df3b139982edc308759f5531ff93ac2dce8579a4ce4c5e3c614ef6ae5074d1a6d4a936dbadb2376d16cf5fc9a30740ca09786b37041
-DIST github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.zip 12348 BLAKE2B 29ffcf284e1e686a901aff774c2ed3ecdf7eaa8c4f60b729926aa1d2d1fafcbe3381fe4c11c41cf7bfbe61d2c0528d795a26a92abc39b466a789e688b6de7248 SHA512 9ed4c52527b79a18ede50cda239df47cdc6f1329a08c31d0d88c1e15a014abde4d0b30cf6151c44dfd1f5f1562bb8cb6f8b7be29f577cde3b46f5ad6a4fcf08b
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod 170 BLAKE2B c8f3e464fd2cb8f38cf999a300b44307a1e3d40101460176aaac8467ec7d371f08c69ebbcae7ad8086a48a02a0dd7fc4b1cda1bbd7b5199c4b76f1ff0492d7b3 SHA512 4cb0a4f9d5f74f3115a10661469cafa88044a8ed2de959b26054441714080fe8d639485b69df02e0f91fa9040db259fbef8281971c28a67953a5abe5b7220ccf
 DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod 41 BLAKE2B fce07437afe34fbb38dc2b3c8695440413610213aa82b910471dfdd37a5dfabd332513dff18fbef7b84469c0c137530e821e2a5adf0e660a96bb78446a084cc6 SHA512 180a8be6b0f3596aa376ec5f264ee545a082328067b3ffa5523634cc95b106328fbc6330fffcada0a1cf250c3a988971073441184b9194fe0d05fd62a33901fa
 DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.zip 12336 BLAKE2B 9af04c73a7345883b0255c644a2ff626825cd80c98b8254e270c338e796ff594f2c14ca3fe3e6f8fedb54d6ad471a88e4c8d1fcd13bf3830bbe0231c68ab6f32 SHA512 b3b5b92200ee866c9d587be1e3a0dfdcd237ec787fc6cf35321306363bb64a5080291ff6f14be4c387a2f76437559fc85c11da9ccddd0894a0016e637a83950f
+DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20200714090401-bf6692d28da5.mod 473 BLAKE2B a92fb866f551f78d532cdf06f354e02d27f64b0b6cf63529f2b272f94a88cdda0d67d10f20adfbc9cc64035437b78bd6935612889a7fefe3f6ab8736bb9ceb9a SHA512 76b1f03cf391c4a365282cc3caf4e1701c195cd0c0fff1e580333a722403868902dc28355f013cfe0e069a4013e2f54f28b10747e2cc1df00c64b84fffc947fd
+DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20200714090401-bf6692d28da5.zip 23935 BLAKE2B 9ad133155820405e4b31287c275b4ad37fdbe8489de1d9d6745a8d849ad28bb696db84767a4dae74d79d3c85fad79d617270be266c60f255e73563a90213d312 SHA512 3fe25ed0c343c03e97d2230d829d93212603eacf9e2238e7c4a440e17710a854852c2fedb4234b7fe82f2a6921adc2aea28f4d1f0646dbf2102732d8f4ceaeb6
+DIST github.com%2Fcockroachdb%2Ferrors%2F@v%2Fv1.2.4.mod 37 BLAKE2B 1cfd7c10c31fcc2d78708be02ddb7fe18098782df3764f4394b2bbbed579fbd4e7692d2f75e1481a994c35e5f2355549eac6de2319ca1d07ea2bda3939cf5013 SHA512 1b62593fcfd90463192016f145a970fcb4c458b8482e60b10505a53e49f0df7ab3cb9bf5acef1d79cc278a2fd742d08df4cd0969e0b0ac04eda6fe35c5cb5bcf
+DIST github.com%2Fcockroachdb%2Ferrors%2F@v%2Fv1.2.4.zip 186141 BLAKE2B 6d071ceb36c2b67ceb7d79d66998044a3ce4cc262c446eca88b9cb4ff0fc62f3e397409fef1cfe4b7d668b96ec585bc0eed1d015e1fb2e45736e7d7611c19195 SHA512 feabfb2f518a47efd7f201b5f357b1e7bba5565112ff9ec4d5504042a4eab699f312a4779fc2c5bb217ad1cee459b43ddb91fdfa420b6c5bdef44243607bd11c
+DIST github.com%2Fcockroachdb%2Flogtags%2F@v%2Fv0.0.0-20190617123548-eb05cc24525f.mod 38 BLAKE2B 2b11ff7691f470b19935549dd6f4c0f112c2efcabf9d32a1b1e8130685b328f14c54907a51188deb8521cd6179a2d92a2c0f63d9a8dedb63a5bbbaa50f077232 SHA512 38726c73deabf25e639f9887a0f3787e43109d9c788427664d138ced64d883133c68cc75a2373483c3f54abd13daef92e0ca8d243f545058f0c0c59f995a6763
+DIST github.com%2Fcockroachdb%2Flogtags%2F@v%2Fv0.0.0-20190617123548-eb05cc24525f.zip 10900 BLAKE2B ffa7b16838c7d8faa4145da4ff60a8e602988ce9722e69b79bf4ed0deb4180554849256083e0f09afd762572d73d1796b97b91bc5e399e2d1a59aaad6d6a96fb SHA512 6860441048d1edb1abcca59f89d5e6f27c3d4cb3895b5e127d7024267dad809fe4e3107c49df40b0fd96078653dc1ff219c7d0f3a4faf53a61a69100fab4a637
 DIST github.com%2Fcodegangsta%2Fnegroni%2F@v%2Fv1.0.0.mod 38 BLAKE2B 35d66235264dfdb0f8f3bf41a405b2805bd89525d39fdc528264fa3819f9b079cb81c17a4e301eea565da031248c059487f258cf7226a8bc0154fbb6c8462893 SHA512 17213196a3a6a4e675f8bb4acde02713129611fb6632e628fd53b785368969efaf977e7b37909f737d051caa6b8eb895e2cef0a297d7b0f4c83a4864c1a2a9bf
-DIST github.com%2Fcodegangsta%2Fnegroni%2F@v%2Fv1.0.0.zip 59816 BLAKE2B 4c7bb70895085da3d29d66a3939ea93bda17187f556c85c43c4ac37bd9fe5ac2504b6ec494cfd1b63383699c25f96e7a0531355ff830c7d2017e5ef5aa7ccb06 SHA512 beb5c4a2325e1b0412ad528543c96014328b794dd00f86b348af97d5a24cca3ec05d3c8a62385477a748bb49a72d4d902ca3134de9f903391252e3b60c79720e
 DIST github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.mod 51 BLAKE2B 76be9b727f1114099d59d41f0542cf0f29dbfe7c2cf0790e5a39650e2a2fc63afa0784c02bc80451e04cd33714601079597288061a6f0152e36acf3df73a94af SHA512 27a66f64ea205ef5fa5e14f65ba3fe4258dc5ad69e66ffdd0726052c50b38aeda6c2a0e6aa3831308765a91313a1376c2819153f2e652bc6356b1800a7624761
 DIST github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.2.0.zip 176604 BLAKE2B c524edab37c966c0309ad0d60b0bf94b0ce7f106353a1589ec66a96afdef57c5a52cb706105572f5b4c59242ee84e7d7fb734ed33964708563eb5c6d9e000179 SHA512 9ac01213c21efdd9948696a8d184fde709791bfbfdb651feddb1629b8641b5d737838e5516b2a55ad050d789c0982a19182afdf2196423fcfc73cd5bc57352d8
 DIST github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.3.0.mod 51 BLAKE2B 76be9b727f1114099d59d41f0542cf0f29dbfe7c2cf0790e5a39650e2a2fc63afa0784c02bc80451e04cd33714601079597288061a6f0152e36acf3df73a94af SHA512 27a66f64ea205ef5fa5e14f65ba3fe4258dc5ad69e66ffdd0726052c50b38aeda6c2a0e6aa3831308765a91313a1376c2819153f2e652bc6356b1800a7624761
 DIST github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.3.0.zip 181405 BLAKE2B 873211a670f35f552e33a4c211c2a3213fb02be3132d232deac26013117c5f2004507a236936a870e7832d59acdcb10085bbc892d9312b68fbc6a0bec0c2bb62 SHA512 084474ab07bcdde8269c1f52954385a55602c0f3c66a66566df6dcdfb647022da8672a51a05227ca043454ffbfbcdf21dd355d7f74fbe58c4072e2ef9819385c
-DIST github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20191030083217-371312c1e31c.mod 34 BLAKE2B c86b65644df0d902d7145622dfbb0519eb263725903e3f8c0c2286e4fa166525d8e6bedc354092f4ee445131ec6a3b53b23b200a7d3d08109f0669d9725812f1 SHA512 0805700c278af0d8a8906d3810c4df3a7d7fc95b6c401595c288d91846169e65919707b55973d10524e0cda446d2f746549f96e897347b6b4cf20bcbe753788e
-DIST github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20191030083217-371312c1e31c.zip 9768 BLAKE2B 0af4bdb37ce760de336b2d8c42fdc6a07f391c5790ce2544e20fb8f727bfcc03072c026f0c206bbce90420d43fdb359760b2b8e4a1b526ce77c3e8d24e55cad7 SHA512 a118821c680fb28e3b8ecfcc379004c0cd3456e36f330c84fabdcb3dab5733f01f9a3c3f228de0597f3add0bced25eb4c084fbfee4411ae73dbc315a027014d6
+DIST github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.5.0.mod 140 BLAKE2B a87913dab2ae95f77dee37785bc8e231100adf5f54ae6bf3731368e38c8b11115d002d94a9a0d0642956bb0751d4faa3a27328e330b31d0aa179ac7ddbc16b63 SHA512 90e98fb79680dfb295a653b812b8d97f9ac05fdc5c2f3da7e5212daf51416767a04c81c48964d13a9957575ad9e8d970b78d80d3be928f27d37b113087bcb289
+DIST github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.5.0.zip 189096 BLAKE2B 10edfd2943f697feb7af040656e95cdaec825456d3a1c2bd51394498bbf48d4ec107149dd74c163efb726bbc57af86bfd79a852010b5c8c7beda765b247f67a7 SHA512 2ae42488c660cfc6fafbdb41845386251e4fabbc0d5af4d5e38a41a83a9594f0faddf2a4d35369cb45733fd1926990271ce7f73003663d96448c4467e33d6e1c
+DIST github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20200908144142-dab0cbea06f4.mod 967 BLAKE2B e6ca6fbd86a4d7a4477dfc1277c989adf8df3a1797280c707793c2442aa7db91bc77a19d55844a15720eaaf9bc88441d135ef185e6ed083a13f03068cfe8421d SHA512 050128e0bf54a0c09ca9ee2a5ffeebaea26a9d1360f1848e797b2766d931191878bb6080eaa7d501271ad5fefa54be13503da3bbfdcbba7af059d43b64d0fbb9
+DIST github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20201003224125-76a6863f2989.mod 647 BLAKE2B 7f778d01f167f1f7359ae817b361bfa530a0eb0a80f410068504bcc53fb2eb47a2a1f9fc9fbac2b6506139c590126bb062dbb612c93f3ed2413f8207b39d46c6 SHA512 e3c8ccbdb8a0057eabb65421f8ca587f4cf5d9dcc0a33ce1ce7c6f827aec10c9d878c69bec1f01b9977e74f093d238326bc3eaea4cc63b0000bfa965406eb970
+DIST github.com%2Fcontainerd%2Faufs%2F@v%2Fv0.0.0-20210316121734-20793ff83c97.mod 256 BLAKE2B 84d24102b845ad59069a6e1eff870db229dc19d86f5e7c69db0bbea3160b31a2b9d665dee392f1690808a65fc291922017c9fd53faa6f2f1b7ef45107e1eb728 SHA512 64b634e3f82598c9efbe9b0b3d6d2e567595a500f8b19593c75bd2f9855c412ba2a94377e6b7b08925dbec2abc8b224afb314ac49c740318d8cc3001c9ecdb2d
+DIST github.com%2Fcontainerd%2Faufs%2F@v%2Fv1.0.0.mod 256 BLAKE2B 84d24102b845ad59069a6e1eff870db229dc19d86f5e7c69db0bbea3160b31a2b9d665dee392f1690808a65fc291922017c9fd53faa6f2f1b7ef45107e1eb728 SHA512 64b634e3f82598c9efbe9b0b3d6d2e567595a500f8b19593c75bd2f9855c412ba2a94377e6b7b08925dbec2abc8b224afb314ac49c740318d8cc3001c9ecdb2d
+DIST github.com%2Fcontainerd%2Faufs%2F@v%2Fv1.0.0.zip 42845 BLAKE2B dd30ab5362d35e1e210ad25c3de0660ce17f13f2dc1a6c74863e9364b1e0262aafbeb93db4b4739311a2a3702d06782eea961bc921870af3e6c6f05500a8b74e SHA512 51068020abf9b77521aeeabd2cfbce9165f89de6df45155dc6db8266b354f78058273cc5b69586f08d7f13e537828784225f0e76ecdecc60db34d13c27e71e12
 DIST github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.mod 82 BLAKE2B 2da26acb4cecf71f1a3a252e31a59e07eef00720ec425bfd7f881de012554cbe341b84bd4ba731ac78b4f59a9f004d4c307ecd2ec6a0017ac1e211bd5724c3a0 SHA512 92f3a066d865b1e40c20ee1d175a54310f87c3c09be832fa7741734b485438f9086edff33ec157fedb2e9b1134686069f6e3ab7808560245b018e1a742d6a429
-DIST github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20201111183144-404b9149801e.zip 18442 BLAKE2B 5c4f7f066992aab1e74ea5ebf582194d7d74b77207053dbd047931dd342687a70ccba8b64a6b5964e9e098a8e3774ad0733d45104197ae73771e920d57bf6932 SHA512 8e75df594dacca5d00bcc15716b2f3a8606a9e18de370ba41fe9b43f08ebf861ff9f803157ba463db2574121b82f02e204a3a7e525b9e33105e8c10815f2c6c7
+DIST github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv0.0.0-20210316141732-918d888fb676.mod 82 BLAKE2B bfdc964e9bb83283e3440ed14fcb68c099b84777c02c1ed3a2eec49abcb94e8bfa28b4e22119274e5e7d726983460b038dbbf97d6413c7780e4452f698b7dce8 SHA512 b01b810400eccd6df050ec3198a29a6b1145e1b159243c714909c73b2d54940facb8d58244d1a0565c983b3029e90a69b45922826ef0d298dea7bf1dfcfb82a2
+DIST github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv1.0.0.mod 82 BLAKE2B bfdc964e9bb83283e3440ed14fcb68c099b84777c02c1ed3a2eec49abcb94e8bfa28b4e22119274e5e7d726983460b038dbbf97d6413c7780e4452f698b7dce8 SHA512 b01b810400eccd6df050ec3198a29a6b1145e1b159243c714909c73b2d54940facb8d58244d1a0565c983b3029e90a69b45922826ef0d298dea7bf1dfcfb82a2
+DIST github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv1.0.0.zip 16823 BLAKE2B f446845dfd0d6d972d50455f5ac997715385cdf617ab2b55078d863c44b151b9d0d09293b7cd8e155eca127aec7a145d52763492009bf7195e43138667c92751 SHA512 bc55fdeba512f2d840c0fbf43023ba0933ebb059f411f2ee6ade9b15d13e1e1bec2730d57f51818312c853970aaad9e1568c205167732f15b7a856b3f4d8b0c4
 DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190717030353-c4b9ac5c7601.mod 37 BLAKE2B 49b7224e2c125faea72311f8abff0a639d4ec73b7dd198fe638bfb014ae94c7e720ccbb3aa5b6939f41aac2cc03dfd2016499bccd544cc31034e09e914b6a3c3 SHA512 d1b294e39f577cb07a2cd4a1bc47535f1ad9ddacfd93fb3779c8a9f0feffaa9fe82e7d8288bc287f6bfeab70e5da8d712356c6f635a0f9cc344183045b69a0f6
-DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod 411 BLAKE2B aaed1a7526861470d053cfa204fe5af2ba4ebca024322c8007d3660acce6fdca03264a12ca0bedcb6fe1f0cc5c78de920f8e8e19a36b12e1604cc3274bb88733 SHA512 32f6adadbc5dc2c9a57c698ba76fa4fd83637e67f58da55c6a22d4faad9f705fef7a472c2b2b2b94b2bba2b839b85856254fac4681dc9770893afa940bc734a5
-DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.mod 618 BLAKE2B 085fe180576e1d1d581d2072cd295ca43d305685ce160e77c27d47e4138ae8ba865c249c4098c8cf51943d65402b57b3942fd48fe7b933f1858bb705d578aa40 SHA512 8dd3e2b3e6b8f2c315289626450c89aae9827dae8a3d314f7372ad473165ee773c38afb4fb7364abde2f0543c66aa268d6f79c455c0c166e7bf1bcae20b8e679
-DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200531161412-0dbf7f05ba59.zip 132231 BLAKE2B b81c5a19ebf7992a84ff06ee4312170e16bcad7a82aea5d49ce6001b163c157adfd937022b7a2b8f05036fc4fdf462a82dbac23d5f2a8437f44331e9b7a3ef37 SHA512 cce8ed5b08d82b6980f0f42494e5acc52f5531f5fd15dcdfc18d9c54da4d68d3024ebae4c058b5f09d4e0e04938f80cf3d63a7b80a4edecd0f5d21e4f5caf85f
 DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.mod 547 BLAKE2B bbda260ebbb90eb05c921aa25f616beaeee29a8f869f2b65fccb815a1e9b4007667395f5b6b3917eeb34fc80075c5d4bd29b7ed44724b115213c618f28487a48 SHA512 efce41b29f0a235d814f780e646b05c2be96fef06818ad6d477bad0d8557d7570fe31fb23cbff1ccb686feb7f8c7fcb0baf11be7c805e2addc6834d979ea21f2
-DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200710171044-318312a37340.zip 132654 BLAKE2B d7b40afec39207fc2bb423838a6a84f443c9e01dd83f0ac8d3e3497b738da53c364c93cd345bafa1954b8a20d7c350ee4c06fc15ccca0fbd280e2d0327eee3b9 SHA512 e9ed912ddca53e529f87a4fe2e03903cedae685565b5cacdb96c8a26c2794642acbb3d52d2123ae686717ca3db8d99bf936bdd51cca3aed0f52bac5279098f41
-DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod 37 BLAKE2B 7037e2b6c6f7927a37d8298f91976232fac6e1723d9ffda59b2c01bf81c24acaf124fceeddd8791b6a6bb1e81b03e1bd5ba88ec9613784462a235bdfdea76498 SHA512 3d4ac776b750aac30718ecb1a3efdb383cf39d0838ca60db5ba266152baa1dcbee739a8f384965b5b8d39b9d9b18561ac317eb8c64c61076986db66bc10bc1dc
+DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20200824123100-0b889c03f102.mod 547 BLAKE2B bbda260ebbb90eb05c921aa25f616beaeee29a8f869f2b65fccb815a1e9b4007667395f5b6b3917eeb34fc80075c5d4bd29b7ed44724b115213c618f28487a48 SHA512 efce41b29f0a235d814f780e646b05c2be96fef06818ad6d477bad0d8557d7570fe31fb23cbff1ccb686feb7f8c7fcb0baf11be7c805e2addc6834d979ea21f2
+DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20210114181951-8a68de567b68.mod 519 BLAKE2B cdc77ac2d07ad3c4a331c29876fe9b712155cd62ff3aa33c564adc35e9faefc91b18c9b4bd5d7134fc25f23389140f89aaf36e1a0e0293da4b93e9d7c6a22e25 SHA512 8c1f3f725b662ecaa878383dc2840bb2dbc88170b3ce8be63ca3740bdb9840268efed41fefdb1717f7c275a932eef0da354c0f6ccc1ed9f115e76e9eadc01d7c
+DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.mod 519 BLAKE2B b17bcd2f4deb4a72fffbde6505d1b50ee95d170f297a6261673ec5ab3a93cbddde2a22a412995090fe97466ae500a43de9cc7082d57848ae26eb80b1f5b35395 SHA512 ec88af90cdfbb294089c1e854c08b81bffe0f2e55e5e762fd4c308b527881c35637ca981359bde77b84cbfd768056110786f1af6c6931603ea50b070f0b11f0f
+DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.zip 131626 BLAKE2B ac926d2986e12432837ce62c0fbd93ad2efa84365f83a42b7f8acb8bdb40bf9d8fa2325ae152a7236805bd82974da66c87e0e0f9762667d28fd423a1dd6e1a10 SHA512 c4c379af43af059e0afd5e64dddc74f1c7a34fd05fcecaafaf750c638ddfdae2b2b6fb930de831495e59283f11f915099a2f0e46de47769a6a82f09c8031fcab
 DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20181022165439-0650fd9eeb50.mod 37 BLAKE2B 7037e2b6c6f7927a37d8298f91976232fac6e1723d9ffda59b2c01bf81c24acaf124fceeddd8791b6a6bb1e81b03e1bd5ba88ec9613784462a235bdfdea76498 SHA512 3d4ac776b750aac30718ecb1a3efdb383cf39d0838ca60db5ba266152baa1dcbee739a8f384965b5b8d39b9d9b18561ac317eb8c64c61076986db66bc10bc1dc
 DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20191206165004-02ecf6a7291e.mod 142 BLAKE2B 078f299e69579bbfd85aa291a997ac81e3f04a8317db16e836da1bb4242c8fa52fe809643b227471f5fc95ae2ccddb5d900a2720a91eef9e3fafff0e28979daf SHA512 a3da31b6bf413b1ed55de8dc4693fe4c9019550c77bf5098b67d305b273945cec0114a00cca4aee4d652b4a09ce318642a5bacd1ea7d7df63616734947bee914
-DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.0.mod 142 BLAKE2B 078f299e69579bbfd85aa291a997ac81e3f04a8317db16e836da1bb4242c8fa52fe809643b227471f5fc95ae2ccddb5d900a2720a91eef9e3fafff0e28979daf SHA512 a3da31b6bf413b1ed55de8dc4693fe4c9019550c77bf5098b67d305b273945cec0114a00cca4aee4d652b4a09ce318642a5bacd1ea7d7df63616734947bee914
-DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.0.zip 23985 BLAKE2B 8e3d1db84e3e94fc0d82a5156fcc707477531f8d6cc224a479b91ad4d10637276ee831fdd27f743c5e59fc67372588ea9faa6e1c7a8a0f4766060c2d31533538 SHA512 39514fc213a23a33018904e84c8306427d561a2091f3e0cdace5470b91188217a4aaa02dfcb438f4be26f36dd10ba141a5be6de1b2c8814bbd6f979ebcb81899
 DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.mod 142 BLAKE2B b063852caf2c56ad1d7b42b5d6f621bc7c5d3b8cb53441688cccd11620bcca11806f01b999fec6ea5d9f297d7540845bbe1bf465f72ad15b87c1bba0e8a2478d SHA512 b14731c3e5c45c304480275ea23e80a5e287bf3eb2b6d56a9b8f6887eebe40fcc7ce22883ca53864ac9cec09f15657cc35a629aa08fc53268a9461d76e5f9a33
-DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.zip 25806 BLAKE2B 8944e8e76193ba57a78c9243100e11c90b7f452be8ea0ac12bc484c2f36ce7c7ac221e21b15ed9ba18e1349180263bbcffd512e56f6b6c4330c35eb646ae65f4 SHA512 579ede619bc1127453350dc3c3009fbda36072756b45037aea9af6a1a1784835216125fa11097f549ebb65232460baede7021402f9b42205933fd7b40730598e
 DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.mod 142 BLAKE2B 904ed213588b607d9d3a8f66d34ee171c259d8d0a847d8fc2f758837e50890506ffefd103f6e7dacb6eb507a1b50ee77fb393f10c793b5887bcc94f9bdbc5251 SHA512 9c027acc553b3141cd60a6d9b7f7734d6e83820fe423036a63fe65311d128921848774240360b70a09e07ab48efb5ecc985d7afe4ef1b708d7f8fa60288e51a9
 DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.zip 29234 BLAKE2B a14bf498a29153650678b713d0a3e8648906806e5522cdf25a2b594c7db0b015a4e6533799cc1acfdb0e3b17018f45ef33785fc81953e5ba8ef6ad8161292b2c SHA512 b98e7adc8c4aadf5e5ad5ab8f68d8a8171e565e0e5ec5978215aa78fc08233fcc35481a2a564461a3e2cb7b086dfbaf5a05afcc25eff411266882d91e30c9e35
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.2.10.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
-DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.1-0.20191213020239-082f7e3aed57.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
-DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
-DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.3.zip 1652053 BLAKE2B 2dce8684aba3184342c9019b4e554b9e79855819da1c785e2e81b47d90dbd793504fcbcd7f520d8d57f3a4aa3f7753fd8f9c516620794bb76e38044533552e14 SHA512 42543e7a2ef51fef0e2890b8b803af947a39a9baa8e6792f86b8a4836fc97b0c0558b1ba6cd40ec99fc56ee9ae0ffff04e8d5cb39464da528b90a02b2bd95879
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.0-beta.2.0.20200729163537-40b22ef07410.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.1.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
-DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.1.zip 1756900 BLAKE2B f199cf19a99ddb84d537981231080f384561381b0b1012ff8d12d79b194a918e392bddb6599d630c59ff7c4065b430ed4a1a1ca8021a087491eac3b991d7b6d0 SHA512 1af47ecbcedded199c8567150817ad2b4c088b32ec9b53bef26e9cddf48730094dd9f1884b7ebd74d4441429b165d27adae230eec3706badb19267353b77491a
-DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.4.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
-DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.4.zip 1761360 BLAKE2B e8da0a47356348be1fc7041566b7534d8184d8ced69c473795fe500ee153c512dcdc7efc194f312bb04e3fea046252362bdbf7687b61a2e522b033d02a3a740c SHA512 02b3b66de3acd918742eeb0de907f5795a87052d9a747326c3fd98d2bb23183344628e4fc80bcf8a684ff1530e14b21c58e516133e4d334c9de15779181a558c
-DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod 40 BLAKE2B d99a912436af30ef3f5fd53f6348367016633170289e08c271f0148a47db1f9c5ac5da362fcc3f6fa5a7e7977377299adcffe63e9c3315c45ec173d55248006c SHA512 442fc394b0be5c87d2b9edc858f47d52b1027acf1fade259879bac7c598e51692199cba7d4e175f21f772193f1570e47e82d6c6c6fa160e253eb49b09cbca793
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.4.3.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.1.mod 3167 BLAKE2B 7f6c73dcc4bb66b6eed715b0da211fc3e651d577ba5f3987e10c715e316745fe7555d387704cb824b0bdf2b21c4d3b9b6e41c26e9f39db855adad277423eff41 SHA512 22ddfc302ef79b6b3f8a47fe5293f36775825ae07e2ecf41e53edf6ea78538d3c321f28241f55a16e65d19446953d3703aef358d83656e74c5147d3efc2fdda9
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.3.mod 3160 BLAKE2B 5ea1ab9522c96ced2615f0116ecc7b762b138bedb1cd61b2dd955f41c47d7fb026e0ca8d91143569dace35f492ce4c5a4b5d8549a31885f7a11dda625b6b4114 SHA512 5201becf224bd0fb9afb13bd2272bf6410168f879ac0dd17ee81af6f66c16a6fd6b908b8d94d208f3c2c6f889039e2d2c3b208f9feb31b9e28a8fb7615d8c79b
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.5.0-beta.4.mod 3090 BLAKE2B f86c6697ac3a3b6b35f70e2e5ffe2fb0c772a3d2e37ef929f4125cce251dea20c9229ad60cf7fe5d586dca4646d86be191152b2224e6c707c44ef26cbdcecc4e SHA512 ff4c945833966fef725e4add013e593b54c050ecef8912e2d8ac401042f055012040f7ef89201a9a76b9f3dd8d9f41fb01bfcc7352c7579c98ab492007180205
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20210208174643-50096c924a4e.mod 706 BLAKE2B 0f74638af018614a90baf0d967e297ad5d128f2cba069e44829ff7ad7ed9723d6fda5789a4ab88dd0a42d47c8d41f52ba60aa420f18dcbb990cf4e744382fcca SHA512 b3a77f2822865a71fe706105baab7f54e109880e21bea2e1e46493371de6dcf8eade2881668a5a4848638ae8b39c9ca95364c842d67d906fdcbff6c197237a0d
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.1.0.mod 433 BLAKE2B 40f8d68e067e61c755d95545be26025e30261667ec2f2dcfc1f7c0a9b429852586a7194fba9c6f569242903a7b0328cb2cd4efa6a1f37de2a37013691a4608b5 SHA512 5814136e2c80d1298acddc6150b756369fdd71269c2a219b0d051c7e0bfadb10f42f2c5ae91c3ce4421eaea9fdec91baa9dd98d877477a809cc84457e7e4816a
+DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.1.0.zip 142849 BLAKE2B fe920f11c50c6716eae1b98341188f91fc337073693fa6b022d69a3acf31e4dd031e051eae4a70c378eedce1e2bff81d69102504937ba4c49a51fb687895adef SHA512 12afc62ae7efbd21687dff36a6f2e854969e775df4abbfff89986503ae4853650de5106e1b3c6ec8370717fe8e4ec0e2756e4d30cf490bf17ec654c8d015e1b3
 DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20180307165137-3d5202aec260.mod 34 BLAKE2B 24e82d551cc42b7a7c8c830ff4941074686a06dfc753202e49bdf1c7d5f7b960d0ddcf73f618585b6dc925cde9cbf123196fc4b45cba6bff79a16500f49c178e SHA512 9ae770f38dd2c9560c8c3e858890a835ed848d5434a289d889c312d681af748b11471efa47739b08ccc12beb6e9050d2f1104ac6299a50a83344f496af516761
-DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod 34 BLAKE2B 24e82d551cc42b7a7c8c830ff4941074686a06dfc753202e49bdf1c7d5f7b960d0ddcf73f618585b6dc925cde9cbf123196fc4b45cba6bff79a16500f49c178e SHA512 9ae770f38dd2c9560c8c3e858890a835ed848d5434a289d889c312d681af748b11471efa47739b08ccc12beb6e9050d2f1104ac6299a50a83344f496af516761
-DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.mod 34 BLAKE2B 24e82d551cc42b7a7c8c830ff4941074686a06dfc753202e49bdf1c7d5f7b960d0ddcf73f618585b6dc925cde9cbf123196fc4b45cba6bff79a16500f49c178e SHA512 9ae770f38dd2c9560c8c3e858890a835ed848d5434a289d889c312d681af748b11471efa47739b08ccc12beb6e9050d2f1104ac6299a50a83344f496af516761
-DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190816180239-bda0ff6ed73c.zip 20795 BLAKE2B 9247e9501703ee81bd29c9218448ea5e1acf52ca128a116b4c7274b3890fefc0aee996047135bf05741f81d619ee3d0946a158a10d2d0ec648f51b44149cd4cf SHA512 f8e1daf4a154fb09498140469576e4585a38b8755cb41a9f99bf2e5fa9c9b369c2b0c336504fb397d0f611c05815dfcd21b36e5e62321e0c711a01e6ba9cd47d
 DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.mod 175 BLAKE2B 1573b65ca6fa922fe9d47ba40920cc95f7f7f9135c729fe9d8f9c2723492a136033f6b16680bc5c405377ce7bf14db34d989c563af74bce702db0b5ab761bc13 SHA512 b227a5f0ea52840001d34ebdfb11b0209dad5dc49faa55c20f5d7283c67992f1e63e4325c4cda3a3e5b70cbc7231301ea448a7e272a5f864d78585cf938f0d2b
-DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20200410184934-f15a3290365b.zip 23051 BLAKE2B d5e41d797f745042138a75de5257332d39bbb7b9036876291680f80a823478cc13e305b958437c1afc602d35be1da8a6081d0e9ebdd85050033e8bc8e26c1ff8 SHA512 33c99a6132c0ea81ce9c813b17360e5fe82aea9569b8877735a4de0bb32d46a23e330906fd57cd35ff0cd91c51ce21a96cb547311fae7782ec500c4676c8e79e
+DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20201026212402-0724c46b320c.mod 175 BLAKE2B 1573b65ca6fa922fe9d47ba40920cc95f7f7f9135c729fe9d8f9c2723492a136033f6b16680bc5c405377ce7bf14db34d989c563af74bce702db0b5ab761bc13 SHA512 b227a5f0ea52840001d34ebdfb11b0209dad5dc49faa55c20f5d7283c67992f1e63e4325c4cda3a3e5b70cbc7231301ea448a7e272a5f864d78585cf938f0d2b
+DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20210316144830-115abcc95a1d.mod 175 BLAKE2B cd70348bc4d75666384d9b368ccb9aad2f39066dc3dd98469712c0de73dc09ec519af0ad349ab2f67fc7f3c4598bdae67621c7df572569f346efe8c2d227713f SHA512 c8fc082c1d94ced28dc757bbe7bf4deb6300df92469c205652abdb146e6acacde9f4df1544cfc9ca877ffd29483eb7cad208c4edc2a7425e301358897873649d
+DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv1.0.0.mod 175 BLAKE2B cd70348bc4d75666384d9b368ccb9aad2f39066dc3dd98469712c0de73dc09ec519af0ad349ab2f67fc7f3c4598bdae67621c7df572569f346efe8c2d227713f SHA512 c8fc082c1d94ced28dc757bbe7bf4deb6300df92469c205652abdb146e6acacde9f4df1544cfc9ca877ffd29483eb7cad208c4edc2a7425e301358897873649d
+DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv1.0.0.zip 21619 BLAKE2B 324de576a76f2f0f2185754fa9bb04fb467b2cb55e8de398cbaa5ab758a30ce38bdb893640f3cb50e5ef1b098ecd55ec9c375da59eb9ac14762f7e78e065b7a2 SHA512 f295b96b4826557b0ce4a4742612088791fc1d9c30bfb1b564be43e4669cc12db88010b2341742b9af115f76698524b3f2f1b0804962699e5a8d21a98bdebafe
 DIST github.com%2Fcontainerd%2Ffuse-overlayfs-snapshotter%2F@v%2Fv1.0.2.mod 485 BLAKE2B 44f39d3aeedf305578b20b85aba216fd80eb61695ae379f7297817c21c913780b1589f9957fcd7b9a64d5a9e3f164d18cfcb94b7b77c6db255c246711bdcbd4e SHA512 ad43e47a983b346bf209a18837559e4d5ace7762deaaf307181de51a46941b5249486c9b235c0ce0fed287cf10f8dc910271ebe1c0f7a2655896be17bc65df0c
 DIST github.com%2Fcontainerd%2Ffuse-overlayfs-snapshotter%2F@v%2Fv1.0.2.zip 53324 BLAKE2B 3df2e8e9b11532726b7fadb874c7d935e8c6cad1b94e5ef70441afdeb5bffbf674dcaf58a396dee6d9ab5b8c779c81ce2d7de51560df093dbc8c1107c134a406 SHA512 c42a482efe29ad0fe0899c93d5987037cd14e0719bff713b0dd0439f5e763af9bf862ab0915dbc24fc58f3e8b6c37975242c842216d0fea72fcf863aee0798f9
+DIST github.com%2Fcontainerd%2Ffuse-overlayfs-snapshotter%2F@v%2Fv1.0.3.mod 450 BLAKE2B aba9862490c98d0a66e37fe8631f3440512d91787cc628ef6bf0ae0e6027373839b99b4e26bb226a276ae00e803cfc55a1d1bf9a47ea12df41e46d62c1ab3762 SHA512 d5099b6b9c46974e6fac886769df18fdaa3fa0005cc526d2478d39c269f8111a535a7d57eedc3b99bcd1505b7a1fa27b8f6a1504dc8dd9961330396f17d9f512
+DIST github.com%2Fcontainerd%2Ffuse-overlayfs-snapshotter%2F@v%2Fv1.0.3.zip 55945 BLAKE2B 2bb8b9aeddb9ed64fab75ae85add62142bdf8dcf367b1c89144df1acc79c1b37d6c951fbb7da67b951d673567b817be174cb4641047127de69bcb2fe4ddc24f8 SHA512 325fad53b05e8ea787cb25b30fb388c6040c88ad821268bbd4ea7867f91ffa1f432347918335b1adc04ef001e79fcd093e2f113545f3792fb67fea5d1f1f8ebd
 DIST github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.mod 452 BLAKE2B 9fab2dca3c8e2790959402414346a2f97f4826a53f730076e13e87e2f7f9e8a4e3b7436435bdfe29d991b2068c3ece450f68ad88c5b24bb4704c698d51e3bd4a SHA512 153d152d9e1cbd12a523d53ab1be36f76e8f128260927a900269aa8bb8512d5aea6d391e273799edf0f68d04756d59c01a3a7f8bb6ffb4f0b629b454a6c3ef03
 DIST github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.1.zip 22765 BLAKE2B 0a549b4cf97bf9063436c51677a989334ef2166ee6c15d70fa4dda373fc3e1a7b14e94ebae42a143577553dcc793eef9cd784b951bcd3618a0c7c6a881d2ca8f SHA512 064a3b7dc7f79cd807dac49466f40d8d63242668133d2bb15fa79174dc931ab327ff89bcbd6969f757ab42761965967e15b33c80eaa27c94260027c35f44d29d
+DIST github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.2.mod 301 BLAKE2B 57ba1e9c0d74dc1cb5c83911269c34fcad82369f2e23c9e91b9f87081cee9139f8ab7ed8056697dd1d66a07fb319c23b927755a0618ad926d2c186c0ebb2cfab SHA512 74a1e2dbbccbd3d14fc59b99cb41c78f9d66dfd59d1b2d6ae10598e13b3bd89be3b25dcd62e14b1fe9c550c68d749ca65aacdf9005b5906b2a83d4cd9117652d
+DIST github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.2.zip 24041 BLAKE2B cd3c841154d10b52e397a9543512ec19e01533dda769c67de2683619bcea7241fcefbf4c3692bae3927724ff129d1f4e2fb16ff0506feaec91a69c835472d1a1 SHA512 712315b992378236006b87d2d05ec105270c4eb9d673c3750d167b06d18f0d2bbcdafe9e56b8cca1a83f8031353bc5b95018605278e51f20d8c93d3e46983e16
 DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod 37 BLAKE2B b3d06413bdfc072eba71c8b51cb7aaf27ca29ba736959bd0fc9ef2de8fe3dbf3f194cdff7d030aa259c8e78fcc9003dee040be0d1b858a677d9e306c89a3542b SHA512 62de290e5234d6bd82d9a865d1ff592736f075130d1c29e9d9f2544ca3f9514c4a81ce1a726cf8fc8be8404e8ca41a88958dac755174ef2c20ec9b455d0cbc50
 DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20190911050354-e029b79d8cda.mod 37 BLAKE2B b3d06413bdfc072eba71c8b51cb7aaf27ca29ba736959bd0fc9ef2de8fe3dbf3f194cdff7d030aa259c8e78fcc9003dee040be0d1b858a677d9e306c89a3542b SHA512 62de290e5234d6bd82d9a865d1ff592736f075130d1c29e9d9f2544ca3f9514c4a81ce1a726cf8fc8be8404e8ca41a88958dac755174ef2c20ec9b455d0cbc50
 DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.mod 255 BLAKE2B 32db1b4c953ea3f3938b2440858dde31e603131b72aacc4acf32af9e44edece17c738b2014c04558fb658e367ac02c6dc2d1f57b89b61907bd38ba56242d9aa5 SHA512 69dde1b31556a7ede162e742be7e546d412bf257449878e92a5f8b3cd8246d77e9ba96c3dc82415f356c5b8a0181517a2b8f41178e5537739644b8e4713eb594
-DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20200220073739-7016d3ce2328.zip 25790 BLAKE2B 466cf6fbb3a4171703ae4912a288aebab52049de02c9c5a346e567a8a770ed662672094e2d6d87a035a6f0609204f166ba859fe1a916a1a06aad876b99b9c237 SHA512 5d8a0e7f0f1c9aa65065a8a62f2fcb47b57976d7e9585c7c1d1e149a0ed17a0e983915b01199cfb9dec8e233f418386120f441dc4d85099c228e82c76e600700
+DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20201020171139-16b287bc67d0.mod 262 BLAKE2B 8a6a3bc0f862a7ccecdfd3829946b534ecb1d9b66a1d0090e415bf0f8a0bbc039e232fa1d6b5eabb969a7ba8ce5650221ac8130b16fb654cbdfad55ecac56a97 SHA512 bc4746747b81ac10a3b30c423f65399646f8b636ea31e6f63a34e30818f7db193de65bbe9327e3ecdb4d2beb36cc581e8aae80bf215752967e6b6f47f3fc6693
+DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv1.0.0.mod 262 BLAKE2B 8a6a3bc0f862a7ccecdfd3829946b534ecb1d9b66a1d0090e415bf0f8a0bbc039e232fa1d6b5eabb969a7ba8ce5650221ac8130b16fb654cbdfad55ecac56a97 SHA512 bc4746747b81ac10a3b30c423f65399646f8b636ea31e6f63a34e30818f7db193de65bbe9327e3ecdb4d2beb36cc581e8aae80bf215752967e6b6f47f3fc6693
+DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv1.0.0.zip 28091 BLAKE2B 7fd9a747da5731845b15bac54b524500ab9646e6cd8f3b006d51f20164ba2785326cf3096af1c44cbbeec3607ed1c18fafd5450cd908e9abad03f8e24795e4d9 SHA512 5a0938903d7670f466aeb026f7d2a77cedfecd21c931fb41ca8d0995381b89bf2cf1c886524b4b601b1a8f7380f3302e0fe72600e9c071813b9acd489feb5d18
 DIST github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.mod 2018 BLAKE2B 917e8990413b37fe249442829484abae42400bb19f819bd00f8d79e9a8469af6b39b6aa7b4df3e14ae83aade2aa3bfa984eaf6817e8aea85cf47db78ba57089e SHA512 68d307f855583847bf203a479833fafcd0df59a298f5e41abc274ad65d53894e01a69477a65b2411b2c6b9beb215ae534a63b977f787f139719f4fd2532522c0
-DIST github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.1.zip 84654 BLAKE2B 72319a9c431414d746d60075fbc92f2ba676ca8b8ce74fca70960f97d5502962bca55beb5948a8c70aae7b8fafd806f73b4f4428f788835a34443a5a80d6f0af SHA512 14161691a9613f9cb9862c18d7305072ceef1c0fb37be736a72a3e0d48e2a5822c84dd611c4b999a3f42bd22ce7d9bab1688546452d375f5fbc43f1942dcb2cc
+DIST github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.0.4-0.20210301171431-0ae5c75f59ba.mod 961 BLAKE2B ceca7fa48b92ea4ad3a3debe1eb481bbb897a3790e04563f4b5656c298cc7ef3152000f3c52d14d6094cef92a1b2d0e6c0e858ae01945d15e57755d9caef2732 SHA512 4363e27ef5a8efc0d11a1d12ed5799f79c47d8a8f2612e784a2a98a19527135a339b31f2c2902687fd885baa57bc97d9dfccb568ce40dff6639e1f027ea7be08
+DIST github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1-0.20210312161619-7ed62a527887.mod 711 BLAKE2B d576681942bc9c190bbd3a367ca9ffd41d969b1604cb2bb2425f2fc30b6d8c0e791317fbc8dbeed98cb24592013c1083ba7d4e7aa65955338f43375d369a9245 SHA512 ef343394d0d8026b753880ab3d08423ddb5ca2f80ae164adb13023f6ddd2f965d77b7ae0bbc2b014e99b5813d1bf1377c90cac9193d9d77fa8d0b7c6cd7adb31
+DIST github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1-0.20210312161619-7ed62a527887.zip 117391 BLAKE2B a3d96090800633c1632b730e3299d52efb721df42aae76de49d9ef8944cd68b1bc4c52e24c63f5364b0649cf198518523074c0754c562df95c989dcb86ab71f8 SHA512 5dd0a1b49c508787a2fb3785dfb20492f315120cb568645dbd727efbac8f724f1ce0e13078343e597c8f950ef1ae527812100151fe539be42ad319a98b8acef2
+DIST github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1.mod 709 BLAKE2B 68cd6944a6cf12c680850ad337db9ba79e8af9b64ecd8426cf558d288e95529847816ccdc2e68c77b99165ffad4f74903f8e02fe41c982e49fbb23a7433b7f32 SHA512 8386ad5d809294ad700a986c872609504c67462a0d440f7cd407141337c5818d0c1de068cc65125dc5946e2d62558b98cecd6ea5b2005ba170639a21b38cfe3d
+DIST github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1.zip 116023 BLAKE2B d18d447ef1c8b4af36c26e9984b6db879918e864750b6ba26399e64842809bdb608fc285daace8ab687affb144fc0052361ff89d2564e8a8e0c36b757eb4b5e8 SHA512 7169b89d716e5ffd0b672e4ec616270d508fdd426c55144c11280e867f3ae08d34f5d4020cc1673c1dd2e55fc58a582f029439cbfde322a7e0cfca665ad93966
+DIST github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20201007170849-eb1350a75164.mod 1439 BLAKE2B c5f90a8ab258e5a7404940bb4d557dc46410a36441af42e5ac06cdcb098b485f84518fa108d39527857a3babfcd2cd4415e4178928af814f0eda1895779a1c96 SHA512 468b17b1d2f697b8fa097fa2355f4d96f1c34cd0779415a453bd1d70005fae345f0551e05e7af729342f2660b749e31db95806d754257bb61a1296ebb417f35f
+DIST github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.0.0-20210316161719-dbaa18c31c14.mod 494 BLAKE2B 2fab5efee2e79f709d55c23688841e2fe394b270b2b23baa91a36fabc15e2f16ca68f98807527b0b613b8aed74d686813ef9fd5156f240456853d94f48c7a567 SHA512 bafead244f4f4a049704531feba39d76875d495a5c8e9bf0f75b643dfcb5d5eadb6285ac0e9a9641564f376bd929822079ab015e2b7af668fc6af37ae66b6c8c
+DIST github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.1.0.mod 494 BLAKE2B 2fab5efee2e79f709d55c23688841e2fe394b270b2b23baa91a36fabc15e2f16ca68f98807527b0b613b8aed74d686813ef9fd5156f240456853d94f48c7a567 SHA512 bafead244f4f4a049704531feba39d76875d495a5c8e9bf0f75b643dfcb5d5eadb6285ac0e9a9641564f376bd929822079ab015e2b7af668fc6af37ae66b6c8c
+DIST github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.1.0.zip 42948 BLAKE2B 983095e87a54595b7d2cb394a560bbe52b7470765d291b78c331088c2bd00a40b7b490e09a535937101e6279a2240474b7260e54b88416bf9f08cb24b7c471de SHA512 625cbd06953d1f6873f2f40d0115c4f9bd5abf3e3f31ef96e0ae8938eaa7d0303272f78226290c80be6333cfa598248b404fa3f6d4bc000043d67517f9812c69
+DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2F@v%2Fv0.8.0.mod 1913 BLAKE2B cd0cc28826325be655391d51d4dd737b24a7a5e81969f884b669ccaf850fe339623c0f49fe877cee846b82d32cae40023958bf4cc2092cdcd4995f98b237e48c SHA512 66d4efd3f445576c274a50e6932558f08ba57484ae07f1f40f29821703f2c96b1f3b8c8f86017265229d246811f7922285a1325d4bd80dd564eb430f1f695405
+DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2F@v%2Fv0.8.0.zip 1412333 BLAKE2B 7aeff67c306ab3dbf4d50653776bfa1386531f4f6c230b52c008077f68c0a1effc9352d9beb052b748f8cf7a5c6bf2076be179230fbb4562c391b2d8030408e5 SHA512 9621f13c7ab468882912894010ae49fcbe7382042e5cb12bbe4ec16830ab71bb494f695faf0f36a7b0a1987ae9a9ae97fa74c8aeb8183e8fd9cca33f72460209
+DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.4.1.mod 206 BLAKE2B 24bf49367435550e94b447bd721179472dac87baa5408d977cb74332d3692d737cf318b53862a5f491db9e1976d587ab2de0b6deaa0fa9eeedcb99bf9d0f15d7 SHA512 fac00528e2ab9ad25cab448470f587b75caa7a0306a2da67add4b53fc55c37edea98e1c78bc195f1a992d988f09cc2f0f27b1226fe970ec95299d13e9eeeb132
+DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.8.0.mod 245 BLAKE2B f8884ed1e6a0c5ddd551aea72dfcdf28c5f07c4a17bfe27ef1ff204990540e4857c64a6c4a9bd390ee0b9b4145f47260ecc67e237a1a96ce886b8e730df40e0e SHA512 846cbb27ae4b31edebbacf0103665f39693e3ba42a73f84b14dd0dd6da80ee41541e3866a1f9d167455546a907c2f3c4bb20a6e9b69b53eda3f085940cbc93fc
+DIST github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.8.0.zip 51426 BLAKE2B 74b1cf2114c4fe0f9d383b81464f2bea68f37afe481048540a668b16eaa854ee0298452d337933fe5064c037b49f67500534d4d10cd535527128885a32537430 SHA512 59c620264ed2098b43d00f84f1c65777197e288862786ecbb9c92a08ff622297daf2969271b163e55af9a25d9c85e4944e4c02e695891ed7e02beb94971c0742
 DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod 35 BLAKE2B e2c6e0700e40d563dc690884628fa22b6dd56872a63ada54374c07cd6328aa332b6df2396300090da5c9f7ac730b6b9bd60dbc776557c4614d5ab3ce003579f2 SHA512 93f981daaa62351a480595cfb2feffad6c34770cf89f35399d777096fc524cafa50d0dd3f56231ae41b15e56061ab83f0f6829190730dbfc7f9fcd594af7b054
 DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828172938-92c8520ef9f8.mod 35 BLAKE2B e2c6e0700e40d563dc690884628fa22b6dd56872a63ada54374c07cd6328aa332b6df2396300090da5c9f7ac730b6b9bd60dbc776557c4614d5ab3ce003579f2 SHA512 93f981daaa62351a480595cfb2feffad6c34770cf89f35399d777096fc524cafa50d0dd3f56231ae41b15e56061ab83f0f6829190730dbfc7f9fcd594af7b054
-DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.0.mod 35 BLAKE2B e2c6e0700e40d563dc690884628fa22b6dd56872a63ada54374c07cd6328aa332b6df2396300090da5c9f7ac730b6b9bd60dbc776557c4614d5ab3ce003579f2 SHA512 93f981daaa62351a480595cfb2feffad6c34770cf89f35399d777096fc524cafa50d0dd3f56231ae41b15e56061ab83f0f6829190730dbfc7f9fcd594af7b054
-DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.0.zip 40442 BLAKE2B 3d75659c744de5bde9567a8f007bffc8b0ee6ad83fca84cf8b1e8555d8d760543a48e21d338402ceb0af6b54f425cd828e260469445d8a4cfae7aa3e59e240e5 SHA512 98762e311f1694eeb88d9ae6d32a4d166f2dd2bdcc01bde0cb121465cf873f3949039fee8acb9e34715378cd71818553f586e233f738bfe66fcdc25a2bbb46f5
+DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20191028202541-4f1b8fe65a5c.mod 368 BLAKE2B 52b871af9fd9f2b71074286d0877d16dbf6e9395f18326cfee8cd1eb7339b4694bfb90ae4c843ae1f71cea664a64d4b090b3b8be7e72f01366424400ec2ff05a SHA512 1655c00f6600d5a2ce87971a893f5e23b4d40f1e49d62fc39916751fc8c5352766321761b1e4c5f321f8e205d5164409c964ec508c9cb7372bd182b850692045
 DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.mod 439 BLAKE2B 7c315352ceb1b2572b46be523f2ae18dcda51ab13d268c7f54d597a4eb0a71d97cd3d615fc8c45584a7c8070b232b1c5b7003cef36a7ff31d1034335951dbbe2 SHA512 aceeefb2d381828781a1bb99048bf5135c18e1443339298974a1f457eecf86116dc70442d2c192725fba64157c230782ebe3b918f0026d89adff9195bf3bd78b
-DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.1.zip 45186 BLAKE2B 4c1278247295d40234a02de926a07b97155bf80c4b88a08976cf3cb5ccb3d81665711c8db307663c6b46104d0c0c417147ead605c36ce21ad47caca93448c5f2 SHA512 f7537d05e867f8dfcf77e2f028c494d2ce9da88b845425196392cdc5b3f0f4519ed5829507369c0db5557d063de3e524ca0be710f181effa295479c3b744fea7
 DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.mod 439 BLAKE2B 7c315352ceb1b2572b46be523f2ae18dcda51ab13d268c7f54d597a4eb0a71d97cd3d615fc8c45584a7c8070b232b1c5b7003cef36a7ff31d1034335951dbbe2 SHA512 aceeefb2d381828781a1bb99048bf5135c18e1443339298974a1f457eecf86116dc70442d2c192725fba64157c230782ebe3b918f0026d89adff9195bf3bd78b
 DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.zip 46371 BLAKE2B 6eb3a72eaa0745e0e783974d571312151c746d30738798c72c32e1f11a0169da4922af72dc7f69cf1eaedd804066b28592b62b3bce4acea31af32e24884dc660 SHA512 f0ad6ecfc32c71d79f38911c13502c671c0594176c22030ae053cc2c793a57415bdf143eac0f349e301630f9a33e57b893a371d8587323877b35d541cccbf996
 DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod 37 BLAKE2B 109f32f2dc537cfeff1699937e93eed980f34a37faa111ad3831be6dbbb1df965c56ef266deba48aa1390fd94bdedfda9ba3a51f4f6d9519ae24db6b99dfe1d4 SHA512 6485196f4703578401e82673647b49d58fe60d7f90c311294096504d3e11477c75fa50684f00c7b378b2566e6e8683cf18d99f2ac78043b077318a643fb11720
-DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.zip 9069 BLAKE2B 65b34ace1b0655929a00f648d5574406440dd840e4ab182b188d754e131dcadb6eadb07971840e867aca65a2efa8ce01c89c20ba76d35654a58e7adbbd3b867b SHA512 cc7e018805824fcff055bf5fac93253b6194a12a421f1e1795de114edf863d865d6eb416ea92ce3ab66fb627b5470a6e721911c059733a27c6eea487f89d3f15
-DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.0.mod 37 BLAKE2B 109f32f2dc537cfeff1699937e93eed980f34a37faa111ad3831be6dbbb1df965c56ef266deba48aa1390fd94bdedfda9ba3a51f4f6d9519ae24db6b99dfe1d4 SHA512 6485196f4703578401e82673647b49d58fe60d7f90c311294096504d3e11477c75fa50684f00c7b378b2566e6e8683cf18d99f2ac78043b077318a643fb11720
-DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.0.zip 8733 BLAKE2B 7dcbae88ec6dbc91ce4268fafd181c8d48b6bfc350bf3db311b76c4729ec1914a6b2f4849ca8959a476c0b651fc1b220eddd87fbc65ae3b53a3770cfee6a7a5d SHA512 65c1789cb0e3bfeab5b3f196fbce10df88bd59006b5747a726844436dd7af2f14c0cd21c3d6002aab12e5fa1ff18022c7dcf57110a6475140cfb8d8bedb2022e
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20190911142611-5eb25027c9fd.mod 122 BLAKE2B 775bbfe519746bae037f93939baef72c091af97099c61ce8ac2e4ddc93a52ce06a4d4fccc52ae28f533da9c7aa147d9f302269d57448a003a695cc765d32cbc0 SHA512 a92ddbef593ef363aee93b81d810ff76b2df0a4155714d95dbae9d000edfcb4383953625becc3f24cbea19a77431cebc0767e40c746b6abf613ca5346f024370
 DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod 122 BLAKE2B 3fadecc6cf793ac4efbc51546c1ab8f882b9f350b9c32fcfbb93da9707cdb9d9cad9115e0a2334b4022e1cc5b715d8ad6a1b59e286ffe65b26d20f49036e8a21 SHA512 d2a8eaa285710c7734b1c046775e9715d20bffb7850f1df888d9b98cd4bd6062dcdcb18d43843ecd95adf7b125a105453f1bdea3fb75f09a350d229663e0cc23
-DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.zip 12534 BLAKE2B 3ad833c79b731b055b9ee48cf567c70d119d2f286c1c16726e167890a5a1fac593c37e4d6f61d9bcbdabaea85a52a7856eb7973c8b47a2c3e7349178bb76588d SHA512 90e97e49a783cac6b06cd0260bcf1ca1358063119593d1caed6785105c669e03ac944bb2d63db6f82acb6d21eefc2b89ec89a81d7bc67c710e3b7458bd85fcd9
-DIST github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20191030014035-9abf673ca6ff.mod 33 BLAKE2B ea2542a250bc0ebb08c407e504570532317ad60e6944101b92d47890027ff289f446bab6c3faa8c27a85eb053d2b4fc19722886e05d17e8512fef844d7113a05 SHA512 9e8cfa192828dc1fcc5e20235020946a37f5023dd603a8db631c97005483478b88345e4fbcbbb92329744b5667068a22f696c24979e058c87b8a4f136431815b
-DIST github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20191030014035-9abf673ca6ff.zip 10273 BLAKE2B 90084e9212a8c51a781ada85306e88db990702426e2a076bdee6c86913702d0f1b1b26cdb0e4943a537913cbccca3966303108a044c1ceb9ef060f91f51b8805 SHA512 7bce1abc4beaa906e9dee33c782b4064c706d282f9e5ff8e268170882de2b628c7c867a3945fd5800de9174263a8883043ef357670eaee182ef2bc64979c4028
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.2.mod 122 BLAKE2B 267a6bedf1d49b87ee31bafc4178435cd1dd2f39e03c9933135ad9ea74bc3e900ea913e41d692bebf6bef57ddef12d7339c59380a17bd2bb8d48939adf7199ea SHA512 ce52f275117c3362ea2ea63700f00e2615ded8b575489c7cbed2d6fdc718aa63d40a9b0858e789311ef3ee94fc9952bde87defb8c9170cfed61f63099d60b076
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.2.zip 13862 BLAKE2B 333f1487ca9d6d5ad22d2de3da4ceaebfe981ee0d4e8ceb9604e55170d130fd62c165433f918a6c05323b21632ca4d8ad5f6d8382c0ad885f11c29f0d4b0ebee SHA512 725c4284a4a0b195e6c434e0ae27981699d2ee085e19b4564aa0846c33ced8ed3171879a3ba3717c6a4b4e30774b8901f6b526b0a7fd02edaf68e2a953fa6df9
+DIST github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20200918131355-0a33824f23a2.mod 1034 BLAKE2B 8abe2830d4e2045c33f438994a7c8875d02a2ea06c6623ea7147a3376328f1211c2aa76fe36328cb0fe2ea4f9aadccad5ee6c927289626cfb594ee70e5737340 SHA512 a5deb691a8a9d292a303c117978173bd49f60fd9d40d5c81679af2499dba27c4993ea8172218f866942d12c990759bde3e8fc9bb3658f9fda3cc2ad4cee79777
+DIST github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210301145711-11e8f1707f62.mod 771 BLAKE2B b760a1721861c21fa061d048a8a8c40a8b2dc0c0409b79e19aa0257e0b9a53d08f696d16daeff4e0806b23d63b5a39a34b9781f951dd97372ab573743cd5aa39 SHA512 c72a7ab4d97ae527f7548bcdb1f69a20a7d78ef0b9291820a82644097b48e278b2d47b8a15370bd475696e61568a0811c5abb42c3c2da9076a4f473271d15479
+DIST github.com%2Fcontainerd%2Fzfs%2F@v%2Fv0.0.0-20210315114300-dde8f0fda960.mod 281 BLAKE2B 0ca9a8e650cc6481cc6ea953067f8f7595b4824c72ef1c38e74187e55c67c8c4e830c68adc8df124ac9244cb834c8ff23a1a9d9ab08f94f3591cee98ad229bc3 SHA512 7e4e0326884c87ecd07fdcc1b6e314da75f822e329b9cc598de36912405ee57fd02a77e7504f3ce30a0bf03c0466b974e2abbbd41bf196904d852c3bd942b391
+DIST github.com%2Fcontainerd%2Fzfs%2F@v%2Fv1.0.0.mod 281 BLAKE2B 0ca9a8e650cc6481cc6ea953067f8f7595b4824c72ef1c38e74187e55c67c8c4e830c68adc8df124ac9244cb834c8ff23a1a9d9ab08f94f3591cee98ad229bc3 SHA512 7e4e0326884c87ecd07fdcc1b6e314da75f822e329b9cc598de36912405ee57fd02a77e7504f3ce30a0bf03c0466b974e2abbbd41bf196904d852c3bd942b391
+DIST github.com%2Fcontainerd%2Fzfs%2F@v%2Fv1.0.0.zip 43726 BLAKE2B 5785232b5d9e85d20970d04868e1815f1af6e4cce6d9fecbd3665f5a08231772d3cb72c199a7361ac9af597b88fcd5b2ef5d5871b9a95a5e956c0a44d3304071 SHA512 bfe440dcd9b9419143a6c5d0393ef30162be2f200e66faac63fea150bc884267fc450f0c5516da43cb848cdc906401a5a41336061fa241eebf6edacfbcb46366
 DIST github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod 42 BLAKE2B 85f366b44e027fa05e71cf323e294e3c4771719c65dd467d2fdab5564501cce11bdd37696a3026b76ae93fab5f9fe92e0f11c6083c6f756f74a19cf0412f94cb SHA512 8249600ef0c0b1993da84d89e9ac18ce72daf21430e0d491f09e863baa6d59d6968b52066c2ef3c4d448570150a511641513da44219f4cc4f64184b883d87703
-DIST github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.zip 147142 BLAKE2B a28d972c54b69ead2b6fe83552ad4358b5d86985ba0a3141a68ccf13efeb2656950e664a9ee3333550278d2571ec1d92a31a6f906e9a0cb04978de6586681adc SHA512 7773628b7aa2a7b2e838e6c8a8acc1e6f90701c46c7ce5d153cbef11e80bd8d82eb09fb4a6a6fbf54beaf63ca9ad88d92bc7be1b0c1ae741b9039810c4780766
 DIST github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.mod 42 BLAKE2B 85f366b44e027fa05e71cf323e294e3c4771719c65dd467d2fdab5564501cce11bdd37696a3026b76ae93fab5f9fe92e0f11c6083c6f756f74a19cf0412f94cb SHA512 8249600ef0c0b1993da84d89e9ac18ce72daf21430e0d491f09e863baa6d59d6968b52066c2ef3c4d448570150a511641513da44219f4cc4f64184b883d87703
 DIST github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.zip 153913 BLAKE2B a3f573c20cfe2703b8e7dc31bc5bd36947b74d3badb82ba495dff667e17ebea3cc60aa9d0156023ad2f3b355d58b619fecb36368086e55a1adabcbc95b1267dc SHA512 a29112eb206c3d3dae148bc3e9f906d5f6eb0e6fba425b76b2e6500b9900ee72fd71b67cdc19e9c5edf8dbb685e8bcf401391df0b0cb8b701fa1ea0599e681e8
+DIST github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.1.mod 42 BLAKE2B 85f366b44e027fa05e71cf323e294e3c4771719c65dd467d2fdab5564501cce11bdd37696a3026b76ae93fab5f9fe92e0f11c6083c6f756f74a19cf0412f94cb SHA512 8249600ef0c0b1993da84d89e9ac18ce72daf21430e0d491f09e863baa6d59d6968b52066c2ef3c4d448570150a511641513da44219f4cc4f64184b883d87703
+DIST github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.1.zip 154039 BLAKE2B 8ec707c4e71d0405c2d545ba095e228dccaaa29ffde811d35053d8d8d6276f5fc7beee9fb79bf7ed04fd68fe8755b9cd5f2332b77bc260337883765bb84dd7b8 SHA512 1650d1a719e43fe92e6deb1596497d954d6d128359a560cb175219cef044f730c5caf025556dfb565c309417885dd445808a5a9e39735a9b04f110f651e03635
 DIST github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.mod 1592 BLAKE2B 6f69f5e32b115faa2999efe7e88bc17c4a114ab4b6550bd9fec16f847b4792ab60d6e9dec3ff43b3dcb043515df47a3285a5b15e367684f673aa11b10675db70 SHA512 e7e79301f7bec0d49245b444d05ed530f18587e5bd2ddd8efdc759a00fbd1aecee8b6d91c4532da05db700d04a1110faf2aa8383ae01dc597e2dcb0fb1315f8a
 DIST github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.zip 297890 BLAKE2B 0d745d50576c21965a3c878061698495f905f3ee92bf9668b54331d5c7a4d8edf93567b09b8a72fd034eac7beb57f54e807390dba5c0e551037ba71334a942dc SHA512 986b300d797ba6e65135d88bdb9e6bfb5e8d772775b620e9ea9c7106d3b7b8b35af1ea245cd4f422393774937ce435891d06df92565b80d838ab83ab1b776a87
+DIST github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.9.1.mod 1283 BLAKE2B 30ad0be88eb5d266bc3810b59f91682ae564117b68fc05b6a8fb49d7eecf9aca6a77f19e43ead98e5af49d49f26d9802932fd3b69ee4cbc927d4c49ab30d557b SHA512 9aa727ffff7f30e58129808faf96e4b35e0e0b0eb3afda2ff3c35d04a3d63561e649bdbf2162d975d61d58cb16b1e6e55e9f3011fbd954503caa633ec3e284d6
+DIST github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.9.1.zip 302082 BLAKE2B e5dc0c40300c66da263a3599de1d768273206cd21052912ad0b887e7c53a1e41f27f79c1eedb8c1daef9b19c94b1e3c244a9d4d2c2d9029f7cfb5d43b7373d54 SHA512 c07fddc0743c7becaa4ad5d1357c613955b8cdfe2fb8749e9058777a6763392880a17adf245cf16542637c30ecb3457dcc17d2fc7beab81640f26e9277c63595
 DIST github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.mod 596 BLAKE2B 467c0bb9d570f483e3f9a6b5120eae6221c1c43ccefdae36826c721c690accda7da4993b4744dba0e646cfaf2f6ad7681aa8ef37220cda491fd6692ab9e1975e SHA512 f9a774bd25a457f029d0ee73d3c79119231e40315e08c7d389d9f9c3d8fafa28bbfd285affed8ace9bab66f4cbc663bde0a4fabbb9bcb918d9dcf80cf4106299
-DIST github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.0.1.zip 61324 BLAKE2B 68481e13ac58f0946ed70d88e5655919476e6bd469171d09496d5970e49eae95c2ab80367fda71746ee6208a02f93a3e550f73414abcb78455a272d1c2540ecf SHA512 bfd86c1a46e73bc9ae5d7078c877b43174a8c37d1efdc4372195e329aeb8088a86bba7d543187c4e481b88b268b33cd9e592eef8822052e8189baa2433326128
+DIST github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.0.mod 705 BLAKE2B f040ecdd53596b78697bb49f6b04ff25f5caf4db91ba1e15f7f8e7c11bffd7adaf0c80dc267f68f271cc589772855dbfa57b95e400df45946e3f98cfd1df3c61 SHA512 0e9e5a7009554c3001053cb210cea2982d0a1d0657e1430c43572d9687f6d9329c8223570dbe50c5bf64b1cf77fdae2ebd355ff2dd6a5f7fd71589e821682dbe
+DIST github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.0.zip 99553 BLAKE2B 35deba617f8ec457009bcf15dbc346911aec1997669986189d5cfb8125fb42eaa5a2ba8d5c0fa26918eded72d9ba26fc22ca8eb9a0d37c980fe8b45a449cbb8e SHA512 e42707b435bf71ded5f2c18f6b1b5749aa3d2fa8effe31c02ccdd386cc15ed0a5f1aa58c19a6c4b26a33963315599fce848c78de98b880d97cbae4f7721cb761
+DIST github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.1.mod 694 BLAKE2B dc34a2c29b67c33dde6d0921d4641769f7c6bf672c546a29c1b1e0b5fe9590b4760b00c48d54421090ecf9eebf68c7b586850c7dd8e53fbbc15c4c4b5d8940ad SHA512 c021472288865f1d55e8b4ff78c1350ba87ce520df0f0f181c8c8b12841cead7b10d3cce9a789fa635f16aececdfe3e46c353f5f03ee7c4aed6f77cd2a99a18d
+DIST github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.1.zip 99758 BLAKE2B 8efc6f27c98bc679d75eec6daf219bfa70eb4416913d67871745acdeabfd0c4f2bf684aee07ee2e0f8a7f70b1d3d80df247d603bc6e2c4bcee583851644032d2 SHA512 e40422cddbb525a349ad93083889f4b15b132c48d4e8313e7825a8d7ddb556adcb925d836fcb01ebcb2f15904a6d6dc5a3e279985fcee3fbd10a46875e0d5d52
+DIST github.com%2Fcoredns%2Fcaddy%2F@v%2Fv1.1.0.mod 147 BLAKE2B 6566fe8844e510b48d8827ceaabd18261b6554c5e3684829c17990562af3ce672190f0317c09b729282137d105a9bb203adf7c98320f594e194d87cf734a37c5 SHA512 082f088805d6af9a7bf8d8a7bb964eb1d8fc4971dd8cac99fad41b6a6f17c1c274949fd85d57705fdee0bc747a787ecc76bf98145bbf7e944fe1f56405d7bd28
 DIST github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.10.mod 171 BLAKE2B 8c8c7c13954cd7d66d76e1b9515091e7c61b09375008a762fce87cbcd13dd3cb5462ee5aa3a46bfc98b6d239333f47fb6c9a0cc4d29cfc80ac01730729648983 SHA512 3c365d26005a78c278dc47e4bcff1f0bedb39427cf49fd61fb9738970125d85316cf57ddb8cbaeb1ebf1b3dc2f7157ed350030c29c8d219e03e22d1c0213be51
-DIST github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.10.zip 48071 BLAKE2B 199965bede99cf620bcce0f5b120eaa02ac0bff60ae030cd2cc77db040123ead5bb37475100c72490397dbbd5c6ed729170e9359db5094d14dd00ffc1d83d86f SHA512 3023c7aebc224e1308a657914dbbe305e401b295522ca9b3e0c74c7bc86910d832dfe5849bf1faad8bb70760b70484ad9aa280f81ea0ce26ae80e41ab58b92e8
 DIST github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.11.mod 171 BLAKE2B 8c8c7c13954cd7d66d76e1b9515091e7c61b09375008a762fce87cbcd13dd3cb5462ee5aa3a46bfc98b6d239333f47fb6c9a0cc4d29cfc80ac01730729648983 SHA512 3c365d26005a78c278dc47e4bcff1f0bedb39427cf49fd61fb9738970125d85316cf57ddb8cbaeb1ebf1b3dc2f7157ed350030c29c8d219e03e22d1c0213be51
-DIST github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.11.zip 48824 BLAKE2B 34e3958811062317f9538de16bb19049a8d48403b284e77e49c46bc226d48386e391f26a5cb9bcf0bc30566232bd0c0eb7d7f9c9f1ccfbee7ccc9ec4c932e9ad SHA512 cb58f6ebde826f7110719810d952c40d8b27cd2304fd00681a0304a29f92be249510d421390a60032a4226aaed9b01bc0936855d59924b35283756793a538f7d
+DIST github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.12.mod 167 BLAKE2B ea5ad2f21713968f4fd47501189ed819fddcc2b56770083ba95ecf83e6e2ddf6181529ced392d90f185349fcda431e5503fd2f907f31ccd3adf6193adb3cd736 SHA512 8bdaa3a29cf8bd925edebb2dfb0a252bea5c688fd7035b79c2718b00203dd0e966f7e39225b028bbff58898a632561836109dfe8a9cd4beb6f6b2ce04922b2a2
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
 DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.1.11+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
-DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.1.11+incompatible.zip 1728060 BLAKE2B 977ffa0cfbe3a74e36208efe8d0542848016b6d29877cffd428dc1a21ad6b950edc27a70123d2ec1551ff1156f2de6daf3e4a444ec7f25bee025e4b0a3ffc107 SHA512 89248f439bb36b5abca3fb44f2c7f49de2c05899705bf5229e34d6defc13471206df8c7f74e644ad76ef63f7271ae34b54d29afa04144a468f1ef9416bea15c0
 DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
 DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
-DIST github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod 33 BLAKE2B 1ce5b6fdaf9b07e47e53896873b9ee4e96fa51c66a7a5afb3f48f34bf1b28addc5a5faa14832c24232a048b5d2b5ec0fd9af57997f0360105479550670b7272e SHA512 4fddb273aae34ba148c277266e98d174e04f5e888a1f59d44a86f7ec80168fbee85f245cea2e2fca44b29cf83f7a417e43b885438d7e3231c89604bb9f0a30c6
 DIST github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.0.mod 37 BLAKE2B 871a916a33bb06834a5841dfdcfa72654f8590a10b7c6f23470ef550643b1cb582c1a34a85a5e5d50868bbffef1ee8613fafbb08291d3f2c47ac7db0a22221e1 SHA512 1709593125db3818a7db588bc486d23501400b9b0960007f0829ddfc42337b7788106b99589de8f83d8f78d5141e029e75621a854bca86a9bfa6e43bc0952c0d
-DIST github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.0.zip 18331 BLAKE2B 6e3b8a89fc55fcc492c01b09784eb604f6379d7ffcbd706614b50451a3c20229e951c5078582cf6cf87b30daa35a3f4f70d263d2d5a44db5e437a0d20251a0db SHA512 20d8786f6c42467931e302af0919f718547378add30f66e1f0b006a6a2544ea94dda419d8491e9fa10a17af1692320fe7c8e464abde1581354b400add58b9a41
 DIST github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod 37 BLAKE2B 871a916a33bb06834a5841dfdcfa72654f8590a10b7c6f23470ef550643b1cb582c1a34a85a5e5d50868bbffef1ee8613fafbb08291d3f2c47ac7db0a22221e1 SHA512 1709593125db3818a7db588bc486d23501400b9b0960007f0829ddfc42337b7788106b99589de8f83d8f78d5141e029e75621a854bca86a9bfa6e43bc0952c0d
 DIST github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.zip 19483 BLAKE2B bb96f4d53637d4d73f8b2ed937211cf9a4a4a856cccb5774a473f59700a5a1cc494de2bdf50d89b5d6e6e98a27cdca35f01d3d841fa694fadd8edb0679dae858 SHA512 b669fe63d351bd7ad3fcf9d25c2b390cf98aa9e607729b7f747c5ae9aba5f98c56364ba8000cb890bb53e8a6add47cd768de110f67e32f3209a983de2e6dff04
+DIST github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.5.0.mod 37 BLAKE2B 871a916a33bb06834a5841dfdcfa72654f8590a10b7c6f23470ef550643b1cb582c1a34a85a5e5d50868bbffef1ee8613fafbb08291d3f2c47ac7db0a22221e1 SHA512 1709593125db3818a7db588bc486d23501400b9b0960007f0829ddfc42337b7788106b99589de8f83d8f78d5141e029e75621a854bca86a9bfa6e43bc0952c0d
+DIST github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.5.0.zip 20130 BLAKE2B 3474d0a8637653dd63bff41902c5394b112dc555542c5fc02a34ba4d16bd414114557781638b195e0fb2aceb7f7fe07684e7f8698091791cb8da251c712b1c69 SHA512 933b23c277b526a8ab682dde506c83adfb353008717e780c9083599f1ca03773c7219451442a4fe7537b6db690b09bd1aba5e8e90d5d6c9f18394fbe45a45dd9
 DIST github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 8c1815001cb2ba1108f60c9959fc87e81146ab7a716f48de7c679e793ccdec03d7324413333cf9dc6adae620298b5c637e0a126eeb6361c82ad16138749ea759 SHA512 5617723462dc0028176687327ac1144b1046a84c9bcf518e2c553a94c9549594c28345a5b875cfbefec148d625ff3525bfec17a97e4a84831dac4fd65d61f886
 DIST github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip 32305 BLAKE2B 74d764ea23387a10095ffb4a28ab3d18a92d16be8d0064fafd67dce3912287f19aafece2a977268dafcd68e65dbd21cdee595d34e57c5981f8d6b36b5a967e05 SHA512 07830cc66d1c178560114f9210266bb8a19a857f50c5a14121d55eabe25f0d0d2909a2a67fb1d187e370524075fe23a06d9835d81d95c28797777490f43dbbf0
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
-DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.zip 10848 BLAKE2B 6bafaaca5b1bf59ac01421e1726f48de06015b36217f9f08ac776428a9edf089bc64382b251be8a02ac537366542ab160c028af668316a0a821486e29b012116 SHA512 7ec927cc2547c8307631198f09d32507176af71bbf03e7192025798dfd34eed3a8350cc0c5b388069eb6f426352d0688e3ee4baab9cf78b18176eb7e46bfc09f
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip 13848 BLAKE2B dc2ec3bf79baaafad410ac2b4625dbc1c520803659b480c2014ffef484d409135ea5d09035669457162457962dc6b3532a480893f399b876810fbc1adfdab8e2 SHA512 918009558869443193fed748b3cc807dbfc540967d60e0315c74c6a09324d7d783067e0f21c5461ebadcdec3c7e6417522565a00e33617af8a8168281a0040c3
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20161114122254-48702e0da86b.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
-DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20161114122254-48702e0da86b.zip 93052 BLAKE2B 639b05573f554fe502d813482d68c3624ba40051ed5c2ca0c83e4b4b50d01dbb1d87c9a1dd9effaa428c8a35838a4d3baeca8154b3199a2455aec782e02469dc SHA512 9491ed618222e2fba7533691d2d0aa9dc020c4a2961b61878e090dd57f9a5044815880b608d703c3382839456cb0c98ba0afd80eb95ae8b9f7f53cf45b33cb66
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
-DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.zip 104092 BLAKE2B 34bd76adab656f40017de5168f2fa1e0f3eb524c3ad9996b7354de8212c54acdc7b0ac7b99c69b71824d9ac9cc263aefe8220daee7b86d96d8b7f323fa6cc9c9 SHA512 4ffb6845abd0ea7cb6ca96a3c306b76b59a049f63dc61e38d5cca6e16e7e82c38ca04b5213230aed92d85b89da76864039fb1706ed15af83e8301c4245498322
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip 109838 BLAKE2B 82e02c44f4fa60aa7257b79e385af47e23508e260415f0f768e4f7aac6a5962c713488458a50f1bc98308446ee3f45de973d5240811dc5a113e5b9577f33bab3 SHA512 7acd6ca00d067e6a81fbb12697ae9d46fa9880834934065549bb23671153012a8596d4c7875705578ca58a259ff81b1165e45aa65c93406d2c324c61954ea4df
 DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod 91 BLAKE2B fad30507d91fca15291c8f13100206c9d9eae4f73ca4034e37de10d1494b42b03535540ce704582cd7a4be4ffa2685f778ac9cd3aa647d6c48d8e6fe33a345cb SHA512 54e3700ced7222d086eac5a73a5973147473e9d063a7a8dd719bff2dbe3d61d9e4cd7427f30c926a2289ef53948f158bc09e189d9714f0437d446f7c30d0cc6e
 DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod 91 BLAKE2B fad30507d91fca15291c8f13100206c9d9eae4f73ca4034e37de10d1494b42b03535540ce704582cd7a4be4ffa2685f778ac9cd3aa647d6c48d8e6fe33a345cb SHA512 54e3700ced7222d086eac5a73a5973147473e9d063a7a8dd719bff2dbe3d61d9e4cd7427f30c926a2289ef53948f158bc09e189d9714f0437d446f7c30d0cc6e
-DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.zip 116823 BLAKE2B b33381de26ca23c0d218ecd16b22bcf13362635348a4c9887ab2c4ec803e0dc2996833eeab85b327b838a234198dcd555dc148a02b8b1282a1dab61e44e56c80 SHA512 4aeae5f35d7de56c2e693fae7eaf6f418745b9d9b8a7652bda4acd6c2979cc2cd175c4809386b7e762d9c243e1504baf82aa4e4dadd7bc6050d2227a61510b7d
 DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.mod 91 BLAKE2B 75d03e4a6fc970743c11a4a9d52dedc93f72b3dd3052c72cdd660af9df42b014f48ecd65961248e3b20f3e258d1ea36e058879a7039ea58441902ec5f339e382 SHA512 722430decd4f1022e8b035bcc7c1ed295db21a3c64f9dbdf409bd0442356664d378d4af37b7de828c02453014a5a9ddefb3397cbbbc8481c14179ecba9499a5a
 DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.1.zip 120665 BLAKE2B a4a827aa46ddaa2f2c5edebfd1a3073d9e7a2df73350e3911d13d0b0e6fdbeb350b43b21247dd352bbde10e4a70cc055c2c787d279742580a79036b3e85206a5 SHA512 ec784c6edd689968aa88bb5eb3efc096e9575b6472ddcbb01f0a57954ceae4461c6255242adfa9fd6976ec60ceed721ab2464c6d4132dd9c98ef3a588b6bd553
+DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.mod 91 BLAKE2B 75d03e4a6fc970743c11a4a9d52dedc93f72b3dd3052c72cdd660af9df42b014f48ecd65961248e3b20f3e258d1ea36e058879a7039ea58441902ec5f339e382 SHA512 722430decd4f1022e8b035bcc7c1ed295db21a3c64f9dbdf409bd0442356664d378d4af37b7de828c02453014a5a9ddefb3397cbbbc8481c14179ecba9499a5a
+DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.zip 120397 BLAKE2B b34e5bae7f632d263c866a599ed6eb9058636e8c69c972409497acb9e93ae0e5228899020c507d9041080ba8c57b8a8dd82cf74cc409edfb19ea5a3a2d6b6d4e SHA512 52b3913281e95bc58c31efab3112186e660ccd74b575f482ab6e830e7331aeec8b92778400259114816ba58648463f505de42c5aaf322a30184a8aec5a08b1e3
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
-DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.zip 56040 BLAKE2B 371b6a37ef8bc88baf94d2a0b95d59454b399c862107cb8b1b30af5cdccc9fff1ee5e400e19d362d0c89203f2c8044316bf853322e05312b5c7a2ce961cd90bf SHA512 2c709a194dcab81cae05040cdef59a21e9f02014cea998dd5957180ff3a28f79607d15c61ce03b54be4a8163c4d5e60f86a5d07012df0f206af735a8d317a6a7
-DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
-DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip 57784 BLAKE2B 1f6e54681c062413577ca873cbbc251c2bb9df4de6339e1154d6b34aa146136ff9464629e419bea7f75afd9feb8b50bddee965160560b25dc5b4041e9d30072e SHA512 4e0f838a7752838dcdac70a96235bae7aee51242022ec2c27be99f4af7657ff5afda5b710be81e25539d2712e5644211689b556e9d8971897ab9f8bf1d3845dc
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip 57782 BLAKE2B cdd50ecc0cbd0c7e58f3e6ff91cd26f7a212f4f62cb10358e1729b6b8be346390f1659ec7443a0c48f280c4a499f399b3ab3c03ba897ba8a7a61c336ff6f7c29 SHA512 e0ac39873cc584e40df505c3c01d20771d3a5e06f1c2c78a046971a220f029795b4cce7da71b497bfb618c0159897640c6606a4bd0d446826b142430f7f66204
-DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod 94 BLAKE2B 94e391c9c787f7b0b9d238f1fc61ac5e90d4d6658f7d60a4c143bbeae999ea0ca23d28f2ca204523e44b61807afa23e8690af850d14203e5755717b0a1f5981d SHA512 b54a3715ce2745ef68bf269b09d458d3712d8ec7a876eff53f5c171d23d992a5391552651c56f7adf5b90a356bcefab552a7ef8dd3a0d562fd396434970963ab
-DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip 8850 BLAKE2B 9053d9c01c92faa257ed0623eb06b27e7d9d93ff9c155ce862183bdb9da6483d57873290eb5bc7bf8f906d7b18dd29d856a7cfabec69b84a2f5400f6e43c616c SHA512 9d35a6f2ccc2b51fb2561891311d5ab33737ba76c61f190fa6b4276eadee8b09d008b2c925fb8dd5bf9202bf3e1ec944c0b5026b080d2adf050fbe8e88a74def
 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%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
@@ -343,27 +386,21 @@ DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 6450
 DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
 DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.zip 19702 BLAKE2B ee009befd8861b2556869434d14c1d4ce130d432ba5f43821b0cc2f6fa493bc8a4f93a011f05f5789f7c388b2a74f272623d6dc2689a5c29dde0b3c307598173 SHA512 d7c39c78c074d060973433f5f4c1405260fa9f49ba9ff020630bb17404412337b536275aac71ae30c0e3783b95585c46cc492f722572b941fa1476898a6f7e8c
 DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
-DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.zip 19233 BLAKE2B 72d5eb2b25cc20e8f22d29948913981975ad9b19669e4bc898b380e946e73b2ae7791c9bb14ac69a6949a28fa4b64f0cf8e2d8c08c5b647119b33856f8b00d51 SHA512 e2c2738bf03022c96e739fbfb9a43c19988d49a54e45eade73ab9b8deaa9f94bbcbbeed910051eb370699de1519da9d5d2ce7c42e22b9d15784b599daf393d4a
 DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
 DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod 45 BLAKE2B fd78b551df24aaa503a1e3a673291776e988c7975ac3bad69beadbec7ac5c85675da6e6da9deb4463535e1b0ef0a3e640df6e7ce771de71f033f0e7a3f67a1c1 SHA512 9d9af0844e5c76f84c3804b788cd643e461b02b8a00fa5a41a6238dd72dbada1bb03aa3e7e420f0c68d9926b9cbd2d159456f26ceb64f1c51162da939742d0fd
 DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip 8869 BLAKE2B 9c466fbe14685f949b792015995e38f276bc66f3f6ce8df45cdce9b1fc362733b3f0b08de7ed393c4fd89f24a48e4bfe90dcc8302af8e636707b07da769b4e8d SHA512 e8c8cbc63aa82d0544634f3aae9a4c94816aa5797bbc1946aff148b19651bea6c3c544add0ddc644d20eec3df99a4056bf11f7f9dd83943c53e7c443cc393eba
 DIST github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod 28 BLAKE2B eaa8a9fbcae0146b856a3049263745784b408c86ebeec08966f1f51567eb6185a58ac126e1c2cedd76fb83904c2011e30be079eed09c1ae85184d3524fae2cd4 SHA512 26d198660f3090f0b407efa5c534e963fe98537117ee3bf8ce6b28d84d4cf74320abcfeacc400e873ab16cc28cc0b158b451526d8ce22d08e98f8c5c473423ae
-DIST github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.zip 11682 BLAKE2B 5f17d04b4df27736e9a5b702161191a55bdfc4080418d5c988afee7fa3a40a2fe11bec911b0447c7c2e7034cf508ae8b60da9bbb4bf42e3575c8e13ee210cc25 SHA512 0792380e113349fbc0e9145fff28ba29d26ed9e0fbf190e4c8e3f58ed4c7f72bc367906547d361d8f9637d93b0d98c47de36d810a0acf2a7159cfa5a85795d0c
 DIST github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod 34 BLAKE2B 9c3101272ec15930da5985c33a6f623be604c73281209793ab20276863a7552efaa8c1a9167e0a5ecdb11a4f713909be8dc12103ced353d21d19e28693820fb7 SHA512 d93e8325fc82633cea4ccd5ca7df21c9d72d9a0c79dc39299008d7b163fcb67a7f9bef8cad2d2a5c268e85c41ee8a54bbf4657f0f0ecf20b211eff7f1e5b3b36
-DIST github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.zip 13713 BLAKE2B 1a669d3052490ba36c05018d2bba916ea1a7a484f506917ce6a7188d8c8afc996f3c56dadebb478a34bdc576f991ca3162c19d313c66d11c5daed5d5de4fcb73 SHA512 91e4173c022445726f9791734be30e69ff8e3ca60068605bdfa98a29a6ec0544c3a945963ed20b9c89a892ceaa3a919504c808ec52a0a4b201221dfb4dce5d00
 DIST github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod 34 BLAKE2B 0b56809cf0ed4e3bfa7b79df2e82e247e083dd3b7467cccf31efed7b2391c817a41eac5e85035ac5ed806bf19708c62b54f634ecf6b5ca83d5781f40a593dca2 SHA512 ff1020a813cca721b7c41d2d4c3fd1924af07afbe798d352a44b07486dff9d823f8953bb011ad3a5b2ad87baa4bd1baa97be1820bd22bd98d37f166b4f0bd9bd
-DIST github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.zip 18273 BLAKE2B 97084e9d141f8ba48530e1f700214e0032c50f288e4a3033d6c30ab854c968e9baede55d3a96450b00b8d6d71f2bf4d2dabdd30741251501af63f851c33fcbcf SHA512 70115fa31f441bb4733976a1dd22434b4ef82743d6b629b76702fd59173397e166ff68418fbfe6c17ed341397490a23150829058ceb8c9128b3a393321af05ff
 DIST github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod 35 BLAKE2B 9f1621229dc76bcc02487adf4642116dfb391ec3abc3fe408364eab83a969dd8219ae0d6b418ba181fc3750799ec55fc49a3e3619cbc1d09e11063ad85b61a5a SHA512 35fad2e2c4120e7a4a22b833a1e7c4c78a97498140a4f8d1233acf1cef5936fe45983217d45f73e5ecadf2c1981a0bf1952ea340e987429d3114b18054786c73
-DIST github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.zip 6856 BLAKE2B ab83b9f0b52aafc0655390e54af2633c004eb0852507708831ebf73678b0eb7a6a00b516eda7a11f6e426dc11addc8d5d5116f3f5ed14ee03c2eddc861c3ed2c SHA512 cc30db535a2884873a7584f44342a9df097e16ec0c9215bea5b1523394d2e9bc223b52747d127ad05f566728b93ff2cc2c658763f8acb16de3ef9088a15309b0
+DIST github.com%2Fdanieljoos%2Fwincred%2F@v%2Fv1.1.0.mod 90 BLAKE2B 0a24f9a2c83c1b9025634475d751568c7bc19debd6a8afad575b380a3d2c0ef96be606704bd499a73c2d9c8f9d01db4044fba2675946babf8abc887cd71a9be2 SHA512 fc8636375194f9bd930b3f2cde2fd77aa64f19eb54caadf65a1d1e10e2454902bdd9041942e9960eb9f84ef22a2838d581894d935c25d0bb837aaaedb412296e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 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%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
 DIST github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod 43 BLAKE2B c7642acf73b5b5f2464b0171c49e0f272811a7d08af54cbd773da1c273552537c51afa84935f5bc682ced8c01668606d822506f98bd872f61bc032be8fe8520d SHA512 0853d89627b3b96d9dfb2401800def229674b13e43653636574b55b9d754669e6edb52273cd8ea844a8f4564b9de1114a66e944b98e2e0bd572db9cc689d582f
 DIST github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.zip 6384 BLAKE2B dfead99a3dfafbdfa7dc97a4e38254d68c5e9cdbb6f21e7210925a097ff32169a9139fb7ae2699bf72a7a358fc881281794a175cb13458e6170d031270f203bf SHA512 16597d7a11876c94c68583833c1b3d889b9bc2ef63095cb094ed6256996d4cfa39d28e551f79ee7ae330c6f2bd1b27af6521d1f0244e45a6d8510f357f545109
 DIST github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170629053852-f6cab0c35083.mod 38 BLAKE2B ca172597deee09bc6129ff6d8a27b70cd49f5891f9db37e73f1178996255cd0548405d7fdfcffed3745777a332d3e979195e4da827f45e00305725f119332cc1 SHA512 086ced52944283fce02fb1b53de3748e32fed8a90dbab1d69e9ade5ff40c47e3fa1277cb3ce7bcdce2dc36d903eb52d3d3e723801fa8f6265736badba1ae935a
-DIST github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170629053852-f6cab0c35083.zip 224706 BLAKE2B 7076c3e6ccb18c246432807caca0bda953e52396bdbccd5bb407f2e05567c58311f412fe25c206d5ce589b993c565ab01c3017036d374f88c7158341ed18eea5 SHA512 a843ad7668de424872be33167a78d41662fe32d3cb04f59432075a35efd68a193893fc4069882bda802b30370f7e9014f651d894e39cb771db1a979de0e16840
 DIST github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod 38 BLAKE2B ca172597deee09bc6129ff6d8a27b70cd49f5891f9db37e73f1178996255cd0548405d7fdfcffed3745777a332d3e979195e4da827f45e00305725f119332cc1 SHA512 086ced52944283fce02fb1b53de3748e32fed8a90dbab1d69e9ade5ff40c47e3fa1277cb3ce7bcdce2dc36d903eb52d3d3e723801fa8f6265736badba1ae935a
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
@@ -371,26 +408,23 @@ DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 57069 BLAKE2
 DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
 DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod 32 BLAKE2B c96afb14f9809bf9dae22bd2260c31921b0435d4459b4386ee016514b84580aaec258fb1f8347fa6447524376de742135ff87b170f40cbaadaa41c41b553ae25 SHA512 320a96424fcf2296f59f8ba247cc9dfa43c35e2e500fc1dd990a69316d4ccb68437e4c4f98e849173161490cad216c15eee039134b3028afa7dcf82d9b8e6423
 DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip 27506 BLAKE2B 0c2accaecec1942bcb9febbe1986e283e3e84e82731a847711fe33031b84122a239561bb6bf7c35015b4bf3c53b77879d44a52ab1b184c5ed37ce33c8a418b32 SHA512 f445307fe15f2abdb2e8c0be22f1c180716411d413b8d27d1b46f00e5ccc49b963a7bc675021e03831fede8470b3c0b384d0cf0f4736256114dde204f5a56611
+DIST github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20191017083524-a8ff7f821017.mod 29 BLAKE2B e7c2f5d22f88da5836f4de5c23e6e1a0e1eeb43e7d6b49b79e25a2b5d04b892ad9dfe7bb174c93cb60faf8e78683af6b296606371ceaf7eafba76a85a6b1c73d SHA512 7681fbfbd36f2ab19e01f6e38f899cf538fa34e4abb34bd38660459d9060367f49680c85f75da08f8d3e7981e9ebf1f911db26e31e1ab44f451640e435cfd877
+DIST github.com%2Fdocker%2Fcli%2F@v%2Fv0.0.0-20191017083524-a8ff7f821017.zip 2122054 BLAKE2B 1458b507febdfc4d2ea66830d39f3a1e35035e8e5eafda45de5e97ca67f0123134490764b8a37405218357a1d1770404e073cabdfc5d3a5dcfc1bf13d2e8f440 SHA512 7f9c62b3ebbd975e69b5a8117702d96fdfe8679449492a7de1a81950bc2023c5a114a64f9e534ccc971331f5c04ec0faf0874a47aae532d8751785ef260fe2e2
+DIST github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.8+incompatible.mod 29 BLAKE2B e7c2f5d22f88da5836f4de5c23e6e1a0e1eeb43e7d6b49b79e25a2b5d04b892ad9dfe7bb174c93cb60faf8e78683af6b296606371ceaf7eafba76a85a6b1c73d SHA512 7681fbfbd36f2ab19e01f6e38f899cf538fa34e4abb34bd38660459d9060367f49680c85f75da08f8d3e7981e9ebf1f911db26e31e1ab44f451640e435cfd877
+DIST github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.8+incompatible.zip 1875439 BLAKE2B 43c4fcf0abfbdcbc4b67e9a1e334ce8f6c5ee5f120a1f74f6334da267da7c4f9fbfab31bc30cbd0a15dd40a6a6e2e2605b539b3a96a7fe57b957eb9ac12fb05b SHA512 bc226854a8a98d68a73eefaafa2c8f5fc6e499a52f4a89433ff72c6bd988e1269f52a2fe90bd23760381333ac4458f86099b20c55b897119196033ca6ce255fb
 DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20190905152932-14b96e55d84c.mod 3136 BLAKE2B 7f2d74332ccfa9e92678b72ecbd9fa615c78924d6e8a7be0690cb11661d2a86ce19e97ca5839e848439bc91709c2b50d8d2f34cc91e50288cb3fee1b3a10a926 SHA512 5facb46a2728b34cbc10c9b1ea5f46da1b528e21214dfb4b12ce01de682d7340ceac6dc31cb6d840c6f596cbd1e2efff4003030864453d70280bba40cd256d9a
 DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3
 DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip 662227 BLAKE2B e9c50aec1dd4d34aab11819bd341b1f0f6fdc32bac63124930d45f76f0259aa5e1e4781bb408411e643574112ecbe57c3b9c4c5fe59399c153d48dc5eb5bea41 SHA512 aff78c88f3bdb596f1855ab993d8ec3315de9d4809757e2cba6fe22ad4d5dc220242f90e73d9d0a33f9a13521705b82c8526082e26c752fb027dee4b28299d52
 DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3
 DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1-0.20190205005809-0d3efadf0154+incompatible.zip 681938 BLAKE2B 62693a6170e7f843812aed03d05965ef0a7f1d212029239924385746efbef5d4df3c649e14ae60977805063e521c0b5c68a42f32e3b8ae131b438da4d062269e SHA512 7280b01be97dba11cd18c2cf044dcd0edbe9ef09538966cc3d92d27400bc615f8106a858377e8f9c80453e8db0449829d4437fb371aed5bccda370f12479a621
-DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv0.7.3-0.20190327010347-be7ac8be2ae0.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
-DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.13.1.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
-DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.13.1.zip 3923847 BLAKE2B ac6d91db49cd6dea66cc426efeda5291441a8158909db74802995ab24b26811db5347ab73c4b85a8d16a7862278366a8a01e6729e07e79c540adb83ba22344c2 SHA512 209a22b6144122c66c2f35dc0fd043a2aa2689b4d66837586111d1ddf63734f567681f9a18420e7f57a93a170cb4091dba8dd5dcc7314919eddf2f1671e17e73
-DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200309214505-aa6a9891b09c.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
-DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200309214505-aa6a9891b09c.zip 4098646 BLAKE2B 1fd8ad2154cbaba00a20802770a9d5a29c48fff9c697c9d9179d9fdaf160487b43a8ee7314eabda6c5494bc07733758a529ba1a77adaddaa6ede1e4d757f0ab8 SHA512 0b7571ce370d56f6fbec459e5640e7cdada0058285217c23c6e8dce0d54639426a042b37f1b65842d78343b0f395f7c26168e77e21b5b0c54614692e8206c029
 DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
 DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible.zip 4176905 BLAKE2B c8cc05cc1e0c571e00c128ba5f5f7f7d86ba34e2f1f27c9695c1880a7d133486a31d4c5b56d7947cd666c0e439afb8bbf1d1d1ec72a479c544e8542dfe69c511 SHA512 deb4affc52a91131497e3dbf384534b5fd2dee5596d4d5d07a80f1fd28d29e954d739e77891661e32b252201222e15cb935f0b6405a4bde1783ae6bf940a2f32
-DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
-DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible.zip 4676485 BLAKE2B 153623af229492e49cf88ea288bb95e0c051e6783cadce1b474cade435c5d4d75dc435a25c7065851e178509cc05e47e9bd01f6860b053a1be511fd97243527b SHA512 8b195f180585a8009192318f0caabd1c07f3c1e0f4451bbb76ec9f5a5bda4b9e307ee95b387ac5ba8e8edcf2d117767d812d7c8c6318b7ce970b001af78ab421
-DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.0-beta1.0.20201108103107-c7109494fe65+incompatible.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
-DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.0-beta1.0.20201108103107-c7109494fe65+incompatible.zip 4620471 BLAKE2B 35c2caf2afee77ce16d3d2e1c98fc58f1466b5a40d309220b13e602b477c7539dc43c85e2deb3a78661f13c44d705e87a1dcf3ed007f7d41b9601fb7cfe962e6 SHA512 6420df37a5b6cb8555b47be1f8e645fadda67d0c7b5e720fa7a1f3cdcabc38da990440739147d2515615288fd88a0c7adf11ca3247a9897111a87f72e1fc5136
 DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.2+incompatible.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
 DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.2+incompatible.zip 4563829 BLAKE2B ec765cbd94795158de58d4b91b7fd6261952a867206af07b4b4b24d5d57943e5133f212736d4873186a2be7a5087d402422ab1403d7c3741573ae7eefcde5c61 SHA512 801c33f32ae134529f7e8451e81aa8d24f6ce0ea01f48f36dda7183e2bb29cae8b92b530883c8f96d38affb3b33cf6ee3c758a0ab9966f5caa80ad67d9d2edf5
-DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.5+incompatible.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
-DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.5+incompatible.zip 4571399 BLAKE2B 01e24524ce18179649f706f1f205ac1a98be0d1803f8db4c08dea1aedbc742f418fcb72ae34dbf7c7f799d6d579a3187f98d97f2990edb9f82a50c0bad443ee0 SHA512 3755024e1c4e5f17b10b1527829147127060d594467fca5da55d47c26ea4f79669caecb1c54842ed609b0a918b51fd0b80f74093c3c020350893c4ce8aa38e19
+DIST github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.mod 51 BLAKE2B 324ddf12d16d5c0261f3700594d6a352ad79601237806dfa84179ff6524b7f8f2f7eb13326ab6ad1f7c22f4a358372de89f4f257d5ff6a702e865bbb56c45274 SHA512 a2ad0b6ddee7601a260905c3d146540292ff3bd69b62166b6b4ae1d25f4f0c8872fe144ad4f3024d0d9723f0f1c8c9ae7bf4e2c6ea5f30a14161bee94c3c06b1
+DIST github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.3.zip 41818 BLAKE2B 6ca108ca56e91e78fdce88d8b76b1bdc512b90094420a835ffe12da142cf77e44b34abe20276262f65574697f2b1ffe49f3a1d1885fb68d5c76804a7c0669967 SHA512 c622c80c2431280c295ba6fb7f1cb0306a0156d4c2a118d5e22294a92b5bf30cf0230540a979e94abf6dbacfae2fb9298384555415d1efb0a2c1a02863965efc
+DIST github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.4.mod 164 BLAKE2B 98d2cfea4693193f4ed90e3cbdfc20e607379f927fbd0093010177c769da53dac0e89b2c0fedb7003a785c509d0b8c70ab6dee84ee60ac48356d78f92fe8bd81 SHA512 d56ef606352ed3ab1e7f9e41f045aae08ee882d075dd5612fa3fb839e05243d1f365f6d045616ef4ac983e8585129a274624d26b7e8466546854e50e873174e9
+DIST github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.4.zip 42413 BLAKE2B 7226b21a60c88755c7a67767a41dcdbbf803457051fe063ac02bf7383f6260aea52aced8c5972e4b58d00ed74c2395c1ce41ca90a9e8d76349b6e9f133255b6f SHA512 3e4eaafca9fe197e10f4f9351889c72ec37871200325400080e67e8b670b589ee3016444e05b800a5a7ae82e427507019179c6e7b307f998d3a85f7a553aa5f6
 DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod 40 BLAKE2B 13f8b46e2e71edb04180a1734d63e1e84dc75661ca635d150fd2bb8b1213df768520fc1c5cffa7a9cb224cb11788efc5242dd85138915fc21dfc9ff95b1d2737 SHA512 721f6b5cc358f8ee7093f7c80e4153ebc474f2052bdb3a91bf2a4ae9d2dbd2e2e50635a5bb8f9b62bd8ee7a0b7420ca9f18c60abcfd5287a953ea63d21aec53d
 DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip 43214 BLAKE2B f64253be261a17ca9e2c6540d70b159c89b5f578921a7f6287e39be2a99fdec8b67191ff06315e5539585ffe812235ddd90c4a9754d8d63e512fec1991297709 SHA512 a61373f6a66f0ffecd3ffa78a99e6d9560419ab325f12101ae90f2623fdcb2e10adcf274459191263e1a80dd866fb98388434f9875c52e42dfd646d3d25264d3
 DIST github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20170721190031-9461782956ad.mod 35 BLAKE2B cb3636f6ba689ab17bbd240c10dd1f1f150988421212af1498f68fcce3250f61f1dedf1aec95c5437ca7ce92c26ebd115d1b3a16da55d07cfa423871e6f6f73c SHA512 ff56a30d40408c088c121984ad3ecfbc1214da641baf359fc36b8a3ae50ebfac8b98add4b9e4a47f8e03f586800fdd9c268582e581bf99e95009abdcb4e83af3
@@ -400,7 +434,6 @@ DIST github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.0-20180209012529-399ea8c73916.
 DIST github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod 97 BLAKE2B c4d40b36cb5693e25e7cb6b9fc7043d0506257d180af3fda684bdad39f566ed75fd711da2e72692dcdd093641ca9919c5acc52678924452dab7086fbf0b670c5 SHA512 8bdc67ca174552ec0f0749f47600c107f88689d8db50c5ee801d5f7a011c8a0ccef00de19d2d47f0eb0c3932006366dae6a1630a3cb10d6052d0f2c0342f5c85
 DIST github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip 24020 BLAKE2B 0fd01cf85ec53bc0990b055ed27586071f79518b3e19f676d6fffd638541fba108d40954540f011e55a1e67f260d172f4b1ca54168bc0d2e69a0615abe99b76c SHA512 359204d3d09a9a4054303e9495130ec2835cb00d55ee3d6e97a4386600a9b5d13b5b3f2f576e9ba89880047357c901267f2a64a6838f13d8ee214bba90a977b3
 DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
-DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.zip 13789 BLAKE2B 1961aff6de16c83f1a771b94965a6e5fc95a951033d93b576cb1567b008473b5fde0a12078179738a921ec88752621281a36137ee6719d4a1110ce072f450bb0 SHA512 66587313fba838dcea2a00bc81222924d1dbf77bfe47b7ed0443a071c249f14204b8e0765146f060009c8d840dc802ff701d6905a4c05b816ded9adbb0a0e981
 DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
 DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip 14089 BLAKE2B a825c998f5a7e6432a9d23f49fdf9d8559b8664ce6508468540530efe9585a98400bd38681a24b5a8b2d10b13c4ad91216f6c71153e8c597e3d2e8c8472622e9 SHA512 294682c312e079f96ac920c3f4e3dde7211e36622a378f54f32483e032f4df6f54a1f7314df7c73e2b7391bc559003ffe2bdb97380e4507aba7620ea4123d872
 DIST github.com%2Fdocker%2Flibtrust%2F@v%2Fv0.0.0-20150114040149-fa567046d9b1.mod 34 BLAKE2B a4bf0454b86b8bee83b8b7c1af18459c17c527c3c30546cab6d4f3e950cfb7336d70d7154c2b799307acd9df81bdd341722555ee7f91a53a8604046039f3f337 SHA512 d5fb8a4b7587a35d372e8f0710899a7df4791ac0f0a7fb96b8fe2330a6d676ecba8903aa9c86d810b0575e61b98543bcf1ebc24e5961f1947e934d6acb121736
@@ -408,10 +441,9 @@ DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.
 DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip 44017 BLAKE2B 598c6308995ba7e6874f08c56f5453d4f3b68146ee29fcf7677571cc07d39a8bd4b78fe2d7d706e57571f00807476be399b08104a0a8bc3b75cc8da6528747f0 SHA512 bad8443888a33c8ba1a18cf07b09d7401067b6924a2a076a00efcdf959a5d720c2040d011d0ba6d6f0b0844b9605928d9798e57a0ac39bf08c0856cccac317cc
 DIST github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod 35 BLAKE2B 03d1120023db31c39a39e5b7f336b05bed30e652c890e12986c81778e49c771e97e8ff0dcbb053f00627ffdb229223b385a9524fa1d35ee83860ca3e0b0701e8 SHA512 7f90935b89bc2fc83b0f52d0090d8cc3f7262415b1feb9c19420f663da4ab8d87bb5cf42c2a558038c57e3e772b468132509b45fe40a4993d0b64b80aeb64ebf
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
-DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip 26646 BLAKE2B 408dfc541d7bd0692010d6071f96db972dbf84b0e9dfe552db221cdcc4011f023dcfc12e7c9657696c9ad204c6587404f793b4785beb78d53462764a2da96c5b SHA512 fb53c8511a1538397edace6101699904f19e63b82143b56754ef2a62d457fd34f6bfa907d379964c427ad8b7d38fa9ad186bc66d4a103c7f118b8734324593ce
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip 26356 BLAKE2B 665fb778605fc05dc686b59a3ad82a6df9020017243cc84498e4113c7b18343507a0084cd67febc329fa6b44e675696f99f632cd282ead5bb06f93ff3bd50bea SHA512 88e19d0139de7de602272e14586a99eda26b2867ea60ef56b517d13b37c0d28b1ab62c05b2f9cf1a9b8dcc8e5afa9c915baf7a30b0f17c4fbd47d5c71d0a3965
-DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
+DIST github.com%2Fdustmop%2Fsoup%2F@v%2Fv1.1.2-0.20190516214245-38228baa104e.mod 31 BLAKE2B 5c720684b2f861954af7fa9bf060482983089c79ca1c3670f756859f9dd4dead90264af62b750667b6de46595cd02a5773b4973c598f0a55a2604001d3348d1f SHA512 b71cce635305f0f96a85cf5e2f353956159892bd1884bed73470e543e59bf37d4886c888ed88b9337b8867a481eb1aa882bedcc3fca489f851b15395ee7d914d
 DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
 DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip 127557 BLAKE2B 1747b001bc860fda3bef9158f85863e56c8751834dda8160e80075efd64079059cd088e6e31c3e951db81823cbd33f4787e55b5afca96795707d20b00d09d2da SHA512 d64c47cb432cdddd39ecbd6f53a431ab34eb1f17e95264302b8708832166f847d81dc650e9a61475389b33e0b5b08f8f7402258d1ae927f4fdbc2cd098326e31
 DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
@@ -420,16 +452,17 @@ DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip 111939 BL
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc51330df71ca612b3a573a93a8ebe57ef4e677157835221dfc5f7bcbada1fd90f7a6a3a002cbde08c6a95642477789d532ddc80e7ecae1f9e6e7c081364e970 SHA512 323c4b1c27bdc5bfb1795f1353d21ad6b7a2056bb0b364adab5960aabb7bea20ab3287ba60685df130abddbd66c3d82dc98a291aff1849dbce8c182c63c7b0bf
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod 543 BLAKE2B 35a7d739e1bc24c321c5732b27fcfc0bd4ef872610759ae867d08f2dea85e55b3f515698fc48299902703b7a8cff9658f30f855a6b472d4f4945f38101ee42d8 SHA512 b52cfc5fde9300a89cb4e59585c549582fbe75c33ca19fe06d1d8797216fdccee4f35a30fb794f37a16ac0a5d54dee0ce53fd938073b42b73cd96203b3819c61
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod 543 BLAKE2B 35a7d739e1bc24c321c5732b27fcfc0bd4ef872610759ae867d08f2dea85e55b3f515698fc48299902703b7a8cff9658f30f855a6b472d4f4945f38101ee42d8 SHA512 b52cfc5fde9300a89cb4e59585c549582fbe75c33ca19fe06d1d8797216fdccee4f35a30fb794f37a16ac0a5d54dee0ce53fd938073b42b73cd96203b3819c61
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
 DIST github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.mod 38 BLAKE2B 55b092734c1c1ffe4a614f50b6f975baebcf53cd4884bec91fa0a3396586ed9078d91e2818761c9b9e6f8f299887ba3674c0cb0dcac1dad1730f7dc24b1ef8e7 SHA512 0659c91f44e4960f7aab32988624287a19897b02efe1766a2aa630ef743b5b84ceb42ef9c674c831a51872948cb78b496c8f954e51dba233cac0ad93813bf2bc
 DIST github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.zip 6871 BLAKE2B d884fffa3b66d3494bbc0e1731e98c5d977ccade812e79be73e999b2cf595b8bc142daf68c336336274d0414e0e17f5433d32eaa3e28212942cc9b7fb00f54f0 SHA512 5f5e745b35939dcb8ae30e1ad00bf25e9b1c8d47e91823388d2c2691eb619d19d893df93abe3e4555ea026dff2823e65836f3a5ce55dba3a69ba4d4617962774
 DIST github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.mod 39 BLAKE2B 869effe65ac30d12ea51ff1945c803b1eea65547381e0ad01f37bf8a68c263a3793e03c7dbcc7cecd0c882020e506cd8e1f2afe187ae8f9c2cce03b5fb9dcf47 SHA512 172218826ef7cc862b47a76156818293267308e8193a2fcd7d0a56b67397f9ee8bd3cf136b4e94c6cf045145189d9a579df05a48c7b413d220d6098940792eaf
 DIST github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.zip 12175 BLAKE2B 591c1bc97cf60adb577353983f12eea0897ba836ae9f3d40212c00f8f1d7107375b53449e0ec0472ba5f9bb365be188e05ff74d0e0ff3e5b8f4f17b8b4bfc99d SHA512 65dfa8dc30ec9348bd2a027e29e279d0d24e66e34ad550244340a6a2a775f91c4539478eb14ec7d7041a0f9b8837d8b4c125675c7498f9ae832af348f6870f63
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.11.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.11.0+incompatible.zip 20688 BLAKE2B 2f5a99511d1adf2e5bdadcdca5b844885875fd23d7d59cce18c63e356c8ee0e8791b1bb0c698bbf7e61ec8b775d1c90261546615fedd4c71007507f6e5221de2 SHA512 ccdb935ec374706c3f53a86a61144c086f579ad918bc858b543d27b571d6fb73cb6d38daacf22b6b7be5169c4fa20af2fedd604fc016979ea62371525d7b9524
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
-DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip 17890 BLAKE2B 78d64a15d328529200d05e6830ae69d4976e1d61df1f335e18e32614b64727b88f008e0369292b15ba633c0d3e687f6baf4520667f22cb9baf8f3140ff9274c9 SHA512 c83ecf63153e35f4fcdf9a35528a3dc2205ead882053682e2ce8d35f1c57bbf60aed92277b2e599bc25da96c1ec3563d7f20505aaa17e78ae5e484b20c921164
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
-DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.zip 18363 BLAKE2B 489ff272e19922758a7fb1b4718b0f409514f24999ff4e49b75c301c532ee8f0cb3892cacb98dcca51f58ed27761d270a433eeffa0a6be5ef9ce6540aacb5c03 SHA512 1ef2ae9897702e9eb32b2ccbf6717ebd92f647ba6874de1e4f1fd8ab668ee14e098b592d6f8b9320e5358f090bcc7e39e6c708c572771f05245b9d4a679b98b1
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.9.0+incompatible.zip 19896 BLAKE2B 8ca1144d10319091d11cd6541176bb21eb26eea5aea52c0f09d919d00ec7d324910e18241736478ed91a21744252ea8da374abf5963e7c5d800628c9ef49e312 SHA512 4c11818589ac5f5ff12ece87b49ce995acf151c87e96d1b0a8bbb9b2326b30e2166ffc5da7e19a59f42628948fae931a15bf418a702e4606779ae31925bdaf0d
 DIST github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod 39 BLAKE2B 7045e72ec933bc321a8d41526812f0f7daa1961fddb7c5a569a4b104f8bbc853b171ccc52aed36807c71f188130a5810a49458a3807d2c38949f625017421520 SHA512 2b1644078068dbd74ed69be1be7ff08e3acac8fd53ab723ef2f9f2243b70fe60c9dd427cefaaa5364a93fc8890f8c906fa8d818847ef0b9b4edd9892f2d2b2ae
@@ -438,27 +471,32 @@ DIST github.com%2Ffanliao%2Fgo-promise%2F@v%2Fv0.0.0-20141029170127-1890db352a72
 DIST github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod 34 BLAKE2B 85d050ce327c96665aac0e7954761b42f6d30256c4620a15a171ae3a92abf4ed45d026973d9d74fc07b90617885d2c002e45cac9a38f03f12018d86c091981fd SHA512 547267e05f39979e80906176e520bc4e74e48f9f96ffcd9d862f974972eb8238b28ed0a0ac891e3e0ebd6d635de98192a38534155fed9eaf44ba0b94c5ff1d9d
 DIST github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip 4266 BLAKE2B 962bac7897b7df9172d558894454576e60a8f0baf852e19ab80e658066daa611cf59296d715deaa4bccd4494ebc81e5da32d9d723490834c4a764c6cc39e5ec5 SHA512 e7e9551abfed9a626f8054630faa16cf7ce23122e810f0ac36c3dc63131b142d8c23b615164f54f2a6669721d0bc5ce0a03973f5e547b86fa79c0cd94e2197d4
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b366c1c50762376d9e2b6f3d3ac287af94c45f7d348516d2e80ee96c6980a4b5fede40f1302f0e3e900e24aae16fec29801a795cb7e514dec SHA512 70f78081c04bdbb52e8f5d24b8926b39a28c4f069beaee0d7bf24be946f2b0ee3bc08d8ecc1305412623670e1767433a37d458df3fc849d244c63b6222f1f599
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
-DIST github.com%2Fflannel-io%2Fflannel%2F@v%2Fv0.13.1-rc2.0.20210324170423-273b36ca57dc.mod 1512 BLAKE2B 00446f203f4e307ba126e626ca8bec20dd9553ce6d6083c56c3b584f351ccb8b2984a9608b9a2455b508d17e61ebe6854b33757db2c0c364ef39688df19112ae SHA512 6338b52e62da11c7aab16c5710affa387f144a3a28075d89dbd9338c4d3d0b1c1e7dfba0ad43b7c9bdaf05fb3ba60fab9173f8fe8e4d912fecc116ffcae727d2
-DIST github.com%2Fflannel-io%2Fflannel%2F@v%2Fv0.13.1-rc2.0.20210324170423-273b36ca57dc.zip 2506369 BLAKE2B 01d2a657b1331004ce23ad4674fd76f8e206c05b964b31d6339a15139ff7ab8b0d3c653e8940dce4b79b45d4fa5e97a18e7c8fd3df9313e56992ee4315c99734 SHA512 3190d4a0a496debedda06b0ec27d2c882aa25416f02e06cddd3ea150093c9ef7d821375c96719be684ed3d6fddc2a38f0f08c59ec442ec301aef09a0377b79ad
+DIST github.com%2Ffelixge%2Fhttpsnoop%2F@v%2Fv1.0.1.mod 45 BLAKE2B 4a3237b18d8ed12d10bfcca77c7b481fbcdc328397faed7784ac1b31ff2f430710a41a383a1b4c63dd6e23eb972aef3de6848c19f49e182872b7c3c9d6cbe6c9 SHA512 7bdc5f80046ba76d6bea23b428460edb7ae3e0837574927b22f903ad2846eca18c202cb77cfe4273b8814bacbd6ce3f28581ae3e0c7c09342622e5a582f1b691
+DIST github.com%2Ffelixge%2Fhttpsnoop%2F@v%2Fv1.0.1.zip 16015 BLAKE2B ff7bbec225929330c4e248211550c34e445e3ba4aa3a0a84dc9a34fd7197e1fb065a1793803d23160a26132b2aac04545211677fdd89b9d07db8a36fdb961f58 SHA512 9af9b14608ef03a8e9babcc8727ac30c035bf2293e1ed7e156e40f80d8ee09b8b3ff0522238879ba9dc7a4db8aa7610ef9aaf925a8e723144c3c810e20b549ba
+DIST github.com%2Fflannel-io%2Fflannel%2F@v%2Fv0.14.0.mod 1512 BLAKE2B 00446f203f4e307ba126e626ca8bec20dd9553ce6d6083c56c3b584f351ccb8b2984a9608b9a2455b508d17e61ebe6854b33757db2c0c364ef39688df19112ae SHA512 6338b52e62da11c7aab16c5710affa387f144a3a28075d89dbd9338c4d3d0b1c1e7dfba0ad43b7c9bdaf05fb3ba60fab9173f8fe8e4d912fecc116ffcae727d2
+DIST github.com%2Fflannel-io%2Fflannel%2F@v%2Fv0.14.0.zip 2494533 BLAKE2B c0bf0b422c04f10778cb9300dfb26bec6d881a0c2fd88e4dcbfd42c82cffa8e533ead98764f0558130c5b17dc94d8b248a0344f0ba94f63931a43ecb4c64d485 SHA512 7db201af51eb16b718cff74f45b0d9c2d53f1c1bda924896619f1528960bab76be0287a97c521e6ef970aaf092e546456b136d2a73ab7578a95a706793d4f215
+DIST github.com%2Fflannel-io%2Fflannel%2F@v%2Fv0.14.1-0.20210827074410-fca1560c91cc.mod 1512 BLAKE2B ad3228f86197b1cb5b979425a1a0cf6c9eeb89a883d7df626e2580b7fc263a08e092aafb4fad5936780dc9ad3a951ec56117c748f5cb1b07eae3fcf501aae141 SHA512 84f19da22a41b99ca056033807b4703c246e42c4c5a7a29377e48fd06c6458775cce1141caeba991df19af489fc709503143c5f7b84e567902a91b9d1d63d50f
+DIST github.com%2Fflannel-io%2Fflannel%2F@v%2Fv0.14.1-0.20210827074410-fca1560c91cc.zip 2513579 BLAKE2B 629c11fa5541d7e1ac15d44811bbcce682f85f822524114d2c875ca5ce91abcfb1f50e4d64934ebf940134bada020e81ee1b39b8129d469fc06c110500250cc3 SHA512 9e0bc9f4fa362de2c1b48caf8d333608f7a59dc8dafa6855e9bf14081edb05692f8c81dd418aa496473f6bb7e2beaf81fc0c4f3d316ae744c1e8ab97b69b6482
 DIST github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod 33 BLAKE2B 2c279a40bce4e61e5aad9d25a1c374b6c154586c296cfdfd56f52435c7739c8d9a8958e19d6da8026c2a03b728e0cb9bb512d5c094aa6111f9b10af24ab894ee SHA512 2bb0f125a91c8f92dc1cb5ec16441b27027585606a3862c216434b76324f3069941055c4bdc98372547543b095a4014155446de1be98264842504450121c941c
 DIST github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod 30 BLAKE2B 725b27caadd05c18fc518e46ce4f1a213cd6ed7b4da3edb02cd74b7c7d3dc37891692f195144bbfc455bdc9bc77e683b41122bb3d646796555e92f565cc0133c SHA512 d64a7c87d6a40c48684a61ed0f6a7e75590df7d72d55242863f1bf18af9bb9ef51c40ecf0c41fbc039e06f1651898a238375afb12f41af5978195887a9a16c9c
 DIST github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod 39 BLAKE2B 03c2848adc48e404015826fc857d2a7b923efe39f2b11ec28e238ad2b06b0c5f4539f256443f91a116bc135923de7c4013a44285763b482d2baab5db1bdbefc8 SHA512 6c5546d979277d5488fb31eeb9fc33999dea631baec6902f937e19f4d65a23a2bb8620481c3ec69606eabd019be0096553097040bc778522b05f85ebc56bb787
 DIST github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.zip 59458 BLAKE2B 3e319bcc242e354aac2efbc31d978bc5dbc0b1af3911835f96243d3077fa12ca37b16256e89223b95d1c89f0fee1cc8105210c6cd74a04a01b69d7c45d4da3ae SHA512 77e29db3609028cd2026db97add708afa8a0688ed76d40e2beb64e5cf93004714605d8cfb83cd2668d1be1c5401747652b09d0f6e7aecc3ea0a3a1e08c957f06
-DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.2.mod 121 BLAKE2B 3b2b42800cf70cdfcc5a34ccde0b38f8bb16756e47fd83215563e653667a993416007880ac26a9f41f1f18318d9803b9ee90eaa98b2d4de16edcb7b74eb54760 SHA512 1a666d5599c4bbdfc3c174047e187af75d1a3e66e344ae76d714b387c39dda9632bb6c7ea1ead5a830a2aea1c5a5e2d051d552535cc7e0bc3dbf71383a1c4e5b
-DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.10.2.zip 44891 BLAKE2B 71044665123da95afb442b491c4a3d9c6e9ada650784ea2391a9a6c3d11ca8a471e505af7ffbaad00f1786b86683e2d5bb72a10012b8dbc618ea568f0e652677 SHA512 f83f91deb3b2d243f07bc8922276245f85d31f620aec192417ed7d413e823f8694f93bacffc6c83163cf528c19460dbf248063d5388d9c622a4255831fca5d37
+DIST github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.3+incompatible.mod 39 BLAKE2B 03c2848adc48e404015826fc857d2a7b923efe39f2b11ec28e238ad2b06b0c5f4539f256443f91a116bc135923de7c4013a44285763b482d2baab5db1bdbefc8 SHA512 6c5546d979277d5488fb31eeb9fc33999dea631baec6902f937e19f4d65a23a2bb8620481c3ec69606eabd019be0096553097040bc778522b05f85ebc56bb787
+DIST github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.3+incompatible.zip 59518 BLAKE2B 84f0fae94cf0c3c9661d671782662babb1f21c5d27a7964330d7f97cfb6ca838afe7ee72de0254ee204b9ed2e115647a87b2810959126241eeb74bda1c066b44 SHA512 621eb4f8ca54e2bcf28aacabfdd3a5bcc842011348d03810dd7c59890e64f0429dd686c14f8a8e4d662bee266d187ed2d77afa9e864172fe3e2b129319d5dbfc
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.mod 121 BLAKE2B d9ab9021ab813b7b6985b19ffec32d7154e43a1a6def62015215f80f0be7f981786f112974b796bd69afd571015ee46bb8b7790bb52dd28da6b830563f1a6034 SHA512 50beb03164eb70760fe996a22127ba01c922fe6c817cbc6089c711cc19f6dc7e25ece6d1c9cd767a3b8b42b1cba84443690b01513a6740df6f8827e94bd1fc79
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.zip 49908 BLAKE2B 67bdf78212983dfc91c56ec978151d0d359e4c2f84ac7d68725ea1bf2404604011f63c73a293accd0d9e679996437a3678f5eb9dc0284b445a97c2cb70ca3638 SHA512 10f3c3075858f8c2096164ee49473611e9df69fe7df7ecc4b515c327f4f590a692b828553ada806054c896475257af706d903e5a964f8f2ce0f7706a6ba499b8
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.1.mod 121 BLAKE2B b9eefdafabba19b234f26fc96699f115cc162acf96c32c2e54a2a0cfcec31b01c5063286c7aaa220d3f724ef0ff72bde0e71d0e655359413e066a15737367160 SHA512 6ea1110f1ac24fdbc455349359ae66537d604c0266d7ae84d31d3d9314c0fcc686124155dc0892ee9f70f44f107faeb6a467ad7622d826833bb4ba2a028b51b2
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.1.zip 50538 BLAKE2B ecd9a91c67c0f8c71d6684bd9944947042ae045c2988ef698e3aafc7beeb8a582a9c5df4fbbc4d1745e4ef6424656c0e6911410858a52483e0c6aee34e82677b SHA512 34d8cd2fcb6afc0720c857dab90148f1ac6bcc2ff4dc55cdb6e65ab70d73924fdb65f252f90edecefc68f0f9ea95ef9ed8d26d0d0584f29c9a23670a2332358c
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
-DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod 106 BLAKE2B 4876f70d70d2d8703d7b6abea5457e093043912d6a672bf7794a892d1c17b159ed2b92dee05ba1625a1b7cd6c8d66d6dc715bfc1d7c0f1c47965ae8e30506bb2 SHA512 ea3a26ed1f6df26a7e2aa64ea9d5d4a4c3005163cd8adc05028cf25d56d01d115bcda38b7af992242013c2610f26a184ce43dd1826309c95fa008fa9c8c387d9
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip 42349 BLAKE2B f2c476034a47330b5424159be4a323bded799ca489163c8d485e95f17ce519d6c4d771a35eaed83e831acbe20c1d9ec5b782469ce20aa224ab03de459228fe59 SHA512 8df5f490e26760bcfbfee216b5479321d060d4e48911c98e4d3375a6f84bd161b5d80769fb0326b3122534ff726e8a987bdce365464cdd042ab4cb5366d674aa
 DIST github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.mod 35 BLAKE2B a429dde238710a24e360e6aaf3631eeb28f1ebc1b75fadf44978ff339735683c81910ed7e7c9349d73d06721bcaa68fd526d5f31fae11dc153627de6878fcd1d SHA512 c79cfbe12d4b0cf8e79d2b652665bd6c81b0983fae996b472273cc0163eedce3beddb73e784fa37fda5442096b00aa5135df6fd06c2675942fdcb79b069f2667
-DIST github.com%2Ffullsailor%2Fpkcs7%2F@v%2Fv0.0.0-20190404230743-d7302db945fa.zip 26848 BLAKE2B 81eeb65593680fef314780e9a5b32a7cb1847a2af56f682de4d95d3e875a96ae402f18d8c17cea33971813b36bb4cbc6dbeed7f77ed26c61a6ba1098da260812 SHA512 2a05a588daac0e1a5fc22275ad0e02f366e07808d30b47ae44c54a9d2ea63a4f9c3e79c1b2e105d31dd128e42d841bf8614dda36d71af57b842a79c76cc7620a
 DIST github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.mod 46 BLAKE2B 6a3e83c8a405b63e5232cf17eaca69b743ddf80d1140e9351c67d3ab56f7a644a8e952535d7fdbf738219518706fb738ec128ddbc125d35de60c19a2bfba580c SHA512 31cadc1939053cabcc279f7db17b5a6f9455856fc41ebd74599ab3156970b2256165492fc007bb022731943bfe8523a2e4822a7f3e1dd538ff8b90823d64c4a7
 DIST github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.zip 4930 BLAKE2B 1083db1297551726173cd0b0f03d131c8f665ab53f35648de2b7b0bf3be5f98195ce39cbc05e80ae8967d1726d37907e902c98b6bbbda07c3c80e6711da10832 SHA512 214551ffacde463d59b5d12e7e42a958839488e890646f485a18e2519fa57fb65a5ce6dad21518415a13258fd35a9aa12bbecbc20e81b136eb03c186a2857c5c
 DIST github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod 34 BLAKE2B aacafc6177e1e87c8f4a17f295900d749608f722755d31a1939d1b601e4719984c0d1299fc4de9fe74c1109852009daf4641cb5c81629788a639eeb9314867c5 SHA512 c4b5fc4230e8e9c7631f577ee15414f7a72bfe27af524fd6bfad8c38a81426411dce35a191d840a9c69eeedfeacacd3f2a108c5eec35a3e30b0a7b262b15340a
+DIST github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.mod 37 BLAKE2B f12e861904648d4931055fc40635565ba64e9e43909af9b6a238105ee85b98a01fc31da46c6ad7b737162f88648d4efe30f428a7d253cdcef7c38e9ff3863d5d SHA512 b10d9112b673106e50e51a54496b9f82af44ded3ae88811eefafcc0c1908b7fc89a1512d438a04748147326beb28026e01ca3e4dc3e833be7cb3d2b49d98e81f
+DIST github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.zip 26210 BLAKE2B e7d3ba9ba27946dcb3f7ac50b439849fcd56ddc1fc1bc9925892c6ab2c28b5a1a94aa3a8b940e6799f6f601bf6620efe0cae8c1dc4c89c8018c4637860b59672 SHA512 51752c4fc76e160d0a3c5a9efb627f15d16c9b9a005a93e7a5c44f374d18e932ca5219debcd89900225a3cc2bcfd5842c59195f5ad3d8217a5d35d19bd053fdf
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 13436 BLAKE2B ddd82721096e3dfc8c70543b4324d02f1137d9eac13c1eec1236c4ff537bbebc2ce5f205af07e8ecc16a909c4415e764d87324bad3efd5c878aecc9f8b105647 SHA512 722683483b8071b58508a7de9a9c9826d4a33c874948c1a6612c89195cceadfbd0ee0b56635d408f0af09aa2e904b0ae3c86a06e9b8f86c502080ce04c756e42
@@ -466,7 +504,6 @@ DIST github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod
 DIST github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod 33 BLAKE2B 8921f64dbb125d824bd11b0328613a447ba831d76ed34d028ebb193fb88097931b256568306d16e17e7506631e870349ec1fde283f9dc94137a8bcce03751349 SHA512 de23a4c4a97845b7eeb623a981716ac97271668fde4e120c5545d260d4d3cc17217d39113f4704ca0edd41713f8e54989284c5b2a09a1afc2897d34c38277a3b
 DIST github.com%2Fgo-acme%2Flego%2F@v%2Fv2.5.0+incompatible.mod 31 BLAKE2B 57a4e94b1961821176b03749269d51319f7494067249de4856cd1c25a936c66ebc6dd0488665db7cedabad6a21a6eee02d3cf7e92be4a06018f61f4e60db1b7c SHA512 43924124919ff4eb8c71992f4cb8c0341abe1566a9a8cb17081c05b074ec9e36ee8a4cee0a686d9e54cedda36a1f2744e9330584cc1a5987af48a8000b224a28
 DIST github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.mod 40 BLAKE2B ec71a9aa1bb1a9be9a2ac26e68f6b718af45320939b32b917a5934358d9d18d4d9ead51eb4620fc28b41c4f2a9866fc4c771acbe5f82e70368e8d66b529fbefd SHA512 c1d72393c1f4210f4fb8ebe84611d37c50513a5df83aff4c940e8cfa03a9c1583f7ff72c27c4a5118cbd35d3b27d6135506f1c1a35c712af90999ffc7f3df584
-DIST github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.1+incompatible.zip 44036 BLAKE2B a1c134c68191728b92951cd0c1a45d8bb17843d36db026e9aa9bac203e11da8d3a65280f1ae92cc63877386d91d26e73a489a1cf70599102ae04f14ccf5174bf SHA512 63dab307606ed0e6f7869fb498de496c3fa0b492c2f11a5213adcbb6b7daed2ee256bf6e7f7195d2c50c862bd7fcdf0b16e13de77dfd2f19866cfc7482208a16
 DIST github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.mod 40 BLAKE2B ec71a9aa1bb1a9be9a2ac26e68f6b718af45320939b32b917a5934358d9d18d4d9ead51eb4620fc28b41c4f2a9866fc4c771acbe5f82e70368e8d66b529fbefd SHA512 c1d72393c1f4210f4fb8ebe84611d37c50513a5df83aff4c940e8cfa03a9c1583f7ff72c27c4a5118cbd35d3b27d6135506f1c1a35c712af90999ffc7f3df584
 DIST github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.zip 44368 BLAKE2B fe6d587c5b496c487423b1159ad12375a8fd7a8100062861ea906abbbd821aae7916f57a20d74a2fbfe99913413a37f6872d5f8c3e56d56fc928906969fc8191 SHA512 312c939ccfcf83a179d6f861d896c1db17a9501869efd8b5033f4057b32e0cbffef826a3f8145ea7ee9bb73f211b462947f995be72ab4793db74105554dd5948
 DIST github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod 35 BLAKE2B 088adc516e2f6f0a693c745963d6daaee2c196b1407e36a469eec392b232ed26b03f9c515d422b8e536c2b2ac8bf199cb3db5ba4ad19ab71fc338919f57a3a53 SHA512 787962ce037cb9143f496d5a7dd11ab1a487180cb57ad498e6c24a8da7a5bf36737b0b2730d2e0837c60a08bc7467ffba744026ce6962885fecdcdd1bb6c07b7
@@ -476,17 +513,19 @@ DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95
 DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
 DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
 DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.28.1.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
-DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.28.1.zip 50904 BLAKE2B 80d5bb52dbcf04603c5bd9969f394df7ef6e045f9293ccec4b64c5987a2461dc4c8ba8b420702901d4817890d87157851d8dabd488bef95610fe65bd617aeea9 SHA512 668525de8e9b44a28e94d36fa9d1d498055cb818a47ffde4274051106394afdd8edd70fb6f4f32d9e0f5d3b4204f6c1f2c17f61375c36dcf5622580adae1f952
 DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.9.0.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod 121 BLAKE2B 6463ba6a856a7bb4efcd00a3369f6593b31b8ef39da4bb16ce1acd741c0808d2243ca7787c0a52d4653a5b402841159e97cd4b42e0f6172ad39429beb2b06993 SHA512 564f0a1b0318004a7ed478c8f3a371ea2f59efd56eb2efec4fc806183de1b4a065d5b44aab6dbd40446d28caf5a74545a7ff6a3d428b1b41cb6df5eefc11e5c3
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod 44 BLAKE2B 0122d72cea88331beb9500849a0936a966e7a48abdd2e76363151bbb124e35481e7248fd896523eba3c51c5f4575dbc13304c2471477757c1eb2f8fb2eee9cc1 SHA512 bfebb8d865586729abcb0dcf4c19a8938f06f9b502c78bed92d01c18d1d037f7df44cc1a1fbd4ca094b1835b8aefbd48fb5988e2884656ca44be0aa83206aadd
 DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod 31 BLAKE2B d141d98fd2673b422369b754fbd430a465f08bcdb07fbbf1ed626304ecd0843255fd2e909fc395b04c7adec18a15dea65ede0c64689be98b7491729d13363db7 SHA512 45bbb63ae2dda8c2ea63c9e38405b379708326c3f2e7963e3589ea53d06fd3bdce1613b5a0c1ef66f9c6ddc21374b1669218bd6b3210918df0a4b205116f3e14
 DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.mod 40 BLAKE2B 58806201fdb03763a50b137694c83456be85e03dac2b8ac7a1dd39c27795225d009e38ca6bb232247dad1e9e6868fbc7d6e976ec8d50c36adc2f7ce7e66f75c7 SHA512 f1933f140710ea465e584361e0751356bea07b0e772ad7da7eb3d8ab2881a55c8c300140778defa1a541e3e7613819c28de76127168900c8d52e931a8b408d97
 DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.2.0.zip 15918 BLAKE2B 1336707973721ae4343d53fd4aab4853472a817a4bb38db05965870ad714e2f47a324c87f692d88d89d886ecf8d56e3125c099949c97d86a06ffe6efd26e76d6 SHA512 af51415b41e2f186b66bea72d46f602faf22e899f01d7b6fbaeebf11532efea1d03e7c575770e79ea5f3f476ecdc61afbda860c490d44d785bbfb0105352d51a
 DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.mod 40 BLAKE2B 58806201fdb03763a50b137694c83456be85e03dac2b8ac7a1dd39c27795225d009e38ca6bb232247dad1e9e6868fbc7d6e976ec8d50c36adc2f7ce7e66f75c7 SHA512 f1933f140710ea465e584361e0751356bea07b0e772ad7da7eb3d8ab2881a55c8c300140778defa1a541e3e7613819c28de76127168900c8d52e931a8b408d97
 DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.zip 19787 BLAKE2B 74176b2689cfe0094d8d818400de8cca9fe637886efed092e74b1868cdf64fc3af65c8a365a9c971eb58031aa839258ffea9df422ca62ce7ee1c7096f07248c6 SHA512 25d5479fc56cd00cae22dbfc81a27097f049a799bb29aa0f4911412b39fa6dada5ffd213118fbadd0991ea7c7207425324a16b99235b439d0cc0204cf8a5e444
+DIST github.com%2Fgo-logr%2Fzapr%2F@v%2Fv0.1.0.mod 31 BLAKE2B 170bddddbee00951e3b24213272cc1f3ef16c38104d5194177c2b9eb45e8625ed2d8f9487340db36372dd9430a49f0a93f7e4dba8c82280b70547f38e17d5a67 SHA512 f4390b6f71ccc7e3c7523001c995fd3af0fb58ca3b933391c0e714db727843bbeda8f10827e696dc2985a8d7f020a96149484985c3860bad6ddd917e644cb392
 DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod 38 BLAKE2B f973673320ec56ab6d8ebff0f6a789a40d5f861736377298de042f2cddf926994bc99611e4757c4cfc34b3dd515609ab9b5dc2b0501d1929d8580b115beda0fb SHA512 23b05bf2f58a7e584e301622fe71160f6d8ef32236c48b2ab9f6afec79cad5afcdf7dfa729073f7b29f1f94fc181c86197de2f05f9e80624411802f55f137c50
 DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod 277 BLAKE2B 10729c6eed12e23e12e34c03ae63b5adbfa0f8abab95bcd750a534de50ce0b59e6082c53d64ac4fa84a075bb81fc1ea596f124b51ef44008fae5debeaee108b5 SHA512 9006a6e1ee363f5705d3113efb82e2317b624ae637391ba0d561fc9bfb0ad389e1741c9ef5fba2ba5025c3f2d3241be01bc62f4c9dfd97c389e673c95c372c4f
 DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod 277 BLAKE2B 10729c6eed12e23e12e34c03ae63b5adbfa0f8abab95bcd750a534de50ce0b59e6082c53d64ac4fa84a075bb81fc1ea596f124b51ef44008fae5debeaee108b5 SHA512 9006a6e1ee363f5705d3113efb82e2317b624ae637391ba0d561fc9bfb0ad389e1741c9ef5fba2ba5025c3f2d3241be01bc62f4c9dfd97c389e673c95c372c4f
@@ -503,12 +542,16 @@ DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod 335 BLAKE2B 9090c5
 DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod 126 BLAKE2B 27ace39813b8f55ba228ea7a2f298e26bc30daab931d25167887237a6e2a944014b132f143a20006e69861a6d4517d597ea6d56f74b2fa6941752f3161e44644 SHA512 a33deb764fbcafead3f863c4e20fbd6969e8ed04098fede6872555405fa4a352b31f771adfb5df03fd633ee5471dbe259407d873e230af01a1fd31b78042cee2
 DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod 210 BLAKE2B b3f610a7bbe7758041e145a17de7becfe6ef0d80bf8a2e6bb9de47883483b3ced7f09e0ef1d170f42f1c5928913cf80043727b3e62fc0025943f6a327a884f64 SHA512 d927113c08de347570e5ecf4ef7019c7574e9fa2d751273e8c68f114b49aa4a9d9c39e32937ddd1ad3d665757d59a4e498fe275578d40a6b0dc644ca7dd8fca2
 DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.zip 18504 BLAKE2B 96ca3632fa43a2e7a2aec8e72bf5ea06374096da1c18656119ea5c1ca1eca55bb82b1075dc1ff478d290febfcdc6d9596e8b6400f053e611b0101c8d79154396 SHA512 2263bc61ddf10f0ab76b3f0b3ac2bdb91e30894e6fdd48731bd3595c9005884038bcea0bdb09abc73bf9a68c03e6b761f73b8cd60315c121058e58a4bc7d18be
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.mod 210 BLAKE2B b3f610a7bbe7758041e145a17de7becfe6ef0d80bf8a2e6bb9de47883483b3ced7f09e0ef1d170f42f1c5928913cf80043727b3e62fc0025943f6a327a884f64 SHA512 d927113c08de347570e5ecf4ef7019c7574e9fa2d751273e8c68f114b49aa4a9d9c39e32937ddd1ad3d665757d59a4e498fe275578d40a6b0dc644ca7dd8fca2
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.zip 18595 BLAKE2B 1d2f10a892b679a58ee2a5f73f423d91127bb8208fdf1bff862c8634d4fe1a93dbf721ece4c87b470232b78924a4ef190536dccc9acfa4a16f0ef21609e73d9b SHA512 c6b3a6bcbb93b2882a9873d0362b8618499f0f7d0aca697c5b9de04fef7f3c462fa11a55a175a0c1ceebf34bdad9df365dfa622dffc59abc4d881136aff5dd4f
 DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod 43 BLAKE2B ab024fc86c325a82315f5a99c39e1fc08440ee35d81fe09959816a0fff09aa5d852431fcc370dde082963ccbd0d79d74d987f1bacdd4796d6d1d11eb80089d63 SHA512 b3548cd55d406b9148e992e276f7178d68116825198f359971f22a1d9e7e2548cdf9605a1b8b6f04b3b66d92faa906dae781a53624344733fc471452f16f4312
 DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod 611 BLAKE2B e9be68fdc22a6dd742faa396fbc29905dafb4addd99c8b4dbf44aa642b06e698a4acd29c1d5d18b2bec85b817fff28aec2e9467644fd0807216df209b89f87e1 SHA512 4f4e1b9f6ace0cfbac71d20abde69a7a00c88d29e4b820ba92b4b3c6f786fcce251fe97a3d853e1c2e37518ea8c709101e542e0a866e09531c1fed6dc04b529a
 DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod 611 BLAKE2B e9be68fdc22a6dd742faa396fbc29905dafb4addd99c8b4dbf44aa642b06e698a4acd29c1d5d18b2bec85b817fff28aec2e9467644fd0807216df209b89f87e1 SHA512 4f4e1b9f6ace0cfbac71d20abde69a7a00c88d29e4b820ba92b4b3c6f786fcce251fe97a3d853e1c2e37518ea8c709101e542e0a866e09531c1fed6dc04b529a
 DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod 354 BLAKE2B fac3e9e9fd1514b1e07894e6931cd0368df9dcc09210519c569d81871ef1350810111ae38799b9f0b5692829d380b403d8f7468e81eab8ca22027ac3dd8f9adf SHA512 30bf4610b301503fed728f146ed4458dd3bf295e1e4f7e1ae4806f4ca6e8856be988a10642c84c5dad601d71ee5b7bbbbe0f3e371be1b382c3c3e869493721ab
 DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod 363 BLAKE2B bec8f102ff2d1cf0d4e61960971cae49e628ff3678b0a6595fd4add3dc6018684c004ff8de4a7f60fdb5ea8fa98dae0507c619f148836dc9287cc687cb9629e1 SHA512 b9528f1a273596c8227843c7b5513920f78c25b859c0d095499ea05f5c0200095f28a344c5bcc913b61c44f71c5af50462a2e7e2ca6ebb9670c5875096118998
 DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.zip 16705 BLAKE2B 61428f887e1b321afb03e2fdb690c4d4d073c343457472fbbcf48b841e49e4e4e0b9215ca217982951bd3948ae8a2efb9042cc87f7ccea1b4e0356358aed98f2 SHA512 52d4c005063af04b2897f5fbc1d23b5b9280701e667949441ca19db9ab8484dedb9f148e5052b0d785aa24fec8fd27a44faca2cda4aca946bd0fff92231c515f
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.5.mod 363 BLAKE2B 44a45869e933ecc2c8ead308cf2396c25bae527cf3bedb12142cc7d2f008b7fa9ac91c4ae04705d84673d71b49ae0490d7e801f1ef0b508792e6be68e79a2534 SHA512 1f1e8745f7a01c67b6f80a9ed4e69a8189a2ebb2bace9d5d63b7aa4e261ee3c465bb791b2df15797823651f9418fca8b2efe8f788525e04d62193a81147f5258
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.5.zip 17133 BLAKE2B 86787baefb7883fd6b8718bc471dd4c2546c1795ea6a17a981a73c0fb9931b785dbb8e22558a6c731559058c0010e2f6b27156914ec9360c97247340247de9a1 SHA512 0274301c00cce0c9436bd038165fa6350173be7e73b1cfbfdd7fb12def1052b37a1505be35ca6a340692d63dff23d5abdc3ccffb1a325659c50089ab443ca1b6
 DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod 1073 BLAKE2B 887a07f56f26aa707e72bb4605dbd22fee24c4d5149e6aba3dcc7812b438ac41c2e9be294f307506318045fff9913c88ba6fb31bc1dc43e3b88d9f453149e4eb SHA512 f22943c5d69bc17b3b7fae0ee0746e628284e4e6ecec577509101148bc1a7fb0b4205fa06f1979204d12f9f19ce83a3c4d44b6aa1da5ac865ba2843bbe566790
 DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod 1073 BLAKE2B 887a07f56f26aa707e72bb4605dbd22fee24c4d5149e6aba3dcc7812b438ac41c2e9be294f307506318045fff9913c88ba6fb31bc1dc43e3b88d9f453149e4eb SHA512 f22943c5d69bc17b3b7fae0ee0746e628284e4e6ecec577509101148bc1a7fb0b4205fa06f1979204d12f9f19ce83a3c4d44b6aa1da5ac865ba2843bbe566790
 DIST github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod 1073 BLAKE2B 887a07f56f26aa707e72bb4605dbd22fee24c4d5149e6aba3dcc7812b438ac41c2e9be294f307506318045fff9913c88ba6fb31bc1dc43e3b88d9f453149e4eb SHA512 f22943c5d69bc17b3b7fae0ee0746e628284e4e6ecec577509101148bc1a7fb0b4205fa06f1979204d12f9f19ce83a3c4d44b6aa1da5ac865ba2843bbe566790
@@ -536,6 +579,8 @@ DIST github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.5.mod 448 BLAKE2B d919fe8d244
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod 34 BLAKE2B 3eae155bd845592809662beb61207107add5a1e0edf380e313e262699dc421b3bbeabad5ea9ee73d29b6a694b2e58854b888e8fdb3dd9c7176ce637056cb90cc SHA512 81cbe6c6c48012994253a40b9c897207b8b4b79f35c09ede64ad7f8d22db8861ec823f2b4a7185334554c75bae3b614de236f804312c77b0027e97114ed4839e
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod 268 BLAKE2B e3e647da07e2cd516610877e931734786d91328d45936b0ad95237409389480c7c5c157787d5dea79f160f665a94abb17c3fbf23535f3cab3fb0b72944b8cb55 SHA512 0dd4ce8cf6ce20117da3e59a8224727f93f6daa29ad9ae7cc92b6d331bc8734f1a6dfbb816ec08da7b24b0f76c91ad770dab551c97e49bedcc403fc823c662ed
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod 268 BLAKE2B e3e647da07e2cd516610877e931734786d91328d45936b0ad95237409389480c7c5c157787d5dea79f160f665a94abb17c3fbf23535f3cab3fb0b72944b8cb55 SHA512 0dd4ce8cf6ce20117da3e59a8224727f93f6daa29ad9ae7cc92b6d331bc8734f1a6dfbb816ec08da7b24b0f76c91ad770dab551c97e49bedcc403fc823c662ed
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.mod 618 BLAKE2B a1710475a51b5883d9a2b8ccb0de566df2911551df66cbb00b1244af22019369e867e239d8e466501075b65d6be912d454eb6228b99c498b4d5e20471037bb7c SHA512 ac14dfdb900e1c43b7d7c487c47059b7b23b721c92196a372d2ce9dfe121ca3842039ffd4893d2b25d562c5afd3809604cf3f08a50a43e940917bc23b980dc5b
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.zip 52002 BLAKE2B 0129a6d34389f3b890a3f51ad4dc31ea051dc9279cba5748b3becf6c06e07cab6a13c24c7989a82a44393b624e7179cf2821504ca540df2cb19541077e5bfc5e SHA512 25fd2a4643d7190ca6a68a72bd0063ce77acb3850fc81970830e3b6103b6639a5b8cfb4e7eb7c5cb5c3d3b0c2d376b654de44c4384eec3a44d44000837a365d3
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod 499 BLAKE2B 77c4b2e41d6ef35e23029489c7962e3a6e036c1e55a876916b90efcaf7011ab935ff0bf8dfbfd45ea8a27194b480055a99039dabd2a45922a4d18f80fce4343c SHA512 c007b4edad28839d872ce2bee87b875757a3428a09d04d499bcf710baa8fe0f448a818f7a939a3c4c40b05436233a683af41c9ebf466ca58e0f44e508a014923
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod 499 BLAKE2B 77c4b2e41d6ef35e23029489c7962e3a6e036c1e55a876916b90efcaf7011ab935ff0bf8dfbfd45ea8a27194b480055a99039dabd2a45922a4d18f80fce4343c SHA512 c007b4edad28839d872ce2bee87b875757a3428a09d04d499bcf710baa8fe0f448a818f7a939a3c4c40b05436233a683af41c9ebf466ca58e0f44e508a014923
 DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.zip 49381 BLAKE2B f83648e2877f57671b8a5133f7b6d0ee36e6d48deb9d4684e839e1d3eee54d721aa536eb41c713f584418916e7dd1192742a87faee77a015496aecbc58759ff3 SHA512 64d7a667df12bb1257a8f1effeb177b0970fb326a54a72c211c781920fa8af98234c0fc22e699af099f0efa3696be2dd5314c9731fcaf74113aa25ffcbc1ba19
@@ -545,70 +590,65 @@ DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.mod 616 BLAKE2B 195302c90
 DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.zip 715602 BLAKE2B 7365ed7c784e9f6d284526977dde25c8591e092568c8742b03af2ff063de41604bc41493b31bfc67984e638ec1c063a849270e7de87474dd24b026ba4daab5a6 SHA512 ce035b8b16eac7eaffe97555114021de8a7bdc2922ca4c169b8d61a049f0773fc5e1cbce8b698dd42c6d79c08c867384fb628018117f6770e69e03e625259963
 DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.8.mod 616 BLAKE2B 195302c90abe853d5c39ecaa800355007bebe9eaad6c6a57e49d8a432d1d30440c213cf3b5e926f5264a65aa22a9cb59b58fcb72597fe38344e943a3ba8f89c4 SHA512 099f9d1770c55309210e8885d327a0c1299a429a5252335578009d415b56da4f30c1ab37049826f9a6a009a9a8003194c60a9837aa733e74578b43848b16c33e
 DIST github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.mod 42 BLAKE2B 216193a7027735f9581dae8cb67af9d738b3a1cb66ed0adc2910ec9cf764e36fc967a138d9fcfcc6efaa7217cebbca486a5250b4ae735c0eafddcc0e6b50d172 SHA512 c6e05617a90cc1e66fa9af0d2cb4e1673aee5647d3bc34763b71992583c4e9159ea74c72ff65ef70322dcacfcef0793565ab6b92b4e1a964bfb5cca70065f316
-DIST github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.zip 43941 BLAKE2B ab30b5c9f64dfe54613268051314666d4a48b1350b85d6dc2ae0afccd0985cbeba91e81be5a08cbf1a93f4a0d230dea3953efbcbe1d2aca718a337c22b0abe81 SHA512 3c67c7c9b54bb704d53e5271df16d03bd54b60999671bc0c02c7811091d847ac8b1e33fa4809e5be1c5632223cb8c885370dc89d7a7e79033a5fce8ba20d5919
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip 106521 BLAKE2B c7c61852b093d2b0452e9daf9ab26b83ee6426a9afa4f67abb0e0f98ef28961017f774075f5d90fc05d6de3c26fdf90a1916b426b32a41e2cee8fb0452e21f03 SHA512 023209372d47d4b5279789f581a6f4452aaff1e262ecbdb3fbdc48a0939599e319109b99d1c79414716f1c426c143cc1ce506dcd38f304dd5aa3e9348084628e
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.6.0.mod 47 BLAKE2B 7252c3d085ad65bc8d2694f6fabeaf42736c8af8f4e061f1b6f254c35859619db00c1e204057cf355434b40f403b1c67c29fa5f93661626284bde20c8877a606 SHA512 149783bbdf84f15c29931e06d98707db26048d13ae9fd157600b522c0ddc60612c39764dc177e063f844205321ba98a01eefc1744dbc6f786861d0607dbdb0bc
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.6.0.zip 117011 BLAKE2B ce99216a8c18289efd467ddb5f3dbe74d4e1a1fa743b6db5df02d3b34cf48ea63dc7e5d8ab97220d66b7648cfb4efa0b1aa23e208a266c7435fac65d26b970a9 SHA512 f356b0e4d723eff7b67f1879f0f67be7157a4a3a15de6863050f604319e5e3d2ee8b03648c4e4dc0c83e4a05d426eaebc953104f45b60675604aa759fcdcd4ca
 DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
 DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip 10204 BLAKE2B 37977dbc6c256bcd404d5b7076ac49d1c3c3c495ad0869cbdf8943b24b80ea5f155c80a0a23571b778e7fcb381140988fd19cae6b8ad681e115260b0fe19394c SHA512 1e834ba368fcac6e13fd8b3a478cbe9b181ec3660087733b68adc0dd41838e54367d22f9bc53e602ece889e6051e319fbf80d5874abcf4daeb0bfb9b64e298e6
 DIST github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.mod 142 BLAKE2B 54253a74012ab95ea6c91a438b815a4350aeaf4bf2ca1792cefe7c240e563a261567eda5338f05e4fec09e6342229ff00f09098919d1bd00e1cc73ba05d84a59 SHA512 a40438b84b2cbe6be587841e249d934f84f3a05335859ae5406f206e69b972095b51629c55a492114c4fb24c0f7b70ceb7650d97af73fe820b4f781e0411df4f
-DIST github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.zip 60633 BLAKE2B e76daed615c3d3860ac3f9be08600ff24eac095d32978d0fac5e4e2b70a64b7ddb1ffcf194c06321643fb473af6f1cf3fb68b6d4260bf391fa5152b12ced3439 SHA512 24c04030cfcd65739754d258ced5e15509ad049fd8d73d3895559bc96871b7500c436279ba8e59e0b41ade83f5a9a167059df6cccfa21abc59d41b60c44ec286
 DIST github.com%2Fgobuffalo%2Fhere%2F@v%2Fv0.6.0.mod 282 BLAKE2B 38ba0a80b133fabc52664560009cc7633fecf4e26e4be24a5c6c9d182f9c1ad02b7e07b8820241c6f6763fa7b6242a0f2f6e37925a223bebdaa6529ff77010ba SHA512 5566453142568e2df12b5217c7a890c184927d7fbf0819236bc009a53a6d7106b1bdff1f7d7552c8b8601858a664f34481f7f00f8dd21fda2fd4a2d5da2bf10a
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20151105175453-c7fdd8b5cd55.mod 30 BLAKE2B e9f919d91a822060a84e112358ad361bc7be6f3e6e7cd668aaa89ea053c08d27bd20d281550e1f5a34f3db10ef19d7ec918bf094c755ba58bc01e17f7269fb40 SHA512 b096b5a6e72184dd2be5fb4f7ea9458e0b61cf6ef43f92a5fe5d225318315fdedd92bdc351b0802bb0959f77beb0aba830ef171ed61c6d84103690c22e8d8945
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod 30 BLAKE2B e9f919d91a822060a84e112358ad361bc7be6f3e6e7cd668aaa89ea053c08d27bd20d281550e1f5a34f3db10ef19d7ec918bf094c755ba58bc01e17f7269fb40 SHA512 b096b5a6e72184dd2be5fb4f7ea9458e0b61cf6ef43f92a5fe5d225318315fdedd92bdc351b0802bb0959f77beb0aba830ef171ed61c6d84103690c22e8d8945
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.zip 79710 BLAKE2B e3ed337421026ef55bfa8f7f7b8dcc9d73c2689bed88d5a29a754ea57fac79b7f49bcbd9604ed899b5c849331435948d523c172cd5620a6541278a499d006ab5 SHA512 84df9cb96823f3bd063992f3ab89248eebc33cf1a78b2d72bbb5065d120240548ddd58490d25ab9a56c4c982d208b420e26d10a251ab0acf33e7458ca6d3a4eb
-DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod 39 BLAKE2B 9884f8a07f2a84a159eb17ef62e9b17398b84bdea38fc37591af050dcebc2f56b83f851046c3333e604a7f954b7628c16b267c0c94807f7a41d5d2b797db0918 SHA512 c32a84bb302c9db3f31f714484131ee3ea96fa98b224b9cbf2c5fdd15100a24094e94b55175cf1fb0b6326128c2db8950677d8f6d281b49645b0c7b51b759093
-DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.zip 91123 BLAKE2B 16eab5a0f642cdf2af9b9ffe96a6e83ad03f0a6d7898841defe1ee5855de12a28939c27c7cfa5c1a676c8293238e6282256ed22c10a32ea47bf3d41f7b2fd507 SHA512 74be69e28d337ea6c5a8ad4f2a563f0480d04efcd1e07d75cc73c008a79e5dc9bc4f8eb068a7eae263729a81f686f5614af211ba78dcdb786eaf65e4199e5363
 DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod 42 BLAKE2B 79541bfacd3378a6c6dbe9591309a80390444f2dc2419fb0137c723c6a2ec1e0588c00704ce3c19dc93297b19db89f79bfa09daa2632f6674e35e76819473cb0 SHA512 b9aad4f1c1d4f2c43b293b0c9ca8a600a37ca407ba8b22b0f826c8355828cb7860a96a85df84f720fe8aa2840974807ea7ea7b790790c6dafed794e761f1f26b
-DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip 91628 BLAKE2B 740176e3d836aea1d048b055add89c2da65bacf5ff93315a62d33a82bce287dbf041376711f0464eba8e71396f12e411d867e719d340c65d790948a17bab9779 SHA512 14f8d0a81caf385c26ef681e16e4045bfa0f5f08d90d68de22f17d6f462c592442a78d24391f7ea3b6e44e8a035b065d00d72dc34a72c50fdba85cecd118b63e
 DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod 42 BLAKE2B 79541bfacd3378a6c6dbe9591309a80390444f2dc2419fb0137c723c6a2ec1e0588c00704ce3c19dc93297b19db89f79bfa09daa2632f6674e35e76819473cb0 SHA512 b9aad4f1c1d4f2c43b293b0c9ca8a600a37ca407ba8b22b0f826c8355828cb7860a96a85df84f720fe8aa2840974807ea7ea7b790790c6dafed794e761f1f26b
 DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.zip 99582 BLAKE2B 1025ed3dc8e4d6df78ba5245b22e61bf5fe880c97578d137d24a975fd0076a7567b8ec90676f8d295c8b4b183dd7eced6ce898df68cc6f01f64e68ea651b2d54 SHA512 ce8a6e20c3f1276440d7e8858e938e5ac7706e100cc0e172c953b2c833b35f5b2c80c47c895787d0bc5170dbf2873e23c88e6e5991b74b7538365deb6e7d718d
 DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
 DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.zip 11234 BLAKE2B d806e8bf8671c1e1adf0dc95ea61efdba9a53ffd1e4b2cdd469030964c7137a51cc77ed65b2788ff4a692ab6ca46572f30e20b6b8c7887eb304c07d8f835fadc SHA512 bacd8f76999947d61c25839c38fa102b4cd7c2998573727309032db6ea47019147f51d2c03d38744e739b2e26afe0ad49c330e936649ad848d332ab1d04c3bca
 DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
 DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.0.zip 14639 BLAKE2B e8d9db907be590e1fe4017afc762898fc83eab3df6e56ac5b0aed018c2275c312a58d9140bee3d0eed21a290851460fbefc41713f26d99bf87d635181cf8e0a7 SHA512 e6dc067a4977622a374656709552a15baed25ce3f3714682ba041fc80c96d64b3f74ac7862dc00e616c85b7ce53a221391c1eafab1bbeb81485bc5bee05d35c9
+DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.1.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
+DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.1.zip 14710 BLAKE2B 0e469d2bd8959bb3b743637a7c88f9695342d66827fd4c372b67605082016619799e71b2a174c83bcbc3f72a0d816f123eec9d885146d6dd4f266482888ba7ed SHA512 9b42452b5fed988d4c786beb6fa65b0c277d5da64c0b74eb533647b792a2a8d9c68203409266e3a2402637f0decb28b131210cfaee1d3af792e557a1baa02a1f
+DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv4.0.0+incompatible.mod 29 BLAKE2B 5311a22dbbbedd78a98e34293e79fb5443c57774fa9049665943e377fd07984a9316f3ec5c8fb70da9b133c6390d32ab28b97e939f938bfeeef78883cca6fba2 SHA512 8a1ab67bf3555ca17b7efb1042fb6a7d58b225b4186302b0cf289e7b60f9aeaf23e36ff6d4e8da2ed728dcd676cb2f30f0625c430c0b6943dd25ee02d2c27247
+DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv4.0.0+incompatible.zip 37684 BLAKE2B 4cd40b5582f3c968fcafbcf9de2d33b108023c2753675191095f48b4f585d22b05e49699a667bf6d8bec3b5d8bca18de725a52c8090cbf2df20c06c3d29c0566 SHA512 97bb200fc1f8f826c770c10af2884a8e44cbf07176b1a63c8c80cf07e7baef303f49d804c043731baf03964da039f757c6ae199725a2400533a8a40343b4f325
 DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.2.0.mod 84 BLAKE2B c25f6962ddcb02b08459d3ea1063e6c3f20e5565e0a70673b7f7c505ca25e219e1e365cccac9d75054b23446e4957a5b136479a35e0d261e2e16519d17781e78 SHA512 be902a6eafa64bbbf2f347367265450369fcbd47a132c3937a7b72946aab00c85c8cae9f98c49dcededc5854362fd78786df3f54ef07e58cd5c92d2b5904828b
 DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.3.2.mod 84 BLAKE2B a4c32df89469a4b93e0d85b867852d870bca997fd2d31163529c9a9f43e67765099caa6dd708e2edc4500b5496c4d36445d8f5c13ec9b08345d6f155dd68fdf7 SHA512 435ffb431d95016e1b15d4bebf142423ab3ac863a17a8ceb4a1595892e1a786a77b37ae0d3c63cd55904e92a783fd908ff5d79f9eeb5e1ebe98dc7e2c0b9a078
 DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.3.2.zip 171611 BLAKE2B 78ab7e9e5b381ff74c6fa1e25dacb3da3e8e21b86d59372144aafa5a49bcb3f2926abb373d102723c6e690d3056836a735d004f28fab7cb1aa6855d4bc3907ab SHA512 a7b2bbc09f09b2a66bccea6ad20fd04078ba9004ef07a273ee85fce81f2271e036eb9db7730d37225deec64ad2a4f09f68269bf187e9273231f78d47e1dc5ccf
+DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod 84 BLAKE2B a4c32df89469a4b93e0d85b867852d870bca997fd2d31163529c9a9f43e67765099caa6dd708e2edc4500b5496c4d36445d8f5c13ec9b08345d6f155dd68fdf7 SHA512 435ffb431d95016e1b15d4bebf142423ab3ac863a17a8ceb4a1595892e1a786a77b37ae0d3c63cd55904e92a783fd908ff5d79f9eeb5e1ebe98dc7e2c0b9a078
+DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.zip 198421 BLAKE2B 34ce056cf560b297318507470d955feb6b085d43b9ddda94bdd04a5ce5f20b0a9f3964269b7746c80020d660d2856aab51dd202d67ab5ee04c34cfdd63d03c21 SHA512 39c6638ecf2e8b3a8d71f8f218b266d4d8d15c008dc5860cc7e335f13719003dc2cae0a478c57d16080009518fdf8567d23790d456598432ea4b8659feaeb9a7
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
-DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip 2461758 BLAKE2B e02c6e6512de9be1410923a6b3eec36a087f8de00e1d1e715a61e6f26a18352db169b1dbec49e3d563e294d8c65c51ca5b55361dff70d1e9e20976e46209209e SHA512 7f9d1d2671c82a1df5f79a154340dd1fa1e92952feb03a1ddaedb1f6cea371bde8d6f7c774a4351aa87abc2646f97891d0beb4d175fe9d51e2f761d37f2699ec
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
-DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip 2656615 BLAKE2B 08542db845ecffd88d279cd63919a705d566084bb556aa4a6c98164a11520ec6476841128134f8fac2e5132d5fb298c9ef6670074891e91ca90577a8535049ff SHA512 2e51e876c4533c4b34f0017f6f13ff3c34922a1905f6a4f90bab241152dbb344689d8d1f5ff1040c79632feb21fbd8f213831179bd424579ac9b5bb602325bac
-DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
-DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip 2737734 BLAKE2B 6d5345f7334008fd717d25d3a3d8f18b77408de943a1deb60ec3fc488ead17a2d41fb2f91ee174195b87f01446fcb61106fa2798acbfd2c477863e7a1740a71f SHA512 b86f02e94eccf0d66190b6ce8025774e2c9d181d4308a4725c2dcd3e7234e71965250826c6ef604665922a2986c3c7e54309b22004fddafe8ebbabe33baafbe1
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
-DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip 2698974 BLAKE2B 5fcb1c66d3fa55efca631fe5def383ec089fab784cad7d6a031ea390463a0c552f5fc4698f7648d271f40fb0ae3eee525f149347bb409c951d15d86b7f560e16 SHA512 c7e2170eda176da203ca64e402c11489c1fd183afd3359742e373927ff228d62e445f5dfc001a471303e1708862998c125ad4c2db86919596297b11cae4aee9e
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod 215 BLAKE2B 0077e3bcaad8a354f484c15844594107eb1a56d551e7ec55cd75e4594e50af02fe3850d9d212b0bc425da71c20bfd7dd470aa37be046b4eb88c28cb6bb63bb53 SHA512 8f928dfbe495a84c91744bf72527c5662422e608125f8b58908803289a39abfec1823d4628a52b987ab5150103ca588509ae0074fb08799d075e7ffc4157dc33
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip 2700673 BLAKE2B 84605b73500cebee7cae122f45003110ec3a50074d0649b9e7e1e25915b1c5e789017c628e8305523edb28d8f93733b9032f5b20a186b4cba4a38f90c0add6b6 SHA512 5d27fdbda403bc5ca722280af1fc331e48e45dc97d6e0b9f99f0d48d2d173292ae88904236f43851173528d0523fca86dc15a633dae218bbe05bc0fc22e1d477
 DIST github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod 34 BLAKE2B 55487f18e815e30ee3653a5dcc9370d2cf044641f7cf12c566e165fa173efe9af3ab18fed752dc36ee0fa25ae2e81a5094e18cebaa61d997ae599b9cc3d09bf1 SHA512 a34e950c565fa284163c40712c9f5e53881996c85153f972a78f27a5cdcaebfdbcce60556e173bbef2db32939f1b8721325846b705ef1504a1c5680598343b10
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
-DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.zip 38604 BLAKE2B a7d16e6b3e1820db97600f17bef2076ec815b81d36c22c8ee927012e8df74bcfc6a3384b2abcffd974a1635068ffa5de9443b204c587df10c9593f830e1c3df8 SHA512 af7492e0d36fa2a876c6204a651d250193900badb819dc7db8c62141d7ee7253eab9d87393a131059587160a0a5f7d373017b2ea2170b4ca6d91e9a58175d88f
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20180513044358-24b0969c4cb7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
-DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.zip 39652 BLAKE2B c4c9dd2930eb417b8c6bf129489c3f067b5d127ed0194808d8e7594b477fd13ef20154508126708fc69cf855ee298cd4e9031bc34d3ab8025d2b2fc67ea21f78 SHA512 e23a4491896904321a371bb972437a0b55df33fe7fc31170967d6b4c0ccf917e34f94753112d4623518875ccb4e4da2e58cad54e0a821dc4e07528021a814b3e
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip 39683 BLAKE2B cebd7b69e8f18547e77e07d49ca26fabd513b6bf95317553c5bcabac3b513dc1d7becc259118eadbad18ee4d45a1dffc3ec96864b80d87c0dc6885983bdbb3d4 SHA512 e7a8277f9b7d2e35d1e8586c580d03457ac1e755e1051fcda20ff9f819a6fb9c3cd1892be3a50d4cbf141b35d1c7b85b27bdc402eb45b700a37ce994be4e5b5e
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip 39701 BLAKE2B ecac1c4212267252571babe2c7332b517c22a7c535777a40b6e318299bc284ba3676ca75df60670dad69698450e97dc614b98c6c9fa793a4f3daa3bf88859167 SHA512 e4cc88b9e484d43a328c2ce80b812d4886fee13b915a41fb64b28cacb163960059de066b9be8aec33be081fdcd3db847ee491aeeb1a74b25aadca2c206c9587f
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.zip 39744 BLAKE2B b1bd8b2983e8b27709639e447fdcb2fa10c1f6602d90b06f03445e294dd3f243d8f0ed1715c569acaa7e8b9455b4c8f9fef55ea64b1e625c927d89ff863e2070 SHA512 52a3eade285f16ca743f29de8676a7ce7dfcfd4728d1f2fe1ab64d372082a621fa160520a31ca9bf231e32f650f4b7faeb91ec172c769022bd55dcfb0d7856b5
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
-DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.zip 73573 BLAKE2B f0f57b09b2a880cabccb2b6d33ccac1ec2d36e6ecee84c2f7b487bcceaf1a1accf9b19996a31118498401af9904f3d8dd8126d6428a0c1f7f2ece4416562c2f8 SHA512 761035674673e77c79d8cf72c29bf297429f58a03e92dc37988f769d650b8ad21bf7785404f236c2f9a9a761987c6c35771758393ef723d8ac2acee811cedce8
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
-DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.zip 77887 BLAKE2B b83e776eee00d6209b0470b2a68588faf8d0a73f3624ab036b6182ef413326933bc9265a2435984a08c7c1ca95731cd8a81c215c322f720f3a9e5affe7dbf689 SHA512 772dfb4b62d9091afa15ef6e0e12f23844db25846aeb113eb513da1b0bbaf51d11afc327940d8f5520be2d239da0c7cbc02844f3e26ede26d70ac3428bcecd85
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip 85123 BLAKE2B 89a11d5b2c0abea9b2f391dea5fbd539b37f7770623b7e535b60d902a33ce0bd6a79928569542e932f117548eece074843303cb4c0539cc8def54dce7363fa25 SHA512 1bf7c75b83793a806e6e664b987f6a21561be9fc687364a6d4cf9fa104df27826482fee467dd752b19f349de2d8dacc1c390b064ecd4eaa2fde6d74bc10af734
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.zip 96199 BLAKE2B f2657e17317a84844687fed180e61ad8851ae46ecf2c6594c00885373a2a23e6388d38749b4015534eb36dc8d0b668a42bc1fb5be0ec6b98b1810c45dca382bf SHA512 2c6d6fa94b5cf2bbb4ff6dc6ea8cf3edfc35143e3bbaa45121117af9684c0c7261248e8cd4751a0af3101d65753219c30f462c86ab70757e5f41cfaef469b9ee
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod 102 BLAKE2B fc65ca5527061bb3ae4b156ab646ab37acec93f14ef00beb21d4ea93100e13a7f25e7d7bd3860b603ba18923075ccb2e106376f6f55ff261cdaa37ae325c554c SHA512 4e386a43067044e410312e3d6015ae59d6e77506b0db35d08fe7e6cda7b3908a5bcf6fa7432fbc5391252dd4dcb346bf359727680250af1311d5c839a4cbf4d7
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip 95367 BLAKE2B a94e0a99550bbf412c113e9721d41b4ebd81f0ee0ee1cbad9240abfbdfc91205a32a4d26676ba2b77e3b74fc86a739b5f5910aa0663a820757e541e6c889c0a7 SHA512 0097c67ed2453ee0ecf7571f15f229ce49ff98a9f7a9df8f7bb374fc693c784b6a74453c57509bb3e006833d341da7cdb9887ef3ad7e55a4ae8681e73b783931
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 482403 BLAKE2B 47db66e9c8187c20b27b9aeb8584f0f2289084103ccda25406eb30059147c3bcb867c76d145c4cab7eae801ed4cf76a63efe23f091e05c9206fcadc3358a02f6 SHA512 d102d00618f077f7d677eea9f0d4aff600e4b95caaca6ae6021355e64ed0a8fe418fd731370baa968f6fd338e377b5d3a2077b0b8a1ee399f992b8a7717cf77f
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip 461624 BLAKE2B 37b2bbde9cd1153fe5811ae008983179820ce40fd6816155fc7b7d040e29b8725509f68c30b5099b686e9a6ff31a2d029188aa526ada6375fb9c7a236b8a7d1a SHA512 a99c2150515bc3deef1d7887644497fc4aaa96ed6c2aaeae91aabfaee6668c144b34a2c75ca829636c7e88d59b297601867b0f188ac048de452b5e0767480608
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod 42 BLAKE2B 5e9f93d89d4f9aa6ac98c9fcf3f44177e95f08fa3d86789f56b6c52afa19c663fb36ec477a04611be15f51e8862ba90641fef9bac7c09b1baa7321b71b5c31e6 SHA512 603005008f167e32ed8984657a85676cc140d57adf0177895f6f4282a301c7f1fa2d826abddc0c59c725c810cf2356c820ac7fd64c6ccb2be132bead79603090
@@ -620,12 +660,14 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c8765cdd720690c1067c7c0ba1005bbfae01cd928bc60d96bd82321052fdb18a4ae12119144e34865cf910e306c5116e4f4f56cc5f70f5d52004e SHA512 acbd5afd399b3798d4b24529479b18523ae4009e21acde15a3893d2af75f9a6e65fcbd5a237423849003eb8903718eaa0b1aed9177c390972ab9490f3acc0d1f
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod 124 BLAKE2B 9e60030e0014cbc67c0bc7064eef3b127dec57dfe25bbf7f0d0e2b9c8c77e28477066daf073a6793428116419900e7c9f6dea6e8841a5f61812cf11ff77e7009 SHA512 14a0f1fed404939fad835398d5889ad57621edeb0e183785b3094957183bb29a2026e2af939b94c7155f8496e966116c4a6a2497fab113a175a9aef3f7ec3f32
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
-DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip 206762 BLAKE2B 13c74350dfc3bf39540c37f6b7771f18930d6bfd6a5c83c27c723065da6458e0de544a6fa4d57c027e6c67eb528493c620228a56249b889f00d67a064218dbb0 SHA512 3d92469995664037149e3e11363db685b3175fff01f4ef3b578ada273853a16131b3c97899b497ab75ffbeb6191fe59a28f073779828f719681b8e15182b6211
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip 206951 BLAKE2B da403116137f70222d2028df84c6f872d324e6aef808ceb2f58dae257e9b7cd2fb37b477c2b61bda55888f5aa72fe6f46afc79ed4fb440f1212c5105f8b6dcc2 SHA512 8df603b906846c265342236e7bff8ad4f37fbac2ab425b6002201ec727602bc2454708985d44de11bd91212e15e338ce1942f33a3e38c328f2ab9e3b990a2ab5
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod 129 BLAKE2B 15d140a0b2b22d6c9886ee9e517f923fda26ee8179755702a8eebf1ae8cf75be48e8d28a1df1bf875a7bfd499075d83a541c9716601856abe0e7c850a3ec68fd SHA512 467a3f6fb4c941cd55d8d4b2d6a2015966c60a8614691539c88c4bf0da2f8022055be8561cddd0e60b118f74f010be5998dd128b7b136f14edd2674e5650db2a
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod 124 BLAKE2B 4f470777c8d8816c52e0fb82b2ef37d4e9879c46fa93e8e4fc87c46b85c36ee6b4b1ffea22db22af2946c0fd3a12affa9df706f13f2367b14bb1a72c737ddb66 SHA512 6b46c8a019e49c6ed2307e7bf633d4fa04627938bcdffec22da42f722aeceb35de8655b04f69eb651fbc662ac5554b54b393340bec3ef4cdd01be2d7f6d07eab
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod 192 BLAKE2B 08ac45ddd213c260f4b9d33fec4ba9758ce949c699e2d8d6c7b31bc0fbd7498618cd5144a6ccc3e1b852e9f1a6b7d00191ada7d464dd5784d132506c9a8639ce SHA512 44c996ad31bf02aec42bef934d7cd65379ae5eca4d1069dab8c478be169f9479cbd55f8f72bd9567e51535d31c9f65cd1d56bbefb8b745f96cad0f5953f8c420
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip 206858 BLAKE2B 42c113333104cf0335d16d24748ca111dc44a52b3c6ceb8e11388c85b8ac80c5c324ca9c6d90d08c07dc865909eed4510fb145153024890e4e160cde2b877269 SHA512 6df84a92489b04e55e35bb2334f7e9e55f4fac646e9ad904eca189d069443609fe1affc4cf5e92d0f90ea9c75162a72f134c6298f828608efe9a71b6e496eeb5
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.zip 79266 BLAKE2B a012e020cf28ee7c9e096068c22514b643d4b299e9396a37f08a003a3167e341cdcf40e1cf424c22d81b9b696175210d42cb8398c9ff37a80d47f4daef10d82c SHA512 c8aeca0bebef35a5a5e87804cf3a74cfe879348fa091a8d49144e164449b9f15569a9ffb7f8f684149251762186ff898b1e8542ddf2ffc642ec625826523b5a1
 DIST github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod 35 BLAKE2B 2266c9ec6e2058e41afcb70dfe33ef7bd1d4c0dd3ef6af9dd85d9f86ac0c5ebcf231c21d66a0c34d6e5930e1de410ad482f7774a42398aac213eb0146c2a00ef SHA512 17790f178fd61969fa03eaca0c0a546ccb8215016d44bcec8105cba39a188c855b5f90c7d6c01fece401167daac2b662405532ac3b38e0a167a2629e6d52a01f
 DIST github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.zip 6328 BLAKE2B c9aca12fd6b2a67d89d011dbf24846b8e1a298bcfe3d47406b59d19e2d07d37597e4379598a56cc92aeb53cee723b033998a95ae85481faa29affb3635e5df75 SHA512 fef69ffe88a470c0c0e42ca6b990be8eb6423b34da2e5d889aa0ca11f6f8623fe66d7dedc4f7e71c1bd78b7c65eab12495d0ebecbc3364c29f6690fe60ab25ee
 DIST github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.mod 33 BLAKE2B 1f96bc7ad16794099334f84bd7b7760ae7eb94a4b32186b2d408e3bb424d19b22b3eff38a817c6ab845ea7c39555305bb940f2b9b9e83b342eb4169f2237d207 SHA512 5a17ebee3e4ae0212aa83c4923932996988a3a693d0ece14fdf1aca4193452ca43cfaf4bb6dcb78c3c7b996300ac285c503ac18b098b95445bb26b7c25cfd25d
@@ -638,33 +680,34 @@ DIST github.com%2Fgolangplus%2Ftesting%2F@v%2Fv1.0.0.zip 11956 BLAKE2B 11662988a
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef5120adab042c415b287bfa6ebf901181837122bbf83867ff312900a16a24c0f375708f915628ae5bac93b42f659663cf827b81e5e6c4c6e47769 SHA512 b54c7f94aef24c769a0478aea5dedbf67309dc3f59a5d7cf52ea8b49e81783d87bf80e5bcfa36f1f95a65e64bdd8312d20ebf81cd73952af5481b2f1f3619eb9
-DIST github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.37.2.mod 2517 BLAKE2B 81a8afaadbb23b4d73df34854790e5fc37e45636d30aad01d867e0d2c48ae45ad13a95295d3998ce640ee88d933b9c76e4de78634507758175bec3ff6a87b86b SHA512 3bb51cae3799f273bdd2e1e3defeb47cfa3d74732254c2e84e02d9c60fc5e6b2199db3cf90b76def6a5d27dba1f4e559bbabaaa86be7b5a236fbfe815e1fc563
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.1.mod 629 BLAKE2B 301265d55a1b721f15a6761e5fa5123266ef57f11adac54db2d55b14a89b40dce70b307411dd012ff946c215fecf8a3c2b5342512ed0e974501c177499b95b2a SHA512 b1f1c83260a976b4d1e79b029bdcf7813184e3f6d45b066400f329b099ab478ac54afcddce10b3e358a14ae8af48c7a1b56dd231388ece034b6092fd11cc44c7
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.1.zip 18241 BLAKE2B 3fad298fbe3af586c31506677c832e5b98afc31a1cf180af912cd65bc8f45ce9448a663867c1c172ef485be458b021ae5804daf974019a1ac1abb7a6af5ec16c SHA512 b82644edae6e2d95dcbc7a7575e5eff35765fae183459dc809f44f337826ed38cf84ebfd01f142b79e3cdecfa3c0b65f9ff83aa91fb33a1a0c7c0bf48d472c63
 DIST github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.37.5.mod 2517 BLAKE2B 81a8afaadbb23b4d73df34854790e5fc37e45636d30aad01d867e0d2c48ae45ad13a95295d3998ce640ee88d933b9c76e4de78634507758175bec3ff6a87b86b SHA512 3bb51cae3799f273bdd2e1e3defeb47cfa3d74732254c2e84e02d9c60fc5e6b2199db3cf90b76def6a5d27dba1f4e559bbabaaa86be7b5a236fbfe815e1fc563
 DIST github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.37.5.zip 531525 BLAKE2B 787ec82b2deede4949d3b967cf147bbd6b51f4a00b7244ef7184a014bf0698cd1ecdc21d96ff3cf7a18de0be28e12c6cb58de1b2900a65c84f9ca6904d358671 SHA512 675a44eec906a002074bb4365a9fa5dd352c676460d333f9df6ea753f53d7145d03ba8627bb39f5f440d596b811836f624fdc1b6f7c7c71dc287ad9d559c5566
-DIST github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.38.5.mod 2409 BLAKE2B a5bcc064e668a98bd60ac5d67e04c015c14bd4e974c9aacad133ece7d5daa09dbb0b4df8ddba73c9e348babba0b9eea06daba76569646e3a33c31c4a11b7e783 SHA512 1a21c4e286ed8ba173c9abcac0ee351a78f6e3ac19f919277cb682cb375e50f32203166e2570a810af3414960a2e068aa06c335f0ec1ad9ed14f04f031330448
 DIST github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.38.8.mod 2409 BLAKE2B a5bcc064e668a98bd60ac5d67e04c015c14bd4e974c9aacad133ece7d5daa09dbb0b4df8ddba73c9e348babba0b9eea06daba76569646e3a33c31c4a11b7e783 SHA512 1a21c4e286ed8ba173c9abcac0ee351a78f6e3ac19f919277cb682cb375e50f32203166e2570a810af3414960a2e068aa06c335f0ec1ad9ed14f04f031330448
 DIST github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.38.8.zip 547429 BLAKE2B 9adf653668b3cfe72239fc1c8ca6e80d9592d32f35cd68cf910534bdfd8dfdf13b1ee255f573bfcfd6be8d69d1536d88f5012f61b3fedf47e6d5aac4ae1fdd36 SHA512 29fed1b166d9a4ab08024958a3fa4494f3b5f3a66ddf1159749c4ecfc585032fbbd4a5af352a917cbff0a08b94a5b259afbcd3a662b0c7691c7b9c13ab7b3324
 DIST github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.39.0.mod 2300 BLAKE2B eb4cec017a424a45ef5ccd52a432531c1bb8b6c80a93d67c3233d23020e2af3b8ae2524e9943ade53ce9d55eb26c7eadffb05f55b79c79994c066390fe5b4c6f SHA512 62c12a8ce26e3913902af801e58492f7f41e4972ee57d08cab0d912f825838eeba98ce75f8326a4635d00bb5d559480f62a0377833169229072675b6bc889e39
 DIST github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.39.0.zip 1263457 BLAKE2B ff3c010aecfdd11a67c60d580dd544c57b10931f94e82873c59a267c8e90422cc55464ac77ba03843239e5261a3b0fd036dfc591e34447dd73dc4418a50e45b3 SHA512 5e9374b2b67b8fe635a55b150f11c445f8ec58eaf7819a43ee3bc55c45691eaa3a6876ed065c3ba1677fab7e9913a0db16cd391c92b85c4765ac358ff825a2c6
+DIST github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.39.2.mod 2211 BLAKE2B 8b91818454d3964cf98e7cdfa1da743d81a060deb9e6e9eb54f218c204b83e4578117fe9de372bc1505338476c39e53b4c8cf7818ebfc06fc96fd244bca6df60 SHA512 b944734881a43f0ccad25d178e3d0103f89153259d09702577e5db4dfaaa3c38caa876aad09cc3258377c0541ddafb2efe47e514479ce77d340eb899a23c48c3
+DIST github.com%2Fgoogle%2Fcadvisor%2F@v%2Fv0.39.2.zip 1271039 BLAKE2B 2c1bb0653290a5f88f9d2917b703bf95ade8379bd644c13f387d757f4e2db9c7e79d4c6f4aba8dcf1497c7a9959ce83d0d483de4bf98931d4c179ca6110a9caa SHA512 dabcf5ed30452cf1bdd67471c37666e4fb83eb26a28f58200f43729d0c6609a9bfd8197d5ebf1e7905d4996929e327b2710e4fe7a9cb8c0ad2a9a16256e68969
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip 99332 BLAKE2B d95e04036796b0687ccfe18e2cae196efa87fbfe7a763a219860a82117f5a7ac594af005d67698289a9fa0f19b9c397f850ebcc8f6b2e2390fcc6463e95dd47a SHA512 6922e27a1a67c4e858880ca338f68ed80bc01175801b2194a900ba265c00eb482c29e785c564e9afb8f60288593b315ae8af6c8f366d35475678003440115d26
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.zip 125740 BLAKE2B 53846b62364384c96a4a1038e7c04213e5623fc97365708174ba705781fa07760fe7726615901bc18a2fa099e90b7e4a5f9023daa5c5a3db8c421360a730e97e SHA512 6ad2ac900d1a8812eb6dd037a2ad5342ef74a339eeb490f23acc207819b8ba9e0c53185364908dfb65e57510146084c7e35e75de0a9fa4bf0898112f8ca8f551
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip 127156 BLAKE2B 1d06924d2e9fadaefa1a506c16830c88e983c3d14b3bb9a82c216879531ffb664dc90de8fbf3b6025ae8b5e7cee1a9ecb900a7eabb85f6144d304fab7cacf21f SHA512 365bb5271fded39749a69bdfaee6e29740b26b84e0a737fedab3e50cc0416a098f0ed0a14704dc1ec9bc1eb81b8827de4a151024f5ea3e6c75a9fb9abfc14d62
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip 128896 BLAKE2B 4981d158f2cbe026d5b56192173ff9da3ee72a91c766235e485530d30524066f4c619e7beb7e8daaf8f38746239516e754be3915126a908910faa812fcc55b38 SHA512 371abaf9db7012c40704d4f5ff322dafa27211f434b477a632f88e57db3f2cda168cef55c293262425a1039caed3bee9a65d48fa8b3d71680d66d3cc041de845
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip 130974 BLAKE2B 6e4efb8abb584c3839c7b1ab80c8060c125b695bddddd44c57f72c0fbf9de85d40595ecff57f57ddb533e34dbe72a95e0e8043d91d462d68818699f194766e90 SHA512 9cff1690cb177e70b1d67ddd305e4317e3d1ef2825f5f3ed4639210f7f2ee6e89ff03970495757b922f16fade5fafae5cc14c8da2b95694faa3fa48c63f3313d
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip 132988 BLAKE2B 48845d9df9bc0766f93a141ddc1989fcf850d76273824d62ee11297774703bed33b1dcbe77817b6eb417769ed11249d8089d248631a8c6669a75a6d34e048653 SHA512 22df4fc49c44a1e73eb72295195633bc04b67fda27df452893ae77932879b62b344455b880972e78022a61dafb30eba8b5b6a872f6c66e093323fd5d1c086466
 DIST github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.0.0-20190617215043-876b8855d23c.mod 46 BLAKE2B a95b1e1023a3e311a8ab8d5b7a6090dad803a9fc1885216bc3dd047222793455f2221e4ecd01aa8791b6b1abed2ee01eed4da347eb9ccf7d3e0670f1dc99ce13 SHA512 6710d64db799643143d3984e4959f63d77b38dde2206a863d6c97c2b8067a629bf9b5f03f46d8e893a484cd270769dce0f2a7f95294428f7c66e8399862979ff
+DIST github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.5.0.mod 1857 BLAKE2B fb8f66ba6335f4f597eed52c6cb20e642ec5378c2040cc0191b6845f86988d0a57c25963964f0d82a9ba39fe60e0acae748c281b3cef852b9582de6f6401a838 SHA512 6f5c00002abd520bb7961fa74aba7cc3c71e533431304f8e21acd081e5380269ba5565c18a2f811e0ad918a50fc1a5cccb88343b835d58a987ee8e654e433ce1
+DIST github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.5.0.zip 1870971 BLAKE2B 6fccdf2f4ea66e1d739ec556ec16a6eeb2a4e386ae05b687c13dcf8446edb72afe5806cb7f8cfef9b21b486959c670ad962f86306ce762b1820329842fd0ff62 SHA512 97935f9dc692a317d21505516af76311102ff5d87f62697391e5ee479206af97fd970e0d3fdac348dd30d1c6a831f91c6aaa2b6987b0fed87dc9e73d18656d3c
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod 32 BLAKE2B 11dbff4f4352c70c63b410ec8fb7986235dbaedd97ed64d665ab465898df351f2ec3eb9758c165812d5f97bd7b409e90f2db6ee41d73ac9d13fb96c638b42c38 SHA512 8720691f3968ccec689b3c777eeb9b5dd2932f16f77760db3e51fc0315405f7d96711fe0683d6bea810c8ec4e5b320fbd16e228f5f407b12ac5ff896cb263372
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
-DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip 16584 BLAKE2B 91b7f51050c2ee0261447144d1f86c7952cdd5f3096d72040b069dd2737c008084bb456b57400d3fa5cd26ce3bb34265c0cfcee94c4dace3468ef13b62d73c74 SHA512 6e265617828739486750cb8c5a8337f3e17f83664821208778528d93e608bd142902aaefcd64d4e6fb8542e5b0938b12191ea070fb5deefbff946daa146e9278
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip 16936 BLAKE2B 04270e67b679a158d5675c41f8b92803ec49d9d29f4e8725345c307d7cfc97a4876b30f6518eadff651a38af46440e184294ea48757dcf53ace35f44d36801f4 SHA512 c94aacb755ae942dc487c9e8f79f01016cc31fb118f6f340a58eb4f458de5735b2533af6ec513cb4512a05e270cca73faf46c5f3f621a0b76a79d0606000d3bc
 DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
@@ -673,49 +716,46 @@ DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 3
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
 DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
 DIST github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod 40 BLAKE2B ddfa83250a6d66e0f112a249993164e9dc1880abef25e9d8921c58bba907eccc0fca5f34cf3333523d81b22e615e6bda8e1080a7bbb8d21e33fafc168de0cf8f SHA512 33a53fe7874517289a9eb9d87b62060ab4827159300acb6f933018b30fc56e3356ec3d33ee64e452137cc6c892a0c6eddeb7e6bd383be8972407c6e7568f94fa
 DIST github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip 8977 BLAKE2B 54e69095f7fc33a26037f2a924ce3291b3a9455c6716a50179ddb161accb07d79f30a72400ddb13229109fead8a9a2e8e85c78f63ed0c2303e0777a571e2be84 SHA512 74bf278d42859148df97c1fdefcbe962ebc583e3c567157b4e17721fd4cef5db7d24c9a76fb32a3d827e6bce6ba761181d9a2d1eca804b59f3cb792a30198906
 DIST github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod 34 BLAKE2B 2ccba8347a642af8518a868d34286011a61a2f540151a9ee37cb20a821041af46d787f1e59e55f428a380d8a27d0beee4494ee7a514a7f90dab18d06f67b8ea8 SHA512 5cc997fe8abd3a4ebaea6f2a023f3b9aa7d31de3f57d1b2693efbef17a93b5a9937403c4c7ac06b78951f04d517ad59e41b171b3fefe0330db88a705d74e94c1
 DIST github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip 39658 BLAKE2B 16dd91d050b8e32594fc01e02ed1cfb23e4b33e922af6c94ba17ac18d419337217cb231b864eb5bd5cd0a6d9a19e73f8c5405cf283cb111cb9dfaa4a84f7ab1b SHA512 f74c5dbacf2e1c5899b66c9ce1aa0298be7e36a04e493cbb8ef65254013c6f00caddf203c20638a9ff229637144e26b892ea16bd546c8eff0bd2f101d3d9f4b1
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
-DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.zip 20693 BLAKE2B f0dcdb63fb70631203b429ead117c7f4db44738c2c6b58013c591449c57e90b7441bd5d298255b229f211882dd73a78967d14e6be7b59bcf96f60b3ffb557a65 SHA512 e46912eed65d3853f80e1b2c990a7c72f1c613d373ea1f4f0c5782b513362a0b4294847e536262039929c65c152f137f90a03d6bab276541b801427e4322bd10
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
-DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
-DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.zip 21638 BLAKE2B 63e755faff06cc528386a19bdc3396a6deccf4872ca8d20484291c279b7c93bec50af19c31d6b41e37ff9144085af7e267ff63490bca1f2524c52a52e28c645f SHA512 b4c3f39d7ef5d42eb89e78e7924cc6edcb682062bb0a96295742359089fddf2806557877bb8ad609ee9c53ecf9d0fce15d0c8366d193ae89a979f834bec64ed1
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip 21941 BLAKE2B 94e8f4d50c0651e1bb47daf76c642871e1e3c53b725910aa101991a7a9b83b8042f76f20be54323b66b5dda1900a7fa5c3708ba0ef02fa2a72c2012efcfa1644 SHA512 eef3b3444dce760fb6cbca5e22f3fcb33fd418e2b54509e80a2150cc644f41a05a59f0acfb7fee386c994dca06d96f4cd023fa192aab368be08ef20eac4a626b
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.3.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.3.0.zip 25027 BLAKE2B c7bce22cd6fc49d4e5250a6dadae0bebb869d88fc0c7efaf22fa3345763488c9a7e5acc826b87c5001c5e53915e327c653e0a4e0bb945d601a79a40e125a775d SHA512 7160b10282b5e11df66caff015b151a1cb2f52794cd97fb0011440a6a374dcd1e88141b516ab1951de594bac0ca9401b2637c4fbcf3f9227d6fed87a21fc95aa
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170426233943-68f4ded48ba9.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
-DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
-DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
-DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.zip 537340 BLAKE2B 6c20d5154ff3df760a60d3828b2171204674d8c477b7836cfb41330eb74656fe2dabdd8067eb2c88ad511c4c58f4695e9aaddf23f94767e267385ef26fd16bef SHA512 fc23502a912ba05b0e01932450dbeea39731b1c470251a3780040cb79265a8c6141ce6dc806e564728ca5bed9b537bf36fe6cd104eb25cef8c0f9a04e51bfeb2
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1.mod 183 BLAKE2B d0b924588ff8bc8f0f19031808d4d1e33926040e3d66ada91561b5f549b663ea2a1ebf682ee9da7a133e36a1bd27312465ccb0076287c1d5625629431fd32b3c SHA512 0ceff1d2167408fab3f5b5d1b64563fcacdf5b1db94c4fc8bf4e90dd7fff9c7475862df9ac15566f0365e5b47b4476b8cd398a90dd011f4a73ebf5f7fa61a7cd
-DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1.zip 561785 BLAKE2B ff16feed7c7482a41f0fc715a34f82f9818abcb79b5178bc7e5e0ec641d46a29094881e10f38a53e6c4c90e2e0f302be77ce9c4a4f07fef9f896c09351008761 SHA512 03c175f256daf180119752b31820d6c3ea5cf25b091ed8cbc3b28c49df68290618473187ff95c43dddb69d5f60849dc2cd6911c1a3f5754a32fa0ddf24ac3528
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod 278 BLAKE2B ddb0dfbc6706088c465077c061562538e66dd414033408a92d7a967fb4382f10ee4926bad97508e4106b9ee341bb7417337630ca006726fe79f3be7ae12a2953 SHA512 3a36f6a3ad1c6dd306291520ed836c77a58390fa21fb6777bc3158df18cb254096b0eecc791947e7815098e020f260a4914bbffdacb53407582f9cf2e908b7a2
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.zip 467713 BLAKE2B 3b48332c43aa3e7e9196503297acbf3cf02b29305eb1f54f459e456f6e1de7851034ebbf15fe22917824208a98aa2435132cf4fa7d89cfb1aa0fa6c8c7f6db62 SHA512 041514fe7007b305fa8a67c4c937560f7c173429bd4ba98baf7512d213b4a917608725d6d6761f7c5bdbecef5ced189a0a05d9c1d4199b54ee523903717f94ea
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.5.1.mod 380 BLAKE2B e02888565ecfdfd6ba90c0a826f20c79c06902c11e398eeef8b3738306c15bfc23db0a82cf7c9bf95ce5ba3f79f293ef3a57c0c3acf56373237aa1cf9ccd8ad4 SHA512 df86f249888cb5eda40b6bc098b469465df9d53b1cc6c67bf610a0cfad408b650af4ce56a5fc13ff3014ff5077d1eb838da284b2bebb7e6a95b76943c3614022
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.5.5.mod 478 BLAKE2B 2a90f424cc3438a7f0af472f4b11a64151cd9259beb2a5c22f97e5384dc3f66557779f53d87a4fe13427bfef99dadf22123d90fa5f28f5fd7feeb086c40ba7e1 SHA512 f9347a47c8f5b479aba1332a89dc233235fbe95f293c591e35a9b64a96d02d8b34a3b38a7aa33c0c79d693c984efef92a6c4f7167f4cae1d6838bbce12e4ab2b
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.5.5.zip 630296 BLAKE2B e443dce201b376981eefcb67983381373b89550da11e33fab977847ace7cadf2c8a5ac2a79a0182f98ad3bf3d2833b9f1949476a8b4a9d200d7fe60eae65d514 SHA512 0f8330bac882c93d8add2fcb85fb82e20d34ba69f5391ef07bf30bdff350939f0d09b1671d658bdb57c552818938fdfe5cb1adeca74ba8e8c2fa9ad360868020
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod 201 BLAKE2B bc1972ace31333e12a0462701bcd8aa135ebda6f8619d3f98e4db0bd037ab854873c68c2503812fad3773f1bb1937aba7ca4b2af50e8eb2c13cea5aaefa7f573 SHA512 a1e237b3f47807afcbe3eed728821d15da81c78e20562ded5a8cdad18d498a670cc4e1c10821374fef8661afb7ec7e41f27b4dab8db2912db7edbcdc642815cb
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip 1719536 BLAKE2B 0df6f7e2df2152bfe6ac0e7065a8c2a2638cc82ca532509cecf5f102e16c1463ad38ac75d324eb38f12106e4cd950d647805dd246860f05f1168ff7c92c1c1af SHA512 ef4d868f6c9f92cfcb5bf7d53e02ebe04e14fdc11ca22e7297d88652b660f6667d491035da7a9a1dcb25654add04852e968f9b7633d5c363534c63db58dce8bd
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20200217142428-fce0ec30dd00.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20200217142428-fce0ec30dd00.zip 270515 BLAKE2B 57ee358bad0560a7e8d8d67ef66a09c0dc0698d950d749d031c9bb7af11ba47e6ae8fcf33eb2d931b703f9da579822beb5b51c41c98ed832318c59293f28b620 SHA512 a78028c7f115b7d0347feefdfd368d470da75a14e92d94a705316d3bd5299bba7e3ad6e7774c512270062058085c627796473b66cc4076a5373eaee77f256b93
 DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b
-DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.zip 6042 BLAKE2B e2f7528550bb8f14d3f1546786616d85248b896e5859c0cba4ed17cab5af3f37765064621fa41fe0ecd46646b547ac54a48fc42070be9271f6dc333eb7d174d0 SHA512 b062352a9628f1bd9408dcca0e1062fd2c20c7bb7e2ab03518f866236e914706412cfefdc21e7b836ab9f569ba0d93733bc1a3f3f0ef1ded5086075826b0c708
 DIST github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod 35 BLAKE2B 549faba95b001f14aa66c628d300b6b0e496c92cbd87ed5814b4dbddd422df6d5d7a38af10ea061e512df4129189d221bca001f2b23ce7bbd13fa0b7152bbf4b SHA512 b4c8a43e739f69430d5004c01d083be6f65a70301adc0cbe824955a3b7b50dd2b6033fe8db18419390cb577f89533e9b0399a169f1b10ea39fb2f0c0e3cc47a9
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
-DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip 54002 BLAKE2B 8f6fc685cc85f850ecc0b7dfd63c37a23dfb6d0b43107ac749365b10f254f8d6cbb16462848e317d91410af8524bbb1c7856eac54c7e94ab6a92d813434b9c40 SHA512 8f82d0b2d7e881b7533e6755448c01a8e32db5bd117d61afd9456387ec87761b58ffad050c4b5051ec4853096c0f11fcc5b87be21c4062ddb3d365e23405123c
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.4.mod 39 BLAKE2B ce025298653101cca2bccaa3f6797881c47f92443d0835d57c2900c62bb34a82d1399884826c863a7a51fbf731c1a8f836674f4416ec2364a20c690d788eaf14 SHA512 3398e8e140093ee9f7c27ce680fc141df5bbeacffb365a98b64898fb6b28cca8eadcbed1d593b90a101a1aede53a5602eb3455e4ec364ea4b76aa3ca043f68f8
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.4.zip 57017 BLAKE2B 127365619f054649afb5ad80c3ea7b63fa45b5d8d4e8194d4cf15f8630894e805e28b0076e1c3546585cff3a8b22f7ca294aa29c0163b072b79a61820b5e9649 SHA512 c7cafd76a18c18410809238f72bf99fed924d6a23d68bf26538c06098f0ee4fb7ccc74a6d2c662fdcedc1f33c8b5907e79cc451b3b9b1835fc695175f46f9698
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod 39 BLAKE2B ce025298653101cca2bccaa3f6797881c47f92443d0835d57c2900c62bb34a82d1399884826c863a7a51fbf731c1a8f836674f4416ec2364a20c690d788eaf14 SHA512 3398e8e140093ee9f7c27ce680fc141df5bbeacffb365a98b64898fb6b28cca8eadcbed1d593b90a101a1aede53a5602eb3455e4ec364ea4b76aa3ca043f68f8
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip 57100 BLAKE2B 002b1bb18bc81e6a124d511aaa6270763eef5c9af2117cec54f4dae6be22f0bd0de2594158484ae32933f24f1107f4bd490dec99f119a1c7d2cb2f722a9160c8 SHA512 d4bab61fba7c23094263e73459f6b4bd15bdbe02ef6349619cf89e1064a7d44c20534d6267034a0af4f2aa1a7aff0f02c35f424d25e6dc7c4d5e911e6e9fed32
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
-DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.zip 67349 BLAKE2B 65b87b962f3b826681183536713048c4719354c7e90c54b555d946edd8f37af86e40cb9230bfc1bd191b38c11fbc32e46e585758600b1f870e7ab948358194f5 SHA512 f6f902c1e097a4cedbeebc96785184270015009d8669dd6ed118a61a3d12e8a5c40a773a9ba9aafcaebd7442914aa8d8edc96b4988619509972fc74b211a13cc
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
-DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip 73861 BLAKE2B ab1760636aad8ffa0aceb1720b6221debe9ddc6ef0c50d180cf5eb30d19a746acbe07ba3bb83047d7595a7e3060370c63ae6288fd2c57fa66a49e36492fc93da SHA512 6261d3ef4f67e239ad3a2d5b3a6b7b05254f6596ee7e9410c1e80de1b42047642286b2c0239b62ee769fbd2319c5aaeae595a1b9beb69abdd85504b53108bac8
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip 79215 BLAKE2B 25312a1d971b0e214f92e88846586f3cb96a23a8df927d2fa73e37cca6eec4d55cd88c3757831f37661ed82a0681a9d0c3e1edb32e5182b1a0b8e349e28ebf79 SHA512 8de80f729d0538295606f5900e9f70a3f77c4b6ea7782c9bfa8520ec89c75b6a7ae08b42b6ad0dcc261f9e9a298bb58645fc97c4e5c2b51cbd6cbab62401a2ae
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
@@ -725,11 +765,19 @@ DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.zip 138925 BLAKE2B 34895513786f190d7379e74e7256b9fc18fb82bcc985866dc94ab2110fe04c120fda46b2f2629b87d9d0380e21420a625f8206782c67ca5c0e71c6cc8309b9ea SHA512 39bb926ff817750578322805bcf412db6c09ca5b7dcd237fed9f64df51222de62b62eee275e6d37c7dafde7dd8fada499c344c62c3ef0a3bd8d27053057f4079
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.3.0.mod 746 BLAKE2B 91753d65b726ac5bfc246b9b84783a9374369c8883cffc0f4a55379ce12332f6bd611f698334d5431f9f39386d076e0e4c02c1303c3e7268b4f4fbd89f8a072a SHA512 3554fb792cf0898b664445f00e1d93a7298e3a8bfef948686f13b915592715e447c3c7e1214d640a582ff0bd83ee5ef1113709c0cb202c218ba80a6534c4f7b1
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.3.0.zip 166741 BLAKE2B dc31b1a683b3c7e1a34c79b2716a3c8bdd9acc625fe3fcb5656f07c12efa00ff83fd23f29c5834d00d200bb09a4aeca00bd082a06d76aac4d53a0800bca3c21e SHA512 8a95316e4e86e6406603124aba7daa8854798da59c0590309942ae545794cf011b2cb709161f9abd22432e3c0d669b45a91ce9bca5a1bca7080660d80edb4a21
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip 35110 BLAKE2B 4ebd3cf0dc4580a53cbefe7a955cf05cb6d1d60a69951ea4e18eaaf108ce2cd5bfd0b2dc4bed62a12b48922f6f9dcdf1e598b77a946bfa0267314caea827286d SHA512 5c8e6beedefdf390a9eda76fd8d5042323e1c9a6306605ec7ca8b1612bc038a6cb0c02ca1093e0b6373a05ea64b7eb0c0bc62720a74b37d4ceb61564f4d46753
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.mod 588 BLAKE2B b3d6657ba787034ed2a14fdb98a7dee43e3d9dbcf253558c588f9dc550b58a294db9022d548d48717ece007f20f52f5004ccec0fe92415120f9110ccad5c9288 SHA512 6d314f14132c60d5dc614c81746fa3492dc821c77f2c0cfa90dccb3dddd5dac671682cd842d9ec4b0d03aefe1da92e5bc2275e9bfa2bbce60e8bcb8ea6bdb173
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.zip 685854 BLAKE2B 2de9f99bde4593ee24aeb819c12df9fe950a62e7e78428dfc18051012c5c3dd791da1e157a1e2f8c5f9367f2ba404ae8e5132071c1ab3bda1ce70cd1aab391de SHA512 0d0ee621079056418847820d55f794befc0eda9a9e569c06c9f099887e680be31683943dd4aa25813caff89e0e573c6d2ed3b27ee7c99cfaa381c34c0d1c1edc
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.zip 429863 BLAKE2B 51d2d6558bb657231d7e7e9561e42018196902dd388a320726a5f5c93b1111c8ed0b8c6eccc62b2e6c49d4b09f084ad99a8b17ce3944963e990c75271ee6f8aa SHA512 3cf71984f9b4974a2967b5d0496bf9ee28f248f10133ed54017c02b7d2bb9e04dcc00cd3873f5a8b9fa4ae7d6cec619a4ee4e97e6dbfecd886df10de47017fda
+DIST github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv1.0.0.mod 94 BLAKE2B 36f3fb449d60fd88b98ab51277603a6c6aa551a1b15fc01ec289506cbb22fca2d7bc2841dd8574c9cdcc5ef14d70aacd5eecd240060b396c76422326f5e5dcea SHA512 a4ec6bdb7df5b5706be0a19144023042cce1fe54d1fe23d2556fcf1c23fadc112f5c4f16d6b497ab0ddf595fb21550543e65ace43a147747d894c220da346ce2
+DIST github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv1.0.0.zip 219180 BLAKE2B 8b80ef3028be429c025c8b75aaae686cac7fcbd0d6b196311dc77c1079a5c8db5b8b2db602282345bb0fd25037669b00796e7a92a40cfc42a79cd299ebe0940d SHA512 b5a5bea977945d4305b3506e5a6f96d1acce91280e103f1c88f3b2c072437d5bbf84b8ef8760ae073106156342356a763ef0db9339b6e2c72002a73f8187ebf6
+DIST github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.1.0.mod 265 BLAKE2B 35dccab4c16be9d4cceeb5885b0b98f67f4039dcb7084aa8183349e90f129a93d4443d325e587ec477fe0c66e0619f013874cc2d9aaf0a5e59531c4931239513 SHA512 5321d209e974e7eb23dabd5d4fa9b157ab722370a71358d059180a5c14b14a23bca5943a8b4ece9aa3dbcf75b402cb654ca9eedb9422d69b529498b2a72d9e88
+DIST github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.1.0.zip 313278 BLAKE2B fb3a32ac91182849b71b351bc5c26c73b78765a7412eb36265a8839d25d06ae067d2cd6cbf8791771d871ef6085b128894c395878949cb5e89ea34994bc199fc SHA512 97d613bc71b7457dd48616cf402761e2209768fa0828595656437fed338d2c7ea33d6c2b01cbec126e623f48e108ff0d252556c11f90a5086dff92edff5cc0cf
 DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod 449 BLAKE2B 1fbabe18b977c8e6283312fc1f8d8b35514104080a4880afd4445b92fa20af4db49ef3f7fe1da703d4237e6bd78902e64fcc7e9d4db85e84153c2bdbc6a6366b SHA512 a6d33e281b580e5a3461edadbf4e5ebe6aa74a8a929b9f0e96582592b24c85eea1ab202457f88f648018cf5991d267811132ec77255ab4886b6ccf958487d5eb
 DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
@@ -741,6 +789,8 @@ DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod 42 BLAKE2B adaf8e14cd6696bc97bedcada70988d2508d8bf28e94a8b528067359665aac351ec7b7f38ca1a89ceb0c18c3c7935e30af4df20102563c9372b34b0cf54d41bb SHA512 da70feb8b6a17512c3761ce6f13653ea47bfcb4af69b471a3bfde9b79901d0f24ede05c10d35f3e051df54e1e636a848be5d00194ef5e9b85bf7915d6b27dd0e
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip 14840 BLAKE2B afc6e5519fc2dc1209382c6ffb6f73d29dc97b6cfa03ef525d6095e65870a1ce25ca59d56648e24bc399f53f6879c0a3ce91e27645a48734602292c7d99bfe16 SHA512 8f86f79788cec64d9ce4f02af2ab7acd64f2014e5b592256f07563841444520bf4810a1dfa76abf04909dbe5f3298c67c0a88e636e45a181e461a2fac08d385c
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod 96 BLAKE2B e834b9619a59e85905dfd9a50233e959874706f35026892af8ab385b2fb78a8f876aa47695fd896fe241c72db5c306da0d7c24f49e3bfcad887ac9e2fe5deae8 SHA512 d44bb68b322c8512c135ca9689bbc603643a4a924dd59c168519761878fff14a394f365fe5d88114f5552a9ed1791f6f9e3f7cc44be08b412f0b3a5eb3efd67c
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip 19419 BLAKE2B e8e9f8e23c550256e8f31341e2a575675c4dc0b720a701023898ba9bd09f1be375d21c9843ce26767fe5b7e7bf6dedbd4807f58807c3497efa1a1d19544e07ae SHA512 054679ee890bfb4f268a614870a100525b996f53bd48dc914200f2f18a4dec30cda59e26c16478259d1e80c35864df6090901595b59fb80a209f30d909e9e9d7
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
 DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
 DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
@@ -750,54 +800,56 @@ DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.0.0-20180201235237-0fb14efe8c47.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
-DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.zip 20071 BLAKE2B 721bc6e9c5da0368495a107c94ef994641147880da54bc7e39a8497f3545e8d21b3cfedaf01aa832c5c964e2eb239babe2d40b9722f48415b230a69b4feb8fe4 SHA512 d763c2a4bf816b333da555a9955a4b2aadf4c6d89d0ac1c5b07a7eaf8792229a810a445995a42fed17aaa880630e834adbbb567901351e96757b263aa1616065
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
-DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip 121655 BLAKE2B 071d008723f19fcac3ee740e1b4898414cf09a2813bdb6922705cdcad5913d7fe4682d11219ef10d8bd3921fcf93c7d568daadd33b8e7c307a55eea6ac0d54ca SHA512 19403c36137b6ec9247fab3a9255dc98ad9dc46ba03ad3788e11298f8a310756b24dbfd3a0d9893ad93dc111dd228c421f96daae09e2058438c3c7c58386a71b
 DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
 DIST github.com%2Fheketi%2Fheketi%2F@v%2Fv10.2.0+incompatible.mod 32 BLAKE2B df722abe60c32d178160cf76ff7ae89eb50b56293c249efc435cec8bec1a59e1d28d93222409005b8d392284d6335e4b71c22ef31c7fe5c604691ad497d813d2 SHA512 5e6ee35cc01105d5aa918a8f43ecd7292e60577e7a6defd348b73b56716694d16d5aa08a6e07fa009c55942e1f2471f1a6e0bb82caf2aa1dc01ad87a6ffc8294
-DIST github.com%2Fheketi%2Fheketi%2F@v%2Fv10.2.0+incompatible.zip 695573 BLAKE2B e56c62ba7df339e1a20b1fce1bb99a190937177b14da309a008ebe5556936e4181cffe22df5849226567652b7b0ae283fd2bb7d8f52c66bf4d357fac3023c4ab SHA512 228fa4c5931f21a55c8af9cfdc2c5675974504f94a0329d1dad291cd810ab018646ef86004a0fc447f16e9c1adc400725c72fbe620a20d122371464c2cb607a8
+DIST github.com%2Fheketi%2Fheketi%2F@v%2Fv10.3.0+incompatible.mod 32 BLAKE2B df722abe60c32d178160cf76ff7ae89eb50b56293c249efc435cec8bec1a59e1d28d93222409005b8d392284d6335e4b71c22ef31c7fe5c604691ad497d813d2 SHA512 5e6ee35cc01105d5aa918a8f43ecd7292e60577e7a6defd348b73b56716694d16d5aa08a6e07fa009c55942e1f2471f1a6e0bb82caf2aa1dc01ad87a6ffc8294
 DIST github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.mod 32 BLAKE2B df722abe60c32d178160cf76ff7ae89eb50b56293c249efc435cec8bec1a59e1d28d93222409005b8d392284d6335e4b71c22ef31c7fe5c604691ad497d813d2 SHA512 5e6ee35cc01105d5aa918a8f43ecd7292e60577e7a6defd348b73b56716694d16d5aa08a6e07fa009c55942e1f2471f1a6e0bb82caf2aa1dc01ad87a6ffc8294
-DIST github.com%2Fheketi%2Fheketi%2F@v%2Fv9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible.zip 680309 BLAKE2B 9ffce6d2099d879c7db987b356aaadebd9f00d866bd409127452d10b0d4c569e2414d4d3a6000ec0a5b879b470f73588b52a22a384a7c58303e51d34b475c40b SHA512 58c2e5a0a2b49dd9adfc3d59354859a44cb6b843b39b0f38328caecb5942f3e3c818117c1a187f22f572e9dcd05efa6b44d9c6897d7b136483d0c62e59f61416
 DIST github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.mod 31 BLAKE2B a4831276b684dfc8fe800df7830987c6c67d6466dc7f3d655f52d4b21ff302b7b570a77b6e059ed348bf42290b7ce440be447057dbee745a624fbc4c26d22cd4 SHA512 131b26fc52ef1ca31c98606591cb56e19de6275ece59880a9f2beb2ee82ba46158709a2d323d564d82a2edf2fe99b8666fd29c200a5d6b8452106883c3ee6c74
-DIST github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.zip 10753 BLAKE2B 8cf6b569c2e3697f991891e96916a45149a7b263711892927450709d5245d12bb653eb2b602dd8c748216d625baa727ed8e1dffb62cd15004c8cc0b1ac85064d SHA512 2659b336a8760d16b9cb7f0f417785bcbdb47be1a390dde2c4f1632588cd1170afcdd726cfaa0255c8ff81730a20833d424bc79383aa337e21446c67101e1f5d
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
 DIST github.com%2Fhugelgupf%2Fsocketpair%2F@v%2Fv0.0.0-20190730060125-05d35a94e714.mod 39 BLAKE2B a912dcc347224514c81826763aa9ad2e6fcfdeb8b97ea12b1d46bf738ed2d6894f63253f8df923f4ceb8b306f724998cf06ed4f67494b45039c7adffee02347c SHA512 f4f7373afd8b364bdb8817d6dc5131113a7540a49b28a306faa42f031905632ce39adff49098236be024966e5f7ba7bbe96eb815bd65bf1d7e7d5b0be28c29f5
 DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.10.mod 74 BLAKE2B 47557579d6c1e12c3b7dfdd9e5dd37291411cb87ff396973a0e17c97ffc79da1f6d81dec640d75cbc5e84ad9a8e17d729992c998dd614ef89a973d3cf5083b60 SHA512 2638750386491e91639a8d6e0fdd5dfe58ffca24a228d2810556b0f280839ca1489bcb47ea77adf287beb3b2d70ab2b1a664e0fd1b8b24cb3c88aea1265e47ab
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod 74 BLAKE2B 47557579d6c1e12c3b7dfdd9e5dd37291411cb87ff396973a0e17c97ffc79da1f6d81dec640d75cbc5e84ad9a8e17d729992c998dd614ef89a973d3cf5083b60 SHA512 2638750386491e91639a8d6e0fdd5dfe58ffca24a228d2810556b0f280839ca1489bcb47ea77adf287beb3b2d70ab2b1a664e0fd1b8b24cb3c88aea1265e47ab
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip 38997 BLAKE2B 792e9f0dee385ecc3a0d3ab507a8b73c5f08392e63964f84045200fe1b380f05ece7e61a6359f263ef8daf682aae30e5b28b53ec17d0e897c83fbbf0dfe60e56 SHA512 fe6e378cd4bb82cbda102710a11a2f183d5286651ad7c641c33c9c1f251387bc95f72a5e995e4fb12dee33c69e6d4a81321a9ea75b27135cf977cddded98ff2b
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.12.mod 74 BLAKE2B 47557579d6c1e12c3b7dfdd9e5dd37291411cb87ff396973a0e17c97ffc79da1f6d81dec640d75cbc5e84ad9a8e17d729992c998dd614ef89a973d3cf5083b60 SHA512 2638750386491e91639a8d6e0fdd5dfe58ffca24a228d2810556b0f280839ca1489bcb47ea77adf287beb3b2d70ab2b1a664e0fd1b8b24cb3c88aea1265e47ab
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.12.zip 39947 BLAKE2B 31ff80fd9c0bee3183139da5f47f2db00e10f6f889f7f3ff17a7fcc4ec31569ac4576b22961f7e8986d01d443e79312dc786f22d276397b48075880273ea24cf SHA512 12ca7bca3eb32780025552ce6c5196d0aa19b0412db5d472349fdb949654c36852c5a5e54b845fa86826dc599cb4c35e8d4842ef89cd48dbe949cb87a308f146
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
-DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.zip 25166 BLAKE2B 6451f037f868e44e6a478811061a0a02be96d5d9c05c7275239cbb23aa4e70c093d42a11b042c4160f8200974ff904a73db450d8112f328944cb42f3c5c62c31 SHA512 d87144fb20e616ae224e2fe41f21cac8b4bb6fe2210edbb5490a2193fd5d76d4d5e7d5039ef2c6a6811850e72d3449834f0209464e7933dbd18773382c0599c0
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
-DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip 28698 BLAKE2B 76fa171ec22419b864bf42855bc0286059dbb93de9e174f8693e132679c762346b1e7ade3616404a20b8b161336d1cb2ccda1c7366a1b8d9e329a82d4c2775f5 SHA512 6dbdd7d3f35f7b6fb1088c28dc1d05bad04fc46d907273acb55e991c708e7b06f5b2db86ae2d6669f0720c3bc95816971ec4b39e897e714344817a83d9ed4583
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
 DIST github.com%2Finsomniacslk%2Fdhcp%2F@v%2Fv0.0.0-20200420235442-ed3125c2efe7.mod 36 BLAKE2B 1f2ae73a4466fa2e50a4f529c5e8eac8f97257a4a43a06213a409002ba6aa6fa3ddd3fd0b2bf36e4cefd9ff7fcb9aa4072225cb6ec51568b05362a16eebd33a4 SHA512 413500a4f56edbb198ec7928d3e124d459b5326bf00c49d86a0397ef0adc613c4525f3f27f65ca304858a06df24c06940b27f7971272159285f43b40a5adf863
 DIST github.com%2Finsomniacslk%2Fdhcp%2F@v%2Fv0.0.0-20210120172423-cc9239ac6294.mod 663 BLAKE2B 24e5c678742cebe0227616262ce67ef3d3ad91cba4b64da045121ddc88557b271a1fe869815d4f6158599877eb8672bdb81d21232121cbcf49ab09ac7434c232 SHA512 20aae78d98ad5b7b363e7f1a21050caaf4a399662ce7a97022cf9b7d174478b6ffc11a38945ad638769237018d6b86ce3527862bbdbc4d237a0fd1601dd0d107
 DIST github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20190723014705-7c296d48a2b5.mod 36 BLAKE2B 749178946a3051b0c6eba9c7d528fa874c8ba72d9358eedddf9eda8f019db0126fb14f94af2962aa11a30a62ffcda419ffc57783b041c32ee18637dc6ed3fd63 SHA512 f651edb55eabc3cd0158a9d8d3c7f1345b1af7dfacf98f46693ab897428421e0553cb3d760f4b385ab94cb86ed7ff0735fd5b7665bb16ce591563bea660c7371
-DIST github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20190723014705-7c296d48a2b5.zip 20786 BLAKE2B 6a5efb1525c5b7bf6dfd22b2077fc285a8fa1752cae9aac655ee0ee2c90fb13cb6b01aed050a773ed5851a6f78c7c574d9fa1e0c99a12ef58d3fb7f7ab4c88fd SHA512 d4c8c0a1138c9bb8543cab5ed299cab35ff66898e42eba32ce2a27411a434421b7465845c0d6bef4ab946e3516332a3d797f8904db7fcdf615c8cd78e623329d
 DIST github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.mod 32 BLAKE2B 5e64d620c37ae185652dd50d045243c9f334248de0232c499c8fbaec13dc400486ecb67ed67a2772048c93fa4ffddda06f402b198cbc8cd81110b03785c4fe42 SHA512 77a838338c62779fd7eba69d5ef388d6d58bcc7953dbfdf8f470d34cb66a7c84bf38ac05602da74c6ac4dd17293c62f910a55370df4671726fca9fab180865ed
-DIST github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.zip 9152 BLAKE2B 149273aa14305911f6fef0cc083e8bcac2d0818106ddf47b39565bbfb123e0c2d3d4959bac89a20faa171859a34f7484a7364d5e31f045ec8167c45590f5e51c SHA512 e8edcdcc45b662710ce08dd76b22c499ac471eded382dccefa0c6296414a7f4c16cb7c9576396d488152c732d6b6876144ad46a82241c904f0b833752eaa0c44
 DIST github.com%2Fjamescun%2Ftuntap%2F@v%2Fv0.0.0-20190712092105-cb1fb277045c.mod 34 BLAKE2B dc250d3c19b11a58deed3e35ece7cef11c91af1da148471c1803e9eb4dc63f6e519993aba3245317577e37644c7a43bdda5c7f69687638a08f0330b82b218e95 SHA512 edd717821dfe4d73ec9ee7e1864284d39fc5ec282c5ebaa3f20b409f86fccf24b8c243ed2671387860dd5e1ecb7b780e896d3798ee4af62e2029b078a9cd360e
 DIST github.com%2Fjetstack%2Fcert-manager%2F@v%2Fv0.7.2.mod 40 BLAKE2B 126665d59d376a30b68e3c23dd754c5a2efff8a1975df433d67065ae7424fdea5b5635fab4b19ffcbea12dd25fc4c97e6ce0fabfcd492e23681cd1ce44be91e4 SHA512 f7fa08dcec1fbce0e0e4f797b2258450460f778cbebc58d6d9c3ec9afc167dffb4cb68e49647c6612ec514b98050d37d70a78c575b672a6b5a78f11f3d86374f
 DIST github.com%2Fjimstudt%2Fhttp-authentication%2F@v%2Fv0.0.0-20140401203705-3eca13d6893a.mod 47 BLAKE2B e328f992c0ed374c9e99019de7ea3c2a5518485eb7bf4dc5e66ea5525562cefeac2a819f649725ed99145ace045c96b88623ff68c67025cf18ee3c6ffea1409f SHA512 97341ef3754232ba8bcc5367bed29a4d6082792819ca35776aecef0c43c3fe8f6a4451c7cf8ea8b8423203443dfe5662066316d63912055557fbdead7d18da9a
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
-DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.zip 231439 BLAKE2B aeef8d95921f15ea2d50f26d1fc72dcfa24594004b67a379e123698ee9ee2c7f2cb8d4954765a925ec8a2f4a7cb8f390cc0747a1041f427bef453b0c00b9bb49 SHA512 1b41a4e0c6e5014d391f231f895c88dfa049709e8afd107d2c4bb7cd8e1aaf2a06cd053f699580bbf0814228ff4ac9193236a2e944eb076c66602dc194ef1b3f
 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%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod 113 BLAKE2B 7ea9e809aab218e2d044bdd2e5994eb3489fd36cf7709613b6cc98b4c1acd6882ecb35b27cfc214779ef3fbeefc930d5803999e12440458af7d1314ec0eb2998 SHA512 50c1339c7ab002f6ceb599f51ec49717e88cc2c5ae1193fccc9431440a531dea27d54e1d0a87b987825545d106a2bbf0dbdbcfb9883fd0e8decad70d88514d68
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip 195725 BLAKE2B d41015982c16856e2ec6710fc7f4c40e7bd11f5b5dc365e8bca6c45fe5055185395724ceff5e35147ab7d493f41db1e7a1dcf90d386444367c1c04dc75abeede SHA512 133747a475094107084d3d8fdf03db36e88eb4673e7781e8779fc9e99da77ecc95dd8c22ac87e80d62cd10c2b6228be449544d1f33d22afb6b978a061b953895
 DIST github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod 209 BLAKE2B 00b0c468a857190cd26890babb3e946e9ebbe5ebf0b94ae01519ba32a96f3d99b031140d6de003caee9ca076b33736c96fe4474fb715def44f6ea1eda3ef258c SHA512 8e54b9d01e16e47686cd7aa3b4b184b61a24b7d54fb83a37897c8b76621b3f4594fa86f05b8f08908f6999862e741309c49dcd90bcc928501be084b5667ddfbc
 DIST github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip 94054 BLAKE2B 33e25f87bb306decf63ba4d67e841b59b5fe1410ab5a75829f5f33f396b74335d28876bd0c3deba8edd37e7d5f938ec3fafc3982dea464958fd0d34f419bfafb SHA512 297e929f6acaed88fa197463d38b50725f8f3d953faf813da2c1aba2e179191cc1863e3b0910159d419c842eb319268985aaba4ed4486d5ef9b9c4173e02fcb6
+DIST github.com%2Fjoefitzgerald%2Frainbow-reporter%2F@v%2Fv0.1.0.mod 90 BLAKE2B 791f2fd579b03799316c3af8db98ec4cd6d0c3bdb61de048283db2adb413b5837f569773c977463208afc44324cc6780a1a2f29fb2ae87123eb6be0fba89d364 SHA512 678595cd445e0e9ed94debd2eaf5412c131846f92a78b9fadec6f8368be2a10b7467b2d5bb55def3f4fa0cbf0545edb8f32e27003303eb550b2d2af72a55a3c5
 DIST github.com%2Fjoho%2Fgodotenv%2F@v%2Fv0.0.0-20161216230537-726cc8b906e3.mod 32 BLAKE2B 108af2b21e180487fb535381cee881222cd34895f1b3d78561bee6bdfee40e7b9681c74345d10881fbe519fc496181b85eb880b5ec411e13b24926a39ae8a512 SHA512 5b3e66c42da78c7df031089cc05aabe56671eeda4617683a1e9857677108cd0dec00332f5b05f29923b1314fa1d1c88e57fac1b653808cadf5a3cde93daab03e
-DIST github.com%2Fjoho%2Fgodotenv%2F@v%2Fv0.0.0-20161216230537-726cc8b906e3.zip 10661 BLAKE2B 29178f1f507ae2aabe62447e180035a5a8157a8bbc720dc3681d75eab5078899f6e1dd941bc9a09309780766a5c37fa8e5b2e4a91acf2ae5505c1f52da3b26a1 SHA512 b643f5d84b34fa36e36d36650df636958b7f13a0a282509e7568b4c7668696bedf500a05215a4ab8b53fcaa2148aa8451b9a85376387e15e23eff6bd6f1e53dd
 DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
 DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip 8857 BLAKE2B 2887917f30fc4cba4c028ce8d42262b007ecd785df9f4ba1dd74f9ddf68376a6c3af924449684c8ff8ca530b249445a7ac0ea36a63fdb18d767ed3649a63f7e0 SHA512 999ed7f22551e55d6b4b59af2ff2692ddddb251de4c61a835ccbb9f8386ae426ef8df6c3434b8e8e143faacf82ab64e022350f9d57ec51544a27042465cf920f
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.2.2.mod 47 BLAKE2B 82b32db5fad59fe9737687b615cbf4308dda3e892b04b34369022f27141f03b55e2cf1f348a7c18f763d67eb6f2e445b89cd49c938b396584d88d2490b99c778 SHA512 fab84681255c85de89c3909b709a0d535c078ae87832eec2386b43a07d73a1913ae2801a658f7023c83907ab7d4b489c82f7a69f83ecf867f22e7a78b531fe5f
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.2.2.zip 12459 BLAKE2B 663f1cef77a317ea2a7a2318bf62ffb7f230ca2127a3e5c983d3aa92f48a269058f65d48f1dfc567153771946d4642af5d2be411e47a14afb69964332dbdfac1 SHA512 be5c859d29e9b7aeaa9e4933cd74f417528756bc667653158addbf7a79b72d4a3bc9c8a52592e07e868fa7be7f59388ca3031345cdc3962c9346584be7042169
+DIST github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.mod 43 BLAKE2B 90d71b886a5077e501d659ca78215cd02aea7e24432a1e174045cb7da6235d45c6e32c81b517bf534e40e36361a1ad3998f415f3975b3f73778d7f8201915725 SHA512 ea2a15e05d84d7a0e86e1ecf62eb07c0baab34a8248f59114545cedc80af8146e529557047e5ffa4ce8e5e4bd2e9b2c282f8f2df929f8da5f72ba9aa8156bde9
+DIST github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.zip 2648 BLAKE2B 169a81d606f15df5f98f6ad2ff418bade31be9c6b78ea790a18bf404653f47f69d2ae067315c735e52da5212459975dc9297e6c03cd1d53e4b3a4b3b25b51c2c SHA512 5343e0a259d658899f8eb93035f9677e96f559726ecadb284271ee60e171666ce8c824182cb5d08b3626eb1d539c381c33f6944ade735210ade30158b028c1d9
+DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod 44 BLAKE2B eb9ba00998f4a45590f7ab28d94adcda4e2b511ae7078f5583bfdcc792d34b6eded81b8c0f71ced35b782cd1bf344542673677915b44b9eb31873e9c5d69e133 SHA512 4d591cc0f2d11ba450f294361950972fe0dd71bdff5bb0c3e72b673cad6ea990335680bf7650093e1f9978bc8556a0ef9329ae2e8a14c10b7de668aead7afe33
 DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod 178 BLAKE2B 305d9f2431b92866a80f6d956d8c0e0825857da7177e9c628d2cfb88b6995a49696d9274d7e0a8ae5e3ec8a1e490f3e5ac74f8f1decf6730ce70bfc9d3681ec3 SHA512 9dae3380dc38404b99d1a7119e3607aae1cd1132f8d7a808733cc22ed21fbc4edc2d1320d008cb63439812151f44a69938abcff05a6c8727d1bc58b2c973dcc4
 DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod 215 BLAKE2B 290912a223a80b17cda3da4e72cb5a149e6c3e2fa8d79bf221d6529eb74c1e88c602bffe1234f16657433128f0ef3c9091b723689be39a6193e421b44bee1715 SHA512 549d0522fff36f194065fb864e65e0d11fb5aa45f4720d38c74049af138d75a1f7680489d5e7c4adca47abaf902dfdb202d05e8b040f119c1fcec2c22f412d0a
 DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod 183 BLAKE2B e9f24802c355e638823352a65cb9211b7ef90951890fe600791236d0877731924c34624c483ca14b5c97378ceedd35abd8b5f2e2397985039b0096057bd6c0e6 SHA512 c64bfec29d68ac738bfa3ec5263eba71ce749c89b5296e8e16205a286fe715536da5b66856065986e94172665dedbda96531f6c8b7f6803f2a1c4213d9f5f138
@@ -805,181 +857,249 @@ DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201110080708-d2c240429e
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip 138645 BLAKE2B 90b085fefbded221903d24f63cf0fe9f2dc95c215b5ec2f9738c384c9118642425d810ca405bfae689fa1985f4d6a8a44c832f79300ef82fd28419138dbe5630 SHA512 1e1e5ed05000dce783b69b47af8ed0d59b11bb0b1739eb9620b576f67b98976cba9e9227519fe247a1aa3ac9c8c423b4896d1dfd9af6877e5eeaa6514761ba7c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.zip 139812 BLAKE2B 508f9a7823b1b52f042ecfd5bf1f12abc59d3a1d059e6168c10f2e9f0bfe6692e2a3eab75fd061d961459a2b98ffe21d29230c0a0f29f3871a5f95310eef792b SHA512 f922b107c536ef5b737ac5555074c237e92046bf0a8754f062c3f2dd0ec04820e32474b5ae3d9b32ef8272800e21fcfb90c5225b8bb466f0022b4adf1d79e910
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
-DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.zip 130029 BLAKE2B d93b46be80649fe8a93eafb6d1bf323daed352a9502bc00034da2bb868b757a32ee2417d0c1fb4f79693f076317d98c35987807f4823fc508043115aa3646a8b SHA512 ff2823c8371568a825075309054e424816e45c0242efea76d94127a72b875ff54d7c7f415bf7aefcb8f0df0863f56d9288df64869edbfba29fb15c693f968b17
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
-DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip 131514 BLAKE2B 477f1ba8434036d96652435c432190539006ee38ccf606671cf319e356c6047c3913c6dffad6e4af13e023dbcb6ce93455797e37d3e5b9524b75ddbcbe0e906e SHA512 e64c91926d1e3688151b4f511f506fe4c2acd0a2ab839a43d12c77145e23215e7ce3ea281651f46bb945a07e04a1d2b6bccdfc3d862b3b7cce074e5817ac014e
-DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
-DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.zip 133348 BLAKE2B 1b5294c65a6864de4df7000935d365cffe1112d6f27848703cef467ae7f962a3c5c5ad22e5f67f25810a2ffcef5d4ea19b2445cbd67cf0f0372db0b1c6c162f1 SHA512 cdc9e1759d68c8c9a64cf6d1566a7d30bb90151d3a7ce3ddc9689627b53056be3915196cba74823d5f7d8c50fe05a9c6a96f8e7c26d2ed17bf7f1b64962fe050
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod 51 BLAKE2B 4cf5f813ed021b04c810da33b332dbf44f45594e3657779687cd24391d2a93770f2a0e8999fa5a8b6564da5e08ed9fea1e52394907d518ea14a9568adf263e67 SHA512 c5761bc45d554ee6639c4ca23fefa5fc5c8a7c818f8f18d0b43aaab26c8114615543a1be207f5aedaef53c2dda623edeb7d3ae1c5ce6b72ea42605a1d5c31667
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod 51 BLAKE2B 2e102c58874af58833146011d2b9d64950522530e5bb51d643b06f98b258d7cb52efa2caa36a1fd4d39d4307a37712de7f22d45990ebab7a755b7cacedcc861f SHA512 e208321653fa4f40d2af68b6db37a368134e27463a45691a1642bfbe67186efa2a6fa41cddb3e443e465c7425d8d44cee8364953b39e1b08fc16b447431cecb3
 DIST github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod 35 BLAKE2B c1b6f3da9b37c5e0888f6ae304f7885901fb5f90bd94de7c980b7089d2477ea25f0fecf30b502f55fdb6a8dd7ba49683f33b89d761de0acd0e9ccbeff53a183b SHA512 824e0e8c8fe3985feb5f25c43725d4ff70f577373406b08767795e691f0bb10594dcbba4149e000bcebaf231bca5f72649c0d078b86cd4df38d0805e1939d63c
-DIST github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.4.4-k3s1.mod 4097 BLAKE2B 44859060ac05469eb0c52f85b57f42ea66293d4a77f6d9e2ee3503bfffa5e8767ee8f8a51cdac3fb7b637a6e883cb896baff5fe8a4003846cd6022cfaa567cc8 SHA512 a645a260d06f5d81af14f389fdb7c3df5fba1c51f50de3bb5c71253a7f2de2042608752b9e84a3fdc8a286b34ac6e3394bb5db352cb2b9d0107d2711ef6103df
-DIST github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.4.4-k3s1.zip 1805429 BLAKE2B 1dd17f9b1576c3f1eb759882df3a3db7c787bc7a092154a027680bfb094620eb4a93c99f9a2a73b81e268864a1dc6ad5462dce97e93f1e158994ed5680996b02 SHA512 9dba06d70b532c24a342d3362cfe8264dc6e992c7b48d965dd6751dea2bbc2fbc9ce88c1ee5aa411f2a0abb0e86c4b22961bb483f321bb0553dd731cfbc4905a
+DIST github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.4.9-k3s1.mod 3835 BLAKE2B 3660849e6db65a5643a64969ce26a3c74cea920aa8fcd70274a0a8b1fedd685f7b79da8e0181bcec16d48b949da93822270223dd68754ca8190a57628514919e SHA512 0a04998af9b9caa79ad8f1fb6eb002d0546102592b41045a3c64489df21e14cfe271eeb633d85ae7b501b10560e30d6af23f3aa09e316bf458a02ef559cf190d
+DIST github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.4.9-k3s1.zip 1809942 BLAKE2B 6fc0d9a69929ef8e888a36f7cfcd62a8dd7d65eebf9186bdca744d6bf61f9f6714f5330e49f660642870db5e37592a940db4f89a76d4c80f982fadbfc720a204 SHA512 49de77bf22e1567196235c63abd24d596aba317f19b1e3d85776c009a7bada0e7288d2a8eb4931065e6d35462b5580ba13201f383a9e2651dd0e1089a89cd2a0
+DIST github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.5.5-k3s1.mod 3057 BLAKE2B 22048f99f7780b257a7c7d10d533f07be0725ddf2642183f2de5f223f5fd2be6ada930bc13a19b1682b4142128f038f3c813dace65cf9d53e7de04d559f0c75a SHA512 3d690f56a2ff3d4b4c2f78621f8727ab70de00c4fb0c70ed3772e0f59e4769dc9cc3f005ef41a8e82bb5e8b3f90dc4e6494c97113d2afef88be278b9ec5672da
+DIST github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.5.5-k3s1.zip 2586668 BLAKE2B 12237f4bda941702ca9a2935c9156eb65fe5e244ac86d88c8b5a31dd01434ed647e6532aec5bb5ca1329e6c8acde231fda84dd1dc4e0195e2eb1fb3f17d9ca31 SHA512 6431dcf82b0866a3117a83444f80ac44e1a4a97980c0efe969c2bfa721d2e581e498645a7b4c8b7e9c6353f066df283741e992a19db6fd5471b5e44b7d31b2d1
 DIST github.com%2Fk3s-io%2Fcontinuity%2F@v%2Fv0.0.0-20210309170710-f93269e0d5c1.mod 706 BLAKE2B 0f74638af018614a90baf0d967e297ad5d128f2cba069e44829ff7ad7ed9723d6fda5789a4ab88dd0a42d47c8d41f52ba60aa420f18dcbb990cf4e744382fcca SHA512 b3a77f2822865a71fe706105baab7f54e109880e21bea2e1e46493371de6dcf8eade2881668a5a4848638ae8b39c9ca95364c842d67d906fdcbff6c197237a0d
 DIST github.com%2Fk3s-io%2Fcontinuity%2F@v%2Fv0.0.0-20210309170710-f93269e0d5c1.zip 142808 BLAKE2B b95f6e4ef412a7cc008b715c26a95f1d7af2224a1dedf9abdffa31f023f70c67c034396a67dd122751d41c1b0b34ce59a61d7fda35a194222b2b83e0fca74478 SHA512 16fd70e16f4ecc877881f28f695078609b7bb5d94dd85131f7a4aed7e3ffe57634c4ad469416b0136d74059e5c97cca96e8fb8462ecfabb456753925d46d03e9
-DIST github.com%2Fk3s-io%2Fcri%2F@v%2Fv1.4.0-k3s.5.mod 29 BLAKE2B 2af562b4c47fd06ba0cda9ce5bcf22e1b308b8438fbd35e1d5bc1e9ddad257f0471ffe9d846253662aa3009e04ec0bb1cc9421be9f023e4c31db815e417d1701 SHA512 82baa768638809f2a73f93dacda1d5cc5fd24625f6ad5243f97ee85ec0f3fd9f10c83c60603f02fcc2219133ae02ce0b4c7454fc6ef5a8215b9263c7fa57a2d5
-DIST github.com%2Fk3s-io%2Fcri%2F@v%2Fv1.4.0-k3s.5.zip 781116 BLAKE2B b25ac577833cb5026864e7194ec3aecee2e1fa3f84d5c07a0d5ad9e64e85c87a5b85ae422b5d8c8c17b7e3c1a62dc5e96592d5494123361dc8676152aa0a5ad5 SHA512 0d6bfc4ffbece628d23ac5b9924f6cd97a05cf294ef89027d5eb04e365066baf1284a02c77d922e85bf082ad3bb5beeb055da7666456949fd4f749b7c0ab72af
+DIST github.com%2Fk3s-io%2Fcri%2F@v%2Fv1.4.0-k3s.7.mod 29 BLAKE2B 2af562b4c47fd06ba0cda9ce5bcf22e1b308b8438fbd35e1d5bc1e9ddad257f0471ffe9d846253662aa3009e04ec0bb1cc9421be9f023e4c31db815e417d1701 SHA512 82baa768638809f2a73f93dacda1d5cc5fd24625f6ad5243f97ee85ec0f3fd9f10c83c60603f02fcc2219133ae02ce0b4c7454fc6ef5a8215b9263c7fa57a2d5
+DIST github.com%2Fk3s-io%2Fcri%2F@v%2Fv1.4.0-k3s.7.zip 791978 BLAKE2B cd02e89671cc85f0164566eccb7b1a7f20b47de8c4fdd915fd4d3f960b43859cdf271372f468cbbab8059ebfa22f4b42c2683e4503913eb6ca7370cb0329b098 SHA512 55bc40ddd4e05cf150be1090579c635e4e8336a65238f9e03a467aeb0d47f8844c3d75430b99eecad12e814cdc9e8ab8f900d9a2af1cd8b03d0937f697682b96
 DIST github.com%2Fk3s-io%2Fcri-tools%2F@v%2Fv1.20.0-k3s1.mod 3724 BLAKE2B 32c4f182d33027b84b6012dccc3296f6c506d6dc2927d2c99b4d5bc1ca204432e92bc145942a09cc314b9fb9dd23bc024bf5a4d0ccd87282144f736f377909cc SHA512 0a9af241c3b04b52906253f3ab99951a567e7fc19e81bf6e9bdb23e9240a670a3db0865ccf828cfbe3dec929fe29c300896c2bcf5d660e6f0564c900c3fcc046
 DIST github.com%2Fk3s-io%2Fcri-tools%2F@v%2Fv1.20.0-k3s1.zip 238098 BLAKE2B a48a8f4b0ee6ea506b6a087eb28381ae30c5fafec232e120abe4b43bc6e6c4b22a513bf2f507417314c622ff982910a180cb33d3f172f45e7cc29bf4a47d2a94 SHA512 cb79901dc3509d7e7114cd809b00d1d4b9ae82401e59abee69120b422252d53f6693e6949545a3af6e175d80049651a121bfc0a0b31026b4303254d33774d5cb
 DIST github.com%2Fk3s-io%2Fcri-tools%2F@v%2Fv1.21.0-k3s1.mod 3674 BLAKE2B 52ce3b9e3f70893cb2949285258c7fc406b5e93496df35c70143e07ab2da3d2253cc67a0c0161fc9981e9f7e098a4b91fbf44ad55fcf5396d08a6597901944e3 SHA512 d78138d961afb46bd6b95e9e7e84a30f59ebdd146fd67c856f4498fc6923c29fabf1fd43196fa6918580a6f0badeb0690f69028bc2dc9c8d3e7979a51c434fea
 DIST github.com%2Fk3s-io%2Fcri-tools%2F@v%2Fv1.21.0-k3s1.zip 236513 BLAKE2B 5a7710691d86d8f190157b31d4b80fa5ea45afa6dec85e0699c17afd0b247bdfaea8cfc2a78f55c19fb1c960950f06a4d885c9cff1dc7fd00fe4b5bca004a344 SHA512 121effd139ff5d94694e0d23348db1b282a1e12440842d3287f1d63d942e692bbca98995d4819f2661f6ef4510dceb687d369900ff4bc144aaa87b3f134ebfe9
 DIST github.com%2Fk3s-io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20201208200253-50621aee4aea.mod 2476 BLAKE2B 80a0e199679221be23c03ff488f7d505a13018e2c025dc53108c319b525ded9c0c79c288f9ca12437cb3a20d64373f06a1cd27603411ca71bd895b3dce78366f SHA512 8d5b0c6b187ce7685a05c5be2ca8ec63234ec96b8b7c8e37aa3c55e51de624aa19117da13fc75fa180c5e4b2a1b9e5d7adc7c106202d1f995237adc995fb160b
 DIST github.com%2Fk3s-io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20201208200253-50621aee4aea.zip 7150943 BLAKE2B ba04ee8b869a7e5d547813db46b5f9fd389070be48a70f1d695b1fbf493d853a3ff084ba5bfd4c854cde5374ccbed53d0fde7d3f6df9e6ffa7410ab2487e5fc5 SHA512 2266cc88514bf7baa53bd335f849ae323f88b1c2a5b91241491d57aaaa883eeeedde0574df31c1e631a74f1a01a39fc836fccd2f8946c1442aea84d272e3f29c
+DIST github.com%2Fk3s-io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0-k3s2.mod 657 BLAKE2B e13684938cec02c9e77e0205a3932eff426445dabecceae0f885b22bb1882e86403c9ba2279ed99b955031976624748178321f00ab33f190e801aa9b5843d677 SHA512 c38c82e0cda65b54a3b7d572fc564792a89d248b82ea5bba3cd44214facf79aa955381c4e432762d5a8dd92d6fafd36b9c5c7d76d3f853ada8c19a0ecd95b20a
+DIST github.com%2Fk3s-io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0-k3s2.zip 118678 BLAKE2B d945255db4fee3e4fc5952a1497bfa6ac7b53072335067c188ddf79ab4e592202169a5a23bdc6cfd1460fa4b417eafbc920dccd1b698cf855dae117465983a8f SHA512 348224436cf234294b93bb1d6e1605b1d876876b9ef0178a9d74056e212042f32d8b09183172caaa3e8da198bef3de777d724d1eb7f7a002ed41991e2a8bf7a4
+DIST github.com%2Fk3s-io%2Fetcd%2Fclient%2Fv3%2F@v%2Fv3.5.0-k3s2.mod 736 BLAKE2B 318c3607f86419c7a151f1de6b021d4ba7afb58665a8c93e8033b3e8a4ad3ae405c5e53dd8c477d026071d9c71e1dce94d1b87af5af5086222f3918a901ea859 SHA512 f8367459e4c0ad2e04ddaac7642cdcc9f75da70e361a871f82ff8d732b1ca9dc6e7820af3155309a7f405d2f587e990c561ac35f156b6ec61edbbd913f4f88a5
+DIST github.com%2Fk3s-io%2Fetcd%2Fclient%2Fv3%2F@v%2Fv3.5.0-k3s2.zip 149241 BLAKE2B 1f26b0035b31b73eba8e4bccc1bb29a2634c326554cf7557ee6f750b9b8674bfa16fa0b57c9b660ae5cede5b285c700a289f969ea63815b7e071dcd7c1d38e70 SHA512 76d8071d71092a32da0f4cb4a4093d474259394054474dbc19991036a5b3d977623571244ed0acb2e714b3553be50310c0979212e0079411ae36ad8e971d73ad
+DIST github.com%2Fk3s-io%2Fetcd%2Fetcdutl%2Fv3%2F@v%2Fv3.5.0-k3s2.mod 961 BLAKE2B 005a375e41c4ca1da28bef55b73c6062e0f437d52f4fe3090c87b1e9c31f06deda8517b18519b30d4e1f08e8c70908431efeec39a30dd4bafbdbb67f52736cbd SHA512 bc395053fbbe672a6110bebc4042ed3fc9b0e7b1ef0904fd4ff3bcec7413723e5522a5ddc417a799093b6a618ca9a63915fa6e8a7bbf1b8d96bc6db5b50e6a46
+DIST github.com%2Fk3s-io%2Fetcd%2Fetcdutl%2Fv3%2F@v%2Fv3.5.0-k3s2.zip 51723 BLAKE2B 2e1eab028d3d86cf5310b466d525715da609a41bc14d86baa3de0aa28b8a93cdb56209a7fdc56a5dbcacc050df09714a115de25f129a33f8e09e1170e95a87df SHA512 3541a0ec7642e0dfc9836fa43d79f99f6acb27154c88bdcbec3754b152f211830a0a160808d6a1b1cf77c70583af16c93aba67a4deac329e5f45d3536a1ec4f8
+DIST github.com%2Fk3s-io%2Fetcd%2Fserver%2Fv3%2F@v%2Fv3.5.0-k3s2.mod 2260 BLAKE2B 9042096df23e62d675597b16bbe6de4a844e2bf242d9ce2430af84f31d1c95d2b5a234875aa6576de970e64d627491f825334de1f99f87dfdc06f91a9514b83a SHA512 ab2887cd66256771cfcdac53ce7897bf1d63d31101d8a7930045d0802bd827024a007c2ddce57ad991542a8b1a448d6708dc01975f96412d3c066edccb7c1939
+DIST github.com%2Fk3s-io%2Fetcd%2Fserver%2Fv3%2F@v%2Fv3.5.0-k3s2.zip 743657 BLAKE2B bb5555e04f21acd05477509a81ccd3c3fa25ec10dba0c75bfaea658ec77fb81bca5183f80bcd7f48fe7be4b751b3aa9a9320f1a7ed81a4805d36b9f1bb160a24 SHA512 fe5fd156814b6796a89d901eaa9fa76f7302017c3609634a7d836f63033457160ab2dd15c602e68b8c7f08d51becf229c04598cf5aa5498bee10e5381047b831
 DIST github.com%2Fk3s-io%2Fflannel%2F@v%2Fv0.12.0-k3s2.mod 2033 BLAKE2B 2e7e439916a7df3a0118fbbaf92e6ddb0877a5c6008ec9fdaeb8cc077f7c83e4e7dfd4e52d7cdfdca385675183ece134b7b43527b35a0939bad3e49d738ecbe2 SHA512 b39b50e7977293131a88e7115d89035776c4e634a135dc2008d94a5e5ee5ad22c58b45ae44e658396e22473cfe7f0e75d34488031fdeb797b613ad7b2d3e241a
 DIST github.com%2Fk3s-io%2Fflannel%2F@v%2Fv0.12.0-k3s2.zip 2473059 BLAKE2B 1a3cb8b639e645464698a13741d325b8661257ce468f3d5a80ca5c8cf0546f9d21b871244641b463ad107f1234eb7c7c9962e0ad4e1157abe0e91082abf044a9 SHA512 65f30a26b692f1f2f590b8ee8237b82192753b932a5e2a22a8a58af7effcb878a54aae5c368a71caedac108278e903ee35faea1eebd09bcd269f0feb981ef192
 DIST github.com%2Fk3s-io%2Fgo-powershell%2F@v%2Fv0.0.0-20200701182037-6845e6fcfa79.mod 39 BLAKE2B a7f0537b10ac2adf9fced0c4daae8c3c7316c7c1a2296bd492b71645ee1d7c00c7196b1b5f67fd98a39973f28801e570aea3b890e377566c261ef56c772c5d00 SHA512 5b3c784dba913018c6f572c32fa4b548371d6ecb458313f8f440aac9f30f52ffab8b9376e676d918e11453ea81474b74524e6ebe1ddd06724492b98706f1ac60
 DIST github.com%2Fk3s-io%2Fgo-powershell%2F@v%2Fv0.0.0-20200701182037-6845e6fcfa79.zip 11896 BLAKE2B 19cdc4169482c993973a598a885ba5b163332e81a1665cf98139178aa6638b95476dd6dcfb4e2f46c35fa991cd703b0c9208099eb22a4c5d78576caf3adce66e SHA512 9ad43bb9fe80bc229ba76694f6783bb0b69deb667356c665bb89ecae765ecdaaee8b5426e83adf25c3bf78813f1b1cd60e604448a1469b52eb072ee915ce71ac
 DIST github.com%2Fk3s-io%2Fgo-powershell%2F@v%2Fv0.0.0-20201118222746-51f4c451fbd7.mod 86 BLAKE2B bd7bbecc67bf62c1eb41fa06068a98ba633d8c95bf2ff2fb5b7ae634f1cd27977893afbfc472c6060c8a52e7aba8d7dabf0511eaafa7de437ae42594dc634413 SHA512 f77353f0bc44061dd5b3ad0d409c9042677a92c30deb5d5f5447c95eac4d98be1bb45299e6cdd8edd3d1e3734742512a1d102bfef36666a6617f943e8c6e0831
 DIST github.com%2Fk3s-io%2Fgo-powershell%2F@v%2Fv0.0.0-20201118222746-51f4c451fbd7.zip 12724 BLAKE2B 2657eaa897e274426a4f01d5e067b2bad8daf49601ad371fef22cc94e36d68a7db7dbae7cd4a3c26656f9147fcceec39e79d01dbedd6ea15e7fdb85925ca6a5b SHA512 b2eb05470f9ff22c41d30290f9cd96ab54f7f313626fdeedf3e09ae45df15789be4bc2b8f5aca69c6bf4e816d4e68354b37dacec05d47d707715dd5b4a13f17a
-DIST github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.8.3.mod 399 BLAKE2B b50676e9cd6a607c17ecbb43b91c672686471394e408ad4a46027d9aeb746c2355da8f26c6eab95354608e537aa0bf1cea989eaceb6dda0afe9ab0173b0fc5f9 SHA512 0de2e99961788f084f68ca834e0f6c27e8a2bd0de344572c6dbd99c9ec43e35d560d0d4af31791e842688eec5c443f779a2d7c7762019f22b60e07059539a3c8
-DIST github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.8.3.zip 98211 BLAKE2B e74a90854af0c9711473a775e35d3e1f0eb27db4e7675535aa3f8da08f7cdefd298e911792122184603963deb5686ff0c0baf55c8c9409507f9d963c12993a8a SHA512 f6a5768bed00d625c9b187b1909941a85b3515225acabb390e1c8fb381dc3bb400495c648a4b1b504ae9bcfeb7ec74db301e1d99bb6a15702238d1c8c7606e64
-DIST github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.6.0.mod 441 BLAKE2B ca0711237c8fbc5ea9f5802e9b9e550b635f6af7fe7b156a02d5d3b2c8090b212da348dcd9abb334f4fc8799ef188fe6f339adeda9347780d112e78919e350f6 SHA512 c7da40b5f5def57c2c6235c96f65c8230f2659a16632903e4fd6203c04f47e1572caf8d7955b36f3f760c1dc56ff3ab232420f93bbc71aaa5e6e09e8fd9877d0
-DIST github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.6.0.zip 64732 BLAKE2B 55c9d83df5fb817448a966d2f412d0b912618bc1f6ddd7b6dbff80dd9d6f9ff27ee808aafea8cd64ee1fa4af4fc5e9e9f4676765134f78dd1b634f42cb032021 SHA512 d182289ae33557c0eca7655b6e39718cdc13e7f79925ae4baf5987b6feb6fd4112c7bd9d765c9c3689779438cd8c7b40acf14a8f9111f00317e2b9704c9ae82d
-DIST github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.19.10-k3s1.mod 33426 BLAKE2B 8d3d706fbed2763d07c17825c5d674f28d58ae468e1e2c1adbb1c1c17f9a04aa0bee9037e6d44aa414771d97b6a346fba0d8b3953e53dc0f76dd5cfaf3192263 SHA512 fa41919443c27ff5fd3787ad52533bc8201007a09e46893d14cff80e7aa0691139e8b678c0cb1de86fcdc8959711ed1e469e5c371fbec0607a8ab1732f831d79
-DIST github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.19.10-k3s1.zip 14164506 BLAKE2B 89a896a66f2c9b8241cbe58f0856877fae2b5cc1d96836c0643d54484fbfb2aa788638f07acede1c71deee53eacf078405dc459944b4b17f4674e71b7f947639 SHA512 0dcc0f3babf857a4d39cde68e6b2b756d116bf55a97ff481e4227a958386f733aaac822f728771abb85fddded448322d366a900ce808dad079796511f2de8532
-DIST github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.20.6-k3s1.mod 35783 BLAKE2B fa84c3de654213f950fe63b9deb84aec4d1d6a1048b60dfd2c91d75b086e4675f94885f1c74f5d55336bd7eeed3fbbce7321a8896b6250b760541125fcaf03e6 SHA512 d85ea5e9442e5f780c3478d565fe89f5ebcf79e7e7dbad977ed54450252baf98dba4cee3cd3e377f273c6c763a51a6bdd5ba1b1b956f86bd01085383f271cd93
-DIST github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.20.6-k3s1.zip 14206656 BLAKE2B c5c18df64c9f8c63dae71e976fe45f92e9258c9c440092ba1a5bd35de0f79976bdc8e617a45f721c586a4a5ab56fe733a1fac37ba3c8d5266874463bdf128610 SHA512 c315b4cfd40bc3351052f812035e8d16c06c4fe9e064511705fd41a89fe51017b1772e08f158cc199c19004651077a24be38b5539413fb70ffa97ced6af7d49e
-DIST github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.21.0-k3s1.mod 35830 BLAKE2B 30ee48ad9c22720b3e3c0e730dfc1a3eb813bcd30fd8baba030a7d7ce0a1b459792019bd6de68bf8a77fc6bac623bf3e362cc220242b86a4939f7addd78fae0f SHA512 add446c964da2bcfa53edab6dbfb4c65e7ee90780d7c84710d0b868816a102f92140e159c0d893b5ba4ea823abdf98c1582b8eba6317b3eefdb8f7adf985f958
-DIST github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.21.0-k3s1.zip 15371898 BLAKE2B 9a182df2cb63ef2dcc46c35367d7f0f84a23e25f88ec1fc55ffb58391afec31d5fb90a69483e6af884e40ad1acf4d86d0cd4fdc1bddd1c6827e9b72a64e98aa3 SHA512 39f5c4e22d038fc23294a4f46ce4a4c0ca6ca531b1c66fc49bc88854bf114b4890f5684a75fa9b63de428c01a7edff9e8bb555eea3097c9ba9f4d310b3bf882e
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.19.10-k3s1.mod 264 BLAKE2B 05d68d8e51ffbc6a1886931dca9964a0a6533701314b86cd64b369c853750d9f39f94a9d11d8b7f0ecc4965e4d69e5b7f99e3763d7e6ddf52cdf68f8bf07ed69 SHA512 cda72c238773d56740d0de387e29925b975fe5770ebd0011bb34ea959ba11804070cfd444ea0647d15f0dffb59c59983681c21363fd013be2e80c74a56ea5428
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.19.10-k3s1.zip 4016145 BLAKE2B 69f3aad6c589b9f151acd95c0fcaf6f17d69744a1058ec42a97acb6787e447bf0937e81db9552ad6f5fd0c1d4d7d20dd29337c87e6e2d1297777f2b30e4aa18a SHA512 78340abc0fdc023e9864d059e61ccc30129ce3db4fadf77483a76c641b39bc07ab1dbd0526ae543113409b1501c0abad39dde41067900f0a7c1b39688a6a232d
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.20.6-k3s1.mod 264 BLAKE2B 88bbe6f39646085ef3067a661a3ca3372a15b7e14586ab0225f05807e0fb9298721ce36dc61427557c1972e2e492a5276eda85d44e5a656d68885be44015280a SHA512 0d90f9ef7a28404bf4b3c5fec0865ae34cc6f36fa4f5c638e200a14a53bfa65a5f9642b8f68c24a4b5933ffba98605a2ad1ed1d6e3d06438d88789cfb73a8876
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.20.6-k3s1.zip 4050800 BLAKE2B 87ce8002456657ba8fddf85033bc06daceb40d2f950f41a296b583b36d3446bac6b3aae13b7c1dadaf00b73d36592a0bc47d21c16829edf8d0557b64e8f707b8 SHA512 055d7db552994b703210f899cca2e8c2f6de87c7a0afec111c024897b935cf56d7419d3961effdca5783e5ec663cc2b0096c7b3a431d7d7e4091318de369d653
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.21.0-k3s1.mod 264 BLAKE2B c65ae8b5d9e6bb25b4013cc05cf397404675a48d26dd89b09f61bce0de158c6293c3931f3862f58b505b7efabdd1d5ca7364481e631b21857db46ebd8ed7a824 SHA512 262b36fcd2e62f41e62fbd540372bcd3845a3bc431e207df271b3f0c222585b718075cafc8e03edff67fa479a95c94e3cbfb046aeb4757c272aecb8b35bdf6d0
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.21.0-k3s1.zip 5005653 BLAKE2B c365efaeba0ef9d9e2c3a31b2ff89da36c0b168ca4e17c3f5b410fbaa49c01f3820820f7e612be59d547a66a359f5724a55bbf32f770223ed219d93b88715904 SHA512 7cbc176763794b5d3dde1f6d85d65ca709626212ee9872131d1f54507fd4a8ea17aa997e81f96b3bc1710a72234bc316e4a95d55199a4444f67b50cdd48a7818
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.19.10-k3s1.mod 1304 BLAKE2B e0c2bd735ef61b27ba30194c1cade4ab6c2691be1e499d5913df2a245090fe23df1f42fede101ee344fd2919f48fc445f8145ea833cbcf9a410338dffe902ca8 SHA512 3c33a4137ca3e7f11db091c595a42a90fee1174d2b5a72f1551a4785fb91161af597570820afaa9b960475b826d8fe6116b5e6440ae4321c492198f18e48b4de
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.19.10-k3s1.zip 697749 BLAKE2B 19d2f8a3b57c2a4d508bc68cc32eb89af0be856464134cdffe0ed54f7567ef628308491f7377a8f7532ed15574d411082120958383e7003cf3a88e5db7c94e94 SHA512 846230abe69863d87930df5f6b55a6bb7568c50e9614ccf3c7787995649d015f7e58e1be1ca91b834f925c0c6d908e3b69d07e6c0ccdfadeddfdd64e0f0d49e9
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.20.6-k3s1.mod 1188 BLAKE2B c9c638e6e05e02c7978da6de945019a24dce6305a65eb9e99e9b32a99750a29276e3dd7b5c607708150e91144f738407464ffb58f6d6c2706fcc9f9c3b245d16 SHA512 5cca9765334ada87883528900224777a957132236a926245a325238d39b3129bb0480798c7d85abfcb99c80f83e90a8d148755d634cb622000432f544065624b
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.20.6-k3s1.zip 709256 BLAKE2B e009fde2377d4e7ad75dfcc90fcaf642ded8aec6b32f4178a4d677991cb4814d6f39c9b59aa3649c13de74b9e3e1e930755d29dfb4692e39d4cdf4a1bbd58cff SHA512 f6812feca839dfee463c84e6dd414609d22be492530fa52dade66576bd656fec7573b0af0996b71213098e375afe7815fc5b35589b71de02becd9c1746c606d0
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.21.0-k3s1.mod 1233 BLAKE2B fdc978adf5929121229335157d7fa686800ea2a03bc8456331a50eaa9aeed4a51db2e4ae7a5d35981d5b3edf46635dac6f64e814a0f8790edae6837c6c7ee256 SHA512 d8d005165339655c1defe813a29e2bd28b19996f4200824b4fdfd228aa9ce5d077e5d16b89ef0b7e4f796a8a7ceb91568a1cb18d7c970ce242dec271dbddf422
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.21.0-k3s1.zip 663288 BLAKE2B 062a4a6a367329206bf26408b29a160c272e7c2697411388ab3a6549296576faab34149c4ed6f6be4f3ccf219ad81d82a7e2df3c6752adb777164f498f1058b2 SHA512 9ec88721b796a63bc2f5f7fef705ebee9cb7b5f5ae187aa75ab05e4f60714596c172d295becc7805ef559aa58521afa13ecab450cf9bf9ff0d16d0ae0b10b698
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.19.10-k3s1.mod 1418 BLAKE2B f32beb03fc9a2af26e626c4fcf43fd5995731c6631ce7f7b0b4e04552c0d533cc186f4092c2f14784c11e4cbad495aa9d87a399dd1844e0b28798e314962d6b0 SHA512 18554a7d60a5dcb9e916d01c406ae114fce42d7d48e27eec3fe1f11cae8ebb022888d9a411386f253a07bd458417a332e08fd4b90482197dcddf2e8990f4becf
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.19.10-k3s1.zip 887866 BLAKE2B 63babb23c7871d6cbee85a7287a4e3ac0ff587017803e939f19404d237f52d63072341371adb420fdc56af8d72706bc44a65b9d86b8dcc5ce8e6c03e0553ac52 SHA512 6ff7acda6f9d6a17544c49931f4599fff5f03c8f354134602708e0b1bf36fa29907b2476c5f94d3823276f85b12b0713125188157844b2c653494f9b8ad222a5
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.20.6-k3s1.mod 1456 BLAKE2B 8aef7dead17e9bad572a03fd73343e27990c3789d0c027ff78281befea4047f0724bafd12ef4b3474af1ef3072a95827d81fdc2a6764c49278b991805800f1a7 SHA512 03bd6ff76c6bf93a626f2f7e88c5c524fc0ecdc3d760ce20d1f31b0eba8ec86d24c307c2391103651d190b92d1f0d29bc5cae11af036e05a36516fce5e450847
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.20.6-k3s1.zip 888225 BLAKE2B 9b55999034aab3e0fbd7c00f1a8e5295d47c3ba35df32d91dc88cd2366878123cf363688eb26fe82d21960e5204da40264234646fec02d23a1d6fb1e44d5a0d6 SHA512 e673ff745a1ad7b1710be921f157f004e870f46c1eba3e043e9da430cdaad982348a88a16646bbe4fc95ff84a8bb44d5284309739a16d05a70ea973d856c1fab
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.21.0-k3s1.mod 1557 BLAKE2B 18659443339f423814ab5839191aad4bdd734db7d2200acfa2ae93865696fc34e1b5e7dde6eee20941ff71d3a4a5fca93a064aef07359d5533a05d4ea90f2dc6 SHA512 5681a15c037dfa1763c6dfa7ac8932c6b866642e01856c0d3ffa6068f434bf4585288c57ac4e1e18c065b2d5d38bf0d17278a382ae51aae79030b4e81db992ce
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.21.0-k3s1.zip 841885 BLAKE2B 3d5317764982b4f7a57f3ee6df7682bd799215b70fa7963ebc433d04bdc926ab299d6e2e3a935f146cb0afc753e07de337037868ddadd9e961f39d61b7abc1e0 SHA512 fb1ded153505761bf092b90a715db99d69bbd4544577db7c719c249d68acb2289d9e25339aabf3698be62aab0837beb16e16c0ac4fb82c6450375a6a41a79e34
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.19.10-k3s1.mod 2305 BLAKE2B 5fecb73695365b556c3ba1e869b3e20f6cd1a973b6978ee3a44d45db19a14138f6be50c0214e7ac3c2adfff4c6e7acda0f5cacf2753997953f70d8c0b67649ce SHA512 bd592e5538d39d576fc4ee09e464bb7515d17d865fa4b0f0d63e2ab79c05ab68b2abc71a0ba91fb68b21303ee9eed8f7633f386e723535d0bd236f2fb9cc8a26
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.19.10-k3s1.zip 1774156 BLAKE2B e7d8fbc579f73d5b46e1dc8d4b97a90fc2def4e8822af9ccac95a744fd04ba9f3a833ec0d5365c92e1a0fc960a212f4cf67da6e24cf93f607c84cc08fed9ccbc SHA512 fb8bb22178372731ba64d2076d5256f42c751a1881d9f0c794683c094c976b56dc51e163813aa452b7b3c04564bf13bfd9e6b53c0dce4bf3763ff8b90ca5a972
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.20.6-k3s1.mod 2323 BLAKE2B ed175d1ca051456c52c77efe3772ce931cbd4479df011348c31b265cc5363ae3063cb4c575a6ad24855ba672a4ebcb503f4c37a96e714d7f0bd578b759192642 SHA512 47c90503b6f3a32852aa436da93007cf3fe13e1bf6224b25fc0f058fab0b383fd0256323e188f5d4e8126b7dec309e94fca1289e8c16b2b77f90e6ae16f0dd1d
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.20.6-k3s1.zip 1857214 BLAKE2B 35ebcb9e93d03b80e0465ce21331151e3815d60a2ccf977b73a41920772e96f5f78f0a15fe51c7a4e6843bc3cb8ed67dd7202452f48c9f90759006d04d48ea77 SHA512 4a20560a4b075bed99337c36d1c64e8a33dd577e287938b41ec2807dee973d956f685ca1ebb5efb99939a0854b506fafab8c84e8183d343fe52d41c919e542b8
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.21.0-k3s1.mod 2372 BLAKE2B 88d7fa2e2bff82b9d7628658756d33b80c2e638d4aa83e682371692b61c4dd0a1ff9c96c6abfe9393766df37aa07e6b7cf655f3c8cdb2bfa95f8128e31e9646a SHA512 ebdd516810c45b3373be04700d3c545c154780e98999700e612e7f7860042667cbb4920a1a67380cbcdaaea5d9ae0d480982976ccecab2f9bf04fbc8f738f1e9
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.21.0-k3s1.zip 1767905 BLAKE2B 0b116c03215dcf067808a7a4c88f129d77fe2be9df14f10e4c332ad369783cf1a691fa81b5b74bdf94ae7602c95e51f11ec183fd4a14020eaf301dba8331a594 SHA512 6e1cb4f659016fd4a6f240a25696ed6b23be0413754c7d8309f2e60cba5865a2ad00f7bba944e34be99d73e7ae4e3e6bdfef7a469d419dac8e81bc39f423197a
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.19.10-k3s1.mod 1027 BLAKE2B e90d92e335517f6771632e42a7162c7efeecdad1b4e8781ce9cdaac241d24dcb83bf97723d8aa097462d90a71b1c1db28c034b91792b6417fb354d0b119a9719 SHA512 bb33066633ae685f2223af031e1b0d9f85b0ab60b8df715229327d838aab86e081c056aae169bfc3ba2aab6d947473d01c54ceb5e8f3f5cf498c79c53cbcd392
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.19.10-k3s1.zip 490603 BLAKE2B f28ffbca87313671f41b82e1bf2e06b2b0d7907107c645f5533c286d709d511f1a0afa43eeadcdec1086bd6c4da479aced9f0b1dfcf51538dddc8316b130c25d SHA512 7bc408859d805b9b538fe6c1f610937ca217743e73180eac176e520df3b96849197338c567a43538866d3f4bc3599c70b14b020e33a10ab7381a373829ed3798
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.20.6-k3s1.mod 922 BLAKE2B 4a00092791a3b9aacea55ca4648d67182bdcbbd3f1d7ac2bdebf0ecf43bc2a526d1976cd87b7c63746b9fc102571d813120a78a64a75ebb2fa99531a42017021 SHA512 c72d27d3978939b79d736c33c31dafb4cba6cf790ab7c780e8390dffcd1afbc2e24afa849a230c2427291ed2144dbb05750de0a0dbd231e55d7bd160812697f7
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.20.6-k3s1.zip 495589 BLAKE2B e7d2ab92ddcf3110efbfbcce296ab67ae2a89e66b1d43eb2f7b057eb716830f71ef63cbeee33576ef75cf02b3eaae0599696f74f26b34cb1380859ea2374e3a0 SHA512 7e395b9815a1faaa39056dc5163caae1654a23cdea1fba5a74de6c1540948e6d926c059e2593b4295a94d08b1ed4ab1d7c5df5ab61a15c77e698357c8dcc26e0
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.21.0-k3s1.mod 803 BLAKE2B 2335b3ac4b63669348e02ff7d47a56573cbde262a9b5ebe9bd876457ac3f823b55031b2990305a8e5b438cbb3060bf597a8a560cdd8a9aa5ca7412d916b52b39 SHA512 6f198f273751273d11293391ac53e66c98c2262a65d8cc4ba825982113149078442e032265bd547ba11131ac43b0ae42f0b94d9c13d64a2679b0195c939f3f06
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.21.0-k3s1.zip 464980 BLAKE2B e7b913bfe8a8d8b08ce414dc721647dbc5af6aabb021901446d94c0d033a81d9996dbddf35d33f6dc5e3f5dc20dc6b30cbba91bc494257635eda84b6ec55a17e SHA512 05dbef92c3fc59033b9049208f3af02433e9c5c7f093207990614f5fcf74d160b45e99124e0e218b8c936a46e537aee3618df3d1440ef4405dc7cb4d2b382cdf
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.19.10-k3s1.mod 1280 BLAKE2B 7705cd6b242012853f6ce768998a8c0a259850a1703ab00c2896bb1de06eb3d6f958cc38b33355f01cd5833b0438a6858d7ecc8da6966951739642b33dc18207 SHA512 ea5ebcda0fab14252a586ae093d0c3074e5e2dba6c4673341b0078fe195da9d0aad9a153a0db64731062d69fbcf176aedd6de96e2948b8a4b32c51f368f91831
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.19.10-k3s1.zip 2565645 BLAKE2B 3a66f2cb7d2cf5e3c2c64eba13e421d3e288e7e5beedb42baf257c6fcae78c4ca4a20d90742a0ea704dac0c86b95f4f7dfd44f76409470b0bf1093e71db92bc2 SHA512 77d7b892e6a7e8065377412bea955f9eaeff8cf74dee1897c4ea3823cde6d2cc93f9939282a043738d16688d6dcb93340e140508035f084af9eea683283b1001
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.20.6-k3s1.mod 1281 BLAKE2B 899772bb3da4961f9830a09d65d2e052609fcc9458a814aa7391c5d53d39e41af30a9e3c0637df4ec1a8bb02b79df68907e97bede5dafe35e46de3c5aebf291b SHA512 3b97c77193d311c2964eb1baf0ce54a06a129b592cfbcf1c28fea11f3216c76bf24812f311fce4b6f22e8c0f669b6426963724390f98c6b2f47c8570e2a2d3d2
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.20.6-k3s1.zip 1998932 BLAKE2B df6e744cc5010fca032897e5529b9273e92ba303e9b8d088ce41d61216205296a01210ebbca837409608930dca68e469a28037f78351ff6084e4e0010799b08d SHA512 ce1264eaa8eaf8d7f6793e29c676329c0a597fc1630d93481648682e6428a8850354c26ffe3fad971f25b9d7d56644548d0d3d1cb2b139f4f7cafe5a751ffb34
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.21.0-k3s1.mod 1393 BLAKE2B 27e59b98f22b63bfc24344cf7cb81c6f215959f3f55b561fbfd85253da76fa5463414e4a437fa64543c9c3881764ce716d116bdc6584f8a52c4d8f1f935bd176 SHA512 26e193c38a41d36ba640c97770744c57a46979fd93fd19e5c873096dd6292cdd09b013462fcaaec3c9f6f92cf4d95bc03cfc557787f7c729f08222efea3d8494
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.21.0-k3s1.zip 2738041 BLAKE2B 59195d5f337e4a6e5ff410cac29312b66d11af7c91e723aea3cbab69ac5588fd4b5db748e14daf1edaa9324ccf305162577a35b0c43a28cba88babdf984f5e94 SHA512 f8345b4a6aa61a7a7136774221522711329fa97191a3bdc9d6114c6c97aeb5c0338223c8732f07c427a9eefb1293f957af95b35f21c7680460125b5c844257e1
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.19.10-k3s1.mod 543 BLAKE2B 12d6312385c711e8041d196f208eab5ded365e576e2fa4efea39bc71b465541caca1cf6c7f27cc077a96793eb0ce1e2a9a6e2e75a3eab702277f2d6272fb5c67 SHA512 fd273a1758745136eba20ece5ca9886d2ace7a4b6e3970b86506311e680d7f3b34d58d719e8a164de1ff531a96b01d7da3865e5530ca776cb177b096b6320004
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.19.10-k3s1.zip 126596 BLAKE2B 88056c319037b8c773b013aea7e189a2b8cf4f58a20225379e16965a23d844826bbf4c058ef6f2da53c7636cb2f65971c13f2012d6433466ed0f905bedc72499 SHA512 f289dd3a433cea843e4eacdc088496fef0d7a206dddddc7ce14649bf24c43fda28248dc130dc2c0014cd0ff99d2b2da935021170c7766db35ab1eb1eb069e8e5
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.20.6-k3s1.mod 750 BLAKE2B d5ffc49c2c1b4e4efbf5cdd911623f9a5facac284091c5f172b8efb11cd0b26274b26d66f07f53242711090d1d3980ae9ffe04f9ed680bd9603f6245a0ef735c SHA512 569605720925e61aea87c93958a020c9651e22daa93bd580ddf5638e128c36a291582532c48ef67bea615d7acfc27d8cb41196d6c93cf4d9e3e5c926a4ccf31d
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.20.6-k3s1.zip 196888 BLAKE2B 160564ecd40baeed9567a05e15067d4668a56d6e7c03f8523d03ce8d75a564385a01df3b2b50863a3b67eab6edd39d8ec18ad74f766ecf801d15ec366b3462c8 SHA512 5c878adf1a2ecd60c13e1d280617f19670d3afe08e5d748eac37b5b35f123e44188b1a195eec8acb9bce0a04746e35240ff0754064fc4fd912d8700bf69ffc37
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.21.0-k3s1.mod 750 BLAKE2B 66689dec0f7ab3edf9dceca145567a8abe1acbb07e9e3a6c0fc9869245aaacc19e613b343e296e5e76ece0228553c1947cfde31cd1c1edf3a46ab61fd55a125f SHA512 1a4a2713a3551483d8af0a8d778824267d3353f3e2c3a84c1e9c0d44789b736a29c5a6ec8b5562eb6298419b9e637ac14c5d8a4529c049b52dbf7601bcd5f77f
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.21.0-k3s1.zip 186052 BLAKE2B b038a3acabc5f17ed6b43960e088ab846b4b064f89afcd8b8c6e5370f1a4ce8132ad7581d55049042b14d70530e1acfe3b6cf5fd246401a68b55985e004174dd SHA512 71cccd9ce1b4e843443a0057d2e464adfbabfaaa9959c024d42c92402c2720c965b0a0bcb3aed53861def3ebef0db0ba425b3d37db10e703c92cd30a683cb504
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.19.10-k3s1.mod 372 BLAKE2B 4994dadd5b18de492b2b5e5cb5fc21259b8db0937ef2a036881e2f71a257b1962f65e49035757515fb3a3f37d8edf36e8710cc6627e3537e387398de2b9a5016 SHA512 ccfb094999f07668aac87a5e11087c09fbfe163b9b0997d92ccf1c119c9e2d6ec4abd2c59f03d631787429c1cf13d9e1cfb8a12f9651438561feccd81d1dcb79
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.19.10-k3s1.zip 35041 BLAKE2B a02c27dbed857ad9a291c68ad98f48686b717549f7e93c17428ce70ce59026ecb456009acbe675d0fa2d146e251a3342f1714b1a169d39337d4788086f118912 SHA512 26fcab310ef9a914d2f356d6482bc5b2ff90236e30874b076b65cc37c5f9eb8d507c0e92d0e664ccfd11a03afa3bc5ecd39cf085880c16223faedef21779fbad
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.20.6-k3s1.mod 440 BLAKE2B 3087e4743f36a595081ecc8957a4c462d64d7723c7256bc43f4385819a589ddb9658ea850a54ab2099d8be9eb59a00aeaa974766f22d0e3bf0e829a45c7bd734 SHA512 a7794ca55c699b95a9b55934bf65fd04b69fcb812cc0a32fd4942290f3c04872df4e4878ee9a428682d2d7efae617cc1c6bfef78d8ad1b4d9e58f946aa3305a9
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.20.6-k3s1.zip 35585 BLAKE2B 8647be3c97b3c1a55209352e4c283786dfc56a80a90e608d61509e7bf2b73a2c18b74fc8cbcc19aeaa0ccb173ef1e5456eb839e2f5d3b083af77b4bf07a7a701 SHA512 3add37dac6a4a76f82a2b900dd9491f178fc9582b6428427f51b5f6007f9a3f6328ba85f2d06f7a10bc84277a2e3c1314b97399b0a0ebaf73c363375ec03e20b
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.21.0-k3s1.mod 440 BLAKE2B f04cb4d45b6669140eb348e357bd3467b5eed375c5867bcac7ffaab59312c3528b4d226b36263714604f0f3fe675640c1379341a219d978cfe34328ba696fc54 SHA512 f0f0bd0e750a586cd2efab912c4ee39ba5eea60db4222469d84433667a0d4ee10f39653c21bf2400bc9d8b19f1884a8f24ce64b88f7a0ded5ebe2ab2ea90f756
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.21.0-k3s1.zip 32421 BLAKE2B 057defd5c4474b061a84348adba1c32f929006b51d033a71dcef79622ce95570db267be908d398700ef4539e427822d37cd2c8f861b554b31ec2788897c26172 SHA512 ceb51061347423247eda45b5b9ae6b975b9df68238a23de62b4971276ba478dd92fb25a4058d4a4d0b4d4f389f0f8d52565d601eb759c6e5b81a27b0d9622508
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.19.10-k3s1.mod 762 BLAKE2B b5e9cbf0c4cb37f4df10be6c76e7d43845b4d762d97ad9e7230b481b69a561934b26cdc1f9fed3498366ef2b972067adc3c59d8716a5d27ba81df8850c306309 SHA512 ed818b9330de74c23b78bbe2d0061226110fcb82da5faf4eb812469ecf31f0fd5409e368eec1b1c1c034797edfccfda4ce927e84fde35bb627a5a389b2afb5ce
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.19.10-k3s1.zip 568515 BLAKE2B 5f6e3da12448a43e55480a8a4396a2a00eccb1c3f15c30027dad69674e714511755893d31eb549e01c9a1d5c9943921bf88d409d4cb12bb9c8df5382152a473b SHA512 651c4f56615c7db360d1c1404b76e03677c6cde62def4d0ad1e41a1f3a03ceb49fb4b5653b9e9fb7dd28276048da143e62ed280850cbe28d381c383d8e59ec31
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.20.6-k3s1.mod 703 BLAKE2B efafa2a26ecdd22dfca72ab71242688dabe037f7472e441b4b9a4d46ef44827a1212d147bb5dbfb984d20ec25480bc4a11bb48c3919ee2399371767771752427 SHA512 456e93cff3a1f06aaef41918a5d47026f6e04b8aff1e882e7caac5b2e946e15c07b2f699b64fc6025453bf459358a32efa774eb510ce1c8c3bf169e4ac6dc8ba
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.20.6-k3s1.zip 568196 BLAKE2B 1a5662c712f7b53ec0c6681a851f69fe5cfc6edf1a00baf3c4aa79ef97b32da941a0d17f472ff52c706217f87013cfc5aaf1e9529644b9bf58c8aa43665183f1 SHA512 c8b44dd6832d473ebdee8092a608211d8baa8299ddcc78037ff25c35e981900e09bba8cdcfda5e36e72a3d83d6a2eadb8a059383587d1997797224cc17743c32
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.21.0-k3s1.mod 1392 BLAKE2B 70c9acf0b197392e15605d9afb2a15b1495b6ef7531123e3d4e2d646e3b4e566a1600d56ef31d31081259f7e66412fb7f1cc475b40e8fd50e4c069d82035e8ed SHA512 2d74fad16a84c8925fed2d3d08d693117d43e8ac80fc44c7efce08a5d24c64d75f407592edafc3cdac5b02c3cb70404bc15acaa997927afaf72faa4b157fd952
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.21.0-k3s1.zip 199845 BLAKE2B 2ee059fecf73d67416df6c485c357c32865f2afed1ba34f6b135e7f3847451c7f61e6e4d978e69f83d912b415acf1549831012665d72086a5fb0320f6816a368 SHA512 7bb372e89a4fe0548f55c98957c5c8398dc160fa9488e838754789b558aeaa48fc9b3673d5964f320dfebc170f7d133e07cb8f0b7102643a7613373b81991b36
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.19.10-k3s1.mod 1028 BLAKE2B 3d26a5f1fbcd6563ac610c43d2e2459f5259f0a357615cd365557bfc8fca1546d2cdf8c8c73cf53de5b2016b3dd5ce525b3e4383dc769a3612091a24080c0713 SHA512 a71327fad7f2ee5451bd8df0a94aa1e533178ee1172a90f02e6752c238101b1a782aa4abef967d63e1fd3701a1720d3f3e2ed8b36a6fb1a99376af85f229f661
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.19.10-k3s1.zip 203649 BLAKE2B b80ac1be5973c151a4e1e1eabfcfd531b095f1df0b12f33c6c79f6fad6f3f53d510275dd0a2a2266b055ec0ce68f2ea47a68f3be6f363de5272d3cb912ac9c00 SHA512 4fad1a25b08f86782462378ab877bd3e408c73294fc31d9dca602c1373ea82de45d1d5bf0dfda4bc34948227a187b5ad28be9273177c343a1a49ec9d0784ab11
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.20.6-k3s1.mod 1028 BLAKE2B efdf301ec20d53e579fef678842ad5945737b14cc4719fa673cb2f0025f1a66a04643e187657826b709f98e93a079c5dbdd95bf375f8d700acdcd0895b304c97 SHA512 0cb56a3c52455f059dda6eda6113c9271d7d3134427f007dde3dc08144c5a454df222409b7f71e564f4b1e9553d48ae4eae39f18a1f968db87c22bc98cf82f5c
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.20.6-k3s1.zip 214975 BLAKE2B 7ea91c15a0ccb464cd189bb4b25b789cf6bd8c8ea698189067c6fb95f43238755d6f4824cbf4c7d5b26bf13148a0ac2e34bab0500134a230e10608cbc53f01fd SHA512 ce5c68996f89b1e6aa7123f65d25c64e9b2c4125a4fe0ced66e3fe7a44b053a00259ef0fa4fc89ab6743be66ebc32f7c42d0450dff18663f97d0edbceffb06d3
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.21.0-k3s1.mod 1070 BLAKE2B c5030256e98674cb4d844341169abb4b875f0d7955905d83cd564273bb08ca760f0bdb8424f0ea000e313fb71561a004d0a83eea6c8d2c0f5d832facf027eb4c SHA512 d1acfe37c467195ac44dda04f4b0ec216f0cd3189e987b4b1fcffabac1f17bf5ad0c0cfbd9ece3821f69f9e17e9e753a82216122c4e12930e59b7b0645c8459b
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.21.0-k3s1.zip 205754 BLAKE2B 2b121a2a656c70b211eb4124bddad189a68a99123ed66b7ba4adb221f1b2c36cf9611480d29ed8b55b7a70036de3cfd3d2089271e2f3631cd2fc06a06d4f95d8 SHA512 65084d8a9f365f29ff56bb39a2f55b17d9e06969cb2a585a276908ff285fae0c7408cc765e952c820ead7e0883cee5429f2fa05b698948219e48b20e68d5282f
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.20.6-k3s1.mod 409 BLAKE2B 31164656916c13673fd1ccce81042560ab4509ea358bc4c371ff3d371f2e924e99df0e809f872c8bb8b8d22de399a4e6cb7cb3e864b0d128290b40ea2e3fa16a SHA512 7b170354b43dddd5faab455fe988f6255b329533944a00fad3b7dc3528028b6451c91333e3142045453637b8d7c7f06423898d98c45613e83a2d866cac7c3c71
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.20.6-k3s1.zip 67716 BLAKE2B e9d4b23825d931a985ab19f04d01d0c236897def8dac9bfff16ea49195aa34a5ecce7f1d8675eabce4b631da355ea298537ad0e16c89c66699ba34732854b171 SHA512 e5cfd4a1fde35e58cb0ec6ee8a1c45e683c772d7807b426e68fba99ba79eb9334e51f7008d5a6bca077155e8259131492b34394d8cc5d8b2232c9434f173eeb7
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.21.0-k3s1.mod 442 BLAKE2B ad4c8557d50f00e8377d80bd90da6c18b19960167c66ea0975a931ebf54ead468f505ea1a4d01c1be07b5f095b573f4966c482014bf503f2e6ab91a1f62c4ee9 SHA512 b3a7dd9b33aa09150cc93e0ea40455d8c0e4f078e5cbfb8114d5c6b22b78fffccefafbdb23aeedd4538fc6f0cd4a0da41aa8993a46ee76805805450204056d71
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.21.0-k3s1.zip 73112 BLAKE2B 1da34ad8b6a998f93ff340683708364ebbb91b6c1fe99c00490ef497386096ac9d7fa57c866232741287a3112f7a7beb4a5a4324a7b7283819ddf09b1a059160 SHA512 1dd0a2e8dc5408377514b8b44d2df19cc07d878409d847d95d15308a234979d27a9b6494bb3621ac3e85d64f5d8896f4f7a4a6758830925c0b78e06ec1e6475a
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.20.6-k3s1.mod 563 BLAKE2B d61e8555109eb1ec12929d6f1e0c4950903ef007ec6944deb209d9dc64734e91e98ecbe03424389f4de1ff2559e7905e6b57179580dbf8097eff99f2e0643d79 SHA512 8b16d1ba465c070e8801d3d20f0e1f8ba891a827cf402248e27f7469031a118df6f7e15afe9de98b32c7737476afd43755c3389ee20c04b63ba6f89941555059
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.20.6-k3s1.zip 67199 BLAKE2B 6b50779f258b799a785dac1aa80127d3fa1b6f1b5b9e7280275b254e240d10b03ff8ee9b0722bf099aaf6373ccf542f14b977575beb78a7500737dd0026de5cc SHA512 a6ce6186563ae62c364681698e0aa74229bf3eeea00d26ba013f18d7f32d2c0f939c5700d31714c12bef8a4be7577dbfae7efb4ec6ba9db37395f2c921266edb
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.21.0-k3s1.mod 668 BLAKE2B d2dcf26c5546c6dec9d87436b8eeb58cdfb0f35845b53afca379de3628b7e8e4f00d4808f724c58382c5800492cae6cd08f1e1d4afc311932d2332dfb4ad41cf SHA512 4edd3f333d14031b5ecd1d5d9479b4006c1da5a82a38cc6899534921eb564c65035615520557d35d929ea934118692ef27bece8afeffd18b402485165d774faf
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.21.0-k3s1.zip 75604 BLAKE2B d03d8481bb2024e2c946cc007192a10217e451c554525a0ff1ece0b8612f4fa5d17a4f57fff2958c741248a236e2e989356a1497d50b5a639d23903dbb294577 SHA512 dc5d4189f14548272371eeec3b1cd2a4a442771446062733ece287eceec27e2f94ca43d56c160e77c03ee3daf357d447e8f2b08602653c9d83f1210e532f51b8
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.19.10-k3s1.mod 651 BLAKE2B 53733bb037f1794014b25b528445190cf06ae2fb08e152aa4a6e208ce0997263b96f38646dc74b6042be553b073170cb6aba7cbdbd9c848f60dcc33460e618a6 SHA512 65eef075058c186c5f81cba8d45489897786125c44fc5efffe5256bd70e242551d73d71e2b4cd0c0a0b2ce218c362cbcab3b028aed49dd904e93064b5353a5d3
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.19.10-k3s1.zip 110685 BLAKE2B 86e642066e3e30285a5d224725bad1960407ae503201e8ba515b0dfa4085eada27432ee5c9ab8a176055e622a04d2efc9719931a31558992aaf6343a7440034f SHA512 42ca38257cc479dba98472f6d6242038509abb38dc47e02acf6deccab73fbe5c01a80a8d0a8006fc44955e7ff6d5406ac72b70bb4b076dfa26c86e339bbf3c7c
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.20.6-k3s1.mod 772 BLAKE2B a36449503b3e7d9e53e7e0b9f553654e7d45009b62043ca23184b9cb94279ec8bfc5a9ac059afeb6012c773ba7a89645724f2e743c6d8b892026ab1926c998b2 SHA512 7eb1028d7f9eee3f272c0e532aaebb6efab94f0bb535de2df7246ab337405a4de062325dba6260547da1100877e3ca9b0dfcb15d8f0ca740f64c29e114889f1e
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.20.6-k3s1.zip 198602 BLAKE2B 0debe307469c4710c7a20ed0356bb3f927593a863f609fb50c2fdb8b176028d4652ff04053bdb03b3440f5a43ef5f1a3b2bcf1e725693ff502974c3e8b6584e6 SHA512 d7aedcf42ffcc9380c82380f7bd36cca4a74f25a01a6d0be54f737c7bd03d6cd0eafec69420fa28ac679281992a66893ba1b8c56cc7ee9f0e49ef03687717624
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.21.0-k3s1.mod 845 BLAKE2B 4a47335938499a393512eb0235fa3ee0830f003780922376dad00cb543b16b4e57cfe3db4cc935d85a7de1705ac02a84ab302ff2f28e2b3c9705a2405314c22d SHA512 aa79a9c98f20e6f4e234c99956eb30e91982f5aba02d834235971c2834d2e636f4bb83ef790433a28222bd61e4da72b39f08bd5c986f652412d533b94d1e27dc
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.21.0-k3s1.zip 195430 BLAKE2B fa04b6ad44ec400bde3eab68124b63f61623ba483746f51470c04c64a4ffa0f2fa3c7e5b5ff325d199a51337a6b895601decf2671eb6033637f13eba8d7f4233 SHA512 53c4394ce302eff7ffb942e3b739f86f1da469a6efe9eabd52971068f028c4b454eeb6f26a93691e813a5ca36f1c56752ddf55ec17ec7162b592d5959fb3fb0f
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.19.10-k3s1.mod 495 BLAKE2B 41fbd56dbcbdf4b82cce93a8808bd1ea7118b8378c713a256cd1b543830f845b1a3afaf7c7d1180a435bfb68f8156a2c361c12587e6798aedd8bf5da7c1624bb SHA512 812b0df6e5fd841d85057134fd21f7b7899613dbf29540b1b74e55f660279fc0072b15cb173101f17e954f574592393da992d625f8741a76e60af2f51e26c7a0
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.19.10-k3s1.zip 66588 BLAKE2B 069f3ccd7a5e8b60faaa7bb026b818f8de487fb866cc642ae6ff0e76971c73c4fd4cc830cbfec88ce914c6832a247e6c005b0ac5d1d4e0930f2792253645e33a SHA512 5877b2f5f6b668b5f781be2c48d393829a59acc6e317d127d5fca04e762d29b1ab9c13962cf5675f54402f76384b2377f1b42b17537f4f6689e8028b42cc5091
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.20.6-k3s1.mod 343 BLAKE2B 1d3b7b391fa6475939fa42d7679b7a50a113438e5436ed1cdbb5ce99a395af70a7d2512931386a71df057b8d553b69473d9307a8d609510f3e04703effdb049c SHA512 a5887fbb9f0200efdba74edd4cd71929fccf81d678f38614b5c7aeff532b05f6b8a107080c5850fe70c5f8e670786413630973899bfd015b5ac39bbad0b85831
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.20.6-k3s1.zip 60797 BLAKE2B c3a405593ef787663ae3abbfc2f2a321a68928db4ebc27e853a5287e180c2cbddcf1b137b0f928e35e6c800fbd65ee082aa0783085d473981b276538cd17d5e4 SHA512 01ba97c663b66ba9aec12bfc6aa3a55326731b065d138b37f8d21739c89df4912ac528cf5bf027b9ed599a7581b7e3662c41a2c249e20cdc9ac1c6bd0b9c2de7
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.21.0-k3s1.mod 343 BLAKE2B fca817b173efc421325565fe554de84b19a8bc1bcfc19edefda97073bbcdaa174e2428794831c792e10e6e58cda5e6c4a80af35d4e71e8566184c7bb955b5ad0 SHA512 9fe8a6034811f84c70079b56f5da6cf80bbd43281ecdbb9db8a470e698d7205f9b7e3ff954d0e9f4dcf4f2b7a64bd062baec0d9ec0aee3a153e2a8208c47bed1
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.21.0-k3s1.zip 64422 BLAKE2B 6b38f2ccebacb3bf86c22d2eb8fb60a8112d25f2dca6b243430f15adef7e769faa74eefe7c857d7cba86650ae44aeef26eacb0eab9e0b9c7157a9c8383178c63 SHA512 f8288e2dd990b9a4a062e5493625ca05ba011f225dceffae37b49cad3d298d753a0f7e999adc316e3daa3085da4c61ae4b9c6f65dbeed2e589b81789937b5545
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.19.10-k3s1.mod 1010 BLAKE2B cc1078ae45812745b16a0268ca98dfa2178a57f3b908272a717eda87b50108e18e22b661ed45fa99034fd35f747a59203846250e9cd332d38cafc3e310345f7f SHA512 19a350c8a70ad101500a98d1fb233eb99088addb4fd43734e9956fc160b2cf149d44c6b9c96051f145a94b2bd01f68c01a11ccf3be5be2737b77f1c5b419307a
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.19.10-k3s1.zip 305702 BLAKE2B a646fce87861fd8c8a33fe7d195715235a1324847e44655267782082716f60d554e07e2906e9514e3e6864ef6b82c6c12418f2e8f89db90cf8411ea08c0628a9 SHA512 937f82bb30bd063b0c4d28a011fa1918da15123bf0a90f855854ec2e3bc92f0313ca71fe5972ef684b908862ea59eb8da222c27422266e03ffc36d7d5ceba6d7
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.20.6-k3s1.mod 1010 BLAKE2B 7462f45de948f2207cc49c2add0e78e9c703b40c67345c8f3aaec55f25a7ad5bbfa26240483bff7593f908ccf5b4960d2a7ffa89d9bdb96d92f52e902df00565 SHA512 e12120bb88c41ee224097fe4f945c7b4083b22f7ec2dd718e349767c56c8badf0a71f761d28be366e287edb5a290e1b3c3afbafd1627369284e267198f7d289f
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.20.6-k3s1.zip 310224 BLAKE2B 251d34013a31d04731b28a8712da2e40680dd05b437ecfc037972687ccf58aae7d53d9270f62de69b287c10949fa9694d14c8003d975659deb0f4898424f1825 SHA512 3013fb1db726adc10e45700c2e254a579d2fb590cde45265aee46d629a518fa417d70b2907762447ee941966a98c37e5a069aa35fdd640d7e9c6f69c18ac0390
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.21.0-k3s1.mod 1055 BLAKE2B 3bbd958137df0605a6383d54ee88ce5f818b5946b9687a112ef79646cbb4ba70a246a17fc6deff72167067cd7e966e80c15cca64964dc338c91cc193d61a88e7 SHA512 410e0518f14762fa18e1c2e5459d0d07792a6089de5e4e012f21098a8f68d6a760c3b445608b328df09150f4ef64b53914fc1ec6ca4953886ad67b7492b80766
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.21.0-k3s1.zip 280126 BLAKE2B dbf16094a5db5b81ce62cdf3bd04c09071154933e0969ae6677145aa51020948c5319543e1d02911213c067beb8ee984282721b66e7fc9677b770b8131535e4b SHA512 d667955a745459890cd8212f38c24bdb984d85f9cc97d8da8e2ce0ba649949df6faf98a317323c0b105b2fc9958da834b76265265a31280ac9c5a34cc6664893
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.19.10-k3s1.mod 385 BLAKE2B 60e2e06f55406789c07dafc0705b88fd152c14c50dbaa69e2b5c3d68216347214d7886e690ab297770eba0cf5b17ff043d5f5e837a4b4bec9756952ce2084367 SHA512 95d5b27a2afe1b212aacb756a73cd8f372b96d8ab5cd6f9900b4568bef3d6e672a13cb64cb6d5f91984ef84ea97eafeff4e1df3503e9f452428f8acf2a8fd6ca
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.19.10-k3s1.zip 36902 BLAKE2B 636545d267bad042c616380486d0b4ffc443a4d11d8f2140e74e5370d561463ded62b36a5e690cd858ad3d8a6e894c7aa2fb2b2c0b7a5faf07a6cd7036796dbf SHA512 804582dafeed60a51476a56563d9d8dd26c48c7e81caaeb6e01f4f9c24df0604c83f21a4d65d43828083edbd9815ae2f6d8325c50e69cb975aa10f8646332731
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.20.6-k3s1.mod 549 BLAKE2B 7833c4edfd05bd698201ac43118130f482be54b0622dc1c2e5911f46932b5f9e070a5fb54e471ce606ea6ef6cca9755648842c06c0c030a35b5c2747da91d61c SHA512 d6dbc84a6abd78b0eea779e03fc2b46d255a19be15efa2a81b092a3a1eb016a2184717a10658c3db831d9ba64f987a3e4801c8dd8d73fba950ad43aba05f08c5
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.20.6-k3s1.zip 43639 BLAKE2B c2d485fc9cc3b94ec88f47d35aa983bfbf21438fa92917b5d0e7917fa371438b61b148232bc06bffe0221613dee98324b598b6b2e77a1e006665fefe3117f2c4 SHA512 866cbefb0c2fea2354fa61e6e5ecbb50d21c3f5065b37677fb8332b58feba8f2106e07e18cda45846cbbf92a1ea837f7eb98235a9a0ba8eb068bd594395328b8
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.21.0-k3s1.mod 549 BLAKE2B 9e7cf2c4ceedb1948984867d9ea2537e123dfd4ca87e6d94dd83c7d9467200205a1d2b4304980cbebc5ba71c48a5d4d8f44f1ebe3c1ec29fc6126b86f20fc9a7 SHA512 b3e9d41f507bd528cf133fad2e70b586ddd7b0c0a847870101d20d92e00e505911216b50c88b124c87973a4381d32ae5aff3a076b75c7b3995ea48b6c6cd4a51
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.21.0-k3s1.zip 42894 BLAKE2B be62c3d3575dfb4fbc20af15445e05ddba1910fb2acd2bd462c339949f222eb81f7ce8dfdbcad2e153f32da2bc1866083f5c0ca0c64a771bd7c5c44f8cbd2344 SHA512 a6539fdac451f90f4f3a215f30eabedadbd54096238e8fbaee09fed33bad096e3b3a92997718c6e7932b5330ad0c9ed5e4ad9f4f8b78d58b6bda6e95f2e53367
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.19.10-k3s1.mod 346 BLAKE2B ddd455edb5860435efb7b11300359a533f13385f118707e0733a69af973a1eff5855b4da102ebb38e474057b2807f71cf55fa0314d3bd57614a0e07d577d7bd2 SHA512 12c04db4a65be22adf3305836204cde95fea753c6db6d65a413e0acf3f6d6fbed08180475841a9956d99906fe5ef7f5fee1aa3cf12f1776767b859051098e7f8
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.19.10-k3s1.zip 33012 BLAKE2B ab3304398c8c021687c3a2ab0b03074ff4ace6afe9f1b93784340b5d617d8c1f28a9bd14167731dff9d675ead98c9f697f3023af8cc9a2b554881b484cc1bc07 SHA512 b54e957511c36eeaaffe149ea04b2ed17a97a6b4c048c6da8dda1f1a0df96a6c42e5e9e5c88de2f0b5d0bf78ac3aac1b29701630d76e4d12865ed8e6f2607977
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.20.6-k3s1.mod 346 BLAKE2B ddd455edb5860435efb7b11300359a533f13385f118707e0733a69af973a1eff5855b4da102ebb38e474057b2807f71cf55fa0314d3bd57614a0e07d577d7bd2 SHA512 12c04db4a65be22adf3305836204cde95fea753c6db6d65a413e0acf3f6d6fbed08180475841a9956d99906fe5ef7f5fee1aa3cf12f1776767b859051098e7f8
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.20.6-k3s1.zip 35200 BLAKE2B f0dd37b057520ee76170446082ae8d4a1a79b911478a2ae1400cbbd54a616fcc90e09af0c68238ac3247505d6bea643ee81f4a7e416cde6ee5934e17c0a6410d SHA512 369e31b2726987a828441bea66d1b42f6b5aa76c615cb0853584ab0e4cb3a379df63b2d7c7af7c1735650fb6beb50635689858adf1dba67d9a0fcffaf24b783e
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.21.0-k3s1.mod 346 BLAKE2B e010dbd167436eaddacae5719d85eefa2b10dce3a2fe47c8f6b37fcf1522b045da74b8915a5fb4d5d72da7003750939efb136653f28b80ec6750112a390f0a1c SHA512 90c9c92f8e3a76b9223dd6baba27b1d0e12c6c8884c7f46514cd6dd3828743d81715f5f5884c2a08a74061bb5d4ea2f93ec7d759e588613552312106da490156
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.21.0-k3s1.zip 34327 BLAKE2B 2830a1a7239149ff64046d6ad1163459601179122483b80adc5b6ec612d33c36f7c0c6a06f708b81de830b6c503cf99222517dd74d2e2c1058654efc704fc43c SHA512 a71c753809fe34b9f07f6db892c877cbed46dd62766d8e84845ee52c7290595465a6bc74cf09105ee67aff70fd5b4b1fef3609ca2ba53bfa409e64be42344ff0
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.19.10-k3s1.mod 435 BLAKE2B 946bdec1e21521e177e66c351104bf8f694fc3f77bb79597b03e5de045c0aa4f26888be8d11e9030f155322f7111870e2198c5aec88c4cc7da038c1fcd31a488 SHA512 b3cc793db5036d4bec52d2bf6046c1c6209a0ad243ce0ab6fdcb2eaa372174ada416007faac6f853b190a65f6f5102686cce935cd70456c76a10575535ce2312
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.19.10-k3s1.zip 52226 BLAKE2B 81388c278b1d53cf2c8b1db7dedc11781353cfbd856b50d16922ff77b1f2e8213896f671e4ef35adef4d4ca07a8ec36bd42682999460127925f70e4dd03756ca SHA512 9d7462af72b24e897f1ba184b7b2db299fdd2f8beaec56ff0b8d2b643be6fa11be4b82cf03faffa436bfa04ad97dbabe9c82c2f9cdcf9089680e6b713c3cc645
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.20.6-k3s1.mod 435 BLAKE2B 3fdfda15fa9fd2a35a166253ea9780f58767856d0719cbd06418e74f6fd53e3a41a0c7318e40a2f2883c146bc3b2171f9cc535a02c3333467f76b4a3860da6c9 SHA512 fa7f281708f3fc894906c5150ab5f5705829205cac3038c76a1252c271e7a259d2891f6e9db5ef3e303a00b8ea30ee9015e8589158d7015f19427ad542e3a514
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.20.6-k3s1.zip 55346 BLAKE2B 6ae730ea50065e0241f1d81efafd1e0d2588287cfac0503ad65f7212b1b171a26c6fb4f24e130a7b0b3eac15d29ca8652516176ae7fdb883e5c6d3f8100f3ced SHA512 5ce3a4f200a98b6155125020340ba9b65882c843488b1e75e07884d135a8d847f23bbb1d81f36ac377f72c4305cf5d151cd739148710b235142fdd8e61b8cd1d
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.21.0-k3s1.mod 435 BLAKE2B c8620e4e57098707a8cd6146e5edf0edcebfc0efdcf134760de4963623428ad9561ba5cd031ffc287644f6febfd002bce1e75af2e3efdb43fa7e798303d026e5 SHA512 5f5082dbace86ec9f25512c26df952fe1ce57306330073f703b708753aff69ca2be3b3a57fcd6779721e2ddb70527f7ac2580037c0e9cf9a7c0de5d830a4977e
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.21.0-k3s1.zip 53298 BLAKE2B e2ab82e43189cef9c580ca97bde91d8ed2594e7ca0554330c75d7da543b0a61a73acc81bc7135c342a46c21d1864d74bb7a9a5c0c0d4525d8509ae95a6fa0d37 SHA512 93ec1f79866a06ea65c5736773432d1497dc2ff85c224af0a3cbfde867fe2445ad0fbd3ac4d50869bc4684ad93f9c64f77f2fb00034bee641b4aa3edf2077d5b
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.19.10-k3s1.mod 2221 BLAKE2B b77973119a795106405933b72d0439eb63d1fa88f02f2c910c60259cddf09bbf85026471060ee62d535b5a251c500c20f25a33a8ac989663565bc3039be744b7 SHA512 49c801f3ae43796f3fe8865886896c10721f404afa079fa06b14f39b7dd3a34fe23cd9e4bcc05d3d8f572fb3ad17abfb4c28f2a774745f7b071ce4dad7df6ebb
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.19.10-k3s1.zip 3472588 BLAKE2B bd9044fc2aca98176736b9a7930c8a544a74f31f9c4f60f6597098048f89c590f7febbaa191b95e275efddc186a54c52526741c4d5b7fdfcc99d9bac66223b93 SHA512 a1ea4a55c2ab062f61f7a999dc953dd5a17441559f3f8dc1dd3722c790ae8acf0c8f35b4e64740b0e4fb192fefc0c7b4916f7309ffd944f4496e5d0d19ac37ec
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.20.6-k3s1.mod 2215 BLAKE2B 7e32f9c1295dc549cdc3f16c282e125b9359858d75408aa3adf00593c2f9b24d7a65fb3f5a65553abba106438e00afe372c63c97c4100155ebbedc31915c9778 SHA512 c59fe62fb8de18edb943bf319d4ef66b13f52e25e46bfc4d6d0cc6b8a09533e1106de05477ea9c9fdc407c3f1fd1d7b4cc6ea0fb5fe52017c16f2b3a10512c67
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.20.6-k3s1.zip 3522649 BLAKE2B 7e5645d4c12b4755e5addcca400f6fd27e72d360401a7bb73a12773ce3e78f523a309c228b58da0382d50bebe961a6a4b11dcb5e23f86b5e318cdb4585c1f96f SHA512 7d8a9eef5e57f6e6c54717a53d9513f9df345bff325dd7bb624ec449bbea5a55d9211462b2e85aceac02c23f07eead4e5af93380fe7c514d4270b8a7d9057271
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.21.0-k3s1.mod 2148 BLAKE2B 1dcbf0091fb62b4ec13441ba8c2ed4970196c26371552d2b8eee4a49c98e4ae8c699cf422b021cb23f611b63be9af551540a23f851258025ab745e91bdd10d3b SHA512 f1f7cd36b1a47cea2fae3a491f4d4473056ea6ef93e4ea2a2d8d97f72280930e4173f4424d806efc1ae747d364fce3c3ec8f80f8c6700abc82fd229ed9e23f08
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.21.0-k3s1.zip 3503603 BLAKE2B 4578ef35b82ca1c8913b6c96cb1f09d3fcaed15895d206338bcd233832a861e34105f06e7803646ea5ba70abb142bbb0642dc94337f09a87cdaa91846743cb2b SHA512 c3d8377eba54097064fd9bee055d3a3dc2b846848aaf2f93a6eed902f1d2b18b4e109eb9149cca0b1e6f2fe54b875f6c812215f8f15272bdfffc9e1a68491e7f
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.19.10-k3s1.mod 474 BLAKE2B fe25d5a8c98883496fcf0f95e3de39c76c08e7850aa20b10ded02de758934babec47c95b1bc3b09b6a1b16bdcb3f6e54ec9a6e8a852d49b3a5bccad0c6d96da0 SHA512 6da10fc78efb8b48d575024f32ca6260b1e8ca1ca040d11a741df5bacf54bb5551d50e9f0d27e4eb95dc3bd6dc5ecff6911c3f4dffd42226f12a6bd753fd330c
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.19.10-k3s1.zip 102293 BLAKE2B 3d3d81dae7fc11c71dbafcdf3b3a81eb5efb33258ef748d11d48e59a0f4706716c41be61901e641225ff68a47f216be985208747affc6d5f4a651ea824d9e13e SHA512 e3e2cbf8b52ac959a41b463b6ae0459efe7cb4b9f72ff1e26642603799e552a3c4f384c3c483397905c745d81083314ebf301f152e3e98202e71a811c245f0ea
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.20.6-k3s1.mod 549 BLAKE2B d770af7deb9ad0744c8f5b1b5e07c87fc9967bcc5faf93e5af358910f517e686e534cd2044a4a5c5d9f26f524359ea69e462ac7ee140bdc16a70a2e5a856dd35 SHA512 ade8c952674536c057d29712390b4001994970957d8ad5bdcb31ff6935e1fdf2b82ad2bb83cb2df7ce7c01fb9340cebbbe356c502f37d98fdacee5db540ad264
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.20.6-k3s1.zip 148572 BLAKE2B a6e75997a33803c257f6d15a4ad007c3b8364729080513a09e87f9175de6dee233e2fb51d8f4344badfd7080a1652f9bb3c35252e9e75133e031609b50652c53 SHA512 bf7f20d6306fc3bbac0ed1aadbf1b506b99dada9020f0fedf188cbb6d7b0a5f7234a3b6a251b23071e96cbe1a54d3797a350c81c485a46f71bb8a825d7c5c0ca
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.21.0-k3s1.mod 549 BLAKE2B 6fdd378735729ad4bc945b2eb3b911e7f568f21e125b69025409caa59094af9c0ebda3e916397064fced7d084e24baa6be034ea8e00e553036f46e25d58e92f1 SHA512 31202dcd64c4c14a05d2bbcd3b02ad5fbc3385cd2c743dbccfc5fdb142085ad3da7a0c956a06c40e9986a010a7495547934f8d8ee2f28853ad0533e433413cc8
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.21.0-k3s1.zip 143017 BLAKE2B 5cdc72433b1fa2b80e8ee3d74d85eb2b8559ffe3ee8b57e388950de901d7824afc5baa41cbcd54a10575d395dfcc676026e32c56058835191e2b55b179195800 SHA512 3ffe1a693f1ca2e26cf8a25530086893019921318755c763905bf55063b9f236ee459376ce66d00e26f153678ba14a8a5318dc7f4a9d4da72da7fbfff6addc05
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.19.10-k3s1.mod 1800 BLAKE2B ff88cb957eae7cb3d018de22ea235f6c1873934ed1277e9d9e5c7d71a2123723508490be95976840c937072b9c242db1cce500e8bf5d6637312991dd862a3538 SHA512 548e88408c08f89b6d31fb9dce2f2c7e3ba9faec1ae9b2bfec6682e69884fb3eb04525e01d19d18696475c6990805c29ddeb31281bd5a80cb4340c759a05d295
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.19.10-k3s1.zip 893638 BLAKE2B bfafe70f1b4b0448f2ad8c2a94bf5c1cd2c2671ac7cd78b8ca2d906a3f456249f0d347ae1a8f4fbb141ccb2f4a93c2f5286352faded1cd1ba0bbfe46a8a959c5 SHA512 57d5c0d23068e0c9aa70c3e2fd848cde10faa41a425e0312d4b6acbe89b6651b5b7152e703c6a43775b76aee7c165bf498af61d11ce7322f725217ff2e67bade
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.20.6-k3s1.mod 1854 BLAKE2B 07671b7d28a82b56c7eac824972694eb144a30946f9e89ae87bb63a8db918bc8ecd6063e67927882f1409dfe0b500fc0fe604d02009f81d29d114aec25d6f456 SHA512 2df73115b0abe12af11458c5d096b97d67b010873b7990ab5b6e09bab406a38d1dd697e78e799bba178b5a03216c19d43316a4fe5bba17e614a9a41cbf1864a1
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.20.6-k3s1.zip 931746 BLAKE2B 31a3970be97fb70c774caa07e17a03a450414fa8d5e5382316f54f60c79c634e4a56b1f10da527b2e8adf42fe1d4a4817b1fd8a6421707a1c0e911d9e63090e0 SHA512 44aacd7052d6b3115a6b68ffad8356dd81a3be8751c6897222277c1c446c286a69bea8d0b7878e4eef52bea0ab0fb7ee3956de9e766f5932e4d8bd422311822a
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.21.0-k3s1.mod 1900 BLAKE2B b22024e3ca3df6f14c005b57a640ccfd10e903a5913d1252fcc209166306ff755ca28c2509b1aa89d207807d48556bbf122a83e737cca603220e5a82bea1b219 SHA512 f3e13a01f36841328c78cbc7b1d75bcab94ff3771dc13da7ecbc99df356ca96c9079568bbe9d5a1bfa2b05770bcc68fc15171eecf856efc447b4b763975f748c
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.21.0-k3s1.zip 899118 BLAKE2B 63dabb7520144d8670bceee918d10c36458e903e2517336c753a147fee35456e22463f26cc2c1b2847eb0443a504fc41b7ddeac6dec5274b8347dd69f135e4e3 SHA512 441f3692c2557a246d3d1c53459cbda060ec23fb46ce037f6522c547d2f0af09e4211ee4ed5a98f22517cbf72bf4733192af4b67039f01fac72273615a78f590
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.19.10-k3s1.mod 450 BLAKE2B c4c6ab281774ca2354e82ac30365a8dc8ca99ad519105fdcf0176495a5d2d9a0f75de2c9ce7b792cd8903791a166d4959ec3ef9bc9316b66a75451b2f7307c3d SHA512 00a9f122960f023bb6083b48e38e5e8320934db6493d515f597a212c2a9632327b307131a9866e35e61e15985f91a4b280c819be7c30aeebafcfdfff11cc69ae
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.19.10-k3s1.zip 216457 BLAKE2B 29f6b4b17ed9c3ea296e864908c012c8b07a844ae390e8d093e561fd1603e4dde143205764c91dffc2c39309ff974408b2844849576bd04b17320047495dcc78 SHA512 8e79418c28a7907468826fea308ad5385873dba823a2cd1a608af3ee6e2f07949e31312ed94ddf4a6cb107b59b7afe7b206b179444677ef74edf394ec0b829e8
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.20.6-k3s1.mod 450 BLAKE2B 5cd264f73c4565d5a35f66921484a7e3eb3ea5064c2cc5a2e52e52dc3d4458dbafcf1ef53a5a957314de439dd9512d78fa4b4776b7d29396d44debb2025dfaf9 SHA512 b7e164e1f56dcd136500123e80a7f94aa41e7f7bc84ee5ed8493e84b20d201c9bbc007e8f3d2a7ff7a3efbd841cb5f419835552de9bb8313538964d00be8780c
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.20.6-k3s1.zip 218040 BLAKE2B 2303e81ef2056f25113e84322e90132c1c1d5bc817b236fa82c37dd537ae7b780625172e9b3e6e57d57e0da15a86e39f16aa5fc2e8def9af1935ed4c12e03a43 SHA512 24a661e64cd02aaf6cbe687d60439bd8b3defb99f645b90014210ac3bff9d9e18e277a9f48ba902306c87dc4d016fba0291c95d6b244a4890fb12eb5a6cc2ac4
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.21.0-k3s1.mod 450 BLAKE2B 85049bc6640f2771f6cddd47c8e092a7956fdb1e254f1a53c6f2f05942aa6e248b3335cb2f4b9f7ddc68286ae71334ab2f57c69fe4e83cfaf3462837b8bf07e3 SHA512 46b26bb2359cd018748a4f974fedc376758735c9661b60bc4f5338a077e193cf7ad01842b92db0ffab2559d700251839f794bb3f1082443ff24e12e511a7148a
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.21.0-k3s1.zip 195334 BLAKE2B 3602b71b7fcd545b6d7e7fb05e8b8c7585c3b0b8db1fb6af9cf33d35efb3ff01be16befef6b8a7bcdbca5b21068024dbd31cd64fa08b0e8b9943b963390ba699 SHA512 2e23ce3a032113510f6e172cf9dc1d1e5b1cc00e48a5a5ee247d25fe224697b132c3c2d89b61624042ad070131f04e55a340a89bf5dab397aa9171b260ca57b9
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.20.6-k3s1.mod 361 BLAKE2B 6c5fdaf96383c5b8aee1fa81709174b5596abdae6b8935f51bd8a1672fe0950fca8f1b3225f157ddc7c31bb82dc6d422b5e58bdcf2d348c4cc0d24c5c85a9956 SHA512 5f1bf6bba66fb329798705fb15a5b204785f2a0c70fa601d50696d6d6342afcb23f0a2cd454a5242e069a31038b87722526b43caf0869ed0f96f24809c38f6d1
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.20.6-k3s1.zip 52547 BLAKE2B 38ebf76d808f6653e35fce6fb4d40a944674813e9ab748cc5965df5e6bf280a8bf20f5fa54ecd7d0cc73b2964f162331ebbe13631a4814131b00610e9b783bf7 SHA512 394f22795df8369c6a09e46067faa62d06c94e8c43f2fd1c672fe8b9db9d4533c5f689eb09d89a3282fae1087cb7ad8b06068a0306475e0ae44d80cc3e34adee
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.21.0-k3s1.mod 434 BLAKE2B 8697e372cc9019f1cd08171d892b3a09faec2ab120c2437c12b5e5e5a8cd8c933ee7b60becb8e9aeec17e8dcb19a726dbf3461256ae4c1f04fa767017f387725 SHA512 6a46c7fc62eb5bb4b9c32eea029ab91f80a61000a5d31c4923463151d06b9779b02528f6594a775192f656df084d63dc40c6731a89f56bc7491fca8b6b68edb0
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.21.0-k3s1.zip 54891 BLAKE2B 2d6b9b51e90ca1388c147b8046998e8fb1001a0a1190ea330929433f6a70fbfd49ef85790df678071ab515e8228ff2bfa2074e871fac3fdcb105b2aefad43393 SHA512 af522529a3c729e3c3f2eab247e78e33f38bc008ae75884855d746cb970f611033bd7f2fdc12897bda141b81f0e63da31c27d7bd1e769fc9357f98080267c783
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv1.19.10-k3s1.mod 701 BLAKE2B 7454a3a3c5d7c5238c648f7c4c5d85876dc9db9145fd97f1b8f105b86376486e74463caf8948c1e2e67f78edcb2a22a280f08b90d5b1a6bae561e70adaff7897 SHA512 e401b6a5087e3873fd62f13dc3601134c644e7b83bed7d7ec2e4882627a1676d707d0dd5e5e10775d0c343f54e9aabda280489d96cb829c12153ca0f5f99054c
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv1.20.6-k3s1.mod 701 BLAKE2B 744ff5c672dd1795658a0bb91d06a50208a8d5e237e831e7bffa81564d4360627c1d9a3682b3f5d1af4ecfa47a44ff5e5f2eceb56b17da87530a1a7752972ea0 SHA512 86fd9822e775576cb7d9f7a98005badefe1de2a0560b7ef48134d2eaeafda1eaeb12194da03a33e2c3bc85ce2e5601998c016b5e3d2023cb0f33e805d91bef8e
-DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv1.21.0-k3s1.mod 701 BLAKE2B 71304e81b1ae3f2b25bd1e5fb3d411b4f18da9d3dcd8d9d32e29badac09af63c8d5a5c9f96cf4331fcbfa50462e7e1a31f3964172083bb2e38c627d4c209f74b SHA512 5022366b2962f47b47634cb75fc413636a7cde9650b78f92fe4fcceab62d5239a0c8e2de00282cb8b4ae2feff2f678aa136a7c8dbaea01a323c70ffef6d46d85
+DIST github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.10.5.mod 399 BLAKE2B b50676e9cd6a607c17ecbb43b91c672686471394e408ad4a46027d9aeb746c2355da8f26c6eab95354608e537aa0bf1cea989eaceb6dda0afe9ab0173b0fc5f9 SHA512 0de2e99961788f084f68ca834e0f6c27e8a2bd0de344572c6dbd99c9ec43e35d560d0d4af31791e842688eec5c443f779a2d7c7762019f22b60e07059539a3c8
+DIST github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.10.5.zip 99268 BLAKE2B 986ec2feb07f879d07e62d84064731697209507f5c8c5d8574027296b1dac1101846e47ff7dc34d0f412867024bede69a2d3ce2cd4e851093fb03ad6f0bc67b4 SHA512 70cb962b0cad198f715171207aec58be9e3bd878cd7cbc5328ac1d6a0c5f654f585c74debbcfdc4572fa49956881a814ac46a5b7199fdeb751ae53fefa847c19
+DIST github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.11.5.mod 420 BLAKE2B eaa6253a899eb116e4a0b119b8cbdcfa28c1b238474eeba2a96c9492ea7bdc25f459f6f119f493253cf0f870b5203ff5e345c4f6af84a0c80c8a01f66e96188f SHA512 16641d281d6b4c91153da50ff889e6c4debc6396765d05e2800184b37c2ee5cd3b2ae6d60dba702053d32ef67638763a463969f8695c11bc9724b08e8177ff0c
+DIST github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.11.5.zip 98735 BLAKE2B 7221d101f492e6431befaab9d5d3d5559f4ecd603cf46ae97f6f182ef3db893fd103a4333e5cc3a4b20723afeb6852af76f52e6f4b20bac8fd244c5cf327148a SHA512 c0f3cc7e1bf9d2693441ae89186b7f1e89bb2bd853532b4d3c34e64dd7259efa22455dc8711a5c00e083458216214b5012f56ad778c5a5678f487262b9bc85ca
+DIST github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.6.2.mod 441 BLAKE2B ca0711237c8fbc5ea9f5802e9b9e550b635f6af7fe7b156a02d5d3b2c8090b212da348dcd9abb334f4fc8799ef188fe6f339adeda9347780d112e78919e350f6 SHA512 c7da40b5f5def57c2c6235c96f65c8230f2659a16632903e4fd6203c04f47e1572caf8d7955b36f3f760c1dc56ff3ab232420f93bbc71aaa5e6e09e8fd9877d0
+DIST github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.6.2.zip 74852 BLAKE2B d1035eabae7eaf50c985402e58791e0df4766a5f6c0c9bc686c50ad11d0c4bba771ca37fba3fefc32e2bda421a8a5fa9fa34cc657cd8fec65dde7a0010184094 SHA512 446c4bc8a683728cc4e598fac4ced04c7bb53471da0ebe9324ddbc3d469730194cec71b9d7ac6f4f75cfbc027abba7080f5060246e0a6e6265c20125abfdc280
+DIST github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.8.0.mod 612 BLAKE2B 2acadb99fe002674625c95fd67aa8f517a85450277a06fbd6ea56e19c87742ec06d199385e39dc0d394d25d1211dc1d1cd58574ee473067ab711b8d0679ede43 SHA512 83d3f36275bfd8fe9c35cd3121c895118fe0aa25c2316880b6f76b357c147dd130d497971f4fd0a18d1c73a8612a93827b3d83f2e2f0ac746d3237bf73e3ae99
+DIST github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.8.0.zip 97149 BLAKE2B 1f888c888124ac895515c9f94f5b945119b190b4fdd269851c836ae0710914bc436375a72805fb68def61fd9d45195595f23b3920a06eac1f2956074687ca2c3 SHA512 bd34de795321937f18a8ebd536413cf8d319b91802f4c1086009b24baa1c7c351826ecde9ad6a7418cf0357df7a694a736b6a395f765492ebaa2478520960b27
+DIST github.com%2Fk3s-io%2Fklog%2F@v%2Fv1.0.0-k3s1.mod 68 BLAKE2B f745a62a974a42d1692705de032c8c651477ec71f32b0515adc02360e5a3de6c7d65f5d97960e78da06e99b0843c312a09701c08c6a5c112af832e3cd2e43649 SHA512 cfee3f10c26fafe7cbc510ff8cba479dfacedf1d95b4e25b75978656862067524b4b9f5e889455f2d74eacf07df7895fe266415a05b9502a759baf2e4bd3884a
+DIST github.com%2Fk3s-io%2Fklog%2F@v%2Fv1.0.0-k3s1.zip 40575 BLAKE2B 529f864977e03d54100d41008d917146da5ea6bb3d7728ef32e0cf25f89c7ea72b049ad020ca298b7a39c636ecb11bcee72934ffdb973b30db6ad9dddf29650f SHA512 ad330f9477277944b477fb713f72b052f86fae2047ad1b6ff3936571468b3245ffcf1f05c01525b1af20e884e3c48881a9448fc57908269840133e73442007e2
+DIST github.com%2Fk3s-io%2Fklog%2Fv2%2F@v%2Fv2.9.0-k3s1.mod 71 BLAKE2B d211519da5641fd9e80f36d55ec4a81d4d943cc263d5ab664706ca4bfa843632ae15eaaaa19c4e0abcc4d67810e7736eaeff20c4a8bbc17a68c3b5211dd11dab SHA512 787d0191620cec13e492773d16600ec5ff90fb4d4253590010c02b473cacc62b547544f6c90502d9f1e53fe9f31dbc65cdfbd3bd2412628c44f37074505fff60
+DIST github.com%2Fk3s-io%2Fklog%2Fv2%2F@v%2Fv2.9.0-k3s1.zip 53587 BLAKE2B bc46568cecf33a44e4f353d2d8bd6c8b979f1fcc20b915cb02ac5c531eac28eef946485b858d691089f9afda8194f3c86fa9b56c1fa770b43dd4957de42177f8 SHA512 14cf4cb55a979b60c9291e3cd6521d2bf7ad05e0b222e4aff7158f8e2d47f80aeebb39acaf47ce2877bf53ff3efaea480e294640c8b2674e0f62e1e16f46e703
+DIST github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.19.15-k3s1.mod 33426 BLAKE2B 55d644c13f839ad6d73c2dc53b9f1c01c0dc23e2440a9ec0bcfbf1bb531829e93226152419f424901f916ad76c104b815e55f6f636d9ec8e15692fcb29e246d6 SHA512 013edd140220fe5bb8b2ab4cc9d6276d60eb7813f9d698cec1c6c29864c5d4c7cf17830fd945cb99ab5bdda4885bf6614d3a64b2bc452c5b948583a9f964da8d
+DIST github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.19.15-k3s1.zip 14192028 BLAKE2B 89a91378ca64f9dc7bb52716ca30ccae7cf50c4cf2fceeb3ea7d5acd34d0dd17325e81ce48a929796cfc92b470c18edd054ef95a22035b6419823d6feb72a591 SHA512 8e478583025f3b749079831cdf493b56e499bd7090d9b78c42a48559d6b19c5d9e58409a795ed01271069bbf710a0e2559570d0439b264af7cc36c381af288df
+DIST github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.20.11-k3s1.mod 35783 BLAKE2B 1f4f259d0887331b66054cc18b0f2ea6571c5704e4c3c5a8859336390dc709dd8dbb99f2e2dc5f289bf9fa77b45c55cef29d58308be8ca0d1c1b662adef50bb9 SHA512 0aa2190f271cdec06cb8b33b5c995dcd86ed4f839627284513cfb8e7facc5a7cbaaf3848335a88bccd5d72de5577286f123395d8e98af344950121d8a9a141b2
+DIST github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.20.11-k3s1.zip 14251256 BLAKE2B 3a8406c523266bee029c1b3e8a55e9cd6e7e01fba0980e61154abd69b3c66b8edc13623e33a5f2f1245ce0d7a9a48adaf850baad74b436e499214b45381bc014 SHA512 60a04617538f14030161e079b93fd7fbf2c740c509bb181491252e9b9d50ce1eaa8b1d412c3b5ba3e8531efe1695e2a71d5fdc453623c10ecd02f2211f35fdc1
+DIST github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.21.5-k3s1.mod 35948 BLAKE2B ed55cd51104be829362401f69bf972abadae46ae3b415b2932a821f8d72bf35e9b58c86e6fc2ce57dc36a0d14a2b10800d150dc6807902c54a58196f97fdf46a SHA512 82a784eeb2a33a098937a554561b70992ee30b96e33024f8c7a0ddd0e21a3ae97102fa1f9a737a5c03b1b8191298e68268f2f898095f2af7c68e4a586b6919d2
+DIST github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.21.5-k3s1.zip 13899745 BLAKE2B 9a74e64b913910ae393cb7ff5fdf9a276dae16785cde46a2f4910570de202d7159ec5701522c762bbf622a37d83810bf1584d328541a5aa2b37c8534ce7b67e2 SHA512 aabf82662379a61f3c7aefd2e0898a75776a0dff9b37a61a4768b1280c11393b9103767b7d551bfe9a3e358fb95a163f96f54b14d199f25614ad5d1c1a10dcef
+DIST github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.22.2-k3s1.mod 35180 BLAKE2B d0d4a0907a7d8106b719e5f4486943fef6dae5424f50515556369a86c4ed125b0e47a60a8c511fe433aaa49a0a00ef055044555dc965727132d492deb8b09a75 SHA512 b0b07f7febb3283136e4601687382d19bfaf04fb69295ead44a70f6d52736ccb2d46360fe653eed74efc996134df0127566c70eace2cb398bd698930f2573e48
+DIST github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.22.2-k3s1.zip 13661151 BLAKE2B e40f0e5fa9b0d710417a1ff1f76e681ba2d0608ed6e55e880d99ca644ca44cae655947dd4f2beff30c6b54adc7e2ee72d9e4d0331a2925b2ff7f034cbb142e08 SHA512 5c4a931685008152e73c0b07194bd81442c8a8f877497d9bca40210dc269d5bd9063189f8d9924393f5cebe65d17e41a0a499e3e47c1f0529c58fc71761d3c16
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.19.15-k3s1.mod 264 BLAKE2B 05d68d8e51ffbc6a1886931dca9964a0a6533701314b86cd64b369c853750d9f39f94a9d11d8b7f0ecc4965e4d69e5b7f99e3763d7e6ddf52cdf68f8bf07ed69 SHA512 cda72c238773d56740d0de387e29925b975fe5770ebd0011bb34ea959ba11804070cfd444ea0647d15f0dffb59c59983681c21363fd013be2e80c74a56ea5428
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.19.15-k3s1.zip 4016140 BLAKE2B cc57060732c25cc46284c8eda4373157c36d964745deefa58258308cafe568caac02e72c3ff6f727b4790e45a724d70cdb6e0ce016f13616e07542a2129e6f6e SHA512 0eb9fbc79dbe30fc8296c40c350dc00e3239b2fd8d1d23bd60eb4dd09ba82b8ce7c9089bbad1b7449ea4bea9e036795a3f00a54820841991a10fe4e59ee4955c
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.20.11-k3s1.mod 264 BLAKE2B 88bbe6f39646085ef3067a661a3ca3372a15b7e14586ab0225f05807e0fb9298721ce36dc61427557c1972e2e492a5276eda85d44e5a656d68885be44015280a SHA512 0d90f9ef7a28404bf4b3c5fec0865ae34cc6f36fa4f5c638e200a14a53bfa65a5f9642b8f68c24a4b5933ffba98605a2ad1ed1d6e3d06438d88789cfb73a8876
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.20.11-k3s1.zip 4054123 BLAKE2B 933efdd2ec45adba4f5b987dc227a32e633f0752ff00ede0238407e2f829f448363ffc794af5646646794bc8b162d6c8f2721342cd98eba23424cc949bdebf4a SHA512 c1239ae8b348448e57c93a4cee8edb788ef8737bc00501c929b84c77a31e6a215dca98913fce0b933a61d46d5f33782c9be3a19c04a6316987fb3a079d2145a9
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.21.5-k3s1.mod 264 BLAKE2B c65ae8b5d9e6bb25b4013cc05cf397404675a48d26dd89b09f61bce0de158c6293c3931f3862f58b505b7efabdd1d5ca7364481e631b21857db46ebd8ed7a824 SHA512 262b36fcd2e62f41e62fbd540372bcd3845a3bc431e207df271b3f0c222585b718075cafc8e03edff67fa479a95c94e3cbfb046aeb4757c272aecb8b35bdf6d0
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.21.5-k3s1.zip 5003472 BLAKE2B 4ccda38c84b23563661ee475441831b418b15fb6b9af77599c50854b7a73793701da95820679ff0b18a1e80ddef3e33cdb6621f776664b6b6caf7e589b1d1d98 SHA512 9e7f068e51d1f03bb534b59e60b41e921f1202f34f80a0ad893d112dad0027af682dbf21e96b37226a1fc3acaec9488372fd17e543c340f879bda9afa3810a6f
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.22.2-k3s1.mod 264 BLAKE2B a442900b5975e556925f7eeff5b3bbdab951d604daee2c8f18315d1bcbd1391d9d6c10b597b1c8adac53cab815cb186cee168b69ebe045a0a354780b91de7c7c SHA512 36ee09564234ec84d4044e6f0c0b3fc0a59bf560cb1fe583e8117fca35cc8f1f0b6e0d64f442653a7093f07ced5226ff3840c9d4fb215c6a465c7f33e5272ea8
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.22.2-k3s1.zip 5002536 BLAKE2B 3b0f3fe87dfbfb8db356283f2abdd31f542cbd9f3a368fb973af01c193eff48f726c4e4b798d0db9678f7ee3b04709fcc7cf5967cbf14e61940e44cb43c5d0c9 SHA512 e3940472eb6c7295c6bdf60555efad5293b5d22b17f7032c78f1cfccc6ba328203bab148e5352a25e4735f84fbe6772e26301aaab4203c998a2310c8e6aacc35
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.19.15-k3s1.mod 1304 BLAKE2B e0c2bd735ef61b27ba30194c1cade4ab6c2691be1e499d5913df2a245090fe23df1f42fede101ee344fd2919f48fc445f8145ea833cbcf9a410338dffe902ca8 SHA512 3c33a4137ca3e7f11db091c595a42a90fee1174d2b5a72f1551a4785fb91161af597570820afaa9b960475b826d8fe6116b5e6440ae4321c492198f18e48b4de
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.19.15-k3s1.zip 697705 BLAKE2B ef30a8b86a339f9e5e69a5c6c619f502ba471f8084547b65351c6f4f2f9ea04c3e19dcd02335a3c5bc6ccea426e158e432d40c6d2e18ff3591c9959683a5cdf4 SHA512 26797868ed55a93b9a3b80268ac23153943b7b23c8ff72153ffeca74a41b4880bebb2576476b578940a8994174a148c59aa1db2f95100b51799317c02d002110
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.20.11-k3s1.mod 1188 BLAKE2B c9c638e6e05e02c7978da6de945019a24dce6305a65eb9e99e9b32a99750a29276e3dd7b5c607708150e91144f738407464ffb58f6d6c2706fcc9f9c3b245d16 SHA512 5cca9765334ada87883528900224777a957132236a926245a325238d39b3129bb0480798c7d85abfcb99c80f83e90a8d148755d634cb622000432f544065624b
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.20.11-k3s1.zip 709933 BLAKE2B 927fb484cf9866796e46d9d2a8f554ea454517cbb00db4b11a3a20ca072e55340811f0756d7787762857d02f5cac94b49f4a0ecec0604bdedf23429c466d8817 SHA512 ca6e5c1dc4cd5e3b08f3f3423402a9e4e2781151c92788e796f3729a6d3c95f5fca271479dda40dcf04ab2d5623967675f23fde1f3e30d38615c853ce6944704
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.21.5-k3s1.mod 1233 BLAKE2B c3a783be17c50163b97170cf70ec9e2c23ce993a3dec6687482a4ff17f9a76038fbd546cf56f36982f87ed50d26e96111313a6fabf237f7ac6be93ca90b14bb2 SHA512 b95fc4501a4ef43e8f6d55685d6e8243de87e06e343812e0faaef21663caf84ae85d4aefc4000d7d6dd90b8b36d3c40c0ff2a5e2541c18680df1a8aa3a0227f0
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.21.5-k3s1.zip 663398 BLAKE2B f4a65691e45598a3981a1dbbd59d39b9e86b613d19587f176f57513d086edf4e13e311b4e6f405ef5c67f71563ddc191bc4c5b426794aeadda3963c6f67e8f3b SHA512 19a55d74702f8d99800f0d5debb9449d2162c21321890d7f9a6d5a6c8b568ba1138b3870f5a976121f92f99edb1cde9739577b25100698c5230e8ec36df4d567
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.22.2-k3s1.mod 1207 BLAKE2B 868792d6b3e2e4ffba3929a9f019dc05483ca9b21ff061fe9629deb01329f77a582a31c07180c3c52c11e142c36121466657d35d87be6ad18297b5566bf135ed SHA512 1f64062a57174928e79868af3bf528ed6cfd5114148f8fe7213cb2bc7ddf7b998321110cb3bee70331cd6db3838ee2bab1a2810a821740fb68210f205ec99f88
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.22.2-k3s1.zip 665761 BLAKE2B 208c53800c91d0962cfe828d9b22ccfb77712ab56f02254612167519386a95ccfde0229297d6c6c0d4ad2fd17540df1d3e9fcbb9b0917446cefd37929ffe3265 SHA512 37444359c33b5506de4490b1c5876eb3c9b68b093250cedd08d5c28a785c41c3b4dcbcf64ac810c4bb7253f4c302ee6a7c40f49bfbbc55f2e3398bbbb4650db5
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.19.15-k3s1.mod 1418 BLAKE2B 0792d9b5ebc77376586813157983894c82d820c92f912d94c81e881308697a829d399787dc1bd3df7df421ad6722d4174edb01e5bd372685b84643c15d9aa2c8 SHA512 88c483440ced84dbd82219a2eac55921c49519c6712ac28f19c599e902fd9bb9778159a016cde6dd4a719db24a3c0ce2c763a6c856c1dcaae7dc044e9e0e02e1
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.19.15-k3s1.zip 889956 BLAKE2B 552ae619927b83b12367e7ef1589ce3458f7c2c9c69a4122fbca1b851830af45bb01610acf0ba9087cd6df18d3c05836ab04f7f4c96d426439290668f940a8c7 SHA512 adddf4d974aa0f41dd61fd34e52d0271db1527b5128b012378ce0bfc58a0205a30a9775aa1077bb2df357a70f28cc3c96c7ac57174dffaabab1675031260bb36
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.20.11-k3s1.mod 1456 BLAKE2B 73d65f9c774c6201a6e055c1da74fdc41fb8c0a9a0b045b00ab8b71e2d1f0ce7f334da0f1cce258784762b4abbea483d7dcd21b477de512dfd20f029b23d0b02 SHA512 fcff83de1c697c69bbd5a154a7816688362b1abc11daf88244af0e69f9a16531d0bebb95714ef8736a3823cdc3446126f06de394f3336c86fc91fdec250463c3
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.20.11-k3s1.zip 891210 BLAKE2B be0dbb710bd5f26660d18ed5972956d74a4f178c5543ed94b0af8fa0fe66e66331de29527a5b2d41dbbf86d04584806d95e02119081ef698ccc83f4d3ad2f53a SHA512 79b169a8901aa85c67bde98cf4d7d8fdda59e9fbf560a85a728d22c5c6d2553306d92bb8a99521e800ee9ad4222d14e6f70658585f4e01993fcc92529d577580
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.21.5-k3s1.mod 1557 BLAKE2B 8795319237bbeb2d351e0e414c3f3651d16cc79453a504991d32d93d0be97d58cbaf2ce5db8b8c02560a8cd42e9c965697dcc132e5ddadd98242bb74636d7641 SHA512 edd2a92ad68efededadefadf44d1fa4ff4fe84458a8c87594e20a6f878218eb9e294c3fcbc2832763dfc6b295fde9a8dbec2672e6e773ef0bdb3d96b8343a851
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.21.5-k3s1.zip 841754 BLAKE2B 22e479aeaf7ddb7b6cef6bc5e16d35748195e8128aa20c9023fe13aaff8cc8b1d4607301bea9ed4bf70f6354d715c8bce43bf72ae0d57bdd92747262e94dbf7d SHA512 df0f2e4d656480bc8c9920a1fec06c044b818a82a7a3f2467504a20ef5d48bfe44f0883838a47caf86c14539f5bc542db734b6a220949345e19cdbb8d9533bb8
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.22.2-k3s1.mod 1401 BLAKE2B a0fea5ad71ca4b8f92db7a6755230feb2c5643a6d842cc42009b6423b324904f078f202b9e53b1c92d544c04efa84d97397a5c234a1160c6e123c1a2789d289f SHA512 b54efd223dd01c30f1bde38f946cb81a4872c9d55c6cbcb07ea9a9abb2b4015628559a5a7e8de7969e92b6797ced2e17f97f0c51698e6b48f7aa1589a15c6ea0
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.22.2-k3s1.zip 851307 BLAKE2B 3d2bacc36561b81a55804cf6d87ffa1211059e1f073677ff62716b17887eb5311cae719d091fa86a43abcbb6e7c7c4ad9914c51c98fcb2cc14db0da96836ab86 SHA512 58f4fc2c47a162fd93a479f6fffd8dca29dd1134c724ed4a43013e9ef766ac6382b2d5003a259b2e1ea9d2b34bf61a6d94a699dabbde23b1adf6c95e5bab71bd
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.19.15-k3s1.mod 2305 BLAKE2B 861d126a6c1bc99c544cdb4db97b9ca3e65d6fe46ff33cf48498d289e2014d78cbc44f000078dcd499c6ed707fb67faf60f6eb1df82f5a2c61bd86d8716b7dc8 SHA512 ad1442e294d7acbec8fa255feed1daeca0777cf3971c05f7745840687c289767fa30376d886b66aa88acb6d05bacd3ed6a132864e6159d3911817617fb971ef7
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.19.15-k3s1.zip 1775538 BLAKE2B 56f7e4541840fc6255279f205714efa9e34c3ed1b97c5b51d35af7c45b29286b268e72af41a11e2fd1f737812f2dfd65cb69226d222ccc78dce8eb485afd1d1d SHA512 c5156790006a65eae5199bbf89c8fd5869e9cfb4744356a77d9965a9180de78b3cc941e2a23c020c76cb543b56236f2b578898393195177dae2fdf633fabe6ee
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.20.11-k3s1.mod 2323 BLAKE2B 6338b010abe34ead3595a8dae45569f146862e4217eb07cdb6ee9f634b5c1b8a71d0f526ddc40c12a1f49ad299ab2a937826ace120488ddd6de890634c483eab SHA512 147ccd0cb86a8aef35abc5c6dbb186c4a36d0647cbe15f1ddeb2bc12d0e3b0dae1c54fdc5c16873aa6c6d6f5a094f65e07e271781ecb535722719c66fc6900da
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.20.11-k3s1.zip 1861884 BLAKE2B 83cdaa3919e73affe165b3a46cc6b99c1c31576139f81591b909ecba082d610f418f4be2a0bf84d4277fda3152cc51ff84f3979f062171026af460a4df41bdc4 SHA512 6e6f850d1902aa2891f64a8b53a77f1b0e9710a5c107e28aa475660d40caaa8b1dc2a2938748657b3d78a93f697107f8a66e353fff2777a32811beff49cac533
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.21.5-k3s1.mod 2372 BLAKE2B 499042428949994d5561562adfae0601b80e940aa44a74bbbc817fd68da0546970f849eb24c3b67972e4ed9acb868ce7efbfc6466392742725bb6a3eb1900930 SHA512 e498a6b40b08f964fc4d242446755d79d7c41d3ab50bc5c1c536f62a34c40668f888ab829c89c41b0ba29f300339738872fe3f7e1d089714e3c2b36f0de75418
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.21.5-k3s1.zip 1770835 BLAKE2B 21ebdac033d5e30f01824f899099d38d3df56184c6dc7a8485769191c412891e04affd9caa7bd8a64a1ae37d90c8975762ee6742256750e5f371850ccc50a9e3 SHA512 6b6a4be82a5ed9b246a9cb00f6a3b44753bc1583d9f1748adbefa021fc916291257515e93a330b9452ed4092de93f0833b5f1ef8f97f648c1b71dd2beb9336cb
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.22.2-k3s1.mod 2373 BLAKE2B e1adf7d7ffe15c5a181bf1b8787cddcbddf29961f36f29e0489e65782f71a73cb19769cb01e1a71da353d255af4ba525f130fd0cc39c80b5983a00abdc68769b SHA512 ae04115df514a863612f4b91eb87dd982875df1c9469c32dc50448efe67cd79dcbf6ae11efe05d6e59d242f2364cf78f12397137a36b5a7474dd30a3d1f029b8
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.22.2-k3s1.zip 1859200 BLAKE2B d1e631a08139c9cfa5b1c8e8333a6d5eca0830d9072b6d749429496a75095f0700473b57188f3f01d2c8fdc42eabeb003d186aaa0208de38401b65ef8dbc6d52 SHA512 fa15d1d5efa6e47e5d8745c56d50aa51c667145b92fc3dbce59eb7b101f482561d045cb8ddf5d78048cbe061285848ebb8e85f09d6c0c56fcc60a39f8d3e0566
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.19.15-k3s1.mod 1027 BLAKE2B e90d92e335517f6771632e42a7162c7efeecdad1b4e8781ce9cdaac241d24dcb83bf97723d8aa097462d90a71b1c1db28c034b91792b6417fb354d0b119a9719 SHA512 bb33066633ae685f2223af031e1b0d9f85b0ab60b8df715229327d838aab86e081c056aae169bfc3ba2aab6d947473d01c54ceb5e8f3f5cf498c79c53cbcd392
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.19.15-k3s1.zip 490596 BLAKE2B 3140d61a3e4e3802f452fb9508d0ec5ce111ae162fb964498aa92fb853145df868992cc11a0497cd6cd05ca05581998f2d3ce83ae2c4728547232d8226655dd5 SHA512 f89772bc25cf3d36e91aa943dd82b4ec7cbfbe0e23fe5a52d26e58e48db2fba03a144608b7aff4ab08f92375fc494754365979e23a50cf7440f3bc3e2f63ecbd
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.20.11-k3s1.mod 922 BLAKE2B 4a00092791a3b9aacea55ca4648d67182bdcbbd3f1d7ac2bdebf0ecf43bc2a526d1976cd87b7c63746b9fc102571d813120a78a64a75ebb2fa99531a42017021 SHA512 c72d27d3978939b79d736c33c31dafb4cba6cf790ab7c780e8390dffcd1afbc2e24afa849a230c2427291ed2144dbb05750de0a0dbd231e55d7bd160812697f7
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.20.11-k3s1.zip 495872 BLAKE2B 9a20eb7027800b70228d2047e3d14263497f7b7f0d2f32ddac25b8be330c4604afe66200e33e4553f2339f49c0c7d5237c54dcb0e51d6c213025437c4dc32204 SHA512 e881dfc528b086b85c5ff77b85670d3e9a2c46d18df52691ee1df2064f14181f60d2ac84010b707f86748cc72e4c089d55d93882f6fbb889c1c61ba7e64eef2c
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.21.5-k3s1.mod 803 BLAKE2B bde8c96372c88ee4af99db205ad6f28ffd58e677c623c0d8e7199cb9592451d0ab81861f032841c86f89f28b51990a4a8a9f461e322f77e19a62e240baeee03a SHA512 0e596c1dede4b33c01e804fc8d5e418ea63ac245949b08ca4d60b65b715a1a605557f468d1351b04581a66878f5d8bc0be219267b237301fc0f076b9798db9fa
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.21.5-k3s1.zip 464380 BLAKE2B 26110b77fe3a6b6f84d6b0426f21eb24db19861d2f0c4b73838a8f5a59e2c29a13bc9f38ba231ceb218fb04133f780b1c8ccc174e2ebb425622dac55bb231d85 SHA512 166e4f5d8936404cfd8342e7376fb650444305c0ea88a80f02f4883c04df2f127998cca0a15c50cefb68d1f9e42346a84853e711a476acabae7b55a3daabbdaa
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.22.2-k3s1.mod 1003 BLAKE2B ea97cb2df39c5db8dd54f2d4455ebc1c0b4c62719d917d1bbc776a6e46a08f15ec0284f93bf15c5b30835aa40b513fb5d63a7ca719f14aac8e3e9a86cce62a99 SHA512 83fd7da899268f98e21a8c7fb9993609583d939f163940a5236c5fe0f82c0f27fadf5bdc59c9afd0b99bb23be99e3838d2477c80bc68ceab44208d3d79eb40d0
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.22.2-k3s1.zip 466171 BLAKE2B 5f72b9f8a5eef9fa54755419655def7b530e7ee57542ea7170e0d41cabf32bf408718cec9445f76042bc5b8465314a6d6474e42cc621d1f24ac11f39c4227970 SHA512 005fd60375a5e03fcd05526eb2b3d82bd24577402bf708487a371cebef9636a4014c610612645ae3da483de243be725a3772572d3f984b6988d2272bde3efffe
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.19.15-k3s1.mod 1280 BLAKE2B 7705cd6b242012853f6ce768998a8c0a259850a1703ab00c2896bb1de06eb3d6f958cc38b33355f01cd5833b0438a6858d7ecc8da6966951739642b33dc18207 SHA512 ea5ebcda0fab14252a586ae093d0c3074e5e2dba6c4673341b0078fe195da9d0aad9a153a0db64731062d69fbcf176aedd6de96e2948b8a4b32c51f368f91831
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.19.15-k3s1.zip 2567679 BLAKE2B 5b02f5a9a13e9dfc890a0914144cb18f57068379d317401cd93bc50d6d7b015aff049b708f0dfcac5e29e9abc11802572b197e1e4c73f35e2a75644794b76229 SHA512 f442afdfcc83350e311e56024047caffda4edd81f2ee3c1e6db32dc2340ce66aea29a416fa4621b4f8249083fab55d21b032a5cc1e9a8a2f4b4305d93802a04a
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.20.11-k3s1.mod 1281 BLAKE2B 899772bb3da4961f9830a09d65d2e052609fcc9458a814aa7391c5d53d39e41af30a9e3c0637df4ec1a8bb02b79df68907e97bede5dafe35e46de3c5aebf291b SHA512 3b97c77193d311c2964eb1baf0ce54a06a129b592cfbcf1c28fea11f3216c76bf24812f311fce4b6f22e8c0f669b6426963724390f98c6b2f47c8570e2a2d3d2
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.20.11-k3s1.zip 2004965 BLAKE2B 38cc85c78fc49162dd87adbcd9c7a57b155301f9c776170c6af61150d1ae41d246c58d967dd24fa252dd59d62c8a38e71891734b5b3abf7310466060d7d1a803 SHA512 482a368f5ca7cfc991da0afc0afb55052f2b049ee2f9e4a6b40e91cef9c8625d57e680a20de92397f871ed406e5cb2a0c32edde37846919c95962d996a019e1e
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.21.5-k3s1.mod 1393 BLAKE2B d53230e1ee9c90f8defe41643a260f83e3ec783da2258aff106276889aba82d2743214da1a1a65aa52a925275677c4cfe4165280911f75e2122c5cb4b0e8c25b SHA512 a764a1a46a4f7940a05bf786fabb8fc64dd53669195889ca40f6fc896a05efcfe9d5864f12d9d202a69964fd1161bad9c634609c89076ec4d92cd0be9dac3465
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.21.5-k3s1.zip 2740595 BLAKE2B e96fc500d01be80a68336b41c70c1c2b25c2181584cac01014149867b2a8ce5d0ef31fbb29aba295fcda5c9a40471495015b1be07ad3956983672b5573aaa207 SHA512 1fedc34658d7f8a1a42a56e5a203d464d5a63ba124e9c91fc6e43f757d68ea729c443a040dc4c8294d6538159ac6df2f39648aa821b6a88c3f5c03234b924762
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.22.2-k3s1.mod 1540 BLAKE2B ffb4a2a2553be11f5b1090724492665893e73506e997a68b02385f9a872d7c6f0f477faaa0b24308903966db65edf0f022402e4ac8ea31a45fdc07e1df0b69db SHA512 b9367d6e2a8741f25cdad04408ed6f7a6dbf909f3c486a16e0814218daf37952d159c167867d29510d5d3b6b983b2cb77297c402d2f45a6605c1d53d40954823
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.22.2-k3s1.zip 2801682 BLAKE2B 1979d31244c1b8c4c38eff9c91d1df1135a5e7f9c03f12ad8217034b6f6844553a58682a2f5feb277af9a243efec7e590db109d6fad5429015f77418db144708 SHA512 39b0c4cd2111677ddb6fe648556d01d842be6e0ed96cca28a171ac195e722351f8fab5c23c65218916a942eba1e57fdb8421e32ab07a3602b674dba1e225cbdf
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.19.15-k3s1.mod 543 BLAKE2B 12d6312385c711e8041d196f208eab5ded365e576e2fa4efea39bc71b465541caca1cf6c7f27cc077a96793eb0ce1e2a9a6e2e75a3eab702277f2d6272fb5c67 SHA512 fd273a1758745136eba20ece5ca9886d2ace7a4b6e3970b86506311e680d7f3b34d58d719e8a164de1ff531a96b01d7da3865e5530ca776cb177b096b6320004
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.19.15-k3s1.zip 126591 BLAKE2B 3de6e1eb2204ca26ecd133d2f13577baa49d595757d7e32de9e218fdab9b2da77b4472220ac4ce7dceee043ed6d75fedeb95361c257cb371aaeef76f85472cb1 SHA512 ccdaf7ad5b894a347209c1aed2e34743c9a7821d95dcfe4979916dd77da75a62ba46836d88f26f78953e43168bb9177217d510e23f0eee9369d480b6f93cca14
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.20.11-k3s1.mod 750 BLAKE2B d5ffc49c2c1b4e4efbf5cdd911623f9a5facac284091c5f172b8efb11cd0b26274b26d66f07f53242711090d1d3980ae9ffe04f9ed680bd9603f6245a0ef735c SHA512 569605720925e61aea87c93958a020c9651e22daa93bd580ddf5638e128c36a291582532c48ef67bea615d7acfc27d8cb41196d6c93cf4d9e3e5c926a4ccf31d
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.20.11-k3s1.zip 197101 BLAKE2B 57fce6582b6f5da234747cfb653e1f783b1ecc2fcf7b97ec7d4197bee31fbed7ae33b69012314cb80188fa70745860cd74ed3b77be438569018bcf24d2746475 SHA512 0d49f4217273a37de075686312381b8f983d3a04934b266826b029bac41268d27e4582332e44763eb5516f81777d24c3489ec600a1892d06a8eb37f7578dd2cb
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.21.5-k3s1.mod 750 BLAKE2B e433585222cab596d0b01e2c2ad2b3a2deae682e2efd8265110cdf69d2f4aa9dda78dcf05a7702789e93c8a4e13e45ee1ed0c56a72bdc7dd56a14e3655403be6 SHA512 22db09ca63e8a49449fff2d0f99e2e00eb8814400450250fc52bfca416310662c90ed7da8c16205c1ffee0a56a1e1d6c33d6f8e71e728142e0d79f08b7723a63
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.21.5-k3s1.zip 186167 BLAKE2B 314b2a7ea48f65f29cd5bfd6a350b62dabb7f04b3e416af2ca148236acf9da14fb53ca6169b0cedfae9396ee3d1549cc49f63ea01de36035e2ccf7bab4c1b26f SHA512 b1aa33fec0204fc404e6f33e0909aa88b2408d2b578527295afc73a16dbf7c5ce3f2587169eca648957c05f253c2ed19259df3bb7840846d899256f17c858735
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.22.2-k3s1.mod 750 BLAKE2B c713b9ab0ee4b19bedf62f2ef985b79c68217a52aef7b7d7469fec992ec99808cae0ddaee02d2a7914f1609def17f33df24a0d31bfa829fdc5bfe1cd288f02ee SHA512 905f5b0cb6e007548d36db41700c52abd9763b57210ebb462c1382bba542b3c142c817ade3f990bdda137ea83f8e3bcc2a9b5fab39e434864ae233e2e7ab43f3
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.22.2-k3s1.zip 190883 BLAKE2B 818755b7a261f6dcb20337ab5ae8b95ff439c062d9f2d3e983e4e78ba8e503b64f426344085af7ca2c4ba08f8d89e265ccad90f545390fc87000259e9fc3c55e SHA512 199936a1cba4a59652d5ac821011deda2d15a5c1e352cf7e58b6162f301aab214074bbcfeea06c8e4e8e3ef1046e5608afc0f583109b1c15fff2e8b5e431961f
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.19.15-k3s1.mod 372 BLAKE2B 4994dadd5b18de492b2b5e5cb5fc21259b8db0937ef2a036881e2f71a257b1962f65e49035757515fb3a3f37d8edf36e8710cc6627e3537e387398de2b9a5016 SHA512 ccfb094999f07668aac87a5e11087c09fbfe163b9b0997d92ccf1c119c9e2d6ec4abd2c59f03d631787429c1cf13d9e1cfb8a12f9651438561feccd81d1dcb79
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.19.15-k3s1.zip 35035 BLAKE2B c20b7488dbedf7b623d2a0c62a6673ec6b5a3e91cd7b03c78c171e8231639885577b1b96efbe733ab319a583424e36d2ab61293d0fcf651a300d031190612468 SHA512 6ec02ea1662a5aca05257e7fc5c520b4b36ecbf58749ccc0ded282d5acf3a48ed437778518daa3519577a4d09ef8008affcd1e5ff7ee82c13854499a86a7ec21
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.20.11-k3s1.mod 440 BLAKE2B 3087e4743f36a595081ecc8957a4c462d64d7723c7256bc43f4385819a589ddb9658ea850a54ab2099d8be9eb59a00aeaa974766f22d0e3bf0e829a45c7bd734 SHA512 a7794ca55c699b95a9b55934bf65fd04b69fcb812cc0a32fd4942290f3c04872df4e4878ee9a428682d2d7efae617cc1c6bfef78d8ad1b4d9e58f946aa3305a9
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.20.11-k3s1.zip 35676 BLAKE2B eb12d89d1f8033287726c58941d02e17cf1d06c5faf097237c2f404cf39c8a5fe91dd47dfb98ca9c47c41f92732664a4a902e9f4915abd498845e533801994af SHA512 7f0c91ae3acf3d72d8f21b94d6616fa7bf2bd4fbb2125dcd851d1684c36ab7ddb210cfa469a450bb33e4417c395a159b92d32a344fd12cfcc0c8809020538e4b
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.21.5-k3s1.mod 440 BLAKE2B f04cb4d45b6669140eb348e357bd3467b5eed375c5867bcac7ffaab59312c3528b4d226b36263714604f0f3fe675640c1379341a219d978cfe34328ba696fc54 SHA512 f0f0bd0e750a586cd2efab912c4ee39ba5eea60db4222469d84433667a0d4ee10f39653c21bf2400bc9d8b19f1884a8f24ce64b88f7a0ded5ebe2ab2ea90f756
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.21.5-k3s1.zip 30247 BLAKE2B d5c65cd04e4159d9a2a6af1f056707e74e558e3d3bfa56e27b37a07e07f6ea8cd410dc6a35a69cd4b6e82f8921811a52640293d07d315a55b37a6072f9eb1447 SHA512 fec733a7f50c4daf373dafcb26b1c08ccad9b855bcd58595efb211600cb38ed60b02d583d7bf1890e91094221f848cac5b522999a39ea18bc078c13e8790d440
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.22.2-k3s1.mod 440 BLAKE2B a643e429196a7bcbed8bda324cf7055173fcf264cde2ee4e2767207c2869801121582767260aa09984959e22440b2c3337a7ff33679534d12c89d85f33aba30b SHA512 38ba3b5c0a5e61c050d20ad8813cc63d7b21c6f67ed4aa38e833a47af962a0a30a201e1e6571aa6814806ef6bc3cef59d0b2488b2ff071b3292e49d1916ebaff
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.22.2-k3s1.zip 31970 BLAKE2B dabf0e0109d68c84cd48bd1924c151b329cf07d96e61a90aed7780b86fd70183db10fc6566701bf4a4db30a7db110bf16b6594ac06cc6cdf69e85deb10b289eb SHA512 75a5531e08b11fe09319dca04e4d40a3ec1d5ed40edf32fa27a9fac15e18b2469df1c5d5add9ab37146073d1a13e24847bbc835cb0d7a9dd52f15e52b6fe2b7f
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.19.15-k3s1.mod 762 BLAKE2B b5e9cbf0c4cb37f4df10be6c76e7d43845b4d762d97ad9e7230b481b69a561934b26cdc1f9fed3498366ef2b972067adc3c59d8716a5d27ba81df8850c306309 SHA512 ed818b9330de74c23b78bbe2d0061226110fcb82da5faf4eb812469ecf31f0fd5409e368eec1b1c1c034797edfccfda4ce927e84fde35bb627a5a389b2afb5ce
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.19.15-k3s1.zip 570533 BLAKE2B e5cc5d72b7dfc53173b681b5e008ded3149779f934bb7ae7d82eea53ca898e98c823b9d9e98d8b6063819eb2dd09491bef92b95e573aaeb396d1b85871b62d69 SHA512 f5afa907f8e9b6eab27df05f151cee3e0ca9e44e45b5da209b2af1c0aedb284854fec1942ebc6347c3d721a8f70b5e1b924ba9091ab223531fc877d0bfe31b01
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.20.11-k3s1.mod 703 BLAKE2B efafa2a26ecdd22dfca72ab71242688dabe037f7472e441b4b9a4d46ef44827a1212d147bb5dbfb984d20ec25480bc4a11bb48c3919ee2399371767771752427 SHA512 456e93cff3a1f06aaef41918a5d47026f6e04b8aff1e882e7caac5b2e946e15c07b2f699b64fc6025453bf459358a32efa774eb510ce1c8c3bf169e4ac6dc8ba
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.20.11-k3s1.zip 571164 BLAKE2B 14c8b31874a383a6ba4ac94cae0c163d8ecb65723ec5eaaab43a5b017d922fa345fa299735ef2f74d538e76804124d157aa7f1558f147169f964a6ee5b57cd04 SHA512 e7ddb30c030b8e5e1d2dbde72f618dccecce46434dd29e5bba01abe6d9cd9bfc13b13523e61f36385c285423e71fd98da52ed0d0d51dec3e4e5e6ad2c025b1c6
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.21.5-k3s1.mod 1300 BLAKE2B 8db3017d3c0fee84935b3f455216d9b437971749483f429fba9269b3c649e3d7d3f0a18838b484378438a98d32854b1768ba88fa8a5f820ac9da62673731fcda SHA512 59541fbfdc0e8203a003ce9d3813388ae30d220768fbbe8bb5cde9a5b08196b0ecac83cd1a170e57e5c775c033be9179c77bbf4a4bc0c0bc01a7c7194451868b
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.21.5-k3s1.zip 199691 BLAKE2B cb45cb74d18333c71df6da58a84480afa9096e60a458b5dfe3cdec3fd2855bc3ec7d84c9a8860b0bf59dc49c0676ec07ec790c5a0d2a372e952ee08759a133d0 SHA512 3827b3ae6d517e94de2e201e6e4e6f8d9513466fef4675cb227d8e83243af83ed540b4eb86e6aa3251ffb42f17ad3818be6b458692db8a62fe8946926f2bad30
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.22.2-k3s1.mod 1067 BLAKE2B 77aa6f85892608b9f16420aca62df7750c5131bed430af3860e2ca4b45fecb080eea56e3909af5cb98dd4cf3ef40fdc382bf114d50e9045284c9de334d3df951 SHA512 2d6eb56c1130540f6757e3094e4d827183b901c2821b1d063c58578ea3028cec77b5841b1569bbe8685af05c9aa7eef99abf8e2f047c7faaea2fbf1e3649a70b
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.22.2-k3s1.zip 202172 BLAKE2B c4c17e2346c2824d8f317ea0d2c55d78e2bb4334106a6055475b990ee35981b6e15ebd43a11f4ef329200006856466b270ba69c4d45b1fe475b33ed3a645efc2 SHA512 90c037bab525049d8e532fd835b1e556b64a44fdd934fad34fd3442515255a59d606a1d0f6019b7371f5d7346cecc20f89b1ea9ba1f1c8ba4678dcacc2c13702
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.19.15-k3s1.mod 1028 BLAKE2B 3d26a5f1fbcd6563ac610c43d2e2459f5259f0a357615cd365557bfc8fca1546d2cdf8c8c73cf53de5b2016b3dd5ce525b3e4383dc769a3612091a24080c0713 SHA512 a71327fad7f2ee5451bd8df0a94aa1e533178ee1172a90f02e6752c238101b1a782aa4abef967d63e1fd3701a1720d3f3e2ed8b36a6fb1a99376af85f229f661
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.19.15-k3s1.zip 203707 BLAKE2B fda6cd30c81b920b08ab7b42ce26e3311e7148a124d674f7f7de30e2d25e3a734f85d85a2ee21db0c0fcca9ea9e2272b530d2d21228aa449b6aca01f73bea705 SHA512 51ff704d4f601ea7c292565f7ee035b1042fce995e0c2e9a0b77295fd053bb9c212c3050880a85a01311b1986c7e27f0538a3ecb5d0f78ddc93fdc7369def016
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.20.11-k3s1.mod 1028 BLAKE2B efdf301ec20d53e579fef678842ad5945737b14cc4719fa673cb2f0025f1a66a04643e187657826b709f98e93a079c5dbdd95bf375f8d700acdcd0895b304c97 SHA512 0cb56a3c52455f059dda6eda6113c9271d7d3134427f007dde3dc08144c5a454df222409b7f71e564f4b1e9553d48ae4eae39f18a1f968db87c22bc98cf82f5c
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.20.11-k3s1.zip 215377 BLAKE2B ac4ac9ea85ca8bcbaeb91a6d71d3f1499ec80d5a1a90267b4c9379e4c2aaabe188ce445d4d87b700264697e0a78525f72a9f99cbdf3b0a559f91c5c4189ee1be SHA512 20499431f6e12092c287b3911414e29bf4730c514b15a324a57113b082fa21f3b934be8cc0a3bd7bdd0cbaa98ef61739f09522fd001ecfde7d6ebc2a38a9cc15
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.21.5-k3s1.mod 1070 BLAKE2B 0725ef4a5a0bb2145939071d207a231567ebfaa25b85ac6afdac3301b77e846ce6a8c76a8a2508d6696d51d29eef2e8e5e90ecf241ab791518bb164406af26c5 SHA512 af66fc9c7e855cff8e2d8b1ffdf678cad65e3e245445dd41a0b2490658163c063b1c752c5eac099ac8f99f8833b6ac93df47023240b153b0d0468831058d5ffe
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.21.5-k3s1.zip 205744 BLAKE2B de45c82d0d3f1ce5457c79dd1e9ee61e5243717c99a0ffdea2db311f245e360f2c73f0f9e8bc07b70a0b8e12bd859cf1eca4f583cb25f9cd138bb0edf768b981 SHA512 37e3ebfff2726e246da251eb524f2232299db376ba3f1a8f19f919d444020b601db96c4b9a2865cfc9102baf22b0416ff2cfa262850b75e66c2471333ba21be1
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.22.2-k3s1.mod 1406 BLAKE2B 56ddce04329318c442cc7e08e3f72daca7f098d0dbcb76eece9154db9503bd50290403b2a2ec82ec0725d3b284290ffa87eaba5f030ea0ee9b776a18a911bfd1 SHA512 0d9615acc1cef3737e8ec8f101b2ebe8a89cc6e74a43907b8b9c04280dd81fdb9596b38ab836b9c00d7f318813b2dbe5aa0d62f55b5c0756c10fa169f48b9f11
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.22.2-k3s1.zip 226618 BLAKE2B 6e6b2e975c467c49efba52694788490aa7cc8f4c599413fdf722cb54311732ccbe6fae26b7a45ebb8d833cd3266b6447ec9fc57e79f7b9842c28285f77bb73c7 SHA512 3892fb8a7e5f634849e939f298a2f58a6a650e0b114433d46d99ff530745cc2c3c4ef89d8c5d34c494335f9c7705480bb0a32d340451af9dd288d0b5270fef3b
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.20.11-k3s1.mod 409 BLAKE2B 31164656916c13673fd1ccce81042560ab4509ea358bc4c371ff3d371f2e924e99df0e809f872c8bb8b8d22de399a4e6cb7cb3e864b0d128290b40ea2e3fa16a SHA512 7b170354b43dddd5faab455fe988f6255b329533944a00fad3b7dc3528028b6451c91333e3142045453637b8d7c7f06423898d98c45613e83a2d866cac7c3c71
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.20.11-k3s1.zip 67841 BLAKE2B d7a663609d535de45d7d2381b16726dbcfa9f7e164d7d58f33f00f8d0adcce14a66aa82ec08db8b13db627c85e73eb44668111d1a8d06ee81d3417c03e649fc1 SHA512 3ca83ccd4a826615102c49fb1fbff3243816e998279127574a16468dbf8524fa60a815fa55aff80d5593dc086c255bfd2907f00e5746e7da74bc7faf464c60c8
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.21.5-k3s1.mod 442 BLAKE2B 92689c8a08e3582a46be5ae70298bedb1ea8cf58908a74e19c14dccc79d182bba4af51b53214aaa0a6e38f64e8f63adb07ac2028faa7567edae694529c754181 SHA512 3a7a7c1ec7d8552a842ad2c40249d3b1614a43e2b0d674963f50c51c6d92211ba59a5635e5bff2b24aae5ab4895b6e720b6ea8bd625015f5a3cce02d43e35fdb
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.21.5-k3s1.zip 72537 BLAKE2B c672046d4ec5a487a46361624ba88b30898053ccd3ab513a47ce893ea1e7114d09366d129ea716403d71760b1ed0aa1645334d8bbe32d5772ea96b1b95fa49a0 SHA512 923f743fd70bace035962584f91f1d92e971bdadb320539b39ead6811cc8efb858024373a7b4a920c9597d8c8dc6087fb3849d4733b156baee9011ebb47a3325
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.22.2-k3s1.mod 442 BLAKE2B 900144d9c93293b9d13949ea3112f02de7390921a25cd39a130cccfa89112d966eeeca53d9dd2de17a122be1c6cf53d6aa8e36037376498902bc77bde2360705 SHA512 fda30f6fd974ad0d0a00f7875fbb886b0668aa5ef0fc4bf1c57e40024c858944298839c0efec17990f91892b9074a3946e8e04c25669277b9521a57a7200418a
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.22.2-k3s1.zip 73673 BLAKE2B 650047e94b161217fbdb81a792de9a0678fddea60cd031b14a57ecea54f3da5e8ea4fe10950b700759a0d67044d6b3a3a755c1a7cb9b9b07a32c64fe39e87c57 SHA512 26829e78cf75631b002e34855f961a76e424305869744481fc1dedf87a50b1e1e2b83d9a2701ca78a13eb280598e6cb3116c45889f6f0d68556225aee6e045a4
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.20.11-k3s1.mod 563 BLAKE2B d61e8555109eb1ec12929d6f1e0c4950903ef007ec6944deb209d9dc64734e91e98ecbe03424389f4de1ff2559e7905e6b57179580dbf8097eff99f2e0643d79 SHA512 8b16d1ba465c070e8801d3d20f0e1f8ba891a827cf402248e27f7469031a118df6f7e15afe9de98b32c7737476afd43755c3389ee20c04b63ba6f89941555059
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.20.11-k3s1.zip 67275 BLAKE2B b82698cb812325b3f2a65d584b53aacd05db616c2a32f0ad0a611791306187ae6399f030fed7ad3242c67b9eb477ce59fd40b11b879dff858473ca3a19375032 SHA512 a2caed00dcea5a72f120ade287f4b37a4c751489f950c3f7b246337537b3b7722351570b7a44f2334e39e9c8810a18ddc2e1fcb187286203c99a8eac1b467784
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.21.5-k3s1.mod 668 BLAKE2B d2dcf26c5546c6dec9d87436b8eeb58cdfb0f35845b53afca379de3628b7e8e4f00d4808f724c58382c5800492cae6cd08f1e1d4afc311932d2332dfb4ad41cf SHA512 4edd3f333d14031b5ecd1d5d9479b4006c1da5a82a38cc6899534921eb564c65035615520557d35d929ea934118692ef27bece8afeffd18b402485165d774faf
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.21.5-k3s1.zip 75708 BLAKE2B 5d58f399a0533b3508e7fd91b307bc3c978b997a82026904205fb2e9bcca2517ee8ccecd36e1503fc4316abf2aa473f86e1d610ae21f31565ac120d1abd90332 SHA512 314254827f1e1fe23647194a9f54a8757575f03cf6137698700002231aa03e770483a44ed7eb1352cd530a09d26235b48e87c769d109bbc58af86a865a80fd4f
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.22.2-k3s1.mod 668 BLAKE2B 1ef35deaa9a75ec41ed399766221ab40d35cda0d20396bd1f8974de74ee43bb074dae1abfb87135527be2a66c1a7b79a4d75f655bcc07efeaf5465518268b5b1 SHA512 d4da2226f98428891a2eedb8e032581828b4c9c3f4860ef69575f7c6afced80c625198103e33be8234c9379fd4a66a9a072a663c73b97bbfcda8816747b33f0e
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.22.2-k3s1.zip 89686 BLAKE2B d215991e6e37d6b023aca412c8b88752bd627361c5094a6c9815a9ac16fa54bef96559b4fa124b612bafbd2ba08ca484f41adc58c6f9ffb2329e290a8c04e02e SHA512 8d5efa5497fbb78cc066264c1bcf92962590dd7229c74369961f770ac4095ca69f2022c0bd4cf9e1bb940a34c033b8214c1169e52aa1f451d69e4adde1d72260
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.19.15-k3s1.mod 651 BLAKE2B 53733bb037f1794014b25b528445190cf06ae2fb08e152aa4a6e208ce0997263b96f38646dc74b6042be553b073170cb6aba7cbdbd9c848f60dcc33460e618a6 SHA512 65eef075058c186c5f81cba8d45489897786125c44fc5efffe5256bd70e242551d73d71e2b4cd0c0a0b2ce218c362cbcab3b028aed49dd904e93064b5353a5d3
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.19.15-k3s1.zip 110643 BLAKE2B 1e102aa6d5415f611331460f8dfd4398d4d30a58ef7cfc2233872a6d7cdcc4fd8721d6adb5be8ee34ddd341d4a53ca2a2f4f9f088f4be455d491e024077b3751 SHA512 9f145e9527735ebe233ef70ca712eea562a2ea3bbded4d2e40884b60d701d2fe7f643c46e3089aa0aa8318afb169f7a0c65faf140c646a7b598ac379f84135c1
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.20.11-k3s1.mod 772 BLAKE2B a36449503b3e7d9e53e7e0b9f553654e7d45009b62043ca23184b9cb94279ec8bfc5a9ac059afeb6012c773ba7a89645724f2e743c6d8b892026ab1926c998b2 SHA512 7eb1028d7f9eee3f272c0e532aaebb6efab94f0bb535de2df7246ab337405a4de062325dba6260547da1100877e3ca9b0dfcb15d8f0ca740f64c29e114889f1e
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.20.11-k3s1.zip 198662 BLAKE2B 5b1c42a16391fa5bd10e6c5409eef571d3ad072ee85be4723dda3a78aa6e9cbe31e8462581519b0e659b06ba7705c103d9863576d0a82733a233f09a336a6faa SHA512 942069e1824d7645a786faa67e829b1ec0343b022bcf7a2118ff5b7006e5a5fa16dfa6ee943f391a6facb2d8c9b8b73d9bca13eccb4498f3a90c8bbbdcdd6f1d
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.21.5-k3s1.mod 753 BLAKE2B b61e9db8c10b596c67fefb5431b5a996a80c4393517deb9126baea855cf20ad5169e6009c2b3528c57ce17fa99e2c80241c63497af45fca5d6d5142af95007df SHA512 806ee01b8b65537cc4f3bef7b1b750547374267d62988370f3cb5f52b895f2e60033d934f2a84694674d3b47d3d23ab53cc3a62a29bfb909377b055c04efb3fb
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.21.5-k3s1.zip 195439 BLAKE2B c9982b5029f785db5026cf5e6965577b4fd84562ac4f672da2cfeb96a61090bca64cd7b0800c7f89fa30dc7d29d78c95d9cdafc48ed0c14da8dcebf0b25aa9e3 SHA512 2f5ac5955526a6147944e49e6fb512cf24dd6cdbf7bb2cfc39ecfb67a8fdd7498cbddb53ff91052c0ad71999d7dfd96d607152be308942bf879027f601528eba
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.22.2-k3s1.mod 732 BLAKE2B bf92778bb752b95fbeb29cfeb9ac311e6312335c7a53a49bf5638f32311edfc1788178250303398f164b88757c7bb9459a0faef6e738c0cd3d2273d97b4fde48 SHA512 e02a83772f5b96d6d8faacc9d2d32f185ead9b968d30e27a3044c0b92ff3a01b79998753e7930b3d87191a7e0eb596f2f8a80121d929aa92b04537e025d8108d
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.22.2-k3s1.zip 199616 BLAKE2B eb4f5bdb2ad070f8473f2299586abf2e73274493372e3d9afd7a361a945f88684e7d91cc1e5ef921715d6c4c64bd13e4a4683b608b81c6281bbed6ceb912c165 SHA512 4b6ca4d176a7c4f7e4e229a2b41052d14ee5096fe5c736844b1b5c954f8c1a027c74b9a62650951266da0db547737d3b8ccc736a36b6d1ea8934df2f1098ff95
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.19.15-k3s1.mod 495 BLAKE2B 41fbd56dbcbdf4b82cce93a8808bd1ea7118b8378c713a256cd1b543830f845b1a3afaf7c7d1180a435bfb68f8156a2c361c12587e6798aedd8bf5da7c1624bb SHA512 812b0df6e5fd841d85057134fd21f7b7899613dbf29540b1b74e55f660279fc0072b15cb173101f17e954f574592393da992d625f8741a76e60af2f51e26c7a0
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.19.15-k3s1.zip 66809 BLAKE2B 5ab576927e010ccf246ed5a34df3790d0cd26e18933a3d7112eb46a38652b40ac4676370ddd48e0bc01011a9e7f9ea2872fcf7bdcb75dd8ae1e4d86c61b4380d SHA512 22e6811e29c40f2740d2ebd7fb64e0153bb8822932d805cdba6cda7f1191c2022ee66d2c85dbda2f5b5ba71a7e436b7a601f19f3e2110f6f66c2bebd927ddad3
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.20.11-k3s1.mod 343 BLAKE2B 1d3b7b391fa6475939fa42d7679b7a50a113438e5436ed1cdbb5ce99a395af70a7d2512931386a71df057b8d553b69473d9307a8d609510f3e04703effdb049c SHA512 a5887fbb9f0200efdba74edd4cd71929fccf81d678f38614b5c7aeff532b05f6b8a107080c5850fe70c5f8e670786413630973899bfd015b5ac39bbad0b85831
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.20.11-k3s1.zip 61120 BLAKE2B 1e77902888bb108543f8b47ea34b64a8ae8c52be3ae5737a1858f83502ce4643e8087c3aea360b903e5024561d0c63f467bbedcecace31158995cbc9799c40fe SHA512 5085a7e22018435ee32e93222944b3d8f011463761be9d1e7c2fc261220070895099ef27b532f3bd39be349ba0216964bcbb01833621f6cd03004ba7e285c9d3
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.21.5-k3s1.mod 343 BLAKE2B fca817b173efc421325565fe554de84b19a8bc1bcfc19edefda97073bbcdaa174e2428794831c792e10e6e58cda5e6c4a80af35d4e71e8566184c7bb955b5ad0 SHA512 9fe8a6034811f84c70079b56f5da6cf80bbd43281ecdbb9db8a470e698d7205f9b7e3ff954d0e9f4dcf4f2b7a64bd062baec0d9ec0aee3a153e2a8208c47bed1
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.21.5-k3s1.zip 62467 BLAKE2B f7cb94a8483dbf9fb89e0251ab1928c91b46e960da79aed210ddba3e5e6a65a24ee15be1cd508478bf84a9619d9f63df97ab454aa9367ff1dc53168604c9f786 SHA512 2897d550ef4fe7c1f2780c06644eaf08dea800294fbd9ced40bbb141df0c6a842587df074590814de3f5806dba1f1d42f84a87e828d7e5e9ea5eefbe83f8f242
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.22.2-k3s1.mod 343 BLAKE2B 712bf1b41694e3fc1c2f725b6801cdc3e7e28783c600ec534e21ead7e9dff7db4671270055a2da1b17784f29802bfa90656d6b1a7d80f3ba62c4c12874810b47 SHA512 a32ab727ec5815c6d917d392766ed3d8ce9f3760cfbb745198fdd078c34125678590cc6bb093fbadb20680595c4b88671ae22badf374d5b06536f56fa028386f
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.22.2-k3s1.zip 65149 BLAKE2B 76ba90ba11f442ec6905dff88fc54c2d46d71e94b42627a22ca26a369180e46f3a798a508e12104b09cf7fcad48317557a07b5130c2bd3b121a021d965853dba SHA512 98223a441c94f8000e285166bbaeec0df31738711ef2d2dc10b93ed63839e80ea5d5f8d563f0f7438944b167f619e896076e8f032df273211441f4673a6729c9
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.19.15-k3s1.mod 1010 BLAKE2B cc1078ae45812745b16a0268ca98dfa2178a57f3b908272a717eda87b50108e18e22b661ed45fa99034fd35f747a59203846250e9cd332d38cafc3e310345f7f SHA512 19a350c8a70ad101500a98d1fb233eb99088addb4fd43734e9956fc160b2cf149d44c6b9c96051f145a94b2bd01f68c01a11ccf3be5be2737b77f1c5b419307a
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.19.15-k3s1.zip 306721 BLAKE2B dfa44ff3f93c4d9029262a7a52d60a1e2965de2a25d452784a26de2217701f7cb3666937f3bf65118dc1f7a841661b28374f2fa43b0c26ad98f3ab75f88d476e SHA512 34466e691f8bbb246f264b27097d835b2d6caedea490c9f7d24fcb04af989425c35e359b143f50b42cce51160e594443714bd2f34abb5f7a52ac43364f3fd6ce
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.20.11-k3s1.mod 1010 BLAKE2B 7462f45de948f2207cc49c2add0e78e9c703b40c67345c8f3aaec55f25a7ad5bbfa26240483bff7593f908ccf5b4960d2a7ffa89d9bdb96d92f52e902df00565 SHA512 e12120bb88c41ee224097fe4f945c7b4083b22f7ec2dd718e349767c56c8badf0a71f761d28be366e287edb5a290e1b3c3afbafd1627369284e267198f7d289f
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.20.11-k3s1.zip 311647 BLAKE2B 06a8ceb704721f814a439c52683d1ea2e5a12706c77d80fad3990326ad04bcfb294723dcd4316e468dcad3849648751fa16fcf813d22c0859fe2ced06cdecd60 SHA512 584a19f709b54b8910525018e984d41c4221735a98c7955e0b450c9a12e5baaee4b09047ada8eebb6068a16ccdb0db6ccdb24897d39b0c3fb4a071dc84540904
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.21.5-k3s1.mod 1055 BLAKE2B 7494a8ac8fafb8c581de9b7d67343bc57d3bc4595df6f8bfbc8443da34bd6860a9b07ba3a16159d681d2915d3a174d195af5cb4f2a5ced3403dd34622fb419fd SHA512 62caf7ed72226730fc13316a440917c87cb0a4a2350d4433a9849862212dc1745e3f1094efd17a2bd67add18dd0400544fb9ffb8ee15334ea89daa648bcb5bcb
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.21.5-k3s1.zip 281260 BLAKE2B 41e6b87ebce27a29ad1cdd111383fdc66107ec9dfb0614e8ba493066c3fc0fae5be7b8576011e65c914e84b9886f4a8a562cc2908d2c60cca2b91f6360e0a90d SHA512 85b09bc2cf26e9f5c3f1e283d929852788bea974be43109de1ba26ac970beb6562f0d2e883a8ea5c9bc741d784274d9df30f03d226282e4febab4268eabb6323
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.22.2-k3s1.mod 1019 BLAKE2B 571323f0464e63156f933ade881da3c5df84d0b9dc95cd6e57abdf7bacbafd0ad255bb78b01a35b115172ac0269f6f84c0694dc0d7fed5bc0c8cfb05c3dd0a37 SHA512 e775f5a36fa1acdbe7cd31d246712007111679e12b3500fbb1e3962b51563fdaeeea0f13fd84df496ec050ba20850158dd65bb046f333a2e96c4354a3c7c32ff
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.22.2-k3s1.zip 288676 BLAKE2B 728ca93918f739b697c1aae084054366eecdf14cec17269a0ad9a7b2a53a2f0bc239403737e038dc07eedfa881c5581d03ad75a2edf3d6c274b37479baf33a3d SHA512 4e7d5c17b0b41f888d8e1c758e9a37b5a1ed3e93c7739661f8e5b65607b11e5a1cd0b9878f20a9abb736823fb8b9e95809b594efbce6877e99101b98774b178b
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.19.15-k3s1.mod 385 BLAKE2B 60e2e06f55406789c07dafc0705b88fd152c14c50dbaa69e2b5c3d68216347214d7886e690ab297770eba0cf5b17ff043d5f5e837a4b4bec9756952ce2084367 SHA512 95d5b27a2afe1b212aacb756a73cd8f372b96d8ab5cd6f9900b4568bef3d6e672a13cb64cb6d5f91984ef84ea97eafeff4e1df3503e9f452428f8acf2a8fd6ca
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.19.15-k3s1.zip 36895 BLAKE2B 0483720557da72e22bbfde04eafcc43f77f6f30425f8f0d1d4d4a0b0717bcac2e07a61b3053db09f08b9d0bc64d9a73d12c17b618b726973b95048089415ef10 SHA512 c8266ee362f510e78285fe098fc15f652a68e5a5e839cfd1d5c18cb35375e9b72098033ca9c162d7519fcd5b9aedac367f01fe9ae9cedac1f0c7874169355474
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.20.11-k3s1.mod 549 BLAKE2B 7833c4edfd05bd698201ac43118130f482be54b0622dc1c2e5911f46932b5f9e070a5fb54e471ce606ea6ef6cca9755648842c06c0c030a35b5c2747da91d61c SHA512 d6dbc84a6abd78b0eea779e03fc2b46d255a19be15efa2a81b092a3a1eb016a2184717a10658c3db831d9ba64f987a3e4801c8dd8d73fba950ad43aba05f08c5
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.20.11-k3s1.zip 43713 BLAKE2B 6d01bf9d4ea84108a77f8f713747b308261db624134897d7a81a3705bc81e72eb155501a4a2a14d77a88014173be3ad149ba4563ba6af521cee1bcef9a2662c0 SHA512 7286f30af5ee6e28d3a29c774d47082a5e527bd94d0affbd13dd62a18cd451205f459c10e0799b654ced5e762397fe6831ba12665177e97c3afecc2963a343f2
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.21.5-k3s1.mod 549 BLAKE2B 9e7cf2c4ceedb1948984867d9ea2537e123dfd4ca87e6d94dd83c7d9467200205a1d2b4304980cbebc5ba71c48a5d4d8f44f1ebe3c1ec29fc6126b86f20fc9a7 SHA512 b3e9d41f507bd528cf133fad2e70b586ddd7b0c0a847870101d20d92e00e505911216b50c88b124c87973a4381d32ae5aff3a076b75c7b3995ea48b6c6cd4a51
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.21.5-k3s1.zip 43014 BLAKE2B 7d7fb4ae17e713242871e9880e3d448711fe34273d01e36c0736ac46ad1f3d1fbd492c2d6c942297f06488ee28179ad3c4fa9a9769b66b9ad2bd5ed037c5dc3c SHA512 fc24b7a8594046544f196c5493426cc895e88c3fe71d135aa81ba83975294c6545dd3e04f17158f2337ed503f3722ba25991e76aa69534349a0d8f909a39d30d
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.22.2-k3s1.mod 549 BLAKE2B 9e7cf2c4ceedb1948984867d9ea2537e123dfd4ca87e6d94dd83c7d9467200205a1d2b4304980cbebc5ba71c48a5d4d8f44f1ebe3c1ec29fc6126b86f20fc9a7 SHA512 b3e9d41f507bd528cf133fad2e70b586ddd7b0c0a847870101d20d92e00e505911216b50c88b124c87973a4381d32ae5aff3a076b75c7b3995ea48b6c6cd4a51
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.22.2-k3s1.zip 45374 BLAKE2B 65255bc7cf0f09e613ae7723cf16328e835730ae723af1c25dccab73b69b0b64e3c73b63765552998d91996c2505c90315b2d43388a81ca0fef959c75fafd5b8 SHA512 87ec808bf5053247569a54a28f529ce5274c5f67da54239e8c4459fd252b49f803e0736d6640dd4ab0679f67460a6eb73b49bd67329c3ceb5449e2a576662ca3
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.19.15-k3s1.mod 346 BLAKE2B ddd455edb5860435efb7b11300359a533f13385f118707e0733a69af973a1eff5855b4da102ebb38e474057b2807f71cf55fa0314d3bd57614a0e07d577d7bd2 SHA512 12c04db4a65be22adf3305836204cde95fea753c6db6d65a413e0acf3f6d6fbed08180475841a9956d99906fe5ef7f5fee1aa3cf12f1776767b859051098e7f8
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.19.15-k3s1.zip 33005 BLAKE2B 5d42ec23b38c56ce81980376a48021645b2455ae7618c62ef45d5f7483dabb27af9c6ba2f3a3a57efe9a22f4ea959fc6f7d08cad482d8ab655196780b02747ec SHA512 ccf1610a11a1374b68066ed4d1201b82d6de9611776413e0c149c3158978c42fcec6974c1d03b608b6d882e24d9061046870f3681fa5d5e5845892480dd831e6
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.20.11-k3s1.mod 346 BLAKE2B ddd455edb5860435efb7b11300359a533f13385f118707e0733a69af973a1eff5855b4da102ebb38e474057b2807f71cf55fa0314d3bd57614a0e07d577d7bd2 SHA512 12c04db4a65be22adf3305836204cde95fea753c6db6d65a413e0acf3f6d6fbed08180475841a9956d99906fe5ef7f5fee1aa3cf12f1776767b859051098e7f8
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.20.11-k3s1.zip 35274 BLAKE2B eff1f3e86659990076c879b451edc3ff1c4e39dc89e5f0ecb6f62ad83071f3457e6d38cd01917c69fc52f70dde73ad8d1b77f3ed4e65a3aad476591baec95fba SHA512 adb87c0f7ee5f54d468f9de85628ebc2a83d32d934aaf40086aed94fc602164a685f04d7f9cb3445feff98b20ff196438b62949ff6e47781b23a8f8c1b09e8de
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.21.5-k3s1.mod 346 BLAKE2B e010dbd167436eaddacae5719d85eefa2b10dce3a2fe47c8f6b37fcf1522b045da74b8915a5fb4d5d72da7003750939efb136653f28b80ec6750112a390f0a1c SHA512 90c9c92f8e3a76b9223dd6baba27b1d0e12c6c8884c7f46514cd6dd3828743d81715f5f5884c2a08a74061bb5d4ea2f93ec7d759e588613552312106da490156
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.21.5-k3s1.zip 34325 BLAKE2B 2a79b221b9c17524ebd1fa66a2521f8c240786d6ada0ba89f61ea7589c3f78b32432d1095204cf31d536d95d0a7e0cc8b22c0a1b47974fbb2a07d113ec218687 SHA512 5dd7104e6cf33a681543f11fe56c0f373fe520cd0e0d82693be4ed6c91b2c9eae142209da8bf1f1a4a08cb1f8b9024984fda42e293adb628e2ba60f6146c86b2
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.22.2-k3s1.mod 346 BLAKE2B e010dbd167436eaddacae5719d85eefa2b10dce3a2fe47c8f6b37fcf1522b045da74b8915a5fb4d5d72da7003750939efb136653f28b80ec6750112a390f0a1c SHA512 90c9c92f8e3a76b9223dd6baba27b1d0e12c6c8884c7f46514cd6dd3828743d81715f5f5884c2a08a74061bb5d4ea2f93ec7d759e588613552312106da490156
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.22.2-k3s1.zip 40532 BLAKE2B 299ed204254e02db212eecd732eb19fa4e7f73865d0ebfb30710f4e9ce9eae4e2696b4c1d02fe3ef8d51e50f74b94ed8218409b50dc720b8e2774959b8995b12 SHA512 436ba089e8d50bd1ff3d7a4eeecf45a8f7b2f4a7d5e1e57fb1d629056912846100e44746f91e720957221762a265536465235ba05c4a05c29ac265785e0ddcf8
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.19.15-k3s1.mod 435 BLAKE2B 946bdec1e21521e177e66c351104bf8f694fc3f77bb79597b03e5de045c0aa4f26888be8d11e9030f155322f7111870e2198c5aec88c4cc7da038c1fcd31a488 SHA512 b3cc793db5036d4bec52d2bf6046c1c6209a0ad243ce0ab6fdcb2eaa372174ada416007faac6f853b190a65f6f5102686cce935cd70456c76a10575535ce2312
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.19.15-k3s1.zip 52219 BLAKE2B b1d4fd1f452ddc026040757f10681b6a56fcaf61caf5a3137a713d56a35fc1c8e5f1422a77cbfd9b056953055b1c19836a8a68a80e0a154bb1ae307a56f43080 SHA512 c177bf1cd29f2091ae30e2fcf799230dd3269f135e241cf452e807d1f1ccb0b016c0f32a87297d116f7ce4d39e7c5d3931704b2edef2d279cf6d7dc267a095a7
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.20.11-k3s1.mod 435 BLAKE2B 3fdfda15fa9fd2a35a166253ea9780f58767856d0719cbd06418e74f6fd53e3a41a0c7318e40a2f2883c146bc3b2171f9cc535a02c3333467f76b4a3860da6c9 SHA512 fa7f281708f3fc894906c5150ab5f5705829205cac3038c76a1252c271e7a259d2891f6e9db5ef3e303a00b8ea30ee9015e8589158d7015f19427ad542e3a514
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.20.11-k3s1.zip 55442 BLAKE2B c2faf05080a7508ca5bb1d10a8669fd170a8b3a94fd7331858daf1ce706cccd480548095479069eb18e449deea83b06f8747a5aa16199f8b7c000b25b78f5f69 SHA512 4ffe4e8f09bee78a7761e340f28131ffd646565ded8e70593a5cbd048627e51762895bac1103299d0720c7eab1f6f587cf5b5133872596d4f98272686a271a00
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.21.5-k3s1.mod 435 BLAKE2B a663ca0b5a586d2c8c369007dc32fd98f0ad6b4de62a710adbdd410af702b231be34905e59ef5e45b327116599b7319075ac874bc37ba30f93c8c33fa61836c5 SHA512 480542829fd063758d3e5de481004302fcacc9dcd1362cc1696663895e7633c3521dcc4857c41f29733f6ee894f3175ee3d05b082338683c69db75006c7f8eec
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.21.5-k3s1.zip 53296 BLAKE2B 328e799cc49c052c8714be1dee0304de7e8c76c0d7ba70ecaca4b6e16cc9e37dd17abbf5bbdfb1f9f1cd67738fbcba7c63d7d7488603102f1d63bc7acc54bc42 SHA512 6495ca20102a4ec259e9e5dc3dc5ee0d5ddc45568b8591bd5d320640db782ead24622f426d6f561de9d4fb95b862efb1e1dd199112783fb393577c4799d4b49e
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.22.2-k3s1.mod 435 BLAKE2B a663ca0b5a586d2c8c369007dc32fd98f0ad6b4de62a710adbdd410af702b231be34905e59ef5e45b327116599b7319075ac874bc37ba30f93c8c33fa61836c5 SHA512 480542829fd063758d3e5de481004302fcacc9dcd1362cc1696663895e7633c3521dcc4857c41f29733f6ee894f3175ee3d05b082338683c69db75006c7f8eec
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.22.2-k3s1.zip 72940 BLAKE2B f377e8722f75b869f5ae03c41011665c7eeaad48bec28a671d8db12862f1a6223ecc52ff50a030f861c62540cb82babec5c86af8cc58bb4fad62ce642564377a SHA512 44f10751bc5bde3cc695e630e9983fa18b8fad66a109f7aecfa33214c7569cffdfaa7c64914986d3ba42e91d2329e49ac621dad6c851c426228c662bbce36c2e
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.19.15-k3s1.mod 2221 BLAKE2B b77973119a795106405933b72d0439eb63d1fa88f02f2c910c60259cddf09bbf85026471060ee62d535b5a251c500c20f25a33a8ac989663565bc3039be744b7 SHA512 49c801f3ae43796f3fe8865886896c10721f404afa079fa06b14f39b7dd3a34fe23cd9e4bcc05d3d8f572fb3ad17abfb4c28f2a774745f7b071ce4dad7df6ebb
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.19.15-k3s1.zip 3472584 BLAKE2B 501622557884eee50341d4efd8c272906a605fbd988f455642fcb5d11626fd2db4a57a191cfb69fbe7ecfe0fdc1700d10857d5ab05d1c393eee438cfae411780 SHA512 4b94352df4e1674f42f0afef3ec1a43cdc5ffaf0d12113743a80c7e87dbc314e0627581c97c2746c8d6c13a8187cc01d9ac01584ec9036bfd5e3e73bb780a039
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.20.11-k3s1.mod 2215 BLAKE2B 7e32f9c1295dc549cdc3f16c282e125b9359858d75408aa3adf00593c2f9b24d7a65fb3f5a65553abba106438e00afe372c63c97c4100155ebbedc31915c9778 SHA512 c59fe62fb8de18edb943bf319d4ef66b13f52e25e46bfc4d6d0cc6b8a09533e1106de05477ea9c9fdc407c3f1fd1d7b4cc6ea0fb5fe52017c16f2b3a10512c67
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.20.11-k3s1.zip 3524738 BLAKE2B aeaafc62b79cacaef974cbf231ce2ce68fbfa619bacc2f1b279e2d3132f73e3999e85bbde58a3ad8a1494b0008cb80fb61313210744bbff281e6ee435691f393 SHA512 691ca4331c3f88b6b9663379ff130d447aefd806d6d84f91ac43baf269ee031050e231c59e44ffbd7ed5863599e206b4c028c2e7e8fed789a54e24cb20c85783
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.21.5-k3s1.mod 2148 BLAKE2B dd4e66c094fbfd8fc75ac829a0ec1d2023d2853ea2037e17972aeb75a42731c125ddd14ad8ea38420a660a0b6b1e39bf4575909d02a6e556d6912ff3b757d9bb SHA512 400f1ef78bf9e652e4b409fec5803d08dfa76a39ebd184f23219c489f4564eb05373bdbae4d195260f4719a3f137051320ce17c0e38aa13e76d77280ee5f4e91
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.21.5-k3s1.zip 3504222 BLAKE2B d7f2f0460fa391a74b3a6e1858ed20ffe6d8583f8cf0b50459cc78d6ca8f78c658ee691a3c90d18b002ca9b74e0f59a32a64795684b4c54523e0fd3f05ebc01b SHA512 e226f56612955a16dcaca026b644f8223238158abcdbe83d5d4f2a8b15da9c4ab30b3795ef613291c842e06cf081e562354fb69fdf8faa0d0dad9903c3d63231
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.22.2-k3s1.mod 2068 BLAKE2B eb135b377b7376346796afebb7eed6917261953b3ff2ad0716d0dd239b737da33fe4f9ad822d581159f19dbf323086a51151482f2233f46b984ade3908108daf SHA512 d2f08d5b659aa96afacb1fc6006fade970d922fd94baeb04d8cc38bec2c04190978f152078f22ec7110f14ae2de1704b4b6376da5809634c9e49fab7699c6023
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.22.2-k3s1.zip 3455757 BLAKE2B cfdb039c733138463e621275f83dbbe7e6cbbe1c98896a8a75f9b1d0431d05c33b48321fe37fb80687decfa811ab549bfb03b0badacc4d66a8ff6ca5e98949fa SHA512 60d4fbce8e7abd8a9c48fcd1e875c76e6150c675d992615b3fab9806fff7478e3b7286b6608d92262b59dc47225de4826774a7113fdd50a8169e6d332c60db97
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.19.15-k3s1.mod 474 BLAKE2B fe25d5a8c98883496fcf0f95e3de39c76c08e7850aa20b10ded02de758934babec47c95b1bc3b09b6a1b16bdcb3f6e54ec9a6e8a852d49b3a5bccad0c6d96da0 SHA512 6da10fc78efb8b48d575024f32ca6260b1e8ca1ca040d11a741df5bacf54bb5551d50e9f0d27e4eb95dc3bd6dc5ecff6911c3f4dffd42226f12a6bd753fd330c
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.19.15-k3s1.zip 102290 BLAKE2B e108d4ceab279f30f4018b07e9bf2b166d321b9e881f1470e5da5b1b43b478401f07833466f90bc9ee2779ac836b5ee6d9cb35228af1362c05319e4b79fc2c17 SHA512 8cefec3b4bb92f842356db1efdc459002df4237bf6170d2e95603083b447897e5ddb9359a09f188788204e15998cea87a46acd28b9999a6e5721bf28b60438f4
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.20.11-k3s1.mod 549 BLAKE2B d770af7deb9ad0744c8f5b1b5e07c87fc9967bcc5faf93e5af358910f517e686e534cd2044a4a5c5d9f26f524359ea69e462ac7ee140bdc16a70a2e5a856dd35 SHA512 ade8c952674536c057d29712390b4001994970957d8ad5bdcb31ff6935e1fdf2b82ad2bb83cb2df7ce7c01fb9340cebbbe356c502f37d98fdacee5db540ad264
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.20.11-k3s1.zip 148744 BLAKE2B a248506f10fd2bf3eb040881851184484399e731f82e12118c277e348daeca8955d191aefad6a18a9499334fde9586205b1bf5ff7373cffb544dac9a9e6ca065 SHA512 2d558a92ef4704e9d701c62227ba5e5dbc7b1c937dc620ba86c64988bbc446c78122d41a314de69c87f552060e66584d40bad2876af9af6c43c572e9582a96af
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.21.5-k3s1.mod 549 BLAKE2B 6fdd378735729ad4bc945b2eb3b911e7f568f21e125b69025409caa59094af9c0ebda3e916397064fced7d084e24baa6be034ea8e00e553036f46e25d58e92f1 SHA512 31202dcd64c4c14a05d2bbcd3b02ad5fbc3385cd2c743dbccfc5fdb142085ad3da7a0c956a06c40e9986a010a7495547934f8d8ee2f28853ad0533e433413cc8
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.21.5-k3s1.zip 143125 BLAKE2B 57eb278bde7280dee30d4144ff559df031431c8b1b6bf237a0f304591af882be04a835965637c5def589cedae5c033e76cda75fffbdbf644fde7caf443bbf972 SHA512 20f22a4489649009e42e48931a7bc5b6df7e435ce9cf3d275ec6782976ba211071424550a733c746a16547ebcddb7bf9a1a96839c1b69405f3866698493499cb
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.22.2-k3s1.mod 474 BLAKE2B d7a7b2b559d267e4b4f8a18d2c4e137adae0e97a19bfff83403d690b0ab41191802bd2cfd2ad06026703ed60ce86959d7f5024d2fb1aa88fb77b87f789321560 SHA512 a66bde59e9afb2316e8519ffa4239d17a3b0cbb217c28f844252bd6d0138989c983ec59a5ca1ed294217882bd37a45e532240665920fba87d39ee3efdaa45c8f
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.22.2-k3s1.zip 151088 BLAKE2B e822fe277bc7be6dc7ee2310f950a03b08bfd16f3da089c2182087af5fcb6837931b14f956201625b8b830fcff923886f4d58ae01c40d29e57dc6dfb89f3fd7f SHA512 ad578fb47d4d3a07e870400071b357507c00344f1bae291e8b0e16722f122dbc735f9cdfbcc6c59309da83ee0ff2af84d1de957e5ee906655dc7b8461e333cb6
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.19.15-k3s1.mod 1800 BLAKE2B ff88cb957eae7cb3d018de22ea235f6c1873934ed1277e9d9e5c7d71a2123723508490be95976840c937072b9c242db1cce500e8bf5d6637312991dd862a3538 SHA512 548e88408c08f89b6d31fb9dce2f2c7e3ba9faec1ae9b2bfec6682e69884fb3eb04525e01d19d18696475c6990805c29ddeb31281bd5a80cb4340c759a05d295
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.19.15-k3s1.zip 899122 BLAKE2B 9be1314baaa0fd8a840b6e2cda146dda078b5b8ca6ed173059658874e5943d080edec4f528d0dbbfd4feaad5ca4a7f6f71fad9d9c88d3f0ca070ceedc5b9e724 SHA512 e17ee6ce786a2f16da91572bb2a4634ae9a71a97d2e440fcd869b013ed1ab4da921d8f0b71d2f79b13b20e2e29da570f7d007a2e60f420783882d6b1019f84fd
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.20.11-k3s1.mod 1854 BLAKE2B 07671b7d28a82b56c7eac824972694eb144a30946f9e89ae87bb63a8db918bc8ecd6063e67927882f1409dfe0b500fc0fe604d02009f81d29d114aec25d6f456 SHA512 2df73115b0abe12af11458c5d096b97d67b010873b7990ab5b6e09bab406a38d1dd697e78e799bba178b5a03216c19d43316a4fe5bba17e614a9a41cbf1864a1
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.20.11-k3s1.zip 938133 BLAKE2B 352c91068ed61ec4d3416a60af705181c6739416b4d16f1b5041c997d73f2ebb9020b8a885373e7c568094ed31ce9ff4f89bf7355c6d5b1faef4f0dac28bd91e SHA512 4afe70cde712395637035463896a9f5a0738c8058e2f394ad17b4f6fda7d3d86058ce4ffad84b10a32d83ae7726126de3ed1221305a736b3aa15e53f5b5e7a3e
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.21.5-k3s1.mod 1900 BLAKE2B e1d343fa4aca9ce6b3aab4ed3bdf18bdc53b7d30b2a9e885feb183e13c479e13cd583526997dc631dd6a485adc06c40efab6de1bd5cd39bc60aa42fd76c67a65 SHA512 c0ea923e9b9be2370656bd4cc3601203d4a5d82dcb0504bd55fba70bb05658a2406860b02f199f8c514b2b56c6f1b162d2376f7fd0235a16399cdf1f07182afa
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.21.5-k3s1.zip 904780 BLAKE2B 155d53989397d14c3e8d94831618c5cdb6fd75e08307c09104692039260badc7a39539f640005354f0a0b06694f3bceddc2441c8a55243f6203a16e8ddd341e8 SHA512 c9667eb38243fc5ff0433fc45ec4122bc2ae6439556f36adc5332d5a8c5e78b192b2286954b4c40d70279067a6f9734e292d26ffcb698b803a595d7fd0e3c562
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.22.2-k3s1.mod 2020 BLAKE2B 328a9cb93ad8f638febb8cacc6607021901fa5a1b4c2a06f3fed20b4ee234622a132a69343058e1308a72a8ccc2df4c5d19ed5f219ee62f7dcf3321432be4bbc SHA512 ef9ce63e81ad00dfa5a610ac96aa406688f1d2b8bcca90a315b1ba44926863ffaf5ab049beb7b25d2434bc389eac6c8d3250aa29d308ca5fe5b20c914adb664f
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.22.2-k3s1.zip 909438 BLAKE2B 00db2d355542dabd5ac5d9ddece0402c28faad45ceecde6e4d7057e80b17f12cc07068183a152b00814f26d0564931094d32b662489e5b38833cb1323668041d SHA512 6230c644c18c9dc6cec989e95ae47d561a3226a8fd0a9104567c67ca1111b53d175f02bbe35f4c8de36cadce39c265bdf5bae9e0b73e40c4ce5c699b6c8da817
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.19.15-k3s1.mod 450 BLAKE2B c4c6ab281774ca2354e82ac30365a8dc8ca99ad519105fdcf0176495a5d2d9a0f75de2c9ce7b792cd8903791a166d4959ec3ef9bc9316b66a75451b2f7307c3d SHA512 00a9f122960f023bb6083b48e38e5e8320934db6493d515f597a212c2a9632327b307131a9866e35e61e15985f91a4b280c819be7c30aeebafcfdfff11cc69ae
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.19.15-k3s1.zip 216452 BLAKE2B f642c8bdcf1e109aabe7af19bbb8265f3734e0c721075473b71235f54912f154f7df1f05f57aea22f1ab0dc89bb9c971d02f57854f7d5bb57c479a01c5049102 SHA512 4911937619bc773a7b18cc8bb53253c4c18ccdf41ce1e3caab4623d9be8f4c2789ee9b45ea19067c6184abd39c8eaaafdf8c78244465ea629b9a0b0e67bc1bcb
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.20.11-k3s1.mod 450 BLAKE2B 5cd264f73c4565d5a35f66921484a7e3eb3ea5064c2cc5a2e52e52dc3d4458dbafcf1ef53a5a957314de439dd9512d78fa4b4776b7d29396d44debb2025dfaf9 SHA512 b7e164e1f56dcd136500123e80a7f94aa41e7f7bc84ee5ed8493e84b20d201c9bbc007e8f3d2a7ff7a3efbd841cb5f419835552de9bb8313538964d00be8780c
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.20.11-k3s1.zip 218407 BLAKE2B 4a9e2de87d7d08d247e5a3e4eff795dfac92ea87cd1ff8b906aac567d4900fb41bdeb31bd655e331105032665bf2a8d34c2cbdd672c00f67e042659f47937689 SHA512 7284c7e9d9bd8aac3a7b3f70cbe5c06ea45172ee0f01910690b71bcf6579b23adc3fd574e658cfe036b9c638df60f27f12e7a9e91534ff3c38365f0000c8a0a1
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.21.5-k3s1.mod 450 BLAKE2B 85049bc6640f2771f6cddd47c8e092a7956fdb1e254f1a53c6f2f05942aa6e248b3335cb2f4b9f7ddc68286ae71334ab2f57c69fe4e83cfaf3462837b8bf07e3 SHA512 46b26bb2359cd018748a4f974fedc376758735c9661b60bc4f5338a077e193cf7ad01842b92db0ffab2559d700251839f794bb3f1082443ff24e12e511a7148a
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.21.5-k3s1.zip 194732 BLAKE2B eff8c505d80b67747f456b27571bba95c2b0598c0337f391bf5e6959cca6e3ace538dfd3e08ccadf1258c441336a6166530c466298c0464135aa8f14fdda5cd8 SHA512 0274eca189a398e4f86fd977d5c4b2130ce705fbd3761b2ec3593fe2d305635eb6f01505d1943dca5bb2cf030e0cc12180140ce305214f6f9156adb38f083285
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.22.2-k3s1.mod 450 BLAKE2B 96144c7c1ada97d972ddb70a31cbf4e91496286c184b51b7d36e4973ce38270de2b6970c1fc7c8ab414dfc53b74fea271e6f7e19b158887b19339795a7498313 SHA512 30dc01e26ba3b1873e3c3676a4b485d1b6247e0464bd678fad70ecf3d69f7dedcb1d59bd0b8bcd79f5b2e113efc38fcf80577753d4b097de5bab4826dad9cf20
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.22.2-k3s1.zip 195391 BLAKE2B 0d57fca6add1e6831887e0ac1c77e2f08a48b0185af2f124bebd930cb1c4aee5a40d8aae54a5626d9e2df430bfbbe5bf51723df000c83d2c50acda01521e7fe6 SHA512 39713c68c98ef2fd6c3455bb7997ee95d03fce5071e99e9d956f843e0c1705ec8c6bef8d0226311c8275151d2e15448fd75cf96ee0b3f2af47a42f051823dac5
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.20.11-k3s1.mod 361 BLAKE2B 6c5fdaf96383c5b8aee1fa81709174b5596abdae6b8935f51bd8a1672fe0950fca8f1b3225f157ddc7c31bb82dc6d422b5e58bdcf2d348c4cc0d24c5c85a9956 SHA512 5f1bf6bba66fb329798705fb15a5b204785f2a0c70fa601d50696d6d6342afcb23f0a2cd454a5242e069a31038b87722526b43caf0869ed0f96f24809c38f6d1
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.20.11-k3s1.zip 53095 BLAKE2B adccbcf991313b0c608570983cb2e0aed3479c5853d2ea9322258dfd805c84692011df0bf5655b056d814633f57240d53567c04b182bccb2d02dbd74fe1d58b4 SHA512 23f873681999739cd92c6523a7eece5f8e1260eeb8553f059e9234dce7a93ccbcc8e7acad61ff40d4976454f96ab2a6ae08787094d2b9f78f3e5efc770150d30
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.21.5-k3s1.mod 434 BLAKE2B 8697e372cc9019f1cd08171d892b3a09faec2ab120c2437c12b5e5e5a8cd8c933ee7b60becb8e9aeec17e8dcb19a726dbf3461256ae4c1f04fa767017f387725 SHA512 6a46c7fc62eb5bb4b9c32eea029ab91f80a61000a5d31c4923463151d06b9779b02528f6594a775192f656df084d63dc40c6731a89f56bc7491fca8b6b68edb0
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.21.5-k3s1.zip 58719 BLAKE2B 1dbe4562129df6a55daf1b215716509777c0ef972c0893692388ac109301bda30af376de28c2f4f92dcab8c7582f881ae44e7fd291a301f6d9ee38ffb4489bed SHA512 6ce83204a89f4a5e47cd17cd284df9dad69e73e788ca7197cc4d8eb55be7c9f7e28aadee1dea730840a4d1fdaf9ecb85229dc9c73e9bb957abf5c81f01453576
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.22.2-k3s1.mod 499 BLAKE2B 705dd4f01a0b48d3b926a42fefe67a1f4453a658d153f00a57a5747e6cdf9ce25a017819a1efdd08706d23709033113e358f12953fb668586c9b0f2a2efd8385 SHA512 d00be60990b663032317a0262366bade8130aaa45d7537054884f54d0c70735bfe443877c16627b934f042bb3615ab9cce596b1ded5d4de7c68829e5cc1902b6
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.22.2-k3s1.zip 58789 BLAKE2B 5d4918fad825dd075afca654f70c38fcd553c0a39d95645ece1664956b9929f46c4760b0433e47903f55c52f8d9e16d00c5e579a0f37dc46ed701b9556509e47 SHA512 e11b458ba7361dcad54a8d952de4937d671f1fb1c06e5045e0acb744f3c01953c6cc1e0233dd0a9f5266e632ebbff2bead5bc0f257943d6ba0c6cca8182b06ad
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fpod-security-admission%2F@v%2Fv1.22.2-k3s1.mod 713 BLAKE2B 2736b9438aeacec6dca71c6948869106c1ad1b7aa4a8256bbca295ade7be1d1e185c8eed1ab6944a755b93a438a256d2c936ac98f12426dd27a57d1713a610ac SHA512 28e391989cd698476fc7f08a40dc1f1175db62e4aaa1736adfca23410ba92f0147d38f804b0cab122c381adaee332228d5e8505d9a6ced5b29c5c72f2129d730
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fpod-security-admission%2F@v%2Fv1.22.2-k3s1.zip 1601895 BLAKE2B bebfc511616d5752686343aba11becc0f59212d5e8002b4549c66cc3c4ccec57f6a5c73fc62280a43e2414c73e21c2ac3612fcd049a3c4b3c6670d836f597634 SHA512 7ddbae97da279affc0c3d9b4b58a6f28c103beecd96a223d9eafd308e9a3402a2247289b6996399f92f2ccaed0a5273a40243f4e3952839efbf50e24ad1e0841
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv1.19.15-k3s1.mod 701 BLAKE2B 7454a3a3c5d7c5238c648f7c4c5d85876dc9db9145fd97f1b8f105b86376486e74463caf8948c1e2e67f78edcb2a22a280f08b90d5b1a6bae561e70adaff7897 SHA512 e401b6a5087e3873fd62f13dc3601134c644e7b83bed7d7ec2e4882627a1676d707d0dd5e5e10775d0c343f54e9aabda280489d96cb829c12153ca0f5f99054c
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv1.20.11-k3s1.mod 701 BLAKE2B 744ff5c672dd1795658a0bb91d06a50208a8d5e237e831e7bffa81564d4360627c1d9a3682b3f5d1af4ecfa47a44ff5e5f2eceb56b17da87530a1a7752972ea0 SHA512 86fd9822e775576cb7d9f7a98005badefe1de2a0560b7ef48134d2eaeafda1eaeb12194da03a33e2c3bc85ce2e5601998c016b5e3d2023cb0f33e805d91bef8e
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv1.21.5-k3s1.mod 701 BLAKE2B 71304e81b1ae3f2b25bd1e5fb3d411b4f18da9d3dcd8d9d32e29badac09af63c8d5a5c9f96cf4331fcbfa50462e7e1a31f3964172083bb2e38c627d4c209f74b SHA512 5022366b2962f47b47634cb75fc413636a7cde9650b78f92fe4fcceab62d5239a0c8e2de00282cb8b4ae2feff2f678aa136a7c8dbaea01a323c70ffef6d46d85
+DIST github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv1.22.2-k3s1.mod 665 BLAKE2B b9e8b7152d2150aa5d10324c9b23d4feb1e4b36c1917397e77e4a802ed9c3d7e49998ee7448431f5c82184db99e7aef8adb550d7aac1fc015d00aba79b194e8f SHA512 fd324506a2ec1523e1227024af1769b6bccd2589d4303f19b0fb582550b30748200ad9623e2b8109d6a6bba1f50f13282cf8dc8d938cfe1d295752bb6d36e029
 DIST github.com%2Fk3s-io%2Fprotobuf%2F@v%2Fv1.4.3-k3s1.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
 DIST github.com%2Fk3s-io%2Fprotobuf%2F@v%2Fv1.4.3-k3s1.zip 207549 BLAKE2B e93181514292a848511000d36d587f8bc52ee9c0cdcc8e82bcb7c8be8b8393c434867fe620dcfdca0f3308a6251cc4f46ca2cde178f82170b1add05901598d69 SHA512 87e6e54caa04d29c0ff721a9fd447de48a7c1fd83754ede8f28e501b1268e37db88061074c02184dbe35bd815ed695ace5c7eb9ea42204fe327f5f47e2d522d1
 DIST github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.mod 45 BLAKE2B e071beae9a17798a9d03db9a8683db282536a4fd999d9d0715eee723ba995955cf1c4f364631b58fadf446d6d9818d02aa69298d55d339eb38533c096c83960d SHA512 703d71ec5ec222e1c475dbe132870d5aab5061f00ff69604f73fda9a66934fcd7e7f14df52c4ced59580cc8240a83d99709c746f5c833c33913e18a172220bad
@@ -990,9 +1110,13 @@ DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod 107 BLAKE2B cd132ab287312d1ae53abd542a75e6bdd5cecdcd46c5311be91da88d54e1a114019440b12d71a9357851585672f440dc66eaf359a99b7682ce1bd4ee03869325 SHA512 302828b5c2b6eec77f4a2ed075cd8b721da8d62a8747883d4382d5674a7c82dcea01a7de664d15d5eeba7e35b9667347dceae9b4ec93858ed3acf8adee692967
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
-DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.zip 18981 BLAKE2B c940bf7f20236ef2b770dc683b5bd5525bc1413c86ae63dd328b2ab1aec7a319d5201733cc832b31185027e27739a6dcd5277d76856f1f95197b3b7797a23bf1 SHA512 9eba5f95e6c5d29b2928708ed91b1cd5a023f0b7053b5529095112a2190d097ba26be7f63b7719f7ee2ed29e698bfe7c4dfa0b33f60b4e475fd1d420453fe7e2
-DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.7.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
-DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.7.zip 17534766 BLAKE2B 9449a00a40cad1a8926576d04ab3da6fb68aef403d207f22878ed8ef42c3e35e5b66fa1bce5ca674eed715a218e637d9b3b2721f1234d076f11fce719f8874df SHA512 4fb82bf9208a83e0a1ac5d9fefc76a4f4c93b46acf6a3eb92b8280c2401a590747542d7af29828919bb3fbb1bab9679d94978aa3d900af7899fdf1bec81c9e8f
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.13.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.13.zip 17544576 BLAKE2B 669681d9593478129116fe4289f574065d07785c1b1bf1ecd66175a630854ea6e551a763035fb70f3f456e2b80e6315a8681ff7a6f46ac8d81cac3de500f9e10 SHA512 4cebb9debd9c07c51d7636c083abc8c3947b291c1c5356632bf43e02d17107511d4ba8cdbb147f1d2c2923165c96c12537206eb8ca25d46da965b51cb38d2475
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.3.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.2.mod 99 BLAKE2B a790a0286893e5d0584fc25403bcd8844f321921992fc719399e34291f7e2f2155dff5202c7407eb5318713e580773208fc414404c86b6daaf8a94f6e3a71575 SHA512 40bef039d92b3a13a5759f1374a7348afa3ce43e1855494c765bf7c4905a22bc6a9abc6bf7b0e8de693f525189416e50eabed20422e07c9809d55d5b43e3df91
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.2.zip 15435518 BLAKE2B ac317e36f17db299bc02c59be373cc11dcb528b0365ce2ea389411323b2f677015c62a26d30a53323fe5e5b92a19c5ec707dea4ec5355d9e325a4cf112c7b54f SHA512 ea969e3eb563a1a729d44341f263cc4f1223e71c6343b8dd3058094c86cb8f590d888cb50aba38a37252aaf3876f4cc3974b1f04a76bc8982e5a24dac611c340
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.13.5.mod 46 BLAKE2B 97cd2e64d41bcc24a2f5b5c52fd150cad9d7d7758e910216bdff8bc764c3b84d7a07ec3d22113991ec9981c69688d7727eff66c8b5ed0ec8282287cb1ee2042a SHA512 169f465555b08e51a41783d4e2740c09d1a19b146b3ff99a8ca32b008569adedf6515b3f6d94aca6e11e98c0dd47ff561926daf2ba5f5d24dcba3407eda6aefc
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.13.5.zip 15563802 BLAKE2B 090c0f6c120411d42e74c82d12b696570bbc4cc8b5bb0769e182b61d624df4c00ca42dc621ee9f406d98d27b41e9cb0e09c790eb78c3748a9a0521dc62878212 SHA512 843cc84977a099438e933d9b5c6c5868fecb401dc8714c8b03dc69ec6aa1f56afe609c1afa0a23fac65d2914cf573d96e21f122788f81d4b713aa34999053f57
 DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
 DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
 DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod 43 BLAKE2B 99324dc9b41ccf0b0012c4732c49c84d206cda9529e4d1ee58bf47266f1eefcb64d227e7ad285dced69c61e5a5d41e84d768bdc45a2a59df6bdb2b953299e6ad SHA512 e5b3325e43c7308becf2c0fffbf969d26624dd1f5a81ac47f91bfcc6adfa5d14f29f32d97cb53814e11a09512da3a0053deed3d0e8dfa3fa21d7ec180a84b0d9
@@ -1001,16 +1125,11 @@ DIST github.com%2Fknative%2Fbuild%2F@v%2Fv0.6.0.mod 32 BLAKE2B ef50f8cd68a875c83
 DIST github.com%2Fknative%2Fpkg%2F@v%2Fv0.0.0-20190514205332-5e4512dcb2ca.mod 30 BLAKE2B 40564fc7c27d0388afefd67491a1976839b3613b456af440bf09d3e52e5a6c772a2a7f182b87af6bef6463038cdfab57384f6831a25cb34e30363c6fdcc7a0e8 SHA512 68ce532527fac2f8bd80517d1df7ae9c160f5fdc2cf79dec3173caa2999bdbee56847fe28346a8134d327925272514e5ff54e8f917da2b490d44a73ca4a458f6
 DIST github.com%2Fknative%2Fserving%2F@v%2Fv0.6.1.mod 34 BLAKE2B 7b4f76743f303fe9ab0d4c179abdef2c1fa52bf5ed48a2245b38d3258a0bc2de5eff10763efee936aae68043bdb2afd45bd3431cda555ff1e708be24ab217906 SHA512 cb7543a9bea8469a8e61a3547adf35a7dfd07765003c84f224982f785cc689c01070953b05fd4db6ff0224160e6fbf63ae94faa4d92595c1dbc9c41dd3513fa9
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
-DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip 3567 BLAKE2B 80b7bf217df9367160180d44c1fab6a9f10154bb9a6455538860158a08c5bf8c794fff973b899b1376e4e65764a9aa0d6b8b162a6d9ebe1adb1368b9a2a42786 SHA512 27910ae03fc9fbf573ac31454635c43bfd771d2a91325eca544f7be0e24b43c2798ed8e74b4c31e8c20c1a9cd266b835017aea3a3e24c2ecb43a14a6143af8e1
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
-DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip 3968 BLAKE2B 223cfe3604cb674a11d4558b8f5a35e2eb41cf11d536e2e2cbdccd6a3c6bed8abf66f450774b39e7247493ea8a382906617c5f297fda02a272b18eef8dcbcf47 SHA512 16c4bf83b78541d2d684113926813ce4cc91f3f13f34dc2cf8d643661dc9f21a988b8382d2c058e138fc87c1ca197e8f694b07595959e917c82bd6ca9101a5ec
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
-DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip 3966 BLAKE2B b638ca22c4f9df8cce5b84837e4f72b009c1ead300c08807b8268d26f04d6cc5476d9af56f676d8f4ac046c78c333614670e0853bee13de3439b5d89b96bfbb0 SHA512 ff98f8c05d8e23fca69ee5ed780e728f9d1779ab55cecd16bff890a91d14af81ae7a0304f34b3e04fbcbbb61e3c97c044dd9c190bd8359f3b19bdd31f8a37329
 DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
-DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
-DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip 11508 BLAKE2B 609b34f41f3c1579ae15bbdd5f9632dd58e9082917acce355ffc5402c33ea45bb0bda32d009a0a58c6cd60327aa87008453e0c4c36ed2a1be41c4f5337de72d9 SHA512 0f792e6f960b0cb8f9a30c25d3a3f30e7c459a05d7f03f68c98cb581967fc48b377314cb83b990c9509cde5680389bee0ce2b0b1efedbceb5592f38a9ae6a3ec
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
@@ -1020,23 +1139,23 @@ DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3d
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0
 DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod 37 BLAKE2B 0ff43371511295cc3819b33c0dc26e3d9352a4b931ad3dabdf79561e5ee077ddfdaf5a601827246c0b5cd8992d53d47ef74aab0b7deac6d08ef5f60f44a728ff SHA512 60a202487e693d925ec13186a89ca6b7f322cf53b2bb3d8657d50a0fa0561ef9f2d8416901478fa9783b7a44774511486fcc8735b1d15b558f7ce111f53d5a27
+DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.zip 23150 BLAKE2B 2fc19beafda9932e04610567453293fa89470f7510f1a5ba15f11bfad72d21727b5b49327589047fba1dc37b290b556c6a5b3b1f6705f1f88bb0d00a24365482 SHA512 c9261d31ebe9504965d774e193a9ff146b0f628fc108a4bc52e1684ae1ad6e8008c080c4776943c8c3e8ed3ba94c9e3a8daa23c830643015e9ab9cc2805af97a
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.10.2.mod 34 BLAKE2B 1f70e2e8670ecb572e36b3697429bbe82bb3372aa977eb116270674c689b66d2195dff69887c8555bd886a67a07bf1bf5d43c2eeca0bbc51b6613183378eabef SHA512 f0f38407ddaf1cddb83a07d7435e78dc4bd789761325b68d689a6e571e8d28ae352717a7aebabf4b63918fac9fb792f6b7ecb0db4898b563706e1fad9c30e13a
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.10.2.zip 120769 BLAKE2B 967ee73edd109274a37e6cc72d70ae3abee3b7f6440364a231adba5f723e05a9403fe652518a81287ad2b638f283c91d5b3053a776b17d2936a71b0d57bc4df2 SHA512 f4bad29787117c2b2cdef794f6aa32b39ecde4e6db6c0fa7f45f06218e55fe4a3f4990c4e771f26e37f6e104019b8c3cf4dfbcb9cedee0798f99e6665ddca9bb
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.mod 34 BLAKE2B 1f70e2e8670ecb572e36b3697429bbe82bb3372aa977eb116270674c689b66d2195dff69887c8555bd886a67a07bf1bf5d43c2eeca0bbc51b6613183378eabef SHA512 f0f38407ddaf1cddb83a07d7435e78dc4bd789761325b68d689a6e571e8d28ae352717a7aebabf4b63918fac9fb792f6b7ecb0db4898b563706e1fad9c30e13a
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.8.0.zip 118447 BLAKE2B 35bf2178c21f6b65693863db7160f4e2392b3525ca9d51db07c64eb026e736cc346009cf8b9b9a0415386c7792833ffe3715ce9658a2e0bdcff8162b7ace7829 SHA512 d01f415ee9e59e1e9b9d8d55a4f79b508aa871ea1106686defab608b6f2c76223e0b85bf7aef3b098b12cf66de89be5767180789691c1abe17680defedf408f4
 DIST github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.mod 45 BLAKE2B 694a8e11e9049086a55e8072e2bbb5f40d662e5d81b5edac84c9f8b763e47cd241a771fae16db9c246156be7cad7dbab75f7d9e211c2520f61a1e535991cdbd0 SHA512 6ddfd83d7d8c13466f4164f7c2e098d61b0ca22e0ba7c7250f85c79cb68df41ee4f2d2ed3a0030483b1e6bb11b5bfa66474c65ec68579cb037690f31fb6d0243
-DIST github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.zip 205783 BLAKE2B da81053703853802c117fc08f93e9deffe6948c0fb9564abb98b08bf17e631920812e19e877bdb4c78e620b84504c4502660a5424fbe325b6e922fac53c340c0 SHA512 083b41b21e928e2ae5e0b2a1e22d5e92c745956b9d97b6aa82fea81927c5d88d47c4f41a1b572d17a390687587754b95caec6db30481791b068d712ecdc55837
 DIST github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod 36 BLAKE2B 16dded88c0f04a1444be329ce01bc4e336b1205b962021589dd7f8d999285da6517a4a332f585e129250cbf7387157e713f0a6703dc0b316c4581e7782dc199f SHA512 7c71255a224e45b30037823ae51ac2805b91238b6e9e5cfe295d822428af95760718e2c955f15ad672011d317516657a568b412dc2e184f068d1bc18c2eaca47
 DIST github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip 14370 BLAKE2B f420806544c85e8956e5588873c10e604c75f6a830510a1e163fc278ce802de4b444a15b01522249749abd4ae77510cee97eb7f4e391e22c9f4469bc705a97e7 SHA512 b535bf7bba884b24e7a97c82b12a48954a4b5b7510c3383d37bdee5963457d3122ed648f91432f9259e6606927fc2e9fedd56902ec20223c8478c2a0650b3b8c
 DIST github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod 35 BLAKE2B 9177d5e73b349b57f364f3bd14e835a38cb33ae37d914454aafca908004c23c3902eebd21e9841f93b9728dc40d061a78aaca599e1edc1df0c941fdc1e972791 SHA512 f91dfedfb737f905f20c50323be91dc990ef172727da91efea0fbf25de48f1f4fa8e288032ecd89af0fea177b905be7986ebd1cdc7e64853fe7fbcef8fee436f
 DIST github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.zip 4250 BLAKE2B 484503f721dba9b17548c3f6deec7f392e1273e8cc817da885955b2e98a56c2d075ff6c2e4dc340edd4b241d27ce2104607543cf51a83846d0899c382deb032a SHA512 716663149e49b2ac5aa75c4cae45942db1f34b2b42c5a22ed317a78db0f0bd9d4e00c1272ecf1d89d07ae77f7abc0e5b3dc9e0cb268751f93c2edd4f19832657
 DIST github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.mod 31 BLAKE2B cb93818128243477b843ee4363e3cf7230df8ab9ba91dad64f17140ed0f87ae9d18e825a375c2afb17f93ca1b7f9242aff3303cead79b28c2eac6a4c61cef79d SHA512 b1f9cd1b5f1d2af2937a3a6cf94506800b5d8b06177b6690dfcaf908b835e76a77b20adca81c81d9ba90665ee338f870603caeadbdad9338a914465f2f0b1fac
-DIST github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.zip 7854 BLAKE2B a102dd77c158f18d319f0c295a0e68dd7f6a89c39fb4326d2beee9b333debec7d36c44e0004ecde95f9f6569e71c0ab171d502b0e6170d23f55f3e7da54acfec SHA512 ea3ae8c0572d7335e6b4595d5945689d23b85928b9129815d1a3469acbcf3504a690553577a5ea00289c8845091bb581a4af459d56d3c712efcd78057a3d3318
 DIST github.com%2Flucas-clemente%2Faes12%2F@v%2Fv0.0.0-20171027163421-cd47fb39b79f.mod 39 BLAKE2B 07249ccccd0beca4bbf154afe82f9d9aceaf8de0ab108e4b5fe70b4b7278fa46d508ededb43186f08d4765dda4c5ec284e5185639538b1a1af517b8b2ec134b8 SHA512 96872af243d5c2c1509cd28cf15e7ec8626cf526d422318d160114526d25fa20a49f2430c62d4ff29646c7115078c86cb9663bb81ce64f99b5c6be4fdc57484b
 DIST github.com%2Flucas-clemente%2Fquic-clients%2F@v%2Fv0.1.0.mod 55 BLAKE2B 2cdde5cc70b28c8888c9fcf680f5a0c337a34ef311e82dfd9321e5bc52a386ec952b1ef0e12b089a3112baba7744bac334a256ff4b37f8db97222a504062a32c SHA512 fb61bf01ac03b06d330a06d6386e48eddecee52b3d8801916077a541655403df558881f16da04acc75004cd18c98ef3c5d29482b6ccf78859febc6ec1937275a
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.10.2.mod 698 BLAKE2B e549ea40544f5c3bbcae0e2ad539b3372436419824857fd933671da67060ef1821e8f0c2b82cc9f144d9c3bab34dad8bf32b61bee5934712965b19d6d2a424bc SHA512 6c9b8edbb34638c032c635735aa772f9c5d730a05946a05497128e38b2a900e9c47b68d5d17a3e047a94321e72990ab662027bc65af48f94ba3af23904034428
 DIST github.com%2Flucas-clemente%2Fquic-go-certificates%2F@v%2Fv0.0.0-20160823095156-d2f86524cced.mod 54 BLAKE2B f70b125bc544cb6d6c58801f2e8591a0ca93ec043528574fd816956889bf87e90b608f5eaa8037503211d163d27a9414cf1247384e89258baf35c2d991a62c7a SHA512 5d128c0c307055962f604b6f6a963167909941da8871f06b8e1551efcaeb72ff44f6538d6434bea546417df6b850cdc1e48dd051d04b06df9a164322cfccefad
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
-DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip 39235 BLAKE2B 29ca5b93a76a4547abfb2c237f832e7545f8b6f74c842644ed3d9f8f56ce6d388eda0c62162d9338dddb827dd09962e1d28ab551461f07fc0801899d6035b8af SHA512 b5d30c117750cd3fc87121787792c3575d53404b66e8095d1d6913488b0271c8372b0e17001ea320b5512987ad68e78479664a40c25f07e9f783fd54f7d562c7
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
@@ -1044,30 +1163,31 @@ DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mo
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod 43 BLAKE2B 52ec55a10810ebe4083ca01c7a10daec67e5e9e370d24ae3a0140ab40801bd9b18fd09cee4f306c891b60c83049497bfc69ebc12420663fb5f6b39426002d759 SHA512 0b54c4dc34e54f09c3d9d4b63a4d6a22736250aa3caf1526220c11473f4bfb5b589fc1fe4cfd9d59d1a7c2f8cb60b3407353d41f9b31389200a96939cb95d925
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.zip 68804 BLAKE2B 1949c9647b1c50741905b2634f5798f57e666df93a6a588b36dc567c4370e5dcc8b6a281780f178de7b6d9e1bcaafda46844605d7cc53c2f3cdee7ed9e6720f8 SHA512 804570fa87fb574d4942c649c00941da987498834951b5fc6bca367f3c17fcddb714656a178daa46ad88087caf97243a6d2c6d1b3392b36f4c72b2b1d2f25b7a
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.mod 87 BLAKE2B e7fdaaee7d16d457c5ff45af261e8dcd7568a105658dd9dbdb61bd62dea3d63456f9e0e7be2bedeefebcce910d9c0734416ea4bbc2a0bbb0e43344aadb8917cc SHA512 b27ca99790b63631bff904271ec74c9d641e05e16455679904b85dbd1800a67c4439cb5ee3da89c40ee51acf8151141881fa7e704d451ea6ee8e62aac84b0ec0
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.zip 84387 BLAKE2B bf57eb15f428e44e24525c817738460e2473a94d9c4184f74427492f3cc65fd14b3b8c90c08669868d853115a7a44b123cc31267fa4a4dfaf2133cda1099c341 SHA512 eeecc4714e4ca23cb41b01660043caaf9f76ff0beacb99d03372506d19ea97721aa627743040639998421099413498cb5c7b613b7edde39c8e00940f664ade2a
 DIST github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.1.mod 126 BLAKE2B 54684aab4787776885bac06e7d05060fcefefa23e739a6c3c46588f1153808d45f2afe5843640ee083a59c134e10e212b90fa2910ba4949689cb38caba5e615e SHA512 38adb18d796530ea1384762053fe1668473fd00909a9eabf8cfb7384b9ff4cf9b843bb30f53b156047f1c39854d64a84163d507c96b35c1d8d950c781a7511fc
 DIST github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod 30 BLAKE2B 672d0e9f9aaf18bd8da762725652827a96008d49cf50ac4c7a9776d884b15dd92a7738f49ce870b53c9136976487ea8b64a31f9b689615e16327b76a22ae605a SHA512 65984a32ddd3eea6fe699c2e636cc2368a11059756fd1f711ecb20930ac5a9bdabae5735e9d4ef829bc4312219bde9f2907dfc7864dc53c2a580fca3f8b7b39c
 DIST github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.2.3.mod 169 BLAKE2B 2c00778603b181f9f14744bed2bbe1927e8f51a3ecbb49d7bbcf7b51fd5ad32756188708203e4319b9797c45a2488602ded332e56916b2b2d91bbb75d57920cb SHA512 f09ad6d4d7b4e53f69ad31b50c934a3534f68887c1b345a41bbb356579f217c2fdb482dd305214452e201b924e5d775a81ab3e91de120fee3119616a31a59da5
 DIST github.com%2Fmattbaird%2Fjsonpatch%2F@v%2Fv0.0.0-20171005235357-81af80346b1a.mod 38 BLAKE2B 60832ea142531d3e2aaade3f327794938aaed8b573646b08c79a12c2765d1bb19290b6e524c8da8685a6893c8efb8a94a66b5a28d86d959de6233b9cca82e40a SHA512 46248cf15a2e9ef71181019b93d49906f227c33edab0870f28c6cca7980e8c4f30b3fc26c2f0209160f3fc426e216434c92f681a0db8928b8d39e6f2713ef257
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip 10606 BLAKE2B d9aed996970ecc4828716e86ddbc85a7949f60ceacc7326708ce499bfc09250bc8ee336806b229a44064839e7ce34f5cb2a7607da5e82c417a737ea869f97f03 SHA512 dd1763a8d04540b3e579d397fa4888c4bd8c00c3963cfcd1fe42af7c1990ef85f9a2e2fd5c5f2c7d3e6817448df5e2237241ff5a2cda651b061cc8932e0afdca
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip 7026 BLAKE2B 3cebbd0bdebcd1d32b7fc618b7190b7813876a1df010d1c3ca3800c41acd64b6537e4b3e4d4a574e3eb736822a27eda7bb2fffa197063baf9a347a820573883f SHA512 829b0596279218a2fad36695fa42036f265ce79903a0f5aad27495dfc7c6a33e8bad32010e59f4dc6853f1e38fd9e9f635ca2f56adaf5ea47e4914f2a892d251
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.zip 24025 BLAKE2B e814fb5f02c39b111715c1b39b66cd720c03ce5011c2534f6255eb2b6fe9d6666eae2003431e8c23438f0af500b6b738ee71c715a4f4abe49df63d2e81d75fd9 SHA512 02d32d992b0fdf082ee703e36f2d3a82c2e8c1e260db4f2ea83b9f73f44f8486187aae2190d4d8c506426a2b81a5468e0482cae946ad488d26d7d9f6becf9e92
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
 DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod 38 BLAKE2B ddc3076fa3a93a287dcc66d087fcfa08483a03baeccc6fcfdca7c390908cd0b83017754103a78f6977c929d24868a9ce78859bf9e270fd84b5fb38ef8f939f9c SHA512 79ad90998c2a3e01501014598c152d4d08a92d354678b5e395c4a16ded8519f12e4ea883485ef49f07e240c52e075c7f9a07a410eaa9a1aca3657cfbfe4b6368
-DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.zip 4770 BLAKE2B 942414d29a4ed18f2a99f05de430d1f35fa946c5d48c0cb745427c210dd3f30a65c9b7d7c3dab344a2f7914f6ad0e98e47d07173155829c92266dddb1a22695c SHA512 45fbd1eba329ea142e4f4030465bb7a6593261286e2bf5343c95860f2a5bb1623380570e407a33a5b342be21a0e6a2e1dad774d3c94765e323af327146216d56
 DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.4.mod 44 BLAKE2B 1589d473d7d8dd651610eeb2771cbaf667c65d2bc445cb9a114b972c21855c31cd323f39f96115cb622d57111685d9cb3deb7d8817d6383da3e26a8df36e2277 SHA512 e5f95d50299fe85ce00ad24e01580bcf8c82473fb49b5d1c0f40f027e36264d226c7de9d88568eb954908e55f643a37a5a93ca538827631637c71a0a032add95
 DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.4.zip 2419474 BLAKE2B 0d39bce4e98baf66792c9702f504cc3028b97788641dd7efe79605fdb417c074ada49369565a47de3a1be855a7d59aef5806b97513c5ac71f05f65d8dacf4877 SHA512 b5bd041ecebafc4283de3fef2e799859f40fd435d45d53ad42c2ea73f2ebe88a0b0baf8668b611c4ea4cc91b79ba8eeb57569318f9ba3981dc7a1bdf1b1a40c5
+DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.8.mod 44 BLAKE2B 3a67fafe0b1e32665bd4e897602283e68e7b2afe2d89cb772a19f02feb8543731b4a3a902ac975b0cc4f5315baa332256bac3e10919d6e82bffa01e17225d987 SHA512 e7572c4b152f83a58c81e374c109eb5b80514c63d9f02f7adc2bc23e8bc81dfaefe6f1ed079b65ecbebbe118a3423c2124f0b619378b8b237ff0a6cc687e1952
+DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.8.zip 2472072 BLAKE2B 1473b608c81e07c5c5654bbd940ce89c835739e56aa96be6566146de4b871c0cfc6af91ea79964463fa6733bfde36c98292fe4f8052bb99b1f9b87d0541b37e3 SHA512 9faef1c40f9aae8896e29edd851aab1499252fa36c864220cd938a137f0f7e369ac130185f2abce22ea4c837e35c58b3121524681e03b6833b7eaf91b80bffb8
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
-DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod 178 BLAKE2B ad9b4e7186954eb025beefa7c1d622146e2329ec6d9483da5f6066488a2422c28bc54071bc28bfc50b916a5cb9f07549bdf09bcfc4e1edc78234b84900638a91 SHA512 e830b9801e4d9645c55dbec3750189c4070d7125dd2aa7332c58e9307917a869bd432cc628680d2e9e88ce646eea9c63ba2f8aa85c53b20bfd3758c5217f5fd9
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip 46423 BLAKE2B ece8bcfeaa56e6d038bafb4986733763fffff1a29e232b0b86513a0ed00416221d7b31352bff01a711cf8952687bf9fe3a4e51024e6d8bba04f4defa457bbb4e SHA512 87ef30626fc29616a17023a2c9303e1e55cc9ab98b58444119717d97641d92fea8bca0fa6a64131fc4c01c4f9a1f293571a54b76f2b938be4518378ff4b73342
+DIST github.com%2Fmaxbrunsfeld%2Fcounterfeiter%2Fv6%2F@v%2Fv6.2.2.mod 641 BLAKE2B 6665ac44958305ee1c0ca00235fe5215eb6db9cddea473c6f145e6c22f9282fc328de0f094aa8ac7e54235df27d41446a6111477308cef70f70ce220f1dc1ddd SHA512 f236fb50f69baa342d8ee88f40a9a74324beedf8d3b1b310c0259b194d35c360aff3e43fedb3b17c8feb31f85e3b0ff2ffc65f31ac4cdad08ac154d968d4ead1
 DIST github.com%2Fmdlayher%2Fethernet%2F@v%2Fv0.0.0-20190606142754-0394541c37b7.mod 293 BLAKE2B 5f61954d8488ea7636d31c7f139e604d78774546bf5668f4b7466c250bc6397b36db8d0ead8c0ca9eebb6b8b548a6e967c18a5235f1066ec6a6c7d237a4a6d2c SHA512 cdca21047fb14be4646478109afc34ac6bbcff4387ae7342cd9422d0ab3025318d2b9977cc3739584adc781a01fc99dca4364ca294bb48fe7198d57497eb235f
 DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod 196 BLAKE2B 69661cd95029a767e20e49762a593633d3acd11e44b489bedc3f52c0a997826b5a07e9706b74edfebcf3aa94706836ee6362edcd32a9a7b6ff33dbb01ab0c1df SHA512 edb2c00f2879dfedf8116e6f21f8358ad89750e1b26ab25db625c55fcfbeface38b523c72e376bd7a5eee333d33e883cbf7ed26d07b4b3a567a162283d9aa006
 DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod 264 BLAKE2B afcb7c0ee7467a383178aed08ff780382ee1efbda1101cd944cba4dd653974153654b3ff38943fb7d6ecece515997384e8eb6f9be2aaceaa4b09bec6fbfddfe7 SHA512 e59cba812a94c451a95be9347f148f0341d0803f32f5f387f6b9dafc96bd4072b035e6fc504235554585338ef448304fcefbc50b1b345d80b27f1cc1b2b571b2
@@ -1082,6 +1202,8 @@ DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.35.mod 333 BLAKE2B 8d0eee290f65ec90aa7
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.35.zip 234123 BLAKE2B d287872e0fec17c5a9639bb4e1eae9f1d7e15bd319cd8e50c784e935a19a079879b4c05a6306345f27aa81a49b134d23c796974b47d89cc712255d5e29933795 SHA512 bbc4ab20114482359ee6449f07a65971bf0f55b262b68c3bc2a22a6b4c299aa44db815f8ce5434d24761593a13fa59e1520e76b5684254212c82e78b69d28e13
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.4.zip 204894 BLAKE2B ddbeb3fd06beb22a0f700354da94c48d26eef81040bf09ea6a56d1f80deb38d510fc5e53ffec5184effe47e6be99bcc58585d8908f9b3ffa5653e8b4d25bcbbf SHA512 4bd2cf57f6d5b9ad9476320bd9391494e9ab1e69da141e00051e54892b9cbc8f7fc8bcf7c3f869371f588d4187a81cbc31bdec60202fd262bce31f50dcdba914
+DIST github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.mod 40 BLAKE2B 48753014b177fb672fb4b96c34fda82fd83e7cc16c40ccf8409628f3b41f24fcc34fb0601ac8cb7869558c7d7ee97f6f1b8e6f587d696222db2f482790a628b2 SHA512 571622dd3240dc43d9119a5cbf644cebbabf134314c46ed43438be1568c871617949d07c60b8af3d22f858f7504ab91effc9bf234de84da1fbf72a936aebdbff
+DIST github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.zip 69201 BLAKE2B fc0af8735511f218b986260e9c74b482c5f93838b7a9811e35cf4c01e4a8a8ab79a48929c48b7642438800e67b42eb500e08894111b6af407da9cc9237ea1ba3 SHA512 3e15e1e0197d1bd6624edd4bffbe0c9d203ab972d168475420695d82224142864827909862c436d755c0b0028797d2df601e7953f12bd1fb5dab8c333c30e5ed
 DIST github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.mod 36 BLAKE2B 18ec4ace4de7c41e3147a0c0b1e2fd044434216707275d2a3db0da6f072f6d45f3c5a451050d4881cd0a684ec2ee12c975d94bbbab68865453b08339bd4169d5 SHA512 ade92d48e56c72c2260143b7d9e00437e55cf825a2d5cd3240fece4e1c01c77a97d7b2b5db4227112bf656b402b91be3cfe4d8890ab9b6873e2e828da1615d50
 DIST github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.zip 60421 BLAKE2B 4bdcf5bc8127af87eb60f981948527dc179a37e6861f17b31ccfdc7992a7f7c24d8005273cc1577d7e48c92fe67d3e11670e88dc90abd0097de28fb3d8c40bae SHA512 97ffd225c5fbfa53aef12e4d7b25788098d07d96230834d8707aa9446d99c40ca092e5fa59790b5cdf1c2ad81edc19a946730390c0616653c8cb9cb604106d4d
 DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod 90 BLAKE2B e375688bb7c11de48d29d17c72a3e7675fd36d4c214bc39acd6d73386b007b51c34ff050b1b6ebf251f1f1cb98ce0022246ce7280a91f14d2136ee3e226f05c4 SHA512 aa292d2eb3045fa595c28c69fa87c329e6bfe29f2e88d5424b28a5b6270a869cc8455a88a6c076cdc5e6c76e36dd7d2d820ea7a8f3995c0af6374ab5c02ec735
@@ -1108,12 +1230,13 @@ DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip 25943 BLAKE2B 9cf08
 DIST github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod 34 BLAKE2B 420449db437a4343e47d666ed912d5c57298ec80d13265f293c3a2294624cdbbce9fa319e47ee530da73bdc06d48d80b4a590a03fa1d741f089ab302cadf071d SHA512 ded99f470ac6900d2627d6cefffc4adcd64946cc036657a805f90145aa83fe05478df9eb994059cd8d9613c75f3009221ab0405bcf7e14b00d5d950e09f3e354
 DIST github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.mod 308 BLAKE2B 019608b9a858fbd2a019918664d9ac1d9cefcf1164bd08cb663a3dabf4d806f4d848fc1deea6db65f919efb1c82ff87979800d6ce9f77a0d54c53a4d4c136cdf SHA512 1baba04cbfe10d85dfd87b4d4795cfa77f68b92dc1f4672f9f46daedc75b840212ad8f0518633198eb78f52f09d921c0827ee6ba74ab12d30dbd1efc2e799ec2
 DIST github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.zip 21091 BLAKE2B 688b98a81f1d5036f2115426b1f1b208d4c7e86db8244fa72d7b1a15b98ecabb0fcd987a47cb584ebb615698f0ad94ed76287967d26738ba9e7ded15b841b72f SHA512 b16d51d3c928779564b8ac3392abd2ad9bdb219d9cf25dc60e0fe0827d32e0faa139e2e8c6cb5bcb8513910d3b964dbb344befdf821a4d6fc2b8ad915ccd028c
+DIST github.com%2Fmoby%2Flocker%2F@v%2Fv1.0.1.mod 39 BLAKE2B 38f071790c09766b9d2305e4e20d237e53ad13cbd25231bc1dce1f27e18a518cb1e2889e660c182517e048ffd239a6554e7a46b82da07672cc63aa09132a2f23 SHA512 98d305cc5a12b2f4e38456f04f009646e627b45bb41c297c72fe689d673f550fa443813f489d4dcc5faa91892920b3e8d5f76a8000bbe134be2ea186f68c74b4
+DIST github.com%2Fmoby%2Flocker%2F@v%2Fv1.0.1.zip 7754 BLAKE2B 910f13da2635be870e43d0fccce5d3a138852d257de307af2c9b8a93ef3d89b621a70ea1cc288580d6ce748ad63ae13d4fc7fd8170f73bd459a23de9f5215a48 SHA512 00bbe5fd9f02f2e546ced31827d3261c905d671b535123f0660dc67fa3e41f2878507b0272e7cc1164be2512bae9920c458936773aa1dc865b7436f8ea18529f
 DIST github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.mod 88 BLAKE2B 614c7f42b35dc5e75d13415e50625c4f1bcad6e9a5c0d48625b70596be0954f22f41f2b7cfa8127aca712127d4f97cd80115a72c54356f07047dadd61c864e0d SHA512 7c2bde82f5a4469dedad4190881dc1977fc6d0e2de9848b272a285069c9073288b8cbc2126ce3b38d3edea1f1ce92ce4f1d3248284d3f654e918e2237ef20e22
 DIST github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.zip 46265 BLAKE2B 4673306ab62ab17318de7cc0ebca963e721bf659b42e91dfd4f726b8255e7b1a953fff696a007bdce4fd9d6c55f7c8a70f623c6acf5fd55e7d87cd99274b2765 SHA512 07bceaae986ff05fe7af1ff63d20d21febc65d555aa1d7fe04d16dbd3493b922f60ab6eb361095fce90b3785d1ae4a73a65b08a1f418d5b411618f12e0912c8e
 DIST github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.1.3.mod 46 BLAKE2B fe25943c58a680d7d2027f8062aba749eee87d4ab21d8650b59f056881f1908a1356a1fc4a2a0e2967eb2bad747ed2cb55aa8f8a5a200b5556d2821ae522c60c SHA512 6042f5061e408f9dfc55bd2db830a2fc70a4d310028bc966184955d4e0d2a7f831347809d1a1f0f791d8e12c237cefed37fc59740089d9318103a3aafddde363
 DIST github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.1.3.zip 29291 BLAKE2B 1b0e083b98f47bfabeb99c6e655ecf8a1fcf4fcb7b4d41e51f3e57acb6c50d8f0df02ec2ab9bd11c553b162d4f500554dbfc95bffda0ad0b1c1dbe55acc851b8 SHA512 81504a250ff187d2f9fd36859760a86feb537106bef319c3d42107e2bc26bff6b4945bd2718491b73e1cd87ff02b24ef30bd66dc16c87775571eb0154cbdb282
 DIST github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.0.mod 107 BLAKE2B ab66968ee9263d9c9d1e1a85444ca0da86a5b0f263cdc51a4d4ae9d6398445b529ea4042e3d93560cade1321d0115c153950611f34a8075194ffaf19a7acc472 SHA512 55dc5a9ed85f4b355e9de88d26d76fe6d87aaf45f95574960d42af9d2c9e97c9685d5397faad9409e3384bb0a205b6546e40c303f127302cf9bea040466665e3
-DIST github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.0.zip 35818 BLAKE2B 31e5bc4ccdd40c623c75021eb28ddc539f3287f0fa68b550d74963875abb80d2bee550c0f9d61de7965e0e19f1e725091d553d38a73856b21687530fc2d8dd25 SHA512 b1847cc39bbe17bb4321be4f92b00807030f50da233ac47fc0de1e27738607bd7f3904879b27eaec029018136c7267d8fd11530bb191315d9056731518b8d150
 DIST github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.mod 107 BLAKE2B ab66968ee9263d9c9d1e1a85444ca0da86a5b0f263cdc51a4d4ae9d6398445b529ea4042e3d93560cade1321d0115c153950611f34a8075194ffaf19a7acc472 SHA512 55dc5a9ed85f4b355e9de88d26d76fe6d87aaf45f95574960d42af9d2c9e97c9685d5397faad9409e3384bb0a205b6546e40c303f127302cf9bea040466665e3
 DIST github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.zip 36737 BLAKE2B 3edd53bcc466182fde46b860033e34cbd5bebff97fa22fcdab0ac5808e796cf9947f921ee267fe0fa3befacd032d655ed771cea4b80f633a321044d08dfc78f4 SHA512 0926b976e8ea08cefa68658519450675ec50e9dbad8716c8e211812bc36830746a75a1a8dea5a8365fdd8d383cda115b066c7cc93abf613f14203ad398d66813
 DIST github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.mod 105 BLAKE2B 41a08600f3ac56f9fdd41ac16d9b662264da29ca65fb8008e76609dd33efb25c2e5f3b8c22b8a30255b86aed19291dec0401036707893bd4ce4ae213dc1f6762 SHA512 514dad44e0511ec48a367857dcafa6e899d1dddca56119463e0b411d5fc2a5184f79bfb1a26b871249dc76c52c58c0e42b5f748e2b44b6ecd9f2ce32a74d5a62
@@ -1122,6 +1245,8 @@ DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.mod 348
 DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20200312100748-672ec06f55cd.zip 23373 BLAKE2B 88c09582445122ca0b30be2b05631f79c7c96c86cae19ca503d95bcb7ad94485bcf35939d208407b5b1f48f81b837e15d9bc95ba71eeaf1e4bb0d89bada5ca08 SHA512 8e31b8842ff579a47d4d1d510663f75ea16ea39dc88722f1730e61fd12a04e0cdb0ec6a2782bc73de0e4613422d044d3c29a8dd56b0085f2a30c7487c30078ce
 DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.mod 298 BLAKE2B a0b5363a0969c283250c05505cb09191943d095ecd42fb8eef6694abc77ca4721aeaa5534a6c1b3a23224fa668ff206958a1900cb3dba36cec73f07c95598ac2 SHA512 3c9e90bf64ca3dc8d4e16c56e6ee0d1f41fc0bb1350ab6242d8f0908b01a90fa61e849a63e79ecb282ef0cb9f7593daf7307f922c92badc365822a1b9512f9fe
 DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.zip 22571 BLAKE2B 129cb205745d7f839899afff88380c24592f975867f5f5d0cb2d05479bbb1fd4168f8fed381575f3ac7a724d816ea69804886c0057eec05cb74a3869c4c406f8 SHA512 55e04111a7b17ea5d0b99dac9c0d30b0449021c94c0c314322f64d0884b6ddadf6703f244636113b601643006c3b1e2faddf1c70092dac1ca7a1614d60c0c38e
+DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20210610120745-9d4ed1856297.mod 298 BLAKE2B 7107b2edfbfbde5a8440144af74f624ca86b7963b771a0a3babec786baa939db3690c63315c50840c9dea2079474dec041c115d341f84c6f245a032566013143 SHA512 cb81729f1ddb7fbd1bcf53ebec25d1691b08b2525d58611759b2941665a24cd9148941b21d5b68e96e3727df19cfbee238e50c2d6c757c48fedac2ecda598048
+DIST github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20210610120745-9d4ed1856297.zip 22571 BLAKE2B 49fc6efc8d0d9105434b68efeb46593fd56fa378948f01151b4f0757df60a30c5372a51b2431ac0fd06e278e32687dd17361a826463a2cf82e753b0656676cd9 SHA512 c238f02cd238753760aefa3e6730ab4f146e74bbb0a9da86720875be29c6c53480d44927e21dc0b40bfe87399135439574777f45ccae8ad5ec073f36aa3ebb4e
 DIST github.com%2Fmoby%2Fvpnkit%2F@v%2Fv0.4.0.mod 30 BLAKE2B e9d34b8d09999397940ff0ccb1ca0925c3e3f0cdf55364314dc535920732ca8181828715240283d2eda8846183d018582988bb93b6d9fe5e128ef5f46c079e7c SHA512 946d58070f83448aa79ee6f594e8bc1bb013d4d92953b8c0079eec0ded5a0adefe95ed852d4d98ab46d2637faece15a7dfd7d48f2fa429b2586993d9f9078e9d
 DIST github.com%2Fmoby%2Fvpnkit%2F@v%2Fv0.5.0.mod 30 BLAKE2B e9d34b8d09999397940ff0ccb1ca0925c3e3f0cdf55364314dc535920732ca8181828715240283d2eda8846183d018582988bb93b6d9fe5e128ef5f46c079e7c SHA512 946d58070f83448aa79ee6f594e8bc1bb013d4d92953b8c0079eec0ded5a0adefe95ed852d4d98ab46d2637faece15a7dfd7d48f2fa429b2586993d9f9078e9d
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
@@ -1132,12 +1257,11 @@ DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742
 DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
 DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562
 DIST github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.mod 33 BLAKE2B e0ea5580f1072ea92da2932166e0e9b1aa9a68fb1f2a6d99d11f74369437431c205c2bc9282f54217f3518b828988ea398a26d7d0b0184d11c6bf7daf8d96775 SHA512 1a35c92a5df7744978b71fd312a0316cd1f6c3c26f4c83cbb61a382cb961590b6aafbb101855b5348596b33796d21f151c9b6db57b45d5056fa78c1946d0a946
-DIST github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.zip 10694 BLAKE2B 80384176b32cf637bb90b296f0c309b33a84ede6bbf5a3ee7eef0e10cd3bf0e4fcbf8ebd4bff7087261692a2006d17cd1ff358939ffa03496572e30ef1607cd3 SHA512 c1b3027261e70a9c0d818a07acf45461651fc3dc6def018a587d8143436102b97389fa1ab92b40261ca8025db5a40365dcf74d053e29e6a3c2c904ff89c99171
+DIST github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170929034955-c48cc78d4826.mod 33 BLAKE2B e0ea5580f1072ea92da2932166e0e9b1aa9a68fb1f2a6d99d11f74369437431c205c2bc9282f54217f3518b828988ea398a26d7d0b0184d11c6bf7daf8d96775 SHA512 1a35c92a5df7744978b71fd312a0316cd1f6c3c26f4c83cbb61a382cb961590b6aafbb101855b5348596b33796d21f151c9b6db57b45d5056fa78c1946d0a946
 DIST github.com%2Fmonochromegane%2Fgo-gitignore%2F@v%2Fv0.0.0-20200626010858-205db1a8cc00.mod 46 BLAKE2B ac31f6bf8ae67b6897f90e55301633f49dc640e6429a5203e6d8d0d82144f43f3b7981c7b9bdba90ccc51c9d2a921754c630dbe0baf6ce047b3d24e03590f215 SHA512 fe04759d750f917eb6319d570f2e4b62cbb41d25a5a5ebaba8566d6a1ba3559444b91faaa157c291f1690eb1efb323b393e8c46f9373ac3ae70b950d1cc76914
 DIST github.com%2Fmonochromegane%2Fgo-gitignore%2F@v%2Fv0.0.0-20200626010858-205db1a8cc00.zip 9064 BLAKE2B b093b12ed3f8651a7899cbc1ec21bc69d46140a35ebfc7b1b761e0763a45bded3a66b98e23cfd50975f8371e5565fc87a9cdd41c19c2f83e3aa4a67dc7c9b283 SHA512 564f019a25d27f6bac2c0c1f38f4a2ba8dfdabd90b46a25955e8a1b46e5632760f021830cdff16cb51faeac9c39b2f37af2284f75abcd1a22b5ec9a23035d1d7
 DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod 31 BLAKE2B 5b5d97cb4685ef921770276b81b0bab6f0acc362b49544e23c228fa4e26c3ff712b58e61815616fafc19233d3cfac47b05e9d55d926b2559137ad4e7d734e113 SHA512 f868673a9af26c1735e257c840e1f9f5de035ebdf3814f8568af504af6f3d94284e050f49e96670a5643804760db2ee8e50d396f6d6c1d17c94258695ef41748
 DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip 56868 BLAKE2B 7795586966a72a5107b680b7e5b051a516cc0aa60cd1519bf0dffaf264ca5fcc768544438aa1bff2a2c5a3a5bdd92507f921357d80e4033590afda4ebaf536ed SHA512 22d3534c0e6d6507671e02f1da00eaeb7245497b4ff626ae7967d6b2dd4c9675ec16ebd20d4eb16ce98aaf831e93d207bd7a3331e8ed7411e9ffc71c574dfe67
-DIST github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20171103030105-7d4729fb3618.mod 36 BLAKE2B 787cabe805d9f0e03a6271f517cb58f18796783b308a50becd1183382cbaeaed9d55f449a7dcfdb22c050859a7654dbf0131be32e36a3974e7bb49f4ed70a2d7 SHA512 61796004d8b6e98d8dff2423ea5bba89fbaa36ca91640957801a079c8202026945d6c3d1c37acd09a8e555d7c17ed03c3a8da4e2691f3046ad0d39fd4877c101
 DIST github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20200520151820-abd8a0e76976.mod 36 BLAKE2B 787cabe805d9f0e03a6271f517cb58f18796783b308a50becd1183382cbaeaed9d55f449a7dcfdb22c050859a7654dbf0131be32e36a3974e7bb49f4ed70a2d7 SHA512 61796004d8b6e98d8dff2423ea5bba89fbaa36ca91640957801a079c8202026945d6c3d1c37acd09a8e555d7c17ed03c3a8da4e2691f3046ad0d39fd4877c101
 DIST github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.0.0-20200520151820-abd8a0e76976.zip 8489 BLAKE2B 779af5e1d4718ac88d6f20b2dde1fc45f42e50b6ca475ab1eb2128554fc4e4643da77ab5f1edf0fb39d71f86bbe4a447797e7c0bbbae03c3b093ef551bc65f89 SHA512 84d37aaa003c8b7f8c8a9993d7dce027089d2be64f8034ee2b15087e2f2a2cf834b7ea6ee4953ffd0470a837ea3c31877ae22cdbcd90508aa534aa9f7ba84f1d
 DIST github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.mod 45 BLAKE2B fed20163d5104ebe6f0a3f9f6649147fcf20ec4b4c5f8cf88f685a0da5c3cf73fb12d2d1ad1f97519e649bab3bf821ffaf1a6d5d2e8990e462ad71a5f315d49e SHA512 f2da07362ab94b3c8d17afdea5720e330568f59d8cbf8a127e5c9407b9d70d83de64cbfb9176c2de612c185ed858d3ee42dd78830d42df974e93d0f8ee2e8341
@@ -1146,8 +1270,8 @@ DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.
 DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod 36 BLAKE2B 636b2a1011ff647b1597c535916bdde712e45585b9be3e90191d474e88e293df5b30e2e15adbd2f6d631a57ac81b59b02055b439390664fbc8a8e224cfc51e39 SHA512 7873fe200c30b46285fa8a001345428db580c67cf634c1b1e4aef6a4a82d7b975545b827d00b1a3dad86b2f3f7681df739915f95144d4d3a3553f055fa70781a
 DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.zip 5674 BLAKE2B 27225d8588d521fd436ea2eadca1181fa342f54afb4db95f063aa80f409db52ea2eebb0e444928a4bacfaf34165ae38a625b58b8716722685eba095ff470ed82 SHA512 4e068235cd96fbb88fb3033143d468d429d6df8bea29ed197551031b6ffec4f2151f6d1b8b42db5ea1698ee835e6897055e69ccf5d088742b214a6f71f661219
 DIST github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.mod 30 BLAKE2B 7fb5410d75cd091a009b995b47410e8441a7dff49dfd7e65b67985213070062991cdb598cb32d3b7ce3e4662b97cf892be89468a07ce344f2032e0fd34c8523a SHA512 38f9286cfe50682f6b466377b05271bb53db493d1b3626bc3567970b5f948b439c8c46f2e9be88b199bc3a7c600553f1200c913ab548fdf74c7c6e8cddb1dc9e
-DIST github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.zip 24172 BLAKE2B aff2a1fe30f450b0393340f9dcb04d31ce047e49e9ebf515a2220f21ca8615f0b42888c37f2a384e1c7437e62002545a5ed23bfcd8e17598f8b017aee8770e0f SHA512 d997c24865b27b47ab42b95be5d965a986a29b60aba5070a882978c213fec27710428326ca104ff05f8ba8aaa41751d195ed4ecf210a53811f919d4b3752374b
 DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
 DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod 34 BLAKE2B 315fe4d5620c1d1c92df3fd382560ac2cf164aa17a741c1a74fc25807819de811705467227923fee7f804c6b6e96606c87b4adb11a6b722f367b543c2792cda0 SHA512 b1c163d7a6a139eeee1457fa07933f01eaf6d2ff24d10385e75f87b443a95fe1b08e9e144d3c18eb6a77d34e8521cc6dbd486fefe908e60452c5a80f654c551a
 DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip 8705 BLAKE2B 905de677e6b1baf15fab1e19177c6f45f7b84aaa1e6426f8aa1c9c77d81b491d4c334ec542d45729e380017a91619b99c8e79451768b1cd9bacdcfb7e9e0981b SHA512 a7983e1a07e1e7fcb047ed7f210cc131c1ac43f4bcb1863c8c17f557e2e2f946624d793e8446632ab127d109ee5d8c1de96f914d6183494ec46145ccd5e75da3
 DIST github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod 39 BLAKE2B 7703b0d2668b61ecc03faf6c5d2acc198afe36da786cf9b3e0c7c52a62af3acabd59f4981abe0e6c99428a0a77264712c015985be45b0b65ee03b80900ea2d91 SHA512 18998ee91dba5395b06f49ab9b9b14b8f3f6271d9bd145ef0c536b62a121d062276fa03e0af4b540b838b30d927f39ad6403a51c1ed5e7185dc52700cf79ab00
@@ -1163,16 +1287,14 @@ DIST github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.mod 141 BLAKE2B e690296e75b3bd7a25e
 DIST github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.zip 31499 BLAKE2B 87b7a109ab2a7780fbe9b85814b0308670d613556ee9316ead12e5b826172ad33a2f44f94020ea594709d19d1ce84ba0d480bf461a182e7dce1d21ed2ce484c6 SHA512 44bc18f913abf245a32b79bb74e8a6517be3db9ba38ecba0f019f242e1b8f7dfc776ab40edd8b9683cde5be11a074d04f975053e8684cbbb64729200999f48b5
 DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
-DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.zip 17365 BLAKE2B 9853368adbde2a0ebcc9666dfaabe2c1dc45247d3c5ce48553e70afbdea58b865ab63e755763595ac5cc13ee3ad6b33a226dceeb08095b22a16f26e7ca8ab550 SHA512 05be92fb57c9b65909d7b37e7ada716dffc3a4e71029e40e3d03a8a5a14b74e57a0eb4e79813e23ca4b8e102a829941b33496495fb96a6b953e68ca9bee1e1cb
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod 96 BLAKE2B f192300c52fbe1d75a3a9c89e3d808d25f13944940475b8f2654b3e3a1205721f6a9aa553ab6293f7ea4c9e8be3d695bf7fd5fb55c35e3179cef924fd1334273 SHA512 29bf0aa6ae9cc8d66b0e1bf852534dda3a3e0e16c918be357cc8f6fec14f2d2537a94cafa1ca9cd06b64363a8f0f0d3c00dabcb5137699aced8d16af767f6ce8
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.mod 96 BLAKE2B 7014a0ac5adf29ba3e90a2ef7400121b655c47924fa0fffe686fdf4234b4e01fe92ba04e82b5153b63c8d20c8b466af03f0fd0975f5a9d6e8dc2f305e4712cef SHA512 79c65033c9ed8b95230cc1f11ae5f1684a3a0d48ca9c47bc33d46376b732be4d08a8b6d39788e388b86ec16e502e378fea4654424e81ab3fa372ff30e87bfdfb
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
-DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.zip 208238 BLAKE2B 97a3012ab324d4a74984b0d6b6900e4dd758709944fe3de16ce2ea3cc079cdc932dff178f26066cc7efea52b6097a658787433aecb3326b24bf9748235b7c7cc SHA512 7ae7457c4836dfc29d441bba1222412a933904ce251a9c3f86e340b55d7dd100e60c91ff02716ef92416087c9378b5427f0e81343a33b388a2c04a7b451de4ce
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
-DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.zip 246563 BLAKE2B 447439c211ccfb74246d6013d319496f77f234125e66f3b356814bf9a6d3db5248ccaa2f027c123a32df0837d0bb25ef60e6d9fded16a1069823baf07b6e40f4 SHA512 9c1f70df5f77becfc3a6bcbb63bf7231f76b5ad13e827d285c0bae5ef016f0aec2450f9f3c9b2d7b60fa8e4a3a9a76a1b2c034e502cf2fb907aa0fc5697d0634
-DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip 245650 BLAKE2B f917c3c8b6076add4a4cb59fcb1561b21785e9c7cd910c96f7decaeaf4f2c988566ef656925cf91842cb4218142d13f0487721c23dfd85bbdce1f847e12f1551 SHA512 bad04a31aa648777f437f3a7516549992962ef1c660694c02aee62508540c553a2ea36370b917d29a8e4510cc171d94590721c447e8878b562f55a7b0ca78f23
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.mod 168 BLAKE2B 5c8f6f90e14aef57fb8fa7dee546f60a73a2b1c16f7d5688d6a0b40a3d04ce308a8622f64242d60c1a014e3aa9264c3069404cf764026016d746fa7de031e236 SHA512 c73c807f01657cfadb139db3684cf680e40ebadd4db38cdff690407741675556e534aee37c96e4f54be64283937c81114856225f3d3f64999cecf5df11cce2a0
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod 166 BLAKE2B 8fad24303bf57553db631ffbce484b05ac3e7db117503b7ce555c55053a0550770ba6d7c6b831e3daea69a9733d98592e98f90b2e9f5b5f3020024b55c3d5cb2 SHA512 06e7e8754384929043159942b2d873ea872b974d9fae1971465592e44eeb26b072539de290adbd79402bad2a2c7fa38556a7597f5e8157e82d7576cad6b49692
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod 254 BLAKE2B 30062eca1c156d706683b2d2b88c70dee8e38da4d4bb8785c3894d7d496838f0628095fdbd020961bc619c8a653216f0efacbcceaf0909820f01d070fc1f9d9b SHA512 8a7b93a80585453b3795e1c536fa232511c6eb797125f3600ab8b1f613d9334559692425855a2ba95e329595bfdd38e8eb3588aad58aee8464f71aadc56f4fd9
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip 258725 BLAKE2B f40083a2965a442ea70d613f2fad5b4541cec4816b2ba6a28b92e6ac679d8e68a7f17a7c990b2db50583017668f355b1b242fd7019e26afc5160cd64dee96458 SHA512 42884272a9d723ca5d78c4fb5adfcba500eb4c6fc8fa22d11a2104fa36bbd4ce3c751b4a99f850c01efcacf3462fb855607bd26ece1f6182e1ddd68b29a734c4
@@ -1180,84 +1302,78 @@ DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.2.mod 254 BLAKE2B 30062eca1c156d706
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.2.zip 260607 BLAKE2B 7799153eb71b62f909e9af927ba6280d02a5d8275f5bfba0cf18748e77d5fc7427a9df952e984e277d43799beb53cc3667ad6cd4f1018635ee1d76fba276dcd5 SHA512 6dd82a9a884cf2acb55b3941f13ebc7e410018cdd282bc3b2468dc222cb1c3d1149faa2e71626b62587cec5b7fb67d029581de84fb76d1441c2db6ad7d98fe77
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.1.mod 288 BLAKE2B 54894e7b679e652f482e824318ac795dc4500cdfb48a4a35f606726d99206ca9d4992f8a4199aa4bb60bfc06a95eeed797507772af168eb6884dd563da3c886c SHA512 1d886d0bb74668946d7aa2cadf770235d83447422d91a020ec2e049d19ebacb01799d9cbc22e4a2e190f205c1398a495d2069790ba30d87d8f4cc6ccd76ae04a
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.1.zip 286780 BLAKE2B 1dca0e30a70eeaabd8f2eac9d9bc6d8be1e5f943bd7b9e17b8c0b14325da005969560399ab3a4f51e354861d9c78fe7b403d7c4e594bae21318bcff490d75bcf SHA512 834d6ed3164346f4696379be9e145cd37d16f08cd694b65366469e3170715044374c67089966f14fbe6b133585b1cb047745cc239e0f9e69e6541f1f62ba9c76
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.4.mod 366 BLAKE2B 4e856abba9dd7eecea1d60709494e10b84b5875047a823f05d523c2f088534ddd5a9c03213a2a49a6d3e5191a9e53f0909d9262a034055ef08cd1a469a76e276 SHA512 2be99360d5e1ad7f911dd9bfb96b08fc53ecf8ad7cb09e29798b417677b788114bf1b254ed8aefdd0e0af5d4d380fbb939070ad3190beee02ac6288867fe29cb
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.4.zip 287470 BLAKE2B af59216b4e377e4a59fe63ea849a2dba7a156ee117ea6350ae7c3c6cd20b2ca1e5347c26c9109b2bcc9dbec2ce2b3957dd922272d708cbae4e3b46d41f75aa17 SHA512 5963fb1a1373c128fa570c2e84805695ed10f6065f6aa6d121c8752bcddd718c287a04070219fd0686e5c2706e72ade578c57375d3830bb24a66718a7d6cff7a
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.4.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
-DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip 239560 BLAKE2B bbb8130df38c1ed95d80391504e92b60fd17fb3e41076c66562619297b602cc5f8fd8ee9782d3c7a5d4f004ecc08fb64bbc52270d9059b4cf3742c10b4a03aa9 SHA512 d14ec67e27936b1d9dcf885d8ec11e942a7beff9cd52a504504c3c88caaeb03eec4153fdfa0b0032f2d53f16cf5c28c00b4c504c81f8b8004cd4c6deb1ce19db
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
-DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.zip 119285 BLAKE2B 078b91bd48c718083e198ef6cd2ea8d69076edc428b1db1816f4af626f544e109fe50e6f389c2be99858b41c8d026f0bd785d8701dc3500ab0288613f07ae96c SHA512 257dbb31c4bce715a1ddf29a069f78157e504127a6bf1a4d60b632ca6658b4a3cdfc8248802eba5ecffe7c532347adb71ee98442e4625d73d82a64f506964144
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
-DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.zip 150581 BLAKE2B 70ef439f753f7e9efce64127a452c1da7925da3fb381df351bea54a22075de4dc3bff79df61b83456c83a84908976f691e0a5e567353d1ef9ad1329b9ed535b7 SHA512 a6851a3fe40c7185a6ce914ae5e77a1315ffe90302f5f4be0def841406135c2aa35b213c5154532a2ecbfbfbfdfa5be978fb497e931637d3d3f37f691324bcb3
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod 245 BLAKE2B 8ef01845f54a49336d1d911ec510a912ca5960eab195d6e193a4dd052d1e4158d2dc90a1c89749ab719e3d017decccb02a6af9e6d761016d871ea6498845f936 SHA512 2d89b68a9f4c3e3bf9d46d23d5b9f906d05a3c6ffdca50e83d2e07eb2f280707393828f8f12110cb64c28e96673b76fbc0235a6108d8ebe0064aa6fdf4d33f83
-DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip 167538 BLAKE2B b6ab81d8dafa47bf212bd61697aadb4f969fe78b5c0022aafa855f864db4989e4a06ac2966e4cc27a6b595eca7f09c4a171a30f8c31787f9366e278e596fd3bb SHA512 028f09b7234ad1a7a2788c4d9741e140fd4ecfeb6a9650b941577c5605512336848c86a17b011ca2bb48ebd5d34e6164ef568da4e3ca92227d39cd489025d430
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.mod 254 BLAKE2B 0f7d9f251d3d7caa20a81ecfd835e058ac04a06c3e66747ac32a0d56ad0320c912ef60c4e19d06dc24fd34e80889cc9a985c5e34fc41628019d79615f29cbe11 SHA512 a121706c1da034216920502710bbf4e91f01303a935519ce1ffda4c32fae67b8fde011821f78521c89246ea2ab641c16992b02484d7724d4d424c4d1ee5a9677
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.zip 168055 BLAKE2B d74f75a7a3e09ab5e5b5cb31bc351cd3da56c8eb44e54f78f7b742564ccc2dbc7f61f706c2f77b320fc21e7e2f3b18414ca3fbd80085b4fb689fe3c128eafc45 SHA512 0bc0bdb17f875fc0d50a1bcbc018082526203965cd624313de4412a230ee570787ca4605e8b897ced4875911994527fa6337d1f5685d94fb4806c06b614d65c3
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.11.0.mod 197 BLAKE2B c7b1c7197d0a0271928813d146c777a5490319798b58442b93980a4081bd42adc005678a621c84d7455f2fa284765b8ef230dcb3da3fbfb70aaa39c2a0fa84f7 SHA512 0ec2126dfe0349e903b71217ba2a1d1f7e02cb5cec825deb149200cf69ec0176445afae5f777bf9e2ad4205cd6d1cf69911492e16e12c8298c8bddbe8e2e55b8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.11.0.zip 173746 BLAKE2B ef26be273a99941ca470f9448549858ba592a102c6972afe168a8a9a71e38c9c4aff8cc95b2a9f2b87d41f9244218950899e11b41410b6bfda94cf2ddb146141 SHA512 c8d1f6bbe2dbf535ff1a7c51653e11368ca93752e122fac84efe4be0f4919c535aafd458a22b82d64eb13fdfeabcacb2c53fdd81d9d726ea90bbba2aa839e19c
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.3.0.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
-DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip 157659 BLAKE2B 2e4a53ddeea8a6076af3dbc356f34d898c0189871a6328f00f0690479ca34d2efdb670a3c0a67c19a4d34684f25145d4bda7ea9a9cee1e26cc6d941a274ecbb9 SHA512 279292e468d786f0f94b627b00b7eda5049dfa9be7423ed5c26e80fc2c020787f5feceb7571654d903787089c0fba05f49539eed958f97238065924d6eccc003
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod 556 BLAKE2B 8e36edf565660234a9c939b93e99acfd61c30620cf45619158d5a87c102492333387de1bda35aa226695f913358a4385d1b8b768527d8a63d056ab8f13cdae61 SHA512 3c48b6f2cd9bc71efc218b11ae432776164936d4474df73510a785819c417fc894ca71f5783da77f323754ece56b681f8f1e9dacd5bf309f189997ba0b317dfb
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.zip 157699 BLAKE2B 15dfd7933294898066316bcf6a0943e1dfa8b6099ec8d7f05425561f622c4d81989a239d46543c37d9cba761eb08ab6a1bc6ef1fc8c8f48fc0059edfe6720ece SHA512 286608571a79faf71bc8cbc29a77ad4478cd2a1d6ece91bdaf4a7c056141a154a04c2c8a93612c3d6536a6064b9ac9198527888a3fc0cb7756ec41548e7dbd31
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.8.1.mod 613 BLAKE2B 5c582ba17d40173653cf739137d0bd6cb866c34fa1f76bf8f0b96c1d05304c5ea52247ef99d6d31d5c6f41bbebdf5ad9e0fb21e275b2cb888098e0ca3ac8f30e SHA512 1a7624cfc159a3444be19238a2aacd003e1b0c6f586d3f6862adec175578e0bf40fca303049a15ae3cd96a1c61395dfded8427f867e1aed4dcca180417fd80f5
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.mod 613 BLAKE2B 5c582ba17d40173653cf739137d0bd6cb866c34fa1f76bf8f0b96c1d05304c5ea52247ef99d6d31d5c6f41bbebdf5ad9e0fb21e275b2cb888098e0ca3ac8f30e SHA512 1a7624cfc159a3444be19238a2aacd003e1b0c6f586d3f6862adec175578e0bf40fca303049a15ae3cd96a1c61395dfded8427f867e1aed4dcca180417fd80f5
 DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
-DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
 DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.0.20180430190053-c9281466c8b2.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
 DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
-DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip 27125 BLAKE2B ace23a65113f48afafaf52d19231b51238dba82a08a85dc615a0037b037530f3fa3bba1af1ad885eed9ca453aeaa0e2585d2f1b94cecdccccf2e32d36a86f11b SHA512 95dd5f43096dcde7c21338e393977b2d8ff3389b9c9b24ffc11df2cffc73b26f3f16a6406b10281add7d6d952ce2276639ba94929491be7792a2cb8f40746bee
 DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod 52 BLAKE2B 451e6b2dce76ac1525c48f536a0f9fc9ae773978ca7b9356bd75473e075877d0127217cbb5695f1fe406295c02a7a9d5424f2f7d4520505d0119834c11645785 SHA512 708918e1cabb5710f63858f35ef5bb197666b2ab8220ee48b47575b77805e44b083dc7577ad3bcf9414fd801653c21be9582086ca73fbd9c5589380a7450a400
 DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip 34573 BLAKE2B 156844533eaaa6410ac116ec0bddc68ac155aebafc017c51e6fdbfe0425a02dc878e8515795e9300b6ddeef776aafabb60ad0c420a1acb9b0fbcfa1fc0f84905 SHA512 be04251b483e39b4cf503ee442344d3ac1eabcc7c41acb56c25d65ee35eea414f798f159fc168ecf5594b15b9d5349c96cb9741a6c5202cab4bfeb104353a9a1
 DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod 44 BLAKE2B e60ef6b775d320cbbd7d0d655e4a0d855f79c0f563ff3aaf0cf0a13485005c800680cb95535d57342c6f23a69da021089f7cb4d3caa3021852e1462126137887 SHA512 e7d3276e531b754a441e94acc632d7322837cc2320ced66e3e91e3512164ff84428a4665493bb3a7cf7e1057e82097bc54d0b811738b1e967b9c248b907d777b
 DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod 44 BLAKE2B e60ef6b775d320cbbd7d0d655e4a0d855f79c0f563ff3aaf0cf0a13485005c800680cb95535d57342c6f23a69da021089f7cb4d3caa3021852e1462126137887 SHA512 e7d3276e531b754a441e94acc632d7322837cc2320ced66e3e91e3512164ff84428a4665493bb3a7cf7e1057e82097bc54d0b811738b1e967b9c248b907d777b
 DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip 170576 BLAKE2B 52c16c643c1e621cb967bfcfa1e1209b564dd81bbf1b0427cd5c02b85160c444fcbe2ad9563bd491f040df2c4c6b9cc35f6ec83f671fc00e3cd5f40c8ca3af25 SHA512 04aa87f93002428f1ab79190ea584b23363126390dbdd6c05064646e7c5c3710da712b730f8da194bd83c7b95f260eb1773fd8c1c9daa9f41891a765e6a21742
-DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201f.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
-DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc8.0.20190926000215-3e425f80a8c9.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
-DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc90.0.20200616040943-82d2fa4eb069.mod 1023 BLAKE2B f2109ab363c758ae6861f0df61319737f1cb5c8b838e3ed69cef1d4c91354c79d2e993adb21ca67773f19a0ecc7ad28a0cec980c88038dd7674cb53e9f21a740 SHA512 f71c3cd528043addeea578905daf254670cad27e7e85eacd5951d353868524035b1e674131f4c7770257e3e99d685003069d2997e0468000f64f1a0f9a2fde9b
-DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc91.0.20200707015106-819fcc687efb.mod 1023 BLAKE2B cbf7da4680dd6c5dec184f92fab05ff0ef13bbfaf8645235bf24d23d369e3aee4d818b14faf78b9d2249b6d78bc9cd06598e09469df2bb6d6dc07f2bee958831 SHA512 723294bb4477b07884769c0eefef238ab8478490573d4d5bc3645c272b508abfe943b6d22bf02ced8ef4cf7cc3b1b79f676249780070d8abc41a04be06843630
-DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc91.0.20200707015106-819fcc687efb.zip 663287 BLAKE2B 14c44b06398cfea7821898eceb95e984d55b03f8c1bbd33d2af36b18ef5259b206f27bf0a5d07405a556c171f615bd98fb660d960fbc2b4092fde6db33c39501 SHA512 84247c18bf7c1e6ab14e2e8a8fe322d1e5e0a3658209a633c879ee6f78bb2289e16e2c55f164febb242b0046550d3a752d277403c4e2b3a964230e0b24ba656e
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20210819154149-5ad6f50d6283.mod 44 BLAKE2B e60ef6b775d320cbbd7d0d655e4a0d855f79c0f563ff3aaf0cf0a13485005c800680cb95535d57342c6f23a69da021089f7cb4d3caa3021852e1462126137887 SHA512 e7d3276e531b754a441e94acc632d7322837cc2320ced66e3e91e3512164ff84428a4665493bb3a7cf7e1057e82097bc54d0b811738b1e967b9c248b907d777b
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20210819154149-5ad6f50d6283.zip 192657 BLAKE2B b0dba30e1d721eb32dd9d1099ecf68d6232a56b396cccf9d21ca5bf088c2e5451f4a059e60e5e58622c606f1f86fa5abf6b72e8d3757ed4029fbd2c07c13e9b6 SHA512 a80dc40034df996cd8a29c2a7d2fd66febaca630979491cb67b2b496cfba22274daab2cca7756878ca22fc4ced8ba7a16d2c05cd305d71ca733e08a3c4f3242a
 DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc92.mod 1023 BLAKE2B b857cb195a74206c5232e9a1c2e43065c6747851dbc9593fb917e3f75d770654d54ad7e1ff5ad05528dc681cc0c9fc265cd7cb6bec524ce9a68582032c3085fd SHA512 964cff099a078235865dd0a994388e032ee77ad6155362f848af0be56bbdfd594c61aa25ffa906415d88a217560965cb8fdb4f122f5d90929ba907112188d559
 DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc92.zip 648433 BLAKE2B f27c1a685a8757ccdebc6a135970017d2a1f2430f8006cded4682a1b70114773c8f016782cb926cff074bc99c4cc6e433d5d9758b6fd0330520b765fa56b1ba9 SHA512 6487bbd83b4cd2eda616cd14e0623134e27a54e9bacdbce0a30084b1e577383ffefd9d748ce2b62d76ad86d73cfb32936f692ea07e2310d4da340d7e19cb33cb
-DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.0.20210414171415-3397a09ee932.mod 1054 BLAKE2B 8d5c3d752dcc363ae10cc29d4c1e87be893de078db34a873907c3c00e3361eacdc6cf1727a5402cc29424a656b9da33d73ff36af17161a5ed937d2e7ebd1cf66 SHA512 ee9d71647de89e680a9e7f8f072881c25ea7dca8963f2c7f3757325674af059228f66d766ffa7d5f208d4f6135f2bef6c97548b41b4045a245f025a85d9023b4
-DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.0.20210414171415-3397a09ee932.zip 713322 BLAKE2B f6e5b9c7c9142cfa59dcf67a49e9675fc667c98e00eed56edff0f5e944f8c83e76cda31e87eed2e7c43c549c48ed80fedbb525408a7e26e544c09fb4a1a5d93b SHA512 051f96c6d61d66a0180a46f77e4ef0eb0555581e45f6d1276501407f397d27e61eb55142ac4c388839be63b275d9acd1d8730475c848a7062fb49017414e829a
-DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.mod 1053 BLAKE2B eef9c12986cf3a2ee51a7c2bc72f01daeb0a6bf0da5c38716447745cb2f82baba7a8263f434c509ce96a26b84f80df93db62dfdc0a247a3cf80c36edd40cf34f SHA512 2f987fd2c36d91f5df6bfb3f2477ab948fa685e2e82e4b0260b369b1fa57aa48c393f0f7f985c5a917218305311ca691525faf7ceed7a0d2f726df04f10ecada
-DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc93.zip 684884 BLAKE2B 820095d03422b37402dee1d8999e7bda875202347a1c6542a0685a6551873d36991e52ffb4e5f0358609cac672f2273d5ec71d313b96edbeb6e28548c169cfc0 SHA512 e710c42be0d5f3b78bc417f1da7aa09e2d9f7ba80ed4506e3d2cf0f6f26156ff9bb099a6ccde3d2fda3d990a18001d19a7e8f0aaa0e5c5fe4d49186e0de25f51
-DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc94.mod 1054 BLAKE2B a5fca5d1282dc793d903b5a43cd0a9de594281f26057d1da150766dcc93e5defe361807a858aa25325255072dcf9d3b40317ee8b5bff7561d82d282cbce802f6 SHA512 eda492af0bc4bc3fffae7b07da7926424e80eb2e20be36d1abab75c486edc5440b9080ec672b309e47c1b5f621d663329559de4ed619d1333c20ec440a09e726
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc94.zip 698668 BLAKE2B 759d0e43e5af9c0c59e06a2188233419c813c88bf16025e75c8c31197a75a2c3ac89a4a9643fe50fdfaafe185ca5651461ac5a6d95942724ea5be9ab0566e1d3 SHA512 847376b1fef7838e35363eb5fd12f4a068d5db21d8752a5b800e56b24fa92d70bc45d7f6e1cb2d73de1b8da131f321b0af37234afe28f70897c37d68c899ddd2
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.1.mod 1063 BLAKE2B f217a9587ed64ad54d82280a62227e5429c8c35eaf5383b0be66dd818c1bd0632d807c3a9faa49a2c07d87323771221981983f32a36b02f434a8ad9aaee10b38 SHA512 6bfa852715f4fe13be43033f2905a4118f9fc9e4a101eee2e113c7410958f789d02d14eaa5f2bcbf76ca2320f1f37eeca9fba015200d73250f2c5c8afa4603aa
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.1.zip 710577 BLAKE2B 0d02cf47b08dfd5421a4bc5a8d04f3ffa04e3de6cee6bea03fb71ec8f141715c5400b876aa65103fb8863e86ca98645760ed82b3449ee09e25f2e1b6e0aff7b6 SHA512 42368e1050fac15acfded83cad47345b92b25976d1086c2d54deb2dd84f15271b5d744c0fff254f75e6c26b3b4a10227b760a7bac592ded3db8688433717006a
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.2.mod 1063 BLAKE2B f217a9587ed64ad54d82280a62227e5429c8c35eaf5383b0be66dd818c1bd0632d807c3a9faa49a2c07d87323771221981983f32a36b02f434a8ad9aaee10b38 SHA512 6bfa852715f4fe13be43033f2905a4118f9fc9e4a101eee2e113c7410958f789d02d14eaa5f2bcbf76ca2320f1f37eeca9fba015200d73250f2c5c8afa4603aa
+DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.2.zip 714078 BLAKE2B 0c1ee7e017976d9cc8aab312a725c8fc44f7ed3615363bfd07b9c9856ad1a67c5a2f5f980124d0593073b342058bdee581b441b4986adf008653a16ebf7170cb SHA512 d5147d662c206b6763f7022a4715584358077bd18acf0b435b693f5790913087759b94a7fed18d4f85a6b03c403450f7b18e6ae99f47e1dc6a4be3620a60f4f2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2-0.20190207185410-29686dbc5559.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
-DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200520003142-237cc4f519e2.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
-DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200520003142-237cc4f519e2.zip 92951 BLAKE2B b99105784894bedddefd10e5409aabdcff81bfa74baebc93107a4c70bb2daf20ae483de03d3cb9abbc92202af8b05eb535f03234cebe8c2638bf08ca9c489786 SHA512 dabc55326a0d026a947d8deda45de3432fffe3364aa59e18cd51a337da455e7431efe598da1db5080ae88de11b2cbba389924e978c38581f748947f42244f793
-DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200710190001-3e4195d92445.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
-DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200710190001-3e4195d92445.zip 93205 BLAKE2B a9098e697a05641093595b52919cbd2a95679831b496ff9a107ee8895c4e8bb10429c3339440f9282402817ac9c300ee1e8a467f2270570f33bd5eebed194168 SHA512 3214539c35626721f658be9efa39bf598c3e8bc10d4fa967f8bb9fe014d13acd92331705fcecfc2a40e7eecee3e561b348bde85842cbc7921e5372ae615a4dd8
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200728170252-4d89ac9fbff6.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200728170252-4d89ac9fbff6.zip 93252 BLAKE2B 2d2bebff7e05185e611d6a43e802303abcb053a01982f0551ffa01048a0d2803b781c1d9fd18acd47a9316c6c86f17c9b79ebfb0d6ca0c8c0305e5d0adcb3e8a SHA512 104f4b22167e9692992ffe0bb8e46a487197b650cb87189dd3aed957d4a0dead29b8f91562e628d7d397931de211673a2021b2f7512232c2cc870bf95d474aed
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
-DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.zip 93618 BLAKE2B 22f438bbfd173163c13a99a286b2459e0ffc7d5c799bdd73cd1982aad6a1c65403adb990da707fb889855bb835e9ee3358d357ec8b7032e7fd77b34d167233f2 SHA512 6c89042e1fc53f3a0664944b4d5a83c5e49e0cbd7452b09fe10c50c8e1c75b0233175127db0d83a7a48194f6e8fc26d3cade943bd3611d50ce9a41dd8e83a709
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210316141917-a8c4a9ee0f6b.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210316141917-a8c4a9ee0f6b.zip 94935 BLAKE2B f12e919e852b23c07fefc90d4dbda526ec9f2be081ce9448e1badb89ed7b035c55845c782d239cd2dd02781cf3badd9e87dea1eda93673fd12314fd25dae50c1 SHA512 2137e46d279e6774e24a44dcff33236072e0cecf71090c3324134b4e1f3d3875e316a1bc74dcb18e0fab88a153bdc8061f6dbc462a266ab42f891f8d805f8757
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.zip 95039 BLAKE2B 2d6069a8477d5431b05e12b6be6a7191c44e70aa352b8dbcce7cbe2c9c6bf9a21cdd3eaf2198ebe47eb1782de4792b90dbe07a9d6e94e95190c62aea9689a6f6 SHA512 42d5a708d0b0508147abdd9a62b9156b600e73e225fc3143922bf21e68e35d291367e5aa82fef37e9b12a1a54950a346cc7019bafd2d7c613cbd00a0fa89ff42
 DIST github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod 47 BLAKE2B 0eda9805fe0e1acdcc1e7b2693e72e39ea416cf57a108b1847491e1f15f8a7965c8aaa77baad1ae6148f39d36b1fc5fcf159b54111bee0d20bf2fe8edfdf85e2 SHA512 4e53e67b276ea3fe8a3977bbe72758bb2f844e22cdc3e23994176821cea51b10f5e802ca3db848a8b3d00a146c133a89271ee76158c478683b393682806400de
-DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.5.1.mod 146 BLAKE2B 5f1b9af6a04921a636cbef00a5dce3fcd8dc2836d8922a16b4abb1b06f898b9fbafaafc732e5c43dd774f0bc4416e186f936afd3734aa08be41908ff88971aee SHA512 737cceb5d3f0b5a231216e0b264ef250e550073302e4b3ff6fab616a90a4652a4ca7051eae98dbeaf1cd6d13ab703bdd6cb12e17ed7d2c44c0bde3a0f0a435ba
 DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.5.2.mod 146 BLAKE2B 5f1b9af6a04921a636cbef00a5dce3fcd8dc2836d8922a16b4abb1b06f898b9fbafaafc732e5c43dd774f0bc4416e186f936afd3734aa08be41908ff88971aee SHA512 737cceb5d3f0b5a231216e0b264ef250e550073302e4b3ff6fab616a90a4652a4ca7051eae98dbeaf1cd6d13ab703bdd6cb12e17ed7d2c44c0bde3a0f0a435ba
-DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.5.2.zip 34651 BLAKE2B a1d5be1b2585898ba149fb31dad799a1e8a25cc0817b7d4471d43a4214316183255aeef2e62973e2471a3a3ac8ac67466d36643deb3756f946fe06c1e2e6b794 SHA512 bcc52888e74313a34057656da6df504575343d08e15a9b39afd38fa0ccb81f08dcd7730df47d6614449b5f335eac60bf342fb3010714c246ba463e94a5edf538
 DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.mod 209 BLAKE2B 5d7d5b4722834a34f8a63dfe72bd2f5a0426b284ace021ef7f6b7d16ac68710ccfd4ab21b442ac7cdd51f9a17fa116235f8c4d5e1d88c6b4392d89bbdc474e5a SHA512 13826a0b4d175ec2093d0854c789a2ce2c82d325b91d8bdd7dc0cc123b13ae59de2dd994039e90b9cb8ca424f5b642fed283bf8671b25c5c6117b168e5ce42bb
-DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.6.0.zip 38392 BLAKE2B 836cc7d6d09206f99bb4795102e67a8d36311349dccadc35f7289ebd6ba72d866f5b025638888a991d144f278d1e34327a675cea1e02454b697645b5feb280d8 SHA512 53fa6b1c6ed4a260f91ea1ebc232f75ece9e26afce1704d1912e74268fc8ebbed008dc027181db01e7b2f1c398e9d28f15baf1c21dee0619e55a09eac1a248ef
 DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.mod 179 BLAKE2B 16c3178a1515a77927002d1291ac1549ab95db0c67cc00f0d1c4ea543a636f6513e2ceaed328d8b3dcd864caff67ac4f0fdcf9d20fdf11fbcd4c49f527463db6 SHA512 b84b63dad1dedf0a1d06e8823c25a2eb5a833d2155e6e59b5205097cf9dcfe801b7a006e54730e512d0c094601237c2c2d9a4f518cf4fa392ef87f72d119776e
 DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.0.zip 39877 BLAKE2B 509d53b2cfd73768e3a43993c0a26c3d77a61c5b2e874d4e980ff0141019b6de810c6dffd1c9963342a9be987c70a82f625ed873e53363fa9bf7775dc5b5bf0e SHA512 54fedd3c2f3365a5838c4fb8deaa0f46e2220928e0a7d911efe399d61bd49eb150a5dc40e7cf9216500df10f44ec7ad652f625e64cbf5fc26a290356334072a0
+DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.2.mod 188 BLAKE2B 916fbc3de4dfc6048a1573e2e2740edc80b4a1502fd85a5163d3b234556785ce4e1732104e7c249746cdbea6573878a174d097c8fb220775b9ca605ca744e7fe SHA512 8fd12c10bca0cc3602df94d71c782e2625e9909fe8d0746265d63b626bf538d4d213d3cb372295a38d510d83284c33efd9c1dc7b1d852fc2fe84d94193a66f25
+DIST github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.2.zip 40035 BLAKE2B d391b14c06dd10f7c1ea22e1332b113894ca3be1e4774ae59a1db34b72efab25c400f267f403192c4ec493a44d20ec84a09e5172f8997a8a1ec86ba9388ab521 SHA512 d13a8271def1c860f6ab94523106d89836626d9e186a1c52a8b736c48b83db8e4ecbb89ef543528b6c9a0a99dccd691f993ce60c0b4fa164bf567b1921ab1af6
+DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
+DIST github.com%2Fpaulmach%2Forb%2F@v%2Fv0.1.3.mod 31 BLAKE2B 8a10160944c0dec0426e659830f73c4194a036295c17626699149d0a16f9cfee4c24862f7a0a647b29c55e8f375e8051c6f9ff3139380d649c4a5a3d4d2b1e9c SHA512 96e5efd9deaac9ce94558d8863bc51ba4a29f3d59f9f35161977a59e50296138615542d2dd04009a3e700e9d52756dc3992f29f83f3530c7a1baaf9a17710db8
 DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod 70 BLAKE2B a94864739ead6676f2defd1020645bb86b8b77600037227aee95fe3e82070c31814fd055dad1fa16ce1a00f64f32be96a97968259ef43f70f20e8a55cb9943eb SHA512 aa2a52cf55149c10f76a8e535dc75ff9bc18b4f2515a31e8720a26a5f501459c736dc73548d2e37f348f27b78974bf0a3b18080df972eec26222fd8afbbcfabd
-DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.zip 17858 BLAKE2B 5fd0e818c37d7054ea1fda8ece6783ac7ef6268f5c9b6ed54fdcce889ac827098475ca5ee219115cf254317eabb590728ae8c574e795dd543c1a697273ae201c SHA512 d4dae97f64a683e23542f205f93ce682f44b7569643f66112f3cb2a682d96a216a0face54631ae062d3b55be3dc6e6b710d7846eafdc78d7c981f3d16dfca6d7
 DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.mod 70 BLAKE2B a94864739ead6676f2defd1020645bb86b8b77600037227aee95fe3e82070c31814fd055dad1fa16ce1a00f64f32be96a97968259ef43f70f20e8a55cb9943eb SHA512 aa2a52cf55149c10f76a8e535dc75ff9bc18b4f2515a31e8720a26a5f501459c736dc73548d2e37f348f27b78974bf0a3b18080df972eec26222fd8afbbcfabd
-DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.zip 17867 BLAKE2B 770770b14b7aec5881d745816239212c40a652a491d5a59ece0cb4f17ad3f84ffee92ae1b683bffbc8751b08ae9c2aeaea45b2eeb57d57d82396b07f31abb8ae SHA512 85a39fab5c82b8b276942c5180b1cc2e17c63657324c976ce99a77a3389bb23b3ced52629c76fa9d4bbe20e6cf866ac94c08e17b3f9a8ac416ff9653b9deb245
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
-DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip 75347 BLAKE2B a6f74be69c8d42d3cc84e957dacd59f5f96fc49d48972c04ff26b623dbfcd3b5c2de13ae3e561e9a491a32cd52cb83d26e171f624191ceb4d659e5b0a3bc7623 SHA512 5dedfbc126ef5a3d146b2f3df2e4efa21cd4f1132bdb9f71801e55bc8583959777e57ee2664a85f3a222d656b910e1017b9b855378c93f65e2f623b568ef12ab
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.mod 88 BLAKE2B d66a44b5b8c2818d6342f621c9821daefd16b262df9fcd630839073cafc65a1352e22aa52662bbd291a65abec09fd0c14576a6aa9f86bda4610db670f8d53e43 SHA512 0e73093ef44bd32ae02910471bd85f6d135cde6d0fbf48780b8a58efb7419e16ac1b01497d451e8d3ee32602b7e32c0673dffbfc822c8f3a2d7670378f47f7cb
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.8.1.zip 117762 BLAKE2B 3ef20be014c5e2419f28f7d5db4cf8e7a7589445eee7e34ac4705b5dfa3cca3c441d14df2be10244472dd6599a2b6c45811f9fef11f2b68fc77f75c32ff8a769 SHA512 09cca3645bbd191ffee980c80c747a8952a37a0e1bfb9615cc1d0c0c3fec7783a9254fa3e31239a036c2bfaabe8028525e9113327c6d72c385c8b9bad3b46017
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.mod 45 BLAKE2B 0a144164f01fb7455ab76875415874dc845b22f9cba88105b7453e5c4c07c21f00a3ce83b8802f333bd775fdce8bc8e998ad41f6fc65a34e92750fef0a7689c7 SHA512 fdeaa2c0dbeb52934d9b48cf468c923f89058e3a454cfa153c9392ab908e3868d501d7bc2b923f33ad5949df6fd9ef07e1336b2dd98f9efa70b1ca4a23918ce0
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.zip 126646 BLAKE2B 78a77568425e63a661b1ebe4bd565f8af0ceb68af0783088860d1e1e93f496b565e357a55c5860b12e41ff693e7e195fdbde2e98974043dd62f12f6e92a58586 SHA512 3878b23bc00b19a5463ce8416043e899167fc4c501a2d499c3d3947745cb4996c91e709dc2d670a16f8060c077a32212f158fc01afc36ca8530b80cfde6e659d
 DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B a52c6a0304ea7026657d40ff685f37799d37cf3b05a87b15336eb05eb8a12d8749cd73d8cc3228ba2a80ce1e489a3029617ecf301dbd51c7f5dc7630dc114801 SHA512 df531789f1495979faa830433a34e38996cd919757f0191b31b862a9e9dd48be68179e291416876cb31083dec78337abf6bee92c68cff38630aaa456cd3cf052
 DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip 22487 BLAKE2B 93907f2e048ce0d8be7636d9ddbfb61f051c6142402f725609692a1644cfb4b504ebc36efeb36ef1e70463b54c809b7c71b9596705a0b0e1dc5f7a52252be5cb SHA512 1619cb9a2613384fa025772cba512f24c29947945bf1d85e476a52be8f5711d4bcb670750dae0554741de3c9190f70ea2a2c60e6b04e5e5fe4bb653269f5a849
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.5.2+incompatible.zip 20573582 BLAKE2B 4c5dd3e4f8ff6edabbd14b78486d6213064a8ee351a45efae43bab610899148060dba9143998f37667d8170a90a70187558b9eba9db36ef6cec5e18df020c466 SHA512 fda30f0b48b9561870599645cb9dc0a788d0f1fb8217e813ecbcf9a36d29d2185a53670bf81e21709484b22b851c0b46ae99265327f4af4c78eb5e95821d8264
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.6.0+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.6.0+incompatible.zip 41519506 BLAKE2B 331b2339998d1589b102c59b4364283b5f00df89ecd2806c7335d494c928934d0135c9dd759656b48012c1190ecb6ee67390039506a065c6dd5ffd5d854693af SHA512 0b44dbe0577bc2ffb6b30267d5410a18d059afb9ad2615683ef57e412a19221fe9c41da9ef705a1fe3b00b3eab73997a81f24d02fca62bfd93a6740cb176a64d
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip 14743 BLAKE2B c0c06d296c0583be2a6eb06359659b50941ea516bc768833bbfe252b73a2d81616dbe2d2db1991bd196b4a615b253c60046bbc6d56ca7268ded5b0ff40a4dc81 SHA512 2975fb8868fddaff560951be41194b82b631138d617705c3f6162acb76ace8697cc8ebc8f610ca1fb1a5167c6b6b0ecc87c150133a757447831463a0da18f392
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
@@ -1268,46 +1384,48 @@ DIST github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a0
 DIST github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.zip 28496 BLAKE2B 0135ba7401deea2cfb58a42a0e236ce3aefbd53a1bfab7ab5e502e3b598ee52a1e7b7cc9a51802fd93be488459b4129b869cdacf866aa530830e0aff9f4a4742 SHA512 5e507e16431a74b81b6662361a3b1ef627d62ec627ee8536c9c20ef8231db854ab949b0e3eac964bd7fba92312224d37af9c4d872f017d13ff2c47c164b4dbf4
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod 540 BLAKE2B 4d43a0901fa46da74e62fa22f61dfebdf6468f2766bd43dfd487d7a5434f961d181ecf26015ff9134e8d3f9c2dc03da6abbcd0030348facda3a499af9a04665d SHA512 9add81238044589ae2cf38042b963953d507e40945118fd62ac1cbf41bde1b001a69423c50b7045b721488b3d53489b4ce3c544b68f6c4e31e340d2581f7c8a6
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
-DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip 200972 BLAKE2B 6b6aa2cc4006f6671b0f54def912df6ff1aba7b69bd08c1950f7415032e2de383af556cd793f991989f1542cab5d7bc8a73894504c2f3b757a23007ba76b21b6 SHA512 c01081549c9e62a75d99ff37fb4bf3e620dd9e6a22a049c1b0b1b53604086ba68a5c366a7373423354b25cf7298c642956db7eca4b04be4b9431fe24ec8da125
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod 357 BLAKE2B ade628b5e576aac499156117606ac8b2458a5b481ee77be1df4b551133a3957dbce70e8674431420c181a67dfcf886d754b927ea06d588cc3df4e10a0ab8fbc5 SHA512 7bdbda1cfee6852064c8d4b15f1037a5153bfc66b59b3555416518a225b70c1db1daca32c0a7058e90d2b0f55da3d9cbb2f5b119107b5d96a874034158a69958
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod 468 BLAKE2B 4ac6ec5b71271218f33b753092c494ec6dd01e73373df68af2f399d8d8ba32de0f02150c1c5fdac8518ac244391f126cdac602c63ec862bff559d76015cc78f5 SHA512 9c6244491c9a3012c4a2e575cdb361f7fa577f391ced254adfd8d567c361f073ce23ddd57a0f18ec3327189cf97ad737254c0d0ef2872085af6af7bf9dec1d72
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip 240896 BLAKE2B 4745181476be50303fdf0e66ec147d643995c809a1fd969c846f656d453025f2cd67089f3065b41bede74bfcaa65e5307dd9541457ed7f7ace31b6b567e2e135 SHA512 20c4e6baf239cbc8c8a754ec1b9ee814ff29df1b41332f75f7440b27864bc28397071f3f4d60ba6ff4d0aa531b7a20857e11ecca93057784f76f03876151e8f8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod 569 BLAKE2B 0c975c1c48f40792b02fd8756be3b6bc044ca05725ae179445a858baed4861011ba76051aa25fb10be23c6cf14738cb9cab928418be49d8ad85211d398089ec8 SHA512 6fe81bf3c591058f2ff968b3c6656766d9d3fd74c8577b3e7cfac17e463392eed3268248237d252c98751b2f97bc7c48a8db15bfc3fbcd4afbbaca0e2970819b
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip 226158 BLAKE2B 899457f410f559d70cac7131e9c6057bfd749964b8b133943635b0ee78a12485d933718569d085f51dd34f831114c2f74986818536cf21ad642dac793b00390a SHA512 5c4d5e70be8984c9eea4211e06e1f9478fea4ee4cc227167b9a99d87fa773e060e42aa4866eaed39e58a251821840643d5117b12006a6809902daa08cca14b2b
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
-DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip 69217 BLAKE2B 738c4f5d28aff0b5e5eaa04f50e9a4e4671bb0a06dafb2174720cc0e6fa79ee87123f55776cdc051124434a3889232d512b32d08b1db1d2cb7f54e251b617e94 SHA512 6cf7daa3b86c574afbf5d91d3d4f372fb31c06ff93d59aa128d8ef025b5c22fcbca5a148b21637ed97127e5e2150305e48c241be1ee4c1b23ae32a09f19ffaa0
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
-DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip 69219 BLAKE2B 6ecc62f2f3ae4622ba6e19c51f7ff7ca3bafcadcb38cb7a9d79dfcc2ddd7183d79dca8e0d6b534f5a2dc508c21e0fb349310b4feaac35c1f7b1166c3febd1228 SHA512 934c3e50ebdc1ea65ccfd4de1e2e0f0ebdece54be1cccaffa5e325c667ab22bae84a7fc7ead1066e75094697a86452fdc36fab57b955f42337708de32e7eec32
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip 13785 BLAKE2B 2cd44410ea7af88683792807b0f2c31b0943d8664a4be050f2e422095ef3674e6d42f4b9b6a76083e13bc9f44be1578cb06a7389b4a4b201b5a88e756b40193c SHA512 db2396362357b6d5e99b21bd4aa8d8dc193dd2676a8f437c62eafae849a56a53875bce7411d58ad78e4fe36445b72ee1a34360b174a23ca84de911f5df189354
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod 817 BLAKE2B b4cabfb93633359c6ac6dcd400484e6162bc6b609bf0edfc4a82a2cc0137edef114d0d3e9c55bc47d1abd906d9ac00f9d84f07ee7072452c570ba9f98118f4b2 SHA512 7e1b17c424c8ec889d0efb0f5a171043ac0fffb48725144836d8ac635c036e877e65f34f75055359747142051afd00374cec9e39911175adddca2c50fde4c893
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.zip 163523 BLAKE2B 6d31ee2f8495605c967a41b12da3e854dadf4666641fa8a324f9926d1e965cb2693e390065f34892876c2eae5c1909b5bae8c11e484dd948b7c80983c8adb551 SHA512 74273a10b05fc2e0ea263ba57a52783c147e1f0ee6a1156879c387d0823f90d2c0072b5eea4325116fa621de0af1d5c2ba19e5dc188315c60ecdf74ff8ddcc99
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod 794 BLAKE2B 91c9bb4469ac63bd98bdd1ce4d2f2cf3a233f62f6c30b1da0b2a94eb1215a975f3a19cf066c6bc5847fd1a642da6082b8377825987ab5ba21620c2ed9ef26af4 SHA512 05a0bd8a7de559925fc5ba7753d9fc80db41271fedfcd0ca3137f9620c68468c0bfb706e0b4915151657c74a5d64f52a5594736e19fa1421aa65124f551f0ddf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.zip 175437 BLAKE2B e86832a3d0eea09f43735d7b45ec2335200d530bad4981da1d7cb12939d284cd769dab8e85412482c3b58a778cc910de6f5492765ff9745ec9a03b8276440411 SHA512 979628ae2384dde963f40dca23a77bd12138dad2b8d7bdd261cba5951678cf9287c47c335d40d4e7b54b561cc3101fcbd6eb7d9b1d039dc603917dbc84c1c4ef
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
-DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip 151692 BLAKE2B 89c5a1012d53a62b773c2c3e9a20426564f01e70abd39ea67cc76abc00f38e6f1443ccb31c0ad89920cff80ad94c5f7e72c5d67eb3aa44e047c0bea758be242b SHA512 121a4e3ffbf959722b4333b5e449dd54b6a84548bb580e429b21fc6fdb6a494456ea55208a039f7be6dc7b7fedcf0c6183edd0dd727cd7ebe0ec517a8e999c85
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod 693 BLAKE2B 414677e90b5a1e5e2b5b498e46386fb2fa7c93314b390bc4337c74865b6a72f8a64804e4c30aefc54515e9261cda168358d70bc533e8686cbbe0f625b8957d08 SHA512 829b3d7349806cebfad94252c09095aba4c5cbe0cb77cc124e7fc514ded1d8faf0f158d21be97911b8937ab9d330b284139275837607950ca602b3faebef146c
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
-DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip 132055 BLAKE2B ed3f24a397ca21aee9972a2fb1bcd12acdcd5b7aa5b21a36cd8e8c1b1e04bf3a1264cd7b21147e1f69e76792fb0d36f4cd44f51178376a9daeb092e69eb8a2f3 SHA512 e3f4d97e22ad8d27a3c8bcdb6516f4e1574348b864deb6f1569f3d94098987f35bc87c7a34f95e84834fcd8c750b3a177f847b586b72b91af0e0f9a735bc3f20
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
-DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip 262428 BLAKE2B 6334337329e564dfddb576464864b53d4da3cd7c0988cb6b0eeefd3ea9141f36429f09c1f75d11560dc12e23751fe5c52a4c7d46cec0ed3454fd3684562bad72 SHA512 8dc2a0f05fea67aa9a64d2e91807cd9fc111be3ad4fcde2b8f53757ed38a478467f5edf68f990d124e1019cdcfef133cbd0278600df8abdc1c0971808d729956
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip 261840 BLAKE2B 0b2120e55db33da70f3764bfd57657445f66fb4ba22c0d05898aa46156228c4a3e232cfaf24e2881707cffe7d3b5694fe04c03f589ee12d6329e94c90847e62e SHA512 cc3c69c18a6bd2bdc5e98de10c0ad6f9c540d5639252b007851be73c405e3774d1ca16518d3edeec036258300692b82a959bef3d92878c772370f6b8892ecc64
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod 198 BLAKE2B 954749eeaffd58f7885eff94ed89b9c933b2506dce66db05c8aa640fc7e8ff21032d855776ad091c86d43b77bd9e2d1db3cfa7b176f2984ea66c4a49b4373d9c SHA512 539fdd264ff10a459bf00eefdfcd2d3d079426cbcce7c4ecd27e1191d6392e0451804bddd5a39f7279e3c91e63a40ed882ebe1bcce7e71913d6109b7b6ba403b
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip 282768 BLAKE2B 22c62ac51bb14578571aa93f0acdecb984ca370b4617122078b28b8ec5ab4ac8cbd6e986d60335d5f9848028f51f94d8fcdae3d8b428c8d3c8196d97cb2f04db SHA512 1b73a550dfdda98e41da9ace048b230ba05bfe7518cec7b5f877c11afa58bdf9d53ad25fa848e316fcb5b25ff6eabb0a2d2688c1cfbd9642a8670b72c3f90a92
 DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
+DIST github.com%2Fqri-io%2Fstarlib%2F@v%2Fv0.4.2-0.20200213133954-ff2e8cd5ef8d.mod 1560 BLAKE2B c0b7b9c55fdbeb0fdfb1c2f149a3f9e6ea3e8f6477090e9cd58a1287fd7fcf89b942bd275009bb0c0eeced95835e820c61eb4dd41325a8a7b05a59bcd5511ab7 SHA512 06b1b7c7c7de45346d01d210e5fa4c00165f93ed0949b9ef20330a8c59c5bedcf0718846ec4f3080ec219da595fc930ba67fafcade1112b4b4a36006da13774a
 DIST github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.2.mod 30 BLAKE2B fa38ca1c196a8b295cc8cd9c15b272df2146dbf0cc863df7c886963027cd0e32e60b13d69732f816d3a0878c63703b93044a7a80a959acab2a183f99c2efce8a SHA512 e5e3217e444afa2d3a36abe503984e8f6ce5a5cfcd38cb12387a4aef74894a24a23526793e59b6bbd1b63cc79e2a136e7c70170b3bf9db2275a78567c28b3dd3
-DIST github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.2.zip 6817 BLAKE2B 2f422d73f1e18f2cf034dbcb1ee51e46d8c639941f55621ce294a1251e6d6867ccf1d99285f731caacfefb85cfdc7424d4af5c473199dd08342202176274147f SHA512 4ba2adc8fbeddd4ed39698c16683d29e87ffbe9492919d2b21fe8637e7fe63d0a3bbcb14f71c02d60971cca2a64069e31fbe86f56b862998c18badce367f6032
 DIST github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.8.mod 30 BLAKE2B fa38ca1c196a8b295cc8cd9c15b272df2146dbf0cc863df7c886963027cd0e32e60b13d69732f816d3a0878c63703b93044a7a80a959acab2a183f99c2efce8a SHA512 e5e3217e444afa2d3a36abe503984e8f6ce5a5cfcd38cb12387a4aef74894a24a23526793e59b6bbd1b63cc79e2a136e7c70170b3bf9db2275a78567c28b3dd3
-DIST github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.8.zip 7005 BLAKE2B ca87ded4ffc5a94160ed6b68852871a09ae2ab12c290337cacf6aaab37f6352194d20e2c79d0e5898f59bb828d50b6c7b5fbed0a32523038515d3bd117cc6267 SHA512 d9cfdb08e08fa52b873a2e98a37d2b76b92d175cb63fe9300d202518132661abb4295eaf29d6fc3d69a0a2db108a1510c18d245d520a6fa43374f039731abb7f
 DIST github.com%2Frakelkar%2Fgonetsh%2F@v%2Fv0.0.0-20190930180311-e5c5ffe4bdf0.mod 35 BLAKE2B eedfaf50f53a93fadfe7f714b4341854b09f52986c56d85f59767ef6cb470db68023eaec7a83404abe2c19bccf284de80675479c0a0d54daa6484a8231550ce8 SHA512 3f00b2186dd9c846384de3492c034f4eb1febde8bca7a9c09c415cd7d2040d3d98f885f8a4b3c882d1b06b18951e6727f951db23698d354bbebf190ca9e758c0
 DIST github.com%2Frakelkar%2Fgonetsh%2F@v%2Fv0.0.0-20190930180311-e5c5ffe4bdf0.zip 15525 BLAKE2B 53f7a01d25856e82b252263ab65d79501431994dd3b184f6e6998067d64a077e4d0abe649b67815b562ace3761cd2de083d116446dd951fc06f45e2cec41b76f SHA512 77f8ad58a5ca52e4fc6d965836a25d3a69b1ae1e90a6f195e453d3b74dd6fa94a3828323fe13e9d8ff332e371a4533b357822dd59cd0d535f2c94cdca410f9b2
 DIST github.com%2Francher%2Fcri-tools%2F@v%2Fv1.19.0-k3s1.mod 3378 BLAKE2B 4ec8588dcd8e7e62d67f67b304aa650863c67a4a666913160e84fb784d52a78ba70c598d1d34c99cccb2e8ba3d621104b99b4a40cb83290ae6bb0c9eb1829744 SHA512 a9c5b8eaa2e082298c5aa5da9ffb46a88032b728ec65fe3d88376fe65ef074764fed98e0c9db4532729c21214ad79339c5c94b28f42642b192ac2f77a693fc07
@@ -1316,25 +1434,29 @@ DIST github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.2.mod 334 BLAKE2B e0b6e8
 DIST github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.2.zip 33671 BLAKE2B 1055738f840c6b5d3b700ed4645b4f00018663b44e84f118f12cfed5f51a98bf719d09c4bf7c52d2d78e54215d9b6d5a1199b359717c623cabc8f1a13d784100 SHA512 4171ebb2c885b45471183f7e606c0b97d511887face91991800ebf60ca1a8cc9ecd3da923848270f19547f1983917fed7f8a23a388a6f00b64e32cef6f8a9329
 DIST github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.3.mod 334 BLAKE2B e0b6e814210c4571bdb0b16325e9ba3ed737b110c453d651b21bfd95bf3cd67a111e472eb5883fce474ea134b00a2ece76b127ac65746369d6349e6f30f1b46a SHA512 c4eb8b39a82c0d8f1ec16aabf71cb48dfd9c5401eedf393e8f2d680b6eb6e63a0554703ffcac4cc90bd057e3cdfbbe4d820c1387a8103183c445f690d76bd6cc
 DIST github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.3.zip 33679 BLAKE2B 130d1400f749dd1eb4ea45e5588d575702df8e11e258d40fe381c7a6b9309f25fce53638669b3cdaca29cea38fdcc763c741cc588011f6e2fcec1dfea4111452 SHA512 7ba171aefe5c4f4cd1792f1ca558c45543118812d8ec01f96dad31e7508ca97f79055d034594e237af7e30493add0902d948d9b0fd7356148e8446774f2d3d6b
+DIST github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.6.mod 240 BLAKE2B 9a8ba0c1fd8e1b564dc267f608beb86ae7ad303cb92d732bbcf81337a8d5f7f1aa0b629a730f33e1eae443936cdad832a6c5aecf740abb87e0e59c623d9d6c9b SHA512 fe5d6404f8c47e1b2392208140636787b37145a78086b87236c0661760762d57e6452218c42c8e4155193d3226f6d0b91d99fed8d38ba01a4efd8010dafaac17
+DIST github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.2.6.zip 51481 BLAKE2B 115c96c4506fde81120b4174f820b35ea317eb8db74ae11b51080289c30195e3d0a19f897df52c37088a78e563ee0dfca35efbba1757a4ef4d31807981787024 SHA512 e1028ab9f469731a141d9f1b63b5f777fa089d58f9d0730df5c50798f488c8f342fcf647ea8954d9b1acde8dfb86f73e111b47d9f8fe2af6e323d3f78d6536f5
 DIST github.com%2Francher%2Fflannel%2F@v%2Fv0.12.0-k3s1.mod 2035 BLAKE2B a325eb435c2be433ba2a75c12bc7231aee4cada3180028de33bc19a353135dfb0501ba391ad87d62178113437a1f019537e8b6b85103b30a29ec5de9bad49e6a SHA512 41c1dae08e9e97a02204cc48b35f5b749a9569458eca43f644111a235b99b035731a22225b7c3310dd4c0022bf7f77a3c1fcf61e5c6a586b396227aacaf017df
 DIST github.com%2Francher%2Fflannel%2F@v%2Fv0.12.0-k3s1.zip 2473200 BLAKE2B eb74517d5ce86eac45ebcbcc5ebae9c3863236afbb24cd4a60dad83e0f21cbc71b0c8dc95297bcfa536b71378540429608a5591165ce47c335076c37d34eb8a9 SHA512 002c2594e1cb37b10f48c03cb7aa35a759ebbff0cb4e52a060a16ef2bf17e1d578c6302d0649ad54e8a038bf41795144a42dce16a7d71b0f83e0f18de6077cdb
 DIST github.com%2Francher%2Fgo-powershell%2F@v%2Fv0.0.0-20200701182037-6845e6fcfa79.mod 40 BLAKE2B c53ca310e799729acd63937210d1ce13fd55983eaf1f29cc84d0f9f5a0b5e4ce132845edf6693fba18b1d4662ee2faf285134d6abb19085e4f7d6c5f4737a669 SHA512 d7ffd6ed46989cf588df08593739533500f186d368d327a4eac7ba11325bf6b1daaa9d7c01065c449138b94d7fa29c3bbf9c24c8c654ab76b5436dfb8534a6e0
 DIST github.com%2Francher%2Fgo-powershell%2F@v%2Fv0.0.0-20200701182037-6845e6fcfa79.zip 11926 BLAKE2B 219175cfaee2d2c20df4eba5e756cc1ba2e22b7d98b7b8817f24dd5a0c5aab719e53223db3429fbe766623f4140644c1ed87b7c53de55d31555002526216b7cd SHA512 097d83db42f98972e997415fbee0c4cb38d1058b830ba9f91e3cd33022aab81c171ea99ffd555ab2131c01a64543ab2d347da4ba5eeef1f164b07c774e17eff3
 DIST github.com%2Francher%2Fgo-powershell%2F@v%2Fv0.0.0-20200701184732-233247d45373.mod 87 BLAKE2B d16b7ff0957ce1d0f343937531b8c784ea50aad16b420590379d8c45bce0378378a97ac9d7dbd542e0e43b877621eff4d44afe3f1e41af6eb28c353b73f2d747 SHA512 deeabdcfeb38d7d6bed6b8dde1fc8df2bdc66b27016c5f67aa69f4cfbe24bc27e4cc9f75b5d6a04e13d6de8503e1f4e35761bd460d388f663a299a86de4d18f5
 DIST github.com%2Francher%2Fgo-powershell%2F@v%2Fv0.0.0-20200701184732-233247d45373.zip 12626 BLAKE2B 10de0faba3b978f2f512c77783beec5f94784f0813f6db03cba0dfc13f37acc20c3f66e6314b421eb6cea058e55a263cf0b966eef2fe82c7802a2db2096a33c7 SHA512 474a5aa09e3928e1c435370da2bea610827ddd7df44c0199e92db3af4a2b60ed12da42add2f1eb6ade400459b9baa4bee4585a68c7fcd214fc1b3952bb29c7d7
-DIST github.com%2Francher%2Fkine%2F@v%2Fv0.5.1.mod 442 BLAKE2B ab63bb6fe3fd715aa24f15e2dea1a912fdfa9930381b2267f91fb7954d54cc13f10308958526ebca5613727aa82534ad9e01afd95d779103a53ef006fd1928ee SHA512 fe5542172fd9120d60e827565d5524a7a88a4833896d94722bbaddb97f80f7fe3645ba04417c5dc0771599b3df0128ea3f77eb112e191c96f22682a633fb6ac5
-DIST github.com%2Francher%2Fkine%2F@v%2Fv0.5.1.zip 64939 BLAKE2B c553006caaad1e74248248553465f3439911758a550490abc39ed43968655ed8a6bb53861f0f74f33100b910ffc93549367abe6f67a9b162d2283414aa8335ad SHA512 5590686568693cc733dd05bb5d37c5f237fe6209c61749aa5362842cceba0b178361d8fab4a047ec026996b5d4f7070085fcd18caef27e20f8bcecd2eda5ffe2
+DIST github.com%2Francher%2Flasso%2F@v%2Fv0.0.0-20210616224652-fc3ebd901c08.mod 129 BLAKE2B 335234e7ee2c4e0ff7253b1aa74841cf54547d344d3bbc03d24a1ddbe0e6d4c4486826357388bc0fcff53549bbd04e03fca43b6eb70629e45e4b3e6c63492312 SHA512 864abde71523a5dad5674988af330c3fcb033bde5dba573341578086fb887c5fa06ca327164174b6820578e708f51ea7fc06687c6eec1ee85637f9a0041b0c5f
+DIST github.com%2Francher%2Flasso%2F@v%2Fv0.0.0-20210616224652-fc3ebd901c08.zip 36156 BLAKE2B 9806da7a6850f9679150d1c89814854a96453d8ed0b7ba89715d47a1e8c6fef8594f33755d6d44966df5917866fcb2b7fc775682d83ff92d69511763fabc399a SHA512 545eff601ef96b95e183d4bc317f4e4fa9c5a96da019ad751e0f97a92c0f120e147a463f67301ad3f6b179b0d1972c00ed3532e0291d048fb6ec3cdacc1a07a7
 DIST github.com%2Francher%2Fmoq%2F@v%2Fv0.0.0-20190404221404-ee5226d43009.mod 30 BLAKE2B ef5429856263ce57552a206e0c5db15b18d36a6d5e957990af5a686567eea22440a2cb78bf9321027df96c7e5f73e2ab038e3ddf7487e30f07466476b1c9800d SHA512 214774736042bb24afe2f08d67329e572fe5c42527b37ea463c8eea0707c1ef9dbf7b9d70626b844496471efa29f3b172ec382e76de0c612ce53ba4ffca3902c
 DIST github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.mod 194 BLAKE2B e40572f883db43f7d0d976d2203b1e74112c7b742feb25cad5a88f223889d17a9bf09e61579c4169286d909f623921c12d172a9558d37cb46c857d460c5055f0 SHA512 2b7a240571fe09cf5c8e2191f91552eb44ddd12692ee6cbe764e879525beceb0dee1b51caa88bd75a4345cc895cc834f8ef4168c933c7b3dba0032d145958e03
 DIST github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.zip 20023 BLAKE2B b7b0f964fc018eb4cc89e9de9d01ff9da5a97e3e999b189e887cb8c57f932d721d236f5601d5b96f492d68a0f494893a1e620418dd5508ae8b43dfbf143d7a7a SHA512 70694745bd3a74f62c4726541659b02fa72bd268b26b6eb84b538cf3306037090be3d8ffbe01079ba80260272ebeca94bc343689cdd5926e5ad877105fb2fd2f
+DIST github.com%2Francher%2Fwharfie%2F@v%2Fv0.3.4.mod 3381 BLAKE2B 88589098d6b4e36c6af7fa48c5491705d30f009247d771b2a8bf20a920c94182c1009da68fe85b8bba93f0001d69c1ac80f9cb51a162a2e78ff97ff2080da3c1 SHA512 b3b318f70e6acf893f1390674fe0e7e8dd85ac87f44e55c2a15096cc85f5df49890b379a3a82761783ec15873a4e3f66bc6ec18c4d47276028e5d7a2a5078049
+DIST github.com%2Francher%2Fwharfie%2F@v%2Fv0.3.4.zip 64143 BLAKE2B cd1ba100cfa6ccce086c1ab8ce1598d3139893c794b5c339f4fde8043115ae28bb88af6f5246e38ec0bd87a3936881cd218e298511213a6105590914ad9143e4 SHA512 4191f78fc9a025819a6c983f36fda6ebce496b044335f62841202141a79126793358748eaf320c8c3798a76205282b0c1b4639c25ff1dbe9f05015cc74d0db96
 DIST github.com%2Francher%2Fwrangler%2F@v%2Fv0.1.4.mod 1675 BLAKE2B a93fb8e5d3cfbfbe40c8c7f5d9906ef70c1cdf07f1827d899c24f706a239ccc6e9db7821177b88280898d6ff64bfabdaabab9ff00cb1c35d3500831f1a93dc20 SHA512 c41496c407602f8f2c4926364debcc3b18cde4e274710feb73f11aeecb6f058839d4805ab9dfd6ee437d639d0fbc1cc58e3e92eb50918e6e849fab43fc95131e
 DIST github.com%2Francher%2Fwrangler%2F@v%2Fv0.4.0.mod 457 BLAKE2B ae26f376462a65fe62712b590f5a16916b612f06ae701fe076b87d65873315b968aa7e559e6530e1e3758210ac0b9b73a473cb51b2e72b9b07624c780c744fa8 SHA512 fc0f658fadad4152347b4711ad88f37713bfb8e59010cadac6ff86ea12f2f2077c9dcb6bbe00e421a5b42914e4560303460ca712f66c7bed6fe8653cfa3e217c
-DIST github.com%2Francher%2Fwrangler%2F@v%2Fv0.4.0.zip 79778 BLAKE2B 89c4d6d4cb1e8b5e3e63e8fe971e5022fa7e0d7e42b67d419af30f2543075c0b0d6e62bf7a4e51f8a47ced0d3f750946121e79864d70c1dccdd96e5143390f2d SHA512 4474e55fab713bb89be3be81d0ec8dda26aac922fcb9878801f6d02f24d40535c30e02518ea361472359c189e4ec660d96543113a8bfa49da3abad24f6f55038
 DIST github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.0.mod 508 BLAKE2B e7c3da50f5f7eeb7997193d11965771a27779da7bb11a118d66885c64f6a7d8ddf913fd959cdf372a391bd19659fb3bdab7fdcc5c8ff6ef600b4df531beb6a8e SHA512 a3ce6788008e24ce79c964e54a53ccba97a0be2836471bfb5fc91ee0e14fae04284c0cc1a5cb042d8dba38ea7ed29e50ffd7975d4d61d020538f2b76f6db1791
 DIST github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.1.mod 508 BLAKE2B e7c3da50f5f7eeb7997193d11965771a27779da7bb11a118d66885c64f6a7d8ddf913fd959cdf372a391bd19659fb3bdab7fdcc5c8ff6ef600b4df531beb6a8e SHA512 a3ce6788008e24ce79c964e54a53ccba97a0be2836471bfb5fc91ee0e14fae04284c0cc1a5cb042d8dba38ea7ed29e50ffd7975d4d61d020538f2b76f6db1791
-DIST github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.1.zip 125409 BLAKE2B 8c13c52f8da846d45d3d8460fd6b94d39bd47071372a4ae347c6f4b59c4beabc5cd08876709e765969b0c090ab11864c6e44b5c4419133a86938b42694e85c83 SHA512 07bdfa5e8067c335cdbc2bda5a4936f1e3755563a4745050519a3e872a8c0c97b86dbbf80ed9518f7c2c1bca1c41170e637d1c377340b062d5b6a214ab5665b4
 DIST github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.2.mod 508 BLAKE2B e7c3da50f5f7eeb7997193d11965771a27779da7bb11a118d66885c64f6a7d8ddf913fd959cdf372a391bd19659fb3bdab7fdcc5c8ff6ef600b4df531beb6a8e SHA512 a3ce6788008e24ce79c964e54a53ccba97a0be2836471bfb5fc91ee0e14fae04284c0cc1a5cb042d8dba38ea7ed29e50ffd7975d4d61d020538f2b76f6db1791
 DIST github.com%2Francher%2Fwrangler%2F@v%2Fv0.6.2.zip 125414 BLAKE2B cd5933496c4f9b8ca272432e2ced287df852ef26c30adf08ce477ea4c04825ae443e68e9b9b4912142a4e4a98d87f6f085356fedb1aa0aa9cab44ece88516c3b SHA512 14b297e87d386e1890bb5bc42653e002f1481bb5b36e3d3abc81815ce3c8fee484df673f70b6b91eab96de156908687bc4f53e06dffc5322903716e2266d66f8
+DIST github.com%2Francher%2Fwrangler%2F@v%2Fv0.8.5.mod 1055 BLAKE2B c89fcecdeab61166078e58cf6aea9b7199a13bd1e465a168e531f3e2b4d0ead1861421c2697e570e0f261c04390ccd0ac59d08e42ab9e49f9c5dd35848ab5054 SHA512 e9af99cef4d7ad12a896864c0d0e00a155c2b0dd34dda5a49cea983836328d4bc3ecf56465f4b491307f8c31a6d0b8760c7e964afa685efb7ba4cb5f5d4c5a10
+DIST github.com%2Francher%2Fwrangler%2F@v%2Fv0.8.5.zip 256087 BLAKE2B f268ad51dfcdd62fd1a973f4b5a3ee16e331a0cdc2a724eca058b15d646756678f25686e00d46764fe2757950edd3ef057d131fcaeb6b6d9b66720b36a100224 SHA512 825f612e89bb2416ff8c3c51066ee7512e8a68ef23dd4c2ae2560abf14b23b932f4f116b76dfe089b4d40f81a50b7bffca51f7eaec338a83253e5004fa77c615
 DIST github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.2.0.mod 970 BLAKE2B 8c094263e9c97590d6cb8b23f18dcc4cd45708a76d4d5142f141d7903f4fd2abe1ab5ba08989149f54bb1d32730816554c6b6d9d2cc7a661cce0775f44805cb1 SHA512 2875807a0c166b8baa66ca8f56788903de844b0a1cd20277a6a331bfe7c24029c96e07f304f5a6f12e847d6176ffd2e8e64d4b56deb71a09f98414fa698d46ee
 DIST github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.6.0.mod 752 BLAKE2B 525cd92da483de548b7f8b97bf36a891e0b9745712ffdeae7cb83b7972d3e392b87b3fb5218b9de10a7b10358eff9dae44e3ef4ea2eb32d7d8875cfaf9734806 SHA512 8e61d285d7ff344c709617f6c6a08be6bce564ffc99de48f4be05efa7880598076c998d95d5f7fe3d3c59ca9f58b0909518398838609970a879a8ffcf6cf4bd5
 DIST github.com%2Francher%2Fwrangler-api%2F@v%2Fv0.6.0.zip 122226 BLAKE2B 3cc43394fbd12503f12d24919ba102ce8c66e1bf180b8d8597e58406edb9c9e976ebe9ee045648557d9aaec142ef22a334c0d3485e4eceb9d04b7ed9c0dd2b8f SHA512 60d2fa5863a81c66ee4fa18ac82cbbe6322e0e498aac5667b2ef3fe51790edadf218e535d0c07607fcf0883fb27502ae2652601a96741a9ac1cfbfed72be960c
@@ -1344,13 +1466,18 @@ DIST github.com%2Frobfig%2Fcron%2F@v%2Fv1.1.0.zip 18583 BLAKE2B b80174aee62a81e9
 DIST github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.mod 42 BLAKE2B b9e93197e4b6bcc47959c44557b28886a5bf1d084931171f1b6e9a0ed30ccdbb916b8779ee628bb4d0aff09bcbc632a4d4b292ded43207551fc598d59a8d0bfd SHA512 ff937cd1958b0f22a47f2c4c630928bb4465aea0fc8699a9208926056c996293a5c0ca4b6b9e62238941a49944160e02e1b14b27de58ce82904e91ca3b17ea7f
 DIST github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.zip 32161 BLAKE2B 671d6595a06bd0bce19331b717ad8f510e1f01c212b515049ab5bce7a45d2682a1c80e2d1d47b8d996845e3c0498de271c1b99447a7075e59e9937f51fec276e SHA512 d011f8a78bc117f8bc2adb18a4085cb5b6360ea42611fd25297970ffe81ca1f5e11cdc72a004dbe90f9f9414cf759c79a376725c89842c836c521771eb6eaa1c
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod 45 BLAKE2B 6fe371f17a31bcd132ac67cb50052f6f3874c9f62e2d67f48d52d241026fd21e58ca9abdc15fd53cb949f79e7d40dd0c289af3849da3d4d9ff75b491e8235c10 SHA512 ea2e9a81d7720b4e11129fbdd4772be224b6e1267157c29b9d33813b6f4ae905e43c3840cf1ade6ff5f73bd22c103430a0bc882355c16715e124b442652cd4da
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
 DIST github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.10.0.mod 813 BLAKE2B 4b9dd50c49ce8e79410e2b8d75bb8be0dfa7dcf68b5a1508e5819c3a24477166e3bc1b19f7b5eeb1d361129d67f8b9db8aafc0d1a0eeac6c4adb932c219d1b33 SHA512 96d8d82d5477cd6db968ac95f458d4fc6ee62b3a43061a085af2de6eec3a813ffe1d47558781c310948d79f135348b4486b63d07c68fc080322606eb73f6fd53
 DIST github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.10.0.zip 84855 BLAKE2B 8e9eac6a861879e761f98560bc75149c2d8f396e3f43d05832a4a77fdf2209d4aa925d611893beb8a289207a39341cb337003574106b31b32ce96fce30d1462b SHA512 d44eb856caa5c12a221232a09f345555c1291551b796ebb3c7d540d5ca32eb805a0e5901ef98900a47f49d281c0afb3b6699a0910270db906e48f02acfd4f615
 DIST github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.0.mod 722 BLAKE2B 0e9fe08a26bc76d89f7cac87ca6bdac80701fc7bf31038860be5bcb3300b92301df3f975673e47beeea3e8e61aa95c6775ac55fd024ef3f054d8b1bf87df4894 SHA512 a085a3247728283ac02cdd41ecc0de8033a2b5735bdf951f22859a05cbb9b6110c2f8f94a21a2668d9084ac0abeb9a0fb68d3953db7f0262f2f5a310d904fa25
 DIST github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.0.zip 102072 BLAKE2B 12574ee500fdaf4d7d337d088399ff3f6e92089110faeb713a76d98e0da837cbc2690b5783f2ec285604ca1c647e0e6f71908e545546c7290c4e41e6d6921f38 SHA512 ad91b6a493e5a08dbb2a9fce24607111ee4fe0897cb50c467a9da286a024e0c8f1e20683660f457fe0f3ccaac924f5fbbda9bcb8bbe0094388eca4b1c0a85019
+DIST github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.5.mod 720 BLAKE2B de5c6f93aca5338c3288022c024ea7e0bd1a9942bcb00976fddc5fb430e08338020fc0dd8b416669440c22347ef4f8fc80be2115624dbc6ccff345dc87d185e1 SHA512 3e66eadeeec13bfc51931e64e8045ef85d0376022574de7f86f9b6ce61549111811a01ff65b143b4c54e70bff1ad119f7bd8e68a7d14786b88d8bbb251c148aa
+DIST github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.5.zip 104588 BLAKE2B bddc51e9b6e6ec1a841fd053e3d063d2d34d705aa033d2082945f2a557cc87923440ccf86b5b652000d41b7ffe32752bcd62811e496850152ff0cded462b1757 SHA512 52a7f6cf48c15cad78f1ae58fedd506c115be35a8b4174515ffe5b27571e6fc99bb27930cd2cab0e6af3c2c70222efc27adecbaa23deade62ceddee15d4510fa
 DIST github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod 25 BLAKE2B 23b4d575cda8259ac3498731524edc19e21e56ca2881d58ab40adad9469eb97d94036eaecd4fa5e78558e852f4c8f4242f830c962843d14779fbef470f3f8f2b SHA512 18a8e8a8b69974b2112578bd8995f31235bcfe49c218b2d0affd6fd5d6b7938687d9f5405d4a228a2ee2960de7960496319a92a26e8b29f6076983c0d07ee66c
 DIST github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.zip 12755 BLAKE2B 3ed8de4c779bec9c9b6bfe63e2d70cd86a73f390bbd46c1da03c2d7d5e0073152c273b44a903314be7fa7a65db702cb4055e0545541a3f3a5c1b62a296748968 SHA512 0911d9b0fbf3c775aa2c1507973bfefda027364ee298ad02a1e52f86c480f4592a7e6fc84f9864030b70b9121a552ef3011437b5deddb1e7faf8ae6271741093
+DIST github.com%2Frs%2Fxid%2F@v%2Fv1.3.0.mod 34 BLAKE2B 191c36f7e2328b0192de2eabff29eaa04575c74260f00171ec29e97ce46dddb7e6fdc32bd50ab5904f4c35f535be2a9af45a1613c4f1ee77c07435eca44118ee SHA512 d47bf7f1012d6b846425ee3b7ba44c64cb51d80e258e4c39df4365a3730e5c55f8836e484d7d77777160c35ad4431ee48f8a4d042b638d5c7eef86de6ad4b943
+DIST github.com%2Frs%2Fxid%2F@v%2Fv1.3.0.zip 14596 BLAKE2B 67169563de57e2b05834d311ab088ef39ddd732be6be1a9a4ae332a14e1eb8d4b1382148dc971c55feaadea793de0b94268ba6661a2cb98a9faf3f6eed448288 SHA512 65571d1a626b3da5423643f3aa04dd2501d5fdb721e120fbe2f512698be10c1204e3bb57849d53b903fc703d06c68fa707850f184a09bf6021dd6755ae8b2404
 DIST github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.mod 33 BLAKE2B 6258821bac21d5e3eed8d35b7db10197ff9432f4795e10e6a19c928778e1a8c47acdea6d697e897c80fc9617bb92809635a9c82f890e0b643c12516061021b3f SHA512 9c8fab721fcf3a8100301e1c86d3d93cd40ebbb597780e9c02c42ff0f30b54b1cd4a2f7b1887bef09f548ac96a2e136d56f63b8840bd3d13844b59ec2d1119bd
 DIST github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.zip 26395 BLAKE2B df43b118e09802e02bbe7597335a91ad8cf63c9b1824b2b65eda40b3bdbffa03e16dd36ae6a5b710715c4ff1adbd629fe579136f85d8bea53375d2144ed2091d SHA512 12eaf4bdc8237dec2c60b954c7d55e621a9722663a91e9cd3d77c85c114740b48a80646fb7bf90c4f5bb969abdc6910ca2e3f6849032f554fb66183affe4bfe3
 DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv0.0.0-20170610170232-067529f716f4.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
@@ -1362,9 +1489,9 @@ DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod 42 BLAKE2B 23dbb
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip 122358 BLAKE2B 8f906d748eda31f9e673fd8eb0978eb9ff17484d38cfef9f5cb7dd623005bb971d131dce52a6089f5a41deded4c4dbb956aa9a56da91b5a5b5eba9e3a9100f59 SHA512 11e29cdd7a8baee7995009755582c26eb819efd715e9dfa1442b5743c7bf5752188f0fa8f5ddb3452f05f371a280324406410b683609f6a510277d3e03b30ca0
 DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
 DIST github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.mod 35 BLAKE2B bcdc10d46ac3b8a6a83e1cf12d688dea82392c2ccb341edbfc922324b689ecdbe9a2c3449030cefa1ad723976364b8f774e3d6f51dd944fefaabd84b3eb203e0 SHA512 96b3521ffde2955dd8ea8b22b14dfdc829fad79e89a4c54e9c243cf34829e650d40f3e176157bde0b3ba3ec89c40c67f51c49d4ab1e08bfed762018e12ab7024
-DIST github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.zip 17390 BLAKE2B 3ca08ada815a26c3b12b441ac21b20c1e83023e5fa19e7f9403ea1e70f242e07429f5e07790d2a19f2b35650fc440f051d2fd2ba3c31b4786ca811088d5064f7 SHA512 e57f0aed2d9c09096007be091fd46abef86536cf187a7b9329ad9ae420f9702a5b7924a91ed82bde9251f1e978f05c8a32b00c9547063d6c38774181adca78b9
 DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
 DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip 16598 BLAKE2B a24ac9b6c7787b9593508fb394cfba29c5dcce040cbf7f78891ff521f00773bbcb189c12cd24500510ed6b89a4c906ae7eb6dd0361a3a7c0c964a6819d8aaf27 SHA512 a694940f17372097d987b0585df417a71a5ce9883aed9f5fc1222dfac32d08f804ecae1001a9241ccabe2a4c5bfeea588cedac078afd6ac3188bd4e907376db5
+DIST github.com%2Fsclevine%2Fspec%2F@v%2Fv1.2.0.mod 32 BLAKE2B e8025015e31a3d5b74f81886e755e9338d9020d49b616c6f7b8bc871eda360a75652715a1118074594137ddfc4b66c5ee4eed5db8ad81c056cdcca644ad36b3b SHA512 0062faa3aabba9df70e9fa757eaaffc948057d356c8062c4e042c5139885d8b44e461998ffd6b4d9d5261091b30a9ba5d1d1943063f21ad5572bc9d679d0bb17
 DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
 DIST github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod 44 BLAKE2B 74f7855fc5488715e3e4b73dfbe83b0a35a050447fc3369c06c532592c7678cdeb28e9f1fc7ef4f5c14fc90c458d8654baec12ab0453117219ab7b865259ab63 SHA512 b9123f2c64dfb2b16e7081bdd7cd3e5a54f911387cb13ccd5c50c113b3ad75ccb64c754123a3b41d916b4a8d089512eb65a5db5eb303f30118775eea553f1d8b
 DIST github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.zip 20630 BLAKE2B 1455301faee92bdebcf4b34c3706600da35240a4b386b90bdef1536c9307048dea77b08303232d2f98b2d407c90dd5b3455a87cd076c192bd755728554155310 SHA512 b77f6e753874e09fa17ddf869be3d4e81138c0ef1c277e9ad58a2a93c89ac8216db3974828538837bcc9c912b73ef85efa5cb8a2863fdcea9b7bd9f559a571ed
@@ -1374,82 +1501,73 @@ DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip 55374 BLAKE2B 39f93770143cb7
 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%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod 34 BLAKE2B 9ff118e3db6f2a49d8cef81bbb78af4ae29fbcf97955758c08c4a9a610fa66f1f6da80dec5aff3c657bbbdf1fd5330331e58dc46c2b2bb657438ec0879a3c45f SHA512 186b34d707aaf1557ddc8edaf49fbc559024f454bd560ca8451cfa555abc211cccf861aea94018363547e39140d9e507c97f7a3c87bb9f1e5d444bab4c531e36
-DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.zip 41533 BLAKE2B d48cd9a1b2cc78151c663390ee002dbf4049f4c36def23a75152fc58d4cbd0f629620c5e9e0c624ac4775ace1a4a531ef5b42fd908681f4c90bbe6bc5f2c1241 SHA512 b59eadbaea21ad46cdb61df84d6774549eb0c885cc4dad073643ba896c9fb2a07d4e5cdb3baef1a37ec88242ceda745c6583961db12aace7c26c3bc951be789e
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
-DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip 52967 BLAKE2B ffc9e503771f88257408708b3e0bf6f1d0c9a36dfb10d6f4f6377fa7e97599b1993f6198a8dc013d29ef17929a83562eac4f5eba1e8f51148b189a94128a4314 SHA512 d30efcc17654904bafaa3cbac0c2aae4b44f83dd347c8ae4ea77f5b637ef4371e08e6d8483ccb8a73273ff9fc91dcad43e8c536ebf5de9b69bac66cdfbf6efe8
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod 337 BLAKE2B 41471db637c5c0363cd36be6d16a6228671ce9658ef71103ad2122a2cd8cfc13c30b87bf2b34df7ba9d6c1fff1ac821462fbb86b622c274cf26a1e3ecb7fd2e9 SHA512 29a4efc27c658b047fbfc6eb2ae311753b01fe878cc733e2fdfd83f5791b3e30ab50b08addd300dff37e7880f6b57662ac0cb0f4b98df2c5a5a9f7d555bc98a5
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
-DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod 301 BLAKE2B 5322be7914862368eba07f521c046dbd7580edafd47ac633116b8c9f4b61526d0d63df11ba6894223590a1ffcf4bf478c394a335c305010ca9fc18107d4e61b7 SHA512 8fe5a437a5f3f8c1ce0aff067ee261a946d946d7640aa5acf7c34b9c8c4ee65128a6421aa38bbb1feeba1339b356952ad58b4bad98f1c89ac455d94e86684a8c
-DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip 65802 BLAKE2B e0487985824efba7ee61c5a73df7b591d625dcda32f833ae276191cd82bec8f3db30cc2ba217d80cb56af1436b8954fcd22ed3f861c6c7fcb4a94818357bbde3 SHA512 abd13a98d10b6c996918712443edacf97ba5fcb9ece7615f59458a583130f68920dd313533ff0d8c84c6011fd2c4d221783b1250e3250b569a6ead9d7c02f7a7
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod 242 BLAKE2B 68986e3744d3ae593a16a24b6ce79876723d93cdf96c978c185b14e4fb8d73d379d4ba05e138b412973b465a76a98a458c6606137b0affdd085dbcf20851471e SHA512 ba06d3386a03812f2ce65f0597b932beb62b70b4da92974c5f5ed81c150fb71ce0285a2d9779ec8a40916870b0e4da5c2c8c5591c3687f3b8e829652a01ec1f6
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip 66939 BLAKE2B 20b3a98bf2aa70e3e1e923d1dab88b543c0a14377518497f960b5f89812f982cb09fe24158d117938c8b8f1da47ad29a330e82f5f952461cf4180fdf267aedd6 SHA512 5f7f556c264900b79a512f17005c7d3d3b1e5d26485002cfc828411e5b183b62d88cc4e3a4c0a352751ef9a561997903ea2ff4cbab419592afe0abd69977dfee
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.mod 242 BLAKE2B 68986e3744d3ae593a16a24b6ce79876723d93cdf96c978c185b14e4fb8d73d379d4ba05e138b412973b465a76a98a458c6606137b0affdd085dbcf20851471e SHA512 ba06d3386a03812f2ce65f0597b932beb62b70b4da92974c5f5ed81c150fb71ce0285a2d9779ec8a40916870b0e4da5c2c8c5591c3687f3b8e829652a01ec1f6
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.zip 66301 BLAKE2B cc9a5f24d1cecda3c1cb51b34d441527c40d16a4c088b888b2e43bb08b0a4f41301ba78fa2503b54546b568a49544ddc516451ac1aff4fc7f92300677e802f5e SHA512 50aa92ee488371c7242664cacc6772fcf3b54068d834089d7b62675f9e17a84d234295f266419919ca197f3ddb6d358bab6d5e4583883d4504d6ff90054f5827
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.1.0.mod 52 BLAKE2B bc9a5ea80a8ced1b4cf2ff279ae7260bb389fad5c465bfecf69420494e69dfb90b377a6c3002e6d23af1bd9a61b5462f6d7c7923756b372f2ef4b27eda8bc585 SHA512 667071e39d96fcfe16538893a848000823a045e83b02adc404f89d6dbbac7d70eaf1f7163247f16eab577b926b528279e5d1bda525ac8d274a431ecdd16ddb1b
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.1.0.zip 117938 BLAKE2B 5b867b6c72fbb58a0b34119a6825d76200494ee8aa3402a7a7892e6f9953547c795854c8e8e4efe0d7ca1d9f03bc0376fc5cc0fa4f94a77ec7a7ced7aacec44f SHA512 67b5ed93a02c96a68c27fdb9fa2a9e2e01ab454cd931e13f2d412b1c2242619d2cd32111791cd2b5d200964767d84d76a9fce4a5219b1825dc7e78233ce3547f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip 1521758 BLAKE2B 653e697d76d392b18c09e5c1c96734a737071667345b9d6ff9c9589bbe74e1c50849dcd7fc00b660adc1aaa30366aa9ca93a94d5eb4e605f7897d9714119f926 SHA512 3bdd2bbeaf755618d9fa7f324814497308361cb0f3f93a7ac84b9fc01b79ab346353ff0a022d3d85e74aef57b3773e03ea9279d0a60de317a1c57d5eca2d1507
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip 26744 BLAKE2B dbc7578fcac5c616d1cb5dd7cae959ee8df0496532db36d78d617ff265f213e4e5a336d33b795e793100c1b8e604919ca6fabb1736bcea0c02bdd0f8f0cc931a SHA512 dc990fd4f640acaa66baed26f2e82e0a6c46e293b016bd1573e72600e1256146f1b8abf746ebd96771bad4f3d95dded70c9f884908580ffffc4162efa0450735
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.5.mod 102 BLAKE2B 437487bf75334bee113c97152964774acc961e5046807a28eb13a45886d61579182ca22a8b4cb29aea27604dfbca6d2fd16ec561c7b2ba59cd108821289af699 SHA512 761412f1b7047c5a737b2e930431fad9daf21cbcf40aafaec5879173c08779699f0072fa40357b427f8274aa68d9f31c466ce63b91a9d11f0cd2c115f76b1a4b
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.5.zip 23712 BLAKE2B 4726b92c206a75b20efe33ddbca7776b21c8d91c36f65e9ec7aec53a62b5831d8eccc5cb4cc2585ce24321034b652ae24c33e16b95729986f6907d0193586e53 SHA512 3587b3b4530120a27f3f8fbc0ced4625b523671995b1330b45066d3b74b5b24b715b9fabbd567341a8533e9c9a808f388c2581e72fa51f2087f9d20fc1ad57a4
+DIST github.com%2Fsonggao%2Fwater%2F@v%2Fv0.0.0-20200317203138-2b4b6d7c09d8.mod 32 BLAKE2B fee5139d049e48f06638b2c2c6212c62b063f02aa39e2ea6bd92bd7fa8e40a0e0affaf946aca271c53a312bd934c5c77466aab46b067d37b0013d04db4b34db1 SHA512 0b34358a6708a4b15b9268cb9e2093a3db82062d8d686ee85b0374384a5c892a17d1c3057dbb861ad3b372e92525c136d1cec526352c2bbfaa3221af3e7de233
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip 68547 BLAKE2B 608b2dc4f6e135b208d273d5e6de884f02eb15ca5d790104c4b2c449595c3c8984238cd4889215472cc2383968ea4d78f75771a2c66b7041980b8f76884b54f8 SHA512 6be9a4d700abf43f9eb8279b601339ff2290f6278fbbaeb308a9d51d621881e613308595dffb8d843d070bc3e21caca3ebaf20ffcbc60cdb2f8590cdcd30c595
 DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
-DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip 12738 BLAKE2B e7a649d1c85aa7b3aa0a80123c49d6e980d8db2bdbb7c49d5871cef8c35a4f632f4de0987ae1b41b3f9b472343e22228f7e75cc7c841d446ced4f33e859039f2 SHA512 4ee0de0cb44960bd75a18648a2c7e4428cd1df1b042e24588d3ed6adee05388e6211854db1878e6ad74dec95083e439d147975082422b8ae5f3c6c7896df4304
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
-DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.zip 139771 BLAKE2B 869564f87de55992a8bcee05a36869a8af8a7bebbb6e079ad40248dd6b81e034455c9b373427113d11cb686809e8a68fcffd6578e9bb74b85f9679e816952416 SHA512 06b98c8d857ab68e20e4639a363d524f2fa5236b9ce807a3cbdcb4f6e1afdf8b14d18a1062fc86cffebd39d9d8900ffa3366f3cee2825a0a5a2691f25323d0ac
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
-DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip 139997 BLAKE2B c20d7292a69fd548bf0dbd62751dc08a41c66f120bd8b5142e96f498aafd208328ed4888d7ac59404b64dace96bcad210f64734e432f15ae63ce6d39dd308cf4 SHA512 1476716a98d5aa26c34af6d85eb93886cae211beac7cdc8f886d2030bf7f83802409aa56510ba09cbdb609dcd2faf87d3490c4e5392922e0e034edcd3d9fb1bf
-DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod 310 BLAKE2B 851f2542f28849f4f5c33155e5d9562aa9aa2645f1fb57e6300e2c6e98c39e0728e01a5e26d4a514435245662fccc55b8eca4eb2633a21057a6c4a5d80d24fd4 SHA512 dfde1474aedc5f36508bed07a01fdfd433967d2a6c0acadc6d985ce862da5e1cbec7ced13d55073512afbc2d925e6ad3e3cdee9511ad17b14ea8a159d8adf8e0
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod 265 BLAKE2B ecbd8f71c2576f741916c7e6fa4c279c327766a9bf957e019164a1ff8af16ca1fc6810004935e57a3b085f81252549ff0f4ee2b89a5e53dc0110218acba937a6 SHA512 25511d7efe6d605b33c4e142ee073694b95d93b10cf3e9d74a161dfb71171de0accd626587299f41a061f4a3ea34482ec36fe7b9b2b3588d8af6b3545a35a45f
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.zip 171286 BLAKE2B efa68ba65ecac895de82fc8f8ae470ed9b2e24e7343f24429a5764fa042f7c91dbe8aedcc0ae003fdfa188bca32e7c4c82481b69736a72df76b50fad3e9094ba SHA512 f311c5ccb68a0b5dfe41f993e0867cbe9742dc3fd50904ed688d4b89777f4739f7a9293f548e7c2ee940d1742e921a3cc82cfe1b9d1b210e435d16c8f0c91880
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod 265 BLAKE2B f7a8de886a358b7d2910807ee16a26c210850980541aea7d179b7880ee57af17f0aa62d0bfff1f1116d8b32c9ee05bb6ac7482313e9556494e92c60ccd03ba1e SHA512 383bafdea96d9fb12cb72123ec4c5bfe3669be7867fca80e2cf4dc7a64e5a69948272da4e74851d1464dab1430362efb9a43914985019bec4fcdf942fc21193f
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip 186061 BLAKE2B 795662b91cebff6b3c8dadd024f73e29ff310deeb2a48d515ebe1726b6979e38ef7912940b8e6f322dee23da9ccc298f31567fce33d4af60979bb0baf4de0d92 SHA512 e764426cfda39a67fc94424affd4073caf26aca0145f7dae44dd5b8dc9c8fb0a0ed490092e58c07ea9586e4c48d0308a7ab2efca1c7b2e510b4546fa0e39f77b
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod 265 BLAKE2B 22909466af108048bc272b0e67db40f6fcac375de02b29aaee7bc31153d73b2c1130faab8e27a82dba9b5930c789de1840468fe9eafaa8881cbee126b0c9df1d SHA512 17049e0eb9bab7ebe298bcc1fd3ffe0eebd40a7642c48f4e5c2447dc37a3099359d04dd929643497f25ed55a71d7ab6ad6bf0e75553afd4fc98616295745a25b
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip 190543 BLAKE2B 692f5c496466f8d914c1172446f3cb79b1ff9c9e08d7afe44d8af3fe1248b6c1b31fecca3fdd8343afc2b014535dc8e1d3f49a3c71f360d46933ee28002c4c40 SHA512 12bf06f87e15ee039ca148873a13f5944ac6aa6800999ccd5df5175a79fca03edf4672236e2c25ebfe1a28a0aca24d0f6965c8b040c09fb648650976baf8c305
 DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
 DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod 188 BLAKE2B 26b2922f8d9ebbb77872bc280b6a40ce569be69e78a0734cf7f75def7709fd86183506274ff8b9e5853cb0dc29043ce315acdda631102497a8178cd749fb0c03 SHA512 a5da49fe5d41b33c03cd1af18affc92ca2572f0c735da70c55f06d668ff33ae4a231fcb6cfa2e85ab4b04ef4c7808d895739d0121ae874c43b01edad791f2735
-DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.zip 9825 BLAKE2B 19f73014efe76cce5fe92a4956b494f58093416931f8b71a6f3a25c7220c34f3e8b981ccbc80a6711d11b5b706feaffa84b5ad288927ea2e35c73ffd2973b915 SHA512 e92d5ce203ba7e7f9cdfc4e9c383a6b25a7afaa2a14c057cd51397a51f6fb21eac97e6fb3df1cf810f82d7a5d055ddd354ab0178edc9ddf433e2cb09f1125939
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.zip 64264 BLAKE2B 5fcce28aa3fc1fe0ccb6d9555cd6c8de8ef72f001e03ab4d09d5f29ceea2cb2cdc015c93fd4ada100954b162ef8b8715b369c6f40e63e255666a2a8f3e1f9cfc SHA512 08bd31164df26e47bf11f9edde91e7ed8c590f739c12c3299a209811ec9ce8ba1559394890a201fac4c90b723973a2fbc9f244f273415e3da60a66224155019a
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.zip 66011 BLAKE2B c4672488d0aeb5bd7c903b8ef845fef0b0a260dadfc9297d81047fc2bc0878910f298daed0c8a24c76e4d1f3bd7ecdc32394dae3d6397c0424ca1d830639f4db SHA512 9790ce50eefe007b5fe3ebd38544e895759857412a7cc99a9e18f33c5c7d53a52c989215bbcd27eda58fd9858bcacdb7cadd2d0ad9661811424e974f88bc3ef3
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.zip 69054 BLAKE2B 03dffa3333ad0656875adf9c3681e7aa966a119a22e7136de21ab517d960b25f36f5f64b8790951351a8bbe49a6682162b0e09198b10c71d0049072cfd1f7ca1 SHA512 63b2847f7eb93fef4af239ec91df153dc85af0b1283c302880793f1427ececad90b5dffaadea6b2d2e560fb57f29559b82b417cf317f2a7e9b7e1bed7f50c225
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
-DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod 2018 BLAKE2B 516407d1afeaeb665c558a4babcaa35aff28dd9b41298d04b904378159f1978a924323195e4c160cb9cb992c264558c7ae4f07ec157dd8c65fb98853a3cdc53f SHA512 fda6d22c26332038895ea2f2c62458baebededb0df883728dc9a127c10102b9bfd3e8128dfee194d909d645ea652f3ccd5ef737a8cb7ceadab71864b21de117b
-DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.zip 48887 BLAKE2B d662cbfeae13c775fee95fc7edba625a156372ca4b865c91525f14b0803d8838dea27667232fec3cc2bde0654c1c247fb4c2d5b11668d2a056baecd86272879c SHA512 1d3eecbb2fd58de1f494ccd5bee286560a043dbdc7f6bd11266eed916db0f016439eb446e3fca31b6541478b7cc303131732efb4ea5e6d68749617943a2b7fb0
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod 1694 BLAKE2B 195244bf4042b519551efc149dfbd9fe10ff87e5b2ffe6f9a2d3777516315db8b43968533ff089b257c10f94f99babd076ff0a7203a434a79ea5aa7e39eb9818 SHA512 9f614a57ccae909af00a67e464b04eb91a92eebf1c28de3809351363b441d22a4a6628a1902fde8b67956d0bdedd91423d20158eaa6b9cd994fb7e284a35e061
-DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.zip 85562 BLAKE2B 0172a0ee31dd7fd1f744e7f7dd0fce8a282e9c1699939da18b3d2ca31395c47fa1a6cbef122fa3c2ca3e29d45df00ee0adf2d4f77f011491f7e36c2fa809cd1e SHA512 59ebf64cf72d1435cdb310a021f89e98f0e6dc0a531dc9b639a4f40c07297abb401598365ca535a8c3b222483264b75ea02f5447bd6f78a4eaff16884bdae096
+DIST github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.mod 44 BLAKE2B a9918d823f3b60134a219be4cde670883d2e64732b665c78a642f1c5bf49a523876041533ee7523f5e77c4520746ff4c14ddd0fcc8a5baad56d7e58f73393ad2 SHA512 6ae4ea9b6e5c2e0951834010d12dfa7301c9142a16636b7276d978d05394ea336520f238fe7db9e402307256506fcde1701198a9130d7483dae5daf5a17ad901
+DIST github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.zip 14166 BLAKE2B 9ef1beff45a293cbe5b22b78b6498d167d3f44d7ec76dfdb7c3a36bec18a21b5ce78b58ad342b20981228216bc08019592c123fc7bd3a9cc8d1d92e6e5407b4e SHA512 ebc1fb3dc920c605db30deedc866109e86721303dc22a5a5468f81ce6fd4ef3453ead67d3a3f6436013af429a4e23ab86113011fd33e7a54d5016a49caf66501
+DIST github.com%2Fstoewer%2Fgo-strcase%2F@v%2Fv1.2.0.mod 90 BLAKE2B 32b404a3a6e19f47c33f0f7803fa6cb7fbadd3d4b1f2867ba784d7edb0eea652ff46fc2bd077639aec880590020cccc5015ede4ece2f2c5ece1a429893e5e57f SHA512 f3dfdf14560790b30989cbdf4e295b54acafe9a8ea073ccb276f901a3a0497642707b7dfae14dd8e7ba92b6a7575d2ed899439772ec2dca8c0f66db3713d5023
 DIST github.com%2Fstorageos%2Fgo-api%2F@v%2Fv0.0.0-20180912212459-343b3eff91fc.mod 35 BLAKE2B 7aef81b8041187cad774ef9e48d9f2ccfaed9e553947dbf8fb06744d02885e530b4833d36e152aa92f51bc6a6b25cbcfa024e6c70e74db48bf85f93e3335672d SHA512 b60065792a85db6921379371c5a18ef5aadd150a90afd152b7a9a0ee270fa5236f43bc2efafb618f77ac361aaee5bd690b210f3d45db9036fa109d29bb0c95a7
-DIST github.com%2Fstorageos%2Fgo-api%2F@v%2Fv0.0.0-20180912212459-343b3eff91fc.zip 83798 BLAKE2B 5092dd8b2ce174b4b57897100f9c3c45156d0eb7f46793a6a5c7fdc59aebac649069e0632a53539bbf3a61cfdcd270aa9d1afb526be3672008df517d3fbb41b0 SHA512 140274fec0f8d3026ce7011c98c71e2bc585412cab349464ebda328d713a40e27aa1974b2b943718f84d2eb64aea05e36e32084873d26443a7f85da9280c2014
 DIST github.com%2Fstorageos%2Fgo-api%2F@v%2Fv2.2.0+incompatible.mod 35 BLAKE2B 7aef81b8041187cad774ef9e48d9f2ccfaed9e553947dbf8fb06744d02885e530b4833d36e152aa92f51bc6a6b25cbcfa024e6c70e74db48bf85f93e3335672d SHA512 b60065792a85db6921379371c5a18ef5aadd150a90afd152b7a9a0ee270fa5236f43bc2efafb618f77ac361aaee5bd690b210f3d45db9036fa109d29bb0c95a7
-DIST github.com%2Fstorageos%2Fgo-api%2F@v%2Fv2.2.0+incompatible.zip 86110 BLAKE2B f4465df470ebeeb71f6c57d367d8f3b97baa477914465253425d6c54dcc5cc7d9cfd3c3733a69f74730eed781fb97dbbc191a0843c9455d0cae21896bccb88a6 SHA512 ea1e154a695b0a195d8457a7edce8d989bd2579e547e4fff8f612a526edf0f42dd05530d3af50bc300e2b604bd279eb648bf7e85d4558b4f7cf519b9c5a96862
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.0.0-20180129172003-8a3f7159479f.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip 37190 BLAKE2B 7c8b79cb736f53337fdd2878cd1d745a6da3d803c3d3f6a0ed53a86f1d4789d2c656c6e7a17f90caed496fac91fdc89fa66b1de7b2caf97409114aa59658efa3 SHA512 b2af82dccd20e9539d72c8629f2d4babd573f711a810fa77e629fec897a614776cc4ff857700c0b6eb32370a13d122504c0a4abdd3d9111eb8ac0938a0e7234f
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip 42547 BLAKE2B af3f81b3947f0802a6542c60db0248aebac9521d75d0d991f76b5783f4eeb42f7902250cd22da1b8fcfc2f150342ffff53260276b7a6903c092febbe66f40ace SHA512 b21cdcb8683760280e515ae487e17b65b324b51dbdb36c6380ec0b272699297d388a34b1a6aac281b1aa149d85ca81640850e1fa0d84bf63f3dc67b794baa249
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20180303142811-b89eecf5ca5d.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip 81710 BLAKE2B 245149718759e71d8c882731fb51813924beee131aa16c9d6ea83a72738721011bceee80411d88dedf91653219d3c8ae33f66349e2d373b08931c28aa2e16d8d SHA512 b2cb918d623065d391a318f4f5c532aec12635662d176a441c30cbe3b042b60be848c7eb685679c5258e661f5780ebc3db3f9dbbb8a37e157da214b4f57fde88
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.3-0.20181224173747-660f15d67dbb.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
 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%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip 105564 BLAKE2B 7b082ff11190ff27ce4a3de68896fffbbbf80ebdead7612aa3b06981171974ad2935bee7d5d71cb9ea29b110a82b3e04447248e7b9376e84c8f3f53d5001ae4b SHA512 be80972112f0a3907bde960637cb2c08d6ba4256ca27cfa07de5a0a8e523d0dfbd8e90ae593e5302d7351b7dbddecf69dc3985a9d19b96087732dd886eff371f
 DIST github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod 34 BLAKE2B 85a4e50642e7088ee26b82c69c65e1bb0396d4e8819088fbdf1d93a8348d7aab950630e3bba1747517d01e0cfb9a9dd1b95341df0722480bbecf18399ba84674 SHA512 50b858817db72f0615a74431c9966f969d12a85fccc3f0dde25a72fbda32f77f3ac76cba50b12fdfd87ed7a7b3a337a291b1f9c86e1fbde81d2d0c2890c1c21d
-DIST github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.zip 10296 BLAKE2B e82879edb9db32d5d9482b6d99f0bda1a04d5b54125ab92629c35777e3ab9001ec9d5321ac0112a245d59cf5b06cb96d1dae785cc2b64ef922d904bf6a731f57 SHA512 6bdd2a829369530a1a8e2b2ff93094b5b0a6fb35873a63f79498b45dfd8c557ab0c91a393974089af1309d626c3fdbde1b02bcb64ffa05550a48fbd0a9d76148
 DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod 38 BLAKE2B eafcc0e8c3633f2d4c2cb4eeb38eacdb7d029944b76da9ee611b3fd2d3b82d2adfb726405168a34f70251be920da17fdc6c70e8052720a6093c788dd724d24b3 SHA512 1efa76d27434ede74fd37d57c1673c8a60cf06248a73c425b5bd08dd068d6b50166b17a15b52d0c059218479fa3976e80e16cba08f671e9ecf7744cf5daa199c
 DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.mod 38 BLAKE2B eafcc0e8c3633f2d4c2cb4eeb38eacdb7d029944b76da9ee611b3fd2d3b82d2adfb726405168a34f70251be920da17fdc6c70e8052720a6093c788dd724d24b3 SHA512 1efa76d27434ede74fd37d57c1673c8a60cf06248a73c425b5bd08dd068d6b50166b17a15b52d0c059218479fa3976e80e16cba08f671e9ecf7744cf5daa199c
 DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20180916011248-d98352740cb2.zip 14006 BLAKE2B 98de01f568485c6909fd0e98a46e2cb040bc556c175948af267453cff5c750c32e95b27609b513073d374da19a8521e62f7a8cc195e0eb993662e1c443cbbfd5 SHA512 7782b65f0d21a519d280f1655257da7b15e5e433f3eb3ff4bc963c81fab22cc9d18ffaea0786d9a7e9f5f32425353c055ea8fcc1daa1e8a30caac47ef2ef31b1
@@ -1462,24 +1580,19 @@ DIST github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.zip 16061 BLAKE
 DIST github.com%2Ftektoncd%2Fpipeline%2F@v%2Fv0.4.0.mod 36 BLAKE2B aa720d18a14cf98a1debeca0e67756a37e7a5d5ff3be89d26eb8a69103825acab74d8e25a136957d5c862a54a4deea181038193830ad2150daf674c8872a329d SHA512 df370b1fade8b63fe9213d07a4aedc193394f3a895ec632037a092b567f706817b7f245e4be3ebf83c3c7f55d3152c2197d40bac7322dd4e59cb9b69a880bb41
 DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv1.0.67.mod 60 BLAKE2B 6e13cc2a35e2d4cc6d24e534f0038e9a1f4f6e12121822a546e282f2a6a8be1bb4ea8ae20097b502a4ac37dda1ad062765de8f7fed3852e19268a2e5788b8363 SHA512 3004f1a66c2a680e5a64993b821bcd610ce06ec7016b76a56a7191453ca63ad194f875b6d9e627044ca78a898bac27ca73a8605ccd25b2479eb545e4026132e4
 DIST github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.mod 40 BLAKE2B c2d18375be8a03fb939416726dc4f68e4debfdd4366ed96b004d231e7660d0c16e67788c3c0eca64a86c031d3d7787abd221b8ef3700cd0a41fc5ab35cd53fb0 SHA512 8644194c5cfcaba2ae9698cbd366d268878b4d80cba48858df7e8cf3af97e046ca376daace4ce1c4ec44840a047f455942884457d9b3a563cfa0de8f3d5a0e46
-DIST github.com%2Fthecodeteam%2Fgoscaleio%2F@v%2Fv0.1.0.zip 171654 BLAKE2B 87dff5786d1ad952d119faadf5a9effbe0d45aa51e3bd50f14120c9c3e73cfd5a1b06d460619e9cd44cf348d4a638a2f772d4c49e58980b33becbe8a5e4ee83b SHA512 3bdcfde6b19eeda9803265dc71c88234c5dfb309a474026a8a5d852155a6ebfa62f4dc36e74224a355d1a4c46ddbd3df5cde1b1cbd29cdf40e951c860a42315b
 DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod 33 BLAKE2B 2f2161156210fb855e4efe08126e21b4fed0ff111b4f03679aa26051e23ac71f9d269c26088262a3ebeb6364fa60cb9e85c1850d8fd1674ab488c6583d6034ac SHA512 39a892eb40bdbf1398cde6fe8575bf4fea604e3bb21473de5b2316ea182130b92c9dd2467e2807c0421a35cddd0096fa99134a9f9de02fe79bb59d82e2762937
 DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.zip 9803 BLAKE2B dbb2623f6e506180cc64bd0d00d88c0fae0f5334f21bedb6f23757a3fd297d11c91ea6726ac9ff1d3de7dbf4a3d400cc7771412ba7978034e78c170b635672d2 SHA512 760da1b31d891006582c28c8394a0cc3494adefbe76ae77882b8340f1ed057011d96ca10bce9d86e881899ea683e6af402770f6f769726811c7776e040c3a787
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
-DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.zip 13357 BLAKE2B 679a623ef429ee69279da815f3467805fd339a082b10272011db5e2edee034efa23f03a0015fac0fbc33ffe2818a7011a5298e44b1013d0015a31f874201588b SHA512 d4f3b3537e862809c33ab7b0d372806ddac9ace9da1831cbea77649f43773d59b1e2d221b152f73eb148e7a6350c476ccb8ccca41108c0a4e4436e878c234d36
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip 13644 BLAKE2B 484e5ae252f421994b2a23fe3e278992a11d79948509e202366a1b496c8f82e7289eabec3f5d2e0489da66bffe73c4c8c58224993ac621a1bd65a11abeb28a76 SHA512 8d7a4d0cf4d179438a0c8ecdf887169d45b3bdc5746f2e11a07c9621dae098c69b3b6a54ebae249efe9aa78669e81db9bf384919204b3d0af866808915eaa6f1
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20201229170055-e5319fda7802.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20201229170055-e5319fda7802.zip 14190 BLAKE2B 977064b97a044fcfe3086306dcab8f6eac6e8d7458f5ae0cd6db9469e70be478c2207cef3e703d5bf3604c1e722f5e5f327323896b1a32f44a43b9bd9bc06749 SHA512 1950754e1fc01ec7f540f807ace45a022177e6170a41ff104d64d578cebe5da90af46bedd9a339eb7411def462e304161ce47ce060e803240b1cec3db89299dd
 DIST github.com%2Fu-root%2Fu-root%2F@v%2Fv6.0.0+incompatible.mod 32 BLAKE2B a7ad78e4f0640ac2e2a89707740847482b2c20c3156d929b27af98a496f720d3ee6579da516043c8f0a4849b3eae6ab3b42b6a6fec1d5dd320f94b21b8efbc97 SHA512 03919957e4a589b3576e8b9aed9e8d4a0858060f92c8e75756a7fbfcdf10326836cf3b03bfd1bd4405a1281fa01a92dcfc876301b5cb17c0a44105a2eb714368
 DIST github.com%2Fu-root%2Fu-root%2F@v%2Fv7.0.0+incompatible.mod 32 BLAKE2B a7ad78e4f0640ac2e2a89707740847482b2c20c3156d929b27af98a496f720d3ee6579da516043c8f0a4849b3eae6ab3b42b6a6fec1d5dd320f94b21b8efbc97 SHA512 03919957e4a589b3576e8b9aed9e8d4a0858060f92c8e75756a7fbfcdf10326836cf3b03bfd1bd4405a1281fa01a92dcfc876301b5cb17c0a44105a2eb714368
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20170107133203-ded73eae5db7.mod 28 BLAKE2B 4d0512f0c014baf150880e5a0322d1fffc7b726106a54fe1bfe2ce5926081af697f6ce74fe000ddfe18e2e6d44799346272c704644ea4f1fb44232ae02b09725 SHA512 65d5e7c1e6f710fdf6b475ad898c14466064c86e4aed61e44aa23ff699cf3a9a631f255ec298c8b3d7414ba640d8d5117a06386fe2cfa5cee47d183b03ba3bbf
-DIST github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20170107133203-ded73eae5db7.zip 196273 BLAKE2B de4b841d9f072761183b3affe9aacdc35892238ffc9fdf6960070eca3b05bc2d93f8c157802b605c727949ad1e669724763a2ec4c2b0a69466b3d4e0801efe7f SHA512 b47c2ffc347bd1c905ce758df25579b723a6986465ff3dfe27a95987cd3339413956f680086a8719560ddf251eb2eeb6eafdeb2bb7aec8df45774e2aa135bfe4
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
-DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
-DIST github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
-DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip 72765 BLAKE2B 61a5269577f397701a50299f9e32b195f56af70a439ecc94f3ccba5a04cf6d1d220b5ae34d26c1a019989b19996335d265abb665ac5aee876ba50b941665cf99 SHA512 5edcc7510abaf7a6326a27a43aa7debd43d333dd1c23462a5f0d8a8d526ef74c085db35a637536eb6883d531bce4bf35648b75dbb19e43e481382572cdd24b3f
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.21.0.mod 111 BLAKE2B 7b28d69689402385a18011130094ae1fbb63a2a13a58d8e26ad6d2acd486d63184aaebca4eec60949560fde04d5a3a0888890f39fba280394a0643c75c9304a0 SHA512 387abf6424bedcf2304bbb4e829348c8c5b980dad73fd829dcf032f86fbbe462c9a80bf924e7d27cbbdee679459f87e8456b8e9eb0edb97961604a1be6c673a4
-DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.21.0.zip 85503 BLAKE2B af64dbe53aea4e2d240b85611d369af57e98ec287999f4b54d901d0d135535b45c0aee934ddab81cd0e355aa938cba0bfebd0b0da886f18ceb4994aed91aea46 SHA512 43d345c57a9516f4b35e6edd39957e947190f9d3e798fa4983a554e2755d2b03c1ddba21e36d0130c0ef058da6c5ec5c00904e5c826084b859c8f4a2dd434747
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.zip 103935 BLAKE2B 3c8512512515eae07ff3690657bd8800880246c3cd667dac372268d59e0a6b2e4f01d2879e121af2a4535300404d9265e491f1f1792e30e7eda7604f121ad0b1 SHA512 28b5760cea9765d971fa36f8465b6f9ad3eb507af619f7782df86da44cbe61de5c95353bdb64b2a151c170f5e1afdb14ef4aa6bbcd9734aec10a1b104487ac7d
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
@@ -1489,28 +1602,23 @@ DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.zip 3449475 BLAKE2B 5eff2b47ef
 DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.mod 183 BLAKE2B 664e1cdbf471bca9566e20f34f214a9abd2ce826067d232b177056fecba72e8d87bb9eb9b56dff47f5ab7a8c5aeb5ac6bccc7069738f4b195cef81851b0ccffd SHA512 081cf55720b5ee8f81340d7d9ff9da92ef1be9d7a139d58516b01db8a2d8e020d097f79305dcba18ed2975b49b2ee23bd697e3c0a466adbf8a8e75328e943401
 DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.zip 3454701 BLAKE2B 5f43a7730268c3bd6d4fcc6b6e27ac23075de3421239c00604b3dbd05f0a65a163a41dce00ec919e2704327419117dfa1f21285b74e44945a615b698b397d465 SHA512 b08d6aa4db1930e6864be6a09bbae416bff657cb25c10350f0a5c7bf92d893240216b6fa243e9d58ac68e684512c1818a70e33e11665b467f6dff6a3433a7e29
 DIST github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod 33 BLAKE2B 1ec43f923edea0edf1f795f14184b3b320765e69beaada55115d54eec3a694f82eac2f15f9a955ef66fabae4a7cca7b98220d6a5231b792cafe2916c98d7f2c0 SHA512 e166de678d1574543eb71f61da6aeaf00396e370d7d6a408c3e24074ea161778e0e836132eed85c364e08bb93909fde32ffb1dc1be5d8eb3c9da09d7f5cc7ce5
-DIST github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.zip 59576 BLAKE2B b1f46161f53094c99114f9877dd5051b158fffbb17f1fdda4faa6ad9c84ce5b32ce1ccbd0ffc3c9c41f069770ab1e358944479fb066256af60a532bf6933ded9 SHA512 28a3215791106fe01d9d09cbc054a968a55bcc3428258a9a30125a7049cf6d253699e2323ccd9eecafcf489675ffd1764df4cc10aa0f060262c7e5528354a838
 DIST github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod 311 BLAKE2B b7d3826a21681cf937eccbb37e11a505f6eccaaf1b82ab8f8b00cf433ab3478f1e2f87f5812fdbb6587e9700e2e8840e9eae935f7a51a257e957b468bfa3484c SHA512 41546de4beb8bce00d5adb8213b5d0440f4917eb0090d9a81fdbde098675c6ad1166f4f2383fe0c526f8069b2f5fa88d93f6fe95642b96a044e49475375b329b
 DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20170220200719-fe3b5664d23a.mod 38 BLAKE2B 3ade12a1ed924c4e12dd9422b763bf2cadf710ef072d593dc40923d48477b792d87aaa3035e020bcab860da3ceeddcadc44afd74d9e11c3902a5d6241c8826b9 SHA512 637521629966c8f1b3d711a2b2b7b1753bed946f26570cd8e5e55ee3da5b106d418e0b80f48cac7a2651b71103c0d09116707d7b9d8cfb2d78d7bac2e908560a
-DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20170220200719-fe3b5664d23a.zip 122003 BLAKE2B 553e115640274edb1b620bad4e9d1c7508e683bdfcd62bec4013b36170e6a3624e90c7727a4eada9db70471196de57ed834e42588bf8a4052a27600518a055ab SHA512 8afd4d7482c2daf57b6eef60af24b51fdeadfbd492a636a6fb47fa1238def953fa387e13dee7a9adfb0a9b92018ee52e5a06cca2bbfe2fa34305d82535cb3ef7
 DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.mod 38 BLAKE2B 3ade12a1ed924c4e12dd9422b763bf2cadf710ef072d593dc40923d48477b792d87aaa3035e020bcab860da3ceeddcadc44afd74d9e11c3902a5d6241c8826b9 SHA512 637521629966c8f1b3d711a2b2b7b1753bed946f26570cd8e5e55ee3da5b106d418e0b80f48cac7a2651b71103c0d09116707d7b9d8cfb2d78d7bac2e908560a
-DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.zip 183683 BLAKE2B 7c80ddc73a1ec900b70c32f3f3507adb4fb04c69a18d1d4334135e682b9acde521980b5b8cfc709b8b69849f390e5957883e0b8e1f217d69b86fd4ca161c6800 SHA512 8ecc3fda12f745221abe792b9c43a965195ee604ecae466e4d9f4db00349a4857dc38beda6ddc58c09e6611cda73c97ab1dd12b566d9655a4dc2c14abccd97e1
 DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.mod 178 BLAKE2B f1d6f07cb4b333ebdd4283a1182c2b8ffc5bdf45a4148912ad383ad73b4dd06bcef24370ee4e33093803042b118bf5a09470e8b2413172ad128f19a7a93c5dea SHA512 a675b67583280d75806977ccdc80641afb67f976ba72d4e106bc90684fa940de2b2854ac2a8cebfa79261e362f46df408198f4c4e48908aab27f9ccb3abd82e8
 DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.zip 192084 BLAKE2B f0adbd320f3f7d73a341a38d8907c567288aaca8c5a145d459da80b8b983b413b1b73baa8c77f4a49065bcdd8f2f9de0939f753a74bcead2b94bf79284c28c1c SHA512 883684e5a41535e22ff8cf64f0cafe138fc88f17468a7f13fd93175fc75d91e6f324ae06195ca51b5e8be911301b1e3ec009944bc4dfa306af5015f0444da4c0
+DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.1-0.20201029203352-d40f9887b852.mod 178 BLAKE2B 4974b32b29b70400f9656004dbf02dd25b0382bd22e0f091915215a96c7765720f6bdee1d7ea8b0ca60e6fe9f234b9cb99fcdf12b242e3f621fa20800fc66e2d SHA512 29b556891b102613e85854594a4fa1ba6b615b094a8d255d791b17ef4cb0fabb0c1c2e530e29bd9fc9394c3281a15a1d4c2465abb049db40779eb71522f38639
+DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.1-0.20201029203352-d40f9887b852.zip 219182 BLAKE2B c0663e80025adedf972802d93637cbfdbd88869efc98087d75e1587a08289b24ab509335438561b503776b4777ace3e12791f8d4b2de0c351b351c08f00a1f67 SHA512 f83f77be105006495537d6391128635842fd2bf42fcd31940cd6b89801d5c72d0739faed5c4495e1eb751129e001a524499c185862b14347a8b40f8f8e3c0ef7
 DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20170219233438-54f0e4339ce7.mod 36 BLAKE2B 89b77c2e7582554fd3a63f99bc03f2886e9f554e579ee4e0a99160385d8704b5f983e5680da06accae6bab806d303b726b22f2b4a6c2b03e82bd6bf9a9ddde7e SHA512 8f581beb7e676d082a76b9bf47b7d04c486d5e96e4f69f17fd99efc101e408cd7cd1c8d51a46ab1cbb55f7bb35b08ba8dd875f18e430f30ba9c88c43e44056fb
-DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20170219233438-54f0e4339ce7.zip 9383 BLAKE2B 017c2b40f4e9162f1fc609d1fcb3b02c6692fc9093c1657128d5dcc09152f855577bd27dffcbbcb67475bd8e8c16bc99e4dc00797ece0fdac8d23333a83a4b55 SHA512 f36ba97d7d4edfe7ecdca44f8e0c3fd044f95bab75820802b1ac0d125defd5028f234a70cc426ed2e04e50b0113b2ec4b424347b21744b12ea1124cfb56ff863
 DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod 36 BLAKE2B 89b77c2e7582554fd3a63f99bc03f2886e9f554e579ee4e0a99160385d8704b5f983e5680da06accae6bab806d303b726b22f2b4a6c2b03e82bd6bf9a9ddde7e SHA512 8f581beb7e676d082a76b9bf47b7d04c486d5e96e4f69f17fd99efc101e408cd7cd1c8d51a46ab1cbb55f7bb35b08ba8dd875f18e430f30ba9c88c43e44056fb
-DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.zip 9506 BLAKE2B f2ca36cdbfaed586696e77a17fd3ee88c158d5fba569d57685a09e6bc6eafdc36ce041d58002b19dc7a87ece0fdba73c793fa443ec31a2a33ef0f4030edcb447 SHA512 0baf36e3d814a78b868cfb028e116b734907c1cdb8898d5cb28986861e96f75ea8d61725f55c01974b4b5d74a4494a5f52a34fd38c9d82ebf97691244af8682d
 DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.mod 45 BLAKE2B bca314ac4894ffa7e671b1d4ef848ae73386b60786cde851e62ff43e3534310c32b0b5e1134a3c81439ded6766c176ebf1d3759c9690ddcf31c4a36edc625bba SHA512 b4dd7f2c1eaa083bdc0e90f3f636ac1fe32b290b6dfbf09153b8b076aa7cb39c9fae038822059413a4883bab87982bfe873477cc38b23076a7c70b3ce9bf1f45
 DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.zip 10040 BLAKE2B cbb85164b1525fed1ee710c1510a898d3dde2498f457bd70b57f25dadc7fa139b5ee9913140dfe500b31bc1ad6f6090ff47ba86d2c0704461f704955980f3403 SHA512 eb20cdd07df50c217fd67d1567da82c17ee020ea6d1f7bc79f4554a4f0beafd311c70b8a601f13df6534424bd45ce1a05c0262b0f1e54a10c77b2fb25720b99f
 DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200520041808-52d707b772fe.mod 106 BLAKE2B df5c36648c22a63cece1458911dbaf387fb1f76669a1179d6235662108e0196832351fdb6669dae7afe56c6218d55d6ae1f4b03824c760a7dc9fc55186d4fdbf SHA512 8dffacee3c651308c304c3dc7b1f75550b34b5084b6ae7c9627b4d3219db2dcd6f0372e4de1d7012ab4ad96727a6a822cbbb326029ead8056e3f6b7dd12589b8
-DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200520041808-52d707b772fe.zip 10074 BLAKE2B 2231552b185fcf87d20e322e590b7444c3b5f0ce7a254c6ea027a2743787992a579f186d29a8986dd40059fdcc612db79502ce3f230f25b00dc4172858969374 SHA512 5338a02fad80fd86f570b5593e7eab05ba3bfef93eb4b6bb4cb76b9625e9a7fa5f316b9c0346df9b1c6e1fb9f7faea3a5cf3f18acedb13fc92a2ebd9ee7b6e73
 DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.mod 106 BLAKE2B df5c36648c22a63cece1458911dbaf387fb1f76669a1179d6235662108e0196832351fdb6669dae7afe56c6218d55d6ae1f4b03824c760a7dc9fc55186d4fdbf SHA512 8dffacee3c651308c304c3dc7b1f75550b34b5084b6ae7c9627b4d3219db2dcd6f0372e4de1d7012ab4ad96727a6a822cbbb326029ead8056e3f6b7dd12589b8
 DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.zip 10408 BLAKE2B f2a8d91911a3b38ed1495918c18146211429ca8b4f3948881724a7cc5244727c7bb970ced48e466be37a9c3e4f1681f7e8106f2816057a895714655ae55ac847 SHA512 45845b6cc06fceec152d54625615fb052a8d2ee83318ee1646e51ad2dd891266a2e6f814e7fcae5c391fc58348c4f19e412cb52cb4b66e3a3217e549438d4fce
 DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.mod 33 BLAKE2B cd0b56c3105d5a303d3e19c1b7fe5231ea3d9454e9b1f67047cbaaae6b5689f2d48fd6ef31c58bbf1453d995045709eacc57b6e9adf1a3c9613b0512dad62868 SHA512 483d88e041bc73a30a83559b427d454381c2774acf67edba69d8dff8034992b6f2435c472e32391f6b6c7c1f0c52715fb554c01890e9da1c173f481df51f51f2
 DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.zip 1722512 BLAKE2B c3fa4160a90e9ac96947e549a456fcd70db9e1b56e19861c9a9d234f496a77e441ef12b7edd4aa207a52f4ce29486146a15e51e10d910628c2c9fc8f0c5bcf58 SHA512 9a4fc4914bd46eb2bc0166df37082079189df0d4cac99cbb6aeb8bf0d76ce45a2b4037efcccc191a33f26164cfd54db39069783ab5f970d685999cc0936bbe2d
 DIST github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.mod 31 BLAKE2B eb05706f9dc60f41414a9d2b5c3acee3f615e0d1249c2e9b9776bc255fcfeb05593fb3bf06351d763d4ae4b465aee3f64d9630f4ae5fdd2d4e9ad847e5d4675d SHA512 f220b8b8bbc82fa03107ec51399e2e8c90a442b8b4ad57db441772c1ef66b16a77b71f0601f8aa22b60de4c1da4dffd1d746cd567158fbcd12b1677d88d4b17b
-DIST github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11-0.20200630133818-d5bec3311243.zip 27114 BLAKE2B 794391f8916ed36d7d1880bc73003c31b5c002636ab6b8cae7696d9e36fdd30e42c2b152a09d1dc379c8dc923c449c2ea8753b24b84b653cb095da48affc1bd3 SHA512 c9c89dc94f1bc0559d0e1c723d44a3e18a3b2ff76809461182453a06845a032dfc3b0a1ff094ef61b8303592f2248ead911443d31c1d221772542fff861c2de5
 DIST github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.mod 40 BLAKE2B aba22d49d3bfa4d2797265117e12dee324dd0bf3e5f59fde41ac871dcbfb5ca009e033e0ebdae3bc3be438c397b56f7065a7a311a5bd5150689d80ec7d3ddd4a SHA512 29f41dcbd13cc6fcc59c46066aa34473ade1ccb1e935b55cbc43955f208857aeda44b6b5b94eea9fe264dc11cc3db84d7fe3cadeedc7e1fa3f300c39358537e8
 DIST github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.11.zip 25167 BLAKE2B 179763bab0e98ef5fc7135e3ba842a26f42f4b40d82b91e1f84051cfe6a725a60fbd1972a30119cbd828359dfa46691dee4b997bfa3e79bc38cb10362b78358c SHA512 49bb9cb92e275dadc9548f211ca9a7fcf86f27d85b35ec1154bc6c19bc80e01eb360d185fb0cd778cd1dcd9f6701a6e904a4a9678b51428a573367ba64eccc44
 DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod 40 BLAKE2B bd8fe364e43fdad423aa574d01229ce91e9b3211cbe3a0234070805150d960d3c0fc0c6ec229e7ce5b4079906f2595a2b5f50a8da7bbe9bd906a72a6a7a7434b SHA512 cdd8a665fc41a4b04c59e869b021d5a9b793b9a441c320a234bf2a13be67af9aa60378c58991161f73d83c184039a52fc3f11cd121490996737f0508e277e1cc
@@ -1525,73 +1633,102 @@ DIST github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20181112141820-a009c3971eca.zip
 DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod 41 BLAKE2B d7c63b68781b147d3baf10d81bce0539aaf0a046a70cd91958b59541dfb35107e01a73937b19de74504f42fe49983b46985a9635c45239e4d7a3e2cca2b85f72 SHA512 a6233a0864081261d4b9cda2d73cf37b236acada8f5fbc85b7b7978ccfbc3bd2949632f2fb67a7ba9db6eb43b41796df54460728379e0172082922820d6143a7
 DIST github.com%2Fyvasiyarov%2Fgo-metrics%2F@v%2Fv0.0.0-20140926110328-57bccd1ccd43.mod 40 BLAKE2B d9bfc152a45edf20400c8f59ff6f7d20ac98441b3bed903d1215a98ad5b59aa9037c3dc413b750a34d4784a14d98b6441b47f8117624acba6bf69202345c43c1 SHA512 2b18d1b7379b2fb032b531119bc11adf0d7ee3b7cb490db5fbb2d7c80f04bfcceedf474012172da27d75f4337902929fa49635a17ac436ccd3df638e182c7932
 DIST github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.0-20141212073537-a9bba5b9ab50.mod 37 BLAKE2B 65bb120d06237325c63f8f722a251585f54d2e7f5c70dc35554fa50147d94298bae6117cee34fc6fa202e96ffb0878534d5eea11775a83ed514d33d4fdfb8775 SHA512 cb07bd4926b20e43b08c9f6c29a74eec6b9119421d56d48d69da58152ce8ead0520197c72109579869f3591fc8f8d05b7bca3d274d383cb65b7a023fd9428ed5
 DIST github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod 50 BLAKE2B 1df5b82dac953ff568a0709714e04e4fb31f384e8160fa933b9aaa579f311eabd38c42781612c6d39b7eefb1f995251f74b5ca5364bbd9d240f6896df3257ca4 SHA512 a921e5321a35252f98bbfc819df7177a500b64665f710f2b833f4187062e5c2f050daeeb5230c6cea9dce724823eae24d272924742df53fd3437d9bee9ad89c6
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
-DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip 112407 BLAKE2B af65ce0475f0b55ace7f03a7af6fdfaf8daae8b79e0ec1c9fd1aaa911cfe517c6760e6a5fb7881f87d7fed4da3274d14c78aa1424c85c003dc0fa98b092134ee SHA512 ff7060fd74bf2070006a55a739f6a8b64abc5ff09db2d2bc53fe978852e5b82f96bfc79c1f73b68e704bff423722f7adefba0b906de6d96d7e03c3e5740b7ac1
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod 94 BLAKE2B 5014c2a8459f1f01661c7cac0a7d2ad7de372b3e2916d56d721fd454e459fc75d5b4f6249a73dc54b46b91df00b1ef5c3d47d099fa28429a6967427ec7bfb36a SHA512 d3cfb7a75e321d2a6fc145b727dea76002189ae2caa8dd3162e5e6903a1acbe5bd55be81d7f112c71b47e61351534ff991be30993632be9c9d7443111600fe39
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip 115621 BLAKE2B f59bced3cd34292c237fe5a472a66fabca151ffdfd39553bd060bcc706433c248d0712fc4fcc7c44a67ee86fb3517a30cd1846c5c5e70b4549d42c1f12be9495 SHA512 0b6a8a073673708adc8fc0d01c96fb0ec4276db63a17f45ff02b4243235de9634952747aff63382ed767157c6dcbcaebd5399ace63a14e52cc826bd5c9749f82
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.6.mod 94 BLAKE2B 097619943e3530007d2f8f9798cdbac483ba077b239096303e4ff7637459e7cb6d28c7a98d893d52e6686ecbcf3fa8900fe8ce46fc16b9061c1f4b0011ede3ea SHA512 d8a4fceaca0875493f0788147e464f36a1a1b9806376318fe88f8b0091ea3ae4bd5ec141ccc7c8bb86d88f34f25a36d2061dbc24d0346a9d68c1fbe45173fdde
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.6.zip 118439 BLAKE2B 8cabb2171e4dc3f7587d6c2d7d56390dcc6ae14cd5cdc84b9b59afa8deabdff025c03090a8b86f3a45287b9e8eb51855076d7fe1fa6eaacbd434282aef81627a SHA512 2e71f7b8606ae949fb9f3287b76dcbc02c5273a44568bdb9b750c381dc1284ed9c4887fdcec652f572eb0e7066e4592a3bb9aa17117b039dfb65355033a0d54e
 DIST go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod 2182 BLAKE2B 024744c8c4b0f296f32ce1af2407eae0eb760a443d43e2a1824254c9b2aace62966a2f0f5b5dbfb0cdaf66f2f00740ab653a2b429cc9aadeb3e48421dd6e180b SHA512 904249febd483a4504d49a1b769ded804042c34acd6b7f76503af9f43c76c53063888a7d0e15ee457107cf688108d2bff057330d9d44548b2a30979336370f09
 DIST go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.zip 7085205 BLAKE2B a2e60cd1754ad2aa8b034c217b0197ac3d00bbe7280d671de5d07c8edd7631e169fd747cbb520e789e183aff6be3f60bc79bcb820a0edfb6fd92fb2a586be520 SHA512 56c113bf05a62327154193021302c5f0999a61176086672715e00eb0c9a73edcd196f3a327e823ae15420255f00d6d01a5b2b5db9acfb8c40f4b64cfe97b7ca9
 DIST go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.mod 2438 BLAKE2B 8697edf8181b20e91953588063dd1925416f2347eeeef5b5053393be4de74da8209524eec829b741d8226c78ef96708d849df6ad4802746c6c74c645a314a152 SHA512 10b1a391d11781521e2070e7ce2db67cca9f5c89af841d9086e28aee731f89772fe92a90a188b72cd83b126b5846a1f905e87a04311f7777259efe44850b25cb
-DIST go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5.zip 7129829 BLAKE2B 32ba2ae6b7ec1b86cd5215afea932fc611d84524d83e941eb5f5d2023a3b0fdc9dfc221c8524c5a30de75bcdef64792ad0d6468a0569a564fcc83033e19a5535 SHA512 84cf3a5a99deee5bc51a331788cb4d4d184a587803efb755007cdb483da66856079405b4744f4ff580b609c3ab5bb58af081a2a934877dadd00617e9ff785266
-DIST go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200910180754-dd1b699fc489.mod 2476 BLAKE2B 80a0e199679221be23c03ff488f7d505a13018e2c025dc53108c319b525ded9c0c79c288f9ca12437cb3a20d64373f06a1cd27603411ca71bd895b3dce78366f SHA512 8d5b0c6b187ce7685a05c5be2ca8ec63234ec96b8b7c8e37aa3c55e51de624aa19117da13fc75fa180c5e4b2a1b9e5d7adc7c106202d1f995237adc995fb160b
-DIST go.etcd.io%2Fetcd%2F@v%2Fv0.5.0-alpha.5.0.20200910180754-dd1b699fc489.zip 7130379 BLAKE2B 3dc2d547cc82d56be53194a288f38c5f902cc0f1b2e44f343379f12e87b59e3585f4c36701b4fd7025a9bd8a3c8e27d694e551035e90a4b99d06b23c93ddc432 SHA512 656079cacdc6690fc5c492ff538a764f84725886ce428afc66e8d8004274d485430f59eadd8fdd232fb6ef4a0f372a4e2d1eb294be1c38388277cd410e6da880
+DIST go.etcd.io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0.mod 657 BLAKE2B e13684938cec02c9e77e0205a3932eff426445dabecceae0f885b22bb1882e86403c9ba2279ed99b955031976624748178321f00ab33f190e801aa9b5843d677 SHA512 c38c82e0cda65b54a3b7d572fc564792a89d248b82ea5bba3cd44214facf79aa955381c4e432762d5a8dd92d6fafd36b9c5c7d76d3f853ada8c19a0ecd95b20a
+DIST go.etcd.io%2Fetcd%2Fclient%2Fpkg%2Fv3%2F@v%2Fv3.5.0.mod 179 BLAKE2B 4a2cc6bce6be4b0c59e37eb32413c7b84d31b79deb3de0e9dc01de1e45399dd57e0e27f17f04cb11da4b9eca5d26feb8556335482a975cf499dab62ea9a2708d SHA512 5c3cc3746a3fac7cef7e0de6b39b280c1f43244bba8c9890f9118654780b0717c5971304f9fefae1a5c7ddd70f82f7a08a4e5502ab8181155ea8bb926be7eb87
+DIST go.etcd.io%2Fetcd%2Fclient%2Fpkg%2Fv3%2F@v%2Fv3.5.0.zip 102021 BLAKE2B a297a9f1fbc515d97f1726bb18997f2f3e4ce06d4735f87a917038a06bc413d5b16d6734b744825aba31bca2603c607c42a9d8625abede5abcb9c618ec28051c SHA512 0bf958ef09e7c99cfa849b541bb3961b1bd97f88191b8931fc8692523a2949cb2565d6d081e4b511456d056589320aa88773f48d2e5d0d5a34634b71636adc4d
+DIST go.etcd.io%2Fetcd%2Fclient%2Fv2%2F@v%2Fv2.305.0.mod 598 BLAKE2B 1067089e4696b50abacb1eb32584f0dac828b0714054d06ac71c4a3b9af0124d746ab520a449052ebeee3c7467d4f11aae6dbc962c1abeeff7e58df56113054e SHA512 90ea50338b3a9197faf9f11bd5966d23e82c89d6188d8a0f5425a9fbe1bbb32333f8c71449d620aa654f6afe5598fc01a4c56eb5d5236861fead943595227040
+DIST go.etcd.io%2Fetcd%2Fclient%2Fv2%2F@v%2Fv2.305.0.zip 54954 BLAKE2B e0c22228e68f6284ee314beb722ff3020548f09701278aa40257fa458c301fea264a75787f8f4702c8750cb467fc5c6d3cf4f031f226c1df1a305a44bdbed230 SHA512 0ad97fae7784462c5e042cc5278062f404ddb2d94ee10148fc7fce51e29249bcdef441a12b1913839ecb53fdb52612d528307f919f361c983fe6d25c2f20caa3
+DIST go.etcd.io%2Fetcd%2Fclient%2Fv3%2F@v%2Fv3.5.0.mod 736 BLAKE2B 318c3607f86419c7a151f1de6b021d4ba7afb58665a8c93e8033b3e8a4ad3ae405c5e53dd8c477d026071d9c71e1dce94d1b87af5af5086222f3918a901ea859 SHA512 f8367459e4c0ad2e04ddaac7642cdcc9f75da70e361a871f82ff8d732b1ca9dc6e7820af3155309a7f405d2f587e990c561ac35f156b6ec61edbbd913f4f88a5
+DIST go.etcd.io%2Fetcd%2Fpkg%2Fv3%2F@v%2Fv3.5.0.mod 613 BLAKE2B feda2a40abfb37d687adaa2d1dc0344d892d704bd061ff5618ed701f2af33038c97b94491c470a6dedcc5d23e3299539bf0d37691eca72a498aed19ed14a56bb SHA512 cfd51181d9183b43a76ef855fa47cc86b56801f01b7a9e55ca469050433644b9f16a0fccc13a8bfa5f8ac12f218f32a95f1d360c1ae54d9af4744b19b70236be
+DIST go.etcd.io%2Fetcd%2Fpkg%2Fv3%2F@v%2Fv3.5.0.zip 2092307 BLAKE2B 12277b14cf87ca23e975cb137ebc8dd65291d2558f5f583d7f2b475a869c06aae35d733ce63ad7802bc15ab624a4e39f2ef517739e35a40db21b225f0e2a6287 SHA512 588dcc47b2fdf09f646c9dc8984edcc0452e6415c57e76c448f481992c2e4f7a19db9316ff4f1291809247d8e98c3ea207c9d985d355568216fcf06ea943770e
+DIST go.etcd.io%2Fetcd%2Fraft%2Fv3%2F@v%2Fv3.5.0.mod 613 BLAKE2B ec6104ebb47f85a6ce98405a7acf6544970e9f90ef8636c7bf589b4ee9d040db43b493183368e5aa37693e4808cf97e51014cff015d17c9eaf2d76c1b079dc42 SHA512 61c93cf8d0421878a378cd81e7e62bc34581d83e9b88c9207560ef57303da66729133f41bbb264549936695dcbfdac65157e4e0a62b0cf9571c62a57dbdf7e34
+DIST go.etcd.io%2Fetcd%2Fraft%2Fv3%2F@v%2Fv3.5.0.zip 241164 BLAKE2B 7279494b3b5cd34c18b904c3720bd4b13b78279a4127ba7179970730762c6c730646ba446b72a59f22bcb4ad311b8d8b6840ee992990688aa1248f9123bf5ca0 SHA512 777711187d82ef832f05273a25ea8649949eb8af80f8b3aef7910221a05f3833ae2e99d6aefbd2fd2a00a52ebeba4edf1fa306a3f012957204e3b835b6d52eac
+DIST go.etcd.io%2Fetcd%2Fserver%2Fv3%2F@v%2Fv3.5.0.mod 2260 BLAKE2B 9042096df23e62d675597b16bbe6de4a844e2bf242d9ce2430af84f31d1c95d2b5a234875aa6576de970e64d627491f825334de1f99f87dfdc06f91a9514b83a SHA512 ab2887cd66256771cfcdac53ce7897bf1d63d31101d8a7930045d0802bd827024a007c2ddce57ad991542a8b1a448d6708dc01975f96412d3c066edccb7c1939
 DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
 DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
 DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
 DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.zip 3726759 BLAKE2B a2a2a81fa1e649044b7b1f066c2b1bd5dc2e4ce7e4a24a3968efef4b2d5e7fbb8371d5e517a488c1c1d572af20ea2cb53f5169d05fc9fb3d2df7d60d12f3249f SHA512 db999b901f1293c1ffa1f1786609c3d5a914c3492f96c05ce2b4883759460fa02a37886a11f13856e2e0b51911ff293b6530921087415193bc0e19e110608ebc
+DIST go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.mod 37 BLAKE2B 9905f25ce802f6b0c6cd290cd4c4eab44332910bd906dbd211c5fbabac7af525fdcf35cc6106e204c194ed9d8e609dcbf0ed0eb5cf606913985076bf2dfa3985 SHA512 f65d060c9eac0fd1d9dfaaa10e03423934b68357cf0ce693486b3e5353b04eee3a4dba0e9fa85c655a0973fbee9b0b85b02c3415b2cce70c52a60209e756b13d
+DIST go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.zip 50649 BLAKE2B 2030f7c582bac3357fb1bbc63be2cebf08f6244e2037747c984624f4c823732c3db35a99a4a5a0b5eecbe4219e6f00dcaac3193b45b08f8ce582bc8804759096 SHA512 afefe82d08e44c4acfa6e70429806a081a5ae5222994fcc897f7ea5a57e4da417fbf612f2b1e1725b0caeb4fc47cf1e7d2a9ad2fa612a517e55d34f5e98dff34
 DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
-DIST go.opencensus.io%2F@v%2Fv0.21.0.zip 289912 BLAKE2B bc8e41070dd253fa0015be310194b9e63af6d8d3edd82ed436f62726b0a5d29efc0089468a87bdcd781eb81456948389b124a4ca6f246b6f52e2a31045ab697d SHA512 2a836a1d130a6c312b055754895bee0c75fcc744aae13026ca5a301f1f31a57cfe1f8e27c7c0c20e6115426e4654bcc4a8f4adf1a9b4a18c54581671cc6676be
 DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
 DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
-DIST go.opencensus.io%2F@v%2Fv0.22.2.zip 296264 BLAKE2B 0b0e20eb2f10b81748d55b843f8489ffb8147a8b17c063cb21fe505fcdb46feb9cc0830f3b3a91ea7034b1e7ba78df27b0b235b8500b8c1ade19f6837366aaa1 SHA512 c98a43e1bfc9f4bd1e54847dfd6b07e9af14efdbcd8d61b70c9f9701541ee2405f800b1e33cf115615a43030accb735a1235e2b7d81f54efd127e2fe5c992326
 DIST go.opencensus.io%2F@v%2Fv0.22.3.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
 DIST go.opencensus.io%2F@v%2Fv0.22.3.zip 299798 BLAKE2B 6adc76c28569e177bf40cd2d4c7de912e92bb679c29ce669bda7e001d33f8e758d3f2a413857b2b74efc676d4d0cf239e9c7acefd2cb7cc502121f07b31d640a SHA512 99fe389fbe5fed1db31068ce5c4ebf597ac5b39203e3c5f13b0f92c3e66ed0b1ee9f6f3ec0d953a7f5d02d2db46969b8d3cb642703acf43cc0df5cda61c3e355
+DIST go.opentelemetry.io%2Fcontrib%2F@v%2Fv0.20.0.mod 44 BLAKE2B a52ef031b2b9283ad316c95ccaf3958a369fe3d07c90cc54e28718f824fb0df687588be003bbc03149ac9ae4dcbd931be08f1e49d7504a10cc3b04be9473e3fd SHA512 2aeb2810ba46082ee859e3928d6117196accf750332c2b2e5f9e572e44845221e90b714f270786a46e8e34a1b4f6fbe053b63c21a9996b6dc5680669cc68a99f
+DIST go.opentelemetry.io%2Fcontrib%2F@v%2Fv0.20.0.zip 31129 BLAKE2B b2fa4255f50670c47c49644aae18488724ec855937dc13770dc69602164d5d907c0cb36f617965fc8ea864788f07c3cd76ceb2d155eeeaf6b5fa49b0e7ace8ec SHA512 b6b38dcefbf9b47d5a37540dc106969f4dea913a258a2d015cd1c7bc43b1f7289ad1f8512148a34837e9539739efe57a9cfeb723ed3ab0fba7b8afb6b6ebb2ff
+DIST go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fgoogle.golang.org%2Fgrpc%2Fotelgrpc%2F@v%2Fv0.20.0.mod 443 BLAKE2B dd18627161ac6a1840d7264f79ed7bd42d8cd28c9761839032ce2e1f72ae3381acab73da7a3063f9c8a6e2da13cda99ba1d8d06e312cee2d7a3a9c72be358674 SHA512 c375129bd65f22e9f24e52be6cafcaec52319a6d0811a9af7452a3d1ea143f351db541afca8026171d01c595b46eb37efc09e3423e7ccf43de3e9c1ff32c1117
+DIST go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fgoogle.golang.org%2Fgrpc%2Fotelgrpc%2F@v%2Fv0.20.0.zip 24107 BLAKE2B 07b25cbdb1c9680b37197037c1024aef34a99ce8b63078c965f8160deae5d1bddc89c519826b1875fcc85ce13b8c4373d31bed3a3595aa61de1e6726f14fb8ec SHA512 bc359a39ce84edc3ceb7b743c5a49890374d24f1955a979578fc7ffc1b6572e5b3d57626d9c33f996fd7bd3bdc88cd550270caa1e41ce4e6874b9f697b6fc348
+DIST go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fnet%2Fhttp%2Fotelhttp%2F@v%2Fv0.20.0.mod 411 BLAKE2B 09eb9735dad8190b1c3a1e4d60fc9c9b2a1033df9a7d473e81286460e4b0b592767032be3284986f36ffaf973339f3a614a22da4634011efe1b798657f6dbce7 SHA512 48a6134109bb5e74ef6904fc76ce498b571d788490c4248f47de83e4114a3da8c83eb3a33ac4880fb2bf218474cc41d7c65dc0c6d2392cd2108e41092ac8236f
+DIST go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fnet%2Fhttp%2Fotelhttp%2F@v%2Fv0.20.0.zip 31596 BLAKE2B 36aac77f6dd859fd79544538605f02f3869a293337ea2f175ad4a288d20c0e3f51167f5c90ab6c1c87f2edf2df1133ac53fe8db6c8b0325dbf237029aadd9992 SHA512 c4c632a1f250aff94ac9e57d7f326a047c472027f82373252b0c67e71eb44084ca65f396aa8ecaabcff5be4d8b1c901176a7502c9d036d3214b8d83601c876cd
+DIST go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.mod 1800 BLAKE2B e2005eaddd67d04b79f8295f1bf4d0018106f36cfe8a697a23ee1ac6767faad43b48a87b8fd0412c813139977f7188db008bd0c278fcfc0aa1000d5260487ae0 SHA512 0c44b58671f37f097def825346d69f0f0288e81926075b4fdb970e74757e333d22a8f552657ecbb152145e27277aeeaeeb2d09122de5fb1d1e284b1e93e68bed
+DIST go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.zip 171776 BLAKE2B b1540b229942993a2d5848fc72023c3b6ca7be44258674d82ea427dfe40b9495afddfc70e4c3a2d062565d921a086438aedc35c42bec9185f29680e5cd355155 SHA512 95680313994d81ea8d92fb6e5b087aa136234fe2fa9c483ff9f382a34eb94498c5092fc49661e7212be7339d077ea9753f07c5e6cffca0c7a9f3b65516372de4
+DIST go.opentelemetry.io%2Fotel%2Fexporters%2Fotlp%2F@v%2Fv0.20.0.mod 2062 BLAKE2B 446cef219447a1bf7da98f287595f5c1896ace21bcf84df7cea23519e4e04a47b61803278955b5a27ee4800ac73cae159078e84df909b7cffc04c99153542cd8 SHA512 a70147113108c327fc4fd41f64639aa6071c399d0e2690e74c369537add86dc3e6fce69c6add549b9fba88fd05d14bd47738bfe3f29d9780b3b4b7bb68ce2812
+DIST go.opentelemetry.io%2Fotel%2Fexporters%2Fotlp%2F@v%2Fv0.20.0.zip 93655 BLAKE2B 8b76d9250c68acee2e5ee26a11bc3ce99da06289a6706d38c98407bcff0b042d77d3b605c80e346def2d4f3d9486a824413c640ea7e610da91f952f051243cda SHA512 8782c496c66ce9efe398924875fe918c6a1868539e7dc8aadca1cd20b62b90f9aee08ca80162c2044ec8bbd3eaa3b0a0e302ac17861393b40024a34baf1bbea4
+DIST go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.mod 1775 BLAKE2B 1d218c7e1adf5e04b19fe3447d1dd7da1da15cc71b3e9294d7a51e0397265b64857ca8d32c6ebc3b61d82a0614ad371bd46d812569dd378508b9a1a61363981f SHA512 34f8d2fc9d8032e6548ca24f7680e8dcb0d528ee183cce383cfc23d4f1b643f52ca4ef624e34dd04cfd37cc9d7fb784a36e09bcc171cdfdc13aa5208951a9350
+DIST go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.zip 35718 BLAKE2B 351b3220ee70c388e75cc861141d0241c6f62820c922d4804d35d251319750b82681c021963b5da54198c4400fdc61514f1b30c4c08f3cfa7b3b11f99246a824 SHA512 d6ea1e3ac0fbbce6dca5ef7f4347d4e425cc8697ca280811004b80b933b124d11f32a754ea1539bae36b04e3ac206b263ed5a0fa9df04ea7cbda6d7625875049
+DIST go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.mod 1744 BLAKE2B f053ca414f157096060ae3a07ac0d7f4723b716db892692152036f397d113dff46d43ca2b39679337bb47d48ffcfd6fbe3a49a8c63774383ce3518cba5854057 SHA512 cd84eadbecf933ea3f0785d4a604e5724d95deff0a152fb66a48ec38203f640da45780fdc86cb61d2cb8b996c9596e20fab92d6f54acb4f7fd22bad2354b0c41
+DIST go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.zip 27684 BLAKE2B 6c08e07d96e8d817eabc719c26b3d610a653284f5d8919ea81f73121fdd5eccdfaae5d5736a5e266e16297b5731b6c05c89fa970ec9bb9dcde89e5930bc92898 SHA512 0213e9fd8f5141e3a2d0d8dd58e299050724bc1ef7623d62e7a92f2ada2d34738c8169289ecd03351f743d3de7aaba7ad1280a2d9d12e2f4fb952319d2857357
+DIST go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.mod 1805 BLAKE2B ea3d75f8a92ae83eb39ed4230255d84c1897ba1c4658cbd603886aa9ff817279f6f79b336de3ab0dc4901add3bc256dc477d3c11a323e27c36e7e11aa7522dc5 SHA512 33568d8d5f47cb528f78f141f4f4970a3099ee9a1a651c1172c117a67dda0977372b9b052bc7ed258677ce7aeab7d22e33b0ce4a54deecbe50f2a744bed4f199
+DIST go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.zip 85289 BLAKE2B 7bf28721a0f3640fab40f7edb59e73f072c1a2bbf03182a6c437bad90c74192edd1080ed39238fa58d780c6f890b1e53625c32126c38c0c972b5b8ce002ab1c4 SHA512 7b3afba37331efd61fa640c5287e864df3a868bff6cb2862d7ce1933c1228374c25bfa301fafe8fe4c9a2778aa1f8df5341a42a600a1b71e4590f30e03b17ef8
+DIST go.opentelemetry.io%2Fotel%2Fsdk%2Fexport%2Fmetric%2F@v%2Fv0.20.0.mod 1889 BLAKE2B 60980f58ebb7d0599609030f781ddb70f4d46240813658c51ea200cc061ad7444705f26250e3c0083814939c4b89dbce571b012035325ff85f038e361de16833 SHA512 2088e8a3e6c25b15511ba67618c9a68037aba4a6f63642cb3f772c14783daa2fba808db696d335dab13ab8dcd18ec014d56c5dc4d89274c726049c60337b9903
+DIST go.opentelemetry.io%2Fotel%2Fsdk%2Fexport%2Fmetric%2F@v%2Fv0.20.0.zip 18321 BLAKE2B 2995bc13a6241ed5b6eb83fc3bac76b43fec49b0d0d8e410029b4e696e48c7611dd7913910f5eb326d96180fbfd6b8cb6e3dc1010a364bbb903cc91163d2028c SHA512 f86727e05b024343b53b453c261bec4c36a58ba42f44588305828333ccc396aec1648a02055454ed10cec439a019ef480a6d43679a032901fe9f3c0f1188cae8
+DIST go.opentelemetry.io%2Fotel%2Fsdk%2Fmetric%2F@v%2Fv0.20.0.mod 1980 BLAKE2B d77532489fd26a0b67b6e29c01f258c932b3a25521cab45b5dfe94ba3915f691e8a99aecd41f1bc3cc4987f7197eeb412d05dcea7222fc5d03a417fbb30da031 SHA512 80f4e868f589281a2b083aa5f7a2e352262d95a49ccdf7c71afc4c0c6c0947de7107b00b6b890e1f17401a18d3e0905af6ffc49f2210e0585dfe28f6f325a68b
+DIST go.opentelemetry.io%2Fotel%2Fsdk%2Fmetric%2F@v%2Fv0.20.0.zip 91170 BLAKE2B 4a427a12e932d6767a6195ca843d60402a59cc7be10b6d49b20ccb2db49b634e7504cb4450e56af4d886437cc00fc2cc12abf623589703880575dd8716936ac4 SHA512 0f56b5e46bcf7fbe0c5466c1bf2c011db3e324e81964c25e4687eafe5fc6ecce2914fbf4a7427cefe0b7530acd669b77b4fc3c7dade148f73dc12de8bf5898bf
+DIST go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.mod 1732 BLAKE2B 63cbf98b7152adbb31a47908f91f994355df404ae5010388ac4a99ec19594ced0ab7947f11edca423e7539c0796df908876f6c4370dc6e0fb4316b07d50e125d SHA512 262d653a0e1d1ec20d5dc2fbb3df55f84100bfa803184ddb1bcaf86eeb055d927cf090f5909795558698ff0104703cda2b1826bef34660fda3b2154667461f1f
+DIST go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.zip 26199 BLAKE2B abbec25b57ce85d471f9298a26bc3c1cd0227bc79be1643f1b323e4d469449a333ab7337990312a2b1384055e143e2be00bea9e28d67f2911ab7af4d51c59ded SHA512 789659153f297a0dd12cf7c4cec8ddcd4dd114a262fe288c802c1183feebc52805a1fe55733f622913e8f33974de1f898ed866d6b934f8a75fa0fc7bb7847da9
+DIST go.opentelemetry.io%2Fproto%2Fotlp%2F@v%2Fv0.7.0.mod 211 BLAKE2B 108e3a16472a1401b8ec1b18180c109e034394988b06050b6dd7e918d578917d1b6d139296b39046e09a9f6e251ea665a2cabb749b4b342cb301e6caa2cf0498 SHA512 4348e909c754b1ca8cabbafa293377cbb8f2b4f4d67ec412f6bcae4171d7d0212851d90631c1354e8b04b7955eb0a8077e5a86fbf8ed38d179e9ffb2e1ef16ae
+DIST go.opentelemetry.io%2Fproto%2Fotlp%2F@v%2Fv0.7.0.zip 70804 BLAKE2B 5f2abff8a7130e5612dbde3b199e49d9fd496acac585c24df348477d096179caaba38ba1ff870b8a0d7718e9efc0d1faeea27f9e5b0c910a910465807def174f SHA512 4ed01d37056b955c8ba2a3ba43eb5ab32359885913557b077e29f46f11d56b2f93788cd03df805b93aed00c53687143ad72e47bb3c5322d713e203ae3148e23e
+DIST go.starlark.net%2F@v%2Fv0.0.0-20190528202925-30ae18b8564f.mod 23 BLAKE2B f7664d7bb5473b3f70276738b039e9daadef4613518756a1e45671ce988f37df51a5d11940ecd6554c6f047cc32013607651bb10d968f267194aeef72dab4a15 SHA512 cb1fbe20cb5a7a51fc38f71a77ce9dcd8e24c016659379b40a39c6bc6aa75a1455743c7c6ec31d65bd988f62cb3b9ce3c386c9434a868b97b66c2512ed0c705c
 DIST go.starlark.net%2F@v%2Fv0.0.0-20200306205701-8dd3e2ee1dd5.mod 289 BLAKE2B 5b1d75d67c4e88e00aaad96b3f1d5666f1a24c0f2224cd4b2ff94056eb0f4d723852c233493a5974440bf51fc27cbcf3f167eafbf5612d84b7a28cf54d78640e SHA512 00d29b9d080aa455ad5fcf13e5bd5bb831edacb3fef6997ac19aba7b77eb02f096d96e1e35bee24dc0455a3d998f8e80f35b75d9bf7cf6f51bc251587b2da218
 DIST go.starlark.net%2F@v%2Fv0.0.0-20200306205701-8dd3e2ee1dd5.zip 261990 BLAKE2B 425d8055eb2933b2cdbd95aeb94d90e6aee8e749eb560e5048a45bc0cb85e183a7a40d179bbe6a91b350cee9db1b70ccf9c161046c727c29af9d77682ce15983 SHA512 13b8a94e64f7c25296826403e86840a135bcd833e4e3ede1bd146194e9f2476b62e89010e64c70cb76ca85600737f838ebc6ad20c2711b1035d3e3f86c442846
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
-DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip 15027 BLAKE2B 06a2451071b8cb0de9b4e664d007584998c91acf4bcca04be7f6c4e97c2579a9cc174e4db220347a00b252392cd6f3aa3e08e27ef3a231d422512a419a199c2a SHA512 be6b2545811ac8a869fd0365c1126be58531a6c0b51690feb17d7e88a2b79dfec6a466ac317df15e4d038c02df0f72993ae3e50a218c9f7f6659787c7f8e9333
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip 17248 BLAKE2B da92637915783bd89117a7b763271151c72f3494eeebdc23d4a0197f5ed394d4ceb3b105e1eb5f0892ac61e0fe617050c1d741b17ea37ff8eff42758329ca68f SHA512 ad71851217d27e72d13db4d8aa1accc069f5ad5ef3fb9ab922c79cc0e6f0ee10025d499478d99e2f46418b36b4410c5bbdf8ea421919d6f60ec95f08c904b267
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod 131 BLAKE2B 0abc8845d865fa3a1e96e938a9df81733f6d658b39592df46f26eb3292431b0db554eb5db00671f12471cc3c0e454bdf227215c0f9adb182493b5c146a12e3ee SHA512 ac727a2635d02ba4d12c9af7a9ca2d27c0f1bbdb2f2ef797a2852cf569d33cced35be8ce3e95e2ff3b13a0085b723622656ddb8731c055719fbf62cf10caa4df
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip 53254 BLAKE2B 55083a93da944305baacb592cc1145f191412b4fa0a98ff3f4180484d7a3bf4dc65561d71670b8a462126f10ea82a3ca2846f73bacde8c9d8c485e895b329598 SHA512 127df97ad28854e4db92b6ef8f147c50eecf49e6a3f70dd0524325f24aa6bfe977127513443cd8926589587654212acfa4cb8f153e2290b8b27aaa09dd846368
+DIST go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod 312 BLAKE2B 16bf4900b2afadc331814e16a34fa8cae0cfdc78c7ea9704312f121e166c93b7811db3604f6c167fc526faefdd1eb0ffca1dd09581094bfea4847fe0f62ecd91 SHA512 8814a6b8138027c366f3ebeea9033a71019990faf1cb613d75a25498a3a74d61fa2ba662302254150370a49a2a6f56da5c54889d4465117cf8afed4ec6cd9f63
+DIST go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip 24823 BLAKE2B 25394ce97a80093bcc7113c651d95fc383863a5efbb47825d053890ee2946f04ba4b9c4bb708458183b91f195133d22fb4bde840a25b6150c1c6a756ef417fd5 SHA512 cad58d0a0f37a7ba9ce7fc5d4598d511eda4bc675689f968b1d02c4b2e95d15976b6aae9d4b8655d2aa85e255308414e474fa6d42e4f49b31092e2b943648b36
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip 14488 BLAKE2B 3bb8df1a459b2cf1dd63ab200f06a9f41f968f828b815b70bff899972a4c913656dbd3856dc6f4626836175d32b63c439e32a5aeb6a034f4733e2d09ef53f7f9 SHA512 d5fff733045694509ef1100fb8701526002b0841a11b5e1acbdea7e186c80738f651bd973c5eba2db5d2b8fff1b3057ea5d7d0e46645268b2f3619656238fdf4
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod 113 BLAKE2B 9c82de4ac4a30a4f5ef4881d70b75dc7433664ee90632c6d4dcd1594f3c08082aada1cea4740d38b79ea7753abe47cbba9a173051577c2be869a45ac1e90902a SHA512 850531fa2e156bb78b5a66f4afe89148f048e90ad6753308f4d36aa886f5bd179d2dd5ca67c99cb98976ced5aa6b14e4e463bb27f0d002b8a0e1814fc5316873
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.zip 17500 BLAKE2B 5d8607a8fde2c57caeb30459232e9d33bcb9c8cb3d1f046f5714510467ddecb6f82180959ec7d28c15053615390ea2ab114ee472988b6ccfc80de7247e74b0c9 SHA512 ab8d76e47875c4435d00d346ab4f9a04f570711f9e03d7eec23abe6a8d29dc49c4538150397da95e89276dc9ae617b8ce90b90422694b38d03b7773127bfd8e5
 DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
 DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip 224175 BLAKE2B 839e4b40c818d9ed889cb4f00b3b4c1e1a21add9e4732da956da63d77e5b8c2211443c9c2528f3c7a6886455d94d0818932e19876cf5576318426451d10eebb5 SHA512 deff970d323e0023cb39fd3aa38c419ccafef4c10af4edc8e9b70671e5892d60229e47f176495bdc4602b1cc4f344e8724e06eb740dd7858fde006bf121d5c1e
+DIST go.uber.org%2Fzap%2F@v%2Fv1.17.0.mod 257 BLAKE2B b03dc3f61ab15720e3e89d8725be6a3a500f9aeba17419403df4bff7ae52b60abafb43af2ef785479017f625c6a3170913ca975fac64c36c65c0476b519540b5 SHA512 9677119c715a41ff061ea5caef85c35b23f79648aa09015e7427ded423c7ed73c0ba7da24d8fb586ea038499bf42ff211e5a328102573b67122ab3a74bfd9ebe
+DIST go.uber.org%2Fzap%2F@v%2Fv1.17.0.zip 232744 BLAKE2B 1d18d6beb771fa235ee9b999c4315817e068d0f4feda90ac270b90e81b67ced86e1622e30777871def262923a71950e81661d08d53ffb64398078e367cf9609b SHA512 4e5aaf0142e579b5b5231adab8b5c9e0a05aa5cd535ab16d04814ba39ff6aa4caa938d8af7de00dc1cd3834328dd2bc424a522261a971590e87a0dda4fb41520
+DIST go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.zip 1758421 BLAKE2B 0c0c663e20a8d703a5e0a971638b81158c90b5d44961e683b3108c6f6d81fc21cb2577aef125db2ea0dc2dc53a00bc162c970c6e339379875d8a1d18957a549c SHA512 cf2f1e8428e764782e64d65629ec18fe8aa67926fef1097284cf15550c4c8de050e6d362ca944548e0009bf1cf449678f1749f7c30370b11029dfad308f4b5ce
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181009213950-7c1a557ab941.zip 1761617 BLAKE2B 434467c03efcd302a75cb9a0f2fe770ede35e5e4779231084c8edc8a796ee396dec1bc32aba19a230fd49b1ba1eeb0c133c1c17a643d711e4a637c3ca682a54c SHA512 aa9b3cea732b7b2f34d4f083937956b88713e9abf14f6100feb9d9a68955bf13cfc88bf60dcc73fc283550739f54dbef87375f30509049db53f571f8f37d25e3
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190123085648-057139ce5d2b.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 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-20190308221718-c2843e01d9a2.zip 1776515 BLAKE2B 5833fc2a16dec541a1362c9df7c02abe04a54e92e04eaafd5767c1a923e3a9cf90bc8d8ae0ee3c60b9745f5f0e3234350be1cafd984052353594d6e6b9fba041 SHA512 a1418dbc50d1e41495fd68ccba2ac84fed5edfd3e613c68850068afcce1136c3456e99d226674908a77c9648f16d7861edacb70afebcf3a7e73ea3dcdf8edbe7
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190320223903-b7391e95e576.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.zip 1820987 BLAKE2B f9ed24af7f0f588ececbe2fcdaacb9396260a9940e06dec53826f28505770bc4536359edb0dc9c4901f47346edee26865bfca52436e57161dc67ff2d2f160304 SHA512 e60736e9052e986753acbbe012372565cd70d806a92f7daafa2af441d41bb5166d6f7c8ed4d88752f319d639d1ee5119d4b4660ec45a0d9563ba7f752e37b27b
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.zip 1826082 BLAKE2B 2dfe94db073155037d35c92d9ca4aaa2aa6986529934ad1453eb543921dbed00b9f4b628c5c556342cdfc2aac1eb85fdd5eee5dcf2b9b6fe2e1a0e5baa7031ef SHA512 eac19a322c3eae4a80541780ab9be5c7ee68c47eb1be7b58a4e5db8280574f65f3055acfd2a72fb9db0ebffc459f27f3d6897cf3a605bba67b836f2582fe9551
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.zip 1844491 BLAKE2B ef52a11f1fd1af1573c551e417a9842bb4d36033ddabfcffd01abd50cec39c2d8560356531b7b7ebc2ff2e3200d589b3309d8696cbe7ed20ddea15b1c68c19dc SHA512 40bd1866eb495f5c39e85b97339331e55b53fdbcb0302f4ea47d4ac6c79ea6cc5b0a4c6e967e71cb0e42e013e6ce1860cb39e70b6f37d94392699bd75d9fc3ee
 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-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip 1867651 BLAKE2B 7e9654d95bf03c5462d4d6420e676bd4a0e8769c5cb7954797a66c89298ed16063581391294b7c3e7c1e735ba0cfe3b60e899fbd2821b98179b2669740271a68 SHA512 a0560b1c03857faee4e6f6d959d042258f30bea2bb86af07c701a21c7a6d7e44a8929acd3e42503daed070c3597abede768af32814e252441f85823f330e573f
 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%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.zip 1876304 BLAKE2B fa57b9b35fbd6fc1e9c64a15e5f3545be4affa2bf773e375dc3658b4384a501de6e480e0b268d1f2c4eaebdd8f0cda71d42e7642472b4b89106bee11e58138d0 SHA512 cbffe21e7836f45412e5c7b2d07fb820b1c2f79e4708d1a3974eab3840460231083069fff4850499f2305326c4c5097b6b16754ba7ab3c39655ccf2218bad259
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.zip 1878084 BLAKE2B 3c16360d960d416d175ed4c93d3fa78d8798971d368e189acccb9e12bc4620f24894c739ac2d350ba5561dcaa6f2d297f3f8b51d5cf556f5a19c5f3c67d6d84d SHA512 8aa88bbc68d280a791035d107c67735b859afd5d69d802136d0d06f05e65d750e0f7d5d6e5db47b4edf8b5d07ea0850ea987055f64f6d2ea50a61ac31a97bdcc
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.zip 1864871 BLAKE2B c621f8aecb2a2732dab3954a1c74d8d657ce336ae195a1c81f2e4521069a8afa0e60e1e204460b922474dc17ea02ea5f5a7cc08902bb2da49ee7a4cb0e4e9d48 SHA512 3a80bda483d8e3b8297b09d97c2a199b132d4f932485fd30020ee3c9fe9ad08c1d2793a3cdd749f3d2731815713bdfa40c6a50234ff991392db7475d2c45abe2
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod 209 BLAKE2B ae212ac1167b75a96c3b74f33594fa85e980530886edcf3bb58fb5e077793d24e69d1015e8581caafcc78b2d41cc75e4e17e82b2d3f76f10058ff5a715f00641 SHA512 c2a45c244884d6ccc5c4f73b6b3852d28c9ed1d3acd4805ff36292681e5011284af42ab75ebf6274cda4cc3bcd426496515db7eaca2a529500c0e896190f26a8
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.zip 1864784 BLAKE2B 6e21ae64d3917f37cc233bb3d63c25149182930d022ff1e70bfc50ead953f49d6fd434405b9c1a4ad5b31ea39471b0a9ae6a0093b53d8b7e6cc1e88a34a45544 SHA512 f7077f2cb6f051911f8d97449b22ca79679c5f8e0a29c3c438a4f4bad25fdc58dbfdb9baa32b008663059bf9054cb9ec029215262559fc655f05a413b7214bd3
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
@@ -1624,6 +1761,7 @@ DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAK
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod 97 BLAKE2B ec2dbdd2dad833a979dc53c8d170b4d0f5d336f4c52f36e3116cba2f3549e42fc3191fa56b81d3b9378a52322b86cf5eb0e947e6002dc1d1bee12f7a6bc2eb36 SHA512 23082eb3c6f3e4330e88178c7511b83a06288b678e517cf8ad5062943d0a0fdcea16973425a8dc01cfeacc32ec05b2dba8edb1adfba2e0bcb2d81cb5060c6085
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip 46076 BLAKE2B a3611608a1963ae2e1e326da29671c30a1d44c7afd2698f85081aed84ae5699c16362af284e299bd4ed721d20052801a79886f0b1305f91b17a2bc5a091a3f27 SHA512 b35cfd6b7640a526780db3c3bc62a89ec731793e350a49894c1de278b8033c4105b5534b09c1ffbfedc8e020fce2f42757808550e98e0ef5d493891f971bf247
 DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
 DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416
 DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20201217150744-e6ae53a27f4f.mod 267 BLAKE2B 64a48fcec55fbe841bc4f933a27f93b97f02423eee8b1b6edf6bfeae98a6fff90023fe6e53bfe25c0d171a19e1e829b507e805a6c446de4e8f29924f26b9f708 SHA512 6e259127bc6a441f5669e11c4d67595a6e603b07d24fb8a4ff970f67b52c3d177fdc0aeb7aa97d9cbf0b61aa68b83ed1064c0c62047365aa8dcc9e9d04772fba
@@ -1637,42 +1775,30 @@ DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc255
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip 128895 BLAKE2B c2543ab5e3e1eacc16790bcae51ef70962f035b9b95de3797a1fa1142726ec00c66e4e79b717e363fbc5dae3e91b79f05826d623f9251c0648437efaf007d018 SHA512 06f329247189a6a61e54902e9adf7f309b71818150f2ee43ca7ead80b8f03070edb31c4646b7a379b31e1a8aa81e15fcdb2d0e92f9375fcb4d5a8e2194b954e9
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.1-0.20200828183125-ce943fd02449.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.1-0.20200828183125-ce943fd02449.zip 145814 BLAKE2B 4168af365daae5571eeccf7301c78b62d80e973ccb8475ee6f7372dcca326ea22b1d68348eaadb5db4293627a64d78e11143378d007f0491e2faec54ad4a7980 SHA512 1fe46d7b62168f55561149122792b5a9ee7620df092cfc270da7893641eed906e6287c462e576ad8586eeba8e6b1f941e38b4078635ed942d823185d9217f43e
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip 141789 BLAKE2B dc517e61f7a9c895d827ff139a36b319c7dd335e85755dc394d01ceaf8b3ce07ef13201bf6d704c31895bf7d91c15acbc4ac75bc8cde065ab4f81839453e0c5c SHA512 6376ecdccd2eeaf828a2c1f560e116c003caf5e09fe68e94a37d193697c93b18bee14abbc06edca93ca57a924f9b270bbe1792df84a7bd66e3641ce6aecbc9b1
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.zip 1330901 BLAKE2B 903b05cbfebe91b05b01a7466d868aa0172f770e74316f56ad7ae5f4e3c5d130be3f48b7ce685ca76bb175fe2eaf8b897faf85043c5cece26ab4d064d32b4a0a SHA512 778c50561a0599c5e276e939db6dd0bdd1cf0b8fde49abcb5831c3cef3fd8fb72e67f11714942df57fe447b7ea5b300e90821ceb8e35105554ff2a2e4e4bd2e9
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181005035420-146acd28ed58.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181011144130-49bb7cea24b1.zip 1332080 BLAKE2B 3059d31a617aad032e44b798fc3e136cf7b63cda49152e7460ebbc7aa59c3115e8ed2c087922bf20ae6f682530ee911dbd1f51f2eabd43cc0df948bca87fda0a SHA512 85c29d89423df60415c0dbb0e1b9c50d201c32a816b619e04f232c2384dfe5811828733b93198602fcffce2317b1e9c4297ab44bc563b0fc72203723f406ef0a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.zip 1322507 BLAKE2B 5b9988629da614ea3908f5f72307b64e02f2e9005ddb51177be32ebf670c9c89e3d62d4222d996728572bdb4716cbe492f77d966c22aefd4d31700c9ff9cca3e SHA512 0e757735d9080f79e627dd107607c1b9f9163be08dbb304d4a9219564ae5f34727ad622e84c650eacbd4eb5cc939086e8364c847c21e768a70e08cc1d3e1af4d
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.zip 1273340 BLAKE2B 7d42472afb905448b6ae6f66258dc805fa7c4b9c8dffb230ad6458b250fe5d564a3f6e2bf97b241ac9293c9f5885f28cc996ab7953a0ba9e97b8731911b982d5 SHA512 57852d3cd066a9eb279f909b464824041e138db1eb98c66ffbbc81259cb3f94da8ecd4d2b961646fbbe0c05156785ab2f44408b19d9f467001627d7b12fed4af
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 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-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.zip 1420117 BLAKE2B a120e636b0af1263d75671e3d2cb5a11e43201a30e43fefb2c02980d168fc436564a919a84ce718fe3c59626142358d954b8760280ab8a0ad50d4682fa771500 SHA512 11bd2b3b29ca953dad5613564f3082cc3d56c6a41fedb889eabfdd776b1dc3d73aaf19b1ff510d117a2b72d88378a42641ffa36e200fcfc40c8b90ec1eec1747
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 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-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.zip 1422376 BLAKE2B 5995b3bf9ad143a950acb3ea20e416518d8f90fa1486416b23895f7e8f8decda87cea64757616d8df1390c714ea5a50f4b2a1d1e4338157867da72f72b4c3f65 SHA512 fe2575eb7f3ca98d19db88886f0812f46e93151037b1286a89e9da22ea8adf1d27ad9243848885e3d309830a3fbbbd40f343a9333ef4cc57e66311d61d8ab638
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.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-20191004110552-13f9640d40b9.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.zip 1422609 BLAKE2B 9d879e8be7102a414510c297e078d409982052dea09b5990d3c2618e8f0ec94ba220c972356b1dc7dcce4941b7d5ba6dfc2e0490a37bccdd34e63bd4f71810c7 SHA512 d0608d4fa986159af8c4977c62d99e9b98cef21cbab548246deef3e1b054941f1576b6243e65de6855740869907098721be140fcdbff6bae9e523af736979fb6
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
@@ -1681,37 +1807,44 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.zip 1500756 BLAKE2B 409469babd63a7afe8d50029b7b3b9d32c6129ec838da1998232b11f15f18c12752d7d995576ee81894ca9c06b2cbda89cad34f35284d6b309e8cfee12b5c78e SHA512 b12fff625e45b082a5d5c2d6e48efa22c13844ac6ee3cc88df9ba67d922fffb1635c20c38fd8ce44f400b77a21bb1ec9629f66fd11f2021b6d4fec71cef7dd4c
+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-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201006153459-a7d1128ccaa0.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.zip 1580428 BLAKE2B 3bc05480dc51b5f2b1b67473a4955a40218100e989f6dff8d1bb337cee52b451554f743448f8b39c3df73066c30f0b7740303807141ff2580a0a9a5b96e3ff21 SHA512 d2d645328924c9e9eb76e267cb47a7397f5cb200ee0a1a295eac1b0da4ba87657c64a7b8f2fc8aea3a359c4f44255e8d44fc06e40c65db539f50f9738b55cb47
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201202161906-c7110b5ffcbb.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.zip 1583641 BLAKE2B f83348dd8fc8907f7a4251c600ec691eff20d86bf45a8af6646c715ab252fa9413dd0145364d7b4e0489043686e0497e79cc2e06532ccd97503c99fc87e6bd42 SHA512 9078bb5c9524a58dbbd099b931fa7df78cbf3f143313eaebab500f1bda247f8691bca3d92100bc4905ab7b97a5d3f94910fdbe4d58a16f03e19a153627149b7b
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210224082022-3d97a244fca7.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210224082022-3d97a244fca7.zip 1586267 BLAKE2B 9f9f5638a7e0b34c6be97e57d3fc3d902955a09ec329c88e90981f39c9ff96a9a8ee7b1eeb3652412c528237009abb9028836c20b035d4624efa1fba8a2ae14b SHA512 dee81a0e3d948635a751397b260f2d5b9c310d63a29093e797f8f3ed6d973c2ab01f677a0e03c455d27049542f6ac78f34296b6dfd4691df979bef9520557b34
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip 1587056 BLAKE2B b8b8cb2f12231f2e5129646f34a1138b138ea6b38af50ad8baafcaf155e9eb623e320823ec1b7502431df3f95dfa7ea1c8cc21abfee3c8831d913347aead0669 SHA512 0e635def6bc35ca664d28575366161fcce349c9f78386a9ffa3dc700da1e1badd6fbb8440113451ad7c1cb9a18b49f949632734946ec56ff56d894d8d74b56bb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod 179 BLAKE2B d4f0ad22973a6e0a06b186e217dedbea3abb1800b259c56a29da9075c36808160620b42b0a485127f713760b24b4d9d6d9a61119c5739927340436bac307f5c4 SHA512 f48731641ffad3b90daf0a8bb79fdfc607c076961dbda1c51e71eab787dca0681e5984ffce048bd655ceb56052fa64426b30b32e6ee32957c92418a16d1c9f06
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.zip 1565731 BLAKE2B 25099f5d276bba9b2d3c5e75c603dac06f3364fd09d2a2c53aaf5030d4698fc3638758d23c0a82fc118a05661b40377b74ea55c2e8f5d9add2d03527104ae80b SHA512 23da0e9ed2c647eb043e4b57e384ae335119b3766411f84cb009496a1fae85c7cefed14a92154b3e8d7e93d92187dbfde9b9cc07236ea3a7ca4052b93c6dc0dd
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210520170846-37e1c6afe023.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210520170846-37e1c6afe023.zip 1566158 BLAKE2B 972b72c5a750722c7cd7fb90f462cc5abcfda4aed6e7952edb46dff875bb721ff571b2906b314fbde9099be660cf301916bf7f0c16af09eba17de3183ff73312 SHA512 c09ee8ce68242e25189095d1d65cfd00ed1a6f4c52cae78225e20d6285149972367e24a58a67846a46f3002133036b0cc7bbe6d7b2f6db6dbd74386f71ee6c5b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip 81912 BLAKE2B 647b2edcfc6109ea26a1844c259174eb37e3a97cbf12242716d4cc308b3918b5a0b104c9a5c2f3b4974bd94c28afa7ecaf40e71aae5fdd821cb1a5a15ec978e4 SHA512 62b95055b08c73a87c7ef69b2984eefd061e3f7d71eab8e05ce82a4ab1be2ce200aae7929da77a9ec49051b7c73bcc948fa4ee782afdfb8d74dc2d206636313b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.zip 81666 BLAKE2B 1c439d91e33db90a8cae45b0c3d94a528ef26bae9068511a14b0c6782fefa8f1dd15124a2c3a209a753903dc9485fad6ad86962f059b937d6c0c369c6af78af5 SHA512 eace3f9bbc11e83304e807c9d3117c54239a7d041a4e3fc47f6e451715a04a3385a0f5a33cdca50bd4a407c7bfa778a7cb9965741c330d26a99477f085c5efdf
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip 84373 BLAKE2B 39bd0256afae566a53bb0b7b95adf0416653fd003bf5312c7a316a2d7c3e5d1fa25fd08bdbcdf75df45a56116fea54dcb1bf9b68b07d15d3a909e072f8f9fa06 SHA512 10a924e5fb556c2726795462c91fe7086472d6baab511ac21c1fb3c137e5a3e0db55f9ce8fe1952566d887225e3528ec8b747136f8984163acf71e869a0d8c58
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.zip 24878 BLAKE2B b405b445c49834f5b9e5ee82326dcd5f4807963a38d29b851fdd1e914d2695fc5066e17066288e539818ddc52f83c209325d9318d1e4e76f9a2a9a1859f82ff8 SHA512 1f94b8b8c8e4aed577fba2cb65403424cd649c2c437c115d52e08338194f447a4939fb39d73237c2906ea15a4b5089642abdd0bc6ad8a34c8b8e6f097cb43fdc
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 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-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.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%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.zip 28627 BLAKE2B 616de462c5c7d1ad7d5b792caf2e3c9d45c5095d723dace2038e012672055b6c052a043414db7b87b26f43c1688d8c353fc63b666ebd9569f832fc08f7ac99ca SHA512 eda82aa21a23db9ccdf960f6fb0583223839623643525410764e5684d8551e725c3bf76fcf68a4b4ef1d1fb48505d248b9600c736e0e9497d9efd4bfe5bd059e
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip 28673 BLAKE2B d5a34f311e12038daf9c89b646bc5caf5566c08fc563fe2af3d113596d77cfe759942e35314e5b595c5704920d12b273ac30de865256b406287868d827d28938 SHA512 443917030bd593bf9ba4fee7748b5d9f15c82b7cbb21a586fc9a326de9c4f8fd8a7caf29131b0c8cf9fbf6a1363fdc7c8dd2ab897b569d3adaacfb55ad0d4601
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip 28693 BLAKE2B 3d6a34fa6da642f5ca71c930bd69a41439013f20ee60dde5d4dfab4bf688f1edb150a0477cb006670424c6c59e90d4bac9e5eb34f9fb4c518d903dfd26fb6cb7 SHA512 48b983589bd682ff9275c47733ec73637ebb5e58e1bca0c7744101229237d5cb34170efab63db0061aec857052cce9ef03c3497702b90a86287e6be88e1b33aa
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -1719,51 +1852,33 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.zip 1438775 BLAKE2B e8b4b6a5ed32eb337abc8df4ba122356c664b4b23fd7f4bf7e08772a031795a293e26aefee819865ef381593807f0af82d9333822f31979d217414edc8b8288a SHA512 3a3f9adfced28713c60cb0047a0fd8a9b4de774fbd96afa7494d7fcb062f172e33024be15abfdeb7565987ee44e71390366fe43b78e8709d21cdc11be491a927
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190124100055-b90733256f2e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 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-20190215142949-d0b11bdaac8a.zip 1584596 BLAKE2B 2d891f4ee749bbf528b0a44acc8cc71a56432961fc47864ec9dd47543a8a1a97d55399dbb95a0654b0588ca2dc95289ae31746ada83afd9a667662c371b6747d SHA512 8431fd78425186e55e07be9cfdb81d294b517d1695f99da3612477b8275d9a64038b60097658a02f399ed99d2f399197e572f3c307f70fa075b4995943caddb8
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190228124157-a34e9553db1e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.zip 1603168 BLAKE2B c95601799c0933a0a571ae363c4fbda2d368056e73814f671203c3cc5ed2ca29c32a1075cb465a97078f77a690b71e1a35d3cab8b890547590e5028b514aecfd SHA512 914ccb1091addb4c59c243ee8f93bf6b69e501e5209c608e53a9239135300a5e087b228382b676387d1638cafc7f15028561bf4d19560fc13bb3856151d401d1
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190321052220-f7bb7a8bee54.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 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-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190522044717-8097e1b27ff5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.zip 1786141 BLAKE2B 75a9277772bd5f02bfb9df1fa4a118dca1a0e52e1a6844e7fa9d7ae7af525403e323f3cf436e7136348d408be2c579dfe9ee250d2a417fb29babaadff5194944 SHA512 1a58864a35c6442dbc958aa75b624488ac5da2bf069dd444234180bb9da6bca6f7d15afadc9609446b9e62a03dead890d3fe14001a1d2bf868c7ec68d510db58
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.zip 1796051 BLAKE2B 8ae290f5ac2a687e7f2445c38a81565c89079c5429bf11d20e17a55244e8a195fe319d76be3abbfca21a9968c7b85c7c5dd648806b8f4cab604b5997c1e40be1 SHA512 bd21fa68f2bfc5afd6b1e764326fa57602127614af10c557cbe231f4fc9428fac0531e3e76ddc05eb7f86a4ccee335a6955e71e05a60b8370fce453cc56cccfe
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190812073006-9eafafc0a87e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.zip 1818872 BLAKE2B f8bb456d6c12b800b7a572f686788454dc81f4f65f61d2f5f7986e936a7dcd4a57417137df2ff16d229adafe2a2daddd9622cb558454648419fbf293857a0382 SHA512 15544b523ad8b302ab9f9fffaf971decb598f3f7789296125523638d5ebb56218312ba2b0d7d43dd8e786ffb761b012d957c8f123dcdcec8c967bb28a544f84d
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.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-20191001151750-bb3f8db39f24.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191002063906-3421d5a6bb1c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.zip 1867555 BLAKE2B 88d89694c8bb9e902e96293be8201438741eea890f444a93764359288aa9e20a275bc5876be2bc1b02dca9c929134efc8ba3b783e3d91cea8b837c97405fb9d4 SHA512 1c3a28e9c6651261a4f0f57ab7884b6183fc2c0de60dc94cf3815043a1af0531bf0c1142e9666fc309016a65259c51e799b35f3ac300ae2e6ce52504c89c71cc
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.zip 1909683 BLAKE2B e805a91f77d0676c801f49d0e538eb2d453757aa2cada7eb171cffb7743862cd6a9513ebfcc6c5fd2a84aababcf6654e6b46aa5385ffe9b2bef5684ed47c4ea1 SHA512 7a89d92749817b460266c037ba8c5045a720d374de593921e53bbfcb06482a2c3b2a2f13b2599959035abdeb256e7b7c63802e5dabf81ec7a553abffce341786
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -1773,56 +1888,67 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200217220822-9197077df867.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.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%2Fsys%2F@v%2Fv0.0.0-20200327173247-9dae0f8f5775.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.zip 1477146 BLAKE2B cc4df16be2d059358b99f9c276d4df8f25aadacbf49af02139604ee688ee377be56ba59f627b83b3b4ef56da050a7a1c371784c07c893035072372fde9987488 SHA512 80419c41d5b556d6b63c2de18a7a9d89dad29b77da1acf6006f3f93f07ffbdaa5034bdd818afcae196a8b69ec00278622a2003e51861d9c6a62a886fa744fa6a
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200622214017-ed371f2e16b4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.zip 1480129 BLAKE2B 7a94559244dc501be0cdb0bf1ead1bf4fc58346333ca55734a695241ca1dfebeace9c845af4f6532cbb4b17a8f811f095c32e511fdaef94940b87b91a544a770 SHA512 2a923e3c49b04e7c01d8bc7072aa0f7af22d45cb7c0d1e59e059f7b755d8977687243a363e3e94e35d80d6c9b5d8aeb098000d29ed891d187652f087491d810e
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200817155316-9781c653f443.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916030750-2334cc1a136f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200922070232-aee5d888a860.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200923182605-d9f96fdee20d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201110211018-35f3e6cf4a65.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201112073958-5cba982894dd.zip 1527718 BLAKE2B 9435f64eb980d40f143a60422d11270b8b4a6e18fa89a2f745afcd4fb45765626920ed8d011c4d4a849e8e46293a0ed628b4ab72820191a16320695376ebef3b SHA512 14d66392bda2766de031c1953e9f598c1d5369eefc66961c245af4abf83e02557b51f95ed19db5f10b18c83f25fcb9c4c3e7eabefd3461b5d781e2c000b03594
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201117170446-d9b008d0a637.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.zip 1529486 BLAKE2B 3d16c77453863e514e36d22712e3673efa29d8bc2e2db1fc09aacd0a18d476b2129b209ad6920342501f3a9b82c1e13a9887da70c96a43cf5bda6edf40ead76e SHA512 ddc7c95d0a5a188838bfced4e2f29da4984789b5a60c3ee6d496ade59b3089567d7f6eddb35ffdf3fbb90cae8ccc3f95ae7c2976f5b39320060ce591e8ff5b38
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210112080510-489259a85091.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201202213521-69691e467435.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.zip 1549338 BLAKE2B 94514181eb8c63293bcc8586586ed12574ed1aeb1f64247ec4953c4a591d8cfff3f32f8cb919eea69b67ee0b6edf406d65b7676dc27db2fea86549148f372127 SHA512 8ac070589db0adff74a784cf233ff80bfafbca77d840fc13f8f5c03e66bd62c960248e13aeee5d6b401282c913adc5d42ab3e4eef64ed199700c953500309ad4
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210225134936-a50acf3fe073.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210225134936-a50acf3fe073.zip 1629496 BLAKE2B caed964dd6b55ef705e87721c9c5988e2c70fdfb91a17185ad36e3f30733a0fcc3bbf5becfd99c54e083be9744e34eddaa9559ee238d79909352721e291f9d6a SHA512 d3a72c106c82dd71dfe24112e74dde867c6649bea85f643f89d17853e6f0095ca15be9e0c41e8f83ff6de2df9d0037fb92246e48a0874969a9075d231a9286fe
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.zip 1693022 BLAKE2B 3944f66744718f14312f18a04dc8efa68254217830a36ec222b121af87a1d863df4b4da5df90bf4761d0983ec0deb77bb8850b0fb3d2575bb712db29562a0b9a SHA512 95bb9341b37d8400807ad99bc7d40a5905f5a1975b4608ab627f1d6baea82a9a9bf2ec751a0551845d9f603d9b18564a302637733b5a31607843f75b04dfc5a3
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.zip 1646022 BLAKE2B 43422147410009bbb57e2ead1bb85d91bd2e86f46c15a1ad776a750c52844d70ef8626bc11570bb9b8f22ad59bfd0ec37b3ffa719a40bfb06743b049664aede1 SHA512 940cdcbbe336f6c795cb5bb09ab06b339ec1736df5b8970ec5c3bb641c1816d93cd758e933b3423d4b7bb692a9a36e80b118e596139ab47053a2b9259c5c3a41
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.zip 1646674 BLAKE2B a2975e42ede4b3923b53f6c28b8360a49b47734e5512ffe9e52e8920f79af09420d3702d3d7e54e5755c04fddd0836e11c7fb83441065bf9dd31da363f5121a2 SHA512 6a36b9dd8ab6582abf0721e3fdfd19c2cbf9caf02a2f8aeff8952175553e35ab9f9972c2e524ad947e51e24f5eaee23984fc1670d512c04e50b2d71890c5d392
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.zip 23281 BLAKE2B b2fedb31c347f2b5b8bc3c0311f5078ab84359736379206227bd7ad4378cffb67f39cf078707a7095ecfac3c243bbac54b64cf41375a4261fbc9af9887d134de SHA512 267fab133c0ae306a1f484d17a9c3bc7bafb1ae77df3412ea4047de34a940b6425524a93b7b41d010cbf32160482fa3a370f93654e4ff73b6d11e45463bc185a
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip 23402 BLAKE2B 03ef6b566c4f9539fe7310adff76e37bac4e3aaf32559f1a228690195207530ff68ad1179b22594cb7a62f9dcceb41631452052eb8bdab852848ffa1e19c0fbb SHA512 3aaf366b00d38d9dfe1ab23a0c6df05e2fb586f44470ec9b7cc59fc113cc68567a4102352b4a416da137df619b44c61e28042124cebcc525e3c6ebf10f8fbff2
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 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%2Ftext%2F@v%2Fv0.3.1-0.20171227012246-e19ae1496984.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip 8605233 BLAKE2B 3e9c66a40249df3915ab9de2a8de2ae0b92e4f7d645f9753e66e585ebaf86992484fcb933510b3400595182e9bc667434894697953d7078bf43f617f5ea1905d SHA512 26d09376646c1e7d99581f0fe03ea109b00879dc351996f77e6442b0fd72817d056f630a56cc167014acb55532baa4be5437bf40b4a933cfe450854c618b3508
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip 8610726 BLAKE2B 78870544de29f5cd9216befa8822c2387654c3987e09994dccf55d210ad7c517edb93bddcc68bd981f2c083a4ec5e012d558b0164901e2d74f6f447e75edfadf SHA512 494d58f2bc02819ec24d8e55f668a06694568e63bc4b41064a7e44aefcb2778c74983fc9126b50277845da8e6739e83fc1334aed989981e8e53b869878803d17
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
-DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.zip 12802 BLAKE2B bd71752bbf787376638a3eb8369fb3f3ac4efdc057cf3ecc9f02318186011af009c17c0a7a3b9183b1bb6a88aad15128dc64835821c90d9bc2adabf6cb6ddde6 SHA512 2e23c18588f6f5cb58a6edc02b23ba1abfef92ec0d46c272b3f542354f8ffba45b14c3a328372dc46bd8118a255d3f3d9aed303a8a91ababd6ed296cba2aadc6
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
-DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.zip 11430 BLAKE2B 71f78b102648ec8bbc2dddfff5744befa947cb4080dea3e9889e27096e261f2dc3d7b2e413d69408d01251a6c7f256238e514a23b4c633b7eabeb198d7835c85 SHA512 2485a31f9a111dbe614d619f6007fc973006f372c6104d5549ac4661d838ab46b42d2d03ed7fbe1ca9231ba4d247a4af584833ce172ae9f48ea42519a25401d0
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
-DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip 11671 BLAKE2B 0a73cd55380594ca4bac71bee0207b51979e62407ec3c828f975e8091a20e2b9a6cc331dea88cf0ff44ff3a6c7d1cfd2844651acd1d957c0d725de525a58985f SHA512 ccd129fd4ce8e4067d0ad4b164cd8c4fb7ba65d5022bb656dfdb50dd2d467152bb83760f3d94c465b6d4c29c29931c8be6c697e1634ccbab4eb3a53edca7dc4a
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip 11971 BLAKE2B 7b29c746b75b42c23fca353b8299a4feaf69556ce1395872470e891835a8dec88a4e4c3b64ba6dcb4b5512aafb9bb44cc38c68915a0f6702f1027cda89d03d81 SHA512 58cb42ebeb88c06e049caf8c609e95243e7bdba51057de7d7301885aa904111dbe85962b5faef216ae45aa73f371b5de6516800a6f5765219cfde3fb06372afe
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.zip 12009 BLAKE2B 62af63a123635afd495a0e621ed365f31b284aba1f891d09f4334d63d46a5dc0387aa055901e6e74bf358e1757ae91ed8515d3e2c9b9388f7f356841eb6543ab SHA512 a1727535cbe56fd9c94619ef7821c06d1b2f2cc386a839451aec9b1d101118b0f1e64ee78e7aaa72660f9a780e1c74e0fed3f07bc8f8b4dae9f7bcab4323ea01
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.zip 12060 BLAKE2B b2dde82c9b26a012e4c7047d5a267b4b6b78cf510a292dc98cd26bc9d58ca6c9fda4be3df63e687a0560ee44a783a5610f75764f80c1e31a88227903eb6fc0bc SHA512 f90053946276726caeab58ba23b298a9c36a576c0450ea558c35edcba87396d32318f1257fe39285dc30137e46b7b0a588d7231a4c1b6a4cc59eb2d22a3bdf01
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210723032227-1f47c861a9ac.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210723032227-1f47c861a9ac.zip 11905 BLAKE2B c72c6fdc8a534617e7f954bf403a9c74611f0d2201e205bd786c11117db58a5bb22262a9efe9b0a8bf14a55174099dc923dd515bf70a3ae55ea743db882c9a99 SHA512 11a00687837969f6da4a439361a4bdaa97e85ce9ac614f6d69b486cb36d1d91b758be4b04ab8c6f6030f34a0863f613aa826d1a899ab9c8a6c17af6f3e1754af
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -1839,21 +1965,19 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLA
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.zip 2661495 BLAKE2B 19aa174d089edd2bf17eda19b54178cbf9c9856a5bcd1860c5a8bc92954e9678a471d45de835e9d1dbcce7f3ea07e7678076c2e8a5592f84b3a56d4198d802d7 SHA512 6890637b40a71ebbc1c218b9d3fb142a473896c1eb939388644dc377c783c487caae3df6fe69d8912708da5345c56477a1fc74038056011f57b12981ffeb5303
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.zip 2714038 BLAKE2B 7472e32eb2b2e13fb69852b75ad11c290959ea5b956e6539e116f22bb1692574ffbdce06735cba47fd53ef5fd2d4bb0e61c5ac8c311a0d1c866a732bdeb4d4d2 SHA512 1f009415ce8aafd1f09a288d61409edfc74fffc2e5ceb16c81e50958b7ad9079ef6dae777505ad8c1e854a287cf66f3dc32681abe5cf083c97b4434e838ccdc6
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190706070813-72ffa07ba3db.mod 155 BLAKE2B 23d2d8015cce612ac3719373303a968d64840c82a2c4442c1c287baf2d7f30e5422fdbf0eb451912f2d38d23a4c36e7730f2c60d5aa1edb55e0b63c0b6359aea SHA512 99b2e19040279bbf7ccafe1de879eaed0dc22c49d60cc3a0e267b533ca04523ca12f35bbbb3b4b85033f1025b036acf9ee3e526d45ff6fa1ecf30d67a3ffedd9
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.zip 2865335 BLAKE2B 7c8e21e0afe308c9c8e9928b284ef4262a90805342a20ece3781ff53249a65c16239b2c462325f080837867ba7904bb3484c1a73ad7df8cadd366f9cedbe9eef SHA512 4cdc1ae13708b8eab3dc643669dfb8e5d113c7c7d68373e1016da89744ae4d4b75a6a96f234d23b06d7958904081a215db4bb4094b6b102791ea0374326d66dc
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191017205301-920acffc3e65.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191017205301-920acffc3e65.zip 2887081 BLAKE2B f24c37ab96c441f6ffe42fa49f9ed566d0832168e148198b878d042f407a1a1e315c06b4104ef4cb3210f4d00b5d01d0e93d5f9a24f90d62846a6b1a37fed03d SHA512 e5f336f4d4339cf91c22c69e14573a6c4c0ce2385fd675ce3202d66f2487d07de6e3a4ac31833953decc8495a9831b1bb76e4d3a0ce8ce19efac85f8cf3264a8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
@@ -1872,20 +1996,24 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod 267 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200505023115-26f46d2f7ef8.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200616133436-c1934b75d054.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200916195026-c9a70fc28ce3.mod 270 BLAKE2B b41915c3832f7da9591429edd55565a9db62232673a9788e81d877f70dd574c14a77db730e1b27d25db1cffcb60dc7de926fc39fade1123b3072ac35e848b2cf SHA512 3f901620a7f769ec147d5b7af39969c5992990c0fde2ba8eb8b1d513dec5dd1804d7ddfc49e80911152a24fd837ef008d210af54585485bed8136dcec5b6c863
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201224043029-2b0845dc783e.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.zip 3360420 BLAKE2B 8292263b751ee7d31e19e81f0d579d777d055ad5ef2528c41015d021d200674c5f189252053a59ead0306907d4c23b07b38145c06c00094364b4a833a873a6e8 SHA512 f8c20e84c403c84de01d202c1b8e68e10483d6db36a06e3271412aa5843649cbd3bc70c5980b254101783e29314d679c5b11b8a0d2ee156cd149b7ad46da20be
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod 323 BLAKE2B 703b8f1e36b74c6bea0f942558045ef2333c658e31a3b4c2b7924c8e436c31a7d596b60587027f7605f65f8fb20597e0a7e7628f0ec2eeb423f3519870d8e0a2 SHA512 13d4c5dc1bb206cae17c38b6e387386573b402a3679054c12a53acf384e15d5d77ebbb77ad374993b1bba547faf34f4189fe5d77b80d57f0831dac1ee54a98c0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.zip 3276723 BLAKE2B 12b3291e8ce52a94677d56ad3cbf020f56777301c8b308b1f05189d346caa6395e8a0e177efa226e15e6e9235c1e387031d34cf61b08b4fc0f3769d65120ded1 SHA512 e1beb4466d35acaf836e0a8f015177e44c346f4fa31599a0b022cb19cf7b6623a3d3efcaf9c00114cd6f86a7634f19c14208a8a48ca3adee780da67964a60b57
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.zip 3441487 BLAKE2B c91d9d98cb01c8562aa2a33931de3ca86d51d815a1514a6e55533854ada4d520f22c8a08c69b9ece3714156c787c46fb9ceba156f99f4b8bbc08d685ed2621d6 SHA512 0ee51d19f7a03af6f79771598ba4201f54b9035f38086829e9e9ea837156bb6e42b900d9f75151ace7e522b6439b21e0a86fe2c70f3d24f37bcf5a70a084cee7
 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 golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip 22295 BLAKE2B 310f892b8ce32810a1afef53335428d73bc23e749e52d00d7624afea2d10422b1b73507026daf23efd2384b81262c4c7862c22da23f6fb43c1b5f79a51170d5e SHA512 34044424d303f5032d4fd302bbf1aca390d45e876583cc223fddf0d685a6eec2bde0a4c1b82c4e471eb5be97fc8aea9b14695b07940d1ecde806636a85d12051
+DIST gomodules.xyz%2Fjsonpatch%2Fv2%2F@v%2Fv2.0.1.mod 185 BLAKE2B e51a6209dbfc47eded193c7e2d1ce3d37d2eba6c2cf279ecd61dc8869a4d3994a6067119e62ba881d38e0ab485de63bbaca444219c84ed879e1f70d854bc7a55 SHA512 36af6513f395188c7b4a82cabb5559d2ff7076079d66daff23e3d2e92f326b12785757ea1e48f57ae8aed61cb37707162329b0defda395f2e628fb72c96db759
 DIST gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod 147 BLAKE2B 6124c221210cb16cf7f0ea44ad962d904b2e8b050b4a86777f8a21114609c99866c53cd32572005bce9778317e2e13425cafee613ccacefa52933ae35c2fa65f SHA512 ff99bdfc473f5d75904731fc4e507a08743e5f4943d3fda12160a81dbcd1d7340935effad4e053be14da69240d6797d0462a823ba705e9f849607b8a069720d2
 DIST gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod 203 BLAKE2B b902ba60b159380e6169e4c6a01cfed819541cde7e25deb4455de65799492c46bd0a8ff6031b332a458f730f2cf5e9af50fb8de918abdeff15d60f20dfed78db SHA512 7c3573dd6aedcf5ccec10490f251c793494595672f68232d2aa0829b32b6922713a0fd2d9ac153434b7293def6ff84be6bb5fa88d2c62663daddecf42b1b3098
 DIST gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.mod 266 BLAKE2B a396e867f12af9acaa0ba4901fce9488d91292bbc1395946347017863a80e2ce4c6208e3a21294f970c8fa5e1ff81855a606e9ee44fe17228e79e4bb74569402 SHA512 7cbcd41fd71c39cae85710571902f9cf2a477d8ef8eedcd2b47cca7d8d36056b1c897f790714dd905e0872546eef853cb52b1aa6c39366149e69d912cf26d567
@@ -1905,74 +2033,50 @@ DIST google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee
 DIST google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
 DIST google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
 DIST google.golang.org%2Fapi%2F@v%2Fv0.20.0.zip 14949265 BLAKE2B 6329dba62db106b5231dd7caa92f6656221439d3283cbb1d96d1bbcd6dc9becbb71a03ecdeb41e92a71e60fdbddabb7153da6ebd78b3036e0ee95ae12c2a0c67 SHA512 f41425c9a9d4148d2539efdda6bccfbb610d0cd0a6fdb8b74b5ea175bb8c304dc0bff7bbbe9e2a0d521846764a5b884b7dfee2a38cdb8780374dd85375b5311a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d
+DIST google.golang.org%2Fapi%2F@v%2Fv0.22.0.zip 15683802 BLAKE2B fa0524cde0d97f97f422db92c0d20728542d960adac6890a65d0ec51f43b642ad16289a47ee0a402f987388ef3b878122150420dcb536a0e033fb9d8ac603e70 SHA512 38227164f1ea35072feea2a8fb6b934403f509be2f3b5108be48ac82ad078cbae70d25bc7edcefcb666e3c8111b3125b4c7448f83be39f3e31323404c1914266
 DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
-DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.zip 12627925 BLAKE2B 127f6d69484594d311f73b20c126fbab0c007a12821ccb0c3961a0af25ec8c4bf02353f59651258f942746296c5574b51e4ff80600e26735ed65cbbda233117b SHA512 0dac137701ce31636c5dd9e84d1b70e35328768125cd660613b751744c9186dbb807847b93a60905a000e7e6500657e3ddd54d3daa4ff8b5dc94717d5146e7f0
 DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
 DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
 DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
-DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip 408151 BLAKE2B 9f815084675da034d639cf3e8648ee5dd2d1282d2bb6937ffc91956b5cfa46809499441a39636e4f0565c4307854977201ecc8cfaf38b46557c3e715cef0722e SHA512 1eeb760cf1057c306f2301ef4c7065cdd6dc18cdeefefd3a1cc8cc22efa312ee5ba7da6b79a4e7666bc09429d1ca73d7bc1db574f9cd33d271a72700a070a219
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
-DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip 408275 BLAKE2B d9469c2686d9899f2a61eb606d7f8d79637eba5d108ae077be3f2bb5b8fe7240378aac0660317597d46bf8aead251506ac0119488cbd54cba59921517b3fa726 SHA512 ae7510a820f4d2a46354c2c987c362ce70f782eaea0ff3a0a627e9cb4b08e07d6a1f29d24fac5be6a8784a7cf3e82708b427c022682377efc2b8872326e6635a
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6
-DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip 418135 BLAKE2B d3a64e18959e36aa267f235f1636d00ad545cb32a9245641bd771d511d8168c8070a2e517ae2b65d4d5911c1202267ea8cdd8ea8ed009cec3ccdb9013ad9a0ba SHA512 36a2b9842757e17959c520fe02243502017b8a074da8105763de86ba14c61659f49b3bb8b1eaf8b7c93f2ed297889a26dd43f3f87a139e205390cebb36f2e446
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip 417678 BLAKE2B cdb4e693ed5fb2bb77ed1ce0e0b1b25dbc3648c00554ade874ce28fffd5824f487fac744f9f2cb0920aad2c94a82024e1d233d1663887f0681790488a3af6f3c SHA512 1ffe3894d8fd004f6c28916e06d8e64708c20321ff914e82d05c50ce4c62b76bcd93e74e45871f7adc779791240ef8e25df08fdaaf2abdce20a3640d8964bb28
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip 417793 BLAKE2B 7219518f67d83fad94a863f889af4c3a28a48b60fced31f33a3026c00bccfb6319060c5ff4712fed598824b5bf1448b0981fc21a6755855e91ce53b4026db062 SHA512 26520c7bbc5ec3c02dc86e5882ffae74b040f0600aa99832cb08cead5d3cd5c21a32d6df332c2c74a76b6c2a684141720b4fce874a07241412bc01837784b115
 DIST google.golang.org%2Fcloud%2F@v%2Fv0.0.0-20151119220103-975617b05ea8.mod 31 BLAKE2B 679418ac9c2ad45dc432c1fb2f8ae13482bcce67e3d83f3204380a5fe8b69ecb6f19114b8e10656880a434e012712ad94bfe3767874d88ac64960d86dd5548ed SHA512 1ce907ff4c74870bf960dc786a8a2d824ed8794c433af026bdb4fe29c40c0812187bd409e3dfb99bb91414e0ac5f766d3cfe0badfa6e1ac4a3e54de3f14c40dc
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.zip 2541816 BLAKE2B d23e165336ee73dcb15c5a5d9632a4594b8853421601d497c29a8c16a69c558b6e7fb8a478e15e9808b9bb9f138501a8d82f6f6329e486a24481e337f883fc14 SHA512 eda9b82bbe85d100e1ff545b838fae621b68848c9293e0d3caa8bd2a183bcfb5dce072a1ac721468cffc264e5f9dc38797e4d98c23f85f905ee95b3587c6d867
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.zip 6571736 BLAKE2B 4928279caa037245a7de73a8f34e71d25eab95d899a5c5e6037a5e09342ffff805106aa2c0976ed313d8e60981311874049a8934c94f49ed41fbe51c79a573d1 SHA512 f5ffe2bab6d812221463d0654f6e381be65a5fb6ec06acbce52ad47bb828d18c842f1129f509363f08d07a93c3f637797bab76c4937e3b30d636b4c6363f3372
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.zip 6582805 BLAKE2B 616605b3f564cb2d18a93dbee14403e3cba1301b4f7846e87c7110b82dc762d19bdd4963a6ac879e0c4d628d3d8aa49a95d4733ef9b0b00f0055bcae6cefa651 SHA512 da166590651a61ce61efd5bddcef57acfa2eaf880f5d783a34b349a5a6daf13256d18437ee77a3963ff2a280f5329044073007b0fc1317ea7bf09437907316d8
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip 7435365 BLAKE2B 7698ddb8160d66abd158a526a71371ffc975215c78fcb187171399c0a7f68b840b2e3d9b9ff631bd57d4e5aab7afb782acd137d41b68cfe8a7dcde60b7564249 SHA512 ad0e0016a55319377b549a55cead8f3d39916dbc2acd22ef7b9a93eb455e52f58ea46e306838a908054e6438b1f2006d1a74fe0dbeee9f3fba9e727fdd42deae
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200117163144-32f20d992d24.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod 340 BLAKE2B 70822d80e0c64a18bea901e30359c66d790629dfcfd7b4512b215b2c29bcfcc862bb68f9480357118c7adbe6a1b42754ef7703bb28e608abef8f8cdcbf6d2396 SHA512 461bf9e9c747d61500f3884c67f82cdf9394b186b512f6ff7537620a8f7a8de7a5c30af81c9a1303c0babfbc748c80460313e6b8e440e1f553fd4e1e8e12321c
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.zip 8474064 BLAKE2B ea1b3412fac7be801f254e2baae315e0d1cde85dbec2ed9dae61359200443af0dc790bc0967aa3e6b2d7448e4d663a6b7b0012f30574cff4ca4ef9510c4d19ae SHA512 6b17af3fc4ac79e8977122e763334b147c16a4c5455fc65048dc2c3db3e30158db094f47cf3895aba2319747f1f242c16d8f980c6e5b270d6c028619aba0d71d
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.zip 11069953 BLAKE2B 6f7597f4c3213a11f9c576d526a927062a5a4628fa3bd554fb28f6c91acaa4e3422a07fc51bbbddfbd5b35d8204a68a48501b7bd8221c15244b7c0674521dc85 SHA512 2589c9190e3e6af5c2943795b71de8c79d60a5f4d4d1cf21f020710c0d5a52acb2a742e0eec46f1a0fec28c970962925cc0ebe7518e11979c926e5d3bb7b4552
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod 353 BLAKE2B 7e159067adb934153bc2a45c1a091ea85083c9e52927db8aba3e7ef9e13f984dd738aaf3890e85f7daf86afdab8e5717775250715285c0edc05625a544664cd2 SHA512 17266a643d974e2fae18e7055986002b9705bd2a7fb1e3cd3664fe6dbefbc7a04aef6900146c1e1c3ed84bea8b4d1bda4d6c355af2cda013c01f19eed57568d5
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.zip 13763150 BLAKE2B 461f4a0d169af83c296b39d3810d5f5ab0eec4d685c5eac8eda9514dc7ae30863a7cf56e3ae928787a17a702bf5fa07effb8e3c30cac707a110192eed8c32491 SHA512 68ded4c09531d5f0c11cf58f0bd54746fb122922363b7c4c31e29d5912de0156805084878d0d32cd69df95b337f3fad45f6409b09bcd9bd8ebefb60ab2d91d4c
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201110150050-8816d57aaa9a.zip 23783146 BLAKE2B 59b725b3a40f0591b08797ad52e9f0801144d7a182329fd7cbbae979de2c0cdbc1b1f4e5fc415483453af3d9b9ae0463f41d601ed8d7beeb05258bcc396a1c5e SHA512 a53b6715cccb7fd66a0546788aff268711febd897b3cd98245856c5062b1a8c18b3201799050b5bba3b996271a2b22770ea1139a3a30c7096c07e798ad587f43
 DIST google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.zip 856318 BLAKE2B 1e6caee44e8839463776d42a897d5de0e8ec0f76a080d9290346f4c777042753e14f7e136be92347e8d0c60c18d0b1d53f55a7eeeaff8d220837645af5bff583 SHA512 f1c7963c187d23174094f1659974e12d23b1c42761915cb5a06ce3a0a043716863703d856451e570b2f56034e83d528e817dbd849584f79444c2228c8fe1f44c
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.zip 1053293 BLAKE2B e4e5c8bae0f39f767f6540659b58a82def27b93eb1bcc9eddd77e9a009af2a40b412e38200633410860ef5e6d02e9f180be190ca0f7d2d44fb687a8027babfe1 SHA512 aa3b29dcb253ff9b89819d888b176378cf62a386e99800395a5ca54b03d152ffb3e591f78954bf241037c6a55497317d089c50c971a342d4c821e93495b9ac50
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.zip 1053568 BLAKE2B 9129891041a943600fe66257e4036ff077df77ea9c032ea3e7e13dd03c7194fcd1ba5d09cb351334cbc129e9f710abf97f271d8d656bdaa499921a5cda24702c SHA512 69ad2fa3d49761f823c68f3939abd8891aa9ca80abe060e747ce9fc78c4cb5d7d5c983a02dc93a30a581c9c5992291fe9e78897e6d2aa5cee025a0af6346c587
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod 771 BLAKE2B ec4ea0b34d044e7a4dab50109d3b4e9b0081c538bd568155c4aa7a6370dd0ec31a18f3d1d294ad87af95cd58f2ac885026d07d43d21df1eee2c926dd4d8b2712 SHA512 b6c886622095b3999f108230f6cd3dddb72157180b0ad1a539919289b2e0c8496ebfaab369d65e83d6fd6eeb97b618b49a834c7ad3b98afc996f290d49c936fa
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.zip 1065639 BLAKE2B 71bbc2ae5288a6008a020b056970fde4f25f64dd6fa8a6d3e1129256707c332af7d07861deb1c95cf068bc039c3dc2da56ff12b4560eec071b9f451e91ceab08 SHA512 e261d085731561e7540eb367f12d5dd48f424eae915380ec99cfab5685297c2e81adc8a58fff68ab29fecd04d03c28e2357c882fa72978391750fd50491fd29b
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod 532 BLAKE2B 4c46c03905fc660d54c7acdb5cd614db9429b0e1add087fa5068f41a72d04b2f776e8326d1181e63ce29078f075d2312f9b0baeaeb048ea3d73f2fdba111e35d SHA512 0171fadf89079d7c0f18b1401aedfd886888d0a4ec4e107aec191c3875c640990532e1f57a3f5306a2e5705ddcf7e09ab2ce4953710347c09deb1d9d5f2d3c1f
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.zip 1101208 BLAKE2B bee7938f7e39bd6acfe03bf03e1d4787f30384f34fbf292ddabf7e172dcf8736ebc0d32f7d26bdf0021252dcb984766bc3b778312434a4ffc5f515f009fd26ed SHA512 8b90599cca0b31538086a5d65dc124c2e7641ec42b4774b15b3f5cb063b39f3d8f83a7114e89e6aac1dc4cebbac526105378a3cd9504bc723cb26781b5d214fd
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.zip 1141475 BLAKE2B ec5a9cbd45f90db7991979e1b25fbdf13f242cead59116a9f5703461f0b2d20b643edf61b906afa54a6b730cb5a1be4483757c726c46b571dbece739610db041 SHA512 687e9528375d9b87ce91eb5c67b22d3a1157166c753f729e4d6c0d3d7964d459defedfe09e8fbe035e49d432130a7029432cbfbf6bae95cc560e715748d4d42c
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip 1142481 BLAKE2B 2b5b18292c24f142fafdffd7ca4416da8425f317e195b3c59fffa6881eaf42ee90722ec7d06f8dd39fff3b582fd5a08248d967d58204d5c55161900c01164d56 SHA512 0ba3e5799dc97e3cae5765bf607742bc3165ab02dcd774290b2a624518ab503c3110b9ea7bd889b9e898344aa679f0bb13f05fcd94514090f7d408fec81cd1ea
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod 542 BLAKE2B d2411d4096489755e1a83388e3b3271930614b11b5d677af4a7ce0ee9c5d4618bda9ccf29c9dce7a2d0254676dfea8bd54c88ec857473f4beaee92d61da9c209 SHA512 a8ff8c888452392a2026849edd07ad5aa36691f7cb30357c33aee3457e03cac9daf48195b90c2ea62b71337c37bcea23d7a5996eaddc4330749487789dd70fb3
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.33.1.mod 542 BLAKE2B e4b2b7b1fa60a14dbc498ae1ba77dfe6056d4f990c8b699323802ca3f5c31896c498d907c766b49c093d0c89edf7d57604daac7f64a543fc5e0745e7b6fd1bc2 SHA512 4e4f309652556a76b4dcd3bc14b32c69d8aac9dde500456d1d9f9f4c773a5aeaa19061f29f5148f7e815c0c5dd0ba377470975d004b0b73213206e7d5aeb89df
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod 578 BLAKE2B db5963bd3e0da1108af3ae72d613cc24fbe23c0569e137ff8c4ba94e393b2b574612e0133a263e8a264cf781469983363a8f147a7f0d9e0f21ed4831772565a0 SHA512 3c04e477a21db637ce07078cb89ad236db3151ca0fe474eab32c326e7e849b41abfa873045d2214bc95e34ebec7767a68f9d5a9828ef286abb4636a14677c479
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.zip 1360328 BLAKE2B 09032b3d1e7204f83d1a7d74f636e45d7dccf773e962a63d58cfc505315e20697acaba7e374f2b03ef5f31f37dd81acb28397c5ec3fdf5750061cd9c4aed34fd SHA512 3f70e3a88f9688fe1d17c7851809051a35d3556204ca7664ceb440f96715db284cd5b5fb62b95aa69a11c3835679aff5566e838954bbb73a6a760143504eb2f9
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod 608 BLAKE2B 01e491f455fd8b3faf2dabdc8ba3e343c67461f3c58621a9c63575940474e3b4346e4eb1c8f260e78f3ca7cfecddf54f7656f590665d3596e6af1391974b284f SHA512 33faa853ccdf8c52a82c9c44e4b5f2dae76e5cc2c1e8227036f8f5fe7f1b496066fa72a379714491c6d2ac14e0ea8fe5419dc0a1626f9e60933b897903377b45
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.mod 608 BLAKE2B 7de276dcb3541de0e9509c95860d13991855aa3f9193d32fe540fd41b28db88e3787c767073a6be9c294b6ece11742d80d13a98cbc1a57c48fe81d1bb7c45004 SHA512 bf2d4e70b656e1345aee9029d35a922424bdbdd05edb45fd8f0267af3a17da53d1d1ff005d58b99d721883e7371b2d2ea99fb67bda9ae880f5ea12a32d8f2078
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.zip 1542670 BLAKE2B 47684b1978848233b02b390aea6e30880d5a34b57395a718abb39b35241e6cfe3b0b0a27b743c50e15bf48833ff08405a50dbb5c7f985c8e1fee85b6fcfd4aa2 SHA512 d39a4110640a15a48641d960aecffe1cff432a0bb40d3f740ee1aaa9c5227f940a42e9202d9bc707b145b4598fd6c81239cf9d04cdceece815baa8dea8e00947
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.mod 608 BLAKE2B 7de276dcb3541de0e9509c95860d13991855aa3f9193d32fe540fd41b28db88e3787c767073a6be9c294b6ece11742d80d13a98cbc1a57c48fe81d1bb7c45004 SHA512 bf2d4e70b656e1345aee9029d35a922424bdbdd05edb45fd8f0267af3a17da53d1d1ff005d58b99d721883e7371b2d2ea99fb67bda9ae880f5ea12a32d8f2078
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.zip 1561437 BLAKE2B 6d0db85a058df199dd8237906082862bba5de66e2c6f92e01e8d90a6473100a0a9075b7239be96495457d7b822b67ff84b9f00d6cbcc4cc2f24dfa3dd0977f4f SHA512 197022bcb7846cbc2257410b6bf0f1b64592e889b222633ed6c3cc3cc9efe1ab3ea36e57b5bd8fa2cf72bae75271821888e91a354b3cf57e3932f05a2bb8678c
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
@@ -1980,40 +2084,32 @@ DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.m
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip 1491602 BLAKE2B 7fcfd0d05fe509a3e30885304b7ec76a538fdc9cde84d44fb90a32aebbd14bdffd5f3f7e36f9ba24ef87decec89fa824963780b152faf43f3799c8e64e822f34 SHA512 91a070430e3a44edc4f66d6b2ecfcfeb4c633a07c252d1494ecbc9a37141483cb7bc9bfc641022a59e740ccfe9c4ed52e263d59eb85b5bc37a66088bafb6ca8a
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod 186 BLAKE2B ac72ab4b58c29ea036b52ea6972dba93b3ff95ceea9b476355b14bc335bfb99ac350101e70ec678bfb6656157679f3dd42a200a1531b982ad9c995c5063ad541 SHA512 d9197910537264ba24d95110f470ce2b057b795e7244bcae423ea922a8eb4f2c89df3b6dceb58e71cc7ba1f68ccaa3dfa78d7c26d63f5949d4014b8df336512c
-DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.zip 1510578 BLAKE2B 71a34f94325a05f830fb7fc951f43c7328fdcddbbdadf03f6e68baa84973be7dfaece317c77fb25bddbc3079f3960a5026ed81fc0ad7d83cdaf224080a2ffc17 SHA512 119be6e0aab9487c1340fdd4c73b57cab4fc74d2290430aac19f650c2a4f56ec34f8eb34c8a87fa267c979e5577cdac72deacfb6d2b9a68cd8f33e19841e0c9a
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip 1543881 BLAKE2B 2f556bdf8ed16bde9e6ecc8fc7339578c719ed0ec73ee426caa75b672ff5fcc442ea7dfed7f737900c98d5a5afc014b9e44b1b7f0f8147edb4627f3b390814c2 SHA512 29073698d91f0bd9d37cba38102b19e6223ea362f6eb331bb186670a0549391eaf856855d2978f70861e775af0a1f678a7669754862c9247edb0a682992debc7
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod 83 BLAKE2B 0e4901ba1d4e31ef22f0f978ee7b7d926ac2cd3a1cb5d8d8a81a33e02f9dc81aad6508280d65659862c3a9bc0667c334cb6cd8c0c532d5fdb3735a415c2a5eca SHA512 a7b2aad691925341e3d1f6d1d1453b68386902a4e2e1c0deb406bc157d04328c5519a01ce938a33a6e358cbd9dc0c2f862c9822bde5314d2eb9d416d7bf789d2
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod 123 BLAKE2B 73f875413489557d8f0bbcd665c06356b900f87e2cd9ef0ee5aba218a3a910842912d36dc9e653afa538c99cc723d28327a8bec6eac1f6bd93277d70fa891339 SHA512 d618524aca1cb3e525060bb66b0c8f06c9ad6be5389be228d265dbcdb368442f4f0a7e98f8c9082916b2579d77e627a550904f0b1c058b7d5e45eb7ceb77c2e0
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip 1557709 BLAKE2B bc672854cc46d48461bf28395c5be02fe99ff9da1d23e212078e549bf3e2beeaf953cc185e059c73a374f3e2662cb81fd6c3ff53472934964b8461f370b51a78 SHA512 de309c033d05be35503d6073e14ead585db4e6b75d478a674a37f93c7757e914c67bad446cf7ce04ccd49659d1ab2f9a024ee639a7536480ef92bb6b8b52dfdb
 DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod 36 BLAKE2B 33002a8288351a233f5e8236743a91df1f630355380a4ae8df10c32abc03470955eac6c15c95655caec990eb17ef2661985570e49293cb146517828090d95635 SHA512 8482c3135335a3a69611529f0d50bd19257b0fe8a8de2d4f2d6441ccde5f1e7a57d487cedc375575c5fe16094e5fc1c7f7f1a6bf04acc8a9d4f92701db279002
-DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip 8866 BLAKE2B 279099b17d2f9a46f3b5e2db1e9855fb352eb840cad4c70e67b4612a6305a83d7926ed28396f0e84e27b56778b15f262ec497a835f7e2327ec82d1ec9388c69d SHA512 1649454679bdb5427e34f9ed83952cc509369ca04ee3776beff20096589bbe4d24bd6f6121c816ad4b9563da6fb0c0e4ddc873196160b42da6c07a204b21d43c
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
 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%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip 41484 BLAKE2B 34fbdc1525bbea7fc6b7f74e74ab407ed03d3b58e25e9b3b79ec35945acce36b7c4be54388c1244d508c7cf67ac6e4f1ff7c9eb5245f01ff27dec82cfe87bdb8 SHA512 713c79551d48a99cc9feed3bcf71b7f1fe95270701787dfb114237bd358ad104d18ce7ca412f65d1ce6b7f94ffb6c01afe28c9b821e1a5378b05c93340aa8a49
 DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
-DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.zip 18135 BLAKE2B 070a1f2616aff08e14ae65e04b7a9ba63a2a31c4e073981da9b41cb4131e04c15fbfd057cf902a27987e5962ed96144561e4fb04957e52938c0e22ea55180e18 SHA512 3cfbad655bd8ecfa2b30aa71d41c6c1620dda6c0ce4574c21d017e6f5fb3c15a511520f2bdf3147f74e17fc21406c55a798f2fede3ad28f9121603efd6994469
 DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63
 DIST gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.mod 24 BLAKE2B 2e460175791185a1eeaec63e12c62c4151b0dd57c9f1e21a2849d834d762c928c843b59a0ec9a2000e8bcf6e86a4c3cea4895c40b99451148e9e4ccd95ffa815 SHA512 cb839ecb3ad2ea4ac9f449a9a0a71dddd03b6988321ccd655cad1d66e042fe2618c635a8ce5ee6a96c5944a12053ef658fc13e54aeb69a5649523f5cd0252252
 DIST gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.zip 37570 BLAKE2B b44087b5532d147125677e7b8b0fa4fb6fae4a8fc8d9f30eb535a724afa3c216adf4d288d3a6ec854506439af6283ca43c3dbdd96cdb32e221f09b324dc5f77e SHA512 7a7bef8809d5be7e997ce442139d867cab498197cdef0d7c13191f852dd1d3df4cc1899e21f2c47b3db1d3b68c237e86bfdbde92e44c6fb6c7378fbdeebb5482
 DIST gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod 50 BLAKE2B c715a977e733670d4047cc0f62fd485ce2af214d87e799cdea97015f64ee66488e1f68f4aec8e8ab139cd70574a0dd5f54b7bcedad09b8890ad098bcb01d7f5f SHA512 2d48fa45b7183412ac358a60c0af0b3c2f77d5c461f6bf4ba5d7a162195d49076870e739ac6c59e95d41dae2002370f52faf183fd6ca7999d60374866fa3ebdc
-DIST gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip 5369 BLAKE2B 348bf4892c8cba465502595b388fcec4f11024b9359f202af0cdecb00ccb28c742304361d38b663dabb0650f185100780578eb33c03207c1acec26b81ca1fdb1 SHA512 bf982d63fea6bd93f2b6be4d5bdc986d1316b6f92ee7af9b604b6f0af1dab44d09697b913a7c8ba59d5bed26296721b6cb7ad25b7a4481cf8d649c8a3e2099d8
 DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
 DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip 15882 BLAKE2B 00d4a14f02231cee71bf55946b52e491df36745bffbc58affd61d73e0266bf259bd19595364c094dda028f84838442c65be69e240f8a23aa5d83f4eb7b3d3d84 SHA512 bfd1d29d3514659d778c1ef699b23bd6b5980620992d9aba56f62bc3870cf438a7f179e9b7bfc02f398cf1ffaf13652fd9b8d1c90c0fbf2ab315bf0b02a97c2b
 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
-DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.zip 59485 BLAKE2B 40d0f1ea8656496c49c0329754c6a8d27ca47ce78757727bd86163203fcad81b079772a78f13b7d5ed3321ed29bdeeaa7a24bf10a1f3fef1a3ae4904fa0a50fe SHA512 73bc289af9201e5b7921f072dc22469e38a269af0a682c9d45bb7d134d9569670d9dd25cf05460d782131370c29f567535751e4c5cca5e40009fb744f9f06d77
 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip 64742 BLAKE2B 55c7f791bb3ba2d1af24dd0791ae53153550b4c53aeb446dc1b549cf366409738957e41798eb879beff02b5748e670a75f1e7eac31eb8a7ac0ae047cd4e9e598 SHA512 46f6bbb5f44ab422ecd68254f559b1eb07c9bcaaa6bc08c966cf6aacfba8f8dfcfc6ba6cb928d16fa112d97600c56ebe78832fa234f4a4c19b96abd579faa61a
 DIST gopkg.in%2Fmcuadros%2Fgo-syslog.v2%2F@v%2Fv2.2.1.mod 38 BLAKE2B 0f62f161dfdcb2e0cbadb8fc183ed67693b8a2a56862799f579125808f8ffa47b9138659121f642b00bd59d82510b5d2bc8f2a824ce0ea7e300ba3f40cb83690 SHA512 468bafc5985f802a58684a1d6758427f5fb95bd41480af49667b7e74e5cf803ad85f2474184ce5104e4677395ff7d91250453d07f698b707c8aeb229dc6b60c4
@@ -2023,27 +2119,26 @@ DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.zip 341833 BLAKE2B d13e1e7e0af043ba6d6d080348c3ff2f4346333514a7bdd264d7e5833caac2291f1cf8d41501d7d0d8876b35a65125f3ed66d5f1a07b008b58713a5713ecc366 SHA512 8c8ac9d450acd3922849fa69d2b7405f88ad32a431c8d025d51b7a4790a41a4d08d35411718c4ec525ce658e6f1d8833811b6ac359ee2f09f72b9d1dee3aedf4
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
-DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip 343284 BLAKE2B a4f4f886636b920a987942524f504c0049ca3c9d9ca5be16101109235e77e9a8a14106fee9fb2d02d403a056dcf5f42b0a4e4f57d33dbc78a88e0df5682162f8 SHA512 0b212e847ef8972bbc9dc96685c9fafcef5552e96c622134cb1aac903aa3f6f5a1aa65a2f179e93396fcf32ea4139a34f46c4e6fb3558c9da8579282095d1baa
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip 353844 BLAKE2B e4d24ee5a99951c19c32328d6eef3fd6c886338bc7189eec9e60c99fe89e5728b3f00824d0f321bbc921738a40900d8d90ab4d9879e8efee529ed4273df0c2a1 SHA512 7ec385824affaaa72aca2b5af052dc7e941a24b1712e0e1945fe6276df3b02ca9eaaf79fdc0888e398aaf10ce3b261f0d23b2c6485184e6a6587e1d04f1c8742
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a
 DIST gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.mod 28 BLAKE2B 39555ca91c4818bcc1955c20438d83965ad6f1b2058c6d8590f4c30688eab2ac08dfa1655d4de34bd68006afea1788a89fb0240d60b048be9616c8e44d8a801f SHA512 6fe714c089847582c8c01e055e4bd6b991e8fddc6e420aa03a40efb35fc4ecc5e87a60c44aa82fe004899eab427d4b82262cfebb3331b7443a2c7a68718f8f75
 DIST gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.zip 4867 BLAKE2B 0db2630030bbd2dc45ad87dac1bb9c2caf261cda1138e7994365999e316d9d17093de7ca645555d2c9d557a02fcc851d6bca7ee7e9e94df3f70b8b0c7a1e8313 SHA512 663920c2857047d3f631ec0fbb5f26709a4945e758459a706a4ddd11fdc024343f4dd803b216982fe10b67cae16bcdf82217ff645d243f1717b412a732445bcc
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.zip 77767 BLAKE2B d77644df22edfcda7d99d4a4a23a1fd1154fa21489dc36b9a8f9ffc45e341d8d793faae76d4d3d32290766c7b13cea30d17efaa7e8e74786ead90b0605f70967 SHA512 bc935858e1d5c341c7d53c41bdf6f856976a469c8f54f017e41e8be742064ce9980cc6881353e022f854d6e19096a37f5ff62bf7b01019b0425a0c03dc6fe14a
 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
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip 80160 BLAKE2B 7c19bcfee1136e9afaa54bb36a296e48c276e21517eead613313409f3ff85f4a961c1dca7926d3c4fd51feb0f537a85de905294d2a310276bb8177f27f3776c3 SHA512 a8fa21d2f84f8c6f28250e9ec7d678ae160963eaa0a373f345fe67804925b2647239a6117ad6f253f458f34ec9f62bc21e8f2071fc9dfe76dbd2a7ded1e1a0e0
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip 80765 BLAKE2B d6d8bfba5082aabb1a247add43b21ffa058b58fef60e8efbf973b724273cda2496ef0c9b226ad14bfea17f141f077d3bd98dfe3dbcf3c2938fd64570abd662b2 SHA512 2a89b2bce856cc11f3b71edec9e538048acf07f6aabbe27236b663b284c086c5862f086734e58727e9db8912a113fea51f72dad1a45a9e85860764f9c27b19d2
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d78507081f30342eb4be40c01252683b16cd3658dd7b30d5f8a071dffe2c05f57bbee3afbc1ee4324c471788c633a878d498ff7d57 SHA512 2790882fbfa812468b9b3443630b1f1ee67a968eb20da8e4a1bfd410e4b516a8a7e77c07414b64f17e11e2151161b85d019e172cc833a45b19e66d4c70f89f82
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip 81183 BLAKE2B 0e3222d715fe7e9e8e9a10abad817f75bdd095f9af250d6bdf1ee2881930c739111de8b526175c9204995c48e0ade9852541a7f22b0ce1261f473986a2739182 SHA512 d6f4ac547609c943adfc6b518ff03ac09da566ba2b29466abe8f6db3d5a41ae7e5c187068dce4e77271905b1aa88497ca49a43bb9bbf9c94011b7ccf1b4b2f42
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20191120175047-4206685974f2.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
@@ -2053,7 +2148,6 @@ DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip 105245 BLA
 DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e
 DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.zip 88327 BLAKE2B 8730134244a00fb47b24b347ee4758fac8c11e3f627788c03d6568af129acb5b911b08857ab77a619bf571986ee90dd1c6c6aa12fd8e6e26d395a64bb7513a8b SHA512 66a13fedc358399644b869ac4b39a295c6c15d642e074ec66ff042e1b109f9603bc941ff25aaf7d9bc700f6c2fb1f60bf2a637a471e26ae037d822f0f1e2c518
 DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod 194 BLAKE2B c322e2469b51e719e88bf9d9461c9a888afbdc1e214d9260b08324623e5828ce14b9dafdd42febc839e354f242e5ec53e78c9f61bd70338abc6de06090dd8197 SHA512 795de820e4a8622de316ee1b391a9c92476b3a67eee387278cd79f818c275df687ccacc60afbba20491dd813e442fa5a10d84b8b138f712c5a8705e884cb1d42
-DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip 92950 BLAKE2B 14dac4350033f9f437fbf2472b1a245bd5a66ba7650f1a0dee2c5e005002a6050b325f062f892982f563ee5914ee3d26e4cdd9d20593029ab8a6932733aeaf1f SHA512 d85150c7a380874323c46fc493847ee12515ef50fa928da808dc5f03d91f65691dbd06473485afab5f5b5fa7b815bdab9ce19e62f69bad407b267a34397d5c40
 DIST gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod 194 BLAKE2B aca56964199448b8220169f979c283dbf422308351fbffa9a858d0c0bf1f32bb7c3139a0738dc0409b4bcd3844a9596daeeeea8a0c79b9cdac7232dde6c47e1d SHA512 027bab5202a25d01ab9b9a87feaf66333ef376daa9c5c12d5bfeaf1624537a895e770c8e927a474589b23af2456d2a7f5a03708f80464cdb3351a64981a4a9dd
 DIST gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip 95019 BLAKE2B e78e242f9ea5824ffa2d8c1dda6df571eb6d27af59ac9bd5f09e09c398fe47098895000752c6b79571398a0ca7e163a58ba789b15f0451e98d79e273e1afb58b SHA512 7f3f556401d7ce27f1dc88e8a022f8885cddd488f4ece632e24cf9b9f6504d748519480dcf60a577a3a9451104340a917f353f43f89e05f868913c26357593d6
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
@@ -2062,60 +2156,44 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLA
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
-DIST k3s-1.19.10.tar.gz 23354226 BLAKE2B e092415d1adba6386ff017802204332828ae004ab08bf4b8b159ed0ed3ecd3ba9d8b4fd5f0d14a073198d91a8b956ce2af038bdcd821037a1d296745f7217107 SHA512 eb30ecb1d753afc65cee98c8de9af1bc4cf2395895e35f81dbe7d8c3bc74f2a1167e506a8cc6adfd0fa5ed0d00292472c0b9bb43d9c7ea01b73a9be28c67d9a6
-DIST k3s-1.20.6.tar.gz 23964066 BLAKE2B 8c87315457cbf1dfa16080c65494d056527e5c33568a5860ecb1bdca82c49095856fcf8f05d6eef244f7a88f52c93f5d77644990bd2394840a6b41958f1cff02 SHA512 0b03d2124f65c83f2ea2cf3ed8ec4f1834a180d8621feb9e20582fdff0ce7f4065daed02a96fdb0b40706ef6b95d04f4c5450b345266d73c9b7c747fcab78bd4
-DIST k3s-1.21.0.tar.gz 25400000 BLAKE2B 51e91813a50cdf7c226172304e901664f04aa89df76b8742e67c1edfddc351cfaaa1d813da4e0797eaa81dec8702a1dd2e98e078345d049af9d2b0dba52656e4 SHA512 b421ea7ccacfb8b88e123a637851aba2ec85187fee95846ed7ce9045558c2e9c6bd265857f0775ac657b8a2b4f25439372dd16fc29452afecf3775704edaff3f
-DIST k3s-cni-plugins-0.8.6.tar.gz 1996335 BLAKE2B d13039e13a5f9c952cd0bbb40303ed7581178dd2d88c599a459d5277bb4467db5eb2b1e91e3413c36181b1a21893e91da2742a647f8fe6d162e353c8d46e67af SHA512 8488d01ae962c51095621120b6dbae6ccf7c5a579d877d55940a222bbe5d6957fd34d8ec20290841e23466e647bc433a1f6f8832d966c5d9a63b32460d735622
-DIST k3s-root-amd64-0.6.0-rc3.tar 13301760 BLAKE2B e2adb3dff58f2b44b6ebb4bb3f812619c6d3627feb64f969efaa7c5e6e4dbca4ad20c2ae75e8caf587aa8b5c8e077cd283fd84d05d6ec2475ef67064b4b70721 SHA512 65538f6827a78943085f2cc82de8b7683273f5d079c3841fc6b1bb52c2a35a50d81cde1b23935c5eab02b414b26c1feb804c73ade42d6b133aa1edde4708408d
-DIST k3s-root-amd64-0.8.1.tar 16209920 BLAKE2B c91d16ea4f626568f82af9b3400d9f6cc61ad5a4427b6e373f47a4b2cafdb3ca15d8279a3bde47c9307f2a368594d078aff9a2a646a48ee0ab2598d6b69d1fc4 SHA512 d404c520bdf958426fc82bd686c1be73cc1b3da4574643e490a975fda90da7c38fcf3bb6c653cc52b80c461dcf9054c22a7f5c4f3498b4e0fa875509c929a29a
-DIST k8s.io%2Fapi%2F@v%2Fv0.17.0.mod 505 BLAKE2B 3cf98c7c421f8eaf9bb6be84824683b140c61ee129bdf14ed24870fd399c80028b486a2fd770822767a07e42d984eb3873463ec05a24b229b929930bd328544c SHA512 8a76945a826bc90f67f20b7d649bc35383f3935841fc209c222ef32b10b497681b8cceaabe284e9ab55331f5cabd147b79d7d91f922b765b68a726d657e71435
-DIST k8s.io%2Fapi%2F@v%2Fv0.18.0.mod 475 BLAKE2B ac30820fa8c3fe58d2b98ae9e46505c68ed009b27a25eeb23edc1fca76e8e37c2b0dc695ffa7eaf5147242781649551c2edad150997a7bc499ccf84f0b5f03c5 SHA512 7ef5f5b32ec02042c913ddcbd433dbc5c5fdcf5a4747509031ef5920a58a1bc7f1708e966624ea887ac96c919f7693a669cb4fb392c74e6a0458eec8e17f37d8
-DIST k8s.io%2Fapi%2F@v%2Fv0.18.0.zip 3442466 BLAKE2B c5a0a38eb9883ab1d6663c7606229110bdd7a875cc7861c4ffa11fbf2924bd72cfa520cf4425931149d99ed3e5e36679a076a8cabd4fda238d6cebf96d95a12a SHA512 8d8f54fd006a897d322b389c1e533c7102344810bd0a3a839199879414fdcaf111a9ac94ddb8947db828ffe9bc63b740a30cf338a9cd9ece216b8995dec47d6b
-DIST k8s.io%2Fapi%2F@v%2Fv0.18.5.mod 475 BLAKE2B 619ccccc9da428944083517bce43dfaa21824a0ce6d4177700fc28d4f274a490290be4f8c33b548ca8949f84207f5ba75f12308083cfbde91489f2ebb64da4a5 SHA512 03d7f629014b92396338c07251c0686a4aaa104e80f5598d240883a6d4557b64ea0c2abdde5f89b706343f0c7b1e5b72539e600e705c5706eecc38e4475ff3b3
-DIST k8s.io%2Fapi%2F@v%2Fv0.18.5.zip 3442467 BLAKE2B 96ccc3bad65dc7c187eaae6f04409d297cf456044e188afdf2713f7450eca27f076e0f0b9a9e2205f373e913e6992a7fa9f2ef94c2c846b70b07b6a060955352 SHA512 110a4bb522762611484c30974b0e9db4ecfca4fc2cd5ef699d4a60aaf1e60a1d88b24190beb6657176cbe25356d9a809db42b699767c41015ae239f2deedf004
-DIST k8s.io%2Fapi%2F@v%2Fv0.19.5.mod 250 BLAKE2B 63f5ae874b4afec28eaf534253e73671ede51fe64b4f0d5fb56e396e02b26a8dbae807ca04249922190bcf0234e36fa05cdc5b572234bf964d2807d7d2c480c9 SHA512 fe537fafe81e12754869da240187916c8797b7a931ca2c8b5a054b8b025b18ea427be85841753bb55d88e802a3ef4792a2dc5dd95d823425908cc8702e87a5f5
-DIST k8s.io%2Fapi%2F@v%2Fv0.19.5.zip 3838061 BLAKE2B e2478ba9513e8d88aa077bdf9f2f23a847032267af62d64c31c2642fed9c093b255b67e6ab9bc74533f987feb9ab41a2d4efef0d956fe5d02ebae4669ad02885 SHA512 66f74454b13f0de1b89f66919dd324624abd6651aa2702a4daaf57c16d5999ba38cd1d61edaab9b451056ac483ff11a4c2cd9b28e941fd04022644a09cf130da
-DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.0.mod 1585 BLAKE2B 58ea1e01cec0c6a85fabf6467f2e4b9270642c16d8e3872b33b55f47493e36a007301a89ed7d79cb1b550abe4e74a3624478d7426aaf1183988365666952c375 SHA512 a666f4da057e801827964f96657a1245505344c0df9690cd41211816b69486f67cb7b29d65afa93354ac478475f37eac54c9ce7025174dc9a2782d961a330456
-DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.0.mod 1527 BLAKE2B 83aeb7da9e70f337f4778a7ead4b5a24745baf5836ff75e5e2848f08bbb4abe1f5a0f3a0446f569d7927425c5f773dea642edb757f295ba3d5ebaf40766db42b SHA512 e4c696fc06d257cd8f3457e59cec1567b27399bb684c8dd67ef37a751aae5eaf47ec4f250f0905a6cc23ba6579a1af5f48da8d33e08166d3e905055078aa8403
-DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.0.zip 604196 BLAKE2B 90e8387d1eeccf4ca979b3c66699ae0fad8b5d3dd35db60922e295dda3f2b765789e4584f9a99a5f5b8f2384e10663543a5c81860797740e92c926d3a7508fbc SHA512 b8a1ee8b2572fa4c67b4dfd7145fe87914a69a80a3f084bd576050e8a2a30ce0dc325109dffb999663e8acb23a9b72ea0399dcd1795fa69c29f7befae0fc0663
-DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.5.mod 1320 BLAKE2B eed464553788f4a6e1a968dae9f975fa76a522a1b6a0a488a5ce7edf5cb6f0c43202902e1d04209279d3a47ed4ecc6a2049cb8818f67765fa89cb8680884c7e3 SHA512 7648c3ba93c10c8e90605463fe8b5f732277c3e681ffe67a9590a06f4d058b2e4759802ce005b3334cab3b289f0e382848bac54ad8f398e760fb8b91c16e30a0
-DIST k8s.io%2Fapimachinery%2F@v%2Fv0.17.0.mod 1618 BLAKE2B 3adab28947dc91814453d8ad3929935f8e863ddcb272266e30a55bce506b05e361eb621e1227a420f90c6b6a58fb0da3c528d524d10a912ee7d75f7b6ea42ce7 SHA512 53c488b7ffbc76d32f905b0dd92577c9a9b9d5c30b810e09ecf2242cb3fec1033a71aef4bbcc53bcf4d4096d0cfa3069acbe49c40c7548553a0ae7b0af4d8ef4
-DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.0.mod 1605 BLAKE2B 7863e328cd5985db939aedbc154aa73c9fabbaa3554d21e6cce2bf02c6c07251f0fdc7c330cd9cc0b7470c6646145ad2f50ecb229b774f56ca6161a11a865fbc SHA512 7bf3281763e6aea61c2b1e83e97c74b3cb20151bb35ec5b6061a3de2a12025c488abd560e68ad90b8bb6a238a493973ea0caf016c24bff5b2ca739faed9ef0fe
-DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.0.zip 782249 BLAKE2B 86edcb0aa2b8d3d56da1a9a597506e4d7a78ab4be10cd1e7c8b8186e05e36d94e7a9139c167f8255600a3dc2e48d2382423ca6e253c8fef836a1e1a3c6073804 SHA512 819dfab278769ec74f1db24daa293bb443b4fd1d473b0016a499b167baf18affc3dc02b48601997c43ad555d8394545b75d0c76a12dfaa6a33a9621e32865a7f
-DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.5.mod 1621 BLAKE2B d900a46836b5db1e3fdfc0cdae750be578f87c9ff2628d15d6438efd04966aa45937d0b7cc1ecec59d3fbe5881a324d2483b8a1794a14fa7d099a75084ad7e8e SHA512 dfb42b8cf1147f96a726a745be420a2e3279f53b72accef3766da6d591d0f217fa620af2d2cf9982d848bfd97a150182d60ac58304ff59b7c8b3ce3b31459137
-DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.5.zip 782976 BLAKE2B c1d812b8477d82b24db6802f7ab6dcc467ce0c83742f023030140f82171fb5cc77601a278f6d02c18c8b83be5a95742a75dd3e3c1a500bd8453ad2e5dc989634 SHA512 e7b590609e43ae56f1452d3188c877ecfdc96cfcece10e25d6a625564e471564947c5b1a6957cedf76697e45dbe780bd26f9cbc2b8b480122f86fe5ea78eed70
-DIST k8s.io%2Fapimachinery%2F@v%2Fv0.19.5.mod 1370 BLAKE2B 06517bf2ef25586d7c3e2c07bb0e74d9b1d67a359013ae054d1948f987f57706ba56514ffaa626e7fac2accc9e2ef3c5f5d4caa3d209785a3f840d9a7b5aa54d SHA512 6d88daedbfd2680a35d364e89ef38d033c94e40e5a36c74fee559b4d6563aaa9ddfa8f35f0c4db925c2e639faa2fccb718e137af8d8f41f1a40ac58f45fd9e3f
-DIST k8s.io%2Fapimachinery%2F@v%2Fv0.19.5.zip 800416 BLAKE2B 742548d9308a5e99008b2e0851f9539c964585255009e8884ba26b60da32480c4cbad4b42fe06f01c01b22b043fd9ae3309ed6eea6e7585e0b3cfc2bc8fc4c48 SHA512 c40d0a0dd378e8ca29e722fd1e846b633eae7dbd639678d445278be9ce1a5fb53330a33b4fe43b7c784b50d6c4053e4f5f52ee1a1fcab2f80ef3bb24288d6514
-DIST k8s.io%2Fapiserver%2F@v%2Fv0.17.0.mod 2745 BLAKE2B a147f92dad978dc7c98ca8c8df36719cd8617d4e0e01b9db64b59d47658d0759e6435f14cf6f88a9106b093c2c7d46ee994ca1ebe9d2d587aa35fafcb58e9047 SHA512 cbd0d8ac96f27d25da962cf109668bc85649336701b54538be14aef1a17d1d1e635fa4a66171a8779550d33229a39f1f85b34c460db241bd5ff622af5ab89ee3
-DIST k8s.io%2Fapiserver%2F@v%2Fv0.18.0.mod 2631 BLAKE2B 66d2b46bba152f0cfc006aa81e6225ce6ee2eb846431046db0e9a56e9af6b883d1797b7c43d11cb47aadb27235c23d758c0c98de7a95d2f9598bc20f7333211c SHA512 d2859003d1c2a2bc2844f8904e66f648d39a09e2847dd411ee68b6004ddc3e8e65d75c5af805a614a02167a8d1dfdb8c31b66f7985d1b1811c535060623a1ebe
-DIST k8s.io%2Fapiserver%2F@v%2Fv0.19.5.mod 2322 BLAKE2B 02e8681b68d6dac2898d2831419f60c76c255896df73a54c8e326964c805aef79603799e14b0d49210420e89670308e5cad900094e1473d456df9abb05f77017 SHA512 0706db0276da0cc30ff3b158524672e1d7a0ff3cfd710cb2703505f3086004dfb6f650a9712451448ba23ea91ebf041b7652182f96263c482748ce8ec2bd5806
-DIST k8s.io%2Fapiserver%2F@v%2Fv0.19.5.zip 1575295 BLAKE2B 633324464ad4109934e822aa6190af4a9d2c0f09f336248f95eabad7efaa5185a11f14c9d17cd34922bbb00370e5770317f5be160e8a8626117e37efbe325970 SHA512 3a36f6a3785951584ce685ae1f9464329b1bf1e84b6b8e6be46ef49f754a2f06cb15c8a2f26a44a8fd7e207bb5c0875b7aa833b4351380304207ba3cff27ac65
-DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.19.5.mod 1028 BLAKE2B f0e6506d8ac699a80da0ced5ba9085e22661e6bb4136ea8339b3ec7e3a87c14d166ab0ec2568ae2dc76ef2bf60a84e095ee5b73b92adcca42a28ad6180dcd98e SHA512 ec167fa93776dacb8088b808bbd03a5de8672b3e397ee6668a4821bc6c567e5263272d865b6e3fa99f3d07b8329115a9e2ce001cf84a8cf45da954ab6a69600a
-DIST k8s.io%2Fclient-go%2F@v%2Fv0.17.0.mod 1649 BLAKE2B 488dff89ce18e2c49176d24b91734228d93e1ef4707c417d2a5d06086052e37326830bd8c7833c5afe0e33b42137c37cef62a0c81150e6eed14434169f88783e SHA512 406e9f688269e1c620da239c62dc01c1da21b291a5cbaabc6231d39032e7a7c904bd702b96209b9e8d1ee3f46b72b11ebee6adfbfa5258c3471e357ce8f2ca19
-DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.0.mod 1591 BLAKE2B f6f6b7dad0d604859d7e8f62b9ad93199d1696e19498f945eb8faa3d2733b34b5e599272e27bf817229a59ea7da9dc973c00a5763a8b23aa6a3633d0d5b214a3 SHA512 f454f2667824023ca333652f78d6da7d3760061d26faafd221a464660a2eae54958c69f4f4b66ba5f8aedf48de14c91e092bfbcd64a2861f8c72192984376bb5
-DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.0.zip 2145216 BLAKE2B c153c76422e1c41413f98aedd72861f92dc5e0386da4f420d36b0c62f504dab4ba50b6f1609cb6c825863a7db2c0cdba0569ec5d16c922a5b659ca11f44a92db SHA512 7c3987914c2fe141ad9b50b876bbecf8ce6128d14a956b98a2e3938f447930b83420faef7020270c0d51d77ae0a42861e1b93e6a825c7b87f52aa189da88492d
-DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.5.mod 1591 BLAKE2B 5a493ddc3b4ad4cc3b022eee320b8c275835ba2877ec7efeeae02cc54ef949dd08d935bf7499662e2a41ecffbd46cc504a66fa97b3116505c6179a92ecc994b5 SHA512 cb5d33cd2162fcc68bd1752d22f44552853322d96c1fc11704e077013e6f8a764a6dd58df36cd940a30dd20658d699bc8d5bdbc3071ddc77e5b0306ecd70b036
-DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.5.zip 2145725 BLAKE2B c8824316b15dde2f1951774108f267e733110e922641d1ca59939a2e4a8465bdf8451f015353891a31629741450fca87289385c279d4ddf26b512e55962ed3c2 SHA512 5f9dfe64bef5c07872e95efc57e4bc9e59e1dd357ec89b7cee334675ef6e8d69884e34652be56cabca7670dcfb7b37a02f8944cad60064f5a5d451551f70157a
-DIST k8s.io%2Fclient-go%2F@v%2Fv0.19.5.mod 1272 BLAKE2B 60187723f028d06e4435d677184a3f2bbc63d5f05a6d5a6383bf38149f6eaac011e74f9a552cd5249a477fac89f5e6aeaf54b3e5dbc008ca37ba18cb8e8a97d6 SHA512 14b90272f652b0fd2442680d14b908d48f85d5ecdf558acefec3d7a814a535a5ae8cbf375233e91b8260ce8d145e8418cdf9e227ac5ae8341cac465965111a87
-DIST k8s.io%2Fclient-go%2F@v%2Fv0.19.5.zip 2196615 BLAKE2B 664fa6e2b031ef3af639ce9a1e1aa8a155d71edb55f72c645a5fd187e0248251fbfe6863e4962b68ace5b8e3848fbff3b812903a70cc724f6dcc6c45d8821533 SHA512 d3ec9ef6cfb191f04f08dbd1b5183bfcdc2dded0a88760d97760e71592efc419682b7e8320c4f35f5297bd3a7c137e7c1c2224c55d79d9fd5346c1bed7fabfbd
-DIST k8s.io%2Fcloud-provider%2F@v%2Fv0.19.5.mod 551 BLAKE2B eea5799bc60614555184631d3572b8d64e2443d953aad530d3f5d093fa5b7a1fee47bce8f0766dc77ea972537b0c34ed551ce59bbeb7273b9b72a0522ce7ea1f SHA512 0154d8213dae5389e6c726ef02c1a31ff2b5c926155c5ec304f49d1ed405c66cfd23fce9a1805d19f3da93e7bd1198dd141af9ce25c34a0b420cbe5db4681fe1
-DIST k8s.io%2Fcluster-bootstrap%2F@v%2Fv0.19.5.mod 348 BLAKE2B dfbcde8a232df8f5b1dfd7842169565d2319d458dbac7f77493e4fd276363741c7c0da47804980e6749dc0016c50274730c5e7364d3bda44a304891b0544a539 SHA512 54fcf36ae876a34faf4dbb574aa572f3be7cf287294bc998a03657610bc14a3b281b5a98ef0c013746aae9d507e929524bfe316b1bb53256adc1f3882f7f6d4c
-DIST k8s.io%2Fcode-generator%2F@v%2Fv0.17.0.mod 1209 BLAKE2B 49be5cf7ea6cd809c3135660a5a586684cac197b3a0eeeb65a9ee08ab4614425a296c4c517c27bd70f2d042e30eace4ecfea2d05d3958489ffe88b449d4c3550 SHA512 4e8b189ef92a1bc66386f8328c082600b659ddd9891a0d38a5c9f051c6200aebee0881f273fddefe6ce13a4316b1337157e4e733b0ea9dd506aece36b2e64245
-DIST k8s.io%2Fcode-generator%2F@v%2Fv0.18.0.mod 1051 BLAKE2B 28c44c1ea38f4bb77ab538784e40af90093dd6e9cdc9dc8babc5bbc6322f6aa3483f97cea03c0fc9a3abfb95e64573e8f17959c6cecf5915b361ca7e30a25cfd SHA512 b3dc9fcd96c9996eeec0decdf5e7ae12c33bfa8d87e94b14566aca3a492bafdb509bfa619f1e977c7f1f8f051d63a0003c2abdfebef15b14f5c4c78812344a59
-DIST k8s.io%2Fcode-generator%2F@v%2Fv0.18.0.zip 442436 BLAKE2B f2166af78567fb72164e34869a196bee58f76be802617eb3dd60c40a330deeebbcc6edee4ab00d9b297e20caf8e718001f4342261441bc7173d12a699552fb60 SHA512 f0e2e1cfcb302d3687f51750f0216f8031660899388a84e127cc2acf13b408f941e174e0549568435b634d8380a69771510f3c9f1cb726fa63a6b35e4ed4c028
-DIST k8s.io%2Fcode-generator%2F@v%2Fv0.19.5.mod 814 BLAKE2B 09c06678912878fd28e2be91f6cb170aa69f0e93b11cc0104d046bbe35cb859bb31ab18f3bce5152a73671d74596bf948850dc28039765ed94362be8e4d7a7b7 SHA512 a401a3f34e054b9ad44d90b1cf13f2dd4ad6d1f4af1db92ef2ae6bb4d0f68c696818136e22a0528ed489f0b94ffad00b1bd57849bf9e3e13b62af19810082086
-DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.17.0.mod 893 BLAKE2B 1c772fe1e75474df798b9debb4dd3c88cccf18260bf8710fd39554ac4fa5349481bc642a234aa4a3d5ad9e60a98d01ff08e986a21f184c23ac409703c04393da SHA512 03cebdacd046938377aa983aa15c95da32dbd5e612086c41ef47278afc6777d657d1d7e336a54b7efd35641e0aeb30f3661949b61280720e965f41eda696f6e3
-DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.0.mod 898 BLAKE2B 6cc9e5252b2e886ec23d67511e7f17d0097b564a2a35547d5c0c03c603f1485787c6a1bc3a5aba7d6b91c5377191987d7947a6181587be97319e4969c5ab5123 SHA512 743600f77e0d833d652c2affa3c0e6bf7f20dd429a914220762f044cd6d7460e8d7ee23af29b84f5bf0f1b0d17e6c3f8cc0853d31dbfb6ea64e78f5d7a6eaff5
-DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.19.5.mod 1022 BLAKE2B 4654da0f90cea5e3a8a023f3731ab16a90be8c936f4393584ac40429f2eb79594abd772e2ad413af325e2a2a8f27bd011bca0bcbf0cf1087306e77523aaa4758 SHA512 a44a0dc6aab85eccf73c6b9caee3d63cf83427f52fa3127af1a88f7fc76d81a78ada454026afbfe07f4292f614f8f2c67b99c20bd6d6071ff98d02eef399a0b7
-DIST k8s.io%2Fcri-api%2F@v%2Fv0.19.5.mod 613 BLAKE2B fc588ef957bf269c2d4af4b80682c22cc689454e0b8425e207eff789e9641e52820ee064683ad03f25b37eb059c5f2b6e7d92cc1ed42c73c256d08f95f3320cc SHA512 751e72fd8fb04395190ef06a0f976d43ef620afda03ef09ae4c3ff4ab87e952b32142470ffbe9f0450115a637cca5eb4e37faab0973b06d035b96d20d2bbd7a2
-DIST k8s.io%2Fcri-api%2F@v%2Fv0.19.5.zip 106582 BLAKE2B b61969e70c54aedf60d55df9128be390fde6eb4b99d531ca207855d256f90727cc0257449a6e9ee34816eb94a424e89ed0c769b26486694de4968db6da0f9816 SHA512 10811346d7cbabb6c8f962856d9266e24fe5a3c3a030b9bedd3a30c76c7f30f5fabd67796945603ec39a9b08879babc2401f9b90460a34103511ec825e8ff7e0
-DIST k8s.io%2Fcsi-translation-lib%2F@v%2Fv0.19.5.mod 504 BLAKE2B 475922034541b97005dfd44d50ab3fc2d43625c100c5caa44db3d8e7375f92c792579b337a377363cc0d7938bd7230b855f7a38edb516b3ba7fe2497acfcdcfe SHA512 153da94f6f34233f91ebaef963dd3719c7c915d119323004ad08cba3d1e1e151c762299669f6295c7950b8ba1b6079b1e913958bb7772732e1f2ea5d6a1a49bd
+DIST inet.af%2Ftcpproxy%2F@v%2Fv0.0.0-20200125044825-b6bb9b5b8252.mod 24 BLAKE2B 716c9e6e767f98cb610e05e88b862fb3b859891f0e0859773bdf10a774bb2e21759ec432a3213cda6c5b4e4f12e52c5e6ca03ca14337278889f217d4774f23ff SHA512 a86bb6b40e32b244627d32aa994dd9ab8c630432d6e13b5fcc37a9ed2f9ce84398a7b914d4268c1a7218379d1e43fc73600d85e0ba64d423b84401ac86d50063
+DIST inet.af%2Ftcpproxy%2F@v%2Fv0.0.0-20200125044825-b6bb9b5b8252.zip 39245 BLAKE2B 673eecbb561fa1a6f93794dcf1dff604419432d8fc81aba2ed22061f58b5c28a74fd35bf6ba00fad828a46253aa2d068d9811510d037edd2820eb4575a668002 SHA512 31a17f97222552d95c5f48754903eeed43eb917c56c009cbc2a84599593c83dc9ed120b1f49650a7477d4a3f10bc2b8621ec1d0f4ffc32863ca54d5d9f7da785
+DIST k3s-1.19.15.tar.gz 23655215 BLAKE2B d3103fc950d39408b881a1c25a9a33b379cc62bed3d797af717d9c005dcd4bc389c7700a81b5aa85909b49138176906a63f2573e06b7838c08572f3a53c5e629 SHA512 2d05c61b727caf142c2ba2b9efb82f4370b49a58340f1bfe306d0c99a5c8bac11788699d6d97bef0166ce8ef41f1590fce5aa16fd36ad3e8c6ca128c8c9c06aa
+DIST k3s-1.20.11.tar.gz 24274110 BLAKE2B 1e06c2d8fbd1a10b541d8b80c1fe5756710c7ca04fe427f4fa8b08a7a851ef35c557313514516294a23a130a6a24221aa79700180cf9085df9b53482471b126c SHA512 2acb48adc09e7aff34cf85732a54233d430756ff518fd98bbc848bb9de5feb7cb353d0cd949612b5a5e4f2f209539a7b4c496f5060d1b2197225a9d8ba072f80
+DIST k3s-1.21.5.tar.gz 25763147 BLAKE2B 4384376752f33af37e963e5350e3c9b2e7e719896221ce6d2c25488b52e3bc7a8f6a6d951ed8f6fa07594ba08bd6231ead1dc632777d1e95ae0cbad1d97290b9 SHA512 6d83601512528e263afb17ad4e3fffb8f3241fc5adc9d5122f3833f173dc94588b6bd728ad3cbda13c6e9507ee168d0a8064f344f5d7c48644645b66a8ea18c9
+DIST k3s-1.22.2.tar.gz 27587734 BLAKE2B a9bb695ef415032c8dc864b467cc994fac09ea73d4167ba2c8bf5e227baa938afb4e296b2d9e26d57e8548413d4e7462744b8ac2e78b51a8e4d9df51aedcd995 SHA512 a8bbcf09deaf15047dc9b3ab812e190b7c1c148c345f2404b34748cd0573fd1357e1fd386d3b364deadd149a297e9680fe79ba20e684ffd1f6a38b86892585ab
+DIST k3s-cni-plugins-0.9.1.tar.gz 2748074 BLAKE2B b8fc7cd8f50c305d811b36ffe1dbd47535ed7334fca4f9c399a261ac321107f892d662a07282dba5a10865c9ff01a1be24c2bcaaa23917d264f5b51102a98109 SHA512 6a59c4aaf4ad62ceee27c09659ebbb4cb8996710a2545adbc93a507ec1f74b12c34d29f0c33b7ae45823b4686e3b279027b7c3f7335788c176eedb2b00423a62
+DIST k3s-root-amd64-0.9.1.tar 16404480 BLAKE2B 66f279d1eb43338fd0a6b71f7ba5d9e8e3e1a7d3a17d24c9fcd30f3e03d0ea8cd5fa15547f3395a8c4015f8446c0dd75311e6ccf102e71c9e4a89e6b64bbcc57 SHA512 294dc0e4d8cb378b46ab638d7be2be3ec6a1102c6b4e08fa76cc82a123884f6a691869ed2725b45014cec2c175b7c53fc9b306709df930b7e9b18b18e88b48a2
+DIST k3s-runc-v1.0.0-rc95.tar.gz 2309875 BLAKE2B 8038a2d5311463f1e83665d513ac8b6336ccaa88fab64a3218b261aa03b2750d342f95bdae965c593d4fa89fc89b1e1a6371498c205160d9d09a5c4920ffa841 SHA512 c802a6e5f16cc0321642fc7adffe33819867c1779420f76b2cabd532edb5ac8c852beadcbcf6a3e895fe274f111c5623be5dcc822fef96e7e5259bf532174ba1
+DIST k3s-runc-v1.0.1.tar.gz 2309875 BLAKE2B 8038a2d5311463f1e83665d513ac8b6336ccaa88fab64a3218b261aa03b2750d342f95bdae965c593d4fa89fc89b1e1a6371498c205160d9d09a5c4920ffa841 SHA512 c802a6e5f16cc0321642fc7adffe33819867c1779420f76b2cabd532edb5ac8c852beadcbcf6a3e895fe274f111c5623be5dcc822fef96e7e5259bf532174ba1
+DIST k3s-runc-v1.0.2.tar.gz 2309875 BLAKE2B 8038a2d5311463f1e83665d513ac8b6336ccaa88fab64a3218b261aa03b2750d342f95bdae965c593d4fa89fc89b1e1a6371498c205160d9d09a5c4920ffa841 SHA512 c802a6e5f16cc0321642fc7adffe33819867c1779420f76b2cabd532edb5ac8c852beadcbcf6a3e895fe274f111c5623be5dcc822fef96e7e5259bf532174ba1
+DIST k8s.io%2Fapi%2F@v%2Fv0.19.10.mod 252 BLAKE2B 917c8bfb55fdc4035dd1663548facddf265cc3225fdd1a02a0f1377217d8a4456cf43a1065be097ab6c3c63e296199dc197b79d5c9eca2b82b2e439d6ff2a864 SHA512 0d8666945e227c2c76d89662679b01d588b8b6889c48387cb9ad683ed3e4eaa83d2d5795846972d455deda5c4a96f24fde242b2b48f31f08b77549f0a088379b
+DIST k8s.io%2Fapi%2F@v%2Fv0.19.10.zip 3841866 BLAKE2B cdafb0c350b3ba9199dcd26a8f995eb8d8aa922b93ce54064b54b71c393b26c361b1c163bcfa830c0b11075dfcee94bee9c718667d1daaba29bf759627d1a67e SHA512 d0c4ee75cc5eaafe1fa299fd5e9aced99dfdfbe0b8b615329b82b738a352c5dc356481b819bbb7390eed32000427aaf431d5cb8e3477863d48ab7b4c015c4a1f
+DIST k8s.io%2Fapi%2F@v%2Fv0.22.0.mod 250 BLAKE2B 50f9c60e31b553e4c802180a3f935658d59c2f4f66962e76897c644a33bc49cdd4e0ff2957aa39297ab99c85d07a7662d36cabb6d63e0a2ab5578873765955d5 SHA512 444cba85841af04bfa7d9d83ff661f9906282002ae3825bbd82f990db68204ed6015fcb85c9da545f8266343217c30b941f60a1d8e5c0db26d6b56ec7b612511
+DIST k8s.io%2Fapi%2F@v%2Fv0.22.0.zip 4824321 BLAKE2B 4ab81f57f4cb61be5c5ca7cc86840a78b2167cd08fa3402de0059a65b38387e929d8b9a091ad6cf686370405a41b5d41c0d7fca7badd6026f148bd783c942101 SHA512 3372ccba544e5098986c2cd24816184347ca3805cb9678e6594d9dea857af5579d43fdb67304f1136d9e8395119013d4dad6f2fd6d689dad1b86173555ad823c
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.19.10.mod 1370 BLAKE2B b698fb5e4557f7dac68b1455f99bd163d60d666d508e5ef24e16a8f4fd1c144451b478a239c8b4d0384693742cb2272b6296834251cb34602683cb1ffc724f7c SHA512 006781c3e219df58614fb2d44de4652c70659ed0fd98c84b257dc7939755edef6bd3e8d9eb0bbbbde42ef3cf84ce70bbaca6b49ba6dd87020b60522e7ab0a278
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.19.10.zip 802743 BLAKE2B c42aea046c255922d387786f6a9a09bc8a54e8ebd18511cd84d7edadb95b2427fd9f4e1ba8b9e145e158e88747fb87f063a699795213df98c67a210c1e7299a7 SHA512 0531d12463e0f92414e3ca908d7d043b2e4e5d9a9d5cc48c35dd979ea7b5d71a18ade10a95c97eb7a67b1d508dbf9570dbaf1cf8263d4edde546109dd1aeeb61
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.22.0.mod 1353 BLAKE2B cb13530fc207fb38adc389a689029926f52d9cbc9c31fa3624b236771e62529e9c7f8d3e94744e394fbb4368d4c2e066f4d941ab6ebef66b35b331e0e782e7a9 SHA512 92ee26016e5cd0cbddcf4bd7f2941f290b22c68e42eb9c66a5dec2e8a0865e531e3241828fcbb28e16132025f5d5acbb5e84aa0abe18d4f9133baac5d0ea6829
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.22.0.zip 815269 BLAKE2B 902711a15a7e91435bdf77fe07df548fec032cf77ffcaaefdb333773f695b590d9c7eda7a2d62d1d503bea325fe66e825137da350553d0e42dabd0c335fd6e20 SHA512 440de8119e8ae2b1c655b2a8370c97dff5e2086a5c2e94729cf2986d582d62c4bc60017b3255c0a10973cf8cf7e4a096d16869932c9b8e6b6728e6fd72df99dc
+DIST k8s.io%2Fapiserver%2F@v%2Fv0.19.10.mod 2331 BLAKE2B 895948cdd8919483379ed2ad30622b9f6161de87eeac8cd6b3ddea3c97840998857fddedde4bf19db56d8d8e05a7b0e78adf754629b9cee9e90c911a8150e982 SHA512 5775a04b8473f460c1c532b8bd5e68d889cee1062c220e689a51617e511f8cd53e6f0c92f490f9f8a48d0d8c76e25fb2e3ac1dcccceb3467ed44296ab04c68eb
+DIST k8s.io%2Fapiserver%2F@v%2Fv0.19.10.zip 1582235 BLAKE2B 2cdad672ff5f393c4f459befb2e6b23fd9f79c5d0582ce86a9b57b22d4ddb5376a925cf8eaa2a8f5c0bc37d4ca973a3d2106955fe830b1fec5d3e48b36a3e637 SHA512 6af8efcfdacc2907232a817d358d15cdf205eed5818352ba5fa37a4ba761d0d7a26ff5e9446b790bad091f4facc01a7d1a4008e020994cdb33584e3ffa956ec1
+DIST k8s.io%2Fapiserver%2F@v%2Fv0.22.0.mod 2391 BLAKE2B cedffdc6c66cecb3dccbd9aaef54b2f2369c25c0d87c020fdc46920519098743075df1a5a1ba74234d7bbf1b1a14824309a8b4df7fb843f94571de056fa849ab SHA512 0a4ffff4ae52cb09f75a096e7c0fc7551509e5419c6332056f51dfe94e25b0a4877453a4a4c55a2d831bc2514fe3ccc658dbd8b4395b7f9a6c23de6d42890637
+DIST k8s.io%2Fapiserver%2F@v%2Fv0.22.0.zip 1775852 BLAKE2B a39a177cd3150ca20835c13320fba0b4f1632e88295a7ea562bde79478f6b03c6fd228518b13f02c7e3774d3e17d86d1a2f2e5da08be3d4050c3a81a8b818a30 SHA512 08ac9e9f4c5acb9d94f650b71e91d7ad08d385edf0ed5847f0ae07bb11b62eeac50169318c0dee841426b216615ef64bb5c1d5a6d610a16fc1d3f93b313d3585
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.19.10.mod 1276 BLAKE2B d85999de89487eec30aa3583bed426a53910109afeb8cbc27c09e8ca15f3e4ff153a122dedb919076f0a00faba4c8325ac4d5b40d6e1a85cf66fa74d01a19872 SHA512 3edb1ff58ba92aaa4966756bc47f8bd5f7a1dd448a020337f97ee845799a3c2b2576548ea1c520b8ebcd7e652a7499a88de13e8bfc3ea7b906f4372247f654cc
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.19.10.zip 2199658 BLAKE2B 170439590805b5e8d7149855169ecd634955016e00d2d0993752af18c0802de40eb90dcbb24bd8e3090566738104e733a49ea9030f6aad65f93a5df72dc07c92 SHA512 c5ddd4b44987c2da1b4eb2168c57a9e394809bdef058e65ef914b21cb3ffa605da2869b6978a57f43b83a684880ef4561e493c980164a9918a7d3783397f0c0c
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.22.0.mod 1532 BLAKE2B b787c494d41758c5bb0910719717d75b6534d22882067930b13f4bb4e0610574a76c2f1935396995704f5bd28bab9f42f002742f63d4273c027ccabad45ef44b SHA512 75185989dd1fbf46c930145c0a2e4ccce1d182dd4ead15e5d4a4ad4668c990c80a259fe36d388ba83d0fb24e8594b849d498345f060edb5f0faee33f0241318b
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.22.0.zip 2656023 BLAKE2B 50b448653d55d7a5c4012503497f83848062d2b7454d09461a91fec4e8e847500d6d0c2f6ffed3d0e23ec007b9623ff4250ce9cd8266d3f50878a8570617450c SHA512 1100bceeec098a1b42c6176bf2d7ffb834e6dac0f2c95488327cedf0585b7fab51666785ff7e200904ba6f70dcce73a24c95022a466aad6644310e00c0f3835d
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.19.10.mod 1027 BLAKE2B 98b70145544e5b7ac33e69addd0c438f69b975eb4aa76a1e8d95125311075894518ecc2dbbc32c213c07e15d4342b99e699dfab841992ede61c712cd11e49941 SHA512 dc1b041261f78c4350a16cc54fc55a084134da1e55233eee10f82bb3aa86c5ce5c7ffa0ae3eb2f77af144cff1fa3fd61c6d1c66643bdb90c0f8fb93c87d06ab1
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.22.0.mod 1400 BLAKE2B c58634fbb1c6e252b373e59cbd99e106fa5a7550713c46fa4ca847cd079cb0eda7e4e940016200dd4e8f409d546d03c1978fc400a73cf66b231c4197304656b0 SHA512 661613419e947ea7ff7f6087ad5faeae698e23ba76170a4669cde1a331f625ff2b29a9750cd3443d0773fbe15664127d02ba730aba06c37943c9e38862189d4f
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.22.0.zip 215765 BLAKE2B d10719be08eceb38b5cd78470e77d93c29bc0f8d9b01b7b8f9457598c03cc595cb08bfdb83eba89f8a4eaae9ef0cf741a22a00dd1203c69882b811351831a09d SHA512 711b24ccbd48d1a35e856cbec18653c496d42054c56358e86007c0eef48240db40d41eb2ed2d018e5f5e8fc644761f1bca06fd6f35be21d44607ba9b6332d079
+DIST k8s.io%2Fcri-api%2F@v%2Fv0.19.10.mod 613 BLAKE2B f74aabecb3307ce29f887cb258fa1d02afc1a5c4208fa24d183a10299c6237ef1db2b870277505791afe6a0c02962cd34774e4194f7186c00313a70931cf5343 SHA512 e8e826824be9bb44ce1c4535598c88f8001c3745ca63a40e9e7cc9d77c1e6d00611d5d0c465df40cc8f938db4e513fbe8ec96d4c62d3d6cb669376259d7ee835
+DIST k8s.io%2Fcri-api%2F@v%2Fv0.19.10.zip 106828 BLAKE2B 0413c297fe7baf89f6c5eb44493390bed2dea4fcf2a93be25a58b7d5813518840d097eb14d9a66cf5df84a0110d999997d061f1e9ca4800061c019054367fea4 SHA512 547944659827f126b610922094534d4a42c5c2c9b6d6ce1247597555a18e2e8a0072277e71c8882b68cb9999dcaf236712b45f60b498e1ae9ae67d3a0678a78a
+DIST k8s.io%2Fcri-api%2F@v%2Fv0.22.0.mod 694 BLAKE2B 6d95e132b885ea630a8b625898aac9fd8dd5fce396d74b990f8c008d8801808b7a7a357213344f9035e0c5fe8642dc361036f4272442a4bbb8f6c03df2cdd466 SHA512 0bd8b3bfa734d6cd004b8ad2880893482ac124c44ad1f33ff40d34e735f032c2fa9830e86b26aeb6d6838cac3c1609a55c8030af581c6051b04565363aa3314c
+DIST k8s.io%2Fcri-api%2F@v%2Fv0.22.0.zip 197483 BLAKE2B 574a22a17aec12e9da20490dcfd1bb1a4541d2a2c5631b5e5e5a14e5797029484b9f212ce2c130726161b3cc1fa4c1af78d13e2faf34e1e929a8c29382307527 SHA512 daaa18afd2a334a7813bb8978f4e178f0a79328e86ed7065cb098a85f3fa7b7b6f0bf09d54bb2fb1efb256b64a7afec5e71bc8ff2e641b958e9e0260a7528881
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190327210449-e17681d19d3a.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
-DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20191120174120-e74f70b9b27e.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
-DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.zip 170299 BLAKE2B d7d4a111dc0440372d25cb6d584b5597b60bc94af9b52e2ddf36366d5200d9459600c4b3ecf744d6877b3a221fae670c65875c49f22fbb8438e3b202f529ae08 SHA512 2e28fb5a8b185f111b8ee099203a32f1b1df99fdc356323ecdd4b19317661f4a3822f8e1952e3272d33abb8ea520e83dc6cca70caa3d481d690c30ced903d9fb
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200428234225-8167cfdcfc14.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200428234225-8167cfdcfc14.zip 170687 BLAKE2B 5297c3edb6bc219f3a868b07f28e4e15f0e8f633a16923a20994521b061d44882e8a3abb4ef87c9e51d32ebefbbce34598bc991b66e3afff89bca407ea015b5e SHA512 e3895c10812fb33a7ca685d2d2f19987ae6e2f3f406db33c2092b47b99c2888f8ff9aa517b2adb7d59d27a7a8bd8923f02475135a1f4b2ce02ad744a62f97032
@@ -2127,7 +2205,6 @@ DIST k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.mod 23 BLAKE2B 0d84b1d2f5efec714030b
 DIST k8s.io%2Fheapster%2F@v%2Fv1.2.0-beta.1.zip 293310 BLAKE2B 05ddf940c2702ab36bcef9462a93e658e301c07e27db544c19bb4fcf231ac658027c147d273be2d1a6d00a33476a8587e1da8cacba7b9af194ec965a8fdf027d SHA512 d08410b6b30096ae6aa9d358020b4add74b0fbf633fbad5b3a43a9d192c9f4f910a5ff6b1715ee897738876fe143162cd16bf4beae113b6b52cbe27f476eaa85
 DIST k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
 DIST k8s.io%2Fklog%2F@v%2Fv0.3.0.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
-DIST k8s.io%2Fklog%2F@v%2Fv0.3.0.zip 35266 BLAKE2B 73313b579008ab1bf3f4b1c0857ba24b34798ea7c92c18b5da11db956b5f544cd2b2e8d601256f2ed012b972033662b3cb6afe1c85de048dc76978373b2c0e6e SHA512 adec8e9a68d5729c35604764b24caafdd30ea097e9e493f35fa47f0f2b4632d7055d50a1d90be3bcc22bc00e3c431e30795ea189ecf7ddfc634ad380eb686f9a
 DIST k8s.io%2Fklog%2F@v%2Fv1.0.0.mod 68 BLAKE2B f745a62a974a42d1692705de032c8c651477ec71f32b0515adc02360e5a3de6c7d65f5d97960e78da06e99b0843c312a09701c08c6a5c112af832e3cd2e43649 SHA512 cfee3f10c26fafe7cbc510ff8cba479dfacedf1d95b4e25b75978656862067524b4b9f5e889455f2d74eacf07df7895fe266415a05b9502a759baf2e4bd3884a
 DIST k8s.io%2Fklog%2F@v%2Fv1.0.0.zip 39827 BLAKE2B 441907426e07ed46aeeb6314c615fceedd43bf1b21b07a31960b23e1cf31dc400f1d7f0304cd5c13db8c2d54aaec47d05425798508978cb25c7d05aa3fcf2fa4 SHA512 b28b559a8a6e46b206ac005497d2e061645a81a3dc4b4f2c2a9f84065aae024dfbe7c64e9a446f72f7f88b5dea31d0ee725b273fb79877e24fb27906e1500c2b
 DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod 71 BLAKE2B c6d2fc56898a5b4e11c13f2d102269674def5c651031128231aa23d016ac3e74c23c734c4637e574e7deea2173733ba6272f02fe05e3c39aa5d1de4713aa184e SHA512 29871958be33057ed4a8f81336085da0c633dcc4c00c4dcc134d1313b1220bd24124d5b2b7a47b26b56ba2e7daefcd33dbef7bbc0a344c72e6c2b039767f810a
@@ -2137,110 +2214,34 @@ DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.mod 71 BLAKE2B 5379c4cfec1c33cee99fc39e4c3
 DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.4.0.zip 47637 BLAKE2B 4736bb8e47bd1b7fd2124e4cc2101a26ccec59231f8c0b3aebf8f6379e01ad985d27846885c18a7c0207c92197ad3658b0feba7482891361e0e6d85607d746dc SHA512 9625bce8689cf7832fe1451fe80fc2ef090ffab2f0c367096eb8b1016fd6fed47923f37eaf8465fa6d3befa017f0b5de07619daac02a60e39004c6b2f20d073e
 DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.8.0.mod 71 BLAKE2B d211519da5641fd9e80f36d55ec4a81d4d943cc263d5ab664706ca4bfa843632ae15eaaaa19c4e0abcc4d67810e7736eaeff20c4a8bbc17a68c3b5211dd11dab SHA512 787d0191620cec13e492773d16600ec5ff90fb4d4253590010c02b473cacc62b547544f6c90502d9f1e53fe9f31dbc65cdfbd3bd2412628c44f37074505fff60
 DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.8.0.zip 51958 BLAKE2B ed0601a01a17f2a4601a21831be90c6a14d6db036b250a84079f19318309f5a41acabbda58fdf716ee8daf738f34f4dcedefe6528ef0ad70bf468e866d4c009c SHA512 cdefea35f3603fc8b3022f1a90981d75fafaeac4192f515ee5e1e6499d534d7c0c8610e754c79b23d12fe0265e17792c937390ec0c50b29fa30e958c411254e5
-DIST k8s.io%2Fkube-aggregator%2F@v%2Fv0.18.0.mod 1258 BLAKE2B bdd9107fbd4b7f1dac7a585bb33e44cc0d8b6c76167b65abf8a0528ff77772533267a2572f6549d121955a10a96c570e7c1ce571d28f8a9e53d0c0498a708cea SHA512 c43d99d587466f016d63d39a79762e8d36d1cafe05c35a0589df1291f0f78f27a208edc098f0266fbd9ec0dc0468674000463adb6ee4c464bcea5efbb9b8ebf7
-DIST k8s.io%2Fkube-aggregator%2F@v%2Fv0.19.5.mod 1042 BLAKE2B 19063bfe33c257ce09a794b6d5cddd636b05354e7e4241cbd1a387fcf8378f4b7206d0b3851267ef6d8cf9b6409c8d83f9aa23d40cfc0465ff3d65dfb2d438ed SHA512 d2da7911b4b3e332e7e0ab4eb884ff5cd7b39aae686787664587d411f5309b8ac5e814ca3eb409bd58aaba95164a13878fdd970a4878c7881f351db4446955a8
-DIST k8s.io%2Fkube-controller-manager%2F@v%2Fv0.19.5.mod 373 BLAKE2B 459856e5be48b4569bd0ac952fbaf11dd37712871085597d7e0686ac94ac5104a9eea43b728859bb829224c6f787bf54e44bd62616d0aef7161a5a23212fb142 SHA512 92bbced75bb52a1f85fbb53adc849c5a1ab8cb606fa273c2693d10aa9bdf8f03cb28a8d84bfa849dc7af19955e0359e369af7cf51c78fc8cad78e87b874efd55
+DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.9.0.mod 71 BLAKE2B d211519da5641fd9e80f36d55ec4a81d4d943cc263d5ab664706ca4bfa843632ae15eaaaa19c4e0abcc4d67810e7736eaeff20c4a8bbc17a68c3b5211dd11dab SHA512 787d0191620cec13e492773d16600ec5ff90fb4d4253590010c02b473cacc62b547544f6c90502d9f1e53fe9f31dbc65cdfbd3bd2412628c44f37074505fff60
+DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.9.0.zip 52961 BLAKE2B ce9130627a7f397452400ff31288a4c9522ba1a9de385f01a2ab0c30611ff751633fa7aa7fade241fe1c1d4ec0ec7e743e27982fd5b3bb384e661ee635359283 SHA512 655202da792f0eaac550aedeb7c52bfa4f462ce47729399784dddb1bbca49cc4fc016e2847f9101262890b579ecf8cc14d0084598cca3b5b76d47d793ab2e7a0
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190502190224-411b2483e503.mod 2063 BLAKE2B 6585a725f7540109143f3051ff83cdd2b5ab610176343a75bad1ca0a69e78b09a3bdfcf077094d07dda47bfd35e40e88455e815ca7619df3e37f0ee47b6c782b SHA512 d18f9adf777dffa450e1e2499bf126e232f4aa21f548bd61edd817f099a9166f1f6f9784bd7007f345e83b94b63237f5f9cab641dfb2092ba57d53fd8605c871
-DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.mod 2088 BLAKE2B 407e0a8a7b3fdf35034c02c9a2b22a1dcb43347d3ce85b89088b04884d49a3a24eeb80a20263699bbce415707462375a420c92fd458016ea151884ac8d2da151 SHA512 b0969627b58ab34c898af158e1dceb5427a621c39c563537ac547c2213cd7034a5eb152840e359821d152bdb47b32426264bb3b86cf64cc1359191a943712340
-DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.mod 1743 BLAKE2B 1f2f1c417b102908c388ebdabbe4686f756287951943eac396b07d8be7fa905a6d362442a2f99d5411aa19b27df038e699ec1264648e9c948126835df0f1a767 SHA512 6444514b3858974b4517ef18bbf82366363e2032e53a8a88db6bf2cda4105271ed672a49cac0d01aefe7f006cb69a8e8deebc077a91063571dd1b20fdf09b21c
-DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.zip 826029 BLAKE2B 454d5c68dc5b2216ff9d38302a817349ed84e2a74e52cc115695d37e6d6b0425af6163b52a96b370a09a6034dffde3ebb362d6f112c2f8b8d0d59a90f9933a17 SHA512 5e4f061796cd04e9dccb2f43c292922363d670a2be8362bbc11b5cc4c658847585a552525ae604b909ab159f447bfbeea71b91c871b01374c749f75d117c3dc1
-DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod 1743 BLAKE2B 1f2f1c417b102908c388ebdabbe4686f756287951943eac396b07d8be7fa905a6d362442a2f99d5411aa19b27df038e699ec1264648e9c948126835df0f1a767 SHA512 6444514b3858974b4517ef18bbf82366363e2032e53a8a88db6bf2cda4105271ed672a49cac0d01aefe7f006cb69a8e8deebc077a91063571dd1b20fdf09b21c
-DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.zip 833867 BLAKE2B 964d8c0f8d94aaaf19ce5aef5ecfa512da1db391158f2bb0b42ef16b6e356b443d7e76368879bfae0ae31e5fe7e0cd2e56458461521c0c5bd38d4e5f2cb8b876 SHA512 fb555892a68bd723dfc63da35d9e754fbe5b157b398d924956ba41d7f81b5bc14988ff979c32bf48c1e019c316d414374bf57673f7236f5e26c6898f071ee46e
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200805222855-6aeccd4b50c6.mod 1548 BLAKE2B 65bd1ac3e8a62764e532270b695a05b2f8d45242472567ba66e15c042651f44802cfd2cacb5bbc52d0e20a4f6caaf7fb6b7e7a407e3c5008bb0be884c9222f76 SHA512 5998597c43f19c27891cdc0c9219658cb12809d6af1df4bc9c3d234e2303aca17581f1f3a9c21e19d9abc201bcf794e05f8cd1b769aadbe21d74c3a6231af86b
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200805222855-6aeccd4b50c6.zip 837055 BLAKE2B 11b6ab0b043bdfa7fcda5cd19fb644cba4e9208560f2e4addf38f06577b91496ad836b39b8d58b75660c41dbfedf2204140ee8d6298f0730ddc5eaa947e141b1 SHA512 86ccf7cb2a1d79e318bc7aad6d418c5303df000e2ffb6b25a1902bebd70129195d33c27b0be37046175893588215ce870ac8ba006eb3f31f680aee2a0b1b4f68
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.mod 1277 BLAKE2B 931fd6a123ccb62fee29d795690f778a4d39c8f84159bd85b80ff0d47f92d298985a6620eefece9c4c76d4e3ed795b4aaf8dfe6e53ceedebd68095a373fa2af9 SHA512 746bc18de0a8a3cfcd1707a3e6b01055a8e29dc2bebb6edb2a7abe8709c13199b288da6107ab3a85e35338a1b3c15eb73ac8f02243579aac0b9c4fe76c8f54fb
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20201113171705-d219536bb9fd.zip 1002101 BLAKE2B 3ffce7dc81c73dc390b68e8ee35a68b125880bfe214e0ac3acf6ec9dffd180b430951f4972c53a5bdbcb0012fa9a165870ba4316252ac90195e9fe4e358df1c5 SHA512 5dc73a20de4b31f0f93540f58d0c7394de26c302298be6268529ea2928f18d3f97bd33e4ee02cb4a8c14c31e798f694414b8ecbade75e1486206d28c1b8e265c
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210305001622-591a79e4bda7.mod 1218 BLAKE2B 381df39fe48c112be512fb3c954797c40daa45f05cf5afcae61333340f125edef6d4261d3462022f02211b82b5840e845528db3a2eedd8380727e015856c8d8a SHA512 cefbc18554b31bc93feb3722d3af94dd84f1d363306b8c3f78e39465de2d51212d592b7bf97e851317fafc45c0efb20c73224be89d5f5bcfa756f0169417fd7f
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210305001622-591a79e4bda7.zip 1002412 BLAKE2B 4c4599fa3e545e71b10c12cbfa4b59e20201cdb8ecb6f7ef9297a09f723bddf56a12df907d5fcf726eda044c5241fdca1b356b297c5476f0ebbaaf4fd36740eb SHA512 d8b702d4534b2a2c94f556e5f96857bebef9320747d73a6b647d88dd42ea62bc5672411c321d2e50f976a11aeeab00d8f36fb0defd26152f235bb13350b1dc2d
-DIST k8s.io%2Fkube-proxy%2F@v%2Fv0.19.5.mod 360 BLAKE2B d7a4289891b2724f1b5e32c04fb018b056330de1dd1e4a22ee0e11c59503dc5b4fe5bd4fce48352b7bfa2b47e91c72ec5a1fe3af02bd6269d5aada24dda9d8dc SHA512 1d815285c2cba5ff9cf7b844585200c21346c62bd7ccd0128c27d215e5378c85f5c2c36ef2a4a3bb8cee0704ff0b6893efd438d6168b941bf53dacd968d6e74e
-DIST k8s.io%2Fkube-scheduler%2F@v%2Fv0.19.5.mod 442 BLAKE2B dbb7ec3f087f780e117d8157e81a408fed5a3148790cd918834d6cbd0eee05c2ed2b76757a0922938d9f233f6546941b20434db50731ca48f7550b32787cfaa1 SHA512 ef283a0cdd900f6ed175a2c19c1ded04171e42d6bda99db1d586d151ad1d45f9a5cd9174b59f529b9e570078b8b877d14e4141f72897e433316106988fc2c851
-DIST k8s.io%2Fkubectl%2F@v%2Fv0.19.5.mod 2281 BLAKE2B 8f093e17cb0907a9e6957f54bb1de810248452985326942fd2ae6204cd3c0a33e768f2fc1452c67e3cc6565873ae3d297a7d657bbf217d39dcf92b2230a6ff59 SHA512 71d48f21a445ccac237d954a2e7671368b0938db04d5fb7365d4049144c76a2f4730fc0d171e81bcc4b4527aa0ddb3d08124ce7c2135c69e4e56b80a9205f1b4
-DIST k8s.io%2Fkubelet%2F@v%2Fv0.19.5.mod 495 BLAKE2B 1d063d26e7586fbf6d915f3e6833487a43e041f0c3409682bc53b2716d3a7a2a81d2e3843a2bb92a52852e636f2f558bbdc5b6853efe75c62277ca09c9fea3a5 SHA512 fde8fa389d426e9583410e093ace5eeda1233fc87725bf23c11ca4c0b749bee7751de7dbd7118a7f1cea82c0eb027457819026e5a36efd221ba9c82cde7e6919
-DIST k8s.io%2Fkubernetes%2F@v%2Fv1.19.5.mod 33426 BLAKE2B a67326c51fc8d7e31300aa7c287fadf2100801f4cea58d3fc81edc2be4bca8d792bed23b5bc285ec91f8a2720073e3b5c51dd3eec90a6963d92ddf8fd002bf2a SHA512 f412a04844496515c40bf5c084f9817e93ceb185f7dd3b1faf0f1b12c9bc175d49def28ca19a770fcd975975a8d9f596caf610341bdee82e899bddefd611060f
-DIST k8s.io%2Fkubernetes%2F@v%2Fv1.20.0.mod 35784 BLAKE2B fb95531af3d2dd03a28b2d5ba8e14d29c06764d73f06ee13e3801fddfe825e8f53d2288e9f2c58325085fc68a00532f503c82e33d1ee43d74d3ee140a5ccbd6c SHA512 2615ed137a7c4e5b157ba6d9dd31cc566e5369df928e3518ee321c0d91a924213d0f173b876cb28ecba2faf82b6ab7a52f2b2fb5c1bf5bbbd9d55af91a620076
-DIST k8s.io%2Fkubernetes%2F@v%2Fv1.20.0.zip 15051141 BLAKE2B 7491afac3ef4cddfb505b438a66afa751da57b09db49d3271cb7fc2c5e3f08e05bf2b90f6ae9e115be968f1e2a7cab8e50b4ce7a563529c1e86334b035cbaa9f SHA512 46f62e3d804ab7ba5f10009e6703451a9c6aa36cc020d3f9f288f84268e448771b95fded85b6f7a73443f087eeb2199b1a10009b032ae577c1a0ae2340535e54
-DIST k8s.io%2Fkubernetes%2F@v%2Fv1.21.0.mod 35830 BLAKE2B 30ee48ad9c22720b3e3c0e730dfc1a3eb813bcd30fd8baba030a7d7ce0a1b459792019bd6de68bf8a77fc6bac623bf3e362cc220242b86a4939f7addd78fae0f SHA512 add446c964da2bcfa53edab6dbfb4c65e7ee90780d7c84710d0b868816a102f92140e159c0d893b5ba4ea823abdf98c1582b8eba6317b3eefdb8f7adf985f958
-DIST k8s.io%2Fkubernetes%2F@v%2Fv1.21.0.zip 14905684 BLAKE2B 49d5c74d9603c810f514a4b3be9efa607b0efc4ab7de707a277399651809da9c77f574f0df294e61944138ec7592799301c8e5b93b05481c261ddd4b0668525d SHA512 67d815100753ba3b1df27ae1029f34cc7321428dc4e45e4f466ac5fef27a115636bd0bb389effa711228fba85c584e99edaea25c5959f05191a4b700d1821bac
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 264 BLAKE2B c95350e61dba4eafae4510d7ad15969d45cbdfb97c6e8b5115a4885a34320c2100929b6c443362ae9f42194af8dfdef62151545e2cfccc94b7316d51d7d06e76 SHA512 44a331c257cc44f631e9fc908ccfa5cade74fe343f3a3131ea7a9dcab4bb15a24c6a246fa0395b6b9428fb0b67c7106f62cefa5102870406707ba8e11715666b
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.zip 4086456 BLAKE2B 4254cd1950ea73258d8ae25a6f1b891d35024b44c8613cb626ae2dd625eecaca447bcb38f2df80ebc9e3301be6e2771041c1622656d6d1092ec0d246f5c2f1ab SHA512 fa9711212582bea4627901795c91a0ac63a508285ad2c0c444716c3a9a908a75f4affe8966344e3578d7067b1df8912d226940bfeada59d6091c5007c0253c8e
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 264 BLAKE2B c65ae8b5d9e6bb25b4013cc05cf397404675a48d26dd89b09f61bce0de158c6293c3931f3862f58b505b7efabdd1d5ca7364481e631b21857db46ebd8ed7a824 SHA512 262b36fcd2e62f41e62fbd540372bcd3845a3bc431e207df271b3f0c222585b718075cafc8e03edff67fa479a95c94e3cbfb046aeb4757c272aecb8b35bdf6d0
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.zip 5044373 BLAKE2B 291f893b6d3fe64ab97f59c77e6b7ac7e92fbb5d9c2354d23774c2fdb2511dcb8284f433b079250790267a29b3eb419ddc9d622edeaf1acd463542586fc687a4 SHA512 45e319e57343ce7cf4d1ef496493168e2bb1c8611bf031e6d521949e9c54968c80166deb1abd137f01b3182a74bf5356906bd3b86276df8d0764f78a1a36ee7a
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 1188 BLAKE2B 1ffafa5cb9b9f4f90d835c6aa1cd86e6a7dea05f4e49572dc9d339593139a951c8463ec04dfb0c4d33f7000bcdc5f1f678a8521c6ef4cf459a06319f01f06fe8 SHA512 e19f8395b74c8aeed0c11a70e8cad5bcd42796519c7c911c612c72c0617c1db65a9c4b45cb397846085387831c00c838b49772c95caae62d2ad818805f9b2d92
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 1233 BLAKE2B fdc978adf5929121229335157d7fa686800ea2a03bc8456331a50eaa9aeed4a51db2e4ae7a5d35981d5b3edf46635dac6f64e814a0f8790edae6837c6c7ee256 SHA512 d8d005165339655c1defe813a29e2bd28b19996f4200824b4fdfd228aa9ce5d077e5d16b89ef0b7e4f796a8a7ceb91568a1cb18d7c970ce242dec271dbddf422
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 1525 BLAKE2B 9621a8018fe9248230422dee4ecc1cdd1ad227c02585e15c17ebbc1023af40237e69515ca74cc574d4c64edc54c2c88f51109f856609f362968577e502cfb487 SHA512 fbfd18e48a95462021385a2cf55409f2581d23a3aee39242838b0bf62ec285876c61db85abfa78960d8399a51661461ec42a127547129ecb5c1a0158bad7b715
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.zip 897871 BLAKE2B 61dba312db9172197f7102d71c65bc9d43afc8060c9628f26d5c131153fdd0b3b7741070f6e9418d2076a729e8c914dc08b75b4646b4be51f5bb9270c325ecae SHA512 bc3d69d540abaffa8d3930b1ee470110870e750fb1a28009c6e2815af2ee95dae5a1b27d2670d72c085a2be143754e77dfb691938dd817892fe9d6d750a8fe6a
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 1557 BLAKE2B 18659443339f423814ab5839191aad4bdd734db7d2200acfa2ae93865696fc34e1b5e7dde6eee20941ff71d3a4a5fca93a064aef07359d5533a05d4ea90f2dc6 SHA512 5681a15c037dfa1763c6dfa7ac8932c6b866642e01856c0d3ffa6068f434bf4585288c57ac4e1e18c065b2d5d38bf0d17278a382ae51aae79030b4e81db992ce
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.zip 849953 BLAKE2B ca2ba4af790c70409968c157bfe2d031ac41035cea627411b0a5eb516bb0fba2229aa4c30d724973f3938faabf9e4c6c7d34acd8b5d5d5d4c1b1b7f23532da04 SHA512 14db6bf5f65138044d95167723e373ce71dd0f0e71b70487cb18ee97cc9c15509a6fd49165386cd5cd7a9e61db8cca1278883fdc02809a50ec6edbd2e0df6d14
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 2323 BLAKE2B 6c71122254bfd987bf395d56a8702dde25bc3224859fc60895cb056a6e31f56d94bca242aead11f24539ecf1ebe82de506244a5884286125d776616003edf5bb SHA512 df481c9aa8b5b8c25dbd06d42ef11368b9eb88b775a4ed8f742e30a9fb2ce0b028f3b0bafa2aa51278ece8712fdf19a70208c6f07256911155d43ec79ef39ad2
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.zip 1873356 BLAKE2B c5cb4d6d56380ff4df0e5adbbcec77f962c8675a3ed7562fcd778d2e49dec7feace1fc2e4530590d02c38b0a58979afcf9752c127b6a1513eb93232f8e663097 SHA512 3bac9c5ae54e080bc83de34f4ac871336e931dd6ab8cc9f40938acc09f1725d8c80bc25fc897b9c015516abceb1aadec272524114b0d6786294588d200daa91d
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 2372 BLAKE2B 88d7fa2e2bff82b9d7628658756d33b80c2e638d4aa83e682371692b61c4dd0a1ff9c96c6abfe9393766df37aa07e6b7cf655f3c8cdb2bfa95f8128e31e9646a SHA512 ebdd516810c45b3373be04700d3c545c154780e98999700e612e7f7860042667cbb4920a1a67380cbcdaaea5d9ae0d480982976ccecab2f9bf04fbc8f738f1e9
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.zip 1786744 BLAKE2B ab8a1eead788e462f88085124e865d9f72054e0c3c07ff9852fc1ab59650fcee01dc48741a5abfb7a760d3e7dde159581527972cb691f1a3eb25b290a2f0c6d1 SHA512 4e80402096e5337daeaaaaff44e62f7c132a3987d929528944b412b77b8639b9c41ae4706517dfefd73621fff8ace4d0e09e9cfb7d69c35167cda8459ca9c9d6
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 922 BLAKE2B 4a00092791a3b9aacea55ca4648d67182bdcbbd3f1d7ac2bdebf0ecf43bc2a526d1976cd87b7c63746b9fc102571d813120a78a64a75ebb2fa99531a42017021 SHA512 c72d27d3978939b79d736c33c31dafb4cba6cf790ab7c780e8390dffcd1afbc2e24afa849a230c2427291ed2144dbb05750de0a0dbd231e55d7bd160812697f7
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 803 BLAKE2B 2335b3ac4b63669348e02ff7d47a56573cbde262a9b5ebe9bd876457ac3f823b55031b2990305a8e5b438cbb3060bf597a8a560cdd8a9aa5ca7412d916b52b39 SHA512 6f198f273751273d11293391ac53e66c98c2262a65d8cc4ba825982113149078442e032265bd547ba11131ac43b0ae42f0b94d9c13d64a2679b0195c939f3f06
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 1281 BLAKE2B 7b3251bf0e5fead0fd5332f57292dff9cbcf4bc2c3b77049e1835d7db12a3ba0738f8a5f5abf79b8ff44ef0c60a509c0668bf16e555d639f7dd550fb34cb6fad SHA512 870610db868cad18c042d8a35339437bb87b539664ca6e53609272ac8985754d01227b561e43a1feacbdab9c2aa33eb5beef9c62cabf9b4059b5f451b9cf5dec
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.zip 2031675 BLAKE2B 3b41e01f1a5aa60a942848f51cc6f9197d7bb12cd6c0f150170cc342aca1852fb57934308c7ba895bc52229cd83f9ffcfece8083a0d9814a317961991bb97f48 SHA512 967d874111d7481b351b83dd9333001949c769c29f63101a2afeb3e12eaa2683f2fa49e89cfa15caa9274c4ba8706882ba723f30270ae81f67775e81086ea27d
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 1393 BLAKE2B 27e59b98f22b63bfc24344cf7cb81c6f215959f3f55b561fbfd85253da76fa5463414e4a437fa64543c9c3881764ce716d116bdc6584f8a52c4d8f1f935bd176 SHA512 26e193c38a41d36ba640c97770744c57a46979fd93fd19e5c873096dd6292cdd09b013462fcaaec3c9f6f92cf4d95bc03cfc557787f7c729f08222efea3d8494
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.zip 2777028 BLAKE2B 8d99d9b259558bd0d23f2cda877f7e9b226c4d498a9e11c57dfb1e9cf17d3db2e15da670e04831ebf445817f1c81c6535ee87d3adb1ec484d8c35cfe6981e4d1 SHA512 c1f110811b0a388b792f9d4a9587d397fc2d979e7955308bd66d3f99b8853d02bd28280885c08366c1a82d0a2d8022a3664a19e2e8db5877c5200087b102de76
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 750 BLAKE2B d5ffc49c2c1b4e4efbf5cdd911623f9a5facac284091c5f172b8efb11cd0b26274b26d66f07f53242711090d1d3980ae9ffe04f9ed680bd9603f6245a0ef735c SHA512 569605720925e61aea87c93958a020c9651e22daa93bd580ddf5638e128c36a291582532c48ef67bea615d7acfc27d8cb41196d6c93cf4d9e3e5c926a4ccf31d
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 750 BLAKE2B 66689dec0f7ab3edf9dceca145567a8abe1acbb07e9e3a6c0fc9869245aaacc19e613b343e296e5e76ece0228553c1947cfde31cd1c1edf3a46ab61fd55a125f SHA512 1a4a2713a3551483d8af0a8d778824267d3353f3e2c3a84c1e9c0d44789b736a29c5a6ec8b5562eb6298419b9e637ac14c5d8a4529c049b52dbf7601bcd5f77f
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 440 BLAKE2B 3087e4743f36a595081ecc8957a4c462d64d7723c7256bc43f4385819a589ddb9658ea850a54ab2099d8be9eb59a00aeaa974766f22d0e3bf0e829a45c7bd734 SHA512 a7794ca55c699b95a9b55934bf65fd04b69fcb812cc0a32fd4942290f3c04872df4e4878ee9a428682d2d7efae617cc1c6bfef78d8ad1b4d9e58f946aa3305a9
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 440 BLAKE2B f04cb4d45b6669140eb348e357bd3467b5eed375c5867bcac7ffaab59312c3528b4d226b36263714604f0f3fe675640c1379341a219d978cfe34328ba696fc54 SHA512 f0f0bd0e750a586cd2efab912c4ee39ba5eea60db4222469d84433667a0d4ee10f39653c21bf2400bc9d8b19f1884a8f24ce64b88f7a0ded5ebe2ab2ea90f756
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 876 BLAKE2B 243706954ca6d4bd2db85246121d02e3f035630af8f781ce589e3d4a203ba52cfb8013ff1f0bdffe881ec590bd3255b2a919eb80043f331deb417092418975e5 SHA512 d35f45ccc08eadaaf28f8ad035aabb866755102ece715c8608ea71d57ff2d4ce00ffc9b347cb4835a1fdf6d2ee43365fec89454e70b9a138e47037b0ca2fa455
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 1392 BLAKE2B 70c9acf0b197392e15605d9afb2a15b1495b6ef7531123e3d4e2d646e3b4e566a1600d56ef31d31081259f7e66412fb7f1cc475b40e8fd50e4c069d82035e8ed SHA512 2d74fad16a84c8925fed2d3d08d693117d43e8ac80fc44c7efce08a5d24c64d75f407592edafc3cdac5b02c3cb70404bc15acaa997927afaf72faa4b157fd952
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 1028 BLAKE2B efdf301ec20d53e579fef678842ad5945737b14cc4719fa673cb2f0025f1a66a04643e187657826b709f98e93a079c5dbdd95bf375f8d700acdcd0895b304c97 SHA512 0cb56a3c52455f059dda6eda6113c9271d7d3134427f007dde3dc08144c5a454df222409b7f71e564f4b1e9553d48ae4eae39f18a1f968db87c22bc98cf82f5c
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.zip 219935 BLAKE2B df587a3a757d2594b956d370715d602cfa8a4760c188ac0e543e1755b81e71b486f5d769996e9361089095df843623237768ca40b877236c3d2791cf1c359f1a SHA512 7a92badabcc17fba842801a32c5ea725c3cdecf60257b998ece0e6bab20941f04257704768068156b57f5f7ae2406c389547fb6474284529400689aa64bfba98
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 1070 BLAKE2B c5030256e98674cb4d844341169abb4b875f0d7955905d83cd564273bb08ca760f0bdb8424f0ea000e313fb71561a004d0a83eea6c8d2c0f5d832facf027eb4c SHA512 d1acfe37c467195ac44dda04f4b0ec216f0cd3189e987b4b1fcffabac1f17bf5ad0c0cfbd9ece3821f69f9e17e9e753a82216122c4e12930e59b7b0645c8459b
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.zip 209852 BLAKE2B 0fa4e22419c46e8c9d91bc7bcd09ccbca89ecf7f5a15e73913993a76e555683f27cc15c7db428e8f7be007ac008886f8c4d58765d8fe19b3e3ac19b39a2911c9 SHA512 04d1f83d53cc6d66223d6257d1d7ee8e91f949b68b265e856460be398cbda26eccc25849c50604cd0dd3acf48dd4c4c566fe542a1d1651dc38c1fb4321556f0c
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 409 BLAKE2B 31164656916c13673fd1ccce81042560ab4509ea358bc4c371ff3d371f2e924e99df0e809f872c8bb8b8d22de399a4e6cb7cb3e864b0d128290b40ea2e3fa16a SHA512 7b170354b43dddd5faab455fe988f6255b329533944a00fad3b7dc3528028b6451c91333e3142045453637b8d7c7f06423898d98c45613e83a2d866cac7c3c71
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 442 BLAKE2B ad4c8557d50f00e8377d80bd90da6c18b19960167c66ea0975a931ebf54ead468f505ea1a4d01c1be07b5f095b573f4966c482014bf503f2e6ab91a1f62c4ee9 SHA512 b3a7dd9b33aa09150cc93e0ea40455d8c0e4f078e5cbfb8114d5c6b22b78fffccefafbdb23aeedd4538fc6f0cd4a0da41aa8993a46ee76805805450204056d71
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 563 BLAKE2B d61e8555109eb1ec12929d6f1e0c4950903ef007ec6944deb209d9dc64734e91e98ecbe03424389f4de1ff2559e7905e6b57179580dbf8097eff99f2e0643d79 SHA512 8b16d1ba465c070e8801d3d20f0e1f8ba891a827cf402248e27f7469031a118df6f7e15afe9de98b32c7737476afd43755c3389ee20c04b63ba6f89941555059
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 668 BLAKE2B d2dcf26c5546c6dec9d87436b8eeb58cdfb0f35845b53afca379de3628b7e8e4f00d4808f724c58382c5800492cae6cd08f1e1d4afc311932d2332dfb4ad41cf SHA512 4edd3f333d14031b5ecd1d5d9479b4006c1da5a82a38cc6899534921eb564c65035615520557d35d929ea934118692ef27bece8afeffd18b402485165d774faf
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 841 BLAKE2B fa355e56751841d562e92cd7484a17efe5b1407ebc2a6096b6e364a878d8b8848552610cec8d8d3eb13b697d97ca3a0473cf4a02257d7f50cc379a8b059f450f SHA512 0ccba625b55546a32921dd56a4d5a974c2a5feb3ab514190b84a036a3c89887fa8960939ae8dace3ddb05959d56ad31a91dd6ec71d1eae8e257c977673fadf82
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.zip 199672 BLAKE2B 6e5a5f2376ce7224400e959e59fb3af11e55f42caf899db5bae6e3010a0ce2e8c669d6ec5540b7d5b9c01ef6e0c95d7ac365594fa8f28bbb352a6b8f7a0f6f89 SHA512 2f2a68da72042358ac93e0a8ec985552b4ea10330d461fe0e344d78d0b3ca777b88afdd18a1798634d43b34458f651aa01d1a3d0d4aefb88e297631167ef9993
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 845 BLAKE2B 4a47335938499a393512eb0235fa3ee0830f003780922376dad00cb543b16b4e57cfe3db4cc935d85a7de1705ac02a84ab302ff2f28e2b3c9705a2405314c22d SHA512 aa79a9c98f20e6f4e234c99956eb30e91982f5aba02d834235971c2834d2e636f4bb83ef790433a28222bd61e4da72b39f08bd5c986f652412d533b94d1e27dc
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.zip 195958 BLAKE2B 2a80ce162e463b42efcb78cc9a7978b29f8a03be742651ca9be7e3cf2fae25912db73ef765b8b0b6cb284d1af1d4cf171a178e2e45bc9d7b33fd0dc1f7e74045 SHA512 1d9a18945f4b5e738e1493111dae888193bb5f17e32f8018f8d8195c70bd09d8ca53176866e2e1ce38055a78250743498b83c7ee8e2454f287ab7cc5ef348ae1
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 343 BLAKE2B 1d3b7b391fa6475939fa42d7679b7a50a113438e5436ed1cdbb5ce99a395af70a7d2512931386a71df057b8d553b69473d9307a8d609510f3e04703effdb049c SHA512 a5887fbb9f0200efdba74edd4cd71929fccf81d678f38614b5c7aeff532b05f6b8a107080c5850fe70c5f8e670786413630973899bfd015b5ac39bbad0b85831
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 343 BLAKE2B fca817b173efc421325565fe554de84b19a8bc1bcfc19edefda97073bbcdaa174e2428794831c792e10e6e58cda5e6c4a80af35d4e71e8566184c7bb955b5ad0 SHA512 9fe8a6034811f84c70079b56f5da6cf80bbd43281ecdbb9db8a470e698d7205f9b7e3ff954d0e9f4dcf4f2b7a64bd062baec0d9ec0aee3a153e2a8208c47bed1
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 1010 BLAKE2B 560cf47a1b8f0f7965ae71042b2dcedd13dad6009f5ea33e2b78a82486fcf3f03586c90047ae47acb27954c270a96ee9a5231f15911169946b4f5436f8d3b4e2 SHA512 035e34e48dc84ce58b2bce7745a5f26bf0ee999ff29faa8f175cecf19c12ee46b4e4cab9f4124965fc31262fc62a7287330ff1b18c1973c943a7ef2e0598bb37
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 1055 BLAKE2B 3bbd958137df0605a6383d54ee88ce5f818b5946b9687a112ef79646cbb4ba70a246a17fc6deff72167067cd7e966e80c15cca64964dc338c91cc193d61a88e7 SHA512 410e0518f14762fa18e1c2e5459d0d07792a6089de5e4e012f21098a8f68d6a760c3b445608b328df09150f4ef64b53914fc1ec6ca4953886ad67b7492b80766
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 549 BLAKE2B 7833c4edfd05bd698201ac43118130f482be54b0622dc1c2e5911f46932b5f9e070a5fb54e471ce606ea6ef6cca9755648842c06c0c030a35b5c2747da91d61c SHA512 d6dbc84a6abd78b0eea779e03fc2b46d255a19be15efa2a81b092a3a1eb016a2184717a10658c3db831d9ba64f987a3e4801c8dd8d73fba950ad43aba05f08c5
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 549 BLAKE2B 9e7cf2c4ceedb1948984867d9ea2537e123dfd4ca87e6d94dd83c7d9467200205a1d2b4304980cbebc5ba71c48a5d4d8f44f1ebe3c1ec29fc6126b86f20fc9a7 SHA512 b3e9d41f507bd528cf133fad2e70b586ddd7b0c0a847870101d20d92e00e505911216b50c88b124c87973a4381d32ae5aff3a076b75c7b3995ea48b6c6cd4a51
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 346 BLAKE2B ddd455edb5860435efb7b11300359a533f13385f118707e0733a69af973a1eff5855b4da102ebb38e474057b2807f71cf55fa0314d3bd57614a0e07d577d7bd2 SHA512 12c04db4a65be22adf3305836204cde95fea753c6db6d65a413e0acf3f6d6fbed08180475841a9956d99906fe5ef7f5fee1aa3cf12f1776767b859051098e7f8
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 346 BLAKE2B e010dbd167436eaddacae5719d85eefa2b10dce3a2fe47c8f6b37fcf1522b045da74b8915a5fb4d5d72da7003750939efb136653f28b80ec6750112a390f0a1c SHA512 90c9c92f8e3a76b9223dd6baba27b1d0e12c6c8884c7f46514cd6dd3828743d81715f5f5884c2a08a74061bb5d4ea2f93ec7d759e588613552312106da490156
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 435 BLAKE2B 3fdfda15fa9fd2a35a166253ea9780f58767856d0719cbd06418e74f6fd53e3a41a0c7318e40a2f2883c146bc3b2171f9cc535a02c3333467f76b4a3860da6c9 SHA512 fa7f281708f3fc894906c5150ab5f5705829205cac3038c76a1252c271e7a259d2891f6e9db5ef3e303a00b8ea30ee9015e8589158d7015f19427ad542e3a514
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 435 BLAKE2B c8620e4e57098707a8cd6146e5edf0edcebfc0efdcf134760de4963623428ad9561ba5cd031ffc287644f6febfd002bce1e75af2e3efdb43fa7e798303d026e5 SHA512 5f5082dbace86ec9f25512c26df952fe1ce57306330073f703b708753aff69ca2be3b3a57fcd6779721e2ddb70527f7ac2580037c0e9cf9a7c0de5d830a4977e
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 2215 BLAKE2B 7e32f9c1295dc549cdc3f16c282e125b9359858d75408aa3adf00593c2f9b24d7a65fb3f5a65553abba106438e00afe372c63c97c4100155ebbedc31915c9778 SHA512 c59fe62fb8de18edb943bf319d4ef66b13f52e25e46bfc4d6d0cc6b8a09533e1106de05477ea9c9fdc407c3f1fd1d7b4cc6ea0fb5fe52017c16f2b3a10512c67
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.zip 3540934 BLAKE2B 7655a24cb4fb9dc977b05a3f7876d65171066390609652f7d79961524c56cf190d145af1d46f8c94e6d9ba38c5cd73f5b58a9cad2e82a93347b59fbdd26670c2 SHA512 d0899c7911070ad7c24fa4326c5d4a0fcce8588c10f915edb1baa8ede7a5d6d798af5a21aaa7349e92216f45bda46223b18d9602707657683acb2b1afc52da8e
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 2148 BLAKE2B 1dcbf0091fb62b4ec13441ba8c2ed4970196c26371552d2b8eee4a49c98e4ae8c699cf422b021cb23f611b63be9af551540a23f851258025ab745e91bdd10d3b SHA512 f1f7cd36b1a47cea2fae3a491f4d4473056ea6ef93e4ea2a2d8d97f72280930e4173f4424d806efc1ae747d364fce3c3ec8f80f8c6700abc82fd229ed9e23f08
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.zip 3519135 BLAKE2B d4edecbe62c45ba196722a43ef7216667d4ece525f07e45e74833b1dfb539bf5ac0d90ec7363bdde81f8fda96aea666ecba9451b814a0e2ef645b6341c5afbd6 SHA512 101fd930d70c67435085eb414d99f36a5b589384b5da80b41924b450e046d8a2d4b7fb632e366458015722b16bcb939e881523ff491bbb118504f5795f7ee6b5
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 549 BLAKE2B c788ae3244204269c3ef217bf51db247ed552ec49902e95840e136c161f3b50bdc648212fd0355bd570e027beb259e8c7b5f8fe04e5bba4521907827980a40ef SHA512 6920f5450419ebfba1d1adb25d46e29c9849aabbc19356f23c1f1bec023b146902c43752d569e7faaa270bf3e81b845f74e5b1c695293ec5e0699031cb8bcaa5
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 549 BLAKE2B 6fdd378735729ad4bc945b2eb3b911e7f568f21e125b69025409caa59094af9c0ebda3e916397064fced7d084e24baa6be034ea8e00e553036f46e25d58e92f1 SHA512 31202dcd64c4c14a05d2bbcd3b02ad5fbc3385cd2c743dbccfc5fdb142085ad3da7a0c956a06c40e9986a010a7495547934f8d8ee2f28853ad0533e433413cc8
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 1854 BLAKE2B 07671b7d28a82b56c7eac824972694eb144a30946f9e89ae87bb63a8db918bc8ecd6063e67927882f1409dfe0b500fc0fe604d02009f81d29d114aec25d6f456 SHA512 2df73115b0abe12af11458c5d096b97d67b010873b7990ab5b6e09bab406a38d1dd697e78e799bba178b5a03216c19d43316a4fe5bba17e614a9a41cbf1864a1
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 1900 BLAKE2B b22024e3ca3df6f14c005b57a640ccfd10e903a5913d1252fcc209166306ff755ca28c2509b1aa89d207807d48556bbf122a83e737cca603220e5a82bea1b219 SHA512 f3e13a01f36841328c78cbc7b1d75bcab94ff3771dc13da7ecbc99df356ca96c9079568bbe9d5a1bfa2b05770bcc68fc15171eecf856efc447b4b763975f748c
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 450 BLAKE2B 5102853eb5524c9578fa1c4ebc7005a3cc0b5003d19f43a1b2ce2cdaa6bdc829bb01a3d9183ef8bcc82fe2bfefd03e9659184c31499e487857151d96b6651aad SHA512 e203d21e78663202206d569871a8d9c0650f0095ce8aa8f1b469300f53717387a252df3bb21f0b3be20aa1c1f1b4be6b7b25c7a896092d90407fb030b9a2da78
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 450 BLAKE2B 85049bc6640f2771f6cddd47c8e092a7956fdb1e254f1a53c6f2f05942aa6e248b3335cb2f4b9f7ddc68286ae71334ab2f57c69fe4e83cfaf3462837b8bf07e3 SHA512 46b26bb2359cd018748a4f974fedc376758735c9661b60bc4f5338a077e193cf7ad01842b92db0ffab2559d700251839f794bb3f1082443ff24e12e511a7148a
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 361 BLAKE2B 6c5fdaf96383c5b8aee1fa81709174b5596abdae6b8935f51bd8a1672fe0950fca8f1b3225f157ddc7c31bb82dc6d422b5e58bdcf2d348c4cc0d24c5c85a9956 SHA512 5f1bf6bba66fb329798705fb15a5b204785f2a0c70fa601d50696d6d6342afcb23f0a2cd454a5242e069a31038b87722526b43caf0869ed0f96f24809c38f6d1
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 434 BLAKE2B 8697e372cc9019f1cd08171d892b3a09faec2ab120c2437c12b5e5e5a8cd8c933ee7b60becb8e9aeec17e8dcb19a726dbf3461256ae4c1f04fa767017f387725 SHA512 6a46c7fc62eb5bb4b9c32eea029ab91f80a61000a5d31c4923463151d06b9779b02528f6594a775192f656df084d63dc40c6731a89f56bc7491fca8b6b68edb0
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv0.0.0-20201204214525-af46c47ce925.mod 701 BLAKE2B 744ff5c672dd1795658a0bb91d06a50208a8d5e237e831e7bffa81564d4360627c1d9a3682b3f5d1af4ecfa47a44ff5e5f2eceb56b17da87530a1a7752972ea0 SHA512 86fd9822e775576cb7d9f7a98005badefe1de2a0560b7ef48134d2eaeafda1eaeb12194da03a33e2c3bc85ce2e5601998c016b5e3d2023cb0f33e805d91bef8e
-DIST k8s.io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv0.0.0-20210408162405-cb303e613a12.mod 701 BLAKE2B 71304e81b1ae3f2b25bd1e5fb3d411b4f18da9d3dcd8d9d32e29badac09af63c8d5a5c9f96cf4331fcbfa50462e7e1a31f3964172083bb2e38c627d4c209f74b SHA512 5022366b2962f47b47634cb75fc413636a7cde9650b78f92fe4fcceab62d5239a0c8e2de00282cb8b4ae2feff2f678aa136a7c8dbaea01a323c70ffef6d46d85
-DIST k8s.io%2Flegacy-cloud-providers%2F@v%2Fv0.19.5.mod 1831 BLAKE2B 28706cc4c051061ee5b4559957d04786caf77d8068c1e879d03a4a00b1c772655cef4d6a3048fbafbdcfcb3d8ab073af68e5f2bc014dea62114a3e1f13da8fbf SHA512 c4f72feb3efd556bf169bed2ae464150a38907ccdebd11df7e022457f9f07111af759f65b5ed9d30580410a1c25fb730a6ff1f190227c8c104ae35141a2ec0f4
-DIST k8s.io%2Fmetrics%2F@v%2Fv0.19.5.mod 472 BLAKE2B 5cd6b502867fe5354384a89a2145aba205d3da971dd4f8c2372907b0bfca87bf557b657a87cfbe0235926239aa509a5fe7fa44d07633afec5634074980403689 SHA512 060b57e6f94e02b891e8b7c0539270239ee84bce6a67a27b768b4729055aff15cac6d8f243a67aacd21068bdaff2927cc2886695502f6b5c303a2f6d56754dc0
-DIST k8s.io%2Fsample-apiserver%2F@v%2Fv0.19.5.mod 730 BLAKE2B bc68578ea7eaaacd8a8454fe03c7ff651fcee073c5f5a35482433a7858e39e28645166de93784c5b102f04f3f1d9651eacf33534a9900a1ff83e7e57bcbf7beb SHA512 a045d0e4b78d8dcd9346dc01fe2b1f595b33f42f4f244749d4fa44fc95b6ef7f849ededb33588d140678e3309bff4c34e2f045a8c821b23b16a5351935cb311c
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210421082810-95288971da7e.mod 1094 BLAKE2B c981e557b03691e1960ddfa12fb8a8afffa9ea0ec150e47514d1e7b3b0fe839a6df76c092d0526754da9de1b291297f941b811a79bfcc5c44c6737ad9b9a4e9a SHA512 dd02de0ceff6a9e1cfa2583f527b65a3c7092fba0c5cbb193e2dc050e7b934e2146b6a170a3f912b69c6907906c58600ef584ae8e3795646eefb3339f7ae64da
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210421082810-95288971da7e.zip 1030871 BLAKE2B 02fe07b1e800b5b3b6f6a6c7bb96da0c5e0c22f03a53f07569c5c71153758e16ed4eb5eb717a71892d2f4552639f6dcf3eb5ac5723690b9f18eacecacad7b55d SHA512 1e40b32d9b6b25a3b7b84fe9a8c1f8e0c6b9a32486dd63b46ed793be192187f619a6656adac80a5fa6d43e903535599088506808fa54ab49a2c712209027f236
 DIST k8s.io%2Fsystem-validators%2F@v%2Fv1.1.2.mod 218 BLAKE2B 48a47d8e555ec46666f816859a07c4835f679a65fb731ef1258a061ffeca990a480aea2f4e813db71dd2675715c28f794eeff45a1223b21fa76e0596399b4484 SHA512 503a01e6ff8a84f0e4ea9901aa8cd246ff5c815ebca4b6e42d0f6386be5370b9e3f3df5f3f3fbf6cd5fed0f2b0c32ee4ea0253b90318d20f4f05a3b441ef73b1
-DIST k8s.io%2Fsystem-validators%2F@v%2Fv1.1.2.zip 53081 BLAKE2B 6a7ffffbc4c2b18eaa0a57c9dddab62f1bcdaf0517aa63cd0ef960e873994172c4a746df784d3bc75d970b4f78a8124748119891792d48abfb8de63cb1663fca SHA512 4bb2e7ff01e7979e67fe8be38307bf9723bd85f9c856ddd3279deb180367900f0378121484c19bb1c23859880a577065b8bf6c5501901d02b569451cbb4138b6
 DIST k8s.io%2Fsystem-validators%2F@v%2Fv1.2.0.mod 218 BLAKE2B 48a47d8e555ec46666f816859a07c4835f679a65fb731ef1258a061ffeca990a480aea2f4e813db71dd2675715c28f794eeff45a1223b21fa76e0596399b4484 SHA512 503a01e6ff8a84f0e4ea9901aa8cd246ff5c815ebca4b6e42d0f6386be5370b9e3f3df5f3f3fbf6cd5fed0f2b0c32ee4ea0253b90318d20f4f05a3b441ef73b1
-DIST k8s.io%2Fsystem-validators%2F@v%2Fv1.2.0.zip 53597 BLAKE2B e0d3ceb2281fa7648c50af2ba6265a9ed8b8ee117b4d7055c1e62268c2a002f248832694af363c296b6083cb9099ae44a81a154602e42c91c2de08b9622b7be1 SHA512 15f14cdf98a6c1c8bbd85282ea55c0647000963d004659378a187850a66f118f263e5634de4a40a7aeef5ce983b76ef2cd65289bdacf1ca4e35da2fc753604a9
 DIST k8s.io%2Fsystem-validators%2F@v%2Fv1.4.0.mod 218 BLAKE2B 48a47d8e555ec46666f816859a07c4835f679a65fb731ef1258a061ffeca990a480aea2f4e813db71dd2675715c28f794eeff45a1223b21fa76e0596399b4484 SHA512 503a01e6ff8a84f0e4ea9901aa8cd246ff5c815ebca4b6e42d0f6386be5370b9e3f3df5f3f3fbf6cd5fed0f2b0c32ee4ea0253b90318d20f4f05a3b441ef73b1
-DIST k8s.io%2Fsystem-validators%2F@v%2Fv1.4.0.zip 54176 BLAKE2B 06c1369751bc8f41b71856e580721b217b82063c4d41cd375f303db5a626a0a5938f5e5cd95f5baa8510505c22c349c205e4dc4657d99614c714f753af18ba98 SHA512 ff12ad5f651b0ad575bb7e1952a991901eae8f26ea8debcc8d3e083e65798bbdd91bd8e0192c652004545cc2c358145a847d3d0d818d8af93ca8e915c7d126f0
+DIST k8s.io%2Fsystem-validators%2F@v%2Fv1.5.0.mod 218 BLAKE2B 48a47d8e555ec46666f816859a07c4835f679a65fb731ef1258a061ffeca990a480aea2f4e813db71dd2675715c28f794eeff45a1223b21fa76e0596399b4484 SHA512 503a01e6ff8a84f0e4ea9901aa8cd246ff5c815ebca4b6e42d0f6386be5370b9e3f3df5f3f3fbf6cd5fed0f2b0c32ee4ea0253b90318d20f4f05a3b441ef73b1
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190506122338-8fab8cb257d5.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
-DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip 147166 BLAKE2B a9d5897231997c8184aba7c58d6b31fa8413d7c94e48f52fb59f171f537d0e9a047055a5e717e411c7f0dbc63bf1794c2a425c278724eeb73de59e7bbd8d2ee0 SHA512 49641d1a253a5469d9dec1e104b5ecbd7033e28f8ab08c351edea432687fb1bf902d9fbf3ea2ef217b82ab06ca3f2453a1dccf03468d38281c847e19477641df
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200414100711-2df71ebbae66.mod 167 BLAKE2B 2a61747d367153284e7e614a82f98c8913693f3b51174c24b7f25d8e9d236418c4da9e6b33c7cdb7b4350314373037e1e7121ad7c0ca5fbc9a3b4b711a078a98 SHA512 1117d2493d40a111a749b0033c92876773242b86da0b437ba063e5da21289102d784479b0c757ad8ce50de4b1d8a2f6956afe3b2656977bd76bfab9f97c1d8a9
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.mod 167 BLAKE2B 2a61747d367153284e7e614a82f98c8913693f3b51174c24b7f25d8e9d236418c4da9e6b33c7cdb7b4350314373037e1e7121ad7c0ca5fbc9a3b4b711a078a98 SHA512 1117d2493d40a111a749b0033c92876773242b86da0b437ba063e5da21289102d784479b0c757ad8ce50de4b1d8a2f6956afe3b2656977bd76bfab9f97c1d8a9
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.zip 159296 BLAKE2B ab5a7b0347d89585292304e4ee3dd6681cdf40f1deeccf6e747c760b9b9a0e1643651c270b181a1c141c232ec76fe4a4a256fc9c41d0b57b628a7d1ba2f17bd7 SHA512 e4e4274b6f38bc9a9a0043e86130fc9c79949f80c341c1cc300b66b0741e4e55eee589280245df7d61c5ea2d4969b914b66a1582d53b07cb0922f8796eb2ae30
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod 167 BLAKE2B 2a61747d367153284e7e614a82f98c8913693f3b51174c24b7f25d8e9d236418c4da9e6b33c7cdb7b4350314373037e1e7121ad7c0ca5fbc9a3b4b711a078a98 SHA512 1117d2493d40a111a749b0033c92876773242b86da0b437ba063e5da21289102d784479b0c757ad8ce50de4b1d8a2f6956afe3b2656977bd76bfab9f97c1d8a9
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.zip 166996 BLAKE2B 210f1ba6f4b371b8216157d219b23dfada39ef76a86152d10dd34673bcd486dbd93802b1d610e31c4ca794e8d2eb1744d77e84adde09277c11929937d6631410 SHA512 03eb8ba4916ec58144deb1a10f47019e127a688c7e3f87b3ba6fee85a2c41b92b6d7a9293c6bf8921b33f83f8e46be019fd4751fe6c1c98cb83a6080065d2b51
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20210707171843-4b05e18ac7d9.mod 167 BLAKE2B 2a61747d367153284e7e614a82f98c8913693f3b51174c24b7f25d8e9d236418c4da9e6b33c7cdb7b4350314373037e1e7121ad7c0ca5fbc9a3b4b711a078a98 SHA512 1117d2493d40a111a749b0033c92876773242b86da0b437ba063e5da21289102d784479b0c757ad8ce50de4b1d8a2f6956afe3b2656977bd76bfab9f97c1d8a9
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20210707171843-4b05e18ac7d9.zip 180186 BLAKE2B 63be2ca078d78c5f392b3fafbeb8e6b025d19bdf7f53abdd0d41803358da944bc1271c0cc8e4bf6a633d2637d67d4b5e69954e8bff6e22c8bbb279854d8babf6 SHA512 dbeb5fcaa17a3c8f4ce955314f86e70f5eac4e8a25eb7ecfd690b062d0ed7311eba1ced273f570b9095562c71157c5edd435020b8348ac8281decba0293a6feb
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20210819203725-bdf08cb9a70a.mod 167 BLAKE2B 2a61747d367153284e7e614a82f98c8913693f3b51174c24b7f25d8e9d236418c4da9e6b33c7cdb7b4350314373037e1e7121ad7c0ca5fbc9a3b4b711a078a98 SHA512 1117d2493d40a111a749b0033c92876773242b86da0b437ba063e5da21289102d784479b0c757ad8ce50de4b1d8a2f6956afe3b2656977bd76bfab9f97c1d8a9
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20210819203725-bdf08cb9a70a.zip 184880 BLAKE2B aaeb7f1d5ec4411ffc994533c17662864f4a235df7502ee0e978d29366c708166a057960f71c85164c5a659fedf8276d591cb5287c323f03d621aa3480d7cefd SHA512 d28549c6c7c2494b41664927990e59855b61bb1979adc609b76af16f73314f67a2e05855f5e61b072c32f14902bc4fd5e47577754572177a06fff84255ca6a94
 DIST modernc.org%2Fcc%2F@v%2Fv1.0.0.mod 22 BLAKE2B 26488aa7e4d0339d58279e663998091c24b5a6d4d026ea71166c06695034ffb5011d20f49c151c6a41481c6cb5648806ae5201bffcf4e2e49b6e7ec9375d9469 SHA512 22847329a9a431f222a2bde9c743aa5d76e737e2535b53273c31cb641c89fa4b73e51de12f84fb6da532b060a1daa084c5150502e3ab4e311eaff351f10617fa
 DIST modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod 25 BLAKE2B 5ae90f4bebc5486b84fbad78cbb9e747a2b1710805a35eefb93fb5f860c7850242067bf79c38a7a076f9f5823995cb4a2fa0120491258cfee9e87fd5996cbbf2 SHA512 764e7459060a8e7e90c8b8714926cb8b1eeb130789d1d89eb52e4dec5be83298bfe03647720c0e84d5aa9cf293a38f041e1696ccfe60a87cd1ef7316190b41ac
 DIST modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod 28 BLAKE2B d93ac859fd33dd8b36dcb992876edf1470206d4a455f6dbfc3a8be76aa84cd3b1a16a12e23d857b090ee5b18ba51441c90bc5d6a4bb35430193d7f99d61a3725 SHA512 53b0f0324ef1cc51f322d535b2199362be3962aa8e2d1c32b0c58da2fd4f65f8f19450089d78fc58aa89ff5903500ae2cb60ba38d89373c9f58f075db0ba80fa
@@ -2250,44 +2251,48 @@ DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8
 DIST rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod 18 BLAKE2B 02f32b5a77e5009f179cf1fdc9acbb977fe219698f19ef41acee8129e0de7ad93b0b39ce82ac1538c82a7cdd33776e270f0acec114716c791727b021a4d3e147 SHA512 f911a889614d9177295952c82f8b4a0942fcbb7b4fca7378c0b98a63ed0e37e1319d51905f906ad08144eb0f3f829a2ccc2af04c2147e60cc2ac1ea8d7dab16f
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
-DIST sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.14.mod 175 BLAKE2B 62ceee8603e76513f82ac240141baa2752978c96b7f2d28dbd4ad5ea9136751af8baa7b0ecc539b22a5ec427446b091f2d33826ae7aff25dac6eb8635ccee4f5 SHA512 0d1d2566707d1ac2927404c5d08e75d4ae9818085c0a156ca81422a688575f913723be6ed07faabc3831fc467ae5e7a9f3d90a2609dbb93c47cc5b230f64ec4e
 DIST sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.mod 175 BLAKE2B 62ceee8603e76513f82ac240141baa2752978c96b7f2d28dbd4ad5ea9136751af8baa7b0ecc539b22a5ec427446b091f2d33826ae7aff25dac6eb8635ccee4f5 SHA512 0d1d2566707d1ac2927404c5d08e75d4ae9818085c0a156ca81422a688575f913723be6ed07faabc3831fc467ae5e7a9f3d90a2609dbb93c47cc5b230f64ec4e
 DIST sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.15.zip 20217 BLAKE2B a1cc180c036cf5a998cd20016ef2972d9332e74342c69238dda31f9b992260cef9a13563533b28bf4a7c96171301af760cc8864b406fec0449f9c6eefd222c96 SHA512 d35eb9cce69824e8c78b953b791e5739c9a5f01e8d74034d31db75e53df3390b4f35e3db4537df11004c98761000128816ffc0819974927a985f24ee61fdee9d
-DIST sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.7.mod 172 BLAKE2B 76dc350439e69f75cfc082d93ee6649320fa8e311933db45425d4489f0ea21aeb8c1342b13e86d1a40c092788592e3d31e55cb550f05a3079fb60dc87f2a739f SHA512 ab153a98f7ccba57905e02e1bebc462ef2e3a86b459c0cbf8d346a2aa8eb044fd474ad2a267dfa2421d1b31d51d6db6f1ba9739cfcef8ee8c02bef554a39a40e
-DIST sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.9.mod 175 BLAKE2B ccd2f996c760ef71cc2cb1f3be5807c8a383349098c377a8166a5cbcdaea1636b41885ed80363d7775aed1ecfea98b8cc0ac01a55490cd8c7acc0ad900263b99 SHA512 d0b7eb24128a3fdfadc158d499e1b7d1ca593ce05b5eca6fea17855e06a3ca1f22e00b65f256d1f9b312532caeb1aff0c53c8a1477b780fffde0bd616776d68a
+DIST sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.22.mod 175 BLAKE2B 62ceee8603e76513f82ac240141baa2752978c96b7f2d28dbd4ad5ea9136751af8baa7b0ecc539b22a5ec427446b091f2d33826ae7aff25dac6eb8635ccee4f5 SHA512 0d1d2566707d1ac2927404c5d08e75d4ae9818085c0a156ca81422a688575f913723be6ed07faabc3831fc467ae5e7a9f3d90a2609dbb93c47cc5b230f64ec4e
+DIST sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.22.zip 20568 BLAKE2B 1f9881460d7d8d2c9aab4e4566a75169a02d4093ae96b5f9b0abe4abba9c66346d095d7e47bff4da10c90138224a1ef5e603279c4a5e8ef64a24e93cae30e087 SHA512 3e77d7339773a1d54e785a8dae20969565537fc3233320dd2962a506d9d2bb7633debbd4db6e0efacba0f8cfdd9fcc831ecbabd9e4cf9725bc823316b4b908da
+DIST sigs.k8s.io%2Fcli-utils%2F@v%2Fv0.16.0.mod 802 BLAKE2B 1949db64559f28ae404a69372c6cc48b0b6a92310900c92d5808c1d5a7268b17a0e3c5f02cc4c7edd95384bf456d0947da4cd2708e0fbc8cde73b0177b591740 SHA512 63bba52271ca2938cca25ec2d576cdba991892ded0238f26f8eafd2a1d6b32f10a2c83f1ff6a9ef64a43df1e12e9a61a83de001ab0b7574650702accf89038da
+DIST sigs.k8s.io%2Fcontroller-runtime%2F@v%2Fv0.4.0.mod 1175 BLAKE2B 208a4c35e64da0492e8e971aa4d2ee57f7645f304a425d46b5c90946c5488cd5d470eb0aa3772abe600da03bd95572e13d3761c25f34a713cb9641953d32440f SHA512 52f051a02b22665ce3ce7d0ab638e519ba35aabf777b4ceb2fd04384b600e3b24f7a373612517c9b95debf88406011ac80f79db82a9bd4312a868e4a2ddb4bcb
 DIST sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.mod 29 BLAKE2B 6dcd5ffe918a42923b91bba22b5ed6da6b907cdb47dd93a471841ee92776606efcf74a0a788f188271a45682de307ac68cf68cd52089cf0398282256e3ef44a7 SHA512 2f557369d03b9991cb84462ac25e6fe937a543cae729e6dcdfd97d2e01d334d42124790442eda51dd1c87409e74d4047a523c020e4a5bf8b773dd065cd94bb69
 DIST sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.zip 486035 BLAKE2B 9ab10ce74e3017ff57247747bc215b01c3da80539687369da2e12653c83a2f5336bdaec76f6ebde44187bade73372878578302f51337bc2b321c5b76f82ddf4a SHA512 a7c6ea8f2e9f5b321d4c9c1f85bca3e27a9ffe72a252227022299ba1f54634a93a36d021845ea6ac2c939eaf4e02edf345a70b740a124358b7f26b90ed0d2177
-DIST sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.8.5.mod 511 BLAKE2B b9d639e0b55c775e31dc20931b0065208a0060941ecefb66770873f30d8259c7eefb6394b79b4892b87c5872d57155471b1a4c1dd94182b1382d124d82d4f3a2 SHA512 006fc48eecd8d2f63f7cfa3b4110dfc36ebf4a06ed9fb69b7c2482bbbef7525097719a881f8c94f38bb4472fc4ec28868639740f2ec6028ab94ce3f515f4aac1
-DIST sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.8.5.zip 655319 BLAKE2B 62deab157e085f1d7a2b3791b8b8b5143c52b6c87a321e114c3050715e884f540f5cc28485ea7674c3f7eab4c7328183b66fa397db86a2ba04c20716294f060e SHA512 d979128df8533d47a675a44df2e08f995aaea9e89979c38c9ea01ebd0879f2470b74951125f1307a9293479b877fa84a2ecb48f1dd2adf4622e968c6def65214
-DIST sigs.k8s.io%2Fkustomize%2Fcmd%2Fconfig%2F@v%2Fv0.9.7.mod 676 BLAKE2B 6321d553f874c9892ff1ac7cdf8122272a941f9eae863e7dfef849bb1614891309c677de847b6d518bf112211c366500098aa9da8a43d8c3a92cd5476215d02a SHA512 837d325a20f065e2fcde2aaa8283a312319b3e9b7dc75a48f0e14b714e8b4a65329bffe0b4506e6a3aabb658796b380e74a17d4a3c6625ac28e9c018b6f33e43
-DIST sigs.k8s.io%2Fkustomize%2Fkustomize%2Fv4%2F@v%2Fv4.0.5.mod 415 BLAKE2B 0d51f6eaa0de1fa550a5ff65e44a3fdf2ae5ccd14681ea9e12699a16cef41e60152c82017962fe027c4c42196456cc4e7607316626f30bbb1bb1875dc7f67079 SHA512 2ecf33be8519911f9e679542e5cdc33845270f4a92b1b25a9f317c13b83d12f07f0d05d1768ac7c5add61ea242d39d2048da2e4d5c714319e8248087edb6ae85
-DIST sigs.k8s.io%2Fkustomize%2Fkustomize%2Fv4%2F@v%2Fv4.0.5.zip 96573 BLAKE2B 7887ee4e0543ea5a62e3d69cd4edb4d79b7002ae150fad5ba5724371b5ce41143c1464e742cf0c79f5206dc92b4eb45c5794285f1b19f5625e9c30a316dccc3a SHA512 51b05216befb307e6c656666a44ee9d52fd2de90c814289c30bd8c213a613354490344fddbc461e0731a01896d976f2418f05c0fa0a07150ff02a087ad67a0f3
-DIST sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.10.15.mod 1837 BLAKE2B d001a9b27ba0233aed7e76fec8720c1f5576d7c1b03ffce811ae3f39ee2f14d756e17e08300a5a51dfeb3938d5af2897034b3300560b2100b29fd3d1f84a9c10 SHA512 81e1ae49dbad9479f9a1450a0cce5760068cd35724bd1557a14920a93dfdf9f27e00af58b38c0b7eca79849561713b4cdbe39a37e081dc9b8554f626645d91fb
-DIST sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.10.15.zip 984235 BLAKE2B 97016ae27f28a03a9cb93c28e7713dc2b575338ffed197999abc36a26d5b19208430c566e6557add86186138c4a90d54dc15b0258c466052643116b96760f79a SHA512 e9fcf41ffea894a3220e663da5dfb4fbedb67ad55e6decb85c1dfa1128997d09f22e04fdcb704a6c88ace43934dce1cef32a8777866c3118521941fb8156750f
+DIST sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.8.11.mod 445 BLAKE2B 6c70facbde87fab9ffb01f4d2c8d4e87e2fea16a03224cbabaf8c14a69773c89ef0b7302a99973516837cce58818659296a0d72032e59bbf49889262295a63fc SHA512 ff9cda59632d8123cc4df24c348c8fb511ca14ce5bddb6bc57ea775404fcf989df4dc2e63af99c2b353f15566296168bfc7fdb8f3445dd13b78a8d914e6acd59
+DIST sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.8.11.zip 384343 BLAKE2B ebd9de9b4c0597c36fc82c761f6e76e9150816ea733f838cd0be95bd1b51c84bef0baacfabd54a1cd60c2f4de8262e58eacc330e1d7653ac7ced572c6020b5ab SHA512 3b8630787acae62e3872c9cc555c415b146992870c54e6c877a141e35cdb90d1861a800b366b3b11c78e9a2bec0911125959c9dc1757db275adac2958a539b0f
+DIST sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.8.8.mod 425 BLAKE2B cac0bacb6dfae160e8c09f7cd1b5da91b7a3faaf87c1bbb8d6c7ff54ccf5b8a25bd6d079909a7abdbddf542322e955b67cce915ef7a723fdda3b3857d619b9ed SHA512 7fc2ffac71c68ee4601b7764796fe4d4f531a7305925d54ff4766065b20c5d1f30bec84d2b1f63bbda5e42e20f12849e233c42da487f24048cd9a22a276f7775
+DIST sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.8.8.zip 394515 BLAKE2B 56abc256ff14581f3b5fac256d364a7f5c97b0f13ceb40ac0dc08d2aec991436e4c6d4c06a2809886043628e93f20a49e264062ad01041c5228709a0a87bff45 SHA512 2166c4dfaebceedf1d4d061ea339ad488cf97c20df7697217a9568bf2a899a48c6f7934fc364c1c2bcc5f5bba84ed73c9a186c31722ad56c8d8a4fb7531c9720
+DIST sigs.k8s.io%2Fkustomize%2Fcmd%2Fconfig%2F@v%2Fv0.9.10.mod 676 BLAKE2B bfa883354607aa22e98841cd22d1b736e3bd803a264ca7ccc4dd5d0e7497d6ffda14e6a3694a0d2de9e6aad355dfc89ae8fb209e2616adcbae74129198e8fa99 SHA512 5efde4a9243993b903d2410230a7a746681e3b01aac6dfcc9df932dba0628f28713ac15a833f36eac46bad80920123cd23085be6c526d95befbd3021086469c1
+DIST sigs.k8s.io%2Fkustomize%2Fcmd%2Fconfig%2F@v%2Fv0.9.13.mod 695 BLAKE2B 8e71a705539840fe0ab4b1069ac83909926bdb50f0d7e4b08ecd259bb2826cb0a8d5f2548e1d6a6948dad5394c1523e7ecbf6c0d4a333b8f81a643826c270238 SHA512 d048bf31c734c27603500db90061c5caa1627c1b7ffb935a9b2db36fab06f4584ad2eaaac1670e00c473e4dc99bbe5f487b1997e2d3331f5de6f14bbdd942b92
+DIST sigs.k8s.io%2Fkustomize%2Fkustomize%2Fv4%2F@v%2Fv4.1.2.mod 416 BLAKE2B b8ce2488571c5e218ac0641899c1b0584c4dd447f1449af072bda2439950fba6d3531df8605159dcd0ee8ed54ade7029f8a2d8c00b469390ce19c54baa1f067b SHA512 db8dc8ea89f3589d6c38cb255771ee9cb02d5c6c3a456b0c50a6a4a9dfa7fd23cb8b0c7f50e9924ebd2a388408c837648618afb325a75a372097b9ed4a625438
+DIST sigs.k8s.io%2Fkustomize%2Fkustomize%2Fv4%2F@v%2Fv4.1.2.zip 96891 BLAKE2B 3bd1bac3583c0a5eae37047423363ab95c5eca340b7eadd3a3872fe2dc9c9e34651a63443a20aa8d7f084f54e94ebef7563688155ab4bc5de872646fdf9956f6 SHA512 8d1d6003afeaf84c065f8d2d4514f6eb11c92919624122657607dfb52e86dd73835c734277d015226739b7f95f60248cdcf7615f5548d839c4f522c85bece0f3
+DIST sigs.k8s.io%2Fkustomize%2Fkustomize%2Fv4%2F@v%2Fv4.2.0.mod 452 BLAKE2B 2aac5d7324cb6f968052c1e496998097d7b7e01651b52c888c2479ce1c681a29719e52fb68e951f6d89f8fbffd3e374c7143b75918ea20d73fa5c88a7ab55479 SHA512 502b79139988564e9a37b9643e5f38ad300246baced32610b7bc768f886224c2103949ebd9a35c26b858b2eb76913452ef00157fa53d30e8dad29537edb7187c
+DIST sigs.k8s.io%2Fkustomize%2Fkustomize%2Fv4%2F@v%2Fv4.2.0.zip 100952 BLAKE2B 5a5c043139e053d47bdcde227edfa037e73107e29bc7ff926e5b3aa1df266198f493b0bd59640a6cce540a72812a696c70c365a638642496c037fbd16e3580eb SHA512 94a5411fb9a5de83b34e776b2f2b3610c9d4563483a23fe59eca7d799c7829a4679da13c0c53ac2e8d1c8a73b8fa654762d82478553df25f2030f913cdbd1700
+DIST sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.10.17.mod 1837 BLAKE2B d001a9b27ba0233aed7e76fec8720c1f5576d7c1b03ffce811ae3f39ee2f14d756e17e08300a5a51dfeb3938d5af2897034b3300560b2100b29fd3d1f84a9c10 SHA512 81e1ae49dbad9479f9a1450a0cce5760068cd35724bd1557a14920a93dfdf9f27e00af58b38c0b7eca79849561713b4cdbe39a37e081dc9b8554f626645d91fb
+DIST sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.10.17.zip 988366 BLAKE2B 5ad63af91eebf56707d84298ccfd824d14d5db72f5615091e5ba9f8b4c7a53a354b5e50001b15ab1e15a8954741781816fcdc230eaa6943c16ecdf4dc638cf11 SHA512 d63edd4e79b92893c3754c09a9bcf18a60d80f0732b75b48467f41736a7480748b4befb0f5f41169e3dde9c23347df087f55ec406acaa79f22678ea74067a43b
+DIST sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.11.0.mod 1836 BLAKE2B e52dbbd0030c8e000b65b520851f6e1edba9461083cbe5ae6b9ed746a147ca971a89343b34d5096513ab953b5bbd54012c1c19894f1d85c8e2c32222c414717e SHA512 8a9ba864e509a3e982575121ac91a72522671efbe701d2e15a96e8c56695f55dd00d599838ea5bd7a6361e1c342c69a782f5fbfc8b336854f6d21db8746f5494
+DIST sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.11.0.zip 1143820 BLAKE2B 486d381c779851b95b4980fdec25dd23ce97b9b0258b2fff6c1ac38887ecf324ec277124824e7b02a63df97f848119ed9c4107412704eb953d24c5fed8c35bf3 SHA512 fe9c4e27b43e9157533b30bd27e77c657722fe74234037c667900db3f76ce397fc9ecc7eabe5bbc6e930b51dd924975b2a5dc319a61b0a8ce065b16ebfc411eb
+DIST sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.4.0.mod 694 BLAKE2B 5f6dbc8c1d6bfd9f3e6e8c55fbf747b0250b69fdb4f7b24fdf55bdb68fd8026fffa82379c425519937465ce9034dd3e4431423177947add877782f9c049ad825 SHA512 06fdde309d5db933f3722fa8aa08460777023c99fac6f33a752436e5a58904fd556b53e9c731840736439ea920a2d89140b78c8c5f34582fc80af45be30636f9
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190426204423-ea680f03cc65.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190426204423-ea680f03cc65.zip 112765 BLAKE2B 3f6723f90dc65f40d1ede7872ef5b44abceeef759d14a1994d436efbd026f274550513bf8fe0ced0d3f6c279e525787358319e9266adf80a9136241707fc4c82 SHA512 fd5a4a870e96ccd0ed9fb4da944323a1b249dd11f9b0b7e49239433f5f1fc93d6eb379a5201b6d8b1885ac6843f217a0d33ae06f8706455774f1c6b7e7335fdc
-DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5
-DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv1.0.1-0.20191108220359-b1b620dd3f06.mod 334 BLAKE2B 920b3fce37af000b4956b9eac7782f6000b91ce04c93fd67e709e8347d4e13b63d894b2c762d927940978455c6fe7a9b02f643f5050218a749a7fe40a28458ca SHA512 58b3f092f22d417aa0fdbc3795f9dbd244b63b9f888b51b335021402e725a9babeba56f101337f5726185b031b3400e3b022e4d76e3f1debaf5281d4360add42
-DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod 298 BLAKE2B c8069652ef0558d03282ef0f8444222d09708f1dcdc1ab19ed698d7acfb8d3421d9d9c9d053f3060848673d3dd30befd94c09b075ced36f79bef28940e7b351b SHA512 d153dd32bc1485e17771bad3142f576d967e0986702050431a656eb990af3bbfe809542745ac7752c0d72e6beee78bf3c285a4b41b37b8ebef50ecd7b3f53f8d
-DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod 298 BLAKE2B c8069652ef0558d03282ef0f8444222d09708f1dcdc1ab19ed698d7acfb8d3421d9d9c9d053f3060848673d3dd30befd94c09b075ced36f79bef28940e7b351b SHA512 d153dd32bc1485e17771bad3142f576d967e0986702050431a656eb990af3bbfe809542745ac7752c0d72e6beee78bf3c285a4b41b37b8ebef50ecd7b3f53f8d
-DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip 215199 BLAKE2B 10e6de70852ce1a49e1091f10305e217d873bf92d727ef5c773376eb5bd4fe7ed09f4bba82b59b8fddb7bb67709428f0ff02068bd025df35c196b29abf9d57ff SHA512 f61f3d2c31c00c2c016ebbf48f051920cb461429c8d0e46b2995efa18e5b03cbfaee429c2b545979546ac82cb3439274133f4e898d0d3f2c9e3636d673818f6c
 DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.1.mod 346 BLAKE2B f7711e6d8685f0d5323a98161f831fbe6d411fba26a6b1ad91ea656faea33eb4ffd9a1b33539b585643006d468f804368ab277db997273da67fec3dc72042ed3 SHA512 ad7e33e7a6eea993c180fe2d26dfea41511ea39e1c28f03ef681dd45e17e2fc0917d673b2a8ca8c09afe5dd832d949873b98c10968e691396a28ccd7ba6bc839
-DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.1.zip 220145 BLAKE2B 4d9481ded980aad9bcc52ff764393dacb1309065e6ba96cc4fa24590fd8cd02c116e056808861d5e3b04d4bf6cfabe1d73e8872965a22cc82670e495ae944353 SHA512 283baf23992d3e8cdb95f1871e4c8cd46bee5c540b2fd5bbd85ccf0651236d2ccbed3e5435c40edb2bf956770a8f74060beb9f1047039d993598aa5b1f135ee5
 DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod 346 BLAKE2B f7711e6d8685f0d5323a98161f831fbe6d411fba26a6b1ad91ea656faea33eb4ffd9a1b33539b585643006d468f804368ab277db997273da67fec3dc72042ed3 SHA512 ad7e33e7a6eea993c180fe2d26dfea41511ea39e1c28f03ef681dd45e17e2fc0917d673b2a8ca8c09afe5dd832d949873b98c10968e691396a28ccd7ba6bc839
-DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.zip 229142 BLAKE2B 70e76301c337432c351134ebc32f723f80be1f8331b9ef80bff6d510b437f9d2ba613d40368c6170a17217d9ef6cd7b639450b64697ff63c3d0352f3733921ce SHA512 a941e1144613c7ddd2dfebac185bc65a9f68d794eaf29bccd4c8f9be209d3cf5c9d1d06d3be09a9af816d2e727f2e3ae92d22724c925ab3211afa1e226b058b4
 DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.3.mod 346 BLAKE2B f7711e6d8685f0d5323a98161f831fbe6d411fba26a6b1ad91ea656faea33eb4ffd9a1b33539b585643006d468f804368ab277db997273da67fec3dc72042ed3 SHA512 ad7e33e7a6eea993c180fe2d26dfea41511ea39e1c28f03ef681dd45e17e2fc0917d673b2a8ca8c09afe5dd832d949873b98c10968e691396a28ccd7ba6bc839
 DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.3.zip 230610 BLAKE2B f175f916de857a9e6689a50e344c307e0dcf41d2797a4d3c237847a07f58fdec8084bc5e68762ecb51c9728d35dbf7f6ccd98f810ec72adad4f88b1c79556676 SHA512 888e3bb9638fdf43036c5b3770dae3ad122f8642be5f841e3c90396625dd21a23882f978b4915ceb50bcc6743f4c20983c859b5e983647becb3d2f55d875ff8c
-DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.0.mod 346 BLAKE2B f7711e6d8685f0d5323a98161f831fbe6d411fba26a6b1ad91ea656faea33eb4ffd9a1b33539b585643006d468f804368ab277db997273da67fec3dc72042ed3 SHA512 ad7e33e7a6eea993c180fe2d26dfea41511ea39e1c28f03ef681dd45e17e2fc0917d673b2a8ca8c09afe5dd832d949873b98c10968e691396a28ccd7ba6bc839
-DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.0.zip 237338 BLAKE2B d75a5c1a26e01039695b4ff956272c3b6b87aa7f8fa05dadae8d3be6df190975a7e65c55fbc78796a6c5f982c20d0052766a548023f43f3cfd0ab6a957831512 SHA512 3f37c05305ba79d2e45c540f0bbfb35ec9c986e6337eefdc7834828e47a369b16e86b48fb06dd6b0162a009894a6592967f00d923dec58e6af87ce9cb6741de2
+DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.2.mod 346 BLAKE2B d97829d2e8d74048df31acd31ca198f7b5a5058cbc7213ef53213f4d3c7f936cc27039a2f9a0615ac7d6c0805f77bd77c5cf9b25f6d081894a3e6cad302daa10 SHA512 0e8cbedf408fa5ca2a3d7f4edd6b2ba33d786f1129df522396018c13bce851195df8ef6fdd17642ec466bad1f2ba882f46bd467d792e5c22d08ad797deef1bda
+DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.2.zip 238829 BLAKE2B b7d798cd7d5e08a8816c7763e7a74b8abc56922625c75e0c66b9d75e1b47daddc9021ecab9817ed85e68120c78ffff8167e76cfe534980d6064e710ef2ce1345 SHA512 d006fae4ec891d4afc336ec1c0709e66c569e16ff077f7b260f185d94ea7cc790574de6732004b3db34cd6dc3a45ba6f1660e4a42a3dd27ec56cebfb1a377b4c
+DIST sigs.k8s.io%2Ftesting_frameworks%2F@v%2Fv0.1.2.mod 577 BLAKE2B 61373bce91777c61ec70f87c6453b9ebe6ff5fa3a6682dc34cdfe8cd0a478e83e1343ca5b2689d50a1fe739954e15c7280bd270bdf8fd4d747b2b4c9783595bd SHA512 a482a8707c35c958dc8703a675b8b1aa4c3e8cb07665cf2be8054e7fc1b795e8dc63ba8cea84482b049038f27d719256d25522eff29d85f7d626b9c71f19f0ba
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
-DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
 DIST traefik-1.81.0.tgz 27292 BLAKE2B c15449a4e1485e2deafee8cf3964a05687b036ff2d50bacd2db1ad461f210f66dd411d79deaebff30bfaf1c0ea0ae6bb82d898d015490ac1cef07afcaeff1563 SHA512 df9f398744b4a3669426698ea87a0f2b553948ae1183c5c95f3b4bac1ae62847b75b2101805afc674881a02704718ed5ca362c88691cd7753bcc0b1db438310e
+DIST traefik-10.3.0.tgz 24016 BLAKE2B f3da409f9b86fcc78c58e50936115a67fd595b43d71f9e4b4b15f1b482a79945ea33a4d879aab1cc902a3aac04053dd6296186e1adf9e23ca309ce2a87163156 SHA512 bbd6e290eb14b2a797f4d6abe0f9487290c7b78a9397d70dbb18f30ce84b2b2792d52b8feca4f8c38f64dd89ae49b31b7b13a603478fe02e805516ab666f71ad
 DIST traefik-9.18.2.tgz 17026 BLAKE2B aa356f9b0778f90d53eee29581c9ee0e70fbba30e878c848ecf4a3af5322b854a7b1159f0e3d5d2a7469f00231c111dc0e590ce8292a6e4791e804323e783fcd SHA512 c52608ae34a3cf49688e221d342558588447ff0b618c2c06dc9e8c356425cbaca82e50cc78b77452ca71cb940230da097884cefa2d99aba3b7ac8cbb303765fd
 DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod 20 BLAKE2B 9817a2968dcdd45e9e5d40b93cb54e6002d0aa6613f241bd77d448b3173b639f58a88d25899734be39a822473b4aac69ad947878006d5bb266a13f24637b0082 SHA512 b052661c1a3c2599fa350578cde2899166b39b71c65a6414ca7ea33e8d5186e85895ebd948819313781041d06fac3292cb08ad12447060df3860a86402344c24
 DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.zip 27337 BLAKE2B a191bd4ef424697548532023bacc2f1cc67801e456d8ada577946204686c444b53c2bd3fc757f77aa07d8b79b3cd45f01e37b01521d6ebea0c621f87d246861c SHA512 77441a4a14c9b5c266eedde3c9eb6d7499a7a2ca57139071197b71fe2d3d1d1cc63c3eed95673733a2b855f329ccb30dcab568e1d743231eb1238ca0154524e6
-EBUILD k3s-1.19.10-r1.ebuild 88419 BLAKE2B 57a216b0d88cf1b56e6fd84b0bdaf9d0e230cb952f293e8e8336576ac5708e50d147c6bd4e998f75bacc728c8f39ce4baf6ee6babf2c427b734811e29765acf0 SHA512 97873dfeaae3b100a430a976903bd8bd16b3361fc71f18b484eb7f926bf99f02b4f42d78137e7f2922210783cc08ae4fdf49571276a99c778676bcf3e3532c1c
-EBUILD k3s-1.20.6.ebuild 105193 BLAKE2B ce9f8aeb01c0617515f20476ec96caac710cf7f5ec0c17859e7483aea7bea6feacb6f1c008248d9b3e5e96dd1e7a33b7496c758f0efd5981632dccd14b1ff8e4 SHA512 ad266f48a566db505c1af3df25f8658c57976b2a6c09158ca73e7f40b98489c238eb2e4a4ed0dcda9262e61d61f8559a7af160dfd49cce03b860d4f722f71518
-EBUILD k3s-1.21.0.ebuild 108798 BLAKE2B 0792e76aa6ffda560cd8c5459c655bfce392d50bd6832cc80f6615ae617f4ce79472294a633784f55492bd9feffdfcf059e577b28bbbb3ab3dd2335233b34997 SHA512 fc11699588f41407c7d9ed1072103675b56768ea394b31f443bd7242169aba812e278543687d94292ca224f482c8a2e9b711637b9e548a2b26c0a701c072478d
+EBUILD k3s-1.19.15.ebuild 80456 BLAKE2B 1ef0910cf505fc916061e757a0a834357ecd5495ae503c99bc808b3f5e02497b0f818bb5dd06a4fd70fe62e15e3327f5e9c6384a675b668781d1ddfd7237ac52 SHA512 671f43ac81300b19d42e2ac783f56804799c59f6d65ffc0d576962e4499cdfee5d934bfadc24232ea3a97629fc72895f4b3a6058d98efb26d288c6523493062d
+EBUILD k3s-1.20.11.ebuild 86579 BLAKE2B 2cc3ee2cd9906f659e0387cfb009651bd745fd3d2280d439a8233e69c4f8edeb1e66de587fcc949bc9ddd7c6eecbf5465f1622bcc76f103a5fcb8f8237eb62ed SHA512 e0892276a005374e72e8589a2e2d0ba508b3e2116f8369158fad530ccb72dffa3c10daae27387e48ebc8b2358359ab5172cf22bed65887891f7e420e7f948702
+EBUILD k3s-1.21.5.ebuild 90403 BLAKE2B c6b6b5818e5c1d7e8a2fadc1e8ef5a4b3cf26ff7ba81613fd52b0140cfbd1fdbc14d094162a612ded61cf27cdcfbc0186b7bfaab9b02a7a411488155fae57119 SHA512 761debf4364ec7b5b7e4932e29fad8635593d9b359aedd4d25571f5c364a416ad25d0627c88bf6155b6f45c577f6c4d31c2fe077233a7c77820b872acbd75ff5
+EBUILD k3s-1.22.2.ebuild 86978 BLAKE2B 4741a6f0458921c1aa7917bcb33689ee47f76fbff16794c93b78c351e8dc1f3bbafcfe27c948d4a4709e346df4e1d91491a4b40afda7f2e58918f0013614eef1 SHA512 ef7944ba8dc6f1c85f3ba61e35ce8307211ac13732a568090c7b7652293a8950a255292d67a2ab7bd39a6c24203faa506bd524e015e3445508ec0502a3cc149e
 MISC metadata.xml 515 BLAKE2B dc5e9d23a7b4d84ec392036cd87975b9117133b3a68eb1a69a38637dfca36f4e721be42dbd1ee0dd73585602800ef49d4255ff736be7cdc97e7f2d07b59af99b SHA512 8ee732afdfd59151faa18dbc68075d0c528113b8ea3f9939d0a83fbf7f06deefe2dee27079b7317ee98ea165e81cf4514f1d305564e21b3e1fc4760d2350fd46
diff --git a/sys-cluster/k3s/k3s-1.19.10-r1.ebuild b/sys-cluster/k3s/k3s-1.19.10-r1.ebuild
deleted file mode 100644
index 542dd973dd3c..000000000000
--- a/sys-cluster/k3s/k3s-1.19.10-r1.ebuild
+++ /dev/null
@@ -1,1669 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module linux-info systemd
-
-DESCRIPTION="Lightweight Kubernetes"
-HOMEPAGE="https://k3s.io"
-K3S_ROOT_VERSION=0.6.0-rc3
-K3S_TRAEFIK_VERSION=1.81.0
-K3S_CNIPLUGINS_VERSION=0.8.6
-CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN"
-
-EGO_SUM=(
-"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898"
-"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
-"bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690"
-"bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod"
-"cloud.google.com/go/bigquery v1.0.1/go.mod"
-"cloud.google.com/go/datastore v1.0.0/go.mod"
-"cloud.google.com/go/pubsub v1.0.1/go.mod"
-"cloud.google.com/go/storage v1.0.0/go.mod"
-"cloud.google.com/go v0.26.0/go.mod"
-"cloud.google.com/go v0.34.0/go.mod"
-"cloud.google.com/go v0.38.0/go.mod"
-"cloud.google.com/go v0.44.1/go.mod"
-"cloud.google.com/go v0.44.2/go.mod"
-"cloud.google.com/go v0.45.1/go.mod"
-"cloud.google.com/go v0.46.3/go.mod"
-"cloud.google.com/go v0.51.0"
-"cloud.google.com/go v0.51.0/go.mod"
-"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
-"github.com/agnivade/levenshtein v1.0.1/go.mod"
-"github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod"
-"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-"github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae"
-"github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod"
-"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
-"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
-"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a"
-"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
-"github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7"
-"github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod"
-"github.com/aws/aws-sdk-go v1.12.54/go.mod"
-"github.com/aws/aws-sdk-go v1.15.11/go.mod"
-"github.com/aws/aws-sdk-go v1.28.2"
-"github.com/aws/aws-sdk-go v1.28.2/go.mod"
-"github.com/aws/aws-sdk-go v1.6.10/go.mod"
-"github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod"
-"github.com/Azure/azure-sdk-for-go v43.0.0+incompatible"
-"github.com/Azure/azure-sdk-for-go v43.0.0+incompatible/go.mod"
-"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
-"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.2"
-"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.2.0"
-"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
-"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/to v0.2.0"
-"github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.6"
-"github.com/Azure/go-autorest/autorest v0.9.6/go.mod"
-"github.com/Azure/go-autorest/autorest/validation v0.1.0"
-"github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod"
-"github.com/Azure/go-autorest/logger v0.1.0"
-"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-"github.com/Azure/go-autorest/tracing v0.5.0"
-"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-"github.com/Azure/go-autorest v10.8.1+incompatible/go.mod"
-"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-"github.com/beorn7/perks v1.0.0"
-"github.com/beorn7/perks v1.0.0/go.mod"
-"github.com/beorn7/perks v1.0.1"
-"github.com/beorn7/perks v1.0.1/go.mod"
-"github.com/bgentry/speakeasy v0.1.0"
-"github.com/bgentry/speakeasy v0.1.0/go.mod"
-"github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod"
-"github.com/bitly/go-simplejson v0.5.0/go.mod"
-"github.com/blang/semver v3.1.0+incompatible/go.mod"
-"github.com/blang/semver v3.5.0+incompatible"
-"github.com/blang/semver v3.5.0+incompatible/go.mod"
-"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
-"github.com/boltdb/bolt v1.3.1"
-"github.com/boltdb/bolt v1.3.1/go.mod"
-"github.com/bronze1man/goStrongswanVici v0.0.0-20171013065002-4d72634a2f11/go.mod"
-"github.com/bronze1man/goStrongswanVici v0.0.0-20190828090544-27d02f80ba40"
-"github.com/bronze1man/goStrongswanVici v0.0.0-20190828090544-27d02f80ba40/go.mod"
-"github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod"
-"github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44"
-"github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod"
-"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod"
-"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod"
-"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod"
-"github.com/BurntSushi/toml v0.3.1"
-"github.com/BurntSushi/toml v0.3.1/go.mod"
-"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-"github.com/caddyserver/caddy v1.0.3"
-"github.com/caddyserver/caddy v1.0.3/go.mod"
-"github.com/canonical/go-dqlite v1.5.1"
-"github.com/canonical/go-dqlite v1.5.1/go.mod"
-"github.com/cenkalti/backoff v2.1.1+incompatible/go.mod"
-"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-"github.com/cespare/xxhash v1.1.0"
-"github.com/cespare/xxhash v1.1.0/go.mod"
-"github.com/cespare/xxhash/v2 v2.1.1"
-"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5"
-"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod"
-"github.com/checkpoint-restore/go-criu/v4 v4.0.2"
-"github.com/checkpoint-restore/go-criu/v4 v4.0.2/go.mod"
-"github.com/checkpoint-restore/go-criu/v4 v4.1.0"
-"github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod"
-"github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod"
-"github.com/cheggaaa/pb v1.0.29/go.mod"
-"github.com/chzyer/logex v1.1.10/go.mod"
-"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-"github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod"
-"github.com/cilium/ebpf v0.0.0-20200507155900-a9f01edf17e3/go.mod"
-"github.com/cilium/ebpf v0.0.0-20200601085316-9f1617e5c574/go.mod"
-"github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775"
-"github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod"
-"github.com/client9/misspell v0.3.4/go.mod"
-"github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313"
-"github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod"
-"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
-"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
-"github.com/codegangsta/negroni v1.0.0"
-"github.com/codegangsta/negroni v1.0.0/go.mod"
-"github.com/containerd/aufs v0.0.0-20191030083217-371312c1e31c"
-"github.com/containerd/aufs v0.0.0-20191030083217-371312c1e31c/go.mod"
-"github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e"
-"github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod"
-"github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod"
-"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
-"github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59"
-"github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod"
-"github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340"
-"github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod"
-"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
-"github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod"
-"github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod"
-"github.com/containerd/console v1.0.0"
-"github.com/containerd/console v1.0.0/go.mod"
-"github.com/containerd/containerd v1.2.10/go.mod"
-"github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
-"github.com/containerd/containerd v1.3.0/go.mod"
-"github.com/containerd/containerd v1.3.2/go.mod"
-"github.com/containerd/containerd v1.3.3"
-"github.com/containerd/containerd v1.3.3/go.mod"
-"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
-"github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod"
-"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
-"github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c"
-"github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c/go.mod"
-"github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b"
-"github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod"
-"github.com/containerd/go-cni v1.0.1"
-"github.com/containerd/go-cni v1.0.1/go.mod"
-"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
-"github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod"
-"github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328"
-"github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod"
-"github.com/containerd/imgcrypt v1.0.1"
-"github.com/containerd/imgcrypt v1.0.1/go.mod"
-"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
-"github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod"
-"github.com/containerd/ttrpc v1.0.0"
-"github.com/containerd/ttrpc v1.0.0/go.mod"
-"github.com/containerd/ttrpc v1.0.1"
-"github.com/containerd/ttrpc v1.0.1/go.mod"
-"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd"
-"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
-"github.com/containerd/typeurl v1.0.0"
-"github.com/containerd/typeurl v1.0.0/go.mod"
-"github.com/containerd/typeurl v1.0.1"
-"github.com/containerd/typeurl v1.0.1/go.mod"
-"github.com/containerd/zfs v0.0.0-20191030014035-9abf673ca6ff"
-"github.com/containerd/zfs v0.0.0-20191030014035-9abf673ca6ff/go.mod"
-"github.com/containernetworking/cni v0.7.1"
-"github.com/containernetworking/cni v0.7.1/go.mod"
-"github.com/containernetworking/cni v0.8.0"
-"github.com/containernetworking/cni v0.8.0/go.mod"
-"github.com/containernetworking/plugins v0.8.6"
-"github.com/containernetworking/plugins v0.8.6/go.mod"
-"github.com/containers/ocicrypt v1.0.1"
-"github.com/containers/ocicrypt v1.0.1/go.mod"
-"github.com/container-storage-interface/spec v1.2.0"
-"github.com/container-storage-interface/spec v1.2.0/go.mod"
-"github.com/coredns/corefile-migration v1.0.10"
-"github.com/coredns/corefile-migration v1.0.10/go.mod"
-"github.com/coreos/bbolt v1.3.2/go.mod"
-"github.com/coreos/etcd v3.1.11+incompatible/go.mod"
-"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
-"github.com/coreos/go-iptables v0.4.0/go.mod"
-"github.com/coreos/go-iptables v0.4.5"
-"github.com/coreos/go-iptables v0.4.5/go.mod"
-"github.com/coreos/go-oidc v2.1.0+incompatible"
-"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
-"github.com/coreos/go-semver v0.2.0"
-"github.com/coreos/go-semver v0.2.0/go.mod"
-"github.com/coreos/go-semver v0.3.0"
-"github.com/coreos/go-semver v0.3.0/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7"
-"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
-"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
-"github.com/coreos/go-systemd/v22 v22.1.0"
-"github.com/coreos/go-systemd/v22 v22.1.0/go.mod"
-"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf"
-"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
-"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
-"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
-"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-"github.com/cpuguy83/go-md2man v1.0.10"
-"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
-"github.com/cpuguy83/go-md2man/v2 v2.0.0"
-"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/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-"github.com/creack/pty v1.1.7"
-"github.com/creack/pty v1.1.7/go.mod"
-"github.com/cyphar/filepath-securejoin v0.2.2"
-"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
-"github.com/d2g/dhcp4client v1.0.0"
-"github.com/d2g/dhcp4client v1.0.0/go.mod"
-"github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5"
-"github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod"
-"github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c"
-"github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod"
-"github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4"
-"github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod"
-"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
-"github.com/davecgh/go-spew v1.1.0"
-"github.com/davecgh/go-spew v1.1.0/go.mod"
-"github.com/davecgh/go-spew v1.1.1"
-"github.com/davecgh/go-spew v1.1.1/go.mod"
-"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd"
-"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod"
-"github.com/denverdino/aliyungo v0.0.0-20170629053852-f6cab0c35083/go.mod"
-"github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod"
-"github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
-"github.com/dnaeon/go-vcr v1.0.1"
-"github.com/dnaeon/go-vcr v1.0.1/go.mod"
-"github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod"
-"github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible"
-"github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod"
-"github.com/docker/distribution v2.7.1+incompatible"
-"github.com/docker/distribution v2.7.1+incompatible/go.mod"
-"github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod"
-"github.com/docker/docker v1.13.1"
-"github.com/docker/docker v1.13.1/go.mod"
-"github.com/docker/docker v1.4.2-0.20200309214505-aa6a9891b09c"
-"github.com/docker/docker v1.4.2-0.20200309214505-aa6a9891b09c/go.mod"
-"github.com/docker/docker v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible"
-"github.com/docker/docker v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible/go.mod"
-"github.com/docker/go-connections v0.4.0"
-"github.com/docker/go-connections v0.4.0/go.mod"
-"github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod"
-"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c"
-"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod"
-"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod"
-"github.com/docker/go-metrics v0.0.1"
-"github.com/docker/go-metrics v0.0.1/go.mod"
-"github.com/docker/go-units v0.3.3/go.mod"
-"github.com/docker/go-units v0.4.0"
-"github.com/docker/go-units v0.4.0/go.mod"
-"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod"
-"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
-"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
-"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4"
-"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
-"github.com/dustin/go-humanize v1.0.0"
-"github.com/dustin/go-humanize v1.0.0/go.mod"
-"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
-"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
-"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-"github.com/emicklei/go-restful v2.9.5+incompatible"
-"github.com/emicklei/go-restful v2.9.5+incompatible/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-"github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83"
-"github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83/go.mod"
-"github.com/euank/go-kmsg-parser v2.0.0+incompatible"
-"github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod"
-"github.com/evanphx/json-patch v4.2.0+incompatible"
-"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-"github.com/evanphx/json-patch v4.5.0+incompatible"
-"github.com/evanphx/json-patch v4.5.0+incompatible/go.mod"
-"github.com/evanphx/json-patch v4.9.0+incompatible"
-"github.com/evanphx/json-patch v4.9.0+incompatible/go.mod"
-"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d"
-"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod"
-"github.com/fatih/camelcase v1.0.0"
-"github.com/fatih/camelcase v1.0.0/go.mod"
-"github.com/fatih/color v1.7.0"
-"github.com/fatih/color v1.7.0/go.mod"
-"github.com/fatih/color v1.9.0/go.mod"
-"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
-"github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod"
-"github.com/frankban/quicktest v1.10.2"
-"github.com/frankban/quicktest v1.10.2/go.mod"
-"github.com/fsnotify/fsnotify v1.4.7"
-"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-"github.com/fsnotify/fsnotify v1.4.9"
-"github.com/fsnotify/fsnotify v1.4.9/go.mod"
-"github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa"
-"github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod"
-"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod"
-"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-"github.com/ghodss/yaml v1.0.0"
-"github.com/ghodss/yaml v1.0.0/go.mod"
-"github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod"
-"github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod"
-"github.com/go-acme/lego v2.5.0+incompatible/go.mod"
-"github.com/go-bindata/go-bindata v3.1.1+incompatible"
-"github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod"
-"github.com/go-bindata/go-bindata v3.1.2+incompatible"
-"github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod"
-"github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod"
-"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c"
-"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod"
-"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e"
-"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
-"github.com/godbus/dbus/v5 v5.0.3"
-"github.com/godbus/dbus/v5 v5.0.3/go.mod"
-"github.com/gofrs/flock v0.7.1"
-"github.com/gofrs/flock v0.7.1/go.mod"
-"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
-"github.com/gogo/googleapis v1.2.0/go.mod"
-"github.com/gogo/googleapis v1.3.2"
-"github.com/gogo/googleapis v1.3.2/go.mod"
-"github.com/gogo/protobuf v1.1.1"
-"github.com/gogo/protobuf v1.1.1/go.mod"
-"github.com/gogo/protobuf v1.2.1"
-"github.com/gogo/protobuf v1.2.1/go.mod"
-"github.com/gogo/protobuf v1.3.1"
-"github.com/gogo/protobuf v1.3.1/go.mod"
-"github.com/gogo/protobuf v1.3.2"
-"github.com/gogo/protobuf v1.3.2/go.mod"
-"github.com/go-ini/ini v1.25.4/go.mod"
-"github.com/go-ini/ini v1.28.1/go.mod"
-"github.com/go-ini/ini v1.9.0/go.mod"
-"github.com/go-kit/kit v0.8.0/go.mod"
-"github.com/go-kit/kit v0.9.0/go.mod"
-"github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903"
-"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
-"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6"
-"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
-"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
-"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
-"github.com/golang/mock v1.1.1/go.mod"
-"github.com/golang/mock v1.2.0/go.mod"
-"github.com/golang/mock v1.3.1"
-"github.com/golang/mock v1.3.1/go.mod"
-"github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450"
-"github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod"
-"github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995"
-"github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod"
-"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e"
-"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod"
-"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-"github.com/golang/protobuf v1.2.0"
-"github.com/golang/protobuf v1.2.0/go.mod"
-"github.com/golang/protobuf v1.3.1"
-"github.com/golang/protobuf v1.3.1/go.mod"
-"github.com/golang/protobuf v1.3.2"
-"github.com/golang/protobuf v1.3.2/go.mod"
-"github.com/golang/protobuf v1.3.3/go.mod"
-"github.com/golang/protobuf v1.3.5"
-"github.com/golang/protobuf v1.3.5/go.mod"
-"github.com/golang/protobuf v1.4.0/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-"github.com/golang/protobuf v1.4.1/go.mod"
-"github.com/golang/protobuf v1.4.2"
-"github.com/golang/protobuf v1.4.2/go.mod"
-"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-"github.com/go-logr/logr v0.1.0/go.mod"
-"github.com/go-logr/logr v0.2.0"
-"github.com/go-logr/logr v0.2.0/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.5"
-"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-"github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod"
-"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-"github.com/googleapis/gnostic v0.1.0/go.mod"
-"github.com/googleapis/gnostic v0.2.0/go.mod"
-"github.com/googleapis/gnostic v0.3.1"
-"github.com/googleapis/gnostic v0.3.1/go.mod"
-"github.com/googleapis/gnostic v0.4.1"
-"github.com/googleapis/gnostic v0.4.1/go.mod"
-"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-"github.com/google/btree v1.0.0"
-"github.com/google/btree v1.0.0/go.mod"
-"github.com/google/cadvisor v0.37.2/go.mod"
-"github.com/google/cadvisor v0.37.5"
-"github.com/google/cadvisor v0.37.5/go.mod"
-"github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317"
-"github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317/go.mod"
-"github.com/google/go-cmp v0.2.0/go.mod"
-"github.com/google/go-cmp v0.3.0"
-"github.com/google/go-cmp v0.3.0/go.mod"
-"github.com/google/go-cmp v0.3.1"
-"github.com/google/go-cmp v0.3.1/go.mod"
-"github.com/google/go-cmp v0.4.0"
-"github.com/google/go-cmp v0.4.0/go.mod"
-"github.com/google/go-cmp v0.5.2"
-"github.com/google/go-cmp v0.5.2/go.mod"
-"github.com/google/go-containerregistry v0.0.0-20190617215043-876b8855d23c/go.mod"
-"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
-"github.com/google/gofuzz v1.0.0"
-"github.com/google/gofuzz v1.0.0/go.mod"
-"github.com/google/gofuzz v1.1.0"
-"github.com/google/gofuzz v1.1.0/go.mod"
-"github.com/google/martian v2.1.0+incompatible/go.mod"
-"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
-"github.com/google/renameio v0.1.0/go.mod"
-"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
-"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
-"github.com/google/uuid v1.0.0"
-"github.com/google/uuid v1.0.0/go.mod"
-"github.com/google/uuid v1.1.1"
-"github.com/google/uuid v1.1.1/go.mod"
-"github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod"
-"github.com/go-openapi/analysis v0.17.0/go.mod"
-"github.com/go-openapi/analysis v0.18.0/go.mod"
-"github.com/go-openapi/analysis v0.19.2/go.mod"
-"github.com/go-openapi/analysis v0.19.5"
-"github.com/go-openapi/analysis v0.19.5/go.mod"
-"github.com/go-openapi/errors v0.17.0/go.mod"
-"github.com/go-openapi/errors v0.18.0/go.mod"
-"github.com/go-openapi/errors v0.19.2"
-"github.com/go-openapi/errors v0.19.2/go.mod"
-"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-"github.com/go-openapi/jsonpointer v0.17.0/go.mod"
-"github.com/go-openapi/jsonpointer v0.18.0/go.mod"
-"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
-"github.com/go-openapi/jsonpointer v0.19.3"
-"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
-"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-"github.com/go-openapi/jsonreference v0.17.0/go.mod"
-"github.com/go-openapi/jsonreference v0.18.0/go.mod"
-"github.com/go-openapi/jsonreference v0.19.2/go.mod"
-"github.com/go-openapi/jsonreference v0.19.3"
-"github.com/go-openapi/jsonreference v0.19.3/go.mod"
-"github.com/go-openapi/loads v0.17.0/go.mod"
-"github.com/go-openapi/loads v0.18.0/go.mod"
-"github.com/go-openapi/loads v0.19.0/go.mod"
-"github.com/go-openapi/loads v0.19.2/go.mod"
-"github.com/go-openapi/loads v0.19.4"
-"github.com/go-openapi/loads v0.19.4/go.mod"
-"github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod"
-"github.com/go-openapi/runtime v0.19.0/go.mod"
-"github.com/go-openapi/runtime v0.19.4"
-"github.com/go-openapi/runtime v0.19.4/go.mod"
-"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-"github.com/go-openapi/spec v0.17.0/go.mod"
-"github.com/go-openapi/spec v0.18.0/go.mod"
-"github.com/go-openapi/spec v0.19.2/go.mod"
-"github.com/go-openapi/spec v0.19.3"
-"github.com/go-openapi/spec v0.19.3/go.mod"
-"github.com/go-openapi/strfmt v0.17.0/go.mod"
-"github.com/go-openapi/strfmt v0.18.0/go.mod"
-"github.com/go-openapi/strfmt v0.19.0/go.mod"
-"github.com/go-openapi/strfmt v0.19.3"
-"github.com/go-openapi/strfmt v0.19.3/go.mod"
-"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-"github.com/go-openapi/swag v0.17.0/go.mod"
-"github.com/go-openapi/swag v0.18.0/go.mod"
-"github.com/go-openapi/swag v0.19.2/go.mod"
-"github.com/go-openapi/swag v0.19.5"
-"github.com/go-openapi/swag v0.19.5/go.mod"
-"github.com/go-openapi/validate v0.18.0/go.mod"
-"github.com/go-openapi/validate v0.19.2/go.mod"
-"github.com/go-openapi/validate v0.19.5"
-"github.com/go-openapi/validate v0.19.5/go.mod"
-"github.com/go-ozzo/ozzo-validation v3.5.0+incompatible"
-"github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod"
-"github.com/gophercloud/gophercloud v0.1.0"
-"github.com/gophercloud/gophercloud v0.1.0/go.mod"
-"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-"github.com/gorilla/context v1.1.1"
-"github.com/gorilla/context v1.1.1/go.mod"
-"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod"
-"github.com/gorilla/mux v1.7.2/go.mod"
-"github.com/gorilla/mux v1.7.3"
-"github.com/gorilla/mux v1.7.3/go.mod"
-"github.com/gorilla/mux v1.7.4"
-"github.com/gorilla/mux v1.7.4/go.mod"
-"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c"
-"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
-"github.com/gorilla/websocket v1.4.0"
-"github.com/gorilla/websocket v1.4.0/go.mod"
-"github.com/gorilla/websocket v1.4.1"
-"github.com/gorilla/websocket v1.4.1/go.mod"
-"github.com/go-sql-driver/mysql v1.4.1"
-"github.com/go-sql-driver/mysql v1.4.1/go.mod"
-"github.com/go-stack/stack v1.8.0"
-"github.com/go-stack/stack v1.8.0/go.mod"
-"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
-"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
-"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
-"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.5"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
-"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
-"github.com/hashicorp/errwrap v1.0.0"
-"github.com/hashicorp/errwrap v1.0.0/go.mod"
-"github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod"
-"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-"github.com/hashicorp/golang-lru v0.5.1"
-"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.3"
-"github.com/hashicorp/golang-lru v0.5.3/go.mod"
-"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
-"github.com/hashicorp/go-multierror v1.0.0"
-"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-"github.com/hashicorp/hcl v1.0.0"
-"github.com/hashicorp/hcl v1.0.0/go.mod"
-"github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible"
-"github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible/go.mod"
-"github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6"
-"github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod"
-"github.com/hpcloud/tail v1.0.0"
-"github.com/hpcloud/tail v1.0.0/go.mod"
-"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
-"github.com/imdario/mergo v0.3.5"
-"github.com/imdario/mergo v0.3.5/go.mod"
-"github.com/imdario/mergo v0.3.7/go.mod"
-"github.com/imdario/mergo v0.3.8"
-"github.com/imdario/mergo v0.3.8/go.mod"
-"github.com/inconshreveable/mousetrap v1.0.0"
-"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-"github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7/go.mod"
-"github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5"
-"github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5/go.mod"
-"github.com/jamescun/tuntap v0.0.0-20190712092105-cb1fb277045c/go.mod"
-"github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab"
-"github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod"
-"github.com/jetstack/cert-manager v0.7.2/go.mod"
-"github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod"
-"github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56"
-"github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod"
-"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
-"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/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/joho/godotenv v0.0.0-20161216230537-726cc8b906e3/go.mod"
-"github.com/jonboulle/clockwork v0.1.0"
-"github.com/jonboulle/clockwork v0.1.0/go.mod"
-"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-"github.com/json-iterator/go v1.1.10"
-"github.com/json-iterator/go v1.1.10/go.mod"
-"github.com/json-iterator/go v1.1.6"
-"github.com/json-iterator/go v1.1.6/go.mod"
-"github.com/json-iterator/go v1.1.7"
-"github.com/json-iterator/go v1.1.7/go.mod"
-"github.com/json-iterator/go v1.1.8"
-"github.com/json-iterator/go v1.1.8/go.mod"
-"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
-"github.com/jtolds/gls v4.20.0+incompatible"
-"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-"github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod"
-"github.com/k3s-io/containerd v1.4.4-k3s1"
-"github.com/k3s-io/containerd v1.4.4-k3s1/go.mod"
-"github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1"
-"github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1/go.mod"
-"github.com/k3s-io/cri v1.4.0-k3s.5"
-"github.com/k3s-io/cri v1.4.0-k3s.5/go.mod"
-"github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea"
-"github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea/go.mod"
-"github.com/k3s-io/helm-controller v0.8.3"
-"github.com/k3s-io/helm-controller v0.8.3/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.19.10-k3s1/go.mod"
-"github.com/k3s-io/kubernetes v1.19.10-k3s1"
-"github.com/k3s-io/kubernetes v1.19.10-k3s1/go.mod"
-"github.com/karrick/godirwalk v1.7.5"
-"github.com/karrick/godirwalk v1.7.5/go.mod"
-"github.com/kisielk/errcheck v1.1.0/go.mod"
-"github.com/kisielk/errcheck v1.2.0/go.mod"
-"github.com/kisielk/errcheck v1.5.0/go.mod"
-"github.com/kisielk/gotool v1.0.0/go.mod"
-"github.com/klauspost/cpuid v1.2.0/go.mod"
-"github.com/klauspost/cpuid v1.2.3/go.mod"
-"github.com/klauspost/cpuid v1.3.1"
-"github.com/klauspost/cpuid v1.3.1/go.mod"
-"github.com/knative/build v0.6.0/go.mod"
-"github.com/knative/pkg v0.0.0-20190514205332-5e4512dcb2ca/go.mod"
-"github.com/knative/serving v0.6.1/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.3"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
-"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-"github.com/kr/pretty v0.1.0"
-"github.com/kr/pretty v0.1.0/go.mod"
-"github.com/kr/pretty v0.2.0"
-"github.com/kr/pretty v0.2.0/go.mod"
-"github.com/kr/pretty v0.2.1"
-"github.com/kr/pretty v0.2.1/go.mod"
-"github.com/kr/pty v1.1.1/go.mod"
-"github.com/kr/pty v1.1.5/go.mod"
-"github.com/kr/text v0.1.0"
-"github.com/kr/text v0.1.0/go.mod"
-"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
-"github.com/libopenstorage/openstorage v1.0.0"
-"github.com/libopenstorage/openstorage v1.0.0/go.mod"
-"github.com/lib/pq v1.8.0"
-"github.com/lib/pq v1.8.0/go.mod"
-"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de"
-"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod"
-"github.com/lithammer/dedent v1.1.0"
-"github.com/lithammer/dedent v1.1.0/go.mod"
-"github.com/lpabon/godbc v0.1.1"
-"github.com/lpabon/godbc v0.1.1/go.mod"
-"github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod"
-"github.com/lucas-clemente/quic-clients v0.1.0/go.mod"
-"github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod"
-"github.com/lucas-clemente/quic-go v0.10.2/go.mod"
-"github.com/magiconair/properties v1.8.0/go.mod"
-"github.com/magiconair/properties v1.8.1"
-"github.com/magiconair/properties v1.8.1/go.mod"
-"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
-"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
-"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
-"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
-"github.com/mailru/easyjson v0.7.0"
-"github.com/mailru/easyjson v0.7.0/go.mod"
-"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd"
-"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod"
-"github.com/marstr/guid v1.1.0/go.mod"
-"github.com/marten-seemann/qtls v0.2.3/go.mod"
-"github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a/go.mod"
-"github.com/mattn/go-colorable v0.0.9"
-"github.com/mattn/go-colorable v0.0.9/go.mod"
-"github.com/mattn/go-colorable v0.1.4/go.mod"
-"github.com/mattn/go-isatty v0.0.11/go.mod"
-"github.com/mattn/go-isatty v0.0.4"
-"github.com/mattn/go-isatty v0.0.4/go.mod"
-"github.com/mattn/go-isatty v0.0.8/go.mod"
-"github.com/mattn/go-runewidth v0.0.2"
-"github.com/mattn/go-runewidth v0.0.2/go.mod"
-"github.com/mattn/go-runewidth v0.0.4/go.mod"
-"github.com/mattn/go-shellwords v1.0.3"
-"github.com/mattn/go-shellwords v1.0.3/go.mod"
-"github.com/mattn/go-sqlite3 v1.14.4"
-"github.com/mattn/go-sqlite3 v1.14.4/go.mod"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
-"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
-"github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod"
-"github.com/Microsoft/go-winio v0.4.11"
-"github.com/Microsoft/go-winio v0.4.11/go.mod"
-"github.com/Microsoft/go-winio v0.4.14/go.mod"
-"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5"
-"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
-"github.com/Microsoft/hcsshim/test v0.0.0-20200803203718-d80bc7196cb0"
-"github.com/Microsoft/hcsshim/test v0.0.0-20200803203718-d80bc7196cb0/go.mod"
-"github.com/Microsoft/hcsshim v0.8.10-0.20200715222032-5eafd1556990"
-"github.com/Microsoft/hcsshim v0.8.10-0.20200715222032-5eafd1556990/go.mod"
-"github.com/Microsoft/hcsshim v0.8.6"
-"github.com/Microsoft/hcsshim v0.8.6/go.mod"
-"github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod"
-"github.com/Microsoft/hcsshim v0.8.7/go.mod"
-"github.com/Microsoft/hcsshim v0.8.9"
-"github.com/Microsoft/hcsshim v0.8.9/go.mod"
-"github.com/miekg/dns v1.1.3/go.mod"
-"github.com/miekg/dns v1.1.4"
-"github.com/miekg/dns v1.1.4/go.mod"
-"github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989"
-"github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989/go.mod"
-"github.com/minio/md5-simd v1.1.0"
-"github.com/minio/md5-simd v1.1.0/go.mod"
-"github.com/minio/minio-go/v7 v7.0.7"
-"github.com/minio/minio-go/v7 v7.0.7/go.mod"
-"github.com/minio/sha256-simd v0.1.1"
-"github.com/minio/sha256-simd v0.1.1/go.mod"
-"github.com/minio/sio v0.2.1/go.mod"
-"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible"
-"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod"
-"github.com/mitchellh/go-homedir v1.1.0"
-"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-"github.com/mitchellh/go-wordwrap v1.0.0"
-"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-"github.com/mitchellh/mapstructure v1.1.2"
-"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod"
-"github.com/moby/ipvs v1.0.1"
-"github.com/moby/ipvs v1.0.1/go.mod"
-"github.com/moby/sys/mountinfo v0.1.3"
-"github.com/moby/sys/mountinfo v0.1.3/go.mod"
-"github.com/moby/term v0.0.0-20200312100748-672ec06f55cd"
-"github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod"
-"github.com/moby/vpnkit v0.4.0/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-"github.com/modern-go/reflect2 v1.0.1"
-"github.com/modern-go/reflect2 v1.0.1/go.mod"
-"github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb"
-"github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod"
-"github.com/morikuni/aec v1.0.0"
-"github.com/morikuni/aec v1.0.0/go.mod"
-"github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618/go.mod"
-"github.com/mrunalp/fileutils v0.0.0-20200520151820-abd8a0e76976"
-"github.com/mrunalp/fileutils v0.0.0-20200520151820-abd8a0e76976/go.mod"
-"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822"
-"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod"
-"github.com/mvdan/xurls v1.1.0"
-"github.com/mvdan/xurls v1.1.0/go.mod"
-"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f"
-"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-"github.com/naoina/go-stringutil v0.1.0/go.mod"
-"github.com/naoina/toml v0.1.1/go.mod"
-"github.com/natefinch/lumberjack v2.0.0+incompatible"
-"github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod"
-"github.com/ncw/swift v1.0.47/go.mod"
-"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
-"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
-"github.com/nxadm/tail v1.4.4"
-"github.com/nxadm/tail v1.4.4/go.mod"
-"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46"
-"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-"github.com/NYTimes/gziphandler v1.1.1"
-"github.com/NYTimes/gziphandler v1.1.1/go.mod"
-"github.com/oklog/ulid v1.3.1/go.mod"
-"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5"
-"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
-"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-"github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b"
-"github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod"
-"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c"
-"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-"github.com/onsi/ginkgo v1.10.3/go.mod"
-"github.com/onsi/ginkgo v1.11.0"
-"github.com/onsi/ginkgo v1.11.0/go.mod"
-"github.com/onsi/ginkgo v1.12.1/go.mod"
-"github.com/onsi/ginkgo v1.14.0"
-"github.com/onsi/ginkgo v1.14.0/go.mod"
-"github.com/onsi/ginkgo v1.6.0/go.mod"
-"github.com/onsi/ginkgo v1.8.0/go.mod"
-"github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a"
-"github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod"
-"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c"
-"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-"github.com/onsi/gomega v1.10.1"
-"github.com/onsi/gomega v1.10.1/go.mod"
-"github.com/onsi/gomega v1.5.0/go.mod"
-"github.com/onsi/gomega v1.7.0"
-"github.com/onsi/gomega v1.7.0/go.mod"
-"github.com/onsi/gomega v1.7.1"
-"github.com/onsi/gomega v1.7.1/go.mod"
-"github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod"
-"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
-"github.com/opencontainers/go-digest v1.0.0"
-"github.com/opencontainers/go-digest v1.0.0/go.mod"
-"github.com/opencontainers/go-digest v1.0.0-rc1"
-"github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod"
-"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
-"github.com/opencontainers/image-spec v1.0.0/go.mod"
-"github.com/opencontainers/image-spec v1.0.1"
-"github.com/opencontainers/image-spec v1.0.1/go.mod"
-"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
-"github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod"
-"github.com/opencontainers/runc v1.0.0-rc90.0.20200616040943-82d2fa4eb069/go.mod"
-"github.com/opencontainers/runc v1.0.0-rc91.0.20200707015106-819fcc687efb"
-"github.com/opencontainers/runc v1.0.0-rc91.0.20200707015106-819fcc687efb/go.mod"
-"github.com/opencontainers/runc v1.0.0-rc92"
-"github.com/opencontainers/runc v1.0.0-rc92/go.mod"
-"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.1/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.2/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20200520003142-237cc4f519e2"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20200520003142-237cc4f519e2/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20200710190001-3e4195d92445"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20200710190001-3e4195d92445/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6/go.mod"
-"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
-"github.com/opencontainers/selinux v1.5.1/go.mod"
-"github.com/opencontainers/selinux v1.5.2"
-"github.com/opencontainers/selinux v1.5.2/go.mod"
-"github.com/opencontainers/selinux v1.6.0"
-"github.com/opencontainers/selinux v1.6.0/go.mod"
-"github.com/pborman/uuid v1.2.0/go.mod"
-"github.com/pborman/uuid v1.2.1/go.mod"
-"github.com/pelletier/go-toml v1.2.0"
-"github.com/pelletier/go-toml v1.2.0/go.mod"
-"github.com/peterbourgon/diskv v2.0.1+incompatible"
-"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-"github.com/pierrec/lz4 v2.5.2+incompatible"
-"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
-"github.com/pkg/errors v0.8.0"
-"github.com/pkg/errors v0.8.0/go.mod"
-"github.com/pkg/errors v0.8.1"
-"github.com/pkg/errors v0.8.1/go.mod"
-"github.com/pkg/errors v0.9.1"
-"github.com/pkg/errors v0.9.1/go.mod"
-"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-"github.com/pmezard/go-difflib v1.0.0"
-"github.com/pmezard/go-difflib v1.0.0/go.mod"
-"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021"
-"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
-"github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod"
-"github.com/prometheus/client_golang v0.9.1/go.mod"
-"github.com/prometheus/client_golang v0.9.3/go.mod"
-"github.com/prometheus/client_golang v1.0.0"
-"github.com/prometheus/client_golang v1.0.0/go.mod"
-"github.com/prometheus/client_golang v1.1.0/go.mod"
-"github.com/prometheus/client_golang v1.7.1"
-"github.com/prometheus/client_golang v1.7.1/go.mod"
-"github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod"
-"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
-"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-"github.com/prometheus/client_model v0.2.0"
-"github.com/prometheus/client_model v0.2.0/go.mod"
-"github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod"
-"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
-"github.com/prometheus/common v0.10.0"
-"github.com/prometheus/common v0.10.0/go.mod"
-"github.com/prometheus/common v0.4.0/go.mod"
-"github.com/prometheus/common v0.4.1"
-"github.com/prometheus/common v0.4.1/go.mod"
-"github.com/prometheus/common v0.6.0/go.mod"
-"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
-"github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod"
-"github.com/prometheus/procfs v0.0.2"
-"github.com/prometheus/procfs v0.0.2/go.mod"
-"github.com/prometheus/procfs v0.0.3/go.mod"
-"github.com/prometheus/procfs v0.0.5/go.mod"
-"github.com/prometheus/procfs v0.0.8/go.mod"
-"github.com/prometheus/procfs v0.1.3"
-"github.com/prometheus/procfs v0.1.3/go.mod"
-"github.com/prometheus/tsdb v0.7.1/go.mod"
-"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-"github.com/PuerkitoBio/purell v1.1.0/go.mod"
-"github.com/PuerkitoBio/purell v1.1.1"
-"github.com/PuerkitoBio/purell v1.1.1/go.mod"
-"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
-"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
-"github.com/quobyte/api v0.1.2"
-"github.com/quobyte/api v0.1.2/go.mod"
-"github.com/rakelkar/gonetsh v0.0.0-20190930180311-e5c5ffe4bdf0"
-"github.com/rakelkar/gonetsh v0.0.0-20190930180311-e5c5ffe4bdf0/go.mod"
-"github.com/rancher/cri-tools v1.19.0-k3s1"
-"github.com/rancher/cri-tools v1.19.0-k3s1/go.mod"
-"github.com/rancher/dynamiclistener v0.2.2"
-"github.com/rancher/dynamiclistener v0.2.2/go.mod"
-"github.com/rancher/flannel v0.12.0-k3s1"
-"github.com/rancher/flannel v0.12.0-k3s1/go.mod"
-"github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79"
-"github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79/go.mod"
-"github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373"
-"github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373/go.mod"
-"github.com/rancher/kine v0.5.1"
-"github.com/rancher/kine v0.5.1/go.mod"
-"github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009/go.mod"
-"github.com/rancher/remotedialer v0.2.0"
-"github.com/rancher/remotedialer v0.2.0/go.mod"
-"github.com/rancher/wrangler-api v0.2.0/go.mod"
-"github.com/rancher/wrangler-api v0.6.0"
-"github.com/rancher/wrangler-api v0.6.0/go.mod"
-"github.com/rancher/wrangler v0.1.4/go.mod"
-"github.com/rancher/wrangler v0.4.0/go.mod"
-"github.com/rancher/wrangler v0.6.0/go.mod"
-"github.com/rancher/wrangler v0.6.1"
-"github.com/rancher/wrangler v0.6.1/go.mod"
-"github.com/rancher/wrangler v0.6.2"
-"github.com/rancher/wrangler v0.6.2/go.mod"
-"github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod"
-"github.com/Rican7/retry v0.1.0"
-"github.com/Rican7/retry v0.1.0/go.mod"
-"github.com/robfig/cron v1.1.0"
-"github.com/robfig/cron v1.1.0/go.mod"
-"github.com/robfig/cron/v3 v3.0.1"
-"github.com/robfig/cron/v3 v3.0.1/go.mod"
-"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-"github.com/rootless-containers/rootlesskit v0.10.0"
-"github.com/rootless-containers/rootlesskit v0.10.0/go.mod"
-"github.com/rs/xid v1.2.1"
-"github.com/rs/xid v1.2.1/go.mod"
-"github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021"
-"github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021/go.mod"
-"github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod"
-"github.com/russross/blackfriday v1.5.2"
-"github.com/russross/blackfriday v1.5.2/go.mod"
-"github.com/russross/blackfriday/v2 v2.0.1"
-"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-"github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8"
-"github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod"
-"github.com/satori/go.uuid v1.2.0"
-"github.com/satori/go.uuid v1.2.0/go.mod"
-"github.com/seccomp/libseccomp-golang v0.9.1"
-"github.com/seccomp/libseccomp-golang v0.9.1/go.mod"
-"github.com/sergi/go-diff v1.0.0/go.mod"
-"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod"
-"github.com/shurcooL/sanitized_anchor_name v1.0.0"
-"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-"github.com/sirupsen/logrus v1.0.6"
-"github.com/sirupsen/logrus v1.0.6/go.mod"
-"github.com/sirupsen/logrus v1.2.0"
-"github.com/sirupsen/logrus v1.2.0/go.mod"
-"github.com/sirupsen/logrus v1.4.1/go.mod"
-"github.com/sirupsen/logrus v1.4.2"
-"github.com/sirupsen/logrus v1.4.2/go.mod"
-"github.com/sirupsen/logrus v1.6.0"
-"github.com/sirupsen/logrus v1.6.0/go.mod"
-"github.com/sirupsen/logrus v1.7.0"
-"github.com/sirupsen/logrus v1.7.0/go.mod"
-"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
-"github.com/smartystreets/goconvey v1.6.4"
-"github.com/smartystreets/goconvey v1.6.4/go.mod"
-"github.com/soheilhy/cmux v0.1.4"
-"github.com/soheilhy/cmux v0.1.4/go.mod"
-"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-"github.com/spf13/afero v1.1.2/go.mod"
-"github.com/spf13/afero v1.2.2"
-"github.com/spf13/afero v1.2.2/go.mod"
-"github.com/spf13/cast v1.3.0"
-"github.com/spf13/cast v1.3.0/go.mod"
-"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee"
-"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
-"github.com/spf13/cobra v0.0.3"
-"github.com/spf13/cobra v0.0.3/go.mod"
-"github.com/spf13/cobra v0.0.5/go.mod"
-"github.com/spf13/cobra v1.0.0"
-"github.com/spf13/cobra v1.0.0/go.mod"
-"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-"github.com/spf13/jwalterweatherman v1.1.0"
-"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
-"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff"
-"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-"github.com/spf13/pflag v1.0.1"
-"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95"
-"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
-"github.com/spf13/pflag v1.0.1/go.mod"
-"github.com/spf13/pflag v1.0.3/go.mod"
-"github.com/spf13/pflag v1.0.5"
-"github.com/spf13/pflag v1.0.5/go.mod"
-"github.com/spf13/viper v1.3.2/go.mod"
-"github.com/spf13/viper v1.4.0"
-"github.com/spf13/viper v1.4.0/go.mod"
-"github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc"
-"github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod"
-"github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod"
-"github.com/stretchr/objx v0.1.0/go.mod"
-"github.com/stretchr/objx v0.1.1/go.mod"
-"github.com/stretchr/objx v0.2.0"
-"github.com/stretchr/objx v0.2.0/go.mod"
-"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
-"github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod"
-"github.com/stretchr/testify v1.2.2"
-"github.com/stretchr/testify v1.2.2/go.mod"
-"github.com/stretchr/testify v1.3.0"
-"github.com/stretchr/testify v1.3.0/go.mod"
-"github.com/stretchr/testify v1.4.0"
-"github.com/stretchr/testify v1.4.0/go.mod"
-"github.com/stretchr/testify v1.5.1/go.mod"
-"github.com/stretchr/testify v1.6.1"
-"github.com/stretchr/testify v1.6.1/go.mod"
-"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
-"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2"
-"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod"
-"github.com/tchap/go-patricia v2.2.6+incompatible"
-"github.com/tchap/go-patricia v2.2.6+incompatible/go.mod"
-"github.com/tchap/go-patricia v2.3.0+incompatible"
-"github.com/tchap/go-patricia v2.3.0+incompatible/go.mod"
-"github.com/tektoncd/pipeline v0.4.0/go.mod"
-"github.com/thecodeteam/goscaleio v0.1.0"
-"github.com/thecodeteam/goscaleio v0.1.0/go.mod"
-"github.com/tidwall/pretty v1.0.0"
-"github.com/tidwall/pretty v1.0.0/go.mod"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
-"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
-"github.com/ugorji/go v0.0.0-20170107133203-ded73eae5db7/go.mod"
-"github.com/ugorji/go v1.1.4/go.mod"
-"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
-"github.com/urfave/cli v1.20.0"
-"github.com/urfave/cli v1.20.0/go.mod"
-"github.com/urfave/cli v1.21.0/go.mod"
-"github.com/urfave/cli v1.22.1"
-"github.com/urfave/cli v1.22.1/go.mod"
-"github.com/urfave/cli v1.22.2"
-"github.com/urfave/cli v1.22.2/go.mod"
-"github.com/urfave/cli/v2 v2.2.0"
-"github.com/urfave/cli/v2 v2.2.0/go.mod"
-"github.com/urfave/negroni v1.0.0"
-"github.com/urfave/negroni v1.0.0/go.mod"
-"github.com/u-root/u-root v6.0.0+incompatible/go.mod"
-"github.com/vektah/gqlparser v1.1.2/go.mod"
-"github.com/vishvananda/netlink v0.0.0-20170220200719-fe3b5664d23a/go.mod"
-"github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf"
-"github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod"
-"github.com/vishvananda/netlink v1.1.0"
-"github.com/vishvananda/netlink v1.1.0/go.mod"
-"github.com/vishvananda/netns v0.0.0-20170219233438-54f0e4339ce7/go.mod"
-"github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc"
-"github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod"
-"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df"
-"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod"
-"github.com/vishvananda/netns v0.0.0-20200520041808-52d707b772fe"
-"github.com/vishvananda/netns v0.0.0-20200520041808-52d707b772fe/go.mod"
-"github.com/vmware/govmomi v0.20.3"
-"github.com/vmware/govmomi v0.20.3/go.mod"
-"github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243"
-"github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod"
-"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
-"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
-"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
-"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
-"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-"github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1"
-"github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod"
-"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
-"github.com/yuin/goldmark v1.1.27/go.mod"
-"github.com/yuin/goldmark v1.2.1/go.mod"
-"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod"
-"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod"
-"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod"
-"go.etcd.io/bbolt v1.3.2/go.mod"
-"go.etcd.io/bbolt v1.3.3"
-"go.etcd.io/bbolt v1.3.3/go.mod"
-"go.etcd.io/bbolt v1.3.5"
-"go.etcd.io/bbolt v1.3.5/go.mod"
-"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
-"go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5"
-"go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod"
-"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793"
-"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-"golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941"
-"golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod"
-"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
-"golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod"
-"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
-"golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod"
-"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
-"golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod"
-"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
-"golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc"
-"golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod"
-"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975"
-"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/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/crypto v0.0.0-20201002170205-7f63de1d35b0"
-"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
-"golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod"
-"golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod"
-"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-"golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod"
-"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
-"golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod"
-"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
-"golang.org/x/exp v0.0.0-20191227195350-da58074b4299"
-"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
-"golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod"
-"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
-"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
-"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
-"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
-"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
-"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-"golang.org/x/mod v0.1.0/go.mod"
-"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
-"golang.org/x/mod v0.2.0/go.mod"
-"golang.org/x/mod v0.3.0"
-"golang.org/x/mod v0.3.0/go.mod"
-"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd"
-"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-"golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod"
-"golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1"
-"golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod"
-"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a"
-"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
-"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-"golang.org/x/net v0.0.0-20190311183353-d8887717615a"
-"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-"golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod"
-"golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod"
-"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod"
-"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7"
-"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
-"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
-"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
-"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
-"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
-"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
-"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
-"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
-"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
-"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b"
-"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
-"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
-"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6"
-"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
-"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f"
-"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
-"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
-"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9"
-"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
-"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5"
-"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
-"golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod"
-"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod"
-"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-"golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod"
-"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
-"golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod"
-"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
-"golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444"
-"golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod"
-"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f"
-"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
-"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
-"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
-"golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod"
-"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456"
-"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
-"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
-"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
-"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7"
-"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod"
-"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
-"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
-"golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod"
-"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
-"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
-"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-"golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod"
-"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
-"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
-"golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod"
-"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
-"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-"golang.org/x/sys v0.0.0-20200327173247-9dae0f8f5775/go.mod"
-"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
-"golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1"
-"golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod"
-"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
-"golang.org/x/sys v0.0.0-20201112073958-5cba982894dd"
-"golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod"
-"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3"
-"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
-"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-"golang.org/x/text v0.3.0"
-"golang.org/x/text v0.3.0/go.mod"
-"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-"golang.org/x/text v0.3.2"
-"golang.org/x/text v0.3.2/go.mod"
-"golang.org/x/text v0.3.3"
-"golang.org/x/text v0.3.3/go.mod"
-"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2"
-"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
-"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
-"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-"golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod"
-"golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod"
-"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-"golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod"
-"golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod"
-"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
-"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
-"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
-"golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72"
-"golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod"
-"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
-"golang.org/x/tools v0.0.0-20191017205301-920acffc3e65"
-"golang.org/x/tools v0.0.0-20191017205301-920acffc3e65/go.mod"
-"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
-"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
-"golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod"
-"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
-"golang.org/x/tools v0.0.0-20210106214847-113979e3529a"
-"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/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"
-"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
-"go.mongodb.org/mongo-driver v1.0.3/go.mod"
-"go.mongodb.org/mongo-driver v1.1.1/go.mod"
-"go.mongodb.org/mongo-driver v1.1.2"
-"go.mongodb.org/mongo-driver v1.1.2/go.mod"
-"gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod"
-"gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod"
-"gonum.org/v1/gonum v0.6.2"
-"gonum.org/v1/gonum v0.6.2/go.mod"
-"gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod"
-"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e"
-"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod"
-"gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod"
-"google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod"
-"google.golang.org/api v0.15.0/go.mod"
-"google.golang.org/api v0.15.1"
-"google.golang.org/api v0.15.1-0.20200106000736-b8fc810ca6b5/go.mod"
-"google.golang.org/api v0.15.1/go.mod"
-"google.golang.org/api v0.4.0/go.mod"
-"google.golang.org/api v0.7.0/go.mod"
-"google.golang.org/api v0.8.0/go.mod"
-"google.golang.org/api v0.9.0/go.mod"
-"google.golang.org/appengine v1.1.0/go.mod"
-"google.golang.org/appengine v1.4.0"
-"google.golang.org/appengine v1.4.0/go.mod"
-"google.golang.org/appengine v1.5.0/go.mod"
-"google.golang.org/appengine v1.6.1"
-"google.golang.org/appengine v1.6.1/go.mod"
-"google.golang.org/appengine v1.6.5"
-"google.golang.org/appengine v1.6.5/go.mod"
-"google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod"
-"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8"
-"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
-"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
-"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
-"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63"
-"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
-"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013"
-"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
-"google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod"
-"google.golang.org/grpc v1.19.0/go.mod"
-"google.golang.org/grpc v1.20.1/go.mod"
-"google.golang.org/grpc v1.21.0/go.mod"
-"google.golang.org/grpc v1.21.1/go.mod"
-"google.golang.org/grpc v1.23.0/go.mod"
-"google.golang.org/grpc v1.23.1/go.mod"
-"google.golang.org/grpc v1.24.0"
-"google.golang.org/grpc v1.24.0/go.mod"
-"google.golang.org/grpc v1.26.0"
-"google.golang.org/grpc v1.26.0/go.mod"
-"google.golang.org/grpc v1.27.0"
-"google.golang.org/grpc v1.27.0/go.mod"
-"google.golang.org/grpc v1.27.1"
-"google.golang.org/grpc v1.27.1/go.mod"
-"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-"google.golang.org/protobuf v1.21.0/go.mod"
-"google.golang.org/protobuf v1.22.0/go.mod"
-"google.golang.org/protobuf v1.23.0"
-"google.golang.org/protobuf v1.23.0/go.mod"
-"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
-"google.golang.org/protobuf v1.24.0"
-"google.golang.org/protobuf v1.24.0/go.mod"
-"go.opencensus.io v0.21.0/go.mod"
-"go.opencensus.io v0.22.0/go.mod"
-"go.opencensus.io v0.22.2"
-"go.opencensus.io v0.22.2/go.mod"
-"gopkg.in/airbrake/gobrake.v2 v2.0.9"
-"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
-"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-"gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod"
-"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
-"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
-"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
-"gopkg.in/cheggaaa/pb.v1 v1.0.25"
-"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
-"gopkg.in/errgo.v2 v2.1.0/go.mod"
-"gopkg.in/fsnotify.v1 v1.4.7"
-"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-"gopkg.in/gcfg.v1 v1.2.0"
-"gopkg.in/gcfg.v1 v1.2.0/go.mod"
-"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2"
-"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-"gopkg.in/inf.v0 v0.9.1"
-"gopkg.in/inf.v0 v0.9.1/go.mod"
-"gopkg.in/ini.v1 v1.57.0"
-"gopkg.in/ini.v1 v1.57.0/go.mod"
-"gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod"
-"gopkg.in/natefinch/lumberjack.v2 v2.0.0"
-"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
-"gopkg.in/resty.v1 v1.12.0/go.mod"
-"gopkg.in/square/go-jose.v2 v2.2.2"
-"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
-"gopkg.in/square/go-jose.v2 v2.3.1"
-"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-"gopkg.in/warnings.v0 v0.1.1"
-"gopkg.in/warnings.v0 v0.1.1/go.mod"
-"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-"gopkg.in/yaml.v2 v2.2.1"
-"gopkg.in/yaml.v2 v2.2.1/go.mod"
-"gopkg.in/yaml.v2 v2.2.2"
-"gopkg.in/yaml.v2 v2.2.2/go.mod"
-"gopkg.in/yaml.v2 v2.2.4"
-"gopkg.in/yaml.v2 v2.2.4/go.mod"
-"gopkg.in/yaml.v2 v2.2.5/go.mod"
-"gopkg.in/yaml.v2 v2.2.8"
-"gopkg.in/yaml.v2 v2.2.8/go.mod"
-"gopkg.in/yaml.v2 v2.3.0"
-"gopkg.in/yaml.v2 v2.3.0/go.mod"
-"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
-"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
-"gotest.tools v2.2.0+incompatible"
-"gotest.tools v2.2.0+incompatible/go.mod"
-"gotest.tools/v3 v3.0.2"
-"gotest.tools/v3 v3.0.2/go.mod"
-"go.uber.org/atomic v1.3.2"
-"go.uber.org/atomic v1.3.2/go.mod"
-"go.uber.org/atomic v1.4.0"
-"go.uber.org/atomic v1.4.0/go.mod"
-"go.uber.org/multierr v1.1.0"
-"go.uber.org/multierr v1.1.0/go.mod"
-"go.uber.org/zap v1.10.0"
-"go.uber.org/zap v1.10.0/go.mod"
-"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-"k8s.io/apiextensions-apiserver v0.18.0"
-"k8s.io/apiextensions-apiserver v0.18.0/go.mod"
-"k8s.io/apiextensions-apiserver v0.19.5/go.mod"
-"k8s.io/apimachinery v0.18.0"
-"k8s.io/apimachinery v0.18.0/go.mod"
-"k8s.io/apimachinery v0.19.5"
-"k8s.io/apimachinery v0.19.5/go.mod"
-"k8s.io/apiserver v0.18.0/go.mod"
-"k8s.io/apiserver v0.19.5"
-"k8s.io/apiserver v0.19.5/go.mod"
-"k8s.io/api v0.18.0"
-"k8s.io/api v0.18.0/go.mod"
-"k8s.io/api v0.19.5"
-"k8s.io/api v0.19.5/go.mod"
-"k8s.io/client-go v0.18.0"
-"k8s.io/client-go v0.18.0/go.mod"
-"k8s.io/client-go v0.19.5"
-"k8s.io/client-go v0.19.5/go.mod"
-"k8s.io/cli-runtime v0.19.5/go.mod"
-"k8s.io/cloud-provider v0.19.5/go.mod"
-"k8s.io/cluster-bootstrap v0.19.5/go.mod"
-"k8s.io/code-generator v0.18.0"
-"k8s.io/code-generator v0.18.0/go.mod"
-"k8s.io/code-generator v0.19.5/go.mod"
-"k8s.io/component-base v0.18.0/go.mod"
-"k8s.io/component-base v0.19.5/go.mod"
-"k8s.io/cri-api v0.19.5"
-"k8s.io/cri-api v0.19.5/go.mod"
-"k8s.io/csi-translation-lib v0.19.5/go.mod"
-"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-"k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a/go.mod"
-"k8s.io/gengo v0.0.0-20191120174120-e74f70b9b27e/go.mod"
-"k8s.io/gengo v0.0.0-20200114144118-36b2048a9120"
-"k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod"
-"k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod"
-"k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14"
-"k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod"
-"k8s.io/heapster v1.2.0-beta.1"
-"k8s.io/heapster v1.2.0-beta.1/go.mod"
-"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-"k8s.io/klog v0.3.0"
-"k8s.io/klog v0.3.0/go.mod"
-"k8s.io/klog v1.0.0"
-"k8s.io/klog v1.0.0/go.mod"
-"k8s.io/klog/v2 v2.0.0/go.mod"
-"k8s.io/klog/v2 v2.2.0"
-"k8s.io/klog/v2 v2.2.0/go.mod"
-"k8s.io/kube-aggregator v0.18.0/go.mod"
-"k8s.io/kube-aggregator v0.19.5/go.mod"
-"k8s.io/kube-controller-manager v0.19.5/go.mod"
-"k8s.io/kubectl v0.19.5/go.mod"
-"k8s.io/kubelet v0.19.5/go.mod"
-"k8s.io/kube-openapi v0.0.0-20190502190224-411b2483e503/go.mod"
-"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c"
-"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod"
-"k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6"
-"k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod"
-"k8s.io/kube-proxy v0.19.5/go.mod"
-"k8s.io/kubernetes v1.19.5/go.mod"
-"k8s.io/kube-scheduler v0.19.5/go.mod"
-"k8s.io/legacy-cloud-providers v0.19.5/go.mod"
-"k8s.io/metrics v0.19.5/go.mod"
-"k8s.io/sample-apiserver v0.19.5/go.mod"
-"k8s.io/system-validators v1.1.2"
-"k8s.io/system-validators v1.1.2/go.mod"
-"k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod"
-"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
-"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
-"k8s.io/utils v0.0.0-20200414100711-2df71ebbae66/go.mod"
-"k8s.io/utils v0.0.0-20200729134348-d5654de09c73"
-"k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod"
-"modernc.org/cc v1.0.0/go.mod"
-"modernc.org/golex v1.0.0/go.mod"
-"modernc.org/mathutil v1.0.0/go.mod"
-"modernc.org/strutil v1.0.0/go.mod"
-"modernc.org/xc v1.0.0/go.mod"
-"rsc.io/binaryregexp v0.2.0/go.mod"
-"rsc.io/pdf v0.1.1/go.mod"
-"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15"
-"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod"
-"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod"
-"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod"
-"sigs.k8s.io/kustomize v2.0.3+incompatible"
-"sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod"
-"sigs.k8s.io/structured-merge-diff v0.0.0-20190426204423-ea680f03cc65"
-"sigs.k8s.io/structured-merge-diff v0.0.0-20190426204423-ea680f03cc65/go.mod"
-"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
-"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
-"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
-"sigs.k8s.io/structured-merge-diff/v4 v4.0.1"
-"sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod"
-"sigs.k8s.io/structured-merge-diff/v4 v4.0.3"
-"sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod"
-"sigs.k8s.io/yaml v1.1.0"
-"sigs.k8s.io/yaml v1.1.0/go.mod"
-"sigs.k8s.io/yaml v1.2.0"
-"sigs.k8s.io/yaml v1.2.0/go.mod"
-"vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc"
-"vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod"
-)
-go-module_set_globals
-MY_PV=${PV}+k3s1
-SRC_URI="https://github.com/k3s-io/k3s/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}
-	https://charts.helm.sh/stable/packages/traefik-${K3S_TRAEFIK_VERSION}.tgz
-	https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz
-	amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+kubectl-symlink rootless"
-REQUIRED_USE="|| ( amd64 )"
-DEPEND="
-	net-firewall/conntrack-tools
-	rootless? ( app-emulation/slirp4netns )
-"
-RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )"
-RESTRICT+=" test"
-
-S=${WORKDIR}/${PN}-${MY_PV/+/-}
-
-k3s_unpack_filter() {
-	grep -v -F \
-		-e "traefik-${K3S_TRAEFIK_VERSION}.tgz" \
-		-e "k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz"
-}
-
-src_unpack() {
-	read -d '' A < <(printf -- '%s\n' ${A} | k3s_unpack_filter)
-	go-module_src_unpack
-	mkdir -p bin/aux build/static/charts cache || die
-	cp "${DISTDIR}/traefik-${K3S_TRAEFIK_VERSION}.tgz" build/static/charts/ || die
-	cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die
-	mv "${WORKDIR}/bin/"* "${S}/bin/" || die
-	mv "${WORKDIR}/etc" "${S}/etc" || die
-}
-
-src_prepare() {
-	local filename pattern replacement
-	default
-	# Disable download for files fetched via SRC_URI.
-	sed -e 's:^curl:#\0:' -i scripts/download || die
-	sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die
-	pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR'
-	filename=scripts/build
-	grep -qF "${pattern}" "${filename}" || \
-		die "failed to locate plugins clone command"
-	sed -e "s|${pattern}|mkdir -p \"\$WORKDIR\" \\&\\& tar -xzf cache/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz --strip-components=1 -C \"\$WORKDIR\"|" \
-		-e 's|rm -rf $TMPDIR||' \
-		-i "${filename}" || die
-	sed -e 's:/usr/local/bin:/usr/bin:g' -i k3s.service || die
-	sed -e 's|mod=vendor|mod=readonly|g' -i vendor/github.com/opencontainers/runc/Makefile || die
-}
-
-src_compile() {
-	mkdir -p build/data || die
-	./scripts/download || die
-	./scripts/build || die
-	./scripts/package-cli || die
-}
-
-src_install() {
-	dobin "dist/artifacts/${PN}"
-	use kubectl-symlink && dosym k3s /usr/bin/kubectl
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	dodoc README.md
-}
diff --git a/sys-cluster/k3s/k3s-1.19.15.ebuild b/sys-cluster/k3s/k3s-1.19.15.ebuild
new file mode 100644
index 000000000000..6e1358977ebc
--- /dev/null
+++ b/sys-cluster/k3s/k3s-1.19.15.ebuild
@@ -0,0 +1,1513 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module linux-info systemd
+
+DESCRIPTION="Lightweight Kubernetes"
+HOMEPAGE="https://k3s.io"
+K3S_RUNC_VERSION=v1.0.0-rc95
+K3S_ROOT_VERSION=0.9.1
+K3S_TRAEFIK_VERSION=1.81.0
+K3S_CNIPLUGINS_VERSION=0.9.1
+CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN"
+
+EGO_SUM=(
+"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+"bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod"
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.38.0/go.mod"
+"cloud.google.com/go v0.44.1/go.mod"
+"cloud.google.com/go v0.44.2/go.mod"
+"cloud.google.com/go v0.45.1/go.mod"
+"cloud.google.com/go v0.46.3/go.mod"
+"cloud.google.com/go v0.51.0"
+"cloud.google.com/go v0.51.0/go.mod"
+"cloud.google.com/go/bigquery v1.0.1/go.mod"
+"cloud.google.com/go/datastore v1.0.0/go.mod"
+"cloud.google.com/go/pubsub v1.0.1/go.mod"
+"cloud.google.com/go/storage v1.0.0/go.mod"
+"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+"github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod"
+"github.com/Azure/azure-sdk-for-go v43.0.0+incompatible"
+"github.com/Azure/azure-sdk-for-go v43.0.0+incompatible/go.mod"
+"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+"github.com/Azure/go-autorest v10.8.1+incompatible/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.6"
+"github.com/Azure/go-autorest/autorest v0.9.6/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.2.0"
+"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/to v0.2.0"
+"github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.1.0"
+"github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod"
+"github.com/Azure/go-autorest/logger v0.1.0"
+"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.5.0"
+"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+"github.com/BurntSushi/toml v0.3.1"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+"github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317"
+"github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317/go.mod"
+"github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab"
+"github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod"
+"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd"
+"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod"
+"github.com/Microsoft/go-winio v0.4.11/go.mod"
+"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
+"github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod"
+"github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod"
+"github.com/Microsoft/go-winio v0.4.17/go.mod"
+"github.com/Microsoft/go-winio v0.4.19"
+"github.com/Microsoft/go-winio v0.4.19/go.mod"
+"github.com/Microsoft/hcsshim v0.8.16"
+"github.com/Microsoft/hcsshim v0.8.16/go.mod"
+"github.com/Microsoft/hcsshim v0.8.20"
+"github.com/Microsoft/hcsshim v0.8.20/go.mod"
+"github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod"
+"github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3"
+"github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod"
+"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+"github.com/NYTimes/gziphandler v1.1.1"
+"github.com/NYTimes/gziphandler v1.1.1/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+"github.com/PuerkitoBio/purell v1.1.0/go.mod"
+"github.com/PuerkitoBio/purell v1.1.1"
+"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
+"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+"github.com/Rican7/retry v0.1.0"
+"github.com/Rican7/retry v0.1.0/go.mod"
+"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod"
+"github.com/agnivade/levenshtein v1.0.1/go.mod"
+"github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod"
+"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a"
+"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
+"github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod"
+"github.com/aws/aws-sdk-go v1.6.10/go.mod"
+"github.com/aws/aws-sdk-go v1.12.54/go.mod"
+"github.com/aws/aws-sdk-go v1.15.11/go.mod"
+"github.com/aws/aws-sdk-go v1.28.2"
+"github.com/aws/aws-sdk-go v1.28.2/go.mod"
+"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod"
+"github.com/bitly/go-simplejson v0.5.0/go.mod"
+"github.com/blang/semver v3.1.0+incompatible/go.mod"
+"github.com/blang/semver v3.5.0+incompatible"
+"github.com/blang/semver v3.5.0+incompatible/go.mod"
+"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/bronze1man/goStrongswanVici v0.0.0-20171013065002-4d72634a2f11/go.mod"
+"github.com/bronze1man/goStrongswanVici v0.0.0-20190828090544-27d02f80ba40"
+"github.com/bronze1man/goStrongswanVici v0.0.0-20190828090544-27d02f80ba40/go.mod"
+"github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod"
+"github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod"
+"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod"
+"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod"
+"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod"
+"github.com/caddyserver/caddy v1.0.3/go.mod"
+"github.com/canonical/go-dqlite v1.5.1"
+"github.com/canonical/go-dqlite v1.5.1/go.mod"
+"github.com/cenkalti/backoff v2.1.1+incompatible/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/cespare/xxhash v1.1.0"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5"
+"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod"
+"github.com/checkpoint-restore/go-criu/v4 v4.1.0"
+"github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod"
+"github.com/checkpoint-restore/go-criu/v5 v5.0.0"
+"github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod"
+"github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod"
+"github.com/cheggaaa/pb v1.0.29/go.mod"
+"github.com/chzyer/logex v1.1.10/go.mod"
+"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+"github.com/cilium/ebpf v0.0.0-20200601085316-9f1617e5c574/go.mod"
+"github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod"
+"github.com/cilium/ebpf v0.2.0/go.mod"
+"github.com/cilium/ebpf v0.4.0"
+"github.com/cilium/ebpf v0.4.0/go.mod"
+"github.com/cilium/ebpf v0.5.0"
+"github.com/cilium/ebpf v0.5.0/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+"github.com/codegangsta/negroni v1.0.0/go.mod"
+"github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod"
+"github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod"
+"github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod"
+"github.com/containerd/aufs v1.0.0"
+"github.com/containerd/aufs v1.0.0/go.mod"
+"github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod"
+"github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod"
+"github.com/containerd/btrfs v1.0.0"
+"github.com/containerd/btrfs v1.0.0/go.mod"
+"github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod"
+"github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod"
+"github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod"
+"github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod"
+"github.com/containerd/cgroups v1.0.1"
+"github.com/containerd/cgroups v1.0.1/go.mod"
+"github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod"
+"github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod"
+"github.com/containerd/console v1.0.1/go.mod"
+"github.com/containerd/console v1.0.2"
+"github.com/containerd/console v1.0.2/go.mod"
+"github.com/containerd/containerd v1.2.10/go.mod"
+"github.com/containerd/containerd v1.3.0/go.mod"
+"github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod"
+"github.com/containerd/containerd v1.3.2/go.mod"
+"github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod"
+"github.com/containerd/containerd v1.4.1/go.mod"
+"github.com/containerd/containerd v1.4.3/go.mod"
+"github.com/containerd/containerd v1.5.0-beta.1/go.mod"
+"github.com/containerd/containerd v1.5.0-beta.3/go.mod"
+"github.com/containerd/containerd v1.5.0-beta.4/go.mod"
+"github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod"
+"github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod"
+"github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod"
+"github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod"
+"github.com/containerd/fifo v1.0.0"
+"github.com/containerd/fifo v1.0.0/go.mod"
+"github.com/containerd/go-cni v1.0.1"
+"github.com/containerd/go-cni v1.0.1/go.mod"
+"github.com/containerd/go-cni v1.0.2"
+"github.com/containerd/go-cni v1.0.2/go.mod"
+"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+"github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod"
+"github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod"
+"github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod"
+"github.com/containerd/go-runc v1.0.0"
+"github.com/containerd/go-runc v1.0.0/go.mod"
+"github.com/containerd/imgcrypt v1.0.1/go.mod"
+"github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod"
+"github.com/containerd/imgcrypt v1.1.1"
+"github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887"
+"github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod"
+"github.com/containerd/imgcrypt v1.1.1/go.mod"
+"github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod"
+"github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod"
+"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+"github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod"
+"github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod"
+"github.com/containerd/ttrpc v1.0.1/go.mod"
+"github.com/containerd/ttrpc v1.0.2"
+"github.com/containerd/ttrpc v1.0.2/go.mod"
+"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+"github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod"
+"github.com/containerd/typeurl v1.0.1/go.mod"
+"github.com/containerd/typeurl v1.0.2"
+"github.com/containerd/typeurl v1.0.2/go.mod"
+"github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod"
+"github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod"
+"github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod"
+"github.com/containerd/zfs v1.0.0"
+"github.com/containerd/zfs v1.0.0/go.mod"
+"github.com/containernetworking/cni v0.7.1/go.mod"
+"github.com/containernetworking/cni v0.8.0"
+"github.com/containernetworking/cni v0.8.0/go.mod"
+"github.com/containernetworking/cni v0.8.1"
+"github.com/containernetworking/cni v0.8.1/go.mod"
+"github.com/containernetworking/plugins v0.8.6"
+"github.com/containernetworking/plugins v0.8.6/go.mod"
+"github.com/containernetworking/plugins v0.9.1"
+"github.com/containernetworking/plugins v0.9.1/go.mod"
+"github.com/containers/ocicrypt v1.0.1/go.mod"
+"github.com/containers/ocicrypt v1.1.0"
+"github.com/containers/ocicrypt v1.1.0/go.mod"
+"github.com/containers/ocicrypt v1.1.1"
+"github.com/containers/ocicrypt v1.1.1/go.mod"
+"github.com/container-storage-interface/spec v1.2.0"
+"github.com/container-storage-interface/spec v1.2.0/go.mod"
+"github.com/coredns/corefile-migration v1.0.10/go.mod"
+"github.com/coreos/bbolt v1.3.2/go.mod"
+"github.com/coreos/etcd v3.1.11+incompatible/go.mod"
+"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+"github.com/coreos/go-iptables v0.4.0/go.mod"
+"github.com/coreos/go-iptables v0.4.5/go.mod"
+"github.com/coreos/go-iptables v0.5.0"
+"github.com/coreos/go-iptables v0.5.0/go.mod"
+"github.com/coreos/go-oidc v2.1.0+incompatible"
+"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+"github.com/coreos/go-semver v0.2.0/go.mod"
+"github.com/coreos/go-semver v0.3.0"
+"github.com/coreos/go-semver v0.3.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
+"github.com/coreos/go-systemd/v22 v22.1.0/go.mod"
+"github.com/coreos/go-systemd/v22 v22.3.1"
+"github.com/coreos/go-systemd/v22 v22.3.1/go.mod"
+"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+"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/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+"github.com/creack/pty v1.1.7/go.mod"
+"github.com/cyphar/filepath-securejoin v0.2.2"
+"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
+"github.com/d2g/dhcp4client v1.0.0/go.mod"
+"github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod"
+"github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod"
+"github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod"
+"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd"
+"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20170629053852-f6cab0c35083/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod"
+"github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/dnaeon/go-vcr v1.0.1"
+"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+"github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod"
+"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+"github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible"
+"github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod"
+"github.com/docker/docker v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible"
+"github.com/docker/docker v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible/go.mod"
+"github.com/docker/go-connections v0.4.0"
+"github.com/docker/go-connections v0.4.0/go.mod"
+"github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod"
+"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c"
+"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod"
+"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod"
+"github.com/docker/go-metrics v0.0.1"
+"github.com/docker/go-metrics v0.0.1/go.mod"
+"github.com/docker/go-units v0.3.3/go.mod"
+"github.com/docker/go-units v0.4.0"
+"github.com/docker/go-units v0.4.0/go.mod"
+"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod"
+"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
+"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
+"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+"github.com/dustin/go-humanize v1.0.0"
+"github.com/dustin/go-humanize v1.0.0/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
+"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+"github.com/emicklei/go-restful v2.9.5+incompatible"
+"github.com/emicklei/go-restful v2.9.5+incompatible/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83"
+"github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83/go.mod"
+"github.com/euank/go-kmsg-parser v2.0.0+incompatible"
+"github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod"
+"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+"github.com/evanphx/json-patch v4.5.0+incompatible/go.mod"
+"github.com/evanphx/json-patch v4.9.0+incompatible"
+"github.com/evanphx/json-patch v4.9.0+incompatible/go.mod"
+"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d"
+"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod"
+"github.com/fatih/camelcase v1.0.0"
+"github.com/fatih/camelcase v1.0.0/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+"github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod"
+"github.com/frankban/quicktest v1.11.3"
+"github.com/frankban/quicktest v1.11.3/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/fsnotify/fsnotify v1.4.9"
+"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+"github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod"
+"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod"
+"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+"github.com/ghodss/yaml v1.0.0"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod"
+"github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod"
+"github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod"
+"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c"
+"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod"
+"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+"github.com/godbus/dbus/v5 v5.0.4"
+"github.com/godbus/dbus/v5 v5.0.4/go.mod"
+"github.com/gofrs/flock v0.7.1"
+"github.com/gofrs/flock v0.7.1/go.mod"
+"github.com/gogo/googleapis v1.2.0/go.mod"
+"github.com/gogo/googleapis v1.4.0"
+"github.com/gogo/googleapis v1.4.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/gogo/protobuf v1.3.0/go.mod"
+"github.com/gogo/protobuf v1.3.1/go.mod"
+"github.com/gogo/protobuf v1.3.2"
+"github.com/gogo/protobuf v1.3.2/go.mod"
+"github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450"
+"github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod"
+"github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995"
+"github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod"
+"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e"
+"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod"
+"github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
+"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/mock v1.3.1"
+"github.com/golang/mock v1.3.1/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/protobuf v1.3.5"
+"github.com/golang/protobuf v1.3.5/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+"github.com/golang/protobuf v1.4.0/go.mod"
+"github.com/golang/protobuf v1.4.1/go.mod"
+"github.com/golang/protobuf v1.4.3"
+"github.com/golang/protobuf v1.4.3/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod"
+"github.com/googleapis/gnostic v0.2.0/go.mod"
+"github.com/googleapis/gnostic v0.3.1/go.mod"
+"github.com/googleapis/gnostic v0.4.1"
+"github.com/googleapis/gnostic v0.4.1/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/cadvisor v0.37.5"
+"github.com/google/cadvisor v0.37.5/go.mod"
+"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/gofuzz v1.1.0"
+"github.com/google/gofuzz v1.1.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.0/go.mod"
+"github.com/google/go-cmp v0.5.1/go.mod"
+"github.com/google/go-cmp v0.5.2/go.mod"
+"github.com/google/go-cmp v0.5.4"
+"github.com/google/go-cmp v0.5.4/go.mod"
+"github.com/google/go-containerregistry v0.0.0-20190617215043-876b8855d23c/go.mod"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+"github.com/google/renameio v0.1.0/go.mod"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
+"github.com/google/uuid v1.0.0/go.mod"
+"github.com/google/uuid v1.1.1/go.mod"
+"github.com/google/uuid v1.1.2/go.mod"
+"github.com/google/uuid v1.2.0"
+"github.com/google/uuid v1.2.0/go.mod"
+"github.com/gophercloud/gophercloud v0.1.0"
+"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+"github.com/gorilla/context v1.1.1/go.mod"
+"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod"
+"github.com/gorilla/mux v1.7.2/go.mod"
+"github.com/gorilla/mux v1.7.3/go.mod"
+"github.com/gorilla/mux v1.7.4"
+"github.com/gorilla/mux v1.7.4/go.mod"
+"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/gorilla/websocket v1.4.1"
+"github.com/gorilla/websocket v1.4.1/go.mod"
+"github.com/go-acme/lego v2.5.0+incompatible/go.mod"
+"github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod"
+"github.com/go-bindata/go-bindata v3.1.2+incompatible"
+"github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+"github.com/go-ini/ini v1.9.0/go.mod"
+"github.com/go-ini/ini v1.25.4/go.mod"
+"github.com/go-ini/ini v1.28.1/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logr/logr v0.1.0/go.mod"
+"github.com/go-logr/logr v0.2.0"
+"github.com/go-logr/logr v0.2.0/go.mod"
+"github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod"
+"github.com/go-openapi/analysis v0.17.0/go.mod"
+"github.com/go-openapi/analysis v0.18.0/go.mod"
+"github.com/go-openapi/analysis v0.19.2/go.mod"
+"github.com/go-openapi/analysis v0.19.5"
+"github.com/go-openapi/analysis v0.19.5/go.mod"
+"github.com/go-openapi/errors v0.17.0/go.mod"
+"github.com/go-openapi/errors v0.18.0/go.mod"
+"github.com/go-openapi/errors v0.19.2"
+"github.com/go-openapi/errors v0.19.2/go.mod"
+"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+"github.com/go-openapi/jsonpointer v0.17.0/go.mod"
+"github.com/go-openapi/jsonpointer v0.18.0/go.mod"
+"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
+"github.com/go-openapi/jsonpointer v0.19.3"
+"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
+"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+"github.com/go-openapi/jsonreference v0.17.0/go.mod"
+"github.com/go-openapi/jsonreference v0.18.0/go.mod"
+"github.com/go-openapi/jsonreference v0.19.2/go.mod"
+"github.com/go-openapi/jsonreference v0.19.3"
+"github.com/go-openapi/jsonreference v0.19.3/go.mod"
+"github.com/go-openapi/loads v0.17.0/go.mod"
+"github.com/go-openapi/loads v0.18.0/go.mod"
+"github.com/go-openapi/loads v0.19.0/go.mod"
+"github.com/go-openapi/loads v0.19.2/go.mod"
+"github.com/go-openapi/loads v0.19.4"
+"github.com/go-openapi/loads v0.19.4/go.mod"
+"github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod"
+"github.com/go-openapi/runtime v0.19.0/go.mod"
+"github.com/go-openapi/runtime v0.19.4"
+"github.com/go-openapi/runtime v0.19.4/go.mod"
+"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+"github.com/go-openapi/spec v0.17.0/go.mod"
+"github.com/go-openapi/spec v0.18.0/go.mod"
+"github.com/go-openapi/spec v0.19.2/go.mod"
+"github.com/go-openapi/spec v0.19.3"
+"github.com/go-openapi/spec v0.19.3/go.mod"
+"github.com/go-openapi/strfmt v0.17.0/go.mod"
+"github.com/go-openapi/strfmt v0.18.0/go.mod"
+"github.com/go-openapi/strfmt v0.19.0/go.mod"
+"github.com/go-openapi/strfmt v0.19.3"
+"github.com/go-openapi/strfmt v0.19.3/go.mod"
+"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+"github.com/go-openapi/swag v0.17.0/go.mod"
+"github.com/go-openapi/swag v0.18.0/go.mod"
+"github.com/go-openapi/swag v0.19.2/go.mod"
+"github.com/go-openapi/swag v0.19.5"
+"github.com/go-openapi/swag v0.19.5/go.mod"
+"github.com/go-openapi/validate v0.18.0/go.mod"
+"github.com/go-openapi/validate v0.19.2/go.mod"
+"github.com/go-openapi/validate v0.19.5"
+"github.com/go-openapi/validate v0.19.5/go.mod"
+"github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod"
+"github.com/go-sql-driver/mysql v1.4.1"
+"github.com/go-sql-driver/mysql v1.4.1/go.mod"
+"github.com/go-stack/stack v1.8.0"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+"github.com/hashicorp/errwrap v1.0.0"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.3"
+"github.com/hashicorp/golang-lru v0.5.3/go.mod"
+"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible/go.mod"
+"github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod"
+"github.com/hpcloud/tail v1.0.0"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+"github.com/imdario/mergo v0.3.5/go.mod"
+"github.com/imdario/mergo v0.3.7/go.mod"
+"github.com/imdario/mergo v0.3.8/go.mod"
+"github.com/imdario/mergo v0.3.10/go.mod"
+"github.com/imdario/mergo v0.3.11"
+"github.com/imdario/mergo v0.3.11/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7/go.mod"
+"github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5/go.mod"
+"github.com/jamescun/tuntap v0.0.0-20190712092105-cb1fb277045c/go.mod"
+"github.com/jetstack/cert-manager v0.7.2/go.mod"
+"github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/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/joho/godotenv v0.0.0-20161216230537-726cc8b906e3/go.mod"
+"github.com/jonboulle/clockwork v0.1.0"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.10"
+"github.com/json-iterator/go v1.1.10/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+"github.com/jtolds/gls v4.20.0+incompatible"
+"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod"
+"github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod"
+"github.com/k3s-io/containerd v1.4.9-k3s1"
+"github.com/k3s-io/containerd v1.4.9-k3s1/go.mod"
+"github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1"
+"github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1/go.mod"
+"github.com/k3s-io/cri v1.4.0-k3s.7"
+"github.com/k3s-io/cri v1.4.0-k3s.7/go.mod"
+"github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea"
+"github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea/go.mod"
+"github.com/k3s-io/helm-controller v0.10.5"
+"github.com/k3s-io/helm-controller v0.10.5/go.mod"
+"github.com/k3s-io/kine v0.6.2"
+"github.com/k3s-io/kine v0.6.2/go.mod"
+"github.com/k3s-io/kubernetes v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.19.15-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.19.15-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.19.15-k3s1/go.mod"
+"github.com/karrick/godirwalk v1.7.5"
+"github.com/karrick/godirwalk v1.7.5/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/errcheck v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.5.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/klauspost/compress v1.11.3/go.mod"
+"github.com/klauspost/cpuid v1.2.0/go.mod"
+"github.com/klauspost/cpuid v1.2.3/go.mod"
+"github.com/klauspost/cpuid v1.3.1"
+"github.com/klauspost/cpuid v1.3.1/go.mod"
+"github.com/knative/build v0.6.0/go.mod"
+"github.com/knative/pkg v0.0.0-20190514205332-5e4512dcb2ca/go.mod"
+"github.com/knative/serving v0.6.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pretty v0.2.1"
+"github.com/kr/pretty v0.2.1/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/pty v1.1.5/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+"github.com/libopenstorage/openstorage v1.0.0/go.mod"
+"github.com/lib/pq v1.8.0"
+"github.com/lib/pq v1.8.0/go.mod"
+"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de"
+"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod"
+"github.com/lithammer/dedent v1.1.0"
+"github.com/lithammer/dedent v1.1.0/go.mod"
+"github.com/lpabon/godbc v0.1.1/go.mod"
+"github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod"
+"github.com/lucas-clemente/quic-clients v0.1.0/go.mod"
+"github.com/lucas-clemente/quic-go v0.10.2/go.mod"
+"github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod"
+"github.com/magiconair/properties v1.8.0/go.mod"
+"github.com/magiconair/properties v1.8.1/go.mod"
+"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
+"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+"github.com/mailru/easyjson v0.7.0"
+"github.com/mailru/easyjson v0.7.0/go.mod"
+"github.com/marstr/guid v1.1.0/go.mod"
+"github.com/marten-seemann/qtls v0.2.3/go.mod"
+"github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-isatty v0.0.4/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-runewidth v0.0.2/go.mod"
+"github.com/mattn/go-runewidth v0.0.4/go.mod"
+"github.com/mattn/go-shellwords v1.0.3/go.mod"
+"github.com/mattn/go-sqlite3 v1.14.4"
+"github.com/mattn/go-sqlite3 v1.14.4/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
+"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
+"github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod"
+"github.com/miekg/dns v1.1.3/go.mod"
+"github.com/miekg/dns v1.1.4"
+"github.com/miekg/dns v1.1.4/go.mod"
+"github.com/miekg/pkcs11 v1.0.3"
+"github.com/miekg/pkcs11 v1.0.3/go.mod"
+"github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989"
+"github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989/go.mod"
+"github.com/minio/md5-simd v1.1.0"
+"github.com/minio/md5-simd v1.1.0/go.mod"
+"github.com/minio/minio-go/v7 v7.0.7"
+"github.com/minio/minio-go/v7 v7.0.7/go.mod"
+"github.com/minio/sha256-simd v0.1.1"
+"github.com/minio/sha256-simd v0.1.1/go.mod"
+"github.com/minio/sio v0.2.1/go.mod"
+"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible"
+"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-wordwrap v1.0.0"
+"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod"
+"github.com/moby/ipvs v1.0.1"
+"github.com/moby/ipvs v1.0.1/go.mod"
+"github.com/moby/sys/mountinfo v0.1.3"
+"github.com/moby/sys/mountinfo v0.1.3/go.mod"
+"github.com/moby/sys/mountinfo v0.4.0/go.mod"
+"github.com/moby/sys/mountinfo v0.4.1"
+"github.com/moby/sys/mountinfo v0.4.1/go.mod"
+"github.com/moby/sys/symlink v0.1.0/go.mod"
+"github.com/moby/term v0.0.0-20200312100748-672ec06f55cd"
+"github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod"
+"github.com/moby/vpnkit v0.4.0/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod"
+"github.com/morikuni/aec v1.0.0"
+"github.com/morikuni/aec v1.0.0/go.mod"
+"github.com/mrunalp/fileutils v0.0.0-20200520151820-abd8a0e76976"
+"github.com/mrunalp/fileutils v0.0.0-20200520151820-abd8a0e76976/go.mod"
+"github.com/mrunalp/fileutils v0.5.0"
+"github.com/mrunalp/fileutils v0.5.0/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822"
+"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod"
+"github.com/mvdan/xurls v1.1.0/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+"github.com/naoina/go-stringutil v0.1.0/go.mod"
+"github.com/naoina/toml v0.1.1/go.mod"
+"github.com/natefinch/lumberjack v2.0.0+incompatible"
+"github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod"
+"github.com/ncw/swift v1.0.47/go.mod"
+"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+"github.com/nxadm/tail v1.4.4"
+"github.com/nxadm/tail v1.4.4/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.8.0/go.mod"
+"github.com/onsi/ginkgo v1.10.3/go.mod"
+"github.com/onsi/ginkgo v1.11.0"
+"github.com/onsi/ginkgo v1.11.0/go.mod"
+"github.com/onsi/ginkgo v1.12.1/go.mod"
+"github.com/onsi/ginkgo v1.14.0"
+"github.com/onsi/ginkgo v1.14.0/go.mod"
+"github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod"
+"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+"github.com/onsi/gomega v1.5.0/go.mod"
+"github.com/onsi/gomega v1.7.0/go.mod"
+"github.com/onsi/gomega v1.7.1"
+"github.com/onsi/gomega v1.7.1/go.mod"
+"github.com/onsi/gomega v1.10.1/go.mod"
+"github.com/onsi/gomega v1.10.3"
+"github.com/onsi/gomega v1.10.3/go.mod"
+"github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod"
+"github.com/opencontainers/go-digest v1.0.0"
+"github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod"
+"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+"github.com/opencontainers/go-digest v1.0.0/go.mod"
+"github.com/opencontainers/image-spec v1.0.0/go.mod"
+"github.com/opencontainers/image-spec v1.0.1"
+"github.com/opencontainers/image-spec v1.0.1/go.mod"
+"github.com/opencontainers/runc v1.0.0-rc92"
+"github.com/opencontainers/runc v1.0.0-rc92/go.mod"
+"github.com/opencontainers/runc v1.0.0-rc94"
+"github.com/opencontainers/runc v1.0.0-rc94/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.1/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.2/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod"
+"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+"github.com/opencontainers/selinux v1.5.2/go.mod"
+"github.com/opencontainers/selinux v1.6.0/go.mod"
+"github.com/opencontainers/selinux v1.8.0"
+"github.com/opencontainers/selinux v1.8.0/go.mod"
+"github.com/pborman/uuid v1.2.0/go.mod"
+"github.com/pborman/uuid v1.2.1/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/peterbourgon/diskv v2.0.1+incompatible"
+"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.5.2+incompatible"
+"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pkg/errors v0.9.1"
+"github.com/pkg/errors v0.9.1/go.mod"
+"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021"
+"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
+"github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.1.0/go.mod"
+"github.com/prometheus/client_golang v1.7.1"
+"github.com/prometheus/client_golang v1.7.1/go.mod"
+"github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.6.0/go.mod"
+"github.com/prometheus/common v0.10.0"
+"github.com/prometheus/common v0.10.0/go.mod"
+"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.3/go.mod"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/prometheus/procfs v0.1.3"
+"github.com/prometheus/procfs v0.1.3/go.mod"
+"github.com/prometheus/procfs v0.6.0"
+"github.com/prometheus/procfs v0.6.0/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/quobyte/api v0.1.2/go.mod"
+"github.com/rakelkar/gonetsh v0.0.0-20190930180311-e5c5ffe4bdf0"
+"github.com/rakelkar/gonetsh v0.0.0-20190930180311-e5c5ffe4bdf0/go.mod"
+"github.com/rancher/cri-tools v1.19.0-k3s1"
+"github.com/rancher/cri-tools v1.19.0-k3s1/go.mod"
+"github.com/rancher/dynamiclistener v0.2.2"
+"github.com/rancher/dynamiclistener v0.2.2/go.mod"
+"github.com/rancher/flannel v0.12.0-k3s1"
+"github.com/rancher/flannel v0.12.0-k3s1/go.mod"
+"github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79"
+"github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79/go.mod"
+"github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373"
+"github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373/go.mod"
+"github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009/go.mod"
+"github.com/rancher/remotedialer v0.2.0"
+"github.com/rancher/remotedialer v0.2.0/go.mod"
+"github.com/rancher/wrangler v0.1.4/go.mod"
+"github.com/rancher/wrangler v0.4.0/go.mod"
+"github.com/rancher/wrangler v0.6.0/go.mod"
+"github.com/rancher/wrangler v0.6.1/go.mod"
+"github.com/rancher/wrangler v0.6.2"
+"github.com/rancher/wrangler v0.6.2/go.mod"
+"github.com/rancher/wrangler-api v0.2.0/go.mod"
+"github.com/rancher/wrangler-api v0.6.0"
+"github.com/rancher/wrangler-api v0.6.0/go.mod"
+"github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod"
+"github.com/robfig/cron v1.1.0"
+"github.com/robfig/cron v1.1.0/go.mod"
+"github.com/robfig/cron/v3 v3.0.1"
+"github.com/robfig/cron/v3 v3.0.1/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+"github.com/rootless-containers/rootlesskit v0.10.0"
+"github.com/rootless-containers/rootlesskit v0.10.0/go.mod"
+"github.com/rs/xid v1.2.1"
+"github.com/rs/xid v1.2.1/go.mod"
+"github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021"
+"github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021/go.mod"
+"github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod"
+"github.com/russross/blackfriday v1.5.2"
+"github.com/russross/blackfriday v1.5.2/go.mod"
+"github.com/russross/blackfriday/v2 v2.0.1"
+"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+"github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod"
+"github.com/satori/go.uuid v1.2.0"
+"github.com/satori/go.uuid v1.2.0/go.mod"
+"github.com/seccomp/libseccomp-golang v0.9.1"
+"github.com/seccomp/libseccomp-golang v0.9.1/go.mod"
+"github.com/sergi/go-diff v1.0.0/go.mod"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+"github.com/sirupsen/logrus v1.0.6/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.1/go.mod"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/sirupsen/logrus v1.6.0/go.mod"
+"github.com/sirupsen/logrus v1.7.0"
+"github.com/sirupsen/logrus v1.7.0/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+"github.com/smartystreets/goconvey v1.6.4"
+"github.com/smartystreets/goconvey v1.6.4/go.mod"
+"github.com/soheilhy/cmux v0.1.4"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/afero v1.2.2"
+"github.com/spf13/afero v1.2.2/go.mod"
+"github.com/spf13/cast v1.3.0/go.mod"
+"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+"github.com/spf13/cobra v0.0.3/go.mod"
+"github.com/spf13/cobra v1.0.0"
+"github.com/spf13/cobra v1.0.0/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
+"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+"github.com/spf13/pflag v1.0.1/go.mod"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/pflag v1.0.5"
+"github.com/spf13/pflag v1.0.5/go.mod"
+"github.com/spf13/viper v1.4.0/go.mod"
+"github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980"
+"github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod"
+"github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod"
+"github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/objx v0.2.0"
+"github.com/stretchr/objx v0.2.0/go.mod"
+"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+"github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod"
+"github.com/stretchr/testify v1.2.2"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/stretchr/testify v1.5.1/go.mod"
+"github.com/stretchr/testify v1.6.1"
+"github.com/stretchr/testify v1.6.1/go.mod"
+"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
+"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2"
+"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod"
+"github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635"
+"github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod"
+"github.com/tchap/go-patricia v2.2.6+incompatible"
+"github.com/tchap/go-patricia v2.2.6+incompatible/go.mod"
+"github.com/tchap/go-patricia v2.3.0+incompatible"
+"github.com/tchap/go-patricia v2.3.0+incompatible/go.mod"
+"github.com/tektoncd/pipeline v0.4.0/go.mod"
+"github.com/thecodeteam/goscaleio v0.1.0/go.mod"
+"github.com/tidwall/pretty v1.0.0"
+"github.com/tidwall/pretty v1.0.0/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/ugorji/go v0.0.0-20170107133203-ded73eae5db7/go.mod"
+"github.com/ugorji/go v1.1.4/go.mod"
+"github.com/urfave/cli v1.20.0/go.mod"
+"github.com/urfave/cli v1.21.0/go.mod"
+"github.com/urfave/cli v1.22.1"
+"github.com/urfave/cli v1.22.1/go.mod"
+"github.com/urfave/cli v1.22.2"
+"github.com/urfave/cli v1.22.2/go.mod"
+"github.com/urfave/cli/v2 v2.2.0"
+"github.com/urfave/cli/v2 v2.2.0/go.mod"
+"github.com/urfave/negroni v1.0.0/go.mod"
+"github.com/u-root/u-root v6.0.0+incompatible/go.mod"
+"github.com/vektah/gqlparser v1.1.2/go.mod"
+"github.com/vishvananda/netlink v0.0.0-20170220200719-fe3b5664d23a/go.mod"
+"github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod"
+"github.com/vishvananda/netlink v1.1.0"
+"github.com/vishvananda/netlink v1.1.0/go.mod"
+"github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852"
+"github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod"
+"github.com/vishvananda/netns v0.0.0-20170219233438-54f0e4339ce7/go.mod"
+"github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod"
+"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df"
+"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod"
+"github.com/vishvananda/netns v0.0.0-20200520041808-52d707b772fe/go.mod"
+"github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae"
+"github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod"
+"github.com/vmware/govmomi v0.20.3"
+"github.com/vmware/govmomi v0.20.3/go.mod"
+"github.com/willf/bitset v1.1.11"
+"github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod"
+"github.com/willf/bitset v1.1.11/go.mod"
+"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1"
+"github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod"
+"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"github.com/yuin/goldmark v1.2.1/go.mod"
+"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod"
+"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod"
+"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de"
+"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod"
+"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83"
+"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+"golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod"
+"golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod"
+"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+"golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod"
+"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+"golang.org/x/exp v0.0.0-20191227195350-da58074b4299"
+"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+"golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod"
+"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+"golang.org/x/mod v0.1.0/go.mod"
+"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/mod v0.3.0"
+"golang.org/x/mod v0.3.0/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+"golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+"golang.org/x/net v0.0.0-20201224014010-6772e930b67b"
+"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
+"golang.org/x/net v0.0.0-20210224082022-3d97a244fca7"
+"golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6"
+"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a"
+"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod"
+"golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod"
+"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+"golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod"
+"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
+"golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod"
+"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod"
+"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+"golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod"
+"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+"golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+"golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod"
+"golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod"
+"golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod"
+"golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod"
+"golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod"
+"golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod"
+"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+"golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+"golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod"
+"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c"
+"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+"golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073"
+"golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod"
+"golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod"
+"golang.org/x/sys v0.0.0-20210426230700-d19ff857e887"
+"golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod"
+"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
+"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod"
+"golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+"golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod"
+"golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod"
+"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
+"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+"golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod"
+"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+"golang.org/x/tools v0.0.0-20191017205301-920acffc3e65/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+"golang.org/x/tools v0.0.0-20210106214847-113979e3529a"
+"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/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"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+"gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod"
+"gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod"
+"gonum.org/v1/gonum v0.6.2"
+"gonum.org/v1/gonum v0.6.2/go.mod"
+"gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod"
+"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e"
+"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod"
+"gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod"
+"google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod"
+"google.golang.org/api v0.4.0/go.mod"
+"google.golang.org/api v0.7.0/go.mod"
+"google.golang.org/api v0.8.0/go.mod"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/api v0.15.0/go.mod"
+"google.golang.org/api v0.15.1"
+"google.golang.org/api v0.15.1-0.20200106000736-b8fc810ca6b5/go.mod"
+"google.golang.org/api v0.15.1/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.1/go.mod"
+"google.golang.org/appengine v1.6.5"
+"google.golang.org/appengine v1.6.5/go.mod"
+"google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63"
+"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+"google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.1/go.mod"
+"google.golang.org/grpc v1.21.0/go.mod"
+"google.golang.org/grpc v1.21.1/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.23.1/go.mod"
+"google.golang.org/grpc v1.24.0/go.mod"
+"google.golang.org/grpc v1.25.1/go.mod"
+"google.golang.org/grpc v1.26.0/go.mod"
+"google.golang.org/grpc v1.27.0/go.mod"
+"google.golang.org/grpc v1.27.1"
+"google.golang.org/grpc v1.27.1/go.mod"
+"google.golang.org/grpc v1.30.0/go.mod"
+"google.golang.org/grpc v1.33.2"
+"google.golang.org/grpc v1.33.2/go.mod"
+"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+"google.golang.org/protobuf v1.21.0/go.mod"
+"google.golang.org/protobuf v1.22.0/go.mod"
+"google.golang.org/protobuf v1.23.0/go.mod"
+"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+"google.golang.org/protobuf v1.24.0/go.mod"
+"google.golang.org/protobuf v1.25.0"
+"google.golang.org/protobuf v1.25.0/go.mod"
+"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+"gopkg.in/errgo.v2 v2.1.0/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gcfg.v1 v1.2.0"
+"gopkg.in/gcfg.v1 v1.2.0/go.mod"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+"gopkg.in/inf.v0 v0.9.1"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/ini.v1 v1.57.0"
+"gopkg.in/ini.v1 v1.57.0/go.mod"
+"gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod"
+"gopkg.in/natefinch/lumberjack.v2 v2.0.0"
+"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.2.2"
+"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
+"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+"gopkg.in/square/go-jose.v2 v2.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/warnings.v0 v0.1.1"
+"gopkg.in/warnings.v0 v0.1.1/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"gopkg.in/yaml.v2 v2.3.0/go.mod"
+"gopkg.in/yaml.v2 v2.4.0"
+"gopkg.in/yaml.v2 v2.4.0/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
+"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
+"gotest.tools v2.2.0+incompatible"
+"gotest.tools v2.2.0+incompatible/go.mod"
+"gotest.tools/v3 v3.0.2/go.mod"
+"gotest.tools/v3 v3.0.3"
+"gotest.tools/v3 v3.0.3/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.etcd.io/bbolt v1.3.3/go.mod"
+"go.etcd.io/bbolt v1.3.5"
+"go.etcd.io/bbolt v1.3.5/go.mod"
+"go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod"
+"go.mongodb.org/mongo-driver v1.0.3/go.mod"
+"go.mongodb.org/mongo-driver v1.1.1/go.mod"
+"go.mongodb.org/mongo-driver v1.1.2"
+"go.mongodb.org/mongo-driver v1.1.2/go.mod"
+"go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1"
+"go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0/go.mod"
+"go.opencensus.io v0.22.2/go.mod"
+"go.opencensus.io v0.22.3"
+"go.opencensus.io v0.22.3/go.mod"
+"go.uber.org/atomic v1.3.2/go.mod"
+"go.uber.org/atomic v1.4.0"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/multierr v1.1.0"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/zap v1.10.0"
+"go.uber.org/zap v1.10.0/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+"k8s.io/apimachinery v0.19.10"
+"k8s.io/apimachinery v0.19.10/go.mod"
+"k8s.io/apiserver v0.19.10"
+"k8s.io/apiserver v0.19.10/go.mod"
+"k8s.io/api v0.19.10"
+"k8s.io/api v0.19.10/go.mod"
+"k8s.io/client-go v0.19.10"
+"k8s.io/client-go v0.19.10/go.mod"
+"k8s.io/component-base v0.19.10/go.mod"
+"k8s.io/cri-api v0.19.10"
+"k8s.io/cri-api v0.19.10/go.mod"
+"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+"k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a/go.mod"
+"k8s.io/gengo v0.0.0-20191120174120-e74f70b9b27e/go.mod"
+"k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod"
+"k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod"
+"k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14"
+"k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod"
+"k8s.io/heapster v1.2.0-beta.1"
+"k8s.io/heapster v1.2.0-beta.1/go.mod"
+"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+"k8s.io/klog v0.3.0/go.mod"
+"k8s.io/klog v1.0.0"
+"k8s.io/klog v1.0.0/go.mod"
+"k8s.io/klog/v2 v2.0.0/go.mod"
+"k8s.io/klog/v2 v2.2.0"
+"k8s.io/klog/v2 v2.2.0/go.mod"
+"k8s.io/klog/v2 v2.4.0"
+"k8s.io/klog/v2 v2.4.0/go.mod"
+"k8s.io/kube-openapi v0.0.0-20190502190224-411b2483e503/go.mod"
+"k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6"
+"k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod"
+"k8s.io/system-validators v1.1.2/go.mod"
+"k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod"
+"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
+"k8s.io/utils v0.0.0-20200414100711-2df71ebbae66/go.mod"
+"k8s.io/utils v0.0.0-20200729134348-d5654de09c73"
+"k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod"
+"k8s.io/utils v0.0.0-20201110183641-67b214c5f920"
+"k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod"
+"modernc.org/cc v1.0.0/go.mod"
+"modernc.org/golex v1.0.0/go.mod"
+"modernc.org/mathutil v1.0.0/go.mod"
+"modernc.org/strutil v1.0.0/go.mod"
+"modernc.org/xc v1.0.0/go.mod"
+"rsc.io/binaryregexp v0.2.0/go.mod"
+"rsc.io/pdf v0.1.1/go.mod"
+"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15"
+"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod"
+"sigs.k8s.io/kustomize v2.0.3+incompatible"
+"sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod"
+"sigs.k8s.io/structured-merge-diff v0.0.0-20190426204423-ea680f03cc65"
+"sigs.k8s.io/structured-merge-diff v0.0.0-20190426204423-ea680f03cc65/go.mod"
+"sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod"
+"sigs.k8s.io/structured-merge-diff/v4 v4.0.3"
+"sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod"
+"sigs.k8s.io/structured-merge-diff/v4 v4.1.2"
+"sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+"sigs.k8s.io/yaml v1.2.0"
+"sigs.k8s.io/yaml v1.2.0/go.mod"
+"vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc"
+"vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod"
+)
+go-module_set_globals
+MY_PV=${PV}+k3s1
+SRC_URI="https://github.com/k3s-io/k3s/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+	https://github.com/opencontainers/runc/archive/refs/tags/v1.0.0-rc95.tar.gz -> k3s-runc-${K3S_RUNC_VERSION}.tar.gz
+	https://charts.helm.sh/stable/packages/traefik-${K3S_TRAEFIK_VERSION}.tgz
+	https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz
+	amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+kubectl-symlink rootless"
+REQUIRED_USE="|| ( amd64 )"
+DEPEND="
+	net-firewall/conntrack-tools
+	rootless? ( app-emulation/slirp4netns )
+"
+RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )"
+RESTRICT+=" test"
+
+S=${WORKDIR}/${PN}-${MY_PV/+/-}
+
+k3s_unpack_filter() {
+	grep -v -F \
+		-e "k3s-runc-${K3S_RUNC_VERSION}.tar.gz" \
+		-e "traefik-${K3S_TRAEFIK_VERSION}.tgz" \
+		-e "k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz"
+}
+
+src_unpack() {
+	read -d '' A < <(printf -- '%s\n' ${A} | k3s_unpack_filter)
+	go-module_src_unpack
+	mkdir -p bin/aux build/static/charts cache || die
+	cp "${DISTDIR}/traefik-${K3S_TRAEFIK_VERSION}.tgz" build/static/charts/ || die
+	cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die
+	mv "${WORKDIR}/bin/"* "${S}/bin/" || die
+	mv "${WORKDIR}/etc" "${S}/etc" || die
+}
+
+src_prepare() {
+	local filename pattern replacement
+	default
+
+	local RUNC_DIR=build/src/github.com/opencontainers/runc
+	mkdir -p "${RUNC_DIR}" || die
+	tar -x --strip-components=1 -f "${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}.tar.gz" -C "${RUNC_DIR}" || die
+	sed -e 's|mod=vendor|mod=readonly|g' -i "${RUNC_DIR}/Makefile" || die
+
+	# Disable download for files fetched via SRC_URI.
+	sed -e 's:^curl:#\0:' \
+		-e 's:^git:#\0:' \
+		-e 's:^rm -rf \${CHARTS_DIR}:#\0:' \
+		-e 's:^rm -rf \${RUNC_DIR}:#\0:' \
+		-i scripts/download || die
+	sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die
+	pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR'
+	filename=scripts/build
+	grep -qF "${pattern}" "${filename}" || \
+		die "failed to locate plugins clone command"
+	sed -e "s|${pattern}|mkdir -p \"\$WORKDIR\" \\&\\& tar -xzf cache/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz --strip-components=1 -C \"\$WORKDIR\"|" \
+		-e 's|rm -rf $TMPDIR||' \
+		-i "${filename}" || die
+	sed -e 's:/usr/local/bin:/usr/bin:g' -i k3s.service || die
+	sed -e 's|mod=vendor|mod=readonly|g' -i vendor/github.com/opencontainers/runc/Makefile || die
+}
+
+src_compile() {
+	mkdir -p build/data || die
+	"${BASH}" -ex ./scripts/download || die
+	./scripts/build || die
+	./scripts/package-cli || die
+}
+
+src_install() {
+	dobin "dist/artifacts/${PN}"
+	use kubectl-symlink && dosym k3s /usr/bin/kubectl
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	dodoc README.md
+}
diff --git a/sys-cluster/k3s/k3s-1.20.11.ebuild b/sys-cluster/k3s/k3s-1.20.11.ebuild
new file mode 100644
index 000000000000..20b0aca0b3c9
--- /dev/null
+++ b/sys-cluster/k3s/k3s-1.20.11.ebuild
@@ -0,0 +1,1628 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module linux-info systemd
+
+DESCRIPTION="Lightweight Kubernetes"
+HOMEPAGE="https://k3s.io"
+K3S_RUNC_VERSION=v1.0.0-rc95
+K3S_ROOT_VERSION=0.9.1
+K3S_TRAEFIK_VERSION=1.81.0
+K3S_CNIPLUGINS_VERSION=0.9.1
+CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN"
+
+EGO_SUM=(
+"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+"bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod"
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.38.0/go.mod"
+"cloud.google.com/go v0.44.1/go.mod"
+"cloud.google.com/go v0.44.2/go.mod"
+"cloud.google.com/go v0.45.1/go.mod"
+"cloud.google.com/go v0.46.3/go.mod"
+"cloud.google.com/go v0.50.0/go.mod"
+"cloud.google.com/go v0.51.0/go.mod"
+"cloud.google.com/go v0.52.0/go.mod"
+"cloud.google.com/go v0.53.0/go.mod"
+"cloud.google.com/go v0.54.0"
+"cloud.google.com/go v0.54.0/go.mod"
+"cloud.google.com/go/bigquery v1.0.1/go.mod"
+"cloud.google.com/go/bigquery v1.3.0/go.mod"
+"cloud.google.com/go/bigquery v1.4.0/go.mod"
+"cloud.google.com/go/datastore v1.0.0/go.mod"
+"cloud.google.com/go/datastore v1.1.0/go.mod"
+"cloud.google.com/go/firestore v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.0.1/go.mod"
+"cloud.google.com/go/pubsub v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.2.0/go.mod"
+"cloud.google.com/go/storage v1.0.0/go.mod"
+"cloud.google.com/go/storage v1.5.0/go.mod"
+"cloud.google.com/go/storage v1.6.0/go.mod"
+"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+"github.com/AkihiroSuda/containerd-fuse-overlayfs v1.0.0"
+"github.com/AkihiroSuda/containerd-fuse-overlayfs v1.0.0/go.mod"
+"github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod"
+"github.com/Azure/azure-sdk-for-go v43.0.0+incompatible"
+"github.com/Azure/azure-sdk-for-go v43.0.0+incompatible/go.mod"
+"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+"github.com/Azure/go-autorest v10.8.1+incompatible/go.mod"
+"github.com/Azure/go-autorest v14.2.0+incompatible"
+"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.6/go.mod"
+"github.com/Azure/go-autorest/autorest v0.11.1"
+"github.com/Azure/go-autorest/autorest v0.11.1/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.5"
+"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.3.0"
+"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+"github.com/Azure/go-autorest/autorest/to v0.2.0"
+"github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.1.0"
+"github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod"
+"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+"github.com/Azure/go-autorest/logger v0.2.0"
+"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.6.0"
+"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+"github.com/BurntSushi/toml v0.3.1"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+"github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317"
+"github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317/go.mod"
+"github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab"
+"github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod"
+"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd"
+"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod"
+"github.com/Microsoft/go-winio v0.4.11/go.mod"
+"github.com/Microsoft/go-winio v0.4.15/go.mod"
+"github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod"
+"github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod"
+"github.com/Microsoft/go-winio v0.4.17/go.mod"
+"github.com/Microsoft/go-winio v0.4.19"
+"github.com/Microsoft/go-winio v0.4.19/go.mod"
+"github.com/Microsoft/hcsshim v0.8.16"
+"github.com/Microsoft/hcsshim v0.8.16/go.mod"
+"github.com/Microsoft/hcsshim v0.8.20"
+"github.com/Microsoft/hcsshim v0.8.20/go.mod"
+"github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod"
+"github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3"
+"github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod"
+"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+"github.com/NYTimes/gziphandler v1.1.1"
+"github.com/NYTimes/gziphandler v1.1.1/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+"github.com/PuerkitoBio/purell v1.1.0/go.mod"
+"github.com/PuerkitoBio/purell v1.1.1"
+"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
+"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+"github.com/Rican7/retry v0.1.0"
+"github.com/Rican7/retry v0.1.0/go.mod"
+"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod"
+"github.com/agnivade/levenshtein v1.0.1/go.mod"
+"github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod"
+"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a"
+"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
+"github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod"
+"github.com/aws/aws-sdk-go v1.12.54/go.mod"
+"github.com/aws/aws-sdk-go v1.15.11/go.mod"
+"github.com/aws/aws-sdk-go v1.35.24"
+"github.com/aws/aws-sdk-go v1.35.24/go.mod"
+"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod"
+"github.com/bitly/go-simplejson v0.5.0/go.mod"
+"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
+"github.com/blang/semver v3.1.0+incompatible/go.mod"
+"github.com/blang/semver v3.5.0+incompatible/go.mod"
+"github.com/blang/semver v3.5.1+incompatible"
+"github.com/blang/semver v3.5.1+incompatible/go.mod"
+"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/bronze1man/goStrongswanVici v0.0.0-20171013065002-4d72634a2f11/go.mod"
+"github.com/bronze1man/goStrongswanVici v0.0.0-20190828090544-27d02f80ba40"
+"github.com/bronze1man/goStrongswanVici v0.0.0-20190828090544-27d02f80ba40/go.mod"
+"github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod"
+"github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod"
+"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod"
+"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod"
+"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod"
+"github.com/caddyserver/caddy v1.0.3/go.mod"
+"github.com/canonical/go-dqlite v1.5.1"
+"github.com/canonical/go-dqlite v1.5.1/go.mod"
+"github.com/cenkalti/backoff v2.1.1+incompatible/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/cespare/xxhash v1.1.0"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5"
+"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod"
+"github.com/checkpoint-restore/go-criu/v4 v4.1.0"
+"github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod"
+"github.com/checkpoint-restore/go-criu/v5 v5.0.0"
+"github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod"
+"github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod"
+"github.com/cheggaaa/pb v1.0.29/go.mod"
+"github.com/chzyer/logex v1.1.10/go.mod"
+"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+"github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod"
+"github.com/cilium/ebpf v0.2.0/go.mod"
+"github.com/cilium/ebpf v0.4.0"
+"github.com/cilium/ebpf v0.4.0/go.mod"
+"github.com/cilium/ebpf v0.5.0"
+"github.com/cilium/ebpf v0.5.0/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+"github.com/codegangsta/negroni v1.0.0/go.mod"
+"github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod"
+"github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod"
+"github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod"
+"github.com/containerd/aufs v1.0.0"
+"github.com/containerd/aufs v1.0.0/go.mod"
+"github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod"
+"github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod"
+"github.com/containerd/btrfs v1.0.0"
+"github.com/containerd/btrfs v1.0.0/go.mod"
+"github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod"
+"github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod"
+"github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod"
+"github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod"
+"github.com/containerd/cgroups v1.0.1"
+"github.com/containerd/cgroups v1.0.1/go.mod"
+"github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod"
+"github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod"
+"github.com/containerd/console v1.0.1/go.mod"
+"github.com/containerd/console v1.0.2"
+"github.com/containerd/console v1.0.2/go.mod"
+"github.com/containerd/containerd v1.2.10/go.mod"
+"github.com/containerd/containerd v1.3.0/go.mod"
+"github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod"
+"github.com/containerd/containerd v1.3.2/go.mod"
+"github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod"
+"github.com/containerd/containerd v1.4.1/go.mod"
+"github.com/containerd/containerd v1.4.3/go.mod"
+"github.com/containerd/containerd v1.5.0-beta.1/go.mod"
+"github.com/containerd/containerd v1.5.0-beta.3/go.mod"
+"github.com/containerd/containerd v1.5.0-beta.4/go.mod"
+"github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod"
+"github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod"
+"github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod"
+"github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod"
+"github.com/containerd/fifo v1.0.0"
+"github.com/containerd/fifo v1.0.0/go.mod"
+"github.com/containerd/go-cni v1.0.1"
+"github.com/containerd/go-cni v1.0.1/go.mod"
+"github.com/containerd/go-cni v1.0.2"
+"github.com/containerd/go-cni v1.0.2/go.mod"
+"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+"github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod"
+"github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod"
+"github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod"
+"github.com/containerd/go-runc v1.0.0"
+"github.com/containerd/go-runc v1.0.0/go.mod"
+"github.com/containerd/imgcrypt v1.0.1/go.mod"
+"github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod"
+"github.com/containerd/imgcrypt v1.1.1"
+"github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887"
+"github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod"
+"github.com/containerd/imgcrypt v1.1.1/go.mod"
+"github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod"
+"github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod"
+"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+"github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod"
+"github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod"
+"github.com/containerd/ttrpc v1.0.1/go.mod"
+"github.com/containerd/ttrpc v1.0.2"
+"github.com/containerd/ttrpc v1.0.2/go.mod"
+"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+"github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod"
+"github.com/containerd/typeurl v1.0.1/go.mod"
+"github.com/containerd/typeurl v1.0.2"
+"github.com/containerd/typeurl v1.0.2/go.mod"
+"github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod"
+"github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod"
+"github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod"
+"github.com/containerd/zfs v1.0.0"
+"github.com/containerd/zfs v1.0.0/go.mod"
+"github.com/containernetworking/cni v0.7.1/go.mod"
+"github.com/containernetworking/cni v0.8.0"
+"github.com/containernetworking/cni v0.8.0/go.mod"
+"github.com/containernetworking/cni v0.8.1"
+"github.com/containernetworking/cni v0.8.1/go.mod"
+"github.com/containernetworking/plugins v0.8.6"
+"github.com/containernetworking/plugins v0.8.6/go.mod"
+"github.com/containernetworking/plugins v0.9.1"
+"github.com/containernetworking/plugins v0.9.1/go.mod"
+"github.com/containers/ocicrypt v1.0.1/go.mod"
+"github.com/containers/ocicrypt v1.1.0"
+"github.com/containers/ocicrypt v1.1.0/go.mod"
+"github.com/containers/ocicrypt v1.1.1"
+"github.com/containers/ocicrypt v1.1.1/go.mod"
+"github.com/container-storage-interface/spec v1.2.0"
+"github.com/container-storage-interface/spec v1.2.0/go.mod"
+"github.com/coredns/corefile-migration v1.0.10/go.mod"
+"github.com/coreos/bbolt v1.3.2/go.mod"
+"github.com/coreos/etcd v3.1.11+incompatible/go.mod"
+"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
+"github.com/coreos/go-iptables v0.4.0/go.mod"
+"github.com/coreos/go-iptables v0.4.5/go.mod"
+"github.com/coreos/go-iptables v0.5.0"
+"github.com/coreos/go-iptables v0.5.0/go.mod"
+"github.com/coreos/go-oidc v2.1.0+incompatible"
+"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+"github.com/coreos/go-semver v0.2.0/go.mod"
+"github.com/coreos/go-semver v0.3.0"
+"github.com/coreos/go-semver v0.3.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
+"github.com/coreos/go-systemd/v22 v22.1.0/go.mod"
+"github.com/coreos/go-systemd/v22 v22.3.1"
+"github.com/coreos/go-systemd/v22 v22.3.1/go.mod"
+"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+"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/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+"github.com/creack/pty v1.1.7/go.mod"
+"github.com/cyphar/filepath-securejoin v0.2.2"
+"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
+"github.com/d2g/dhcp4client v1.0.0/go.mod"
+"github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod"
+"github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod"
+"github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod"
+"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd"
+"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20170629053852-f6cab0c35083/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod"
+"github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/dnaeon/go-vcr v1.0.1"
+"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+"github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod"
+"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+"github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible"
+"github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod"
+"github.com/docker/docker v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible"
+"github.com/docker/docker v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible/go.mod"
+"github.com/docker/go-connections v0.4.0"
+"github.com/docker/go-connections v0.4.0/go.mod"
+"github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod"
+"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c"
+"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod"
+"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod"
+"github.com/docker/go-metrics v0.0.1"
+"github.com/docker/go-metrics v0.0.1/go.mod"
+"github.com/docker/go-units v0.3.3/go.mod"
+"github.com/docker/go-units v0.4.0"
+"github.com/docker/go-units v0.4.0/go.mod"
+"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod"
+"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
+"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
+"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+"github.com/dustin/go-humanize v1.0.0"
+"github.com/dustin/go-humanize v1.0.0/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
+"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+"github.com/emicklei/go-restful v2.9.5+incompatible"
+"github.com/emicklei/go-restful v2.9.5+incompatible/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83"
+"github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83/go.mod"
+"github.com/euank/go-kmsg-parser v2.0.0+incompatible"
+"github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod"
+"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+"github.com/evanphx/json-patch v4.5.0+incompatible/go.mod"
+"github.com/evanphx/json-patch v4.9.0+incompatible"
+"github.com/evanphx/json-patch v4.9.0+incompatible/go.mod"
+"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d"
+"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod"
+"github.com/fatih/camelcase v1.0.0"
+"github.com/fatih/camelcase v1.0.0/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+"github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod"
+"github.com/form3tech-oss/jwt-go v3.2.2+incompatible"
+"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+"github.com/frankban/quicktest v1.11.3"
+"github.com/frankban/quicktest v1.11.3/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/fsnotify/fsnotify v1.4.9"
+"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+"github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod"
+"github.com/fvbommel/sortorder v1.0.1"
+"github.com/fvbommel/sortorder v1.0.1/go.mod"
+"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod"
+"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+"github.com/ghodss/yaml v1.0.0"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod"
+"github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod"
+"github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod"
+"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c"
+"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod"
+"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+"github.com/godbus/dbus/v5 v5.0.4"
+"github.com/godbus/dbus/v5 v5.0.4/go.mod"
+"github.com/gofrs/flock v0.7.1"
+"github.com/gofrs/flock v0.7.1/go.mod"
+"github.com/gogo/googleapis v1.2.0/go.mod"
+"github.com/gogo/googleapis v1.4.0"
+"github.com/gogo/googleapis v1.4.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/gogo/protobuf v1.3.0/go.mod"
+"github.com/gogo/protobuf v1.3.1/go.mod"
+"github.com/gogo/protobuf v1.3.2"
+"github.com/gogo/protobuf v1.3.2/go.mod"
+"github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450"
+"github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod"
+"github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995"
+"github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod"
+"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e"
+"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod"
+"github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
+"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/mock v1.3.1/go.mod"
+"github.com/golang/mock v1.4.0/go.mod"
+"github.com/golang/mock v1.4.1"
+"github.com/golang/mock v1.4.1/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/protobuf v1.3.5"
+"github.com/golang/protobuf v1.3.5/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+"github.com/golang/protobuf v1.4.0/go.mod"
+"github.com/golang/protobuf v1.4.1/go.mod"
+"github.com/golang/protobuf v1.4.3"
+"github.com/golang/protobuf v1.4.3/go.mod"
+"github.com/golang/snappy v0.0.3"
+"github.com/golang/snappy v0.0.3/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod"
+"github.com/googleapis/gnostic v0.2.0/go.mod"
+"github.com/googleapis/gnostic v0.3.1/go.mod"
+"github.com/googleapis/gnostic v0.4.1"
+"github.com/googleapis/gnostic v0.4.1/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/cadvisor v0.38.8"
+"github.com/google/cadvisor v0.38.8/go.mod"
+"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/gofuzz v1.1.0"
+"github.com/google/gofuzz v1.1.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.0/go.mod"
+"github.com/google/go-cmp v0.5.1/go.mod"
+"github.com/google/go-cmp v0.5.2/go.mod"
+"github.com/google/go-cmp v0.5.4"
+"github.com/google/go-cmp v0.5.4/go.mod"
+"github.com/google/go-containerregistry v0.0.0-20190617215043-876b8855d23c/go.mod"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+"github.com/google/renameio v0.1.0/go.mod"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
+"github.com/google/uuid v1.0.0/go.mod"
+"github.com/google/uuid v1.1.1/go.mod"
+"github.com/google/uuid v1.1.2/go.mod"
+"github.com/google/uuid v1.2.0"
+"github.com/google/uuid v1.2.0/go.mod"
+"github.com/gophercloud/gophercloud v0.1.0"
+"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+"github.com/gorilla/context v1.1.1/go.mod"
+"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod"
+"github.com/gorilla/mux v1.7.2/go.mod"
+"github.com/gorilla/mux v1.7.3/go.mod"
+"github.com/gorilla/mux v1.7.4/go.mod"
+"github.com/gorilla/mux v1.8.0"
+"github.com/gorilla/mux v1.8.0/go.mod"
+"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/gorilla/websocket v1.4.2"
+"github.com/gorilla/websocket v1.4.2/go.mod"
+"github.com/go-acme/lego v2.5.0+incompatible/go.mod"
+"github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod"
+"github.com/go-bindata/go-bindata v3.1.2+incompatible"
+"github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod"
+"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+"github.com/go-ini/ini v1.25.4/go.mod"
+"github.com/go-ini/ini v1.28.1/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logr/logr v0.1.0/go.mod"
+"github.com/go-logr/logr v0.2.0"
+"github.com/go-logr/logr v0.2.0/go.mod"
+"github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod"
+"github.com/go-openapi/analysis v0.17.0/go.mod"
+"github.com/go-openapi/analysis v0.18.0/go.mod"
+"github.com/go-openapi/analysis v0.19.2/go.mod"
+"github.com/go-openapi/analysis v0.19.5"
+"github.com/go-openapi/analysis v0.19.5/go.mod"
+"github.com/go-openapi/errors v0.17.0/go.mod"
+"github.com/go-openapi/errors v0.18.0/go.mod"
+"github.com/go-openapi/errors v0.19.2"
+"github.com/go-openapi/errors v0.19.2/go.mod"
+"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+"github.com/go-openapi/jsonpointer v0.17.0/go.mod"
+"github.com/go-openapi/jsonpointer v0.18.0/go.mod"
+"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
+"github.com/go-openapi/jsonpointer v0.19.3"
+"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
+"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+"github.com/go-openapi/jsonreference v0.17.0/go.mod"
+"github.com/go-openapi/jsonreference v0.18.0/go.mod"
+"github.com/go-openapi/jsonreference v0.19.2/go.mod"
+"github.com/go-openapi/jsonreference v0.19.3"
+"github.com/go-openapi/jsonreference v0.19.3/go.mod"
+"github.com/go-openapi/loads v0.17.0/go.mod"
+"github.com/go-openapi/loads v0.18.0/go.mod"
+"github.com/go-openapi/loads v0.19.0/go.mod"
+"github.com/go-openapi/loads v0.19.2/go.mod"
+"github.com/go-openapi/loads v0.19.4"
+"github.com/go-openapi/loads v0.19.4/go.mod"
+"github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod"
+"github.com/go-openapi/runtime v0.19.0/go.mod"
+"github.com/go-openapi/runtime v0.19.4"
+"github.com/go-openapi/runtime v0.19.4/go.mod"
+"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+"github.com/go-openapi/spec v0.17.0/go.mod"
+"github.com/go-openapi/spec v0.18.0/go.mod"
+"github.com/go-openapi/spec v0.19.2/go.mod"
+"github.com/go-openapi/spec v0.19.3"
+"github.com/go-openapi/spec v0.19.3/go.mod"
+"github.com/go-openapi/strfmt v0.17.0/go.mod"
+"github.com/go-openapi/strfmt v0.18.0/go.mod"
+"github.com/go-openapi/strfmt v0.19.0/go.mod"
+"github.com/go-openapi/strfmt v0.19.3"
+"github.com/go-openapi/strfmt v0.19.3/go.mod"
+"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+"github.com/go-openapi/swag v0.17.0/go.mod"
+"github.com/go-openapi/swag v0.18.0/go.mod"
+"github.com/go-openapi/swag v0.19.2/go.mod"
+"github.com/go-openapi/swag v0.19.5"
+"github.com/go-openapi/swag v0.19.5/go.mod"
+"github.com/go-openapi/validate v0.18.0/go.mod"
+"github.com/go-openapi/validate v0.19.2/go.mod"
+"github.com/go-openapi/validate v0.19.5"
+"github.com/go-openapi/validate v0.19.5/go.mod"
+"github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod"
+"github.com/go-sql-driver/mysql v1.4.1"
+"github.com/go-sql-driver/mysql v1.4.1/go.mod"
+"github.com/go-stack/stack v1.8.0"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+"github.com/hashicorp/consul/api v1.1.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+"github.com/hashicorp/errwrap v1.0.0"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.3"
+"github.com/hashicorp/golang-lru v0.5.3/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go.net v0.0.1/go.mod"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.0/go.mod"
+"github.com/hashicorp/memberlist v0.1.3/go.mod"
+"github.com/hashicorp/serf v0.8.2/go.mod"
+"github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible/go.mod"
+"github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod"
+"github.com/hpcloud/tail v1.0.0"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+"github.com/imdario/mergo v0.3.5/go.mod"
+"github.com/imdario/mergo v0.3.7/go.mod"
+"github.com/imdario/mergo v0.3.8/go.mod"
+"github.com/imdario/mergo v0.3.10/go.mod"
+"github.com/imdario/mergo v0.3.11"
+"github.com/imdario/mergo v0.3.11/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7/go.mod"
+"github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5/go.mod"
+"github.com/jamescun/tuntap v0.0.0-20190712092105-cb1fb277045c/go.mod"
+"github.com/jetstack/cert-manager v0.7.2/go.mod"
+"github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod"
+"github.com/jmespath/go-jmespath v0.4.0"
+"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
+"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+"github.com/joho/godotenv v0.0.0-20161216230537-726cc8b906e3/go.mod"
+"github.com/jonboulle/clockwork v0.1.0"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.10"
+"github.com/json-iterator/go v1.1.10/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+"github.com/jtolds/gls v4.20.0+incompatible"
+"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod"
+"github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod"
+"github.com/k3s-io/containerd v1.4.9-k3s1"
+"github.com/k3s-io/containerd v1.4.9-k3s1/go.mod"
+"github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1"
+"github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1/go.mod"
+"github.com/k3s-io/cri v1.4.0-k3s.7"
+"github.com/k3s-io/cri v1.4.0-k3s.7/go.mod"
+"github.com/k3s-io/cri-tools v1.20.0-k3s1"
+"github.com/k3s-io/cri-tools v1.20.0-k3s1/go.mod"
+"github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea"
+"github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea/go.mod"
+"github.com/k3s-io/flannel v0.12.0-k3s2"
+"github.com/k3s-io/flannel v0.12.0-k3s2/go.mod"
+"github.com/k3s-io/go-powershell v0.0.0-20200701182037-6845e6fcfa79"
+"github.com/k3s-io/go-powershell v0.0.0-20200701182037-6845e6fcfa79/go.mod"
+"github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7"
+"github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7/go.mod"
+"github.com/k3s-io/helm-controller v0.10.5"
+"github.com/k3s-io/helm-controller v0.10.5/go.mod"
+"github.com/k3s-io/kine v0.6.2"
+"github.com/k3s-io/kine v0.6.2/go.mod"
+"github.com/k3s-io/kubernetes v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.20.11-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.20.11-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.20.11-k3s1/go.mod"
+"github.com/karrick/godirwalk v1.16.1"
+"github.com/karrick/godirwalk v1.16.1/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/errcheck v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.5.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/klauspost/compress v1.11.3/go.mod"
+"github.com/klauspost/compress v1.12.2"
+"github.com/klauspost/compress v1.12.2/go.mod"
+"github.com/klauspost/cpuid v1.2.0/go.mod"
+"github.com/klauspost/cpuid v1.2.3/go.mod"
+"github.com/klauspost/cpuid v1.3.1"
+"github.com/klauspost/cpuid v1.3.1/go.mod"
+"github.com/knative/build v0.6.0/go.mod"
+"github.com/knative/pkg v0.0.0-20190514205332-5e4512dcb2ca/go.mod"
+"github.com/knative/serving v0.6.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pretty v0.2.1"
+"github.com/kr/pretty v0.2.1/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/pty v1.1.5/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+"github.com/libopenstorage/openstorage v1.0.0/go.mod"
+"github.com/lib/pq v1.8.0"
+"github.com/lib/pq v1.8.0/go.mod"
+"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de"
+"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod"
+"github.com/lithammer/dedent v1.1.0"
+"github.com/lithammer/dedent v1.1.0/go.mod"
+"github.com/lpabon/godbc v0.1.1/go.mod"
+"github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod"
+"github.com/lucas-clemente/quic-clients v0.1.0/go.mod"
+"github.com/lucas-clemente/quic-go v0.10.2/go.mod"
+"github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod"
+"github.com/magiconair/properties v1.8.0/go.mod"
+"github.com/magiconair/properties v1.8.1/go.mod"
+"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
+"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+"github.com/mailru/easyjson v0.7.0"
+"github.com/mailru/easyjson v0.7.0/go.mod"
+"github.com/marstr/guid v1.1.0/go.mod"
+"github.com/marten-seemann/qtls v0.2.3/go.mod"
+"github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.4/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-runewidth v0.0.2/go.mod"
+"github.com/mattn/go-runewidth v0.0.4/go.mod"
+"github.com/mattn/go-shellwords v1.0.3/go.mod"
+"github.com/mattn/go-sqlite3 v1.14.4"
+"github.com/mattn/go-sqlite3 v1.14.4/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
+"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
+"github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/dns v1.1.3/go.mod"
+"github.com/miekg/dns v1.1.4"
+"github.com/miekg/dns v1.1.4/go.mod"
+"github.com/miekg/pkcs11 v1.0.3"
+"github.com/miekg/pkcs11 v1.0.3/go.mod"
+"github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989"
+"github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989/go.mod"
+"github.com/minio/md5-simd v1.1.0"
+"github.com/minio/md5-simd v1.1.0/go.mod"
+"github.com/minio/minio-go/v7 v7.0.7"
+"github.com/minio/minio-go/v7 v7.0.7/go.mod"
+"github.com/minio/sha256-simd v0.1.1"
+"github.com/minio/sha256-simd v0.1.1/go.mod"
+"github.com/minio/sio v0.2.1/go.mod"
+"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible"
+"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/gox v0.4.0/go.mod"
+"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/go-wordwrap v1.0.0"
+"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+"github.com/mitchellh/iochan v1.0.0/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod"
+"github.com/moby/ipvs v1.0.1"
+"github.com/moby/ipvs v1.0.1/go.mod"
+"github.com/moby/sys/mountinfo v0.1.3"
+"github.com/moby/sys/mountinfo v0.1.3/go.mod"
+"github.com/moby/sys/mountinfo v0.4.0/go.mod"
+"github.com/moby/sys/mountinfo v0.4.1"
+"github.com/moby/sys/mountinfo v0.4.1/go.mod"
+"github.com/moby/sys/symlink v0.1.0/go.mod"
+"github.com/moby/term v0.0.0-20200312100748-672ec06f55cd"
+"github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod"
+"github.com/moby/vpnkit v0.4.0/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod"
+"github.com/morikuni/aec v1.0.0"
+"github.com/morikuni/aec v1.0.0/go.mod"
+"github.com/mrunalp/fileutils v0.0.0-20200520151820-abd8a0e76976"
+"github.com/mrunalp/fileutils v0.0.0-20200520151820-abd8a0e76976/go.mod"
+"github.com/mrunalp/fileutils v0.5.0"
+"github.com/mrunalp/fileutils v0.5.0/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822"
+"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod"
+"github.com/mvdan/xurls v1.1.0/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+"github.com/naoina/go-stringutil v0.1.0/go.mod"
+"github.com/naoina/toml v0.1.1/go.mod"
+"github.com/natefinch/lumberjack v2.0.0+incompatible"
+"github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod"
+"github.com/ncw/swift v1.0.47/go.mod"
+"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+"github.com/nxadm/tail v1.4.4"
+"github.com/nxadm/tail v1.4.4/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.8.0/go.mod"
+"github.com/onsi/ginkgo v1.10.3/go.mod"
+"github.com/onsi/ginkgo v1.11.0"
+"github.com/onsi/ginkgo v1.11.0/go.mod"
+"github.com/onsi/ginkgo v1.12.1/go.mod"
+"github.com/onsi/ginkgo v1.14.2"
+"github.com/onsi/ginkgo v1.14.2/go.mod"
+"github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod"
+"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+"github.com/onsi/gomega v1.5.0/go.mod"
+"github.com/onsi/gomega v1.7.0/go.mod"
+"github.com/onsi/gomega v1.7.1"
+"github.com/onsi/gomega v1.7.1/go.mod"
+"github.com/onsi/gomega v1.10.1/go.mod"
+"github.com/onsi/gomega v1.10.3"
+"github.com/onsi/gomega v1.10.3/go.mod"
+"github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod"
+"github.com/opencontainers/go-digest v1.0.0"
+"github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod"
+"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+"github.com/opencontainers/go-digest v1.0.0/go.mod"
+"github.com/opencontainers/image-spec v1.0.0/go.mod"
+"github.com/opencontainers/image-spec v1.0.1"
+"github.com/opencontainers/image-spec v1.0.1/go.mod"
+"github.com/opencontainers/runc v1.0.0-rc92"
+"github.com/opencontainers/runc v1.0.0-rc92/go.mod"
+"github.com/opencontainers/runc v1.0.0-rc94"
+"github.com/opencontainers/runc v1.0.0-rc94/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.1/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.2/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod"
+"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+"github.com/opencontainers/selinux v1.6.0/go.mod"
+"github.com/opencontainers/selinux v1.8.0"
+"github.com/opencontainers/selinux v1.8.0/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pborman/uuid v1.2.0/go.mod"
+"github.com/pborman/uuid v1.2.1/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/peterbourgon/diskv v2.0.1+incompatible"
+"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.5.2+incompatible"
+"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pkg/errors v0.9.1"
+"github.com/pkg/errors v0.9.1/go.mod"
+"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021"
+"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
+"github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.1.0/go.mod"
+"github.com/prometheus/client_golang v1.7.1"
+"github.com/prometheus/client_golang v1.7.1/go.mod"
+"github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.6.0/go.mod"
+"github.com/prometheus/common v0.10.0"
+"github.com/prometheus/common v0.10.0/go.mod"
+"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.3/go.mod"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/prometheus/procfs v0.1.3/go.mod"
+"github.com/prometheus/procfs v0.2.0"
+"github.com/prometheus/procfs v0.2.0/go.mod"
+"github.com/prometheus/procfs v0.6.0"
+"github.com/prometheus/procfs v0.6.0/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/quobyte/api v0.1.8/go.mod"
+"github.com/rakelkar/gonetsh v0.0.0-20190930180311-e5c5ffe4bdf0"
+"github.com/rakelkar/gonetsh v0.0.0-20190930180311-e5c5ffe4bdf0/go.mod"
+"github.com/rancher/dynamiclistener v0.2.2"
+"github.com/rancher/dynamiclistener v0.2.2/go.mod"
+"github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009/go.mod"
+"github.com/rancher/remotedialer v0.2.0"
+"github.com/rancher/remotedialer v0.2.0/go.mod"
+"github.com/rancher/wrangler v0.1.4/go.mod"
+"github.com/rancher/wrangler v0.4.0/go.mod"
+"github.com/rancher/wrangler v0.6.0/go.mod"
+"github.com/rancher/wrangler v0.6.1/go.mod"
+"github.com/rancher/wrangler v0.6.2"
+"github.com/rancher/wrangler v0.6.2/go.mod"
+"github.com/rancher/wrangler-api v0.2.0/go.mod"
+"github.com/rancher/wrangler-api v0.6.0"
+"github.com/rancher/wrangler-api v0.6.0/go.mod"
+"github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod"
+"github.com/robfig/cron v1.1.0"
+"github.com/robfig/cron v1.1.0/go.mod"
+"github.com/robfig/cron/v3 v3.0.1"
+"github.com/robfig/cron/v3 v3.0.1/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+"github.com/rootless-containers/rootlesskit v0.10.0"
+"github.com/rootless-containers/rootlesskit v0.10.0/go.mod"
+"github.com/rs/xid v1.2.1"
+"github.com/rs/xid v1.2.1/go.mod"
+"github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021"
+"github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021/go.mod"
+"github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod"
+"github.com/russross/blackfriday v1.5.2"
+"github.com/russross/blackfriday v1.5.2/go.mod"
+"github.com/russross/blackfriday/v2 v2.0.1"
+"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod"
+"github.com/satori/go.uuid v1.2.0"
+"github.com/satori/go.uuid v1.2.0/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/seccomp/libseccomp-golang v0.9.1"
+"github.com/seccomp/libseccomp-golang v0.9.1/go.mod"
+"github.com/sergi/go-diff v1.0.0/go.mod"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+"github.com/sirupsen/logrus v1.0.6/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.1/go.mod"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/sirupsen/logrus v1.6.0/go.mod"
+"github.com/sirupsen/logrus v1.7.0"
+"github.com/sirupsen/logrus v1.7.0/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+"github.com/smartystreets/goconvey v1.6.4"
+"github.com/smartystreets/goconvey v1.6.4/go.mod"
+"github.com/soheilhy/cmux v0.1.4"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/afero v1.2.2"
+"github.com/spf13/afero v1.2.2/go.mod"
+"github.com/spf13/cast v1.3.0/go.mod"
+"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+"github.com/spf13/cobra v0.0.3/go.mod"
+"github.com/spf13/cobra v1.0.0/go.mod"
+"github.com/spf13/cobra v1.1.1"
+"github.com/spf13/cobra v1.1.1/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
+"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+"github.com/spf13/pflag v1.0.1/go.mod"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/pflag v1.0.5"
+"github.com/spf13/pflag v1.0.5/go.mod"
+"github.com/spf13/viper v1.4.0/go.mod"
+"github.com/spf13/viper v1.7.0/go.mod"
+"github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980"
+"github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod"
+"github.com/storageos/go-api v2.2.0+incompatible/go.mod"
+"github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/objx v0.2.0"
+"github.com/stretchr/objx v0.2.0/go.mod"
+"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+"github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod"
+"github.com/stretchr/testify v1.2.2"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/stretchr/testify v1.5.1/go.mod"
+"github.com/stretchr/testify v1.6.1"
+"github.com/stretchr/testify v1.6.1/go.mod"
+"github.com/subosito/gotenv v1.2.0/go.mod"
+"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
+"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2"
+"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod"
+"github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635"
+"github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod"
+"github.com/tchap/go-patricia v2.2.6+incompatible"
+"github.com/tchap/go-patricia v2.2.6+incompatible/go.mod"
+"github.com/tchap/go-patricia v2.3.0+incompatible"
+"github.com/tchap/go-patricia v2.3.0+incompatible/go.mod"
+"github.com/tektoncd/pipeline v0.4.0/go.mod"
+"github.com/thecodeteam/goscaleio v0.1.0/go.mod"
+"github.com/tidwall/pretty v1.0.0"
+"github.com/tidwall/pretty v1.0.0/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/ugorji/go v0.0.0-20170107133203-ded73eae5db7/go.mod"
+"github.com/ugorji/go v1.1.4/go.mod"
+"github.com/urfave/cli v1.20.0/go.mod"
+"github.com/urfave/cli v1.21.0/go.mod"
+"github.com/urfave/cli v1.22.1"
+"github.com/urfave/cli v1.22.1/go.mod"
+"github.com/urfave/cli v1.22.2"
+"github.com/urfave/cli v1.22.2/go.mod"
+"github.com/urfave/cli/v2 v2.2.0/go.mod"
+"github.com/urfave/cli/v2 v2.3.0"
+"github.com/urfave/cli/v2 v2.3.0/go.mod"
+"github.com/urfave/negroni v1.0.0/go.mod"
+"github.com/u-root/u-root v6.0.0+incompatible/go.mod"
+"github.com/vektah/gqlparser v1.1.2/go.mod"
+"github.com/vishvananda/netlink v0.0.0-20170220200719-fe3b5664d23a/go.mod"
+"github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod"
+"github.com/vishvananda/netlink v1.1.0"
+"github.com/vishvananda/netlink v1.1.0/go.mod"
+"github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852"
+"github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod"
+"github.com/vishvananda/netns v0.0.0-20170219233438-54f0e4339ce7/go.mod"
+"github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod"
+"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df"
+"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod"
+"github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae"
+"github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod"
+"github.com/vmware/govmomi v0.20.3"
+"github.com/vmware/govmomi v0.20.3/go.mod"
+"github.com/willf/bitset v1.1.11"
+"github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod"
+"github.com/willf/bitset v1.1.11/go.mod"
+"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"github.com/yuin/goldmark v1.2.1/go.mod"
+"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod"
+"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod"
+"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de"
+"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod"
+"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83"
+"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+"golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod"
+"golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod"
+"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+"golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod"
+"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6"
+"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+"golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod"
+"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+"golang.org/x/mod v0.1.0/go.mod"
+"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/mod v0.3.0"
+"golang.org/x/mod v0.3.0/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+"golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+"golang.org/x/net v0.0.0-20201224014010-6772e930b67b"
+"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
+"golang.org/x/net v0.0.0-20210224082022-3d97a244fca7"
+"golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6"
+"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a"
+"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod"
+"golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod"
+"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+"golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod"
+"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
+"golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod"
+"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod"
+"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+"golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod"
+"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+"golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+"golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod"
+"golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod"
+"golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod"
+"golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod"
+"golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod"
+"golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod"
+"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+"golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+"golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod"
+"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c"
+"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+"golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073"
+"golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod"
+"golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod"
+"golang.org/x/sys v0.0.0-20210426230700-d19ff857e887"
+"golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod"
+"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/text v0.3.4"
+"golang.org/x/text v0.3.4/go.mod"
+"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
+"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod"
+"golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+"golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod"
+"golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod"
+"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
+"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+"golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod"
+"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+"golang.org/x/tools v0.0.0-20191017205301-920acffc3e65/go.mod"
+"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
+"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+"golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod"
+"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+"golang.org/x/tools v0.0.0-20210106214847-113979e3529a"
+"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/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"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+"gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod"
+"gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod"
+"gonum.org/v1/gonum v0.6.2"
+"gonum.org/v1/gonum v0.6.2/go.mod"
+"gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod"
+"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e"
+"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod"
+"gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod"
+"google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod"
+"google.golang.org/api v0.4.0/go.mod"
+"google.golang.org/api v0.7.0/go.mod"
+"google.golang.org/api v0.8.0/go.mod"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/api v0.13.0/go.mod"
+"google.golang.org/api v0.14.0/go.mod"
+"google.golang.org/api v0.15.0/go.mod"
+"google.golang.org/api v0.15.1-0.20200106000736-b8fc810ca6b5/go.mod"
+"google.golang.org/api v0.17.0/go.mod"
+"google.golang.org/api v0.18.0/go.mod"
+"google.golang.org/api v0.20.0"
+"google.golang.org/api v0.20.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.1/go.mod"
+"google.golang.org/appengine v1.6.5"
+"google.golang.org/appengine v1.6.5/go.mod"
+"google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63"
+"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+"google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.1/go.mod"
+"google.golang.org/grpc v1.21.0/go.mod"
+"google.golang.org/grpc v1.21.1/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.23.1/go.mod"
+"google.golang.org/grpc v1.24.0/go.mod"
+"google.golang.org/grpc v1.25.1/go.mod"
+"google.golang.org/grpc v1.26.0/go.mod"
+"google.golang.org/grpc v1.27.0/go.mod"
+"google.golang.org/grpc v1.27.1"
+"google.golang.org/grpc v1.27.1/go.mod"
+"google.golang.org/grpc v1.30.0/go.mod"
+"google.golang.org/grpc v1.33.2"
+"google.golang.org/grpc v1.33.2/go.mod"
+"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+"google.golang.org/protobuf v1.21.0/go.mod"
+"google.golang.org/protobuf v1.22.0/go.mod"
+"google.golang.org/protobuf v1.23.0/go.mod"
+"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+"google.golang.org/protobuf v1.24.0/go.mod"
+"google.golang.org/protobuf v1.25.0"
+"google.golang.org/protobuf v1.25.0/go.mod"
+"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+"gopkg.in/errgo.v2 v2.1.0/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gcfg.v1 v1.2.0"
+"gopkg.in/gcfg.v1 v1.2.0/go.mod"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+"gopkg.in/inf.v0 v0.9.1"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/ini.v1 v1.51.0/go.mod"
+"gopkg.in/ini.v1 v1.57.0"
+"gopkg.in/ini.v1 v1.57.0/go.mod"
+"gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod"
+"gopkg.in/natefinch/lumberjack.v2 v2.0.0"
+"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.2.2"
+"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
+"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+"gopkg.in/square/go-jose.v2 v2.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/warnings.v0 v0.1.1"
+"gopkg.in/warnings.v0 v0.1.1/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.3/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"gopkg.in/yaml.v2 v2.3.0/go.mod"
+"gopkg.in/yaml.v2 v2.4.0"
+"gopkg.in/yaml.v2 v2.4.0/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
+"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
+"gotest.tools v2.2.0+incompatible"
+"gotest.tools v2.2.0+incompatible/go.mod"
+"gotest.tools/v3 v3.0.2/go.mod"
+"gotest.tools/v3 v3.0.3"
+"gotest.tools/v3 v3.0.3/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.etcd.io/bbolt v1.3.3/go.mod"
+"go.etcd.io/bbolt v1.3.5"
+"go.etcd.io/bbolt v1.3.5/go.mod"
+"go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod"
+"go.mongodb.org/mongo-driver v1.0.3/go.mod"
+"go.mongodb.org/mongo-driver v1.1.1/go.mod"
+"go.mongodb.org/mongo-driver v1.1.2"
+"go.mongodb.org/mongo-driver v1.1.2/go.mod"
+"go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1"
+"go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0/go.mod"
+"go.opencensus.io v0.22.2/go.mod"
+"go.opencensus.io v0.22.3"
+"go.opencensus.io v0.22.3/go.mod"
+"go.uber.org/atomic v1.3.2/go.mod"
+"go.uber.org/atomic v1.4.0"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/multierr v1.1.0"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/zap v1.10.0"
+"go.uber.org/zap v1.10.0/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+"k8s.io/apimachinery v0.19.10"
+"k8s.io/apimachinery v0.19.10/go.mod"
+"k8s.io/apiserver v0.19.10"
+"k8s.io/apiserver v0.19.10/go.mod"
+"k8s.io/api v0.19.10"
+"k8s.io/api v0.19.10/go.mod"
+"k8s.io/client-go v0.19.10"
+"k8s.io/client-go v0.19.10/go.mod"
+"k8s.io/component-base v0.19.10/go.mod"
+"k8s.io/cri-api v0.19.10"
+"k8s.io/cri-api v0.19.10/go.mod"
+"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+"k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a/go.mod"
+"k8s.io/gengo v0.0.0-20191120174120-e74f70b9b27e/go.mod"
+"k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod"
+"k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod"
+"k8s.io/gengo v0.0.0-20201113003025-83324d819ded"
+"k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod"
+"k8s.io/heapster v1.2.0-beta.1"
+"k8s.io/heapster v1.2.0-beta.1/go.mod"
+"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+"k8s.io/klog v0.3.0/go.mod"
+"k8s.io/klog v1.0.0"
+"k8s.io/klog v1.0.0/go.mod"
+"k8s.io/klog/v2 v2.0.0/go.mod"
+"k8s.io/klog/v2 v2.2.0/go.mod"
+"k8s.io/klog/v2 v2.4.0"
+"k8s.io/klog/v2 v2.4.0/go.mod"
+"k8s.io/kube-openapi v0.0.0-20190502190224-411b2483e503/go.mod"
+"k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod"
+"k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd"
+"k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod"
+"k8s.io/system-validators v1.2.0/go.mod"
+"k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod"
+"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
+"k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod"
+"k8s.io/utils v0.0.0-20201110183641-67b214c5f920"
+"k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod"
+"modernc.org/cc v1.0.0/go.mod"
+"modernc.org/golex v1.0.0/go.mod"
+"modernc.org/mathutil v1.0.0/go.mod"
+"modernc.org/strutil v1.0.0/go.mod"
+"modernc.org/xc v1.0.0/go.mod"
+"rsc.io/binaryregexp v0.2.0/go.mod"
+"rsc.io/pdf v0.1.1/go.mod"
+"rsc.io/quote/v3 v3.1.0/go.mod"
+"rsc.io/sampler v1.3.0/go.mod"
+"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod"
+"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22"
+"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod"
+"sigs.k8s.io/kustomize v2.0.3+incompatible"
+"sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod"
+"sigs.k8s.io/structured-merge-diff v0.0.0-20190426204423-ea680f03cc65"
+"sigs.k8s.io/structured-merge-diff v0.0.0-20190426204423-ea680f03cc65/go.mod"
+"sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod"
+"sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod"
+"sigs.k8s.io/structured-merge-diff/v4 v4.0.3"
+"sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod"
+"sigs.k8s.io/structured-merge-diff/v4 v4.1.2"
+"sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+"sigs.k8s.io/yaml v1.2.0"
+"sigs.k8s.io/yaml v1.2.0/go.mod"
+)
+go-module_set_globals
+MY_PV=${PV}+k3s1
+SRC_URI="https://github.com/k3s-io/k3s/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+	https://github.com/opencontainers/runc/archive/refs/tags/v1.0.0-rc95.tar.gz -> k3s-runc-${K3S_RUNC_VERSION}.tar.gz
+	https://charts.helm.sh/stable/packages/traefik-${K3S_TRAEFIK_VERSION}.tgz
+	https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz
+	amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+kubectl-symlink rootless"
+REQUIRED_USE="|| ( amd64 )"
+DEPEND="
+	net-firewall/conntrack-tools
+	rootless? ( app-emulation/slirp4netns )
+"
+RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )"
+RESTRICT+=" test"
+
+S=${WORKDIR}/${PN}-${MY_PV/+/-}
+
+k3s_unpack_filter() {
+	grep -v -F \
+		-e "k3s-runc-${K3S_RUNC_VERSION}.tar.gz" \
+		-e "traefik-${K3S_TRAEFIK_VERSION}.tgz" \
+		-e "k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz"
+}
+
+src_unpack() {
+	read -d '' A < <(printf -- '%s\n' ${A} | k3s_unpack_filter)
+	go-module_src_unpack
+	mkdir -p bin/aux build/static/charts cache || die
+	cp "${DISTDIR}/traefik-${K3S_TRAEFIK_VERSION}.tgz" build/static/charts/ || die
+	cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die
+	mv "${WORKDIR}/bin/"* "${S}/bin/" || die
+	mv "${WORKDIR}/etc" "${S}/etc" || die
+}
+
+src_prepare() {
+	local filename pattern replacement
+	default
+
+	local RUNC_DIR=build/src/github.com/opencontainers/runc
+	mkdir -p "${RUNC_DIR}" || die
+	tar -x --strip-components=1 -f "${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}.tar.gz" -C "${RUNC_DIR}" || die
+	sed -e 's|mod=vendor|mod=readonly|g' -i "${RUNC_DIR}/Makefile" || die
+
+	# Disable download for files fetched via SRC_URI.
+	sed -e 's:^curl:#\0:' \
+		-e 's:^git:#\0:' \
+		-e 's:^rm -rf \${CHARTS_DIR}:#\0:' \
+		-e 's:^rm -rf \${RUNC_DIR}:#\0:' \
+		-i scripts/download || die
+	sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die
+	pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR'
+	filename=scripts/build
+	grep -qF "${pattern}" "${filename}" || \
+		die "failed to locate plugins clone command"
+	sed -e "s|${pattern}|mkdir -p \"\$WORKDIR\" \\&\\& tar -xzf cache/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz --strip-components=1 -C \"\$WORKDIR\"|" \
+		-e 's|rm -rf $TMPDIR||' \
+		-i "${filename}" || die
+	sed -e 's:/usr/local/bin:/usr/bin:g' -i k3s.service || die
+	sed -e 's|mod=vendor|mod=readonly|g' -i vendor/github.com/opencontainers/runc/Makefile || die
+}
+
+src_compile() {
+	mkdir -p build/data || die
+	"${BASH}" -ex ./scripts/download || die
+	./scripts/build || die
+	./scripts/package-cli || die
+}
+
+src_install() {
+	dobin "dist/artifacts/${PN}"
+	use kubectl-symlink && dosym k3s /usr/bin/kubectl
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	dodoc README.md
+}
diff --git a/sys-cluster/k3s/k3s-1.20.6.ebuild b/sys-cluster/k3s/k3s-1.20.6.ebuild
deleted file mode 100644
index b4f4388b9dc6..000000000000
--- a/sys-cluster/k3s/k3s-1.20.6.ebuild
+++ /dev/null
@@ -1,1966 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module linux-info systemd
-
-DESCRIPTION="Lightweight Kubernetes"
-HOMEPAGE="https://k3s.io"
-K3S_ROOT_VERSION=0.8.1
-K3S_TRAEFIK_VERSION=1.81.0
-K3S_CNIPLUGINS_VERSION=0.8.6
-CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN"
-
-EGO_SUM=(
-"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898"
-"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
-"bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690"
-"bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod"
-"cloud.google.com/go v0.26.0/go.mod"
-"cloud.google.com/go v0.34.0/go.mod"
-"cloud.google.com/go v0.38.0"
-"cloud.google.com/go v0.38.0/go.mod"
-"cloud.google.com/go v0.44.1/go.mod"
-"cloud.google.com/go v0.44.2/go.mod"
-"cloud.google.com/go v0.45.1/go.mod"
-"cloud.google.com/go v0.46.3/go.mod"
-"cloud.google.com/go v0.50.0/go.mod"
-"cloud.google.com/go v0.51.0/go.mod"
-"cloud.google.com/go v0.52.0/go.mod"
-"cloud.google.com/go v0.53.0/go.mod"
-"cloud.google.com/go v0.54.0"
-"cloud.google.com/go v0.54.0/go.mod"
-"cloud.google.com/go/bigquery v1.0.1/go.mod"
-"cloud.google.com/go/bigquery v1.3.0/go.mod"
-"cloud.google.com/go/bigquery v1.4.0/go.mod"
-"cloud.google.com/go/datastore v1.0.0/go.mod"
-"cloud.google.com/go/datastore v1.1.0/go.mod"
-"cloud.google.com/go/firestore v1.1.0/go.mod"
-"cloud.google.com/go/pubsub v1.0.1/go.mod"
-"cloud.google.com/go/pubsub v1.1.0/go.mod"
-"cloud.google.com/go/pubsub v1.2.0/go.mod"
-"cloud.google.com/go/storage v1.0.0/go.mod"
-"cloud.google.com/go/storage v1.5.0/go.mod"
-"cloud.google.com/go/storage v1.6.0/go.mod"
-"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
-"github.com/AkihiroSuda/containerd-fuse-overlayfs v1.0.0"
-"github.com/AkihiroSuda/containerd-fuse-overlayfs v1.0.0/go.mod"
-"github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod"
-"github.com/Azure/azure-sdk-for-go v43.0.0+incompatible"
-"github.com/Azure/azure-sdk-for-go v43.0.0+incompatible/go.mod"
-"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
-"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
-"github.com/Azure/go-autorest v10.8.1+incompatible/go.mod"
-"github.com/Azure/go-autorest v14.2.0+incompatible"
-"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
-"github.com/Azure/go-autorest/autorest v0.11.1"
-"github.com/Azure/go-autorest/autorest v0.11.1/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.6/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.9.5"
-"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.3.0"
-"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
-"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
-"github.com/Azure/go-autorest/autorest/to v0.2.0"
-"github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/validation v0.1.0"
-"github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod"
-"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-"github.com/Azure/go-autorest/logger v0.2.0"
-"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
-"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-"github.com/Azure/go-autorest/tracing v0.6.0"
-"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
-"github.com/BurntSushi/toml v0.3.1"
-"github.com/BurntSushi/toml v0.3.1/go.mod"
-"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-"github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317"
-"github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317/go.mod"
-"github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab"
-"github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod"
-"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd"
-"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod"
-"github.com/Microsoft/go-winio v0.4.11"
-"github.com/Microsoft/go-winio v0.4.11/go.mod"
-"github.com/Microsoft/go-winio v0.4.14/go.mod"
-"github.com/Microsoft/go-winio v0.4.15"
-"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5"
-"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
-"github.com/Microsoft/go-winio v0.4.15/go.mod"
-"github.com/Microsoft/hcsshim v0.8.10-0.20200715222032-5eafd1556990"
-"github.com/Microsoft/hcsshim v0.8.10-0.20200715222032-5eafd1556990/go.mod"
-"github.com/Microsoft/hcsshim v0.8.6"
-"github.com/Microsoft/hcsshim v0.8.6-0.20190129145542-bc49f75c7221"
-"github.com/Microsoft/hcsshim v0.8.6-0.20190129145542-bc49f75c7221/go.mod"
-"github.com/Microsoft/hcsshim v0.8.6/go.mod"
-"github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod"
-"github.com/Microsoft/hcsshim v0.8.7/go.mod"
-"github.com/Microsoft/hcsshim v0.8.9"
-"github.com/Microsoft/hcsshim v0.8.9/go.mod"
-"github.com/Microsoft/hcsshim/test v0.0.0-20200803203718-d80bc7196cb0"
-"github.com/Microsoft/hcsshim/test v0.0.0-20200803203718-d80bc7196cb0/go.mod"
-"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46"
-"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-"github.com/NYTimes/gziphandler v1.1.1"
-"github.com/NYTimes/gziphandler v1.1.1/go.mod"
-"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-"github.com/PuerkitoBio/purell v1.1.0/go.mod"
-"github.com/PuerkitoBio/purell v1.1.1"
-"github.com/PuerkitoBio/purell v1.1.1/go.mod"
-"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
-"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
-"github.com/Rican7/retry v0.1.0"
-"github.com/Rican7/retry v0.1.0/go.mod"
-"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod"
-"github.com/agnivade/levenshtein v1.0.1/go.mod"
-"github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod"
-"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-"github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae"
-"github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod"
-"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
-"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
-"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a"
-"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
-"github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7"
-"github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod"
-"github.com/aws/aws-sdk-go v1.12.54"
-"github.com/aws/aws-sdk-go v1.12.54/go.mod"
-"github.com/aws/aws-sdk-go v1.15.11/go.mod"
-"github.com/aws/aws-sdk-go v1.28.2/go.mod"
-"github.com/aws/aws-sdk-go v1.35.24"
-"github.com/aws/aws-sdk-go v1.35.24/go.mod"
-"github.com/aws/aws-sdk-go v1.6.10/go.mod"
-"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-"github.com/beorn7/perks v1.0.0"
-"github.com/beorn7/perks v1.0.0/go.mod"
-"github.com/beorn7/perks v1.0.1"
-"github.com/beorn7/perks v1.0.1/go.mod"
-"github.com/bgentry/speakeasy v0.1.0"
-"github.com/bgentry/speakeasy v0.1.0/go.mod"
-"github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod"
-"github.com/bitly/go-simplejson v0.5.0/go.mod"
-"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
-"github.com/blang/semver v3.1.0+incompatible/go.mod"
-"github.com/blang/semver v3.5.0+incompatible/go.mod"
-"github.com/blang/semver v3.5.1+incompatible"
-"github.com/blang/semver v3.5.1+incompatible/go.mod"
-"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
-"github.com/boltdb/bolt v1.3.1"
-"github.com/boltdb/bolt v1.3.1/go.mod"
-"github.com/bronze1man/goStrongswanVici v0.0.0-20171013065002-4d72634a2f11"
-"github.com/bronze1man/goStrongswanVici v0.0.0-20171013065002-4d72634a2f11/go.mod"
-"github.com/bronze1man/goStrongswanVici v0.0.0-20190828090544-27d02f80ba40"
-"github.com/bronze1man/goStrongswanVici v0.0.0-20190828090544-27d02f80ba40/go.mod"
-"github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod"
-"github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44"
-"github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod"
-"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod"
-"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod"
-"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod"
-"github.com/caddyserver/caddy v1.0.3"
-"github.com/caddyserver/caddy v1.0.3/go.mod"
-"github.com/canonical/go-dqlite v1.5.1"
-"github.com/canonical/go-dqlite v1.5.1/go.mod"
-"github.com/cenkalti/backoff v2.1.1+incompatible/go.mod"
-"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-"github.com/cespare/xxhash v1.1.0"
-"github.com/cespare/xxhash v1.1.0/go.mod"
-"github.com/cespare/xxhash/v2 v2.1.1"
-"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5"
-"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod"
-"github.com/checkpoint-restore/go-criu/v4 v4.0.2/go.mod"
-"github.com/checkpoint-restore/go-criu/v4 v4.1.0"
-"github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod"
-"github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod"
-"github.com/cheggaaa/pb v1.0.29/go.mod"
-"github.com/chzyer/logex v1.1.10/go.mod"
-"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-"github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod"
-"github.com/cilium/ebpf v0.0.0-20200507155900-a9f01edf17e3/go.mod"
-"github.com/cilium/ebpf v0.0.0-20200601085316-9f1617e5c574/go.mod"
-"github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775"
-"github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod"
-"github.com/client9/misspell v0.3.4/go.mod"
-"github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313"
-"github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod"
-"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
-"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
-"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
-"github.com/codegangsta/negroni v1.0.0"
-"github.com/codegangsta/negroni v1.0.0/go.mod"
-"github.com/container-storage-interface/spec v1.2.0"
-"github.com/container-storage-interface/spec v1.2.0/go.mod"
-"github.com/containerd/aufs v0.0.0-20191030083217-371312c1e31c"
-"github.com/containerd/aufs v0.0.0-20191030083217-371312c1e31c/go.mod"
-"github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e"
-"github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod"
-"github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod"
-"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
-"github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59"
-"github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod"
-"github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340"
-"github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod"
-"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
-"github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod"
-"github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod"
-"github.com/containerd/console v1.0.0"
-"github.com/containerd/console v1.0.0/go.mod"
-"github.com/containerd/containerd v1.2.10/go.mod"
-"github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
-"github.com/containerd/containerd v1.3.0/go.mod"
-"github.com/containerd/containerd v1.3.2/go.mod"
-"github.com/containerd/containerd v1.3.3/go.mod"
-"github.com/containerd/containerd v1.4.1"
-"github.com/containerd/containerd v1.4.1/go.mod"
-"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
-"github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod"
-"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
-"github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b"
-"github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod"
-"github.com/containerd/go-cni v1.0.1"
-"github.com/containerd/go-cni v1.0.1/go.mod"
-"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
-"github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod"
-"github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328"
-"github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod"
-"github.com/containerd/imgcrypt v1.0.1"
-"github.com/containerd/imgcrypt v1.0.1/go.mod"
-"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
-"github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod"
-"github.com/containerd/ttrpc v1.0.0/go.mod"
-"github.com/containerd/ttrpc v1.0.1"
-"github.com/containerd/ttrpc v1.0.1/go.mod"
-"github.com/containerd/ttrpc v1.0.2"
-"github.com/containerd/ttrpc v1.0.2/go.mod"
-"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
-"github.com/containerd/typeurl v1.0.0/go.mod"
-"github.com/containerd/typeurl v1.0.1"
-"github.com/containerd/typeurl v1.0.1/go.mod"
-"github.com/containerd/zfs v0.0.0-20191030014035-9abf673ca6ff"
-"github.com/containerd/zfs v0.0.0-20191030014035-9abf673ca6ff/go.mod"
-"github.com/containernetworking/cni v0.7.1"
-"github.com/containernetworking/cni v0.7.1/go.mod"
-"github.com/containernetworking/cni v0.8.0"
-"github.com/containernetworking/cni v0.8.0/go.mod"
-"github.com/containernetworking/plugins v0.8.6"
-"github.com/containernetworking/plugins v0.8.6/go.mod"
-"github.com/containers/ocicrypt v1.0.1"
-"github.com/containers/ocicrypt v1.0.1/go.mod"
-"github.com/coredns/corefile-migration v1.0.10"
-"github.com/coredns/corefile-migration v1.0.10/go.mod"
-"github.com/coreos/bbolt v1.3.2/go.mod"
-"github.com/coreos/etcd v3.1.11+incompatible"
-"github.com/coreos/etcd v3.1.11+incompatible/go.mod"
-"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
-"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
-"github.com/coreos/go-iptables v0.4.0"
-"github.com/coreos/go-iptables v0.4.0/go.mod"
-"github.com/coreos/go-iptables v0.4.5"
-"github.com/coreos/go-iptables v0.4.5/go.mod"
-"github.com/coreos/go-oidc v2.1.0+incompatible"
-"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
-"github.com/coreos/go-semver v0.2.0"
-"github.com/coreos/go-semver v0.2.0/go.mod"
-"github.com/coreos/go-semver v0.3.0"
-"github.com/coreos/go-semver v0.3.0/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b"
-"github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7"
-"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
-"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
-"github.com/coreos/go-systemd/v22 v22.1.0"
-"github.com/coreos/go-systemd/v22 v22.1.0/go.mod"
-"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf"
-"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
-"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea"
-"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
-"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
-"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-"github.com/cpuguy83/go-md2man v1.0.10"
-"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
-"github.com/cpuguy83/go-md2man/v2 v2.0.0"
-"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/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-"github.com/creack/pty v1.1.7"
-"github.com/creack/pty v1.1.7/go.mod"
-"github.com/cyphar/filepath-securejoin v0.2.2"
-"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
-"github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c"
-"github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod"
-"github.com/d2g/dhcp4client v1.0.0"
-"github.com/d2g/dhcp4client v1.0.0/go.mod"
-"github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5"
-"github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod"
-"github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4"
-"github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod"
-"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
-"github.com/davecgh/go-spew v1.1.0"
-"github.com/davecgh/go-spew v1.1.0/go.mod"
-"github.com/davecgh/go-spew v1.1.1"
-"github.com/davecgh/go-spew v1.1.1/go.mod"
-"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd"
-"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod"
-"github.com/denverdino/aliyungo v0.0.0-20170629053852-f6cab0c35083"
-"github.com/denverdino/aliyungo v0.0.0-20170629053852-f6cab0c35083/go.mod"
-"github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod"
-"github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
-"github.com/dnaeon/go-vcr v1.0.1"
-"github.com/dnaeon/go-vcr v1.0.1/go.mod"
-"github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod"
-"github.com/docker/distribution v2.7.1+incompatible"
-"github.com/docker/distribution v2.7.1+incompatible/go.mod"
-"github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible"
-"github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod"
-"github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod"
-"github.com/docker/docker v1.13.1"
-"github.com/docker/docker v1.13.1/go.mod"
-"github.com/docker/docker v1.4.2-0.20200309214505-aa6a9891b09c/go.mod"
-"github.com/docker/docker v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible"
-"github.com/docker/docker v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible/go.mod"
-"github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible"
-"github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible/go.mod"
-"github.com/docker/docker v20.10.0-beta1.0.20201108103107-c7109494fe65+incompatible"
-"github.com/docker/docker v20.10.0-beta1.0.20201108103107-c7109494fe65+incompatible/go.mod"
-"github.com/docker/go-connections v0.4.0"
-"github.com/docker/go-connections v0.4.0/go.mod"
-"github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod"
-"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c"
-"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod"
-"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod"
-"github.com/docker/go-metrics v0.0.1"
-"github.com/docker/go-metrics v0.0.1/go.mod"
-"github.com/docker/go-units v0.3.3"
-"github.com/docker/go-units v0.3.3/go.mod"
-"github.com/docker/go-units v0.4.0"
-"github.com/docker/go-units v0.4.0/go.mod"
-"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod"
-"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
-"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
-"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4"
-"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
-"github.com/dustin/go-humanize v1.0.0"
-"github.com/dustin/go-humanize v1.0.0/go.mod"
-"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
-"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
-"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
-"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-"github.com/emicklei/go-restful v2.9.5+incompatible"
-"github.com/emicklei/go-restful v2.9.5+incompatible/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-"github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83"
-"github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83/go.mod"
-"github.com/euank/go-kmsg-parser v2.0.0+incompatible"
-"github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod"
-"github.com/evanphx/json-patch v4.2.0+incompatible"
-"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-"github.com/evanphx/json-patch v4.5.0+incompatible"
-"github.com/evanphx/json-patch v4.5.0+incompatible/go.mod"
-"github.com/evanphx/json-patch v4.9.0+incompatible"
-"github.com/evanphx/json-patch v4.9.0+incompatible/go.mod"
-"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d"
-"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod"
-"github.com/fatih/camelcase v1.0.0"
-"github.com/fatih/camelcase v1.0.0/go.mod"
-"github.com/fatih/color v1.7.0"
-"github.com/fatih/color v1.7.0/go.mod"
-"github.com/fatih/color v1.9.0/go.mod"
-"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
-"github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod"
-"github.com/form3tech-oss/jwt-go v3.2.2+incompatible"
-"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
-"github.com/frankban/quicktest v1.10.2"
-"github.com/frankban/quicktest v1.10.2/go.mod"
-"github.com/fsnotify/fsnotify v1.4.7"
-"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-"github.com/fsnotify/fsnotify v1.4.9"
-"github.com/fsnotify/fsnotify v1.4.9/go.mod"
-"github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa"
-"github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod"
-"github.com/fvbommel/sortorder v1.0.1"
-"github.com/fvbommel/sortorder v1.0.1/go.mod"
-"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod"
-"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-"github.com/ghodss/yaml v1.0.0"
-"github.com/ghodss/yaml v1.0.0/go.mod"
-"github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod"
-"github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod"
-"github.com/go-acme/lego v2.5.0+incompatible/go.mod"
-"github.com/go-bindata/go-bindata v3.1.1+incompatible"
-"github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod"
-"github.com/go-bindata/go-bindata v3.1.2+incompatible"
-"github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod"
-"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
-"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
-"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
-"github.com/go-ini/ini v1.25.4/go.mod"
-"github.com/go-ini/ini v1.28.1"
-"github.com/go-ini/ini v1.28.1/go.mod"
-"github.com/go-ini/ini v1.9.0/go.mod"
-"github.com/go-kit/kit v0.8.0/go.mod"
-"github.com/go-kit/kit v0.9.0/go.mod"
-"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-"github.com/go-logr/logr v0.1.0/go.mod"
-"github.com/go-logr/logr v0.2.0"
-"github.com/go-logr/logr v0.2.0/go.mod"
-"github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod"
-"github.com/go-openapi/analysis v0.17.0/go.mod"
-"github.com/go-openapi/analysis v0.18.0/go.mod"
-"github.com/go-openapi/analysis v0.19.2/go.mod"
-"github.com/go-openapi/analysis v0.19.5"
-"github.com/go-openapi/analysis v0.19.5/go.mod"
-"github.com/go-openapi/errors v0.17.0/go.mod"
-"github.com/go-openapi/errors v0.18.0/go.mod"
-"github.com/go-openapi/errors v0.19.2"
-"github.com/go-openapi/errors v0.19.2/go.mod"
-"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-"github.com/go-openapi/jsonpointer v0.17.0/go.mod"
-"github.com/go-openapi/jsonpointer v0.18.0/go.mod"
-"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
-"github.com/go-openapi/jsonpointer v0.19.3"
-"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
-"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-"github.com/go-openapi/jsonreference v0.17.0/go.mod"
-"github.com/go-openapi/jsonreference v0.18.0/go.mod"
-"github.com/go-openapi/jsonreference v0.19.2/go.mod"
-"github.com/go-openapi/jsonreference v0.19.3"
-"github.com/go-openapi/jsonreference v0.19.3/go.mod"
-"github.com/go-openapi/loads v0.17.0/go.mod"
-"github.com/go-openapi/loads v0.18.0/go.mod"
-"github.com/go-openapi/loads v0.19.0/go.mod"
-"github.com/go-openapi/loads v0.19.2/go.mod"
-"github.com/go-openapi/loads v0.19.4"
-"github.com/go-openapi/loads v0.19.4/go.mod"
-"github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod"
-"github.com/go-openapi/runtime v0.19.0/go.mod"
-"github.com/go-openapi/runtime v0.19.4"
-"github.com/go-openapi/runtime v0.19.4/go.mod"
-"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-"github.com/go-openapi/spec v0.17.0/go.mod"
-"github.com/go-openapi/spec v0.18.0/go.mod"
-"github.com/go-openapi/spec v0.19.2/go.mod"
-"github.com/go-openapi/spec v0.19.3"
-"github.com/go-openapi/spec v0.19.3/go.mod"
-"github.com/go-openapi/strfmt v0.17.0/go.mod"
-"github.com/go-openapi/strfmt v0.18.0/go.mod"
-"github.com/go-openapi/strfmt v0.19.0/go.mod"
-"github.com/go-openapi/strfmt v0.19.3"
-"github.com/go-openapi/strfmt v0.19.3/go.mod"
-"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-"github.com/go-openapi/swag v0.17.0/go.mod"
-"github.com/go-openapi/swag v0.18.0/go.mod"
-"github.com/go-openapi/swag v0.19.2/go.mod"
-"github.com/go-openapi/swag v0.19.5"
-"github.com/go-openapi/swag v0.19.5/go.mod"
-"github.com/go-openapi/validate v0.18.0/go.mod"
-"github.com/go-openapi/validate v0.19.2/go.mod"
-"github.com/go-openapi/validate v0.19.5"
-"github.com/go-openapi/validate v0.19.5/go.mod"
-"github.com/go-ozzo/ozzo-validation v3.5.0+incompatible"
-"github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod"
-"github.com/go-sql-driver/mysql v1.4.1"
-"github.com/go-sql-driver/mysql v1.4.1/go.mod"
-"github.com/go-stack/stack v1.8.0"
-"github.com/go-stack/stack v1.8.0/go.mod"
-"github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod"
-"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c"
-"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod"
-"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e"
-"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
-"github.com/godbus/dbus/v5 v5.0.3"
-"github.com/godbus/dbus/v5 v5.0.3/go.mod"
-"github.com/gofrs/flock v0.7.1"
-"github.com/gofrs/flock v0.7.1/go.mod"
-"github.com/gogo/googleapis v1.2.0/go.mod"
-"github.com/gogo/googleapis v1.3.2"
-"github.com/gogo/googleapis v1.3.2/go.mod"
-"github.com/gogo/protobuf v1.1.1"
-"github.com/gogo/protobuf v1.1.1/go.mod"
-"github.com/gogo/protobuf v1.2.1"
-"github.com/gogo/protobuf v1.2.1/go.mod"
-"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
-"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
-"github.com/gogo/protobuf v1.3.1"
-"github.com/gogo/protobuf v1.3.1/go.mod"
-"github.com/gogo/protobuf v1.3.2"
-"github.com/gogo/protobuf v1.3.2/go.mod"
-"github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903"
-"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
-"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6"
-"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
-"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
-"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
-"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
-"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
-"github.com/golang/mock v1.1.1"
-"github.com/golang/mock v1.1.1/go.mod"
-"github.com/golang/mock v1.2.0"
-"github.com/golang/mock v1.2.0/go.mod"
-"github.com/golang/mock v1.3.1/go.mod"
-"github.com/golang/mock v1.4.0/go.mod"
-"github.com/golang/mock v1.4.1"
-"github.com/golang/mock v1.4.1/go.mod"
-"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-"github.com/golang/protobuf v1.2.0"
-"github.com/golang/protobuf v1.2.0/go.mod"
-"github.com/golang/protobuf v1.3.1"
-"github.com/golang/protobuf v1.3.1/go.mod"
-"github.com/golang/protobuf v1.3.2"
-"github.com/golang/protobuf v1.3.2/go.mod"
-"github.com/golang/protobuf v1.3.3/go.mod"
-"github.com/golang/protobuf v1.3.4/go.mod"
-"github.com/golang/protobuf v1.3.5"
-"github.com/golang/protobuf v1.3.5/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-"github.com/golang/protobuf v1.4.0/go.mod"
-"github.com/golang/protobuf v1.4.1/go.mod"
-"github.com/golang/protobuf v1.4.2"
-"github.com/golang/protobuf v1.4.2/go.mod"
-"github.com/golang/protobuf v1.4.3"
-"github.com/golang/protobuf v1.4.3/go.mod"
-"github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450"
-"github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod"
-"github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995"
-"github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod"
-"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e"
-"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod"
-"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-"github.com/google/btree v1.0.0"
-"github.com/google/btree v1.0.0/go.mod"
-"github.com/google/cadvisor v0.37.2/go.mod"
-"github.com/google/cadvisor v0.38.5/go.mod"
-"github.com/google/cadvisor v0.38.8"
-"github.com/google/cadvisor v0.38.8/go.mod"
-"github.com/google/go-cmp v0.2.0/go.mod"
-"github.com/google/go-cmp v0.3.0"
-"github.com/google/go-cmp v0.3.0/go.mod"
-"github.com/google/go-cmp v0.3.1"
-"github.com/google/go-cmp v0.3.1/go.mod"
-"github.com/google/go-cmp v0.4.0"
-"github.com/google/go-cmp v0.4.0/go.mod"
-"github.com/google/go-cmp v0.5.0"
-"github.com/google/go-cmp v0.5.0/go.mod"
-"github.com/google/go-cmp v0.5.2"
-"github.com/google/go-cmp v0.5.2/go.mod"
-"github.com/google/go-containerregistry v0.0.0-20190617215043-876b8855d23c/go.mod"
-"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
-"github.com/google/gofuzz v1.0.0"
-"github.com/google/gofuzz v1.0.0/go.mod"
-"github.com/google/gofuzz v1.1.0"
-"github.com/google/gofuzz v1.1.0/go.mod"
-"github.com/google/martian v2.1.0+incompatible/go.mod"
-"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
-"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
-"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
-"github.com/google/renameio v0.1.0/go.mod"
-"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
-"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
-"github.com/google/uuid v1.0.0"
-"github.com/google/uuid v1.0.0/go.mod"
-"github.com/google/uuid v1.1.1"
-"github.com/google/uuid v1.1.1/go.mod"
-"github.com/google/uuid v1.1.2"
-"github.com/google/uuid v1.1.2/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.5"
-"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-"github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod"
-"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-"github.com/googleapis/gnostic v0.1.0"
-"github.com/googleapis/gnostic v0.1.0/go.mod"
-"github.com/googleapis/gnostic v0.2.0/go.mod"
-"github.com/googleapis/gnostic v0.3.1"
-"github.com/googleapis/gnostic v0.3.1/go.mod"
-"github.com/googleapis/gnostic v0.4.1"
-"github.com/googleapis/gnostic v0.4.1/go.mod"
-"github.com/gophercloud/gophercloud v0.1.0"
-"github.com/gophercloud/gophercloud v0.1.0/go.mod"
-"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-"github.com/gorilla/context v1.1.1"
-"github.com/gorilla/context v1.1.1/go.mod"
-"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod"
-"github.com/gorilla/mux v1.7.2/go.mod"
-"github.com/gorilla/mux v1.7.3/go.mod"
-"github.com/gorilla/mux v1.7.4/go.mod"
-"github.com/gorilla/mux v1.8.0"
-"github.com/gorilla/mux v1.8.0/go.mod"
-"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c"
-"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
-"github.com/gorilla/websocket v1.4.0"
-"github.com/gorilla/websocket v1.4.0/go.mod"
-"github.com/gorilla/websocket v1.4.2"
-"github.com/gorilla/websocket v1.4.2/go.mod"
-"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
-"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
-"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
-"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.5"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
-"github.com/hashicorp/consul/api v1.1.0/go.mod"
-"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
-"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
-"github.com/hashicorp/errwrap v1.0.0"
-"github.com/hashicorp/errwrap v1.0.0/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
-"github.com/hashicorp/go-multierror v1.0.0"
-"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-"github.com/hashicorp/go.net v0.0.1/go.mod"
-"github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod"
-"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-"github.com/hashicorp/golang-lru v0.5.1"
-"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.3"
-"github.com/hashicorp/golang-lru v0.5.3/go.mod"
-"github.com/hashicorp/hcl v1.0.0"
-"github.com/hashicorp/hcl v1.0.0/go.mod"
-"github.com/hashicorp/logutils v1.0.0/go.mod"
-"github.com/hashicorp/mdns v1.0.0/go.mod"
-"github.com/hashicorp/memberlist v0.1.3/go.mod"
-"github.com/hashicorp/serf v0.8.2/go.mod"
-"github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible"
-"github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible/go.mod"
-"github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6"
-"github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod"
-"github.com/hpcloud/tail v1.0.0"
-"github.com/hpcloud/tail v1.0.0/go.mod"
-"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
-"github.com/imdario/mergo v0.3.5"
-"github.com/imdario/mergo v0.3.5/go.mod"
-"github.com/imdario/mergo v0.3.7/go.mod"
-"github.com/imdario/mergo v0.3.8"
-"github.com/imdario/mergo v0.3.8/go.mod"
-"github.com/inconshreveable/mousetrap v1.0.0"
-"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-"github.com/insomniacslk/dhcp v0.0.0-20200420235442-ed3125c2efe7/go.mod"
-"github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5"
-"github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5/go.mod"
-"github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56"
-"github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod"
-"github.com/jamescun/tuntap v0.0.0-20190712092105-cb1fb277045c/go.mod"
-"github.com/jetstack/cert-manager v0.7.2/go.mod"
-"github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod"
-"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
-"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7"
-"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod"
-"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-"github.com/jmespath/go-jmespath v0.4.0"
-"github.com/jmespath/go-jmespath v0.4.0/go.mod"
-"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
-"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
-"github.com/joho/godotenv v0.0.0-20161216230537-726cc8b906e3"
-"github.com/joho/godotenv v0.0.0-20161216230537-726cc8b906e3/go.mod"
-"github.com/jonboulle/clockwork v0.1.0"
-"github.com/jonboulle/clockwork v0.1.0/go.mod"
-"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-"github.com/json-iterator/go v1.1.10"
-"github.com/json-iterator/go v1.1.10/go.mod"
-"github.com/json-iterator/go v1.1.6"
-"github.com/json-iterator/go v1.1.6/go.mod"
-"github.com/json-iterator/go v1.1.7"
-"github.com/json-iterator/go v1.1.7/go.mod"
-"github.com/json-iterator/go v1.1.8"
-"github.com/json-iterator/go v1.1.8/go.mod"
-"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
-"github.com/jtolds/gls v4.20.0+incompatible"
-"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-"github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod"
-"github.com/k3s-io/containerd v1.4.4-k3s1"
-"github.com/k3s-io/containerd v1.4.4-k3s1/go.mod"
-"github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1"
-"github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1/go.mod"
-"github.com/k3s-io/cri v1.4.0-k3s.5"
-"github.com/k3s-io/cri v1.4.0-k3s.5/go.mod"
-"github.com/k3s-io/cri-tools v1.20.0-k3s1"
-"github.com/k3s-io/cri-tools v1.20.0-k3s1/go.mod"
-"github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea"
-"github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea/go.mod"
-"github.com/k3s-io/flannel v0.12.0-k3s2"
-"github.com/k3s-io/flannel v0.12.0-k3s2/go.mod"
-"github.com/k3s-io/go-powershell v0.0.0-20200701182037-6845e6fcfa79"
-"github.com/k3s-io/go-powershell v0.0.0-20200701182037-6845e6fcfa79/go.mod"
-"github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7"
-"github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7/go.mod"
-"github.com/k3s-io/helm-controller v0.8.3"
-"github.com/k3s-io/helm-controller v0.8.3/go.mod"
-"github.com/k3s-io/kine v0.6.0"
-"github.com/k3s-io/kine v0.6.0/go.mod"
-"github.com/k3s-io/kubernetes v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.20.6-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.20.6-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.20.6-k3s1/go.mod"
-"github.com/karrick/godirwalk v1.16.1"
-"github.com/karrick/godirwalk v1.16.1/go.mod"
-"github.com/karrick/godirwalk v1.7.5/go.mod"
-"github.com/kisielk/errcheck v1.1.0/go.mod"
-"github.com/kisielk/errcheck v1.2.0/go.mod"
-"github.com/kisielk/errcheck v1.5.0/go.mod"
-"github.com/kisielk/gotool v1.0.0"
-"github.com/kisielk/gotool v1.0.0/go.mod"
-"github.com/klauspost/compress v1.11.7"
-"github.com/klauspost/compress v1.11.7/go.mod"
-"github.com/klauspost/cpuid v1.2.0/go.mod"
-"github.com/klauspost/cpuid v1.2.3/go.mod"
-"github.com/klauspost/cpuid v1.3.1"
-"github.com/klauspost/cpuid v1.3.1/go.mod"
-"github.com/knative/build v0.6.0/go.mod"
-"github.com/knative/pkg v0.0.0-20190514205332-5e4512dcb2ca/go.mod"
-"github.com/knative/serving v0.6.1/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.3"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
-"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-"github.com/kr/pretty v0.1.0"
-"github.com/kr/pretty v0.1.0/go.mod"
-"github.com/kr/pretty v0.2.0"
-"github.com/kr/pretty v0.2.0/go.mod"
-"github.com/kr/pretty v0.2.1"
-"github.com/kr/pretty v0.2.1/go.mod"
-"github.com/kr/pty v1.1.1/go.mod"
-"github.com/kr/pty v1.1.5/go.mod"
-"github.com/kr/text v0.1.0"
-"github.com/kr/text v0.1.0/go.mod"
-"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
-"github.com/lib/pq v1.8.0"
-"github.com/lib/pq v1.8.0/go.mod"
-"github.com/libopenstorage/openstorage v1.0.0"
-"github.com/libopenstorage/openstorage v1.0.0/go.mod"
-"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de"
-"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod"
-"github.com/lithammer/dedent v1.1.0"
-"github.com/lithammer/dedent v1.1.0/go.mod"
-"github.com/lpabon/godbc v0.1.1"
-"github.com/lpabon/godbc v0.1.1/go.mod"
-"github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod"
-"github.com/lucas-clemente/quic-clients v0.1.0/go.mod"
-"github.com/lucas-clemente/quic-go v0.10.2/go.mod"
-"github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod"
-"github.com/magiconair/properties v1.8.0/go.mod"
-"github.com/magiconair/properties v1.8.1"
-"github.com/magiconair/properties v1.8.1/go.mod"
-"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
-"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
-"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
-"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
-"github.com/mailru/easyjson v0.7.0"
-"github.com/mailru/easyjson v0.7.0/go.mod"
-"github.com/marstr/guid v1.1.0/go.mod"
-"github.com/marten-seemann/qtls v0.2.3/go.mod"
-"github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a/go.mod"
-"github.com/mattn/go-colorable v0.0.9"
-"github.com/mattn/go-colorable v0.0.9/go.mod"
-"github.com/mattn/go-colorable v0.1.4/go.mod"
-"github.com/mattn/go-isatty v0.0.11/go.mod"
-"github.com/mattn/go-isatty v0.0.3/go.mod"
-"github.com/mattn/go-isatty v0.0.4"
-"github.com/mattn/go-isatty v0.0.4/go.mod"
-"github.com/mattn/go-isatty v0.0.8/go.mod"
-"github.com/mattn/go-runewidth v0.0.2"
-"github.com/mattn/go-runewidth v0.0.2/go.mod"
-"github.com/mattn/go-runewidth v0.0.4/go.mod"
-"github.com/mattn/go-shellwords v1.0.3"
-"github.com/mattn/go-shellwords v1.0.3/go.mod"
-"github.com/mattn/go-sqlite3 v1.14.4"
-"github.com/mattn/go-sqlite3 v1.14.4/go.mod"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
-"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
-"github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod"
-"github.com/miekg/dns v1.0.14/go.mod"
-"github.com/miekg/dns v1.1.3/go.mod"
-"github.com/miekg/dns v1.1.4"
-"github.com/miekg/dns v1.1.4/go.mod"
-"github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989"
-"github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989/go.mod"
-"github.com/minio/md5-simd v1.1.0"
-"github.com/minio/md5-simd v1.1.0/go.mod"
-"github.com/minio/minio-go/v7 v7.0.7"
-"github.com/minio/minio-go/v7 v7.0.7/go.mod"
-"github.com/minio/sha256-simd v0.1.1"
-"github.com/minio/sha256-simd v0.1.1/go.mod"
-"github.com/minio/sio v0.2.1/go.mod"
-"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible"
-"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod"
-"github.com/mitchellh/cli v1.0.0/go.mod"
-"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-"github.com/mitchellh/go-homedir v1.1.0"
-"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-"github.com/mitchellh/go-wordwrap v1.0.0"
-"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-"github.com/mitchellh/gox v0.4.0/go.mod"
-"github.com/mitchellh/iochan v1.0.0/go.mod"
-"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-"github.com/mitchellh/mapstructure v1.1.2"
-"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod"
-"github.com/moby/ipvs v1.0.1"
-"github.com/moby/ipvs v1.0.1/go.mod"
-"github.com/moby/sys/mountinfo v0.1.3"
-"github.com/moby/sys/mountinfo v0.1.3/go.mod"
-"github.com/moby/term v0.0.0-20200312100748-672ec06f55cd"
-"github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod"
-"github.com/moby/vpnkit v0.4.0/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-"github.com/modern-go/reflect2 v1.0.1"
-"github.com/modern-go/reflect2 v1.0.1/go.mod"
-"github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb"
-"github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod"
-"github.com/morikuni/aec v1.0.0"
-"github.com/morikuni/aec v1.0.0/go.mod"
-"github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618/go.mod"
-"github.com/mrunalp/fileutils v0.0.0-20200520151820-abd8a0e76976"
-"github.com/mrunalp/fileutils v0.0.0-20200520151820-abd8a0e76976/go.mod"
-"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822"
-"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod"
-"github.com/mvdan/xurls v1.1.0"
-"github.com/mvdan/xurls v1.1.0/go.mod"
-"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f"
-"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-"github.com/naoina/go-stringutil v0.1.0/go.mod"
-"github.com/naoina/toml v0.1.1/go.mod"
-"github.com/natefinch/lumberjack v2.0.0+incompatible"
-"github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod"
-"github.com/ncw/swift v1.0.47/go.mod"
-"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
-"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
-"github.com/nxadm/tail v1.4.4"
-"github.com/nxadm/tail v1.4.4/go.mod"
-"github.com/oklog/ulid v1.3.1/go.mod"
-"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5"
-"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
-"github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b"
-"github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod"
-"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c"
-"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-"github.com/onsi/ginkgo v1.10.1/go.mod"
-"github.com/onsi/ginkgo v1.10.3/go.mod"
-"github.com/onsi/ginkgo v1.11.0"
-"github.com/onsi/ginkgo v1.11.0/go.mod"
-"github.com/onsi/ginkgo v1.12.1/go.mod"
-"github.com/onsi/ginkgo v1.14.2"
-"github.com/onsi/ginkgo v1.14.2/go.mod"
-"github.com/onsi/ginkgo v1.6.0"
-"github.com/onsi/ginkgo v1.6.0/go.mod"
-"github.com/onsi/ginkgo v1.8.0/go.mod"
-"github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a"
-"github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod"
-"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c"
-"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-"github.com/onsi/gomega v1.10.1"
-"github.com/onsi/gomega v1.10.1/go.mod"
-"github.com/onsi/gomega v1.10.3"
-"github.com/onsi/gomega v1.10.3/go.mod"
-"github.com/onsi/gomega v1.5.0/go.mod"
-"github.com/onsi/gomega v1.7.0"
-"github.com/onsi/gomega v1.7.0/go.mod"
-"github.com/onsi/gomega v1.7.1"
-"github.com/onsi/gomega v1.7.1/go.mod"
-"github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod"
-"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
-"github.com/opencontainers/go-digest v1.0.0"
-"github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod"
-"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
-"github.com/opencontainers/go-digest v1.0.0/go.mod"
-"github.com/opencontainers/image-spec v1.0.0/go.mod"
-"github.com/opencontainers/image-spec v1.0.1"
-"github.com/opencontainers/image-spec v1.0.1/go.mod"
-"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
-"github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod"
-"github.com/opencontainers/runc v1.0.0-rc90.0.20200616040943-82d2fa4eb069/go.mod"
-"github.com/opencontainers/runc v1.0.0-rc91.0.20200707015106-819fcc687efb/go.mod"
-"github.com/opencontainers/runc v1.0.0-rc92"
-"github.com/opencontainers/runc v1.0.0-rc92/go.mod"
-"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.1/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.2/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20200520003142-237cc4f519e2/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20200710190001-3e4195d92445"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20200710190001-3e4195d92445/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6/go.mod"
-"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
-"github.com/opencontainers/selinux v1.5.1/go.mod"
-"github.com/opencontainers/selinux v1.5.2/go.mod"
-"github.com/opencontainers/selinux v1.6.0"
-"github.com/opencontainers/selinux v1.6.0/go.mod"
-"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-"github.com/pborman/uuid v1.2.0"
-"github.com/pborman/uuid v1.2.0/go.mod"
-"github.com/pborman/uuid v1.2.1"
-"github.com/pborman/uuid v1.2.1/go.mod"
-"github.com/pelletier/go-toml v1.2.0"
-"github.com/pelletier/go-toml v1.2.0/go.mod"
-"github.com/peterbourgon/diskv v2.0.1+incompatible"
-"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-"github.com/pierrec/lz4 v2.5.2+incompatible"
-"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
-"github.com/pkg/errors v0.8.0"
-"github.com/pkg/errors v0.8.0/go.mod"
-"github.com/pkg/errors v0.8.1"
-"github.com/pkg/errors v0.8.1/go.mod"
-"github.com/pkg/errors v0.9.1"
-"github.com/pkg/errors v0.9.1/go.mod"
-"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-"github.com/pmezard/go-difflib v1.0.0"
-"github.com/pmezard/go-difflib v1.0.0/go.mod"
-"github.com/posener/complete v1.1.1/go.mod"
-"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021"
-"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
-"github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod"
-"github.com/prometheus/client_golang v0.9.1/go.mod"
-"github.com/prometheus/client_golang v0.9.3/go.mod"
-"github.com/prometheus/client_golang v1.0.0"
-"github.com/prometheus/client_golang v1.0.0/go.mod"
-"github.com/prometheus/client_golang v1.1.0/go.mod"
-"github.com/prometheus/client_golang v1.7.1"
-"github.com/prometheus/client_golang v1.7.1/go.mod"
-"github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod"
-"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
-"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-"github.com/prometheus/client_model v0.2.0"
-"github.com/prometheus/client_model v0.2.0/go.mod"
-"github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod"
-"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
-"github.com/prometheus/common v0.10.0"
-"github.com/prometheus/common v0.10.0/go.mod"
-"github.com/prometheus/common v0.4.0/go.mod"
-"github.com/prometheus/common v0.4.1"
-"github.com/prometheus/common v0.4.1/go.mod"
-"github.com/prometheus/common v0.6.0/go.mod"
-"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
-"github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod"
-"github.com/prometheus/procfs v0.0.2"
-"github.com/prometheus/procfs v0.0.2/go.mod"
-"github.com/prometheus/procfs v0.0.3/go.mod"
-"github.com/prometheus/procfs v0.0.5/go.mod"
-"github.com/prometheus/procfs v0.0.8/go.mod"
-"github.com/prometheus/procfs v0.1.3"
-"github.com/prometheus/procfs v0.1.3/go.mod"
-"github.com/prometheus/procfs v0.2.0"
-"github.com/prometheus/procfs v0.2.0/go.mod"
-"github.com/prometheus/tsdb v0.7.1/go.mod"
-"github.com/quobyte/api v0.1.2/go.mod"
-"github.com/quobyte/api v0.1.8"
-"github.com/quobyte/api v0.1.8/go.mod"
-"github.com/rakelkar/gonetsh v0.0.0-20190930180311-e5c5ffe4bdf0"
-"github.com/rakelkar/gonetsh v0.0.0-20190930180311-e5c5ffe4bdf0/go.mod"
-"github.com/rancher/dynamiclistener v0.2.2"
-"github.com/rancher/dynamiclistener v0.2.2/go.mod"
-"github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79"
-"github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79/go.mod"
-"github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373"
-"github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373/go.mod"
-"github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009/go.mod"
-"github.com/rancher/remotedialer v0.2.0"
-"github.com/rancher/remotedialer v0.2.0/go.mod"
-"github.com/rancher/wrangler v0.1.4/go.mod"
-"github.com/rancher/wrangler v0.4.0"
-"github.com/rancher/wrangler v0.4.0/go.mod"
-"github.com/rancher/wrangler v0.6.0/go.mod"
-"github.com/rancher/wrangler v0.6.1"
-"github.com/rancher/wrangler v0.6.1/go.mod"
-"github.com/rancher/wrangler v0.6.2"
-"github.com/rancher/wrangler v0.6.2/go.mod"
-"github.com/rancher/wrangler-api v0.2.0/go.mod"
-"github.com/rancher/wrangler-api v0.6.0"
-"github.com/rancher/wrangler-api v0.6.0/go.mod"
-"github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod"
-"github.com/robfig/cron v1.1.0"
-"github.com/robfig/cron v1.1.0/go.mod"
-"github.com/robfig/cron/v3 v3.0.1"
-"github.com/robfig/cron/v3 v3.0.1/go.mod"
-"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-"github.com/rootless-containers/rootlesskit v0.10.0"
-"github.com/rootless-containers/rootlesskit v0.10.0/go.mod"
-"github.com/rs/xid v1.2.1"
-"github.com/rs/xid v1.2.1/go.mod"
-"github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021"
-"github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021/go.mod"
-"github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod"
-"github.com/russross/blackfriday v1.5.2"
-"github.com/russross/blackfriday v1.5.2/go.mod"
-"github.com/russross/blackfriday/v2 v2.0.1"
-"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-"github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8"
-"github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod"
-"github.com/satori/go.uuid v1.2.0"
-"github.com/satori/go.uuid v1.2.0/go.mod"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-"github.com/seccomp/libseccomp-golang v0.9.1"
-"github.com/seccomp/libseccomp-golang v0.9.1/go.mod"
-"github.com/sergi/go-diff v1.0.0/go.mod"
-"github.com/shurcooL/sanitized_anchor_name v1.0.0"
-"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-"github.com/sirupsen/logrus v1.0.6"
-"github.com/sirupsen/logrus v1.0.6/go.mod"
-"github.com/sirupsen/logrus v1.2.0"
-"github.com/sirupsen/logrus v1.2.0/go.mod"
-"github.com/sirupsen/logrus v1.4.1/go.mod"
-"github.com/sirupsen/logrus v1.4.2"
-"github.com/sirupsen/logrus v1.4.2/go.mod"
-"github.com/sirupsen/logrus v1.6.0"
-"github.com/sirupsen/logrus v1.6.0/go.mod"
-"github.com/sirupsen/logrus v1.7.0"
-"github.com/sirupsen/logrus v1.7.0/go.mod"
-"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
-"github.com/smartystreets/goconvey v1.6.4"
-"github.com/smartystreets/goconvey v1.6.4/go.mod"
-"github.com/soheilhy/cmux v0.1.4"
-"github.com/soheilhy/cmux v0.1.4/go.mod"
-"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-"github.com/spf13/afero v1.1.2/go.mod"
-"github.com/spf13/afero v1.2.2"
-"github.com/spf13/afero v1.2.2/go.mod"
-"github.com/spf13/cast v1.3.0"
-"github.com/spf13/cast v1.3.0/go.mod"
-"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee"
-"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
-"github.com/spf13/cobra v0.0.3"
-"github.com/spf13/cobra v0.0.3/go.mod"
-"github.com/spf13/cobra v0.0.5/go.mod"
-"github.com/spf13/cobra v1.0.0/go.mod"
-"github.com/spf13/cobra v1.1.1"
-"github.com/spf13/cobra v1.1.1/go.mod"
-"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-"github.com/spf13/jwalterweatherman v1.1.0"
-"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
-"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff"
-"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-"github.com/spf13/pflag v1.0.1"
-"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95"
-"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
-"github.com/spf13/pflag v1.0.1/go.mod"
-"github.com/spf13/pflag v1.0.3"
-"github.com/spf13/pflag v1.0.3/go.mod"
-"github.com/spf13/pflag v1.0.5"
-"github.com/spf13/pflag v1.0.5/go.mod"
-"github.com/spf13/viper v1.3.2/go.mod"
-"github.com/spf13/viper v1.4.0/go.mod"
-"github.com/spf13/viper v1.7.0"
-"github.com/spf13/viper v1.7.0/go.mod"
-"github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod"
-"github.com/storageos/go-api v2.2.0+incompatible"
-"github.com/storageos/go-api v2.2.0+incompatible/go.mod"
-"github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod"
-"github.com/stretchr/objx v0.1.0/go.mod"
-"github.com/stretchr/objx v0.1.1/go.mod"
-"github.com/stretchr/objx v0.2.0"
-"github.com/stretchr/objx v0.2.0/go.mod"
-"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
-"github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod"
-"github.com/stretchr/testify v1.2.2"
-"github.com/stretchr/testify v1.2.2/go.mod"
-"github.com/stretchr/testify v1.3.0"
-"github.com/stretchr/testify v1.3.0/go.mod"
-"github.com/stretchr/testify v1.4.0"
-"github.com/stretchr/testify v1.4.0/go.mod"
-"github.com/stretchr/testify v1.5.1/go.mod"
-"github.com/stretchr/testify v1.6.1"
-"github.com/stretchr/testify v1.6.1/go.mod"
-"github.com/subosito/gotenv v1.2.0"
-"github.com/subosito/gotenv v1.2.0/go.mod"
-"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
-"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2"
-"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod"
-"github.com/tchap/go-patricia v2.2.6+incompatible"
-"github.com/tchap/go-patricia v2.2.6+incompatible/go.mod"
-"github.com/tchap/go-patricia v2.3.0+incompatible"
-"github.com/tchap/go-patricia v2.3.0+incompatible/go.mod"
-"github.com/tektoncd/pipeline v0.4.0/go.mod"
-"github.com/thecodeteam/goscaleio v0.1.0"
-"github.com/thecodeteam/goscaleio v0.1.0/go.mod"
-"github.com/tidwall/pretty v1.0.0"
-"github.com/tidwall/pretty v1.0.0/go.mod"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
-"github.com/u-root/u-root v6.0.0+incompatible/go.mod"
-"github.com/ugorji/go v0.0.0-20170107133203-ded73eae5db7"
-"github.com/ugorji/go v0.0.0-20170107133203-ded73eae5db7/go.mod"
-"github.com/ugorji/go v1.1.4/go.mod"
-"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
-"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
-"github.com/urfave/cli v1.20.0"
-"github.com/urfave/cli v1.20.0/go.mod"
-"github.com/urfave/cli v1.21.0"
-"github.com/urfave/cli v1.21.0/go.mod"
-"github.com/urfave/cli v1.22.1"
-"github.com/urfave/cli v1.22.1/go.mod"
-"github.com/urfave/cli v1.22.2"
-"github.com/urfave/cli v1.22.2/go.mod"
-"github.com/urfave/cli/v2 v2.2.0/go.mod"
-"github.com/urfave/cli/v2 v2.3.0"
-"github.com/urfave/cli/v2 v2.3.0/go.mod"
-"github.com/urfave/negroni v1.0.0"
-"github.com/urfave/negroni v1.0.0/go.mod"
-"github.com/vektah/gqlparser v1.1.2/go.mod"
-"github.com/vishvananda/netlink v0.0.0-20170220200719-fe3b5664d23a"
-"github.com/vishvananda/netlink v0.0.0-20170220200719-fe3b5664d23a/go.mod"
-"github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf"
-"github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod"
-"github.com/vishvananda/netlink v1.1.0"
-"github.com/vishvananda/netlink v1.1.0/go.mod"
-"github.com/vishvananda/netns v0.0.0-20170219233438-54f0e4339ce7"
-"github.com/vishvananda/netns v0.0.0-20170219233438-54f0e4339ce7/go.mod"
-"github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc"
-"github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod"
-"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df"
-"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod"
-"github.com/vishvananda/netns v0.0.0-20200520041808-52d707b772fe/go.mod"
-"github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae"
-"github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod"
-"github.com/vmware/govmomi v0.20.3"
-"github.com/vmware/govmomi v0.20.3/go.mod"
-"github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243"
-"github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod"
-"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
-"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
-"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
-"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
-"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-"github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod"
-"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
-"github.com/yuin/goldmark v1.1.27/go.mod"
-"github.com/yuin/goldmark v1.2.1/go.mod"
-"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod"
-"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod"
-"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod"
-"go.etcd.io/bbolt v1.3.2/go.mod"
-"go.etcd.io/bbolt v1.3.3"
-"go.etcd.io/bbolt v1.3.3/go.mod"
-"go.etcd.io/bbolt v1.3.5"
-"go.etcd.io/bbolt v1.3.5/go.mod"
-"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738"
-"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
-"go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod"
-"go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489"
-"go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod"
-"go.mongodb.org/mongo-driver v1.0.3/go.mod"
-"go.mongodb.org/mongo-driver v1.1.1/go.mod"
-"go.mongodb.org/mongo-driver v1.1.2"
-"go.mongodb.org/mongo-driver v1.1.2/go.mod"
-"go.opencensus.io v0.21.0"
-"go.opencensus.io v0.21.0/go.mod"
-"go.opencensus.io v0.22.0/go.mod"
-"go.opencensus.io v0.22.2"
-"go.opencensus.io v0.22.2/go.mod"
-"go.opencensus.io v0.22.3"
-"go.opencensus.io v0.22.3/go.mod"
-"go.uber.org/atomic v1.3.2"
-"go.uber.org/atomic v1.3.2/go.mod"
-"go.uber.org/atomic v1.4.0"
-"go.uber.org/atomic v1.4.0/go.mod"
-"go.uber.org/multierr v1.1.0"
-"go.uber.org/multierr v1.1.0/go.mod"
-"go.uber.org/zap v1.10.0"
-"go.uber.org/zap v1.10.0/go.mod"
-"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793"
-"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-"golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941"
-"golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod"
-"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
-"golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod"
-"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
-"golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod"
-"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8"
-"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
-"golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod"
-"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
-"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586"
-"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod"
-"golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc"
-"golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod"
-"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975"
-"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/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/crypto v0.0.0-20201002170205-7f63de1d35b0"
-"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
-"golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod"
-"golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod"
-"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-"golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod"
-"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
-"golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod"
-"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
-"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
-"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
-"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
-"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
-"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
-"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6"
-"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
-"golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod"
-"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
-"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
-"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
-"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
-"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
-"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
-"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
-"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-"golang.org/x/mod v0.1.0/go.mod"
-"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
-"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
-"golang.org/x/mod v0.2.0/go.mod"
-"golang.org/x/mod v0.3.0"
-"golang.org/x/mod v0.3.0/go.mod"
-"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd"
-"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-"golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod"
-"golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1"
-"golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod"
-"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a"
-"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
-"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-"golang.org/x/net v0.0.0-20190311183353-d8887717615a"
-"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-"golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod"
-"golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod"
-"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980"
-"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod"
-"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
-"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7"
-"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
-"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
-"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
-"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
-"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
-"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
-"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
-"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
-"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
-"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
-"golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7"
-"golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod"
-"golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod"
-"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
-"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b"
-"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
-"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
-"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6"
-"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
-"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
-"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
-"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f"
-"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
-"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
-"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9"
-"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
-"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5"
-"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
-"golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod"
-"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod"
-"golang.org/x/sys v0.0.0-20190312061237-fead79001313"
-"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-"golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod"
-"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
-"golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod"
-"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
-"golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444"
-"golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod"
-"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f"
-"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
-"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
-"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
-"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
-"golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod"
-"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456"
-"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
-"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
-"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
-"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
-"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
-"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7"
-"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod"
-"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
-"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e"
-"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
-"golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod"
-"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
-"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
-"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
-"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-"golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod"
-"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
-"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
-"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
-"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
-"golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod"
-"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/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/sys v0.0.0-20200327173247-9dae0f8f5775/go.mod"
-"golang.org/x/sys v0.0.0-20200519105757-fe76b779f299"
-"golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod"
-"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
-"golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1"
-"golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod"
-"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
-"golang.org/x/sys v0.0.0-20201110211018-35f3e6cf4a65/go.mod"
-"golang.org/x/sys v0.0.0-20201112073958-5cba982894dd"
-"golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod"
-"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3"
-"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
-"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
-"golang.org/x/text v0.3.0"
-"golang.org/x/text v0.3.0/go.mod"
-"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-"golang.org/x/text v0.3.2"
-"golang.org/x/text v0.3.2/go.mod"
-"golang.org/x/text v0.3.3"
-"golang.org/x/text v0.3.3/go.mod"
-"golang.org/x/text v0.3.4"
-"golang.org/x/text v0.3.4/go.mod"
-"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2"
-"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
-"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c"
-"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
-"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e"
-"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
-"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-"golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod"
-"golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod"
-"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135"
-"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-"golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod"
-"golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod"
-"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac"
-"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
-"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
-"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
-"golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72"
-"golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod"
-"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
-"golang.org/x/tools v0.0.0-20191017205301-920acffc3e65"
-"golang.org/x/tools v0.0.0-20191017205301-920acffc3e65/go.mod"
-"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
-"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
-"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
-"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
-"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
-"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
-"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
-"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
-"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
-"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
-"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
-"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
-"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
-"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
-"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
-"golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod"
-"golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod"
-"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
-"golang.org/x/tools v0.0.0-20210106214847-113979e3529a"
-"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/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"
-"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
-"gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod"
-"gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod"
-"gonum.org/v1/gonum v0.6.2"
-"gonum.org/v1/gonum v0.6.2/go.mod"
-"gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod"
-"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e"
-"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod"
-"gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod"
-"google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod"
-"google.golang.org/api v0.13.0/go.mod"
-"google.golang.org/api v0.14.0/go.mod"
-"google.golang.org/api v0.15.0/go.mod"
-"google.golang.org/api v0.15.1-0.20200106000736-b8fc810ca6b5/go.mod"
-"google.golang.org/api v0.15.1/go.mod"
-"google.golang.org/api v0.17.0/go.mod"
-"google.golang.org/api v0.18.0/go.mod"
-"google.golang.org/api v0.20.0"
-"google.golang.org/api v0.20.0/go.mod"
-"google.golang.org/api v0.4.0"
-"google.golang.org/api v0.4.0/go.mod"
-"google.golang.org/api v0.7.0/go.mod"
-"google.golang.org/api v0.8.0/go.mod"
-"google.golang.org/api v0.9.0/go.mod"
-"google.golang.org/appengine v1.1.0/go.mod"
-"google.golang.org/appengine v1.4.0"
-"google.golang.org/appengine v1.4.0/go.mod"
-"google.golang.org/appengine v1.5.0"
-"google.golang.org/appengine v1.5.0/go.mod"
-"google.golang.org/appengine v1.6.1"
-"google.golang.org/appengine v1.6.1/go.mod"
-"google.golang.org/appengine v1.6.5"
-"google.golang.org/appengine v1.6.5/go.mod"
-"google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod"
-"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8"
-"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7"
-"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873"
-"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
-"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
-"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
-"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
-"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
-"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
-"google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod"
-"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
-"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
-"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
-"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63"
-"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
-"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
-"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013"
-"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
-"google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a"
-"google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod"
-"google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod"
-"google.golang.org/grpc v1.19.0"
-"google.golang.org/grpc v1.19.0/go.mod"
-"google.golang.org/grpc v1.20.1/go.mod"
-"google.golang.org/grpc v1.21.0/go.mod"
-"google.golang.org/grpc v1.21.1/go.mod"
-"google.golang.org/grpc v1.23.0"
-"google.golang.org/grpc v1.23.0/go.mod"
-"google.golang.org/grpc v1.23.1"
-"google.golang.org/grpc v1.23.1/go.mod"
-"google.golang.org/grpc v1.24.0"
-"google.golang.org/grpc v1.24.0/go.mod"
-"google.golang.org/grpc v1.25.1/go.mod"
-"google.golang.org/grpc v1.26.0"
-"google.golang.org/grpc v1.26.0/go.mod"
-"google.golang.org/grpc v1.27.0/go.mod"
-"google.golang.org/grpc v1.27.1"
-"google.golang.org/grpc v1.27.1/go.mod"
-"google.golang.org/grpc v1.33.2"
-"google.golang.org/grpc v1.33.2/go.mod"
-"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-"google.golang.org/protobuf v1.21.0/go.mod"
-"google.golang.org/protobuf v1.22.0/go.mod"
-"google.golang.org/protobuf v1.23.0"
-"google.golang.org/protobuf v1.23.0/go.mod"
-"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
-"google.golang.org/protobuf v1.24.0"
-"google.golang.org/protobuf v1.24.0/go.mod"
-"google.golang.org/protobuf v1.25.0"
-"google.golang.org/protobuf v1.25.0/go.mod"
-"gopkg.in/airbrake/gobrake.v2 v2.0.9"
-"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
-"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-"gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod"
-"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
-"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
-"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
-"gopkg.in/cheggaaa/pb.v1 v1.0.25"
-"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
-"gopkg.in/errgo.v2 v2.1.0/go.mod"
-"gopkg.in/fsnotify.v1 v1.4.7"
-"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-"gopkg.in/gcfg.v1 v1.2.0"
-"gopkg.in/gcfg.v1 v1.2.0/go.mod"
-"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2"
-"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-"gopkg.in/inf.v0 v0.9.1"
-"gopkg.in/inf.v0 v0.9.1/go.mod"
-"gopkg.in/ini.v1 v1.51.0"
-"gopkg.in/ini.v1 v1.51.0/go.mod"
-"gopkg.in/ini.v1 v1.57.0"
-"gopkg.in/ini.v1 v1.57.0/go.mod"
-"gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod"
-"gopkg.in/natefinch/lumberjack.v2 v2.0.0"
-"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
-"gopkg.in/resty.v1 v1.12.0/go.mod"
-"gopkg.in/square/go-jose.v2 v2.2.2"
-"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
-"gopkg.in/square/go-jose.v2 v2.3.1"
-"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-"gopkg.in/warnings.v0 v0.1.1"
-"gopkg.in/warnings.v0 v0.1.1/go.mod"
-"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-"gopkg.in/yaml.v2 v2.2.1"
-"gopkg.in/yaml.v2 v2.2.1/go.mod"
-"gopkg.in/yaml.v2 v2.2.2"
-"gopkg.in/yaml.v2 v2.2.2/go.mod"
-"gopkg.in/yaml.v2 v2.2.3/go.mod"
-"gopkg.in/yaml.v2 v2.2.4"
-"gopkg.in/yaml.v2 v2.2.4/go.mod"
-"gopkg.in/yaml.v2 v2.2.5/go.mod"
-"gopkg.in/yaml.v2 v2.2.8"
-"gopkg.in/yaml.v2 v2.2.8/go.mod"
-"gopkg.in/yaml.v2 v2.3.0"
-"gopkg.in/yaml.v2 v2.3.0/go.mod"
-"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
-"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
-"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
-"gotest.tools v2.2.0+incompatible"
-"gotest.tools v2.2.0+incompatible/go.mod"
-"gotest.tools/v3 v3.0.2"
-"gotest.tools/v3 v3.0.2/go.mod"
-"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
-"k8s.io/api v0.17.0/go.mod"
-"k8s.io/api v0.18.0"
-"k8s.io/api v0.18.0/go.mod"
-"k8s.io/api v0.18.5"
-"k8s.io/api v0.18.5/go.mod"
-"k8s.io/api v0.19.5"
-"k8s.io/api v0.19.5/go.mod"
-"k8s.io/apiextensions-apiserver v0.17.0/go.mod"
-"k8s.io/apiextensions-apiserver v0.18.0"
-"k8s.io/apiextensions-apiserver v0.18.0/go.mod"
-"k8s.io/apiextensions-apiserver v0.19.5/go.mod"
-"k8s.io/apimachinery v0.17.0/go.mod"
-"k8s.io/apimachinery v0.18.0"
-"k8s.io/apimachinery v0.18.0/go.mod"
-"k8s.io/apimachinery v0.18.5"
-"k8s.io/apimachinery v0.18.5/go.mod"
-"k8s.io/apimachinery v0.19.5"
-"k8s.io/apimachinery v0.19.5/go.mod"
-"k8s.io/apiserver v0.17.0/go.mod"
-"k8s.io/apiserver v0.18.0/go.mod"
-"k8s.io/apiserver v0.19.5"
-"k8s.io/apiserver v0.19.5/go.mod"
-"k8s.io/cli-runtime v0.19.5/go.mod"
-"k8s.io/client-go v0.17.0/go.mod"
-"k8s.io/client-go v0.18.0"
-"k8s.io/client-go v0.18.0/go.mod"
-"k8s.io/client-go v0.18.5"
-"k8s.io/client-go v0.18.5/go.mod"
-"k8s.io/client-go v0.19.5"
-"k8s.io/client-go v0.19.5/go.mod"
-"k8s.io/cloud-provider v0.19.5/go.mod"
-"k8s.io/cluster-bootstrap v0.19.5/go.mod"
-"k8s.io/code-generator v0.17.0/go.mod"
-"k8s.io/code-generator v0.18.0"
-"k8s.io/code-generator v0.18.0/go.mod"
-"k8s.io/code-generator v0.19.5/go.mod"
-"k8s.io/component-base v0.17.0/go.mod"
-"k8s.io/component-base v0.18.0/go.mod"
-"k8s.io/component-base v0.19.5/go.mod"
-"k8s.io/cri-api v0.19.5"
-"k8s.io/cri-api v0.19.5/go.mod"
-"k8s.io/csi-translation-lib v0.19.5/go.mod"
-"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-"k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a/go.mod"
-"k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod"
-"k8s.io/gengo v0.0.0-20191120174120-e74f70b9b27e/go.mod"
-"k8s.io/gengo v0.0.0-20200114144118-36b2048a9120"
-"k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod"
-"k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod"
-"k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod"
-"k8s.io/gengo v0.0.0-20201113003025-83324d819ded"
-"k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod"
-"k8s.io/heapster v1.2.0-beta.1"
-"k8s.io/heapster v1.2.0-beta.1/go.mod"
-"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-"k8s.io/klog v0.3.0"
-"k8s.io/klog v0.3.0/go.mod"
-"k8s.io/klog v1.0.0"
-"k8s.io/klog v1.0.0/go.mod"
-"k8s.io/klog/v2 v2.0.0/go.mod"
-"k8s.io/klog/v2 v2.2.0"
-"k8s.io/klog/v2 v2.2.0/go.mod"
-"k8s.io/klog/v2 v2.4.0"
-"k8s.io/klog/v2 v2.4.0/go.mod"
-"k8s.io/kube-aggregator v0.18.0/go.mod"
-"k8s.io/kube-aggregator v0.19.5/go.mod"
-"k8s.io/kube-controller-manager v0.19.5/go.mod"
-"k8s.io/kube-openapi v0.0.0-20190502190224-411b2483e503/go.mod"
-"k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod"
-"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c"
-"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod"
-"k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6"
-"k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod"
-"k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod"
-"k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd"
-"k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod"
-"k8s.io/kube-proxy v0.19.5/go.mod"
-"k8s.io/kube-scheduler v0.19.5/go.mod"
-"k8s.io/kubectl v0.19.5/go.mod"
-"k8s.io/kubelet v0.19.5/go.mod"
-"k8s.io/kubernetes v1.19.5/go.mod"
-"k8s.io/kubernetes v1.20.0"
-"k8s.io/kubernetes v1.20.0/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20201204214525-af46c47ce925"
-"k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20201204214525-af46c47ce925"
-"k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20201204214525-af46c47ce925"
-"k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20201204214525-af46c47ce925"
-"k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20201204214525-af46c47ce925"
-"k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20201204214525-af46c47ce925"
-"k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20201204214525-af46c47ce925"
-"k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20201204214525-af46c47ce925/go.mod"
-"k8s.io/legacy-cloud-providers v0.19.5/go.mod"
-"k8s.io/metrics v0.19.5/go.mod"
-"k8s.io/sample-apiserver v0.19.5/go.mod"
-"k8s.io/system-validators v1.1.2/go.mod"
-"k8s.io/system-validators v1.2.0"
-"k8s.io/system-validators v1.2.0/go.mod"
-"k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod"
-"k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod"
-"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
-"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
-"k8s.io/utils v0.0.0-20200414100711-2df71ebbae66/go.mod"
-"k8s.io/utils v0.0.0-20200729134348-d5654de09c73"
-"k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod"
-"k8s.io/utils v0.0.0-20201110183641-67b214c5f920"
-"k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod"
-"modernc.org/cc v1.0.0/go.mod"
-"modernc.org/golex v1.0.0/go.mod"
-"modernc.org/mathutil v1.0.0/go.mod"
-"modernc.org/strutil v1.0.0/go.mod"
-"modernc.org/xc v1.0.0/go.mod"
-"rsc.io/binaryregexp v0.2.0/go.mod"
-"rsc.io/pdf v0.1.1/go.mod"
-"rsc.io/quote/v3 v3.1.0/go.mod"
-"rsc.io/sampler v1.3.0/go.mod"
-"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod"
-"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15"
-"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod"
-"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod"
-"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod"
-"sigs.k8s.io/kustomize v2.0.3+incompatible"
-"sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod"
-"sigs.k8s.io/structured-merge-diff v0.0.0-20190426204423-ea680f03cc65"
-"sigs.k8s.io/structured-merge-diff v0.0.0-20190426204423-ea680f03cc65/go.mod"
-"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
-"sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod"
-"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
-"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
-"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
-"sigs.k8s.io/structured-merge-diff/v4 v4.0.1"
-"sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod"
-"sigs.k8s.io/structured-merge-diff/v4 v4.0.2"
-"sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod"
-"sigs.k8s.io/structured-merge-diff/v4 v4.0.3"
-"sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod"
-"sigs.k8s.io/yaml v1.1.0"
-"sigs.k8s.io/yaml v1.1.0/go.mod"
-"sigs.k8s.io/yaml v1.2.0"
-"sigs.k8s.io/yaml v1.2.0/go.mod"
-"vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod"
-)
-go-module_set_globals
-MY_PV=${PV}+k3s1
-SRC_URI="https://github.com/k3s-io/k3s/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}
-	https://charts.helm.sh/stable/packages/traefik-${K3S_TRAEFIK_VERSION}.tgz
-	https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz
-	amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+kubectl-symlink rootless"
-REQUIRED_USE="|| ( amd64 )"
-DEPEND="
-	net-firewall/conntrack-tools
-	rootless? ( app-emulation/slirp4netns )
-"
-RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )"
-RESTRICT+=" test"
-
-S=${WORKDIR}/${PN}-${MY_PV/+/-}
-
-k3s_unpack_filter() {
-	grep -v -F \
-		-e "traefik-${K3S_TRAEFIK_VERSION}.tgz" \
-		-e "k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz"
-}
-
-src_unpack() {
-	read -d '' A < <(printf -- '%s\n' ${A} | k3s_unpack_filter)
-	go-module_src_unpack
-	mkdir -p bin/aux build/static/charts cache || die
-	cp "${DISTDIR}/traefik-${K3S_TRAEFIK_VERSION}.tgz" build/static/charts/ || die
-	cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die
-	mv "${WORKDIR}/bin/"* "${S}/bin/" || die
-	mv "${WORKDIR}/etc" "${S}/etc" || die
-}
-
-src_prepare() {
-	local filename pattern replacement
-	default
-	# Disable download for files fetched via SRC_URI.
-	sed -e 's:^curl:#\0:' -i scripts/download || die
-	sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die
-	pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR'
-	filename=scripts/build
-	grep -qF "${pattern}" "${filename}" || \
-		die "failed to locate plugins clone command"
-	sed -e "s|${pattern}|mkdir -p \"\$WORKDIR\" \\&\\& tar -xzf cache/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz --strip-components=1 -C \"\$WORKDIR\"|" \
-		-e 's|rm -rf $TMPDIR||' \
-		-i "${filename}" || die
-	sed -e 's:/usr/local/bin:/usr/bin:g' -i k3s.service || die
-	sed -e 's|mod=vendor|mod=readonly|g' -i vendor/github.com/opencontainers/runc/Makefile || die
-}
-
-src_compile() {
-	mkdir -p build/data || die
-	./scripts/download || die
-	./scripts/build || die
-	./scripts/package-cli || die
-}
-
-src_install() {
-	dobin "dist/artifacts/${PN}"
-	use kubectl-symlink && dosym k3s /usr/bin/kubectl
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	dodoc README.md
-}
diff --git a/sys-cluster/k3s/k3s-1.21.0.ebuild b/sys-cluster/k3s/k3s-1.21.0.ebuild
deleted file mode 100644
index c0155abd8c93..000000000000
--- a/sys-cluster/k3s/k3s-1.21.0.ebuild
+++ /dev/null
@@ -1,2037 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module linux-info systemd
-
-DESCRIPTION="Lightweight Kubernetes"
-HOMEPAGE="https://k3s.io"
-K3S_ROOT_VERSION=0.8.1
-K3S_TRAEFIK_VERSION=9.18.2
-K3S_CNIPLUGINS_VERSION=0.8.6
-CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN"
-
-EGO_SUM=(
-"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898"
-"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
-"bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690"
-"bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod"
-"cloud.google.com/go v0.26.0/go.mod"
-"cloud.google.com/go v0.34.0/go.mod"
-"cloud.google.com/go v0.38.0/go.mod"
-"cloud.google.com/go v0.44.1/go.mod"
-"cloud.google.com/go v0.44.2/go.mod"
-"cloud.google.com/go v0.45.1/go.mod"
-"cloud.google.com/go v0.46.3/go.mod"
-"cloud.google.com/go v0.50.0/go.mod"
-"cloud.google.com/go v0.51.0/go.mod"
-"cloud.google.com/go v0.52.0/go.mod"
-"cloud.google.com/go v0.53.0/go.mod"
-"cloud.google.com/go v0.54.0"
-"cloud.google.com/go v0.54.0/go.mod"
-"cloud.google.com/go/bigquery v1.0.1/go.mod"
-"cloud.google.com/go/bigquery v1.3.0/go.mod"
-"cloud.google.com/go/bigquery v1.4.0/go.mod"
-"cloud.google.com/go/datastore v1.0.0/go.mod"
-"cloud.google.com/go/datastore v1.1.0/go.mod"
-"cloud.google.com/go/firestore v1.1.0/go.mod"
-"cloud.google.com/go/pubsub v1.0.1/go.mod"
-"cloud.google.com/go/pubsub v1.1.0/go.mod"
-"cloud.google.com/go/pubsub v1.2.0/go.mod"
-"cloud.google.com/go/storage v1.0.0/go.mod"
-"cloud.google.com/go/storage v1.5.0/go.mod"
-"cloud.google.com/go/storage v1.6.0/go.mod"
-"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
-"dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod"
-"github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod"
-"github.com/Azure/azure-sdk-for-go v43.0.0+incompatible"
-"github.com/Azure/azure-sdk-for-go v43.0.0+incompatible/go.mod"
-"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
-"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
-"github.com/Azure/go-autorest v10.8.1+incompatible/go.mod"
-"github.com/Azure/go-autorest v14.2.0+incompatible"
-"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
-"github.com/Azure/go-autorest/autorest v0.11.12"
-"github.com/Azure/go-autorest/autorest v0.11.12/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-"github.com/Azure/go-autorest/autorest v0.9.6/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
-"github.com/Azure/go-autorest/autorest/adal v0.9.5"
-"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/date v0.3.0"
-"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
-"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
-"github.com/Azure/go-autorest/autorest/to v0.2.0"
-"github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod"
-"github.com/Azure/go-autorest/autorest/validation v0.1.0"
-"github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod"
-"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-"github.com/Azure/go-autorest/logger v0.2.0"
-"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
-"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-"github.com/Azure/go-autorest/tracing v0.6.0"
-"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
-"github.com/BurntSushi/toml v0.3.1"
-"github.com/BurntSushi/toml v0.3.1/go.mod"
-"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-"github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317"
-"github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317/go.mod"
-"github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab"
-"github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod"
-"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd"
-"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod"
-"github.com/Microsoft/go-winio v0.4.11"
-"github.com/Microsoft/go-winio v0.4.11/go.mod"
-"github.com/Microsoft/go-winio v0.4.14/go.mod"
-"github.com/Microsoft/go-winio v0.4.15"
-"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5"
-"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
-"github.com/Microsoft/go-winio v0.4.15/go.mod"
-"github.com/Microsoft/hcsshim v0.8.10-0.20200715222032-5eafd1556990"
-"github.com/Microsoft/hcsshim v0.8.10-0.20200715222032-5eafd1556990/go.mod"
-"github.com/Microsoft/hcsshim v0.8.6"
-"github.com/Microsoft/hcsshim v0.8.6/go.mod"
-"github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod"
-"github.com/Microsoft/hcsshim v0.8.7/go.mod"
-"github.com/Microsoft/hcsshim v0.8.9"
-"github.com/Microsoft/hcsshim v0.8.9/go.mod"
-"github.com/Microsoft/hcsshim/test v0.0.0-20200803203718-d80bc7196cb0"
-"github.com/Microsoft/hcsshim/test v0.0.0-20200803203718-d80bc7196cb0/go.mod"
-"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-"github.com/NYTimes/gziphandler v1.1.1"
-"github.com/NYTimes/gziphandler v1.1.1/go.mod"
-"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-"github.com/PuerkitoBio/purell v1.1.0/go.mod"
-"github.com/PuerkitoBio/purell v1.1.1"
-"github.com/PuerkitoBio/purell v1.1.1/go.mod"
-"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
-"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
-"github.com/Rican7/retry v0.1.0"
-"github.com/Rican7/retry v0.1.0/go.mod"
-"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod"
-"github.com/agnivade/levenshtein v1.0.1/go.mod"
-"github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod"
-"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-"github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae"
-"github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod"
-"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
-"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
-"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
-"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a"
-"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
-"github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7"
-"github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod"
-"github.com/aws/aws-sdk-go v1.12.54/go.mod"
-"github.com/aws/aws-sdk-go v1.15.11/go.mod"
-"github.com/aws/aws-sdk-go v1.28.2/go.mod"
-"github.com/aws/aws-sdk-go v1.35.24"
-"github.com/aws/aws-sdk-go v1.35.24/go.mod"
-"github.com/aws/aws-sdk-go v1.6.10/go.mod"
-"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
-"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-"github.com/beorn7/perks v1.0.0"
-"github.com/beorn7/perks v1.0.0/go.mod"
-"github.com/beorn7/perks v1.0.1"
-"github.com/beorn7/perks v1.0.1/go.mod"
-"github.com/bgentry/speakeasy v0.1.0"
-"github.com/bgentry/speakeasy v0.1.0/go.mod"
-"github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod"
-"github.com/bitly/go-simplejson v0.5.0/go.mod"
-"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
-"github.com/blang/semver v3.1.0+incompatible/go.mod"
-"github.com/blang/semver v3.5.0+incompatible/go.mod"
-"github.com/blang/semver v3.5.1+incompatible"
-"github.com/blang/semver v3.5.1+incompatible/go.mod"
-"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
-"github.com/boltdb/bolt v1.3.1"
-"github.com/boltdb/bolt v1.3.1/go.mod"
-"github.com/bronze1man/goStrongswanVici v0.0.0-20171013065002-4d72634a2f11/go.mod"
-"github.com/bronze1man/goStrongswanVici v0.0.0-20190828090544-27d02f80ba40"
-"github.com/bronze1man/goStrongswanVici v0.0.0-20190828090544-27d02f80ba40/go.mod"
-"github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod"
-"github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44"
-"github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod"
-"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod"
-"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod"
-"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod"
-"github.com/caddyserver/caddy v1.0.3"
-"github.com/caddyserver/caddy v1.0.3/go.mod"
-"github.com/canonical/go-dqlite v1.5.1"
-"github.com/canonical/go-dqlite v1.5.1/go.mod"
-"github.com/cenkalti/backoff v2.1.1+incompatible/go.mod"
-"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-"github.com/cespare/xxhash v1.1.0"
-"github.com/cespare/xxhash v1.1.0/go.mod"
-"github.com/cespare/xxhash/v2 v2.1.1"
-"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5"
-"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod"
-"github.com/checkpoint-restore/go-criu/v4 v4.0.2/go.mod"
-"github.com/checkpoint-restore/go-criu/v4 v4.1.0"
-"github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod"
-"github.com/checkpoint-restore/go-criu/v5 v5.0.0"
-"github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod"
-"github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod"
-"github.com/cheggaaa/pb v1.0.29/go.mod"
-"github.com/chzyer/logex v1.1.10/go.mod"
-"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-"github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod"
-"github.com/cilium/ebpf v0.0.0-20200507155900-a9f01edf17e3/go.mod"
-"github.com/cilium/ebpf v0.0.0-20200601085316-9f1617e5c574/go.mod"
-"github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775"
-"github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod"
-"github.com/cilium/ebpf v0.2.0"
-"github.com/cilium/ebpf v0.2.0/go.mod"
-"github.com/cilium/ebpf v0.5.0"
-"github.com/cilium/ebpf v0.5.0/go.mod"
-"github.com/client9/misspell v0.3.4/go.mod"
-"github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313"
-"github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod"
-"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
-"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
-"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
-"github.com/codegangsta/negroni v1.0.0/go.mod"
-"github.com/container-storage-interface/spec v1.2.0/go.mod"
-"github.com/container-storage-interface/spec v1.3.0"
-"github.com/container-storage-interface/spec v1.3.0/go.mod"
-"github.com/containerd/aufs v0.0.0-20191030083217-371312c1e31c"
-"github.com/containerd/aufs v0.0.0-20191030083217-371312c1e31c/go.mod"
-"github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e"
-"github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod"
-"github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod"
-"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
-"github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59"
-"github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod"
-"github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340"
-"github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod"
-"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
-"github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod"
-"github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod"
-"github.com/containerd/console v1.0.0"
-"github.com/containerd/console v1.0.0/go.mod"
-"github.com/containerd/console v1.0.1"
-"github.com/containerd/console v1.0.1/go.mod"
-"github.com/containerd/console v1.0.2"
-"github.com/containerd/console v1.0.2/go.mod"
-"github.com/containerd/containerd v1.2.10/go.mod"
-"github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
-"github.com/containerd/containerd v1.3.0/go.mod"
-"github.com/containerd/containerd v1.3.2/go.mod"
-"github.com/containerd/containerd v1.3.3/go.mod"
-"github.com/containerd/containerd v1.4.4"
-"github.com/containerd/containerd v1.4.4/go.mod"
-"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
-"github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod"
-"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
-"github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b"
-"github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod"
-"github.com/containerd/fuse-overlayfs-snapshotter v1.0.2"
-"github.com/containerd/fuse-overlayfs-snapshotter v1.0.2/go.mod"
-"github.com/containerd/go-cni v1.0.1"
-"github.com/containerd/go-cni v1.0.1/go.mod"
-"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
-"github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod"
-"github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328"
-"github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod"
-"github.com/containerd/imgcrypt v1.0.1"
-"github.com/containerd/imgcrypt v1.0.1/go.mod"
-"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
-"github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod"
-"github.com/containerd/ttrpc v1.0.0/go.mod"
-"github.com/containerd/ttrpc v1.0.1"
-"github.com/containerd/ttrpc v1.0.1/go.mod"
-"github.com/containerd/ttrpc v1.0.2"
-"github.com/containerd/ttrpc v1.0.2/go.mod"
-"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
-"github.com/containerd/typeurl v1.0.0/go.mod"
-"github.com/containerd/typeurl v1.0.1"
-"github.com/containerd/typeurl v1.0.1/go.mod"
-"github.com/containerd/zfs v0.0.0-20191030014035-9abf673ca6ff"
-"github.com/containerd/zfs v0.0.0-20191030014035-9abf673ca6ff/go.mod"
-"github.com/containernetworking/cni v0.7.1"
-"github.com/containernetworking/cni v0.7.1/go.mod"
-"github.com/containernetworking/cni v0.8.0"
-"github.com/containernetworking/cni v0.8.0/go.mod"
-"github.com/containernetworking/plugins v0.8.6"
-"github.com/containernetworking/plugins v0.8.6/go.mod"
-"github.com/containers/ocicrypt v1.0.1"
-"github.com/containers/ocicrypt v1.0.1/go.mod"
-"github.com/coredns/corefile-migration v1.0.10/go.mod"
-"github.com/coredns/corefile-migration v1.0.11"
-"github.com/coredns/corefile-migration v1.0.11/go.mod"
-"github.com/coreos/bbolt v1.3.2/go.mod"
-"github.com/coreos/etcd v3.1.11+incompatible/go.mod"
-"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
-"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
-"github.com/coreos/go-iptables v0.4.5"
-"github.com/coreos/go-iptables v0.4.5/go.mod"
-"github.com/coreos/go-oidc v2.1.0+incompatible"
-"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
-"github.com/coreos/go-semver v0.2.0"
-"github.com/coreos/go-semver v0.2.0/go.mod"
-"github.com/coreos/go-semver v0.3.0"
-"github.com/coreos/go-semver v0.3.0/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7"
-"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
-"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
-"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
-"github.com/coreos/go-systemd/v22 v22.1.0"
-"github.com/coreos/go-systemd/v22 v22.1.0/go.mod"
-"github.com/coreos/go-systemd/v22 v22.3.1"
-"github.com/coreos/go-systemd/v22 v22.3.1/go.mod"
-"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf"
-"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
-"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea"
-"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
-"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
-"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-"github.com/cpuguy83/go-md2man v1.0.10"
-"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
-"github.com/cpuguy83/go-md2man/v2 v2.0.0"
-"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/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-"github.com/creack/pty v1.1.11"
-"github.com/creack/pty v1.1.11/go.mod"
-"github.com/creack/pty v1.1.7"
-"github.com/creack/pty v1.1.7/go.mod"
-"github.com/creack/pty v1.1.9/go.mod"
-"github.com/cyphar/filepath-securejoin v0.2.2"
-"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
-"github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c"
-"github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod"
-"github.com/d2g/dhcp4client v1.0.0"
-"github.com/d2g/dhcp4client v1.0.0/go.mod"
-"github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5"
-"github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod"
-"github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4"
-"github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod"
-"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
-"github.com/davecgh/go-spew v1.1.0"
-"github.com/davecgh/go-spew v1.1.0/go.mod"
-"github.com/davecgh/go-spew v1.1.1"
-"github.com/davecgh/go-spew v1.1.1/go.mod"
-"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd"
-"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod"
-"github.com/denverdino/aliyungo v0.0.0-20170629053852-f6cab0c35083/go.mod"
-"github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod"
-"github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
-"github.com/dnaeon/go-vcr v1.0.1"
-"github.com/dnaeon/go-vcr v1.0.1/go.mod"
-"github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod"
-"github.com/docker/distribution v2.7.1+incompatible"
-"github.com/docker/distribution v2.7.1+incompatible/go.mod"
-"github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod"
-"github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod"
-"github.com/docker/docker v1.13.1"
-"github.com/docker/docker v1.13.1/go.mod"
-"github.com/docker/docker v1.4.2-0.20200309214505-aa6a9891b09c/go.mod"
-"github.com/docker/docker v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible"
-"github.com/docker/docker v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible/go.mod"
-"github.com/docker/docker v20.10.2+incompatible"
-"github.com/docker/docker v20.10.2+incompatible/go.mod"
-"github.com/docker/docker v20.10.5+incompatible"
-"github.com/docker/docker v20.10.5+incompatible/go.mod"
-"github.com/docker/go-connections v0.4.0"
-"github.com/docker/go-connections v0.4.0/go.mod"
-"github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod"
-"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c"
-"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod"
-"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod"
-"github.com/docker/go-metrics v0.0.1"
-"github.com/docker/go-metrics v0.0.1/go.mod"
-"github.com/docker/go-units v0.3.3/go.mod"
-"github.com/docker/go-units v0.4.0"
-"github.com/docker/go-units v0.4.0/go.mod"
-"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod"
-"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
-"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
-"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4"
-"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
-"github.com/dustin/go-humanize v1.0.0"
-"github.com/dustin/go-humanize v1.0.0/go.mod"
-"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
-"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
-"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
-"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-"github.com/emicklei/go-restful v2.9.5+incompatible"
-"github.com/emicklei/go-restful v2.9.5+incompatible/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-"github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod"
-"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-"github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83"
-"github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83/go.mod"
-"github.com/euank/go-kmsg-parser v2.0.0+incompatible"
-"github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod"
-"github.com/evanphx/json-patch v4.2.0+incompatible"
-"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-"github.com/evanphx/json-patch v4.5.0+incompatible"
-"github.com/evanphx/json-patch v4.5.0+incompatible/go.mod"
-"github.com/evanphx/json-patch v4.9.0+incompatible"
-"github.com/evanphx/json-patch v4.9.0+incompatible/go.mod"
-"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d"
-"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod"
-"github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod"
-"github.com/fatih/camelcase v1.0.0"
-"github.com/fatih/camelcase v1.0.0/go.mod"
-"github.com/fatih/color v1.7.0"
-"github.com/fatih/color v1.7.0/go.mod"
-"github.com/fatih/color v1.9.0/go.mod"
-"github.com/flannel-io/flannel v0.13.1-rc2.0.20210324170423-273b36ca57dc"
-"github.com/flannel-io/flannel v0.13.1-rc2.0.20210324170423-273b36ca57dc/go.mod"
-"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
-"github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod"
-"github.com/form3tech-oss/jwt-go v3.2.2+incompatible"
-"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
-"github.com/frankban/quicktest v1.11.3"
-"github.com/frankban/quicktest v1.11.3/go.mod"
-"github.com/fsnotify/fsnotify v1.4.7"
-"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-"github.com/fsnotify/fsnotify v1.4.9"
-"github.com/fsnotify/fsnotify v1.4.9/go.mod"
-"github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa"
-"github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod"
-"github.com/fvbommel/sortorder v1.0.1"
-"github.com/fvbommel/sortorder v1.0.1/go.mod"
-"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod"
-"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-"github.com/ghodss/yaml v1.0.0"
-"github.com/ghodss/yaml v1.0.0/go.mod"
-"github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod"
-"github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod"
-"github.com/go-acme/lego v2.5.0+incompatible/go.mod"
-"github.com/go-bindata/go-bindata v3.1.1+incompatible"
-"github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod"
-"github.com/go-bindata/go-bindata v3.1.2+incompatible"
-"github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod"
-"github.com/go-errors/errors v1.0.1"
-"github.com/go-errors/errors v1.0.1/go.mod"
-"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
-"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
-"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
-"github.com/go-ini/ini v1.25.4/go.mod"
-"github.com/go-ini/ini v1.28.1/go.mod"
-"github.com/go-ini/ini v1.9.0/go.mod"
-"github.com/go-kit/kit v0.8.0/go.mod"
-"github.com/go-kit/kit v0.9.0/go.mod"
-"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-"github.com/go-logr/logr v0.1.0/go.mod"
-"github.com/go-logr/logr v0.2.0"
-"github.com/go-logr/logr v0.2.0/go.mod"
-"github.com/go-logr/logr v0.4.0"
-"github.com/go-logr/logr v0.4.0/go.mod"
-"github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod"
-"github.com/go-openapi/analysis v0.17.0/go.mod"
-"github.com/go-openapi/analysis v0.18.0/go.mod"
-"github.com/go-openapi/analysis v0.19.2/go.mod"
-"github.com/go-openapi/analysis v0.19.5/go.mod"
-"github.com/go-openapi/errors v0.17.0/go.mod"
-"github.com/go-openapi/errors v0.18.0/go.mod"
-"github.com/go-openapi/errors v0.19.2/go.mod"
-"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-"github.com/go-openapi/jsonpointer v0.17.0/go.mod"
-"github.com/go-openapi/jsonpointer v0.18.0/go.mod"
-"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
-"github.com/go-openapi/jsonpointer v0.19.3"
-"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
-"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-"github.com/go-openapi/jsonreference v0.17.0/go.mod"
-"github.com/go-openapi/jsonreference v0.18.0/go.mod"
-"github.com/go-openapi/jsonreference v0.19.2/go.mod"
-"github.com/go-openapi/jsonreference v0.19.3"
-"github.com/go-openapi/jsonreference v0.19.3/go.mod"
-"github.com/go-openapi/loads v0.17.0/go.mod"
-"github.com/go-openapi/loads v0.18.0/go.mod"
-"github.com/go-openapi/loads v0.19.0/go.mod"
-"github.com/go-openapi/loads v0.19.2/go.mod"
-"github.com/go-openapi/loads v0.19.4/go.mod"
-"github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod"
-"github.com/go-openapi/runtime v0.19.0/go.mod"
-"github.com/go-openapi/runtime v0.19.4/go.mod"
-"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-"github.com/go-openapi/spec v0.17.0/go.mod"
-"github.com/go-openapi/spec v0.18.0/go.mod"
-"github.com/go-openapi/spec v0.19.2/go.mod"
-"github.com/go-openapi/spec v0.19.3/go.mod"
-"github.com/go-openapi/spec v0.19.5"
-"github.com/go-openapi/spec v0.19.5/go.mod"
-"github.com/go-openapi/strfmt v0.17.0/go.mod"
-"github.com/go-openapi/strfmt v0.18.0/go.mod"
-"github.com/go-openapi/strfmt v0.19.0/go.mod"
-"github.com/go-openapi/strfmt v0.19.3/go.mod"
-"github.com/go-openapi/strfmt v0.19.5/go.mod"
-"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-"github.com/go-openapi/swag v0.17.0/go.mod"
-"github.com/go-openapi/swag v0.18.0/go.mod"
-"github.com/go-openapi/swag v0.19.2/go.mod"
-"github.com/go-openapi/swag v0.19.5"
-"github.com/go-openapi/swag v0.19.5/go.mod"
-"github.com/go-openapi/validate v0.18.0/go.mod"
-"github.com/go-openapi/validate v0.19.2/go.mod"
-"github.com/go-openapi/validate v0.19.5/go.mod"
-"github.com/go-openapi/validate v0.19.8/go.mod"
-"github.com/go-ozzo/ozzo-validation v3.5.0+incompatible"
-"github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod"
-"github.com/go-sql-driver/mysql v1.4.1"
-"github.com/go-sql-driver/mysql v1.4.1/go.mod"
-"github.com/go-stack/stack v1.8.0/go.mod"
-"github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0"
-"github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod"
-"github.com/gobuffalo/here v0.6.0/go.mod"
-"github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod"
-"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c"
-"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod"
-"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e"
-"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
-"github.com/godbus/dbus/v5 v5.0.3"
-"github.com/godbus/dbus/v5 v5.0.3/go.mod"
-"github.com/godbus/dbus/v5 v5.0.4"
-"github.com/godbus/dbus/v5 v5.0.4/go.mod"
-"github.com/gofrs/flock v0.8.0"
-"github.com/gofrs/flock v0.8.0/go.mod"
-"github.com/gogo/googleapis v1.2.0/go.mod"
-"github.com/gogo/googleapis v1.3.2"
-"github.com/gogo/googleapis v1.3.2/go.mod"
-"github.com/gogo/protobuf v1.1.1"
-"github.com/gogo/protobuf v1.1.1/go.mod"
-"github.com/gogo/protobuf v1.2.1"
-"github.com/gogo/protobuf v1.2.1/go.mod"
-"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
-"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
-"github.com/gogo/protobuf v1.3.1"
-"github.com/gogo/protobuf v1.3.1/go.mod"
-"github.com/gogo/protobuf v1.3.2"
-"github.com/gogo/protobuf v1.3.2/go.mod"
-"github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903"
-"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
-"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6"
-"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
-"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
-"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
-"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
-"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
-"github.com/golang/mock v1.1.1/go.mod"
-"github.com/golang/mock v1.2.0/go.mod"
-"github.com/golang/mock v1.3.1/go.mod"
-"github.com/golang/mock v1.4.0/go.mod"
-"github.com/golang/mock v1.4.1/go.mod"
-"github.com/golang/mock v1.4.4"
-"github.com/golang/mock v1.4.4/go.mod"
-"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-"github.com/golang/protobuf v1.2.0"
-"github.com/golang/protobuf v1.2.0/go.mod"
-"github.com/golang/protobuf v1.3.1"
-"github.com/golang/protobuf v1.3.1/go.mod"
-"github.com/golang/protobuf v1.3.2"
-"github.com/golang/protobuf v1.3.2/go.mod"
-"github.com/golang/protobuf v1.3.3/go.mod"
-"github.com/golang/protobuf v1.3.4/go.mod"
-"github.com/golang/protobuf v1.3.5"
-"github.com/golang/protobuf v1.3.5/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-"github.com/golang/protobuf v1.4.0/go.mod"
-"github.com/golang/protobuf v1.4.1/go.mod"
-"github.com/golang/protobuf v1.4.2/go.mod"
-"github.com/golang/protobuf v1.4.3"
-"github.com/golang/protobuf v1.4.3/go.mod"
-"github.com/golang/protobuf v1.5.0/go.mod"
-"github.com/golang/protobuf v1.5.2"
-"github.com/golang/protobuf v1.5.2/go.mod"
-"github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod"
-"github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod"
-"github.com/golangplus/fmt v1.0.0/go.mod"
-"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e"
-"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod"
-"github.com/golangplus/testing v1.0.0"
-"github.com/golangplus/testing v1.0.0/go.mod"
-"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-"github.com/google/btree v1.0.0"
-"github.com/google/btree v1.0.0/go.mod"
-"github.com/google/cadvisor v0.37.2/go.mod"
-"github.com/google/cadvisor v0.39.0"
-"github.com/google/cadvisor v0.39.0/go.mod"
-"github.com/google/go-cmp v0.2.0/go.mod"
-"github.com/google/go-cmp v0.3.0"
-"github.com/google/go-cmp v0.3.0/go.mod"
-"github.com/google/go-cmp v0.3.1"
-"github.com/google/go-cmp v0.3.1/go.mod"
-"github.com/google/go-cmp v0.4.0"
-"github.com/google/go-cmp v0.4.0/go.mod"
-"github.com/google/go-cmp v0.5.0/go.mod"
-"github.com/google/go-cmp v0.5.2"
-"github.com/google/go-cmp v0.5.2/go.mod"
-"github.com/google/go-cmp v0.5.4"
-"github.com/google/go-cmp v0.5.4/go.mod"
-"github.com/google/go-cmp v0.5.5"
-"github.com/google/go-cmp v0.5.5/go.mod"
-"github.com/google/go-containerregistry v0.0.0-20190617215043-876b8855d23c/go.mod"
-"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
-"github.com/google/gofuzz v1.0.0"
-"github.com/google/gofuzz v1.0.0/go.mod"
-"github.com/google/gofuzz v1.1.0"
-"github.com/google/gofuzz v1.1.0/go.mod"
-"github.com/google/martian v2.1.0+incompatible/go.mod"
-"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
-"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
-"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
-"github.com/google/renameio v0.1.0/go.mod"
-"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
-"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
-"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
-"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
-"github.com/google/uuid v1.0.0"
-"github.com/google/uuid v1.0.0/go.mod"
-"github.com/google/uuid v1.1.1"
-"github.com/google/uuid v1.1.1/go.mod"
-"github.com/google/uuid v1.1.2"
-"github.com/google/uuid v1.1.2/go.mod"
-"github.com/google/uuid v1.2.0"
-"github.com/google/uuid v1.2.0/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-"github.com/googleapis/gax-go/v2 v2.0.5"
-"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-"github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod"
-"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-"github.com/googleapis/gnostic v0.1.0/go.mod"
-"github.com/googleapis/gnostic v0.2.0/go.mod"
-"github.com/googleapis/gnostic v0.3.1"
-"github.com/googleapis/gnostic v0.3.1/go.mod"
-"github.com/googleapis/gnostic v0.4.1"
-"github.com/googleapis/gnostic v0.4.1/go.mod"
-"github.com/gophercloud/gophercloud v0.1.0"
-"github.com/gophercloud/gophercloud v0.1.0/go.mod"
-"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-"github.com/gorilla/context v1.1.1/go.mod"
-"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod"
-"github.com/gorilla/mux v1.7.2/go.mod"
-"github.com/gorilla/mux v1.7.3/go.mod"
-"github.com/gorilla/mux v1.8.0"
-"github.com/gorilla/mux v1.8.0/go.mod"
-"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c"
-"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
-"github.com/gorilla/websocket v1.4.0"
-"github.com/gorilla/websocket v1.4.0/go.mod"
-"github.com/gorilla/websocket v1.4.2"
-"github.com/gorilla/websocket v1.4.2/go.mod"
-"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
-"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
-"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
-"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
-"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.5"
-"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
-"github.com/hashicorp/consul/api v1.1.0/go.mod"
-"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
-"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
-"github.com/hashicorp/errwrap v1.0.0"
-"github.com/hashicorp/errwrap v1.0.0/go.mod"
-"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
-"github.com/hashicorp/go-multierror v1.0.0"
-"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
-"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-"github.com/hashicorp/go.net v0.0.1/go.mod"
-"github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod"
-"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-"github.com/hashicorp/golang-lru v0.5.1"
-"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-"github.com/hashicorp/golang-lru v0.5.3"
-"github.com/hashicorp/golang-lru v0.5.3/go.mod"
-"github.com/hashicorp/hcl v1.0.0"
-"github.com/hashicorp/hcl v1.0.0/go.mod"
-"github.com/hashicorp/logutils v1.0.0/go.mod"
-"github.com/hashicorp/mdns v1.0.0/go.mod"
-"github.com/hashicorp/memberlist v0.1.3/go.mod"
-"github.com/hashicorp/serf v0.8.2/go.mod"
-"github.com/heketi/heketi v10.2.0+incompatible"
-"github.com/heketi/heketi v10.2.0+incompatible/go.mod"
-"github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible/go.mod"
-"github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6"
-"github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod"
-"github.com/hpcloud/tail v1.0.0"
-"github.com/hpcloud/tail v1.0.0/go.mod"
-"github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod"
-"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
-"github.com/imdario/mergo v0.3.5"
-"github.com/imdario/mergo v0.3.5/go.mod"
-"github.com/imdario/mergo v0.3.7/go.mod"
-"github.com/imdario/mergo v0.3.8"
-"github.com/imdario/mergo v0.3.8/go.mod"
-"github.com/inconshreveable/mousetrap v1.0.0"
-"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-"github.com/insomniacslk/dhcp v0.0.0-20210120172423-cc9239ac6294/go.mod"
-"github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5"
-"github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5/go.mod"
-"github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56"
-"github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod"
-"github.com/jamescun/tuntap v0.0.0-20190712092105-cb1fb277045c/go.mod"
-"github.com/jetstack/cert-manager v0.7.2/go.mod"
-"github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod"
-"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
-"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod"
-"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-"github.com/jmespath/go-jmespath v0.4.0"
-"github.com/jmespath/go-jmespath v0.4.0/go.mod"
-"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
-"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
-"github.com/joho/godotenv v0.0.0-20161216230537-726cc8b906e3/go.mod"
-"github.com/jonboulle/clockwork v0.1.0"
-"github.com/jonboulle/clockwork v0.1.0/go.mod"
-"github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod"
-"github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod"
-"github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod"
-"github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod"
-"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-"github.com/json-iterator/go v1.1.10"
-"github.com/json-iterator/go v1.1.10/go.mod"
-"github.com/json-iterator/go v1.1.6"
-"github.com/json-iterator/go v1.1.6/go.mod"
-"github.com/json-iterator/go v1.1.7"
-"github.com/json-iterator/go v1.1.7/go.mod"
-"github.com/json-iterator/go v1.1.8"
-"github.com/json-iterator/go v1.1.8/go.mod"
-"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
-"github.com/jtolds/gls v4.20.0+incompatible"
-"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-"github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod"
-"github.com/k3s-io/containerd v1.4.4-k3s1"
-"github.com/k3s-io/containerd v1.4.4-k3s1/go.mod"
-"github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1"
-"github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1/go.mod"
-"github.com/k3s-io/cri v1.4.0-k3s.5"
-"github.com/k3s-io/cri v1.4.0-k3s.5/go.mod"
-"github.com/k3s-io/cri-tools v1.21.0-k3s1"
-"github.com/k3s-io/cri-tools v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea"
-"github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea/go.mod"
-"github.com/k3s-io/helm-controller v0.8.3"
-"github.com/k3s-io/helm-controller v0.8.3/go.mod"
-"github.com/k3s-io/kine v0.6.0"
-"github.com/k3s-io/kine v0.6.0/go.mod"
-"github.com/k3s-io/kubernetes v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.0-k3s1"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.21.0-k3s1/go.mod"
-"github.com/k3s-io/protobuf v1.4.3-k3s1"
-"github.com/k3s-io/protobuf v1.4.3-k3s1/go.mod"
-"github.com/karrick/godirwalk v1.16.1"
-"github.com/karrick/godirwalk v1.16.1/go.mod"
-"github.com/karrick/godirwalk v1.7.5/go.mod"
-"github.com/kisielk/errcheck v1.1.0/go.mod"
-"github.com/kisielk/errcheck v1.2.0/go.mod"
-"github.com/kisielk/errcheck v1.5.0/go.mod"
-"github.com/kisielk/gotool v1.0.0/go.mod"
-"github.com/klauspost/compress v1.11.7"
-"github.com/klauspost/compress v1.11.7/go.mod"
-"github.com/klauspost/cpuid v1.2.0/go.mod"
-"github.com/klauspost/cpuid v1.2.3/go.mod"
-"github.com/klauspost/cpuid v1.3.1"
-"github.com/klauspost/cpuid v1.3.1/go.mod"
-"github.com/knative/build v0.6.0/go.mod"
-"github.com/knative/pkg v0.0.0-20190514205332-5e4512dcb2ca/go.mod"
-"github.com/knative/serving v0.6.1/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.3"
-"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
-"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-"github.com/kr/pretty v0.1.0"
-"github.com/kr/pretty v0.1.0/go.mod"
-"github.com/kr/pretty v0.2.0"
-"github.com/kr/pretty v0.2.0/go.mod"
-"github.com/kr/pretty v0.2.1"
-"github.com/kr/pretty v0.2.1/go.mod"
-"github.com/kr/pty v1.1.1/go.mod"
-"github.com/kr/pty v1.1.5/go.mod"
-"github.com/kr/text v0.1.0"
-"github.com/kr/text v0.1.0/go.mod"
-"github.com/kr/text v0.2.0"
-"github.com/kr/text v0.2.0/go.mod"
-"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
-"github.com/lib/pq v1.8.0"
-"github.com/lib/pq v1.8.0/go.mod"
-"github.com/libopenstorage/openstorage v1.0.0"
-"github.com/libopenstorage/openstorage v1.0.0/go.mod"
-"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de"
-"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod"
-"github.com/lithammer/dedent v1.1.0"
-"github.com/lithammer/dedent v1.1.0/go.mod"
-"github.com/lpabon/godbc v0.1.1"
-"github.com/lpabon/godbc v0.1.1/go.mod"
-"github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod"
-"github.com/lucas-clemente/quic-clients v0.1.0/go.mod"
-"github.com/lucas-clemente/quic-go v0.10.2/go.mod"
-"github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod"
-"github.com/magiconair/properties v1.8.0/go.mod"
-"github.com/magiconair/properties v1.8.1"
-"github.com/magiconair/properties v1.8.1/go.mod"
-"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
-"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
-"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
-"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
-"github.com/mailru/easyjson v0.7.0"
-"github.com/mailru/easyjson v0.7.0/go.mod"
-"github.com/markbates/pkger v0.17.1/go.mod"
-"github.com/marstr/guid v1.1.0/go.mod"
-"github.com/marten-seemann/qtls v0.2.3/go.mod"
-"github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a/go.mod"
-"github.com/mattn/go-colorable v0.0.9"
-"github.com/mattn/go-colorable v0.0.9/go.mod"
-"github.com/mattn/go-colorable v0.1.4/go.mod"
-"github.com/mattn/go-isatty v0.0.11/go.mod"
-"github.com/mattn/go-isatty v0.0.3/go.mod"
-"github.com/mattn/go-isatty v0.0.4"
-"github.com/mattn/go-isatty v0.0.4/go.mod"
-"github.com/mattn/go-isatty v0.0.8/go.mod"
-"github.com/mattn/go-runewidth v0.0.2"
-"github.com/mattn/go-runewidth v0.0.2/go.mod"
-"github.com/mattn/go-runewidth v0.0.4/go.mod"
-"github.com/mattn/go-runewidth v0.0.7/go.mod"
-"github.com/mattn/go-shellwords v1.0.3"
-"github.com/mattn/go-shellwords v1.0.3/go.mod"
-"github.com/mattn/go-sqlite3 v1.14.4"
-"github.com/mattn/go-sqlite3 v1.14.4/go.mod"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
-"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
-"github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod"
-"github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod"
-"github.com/mdlayher/netlink v1.0.0/go.mod"
-"github.com/mdlayher/netlink v1.1.0/go.mod"
-"github.com/mdlayher/netlink v1.1.1/go.mod"
-"github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod"
-"github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod"
-"github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod"
-"github.com/miekg/dns v1.0.14/go.mod"
-"github.com/miekg/dns v1.1.3/go.mod"
-"github.com/miekg/dns v1.1.35"
-"github.com/miekg/dns v1.1.35/go.mod"
-"github.com/miekg/dns v1.1.4/go.mod"
-"github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989"
-"github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989/go.mod"
-"github.com/minio/md5-simd v1.1.0"
-"github.com/minio/md5-simd v1.1.0/go.mod"
-"github.com/minio/minio-go/v7 v7.0.7"
-"github.com/minio/minio-go/v7 v7.0.7/go.mod"
-"github.com/minio/sha256-simd v0.1.1"
-"github.com/minio/sha256-simd v0.1.1/go.mod"
-"github.com/minio/sio v0.2.1/go.mod"
-"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible"
-"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod"
-"github.com/mitchellh/cli v1.0.0/go.mod"
-"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-"github.com/mitchellh/go-homedir v1.1.0"
-"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-"github.com/mitchellh/go-wordwrap v1.0.0"
-"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-"github.com/mitchellh/gox v0.4.0/go.mod"
-"github.com/mitchellh/iochan v1.0.0/go.mod"
-"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-"github.com/mitchellh/mapstructure v1.1.2"
-"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod"
-"github.com/moby/ipvs v1.0.1"
-"github.com/moby/ipvs v1.0.1/go.mod"
-"github.com/moby/spdystream v0.2.0"
-"github.com/moby/spdystream v0.2.0/go.mod"
-"github.com/moby/sys/mountinfo v0.1.3/go.mod"
-"github.com/moby/sys/mountinfo v0.4.0"
-"github.com/moby/sys/mountinfo v0.4.0/go.mod"
-"github.com/moby/sys/mountinfo v0.4.1"
-"github.com/moby/sys/mountinfo v0.4.1/go.mod"
-"github.com/moby/sys/symlink v0.1.0"
-"github.com/moby/sys/symlink v0.1.0/go.mod"
-"github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod"
-"github.com/moby/term v0.0.0-20201216013528-df9cb8a40635"
-"github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod"
-"github.com/moby/vpnkit v0.5.0/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
-"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-"github.com/modern-go/reflect2 v1.0.1"
-"github.com/modern-go/reflect2 v1.0.1/go.mod"
-"github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb"
-"github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod"
-"github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00"
-"github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod"
-"github.com/morikuni/aec v1.0.0"
-"github.com/morikuni/aec v1.0.0/go.mod"
-"github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618/go.mod"
-"github.com/mrunalp/fileutils v0.0.0-20200520151820-abd8a0e76976/go.mod"
-"github.com/mrunalp/fileutils v0.5.0"
-"github.com/mrunalp/fileutils v0.5.0/go.mod"
-"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822"
-"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod"
-"github.com/mvdan/xurls v1.1.0"
-"github.com/mvdan/xurls v1.1.0/go.mod"
-"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f"
-"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-"github.com/naoina/go-stringutil v0.1.0/go.mod"
-"github.com/naoina/toml v0.1.1/go.mod"
-"github.com/natefinch/lumberjack v2.0.0+incompatible"
-"github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod"
-"github.com/ncw/swift v1.0.47/go.mod"
-"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
-"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
-"github.com/nxadm/tail v1.4.4/go.mod"
-"github.com/nxadm/tail v1.4.8"
-"github.com/nxadm/tail v1.4.8/go.mod"
-"github.com/oklog/ulid v1.3.1/go.mod"
-"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5"
-"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
-"github.com/olekukonko/tablewriter v0.0.4/go.mod"
-"github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b"
-"github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod"
-"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c"
-"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-"github.com/onsi/ginkgo v1.10.1/go.mod"
-"github.com/onsi/ginkgo v1.10.3/go.mod"
-"github.com/onsi/ginkgo v1.11.0"
-"github.com/onsi/ginkgo v1.11.0/go.mod"
-"github.com/onsi/ginkgo v1.12.1/go.mod"
-"github.com/onsi/ginkgo v1.16.1"
-"github.com/onsi/ginkgo v1.16.1/go.mod"
-"github.com/onsi/ginkgo v1.6.0/go.mod"
-"github.com/onsi/ginkgo v1.8.0/go.mod"
-"github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a"
-"github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod"
-"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c"
-"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-"github.com/onsi/gomega v1.10.1/go.mod"
-"github.com/onsi/gomega v1.11.0"
-"github.com/onsi/gomega v1.11.0/go.mod"
-"github.com/onsi/gomega v1.5.0/go.mod"
-"github.com/onsi/gomega v1.7.0"
-"github.com/onsi/gomega v1.7.0/go.mod"
-"github.com/onsi/gomega v1.7.1"
-"github.com/onsi/gomega v1.7.1/go.mod"
-"github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod"
-"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
-"github.com/opencontainers/go-digest v1.0.0"
-"github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod"
-"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
-"github.com/opencontainers/go-digest v1.0.0/go.mod"
-"github.com/opencontainers/image-spec v1.0.0/go.mod"
-"github.com/opencontainers/image-spec v1.0.1"
-"github.com/opencontainers/image-spec v1.0.1/go.mod"
-"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
-"github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod"
-"github.com/opencontainers/runc v1.0.0-rc90.0.20200616040943-82d2fa4eb069/go.mod"
-"github.com/opencontainers/runc v1.0.0-rc91.0.20200707015106-819fcc687efb/go.mod"
-"github.com/opencontainers/runc v1.0.0-rc92"
-"github.com/opencontainers/runc v1.0.0-rc92/go.mod"
-"github.com/opencontainers/runc v1.0.0-rc93"
-"github.com/opencontainers/runc v1.0.0-rc93.0.20210414171415-3397a09ee932"
-"github.com/opencontainers/runc v1.0.0-rc93.0.20210414171415-3397a09ee932/go.mod"
-"github.com/opencontainers/runc v1.0.0-rc93/go.mod"
-"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.1/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.2/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20200520003142-237cc4f519e2/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20210316141917-a8c4a9ee0f6b"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20210316141917-a8c4a9ee0f6b/go.mod"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417"
-"github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod"
-"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
-"github.com/opencontainers/selinux v1.5.1/go.mod"
-"github.com/opencontainers/selinux v1.5.2/go.mod"
-"github.com/opencontainers/selinux v1.6.0"
-"github.com/opencontainers/selinux v1.6.0/go.mod"
-"github.com/opencontainers/selinux v1.8.0"
-"github.com/opencontainers/selinux v1.8.0/go.mod"
-"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-"github.com/pborman/uuid v1.2.0/go.mod"
-"github.com/pborman/uuid v1.2.1"
-"github.com/pborman/uuid v1.2.1/go.mod"
-"github.com/pelletier/go-toml v1.2.0"
-"github.com/pelletier/go-toml v1.2.0/go.mod"
-"github.com/peterbourgon/diskv v2.0.1+incompatible"
-"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-"github.com/pierrec/lz4 v2.5.2+incompatible"
-"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
-"github.com/pkg/errors v0.8.0"
-"github.com/pkg/errors v0.8.0/go.mod"
-"github.com/pkg/errors v0.8.1"
-"github.com/pkg/errors v0.8.1/go.mod"
-"github.com/pkg/errors v0.9.1"
-"github.com/pkg/errors v0.9.1/go.mod"
-"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-"github.com/pmezard/go-difflib v1.0.0"
-"github.com/pmezard/go-difflib v1.0.0/go.mod"
-"github.com/posener/complete v1.1.1/go.mod"
-"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021"
-"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
-"github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod"
-"github.com/prometheus/client_golang v0.9.1/go.mod"
-"github.com/prometheus/client_golang v0.9.3/go.mod"
-"github.com/prometheus/client_golang v1.0.0"
-"github.com/prometheus/client_golang v1.0.0/go.mod"
-"github.com/prometheus/client_golang v1.1.0/go.mod"
-"github.com/prometheus/client_golang v1.7.1"
-"github.com/prometheus/client_golang v1.7.1/go.mod"
-"github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod"
-"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
-"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-"github.com/prometheus/client_model v0.2.0"
-"github.com/prometheus/client_model v0.2.0/go.mod"
-"github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod"
-"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
-"github.com/prometheus/common v0.10.0"
-"github.com/prometheus/common v0.10.0/go.mod"
-"github.com/prometheus/common v0.4.0/go.mod"
-"github.com/prometheus/common v0.4.1"
-"github.com/prometheus/common v0.4.1/go.mod"
-"github.com/prometheus/common v0.6.0/go.mod"
-"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
-"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
-"github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod"
-"github.com/prometheus/procfs v0.0.2"
-"github.com/prometheus/procfs v0.0.2/go.mod"
-"github.com/prometheus/procfs v0.0.3/go.mod"
-"github.com/prometheus/procfs v0.0.5/go.mod"
-"github.com/prometheus/procfs v0.0.8/go.mod"
-"github.com/prometheus/procfs v0.1.3"
-"github.com/prometheus/procfs v0.1.3/go.mod"
-"github.com/prometheus/procfs v0.2.0"
-"github.com/prometheus/procfs v0.2.0/go.mod"
-"github.com/prometheus/tsdb v0.7.1/go.mod"
-"github.com/quobyte/api v0.1.2/go.mod"
-"github.com/quobyte/api v0.1.8"
-"github.com/quobyte/api v0.1.8/go.mod"
-"github.com/rancher/dynamiclistener v0.2.3"
-"github.com/rancher/dynamiclistener v0.2.3/go.mod"
-"github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009/go.mod"
-"github.com/rancher/remotedialer v0.2.0"
-"github.com/rancher/remotedialer v0.2.0/go.mod"
-"github.com/rancher/wrangler v0.1.4/go.mod"
-"github.com/rancher/wrangler v0.4.0"
-"github.com/rancher/wrangler v0.4.0/go.mod"
-"github.com/rancher/wrangler v0.6.0/go.mod"
-"github.com/rancher/wrangler v0.6.1"
-"github.com/rancher/wrangler v0.6.1/go.mod"
-"github.com/rancher/wrangler v0.6.2"
-"github.com/rancher/wrangler v0.6.2/go.mod"
-"github.com/rancher/wrangler-api v0.2.0/go.mod"
-"github.com/rancher/wrangler-api v0.6.0"
-"github.com/rancher/wrangler-api v0.6.0/go.mod"
-"github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod"
-"github.com/robfig/cron v1.1.0"
-"github.com/robfig/cron v1.1.0/go.mod"
-"github.com/robfig/cron/v3 v3.0.1"
-"github.com/robfig/cron/v3 v3.0.1/go.mod"
-"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-"github.com/rootless-containers/rootlesskit v0.14.0"
-"github.com/rootless-containers/rootlesskit v0.14.0/go.mod"
-"github.com/rs/xid v1.2.1"
-"github.com/rs/xid v1.2.1/go.mod"
-"github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021"
-"github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021/go.mod"
-"github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod"
-"github.com/russross/blackfriday v1.5.2"
-"github.com/russross/blackfriday v1.5.2/go.mod"
-"github.com/russross/blackfriday/v2 v2.0.1"
-"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-"github.com/russross/blackfriday/v2 v2.1.0"
-"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
-"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-"github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8"
-"github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod"
-"github.com/satori/go.uuid v1.2.0"
-"github.com/satori/go.uuid v1.2.0/go.mod"
-"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-"github.com/seccomp/libseccomp-golang v0.9.1"
-"github.com/seccomp/libseccomp-golang v0.9.1/go.mod"
-"github.com/sergi/go-diff v1.0.0/go.mod"
-"github.com/sergi/go-diff v1.1.0"
-"github.com/sergi/go-diff v1.1.0/go.mod"
-"github.com/shurcooL/sanitized_anchor_name v1.0.0"
-"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-"github.com/sirupsen/logrus v1.0.6"
-"github.com/sirupsen/logrus v1.0.6/go.mod"
-"github.com/sirupsen/logrus v1.2.0"
-"github.com/sirupsen/logrus v1.2.0/go.mod"
-"github.com/sirupsen/logrus v1.4.1/go.mod"
-"github.com/sirupsen/logrus v1.4.2"
-"github.com/sirupsen/logrus v1.4.2/go.mod"
-"github.com/sirupsen/logrus v1.6.0"
-"github.com/sirupsen/logrus v1.6.0/go.mod"
-"github.com/sirupsen/logrus v1.7.0"
-"github.com/sirupsen/logrus v1.7.0/go.mod"
-"github.com/sirupsen/logrus v1.8.1"
-"github.com/sirupsen/logrus v1.8.1/go.mod"
-"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
-"github.com/smartystreets/goconvey v1.6.4"
-"github.com/smartystreets/goconvey v1.6.4/go.mod"
-"github.com/soheilhy/cmux v0.1.4"
-"github.com/soheilhy/cmux v0.1.4/go.mod"
-"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-"github.com/spf13/afero v1.1.2/go.mod"
-"github.com/spf13/afero v1.2.2"
-"github.com/spf13/afero v1.2.2/go.mod"
-"github.com/spf13/cast v1.3.0"
-"github.com/spf13/cast v1.3.0/go.mod"
-"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee"
-"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
-"github.com/spf13/cobra v0.0.3"
-"github.com/spf13/cobra v0.0.3/go.mod"
-"github.com/spf13/cobra v0.0.5/go.mod"
-"github.com/spf13/cobra v1.0.0/go.mod"
-"github.com/spf13/cobra v1.1.1"
-"github.com/spf13/cobra v1.1.1/go.mod"
-"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-"github.com/spf13/jwalterweatherman v1.1.0"
-"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
-"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff"
-"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-"github.com/spf13/pflag v1.0.1"
-"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95"
-"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
-"github.com/spf13/pflag v1.0.1/go.mod"
-"github.com/spf13/pflag v1.0.3/go.mod"
-"github.com/spf13/pflag v1.0.5"
-"github.com/spf13/pflag v1.0.5/go.mod"
-"github.com/spf13/viper v1.3.2/go.mod"
-"github.com/spf13/viper v1.4.0/go.mod"
-"github.com/spf13/viper v1.7.0"
-"github.com/spf13/viper v1.7.0/go.mod"
-"github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod"
-"github.com/storageos/go-api v2.2.0+incompatible"
-"github.com/storageos/go-api v2.2.0+incompatible/go.mod"
-"github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod"
-"github.com/stretchr/objx v0.1.0/go.mod"
-"github.com/stretchr/objx v0.1.1/go.mod"
-"github.com/stretchr/objx v0.2.0"
-"github.com/stretchr/objx v0.2.0/go.mod"
-"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
-"github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod"
-"github.com/stretchr/testify v1.2.2"
-"github.com/stretchr/testify v1.2.2/go.mod"
-"github.com/stretchr/testify v1.3.0"
-"github.com/stretchr/testify v1.3.0/go.mod"
-"github.com/stretchr/testify v1.4.0"
-"github.com/stretchr/testify v1.4.0/go.mod"
-"github.com/stretchr/testify v1.5.1/go.mod"
-"github.com/stretchr/testify v1.6.1"
-"github.com/stretchr/testify v1.6.1/go.mod"
-"github.com/stretchr/testify v1.7.0"
-"github.com/stretchr/testify v1.7.0/go.mod"
-"github.com/subosito/gotenv v1.2.0"
-"github.com/subosito/gotenv v1.2.0/go.mod"
-"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
-"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2"
-"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod"
-"github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635"
-"github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod"
-"github.com/tchap/go-patricia v2.2.6+incompatible"
-"github.com/tchap/go-patricia v2.2.6+incompatible/go.mod"
-"github.com/tchap/go-patricia v2.3.0+incompatible"
-"github.com/tchap/go-patricia v2.3.0+incompatible/go.mod"
-"github.com/tektoncd/pipeline v0.4.0/go.mod"
-"github.com/tencentcloud/tencentcloud-sdk-go v1.0.67/go.mod"
-"github.com/thecodeteam/goscaleio v0.1.0"
-"github.com/thecodeteam/goscaleio v0.1.0/go.mod"
-"github.com/tidwall/pretty v1.0.0/go.mod"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5"
-"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
-"github.com/u-root/u-root v7.0.0+incompatible/go.mod"
-"github.com/ugorji/go v0.0.0-20170107133203-ded73eae5db7/go.mod"
-"github.com/ugorji/go v1.1.4/go.mod"
-"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
-"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
-"github.com/urfave/cli v1.20.0"
-"github.com/urfave/cli v1.20.0/go.mod"
-"github.com/urfave/cli v1.21.0"
-"github.com/urfave/cli v1.21.0/go.mod"
-"github.com/urfave/cli v1.22.1"
-"github.com/urfave/cli v1.22.1/go.mod"
-"github.com/urfave/cli v1.22.2"
-"github.com/urfave/cli v1.22.2/go.mod"
-"github.com/urfave/cli/v2 v2.3.0"
-"github.com/urfave/cli/v2 v2.3.0/go.mod"
-"github.com/urfave/negroni v1.0.0"
-"github.com/urfave/negroni v1.0.0/go.mod"
-"github.com/vektah/gqlparser v1.1.2/go.mod"
-"github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf"
-"github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod"
-"github.com/vishvananda/netlink v1.1.0"
-"github.com/vishvananda/netlink v1.1.0/go.mod"
-"github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc"
-"github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod"
-"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df"
-"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod"
-"github.com/vishvananda/netns v0.0.0-20200520041808-52d707b772fe/go.mod"
-"github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae"
-"github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod"
-"github.com/vmware/govmomi v0.20.3"
-"github.com/vmware/govmomi v0.20.3/go.mod"
-"github.com/willf/bitset v1.1.11"
-"github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243"
-"github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod"
-"github.com/willf/bitset v1.1.11/go.mod"
-"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
-"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
-"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
-"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
-"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-"github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod"
-"github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca"
-"github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod"
-"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
-"github.com/yuin/goldmark v1.1.27/go.mod"
-"github.com/yuin/goldmark v1.2.1/go.mod"
-"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod"
-"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod"
-"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod"
-"go.etcd.io/bbolt v1.3.2/go.mod"
-"go.etcd.io/bbolt v1.3.3"
-"go.etcd.io/bbolt v1.3.3/go.mod"
-"go.etcd.io/bbolt v1.3.5"
-"go.etcd.io/bbolt v1.3.5/go.mod"
-"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738"
-"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
-"go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod"
-"go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489"
-"go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod"
-"go.mongodb.org/mongo-driver v1.0.3/go.mod"
-"go.mongodb.org/mongo-driver v1.1.1/go.mod"
-"go.mongodb.org/mongo-driver v1.1.2/go.mod"
-"go.opencensus.io v0.21.0/go.mod"
-"go.opencensus.io v0.22.0/go.mod"
-"go.opencensus.io v0.22.2"
-"go.opencensus.io v0.22.2/go.mod"
-"go.opencensus.io v0.22.3"
-"go.opencensus.io v0.22.3/go.mod"
-"go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5"
-"go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod"
-"go.uber.org/atomic v1.3.2"
-"go.uber.org/atomic v1.3.2/go.mod"
-"go.uber.org/atomic v1.4.0"
-"go.uber.org/atomic v1.4.0/go.mod"
-"go.uber.org/multierr v1.1.0"
-"go.uber.org/multierr v1.1.0/go.mod"
-"go.uber.org/zap v1.10.0"
-"go.uber.org/zap v1.10.0/go.mod"
-"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793"
-"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-"golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941"
-"golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod"
-"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
-"golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod"
-"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
-"golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod"
-"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
-"golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod"
-"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
-"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586"
-"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod"
-"golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc"
-"golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod"
-"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975"
-"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/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/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
-"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83"
-"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
-"golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod"
-"golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod"
-"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-"golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod"
-"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
-"golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod"
-"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-"golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod"
-"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
-"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
-"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
-"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
-"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
-"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
-"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
-"golang.org/x/exp v0.0.0-20210220032938-85be41e4509f"
-"golang.org/x/exp v0.0.0-20210220032938-85be41e4509f/go.mod"
-"golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod"
-"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
-"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
-"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
-"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
-"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
-"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
-"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
-"golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod"
-"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-"golang.org/x/mod v0.1.0/go.mod"
-"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
-"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
-"golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod"
-"golang.org/x/mod v0.2.0/go.mod"
-"golang.org/x/mod v0.3.0/go.mod"
-"golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449"
-"golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod"
-"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd"
-"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-"golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod"
-"golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1"
-"golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod"
-"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a"
-"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
-"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-"golang.org/x/net v0.0.0-20190311183353-d8887717615a"
-"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-"golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod"
-"golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod"
-"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980"
-"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod"
-"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
-"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7"
-"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
-"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
-"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
-"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
-"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
-"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
-"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
-"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
-"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
-"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
-"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
-"golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod"
-"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
-"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b"
-"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
-"golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod"
-"golang.org/x/net v0.0.0-20201224014010-6772e930b67b"
-"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
-"golang.org/x/net v0.0.0-20210224082022-3d97a244fca7"
-"golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod"
-"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
-"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
-"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6"
-"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
-"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
-"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
-"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f"
-"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
-"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
-"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9"
-"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
-"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5"
-"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
-"golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod"
-"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod"
-"golang.org/x/sys v0.0.0-20190312061237-fead79001313"
-"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-"golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod"
-"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
-"golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod"
-"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
-"golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444"
-"golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod"
-"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f"
-"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
-"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
-"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
-"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
-"golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod"
-"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456"
-"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
-"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
-"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
-"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
-"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
-"golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod"
-"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
-"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7"
-"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod"
-"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
-"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
-"golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod"
-"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
-"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
-"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
-"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-"golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod"
-"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
-"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
-"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
-"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
-"golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod"
-"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
-"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-"golang.org/x/sys v0.0.0-20200327173247-9dae0f8f5775/go.mod"
-"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
-"golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1"
-"golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod"
-"golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod"
-"golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod"
-"golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod"
-"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
-"golang.org/x/sys v0.0.0-20201112073958-5cba982894dd"
-"golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod"
-"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3"
-"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
-"golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod"
-"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
-"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c"
-"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
-"golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073"
-"golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod"
-"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
-"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d"
-"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
-"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
-"golang.org/x/text v0.3.0"
-"golang.org/x/text v0.3.0/go.mod"
-"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-"golang.org/x/text v0.3.2"
-"golang.org/x/text v0.3.2/go.mod"
-"golang.org/x/text v0.3.3"
-"golang.org/x/text v0.3.3/go.mod"
-"golang.org/x/text v0.3.4"
-"golang.org/x/text v0.3.4/go.mod"
-"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2"
-"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
-"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
-"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
-"golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba"
-"golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod"
-"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-"golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod"
-"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod"
-"golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod"
-"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-"golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod"
-"golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod"
-"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
-"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
-"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
-"golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72"
-"golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod"
-"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
-"golang.org/x/tools v0.0.0-20191017205301-920acffc3e65"
-"golang.org/x/tools v0.0.0-20191017205301-920acffc3e65/go.mod"
-"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
-"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
-"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
-"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
-"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
-"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
-"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
-"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
-"golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod"
-"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
-"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
-"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
-"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
-"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
-"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
-"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
-"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
-"golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod"
-"golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod"
-"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
-"golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod"
-"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
-"golang.org/x/tools v0.1.0"
-"golang.org/x/tools v0.1.0/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"
-"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
-"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
-"gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod"
-"gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod"
-"gonum.org/v1/gonum v0.6.2"
-"gonum.org/v1/gonum v0.6.2/go.mod"
-"gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod"
-"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e"
-"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod"
-"gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod"
-"google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod"
-"google.golang.org/api v0.13.0/go.mod"
-"google.golang.org/api v0.14.0/go.mod"
-"google.golang.org/api v0.15.0/go.mod"
-"google.golang.org/api v0.15.1-0.20200106000736-b8fc810ca6b5/go.mod"
-"google.golang.org/api v0.15.1/go.mod"
-"google.golang.org/api v0.17.0/go.mod"
-"google.golang.org/api v0.18.0/go.mod"
-"google.golang.org/api v0.20.0"
-"google.golang.org/api v0.20.0/go.mod"
-"google.golang.org/api v0.4.0/go.mod"
-"google.golang.org/api v0.7.0/go.mod"
-"google.golang.org/api v0.8.0/go.mod"
-"google.golang.org/api v0.9.0/go.mod"
-"google.golang.org/appengine v1.1.0/go.mod"
-"google.golang.org/appengine v1.4.0"
-"google.golang.org/appengine v1.4.0/go.mod"
-"google.golang.org/appengine v1.5.0"
-"google.golang.org/appengine v1.5.0/go.mod"
-"google.golang.org/appengine v1.6.1"
-"google.golang.org/appengine v1.6.1/go.mod"
-"google.golang.org/appengine v1.6.5"
-"google.golang.org/appengine v1.6.5/go.mod"
-"google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod"
-"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8"
-"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873"
-"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
-"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
-"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
-"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
-"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
-"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
-"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
-"google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod"
-"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
-"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
-"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
-"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63"
-"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
-"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
-"google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884"
-"google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod"
-"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
-"google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a"
-"google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod"
-"google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod"
-"google.golang.org/grpc v1.19.0/go.mod"
-"google.golang.org/grpc v1.20.1/go.mod"
-"google.golang.org/grpc v1.21.0/go.mod"
-"google.golang.org/grpc v1.21.1/go.mod"
-"google.golang.org/grpc v1.23.0/go.mod"
-"google.golang.org/grpc v1.23.1"
-"google.golang.org/grpc v1.23.1/go.mod"
-"google.golang.org/grpc v1.24.0"
-"google.golang.org/grpc v1.24.0/go.mod"
-"google.golang.org/grpc v1.25.1/go.mod"
-"google.golang.org/grpc v1.26.0"
-"google.golang.org/grpc v1.26.0/go.mod"
-"google.golang.org/grpc v1.27.0/go.mod"
-"google.golang.org/grpc v1.27.1"
-"google.golang.org/grpc v1.27.1/go.mod"
-"google.golang.org/grpc v1.37.0"
-"google.golang.org/grpc v1.37.0/go.mod"
-"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-"google.golang.org/protobuf v1.21.0/go.mod"
-"google.golang.org/protobuf v1.22.0/go.mod"
-"google.golang.org/protobuf v1.23.0"
-"google.golang.org/protobuf v1.23.0/go.mod"
-"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
-"google.golang.org/protobuf v1.24.0"
-"google.golang.org/protobuf v1.24.0/go.mod"
-"google.golang.org/protobuf v1.25.0"
-"google.golang.org/protobuf v1.25.0/go.mod"
-"google.golang.org/protobuf v1.26.0"
-"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
-"google.golang.org/protobuf v1.26.0/go.mod"
-"gopkg.in/airbrake/gobrake.v2 v2.0.9"
-"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
-"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
-"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-"gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod"
-"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
-"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
-"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
-"gopkg.in/cheggaaa/pb.v1 v1.0.25"
-"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
-"gopkg.in/errgo.v2 v2.1.0/go.mod"
-"gopkg.in/fsnotify.v1 v1.4.7"
-"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-"gopkg.in/gcfg.v1 v1.2.0"
-"gopkg.in/gcfg.v1 v1.2.0/go.mod"
-"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2"
-"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-"gopkg.in/inf.v0 v0.9.1"
-"gopkg.in/inf.v0 v0.9.1/go.mod"
-"gopkg.in/ini.v1 v1.51.0"
-"gopkg.in/ini.v1 v1.51.0/go.mod"
-"gopkg.in/ini.v1 v1.57.0"
-"gopkg.in/ini.v1 v1.57.0/go.mod"
-"gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod"
-"gopkg.in/natefinch/lumberjack.v2 v2.0.0"
-"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
-"gopkg.in/resty.v1 v1.12.0/go.mod"
-"gopkg.in/square/go-jose.v2 v2.2.2"
-"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
-"gopkg.in/square/go-jose.v2 v2.3.1"
-"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-"gopkg.in/warnings.v0 v0.1.1"
-"gopkg.in/warnings.v0 v0.1.1/go.mod"
-"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-"gopkg.in/yaml.v2 v2.2.1"
-"gopkg.in/yaml.v2 v2.2.1/go.mod"
-"gopkg.in/yaml.v2 v2.2.2"
-"gopkg.in/yaml.v2 v2.2.2/go.mod"
-"gopkg.in/yaml.v2 v2.2.3/go.mod"
-"gopkg.in/yaml.v2 v2.2.4"
-"gopkg.in/yaml.v2 v2.2.4/go.mod"
-"gopkg.in/yaml.v2 v2.2.5/go.mod"
-"gopkg.in/yaml.v2 v2.2.7/go.mod"
-"gopkg.in/yaml.v2 v2.2.8"
-"gopkg.in/yaml.v2 v2.2.8/go.mod"
-"gopkg.in/yaml.v2 v2.3.0/go.mod"
-"gopkg.in/yaml.v2 v2.4.0"
-"gopkg.in/yaml.v2 v2.4.0/go.mod"
-"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
-"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
-"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
-"gotest.tools v2.2.0+incompatible"
-"gotest.tools v2.2.0+incompatible/go.mod"
-"gotest.tools/v3 v3.0.2"
-"gotest.tools/v3 v3.0.2/go.mod"
-"gotest.tools/v3 v3.0.3"
-"gotest.tools/v3 v3.0.3/go.mod"
-"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
-"k8s.io/api v0.17.0/go.mod"
-"k8s.io/api v0.18.0"
-"k8s.io/api v0.18.0/go.mod"
-"k8s.io/api v0.19.5"
-"k8s.io/api v0.19.5/go.mod"
-"k8s.io/apiextensions-apiserver v0.17.0/go.mod"
-"k8s.io/apiextensions-apiserver v0.18.0"
-"k8s.io/apiextensions-apiserver v0.18.0/go.mod"
-"k8s.io/apiextensions-apiserver v0.19.5/go.mod"
-"k8s.io/apimachinery v0.17.0/go.mod"
-"k8s.io/apimachinery v0.18.0"
-"k8s.io/apimachinery v0.18.0/go.mod"
-"k8s.io/apimachinery v0.19.5"
-"k8s.io/apimachinery v0.19.5/go.mod"
-"k8s.io/apiserver v0.17.0/go.mod"
-"k8s.io/apiserver v0.18.0/go.mod"
-"k8s.io/apiserver v0.19.5"
-"k8s.io/apiserver v0.19.5/go.mod"
-"k8s.io/cli-runtime v0.19.5/go.mod"
-"k8s.io/client-go v0.17.0/go.mod"
-"k8s.io/client-go v0.18.0"
-"k8s.io/client-go v0.18.0/go.mod"
-"k8s.io/client-go v0.19.5"
-"k8s.io/client-go v0.19.5/go.mod"
-"k8s.io/cloud-provider v0.19.5/go.mod"
-"k8s.io/cluster-bootstrap v0.19.5/go.mod"
-"k8s.io/code-generator v0.17.0/go.mod"
-"k8s.io/code-generator v0.18.0"
-"k8s.io/code-generator v0.18.0/go.mod"
-"k8s.io/code-generator v0.19.5/go.mod"
-"k8s.io/component-base v0.17.0/go.mod"
-"k8s.io/component-base v0.18.0/go.mod"
-"k8s.io/component-base v0.19.5/go.mod"
-"k8s.io/cri-api v0.19.5"
-"k8s.io/cri-api v0.19.5/go.mod"
-"k8s.io/csi-translation-lib v0.19.5/go.mod"
-"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-"k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a/go.mod"
-"k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod"
-"k8s.io/gengo v0.0.0-20191120174120-e74f70b9b27e/go.mod"
-"k8s.io/gengo v0.0.0-20200114144118-36b2048a9120"
-"k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod"
-"k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod"
-"k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod"
-"k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027"
-"k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod"
-"k8s.io/heapster v1.2.0-beta.1"
-"k8s.io/heapster v1.2.0-beta.1/go.mod"
-"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-"k8s.io/klog v0.3.0"
-"k8s.io/klog v0.3.0/go.mod"
-"k8s.io/klog v1.0.0"
-"k8s.io/klog v1.0.0/go.mod"
-"k8s.io/klog/v2 v2.0.0/go.mod"
-"k8s.io/klog/v2 v2.2.0"
-"k8s.io/klog/v2 v2.2.0/go.mod"
-"k8s.io/klog/v2 v2.8.0"
-"k8s.io/klog/v2 v2.8.0/go.mod"
-"k8s.io/kube-aggregator v0.18.0/go.mod"
-"k8s.io/kube-aggregator v0.19.5/go.mod"
-"k8s.io/kube-controller-manager v0.19.5/go.mod"
-"k8s.io/kube-openapi v0.0.0-20190502190224-411b2483e503/go.mod"
-"k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod"
-"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c"
-"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod"
-"k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod"
-"k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7"
-"k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod"
-"k8s.io/kube-proxy v0.19.5/go.mod"
-"k8s.io/kube-scheduler v0.19.5/go.mod"
-"k8s.io/kubectl v0.19.5/go.mod"
-"k8s.io/kubelet v0.19.5/go.mod"
-"k8s.io/kubernetes v1.19.5/go.mod"
-"k8s.io/kubernetes v1.21.0"
-"k8s.io/kubernetes v1.21.0/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20210408162405-cb303e613a12"
-"k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210408162405-cb303e613a12"
-"k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210408162405-cb303e613a12"
-"k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210408162405-cb303e613a12"
-"k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210408162405-cb303e613a12"
-"k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210408162405-cb303e613a12"
-"k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210408162405-cb303e613a12"
-"k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210408162405-cb303e613a12/go.mod"
-"k8s.io/legacy-cloud-providers v0.19.5/go.mod"
-"k8s.io/metrics v0.19.5/go.mod"
-"k8s.io/sample-apiserver v0.19.5/go.mod"
-"k8s.io/system-validators v1.1.2/go.mod"
-"k8s.io/system-validators v1.4.0"
-"k8s.io/system-validators v1.4.0/go.mod"
-"k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod"
-"k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod"
-"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
-"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
-"k8s.io/utils v0.0.0-20200414100711-2df71ebbae66/go.mod"
-"k8s.io/utils v0.0.0-20200729134348-d5654de09c73"
-"k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod"
-"k8s.io/utils v0.0.0-20201110183641-67b214c5f920"
-"k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod"
-"modernc.org/cc v1.0.0/go.mod"
-"modernc.org/golex v1.0.0/go.mod"
-"modernc.org/mathutil v1.0.0/go.mod"
-"modernc.org/strutil v1.0.0/go.mod"
-"modernc.org/xc v1.0.0/go.mod"
-"rsc.io/binaryregexp v0.2.0/go.mod"
-"rsc.io/pdf v0.1.1/go.mod"
-"rsc.io/quote/v3 v3.1.0/go.mod"
-"rsc.io/sampler v1.3.0/go.mod"
-"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15"
-"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod"
-"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod"
-"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod"
-"sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod"
-"sigs.k8s.io/kustomize/api v0.8.5"
-"sigs.k8s.io/kustomize/api v0.8.5/go.mod"
-"sigs.k8s.io/kustomize/cmd/config v0.9.7/go.mod"
-"sigs.k8s.io/kustomize/kustomize/v4 v4.0.5"
-"sigs.k8s.io/kustomize/kustomize/v4 v4.0.5/go.mod"
-"sigs.k8s.io/kustomize/kyaml v0.10.15"
-"sigs.k8s.io/kustomize/kyaml v0.10.15/go.mod"
-"sigs.k8s.io/structured-merge-diff v0.0.0-20190426204423-ea680f03cc65"
-"sigs.k8s.io/structured-merge-diff v0.0.0-20190426204423-ea680f03cc65/go.mod"
-"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
-"sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod"
-"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
-"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
-"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
-"sigs.k8s.io/structured-merge-diff/v4 v4.0.1"
-"sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod"
-"sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod"
-"sigs.k8s.io/structured-merge-diff/v4 v4.1.0"
-"sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod"
-"sigs.k8s.io/yaml v1.1.0"
-"sigs.k8s.io/yaml v1.1.0/go.mod"
-"sigs.k8s.io/yaml v1.2.0"
-"sigs.k8s.io/yaml v1.2.0/go.mod"
-"vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod"
-)
-go-module_set_globals
-MY_PV=${PV}+k3s1
-SRC_URI="https://github.com/k3s-io/k3s/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}
-	https://helm.traefik.io/traefik/traefik-${K3S_TRAEFIK_VERSION}.tgz
-	https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz
-	amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+kubectl-symlink rootless"
-REQUIRED_USE="|| ( amd64 )"
-DEPEND="
-	net-firewall/conntrack-tools
-	rootless? ( app-emulation/slirp4netns )
-"
-RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )"
-RESTRICT+=" test"
-
-S=${WORKDIR}/${PN}-${MY_PV/+/-}
-
-k3s_unpack_filter() {
-	grep -v -F \
-		-e "traefik-${K3S_TRAEFIK_VERSION}.tgz" \
-		-e "k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz"
-}
-
-src_unpack() {
-	read -d '' A < <(printf -- '%s\n' ${A} | k3s_unpack_filter)
-	go-module_src_unpack
-	cd "${S}" || die
-	mkdir -p bin/aux build/static/charts cache || die
-	cp "${DISTDIR}/traefik-${K3S_TRAEFIK_VERSION}.tgz" build/static/charts/ || die
-	cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die
-	mv "${WORKDIR}/bin" "${S}/bin" || die
-	mv "${WORKDIR}/etc" "${S}/etc" || die
-}
-
-src_prepare() {
-	local filename pattern replacement
-	default
-	# Disable download for files fetched via SRC_URI.
-	sed -e 's:^[[:space:]]*curl:#\0:' \
-		-e "s:^setup_tmp\$:TMP_DIR=${S}/build/static/charts:" \
-		-i scripts/download || die
-	sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die
-	pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR'
-	filename=scripts/build
-	grep -qF "${pattern}" "${filename}" || \
-		die "failed to locate plugins clone command"
-	sed -e "s|${pattern}|mkdir -p \"\$WORKDIR\" \\&\\& tar -xzf \"${S}/cache/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz\" --strip-components=1 -C \"\$WORKDIR\"|" \
-		-e 's|rm -rf $TMPDIR||' \
-		-i "${filename}" || die
-	sed -e 's:/usr/local/bin:/usr/bin:g' -i k3s.service || die
-	sed -e 's|mod=vendor|mod=readonly|g' -i vendor/github.com/opencontainers/runc/Makefile || die
-}
-
-src_compile() {
-	mkdir -p build/data || die
-	./scripts/download || die
-	./scripts/build || die
-	./scripts/package-cli || die
-}
-
-src_install() {
-	dobin "dist/artifacts/${PN}"
-	use kubectl-symlink && dosym k3s /usr/bin/kubectl
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	dodoc README.md
-}
diff --git a/sys-cluster/k3s/k3s-1.21.5.ebuild b/sys-cluster/k3s/k3s-1.21.5.ebuild
new file mode 100644
index 000000000000..0e20a482fe90
--- /dev/null
+++ b/sys-cluster/k3s/k3s-1.21.5.ebuild
@@ -0,0 +1,1710 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module linux-info systemd
+
+DESCRIPTION="Lightweight Kubernetes"
+HOMEPAGE="https://k3s.io"
+K3S_RUNC_VERSION=v1.0.2
+K3S_ROOT_VERSION=0.9.1
+K3S_TRAEFIK_VERSION=9.18.2
+K3S_CNIPLUGINS_VERSION=0.9.1
+CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN"
+
+EGO_SUM=(
+"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+"bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod"
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.38.0/go.mod"
+"cloud.google.com/go v0.44.1/go.mod"
+"cloud.google.com/go v0.44.2/go.mod"
+"cloud.google.com/go v0.45.1/go.mod"
+"cloud.google.com/go v0.46.3/go.mod"
+"cloud.google.com/go v0.50.0/go.mod"
+"cloud.google.com/go v0.51.0/go.mod"
+"cloud.google.com/go v0.52.0/go.mod"
+"cloud.google.com/go v0.53.0/go.mod"
+"cloud.google.com/go v0.54.0/go.mod"
+"cloud.google.com/go v0.57.0"
+"cloud.google.com/go v0.57.0/go.mod"
+"cloud.google.com/go/bigquery v1.0.1/go.mod"
+"cloud.google.com/go/bigquery v1.3.0/go.mod"
+"cloud.google.com/go/bigquery v1.4.0/go.mod"
+"cloud.google.com/go/datastore v1.0.0/go.mod"
+"cloud.google.com/go/datastore v1.1.0/go.mod"
+"cloud.google.com/go/firestore v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.0.1/go.mod"
+"cloud.google.com/go/pubsub v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.2.0/go.mod"
+"cloud.google.com/go/storage v1.0.0/go.mod"
+"cloud.google.com/go/storage v1.5.0/go.mod"
+"cloud.google.com/go/storage v1.6.0/go.mod"
+"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+"dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod"
+"github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod"
+"github.com/Azure/azure-sdk-for-go v43.0.0+incompatible"
+"github.com/Azure/azure-sdk-for-go v43.0.0+incompatible/go.mod"
+"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+"github.com/Azure/go-autorest v10.8.1+incompatible/go.mod"
+"github.com/Azure/go-autorest v14.2.0+incompatible"
+"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+"github.com/Azure/go-autorest/autorest v0.9.6/go.mod"
+"github.com/Azure/go-autorest/autorest v0.11.12"
+"github.com/Azure/go-autorest/autorest v0.11.12/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.5"
+"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.3.0"
+"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+"github.com/Azure/go-autorest/autorest/to v0.2.0"
+"github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.1.0"
+"github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod"
+"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+"github.com/Azure/go-autorest/logger v0.2.0"
+"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+"github.com/Azure/go-autorest/tracing v0.6.0"
+"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+"github.com/BurntSushi/toml v0.3.1"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+"github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317"
+"github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317/go.mod"
+"github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab"
+"github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod"
+"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd"
+"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod"
+"github.com/Microsoft/go-winio v0.4.11/go.mod"
+"github.com/Microsoft/go-winio v0.4.14/go.mod"
+"github.com/Microsoft/go-winio v0.4.15/go.mod"
+"github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod"
+"github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod"
+"github.com/Microsoft/go-winio v0.4.17/go.mod"
+"github.com/Microsoft/go-winio v0.4.19"
+"github.com/Microsoft/go-winio v0.4.19/go.mod"
+"github.com/Microsoft/hcsshim v0.8.16"
+"github.com/Microsoft/hcsshim v0.8.16/go.mod"
+"github.com/Microsoft/hcsshim v0.8.20"
+"github.com/Microsoft/hcsshim v0.8.20/go.mod"
+"github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod"
+"github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3"
+"github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod"
+"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+"github.com/NYTimes/gziphandler v1.1.1"
+"github.com/NYTimes/gziphandler v1.1.1/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+"github.com/PuerkitoBio/purell v1.1.0/go.mod"
+"github.com/PuerkitoBio/purell v1.1.1"
+"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
+"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+"github.com/Rican7/retry v0.1.0"
+"github.com/Rican7/retry v0.1.0/go.mod"
+"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod"
+"github.com/agnivade/levenshtein v1.0.1/go.mod"
+"github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod"
+"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a"
+"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
+"github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod"
+"github.com/aws/aws-sdk-go v1.12.54/go.mod"
+"github.com/aws/aws-sdk-go v1.15.11/go.mod"
+"github.com/aws/aws-sdk-go v1.35.24"
+"github.com/aws/aws-sdk-go v1.35.24/go.mod"
+"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod"
+"github.com/bitly/go-simplejson v0.5.0/go.mod"
+"github.com/bits-and-blooms/bitset v1.2.0"
+"github.com/bits-and-blooms/bitset v1.2.0/go.mod"
+"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
+"github.com/blang/semver v3.1.0+incompatible/go.mod"
+"github.com/blang/semver v3.5.0+incompatible/go.mod"
+"github.com/blang/semver v3.5.1+incompatible"
+"github.com/blang/semver v3.5.1+incompatible/go.mod"
+"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/bronze1man/goStrongswanVici v0.0.0-20171013065002-4d72634a2f11/go.mod"
+"github.com/bronze1man/goStrongswanVici v0.0.0-20190828090544-27d02f80ba40"
+"github.com/bronze1man/goStrongswanVici v0.0.0-20190828090544-27d02f80ba40/go.mod"
+"github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod"
+"github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod"
+"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod"
+"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod"
+"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod"
+"github.com/caddyserver/caddy v1.0.3/go.mod"
+"github.com/canonical/go-dqlite v1.5.1"
+"github.com/canonical/go-dqlite v1.5.1/go.mod"
+"github.com/cenkalti/backoff v2.1.1+incompatible/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/cespare/xxhash v1.1.0"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5"
+"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod"
+"github.com/checkpoint-restore/go-criu/v5 v5.0.0"
+"github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod"
+"github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod"
+"github.com/cheggaaa/pb v1.0.29/go.mod"
+"github.com/chzyer/logex v1.1.10/go.mod"
+"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+"github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod"
+"github.com/cilium/ebpf v0.2.0/go.mod"
+"github.com/cilium/ebpf v0.4.0/go.mod"
+"github.com/cilium/ebpf v0.5.0"
+"github.com/cilium/ebpf v0.5.0/go.mod"
+"github.com/cilium/ebpf v0.6.2"
+"github.com/cilium/ebpf v0.6.2/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+"github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod"
+"github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod"
+"github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod"
+"github.com/containerd/aufs v1.0.0"
+"github.com/containerd/aufs v1.0.0/go.mod"
+"github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod"
+"github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod"
+"github.com/containerd/btrfs v1.0.0"
+"github.com/containerd/btrfs v1.0.0/go.mod"
+"github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod"
+"github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod"
+"github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod"
+"github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod"
+"github.com/containerd/cgroups v1.0.1"
+"github.com/containerd/cgroups v1.0.1/go.mod"
+"github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod"
+"github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod"
+"github.com/containerd/console v1.0.1/go.mod"
+"github.com/containerd/console v1.0.2"
+"github.com/containerd/console v1.0.2/go.mod"
+"github.com/containerd/containerd v1.2.10/go.mod"
+"github.com/containerd/containerd v1.3.0/go.mod"
+"github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod"
+"github.com/containerd/containerd v1.3.2/go.mod"
+"github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod"
+"github.com/containerd/containerd v1.4.1/go.mod"
+"github.com/containerd/containerd v1.4.3/go.mod"
+"github.com/containerd/containerd v1.5.0-beta.1/go.mod"
+"github.com/containerd/containerd v1.5.0-beta.3/go.mod"
+"github.com/containerd/containerd v1.5.0-beta.4/go.mod"
+"github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod"
+"github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod"
+"github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod"
+"github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod"
+"github.com/containerd/fifo v1.0.0"
+"github.com/containerd/fifo v1.0.0/go.mod"
+"github.com/containerd/fuse-overlayfs-snapshotter v1.0.2"
+"github.com/containerd/fuse-overlayfs-snapshotter v1.0.2/go.mod"
+"github.com/containerd/go-cni v1.0.1"
+"github.com/containerd/go-cni v1.0.1/go.mod"
+"github.com/containerd/go-cni v1.0.2"
+"github.com/containerd/go-cni v1.0.2/go.mod"
+"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+"github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod"
+"github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod"
+"github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod"
+"github.com/containerd/go-runc v1.0.0"
+"github.com/containerd/go-runc v1.0.0/go.mod"
+"github.com/containerd/imgcrypt v1.0.1/go.mod"
+"github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod"
+"github.com/containerd/imgcrypt v1.1.1"
+"github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887"
+"github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod"
+"github.com/containerd/imgcrypt v1.1.1/go.mod"
+"github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod"
+"github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod"
+"github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod"
+"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+"github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod"
+"github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod"
+"github.com/containerd/ttrpc v1.0.1/go.mod"
+"github.com/containerd/ttrpc v1.0.2"
+"github.com/containerd/ttrpc v1.0.2/go.mod"
+"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+"github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod"
+"github.com/containerd/typeurl v1.0.1/go.mod"
+"github.com/containerd/typeurl v1.0.2"
+"github.com/containerd/typeurl v1.0.2/go.mod"
+"github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod"
+"github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod"
+"github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod"
+"github.com/containerd/zfs v1.0.0"
+"github.com/containerd/zfs v1.0.0/go.mod"
+"github.com/containernetworking/cni v0.7.1/go.mod"
+"github.com/containernetworking/cni v0.8.0"
+"github.com/containernetworking/cni v0.8.0/go.mod"
+"github.com/containernetworking/plugins v0.8.6"
+"github.com/containernetworking/plugins v0.8.6/go.mod"
+"github.com/containers/ocicrypt v1.0.1/go.mod"
+"github.com/containers/ocicrypt v1.1.0"
+"github.com/containers/ocicrypt v1.1.0/go.mod"
+"github.com/containers/ocicrypt v1.1.1"
+"github.com/containers/ocicrypt v1.1.1/go.mod"
+"github.com/container-storage-interface/spec v1.3.0"
+"github.com/container-storage-interface/spec v1.3.0/go.mod"
+"github.com/coredns/corefile-migration v1.0.11/go.mod"
+"github.com/coreos/bbolt v1.3.2/go.mod"
+"github.com/coreos/etcd v3.1.11+incompatible/go.mod"
+"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
+"github.com/coreos/go-iptables v0.4.5"
+"github.com/coreos/go-iptables v0.4.5/go.mod"
+"github.com/coreos/go-oidc v2.1.0+incompatible"
+"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+"github.com/coreos/go-semver v0.2.0/go.mod"
+"github.com/coreos/go-semver v0.3.0"
+"github.com/coreos/go-semver v0.3.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
+"github.com/coreos/go-systemd/v22 v22.1.0/go.mod"
+"github.com/coreos/go-systemd/v22 v22.3.1"
+"github.com/coreos/go-systemd/v22 v22.3.1/go.mod"
+"github.com/coreos/go-systemd/v22 v22.3.2"
+"github.com/coreos/go-systemd/v22 v22.3.2/go.mod"
+"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+"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/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+"github.com/creack/pty v1.1.7/go.mod"
+"github.com/creack/pty v1.1.9/go.mod"
+"github.com/creack/pty v1.1.11"
+"github.com/creack/pty v1.1.11/go.mod"
+"github.com/cyphar/filepath-securejoin v0.2.2"
+"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
+"github.com/d2g/dhcp4client v1.0.0/go.mod"
+"github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod"
+"github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod"
+"github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod"
+"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd"
+"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20170629053852-f6cab0c35083/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod"
+"github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/dnaeon/go-vcr v1.0.1"
+"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+"github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017"
+"github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod"
+"github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod"
+"github.com/docker/distribution v2.7.1+incompatible"
+"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+"github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod"
+"github.com/docker/docker v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible"
+"github.com/docker/docker v17.12.0-ce-rc1.0.20200310163718-4634ce647cf2+incompatible/go.mod"
+"github.com/docker/docker v20.10.2+incompatible"
+"github.com/docker/docker v20.10.2+incompatible/go.mod"
+"github.com/docker/docker-credential-helpers v0.6.3"
+"github.com/docker/docker-credential-helpers v0.6.3/go.mod"
+"github.com/docker/go-connections v0.4.0"
+"github.com/docker/go-connections v0.4.0/go.mod"
+"github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod"
+"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c"
+"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod"
+"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod"
+"github.com/docker/go-metrics v0.0.1"
+"github.com/docker/go-metrics v0.0.1/go.mod"
+"github.com/docker/go-units v0.3.3/go.mod"
+"github.com/docker/go-units v0.4.0"
+"github.com/docker/go-units v0.4.0/go.mod"
+"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod"
+"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
+"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
+"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+"github.com/dustin/go-humanize v1.0.0"
+"github.com/dustin/go-humanize v1.0.0/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
+"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+"github.com/emicklei/go-restful v2.9.5+incompatible"
+"github.com/emicklei/go-restful v2.9.5+incompatible/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83"
+"github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83/go.mod"
+"github.com/euank/go-kmsg-parser v2.0.0+incompatible"
+"github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod"
+"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+"github.com/evanphx/json-patch v4.5.0+incompatible/go.mod"
+"github.com/evanphx/json-patch v4.9.0+incompatible"
+"github.com/evanphx/json-patch v4.9.0+incompatible/go.mod"
+"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d"
+"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod"
+"github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod"
+"github.com/fatih/camelcase v1.0.0"
+"github.com/fatih/camelcase v1.0.0/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/flannel-io/flannel v0.14.0"
+"github.com/flannel-io/flannel v0.14.0/go.mod"
+"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+"github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod"
+"github.com/form3tech-oss/jwt-go v3.2.2+incompatible"
+"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+"github.com/frankban/quicktest v1.11.3"
+"github.com/frankban/quicktest v1.11.3/go.mod"
+"github.com/frankban/quicktest v1.12.1"
+"github.com/frankban/quicktest v1.12.1/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/fsnotify/fsnotify v1.4.9"
+"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+"github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod"
+"github.com/fvbommel/sortorder v1.0.1"
+"github.com/fvbommel/sortorder v1.0.1/go.mod"
+"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod"
+"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+"github.com/ghodss/yaml v1.0.0"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod"
+"github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod"
+"github.com/gobuffalo/here v0.6.0/go.mod"
+"github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod"
+"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c"
+"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod"
+"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+"github.com/godbus/dbus/v5 v5.0.4"
+"github.com/godbus/dbus/v5 v5.0.4/go.mod"
+"github.com/gofrs/flock v0.8.0"
+"github.com/gofrs/flock v0.8.0/go.mod"
+"github.com/gogo/googleapis v1.2.0/go.mod"
+"github.com/gogo/googleapis v1.4.0"
+"github.com/gogo/googleapis v1.4.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/gogo/protobuf v1.3.0/go.mod"
+"github.com/gogo/protobuf v1.3.1/go.mod"
+"github.com/gogo/protobuf v1.3.2"
+"github.com/gogo/protobuf v1.3.2/go.mod"
+"github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod"
+"github.com/golangplus/fmt v1.0.0/go.mod"
+"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod"
+"github.com/golangplus/testing v1.0.0"
+"github.com/golangplus/testing v1.0.0/go.mod"
+"github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
+"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/mock v1.3.1/go.mod"
+"github.com/golang/mock v1.4.0/go.mod"
+"github.com/golang/mock v1.4.1/go.mod"
+"github.com/golang/mock v1.4.3/go.mod"
+"github.com/golang/mock v1.4.4"
+"github.com/golang/mock v1.4.4/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/protobuf v1.3.5"
+"github.com/golang/protobuf v1.3.5/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+"github.com/golang/protobuf v1.4.0/go.mod"
+"github.com/golang/protobuf v1.4.1/go.mod"
+"github.com/golang/protobuf v1.4.3"
+"github.com/golang/protobuf v1.4.3/go.mod"
+"github.com/golang/snappy v0.0.3"
+"github.com/golang/snappy v0.0.3/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod"
+"github.com/googleapis/gnostic v0.2.0/go.mod"
+"github.com/googleapis/gnostic v0.3.1/go.mod"
+"github.com/googleapis/gnostic v0.4.1"
+"github.com/googleapis/gnostic v0.4.1/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/cadvisor v0.39.0"
+"github.com/google/cadvisor v0.39.0/go.mod"
+"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/gofuzz v1.1.0"
+"github.com/google/gofuzz v1.1.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.0/go.mod"
+"github.com/google/go-cmp v0.5.1/go.mod"
+"github.com/google/go-cmp v0.5.2/go.mod"
+"github.com/google/go-cmp v0.5.4"
+"github.com/google/go-cmp v0.5.4/go.mod"
+"github.com/google/go-cmp v0.5.5"
+"github.com/google/go-cmp v0.5.5/go.mod"
+"github.com/google/go-containerregistry v0.0.0-20190617215043-876b8855d23c/go.mod"
+"github.com/google/go-containerregistry v0.5.0"
+"github.com/google/go-containerregistry v0.5.0/go.mod"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+"github.com/google/renameio v0.1.0/go.mod"
+"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
+"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
+"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
+"github.com/google/uuid v1.0.0/go.mod"
+"github.com/google/uuid v1.1.1/go.mod"
+"github.com/google/uuid v1.1.2/go.mod"
+"github.com/google/uuid v1.2.0"
+"github.com/google/uuid v1.2.0/go.mod"
+"github.com/gophercloud/gophercloud v0.1.0"
+"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod"
+"github.com/gorilla/mux v1.7.2/go.mod"
+"github.com/gorilla/mux v1.7.3/go.mod"
+"github.com/gorilla/mux v1.8.0"
+"github.com/gorilla/mux v1.8.0/go.mod"
+"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/gorilla/websocket v1.4.2"
+"github.com/gorilla/websocket v1.4.2/go.mod"
+"github.com/go-acme/lego v2.5.0+incompatible/go.mod"
+"github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod"
+"github.com/go-bindata/go-bindata v3.1.2+incompatible"
+"github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod"
+"github.com/go-errors/errors v1.0.1"
+"github.com/go-errors/errors v1.0.1/go.mod"
+"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+"github.com/go-ini/ini v1.25.4/go.mod"
+"github.com/go-ini/ini v1.28.1/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logr/logr v0.1.0/go.mod"
+"github.com/go-logr/logr v0.2.0"
+"github.com/go-logr/logr v0.2.0/go.mod"
+"github.com/go-logr/logr v0.4.0"
+"github.com/go-logr/logr v0.4.0/go.mod"
+"github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod"
+"github.com/go-openapi/analysis v0.17.0/go.mod"
+"github.com/go-openapi/analysis v0.18.0/go.mod"
+"github.com/go-openapi/analysis v0.19.2/go.mod"
+"github.com/go-openapi/analysis v0.19.5/go.mod"
+"github.com/go-openapi/errors v0.17.0/go.mod"
+"github.com/go-openapi/errors v0.18.0/go.mod"
+"github.com/go-openapi/errors v0.19.2/go.mod"
+"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+"github.com/go-openapi/jsonpointer v0.17.0/go.mod"
+"github.com/go-openapi/jsonpointer v0.18.0/go.mod"
+"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
+"github.com/go-openapi/jsonpointer v0.19.3"
+"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
+"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+"github.com/go-openapi/jsonreference v0.17.0/go.mod"
+"github.com/go-openapi/jsonreference v0.18.0/go.mod"
+"github.com/go-openapi/jsonreference v0.19.2/go.mod"
+"github.com/go-openapi/jsonreference v0.19.3"
+"github.com/go-openapi/jsonreference v0.19.3/go.mod"
+"github.com/go-openapi/loads v0.17.0/go.mod"
+"github.com/go-openapi/loads v0.18.0/go.mod"
+"github.com/go-openapi/loads v0.19.0/go.mod"
+"github.com/go-openapi/loads v0.19.2/go.mod"
+"github.com/go-openapi/loads v0.19.4/go.mod"
+"github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod"
+"github.com/go-openapi/runtime v0.19.0/go.mod"
+"github.com/go-openapi/runtime v0.19.4/go.mod"
+"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+"github.com/go-openapi/spec v0.17.0/go.mod"
+"github.com/go-openapi/spec v0.18.0/go.mod"
+"github.com/go-openapi/spec v0.19.2/go.mod"
+"github.com/go-openapi/spec v0.19.3/go.mod"
+"github.com/go-openapi/spec v0.19.5"
+"github.com/go-openapi/spec v0.19.5/go.mod"
+"github.com/go-openapi/strfmt v0.17.0/go.mod"
+"github.com/go-openapi/strfmt v0.18.0/go.mod"
+"github.com/go-openapi/strfmt v0.19.0/go.mod"
+"github.com/go-openapi/strfmt v0.19.3/go.mod"
+"github.com/go-openapi/strfmt v0.19.5/go.mod"
+"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+"github.com/go-openapi/swag v0.17.0/go.mod"
+"github.com/go-openapi/swag v0.18.0/go.mod"
+"github.com/go-openapi/swag v0.19.2/go.mod"
+"github.com/go-openapi/swag v0.19.5"
+"github.com/go-openapi/swag v0.19.5/go.mod"
+"github.com/go-openapi/validate v0.18.0/go.mod"
+"github.com/go-openapi/validate v0.19.2/go.mod"
+"github.com/go-openapi/validate v0.19.8/go.mod"
+"github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod"
+"github.com/go-sql-driver/mysql v1.4.1"
+"github.com/go-sql-driver/mysql v1.4.1/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+"github.com/hashicorp/consul/api v1.1.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+"github.com/hashicorp/errwrap v1.0.0"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.3"
+"github.com/hashicorp/golang-lru v0.5.3/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go.net v0.0.1/go.mod"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.0/go.mod"
+"github.com/hashicorp/memberlist v0.1.3/go.mod"
+"github.com/hashicorp/serf v0.8.2/go.mod"
+"github.com/heketi/heketi v10.2.0+incompatible/go.mod"
+"github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod"
+"github.com/hpcloud/tail v1.0.0"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod"
+"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+"github.com/imdario/mergo v0.3.5/go.mod"
+"github.com/imdario/mergo v0.3.7/go.mod"
+"github.com/imdario/mergo v0.3.8/go.mod"
+"github.com/imdario/mergo v0.3.10/go.mod"
+"github.com/imdario/mergo v0.3.11"
+"github.com/imdario/mergo v0.3.11/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/insomniacslk/dhcp v0.0.0-20210120172423-cc9239ac6294/go.mod"
+"github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5/go.mod"
+"github.com/jamescun/tuntap v0.0.0-20190712092105-cb1fb277045c/go.mod"
+"github.com/jetstack/cert-manager v0.7.2/go.mod"
+"github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod"
+"github.com/jmespath/go-jmespath v0.4.0"
+"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
+"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+"github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod"
+"github.com/joho/godotenv v0.0.0-20161216230537-726cc8b906e3/go.mod"
+"github.com/jonboulle/clockwork v0.1.0"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod"
+"github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod"
+"github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod"
+"github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod"
+"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.10"
+"github.com/json-iterator/go v1.1.10/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+"github.com/jtolds/gls v4.20.0+incompatible"
+"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod"
+"github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod"
+"github.com/k3s-io/containerd v1.4.9-k3s1"
+"github.com/k3s-io/containerd v1.4.9-k3s1/go.mod"
+"github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1"
+"github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1/go.mod"
+"github.com/k3s-io/cri v1.4.0-k3s.7"
+"github.com/k3s-io/cri v1.4.0-k3s.7/go.mod"
+"github.com/k3s-io/cri-tools v1.21.0-k3s1"
+"github.com/k3s-io/cri-tools v1.21.0-k3s1/go.mod"
+"github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea"
+"github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea/go.mod"
+"github.com/k3s-io/helm-controller v0.10.5"
+"github.com/k3s-io/helm-controller v0.10.5/go.mod"
+"github.com/k3s-io/kine v0.6.2"
+"github.com/k3s-io/kine v0.6.2/go.mod"
+"github.com/k3s-io/kubernetes v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.5-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.21.5-k3s1/go.mod"
+"github.com/k3s-io/protobuf v1.4.3-k3s1"
+"github.com/k3s-io/protobuf v1.4.3-k3s1/go.mod"
+"github.com/karrick/godirwalk v1.16.1"
+"github.com/karrick/godirwalk v1.16.1/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/errcheck v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.5.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/klauspost/compress v1.11.3/go.mod"
+"github.com/klauspost/compress v1.12.2"
+"github.com/klauspost/compress v1.12.2/go.mod"
+"github.com/klauspost/cpuid v1.2.0/go.mod"
+"github.com/klauspost/cpuid v1.2.3/go.mod"
+"github.com/klauspost/cpuid v1.3.1"
+"github.com/klauspost/cpuid v1.3.1/go.mod"
+"github.com/knative/build v0.6.0/go.mod"
+"github.com/knative/pkg v0.0.0-20190514205332-5e4512dcb2ca/go.mod"
+"github.com/knative/serving v0.6.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pretty v0.2.1"
+"github.com/kr/pretty v0.2.1/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/pty v1.1.5/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/kr/text v0.2.0"
+"github.com/kr/text v0.2.0/go.mod"
+"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+"github.com/libopenstorage/openstorage v1.0.0/go.mod"
+"github.com/lib/pq v1.8.0"
+"github.com/lib/pq v1.8.0/go.mod"
+"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de"
+"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod"
+"github.com/lithammer/dedent v1.1.0"
+"github.com/lithammer/dedent v1.1.0/go.mod"
+"github.com/lpabon/godbc v0.1.1/go.mod"
+"github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod"
+"github.com/lucas-clemente/quic-clients v0.1.0/go.mod"
+"github.com/lucas-clemente/quic-go v0.10.2/go.mod"
+"github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod"
+"github.com/magiconair/properties v1.8.0/go.mod"
+"github.com/magiconair/properties v1.8.1/go.mod"
+"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
+"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+"github.com/mailru/easyjson v0.7.0"
+"github.com/mailru/easyjson v0.7.0/go.mod"
+"github.com/markbates/pkger v0.17.1/go.mod"
+"github.com/marstr/guid v1.1.0/go.mod"
+"github.com/marten-seemann/qtls v0.2.3/go.mod"
+"github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.4/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-runewidth v0.0.2/go.mod"
+"github.com/mattn/go-runewidth v0.0.4/go.mod"
+"github.com/mattn/go-runewidth v0.0.7/go.mod"
+"github.com/mattn/go-shellwords v1.0.3/go.mod"
+"github.com/mattn/go-sqlite3 v1.14.4"
+"github.com/mattn/go-sqlite3 v1.14.4/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
+"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
+"github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod"
+"github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod"
+"github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod"
+"github.com/mdlayher/netlink v1.0.0/go.mod"
+"github.com/mdlayher/netlink v1.1.0/go.mod"
+"github.com/mdlayher/netlink v1.1.1/go.mod"
+"github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod"
+"github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod"
+"github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/dns v1.1.3/go.mod"
+"github.com/miekg/dns v1.1.35"
+"github.com/miekg/dns v1.1.35/go.mod"
+"github.com/miekg/pkcs11 v1.0.3"
+"github.com/miekg/pkcs11 v1.0.3/go.mod"
+"github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989"
+"github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989/go.mod"
+"github.com/minio/md5-simd v1.1.0"
+"github.com/minio/md5-simd v1.1.0/go.mod"
+"github.com/minio/minio-go/v7 v7.0.7"
+"github.com/minio/minio-go/v7 v7.0.7/go.mod"
+"github.com/minio/sha256-simd v0.1.1"
+"github.com/minio/sha256-simd v0.1.1/go.mod"
+"github.com/minio/sio v0.2.1/go.mod"
+"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible"
+"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/gox v0.4.0/go.mod"
+"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/go-wordwrap v1.0.0"
+"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+"github.com/mitchellh/iochan v1.0.0/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod"
+"github.com/moby/ipvs v1.0.1"
+"github.com/moby/ipvs v1.0.1/go.mod"
+"github.com/moby/spdystream v0.2.0"
+"github.com/moby/spdystream v0.2.0/go.mod"
+"github.com/moby/sys/mountinfo v0.4.0/go.mod"
+"github.com/moby/sys/mountinfo v0.4.1"
+"github.com/moby/sys/mountinfo v0.4.1/go.mod"
+"github.com/moby/sys/symlink v0.1.0"
+"github.com/moby/sys/symlink v0.1.0/go.mod"
+"github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod"
+"github.com/moby/term v0.0.0-20201216013528-df9cb8a40635"
+"github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod"
+"github.com/moby/vpnkit v0.5.0/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod"
+"github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00"
+"github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod"
+"github.com/morikuni/aec v1.0.0"
+"github.com/morikuni/aec v1.0.0/go.mod"
+"github.com/mrunalp/fileutils v0.5.0"
+"github.com/mrunalp/fileutils v0.5.0/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822"
+"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod"
+"github.com/mvdan/xurls v1.1.0/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+"github.com/naoina/go-stringutil v0.1.0/go.mod"
+"github.com/naoina/toml v0.1.1/go.mod"
+"github.com/natefinch/lumberjack v2.0.0+incompatible"
+"github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod"
+"github.com/ncw/swift v1.0.47/go.mod"
+"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+"github.com/nxadm/tail v1.4.4/go.mod"
+"github.com/nxadm/tail v1.4.8"
+"github.com/nxadm/tail v1.4.8/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+"github.com/olekukonko/tablewriter v0.0.4/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.8.0/go.mod"
+"github.com/onsi/ginkgo v1.10.3/go.mod"
+"github.com/onsi/ginkgo v1.11.0"
+"github.com/onsi/ginkgo v1.11.0/go.mod"
+"github.com/onsi/ginkgo v1.12.0/go.mod"
+"github.com/onsi/ginkgo v1.12.1/go.mod"
+"github.com/onsi/ginkgo v1.16.1"
+"github.com/onsi/ginkgo v1.16.1/go.mod"
+"github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod"
+"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+"github.com/onsi/gomega v1.5.0/go.mod"
+"github.com/onsi/gomega v1.7.0/go.mod"
+"github.com/onsi/gomega v1.7.1"
+"github.com/onsi/gomega v1.7.1/go.mod"
+"github.com/onsi/gomega v1.9.0/go.mod"
+"github.com/onsi/gomega v1.10.1/go.mod"
+"github.com/onsi/gomega v1.11.0"
+"github.com/onsi/gomega v1.11.0/go.mod"
+"github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod"
+"github.com/opencontainers/go-digest v1.0.0"
+"github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod"
+"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+"github.com/opencontainers/go-digest v1.0.0/go.mod"
+"github.com/opencontainers/image-spec v1.0.0/go.mod"
+"github.com/opencontainers/image-spec v1.0.1"
+"github.com/opencontainers/image-spec v1.0.1/go.mod"
+"github.com/opencontainers/runc v1.0.0-rc94"
+"github.com/opencontainers/runc v1.0.0-rc94/go.mod"
+"github.com/opencontainers/runc v1.0.2"
+"github.com/opencontainers/runc v1.0.2/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.1/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.2/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20210316141917-a8c4a9ee0f6b"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20210316141917-a8c4a9ee0f6b/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod"
+"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+"github.com/opencontainers/selinux v1.6.0/go.mod"
+"github.com/opencontainers/selinux v1.8.0"
+"github.com/opencontainers/selinux v1.8.0/go.mod"
+"github.com/opencontainers/selinux v1.8.2"
+"github.com/opencontainers/selinux v1.8.2/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pborman/uuid v1.2.0/go.mod"
+"github.com/pborman/uuid v1.2.1/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/peterbourgon/diskv v2.0.1+incompatible"
+"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.6.0+incompatible"
+"github.com/pierrec/lz4 v2.6.0+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pkg/errors v0.9.1"
+"github.com/pkg/errors v0.9.1/go.mod"
+"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021"
+"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
+"github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.1.0/go.mod"
+"github.com/prometheus/client_golang v1.7.1"
+"github.com/prometheus/client_golang v1.7.1/go.mod"
+"github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.6.0/go.mod"
+"github.com/prometheus/common v0.10.0"
+"github.com/prometheus/common v0.10.0/go.mod"
+"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.3/go.mod"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/prometheus/procfs v0.1.3/go.mod"
+"github.com/prometheus/procfs v0.2.0"
+"github.com/prometheus/procfs v0.2.0/go.mod"
+"github.com/prometheus/procfs v0.6.0"
+"github.com/prometheus/procfs v0.6.0/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/quobyte/api v0.1.8/go.mod"
+"github.com/rancher/dynamiclistener v0.2.3"
+"github.com/rancher/dynamiclistener v0.2.3/go.mod"
+"github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009/go.mod"
+"github.com/rancher/remotedialer v0.2.0"
+"github.com/rancher/remotedialer v0.2.0/go.mod"
+"github.com/rancher/wharfie v0.3.4"
+"github.com/rancher/wharfie v0.3.4/go.mod"
+"github.com/rancher/wrangler v0.1.4/go.mod"
+"github.com/rancher/wrangler v0.4.0/go.mod"
+"github.com/rancher/wrangler v0.6.0/go.mod"
+"github.com/rancher/wrangler v0.6.1/go.mod"
+"github.com/rancher/wrangler v0.6.2"
+"github.com/rancher/wrangler v0.6.2/go.mod"
+"github.com/rancher/wrangler-api v0.2.0/go.mod"
+"github.com/rancher/wrangler-api v0.6.0"
+"github.com/rancher/wrangler-api v0.6.0/go.mod"
+"github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod"
+"github.com/robfig/cron v1.1.0"
+"github.com/robfig/cron v1.1.0/go.mod"
+"github.com/robfig/cron/v3 v3.0.1"
+"github.com/robfig/cron/v3 v3.0.1/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+"github.com/rootless-containers/rootlesskit v0.14.0"
+"github.com/rootless-containers/rootlesskit v0.14.0/go.mod"
+"github.com/rs/xid v1.2.1"
+"github.com/rs/xid v1.2.1/go.mod"
+"github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021"
+"github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021/go.mod"
+"github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod"
+"github.com/russross/blackfriday v1.5.2"
+"github.com/russross/blackfriday v1.5.2/go.mod"
+"github.com/russross/blackfriday/v2 v2.0.1"
+"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+"github.com/russross/blackfriday/v2 v2.1.0"
+"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod"
+"github.com/satori/go.uuid v1.2.0"
+"github.com/satori/go.uuid v1.2.0/go.mod"
+"github.com/sclevine/spec v1.2.0/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/seccomp/libseccomp-golang v0.9.1"
+"github.com/seccomp/libseccomp-golang v0.9.1/go.mod"
+"github.com/sergi/go-diff v1.0.0/go.mod"
+"github.com/sergi/go-diff v1.1.0"
+"github.com/sergi/go-diff v1.1.0/go.mod"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+"github.com/sirupsen/logrus v1.0.6/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.1/go.mod"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/sirupsen/logrus v1.6.0/go.mod"
+"github.com/sirupsen/logrus v1.7.0"
+"github.com/sirupsen/logrus v1.7.0/go.mod"
+"github.com/sirupsen/logrus v1.8.1"
+"github.com/sirupsen/logrus v1.8.1/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+"github.com/smartystreets/goconvey v1.6.4"
+"github.com/smartystreets/goconvey v1.6.4/go.mod"
+"github.com/soheilhy/cmux v0.1.4"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/afero v1.2.2"
+"github.com/spf13/afero v1.2.2/go.mod"
+"github.com/spf13/cast v1.3.0/go.mod"
+"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+"github.com/spf13/cobra v0.0.3/go.mod"
+"github.com/spf13/cobra v1.0.0/go.mod"
+"github.com/spf13/cobra v1.1.1"
+"github.com/spf13/cobra v1.1.1/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
+"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+"github.com/spf13/pflag v1.0.1/go.mod"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/pflag v1.0.5"
+"github.com/spf13/pflag v1.0.5/go.mod"
+"github.com/spf13/viper v1.4.0/go.mod"
+"github.com/spf13/viper v1.7.0/go.mod"
+"github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980"
+"github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod"
+"github.com/storageos/go-api v2.2.0+incompatible/go.mod"
+"github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/objx v0.2.0"
+"github.com/stretchr/objx v0.2.0/go.mod"
+"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+"github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod"
+"github.com/stretchr/testify v1.2.2"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/stretchr/testify v1.5.1/go.mod"
+"github.com/stretchr/testify v1.6.1"
+"github.com/stretchr/testify v1.6.1/go.mod"
+"github.com/stretchr/testify v1.7.0"
+"github.com/stretchr/testify v1.7.0/go.mod"
+"github.com/subosito/gotenv v1.2.0/go.mod"
+"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
+"github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod"
+"github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635"
+"github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod"
+"github.com/tchap/go-patricia v2.2.6+incompatible"
+"github.com/tchap/go-patricia v2.2.6+incompatible/go.mod"
+"github.com/tchap/go-patricia v2.3.0+incompatible"
+"github.com/tchap/go-patricia v2.3.0+incompatible/go.mod"
+"github.com/tektoncd/pipeline v0.4.0/go.mod"
+"github.com/tencentcloud/tencentcloud-sdk-go v1.0.67/go.mod"
+"github.com/thecodeteam/goscaleio v0.1.0/go.mod"
+"github.com/tidwall/pretty v1.0.0/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/ugorji/go v0.0.0-20170107133203-ded73eae5db7/go.mod"
+"github.com/ugorji/go v1.1.4/go.mod"
+"github.com/urfave/cli v1.20.0/go.mod"
+"github.com/urfave/cli v1.21.0/go.mod"
+"github.com/urfave/cli v1.22.1"
+"github.com/urfave/cli v1.22.1/go.mod"
+"github.com/urfave/cli v1.22.2"
+"github.com/urfave/cli v1.22.2/go.mod"
+"github.com/urfave/cli/v2 v2.3.0"
+"github.com/urfave/cli/v2 v2.3.0/go.mod"
+"github.com/urfave/negroni v1.0.0/go.mod"
+"github.com/u-root/u-root v7.0.0+incompatible/go.mod"
+"github.com/vektah/gqlparser v1.1.2/go.mod"
+"github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod"
+"github.com/vishvananda/netlink v1.1.0"
+"github.com/vishvananda/netlink v1.1.0/go.mod"
+"github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod"
+"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df"
+"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod"
+"github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae"
+"github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod"
+"github.com/vmware/govmomi v0.20.3"
+"github.com/vmware/govmomi v0.20.3/go.mod"
+"github.com/willf/bitset v1.1.11"
+"github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod"
+"github.com/willf/bitset v1.1.11/go.mod"
+"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca"
+"github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod"
+"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"github.com/yuin/goldmark v1.2.1/go.mod"
+"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod"
+"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod"
+"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de"
+"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod"
+"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83"
+"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+"golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod"
+"golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod"
+"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+"golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod"
+"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+"golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod"
+"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+"golang.org/x/exp v0.0.0-20210220032938-85be41e4509f"
+"golang.org/x/exp v0.0.0-20210220032938-85be41e4509f/go.mod"
+"golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod"
+"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+"golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod"
+"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+"golang.org/x/mod v0.1.0/go.mod"
+"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+"golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/mod v0.3.0/go.mod"
+"golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449"
+"golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+"golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+"golang.org/x/net v0.0.0-20201224014010-6772e930b67b"
+"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
+"golang.org/x/net v0.0.0-20210224082022-3d97a244fca7"
+"golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6"
+"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a"
+"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod"
+"golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod"
+"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+"golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod"
+"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
+"golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod"
+"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod"
+"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+"golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod"
+"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+"golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+"golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod"
+"golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod"
+"golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod"
+"golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod"
+"golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod"
+"golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod"
+"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+"golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+"golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod"
+"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c"
+"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+"golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073"
+"golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod"
+"golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod"
+"golang.org/x/sys v0.0.0-20210426230700-d19ff857e887"
+"golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod"
+"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d"
+"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
+"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/text v0.3.4"
+"golang.org/x/text v0.3.4/go.mod"
+"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
+"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+"golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba"
+"golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod"
+"golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+"golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod"
+"golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod"
+"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
+"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+"golang.org/x/tools v0.0.0-20190706070813-72ffa07ba3db/go.mod"
+"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+"golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod"
+"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+"golang.org/x/tools v0.0.0-20191017205301-920acffc3e65/go.mod"
+"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
+"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
+"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+"golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod"
+"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+"golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod"
+"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+"golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod"
+"golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod"
+"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
+"golang.org/x/tools v0.1.0"
+"golang.org/x/tools v0.1.0/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"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+"gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod"
+"gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod"
+"gonum.org/v1/gonum v0.6.2"
+"gonum.org/v1/gonum v0.6.2/go.mod"
+"gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod"
+"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e"
+"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod"
+"gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod"
+"google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod"
+"google.golang.org/api v0.4.0/go.mod"
+"google.golang.org/api v0.7.0/go.mod"
+"google.golang.org/api v0.8.0/go.mod"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/api v0.13.0/go.mod"
+"google.golang.org/api v0.14.0/go.mod"
+"google.golang.org/api v0.15.0/go.mod"
+"google.golang.org/api v0.15.1-0.20200106000736-b8fc810ca6b5/go.mod"
+"google.golang.org/api v0.17.0/go.mod"
+"google.golang.org/api v0.18.0/go.mod"
+"google.golang.org/api v0.20.0/go.mod"
+"google.golang.org/api v0.22.0"
+"google.golang.org/api v0.22.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.1/go.mod"
+"google.golang.org/appengine v1.6.5"
+"google.golang.org/appengine v1.6.5/go.mod"
+"google.golang.org/appengine v1.6.6"
+"google.golang.org/appengine v1.6.6/go.mod"
+"google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63"
+"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+"google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884"
+"google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod"
+"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+"google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.1/go.mod"
+"google.golang.org/grpc v1.21.0/go.mod"
+"google.golang.org/grpc v1.21.1/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.23.1/go.mod"
+"google.golang.org/grpc v1.24.0/go.mod"
+"google.golang.org/grpc v1.25.1/go.mod"
+"google.golang.org/grpc v1.26.0/go.mod"
+"google.golang.org/grpc v1.27.0/go.mod"
+"google.golang.org/grpc v1.27.1"
+"google.golang.org/grpc v1.27.1/go.mod"
+"google.golang.org/grpc v1.30.0/go.mod"
+"google.golang.org/grpc v1.33.2"
+"google.golang.org/grpc v1.33.2/go.mod"
+"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+"google.golang.org/protobuf v1.21.0/go.mod"
+"google.golang.org/protobuf v1.22.0/go.mod"
+"google.golang.org/protobuf v1.23.0/go.mod"
+"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+"google.golang.org/protobuf v1.24.0/go.mod"
+"google.golang.org/protobuf v1.25.0"
+"google.golang.org/protobuf v1.25.0/go.mod"
+"google.golang.org/protobuf v1.26.0"
+"google.golang.org/protobuf v1.26.0/go.mod"
+"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+"gopkg.in/errgo.v2 v2.1.0/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gcfg.v1 v1.2.0"
+"gopkg.in/gcfg.v1 v1.2.0/go.mod"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+"gopkg.in/inf.v0 v0.9.1"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/ini.v1 v1.51.0/go.mod"
+"gopkg.in/ini.v1 v1.57.0"
+"gopkg.in/ini.v1 v1.57.0/go.mod"
+"gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod"
+"gopkg.in/natefinch/lumberjack.v2 v2.0.0"
+"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.2.2"
+"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
+"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+"gopkg.in/square/go-jose.v2 v2.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/warnings.v0 v0.1.1"
+"gopkg.in/warnings.v0 v0.1.1/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.3/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.7/go.mod"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"gopkg.in/yaml.v2 v2.3.0/go.mod"
+"gopkg.in/yaml.v2 v2.4.0"
+"gopkg.in/yaml.v2 v2.4.0/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+"gotest.tools v2.2.0+incompatible"
+"gotest.tools v2.2.0+incompatible/go.mod"
+"gotest.tools/v3 v3.0.2/go.mod"
+"gotest.tools/v3 v3.0.3"
+"gotest.tools/v3 v3.0.3/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.etcd.io/bbolt v1.3.3/go.mod"
+"go.etcd.io/bbolt v1.3.5"
+"go.etcd.io/bbolt v1.3.5/go.mod"
+"go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod"
+"go.mongodb.org/mongo-driver v1.0.3/go.mod"
+"go.mongodb.org/mongo-driver v1.1.1/go.mod"
+"go.mongodb.org/mongo-driver v1.1.2/go.mod"
+"go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1"
+"go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0/go.mod"
+"go.opencensus.io v0.22.2/go.mod"
+"go.opencensus.io v0.22.3"
+"go.opencensus.io v0.22.3/go.mod"
+"go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5"
+"go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod"
+"go.uber.org/atomic v1.3.2/go.mod"
+"go.uber.org/atomic v1.4.0"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/multierr v1.1.0"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/zap v1.10.0"
+"go.uber.org/zap v1.10.0/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+"k8s.io/apimachinery v0.19.10"
+"k8s.io/apimachinery v0.19.10/go.mod"
+"k8s.io/apiserver v0.19.10"
+"k8s.io/apiserver v0.19.10/go.mod"
+"k8s.io/api v0.19.10"
+"k8s.io/api v0.19.10/go.mod"
+"k8s.io/client-go v0.19.10"
+"k8s.io/client-go v0.19.10/go.mod"
+"k8s.io/component-base v0.19.10/go.mod"
+"k8s.io/cri-api v0.19.10"
+"k8s.io/cri-api v0.19.10/go.mod"
+"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+"k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a/go.mod"
+"k8s.io/gengo v0.0.0-20191120174120-e74f70b9b27e/go.mod"
+"k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod"
+"k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod"
+"k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod"
+"k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027"
+"k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod"
+"k8s.io/heapster v1.2.0-beta.1"
+"k8s.io/heapster v1.2.0-beta.1/go.mod"
+"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+"k8s.io/klog v0.3.0/go.mod"
+"k8s.io/klog v1.0.0"
+"k8s.io/klog v1.0.0/go.mod"
+"k8s.io/klog/v2 v2.0.0/go.mod"
+"k8s.io/klog/v2 v2.2.0/go.mod"
+"k8s.io/klog/v2 v2.4.0"
+"k8s.io/klog/v2 v2.4.0/go.mod"
+"k8s.io/klog/v2 v2.8.0"
+"k8s.io/klog/v2 v2.8.0/go.mod"
+"k8s.io/kube-openapi v0.0.0-20190502190224-411b2483e503/go.mod"
+"k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod"
+"k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7"
+"k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod"
+"k8s.io/system-validators v1.4.0/go.mod"
+"k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod"
+"k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod"
+"k8s.io/utils v0.0.0-20201110183641-67b214c5f920"
+"k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod"
+"modernc.org/cc v1.0.0/go.mod"
+"modernc.org/golex v1.0.0/go.mod"
+"modernc.org/mathutil v1.0.0/go.mod"
+"modernc.org/strutil v1.0.0/go.mod"
+"modernc.org/xc v1.0.0/go.mod"
+"rsc.io/binaryregexp v0.2.0/go.mod"
+"rsc.io/pdf v0.1.1/go.mod"
+"rsc.io/quote/v3 v3.1.0/go.mod"
+"rsc.io/sampler v1.3.0/go.mod"
+"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod"
+"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22"
+"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod"
+"sigs.k8s.io/kustomize/api v0.8.8"
+"sigs.k8s.io/kustomize/api v0.8.8/go.mod"
+"sigs.k8s.io/kustomize/cmd/config v0.9.10/go.mod"
+"sigs.k8s.io/kustomize/kustomize/v4 v4.1.2"
+"sigs.k8s.io/kustomize/kustomize/v4 v4.1.2/go.mod"
+"sigs.k8s.io/kustomize/kyaml v0.10.17"
+"sigs.k8s.io/kustomize/kyaml v0.10.17/go.mod"
+"sigs.k8s.io/structured-merge-diff v0.0.0-20190426204423-ea680f03cc65"
+"sigs.k8s.io/structured-merge-diff v0.0.0-20190426204423-ea680f03cc65/go.mod"
+"sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod"
+"sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod"
+"sigs.k8s.io/structured-merge-diff/v4 v4.0.3"
+"sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod"
+"sigs.k8s.io/structured-merge-diff/v4 v4.1.2"
+"sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+"sigs.k8s.io/yaml v1.2.0"
+"sigs.k8s.io/yaml v1.2.0/go.mod"
+)
+go-module_set_globals
+MY_PV=${PV}+k3s1
+SRC_URI="https://github.com/k3s-io/k3s/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+	https://github.com/opencontainers/runc/archive/refs/tags/v1.0.0-rc95.tar.gz -> k3s-runc-${K3S_RUNC_VERSION}.tar.gz
+	https://helm.traefik.io/traefik/traefik-${K3S_TRAEFIK_VERSION}.tgz
+	https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz
+	amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+kubectl-symlink rootless"
+REQUIRED_USE="|| ( amd64 )"
+DEPEND="
+	app-misc/yq
+	net-firewall/conntrack-tools
+	rootless? ( app-emulation/slirp4netns )
+"
+RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )"
+RESTRICT+=" test"
+
+S=${WORKDIR}/${PN}-${MY_PV/+/-}
+
+k3s_unpack_filter() {
+	grep -v -F \
+		-e "k3s-runc-${K3S_RUNC_VERSION}.tar.gz" \
+		-e "traefik-${K3S_TRAEFIK_VERSION}.tgz" \
+		-e "k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz"
+}
+
+src_unpack() {
+	read -d '' A < <(printf -- '%s\n' ${A} | k3s_unpack_filter)
+	go-module_src_unpack
+	cd "${S}" || die
+	mkdir -p bin/aux build/static/charts cache || die
+	cp "${DISTDIR}/traefik-${K3S_TRAEFIK_VERSION}.tgz" build/static/charts/ || die
+	cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die
+	mv "${WORKDIR}/bin" "${S}/bin" || die
+	mv "${WORKDIR}/etc" "${S}/etc" || die
+}
+
+src_prepare() {
+	local filename pattern replacement
+	default
+
+	local RUNC_DIR=build/src/github.com/opencontainers/runc
+	mkdir -p "${RUNC_DIR}" || die
+	tar -x --strip-components=1 -f "${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}.tar.gz" -C "${RUNC_DIR}" || die
+	sed -e 's|mod=vendor|mod=readonly|g' -i "${RUNC_DIR}/Makefile" || die
+
+	# Disable download for files fetched via SRC_URI.
+	sed -e 's:^[[:space:]]*curl:#\0:' \
+		-e 's:^[[:space:]]*git:#\0:' \
+		-e 's:^rm -rf \${CHARTS_DIR}:#\0:' \
+		-e 's:^rm -rf \${RUNC_DIR}:#\0:' \
+		-e 's:yq e :yq -r :' \
+		-e "s:^setup_tmp\$:TMP_DIR=${S}/build/static/charts:" \
+		-i scripts/download || die
+	sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die
+	pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR'
+	filename=scripts/build
+	grep -qF "${pattern}" "${filename}" || \
+		die "failed to locate plugins clone command"
+	sed -e "s|${pattern}|mkdir -p \"\$WORKDIR\" \\&\\& tar -xzf \"${S}/cache/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz\" --strip-components=1 -C \"\$WORKDIR\"|" \
+		-e 's|rm -rf $TMPDIR||' \
+		-i "${filename}" || die
+	sed -e 's:/usr/local/bin:/usr/bin:g' -i k3s.service || die
+	sed -e 's|mod=vendor|mod=readonly|g' -i vendor/github.com/opencontainers/runc/Makefile || die
+}
+
+src_compile() {
+	mkdir -p build/data || die
+	"${BASH}" -ex ./scripts/download || die
+	./scripts/build || die
+	./scripts/package-cli || die
+}
+
+src_install() {
+	dobin "dist/artifacts/${PN}"
+	use kubectl-symlink && dosym k3s /usr/bin/kubectl
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	dodoc README.md
+}
diff --git a/sys-cluster/k3s/k3s-1.22.2.ebuild b/sys-cluster/k3s/k3s-1.22.2.ebuild
new file mode 100644
index 000000000000..f100d470849b
--- /dev/null
+++ b/sys-cluster/k3s/k3s-1.22.2.ebuild
@@ -0,0 +1,1688 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module linux-info systemd
+
+DESCRIPTION="Lightweight Kubernetes"
+HOMEPAGE="https://k3s.io"
+K3S_RUNC_VERSION=v1.0.1
+K3S_ROOT_VERSION=0.9.1
+K3S_TRAEFIK_VERSION=10.3.0
+K3S_CNIPLUGINS_VERSION=0.9.1
+CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN"
+
+EGO_SUM=(
+"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+"bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod"
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.38.0/go.mod"
+"cloud.google.com/go v0.44.1/go.mod"
+"cloud.google.com/go v0.44.2/go.mod"
+"cloud.google.com/go v0.45.1/go.mod"
+"cloud.google.com/go v0.46.3/go.mod"
+"cloud.google.com/go v0.50.0/go.mod"
+"cloud.google.com/go v0.51.0/go.mod"
+"cloud.google.com/go v0.52.0/go.mod"
+"cloud.google.com/go v0.53.0/go.mod"
+"cloud.google.com/go v0.54.0/go.mod"
+"cloud.google.com/go v0.57.0"
+"cloud.google.com/go v0.57.0/go.mod"
+"cloud.google.com/go/bigquery v1.0.1/go.mod"
+"cloud.google.com/go/bigquery v1.3.0/go.mod"
+"cloud.google.com/go/bigquery v1.4.0/go.mod"
+"cloud.google.com/go/datastore v1.0.0/go.mod"
+"cloud.google.com/go/datastore v1.1.0/go.mod"
+"cloud.google.com/go/firestore v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.0.1/go.mod"
+"cloud.google.com/go/pubsub v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.2.0/go.mod"
+"cloud.google.com/go/storage v1.0.0/go.mod"
+"cloud.google.com/go/storage v1.5.0/go.mod"
+"cloud.google.com/go/storage v1.6.0/go.mod"
+"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+"dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod"
+"github.com/360EntSecGroup-Skylar/excelize v1.4.1/go.mod"
+"github.com/Azure/azure-sdk-for-go v55.0.0+incompatible"
+"github.com/Azure/azure-sdk-for-go v55.0.0+incompatible/go.mod"
+"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+"github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod"
+"github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1"
+"github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod"
+"github.com/Azure/go-autorest v14.2.0+incompatible"
+"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+"github.com/Azure/go-autorest/autorest v0.11.18"
+"github.com/Azure/go-autorest/autorest v0.11.18/go.mod"
+"github.com/Azure/go-autorest/autorest/adal v0.9.13"
+"github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod"
+"github.com/Azure/go-autorest/autorest/date v0.3.0"
+"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
+"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+"github.com/Azure/go-autorest/autorest/to v0.4.0"
+"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
+"github.com/Azure/go-autorest/autorest/validation v0.1.0"
+"github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod"
+"github.com/Azure/go-autorest/logger v0.2.1"
+"github.com/Azure/go-autorest/logger v0.2.1/go.mod"
+"github.com/Azure/go-autorest/tracing v0.6.0"
+"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+"github.com/BurntSushi/toml v0.3.1"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+"github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317"
+"github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317/go.mod"
+"github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab"
+"github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod"
+"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd"
+"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod"
+"github.com/Microsoft/go-winio v0.4.11/go.mod"
+"github.com/Microsoft/go-winio v0.4.14/go.mod"
+"github.com/Microsoft/go-winio v0.4.15/go.mod"
+"github.com/Microsoft/go-winio v0.4.17"
+"github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod"
+"github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod"
+"github.com/Microsoft/go-winio v0.4.17/go.mod"
+"github.com/Microsoft/hcsshim v0.8.6/go.mod"
+"github.com/Microsoft/hcsshim v0.8.16/go.mod"
+"github.com/Microsoft/hcsshim v0.8.18"
+"github.com/Microsoft/hcsshim v0.8.18/go.mod"
+"github.com/Microsoft/hcsshim v0.8.20"
+"github.com/Microsoft/hcsshim v0.8.20/go.mod"
+"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+"github.com/NYTimes/gziphandler v1.1.1"
+"github.com/NYTimes/gziphandler v1.1.1/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/PuerkitoBio/goquery v1.5.0/go.mod"
+"github.com/PuerkitoBio/purell v1.1.0/go.mod"
+"github.com/PuerkitoBio/purell v1.1.1"
+"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
+"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+"github.com/Rican7/retry v0.1.0"
+"github.com/Rican7/retry v0.1.0/go.mod"
+"github.com/agnivade/levenshtein v1.0.1/go.mod"
+"github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+"github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod"
+"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
+"github.com/andybalholm/cascadia v1.0.0/go.mod"
+"github.com/antihax/optional v1.0.0/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a"
+"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
+"github.com/auth0/go-jwt-middleware v1.0.1/go.mod"
+"github.com/aws/aws-sdk-go v1.12.54/go.mod"
+"github.com/aws/aws-sdk-go v1.35.24/go.mod"
+"github.com/aws/aws-sdk-go v1.38.49"
+"github.com/aws/aws-sdk-go v1.38.49/go.mod"
+"github.com/benbjohnson/clock v1.0.3"
+"github.com/benbjohnson/clock v1.0.3/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/bits-and-blooms/bitset v1.2.0"
+"github.com/bits-and-blooms/bitset v1.2.0/go.mod"
+"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
+"github.com/blang/semver v3.5.0+incompatible/go.mod"
+"github.com/blang/semver v3.5.1+incompatible"
+"github.com/blang/semver v3.5.1+incompatible/go.mod"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/bronze1man/goStrongswanVici v0.0.0-20201105010758-936f38b697fd"
+"github.com/bronze1man/goStrongswanVici v0.0.0-20201105010758-936f38b697fd/go.mod"
+"github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod"
+"github.com/canonical/go-dqlite v1.5.1"
+"github.com/canonical/go-dqlite v1.5.1/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod"
+"github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054"
+"github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod"
+"github.com/cespare/xxhash v1.1.0"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5"
+"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod"
+"github.com/checkpoint-restore/go-criu/v5 v5.0.0"
+"github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod"
+"github.com/cheggaaa/pb v1.0.29/go.mod"
+"github.com/chzyer/logex v1.1.10/go.mod"
+"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+"github.com/cilium/ebpf v0.2.0/go.mod"
+"github.com/cilium/ebpf v0.4.0/go.mod"
+"github.com/cilium/ebpf v0.5.0"
+"github.com/cilium/ebpf v0.5.0/go.mod"
+"github.com/cilium/ebpf v0.6.2"
+"github.com/cilium/ebpf v0.6.2/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+"github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5"
+"github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod"
+"github.com/cockroachdb/errors v1.2.4"
+"github.com/cockroachdb/errors v1.2.4/go.mod"
+"github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f"
+"github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod"
+"github.com/containerd/aufs v1.0.0"
+"github.com/containerd/aufs v1.0.0/go.mod"
+"github.com/containerd/btrfs v1.0.0"
+"github.com/containerd/btrfs v1.0.0/go.mod"
+"github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod"
+"github.com/containerd/cgroups v1.0.1"
+"github.com/containerd/cgroups v1.0.1/go.mod"
+"github.com/containerd/console v1.0.1/go.mod"
+"github.com/containerd/console v1.0.2"
+"github.com/containerd/console v1.0.2/go.mod"
+"github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod"
+"github.com/containerd/continuity v0.1.0"
+"github.com/containerd/continuity v0.1.0/go.mod"
+"github.com/containerd/fifo v1.0.0"
+"github.com/containerd/fifo v1.0.0/go.mod"
+"github.com/containerd/fuse-overlayfs-snapshotter v1.0.3"
+"github.com/containerd/fuse-overlayfs-snapshotter v1.0.3/go.mod"
+"github.com/containerd/go-cni v1.0.2"
+"github.com/containerd/go-cni v1.0.2/go.mod"
+"github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod"
+"github.com/containerd/go-runc v1.0.0"
+"github.com/containerd/go-runc v1.0.0/go.mod"
+"github.com/containerd/imgcrypt v1.1.1"
+"github.com/containerd/imgcrypt v1.1.1/go.mod"
+"github.com/containerd/nri v0.1.0"
+"github.com/containerd/nri v0.1.0/go.mod"
+"github.com/containerd/stargz-snapshotter v0.8.0"
+"github.com/containerd/stargz-snapshotter v0.8.0/go.mod"
+"github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod"
+"github.com/containerd/stargz-snapshotter/estargz v0.8.0"
+"github.com/containerd/stargz-snapshotter/estargz v0.8.0/go.mod"
+"github.com/containerd/ttrpc v1.0.2"
+"github.com/containerd/ttrpc v1.0.2/go.mod"
+"github.com/containerd/typeurl v1.0.1/go.mod"
+"github.com/containerd/typeurl v1.0.2"
+"github.com/containerd/typeurl v1.0.2/go.mod"
+"github.com/containerd/zfs v1.0.0"
+"github.com/containerd/zfs v1.0.0/go.mod"
+"github.com/containernetworking/cni v0.7.1/go.mod"
+"github.com/containernetworking/cni v0.8.0/go.mod"
+"github.com/containernetworking/cni v0.8.1"
+"github.com/containernetworking/cni v0.8.1/go.mod"
+"github.com/containernetworking/plugins v0.8.6/go.mod"
+"github.com/containernetworking/plugins v0.9.1"
+"github.com/containernetworking/plugins v0.9.1/go.mod"
+"github.com/containers/ocicrypt v1.1.1"
+"github.com/containers/ocicrypt v1.1.1/go.mod"
+"github.com/container-storage-interface/spec v1.5.0"
+"github.com/container-storage-interface/spec v1.5.0/go.mod"
+"github.com/coredns/caddy v1.1.0/go.mod"
+"github.com/coredns/corefile-migration v1.0.12/go.mod"
+"github.com/coreos/bbolt v1.3.2/go.mod"
+"github.com/coreos/etcd v3.1.11+incompatible/go.mod"
+"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
+"github.com/coreos/go-iptables v0.4.5/go.mod"
+"github.com/coreos/go-iptables v0.5.0"
+"github.com/coreos/go-iptables v0.5.0/go.mod"
+"github.com/coreos/go-oidc v2.1.0+incompatible"
+"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+"github.com/coreos/go-semver v0.2.0/go.mod"
+"github.com/coreos/go-semver v0.3.0"
+"github.com/coreos/go-semver v0.3.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/go-systemd/v22 v22.1.0/go.mod"
+"github.com/coreos/go-systemd/v22 v22.3.1"
+"github.com/coreos/go-systemd/v22 v22.3.1/go.mod"
+"github.com/coreos/go-systemd/v22 v22.3.2"
+"github.com/coreos/go-systemd/v22 v22.3.2/go.mod"
+"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+"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/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+"github.com/creack/pty v1.1.7/go.mod"
+"github.com/creack/pty v1.1.9/go.mod"
+"github.com/creack/pty v1.1.11"
+"github.com/creack/pty v1.1.11/go.mod"
+"github.com/cyphar/filepath-securejoin v0.2.2"
+"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
+"github.com/d2g/dhcp4client v1.0.0/go.mod"
+"github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod"
+"github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod"
+"github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod"
+"github.com/danieljoos/wincred v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd"
+"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod"
+"github.com/denverdino/aliyungo v0.0.0-20170629053852-f6cab0c35083/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/dnaeon/go-vcr v1.0.1"
+"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+"github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod"
+"github.com/docker/cli v20.10.8+incompatible"
+"github.com/docker/cli v20.10.8+incompatible/go.mod"
+"github.com/docker/distribution v2.7.1+incompatible"
+"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+"github.com/docker/docker v20.10.2+incompatible"
+"github.com/docker/docker v20.10.2+incompatible/go.mod"
+"github.com/docker/docker-credential-helpers v0.6.3/go.mod"
+"github.com/docker/docker-credential-helpers v0.6.4"
+"github.com/docker/docker-credential-helpers v0.6.4/go.mod"
+"github.com/docker/go-connections v0.4.0"
+"github.com/docker/go-connections v0.4.0/go.mod"
+"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c"
+"github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod"
+"github.com/docker/go-metrics v0.0.1"
+"github.com/docker/go-metrics v0.0.1/go.mod"
+"github.com/docker/go-units v0.3.3/go.mod"
+"github.com/docker/go-units v0.4.0"
+"github.com/docker/go-units v0.4.0/go.mod"
+"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
+"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+"github.com/dustin/go-humanize v1.0.0"
+"github.com/dustin/go-humanize v1.0.0/go.mod"
+"github.com/dustmop/soup v1.1.2-0.20190516214245-38228baa104e/go.mod"
+"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
+"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+"github.com/emicklei/go-restful v2.9.5+incompatible"
+"github.com/emicklei/go-restful v2.9.5+incompatible/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83"
+"github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83/go.mod"
+"github.com/euank/go-kmsg-parser v2.0.0+incompatible"
+"github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod"
+"github.com/evanphx/json-patch v4.5.0+incompatible/go.mod"
+"github.com/evanphx/json-patch v4.11.0+incompatible"
+"github.com/evanphx/json-patch v4.11.0+incompatible/go.mod"
+"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d"
+"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod"
+"github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod"
+"github.com/fatih/camelcase v1.0.0"
+"github.com/fatih/camelcase v1.0.0/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/felixge/httpsnoop v1.0.1"
+"github.com/felixge/httpsnoop v1.0.1/go.mod"
+"github.com/flannel-io/flannel v0.14.1-0.20210827074410-fca1560c91cc"
+"github.com/flannel-io/flannel v0.14.1-0.20210827074410-fca1560c91cc/go.mod"
+"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+"github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod"
+"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+"github.com/form3tech-oss/jwt-go v3.2.3+incompatible"
+"github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod"
+"github.com/frankban/quicktest v1.11.3"
+"github.com/frankban/quicktest v1.11.3/go.mod"
+"github.com/frankban/quicktest v1.12.1"
+"github.com/frankban/quicktest v1.12.1/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/fsnotify/fsnotify v1.4.9"
+"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+"github.com/fvbommel/sortorder v1.0.1"
+"github.com/fvbommel/sortorder v1.0.1/go.mod"
+"github.com/getsentry/raven-go v0.2.0"
+"github.com/getsentry/raven-go v0.2.0/go.mod"
+"github.com/ghodss/yaml v1.0.0"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod"
+"github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod"
+"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c"
+"github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod"
+"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+"github.com/godbus/dbus/v5 v5.0.4"
+"github.com/godbus/dbus/v5 v5.0.4/go.mod"
+"github.com/gofrs/flock v0.8.1"
+"github.com/gofrs/flock v0.8.1/go.mod"
+"github.com/gofrs/uuid v4.0.0+incompatible"
+"github.com/gofrs/uuid v4.0.0+incompatible/go.mod"
+"github.com/gogo/googleapis v1.3.2"
+"github.com/gogo/googleapis v1.3.2/go.mod"
+"github.com/gogo/googleapis v1.4.0"
+"github.com/gogo/googleapis v1.4.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/gogo/protobuf v1.3.1/go.mod"
+"github.com/gogo/protobuf v1.3.2"
+"github.com/gogo/protobuf v1.3.2/go.mod"
+"github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod"
+"github.com/golangplus/fmt v1.0.0/go.mod"
+"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod"
+"github.com/golangplus/testing v1.0.0"
+"github.com/golangplus/testing v1.0.0/go.mod"
+"github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+"github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da"
+"github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/mock v1.3.1/go.mod"
+"github.com/golang/mock v1.4.0/go.mod"
+"github.com/golang/mock v1.4.1/go.mod"
+"github.com/golang/mock v1.4.3/go.mod"
+"github.com/golang/mock v1.4.4"
+"github.com/golang/mock v1.4.4/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/protobuf v1.3.3/go.mod"
+"github.com/golang/protobuf v1.3.4/go.mod"
+"github.com/golang/protobuf v1.3.5/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+"github.com/golang/protobuf v1.4.0/go.mod"
+"github.com/golang/protobuf v1.4.1/go.mod"
+"github.com/golang/protobuf v1.4.2/go.mod"
+"github.com/golang/protobuf v1.4.3"
+"github.com/golang/protobuf v1.4.3/go.mod"
+"github.com/golang/protobuf v1.5.0/go.mod"
+"github.com/golang/protobuf v1.5.1/go.mod"
+"github.com/golang/protobuf v1.5.2"
+"github.com/golang/protobuf v1.5.2/go.mod"
+"github.com/golang/snappy v0.0.3/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/googleapis/gnostic v0.3.1/go.mod"
+"github.com/googleapis/gnostic v0.5.1/go.mod"
+"github.com/googleapis/gnostic v0.5.5"
+"github.com/googleapis/gnostic v0.5.5/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/btree v1.0.1"
+"github.com/google/btree v1.0.1/go.mod"
+"github.com/google/cadvisor v0.39.2"
+"github.com/google/cadvisor v0.39.2/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/gofuzz v1.1.0"
+"github.com/google/gofuzz v1.1.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.0/go.mod"
+"github.com/google/go-cmp v0.5.2/go.mod"
+"github.com/google/go-cmp v0.5.4"
+"github.com/google/go-cmp v0.5.4/go.mod"
+"github.com/google/go-cmp v0.5.5/go.mod"
+"github.com/google/go-cmp v0.5.6"
+"github.com/google/go-cmp v0.5.6/go.mod"
+"github.com/google/go-containerregistry v0.5.0"
+"github.com/google/go-containerregistry v0.5.0/go.mod"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+"github.com/google/renameio v0.1.0/go.mod"
+"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
+"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
+"github.com/google/uuid v1.0.0/go.mod"
+"github.com/google/uuid v1.1.1/go.mod"
+"github.com/google/uuid v1.1.2/go.mod"
+"github.com/google/uuid v1.2.0"
+"github.com/google/uuid v1.2.0/go.mod"
+"github.com/google/uuid v1.3.0"
+"github.com/google/uuid v1.3.0/go.mod"
+"github.com/gophercloud/gophercloud v0.1.0"
+"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00"
+"github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod"
+"github.com/gorilla/mux v1.7.3/go.mod"
+"github.com/gorilla/mux v1.7.4/go.mod"
+"github.com/gorilla/mux v1.8.0"
+"github.com/gorilla/mux v1.8.0/go.mod"
+"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/gorilla/websocket v1.4.2"
+"github.com/gorilla/websocket v1.4.2/go.mod"
+"github.com/go-bindata/go-bindata v3.1.2+incompatible"
+"github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod"
+"github.com/go-errors/errors v1.0.1"
+"github.com/go-errors/errors v1.0.1/go.mod"
+"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+"github.com/go-ini/ini v1.28.1/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-kit/log v0.1.0/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logfmt/logfmt v0.5.0/go.mod"
+"github.com/go-logr/logr v0.1.0/go.mod"
+"github.com/go-logr/logr v0.4.0"
+"github.com/go-logr/logr v0.4.0/go.mod"
+"github.com/go-logr/zapr v0.1.0/go.mod"
+"github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod"
+"github.com/go-openapi/analysis v0.17.0/go.mod"
+"github.com/go-openapi/analysis v0.18.0/go.mod"
+"github.com/go-openapi/analysis v0.19.2/go.mod"
+"github.com/go-openapi/analysis v0.19.5/go.mod"
+"github.com/go-openapi/errors v0.17.0/go.mod"
+"github.com/go-openapi/errors v0.18.0/go.mod"
+"github.com/go-openapi/errors v0.19.2/go.mod"
+"github.com/go-openapi/jsonpointer v0.17.0/go.mod"
+"github.com/go-openapi/jsonpointer v0.18.0/go.mod"
+"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
+"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
+"github.com/go-openapi/jsonpointer v0.19.5"
+"github.com/go-openapi/jsonpointer v0.19.5/go.mod"
+"github.com/go-openapi/jsonreference v0.17.0/go.mod"
+"github.com/go-openapi/jsonreference v0.18.0/go.mod"
+"github.com/go-openapi/jsonreference v0.19.2/go.mod"
+"github.com/go-openapi/jsonreference v0.19.3/go.mod"
+"github.com/go-openapi/jsonreference v0.19.5"
+"github.com/go-openapi/jsonreference v0.19.5/go.mod"
+"github.com/go-openapi/loads v0.17.0/go.mod"
+"github.com/go-openapi/loads v0.18.0/go.mod"
+"github.com/go-openapi/loads v0.19.0/go.mod"
+"github.com/go-openapi/loads v0.19.2/go.mod"
+"github.com/go-openapi/loads v0.19.4/go.mod"
+"github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod"
+"github.com/go-openapi/runtime v0.19.0/go.mod"
+"github.com/go-openapi/runtime v0.19.4/go.mod"
+"github.com/go-openapi/spec v0.17.0/go.mod"
+"github.com/go-openapi/spec v0.18.0/go.mod"
+"github.com/go-openapi/spec v0.19.2/go.mod"
+"github.com/go-openapi/spec v0.19.3/go.mod"
+"github.com/go-openapi/spec v0.19.5/go.mod"
+"github.com/go-openapi/strfmt v0.17.0/go.mod"
+"github.com/go-openapi/strfmt v0.18.0/go.mod"
+"github.com/go-openapi/strfmt v0.19.0/go.mod"
+"github.com/go-openapi/strfmt v0.19.3/go.mod"
+"github.com/go-openapi/strfmt v0.19.5/go.mod"
+"github.com/go-openapi/swag v0.17.0/go.mod"
+"github.com/go-openapi/swag v0.18.0/go.mod"
+"github.com/go-openapi/swag v0.19.2/go.mod"
+"github.com/go-openapi/swag v0.19.5/go.mod"
+"github.com/go-openapi/swag v0.19.14"
+"github.com/go-openapi/swag v0.19.14/go.mod"
+"github.com/go-openapi/validate v0.18.0/go.mod"
+"github.com/go-openapi/validate v0.19.2/go.mod"
+"github.com/go-openapi/validate v0.19.8/go.mod"
+"github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod"
+"github.com/go-sql-driver/mysql v1.6.0"
+"github.com/go-sql-driver/mysql v1.6.0/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.3.0"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.16.0"
+"github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod"
+"github.com/hanwen/go-fuse v1.0.0"
+"github.com/hanwen/go-fuse v1.0.0/go.mod"
+"github.com/hanwen/go-fuse/v2 v2.1.0"
+"github.com/hanwen/go-fuse/v2 v2.1.0/go.mod"
+"github.com/hashicorp/consul/api v1.1.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+"github.com/hashicorp/errwrap v1.0.0"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.3/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-multierror v1.1.1"
+"github.com/hashicorp/go-multierror v1.1.1/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go.net v0.0.1/go.mod"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.0/go.mod"
+"github.com/hashicorp/memberlist v0.1.3/go.mod"
+"github.com/hashicorp/serf v0.8.2/go.mod"
+"github.com/heketi/heketi v10.3.0+incompatible/go.mod"
+"github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod"
+"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+"github.com/imdario/mergo v0.3.5/go.mod"
+"github.com/imdario/mergo v0.3.6/go.mod"
+"github.com/imdario/mergo v0.3.12"
+"github.com/imdario/mergo v0.3.12/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/insomniacslk/dhcp v0.0.0-20210120172423-cc9239ac6294/go.mod"
+"github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod"
+"github.com/jmespath/go-jmespath v0.4.0"
+"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
+"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+"github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod"
+"github.com/joho/godotenv v0.0.0-20161216230537-726cc8b906e3/go.mod"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/jonboulle/clockwork v0.2.2"
+"github.com/jonboulle/clockwork v0.2.2/go.mod"
+"github.com/josharian/intern v1.0.0"
+"github.com/josharian/intern v1.0.0/go.mod"
+"github.com/jpillora/backoff v1.0.0/go.mod"
+"github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod"
+"github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod"
+"github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod"
+"github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.10/go.mod"
+"github.com/json-iterator/go v1.1.11"
+"github.com/json-iterator/go v1.1.11/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+"github.com/jtolds/gls v4.20.0+incompatible"
+"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/julienschmidt/httprouter v1.3.0/go.mod"
+"github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod"
+"github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod"
+"github.com/k3s-io/containerd v1.5.5-k3s1"
+"github.com/k3s-io/containerd v1.5.5-k3s1/go.mod"
+"github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1"
+"github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1/go.mod"
+"github.com/k3s-io/cri-tools v1.21.0-k3s1"
+"github.com/k3s-io/cri-tools v1.21.0-k3s1/go.mod"
+"github.com/k3s-io/etcd/api/v3 v3.5.0-k3s2"
+"github.com/k3s-io/etcd/api/v3 v3.5.0-k3s2/go.mod"
+"github.com/k3s-io/etcd/client/v3 v3.5.0-k3s2"
+"github.com/k3s-io/etcd/client/v3 v3.5.0-k3s2/go.mod"
+"github.com/k3s-io/etcd/etcdutl/v3 v3.5.0-k3s2"
+"github.com/k3s-io/etcd/etcdutl/v3 v3.5.0-k3s2/go.mod"
+"github.com/k3s-io/etcd/server/v3 v3.5.0-k3s2"
+"github.com/k3s-io/etcd/server/v3 v3.5.0-k3s2/go.mod"
+"github.com/k3s-io/helm-controller v0.11.5"
+"github.com/k3s-io/helm-controller v0.11.5/go.mod"
+"github.com/k3s-io/kine v0.8.0"
+"github.com/k3s-io/kine v0.8.0/go.mod"
+"github.com/k3s-io/klog v1.0.0-k3s1"
+"github.com/k3s-io/klog v1.0.0-k3s1/go.mod"
+"github.com/k3s-io/klog/v2 v2.9.0-k3s1"
+"github.com/k3s-io/klog/v2 v2.9.0-k3s1/go.mod"
+"github.com/k3s-io/kubernetes v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.22.2-k3s1"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.22.2-k3s1/go.mod"
+"github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.22.2-k3s1/go.mod"
+"github.com/karrick/godirwalk v1.16.1"
+"github.com/karrick/godirwalk v1.16.1/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/errcheck v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.5.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/klauspost/compress v1.11.13"
+"github.com/klauspost/compress v1.11.13/go.mod"
+"github.com/klauspost/compress v1.12.2/go.mod"
+"github.com/klauspost/compress v1.13.5"
+"github.com/klauspost/compress v1.13.5/go.mod"
+"github.com/klauspost/cpuid v1.2.3/go.mod"
+"github.com/klauspost/cpuid v1.3.1"
+"github.com/klauspost/cpuid v1.3.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pretty v0.2.1"
+"github.com/kr/pretty v0.2.1/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/pty v1.1.5/go.mod"
+"github.com/kr/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/kr/text v0.2.0"
+"github.com/kr/text v0.2.0/go.mod"
+"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348"
+"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+"github.com/libopenstorage/openstorage v1.0.0/go.mod"
+"github.com/lib/pq v1.10.2"
+"github.com/lib/pq v1.10.2/go.mod"
+"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de"
+"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod"
+"github.com/lithammer/dedent v1.1.0"
+"github.com/lithammer/dedent v1.1.0/go.mod"
+"github.com/lpabon/godbc v0.1.1/go.mod"
+"github.com/magiconair/properties v1.8.0/go.mod"
+"github.com/magiconair/properties v1.8.1/go.mod"
+"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
+"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+"github.com/mailru/easyjson v0.7.0/go.mod"
+"github.com/mailru/easyjson v0.7.6"
+"github.com/mailru/easyjson v0.7.6/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.4/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-runewidth v0.0.2/go.mod"
+"github.com/mattn/go-runewidth v0.0.4/go.mod"
+"github.com/mattn/go-runewidth v0.0.7/go.mod"
+"github.com/mattn/go-runewidth v0.0.9/go.mod"
+"github.com/mattn/go-shellwords v1.0.3/go.mod"
+"github.com/mattn/go-sqlite3 v1.14.8"
+"github.com/mattn/go-sqlite3 v1.14.8/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
+"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
+"github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod"
+"github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod"
+"github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod"
+"github.com/mdlayher/netlink v1.0.0/go.mod"
+"github.com/mdlayher/netlink v1.1.0/go.mod"
+"github.com/mdlayher/netlink v1.1.1/go.mod"
+"github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod"
+"github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/pkcs11 v1.0.3"
+"github.com/miekg/pkcs11 v1.0.3/go.mod"
+"github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989"
+"github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989/go.mod"
+"github.com/minio/md5-simd v1.1.0"
+"github.com/minio/md5-simd v1.1.0/go.mod"
+"github.com/minio/minio-go/v7 v7.0.7"
+"github.com/minio/minio-go/v7 v7.0.7/go.mod"
+"github.com/minio/sha256-simd v0.1.1"
+"github.com/minio/sha256-simd v0.1.1/go.mod"
+"github.com/minio/sio v0.2.1/go.mod"
+"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible"
+"github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/gox v0.4.0/go.mod"
+"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/go-wordwrap v1.0.0"
+"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+"github.com/mitchellh/iochan v1.0.0/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/moby/ipvs v1.0.1"
+"github.com/moby/ipvs v1.0.1/go.mod"
+"github.com/moby/locker v1.0.1"
+"github.com/moby/locker v1.0.1/go.mod"
+"github.com/moby/spdystream v0.2.0"
+"github.com/moby/spdystream v0.2.0/go.mod"
+"github.com/moby/sys/mountinfo v0.4.1"
+"github.com/moby/sys/mountinfo v0.4.1/go.mod"
+"github.com/moby/sys/symlink v0.1.0"
+"github.com/moby/sys/symlink v0.1.0/go.mod"
+"github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod"
+"github.com/moby/term v0.0.0-20210610120745-9d4ed1856297"
+"github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod"
+"github.com/moby/vpnkit v0.5.0/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod"
+"github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod"
+"github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00"
+"github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod"
+"github.com/morikuni/aec v1.0.0"
+"github.com/morikuni/aec v1.0.0/go.mod"
+"github.com/mrunalp/fileutils v0.5.0"
+"github.com/mrunalp/fileutils v0.5.0/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822"
+"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod"
+"github.com/mvdan/xurls v1.1.0/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f"
+"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+"github.com/natefinch/lumberjack v2.0.0+incompatible"
+"github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod"
+"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+"github.com/nxadm/tail v1.4.4"
+"github.com/nxadm/tail v1.4.4/go.mod"
+"github.com/nxadm/tail v1.4.8"
+"github.com/nxadm/tail v1.4.8/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+"github.com/olekukonko/tablewriter v0.0.4/go.mod"
+"github.com/olekukonko/tablewriter v0.0.5/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod"
+"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+"github.com/onsi/ginkgo v1.4.0/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.8.0/go.mod"
+"github.com/onsi/ginkgo v1.10.3/go.mod"
+"github.com/onsi/ginkgo v1.11.0/go.mod"
+"github.com/onsi/ginkgo v1.12.0/go.mod"
+"github.com/onsi/ginkgo v1.12.1/go.mod"
+"github.com/onsi/ginkgo v1.14.0"
+"github.com/onsi/ginkgo v1.14.0/go.mod"
+"github.com/onsi/ginkgo v1.16.1/go.mod"
+"github.com/onsi/ginkgo v1.16.4"
+"github.com/onsi/ginkgo v1.16.4/go.mod"
+"github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod"
+"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+"github.com/onsi/gomega v1.3.0/go.mod"
+"github.com/onsi/gomega v1.5.0/go.mod"
+"github.com/onsi/gomega v1.7.1/go.mod"
+"github.com/onsi/gomega v1.8.1/go.mod"
+"github.com/onsi/gomega v1.9.0/go.mod"
+"github.com/onsi/gomega v1.10.1/go.mod"
+"github.com/onsi/gomega v1.10.3"
+"github.com/onsi/gomega v1.10.3/go.mod"
+"github.com/onsi/gomega v1.11.0"
+"github.com/onsi/gomega v1.11.0/go.mod"
+"github.com/opencontainers/go-digest v1.0.0"
+"github.com/opencontainers/go-digest v1.0.0/go.mod"
+"github.com/opencontainers/image-spec v1.0.1"
+"github.com/opencontainers/image-spec v1.0.1/go.mod"
+"github.com/opencontainers/image-spec v1.0.2-0.20210819154149-5ad6f50d6283"
+"github.com/opencontainers/image-spec v1.0.2-0.20210819154149-5ad6f50d6283/go.mod"
+"github.com/opencontainers/runc v1.0.1"
+"github.com/opencontainers/runc v1.0.1/go.mod"
+"github.com/opencontainers/runc v1.0.2"
+"github.com/opencontainers/runc v1.0.2/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.2/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20210316141917-a8c4a9ee0f6b"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20210316141917-a8c4a9ee0f6b/go.mod"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417"
+"github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod"
+"github.com/opencontainers/selinux v1.8.0"
+"github.com/opencontainers/selinux v1.8.0/go.mod"
+"github.com/opencontainers/selinux v1.8.2"
+"github.com/opencontainers/selinux v1.8.2/go.mod"
+"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/paulmach/orb v0.1.3/go.mod"
+"github.com/pborman/uuid v1.2.0/go.mod"
+"github.com/pborman/uuid v1.2.1/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/pelletier/go-toml v1.8.1"
+"github.com/pelletier/go-toml v1.8.1/go.mod"
+"github.com/pelletier/go-toml v1.9.3"
+"github.com/pelletier/go-toml v1.9.3/go.mod"
+"github.com/peterbourgon/diskv v2.0.1+incompatible"
+"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+"github.com/pierrec/lz4 v2.6.0+incompatible"
+"github.com/pierrec/lz4 v2.6.0+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pkg/errors v0.9.1"
+"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/posener/complete v1.1.1/go.mod"
+"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021"
+"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.2/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.1.0/go.mod"
+"github.com/prometheus/client_golang v1.7.1/go.mod"
+"github.com/prometheus/client_golang v1.11.0"
+"github.com/prometheus/client_golang v1.11.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.6.0/go.mod"
+"github.com/prometheus/common v0.10.0/go.mod"
+"github.com/prometheus/common v0.26.0"
+"github.com/prometheus/common v0.26.0/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.3/go.mod"
+"github.com/prometheus/procfs v0.1.3/go.mod"
+"github.com/prometheus/procfs v0.2.0/go.mod"
+"github.com/prometheus/procfs v0.6.0"
+"github.com/prometheus/procfs v0.6.0/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d/go.mod"
+"github.com/quobyte/api v0.1.8/go.mod"
+"github.com/rancher/dynamiclistener v0.2.6"
+"github.com/rancher/dynamiclistener v0.2.6/go.mod"
+"github.com/rancher/lasso v0.0.0-20210616224652-fc3ebd901c08"
+"github.com/rancher/lasso v0.0.0-20210616224652-fc3ebd901c08/go.mod"
+"github.com/rancher/remotedialer v0.2.0"
+"github.com/rancher/remotedialer v0.2.0/go.mod"
+"github.com/rancher/wharfie v0.3.4"
+"github.com/rancher/wharfie v0.3.4/go.mod"
+"github.com/rancher/wrangler v0.8.5"
+"github.com/rancher/wrangler v0.8.5/go.mod"
+"github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod"
+"github.com/robfig/cron/v3 v3.0.1"
+"github.com/robfig/cron/v3 v3.0.1/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+"github.com/rootless-containers/rootlesskit v0.14.5"
+"github.com/rootless-containers/rootlesskit v0.14.5/go.mod"
+"github.com/rs/xid v1.2.1/go.mod"
+"github.com/rs/xid v1.3.0"
+"github.com/rs/xid v1.3.0/go.mod"
+"github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021"
+"github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021/go.mod"
+"github.com/russross/blackfriday v1.5.2"
+"github.com/russross/blackfriday v1.5.2/go.mod"
+"github.com/russross/blackfriday/v2 v2.0.1"
+"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+"github.com/russross/blackfriday/v2 v2.1.0"
+"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod"
+"github.com/satori/go.uuid v1.2.0"
+"github.com/satori/go.uuid v1.2.0/go.mod"
+"github.com/sclevine/spec v1.2.0/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/seccomp/libseccomp-golang v0.9.1"
+"github.com/seccomp/libseccomp-golang v0.9.1/go.mod"
+"github.com/sergi/go-diff v1.0.0/go.mod"
+"github.com/sergi/go-diff v1.1.0"
+"github.com/sergi/go-diff v1.1.0/go.mod"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+"github.com/sirupsen/logrus v1.0.6/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.1/go.mod"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/sirupsen/logrus v1.6.0/go.mod"
+"github.com/sirupsen/logrus v1.7.0"
+"github.com/sirupsen/logrus v1.7.0/go.mod"
+"github.com/sirupsen/logrus v1.8.1"
+"github.com/sirupsen/logrus v1.8.1/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+"github.com/smartystreets/assertions v1.1.0"
+"github.com/smartystreets/assertions v1.1.0/go.mod"
+"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+"github.com/smartystreets/goconvey v1.6.4"
+"github.com/smartystreets/goconvey v1.6.4/go.mod"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/soheilhy/cmux v0.1.5"
+"github.com/soheilhy/cmux v0.1.5/go.mod"
+"github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/afero v1.2.2"
+"github.com/spf13/afero v1.2.2/go.mod"
+"github.com/spf13/cast v1.3.0/go.mod"
+"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+"github.com/spf13/cobra v0.0.3/go.mod"
+"github.com/spf13/cobra v1.0.0/go.mod"
+"github.com/spf13/cobra v1.1.3"
+"github.com/spf13/cobra v1.1.3/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+"github.com/spf13/pflag v1.0.1/go.mod"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/pflag v1.0.5"
+"github.com/spf13/pflag v1.0.5/go.mod"
+"github.com/spf13/viper v1.4.0/go.mod"
+"github.com/spf13/viper v1.7.0/go.mod"
+"github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980"
+"github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod"
+"github.com/stoewer/go-strcase v1.2.0/go.mod"
+"github.com/storageos/go-api v2.2.0+incompatible/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/objx v0.2.0"
+"github.com/stretchr/objx v0.2.0/go.mod"
+"github.com/stretchr/testify v1.2.2"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.2.3-0.20181224173747-660f15d67dbb/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/stretchr/testify v1.5.1/go.mod"
+"github.com/stretchr/testify v1.6.1/go.mod"
+"github.com/stretchr/testify v1.7.0"
+"github.com/stretchr/testify v1.7.0/go.mod"
+"github.com/subosito/gotenv v1.2.0/go.mod"
+"github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635"
+"github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod"
+"github.com/tchap/go-patricia v2.2.6+incompatible"
+"github.com/tchap/go-patricia v2.2.6+incompatible/go.mod"
+"github.com/tchap/go-patricia v2.3.0+incompatible"
+"github.com/tchap/go-patricia v2.3.0+incompatible/go.mod"
+"github.com/tencentcloud/tencentcloud-sdk-go v1.0.67/go.mod"
+"github.com/tidwall/pretty v1.0.0/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod"
+"github.com/ugorji/go v0.0.0-20170107133203-ded73eae5db7/go.mod"
+"github.com/ugorji/go v1.1.4/go.mod"
+"github.com/urfave/cli v1.20.0/go.mod"
+"github.com/urfave/cli v1.21.0/go.mod"
+"github.com/urfave/cli v1.22.1"
+"github.com/urfave/cli v1.22.1/go.mod"
+"github.com/urfave/cli v1.22.2"
+"github.com/urfave/cli v1.22.2/go.mod"
+"github.com/urfave/cli/v2 v2.3.0"
+"github.com/urfave/cli/v2 v2.3.0/go.mod"
+"github.com/urfave/negroni v1.0.0/go.mod"
+"github.com/u-root/u-root v7.0.0+incompatible/go.mod"
+"github.com/vektah/gqlparser v1.1.2/go.mod"
+"github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod"
+"github.com/vishvananda/netlink v1.1.0"
+"github.com/vishvananda/netlink v1.1.0/go.mod"
+"github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852"
+"github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod"
+"github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod"
+"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df"
+"github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod"
+"github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae"
+"github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod"
+"github.com/vmware/govmomi v0.20.3"
+"github.com/vmware/govmomi v0.20.3/go.mod"
+"github.com/willf/bitset v1.1.11"
+"github.com/willf/bitset v1.1.11/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca"
+"github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod"
+"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"github.com/yuin/goldmark v1.2.1/go.mod"
+"github.com/yuin/goldmark v1.3.5/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
+"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83"
+"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2"
+"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod"
+"golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod"
+"golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod"
+"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+"golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod"
+"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+"golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod"
+"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+"golang.org/x/exp v0.0.0-20210220032938-85be41e4509f"
+"golang.org/x/exp v0.0.0-20210220032938-85be41e4509f/go.mod"
+"golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod"
+"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+"golang.org/x/lint v0.0.0-20200302205851-738671d3881b"
+"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+"golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod"
+"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+"golang.org/x/mod v0.1.0/go.mod"
+"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+"golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/mod v0.3.0/go.mod"
+"golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod"
+"golang.org/x/mod v0.4.2"
+"golang.org/x/mod v0.4.2/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+"golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod"
+"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+"golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod"
+"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+"golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod"
+"golang.org/x/net v0.0.0-20201224014010-6772e930b67b"
+"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4"
+"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
+"golang.org/x/net v0.0.0-20210520170846-37e1c6afe023"
+"golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+"golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod"
+"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
+"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
+"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod"
+"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+"golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+"golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod"
+"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+"golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod"
+"golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod"
+"golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod"
+"golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod"
+"golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod"
+"golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod"
+"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+"golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c"
+"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+"golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod"
+"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+"golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod"
+"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+"golang.org/x/sys v0.0.0-20210426230700-d19ff857e887"
+"golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod"
+"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod"
+"golang.org/x/sys v0.0.0-20210616094352-59db8d763f22"
+"golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod"
+"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c"
+"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod"
+"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d"
+"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
+"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20171227012246-e19ae1496984/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/text v0.3.4/go.mod"
+"golang.org/x/text v0.3.6"
+"golang.org/x/text v0.3.6/go.mod"
+"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+"golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod"
+"golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac"
+"golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod"
+"golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+"golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod"
+"golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod"
+"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
+"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+"golang.org/x/tools v0.0.0-20190706070813-72ffa07ba3db/go.mod"
+"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+"golang.org/x/tools v0.0.0-20191017205301-920acffc3e65/go.mod"
+"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
+"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+"golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod"
+"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+"golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod"
+"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+"golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod"
+"golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod"
+"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
+"golang.org/x/tools v0.1.2"
+"golang.org/x/tools v0.1.2/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"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+"gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod"
+"gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod"
+"gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod"
+"gonum.org/v1/gonum v0.6.2"
+"gonum.org/v1/gonum v0.6.2/go.mod"
+"gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod"
+"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e"
+"gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod"
+"gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod"
+"google.golang.org/api v0.4.0/go.mod"
+"google.golang.org/api v0.7.0/go.mod"
+"google.golang.org/api v0.8.0/go.mod"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/api v0.13.0/go.mod"
+"google.golang.org/api v0.14.0/go.mod"
+"google.golang.org/api v0.15.0/go.mod"
+"google.golang.org/api v0.15.1-0.20200106000736-b8fc810ca6b5/go.mod"
+"google.golang.org/api v0.17.0/go.mod"
+"google.golang.org/api v0.18.0/go.mod"
+"google.golang.org/api v0.20.0/go.mod"
+"google.golang.org/api v0.22.0"
+"google.golang.org/api v0.22.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.1/go.mod"
+"google.golang.org/appengine v1.6.5"
+"google.golang.org/appengine v1.6.5/go.mod"
+"google.golang.org/appengine v1.6.6"
+"google.golang.org/appengine v1.6.6/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63"
+"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.1/go.mod"
+"google.golang.org/grpc v1.21.0/go.mod"
+"google.golang.org/grpc v1.21.1/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.25.1/go.mod"
+"google.golang.org/grpc v1.26.0/go.mod"
+"google.golang.org/grpc v1.27.0/go.mod"
+"google.golang.org/grpc v1.27.1/go.mod"
+"google.golang.org/grpc v1.29.1/go.mod"
+"google.golang.org/grpc v1.33.1/go.mod"
+"google.golang.org/grpc v1.33.2/go.mod"
+"google.golang.org/grpc v1.36.0/go.mod"
+"google.golang.org/grpc v1.37.0/go.mod"
+"google.golang.org/grpc v1.38.0"
+"google.golang.org/grpc v1.38.0/go.mod"
+"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+"google.golang.org/protobuf v1.21.0/go.mod"
+"google.golang.org/protobuf v1.22.0/go.mod"
+"google.golang.org/protobuf v1.23.0/go.mod"
+"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+"google.golang.org/protobuf v1.25.0"
+"google.golang.org/protobuf v1.25.0/go.mod"
+"google.golang.org/protobuf v1.26.0"
+"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+"google.golang.org/protobuf v1.26.0/go.mod"
+"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+"gopkg.in/errgo.v2 v2.1.0/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gcfg.v1 v1.2.0"
+"gopkg.in/gcfg.v1 v1.2.0/go.mod"
+"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+"gopkg.in/inf.v0 v0.9.1"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/ini.v1 v1.51.0/go.mod"
+"gopkg.in/ini.v1 v1.57.0"
+"gopkg.in/ini.v1 v1.57.0/go.mod"
+"gopkg.in/natefinch/lumberjack.v2 v2.0.0"
+"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.2.2"
+"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
+"gopkg.in/square/go-jose.v2 v2.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/warnings.v0 v0.1.1"
+"gopkg.in/warnings.v0 v0.1.1/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.0.0/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.3/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"gopkg.in/yaml.v2 v2.3.0/go.mod"
+"gopkg.in/yaml.v2 v2.4.0"
+"gopkg.in/yaml.v2 v2.4.0/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+"gotest.tools v2.2.0+incompatible"
+"gotest.tools v2.2.0+incompatible/go.mod"
+"gotest.tools/v3 v3.0.2/go.mod"
+"gotest.tools/v3 v3.0.3"
+"gotest.tools/v3 v3.0.3/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.etcd.io/bbolt v1.3.3/go.mod"
+"go.etcd.io/bbolt v1.3.6"
+"go.etcd.io/bbolt v1.3.6/go.mod"
+"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738"
+"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
+"go.etcd.io/etcd/api/v3 v3.5.0/go.mod"
+"go.etcd.io/etcd/client/pkg/v3 v3.5.0"
+"go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod"
+"go.etcd.io/etcd/client/v2 v2.305.0"
+"go.etcd.io/etcd/client/v2 v2.305.0/go.mod"
+"go.etcd.io/etcd/client/v3 v3.5.0/go.mod"
+"go.etcd.io/etcd/pkg/v3 v3.5.0"
+"go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod"
+"go.etcd.io/etcd/raft/v3 v3.5.0"
+"go.etcd.io/etcd/raft/v3 v3.5.0/go.mod"
+"go.etcd.io/etcd/server/v3 v3.5.0/go.mod"
+"go.mongodb.org/mongo-driver v1.0.3/go.mod"
+"go.mongodb.org/mongo-driver v1.1.1/go.mod"
+"go.mongodb.org/mongo-driver v1.1.2/go.mod"
+"go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1"
+"go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0/go.mod"
+"go.opencensus.io v0.22.2/go.mod"
+"go.opencensus.io v0.22.3"
+"go.opencensus.io v0.22.3/go.mod"
+"go.opentelemetry.io/contrib v0.20.0"
+"go.opentelemetry.io/contrib v0.20.0/go.mod"
+"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0"
+"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod"
+"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0"
+"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod"
+"go.opentelemetry.io/otel v0.20.0"
+"go.opentelemetry.io/otel v0.20.0/go.mod"
+"go.opentelemetry.io/otel/exporters/otlp v0.20.0"
+"go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod"
+"go.opentelemetry.io/otel/metric v0.20.0"
+"go.opentelemetry.io/otel/metric v0.20.0/go.mod"
+"go.opentelemetry.io/otel/oteltest v0.20.0"
+"go.opentelemetry.io/otel/oteltest v0.20.0/go.mod"
+"go.opentelemetry.io/otel/sdk v0.20.0"
+"go.opentelemetry.io/otel/sdk v0.20.0/go.mod"
+"go.opentelemetry.io/otel/sdk/export/metric v0.20.0"
+"go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod"
+"go.opentelemetry.io/otel/sdk/metric v0.20.0"
+"go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod"
+"go.opentelemetry.io/otel/trace v0.20.0"
+"go.opentelemetry.io/otel/trace v0.20.0/go.mod"
+"go.opentelemetry.io/proto/otlp v0.7.0"
+"go.opentelemetry.io/proto/otlp v0.7.0/go.mod"
+"go.starlark.net v0.0.0-20190528202925-30ae18b8564f/go.mod"
+"go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5"
+"go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod"
+"go.uber.org/atomic v1.3.2/go.mod"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/atomic v1.7.0"
+"go.uber.org/atomic v1.7.0/go.mod"
+"go.uber.org/goleak v1.1.10"
+"go.uber.org/goleak v1.1.10/go.mod"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/multierr v1.6.0"
+"go.uber.org/multierr v1.6.0/go.mod"
+"go.uber.org/zap v1.9.1/go.mod"
+"go.uber.org/zap v1.10.0/go.mod"
+"go.uber.org/zap v1.17.0"
+"go.uber.org/zap v1.17.0/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+"inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252"
+"inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252/go.mod"
+"k8s.io/apimachinery v0.22.0"
+"k8s.io/apimachinery v0.22.0/go.mod"
+"k8s.io/apiserver v0.22.0"
+"k8s.io/apiserver v0.22.0/go.mod"
+"k8s.io/api v0.22.0"
+"k8s.io/api v0.22.0/go.mod"
+"k8s.io/client-go v0.22.0"
+"k8s.io/client-go v0.22.0/go.mod"
+"k8s.io/component-base v0.22.0"
+"k8s.io/component-base v0.22.0/go.mod"
+"k8s.io/cri-api v0.22.0"
+"k8s.io/cri-api v0.22.0/go.mod"
+"k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod"
+"k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod"
+"k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod"
+"k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027"
+"k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod"
+"k8s.io/klog/v2 v2.0.0/go.mod"
+"k8s.io/klog/v2 v2.9.0"
+"k8s.io/klog/v2 v2.9.0/go.mod"
+"k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e"
+"k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod"
+"k8s.io/system-validators v1.5.0/go.mod"
+"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod"
+"k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod"
+"k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod"
+"k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9"
+"k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9/go.mod"
+"k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a"
+"k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod"
+"modernc.org/cc v1.0.0/go.mod"
+"modernc.org/golex v1.0.0/go.mod"
+"modernc.org/mathutil v1.0.0/go.mod"
+"modernc.org/strutil v1.0.0/go.mod"
+"modernc.org/xc v1.0.0/go.mod"
+"rsc.io/binaryregexp v0.2.0/go.mod"
+"rsc.io/pdf v0.1.1/go.mod"
+"rsc.io/quote/v3 v3.1.0/go.mod"
+"rsc.io/sampler v1.3.0/go.mod"
+"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22"
+"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod"
+"sigs.k8s.io/cli-utils v0.16.0/go.mod"
+"sigs.k8s.io/controller-runtime v0.4.0/go.mod"
+"sigs.k8s.io/kustomize/api v0.8.11"
+"sigs.k8s.io/kustomize/api v0.8.11/go.mod"
+"sigs.k8s.io/kustomize/cmd/config v0.9.13/go.mod"
+"sigs.k8s.io/kustomize/kustomize/v4 v4.2.0"
+"sigs.k8s.io/kustomize/kustomize/v4 v4.2.0/go.mod"
+"sigs.k8s.io/kustomize/kyaml v0.4.0/go.mod"
+"sigs.k8s.io/kustomize/kyaml v0.11.0"
+"sigs.k8s.io/kustomize/kyaml v0.11.0/go.mod"
+"sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod"
+"sigs.k8s.io/structured-merge-diff/v4 v4.1.2"
+"sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod"
+"sigs.k8s.io/testing_frameworks v0.1.2/go.mod"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+"sigs.k8s.io/yaml v1.2.0"
+"sigs.k8s.io/yaml v1.2.0/go.mod"
+)
+go-module_set_globals
+MY_PV=${PV}+k3s1
+SRC_URI="https://github.com/k3s-io/k3s/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+	https://github.com/opencontainers/runc/archive/refs/tags/v1.0.0-rc95.tar.gz -> k3s-runc-${K3S_RUNC_VERSION}.tar.gz
+	https://helm.traefik.io/traefik/traefik-${K3S_TRAEFIK_VERSION}.tgz
+	https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz
+	amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+kubectl-symlink rootless"
+REQUIRED_USE="|| ( amd64 )"
+DEPEND="
+	app-misc/yq
+	net-firewall/conntrack-tools
+	rootless? ( app-emulation/slirp4netns )
+"
+RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )"
+RESTRICT+=" test"
+
+S=${WORKDIR}/${PN}-${MY_PV/+/-}
+
+k3s_unpack_filter() {
+	grep -v -F \
+		-e "k3s-runc-${K3S_RUNC_VERSION}.tar.gz" \
+		-e "traefik-${K3S_TRAEFIK_VERSION}.tgz" \
+		-e "k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz"
+}
+
+src_unpack() {
+	read -d '' A < <(printf -- '%s\n' ${A} | k3s_unpack_filter)
+	go-module_src_unpack
+	cd "${S}" || die
+	mkdir -p bin/aux build/static/charts cache || die
+	cp "${DISTDIR}/traefik-${K3S_TRAEFIK_VERSION}.tgz" build/static/charts/ || die
+	cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die
+	mv "${WORKDIR}/bin" "${S}/bin" || die
+	mv "${WORKDIR}/etc" "${S}/etc" || die
+}
+
+src_prepare() {
+	local filename pattern replacement
+	default
+
+	local RUNC_DIR=build/src/github.com/opencontainers/runc
+	mkdir -p "${RUNC_DIR}" || die
+	tar -x --strip-components=1 -f "${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}.tar.gz" -C "${RUNC_DIR}" || die
+	sed -e 's|mod=vendor|mod=readonly|g' -i "${RUNC_DIR}/Makefile" || die
+
+	sed -e 's:github.com/containerd/containerd => ./.empty-mod/:github.com/containerd/containerd => ./:' \
+		-i vendor/github.com/containerd/containerd/go.mod || die
+
+	# Disable download for files fetched via SRC_URI.
+	sed -e 's:^[[:space:]]*curl:#\0:' \
+		-e 's:^[[:space:]]*git:#\0:' \
+		-e 's:^rm -rf \${CHARTS_DIR}:#\0:' \
+		-e 's:^rm -rf \${RUNC_DIR}:#\0:' \
+		-e 's:yq e :yq -r :' \
+		-e "s:^setup_tmp\$:TMP_DIR=${S}/build/static/charts:" \
+		-i scripts/download || die
+	sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die
+	pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR'
+	filename=scripts/build
+	grep -qF "${pattern}" "${filename}" || \
+		die "failed to locate plugins clone command"
+	sed -e "s|${pattern}|mkdir -p \"\$WORKDIR\" \\&\\& tar -xzf \"${S}/cache/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz\" --strip-components=1 -C \"\$WORKDIR\"|" \
+		-e 's|rm -rf $TMPDIR||' \
+		-i "${filename}" || die
+	sed -e 's:/usr/local/bin:/usr/bin:g' -i k3s.service || die
+	sed -e 's|mod=vendor|mod=readonly|g' -i vendor/github.com/opencontainers/runc/Makefile || die
+}
+
+src_compile() {
+	mkdir -p build/data || die
+	"${BASH}" -ex ./scripts/download || die
+	./scripts/build || die
+	./scripts/package-cli || die
+}
+
+src_install() {
+	dobin "dist/artifacts/${PN}"
+	use kubectl-symlink && dosym k3s /usr/bin/kubectl
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	dodoc README.md
+}
diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index 3aa5e77b4bc5..1b34c54e289a 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -1,6 +1,8 @@
 AUX mpich-3.3-add-external-libdir-parameter.patch 8605 BLAKE2B 56a6c60362da3004c8762f6fe62f0a9a010904a38ed7998f5617598362669e7d083b2893781e24d96100b9cefffe5f51ed1d3a921ff14b511dea12622e8a5e0e SHA512 2533f0a92f517118bf3c145d3d3a6e446b0596cc6c5c79d5eebb13e55ee1ab35ce2356fa75db4029f45a3337888ff151a78e0ec1e02ef6c7cde56f85c189eb00
 DIST mpich-3.0.4.tar.gz 10921075 BLAKE2B 341aaac23277aed05a4448ea03d9caf1ee14cfe327a770c95d620fc1ee1ea7bfa6df36860aa44aad162eb6d630d35fdfb30ae9a866d67680ab71c7b4326c109c SHA512 f9d8b2cf561fe5f85c12512ef4dd7b0cf5ec8b53ddb07bfa0d1db2e3c8ae0382c77e0661f46b82ec96b05d18ea2d25328bb84e9528ac06e5925f30ec8ef030d0
 DIST mpich-3.3.tar.gz 27209008 BLAKE2B 3010f847456ed71a27e728b91887e04303a83b4abea883bf73d9794ff697052efe3bccd238933dc6e5fbc75e0be36004f1ae9fc7695a4e8887984552ae005917 SHA512 1ed6d8d30db4923fd1bd39b6e9622f0db939a45edf8d9f8bdbccfa619fde7fb920c5a0d3f2442f0dd63cf8fda823dbd2983ac5f7c16308bc79e04f61d8e119be
-EBUILD mpich-3.0.4.ebuild 2776 BLAKE2B 79e5f2ec638b50bf9658e6e5817f1985fe4c61592f6a8b872b03dc5190bbe61ab58da935545ea6344e6ad0f3ccbdd423917f1ca882125be43982c732832ede83 SHA512 c0e26db5c7f43767880f4bccd2c481996aa9f39ae41c682a19eaca176854da291b7d49800d5585c725459fa10c26af852c1b471dfb65501b70a204f8cf1a203d
+DIST mpich-3.4.2.tar.gz 32850822 BLAKE2B cbbb7d8b3c6db31c9ee8f59e6a386c000480a738819c8b4398e1299c0fdfce28649a3ebc868aa48517476d0b49d4d58e66407f2116708c3d9e61ce43f6e1c32b SHA512 5f5389071c7d275a864df16aedd19f2b925c9b9ad3b304f9c9f99b5808f6b82def775b4191c03cdd3288c5e4478a40a2aae22c3cf2aabe82be1dd612efd7f2a6
+EBUILD mpich-3.0.4-r1.ebuild 2844 BLAKE2B e304d1b825dcddf10991d5cebe966f5d4912e73b4112368136c2ca5cbb55e8e710d3e9c0ef4cd3319bbb10996f9b97a15fd8a8a4c9d167b731e5ce9915029033 SHA512 83685307f607e98d5cffd3744b8f07e518953364aeaa6c2f73fd0b15808dd5b3661900ec4a73b40a3af6d56b6c17def2062caa6117919a209364ef9dea6f8c6c
 EBUILD mpich-3.3-r1.ebuild 4083 BLAKE2B d9be698bedd0d128b5ffe866ce9a27e46f467473b857390fcf7d29b06bdbe2fe328630ef1d40ab45f2b7a0ddc397d3c4d2cea065ce218726175a9ec83fffc060 SHA512 9dc29556c1d17885dfab65cdd208d28f44d400ab1de5b620d1a899bbb49663217023dc712630a2764466fa3460fe0aceed6036fc10b1c4df74daad75777d321e
+EBUILD mpich-3.4.2.ebuild 4216 BLAKE2B ed2983b987d976d40e9ec4f2b1a31a6776c7918b7d84a1d2bc0649efb80f7155f0317efcd26cf46357ec832f3a239aa90fcc23281cf83a4f957870a47309bf7b SHA512 d8c8b3ea94b1acda6fe5ac2a3589e3581f7b40e46ca23988b71856f2e55b9a09e25418f66d5ac82488d70af901e73b4b3968e3d1c4283e5e62b04f05b0b047aa
 MISC metadata.xml 395 BLAKE2B 25cbe25bce4d76de586fdfb898e1925f047edeea1b9658f09db3c17f8c80056fea93a4a8f6bcd7d91d701ef7e94d5509f215290f97fbdff500b1e50c12f4814b SHA512 9f38dd49af31cad2d458ed8bcf674caf32ef12cfd93ec9548f6598cb8b54794bf7d1ba46a431172ee2938c5e66c8a54b5b238b0d48883f20f7e5b3148317d2d8
diff --git a/sys-cluster/mpich/mpich-3.0.4-r1.ebuild b/sys-cluster/mpich/mpich-3.0.4-r1.ebuild
new file mode 100644
index 000000000000..8d5657d59939
--- /dev/null
+++ b/sys-cluster/mpich/mpich-3.0.4-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 flag-o-matic
+
+MY_PV=${PV/_/}
+DESCRIPTION="A high performance and portable MPI implementation"
+HOMEPAGE="http://www.mpich.org/"
+SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="mpich2"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="+cxx doc fortran mpi-threads romio threads"
+
+COMMON_DEPEND="
+	dev-libs/libaio
+	<sys-apps/hwloc-2
+	romio? ( net-fs/nfs-utils )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	sys-devel/libtool"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/mpich2
+	!sys-cluster/openmpi"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+pkg_setup() {
+	FORTRAN_STANDARD="77 90"
+	fortran-2_pkg_setup
+
+	if use mpi-threads && ! use threads; then
+		ewarn "mpi-threads requires threads, assuming that's what you want"
+	fi
+}
+
+src_prepare() {
+	# Using MPICHLIB_LDFLAGS doesn't seem to fully work.
+	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
+		src/packaging/pkgconfig/mpich.pc.in \
+		src/env/*.in \
+		|| die
+}
+
+src_configure() {
+	local c="--enable-shared"
+
+	# The configure statements can be somewhat confusing, as they
+	# don't all show up in the top level configure, however, they
+	# are picked up in the children directories.
+
+	if use mpi-threads; then
+		# MPI-THREAD requries threading.
+		c="${c} --with-thread-package=pthreads"
+		c="${c} --enable-threads=runtime"
+	else
+		if use threads ; then
+			c="${c} --with-thread-package=pthreads"
+		else
+			c="${c} --with-thread-package=none"
+		fi
+		c="${c} --enable-threads=single"
+	fi
+
+	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
+	c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
+
+	# GCC 10 compatibility workaround
+	# bug #725842
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
+	export MPICHLIB_CFLAGS=${CFLAGS}
+	export MPICHLIB_CPPFLAGS=${CPPFLAGS}
+	export MPICHLIB_CXXFLAGS=${CXXFLAGS}
+	export MPICHLIB_FFLAGS=${FFLAGS}
+	export MPICHLIB_FCFLAGS=${FCFLAGS}
+	export MPICHLIB_LDFLAGS=${LDFLAGS}
+	# dropped w/ bug #725842 fix
+	#unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
+
+	# Possible workaround for bug #818280
+	append-flags -fcommon
+
+	# Forcing Bash as there's quite a few bashisms in the build system
+	CONFIG_SHELL="${BROOT}/bin/bash" econf ${c} \
+		--with-pm=hydra \
+		--disable-mpe \
+		--disable-fast \
+		--enable-smpcoll \
+		--enable-versioning \
+		--with-hwloc-prefix=/usr \
+		$(use_enable romio) \
+		$(use_enable cxx) \
+		$(use_enable fortran f77) \
+		$(use_enable fortran fc)
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	dodir /usr/share/doc/${PF}
+	dodoc README{,.envvar} CHANGES RELEASE_NOTES
+	newdoc src/pm/hydra/README README.hydra
+	if use romio; then
+		newdoc src/mpi/romio/README README.romio
+	fi
+
+	if ! use doc; then
+		rm -rf "${D}"usr/share/doc/${PF}/www*
+	fi
+}
diff --git a/sys-cluster/mpich/mpich-3.0.4.ebuild b/sys-cluster/mpich/mpich-3.0.4.ebuild
deleted file mode 100644
index 828fec76358a..000000000000
--- a/sys-cluster/mpich/mpich-3.0.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 flag-o-matic
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mpich.org/"
-SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="mpich2"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx doc fortran mpi-threads romio threads"
-
-COMMON_DEPEND="
-	dev-libs/libaio
-	<sys-apps/hwloc-2
-	romio? ( net-fs/nfs-utils )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	sys-devel/libtool"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/mpich2
-	!sys-cluster/openmpi"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_setup() {
-	FORTRAN_STANDARD="77 90"
-	fortran-2_pkg_setup
-
-	if use mpi-threads && ! use threads; then
-		ewarn "mpi-threads requires threads, assuming that's what you want"
-	fi
-}
-
-src_prepare() {
-	# Using MPICHLIB_LDFLAGS doesn't seem to fully work.
-	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
-		src/packaging/pkgconfig/mpich.pc.in \
-		src/env/*.in \
-		|| die
-}
-
-src_configure() {
-	local c="--enable-shared"
-
-	# The configure statements can be somewhat confusing, as they
-	# don't all show up in the top level configure, however, they
-	# are picked up in the children directories.
-
-	if use mpi-threads; then
-		# MPI-THREAD requries threading.
-		c="${c} --with-thread-package=pthreads"
-		c="${c} --enable-threads=runtime"
-	else
-		if use threads ; then
-			c="${c} --with-thread-package=pthreads"
-		else
-			c="${c} --with-thread-package=none"
-		fi
-		c="${c} --enable-threads=single"
-	fi
-
-	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
-	c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
-	# GCC 10 compatibility workaround
-	# bug #725842
-	append-fflags $(test-flags-FC -fallow-argument-mismatch)
-
-	export MPICHLIB_CFLAGS=${CFLAGS}
-	export MPICHLIB_CPPFLAGS=${CPPFLAGS}
-	export MPICHLIB_CXXFLAGS=${CXXFLAGS}
-	export MPICHLIB_FFLAGS=${FFLAGS}
-	export MPICHLIB_FCFLAGS=${FCFLAGS}
-	export MPICHLIB_LDFLAGS=${LDFLAGS}
-	# dropped w/ bug #725842 fix
-	#unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
-
-	# Forcing Bash as there's quite a few bashisms in the build system
-	CONFIG_SHELL="${BROOT}/bin/bash" econf \
-		--with-pm=hydra \
-		--disable-mpe \
-		--disable-fast \
-		--enable-smpcoll \
-		--enable-versioning \
-		--with-hwloc-prefix=/usr \
-		$(use_enable romio) \
-		$(use_enable cxx) \
-		$(use_enable fortran f77) \
-		$(use_enable fortran fc)
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	dodir /usr/share/doc/${PF}
-	dodoc README{,.envvar} CHANGES RELEASE_NOTES
-	newdoc src/pm/hydra/README README.hydra
-	if use romio; then
-		newdoc src/mpi/romio/README README.romio
-	fi
-
-	if ! use doc; then
-		rm -rf "${D}"usr/share/doc/${PF}/www*
-	fi
-}
diff --git a/sys-cluster/mpich/mpich-3.4.2.ebuild b/sys-cluster/mpich/mpich-3.4.2.ebuild
new file mode 100644
index 000000000000..21539e686ec2
--- /dev/null
+++ b/sys-cluster/mpich/mpich-3.4.2.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90"
+
+inherit fortran-2 multilib-minimal flag-o-matic
+
+MY_PV=${PV/_/}
+DESCRIPTION="A high performance and portable MPI implementation"
+HOMEPAGE="https://www.mpich.org/"
+SRC_URI="https://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="mpich2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+cxx doc fortran mpi-threads +romio threads"
+REQUIRED_USE="mpi-threads? ( threads )"
+
+COMMON_DEPEND=">=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
+	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+	sys-libs/libunwind[${MULTILIB_USEDEP}]
+	romio? ( net-fs/nfs-utils )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	sys-devel/libtool"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/mpich2
+	!sys-cluster/openmpi
+	!sys-cluster/nullmpi"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/mpicxx.h
+	/usr/include/mpi.h
+	/usr/include/opa_config.h
+)
+
+#PATCHES=(
+#	"${FILESDIR}"/${PN}-3.3-add-external-libdir-parameter.patch
+#)
+
+src_prepare() {
+	default
+
+	# Using MPICHLIB_LDFLAGS doesn't seem to fully work.
+	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
+		src/packaging/pkgconfig/mpich.pc.in \
+		src/env/*.in \
+		|| die
+
+	# Fix m4 files to satisfy lib dir with multilib.
+	#touch -r src/pm/hydra/confdb/aclocal_libs.m4 \
+	#	confdb/aclocal_libs.m4 \
+	#	|| die
+	#cp -fp confdb/aclocal_libs.m4 \
+	#	src/pm/hydra/confdb/aclocal_libs.m4 \
+	#	|| die
+	#cp -fp confdb/aclocal_libs.m4 \
+	#	src/pm/hydra/mpl/confdb/aclocal_libs.m4 \
+	#	|| die
+	#cd src/pm/hydra/mpl; eautoreconf; cd -
+	#cd src/pm/hydra; eautoreconf; cd -
+	#eautoreconf
+}
+
+multilib_src_configure() {
+	# The configure statements can be somewhat confusing, as they
+	# don't all show up in the top level configure, however, they
+	# are picked up in the children directories.  Hence the separate
+	# local vars.
+
+	local c=
+	if use mpi-threads; then
+		# MPI-THREAD requries threading.
+		c="${c} --with-thread-package=pthreads"
+		c="${c} --enable-threads=runtime"
+	else
+		if use threads ; then
+			c="${c} --with-thread-package=pthreads"
+		else
+			c="${c} --with-thread-package=none"
+		fi
+		c="${c} --enable-threads=single"
+	fi
+
+	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
+
+	# GCC 10 compatibility workaround
+	# bug #725842
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
+	export MPICHLIB_CFLAGS="${CFLAGS}"
+	export MPICHLIB_CPPFLAGS="${CPPFLAGS}"
+	export MPICHLIB_CXXFLAGS="${CXXFLAGS}"
+	export MPICHLIB_FFLAGS="${FFLAGS}"
+	export MPICHLIB_FCFLAGS="${FCFLAGS}"
+	export MPICHLIB_LDFLAGS="${LDFLAGS}"
+
+	# Dropped w/ bug #725842 fix
+	#unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
+
+	# Forcing Bash as there's quite a few bashisms in the build system
+	#
+	# Note that --with-device=ch3 is preserving the old 3.3.x default
+	# - keeping it for compatibility for now.
+	CONFIG_SHELL="${BROOT}/bin/bash" ECONF_SOURCE=${S} econf \
+		--enable-shared \
+		--with-hwloc-prefix="${EPREFIX}/usr" \
+		--with-hwloc-libdir="$(get_libdir)" \
+		--with-common-libdir="$(get_libdir)" \
+		--with-prefix-libdir="$(get_libdir)" \
+		--with-izem-libdir="$(get_libdir)" \
+		--with-fiprovider-libdir="$(get_libdir)" \
+		${c} \
+		--with-pm=hydra \
+		--with-device=ch3 \
+		--disable-fast \
+		--enable-versioning \
+		$(use_enable romio) \
+		$(use_enable cxx) \
+		$(use_enable fortran fortran all)
+}
+
+multilib_src_test() {
+	emake -j1 check
+}
+
+multilib_src_install() {
+	default
+
+	# fortran header cannot be wrapped (bug #540508), workaround part 1
+	if  use fortran; then
+		if multilib_is_native_abi; then
+			mkdir "${T}"/fortran || die
+			mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
+			mv "${ED}"/usr/include/*.mod "${T}"/fortran || die
+		else
+			rm "${ED}"/usr/include/mpif* "${ED}"/usr/include/*.mod || die
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	# Fortran header cannot be wrapped (bug #540508), workaround part 2
+	if use fortran; then
+		mv "${T}"/fortran/* "${ED}"/usr/include || die
+	fi
+
+	einstalldocs
+	newdoc src/pm/hydra/README README.hydra
+	if use romio; then
+		newdoc src/mpi/romio/README README.romio
+	fi
+
+	if ! use doc; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/www* || die
+	fi
+}
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index 39dfd58c0502..d0c24b4e3156 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -1,4 +1,4 @@
 AUX mpich2-1.5-fno-common.patch 531 BLAKE2B 1b7823e5c597384eb3dea589dfca0caee8fee9ed2887ac25c5152812fa1ea4e3e6d31669945e9c0c16b443e85c6fc9e075ad54b3b5d7a60fbc1921917b023978 SHA512 2e71c542e7cf4237c723dea527be06b6f37fd7f338810cf5a544b39234dda089b06ed58dd8e0ff5b7cdd3c716a0bae90b6e47c0bb03c865a93c962567d3267f5
 DIST mpich2-1.5.tar.gz 22826035 BLAKE2B 75075fbdd0111725e5bce1e828561125cdba2c91ecfb5af7c6ebd0603f8de05aa5813e57bf05b276607d0a6c0a378862b5631ab988f87e67299e7f651efdc76b SHA512 01ef68accdd60af805705c1c7a144a570eee6f01984939fe151a093f963c956fba366247b1058885ba1a2ff626278d30e928e03d394bd6cf2a4b6dab99586c15
-EBUILD mpich2-1.5.ebuild 2977 BLAKE2B 57e1ce873844d9a05b1dea78d4a8c949cf3c113fa3e43355edb8dfdc3deea72c4d7b81686e530dd39a8bc1a35836a0cc87790be1a95fa842c889a33c6e347f77 SHA512 c676dbd4663a4cb8b06e5bbd97805335501f21ba66898a5fefc4477bd9d4b21c6ff021853b3f77f9f4533c9e741d057b42c0521e7e4d1208e267592c319bf443
+EBUILD mpich2-1.5-r1.ebuild 2982 BLAKE2B a363e5f8de2e1e7e62b1cc9d40a66827a16a7a0435802e5794ca0e9b1079c5b07163cb8761f7c2fb4091d3903ac4707fc0003d3415679a1b49e397898aafdc91 SHA512 6d27ac06b7275f7caa8b4d1eb45ee87591f390b57c37885776df37354615e8deb0d43ed173394c057a041e2b496fbb564095d53632b8b61d0ab4b653cc17fc5b
 MISC metadata.xml 427 BLAKE2B 367f9a26db478ba0c84be955fe5861c50c9bcad56be08f07ed1d958b26f9d9529e6e1e7d0f24a0256306fc93062f5309a068ea2a661fbdcba837c95c7ab2eec5 SHA512 3c0b449002cf029ec027c9f0bb0c0025a142577a2f747eac4b0d96c62255bd76ce6233744eb844d05f2b93d51225e497f4e34357564a6fcce50176bc1cf51e77
diff --git a/sys-cluster/mpich2/mpich2-1.5-r1.ebuild b/sys-cluster/mpich2/mpich2-1.5-r1.ebuild
new file mode 100644
index 000000000000..b436f7e5fe9d
--- /dev/null
+++ b/sys-cluster/mpich2/mpich2-1.5-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit epatch fortran-2 flag-o-matic
+
+MY_PV=${PV/_/}
+DESCRIPTION="A high performance and portable MPI implementation"
+HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
+SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz"
+
+SLOT="0"
+LICENSE="mpich2"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="+cxx doc fortran mpi-threads romio threads"
+
+COMMON_DEPEND="
+	dev-libs/libaio
+	net-libs/libnsl:0=
+	sys-apps/hwloc
+	romio? ( net-fs/nfs-utils )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	sys-devel/libtool"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/mpich
+	!sys-cluster/openmpi"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+pkg_setup() {
+	FORTRAN_STANDARD="77 90"
+	fortran-2_pkg_setup
+
+	if use mpi-threads && ! use threads; then
+		ewarn "mpi-threads requires threads, assuming that's what you want"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fno-common.patch"
+
+	# Using MPICH2LIB_LDFLAGS doesn't seem to full work.
+	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
+		src/packaging/pkgconfig/mpich2.pc.in \
+		src/env/*.in \
+		|| die
+}
+
+src_configure() {
+	local c="--enable-shared --disable-static"
+
+	# The configure statements can be somewhat confusing, as they
+	# don't all show up in the top level configure, however, they
+	# are picked up in the children directories.
+
+	if use mpi-threads; then
+		# MPI-THREAD requries threading.
+		c="${c} --with-thread-package=pthreads"
+		c="${c} --enable-threads=runtime"
+	else
+		if use threads ; then
+			c="${c} --with-thread-package=pthreads"
+		else
+			c="${c} --with-thread-package=none"
+		fi
+		c="${c} --enable-threads=single"
+	fi
+
+	# GCC 10 compatibility workaround
+	# bug #725722
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
+	export MPICH2LIB_CFLAGS=${CFLAGS}
+	export MPICH2LIB_CPPFLAGS=${CPPFLAGS}
+	export MPICH2LIB_CXXFLAGS=${CXXFLAGS}
+	export MPICH2LIB_FFLAGS=${FFLAGS}
+	export MPICH2LIB_FCFLAGS=${FCFLAGS}
+	export MPICH2LIB_LDFLAGS=${LDFLAGS}
+	# dropped w/ bug #725722 fix
+	#unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
+
+	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
+	c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
+
+	# Forcing Bash as there's quite a few bashisms in the build system
+	CONFIG_SHELL="${BROOT}/bin/bash" econf ${c} \
+		--with-pm=hydra \
+		--disable-mpe \
+		--disable-fast \
+		--enable-smpcoll \
+		--enable-versioning \
+		$(use_enable romio) \
+		$(use_enable cxx) \
+		$(use_enable fortran f77) \
+		$(use_enable fortran fc)
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	dodir /usr/share/doc/${PF}
+	dodoc COPYRIGHT README{,.envvar} CHANGES RELEASE_NOTES
+	newdoc src/pm/hydra/README README.hydra
+	if use romio; then
+		newdoc src/mpi/romio/README README.romio
+	fi
+
+	if ! use doc; then
+		rm -rf "${D}"usr/share/doc/${PF}/www*
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-cluster/mpich2/mpich2-1.5.ebuild b/sys-cluster/mpich2/mpich2-1.5.ebuild
deleted file mode 100644
index 05eb7a68a7d2..000000000000
--- a/sys-cluster/mpich2/mpich2-1.5.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit epatch fortran-2 flag-o-matic
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
-SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz"
-
-SLOT="0"
-LICENSE="mpich2"
-KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx doc fortran mpi-threads romio threads"
-
-COMMON_DEPEND="
-	dev-libs/libaio
-	net-libs/libnsl:0=
-	sys-apps/hwloc
-	romio? ( net-fs/nfs-utils )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	sys-devel/libtool"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/mpich
-	!sys-cluster/openmpi"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_setup() {
-	FORTRAN_STANDARD="77 90"
-	fortran-2_pkg_setup
-
-	if use mpi-threads && ! use threads; then
-		ewarn "mpi-threads requires threads, assuming that's what you want"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fno-common.patch"
-
-	# Using MPICH2LIB_LDFLAGS doesn't seem to full work.
-	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
-		src/packaging/pkgconfig/mpich2.pc.in \
-		src/env/*.in \
-		|| die
-}
-
-src_configure() {
-	local c="--enable-shared --disable-static"
-
-	# The configure statements can be somewhat confusing, as they
-	# don't all show up in the top level configure, however, they
-	# are picked up in the children directories.
-
-	if use mpi-threads; then
-		# MPI-THREAD requries threading.
-		c="${c} --with-thread-package=pthreads"
-		c="${c} --enable-threads=runtime"
-	else
-		if use threads ; then
-			c="${c} --with-thread-package=pthreads"
-		else
-			c="${c} --with-thread-package=none"
-		fi
-		c="${c} --enable-threads=single"
-	fi
-
-	# GCC 10 compatibility workaround
-	# bug #725722
-	append-fflags $(test-flags-FC -fallow-argument-mismatch)
-
-	export MPICH2LIB_CFLAGS=${CFLAGS}
-	export MPICH2LIB_CPPFLAGS=${CPPFLAGS}
-	export MPICH2LIB_CXXFLAGS=${CXXFLAGS}
-	export MPICH2LIB_FFLAGS=${FFLAGS}
-	export MPICH2LIB_FCFLAGS=${FCFLAGS}
-	export MPICH2LIB_LDFLAGS=${LDFLAGS}
-	# dropped w/ bug #725722 fix
-	#unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
-
-	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
-	c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
-	# Forcing Bash as there's quite a few bashisms in the build system
-	CONFIG_SHELL="${BROOT}/bin/bash" econf \
-		--with-pm=hydra \
-		--disable-mpe \
-		--disable-fast \
-		--enable-smpcoll \
-		--enable-versioning \
-		$(use_enable romio) \
-		$(use_enable cxx) \
-		$(use_enable fortran f77) \
-		$(use_enable fortran fc)
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	dodir /usr/share/doc/${PF}
-	dodoc COPYRIGHT README{,.envvar} CHANGES RELEASE_NOTES
-	newdoc src/pm/hydra/README README.hydra
-	if use romio; then
-		newdoc src/mpi/romio/README README.romio
-	fi
-
-	if ! use doc; then
-		rm -rf "${D}"usr/share/doc/${PF}/www*
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index d87bc83bf95a..15e8271eddb1 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -13,6 +13,8 @@ DIST openmpi-4.0.2.tar.bz2 9819372 BLAKE2B 000faa8ff032f9aa6bf5f0a14fb9a363080cf
 DIST openmpi-4.0.3.tar.bz2 9856669 BLAKE2B 571e8038cdf125bfb452fbee44d8397f8e724498971409fb25e11cc90ad4d7f9106f4ad093d4722754303808b82c58bf3b39a72a2567192efd1b98422f09160f SHA512 01f773064c575a0fe6ab081c20c5cf07ba1c9eada5ecfe520d14ce2b9fc6d021d0f56a0159fa354fd6c8e2bb7354a272aa8d0063b351f59251deb56474849acc
 DIST openmpi-4.0.4.tar.bz2 9748444 BLAKE2B 3c3258b7cd71156deec317479ac1ea9766b09447b77174e448a63dab30f75a525c4142159ff58ad0b6208282e36d568e4cd4e7cc1f8b9b34cad8561ce2969a72 SHA512 6c193b4b5cbfd9d48fa5efcef01372c424b51ae5e9727ccf4235e3b14556dfeb010865e41a9473419ccda16559139aa469086b1fff9abfd337e87387fdec1c64
 DIST openmpi-4.0.5.tar.bz2 9752045 BLAKE2B 9709dc8c251d4f2be14d0ab498c5d0d0e59f95db98fb16d9e84fe3d30af5a8e2f9636bbceaf7ae4086a3312bcd6299f0e9e1ca609d658930a1f5abe1018311e1 SHA512 b7a1a5ccfc0eaa0f0504ff770b550480f7ae6727fa891e3310d9340a0d844a2ceddf62c2e59efd047ab9416b24c829919bbccd29606ca0e0d7a0569dad800011
+DIST openmpi-4.0.6.tar.bz2 9805015 BLAKE2B 2a476fc22a953bd8afb56153ca73e86e27a60ea1490bc1f2ac2a800d352876504e474d8cf8fc768e447ea9840413d7ae9eb7d852c14b0d751b90b86a6133b194 SHA512 4900a957756399464a74e7f685d5d0bf2b4672e274dc02f7de3e5ac07d9e890713d20ef424e0810368ace2315a2d3dea727bfeca980eb2d7cc99f12979dde22d
+DIST openmpi-4.1.1.tar.bz2 10052770 BLAKE2B 2f853ca44703197469e5ccd42ecd81de72d39f265e0da9d847e6b2f7a7646241b76346c71969bf6a3d4605c28f02de6b587fd0330c753ad7dec8503af0784b69 SHA512 0d85ba45a40c0879f266e5286615e2cf94eb3570f0a705194525821d5c85d460cefc3a2da8207e6e84c479d3d0da656e2342cc2d6f88c4b4577ca22bbeacc89d
 EBUILD openmpi-1.10.7.ebuild 6255 BLAKE2B 9c95f5795f1ae64079ee6196437bd10fa74cd94cbe38c2923d582ba50041e61fec23accffb9e21c259495b79a37d8a5cc151e6d81818fb7f7840bd40de666671 SHA512 45d7ca9d261a9309acc1e857e3e26ba63d0a39c95bcabca2023b2573c336d2d4ebe25213a037a986bfac38385cf5977ddabe16f7cebcf18a2f697a363fcf2469
 EBUILD openmpi-1.4.5.ebuild 2413 BLAKE2B 0e4c9ad51c2f7f44449b0a5d3e1400de600f5337d591dcb89eb938455afa24d891573e03abdfa7434432b8377ffb3f9aefc291881713de0b80fe50322b962ba7 SHA512 187962e3788b94607b9a22728c6f90405cd4c49007413e9d0cfb4df45d5e67f30bcd2129ae8132d08460d9760891f2b15539f995e481962d91c2b7c5a7005002
 EBUILD openmpi-1.6.5-r1.ebuild 4944 BLAKE2B 8e5686a037431c45d7ebde9e82e633f138dc887ca2f1cc2ae24e76dc800ace2a79f63f6c7804794cde1cad5ec7e84b00ded707d84424d7a6413da9c80359fb51 SHA512 008b5b5ad61126d5a758784f6c2c805a55837de6dc109c11758941e2e3a414d3361ba3dbb3959185e2b6b3f02eb7ecf4a8aadb76bea0b872e463c13620a48a08
@@ -25,6 +27,8 @@ EBUILD openmpi-3.1.4.ebuild 5356 BLAKE2B 2330d221b4b6f8cfb83abddd5c9d0ea62c733bf
 EBUILD openmpi-4.0.2.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
 EBUILD openmpi-4.0.3.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
 EBUILD openmpi-4.0.4.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
-EBUILD openmpi-4.0.5-r1.ebuild 5497 BLAKE2B 90af6a25648bf252c54055438260b229aa5b8a122dec07ec5649f8bec89aa04c041a2a5a18d887d9ca894ccabe8fadab64dda82ac89051e1498dd9d661bddfdd SHA512 29c5cf9d8109f8736cd966b7f26c175973ee5c0cbc4b4c8eadfc58da0dda0e83191226c86a85a7af3c2a93945c7f1df3aee1ead76a4a1c8859be2501131704a8
+EBUILD openmpi-4.0.5-r1.ebuild 5493 BLAKE2B 54a40d373efd7523f03b51ac5c3a10b0eb80395581c3c8951ce6aa6a46a3bdf0af01b73c89b228d8c7e1a350a78af34efd708cb851fc1aac88b88fd7c6f78312 SHA512 8a558fc006e424b85ade91510d3348f98941cee6a2725a140370cc30565c66840ca50cab7038172d61f6b1bb571b7245b976943fe67e9bdf9133a80c13156ac8
 EBUILD openmpi-4.0.5.ebuild 5379 BLAKE2B 4f710429ea2e112c0c1500371c199e990da8b15aed1df010372efcef84cc09b740f1ed39cac64170136f7f6831e475cc4643ec4424abde0501744f9c34667174 SHA512 da2d5951249ae7c4c191c8aef70bd092dae49593db86f675578d182b4e04888b9db5d13bea062ccf2e9702a5bf210b3f51658de4770d71c97cc13246995a841a
+EBUILD openmpi-4.0.6.ebuild 5499 BLAKE2B fbb71a014e7cd2f1a1972f8cb57e09a017d3bfbdf2741032014957aa73df61cebca92369e3bc090015b1ee9531f574644e2c38bd77e2bc7a759ade24c523d9b3 SHA512 3a3267eac9883d7e05036159bdaca16d8693375d6c9a37180776eb7797ee250fd9938c479f645b4eab599a7ecce5414dfd5e72669d33efb33873ee56fb135acd
+EBUILD openmpi-4.1.1.ebuild 5811 BLAKE2B a76789abb5e0b8e5b5224eed68714736f0b778286a84622b5f23c21ab233efea63f72525485e1e68752490033dad5526472e9ff82642be20bd96e0777e17b86c SHA512 3aaf933bb0c3f4049938b8ad2658e15f0d497878287167270a19e2302792e5d7d13d7f25dc2e1e4b4e5053b034214a3ebc24ef5b8e8d6eac03ed129bfc980231
 MISC metadata.xml 961 BLAKE2B 83fe60a3b125736b98fb8fde2deef0231d8dab694f251a1ca929360a92558774707da4f8085dbfa3431c311aabacaf06cefb0c2969126c95cee4996485cad87f SHA512 970e915852eb254419c67ba00df53034761e31ef12c63b3672ffcd1006a00e6ede30ae09d5ccd8c52e2d5899301cdecf24a477a67c8df9ec319e129705e9cd9c
diff --git a/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild b/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
index 6c1ca2a4c165..6973f379e279 100644
--- a/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.5-r1.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="https://www.open-mpi.org"
 SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux"
 IUSE="cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
diff --git a/sys-cluster/openmpi/openmpi-4.0.6.ebuild b/sys-cluster/openmpi/openmpi-4.0.6.ebuild
new file mode 100644
index 000000000000..47238b0329d1
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-4.0.6.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+IUSE_OPENMPI_FABRICS="
+	openmpi_fabrics_ofed
+	openmpi_fabrics_knem
+	openmpi_fabrics_psm"
+
+IUSE_OPENMPI_RM="
+	openmpi_rm_pbs
+	openmpi_rm_slurm"
+
+IUSE_OPENMPI_OFED_FEATURES="
+	openmpi_ofed_features_control-hdr-padding
+	openmpi_ofed_features_udcm
+	openmpi_ofed_features_rdmacm
+	openmpi_ofed_features_dynamic-sl"
+
+DESCRIPTION="A high-performance message passing library (MPI)"
+HOMEPAGE="https://www.open-mpi.org"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE="cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio
+	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
+
+REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
+	openmpi_rm_pbs? ( !openmpi_rm_slurm )
+	openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
+
+CDEPEND="
+	!sys-cluster/mpich
+	!sys-cluster/mpich2
+	!sys-cluster/nullmpi
+	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) )
+	openmpi_fabrics_knem? ( sys-cluster/knem )
+	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
+	openmpi_rm_pbs? ( sys-cluster/torque )
+	openmpi_rm_slurm? ( sys-cluster/slurm )
+	openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) )"
+
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.8:* )"
+
+DEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.8:* )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/mpi.h
+	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
+	/usr/include/openmpi/mpiext/mpiext_cuda_c.h
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	java-pkg-opt-2_pkg_setup
+
+	elog
+	elog "OpenMPI has an overwhelming count of configuration options."
+	elog "Don't forget the EXTRA_ECONF environment variable can let you"
+	elog "specify configure options if you find them necessary."
+	elog
+}
+
+src_prepare() {
+	default
+
+	# Necessary for scalibility, see
+	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
+	echo 'oob_tcp_listen_mode = listen_thread' \
+		>> opal/etc/openmpi-mca-params.conf || die
+}
+
+multilib_src_configure() {
+	if use java; then
+		# We must always build with the right -source and -target
+		# flags. Passing flags to javac isn't explicitly supported here
+		# but we can cheat by overriding the configure test for javac.
+		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	fi
+
+	local myconf=(
+		--enable-mpi-fortran=$(usex fortran all no)
+		--enable-orterun-prefix-by-default
+		--enable-pretty-print-stacktrace
+
+		--sysconfdir="${EPREFIX}/etc/${PN}"
+
+		--with-hwloc="${EPREFIX}/usr"
+		--with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)"
+		--with-libltdl="${EPREFIX}/usr"
+		--with-libevent="${EPREFIX}/usr"
+		--with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)"
+
+		$(use_enable cxx mpi-cxx)
+		$(use_enable heterogeneous)
+		$(use_enable ipv6)
+		$(use_enable libompitrace)
+		$(use_enable peruse)
+		$(use_enable romio io-romio)
+
+		$(use_with cma)
+
+		$(multilib_native_use_enable java mpi-java)
+		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding)
+		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm)
+		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm)
+		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl)
+
+		$(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda)
+		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr)
+		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr)
+		$(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr)
+		$(multilib_native_use_with openmpi_rm_pbs tm)
+		$(multilib_native_use_with openmpi_rm_slurm slurm)
+	)
+
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_test() {
+	# Doesn't work with the default src_test as the dry run (-n) fails.
+	emake -j1 check
+}
+
+multilib_src_install() {
+	default
+
+	# fortran header cannot be wrapped (bug #540508), workaround part 1
+	if multilib_is_native_abi && use fortran; then
+		mkdir "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
+	else
+		# some fortran files get installed unconditionally
+		rm \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			|| die
+	fi
+}
+
+multilib_src_install_all() {
+	# fortran header cannot be wrapped (bug #540508), workaround part 2
+	if use fortran; then
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
+	fi
+
+	# Remove la files, no static libs are installed and we have pkg-config
+	find "${ED}" -name '*.la' -delete || die
+
+	if use java; then
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
+		java-pkg_dojar "${mpi_jar}"
+		# We don't want to install the jar file twice
+		# so let's clean after ourselves.
+		rm "${mpi_jar}" || die
+	fi
+	einstalldocs
+}
diff --git a/sys-cluster/openmpi/openmpi-4.1.1.ebuild b/sys-cluster/openmpi/openmpi-4.1.1.ebuild
new file mode 100644
index 000000000000..84d39a7da2a5
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-4.1.1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit cuda fortran-2 java-pkg-opt-2 multilib-minimal
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+IUSE_OPENMPI_FABRICS="
+	openmpi_fabrics_ofed
+	openmpi_fabrics_knem
+	openmpi_fabrics_psm"
+
+IUSE_OPENMPI_RM="
+	openmpi_rm_pbs
+	openmpi_rm_slurm"
+
+IUSE_OPENMPI_OFED_FEATURES="
+	openmpi_ofed_features_control-hdr-padding
+	openmpi_ofed_features_udcm
+	openmpi_ofed_features_rdmacm
+	openmpi_ofed_features_dynamic-sl"
+
+DESCRIPTION="A high-performance message passing library (MPI)"
+HOMEPAGE="https://www.open-mpi.org"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE="cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio
+	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
+
+REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
+	openmpi_rm_pbs? ( !openmpi_rm_slurm )
+	openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
+
+CDEPEND="
+	!sys-cluster/mpich
+	!sys-cluster/mpich2
+	!sys-cluster/nullmpi
+	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) )
+	openmpi_fabrics_knem? ( sys-cluster/knem )
+	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
+	openmpi_rm_pbs? ( sys-cluster/torque )
+	openmpi_rm_slurm? ( sys-cluster/slurm )
+	openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) )"
+
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.8:* )"
+
+DEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.8:* )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/mpi.h
+	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
+	/usr/include/openmpi/mpiext/mpiext_cuda_c.h
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	java-pkg-opt-2_pkg_setup
+
+	elog
+	elog "OpenMPI has an overwhelming count of configuration options."
+	elog "Don't forget the EXTRA_ECONF environment variable can let you"
+	elog "specify configure options if you find them necessary."
+	elog
+}
+
+src_prepare() {
+	default
+
+	echo "void main() { return 0; }" > test/util/opal_path_nfs.c || die
+
+	# Necessary for scalibility, see
+	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
+	echo 'oob_tcp_listen_mode = listen_thread' \
+		>> opal/etc/openmpi-mca-params.conf || die
+}
+
+multilib_src_configure() {
+	if use java; then
+		# We must always build with the right -source and -target
+		# flags. Passing flags to javac isn't explicitly supported here
+		# but we can cheat by overriding the configure test for javac.
+		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	fi
+
+	local myconf=(
+		--enable-mpi-fortran=$(usex fortran all no)
+		--enable-orterun-prefix-by-default
+		--enable-pretty-print-stacktrace
+
+		--sysconfdir="${EPREFIX}/etc/${PN}"
+
+		--with-hwloc="${EPREFIX}/usr"
+		--with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)"
+		--with-libltdl="${EPREFIX}/usr"
+		--with-libevent="${EPREFIX}/usr"
+		--with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)"
+
+		$(use_enable cxx mpi-cxx)
+		$(use_enable heterogeneous)
+		$(use_enable ipv6)
+		$(use_enable libompitrace)
+		$(use_enable peruse)
+		$(use_enable romio io-romio)
+
+		$(use_with cma)
+
+		$(multilib_native_use_enable java mpi-java)
+		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding)
+		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm)
+		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm)
+		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl)
+
+		$(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda)
+		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr)
+		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr)
+		$(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr)
+		$(multilib_native_use_with openmpi_rm_pbs tm)
+		$(multilib_native_use_with openmpi_rm_slurm slurm)
+	)
+
+	CONFIG_SHELL="${BROOT}/bin/bash" ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+multilib_src_test() {
+	# -j1: doesn't work with the default src_test as the dry run (-n) fails.
+	# Explicit listing of test/* subdirs modulo util because of nfs test fails
+	# due to sandbox and couldn't find a sane way to skip it.
+	emake -j1 -C test asm class datatype dss event monitoring mpool spc support threads
+}
+
+multilib_src_install() {
+	default
+
+	# fortran header cannot be wrapped (bug #540508), workaround part 1
+	if multilib_is_native_abi && use fortran; then
+		mkdir "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
+	else
+		# some fortran files get installed unconditionally
+		rm \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			|| die
+	fi
+}
+
+multilib_src_install_all() {
+	# fortran header cannot be wrapped (bug #540508), workaround part 2
+	if use fortran; then
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
+	fi
+
+	# Remove la files, no static libs are installed and we have pkg-config
+	find "${ED}" -name '*.la' -delete || die
+
+	if use java; then
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
+		java-pkg_dojar "${mpi_jar}"
+		# We don't want to install the jar file twice
+		# so let's clean after ourselves.
+		rm "${mpi_jar}" || die
+	fi
+	einstalldocs
+}
diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest
index 05cd2519e1cb..db2aa0a53719 100644
--- a/sys-cluster/sanlock/Manifest
+++ b/sys-cluster/sanlock/Manifest
@@ -2,5 +2,7 @@ AUX sanlock-fence_sanlock-LDFLAGS.patch 504 BLAKE2B 11176057304ee5f841500921f1fa
 AUX sanlock.initd 249 BLAKE2B 18bafba28ab4449c7f25ab2d14b4ac2d3cc89cf79bfb8f802fd180584becde8a5b9d919ac9ab887a4ebdfe8ea64e53f30b3785bc32875ccd2e25fa99a9278081 SHA512 5ed7b2d96cb875e2db0914ec7232fe8443c05de69e07d214ffc0adfafac5123694173373f831c5acf46d11aa4fca304b88e6e4c4ee2fbe5b033d173eea5aec36
 AUX wdmd.initd 261 BLAKE2B 65b393f2f084896d3c17aa0345f9930badeec7a3ee4cc7e47bd0a35e47c18ea2bcf5afdc386c0da98988bc9fae479a68b504c244b55ab389ac7f5304c34282ae SHA512 9c7e980817c1c76868caff229b42a3d70e912abfd8c974bf5b856067bef79fbd3a5942b30bcb7d02869e2eba85e6f6ba3c861e9780046b01b25df1b39661b6c0
 DIST sanlock-3.8.2.tar.gz 266780 BLAKE2B 5248d08225bcc2a19594a3dcd3872c8c69ca8b217d31f6263f2717e4594180d4ba4685c9679ce2f31b6a2dcb4fe9f3e6a5dd5ac3ed073aea02599e7bbc04390c SHA512 2fa92e16eee4d2f3dac452400522f7e90b93b71349d322564d5957e2d87fb4bd69f0b5617b05f4b296c272d6da9a404fccadbbfff106354a0e302c436593eaac
+DIST sanlock-3.8.4.tar.gz 270031 BLAKE2B da011a15d488849d47fe1043df040580652558918dff9549bf4e6cb4077c03b4aaa8f8de5399dbb0e3f2301ae90c0d20599b25bd5e72bae5317b13f79a352333 SHA512 9fca2b18fd3bd504d5186de0b2626ea2c993997528de2384dc042afe52b2b68422a2e4bb79e2409c9e6eccbe5ea8d8939549eb25c5d16aa7fecf6c9a5798340c
 EBUILD sanlock-3.8.2.ebuild 2162 BLAKE2B 49264c2dc1d0cba149548ca16435426e5dccf9b9966da8538dbb770cd15b1d93e69e0cc5806865a13f9a0595aca7206a28bdeb89f592c64ff05f626f9e031ec9 SHA512 3504d179f274a424e82daeea0c144eb5ed3d35fd4c68bce64512c7ad404adb0c29642bd1cc450ad2786c4e6a36ca4f2f79844faef7017616fe1af37b922fa313
+EBUILD sanlock-3.8.4.ebuild 1786 BLAKE2B 64a758e9232dba6a62f460ac122df6aa7ce0c68343ffea859dc3fda79c1469f559fd8cf2f3629e9fac63186d02b946293a8b99b40a8482a4014baa363b7a8a50 SHA512 0342dd168f81aca19464e406c35d4b00a344eb2337d971e01b837aa5d263761cd6b09e996abe78c79d186cf71cd455d8cd139425fb7275dc0d9ccf69b9689d18
 MISC metadata.xml 369 BLAKE2B a32cbc5e109bab37912ecc7efe951fcec96fb133b2861d3c38290e5f3aabe87e444d38bdbb18b711ba5836c43c7ac7ebcde3b5f23ec10df8c413cbd445c05ddf SHA512 ac7cb5f13743775baecae83e2c6beb6988b4c374db96217136cd68124e947890de32c9d7afecbdafbac32b0ac450ec2580b923f0e9fb63ef944463e879cd8283
diff --git a/sys-cluster/sanlock/sanlock-3.8.4.ebuild b/sys-cluster/sanlock/sanlock-3.8.4.ebuild
new file mode 100644
index 000000000000..65418ff64118
--- /dev/null
+++ b/sys-cluster/sanlock/sanlock-3.8.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit linux-info python-r1 systemd
+
+DESCRIPTION="shared storage lock manager"
+HOMEPAGE="https://pagure.io/sanlock"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2+ GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	acct-user/${PN}
+	acct-group/${PN}
+	dev-libs/libaio
+	sys-apps/util-linux
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/sanlock-fence_sanlock-LDFLAGS.patch"
+)
+
+CONFIG_CHECK="~SOFT_WATCHDOG"
+
+src_compile() {
+	for d in wdmd src fence_sanlock reset; do
+		emake -C ${d}
+	done
+
+	if use python; then
+		python_foreach_impl emake -C python
+	fi
+}
+
+src_install() {
+	for d in wdmd src fence_sanlock reset; do
+		emake -C ${d} DESTDIR="${D}" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+	done
+
+	if use python; then
+		python_foreach_impl emake -C python DESTDIR="${D}" install
+	fi
+
+	# config
+	dodir /etc/wdmd.d
+	dodir /etc/sanlock
+	insinto /etc/sanlock
+	doins src/sanlock.conf
+
+	# init
+	newconfd init.d/sanlock.sysconfig sanlock
+	newconfd init.d/wdmd.sysconfig wdmd
+	newinitd "${FILESDIR}"/sanlock.initd sanlock
+	newinitd "${FILESDIR}"/wdmd.initd wdmd
+	#doinitd ${FILESDIR}/sanlk-resetd.initd
+	#doinitd ${FILESDIR}/fence_sanlockd.initd
+
+	# systemd
+	systemd_newunit init.d/sanlock.service.native sanlock.service
+	sed -i 's,^ExecStartPre=,#ExecStartPre=,' init.d/wdmd.service.native || die
+	systemd_newunit init.d/wdmd.service.native wdmd.service
+	systemd_dounit init.d/sanlk-resetd.service
+	#systemd_dounit ${FILESDIR}/fence_sanlockd.service
+}
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index d657955b9e17..a6d181d8b02e 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,5 +1,5 @@
 DIST singularity-3.8.0.tar.gz 7892955 BLAKE2B a75c9a5646cf5bfcc906bdda0e72e062787f6694322ca62ff329c63dfad051edc6c751e4e58cf01476a133947d87ad6230ba60e2d7b7da75ba654486a6c8d48c SHA512 b1e3dc673fbf58d8fa13bea4c67114d1abf0f17e86f1958f585795374107f6b18dd854899b4a574dc3e4d8d4abf4177c26e63c7c3436ae1d35c66331f1630272
 DIST singularity-3.8.3.tar.gz 7948604 BLAKE2B 67c8f4e52faf46a25c1bc16d4f05100f92cfb67b111898bebaeed827bb545f9d44fc3aaae99cbea020ec934c7dd3412b119a3f7f3f003f3e09a5e86dd2816957 SHA512 ede69bfa6602d75f67354afc215a1cf51db769df052662b77a8f1ac88cf580f13683190231452611ba618cda0e63af746dcdf59ab41611a9035bd199f8b50ec5
 EBUILD singularity-3.8.0.ebuild 1900 BLAKE2B a24c10ad485b5359a304caf1c85dcd1529e41d50070f842b9d36f1ef79c76edd51ed44f8bceddeea729038eb299e1a917036fef34f036413255033e3e4c0d3ae SHA512 32764eddc65b36a265c7527852b4b1709dca3f1cc17ad38ea75950fd2972643f0f13238df1e481fe392762ef6755e83707b64037b36f73dd18a923ee0f28058c
-EBUILD singularity-3.8.3.ebuild 1902 BLAKE2B 4a74b5f864d91a365ed02f1258acde2f9d9eb35eba1d30a15b7d9e588f6f208914a53b1618d0b9ce7578c86b48df16008ae70951201c1ffbf0f08ba493c4b0ba SHA512 efbf3bf5206298278de52089717652b4bd82c994d543a7594854c49473f23726b2836629c67ea23d2e635d8c26fe95512d4b606966883e2e54b6408d7533d742
+EBUILD singularity-3.8.3.ebuild 1909 BLAKE2B 345f4286e94ab41b16beb32498f84b10e9c53b70a94dd59f3be44f0762785ddb514dcef6c688541a11d02fa36b01426029a3f6802f175fbb34e6e8cafa789a52 SHA512 21c185762d6aa45e4e15301b3c3bfff41fa4d5ec46f79e4f8647d9a79debfc6f6852603a7f64b1ef547dd927c4e8c72646a552a21483ac88e8a595c6f27fabb0
 MISC metadata.xml 452 BLAKE2B 5b210e6e78898e3bd858298ec713422552846c5b89c28af42df7d3ccba7935abcacb0a0c190580016c24b311e9dab2804e46337a0ad9cc1de438ae100f1fc512 SHA512 17b00ea10ebd8b196a7c7f5e42d9ea693ae8dfa2749b65612f07b11ba88552223e6c1a5bfad774fdbf97fb399ac71a8dd0637c4f74344cf22cba76dfce4598bf
diff --git a/sys-cluster/singularity/singularity-3.8.3.ebuild b/sys-cluster/singularity/singularity-3.8.3.ebuild
index f65b278b7031..1875b1b03824 100644
--- a/sys-cluster/singularity/singularity-3.8.3.ebuild
+++ b/sys-cluster/singularity/singularity-3.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples +network +suid"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 42984da8f663..83c5d63ff14f 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -6,5 +6,5 @@ AUX slurmctld.initd 1842 BLAKE2B 25c9fd76dc888544888abb2790d8a0ae66254c0f8807bf4
 AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e609caa50f627d9bbf9c2d57bc6746b9c719a66cf2f4b0d756ecbbaf3bcd070846ad5ced6b289c9d SHA512 bb9447c25d2e96de1aea5935084ea78ea403701bd655d89d1a9d1d21bdbf88bdbae3888cfd618aabcc86dd8808401157ff84402ef35c4e138263457fd954046a
 AUX slurmdbd.initd 1717 BLAKE2B e177a937f8bd97bb2f45e479e0f34b23cc23ab44b0000165a856ff8476560638a567baecad8aa8d57aeb76062f248039da7f440ddca8f5827e4729136a10d7de SHA512 6d21f667f4222ab62dc8d7f648e00205da982612d58b98e8e35e6b6602b3ad31c03e5130402437c77d3677b424da7b5226e2bfa8c5d29bc908fd618fc02697a8
 DIST slurm-20-11-0-1.tar.gz 8762691 BLAKE2B 1e24a04b3faf97f4df98bd982d67d47f79670b863f466326e45e00fac0b99124122e94e30054a97471e4337234cbd213806791bdd5b3bddfeb05bef55f42931e SHA512 9a57f2610f7294ba6cd265746b874e32a7930100f30c0adf41d95b261787c441bdcacaa641f0b9785150b94fc7d6b5b7608ec618f668bffcae6f774752f17678
-EBUILD slurm-20.11.0.1-r101.ebuild 7971 BLAKE2B 1f43aeb7d45affe35d1c375069da2c162f1d2419ba8263737e882eaf60485b8ae64a6013e665f505ced1a01c60d3d7246a976e715a733e6292c6b82bfde86a65 SHA512 26baa23c5dc1c11b4f4fe4b48828fa78ca3cfe0ef51c13532126bad14a0be75cd83c6102816d881831d04c08202bb63b98b20ce38bc7fd56c151c0d8f719640c
+EBUILD slurm-20.11.0.1-r102.ebuild 8031 BLAKE2B 9d49b583a15f9337cd649b2fcec075d448324e5772154eab18c7ebc043c9eb77237315d8d9c74573b064b66ee7329d31b876e4568af2810360e2e786e90f071a SHA512 2bcd705cf29bf70d0aa93f466d0aea9462a739e0bcf8c2e61dc1ad06df65a917a2c3804dc74cb3dfc2a556e5c355a1228a42282dd9f4926f44ceb8e233294e99
 MISC metadata.xml 1092 BLAKE2B fc708ed8e57e531f3c2b10be663f2d64d2aa6606972ee0e5030e0d2fb2916f3b67947407c5a0505bd315dc7cfb91a49ef9b5db49a7134260fdbe6570cbca8710 SHA512 74d0cc46c6b4fbf7728cdf01c021c06c944797cc8a35d32e8b155920f2b9ff9240c5c8e8e4b7ce5b1ea435c36d4da95a36a3ef2875c2ff93f4820e6b4bc1214a
diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild
deleted file mode 100644
index f964ff1a8d43..000000000000
--- a/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
-	INHERIT_GIT="git-r3"
-	MY_P="${P}"
-else
-	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
-		MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
-	else
-		MY_PV=$(ver_rs 1-4 '-') # stable releases
-	fi
-	MY_P="${PN}-${MY_PV}"
-	INHERIT_GIT=""
-	SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv ~x86"
-fi
-
-inherit autotools bash-completion-r1 lua-single pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} tmpfiles
-
-DESCRIPTION="A Highly Scalable Resource Manager"
-HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X"
-
-COMMON_DEPEND="
-	!sys-cluster/torque
-	!net-analyzer/slurm
-	!net-analyzer/sinfo
-	|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
-	mysql? (
-		|| ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
-		slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) )
-		)
-	munge? ( sys-auth/munge )
-	pam? ( sys-libs/pam )
-	lua? ( ${LUA_DEPS} )
-	ipmi? ( sys-libs/freeipmi )
-	json? ( dev-libs/json-c:= )
-	amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) )
-	hdf5? ( sci-libs/hdf5:= )
-	numa? ( sys-process/numactl )
-	ofed? ( sys-fabric/ofed )
-	ucx? ( sys-cluster/ucx )
-	X? ( net-libs/libssh2 )
-	>=sys-apps/hwloc-1.1.1-r1
-	sys-libs/ncurses:0=
-	app-arch/lz4:0=
-	dev-libs/glib:2=
-	sys-libs/readline:0="
-
-DEPEND="${COMMON_DEPEND}
-	html? ( sys-apps/man2html )"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-user/slurm
-	acct-group/slurm
-	dev-libs/libcgroup"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	torque? ( perl )"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.11.0.1_autoconf-lua.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	tc-ld-disable-gold
-	default
-
-	# pids should go to /var/run/slurm
-	sed \
-		-e 's:/tmp:/var/tmp:g' \
-		-e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
-		-e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
-		-e "s:StateSaveLocation=.*:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
-		-e "s:SlurmdSpoolDir=.*:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
-		-i "${S}/etc/slurm.conf.example" \
-		|| die "Can't sed for /var/run/slurmctld.pid"
-	sed \
-		-e "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
-		-i "${S}/etc/slurmdbd.conf.example" \
-		|| die "Can't sed for /var/run/slurmdbd.pid"
-	# gentooify systemd services
-	sed \
-		-e 's:sysconfig/.*:conf.d/slurm:g' \
-		-e 's:var/run/:run/slurm/:g' \
-		-e '/^EnvironmentFile=.*/d' \
-		-i "${S}/etc"/*.service.in \
-		|| die "Can't sed systemd services for sysconfig or var/run/"
-
-	sed -e '/AM_PATH_GTK_2_0/d' -i configure.ac || die
-
-	hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--with-hwloc="${EPREFIX}/usr"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
-	use mysql || myconf+=( --without-mysql_config )
-	use amd64 && myconf+=( $(use_with netloc) )
-	econf "${myconf[@]}" \
-		$(use_enable debug) \
-		$(use_enable lua) \
-		$(use_enable pam) \
-		$(use_enable X x11) \
-		$(use_with munge) \
-		$(use_with json) \
-		$(use_with hdf5) \
-		$(use_with ofed) \
-		$(use_with ucx) \
-		$(use_enable static-libs static) \
-		$(use_enable multiple-slurmd)
-
-	# --htmldir does not seems to propagate... Documentations are installed
-	# in /usr/share/doc/slurm-2.3.0/html
-	# instead of /usr/share/doc/slurm-2.3.0.2/html
-	sed \
-		-e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
-		-i doc/html/Makefile || die
-	if use perl ; then
-		# small hack to make it compile
-		mkdir -p "${S}/src/api/.libs" || die
-		mkdir -p "${S}/src/db_api/.libs" || die
-		touch "${S}/src/api/.libs/libslurm.so" || die
-		touch "${S}/src/db_api/.libs/libslurmdb.so" || die
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${S}" || die
-		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
-	fi
-}
-
-src_compile() {
-	default
-	use pam && emake -C contribs/pam
-	if use perl ; then
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" perl-module_src_compile
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
-		cd "${S}" || die
-	fi
-	use torque && emake -C contribs/torque
-}
-
-src_install() {
-	default
-	use pam && emake DESTDIR="${D}" -C contribs/pam install
-	if use perl; then
-		cd "${LIBSLURM_PERL_S}" || die
-		S="${LIBSLURM_PERL_S}" perl-module_src_install
-		cd "${LIBSLURMDB_PERL_S}" || die
-		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
-		cd "${S}" || die
-	fi
-	if use torque; then
-		emake DESTDIR="${D}" -C contribs/torque
-		rm -f "${D}"/usr/bin/mpiexec || die
-	fi
-	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
-	# install sample configs
-	keepdir /etc/slurm
-	insinto /etc/slurm
-	doins \
-		etc/prolog.example \
-		etc/cgroup.conf.example \
-		etc/slurm.conf.example \
-		etc/slurmdbd.conf.example
-	exeinto /etc/slurm
-	keepdir /etc/slurm/layouts.d
-	# install init.d files
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
-	newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
-	# install conf.d files
-	newconfd "${FILESDIR}/slurm.confd" slurm
-	# install logrotate file
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" slurm
-	# install bashcomp
-	newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
-	bashcomp_alias scontrol \
-		sreport sacctmgr squeue scancel sshare sbcast sinfo \
-		sprio sacct salloc sbatch srun sattach sdiag sstat
-	# install systemd files
-	newtmpfiles "${FILESDIR}/slurm.tmpfiles" slurm.conf
-	systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
-}
-
-pkg_preinst() {
-	if use munge; then
-		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"/etc/conf.d/slurm || die
-	fi
-}
-
-create_folders_and_fix_permissions() {
-	einfo "Fixing permissions in ${@}"
-	mkdir -p ${@} || die
-	chown -R ${PN}:${PN} ${@} || die
-}
-
-pkg_postinst() {
-	paths=(
-		"${EROOT}"/var/${PN}/checkpoint
-		"${EROOT}"/var/${PN}
-		"${EROOT}"/var/spool/${PN}/slurmd
-		"${EROOT}"/var/spool/${PN}
-		"${EROOT}"/var/log/${PN}
-		/var/tmp/${PN}/${PN}d
-		/var/tmp/${PN}
-		/run/${PN}
-	)
-	local folder_path
-	for folder_path in ${paths[@]}; do
-		create_folders_and_fix_permissions $folder_path
-	done
-	echo
-
-	tmpfiles_process slurm.conf
-
-	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
-	elog "through a (javascript enabled) browser to create a configureation file."
-	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
-	echo
-	elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
-	elog "Your kernel must be compiled with the wanted cgroup feature:"
-	elog "    For the proctrack plugin:"
-	elog "        freezer"
-	elog "    For the task plugin:"
-	elog "        cpuset, memory, devices"
-	elog "    For the accounting plugin:"
-	elog "        cpuacct, memory, blkio"
-	elog "Then, set these options in /etc/slurm/slurm.conf:"
-	elog "    ProctrackType=proctrack/cgroup"
-	elog "    TaskPlugin=task/cgroup"
-	einfo
-	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
-	for folder_path in ${paths[@]}; do
-		ewarn "    ${folder_path}"
-	done
-}
diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r102.ebuild b/sys-cluster/slurm/slurm-20.11.0.1-r102.ebuild
new file mode 100644
index 000000000000..4ec46d7d5f58
--- /dev/null
+++ b/sys-cluster/slurm/slurm-20.11.0.1-r102.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
+	INHERIT_GIT="git-r3"
+	MY_P="${P}"
+else
+	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
+		MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
+	else
+		MY_PV=$(ver_rs 1-4 '-') # stable releases
+	fi
+	MY_P="${PN}-${MY_PV}"
+	INHERIT_GIT=""
+	SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+inherit autotools bash-completion-r1 lua-single pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT} tmpfiles
+
+DESCRIPTION="A Highly Scalable Resource Manager"
+HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd static-libs ucx torque X"
+
+# See bug #813924 for hdf5lib < dep, needs proper fix
+COMMON_DEPEND="
+	!sys-cluster/torque
+	!net-analyzer/slurm
+	!net-analyzer/sinfo
+	|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
+	mysql? (
+		|| ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
+		slurmdbd? ( || ( dev-db/mariadb:* dev-db/mysql:* ) )
+		)
+	munge? ( sys-auth/munge )
+	pam? ( sys-libs/pam )
+	lua? ( ${LUA_DEPS} )
+	ipmi? ( sys-libs/freeipmi )
+	json? ( dev-libs/json-c:= )
+	amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) )
+	hdf5? ( <sci-libs/hdf5-1.12:= )
+	numa? ( sys-process/numactl )
+	ofed? ( sys-fabric/ofed )
+	ucx? ( sys-cluster/ucx )
+	X? ( net-libs/libssh2 )
+	>=sys-apps/hwloc-1.1.1-r1
+	sys-libs/ncurses:0=
+	app-arch/lz4:0=
+	dev-libs/glib:2=
+	sys-libs/readline:0="
+
+DEPEND="${COMMON_DEPEND}
+	html? ( sys-apps/man2html )"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-user/slurm
+	acct-group/slurm
+	dev-libs/libcgroup"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	torque? ( perl )"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LIBSLURM_PERL_S="${S}/contribs/perlapi/libslurm/perl"
+LIBSLURMDB_PERL_S="${S}/contribs/perlapi/libslurmdb/perl"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.11.0.1_autoconf-lua.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	tc-ld-disable-gold
+	default
+
+	# pids should go to /var/run/slurm
+	sed \
+		-e 's:/tmp:/var/tmp:g' \
+		-e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
+		-e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
+		-e "s:StateSaveLocation=.*:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
+		-e "s:SlurmdSpoolDir=.*:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
+		-i "${S}/etc/slurm.conf.example" \
+		|| die "Can't sed for /var/run/slurmctld.pid"
+	sed \
+		-e "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
+		-i "${S}/etc/slurmdbd.conf.example" \
+		|| die "Can't sed for /var/run/slurmdbd.pid"
+	# gentooify systemd services
+	sed \
+		-e 's:sysconfig/.*:conf.d/slurm:g' \
+		-e 's:var/run/:run/slurm/:g' \
+		-e '/^EnvironmentFile=.*/d' \
+		-i "${S}/etc"/*.service.in \
+		|| die "Can't sed systemd services for sysconfig or var/run/"
+
+	sed -e '/AM_PATH_GTK_2_0/d' -i configure.ac || die
+
+	hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--sysconfdir="${EPREFIX}/etc/${PN}"
+		--with-hwloc="${EPREFIX}/usr"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
+	use mysql || myconf+=( --without-mysql_config )
+	use amd64 && myconf+=( $(use_with netloc) )
+	econf "${myconf[@]}" \
+		$(use_enable debug) \
+		$(use_enable lua) \
+		$(use_enable pam) \
+		$(use_enable X x11) \
+		$(use_with munge) \
+		$(use_with json) \
+		$(use_with hdf5) \
+		$(use_with ofed) \
+		$(use_with ucx) \
+		$(use_enable static-libs static) \
+		$(use_enable multiple-slurmd)
+
+	# --htmldir does not seems to propagate... Documentations are installed
+	# in /usr/share/doc/slurm-2.3.0/html
+	# instead of /usr/share/doc/slurm-2.3.0.2/html
+	sed \
+		-e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
+		-i doc/html/Makefile || die
+	if use perl ; then
+		# small hack to make it compile
+		mkdir -p "${S}/src/api/.libs" || die
+		mkdir -p "${S}/src/db_api/.libs" || die
+		touch "${S}/src/api/.libs/libslurm.so" || die
+		touch "${S}/src/db_api/.libs/libslurmdb.so" || die
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		cd "${S}" || die
+		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
+	fi
+}
+
+src_compile() {
+	default
+	use pam && emake -C contribs/pam
+	if use perl ; then
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" perl-module_src_compile
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
+		cd "${S}" || die
+	fi
+	use torque && emake -C contribs/torque
+}
+
+src_install() {
+	default
+	use pam && emake DESTDIR="${D}" -C contribs/pam install
+	if use perl; then
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" perl-module_src_install
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
+		cd "${S}" || die
+	fi
+	if use torque; then
+		emake DESTDIR="${D}" -C contribs/torque
+		rm -f "${D}"/usr/bin/mpiexec || die
+	fi
+	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+	# install sample configs
+	keepdir /etc/slurm
+	insinto /etc/slurm
+	doins \
+		etc/prolog.example \
+		etc/cgroup.conf.example \
+		etc/slurm.conf.example \
+		etc/slurmdbd.conf.example
+	exeinto /etc/slurm
+	keepdir /etc/slurm/layouts.d
+	# install init.d files
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
+	# install conf.d files
+	newconfd "${FILESDIR}/slurm.confd" slurm
+	# install logrotate file
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" slurm
+	# install bashcomp
+	newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
+	bashcomp_alias scontrol \
+		sreport sacctmgr squeue scancel sshare sbcast sinfo \
+		sprio sacct salloc sbatch srun sattach sdiag sstat
+	# install systemd files
+	newtmpfiles "${FILESDIR}/slurm.tmpfiles" slurm.conf
+	systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
+}
+
+pkg_preinst() {
+	if use munge; then
+		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"/etc/conf.d/slurm || die
+	fi
+}
+
+create_folders_and_fix_permissions() {
+	einfo "Fixing permissions in ${@}"
+	mkdir -p ${@} || die
+	chown -R ${PN}:${PN} ${@} || die
+}
+
+pkg_postinst() {
+	paths=(
+		"${EROOT}"/var/${PN}/checkpoint
+		"${EROOT}"/var/${PN}
+		"${EROOT}"/var/spool/${PN}/slurmd
+		"${EROOT}"/var/spool/${PN}
+		"${EROOT}"/var/log/${PN}
+		/var/tmp/${PN}/${PN}d
+		/var/tmp/${PN}
+		/run/${PN}
+	)
+	local folder_path
+	for folder_path in ${paths[@]}; do
+		create_folders_and_fix_permissions $folder_path
+	done
+	echo
+
+	tmpfiles_process slurm.conf
+
+	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
+	elog "through a (javascript enabled) browser to create a configureation file."
+	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
+	echo
+	elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
+	elog "Your kernel must be compiled with the wanted cgroup feature:"
+	elog "    For the proctrack plugin:"
+	elog "        freezer"
+	elog "    For the task plugin:"
+	elog "        cpuset, memory, devices"
+	elog "    For the accounting plugin:"
+	elog "        cpuacct, memory, blkio"
+	elog "Then, set these options in /etc/slurm/slurm.conf:"
+	elog "    ProctrackType=proctrack/cgroup"
+	elog "    TaskPlugin=task/cgroup"
+	einfo
+	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
+	for folder_path in ${paths[@]}; do
+		ewarn "    ${folder_path}"
+	done
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 56585f520883..5ef81de59526 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 82939e46d85d..7e403130ef2b 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -17,6 +17,6 @@ DIST autoconf-2.71.tar.xz 1292296 BLAKE2B 7fd4b98b4cfff10720e8da6ee9104563799164
 EBUILD autoconf-2.13-r1.ebuild 1520 BLAKE2B 4b98ba08406846f4556eb46c223dd98e0ec034bd5a1246af248581542a3c9254d8b2fc879362095ad99c6bb842243ed582df27dc865c0b29d30482ec2e2aeee4 SHA512 1cdb6bca636c241af2a3dcc314929ac690bcef2ff12b5748ab335aacde795a25821dd4c4ed4053c3af10e48693c6c691d7b0904e67910e9462cd554ab9b4b024
 EBUILD autoconf-2.64-r1.ebuild 648 BLAKE2B 02c8390b16a7efe5900562658ec4797d21a8958f4eb40874104928b9eb256c3a50e0d1a7f5de24f2c71f6343c50149049f184f3d1d3ae2aea75444aeb4f42c50 SHA512 7d101553e2175ccdda97570402dad92ae6ae8224aa95549e035fea6fa15347e2ae3a2cf7f74a119e1c70bf7685bf3dfa46b394611b700f850268c8d99a3a88e0
 EBUILD autoconf-2.69-r5.ebuild 1820 BLAKE2B 3b103cb825ca98cb30cc358029a99f91121ed5dddd29a6ce1d4496c6be41cfa9c6175ad6ffda44e7dad54ae54db51df774ba68a4138210dc8d0d64f8b1bd5241 SHA512 eb60a3e852d5ed3722ad3d03405cba0eb9840d056af86039078426b687ef34522ea8b8090645a56502e4afd0095e1faa4305474901890b72bf6ec00aaeb38835
-EBUILD autoconf-2.71-r1.ebuild 2132 BLAKE2B ca461ec73b4a0041403b1dd2928cdf2e1e95f5649b4a15c99e605fc383ca07265139f5cce381431911b577d8ac1e97be95447cd43d13a59d21ad1dccb14b1a9f SHA512 2452c75a08686a921dacc9f349ff9a8850322d1f82ce9218cfc1ab57ad090927f80183f2f3d07ee178775d73da2120861fc01928c756a8eede12728a2bbb52a3
+EBUILD autoconf-2.71-r1.ebuild 2129 BLAKE2B 5d6e2e3297569338a31cafa98c9b7e5f640642732786e8bd239330edb9b07fec5847278a131e8e2198be06924874edcf651825d7f9d75d260011a4e77529ce42 SHA512 5cb7e35d1387a4e1cfc6c1eb1dfe73affb2cc7a81d624694a9fe4a03af597d5fc1ee33ad93f9fec16c5a5cb8e49c5424dc9ab7a606a7f32e084788e455119686
 EBUILD autoconf-9999.ebuild 1415 BLAKE2B 58fd01a12db47c27edd002fdd2a93b6cf962d60827b83d60faeb1081871af4eb7007427a9fb51e6416f7f293364db616dda8cf5a08083faece80c89f385c2291 SHA512 bf49a37cb2a48296029564503f4faf665de99c256bf9149fbc1f6c4678d6aef56037fe425e8c123fe2deaf4eb40c682ccbab5e9178fb5188cba059cb0ba50fa3
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-devel/autoconf/autoconf-2.71-r1.ebuild b/sys-devel/autoconf/autoconf-2.71-r1.ebuild
index 0f1fae2b4e02..2421cf85b368 100644
--- a/sys-devel/autoconf/autoconf-2.71-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.71-r1.ebuild
@@ -15,7 +15,7 @@ else
 		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz"
 	#SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz"
 	[[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 9bf524afbf50..a75a9d9e0d60 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -17,11 +17,12 @@ DIST gcc-9.4.0-patches-1.tar.bz2 14012 BLAKE2B d5fbfd73d9c3a5b66be5b124d981fe5a7
 DIST gcc-9.4.0.tar.xz 72411232 BLAKE2B 4bb000d33d6bd2d6cc91c040713f27f79dcf726ef8ab1542c711e0c25651507628510b1373bc73aef71ffb660afddb2eb8d8c8540f5f1498ee243cfff6c0be67 SHA512 dfd3500bf21784b8351a522d53463cf362ede66b0bc302edf350bb44e94418497a8b4b797b6af8ca9b2eeb746b3b115d9c3698381b989546e9151b4496415624
 EBUILD gcc-10.3.0-r2.ebuild 446 BLAKE2B 2d0f1773e9aaa6710b7295b26ab55fe4d77653d85de88af392f7c8886db005b4aa47bfee8649cfb4d9f8f9aa447601d2aa97edd1e94f65b79e2600e4a5e3ed6f SHA512 f0c182f9fb60ad9dee98cbfa3f34e68d0a9101e9d583741e4147c168550d3e93f9d27236ea1dc59f42fb8179bfc115a7a89773a89b9aafb0f8e99052194f0cc7
 EBUILD gcc-10.3.1_pre9999.ebuild 649 BLAKE2B 7c2d1e2d939433104d3fb01de2dbdb12b6022a503d2252d8371f699577eb289276897440113bc70745deb7057819d63890be8c0fd0022c02cc6d565fb1c1307e SHA512 eaca9dd9ac89a354beae99d38d7df2004289d281236f4a41457afbba563dcc8f6c1bfe24e8ea9219019c2b7e1c9abb67f428c96389fc9f6b8263db2af66ff3ef
-EBUILD gcc-11.2.0.ebuild 290 BLAKE2B 6b94604283cf63809aa912ab2984f6ca668571723e6a0526fd09ead95a3b79797f22a9c8b0bf5bb80733eadddc7320a602e81e1621a1e954758dd6ed134034ce SHA512 bb845cacc8b9b0e2032c2cbe9b2c9a304276ac6d1cb6aa72c625a3c1afba61fd73098f438e96e7aa647229fa9bbdca37001dcc79b41be416345d49c10b76045f
+EBUILD gcc-11.2.0.ebuild 283 BLAKE2B 1f1f231235ff6f62a2ff6e8604239606fcd3f6b767f09526e7a956178bab7cf78995d026cb4513f11ccbb23fa2cea71627aee4ebac1cc18b0838308ec691cfe3 SHA512 702487d84c6293e1b12d8e5ac13dae86936ca5e282666bc5e2a9c69a8008653c36261cf6115ed8dd611bc9c2e70a067d79ad3f1d4d7926bd3dfabab47ddbfcbe
 EBUILD gcc-11.2.1_pre9999.ebuild 527 BLAKE2B 69ad8ded1819b6b584ddac3ad639750d5d13f465854bf88093d0a48f5f83f5919ff66014ff0ae67167e88d3282cb108291a0ffe86147f7f505396c77a887a017 SHA512 0011d0d43953cbcd1afa201005f52bc13bedffeab1a45469d6d7b60e2e04343b1a4385dd8bf684e442858ab80b314aa849184e3353e0e3adf44839c3753de4ad
 EBUILD gcc-12.0.0_pre9999.ebuild 367 BLAKE2B f4d4fae47ad12381f9f25e4c97964d7a155f7b1c186a324c8c96109559da063f5f568a168e32a078e1afe39bfa786260a7a3785bfed648c68156fe14ad3bce56 SHA512 2a4e545ba1ee6f16f0301a367097b0253dd9f786873b45b31be2b0284605dbb9bc8d6c34d4f0a2d7825e92fa6c8fcedca4b680e1cb7d4446574c0d993c8918c9
 EBUILD gcc-6.5.0-r4.ebuild 445 BLAKE2B 2f3d0d7d881671cb42296b53441f8c379bea95dcb83348fc9d993b1c586c828a82188ca39688a728a32e1d37f19a5bc5148e339654477c5383d90e29dc527ca3 SHA512 1c2fcee4393c001dfe1718ac6bc7ace20df0b77bfc9cf1c94683a60f3c0d42cf62b8e6afe4d8938937eef870083b7026491cc3c4952d67fa81894e543ec4653a
 EBUILD gcc-7.5.0-r2.ebuild 456 BLAKE2B 4d675d65bb34c51225f2f490409ed63f0f95a3f9bec9c1e034127ad0ac4fed7f104fc5febb761133873505807c6cc6b44b8ce8d51d0faef26843feed6cf1f933 SHA512 057ed372182d4bd5afb51459e0bc563fa05590feb5e0a859123a2d20d9f052cd23d2ac70923f58c827ebec3e419cfb6cb1d370feb58d39a02089fa3bd4d90921
 EBUILD gcc-8.5.0-r1.ebuild 444 BLAKE2B 9ccc45a2aee8c0a692f7b56efbdd817d5a9202a531de95dfc09a283dc67494df97843146bca9aca701522c22932036a9236ea678f3d643d049faa05bec53ae22 SHA512 d2fefd74e875ce17e2f4bf8e4135bb36a45cfbb1ab7c7ff4847eaf53a368656c8e5a1eba039a909623cc4bd4f4905249da6b291c7327b791a25dbab0008c4f5c
 EBUILD gcc-9.4.0.ebuild 444 BLAKE2B 502cc25c645a8568cda444c75f5ab23498e121b77e3d50e100fa32663707f61ff4796bd13b54d72a6e2d348b7b50b0f783e1a24f6cf94304094850f02fc371e6 SHA512 696de505f81344d66c437d2402b9b45b4a8c9dafbf65d2778c3b178a74b86892c6c48d2f41db7ad79ae615b33796b366a33e8dfd438ae28615c0e43a2b4e6d33
+EBUILD gcc-9.4.1_pre9999.ebuild 526 BLAKE2B 91cd7c5793fcb8b52e0ef75d32aef9d2e8fbaeb13353b1bc562c3ab2e17c748a340c66f60dc0641c4f162ad69ab95ff1ac34081924bb3a8f82f98cbe7e74d2d1 SHA512 cee74704109204b5c28b7a806903611eb7f9025fb64abf2e5a215139a9613c747af5c359116c4bdffd312d7614a11c9b33420e7b8874666dca5bb54ee69490e7
 MISC metadata.xml 2705 BLAKE2B ec4b5cd50851bdf9ee60d4ef721f7e711f70cc54e0ef5fbbe7e3e73712c248bf450b7772ebbe9491e144636a29dc1b0d500408cd5e7699248af8f75f4240657d SHA512 e288b60c8b2f281f88cd56a1d534baa2616c41e5bdef525e9c8ed44074a78fc962a13d307c5e3bbac8a235936d7b10463117fa05329f69242a4ddcafbcfa5440
diff --git a/sys-devel/gcc/gcc-11.2.0.ebuild b/sys-devel/gcc/gcc-11.2.0.ebuild
index 7ed0fc66d6a2..193f8b813ec4 100644
--- a/sys-devel/gcc/gcc-11.2.0.ebuild
+++ b/sys-devel/gcc/gcc-11.2.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
diff --git a/sys-devel/gcc/gcc-9.4.1_pre9999.ebuild b/sys-devel/gcc/gcc-9.4.1_pre9999.ebuild
new file mode 100644
index 000000000000..8c31f450a34c
--- /dev/null
+++ b/sys-devel/gcc/gcc-9.4.1_pre9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_GCC_VER="9.4.0"
+PATCH_VER="1"
+
+inherit toolchain
+
+# Don't keyword live ebuilds
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 50b42a0b081e..f946cee40016 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -7,7 +7,7 @@ DIST gdb-10.2.tar.xz 21518900 BLAKE2B c5d31d80d2b454767d6f844e8471b012ad437c3872
 DIST gdb-11.1.tar.xz 22040696 BLAKE2B 6a639f6533f4008bfb469c23a26c4fcd039f1bc5dd33745f4876344451beb595d7a8843caeb5db70214924624c5b999f8831237d459bebf1cb2d2866f8b41ee2 SHA512 c40bf970e2f7c2107b29c5aa6a7150daa709d75ddadb73ac20742419d4637d158e3063a4c6ff6e47fae8ca8e1d36253973f85ea15445d004be6d5d7a2dd9bd46
 EBUILD gdb-10.1.ebuild 7003 BLAKE2B b98d23ee8b9ba2d9fa573e488fd8f4d941ff34b6e2afc4b7a6d2e7e74ec444f379ac2af9da840cd811aa823ebb5905e426200765bfaf0f0ada06574866ee768d SHA512 bfd8581d2d9cf4631769b1366997974cf08449d4b2166fc48d8b7a5ca9f56560a1350a4141e92946f98176b998780ca118c199d4e0873b3a5f59d1e7bc238c40
 EBUILD gdb-10.2-r1.ebuild 7094 BLAKE2B f958c527865171cd695f3da60857d8ece8cb44cbafa22a1760536170e6d556770e7204ae3e4063f6b29cf4ee3b1f75ef94143328b8011fc54c819fb3e53958d9 SHA512 d67c05ce13c341506e50fe5fd51d699f5416c6ccead0ece810893d1c0704c652e9f49939c1a815f93ca3e80d951027a5898aca4191c78d4018fdddcfa97f3269
-EBUILD gdb-10.2.ebuild 7047 BLAKE2B 2bcaea9fa86e92c1d3fc4579583f174fbfb48ee0c3acd1fae561111489b2aa0bac001b7b78bced7f27029ef527b4766d1ccf193cb32a770d95c1ce5853ead2ee SHA512 391f5552cc263c4d676a2d6aa144679f283f90744434a92654e4b3d320b9bc25e55cdf2efe8101e9e8cb46bf06b184972e92ff0b6287ee61fa00aa67aa7933b6
+EBUILD gdb-10.2.ebuild 7045 BLAKE2B 85d2a4b2ac11a44c46e42a00a4fd36de82d6b9d9e8fc1134625550356d93f115aab03bb5d16b9c5c7a876193c2351ad5de15160a39efe4bea44627a7c375d8c3 SHA512 07dc3c738ee21e83f6cd59b171f7c9676774693522ff22e6ef126698052a8e29bc0c64d3d6683ffb75d6d4b4be2d20f7eb5e6bd808346bfbcf4b91d330bb47fa
 EBUILD gdb-11.1.ebuild 7009 BLAKE2B 1b660541d730d7e449b76d12f0ca05b8bdf4695721fe79344ee1630ec336137bb34f4f4fb3640f790fd218e1dcd5fc04dce2055c0ddb7ac8e4c92e1a122e15af SHA512 8da08ee0856f5550faec5a5e6d45f07a4c21766f39d425d65bd7ebc94bf138b83c4c53f16dc8bbd04a66be965a61ef7d3b17f83dc26561fe192e1d76a2050a4a
 EBUILD gdb-9999.ebuild 7009 BLAKE2B 1b660541d730d7e449b76d12f0ca05b8bdf4695721fe79344ee1630ec336137bb34f4f4fb3640f790fd218e1dcd5fc04dce2055c0ddb7ac8e4c92e1a122e15af SHA512 8da08ee0856f5550faec5a5e6d45f07a4c21766f39d425d65bd7ebc94bf138b83c4c53f16dc8bbd04a66be965a61ef7d3b17f83dc26561fe192e1d76a2050a4a
 MISC metadata.xml 1103 BLAKE2B e63ea2e52649ac2f4ac21381cadb7cc76525792e99a4a6581535475480b6c45e654c8222b0b58585435d4c858cf3eef00dcaecf7edecae2b2fd336f1b56e6e56 SHA512 f7f1b4da71b18cb68a2f32aa6faae6251528047069071c9bee1be504267d0baf2cbac4fb928e0cbe9df100e3a681e2c3b6c7be14514a45a2f52d30364a8626f4
diff --git a/sys-devel/gdb/gdb-10.2.ebuild b/sys-devel/gdb/gdb-10.2.ebuild
index bdb30edb1d9e..7cd5db524ba2 100644
--- a/sys-devel/gdb/gdb-10.2.ebuild
+++ b/sys-devel/gdb/gdb-10.2.ebuild
@@ -44,7 +44,7 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 36c175ffc158..d40ff0edb0fa 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/ipw2100-firmware/Manifest b/sys-firmware/ipw2100-firmware/Manifest
index 9aaf07a7ac4f..48abd1ef50d2 100644
--- a/sys-firmware/ipw2100-firmware/Manifest
+++ b/sys-firmware/ipw2100-firmware/Manifest
@@ -1,3 +1,3 @@
 DIST ipw2100-fw-1.3.tgz 248471 BLAKE2B 97c56f1887cc6f577b99f8b0e9c1f30f424f28209d6d587922c539b8eacc8663960ea7d4e8713e774fa85ad5d8d38e9ce86bdadcab4d64599ef231294e4ba6e8 SHA512 1e1b8406a795a2f7f9d4d5ba533293daf1a3f3583dbe6eac45849176da8fc46d261bf4ca6a0b236c67c48313b6ff0feb5f9f2019cacbef65471dc0d36e1e1114
-EBUILD ipw2100-firmware-1.3.ebuild 450 BLAKE2B ca69d7f2bb2655402eb6ae2217e229f8f1d427265df1c5249e7e55fb50f2deea9d5387ca3a4e142517ec683510e5167114dbfad624a1d5b106441f5786246ac0 SHA512 6537616bf61e3b135841b4c9b78ce2d360933517edf480603770a8e9fac39e0f14e5627141a0892e44c4bc672d21c97eb1c06365c10c49002a107da34603e101
+EBUILD ipw2100-firmware-1.3.ebuild 455 BLAKE2B f0a0139794545964d22aa1f432181ca298db0738534923b2f3eb0699e28db5fe29abde9520184c976f0a21233331acd4a67185741e5d4425722bfb4ca1a343ec SHA512 2b493ad2a4a14450c35c7e25fc9d39da992d355acbd6cf8b871fd90d8e08f23e85b4915fa442a9de56b3c9f89af3337ce3962ba8556f9e1a32db8ec5e846752f
 MISC metadata.xml 245 BLAKE2B 0e4e0b3f268d663228557d57d6d86ecd89c4dca5e05d5ce6f4b9c212e1a2588b31507eaab431434ca2bca560e8bb2c24da265cdf2337a54718017e5fd5ea3324 SHA512 68a419c88b7a89fa2e24de4cc155ef87453b4c963ace41e10040b4725c539f3d4e71a3d9f5f4f5b292d66450437fc62267fcc5909ecb574d77021b9a3ad6101b
diff --git a/sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3.ebuild b/sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3.ebuild
index f38b631d786f..81a6a3c86cfa 100644
--- a/sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3.ebuild
+++ b/sys-firmware/ipw2100-firmware/ipw2100-firmware-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="ipw2100-fw"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-firmware/ipw2200-firmware/Manifest b/sys-firmware/ipw2200-firmware/Manifest
index edc8a2e43513..8100e4f983fa 100644
--- a/sys-firmware/ipw2200-firmware/Manifest
+++ b/sys-firmware/ipw2200-firmware/Manifest
@@ -1,3 +1,3 @@
 DIST ipw2200-fw-3.1.tgz 270042 BLAKE2B f6ab1abb14a48a027da86d2c1823964abc70f7972da602338bee2cdd0ef351683adf9ffe31a292aea2ad7397e5669b998e2394cf59586f03a3afb436f2cdcbd1 SHA512 b588566d67a31e8e5c464991f2de5420822816528a388829e36ba47080d2edd10794b0b1d05562035c54e9bb9a9999504a2ff099a37157c39b3c71b125748ad8
-EBUILD ipw2200-firmware-3.1.ebuild 489 BLAKE2B 4c995e269ec9ba407da92ffc2f4f78c1d9cb73cca7469eefc9eb40bbde95298d4ba547287243fcffe00ab972c1d2d9e2d249980f6fab9741b54592b8f14b75c0 SHA512 0535d0bd281920056f446de7bd396d830a1e4fce6202e990cbc36b3890b095f8eee43e622a05f5d09657438ddfaf739241b598bab92895976f8eaa628320e06b
+EBUILD ipw2200-firmware-3.1.ebuild 494 BLAKE2B 2ff4fd12b8bbacee5d837c37920b275c598535eff033f02ab22c24a82e7c4b84d5c9e61b7b23708359438f3c1d0767754f9e822be9bed1aaa2ced217e76dc68d SHA512 a0a2092c0e8ffbf84d5596157016cdb0f0b665d14869c2d38cdfa46bec75d5b5f8ddb57f91ee2e77f4af47c61ba6c8498f29e80817d24e9d51abe2c07e1f8d1d
 MISC metadata.xml 245 BLAKE2B f666a868c69acfcf75dfb107e77fcaf20be792ede63985fe4955eba3df40ba0e0564be6cb0c435152b08575a4834b26d3ee34f86313c92c974a7ca13f8318bd7 SHA512 b968fc05dfd29023b131be7419fd7577506fd8de0f537733dddb87e4432188449e02a33e4f0636e0b441d8d7fc86f759c30a0647041217c84d0b619d2b305237
diff --git a/sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1.ebuild b/sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1.ebuild
index c3fb4a57f708..93ff56de95eb 100644
--- a/sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1.ebuild
+++ b/sys-firmware/ipw2200-firmware/ipw2200-firmware-3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.bughost.org/firmware/${MY_P}.tgz"
 
 LICENSE="ipw2200-fw"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/sys-firmware/sof-firmware/Manifest b/sys-firmware/sof-firmware/Manifest
index 3bf6a488f9b5..cfe481132549 100644
--- a/sys-firmware/sof-firmware/Manifest
+++ b/sys-firmware/sof-firmware/Manifest
@@ -1,20 +1,5 @@
-DIST sof-firmware-1.4.2-sof-apl-v1.4.2.ldc 73536 BLAKE2B 48d52c5cd9a65ddacac2c69a5b455fc6073125e504925a35bcd67168ab7d6caef91fd874d7a1b5434b4b9d340746479bc2c87e04287cd04113a959f6b08e8d65 SHA512 9cd9ba944511f708f186c86d66f0a0af64b441b1d204fcbb52c38e0b052f3baeea03a45b069a6c77d22ba2c178df845762b1cbede62b71aa481334b982a93d2d
-DIST sof-firmware-1.4.2-sof-apl-v1.4.2.ri 282624 BLAKE2B b818b9a422fddb6ff46f649fc0fc21a1327745b1b059a74ffa9ab3c5dc82ef83560010fac0ee8dc73b63a6ebc46bb992a0b572c0e844f7a913b3837fe6c77afd SHA512 53ec06f5ac3d0e3aad5e4a4916e228e8aacc030c7e19fdf5f64ea3438bdfc318359164fc9791b27b4b07001e02e41e1f64aae4b00b441b44caadf4f6ef8f0b3b
-DIST sof-firmware-1.4.2-sof-bdw.ldc 61176 BLAKE2B 79ba2b04a76eb1e97962194963d33d2ff927427aff09c019f2e6f9e68e599abef8bcc63e4e218cd4828d2fd3cb1bcde1c5da4b9f94be74fe1e6201d55dfaa6a8 SHA512 b2bda94e8397f6439b14ed581430bb02b735c002f876cda8e25076f80a12d6550123cad5b872c2cdc6c6a9a9a6946c16cd824c3c9ca2ca00e669c97d25e12451
-DIST sof-firmware-1.4.2-sof-bdw.ri 109616 BLAKE2B 6519f0e8d1d4c63abec67ab454bae480c7908267bec70b0edd3b69ae6ff346e10efa5f27236034879b5f3401aa6ba82f0b91502f07411d78164532e946184ed3 SHA512 77a0ab8051f5b2a5021cd398e6f550b68700e98d6f5f8c2f6676d2fc9ba51ca74b6bf48abc49e6619a5b60483d22cd91af7bc989efe989bf759a85aa2f634db7
-DIST sof-firmware-1.4.2-sof-byt.ldc 40976 BLAKE2B 3b43f4da1c30635b044abf781430584e966d35ddac35536bdd4fcaa211f9c637527aeb928569d0149e5ef0a161759a23d424dcb7f75061a84878b5776682fbd8 SHA512 924d2a6bab3dbade14d2d004d690e3bbf334db765a544941dee315b38946ee841f38739613198276a5e41109a5b26b7083dba044d35b93d7da3dce3116cf386a
-DIST sof-firmware-1.4.2-sof-byt.ri 88164 BLAKE2B 425a9615f49aabbc0aec157487b5f1a04f0d45efdbf34bf6ca8882c09512e5a75075399ad7761028f00a763b6fbb6c13905184684ef1b2c7d3be3b17cebf5184 SHA512 70a0674aaa6bb08fe2ed3d089c75532c2228b851d8f026489024f52db2bdbbec0ab68dc70657422336a102d3fe5908a6fa05ab0b670803a4a2cc7b6428f04d17
-DIST sof-firmware-1.4.2-sof-cht.ldc 40976 BLAKE2B 3b43f4da1c30635b044abf781430584e966d35ddac35536bdd4fcaa211f9c637527aeb928569d0149e5ef0a161759a23d424dcb7f75061a84878b5776682fbd8 SHA512 924d2a6bab3dbade14d2d004d690e3bbf334db765a544941dee315b38946ee841f38739613198276a5e41109a5b26b7083dba044d35b93d7da3dce3116cf386a
-DIST sof-firmware-1.4.2-sof-cht.ri 88972 BLAKE2B a0f4eb77c84cb2f20926a501e6333c9d223e2680320a3ee1d279288ff79e699a7b46a9e47e4a864abdf55dc4cd85851134d0582e972b15d03316235d919323e7 SHA512 3e26e74708f677dd3e1b1e75ee1664b8ebff5185af32174771bcedc62189bd2469f03bf168033bc426fa8b6d3f4d42fea7c423d6678977acc9def5ee0c78f58a
-DIST sof-firmware-1.4.2-sof-cnl-v1.4.2.ldc 74704 BLAKE2B d94e91760e02124ed74e27cba74e5fa63ce012562fdcdbb00aec5f29bf9e9ffb890eefbad9c13b13a70f9747f8600441f7511e14fac535aa42dd6ebf331ae3fd SHA512 345336ed952c02c6dd2f442067cc30480398bf2faeb588d6bfda1c0d099cf40bd9c14ecc63ce53facdb9b1c501410238f2f276340af3d90ce3969f604a8885a7
-DIST sof-firmware-1.4.2-sof-cnl-v1.4.2.ri 286720 BLAKE2B d0385ad6d73503cc62e1c284ebf92f08fb7a73115b1889d8054a59a94468f56eef1a47490870d0e58b6e3f0a38d22a26a46aeeeb788a028ee3982cfcfce292b1 SHA512 3b4ba753ce1652f068c1a78d38b6c03b3fa08e9f829ff78a71efa8708ede2a08b0baf9b3f70b91f8efff8d595a64e46eaa8ac43b33c8fcebf96cbde50db0679d
-DIST sof-firmware-1.4.2-sof-icl-v1.4.2.ldc 74240 BLAKE2B f2729a3dd3e4b33c7c0fc7ef9ee11b19d9ad1016e8d94706285420eb0fe3dd9f9e725d4d2f2a61dc2c3d129d336050da784e3e0c027bd19915af329c993d4cce SHA512 e6d520f300079175e9602bc01ab6f91d742ea8afabdf4f0ef49f08d6dfa0ecf791825d8839b0e0f84055cdd09e23faa53ec87aede7a40da6c043da430582a487
-DIST sof-firmware-1.4.2-sof-icl-v1.4.2.ri 286720 BLAKE2B 1acbfb116be92f6934980ac8ac9d28d603ac623337ad9e1156dffa07e803f609982e25cb50cceb1a00f38900053ba2efde9769ec5a4ce57250b3ad278adff9fb SHA512 3f301ec5b532b130889d7973b3a7b21e14857f6b9b355d5e29339148ead94aef3d6646c809fafe3b3e5ea49a363109e4919cfe1ac4025a0ddf23b670702a1ef2
-DIST sof-firmware-1.4.2-sof-imx8.ldc 60848 BLAKE2B a17be83147fa58eb71698e9d7306d918e398097b9935e3a2160056a49b78ef2dcbd01d2984853813b4628e6f2810bf7ab7f5e82b0e5f804c4fd671ed37042b06 SHA512 42c548368de0eee13e95a303ccea051a4909a3e47ee497c4c7ea304778d1518723ccd4ccebdd6588c58990bf3cb18ea310cfa05025e4ba9b9b28faccbff5bb2a
-DIST sof-firmware-1.4.2-sof-imx8.ri 115472 BLAKE2B ffb9fabdb388354b409881489594c411cc3c0fcbabb05688585696ad7b15f4a54a3f2786df811217b81cff210088e7e67ef1ae5e54c3e4e7827c69aa32ca5f87 SHA512 86e267cdd8fe835bdab7e082f0e9c527e8283757759c70069af52d4e23440439565380b10011fb746afed13a3fb2f1aadcaf54e45740b08b40a1f5455b57e05b
-DIST sof-firmware-1.5.1.tar.gz 1611811 BLAKE2B 7408ba12f1375cb3d6c20e1654be225e8ab11e8b1471c54bd0a498ed1fad11954c57f68a7e483223117c5469278507b1d05e077420a1f58efb2eb0d2b4e95078 SHA512 0e3273f681dc3c0ee075bfb10e689e7ae8d8c0604f9d849f5bd991793d272e06ce7664a0b5829a9b93993d0576683824ee0ac5f8d1efe0b94a705a3e7ae34903
 DIST sof-firmware-1.6.1.tar.gz 3033953 BLAKE2B 0c33bd9a5d17c3b889219bf926d3619e3e448ff6b16e39b4caffe19e87c98d1227b303ebe80d185f93480ead29f37de39093f3e76f275df7836d3250ae47c566 SHA512 71acd34662ffd4d93f6111dfd046ed358184fdf24d0e118da43770aeee45bd15105b688bc5a569f2cb7941724ec822d2cfbab8a08e9caee1a77aa5763ac7b48e
-EBUILD sof-firmware-1.4.2.ebuild 841 BLAKE2B b172de0cd4c5e24416eb66eab28376d6cbdf27fbcb23aae9df844203f3be7247faf5e3adb77f3b7cc9f66cd8da7f0ba4f040d92335f41350224692676ae2f86d SHA512 53b90e002111c5f0359ac55e505810a06f57a660138a4f5dec3c57e10c6c77415b91779e6de36f60b4e6f9a3307241c671ab13d7ca6b420483e447bf328497c7
-EBUILD sof-firmware-1.5.1.ebuild 678 BLAKE2B fb603fefd24e027b76b47430abb2c84dd25a108447ac3cad7b24cd6ecfd6bddb49a5dd83e33abd73ebf74591a4c1647ede7d2f321c8cff201c190dcbce56058b SHA512 04215ec02969c0f3a7ae84faa8f06a6567b999ca91761720c02d4cb981f0cfd76d338e8e83ae5b3d5988d48e06d92fde8eb33c078af05c72644b0f2a9105d2ba
+DIST sof-firmware-1.9.tar.gz 3470302 BLAKE2B 597467915a658beda5611177c550b51a15720dfde23f1a55ea91217e7e809ff5c6417c6cc449e5d4a1732ffc03f9f817407951410646c9431ec189e8b141f60e SHA512 aee733381edb2150f2132c296e9151b1d6a71246e204b15c2394587c528286f730ceaf02002e1e58ccea0deba5e4ae81cb7a03efb858ac954633b0cfaec81a22
 EBUILD sof-firmware-1.6.1.ebuild 641 BLAKE2B 3ec766a6799d4a6e482522d79c8d985f4927240b31553578b1aa9edd314a8900d11aba8c89cf1a8d2cb49fe01e9c56719768cb6bbfad38e7a865a4f24ee53d7e SHA512 7433f8983f80b1fa8b7af27e50c8036d860ad16149917fd6457521166797e846fcbd2ae54936388bab1d36965dc3ba5570d83f75228e9e9adcc89c7e44b3b642
-MISC metadata.xml 295 BLAKE2B 9a339c92348fdc012a527b688c0b940791d106fe3e3399bda8c202e79180938e7638c8894a017ddff0fa11c946ed381016d3b2191554588f791930f40de381d5 SHA512 c7c4bf9a238eb7a199f21909bb3ce84252900e4f808bcd65fcc657e78c820b2495f67111c4f77b496dd0315eae7ae47e0e401f8e3841f888ce389ef7efb40aaa
+EBUILD sof-firmware-1.9.ebuild 657 BLAKE2B 3f95821a60304502fefe03f615462cc7103283019799634db50953d903dce7faea714a5ee5a53cd005880ce54915b42442db35a9adfcbc504183cefcd62af761 SHA512 c97d3b1d28a8581ab60622f1843bf5168a36697744817d8a9a650114e6a7246941c6727489ba2f8e015c3838c7321b9532ccb95410e2c92554800391b1bea58b
+MISC metadata.xml 218 BLAKE2B b13b149202bf20882c38ce2cfd0e1c4ea9a15f584ff819022fd74261c2f73dc52efe21fe1e621fd84406527ab86bd29147ef34c895ccf9de3596ce58cb59d846 SHA512 068fda6c090090d62a719b26812505efa881b855004ed63dea86b1ee9b698d5d6ccd3210366e7cfa886f886c77e31b90cd69ec015e67286ce0611483304e798f
diff --git a/sys-firmware/sof-firmware/metadata.xml b/sys-firmware/sof-firmware/metadata.xml
index 787640b90d49..437d32a9f916 100644
--- a/sys-firmware/sof-firmware/metadata.xml
+++ b/sys-firmware/sof-firmware/metadata.xml
@@ -4,7 +4,4 @@
 <maintainer type="project">
 <email>alsa-bugs@gentoo.org</email>
 </maintainer>
-<maintainer type="person">
-<email>dilfridge@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/sys-firmware/sof-firmware/sof-firmware-1.4.2.ebuild b/sys-firmware/sof-firmware/sof-firmware-1.4.2.ebuild
deleted file mode 100644
index fc321654b92d..000000000000
--- a/sys-firmware/sof-firmware/sof-firmware-1.4.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sound Open Firmware (SOF) binary files"
-
-HOMEPAGE="https://www.sofproject.org"
-
-MY_FILELIST=(
-	sof-apl-v${PV}.ldc
-	sof-apl-v${PV}.ri
-	sof-bdw.ldc
-	sof-bdw.ri
-	sof-byt.ldc
-	sof-byt.ri
-	sof-cht.ldc
-	sof-cht.ri
-	sof-cnl-v${PV}.ldc
-	sof-cnl-v${PV}.ri
-	sof-icl-v${PV}.ldc
-	sof-icl-v${PV}.ri
-	sof-imx8.ldc
-	sof-imx8.ri
-)
-MY_SRC_URI_BASE="https://github.com/thesofproject/sof/releases/download/v${PV}"
-
-for my_file in "${MY_FILELIST[@]}" ; do
-	SRC_URI+="${MY_SRC_URI_BASE}/${my_file} -> ${P}-${my_file}  "
-done
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	insinto /lib/firmware
-	for my_name in ${A} ; do
-		newins "${DISTDIR}/${my_name}" "${my_name#${P}-}"
-	done
-}
diff --git a/sys-firmware/sof-firmware/sof-firmware-1.5.1.ebuild b/sys-firmware/sof-firmware/sof-firmware-1.5.1.ebuild
deleted file mode 100644
index b3ae03432846..000000000000
--- a/sys-firmware/sof-firmware/sof-firmware-1.5.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sound Open Firmware (SOF) binary files"
-
-HOMEPAGE="https://www.sofproject.org https://github.com/thesofproject/sof https://github.com/thesofproject/sof-bin"
-SRC_URI="https://github.com/thesofproject/sof-bin/archive/stable-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-S=${WORKDIR}/sof-bin-stable-v${PV}
-
-src_compile() {
-	sed -i -e '1i #!/bin/bash\nset -e' \
-		   -e '/^ROOT=/d' \
-		   -e "s/^VERSION=.*/VERSION=v${PV}/" go.sh || die
-}
-
-src_install() {
-	mkdir -p ${D}/lib/firmware || die
-	ROOT=${D} ${S}/go.sh || die
-}
diff --git a/sys-firmware/sof-firmware/sof-firmware-1.9.ebuild b/sys-firmware/sof-firmware/sof-firmware-1.9.ebuild
new file mode 100644
index 000000000000..73dbc489b0e4
--- /dev/null
+++ b/sys-firmware/sof-firmware/sof-firmware-1.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Sound Open Firmware (SOF) binary files"
+
+HOMEPAGE="https://www.sofproject.org https://github.com/thesofproject/sof https://github.com/thesofproject/sof-bin"
+SRC_URI="https://github.com/thesofproject/sof-bin/releases/download/v${PV}/sof-bin-v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S=${WORKDIR}/sof-bin-v${PV}
+
+QA_PREBUILT="/usr/bin/sof-logger"
+
+src_install() {
+	dodir /lib/firmware/intel
+	dodir /usr/bin
+	FW_DEST="${D}/lib/firmware/intel" TOOLS_DEST="${D}/usr/bin" "${S}/install.sh" v${PV} || die
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 5384b477f059..5e0b850f7677 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 83916a48fec4..060767a998ce 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,10 +1,8 @@
 DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d
-DIST btrfs-progs-v5.13.1.tar.xz 2237108 BLAKE2B 6de5d70d1b3611dc7c502530c08f9b58da798b33a97a415a787c5ed55b3369432f362c4d61636b6c85d952bf4482125a2d59397214ac543cf7160de28fe20a0b SHA512 4ef8256da59614d17316db9c19909a2aa4f0557504201e421332c63a4935dbd6578791484b9f3f2dbeaaa28f6f4b4fd59c5a7adf6853fd76546ac213a0f09823
 DIST btrfs-progs-v5.14.1.tar.xz 2247384 BLAKE2B 70eb5f1f3f4b7acc2d4f662c0484984903a09c03bd4d3bd6e15ac712318c3ee9a3621e682f1d33a8b2b25280a63801e1a71d574c55dbd28e205e7fb4b549af47 SHA512 d706322b3c82825ab0eedc952a5e68642483539af5f3bf84d751ffed09d5e997f188370734145c7eb8b109be5bf6d77a2e3731521b3e34d46e1a454eef6bfb56
-DIST btrfs-progs-v5.14.tar.xz 2246876 BLAKE2B 0b0b9a8b131c7a80951695bd8e606e07f89834b60e5af1478b9a02474b9c4e77cd7d628e8cb1be32051d25bd8539e15c48f8b15b3500f6490daca87cd36555b6 SHA512 153dc24e24cb68e2522bad94873de4e24b106fe160fbea924e132728a908219f22baacbdd224a4d1f93179ebcb265bfef6ae7e92e486f538cd40ecdc46b98efd
+DIST btrfs-progs-v5.14.2.tar.xz 2252600 BLAKE2B 74ac21bc9bbc70a4034b6a439afbd0c0ab023ac7815c1cae1e7ac81c4239684d41be06bebe1d015dc2a0ba80cf0975e8f6da7e111b2825eb1a7814d1832914eb SHA512 dc1a73e49dd94ccd8128c197d99f112977b16350d22bc0ca32247211314a3fec66de73827305bf24ef8e0571fc890f00378d0ec3a82988f0ee54f5db10f6578c
 EBUILD btrfs-progs-5.10.1-r1.ebuild 2981 BLAKE2B 0c1e13d87b5119c171447e3eebc0fe9439da77a7d05ae0b1130eb8904c24081716e6f15dcb39f700abbe68a0431331c78c18a9253cb631998e61a842bbbe9791 SHA512 715d72ae20791fa701e3116ae7540be89c6761cbee1b42589881482e3abab6d5f9621fcba2b22166ac858466fe821b1af32284a0eea0a25ec8d9b3f63518a7c7
-EBUILD btrfs-progs-5.13.1-r1.ebuild 3015 BLAKE2B 4d1c0c35fe2e0d159db0a286805258ec4db568b39ea0bab81b3459bd87538c0d9b2ce5b4966d7cb64548d25e86ab0a42d6a96818439ed26dfbd6a904fc52ea1d SHA512 8109626768b1622658657eeb054decb92e1f2474623c3b4eae249d94712f61831d7f4a8207f824eae08bd6a4ad776e411c39c9896a359467ec53d07c5b5df03b
-EBUILD btrfs-progs-5.14-r1.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374
 EBUILD btrfs-progs-5.14.1.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374
+EBUILD btrfs-progs-5.14.2.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374
 EBUILD btrfs-progs-9999.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374
 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.13.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.13.1-r1.ebuild
deleted file mode 100644
index 7180e0d1cd55..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-5.13.1-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert doc python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-BDEPEND="
-	doc? (
-		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
-		app-text/docbook-xml-dtd:4.5
-		app-text/xmlto
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable doc documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-	use python && python_optimize
-
-	# install prebuilt subset of manuals
-	use doc || doman Documentation/*.[58]
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.14-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.14.2.ebuild
index 36548f98db8a..36548f98db8a 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.14-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.14.2.ebuild
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index e089fd953067..2f4d8beaa176 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -2,8 +2,6 @@ AUX cryfs-0.10.2-install-targets.patch 1337 BLAKE2B e2e1e4157a41ebe26ae459e0d680
 AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1ae5747ad01b796a6b7d8fd81b03be9bcde456591f94d2839c3be3a39dc2a9975ba503d8ad369bf838232157cf1385ef43d6 SHA512 815956b160f5f117a5c4f89babe088e6f485d89a58feb12d514ff0fd3d39752db6695f7a9a2e279d88eb3ef490394dd03ee8b0ca2d04f66793096fac742ae45c
 AUX cryfs-0.10.3-fix-build-with-boost-1-77.patch 639 BLAKE2B c03de4feed91e4182bcc9e68c294b15bf5715f06e38e21ced9e27a0bb96f9cb4546ec2eca5b0ae106724e797cbe0f734fb311bd13361248043f590e5a2c61c8f SHA512 e67f0dd1c0b08c062db75ff354124cc2f346efd0141439af78c9ade1019937af91ccd5c5c06ade89889d9b2a9ac5d01afbcec33a22ec454120918329a9ee60e2
 AUX cryfs-0.10.3-gcc11.patch 14590 BLAKE2B c6541d1e211c9ae503ee83be18dd2283f2ac5785f5a975fcd155b02759f6180eb96b8673d98c71e20c101ac4afa4ceaab4c6ece14c6605e32f5c020f260568bc SHA512 4fa2817c9f10df4e371deb7fb4acc423dd8260277216cf959ace47d64bebe394db71c79cd72098c6b11ac27b88d98eab8b5cde5af5095a63d57dc88d7dea7085
-DIST cryfs-0.10.2.tar.xz 7902252 BLAKE2B 704d124ed32a8a958f400188af99498cedb706ccfc004131b677a113b6ab2733942becb1ab64fd06d0b9d5b39f7abe832b3b0669caaf2b6feb7c6577c8c7fbfd SHA512 e49dd6d1e402d968cc4df0e8ca0460a01a27e4e73482041dca0fa9cde905a91d12e2bda18d257a044335e32e316b9363cecf374eb2ca621924b394dd2fabcb8f
 DIST cryfs-0.10.3.tar.xz 7908228 BLAKE2B e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596 SHA512 a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87
-EBUILD cryfs-0.10.2-r1.ebuild 2180 BLAKE2B bf826cc26d0ec5aeace2d411744192891aa3b14f6ae18e76d183b247b34eabf7809f9f7b9238ba2d705761fec12bffa1ef069657b2672145485e2f5f55a4216a SHA512 778e1d7bc641f0ba5bd428098c72b0079ad7db796394816e1d35e7db639fb661be9b90e8cdd6fd58855fcbc5634afb465b8c1b4e7c018d33eb60cf64980f0b4e
-EBUILD cryfs-0.10.3-r1.ebuild 2321 BLAKE2B 12262873ce9b8ea55bcb1158472a7efa302a29cc0f180747aef103d2f98bbf544e47acf3ca59cd4cf47aea8a3610eeb6a185e7b2700ad4c65e62bbf35b43bdc0 SHA512 9a4c9bf496d995f48fa63dcc86b9ebc0f410788eb1375712352c0b9e8bd667683c2987d5f430af404220564e0dd986f125d43083259470732f7a21664521c7c3
+EBUILD cryfs-0.10.3-r1.ebuild 2320 BLAKE2B 503a13941bd1fabc274921702634bd575d08615a3a9749921f068bc12d03afc6ef66f15515f2807a80d6a2544fef79f3bb69532ecf1422d894833844e8a4e95a SHA512 30cbb54d4a7f1323d8330937e81149e6e0e9c0f8b7b46c8e8688b51427dd40192830e0dd252c77ace2b196a9739ed2cb610dab85acbf6d39c9eaa5688880e097
 MISC metadata.xml 416 BLAKE2B b741d80131fbeac4c8659847bc206aad10c2ade82bb63bf1233542b0d9d6a2a0d3aee2b09aad9d7ef0f5dfb0ef1f9d065ae51c0884ef9a89479fcb99df912650 SHA512 4d38d4f4d0f5870d4cf6b1f86fbafe7327b6b799c8fe32d37fcd00d47b3d02f39f4725aa1bd205d2e141fa287427fb1a8f47206c25d2b8973135b6cd44735395
diff --git a/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild
deleted file mode 100644
index 5f06da1a12ff..000000000000
--- a/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,99 +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 flag-o-matic linux-info python-any-r1
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
-else
-	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-	S="${WORKDIR}"
-fi
-
-DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
-HOMEPAGE="https://www.cryfs.org/"
-
-LICENSE="LGPL-3 MIT"
-SLOT="0"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/boost-1.65.1:=
-	>=dev-libs/crypto++-8.2.0:=
-	net-misc/curl:=
-	>=sys-fs/fuse-2.8.6:0
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	# TODO upstream:
-	"${FILESDIR}/${P}-unbundle-libs.patch"
-	"${FILESDIR}/${P}-install-targets.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~FUSE_FS"
-	local WARNING_FUSE_FS="CONFIG_FUSE_FS is required for cryfs support."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# don't install compressed manpage
-	cmake_comment_add_subdirectory doc
-
-	# remove tests that require internet access to comply with Gentoo policy
-	sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \
-		-i test/cpp-utils/CMakeLists.txt || die
-
-	# /dev/fuse access denied
-	sed -e "/CliTest_IntegrityCheck/d" \
-		-i test/cryfs-cli/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBoost_USE_STATIC_LIBS=OFF
-		-DCRYFS_UPDATE_CHECKS=OFF
-		-DBUILD_SHARED_LIBS=OFF
-		-DUSE_SYSTEM_LIBS=ON
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	use debug || append-flags -DNDEBUG
-
-	cmake_src_configure
-}
-
-src_test() {
-	local TMPDIR="${T}"
-	local tests_failed=()
-
-	# fspp fuse tests hang, bug # 699044
-	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore cryfs cryfs-cli ; do
-		"${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}" )
-	done
-
-	if [[ -n ${tests_failed[@]} ]] ; then
-		eerror "The following tests failed:"
-		eerror "${tests_failed[@]}"
-		die "At least one test failed"
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	doman doc/man/cryfs.1
-}
diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
index e6d04c05f241..199c5a6badd1 100644
--- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
 else
 	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-fs/fuse-zip/Manifest b/sys-fs/fuse-zip/Manifest
index 225992704c7a..fc8fae985765 100644
--- a/sys-fs/fuse-zip/Manifest
+++ b/sys-fs/fuse-zip/Manifest
@@ -1,4 +1,4 @@
 AUX fuse-zip-0.4.5-makefile.patch 820 BLAKE2B cf6bbce2be6d9da05ab6974759b1fde5f05f0ab1f4fbda79dc0dd439409480a183d6e3c116dc488c9f8e098be47dfad7ea1adb1c4b0d07daef854c70d655763f SHA512 64eb06111deaa858558de068a331c0b086983390c13be39857b38a87e5d24ddb9efe652e4612a3cd50c45dc052dc2f147743c898a5933aa6828fc0810d47d9b6
 DIST fuse-zip-0.7.0.tar.gz 712853 BLAKE2B fd8bdaf30321bfbf897598de0291b1b285171b9b254e21acc1ca9f9d5af2b3a199dcb05696e92983a9b7491b4993b59defa53ec37d0a958d4fb80d2baf322194 SHA512 ea08bee4a7d0e7a0584237c6e9560d0fd2665bea59e87bc020697c3fc6bdc3c4c5c5d4dcdb454eed8cb735c176dd54d7c9bf879a04ac2d5b38bc271cc3128b69
 EBUILD fuse-zip-0.7.0.ebuild 691 BLAKE2B ee9f37d3ea5ba2c1f6dcb67dd4d770d1d10ba725675afaee4bb39c0404ea2da396b79f1583ca1c8b396cefd6aae62ba82a158997ca49c843a87cbd0dc1afacd9 SHA512 1b5eb8da3474e28d01cea7b3c988ac4497fd44bb1e1df8a032719cae011932de7468312787440a2ca9c7ce2d9365ce76658675396938f5d5d6d69659b1535255
-MISC metadata.xml 384 BLAKE2B f5b3d72dc934c938ea6e8a7fbe981987371107a519771e92ab9583155d388eb0398569461128ab1fca5542e72f55536b2364db548ec772464afd08fc467899b4 SHA512 8cff3c23a549d5117936f3845eac925b901538dacc92792726855d7ebecec2cf91b5607d0ceca3de0fc3921aa1f2bbf4e1e85a4f979950be001a6980786136e5
+MISC metadata.xml 306 BLAKE2B 6430b8d23ab5b4108fa9f2dbb1e2732c6c3d03c9b23d7daa0cfe25213f79f364573c95ad01ea93a842b44794c9d53dee320a4dc4b4c401fce0a65224643cdd9e SHA512 60016befbb6e1691bd1f1c8f471b3374e51d02aad68db4a83164f5850c2961903803b03c4553aa10a36524f155271323617976bb3815f36dd61266966395cc06
diff --git a/sys-fs/fuse-zip/metadata.xml b/sys-fs/fuse-zip/metadata.xml
index 11c7d000eb5c..8cde094293e5 100644
--- a/sys-fs/fuse-zip/metadata.xml
+++ b/sys-fs/fuse-zip/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">fuse-zip</remote-id>
 		<remote-id type="bitbucket">agalanin/fuse-zip</remote-id>
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index ead90bd8c3a7..edeed8cb1765 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,5 +1,3 @@
-DIST loop-AES-v3.7t.tar.bz2 377808 BLAKE2B 77a6baa31be9efc84504e6eaccca87193180b26ec6f6dc824480453e78905f8763c08fd72a63c18950796ad0b70ad8be2ed26e107cded6dcaddd96433dfa7f56 SHA512 cb0dcbfa7639f8d2c1990465a44cbcd6d4bf065b1df9178f4dd524a8b8ddd05ebb860e6a9d9425b4a22b9c74342bf3ff232ff777be9b5458bdabe54f4097ecef
 DIST loop-AES-v3.7v.tar.bz2 378465 BLAKE2B 01d9c3719242846696c1e199a02a42254c06472abce6cee7ccc3882e456921176f7469e9c61331193dd86ee2fcf0d24972f9012026eadad150a8e6116dd4e275 SHA512 62c0bafd97bc07d78d128ba3bbcf471bf16bd979264ad9180132b83f01a1e8d4f6d9aa874c602a00bc85360abfefe16f72b28b2c73cc2ad863ea2d36eb7bc478
-EBUILD loop-aes-3.7t.ebuild 1751 BLAKE2B 318ecaf349eb7ef78e506352c9a20c3ac5d77b7d8e95dbd14c5ea8e8d6000018fdc16ba10ad7806d51539167a5a42978465ca4693c8b9b0796139bee05aae57a SHA512 f0dbca7131097f5c9e58623991085a60bfaea2d6f70072da714485ede0f1b89b27dad78f322a8bd4e77d8b081ca95f347d7d8098a3c3735814f47aadf4aca94b
 EBUILD loop-aes-3.7v.ebuild 1528 BLAKE2B 9774785e6db9f11ad9191e3b4b761b05507b6f613de6d347a3a756aa5abc4d63b7db56826b6345bf836ca837fcb8bc4f81fde6555c027772d2434931e32672c0 SHA512 8edae2efb1686106bc3f4a625f9a7e0e5da5034e80019b37be5ea568eefcc289916aa81c919e7d64223efcec5e21172994aa9db557f3b3d2b675102ff443c58a
 MISC metadata.xml 648 BLAKE2B 283db8a905c756bf44779739a188d2555ff87bdf77ff46ef2d0d947661633a45a0b163a1ad3a7bcc00a50e6502e01886178245af2c73d86947adda24c948c37a SHA512 8fa7faf71248ce5dc0c217869a2109ea3275c84de1b5f4b898fe97be5c0c4c91d38405699b41a8e591336993d52d69357becba2b2a7f15369dc5e0508c4788b4
diff --git a/sys-fs/loop-aes/loop-aes-3.7t.ebuild b/sys-fs/loop-aes/loop-aes-3.7t.ebuild
deleted file mode 100644
index 116820a36e69..000000000000
--- a/sys-fs/loop-aes/loop-aes-3.7t.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod
-
-MY_P="${PN/aes/AES}-v${PV}"
-
-DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
-HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
-SRC_URI="http://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
-
-DEPEND="app-crypt/loop-aes-losetup"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	CONFIG_CHECK="!BLK_DEV_LOOP"
-	MODULE_NAMES="loop(block::tmp-d-kbuild)"
-	BUILD_TARGETS="all"
-
-	BUILD_PARAMS=" \
-		V=1 \
-		LINUX_SOURCE=\"${KERNEL_DIR}\" \
-		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
-		USE_KBUILD=y MODINST=n RUNDM=n"
-	use cpu_flags_x86_aes && BUILD_PARAMS+=" INTELAES=y"
-	use keyscrub && BUILD_PARAMS+=" KEYSCRUB=y"
-	use cpu_flags_x86_padlock && BUILD_PARAMS+=" PADLOCK=y"
-
-	if use extra-ciphers; then
-		MODULE_NAMES="${MODULE_NAMES}
-			loop_blowfish(block::tmp-d-kbuild)
-			loop_serpent(block::tmp-d-kbuild)
-			loop_twofish(block::tmp-d-kbuild)"
-		BUILD_PARAMS+=" EXTRA_CIPHERS=y"
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README
-	dobin loop-aes-keygen
-	doman loop-aes-keygen.1
-
-	into /
-	dosbin build-initrd.sh
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo
-	einfo "For more instructions take a look at examples in README at:"
-	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
-	einfo
-	einfo "If you have a newer Intel processor (i5, i7), and you use AES"
-	einfo "you may want to consider using the aes-ni use flag. It will"
-	einfo "use your processors native AES instructions giving quite a speed"
-	einfo "increase."
-	einfo
-}
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index 2b8d7f2f0380..2864c92ed349 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -1,5 +1,5 @@
 DIST ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz 1278315 BLAKE2B d4f84bf744b12fec7faff82bd3d3048282a3cbcde2ca75e5d3a295206585c4cee68e25dff5fb20b034f516a3f2cd95c489105d9df810f8a9378024ef065b67d3 SHA512 8534970ba9f07999c5ff433144ad3a59640fb9a28fb30b37b5d736101e19f9fec1c222152338be382c894f972fce2b2a83680b85a28cf147cb5500b40a0a25cc
 DIST ntfs-3g_ntfsprogs-2021.8.22.tgz 1317499 BLAKE2B 403036c68a37ba83873b5faadbb2088deb25e0ff31deb1958d4f869a198d830caa44edea879492a7894f5e7a5ad6205a6fda57bf8de722ce49bf3187239ad993 SHA512 e0544df78a6c352999e1206d7b5d71c56e39396b7a0936a261d728c2ac9d61c6b95ef297f8529ac2a5146f31c1c9e43066d3e281064d4f5d781a04eba51f536d
 EBUILD ntfs3g-2017.3.23.5-r1.ebuild 2063 BLAKE2B d70e46fe59628db9440f4d6516781fad6d9d10873f98b06364acd4c8afbc6b609f78fca688fbb1c4486ae6cd7a0089a6c3674b8555fec8af4360b6c7e4ac54b1 SHA512 fbf424b708a4e15fabdffb1046dd49854ed21335bf953fe39eb8993541178cfd3ffe482121d29c56b5dd5802c373d8aaaa70e0ae9dc6526f091baa886950bf36
-EBUILD ntfs3g-2021.8.22.ebuild 2101 BLAKE2B 5f4b74c7f0f149215ed69d120dc2b0bd556fde2646b4ff641a4a081826b7eb00198b999a2846cf8165cfba64e8ad28f40015938e2041b95a49a0b6a903d24306 SHA512 055b4a7aabe659361a52a6c469e195b4ef50bbfb784918e5629b270fd03e2d5f515e8a834d66e7d1c2248b9002dd5a6faaa2ad05651c70bcf3d1a32a3e9f2dba
+EBUILD ntfs3g-2021.8.22.ebuild 2096 BLAKE2B 70fde87b5c2f698b4671ae86f02dbd75552bcf7782de775d955b22f87ae4e58c44da9462802dba2e82327a0b3716a72bc098a84206e3856d397ea33ef2cf985c SHA512 22d0d2fe43e0359efc7c46fcc3853c8130feeb530776b6014a3bb948feb73e1f8452ce777719ca72623d3d16d517b54c4869513593ea4ad17f0356d673f48eac
 MISC metadata.xml 1072 BLAKE2B cbfb93f83a25bb707c6584f035d742513da2e423ec1f52fcebf25b6b34829bc429f7fbc38e2e3e76dd5ad2eca5f28d91072a0000ef83277bf84553aa6ff1e6b5 SHA512 2afcc34189ca0708f6d1cd15e9e249dc3ac0a150f4094c97a0d5745ca0b21f426676c3090df031cc8f234da38b2d13abb8ddf1583b9049d52ce2737833ee9314
diff --git a/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild b/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
index 7e4c2ed5669d..50d7f44b0230 100644
--- a/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 # The subslot matches the SONAME major #.
 SLOT="0/89"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug ntfsdecrypt +ntfsprogs static-libs suid xattr"
 
 RDEPEND="
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 2d63cd04ae0a..383d0ede9d52 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,3 +1,5 @@
 DIST squashfs-tools-4.5.tar.gz 250471 BLAKE2B 2fc8ab9bb6565b97656afd63b76bfd7449d96b83697286e88b55a8cd82957b395df17a707ee93e8a99ed19dc5ba73966ce33530ef6c35797924dad4e3f16ed3b SHA512 e00610487d24eed9e5dadcf84014a3d7faa9815d8ce00fd4660e6c8ce394dccf185ed9f387f4fa1313b9812fe770f802bdcbaef87887f2bcefacf234594a72e0
+DIST squashfs-tools-4.5_p20210914.tar.gz 252104 BLAKE2B f3e2e281c30464b3c2e9b2a3520979f90ccb83665ac61a2f68513b402d8ef658621fc75c782c2f42da20ddf51f884e2ccc6217df941790fd45b41f3f4e3ec970 SHA512 a814092be787bbcbd4115f87493a63b67caa364ad88fe5a3c82808083343cbcbc22b4617bd5c72d65d8abe2b11eb77853bcc55c11f5cd5dc3edf24bd27cbd135
 EBUILD squashfs-tools-4.5.ebuild 1315 BLAKE2B 081cb5d1c7826695bdc7324c0e86ee3292db8a6b8ee50f7688d617961e6538b76f2b4b73f008f94acedc51f2245cfe1c0900d4c9e957a500dd75423330b157a6 SHA512 9f8eff369fb146a9f8fbaacdfa9c1d7c2a55b8efa528c2613d66787d6ad60e86ea367780739766a660855288b41ada5bfc7530bf734dcd37e5fff9f6b769ee4b
+EBUILD squashfs-tools-4.5_p20210914.ebuild 1508 BLAKE2B 91dda143b0d2f238472fcf299f25a062681209f9a9eafe524546229f51f6ccab0b6060afd56a49db0018bbfa018ff33f0e00444aedc259f659de723e797b90ca SHA512 f059411486b21b14e77b6e12804161c8e691f4ecb4b00c7faf6a9c04bd220d4ea713b99fe00acf2dbd717df943f004d797783cc5c40c152a6fa4a49fe069892f
 MISC metadata.xml 326 BLAKE2B b34f627cbc911d0e31c84e29ab196767d6618ae95909466efe663abdc54f76325b24e1d6a95ff5e7fa9d33f19b848dec1bfa95dc1b5f0b260839cf7337ce2c0f SHA512 354a34decfc9aa79c434275283e805423f2bcbbcb788e09236cd7b4e67a7bfbbc413e3874a45fe618f0e601036372e94c5965665483566cb651edea0728d5117
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild
new file mode 100644
index 000000000000..66c6618def05
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic toolchain-funcs
+
+MY_COMMIT="19fcc9365dcdb2c22d232d42d11012940df64b7c"
+MY_P=${P/_p/-git.}
+DESCRIPTION="tools to create and extract Squashfs filesystems"
+HOMEPAGE="https://github.com/plougher/squashfs-tools/"
+SRC_URI="https://github.com/plougher/squashfs-tools/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${MY_COMMIT}
+
+#SRC_URI="
+#	https://github.com/plougher/squashfs-tools/archive/${PV/_p/-git.}.tar.gz
+#		-> ${MY_P}.tar.gz"
+#S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="debug lz4 lzma lzo xattr zstd"
+
+RDEPEND="
+	sys-libs/zlib
+	lz4? ( app-arch/lz4 )
+	lzma? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo )
+	xattr? ( sys-apps/attr )
+	zstd? ( app-arch/zstd )
+"
+DEPEND=${RDEPEND}
+
+use10() { usex "${1}" 1 0; }
+
+src_configure() {
+	# set up make command line variables in EMAKE_SQUASHFS_CONF
+	EMAKE_SQUASHFS_CONF=(
+		LZMA_XZ_SUPPORT=$(use10 lzma)
+		LZO_SUPPORT=$(use10 lzo)
+		LZ4_SUPPORT=$(use10 lz4)
+		XATTR_SUPPORT=$(use10 xattr)
+		XZ_SUPPORT=$(use10 lzma)
+		ZSTD_SUPPORT=$(use10 zstd)
+	)
+
+	tc-export CC
+	use debug && append-cppflags -DSQUASHFS_TRACE
+}
+
+src_compile() {
+	emake "${EMAKE_SQUASHFS_CONF[@]}" -C squashfs-tools
+}
+
+src_install() {
+	dobin squashfs-tools/{mksquashfs,unsquashfs}
+	dodoc ACKNOWLEDGEMENTS CHANGES README*
+	dodoc -r RELEASE-READMEs
+}
diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index 873e88e9b815..aece29c1e6f4 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -4,6 +4,6 @@ AUX xfsdump-3.1.9-no-symlink.patch 1027 BLAKE2B 35e0a308e9c368448305361e1632a229
 AUX xfsdump-3.1.9-prompt-overflow.patch 329 BLAKE2B 58bada935969c61fe9a161e810c6402642a87d0803076c89f1cecf5367037f96ff234d3231c49fa8b450810b21f60ac391bd631400e30738b9b11d3000158bd7 SHA512 dae03fd09ac45c8a974cf1818625cbb07c1bd7c88b28613f855d0a5878c1bf3bcb071c6f8ebd46627b83fd482ff4847a33f8a54f1de5be7595025df9f22d2fdf
 AUX xfsdump-3.1.9-skip-inventory-debian-subfolder.patch 468 BLAKE2B 81cf0af8cef61efa4dff6e230b71c0db65c3e7d93fd252035b6b5bf14afe28e65eccaef22bc3fc4419d196b0cca1428bc1697233efcc4f28aa138beaf3a5ccbf SHA512 c94af1c52c95a7617586b64a8936cdbfbd3a264c9580fabc3e1e7d3d5c37ca368b97f730baef2330e796ef7459561fa37b03280601aaa3b79eb2f90d9af5170d
 DIST xfsdump-3.1.9.tar.xz 600348 BLAKE2B 9e833acaacd3ad581b4f23731d7d613fcffa3d518f43638cddbc7da7015e582cb9415e00616e5e8586836831b6d5877fa83e8a5fd931fd454731bf2af7072095 SHA512 e8f9811d16fc06ab49fe2c109de0546c989575eca6e68b579c6d219a745f935952020069f58b357c5c87b944c5097ca2894466d328d09f06beb8a55880142351
-EBUILD xfsdump-3.1.9-r1.ebuild 1615 BLAKE2B cdec8971db53d7745a1ea77478b3ee266f48a5875f8921e19da04adde7f54a27471f8bcd745ff1801b9cca8f7264e560b30b9e4e388129e100fec0631141875d SHA512 24a8d2b84525bdca75217b903ec884693d7923c2f09a3e64e0d1e2ca465626e4ef883acc05bc5d2f31dd2305dbcab1982c6102b43d9e419f748f86fea9f8d5c1
+EBUILD xfsdump-3.1.9-r1.ebuild 1618 BLAKE2B 734ce5ddc985969de991b2c7394e93b59e9a02e32492df9b389b8be7e50b3961549980ab553837fa758c138f3456d983e112060b8c403718b78d5e14d68173a0 SHA512 4e718505da2fb99d33b1c7432a89aad2ce1662a3672aa982e31d0cbef8709876aff143a2a2fea22843d85bf9dc4f13ae76e4e5754b7c4bcb412929edbfce7425
 EBUILD xfsdump-3.1.9.ebuild 1627 BLAKE2B a0a8dc7e37a915700699b5db970c755a84fc679ffb327654bbb07592b297740a9fb945062442d439d026e15c82a56423ecfe61c02dea497e59af549e0aa7d83a SHA512 c4de8c287915cc9e6934b8fbafb9ae1ca44a9b8e5cfa81c09defbad9b60facb0fc0344dfc94b49dbceaf6a97e87529821a76e2465f5044c47a91b8d8929f59f7
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild b/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild
index aafb02db2752..9d68ac0a7cd4 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86"
 IUSE="ncurses nls"
 
 RDEPEND="
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index ea191e41d327..55f0460d9732 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 216e4e510c01..e793dd28809f 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,12 +6,24 @@ DIST genpatches-5.10-76.base.tar.xz 2336392 BLAKE2B 72b937a112169e68f5ae72fa7c0c
 DIST genpatches-5.10-76.extras.tar.xz 3848 BLAKE2B 89eba39e2c72ca1fed282a32b5de3dd027797940823619edb5c2a0daf341c8ba7c512d204de6991a8a85c348f47459209d3d24ce917370b4b4f7d330b31da4cc SHA512 98163a299c371b3f8fda9268e8994e16de6cfb90f8c5a6ccf6e6cb85d5ff05ec721021bcdc8ec34bf6620a7ccd8055712f7d0b879b5638a376eaa458457f079b
 DIST genpatches-5.10-77.base.tar.xz 2365032 BLAKE2B 7aa32a168b6f5d75f30501a6e779c253becdd398789b2e54131d1299d2c99acc329fcffabc37ae5212b12ea24268b721770d09ba321bdb670131e9f37e5d0d11 SHA512 4fc8a442b98bf47ff8810b857cbd5f59d6e8805c7a5768a439bdbf54db28b0d6c81bf3d4dcbeda9a0784ea159c7cd7b24ae233435cc77bd05c82e9c75867157a
 DIST genpatches-5.10-77.extras.tar.xz 3848 BLAKE2B a8a97c432acae3cadf43e033a615560da3477dcd1c0dcb9cb97f2edf69ffe5074e5066e286243b0bd66d0fbedd86e097846587df5e96c6462d67b354b7e75bcd SHA512 2d4726d2de66bd3c0a6d191f47c24de16d6d5cc815f4eed6199f0162a8ee0c7fa05ff90727a95c27a182a234d3c31bfbb9f62b17a0d7448344db32bd230b5123
+DIST genpatches-5.10-78.base.tar.xz 2372000 BLAKE2B 263371197ab54e9153bef37cb34fc9d60e359aaa10a2991fb507664082554590f03e5518fbc94665c58ab93a643473e1fa3614fdd650089cfdeb542b51a88b88 SHA512 832a57e2a775921f96769bf09c277a1d317ae31f73309f6d4d6b817ef9031efb4cebec29ed9d9c68671ba79efc8e76d03e7c1fa65683664d6be0dd05a7316a0a
+DIST genpatches-5.10-78.extras.tar.xz 3848 BLAKE2B bc1f534a45c748e9ad1e6382349853d58c93c51db7deb411ea5fe981edc983c3df1d62034af582da4740c8a8c5f3617bd8e360602f806808148e2a0e66b6f327 SHA512 d96f7924e9c7c128eebfc3e73ddd54a501a7909a5d51bf74f062988113c7a2b3671813f875018a52395f41aa6d3fb86a35e57422b19ad885e667e1bef693cf9e
+DIST genpatches-5.10-79.base.tar.xz 2387632 BLAKE2B 2da2a130876482ac0c4c2959e4faa7931fbe6037c03da78f7238411b132dba8e7e196aa5102b8b74d1996bc9f7d29b435c506954f6db4c91bf3b0a4ff39cfc46 SHA512 1034e28b4c880c285999ddb47f3074a9885fcba6716ce58bd121a654f20f0ee168fc454475517c3a2c9e8327f1a81b5c68b26a114ac074c425be68e95eab3472
+DIST genpatches-5.10-79.extras.tar.xz 3852 BLAKE2B 9e76a55a44ac857f37ab753e4ef13e5f041c68b14b4a6cb762c75435513f084c211b2dd4797bebeae451bfd207be133f9099ce14ecf8cb0142f5f04a1ea4f504 SHA512 538359609f242eb7ca012c4626c0b049de8fcf5ac81934bd21e75e53d5d4657db831738b37f24d96ea5e1c3ed8eb01b577c1978c7095a93aad9d5ad225894505
+DIST genpatches-5.10-80.base.tar.xz 2394312 BLAKE2B 663fc2222740c01ef53024985679854abfd97b3a44b5177229f4529bfb2497810a73d177ee714d699e7367602c14dd5c7c99c312f38dba496fcfea062f485ba0 SHA512 ca51c04253647b98200c873f67a0f52861299376ab02c7a665b142962eed3db77060f6ae5e8391518388447f81095c8bca0c9d20502dc53c0a7e42216ce39e15
+DIST genpatches-5.10-80.extras.tar.xz 3848 BLAKE2B 401714e5b73d2e9d8ec46cae0f7f2729c6542726f2234f46c68cc4cc695276df37d757c37bfbc11e6e4fbc91b6b4edef0172520f9be5d457e2e4c283b41224b3 SHA512 88bec3172d52f7c9b71bc8575622f071ec6469ae58578d43e31ee027631ab6918c9b0c24bc852d9716f4a0292e85fffb169304c43800b870e4eb33e8245b608c
 DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B ba681ca3732dd42d0242c2b4e95f90f92bf4737eee326a33297c03d9cefd5da3182262626caf4635a3c66329df5fd0f28d55a963b5fbba110f025e7874f00726 SHA512 55f21fa1711464d686dcac9886ed0420cf48d2ab4e1b98ec1d8ac52c8828d4d8c2d71c4e57df989d23df670d46a00ec2c7dcdd4dfb7f411e904e379f9fb702f1
 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a SHA512 397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
 DIST genpatches-5.14-10.base.tar.xz 395372 BLAKE2B a645dc7c97a08fbd4f58b9696a58f5e61859858cec6214593e75c8394ec11464bf469ad4f17d75dc978878beb4cc7e9a37a91f0d879ddefe5e50cb80f38a85ce SHA512 add638c70c9d1e95aed125db0d3cbfd1b9c7b4fc2ab5c5548d38dd1bff7cce57e459a8175d9e4e719a4c2bb95e3ee10ee697b5288ff9ef26a9cb50287eee1d86
 DIST genpatches-5.14-10.extras.tar.xz 3848 BLAKE2B 3ea5db4c39e5ecfb856189191979806f34720672a7d83a5454c0f49f0caa32f035c338c0413ad1ec27dace1085661ea9c7e4318c59d062d99dc0a2e4c8aaa3d8 SHA512 7665b5b006d1847a8ac668793635fdabd6774820eb9e1a7444267708e34b935253458cd74a0f24219fa19b22e895c7fe01943ab3156608f5027e43abfecca4c4
 DIST genpatches-5.14-11.base.tar.xz 446596 BLAKE2B c7ea616d473fb6e07af15ad0cd400fc4397dd9833af139fa19b23d5175959de09c5b2eeea1efcfa9e76133f4f07cc503245d03d2f7172dce9e677028d69b05d6 SHA512 b4eb0036109c628c2a4648edbc2b601da3003f7bbedd0c9811fed22c472b492763ac74b61f36cec896ea04641ead861522d2447bf88ee0302f68a8ebe02f566e
 DIST genpatches-5.14-11.extras.tar.xz 3848 BLAKE2B 05f652b6f3f4052b5992c747ce8354c8bc6ab64a7197150c223f868c0060a55c289dca650d3dadc804bd39cc661dab56d7d8086c5dd9715723f17c19320960b2 SHA512 509e95a8dc4a1e2d1e28388575664006bc5c19eb5aa05e45999838c7cbaec875d784a85f852e3207a37047fb27fd5733a01f95c4d488ff1275661343cf5694ee
+DIST genpatches-5.14-12.base.tar.xz 459100 BLAKE2B ba32bf5be3d9e3e332659281495ecbe1b4cb683e1b5c3d1ab490d03ff3eee47db33e4f3f1c9c25f50230adaf267c23b01161d243c3acb2312352a40c8328b606 SHA512 1adc3a9ea9c7b3bbb89de6fb219f1cd0d6fb02c6f866c4a5519e70452799069d99e1b2491560bc408706ba40b0ab6cccaecfd34a1f11f76fcd8e5ee1cb78cc1b
+DIST genpatches-5.14-12.extras.tar.xz 3848 BLAKE2B 0bac1f83f9ebdc3b6860516313ca95d5ad2e1515bc587a3e6010bdbbd2bf3e55fe3acb835989ea874608149c3efcedf172451322ba5e5df821970cbd210a69ab SHA512 9e4c5445b0883680ff28e24d2b7af4d6dbd4d2f54c33583c5b91e0629caa5cac02b02996c52cf277909f057c8bd2f41342cd57f9e6ba9d8b4a8895fd70bcabaa
+DIST genpatches-5.14-13.base.tar.xz 502028 BLAKE2B 54de53dff2214469b24b173b17aa6a4cfa2ac50d8834434c0e50c5538484e7a16c3822b677572e4d2bb444266196a272487df0264c2fc4bd25e6fc6a7b63fb8c SHA512 205d403607618c0ea1e82ac9ba48cd1e90e961e92e282a5bc2723408ddd7a85ca871e91b23cff37c3108f37f4040fbe063928161cabb175c78b7175ba8b60974
+DIST genpatches-5.14-13.extras.tar.xz 3848 BLAKE2B d595a77078bd8740dc61a5e2f35d75f19015e2d4b30716f484bc961b9631a994a3b1a8367a1ed2d1c46d3bea601013e4488870cec202dbd5b63cffaf5078ce36 SHA512 b1abcde0b14f51d60ae27e885f7b912b8531ee77fb9b6b4c2e062f5feb1eddc2687965c949ea675c1c425561244e1a3011a1c092404ce86b171ea60991c7cd2e
+DIST genpatches-5.14-14.base.tar.xz 511456 BLAKE2B 5e4ed4eb05d3161292e9ae3e69ad28d99ba0e72f1b38289f9c3e3232346ac77fde922f4fc498fc9161b793bca2beca33728664c2ec68175a637676ee8737e311 SHA512 81a2293ebcfd9a44711dafe2e0ea14f73dd0d6d53cf5c30892ab5fc09995519174e3250d1521778058ca8ae1aaf75fc5ddf7541eb2231f8965dda45c8c8f250a
+DIST genpatches-5.14-14.extras.tar.xz 3848 BLAKE2B 5820173b798dddf5892b0a8f133f3fe4dfb0b80fec5bbba79b8f03f78af4722f48bb69370f56773bf9b7372aec3500db4f672fa82729bea8e93e8fa1af7efea1 SHA512 1012bd7f20b0657e75d810e66a97222c66373b8b2cb4cec0a29ea0469aae5ccdc0bfafc89dfe9ded34036883d88c7da111f99ce2076dcb8f01143e985a62c8d6
 DIST genpatches-5.14-8.base.tar.xz 315608 BLAKE2B 1a19a4aa497580d5d1ceed952899f0f19b13fa36a585206c1ce9b3c348754f6c94aeb7a697fadeda88ecd9e2b35e7d9061601bfbbc720cce00030b3b0de5d26f SHA512 5d131854f01730a807eba05109270f80d40b5f9db4fc7a9f9041200eb0025e4ef436a6df51d2020ae4cb737ff2846e080a318c92975be1d54a17e99131d6771a
 DIST genpatches-5.14-8.extras.tar.xz 3852 BLAKE2B 6ec8bdf43eca6d43f5e88f19e15c23e056d5f5144a5c746e3eb20170c445de82e465bdc5ef85f95a1c65582c458110437287d8f31022132fa092096147540c88 SHA512 d6a65dbe36ea6c5eb20f3df047493e3e3e31b27e4a812c9541e50deb4bfbe795de3f8eba4d901bf34a013d46ead22f849b77f3c2bd305f2b28cd039459f6c43f
 DIST genpatches-5.14-9.base.tar.xz 349596 BLAKE2B 801a5a1aec2e0cd1b52f1c21fd3349f91f8bbfd33c40892b28679ca89799f5589d333e5227674fed3326d0094f5932959427e31e5dc847aec261ebf164d2954d SHA512 a8463a1cda8084afd1e6613ba160c9a75b1a136331217627f9a6b7876f33e9bd4947cd6c059f481612962e430ef530fac246e8b48c38ca8f505b949296390590
@@ -24,6 +36,12 @@ DIST genpatches-5.4-154.base.tar.xz 4018472 BLAKE2B dd471796a671f5eca01d5c77bbfc
 DIST genpatches-5.4-154.extras.tar.xz 1784 BLAKE2B a97a459428ffbedc0a8f4e8a4bc8c15b22bb74b00198843bd3558d2a21b770d0c8273f1c0d9efa31515eb2585052ae6500f93489b06e5a24ceca5396d5393ce0 SHA512 829a6b76f50c1c08ae46a1a102772b35ca04f37dc3908b34ba3c16d8034b3510d5eed95dcf61ba65773ef7506733669917cdc015913f2418f866df007d25c5e4
 DIST genpatches-5.4-155.base.tar.xz 4028140 BLAKE2B be936c28ef5da5deacdaafebee8781ba759b66427140bc806858fcaa3523c8076895bbc952b018e7ddaf5aa5ec45338acc50f6e235c0d54dc687124127de6288 SHA512 7dc3aa310d15abc349627d3d305a490722b9a49fc84d2969f7e98ae6940121d5e5b6b4ef0776b6aff138531cfccfbb0a9c3bef28790345d35f9a386bd741ebb2
 DIST genpatches-5.4-155.extras.tar.xz 1788 BLAKE2B d0ce88939e6e87ff1af00b161200ebe38895aa34fbace9f6197fcc541793eead351d13ea4d0fa1c0c565ccba4f7ae191ee432d909d1961df6121ee4f7a0bd516 SHA512 5fefaa51fabf22993fd8502e48a3282f172c7609d1b7418e9fe20ce8ff79c1bc1b3d4f33e1ec1d87040ee4d13c71d64bc8b48624d03b567351842d685f0fc64e
+DIST genpatches-5.4-156.base.tar.xz 4031752 BLAKE2B 7450e619bd4524c4c2929a2adb95ac492836a9686d106df394360faaef16e2e1d66b646e61199daf1b69eceb4b9aa3ca310e29d1bbda024ef1542f76778bbca4 SHA512 3d1986640f3851785c0cd5c95ac0715c81c202c2e75ff08d18c873a2f7092a2bb60032389d7899c4080ff5b16c33230c6e517a758082c1795463b338636216a1
+DIST genpatches-5.4-156.extras.tar.xz 1784 BLAKE2B 215396166913e8dfad67a0fea37626170aa71a8fdca7861f55e48c50e37fe0b92ba03e185d2cd23aae1f0903c9900c5ec7d79442c5f622c1f0093a3587f348da SHA512 43fe8cb9416a5d88c78a8c51466f7fbfd04b395a19efc2890669b9f3b90e233190c7724804c06c810cef89cbc3db95072afd2c04a3e9efbd074d975ce0f3ea12
+DIST genpatches-5.4-157.base.tar.xz 4048356 BLAKE2B 787334d4f61f375a6ab46712ff632d560a9532932ced876b90d78bc2161c48d6c917297e53604ff6ac0039ce5ec6edc70c84f6ca9933fd0d74f83c5e57bd2d42 SHA512 e7380f35a80a88d2fcc0278da156042c08b7cb1b6eadcaf2ce5769fb4b6127eaa8e1ce9e8a64f8c24286a30f566df4d52184ba3fa0993c6119d7b306c88fa8cd
+DIST genpatches-5.4-157.extras.tar.xz 1788 BLAKE2B ca74b942a7038927ee3ca591c383d0dd86418363399245e49763bb3efdb66a57eec28982c77bc10b723c897dc87d0f2991736702e3a22f23e02eba2d3686d933 SHA512 8c63e5e7fb2653e680d2d78c18e5b84362ae5f391d621489e377e21894b7df8fcacc15bca2c61b544b20ee6156abf323ddd599c3a47e292f17e5372f6cb46dcb
+DIST genpatches-5.4-158.base.tar.xz 4052760 BLAKE2B 1fa28f9309c2f9ae9fb8167cd016664781ec78d16a2e652e67de34503ccf4a28477fd16ee8f10ad9fb4eff35066d716c63df32f3ded98e9b8306e526528053b6 SHA512 37b6ff682889580053c2c5e88b2f46df9a6b5506550651773949ea9a4c6d70b56b1b59388df1d4747dbd1c9b186e95b0997f651a08df52be351401276e7b6f33
+DIST genpatches-5.4-158.extras.tar.xz 1788 BLAKE2B 265a90ab037b468294afea457d8e3c3e7fe2a1112100354e9f4a30f6604b204be5efc3f5889ce42ef0fa959baf80403a6ddf4ad36f4e9d0e9888c4c6ae7aa70b SHA512 9a498e672c05166dfc1b0460d6bc6830b5086fc2d9ef97423bef5334ded9d4f31836b40fe85b9c2f66eb56cda291e41399ecf88e9e4a20022f5d88bf6d4269b8
 DIST gentoo-kernel-5.10.68-1.amd64.xpak 65497706 BLAKE2B 526ea1fc91fc906828366b4f7c10cb04a0e1cffe19702443790d52ba82a99710aa9ce1eeb7832a0da9970f9ec073173c846d5872ade5ae6f44fb33c20b0c46b8 SHA512 6be46f7608dbe3ad05472264957b23e8a841ecab3a978ec94de8043f864a9e9864e8086f979bf185010e65bbec23af941eb3a82828c3341da9a365410c85a030
 DIST gentoo-kernel-5.10.68-1.arm64.xpak 61234698 BLAKE2B f30cf0cd18711f3b42d9bfcb528ca56c7bafb88477414a3ed6ecd9c26b66fe76c1c1370461c3b1b83a13266240a20f55cbc35fd68d66bb8ca20503cc26f91f15 SHA512 df478abac49f43635cbe7b79faa188570cee3419d920877f05346fae7a3a16333f95c778d170b509277a0ee08c08d73589a177b69f86fdcdf800bde8481b903c
 DIST gentoo-kernel-5.10.68-1.x86.xpak 57237230 BLAKE2B be3156a79fc45bac92220f715e0e7270c060545f222d01fc24ff5bb6a239d8187077f6c4beba1d18c704c6e858f36b22db6f1ce9ebc737e574e9130410d5c813 SHA512 7ac97263d05bd70b29388d749786788124c6e636a3b1e975df8c9225ad3106d66a93898ce1e6cffefc4ec948a36830cfd3ae16dade66d3281bfebdd3a2bf6f7e
@@ -36,11 +54,30 @@ DIST gentoo-kernel-5.10.70-1.x86.xpak 57241603 BLAKE2B 79dde6ba5c9ffb878267f491c
 DIST gentoo-kernel-5.10.71-1.amd64.xpak 65531448 BLAKE2B a452aa65c53ddc469f7b62e73947538c98cc33271ed716286c8e8a1b56e963af422ca775279e0bc2540ceb415c337c8094d1d3f1b16724e0a4191182e2aa51ec SHA512 7a0d9ba58e50430e42b4588da1dcfcb52b832dc021b38823fb787aebe754b3a020ec06756432b51391023a84855f822104e9582d1955f241c93f43ca0c4e21ec
 DIST gentoo-kernel-5.10.71-1.arm64.xpak 61260000 BLAKE2B 43c44a2f34445f28cd4748e94a416d680c51ad98dc19d521ca8b6a55847c8ca59dadacc02c1f3f74159c070bbf8a25c3418f0bdd9713c05abc23d8587db84703 SHA512 ae21250d1db987af750af20b079359cab76c5a149ca55324a007e070a5c6fd1a50189d109efafc10fe8434be6b8587da9e8dbe445b74d936fdeba41ad87d9ece
 DIST gentoo-kernel-5.10.71-1.x86.xpak 57265156 BLAKE2B a9eaca5de9ef3883863cab33773d63569accaa2095e9725f37181fb2d05435717ff9562faf6d4bdf76625c554a13378c6ca84e7b60bb81df236633d2d0e9ec44 SHA512 19f6de9ca4190255be47f0cd0bb53367df9114d961e2fbda081962647b3c71e5f7cb0df22bad5e92d2d7647fe163d4dcfb7a517b0be783c80e61259589c63703
+DIST gentoo-kernel-5.10.72-1.amd64.xpak 65501066 BLAKE2B c4f9d43fd17a73addb6db65f62f68ab18d49937581e833abc1653cf41a70980bff0b1fa9332e8f13a5acb7c4918e226a24ea0f96b2a874c63a2cbfa37dc0116e SHA512 6bba12624a100b892d939bcc39e4324866dc9393dac34e1fa296fa92393b392517f7aeeac2503e8066b937d0f8002be14f499c0633d8c62d45324a4ab63c1d44
+DIST gentoo-kernel-5.10.72-1.arm64.xpak 61226946 BLAKE2B 09501bbb9146450bb25d3dc89422f14286351e86b3482bdf351a86a21883ba07117a1dedcf6d218eacfb0468e1e92af724ae898a4fac0b088e8690d86c783841 SHA512 7a9e5c2c8f26900abec2337295a225911478191f1a3088226821779177326735b7987bf3646647594dd3e17a83be857f4addc05445906b851c3583f0fe2da84d
+DIST gentoo-kernel-5.10.72-1.x86.xpak 57243325 BLAKE2B 019dd95e8fab63f6010ded8f726119a46780ddde160509730974773afde6eb9fe2c339d33c8b8b3c0212671e0355048018365681bbd8ef6664771288d6b48c0f SHA512 16fbdc50a198b275e1931ee183ce51e05ebc989bed7102020cc03090ee2d757f6f1879f06899ba683ebd030465022aed76873b03c0541c2231d59370f3675136
+DIST gentoo-kernel-5.10.73-1.amd64.xpak 65497272 BLAKE2B 16901ef5d85cc199bb02d21b704adc173db8c0a6f3d00805dae432800941a285948eb70c7cb1ebf4a534c22ac3ce979a37dc0da91c2f86967ecda79d4a6c0974 SHA512 c0506a0b3125ac784bc239b1ffd7b81fd313239d9d2f9a07a4be16355d8a813a455cf87628b3bbe753d3fc7c157e356fb4d2951577a269236cb7befe78804415
+DIST gentoo-kernel-5.10.73-1.arm64.xpak 61223372 BLAKE2B eeb51e422e4d04eed64146b629467dae18c494d93b9b2a0e1965e0e5bd95bb8f343571c51c2736b3adfc57511afb001e9107b0cc6c89d3977a7abd20d0f66c67 SHA512 e13e73769a3a8a9edfa2ccd655d1164a4a74c74c208c5a8980fdd1c6b6e7dbaef7fccd54d57d8a2401bf64e0f1f0f5933962f67430b8c6dbff4fbbb4a75ae432
+DIST gentoo-kernel-5.10.73-1.x86.xpak 57234727 BLAKE2B 028eec3d6f13893ea7e90fc5eeb5efd2a244a59a1a0e18a6d13d2e335bf945439344b8b2124bec0c62c234a160d4b08b661c948453cc9ed4c56acdd70fd1eb16 SHA512 50d414bcc836cb5109088aa265c9b1321c1d0bfa58e978b72e7a2882b6491623ed9ed8fa0693a13420ece3f3057b913c7537cbe275abfbdc0941dca883d22d40
+DIST gentoo-kernel-5.10.74-1.amd64.xpak 65523300 BLAKE2B 3f764dfcef5b0fb8d2f5fc6217b017245689fddd553db237345e534babcc82e6ee928ff15ef29e8cf5e8aa0ef91c683a077a133e40275c0a4b8fa322d1bdf499 SHA512 8cdc9cef68620fe70acb0af49a36df9a12ddb00ec0cce938f40eec9a259270254a29f06dabf0b8ca3b8796c430f4b6088f233815d2a15f14243d4432ecdd489e
+DIST gentoo-kernel-5.10.74-1.arm64.xpak 61290653 BLAKE2B 24778034fd0407e2d33d10de6c69331493cbdb284fb9e1dfc3bd05efe806bd50e1186325a25a0e646e68d2ca57c9ce05460057020fa9f3c7c185918e465ada16 SHA512 45109b2a2257be9be186989aa34b10801434c05c3e4d5325a29d487116502f2a3680764188c14900157ebd60c317d2e025abf08b0c941564e6e5fd6e76d5f23c
+DIST gentoo-kernel-5.10.74-1.x86.xpak 57252997 BLAKE2B 517acc2cb011e325c1ac41f75f8da1fd1187f6b47359b2fd67171ae26e239a40ca26beea926dd490ed116e7b3956bb29d2f8e5a05c95ac3c6d6341751fc6179f SHA512 46b62a7767f056cb530373a090847ef37991b96b1931daa2eeec49c00258d570c9d859477ebc5afa3cfce2cd7245e5df869c41fd4090cbec2008e0dad93e8e16
 DIST gentoo-kernel-5.13.19-1.amd64.xpak 67338326 BLAKE2B d9e718a94bf9a341f5b57063cbde2f3f1f0ea6d03f1805051c084b792388789494a49786d643f1570871ca2b6366a206497aed83f9ed00837c542ac970a71fc6 SHA512 aea74f6f39861752f7a5dae16d955d541f65d3e7b8a0e5fba593011d9ca8583f3dd0964e76aa21daa6583d5d26e3616885aeca8a04dbba222e0aae2a85062b40
 DIST gentoo-kernel-5.13.19-1.arm64.xpak 62747957 BLAKE2B 1981ddb4e35d2210e1c678856ac58e088cd100ecbd70d2b5c88ffe8eb25b56f3f0c90e45d12adb74c7a0fb881dfd36b1d46d6fdfb837dbdff1881ded066b906d SHA512 d8c1e524a3e58def5352b3faae07c42074a2d67015cc62b9601e20bb9b7f29d44d2843e7771e0399e9150be1de2be2b28776f96f7fe75ba7ec4e8f2c31e1f715
 DIST gentoo-kernel-5.13.19-1.x86.xpak 58517020 BLAKE2B 1dcd347af7693696f93f7a28326aff4c7936c4b71238500b6dd2a4b7cd2b88891436c7c8b7c6a56f638182b722ba5e75f52a1befc74eef4bfe9e6f6fd7d8ef8e SHA512 7bf1cf45d06cf4c6331d8d0c0378d253f6760dbd2f564cac6f7e53d30748ea01ea2d96a6c409a0d653ed74366d319e28ae1e2924b07f4ce7899c5bae121a3630
 DIST gentoo-kernel-5.14.10-1.amd64.xpak 68081742 BLAKE2B b2b443d53ddfc3ef45133a307e2ee9c997eb7c9afad6b421caaf81b10dcd1721542715e9826ee08b17a102abf5e4894a2891e01699051bd5d3c9a2033e25d78a SHA512 632c30f020c8561605cb00a3300dc476527bc051544a39543c4f46461da98531226b266f3c7081c4a31dbf658770ffe6dc8ef6e38488a887fbd5833060e6ddf3
+DIST gentoo-kernel-5.14.10-1.arm64.xpak 63345321 BLAKE2B 6c1dcbad9d5311a20645072383f0ac845c91b137974fe423d8ea1d2e2c33eb2218b5099f0a35a68321a86ed06fb9609c93b75981ba8401433a8f80d1149ba67e SHA512 386e481acc70d160ff7283ddbc48915278e900350111f94241f164530229ca52e77219706825dc66d02a1bc521d79c1d5172bf78aae04720e5e42446487b06b0
 DIST gentoo-kernel-5.14.10-1.x86.xpak 59178806 BLAKE2B 10a6f1e987b859ca3f1b904b521b8ebf7e7139883d5686559e9f3e3e18fe14bc259632f54ea14057d1659b4c92915e4032f0f0c4dbdd15c38698f7efe19a137e SHA512 f6c5c8dd1f1dfa17bd43a38f90e4d31554c232a71b6d2b5e4d9a2a33aac311b924db84827d6fd4f95f73e6b7000e8958e346347f6e4f99301fc9e71ced86cad2
+DIST gentoo-kernel-5.14.11-1.amd64.xpak 68067146 BLAKE2B 8ce01c1f9003c298f262c23db11d837955dad760ac1fd39d9cb857500b64ce55c4a7b71823d3eff4443721e2430ca4966a304bd35023fba574de6ddc8ddd2cfd SHA512 2efe779c30023c4177b0f5d9d868f97018f887122d16a87a43ac5c32ce73b41b75838cb0d270930fe87cef788b9d1c9af7dc9e60e3ae4583b827105403beb393
+DIST gentoo-kernel-5.14.11-1.arm64.xpak 63292538 BLAKE2B a4e485ebd2c1e757fabf159d676b52dbdb8be4ff3613ef1c4be4dff1cdcc928fbcaa2e7b223ed906b76d6eac559930a8da9b48c25b927b7d82ca5c5eeb0a31fe SHA512 fd2a6c74f35d9ac4843be51a8cb015af65cff36b7479b09e861fc5eae5333327792e8b4c013809e2880c7386ff00221fff02647b059842ae0b178b585c9f3ca7
+DIST gentoo-kernel-5.14.11-1.x86.xpak 59165591 BLAKE2B 870935f0eddc88cb23aac651f92663a963e148a3c526bd30daa17ed3b63175c16553e8a8fc7edb7a728859d436199a12cf4bc230490805b0342de1a4a0033e39 SHA512 0ddd7b81473cb552ffd1bb20fee14191cff033145fac4ce1d6688a674db2e3f401c851021c2d39fdb05ef1b034a210adae8196c718220fc8d38508bfac1102c8
+DIST gentoo-kernel-5.14.12-1.amd64.xpak 68076172 BLAKE2B cbe6725fbbd725a2effedf4f17f6d1a91e5ebc37e355b378d4e5d4075b3d36200c3d7c0c5e0e92300c0862a49362bf182dcf23b2cb6c58a15579e4120a28978f SHA512 3c1af75b0c4215d30563b72f6e363f9d1631f2b36686740720b52c5468f59c3ddfb500cdfc95d9fab0333e7381b8fa81a4e4d45e401374f6765906feb6c41847
+DIST gentoo-kernel-5.14.12-1.arm64.xpak 63328712 BLAKE2B 82d66c33182546f1ad2b0285fdad24d6f378616a6557a73a2fe3669619ffdf7e091fce2c43764c921be852415e782799e729229dca6d52f0c7f722726bbb7b6a SHA512 7ad95019bc3a80764c94ce57f432a46f6b69dd8b0684fca39e6b86ed7f67f4d1264261ffd7349b1a3793df7e7b6c8a0ce5a2e56ce53bf92565d2e19b7447b9e2
+DIST gentoo-kernel-5.14.12-1.x86.xpak 59179955 BLAKE2B b94956dae8d21e1a538252f402045d99ca9b464810d8df51cf3f86c4a29f7c21512fd944086711dd5e432245259233dedc068e1d1bd9e8a5de74824396a67b66 SHA512 227bce0cc990d9943a4310c5edccda99acfb71e69fa414a800a138e0c16ceb780e61fb68529680a93b72d64851914fdbb4cbff7ad70f8dafdd88d8ca82e3dccb
+DIST gentoo-kernel-5.14.13-1.amd64.xpak 68024577 BLAKE2B a43710471bae30805de6110dbc52f93ebe618dc68e3348717e22296ed7afbecc2657e0d4eb05b177d5f1fc9c0d6407dc3310ffd6021baede0f02540b02eeee15 SHA512 6576792ce0a46829782dd380392fcbb48b399b0f4b649e17baff1b0e0487dab81e4065eb5efe9e41919cd4e43c3c2b5ad5141731c9bc19f765ffc6d0895b49ca
+DIST gentoo-kernel-5.14.13-1.arm64.xpak 63344405 BLAKE2B bf8618ff4614665383768fe5cacf19277e6283d6c84893a4e4c05b55cde8212c019c9a278044146fb3aa7b52c69f74c94c614e40b1b8fe59f2cc76662ae357ca SHA512 029c1b07c39ea2d95075da59460a864bfb2767675cedd4f1bafefbd61fd084c1d9ad8f3cc579e772581c66b78af44ee386b6e2839e788bb62b45a49557d4b56e
+DIST gentoo-kernel-5.14.13-1.x86.xpak 59170584 BLAKE2B a24893477ab57d178622f1044cc43b136cd12b7814bff1b956c0c1a7a34195bc0d00e6947fd7e0e22ca82b7ef808b164f1577604a373e96a614be4e56d46899e SHA512 d26a623023f79c14964b8a900640e68a870bf3a920cccbe6a9b4d172414411d805eaf6336cdc6a8a4b205b128c08d1c1d9a5953bf8a99a4093dc43d6dcdf3951
 DIST gentoo-kernel-5.14.7-1.amd64.xpak 68031586 BLAKE2B 7cc01200f01a93daf5f0c84b09e066474dc5dcef76ddadf5e43843a3bb8a69710134ee9546cbfc6da0149b96e480d59cc0ceb610608c7e6710dccbb9e9e185f2 SHA512 595ce0155ef9df5809d7c27ee310d3978bde477e6778468f467c9f07a60c43dd7ce6e39320d3e298639f01c18cfed5811de480d0afd884586d13f434c533fe6b
 DIST gentoo-kernel-5.14.7-1.arm64.xpak 63383693 BLAKE2B d8780cdd6306f36530d82b9a5b6a74e1d2caf9c4e9db31d6816020bc9415fe92891e418dd08f89628f3d36189c84f97c10b570091c2d1a94a494f37a21286706 SHA512 90ef111ef0ef68dd362c458c9e6ea15959713118787ebd8c68492bd204da83a212e5def456fd550c3f175565c262581855599adeb34692c65f54c2f2d7f1d06c
 DIST gentoo-kernel-5.14.7-1.x86.xpak 59157603 BLAKE2B 2c8d5d3786f9b2aa77d0ac7eb4b3dff0d534bebbd974ec43b8b1e7e9322d3a1b9db0554ebb3bf6943f00673e087bb1067f14d341836012bb46774e5b194f1cf5 SHA512 af337483437a9819d16235e9641cb3f9893e140091e31a06ccb1015a6e946189defb5b2d2d12afd19dffaef1828a2d101b01798f107457a53a93ada2d063f023
@@ -62,6 +99,15 @@ DIST gentoo-kernel-5.4.150-1.x86.xpak 53154582 BLAKE2B 3230b498ed602da9cab50d62b
 DIST gentoo-kernel-5.4.151-1.amd64.xpak 61415626 BLAKE2B bbb924ccc35a3dff6cc2284f7fd414f0add828debbbdd900c7d2a4e822b1f90b90ac8064c61798290ff806a325ea22e418191e12990f6a6887d1807ad8897201 SHA512 d033aa25c9a069cfd02eacf2aa1699840fafe0fbe17835bc6d853d04966cfbc2135bcf98a3d58afeee9dd40a4da1d867eaee7bb0e78d2bee049c3f3d62951853
 DIST gentoo-kernel-5.4.151-1.arm64-r1.xpak 57973056 BLAKE2B 2b78681505963b42718c0d899a72643d8193e43d6f5a9709855ef2e7b748aed99c9980e4852dc4a860bfdaf713d226f4a1582790cb9ac9058715c2a94037327f SHA512 1ab279e632f0f17f7efeb14735c0d7e62b51a597c5e5aeb5bbaa1ea34db662d5668f865cf7024053969baf8673fbfeebf701d6989eb43fffb9356d40b7711363
 DIST gentoo-kernel-5.4.151-1.x86.xpak 53172777 BLAKE2B 59036b5c78b49fa125f67e7066ea6e32dfc3297f0de96993a5dc8517708cc844bd1696cf573016a9f6ecec01bfcda47bf057795eecbc11d8080e1a2978eb6fe3 SHA512 ba34d560c7405cd2b6478b5e78bb8bd371d95434a30e9cc78d10df301be6dd4737a4ef84ac1c824b88f921c4f9a35f889307072355d1ed69a9a049a1551b3256
+DIST gentoo-kernel-5.4.152-1.amd64.xpak 61376142 BLAKE2B f6eed297fe1a9fbf5882522f1a2b4b154f0900b1dd38e8fa7f6e6d3dd8c8d613e8218c9eae6bb9a039c6f049910732218d9529567acf346761daf0d1da3923cb SHA512 2b4559c270a7479039288092e17b1c084b01e9d44b0207c7eb289074667fc53ec6b670f370ee9e4bc0d175aa5ce1fa38ad6d0a739c3fb852499326fa5b58ac3f
+DIST gentoo-kernel-5.4.152-1.arm64-r1.xpak 58006425 BLAKE2B 73697415be296fb5e259ad566cb7cea46cc755a3162ec113b4e34f04fe3e1a1bea134f58fbd4cb7026f37e200503229de82b1a02db8968e73133c996357aafde SHA512 6a5063e1c755b189d19b0f52c23c07eab941849172f3e242ce83254794dfba36d5c6983f75d55db04d01c54e99095e8de0220a28307da9ac48a163fa58fd354c
+DIST gentoo-kernel-5.4.152-1.x86.xpak 53160478 BLAKE2B 64bb7c24de23fb7bffabdd56e1d79b0ebf2d1ff9e3ab6bee70e454a4a94106d5eaa956886e78d264c204b9d7214d1664418113b92b27a59c123a39f89705e9dc SHA512 7afa3a380453b64e54153e59cb552ccf1bbe85eab665646bf0f654e3b8c0edbd25bd57acf93e2deed9d1307e5dad2f7ef037bf28da0d8d9681c9ce05c9ebdcba
+DIST gentoo-kernel-5.4.153-1.amd64.xpak 61346905 BLAKE2B 813efd5bad07ebe374dc5611eef01ac6958764ca52de4a03f9aec5e25d28a34405cda5d2b2cffff4848e857b874c0bd0dac57e9311d3274321f2e1fa10afc58a SHA512 b563e52afd8d9e1a2e0c5cec48c61bbb1acb4f20b788a2ff6799d0015ac3d8f69f7aa2d58ead4eb9a8cd3760037e94152bc90aa268043fc4ec4c93c26c0704a7
+DIST gentoo-kernel-5.4.153-1.arm64-r1.xpak 58075899 BLAKE2B 6948e53b8e1fbc82e8742517d2a808eec4aabc6503ac1f22d0d5de77473dd3a67e4772454ef5944044153966002beaca0c26593462efa85d74fdcb894aa75d58 SHA512 a64d9dd91b12dd290bcab8b9d516bf22e8e28e319bac8a196756bc2bac01cd43cc3eed7d856bdf0e4920cb6edf0f9f977ef8db28a711165a4503ad5539b1080c
+DIST gentoo-kernel-5.4.153-1.x86.xpak 53168275 BLAKE2B 583f450220035bec5e718e2251bac5a0a7d2a178c3c28dc9eb005e2f596313b0cb48d58a6d69612b110194f9d34d30fb40486351f2b5db63ca486dd38880a851 SHA512 af873b666c6cf0096a6fc370ee59cf79b8ff2c005afb29aa9611b8f75620ce2773452bdaead00f7fca206c358f26198e2585facec9bc6bc75dfc65ce780942cd
+DIST gentoo-kernel-5.4.154-1.amd64.xpak 61399049 BLAKE2B 1cd9dfa937e87a8e1ec35a2e76f761f022a3c0ecef62c8d62e1a6f2e7972b0e7684bf543819e1c395df0b421563c876de0a29ea8a57b88ef26f7ed394cca7a0b SHA512 706c3dc11604646c29174c12a94afff95f3354b9f658d66591f263dc1a45732415bffb4aa3ed116ba999065feb94723428a5d259cda7bc5373da2ce79c2f3068
+DIST gentoo-kernel-5.4.154-1.arm64.xpak 58059965 BLAKE2B 434c37aaba83a7eaa88804b0d912e6a5ca6e4cf3b3c3a7c3096c5363471c6bda6b541c6d8aec8541bf3740c532fe75b4b4b80076cde642c813a82b18be6140b0 SHA512 24a064e19a267d5db1426f7484ec0210baaef5343f507a037cd8dc01977612878d1ddf9c0c9c953aef5761ae06c716390d77ce9a86c181db6ad8a7a89fe6d510
+DIST gentoo-kernel-5.4.154-1.x86.xpak 53175292 BLAKE2B e6a37169fd36a40f766c3f45f1a85033dda4113bbd7167d7946dafc9f92ecb4393609466dc8f338c9ca3fdcb18c82210e9506a677bcd8f46bb3bb1b5cae427d1 SHA512 8e88fcf1201db8df51268fd1ce13cf0b534919c12426f1754d140d950a7b87b726d44d03782f3bb32738ae638c35290bda4ba682d788e90798694ba9ba135bc0
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
@@ -74,9 +120,22 @@ EBUILD gentoo-kernel-bin-5.10.70-r1.ebuild 2542 BLAKE2B f0875f84db933407258e0b4c
 EBUILD gentoo-kernel-bin-5.10.70.ebuild 2677 BLAKE2B c8dea5ffb279f8919ae35d3f9dbd328d317f164a3a85dc88c856270d71dc6b5f709b7f088cc7c059aacac96ade4f3d7f1c96f5f1b2a6c03118576b217aa5146f SHA512 56d94d99725ec854f13092a2a5fda787bd1fc60b5576f6f1e39f80d0751062e88a992aa578cd208b76f6c9ab5e4bd4a30d9c7e1ae616eb948cbe1f6847ee0c0f
 EBUILD gentoo-kernel-bin-5.10.71-r1.ebuild 2542 BLAKE2B f0875f84db933407258e0b4c068efa29a99a2e87bf77ac1f40c2387be9a73ad15af1ea01c14641b2b3d8ed05b55347059de2feac8bba1853706ad68b72f2b9cd SHA512 bb839e158eca955a08d18fae084cb14359c3e83c459f724b584b3c41c5e763faf6c06d6f35742b564681a7365fd909c1f3a6c1e1070edfa1d2a802a2dc921447
 EBUILD gentoo-kernel-bin-5.10.71.ebuild 2677 BLAKE2B c8dea5ffb279f8919ae35d3f9dbd328d317f164a3a85dc88c856270d71dc6b5f709b7f088cc7c059aacac96ade4f3d7f1c96f5f1b2a6c03118576b217aa5146f SHA512 56d94d99725ec854f13092a2a5fda787bd1fc60b5576f6f1e39f80d0751062e88a992aa578cd208b76f6c9ab5e4bd4a30d9c7e1ae616eb948cbe1f6847ee0c0f
+EBUILD gentoo-kernel-bin-5.10.72-r1.ebuild 2542 BLAKE2B f0875f84db933407258e0b4c068efa29a99a2e87bf77ac1f40c2387be9a73ad15af1ea01c14641b2b3d8ed05b55347059de2feac8bba1853706ad68b72f2b9cd SHA512 bb839e158eca955a08d18fae084cb14359c3e83c459f724b584b3c41c5e763faf6c06d6f35742b564681a7365fd909c1f3a6c1e1070edfa1d2a802a2dc921447
+EBUILD gentoo-kernel-bin-5.10.72.ebuild 2677 BLAKE2B c8dea5ffb279f8919ae35d3f9dbd328d317f164a3a85dc88c856270d71dc6b5f709b7f088cc7c059aacac96ade4f3d7f1c96f5f1b2a6c03118576b217aa5146f SHA512 56d94d99725ec854f13092a2a5fda787bd1fc60b5576f6f1e39f80d0751062e88a992aa578cd208b76f6c9ab5e4bd4a30d9c7e1ae616eb948cbe1f6847ee0c0f
+EBUILD gentoo-kernel-bin-5.10.73-r2.ebuild 2540 BLAKE2B 517bdb928b05b7459e0e17eb4c65507a18a1ea755a3995f9c59efb83c9c3953935c166dc23c5ff734a4062ad199f1a5166a7e3a2755c95c3a7bf02b75432d23b SHA512 5daae6050c9729668dc8803e2bc9d447b88c12cacdf06882142f6f42c9ce69abb1dd3a7e1cf87131322c673a34c29c2e29cdbd4545419037fb823ecaef425b89
+EBUILD gentoo-kernel-bin-5.10.73.ebuild 2675 BLAKE2B 50558464db4279a19a8a2c19827e7cfad716be6c252a58494692bf6debede6d05368253ec8d63f259d8f15377a61e9046e3106d93189865f3a90b9aeeaffb8ed SHA512 c4803d43d6c29839380d6f6c9ad3bf09db75e0fab94fe09025d907f574ab3be35c59114a9a32e4feb511e9d70079a0355dba7d827d439b88eee9d86cc9d4be0f
+EBUILD gentoo-kernel-bin-5.10.74-r1.ebuild 2542 BLAKE2B f0875f84db933407258e0b4c068efa29a99a2e87bf77ac1f40c2387be9a73ad15af1ea01c14641b2b3d8ed05b55347059de2feac8bba1853706ad68b72f2b9cd SHA512 bb839e158eca955a08d18fae084cb14359c3e83c459f724b584b3c41c5e763faf6c06d6f35742b564681a7365fd909c1f3a6c1e1070edfa1d2a802a2dc921447
+EBUILD gentoo-kernel-bin-5.10.74.ebuild 2677 BLAKE2B c8dea5ffb279f8919ae35d3f9dbd328d317f164a3a85dc88c856270d71dc6b5f709b7f088cc7c059aacac96ade4f3d7f1c96f5f1b2a6c03118576b217aa5146f SHA512 56d94d99725ec854f13092a2a5fda787bd1fc60b5576f6f1e39f80d0751062e88a992aa578cd208b76f6c9ab5e4bd4a30d9c7e1ae616eb948cbe1f6847ee0c0f
 EBUILD gentoo-kernel-bin-5.13.19-r1.ebuild 2541 BLAKE2B f4293af94bfc918c3c5707dd020ca21551fd6101e5290230345aedad820f6832f217f307eea4c53e950414ef8675255e84ad0da7202f7f55d2da3d7a98c4ae27 SHA512 f7628a110b0bedc7d604eaaf758ae42211b4a68f3ad244387d19cc3411d9fb4f7d5ed391309f7e365b6e104ef0859b05f0c8e4bd2b4b26c15152d7119d426a97
 EBUILD gentoo-kernel-bin-5.13.19.ebuild 2677 BLAKE2B 36ea71e86c73f165c48bf0be61a199b287b19d8b5a24577a671c458ab58a1489d27d03390092f24cf5685f4e3ec52c7062afd39eb2ba7e3f00cf0bf13caf0c5c SHA512 7a4d3a7525feb32b33e173d469decb36eb65d61a7c0d1bc5454ad3037200fd4d8ce0bb20d421cb88edb72e6846501cb79999c58161c08166d022163b49072634
+EBUILD gentoo-kernel-bin-5.14.10-r1.ebuild 2541 BLAKE2B db09d51ee88e05a7bdbe9cefe21e7220ee15bfddb77f95546d4bc36695540b3bbe389433247601d94b57660200df5b4ce247df0f0a7d22c0b661f4b9c9a02d2b SHA512 8fcc8c3c6c86dc8a4b8558d858276e48511d7f251d1e03413edc056dd2f70e04d9b8bbd3c5be5e3a156b4262896d9ad0bff9262d78555d0d2f40dfe140265aea
 EBUILD gentoo-kernel-bin-5.14.10.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
+EBUILD gentoo-kernel-bin-5.14.11-r1.ebuild 2541 BLAKE2B db09d51ee88e05a7bdbe9cefe21e7220ee15bfddb77f95546d4bc36695540b3bbe389433247601d94b57660200df5b4ce247df0f0a7d22c0b661f4b9c9a02d2b SHA512 8fcc8c3c6c86dc8a4b8558d858276e48511d7f251d1e03413edc056dd2f70e04d9b8bbd3c5be5e3a156b4262896d9ad0bff9262d78555d0d2f40dfe140265aea
+EBUILD gentoo-kernel-bin-5.14.11.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
+EBUILD gentoo-kernel-bin-5.14.12-r2.ebuild 2539 BLAKE2B 6b2cc07b2c5bb9feb7f549ca16e3ea66d514bb140ed2c098c11e2a0b83ba105f3ef107c2f5b4463436d942763bc8daa8f514bc831a78a34d56048d4dfad5b7d6 SHA512 4d7d037465de4c1953b2f61023ec44a3006bf022a87a7ee3ab554c312e1372529da0e75d8fc3a1fa0096f49f1f4623c63500e81bfa20729e9f007c30ec944ed1
+EBUILD gentoo-kernel-bin-5.14.12.ebuild 2675 BLAKE2B 7dab3b5b37c1ff781e07a0116c303fa72ad9290cfdfa4c64207f74a88540fb5a08064ecd9d9841cef5b7e9f3f6ed13db5b091ee320e4cd4fa70810c00da2d57c SHA512 d271f0f45300731e02e0e1172aab45835dfc7a37343347309a17bcc643a3097616f1773df2d6d9e04f32a5940b8c786c3e99c5662ef1dd98b99e73092920f803
+EBUILD gentoo-kernel-bin-5.14.13-r1.ebuild 2542 BLAKE2B 952d01614fd47248c95267e650ccbca6f01956c70ea8d8837bdf7ccaede6bce5031bb2f767269bb5ce455914cf6e215bc9a6273ce914ac71b5b5da4536c97f63 SHA512 f7b4e5ce1533646eac42ae849fec328feda9afb10229b878865230b72872b6865202a9785be163216af60e1c67dbe56a197723d06795ca3df311de260d46c453
+EBUILD gentoo-kernel-bin-5.14.13.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
 EBUILD gentoo-kernel-bin-5.14.7-r1.ebuild 2541 BLAKE2B db09d51ee88e05a7bdbe9cefe21e7220ee15bfddb77f95546d4bc36695540b3bbe389433247601d94b57660200df5b4ce247df0f0a7d22c0b661f4b9c9a02d2b SHA512 8fcc8c3c6c86dc8a4b8558d858276e48511d7f251d1e03413edc056dd2f70e04d9b8bbd3c5be5e3a156b4262896d9ad0bff9262d78555d0d2f40dfe140265aea
 EBUILD gentoo-kernel-bin-5.14.7.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
 EBUILD gentoo-kernel-bin-5.14.8-r1.ebuild 2541 BLAKE2B db09d51ee88e05a7bdbe9cefe21e7220ee15bfddb77f95546d4bc36695540b3bbe389433247601d94b57660200df5b4ce247df0f0a7d22c0b661f4b9c9a02d2b SHA512 8fcc8c3c6c86dc8a4b8558d858276e48511d7f251d1e03413edc056dd2f70e04d9b8bbd3c5be5e3a156b4262896d9ad0bff9262d78555d0d2f40dfe140265aea
@@ -91,4 +150,10 @@ EBUILD gentoo-kernel-bin-5.4.150-r1.ebuild 2545 BLAKE2B b8a68d8afe2e7066eb7a47e9
 EBUILD gentoo-kernel-bin-5.4.150.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
 EBUILD gentoo-kernel-bin-5.4.151-r1.ebuild 2545 BLAKE2B b8a68d8afe2e7066eb7a47e9fe22cce2aad4c6b01c930ab5c01d6f1fb1ccef4e1f900cfb281f4ebc15264f59136c80bf2d4b383c87891b9979050bbd99e6429a SHA512 ca86c79ca3bf29d69f7e9c666b9d1496898f26bfbb0f9d989d7a99f67a2881ae218f4b703ab1b07eae60400580da6b6705a738d5f60f509660807972fc9a4e00
 EBUILD gentoo-kernel-bin-5.4.151.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
+EBUILD gentoo-kernel-bin-5.4.152-r1.ebuild 2545 BLAKE2B b8a68d8afe2e7066eb7a47e9fe22cce2aad4c6b01c930ab5c01d6f1fb1ccef4e1f900cfb281f4ebc15264f59136c80bf2d4b383c87891b9979050bbd99e6429a SHA512 ca86c79ca3bf29d69f7e9c666b9d1496898f26bfbb0f9d989d7a99f67a2881ae218f4b703ab1b07eae60400580da6b6705a738d5f60f509660807972fc9a4e00
+EBUILD gentoo-kernel-bin-5.4.152.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
+EBUILD gentoo-kernel-bin-5.4.153-r2.ebuild 2543 BLAKE2B 4359fb9e9185a8228ea395f0e7fe6e983cd9fa3bb05fd91034d34901cef10909df84128e3cd2cc30317b5f028415261303fd6a8dbc727514caa42aed63cbb33d SHA512 af0c9117b7675eb75ed28614b3fe7aa4604c983a257590114b2784b9561b930032a129f1784f2e8d14163a0fbc87d5837c34ea627e61533db44787144a83ed9d
+EBUILD gentoo-kernel-bin-5.4.153.ebuild 2675 BLAKE2B 81a555fb9602a18818f384c1cbc0929eca560a2c1ca7055dc3ccebb44e66a16e12ca132523ae18b45b61d644fee834cb06aee9145a886cf1a89b8f0a45219883 SHA512 5fc435c9479c488354d3be8457d8ec8fb3934b399bd687bab80b5721474514e0cab39ed3b6ab54eda9e004b8edc860104333a3981e69ce884bb88561055c38b4
+EBUILD gentoo-kernel-bin-5.4.154-r1.ebuild 2542 BLAKE2B 6d28ac98d98db7ebf5bfcb35c7a2c223b9bc82164fca1a85ce89e987f285b1eb5c8b1848dfb9b185c6ead189d0bd1a6346d44d8638b71dea1ee0083c3e879e02 SHA512 847c2545daa9a7d6cbf094aec806ea00f7e4fcaa4092342d69d2e3313e3dc85adcafb284c5f9a654446e5062340d4b96aa1c007003ce1484d32a8a9e02a7906f
+EBUILD gentoo-kernel-bin-5.4.154.ebuild 2677 BLAKE2B 7b08f219678c5b66d567a22360c3f23a82a9b9d12291eccceb0f400d8a2dbf371d3bad76f44cf52c63109a95de4b58288c57b0f89836be356d83394d5ff9bc13 SHA512 90f07d1dbf82b88c1e989c1e6696534d7908bab161523af69ac02e987f5aaf7a253831709e55d42823bff7bccc32b173cca1a03aea2f542eedab29d61cf5ed3d
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.72-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.72-r1.ebuild
new file mode 100644
index 000000000000..9f8ae493e215
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.72-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.72.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.72.ebuild
new file mode 100644
index 000000000000..b23f3e054425
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.72.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.73-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.73-r2.ebuild
new file mode 100644
index 000000000000..d56af60a578b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.73-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.73.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.73.ebuild
new file mode 100644
index 000000000000..89387b6fe81b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.73.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.74-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.74-r1.ebuild
new file mode 100644
index 000000000000..9f8ae493e215
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.74-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.74.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.74.ebuild
new file mode 100644
index 000000000000..b23f3e054425
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.74.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.10-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.10-r1.ebuild
new file mode 100644
index 000000000000..c4534b7e4c4d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.10-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+		-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.11-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.11-r1.ebuild
new file mode 100644
index 000000000000..c4534b7e4c4d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.11-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+		-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.11.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.11.ebuild
new file mode 100644
index 000000000000..c31025c57600
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.11.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.12-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.12-r2.ebuild
new file mode 100644
index 000000000000..ae5406f75115
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.12-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+		-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.12.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.12.ebuild
new file mode 100644
index 000000000000..f6712def1088
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.12.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.13-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.13-r1.ebuild
new file mode 100644
index 000000000000..acaaf28e30cb
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.13-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.13.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.13.ebuild
new file mode 100644
index 000000000000..c31025c57600
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.13.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.152-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.152-r1.ebuild
new file mode 100644
index 000000000000..3b97f74d1041
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.152-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64-r1.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.152.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.152.ebuild
new file mode 100644
index 000000000000..19484744cb5c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.152.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.153-r2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.153-r2.ebuild
new file mode 100644
index 000000000000..fef2dfdd7648
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.153-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64-r1.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.153.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.153.ebuild
new file mode 100644
index 000000000000..ea0354e89533
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.153.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.154-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.154-r1.ebuild
new file mode 100644
index 000000000000..fe6e6023d323
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.154-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.154.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.154.ebuild
new file mode 100644
index 000000000000..19484744cb5c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.154.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH=$(tc-arch-kernel)
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index f254a0600973..885eeee68436 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,12 +6,24 @@ DIST genpatches-5.10-76.base.tar.xz 2336392 BLAKE2B 72b937a112169e68f5ae72fa7c0c
 DIST genpatches-5.10-76.extras.tar.xz 3848 BLAKE2B 89eba39e2c72ca1fed282a32b5de3dd027797940823619edb5c2a0daf341c8ba7c512d204de6991a8a85c348f47459209d3d24ce917370b4b4f7d330b31da4cc SHA512 98163a299c371b3f8fda9268e8994e16de6cfb90f8c5a6ccf6e6cb85d5ff05ec721021bcdc8ec34bf6620a7ccd8055712f7d0b879b5638a376eaa458457f079b
 DIST genpatches-5.10-77.base.tar.xz 2365032 BLAKE2B 7aa32a168b6f5d75f30501a6e779c253becdd398789b2e54131d1299d2c99acc329fcffabc37ae5212b12ea24268b721770d09ba321bdb670131e9f37e5d0d11 SHA512 4fc8a442b98bf47ff8810b857cbd5f59d6e8805c7a5768a439bdbf54db28b0d6c81bf3d4dcbeda9a0784ea159c7cd7b24ae233435cc77bd05c82e9c75867157a
 DIST genpatches-5.10-77.extras.tar.xz 3848 BLAKE2B a8a97c432acae3cadf43e033a615560da3477dcd1c0dcb9cb97f2edf69ffe5074e5066e286243b0bd66d0fbedd86e097846587df5e96c6462d67b354b7e75bcd SHA512 2d4726d2de66bd3c0a6d191f47c24de16d6d5cc815f4eed6199f0162a8ee0c7fa05ff90727a95c27a182a234d3c31bfbb9f62b17a0d7448344db32bd230b5123
+DIST genpatches-5.10-78.base.tar.xz 2372000 BLAKE2B 263371197ab54e9153bef37cb34fc9d60e359aaa10a2991fb507664082554590f03e5518fbc94665c58ab93a643473e1fa3614fdd650089cfdeb542b51a88b88 SHA512 832a57e2a775921f96769bf09c277a1d317ae31f73309f6d4d6b817ef9031efb4cebec29ed9d9c68671ba79efc8e76d03e7c1fa65683664d6be0dd05a7316a0a
+DIST genpatches-5.10-78.extras.tar.xz 3848 BLAKE2B bc1f534a45c748e9ad1e6382349853d58c93c51db7deb411ea5fe981edc983c3df1d62034af582da4740c8a8c5f3617bd8e360602f806808148e2a0e66b6f327 SHA512 d96f7924e9c7c128eebfc3e73ddd54a501a7909a5d51bf74f062988113c7a2b3671813f875018a52395f41aa6d3fb86a35e57422b19ad885e667e1bef693cf9e
+DIST genpatches-5.10-79.base.tar.xz 2387632 BLAKE2B 2da2a130876482ac0c4c2959e4faa7931fbe6037c03da78f7238411b132dba8e7e196aa5102b8b74d1996bc9f7d29b435c506954f6db4c91bf3b0a4ff39cfc46 SHA512 1034e28b4c880c285999ddb47f3074a9885fcba6716ce58bd121a654f20f0ee168fc454475517c3a2c9e8327f1a81b5c68b26a114ac074c425be68e95eab3472
+DIST genpatches-5.10-79.extras.tar.xz 3852 BLAKE2B 9e76a55a44ac857f37ab753e4ef13e5f041c68b14b4a6cb762c75435513f084c211b2dd4797bebeae451bfd207be133f9099ce14ecf8cb0142f5f04a1ea4f504 SHA512 538359609f242eb7ca012c4626c0b049de8fcf5ac81934bd21e75e53d5d4657db831738b37f24d96ea5e1c3ed8eb01b577c1978c7095a93aad9d5ad225894505
+DIST genpatches-5.10-80.base.tar.xz 2394312 BLAKE2B 663fc2222740c01ef53024985679854abfd97b3a44b5177229f4529bfb2497810a73d177ee714d699e7367602c14dd5c7c99c312f38dba496fcfea062f485ba0 SHA512 ca51c04253647b98200c873f67a0f52861299376ab02c7a665b142962eed3db77060f6ae5e8391518388447f81095c8bca0c9d20502dc53c0a7e42216ce39e15
+DIST genpatches-5.10-80.extras.tar.xz 3848 BLAKE2B 401714e5b73d2e9d8ec46cae0f7f2729c6542726f2234f46c68cc4cc695276df37d757c37bfbc11e6e4fbc91b6b4edef0172520f9be5d457e2e4c283b41224b3 SHA512 88bec3172d52f7c9b71bc8575622f071ec6469ae58578d43e31ee027631ab6918c9b0c24bc852d9716f4a0292e85fffb169304c43800b870e4eb33e8245b608c
 DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B ba681ca3732dd42d0242c2b4e95f90f92bf4737eee326a33297c03d9cefd5da3182262626caf4635a3c66329df5fd0f28d55a963b5fbba110f025e7874f00726 SHA512 55f21fa1711464d686dcac9886ed0420cf48d2ab4e1b98ec1d8ac52c8828d4d8c2d71c4e57df989d23df670d46a00ec2c7dcdd4dfb7f411e904e379f9fb702f1
 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a SHA512 397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
 DIST genpatches-5.14-10.base.tar.xz 395372 BLAKE2B a645dc7c97a08fbd4f58b9696a58f5e61859858cec6214593e75c8394ec11464bf469ad4f17d75dc978878beb4cc7e9a37a91f0d879ddefe5e50cb80f38a85ce SHA512 add638c70c9d1e95aed125db0d3cbfd1b9c7b4fc2ab5c5548d38dd1bff7cce57e459a8175d9e4e719a4c2bb95e3ee10ee697b5288ff9ef26a9cb50287eee1d86
 DIST genpatches-5.14-10.extras.tar.xz 3848 BLAKE2B 3ea5db4c39e5ecfb856189191979806f34720672a7d83a5454c0f49f0caa32f035c338c0413ad1ec27dace1085661ea9c7e4318c59d062d99dc0a2e4c8aaa3d8 SHA512 7665b5b006d1847a8ac668793635fdabd6774820eb9e1a7444267708e34b935253458cd74a0f24219fa19b22e895c7fe01943ab3156608f5027e43abfecca4c4
 DIST genpatches-5.14-11.base.tar.xz 446596 BLAKE2B c7ea616d473fb6e07af15ad0cd400fc4397dd9833af139fa19b23d5175959de09c5b2eeea1efcfa9e76133f4f07cc503245d03d2f7172dce9e677028d69b05d6 SHA512 b4eb0036109c628c2a4648edbc2b601da3003f7bbedd0c9811fed22c472b492763ac74b61f36cec896ea04641ead861522d2447bf88ee0302f68a8ebe02f566e
 DIST genpatches-5.14-11.extras.tar.xz 3848 BLAKE2B 05f652b6f3f4052b5992c747ce8354c8bc6ab64a7197150c223f868c0060a55c289dca650d3dadc804bd39cc661dab56d7d8086c5dd9715723f17c19320960b2 SHA512 509e95a8dc4a1e2d1e28388575664006bc5c19eb5aa05e45999838c7cbaec875d784a85f852e3207a37047fb27fd5733a01f95c4d488ff1275661343cf5694ee
+DIST genpatches-5.14-12.base.tar.xz 459100 BLAKE2B ba32bf5be3d9e3e332659281495ecbe1b4cb683e1b5c3d1ab490d03ff3eee47db33e4f3f1c9c25f50230adaf267c23b01161d243c3acb2312352a40c8328b606 SHA512 1adc3a9ea9c7b3bbb89de6fb219f1cd0d6fb02c6f866c4a5519e70452799069d99e1b2491560bc408706ba40b0ab6cccaecfd34a1f11f76fcd8e5ee1cb78cc1b
+DIST genpatches-5.14-12.extras.tar.xz 3848 BLAKE2B 0bac1f83f9ebdc3b6860516313ca95d5ad2e1515bc587a3e6010bdbbd2bf3e55fe3acb835989ea874608149c3efcedf172451322ba5e5df821970cbd210a69ab SHA512 9e4c5445b0883680ff28e24d2b7af4d6dbd4d2f54c33583c5b91e0629caa5cac02b02996c52cf277909f057c8bd2f41342cd57f9e6ba9d8b4a8895fd70bcabaa
+DIST genpatches-5.14-13.base.tar.xz 502028 BLAKE2B 54de53dff2214469b24b173b17aa6a4cfa2ac50d8834434c0e50c5538484e7a16c3822b677572e4d2bb444266196a272487df0264c2fc4bd25e6fc6a7b63fb8c SHA512 205d403607618c0ea1e82ac9ba48cd1e90e961e92e282a5bc2723408ddd7a85ca871e91b23cff37c3108f37f4040fbe063928161cabb175c78b7175ba8b60974
+DIST genpatches-5.14-13.extras.tar.xz 3848 BLAKE2B d595a77078bd8740dc61a5e2f35d75f19015e2d4b30716f484bc961b9631a994a3b1a8367a1ed2d1c46d3bea601013e4488870cec202dbd5b63cffaf5078ce36 SHA512 b1abcde0b14f51d60ae27e885f7b912b8531ee77fb9b6b4c2e062f5feb1eddc2687965c949ea675c1c425561244e1a3011a1c092404ce86b171ea60991c7cd2e
+DIST genpatches-5.14-14.base.tar.xz 511456 BLAKE2B 5e4ed4eb05d3161292e9ae3e69ad28d99ba0e72f1b38289f9c3e3232346ac77fde922f4fc498fc9161b793bca2beca33728664c2ec68175a637676ee8737e311 SHA512 81a2293ebcfd9a44711dafe2e0ea14f73dd0d6d53cf5c30892ab5fc09995519174e3250d1521778058ca8ae1aaf75fc5ddf7541eb2231f8965dda45c8c8f250a
+DIST genpatches-5.14-14.extras.tar.xz 3848 BLAKE2B 5820173b798dddf5892b0a8f133f3fe4dfb0b80fec5bbba79b8f03f78af4722f48bb69370f56773bf9b7372aec3500db4f672fa82729bea8e93e8fa1af7efea1 SHA512 1012bd7f20b0657e75d810e66a97222c66373b8b2cb4cec0a29ea0469aae5ccdc0bfafc89dfe9ded34036883d88c7da111f99ce2076dcb8f01143e985a62c8d6
 DIST genpatches-5.14-8.base.tar.xz 315608 BLAKE2B 1a19a4aa497580d5d1ceed952899f0f19b13fa36a585206c1ce9b3c348754f6c94aeb7a697fadeda88ecd9e2b35e7d9061601bfbbc720cce00030b3b0de5d26f SHA512 5d131854f01730a807eba05109270f80d40b5f9db4fc7a9f9041200eb0025e4ef436a6df51d2020ae4cb737ff2846e080a318c92975be1d54a17e99131d6771a
 DIST genpatches-5.14-8.extras.tar.xz 3852 BLAKE2B 6ec8bdf43eca6d43f5e88f19e15c23e056d5f5144a5c746e3eb20170c445de82e465bdc5ef85f95a1c65582c458110437287d8f31022132fa092096147540c88 SHA512 d6a65dbe36ea6c5eb20f3df047493e3e3e31b27e4a812c9541e50deb4bfbe795de3f8eba4d901bf34a013d46ead22f849b77f3c2bd305f2b28cd039459f6c43f
 DIST genpatches-5.14-9.base.tar.xz 349596 BLAKE2B 801a5a1aec2e0cd1b52f1c21fd3349f91f8bbfd33c40892b28679ca89799f5589d333e5227674fed3326d0094f5932959427e31e5dc847aec261ebf164d2954d SHA512 a8463a1cda8084afd1e6613ba160c9a75b1a136331217627f9a6b7876f33e9bd4947cd6c059f481612962e430ef530fac246e8b48c38ca8f505b949296390590
@@ -24,6 +36,12 @@ DIST genpatches-5.4-154.base.tar.xz 4018472 BLAKE2B dd471796a671f5eca01d5c77bbfc
 DIST genpatches-5.4-154.extras.tar.xz 1784 BLAKE2B a97a459428ffbedc0a8f4e8a4bc8c15b22bb74b00198843bd3558d2a21b770d0c8273f1c0d9efa31515eb2585052ae6500f93489b06e5a24ceca5396d5393ce0 SHA512 829a6b76f50c1c08ae46a1a102772b35ca04f37dc3908b34ba3c16d8034b3510d5eed95dcf61ba65773ef7506733669917cdc015913f2418f866df007d25c5e4
 DIST genpatches-5.4-155.base.tar.xz 4028140 BLAKE2B be936c28ef5da5deacdaafebee8781ba759b66427140bc806858fcaa3523c8076895bbc952b018e7ddaf5aa5ec45338acc50f6e235c0d54dc687124127de6288 SHA512 7dc3aa310d15abc349627d3d305a490722b9a49fc84d2969f7e98ae6940121d5e5b6b4ef0776b6aff138531cfccfbb0a9c3bef28790345d35f9a386bd741ebb2
 DIST genpatches-5.4-155.extras.tar.xz 1788 BLAKE2B d0ce88939e6e87ff1af00b161200ebe38895aa34fbace9f6197fcc541793eead351d13ea4d0fa1c0c565ccba4f7ae191ee432d909d1961df6121ee4f7a0bd516 SHA512 5fefaa51fabf22993fd8502e48a3282f172c7609d1b7418e9fe20ce8ff79c1bc1b3d4f33e1ec1d87040ee4d13c71d64bc8b48624d03b567351842d685f0fc64e
+DIST genpatches-5.4-156.base.tar.xz 4031752 BLAKE2B 7450e619bd4524c4c2929a2adb95ac492836a9686d106df394360faaef16e2e1d66b646e61199daf1b69eceb4b9aa3ca310e29d1bbda024ef1542f76778bbca4 SHA512 3d1986640f3851785c0cd5c95ac0715c81c202c2e75ff08d18c873a2f7092a2bb60032389d7899c4080ff5b16c33230c6e517a758082c1795463b338636216a1
+DIST genpatches-5.4-156.extras.tar.xz 1784 BLAKE2B 215396166913e8dfad67a0fea37626170aa71a8fdca7861f55e48c50e37fe0b92ba03e185d2cd23aae1f0903c9900c5ec7d79442c5f622c1f0093a3587f348da SHA512 43fe8cb9416a5d88c78a8c51466f7fbfd04b395a19efc2890669b9f3b90e233190c7724804c06c810cef89cbc3db95072afd2c04a3e9efbd074d975ce0f3ea12
+DIST genpatches-5.4-157.base.tar.xz 4048356 BLAKE2B 787334d4f61f375a6ab46712ff632d560a9532932ced876b90d78bc2161c48d6c917297e53604ff6ac0039ce5ec6edc70c84f6ca9933fd0d74f83c5e57bd2d42 SHA512 e7380f35a80a88d2fcc0278da156042c08b7cb1b6eadcaf2ce5769fb4b6127eaa8e1ce9e8a64f8c24286a30f566df4d52184ba3fa0993c6119d7b306c88fa8cd
+DIST genpatches-5.4-157.extras.tar.xz 1788 BLAKE2B ca74b942a7038927ee3ca591c383d0dd86418363399245e49763bb3efdb66a57eec28982c77bc10b723c897dc87d0f2991736702e3a22f23e02eba2d3686d933 SHA512 8c63e5e7fb2653e680d2d78c18e5b84362ae5f391d621489e377e21894b7df8fcacc15bca2c61b544b20ee6156abf323ddd599c3a47e292f17e5372f6cb46dcb
+DIST genpatches-5.4-158.base.tar.xz 4052760 BLAKE2B 1fa28f9309c2f9ae9fb8167cd016664781ec78d16a2e652e67de34503ccf4a28477fd16ee8f10ad9fb4eff35066d716c63df32f3ded98e9b8306e526528053b6 SHA512 37b6ff682889580053c2c5e88b2f46df9a6b5506550651773949ea9a4c6d70b56b1b59388df1d4747dbd1c9b186e95b0997f651a08df52be351401276e7b6f33
+DIST genpatches-5.4-158.extras.tar.xz 1788 BLAKE2B 265a90ab037b468294afea457d8e3c3e7fe2a1112100354e9f4a30f6604b204be5efc3f5889ce42ef0fa959baf80403a6ddf4ad36f4e9d0e9888c4c6ae7aa70b SHA512 9a498e672c05166dfc1b0460d6bc6830b5086fc2d9ef97423bef5334ded9d4f31836b40fe85b9c2f66eb56cda291e41399ecf88e9e4a20022f5d88bf6d4269b8
 DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f SHA512 5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713
 DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48 SHA512 55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c
 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
@@ -51,8 +69,14 @@ EBUILD gentoo-kernel-5.10.68.ebuild 3127 BLAKE2B 979ebf8eaca7ac64f9268bf37c2326e
 EBUILD gentoo-kernel-5.10.69.ebuild 3131 BLAKE2B d101a2b8b409e1127c470fbb4b64ee2829e173f5745751c6985703ea49bfa5b3c0ad01efc2b3f56c74e80a0646dc4a891d3acf51c2c0dbaca5824903ed1928a9 SHA512 dfc0a38f987c5c22d0ef76e1b94d0c9c434f1d53244a8000e6305d9fb20b15739e5ac99dfb2b94167c8c4d89cd0ca6f02885b880cd8d7364736a1e88f2494d25
 EBUILD gentoo-kernel-5.10.70.ebuild 3131 BLAKE2B d101a2b8b409e1127c470fbb4b64ee2829e173f5745751c6985703ea49bfa5b3c0ad01efc2b3f56c74e80a0646dc4a891d3acf51c2c0dbaca5824903ed1928a9 SHA512 dfc0a38f987c5c22d0ef76e1b94d0c9c434f1d53244a8000e6305d9fb20b15739e5ac99dfb2b94167c8c4d89cd0ca6f02885b880cd8d7364736a1e88f2494d25
 EBUILD gentoo-kernel-5.10.71.ebuild 3131 BLAKE2B d101a2b8b409e1127c470fbb4b64ee2829e173f5745751c6985703ea49bfa5b3c0ad01efc2b3f56c74e80a0646dc4a891d3acf51c2c0dbaca5824903ed1928a9 SHA512 dfc0a38f987c5c22d0ef76e1b94d0c9c434f1d53244a8000e6305d9fb20b15739e5ac99dfb2b94167c8c4d89cd0ca6f02885b880cd8d7364736a1e88f2494d25
+EBUILD gentoo-kernel-5.10.72.ebuild 3131 BLAKE2B d101a2b8b409e1127c470fbb4b64ee2829e173f5745751c6985703ea49bfa5b3c0ad01efc2b3f56c74e80a0646dc4a891d3acf51c2c0dbaca5824903ed1928a9 SHA512 dfc0a38f987c5c22d0ef76e1b94d0c9c434f1d53244a8000e6305d9fb20b15739e5ac99dfb2b94167c8c4d89cd0ca6f02885b880cd8d7364736a1e88f2494d25
+EBUILD gentoo-kernel-5.10.73.ebuild 3129 BLAKE2B 2c326d26786480e79b053a9daaff3e2d31b420ddd559c327ec185f37fe973027f7439eb8c6252cc36ba099704cb5783f9a82a3f019ab6c5e0204d125ff58d346 SHA512 1d0efab4aba6c736cf710af95cb7ec98a2a0079902968a45a2d5c30dd93f6608822dc8fe49c76301353050c0e7c4ba69c9dd669a82c8271a8f3700ee3949909a
+EBUILD gentoo-kernel-5.10.74.ebuild 3131 BLAKE2B d101a2b8b409e1127c470fbb4b64ee2829e173f5745751c6985703ea49bfa5b3c0ad01efc2b3f56c74e80a0646dc4a891d3acf51c2c0dbaca5824903ed1928a9 SHA512 dfc0a38f987c5c22d0ef76e1b94d0c9c434f1d53244a8000e6305d9fb20b15739e5ac99dfb2b94167c8c4d89cd0ca6f02885b880cd8d7364736a1e88f2494d25
 EBUILD gentoo-kernel-5.13.19.ebuild 3129 BLAKE2B bf974bf3ceee524bf31fae497e22d7bacceadd2c1221b476948da9ad927eb855365e896155cd84b69af169073541799999784990b5e2b8dd7615b3f5c1a14fcf SHA512 b00e7311942a763c4847ea9205e47e1133fdba254c35ec740d9097767261e3c0636c729607aa7ea4b346e88644d1da8e30e620254c731d0278066168fcc05cbb
 EBUILD gentoo-kernel-5.14.10.ebuild 3129 BLAKE2B 6e8f1f891569551c97df34d60b33103f4ee39601d28658a0cd9170f687c0f248af98d6b6011c8646799f02ae04650cf72dd38d2f9bdaf4a5e8961d884d04f9c7 SHA512 cd83e4778f01bad83da5e407e53489ccf079dc410a396fe35b83f046e0873d7c3f5d8339f2435eee2bf710e385c2c23385fdf4918716a8af610babd277177db4
+EBUILD gentoo-kernel-5.14.11.ebuild 3129 BLAKE2B 6e8f1f891569551c97df34d60b33103f4ee39601d28658a0cd9170f687c0f248af98d6b6011c8646799f02ae04650cf72dd38d2f9bdaf4a5e8961d884d04f9c7 SHA512 cd83e4778f01bad83da5e407e53489ccf079dc410a396fe35b83f046e0873d7c3f5d8339f2435eee2bf710e385c2c23385fdf4918716a8af610babd277177db4
+EBUILD gentoo-kernel-5.14.12.ebuild 3127 BLAKE2B 1ae874398c8c3332d9b3d8bfb573890f7f00d8f43678bd3caa44780ecf853c061c16a4b119f19b4474c269a47c6c8c92adc05aa34dcb4b0113ba0d8b9a1e9ab6 SHA512 816231e0e6708bdfc12403945c588848f4a7d9655b0bd9b4e718cea3ee75694795d0a946a9346e47748ba56f5101cb18926f4a899b8d2fef38793aa491ecd91e
+EBUILD gentoo-kernel-5.14.13.ebuild 3129 BLAKE2B 6e8f1f891569551c97df34d60b33103f4ee39601d28658a0cd9170f687c0f248af98d6b6011c8646799f02ae04650cf72dd38d2f9bdaf4a5e8961d884d04f9c7 SHA512 cd83e4778f01bad83da5e407e53489ccf079dc410a396fe35b83f046e0873d7c3f5d8339f2435eee2bf710e385c2c23385fdf4918716a8af610babd277177db4
 EBUILD gentoo-kernel-5.14.7.ebuild 3129 BLAKE2B 6e8f1f891569551c97df34d60b33103f4ee39601d28658a0cd9170f687c0f248af98d6b6011c8646799f02ae04650cf72dd38d2f9bdaf4a5e8961d884d04f9c7 SHA512 cd83e4778f01bad83da5e407e53489ccf079dc410a396fe35b83f046e0873d7c3f5d8339f2435eee2bf710e385c2c23385fdf4918716a8af610babd277177db4
 EBUILD gentoo-kernel-5.14.8.ebuild 3129 BLAKE2B 6e8f1f891569551c97df34d60b33103f4ee39601d28658a0cd9170f687c0f248af98d6b6011c8646799f02ae04650cf72dd38d2f9bdaf4a5e8961d884d04f9c7 SHA512 cd83e4778f01bad83da5e407e53489ccf079dc410a396fe35b83f046e0873d7c3f5d8339f2435eee2bf710e385c2c23385fdf4918716a8af610babd277177db4
 EBUILD gentoo-kernel-5.14.9.ebuild 3129 BLAKE2B 6e8f1f891569551c97df34d60b33103f4ee39601d28658a0cd9170f687c0f248af98d6b6011c8646799f02ae04650cf72dd38d2f9bdaf4a5e8961d884d04f9c7 SHA512 cd83e4778f01bad83da5e407e53489ccf079dc410a396fe35b83f046e0873d7c3f5d8339f2435eee2bf710e385c2c23385fdf4918716a8af610babd277177db4
@@ -60,4 +84,7 @@ EBUILD gentoo-kernel-5.4.148.ebuild 2818 BLAKE2B e989342b15abf7771213d72c62618b8
 EBUILD gentoo-kernel-5.4.149.ebuild 2822 BLAKE2B 76974c004fc0c42ef221117340bd1c0557a695343ad16e396007bc204f84d870ed2d213ea773070c792319f65fdc736341aeaf64166cbda0bc4207060ea52987 SHA512 a15f2991722cf4be0d321bfdce67d84c92d244b509cfd48c6e02cc0bd8722fba3af6a8ad7ca696a856f1e5ec70543b786f0db4a99f3f74db3666509bf1c5324b
 EBUILD gentoo-kernel-5.4.150.ebuild 2822 BLAKE2B 76974c004fc0c42ef221117340bd1c0557a695343ad16e396007bc204f84d870ed2d213ea773070c792319f65fdc736341aeaf64166cbda0bc4207060ea52987 SHA512 a15f2991722cf4be0d321bfdce67d84c92d244b509cfd48c6e02cc0bd8722fba3af6a8ad7ca696a856f1e5ec70543b786f0db4a99f3f74db3666509bf1c5324b
 EBUILD gentoo-kernel-5.4.151.ebuild 2822 BLAKE2B 76974c004fc0c42ef221117340bd1c0557a695343ad16e396007bc204f84d870ed2d213ea773070c792319f65fdc736341aeaf64166cbda0bc4207060ea52987 SHA512 a15f2991722cf4be0d321bfdce67d84c92d244b509cfd48c6e02cc0bd8722fba3af6a8ad7ca696a856f1e5ec70543b786f0db4a99f3f74db3666509bf1c5324b
+EBUILD gentoo-kernel-5.4.152.ebuild 2822 BLAKE2B 76974c004fc0c42ef221117340bd1c0557a695343ad16e396007bc204f84d870ed2d213ea773070c792319f65fdc736341aeaf64166cbda0bc4207060ea52987 SHA512 a15f2991722cf4be0d321bfdce67d84c92d244b509cfd48c6e02cc0bd8722fba3af6a8ad7ca696a856f1e5ec70543b786f0db4a99f3f74db3666509bf1c5324b
+EBUILD gentoo-kernel-5.4.153.ebuild 2820 BLAKE2B 3b56769b765f440213db7fcadc05eda3569f3bdcbdd69518fea282a8fb6318ef4568efaca467603bdaff2b65adc725e886123d62cf1eabfe66ce829c1351d945 SHA512 61e52d3dfef7bc2634797a7e8744ed9f56883f05965bd0a097ccf56a99862561301bfac6d3e1a88afec466d965c115d4931528ddb4f861007e868afbc833440e
+EBUILD gentoo-kernel-5.4.154.ebuild 2822 BLAKE2B 76974c004fc0c42ef221117340bd1c0557a695343ad16e396007bc204f84d870ed2d213ea773070c792319f65fdc736341aeaf64166cbda0bc4207060ea52987 SHA512 a15f2991722cf4be0d321bfdce67d84c92d244b509cfd48c6e02cc0bd8722fba3af6a8ad7ca696a856f1e5ec70543b786f0db4a99f3f74db3666509bf1c5324b
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.72.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.72.ebuild
new file mode 100644
index 000000000000..8a97f9b5278b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.72.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.42
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.73.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.73.ebuild
new file mode 100644
index 000000000000..104eaa4eafe5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.73.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.42
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.74.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.74.ebuild
new file mode 100644
index 000000000000..8a97f9b5278b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.74.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.42
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.11.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.11.ebuild
new file mode 100644
index 000000000000..b7a0d9f34177
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.11.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.14.6
+CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.12.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.12.ebuild
new file mode 100644
index 000000000000..1248c26d4b96
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.12.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.14.6
+CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.13.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.13.ebuild
new file mode 100644
index 000000000000..b7a0d9f34177
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.13.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.14.6
+CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.152.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.152.ebuild
new file mode 100644
index 000000000000..1bf22439675a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.152.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.153.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.153.ebuild
new file mode 100644
index 000000000000..bb8fb4662a23
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.153.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.154.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.154.ebuild
new file mode 100644
index 000000000000..1bf22439675a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.154.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 452511ced20a..93b0bdc7a418 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -13,6 +13,12 @@ DIST genpatches-4.14-258.extras.tar.xz 3656 BLAKE2B 046d8bbc9971886be4d645f446cb
 DIST genpatches-4.14-259.base.tar.xz 5302384 BLAKE2B edc7e030049e4a31ab32be584997af51842e5ba68f6db837bcd63b88ccc094f941e0879643930760def1e760dc088bc4ece6f042da59a6d0b14a98a6e9b14614 SHA512 033425186fb1be53888c4258cac90a5a61e8b772171bd0893faeb2316141c866c39b042ce35a10ec8db093cf2d2857538c644788ecf36f88e13201de6a341c93
 DIST genpatches-4.14-259.experimental.tar.xz 5708 BLAKE2B f7cdceba81eb4a94b60d21a436a01923c80bb3b4e7727b25e0a739f83d6c423392d9cb028ad828d729a39630658f3a4e6d9506aff18c6bdb9067f2db6dd7b353 SHA512 8336d74fb8a9f52fb1313c07d5f206717f4c1368515d7ca29f928f39f9f09ededf9579aeff8d32b5b190e7800e571463601f34f7c86830a53ec5bea5c5ef34ef
 DIST genpatches-4.14-259.extras.tar.xz 3656 BLAKE2B 5eaa3aeae66a0137078b0470ec4f0e89ce4e342d6b4f2f2a48ae242744677b062a3ce67c3901a482ad8b89d402afa7ed4e7f8dd2305c0edef72ced2f85c37fa6 SHA512 555f722c73d5b395d22fbd2a63b1c3e4486ba6dce1f0f0faca234db6c56898335389cb08642d04243557b119eda38681c01aa2a220cfbbf88b23abff5e4e656a
+DIST genpatches-4.14-260.base.tar.xz 5305144 BLAKE2B 8276dfb1953470b63ba76207559059701f2e6d55f7eddb8879153fa193ac7b4fdfb11df020bb6c06bd630afbda75946b238667a5bf0c799f76d0fd0e864f9b1b SHA512 fc1f9d0a763f25b543552d54a15627ba2e35a9dd51064f6a34b3b5271d716d03388c2ebd92e1cbb32d9ee7acb394b395dcdcdac5bf9a79964a18896bdee98649
+DIST genpatches-4.14-260.experimental.tar.xz 5708 BLAKE2B eff6d072fb5d3c613bbee8a67426e9cf4a087633d98c661d6aa70ec92ae27c06910e8d65fc86543fcc9954d8c400f31c2caa89cbe233cb20ed5c1383a67314d4 SHA512 1be268737b893e4ad838be08a08cbf761e66027e15a254dc7d9e9c42611d9010821a5065ad11d2911125a1e136132c5caecf3c9ba67df682501b18bf8edaa6a6
+DIST genpatches-4.14-260.extras.tar.xz 3652 BLAKE2B a132c566c43ef88278b7cc9820ea6c96b84ce13fd7f38c005b29b369602c69a320781de8b04e07d7b20669af6aa624649fb7460c5ea577d0ab48d5e254acce16 SHA512 df0c57306a5df11a42e6984f6405843887a4bedc74c13a0b4c24cd804cfaf3896e1fd3d74d4268c1047d106701223321b40aa7a0e61d9463540653ae07f80867
+DIST genpatches-4.14-261.base.tar.xz 5311832 BLAKE2B e6401c3353e531daab7ce741b491f49cca6912ac200751f67a55373188a65f92925b1a706a1d46aeac6f6ad5c5de3caad3bb5e11db13021f58c88f96ba94bb6a SHA512 901f87fd50691c4d5f27d73c1bb8d65065435a1848311cbcb27ee94a2f108b4073e2b54575f861050c94d8738b9857b7135abdb094aeb8a5f8e8a242bcb34151
+DIST genpatches-4.14-261.experimental.tar.xz 5712 BLAKE2B 96928274db362c7407e9c07dd377feb656536abda0f0e484bf3ddc42fe2f2cba6c9aaee3906978aeddbc78847fc2fe6f8e62a6961f45c7cfd34e4c48801fdc97 SHA512 7f07d424bf0429c88fb87db3398a05464cd66ff57969503caabe58949e3e76266e37f00b9b07c3b703ea286dfea74ecd919856aa5fcd31899d02b2a024677e96
+DIST genpatches-4.14-261.extras.tar.xz 3656 BLAKE2B 7a1404ca6df41fd61f134ce840739f5dc79e2e80393b3ff23a83ac547b0dea729ca8073a5748da071f35972070cefbc096432cb8038a23b28eed00da25b6f7b5 SHA512 c92cbbb55579c2a46a2e9f8a71e7746e9b5b8d0d978fefaf04e97cc041072561c0e526fcd9c84b576ff30ab97604ead20dda9487738e7850e7e9b697d675afe1
 DIST genpatches-4.19-204.base.tar.xz 4899768 BLAKE2B 9e2721950d6786628639ce06c774df260120f3348abee2104c181515727f1f0276d8abc05c15993ad425ae0c4f85c14c54f1f946137a9ac50c9434e61cec4b64 SHA512 9dd0c810cf68ffb802e1fdbb538acbe8bc56a03bef36099e29187cc0945e6c539f7f85b17b4acecaa8f7d14492cd1c59cd1c1043891429d7797f842763c32db1
 DIST genpatches-4.19-204.experimental.tar.xz 5464 BLAKE2B f913b92f4f6df5f4c0696d6991406da1dec2fd5d70a54a8437b29201104b4d7301844c834cb5184bd7aa29d3359186f8a6e6646260cec4bd49b6480cc202cbd8 SHA512 cc7ebf9c8e7813bdf4f9d0ea19fdbd62b66b5507fcfadd421fea1fbf417e0ae4c30da81f3ebadfbcceed60fdaf8f617bcf249893ed620bffd2887860ae0f21a2
 DIST genpatches-4.19-204.extras.tar.xz 3672 BLAKE2B e9f384f8fe5caf179d116a04064b9ca93829d8a8c00ea661edc84172e3c55da4f1a115a212472bd4ab89342294952e4a12dac2b902fb10419e12b5501afa1c05 SHA512 b59d52624ff422f8b2946d5c73e835a025f602858d42e86f5b124ad4aa1ac126e45483386f66f4f74ba3442be59987b6a94559cea01f4b2577a9aad21996a1c7
@@ -28,6 +34,15 @@ DIST genpatches-4.19-207.extras.tar.xz 3668 BLAKE2B 2ac41165e32d57c71a2f9042271c
 DIST genpatches-4.19-208.base.tar.xz 4999044 BLAKE2B 10fef74f158045b06e25ea63943f8965d83bfe8cbffad3b967e85979feade30d0cb87ea199caac85ba0da37a20433a1ed584d22429510df014ef5c7a08aeb288 SHA512 07b714b1f3a524ed66bd99fb1c7417c43e0c14f6a413504b9ee1ddd5f1cb00aaff40d7fd8fc9da7e6d937c507b9be690d34a3b6de329e3085ccda049c0e59d0f
 DIST genpatches-4.19-208.experimental.tar.xz 5464 BLAKE2B 34c82a298d90239e85104ff69d31f7c139cd6b8084a682c2d45666b100b0d2e1c7a2e2777fa158d80aed740e7416f3061445cff6cf9703a02a6d24cc82fad0a9 SHA512 6d38630a624d1a096dfc77943aceaccfd5f62b4ec29a402bd3ed79ea8bf1d478f845dd0f1f5da9bf253022558d073d60a1ffe4d6fc1137196a14196bc69ea998
 DIST genpatches-4.19-208.extras.tar.xz 3668 BLAKE2B edd15dbe7cf595ef69bb163de9e35b02dd7e4122f9f1fe7d123978a5b02f4995683c2c2c3e82d438caaa1656c9e2c30e2b2614c769807b6057a6296a6eb18a88 SHA512 fa0d6c63980b9dd9cf3264a6c29da4e20178dbb95400ca0a89677cc293a3930abd570b9d049ca9a1c5fdab0ceb3496f68337dd8c9d6cfb5d10ca402263eb5792
+DIST genpatches-4.19-209.base.tar.xz 5001908 BLAKE2B 26657604b7fedb6ed4177ec53a7da69c26bbab557c8ff33edf451642b912ada993155137ea660f04cbdb50bb38470d39301184ffdb699a0671372131b1b6063b SHA512 6406ae5002a90531ec2a56eeede87ce76c29a909fa9bce80905c7ed3ec99d015bd10cf4888540729bbde806087a0961b494f6dfbfdc02ece33616a70ff98d58e
+DIST genpatches-4.19-209.experimental.tar.xz 5460 BLAKE2B b732e77e449092b1152d3a50eb0843da307a447d4ab3272950ec066e78c424a016372fdc4f29468e683db9f9f3b90ff931a4972908ebca8144775a0157969147 SHA512 d9a64e36130a067befae91e16699018a40a1d72f1bd8df814c0618894f22b2f8cdf72d0b363c57eb0658edf897e180be680069881a023b5943dafd25abe4a126
+DIST genpatches-4.19-209.extras.tar.xz 3668 BLAKE2B 7b158c1d9dbe3564c4b3a364fcbdd00a07d870dd238b39fd0f571b857ba0beb0a5720044d2f57c2217f3c412119d019f900f7a3de3e129bc0c37b0b3c7e994a5 SHA512 1fc3942ea5e3270504f1d6062ae15965614f32d203f9fb364066c2dd131503cf316c812b4b184e96a5491e0592cbfc4eca4d5989020ed428df97e9effceb3f09
+DIST genpatches-4.19-210.base.tar.xz 5006392 BLAKE2B a4a8c3462964076f36561e969a84f041af9dbde113326f815f016a4237b860e97543180267f2931fc8f594b425427ea7aa0c710d219ed9e08b03131e9d516a73 SHA512 af05ddbcb2edfee894d59817fad402d968e90e16b8f79a626e2bbd0c79498a869cd8facdc9c1175f89a269c04b4fdc0df6981f21d581ba24568338f9c9b2ede9
+DIST genpatches-4.19-210.experimental.tar.xz 5456 BLAKE2B 5058c916ccb0735425207c13f4299d28870f9863869f336485e76f78ba9b5a0efe7b1417186059af4108b0168cbdd20651185f0b78750e42527921c1235139e7 SHA512 b31689ed3c24f18512c23fe918f2483852f8f07246624149c44ef3a490947ed2f9b7ea47a424fe8dcbe2de707ddfde19b8a29f43517dc9d58066194ac320ecfb
+DIST genpatches-4.19-210.extras.tar.xz 3668 BLAKE2B 1a6056967b1d2f829b6932f4dc16416004678bc07461b0484fc6a1d430afe261f77852155b1f5080503c277437c34bba89c778ed8e915c75d1581ca10227163a SHA512 def95985a6c4ae1f5d91deb06a3f141027543e38206ceef19c605e1f8177db69e5526c5175224c9928acbb842c215a20db7648882d9fef44a9754ec82f818e17
+DIST genpatches-4.19-211.base.tar.xz 5009536 BLAKE2B 3b41949811bd6b6f16fef6cb7ed834130b999c0d5bbb1c23c38569d33d0dc7552737fbda8fdc1fc717cac879ae8a7e987b826ecb015648cb78e8f2ca1268a1d7 SHA512 eb14f3b869253b3a0be00dde3efb87a2ccc6a177140af208c696d4f405358e28f3611ca4cd7ae21e20cd7b369429ca45ccd4cfc46672ba09f36b87b909f753b9
+DIST genpatches-4.19-211.experimental.tar.xz 5460 BLAKE2B 87c43f93aaa66325bb0ce713afc4cdfad341e7def1cbe9bbc0715a2b6a2d3c54e38c313cbebdcebe1e8d1ea14d5f6083719aeca6e39fd92ca58b50df81d5dd67 SHA512 47e91a6f62f3ed308431e5ed0121e0d4680e7669d56d1774bd3d3c58835cfb9025f09a2ff43c3ea567dcb05bdbf9be1eee8f3b1d7645ab11305f1b65c7e810d1
+DIST genpatches-4.19-211.extras.tar.xz 3664 BLAKE2B d888457856216ea409034115c13e51ec49e7271dcf22b0029063f166bf53e1c87a715f78a016e637ebbfce8b884cdb6c7be8585b959a185720640a6bbe427df6 SHA512 1394ce90002e6f9400550d573336624a95adaf8bc5d8f54f5975d90c58204804fa15e3095a6374eb71833e3b641fb30d4cfecbfebaf02bc95ba43aa05dc5dba1
 DIST genpatches-4.4-284.base.tar.xz 4258176 BLAKE2B 059dd90c9fd124578a3a4458eacba00182f8a988b3ea6af485e166e41f07d9a27e40ca58cc6480a95eb089c455f899ef3439caa3786116db5b5bc31dcf1cf898 SHA512 0526b7099325edf5b839b50aa3aeadd96b8b8baeb6c1bfd24782f7ef97943822dcd97f0dde7a8267e68290977d910079dca41b6bd0389460f4fc238c53ce1dea
 DIST genpatches-4.4-284.experimental.tar.xz 83308 BLAKE2B 1cf0bba71dff6ccfd67a5f8c6c4cf129dae607b7b5d71b2037d6465e88caeed9971ea332053a4b898ae74648f38ef488452006f2ed315a6b0d93b307dae88ef0 SHA512 b9ddbe6f93f65a4eaca48b1731cdb0c74890c8f3f9be390c75c8dd6aeeafd2dedf440b06bdd781d0c93a8873c56537a514acd696bbf46e921e84ae42333dd22b
 DIST genpatches-4.4-284.extras.tar.xz 2132 BLAKE2B 7eb8440592baa6d6a6ad5319289597eb23dad0f95baa3aabe6d753b2ccc42efefb2cdf67a08a9affd5793a0667a775467ac0c99385ff137166d8b08c43591b9d SHA512 fe4072ef93657764dde7dc8adb67085df3c9ce3b645f68f331f2f929d38e83d90dbab68053423b1640a0a0ec5c4620d823403244b0ab7e600e5b573db520520d
@@ -46,6 +61,12 @@ DIST genpatches-4.4-288.extras.tar.xz 2128 BLAKE2B b2ea18d7a1ba893d3fac5090f4cbb
 DIST genpatches-4.4-289.base.tar.xz 4292772 BLAKE2B e27e77a896363ed24f682a76471ff8b3ea47e541954c3578c5825e3b6e39755d2ce074fbcdd55fdb813a638734e4b85a7cab5fc369ca5481af3b6480304b292b SHA512 5c8aa3a1f1fd9b19115231a44a82ef3719e6ae6f658a7c04787cb8994fc0bef89de38889bd0f97e5769ca6027f7cdf1284b7a8286d4b07b1e6c60df0bf7134ed
 DIST genpatches-4.4-289.experimental.tar.xz 83296 BLAKE2B 184f4d7c56e832124f0d00533668afc8bfb1cdf169ec17690e93b34dd8db4fe8665fccaef221b63d3ec9fc102d54909f230d9114b003ff5067f9c8eb880d1d77 SHA512 a3987ee159ddcf0c9b4ee9f7ea2ba6327ccba934549d677579f82b442bc2c7c7f74d6b3fb36f8ecfe74791449df1c60086afa55dd7a9dd1c53ba7b6fb8b1759e
 DIST genpatches-4.4-289.extras.tar.xz 2128 BLAKE2B 9779169c2dc52936aba0ead86ef090fed47ea83ba79b1e7ea786d84e8506db0230c5aadb6780cc18b82b29ae2c83d2ea32444bee1ad85fe0a82e5722f2ff2e6b SHA512 ed0443e62c43f309535c5fc8e4a492ea207d34d19227ac87db31054709dbbc072a589fc23db3c7f74fb7f4e82bb0160071b9da9d4563423871e1a12ba941d855
+DIST genpatches-4.4-290.base.tar.xz 4294668 BLAKE2B ce0e7bb40ae7d938b1e63f85c90e3363ff51bfdee46601071be64330a4a7a361503200930fca4bc3f3a0f114e649f5dd1838c4fbf406298241fc4fabd8ea2334 SHA512 ee4db6a005cf75eda1e730005fd26a68e35f212af9a44be09f396cc170cc873655555fdee78f5bf278ae9937ba50b9b6e94886676320b8e124d6f162b8730216
+DIST genpatches-4.4-290.experimental.tar.xz 83284 BLAKE2B 659f7a806f7b475bb41808f455dcb0f03f3bc1f689e8483beb25564244758fe8b741f2a8cf2feec7e661ecb3502776b795ac6176f03453d6427d88684d635405 SHA512 93332e4a05b812a55ecbe12a7461c32a02ec586c577c035c43092a0610819fbe79ee10634b45a352c46048289c6eee5fb83e1532ffa29af7944489b46b4305c6
+DIST genpatches-4.4-290.extras.tar.xz 2128 BLAKE2B da709a1d8ab9107fdfebbf9ce04fa445264c2a5cb148376e905622eb61293c650d718cf375f4c6f79c5e90a3a816752d806ab36ab971b389627f2c00893b61af SHA512 baf14b66de1750ee6e38c808e67dcdd2d727c3558817ea2660a52c90eb8a5f57efa36d57846ebd6bc208ec2a8b82c5f685b09127907b68bbea2f32e7dab030f3
+DIST genpatches-4.4-291.base.tar.xz 4298504 BLAKE2B e85054eadd079e0160b808e6674f2e35e58cde70f347888eaf07ac4a11893354584c7b0c18521c3e204c732f012d83772e11600dea956046bb3c40a59b44c8ae SHA512 ebf04aa612b2abe5ab05dae71dfeaaf96714bad45b3526d59793e9cd06f698538fd01bc2a694b0451ce96ba7e5c34e6e472676b4fa69552436b4429d75d6bdce
+DIST genpatches-4.4-291.experimental.tar.xz 83280 BLAKE2B 6ca89203953ec6a1217b3f96ae9468ea5aedb9071229e38b8cc509384fa84cf31d620c5b135e2a845dbdd40fa476c06e29d17e256820ac6ca3ee4478034a05ad SHA512 a5910e90aa21b2ae4397c395038e6d283a8ce54dd5a7a4be48c79497d0e014bc93e908be946ba9566466f675b72eee57fb378fa19243c653e09bfbb229351e3a
+DIST genpatches-4.4-291.extras.tar.xz 2128 BLAKE2B d7ae9967a8bef08b13a5aa8532853123541fbfb63b32f6970e9cb8a07bcbd9172c94837c5d6d79f05e5ab0098a20ad993a782daf080c005500ac45367472b05c SHA512 717b0cab971984d26155a0e9c435077a7cda55364a6f1f8764599c7174f33da583b05e8f6bc116b74d447989873c2c0b22ad3e4d0d03e535668d0ae2fa0fd54e
 DIST genpatches-4.9-285.base.tar.xz 4807100 BLAKE2B 594354ba8ccba1b3ef87a51d94ec7fbf650ac72bed9f76708303f56523af059e078f44b78f129dd68c945acb98ff4e1e920203a8aa187486322a41e16f3d1188 SHA512 ecb32e45b6e285f8adbf1b52f9924f5bcbf4653c308b92ad5788ae25dd4fdf1e5068258db90198edb0b11caaf774f1a84c8f30167b741435fc75f41c1fa8d910
 DIST genpatches-4.9-285.experimental.tar.xz 106376 BLAKE2B 74d6d05dd7e96c07355bfc9acd7bcd964aaff25cd4bd3928c57f7f1d3e401d650d59a80f2765b10662141266f083e905e14a2bf669a5f7d05c899758c7540664 SHA512 6e33163ced1383f86533a51b69e4b6487de328ed89af77d8d1a328efa39eee1a3d401f90291534df02a6c4c0dd07b3d1a180465bd20c4b5f22206e1ac0d4486b
 DIST genpatches-4.9-285.extras.tar.xz 3676 BLAKE2B 3304dc16147106458478f99607c6354272e9daba4c17d47cdf3c35681a63444bc26399aa5fc054bfb596e7be19d438c8202e3c7a17572b9de510b4f81b7216c7 SHA512 b583fb5dc399b47e1700cb5700a8fba6139cc0d588c2fac8d85fb75b34d3ee68498d21919ef5886c9ad20632502af41a9ef61e6060fe83a75656a3d165f5a95c
@@ -61,6 +82,12 @@ DIST genpatches-4.9-288.extras.tar.xz 3676 BLAKE2B ecfc2f704e24a0ccac84aaef73f8c
 DIST genpatches-4.9-289.base.tar.xz 4857032 BLAKE2B 18cff0c95a7ed932aa9eb332baff0c9a36966646a49592aedaab301266978923329a34be3dc257d9ef6a54d75ed4c47662dbd2463a8f55f25de58b7c22b2a7ec SHA512 e6ff53a0dae9bc00a99aa8d26b79d404fd4fa7f12ffad3000a6b4471a570851e61d2950706950a0d94e396b7c884ec7078691ea10dd73117c8d73ec533e8a57c
 DIST genpatches-4.9-289.experimental.tar.xz 106348 BLAKE2B 976bdfd4b6f9a7635b9de08c8d2464a9cf912f2746c5577fba835f96bed430d876e9d8641e06086530d58a70bac12021896825be4c63f82ae87f7d8bd0618316 SHA512 e53f40ca8fc3c880b7a84af3e93b26ab9e763885426869b3291d1c80086afb8b03016eb63426c6cfd1cf75306ee7ab30bbe7641635c069b4e9115a6c33d0eaf2
 DIST genpatches-4.9-289.extras.tar.xz 3676 BLAKE2B a80e9baca1bf2f427b4dad1a821c35da85716c7f00bfaad82c7a068b5404cafa5ec9a130742a50e1d1bbb89a0af52a737b9ea30cb91342c5d3cd5bdb091645c9 SHA512 76f5f9fe6c90c2faadf52ae28a916231c0e5de504c45870dc8fd57ab25d7634f52f6d9f8b92e31e2b46281304c7a88e22f260ebc55a3838c61f969e99a0a7a41
+DIST genpatches-4.9-290.base.tar.xz 4859056 BLAKE2B e3f8526e90c5c724d1684192da7d92c4023a71971223c2dbf8d3f02a2419d7dc5c7b8e02afa3e65e2aa7b97e734eb2e5cc5bdb14d006c0e3984a066ec804d521 SHA512 69211f08b1845a3d831f806c1eff72dcc61e0ae805fdbc8321b524c4d162e957e7ac14c3335d5f10bda5ffeedd952fb3c853c78fd05d4335f4ead45bfcca973d
+DIST genpatches-4.9-290.experimental.tar.xz 106368 BLAKE2B 1c42e6f637d8ff4bf19ecc3d129aa830671e907d0a0ae0947fab8c208c6c769e6bc613003800b40b098fac591ebf62d0d28a43632fbd363b29dfdd336d2c97a6 SHA512 2c5ca892b92dc985e0c068ca6a597fe0e422f7b3b033232a2edeb3a8d3646ae8983c9e7ccddc1ffca1b9df3969ea9ba7e3bfb10199d5f9a2f5a4c25086785943
+DIST genpatches-4.9-290.extras.tar.xz 3676 BLAKE2B c556cdbb92cb9d131d30bfc687c68f5e1cdce140d347981a23cc2727cf9815f254b9205394947b90a0863c9b9bc31f6d2ac0fc74e04cbe91f7f0099b3029a66d SHA512 bb9f90954d35f25705f7bf12e6a15755cbe0ea52ace73f0b804b3d707ee6e777a99553f76409e7e296cb46f747af9918b22ac3318a526ae16006db24834cc588
+DIST genpatches-4.9-291.base.tar.xz 4863708 BLAKE2B 70ca869f2078d5603906cc53122393a5c380bd52d676576c9d677ea29bc0d23f218eb197ae5c91f889e141ce52cab79fa19ec3dc31fc18890839c2949a48f598 SHA512 8bc81750c195bec516f78baf882c0ab864b03444415adab6b277c508127f413d4489a4e058ea3af6c0a3aa231d8abc90d018bdc701be022785208bfa6b5f850d
+DIST genpatches-4.9-291.experimental.tar.xz 106412 BLAKE2B 8dfe3ae8d966f70fc5fc4e1fc180328172c9edbb9a84912f89bf50317e1aec23ea8e2bbdb95e40f97292aa8c76b7682a4f0f33103b6e6a41bec59d496c335aca SHA512 c579383395bbfc6f1e7dbec4531babbcd5f8baf8b4ef2ee1e0c1e4bc9713090bc4c8f9810128d82f392a35cc6844a47c2698f72f082033257ef0bfdc1e5c849a
+DIST genpatches-4.9-291.extras.tar.xz 3676 BLAKE2B e54fd615c8991afa17c217c5b03560909817d1c1a706703d199f2eb40e1c896248a8c28d1769ab1b56075347b35a8188c7e68e79c63fd9ce12bc175bfba206f5 SHA512 cba06413dcc292eddc507f96967bc3aeb4113d6c039f8edee0975fe87d34f4db86f07fcb05c0ce31727aa422a57a492338785971048dda37e31e0bf525de4d0d
 DIST genpatches-5.10-67.base.tar.xz 2086184 BLAKE2B d01856f8ab1b24b9581576c80c63b7b30adf3376b70f890e527d5652c28228b17c42c28e4517689411e67b7b7a715b4ad3e1b2e045725f11d825a0ffc67f39f0 SHA512 ff55f88e4c334f463945d8f3d9aa7dfd987602057ba28496cb31a1d17ba3ec8d1eea94cd0544af6ef5f6dc140c09427a6ed0de476e0b71f9dbba5e558e8422d3
 DIST genpatches-5.10-67.experimental.tar.xz 16876 BLAKE2B 39f012e224da8dfbf21b6bd7e43f2669122a7b502f99f0b28e3b6251441d7f57629c96e07df2d3d76a05142a16db86528a0dba4770ad0c3e69fbe1a5ca354d1e SHA512 4f216cb7204fa731b023d121259244f7180cdc4c65e842323ab00b784c7d82466f2e4a3705ba8931b8a1e82a57b9a8e42c99b48f28fb78fc9281a1976729b772
 DIST genpatches-5.10-67.extras.tar.xz 3848 BLAKE2B 1469349ac07374c4f6e8875757e588af6d78d13fa8162573ee83a201ee5158916043d013bf1202d89911584fe861d0a7ab264b63affdfd062bb23cf3e0011869 SHA512 7887ce5a472f6a778f3eaa4032f5a9ba2dac8f06dff1937188c708396f2305a499ed129e275e85aafc6746e7bbf4526cc7aefe502bcf4953c30020cbb0e9d657
@@ -82,6 +109,15 @@ DIST genpatches-5.10-76.extras.tar.xz 3848 BLAKE2B 89eba39e2c72ca1fed282a32b5de3
 DIST genpatches-5.10-77.base.tar.xz 2365032 BLAKE2B 7aa32a168b6f5d75f30501a6e779c253becdd398789b2e54131d1299d2c99acc329fcffabc37ae5212b12ea24268b721770d09ba321bdb670131e9f37e5d0d11 SHA512 4fc8a442b98bf47ff8810b857cbd5f59d6e8805c7a5768a439bdbf54db28b0d6c81bf3d4dcbeda9a0784ea159c7cd7b24ae233435cc77bd05c82e9c75867157a
 DIST genpatches-5.10-77.experimental.tar.xz 16872 BLAKE2B f2d434b26070975dc12cca678ec49452a86d07ff870215bc12f45ad13e78e7b6251b76bce221f1a7cc4cdd9efd7058105246ce0c4389870257b05864ac9cb433 SHA512 2dee594c9c984038a8f4ac7e320ad2786dfa7b52ac76a2b3e605f49740962b465d8324ebe7457e4c7d239bfe763880e9bfe40651eb5cf4cdfe06b79a064ef85a
 DIST genpatches-5.10-77.extras.tar.xz 3848 BLAKE2B a8a97c432acae3cadf43e033a615560da3477dcd1c0dcb9cb97f2edf69ffe5074e5066e286243b0bd66d0fbedd86e097846587df5e96c6462d67b354b7e75bcd SHA512 2d4726d2de66bd3c0a6d191f47c24de16d6d5cc815f4eed6199f0162a8ee0c7fa05ff90727a95c27a182a234d3c31bfbb9f62b17a0d7448344db32bd230b5123
+DIST genpatches-5.10-78.base.tar.xz 2372000 BLAKE2B 263371197ab54e9153bef37cb34fc9d60e359aaa10a2991fb507664082554590f03e5518fbc94665c58ab93a643473e1fa3614fdd650089cfdeb542b51a88b88 SHA512 832a57e2a775921f96769bf09c277a1d317ae31f73309f6d4d6b817ef9031efb4cebec29ed9d9c68671ba79efc8e76d03e7c1fa65683664d6be0dd05a7316a0a
+DIST genpatches-5.10-78.experimental.tar.xz 16868 BLAKE2B cb7ec911a1e0d816c2f1232df2bdfa5703068b0bcc19d2275714500412a9da136829647054ea58c58547b749fd8f3c2d5081c0702c8ac3bc57c3369c6921f52f SHA512 81f65a8f84cfe5cb2de43f7f558d133cba2a34cb7721871e9971537bb0a10d1d9d32883de05e555381dfea0ec530c56e639f836ae58aa866074695fffc27978b
+DIST genpatches-5.10-78.extras.tar.xz 3848 BLAKE2B bc1f534a45c748e9ad1e6382349853d58c93c51db7deb411ea5fe981edc983c3df1d62034af582da4740c8a8c5f3617bd8e360602f806808148e2a0e66b6f327 SHA512 d96f7924e9c7c128eebfc3e73ddd54a501a7909a5d51bf74f062988113c7a2b3671813f875018a52395f41aa6d3fb86a35e57422b19ad885e667e1bef693cf9e
+DIST genpatches-5.10-79.base.tar.xz 2387632 BLAKE2B 2da2a130876482ac0c4c2959e4faa7931fbe6037c03da78f7238411b132dba8e7e196aa5102b8b74d1996bc9f7d29b435c506954f6db4c91bf3b0a4ff39cfc46 SHA512 1034e28b4c880c285999ddb47f3074a9885fcba6716ce58bd121a654f20f0ee168fc454475517c3a2c9e8327f1a81b5c68b26a114ac074c425be68e95eab3472
+DIST genpatches-5.10-79.experimental.tar.xz 16868 BLAKE2B 4d9013522d715e93ca48be987c04053038889ff4bca39baf3f69f8c41a16f092d08482c52198125eab7dff7ce89b142d626a0f1be3966eea233a9d126c0a68b0 SHA512 acc03d186c456dd4a70cfa95edea81110b8c9ba4e8c9fa0fa226aefb961ac54f954f35b6b717870689368233467ef27149c920701698c7f581e62dd4c88f0e7e
+DIST genpatches-5.10-79.extras.tar.xz 3852 BLAKE2B 9e76a55a44ac857f37ab753e4ef13e5f041c68b14b4a6cb762c75435513f084c211b2dd4797bebeae451bfd207be133f9099ce14ecf8cb0142f5f04a1ea4f504 SHA512 538359609f242eb7ca012c4626c0b049de8fcf5ac81934bd21e75e53d5d4657db831738b37f24d96ea5e1c3ed8eb01b577c1978c7095a93aad9d5ad225894505
+DIST genpatches-5.10-80.base.tar.xz 2394312 BLAKE2B 663fc2222740c01ef53024985679854abfd97b3a44b5177229f4529bfb2497810a73d177ee714d699e7367602c14dd5c7c99c312f38dba496fcfea062f485ba0 SHA512 ca51c04253647b98200c873f67a0f52861299376ab02c7a665b142962eed3db77060f6ae5e8391518388447f81095c8bca0c9d20502dc53c0a7e42216ce39e15
+DIST genpatches-5.10-80.experimental.tar.xz 16872 BLAKE2B a0250b00329c40e95104061ac18b8177e784553a8c3fc55d7fe075d8f864a56e86c4b59ac1eb812d3196d03bf76cf7a8fc42225735b11896db28e72ae1bc6a35 SHA512 c9d4ea2776d62ec69152f1fd1617d3265619d3605a9d328dbd59a085547137a7be49afe95b6d9973702cff6c8708cb51a482a1593cbb006a97f3406ad93f02e4
+DIST genpatches-5.10-80.extras.tar.xz 3848 BLAKE2B 401714e5b73d2e9d8ec46cae0f7f2729c6542726f2234f46c68cc4cc695276df37d757c37bfbc11e6e4fbc91b6b4edef0172520f9be5d457e2e4c283b41224b3 SHA512 88bec3172d52f7c9b71bc8575622f071ec6469ae58578d43e31ee027631ab6918c9b0c24bc852d9716f4a0292e85fffb169304c43800b870e4eb33e8245b608c
 DIST genpatches-5.13-18.base.tar.xz 753548 BLAKE2B 2aeb182e609c2043b87a146b912c7a36674b87451d7d469e8538e070ee0b388cae70bf040341798daa7723aae5f490e6826c94374af7a4d1817e1ece54f6279c SHA512 b795d49d7f386aba7c35aa5a3b8ecb1e9bbcdea424aef77251cea12d64b213410c883fcf58e9131437e78e5c63d435d84d8c2834ca5a679f65b7807b026d60d8
 DIST genpatches-5.13-18.experimental.tar.xz 67316 BLAKE2B e2bd9772cf178f3de74c8241af33e5fdf58249a1168262dd123a81ef95b41dd51e32cdc32f2b6b23bbe7812d87f71a62887e9dba33860c0a3e7ab5a122d152bb SHA512 f3a00f8b3c8614ffa6c71feb1c84638aa984f7d4ce36026d83a9dbd691b83497a9178157d1ee17044a4b84fc252fcfd6aa0294d13eaed17dd1ae08a73a30ac44
 DIST genpatches-5.13-18.extras.tar.xz 3848 BLAKE2B f4649e2c359dbd01daa454b1a63534f3347b21e8746a8ab72e6485090b7a3eeb6cdc68cfd2def0f7cd86410f075bd7ec859176c9286d247870a4532f035e45f2 SHA512 963288db0a789baa4c8e588ce77a53391146071738e56979119e83cf10eae176ec49c8a084cd6057ad2c839ad2b19bb1b09790abd05c40f8906a973bcdb87f76
@@ -97,6 +133,15 @@ DIST genpatches-5.14-10.extras.tar.xz 3848 BLAKE2B 3ea5db4c39e5ecfb8561891919798
 DIST genpatches-5.14-11.base.tar.xz 446596 BLAKE2B c7ea616d473fb6e07af15ad0cd400fc4397dd9833af139fa19b23d5175959de09c5b2eeea1efcfa9e76133f4f07cc503245d03d2f7172dce9e677028d69b05d6 SHA512 b4eb0036109c628c2a4648edbc2b601da3003f7bbedd0c9811fed22c472b492763ac74b61f36cec896ea04641ead861522d2447bf88ee0302f68a8ebe02f566e
 DIST genpatches-5.14-11.experimental.tar.xz 67612 BLAKE2B 0aa0d42732fbae30884537ef697252b47516f6509dbc9bf2cf1af7b3edb3dfd86653a2a0bfd7fc4342945ad38fdfe5ab9af18af18ad27debd2a9969424adf53c SHA512 08e3be148043d141cf3a4be4c11f371e9db3c3c953b302f9640d6a2dce28b849f3cc8fe679686a8a55b7cb6cd0494f290c3f3f0bf4b30b036702db291e07b396
 DIST genpatches-5.14-11.extras.tar.xz 3848 BLAKE2B 05f652b6f3f4052b5992c747ce8354c8bc6ab64a7197150c223f868c0060a55c289dca650d3dadc804bd39cc661dab56d7d8086c5dd9715723f17c19320960b2 SHA512 509e95a8dc4a1e2d1e28388575664006bc5c19eb5aa05e45999838c7cbaec875d784a85f852e3207a37047fb27fd5733a01f95c4d488ff1275661343cf5694ee
+DIST genpatches-5.14-12.base.tar.xz 459100 BLAKE2B ba32bf5be3d9e3e332659281495ecbe1b4cb683e1b5c3d1ab490d03ff3eee47db33e4f3f1c9c25f50230adaf267c23b01161d243c3acb2312352a40c8328b606 SHA512 1adc3a9ea9c7b3bbb89de6fb219f1cd0d6fb02c6f866c4a5519e70452799069d99e1b2491560bc408706ba40b0ab6cccaecfd34a1f11f76fcd8e5ee1cb78cc1b
+DIST genpatches-5.14-12.experimental.tar.xz 67632 BLAKE2B 791bcde6dfcd683825dc460f7e2d380b8fb7b436f536572227919408474b57ed1b0c7d9acbd38eb7d7ece04b052c716d1c94dedaa1a59715f0654aa612e0c271 SHA512 6b4eee183b9a8277728d071b5383b11e27923f2ebb8ba103fa562a082147b4a326b7dd95b9f3e0c6677f68ca5eae79055f971e354e812b0a31424a6aec8bc424
+DIST genpatches-5.14-12.extras.tar.xz 3848 BLAKE2B 0bac1f83f9ebdc3b6860516313ca95d5ad2e1515bc587a3e6010bdbbd2bf3e55fe3acb835989ea874608149c3efcedf172451322ba5e5df821970cbd210a69ab SHA512 9e4c5445b0883680ff28e24d2b7af4d6dbd4d2f54c33583c5b91e0629caa5cac02b02996c52cf277909f057c8bd2f41342cd57f9e6ba9d8b4a8895fd70bcabaa
+DIST genpatches-5.14-13.base.tar.xz 502028 BLAKE2B 54de53dff2214469b24b173b17aa6a4cfa2ac50d8834434c0e50c5538484e7a16c3822b677572e4d2bb444266196a272487df0264c2fc4bd25e6fc6a7b63fb8c SHA512 205d403607618c0ea1e82ac9ba48cd1e90e961e92e282a5bc2723408ddd7a85ca871e91b23cff37c3108f37f4040fbe063928161cabb175c78b7175ba8b60974
+DIST genpatches-5.14-13.experimental.tar.xz 67620 BLAKE2B dfb22d5a498eee54a07e1e961b3a5d96e27e877c35e89db5579052554c93e37148262f3c90d9fe4391f4cafe53e24b2e63fa22f76096eebe53cc212cf60bc7aa SHA512 2bf7d6ce1d0b62a14326018a7e999329807e248da7edec05cf6d17c588d26a4e6a4e662296def7096b1663f77b0430d3ff4a0bccc37bae9aa7312dd71c1b1968
+DIST genpatches-5.14-13.extras.tar.xz 3848 BLAKE2B d595a77078bd8740dc61a5e2f35d75f19015e2d4b30716f484bc961b9631a994a3b1a8367a1ed2d1c46d3bea601013e4488870cec202dbd5b63cffaf5078ce36 SHA512 b1abcde0b14f51d60ae27e885f7b912b8531ee77fb9b6b4c2e062f5feb1eddc2687965c949ea675c1c425561244e1a3011a1c092404ce86b171ea60991c7cd2e
+DIST genpatches-5.14-14.base.tar.xz 511456 BLAKE2B 5e4ed4eb05d3161292e9ae3e69ad28d99ba0e72f1b38289f9c3e3232346ac77fde922f4fc498fc9161b793bca2beca33728664c2ec68175a637676ee8737e311 SHA512 81a2293ebcfd9a44711dafe2e0ea14f73dd0d6d53cf5c30892ab5fc09995519174e3250d1521778058ca8ae1aaf75fc5ddf7541eb2231f8965dda45c8c8f250a
+DIST genpatches-5.14-14.experimental.tar.xz 67620 BLAKE2B 14b58390801cccf96eb3ef04a199c56c770e2a8b24742d1fbf1412e8de461b2472d503c7ae53e74fd67406a9f51f649b7c406fc65effe28a4dc6679cbd871688 SHA512 cafffd23bb97810bc9814abd682c6cb055ef76bc5a1ba02816332739cdb80f964fd52f03f647f60327fa545e2c3ab09db860ca889ef8961887b356d63129693b
+DIST genpatches-5.14-14.extras.tar.xz 3848 BLAKE2B 5820173b798dddf5892b0a8f133f3fe4dfb0b80fec5bbba79b8f03f78af4722f48bb69370f56773bf9b7372aec3500db4f672fa82729bea8e93e8fa1af7efea1 SHA512 1012bd7f20b0657e75d810e66a97222c66373b8b2cb4cec0a29ea0469aae5ccdc0bfafc89dfe9ded34036883d88c7da111f99ce2076dcb8f01143e985a62c8d6
 DIST genpatches-5.14-4.base.tar.xz 20400 BLAKE2B 2b0781d16dcc40dd8db831fca56c87e4edf29f0bb54a75949eb251eb98a3da1f0f635cd37ec887498ab4527071edad95f2e22d742aa37e3a1957d5eada102f43 SHA512 48d883b13c1ece3c62a3892b4d06bf1e14990e4a6ec62ca0b96432069a11f05fdb51c3d62187fd8dc70adbf7c93d18aefcb496a4d9be8d42bc9c9dcb52aaad5c
 DIST genpatches-5.14-4.experimental.tar.xz 5408 BLAKE2B b2ce3ee820369e9060a6edc646636f6c4056ef3050b622d0047e80392aec7da59b7b56c2416a2d83ce95c1aa75c10378d9a5723ff7c0537ed81d882b235db91f SHA512 fc8954f3f7d3d05583a748ea43cd0a0e182f8963ecb9bb73e3e4b722de4d6bd79930ef27100b2f4d4ea93742cb4d98bb69f9dddffb931d2fb9278ace81ffd2a4
 DIST genpatches-5.14-4.extras.tar.xz 3848 BLAKE2B b7ff12e366e9db24cdfd67da87e3429b2d39cd7d13fa6cb1e780e59a54fa465641b0b6440c51306cf0f4ccd3952f6f4e8993200f29f9cee36b6be4e84b014291 SHA512 99b0d40e43236e77f188608973e30cd4f1562f6d90c1f71fd95fd9b0e8146744b3b8862e84b9b33e69193cff0a7223a0e9f25cbb030a3f80e4c2d86ac6b50873
@@ -133,6 +178,15 @@ DIST genpatches-5.4-154.extras.tar.xz 1784 BLAKE2B a97a459428ffbedc0a8f4e8a4bc8c
 DIST genpatches-5.4-155.base.tar.xz 4028140 BLAKE2B be936c28ef5da5deacdaafebee8781ba759b66427140bc806858fcaa3523c8076895bbc952b018e7ddaf5aa5ec45338acc50f6e235c0d54dc687124127de6288 SHA512 7dc3aa310d15abc349627d3d305a490722b9a49fc84d2969f7e98ae6940121d5e5b6b4ef0776b6aff138531cfccfbb0a9c3bef28790345d35f9a386bd741ebb2
 DIST genpatches-5.4-155.experimental.tar.xz 16912 BLAKE2B 7c302031c420c4ac04f5fdaccac976e513f33f098bbd05cc428eb1730f66fad06889df16feee03d9ef7b48fe8f341d2e85ec4b7dfc8224a0cedda341949ab983 SHA512 fba690d020deea39f63fd7cccf76d7865ede8fbc32609af3daabfb0d4e864a5bd72bc73826d267c910c6b462fbc8827d418b9ebc7e5758dd44ac11a2b3893729
 DIST genpatches-5.4-155.extras.tar.xz 1788 BLAKE2B d0ce88939e6e87ff1af00b161200ebe38895aa34fbace9f6197fcc541793eead351d13ea4d0fa1c0c565ccba4f7ae191ee432d909d1961df6121ee4f7a0bd516 SHA512 5fefaa51fabf22993fd8502e48a3282f172c7609d1b7418e9fe20ce8ff79c1bc1b3d4f33e1ec1d87040ee4d13c71d64bc8b48624d03b567351842d685f0fc64e
+DIST genpatches-5.4-156.base.tar.xz 4031752 BLAKE2B 7450e619bd4524c4c2929a2adb95ac492836a9686d106df394360faaef16e2e1d66b646e61199daf1b69eceb4b9aa3ca310e29d1bbda024ef1542f76778bbca4 SHA512 3d1986640f3851785c0cd5c95ac0715c81c202c2e75ff08d18c873a2f7092a2bb60032389d7899c4080ff5b16c33230c6e517a758082c1795463b338636216a1
+DIST genpatches-5.4-156.experimental.tar.xz 16904 BLAKE2B 8447354542dc4ec3fb120182f9592086c86aec07d5128a9178dcec0fcf906824f798518408cf091310e89acc3be6a8b60f6cd1aba28d62c2e256a29d32df2db1 SHA512 6595131aa9d85c6dd851297fa54b6ad156f681f0b7394af07eb50800ae81437f3e833f3e2e97fe13b98c279d1fe1a87e973edce904b073c9df6b9bf121da680b
+DIST genpatches-5.4-156.extras.tar.xz 1784 BLAKE2B 215396166913e8dfad67a0fea37626170aa71a8fdca7861f55e48c50e37fe0b92ba03e185d2cd23aae1f0903c9900c5ec7d79442c5f622c1f0093a3587f348da SHA512 43fe8cb9416a5d88c78a8c51466f7fbfd04b395a19efc2890669b9f3b90e233190c7724804c06c810cef89cbc3db95072afd2c04a3e9efbd074d975ce0f3ea12
+DIST genpatches-5.4-157.base.tar.xz 4048356 BLAKE2B 787334d4f61f375a6ab46712ff632d560a9532932ced876b90d78bc2161c48d6c917297e53604ff6ac0039ce5ec6edc70c84f6ca9933fd0d74f83c5e57bd2d42 SHA512 e7380f35a80a88d2fcc0278da156042c08b7cb1b6eadcaf2ce5769fb4b6127eaa8e1ce9e8a64f8c24286a30f566df4d52184ba3fa0993c6119d7b306c88fa8cd
+DIST genpatches-5.4-157.experimental.tar.xz 16900 BLAKE2B afc61ab8e806b95e72cea808c33c3f765e1158f90b9f9b58f1b41e891db1859b6142ff66d24567ab99c97b297d08bbd2a49a32387453e4a9a135c80987190085 SHA512 02a8dd06098b7bdcd569544c7d7ef92b97961286f83d82a5acb6ec440fcbde2fdd666df48bfdbb5534e54f24b2832dc96cfa128ed54d6692e31bf9c2ea429953
+DIST genpatches-5.4-157.extras.tar.xz 1788 BLAKE2B ca74b942a7038927ee3ca591c383d0dd86418363399245e49763bb3efdb66a57eec28982c77bc10b723c897dc87d0f2991736702e3a22f23e02eba2d3686d933 SHA512 8c63e5e7fb2653e680d2d78c18e5b84362ae5f391d621489e377e21894b7df8fcacc15bca2c61b544b20ee6156abf323ddd599c3a47e292f17e5372f6cb46dcb
+DIST genpatches-5.4-158.base.tar.xz 4052760 BLAKE2B 1fa28f9309c2f9ae9fb8167cd016664781ec78d16a2e652e67de34503ccf4a28477fd16ee8f10ad9fb4eff35066d716c63df32f3ded98e9b8306e526528053b6 SHA512 37b6ff682889580053c2c5e88b2f46df9a6b5506550651773949ea9a4c6d70b56b1b59388df1d4747dbd1c9b186e95b0997f651a08df52be351401276e7b6f33
+DIST genpatches-5.4-158.experimental.tar.xz 16900 BLAKE2B e8c9105482be182d79c3f16aed9b5c127791ff2cba321aced10e7af1a970f53b615ed823005ee0211e6e639fc25a566dd150cd300ec2cdcc5b817de661957593 SHA512 21c45b4baef4b6eb43df3a9a75f5c2548abbb5a554c84b06e5e267a315a95ddf6234a22baa4631f83c6767a0d43cbbb20203afa4f48851e4222ba32a88fc7063
+DIST genpatches-5.4-158.extras.tar.xz 1788 BLAKE2B 265a90ab037b468294afea457d8e3c3e7fe2a1112100354e9f4a30f6604b204be5efc3f5889ce42ef0fa959baf80403a6ddf4ad36f4e9d0e9888c4c6ae7aa70b SHA512 9a498e672c05166dfc1b0460d6bc6830b5086fc2d9ef97423bef5334ded9d4f31836b40fe85b9c2f66eb56cda291e41399ecf88e9e4a20022f5d88bf6d4269b8
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
@@ -146,22 +200,31 @@ EBUILD gentoo-sources-4.14.246.ebuild 736 BLAKE2B 4b3773779d2bdf72aa3186393e602b
 EBUILD gentoo-sources-4.14.247.ebuild 736 BLAKE2B 6e5d4f86f0beedcd2f85c05397e6feba61958702fd00567ca287a4b72a664908c48f0aa95cb22e902f5fb67c03168ec44713200809206c3738a009de8ded0c79 SHA512 6753f8af364e0e5dc7a4dba18253ac491f687ea3436babe5f692a895032bc9084ac663b0608445ef77bb6c7b9e8f4fcaf36351e75639fc257a566748d422c6b0
 EBUILD gentoo-sources-4.14.248.ebuild 736 BLAKE2B c3bc140c2819bbaf424e712aed3acdfcc02d037a88a5dfb4b0d1b7b86c514b80ebeee437dcd9fd203b03da13136e6b0d515850daae4ce53a548184ec97f3606c SHA512 f39e68ad96c8377bfe168f695ce738514587c4379a5de91df6d1167435e2b242cd717941c60080411ca72cefc37c420e534ec5db51adef3812c64acf2fad8781
 EBUILD gentoo-sources-4.14.249.ebuild 736 BLAKE2B 50113efea7a9ad4aeb74ce16a3763c25663aa78f9a9d1157ecdd720f5a72d68af990394c3f9aff51dbea1168bd24e44581c5d49ac52239bdb759ff8cb7df8f84 SHA512 303dfd878839511657ca11fa048f8d307e537aa1ae8e2589938fd5e0e5dba94376ff8fcb870cfe622337f631248a7a97081be11d3a2b47cc90bc1734dea161e2
+EBUILD gentoo-sources-4.14.250.ebuild 736 BLAKE2B ff516b3768604e325d603462914809b52d16db7fee81de910004eaccb0541be38c029411a38fee8840e3e36b96e405163f3df25552ece8742fadc53e2c1197a3 SHA512 7106b2d107cb771ee25a277a88a5cb46df7a44d36c4655442716c2d260d8f37943d6ecb84fd2d6059c40c4c9773f9daab89fc6aed49b12b6deec88935e60382c
+EBUILD gentoo-sources-4.14.251.ebuild 736 BLAKE2B 7bfdd983ae21655547425af36df51818d5857a9c9361bb4b772ee1877d546eb724f84dc14c0df9cc0d45c5e6a7b76a84f0884b064c5ad72cd97e797eb2afb9bc SHA512 6c7f923f626cf0bf8ad02247ec7e090f0f5905fc1fabd0a420a684582a564c5fbede370054dcb2492a3d84c4301b00a99accc852a1364d2aaeab07f6d432522f
 EBUILD gentoo-sources-4.19.205.ebuild 730 BLAKE2B e26633745f7837cefdec382c62ef90403a570fc5805be06f81986208e58d5d3cce15a9222feadfee1b5c39e0e7178d445006949d24e1f01a2db5b41b3b70b288 SHA512 69fc976572fbf3e3abf07fccce9ce6ec57a412c34cf97142c904d45fe865e0ebca9a37369376cd7241d109e552a6eee27db2a8fd19fcf5625568ff85d11251a6
 EBUILD gentoo-sources-4.19.206.ebuild 736 BLAKE2B 0b3ceb4cf6b267d56918f19371dea92b2c32bb72e43bf60132bc0a684579fe8d41885bedbf2407bc19b7a54492956d07018a71eef9ef6aca867b6e5dd0a74b54 SHA512 a26178e35dcca0fd4a89090489cfa30e88338ee672297d6f59efbda880ef9f54852178457f2d91f7af7f320d1ff7cc72959edb00317df8909125bf80c86a42d1
 EBUILD gentoo-sources-4.19.207.ebuild 736 BLAKE2B 84f17c9101194fd936e3e9de75a114c2c81e2a72c5ab4f597210f892b5cb4ecf617e5837e7fdd12c51a18b63f34e26d88c1a41bf6b9d487bbc688c988282baca SHA512 b450d636f4f57f9f9e3aebdda40311e5fae4764b09492c7e09861e232ba08bf83617269ae53688c044d9274375ccc1af0c5df7561043421e802962c2a719c30a
 EBUILD gentoo-sources-4.19.208.ebuild 736 BLAKE2B b9902d413c1e43acba7ede13ce386483cc20a6c96ea429303a91c7ecf77598d021cdfb7af2dc12eaebe575918c5749bef216a2893337bc3ffe833fbf8aa12620 SHA512 069f0e9a32f7cfcd396a1b9f7a4e32de573476d4827f4e1f36a059ded1f7c6c007a9ec0fda7e6feda4bc32480991088b9a1f929fed6f9a88e18c30e9748a2484
 EBUILD gentoo-sources-4.19.209.ebuild 736 BLAKE2B aeb6b16eabb7e230ca0f9275575491a07884c0f8eee264281149acc7bf21e82e9f4e66fb950e7cfe4267c53438bd55405690714fd2893a197a81182ab626564b SHA512 8e60721c51c58a4fc096cc3081bda211b237e91f0e83c006359a08f7110d99f69e81a5aa846f6b01a80a56e8c792316ec260889267d2d023c63ce8b71d6e4be7
+EBUILD gentoo-sources-4.19.210.ebuild 736 BLAKE2B fd62031d7868023d60209d2f15da57be031a72481c79230d5abeb1c69d8e0150164b20c1976245bbe4ae4c9a864e947d21b78b5b6c061c61985a61726362edd8 SHA512 a59706e86829429630c86093ab87489a8aaf2a69f5646541c32bc90b9d66f9012161eeee0ced98b3ef597b0dec6bfaba126857541a5a3ae4de40fcb3bdd3b049
+EBUILD gentoo-sources-4.19.211.ebuild 736 BLAKE2B dc932793320253dbead284d33f928fe31fb97ffbe98f84e69be07c98292e14bc00b64e685e42a81e01542f2e860f1a2de52cba82534e0b1f42e7c0d1d0dacb62 SHA512 9584ad77e9424ffe18a77409458267774f80f761091e4e9f433ceee6d1fa1c363a3b5565ccad42cc9c391246530aea3a9dd97c44357cf3001d38e9aca1afd69b
+EBUILD gentoo-sources-4.19.212.ebuild 736 BLAKE2B 8fd73312c40ac2536909e1047641bc206b1612cc6cfaea2355dc082cae6cb1e58f0150645f80dfe0d60239c78c325cf50d8ef56afbbc465607971e769eaf4d97 SHA512 1544743920e0ad6378b883688c4d2cbb3bbc7c3a63c1f71d1b3bdd249bbb385f65d0e3c6fdb9785da7752ba413da0df9f0965db52ebb51eea1d11b60c32bebcb
 EBUILD gentoo-sources-4.4.282.ebuild 730 BLAKE2B 15e9ef3dc54d7f7ef70e14782f343525a9c984e59854ff1865eb838e0a4de9d57f1a458660d8e4b8436dddc11aa4f79bba285471988253c99933c5a57f74c57f SHA512 35da1377e9ec9325324553a5dc32b8436ab0a9c2492adb767ca1eba9189b6bb98d3c989d2144ebc8c681ddfb27a4a4283150ef74ea05472c013f8fccdb1c1915
 EBUILD gentoo-sources-4.4.283.ebuild 736 BLAKE2B 8e89820b8438812976435e4b27aa3ecac2ecd50e1598f6eb64c46bf9a1c62f87792b44a660b2c683154c2763982f6aff7227605a610a0a776678940adba40159 SHA512 bde18ee0ad102e2b0fe7e3891e74cafe74c3708c000671e0bad6e89a85b7b8032a2e223216534ef21cc0cc63aa0a78c8ea137871db5cee014b0b29f471d7f5ff
 EBUILD gentoo-sources-4.4.284.ebuild 736 BLAKE2B 19a228118bd7958bd5f8f032acbee7f0e900c0b913c92a5a79ce33a861dd4fc19252a96f6415a1b6b9af5a57885442eea7a067b7807861cade5f2b632742597a SHA512 2ca52b0e27bdb017196d0a34c31a48d604dff2c5b4f113f91df50d89fa0b898cf1f96c8ee7a743fca6463bad9c584442570d65b6599975da18b4185dc538a482
 EBUILD gentoo-sources-4.4.285.ebuild 736 BLAKE2B 749061d5af0ba7d1e258c73d85c57e41401147010000d38f8f55a97299e9af4bac445b2d9ed431e978e0f1901235484819300bf8103c96196ee5690c31744e88 SHA512 f4c646bcf23cec85bd024b732b7ab403ca968071ff84da1f8dba137979979c9c14757ccc5c3e99a729f3399c59ea982577cfec9186f845ed86904a0731d4f6b4
 EBUILD gentoo-sources-4.4.286.ebuild 736 BLAKE2B 89ec013fe6d5197865fba5256ada4b8e835774058fadd1c8540047f72a49e61c97f51b332b1ab661f18c403b893db2ad4af2ba5374fb364bafa23f78af0d247c SHA512 68c48774be6b53190a7ba10802363568935ba52acd4710036494fc5ffcd6d0288895b31bd88ddc4e04a143a64264418bb0996023f61d178e5bc4defd75015fb7
 EBUILD gentoo-sources-4.4.287.ebuild 736 BLAKE2B 07310b5f4801acd738cb52a4643872b4268a788b3a6011cfc21f40381fdb46a65832296db8c432bbe6573ea5680e006fb387f0256f1b451e5f031d0640d69be0 SHA512 3863851d6878d0e2f6497da852ab25bf85e73334323e4b41cd88926c18cd8d3e5a50e27e3eb9067407a7b64b16ed279492a891e5bce201ec6fb836d78f7f6e46
+EBUILD gentoo-sources-4.4.288.ebuild 736 BLAKE2B bc5eb541c40323e8eafd28bbefb7230b573328e76736c8b44a7a1bd71e9b9732bb6551e2df7ada6e19811297e5e38d7c841ffaaf872248f44c78ff5880f00702 SHA512 ade18b7b3abfa6f38da5123e116fca617e0dad28e6442b3cdfe044a354d0b7b085ba73fd699c272878a38b68f9a8c93020dafd7af2e2c73b6214b3f02c0334d3
+EBUILD gentoo-sources-4.4.289.ebuild 736 BLAKE2B cd397b0ad5d4ecc9126ee683fec6c16ee1b3c56bceb3e1ed1ca9b508e64d4a93a6463d8422d9e1f2956fd3283579025b2e3402efcd4b72d30f3d5b5ff5f1f3ae SHA512 dc831dc0ad0e9e276912c1c5c9094968ca13b1bed5c05c595c9ea72d4060f0ea2b2974a69b9388c002e90c9a83b0dc13513126c87d1953664ad18257d22151c6
 EBUILD gentoo-sources-4.9.281.ebuild 730 BLAKE2B 3b9f86cd30f60a8ed6bfd1c1eecb703ce542d29e5ffce465c61d6f03608c9bcb6f492809fb52d22eab444518c9facef15888615a555bae44ea5e78ffe3a9a67f SHA512 32316ac1bc4db8150ba4ea09394689ab8c76ef4ee870ea76d9adaf6b8f0303cf11efe7b810e88a8a29c38e1a9d92850f4b8b5c222e9ca5fad901d57a9effb2bf
 EBUILD gentoo-sources-4.9.282.ebuild 736 BLAKE2B 19a228118bd7958bd5f8f032acbee7f0e900c0b913c92a5a79ce33a861dd4fc19252a96f6415a1b6b9af5a57885442eea7a067b7807861cade5f2b632742597a SHA512 2ca52b0e27bdb017196d0a34c31a48d604dff2c5b4f113f91df50d89fa0b898cf1f96c8ee7a743fca6463bad9c584442570d65b6599975da18b4185dc538a482
 EBUILD gentoo-sources-4.9.283.ebuild 736 BLAKE2B 749061d5af0ba7d1e258c73d85c57e41401147010000d38f8f55a97299e9af4bac445b2d9ed431e978e0f1901235484819300bf8103c96196ee5690c31744e88 SHA512 f4c646bcf23cec85bd024b732b7ab403ca968071ff84da1f8dba137979979c9c14757ccc5c3e99a729f3399c59ea982577cfec9186f845ed86904a0731d4f6b4
 EBUILD gentoo-sources-4.9.284.ebuild 736 BLAKE2B 89ec013fe6d5197865fba5256ada4b8e835774058fadd1c8540047f72a49e61c97f51b332b1ab661f18c403b893db2ad4af2ba5374fb364bafa23f78af0d247c SHA512 68c48774be6b53190a7ba10802363568935ba52acd4710036494fc5ffcd6d0288895b31bd88ddc4e04a143a64264418bb0996023f61d178e5bc4defd75015fb7
 EBUILD gentoo-sources-4.9.285.ebuild 736 BLAKE2B 07310b5f4801acd738cb52a4643872b4268a788b3a6011cfc21f40381fdb46a65832296db8c432bbe6573ea5680e006fb387f0256f1b451e5f031d0640d69be0 SHA512 3863851d6878d0e2f6497da852ab25bf85e73334323e4b41cd88926c18cd8d3e5a50e27e3eb9067407a7b64b16ed279492a891e5bce201ec6fb836d78f7f6e46
+EBUILD gentoo-sources-4.9.286.ebuild 736 BLAKE2B bc5eb541c40323e8eafd28bbefb7230b573328e76736c8b44a7a1bd71e9b9732bb6551e2df7ada6e19811297e5e38d7c841ffaaf872248f44c78ff5880f00702 SHA512 ade18b7b3abfa6f38da5123e116fca617e0dad28e6442b3cdfe044a354d0b7b085ba73fd699c272878a38b68f9a8c93020dafd7af2e2c73b6214b3f02c0334d3
+EBUILD gentoo-sources-4.9.287.ebuild 736 BLAKE2B cd397b0ad5d4ecc9126ee683fec6c16ee1b3c56bceb3e1ed1ca9b508e64d4a93a6463d8422d9e1f2956fd3283579025b2e3402efcd4b72d30f3d5b5ff5f1f3ae SHA512 dc831dc0ad0e9e276912c1c5c9094968ca13b1bed5c05c595c9ea72d4060f0ea2b2974a69b9388c002e90c9a83b0dc13513126c87d1953664ad18257d22151c6
 EBUILD gentoo-sources-5.10.61.ebuild 734 BLAKE2B b45954941fbee04fe5ef22e52e8dcf6dec19c0ce8960ae42f37b8c236d418589340aa63abaadb4531feaafb93b6326385851f82dcc8abfe584e2b67091dd279f SHA512 5bb91fb27d1a81cbe2e83685d7e231a46fd23ad08d9c77783dbcf710c6de7dbe5e20c42c0381e0e3dde9e55193dddcc89c965fe6159b8c536cc693d8c5f515cc
 EBUILD gentoo-sources-5.10.66.ebuild 742 BLAKE2B 1cf4a22fa28d505a964741a381eb0a07d73d1cc199b016c7bbb4867921868030d2e93ade96491b1acb0b7469bb42d3d93de48898102796850d2088e82787fd2a SHA512 0263007e35ad14c8dfe980729aace35b45abcbc48d9cbf6a739525cd948c6880e3201740f0e10f62d39bf3469a32cacc3be992c560104ffcfc9d530e65c99aed
 EBUILD gentoo-sources-5.10.67.ebuild 742 BLAKE2B 989a25ee17809f6b5c1653343bafc6e64f7d8853800acd48c173266d152b49c8d8bba5ffc60c38910addbe845c2dbc28dc21f341e1b54825c2a2120994f08022 SHA512 4c8123fe375233294d96fdcf76c4525aac214bff3c0365c98a22a58226bdd8cccf014c9a78bdd8945bf0bcf0977234504b33732787dd0a91b4b6600e14be7ad2
@@ -169,10 +232,16 @@ EBUILD gentoo-sources-5.10.68.ebuild 742 BLAKE2B f4204d10db4e60a139a7b9cafdbb401
 EBUILD gentoo-sources-5.10.69.ebuild 742 BLAKE2B 14e47f1921c09c9c9c022818a03a429d9609ee119dd6362a88b110ce1dec8773064f21612749176fde3286366798ba7ef329f0b6f42221dd7d4b718c424a3b9e SHA512 f7b6d3b9f9f3ca6ae4eea8f1ff9a765ce418035f18b05719d47a0b3019376489e47f15f319b4f085f0f6c03b7b6c0d1431e10904c78796f945439d61dcb88653
 EBUILD gentoo-sources-5.10.70.ebuild 742 BLAKE2B 989c19bd63198ce79dc3631a18db6641ca58b1f702e196b4c782b01861e1c00d211469c88c412ffc18336d19d5f3bbd34322ff8a676415cdc70b96f9cf2cd3c3 SHA512 b2b929a459cab097234a2286d788d115b21bbd2bef87da25560cf7a5c4a4a6bef16fbd9d4485b0b18fc68e786ce4f9612588736b81a7e77e57565948544df71a
 EBUILD gentoo-sources-5.10.71.ebuild 742 BLAKE2B 0209ac9620310f1a1b489f75ef6dcf74f9b68131ee16f02d748c873788e95a7129adcdee07ebd0061d9a66d54bf14e3bfd929392b8773afc74b80ff1b2779d30 SHA512 f5a695a18ddfe5edc511ba80a8de11f7cc108f017d5c0d8f0df27f3c5ddbc3948090e3cf8e6b428db9c66e26beb3cd0db52be3b20c5d2c8e6de1326085e5eed5
+EBUILD gentoo-sources-5.10.72.ebuild 742 BLAKE2B bc55079aacc06fdaa0ac6db9f8395afe5dfa5a295090f811afd31c01819f0c4facd24e2d3e7e0e08625afd8da256e1cfadfa14dbf8990ebffa819f9d2fc0ea0f SHA512 160b84c80a088df75158417dcec4ce75013d4dd000289d9700805989341e4fb04e6f76959db3894c335ac093b70c533f39f7ae69b97b0fe00503d8dea972aa42
+EBUILD gentoo-sources-5.10.73.ebuild 742 BLAKE2B b7ebc095fcded6075cc2114f903750984cdebc89fcaefb0f68f4263c5369b71d1e540dad33b65374e54dff24a1128059ee06ab1c91e70d0262a3fc1457c45aae SHA512 6c7047f7edbc3e1dde144c709caf3c89bc8345efcdd52005b29a05044c5adc21f44950a1b8ec5551b62cb23684c02d06e7276d6393ce4c7cf9637007cb1de4ee
+EBUILD gentoo-sources-5.10.74.ebuild 742 BLAKE2B 5c4d231ed7d70399772bd811d4365a47e1354e1f2e6ddc9d42f179a0f4c4ebefc122bbf393b71e42d07f9eb00cde2524e587c8d3c7cc96f33353b4f146a875e6 SHA512 dba2b236590877bca975414dac04eb684e6084ce3d65b653b9eed28e3589a685792f6e6cf8f8e5e209ad4e208ada6476c670ea03e2610e8db264881146605fd3
 EBUILD gentoo-sources-5.13.16.ebuild 742 BLAKE2B 74b6ec98e31d744b30da21175eb89e36165427733c343e869437aa296994837eadf47330ff7e323c2e4bc8c62d6ab3fdadc7483249440264096fe464d46f0712 SHA512 e66af0a5b1a115f1be4789d7b53b5f2ea3820e4b2436c7e63dd51a898093ff72571a46c0e3dd29b8f9bb73707e15257a0b67626ef5151e89ee14b710fe196822
 EBUILD gentoo-sources-5.13.18.ebuild 742 BLAKE2B 76265b2c2b286b698b37d822c8c63183de8b39eccbb7f0af70cbaa3df10e7958c824e28d531b393b83fc7bc8c93318ba8aa61e1a0af53616204fcbb6d3522e83 SHA512 a7dac6cf5bc99dcee0386434da8241523e64056bab0b219317ca44846d0180ed77682079d2705b6a06cc43e87003905f646a32b02ca48cefae79167f3a9a3974
 EBUILD gentoo-sources-5.13.19.ebuild 742 BLAKE2B ed01b58ae704f13aedebb03c722ea77ad3ae2844096f144ebd48f98409c7d3ac40a4fd29e6c7e7a2819e8486467b44c437951cb2ca149e8746c010069de109f9 SHA512 49a02f52ee27fdca79b9fbba38efeaf5686d4bb2bfefb5db221fbc1894d998b91aa6da8ccce8f62e01d4f722c4348abde0275c4f5b39ddc0d7f3da3ad8bd7620
 EBUILD gentoo-sources-5.14.10.ebuild 742 BLAKE2B 7a167fd5e5f7e1f7af1740884e6867bba5dca88b35e8f7da3228bd3dcc3659582f244fc99999ed55f8f70d87720adf6ea64a2653d6b349048112e2384e94134c SHA512 cbe170b9e45372ad600b27a100781f11aef8046a12a747608626fdc46085052aaf7a32cad05f1ab99554c4493bca5c46eaa2ed84b0e3f6f0e8ffddec510f60fe
+EBUILD gentoo-sources-5.14.11.ebuild 742 BLAKE2B f1f947e856fd6a017a4ba8f8fa0ecc5d17be43f6a6c9699b58a7d8a41a507a9aa2e29b5b7ca583424e273eca103622ffd46ba6311f4f58b7d5ca3c90937d5adc SHA512 14abcdcf1fb6d5464f5714b4bc6eef78fbbdb8e1c481c4eb4266473dd2ce4afa8e9fe9a07c9e73fea87203ecd57ad720e49c01cd6166cfaab0e14e8923b23ff5
+EBUILD gentoo-sources-5.14.12.ebuild 742 BLAKE2B f257938e38e37fbee0f9d76f125295fd9658455835d7be02c6ce34ea028b8f34be99dc6067f29edfbc12f0d9591da7c5ec8d9abe10b1006eeb1a517b087fa3dc SHA512 4336ea83b9d84f384e1b3319b0f8acd15339689cdf2fcae69b3591a3c0e06e2876842e5516f088f1d97d3ba742eabc7e2cf51957562a2643e239f804fae64038
+EBUILD gentoo-sources-5.14.13.ebuild 742 BLAKE2B 9fbf2ba4737a923bc39030afa7b1891513d91c3d416166d18e6be29ae1443e0a55e81ee95e42457a587d24f7e6a8c76885c23e92b04720c2b2a42674e3a4c609 SHA512 947390f0eff3978fb698b6a2c58d25c113b1089be4e2e33c8630623780e9a0e6747501031b6a51ecf6fcfb7430a326572e5a50479df095cb426d85d5433f75f9
 EBUILD gentoo-sources-5.14.3.ebuild 741 BLAKE2B 9a443c5a2837189e31b86920487fa066e321b602fac89ac26e80d83dd9e23e6a62341321d1246c269ab26f1c361d0c28d4e0d460462577b883c997f5c52d3e7e SHA512 1da5bc2c994f68311664dea83f334ab3eb802130f9d646f436c213eee0db5030516faf164f45f4f3ade71d7c903c9b49fe4b4c5fb192fa3b4efe5c60ba8f82f4
 EBUILD gentoo-sources-5.14.5.ebuild 741 BLAKE2B ebabf5a8f4c7148efe0826f8fb3e793dbba0c494c6b02000f13138ef466603d4c9bb36f2a20dc89ef8dce3b9b1e96eeb116a6148926bf630f8b8ee78117df109 SHA512 4cc6d947f712b886b2db33093ca355555e189711441f5002a7052e89cb3731fc1905fddca90c4d30302277011ca1dbc0b8b6d6d1adc03bbd8196b11532c2e7f6
 EBUILD gentoo-sources-5.14.6.ebuild 741 BLAKE2B bbe96fedb8e0b92042297f268a5696ddf692d8615911176bb5109d9bd363013fea30fa7f68995b2e0e3a25539cdefaaf8853638a5e22cebc9a849807e7fe09bb SHA512 0c01d57a1d008a8207626a11ccdfa8a93b7c8a02312ec94a40d37b8e8f7852de9f2cb4a0045a1aa407dcd55e0a71ad531c4f040b9974968dccb19fe215beec2b
@@ -186,4 +255,7 @@ EBUILD gentoo-sources-5.4.148.ebuild 736 BLAKE2B 95629ec606ef39856b9f04cc4ce437e
 EBUILD gentoo-sources-5.4.149.ebuild 736 BLAKE2B 538895332006b301a724a026e9445069da0172ab9a58f7d8f0f8957845d6afe2ebacd03139c97c7463ae799f7c46599d43cb9a606b9db7703f7e8ca18c3b8acb SHA512 cb8b55cc14a019cfa53d349e73da9cd76764e2e68cb507bd7098429096cf44f22521a78c4528e34bed2e395a7644644ed587578e98edd95ce27125dc5de6c687
 EBUILD gentoo-sources-5.4.150.ebuild 736 BLAKE2B ff099555f45557d654d9cf25ae7b20820f958f74eb0cc3c63c32a3b1d26ba358bca7ce664c2c294f45cabb133763cf3eeb5683eeb0b853f6dc541366c848c38a SHA512 5078e453a5b652bc867228bb4b7c76e4a8469db4d84db45faf15c6d436b0b22e02b2e7f93df3ecc413a6805d970b4c84c05a8d571f4c059d74c4d634c28c7c2e
 EBUILD gentoo-sources-5.4.151.ebuild 736 BLAKE2B 97fed0a632d2de66d16faa7933c0de108974dad7dd0792bb3c90061787c8abcc08d064adec34d9790c944b5b942c842768be9e500997fade89adf080609bbe9f SHA512 192141d13ba13ae8eb51913aa5d630d82ad20f841901996eac700779100efa7c1772eba4eb4a416a9562359bb84b66782261652c42a3bba457d00c387c394ef4
+EBUILD gentoo-sources-5.4.152.ebuild 736 BLAKE2B c7dcc4eedf6621a6c6b747f503043552829fbbdb166231d83f6c000d8ef7d5b392b6cd7b935211561d9735bd1baa443c59806eb83607ae3ac154fe0706c9e032 SHA512 bb6797981cd9eafa20e6ec70b46a3de57de9f98f24a022985e9569bf4118dae66ed079c9c326bcaa3acaa743547dc692312b988ec59cd47b34321132187b86f0
+EBUILD gentoo-sources-5.4.153.ebuild 736 BLAKE2B f9d7a159d00c0044d9bb100c9c8a146f6ba6cdb2ce08d3c8f1b9aecafd2a7d41b51a3fe931cb3c91ea925855b246711f14a3fd4068eabe74248ebf211c24a489 SHA512 85ff4e2d85725a11ec3b2f028855fb2fc86c6241280592aa91df348caa00ede2118ad4d1a6d154c76440393e25facbc46e22d5a0175a3477abb8a787f9884c2e
+EBUILD gentoo-sources-5.4.154.ebuild 736 BLAKE2B 8cefec7ef08619a6d28653d717fe909dc2b28e47da0ba24e0bf0ba14908c37061e244e16e90e3ce3aff40fe5388787a0a940f9959e16b9d172e0ca21007b004a SHA512 6b3f31babc1e10ef522120c418717de49b0b069858507f480ff361df1d89d43b15ed023f268348d19351712f4ef9f68046ece1b1ea3fdcdc97a1274957eafd46
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.250.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.250.ebuild
new file mode 100644
index 000000000000..0478e3010f6c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.250.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="260"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.251.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.251.ebuild
new file mode 100644
index 000000000000..bafcd907d129
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.251.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="261"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.210.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.210.ebuild
new file mode 100644
index 000000000000..9ae65f4e4b20
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.210.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="209"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.211.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.211.ebuild
new file mode 100644
index 000000000000..29c6a484e2ae
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.211.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="210"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.212.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.212.ebuild
new file mode 100644
index 000000000000..333bb5a3abaa
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.212.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="211"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.288.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.288.ebuild
new file mode 100644
index 000000000000..5f6abe7d65b9
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.288.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="290"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.289.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.289.ebuild
new file mode 100644
index 000000000000..6bc055bb0dd2
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.289.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="291"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.286.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.286.ebuild
new file mode 100644
index 000000000000..5f6abe7d65b9
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.286.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="290"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.287.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.287.ebuild
new file mode 100644
index 000000000000..6bc055bb0dd2
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.287.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="291"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.72.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.72.ebuild
new file mode 100644
index 000000000000..6be0cdb50316
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.72.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="78"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.73.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.73.ebuild
new file mode 100644
index 000000000000..3648df5d09eb
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.73.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="79"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.74.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.74.ebuild
new file mode 100644
index 000000000000..7ad3672a80cf
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.74.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="80"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.14.11.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.14.11.ebuild
new file mode 100644
index 000000000000..d27057f21080
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.14.11.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="12"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.14.12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.14.12.ebuild
new file mode 100644
index 000000000000..315e9c123adf
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.14.12.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="13"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.14.13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.14.13.ebuild
new file mode 100644
index 000000000000..52143653e4b3
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.14.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="14"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.152.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.152.ebuild
new file mode 100644
index 000000000000..cc69274987c6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.152.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="156"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.153.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.153.ebuild
new file mode 100644
index 000000000000..ada282310efe
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.153.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="157"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.154.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.154.ebuild
new file mode 100644
index 000000000000..80756110f233
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.154.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="158"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index dbd0a00fb421..9ce34d2ef4fd 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -3,8 +3,12 @@ DIST patch-5.15-rc1.patch 41357462 BLAKE2B 7df3298b6dcf7eb5a4867e84dc801e3440636
 DIST patch-5.15-rc2.patch 41617220 BLAKE2B b2216f798e64ccbcd3d6a9ecbf77388a6af97bce43c913dc0b8561db909b15f242ea63a5a266c422f887ef5f1232119f30b213fa9604a57596611f69b51964e9 SHA512 76d1054282c00adef7c31701e0991e9d279e641ee4f009713169aea2f0c9e4cce0eca356e32ed8e818fef57b601f9205f2ff32e4a139bb2ac48a2bd1d2b4a178
 DIST patch-5.15-rc3.patch 41945558 BLAKE2B 550064d9cd8b30c062cd4411d169547317a406e259cc46b124a8e6115d2ff4e370903fad3a5bf4e62e9db07fb7d510ecf6c2b36ba27534b813cb379f7fe9c966 SHA512 6e3ae62519dd991d26eee5063d511749d282ad1b8a57d020ee179a5819ed7842f3f22c2ac8ec972f57bb1d4650f46ee3d8a98f52d33c7e82412e4968af2ed3cc
 DIST patch-5.15-rc4.patch 42309515 BLAKE2B bb92e0f0fe290faf86da6f0cb4980b1af700d735bb22250851df5c6712af59b82de524cd96f9e3180c4d77121d09258109c16fb48d342e6117073d2ac8189524 SHA512 e5b3c895d72d7c9be5ce409072a3076d5c9789a510e72cd6e5c79011a321a1de219bd84e6ce3df5cba94f4103dbb3c8082e0317b7783138dba05b956737e697c
+DIST patch-5.15-rc5.patch 42630582 BLAKE2B fd8402eb398d0e2cdeb88f53b9c9d59e6fef4d0b9474d78e23cc1932738e869c44072483a21dbd4b5b6d4c77a6fb747e12db6f90311ce6040e28eb28a49acbdf SHA512 5646280e7d9da363916697a54c6b759d8e97547dcaa544c1ca24763699dc190c2fb2722f8004541cb347461f0fb4b20d086df184771af884ae50f7efb29ba8fd
+DIST patch-5.15-rc6.patch 42890983 BLAKE2B c2cf4ef6efa367bf4bb5b3488e5ea5771f06b0d80418a88d88d4e7a2674fc3616aa5d75aeed5e092d12d1702cc1961ac3722c299eb542dcb56c766925106169a SHA512 fef30c696159c5649406027bfeebcc83ffb169d0acea05c6b3ef848b070d74eef4834834de7f2a62cf7c218566d7f1a25d79dcb70c934c062e9d6882196a7ec3
 EBUILD git-sources-5.15_rc1.ebuild 1172 BLAKE2B 9c29aa24dd6dac1a6b5edc7b73f0c72389ef5dbdbd14b35fbfeacea51fc8a409d3097f517b12c3fc6dc1012b6122462ffc6438c712fc6553734762c6ea9489a8 SHA512 484806391f4b127582c2fd440c999b615ee9d776e3a6c4d11dd2650aef6485fd84840b158cb2440c096aff3cb47c33adb7dccffb9bbedbec3daba8454c51845a
 EBUILD git-sources-5.15_rc2.ebuild 1172 BLAKE2B 9c29aa24dd6dac1a6b5edc7b73f0c72389ef5dbdbd14b35fbfeacea51fc8a409d3097f517b12c3fc6dc1012b6122462ffc6438c712fc6553734762c6ea9489a8 SHA512 484806391f4b127582c2fd440c999b615ee9d776e3a6c4d11dd2650aef6485fd84840b158cb2440c096aff3cb47c33adb7dccffb9bbedbec3daba8454c51845a
 EBUILD git-sources-5.15_rc3.ebuild 1172 BLAKE2B 9c29aa24dd6dac1a6b5edc7b73f0c72389ef5dbdbd14b35fbfeacea51fc8a409d3097f517b12c3fc6dc1012b6122462ffc6438c712fc6553734762c6ea9489a8 SHA512 484806391f4b127582c2fd440c999b615ee9d776e3a6c4d11dd2650aef6485fd84840b158cb2440c096aff3cb47c33adb7dccffb9bbedbec3daba8454c51845a
 EBUILD git-sources-5.15_rc4.ebuild 1172 BLAKE2B 9c29aa24dd6dac1a6b5edc7b73f0c72389ef5dbdbd14b35fbfeacea51fc8a409d3097f517b12c3fc6dc1012b6122462ffc6438c712fc6553734762c6ea9489a8 SHA512 484806391f4b127582c2fd440c999b615ee9d776e3a6c4d11dd2650aef6485fd84840b158cb2440c096aff3cb47c33adb7dccffb9bbedbec3daba8454c51845a
+EBUILD git-sources-5.15_rc5.ebuild 1172 BLAKE2B 9c29aa24dd6dac1a6b5edc7b73f0c72389ef5dbdbd14b35fbfeacea51fc8a409d3097f517b12c3fc6dc1012b6122462ffc6438c712fc6553734762c6ea9489a8 SHA512 484806391f4b127582c2fd440c999b615ee9d776e3a6c4d11dd2650aef6485fd84840b158cb2440c096aff3cb47c33adb7dccffb9bbedbec3daba8454c51845a
+EBUILD git-sources-5.15_rc6.ebuild 1172 BLAKE2B 9c29aa24dd6dac1a6b5edc7b73f0c72389ef5dbdbd14b35fbfeacea51fc8a409d3097f517b12c3fc6dc1012b6122462ffc6438c712fc6553734762c6ea9489a8 SHA512 484806391f4b127582c2fd440c999b615ee9d776e3a6c4d11dd2650aef6485fd84840b158cb2440c096aff3cb47c33adb7dccffb9bbedbec3daba8454c51845a
 MISC metadata.xml 465 BLAKE2B 089bfb0e4af03b69d3d118d39713b54aac6912012cf0e9352d22b4b597abe5b1ef86863c37f6a0be2f81995f2a81a8d08bc7c2927d06ac2042b7b18ba02c77be SHA512 cb2bec5a8cce1e6da593f6ab11ceb854112fb4e828198793820699913f2f7cb2a9443e1cb15c42e16730891a27fe8dcd1713527c2ba2cfa56f6d2296f6f6e001
diff --git a/sys-kernel/git-sources/git-sources-5.15_rc5.ebuild b/sys-kernel/git-sources/git-sources-5.15_rc5.ebuild
new file mode 100644
index 000000000000..d7e4ec9a1508
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.15_rc5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.14"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/git-sources/git-sources-5.15_rc6.ebuild b/sys-kernel/git-sources/git-sources-5.15_rc6.ebuild
new file mode 100644
index 000000000000..d7e4ec9a1508
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.15_rc6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.14"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 925a0f17abd6..594704d87166 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -27,6 +27,7 @@ DIST pf-sources-5.13_p6.patch 7070425 BLAKE2B bccbb3ea9777675b28f4ee5ddc1539188c
 DIST pf-sources-5.14_p1.patch 3968070 BLAKE2B 8abeb3e0db3644e2b34cb3bf3b19d8eaab1bb1852964f26c6e5baedd24ad82760d352acee557e4b0af4fdfbc7ec05a497d966f98e3255d9f521a42958a12cd6d SHA512 c15ff5a30727983bfd8d1fc43be5efc31590e48b183cf0fa5bd46ea9c0ed4701cd1456d3b409b94bd1ee014e24be41667d85882074ffe4f3ffa07a16621c1796
 DIST pf-sources-5.14_p2.patch 4040142 BLAKE2B 6b41a69d8c9475ab5aab18de5cfc0e032197b8616e9aae40f0a7519ad58d1502502539139746e21c83295f3106350a403b6d677541f42b43d12ce60d4af619b4 SHA512 d22eeb8de3e31627d82edb1b95b42cf29d26b1f46898fbcb394ea22f7293824e8e0394253ac07d406ae1b51786707cb6845e8f466a01f2f347a79564c6450914
 DIST pf-sources-5.14_p4.patch 5657590 BLAKE2B e48ed2c8fe30e9a008bdcec98d8ff620e87977bcece927b6e8fc90fcbbe7692316ecb4759b1ac4b7928384a14680fd39aedb9607a533e436d239aca3922f0463 SHA512 490baec19f2de8951867ac355c23cc92ea7aa6f4f09dfc8baacc0dfcbcddfb5da8021549304b4030a97df1bd615fbccc2b5869593a47450eec339fd074a694b2
+DIST pf-sources-5.14_p5.patch 6029195 BLAKE2B f64b148b26846574490fc81cde2de3e46e452c566673a1e89c2cbd7078415b735d77a5dce9a86239c0ae65be63fe5c0b7b037e5bde39a909a39bd79a47d17d77 SHA512 4ed4c5101c333f9129f37ad2495499a1b1da85fff87061bfccba58216e9749063dd8dc7d2d303c80feba3d83d86f318166392fc98a0b557e51a6acf6308532e0
 DIST prjc_v5.13-r1.patch 258898 BLAKE2B 013be3c3e9b342268359ecbcc10c7b95c7fe3741d2b9058db87da59d40aa9b34db898d31f1f1a0dab80598cab313499d8083ccea141c5200b5593c9d44647de7 SHA512 ad9276a80e28eec461a307ad44a1ed5acebf810b14ce8c9e6f1dc211be6ed7e72f535175fb65f3115fa217f8b635122c65c2c002ff00ba458c867d8bb6257f36
 DIST prjc_v5.13-r2.patch 257231 BLAKE2B 943d3035035cdd1744ce0e075441224ffce04a1324dc9adfb355003b1fa6bcced1f63989845d1677ada0eac78f39b01d95d3fc7676c79b68858e8748c91b70d7 SHA512 1d9c80813e8f842b8b5da8b52e4348f329ef415b8cbef0a46f17eee64bf22fa8b1e443ae84ec9e7cf7ccff339d4b4bb2df9dfc894eea438e80f07446c82992db
 DIST prjc_v5.13-r3.patch 257137 BLAKE2B 22e05106ee91f104c69f8d11fa4072b28910b8202388a1778ac498f5128f8b93e6465c3e1ef0d9393aa5d01bfc226b3d6463fbba9e463305381a45cb5f015fa0 SHA512 d7dc67a9913d0d7723a616a11db2ab0798e65a6c2dfb99990bc2a4287c0c2e2eab72d17cdc3f93b884f006844f576379a9d8617b7e491dad278f3880d372bb17
@@ -43,4 +44,5 @@ EBUILD pf-sources-5.13_p6.ebuild 2258 BLAKE2B 70d01125643ae392f74dcd0ecd615c462c
 EBUILD pf-sources-5.14_p1.ebuild 2258 BLAKE2B 39f5758effb38e8802d3dc42093f9e45fece0e44d5b0efdea9778eda51645e4b7b4595f175506bf57fb7b6029c3adddf07156ad8e45906c5129f25eb9839ac88 SHA512 15a4a46dea772329a1293cb441f4c3ecad2f8219870c724f1cc1de5bc9d92855e628ccd0c9cee0dd3caad4ed57656183e4586aa0c1d3b0ce04ec8434b32c19f6
 EBUILD pf-sources-5.14_p2.ebuild 2258 BLAKE2B 057d9e0756294794903bd1f12eb2c6a970351b3556043c20fa49829f6fdacc1ad32e029c739cd1e7f4538cd8299d0fe10aac80d78aef3fa88b37baed7abde357 SHA512 b27deaec1354a5bb1f16d32cdc5626e2533324e303e547da722d8a9686c5b577cfb2e4c02d05724083f5d822d7e44ad1ad5de92bc946c769db38cdd098f3f917
 EBUILD pf-sources-5.14_p4.ebuild 2443 BLAKE2B a86072cf5e719c8762cf4c06910d670c4f12129d370fe2eea4aa573ff11fed1a38cadc643b88624fa07c22226c847ce7bdb44df9e6fbe81a5504b204b3b28e80 SHA512 503099839ffe38b3a7449eb5775bb0c64a9e443597451bf1c9db09dfe632f309cb966bd3b5e329abff42708b111c195f44881ad09c84931f489651b14049be50
+EBUILD pf-sources-5.14_p5.ebuild 2450 BLAKE2B 4c32228d8780da35e5721bd9da948ffd7dc469ee9e0c0a086d8204620bb1a2b8ba46f4710bcd3b128de9ba807d290708bf0e026c57958eeff91578cd5387b6b4 SHA512 c2d39338416ad4a35920993d70a4b9e9762fa570442289943aac56fbdbad5f9778f010659c0ca66e10e5b175dadcb5540c3ea6842c61dedf559ecaae33ff92a5
 MISC metadata.xml 346 BLAKE2B aac642a4971d6bc11e22a4885e5a4cfdaa36287a97883ed22368729e1db9bbe1baa382fc542d6f89582a0e4f43d2e78419d09716f6d215477454b72dc365e2ec SHA512 94e6a97663111931e68e8af0656691776c39b4e8cc4e96c4a257a9617413ea238400096b15729b1e3b91d60e030c6eae3789401c444692d3bf7daa7c80e78a72
diff --git a/sys-kernel/pf-sources/pf-sources-5.14_p5.ebuild b/sys-kernel/pf-sources/pf-sources-5.14_p5.ebuild
new file mode 100644
index 000000000000..6454ab5d9c21
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.14_p5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
+K_GENPATCHES_VER="1"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+# major kernel version, e.g. 5.14
+SHPV="${PV/_p*/}"
+
+# https://gitlab.com/alfredchen/projectc/ revision for a major version, 
+# e.g. prjc-v5.14-r2 = 2
+PRJC_R=3
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="${KERNEL_URI}
+	https://github.com/pfactum/pf-kernel/compare/v${SHPV}...v${SHPV}-pf${PV/*_p/}.diff -> ${P}.patch
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz
+	https://gitlab.com/alfredchen/projectc/-/raw/master/${SHPV}/prjc_v${SHPV}-r${PRJC_R}.patch
+	https://dev.gentoo.org/~mpagano/genpatches/trunk/${SHPV}/5021_BMQ-and-PDS-gentoo-defaults.patch -> 5021_BMQ-and-PDS-gentoo-defaults-${SHPV}.patch"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch"
+	"${DISTDIR}/prjc_v${SHPV}-r${PRJC_R}.patch"
+	"${DISTDIR}/5021_BMQ-and-PDS-gentoo-defaults-${SHPV}.patch" )
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+	# kernel-2_src_prepare doesn't apply PATCHES().
+	default
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	optfeature "userspace KSM helper" sys-process/uksmd
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index a846fa37299b..332f37d36aaf 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -25,10 +25,22 @@ DIST linux-5.10.70.tar.sign 991 BLAKE2B 2a7b6af50b66a8447156cbd191aab6b99d4cf263
 DIST linux-5.10.70.tar.xz 116426828 BLAKE2B 3bdb1890f1dca4bc20f1e3a5d9295bf3c9e598390ce71694049f7818526b8aaa173e2d24465d4e9da66a37254eccfe3bd34b3898a9f1c72ba372c196f956ca22 SHA512 db69bfd232d3d573d970fad673710232000fd52ae7abc60f73cea8beda88e9c3383c12a1e583aa798a4134b8646ab3cc8a251c16b0f6e7ba3301cdda9ca19d62
 DIST linux-5.10.71.tar.sign 991 BLAKE2B 693c1d0b231eceb00cb17402f07608421283cbeb613426add63649d3d6ef81535a7d40ae8fe174bb355284c1d1b6ccc2450b3859e906491993dc3cfc9b85486f SHA512 707ef8f7141f368b533d9b52f9245d10bdc9c9cdfefd0beb1f67c56003b1ab334d031d28ab94029877fb3fe90ca27307e8177cb58005132829c2279330989839
 DIST linux-5.10.71.tar.xz 116444552 BLAKE2B 6428513c80f203fe154275cba89af6d075c132364c31c08a567ef7dc220f43e6b00530887db1ca23d42c7a9d2795b58dfbdcd98336b92075b1ed401d170a685c SHA512 14cc7c1de20e9700b850dfc27acdb4e9c88467f03cfd28da6611e78759eb688e33dcc04d2f905d9d69ccb9819e5b5f5c39e02e3be2e4de2747f671c7a57eee74
+DIST linux-5.10.72.tar.sign 991 BLAKE2B f5b3025d32c5d852dee6d7aaa64c64ec6c34ef8a76097906e4e830e64ddbea3d8d86a47208aa1080e5704517eb116c43398881590c7242039d5888a2f6551cff SHA512 5f7f23499892dcd2441feb163289213221d63fbb291e95d8bbbce97354b69922b4bc1cea95cae9ca3baf18e5742c0e9513e419002cfaeaec9ce56dbe05357e25
+DIST linux-5.10.72.tar.xz 116438780 BLAKE2B de53cb5ba4e99d45ed739cee180c8f28edebf0206c0dda548c7b5f3929e93e3d72d8e05eddd1878723e1cc29cac6ddc98c9131594a60529db552d07c96ac2451 SHA512 24646ec0a673becfc7a9ac50dad9373a5ad40c3203ec1e45c7412a80cfc250fafe90aac5aa65b1ce71dafaf9bc3079470d604f11e7abc0a2510789b710b16be3
+DIST linux-5.10.73.tar.sign 991 BLAKE2B 7e8cfac025378f5a0f2fdc91815f8333507106260c1a37306c526e72988f202a3b5cfb23917cde70a1188e7edbe433de91de5bcb3cb31209e1224b68e8564cbd SHA512 565affb2fd23de21eb11d07a914c17f15000b648bb33edf4cd6a0550f80f36cfce9969bbb83535ca9620514dffbd6cbe21737d37081dc987f1e2f21396123894
+DIST linux-5.10.73.tar.xz 116436432 BLAKE2B 0f85aa816530ab3f738f4ae203bd681e439002ae2a1fe1ba2fb3238e194d79812f1bd084d76d4ad985fdc94d5c913579336652c0b8afb0f8047fd50e9c2db99e SHA512 8dbc10e67a59c2f416f64891f26e87226dfaa39d0d31274467527be01dbf41d7131832d6dbc4aeb2507558aee07aa41ee7ccf79c09be3add6a40a1e6773083f7
+DIST linux-5.10.74.tar.sign 991 BLAKE2B cb4477a85732a41f3fc565d60ec8d39f6408693f1c6392e39f120d8400b7762202d9fbef03dfaf36ecc2d3ea2406ea0f082637f762ed3b3ac0cd9ea035273ba9 SHA512 50575d27166e8bb144524a78b126dc282d2a0a3c832554b8ee5b2579f9d92f855a080593be82195705c3b9f3939f1743023bdf3cc9a051e5cd5fa29dfa1c7b47
+DIST linux-5.10.74.tar.xz 116434932 BLAKE2B e60d9b8ab3cf30a56617037435dc654db67f2e40918bc3c95bcf5e9e8a85d2487c49cf9bcf909675595f6ce4cf59437f2b328635398dad4ee5b7145a0c9492b7 SHA512 d978359f2d8f3f26dd975acda2caf1107e1b0b784aaba0437a6b4100990e50a6d3333a41647f56cdb2bea2ffb75113952dd6ea1570a2fcc88321254e6539bc6b
 DIST linux-5.13.19.tar.sign 991 BLAKE2B d26b1e733f84725318d8dbf1e9fcade7beeadc38a4a07aebf6be653ab0dff5c0a5533b5591e753745aeeeaa7650b2bf0d1942878b2243aac01b68d0ca81f8367 SHA512 a4c5ad726818ad7bcb87c3b6621abecdb17ea14ba6cc8686bf36ace3c0d16f8c5353b4f02f0b02b60967957d13172c3fa60b1415ce3d2dd1c0f8a852127a6c4e
 DIST linux-5.13.19.tar.xz 119374060 BLAKE2B 6a05829867d75705e0282418bd68c1b60a4f2cdced39803458d67c975f8aa3ed455300c19300d7c7cfad71d2e5750b0b0750f825aacb0fb3794eb5b7b3189cc6 SHA512 77f6279fe7de3c0dd35946b991fa190aa70f5e806fa6188a0a676dad0939e2a20136b3dfc659dcac7870b387ead328fcdc287c8a25b63120bea1ac960117990e
 DIST linux-5.14.10.tar.sign 991 BLAKE2B 899b62183a8e8d9ca26a5bc789c9c728db18f0fb44b7887ceece72b0ef4cfb99444ad20bc08714fd62e1d8c9a4fc4bc8a3c48bad09086723f205cba821bf6c44 SHA512 cdd41731a8502864a04dc5dc3b21cc2b149015bb7894f2f7ace9b571784ff5ab6d2e7aa48b90fa46840f18edfb7bcfda5cb042f34c58b7232b643673accbb7fe
 DIST linux-5.14.10.tar.xz 120693836 BLAKE2B 8875ce37b6579e51de0ed3c059d99fe26b3a2ab3e795161fbb8de8476f2e3e26ebc1e0c98c3fb1b904b43e954ddb0f91b30248c91307d20912963f2f13fd9925 SHA512 3194f505ca347705e8f782df1a2d0c9614b20524c5f0560d02ca32860b1e8902107fb6eaa80ed4e50bf1f1c909993452d5747b27abbea3efdd7037c40a7f9e76
+DIST linux-5.14.11.tar.sign 991 BLAKE2B c8bfd50261f0d034582c4d96fe69e5c70d7bef84390e9c91b359011b818f73fc3bfca8335a8707edd77548fc8740894db40bdfb00a050568b2eaa7506da78f83 SHA512 8a75a723d1ec4b23480f5244c992d1efac4495ec7240f8434b9a5c4ff7c9234f38fe498d5d760776822119d62ea20b03ee251482c1852719d30af62def290ebc
+DIST linux-5.14.11.tar.xz 120700220 BLAKE2B b84afc268eaace7029d13b0e37b5366d042e96f1437b95b08a995d7717d6b6ed118e929c2d0e0929ddcc4dba772768d686d1c3a29a7c9ed60b9534797b006efa SHA512 2c2cf12c039c08daed2e2af4bde42c5b961a5f83772096ddcc3d0297e07c716df974320ad8e1da56e29fbd8f4e92e1d2bec32951d4ae252357e2e4050d9f1383
+DIST linux-5.14.12.tar.sign 991 BLAKE2B 73bcf4394b735bde8c6c3b97489ed22e241db2185e30e13ab8e0e678cc1e24e514ddc5c4142a6079af17d7544cb3d7a5fa2a71e2999a148866d0714ba1f9f51d SHA512 f4494ffcac93170badcb118e008aa6b6c57fe28a20ecf7c70bf6fe610ba2634f036a6510f0081fa09a13ea1f15a796e456694fb17b0b343e9ed2850bc32a2d63
+DIST linux-5.14.12.tar.xz 120708144 BLAKE2B 854c3160a327a38ba0e8e35a2952029670429d829e903ba4fda659aa7cc7b88014b5dbdeefd2e0cc95e0311875fc7dae4c5fad825bff72102a894624845acbb8 SHA512 df79d76b1247684e650df48051697a017f3b97ac1c3687398e50dfb4b21650b563ad28c35d1bd9261b65f8f77b6bfe34b3ed0e076a03547b6ed16f6fe760915f
+DIST linux-5.14.13.tar.sign 991 BLAKE2B ae135582639a9da85e98ed274b07c289cfe4eacdcf0f53db31231636615f2518ff3aa36a80fa84c518c56dd4b712df94dd0964f2c3faf19b019497618286c836 SHA512 25aab006df0d2d193ee31ab222c595877516f0960cdf8f7d8507f363baab6d284e83d47f06f3573d1c7ea8743166afdc7db9da9b422b177550bc0975e376ad97
+DIST linux-5.14.13.tar.xz 120704340 BLAKE2B 4bb15634eb047d31173be23dac211ce6f4be77f8929cf4f183290e58080aacd70d6512e0bf3229c6d3badf311411a356fbd27d30d1ea40eada364a76f413228b SHA512 b3c662115585b358a05807ebf4953b0fa1ab2c3002835d8b99b3fb203cf1ff080025d476114b022d2e372f53c3c2d93e5460cffac9fdf450fe6d8b86bc65916e
 DIST linux-5.14.7.tar.sign 989 BLAKE2B fe033dfdb6f5ac14474a7e603c2edef98eb7318d065ca57bbf7f8bfea0d1fb38d4d62dc28a3b014a3cdf4be64d36b05463d5902afdb794ea1b609e5e2872e1e7 SHA512 4926f4bcf283e2afc3bd5e7340e3dda69c40e5bd45d1b9effeade05fc04595c0153e05f07b458013224c950feb967127520cf9c2ef6d0e303b7545f10e49a871
 DIST linux-5.14.7.tar.xz 120688920 BLAKE2B 861405cd1333958cb829017b6c1d6692a7256d179a48fad751bb02cd02ba09227ff210d9252c592a99d3820c1fbdcc3a6e133cbed31fdecb68ba9cf27dfc8f78 SHA512 ab1dd61a9e0e5ed82b38684d01fbc5c00fbf28acdd5ee754095a9fabe5a5fca7c220b37f80c2adbdd0bd46be461ded6397e40f7a827ea18035124f06756ad743
 DIST linux-5.14.8.tar.sign 989 BLAKE2B 2987fdf70a35ffbc5a8b63dd821f83e4eee25cea66518a41a91a48d22c5670f497abce18b94ca4a351122c78fd02c240a6a5fe9514873aa396ce2a79ddb83301 SHA512 ff7c67c99237b7f52942c54a9ee1f4a1272760232bb7e65d314484ad773d1fcb37070e404b458721e3d3d92f5849a001479a370c9bc3e5b5c72651ac33d1d8f8
@@ -43,12 +55,24 @@ DIST linux-5.4.150.tar.sign 991 BLAKE2B 6292a8c6bc16f62201d95a170e5df7b1edd9f33e
 DIST linux-5.4.150.tar.xz 109155076 BLAKE2B e34c474778d2ba1a619551fdb6c81be01ed0d155ab447bfcbe497c2258637b939fc1dda7d7161d8782e38d8c84e9fc94043d62a43698258594fdd6cfea8ac79b SHA512 5f6cc5852cb1e881027b8724920dd03b96f3ce2a58353ada6f7cf5bb0bffb3a8d4ded708f50963074ff41236e8c0aeaa7f81df0ac8e4f1147a7c4a0160c2c543
 DIST linux-5.4.151.tar.sign 991 BLAKE2B 26cc28a8ea886acbd2bf16e23be6e5368958a91f2e3d403ce7a90f94c427ffc05a3edb670367f4f3934cca31b0213b85743f98554fda6b1a7b50577cad90b391 SHA512 95fded48c138d70f5c7df0828c23b2575fed66fb703128b61e8f59de282569aab7f45bae6f2ba9f1dec256a96cda987023246b53f42102ac339b418b63e67be6
 DIST linux-5.4.151.tar.xz 109163992 BLAKE2B 12c2d24acab896ccf0d6edeea3d38fbfecda4621dddce4d5ef916b6face70a509cde8ae35ada5a65eb08c79afdbe4c84544a63e52c712d8d42682dd8559df296 SHA512 e210b9cdb47e5dc294688e23dffdd853bca96bdd613d6f476c291e1c949e185be2047735c69c01602c46d0bf767367975bf08b7b6976297b6a486529b0418982
+DIST linux-5.4.152.tar.sign 991 BLAKE2B 4ba252d2e4b245f6249dac83ca180ba48a3892262ebd5d721cd95e2ebbcae4b62fdfeb23d5cc7c15b0b52c9d6ad43839534a9fa2423d52c58a408cccb9efee2f SHA512 9aa21b4f04bbe79f06e5f44d4a6bb9a5e67946ceb6a0ae87693dd2ff4a2530e9d5f4d6fe051b8c62e28c49aba5a7cb984b44a427cc970d925cb762e3a611b821
+DIST linux-5.4.152.tar.xz 109160584 BLAKE2B 9fd0af5bb6319237471ca9dcfec8a5b8601dd4fc51e55ef9cfd956044ddafef0bfb017e2d19d277927c89b3dd1d1da09c10dfe88752b1032e5ffe81f331ce881 SHA512 183f70bb44ae2c8e0684b640fa733e9db5e0cf29e78bdd3156602cfc337f968ab308444f3671acff40ab674498d4879ded620c8f8c82a506f0d1512a24dace2b
+DIST linux-5.4.153.tar.sign 991 BLAKE2B f7b80216c2afaf39b8060df5f3a5323863bd0ed6b2591dbf210cb20bfe5d7a62adcd40e31d08c1f87012270f8ce7ca879bd14d65e439c82a58379e3da375ac79 SHA512 9faff3aceb0b2e18dc52185bd6e32ee991da98a26e8338f0af98934ba740871a8365c105b745c3dbf920eb1d0d28b7b093754685dea015ad97d71a3bdc842dd1
+DIST linux-5.4.153.tar.xz 109167756 BLAKE2B 850ea9fe0b25b4016edfe151bead709f5d1600dce0dca03e72adfbc6e9322d756b7b5bcb1143b4e2561e4c87daf2527c00874764b7a4f65000f38227c066c369 SHA512 63c937238dacf027ec9b78f62253b55731571101daa92b8b55d9fbf4937552372f296c80944216269271ee35214406ad63f4769fc29f3d32f60c2c73b76aad08
+DIST linux-5.4.154.tar.sign 991 BLAKE2B 39e97f6ec62f0828e6ac1b8a8eb3c09cfbc21424cd1698643782f23fe54b6beeddd9a0a6aa35750dcdbc108285094e4dc6063bdb90693cb84761a1df6b7bd5a7 SHA512 fbf2b02203170bb5b7e9a5878852fd90f4f0ba7cb2aa1bff9f4216ae00b606babb85d38ee422ec4deb63e7de7d80df8e39f8483482a75d3cb5b57f1a79aa511e
+DIST linux-5.4.154.tar.xz 109181708 BLAKE2B 87ae65ad680670a26d4acc93bffead3f01ea49af433a9270f057ebca7fb6a7151d8e9b1f32d532cf88b300bdaa3d9d1b8127e3e8aac25209eb776aa0aad67fc9 SHA512 098bc78f454ac37dc3113559cfc462acb912471784d281a9cecdb526411a54043b9b0b5cfe417c4ee8cd281bee0f87116b0b7ff39256cd0f5448fe5195d200f3
 EBUILD vanilla-kernel-5.10.68.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.10.69.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.10.70.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.10.71.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
+EBUILD vanilla-kernel-5.10.72.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
+EBUILD vanilla-kernel-5.10.73.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
+EBUILD vanilla-kernel-5.10.74.ebuild 2913 BLAKE2B 73f4bfbc33d65cabaf34762e6512d92a67735abecccebd91170ac7e9d3e925b2c3b127f8d27cb45a729e424c87ca0646668a9566f4f7a9a44724dc53142174b6 SHA512 2628599f32bed1adfc1e5d37883f0601c941ad2757bfd9c5eff839f5f9e0c7b5f3946213ac574f317be0fa8e5f4f17ae519d0ea33cd1680389c907485553e6c2
 EBUILD vanilla-kernel-5.13.19.ebuild 2911 BLAKE2B 3bd4c0c39d864d5f47bb3c1982678cafce6582f058499d37759cf0a7c6b3d9801dba32919336c32e09ae304e2d518471cf8d250c0b5c25e2b02603f8ac9b7f9c SHA512 1771f396d100988ffa05ea691cc1013c185bf75742f9b41aa114a23258855147693bcf383ab382582d6a8976883e887f11be64bf9c273c369c12eac467c6cc24
 EBUILD vanilla-kernel-5.14.10.ebuild 2911 BLAKE2B 6020b3ffa4c88d614a6e375991aabb5034ff0141310485f5e77d9ea6edb8cb02eed43960cb55e737f2baf258a29167064ecd97d5d9aedb2cd37eed681aaf7a30 SHA512 6660d9e55b1693d9be31d52d29103ab73cc9557196c776679d2ba8a5f7f5576a3305963449f43e81b7b4f3021a88d9e4ca0518fea1447f85ceb48670d7bc0456
+EBUILD vanilla-kernel-5.14.11.ebuild 2911 BLAKE2B 6020b3ffa4c88d614a6e375991aabb5034ff0141310485f5e77d9ea6edb8cb02eed43960cb55e737f2baf258a29167064ecd97d5d9aedb2cd37eed681aaf7a30 SHA512 6660d9e55b1693d9be31d52d29103ab73cc9557196c776679d2ba8a5f7f5576a3305963449f43e81b7b4f3021a88d9e4ca0518fea1447f85ceb48670d7bc0456
+EBUILD vanilla-kernel-5.14.12.ebuild 2911 BLAKE2B 6020b3ffa4c88d614a6e375991aabb5034ff0141310485f5e77d9ea6edb8cb02eed43960cb55e737f2baf258a29167064ecd97d5d9aedb2cd37eed681aaf7a30 SHA512 6660d9e55b1693d9be31d52d29103ab73cc9557196c776679d2ba8a5f7f5576a3305963449f43e81b7b4f3021a88d9e4ca0518fea1447f85ceb48670d7bc0456
+EBUILD vanilla-kernel-5.14.13.ebuild 2911 BLAKE2B 6020b3ffa4c88d614a6e375991aabb5034ff0141310485f5e77d9ea6edb8cb02eed43960cb55e737f2baf258a29167064ecd97d5d9aedb2cd37eed681aaf7a30 SHA512 6660d9e55b1693d9be31d52d29103ab73cc9557196c776679d2ba8a5f7f5576a3305963449f43e81b7b4f3021a88d9e4ca0518fea1447f85ceb48670d7bc0456
 EBUILD vanilla-kernel-5.14.7.ebuild 2911 BLAKE2B 6020b3ffa4c88d614a6e375991aabb5034ff0141310485f5e77d9ea6edb8cb02eed43960cb55e737f2baf258a29167064ecd97d5d9aedb2cd37eed681aaf7a30 SHA512 6660d9e55b1693d9be31d52d29103ab73cc9557196c776679d2ba8a5f7f5576a3305963449f43e81b7b4f3021a88d9e4ca0518fea1447f85ceb48670d7bc0456
 EBUILD vanilla-kernel-5.14.8.ebuild 2911 BLAKE2B 6020b3ffa4c88d614a6e375991aabb5034ff0141310485f5e77d9ea6edb8cb02eed43960cb55e737f2baf258a29167064ecd97d5d9aedb2cd37eed681aaf7a30 SHA512 6660d9e55b1693d9be31d52d29103ab73cc9557196c776679d2ba8a5f7f5576a3305963449f43e81b7b4f3021a88d9e4ca0518fea1447f85ceb48670d7bc0456
 EBUILD vanilla-kernel-5.14.9.ebuild 2911 BLAKE2B 6020b3ffa4c88d614a6e375991aabb5034ff0141310485f5e77d9ea6edb8cb02eed43960cb55e737f2baf258a29167064ecd97d5d9aedb2cd37eed681aaf7a30 SHA512 6660d9e55b1693d9be31d52d29103ab73cc9557196c776679d2ba8a5f7f5576a3305963449f43e81b7b4f3021a88d9e4ca0518fea1447f85ceb48670d7bc0456
@@ -56,4 +80,7 @@ EBUILD vanilla-kernel-5.4.148.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935
 EBUILD vanilla-kernel-5.4.149.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
 EBUILD vanilla-kernel-5.4.150.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
 EBUILD vanilla-kernel-5.4.151.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
+EBUILD vanilla-kernel-5.4.152.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
+EBUILD vanilla-kernel-5.4.153.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
+EBUILD vanilla-kernel-5.4.154.ebuild 3073 BLAKE2B 6038d04284e4343059e7664c466935a0a022da16a8da1c65e0a3077f87374f6aa61b38e1d5af8ab33f3c4c7e9ea5d9d2272f80348e05574d84f7edac1d7fb865 SHA512 8497553ccc9b2961a0b8f4ccf082106d40ebb6bee06658489523eb7670f313cb3a4ee0ad27a99ca113578f784c6d7ec9c63b39ddbc414c74ae2c12a088889e9e
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.72.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.72.ebuild
new file mode 100644
index 000000000000..12c958a4bb2d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.72.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.32
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.73.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.73.ebuild
new file mode 100644
index 000000000000..12c958a4bb2d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.73.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.32
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.74.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.74.ebuild
new file mode 100644
index 000000000000..12c958a4bb2d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.74.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.32
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.11.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.11.ebuild
new file mode 100644
index 000000000000..d3a06ae09749
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.11.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.14.6
+CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.12.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.12.ebuild
new file mode 100644
index 000000000000..d3a06ae09749
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.12.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.14.6
+CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.13.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.13.ebuild
new file mode 100644
index 000000000000..d3a06ae09749
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.13.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.14.6
+CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
+GENTOO_CONFIG_VER=5.13.4
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.152.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.152.ebuild
new file mode 100644
index 000000000000..dc33930084ad
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.152.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.153.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.153.ebuild
new file mode 100644
index 000000000000..dc33930084ad
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.153.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.154.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.154.ebuild
new file mode 100644
index 000000000000..dc33930084ad
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.154.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 5f3feb29f2b5..e2c33b86f5a8 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -3,23 +3,20 @@ DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c03418
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
-DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST patch-4.14.249.xz 4462060 BLAKE2B 58c4f2ce3bdb9b83e6f0770b2b94a77a80394b45b990b6cf51cca5402b90d0b24280cb7ff0de1118107de3be8d01eea174bea7e1de1636be7c110f3e8d5bf1cd SHA512 8aac9ef1bad6f19d4ede63444101b2ff2d2eeaf9752c9e6f1044745a24d08d79b628b614caa936a736ff5a8b8544e07bb332a1f70f815564cdd28bcf8bfddb71
-DIST patch-4.19.209.xz 4275724 BLAKE2B 0bc107020f736173845b5e8d5f5968150c2fdc6dcfbad99c5af137c342106a299acf95e2df605acc441c64c181190acbfeac3dc9d5bee8a86d5de1a113898cc8 SHA512 10bd5f2fee2dba15bf39a3702fefab5e3639e50334ab1120177a9c2c8a49c9135c690ec18a4f990b98e2ce5e4a7291a1b6a6aeb005d8909190c3b4f5b603dce1
-DIST patch-4.4.287.xz 3661120 BLAKE2B 1674632d537586196761c5ce61c7ac12378070268241ce46ec0abb67086697f6e1ba5e8a8ab645a38481f3a095d097450fce0103de474ad9a0832892e5f6b4dc SHA512 5957ad8ec4523338e0412b55075cfcadc8d3d777d4e2ec5dd1d48e944bbf657ccc598178ce05fa31d161b19d6bc81b8d7617f760588ce204c193f313028f0da4
-DIST patch-4.9.285.xz 4109404 BLAKE2B 7e75f1259f3c198ccf91ea93074b60e35ca1a65f54d74d63b239c1c013ea54444b98d7b52d9383091932accb6a1cd67d6045e79d1b700b5d89492024aa06414e SHA512 b72bdf5ba28e0ed40e560d5e4d7bb0d105472992cfaa5705a8cf624a1b10ea8bce44622845099269817cf7632d426daabc08cd10f51dba81f974787c3c185310
-DIST patch-5.10.71.xz 2194668 BLAKE2B beb4804792c381ef5b73ebb92d73daf1b5e1be143a8c78aa9c417b0a8f4c0fd5a1247186babce891aa6dad069c4557469a9d17b721b29e9e99d35dd46ee4b559 SHA512 e2828e2c811a1d3fea892873113bbbcabc02c6de104d62790c0dc23c24c601942d95902b52da829cc2af5d77facb95b40a0d5d5a752a231bafd8684f403b1f64
-DIST patch-5.13.19.xz 917200 BLAKE2B 5f467e1bd880708e82971b6b1b586baab8b2fe77639a29df1a256317d6b894ea8cd78cb2b72da96e5fabf8bc96bf39dcdb366360af3586336ffcaf0aa57970c7 SHA512 1d3695ee5f623a0b27c4c9682541bf096a75310a4fb3a3d76b3c513f95b244679b4950040e9f1261dabfdd5cc908ba37a639556974f634fd4476f52ce5e5a573
-DIST patch-5.14.10.xz 434948 BLAKE2B 39150e6bc5a4435b6d53cce18bb4a83cf1675cb53136039d992ecd2c8ff245363b83e83ea692be04652e6a9a69ad7b774c116fc9108bf9c95c0a5d443bc85e6d SHA512 3e6eb70b0400ae59505e95ead704daaab4b2ffb584bfd59168c9df2b53cba4838e45e235ee184fb9631be84bedf28ce2866ff686e70a8f22dc2c7d1d92f537a7
-DIST patch-5.4.151.xz 3398680 BLAKE2B 500327225456d005e7951006a7320f849c6fff4efbce75f36f3285d60a3ac1d04ed59bcd023359a08c966e830bee88e2f6c4f350d1afa89f7369219da8632e8d SHA512 21c70607faa2b253f554ca13e2ccbf9e1ae73c309b490d241be1326a972721d60b2d142addb7485de1b871b0724a875efa686859346e20bb2ca38b581bedd4e0
-EBUILD vanilla-sources-4.14.249.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
-EBUILD vanilla-sources-4.19.209.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
-EBUILD vanilla-sources-4.4.287.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
-EBUILD vanilla-sources-4.9.285.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
-EBUILD vanilla-sources-5.10.71.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
-EBUILD vanilla-sources-5.13.19.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
-EBUILD vanilla-sources-5.14.10.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
-EBUILD vanilla-sources-5.4.151.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
+DIST patch-4.14.251.xz 4468952 BLAKE2B f7f5ac471d2be76cb229839f734e27285cf507d53acfedb2f731085774fb0cc966a4924b8459d0904af2c5f4afe7ad0eb9481678074a56b2137ce57a596adaeb SHA512 c82e3aec6e99b023f71e0b8fa71c82e342f4a830732cfdf633f1ef134093975cd5a5e81c046e058c9ab639c298ae271ebaebd53656c91b54a6f8aed752b97272
+DIST patch-4.19.212.xz 4284024 BLAKE2B 80ad2a9eb1cc2dc82ea4de2808c2a8e553a059673939824c3827c361221ed0efd483a4ceb1dc9787b2b590f7d98053d5a7c125f371e2c35c521cd60bad81c538 SHA512 9530a1cdc4df975b03f762a2264370aae0a6f430279b3c44edbf8bd22804c592bee99a2502adf1931bdb7be57ad7e069cc407081d6c50dd2de5cb4c9bb4cca65
+DIST patch-4.4.289.xz 3665240 BLAKE2B a0a32c0f23dd956509037f7f72d8e017d6cd2366c33878cc26648bb34a2018e33da03b5b898f223299dc96dbaa1a908d9510f15ba587333a344ea0e3bbd02fe8 SHA512 b4c19b8cab3cc772a0459f01f49f841351fd70d9316a52f17a5fd45cb8a168d8ffe0cc4ad804d19cb34c32596006d8834604a5932bb80ea667e993087d44248b
+DIST patch-4.9.287.xz 4114228 BLAKE2B 23593cd1cde8dd2e25663746174c8ec889eaac2c22b2de22e8e58b50cc334fdb9a03b72c5b94b41fafb14dc8421433a6089ba8f4d6cc8401ed9b9226767e13d3 SHA512 0beef0dcb97e7ec9e983c0e636bea1b7ac420f49c92977614993bd37ac89cdf9b6a486a47857599da36ccc71ebf41b8506df0872718a6517db6f67d329e04b95
+DIST patch-5.10.74.xz 2219416 BLAKE2B 24a8230c30dce6062b5a49103418fcc060bc27d12256aac65152e27242c0becd0325af8e5f8d84909d27ce3c4d2d4acf132ec8efc32ad68fecd1e2418e3cff6d SHA512 3d2625379aea1738612166190c7480db79e15d7a66c32a7a794985c0da2b46965e07dab194ebf0d3441d9c80e6d47dd45b752097d52f135921fa7ac1279dd2af
+DIST patch-5.14.13.xz 497216 BLAKE2B e51417dced941cf9e38e8410ca0220a9e75b901aff04cdc466f4f8cc50543b9a89d8f3a992eb935bf56a1592b596d33987461a2a27e5eef0ced858ab5036e9e2 SHA512 d1925f0f9911edfaf769ebce775afc67ae6b9a99eec557588712bf26b0b65b2c6e7359e12e033e1b1e3556af2ac820efb802b2512b44c2147459806f603407de
+DIST patch-5.4.154.xz 3419760 BLAKE2B d67193634055eba94444c384c624f70189c7dcfce7024f54312be3239f0215c2687e04568359d391700e8b7892a41f56c9005b42ce9e384996c85f976164c32d SHA512 c6b906a73db666255c0cefec4ed5651ee5f7383d9c5b8696d73f2702a3cb43a5373b7b8022b13cd4d86fb48b3dfc57a25f370916b6b6aaa003c7429602894eb5
+EBUILD vanilla-sources-4.14.251.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
+EBUILD vanilla-sources-4.19.212.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
+EBUILD vanilla-sources-4.4.289.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
+EBUILD vanilla-sources-4.9.287.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
+EBUILD vanilla-sources-5.10.74.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
+EBUILD vanilla-sources-5.14.13.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
+EBUILD vanilla-sources-5.4.154.ebuild 426 BLAKE2B 694cfe2eefb0f81dd4882e3d2df08b135d496b373e509692ca59b7317207f79af0c6367c3c15d77589226c9d987ba07907f7b736a97ec9fdccb334a7160d7be0 SHA512 d502001a362c95ed9e7c62298209085327cb0914c858309103fc8702b0c5758b061b41fdbfd70f1343bd5e03e687e67a5653a58e69ecd875831782f12613d751
 MISC metadata.xml 517 BLAKE2B 2871be490050fb99de129f0abf368bddb5e2604d2e1b63fed36ed19a07987f88a82c5aec08854f36755f017a4a5a961b5d247e15ded1900e40a4ad913b6233a5 SHA512 1bb6d299efadf5d251395a0c57a27e254e80ea193fe2b9bcf29c582f32e9067f9fe263c24853a0b653d0365957aa0268cc7150a6727e1e199af487d951959a1e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.249.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.251.ebuild
index ca1945d44eab..ca1945d44eab 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.249.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.251.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.209.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.212.ebuild
index ca1945d44eab..ca1945d44eab 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.209.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.212.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.287.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.289.ebuild
index ca1945d44eab..ca1945d44eab 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.287.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.289.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.285.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.287.ebuild
index ca1945d44eab..ca1945d44eab 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.285.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.287.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.71.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.74.ebuild
index ca1945d44eab..ca1945d44eab 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.10.71.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.10.74.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.13.19.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.14.13.ebuild
index ca1945d44eab..ca1945d44eab 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.13.19.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.14.13.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.151.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.151.ebuild
deleted file mode 100644
index ca1945d44eab..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.151.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.14.10.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.154.ebuild
index ca1945d44eab..ca1945d44eab 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.14.10.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.154.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 411d6056fb5c..6f28e8b87320 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 36772196c901..b277e8723112 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,10 +1,10 @@
 AUX gdbm-1.18.1-gettext.patch 444 BLAKE2B 43496bf0e950e1af452439f881bca4fe5e318717c27692639196884405b0b6ed8e32e056afeda2040f651d26ff1607e69e7f482d023c2b98b7c080b67f3392b2 SHA512 fd033d7de3a1bc53c10115fd27d7001ce1b376126c11f934adf8a25c9df195754835fd707f40c540539553c091fa196115e02bb56cc41702a12a1d4fb1724a52
 AUX gdbm-1.20-uclibc-types.patch 397 BLAKE2B 35357a83086cb3028dad05622d66d0500e94796441de167260475c9159d4a67c1730d7e2db1a4686c3cc757d678c5a0eb7061d61bb43403319cb074f3a0d74bb SHA512 10e2bd4c6d4055df067e63c9d3e2fc6837bfd58f44d4e6ffa827272cbe95fe33b59db7791c44510a26f0131f8b58e19e514402f687418eb30d810c45deffe505
-DIST gdbm-1.19.tar.gz 967861 BLAKE2B 92a1a9c461c763b01d7abced58800aa8db200ae746240c8ef8079a615d920efe95f0d805a8cfa63d8aa6bcbda637bcb07d98d630f58de5678b7633c3fcf6bf9b SHA512 118c5b8cdf74898bfb7c2100302fedf80096be017bf08e80a44486563cad5d93b93567622f2e7c7aceb72f30460504bd0b4ddfccf34df994ed65166e12ecd495
 DIST gdbm-1.20.tar.gz 987628 BLAKE2B b0e01e63714b0485f9ac28f4a2260bf9309d2b3a87f6ccf6c9901619d383b6527d068b8614220eb6a6dec909fbf3fab5162a6c67bb928cfedaef36f1df26d0df SHA512 5f2fbd4318259e5b879ea2bff09e22defbb4e566ebbe11c44ac5b5369fd00745d7ed9f72ec1206153027eba245c4ee4a515a8ec6d67f84ec477483e72753590b
 DIST gdbm-1.21-gettext-ac.patch.gz 7142 BLAKE2B 1cb4eed1dbea047e115b13831ab2c6af9b639c48324c83b60ee926e7731a4b59fb779aaea8508d12fd5e5d64328464768a153135a555c1783086e4d1e981d86f SHA512 714dc008b5d5a5882f13c8bfc889e04a0b2c142a06ffe479f3ba3b21e8d6f08f579d1b111237ad9e1987d9aae27f67b4689aa3cd664c2adadb1bb856497ed3f8
 DIST gdbm-1.21.tar.gz 1005982 BLAKE2B 1f9b04507601b9660a9a81edc29e9b7c0d9adececf21e372670bcf1acf3d0551d858af3e7cf9202b460691cc851ca6dfcc5014ae28161b06f31c9442d3a9fe96 SHA512 b2a31802d1af9f97b24d3dd01cb048bab4a8e748297f1b70851c0342400dde4281242b7f80bd92a36035e22398d240d131b550ab444ee838a077522a6921fa43
-EBUILD gdbm-1.19.ebuild 1316 BLAKE2B 93f38c5f423af1033a05b2225589ce5643941b7bb158b9369d58494356333017ce0eea2e74fdd64b2beccf6754bc192729bdaab24ae703be268fc61ffdb757f4 SHA512 2198bd55c2d87547d3fa4eed0893947b6e33c11299bcbeca744c45c5df5ccb770a66c441c717d3b908e5d72c2a5ce4d9842e962f82bdd2d86b40fdc519724f69
+DIST gdbm-1.22.tar.gz 1090100 BLAKE2B f27c65e8cc7c71fc4f4a119b92e1d1b2068c1ec87456d5a555879dc23654ad4e7cf8172049aa9f4f9c432cc7140ff61fc36ddf6d5e45c321add67a105754a59c SHA512 67461fc4f41e825d0134175ff99c913ccb4aa7ea3d0f64f32bdedbc7677b3ecabd2c525ac6b2ee47a9561e002e4224e492b72088d57bb4862a1f8c089521ec51
 EBUILD gdbm-1.20.ebuild 1381 BLAKE2B 230dad65e7f400ba7afcaf99c641eb2129410fd7c520665515e0732c61485ad4cc30990ad1cefafaab1817c50ebd29c167487ecbe04e71311dd86d0c9d677907 SHA512 ddb05fa235a592c9e358920cd2822d5773b81e9219af10c8d336aad86b76e07e0deb858760922c82288a791d853de1d4adedde982f6670d2183e169e416cffcd
 EBUILD gdbm-1.21.ebuild 1358 BLAKE2B 9a315c2ea0cdb2bcc47b6d84c01b4a777e285ba9a05bc9c9f0bc45b54af8284ed1b105cc9f9c2d2e3cef7a0c1709d8f5da99abf429c094fdcc74542e52209341 SHA512 67c5bea17da109a18928146ef3e4dfdde2669b9429c9c6c729c17fa312547c02afc492083ddaf94b6a553303db965d572607a8a63d2204f81695f32e02496258
+EBUILD gdbm-1.22.ebuild 1210 BLAKE2B 4d53fbcbf1bb4df12765408dfbacb774f3120cee4455c012be4c00a6809e0d2e4c26753575428ecab081a032020a764743fe870631d8cea65b4cb8b4e18aac37 SHA512 ada4f244fc28a2aab215328c22b4058fd865e6491ebfe9cfd14c953ac73fcfbac9b117b7a36a1bcb8bf32f5cf109dacbb87caeea1891eaab34df9fdc9070fe7f
 MISC metadata.xml 360 BLAKE2B 4133eee8e152f330b954a1bcc947747364b73301a0bbb5c26cc88f8d53fa816a8b16e34b06a79859a19975bf45761dbc8bd73b6b6a875587d63624ccd737600b SHA512 5f8de97ceb589c6db119d81ef7e662042b288d2fca0ab1d1f8fef714dcb2087cf5f87ade607f7a18790fba02579a9ec5a84edb0482c83b7181e7836d108eb9d3
diff --git a/sys-libs/gdbm/gdbm-1.19.ebuild b/sys-libs/gdbm/gdbm-1.19.ebuild
deleted file mode 100644
index a6fc57b2a1d8..000000000000
--- a/sys-libs/gdbm/gdbm-1.19.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Standard GNU database libraries"
-HOMEPAGE="https://www.gnu.org/software/gdbm/"
-SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/6" # libgdbm.so version
-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="+berkdb nls +readline static-libs"
-
-DEPEND="
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.18.1-gettext.patch #696838
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# gdbm doesn't appear to use either of these libraries
-	export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
-
-	local myeconfargs=(
-		--includedir="${EPREFIX}"/usr/include/gdbm
-		$(use_enable berkdb libgdbm-compat)
-		$(use_enable nls)
-		$(use_enable static-libs static)
-		$(use_with readline)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-	mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die
-}
diff --git a/sys-libs/gdbm/gdbm-1.22.ebuild b/sys-libs/gdbm/gdbm-1.22.ebuild
new file mode 100644
index 000000000000..ea2981b0de29
--- /dev/null
+++ b/sys-libs/gdbm/gdbm-1.22.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Standard GNU database libraries"
+HOMEPAGE="https://www.gnu.org/software/gdbm/"
+SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/6" # libgdbm.so version
+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="+berkdb nls +readline static-libs"
+
+DEPEND="
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+	# gdbm doesn't appear to use either of these libraries
+	export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
+
+	local myeconfargs=(
+		--includedir="${EPREFIX}"/usr/include/gdbm
+		$(use_enable berkdb libgdbm-compat)
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		$(use_with readline)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+	mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die
+}
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 238a7df5754f..2dad1efe9f90 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -4,6 +4,6 @@ DIST ldb-2.2.1.tar.gz 1676819 BLAKE2B 794575d5bd7d33dcd586cb5de6c392411795c467f4
 DIST ldb-2.3.0.tar.gz 1686378 BLAKE2B b31949e14a41f6fc99ef022e4072021d135037d835aeca80ee81a58ed20cab4f8cbd96e394f59460df11e2424e2e263d5fb01b9cebbfb4ca1bcc77162e93ed3f SHA512 7e389c0b4700a809893276d69216436ebd6d30e1f52407e4a08a1113cf14e151aed74300d8c36765c91c8f3195d8054b13a28cbdfcab031f88fd1d353e415348
 DIST ldb-2.4.0.tar.gz 1689484 BLAKE2B 904d74900011ce3f63ad1c24fe88b1a090e835c68829ddfda5e8af2c0ab3674d7a8cd9a62b95c1f38f26578d0704556d3562e46e21a54cbb44a15b9d83676521 SHA512 6c500b723c081488bc0717b6a5b0e8966c5d8a751232f8856281a6fe4d358ae6b5878c8400a82fa666379066105fbb9259b2967313e73efabef0e1386095e2ee
 EBUILD ldb-2.2.1-r1.ebuild 2932 BLAKE2B 004dc7b83fcd5705135df1e4848a49296b75d850152bc41bfff56ea1c352fd4a0e4f6074a0b96a54576e594b1f8f79ad669a22f39390b90489654180665fcf1c SHA512 8ec5dd9111c238dbad97e0a1ae1f0ebaf90a4e8e083dca3946e597a7d28922ae72ccedfa3e9b6425a997a3f2d21abf7c407231808415076b0dfc2126d47cd164
-EBUILD ldb-2.3.0-r1.ebuild 2940 BLAKE2B dba1ae6ec790b727daf4c0879b1cc7199c91b19f4c3c3eb79bc67af1033121ae16ecfbd150e32a2b0359ac9b8bcec9621293143936642dd2cee9811cbbfe7947 SHA512 20f84168ff48765067c0217ff158afe19c2b399e7713e601d55d6c5377cd3b813ca3a1cfc2dba46835b163eb235704bca38a2643f19b8aaeeb8149143f4945f1
+EBUILD ldb-2.3.0-r1.ebuild 2939 BLAKE2B df5bfd3655a2e69311efcd256bd821eba1840a10dec3ebbbd52ffce44740495d1ff8082b561852db8eb93f27e28660f124b97c8ed5c164d23fbc56f3dd056aa6 SHA512 5bb570a204d962df72c8152c647f085dbd91532149b1b81478c7620085e27ebff1bc83061b3a4bae8fdc268d0ef009b4618c4cd50e42180a6cc05c7fb5dec242
 EBUILD ldb-2.4.0-r1.ebuild 2946 BLAKE2B dde6e4beeec5907b3e32cfbc675bbd08d1f52081fd547d58e30b490305000c36be8a8d55b3daf9ad8b21edc8c7bc90fbd8984dad1bdff90273d1c66b3eb0b0ab SHA512 9994c7964012f99db5c6d2972e6e0a750a3632fcc25d0a6435fbc42bea3b067f8853efe018f7b9e25ea41420f9de325aff1c2e42fae8501c3ec314a9f2494c04
 MISC metadata.xml 526 BLAKE2B 004dbbf0286ced4bcd404eb3caf091f973e67e00b9230d2399f07dcb31d93a423045b353c1813958da151cded2f52996608de1b4294e3cb90cb8da0ac8877f9f SHA512 9f8008b5b57e5f73e79df68d828f1644edb0a154fa97504c3088301aa60e6ba3ac83a2e06d55d14c06cded89196dd635598f1d767ca93398cbf9610af3b49038
diff --git a/sys-libs/ldb/ldb-2.3.0-r1.ebuild b/sys-libs/ldb/ldb-2.3.0-r1.ebuild
index 4fe02c1a60c9..31a2105b4c36 100644
--- a/sys-libs/ldb/ldb-2.3.0-r1.ebuild
+++ b/sys-libs/ldb/ldb-2.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc ldap +lmdb python test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest
index a13a6a89f379..860f9b4c776b 100644
--- a/sys-libs/liburing/Manifest
+++ b/sys-libs/liburing/Manifest
@@ -1,10 +1,11 @@
 AUX liburing-0.7-ucontext_h-detection.patch 1920 BLAKE2B 0a360811328eb19f0b0a37725cad95879faf5664966351544f290fcf8cabbc2d8d66592ab6da994f3232ec4275717019543044c1592827c0e2b9c07f337707fa SHA512 4a32e8825b805c47778ef32a636fde984e1648cd966f49309e5f3b63511afbdaeb723ba245ffbc4f7e7589f1a0ee98415f4fe3815ddd0650ac9fba2b0ae2780e
 AUX liburing-2.0-spec_version.patch 995 BLAKE2B dda31830765cd4bb8fc0e178429b4e632c30e2c212a04ae0849fe4cad09a91b299a3c177d62de0939fbaa269e2d8895d60fa356952f1ac797bda340a5b1ae01c SHA512 4b22e6e1cc24ee427bb162fc1bf58e4509709deabad2a9ddb156abdbd1a094086520c5786f3f2a9c047bf4241518f88308d588b542fec292837bf23d79d4aacb
+AUX liburing-2.1-arm-syscall.patch 1752 BLAKE2B f2f27e9ff6f86b75808d99a0e89e2c8609f481ba3ff1f908b1f2ec670a5ab5518ea990ff4bc24506f5ce6f6d8e1083ac7e3b0aaee9d72a8fb5bc3d4577617309 SHA512 04e1c92d6b399f046c500ff3a7d78990682e60df3994431977f7a01bea0fba0fb1dea6e66340bfd79869fbc2114f4e9a9eb391ed26d81a3041accf78141fd158
 DIST liburing-0.7.tar.bz2 86386 BLAKE2B a4fa00cc8e384f9909f3c628d479774beaffd5ab09c9f321ef22bfbabd273e4c8d4dbb30a3280633e89e1a79e893348e68f0aa2f3b1b4deda56759f77d9b1875 SHA512 9a23bc08e0fa59273264295859dddbe3276b2911df6d937b3c6f7647a250a3175222b5f051f3094efc98e48cacd242511327c5c5b895ebde10c8c87929ba4328
 DIST liburing-2.0.tar.bz2 109066 BLAKE2B e2be57f66d2a40650c74502bef55e646986443450b2cdf4d2b5247a3fa099178ae19e61a20e4452dc723351053b613a96743f1268004939da9fddd8f38df3fa5 SHA512 a0da3472eb876c9cfbe56abe14b4d926e4d1c362ee9c4f38eec4c4ab01edab6d76651ffe2afe5cac8589caadc02517950974332eb7990f8bcc9f4f4800b66e33
 DIST liburing-2.1.tar.bz2 120806 BLAKE2B 3a09d1504150ed1c111f064187d868fd86ec7c3dbf661f73999f7fbb9c945b528f7ab2e0cfff5d270a1a977f04deedc7c790b6df8708ef2884fbf28c1a9ffd1b SHA512 a658454869b01752b5e499c4f0b50c342a8ff63b3dd1a473a96f9fad03f22a6e4d2354b0e658a4e7e50ea27440a84ee274856b3687803583bc80cb4bc45aec71
 EBUILD liburing-0.7-r1.ebuild 1284 BLAKE2B 70202e46fdeced14f4f6b2f931191af8108225fb74e771630b633cfc0f8e90efadc6013e4ff16cce9e4e1211ff2bfca7ab6228c88bf0c9bc4ff49b61a39c7fad SHA512 c09d8936d6a0955d541e3b02e7d6f0b5a76e54db4c175a549e8b5863df79a27a299d1b0badf3a45b8fe936343f20f921c52ba72464228372c0599f2db915a16d
 EBUILD liburing-2.0-r1.ebuild 1293 BLAKE2B 5c377b39f0f8297f227b84453ac0f909075d4f5f37ef3feea19c1178d3bcf383cb2368acce1d6f52753799fe74ffa708c4aa7266200e715b10149193ecb69138 SHA512 cc9c46893838fa836cf5c3e45c669545522a3e6bf10933bd5ca94af9f7169f61081824d15aa36636c2e3cd52fd4f8fc1fc7c749b81c9e3940e05bdfcf1fd9a02
-EBUILD liburing-2.1.ebuild 1235 BLAKE2B 9d64187cadaa2fe0f6f67a8640fe9d6ce3a545e3810493efbb62d1b2f27d7f293dc01ef2fda2b474be9a46d76675c328eddf25e7b484e592d3b41f149a0a65eb SHA512 7434cdcdf2b0fc93ae81d8f63ccfd237f4ad454c017903f9a0e741d37069ce3932baabd97d80913f3cc9fd10c68c30ca1d59c3f0933eaf79c05bb2abef381202
+EBUILD liburing-2.1.ebuild 1311 BLAKE2B f2cc49c107b20dbf0fc61b94e80f3c369a2e41a367128608ff49caeae0abb0b966b13156d37beb637c36111241eeb49fe9778e06f1054b3045ced22b2c30c971 SHA512 9277b411c2ddfd71a1dab8519c4f4ceb57bd8ef9b5f61659ffbcadc5e9bf25ff78e264bfc0d200c14d561cd511d125d66fd5e356688fee21d1a86d9c835b22b3
 EBUILD liburing-9999.ebuild 1235 BLAKE2B 9d64187cadaa2fe0f6f67a8640fe9d6ce3a545e3810493efbb62d1b2f27d7f293dc01ef2fda2b474be9a46d76675c328eddf25e7b484e592d3b41f149a0a65eb SHA512 7434cdcdf2b0fc93ae81d8f63ccfd237f4ad454c017903f9a0e741d37069ce3932baabd97d80913f3cc9fd10c68c30ca1d59c3f0933eaf79c05bb2abef381202
 MISC metadata.xml 331 BLAKE2B 4466b3a5d60709f68985e860c920b53fc59d3a06c1110876ffa31edc80fc69305f2221ced9b60ef44d4ab77e1209aa9f2f7cf4037a2d411f9f31885baa55a73f SHA512 977da0c23dd070b8dc35c569993e3517c7b236f8dac5cf9ce7fcc16a77550cb58ddf9c9a3139835be48e3a3c82dc86efe4be304c8784e13f82b6856c7331d96d
diff --git a/sys-libs/liburing/files/liburing-2.1-arm-syscall.patch b/sys-libs/liburing/files/liburing-2.1-arm-syscall.patch
new file mode 100644
index 000000000000..a652b052148a
--- /dev/null
+++ b/sys-libs/liburing/files/liburing-2.1-arm-syscall.patch
@@ -0,0 +1,54 @@
+https://github.com/axboe/liburing/commit/cb350a8989adbd65db574325d9a86d5437d800da
+https://bugs.gentoo.org/816798
+
+From cb350a8989adbd65db574325d9a86d5437d800da Mon Sep 17 00:00:00 2001
+From: Guillem Jover <guillem@hadrons.org>
+Date: Mon, 13 Sep 2021 23:56:08 +0200
+Subject: [PATCH] test: Use syscall wrappers instead of using syscall(2)
+ directly
+
+Some of these syscalls have different entry points depending on the
+architecture. Use the wrappers to avoid having to reimplement them
+portably.
+
+Fixes build failures on Debian armel and armhf builds.
+
+Signed-off-by: Guillem Jover <guillem@hadrons.org>
+--- a/test/sqpoll-cancel-hang.c
++++ b/test/sqpoll-cancel-hang.c
+@@ -4,7 +4,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/mman.h>
+-#include <sys/syscall.h>
+ #include <sys/wait.h>
+ #include <time.h>
+ #include <unistd.h>
+@@ -29,8 +28,6 @@ static uint64_t current_time_ms(void)
+ 
+ #define IORING_OFF_SQES 0x10000000ULL
+ 
+-#define sys_io_uring_setup 425
+-
+ static void kill_and_wait(int pid, int* status)
+ {
+     kill(-pid, SIGKILL);
+@@ -53,7 +50,7 @@ a5)
+     void* vma2 = (void*)a3;
+     void** ring_ptr_out = (void**)a4;
+     void** sqes_ptr_out = (void**)a5;
+-    uint32_t fd_io_uring = syscall(sys_io_uring_setup, entries, setup_params);
++    uint32_t fd_io_uring = __sys_io_uring_setup(entries, setup_params);
+     uint32_t sq_ring_sz = setup_params->sq_off.array +
+ setup_params->sq_entries * sizeof(uint32_t);
+     uint32_t cq_ring_sz = setup_params->cq_off.cqes +
+@@ -135,7 +132,7 @@ void trigger_bug(void)
+ }
+ int main(void)
+ {
+-    syscall(__NR_mmap, 0x20000000ul, 0x1000000ul, 7ul, 0x32ul, -1, 0ul);
++    mmap((void *)0x20000000ul, 0x1000000ul, 7ul, 0x32ul, -1, 0ul);
+     int pid = fork();
+     if (pid < 0)
+         exit(1);
+
diff --git a/sys-libs/liburing/liburing-2.1.ebuild b/sys-libs/liburing/liburing-2.1.ebuild
index 6d65622e2a7a..dd13ba0d9ab7 100644
--- a/sys-libs/liburing/liburing-2.1.ebuild
+++ b/sys-libs/liburing/liburing-2.1.ebuild
@@ -21,6 +21,11 @@ IUSE="static-libs"
 # fsync test hangs forever
 RESTRICT="test"
 
+PATCHES=(
+	# Upstream, bug #816798
+	"${FILESDIR}"/${P}-arm-syscall.patch
+)
+
 src_prepare() {
 	default
 	multilib_copy_sources
diff --git a/sys-libs/pam_wrapper/Manifest b/sys-libs/pam_wrapper/Manifest
index 50e4d38a2032..9b9d9824d563 100644
--- a/sys-libs/pam_wrapper/Manifest
+++ b/sys-libs/pam_wrapper/Manifest
@@ -1,3 +1,4 @@
 DIST pam_wrapper-1.1.3.tar.gz 118034 BLAKE2B 3c05e74959f3c6dfd35575cc5f9187f4a328bfd7ce002e327fc135c82a4ff1513add87678360992d2010c124f7fd95e4bdb3c0a4d63418d9711069cbc200e417 SHA512 3b7cbd25ae7dd73f4a0c64a7762cdeb38cc7ba6e8b4e18e79aceffea09241d520aa884de88e4105b5957b2b18ec682be6568a6bfccf82b9354a3510cd2cd98eb
+EBUILD pam_wrapper-1.1.3-r2.ebuild 1768 BLAKE2B f37023a08920228d9f3a8b1b52a84ddfc8a9ee094b48adf3a8df665f6f26aed0e5cb1047a994ec99dc6ede2b8576ab0368e6da227a73797d3e4d3af919f98d5a SHA512 2f19017f4bf6be4f73e8c660fab21a1ae284c2d794233abb157aa0cf8ba43c3a50c84a629634490fc75b7589c8bbff2b8cef8748238180f1c2896de63ddc13c5
 EBUILD pam_wrapper-1.1.3.ebuild 1107 BLAKE2B c7c5c853f9a1afb50dbf13cb3ffbce7cf53e8c8dba0bcf18e58ea54357c8e4a34e464e6d920d4d86e28a76b345f350067f7a9392f20f4d07be2fc354a6fb9928 SHA512 565455f3861d0b67f6cf68962816f9059002b37bc66221903f4b5e5555db0d3351323b2de3e5bb372b92ba0c4095a4ab1daf1209234243d93b5c3e8905a8855a
 MISC metadata.xml 250 BLAKE2B e398673dd1a3522ccddb89a82a53fc2578d8e0777ec46f889d01d618609a22958d91699beef513c7912799e0e8ff985200f7c67bba941235da25c24cd4b48f09 SHA512 16834c3cbecd0dd5a9c8c311d2b8ebc63d8cd72c5891498f4f0048988993c104aadd4e24e632bf54071c11f810716432e89e4afab029555875f9f52794daa6e9
diff --git a/sys-libs/pam_wrapper/pam_wrapper-1.1.3-r2.ebuild b/sys-libs/pam_wrapper/pam_wrapper-1.1.3-r2.ebuild
new file mode 100644
index 000000000000..651440322594
--- /dev/null
+++ b/sys-libs/pam_wrapper/pam_wrapper-1.1.3-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib python-r1
+
+DESCRIPTION="A tool to test PAM applications and PAM modules"
+HOMEPAGE="https://cwrap.org/pam_wrapper.html"
+SRC_URI="
+	https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
+	https://ftp.samba.org/pub/cwrap/${P}.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	sys-libs/pam:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka[${MULTILIB_USEDEP}] )
+"
+
+multilib_src_configure() {
+	configure_for_python() {
+		local libpam="${EPREFIX}/$(get_libdir)/libpam.so.0"
+
+		local mycmakeargs=(
+			-DPAM_LIBRARY="${libpam}"
+			-DUNIT_TESTING=OFF
+		)
+
+		cmake_src_configure
+	}
+
+	if multilib_is_native_abi ; then
+		# Build the Pythons for each version (but only for the native ABI)
+		# bug #737468
+		python_foreach_impl configure_for_python
+	fi
+
+	# Do the regular build now
+	local libpam="${EPREFIX}"
+	multilib_is_native_abi || libpam+="/usr"
+	libpam+="/$(get_libdir)/libpam.so.0"
+
+	local mycmakeargs=(
+		-DPAM_LIBRARY="${libpam}"
+		-DUNIT_TESTING=$(usex test)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python{Libs,Interp,SiteLibs}=ON
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		python_foreach_impl cmake_src_compile
+	fi
+
+	# Compile the "proper" version without Python last
+	cmake_src_compile
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		python_foreach_impl cmake_src_install
+	fi
+
+	# Install the "proper" version without Python last
+	cmake_src_install
+}
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index c7cf317adcbd..7d5bf76cbb8f 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -6,5 +6,5 @@ AUX readline-8.0-headers.patch 577 BLAKE2B b8fe6cdf51188f68c852d3c9052e7840a0bcb
 AUX readline-8.1-windows-signals.patch 569 BLAKE2B af1ad52b09a1a49e6045bd640d57f3932f2b8db450b2eb7e0787a4326f6c61445ad83395620caf489da14107e8a51aed5d5fdf8e3268fab83d8ff04d393b1a59 SHA512 37aa778a21e360708d371aaf3f08274f75b15d8b2c42b030bda8d65dda81b1713c748644e45b6662c608da14ad413d6d83e43800ea58309fa60256a18317f5ae
 DIST readline-8.1.tar.gz 2993288 BLAKE2B f0feca1ea3517b2b613adacac8c997cce0e86aa2f410c82a40ce1a2e128067112b4c68dbf25b808291c28c47583345abac994ce10b8d117958afcb96ee5e7c69 SHA512 27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00
 DIST readline81-001 2454 BLAKE2B 7ec4e5c39a224a70643b44b88bcfef5198e199c76f2a34f0b0ce24f1747dd46be49ddf93871c474cda64322b4358127fec4c2401d19422f84934546bbe1f3bf2 SHA512 cfbef10bdeb562a302ccf214878d02ebadf799343b3d2d7996a282f81bcfde83997ba6dcc9a8477af4dd7c73bca74105ca00a81e42ed13321672bd2930550e54
-EBUILD readline-8.1_p1-r1.ebuild 5430 BLAKE2B 5a7bfe95c1324e91756fe6d54fdf5979d62a8c2b065c5cd6c27ef30948551e7ff2586f2767c36fd1a0fd99c0f02617dd792372c0e2cdad85693e90bd4c112932 SHA512 2ebf0ec8031b71c96591d5c0ba2d2f7120defc29fcede54d4761d47292e46d52b6c7463f26ffb8a3cabd0f2a1b955723551218c7ae0cb0a71d97fe37f3a0e5c0
+EBUILD readline-8.1_p1-r1.ebuild 5901 BLAKE2B 41d0c089c8bc43c20a83dc975f81f2953dd199ba86ac12fe563a82c76bf2a3085a66d328331bf6ccefc6bb3553d697408568fff8cd98bd61b70fa04c91dd8154 SHA512 9e3b525d325b3b65131f04b04c630df8f0f8d47f5394f77df574f353438144cfb69d2690ea1ee28ec15fd888a43f2aecdbdd3741d0f41b994b4b2305484bdd5e
 MISC metadata.xml 473 BLAKE2B 95401399d6edc2a1a28f9c0f42123b07568d5c517c49be38eff09e1f23a9b5df4d5b302495db8880c8ed65081ea2920f194e6b32402ab0d6049221e9ee6a4eed SHA512 e54e4ce57f3178aa8646acb6798f46074eb33173ab63d61f62bc9ab1d35ef823ce9ee3e173234f8866e2cb635519869c76a449f5073c3a5b7cfd29cd23c16462
diff --git a/sys-libs/readline/readline-8.1_p1-r1.ebuild b/sys-libs/readline/readline-8.1_p1-r1.ebuild
index 89f31e17eb10..7ee132fe1f14 100644
--- a/sys-libs/readline/readline-8.1_p1-r1.ebuild
+++ b/sys-libs/readline/readline-8.1_p1-r1.ebuild
@@ -70,9 +70,24 @@ src_prepare() {
 	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
 	default
 
-	# Force ncurses linking. #71420
-	# Use pkg-config to get the right values. #457558
-	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
+	if use prefix && [[ ! -x "${BROOT}"/usr/bin/pkg-config ]] ; then
+		# If we're bootstrapping, make a guess. We don't have pkg-config
+		# around yet. bug #818103.
+		# Incorrectly populating this leads to underlinked libreadline.
+		local ncurses_libs
+		local ncurses_libs_suffix=$(usex unicode w '')
+
+		ncurses_libs="-lncurses${ncurses_libs_suffix}"
+
+		if has_version "sys-libs/ncurses[tinfo(+)]" ; then
+			ncurses_libs+=" -ltinfo${ncurses_libs_suffix}"
+		fi
+	else
+		# Force ncurses linking. #71420
+		# Use pkg-config to get the right values. #457558
+		local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
+	fi
+
 	sed -i \
 		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
 		support/shobj-conf || die
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index c50bf15f622f..35c54b0344be 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index b52bae2fd964..037dcf25b3e7 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -2,5 +2,5 @@ AUX upower-0.99.12-fix-power_now-energy_rate-readings.patch 1636 BLAKE2B e61167d
 DIST upower-0.99.11.tar.xz 430128 BLAKE2B 77604d02a69de98e4c7b268d11d189aa42ace2d62b982fda9bc41131ce383ede32953ada31eae0bbfd1121600af5863924d48c636e60a28f505a6998dcac227c SHA512 67219a0beb98c97ac4512e4fe8ba83fc80a1035d1edb5367dda6911da50c672b047051f2f528e8703be29ab47547d92b6c71a7ef695226a1bdb5bc33e6d18803
 DIST upower-0.99.12.tar.xz 423640 BLAKE2B 4c5c6357f0a2f8d721ebae9736912b1871a898c7ce65708626f9a9465cde87036ba6ab8050d97f5b9074d92e2700d8ed1e71b67f43cd6305eb4e89336f1b628f SHA512 9858a0e5f65271522cc5f36b0cd8722a5fb3effba37dbc5b22f08606701d4242ee54329d07460768004a24dc42705a84140ac6d9691afb7f09584b2e61fe3413
 EBUILD upower-0.99.11.ebuild 2105 BLAKE2B c94253f904dba7fa27380996fa645218c34342d55e3b4a43cd38614d60176c3140ae4ac520d4c1ad05ada307f860a373bd8397915c7c644792c3a934b303bd68 SHA512 d778181809780a53677aa234ea64d5c4ba840b9f7ab465a1160d1efc1c4b26427032f1b09739333387406ed62a61cc9626e3e72da756869d0a1707fc8c45d45e
-EBUILD upower-0.99.12-r1.ebuild 2785 BLAKE2B 9869a806176806505f0f7450d6508aed8276fafd8873a8caaeddf3f15e7134d9206639d08f87e8a76c29e9a425d6944697cdf9f26d88972418f651f77057a3b9 SHA512 562fc1ed767b9694dd3a7b1032f2b303762fdb4b1c6b58e54a48830bb82b32091c60ddd05da095fc37661c657bd6773c2ab7ff97cf7728df0f6cc6609117c77b
+EBUILD upower-0.99.12-r1.ebuild 2784 BLAKE2B 8603683c2e0f7af7b49680741ad20d051fbdeab0341a89d2ac97b8c2410d78f59b2260e9d07a4d73532b0f672d0e4e06d58a4254dff2f8d8b2ee965bd6bada7b SHA512 fad316a3f69506f5129751a5e635f0396849affa58237d21c67d3fa5650f7ce9ef67942b25aa02409edb281b313db508f79ed0eeec9a323037f3e61ae04fbb37
 MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/sys-power/upower/upower-0.99.12-r1.ebuild b/sys-power/upower/upower-0.99.12-r1.ebuild
index a786a471b641..8066c698d0c4 100644
--- a/sys-power/upower/upower-0.99.12-r1.ebuild
+++ b/sys-power/upower/upower-0.99.12-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 # gtk-doc files are not available as prebuilt in the tarball
 IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 96b9ff428140..cb975907a7ab 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/acct/Manifest b/sys-process/acct/Manifest
index d4b15de179a6..ee73f49a42aa 100644
--- a/sys-process/acct/Manifest
+++ b/sys-process/acct/Manifest
@@ -4,5 +4,5 @@ AUX acct.initd-r2 1080 BLAKE2B c1d2a49530df32adf143b4b3b50059602494df57efe0ef414
 AUX acct.logrotate-r1 304 BLAKE2B 60ddfe6b5a8fdf75c82bdf43308ad6f2e1da0c533e532277eabff670c46bb874b5dee90f1bd0d98cba9218cc47e82fd4a91e66170ffd1d367d2d8a01c1e3e00d SHA512 54fcb419f433df2a64eb51ecfc8122c4945960ca7d745d7a8816fec441586e15321cdfacb2db1feeec23c66b1b02b4191d3fc53355379a75c2956a00bc743332
 AUX acct.service 382 BLAKE2B 7a777c0d9195676d897bf95087a3af2175587e365969956de0d458e842144b6fa97c3e7e1bac402467c8611ef19915c55b562466104b6cbc75279225870c25dc SHA512 8c2523526eb3185765eac62676761af6758d0090d68ba48aeacc59c7a45f0722c867fb97d02ff3ceaa8d77637d2b915938d545f7d782e4f7aa46861f25364bd3
 DIST acct-6.6.4.tar.gz 853273 BLAKE2B 2ee42ae849f8e7c5c6dbe33d45e944f945cef87a5fef0074ac31848547ab9b7068509bce3c4b47b35bfde49b02daf43ae812cc58284c50185e4bdc660dccae52 SHA512 413aa446caece8fd773c92e2995bbaa034f63dd0ced521815a676c49f118e02982862b9c0ab7e60be5212c87d1e82ba6325bda212cf4857392a068d359a1e2c2
-EBUILD acct-6.6.4-r3.ebuild 1074 BLAKE2B 6414ca5c36d518b3c6a06087fa4f90aa4d3ed0e95863b92d8df731deca291e103f64dc9251b9e228ffb5edb43a765b1285e039ab0186103480908e5ca1742fbc SHA512 49891b21188c8931669787a26dded7af2051554a91bff33136dedc3c9b4c92525254a5f9a13d42ac79dab015091fad34c19a38850a3359756f0bcf168c975ec8
+EBUILD acct-6.6.4-r3.ebuild 1081 BLAKE2B 89ec74dee905801358bf7480930ab9a3e936fef572366e210d695c3c4bd624b645dfbe216c6271aa63b8c97ffd483514ec1b231d68e7f64dbf29d8e1093f1e9f SHA512 d36870f2d0dc4031471b0abef8771ec294fbc0cca3e6f609ee7798540d297ca3430007c554fdb20442742b07f5b5fd0223219890129c3664b27d5cd36d36628f
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-process/acct/acct-6.6.4-r3.ebuild b/sys-process/acct/acct-6.6.4-r3.ebuild
index 6c9f0a07adc9..a522990e5ba4 100644
--- a/sys-process/acct/acct-6.6.4-r3.ebuild
+++ b/sys-process/acct/acct-6.6.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index 4f18b0a83868..0837d1b05ef1 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -4,5 +4,5 @@ AUX atop.service 190 BLAKE2B 905a7b42d38b3ab25916c90d7b50c52721f9b061c99e8ce5b9d
 AUX atopacct.rc 1054 BLAKE2B 80f301506d805ae54552f088c53bf18cab1ee52b76a37387500176e61eba317059b10c9955d13ac5718547253401ec21f0add4b189e5d04ff724af43c8c50b73 SHA512 ddb026c4ebf63dccc6f49b2b7db829d7ba0388da080a65562bac3f2d7ebacc95093099a0fc9d636af5462ace4a9e118eacfe3eb626a70245e7c5c1e874866f02
 AUX atopacct.service 269 BLAKE2B 8cf88201ecb08da441cd066c0d6974afbae41018a5b2ef9c6b1b805d5be53f2bc5849dafe1d0e2d996e3598ed1baa93e3a0e559fe33c11c55bf64345af5c2bab SHA512 1e57eb76db3e78be504a1a11a479d154239f269da5f5cd3a52eced4ca63ea051d003f14d498d9a71070b7081b2ff80f5eeb5453b81952ee0e4c05423e3c2d308
 DIST atop-2.6.0.tar.gz 242323 BLAKE2B 8cf39c4b18994de26188ad5e19e282bc3ef7693eeff4853386f6b254d1115dbd2308eaa4c6e7620e6081d44037e6ce01356ad72ba25bcf4b1c3e7674768e5c24 SHA512 46cbc1c67ee6683be8dca79bf68d85962a119469ddce4947519cf4fe178b14d54b69451cfaa2b5c0a3f8c9bf8769de619aa5a7768eae34422688c7fc26fe0a58
-EBUILD atop-2.6.0.ebuild 1391 BLAKE2B 1cfb3e27a325c6f64adeffb2e07e7ec380930b8562dbd0be8050780ba9d92a9a54fb99f6cb9bb0e1e068f5fed1c6274ad10c2baea43c808d1dee37607bb6d72f SHA512 c8ddf3041589251ebf67fbcfca3cc969c35a5eea50d623a1b3f6e49acdd3ffe3c1e3cae3e259817ad5d0f7bb73bdb54eff57b85a637361ddc8fe39d0921f3125
+EBUILD atop-2.6.0.ebuild 1398 BLAKE2B fdfcfea38505599ac89a61e1964c24ca703fb7dfb9a43951ed2a22ba95498e811512571316d4afa16fb7bd6a9da3f23162ecbcd7d2a5e8e320c1a605cb5dd10e SHA512 828aa1ac766b4ce20b43ca24f012ae6126676509cddf468e3d6770970625ba3a43e8b46244e2b834bbb9eee42abf59b0f130b8f1b6c2e48b7ffdd9c197348d63
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-process/atop/atop-2.6.0.ebuild b/sys-process/atop/atop-2.6.0.ebuild
index 8e840c67caa0..593972f43deb 100644
--- a/sys-process/atop/atop-2.6.0.ebuild
+++ b/sys-process/atop/atop-2.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Atoptool/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-process/bashtop/Manifest b/sys-process/bashtop/Manifest
index 23a483f39f46..0eeaeaede7d0 100644
--- a/sys-process/bashtop/Manifest
+++ b/sys-process/bashtop/Manifest
@@ -1,3 +1,3 @@
 DIST bashtop-0.9.25.tar.gz 443776 BLAKE2B e778f7657a0502a47ed008d9a54514a7397fa3d2f04a3cac0f98faf67b0b183329f0a760121b0e1e7f7bc28a0ff37b43fe514a524eae81468c9cac573da249d2 SHA512 bd70c1e5b8876be38afe5987e60af0d59496532e6f0a87d2b3cd62c2a251fe627d0fac77e757f01979a6d20b43948860f0bcba4d8a1c54f8ef52d02ad4547a7f
-EBUILD bashtop-0.9.25.ebuild 730 BLAKE2B 0643ce0384b470f0d91bdd5854b09e0fc0c85d7e73532fabefaae80e0caee5abe1f3601e0d4386a8e52fc78d3761ab198e78d74fb3a3064f797ebf01f1cb27ee SHA512 9a57fe838be41ebffc679a4d4082c890c057d476dc4c1064cf55dd1f7abf468fcb066250026142724e1d0e2214510e8d44f35170340bb7659e4133c99c3fc223
+EBUILD bashtop-0.9.25.ebuild 742 BLAKE2B 59466779af5b61c161537425535e52ce4df5d3b08566b94e9536174c34b993a97f351c40ac72d6e072d67b546eecd372faeaa444fefd2a239154f687fc4b910b SHA512 65d8457551b26e3df38564466b3e458c218a55ca844895d6d5d4b574a09ac8cfb3920313911488f324e47f81f448f15465f0d2599f008b85fc46dd4ecbfbb005
 MISC metadata.xml 405 BLAKE2B 5d0a2aeab3de5243039205787bc8784cd83ff090a7f70b269b6fba7dffa0543008dcc1ea6d7866474dff97b7bc9346bd1e37c1937287be5045c0336376bac6e5 SHA512 28f20a2b221aa8960e26d49a2b2ecde74e46371b5ebedb9d946b1526442659193d791fa26db6f30da4de345c06676ed3e8f608aa8620b7d14d534c98814dddad
diff --git a/sys-process/bashtop/bashtop-0.9.25.ebuild b/sys-process/bashtop/bashtop-0.9.25.ebuild
index 56058a7c8b06..07166d23d85b 100644
--- a/sys-process/bashtop/bashtop-0.9.25.ebuild
+++ b/sys-process/bashtop/bashtop-0.9.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/aristocratos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 src_prepare() {
 	default
diff --git a/sys-process/bottom/Manifest b/sys-process/bottom/Manifest
index 00478c1d9ecf..cfee021e18dc 100644
--- a/sys-process/bottom/Manifest
+++ b/sys-process/bottom/Manifest
@@ -173,5 +173,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD bottom-0.6.3.ebuild 4373 BLAKE2B e9e21fb8def6064f9cf5eadb393005085d4c34dc50a5efc25c6f552492aa6428e728fecd7148a358fd0914b156a4767dfdc63f94e18805bb11220e4d8843889b SHA512 928f0fc0897cc79b0aaea6bbc1254c58cd98e5c9ce82a8f8d86fbceafe022055bc00d64d1b1a5a496399ed21e5f9ff19d43e1aa58bd8073095f8c9a9fe114911
-EBUILD bottom-0.6.4.ebuild 4784 BLAKE2B 7651e14208b1a3bc2fe3fc2b0a01c760259673192b7993207764c6ceecf7a81e080a60213b19f8f8e566597a9d2915c4c5cc59af50f7f9bceb445f465df39b43 SHA512 1271f1e2f5fa3e4c657d4f9a379d91fae74bf706885fa7d7cd65e81b0163cdf3b7177bedc5c5e1dbd270f0cc1b34e03855278804a70b8a4d45aeb5d1171034df
+EBUILD bottom-0.6.4.ebuild 4781 BLAKE2B b184f32fb89e2aba25f4e20a38ce28e1dc248510b3a106be796fbdf5daa7102168a0548e18d169187e263ad88a8690a7610e91f5de445d22128eca3e1d0c848c SHA512 ea86003d719f89d536d43ec11ff90848639df9ef373501add6143fd79a27669ad9406483f75289a3927e018e18dadebd1b50302e2c8edb0877676ebcfe5328cb
 MISC metadata.xml 797 BLAKE2B 444693b0becb99edaa93f5623dfa48058648852e0d328802001df5de7661ca8a5f07e920f75aaa06ad7287cbbb46e47f24e5f9897d626574ade3d6270f8eea6f SHA512 e209429c2824e3248c7c2e89b121c6665f80d3a410038709c19fbc9a30b118edd317b8f0b1dab8059aa8c74a3b72d8086f35cd19f7c722d106e0aba5c2586c3d
diff --git a/sys-process/bottom/bottom-0.6.4.ebuild b/sys-process/bottom/bottom-0.6.4.ebuild
index 12d74fde94f1..2bd36f9aba1e 100644
--- a/sys-process/bottom/bottom-0.6.4.ebuild
+++ b/sys-process/bottom/bottom-0.6.4.ebuild
@@ -181,7 +181,7 @@ SRC_URI="$(cargo_crate_uris)"
 
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 MIT MPL-2.0 Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ppc64"
 IUSE="+battery"
 
 PATCHES=(
diff --git a/sys-process/bpytop/Manifest b/sys-process/bpytop/Manifest
index 8cbaf02b8509..561cd0bfb1a0 100644
--- a/sys-process/bpytop/Manifest
+++ b/sys-process/bpytop/Manifest
@@ -5,5 +5,5 @@ DIST bpytop-1.0.63.tar.gz 627729 BLAKE2B a61d7c101c05d8e706b5c89f3c52dd02cf99e12
 DIST bpytop-1.0.67.tar.gz 628491 BLAKE2B 9ce35332dde806d132fee42f04f787e9220f05644e938d83725369157032a556c89d216a393a52a26fa6c6841a2b91b8212ee122ba734e1aedc912f7a02d350b SHA512 bfd6b365d4d76521cb5d1edccfd858732143a1a9273dc0e17d348c824c125df904b1160d9e7f81d718f880c4f3eea33d045a684706039bceb7f95ed67df2b56b
 EBUILD bpytop-1.0.61-r1.ebuild 710 BLAKE2B 65f31779d8ec7541de778a046d05837bd30ae24222d47f1f6f71c1a740061e2402ca3b157503aa167068f94e963c14243f6c23bc8396e983ad10923e5420cd51 SHA512 493910aaa46a19175de31abb3a1c91fc1b250f3a5ba1c3d7ed309b32ce7c05248b6ebe973eaae614fd84fe559bcf108e9ee1a19eaa5fad6bec005c04d3c18b2e
 EBUILD bpytop-1.0.63.ebuild 710 BLAKE2B 5bf551615b28e84e1dac73120077a2c9c4b5a3af96bf0397f577bd4b8c2a8e62b315bd345422d30219f1e4b0913cec2910c54b9665117bf55ad8895fc523188c SHA512 b03eaccbdc0294db021282bf4440d23bae362a86bb1a329be830f8187a63110fad7c996e58ab1842f7eddd0660835a66a54503d948a0f672b4e0d1f07bde69e1
-EBUILD bpytop-1.0.67.ebuild 711 BLAKE2B 274d5b45c8a8633ada0f5440365e10fb62a5f7126eb94e8a2e0b1e512c9146694254b08baa1c5139fe72c5c7f87ccb1bd533d6b23caf5eb44d4c5d521676e82c SHA512 425709f4a93ece4a34994b45589a6c6387df3ff6cee73c1f6b78f9024995b6dd465e3bcff3e70c3d787fb527f859c67fbe5a8a1ecf2cbbfaf3f6940729d3872d
+EBUILD bpytop-1.0.67.ebuild 718 BLAKE2B facc19e21ebed5c84f24423a58905902b2bc8705218ec9fb5b18f2c34a00f779a64e9ce81c99d8978398ae2698601c7445633752c76b7a0f87577df3222f629b SHA512 11fae0fbdbb09a8ebdf010099c6caea157733365806b5de38e2b7cf5c3fb5a1db4acb4f5d66524b0a64babf093f1ab4bfcf377589b219a911eb213cb027936ca
 MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/sys-process/bpytop/bpytop-1.0.67.ebuild b/sys-process/bpytop/bpytop-1.0.67.ebuild
index 635e16b769aa..6f6b0fccb105 100644
--- a/sys-process/bpytop/bpytop-1.0.67.ebuild
+++ b/sys-process/bpytop/bpytop-1.0.67.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/aristocratos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest
index 157467be71d8..c0d54f236d7c 100644
--- a/sys-process/fcron/Manifest
+++ b/sys-process/fcron/Manifest
@@ -10,5 +10,7 @@ DIST fcron-3.2.1.src.tar.gz 601142 BLAKE2B 184b74f9d64186b7d3aae87d48ed0107525fd
 DIST fcron-3.3.0_beta.tar.gz 592481 BLAKE2B b862dac8e70621e299ec2fbbc75a0e8843e7a085190fa7a18f9444f6f41f28cf55ef0dcd7234a388b9b3e6689f25019a581ded2ae6002643bb3dc472a59207bb SHA512 e5b76e23af774997d9ee1ef58d17009cea95d10b19a2d22b550b178a39bb7c439c055b440eb99c4286db6622901e5deb029318e4425e8cd098766452ffc15bc6
 EBUILD fcron-3.2.1-r4.ebuild 6984 BLAKE2B a0ffbc0ff0c143eff057010923b90a0fe379c8d9d55e756d7fc9b13ee68390aaf4aed26894bda92ccf5cfe2276a1269db8f517a9adba0aace662dfecee796790 SHA512 a44daaee4c1d15644427faa1f345b7c141e5c3bb27406f2b4a4ccb9c2819cd951a6fd475d508be3f485cb7acc34aaba4581b9527442de3a0e2865258b0c56a52
 EBUILD fcron-3.2.1-r5.ebuild 7093 BLAKE2B 7bcc217ad1f34b2991a3a35a629123667fb63c0c488df39ee94fc93538f4186f548faed125a717b0c0bce06fbad25289112593cf23f03a8cb5d25de49c222c79 SHA512 6d6815b015b5e20d8ebab26c3736aa8a503f42b5987e30c71ee3134bc1f6735e3aa8f442f16288f535c8febe16ee8d1dde878575ad5b6b07896175347116445c
+EBUILD fcron-3.2.1-r7.ebuild 7075 BLAKE2B 6472923241aff7fcc468bf82c39a6eb9885b90a05205f2b6294bb8c386da127f691aebf16a24a9a42cdf1d342141658b53f87e6e2ccb2d7091747086661fccbf SHA512 7e2fa6c6581fb785ac876238d9a5888bfd220932d4ceb36b573d8f989a4463ec89566aa1293805e6b8c91455711becfe0d03777929db07e1a0aa7ccd2edf2e64
 EBUILD fcron-3.3.0_beta-r2.ebuild 7120 BLAKE2B 5397bbb8a5283761ca7df55dc24aab398d3a6c20837261e9070e465a08c50e09a8a01f84d47782ec87e047838f553b30dac9f92d6895e510c4b97a9f6052aa43 SHA512 218af6c1327b7c71bb69cb17090d0ccd89176f0abb8a1704ab9a6d94e0a056884f03c153a57604e0fdc1d2c21a4f569dc30d9ee9a359025e523edaf89ac192e7
+EBUILD fcron-3.3.0_beta-r4.ebuild 7099 BLAKE2B c3fe2e0c251eb00a54de3e072a91a6786c81b8ef092dd58bcc7fce767dbc16369db239df01a0429da23f6afa918036df0f60b6cf6169251b9e01ed9f52c71ea0 SHA512 9fdf7d8bb1c6713c2558a015f8aba1372ca5bf79eeb40551395f94f184ae5ae9e7ef986ab0c12315da017ef4f280866b5e4cc897a5b8fb6c0b62cd9e13cd57e6
 MISC metadata.xml 1237 BLAKE2B 1b5d016860601bc59b5d896e51636846728e442f9f4a89bfe484d50c55016491428365eb10da059d39858d52f80e4744fb3a7a9999317ca28e32197a97ce7ebf SHA512 7c465f650ba3fc3608cc57bb8bef4f479cd4102a384ae6b9db83d19306f536f3d52eb729a4aeda98f5c6cf9996c68018dba5424776eb2e3b8c82e60140178340
diff --git a/sys-process/fcron/fcron-3.2.1-r7.ebuild b/sys-process/fcron/fcron-3.2.1-r7.ebuild
new file mode 100644
index 000000000000..0d71756ff300
--- /dev/null
+++ b/sys-process/fcron/fcron-3.2.1-r7.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WANT_AUTOMAKE="none"
+
+inherit autotools cron flag-o-matic pam systemd user-info
+
+DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
+HOMEPAGE="http://fcron.free.fr/"
+SRC_URI="http://fcron.free.fr/archives/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="audit debug pam selinux l10n_fr +mta +system-crontab readline"
+
+DEPEND="
+	acct-group/fcron
+	acct-user/fcron
+	virtual/libcrypt:=
+	audit? ( sys-process/audit )
+	pam? ( sys-libs/pam )
+	readline? ( sys-libs/readline:= )
+	selinux? ( sys-libs/libselinux )
+"
+
+RDEPEND="
+	${DEPEND}
+	app-misc/editor-wrapper
+	mta? ( virtual/mta )
+	pam? ( sys-auth/pambase )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.1-noreadline.patch
+	"${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch
+	"${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch
+)
+
+pkg_setup() {
+	rootuser=$(egetent passwd 0 | cut -d ':' -f 1)
+	[[ ${rootuser} ]] || rootuser=root
+	rootgroup=$(egetent group 0 | cut -d ':' -f 1)
+	[[ ${rootgroup} ]] || rootgroup=root
+}
+
+src_prepare() {
+	default
+
+	# respect LDFLAGS
+	sed "s:\(@LIBS@\):\$(LDFLAGS) \1:" -i Makefile.in || die "sed failed"
+
+	# Adjust fcrontab path
+	sed -e 's:/etc/fcrontab:/etc/fcron/fcrontab:' -i script/check_system_crontabs.sh || die
+
+	mv configure.in configure.ac || die
+
+	cp "${FILESDIR}"/crontab.2 "${WORKDIR}"/crontab || die
+
+	eautoconf
+}
+
+src_configure() {
+	# Don't try to pass --with-debug as it'll play with cflags as
+	# well, and run foreground which is a _very_ nasty idea for
+	# Gentoo.
+	use debug && append-cppflags -DDEBUG
+
+	# bindir is used just for calling fcronsighup
+	local myeconfargs=(
+		--with-cflags="${CFLAGS}"
+		--bindir=/usr/libexec
+		--sbindir=/usr/libexec
+		$(use_with audit)
+		$(use_with mta sendmail)
+		$(use_with pam)
+		$(use_with readline)
+		$(use_with selinux)
+		--sysconfdir=/etc/fcron
+		--with-username=fcron
+		--with-groupname=fcron
+		--with-piddir=/run
+		--with-spooldir=/var/spool/fcron
+		--with-fifodir=/run
+		--with-fcrondyn=yes
+		--disable-checks
+		--with-editor=/usr/libexec/editor
+		--with-shell=/bin/sh
+		--without-db2man
+		--without-dsssl-dir
+		--with-rootname=${rootuser}
+		--with-rootgroup=${rootgroup}
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	# bug #216460
+	sed \
+		-e 's:/usr/local/etc/fcron:/etc/fcron/fcron:g' \
+		-e 's:/usr/local/etc:/etc:g' \
+		-e 's:/usr/local/:/usr/:g' \
+		-i doc/*/*/*.{txt,1,5,8,html} \
+		|| die "unable to fix documentation references"
+}
+
+src_install() {
+	keepdir /var/spool/fcron
+
+	exeinto /usr/libexec
+	doexe fcron fcronsighup
+
+	dobin fcrondyn fcrontab
+
+	insinto /etc/fcron
+	doins files/fcron.{allow,deny,conf}
+
+	if use system-crontab; then
+		dosym fcrontab /usr/bin/crontab
+
+		exeinto /usr/libexec
+		newexe script/check_system_crontabs.sh check_system_crontabs
+
+		insinto /etc/fcron
+		newins "${FILESDIR}"/fcrontab.2 fcrontab
+
+		fowners ${rootuser}:fcron /etc/fcron/fcrontab
+		fperms 0640 /etc/fcron/fcrontab
+
+		insinto /etc
+		newins "${FILESDIR}"/crontab.2 crontab
+	fi
+
+	fowners fcron:fcron \
+		/var/spool/fcron \
+		/usr/bin/fcron{dyn,tab}
+
+	# fcronsighup needs to be suid root, because it sends a HUP to the
+	# running fcron daemon, but only has to be called by the fcron group
+	# anyway
+	fowners ${rootuser}:fcron \
+		/usr/libexec/fcronsighup \
+		/etc/fcron/fcron.{allow,deny,conf} \
+		/etc/fcron
+
+	fperms 6770 /var/spool/fcron
+	fperms 6775 /usr/bin/fcron{dyn,tab}
+
+	fperms 4710 /usr/libexec/fcronsighup
+
+	fperms 0750 /etc/fcron
+	fperms 0640 /etc/fcron/fcron.{allow,deny,conf}
+
+	use pam && pamd_mimic system-services fcron auth account session
+	cat > "${T}"/fcrontab.pam <<- EOF
+	# Don't ask for the user's password; fcrontab will only allow to
+	# change user if running as root.
+	auth		sufficient		pam_permit.so
+
+	# Still use the system-auth stack for account and session as the
+	# sysadmin might have set up stuff properly, and also avoids
+	# sidestepping limits (since fcrontab will run \$EDITOR).
+	account		include			system-auth
+	session		include			system-auth
+	EOF
+	use pam && newpamd "${T}"/fcrontab.pam fcrontab
+
+	newinitd "${FILESDIR}"/fcron.init-r5 fcron
+	systemd_newunit "${S}/script/fcron.init.systemd" fcron.service
+
+	newconfd "${FILESDIR}"/fcron.confd fcron
+
+	local DOCS=( MANIFEST VERSION "${WORKDIR}/crontab")
+	DOCS+=( doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt )
+
+	local HTML_DOCS=( doc/en/HTML/. )
+
+	einstalldocs
+
+	newdoc files/fcron.conf fcron.conf.sample
+	doman doc/en/man/*.{1,5,8}
+
+	for lang in fr; do
+		use l10n_${lang} || continue
+
+		doman -i18n=${lang} doc/${lang}/man/*.{1,5,8}
+
+		docinto html/${lang}
+		dodoc -r doc/${lang}/HTML/.
+	done
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "Make sure you execute"
+		elog ""
+		elog "  # emerge --config ${CATEGORY}/${PN}"
+		elog ""
+		elog "to install the default systab on this system."
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "3.2.1" -le ${v}; then
+				# This is an upgrade
+
+				elog "fcron's default systab was updated since your last installation."
+				elog "You can use"
+				elog ""
+				elog "  # emerge --config ${CATEGORY}/${PN}"
+				elog ""
+				elog "to re-install systab (do not call this command before you"
+				elog "have merged your configuration files)."
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if ! use system-crontab; then
+		echo ""
+		ewarn "Remember that fcron will *not* use /etc/cron.d in this configuration"
+		ewarn "due to USE=-system-crontab!"
+		echo ""
+	fi
+}
+
+pkg_config() {
+	if [[ $(fcrontab -l -u systab 2>/dev/null) ]]; then
+		eerror "We're not going to make any change to your systab as long as"
+		eerror "it contains data; please clear it before proceeding."
+		eerror "You can do that with"
+		eerror ""
+		eerror "  # fcrontab -u systab -r"
+		eerror ""
+		eerror "However you are advised to do this by hand to review existing"
+		eerror "systab just in case."
+		return 1
+	fi
+
+	if use system-crontab; then
+		elog "This is going to set up fcron to execute check_system_crontabs."
+		elog "In this configuration, /etc/crontab and /etc/cron.d are respected."
+		elog "Per default fcron will check for modifications every 10 minutes."
+		/usr/libexec/check_system_crontabs -v -i -f
+	else
+		elog "This is going to set up fcron to set up a default systab that"
+		elog "executes /etc/cron.{hourly,daily,weekly,monthly} but will ignore"
+		elog "/etc/crontab and /etc/cron.d."
+		fcrontab -u systab - <<- EOF
+		!serial(true)
+		00   *    *    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.hourly
+		00   00   *    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.daily
+		00   00   *    *    6     /bin/rm -f /var/spool/cron/lastrun/cron.weekly
+		00   00   1    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.monthly
+		*/10 *    *    *    *     /usr/bin/test -x /usr/sbin/run-crons && /usr/sbin/run-crons
+		!serial(false)
+		EOF
+	fi
+}
diff --git a/sys-process/fcron/fcron-3.3.0_beta-r4.ebuild b/sys-process/fcron/fcron-3.3.0_beta-r4.ebuild
new file mode 100644
index 000000000000..857880e1ae42
--- /dev/null
+++ b/sys-process/fcron/fcron-3.3.0_beta-r4.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WANT_AUTOMAKE="none"
+
+inherit autotools cron flag-o-matic pam systemd user-info
+
+MY_PV="${PV/_beta/}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
+HOMEPAGE="http://fcron.free.fr/"
+SRC_URI="http://fcron.free.fr/archives/${MY_P}.src.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+KEYWORDS="~riscv"
+IUSE="audit debug pam selinux l10n_fr +mta +system-crontab readline"
+
+DEPEND="
+	acct-group/fcron
+	acct-user/fcron
+	virtual/libcrypt:=
+	audit? ( sys-process/audit )
+	pam? ( sys-libs/pam )
+	readline? ( sys-libs/readline:= )
+	selinux? ( sys-libs/libselinux )
+"
+
+RDEPEND="
+	${DEPEND}
+	app-misc/editor-wrapper
+	mta? ( virtual/mta )
+	pam? ( sys-auth/pambase )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.1-noreadline.patch
+	"${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch
+	"${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch
+)
+
+pkg_setup() {
+	rootuser=$(egetent passwd 0 | cut -d ':' -f 1)
+	[[ ${rootuser} ]] || rootuser=root
+	rootgroup=$(egetent group 0 | cut -d ':' -f 1)
+	[[ ${rootgroup} ]] || rootgroup=root
+}
+
+src_prepare() {
+	default
+
+	# respect LDFLAGS
+	sed "s:\(@LIBS@\):\$(LDFLAGS) \1:" -i Makefile.in || die "sed failed"
+
+	# Adjust fcrontab path
+	sed -e 's:/etc/fcrontab:/etc/fcron/fcrontab:' -i script/check_system_crontabs.sh || die
+
+	mv configure.in configure.ac || die
+
+	cp "${FILESDIR}"/crontab.2 "${WORKDIR}"/crontab || die
+
+	eautoconf
+}
+
+src_configure() {
+	# Don't try to pass --with-debug as it'll play with cflags as
+	# well, and run foreground which is a _very_ nasty idea for
+	# Gentoo.
+	use debug && append-cppflags -DDEBUG
+
+	# bindir is used just for calling fcronsighup
+	local myeconfargs=(
+		--with-cflags="${CFLAGS}"
+		--bindir=/usr/libexec
+		--sbindir=/usr/libexec
+		$(use_with audit)
+		$(use_with mta sendmail)
+		$(use_with pam)
+		$(use_with readline)
+		$(use_with selinux)
+		--sysconfdir=/etc/fcron
+		--with-username=fcron
+		--with-groupname=fcron
+		--with-piddir=/run
+		--with-spooldir=/var/spool/fcron
+		--with-fifodir=/run
+		--with-fcrondyn=yes
+		--disable-checks
+		--with-editor=/usr/libexec/editor
+		--with-shell=/bin/sh
+		--without-db2man
+		--without-dsssl-dir
+		--with-rootname=${rootuser}
+		--with-rootgroup=${rootgroup}
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	# bug #216460
+	sed \
+		-e 's:/usr/local/etc/fcron:/etc/fcron/fcron:g' \
+		-e 's:/usr/local/etc:/etc:g' \
+		-e 's:/usr/local/:/usr/:g' \
+		-i doc/*/*/*.{txt,1,5,8,html} \
+		|| die "unable to fix documentation references"
+}
+
+src_install() {
+	keepdir /var/spool/fcron
+
+	exeinto /usr/libexec
+	doexe fcron fcronsighup
+
+	dobin fcrondyn fcrontab
+
+	insinto /etc/fcron
+	doins files/fcron.{allow,deny,conf}
+
+	if use system-crontab; then
+		dosym fcrontab /usr/bin/crontab
+
+		exeinto /usr/libexec
+		newexe script/check_system_crontabs.sh check_system_crontabs
+
+		insinto /etc/fcron
+		newins "${FILESDIR}"/fcrontab.2 fcrontab
+
+		fowners ${rootuser}:fcron /etc/fcron/fcrontab
+		fperms 0640 /etc/fcron/fcrontab
+
+		insinto /etc
+		newins "${FILESDIR}"/crontab.2 crontab
+	fi
+
+	fowners fcron:fcron \
+		/var/spool/fcron \
+		/usr/bin/fcron{dyn,tab}
+
+	# fcronsighup needs to be suid root, because it sends a HUP to the
+	# running fcron daemon, but only has to be called by the fcron group
+	# anyway
+	fowners ${rootuser}:fcron \
+		/usr/libexec/fcronsighup \
+		/etc/fcron/fcron.{allow,deny,conf} \
+		/etc/fcron
+
+	fperms 6770 /var/spool/fcron
+	fperms 6775 /usr/bin/fcron{dyn,tab}
+
+	fperms 4710 /usr/libexec/fcronsighup
+
+	fperms 0750 /etc/fcron
+	fperms 0640 /etc/fcron/fcron.{allow,deny,conf}
+
+	use pam && pamd_mimic system-services fcron auth account session
+	cat > "${T}"/fcrontab.pam <<- EOF
+	# Don't ask for the user's password; fcrontab will only allow to
+	# change user if running as root.
+	auth		sufficient		pam_permit.so
+
+	# Still use the system-auth stack for account and session as the
+	# sysadmin might have set up stuff properly, and also avoids
+	# sidestepping limits (since fcrontab will run \$EDITOR).
+	account		include			system-auth
+	session		include			system-auth
+	EOF
+	use pam && newpamd "${T}"/fcrontab.pam fcrontab
+
+	newinitd "${FILESDIR}"/fcron.init-r5 fcron
+	systemd_newunit "${S}/script/fcron.init.systemd" fcron.service
+
+	newconfd "${FILESDIR}"/fcron.confd fcron
+
+	local DOCS=( MANIFEST VERSION "${WORKDIR}/crontab")
+	DOCS+=( doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt )
+
+	local HTML_DOCS=( doc/en/HTML/. )
+
+	einstalldocs
+
+	newdoc files/fcron.conf fcron.conf.sample
+	doman doc/en/man/*.{1,5,8}
+
+	for lang in fr; do
+		use l10n_${lang} || continue
+
+		doman -i18n=${lang} doc/${lang}/man/*.{1,5,8}
+
+		docinto html/${lang}
+		dodoc -r doc/${lang}/HTML/.
+	done
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "Make sure you execute"
+		elog ""
+		elog "  # emerge --config ${CATEGORY}/${PN}"
+		elog ""
+		elog "to install the default systab on this system."
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "3.2.1" -le ${v}; then
+				# This is an upgrade
+
+				elog "fcron's default systab was updated since your last installation."
+				elog "You can use"
+				elog ""
+				elog "  # emerge --config ${CATEGORY}/${PN}"
+				elog ""
+				elog "to re-install systab (do not call this command before you"
+				elog "have merged your configuration files)."
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if ! use system-crontab; then
+		echo ""
+		ewarn "Remember that fcron will *not* use /etc/cron.d in this configuration"
+		ewarn "due to USE=-system-crontab!"
+		echo ""
+	fi
+}
+
+pkg_config() {
+	if [[ $(fcrontab -l -u systab 2>/dev/null) ]]; then
+		eerror "We're not going to make any change to your systab as long as"
+		eerror "it contains data; please clear it before proceeding."
+		eerror "You can do that with"
+		eerror ""
+		eerror "  # fcrontab -u systab -r"
+		eerror ""
+		eerror "However you are advised to do this by hand to review existing"
+		eerror "systab just in case."
+		return 1
+	fi
+
+	if use system-crontab; then
+		elog "This is going to set up fcron to execute check_system_crontabs."
+		elog "In this configuration, /etc/crontab and /etc/cron.d are respected."
+		elog "Per default fcron will check for modifications every 10 minutes."
+		/usr/libexec/check_system_crontabs -v -i -f
+	else
+		elog "This is going to set up fcron to set up a default systab that"
+		elog "executes /etc/cron.{hourly,daily,weekly,monthly} but will ignore"
+		elog "/etc/crontab and /etc/cron.d."
+		fcrontab -u systab - <<- EOF
+		!serial(true)
+		00   *    *    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.hourly
+		00   00   *    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.daily
+		00   00   *    *    6     /bin/rm -f /var/spool/cron/lastrun/cron.weekly
+		00   00   1    *    *     /bin/rm -f /var/spool/cron/lastrun/cron.monthly
+		*/10 *    *    *    *     /usr/bin/test -x /usr/sbin/run-crons && /usr/sbin/run-crons
+		!serial(false)
+		EOF
+	fi
+}
diff --git a/sys-process/ftop/Manifest b/sys-process/ftop/Manifest
index f19b8835601c..18061442fb7f 100644
--- a/sys-process/ftop/Manifest
+++ b/sys-process/ftop/Manifest
@@ -1,5 +1,5 @@
 AUX ftop-1.0-overflow.patch 480 BLAKE2B bd7d9ff99835d56f4d453e5e4be0596e0435ccdd19c4ff24d871038d8940eb2b6bb4133ffd2b2859ce54da2ced0052563271ce3230c94626a14126821305dca3 SHA512 8057c3e938c0e3d53fa6925bb11d5ea5596343fc82c7bf0e3e32461f11b86c0e3f62b7eedd597b31dad587c585a5b99cd1f4c3d99c13c6825e59278ad1f17d2f
 AUX ftop-1.0-tinfo.patch 194 BLAKE2B f38832a7b5deb792a2ab12007f12b7654b02d2e987de68674bb2ddc005113986646146bf4e8497f1f6b4bc63df4e71304fb0d8bb30cf5471bbd66b8b08945c25 SHA512 a15acc7acd78ca2abc166ff9f9fc66f3b2c5f1348d6d416d70520a8e07cc128529129d217045ca16a115b1a18e0729cacf0f5fc711d3a8da5b56466ddc1650b6
 DIST ftop-1.0.tar.bz2 143122 BLAKE2B 5676612465a6bdf6af5cffb78ddffaf05b188b4cd4508dc13335f0807391662201b8cd988cf86068c3094e4133bacf52c250c3963910a291383c17203823805e SHA512 f572a52481db7d52a1e384500f5ec57eec36fefab95c7237197d69650e6522dd5ddd4c4425a08ffe853ba730519b90de522186aad5d8bd94cece6e66db5e634a
-EBUILD ftop-1.0-r1.ebuild 524 BLAKE2B 6c6536a0c712c55feb8ac005e7a365fd087ffde7a7e867a7c9b3225140f457dfca2590916858188814eb388c87d22b435cfcd4bec5c3b6d854eb5ceae8e54550 SHA512 725a87901b1cb1ddbd678a74c16ae78688202cfe703bef9184e9f4a2a768d4b5fd6f9bc956afeef42fad7867bdccde771925958467de61a17cb54dbb750c6094
+EBUILD ftop-1.0-r1.ebuild 531 BLAKE2B 91be88f45b15871e7f09e2e15d122bbd42f9bae5473092b25696d293cdf45ed03929143bc1839129bd8a7d048c497b37f2ccc5d426b50279da6835629cd99f71 SHA512 109759436d6657e64e0617fff87f8da64ddfd3f8ae97cbe334b61dd90ddb71f080e18e0c37d222338b41cc63763308b7d584d9b005b7ab57299877bf230c36cc
 MISC metadata.xml 225 BLAKE2B 1702b2df6fd2eeef541d05e9f87af1d901036a8b9f91f497007c6e3e1f587b0a30d63e0f5334a5f61b86cec471042853c82e68302a85d1ad4cb7f149fc3aef59 SHA512 9af880d61ecd66710680d94dec379665673167f3af0839dd4134c85f4b9ef1f77862d4d25f97625bc9c40df0615b81a2ba6364c6eef8e749dec7c073aeb51646
diff --git a/sys-process/ftop/ftop-1.0-r1.ebuild b/sys-process/ftop/ftop-1.0-r1.ebuild
index 852566d92e0e..20954adbe5c7 100644
--- a/sys-process/ftop/ftop-1.0-r1.ebuild
+++ b/sys-process/ftop/ftop-1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~riscv ~x86"
 
 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index b8561563e668..4c4ba40c2265 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,5 +1,7 @@
 DIST htop-3.0.5.tar.gz 297931 BLAKE2B a6e62f99ef349809d11bb14b4d515036601aa457507b34a96354607f136cc4e0d3d40a715f1576c70833db051d989fa55142b4f8bba0f5f432ea3676364d9575 SHA512 7dae83ceff6b3f30e69c30c9559dbb3bf69281df006c6a26e4e2c49dd5a147e05ed7bafeeac8ec5bedc8ba670470100cc128209a92654858f98df09a9394594f
 DIST htop-3.1.0.tar.gz 378838 BLAKE2B c5b09f714c27879c0f3fe0d7233d1eacb979ceb76007ee0c2720bce5d08f84d0e6b9e3747c57fca11f2354909285365749d57d597911641fdb6dd834bec23166 SHA512 bb4422591a61978d1cc5b423413820c14cc571c4660087387949f1071609da38e42be2be8485863cb19b0b957d1fdeb5b2df46212d9ddd3891871b1c9d276c6e
+DIST htop-3.1.1.tar.gz 381277 BLAKE2B 4383991e8821e4c27a4f5cb002b198fa7915465c03d9fb83324fa2df732d8553be4061c2c559b92de934b0c214bb4445b068795050e1bee2afb803d7f32b9a67 SHA512 5e4ec9b5fdf4583c8a345dcc2fe9395737e3a6e8dd8e6547800b959be084b9d57ae30bf891f79a25f6bf99ec0b6eb7eaba8bc851072c5a550de70df4178dc07d
 EBUILD htop-3.0.5-r1.ebuild 1778 BLAKE2B 7019c1a5668339b8e9efe626e01d8c44d6d802659cf8283069dad92943912d34d40f77e75bfd7834e35e07c129edcd71681fe621a3f61731d3f35aa85b72668c SHA512 1d3af3d7c65d6808eee5083f95a865715a7302da4d2b90f91c84b2fb6ba355cf474eb8f89946704af006d33dc5ad44f4cae430175193af5a65cfac0b8650788b
 EBUILD htop-3.1.0.ebuild 2234 BLAKE2B 8f58976d413c2cce5fa4f028a4b254e76fc44aa0b1e4d23bea8dfbd766b16974d559901e8e4d5d81aee3e385cc5206614f512a56ceca7e83a79687e0e142988d SHA512 9b43d40d019b4603deb65e08474f45493fbb409ed4b3ae7b6c4820117bc6abb0c514f9f3c6ecad48fb1e1d7fadd2ee69b5a88323e53701d4481867df204d970c
+EBUILD htop-3.1.1.ebuild 2236 BLAKE2B 8e41acfeda097693e90914778c647d8dd0377e109036da13a86c5dae2c16522046a491406c3e34161c9953d2e5cffeb248b07add558f2f6f54ea63d8c6986c32 SHA512 456ca668c989248065378888d2433d88785dd2bc4a9fc886e5575ba049e0e9515da9b98e23a8ab3de4e197a1a75304746afdbcb7bb31d4be05f950dd8f9cf47e
 MISC metadata.xml 1012 BLAKE2B 88fff3df3c1385c3745511bfbda2480189db694f4642fd744591eccee9dcc0f855cf268cc1d912cef3c042df5be1eab4213139b5909748914e6ebfaf505e3caa SHA512 fd4bcf57709b15cbd3e9cc74cfd5ca0ebf5a656a3f447e5e295bc698efd89ce46899a84a794f53a1d7ae7b79bdb0df9e5cb1c8eab10b5cb4b979b83fe5c68e48
diff --git a/sys-process/htop/htop-3.1.1.ebuild b/sys-process/htop/htop-3.1.1.ebuild
new file mode 100644
index 000000000000..ad00e02ff840
--- /dev/null
+++ b/sys-process/htop/htop-3.1.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools linux-info python-any-r1 xdg-utils
+
+DESCRIPTION="interactive process viewer"
+HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
+SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+IUSE="caps debug delayacct hwloc kernel_FreeBSD kernel_linux lm-sensors openvz unicode vserver"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	hwloc? ( sys-apps/hwloc )
+	kernel_linux? (
+		caps? ( sys-libs/libcap )
+		delayacct? ( dev-libs/libnl:3 )
+		lm-sensors? ( sys-apps/lm-sensors )
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+DOCS=( ChangeLog README )
+
+CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
+
+S="${WORKDIR}/${P/_}"
+
+pkg_setup() {
+	if ! has_version sys-process/lsof; then
+		ewarn "To use lsof features in htop (what processes are accessing"
+		ewarn "what files), you must have sys-process/lsof installed."
+	fi
+
+	python-any-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	[[ ${CBUILD} != ${CHOST} ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
+
+	local myeconfargs=(
+		--enable-unicode
+		$(use_enable debug)
+		$(use_enable hwloc)
+		$(use_enable !hwloc affinity)
+		$(use_enable openvz)
+		$(use_enable unicode)
+		$(use_enable vserver)
+	)
+
+	if use kernel_linux ; then
+		myeconfargs+=(
+			$(use_enable caps capabilities)
+			$(use_enable delayacct)
+			$(use_enable lm-sensors sensors)
+		)
+	else
+		if use kernel_Darwin ; then
+			# Upstream default to checking but --enable-affinity
+			# overrides this. Simplest to just disable on Darwin
+			# given it works on BSD anyway.
+			myeconfargs+=( --disable-affinity )
+		fi
+
+		myeconfargs+=(
+			--disable-capabilities
+			--disable-delayacct
+			--disable-sensors
+		)
+	fi
+
+	econf ${myeconfargs[@]}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/sys-process/iotop-c/Manifest b/sys-process/iotop-c/Manifest
index 0b1298e5e6ab..e3930912f005 100644
--- a/sys-process/iotop-c/Manifest
+++ b/sys-process/iotop-c/Manifest
@@ -1,8 +1,6 @@
-DIST iotop-c-1.18.tar.gz 114838 BLAKE2B 8b3e13d00de4a5cd385a2d441d84bb27cc1d03a27012163b9628285c31176698bf840951e39199abef11b2d3c0413d500d6e7699f32a3b542360a1333307d00e SHA512 f0affbfdb106eb36078e7994860155f52d47878017f47e64d69aa7c04cc29756ca516a6634fd19d6d39c931100b9a0e93e07ca2f4d14c18014dc1c4f477907ea
 DIST iotop-c-1.19.tar.gz 115025 BLAKE2B 0b45a73afc5dd160692fa1a3d028afff2b4b242a008470679a669182baa56b133f5fd26f9cb3ed20ebfe18b7fdeba9ca98a7801299c8c9b8d776a58fed2725d2 SHA512 489ddd67eb4e9159058c94f614534290b302abd5af8b424f6c42df20f21362c60dc30e7fd0bac883b8bf032e72843b4b82dbfb77b670258728ef0fa9dbb7dfa3
 DIST iotop-c-1.20.tar.gz 124352 BLAKE2B ec14a70e7952b6a5d4a74dbac3cd3c5f18e4b4c447d7b8c8515f8e59f4d859ed8110da44329f5cf2ed36cac764c509d080cb7b75b0caa50896fa77abe84880ca SHA512 1e4b5a9f166ff021b53e13a1c975328b6f966e468c3bf834a0504e41b7c3f3f9052516d6b57082692871a69b5675a86d16fb7f487e2aa44dbb5e81a8a0d806bb
-EBUILD iotop-c-1.18.ebuild 775 BLAKE2B 3869a20c8ce7d1144a33a58db4596b95798f338d2d739bc28c2494185bca002fd736a0bbd9521bc2907aa8b1a078268f53f8aefa6c13f6696471103d5f6faddc SHA512 061611b94fc7c2c29e08ceffa09d58de640f255c1eccc57442804be051beda551584ca682409cb17ff9a7d48fc0e7a50f3bc6ee738d03d936a4144ead2fcdc9c
 EBUILD iotop-c-1.19.ebuild 775 BLAKE2B 3869a20c8ce7d1144a33a58db4596b95798f338d2d739bc28c2494185bca002fd736a0bbd9521bc2907aa8b1a078268f53f8aefa6c13f6696471103d5f6faddc SHA512 061611b94fc7c2c29e08ceffa09d58de640f255c1eccc57442804be051beda551584ca682409cb17ff9a7d48fc0e7a50f3bc6ee738d03d936a4144ead2fcdc9c
-EBUILD iotop-c-1.20.ebuild 775 BLAKE2B 3869a20c8ce7d1144a33a58db4596b95798f338d2d739bc28c2494185bca002fd736a0bbd9521bc2907aa8b1a078268f53f8aefa6c13f6696471103d5f6faddc SHA512 061611b94fc7c2c29e08ceffa09d58de640f255c1eccc57442804be051beda551584ca682409cb17ff9a7d48fc0e7a50f3bc6ee738d03d936a4144ead2fcdc9c
+EBUILD iotop-c-1.20.ebuild 787 BLAKE2B 80d4a7d1fdf73391997a6369f4a3f58d259e3550daeeeff4a8481b13b240afd274405dc5cee7d14c1edc966cceb4d2aede8eb271931aa47f1b5ca06c415f1ea0 SHA512 d53395581ed9c7d720e58e28ee6ced1f073bdce4231d1b886ef9db077a273c4eb6605e39d4308a0b0fbbac53df8c9f9f76b57023b0b0e1edd066a5cc401c5d1b
 EBUILD iotop-c-9999.ebuild 701 BLAKE2B d87011d19c473ce2c4cba8d2f954d1c4e5e7d3cb43f04cef30f62bc238ad995db40c090107c1633acf37e983520474148f4975305c54cd40d01f428068bf85f4 SHA512 99bdda36efce6b2174a17746c21fe7398bcdf515943139776ac8123189d681bd630c063e9efcbb3cb91827fac75f518f3501fb11b09086cbc49442848308c055
 MISC metadata.xml 1377 BLAKE2B 1b0e762f6677fd063044d1ad811fda5c95f64b36a51310dd3d9d0e652d9d671fe255a9cfa312d299369b19d4206723aa5010994ff6e20bf1b67be92432cb4350 SHA512 c5eee7ec3b5711666029d57eb84319e3f89373d7f73d067d1b990ecfcc6d98625966fb781ea3a47894ea078cfca40fc5f03a8d70dd83f7c93b8a77a6e14d2de0
diff --git a/sys-process/iotop-c/iotop-c-1.18.ebuild b/sys-process/iotop-c/iotop-c-1.18.ebuild
deleted file mode 100644
index b6d52c5d05fa..000000000000
--- a/sys-process/iotop-c/iotop-c-1.18.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps linux-info toolchain-funcs
-
-DESCRIPTION="top utility for IO (C port)"
-HOMEPAGE="https://github.com/Tomas-M/iotop"
-SRC_URI="https://github.com/Tomas-M/iotop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/iotop-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-libs/ncurses:=
-	!sys-process/iotop"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS"
-
-FILECAPS=(
-	cap_net_admin=eip usr/bin/iotop
-)
-
-src_compile() {
-	emake V=1 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" NO_FLTO=1
-}
-
-src_install() {
-	dobin iotop
-	dodoc README.md
-	doman iotop.8
-}
diff --git a/sys-process/iotop-c/iotop-c-1.20.ebuild b/sys-process/iotop-c/iotop-c-1.20.ebuild
index b6d52c5d05fa..dc0ad0349ff8 100644
--- a/sys-process/iotop-c/iotop-c-1.20.ebuild
+++ b/sys-process/iotop-c/iotop-c-1.20.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/iotop-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="sys-libs/ncurses:=
 	!sys-process/iotop"
diff --git a/sys-process/tiptop/Manifest b/sys-process/tiptop/Manifest
index b6375c571584..6327a91b1c34 100644
--- a/sys-process/tiptop/Manifest
+++ b/sys-process/tiptop/Manifest
@@ -1,4 +1,6 @@
 AUX tiptop-2.3.1-tinfo.patch 428 BLAKE2B d055899343b616e8c487be4285c86659f4912cd817c58639c206af365981440c3c6daefebc086409bcbdf294b5db60d477a9994be29eda89245c10d4e0916dfa SHA512 c22e2129deb1f41531ac515a4ded03f8d2afd9c12eb6fbb132758c239d3107443b80ac1f8318dd273ec701afd7ef247e914d7fa3fcd5e908ef5951ae31d953c2
 DIST tiptop-2.3.1.tar.gz 100993 BLAKE2B fd05d9d59fda2e81c194dedabb7d9d94220e790a8118048ebc3edd84706471a8892a918e02ebc7436c3c75e7a98c5c3ab98e11d614ced304ac81fdf8ce1951ed SHA512 73d275bc3957583524c872b401cf4fa773de7b4e7b7177f1787851f43e7c4aeefd953eb50b2dbce3babfc7a1c46707370ba4ad06998260177994b2eafb91395b
+DIST tiptop_2.3.1-4.debian.tar.xz 3716 BLAKE2B 14e5192888b99681f8114fd9abcafb4c2fc00b1923560ea93ba4c714dc1164731cdf16d42d73946413f743fe48b6d27151804f5f6e65cab7afa8834f54c683e1 SHA512 45d34abc16327bc443387c941c0477b2c491510c7cda1da8a7f7a704c8b891ef07c96122be46c501e55e471df5bcfd50919f586a67d8b91b764d3bdefa599872
 EBUILD tiptop-2.3.1.ebuild 515 BLAKE2B bd5e691132e7408e8b9b77fb16128d8e9e9e2cbd645a7fb32f584202acdfdc24bac161f80b4cbccfd8ca1a9dbf05598c818b068acba45e9c6c51cf853021368f SHA512 35afa6523ab82b4c20f68596035fd199c883f5edb2442c828ca9be6dc1040afa782ab3dcf9857a302f64e82e48a24706f1cc2978c120eee686a84c6d6ab71e25
+EBUILD tiptop-2.3.1_p4.ebuild 689 BLAKE2B 4caea000cf6a706f4b7d72409e7f25626c8e09d9f7e28c0ef786c2c2b4454dfd27ab13da7bca3de9af1982376a338873dc94c51ebed2137bd096ff86f40bcedb SHA512 fbddc02611f9c47ded68f8440a5f6be051918023aed19ae45ecb8c00a4e2360d38c74a802c2c2ab6c5a00933443b7eebec6f62d61ce0a948056c05639235793a
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/sys-process/tiptop/tiptop-2.3.1_p4.ebuild b/sys-process/tiptop/tiptop-2.3.1_p4.ebuild
new file mode 100644
index 000000000000..12c132e4234f
--- /dev/null
+++ b/sys-process/tiptop/tiptop-2.3.1_p4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="top for performance counters"
+HOMEPAGE="http://tiptop.gforge.inria.fr/"
+SRC_URI="http://${PN}.gforge.inria.fr/releases/${PN}-$(ver_cut 1-3).tar.gz"
+SRC_URI+=" http://deb.debian.org/debian/pool/main/t/tiptop/tiptop_${PV/_p/-}.debian.tar.xz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	sys-libs/ncurses:=
+	dev-libs/libxml2:2
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.1-tinfo.patch #618124
+	"${WORKDIR}"/debian/patches
+)
+
+src_prepare() {
+	default
+	eautoreconf #618124
+}
diff --git a/sys-process/usbtop/Manifest b/sys-process/usbtop/Manifest
index 5fef07375a01..b3d00601cc93 100644
--- a/sys-process/usbtop/Manifest
+++ b/sys-process/usbtop/Manifest
@@ -1,3 +1,3 @@
 DIST usbtop-1.0.tar.gz 626770 BLAKE2B 4f14e1e8d926ce7f6ffd1a276871d7d9072979d844a55e477c402bcac343a3cc14faebbfd3886b386a48b01399bcb748fb843453a0eee48b8e09578841eab356 SHA512 bc2003c1085fae238d99347bbf3caa1da7e44aa8f5b07abbde3f96b4124b301bbbc896f7b5e341665db1cdba44a59752884e3b9fe3a6104ef804aa94c510a5c0
-EBUILD usbtop-1.0.ebuild 650 BLAKE2B 351ed5aacfebc14582004e40c5a53e26899b8274bc0bde2bf88b6efb5986ea4a98495519134c4896a388104c2aea7593d6e02960046bd4575d3943665850ac62 SHA512 9cbd44a48928d0f11d0c56e23aa0c21e1642062ef793fb5c96083ba71ec9d42768588c7b10cc168a8b7e510a12e2ffb07b10783764b5860ce509b706050cae6e
+EBUILD usbtop-1.0.ebuild 657 BLAKE2B 54c11c3e58a2ac0773dcf9e4f9836b4672a25bd31b1d65693c476648b3ca7275c698cf4a99287b574ca2603d45a33ff14417676a479c5cca350e869ae2b9b035 SHA512 53fdd01fde21c04426f737e4e55ec2cf77e9f490c47f79b85ed511505b1a48943643ae913c6d3dbb02d8d4698c790adf3e33f382b7b2f1fc37c5a3c9c11a15cd
 MISC metadata.xml 248 BLAKE2B 289644a08c163016713ef605da208e5e305427bc7e76b65abc70af7167fdb4db34e89b0cfef631a702965e89e85058471b9dbab0abadb6d7bec3c8b2a72f3add SHA512 9030c9a82b92ffa1e5501c40175477a47e724fd841a78019a7a0a7e3bba91f19aaee02d286af9a1d71004f0003f6e2f04abd0f6799d830f76bf12bf67163e631
diff --git a/sys-process/usbtop/usbtop-1.0.ebuild b/sys-process/usbtop/usbtop-1.0.ebuild
index 2a1c6be84ff0..7b0e14747291 100644
--- a/sys-process/usbtop/usbtop-1.0.ebuild
+++ b/sys-process/usbtop/usbtop-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/aguinet/usbtop/archive/release-${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="net-libs/libpcap:=[usb]
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 799f9d39f64b..783aaf930cde 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index b1b6d96f253f..0f6ac9a306c7 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -2,8 +2,14 @@ EBUILD dist-kernel-5.10.68.ebuild 383 BLAKE2B 80eec9edaf8e2502e3d24e3c4c48b98ef7
 EBUILD dist-kernel-5.10.69.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.10.70.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.10.71.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.10.72.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.10.73.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.10.74.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.13.19.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.14.10.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.14.11.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.14.12.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
+EBUILD dist-kernel-5.14.13.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.14.7.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.14.8.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
 EBUILD dist-kernel-5.14.9.ebuild 387 BLAKE2B c298c77d3666332bfdbb45fa8e519ace2727083219db29dd9e4d6fbad78f40937a93c1492c87bdb0d699a17a1bf6308966c8fb621cc3a28428f9e2a04bc33fe0 SHA512 94d4e874020ff9e432bf2c0b3ff54c6e2bb6c0dd62589e3f352aa715b3f19bb5b215cf0bde795ef147fdba825329434edfa779c2f4e7fbbe426e9b2be9a18088
@@ -11,4 +17,7 @@ EBUILD dist-kernel-5.4.148.ebuild 378 BLAKE2B 425766351233e0cc1717be1ad4fd1e200b
 EBUILD dist-kernel-5.4.149.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.150.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 EBUILD dist-kernel-5.4.151.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
+EBUILD dist-kernel-5.4.152.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
+EBUILD dist-kernel-5.4.153.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
+EBUILD dist-kernel-5.4.154.ebuild 382 BLAKE2B 5196a1f590f9c3e29485cf25a5b5da23b2c8745d1e53960412f9abe6f93c0bd6ac88fe6469e2cfc9a301ae16c6a0c1103b5a757aaf5c26fe07e6acf7e3b57900 SHA512 70ce3d9a474bcfe30cd2afd0d62d4afab6a95ddded02a89b22518deb138902b80a5abdc779c6e13cb56874c35fdc71e2690ae4df7478dc3bd0e46ed388caff3f
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.10.72.ebuild b/virtual/dist-kernel/dist-kernel-5.10.72.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.72.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.73.ebuild b/virtual/dist-kernel/dist-kernel-5.10.73.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.73.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.74.ebuild b/virtual/dist-kernel/dist-kernel-5.10.74.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.74.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.14.11.ebuild b/virtual/dist-kernel/dist-kernel-5.14.11.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.14.11.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.14.12.ebuild b/virtual/dist-kernel/dist-kernel-5.14.12.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.14.12.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.14.13.ebuild b/virtual/dist-kernel/dist-kernel-5.14.13.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.14.13.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.152.ebuild b/virtual/dist-kernel/dist-kernel-5.4.152.ebuild
new file mode 100644
index 000000000000..11d6573ded7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.152.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.153.ebuild b/virtual/dist-kernel/dist-kernel-5.4.153.ebuild
new file mode 100644
index 000000000000..11d6573ded7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.153.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.154.ebuild b/virtual/dist-kernel/dist-kernel-5.4.154.ebuild
new file mode 100644
index 000000000000..11d6573ded7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.154.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index be9b307b17b3..d751849d093e 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,3 +1,4 @@
 EBUILD jdk-1.8.0-r6.ebuild 481 BLAKE2B 4dceecb033e5ac793574de2b244c3562690d17b8c8fbdca133d70810904a715d61f9ac440ce023011c6c4057a95cad88facaccaf98f3e0c45f56e31672afd3e3 SHA512 5e0fa11e168efa9cdf3d9ccdd76b2e3da8b240a419505e93eb28d6d83cd39e0629855674ab5a737c19d1157d352234a0b5fa7a852c75ded74848b8eafbe057bd
 EBUILD jdk-11-r2.ebuild 368 BLAKE2B cee739058d7440f90d7df0dcd51852d760f05f7bf7a358ea3b46d12563bf946e0379ba78d87e358816bcd133c089c6e684d8377aafee24bbb37b3f01dfbeb10b SHA512 c98d5bf5af5ad469dcdc00da7aa89e8888f9bed61a1578a635ee3aead34f2374e1bd0a23e1b82b8ad6f666783c292930b49c0fe43181e1b2113740362f8ecee4
+EBUILD jdk-17.ebuild 368 BLAKE2B 62b930d57535aec19061d8af0444b227e327717b0396cd0c785bbd75d02b71456317d41c4dfaa41a080865e0263fc6ec78e737dc3937aa0f3db3523869b1de87 SHA512 6ef4bbd5949c0d074813337cea3a268be1f65b274ed28792695fac7eac242f1c3ce4964dc1a9fa248080332287eda1088b7a05dd35e7b15d6ccbe740c5f7fe01
 MISC metadata.xml 368 BLAKE2B 6298bd4e4c427585545c1ea59e3fd7ddbdbf16e1faf4c441a60d55b31f7512c60b68c1069b357c8e1f330ae2119d717a8d3fc2381f5f2d431a2d1309fde5dd79 SHA512 61caf57982be84ef09b17d7bac1237973a450d8778fc5f93e126e9dd64ecc2e6a936db0609a5072a070d7815903197ec534602ed941925ad5890111862d9ccee
diff --git a/virtual/jdk/jdk-17.ebuild b/virtual/jdk/jdk-17.ebuild
new file mode 100644
index 000000000000..56e0de933b79
--- /dev/null
+++ b/virtual/jdk/jdk-17.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual for Java Development Kit (JDK)"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+IUSE="headless-awt"
+
+RDEPEND="|| (
+		dev-java/openjdk-bin:${SLOT}[gentoo-vm(+),headless-awt=]
+		dev-java/openjdk:${SLOT}[gentoo-vm(+),headless-awt=]
+)"
diff --git a/virtual/jre/Manifest b/virtual/jre/Manifest
index 866a0025ca9b..a5ca9f37d815 100644
--- a/virtual/jre/Manifest
+++ b/virtual/jre/Manifest
@@ -1,3 +1,4 @@
 EBUILD jre-1.8.0-r3.ebuild 360 BLAKE2B 8c604b057765e57f590bf68f5b0140bbc297ddb72620ae6a5dc2dd4ad76509e9de4ff7f7e9bf7dd9bb6ac13e044f0619830b6d9d333759a50f788606d0a8e1a2 SHA512 e06698ef632b0216dfde10e01e16edb67de267fe8b6d1957be38121e5296e6e56f67d80c3c91b850ef564565a05ae13872ea86880fb36d072e913dfe1931bc46
 EBUILD jre-11-r2.ebuild 309 BLAKE2B 8e7122f9553999b5be2e96b35b8f27f1725335722dbe6e9ca600c6f0fd35fded12e3b1d52a9c2226a3ebcfba1caeb62359d7e184637792ee63e29f94ad1c3157 SHA512 67c40b8ccbcf03ff91d834bb03fb5f51a0ee7b453e9b116d4120839484669bb610f9acfd9c9180d24dd399e99b9e7db0828fb52a34598256363dbe49028c469f
+EBUILD jre-17.ebuild 309 BLAKE2B 94028e7d13318e1afd205542d28f0b7c0377ffcc9d941fc94bca8761b6cc6d20bb07987d8777863376cdc7d0165b1c6f53e135945a2db0543314cae0db03ce5d SHA512 29ca37ff83300bf2fe7e427dead3b1997e1631517bc7638152f3da4be64b7eb8fc3bd28f71c35f3ae3370f969122accd0d1427b463b5ce23fd0262055c42a5af
 MISC metadata.xml 261 BLAKE2B 8f415bc9d8eed52fb60eea18c29354c635602c7f571670dfe3adf98c7bc0d0d4daf923d2a2b45a825caded195310ab81240f645b006f0cb820681eb1835f4325 SHA512 1842d84b92b5dacd5280960a97380be4625bc7e210aaf9ae62845d7e0c09bdad394151e2edd0fd4dc987d3d16460c67e55512d78de36165fe3e6ad87d029a23b
diff --git a/virtual/jre/jre-17.ebuild b/virtual/jre/jre-17.ebuild
new file mode 100644
index 000000000000..d6f67d7c2689
--- /dev/null
+++ b/virtual/jre/jre-17.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+RDEPEND="|| (
+		virtual/jdk:${SLOT}
+		dev-java/openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
+)"
diff --git a/virtual/mpi/Manifest b/virtual/mpi/Manifest
index 95af9ce4081a..805be704aaa5 100644
--- a/virtual/mpi/Manifest
+++ b/virtual/mpi/Manifest
@@ -1,4 +1,4 @@
 EBUILD mpi-2.0-r3.ebuild 509 BLAKE2B a8b0a85d8f4e6f70a9e23bcc65be19ca3bbbb9c0ee483b2198c300261f360a978b88648e847d2477bad177fd3f5bc973220a3f592ef4e6da921c732ceb6a5c53 SHA512 cbaef1f75b8955f427f472ffac7285d25129dafc6a7f5d8364a3a9be4d3f4234d7b1125da1434b1ff644d767a8e1303b250d54c2eccae13abcc11a926afb69ca
 EBUILD mpi-2.0-r4.ebuild 707 BLAKE2B e2f4f094d2c1e47540cdc2f4653b7e6b4cbadad21eaa7aa12871c734d1ba9acc89894dd8cc04c42b9611e502aeaf4ad67cc19e7fdb69b95b2f5069242fe9ac8b SHA512 c23d0cfafaee2cccb494421eb8f35f45766457da9ffe50004883574cde9b3696e2d872401908ead23578b4e91b9da4a0836c577abda2226626d90b8edac2f44c
-EBUILD mpi-2.0-r5.ebuild 721 BLAKE2B 35c52b436dfe2218434c7b59e17e1fce536347d563a51d588bdf2a5e56cb513d2c2b8dc341708b124bea2964ff74cffcbe250244af7dabe9db3b86e349da66d7 SHA512 874fe1ec980bbcd65790315e9e195372feba2e634c10f463f5134b7e63b4d836608c9b825c38c73747638887e8e3f15523c49b17fbc7949e6f9273f48e3780fd
+EBUILD mpi-2.0-r5.ebuild 717 BLAKE2B 399d8e0314bea3caa6287cbfd9081d52110edabf48704b47dc4dd7d87194d8d8c31553b4ccd7f06d77e54f6c5d03c020e8d3235c46be72aa63bc5463626c3086 SHA512 4cf9da1bc3b9b4d16eb9b42d6e6c12437277586287c076bd9c69505369b186e6792e4d1897234102c81d18638ad19de8b58e1d3fbf0f7bd087a5f8e7678a7b1b
 MISC metadata.xml 374 BLAKE2B 3be463a9aa6135e593d42b44862f314056bfcb6369887d85593d40e45b94b645c65c4cb5fbc2a625a6ced8874beccac4479fa2de47341bca75afebb4613a2da9 SHA512 82790fe2199aaa291b8d0ba67ec61963425b7b545824a0dc90818a66ac0fee4b23b6dd80897998ebd6fc7729eb2d2614272e64aa17b436da488ca309609ce4b9
diff --git a/virtual/mpi/mpi-2.0-r5.ebuild b/virtual/mpi/mpi-2.0-r5.ebuild
index 25670effcc3f..567246231942 100644
--- a/virtual/mpi/mpi-2.0-r5.ebuild
+++ b/virtual/mpi/mpi-2.0-r5.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for Message Passing Interface (MPI) v2.0 implementation"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cxx fortran romio threads"
 
 RDEPEND="|| (
diff --git a/virtual/perl-Archive-Tar/Manifest b/virtual/perl-Archive-Tar/Manifest
index 771660528cde..f1a07c8ad1e0 100644
--- a/virtual/perl-Archive-Tar/Manifest
+++ b/virtual/perl-Archive-Tar/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Archive-Tar-2.360.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Archive-Tar-2.380.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.360.0.ebuild b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.360.0.ebuild
deleted file mode 100644
index 0f06442ac78c..000000000000
--- a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.360.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-CPAN/Manifest b/virtual/perl-CPAN/Manifest
index 447e2beb2a41..fdfb5aa7309d 100644
--- a/virtual/perl-CPAN/Manifest
+++ b/virtual/perl-CPAN/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-CPAN-2.270.0.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
 EBUILD perl-CPAN-2.280.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-CPAN/perl-CPAN-2.270.0.ebuild b/virtual/perl-CPAN/perl-CPAN-2.270.0.ebuild
deleted file mode 100644
index b14ab47098c6..000000000000
--- a/virtual/perl-CPAN/perl-CPAN-2.270.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Carp/Manifest b/virtual/perl-Carp/Manifest
index b9d5a13621e7..be7e54de544d 100644
--- a/virtual/perl-Carp/Manifest
+++ b/virtual/perl-Carp/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Carp-1.500.0-r3.ebuild 542 BLAKE2B d4bc36b090ea97b75164d15999a61a0ec94fc4081d44dbe124fc3b2a3ebeb90f13595afb32034b29929672af1de2e7b2f16813f169ade02c27f4091d254a7dbd SHA512 8d98f143b08fb32eea87a98eac02873806c29d41b5b1bd43bdf1f2b2776b85f3c560286b6d09c9f4fbc1d71e226de889c280f5ecafd98895596456c385f4e4ec
 EBUILD perl-Carp-1.520.0-r1.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Carp/perl-Carp-1.500.0-r3.ebuild b/virtual/perl-Carp/perl-Carp-1.500.0-r3.ebuild
deleted file mode 100644
index ffa75f024ab8..000000000000
--- a/virtual/perl-Carp/perl-Carp-1.500.0-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Compress-Raw-Bzip2/Manifest b/virtual/perl-Compress-Raw-Bzip2/Manifest
index f84cfb1d0929..304174f30e66 100644
--- a/virtual/perl-Compress-Raw-Bzip2/Manifest
+++ b/virtual/perl-Compress-Raw-Bzip2/Manifest
@@ -1,3 +1,2 @@
 EBUILD perl-Compress-Raw-Bzip2-2.101.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
-EBUILD perl-Compress-Raw-Bzip2-2.93.0.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.93.0.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.93.0.ebuild
deleted file mode 100644
index b14ab47098c6..000000000000
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.93.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Compress-Raw-Zlib/Manifest b/virtual/perl-Compress-Raw-Zlib/Manifest
index 967f331001d2..abdff148558c 100644
--- a/virtual/perl-Compress-Raw-Zlib/Manifest
+++ b/virtual/perl-Compress-Raw-Zlib/Manifest
@@ -1,3 +1,2 @@
 EBUILD perl-Compress-Raw-Zlib-2.101.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
-EBUILD perl-Compress-Raw-Zlib-2.93.0.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.93.0.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.93.0.ebuild
deleted file mode 100644
index b14ab47098c6..000000000000
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.93.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-DB_File/Manifest b/virtual/perl-DB_File/Manifest
index 9cc298b7659f..ccc9e54f820d 100644
--- a/virtual/perl-DB_File/Manifest
+++ b/virtual/perl-DB_File/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-DB_File-1.853.0.ebuild 529 BLAKE2B 4f3467467239114b3ebf508a146bda1dda0f0330c8cd1b9e2c3cc4508d93d6fa64e50c0019591b98517abe41a35017051e45fd0605c4900b7d35fead63e1edd2 SHA512 c60f1634d3913c57ed4e8b857794f1319a71e16b61df5119a8c4488f6847e8f835cb6825427d8b7701a2653c2df953435d83838c9c3e80f051143665af3b548c
 EBUILD perl-DB_File-1.855.0.ebuild 529 BLAKE2B 49833a2cc9de956edf7a67ce07f682f392aa9bb1f576752c8a432024b03df2611bd4e396c6e397c20a467459b699200dd91fa80c1d7f26af8716e8e13526e717 SHA512 4ef748e4a7f87d315586287e565ac0d1fede26338f93214e5a90d75f68bd100584a8d8a4864d4e7d9cc7c32ba6cd73d0b5f1cdb909a3d547c60bb6f9dd29c2f6
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-DB_File/perl-DB_File-1.853.0.ebuild b/virtual/perl-DB_File/perl-DB_File-1.853.0.ebuild
deleted file mode 100644
index f55462db2340..000000000000
--- a/virtual/perl-DB_File/perl-DB_File-1.853.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32*[berkdb] ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Data-Dumper/Manifest b/virtual/perl-Data-Dumper/Manifest
index bc245580613a..2fa04b679799 100644
--- a/virtual/perl-Data-Dumper/Manifest
+++ b/virtual/perl-Data-Dumper/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Data-Dumper-2.174.10_rc.ebuild 523 BLAKE2B 79e27c9a1b607a9a48c0ec116609a58eea98b9454a82f37ac36089fccf1b65c4573e56c2b01fc5853a2d3f8aed41bf289c2595434d13dc957f4bb66d42a73fa6 SHA512 0558cc737f8aac66ad7f8f90574ba203266a96fa0c943f4eb04d6056dda0baddd30e1a0e8eb483307a873c557ec85253f26a178a36afb77eec70848ef51a2468
 EBUILD perl-Data-Dumper-2.179.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.10_rc.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.10_rc.ebuild
deleted file mode 100644
index f78cf29a24d9..000000000000
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.10_rc.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32.1* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Devel-PPPort/Manifest b/virtual/perl-Devel-PPPort/Manifest
index 09ac615320d0..464934583203 100644
--- a/virtual/perl-Devel-PPPort/Manifest
+++ b/virtual/perl-Devel-PPPort/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Devel-PPPort-3.570.0.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
 EBUILD perl-Devel-PPPort-3.620.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.570.0.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.570.0.ebuild
deleted file mode 100644
index b14ab47098c6..000000000000
--- a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.570.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Digest-MD5/Manifest b/virtual/perl-Digest-MD5/Manifest
index 4acb7140afd1..5a757a555408 100644
--- a/virtual/perl-Digest-MD5/Manifest
+++ b/virtual/perl-Digest-MD5/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Digest-MD5-2.550.100_rc.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
 EBUILD perl-Digest-MD5-2.580.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.100_rc.ebuild b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.100_rc.ebuild
deleted file mode 100644
index b14ab47098c6..000000000000
--- a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.100_rc.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Digest/Manifest b/virtual/perl-Digest/Manifest
index 6b131705a751..3b1cd5ad68e5 100644
--- a/virtual/perl-Digest/Manifest
+++ b/virtual/perl-Digest/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Digest-1.170.100_rc-r10.ebuild 542 BLAKE2B d4bc36b090ea97b75164d15999a61a0ec94fc4081d44dbe124fc3b2a3ebeb90f13595afb32034b29929672af1de2e7b2f16813f169ade02c27f4091d254a7dbd SHA512 8d98f143b08fb32eea87a98eac02873806c29d41b5b1bd43bdf1f2b2776b85f3c560286b6d09c9f4fbc1d71e226de889c280f5ecafd98895596456c385f4e4ec
 EBUILD perl-Digest-1.190.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Digest/perl-Digest-1.170.100_rc-r10.ebuild b/virtual/perl-Digest/perl-Digest-1.170.100_rc-r10.ebuild
deleted file mode 100644
index ffa75f024ab8..000000000000
--- a/virtual/perl-Digest/perl-Digest-1.170.100_rc-r10.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Encode/Manifest b/virtual/perl-Encode/Manifest
index 7917897663f5..85105b026d88 100644
--- a/virtual/perl-Encode/Manifest
+++ b/virtual/perl-Encode/Manifest
@@ -1,4 +1,3 @@
 EBUILD perl-Encode-3.120.0.ebuild 426 BLAKE2B be23ce796ab246ce12ffb78688bb79967c19811c1cd8adbc99106851f5dd3c62c933d9d0979c3ead5cc66521074ec2a1ad3bef4a0d0d2520811201f226903f7b SHA512 de0ee3de1eb0b22a47a4dd0d98b9d74960b074a7d0b968c1651fe0656308c6f3f2ac0a2b752424c54bc2f4113f6cd912829bfd92ae9177a34f12efe167b52757
-EBUILD perl-Encode-3.60.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Encode-3.80.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Encode/perl-Encode-3.60.0.ebuild b/virtual/perl-Encode/perl-Encode-3.60.0.ebuild
deleted file mode 100644
index 0f06442ac78c..000000000000
--- a/virtual/perl-Encode/perl-Encode-3.60.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Exporter/Manifest b/virtual/perl-Exporter/Manifest
index 0fb3109a273b..114fb1bac3c4 100644
--- a/virtual/perl-Exporter/Manifest
+++ b/virtual/perl-Exporter/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Exporter-5.740.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Exporter-5.760.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Exporter/perl-Exporter-5.740.0.ebuild b/virtual/perl-Exporter/perl-Exporter-5.740.0.ebuild
deleted file mode 100644
index 0f06442ac78c..000000000000
--- a/virtual/perl-Exporter/perl-Exporter-5.740.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-ExtUtils-CBuilder/Manifest b/virtual/perl-ExtUtils-CBuilder/Manifest
index 9b2e3d540c79..095b402762e3 100644
--- a/virtual/perl-ExtUtils-CBuilder/Manifest
+++ b/virtual/perl-ExtUtils-CBuilder/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-ExtUtils-CBuilder-0.280.234.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-ExtUtils-CBuilder-0.280.236.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.234.ebuild b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.234.ebuild
deleted file mode 100644
index 0f06442ac78c..000000000000
--- a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.234.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-ExtUtils-Install/Manifest b/virtual/perl-ExtUtils-Install/Manifest
index 62316ec605ff..e7a0b13c2f18 100644
--- a/virtual/perl-ExtUtils-Install/Manifest
+++ b/virtual/perl-ExtUtils-Install/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-ExtUtils-Install-2.140.0-r3.ebuild 547 BLAKE2B 9c064b40ec4108ca4c5483ee2fa690d0ded4de4b2a5818f1f7cfbd5579c1e02035f0aa810952d3a396e0c2ccb4d842b12cc9c53a8dcfaaeb7f498a04625dbec9 SHA512 ecfca2790240fb697afd95b28e1a65c70280395313535467d03c6e08d1c8ac0be1690837f2a2809372bdc6319baeb63c8430e1424cb28926c8a25a0b9915d0a0
 EBUILD perl-ExtUtils-Install-2.200.0.ebuild 526 BLAKE2B 28813084bd6fd7f0d7a7258d7276fe0666d773f5694f1d8685e36dc2bc54e6f49e2f16d80c3186137e7817c90a8eb348f936c4633676df3a3d41fa1eec00928f SHA512 79db742a3e2db284175cb7a06dda3f237cbb529351aa94d743847abebe526322b1d93f3d4258701458775383d8fd3566c03bc4c6b0f6fd3746869c4758e307a6
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r3.ebuild b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r3.ebuild
deleted file mode 100644
index c129138f247d..000000000000
--- a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ExtUtils-Install"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-ExtUtils-MakeMaker/Manifest b/virtual/perl-ExtUtils-MakeMaker/Manifest
index 682f6766c9d6..fd1079547cd9 100644
--- a/virtual/perl-ExtUtils-MakeMaker/Manifest
+++ b/virtual/perl-ExtUtils-MakeMaker/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-ExtUtils-MakeMaker-7.440.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-ExtUtils-MakeMaker-7.620.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.440.0.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.440.0.ebuild
deleted file mode 100644
index 0f06442ac78c..000000000000
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.440.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-ExtUtils-Manifest/Manifest b/virtual/perl-ExtUtils-Manifest/Manifest
index 31cebe6779f3..853734750a94 100644
--- a/virtual/perl-ExtUtils-Manifest/Manifest
+++ b/virtual/perl-ExtUtils-Manifest/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-ExtUtils-Manifest-1.720.0-r1.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
 EBUILD perl-ExtUtils-Manifest-1.730.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0-r1.ebuild b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0-r1.ebuild
deleted file mode 100644
index 4437c13809e1..000000000000
--- a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-ExtUtils-ParseXS/Manifest b/virtual/perl-ExtUtils-ParseXS/Manifest
index f59b0cd3751c..1de23f7d9216 100644
--- a/virtual/perl-ExtUtils-ParseXS/Manifest
+++ b/virtual/perl-ExtUtils-ParseXS/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-ExtUtils-ParseXS-3.400.0-r1.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
 EBUILD perl-ExtUtils-ParseXS-3.430.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0-r1.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0-r1.ebuild
deleted file mode 100644
index 4437c13809e1..000000000000
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-File-Path/Manifest b/virtual/perl-File-Path/Manifest
index 5296d02a077f..57859d1ddd61 100644
--- a/virtual/perl-File-Path/Manifest
+++ b/virtual/perl-File-Path/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-File-Path-2.160.0-r1.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
 EBUILD perl-File-Path-2.180.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-File-Path/perl-File-Path-2.160.0-r1.ebuild b/virtual/perl-File-Path/perl-File-Path-2.160.0-r1.ebuild
deleted file mode 100644
index 4437c13809e1..000000000000
--- a/virtual/perl-File-Path/perl-File-Path-2.160.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-File-Spec/Manifest b/virtual/perl-File-Spec/Manifest
index 0b33c81a1f76..28d5a9af49d2 100644
--- a/virtual/perl-File-Spec/Manifest
+++ b/virtual/perl-File-Spec/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-File-Spec-3.780.0-r1.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
 EBUILD perl-File-Spec-3.800.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.780.0-r1.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.780.0-r1.ebuild
deleted file mode 100644
index 4437c13809e1..000000000000
--- a/virtual/perl-File-Spec/perl-File-Spec-3.780.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-File-Temp/Manifest b/virtual/perl-File-Temp/Manifest
index e166f07ef517..8f4cec3fda39 100644
--- a/virtual/perl-File-Temp/Manifest
+++ b/virtual/perl-File-Temp/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-File-Temp-0.230.900.ebuild 522 BLAKE2B 09b2a3f4872d24bb36e4eb2a5f8b23d5b028cca525061bc6e7504a05c19fdcfdb4a1951361c85823fc8b61034671ac1cce15413525363aa127951f7716ad551a SHA512 9a84462c014b0b56f3a147b6999d8536a5abf84476a3121a678f0ae39444a06c83ab0f9a9066cff7596120f88c33eaa63ae377c8dbe5d9f5b7dc501f9ec25d6d
 EBUILD perl-File-Temp-0.231.100.ebuild 499 BLAKE2B 6df6c4e77a729558b260dd0231c467842cd8f941e561ce3d853881aabfa949915036a63877bda25938ad3fe9b173fbce7c7956efd317188bd6392b3add2f9b98 SHA512 e9ac3b823f591dc3cf8123b5f7b8bb94fe0d082e8cdc0f9253eb7e1377f69f79ff2738adb0cacc13044079f8f22036932089abc66be2ace04eb0c9863a1c8650
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-File-Temp/perl-File-Temp-0.230.900.ebuild b/virtual/perl-File-Temp/perl-File-Temp-0.230.900.ebuild
deleted file mode 100644
index bab6aff56c6e..000000000000
--- a/virtual/perl-File-Temp/perl-File-Temp-0.230.900.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	~perl-core/${PN#perl-}-${PV}
-	dev-lang/perl:=
-"
-
-# this is the dev-lang/perl-5.30 and dev-lang/perl-5.32 version but we need the security patch
diff --git a/virtual/perl-Getopt-Long/Manifest b/virtual/perl-Getopt-Long/Manifest
index fa0a3fa85f8b..de50e14c3048 100644
--- a/virtual/perl-Getopt-Long/Manifest
+++ b/virtual/perl-Getopt-Long/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Getopt-Long-2.510.0.ebuild 521 BLAKE2B 8768cdc38c89d1f334d82458407e4590e461b3cc5164c4006890281f577bb86272f3eb0e81b030c4e7582d5451611a451cd20caf348c65050edfb134a9e7c2ff SHA512 056592fe3e3ec5934282d48ec81ebfc3615e9364b61bcf2a5a8eea9efcf2a18e87c08d7a922bf197a9ed05fb73ee5f4481cdbd33aec471704acc2a9efa837492
 EBUILD perl-Getopt-Long-2.520.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.510.0.ebuild b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.510.0.ebuild
deleted file mode 100644
index b14ab47098c6..000000000000
--- a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.510.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-I18N-LangTags/Manifest b/virtual/perl-I18N-LangTags/Manifest
index 9544c2d3ca41..7b9e4521f322 100644
--- a/virtual/perl-I18N-LangTags/Manifest
+++ b/virtual/perl-I18N-LangTags/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-I18N-LangTags-0.440.0.ebuild 529 BLAKE2B 8c54723ec2ff280d5df2c8e1ef61d966ebdf6a0c2a23fbb9bb2b97cf27ae01579a24a7c8f723ad61bbd2a1a4f5fdcb23bc223ff9fa01317351aec6533dab55b3 SHA512 3b8948f3c5b097b9130c328b66914679857462d828dd22b3c550513bb25dec5452d59a60eaad37aefebfa4c141196f2e6b6380847ba01c8b1995b62def8fb9b1
 EBUILD perl-I18N-LangTags-0.450.0.ebuild 529 BLAKE2B 8cab532c66b2d8164ca506ca12ae9dcaf33ba5d8aa1f961c6865e0760e4a3954d96e3960ce8614426204eb895789023c7fa8267ae375aa54ef5653c570e46908 SHA512 74034f8c2147a9f39a6030f3669d2fed62f50d2f1ad1784fbfeb5fce4bdaf53ecc4c5c795693563e343039a2b6e3613639b6f5470c5e4abfec442ba82412f3df
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.440.0.ebuild b/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.440.0.ebuild
deleted file mode 100644
index d392ebebe8ab..000000000000
--- a/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.440.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for I18N-LangTags"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/I18N-LangTags-${PV} )
-	dev-lang/perl:=
-	!<perl-core/I18N-LangTags-${PV}
-	!>perl-core/I18N-LangTags-${PV}-r999
-"
diff --git a/virtual/perl-IO-Compress/Manifest b/virtual/perl-IO-Compress/Manifest
index db651974d333..17752491c48a 100644
--- a/virtual/perl-IO-Compress/Manifest
+++ b/virtual/perl-IO-Compress/Manifest
@@ -1,3 +1,2 @@
 EBUILD perl-IO-Compress-2.102.0.ebuild 708 BLAKE2B c02b5f359db69c330489271cb17a7e21070b717e311f862f40f89e8383884de3c566fed79013f983ec2a2b93f112e08bf5fdbfaa4d0d28dcf8c7e951562051d7 SHA512 23b728a08e800c214cfac5fadefefffe83933f22b612fa36f18003b3d4ac92970178d54697e479f1abb44f727274a33c7cb19eb719f4d29870f4e0a3e3cc0716
-EBUILD perl-IO-Compress-2.93.0.ebuild 704 BLAKE2B 7662907ccf152886e72630215a0003b64258cd1f1bbc7cb4809a1c88644a203bd6897a3726eb2bc12276d7a33bd3c1d072a5d989d6a6c515fe106fd50c8dbfe9 SHA512 83a59823c76c1c653cba972273df2dfb36240f86998ac2d9c70d698014a09f70c1fb299ba9311b31dcc0849cda396f25998f39fe415e30ed925d7a1c6633aa6a
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.93.0.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.93.0.ebuild
deleted file mode 100644
index ab6ba0abb10a..000000000000
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.93.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-	>=virtual/perl-Compress-Raw-Zlib-${PV}
-	>=virtual/perl-Compress-Raw-Bzip2-${PV}
-"
-# Dependencies on Compress-Raw* must be kept in step
-# but sometimes not .... use ${PV} when you can.
diff --git a/virtual/perl-IO-Socket-IP/Manifest b/virtual/perl-IO-Socket-IP/Manifest
index 519173e80729..986867e88584 100644
--- a/virtual/perl-IO-Socket-IP/Manifest
+++ b/virtual/perl-IO-Socket-IP/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-IO-Socket-IP-0.390.0-r3.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
 EBUILD perl-IO-Socket-IP-0.410.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r3.ebuild b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r3.ebuild
deleted file mode 100644
index 4437c13809e1..000000000000
--- a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-IO-Zlib/Manifest b/virtual/perl-IO-Zlib/Manifest
index 3a5f1491effe..263c8b869f83 100644
--- a/virtual/perl-IO-Zlib/Manifest
+++ b/virtual/perl-IO-Zlib/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-IO-Zlib-1.100.0-r14.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
 EBUILD perl-IO-Zlib-1.110.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r14.ebuild b/virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r14.ebuild
deleted file mode 100644
index 4437c13809e1..000000000000
--- a/virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r14.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-IO/Manifest b/virtual/perl-IO/Manifest
index a4618cf83ee7..b1ba729f1d41 100644
--- a/virtual/perl-IO/Manifest
+++ b/virtual/perl-IO/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-IO-1.430.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-IO-1.460.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-IO/perl-IO-1.430.0.ebuild b/virtual/perl-IO/perl-IO-1.430.0.ebuild
deleted file mode 100644
index 0f06442ac78c..000000000000
--- a/virtual/perl-IO/perl-IO-1.430.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-JSON-PP/Manifest b/virtual/perl-JSON-PP/Manifest
index ae2975604a77..a44c8f2ea718 100644
--- a/virtual/perl-JSON-PP/Manifest
+++ b/virtual/perl-JSON-PP/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-JSON-PP-4.40.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-JSON-PP-4.60.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-JSON-PP/perl-JSON-PP-4.40.0.ebuild b/virtual/perl-JSON-PP/perl-JSON-PP-4.40.0.ebuild
deleted file mode 100644
index 0f06442ac78c..000000000000
--- a/virtual/perl-JSON-PP/perl-JSON-PP-4.40.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-MIME-Base64/Manifest b/virtual/perl-MIME-Base64/Manifest
index eeca32bb717c..29685dbe67f6 100644
--- a/virtual/perl-MIME-Base64/Manifest
+++ b/virtual/perl-MIME-Base64/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-MIME-Base64-3.150.0-r7.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
 EBUILD perl-MIME-Base64-3.160.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-MIME-Base64/perl-MIME-Base64-3.150.0-r7.ebuild b/virtual/perl-MIME-Base64/perl-MIME-Base64-3.150.0-r7.ebuild
deleted file mode 100644
index 4437c13809e1..000000000000
--- a/virtual/perl-MIME-Base64/perl-MIME-Base64-3.150.0-r7.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Math-Complex/Manifest b/virtual/perl-Math-Complex/Manifest
index a7c6d798dd66..9f060cc2db5c 100644
--- a/virtual/perl-Math-Complex/Manifest
+++ b/virtual/perl-Math-Complex/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Math-Complex-1.590.100-r4.ebuild 536 BLAKE2B 2feab1b5ea634b6849b49af94c5fd40a269c440d808e773e02592b6c05f8933c0ed9219f0bd489dc693a791fddfbc0b468dd9008448353a8ab01eb4bf671074e SHA512 f0a012512795bb506ba61c324a1f126bd589d281b7dff34aa992aeb8351948807b49c59fb8e04a0071cf6cf2f76365abe2f5a31a6715fbc934e05d3cd75e16ec
 EBUILD perl-Math-Complex-1.590.200.ebuild 522 BLAKE2B c31d063cf14a75ffe5815c3292f86a263bbeab2f9f0b5b3566356d6ceee45e69e4b57712149259ba1e9130bf5a86f6700966b218e0ee04b637157f2d61ec059c SHA512 2f284610519461c00ec51862cff72d9c79e72e8d4120f1d6728ec082a392525f4ccfb17ee8532d359fe743b8a616b4b937128e4694bd9bec60ed10ca34d1179a
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-r4.ebuild b/virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-r4.ebuild
deleted file mode 100644
index 5c0ca2ca0adf..000000000000
--- a/virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Module-CoreList/Manifest b/virtual/perl-Module-CoreList/Manifest
index 9c8a542ad890..a86eaf7a7ce9 100644
--- a/virtual/perl-Module-CoreList/Manifest
+++ b/virtual/perl-Module-CoreList/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Module-CoreList-5.202.101.230.ebuild 644 BLAKE2B ee7a8a0992416a1b59c5961d8041b259c86d1fe650f6bc2fcc7b65df35ea57d79b43723105729a2516a41af7dabf010a6eff2f7740b2235b919c761917ac2f15 SHA512 4977d9f201bfcfcd2fee8914b423846cd063af6155915f248249416b3dd7d1488b0203a90351a791b4c53a716d1e0281a0550f1abf35a60a0e814ae074d22b11
 EBUILD perl-Module-CoreList-5.202.105.200.ebuild 644 BLAKE2B 7892122cf84cc47e8629a710e2179942b1d1adbe53e38743410c81672069964126b14bb7c9e51c686d2e97b8484e58945ec97920c752da9f1d3c920b0ab5eb22 SHA512 828d796d90a6f7d33d5cee88e86f8b8f3ead5ae7576aebfb8d8ae85976fbf40993f9b9a1c5eb169ad1626208e9d3272778d068dfd3f32a6542803472e5ab8cfd
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.101.230.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.101.230.ebuild
deleted file mode 100644
index 364abed85de9..000000000000
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.101.230.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-# Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
-# When bumping this package.
-RDEPEND="
-	|| ( =dev-lang/perl-5.32.1* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Module-Load-Conditional/Manifest b/virtual/perl-Module-Load-Conditional/Manifest
index 192a6ead36e5..0af825c407b4 100644
--- a/virtual/perl-Module-Load-Conditional/Manifest
+++ b/virtual/perl-Module-Load-Conditional/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Module-Load-Conditional-0.700.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Module-Load-Conditional-0.740.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.700.0.ebuild b/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.700.0.ebuild
deleted file mode 100644
index 0f06442ac78c..000000000000
--- a/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.700.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Module-Load/Manifest b/virtual/perl-Module-Load/Manifest
index 1a383921c7e5..942057def7a9 100644
--- a/virtual/perl-Module-Load/Manifest
+++ b/virtual/perl-Module-Load/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Module-Load-0.340.0-r1.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
 EBUILD perl-Module-Load-0.360.0-r1.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Module-Load/perl-Module-Load-0.340.0-r1.ebuild b/virtual/perl-Module-Load/perl-Module-Load-0.340.0-r1.ebuild
deleted file mode 100644
index 4437c13809e1..000000000000
--- a/virtual/perl-Module-Load/perl-Module-Load-0.340.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Net-Ping/Manifest b/virtual/perl-Net-Ping/Manifest
index 6eada9a99510..21ccac0f6b56 100644
--- a/virtual/perl-Net-Ping/Manifest
+++ b/virtual/perl-Net-Ping/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Net-Ping-2.720.0.ebuild 515 BLAKE2B ae500da3f4d0515bda1fb5c1eaa8b9b1cb9aeab03c62b5f05174de502befb537fd3522c393f8465d2b17d29b46a8d951c2928b4a6b716f1e59f5ea2f9baf5071 SHA512 cd7e5030412530e80a573c2782c924743e890edaf8307e05a7bcdcfbf86f1be5c51f5ff8a583f07f5eb48dd03895ee70d076ee008ab64dc51c89992209d6aaf5
 EBUILD perl-Net-Ping-2.740.0.ebuild 515 BLAKE2B 515e40a94072748f6b234f9c1bed5d86c411b0289a255836a4ced1a3fcd18e73e3ff5a2c0f60bf521c98a6b6c6f54ed5c76bfdbbcf29331f39d9235618b2fe36 SHA512 648ad1732c7ac8015623896fa8875b78b2b3c0c81fe8203057c9a9a709375f15fd9fd87077219ec1ba577eae547f0196791947079f632a344ded66726830027a
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Net-Ping/perl-Net-Ping-2.720.0.ebuild b/virtual/perl-Net-Ping/perl-Net-Ping-2.720.0.ebuild
deleted file mode 100644
index 637ea5c7a905..000000000000
--- a/virtual/perl-Net-Ping/perl-Net-Ping-2.720.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/Net-Ping-${PV}
-	!>perl-core/Net-Ping-${PV}-r999
-"
diff --git a/virtual/perl-Pod-Simple/Manifest b/virtual/perl-Pod-Simple/Manifest
index a4fdae5f1335..d7fae4ab4ec3 100644
--- a/virtual/perl-Pod-Simple/Manifest
+++ b/virtual/perl-Pod-Simple/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Pod-Simple-3.400.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Pod-Simple-3.420.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.400.0.ebuild b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.400.0.ebuild
deleted file mode 100644
index 0f06442ac78c..000000000000
--- a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.400.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Safe/Manifest b/virtual/perl-Safe/Manifest
index 00e6953096f5..6c6d104517aa 100644
--- a/virtual/perl-Safe/Manifest
+++ b/virtual/perl-Safe/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Safe-2.410.100_rc.ebuild 523 BLAKE2B 79e27c9a1b607a9a48c0ec116609a58eea98b9454a82f37ac36089fccf1b65c4573e56c2b01fc5853a2d3f8aed41bf289c2595434d13dc957f4bb66d42a73fa6 SHA512 0558cc737f8aac66ad7f8f90574ba203266a96fa0c943f4eb04d6056dda0baddd30e1a0e8eb483307a873c557ec85253f26a178a36afb77eec70848ef51a2468
 EBUILD perl-Safe-2.430.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Safe/perl-Safe-2.410.100_rc.ebuild b/virtual/perl-Safe/perl-Safe-2.410.100_rc.ebuild
deleted file mode 100644
index f78cf29a24d9..000000000000
--- a/virtual/perl-Safe/perl-Safe-2.410.100_rc.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32.1* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Socket/Manifest b/virtual/perl-Socket/Manifest
index 871c70f92489..a9c4f3063be9 100644
--- a/virtual/perl-Socket/Manifest
+++ b/virtual/perl-Socket/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Socket-2.29.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Socket-2.31.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Socket/perl-Socket-2.29.0.ebuild b/virtual/perl-Socket/perl-Socket-2.29.0.ebuild
deleted file mode 100644
index 0f06442ac78c..000000000000
--- a/virtual/perl-Socket/perl-Socket-2.29.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Storable/Manifest b/virtual/perl-Storable/Manifest
index 326eb74da733..524d7732bdd7 100644
--- a/virtual/perl-Storable/Manifest
+++ b/virtual/perl-Storable/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Storable-3.210.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Storable-3.230.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Storable/perl-Storable-3.210.0.ebuild b/virtual/perl-Storable/perl-Storable-3.210.0.ebuild
deleted file mode 100644
index 0f06442ac78c..000000000000
--- a/virtual/perl-Storable/perl-Storable-3.210.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Test-Harness/Manifest b/virtual/perl-Test-Harness/Manifest
index 7dfe3fc91203..16eeb997c08c 100644
--- a/virtual/perl-Test-Harness/Manifest
+++ b/virtual/perl-Test-Harness/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Test-Harness-3.420.0-r3.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
 EBUILD perl-Test-Harness-3.430.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r3.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r3.ebuild
deleted file mode 100644
index 4437c13809e1..000000000000
--- a/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Test-Simple/Manifest b/virtual/perl-Test-Simple/Manifest
index f930fb070e3f..3d29a10ca2e6 100644
--- a/virtual/perl-Test-Simple/Manifest
+++ b/virtual/perl-Test-Simple/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Test-Simple-1.302.175.ebuild 518 BLAKE2B f1ab978361478badd6228960272075e4ce1dca09cb1ff01f2c564fadec6bc45e690eb31eca8f0858ecef36f7241e6969f830e4f1396d6cbad1553b5ee822fb92 SHA512 4a07f2795aac3d33783ec06e0c6fa34166a0c320819f673824607c59c399bc06d6b5ec8a9b058590f291a37878ed3adb7580208a35e246453a4e6a092d2ed6f8
 EBUILD perl-Test-Simple-1.302.183.ebuild 518 BLAKE2B cff4692a1918d403a86c82d7e0a79f0e2987beea2f7e9ff5bbfa6d70dec501ed9ce7f0e40d99373c50ffb5375456d3e5e878bb889ca70b855547a246fbbbb6c2 SHA512 a50230a7995f31ff4dfa6cb1e1bd1b9b9a4aeaf36c7c04e40421e8be57df22ab2ddd854eedcc7319082463a917cec840e9cdf36b39a4f19b63322cee4c81a4bf
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.175.ebuild b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.175.ebuild
deleted file mode 100644
index 0604167bd404..000000000000
--- a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.175.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<dev-perl/Test-Tester-0.114.0
-	!<dev-perl/Test-use-ok-0.160.0
-"
diff --git a/virtual/perl-Text-Balanced/Manifest b/virtual/perl-Text-Balanced/Manifest
index db8bbf1e5257..0f9c8ae17730 100644
--- a/virtual/perl-Text-Balanced/Manifest
+++ b/virtual/perl-Text-Balanced/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Text-Balanced-2.30.0-r7.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
 EBUILD perl-Text-Balanced-2.40.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r7.ebuild b/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r7.ebuild
deleted file mode 100644
index 4437c13809e1..000000000000
--- a/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r7.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Tie-RefHash/Manifest b/virtual/perl-Tie-RefHash/Manifest
index 5f1841b72ede..41c5dad6dc97 100644
--- a/virtual/perl-Tie-RefHash/Manifest
+++ b/virtual/perl-Tie-RefHash/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Tie-RefHash-1.390.0-r12.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
 EBUILD perl-Tie-RefHash-1.400.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r12.ebuild b/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r12.ebuild
deleted file mode 100644
index 4437c13809e1..000000000000
--- a/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r12.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Time-HiRes/Manifest b/virtual/perl-Time-HiRes/Manifest
index 901fa8afab76..3c7c383e9c59 100644
--- a/virtual/perl-Time-HiRes/Manifest
+++ b/virtual/perl-Time-HiRes/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Time-HiRes-1.976.400.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Time-HiRes-1.976.700.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.400.ebuild b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.400.ebuild
deleted file mode 100644
index 0f06442ac78c..000000000000
--- a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.400.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Time-Local/Manifest b/virtual/perl-Time-Local/Manifest
index b3e892d55465..364605172501 100644
--- a/virtual/perl-Time-Local/Manifest
+++ b/virtual/perl-Time-Local/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Time-Local-1.280.0-r1.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
 EBUILD perl-Time-Local-1.300.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Time-Local/perl-Time-Local-1.280.0-r1.ebuild b/virtual/perl-Time-Local/perl-Time-Local-1.280.0-r1.ebuild
deleted file mode 100644
index 4437c13809e1..000000000000
--- a/virtual/perl-Time-Local/perl-Time-Local-1.280.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Unicode-Collate/Manifest b/virtual/perl-Unicode-Collate/Manifest
index a0d94efd2c10..41149d52963a 100644
--- a/virtual/perl-Unicode-Collate/Manifest
+++ b/virtual/perl-Unicode-Collate/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Unicode-Collate-1.270.0-r1.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
 EBUILD perl-Unicode-Collate-1.290.0-r1.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.270.0-r1.ebuild b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.270.0-r1.ebuild
deleted file mode 100644
index 4437c13809e1..000000000000
--- a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.270.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Unicode-Normalize/Manifest b/virtual/perl-Unicode-Normalize/Manifest
index 84a9e06c151a..02653c20e229 100644
--- a/virtual/perl-Unicode-Normalize/Manifest
+++ b/virtual/perl-Unicode-Normalize/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-Unicode-Normalize-1.270.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-Unicode-Normalize-1.280.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.270.0.ebuild b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.270.0.ebuild
deleted file mode 100644
index 0f06442ac78c..000000000000
--- a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.270.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-autodie/Manifest b/virtual/perl-autodie/Manifest
index 1b69f49e6c7a..77ba3719d969 100644
--- a/virtual/perl-autodie/Manifest
+++ b/virtual/perl-autodie/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-autodie-2.320.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-autodie-2.340.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-autodie/perl-autodie-2.320.0.ebuild b/virtual/perl-autodie/perl-autodie-2.320.0.ebuild
deleted file mode 100644
index 0f06442ac78c..000000000000
--- a/virtual/perl-autodie/perl-autodie-2.320.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-if/Manifest b/virtual/perl-if/Manifest
index d105aed17c22..71bba44dbc26 100644
--- a/virtual/perl-if/Manifest
+++ b/virtual/perl-if/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-if-0.60.800-r3.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
 EBUILD perl-if-0.60.900.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-if/perl-if-0.60.800-r3.ebuild b/virtual/perl-if/perl-if-0.60.800-r3.ebuild
deleted file mode 100644
index 4437c13809e1..000000000000
--- a/virtual/perl-if/perl-if-0.60.800-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-libnet/Manifest b/virtual/perl-libnet/Manifest
index 1b658782fc58..501e878941a1 100644
--- a/virtual/perl-libnet/Manifest
+++ b/virtual/perl-libnet/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-libnet-3.110.0-r4.ebuild 644 BLAKE2B f794b181b22cb5a9f27b2bc02a24cbf87ba616ea6a7f28a8b57bea0bbf81d1e0b9a3714214918255e56a2c5a652fac7d15d675a0abe10150943dae99aa838f6d SHA512 8338bd568a854efdc9ec47316abc780b5cd3a192ba0560bc6f42a8c961bb5277600bc633e5d4134904305eb67073b44e72426d8d1e3610a1a8c5d8dd078ed8dd
 EBUILD perl-libnet-3.130.0.ebuild 623 BLAKE2B c68aae68f77b636cfb488b5a4c5dd8aa4d152499948f1f0b6356d5a3563b0dabaff02d9f782ad4f44dc2f979846496f184775f91b8116cff911f76e12b03f507 SHA512 4386f08383d8fa667d11b52cf4f16ddd92e139102a851d7446388ae647684fef437188ce37f9cbd9b768f2bad8fda8f72729e7e02d0949aeecf433ff79556b10
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-libnet/perl-libnet-3.110.0-r4.ebuild b/virtual/perl-libnet/perl-libnet-3.110.0-r4.ebuild
deleted file mode 100644
index 6a70b8655625..000000000000
--- a/virtual/perl-libnet/perl-libnet-3.110.0-r4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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="+ssl"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
-
-# https://bugs.gentoo.org/735004
-PDEPEND="
-	ssl? (
-		>=dev-perl/IO-Socket-SSL-2.7.0
-	)
-"
diff --git a/virtual/perl-threads-shared/Manifest b/virtual/perl-threads-shared/Manifest
index 46c8338c963f..ba8b4842c598 100644
--- a/virtual/perl-threads-shared/Manifest
+++ b/virtual/perl-threads-shared/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-threads-shared-1.610.0.ebuild 521 BLAKE2B b26d8349487ab5da3e1a435ecb1da0c58e670724b99982467de7804041ecbeed26330cdd018ca2078ee9ce0046b9eae8453a9fc91e7b896411647fe42ff8a2ed SHA512 22bfee00fceee7018cb2924ecf08d383dc547afb28500dd09cdd28644ec40522a64eb8f16fb0822db99f0e40d10507eff3ef6c120e62b2688658e127596f706d
 EBUILD perl-threads-shared-1.620.0.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-threads-shared/perl-threads-shared-1.610.0.ebuild b/virtual/perl-threads-shared/perl-threads-shared-1.610.0.ebuild
deleted file mode 100644
index 0f06442ac78c..000000000000
--- a/virtual/perl-threads-shared/perl-threads-shared-1.610.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-threads/Manifest b/virtual/perl-threads/Manifest
index 4be4c3c3085b..b0196a0cba70 100644
--- a/virtual/perl-threads/Manifest
+++ b/virtual/perl-threads/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-threads-2.250.0.ebuild 531 BLAKE2B 791770c997990c5577f10960eb410950a70061a943d9a2c53f91317211861775fcae59a33aea218a52f7ff2b33dfd479878f0739aa1cbeed138d9798cde6dd50 SHA512 1a56831614e0ba3d55ff12e64371cb878653f8adef40eacffea7f7de8d5225e9372f6cea7b33856afb5e88fc87ebc17ac075d64360c12064f4af7755f0d699a2
 EBUILD perl-threads-2.260.0.ebuild 531 BLAKE2B 8c58d9aaaa4becf80ccbd21c9f09b782f9004edd029564fb14ccf01c65250b0d59786b98c9dbbde5ec8ff6090e3a82fb5968b286b2e2441512f8feb5530ccf01 SHA512 e4e0a4a167cfc10691e285f052fc7714d831583b35d7f0f76fbfa56ef1cc9b46ad5c2bb8e9f31dcbd796f4fa90f4b489272ba19f26180278265bab839ca4ae49
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-threads/perl-threads-2.250.0.ebuild b/virtual/perl-threads/perl-threads-2.250.0.ebuild
deleted file mode 100644
index 593f6e8c0906..000000000000
--- a/virtual/perl-threads/perl-threads-2.250.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32*[ithreads] ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-version/Manifest b/virtual/perl-version/Manifest
index 75a962af2e76..9355600c6ece 100644
--- a/virtual/perl-version/Manifest
+++ b/virtual/perl-version/Manifest
@@ -1,3 +1,2 @@
-EBUILD perl-version-0.992.400-r1.ebuild 542 BLAKE2B 9636a5794f0667c45a1ae7ff0c2d319453ccb5d54659d20ffaaf1b590d0b197d41e0b0a5fc11464df397884d6ce8d841cbbf00db53224c10b5e2717938c6b473 SHA512 698c9a1f0d01ec69bb316a8247d18f2716f9b74a1cdb12c95eefc09503befa6ae2a18c92d19c2027300f518114527005f85970564d64ff87b0e231af87f3ff4d
 EBUILD perl-version-0.992.800.ebuild 521 BLAKE2B 3739dab7f41defbe245ab5c71ebb59c1d4cc5d3759edfdb8c3b34fd3f123eac1096488c46d6f303ec9f57edf16544a128d7a877541385aadff51e919b63ce6c8 SHA512 d68f1306eb20e7374e3d703750e527678216d289fa6a6a537846e8bf019e655003b817759b4ba670a6407f9249019aa5d8e9cd60237a54d672d40dcdfa5759bb
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-version/perl-version-0.992.400-r1.ebuild b/virtual/perl-version/perl-version-0.992.400-r1.ebuild
deleted file mode 100644
index 4437c13809e1..000000000000
--- a/virtual/perl-version/perl-version-0.992.400-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/rubygems/Manifest b/virtual/rubygems/Manifest
index 095fcb63955b..b987ba33a171 100644
--- a/virtual/rubygems/Manifest
+++ b/virtual/rubygems/Manifest
@@ -1,3 +1,3 @@
 EBUILD rubygems-15.ebuild 615 BLAKE2B 95e4057a5abf8af9bf3dfab4cb049a7b0494efc8a3d41f20ae9a79b7ebb6960513cd8e802782a125895f72a2ad2e203ec218ea77af0852f035d632205078a1fa SHA512 53d9de102990170441a1d40b38427059bd8642f9477969d7efba4f716049a3f51bbf1cec2b3d289a7be4cd2f04ae04737ee8741261f0a986ce6b82a7c92b1999
-EBUILD rubygems-16.ebuild 791 BLAKE2B 2816c68eab03676ae3451604f8f098e350d25ec0d6a119916bf3b825c77a29501da3ac14cec381ffaa40ac14ff6df546c8ca665865d65db1ced4a9300d800802 SHA512 65bd99385be05f639efcabd7a876ab32c10ca3cee7b5724441bdad6aef88cbc83bde85441b8df0573befc484e817f869156a6c45a04f2e6aa399abdac88a1085
+EBUILD rubygems-16.ebuild 784 BLAKE2B e51d8653fa7b9e4d4c6b475f6048e34c71156b2ee0e6ecd3cf9c772775257e471c175979a45c87524ac9fbd22e1a498d1a164e354d3a2f1ee2407a1efcb40840 SHA512 0ba3f10879f108dc551e6e927b5c9082da2ddb52d1e5493336dbcf278099c18f3962cbc87cb639d285a657ed217949f4a681448857714884fda96939875a8426
 MISC metadata.xml 276 BLAKE2B 240071bbd27a17a329e2e7c1c8a314680663e453a2c7ba79c6356ce9b201229832ccbcc3b8260c375d67944a9cd5ddaa6bb0d46a2a8d9f6a559a9554cd2e7e3b SHA512 b4433340410da26efbe36c7c9d7a20cb0f151d90a906ccc7aac6be3a59d24557cac23638899f227c021833b3d0061547eef3b11649620886e54be43aa05265ac
diff --git a/virtual/rubygems/rubygems-16.ebuild b/virtual/rubygems/rubygems-16.ebuild
index 7179f212f314..73a9370b1e03 100644
--- a/virtual/rubygems/rubygems-16.ebuild
+++ b/virtual/rubygems/rubygems-16.ebuild
@@ -8,7 +8,7 @@ inherit ruby-ng
 
 DESCRIPTION="Virtual ebuild for rubygems"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ruby_targets_ruby26? ( >=dev-ruby/rubygems-3.0.1[ruby_targets_ruby26] )
diff --git a/virtual/skkserv/Manifest b/virtual/skkserv/Manifest
index 1a2ab9fc8b6f..992b76504dd3 100644
--- a/virtual/skkserv/Manifest
+++ b/virtual/skkserv/Manifest
@@ -1,2 +1,2 @@
-EBUILD skkserv-0.ebuild 350 BLAKE2B c74117647b9ff59271d4434e6ab74d7dd35c0eb125bfeb104bc3a7e21c7e3d78bca07bcc5d031711ab85ab2627c7e1d6e7ffd1ddf3d783e7f77c4785af7ebb50 SHA512 7efb33a58bbff50d62fe836d96f62c3acbdb3dba661ca7738fa1502e710ee899bd4e08b46dd768e63327fed4bbec634cffa1a03424af77ad05d8a082863d95f3
+EBUILD skkserv-0-r1.ebuild 372 BLAKE2B 3d8e9fbfd4ee602e04e94b7c0b443c197d93d3e0676278bf7fc137f06d07ac9f0f3405bf4e8872e19b9617f9f24b113afe8bcbae424b874faf76944e9125babc SHA512 4605d0587a7ec6255bada16a47f5206bd5af7e628e3673d7ff60d3453cfca3957ce052065c690bce0e359a3f357ec152929ef829395d45f9d231e13160878e86
 MISC metadata.xml 259 BLAKE2B 473457dc1808c494d8a08c731bc36bc3f6fd42ac730b0e7372e9749275ad413c56abc214d6b8d43c3e3f3d878a81e61d3ac1088b0606e99b449018828f056c4c SHA512 42603797647a4e2bdd69fc8548c0f035143c2a94b836763b39fc0dda770621970fbb233327c142107bca40f48b2b380fe97c6517e5fce633ba2c11f7a34402fc
diff --git a/virtual/skkserv/skkserv-0-r1.ebuild b/virtual/skkserv/skkserv-0-r1.ebuild
new file mode 100644
index 000000000000..eb615fcabaad
--- /dev/null
+++ b/virtual/skkserv/skkserv-0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for SKK server"
+
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="|| (
+		app-i18n/skkserv
+		app-i18n/dbskkd-cdb
+		app-i18n/mecab-skkserv
+		app-i18n/multiskkserv
+		app-i18n/yaskkserv
+		app-i18n/yaskkserv2
+	)"
diff --git a/virtual/skkserv/skkserv-0.ebuild b/virtual/skkserv/skkserv-0.ebuild
deleted file mode 100644
index 6f74d2efffe4..000000000000
--- a/virtual/skkserv/skkserv-0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for SKK server"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="|| (
-		app-i18n/skkserv
-		app-i18n/dbskkd-cdb
-		app-i18n/mecab-skkserv
-		app-i18n/multiskkserv
-		app-i18n/yaskkserv
-	)"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index df499216bc62..b1daaf2cb192 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 1a777bf4b1d9..68dc8e3983ce 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,3 +1,3 @@
 DIST tomcat-connectors-1.2.48-src.tar.gz 3665280 BLAKE2B eca84f31235e441dea08fd7f0e44de4370799e9781384a0a4329ae48c9dab4b146733bf810669fdcf60ede9e67e139942ccfe12c74e15f4eda19d9107f9b6150 SHA512 955a830724a3902e29032a5d2e7603d3170334e8a383d314f6bf8539d53d9f7ee4cfa0b31cfc954acb0a13d9975ed2229de085d08de3885f8679b509924fde47
-EBUILD mod_jk-1.2.48.ebuild 1492 BLAKE2B 3a8fbf8edc8782aec316457dca32c62dd1e189069bb71078e55fe603318df392467050097053339ef1348ff96bf5d8277ed196e74cabb1d5707bd7659491c0ab SHA512 62fe35d8f59f6df0d5304a8027f0c9a2779ebe9f8a91686c8c5c5ec628895dc0510378f7b7fcc735a71628ae2f5e07c6117c72ad796ebc6f97b708fb02b3b06e
+EBUILD mod_jk-1.2.48.ebuild 1647 BLAKE2B 194a95155693935396536601d36eee2532deb8c47802ee009161937b299f4932e39b6826cb692d24e08d16ad492c4272697bbf73bfe97ed6446792a766e82123 SHA512 24a6ad3f82861c41cba5717ca17cfe798f73d9082da659b1e08f6b5fe9687bfe636801a8363aa705517d738adaa4f17901368d383d83c12efc70f7d026b4cbbc
 MISC metadata.xml 617 BLAKE2B 2fe52915ee2fdf01518b2631479934838c85820e4803792e6c4c69e7ee490cd08aea7f4a269eb456a258d6433fd5f323866439ca61c40f86a256ee941b4457e2 SHA512 0df6992cc0912e1a93b5ca9e5d3c5470e9a91b065714bd77391a8efbf8118bcede4aecb2263a3cd0e4c0a3ad1bfe006db7ee524fe4148e04a69dcbad0dbd18b7
diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
index f84c81d573c1..739db0daedf4 100644
--- a/www-apache/mod_jk/mod_jk-1.2.48.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_P="tomcat-connectors-${PV#-*}-src"
 
-inherit apache-module
+inherit apache-module autotools
 
 DESCRIPTION="Provides an AJP Apache2-JK-connector for the Tomcat servlet engine"
 HOMEPAGE="https://tomcat.apache.org/connectors-doc/"
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}/native"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="dev-libs/apr:1="
 RDEPEND="${DEPEND}"
@@ -36,6 +36,10 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	# Don't add '-Wl,' as prefix for CFLAGS, as linker will fail
+	sed -e '/JK_PREFIX_IF_MISSING/d' -i configure.ac || die
+	eautoreconf
+
 	# Adjust confpath and logpath for Gentoo
 	local logs_path="/var/log/apache2"
 	sed -e "s|conf|${APACHE_CONFDIR}|g" -e "s|logs|${logs_path}|g" -i ../conf/httpd-jk.conf || die
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index e9045c97d6a5..4aebfa0d2d93 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index b0255290dbc7..906c618af984 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,3 +1,3 @@
-DIST chromedriver-bin-94.0.4606.61.linux64.zip 9880569 BLAKE2B 878f2361cd952853f14836e7f09f741860476796be29e3654d06ec44cdef9d99c8cb08bc589adece85e8f4a63b784c92454d9f43e5a58f7a6eb52c04fa28d393 SHA512 be0c96b91c521b097ff0b3c44b72499f30f874305c367830f996b09903910fecdf5ad945ca6ca8f1cc5af85fde1e3dd3a89b4086f2e6c0dd6a7955d867a9d279
-EBUILD chromedriver-bin-94.0.4606.61.ebuild 587 BLAKE2B a4f3eeac5597635be0030b1456c08adfec51a128c55b8fef99a88a87738578ab5cd31211557d6d715ff46b6e5d1c719913d27fcf31119cc66f822ebc01dc228f SHA512 2a5d1d3659e518976c4d6dc75d2d4a8e7916b81e7e6ada92d5920651fcb4ecb884390223056e8918fb5857bdeb4972bbae5f2de5af81142df28425450307ccaf
+DIST chromedriver-bin-95.0.4638.17.linux64.zip 9979977 BLAKE2B f1e9076e2fb92cbf0b51ee464066602bd287c64d1099f84127fdf6e7f40a68a91dbb73d63ed21b8e95e58e2ab0cada56b0c6e83aa16d4416b830b120de876342 SHA512 ed59620a73229fed2b4e85098e8efff4e20c7a104ef34e40f6878f5c757657b7c712ab7aea4813fd493ff8e9c75fc0b4295d0bcd65ec24c0a22e4d436d431b97
+EBUILD chromedriver-bin-95.0.4638.17.ebuild 587 BLAKE2B a4f3eeac5597635be0030b1456c08adfec51a128c55b8fef99a88a87738578ab5cd31211557d6d715ff46b6e5d1c719913d27fcf31119cc66f822ebc01dc228f SHA512 2a5d1d3659e518976c4d6dc75d2d4a8e7916b81e7e6ada92d5920651fcb4ecb884390223056e8918fb5857bdeb4972bbae5f2de5af81142df28425450307ccaf
 MISC metadata.xml 461 BLAKE2B 4e6e0fd9bf732be9040a4defe4dc1ca63ba7e1ba860abfc97ad487d6220f7bc5cb1e304d001409cb866408fdf393ca42f3b95eb9b8dc258a0627aaa978f66e6e SHA512 3c9217fe5af26ee8ddc705edad8a32604d542ad60c3e78ed8aba9e08a5bd2b3508234e42710d4524149f8b7626bba08f83cb96f7f942fe5ccdfbd8bd98908bec
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-94.0.4606.61.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-95.0.4638.17.ebuild
index 7c2aac12ffeb..7c2aac12ffeb 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-94.0.4606.61.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-95.0.4638.17.ebuild
diff --git a/www-apps/element/Manifest b/www-apps/element/Manifest
index 5b0e561cb9d0..942ca4e76f35 100644
--- a/www-apps/element/Manifest
+++ b/www-apps/element/Manifest
@@ -1,5 +1,7 @@
 DIST element-v1.8.5.tar.gz 15979411 BLAKE2B 865f36b5b01d43c9f5b912834ed9c357b8ffb8001bb86c00a941c7093902d6ca54ab21c44bb1ed535e039e787735e3e3e3cbb5e7c210d978f666a60dbc1f2bff SHA512 90adfa42829cedd30180e235b4293a040eb008e990845211b07807b64c1e7bdc8ef0c609a3ec5150d821de528be8a4cb01565950356c134ac6fc7390255e8d66
 DIST element-v1.9.0.tar.gz 15631650 BLAKE2B aeecf81dc0f5f99df23c8a2d931dc9172b3dd6b627bc8c149d22ac0862066bc0dda02774919ff7509c9ae99e420730f9b0eabbaaf0399f9ba5927362bde7dfd6 SHA512 e0a3a8696e493ccca6abcb5dee178e934cdae62a92e92d4c1b8718eeded45cab26ba3d08353c8a4701a94d537a0da072aac3e34e268c9d8541b26111c90eef27
+DIST element-v1.9.2.tar.gz 15333289 BLAKE2B 28bb3e1175e20081f0227df95e9d8e7af031196103792c25681846fe7c20365075a16abdd7685018c159f767985566d473a8e616810f8d9015b68ac352befbd2 SHA512 e2354b09de6dfea0c33ab01de1c1d31199947b7406c0fd85d150198105f49b4cd5fda8319f259a5778ea7a012083082898fb1a06a2566c67cd86f854aa3494de
 EBUILD element-1.8.5.ebuild 728 BLAKE2B 877d2ab169d6d3dc480351f830c4c545dea80b40cffef12b16901f36cea50faab16f3f10e543b5b21e783802128370610d92f1c7e4b7c47174871a41588c29d6 SHA512 6a3a88784accd6fbe15f346894267aac7cd9e93e8bb4eac4f6bc37524a3070595148446654178cdce08e846c267bed8cfc4c3522ec74ce8c560a429707c8e728
 EBUILD element-1.9.0.ebuild 728 BLAKE2B 877d2ab169d6d3dc480351f830c4c545dea80b40cffef12b16901f36cea50faab16f3f10e543b5b21e783802128370610d92f1c7e4b7c47174871a41588c29d6 SHA512 6a3a88784accd6fbe15f346894267aac7cd9e93e8bb4eac4f6bc37524a3070595148446654178cdce08e846c267bed8cfc4c3522ec74ce8c560a429707c8e728
+EBUILD element-1.9.2.ebuild 728 BLAKE2B 877d2ab169d6d3dc480351f830c4c545dea80b40cffef12b16901f36cea50faab16f3f10e543b5b21e783802128370610d92f1c7e4b7c47174871a41588c29d6 SHA512 6a3a88784accd6fbe15f346894267aac7cd9e93e8bb4eac4f6bc37524a3070595148446654178cdce08e846c267bed8cfc4c3522ec74ce8c560a429707c8e728
 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/www-apps/element/element-1.9.2.ebuild b/www-apps/element/element-1.9.2.ebuild
new file mode 100644
index 000000000000..0d6f2e6d2cb4
--- /dev/null
+++ b/www-apps/element/element-1.9.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="A glossy Matrix collaboration client for the web"
+HOMEPAGE="https://element.io/"
+SRC_URI="https://github.com/vector-im/element-web/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+need_httpd
+
+S=${WORKDIR}/${PN}-v${PV}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/home
+	dodir "${MY_HTDOCSDIR}"/sites
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/home
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites
+	#webapp_configfile "${MY_HTDOCSDIR}"/config.json
+
+	webapp_src_install
+}
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index e288951e1479..69b675e25348 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,8 +1,4 @@
-DIST icingaweb2-2.8.3.tar.gz 8514052 BLAKE2B 507753833ed8a0de816651f3fdb06f3fdf04b3fa9c43fad5046c28924c93f3c3e491d9a4e1532f08ac0d6abe97c1343b85cdb23de9ece9f16858b91886283e9c SHA512 236385dc54dbd11d8e100059bb7e29b3a4efc23888f187e13e563510dfb1f3d20e5c4107e2dadfa6842e6689aaa21d4e9465abd0a234c52229354f43ec44cfb4
-DIST icingaweb2-2.8.4.tar.gz 8514585 BLAKE2B 1c331d45152a94dcaf21509e36ecd9c90c840f41bf14d102910e65fce28994bb7db3319c39e5d5740638a673c74b84b54d803b97d91cb8968260174b2437a7ca SHA512 7f136f7901db8398fab85fef079d4e5af1662c13c5c107d3c1c10e022186bdca29d3b144f937e40e470975b97bd98215ec3e0c7f2b6127a6a74143fbe0e1882c
 DIST icingaweb2-2.9.3.tar.gz 12307606 BLAKE2B fddd72823674ae64191bf55f0dc378ef50cd7849a18199310fbe25446aff3e0c325b20aa0244c751b07852d3cca81ecdaba02c3250eb77b36645829d7da61377 SHA512 46ae2790743fb5e0a80861da522cfa2783d181ec056135e97949fffbc3ca821f778033db9e276e824430a6b7a1dd842f387b599fa70072e63fb6ebd74dd2bfc0
-EBUILD icingaweb2-2.8.3.ebuild 2309 BLAKE2B 3fcaed75fcbb6cd194810b19f9a1f47394a4a4e41aff82598152b224f937faa156a8142e63018e140c430be2fc38deb2f86e09001540fd2ea85dd252d9f21882 SHA512 ce4a4933dc9c5e6a05639be9c92199cf83a5a9690f5fde5fac7a9ba68c816308d7c0977544bdf8b0d04124ebd5df13ef54393c0e984d15fdc937f735e7327a0a
-EBUILD icingaweb2-2.8.4.ebuild 2311 BLAKE2B fa669bbc37e8a8445563d4a1b248be139030ab8807b272efdd720abaeb2aa2904c4befbb2699582114232bb247673e46589800b7e74cb53bf9803f4af6bf0c65 SHA512 b68aacddeba57332a45ea1382d4e8d1272f5ab38611e175865836335b382a27fda740aa834b777b0a070abc3d1a38b560426bf2455adddd020346e727d9f0ffb
 EBUILD icingaweb2-2.9.3-r2.ebuild 2471 BLAKE2B 7227d7ffbce7e968ef3d32d227dcf4647b2b93dc42bf2f0d2106dea11ef0a2545ca9f7263f2d355e54fe1f37f0c0f04ac90a8776a30605598c5c26ca27215c50 SHA512 85387719edf85adc983d9108434a5fa44abccfb13cda9dc95b32bd42151850b70f1f1c33ae7c08f10880d72e9c7ac187db98f054438addffd5e29e955e1c8892
 EBUILD icingaweb2-9999.ebuild 2374 BLAKE2B f63044faae6d69d55aac95b9388f8c576ad57224638768a9e1245162f337d57f63c6c484184a09b68531251b5c567a541cb193b3d8583153144476777c597c1c SHA512 1901a407660a0eef7e82ca0097a232e4434d7e8b3951f2b7052b63607e0890e2bc8e3bca105dd4ad455671ffe9fedf8294e521db844ea73cb2cd4eef800daa2b
 MISC metadata.xml 444 BLAKE2B bf24467286f442770ed78cb298cd0fc1d37786b06e85bbc4b20a8c750764e7a831828ebc9b7872772f0a286b12cb67491cb1f84f189cf00e2ec59a6b921e760f SHA512 55e57997695e09ad9cc8448030e8470a0e39a1cbc610f70e29c2a68a4f287e54cb816b0cd1ceec611112849ba97225a60560b67368fb3a6ed68a73a728d61d83
diff --git a/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
deleted file mode 100644
index 8ce454622665..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit depend.apache multilib
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
-REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-php/pecl-imagick
-		pdf? ( media-gfx/imagemagick[png] )
-		apache2-server? ( >=www-servers/apache-2.4.0 )
-		nginx? ( >=www-servers/nginx-1.7.0:* )
-		|| (
-			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-		)
-		acct-group/icingacmd
-		acct-group/icingaweb2"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild b/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild
deleted file mode 100644
index c5f119e375d9..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit depend.apache multilib
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
-REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-php/pecl-imagick
-		pdf? ( media-gfx/imagemagick[png] )
-		apache2-server? ( >=www-servers/apache-2.4.0 )
-		nginx? ( >=www-servers/nginx-1.7.0:* )
-		|| (
-			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-		)
-		acct-group/icingacmd
-		acct-group/icingaweb2"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/phpBB/Manifest b/www-apps/phpBB/Manifest
index 9f8569e629fc..e96e2abfde31 100644
--- a/www-apps/phpBB/Manifest
+++ b/www-apps/phpBB/Manifest
@@ -1,5 +1,5 @@
 AUX permissions 600 BLAKE2B ae5ced85bf5ce72bc6bca533e68ae55499ace30590de37be55c4267efacf03fe752c9c3d96ff1f6ba54beda0df238fa663281195a7c874eb3cea422fb16b5a82 SHA512 ea8f2796a43c825fbe160606dc4a3cdabd6ed8fd6692c841cadb87b06803f448df48446a83366a3af3cfba65a50bb9ed3361c0495bb5058c542b6cac9c7b2a1b
 AUX postinstall-en.txt 554 BLAKE2B 6560cb0c3a95cbbba91932af13790eae010193e6bcca4d46c640eb05b18bcae23645d5962a6be08f28aa721a10668bd128d19f505b9d463119d1a7aff845e732 SHA512 d1d61b525b2746d558f9fa1bd56e92e182d44bb406302f1646a40b0b1f06fc900ae46c3e600e27495edce1fa4188915dcf8f96b4762938ec0f324bdbb8d91759
-DIST phpBB-3.3.4.tar.bz2 4707921 BLAKE2B d70797c88514b1b0409194784e510401e1af910e4577e5b679d5b18b0664fe8eb011567fd9a2894f18ce4f78bf5e694305def7dc7d0c3000b23753dc9ca6a67d SHA512 d021530a2e89eb3fea818c5c13cc1e66dc5b5bb3f9db838243be0fb167d21f0d1f1311c2a2fe4f9ac2b81621a949c1c1db139bd32fc3007d6deade4e9f7386d8
-EBUILD phpBB-3.3.4.ebuild 1620 BLAKE2B 09849f298aa42a32957d8286c0010078aa47c7d27fe9ff744a7afc6043c342fedeb10c520245802a24bfa1d2848db5696f156d5b5aeda9dea8c5792913e03bac SHA512 ea29b23ace1dfc439f8775358e130b8cab9167527420d13078741215dc8d76e72e9bde36ddc62edec065e146e4849e2cb4186d6e9bb0dcea786366292a85fcbe
+DIST phpBB-3.3.5.tar.bz2 4027687 BLAKE2B 1834493e58f54c0968d732686403cc8ec71e0d8943514850df7408bcd8da34ee9d887a0c1e58ca6f9fa46c3f73a886b2bbf487589a1109be4ec157c81d57ae5c SHA512 62a458c37704da850e2e14339671350ba5346dd527aa2020da402df2f078b55ba19254be02d6c03693db5c653b5eff687cde79fb3e18468eb87af4f77d7b1afc
+EBUILD phpBB-3.3.5.ebuild 1620 BLAKE2B 09849f298aa42a32957d8286c0010078aa47c7d27fe9ff744a7afc6043c342fedeb10c520245802a24bfa1d2848db5696f156d5b5aeda9dea8c5792913e03bac SHA512 ea29b23ace1dfc439f8775358e130b8cab9167527420d13078741215dc8d76e72e9bde36ddc62edec065e146e4849e2cb4186d6e9bb0dcea786366292a85fcbe
 MISC metadata.xml 900 BLAKE2B 94b42ae69db2f3ac1be4e25ec23597b44614faf3b122ac7892e9fb3b55c5ef706a13be0521c85251f7f4a3c9434c155fb3a0bcaf6589ae92f84ec9a95e90ad1d SHA512 42dd9eabe9890be0b2b245ca33596ba9804d9023ef1f8e2d9d7261dfee45e41d6f32217f5666916265e9fabf9e21ead6c1d7e53d7a210b620d1c6f8c99a72c9b
diff --git a/www-apps/phpBB/phpBB-3.3.4.ebuild b/www-apps/phpBB/phpBB-3.3.5.ebuild
index 70b57df522aa..70b57df522aa 100644
--- a/www-apps/phpBB/phpBB-3.3.4.ebuild
+++ b/www-apps/phpBB/phpBB-3.3.5.ebuild
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index b33189b1059a..69d82e2fb84a 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -3,8 +3,8 @@ AUX additional_environment.rb 322 BLAKE2B 26571ffcbc43431058a685000e00870ec41d26
 AUX redmine-3.initd 1269 BLAKE2B 1c0f561fa1c13c899b17b7c707ac6beaa9090a9ec98657f7ddce2e653241d7388392f22eaf35a85f5de96c3a0c32a4b67f0003725c371ef1ffb1f76c56d989b4 SHA512 c0ec931313d8b684cc8d2ab59e0c6d6fd159202420a3849cbb09a62f4fae7f6c3ec071b58fc17d838247c7c573a92de0ecdab7de995fd2391c4bd66001335ece
 AUX redmine.confd 267 BLAKE2B d2f4f34ac6ac2aadfe5371831fb5dba6dc6e58fd26197528ebe27d9f4faa3dc8b9c495e77841b8a2e67db7093c76cbcda24b9548da0d10268d105b5dde0bb023 SHA512 4e4a700f1540b5e82df6ca610a94adcb08929f5ca75e605e40372b18ccc395515cdd53451ba2b3e3d9bdf129d9052a7218f6323d526c1ffb2540254d279c8d94
 AUX redmine.logrotate 106 BLAKE2B 0c725d812b4a6caae29ed55d0b948a3dc14369aa550994d55ca3aa41e0c1e34962d26da4a46c99fdbdcdd600c12f2d386559af53a2e48d55b5d670372be65b60 SHA512 c7e611dc5e662e5b2126c77a333081708e552f2980efb835dc8560cd5e1929c6923e5e6e4e45604fe662b9bd5ef433678eb900e797cee34bbb1b80fb55eed0e1
-DIST redmine-4.1.4.tar.gz 2720709 BLAKE2B 9e0c2b990248c9000fd6062e3928bf4bc8e8043e0d9ceff13d5000da824cde027090121ce3a8be2f5d92eedb97b91629fb8b681ae5e380459fdb97904abd9b98 SHA512 93e46f2ed220c05b83b7bab34327891a7f05a46a01c6cbfc1a5c9bf18613e308d94d84fc3158a8bb7af740b8792448d935bc9d29795ee341bca577c82ac0619b
-DIST redmine-4.2.2.tar.gz 3038398 BLAKE2B 995179b6a5f75548525912dc20b4c0ded8709a12d6eb84873d899b20cf3b83469af7f14713187cce8ec720be4d501a9e7e890e1f38cbe2b118041dc91f555f53 SHA512 71155358ca68d9eb5bf6b79e26202c29ba3355d499662bfe659ff1672625a25d91694d5f1e4bb8db18456642470244aca914efe4456adef2850b70ff7eb216b2
-EBUILD redmine-4.1.4.ebuild 6783 BLAKE2B f38a88860cfb25cb1d8b353feea94b2022508fded695d82b0c3ab1044c539b4929ccb1a9e8b8dcdd29e793c75b78ec76ecd2f839f30fd8726a6259a0441749e4 SHA512 2df24ff810aa0513edd620c8dbe9e222381b896eb63f14abf027aba4f2350691de665b8333efaa53502cfcd026ecd0ca9e433b98bd84440b53b1d6b33658f50a
-EBUILD redmine-4.2.2.ebuild 6974 BLAKE2B 1c0617a830ddfba65b86811fec00d65b90db586b060df715954a1fb25ae069ee9a46a88e836b670a781b6694bee5e972bba304bb46d4e430bb412d9728a912ba SHA512 22439e771ac9fe6c6c943eea48829bd54078c558450165bc292f1d732b0453523d794307715868905753b39331ca151559750564ff8702f0b36c53eaeee98fc5
+DIST redmine-4.1.5.tar.gz 2722929 BLAKE2B 83c9c974bbfecfcb796833640ed9b3cb4b2e2550714e702d9b024a41f676c2c71f8e6f4119b2519654556451313a0276a4dbe307f41747466b0034f415cde662 SHA512 cf4020bff11b13986989e312db1e7ee459f4391ec7326f59a4f493fb0c95be87d19196377da60ac083801b7c792dc012769350b684e20dd887c431c0c18cc851
+DIST redmine-4.2.3.tar.gz 3039136 BLAKE2B 68656da4a9a43139ab78b70e7e7364cbc776a75ea3069962086c49ea2ca965739efc47d6709b0068d94a884eaa6b56a641826ffbb16276cc8d686374a88d9e75 SHA512 456117b0d5d72ee58c87def84327e29f79937fa71098b48a80103e3e6653648c0df46afcc4f533803384ba7413e690538deeee33e263d86dd9e4e5dec65144e3
+EBUILD redmine-4.1.5.ebuild 6783 BLAKE2B f38a88860cfb25cb1d8b353feea94b2022508fded695d82b0c3ab1044c539b4929ccb1a9e8b8dcdd29e793c75b78ec76ecd2f839f30fd8726a6259a0441749e4 SHA512 2df24ff810aa0513edd620c8dbe9e222381b896eb63f14abf027aba4f2350691de665b8333efaa53502cfcd026ecd0ca9e433b98bd84440b53b1d6b33658f50a
+EBUILD redmine-4.2.3.ebuild 6974 BLAKE2B 1c0617a830ddfba65b86811fec00d65b90db586b060df715954a1fb25ae069ee9a46a88e836b670a781b6694bee5e972bba304bb46d4e430bb412d9728a912ba SHA512 22439e771ac9fe6c6c943eea48829bd54078c558450165bc292f1d732b0453523d794307715868905753b39331ca151559750564ff8702f0b36c53eaeee98fc5
 MISC metadata.xml 659 BLAKE2B 1598079638eae3152ded1c8129eac0386737c2eb827e3e0d4d16cfa5506acebbb12e51c2084e43d43ff5c3ff220bfde3e7e0d84c4b03502b2f1b593543442d50 SHA512 ac1674ad83f39871d410c338915fba222c6cddf310b62abd7eb3725dba294b1595c291cb8f87debf7e350e67703c7b30ccba223c3b8a7692e916d2a17adb4434
diff --git a/www-apps/redmine/redmine-4.1.4.ebuild b/www-apps/redmine/redmine-4.1.5.ebuild
index f331ffe6d232..f331ffe6d232 100644
--- a/www-apps/redmine/redmine-4.1.4.ebuild
+++ b/www-apps/redmine/redmine-4.1.5.ebuild
diff --git a/www-apps/redmine/redmine-4.2.2.ebuild b/www-apps/redmine/redmine-4.2.3.ebuild
index bd3fc3e7a87c..bd3fc3e7a87c 100644
--- a/www-apps/redmine/redmine-4.2.2.ebuild
+++ b/www-apps/redmine/redmine-4.2.3.ebuild
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 098dda28a698..f3dd6e2b7bde 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 238209c273b3..ae9e50ea84d3 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -3,7 +3,9 @@ AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf
 AUX chromium-95-eigen-avx-1.patch 12740 BLAKE2B 326f2209ace9ec5816be308b07daec301342b9b32f73f8072bf3cb9b148d333d125d75e546233d35806433fd98504a19262b592e03a2752bd283559c47b59ad2 SHA512 103ed3a3c3e8adba8c54c30aa43d7c597b5c4520d40ee3dfaca591a5fde176c4ef1c90bfbbcef37d8e22dfaf2f9eaf5bc3aeac2a679ce7c5c18c98fc11fad136
 AUX chromium-95-eigen-avx-2.patch 1903 BLAKE2B d9a217723c8ebdb5371e93b85a925a24b46b16300d5f125f2208cdad3630ce9a0262a9132e1f449bc80315af617bd13f327dda6a7c8396a7fda0115c0685a600 SHA512 7c9d9a8335768156b9f54e46fa8e41e7caeefe6a0c58c1cf52af4eafb8c20faf9eb17f0a5686819ce111d31c6ab23e67806751bb467fb0b2c418eccb41ef83f3
 AUX chromium-95-eigen-avx-3.patch 1981 BLAKE2B 3a38ab5600702415d779c3b725785270d2deaf3008ae46b1e69eb3ca19412c87e94afd3171ec9e9149b7a8203bd9324bbccda2533ca32a0d2496afbafe43dd1a SHA512 bd8417df9804437b25a8cdc5b2552bfb6f9e4d26c325416f72d98b64fb6a587d2493e67d6cfb1538b5e41256e191c8958ee937bfbc02dbd49bf27a99e17eebb7
+AUX chromium-95-harfbuzz-3.patch 1540 BLAKE2B f40fa435623da8bdf1075e27ada445cf1c3b642cb01ab10ef1a3a608abcb6b232721b897d4c83db66e331e86346c96d864c93fe37b677f1357c79dbc4657435e SHA512 ddf6b5ebf439d29d34d206a2f8d753458f7e242c2e3241dc87f77a6593bf27319f610b45b75d4977c4f58302d17ceb912915751f6ce56439bc3ec2d589d38381
 AUX chromium-95-maldoca-zlib.patch 445 BLAKE2B 2793d344ff3083cfadc572bd1ce6932643cf00f11d1cd596f8aaff68363a12a79c4b42a389b1a1843fbe6d760de8960cafc5d3b2f7769f4ea04ff4ef74703839 SHA512 962834cdc6a32be31d61ac526067c7e73fe322c3e3cb72c234735e08d6cd15830ed461493c41febe35d40de60120fa85d2da7b3a62dafbe180b1e213e3d8940c
+AUX chromium-96-EnumTable-crash.patch 2850 BLAKE2B 196f5f739e96cab32d9ac7585ad4a04505f71e2e147b03e5f6e618ceed5cb37591240fdea48e388c0aefc567ecf6b369026a1d9c250112e4c0b2bf7952fcd21d SHA512 c968cc19160a4d91e0000a7ff2efdaaf97a1cd43ec68dbb335493f1bb1ff3798a6b5f33baa836ddc601c7017863655b00cf4d32cd9c9c94dbfcea7187dbec937
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-launcher-r6.sh 1593 BLAKE2B a871bd572239552390b216c89269dfe132474e1f57bfd0429f605af8285634659725c550b701e537f56adf20cba2dcb27dd9dadd390366dedc147f1ee987f462 SHA512 c01cb376eae2871dfa7a488d96ac8cc3445230eeb0fbd865948c5b3b601820468e85f2f0b9b30fff940c736aded050b7802759b8562e6378747af93c1d4f08a3
 AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351e8833e0e98f43d00633e850094c288b5d97d1a84801ea13aceb294623692c86c1b9be5811b7b97fa8a07a1ecd SHA512 1e97f8394bd8bb4b29570b1b85176efe6258314a596f079bee1c4018113e0023aa54a93690ba8de2a00d127af10dbe2cc3fb3127b72b841c6f28f9e7bed820e0
@@ -11,14 +13,12 @@ AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f
 AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c463305934c126af4f7c5be305863edc7eec3add5b5ada30565b49b5944021eb40f1a9643e7eec3f973c502d9b02426f00b760570fcea5f1509219e41c6f SHA512 fe2878ee45778bac894ea17a668511d27ad2ca40988d5f11439790b700bfefd6560f3931415b4e6c543fcbbfc7cfef55cc757ed4ace1d111039ae78c46b81945
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-94-patchset-3.tar.xz 5052 BLAKE2B 3946b555d22792023696e85dbdb02a5fc43e39819c3a1a25c782d12771a608b068a7d11f757fa6390e7d295fe9c2b3b8085c31bd79d35edcd882a3f9f66df8dd SHA512 42f7beb412a7e691f35603625cbb316223706891f2a289301e4786ab92cfd4414d2f4a365f7637ba49a28508e18523670e59ae88512bc56afdd79d22f62f407e
-DIST chromium-94.0.4606.71.tar.xz 1039867644 BLAKE2B fca167a133b417554e22a4868a4826dc7ffeb1b5e30a7d3ecc877d1db74a61e7ef238b09b58c53b05d2bacae545927f942784425ae740074b087d26541facbcc SHA512 07ea0be22c8e42958d9fa53fbe310b7977f9423d7e043287a7b9f27d82f3ed2b088435708b511763b4a7ce039863a37db0adc9daa470349466da1d903e4d8135
 DIST chromium-94.0.4606.81.tar.xz 1039841108 BLAKE2B ff7cead6f4d12e31d48458f5307d2d6055041493f95bee38e1481aa3f16360dbcee6484fc4441dc0bec26313139786c04735cff8f29e410ad23586da10626f8c SHA512 59bde106e41da1daa1e806f790cbeea8623e5b5a191222981981f2722da97a26c7f70cbe3a9108e5d84e411712627657a86b3931ec940121c7e61bdb09b5bee8
 DIST chromium-95-patchset-4.tar.xz 4308 BLAKE2B e91cb78d2357af8c0dfc66e4d148c5e6ef20cf9a811bcebf411e07cc5af73f30760d889842923afb2945e57b0f67330deac3f9068b6ce7c487482a6434e5c672 SHA512 152657e13afab3caca6a9ff6c0b51203f5bc8b0a4075a4396794d7a85caddce1b26f989c7dede5fa9a54316334099d21889e6767885fbf974260a6e9bd90df9d
-DIST chromium-95.0.4638.40.tar.xz 1213280408 BLAKE2B 29421623b9adf95608574226a5ddf3666c0d8e51225c047f9978fee34b7460324bf31785c1b68213e5264e8b9c77ed3c496b8cdc327af5e8afaec5af92074e16 SHA512 3ccd24a93d4a68f7646d44862127746c78766451071790cb541dbe1e1eeb959ee5e2bf31859ae139971f70ca1680e15e3cbaed95303473f0bbd857a6fe28dcb7
-DIST chromium-96-patchset-2.tar.xz 4208 BLAKE2B a5b1c9eafb7a6807bc28ba9f6f1136adc73337c7964c22c4a245ab7c622fb9f6daa28eb46292cbc80d5fd8ac827d733f36929e620327d637f8bae60e3e41b27a SHA512 d8b5e94f95e3b57313fa5e132940056f73fb4f0ea922db0b40c6c41f0ee51e0c9043c816b378a9e5bf3a151d4cdf293c6a33c98ab2248b2b9e8109f8b4317bfd
-DIST chromium-96.0.4655.0.tar.xz 1218779336 BLAKE2B ee3bb0dfa7a417ed39d5f33fcac581856c9cd58579b9b24e037cc93998dfba39807a36e690b30a70afe47b2af772e9caa222825354dba3802bc4b2a88e9d79b3 SHA512 cc77db8f028968176cae647897812e765b477664a8f27d7df2b832f378891719244aace2b2a9a7ff3ca43e3898c39665d5f632e14b6c010a45056fc5f8a305e4
-EBUILD chromium-94.0.4606.71.ebuild 29923 BLAKE2B 816538aa12e5ba235cc4c856704ba0f6728f5648ef874dc918301e1d748cf6f722c828489fc99e6a9c918eb5b38f7d85115ff1f3753c791d12d5f8826361f4f6 SHA512 0618a00234ccc523455b5b14ecea5817498b97b4b7ae6325cc35bad39327577f25ba29c6d72c0ed104ef6c060ea20d6b494c85196e864e20e9700377c90bdee2
-EBUILD chromium-94.0.4606.81.ebuild 29926 BLAKE2B cd98ad5f5a75751b883846420c1d9db0509f0f088975b08e11edbfed5ef9ba72773174243ca1c27f9d55735afbdfb3dec737b3da20be8784b4028b33b01cf522 SHA512 6e010c78d4135fb875a8b1fa2f06fd1b26fa2a3859af5712647dd66f971b8c2a698b30a1ab854b319e386593ff2104ecc4ddcee989eb62a4808ca2678e4f6ce4
-EBUILD chromium-95.0.4638.40.ebuild 30245 BLAKE2B b534bc5cd414bac7091152e3bd2faa6c06f4058c956d1a71f8c14c72d0330bcba88d24f4309974376f06a09d3aced06f0c4dce0dc5e315b7afeac4f1f00de014 SHA512 e9b01593637fc84db232eb90c938978bb1dc37c355c145bbd4ed9336a669e53b9be51fcd2af95f3d7e98840c7ce77aac758bedd494cb3ed9c371a3cfcb02b5d6
-EBUILD chromium-96.0.4655.0.ebuild 30168 BLAKE2B bb7b398358fa85b42cf3cafa0883f85abf70a8d0f8e49d894cffafba310a55b688791a6955f61ade70be4e655ffbad72a072d0993710eba05670730a31389f50 SHA512 fdf6de87551ae6f2fdbfd25e9c05c393eb1e5812a9bb0da0b708b95514d8be131bfbb4add7cb4e1748a994780007c6a08529b5bf1735e269fa068d8eeedb83fa
+DIST chromium-95.0.4638.54.tar.xz 1213374932 BLAKE2B 75e1017a50eb0f42c714863969414308df7ee69160271d3bcd5ba7af79c96c5eb53edd9d892f33db6c2455d0b2dfa12dadfa8cb01d4baf1f89d57fde5291783e SHA512 159c8d37e8cfb5bb0e55d3d1329295dab585164b84b8c514ea80f0f68ce0b491f4c40a186a2bc108baae2341cf320dee78c654c0a038d5aeb17b5a19c7f043d9
+DIST chromium-96-patchset-4.tar.xz 4812 BLAKE2B 5d82d212b8ec1689be6f4a7a0646256311d06c17e74ee0e5b2035c32125a5235e4b6b7605cefffa367cc53e651be17b75f5e339149b4c80dca50cd959b1623f1 SHA512 a72c1bb2c58e9e2912a641093c153f01ad7239dc971c7c96481ba4164204afe41741f3253e8af03070dab8276179784dc6a11761b39ad7902ed2553016778282
+DIST chromium-96.0.4664.9.tar.xz 1221461124 BLAKE2B 4ab38eb5d3b79f5a59c2f7ca546dcfd375e5dc7580c6de415a097a003d63d6a9d505ed9223d829538ede816ca6ca6a2cbaae9213c99951697ccdb4d880b8d12e SHA512 1dbc23efd8331ac7e31b0a30dff1dda646d81ebd5532a220c7933c6f03362f28406142b92b7ee09f50dbb9bd6c12f5bb4e3a6546dd245b11ecb2f006e40828f1
+EBUILD chromium-94.0.4606.81.ebuild 29924 BLAKE2B 5f09dbd458540310e1a24bd8ba2026f4b4d29a73a5c713062a17f8689dbfd1d126ea1b30bd1b86bc8bef10093a2f564386e91658c57fcc9d1bc26f44392245aa SHA512 b756e99d7522d309c9d4b98fb6fa545b92e49a5161ae6849a5f042577746bced7d0c2b6e5442fda31190ddf8f9b750bfa8ab61799da89ccf5ad1c336fc30175f
+EBUILD chromium-95.0.4638.54.ebuild 30290 BLAKE2B 5254c12e52445676a80fa9ed8712a544a0a8d8fd80f1aab21a4de730605b7ad53e0bfdb7d35709a78844cd1b6fb2239cc03684cf3132b21968805aabecce6d26 SHA512 51cacd5b1eba791d1a6fd9593e5039aa22764e4acfd23dd049b852803e57fe248055df09cdd8109e403f9d01c11c61b2a454eb3864e7b806678c39f17c913f82
+EBUILD chromium-96.0.4664.9.ebuild 30075 BLAKE2B 821daa72d15d4bb04bd89fc04d90f58489181e0069096b202910fc2d7f3b2dd15e146aa9229ec9e662e7652440fd07c52f4ca6f2a21945c6f169e9fe9da3a056 SHA512 e664f0751bd03d37306300c448a497c947ef59a0f97fd16743a57d91d8dc0ddd83e55a548a9cbeeef0af99c64224a8cc5a8528a21f1d99a205c7bab40028dea3
 MISC metadata.xml 1775 BLAKE2B 2fa038c0f6ebe1d86427cdf0806400dd690e31a9ee2667ea9f4f744478a675b9da89f0f541869bfea4ae5e28af1210d67b2766474d16752322407aad401d2c37 SHA512 0f4430b96a7d4dea4f2f1707cc81b184445c0f9da1d5c35a84c7958a037c13068b1a1073edc4576d7131564fc14c2f3b41a97cb8665f45e5a18eddc428c9ed23
diff --git a/www-client/chromium/chromium-94.0.4606.71.ebuild b/www-client/chromium/chromium-94.0.4606.71.ebuild
deleted file mode 100644
index 0fbd60cfd488..000000000000
--- a/www-client/chromium/chromium-94.0.4606.71.ebuild
+++ /dev/null
@@ -1,943 +0,0 @@
-# Copyright 2009-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="xml"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-PATCHSET="3"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine"
-REQUIRED_USE="
-	component-build? ( !suid )
-	screencast? ( wayland )
-"
-
-COMMON_X_DEPEND="
-	media-libs/mesa:=[gbm(+)]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxcb:=
-	x11-libs/libxshmfence:=
-	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
-"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	dev-libs/expat:=
-	dev-libs/glib:2
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4.3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		>=media-libs/opus-1.3.1:=
-	)
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libxkbcommon:=
-	x11-libs/pango:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-	!headless? (
-		${COMMON_X_DEPEND}
-		>=app-accessibility/at-spi2-atk-2.26:2
-		>=app-accessibility/at-spi2-core-2.26:2
-		>=dev-libs/atk-2.26
-		x11-libs/gtk+:3[X]
-		wayland? (
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:0/0.3 )
-			x11-libs/gtk+:3[wayland,X]
-			x11-libs/libdrm:=
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-"
-DEPEND="${COMMON_DEPEND}
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	dev-lang/perl
-	>=dev-util/gn-0.1807
-	dev-vcs/git
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-7.6.0[inspector]
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	js-type-check? ( virtual/jre )
-"
-
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-: ${CHROMIUM_FORCE_LIBCXX=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-12"
-fi
-
-if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-	RDEPEND+=" >=sys-libs/libcxx-12"
-	DEPEND+=" >=sys-libs/libcxx-12"
-else
-	COMMON_DEPEND="
-		app-arch/snappy:=
-		dev-libs/libxslt:=
-		>=dev-libs/re2-0.2019.08.01:=
-		>=media-libs/openh264-1.6.0:=
-		system-icu? ( >=dev-libs/icu-69.1:= )
-	"
-	RDEPEND+="${COMMON_DEPEND}"
-	DEPEND+="${COMMON_DEPEND}"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
-			die "At least gcc 9.2 is required"
-		fi
-		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
-			CPP="${CHOST}-clang++ -E"
-			if ! ver_test "$(clang-major-version)" -ge 12; then
-				die "At least clang 12 is required"
-			fi
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="4G"
-	CHECKREQS_DISK_BUILD="9G"
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-
-	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
-	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
-		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
-		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local PATCHES=(
-		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-93-EnumTable-crash.patch"
-		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
-		"${FILESDIR}/chromium-shim_headers.patch"
-	)
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/angle/src/third_party/volk
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dav1d
-		third_party/dawn
-		third_party/dawn/third_party/khronos
-		third_party/dawn/third_party/tint
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit-html
-		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
-		third_party/devtools-frontend/src/third_party
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fdlibm
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/freetype
-		third_party/fusejs
-		third_party/highway
-		third_party/libgifcodec
-		third_party/liburlpattern
-		third_party/libzip
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/fastfeat
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libavif
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libjxl
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/one_euro_filter
-		third_party/opencv
-		third_party/openscreen
-		third_party/openscreen/src/third_party/mozilla
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private-join-and-compute
-		third_party/private_membership
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pyjson5
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/skcms
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/skcms
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
-		third_party/tcmalloc
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/tflite-support
-		third_party/ruy
-		third_party/six
-		third_party/ukey2
-		third_party/unrar
-		third_party/usrsctp
-		third_party/utf
-		third_party/vulkan
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/zxcvbn-cpp
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng/utils )
-	else
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-	if use wayland && ! use headless ; then
-		keeplibs+=( third_party/wayland )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		keeplibs+=( third_party/libxml )
-		keeplibs+=( third_party/libxslt )
-		keeplibs+=( third_party/openh264 )
-		keeplibs+=( third_party/re2 )
-		keeplibs+=( third_party/snappy )
-		if use system-icu; then
-			keeplibs+=( third_party/icu )
-		fi
-	fi
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	if use js-type-check; then
-		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
-	fi
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-src_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
-		# Force clang since gcc is pretty broken at the moment.
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-			die "Compiling with sys-libs/libcxx requires clang."
-		fi
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
-		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
-		gn_system_libraries+=( libxml )
-		gn_system_libraries+=( libxslt )
-		gn_system_libraries+=( openh264 )
-		gn_system_libraries+=( re2 )
-		gn_system_libraries+=( snappy )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false) rtc_pipewire_version=\"0.3\""
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
-
-	# Disable forced lld, bug 641556
-	myconf_gn+=" use_lld=false"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
-		fi
-	fi
-
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		append-flags -stdlib=libc++
-		append-ldflags -stdlib=libc++
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
-	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
-
-	# Disable unknown warning message from clang.
-	tc-is-clang && append-flags -Wno-unknown-warning-option
-
-	# Explicitly disable ICU data file support for system-icu builds.
-	if use system-icu; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	if use wayland || use headless; then
-		if use headless; then
-			myconf_gn+=" ozone_platform=\"headless\""
-			myconf_gn+=" use_x11=false"
-		else
-			myconf_gn+=" ozone_platform_wayland=true"
-			myconf_gn+=" use_system_libdrm=true"
-			myconf_gn+=" use_system_minigbm=true"
-			myconf_gn+=" use_xkbcommon=true"
-			myconf_gn+=" ozone_platform=\"wayland\""
-		fi
-	fi
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	myconf_gn+=" use_thin_lto=false"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		# Disable CFI: unsupported for GCC, requires clang+lto+lld
-		myconf_gn+=" is_cfi=false"
-		# Disable PGO, because profile data is only compatible with >=clang-11
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g;
-			s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-	doins -r out/Release/MEIPreload
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if use vaapi; then
-		elog "VA-API is disabled by default at runtime. You have to enable it"
-		elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-		elog "in /etc/chromium/default."
-	fi
-	if use screencast; then
-		elog "Screencast is disabled by default at runtime. Either enable it"
-		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
-		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-	fi
-}
diff --git a/www-client/chromium/chromium-94.0.4606.81.ebuild b/www-client/chromium/chromium-94.0.4606.81.ebuild
index 31b7beee49c9..0c9e3bc72aed 100644
--- a/www-client/chromium/chromium-94.0.4606.81.ebuild
+++ b/www-client/chromium/chromium-94.0.4606.81.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid )
diff --git a/www-client/chromium/chromium-95.0.4638.40.ebuild b/www-client/chromium/chromium-95.0.4638.40.ebuild
deleted file mode 100644
index 5053fd82ccce..000000000000
--- a/www-client/chromium/chromium-95.0.4638.40.ebuild
+++ /dev/null
@@ -1,953 +0,0 @@
-# Copyright 2009-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="xml"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-PATCHSET="4"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine"
-REQUIRED_USE="
-	component-build? ( !suid )
-	screencast? ( wayland )
-"
-
-COMMON_X_DEPEND="
-	media-libs/mesa:=[gbm(+)]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxcb:=
-	x11-libs/libxshmfence:=
-	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
-"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	dev-libs/expat:=
-	dev-libs/glib:2
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4.3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		>=media-libs/opus-1.3.1:=
-	)
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libxkbcommon:=
-	x11-libs/pango:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-	!headless? (
-		${COMMON_X_DEPEND}
-		>=app-accessibility/at-spi2-atk-2.26:2
-		>=app-accessibility/at-spi2-core-2.26:2
-		>=dev-libs/atk-2.26
-		x11-libs/gtk+:3[X]
-		wayland? (
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:0/0.3 )
-			x11-libs/gtk+:3[wayland,X]
-			x11-libs/libdrm:=
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-"
-DEPEND="${COMMON_DEPEND}
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	dev-lang/perl
-	>=dev-util/gn-0.1807
-	dev-vcs/git
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-7.6.0[inspector]
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	js-type-check? ( virtual/jre )
-"
-
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-: ${CHROMIUM_FORCE_LIBCXX=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-12"
-fi
-
-if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-	RDEPEND+=" >=sys-libs/libcxx-12"
-	DEPEND+=" >=sys-libs/libcxx-12"
-else
-	COMMON_DEPEND="
-		app-arch/snappy:=
-		dev-libs/libxslt:=
-		>=dev-libs/re2-0.2019.08.01:=
-		>=media-libs/openh264-1.6.0:=
-		system-icu? ( >=dev-libs/icu-69.1:= )
-	"
-	RDEPEND+="${COMMON_DEPEND}"
-	DEPEND+="${COMMON_DEPEND}"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
-			die "At least gcc 9.2 is required"
-		fi
-		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
-			CPP="${CHOST}-clang++ -E"
-			if ! ver_test "$(clang-major-version)" -ge 12; then
-				die "At least clang 12 is required"
-			fi
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="4G"
-	CHECKREQS_DISK_BUILD="9G"
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-
-	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
-	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
-		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
-		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local PATCHES=(
-		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-93-EnumTable-crash.patch"
-		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-95-maldoca-zlib.patch"
-		"${FILESDIR}/chromium-95-eigen-avx-1.patch"
-		"${FILESDIR}/chromium-95-eigen-avx-2.patch"
-		"${FILESDIR}/chromium-95-eigen-avx-3.patch"
-		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
-		"${FILESDIR}/chromium-shim_headers.patch"
-	)
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/angle/src/third_party/volk
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dav1d
-		third_party/dawn
-		third_party/dawn/third_party/khronos
-		third_party/dawn/third_party/tint
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit-html
-		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
-		third_party/devtools-frontend/src/third_party
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fdlibm
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/freetype
-		third_party/fusejs
-		third_party/highway
-		third_party/libgifcodec
-		third_party/liburlpattern
-		third_party/libzip
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/fastfeat
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libavif
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libjxl
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/maldoca
-		third_party/maldoca/src/third_party/tensorflow_protos
-		third_party/maldoca/src/third_party/zlibwrapper
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/one_euro_filter
-		third_party/opencv
-		third_party/openscreen
-		third_party/openscreen/src/third_party/mozilla
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private-join-and-compute
-		third_party/private_membership
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pyjson5
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/skcms
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/skcms
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
-		third_party/tcmalloc
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/tflite-support
-		third_party/ruy
-		third_party/six
-		third_party/ukey2
-		third_party/unrar
-		third_party/usrsctp
-		third_party/utf
-		third_party/vulkan
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/zxcvbn-cpp
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng/utils )
-	else
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-	if use wayland && ! use headless ; then
-		keeplibs+=( third_party/wayland )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		keeplibs+=( third_party/libxml )
-		keeplibs+=( third_party/libxslt )
-		keeplibs+=( third_party/openh264 )
-		keeplibs+=( third_party/re2 )
-		keeplibs+=( third_party/snappy )
-		if use system-icu; then
-			keeplibs+=( third_party/icu )
-		fi
-	fi
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	if use js-type-check; then
-		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
-	fi
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-src_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
-		# Force clang since gcc is pretty broken at the moment.
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-			die "Compiling with sys-libs/libcxx requires clang."
-		fi
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
-		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
-		gn_system_libraries+=( libxml )
-		gn_system_libraries+=( libxslt )
-		gn_system_libraries+=( openh264 )
-		gn_system_libraries+=( re2 )
-		gn_system_libraries+=( snappy )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
-
-	# Disable forced lld, bug 641556
-	myconf_gn+=" use_lld=false"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
-		fi
-	fi
-
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		append-flags -stdlib=libc++
-		append-ldflags -stdlib=libc++
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
-	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
-
-	# Disable unknown warning message from clang.
-	tc-is-clang && append-flags -Wno-unknown-warning-option
-
-	# Explicitly disable ICU data file support for system-icu builds.
-	if use system-icu; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	myconf_gn+=" ozone_platform_x11=$(usex headless false true)"
-	if use wayland || use headless; then
-		if use headless; then
-			myconf_gn+=" ozone_platform=\"headless\""
-			myconf_gn+=" use_x11=false"
-		else
-			myconf_gn+=" ozone_platform_wayland=true"
-			myconf_gn+=" use_system_libdrm=true"
-			myconf_gn+=" use_system_minigbm=true"
-			myconf_gn+=" use_xkbcommon=true"
-			myconf_gn+=" ozone_platform=\"wayland\""
-		fi
-	else
-		myconf_gn+=" ozone_platform=\"x11\""
-	fi
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	myconf_gn+=" use_thin_lto=false"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		# Disable CFI: unsupported for GCC, requires clang+lto+lld
-		myconf_gn+=" is_cfi=false"
-		# Disable PGO, because profile data is only compatible with >=clang-11
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-	doins -r out/Release/MEIPreload
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if use vaapi; then
-		elog "VA-API is disabled by default at runtime. You have to enable it"
-		elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-		elog "in /etc/chromium/default."
-	fi
-	if use screencast; then
-		elog "Screencast is disabled by default at runtime. Either enable it"
-		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
-		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-	fi
-}
diff --git a/www-client/chromium/chromium-95.0.4638.54.ebuild b/www-client/chromium/chromium-95.0.4638.54.ebuild
new file mode 100644
index 000000000000..377ba36b7e97
--- /dev/null
+++ b/www-client/chromium/chromium-95.0.4638.54.ebuild
@@ -0,0 +1,954 @@
+# Copyright 2009-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="xml"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+PATCHSET="4"
+PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine"
+REQUIRED_USE="
+	component-build? ( !suid )
+	screencast? ( wayland )
+"
+
+COMMON_X_DEPEND="
+	media-libs/mesa:=[gbm(+)]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxcb:=
+	x11-libs/libxshmfence:=
+	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
+"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/expat:=
+	dev-libs/glib:2
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2.11.0-r1:=
+	system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] )
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4.3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		>=media-libs/opus-1.3.1:=
+	)
+	net-misc/curl[ssl]
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libxkbcommon:=
+	x11-libs/pango:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+	!headless? (
+		${COMMON_X_DEPEND}
+		>=app-accessibility/at-spi2-atk-2.26:2
+		>=app-accessibility/at-spi2-core-2.26:2
+		>=dev-libs/atk-2.26
+		x11-libs/gtk+:3[X]
+		wayland? (
+			dev-libs/wayland:=
+			screencast? ( media-video/pipewire:0/0.3 )
+			x11-libs/gtk+:3[wayland,X]
+			x11-libs/libdrm:=
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=app-arch/gzip-1.7
+	dev-lang/perl
+	>=dev-util/gn-0.1807
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	js-type-check? ( virtual/jre )
+"
+
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
+: ${CHROMIUM_FORCE_CLANG=no}
+: ${CHROMIUM_FORCE_LIBCXX=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-12"
+fi
+
+if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+	RDEPEND+=" >=sys-libs/libcxx-12"
+	DEPEND+=" >=sys-libs/libcxx-12"
+else
+	COMMON_DEPEND="
+		app-arch/snappy:=
+		dev-libs/libxslt:=
+		>=dev-libs/re2-0.2019.08.01:=
+		>=media-libs/openh264-1.6.0:=
+		system-icu? ( >=dev-libs/icu-69.1:= )
+	"
+	RDEPEND+="${COMMON_DEPEND}"
+	DEPEND+="${COMMON_DEPEND}"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
+			die "At least gcc 9.2 is required"
+		fi
+		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
+			CPP="${CHOST}-clang++ -E"
+			if ! ver_test "$(clang-major-version)" -ge 12; then
+				die "At least clang 12 is required"
+			fi
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="4G"
+	CHECKREQS_DISK_BUILD="9G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+
+	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
+	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
+		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${WORKDIR}/patches"
+		"${FILESDIR}/chromium-93-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-95-maldoca-zlib.patch"
+		"${FILESDIR}/chromium-95-eigen-avx-1.patch"
+		"${FILESDIR}/chromium-95-eigen-avx-2.patch"
+		"${FILESDIR}/chromium-95-eigen-avx-3.patch"
+		"${FILESDIR}/chromium-95-harfbuzz-3.patch"
+		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
+		"${FILESDIR}/chromium-shim_headers.patch"
+	)
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	# adjust python interpreter version
+	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/src/third_party/volk
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4-4.9.3
+		third_party/catapult/third_party/html5lib-1.1
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/khronos
+		third_party/dawn/third_party/tint
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/diff
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit-html
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
+		third_party/devtools-frontend/src/third_party
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fdlibm
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/freetype
+		third_party/fusejs
+		third_party/highway
+		third_party/libgifcodec
+		third_party/liburlpattern
+		third_party/libzip
+		third_party/gemmlowp
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/fastfeat
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libjxl
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/maldoca
+		third_party/maldoca/src/third_party/tensorflow_protos
+		third_party/maldoca/src/third_party/zlibwrapper
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/opencv
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/securemessage
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/tcmalloc
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/tflite-support
+		third_party/ruy
+		third_party/six
+		third_party/ukey2
+		third_party/unrar
+		third_party/usrsctp
+		third_party/utf
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if use system-harfbuzz; then
+		keeplibs+=( third_party/harfbuzz-ng/utils )
+	else
+		keeplibs+=( third_party/harfbuzz-ng )
+	fi
+	if use wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libxml )
+		keeplibs+=( third_party/libxslt )
+		keeplibs+=( third_party/openh264 )
+		keeplibs+=( third_party/re2 )
+		keeplibs+=( third_party/snappy )
+		if use system-icu; then
+			keeplibs+=( third_party/icu )
+		fi
+	fi
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	if use js-type-check; then
+		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
+	fi
+
+	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
+	mkdir -p buildtools/third_party/eu-strip/bin || die
+	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+			die "Compiling with sys-libs/libcxx requires clang."
+		fi
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
+	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
+	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
+	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
+		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
+		gn_system_libraries+=( libxml )
+		gn_system_libraries+=( libxslt )
+		gn_system_libraries+=( openh264 )
+		gn_system_libraries+=( re2 )
+		gn_system_libraries+=( snappy )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" disable_fieldtrial_testing_config=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=false"
+
+	# Disable code formating of generated files
+	myconf_gn+=" blink_enable_generated_code_formatting=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info. The OAuth2 credentials, however, have been left out.
+	# Those OAuth2 credentials have been broken for quite some time anyway.
+	# Instead we apply a patch to use the --oauth2-client-id= and
+	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
+	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
+	# Chromium without baked-in values.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		append-flags -stdlib=libc++
+		append-ldflags -stdlib=libc++
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
+	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
+
+	# Disable unknown warning message from clang.
+	tc-is-clang && append-flags -Wno-unknown-warning-option
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	myconf_gn+=" ozone_platform_x11=$(usex headless false true)"
+	if use wayland || use headless; then
+		if use headless; then
+			myconf_gn+=" ozone_platform=\"headless\""
+			myconf_gn+=" use_x11=false"
+		else
+			myconf_gn+=" ozone_platform_wayland=true"
+			myconf_gn+=" use_system_libdrm=true"
+			myconf_gn+=" use_system_minigbm=true"
+			myconf_gn+=" use_xkbcommon=true"
+			myconf_gn+=" ozone_platform=\"wayland\""
+		fi
+	else
+		myconf_gn+=" ozone_platform=\"x11\""
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	myconf_gn+=" use_thin_lto=false"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Disable PGO, because profile data is only compatible with >=clang-11
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
+	local -x PYTHONPATH=
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	mv out/Release/chromedriver{.unstripped,} || die
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+	doexe out/Release/chrome_crashpad_handler
+
+	ozone_auto_session () {
+		use wayland && ! use headless && echo true || echo false
+	}
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+	doins -r out/Release/MEIPreload
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if use vaapi; then
+		elog "VA-API is disabled by default at runtime. You have to enable it"
+		elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+		elog "in /etc/chromium/default."
+	fi
+	if use screencast; then
+		elog "Screencast is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
+		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+	fi
+}
diff --git a/www-client/chromium/chromium-96.0.4655.0.ebuild b/www-client/chromium/chromium-96.0.4655.0.ebuild
deleted file mode 100644
index d53a4e5b63b5..000000000000
--- a/www-client/chromium/chromium-96.0.4655.0.ebuild
+++ /dev/null
@@ -1,951 +0,0 @@
-# Copyright 2009-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="xml"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-PATCHSET="2"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine"
-REQUIRED_USE="
-	component-build? ( !suid )
-	screencast? ( wayland )
-"
-
-COMMON_X_DEPEND="
-	media-libs/mesa:=[gbm(+)]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxcb:=
-	x11-libs/libxshmfence:=
-	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
-"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	dev-libs/expat:=
-	dev-libs/glib:2
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4.3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		>=media-libs/opus-1.3.1:=
-	)
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libxkbcommon:=
-	x11-libs/pango:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-	!headless? (
-		${COMMON_X_DEPEND}
-		>=app-accessibility/at-spi2-atk-2.26:2
-		>=app-accessibility/at-spi2-core-2.26:2
-		>=dev-libs/atk-2.26
-		x11-libs/gtk+:3[X]
-		wayland? (
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:0/0.3 )
-			x11-libs/gtk+:3[wayland,X]
-			x11-libs/libdrm:=
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-"
-DEPEND="${COMMON_DEPEND}
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	dev-lang/perl
-	>=dev-util/gn-0.1807
-	dev-vcs/git
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-7.6.0[inspector]
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	js-type-check? ( virtual/jre )
-"
-
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-: ${CHROMIUM_FORCE_LIBCXX=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-12"
-fi
-
-if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-	RDEPEND+=" >=sys-libs/libcxx-12"
-	DEPEND+=" >=sys-libs/libcxx-12"
-else
-	COMMON_DEPEND="
-		app-arch/snappy:=
-		dev-libs/libxslt:=
-		>=dev-libs/re2-0.2019.08.01:=
-		>=media-libs/openh264-1.6.0:=
-		system-icu? ( >=dev-libs/icu-69.1:= )
-	"
-	RDEPEND+="${COMMON_DEPEND}"
-	DEPEND+="${COMMON_DEPEND}"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
-			die "At least gcc 9.2 is required"
-		fi
-		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
-			CPP="${CHOST}-clang++ -E"
-			if ! ver_test "$(clang-major-version)" -ge 12; then
-				die "At least clang 12 is required"
-			fi
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="4G"
-	CHECKREQS_DISK_BUILD="9G"
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-
-	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
-	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
-		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
-		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local PATCHES=(
-		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-93-EnumTable-crash.patch"
-		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-95-eigen-avx-1.patch"
-		"${FILESDIR}/chromium-95-eigen-avx-2.patch"
-		"${FILESDIR}/chromium-95-eigen-avx-3.patch"
-		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
-		"${FILESDIR}/chromium-shim_headers.patch"
-	)
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/angle/src/third_party/volk
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dav1d
-		third_party/dawn
-		third_party/dawn/third_party/khronos
-		third_party/dawn/third_party/tint
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit-html
-		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
-		third_party/devtools-frontend/src/third_party
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fdlibm
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/freetype
-		third_party/fusejs
-		third_party/highway
-		third_party/libgifcodec
-		third_party/liburlpattern
-		third_party/libzip
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/fastfeat
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libavif
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libjxl
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/maldoca
-		third_party/maldoca/src/third_party/tensorflow_protos
-		third_party/maldoca/src/third_party/zlibwrapper
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/one_euro_filter
-		third_party/opencv
-		third_party/openscreen
-		third_party/openscreen/src/third_party/mozilla
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private-join-and-compute
-		third_party/private_membership
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pyjson5
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/skcms
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/skcms
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
-		third_party/tcmalloc
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/ruy
-		third_party/six
-		third_party/ukey2
-		third_party/unrar
-		third_party/usrsctp
-		third_party/utf
-		third_party/vulkan
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/zxcvbn-cpp
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng/utils )
-	else
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-	if use wayland && ! use headless ; then
-		keeplibs+=( third_party/wayland )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		keeplibs+=( third_party/libxml )
-		keeplibs+=( third_party/libxslt )
-		keeplibs+=( third_party/openh264 )
-		keeplibs+=( third_party/re2 )
-		keeplibs+=( third_party/snappy )
-		if use system-icu; then
-			keeplibs+=( third_party/icu )
-		fi
-	fi
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	if use js-type-check; then
-		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
-	fi
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-src_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
-		# Force clang since gcc is pretty broken at the moment.
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-			die "Compiling with sys-libs/libcxx requires clang."
-		fi
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
-		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
-		gn_system_libraries+=( libxml )
-		gn_system_libraries+=( libxslt )
-		gn_system_libraries+=( openh264 )
-		gn_system_libraries+=( re2 )
-		gn_system_libraries+=( snappy )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
-
-	# Disable forced lld, bug 641556
-	myconf_gn+=" use_lld=false"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
-		fi
-	fi
-
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		append-flags -stdlib=libc++
-		append-ldflags -stdlib=libc++
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
-	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
-
-	# Disable unknown warning message from clang.
-	tc-is-clang && append-flags -Wno-unknown-warning-option
-
-	# Explicitly disable ICU data file support for system-icu builds.
-	if use system-icu; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	myconf_gn+=" ozone_platform_x11=$(usex headless false true)"
-	if use wayland || use headless; then
-		if use headless; then
-			myconf_gn+=" ozone_platform=\"headless\""
-			myconf_gn+=" use_x11=false"
-		else
-			myconf_gn+=" ozone_platform_wayland=true"
-			myconf_gn+=" use_system_libdrm=true"
-			myconf_gn+=" use_system_minigbm=true"
-			myconf_gn+=" use_xkbcommon=true"
-			myconf_gn+=" ozone_platform=\"wayland\""
-		fi
-	else
-		myconf_gn+=" ozone_platform=\"x11\""
-	fi
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	myconf_gn+=" use_thin_lto=false"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		# Disable CFI: unsupported for GCC, requires clang+lto+lld
-		myconf_gn+=" is_cfi=false"
-		# Disable PGO, because profile data is only compatible with >=clang-11
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-	doins -r out/Release/MEIPreload
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if use vaapi; then
-		elog "VA-API is disabled by default at runtime. You have to enable it"
-		elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-		elog "in /etc/chromium/default."
-	fi
-	if use screencast; then
-		elog "Screencast is disabled by default at runtime. Either enable it"
-		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
-		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-	fi
-}
diff --git a/www-client/chromium/chromium-96.0.4664.9.ebuild b/www-client/chromium/chromium-96.0.4664.9.ebuild
new file mode 100644
index 000000000000..713a8a577ae7
--- /dev/null
+++ b/www-client/chromium/chromium-96.0.4664.9.ebuild
@@ -0,0 +1,949 @@
+# Copyright 2009-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+PATCHSET="4"
+PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine"
+REQUIRED_USE="
+	component-build? ( !suid )
+	screencast? ( wayland )
+"
+
+COMMON_X_DEPEND="
+	media-libs/mesa:=[gbm(+)]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxcb:=
+	x11-libs/libxshmfence:=
+	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
+"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/expat:=
+	dev-libs/glib:2
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2.11.0-r1:=
+	system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] )
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4.3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		>=media-libs/opus-1.3.1:=
+	)
+	net-misc/curl[ssl]
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libxkbcommon:=
+	x11-libs/pango:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+	!headless? (
+		${COMMON_X_DEPEND}
+		>=app-accessibility/at-spi2-atk-2.26:2
+		>=app-accessibility/at-spi2-core-2.26:2
+		>=dev-libs/atk-2.26
+		x11-libs/gtk+:3[X]
+		wayland? (
+			dev-libs/wayland:=
+			screencast? ( media-video/pipewire:0/0.3 )
+			x11-libs/gtk+:3[wayland,X]
+			x11-libs/libdrm:=
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=app-arch/gzip-1.7
+	dev-lang/perl
+	>=dev-util/gn-0.1807
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	js-type-check? ( virtual/jre )
+"
+
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
+: ${CHROMIUM_FORCE_CLANG=no}
+: ${CHROMIUM_FORCE_LIBCXX=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-12"
+fi
+
+if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+	RDEPEND+=" >=sys-libs/libcxx-12"
+	DEPEND+=" >=sys-libs/libcxx-12"
+else
+	COMMON_DEPEND="
+		app-arch/snappy:=
+		dev-libs/libxslt:=
+		>=dev-libs/re2-0.2019.08.01:=
+		>=media-libs/openh264-1.6.0:=
+		system-icu? ( >=dev-libs/icu-69.1:= )
+	"
+	RDEPEND+="${COMMON_DEPEND}"
+	DEPEND+="${COMMON_DEPEND}"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
+			die "At least gcc 9.2 is required"
+		fi
+		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
+			CPP="${CHOST}-clang++ -E"
+			if ! ver_test "$(clang-major-version)" -ge 12; then
+				die "At least clang 12 is required"
+			fi
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="4G"
+	CHECKREQS_DISK_BUILD="9G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+
+	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
+	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
+		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${WORKDIR}/patches"
+		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-96-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
+		"${FILESDIR}/chromium-shim_headers.patch"
+	)
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	# adjust python interpreter version
+	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/src/third_party/volk
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4-4.9.3
+		third_party/catapult/third_party/html5lib-1.1
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/khronos
+		third_party/dawn/third_party/tint
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/diff
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit-html
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
+		third_party/devtools-frontend/src/third_party
+		third_party/distributed_point_functions
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fdlibm
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/freetype
+		third_party/fusejs
+		third_party/highway
+		third_party/libgifcodec
+		third_party/liburlpattern
+		third_party/libzip
+		third_party/gemmlowp
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/fastfeat
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libjxl
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/maldoca
+		third_party/maldoca/src/third_party/tensorflow_protos
+		third_party/maldoca/src/third_party/zlibwrapper
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/opencv
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/securemessage
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/tcmalloc
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/ruy
+		third_party/six
+		third_party/ukey2
+		third_party/unrar
+		third_party/usrsctp
+		third_party/utf
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if use system-harfbuzz; then
+		keeplibs+=( third_party/harfbuzz-ng/utils )
+	else
+		keeplibs+=( third_party/harfbuzz-ng )
+	fi
+	if use wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libxml )
+		keeplibs+=( third_party/libxslt )
+		keeplibs+=( third_party/openh264 )
+		keeplibs+=( third_party/re2 )
+		keeplibs+=( third_party/snappy )
+		if use system-icu; then
+			keeplibs+=( third_party/icu )
+		fi
+	fi
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	if use js-type-check; then
+		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
+	fi
+
+	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
+	mkdir -p buildtools/third_party/eu-strip/bin || die
+	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+			die "Compiling with sys-libs/libcxx requires clang."
+		fi
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
+	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
+	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
+	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
+		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
+		gn_system_libraries+=( libxml )
+		gn_system_libraries+=( libxslt )
+		gn_system_libraries+=( openh264 )
+		gn_system_libraries+=( re2 )
+		gn_system_libraries+=( snappy )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" disable_fieldtrial_testing_config=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=false"
+
+	# Disable code formating of generated files
+	myconf_gn+=" blink_enable_generated_code_formatting=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info. The OAuth2 credentials, however, have been left out.
+	# Those OAuth2 credentials have been broken for quite some time anyway.
+	# Instead we apply a patch to use the --oauth2-client-id= and
+	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
+	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
+	# Chromium without baked-in values.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		append-flags -stdlib=libc++
+		append-ldflags -stdlib=libc++
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
+	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
+
+	# Disable unknown warning message from clang.
+	tc-is-clang && append-flags -Wno-unknown-warning-option
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	myconf_gn+=" ozone_platform_x11=$(usex headless false true)"
+	if use wayland || use headless; then
+		if use headless; then
+			myconf_gn+=" ozone_platform=\"headless\""
+			myconf_gn+=" use_x11=false"
+		else
+			myconf_gn+=" ozone_platform_wayland=true"
+			myconf_gn+=" use_system_libdrm=true"
+			myconf_gn+=" use_system_minigbm=true"
+			myconf_gn+=" use_xkbcommon=true"
+			myconf_gn+=" ozone_platform=\"wayland\""
+		fi
+	else
+		myconf_gn+=" ozone_platform=\"x11\""
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	myconf_gn+=" use_thin_lto=false"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Disable PGO, because profile data is only compatible with >=clang-11
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
+	local -x PYTHONPATH=
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	mv out/Release/chromedriver{.unstripped,} || die
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+	doexe out/Release/chrome_crashpad_handler
+
+	ozone_auto_session () {
+		use wayland && ! use headless && echo true || echo false
+	}
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+	doins -r out/Release/MEIPreload
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if use vaapi; then
+		elog "VA-API is disabled by default at runtime. You have to enable it"
+		elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+		elog "in /etc/chromium/default."
+	fi
+	if use screencast; then
+		elog "Screencast is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
+		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+	fi
+}
diff --git a/www-client/chromium/files/chromium-95-harfbuzz-3.patch b/www-client/chromium/files/chromium-95-harfbuzz-3.patch
new file mode 100644
index 000000000000..33fe9556aaf3
--- /dev/null
+++ b/www-client/chromium/files/chromium-95-harfbuzz-3.patch
@@ -0,0 +1,31 @@
+From 9e00e702633c47c590a869bc66b5c2ceec09da50 Mon Sep 17 00:00:00 2001
+From: Dominik Röttsches <drott@chromium.org>
+Date: Tue, 28 Sep 2021 15:31:50 +0000
+Subject: [PATCH] Roll src/third_party/harfbuzz-ng/src/ 6602cbb70..a52c6df38 (80 commits)
+
+Fixed: 1252284
+Change-Id: Ie2ff99da5e41ca97b8881e1bd3e158881f4d5a8e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3190252
+Commit-Queue: Dominik Röttsches <drott@chromium.org>
+Commit-Queue: Calder Kitagawa <ckitagawa@chromium.org>
+Auto-Submit: Dominik Röttsches <drott@chromium.org>
+Reviewed-by: Calder Kitagawa <ckitagawa@chromium.org>
+Reviewed-by: Anders Hartvoll Ruud <andruud@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#925776}
+
+(only components/paint_preview/common/subset_font.cc)
+---
+
+diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc
+index 45daea7b1..43a448e 100644
+--- a/components/paint_preview/common/subset_font.cc
++++ b/components/paint_preview/common/subset_font.cc
+@@ -79,7 +79,7 @@
+   // Retain all variation information for OpenType variation fonts. See:
+   // https://docs.microsoft.com/en-us/typography/opentype/spec/otvaroverview
+   hb_set_t* skip_subset =
+-      hb_subset_input_no_subset_tables_set(input.get());  // Owned by |input|.
++      hb_subset_input_set(input.get(), HB_SUBSET_SETS_NO_SUBSET_TABLE_TAG);
+   hb_set_add(skip_subset, HB_TAG('a', 'v', 'a', 'r'));
+   hb_set_add(skip_subset, HB_TAG('c', 'v', 'a', 'r'));
+   hb_set_add(skip_subset, HB_TAG('f', 'v', 'a', 'r'));
diff --git a/www-client/chromium/files/chromium-96-EnumTable-crash.patch b/www-client/chromium/files/chromium-96-EnumTable-crash.patch
new file mode 100644
index 000000000000..9736739c8224
--- /dev/null
+++ b/www-client/chromium/files/chromium-96-EnumTable-crash.patch
@@ -0,0 +1,76 @@
+diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h
+index aad9e08..2f3fcad 100644
+--- a/components/cast_channel/enum_table.h
++++ b/components/cast_channel/enum_table.h
+@@ -8,6 +8,7 @@
+ #include <cstdint>
+ #include <cstring>
+ #include <ostream>
++#include <vector>
+ 
+ #include "base/check_op.h"
+ #include "base/macros.h"
+@@ -188,7 +189,6 @@ class
+   inline constexpr GenericEnumTableEntry(int32_t value);
+   inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str);
+ 
+-  GenericEnumTableEntry(const GenericEnumTableEntry&) = delete;
+   GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete;
+ 
+  private:
+@@ -254,7 +254,6 @@ class EnumTable {
+     constexpr Entry(E value, base::StringPiece str)
+         : GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
+ 
+-    Entry(const Entry&) = delete;
+     Entry& operator=(const Entry&) = delete;
+   };
+ 
+@@ -313,15 +312,14 @@ class EnumTable {
+     if (is_sorted_) {
+       const std::size_t index = static_cast<std::size_t>(value);
+       if (ANALYZER_ASSUME_TRUE(index < data_.size())) {
+-        const auto& entry = data_.begin()[index];
++        const auto& entry = data_[index];
+         if (ANALYZER_ASSUME_TRUE(entry.has_str()))
+           return entry.str();
+       }
+       return absl::nullopt;
+     }
+     return GenericEnumTableEntry::FindByValue(
+-        reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
+-        data_.size(), static_cast<int32_t>(value));
++        &data_[0], data_.size(), static_cast<int32_t>(value));
+   }
+ 
+   // This overload of GetString is designed for cases where the argument is a
+@@ -349,8 +347,7 @@ class EnumTable {
+   // enum value directly.
+   absl::optional<E> GetEnum(base::StringPiece str) const {
+     auto* entry = GenericEnumTableEntry::FindByString(
+-        reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
+-        data_.size(), str);
++        &data_[0], data_.size(), str);
+     return entry ? static_cast<E>(entry->value) : absl::optional<E>();
+   }
+ 
+@@ -365,7 +362,7 @@ class EnumTable {
+   // Align the data on a cache line boundary.
+   alignas(64)
+ #endif
+-      std::initializer_list<Entry> data_;
++      const std::vector<Entry> data_;
+   bool is_sorted_;
+ 
+   constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
+@@ -377,8 +374,8 @@ class EnumTable {
+ 
+     for (std::size_t i = 0; i < data.size(); i++) {
+       for (std::size_t j = i + 1; j < data.size(); j++) {
+-        const Entry& ei = data.begin()[i];
+-        const Entry& ej = data.begin()[j];
++        const Entry& ei = data[i];
++        const Entry& ej = data[j];
+         DCHECK(ei.value != ej.value)
+             << "Found duplicate enum values at indices " << i << " and " << j;
+         DCHECK(!(ei.has_str() && ej.has_str() && ei.str() == ej.str()))
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 4953a33da2c4..d703a587ae2b 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -5,6 +5,6 @@ DIST dillo-3.0.5.tar.bz2 734472 BLAKE2B c8a7ac3a875740d2d64269b0d368e6f9395c89a5
 DIST dillo-3.1_pre20181005.tar.xz 907752 BLAKE2B a894583e2c50baf2c2ff615dadfbe79e7652154cc0f7b80a4253d27dbe2e5463fa9c7a44622a6cfdcc60822cee0e1c38c31231b5bc5ee9c7b22bb16a15cc8c90 SHA512 f1916c6261bfcae9264037eaee37497660e43e46641c42fbcc9c2592fa41602a83fc91ddce6aeabc0122c575bcff72339d181210f3039e5d4c5a7c25f88aa642
 DIST dillo.png 6135 BLAKE2B 63aa76000934123420d0704317309639bf5dcd22c61b09406a7ec67018b17044a417209954d67f22e2000b0871d315a25388bacffab9599230fc9615877a2f08 SHA512 cfc9bcf1bfd0fff7fc625c7d288c92d0f33418b963a4e344844fd2bcb33823b3215a8a1a86162dcd1c614eea2323bb361c11bd8bd15859b771c63943c1b40833
 EBUILD dillo-3.0.5-r3.ebuild 1241 BLAKE2B f304a6f6e61613f97fae92370271a09a43bfa195f913f8d5694e14136adf87129e29616a1a463eee49989a45cbbbf3885653e190dd8394ca83feb51d4553a685 SHA512 956089c7456747bf4f12da512233853d2c9180897aacd5b262089fc86a7aa9e7b6aa16621f7d5c094a13b4081521258a85904b19873a166b4f18df37685b6e4a
-EBUILD dillo-3.1_pre20181005.ebuild 1213 BLAKE2B c0c66dc90845a8ff72bf4144c95af6f32a3cc52e6d8fcfa757458e5f2bec0c04a0625ebc470c8020bff2c04d2ee87f23fa4106748c47eab5d7dd6d3806c2f88f SHA512 5b9473eac50c90cc3080de16b2d4f7e10026e807e356dc45f54ed7228341aaad71cfbccdadc382ef388c1b0165a8ea2d4136132ad9379850144f2e724171d5f2
+EBUILD dillo-3.1_pre20181005.ebuild 1227 BLAKE2B 57d2a2a768305388c36f54fb0558b1cd6711cc84b5a336610f0956616bcfd680070c22d57915060b84322c648ddf0e0330d6a5663768b6278366efc8c01c239c SHA512 5919649b6959ca81786c2c65698447e76ffe3cf885885b4eecfc7dc461fd494aa9e8e910d90cd400c5166315c2a9dd147412acdcb870e1e455379ad5b6879a0d
 EBUILD dillo-9999.ebuild 1153 BLAKE2B 8c859ca6a5d600ef275efcf30cc36352ef7b761d6971dea299cd45e19c209ccde9402e41652a6f79b7913952d8bd88b9d8b3df49e40277c46d45299be4f90468 SHA512 695e0cac6fb25b75055d8c19a77e14d5c4c6dada6af22ab0904fe43d93b96bf1c1550c170385a0a2c1243b40d0e57ea68088069025bf9d60ebc2780eb5acfbfe
 MISC metadata.xml 234 BLAKE2B 005eb7a48b02fc940cbb0a6295ff7f2af850eeeb2d96ee4c72782c8fb23a3b95d6219536fa2ec47be79553cd2a396a909cd5779526e33faf1d1669aab442a809 SHA512 3f8ddc377f27647b83b0bad68cd3daadcc3a9021c28e05fa32765103d53f0c164436c5265ba4373345fd0fc35db8edc3a5fb2c03884a2a22b14f5086e375206b
diff --git a/www-client/dillo/dillo-3.1_pre20181005.ebuild b/www-client/dillo/dillo-3.1_pre20181005.ebuild
index 92580c3355db..4726129bf854 100644
--- a/www-client/dillo/dillo-3.1_pre20181005.ebuild
+++ b/www-client/dillo/dillo-3.1_pre20181005.ebuild
@@ -7,7 +7,7 @@ inherit autotools desktop toolchain-funcs
 DESCRIPTION="Lean FLTK based web browser"
 HOMEPAGE="https://www.dillo.org/"
 SRC_URI="
-	https://dev.gentoo.org/~jer/${P}.tar.xz
+	https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz
 	mirror://gentoo/${PN}.png
 "
 
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index eff086466bdd..4c7c3a57d59c 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -9,198 +9,6 @@ AUX gentoo-hwaccel-prefs.js 162 BLAKE2B c5f2dfb727081e2d538c262f12c0cfdda31cbda5
 AUX icon/firefox-r2.desktop 8137 BLAKE2B 5d0ce737c0e0969cb1a61de7989f5ca1ca0dff413d6d98bb0c93e0fed510b4e075a88fc117d3713e5e11ee7471ceaeffa9bc9dfd4282f3ddb1ea837d823e4887 SHA512 749a50b11d89c1329a52d13745ff8d5f801e565038cb5341319b4b515f36baf1c0c740003d6d01188c27e31d7ddeff58310e7b2420681292d0f2522bc5bd34b6
 AUX icon/firefox-r3.desktop 8116 BLAKE2B 50b476a1be87bcca0bd6175b7a7f5e67ac5d3f40b0a5a99c2244036a9eea53fb518f59c1d87b18723c4ae6c261bfb692ef0b52c6714402b0a98da4b6867ab977 SHA512 07c9d89babe20fba9531396c9aa2b692aae77606be2b8a750481b6b8f9b3eab320fef313d1ed4b15d3fbc4cd94dfb56b62ce1a3e89ba7143c6aa9acc0f919bf8
 AUX icon/firefox-symbolic.svg 7432 BLAKE2B 33a552ffb9850f6b9cd3cb8d9f7f80268ac08f00a0bd5eb15d892c6fbb950f8cacf6058b9c838f5be1ae1b53541f143a1ec0c1302ae85b49100b166fcbccdce6 SHA512 ba7db9a7c95a051bcd84e4c09c802fc55ee3c0d1d06ec1b169b04e414259b75bbe92fe584aee41a1e3f71e71c160df8bedf5393449e5024110ed27dbc0579ea8
-DIST firefox-78.13.0esr-ach.xpi 460301 BLAKE2B ca4cd3d8d2384de6fd855bb6bf2b6f4a5bae9addb51e7a092eebd8e6f4de1b5cb7f452c58636679e68f58c89ae816eca6108813df8bea4272553602b65a40630 SHA512 b93d460f80a2403946c0daa8a083670b3f95cd91d5b9d9620b1ccd71f4a2eeaa6d9ee9acf73517e6efb56b39d8a4058f66e328b058df5c143006d18fae2d647b
-DIST firefox-78.13.0esr-af.xpi 428367 BLAKE2B deb1463defa2b2567b7f1ac2e6a12cdbd7b723ce1d1242d55fe34d3422ae52651bce6e785347647b59ab75bd9c8e42ab75fa6bbaf74ca5449844873077a826e6 SHA512 777c8f15e6a004e2fe1a48011187fe6d7d7ff2c8372885043e57e646a9c4913ded02695d970cdf0660adbd90840ea791008c342f33eca77b92e8809f1b659c38
-DIST firefox-78.13.0esr-an.xpi 508374 BLAKE2B c1c02f6732ea63a2692b2f82540c61a50a661c681f433299acaeca1008be387f489e58fc3e776762e0fda1799b956b503b3b941974bf2f03835c59cc2b724d89 SHA512 138363db07e7e2972cfb59ae76134f6604494659b0459596a1af56c37b33d0713c1632e34d239486c7b8adf46bb86aa84e9db3bc9ba428862ab075de76056451
-DIST firefox-78.13.0esr-ar.xpi 560955 BLAKE2B 2f2250f5cee51a85ebc0d44c5e683594b9cda155a70f6c168185a737495c1f7b1084e5505679aa990eb73aceb186accb786f8f12c9fcbe53bc6d5ab6636c8905 SHA512 7bf2a63204528769a443586ce47de9085f151883aca910d3814bc6bd70dc8cfb0ed5c4a96cbed68d15b06fd3d8f256eb4a23be62c2173ea76a8fc7aeac1f2240
-DIST firefox-78.13.0esr-ast.xpi 456379 BLAKE2B 2590ef002c4db03b5f92f12622700dd78e49692429ee9360bb70ca974e73ca46fc05c5fe7a77af5ac77470ed558461612c0461efa8d75a8aafc510d93aed6ccc SHA512 ac9fe567c893f2f5c4e6091b3f84481c0898b64a09430bd7cfa96b4be1824618a0ba17916e424ebc7a2561f1b7c6ec6de8862d27eaff2c05aa6f2610981283e8
-DIST firefox-78.13.0esr-az.xpi 497445 BLAKE2B 295eeb81ba639a847094db720a7b2f34a9672f4499b4a079abe957a913d5953f62e3f9186d888c97540814428a80abdcf1550ed15347a471bbce53e51850578e SHA512 80d2ecd9f0d58fc3c3ecf2141f599bae11ea9a754d417316a020b4687baa308a6595c5112927fe48d7af425f876bf647f6eb217cb59902bde76a8ff967465f3e
-DIST firefox-78.13.0esr-be.xpi 608659 BLAKE2B df63d42565cb7848711d843ad02a3a6eeebedb08ad59a76c54798314b13905c3f4cf86cce9451766bda8a30b791da37ecaa294ef430b549dcf118126b13222ad SHA512 0bb5a0e882f56cc15749b61f62b6a9039188767a8cbdf4d8e9039ba3a922c1e3b973baa01b9ab26474ee9491acb48ae803e63a95824481dc0a096683b2c670bd
-DIST firefox-78.13.0esr-bg.xpi 553974 BLAKE2B b76e7290edf1aa1c87a8b2a0dba09cb091be43484687c96d651a382cb8fe74cc13ed3c728a3ebf74caa90e5a5a24a8cc8dedb7fbaeacdb0583327b9f31fb0747 SHA512 e6119e25a36a04a2188d17d6fa5b77760c14353f54b96f7e29ed1381900fb756b2564d6f89175f8d3a68c33a00888c3d0514ac03d61423ca323869e69d8de7e7
-DIST firefox-78.13.0esr-bn.xpi 572607 BLAKE2B 575dccdfc43d46905e16adc80ed82b00b74a7b83d837c9e839873136e67a961e13a72a0b5d4b8312a3ddd9cc87845a9b4fc61ea6f7308709c21134a3a4ea5acf SHA512 32178259c4df33e5c67cd2e91358f88d2e43dcccb5ad702abe8e4bb06b36b15d767e5a9f67c89010e8a241d0e678a9ba49d82b55721927a83a2bb5b188c7e5a9
-DIST firefox-78.13.0esr-br.xpi 507138 BLAKE2B f556789f0afb060aecdf9c0dd18b0944b0ad68d88625df9a7bc0d1f2fe78735e97bc674a3cbcad3b20d50d8c21d4dd4f6ddf847ec38a9487593e9f401d4bf54d SHA512 91392d621a1f146c110720bb4bb62275c5befd87e056eb56f06be5c5592344fdc991f9e62bd0baa368688e01dc99f17e3ae01c633e2b1baa14c7ce8e3f555fc7
-DIST firefox-78.13.0esr-bs.xpi 463805 BLAKE2B 5ab8913e373789d6d24a6c74b7e00ed7954fdd47b86805a4de07a462c803b074f39ba469e33be282888c8f5ff7cc7e04b6892fafaf5290b62bd2ab1295b33fe7 SHA512 150ced0674293c1256dd1a02cf1b0c522c015eda48c46f80a34730c4158c9b03e409d12283bc10ce76cc19120105771bcf748d0a21fd3453541bba1693ee6fe8
-DIST firefox-78.13.0esr-ca-valencia.xpi 517183 BLAKE2B b7caad787c6899d90df5ee7f7ba4af71693b9f05b8e2409eb2002a6c4bede51e0dad61704a174de79526e6c0ec7a93aba7aac6f3d8dbbbf38639a79c0dee7cb6 SHA512 e220126c1c12fffcbb4b362a13b75a0c7283dd1a15f38d6e891c447fa9bdbf570e617cd50f6208316bf01f00a34398ed6eb5d2abc9cb60873199ae5a3108d959
-DIST firefox-78.13.0esr-ca.xpi 514178 BLAKE2B 80ff5a01ffdbcf6cd996d3cff9d92d5883645a788c46ef703a85e5167c3c331ffcbb6dd87f2f48e2910c01039c157696ebe6602df37ed2b5dcf9fb84ad5c0575 SHA512 c335b3b3fe9d15b81513060b6b5450e55db662e63105be5f99cb99ace6560e272669279cbe9d8142a0dfda6d38e5d24bfaec3a27a7303042806425c8e93ba95a
-DIST firefox-78.13.0esr-cak.xpi 551550 BLAKE2B 5659d9f973b24825959dca2d57dba1700562a7ce99fcdd752bd4e20644ae5d6941138c3dfdc4a186aae987bbe17d4fe124f644f927d4bf57cdc82372e28d8be0 SHA512 52b26214ee19f9f61630f39445f7335b7616b72367071834d4d94a9119065974acde2d64a676649570aa6541e635643563ff94fd34794001be249e98fd6389ae
-DIST firefox-78.13.0esr-cs.xpi 540320 BLAKE2B 0363a36a5e83979b8f9fe559941e9b8cbea3e90605fbe94faaf9045e4b6be3db4c59a777eeab5806e5f37987a60e85853f8b933342bcf3d6cafad41f8b55f24a SHA512 2b2a6814038e4213f5142477016356b9480c6fc7887051c3ba8a3d31011d0f03a42a92fd55f431ca25920cbf0350f8aab73b120e12e6e82d7d095bfc1e3a392b
-DIST firefox-78.13.0esr-cy.xpi 530701 BLAKE2B 9cd88db7de2620fb592d6fed33c13f6b54ccec9982feadf9a66153478eced45223d6421781bbf428e68ef29e7a5971e06fdc7ba95ed3e373a7ba2f429ccfd736 SHA512 a9f66379d99576040d7861bc3c06df7df904ed29e71f8686b790527de27b123bc13d00e22c4db10ca8d03a64e84fb8bac11148fac6866ac788858a5b79cde7c5
-DIST firefox-78.13.0esr-da.xpi 520278 BLAKE2B a7d0c1a095a8f9ced42ff51c85f2a24bc74a1c29d06d394cc587c0347a070a36865c2c4a0b988eddec0bd1ec3b3b6e155425a0aa8d852e1e99a6f791c4e67a37 SHA512 34d9c20c1d5899c11d08369baf7b94a50711b94c135a0a67dfe8281ae12b0e512ec2594c36edb5dcc93f609fc3e98714bf4dc89525d5a8ca19418bf6e31f45f2
-DIST firefox-78.13.0esr-de.xpi 542854 BLAKE2B 434ccafabcffab6226280155b3172da15fe5f12a2263f2eacd6a80d05509b220b4acc1da8c13f77ebbf15a1d755c3eba12e2789a6f0a46e4f497431e79447641 SHA512 f6818cd5eaed1d0bd2c1a35ccf93cbd396407ebcc09c428ba7692f75bdaa7b106da44e85a4b6dcfe66a06821943d3b0bc413424dc9b7820da1b9abb9a3545653
-DIST firefox-78.13.0esr-dsb.xpi 554282 BLAKE2B b509ff153d52f499c53a193be91439652eab0573231f228efb406716a3d280b6aa382edfa1f379c66dbd00a6ef4105ce9855bb6f86208e365fcf1c505af00e93 SHA512 241e36d1bc70f5c234572e9a4e048c6be55c0967743fdde19c53398e4030f4729371fa34656429d4bf9ac80a1b58e7786d19cb69859a8646184c405e6a90adcb
-DIST firefox-78.13.0esr-el.xpi 626572 BLAKE2B a89297cae63836060f439e897b956a2b00e438c40fee704acda87acb169fd9d91297ab69e5101b126bf29335b2bb4f3223b4a2dbdbedf1b40a010debd2a07f02 SHA512 68daa7d62fa75cc282c44a0378021f4b676411cec1608d5603213efbccd96ba239bdfbf1162de79a1c5b40fa4146d586247bcd20a913505b42c43e5017c9cf6b
-DIST firefox-78.13.0esr-en-CA.xpi 497730 BLAKE2B 944e287896bae91b9ae305ffffd4ed2784e43cbca3ecb8d0d4ea6a4fa66234173614b0c99d99a1abfce1f21083c88353c600901ef12b1976c5e8e01fa5f46008 SHA512 367804a19076a3ca6cea35931cfa3811e71639139bacb156e44b4ec1a19266a699d4b927b8344ffe28067eaefd18e005babc20a83220b627c59f50309de1492f
-DIST firefox-78.13.0esr-en-GB.xpi 497574 BLAKE2B 3f867c5fd234e67783dc7155cacc1812b6bd8a6fb8759b64dfdbff59f8dd72123e9087eff71d03dbd018109c9937f9efe3a3d8d1d54be0b8e68e0f8e19a15b12 SHA512 4bc690ca4634cb29c355973d37d2d94a1968dabe60836696d147e5d5052ac46b620e99c5a8e478a68d2c3965006b8644ee2dc2a844ee1b128286731512deca79
-DIST firefox-78.13.0esr-eo.xpi 525738 BLAKE2B d9c055bc8aaede7c7cc13fbe308218e69540374588b7094a1b20086bbdd75cc335f93d4d09c54f5bab809c722a29449773e027d79c457f35a43932c410e22514 SHA512 4c8a269b33986d82e77a53bf03875071aec11be9063ab93f1e878f8395075b7e3552695f8f34b14d878d49896ab1a85f2c9598287e22fa6f4ad771622fc525c7
-DIST firefox-78.13.0esr-es-AR.xpi 535813 BLAKE2B 08c7bff8682f82cb51dffcd0911efdb962b2acb2998c9f25815686c73d153015b158e3f8088658c023044740d7a9354b27582cb229db834d641df77e6ab51731 SHA512 39b1f25407b73e9354beda25e4f087c77d0a3bbc9957e2867c810c66f423519ef2a747e05ceff8a236567ed1ce653103fa59b9cdb1324c86291c549955c377ee
-DIST firefox-78.13.0esr-es-CL.xpi 535356 BLAKE2B 0a1b73b7935fc91aac2b98e6a0eafe8345b5477d8b9b906852c702cd95210b71de31c535503fe417f4a0d6f8082b3d13e6b60ad100ab7919150c6ca7c6c09435 SHA512 b36a2a63a0ce754954095eeafdfd40b91645298722daa6fc01b5d60dc66bc960e115a4067f6624ab865bed44c012c21c9694fac2ccdba74b6882a6ea3f14691b
-DIST firefox-78.13.0esr-es-ES.xpi 522699 BLAKE2B fb73ee445bb400a48824ce5de31aa1fec6be4252fc455397bedcae5edd3358028b69af4b1c56474d5da6c513ef274aff1144391fea32ff5c87d039c35ca76975 SHA512 758af7ac3853349013aa99df4df894ebe0b60e45152814eaf37e38b8cea3d1a1850d731eab3343256c3269f3a1f0437f3fa1ab920f16212034e79e79c398c5e4
-DIST firefox-78.13.0esr-es-MX.xpi 532313 BLAKE2B cafefc82f7fd260bd60157807ae83fc8a4856ac9ab72c7c71502bcbc14429acf72953e488a18d64bddef798fcce3b842a17dc937853d7d99635fd7a49ec6cd24 SHA512 3931f1c79a950c4787e088450a40f5044b73d5684d4f47c6480cf161b5fc0a7dfc30edfdc3ab317686d3113a90ae549748b6f6b02740103da86b8c1afa053a28
-DIST firefox-78.13.0esr-et.xpi 485253 BLAKE2B 4b237896b91c661ecb7afffdfcea8959f675ea1f2ad29691ffa07a71d3a22cfa7af701805b14c05f75e84316aabb0a6437d4458ac55659458b720e1754900495 SHA512 ea5309cd03aa32dd440ed5a72f5e1cb7e430c0440ebc91c5e8b45ed51785bb91cd3c9bd774f28cbebf1c523d7ef2de6de504b8318f015b587f6caeea31475c93
-DIST firefox-78.13.0esr-eu.xpi 505872 BLAKE2B af7b75906a36768399651abe01aca22cf4f2764e954c3b9ff5bb500b8c0d63114d6c1d15b06e24e2ab141740e15e8647bddb62bcf2ff6f7e400cd700837c4955 SHA512 d4718873c1c30dc55d50d4905bb25f3eaa2919349a34218ccf1d828238798aaa72c0cbaae6f2d8af0af69581eb952b69742b98498256c1fb54902d8d4856ec0d
-DIST firefox-78.13.0esr-fa.xpi 538920 BLAKE2B 5c38fcfe7792e5887a3bf10bfad34305074f9525b1b8ffc3ef3a02d9872281a8adc1deb00e68f4066170ae27401836beed9928b2aafc15567b5ea8b27fc2436c SHA512 6ed1a37f6ae15e7937e8a60e056df155d4b977d2895466bc37a042b3b9379a10db015fcabffbb703d1d65d1a7e66c62f014b876d7fdee99243f2406984b1d727
-DIST firefox-78.13.0esr-ff.xpi 481616 BLAKE2B 646dcb5075bb6aab65df2c83cf526f8427f41cb2359ab8887942eda4a377d5c718136ca0125a11d78e07a983c7529aea0c567fa76e150278b42c46d16547de85 SHA512 18a06d0fd236d58f41acf6491dc9bb391040d268a3fbb5945b88e656ad5d44d941562d042aa419b944850cd8c4e290f2246f43f8b70a8bc70e24aa7300c83d60
-DIST firefox-78.13.0esr-fi.xpi 517928 BLAKE2B 696e294eee7dab802b9d3713e333f10e0b7a5cdf6d190daa3cc22cf624d663f016d6175544501665b973317ceff446b2d3be354aeccb13a8ddb3842541e153f2 SHA512 a5a49de966bb9334acb2a036e23732eb56b8f4359e5982a88b68ba62fbf3503993044c79b592fb1d8e397db3b55f1afb863fab0f4fa271f9e8ca1f260a3d4dc3
-DIST firefox-78.13.0esr-fr.xpi 545877 BLAKE2B 86f92a9272466277e953cd91023bab29a3e0a602c320a846d74926bf94c145d8d8e05ca9c48f4060842633a92678bc747e97a2b6e3d1d80b13da473c5f6bfb9b SHA512 b9f3ac1736b5644d155b59e1386f0f28db160ce964b0fd7ab2d6559358ae902ff8da9b4d82cd6a8b41a15e6634c3c3a484712e0b1ec08c75e46619c213a80b7a
-DIST firefox-78.13.0esr-fy-NL.xpi 532480 BLAKE2B 0a0a44fd4c7b75c74905aa3f9691681a37fc6794e23e53d77105ea23b8bdaee8dd455ec58d0e5a4e009508ddf6310d77e67ae3e427d84492d89afb1a25bf68cc SHA512 23f552a6ac6e1d95911c8b2167d578fadc22583c7630105f38ec3cbe7ff8f4356a6e0fe3698b9ea7b6fd3a9c8f7313e4c901e4f2d67f288fa95f2d6e41d59fda
-DIST firefox-78.13.0esr-ga-IE.xpi 466892 BLAKE2B 2ed1c00d30929cd84413276f3dff260ffbfa474bd86dbf8abd63f72c28ef90679b398558eac9719c477c85aea9e48e6c1916d2f9294c6494209962b6e56ad88e SHA512 854679fb5656890c485a4e8566553420e54d7c5a18b394cba45fee608bfddc37b82bc3b352a5378ea87d8304beb77946a1b764713e2edc4a111d49ff75fa0df6
-DIST firefox-78.13.0esr-gd.xpi 491890 BLAKE2B 7af9f281bf698be6378b7e691aed329b33dccd187227551701f61c46cb419634b65ea17999a19da4a1664501fcd8ef038d6852b4c7d62e25d78f440ba2f20ece SHA512 f29b1e1086af3a93af4b8012680d052b666b1bbe4526c32be44b7126bd1127bf46e248faf78c579c4e4c1b962587ce7b18643954125426ad4ce9f02b5a4ae480
-DIST firefox-78.13.0esr-gl.xpi 528418 BLAKE2B a21b06208cc51a02321b216a0e0cf6df5bddfb3f749ae2d831b8a0de5f7550cc8e174be5f2402c67890cca798cb629dca13bfe68d10802bdd2523255638149f1 SHA512 3dc680e75e5489936a2110dc336374e71838c044fef7e3030ee17e80b23f3f171a802fef13b8e2ab6fcd34041bb5eddbdac6ee7036a65f1077f15f0d343a2952
-DIST firefox-78.13.0esr-gn.xpi 546474 BLAKE2B 529dfe3f5603b2c0144c8d65f6e2d0d41dca61c90c38178a80342f11d4eea9993385bac6a2bd33f3b1fe3c406cde0cb775f113a8a0ecaf8a205278276893325a SHA512 bfa84b5e81b898b8d88cd43632c538dabe8c00a708c905c91e222f88a9220e1d6c4415328dcc3b84d928279b3b5dea3eda9b39d15d1b3aaee8754fa904878476
-DIST firefox-78.13.0esr-gu-IN.xpi 541439 BLAKE2B 59b1cf09802c2d009c6df58d6ad231d3d3ce8a831ac9c9eb9ecc6eb00108d3d24c7eecda7937e3e7fcc94ef13bfc4f8d05d93546d775b5d5295dfdc1e60f8617 SHA512 6b0ddde030a780d90b146651f9e16c7beb1f455ecb3a2eec5fbde2b218e17b3536c111d52502e3a65ce2385575e13ea8f9fe1bce95f9ec88de70ed31a4003c43
-DIST firefox-78.13.0esr-he.xpi 545594 BLAKE2B e9c4af2587e618f4ddd0929357d497f1e4b95749e17c09d5e439b5a3aaaf7a766aad12b303a48f810219df5f50384cd325ba6df7b3b9e98fe45f7d75c329de46 SHA512 cdd10acb879c693409efafca19fabedb5d3fbca29185c0f38fe6e2af4f82e2ecfe0a88cf8c45945e8044daf1fdaf11a49aff9805175d9ca7f941ba9603d4a03e
-DIST firefox-78.13.0esr-hi-IN.xpi 567845 BLAKE2B b7bc36271cd92e2829e73339e150cceef02fc9c651b1e77b322364fe2b2f95e7f7b0f18160b33d475cfb46d376c1dd98ce9ceadff9cdfd622148135f3d7a5c0d SHA512 958cebf9c6730a6a71a2cfa50adfade1dd690ed4584cad4508ea3ab5fb1abb700e82454961c63d6d7f34e14611a1d121922a4fd5b015142783d1f0b79f3786bd
-DIST firefox-78.13.0esr-hr.xpi 522682 BLAKE2B c3f4bd7e567f191a2a4b501ffc00de72f2966e07a290ef4cb2d9015c398e95479f3272b38e776eac6b7275951489206088c3e96922751afa822f5d71b682033a SHA512 483bcd5387f00c9bb74280277086444ddd1127841aad5f72c8e1d99f77c7ab234b154abe6dc27fbfb9238063324c315b5429d8ae4040a7ccdb3385d30c3bbeb0
-DIST firefox-78.13.0esr-hsb.xpi 550660 BLAKE2B 7f5a35319c0849296114aca6bf8037598f9308e41a8fe1ed68b959543a744fb93644f94135f71fb33390c1ab4d961c520e8b57d4ce0943932eb520caee346312 SHA512 df10e5678e7c1815300a355e9dfe6d0b2a350d882bd31e7100155ffc5a70759d2bcf844740376897ce447ccfe7ba2b6a79ac5272b0d1dc22872bd9829dc688c1
-DIST firefox-78.13.0esr-hu.xpi 554890 BLAKE2B a04c706fb83ddd09972498124ab4c69cd73eeb317acf4d4b3592cbf06c2fab686b79e39f6462c9d59bbdfca51d3285bed1429b00f4f4bafbee1114d6a42da746 SHA512 aa4c125c04ca979aeb4a41d1f52ebeddf82eb7835862462412ff4859c5476a3339c7bcc6cbf6466f242a71f7296ef44f910d37c767dbd83d6a73cef2fb26a654
-DIST firefox-78.13.0esr-hy-AM.xpi 588992 BLAKE2B b683f8b09b032e371250712bea407e54065409e0c9fe3c013944ca7f7b89b65398803cb1afb2a56c6caab6a2449fcd6f68418a8a874fc4245fc3bf2739da7537 SHA512 e8fa0f96b46814b5fbe74b075f42004003ac648e22ccf12ec3c867c361d110c258ff3aca7e31be742a659698f3d04e11a13cb169da03681e5467b7c6c1194f9a
-DIST firefox-78.13.0esr-ia.xpi 518833 BLAKE2B 8ad262af0d970e96bd459b2591eba045cc4609f0898b0c99ede204aeffb422c4fcdedeec0701fa50cc16c686303611f2626161cefa17236fe5cf584dce31266e SHA512 9cc3a0e5f504ab24e70735e5aa688440dd769ffd456ecf2d2fadb3297ee8df7b7526bed89d04c08203ca99e3f3613356faea1e0f7e75bff73c2828cc1639f388
-DIST firefox-78.13.0esr-id.xpi 509572 BLAKE2B 1431d40db2eb8d14a68cb6f822a04005579ffca6a04b8063250ba6b252560442fb2b0c560b5831c47180bdf1f9b663add2bf1340838bd6ca15eec365a0bac299 SHA512 9ad680701be2bc0ba280c21a28e6e0587fd14bfd4f5337b1338e5b8881e7df0cf38e0eb4586115c3684c42a3b4f11160e800480cdf9ccedaadd3e1dbe6d75597
-DIST firefox-78.13.0esr-is.xpi 477021 BLAKE2B 2982ac46efe36f2dd5c36ba6a8edac87d37aff888dd2ac4cc4e6888254abb0e0a0e507cd67a6b317290357182ec21361495d354ff48e24b74a3b82e9e9b77701 SHA512 84ae935d055a5482036892c220fe8d952919854674b8625405aa178bd081363c96c87a2b27a522e14fb468d019e4e335bb8010ade498ff4274383637b3632911
-DIST firefox-78.13.0esr-it.xpi 449811 BLAKE2B 4130a27de327b1cb8d1545a256a46ca8642d210c2355342433c2ec94a302276bbfe000bfc676eb8bbc05547b8febd05edb5627ab9e2a8a61e917975695c3aee5 SHA512 555239c44184d6316fdf75fed7bf56a0a7dfe2d0e1a66852073f3200012ceb3860f92e36b63676c0d2450089a9c24048ee8f04e31b53e00a817f60123a4408a7
-DIST firefox-78.13.0esr-ja.xpi 578208 BLAKE2B f8d8256f6d35965b9360c3783ae263a73b918896b0294d403242bb91d19b06eadd9ebb20e01b643ca9bba781b72b16bc10d419d7f53d1cc1970e76b77e7e449b SHA512 f3fbfa55276b171acdb3e875f17b61c2a7d050b12c0416c3bc85846c037256e9d3591cdf87b20c1e25bc3337f6182d8266152f722f94a3412afb326d9c0c94bb
-DIST firefox-78.13.0esr-ka.xpi 579100 BLAKE2B 5fa3d8ffc64ef29876c63cd135252844e1f049412a2f858106655b0321344dc185df11f1a2c7fba2b707bc282784b6508235aac645a445fadda4ec9834e8df86 SHA512 b4184ed89b260503ef8cb5210a180d15c931d486c02efd9e28c0aa2cd7ddfa845ce063139e325562d372a00384d0fbf722975c6ab6377e82c3ac08dd76febf33
-DIST firefox-78.13.0esr-kab.xpi 539740 BLAKE2B 791c4d2e5c7e4126dd49f7187e2f81f958750bfc7ed53979c664d9763a8fd6e22b86716f6817726916cd8de87fbadaee34f74c97ab194f4458b0922e75a7d061 SHA512 075ed489d539dea49f7766654b8bd49f5159cd3bd182b75977e8416e651e7b87fe3f33c91ff2247a4318aab326c2ae4ee0209da57b7e83619c05df6124486256
-DIST firefox-78.13.0esr-kk.xpi 593250 BLAKE2B fc0f6063d7b39e94a4d07cd633cb7b1c7e9925c18f0dd91b0a802a230bf494522dfd459820ca77116b0e5db7a78f6b486cfdd38f2bc602b82c74adfcde911a95 SHA512 b929b0c0ba3873eac4d72090b73d35761a76c5518835e580bbbd3ec2710f3bd049368c4461dec24a6de0fa30dc1a217acdb563b64e785f93d5fb04f93fa04020
-DIST firefox-78.13.0esr-km.xpi 527364 BLAKE2B 3402e64a044aaf15a822fd2b51ba6a9beffc216ec8263a6f503bdf7f4977a4e37305b19ae8937167667a9470bb9667726bf77c76594bb3c35a0198505ec75db7 SHA512 149193ac6cc08908b9dce860aa4a2cc02d8c8ed3d2eb12ddac6f0b9f8338d778198fdc853af8a505a1fea1c202a9543dc79b58ce07ff0d7f0d9601b73b59862d
-DIST firefox-78.13.0esr-kn.xpi 506746 BLAKE2B f590d5ce7321758d8c10080ca80de1b605664fd56a844120ebe17308ab5ee134260a662e239156db445a727f02477d8a8b5bffbb125cdc629c80ef1fb3e94ae9 SHA512 fae713254c36a2741776f743e33f8bb9872e16f7b5a7d8076a157f0188916be7862582ecee1a3508e1441dce34e1a7765a2e897bd96879706421c4e598ee9296
-DIST firefox-78.13.0esr-ko.xpi 567536 BLAKE2B b9e0f99a91a22ce59fa94f35bc2b000091fb97d385a3e472189db6a68891bc8e45a7a259f937c60bfb3c9a7f3b245567d3cd9f3c357aefa074de41142405d4bc SHA512 81ce1e71d87a7136a55b853138be17e1bd5d310f81033e5ea2c695552fc72eaa4f81b3167889532b217b731804bed0efdb5b59ae5caafa50a27b778d32f17ebd
-DIST firefox-78.13.0esr-lij.xpi 475236 BLAKE2B a87fc4fb6f385fde26475e0a4ac0d7b0c1c0c566eb5f95cc4aa9d3e7bf255be99294a283fd5fe76e3c565dadc4b50e77cfc071db58fd0418b7aca52a0ea91040 SHA512 4dc2ad8c6cf9973704ac4338625a4cfc7a0bd86f1c1672622a831d6ab81781ed3c877f5809d2d69d074e5777eac7577d29fe29f54e3efe4ca57b92e1d348f45b
-DIST firefox-78.13.0esr-lt.xpi 540686 BLAKE2B 50fda225b85f7c980dc311fe49ebacfc3de0166c2719450262f3f3ee4fc499ef6ea71a6e458d96fa8633a2c25b7a7e5df9c2cf5d48bb70166eff88f14b342cc5 SHA512 bd5e2316f1cd2696a5b1a2aa3803c812babd11bce880bcde436d735f8610e701e0a31e662d9ff61732e2e110e1001ceea25c0b3f41911e2b50b1c4eea4fa820f
-DIST firefox-78.13.0esr-lv.xpi 467471 BLAKE2B 580dc5573d73da24983fb6fe3453c42aad828d180cc63db26da786b4e15e9b78c7ee4ed49bb601c0fbdcf0ace4693158d6a30bdbf4f6dead254a05e457393819 SHA512 9dd2ae04f93afaf63a0254b0b3277f14867d125984b41fa322c475fcc99b3ea8061efb8d419460bd6dee58d01dfe1f5dea8c83910b1f66850d5bc1f458767023
-DIST firefox-78.13.0esr-mk.xpi 460033 BLAKE2B af225cfb8e47eeadb443df6dd961235339d79bb7eb0ccd0b19347043894a5b0467575f5dcf5c503db456db830b65c60df25b35a512c2eaf49e5e34d334bd80da SHA512 16ecb8e2cbefdec9c9a14c9df7e017bc555ccfd3dd71cb9bcf8ea788498bcc3c4b465e89fa7e90272c8a188a6dc87fdb7d73c9e17157f2d9112bd9a3b8b84ab2
-DIST firefox-78.13.0esr-mr.xpi 541568 BLAKE2B 827b193174ee8f91121726cd67f4d5248ca2090e8bf76a0dcf9396fe2844e98486f7bb6910b5c43c34b1d24fdb6d89a635696136aabb3a6eac0a32b6a00c33c2 SHA512 844e201cc429aaba56a0daf2cb4648a8c8d85a50c374236c1c90a91c77a546847df92f269313d4907ed5738cbb4763084beb8e92748cd5fb7ae23afdaff88b72
-DIST firefox-78.13.0esr-ms.xpi 453064 BLAKE2B 4e47558d7d5f2c27b79a992bc0fca4e2f7f7736fbd5187bf90a0a31cc9d98a9d5fd5583a3153b479d5821f6884829eaef4441d6a18bcb38df5f58eadab75db1e SHA512 2108b828e90d7353c1f4282997fc2567edf9bbdb3f009578a80aa9f0f8d7db754cef9492afc63039178b5dd0462a21401a29005b914538880c4b8e84bffbb41d
-DIST firefox-78.13.0esr-my.xpi 526325 BLAKE2B 00cafe6ec345ba38731feef5e350f1174d9b41b90bab13b40925457f4e6771553ddd13a4dc06fd26a94fdc8d7934b15b065376eed8d49d41ae40de03cfd5fcd0 SHA512 2606263dbbedc8efdbd3723d6f99e9796e897c9fdd1dbe61c3825b00f0f0f1ce66c7e1c8615904cc98cb5fbd5042dcaaac8ecf3a5e77f2dd9bf646c06466c5f2
-DIST firefox-78.13.0esr-nb-NO.xpi 518522 BLAKE2B 783d790d25456aa126585c05cf5199fa02765c8a697bf2b05484eb17b3f0d402aee1346d3bbcc7e01b195dcb206b876e28d15798dfc2f137c98b8f141929ab38 SHA512 7a71a8e6dd4db1285c49443357b4583946f98bbb6e4b677a3da8ecd8b50834308751df78d4487302f5392ff87c73a826984769bfbfaedcc976447bea73ed5d59
-DIST firefox-78.13.0esr-ne-NP.xpi 483409 BLAKE2B 41f2e4fbb40432630f7c99f2593e151e0c5bf010c6c041a269b683628e3154d044791b50b2aefaeda083620c55815cb85428fc82dc6271c07a55407bc3e0f9eb SHA512 45bd2e9ed018edbe9a6e8d403bd26692fb66f52714ac452372479f0cced5f16de2a16d4691a2666a9f2e8717a58929ec09b2af285d207e10a51f4af4018ab436
-DIST firefox-78.13.0esr-nl.xpi 526215 BLAKE2B bf51749af575c21d582715041bcf20577d091cedf5d3fb16e091beaf261ca55c6734be9509d98e4bdb009f3833b8fa279d872c74bca49388f84070fc9acbfe07 SHA512 9cc5abe3c4eaed94c8a0347b053f1255f85d111a57102efeee4e438111c320a9a7db18b2a7d069329a3794f327efaaf25455b9b3244c5405318727ffa9b1e8a7
-DIST firefox-78.13.0esr-nn-NO.xpi 520165 BLAKE2B 80e87cb105b316fc580a921076d090ab3529be9f6e1eb88eca943fef7fe050d940b9e909290fec05c14f504ec9951e54fed9e4eb5b1374c03820ce94d806e6b0 SHA512 1489aa7b3938794db8938e3037f25d9f6298f7231b2180332a93abccad37081b9c07dbdf27cae71706f9485ada48961ca3d787a5d64691686b0a546ebedef9d4
-DIST firefox-78.13.0esr-oc.xpi 542153 BLAKE2B 4e8e2b747714c7f25e774063f3182269b085a7b4d4e2c870ced81ab847f9c90472007f244100263615c49e752f6ba8581e51bb74a1ee3025e58ef431bcd38b52 SHA512 ea9b63c0bdc83ba26d65f49d7f0e77ee8c11771ec9464c3b5d55cfe73a3f4b86c4b8a01560da8ac227eb5843257415c235f4e345eb8d356bb07d4b9e70ef709f
-DIST firefox-78.13.0esr-pa-IN.xpi 580355 BLAKE2B 2f77ef3a465d6d08ff0c8ab0632cc1619014d80e50e3c1d3a62e6f0fc597d09bd1c75d5325ba8bdd62aedee6a89caf42c5e7a18d8be4886f56f21148c6d447e3 SHA512 73abc1399df17aefc22397c560e9d32a8fdb7e39b353e8f2b31f8575c9fa453d6ef3268a80f4e671b477ade868e5e7147a0ab23ee6ae84fc9172aaf6857f31aa
-DIST firefox-78.13.0esr-pl.xpi 545612 BLAKE2B d5e61f21c1be1b63c3afcd124b0a1b52542c462ee75c7c972b8a4e7120080da5658d9603ec96859b26210086c9f98a25855f2b74d5ab0235b4f04d716ebc2503 SHA512 df3acefdeed5c39bf855e9229a2197cabe9280928422b44580fab3ce02fd7577142b2c00602f1bf2aecb4eea5fe8c8ad92b39e56ab7b573a01e225804d971dad
-DIST firefox-78.13.0esr-pt-BR.xpi 527580 BLAKE2B 694dbbb70ac01e77543d0ea431a78b1013c04705109f39e9cde7fe12ec2e070094a1baf4bd1aa6e96612bdb8e18ed0b08309c4586457bca251877998a66d0f1f SHA512 5ac17545748321c02fd04f01bd4e3797367c357411a4a5b332e2d49bef2e2bef5c6e75e858e34b5e164a6c6daf9bf8b85cf74703c6daaa64280fd368baafbd73
-DIST firefox-78.13.0esr-pt-PT.xpi 532051 BLAKE2B f8c209fff3c12d322c2498f74aba778ddd2a1e5cdaf60b56024b2d9e973167cf367fd39d98f5dc72d5493d195bb9eb1722b7dd75ef68c742b6be5d72f14b8aa7 SHA512 aca4c5705fc06ad6816b329f89b41fb05febfa8dddc02aefa0e976ca124f56aa115a65a828cdcec78f66d86320282b2c3ee579add44116f7c459a38cbc88d4dc
-DIST firefox-78.13.0esr-rm.xpi 526714 BLAKE2B c54d926dd3a0abbdcdd325dda8656f5cb5f633cc0b7ce06ad825599e5ca0aca0b6f14ba7bb4aee0c943388130e28335e6d23117a998c1d22482b384360aa391a SHA512 85644a756b51515755321f6a9e1d82a0035b09aaf89412b7b67b2d62bd216c271554414fc9164574d6e153f7afc6b0f7ee93a0fe6a7ae7993babdc0d84382435
-DIST firefox-78.13.0esr-ro.xpi 535579 BLAKE2B 56cbd08104acc42032eec831607cbb823b3c3595679239dd01fd8d3c0c98ebee562637616c0f2619453c1c7da2b27221a311776d5c8ed75d00ea18e39328b694 SHA512 10c5f936179e329e87a754f8fa41ea805fb3313911a1c58a84e595b941508ccab408e88fa3aa5f5f5f03f737cd886ff1e7f2c3f4990fc11401bec4b5b656da79
-DIST firefox-78.13.0esr-ru.xpi 614590 BLAKE2B 610e6db11ec6f491da83ebf4ffe70540644eb88388d7642b2857ba5e3d9cee8a4945a6476ca031c7553c6cd95ab85f520a9ed3dfae5b626a3a1ff1d6635176c0 SHA512 3cfe6058b1d14224a7791bf485c909b21f8db81fdfce655a8af76baae86aab648a31d8dd694f1b782a30a5ada876224caa89d140529b9b0259b60ef3cb1ee440
-DIST firefox-78.13.0esr-si.xpi 492534 BLAKE2B f973d5db15c9fe7d7b0d0e82c2644e289cce4089be701ffc4870ea63c6d27e8701ed8a447e3431d03b1181d1fd926bda68651d5addefbf02560fd3cf1422e55d SHA512 544f386723eff09441da17bf69f8cc151f9bbd2b443a66837b3ef148d6568650049ab4b395d558d05c4a4c0935fb71a59dfb01c3c5a8a131a2e91760e2f5c05b
-DIST firefox-78.13.0esr-sk.xpi 534241 BLAKE2B cea9f20c5722f22f64faa1f6bbd5869cb69827b4922d1e91ad7f66c0472a3ff273792314ed164ac7be4779ac6de7f3cea22738638275c621256ea1771d0530e6 SHA512 26de99bc30eb0a90babe5e667376dc8901c5374b4cfbdae0160271ac48f7ecab8a553008acb5464b60eb2657832dd6fb527e7266678e4ff16a491155e00399fd
-DIST firefox-78.13.0esr-sl.xpi 520940 BLAKE2B 66c23d901ec5bd1111a4f3e292dae496fc7b82fa510bb45a4e5df72fef567ae2ad7fec2fb91a17247bb4cfa3e0d5048f84d380fc18231c1badabf7ee570c83d9 SHA512 e90031dfa2558f440a75a3a34cdfd21457d85766765129825cf675a5559879dd61000ad78127d7f64706aa7036575ccec2b4806479bd0766a73a96ac5d529c5b
-DIST firefox-78.13.0esr-son.xpi 424574 BLAKE2B ee31f8dcaee77b335343ecbbd7cc66b7ff3c5fba94002443f0eb23379500d96412a107158d36b9fd73ab61a3849dafb19a5a4831588d1d4f71fc6e5102af4cf6 SHA512 c1bb069fb3c74badd20a59cf977bb0b0245a4380332fbd64fcb6f02b7c52d3f65e7e3969907c1b0f71d09404487d59d525b4bc34b10577972f325f7892f2d426
-DIST firefox-78.13.0esr-sq.xpi 544908 BLAKE2B e5fb256ca63b3e8161d2875df741fb5318020d710d7dd9de734afb5c894c294a33d0527db4de79d2bb796661343965d347d892af5f1681a54dc0089c7fb32ea9 SHA512 a6e5b97c6defec1bd3ed6dbb0afb59df32891008dd291d8b7759e1f61514ec413a45e1eeba0706e41f088422a0cc33e4c1f58797fb006d0872d58125f064eb03
-DIST firefox-78.13.0esr-sr.xpi 561377 BLAKE2B 8b65c4b4bb7e39e33f57c530b10bfafabb78508a3037a254a234aaa754f0ba74528531bc68449e4facc01c8ae72a8c9fbf326472f5e8da2358e5ee9ffdd7a128 SHA512 5fff90b3e5784938c8b4f1101b6fa42383b1c62611af6b60902611bd126eca842c9deb518efb2cc91b0e63f0dd862216ab2510c0b61799be5cdd2ee8eb2c5cbc
-DIST firefox-78.13.0esr-sv-SE.xpi 529694 BLAKE2B 9b33ee7b142ba01d6d40f7141549df756fdb966e708a7b6c565a4b7fc9e6713bce724fd191b1796cbcb37e94ce6677b6e6fcace75f37c3072176e22deae81c14 SHA512 5b721c1395fcb8f615888687d5d6c07fe566a0508985b7a4c3bc2318febcb47e1e9b419dfd1cf5a7ef470c98b38ca5106f0325bb56dc1f74db34e4162b3a6b26
-DIST firefox-78.13.0esr-ta.xpi 521540 BLAKE2B 2903678a17137d22249274981012af216edbc345fa8ed8df501071153de8deb8cab85294208af268b2da50f4fe3e76c9805353d5e135e34aac22d0acd053fdab SHA512 a8ce09230ad06373484f5857f26cbbce439d0251cf76f0768da8f70e5fd141f39834b254db25c2e712db4df73b62e2ee71be3eb376bad7be84916daabeba2a06
-DIST firefox-78.13.0esr-te.xpi 558394 BLAKE2B 5234b1293098bdc8c029dedb08686a78fccb50e9f5281d3d760e6a73fa4ff3be4da590b184a9b2870d8f2d6b214a628f13106ceb7bf82f7acd8ed872dbeb6c4e SHA512 248db47c72c987163fae11fbf5972bcc02c18b877228b86d1848151b5475d8dc77a70de925287c89d692fc0a33c61386fbd8e18a4a153c67e6dc8a18371d57b9
-DIST firefox-78.13.0esr-th.xpi 592241 BLAKE2B b111dffec4ee4cdf8483b668a234850f6df45aa899dc8548f312c342f82abc81853467f1881a093398c1dcf59b63869badf293318e5238f70788a77ee8721c82 SHA512 f5e037e845c6bc88887c3bba090bcfe5c6863da4a2bea21c35ea1c1c4d4d69b05d3f303a62653c1be10d326ddc50a3a0595dc99d1e50fbe39914d5bef05b8d80
-DIST firefox-78.13.0esr-tl.xpi 521106 BLAKE2B 8a2a5e268388b65b9791bcf1d3dbcc00848bfd72f69d0d60bd28a2f5d3d3edc4581a0000e66a89c78013510e5b4570c78b73bfa35dcf7c148de06dcbe50effa9 SHA512 5225d642a2647c3097868bc893cd95968cadd61a2078c836cd52adf948d4dffaa8a02b0e3fc9d43bf609be629508bb049cd6add4110bb947acac33925edd0788
-DIST firefox-78.13.0esr-tr.xpi 539868 BLAKE2B a651d7bbdad1f1838aa08434ed972141d945377fde0c3aea31a168e1802070cf646cb9c45225c2e3093801299f859ee83186a08483f8f6a0b63d681c54277cbd SHA512 633c50d8147f12a28cfa2fb997728dcbf71cdb5ad5f253817edf212bd656094bb1bc44e0e30bbafa399cd94090cf16e932304801911878026bc88d97e1fea91e
-DIST firefox-78.13.0esr-trs.xpi 501218 BLAKE2B 2ddbbdc3fe7db8c96dcff4ea3303dc7dcf56428f181de240b0f1d643e8ca59d2a9f5498b95abe6aaa8bbca3adc48eee98e7f200a529d2e5a4606981001f9b75d SHA512 d2df6fbdec088bc74529d4ba698b9bb2d89631106a0d2f797e0ca80f9d742eb21980a3f6fb9a0ebdec65af2a3434767dd7d3bad7bf04c52b4088a6c1d7e176e1
-DIST firefox-78.13.0esr-uk.xpi 608596 BLAKE2B c521861f67e0e139b0ef3eb0729a0660a024cd4d73f50235b485e8dafa37eb876949ace28770c2302e3f407679bddf38ab14f72d4e832354ad25b25e7d7e2018 SHA512 6a52be7ffeb05baa95328d8d049cc30c15cd9f466484283ec671c0c90ca90b06f68e30c78861db4c72012afb474e4d0b983b05292fc29332b089196197ab6e68
-DIST firefox-78.13.0esr-ur.xpi 557945 BLAKE2B 11940d28eda4478582e6d3b5ea32a2fe263843e428f4c4115d289a15809bba99cec30059e6d9d87f5970bc3ed8542d59d35eb1da1a7c33dbf576996904eb274c SHA512 ee5101356c137867c3a74d40dce3c985dfc22ab093aee2c3f923c07b317a964b83949b5404ec457f988b7387b6f17b011f14cb23ebfdb3501df72d243876b030
-DIST firefox-78.13.0esr-uz.xpi 477557 BLAKE2B 22131d49584ea9d8512c296b6bfe4ea46dce2df22fe1e99bae58639ceecde4941ae5bada3a3265a7de73b43f855a8b895959ec08ac193bfd990db00a536f53b6 SHA512 e43f2930becaab2dcce6a8fc93581da735884a086e78310661ad24f8d8496397c8349152f565194cd9aa7e6bc02565e81d029e304f206aa6f84f85808c8734ff
-DIST firefox-78.13.0esr-vi.xpi 562865 BLAKE2B 695282cb29634e91f5401809e1010572aa1ef26b79414764136da8af68d30df0713ca208e5106d892110559df786291411754bff327d40acecc09af9a9273b36 SHA512 68be6d3df4a69d5429cd798c5eedb3c863f8b9246162abd7a2f534843cc352b395500bf2732eb0ab687d5e712db03e58c6534fa1eea5e4014ffd990ee795f8f1
-DIST firefox-78.13.0esr-xh.xpi 427848 BLAKE2B c31909945f72dadee041eb3bcb4042ea97e5da17084a10b9af54174970d5e76b7c0606d58746a5ab4e85743dd556e6cbe4c2e718e9553cc39e134989c7261b83 SHA512 d10ca999401c99dd32bcb9c92dd6bb4652d59877153c91553aa2e9a12bcc86869ee36b05f78f7f4600dfdf511d8a04a30b7a539e6cfd0a9d45454af5bebe2ba7
-DIST firefox-78.13.0esr-zh-CN.xpi 564769 BLAKE2B 2771f27244e43c48075f9f6babbbd362ef02ae6aa4ff344affc84fc96cd69427ba2f9650ede1aa27ad8c4e240030855df06f5d5ba133cf1f42bdc22ef7e049fb SHA512 9ea0f86c5529e9d069e1066974be9c50b93325be653711159215e06dcd4b0ad76c7e4a8ba954ec3e104b424918226c2b4999c7328638d352ff389b0e24b44b65
-DIST firefox-78.13.0esr-zh-TW.xpi 564747 BLAKE2B 0aeef4fb1a7f1290f84f7f18d4f1ad63dd267a2b7f472dd7c2aac55851776c9308457ea9d6abb297c661d18b8aaff274d50ee1f8b39ec36de9a804b62bb419bc SHA512 73e873090097c1021c34e4e063b9bbc729023279b94a451307332ae70fb5f60b9cec6b515d3366550d126368f913c574200664322ca20b95279f7171595120d5
-DIST firefox-78.13.0esr.source.tar.xz 333506484 BLAKE2B 1922e2f6b2ada46e581e4eaaa388873d31c6a922e5165ba225eeaccde5c1c6d7369a57ecf8e89371a34f692dca5754a461abb7d1c9bfda9cbc4f021d39549439 SHA512 78a5dc8713ab879ebfc3b8fd7a8219844d06f0d897342fdf9a11471633d98e148ff85cf10e561899df4910b94a33b57709b64788df4621a8c0b83eb9a7102cef
-DIST firefox-78.14.0esr-ach.xpi 460292 BLAKE2B 6172004493452f0b3552b279e145fbd1e3f0b390c2a1e38d636beb2e76ca2353030e5a23cb0051cc2686b8a7dfd47bc12a62c0f9903484ce91e53afd1015b68a SHA512 1eb68df58fe3f601576150a6e0f344b68537cd8db3c69cfef30f81ebf35b48a40881da5194db62783f88e513dcce705901a0e51db1ad28fa68bbf3fa0d03702c
-DIST firefox-78.14.0esr-af.xpi 428352 BLAKE2B 4c4eedbbaffe0b787bec867f8dac28b83b9854077c86ef6091f7b344ac9afc0d1d40dde83422803a1005c81dd7a17dc8ac155b8bf22ab8d9168ad48a23065a5d SHA512 b41a340340522ff72ed78bf4990254ceca898ee13ca3292e260b88293daa0763da1e5ea5aac482c5206314cbeb04a1ae44fb498bf5619417964170ff03fc227d
-DIST firefox-78.14.0esr-an.xpi 508372 BLAKE2B 569866fdf9fc43e290bd6c873c4e0a57948fec7315977b614722bc300ef9fb7bc3733cc26cf6131c9aaf877aff5aad2c760729c932bab23d20e2e7161c51423d SHA512 49cedb618b37b478374fd735decad90976a9057d8055f82dbf6d207ef4228416be4ca5cc7371917c826271256f59c4b8bb244fa353966a323b038ce1300944c9
-DIST firefox-78.14.0esr-ar.xpi 560974 BLAKE2B afa1a2cdea62b4c906d4c4a07de110d6bc76799a4df0c68c5d1fc5d8f6232748e47ce7b567cff11dbd91db967cead05a79f28363ce892f9ab480b6bf0193b06d SHA512 131b1b2163fa0970a945f23ce3d7362958455a1f7b527ed47611f5ebe2960644fd7a4e998397b414935eb9c602e558ebbf69da9446b0ea37999b5aa16dcfcbfc
-DIST firefox-78.14.0esr-ast.xpi 456400 BLAKE2B 9109a1204d82327b267954d284535bf82632ab687490be1699887ace2dcd7b42a34ea377261322e32d53d0da4077efcef62307764f0bd1765da47e3abeea8710 SHA512 f90e699147d6a11c4f3e086a17749180aa9d07faf81987bba218463c353e767f04c01b01c35ca657ea9583ab7c775a2073e7de2de92fba9e6a0e53b444e8545a
-DIST firefox-78.14.0esr-az.xpi 497429 BLAKE2B ef59d029419076d2c4530d7646b03913044914cd530ab68b9ae4171db4d25877e92d43083ef8d15ac768fba38dc02d29fde7b7eb4de07a146f3096bb9322d4a4 SHA512 d634b3974dcd2d61bce46901dc7074ec8b6739250663cd44c9ac2b31530e15af8af4f435acfdbb46cbca1f5636a0d04fa56ef8a4feb2f7ecd6b7bf96c152c7cb
-DIST firefox-78.14.0esr-be.xpi 608653 BLAKE2B 52f62ed9905da1f89fe90e4b131c91a66c3e7c04381e3d50c236b04a72383a7b6f73f485ed6e97caf5ff07c0e2d522d8be724be904274a8f38459e9fb5f8ad62 SHA512 b9a211c6545a8dd32164bcda535f9bdacf25faa4e20740ea686eb2875a3155c7d8b1e2dfce465ecec74511334e8b403ed890c57ccf3ba659a1b9207bc9d8c5dc
-DIST firefox-78.14.0esr-bg.xpi 553989 BLAKE2B 6617311a88bac82102018be4eba224339540dfa05e763ab8f48c17cb3e6bf05f430a4b7cb73880029b07b04df5cf259d2e9b5373fa363daad31958104f600ff3 SHA512 8e663d4c1f4c3b3d4940b3b8fd6d34dc34bafd9195e8445e203f5a1a11ce85ce38f5e6544f731512b1c41ca294548f22f3e943b3cf3502a0beddfe5ef018f3d3
-DIST firefox-78.14.0esr-bn.xpi 572621 BLAKE2B b340d67e313a71d7373972ad8ba38d9ed5d129432dbe8f8e1d94ec433854009bf4e4eb6a1ebea15999b0b0a549dea35731f277fb35790f3e23fb4054d877677f SHA512 458c2b59e7fe485df04421c97b4964de076178f6413a7ab9721308b777ac912d13ce8e59dff0aa47c78eb3928487a0eda7009b10b031140b913179423e068061
-DIST firefox-78.14.0esr-br.xpi 507124 BLAKE2B 1beda598aa2a9c9405f91ef6916f1607949d73659611c721836ad2cb5d4f02b147995543cf78427c80fb37e14575b9824e84fe39f4c5e8d041c2784b6623656a SHA512 b0292679c2ab68c75dfaa70f030c4bc8016af0a4f48361825b06616121fb76b26db524adb2270b0232c7a6661d97a31c02aea7731d5395bbd933f9ee8d20b278
-DIST firefox-78.14.0esr-bs.xpi 463814 BLAKE2B 06af02ba3492000afa32ebb77cc2f633e03012343eb9c6c3469703f8241ad5e7a7c17559be1b3d9c25e1a87d568694ac72cf5ae86f892f38bf7d1beba1d3135c SHA512 e264a6b2a50c11372bb1f882b076f7643d54f6d015e39f11557d2a4edd24e58c38db6c9b3554b6a522d7397111acab46d713c32167b7836a9c696a3b56ea472f
-DIST firefox-78.14.0esr-ca-valencia.xpi 517191 BLAKE2B f7be836d7c207c5fb7c5098cadec485b18e253f8d6136c18521a907dfda1fc5cafa12d754d3036ecb10fa73339ab4d86074c7691a78dcfe86dc75606c73a32d5 SHA512 0ff6e8fc648b5ac6cab1e24c730c6cfee284e8eb9cd7ec1fd1e966b6b69f6d5146fd5bd3f401b8d110812c1efa6f7a25082a646552a85386517705d47ce1afd9
-DIST firefox-78.14.0esr-ca.xpi 514176 BLAKE2B 807464010072c897105e18997bfcba347b6d6b8675cea8d368f46f21d8114e620f524c2148ac55b66d810fa0e53e494fa2e8671cd47fc75020d5775a0950dffa SHA512 a1832778fc082f3b67bb57e753f428d0e2961dfa98c86264ab0a0d30c31f341df17310c73a003c4f30016b13180cd56853a4137ffedbdeb994c69667c7e771ba
-DIST firefox-78.14.0esr-cak.xpi 551551 BLAKE2B ba07df4c82a29bdc68dbaaf86afc0e9dd737553c155cda5aaf41649195c9b1d480b638b7babb30daa177f31188cf90bf2e56ed59c8695ca9b70b41d3b2566e47 SHA512 a54203624b37d0bc0c25eadc0bbea5a83808f964dbb98d3ace33a1bdeef36061c55a613718767055cc9bba56fe9ab26c1726c221434628b028ebdf2319bf4857
-DIST firefox-78.14.0esr-cs.xpi 540325 BLAKE2B 2cdd1cd91a71a60021ba412ca4dd66f2e2627ee4041f9e4184565146707f8780980af6cfff2a8aaa5ede9fe214d24f0fcef4b5182ae2e897779cb55397c5f96e SHA512 1927bdfb335c49ec181dadf133d8a8fd3ae0d61b6c4d05f94db3f321f7f7be256c9ececc728bf39b27e48bdefc4d965c4009cb752b771bd899f939966a489508
-DIST firefox-78.14.0esr-cy.xpi 530698 BLAKE2B 16eae5cbe546606f93ade7a69d24bde8d7d7d83c6865f8adc514fa1a38fa7b887ebe62524fbe47d735c324ab230f8778169c0a8dbf521e1d952afbddd840d52d SHA512 0306993221059abb0c4540bfd6157d9ffc4155881f66d7752be423a1798b9c07fa96a266be8ff52b8e54be95bc1591ba7dbd8b9a19948bd31b5ca3a0869286e8
-DIST firefox-78.14.0esr-da.xpi 520275 BLAKE2B c124d90d73050bb9eececb9e9e4f977e214bccab465548f5eae993be10603d0c6cee1b756349665afd5c27e7d47c18d8c0fbf9190a72ab314701f81ceab13513 SHA512 3db6396f32ce2851cc66179cc8aa1e897a07882bba0002cb3003f5e75feecbae30c443ad6f450b94cbc55824fe61d1e7ffa2fb1f7cbaed05611302cc724c8fe6
-DIST firefox-78.14.0esr-de.xpi 542872 BLAKE2B 112688e2f41bd6eba735fa13a2235e482d5243180bb5d664c7b7c3eccc46f0107d22fc0ce41a432eef538a783b148718d6d5373432c8b7e0c33cf66943fc1115 SHA512 b78b315cfcc1015edc7a09438b2c828aaa6e2e6ccfe11f701de14dd6544983b6e7dc2253662cf318da9f404a22937168dbbe4f8095d27857808378785a45197e
-DIST firefox-78.14.0esr-dsb.xpi 554277 BLAKE2B 29875c9c0a0b992e6b6c26ec714c0b428ee69cfb18839a5c3bd5abf55667487b07d49e4670ac0b64aa77c1d96e97aad1d54b6f0d5ea2871a76def8c8f1d0ae34 SHA512 d7115d986d50bec430a7b79a58de9a6fe456c306c4f77f4a1bc8a2ef0447a474840b800d05b5403cc5a0bdf302e2020d59aeb38b39cc98b7ab34b9058ff02103
-DIST firefox-78.14.0esr-el.xpi 626561 BLAKE2B 3c1becc741a1b9a2610cb9de73e61d4e5632dc18b3e54b58f9de45672313779ef797eedeccf287553ffec7f0134057e62afda9c852076f5bec1cd3d0edee9efd SHA512 bbc74cb32194f0ab25f4ff3e72e3a367592354370683a27bba06a40cf461a6d53a9e8b9a20fa513997be1cf941e77592f3a92afc17ccfaef23e631847f760af6
-DIST firefox-78.14.0esr-en-CA.xpi 497735 BLAKE2B c95e41bf3300f9cc8ad3fe1ea8575cf256202a77805baebb2f3e75a1acd6bf2ccd52c3a1bf0dbc4f8fc56527fc6ba729092b8601eb25281b1237fd027bba4098 SHA512 0573a076e30381e8da7dfc07642771e47f6f8187c13a3e489acd049ee8e2000182a5181871126502893a3a2673c740fc12112ba1fd0b4104874ed19a75a169d6
-DIST firefox-78.14.0esr-en-GB.xpi 497574 BLAKE2B 8b883f6fbf8ee861781da81b0183e34d353746fd0dfdfe95429a0d6c9497b55f0ac78b151ad9fa8c2bdb4c64a95582bd35c0d93a1b9c29dc40fe3ba9d421ea68 SHA512 8f987f7a8fd525a166c174ab84fa962981d85cccc63fa35e73e14c9c29580d4a94162be5de5c03eb0e83ed54614467dd5b59078211b5aa63b594ab4eb23f180c
-DIST firefox-78.14.0esr-eo.xpi 525722 BLAKE2B b2b20498379353a4e973b54566c32236ae123ba2190f9c804492d8d6d894d1df6609a60dedc051b48ab40ba06e34e37968d135e17f27bdf5442ab99130fdae81 SHA512 3ff3bc973d3d510e4dad39f689eefc36034c5b8816e7b0f8ce9a7df3d2dad53b56e889314580a602bd3cb5a49b3d1e1a5d73a1c4d229aec4342c694d966dae43
-DIST firefox-78.14.0esr-es-AR.xpi 535804 BLAKE2B 55380decd6a15b6a2496c5f7a4a98264235166a9a7bb8df2f7ff68b5315b0374b869f29c0accd7efb69c2f38820e052892b1e482a232c87669576558695e1e57 SHA512 d286dc978479142caf7bc913bfba78af3db39aa754f73f35ea56f26622fb3cfa077a5f5f15afdabea0adc3ed70b66549574c5bcfe9f96fba909c435ff05ce049
-DIST firefox-78.14.0esr-es-CL.xpi 535354 BLAKE2B 79efc11b2faab019d8e4329ac8d98143cdb57e1bb35f33b6bdf8f53c9e19f8b565c2a46fa6ec681625b95c31f167f8ded74f5cca6cd0530a5c46df8277201527 SHA512 2ec0ffdcf645c14d240bf2b108fdcb5d74f3f6772ab68edf57bd49ad038f598b0cdcadcf734d7174466a54bca5b7e914b621628dfc19694ddcee6e33d04bbc0e
-DIST firefox-78.14.0esr-es-ES.xpi 522708 BLAKE2B 8aa900dc6ee81b3e248d8c1b45ad5765b30831ff57e5068e69c864cbfe74d02984ac3a17f6e67a902a5e5ae78011b4da9970f2a4021d5ca5cb7803131ca78abc SHA512 93c57ffaf86a41dda795a65ad01c9ec6399da07c96ffe83af53d8f08aa5e0f2b7a8f02749a762b4880bb0046030965c15bebab04eac07d0416d5baaffd95eac6
-DIST firefox-78.14.0esr-es-MX.xpi 532309 BLAKE2B c59d8f6d0c7d8b0562df60abc4761a4e808006389b4ed3cf9a3ed35e87b99244fa6d9b4ea190b751a3aa7f73124b9ace8d8cb23de548306d65258d75f9809f17 SHA512 2b6760d5c883b962bbbbfddedd7eff3334af42ce675c02caed3689efd5c4cdd1afa72a6c1e1bc92233e1c84192735bf9e3203432ffdd859210be3a70cc60fa88
-DIST firefox-78.14.0esr-et.xpi 485250 BLAKE2B 671ac432ff76c63e4ba720aec6a993fdb0237dc3f8b41ad531d6187474eaea0d9464eb2da41fe17ef99362e2569dc6ae0b4250c79582065f32d3bec33f2a4af6 SHA512 2a823709169cf7a32e751926633aefaf7971111b0b707c76278109ba854941d3bd3f16d12302a66c3a7264922f9cc8d353589a1d4aa104d3afb15485848c49f0
-DIST firefox-78.14.0esr-eu.xpi 505879 BLAKE2B a8b5818c395f29f573743ff412c329da4ce71d14ed9ff16bddfedbba25df6956d2e456710bbcbbd6b6fc14b660df31173af2e855d82b84a16765458d17ef29ec SHA512 cffeb8bbbdaf1cfbb167117eb8449d79446ab0cbf643b54e77eb4ab479761df74fb365af88444121b1180433b63b61e8cc87f7d3af3331dca06c31cc58b6aab1
-DIST firefox-78.14.0esr-fa.xpi 538923 BLAKE2B 315963b5c2496d5733c5b3a4dd0901df505e7350b29b24a3d8600434fbf6df6dbca453474ce625679e2ab1286718a127147ea3dc2af847c09fcf5c8b0b689e29 SHA512 edf3a1ab884bf117e7933c91070b319226b22e5cae9df8e10734ae4a74e7dafc2f32f594f4b33452a0d85ad8de14af4e814caf63c51eeb3db3d67cf9c0e258df
-DIST firefox-78.14.0esr-ff.xpi 481617 BLAKE2B 77e63295b40a46a70bddf25c5aba37c5c8cfe07abc461eac6234a85c783fec20db2c236abb21ef70847a004ba486f2ce48f75b3f81a5e1d631c64714f509878f SHA512 38ca80b0f2b3486d8dcc1e15c994d5e8221bb248922f81a48faea5b04355c86917282cdc1b623529d0557dbbebda2d1c9a4eb57f60152c43110615d9ba7fedfc
-DIST firefox-78.14.0esr-fi.xpi 517930 BLAKE2B cce4811746d7c6866d42c63677e37017f0696707481bd55d36bbe313105601d6a55a4a04bd16a17abba7c7a72eb4379ef67d04922958d2824e773a430cb71e21 SHA512 6bee3f658b8ad7a287c0594290a1e3181c793d59e89cf7491a2927be2a3dd0334d551bcf26fded5cc9022d0908ea292633db000412130ab275c27441283b64c8
-DIST firefox-78.14.0esr-fr.xpi 545893 BLAKE2B 2ac2f8fd03da7db50dc6a77e2e7ee68030e3dcc4d2bb3992528df9f8676dc8a601e06e830775b6ae0167679a7f579d6f01544ab01c1d52939fe9f1620eb7221c SHA512 ddfdc7353cefb19383c191bf6e2f8590d38dcc80fda93fd34a7d4537634d1f672fae7dbff6dc9f1cfddb665c389d474508104b9417f7f3454702b0f08243f5a9
-DIST firefox-78.14.0esr-fy-NL.xpi 532481 BLAKE2B efdb7475883a211852bd2ba45288a7e89a4dba469c3f27ecc5192ce98d41b239badd142e4af71008741a1e6fdc97d052af70cc521e8e851c41f72886371bf314 SHA512 c5ea8e6745705cceca75accae16b7902a103d3e8636432e1642092951247e757db8904d2f6ed012fe7814a5f6808db4067016a32127ba3a9b920e11e753b51ba
-DIST firefox-78.14.0esr-ga-IE.xpi 466904 BLAKE2B 035f7ff09072dc43b2b1283cb4fd828f33f2f0bf7eede6e9ab4c09bf0503c889654858c184a94884f2dd45a485a708bcda34393e613d034160062b6cd17426dc SHA512 6d4f5bd6dcaa4bf43ceffce578cc6fc670f180aeb12f10459137665a757fcd97620c732fd96c2202053816292984696efe0e24f0d9c3c5033326c5e881f42fb1
-DIST firefox-78.14.0esr-gd.xpi 491896 BLAKE2B e46c92db5a33e36957b37cfe5326e3696070b453b81770d50ef5ee7bd545749338d74b502a986ce3e9afc84e3aae080e0cf697c4551086f4ba4bbd9fd2aa1a46 SHA512 8add92a07bc6d9246f1a6fc960028a0b7911ce4a7b9418327aaa4b53cd1c0f2139f42a83884998516e06a2a87d6e2e67ff6cf9d12189db9e84020068d8dbfcc7
-DIST firefox-78.14.0esr-gl.xpi 528418 BLAKE2B 5bd680f46f212e402ba2a881a1124bbda4cc79edc86940734d4732296d1a04f67a8a08c725db2ace8198bf68e7c55362645636b81070b2633bcee8397f0d362b SHA512 b1ac9231006a237849538783d1a0133534bdbbcfcf706cea28a0489d5ac6dbe294ce0ad7412e3fe9bffa26ad431e355b5aa0b491e60ed8392758f9bccc5b8ac5
-DIST firefox-78.14.0esr-gn.xpi 546468 BLAKE2B ecb00a5c32bac405e26c4d8b1ad6514988df3d68738d407ac662ae6341d014e8ebd3d56271d89c4aad2c8c2a44880d0e2d091c808c6644b252509cabf4c15999 SHA512 02798e554422228e73fecdd4782d9cf019b28a76193035c33cfb151272ab6ece72a98c57f9060d11cd9faf7f352a97e36c91b2a1c6aa6ca6b8328d880e0750dc
-DIST firefox-78.14.0esr-gu-IN.xpi 541434 BLAKE2B ded993c377f45b54c1cf835fa21730c27be49ed039758cea004c418668bcf3591a79775a7bdf4aa598a8e96d7b1a95f551e186f79e8d0b4ac0350e276e59213e SHA512 e2f1888108b08666a7a819ae89916e14cc641b9a867fb14821ba4a79515197fd3aa2b5eb800f57fb3d63eec49deef645a7d40cdc5789b860ce5e3133833d4aef
-DIST firefox-78.14.0esr-he.xpi 545580 BLAKE2B b9b4b3da5a0ad55e9ee6a9577095085cf076c4b5c07a30c234c058ed5057681ce216692add63e10441dc409b098f3a6693810db17e30c558587b794279fe08c0 SHA512 fdeefe908cdc49090e8925de92b8cd96c171a6f280f244446a45d7cc9d9bb394dfda34da95a91c29b6c9a0371accc5d790b4e6f34d9b43191ccfff0346af252f
-DIST firefox-78.14.0esr-hi-IN.xpi 567859 BLAKE2B 5dc5e18013a8a476792fbd1eb4ba6b27170a0c635b6bb4844b24567eb233e7bb972a894f4aeb04781571418ec7b24f7fb32624a473088a07db4a28f9874f3f74 SHA512 0a761b30838635cdd85b2673301019754a2ae5eadfd509e2df646a82402bba9a24b8bdf775c8da26683d6eba80d6379f594951abb19f73c3c2c5f029f4c30311
-DIST firefox-78.14.0esr-hr.xpi 522695 BLAKE2B 290b8c8630d108b126f5c03a2c83daf6a285422b3c3f41ed02e28d8f759498f5e40edcee5fe5cc177e2cc49a2404955ad83350616f4a85f1e3e90a32c887cf24 SHA512 d8e7748d17925b8031e3a2bcf11be017fcf3ab6970cd4e885667035ec7077eac41404b2ce76bbf2ca86578006733faae5dd142ea9ab60809d4b81b8089633d0a
-DIST firefox-78.14.0esr-hsb.xpi 550661 BLAKE2B 1e2a85f9c11b8461dbc278080730269bb07113350204adce75f01afb4bc1488d57ffadd10b81d3590e23bbc792c284c874417ac2f1a8d44ba6456c8d76bc0dad SHA512 78a007061b50f387dd2cf2e7ff2c5680aa363ae84cd8bec287affbe8d03f9da43e4a5f76b60bf09c76b278ab5ed8dd916f0a51f8dff23e4cc54d32f0ee1bc014
-DIST firefox-78.14.0esr-hu.xpi 554883 BLAKE2B 403ad326a1873ed30684910a76dcf4f4340e1bb86630bf42c706357c49b1795031ec6b6e4a6e04ea0a9933eeed93fb6bdb25e6059a819d82cf9ee7b926e3e32d SHA512 fee59bce668bce8fac15ab9099d0b2c433538128cf5e51d744e07dab427096a8bbcb01877b884a14b9eb552fb56bd05bc68e29c1532632bd7f5d3a85ad777663
-DIST firefox-78.14.0esr-hy-AM.xpi 588991 BLAKE2B 60b632765d084a822508e1291fc350ebdcf1fd2b468716cc843cc09b6c2895e79f062980dd8eb4309a6457257643c2297526e8caa9999c011bb239ca207890e3 SHA512 c33a58a6403273f9c10525c024eb0d7e0b931ffaaf1d36e0a6c3cb8193b42aa716d90aead251e74511374f488303dabfc9e65fa6e208b3d6c6bd25b221cf5f0c
-DIST firefox-78.14.0esr-ia.xpi 518822 BLAKE2B f33e514f9d4d8a3d08f51c24f2857e7b6c150582b581a1138083b52baf9429654cf2befe760a5cf0687fa91a7ec702be5d259aef824d6c99cf43d40bc79558ac SHA512 17844ad44221e6a1dcdaa6f1280de24d0f363fa2a5256b61161a5bccad8d5d1d121176d90edb23dc37a4b58a4e77c1ca8a3eda3cf7c11a176cb7b5f58be34251
-DIST firefox-78.14.0esr-id.xpi 509569 BLAKE2B 116f25148448991b25647064a79df2fd2bc5b77e41c9589267cb628991a053efe0e45b913d37113877cfb0b30fa2c27b37140c2f26f3611580bd82049c4efd74 SHA512 f46cb098cce38e6d55c90486c9de293b424c1d1cb0b4445e0a9b1417107e5fe98d0e582d2b814b2690bb58eb0a55f823b79d4171eebe36f15ea0cc8a706d0673
-DIST firefox-78.14.0esr-is.xpi 477032 BLAKE2B c55323d8ff25a3f63a6a723980108e5daaa5f4a52d2bd7f2da3cca7cf4efcb65eb910114d53a96d3a035a5b1969d514dc427a02aa3ec5cb1b2c63ace77f026de SHA512 12b1b4000643f17574c01b70ecd016a25c81ffb792e000f56a9b656de8af9eda0874fd8285eb503f2eae14a13230e79d4a75f258ef9f0448b51f1bbcb984ee59
-DIST firefox-78.14.0esr-it.xpi 449817 BLAKE2B f45a2c611e673949dc9af995cc8816d408087f71b561682ccf802eb57495a9f6d607fd7966a041037e245514a3015da82da8a1e713d127ba4dfb4bc7829747c8 SHA512 a5dd1f2ad7e020852e07ba776bedb789cbeb301049c52a8a7178418f7b3ac9c59458d684d86e482786006d3d1d7576ce6f872f56cee3e39ec8c71a82ce137280
-DIST firefox-78.14.0esr-ja.xpi 578183 BLAKE2B fd4065c26887fa73a925136cc25a951dab8cac1647f82dd3f89a79e7e32d44952bf7b7598f2eb56f77a31d08f904e39866abf688e06fdaad25cab4d3e3e60e44 SHA512 27ae4cd28328d3a23b1414a7ef8be6366baa838d3f1a20e9ed6a8c8704186eefaba8e68c3e5f22edfa0d76c902b4985dbd8634d7a48fa0ccbdee0c1b98413d29
-DIST firefox-78.14.0esr-ka.xpi 579087 BLAKE2B 3492928dd07f22dbfbb6bb78bc8c3e02ada8f86a32418115634281bf643ffce0cdfed7aa888fcd98f6957913fd824a6dca8777202fce57d3bba9be794b6f0688 SHA512 17f9965e376adbed4067d00eb2617f6515140b4cd1a24cfb233642cdc73d8bffa38f14bc3649627cf5ea7896f6ac0efdfccbdd4a723f554c470e391d3323da22
-DIST firefox-78.14.0esr-kab.xpi 539729 BLAKE2B f6af275768f9756e65d7bce90d05389cb96376df2567bc151301715e87a543bea32b9d974d69232b2747960838379ba5e99a328a079e570d67fce276a741e267 SHA512 3b92398b6f1a7ea37057a0546fdf277dae1e932e0c6774e65666c63ded4e02ba0708edbb7eadf7db147dd3c06f00b9cf08a8e97d1c4bfa7af2dd0b633c897166
-DIST firefox-78.14.0esr-kk.xpi 593247 BLAKE2B d9e8f4678c8995aaa8e4d9877e39100396b0a6832236ffb91924771c8f766cb40985959b157addd69c961beae9f746643cf621bd79512a6f235f133e40fd7d6b SHA512 ecc0155641d3f48b6703797d1f2901f3928eda04150683e2ec8e15081685aeff70d095d682a6191571b3e9d3d40a6c29e40b7ee2786f21274153d90dbac23597
-DIST firefox-78.14.0esr-km.xpi 527376 BLAKE2B 1b10ab4e022020728cc5c34b13bbc6b4308bb15a3dc1f1cae2e142a3b0090fbc267bbc80411d85caa3e3753fa579f92d394d2e824e6b7e628e14242830871f86 SHA512 5ccb8ebfd62089ac5f152e9ccab72365a2914239480ca4ddeb0b86feb4cd558bf965db3471ce9e1597d7b985a3db8a1d5b0a48358baf1ca141e7a523aded71bd
-DIST firefox-78.14.0esr-kn.xpi 506750 BLAKE2B be7be89726ed89ed9fe2a335223c0249b4f1fcc8a0eed1d4c28cc9c9c6726a326aabe0a498dfbebf1fb557a525d21511666f511b3c594308c109cbd65faa3707 SHA512 917d339b78fed82f72bdb3b7e62c20cbaa9dd9954496827da37cbecef5e4b120eb56bdfaf623e0a0ce38e7516720e14900bd283b2475e7a91f21ea29a24329b8
-DIST firefox-78.14.0esr-ko.xpi 567535 BLAKE2B 9649e6f7208e075043b9ca268ebe33edb516e2680c7b47cf3ab3e811efe6639441b57f05a28791bda777d63ec94826976897850cca4a09bb504db4bea0835da6 SHA512 d103971c578bd847b951c91d50665a8bee58f1d29aa62ad163a692c45612c348a183b0e5285378bc7cc86273231f0a4c2f1eb8be077b4d52659008470a3c5516
-DIST firefox-78.14.0esr-lij.xpi 475234 BLAKE2B 2891005a0e72cdbd7c233149e3b95f2c0038e88df1a42b467c53549ee755a2feaec1a89966b6132bc3f164fe47f3e0d8bbf5a1887bcf24a702032055c285fdf6 SHA512 8e7582f8e34bbeb13c9d3b22758c3abfc7bfb84afd57dce1f3300b68aedab221a06ee5b0f71d7a7dcb8534365ede3e9b91b3b90ea1af37034f4f73ade03679e2
-DIST firefox-78.14.0esr-lt.xpi 540701 BLAKE2B 0569be25a3aefab4ae1f78891024e0d2e74aacd11337f9ea3bf7c6ff8dfbd52cb614c88bae83f19356804c2f03326d63adc1cac1dac5ce15d1d16176bfffb133 SHA512 de0d9879cc0812898fbf1879fe6860a86d548cf9c1a0110d58db9c78d1c0db84db6a93a140f34ab9314d6c17f4f932afa8f98701c2b16ecf6d6d950bef90227f
-DIST firefox-78.14.0esr-lv.xpi 467472 BLAKE2B 5af8c5289c0f70d6123ab7d1196bc6d44c0e16dde66d1dcbd91c0ffcb47fb3587cc3889c9e5f6a76819ee72928d18bb23974634dea21c4f59d7b1aa3498f3643 SHA512 e4afe1d166116e4eb8c5b497a9b3844b44e6ec2586c5b24c1192de016b5c963eed15b77e8169c0d2626a6670b15b6e3247dab349e8f47d26baf75caaa4ad0b7b
-DIST firefox-78.14.0esr-mk.xpi 460031 BLAKE2B e0003607237757be71a147d256ca003f8e4dc3b3018ccf946acdcf57f0a262b533643d2404ef1c0ae1d09a8f31b73e84b77eab81ef5f30d32c338d3b4b0683f8 SHA512 7f57fff0f75eec887b1329bdb52d4eb523c117b9b841b7c40f42d3d106900e046d697d4fc70957f61777b6c940a3d3e2560f54e865c0b19ea4e81d8a50055145
-DIST firefox-78.14.0esr-mr.xpi 541568 BLAKE2B 5b61ee2a6ff3cb70418cad699fb702afd718999a98fbd9186f8226df21a95fba49eed999d31229af9dbf7d8fa81ebb52c885d8ecd0b4882c9974d9a4fa1c0265 SHA512 9bf2465a5b25500fed276056a83d924aaa821c4cc6d506e2b8fd14a9fee1a8637a2d85a4da95a71863a3d5f5a2b399a024eb6d0e213ffb31da1581044bcaa1e3
-DIST firefox-78.14.0esr-ms.xpi 453055 BLAKE2B db16cf845512665f448a7541a408752d8984806e6a48d79860674eddf51ad301e3299f7c3e001ebb0f0ab9d27b6630da4c0eed9fa0560aabc6ecf89b5dce7cdc SHA512 0851fb2c84f595f5af61edc5fd05ad87213ce34351b8635bb73969b5019bd01f9faf786172f8d27584c9055c01cb1718bb6cefad626c046621f673bc662a8763
-DIST firefox-78.14.0esr-my.xpi 526330 BLAKE2B c4dc0addf76dbfc8357e9620916a1c70e16ffc67b0e5f47825a5377aaa1c1df4cd602a3a0c7521a7edfde961079a08c9ed302515c06721cc7dd64969f5619f0f SHA512 575d51d92126448910f809b467ee588e608524312c872667281810591dee4616ad3ca58102aee667dc937069b64479efab21ad7381a0a2bb1b9a6a46a6b16014
-DIST firefox-78.14.0esr-nb-NO.xpi 518521 BLAKE2B 6a37694dd9015b303aa955f64eb76a00a5e5a041224251f9e468438ef6be9676dff88dfd4fff767bd4907c9a92cfe453f8ba716983c6be957b668062fa9a6c55 SHA512 0ee6ff5f074345187b2b19c88da1628fc696cfea1dbac2e7e3e8e28cfe0cdb3f48b5674c07fa2aa1e661e09ed9798265f0b37f25ac1ae61afb565e6d12f5cd36
-DIST firefox-78.14.0esr-ne-NP.xpi 483408 BLAKE2B 166568a283b52103d9548b6d0dc149b8c90dce4a83302bb33dc2848ee46f90fc8921203c05ea3c6779366f81b96e4f1c4b2398c82ddcd22fd2728b4fb0e01908 SHA512 4bf89380f196b7f17857d1df0696f4484df398a3122f5ec55ac314167489ad63e60884cd2b749eb0ca6f7ee7fad21bae4f151bfaf4fb1df7aa671fcf73d74e24
-DIST firefox-78.14.0esr-nl.xpi 526207 BLAKE2B b3f620de2fe0706b20e5c9150be2ef2007984fdb5d1b0e9fa4b97f04cf17fcf07341a0395718412ee2b4e7b2e1f6a07154ab0b22f418f4bab80ff06629fd8e4f SHA512 c9705e47fbc634928437b9133a6b23224bbb022ef24d43ac8ab6ede44ea4ae2ca9774a5de34da679c094b43e8916093d74ed90bd39bdf58120727eb253c811d6
-DIST firefox-78.14.0esr-nn-NO.xpi 520156 BLAKE2B 06246ec50fb6b1d83c529c71e480c1bd52755e6a22cbd5e54cf42d2b27d29639123586696ea539502df1e2b1a5b8e22c4993d6810d7ed8f631c40e741df4e094 SHA512 e08bb070ec79334cfdb3a209bb6362d4fc0b3fccffc0c038284ebc339b0af4b83005c98590f0b5f83520060d1ab99295e6f0964e91a45410fed4fb693bcef4dd
-DIST firefox-78.14.0esr-oc.xpi 542152 BLAKE2B 3eec31151584826ff93f486929529b316a53406749865ca888f8520491d984266aa5d2465475c63e9f416d98b9bbd10c7d55cb025caf1c94d56a1a8afd4c0b47 SHA512 244be100f4fa5b598ecea295b3010c2001f1fe71624503a27adec6a12e08bf11031382b3181481405295665f36dfb8da6eef135fad6953dd7d3de4e8a374a41e
-DIST firefox-78.14.0esr-pa-IN.xpi 580362 BLAKE2B b9b649e223080248903c114739b1231220cb29845fcf0890a2a9d98188051ae0e37b671a6b9f38cd38b282d1a06ed58ce0d068d4ee7e21527221bd28157ab619 SHA512 666ab88cc906db6874dd59f2da77af7d589068e88e3981bfed4ab445389c1a7cf7cf8b7cbe70038889a620404df2127497be20b0a8717e8394393c390b3dc093
-DIST firefox-78.14.0esr-pl.xpi 545606 BLAKE2B 7bc6a8cf6677391f824c194529fcbe3febb20cb62cdb56b9dffc0305d364ef52c7c17c09a0697308a8bae867da46e41c162d2d077c54bd4186a0b406c93e491d SHA512 bc11eec9565bedff24ed749d5b40b53b9269d950b7623918f61c7870f6311e9fbe3ace65679d85fd62de41a73a425ab3fef1d152b5997ba87c722b20e8903652
-DIST firefox-78.14.0esr-pt-BR.xpi 527582 BLAKE2B b1c2973fe1458098ab34a5b92803462933f7e3a6b0203022fba81f3fd84fd9c112a0ef455e06c5cd3cca85571ad69ad0302e229d1dd476f838ac5b1ad4e06305 SHA512 5f454030c18045690da22971f4a90ab8b5bb6dac70db16b50599a9d083aaf4137b2f4a182ed9d3e585781d105ad51504ca16bc5dfe636469183a7afbeca3a47d
-DIST firefox-78.14.0esr-pt-PT.xpi 532032 BLAKE2B 5390d69ab9f234b1570d1b70b3c55abcbf51c6fea1f0e1053477c545c658a777077cf0f267200882cc88bb2805cc2a660efbd2f108e0852ca84726ec27dcface SHA512 3cff6d3fe5ccbdf199aeeff632cd64a5b59be608881c18f596a59a210ff4d3fe3e913ebf6110b5be6d7d5a627b265433384839ba4fdb182d616f978fc55c944e
-DIST firefox-78.14.0esr-rm.xpi 526711 BLAKE2B 08b913c641e2da7adf62da5f175a9f42146e071bfe2be82b139fe9b62c6312c779c2000b11cc07c83407aa77b8a8cdd5d3dd9346b133aa1b98e30877b98b236a SHA512 2fd6ff84e90a8e02c3b0e973cc0c7e46cc36d81357d106008df090687649f9ef7895b1f53e4a155299f99784a40e2ac34f70b8e76c8763a034c216319c0a4e83
-DIST firefox-78.14.0esr-ro.xpi 535575 BLAKE2B 7a2c060ee0fb718aa84b0568da6457f3e16e8f962061c2f1ffbf156827d0edc744ee48a25130d26be528eb959a784dd7ea4cf07ce38352206170084d6ae0e0d5 SHA512 da47132eb11729b0342306d9c7d6d42799b4c0911814a2c058874fad3de079bf34a3695a6afa595bc5b877bbf847a160921fef678d009ace2ead7b9718a701ea
-DIST firefox-78.14.0esr-ru.xpi 614598 BLAKE2B 078acf040420a0d03ad9adc9119264160e3f0694b8705fbb8b913338fc93cda51bc9e64f994f6569371d9b3d225600e10642bc36a71121c51b6dfbec4b93f49b SHA512 a122f4294c94eb76376436a08d591c8a8948f3e686b06c043c0a4a3832f56e69823dec19bc610f04231c208a08153bdb2b74b2185b62d533d79b0c8732d76233
-DIST firefox-78.14.0esr-si.xpi 492522 BLAKE2B adb49fc8ac4143ecc43c5bde14f324139041d34a0fa0b2f5bd65edcc4edc520d0f452713423f8d3694995f1769811b7e35eb265dadb66f366f4f624146e61c23 SHA512 9951afbd84ab0b543278eac671994eebf7d14c59cc5c99f4fc69bb9ccdd33cd37f7660db78c43df81c0fc18c4807ca75b0dd90adb0d97452ae1715910c3a2790
-DIST firefox-78.14.0esr-sk.xpi 534241 BLAKE2B ab2114580fdb7541e5b35f2a056ed0abafd5e1d34832d35e1bb36ef1f03552196672cb79422337163c8a553bc4f030a1e78257d5c41bc5ced294735217e67ec6 SHA512 ba6d3c9b821dff62d085ffd77359936fdd6005f4fb44b3a8c123c0e094e20cbe940de8c6d5c98b0c377b35686f96f011e24a33ab83041cd897e1d345da297dcf
-DIST firefox-78.14.0esr-sl.xpi 520936 BLAKE2B ff1082a5a0eddbfb4c3d05ae6489de9ab12fd32ffdb79437bfc485720ba46e6ad425da81a49ece9242c59f908eaf761fa403bc37049f6ea8b12f7a758118ebc7 SHA512 39db06bab8cc70be2d10cf713be7e3cceb5c32e60010dbe315fbd607c4bab74a97bcff19059467a4eb2e75c568c3912c0889b193316266994573bf9a603f08ea
-DIST firefox-78.14.0esr-son.xpi 424580 BLAKE2B e00166ff54cb94674ceb0919617fa7855fefb57a6c6360bb028f4db78197267c3b565ac27d202a3dca5f741b0263bb6d3fea0670712c796e0da8916027765d34 SHA512 ca7becddb358c672c75b43781ba66d63da1abcdeb9756b4545891c9a24d7b1e9f7f36ff6ea653960dff8ca40d705512f372260554ab5260080e1048122697da4
-DIST firefox-78.14.0esr-sq.xpi 544909 BLAKE2B b926f14347a7a3015ee2214720ce5828c9f530d8de5941d8b97e7f54e15fc2fd1422cd7063c5eb7a3dd8dd5bb435dfd592c5f0b19e25dbf04b20c2b06a345d16 SHA512 fda3a5cf64b791ff6e4f3da3ac91ca82552bef84dfb25b300b96b08996ef8b14b7fa544a0ee54d2306201af1354605cc260b527ee1967c029c24043d27d8f2f7
-DIST firefox-78.14.0esr-sr.xpi 561396 BLAKE2B d88ecc03210a6b13ab591186a0e052a13234ccb0d6ce17482b92c44510df55690a0fcfd7398469e3951b6250d5fabf2de885cb642998d0f9cd2d747da5bbcea2 SHA512 3feb63179860f10dc7303740ad1c7c2164ab8d67578dce8166e64bd7e281a5391b6be86fe85d1e89f54b807661cf3bf4e3a745b41db3e21921af855059461185
-DIST firefox-78.14.0esr-sv-SE.xpi 529697 BLAKE2B 941286baa2839461097760cb0ec08360d5f946baec4385d6909c1bbb91462b0cb1e3ce13b6fe853e5f78a8f924eb5cff92164442497d532aa2bfef5a3dae0924 SHA512 7602297e7ed5934da0dc92d334c6a8989ff1db40ce9a4347efaaa1842d92f71ee17026219d122685f5387a41c9a4796b302c8ee4c16da9980bbbb5bc90c2e12c
-DIST firefox-78.14.0esr-ta.xpi 521529 BLAKE2B a797a83786c85c8416ba89b088ca2abfbd5aa102f132bc79889da96a9fad4f785b98ccd9a002a82693c9feac863bc9391ba701b3c1039984b485d7079866b615 SHA512 728b43a062d2561880a4b45c1ebaac1e01d8f26661ae2b26d2a4b88f3d50ec57bb611c8fb227df5bcac4a20c7fcd5c0fc6dd5a2d59dae53fe50f46b4fd6161f2
-DIST firefox-78.14.0esr-te.xpi 558415 BLAKE2B dc65317915ab52d53171f06a9818e6abc7810768e2576b01febf4b02a8e0941235c3ab43654b103d201b4b039a96dac371219597c00db5c2e4e1e6ba293f5d60 SHA512 fccb2562d445c63745fca297b24df36d9ac6d808c9b794d26396255ba98cf6b05671130d84645603eedf329c7d86c4194b2ef12fcc668f6d89f258474684943e
-DIST firefox-78.14.0esr-th.xpi 592253 BLAKE2B 13bb9950fd43648d922e841b27001c7a4599946b3f22716284261177aafbf2ba5ddf7bd22d228c55542f4901de7ea1383d3ce5ee66aa1c5701aadf232456ae9c SHA512 6c482a34cdcb8a2880c0c744c7fb2bcd2553f1b3340c9a62e5232259f853ca7749bce25509307a1f6a8266efd5f17fcf9ab63c707bc6ee034e0928730f24780d
-DIST firefox-78.14.0esr-tl.xpi 521114 BLAKE2B ebc8c8b95e03d609e7f3408e4521f5443a541dad343c1909a243ee36f689312d987e7732c979b9093efb4908975f5ba8364af3862a21dd33b9d6eed0adb361a3 SHA512 3a7a4bb231c471ef3601b00f6e45b7cbbd8d24b987e93addd937e1aaf5abeab7fa555a984baea267a50f3714a494c26dcb04ee6df561f7f29fb5dad64854e8e8
-DIST firefox-78.14.0esr-tr.xpi 539885 BLAKE2B b52ae72ee505611d151d5b650d06c4628c43e8cb713ca4146c327f4ab06c2ec8b5fc2c84a5ce56ac82e36fa127a745e89d2f82cc84d22ec772b217fbf76b8eab SHA512 2196241b8191cadc3997a1dc3bcf5e358dcc82c91398538dfb28442818dd0030b3b577ec5fe82d64f1466a84859db65de453e2d184b71763e7a001814da350c1
-DIST firefox-78.14.0esr-trs.xpi 501224 BLAKE2B 0696fe6474ae4b9d535eefc395b886998cf495a724ce4e4a9432ee645f748a52a369b5b74d5f23c7ccab9d39db0490e159265ac1d43d2220b51616671a8200bb SHA512 226201e55c438a1753774850b8fdbddf3daa3ba2c94ae56eaabde0254fcc18ee55d85a811d21df30f29e2cd7395b83338b6ef89b9da0dd540fdcc86621df9af5
-DIST firefox-78.14.0esr-uk.xpi 608593 BLAKE2B 2491d4f7702651ae4d4b5e65b47e9e5a50cf46b71a461472beef5c004a52cf49b3d131025225474f03817592427991f9212ee9bc4cd8c3ef5184c5a1f3c33634 SHA512 b394708d5f65ca4fea5dfe1f6ba190746ff4e99cc7cf6221a417db817ff33d139194eb3c3b4a5fb89d186a08834fa89556c72b5b31746c5b0e805521aee4ce71
-DIST firefox-78.14.0esr-ur.xpi 557956 BLAKE2B fcd4b2cd224043dfcbe9e7a0ef8f8812c5ce52d4c77e41c4c755b9fefd56e0572090650f97e0aa713d302b0e066cac0b257934780b2376266ed854c86ce592f6 SHA512 c5d8c23dc191879cb9943064f973c8217a08fd50b9b359b91935f62a64af53de8844d439ac9aac035af9b3999f939bfd9063f8268e3d662137e6cfac38e56a04
-DIST firefox-78.14.0esr-uz.xpi 477564 BLAKE2B 0d79d9774a0c3e647e0d6caf889a270f14cd72e26594e81967162152ecfe3c48b924b3ececf9015dbb31d01aee579dba710821ad43962662d6f3dc8990b8ad7e SHA512 cb3c8bd3268a060635cce6e216980b9908cb34b8ba100e1eab5bb7b21ca1202901f54e601adf76f852ef19ebedfaaf5c4e7cb16f1c3badc5a5ccc769e4e899b4
-DIST firefox-78.14.0esr-vi.xpi 562861 BLAKE2B 433c6d2cf314308957ab8126515945cba8788a28cd8d7c3e9ccdbaab1367850edac16f1ee5af2d737974b6a8a69612e421bc15caa8c00431541c003488e3253e SHA512 fe873c104c78167e35b959ae9455805f62436fac404b22d7dba2feeaa2722bd1b9b46583f9eaa02d5b0c20578ffa8192acfca1043b01755197523b415060764d
-DIST firefox-78.14.0esr-xh.xpi 427840 BLAKE2B 98a6203db8dad8b0eedaca0fe618cad0ec9839aca849cc0c4eda134dd8215460c74ffb563da7bed7a5ee88ad1505521f43ded6f69e866e7dece3121fb8b8c812 SHA512 f0af08c51d823977c6a07f2e6500db03cec4ce0df70f2d5546e7bb8ec9aeeb7f8c4fc54978e2427b741ae5bae9700b896120d1717b01295606c2a868057d0778
-DIST firefox-78.14.0esr-zh-CN.xpi 564767 BLAKE2B 79af107fc6eed1b264c84d4694d1a88406de80e28d211bd1ddb276be043987f29d69bce0047a3b5fcea36ba1683679b60f979b80618aabd4f239dacd69333ab7 SHA512 682073787d31141414b41ff8a579d917bcade5cc8752eab205e8911a2cf51546fb5a77872c8ba13711b665f4f31716586660c308da9ddcfb4adf4342488a8a3c
-DIST firefox-78.14.0esr-zh-TW.xpi 564732 BLAKE2B eaf9c564862a9235ebbdcfdb0ca594f88876082e7078e1d80e418f28e9af495d9e1932a6e569e8ce6f0bad948e833d4c99341c8cd4ec55f09eb0355bdfe6b984 SHA512 5e39158d4821aa9424fa3b66b2c050bb5d093147ffd40786c93561fcc58bad933d6342384ce2bf5fc8c78eb010d4058fbde9da9e843fd7751b253ffdef589a4f
-DIST firefox-78.14.0esr.source.tar.xz 340771180 BLAKE2B 7b83bf081138fbf2367116099839c6d05ec5ade58f183ba033c5167d503a2a1f40976f88bdba680a7a8df7c66ac32449004e58a5211f16086b792a2b41e27c67 SHA512 5d5e4b1197f87b458a8ab14a62701fa0f3071e9facbb4fba71a64ef69abf31edbb4c5efa6c20198de573216543b5289270b5929c6e917f01bb165ce8c139c1ac
 DIST firefox-78.15.0esr-ach.xpi 460291 BLAKE2B b22cff8020124356f56a542d0b027321fa6a6d3538239498150c036eb7619df2dfdfc5a04145ea7755a533c560c67dc4098b4a6cea77b333be5d23713b879aed SHA512 658884e108ad3d1b71353742dffc2e4b205ef1212d12dccec75a9f014f151237a34052f78a797975fedb33ab530bd78aea5d1f0276d00fc3177015743b76d17e
 DIST firefox-78.15.0esr-af.xpi 428349 BLAKE2B 1cc33d264817e7aeaf6b532a5fb65901e6b8f3253a6be78fda026cb97b417c52b62952ba5db247bd7370fa7631b9d94a6b3e2ead3f016e85562cdfd3b3021200 SHA512 5a6558244c174d9d225c3cf3f6f74b9c4c418bae41ef2b7b3d804dbc92ebcd1b2191082909a000bf6f544771c2d04ade7003c16e58fd96272233168d1f6d82f5
 DIST firefox-78.15.0esr-an.xpi 508374 BLAKE2B 73854cc9f9a1b7ff4d9a70ec10bab04cae18cff5e23875590b6e08f5f571b44ee6aa1259638e658102c78e41e60dfb27ed86ad8f11b7b2f5322997a0ab7549cb SHA512 1ab2d37cc19377234d82cd5d85ad963ce0f14875ab94f5e093d7546375b09873c22cf9ba8c7df23cc42baa8075e060e773d7de1a9e730361d9f77c9ca6d326be
@@ -297,404 +105,7 @@ DIST firefox-78.15.0esr-xh.xpi 427847 BLAKE2B aaf667de15953c99c580766047afe082e4
 DIST firefox-78.15.0esr-zh-CN.xpi 564764 BLAKE2B df0b207411e7731c9238dd069fd42e47c7ecd0477089e0673a98fc879e76db566dc6f92c60a515938a831c0e0ef116f4f75f9a0b37350ce2f04be4fd72e53677 SHA512 072aba4d663091121118ecf6978129ad3cad28ae16eea7e1f680831ae0326d8ad5e0f853cac25827719229d7eb51635d1d8ed33e6fec01a48ce05875e15db2f3
 DIST firefox-78.15.0esr-zh-TW.xpi 564733 BLAKE2B dfcc1df31227d62486a8a36428c413523e2b6a81f96fc91481fc35fa65744bdb06f92ec1b259a1b79d1e5b43f1cb16c6fefb0a74fe2d4b33538783755b165453 SHA512 b5b9c3c6a4d717fef8ca250e6ccc636be2de0b22988f3f1da634266622ee0304b59a10a194f424d2b6693ce3262658172fe2a015474de600e1686950f8b90370
 DIST firefox-78.15.0esr.source.tar.xz 330819568 BLAKE2B dc8785613c2f72c55d484642c89c2545765a9efbd609bc7c2cf57b4a3a06a2ea22e6959e42b5b8af867db782e8b2097a67dec858796b744e47008a8e575e2316 SHA512 ac3de735b246ce4f0e1619cd2664321ffa374240ce6843e785d79a350dc30c967996bbcc5e3b301cb3d822ca981cbea116758fc4122f1738d75ddfd1165b6378
-DIST firefox-78esr-patches-16.tar.xz 55964 BLAKE2B 79d3a465c69656bb55ee7c1e9060606464b6404435b92f534db275521ac2343e045feae1fff6166fde9e2599a82cd982b0b2395271b1033f0f784e745e2c6965 SHA512 3aa971c726646cbf37a14a0dba6c4ac966b88db655cd8b730c5572543bfbf682991ee7c139889541e4f6936c13f27233dc1837fbdb9ee340b33ebb2cec59b01f
-DIST firefox-78esr-patches-17.tar.xz 56004 BLAKE2B 01d2ded2658c24176a3d13d0267d1c4df4ef0113c5c40b1002acd39a0f04db35b773bc617afed1c681df3ec38120621a5c3753ba2d36688d7d5926233bfb8501 SHA512 43b372b848c1f30e02505d06bbb11f5b80d976fe7ee39c0d2aacf60d48bc1d3e378c325f4e2fd4730b971e88c3bd902539a7b81874f53b8b92369f876e05be5e
 DIST firefox-78esr-patches-18.tar.xz 55968 BLAKE2B f32fe8e0086e4bf74fd43127b9fe136a0e0ad6e51cb8a2398f6e8f9fe585de1574c745dd3f50440cf62b626f9fa24d368284c563fb75acbacc5238f9bc8d099f SHA512 99a51a241d91aa00c64550f2a521528f6134c8812e379eaf95cd1287fd51d00346de8d41f2d2f55a83332580531b31c4e814a47d7f69da6e3512613e8e98bb31
-DIST firefox-91-patches-02.tar.xz 22332 BLAKE2B d323054441c9383ccc88b0522cd2a8732df19af670aab6e57689a69f299ed97fe8cfeda0aff8dc7353d591705ce2c42957b21da1f449a58145d9343474d35f2d SHA512 f70665c4dcf19b67ee7305fc3d683c03817e7089188a5033a6fe9ee32074820876b52e0bd32f585e1e5cb14e2fa4bcd1cf9928dab6f74f6753b4bf18919537c5
-DIST firefox-91-patches-03.tar.xz 22948 BLAKE2B b65585a1c84000872ce675cd531033522cd7ec7e3d3c4bb660269709f02944e8d88cc76c3b9b0059cf3ca85a3caad22168cf607aa1f4f2426eb0dd161b5ea249 SHA512 e970f8fda3257b871f3d8f1e185724ebdf5b4d91bfba6061a777242b7aee5a613fa4450af4f758c0f440d09483e65ca48ae79c91e040ba9c5e63d32d329a7187
-DIST firefox-91.0.1-ach.xpi 465287 BLAKE2B 2d45551393247fda1a64aa05e8491c52e476c033a457cdd8872b3cab88028692f360b2310174116b93437e6523d86c19150045187f1392fa2973cab0f9141a8f SHA512 560cf7a68510d55909a15524af17b3e49c3c6acd84d61c509545ca0661733779b563699952f07d8efd6becd569b204f7114aa7434ff8889184f5c2f0a71d4d07
-DIST firefox-91.0.1-af.xpi 433153 BLAKE2B d7b7210a9dbe92e2e73493539e3245f265247a6a754461c96e3a29fcfdfc5714ddfb83025b08d862d76bd19fab03fbb9892665fc8987033a406cd6e0ed0be6d5 SHA512 65ac9bc81d3676b1dd7871596fb8ee3361bc1e6204571319adc2691c8969234c7c0a66c00a52244e1ff8bbf213f38ae4ea9c85a181d3c92039cfc47902305e8f
-DIST firefox-91.0.1-an.xpi 511815 BLAKE2B 286a6e19f1a882942f187204a2923ec7e8ec38eded208acb0fe01b0c0f83f3b9cb30dc9bfe622d5a66ef327732ad8aebd415177716133abb074e8e85c1d400a2 SHA512 df6c249c5f0f572c4d128ff62e4c49d13dc6c2e4e3d450f290f4f9e55c18da2d1ffc4d04f75359e827b7a2b0d8d242c3f3f40f9e08d64e64e2d0c27a8e1390e5
-DIST firefox-91.0.1-ar.xpi 573965 BLAKE2B 52b50fe23ee9cc59730bd6baa81f0032ed46f54e6e633820a19632b6c45c8a1dd9fe0f73c2644b093f104c92f9ab6dfe621c1a6d88853a1ad516b63082a9d0eb SHA512 b20cc21d86967e15c5dc9276040ce46e51de8514905b78ebf9887cfb5c74135f425a3cabcdb7d6cf93be9c8d84e599e0c2083fd07b79d45c2d404a90536edfc1
-DIST firefox-91.0.1-ast.xpi 502959 BLAKE2B 07415fb7f77703a299e022c5283889ff070492f1e68709a610ab571a2d03af5449a751ccdff071b41091f271174aff8515cd090232ee3a8afb8524326488fe2e SHA512 a525017e47323d0680e5ec15ab1dfdb5be45994fe27506d0088c2e02d5ffbe9aa37d426b3032e4343f01d9f1e597359f46b73bd32847de02a524c47a82befb3a
-DIST firefox-91.0.1-az.xpi 500888 BLAKE2B fc33248a75f92dba2b6f905a18b184fa819a8b22244744e34c562bd824a4d5a352a39da7378a3810ac2ffc60c5e037ac627ff4d69271c3c1bdbc4b24d7c3559f SHA512 831ad2fa7fce8f1a1b3c5c4e69c0be8f412802a1b45c980f344f0329aa5b35f407185c7e863ef521e6be8ddea7b1c4ebd51112c47854891b11c1d8ba116feb3d
-DIST firefox-91.0.1-be.xpi 630159 BLAKE2B 54f5d6cb3e7cd8fe093637f4894afbe58627d0f548fe75095b97580af6be66ffec73dbf80176ad954742eb5cdafb790017f54f9a66594a948d84bd938dc137a7 SHA512 d126e4d28cf90a843c7591a032761e7fa9bf693ce5c94b2620b70d88e146896114ca975514a258e62c57affac13884c1dd3f560ab5a27287adefcf3755066d97
-DIST firefox-91.0.1-bg.xpi 585089 BLAKE2B c1986ecf74b055f5be9b20f40bc564b6ee4442fcd5aa8336b57dc45ca552c866cb209514aea48b124c10310c91d6a4a5c74353043a10dfba059f7557d1dedfb3 SHA512 db96440741c136a6bc8f6b71be0c100fe283dc85798f0c4be0975e543a1fed89e3045f81f8bc0299b702dac6b4f0336181154e256ce10831b6f4b922c117d624
-DIST firefox-91.0.1-bn.xpi 576483 BLAKE2B b7a85debdcb0a7ad07ab095d5d53e625d07608a118b29bca5491dbbf81455516c83b6cd2156cded61d050dd5239620e2c764460f091bee4f122cd74a0bde2d77 SHA512 d0498f27bc4e4b1e23cf5d53364b8c70c41f5e47542c34cd2151b25bb36d608da6897035af9493c1e07d0af8603abfb411953a84874df0d77e90c03e5dc8cff3
-DIST firefox-91.0.1-br.xpi 534797 BLAKE2B ee346228bb3f8cd0d2b6fac0b8fbe08cb37f36a151a63e181235894dd4608894442d481d7740f8543e538c8a9778d838a3f8b239642a17f9ef0621f0873643d8 SHA512 fe5bffa7fadb5192d4054ffcf865dd2fb2063d43e8012103280cb121fa59d39818a60f9d9305b22358942a5a55f4a34a3de188a1b7350f10a6820de8af918908
-DIST firefox-91.0.1-bs.xpi 473115 BLAKE2B 3d667ec86b2e840c39f412df88fa7183945e6a55ab9134300bc36ac1fe7d59324fa85b8efc8f6685ff813f734ab7c983f9afb9bb96c621e683311e50be8018b0 SHA512 fc81e1e90becee4436fe56ddccd986e9c975e4bf27a2497841e22dbf1f06358596071148fe9f00a729da549d80f31d6e341ec717e9eb63baebbd1e9403f8de16
-DIST firefox-91.0.1-ca-valencia.xpi 543224 BLAKE2B 0aa78a5d29c40ecea6aca34b4597b218433e67101a4018c64a8ebd7235bae0a4257570afecb9f1da75107379a72934752c57734cb81bb708461dd8b1127235a7 SHA512 b22d1013b3f60df720c7070f3e4ec62bf72b63629ea4828eef5def4edba4793a34ecc14aab8b5e21613193713ac13cbf53b3d240c6716a91523bef4a6752ccb8
-DIST firefox-91.0.1-ca.xpi 540998 BLAKE2B 1e7694f1e055516d36cc1e40360b5e60c94839b16ba9cdc7a241a308dd87e0fb46930ecd48a04bae560d35ad19cb480221cf0334f077c2260b2fb8f884142769 SHA512 01e3aefbb2cec10c86e7e18f45ec85b4d433cc995518c878411872a93c24d883dbb7a3087a51ba170d991a4e5263c75d59855b8a82ba21e329615fb33b89e48d
-DIST firefox-91.0.1-cak.xpi 568040 BLAKE2B a59457069ac664c299073e66ae405178241096cecf693b2b9eacade23c1916c5b171fc17a0d84286f3954d2b412e5dd87d10da2ababc258932d4171d49744c17 SHA512 1c0ff812049e5f09dacd795342722f117f33ecc4d6a2b62f0627971f91b68ad1ef62af85f1f694832318b06e5409560867256231a667b02bf9d01933cd610886
-DIST firefox-91.0.1-cs.xpi 571507 BLAKE2B 7804cf6786ab37d5f365b8901ffa49cef5b5176994cd380717b1fb1ac36816d6fbb97bae23c64851120c9fdb8bd24f35a729a5f8b8cda859c45e1522bf007228 SHA512 7667c0088c1366cb10720bbe52f8e7a58697f0c14c6319206b601bbb293f49d0d70bb0db57ee3e354665b29688b1612ef257d468a449843b387f06c0c81aa8a0
-DIST firefox-91.0.1-cy.xpi 548290 BLAKE2B c6f40f2f5c6eac115e8d31c54010b5d6478e18fca3eb7cb4944782abc84b66b7415acae4b7e3dcf5df91e4e78b280cbb66a6f86e9fff3ba62cb1a650338f1630 SHA512 e74e3de44863a6258b961b863961d620ea2c76386bab929a6dd954aacc7323bf2eb0b9e63619f62103a1224fecd5ab9adf633e99173661e07d0575e94649bbf7
-DIST firefox-91.0.1-da.xpi 540522 BLAKE2B 28962025613bb8f43a9493ceb3195ce94933691be571c950abac62c30ae75ce327c7b1834fe9a02de5209d94c66e62de346bb4e688bca21aa9ae284482652696 SHA512 958d7c260b947d7577f88f482aa9df9af0350b2efd618a47d1332d9f50418200c2e62c7bb71fe5136c80604b6450022aaeb78e16dff50a1c2ef63a12122fa316
-DIST firefox-91.0.1-de.xpi 560086 BLAKE2B 99079af04537beac2bab4b5591bd915295043597e09ff496c95c9c54bc9a8b30502a3d73e41eb54cb3ef3632a46fb3f92dcea88b8e0c21e7e7a1ace1f9511fea SHA512 8c0c1512ade19c9005bba51bd9bc2d559a84559c0b5db99c6687cceac7a9fd6f9aa0383815e9592a2ba656aed42d337fa94a687104738c8a76db649f0e150dd6
-DIST firefox-91.0.1-dsb.xpi 572852 BLAKE2B 5b5a79b15711ab50779d8af85095ce963ad27543eeb621e44384e0d25aa198cba029f13166ee3c944c8529dd5ff0fe1b232bcc60e1884afc96c8a0148ed85461 SHA512 01df036204449b6e9c08f26e7c9f33dd9a7b2db0eb9446a41c76de7bf9cc5adb35ce09020d93fc5c851e143934c8a0a3a20e2b0ab40a887bb347fc42c366f0a5
-DIST firefox-91.0.1-el.xpi 646565 BLAKE2B 39a36d9fb96e710fcb8f7907e6dce3c78b7c53a547373ef76ddef95503dab5b9ba10efcb8ca998e5141c7dc094923af808a8e53e7a1ef19cb6e1785fdc2b9613 SHA512 9a35bb7a0b2327616f4f928c6c8a39c00cdfc99926c3447dd314c19c201230e6f7b134734ed9ba126efd6a2762c6f8a9b47079ed52917b447d63d085fcecbb38
-DIST firefox-91.0.1-en-CA.xpi 515726 BLAKE2B d845b2da2d5c4b2e5f4f45eaaa038e075e0cc838f1f8fbc5018da08def530fe65558c80fd06dfa327c5cdcc5da7420abdf8a229dc1a451fe76d79a1d1ebc718d SHA512 e14353b710c593b0b912e9cd7c9be58c58591a93605a4ce5ccfe56385165b7317dceb699ce2dc674d20e51677a4a83f029579a8537757ad4eb0386c4cd79f600
-DIST firefox-91.0.1-en-GB.xpi 515977 BLAKE2B 1fb0906663297c2007fdd17983864c5d1240fc910485cd0f63d2f09463c7f0ebe8e1082972b14b02a44fe757feaadc999752130eecbfc5742e60ff348736011a SHA512 dbd27bbd0695d978e6f043fcbe859a8519c0de9a15df1be5d02676a8b122a2dc88afbd6be9fb6786db3562d894b7212d2807ba37487220c5d85c368e1f9cd8b8
-DIST firefox-91.0.1-eo.xpi 542047 BLAKE2B 6240da366483ca76a58eecf0efade198cc4443916efb7da422eddf353f5ec4e2967a7f932bddee056c62461657c03bd2524aabb9c12f4398d7e4511f3639cc88 SHA512 f3ceda1b665d696a4316f2c39d6172f0b88dd61100a7cc742285172d9da742406f7bfe1ea1f7de855ffd38851f5e7fe93bb346f62912f6e47b881f275012c1d6
-DIST firefox-91.0.1-es-AR.xpi 553515 BLAKE2B 676280a74709db605cf84e59403bf65f6b7b8bb4679e2e0b7f51fe8da2a69a38886f2a848318602ddad1070b583aa18977c4899a978def7ab87487104877e97e SHA512 3ace98e5165cef6d5eeb45b8df8449133c6a466b86e553778ef121cd2e89b57bf74dde6897b90f1c25b2d1e1db22d420627883496df160be293aa605defe52bd
-DIST firefox-91.0.1-es-CL.xpi 552540 BLAKE2B 893e92ed1e681e1ba238cd6d4a694d298aede939bb01d55b14017d61c58be545453534c82fe7f183683475292c068a37bc9e6f76cc50e99041962460af085763 SHA512 eecfaf871d63a51487a2aca835ff2190882aac2e51aebf25709f19fef34867ac4297598aacb27d908110b127102755aadc404dbbf3cd231090b8b1a6d4a0f100
-DIST firefox-91.0.1-es-ES.xpi 542531 BLAKE2B ddd687343115af534f986201dd1d7496a678457a567ae7309a2ff245432fa52341e877781b61ef304a0157f2fb5db49063ff54574776a5d4c74f17044bc5a9fe SHA512 b2022661f9e0fded6c91fc30b050c8c917e323f105779477f7883418286ff0838519bd091a510be4bd18fd41053220680bcc025bf3f7093035baddcff6a7a965
-DIST firefox-91.0.1-es-MX.xpi 556676 BLAKE2B ca0de4cb6af0bd6a033cc32b95c58e545d523feb30e7785d18b39d0bd90895b8e48272606f059c7e7b39da0dfd132f964f446142384459897e15f85360682043 SHA512 9ec1ac0d060b2284c77062ec780bb44f771189a360cdf687756d9d43a56072725c24b89b594a941ace27f892a6e3dff0d588cf1e6cf96d71bc6f5db4b29a90ba
-DIST firefox-91.0.1-et.xpi 494144 BLAKE2B 1507fff6e251ea9cb4ad0a13f471a95374b7aac2c109ac1f70e8c285103ffe0c08e505414ad90d9518cbed3946b9db5521793afca0ce3cd1a9f6303833876777 SHA512 77ce0b40539ade514a09453b175eb0be52702e53d4f1a0af39740d393d9f076b4f6e7e71380d678123dba2783a22d871c6990c738359e8c7387f816af4e96c3e
-DIST firefox-91.0.1-eu.xpi 539059 BLAKE2B a8b7c4ac6d4f2f4af552796a32ad46a90e3be4c2d3159f34d26566d8de1d1ae22d279be967289e7df161c875b9d28b244081a42c39386193a1a86beec0607d27 SHA512 34da87854e3407a18eb1adeb9a6f3aabb8adc2ced228bf6b62baba93a9a7160f108be7d0f18a9a462b30a503d411c4ca43dcb1231e5063504fc2c4b56aba4b60
-DIST firefox-91.0.1-fa.xpi 561627 BLAKE2B 5cfc5115d94a9e827eb254cf1da94fcdd1e5e2edf724e5725f4e4c3566d2a08084efb057f01131dcb5b6055de4f282f7170c55ffdc48a22bc123a02739bf440e SHA512 5e199c81278ca9311d4abddab35bd758231f5bbdaef50247c8d0e148602ab686517f711e97909d3e8c99a10a7e83dfbcb8a655dc151c595a348667b1c096d4cd
-DIST firefox-91.0.1-ff.xpi 485699 BLAKE2B 3d4bdd815afc8143019b3b8aa26409e5ddd70e5c5c9d98bdf856836f6d187318129aca275c43026a7d199e619059a6e8e89f177ec31f98f43933868fb811e47c SHA512 607c0e7e50f21403db2e7662a7b3b842c259534e6af052edf2ac4f5f2429cc0e4e90551b6f5dd09ac707756525349439a130305a86b5718bf436120c7df9a4b3
-DIST firefox-91.0.1-fi.xpi 539827 BLAKE2B 78fc432a81754687bc2cb42ef55597316086fe70987868dcb8c6b0155eeefc60e460596fc5a5750541f98d838c5d81271338b2280fba3b8122f8adb82a0932ea SHA512 046fb4f4b5300798fad660df13ddcee8327a7586634e4f1945ead67fd9b84cb50f4e1d05a8c8b1d259fdf4752efa2f02a84de637444118bad3eebeabfbb663d7
-DIST firefox-91.0.1-fr.xpi 564062 BLAKE2B 4be5cbb4d525dcbc50f2bbc652ed8d64c83922a2f5a2e30c1f78f89748668442dca87050f29be57ec5fd8f2f0f78eaefed8a985bf09245937d4567875813e047 SHA512 0d61587288f3f6677a1ab48b366f634eb05a55aecac3209a2a48a4df8c80b507589e88423493bcad86927f7e14992862916a910a14f951f5060651cfa61244cb
-DIST firefox-91.0.1-fy-NL.xpi 549214 BLAKE2B 86920b43508060098d03724b89b9d0327b8e95580fe1180c34ef372dc7554c48ffde85b34956baf2e8d9d1d1294622487d39713a9f57abba5b716872a4223357 SHA512 51b7c6623b446eb7e05d64073a66dfe5a853e742fb1251eebece8703edccfe9c534c06542df7c31353ca60f38612dd2f1a956bfea794b266d34590dd55cbee5a
-DIST firefox-91.0.1-ga-IE.xpi 470695 BLAKE2B 0854bad626a93dbb5a6d5bfb69dd10dffae79500040b423771793a5bca1d47232b9d620ce807ad853d8d3aed7f3e4d03e8fdd4dc1db4555150a8356c6d22d41c SHA512 e0cfb591df480d5d029700719e1cf0d1e72ca6efbe6e5ee74382b5ff631d22e6b5059a0805aead8e2ef3e8b0d03b2462939dd595227c4ea060aa8896941ef6d7
-DIST firefox-91.0.1-gd.xpi 545679 BLAKE2B f305678a4ac5a4e6d3078e7216abd69b8863a55a7322d490c94342ec458dd2af22eda25a3b578b801ca6e49ccf983115012ac4b1d0d0f20b6ee736b9313ccf7c SHA512 9014992c1fd03bc207ecd91f12d4e3d42d99323d306824274a5d830f73afe2718890de291d2d8619fb879b9b825e46e3eadeda9d905a4528be1d1a22e9ff2311
-DIST firefox-91.0.1-gl.xpi 548400 BLAKE2B a30c56b8b6d7fcea245dd4088f68b1e5d5ec052673b6bc81e00dae370c2e041a75060238b658c2f2ab0cdb1d6f48e410d071efd9640bd0ae6057401996429189 SHA512 57191af8eecceeaa151a4166b7d81d9bca56905cad4b335c3096c3b77c52833342863528398934a69724e4d315f155a4ed5188178f5c03e2574f8a6f78bc0648
-DIST firefox-91.0.1-gn.xpi 565288 BLAKE2B 2a625071695bb5de6e0c66dea03fbe34bccaff97443da4d3e8bc241a5e37d49af5ecda7c28a32804667f2f0f321137b92582f2339ca767c645e6d1ab0dfd44b6 SHA512 f2ef2392c8e0f51c0164dc27c0761d8b94e9b049e1a4e84b1c895de19ad1e97dc71419eab42436b62fc26be39baf10ee3c546f8440c834e890194f914f989b4c
-DIST firefox-91.0.1-gu-IN.xpi 544520 BLAKE2B 4b6ef8accc458b5092d2dba3a1b17816dff06c48f3cdd0b8c60732057062f8cb3070ef13af7024a5fc72d4f7d49d54871b6d1f75c76c1dc536754046576cc69a SHA512 4a861f82dd8ff7d220c9eae2552eb554470ff5214d3587b82278753525a7c17edc9d139a245360d6a2691694722b0be143d8388bfa3800c2c6e9868ee3f73e7f
-DIST firefox-91.0.1-he.xpi 563135 BLAKE2B f062c0d3778e60ea66554b31e4c25ed323b6a3c1304e69855fb9d249c55265003df9cdb9cff6c81543df1a0a427b17734c744589dfdd2ce70dd11f6f96df9fdf SHA512 cb3f171a0c84db3c4549392ab981450367f9a76a21014427c37e3b7d71693b496d27f140b029ea5e532c849100abae54e92706254840da406e901992fefc4d6c
-DIST firefox-91.0.1-hi-IN.xpi 575687 BLAKE2B 63b0c59d6be1d098c7ec121a111d7f7af394f3735e097bd82b445270d16a2881aeeef3c309b16aa4b4aed567fa3daff8b566ebe6d3a70ee068319af85cb9ae7e SHA512 260c490892ab6790bb7ea4e8e8ef84038359f016563be742f145a089b73462988611450246455c10fa70926104a79c55cd71bd508e0523ddecd79ab39d37a00e
-DIST firefox-91.0.1-hr.xpi 544089 BLAKE2B 585a212a42590aed3886a0d2f8c8819963cabb8e43c3eacf7b025606973c92aca900f9dfa50ee1850b84eccc0d07bda1f1fa8c3fa27f19cf0fa5e1f2b018eed2 SHA512 50e5540290c2e6b45c13aa04221478272ffc2c4ea67675997e95cffa366291a9e6cdf78803cb9d826710664f566e69dfee29266a6c50d60033d5b65c47830e6d
-DIST firefox-91.0.1-hsb.xpi 568946 BLAKE2B 657894acbd00379001162e710c062db03846ed8f59f1b522bef0305f86d65986b631bdc70216bfb3685be25ba856cc04adc509f08ced6265cd1904bd606646de SHA512 cce8258a90bdafda4136dbdc3a6bca7254dd5fe20d67e47c533d2bf514bc6e88debce079016e5ebe49c6e12aafe52501ff45629ff1a40ee11dcc740c3952e3f4
-DIST firefox-91.0.1-hu.xpi 572754 BLAKE2B 634d3a958462f342d398435161d5f2908392d4a2ea464946fb2c30f416a2ac143972abf4a6f7da3c15ce20e54b7d5b26512b2c47e15680483a56ffbff26b9bca SHA512 78270700c812a78b43242353b00e0668fb39141736670238e9082ce444164acbdfe94313da6698b90d5d1879d32f3119be720326bdf3f2687a6400f6d4617410
-DIST firefox-91.0.1-hy-AM.xpi 599022 BLAKE2B 6c34d34b1ee5d07ec67795702451b5015a08e4714cc6d4ce82d4a30b9522c51abbf3e20818c24f3a54f9d6e8e2d6a9a17771d3f468658822e1d8aa7cb1dbf66c SHA512 a0889af23304d9576f4118c56a739431fadff7abe913cefd800988da5783dcc9f8bddc6d384c217a4a766747306cf9464c4ddfda4b6faad5181faa781d584aed
-DIST firefox-91.0.1-ia.xpi 538521 BLAKE2B 92aa1189ff7235e68447a0dc815da9c662fe7b2d1016385e9872d039eaba5d7322a8ac4aa4b89c15bd5b28292979ccece664612ad6a27bd0322e7b6ebb371aa0 SHA512 ff11e19878b0dd9aee6b0a13c1d03921cb4f9537a7ec24a2cfd671208dbb1d7ce09e425ddd35afdda9a8603c975672a0db1cc92c6d8b16afa8984d4cec84c4e8
-DIST firefox-91.0.1-id.xpi 533880 BLAKE2B 765594b76a6e516c71c421b8d86abfca88e90ef9d7327c339034db15a314822495f3c742d56e82802f79e9f936934c677358dc343a594d50ce4a780e4515f787 SHA512 9af829bc083f0861613689f587aefb476428d6557c7b58122dd115389ef92ce63ba0915552657594d272f6162cd7c03364df8e84086fccd73d7f3ce7a4170ea6
-DIST firefox-91.0.1-is.xpi 481333 BLAKE2B 5272ec7357389f2036a321b2e8e117d5937696439ba1987575a7ceeeea49c017d43b225e8778ae0132dbf6379e31605bc6acc3f269fb15010ceb2002499d27a9 SHA512 dafc2b5a52905b659e8a7147b7ff5faaff8fa66d14bf7e1920764f9cc132b770404638687e09327ee99089ff37ee9e37effa607f0509949c6e6e4d842cf7a179
-DIST firefox-91.0.1-it.xpi 467038 BLAKE2B de243e2995585bf155b7e19e6fc092c083cfb865074e11b1be4f5cbb130b5984eeb034400ccaf19a4ff70867c26eb4387fc3561beacb0ba47864dbf9a7d5bfda SHA512 36bc28ba390afc153c7c3d5499fb78292ed8dd6ae5158119863042a254b2f1dc3d337dcc60258fe96125d587c4aea3e6b78763a8ab574d10c24038fa37e0f228
-DIST firefox-91.0.1-ja.xpi 599312 BLAKE2B 1fec31ea99221e133a2afb633d6e32a613a333e566c274591321e7c40dd657398f714a76cd69eae5ddf4f946d085998119e0779ea87c7c6e6ca14eae0c5fca9a SHA512 bfa62d077b9415ab9640389da416703bcac799d6849106a611edb4eea25b76cc0c55ebc6d1ed4c599d0d0732fee84c785c4b179024fc8c31ce992bbe90f0a9b6
-DIST firefox-91.0.1-ka.xpi 600149 BLAKE2B 849f2564a1bd52c3fbfc91adc5ee1d0434c4a7b0fb6ab07e7666b6e90c63a5fdfbdddb538c31c448cac3b5a1a44fc067229981f148428c0868e0675472c66b3f SHA512 7f40ed7b11e2baec17900a9cebf34763530619bd5377baf7cdc1384fd5197ab1b1743d2c0641ef1b709050b8dde2489feebfbc28595f8fad78c891764d310a15
-DIST firefox-91.0.1-kab.xpi 557819 BLAKE2B f3324372e1d0a77662266218537c90945135348fe955eb25cfeecc679c2f819a3fe18284bb7f4ac95e655a0706368d3ac38be25567e80c122d697ebaaa8377db SHA512 4d726ce5e6d2804e53f12960655a69ab7b5752f89c7ada0db8e6a5a7ea78c6971ee87963d4b2355a1b45d2aa21fd26757c0a85370494c61cf630ee6704537cdf
-DIST firefox-91.0.1-kk.xpi 614348 BLAKE2B 8b969952db26b3af3dc36f7cf0bd383583e1610a0fefecabb8587ae1360304fa4d0e0cb75ee80297d4f06f9a6a5e6aba278c61421cda3c292636defce5e434a3 SHA512 3dbebf440a68e0647758f6e821428ecae09fe6248cdc7166dafe4306c34c8ccec8362d4957b2de5715e38798a83ed4b988c0562b9357e4f5e29f9e8ccd9e70d1
-DIST firefox-91.0.1-km.xpi 544979 BLAKE2B c9404fd5a0c462ce0835e8a0752f0222bb258b5185b88c36a0b9e5ce7f1adfa6a3680da85fb3ac6ee5f27c93972971a4f203826e1a3e8a9ac8ff9ad1090ee2f2 SHA512 6afbba783256aea84c2ad2bcfa5d17dd58ca14288275b893f78c374561b03c407ead02376957bb622b19248a01c19f9788af736e85c663c252a20b12ad2b8c3a
-DIST firefox-91.0.1-kn.xpi 508520 BLAKE2B 0f7e87ed335cbf6b3d406d515fded7608976079f3f69cb623301b84c85ea21b90f8845bebd25a84d306d99cf59c7cf2d3bc66db1c6fc47d249d650b4f79fa307 SHA512 e4b0c2ee328e0fa5dbfe844fc04e4da8113a67dd453a2e7ec427aae55ad358467fd58959b0235c5bbc25e764b33003b326548c63b9d7224db4328b906d2d9cc2
-DIST firefox-91.0.1-ko.xpi 584339 BLAKE2B 260de436acfe9a052764d90321c51e912e86922ff2dec42baa997474f656af21542920a02dd8c6e9ec414b89aaa2470c050ba329747d56b8530a6e840292c67a SHA512 bd4edaead3c1e64a3fb2f95b7bced43f0cff61532900b2e092481a3296dc3eadb9d39dd6f5ce2150312cb81f18e113431e5a5f5de48541b4aa0b9603e4aecccd
-DIST firefox-91.0.1-lij.xpi 481929 BLAKE2B 9905cb8ac5025e63112209d20358aa6af3bb06de4ee6071937fd21be899d118f230906692baffecd30a0a1cec2aba23cbf8b4f52e8da055133d6164b5ed488a9 SHA512 ca04d219b8e0fa2a60a90a051b1ab67e575e68eb5e34689a72ab055215c2b38052da806666438e6ef361e5211195e54a9f4bbbf96c6197ac627e118549366b5d
-DIST firefox-91.0.1-lt.xpi 567607 BLAKE2B 176d3253e86b5636ff485355fd7921e20b8d62af84c8ebf5ca14340dfb89880dfe7c66847984ee2f43accd206da62378d2b4ae70427c29786e457a7ed38cf48e SHA512 a508469ccbfb038ab0c307f00f05d237f9471f85a547447236644e801fa4024acd3e9fb773f0464d801d8b1e762f1eb75dc4611b9ba41b14daf20328b15b4145
-DIST firefox-91.0.1-lv.xpi 473330 BLAKE2B 28460959c1137966e5b21cfe687e15d6806efb3a19b4805b88c71a3ca9af93aa2cb6cc222bad8e2b186d3be4712aa0500590a2308ad42b1b23092ef2de3aa069 SHA512 bc694d8ab26d76dd6340bd0a11499049e0a0c3436468a6839bc8384fbb275f9960528ad6aa56bb1463bb20c152a278c64100e8678ba369a034a2c0e01c05d5dd
-DIST firefox-91.0.1-mk.xpi 473477 BLAKE2B ff78a87591709df5a7ee502c4f97d509291aa73562417c64922342af171aff6a462c21f09e221c834162517a3d5528f8444e17330ebefc4f0b826ca5f050d381 SHA512 559077e8d9151618afb8ba375c637d04c3b382c34355442ec717175f60c85c0ed159725b8c6d470505349d33c13d0b70a5fd1850ab125aa25df1308f89dc8862
-DIST firefox-91.0.1-mr.xpi 544861 BLAKE2B 1bc24be2c664792aeeac10e706079afa3859f520b7e75899df95b371226c00f0f7a9943d76308dd48c2f58a181547fbf65d59c2f21cb0b20d2b2e8204d8fd4b1 SHA512 c60b5eec8c5cacc0520ef545298be9cca1e1cd7cb58a6e7dd54dd8975fe8ffb47642f1bac69f583a8da3e8821db78dd6351bbfad5fc4eddec52be18f09f105a2
-DIST firefox-91.0.1-ms.xpi 457207 BLAKE2B 55f928df57053f905d738e9fb56ae5d72c4d21aa409d0e478438e77fdb4bf842ff4a5a968aaa5d22b397b13d6ef5560aba402b9017d1258d5d2d838ca617a363 SHA512 e9ec601628226a9bfb14e5bbf3f41082daa8a5ab93a9e06a6fb0a0675b840f622cffc4bb332012a5c14760aff0cc861d797fb3f1f6cf3bcfb677d5150c78023f
-DIST firefox-91.0.1-my.xpi 530141 BLAKE2B eda719bd9d52eb2f74725c172fb6281d0693831dc99af7b22e9a2eb66605e4abb0543218ac69849da8c0135f7d10214531008f368b2887c05302450a25a9d078 SHA512 892c3872e531c1bdaf735250d42a275c181bdf096d1aade126acdb1d7169f02dfce67057f36c6f6a4cbb87967eb23afeac8c1fedaeeb0cc4092a68bc7cabbfb7
-DIST firefox-91.0.1-nb-NO.xpi 534990 BLAKE2B 8b6ddf3de4c230dba5c4afc1dd4c9aaba8abc61716b6a88c7759baa65c1af7b17c6d6a92f5b7d01817dcb50f6b7b64510b4141b813f2ecff487d05e9217dc77a SHA512 388eb598be5022de1d9b43a02666f60f618ab1a74a4a04718cee6e398f3422da314eb87d70f1e5eca31883f7d782d46076c3659f457fa893e9e9d9532abe61dc
-DIST firefox-91.0.1-ne-NP.xpi 486187 BLAKE2B e2a82ac646a4d7008a95b39f53b1f6e2516e4a22b837d32484b461e1f18fed2169cacddfb719d6099e66e61ef3dfb95021a2f2880de34da0fcaa8c99fa0383a7 SHA512 571c7002526676b5bac07d09a3666b586e016fa7f3d2082a1100a55d35309823b18185ea416b10ee501d7fe0934ba2d4f5ebd5849e378b2afcc9a8006841a12d
-DIST firefox-91.0.1-nl.xpi 543368 BLAKE2B 1b1681b47e5612ee32e1ee3371fef0d07855b0fc80e961b8495c0fc0291a6489582219f5c7aba465d517fbc4ff23c2ae9346a5f40b0fad078e77a9501f0534de SHA512 55b2d6cf5a699874af23b70da80195a2996b6f4a9c90e657785c98c14410c9d725b763fc39d73570b455359811d682430bc423b909270d067be9c140bcc1ac70
-DIST firefox-91.0.1-nn-NO.xpi 537546 BLAKE2B 978bdc13173d375f7321e6e821e93f9fd033001a2f0bf6f65bdb7da8571b41e0953e32b4bea9b43edbeeb31fed7c067e0eca72d86733a60e13b7070e189df0cb SHA512 0774741d022647dd826e316bc1c45cd17c43c130b4fec5edb770cb776a61953a3de30e4bf589c7a08680c4e02412f0ab4d55ca4596584921c2e22505df4ccf59
-DIST firefox-91.0.1-oc.xpi 559032 BLAKE2B f2701f64ebfe23a829b8e05b5337b7b5c9d7da205f131ec47b6fc06b7687ef12548ef5b19d13bb1d5884528e34116e99ed073c4babf421ae2e13d51e8a051b6c SHA512 e24f9d000ffbc4b138640cc01387d570336bf84b8f4d94d9fb2a04d8f9f9d183b9b04561411e300cbec44775d1cf08f720908caf9befbff4bb2d68a98bb002c1
-DIST firefox-91.0.1-pa-IN.xpi 605089 BLAKE2B d51ddcb0f3a2c37ad121e7e61e243d87911f1df20a88670330145f25dd40cb0edda537444e513ca7973004358946fb2812fd76d088624b918bb85eb9610469dd SHA512 6342a857167837f0250873d3f7d645a435ce9fe42afc3c07e00871953567d01d9076cd31ef6cf2aae33a1ed626a8fb70f747735e47eb1162debf35a1aba2cba3
-DIST firefox-91.0.1-pl.xpi 562845 BLAKE2B 5ef1225f91896ff5df88e2f7e6d83ab11e4b7aef1a094e11cfd4ba79c3b8777992b711a1e9cbd3a539377decb69e9de80d675073db2c84b86923674dd9ee9a0b SHA512 c62a73ce7c63468541a295cc4dc96ecbff669e9c80690b0db8cca3587398f1ce52f3087a88e97be1f7770bde7f6d06f96f5673864dceb45c8f7a3a7c7ab005f2
-DIST firefox-91.0.1-pt-BR.xpi 549014 BLAKE2B 284df08f9b992b692234726f29dd6db6ceb64827780d84a9eaa0b8d6ff3736f0fb8aacf6ad17a3700f5ade48e0f0647756452d5fea70527780bc05001e7500fd SHA512 9eba2963c882c64309cb39d732eea9a6a47b65764ef20c5ff35504255d764529b198b63177bbe654d1ae9e35c8ccd7d8db6416b8c2e4c5e7a423f8dab156b056
-DIST firefox-91.0.1-pt-PT.xpi 552654 BLAKE2B 6fe32e53cdc0977027f2ed12a3bdb4663316bfcc4633cd8199e8d22d119d621536f72d26f523aba005c923b6cc13f51ee8a2bb1509ed92e6bd9ed7288bdcb21b SHA512 f2bf85d884ef8a6d2b7da40f06b0cd530d64593f65908be62e78609e78f7ea47696e7129f68fb379abae78da1c83d9c32083ea4b9bcd9ba7104d4f4c507a8e83
-DIST firefox-91.0.1-rm.xpi 543754 BLAKE2B f4431c5bb5e8f408c7c794def16790723d3d44e823c38038a80375175ef63fd47b02728b24f4296cd901ac964d18a9bd9b63f5d93a65a0db1987343aafbaea4b SHA512 05ee7220d545afb2fdb8688eb2d3b750a732c80f53c1af349d85496f89152a6dbf96127f9f8e64e45bc62b7e2d2def9bf37e2be9c7b31deb5735167f5f0301fe
-DIST firefox-91.0.1-ro.xpi 544863 BLAKE2B 2f4708130a9b85110eec60ea44e696132bd36b08c6dbfb79d2d75382b337baf691a375ead8d014b408257c818a0495656169a82aa9ee9a5878b9d66053f747ad SHA512 877de9fe822754d72b7ae354f3950abafc48b9b2d90f2fd084a030aad2e4784f99c975f4781e1a6916a8d7ebf6908be90963fc51eef6e8915c1927893a3f645f
-DIST firefox-91.0.1-ru.xpi 635042 BLAKE2B c6de6a6fcc637665053998277135e53164617afe01d5123670c3ce468006cde702f93bc7b45ce514f6557c7788c21487c203cf7172ea47a9bf09bad0f21ead03 SHA512 9e55f4b82db8f9b566e0dab997ca5a9d908db7c002e15aebd4d92bb1aa98d7c1e1bb705be26e0d14ee342a1e719fb733c0a0ece15d3449a919673c9f68ae797a
-DIST firefox-91.0.1-si.xpi 496846 BLAKE2B 9bad4b6f48a63ec7f557eed45d7f85b532b942dd7d1281eb0d21a67950cf75b707f8c79b409e0e00f207479356e7aba10ebb3d8d18352e6fb5b3f54aff3a1909 SHA512 7999d0c0e2cb8a9171b8eda05c369d31a336041a9e907fe36a6a7e3207a5f57a264f4616952a34bb762374e5c18cec1b2479278c05210e04cb4bbb3c05b5496a
-DIST firefox-91.0.1-sk.xpi 572090 BLAKE2B bc335f6b5222f8618360d8f76143925fdc1b4a11970c5dd9dd65a83e3c79401ac0ae4afb685e95e103da1bb6d750eeab86b5c0471e49ac31f6eb3242bd4dfac1 SHA512 5f851e8a755b755d5bbc7155eecf9c9d6c9e79fb6753492280aa43a00caf9b80a07540e32e48f9281f1afe68a920d78a72229f7809a974724a47d23efbf9ad24
-DIST firefox-91.0.1-sl.xpi 542780 BLAKE2B 449439702d3e4b04b45971c0461fbcb6014d7aa420fa9e85efb068e93482731953c6bf413b96f645ec9bc6b02559ef28ba254404040469b2521ed58be31d1109 SHA512 14806cf7a350bd7983d0c4684b1c956c933e332aaaa376290a0184687fb14f1ba22aac8388ce1d05b627dff763faccf28d3504402db7b001165eac6c790ba18b
-DIST firefox-91.0.1-son.xpi 432934 BLAKE2B f21310d02ccee27097da171a18abbe47acdf6494422499d4f1b791bed56636db5596540e0412d43ebc7c1277e90e4755a7148e00da05d344284511618affc780 SHA512 34811ead9fba243f1892bceab29e4180b56d997fb7ee7c48899485a8308878ccc90b239f3b2565eb4f5356d60ea07936f6c8c94c4eaa5d2526c84e870b93c0bd
-DIST firefox-91.0.1-sq.xpi 562218 BLAKE2B 09780c37d7323135c9a336c7109d4abf7c9cab013f6148639f1e0c7ed00fb884d1115952849ddac6f33762594784f46807b78e4ecdee845817e0d2a6729f5d4b SHA512 5e64a574accbb5309cb6ce5f390dff4327e5374327bf20e4ac9fb42ba41dfdb4466a2bfde8b6f8390b2ffe53ca11746aec9a4a0c8d47e0a81e2bd5da610120e8
-DIST firefox-91.0.1-sr.xpi 596028 BLAKE2B 732581a0fc2758bcd377a7b7222392d083679764d61b3c83572a2c5e066738c70ccf1663134d2ace5999ed9f5b0cb23b494cb9813e8fb476e54f34aa3588a43f SHA512 08770fdca76823c10da8ce6cd4cdb32dfc35568ee579f97e3e826113a3d82c01459ababa4952c82b7c4ecf0c31f74066826f9a2782665ad9667b18d0d7e4551c
-DIST firefox-91.0.1-sv-SE.xpi 546388 BLAKE2B 52fe3913d4772ab3e621aba11a2e2bdb2e85aa194131494eb385f19094bf80cd8ef540111e450e6982ecea4f9c80228679eca7c01a353bad0ac60d7912b55954 SHA512 ce0294899aee0b12fded3572a9a856aa025836e492b49cd76c0c636f63056e951bb95d25c6e9228ab8a157fee24875defd632b36fa67c175e7b7d62323c8ab7c
-DIST firefox-91.0.1-szl.xpi 522369 BLAKE2B 4f42ea144d7782084f91fa89649f6ae360b7827801e35d9601f7b61232e04e1965c25c55b453b75f498d5f0347a7f1c4923fbe01fcbdfe61ce44177e7855f500 SHA512 5aa722889837c58f2fe5156cf17c5f6ec2349af3918ee6f97e42c6954420012c8931260d16d1ed475ea71695c25b776fa1ded76d17ea29c3d0ed49a7bfbb0ec2
-DIST firefox-91.0.1-ta.xpi 523936 BLAKE2B 17a186aaedfaf2d6e516c2d17278925005b933dcf4cc3e2cf50af2bd45e90239e33d01476de13e8dd3c65dc3e08f1dba5307d684096bd7f29b94a1c03e5d6792 SHA512 094f7c7f511d1485c4fc21745246a9eb7d654f728b3208362dfcc8d2cf4ee09adb0e100f47384b44972630e4b7b02b674ba611e56af39efb2354ccb466635610
-DIST firefox-91.0.1-te.xpi 564764 BLAKE2B 4aa83a92482e5c285f71a4922a5de2b2aeec84d396b179ae08d1a3318aed85d6b79ebef7e9b75ffcf5f533467ca61ee2a0a29a7830c7e8954cbe86ac45cc1eb6 SHA512 40a41d3ae4e3fa8613481d29766e770ca57a9cfcdd90ba2632b99794fb9a4612569d5f3e774b0e7d5abc47b818f99ba6abd1c767b459e734eb2731c21dc1fda3
-DIST firefox-91.0.1-th.xpi 614163 BLAKE2B f9f98f78708c60e3e63c24641b8c06e954c3e25d92872177d492d5c90fdf64d6cab1823da8cb757dcb0b8b5d85bb83c97f7a6ed16835ab2a3ada4fe9520068b6 SHA512 0eaef5015db4d38948b794da0c36f0f5c266c96a224bd75c5555232b43a167c6c3c2752b68b919409d626cbeb51ccbd45af39eac0e70e8bf91c701a30186e98f
-DIST firefox-91.0.1-tl.xpi 531313 BLAKE2B 77440085b88fd315097eb2bf7294d2bead31c40e87d402699ef4ce97200a5c77435ef346b688f1de3d1d44492c51d611968f98a3ae1411897d322ff8f4be75c8 SHA512 0e2bdadbd050f7306cc458976a1e32e1242034775b758cc1c1da605f5500ce2661349cafa28f004a1d5cca56837f176536c5515f4f96a8c66d9f8640f88bf3bd
-DIST firefox-91.0.1-tr.xpi 558477 BLAKE2B a57e1834284d4a41d34a5500e332393410858067ec2918da4110ea1c58581fe0956b98e580a1ed7028e139e963e3a1cd03e1a49579cf360f3aa6a6cd6f217159 SHA512 a13ea02344dd369c4f85ff8917c20f401c9944b472e9fbdfbbba653c8cd47415b33efbc77b580954ed9f9201ccf23e72258e40af532de0678622275437e32b18
-DIST firefox-91.0.1-trs.xpi 503655 BLAKE2B 25a6acae1b111d3b1b8ccad18cf9949896996bce2eca82a09b01487caaf595ea18353deea4b6943051e9cc07b0a84249e8508837ffcb729c3576705ad213bb5b SHA512 6aec49222741e020db701fdc071dfb8a7d64a5c434eebfdabea003258cc65dcc19fe01aa3acc3701c79f0f1dae267e856346bc079e4fc1e1c37e1836aafab56c
-DIST firefox-91.0.1-uk.xpi 628576 BLAKE2B 254edaf0cc874886013a2ffbe5347bb9ee2effbd53cf021804a8c04373e5143d51e8adf12dd887206ad75ccc0c12d130e07599435fdecb4bcd26655dbbec69ec SHA512 c01e6da44471bb0c0e2b762e80dadb2d69c3fde5fc8bf9bda41f6dbb19f20c94d7977e9a59a28a70eb48e05a235a77775b9253d68ca9ae95fee9cfb5e1aa3832
-DIST firefox-91.0.1-ur.xpi 572686 BLAKE2B 1b3952ca3196f7cabc28b3f898b13a16d9a0b04c16234e82174d90d77e772f4a30e266adc7a60afaa5bb67b5e80c0119c48c3ded58d429cf0a01d8eee98ac923 SHA512 7e1a35fb4fcc674b2f01b6e708d63fd17d035bc779c3d595587c6df47c956619511611b5a966b3335ac3007e1975de7399f9cada7a413a859718a0ea407bcc6a
-DIST firefox-91.0.1-uz.xpi 480945 BLAKE2B c2abeafd1326d072949393daa3563abf0ba638ee59b811989142fe2bcab711e354aab074272a7d7bcd296f328b080fb7e43d06873ec0e22bcb800f04596a4b27 SHA512 dee6dc7222129758602be663bb17d0f5bd0888bedb516970812983114db988d4c93f5452d219b29d9bb9e0426751b1967ea053a87c533f9cb8a56be66400c2b1
-DIST firefox-91.0.1-vi.xpi 580493 BLAKE2B 655227fb4bc61ecf7214ed185c6ff62cee36da6a2ea386a8979d738c40f05507dbd7b43610f9e634b8076002b7f3f3206ba776a8cb773af9bfa9e104e37c2b1c SHA512 8d18c04aa991c0d5b39303b14249c25b6d11adf871250d1639ed6a938d9a201dda08c15c56ffb4ea16288ebbaed0f5ae5b8c9268c6e4e0d936a86d9a2728b36d
-DIST firefox-91.0.1-xh.xpi 435057 BLAKE2B 02b8cd6ccd064c43111158efc842f305b497af8338ae633844dcb0c926dde913532b1df213b0c9f420a5ad9477e6ac26cef39075c26e509a76fd1c355e6d989d SHA512 01e6af744a5f099a79b6bd2c124a4c203fc494c8f3f63fa5b685581a258d504475b29767af5368cd4b1eaa5958fdbf17ef65d618613f720dd2b3289a2b304c55
-DIST firefox-91.0.1-zh-CN.xpi 581947 BLAKE2B e536cd392e3eb452f7de9bb708974412e9e34f862fb9213917df4317f331005f29300e7a486302584a8c2e59c03088b8f4a1e3d780549e9006a62f22a495fdf3 SHA512 d2f1767782b9f9a3dd545bc3fd98c08da3fc9d4809c5eaed088518e0fb766813acfb498442486768aa90f0ecc9ed9e787b805a268c6a03a8ec381493ed694e4a
-DIST firefox-91.0.1-zh-TW.xpi 582122 BLAKE2B 1cc357c92eb9a3ea42fc1c30e9aec966b6368a6c0ca60fa41415ff561d86cfb7e5bfaecbc69bc99b2e0ea8d93f0026c0c48b41b0fe06df5b784eb76bdf25583e SHA512 9927feb39e7bf343414065d0ed8e308e9c754c393d59d0ad7fdc8a743d20d7eeb315b1fd0a8f5e004968d99ce2fb1cac3344ac973ecb31257ad8052612cd0f73
-DIST firefox-91.0.1.source.tar.xz 389052264 BLAKE2B 5372d65561ef5f52b2d71d8b9401c2402413fb5bc027167356bb491ca3c979a5516da11f9b855a1d796146640a9f1308e808218099cfd64f9c3e61578dfaf348 SHA512 9388789bfe3dca596542b082d0eca7b1a6d1bbbf69eb97cc445f563d1a5ff0c9b530f3be02ee290805e311b0fcb392a4f5341e9f256d9764a787b43b232bdf67
-DIST firefox-91.0.2-ach.xpi 465284 BLAKE2B 1827b3beb7ee055d363f3d993a02a732363e0a8f37cf9ca15fd97f0702779a7a1a2ff4a7594b3c85034db42f3b50124b4cdf1e2b38e0fb01f1a7ee16f83f00e5 SHA512 6f9016adcce981dfe122282e5806ea690e615af4c2542f996813eeeea81bea81ec87eac38f12baf9e0daad19af546a65753fdedc1cb715ee93ab30250dd8ba78
-DIST firefox-91.0.2-af.xpi 433156 BLAKE2B ea445ac7e7b0080ee0b454a6839ef378359945b9aa6fe9c8e99accb8343982127cb42d64a7ffc1f24edd5f0358d3eedfbc58828bd1f3a37058ab41dd160db5fb SHA512 89866a7e818ecc53674b1bcebc7ef36af7b3ec8416cb8ad6b57f0ab4ad9a1445e99dd203aaa52631c5cbb9265adb9c13197abf593f0c5a4849660f40afa3e122
-DIST firefox-91.0.2-an.xpi 511823 BLAKE2B a0aee9d410bccda629ceae7cfb913519c31317bf2dae6290b36b764219154d4a7bc17dcabab0d7494b525edd374f5003f00acfada79d3efada0676a73c593963 SHA512 75a4a2ac929a629fa1392868abbdab4d3f86f94f93c15fa8f8029c84ad5c70054153a85b7fbdee47495a25efd7f829cad3992b3e87fcb950607a70fe58f1e48c
-DIST firefox-91.0.2-ar.xpi 573962 BLAKE2B 7e7cd41eacdeca1773d3bf97a15270249b4514ca3ce30bf44d2ec3ac19394f0e1eb1f0fafe991ae850bd35fbcccfadcb9a469f6af9ffae7c4fae9a8d9c3ef22b SHA512 2dca2e3828a381c08e48f5cf05449a62ce41d2ee5e86e5d74c6f128458e2ef7f748d8e93486dc40b942330e2481dc836bec38caaa957d18b512a3b48421f914b
-DIST firefox-91.0.2-ast.xpi 502953 BLAKE2B 129f446a8d4d7d704423426a22c2fc0fab4c11bab737f1395a8bb3f9b0b9071942e4d076e98fefd487f673da7f5fc7a7debd701764559132be8dcefc33328b5d SHA512 8af2bf2347ee42566c9e36872890212a08ec66c4b1d6eac97d43212d0b05617e5fdf8504eee6087344b4b4cff05b1b1e23b1433fa5fcfb9df6df7c0b8c57259e
-DIST firefox-91.0.2-az.xpi 500888 BLAKE2B cfaf3f2be8c9c2a99c68c91ecb05e2526e0caf6e80bf955708d6c6f35e0eb789ed8865e2c0343830865a201defb42ae1a09df8895bd38a1bc92c25e573212e51 SHA512 2e25186f03ced1a2c817dc05bef502b5eb62a46e58a42ef31f5fc8b1a6747e57bd2c132987e08aa4aea30745130b818c2acee0a685fb506d51964f6ff9348823
-DIST firefox-91.0.2-be.xpi 630158 BLAKE2B b01908e7234c26ce6bd1093639e6ffb9f184fe6bc9b3389bc70a405109dca768f98135e22989e7e071d6e49a61d9e5102d14785073cec6f458eabcfe54c1ac33 SHA512 589dd1b63468f2f6e08b769680f8217f21d73a2b16257eedbd5f100e9d17591476a7572a04e89c3a14e9d63662fd62ef9c56e9d756c2172461af015ea7bef0ab
-DIST firefox-91.0.2-bg.xpi 585089 BLAKE2B 6759da23207731cfc0ea46a14f64863c97aa8e1d4f030664819407a91c37b458b64a3fd6902f005c070aba5bb9c42f7dfd4f5752bde00277147670b728b647f8 SHA512 945b973fe302fbb7344e6152ae5680927ae4df45f9b836b79e9de89f0739a162a41565517db8591abe09762564ed07709c3b7175d89803df27b54c9308e5da2b
-DIST firefox-91.0.2-bn.xpi 576482 BLAKE2B b3c12715a82cad54cd607c3ba4d97f8863850ba52bfd48395376f48d11b7fb2854de003a4c497cc5af06fee31e52d9e5ebf150f7c28085b0e5033a65ab69d7d7 SHA512 899f6c151b0133d18516247549651fc0a008d2f8a5a329976201f5d60192d3715907c56848933c3f03883bbac86b1e933414379bcf207ec4d3c9ed1639e3d745
-DIST firefox-91.0.2-br.xpi 534790 BLAKE2B 66f419ae8b34b69c76e192f603d7b68aea2e9883fc74e1f24cfc010a5465cd3750310b29d06d674d861d634117efcb09f18e9fb186c12131a80db00a5bd95540 SHA512 6f97876cfa656d181c819beae2ec0d08bb13901538df0e5cfa27abafcfe43660b49f1db9e4dea3ac2da38f3a7f5925341449ca50c71cfffdf24aed9e93a94120
-DIST firefox-91.0.2-bs.xpi 473101 BLAKE2B 6228b43cfb0397be9d0303b84c17338a338e4c84ee05e578714b9212812066d7209ca11bc80ab16308a53372b202fe60fccb7792e520e14a0c3e4d2edf9ce342 SHA512 d3cd6bb28e5adc4a8effa3907c4843813d583a2d4a04c5ba1371c9b9cd086c38158b7aa8baf2b91c1f917b60b79fc2214bc1b956cc12996ba1d0c58356d6b261
-DIST firefox-91.0.2-ca-valencia.xpi 543235 BLAKE2B 80fc2be3f773136a409cc231321b21db4a7fcf1c927d460c4c10cd47fb14bffb9915a3d792d49646ea1798f164a7a00c994aacd376cc11c2d7634fefcfbd88d8 SHA512 e0a6e8d39d11caff521aad0fed3416a16097190b102db40970c63070eac4723831a428425abf9d6a1c4fb47ee18ef63cc3a7ef829938b528646f3ac14a46edf1
-DIST firefox-91.0.2-ca.xpi 541005 BLAKE2B 411c713142c91d73902d09667a2ee058a8f13c2ce7dd2655655a63e349176f15d998625a63b1b37e497bc5ef053ee5165f8a4552738ea1b4d92f541e955d68c7 SHA512 782878ed186ddc0e64aaed91c66f02d4387b2493f81357d73e6a7c2f2f5612929f6d2fc955b927dd7d12ef5e18f9890589691ea834ce6232aa60474b11e66d75
-DIST firefox-91.0.2-cak.xpi 568042 BLAKE2B 24f066877199909cbc65ae213e53f53f9393347d8ed16c09c54e9dd2e344715ee004d273e8a8720b60f71f993a93b986d0db80434e66ad9aeb7d998553ef5491 SHA512 14be651ab88b951617ae1f60b35ab61f4241268d261d9cbe2604e11bf2c4d0a8ccbc16a4ef980d88865d84112c4ff1577e7002b57a4af3cc1d90ccbf0693eb21
-DIST firefox-91.0.2-cs.xpi 571515 BLAKE2B ec03024b6e69364913f952b4ba56b7c4695f5067c7bb1115d7c27b1cf8f04abc7bc5ed023c3c5a6c673ee99356bff23af160a5ae642e741cb2b98b637fc9ed99 SHA512 b47773ce2f19f5e44de7ba59d27b01a533641d54b0354a2d0c1b4e6455f9ad9b8485f72dd03d2081d7780c2221c154b117b0f14e6669b2774fb11b19e1fd798b
-DIST firefox-91.0.2-cy.xpi 548289 BLAKE2B b0513e5f5eff768ad4061125a6de882a5046235115b115ec6da6e9d308b844a51482a189225c50906f675b7e47fa51cccd1028385ed69be809cc5ec22ef19ec7 SHA512 8eab5988490e1a0f396290f399ac47347bc269ea6ba6676a9e1ed6c52f9beb494687e1ee60eb1eb1b1a280be551c7c784a47925ce2652b4cac1cccd3712e14e2
-DIST firefox-91.0.2-da.xpi 540522 BLAKE2B 5c33f02e1940e8dbef839967276c9fe8fcc8011f814790825433c6960bb35e9d624af4c35d615516e43f5d65a2320266612d10516ff0d209ec49396f6154cd28 SHA512 50b8d81b568e1c29cabd304427ade67fae622d1a1af589773c148c9c2e45651baaba6b9707bbd54b1f103cbefcdd476ec5623773a9fb44fcb8c0a4377661e001
-DIST firefox-91.0.2-de.xpi 560089 BLAKE2B 47647865fa91e22e601b52ae2bcc8f2ac91619307551ef3dd260e258f7657d8ee164664eda40354a30e8c50be94402dca56b5ef9c53a2bc463c390130c8fd46b SHA512 8267c893cebec1cb3198045bbc5ec2cea821abbe8ade3488eec27b1d599d74de87df4396b686b509866f850dc3b996a0e665f8ff1e3b510f08fd8d7a9035b39d
-DIST firefox-91.0.2-dsb.xpi 572860 BLAKE2B 49debcc4b22fc28e7bd2b951b59898f4d60070dffb50f851759161731dabed3b8750424cb5d5517c9f71ef7c203b1f26ff370dcc0fdeae11fdb2a9606be4571b SHA512 bc045c295d4a33507a4037003e3dc32cd632d88c31c89b10543e5ee57b733659bee5ebcb45629fadf79ace5c6a47fc3fd9cc06aa2e75ac43edc3d32bcd67fe0f
-DIST firefox-91.0.2-el.xpi 646568 BLAKE2B 50a0fe00c2b14556f39d501232593289585213e66b65897f630e6688e1a3ab4b447ccd1634672148370c325712510e7dad884872360e8d8744db8901b51af849 SHA512 0e62e049b3a51ad1f2a2a95fa5ac62996a3e56a69a41355bc74e6af9ce487ec98e89a15237b351878c9a90f34f0ca5ce14d6d27659f432eafd11f960b4fa21a3
-DIST firefox-91.0.2-en-CA.xpi 515736 BLAKE2B f0de88e7c171910287fe40048c3c4e70c65856e6c7d6af06ff92edf4b0ff6600678f0f51164bb59b2315187200783068c0b28436d50004e64b944dc46c086684 SHA512 6b9b6a4fe029df7a283d78237b23f69bb57e84ff60055843dc422795dbec4fe92a396344c0be2467be7764d30f19d993c4af01e6935da688ad503090714ca610
-DIST firefox-91.0.2-en-GB.xpi 515982 BLAKE2B 034e89bbc4419c77913370b19f587b437588aa7f9ec27a84aeba27887ce2e31e967d695d67ecb725b31ac0d84e3fb56eb34491927cb4604bec658883a55f6a47 SHA512 fee033b59fb4305a373a902519537ef3293c74ad5ecc5016ce499bf845400d34e7ae5915ff5f95a3384f5eda20ddee97578f9c1d8c7f055936c4800e5341bfbc
-DIST firefox-91.0.2-eo.xpi 542048 BLAKE2B 374f51c5979d382e73c0bc4cbe7e4ea66112b4cea907f71cb140515632852a686ff0f3a1febd0f74e4c2c536977e7aec0c0eff43f33fe61ebaf3aa96238dc0c1 SHA512 cc0049d2b4b90833a66affb778a3481c1de0816bda7eb150616562c43fca9095d2d5704cc4c9edf346f29e30471c83848d15500a319caea5b04f7df8c0461708
-DIST firefox-91.0.2-es-AR.xpi 553517 BLAKE2B 311b2b0e5f4c0704b2bb993bd9da749b84c4780fe0b4dbfd960c11f6c0e33ac5b74bd7d88bf0e8a993019f52e093e5b5915d6a05660a655fd189363415939730 SHA512 792532867883d33fc234a204291c9966b06870db3d15d8710beba6be7892ad5d7ab0141191390372b44042f9ab6a3ef81c113ab7a6a675306fbdaffd2b3378e6
-DIST firefox-91.0.2-es-CL.xpi 552534 BLAKE2B 48891168c9de04fc35ee63cba20c0f0c03ae967e389a5cfdd6f6984663ccedd28d686f84d8ec4880b41938a5e64833c635c51b9b63c247f340aacc010beb2aea SHA512 e774fdbdab10bdaa97d81a8e05963b60921143aac2149cc03aacd0ad8b89689882617ad3052b78286300a2d8c44fb549577cc84d78048e725a7ecc1a831470e4
-DIST firefox-91.0.2-es-ES.xpi 542522 BLAKE2B 62d28273362e360317562939cfead517c5da7fe2d38b0e13123992e67dafe5ed4c06a5c426a28192719bbe6aee6cc59fc6d8e36bea10f8e544ec35e12c62b0ee SHA512 c50e56de633f981f0e8e5fb0c82f5ea0e347d71434bd467aa56c131a01d605b44f955e6cfffddd0e9a7a12fef98d811830d032aef2ede7a3b8576ae164e8ccdf
-DIST firefox-91.0.2-es-MX.xpi 556676 BLAKE2B ed87e4b73f9827a31c4b257c797f5b117d37f436ad7876f6aea71052ed858b700f535597372a49db9297bf51c8cb2c3a053661642fdbc228beb85f63d6542c65 SHA512 e07113691b8fc1a6b798dd8327f95d725f635fac7e198fde00f833528a073c69eab6b88c7e1d4c50340475c7fe2c1416498ca243cc6843bd93da8ef1342db95f
-DIST firefox-91.0.2-et.xpi 494142 BLAKE2B 4e8ace24cde2baf4826334e0fb7ae7209893bace1981f994fe3dd1c9b1cb4e7384eaa68db7974a8dfe0db2cba6ee468268f0852f47db81b975b02cd09c77185e SHA512 1f53ae61a22fe59935b7b7be506f466909e27ea3a541bcf36174ceea89bce56fd35b15372c7adecb92173e87ca0706c1bd39011fea40c136768410d9c2d49d8f
-DIST firefox-91.0.2-eu.xpi 539046 BLAKE2B 93cfe5c88109054e09fb0605d998bc4ebe9cde572332ed6fd8cef517e5afc50596175a08cbd041dceaa056c5a419cd494e6a75a2d19c54603b9d48be5b357424 SHA512 61bfe155b5abbcf15739576928e2f4f84f4898911fb862d2d51d45d4648d0f5ebfc7fab0770f64b295dbf604d6772883884d3f908dfeffbf6438f44ea1078f63
-DIST firefox-91.0.2-fa.xpi 561638 BLAKE2B f277a445a109761dea17a8601b62c1d03a53855d46ba17c5129aa5732695663499ae86ca279a1581db2bde6ee1b8dbec09506abb60ea8c39dd4550bdf735af8f SHA512 c0821849b254977c6002b92f0a48020476531f6485260155ef103e4564f6628f3b097c24877cb86adfa6ab0afaa15786924e65e3f60a2284753f7ba52514eda9
-DIST firefox-91.0.2-ff.xpi 485699 BLAKE2B 1d372646848dadb64a1ea0f084e762b8174f6f815fedd265dbe0b70af07a7fc472cc32ae755b18e4b9af8257dce5bfc18f67526a997e17734b4277573684b310 SHA512 bc34242897070e8593f8024f795d18e049fedd448d0084aff7b7d4765bd4d9b9458bb692cc54eae15872ebe7d2f22a00e732f1093a7628e216d4ccca0ba4615e
-DIST firefox-91.0.2-fi.xpi 539811 BLAKE2B d09217d946f8fdcdc9dd41b4d5c5bd9d9d30a37a1e1d4cc85b37c90d5e3a7874aa58c8297c7fb10ee437f738cdf64fef338c4aa0d92733c5f2c4a9aef877e0ab SHA512 4d87dc2bcaec4b3a1d653797fb3a56a609931ce3a24ca277fe0a050d0fd7336e5ddef881e03f7c161184c857aa0d361a7b9c80258ab42bc4e9fa73d335a8d8b1
-DIST firefox-91.0.2-fr.xpi 564055 BLAKE2B 7e6538a7246179fea01b20361334a7ce429e73f6cb7537c096ee512acc77192dc0e39546956c1cdffa9b497e4d14ba41ad38c5f5b583fe42f57032356086df28 SHA512 aa25c36a732d512c4d686698f69ed1467d82c02eb4476d8117959683f7aabd1ca580019e0450c39ecc95916b9e2765c4eeb5a94774ef3ca87e047830a8756925
-DIST firefox-91.0.2-fy-NL.xpi 549221 BLAKE2B b8b836dd7fa5f4f9bc0fb5ee9620db0ad2d1606ea26f49344433fbabb85321cfe760412d02fd61c010be25bc92f8793101e341527b8770375a20adfcc3c25666 SHA512 b452811f1fabc0240141996c393d2e0bc04a6d1163aa32e9cbcd381f2d505a0cc6b4d82192dfbfeb671346e111db16bbd6bf73712ce7015a3c4fbdcf438a0b2d
-DIST firefox-91.0.2-ga-IE.xpi 470699 BLAKE2B 1da8c8d70e28dddf138b6750b6bb5b03ce95349e1108f14e395993aae0c9c2631b40742b10ff4b5763e2d5c145fc316ca2394bf14715467e4ba75b542d51f23f SHA512 2d7cafdf455cf805ddb522152238dde6261964399f60bfaacf2c6cd70e54c047ae70fd0952254d34b7b1b4f9c85162687684f5e66c7d60ee0915571b96c78c84
-DIST firefox-91.0.2-gd.xpi 545686 BLAKE2B e6c5552211ca1b07426ae79e80fe9be7fb516ad831c4bb303f0aa1bb7e3f648062d0b29c9a617ed2bed3310dc51a28889232b4c413e93c6623126ff4fdb7a075 SHA512 5ebde92fbb0697745e8b8cb4d0eb40581a2a54f18fb967a90cbe7d90bf22ab9b1a40d04f7a52f1ef96c349167a4a50ef02476a68a5bf5d9fa911893a3a90f37b
-DIST firefox-91.0.2-gl.xpi 548390 BLAKE2B cacc1630f147ede28dab1c47d1eb4442077d0126fd5e02ab06572f33004e50f43a0a7365ef863ff0b3f983041b2b915cd34ce674c56602616912516dab39adfc SHA512 644cec199ab6f9919b82b3d903cda3fa12557c9e7ac0df4e4d41e854d04f54fb98775e80d052aee6a840c1de008c83390c4402cd3a0703de1edd94ec7ec37a37
-DIST firefox-91.0.2-gn.xpi 565276 BLAKE2B 7053cd1585af3a9f755a1f09132035e5b3e39f9b293364a411028fda8382dfe9ad91970a748c52dcad35fa526ddace25e0e032032dfcf8cd2008422b54be5117 SHA512 ca0476636fded14809fbc8549305b7f5d42382f973704f04fa6bd1cdfd378ce4340046a8ffc7959caf5345a5955cab235834d7830f77717a759e9404c8b74ba2
-DIST firefox-91.0.2-gu-IN.xpi 544513 BLAKE2B 414c5705c7b9116754c7a64b9b270d5fdf08589e50993643165c61e2a0874eeec5ca11156c9dd8bb7ec2edca05ba0c476f4df10927907b3a10aeb4f4a6a4f509 SHA512 2fc8ba1bb037a70e20c3914f304aa8798fe4f7bef9814d73f21df7e4deb2abd708ec90fe8c257640d66249fb21efea3226564416d326705f10258defbd84ccfb
-DIST firefox-91.0.2-he.xpi 563140 BLAKE2B f4a9fb78602318778be27806f67afc4d638248472386dd5f1140cda9922a3d62439d06e1ebe0b19ed8adf86f256bac14ff7cd5a53e6fa82ab05b5f596813e2a1 SHA512 0100acf0f6cce50fb382ba9e70c5b95e3862779308a6f6038726914226f1948b556335aac498f2737217f0a77037af2545788515bd1ea643af37c855ad0833ca
-DIST firefox-91.0.2-hi-IN.xpi 575682 BLAKE2B b93b1cfef22c48dc1fd7c1b6cf2f6198428aabcd19a002bd60c2b17e14cfa68e93253391783c179f20a4b619cb75ce2b4b09a58228525f73c8c9376075476bfe SHA512 8f9b0d18fb1ccac2df13faba3b84151e222b717b0110f3bed4b3800848bfd165c42388e3e81a76e7bd13356cbc1a85f4b6b8676f2c0179da3847beea5c7610cb
-DIST firefox-91.0.2-hr.xpi 544093 BLAKE2B 522e7738189dfdfa741bbf6e071a2a0af759830b9ef055d6397f22a95da390e6a22d6d08e4c5cf61588d8d6decf0e986c80be0720640c56d5081f9eae373bab6 SHA512 3284e8570ed98d6d453d87fc3d0805015b5219c4dab9d5413622a5bc95ff6026811b30a6e64546b138884f9e1bcdb04144efe6efaca6666ad37eb0a89ec1ffa9
-DIST firefox-91.0.2-hsb.xpi 568931 BLAKE2B 02948484c3d21a10bb1811921fbcc9a2e1d549358ba0436d4958edf85a5f3b5580d011ffa98c154c79c2349e3dbdd04f70993e70a62aaaf3a52d0a36d94b9540 SHA512 2767920e501cba28b842bb358dadea7a9b992b7324186dd1b4e6a8f3da404aa682a5f1e23d05c3c3ba79d5bd0550ed6631c07ceb3d35ec223974e6608c778dc4
-DIST firefox-91.0.2-hu.xpi 572766 BLAKE2B 85196c0e3107768d3b50c32d12a44156bae2ad7bfecd5f3588c9fbba4d122da4d8fb09bb2e9582a7c35f19e74f8622bac6e791da022f151e37727a5841c1b6aa SHA512 15be8f755bcdbd1c3f2ddb5f5e6861bb5b5eaac2fe6590c117b48d2a3dc841356d96c1385569a54eefb4232f3e0b9552f0082e9921f5dbd62a85e71519b4552f
-DIST firefox-91.0.2-hy-AM.xpi 599014 BLAKE2B 6a08d2427f3ed840cd88575d84e862bfc46998e6c1f5c51ed975b4e7f7e2f8bff373d11b59c71fdc4da34ff16cb4ac81ee2f803effd7e8cb4095086f6c43ead0 SHA512 6d6edbb1cc88a9d4af446f7979b559ec9fa848e6c89d45f00e0cd74278f2c0863bd1f7c78710c0238fcac7dd9fa1f62e79d9ef04931bf2df94d1899eada3c913
-DIST firefox-91.0.2-ia.xpi 538523 BLAKE2B 078f874a0252b40d0817ae333d157c0f18d9b3f84da9778702ef2ff96d55bab94395cfee04ae8b292fea36f7c8f7f3e62aea63a4aa4534073525532a60107760 SHA512 526712c639ced83b42602d160d020d66a1b5381db15e3be500d121820a697c48ba961ed5b874003e1df5b819da28107f620805b630b4fccd85613229841ebe47
-DIST firefox-91.0.2-id.xpi 533874 BLAKE2B 165ddea29605321b3296ade87e8cf276fecc45848b3df036527eaacb566ec3b44ccc5a90611a4f815279e0aabb06eaaba6c8b432460bc6bed8d92bf63247b174 SHA512 333874f55731dca69937a4f43fe335c0c066af4506955af8eb3da82764c5c05394f359429ee38992c51a714c7d7e0f4427235d54c52f176865a03b291dbd0bf9
-DIST firefox-91.0.2-is.xpi 481340 BLAKE2B bb8c5840492f47ef79c763e2677fbafcfd90b3d16c54f9492958fae73c12f575265873fe310dc9010fd55a62d42c74572351a828b78edbcd479aadaacba5ff93 SHA512 d74497fab93316d556002558768bb28ca26d39198d745e9d252b6c97a46179e9a33a207d0aafca098ee83de79522d5e73d75e1fbac3c0f83ebbbacd3d2d0a7a0
-DIST firefox-91.0.2-it.xpi 467043 BLAKE2B aca3186e0e425f0532f9be8c647c44f2edb934fdebfb0197d122e921e181093ff38485bc9f9e18e32bd2d3ae68a23219def152d00d0d435b7b643832d635b595 SHA512 070fadc60b7f06591a1e9714a12f3f60be04f6fc42ed4ff8713d8755fe39c1a99345f8e9fc0bdb94a825e5cc582e7d671275946a125597f08c57152927bbddf6
-DIST firefox-91.0.2-ja.xpi 599312 BLAKE2B 4535634b3469ee7e76f465ce87cb82baaff44bc69bf9b95c7691df876df4fe91bab899c48b3bbb2b665eef8259aa83251aa3c184b0296cd431a8e6c6ff82db0e SHA512 a1e813820de9b5e44d7adb18f1451c55e62924ed769e394b9a7b38ff24c6a96e49f674402e76b53eeb43d19e597f7df9083f0158987462157f48940808d6f057
-DIST firefox-91.0.2-ka.xpi 600142 BLAKE2B e1a2ebaa905ae3432c06f448f4a2e4414caebf92148abdd52d8077784f5d6d5c63770c7c797d5bbacf206ec7f5ed6410dfc3315229f7e13f67df1b225175a434 SHA512 d99056aec02d3c62a3b6fac4d44bd7bf35edd73de32500f9dcf2ac5320d6fdaf93bf495303873dd725d80651d393786a3fce5d7eb68ca5ecfaec5be199c9f3e6
-DIST firefox-91.0.2-kab.xpi 557813 BLAKE2B bd0baf375f7318ce8f88883f52368b0d35132674ccda5905e2154b03e493db6452267069b482c290d3db005bca450c038257262207b2547872d66136a0d864a5 SHA512 3afa8920925b1c54d7b37b26056bd170e246615544bd4e3efdac9404602e4c17d6b7f019c56819f4dbd53505bee220e7edec91d85ed442fbebccdfee7130b6bd
-DIST firefox-91.0.2-kk.xpi 614348 BLAKE2B 8cca4eaea30764e7156c55c13118d5ca1d9dda845be7894fe2bcfc734ace1d967e984cafd8e1a522298032a7f1f345847d806429cce0ea157ab12566c8f70d06 SHA512 12753ddc8419b830a0e6af938399902da277ee375cb29a144e32c1a71c5c5cb314c308ed1283bffea4127b70e5dada7449f141455fd148c0fbe0d85e56a817d2
-DIST firefox-91.0.2-km.xpi 544983 BLAKE2B 648abe7d2f3c4dfab206330886bf64e9e5e6a121612ef8589bd6f9bb2ce0f74a2db5336098e9f7b15fd959bc562be7aaa6e5c957f7b601ceab0f06be9eb5e7eb SHA512 5dedbefa7d088c87c009263ad6bf11b3c739478fb993a1b94fa10fa5d0e8771fe92db7548e52618543340f7d42774faf15a9ae834011577ad6a4f45d113163d9
-DIST firefox-91.0.2-kn.xpi 508521 BLAKE2B 70d6936f6b213428e3a09c94d6cdf9ede084c9c96dc0dcf43134bf31f1bbc356cc69354c3a6e9780b5f208e6ce254f7e307d31f39d2d38660260ad374c438b5c SHA512 e9bc6fa8cb3ebc9cd5d6f289b2d7f31a8f9063cf84819cd5e56e43db7a2d864ce2fcb09cf6602b53dd6cff595f62f50caa60343efd2ebed84c0c87bcf92c838b
-DIST firefox-91.0.2-ko.xpi 584343 BLAKE2B 58a4c560788b2b8f9c7e7f577cab11c7ca34cb243685bcecab8b8a5453f8634289b61b30c8717d2487d3ba10f59bf76a09af4e156fa7cfa4c2b7b81453355638 SHA512 7fbd65d20d1f72f6ce83b8efc2d2d37515360060b2a58d0395e03eb297aa136a13f919187b29027512f7558ab489cf73d7edec344e37a91578a2c03a346d2f7c
-DIST firefox-91.0.2-lij.xpi 481930 BLAKE2B 52dbe2aa33ce053073c0c157471d5c6be9c94743ec90523687f8ce70da96c17f64a59a1cf96c78f810e86a64b3ff573b366742184f617d7e4d713b3a8c85c564 SHA512 463bfffdae4e4969fdf9e1629dc44185e4774dd786d0a072b4ad3214230f0f6c8299b129b1dee1859a626cd2233e5c0af60128651b7722fb50b7892bcc873225
-DIST firefox-91.0.2-lt.xpi 567603 BLAKE2B f073ef003588d3fe0cfee368ddcfffbae6ef0b1a233f4e0ac9637b76b4724db5cc2452373098552103523d28426e71c6ab88149f0599cf40040c057dfc61b45c SHA512 664557a9e4d05ceac2fac9d51b89a672824b83eacfe14744cbb639866ae0efdf743c6d245f5c870dc97209b015ddc9ccc2feec9b71af717355f5073fc0fdbb08
-DIST firefox-91.0.2-lv.xpi 473333 BLAKE2B f53f90bb380bf60d960c998affdcf2d250fb84da847a6904d67a54f437e0e0c522346276a3db6967d5153998ddccb1916a98ff70ea44182117d300f0ce950582 SHA512 d59618421f4c3b8dd85e8a2eabe08c3a858eb3c8a06dec84da7451c4f12bd0a1161db3b300bae138558b552ebf5bcdba18494272b08871b4d7d1d05d280c7c34
-DIST firefox-91.0.2-mk.xpi 473479 BLAKE2B 6ff5f26980802fa7049fd550e56215807dda08fbf248f77c2d4d06255bf5d7c2897b5337582276b14ce7b11692c04c442d746559ac04b5d901dd6e53307e7cc6 SHA512 f8902b73f7dc119c960bf536817c47589f7d9bf4fad73ecbbb173bded865e96beeb1eee891ce69d4cd7be0732f7f07bf5a43290d79e32acb3b1d77ece720f1cf
-DIST firefox-91.0.2-mr.xpi 544869 BLAKE2B 8063812be027d53982c5b2c52c576622c4b5ee8add2deede210c70eb3a9fa77b4b82d8f78c2277cbcfec64955a76ef7f91d290b354aa01275c6d98cd15211b6d SHA512 75a95bd65b7caefd471a171fa56ceac1dcc73e65fb62d89af71da608fc44a802d3e239546f78340e9d61335765183dad85f1593cebbcfc7418d0e467a041e3f3
-DIST firefox-91.0.2-ms.xpi 457203 BLAKE2B 459bc8db9573053491d7708cf7136fd8b25f0ee406f1058d49b46868242ab2fbfcaa00fd5dd97bba830dd4fc3d98eed944adacf7fcdc3219b35b438bc76625bb SHA512 733971750312670a2345c3724585991e33e65d17126bd699be7c115da6f814700db01411776ea25adc2ee47ade78d6f8f18f4aa0b5e301dc749de5c1c2fdff26
-DIST firefox-91.0.2-my.xpi 530145 BLAKE2B 42909546ba46ed0e12a93703cdf356407e2b1bd0296d74748fbee32415bd1c8cd647602c7c7312eff94b31ef27fcfe9fe947dbbb999c10978c06027d6f90efeb SHA512 c24deca71aeaf03d083767b37758da97c20b735973bc7373d791b7d4f2d70175bd243b4ae8b65d3fd277cdf43d65133d7c536dec6e23aa395e68547176364ef9
-DIST firefox-91.0.2-nb-NO.xpi 534986 BLAKE2B 6393d435d9bc7f6afd76def4ebb3a03efde327a3bb8a3fd84eabcb485d4fd340bd0dbd84918102ff10fb9b5e9f3a5783d2404010c448a3eab34e0fcc5084b35b SHA512 bba89b13817da879d2fbc029dd42753122ef3ead9f24163c57f6e56daba4d83c69ec117dc729a87a8d217b073e0f623007e05bb5f15c5cc579a7a0c254ed9ad4
-DIST firefox-91.0.2-ne-NP.xpi 486178 BLAKE2B 22793df48a5a2f62169a441934aa8975470f7765b32d6097b19320c3cb4e3890cf95f9b5a91e7590781e342bdf0fcf26ce4949208fb8ce89001b4d3bf3adc5db SHA512 d4b67b1fde7c386cf0df744194e72df12e0341b85678378762d15ab86d0d9d1e03d9d251705986b5cf8bc67aaed54694d719b73426a2911b0ef3d1d00b76c14d
-DIST firefox-91.0.2-nl.xpi 543375 BLAKE2B 7089b4c42afb164560e45727f655255c8f6d0c0530dcd18535524520a9b011aa145f097c0d260b5a16df007ecca58dc63c8516ec55aee2559a5217b120c03db2 SHA512 5668f48b70798f5da84951c1f95ab60ad2d7e354abdb75546684d0df2749381c68ce0d3f8e481c29aa9d7e942cf092aa03e3967cd914dd8abd5c7f8fa7ba7366
-DIST firefox-91.0.2-nn-NO.xpi 537542 BLAKE2B 9bbb693c26e3776485d816cd032ecf380f3dde7785b9994f56c06d194127993bb22624b3d5a2d9e7c300b7676f9d1e8cb9627e9929cd80bce39c030e656e6949 SHA512 dab9c2c2bdb72fcf8463d82a351746c9cafa4b3400493098d8ebbb5c611a6b0563d070e36d7cc659351c45212551e7e77af023c91e13691d88a70afaea169484
-DIST firefox-91.0.2-oc.xpi 559028 BLAKE2B 341ad88da64ac06e86cff2ff2f2b3a31e420a1529e64f0b626c0374272d123a808cf47aa30104bc3821488d1051f3020fdb5a91c5ad590069857029b39d64038 SHA512 7fee4a09dfcfdc84372faa8ade371441985d235c73e1cd0349c7ac8d280ccd5f9ac1efb86530cb5dade4face156d6299f8d14a0b3d7972a49898da56b816a5d2
-DIST firefox-91.0.2-pa-IN.xpi 605086 BLAKE2B d31232b6ab3154ca7c1b4f69308c24fd9fa7ae5e367e02d089cb8f759ee95397b504f6a94c059b6c822597fecff69703af59cec5f299fac62b97c396ad132a06 SHA512 86a98ac48c729fb308ece202dec5116732dad5b13c75a8fcb6dd4a3e7f1888f432a5aaffa0b4fcef7de409d3f5d2e6e32c4b762f0e0c2e932d5510361835d0d4
-DIST firefox-91.0.2-pl.xpi 562852 BLAKE2B 45177be1a73deba99c21c00e92607567384fd93e632803b4babd3f6d0b2d4ee7106bb3cfaa713b44efa0f667bb524c0d4b0ed14f2cf3aef2ca46869e5dcec60f SHA512 913c5fd1618e09fdcf404af08754022249ac4dc3580efc823a3ffa14876eab949b28c41ea99d291d59d0012cee5306509108ebbcfbb97cd1d3396f9510831d09
-DIST firefox-91.0.2-pt-BR.xpi 549002 BLAKE2B a12c8b2d7dd6f5228a547a79f5f6527cbce47b599076d372d87501f8b965299c538072dd1845efa52f94c579506a82129dd5623d3d66ec8f7a325aabbfa63d9b SHA512 4de795d87061b9e4e6d484efd765d2cd68b68b98dcdcd58382095d8e4d7d3051650da3a28f01b632b5eb37c4c3e5f50f0a2dda3c97c02f5dd2097d472c957de4
-DIST firefox-91.0.2-pt-PT.xpi 552653 BLAKE2B a6b625df698b8dbb2686b140b8ad89a6e547197b91d397b72ce03b27357f037529eb4b9dc431b5a6c785f365dcbb0994060b87a11e77daad069687c7f39fba3a SHA512 499152aadb03b3721dda8ca4f1943b56122e4cb9ddccfc90d1eddd6f7c116ba2f3746e686ac1b4057a2c3a821beda3d1d6aada651b545fe144b5c86f3780bbce
-DIST firefox-91.0.2-rm.xpi 543758 BLAKE2B b5c6b7c255cf47d565379c2d09978d54fa84da46b29601c3ef23dccb244417080f22e6c18e96fdf5ba4c657da8e7f3adba1f1b44436e40fd615b4f2ec6ad70de SHA512 f3ffd1514fa4d664cbb5e0d1a3caa1c286dfce482665a111504d72c5e0c1f1db2148552c24e7daf801317c11732049df997134c481de790ae2962fa3c81a3183
-DIST firefox-91.0.2-ro.xpi 544870 BLAKE2B 638192c620112619abd447597f9d7db7bc09cc5b1fc7bafc1986863ff0904f78695fcebb4271d3ddb86167436d98052aa2b7fc5fdc919d1751beed00204c0f85 SHA512 b4700a3b946df0210683d463fc244cbe345f4ab34b4240ed746f15096a4a00448bbe5a3bbfd7bed1909c7df39cb9e234cf33db3650096a8d1b34767fb6694f81
-DIST firefox-91.0.2-ru.xpi 635037 BLAKE2B 1173448e8346105bf86e91be2467c5d5baa4f0afb8f79d83197acd3ede3fa88505a7f123f132a7dbab13c4bdc0aaf095815cc943056a1152569407b7d51afe63 SHA512 5e18f24daea284a47ec2a563d790e3dc8ae44ffdedffa684f737daee04fe480eedcf4ff60481d8c76becd0d1c16cb80954c612aa00162cf40390f9f2ac3727aa
-DIST firefox-91.0.2-sco.xpi 512252 BLAKE2B e91cd10d8db891b75f552cae391b9f20fc93e77ef9a01e13e3303425ec4758f63b5cf8806bbdecce2434f471f660148dc16c2bf9b872732f8156235995341809 SHA512 340626f186c46336b1b36c14f1b4e56d337ec0e04fe84a8cc2293b1cdf7b385d2068825fe81952ed28b983ad931a8e56d0e1828447a6fbad288a9016eca38375
-DIST firefox-91.0.2-si.xpi 496840 BLAKE2B 3609ada9163696aba196d9748e97f8e6ea16510b0f55145d23c16d8868def2236a178c4b429f0bf9f479c75ed83623e306443e102dc82c87be35de12fd4a8fde SHA512 7dfcfc0ebc6c2d9651c3274abfc25d100b451b55375a9e9380cc2586531ab08c0a5e1ce4d914f8b846f3d4f8c10ae33fe66c9d04817d01d5e7f3ef98239ea6d6
-DIST firefox-91.0.2-sk.xpi 572088 BLAKE2B 86020743034e7e00783038256231e1bcb3f2054d3c679db716d71ecc42e5b3be18e3151180250f82bbd03c99d72b71a886f5d8cb7b08da4fe596fcd1de62e5bb SHA512 5487d0ebf35a13368c3f2c4c6e933953ad43938f98a56660d7ee83156bfedfd5f766b8779ae0980aebebe6a4112cc3e90ad941159fed6767c4319c4bcbfed873
-DIST firefox-91.0.2-sl.xpi 542792 BLAKE2B 05b78a248eecd982251e83aea8d4e180388e5ba2424d8642c8b8c37e9024622bce4c7e268067bd2c959602326f7ded61f3268c25c6048abaff277f6eb53dd143 SHA512 684d20192df92823fdd853d8a79582748e2c1f3d95d40b2896952b931b34feaf4eedf222aea640ff576f0fe68efb661a48acfa616263a3d41d9777a23ddcd992
-DIST firefox-91.0.2-son.xpi 432937 BLAKE2B 592a2605a2fe3567e0dc5020382c3cad9ac152cfdd3793c679a1f776983cd9aa4cb83d59c39ff3dfca8c0e70c98fa8fa13ba5a11eed74ce906e2cd0c9f955aec SHA512 cac2639b2358550d50ba53cea726dbe65717d40296d63dc0eff85bbebb3cf0186c70ef6e8d83857e61b06bd5c425c1a72aec34723541e2aaded96ae6838e616d
-DIST firefox-91.0.2-sq.xpi 562223 BLAKE2B 49443861d6ecd85d6fe4383518a0b65b57055260d326778497042e771f62cbb830dc479e883fa154dd2f2a2dbf4061fde46f137f14e63b8bce76d4c90299f13a SHA512 c6a65bd7fc49ad9fd5af2c7b8b86c42a90b81074ea16411adeb6794195fda74cd13fc61762f0962ba6252da8011c8279deaf2352ec9be3439254fdc38c398d45
-DIST firefox-91.0.2-sr.xpi 596028 BLAKE2B 6ea53132a28738d54446b82fba65317a3f9f493f185f76595067d29a84551a69995d6676150946dc52df9df5f6836476d578b9609bb04f7ceda77f9bd8723e73 SHA512 c4e6b08d0e983bae2f76fc8b5d3c301dcb8103051d7d7d1766db7981972cfa8027cb178ddb854be6a95c4fb9c2b4a82336eee4fd5d4de7b6af4e98ad8d0526cd
-DIST firefox-91.0.2-sv-SE.xpi 546389 BLAKE2B 20dde060f8e0bb1a0117bd8d3135dd5593720eac58a946df6f6572fcc1a3c558052dd8db4d696b3c56326685af149d02ad023388539f45c71c959b0e5c24671a SHA512 42f66c348933a446aead3dbb115873e52a7f8ce428b75065ccac8e6bd6a3332f1f4a5e9fc30fd001f7e6fbce4c20f50c70f0aea52fe4f3bac605a1b94ba96e45
-DIST firefox-91.0.2-szl.xpi 522374 BLAKE2B 3100df810f0b26de1c4ba3e868e6855ef444654ddae1f15b1b28ff721f64b5807eebb154dc41d6d7ef30184e35a532e3357229148cb502e2a34a2b08b29060dd SHA512 4434ca0704390113fc22bcac26efdd376643b550d33f070493b2132421281983f1e0b4823b83319a3e11e274b9381d502fa193d52f7efe883ee6f801707b6e71
-DIST firefox-91.0.2-ta.xpi 523941 BLAKE2B 2c87a6ead3ba80ae2d31353dedaeb6f58da25751684e5341517720690f8ab52201259aad7ce33ed78816d817a5d3a3a2147ab3bba6513ea044971a8f7f273cdf SHA512 9c24dd0b1e17623af3166ca4078bee47a6958cd9287c8719a525f1c5ae8a88bc21044e8e83675c9e786be93fe6c1a4c30a91f1f68a880eae2351b4ad3bb050b7
-DIST firefox-91.0.2-te.xpi 564760 BLAKE2B 314220ed7b4ebe6bb27d740360b608c4702051a6f2762429868c9a116c568f87ae34eb062d86782e0e753febc70daf02ae844c3fdd3f1ccd67d13f2a4c404ce1 SHA512 4170d39649828e1c8395fdcd1b0e5555ca2ca32e4003c68ead981b108ac98c5cf955bcfc74486c3e940d8e5ce21c9853a7fda88b98b50698a979f7258d4bdeb4
-DIST firefox-91.0.2-th.xpi 614152 BLAKE2B 85b298f4dd95f35e7681fec5a736c3dcf27bea72d0c319292a342a8d5f72dd8764d02c98aac5e0d49326ac506cd8045715bbe8088e67062c97ec116e1f32779c SHA512 0ea959243a6edb9433bf86dffa7cabb09b4b69dbda218a4e040625c75d543d5e5cb065dcf6ebaa346b347abe6cf0d76237458cae8fab04f1ebef3e8a9320de63
-DIST firefox-91.0.2-tl.xpi 531316 BLAKE2B 0946e102605fc7c05c7e883b693cfeca11204f4d1d0793864e9c0f7a5c573b04f1714a72094e8e78b4106889068921a1c13b44ab77478352310c05507de9a087 SHA512 8f13de4fd691937296bb4c3e3d67b2d826b0e89ac0a972cf4ebe2bdabd4b5539bed9455a56f6211067900b9b003d388c90d96b2b25f4896ee9c78814a7bde6d2
-DIST firefox-91.0.2-tr.xpi 558469 BLAKE2B 1f6b73ada217f445cc9eb04358f7d6e84ffb20283d4bad63afc735536851af4a7198cc2a4e32a8c2b2659d212b89783844e006dbedc1a613353f76a523a0ab38 SHA512 c947f20755b5691bdb115e15108f6a6783a74b372dccc6912749e25ded9d01e463b4346bcd1b8d2d8ee017c95573b27431056ed3878c547b36be81a8f108fc9a
-DIST firefox-91.0.2-trs.xpi 503653 BLAKE2B ce6c5aceeffc3ce0f3980d64c6111c917ab984020d03b18302422a1db3dc8f9d56544e27b45dbdc12d4f394f41d133624932e390c358572b1a8f5df780d62717 SHA512 f1b16b1a9e97344d6f0326e29939ccd9a2e71dec21748310b4c76ea4ccd130f6e3c0ddaef7596eff073315d8d57602c12361aba45e85785720e73ccdcbf0768b
-DIST firefox-91.0.2-uk.xpi 628579 BLAKE2B 1276d8d95c61ab17748b3d5809b4fa1c0606b7eab417888e3e4f822295ffca7e1d5d38c6c3c5ee83b2dafd3fbef2462b942c245ab13e90775e252dadada43740 SHA512 314262e929bfeac9908709e01b78f0a42a9317e0c427cf47f87233353dcbee5ad12ca2b77a322c8a1bd481d43b42d133784170e5335429cf11ca16da838762a3
-DIST firefox-91.0.2-ur.xpi 572692 BLAKE2B 3726bed6a61448343fbe39dd952045d74ea16e9910c1b4712e0e4145fc852242b675265929f06f4f32daf31e648438cd95bcf2e3077005f12e21b28392283402 SHA512 f0d2ef0ee280096c905b29b8cf81e8a561d789e51b8cc45ffba4f56a79854fc0a9d28270fa85d1db85642690bfb1e3d8b2c77cd04fb81a0ffe5dbf3e9198c00a
-DIST firefox-91.0.2-uz.xpi 480939 BLAKE2B c992594e78b95eb6678ac7beba5a5c332b3af5d9ea09ffa77e052e0b4745a84c4e27abc9423d9ae0db44eee15ee3e05880da378a83f86754e3b55179b862ed20 SHA512 9b65130a52b0eb05cafda63960ac0bca6f499d1bf9422685b8e21647665daa837331d7f59fc82a6bf55cb7824e851cc86529e140e5316ebe319e06669bd8bf1e
-DIST firefox-91.0.2-vi.xpi 580492 BLAKE2B 9df06719539a0d9f9d55f6480bc438598eb632916b4254599df1aad25abb3ab3d379fb1d55d8dca39416dd9bd0e7f225c6579643a8a7883bf68aaf1d9783b56a SHA512 684ca1c7c994d3a67a27b3e3c1318bb6dd0b668a49da13c4c5cfb4fe695915a38f6f9cfbb7bc7ee3e322b6139f0ab561ef741b11a12ccd418e747b03a70e18b7
-DIST firefox-91.0.2-xh.xpi 435041 BLAKE2B e51f7abe34cd7e65be01e3a5c0288cced33e85c0e63e4bb33e62f0972724c689d40113f40cbdbeccb84ca536b540fa3a1653d8853c461c28b7f353fca11db1a9 SHA512 eb6ba0cc1446d67663270505e7f9b215733dd6d668218197c1b5a7c95b22c237ea5f66cea6b8a9ba7e74699d50643927e77c95b29f2922cf30aff5ac1bc9dc7c
-DIST firefox-91.0.2-zh-CN.xpi 581941 BLAKE2B 92ffe8fa9317e8240a522bf312333cf35359fc036e9caf6bdb8c56a4701163efbbe6f69145a0282963c255998c554a6f2f0876c31aa6c7396dc7bfd73f15ec85 SHA512 f09100f3d7555c00cdb33bc0b0a07488494baffe6bb8e7408c32196e91808625fcd9af24d4088bcbaa06637ccfc3f6e8772d29dc0c66b1335d09ca7a6e0ced55
-DIST firefox-91.0.2-zh-TW.xpi 582124 BLAKE2B 962fe6182f240fa5f1bce94f7e1038c958aefa0736a1b3b36a3565d26acd6361d19dc31cd4747dd723e9069490b073b2b2fdd328af440efaeeeed6531bb00a72 SHA512 3315585c1cc781c2f8707f7f092e70374e93166884149ee9123ddd1cc5e6c4950ce6ea5050637181a79096544d3567f0c4c46dbd88ddb6eb1d3e06c2c5b7346a
-DIST firefox-91.0.2.source.tar.xz 381193820 BLAKE2B 42e03ee63e9930a71716599fdeb538006e1a1404a81ecb0efc25511f4d2100b447c9c979d367c9f5fdd60c8ac667f50d36f250b1b755b8eb6eb8f7fdd909b612 SHA512 82084799524db6661d97d9942a01ca9edec2fae6b503c9dd2d79fca78bfef4ee0a888e5f5cf4cfa2b91d9c9392658bb8218bae2b9bec0fbcacfe73a174a4dbe7
-DIST firefox-92-patches-01.tar.xz 21148 BLAKE2B 3135c63ffee4c1268db98c1994b174c8293fbac23ce3f75202342dd1ae187d5b2e0d4f8df0871ca471cd24aeba0f0d699acbcb8af54f5172a559ecc2350f66d3 SHA512 d09ed2f559fd438725a599f9b3b915270882af200dcd4cfc31dacedbddf31a81de8649a2e92fff8ba682e42bc911a5bb24672e6ef8202a497dfdb4ce61084444
-DIST firefox-92-patches-02.tar.xz 21848 BLAKE2B 684364e1cd3667498fe39dd9a08d48c4cacfea9d426db77b47f6578aa631af19be7241a074da9e6b01d0bf9d56db247c2ca0ef23bb3d5e978aa9c3226c753df0 SHA512 6d13e2363866ce9d4de6f900fd593038c74457952a837f5fbd1a43d05000a6eefb04910b5697fc8c35f2643462eb81dadd199dbc3b42e116db4e98f278d81808
-DIST firefox-92.0-ach.xpi 465861 BLAKE2B 7d94552a24be77bbe07d0ef6d15e0ea0e7638160383a08b07d9f2f52f85da67e2bd1dd8648327d75980db3666ca923b1d97f01b0a81376604ebf7d552fde88ff SHA512 7ca2529c005dba08ad4d34e6cf56266c45274acce9a98e474f88e14e39fc1829620a59a68f7b9345544bc9eaf8feeaf17a228b85af6edaa87f51e15a1b1cad9a
-DIST firefox-92.0-af.xpi 433704 BLAKE2B 2365b44db5d1724aac5a15b88f71158e1703449bdd26f73b4d113a33014ba37e4ff060a9a6c52269f27129187a25cf133b944bc4f455076d292973a7cd12b14e SHA512 0591a67216cd5033e4add9571614f1025f09c5b99dd93b85a907b126b4a60a95c45183d220a1781822bd79f7338e7596cda862bb818136374013f970153193af
-DIST firefox-92.0-an.xpi 516731 BLAKE2B 2a9e61e95d2a718b68f4de87f97d52b7563fc47858e6909ae76eb0cddee36963c94b9f818ebdd27726501e132a6f5dac64a0a94c6ee30d135ad771e517431f1c SHA512 e7eb05045beacf86ad7fc74973389f040ea936ee951c1980c5dbe4631b54f5bb11163983e3803958669bf10014383c2da024a4ad34fccf1fb4413e3517ecd8ed
-DIST firefox-92.0-ar.xpi 575437 BLAKE2B 86c06da9b5f6d5a83aec3f9ffa0976a14adb057b331d0ea7c776b8d06944a9e7ed9226b1d558fb9a0633878fa38d6c775f12f21970f1a2c8495d5be165e2d2c7 SHA512 f52718c39fad8362fc447d3c0f4ce589bb64ade52e25672b0a5f50717bae4c99e6bb38435380f1d5c6b1286befb1be192ddf1cc89acadb5e477aa54398f5bc3f
-DIST firefox-92.0-ast.xpi 504077 BLAKE2B 18b70a8c051561a8ec260a611a2e73313d019e516c13d67895d3af70bc2e3e7abb6db412d83507385c3975b746b74cf353c4e0babdf3cda398c19059a5f1212a SHA512 5d503769b03cd3a0d37059b7ebb7840c603d595609a853889b65825a8fadb3b2ce67ae695268b5549e63e5157fac1def8c6b170eb997d4f7d7343081c6ecb2e1
-DIST firefox-92.0-az.xpi 501628 BLAKE2B fbf74b1356c5281d45d6674747f73cb021999332b496266fb0ce8a58f9a0c630c2db95649a4c2a2f002d7e9f6a81ec4b9649d7131909b5e21c24bc9afd378af6 SHA512 2dd7665290a5581729231f01eb0a1a3db7afed3822e4f437cc497f015a17ef3ca0113a27705e4c381689cc5add9b181db42435f7f27e9f6d6216a133453211ac
-DIST firefox-92.0-be.xpi 631728 BLAKE2B 267743c0a95641684904e93505dfe1c3864fa8112080a15160587b4a9b9753c29b1665f6a1a49d738e4af07ba45d64cc6db973aa0475052c513936e5ee50a69c SHA512 92c1d1c2788f50528575896a0db620d43488b849da15953674f6df692d0a86e82edcaed98b7d26072ffa6321bf2080fd223c1f15223a2f1b251fd69804fe2591
-DIST firefox-92.0-bg.xpi 585832 BLAKE2B 8975ac73a6de3071be4bf4a62fe56fe149402e9be1c66e2f4743e4926480a323d1d02eb00493271f3f1855e514ca830c3ea08788ee658dd6b91311bb0ce46d12 SHA512 698c2f4138eeb2fb8887923df9534a2810272143d2810a5875e5342999b75d70dba2f46c008ca4c970dd4a9785e6ca66c81702754655f9603e1721c6a4a2c8cb
-DIST firefox-92.0-bn.xpi 577032 BLAKE2B 065c5e88bbb6a184280b8174f6eb77af3dd9f2ae79bc6c87a5c5b1225c1dc24a6ae90d7d92fede84ee37ce8fea62a08895f03c4ff9be22e0fc57bc8d4d120819 SHA512 c584cc35797b41d32692c69d07e3f48e8e97db8bcca8f3325b3b3772bb9a94e53f8e1f01b2b9c21989579e30a8e4230b4dff14fca2075dda1feb0a4cdf32d9ec
-DIST firefox-92.0-br.xpi 535413 BLAKE2B 9bb2f456c6b1e649a32f21a6a3db00ea7bf68579ae91d190f1c810f8b85cc56c98758b06b9a83b9f4acd1293ca5e3b544e1bacceed8720743c9d1e3048036236 SHA512 5ef4f4e8a1cec97a8ea89f9a64520c892d3f240532979339d322a046ec1ba33b1b2853995909e4aa3f46cc979ec06392f587acd0329ad89897106027aa8e5742
-DIST firefox-92.0-bs.xpi 473741 BLAKE2B 1eff4110e035a3e050de28281aa69c840021603deb5d67be8070be49fb8ac7fdd9aabcba8bef77a42f23ffa51c39a176249d11b3f5c61cbec09c397de843f059 SHA512 95e1250cd3ede7d74f693068d691f42bb7039bb690e391b2f74492bfe8595ee63446860afe78391b44a6a54477729a151419a0ddac6ceb47a98aaf8a9b884218
-DIST firefox-92.0-ca-valencia.xpi 543909 BLAKE2B 76d527aa1c3ba85940bf6c86e6cf05616e347623f216b228408f07e6ba5e6f1031aec52e5ed59129d98bd61efa22882766f33e9c5f209f4411bd024a2bf32667 SHA512 a01259b414856803c1a41648e3c49536edc974ff996b0e0e9cd8bf96b1488718fc7e965896bf27086f728faeea99c6e22e85281bf04466aa78aa826a21c098c1
-DIST firefox-92.0-ca.xpi 542395 BLAKE2B c91a1d4b3026b317334bc5e00becea1a9ddcfab60c52ec9da29caa93f41036589f9dab8db4078440628a058df7c88f6605a25a5471054243e10ed33e60bdfeb2 SHA512 cbe01d0277aa33fb0b6647679c220b6a64fe20583f87c3ddfe0700818da0c37c66b5553042334628acf672f344aad4ae394d9c5e13f26a81a1575906ac26a862
-DIST firefox-92.0-cak.xpi 568756 BLAKE2B bddca5aa0d38e6615fffb71d9656fb8e445aec6b133cbb697928b315ead5a54bece051d628b6e8d45bbd95f50fd30144feb8204e91e35175d612924263492783 SHA512 408b91d2938f014bd4eb5bf59c0a9616b32e4127f0439f103748b92f4b7672e45029db904eb66173117e5a6df581eda629579037ebffe4cbe6d96d957d073138
-DIST firefox-92.0-cs.xpi 573296 BLAKE2B 2727423838d2ec126aaf883a3e56734f13081d218b066b2bbaa25fbe1f6c877172e79bc8f5006644371cb632e13bbb3b94e0aae5c90b3cc21c267324c43edf9d SHA512 1f33a52ce6a4b6f4b61ba66f6d91aaf4664dfdaa35a176b44ca0c89655fdd9cbd0aa2cc6ff1de2861184f2d9f3c95383d14b6bfadc7bb3e9e6ed59e0c8a38dcc
-DIST firefox-92.0-cy.xpi 549215 BLAKE2B 183237354a64b49c7c5e0b33604fdf9c59fdac286bfba2c4c4774d6624f62e8e208e7d99d9d3fa087748481aeb735484c44c43571ad175558ab7e5bcf0a6d1fa SHA512 a5092eebf00e2f2e60790ca995123f7c609263323e2f9f68888958e36bf358437d9457370e5129a47ce09d24db4173adbb2a93aa905763aa9a3469348de36c62
-DIST firefox-92.0-da.xpi 541085 BLAKE2B 1cfbaefeb24cb9e3aeff5e7e985627cdfe9c8db4882868ff3c9aa49d121f524864327fabb6e0a929c9d1bcf98153a5b5d79f4045987ebd72b9f090dcb2983f07 SHA512 f51dc0992a3f86ef51e7765b3a943377070f9054b81e9fb18e98e0bd7ff1b96fdfbf963b83f21ec56ca42c57d269033387a156ae92cb28745625759428022eac
-DIST firefox-92.0-de.xpi 561491 BLAKE2B 549fa2f52c1bee61f1cbc6a72d184ef57a55839a163771b9a9eed2afb9926027d69f2d59d22915ba1ff5bab46e99fe6761282d2bae6bfc4d33a269ad3f537447 SHA512 7a3f0ee1613e9b04f4e30be69ea57c355036704b35ae5613adb9e3d0061fd91e568c7af07f95ad49ffe482e7baa337a89cbdff9037eec89b67c0a32a2c98e922
-DIST firefox-92.0-dsb.xpi 574182 BLAKE2B b8a845416fc1deffdbf5274b788f5d8bc8b2c0fb68ff31a275081312cd8cf5f882ea38bba3f7d0fb2788ede936ee61e50733d36b74bafa09cf1c73322621d3bc SHA512 2d3de43368deecccce7999f8ac29eeaeb1bdea8244ba2f8d004b026ad6c0ec5239fa5431ab3badfb84ca250983cdef97da6df69c40d31af41dede4e514b8872b
-DIST firefox-92.0-el.xpi 647313 BLAKE2B 1fb150e19fe90543fcab94ebfc19f86293a2543d4bbec42bcbfc6319e28eaa28e48d5c4026460bf22e9edb1de2c542f3155949ac04e6315034b0a8ecbac044bd SHA512 f7ae3b6d46ec6b1ac1aba8fd03fe96ea0cb431658b55e0f269ff53c8b75c95b72d79acd7ad609a3474d8d4996db9f61328b139a6db4dc7159faa82658550be10
-DIST firefox-92.0-en-CA.xpi 516480 BLAKE2B ea3a5294b02ff288bbd8941f764e903a71a791d85e1498907e8623966eede12f1e26faca063f2371250fdfb4a4166547a33a67d8182b0564aeb61bec34c4f65e SHA512 42a738671b3bf4efde9c165b90a3e2cadb2f1b70be900770479de9872742641d409bd0ae980ba727b15c26467f3b3b3441d9245c018e625fab03fb6a457ae02a
-DIST firefox-92.0-en-GB.xpi 517068 BLAKE2B c7df7c2379dd6c9e7e26c3b8c6df175407b96873c8f7b3173dad69b21f9b6b9b8503c4f35d1b75bcbc650a2f9138cc93de2e9f0405407d8f70d81cc95c113a6c SHA512 4cf091d855be867a4410e89b116578f27e5f9ce67acea3d17fcbbe79d019b38fa14d8b3ef108712187f567a8ebbefe93b6cc146cb85421204b131fbe4f0eafb7
-DIST firefox-92.0-eo.xpi 543248 BLAKE2B 6a64cdcdbb3ca6d255348fc86f333be80167325d843242d295518331a9eea61535109215573d26eb9d245473e1b4c03ea6e37e7c0575a936a3a4e7b07aeba37e SHA512 b5ed1334e6ab221d44f04c8f054ae0273542d94570e0cb24dd4cd7bee3d8d0b19288eda1b5c78540ebfd2f99d187155d999ff5965a122f03e269109e5b53eaa3
-DIST firefox-92.0-es-AR.xpi 554546 BLAKE2B e38045fcfa3cd5249e8cfee1a1bd127764d4f4bf7325c559044f028da447a35908f15144d6b32d597cbf8f189269bbf11e18f167f5f7871a5f33bc490095aaab SHA512 3987be6ce8350231638497d2e0ce59bf9e466e984870d69a6a01f03c959507f91fa8ebc35cc86c2a7b6a56946749d49515da6db6020a19eee10f8f8271e0cc98
-DIST firefox-92.0-es-CL.xpi 553841 BLAKE2B 496419d014c508fd3eacae2fb7498a8db2830c1093a699d7dd71a59ad0b4a8c3afcb84acdb1f9d022cf19b11dbf1ed79b08e83595989f27f684d08a3e4cc56d8 SHA512 be5a70498dd6058c2903e014c53e6d5b810ce71cc697943691d0f2ffa529944d6179ecab936f355cadb2222103e8b17050581ef9f7f431ec0f23e740066cbf4a
-DIST firefox-92.0-es-ES.xpi 543221 BLAKE2B 9ee18b05770d9fff6c7572100852c6874aa2236e6d61c182f0b1383b843b13e3530f39fb79b1beb2da417eba6bb4b40875f72c58a06659b971ce3f26078e1aa8 SHA512 b69eba5045ccfe533b041a1e351a5a901fb63dbba86e0929a1318483581a3cce566cbee86e7b3e236c586f538dee203795632be6813d7da20c2d1dba9964bae4
-DIST firefox-92.0-es-MX.xpi 556995 BLAKE2B 1596010e768e1f4f3b2db5403ae39fc326b080ae70994a46b04ab579b52fd9306480a1fe6e4408ae1780acbac11be9052ded516bf53c547f12b6836fefcac4a3 SHA512 42e9d3dd6700a3dce527f9502dbf17a6a2eeb3516a9e35c245281a48f8d81642534f86091ec238c8848c7e3b4715766f0e07bd37c20de5e67d4fb5c9b5bcd51d
-DIST firefox-92.0-et.xpi 494873 BLAKE2B fdf9220582bf8208e8a134ed6189835bad375ffe446b30c1ac8f252e318d1f5c7b1b2545b5e21162fa100f7fcbc84b8049f2123090c7c1cda80ccd323959a6b2 SHA512 b780aca16b3c760e7c9f1b614a5f6eb53ccc1686a63644819c7275db45357e1044e8bda59c634b09d8d96105a19eb740cc333e9ba2961f9db70d400c02f09879
-DIST firefox-92.0-eu.xpi 539775 BLAKE2B 939f64181678f3c88c3635a2438246547ed9ce9b6ccd80a95158694788ad6da34fe190212e76579797b37f129ea310c7b2707ae3ba799136cbcc7e01d1a63006 SHA512 5af62d3744c24182aca56174a667777f522b36c151df3c208fe808fa8a93229643350ad0c39a0afb4a1466a795e778935b8215e700352e3f86d76058a6777a2e
-DIST firefox-92.0-fa.xpi 571229 BLAKE2B 4f76b2886dee55fcbab1a0fc3439840ca2a3b98f64ba2cc8bdf040e02777ea075742db2cf106027ed47e1f266df89051642550678b0f26500979d0bbf0f50b8e SHA512 cce85adb4ebcb8db2ebf69a5b8895dc35e139c8c77202e24feff44d19be40212ff0b2fcc83c357e8a54fa0ce17be08db5752281a30804eb119cb57b9d55c7f24
-DIST firefox-92.0-ff.xpi 486429 BLAKE2B abd3f9f3788c7603a08c17d0a558390ddbf6268009250f14dd20b93a8f582c271c9735a7e66fb3417633fc2d37e9e2f43d7714e29994074e83abc199ba266125 SHA512 1f49c39b696c8ab49bf1f79266a85a94fb836d02cf4bd912ab7c1d1d65cb82fafc0918cee78186306f672a757b6065b8995a2bb3154ff602db04d21331d33144
-DIST firefox-92.0-fi.xpi 540701 BLAKE2B 49246e41b46b6b354ac32ba4c7acf2545787911421b166dd4aa61a78c8a0b156eadc6fb30187f4f6d3171d3685f7cf9622c1a5c1b77c2e7a5d6e748d97ed11a8 SHA512 168fbb21267c4ee2110f7a5bdbb6ae8fe9fb35f92a0094a1a1f58ddee7087f5d2ff6ab17d6f6fa07e9a6ca01c6503d5f9b7d1a03dd2ec707d0fcc15499490af4
-DIST firefox-92.0-fr.xpi 565622 BLAKE2B 2763e1ab413a7f3e4371d89cc42c2c54ced51c8716ca050debdf83575bfb094eef1ac00fff253caf5fc5e5d9f00a620246af691d410cb48580479dd34a530293 SHA512 0042b8a01ea8f8a9d1997786a114917202553b217795a8de927ac968967f76417b0c482591e7933048299080f891d70bca2d4e87a1e5853d3f7e87585cb88057
-DIST firefox-92.0-fy-NL.xpi 549800 BLAKE2B 7efe16d4542320afb2ec0b50ac3dc3980d2fff4c516d0952950c6f08c96e439c1d15103cc2f71c382ef0802838a5cd83da9a74887fcaefd946b8006883b45ff9 SHA512 8bad1072823c1b7394fe4d580038d8657a6d7c46f94168f8c3520e93cda807de29c46fcb98d7eee6e2a374c3f242e3964dee62ede6fcec35cbd56bf21c44a182
-DIST firefox-92.0-ga-IE.xpi 471470 BLAKE2B efb50adacf182e8acdcac59db60a532a321752aabc2287547bce04072c3db754fabf9862578689623caba75911af8504a7d6ce348d7bfb089ec73b061d2659d2 SHA512 8cd7b5a46fc6b7e2f29691a6759d1a7640f734e28b01a30135b459a1106a0bd4efba7dcc63d9b67ab71a9929afc3d53dab0a300fbdfdb6657a4b04bfd400ba49
-DIST firefox-92.0-gd.xpi 545949 BLAKE2B b22117e0db9de6f4c2c18ae71d104d2518bb6f8fc37b71f9ed70a80fd3f33b19fb9482104d5be3c258d106a5ee05cfa7effa03696f44649b505862aa27574a31 SHA512 b31020cde143d9e6e334a07de474c6cff77a4812886b96583ac1be58624fca114a6f5047dc1563faba2072659b900fb2302b1cb6cb0c6fdeff5a7710eb759b00
-DIST firefox-92.0-gl.xpi 548998 BLAKE2B a91c6cc3408effc76748231398feed6fe7a3ffab0f1ca2f5187bf19bdd8b74943e4c804ae265b62f354b2c2a4c3b94631180b202bab858bbaf532983b7a0c866 SHA512 b5118c2393d6ee647859b2014196a77ee33789c5a351adfc28faedb529ca4426b8a8508d4b69c59114c2d6c63e3cd2c569ec3fee5d6db6ff6b28199ea6e4cbf9
-DIST firefox-92.0-gn.xpi 566605 BLAKE2B 81fa761a4d782f15164eec6a8fc82eccc1850c7961e6d595f5d9ee278a4e2965aca293dc40941cb4fb99d931954b1d8282c24fa0ce98eb8c4016991bb6d5677c SHA512 e42add8c48ca9e4e0139ba7ea6bdcd7e5f3437335ecf59107cf03d67c9f6b105f1790419e244813378ba58f74fcfe432da0b7f23e4bf7181c365e618973e9c01
-DIST firefox-92.0-gu-IN.xpi 545302 BLAKE2B 62c4cd429f00d2459beff9a5a82a1ba88f57bec603243e64b529795fae682c002cb05c02a07df58947cd107a919dae53fcd5ca73dcb3bb5ae09c63cfef9c8317 SHA512 a2ad9ff82880d10459bc237aa5e4685fafdfd922e84fada384cf8f7b6f6fb42cc058317c36df26c52f9d105709e78d1f43d4468270df53ba517141262afff295
-DIST firefox-92.0-he.xpi 564004 BLAKE2B 724e7b9e592ee9b4feef11e745777cd5720446af4700eb4595fb405e6772bd22b7a01c0b4c7c6be63573c9caf81ca421881b4ef85ea4838135f86b2fc3c6fbbe SHA512 8b31e7a89d0bd6f34f34e6be47d9640ae4c58f272f91a7e8bef7175ade905154b9636e653ce53abd356bd882ca0a16a815360adcd8e251f499ed31e988ae9198
-DIST firefox-92.0-hi-IN.xpi 576346 BLAKE2B 6feaadfe601dd5094328fbc73b0d56581d3080681265b6d12747ab54c6faf1a7acf8bbed24711970cbc9fe1ff9e6407a20dd2fbe0ccbfd75893bfb13d3e991f9 SHA512 6e2c4ba5b5d0034d936650b9a8366f97402df8d48ab6c39c69ad18df4e32860d7298d80fa20a2cc7534fb8039c9be71f6afe5f8df043246c11a7830e37e8d19a
-DIST firefox-92.0-hr.xpi 545062 BLAKE2B 8e32013036fdc53f5c4110f36ae49e16445f4be6a6bf3f8c3366736bc5d8be5eac48b23e564be3f063bb1a6f202c5456c4df47f5460bff1ff1d1133e73ab0c9a SHA512 5f332ff5c2909fc28300154bf42dac5755a019dc34072e4eb5a0f96a189a59edfec3dbe1da098138243aee2be75fd5f656023696318ecf5514919d993e1cbaee
-DIST firefox-92.0-hsb.xpi 570282 BLAKE2B b794b41c24e605a8cc3b68cc476a4cc04037e495171eb01050da9cbc4d6e1631ab3fabe364f2285b0abca52aee02cf7e05d0ef5f6ddd1dbe4c6bafb1308f9b88 SHA512 8b69ee627dcb400bc05e483ad9427cad49b90a1c449f3b45cf87d20acf3b2fa222b92a10c0e830304133905a0397f25bc38e0d3e4cd93d3563addc023b67fe4c
-DIST firefox-92.0-hu.xpi 574178 BLAKE2B 8033f2e3bb61393c116136d1a4ddf76c0d53fd27298e6746fe9deb79cdc716be5abb0402d58ef0892996ef09b2bc1542e31d01dc0f2e2132e5cb5e8d9ccdb5c0 SHA512 03118f6c5ebf6312a3f92622afac7a35a9f29ae2cbfa47e9e0897ebb630b536313da226d5e14107356938df43ea612f04ad00475500496c19af215c7b63c6aa3
-DIST firefox-92.0-hy-AM.xpi 599704 BLAKE2B 47b2d67d90c107720363327585da21da0aa1f0b0747952cf31c1d704567230b15790a97c7ef9d59208182f8f8336f96e8c330c9832bd66a6bd34146758e9a81b SHA512 95da7c4fa5766895178e7cc7c91647e955394aed5c2a474ca21b5ed2534ec99ec5dfe2f04a5fefd5240ca51b7e682b4225606444d90e98e63632153ccf367435
-DIST firefox-92.0-ia.xpi 539829 BLAKE2B 5e4af9d63b6b5b2c0ee93e60fad02fd1c0d9ad472fbb8537b1484b07cdd30758f77e134fe4b0c74a29818956a8dedf9fb28de89553e1068e09f04d8910fdb2e2 SHA512 5670d24edfddbd82c079cdecd9c9fc52b8dc07d94127e05ebb45cf1d3ad6a8c57bb04f2500257d4bd96fffc3029f6d94913d1b6ddd6d51c5a3b09e5302b3709d
-DIST firefox-92.0-id.xpi 534563 BLAKE2B a2929a900f2e6bcea9972c43a222e28ce09c9544f093da454e21d48a28f19df1bd90679b23b35c60e5584749f251125947aeabd297cb6712b1167c32d14bdd64 SHA512 1ac7b074064431d67c7e1b467b47a93b8335d0de88d771b41e52145b02d26e33978a4398861514f6c0fb690838d88536b203b3a91ffc76c12cf609e0aad44ef4
-DIST firefox-92.0-is.xpi 482030 BLAKE2B b89fb89961cc6726381deef0a3c11f273d9faad5aad24b14978d25935f37a866b7ba0a8a64c82f3101fc3a7cc7792642cea357720ce8fc22ff3829c3ee8e4497 SHA512 e6e8a5834b447287c7cdfc4b4dfeed0c97cbb7aacbfb5d517adee5f8f26bb3d95f6e421f6edeb847dac861d9c93c885645ab658d43c0ff9e9312afdf0fac6011
-DIST firefox-92.0-it.xpi 467585 BLAKE2B 6bfefbd27e2d96c328a97c4cc8abec953d64230d53d0a2cb89bb8eeeca37cf77d4db0335ec6ec033c1c9d09de4ecdffe975a72757d6ac875f130311e0c317b45 SHA512 045c717b090b9f842a2c1db95010007b4f941fe9f9f0951f4b950b8f8006231f46a0a28ae6a1fb52ba83f42d984557a742254f049b1d264b823739da22978838
-DIST firefox-92.0-ja.xpi 599760 BLAKE2B a62a1d2a479ed661cd901cd2b1a90bebb5a20a96f63c2b049b2952db871e3a7f2532b3a8a3065930a83c0a7c02e8091e47d3204a269a4c862a85a7050326e5fe SHA512 29bbbbad76b5a05367fafde0c644b5d0c070b0798eaade0cc4cc63c9aa7b52647b80f4bfd511bf9a8a8192d9f2c112e1c214bc9ba74e442af08c071640449e08
-DIST firefox-92.0-ka.xpi 601258 BLAKE2B 72634077d7ff739145145ce5eaa7c6ed66628180ea60d2e5777b8c3b9b378d6ad7ab5b19003c85dbce0fb926d16f40ac2d8a319e334f1433e2b59b8c8fc173e7 SHA512 8e83dbef7bfef2a2983e2d43637d9a43c8c4e6852db5d7fa72ead760e654b8fd3e53432f723f6effb31bd022a2c212c787a2cff0d431000023f523e76613b115
-DIST firefox-92.0-kab.xpi 558942 BLAKE2B c77b6f4a306e671d3d79c24b4c9bc937c7c8d91e08a05c2489f336fbb8992796dd1ec51b7074a62358c566b26d411648d1df1cb122237160bfb9a8a82ea5c911 SHA512 53faa17ad2b455cd60ee7e3f6209705bba67e157f6ccd38f539b6c47cae77a9e20154ae8fe540c12182832cb4bc88d650717d9a9d6397b5e04f549dacf48618c
-DIST firefox-92.0-kk.xpi 615414 BLAKE2B dcfca9958ae6a0142edebf01811345de50ae3fe74900bb7af732d27517e09e06de3ea4334bc82f66f36c97b8463d7ac4032482fa3e65f0836bd484e4212737db SHA512 d10e4f65bf20135f0806b8e9d237d12df5c817dad44f570a7a77e6876db3a8f13ca2939a96f71ca59dbd4b49eda0835ba345fecbb238537fd202d705c514f57d
-DIST firefox-92.0-km.xpi 545531 BLAKE2B b048c844212441470fa08b2e8e86e54fb32278a7be99b61c203aff9bf96d3afb2d1adafa00e1ea0828d9bd1ccd6adb1a819be5c6561fb1a52d050c47c57ed908 SHA512 868b4f6da85fe8a01d3c17866c96f0185bc852ed97bfa7bd9f4fc651825e509314625f5bb873e470fb2fa9fb149315daa2000ddef2e55dde93832d4b154acd0f
-DIST firefox-92.0-kn.xpi 509169 BLAKE2B 5fe542d3d7386658684d45b109764aa270cdb37725c71ad1c485a49327395275ec165dbe6c2cf2a98f415eac52b83d05d6ced15904b08c28e48f5b8be5657681 SHA512 777cf7be31654418cde07b5e2526870668950f291335d1a95dae1f555f8dc44ea5ee6dbe05486777f2dff5ae1c96c507579ff7129e0e2e452958e0f7abc45b38
-DIST firefox-92.0-ko.xpi 585486 BLAKE2B 0d5542c609b353dd4344abdc561da5d5d489ee72dc2f2671b83713e6bb8f7e933a2deff2f5f493906d73958e79cd13ec150bcf2420fef2b69b77df412bad57bd SHA512 258a09a0df4a8cd04f86ca49a94d1a8c329feecf6eee2d2653cdaafff4337182c9dd8f38bb9a68b33620713db356c5351909265af3bb42e6af614020dc70cc94
-DIST firefox-92.0-lij.xpi 482445 BLAKE2B c17f579f2cb698ff07dcc9b9ff28c538109de6ade6d0ef7905404c94ebb91e42635fc386adcc041531edf9ce3b157f519438bfd7502b88259a162640c9b045b2 SHA512 6d0c5b12d34308bfa526751121995492164032d40246420a20ae8f42195a5e57d83f8086f55d20608209c674c108dcf2e33d559a03f7591aed65eddbbc0fcde3
-DIST firefox-92.0-lt.xpi 568122 BLAKE2B 670d653b62f69d15aaec00dade64b717c22e903da6010caa722e4212f4c9b87f5fc29a61dd782fc5cf8ce8b85c29e0cba0ab3a8af60a7884ff9ca7fbe0988f54 SHA512 f56a8b694cf9f4296b20e2ca090f38b4a9fa9d405398ed3111df228d657791fffe600e42bb476b29c5a47ce463d82bb84a883d44bab5f5e6427ba55a8151a160
-DIST firefox-92.0-lv.xpi 474044 BLAKE2B 68b25a63cb49380aec23c0b68623085d0c864076eecbd1172ccd668e7c66d580d7e011cd4c9b2fa781a894cd3b4f03c3bc1fa690b09185f681d0b9a94f93bdc4 SHA512 ca1778b735a5fd83a636bc03d1e679fb52f0339ef3770d1aeb3d213290a3f3e56204ce3aafebe365d3846a5d7f08314870b87f9370e025be18b17a72f34cf267
-DIST firefox-92.0-mk.xpi 473976 BLAKE2B 0addf0c2e701d1f43dceb67d77d5812fa1ac8c55e4ff6bd0693a6ae163955e5cea4e23ff58309a6f3feb5e2882161cc61316ceefb1ecc996bfc8eab3a334cdca SHA512 05874993f32d6bd14807ba337671b1fa994e6cf190a0e19cebe7518784c03f4c8869438892d9bde40881881d102fb98e58a8c2442364618acc18d746d0383e8c
-DIST firefox-92.0-mr.xpi 547477 BLAKE2B d025fae033e9e4dd7f9275a5b861dc534da1fb8a714aa1154a3f5d043c694106fbf3ce4ae0f9ba7f9be6d0e3ce138385d1fe275966295106542a48513e5f8013 SHA512 928650168c588f19d714e7a5fb45b487d84bcb7d837dd49f4e060b91483ebd8d71862f86b6538ed5ce9425552b5c6d6ebac04bc3244c032090749a436c420bea
-DIST firefox-92.0-ms.xpi 457892 BLAKE2B 02db15daddb239f0c3dfcefcdeff567f4d0d85659dfbd92b836ad310a6bae3f8460242d644a6f0ed7ca4101e36a933b0b1685699b8df19b6fb254f6d62d9f417 SHA512 12023f2247c98888b73cec0bca42aa3afc94cf936fe1364b7c672100920c2314f56fa2a44ef031427f74b5b93cbb58c8143473f5ec3cbd309ba2062758e42fc0
-DIST firefox-92.0-my.xpi 530888 BLAKE2B a9b97dcb50c7430767de4d3c4535f0d74586c8db3a2d9d74a4b85832273f8930ea0629752325cde80bf4f4e478082864de2f0530f65675fa832a21b68e70811f SHA512 11167a28ab2774b727686348b7bcfcc84dda846d4bad470103017854269a84d7cc2f4bf2e64a7b85cd58b0e487928bd5109ac07b05a90148c40550d9b1914a48
-DIST firefox-92.0-nb-NO.xpi 536410 BLAKE2B 2a5ed043d2a3bf24cd81adee7b700ebb101c28890abf835f99d240968413ba66a8d1b6d167baa17c6dcac49f5f3245171b6e80f9e610af200fe728279382f096 SHA512 9e10f7717a690763f25b75b2f2b2a854ca2122f1f07c1e5bca3145d5a7188b47d6a71b806b7195c0090a5fbd6f1f1361425883d7cbec8ce18c7889db494aeac8
-DIST firefox-92.0-ne-NP.xpi 486827 BLAKE2B 5a7ba7a3c66865e075216fda27563580b4e37744314683343704f33d876bdd8f7615f382fb25418701e81d754ba1489d319ab348680bf5106cf086b4031d9aee SHA512 f8b561ee8abb59f61ff0a7e86dae995db03a1156641134198e50298b306cc2fdaa36f5854b5c71a20a7318c6031cfa07d144e3acb2bbd19734df048cdd4baf32
-DIST firefox-92.0-nl.xpi 544342 BLAKE2B 21052b6916fc675fe6f8df1acbb1b862bd3700ad51f1476f9f34cb30712d3c8314fc2a2651c5a948787d1288eacbc14b0f4103f33c6c9bcaf09386900631d7bd SHA512 d2e17a3e55d35b92e72d90a0d0bf2080aa533e1107d20c5e78e0bf5a7610a8a8bd5aab8a802bc223ae67bb4141018466f73c89374ecb9633c288b381f6eb042b
-DIST firefox-92.0-nn-NO.xpi 539204 BLAKE2B fad9e0b207c271975beabdc6af14947d71055cb16762596d79d9276e12cfebccd581c0b6a95f04491254bafe116333ed634c37e25ed765d991e7d863140e33aa SHA512 dcacc69cc80ceca6c8740a7e92311fe8e2ca45d554312207dbe18abc64e2f5604f75f6c17fde086c88548752662bb681336510dbe1400692c007464fe8c2fd48
-DIST firefox-92.0-oc.xpi 560486 BLAKE2B d8b4c7ea53c6cb88e126326094a93b4cc56011b4efefa03abb4945e3b5e04d0a949cd2ecf8e86dd70d1f05f15977307aade6500b8ee4ad2e43dbc482f1cd4bda SHA512 931d0829858a6ff795710eabe81a80ce0d0ccf8fbf0a7211b7eea79808ef89c537f21d13cfb748a154caa6035de423161fc0997ab0abd5d9c330ee805518b192
-DIST firefox-92.0-pa-IN.xpi 605556 BLAKE2B 906b9fc303d6473caf95af949b99997e13f2a42e0b20d310f919831d7349562b58efcc47fe5b7bf9f0f992565aad190a7a16bab015bd58c647a36bf064c4be34 SHA512 8933c98a76f00aabb9ea066c3625961f3e8c5fc81cb6efedd9fdb03e2dc12b6ea9bf2caf4a5bfd23c3fbda58d7fbf9d9dda71a5171a13a3dab578dca2e8cd0cc
-DIST firefox-92.0-pl.xpi 564253 BLAKE2B ed03e95de5fad7982abca8f60d13703cc79e75667ebddd1648ed5cfb119f7c889003dc936b6fe291139958b44634df2aa8cf5070f78eab912fbe1ef0cf76f172 SHA512 d65c2e19d2fa7e6f9488ca7c98093d963978ed631f1c6296dda53b64756327cc79ac196aae637d4f9068e47b199ba1bac1dfa843489f6f139aea57be1fcf5e3f
-DIST firefox-92.0-pt-BR.xpi 550108 BLAKE2B 153af29fb86ad47cd98ce73c1e8bbc0cdce23101d8120bbb2cf80630c44717fc5af6985d565e0921b4af82b992fcf45ae875d0ac403cca328c2e0568464d3f51 SHA512 51314539e84c3bca514a83052e89805e2001aa20e49b4051d767145de1ead58b94f773dac3cc4913f98461b8ffc0e92c210ad3c8c6f557fd670b5eb35b693473
-DIST firefox-92.0-pt-PT.xpi 553465 BLAKE2B a10d5e6bf3771a690fc13a3a9033e6488b5c6a17a03133d75895948e80c00ea7c1b1f9204a71e721e4211d7315aeedbe32d3c47cc888e970d9d0c40ad4bf29a2 SHA512 2ed68519e92ed01b69a61d92dfeec1827f079ce150960aebb9ce685affe05de8ef9f75e5803a8f11b559b043c6f44a018ee24da5e299bf9eec1a373276ba85b6
-DIST firefox-92.0-rm.xpi 544463 BLAKE2B 0f604a6d26392e2092ac0814c3b36ab4a376e6f8fc6c3186506e3cd948af7934da88d4a486f06e4d8e7e6a4be65370cb64e77a064b976682a16f780709a70da5 SHA512 31109bb6c2b57799cbf65df3bd9ce925bb00b4ff1512d14f970e62da2b8e6f78f20911fb86ceac1abedee6e6c2dd25112500e1961416891731a80c7271611340
-DIST firefox-92.0-ro.xpi 546127 BLAKE2B 749eb2bf955edada6a3766bac8f6b0ea2ea2bea5a3ca18391e94d0d7e5e2cc616dc7d2746cb55089f977d70f4ce12136007748a28b830f0348f1e654c63755b2 SHA512 a2da72744a0edf00342e9691670b8f9c63ea7c1cfd23f681b806543d286a715fb21a4959b10ed4fa9293c960825605ba47ac1abcfe2d19db249eac49b674752d
-DIST firefox-92.0-ru.xpi 636045 BLAKE2B ed4a15e8c65f79e203025977522c93cc39311343a96d916d66c2a170f064f762049775d5daa259ff3b5ac2ebe9f700980fdbd66c35025d2f0ce266ca01185dac SHA512 6a5311cda22b75b5fc17a426b4a5ba08d7ef1b922940aad054bb5ce3f72df17a070b5e162d6da7fbacb5a6411feb2ff4c3c2d240bdd13085de83e49eb8161331
-DIST firefox-92.0-sco.xpi 513481 BLAKE2B 5c4911f2a62da4a36cc09161cba0c18d088e607b23f676aad2486eb635efe889fba37d52fd7f9ef594114e1c9c7c889051637e0b43ef24b3f3f3b9114f0b35a7 SHA512 cbe970e50c9b376604febcc0569ab98206f704d033e276cab017e51c5a31bd7deddc0d628c770bfd3881134934bae764e6e792dbe979eee0ebc465aa53325919
-DIST firefox-92.0-si.xpi 497459 BLAKE2B dfa7f8fe3314056a0b0337d4c741ffbaf7b8a8b6425d0ba57484241df79fc9b8a9bc5f0c554eb4e2e4557c9d91b5781f320bdb4e0082b543a9d41306386f212a SHA512 f3deecb153435df30ec2a2b035bae888d5cf38aeaf8afb8c3fb1c2b50b6bce6ee0fd947d71ef62d9bda46bb1ec2acb45d1002b03462422d273c612472b675986
-DIST firefox-92.0-sk.xpi 573545 BLAKE2B 0478f143011fb39ceeec1d8855737e893b531b9457373ed9eccae3ff36a48ba45fe6ae0c627acea8bf32e8904dd9b2391ee660989e89682145495f46c5f3ef35 SHA512 a75a0816b9539f3f7d3454f536f860510d1eed9002df79ec4b05af190cbad7f0acde9e7056a55d4be849cc5fbb6c988904f4f7ecce45642452d50140c4ed02d0
-DIST firefox-92.0-sl.xpi 543414 BLAKE2B 5e4d94809cf7852b5f7eb06353756612b712923b367d64d042a3b48121d804cf4bd0536b7f76f8bf580b65b050c69b05ed879a999262a2116d10b33c97db97cd SHA512 4f3a4a46f678c62ba7e66bac3f3e7790ae54a1a25eeaac82b8ddd0b751e45d89019116e9c5a9604e4aea09e1826a6642a59e9de60ee2a637a60dd6803098faf3
-DIST firefox-92.0-son.xpi 433438 BLAKE2B 5e8b80000c0a1d2e15193336f6b34f3a93ccf9b0881cb8e6b4a23df65a0331540ed031565a8e864c68c8fb144421eddd27c6b1173c4e2221503a366f4578a569 SHA512 21f026197ccf58abc19cc33615e534ff7c1648973bdc0266f3f9bab6483fde8de22399e795fc44366174c52d6f241e1c17e67a21b18293ed581ab0592d5002fc
-DIST firefox-92.0-sq.xpi 562893 BLAKE2B 15edc43578dbf9deb89c04e107b29d5770744baa16124ab9d410795cab31f30f262272d3b6791e1f1c7309e12f9e7cee6ff5fe46c7b47d2e0ee603e479f70f21 SHA512 216c440b666acef73904804ad68dadbc78266ca569d111e4dafbce64227902af5442d1ef9a9f7784e37498e1b40d9806389c5a6c6b7f12b8f2680f7fdc989187
-DIST firefox-92.0-sr.xpi 601676 BLAKE2B 9ed6f87298d0b957cfec315586672e2d701b771298c9b6198215b823fa5749c8f1e961df7677c5032ef25f381c684ede77c54c6f6d01df5022bf99f0d4a48f74 SHA512 2d7827f56dba138acecdca08ac856bc463309f035464f7415478170f2ffeeb81fcb902dc24b058c141aac51ff13372d9f10866291a29157b80344ca98606c6f6
-DIST firefox-92.0-sv-SE.xpi 547612 BLAKE2B f83b1a2886bbf9a2863d88d86f800b568c9d46ab8af4aa48ede67acad10b92abf73d96e7cc2fa91b8fb5e7de3eecd1570713f00db9b7641bc5fd0610040a2e18 SHA512 6307a8ab52679c91a7675b97d414a0b73c0eaaff0398570b994faff92d740f05c87bf4524c1b25e281aa4f4bf2c1623d088163071655ac0eae6c778401d0914b
-DIST firefox-92.0-szl.xpi 522849 BLAKE2B 98e915f6ecf993f9680976c17bfe35eda94907fdd860f6aac500679e56978ecbfd07918533037e66c264e1c885ff8dd594add6e2bbcf9fca7d40caa0179b4b40 SHA512 e38648e23f25e7d19eda6bbc208b1964c8e7b423de0c1cb317ac523a0369271b2afd2f8d6edc8a5af6499787094dd41629dc36c0736d4fca56b5fcc1b86f6e0a
-DIST firefox-92.0-ta.xpi 525652 BLAKE2B af375f03fd40988d8f932e58d9e84ffbe3599d6594c217dd86c88f671f4eecdb832d4d728a486d3d08cf001c89356b64558dc7e7cfbefcb58de96d5b547a3d02 SHA512 4b9d9d419873e92cb1d2aa9e370d55913257f827654021443d4aa825e9ff5ba12b182548d41cc84018ee07d9176b3367b8f8ccc6bc01e2d2f63da5cb7a8b2f2f
-DIST firefox-92.0-te.xpi 566292 BLAKE2B d6b6a24c36c394dc0b40d1c660bcae94498978a4bee05930ce1150dc38cb7dcbcff0be98930bd2eb25f4f339e4ab71ef25d2693e694b1ca588130719f58732ee SHA512 f59a7d79c93e7354d45fc5c9ed63eb5c0779992350f50c42e2a7b118f578bd231e7f4e3f027edfb907a5da4b84ed994b6f537843f0be5477f213228d92cba898
-DIST firefox-92.0-th.xpi 615176 BLAKE2B 86e3ae1518147add00aaad92191b9094c7c4f7e9c255411941c0bd57b86a7f21eb6f695c55585692c995da1ef45e80653e1a2869196901857bf2d237c9e143ab SHA512 09f1112028a5fe82a05e6df8e49389e45a91deaaaaf01a19e52c5469cdc3e19ec797966b3e7dd05f96f8a9bb5e6bae7ba4f58d8c321b7eae48fbda816840288f
-DIST firefox-92.0-tl.xpi 532140 BLAKE2B bc1bf0cac0212841e5251d4111de1096fffc8ba9f32e5b9f504ec45e2f0ce218bdb3abcc436c6d8fcdd9c82ce01e8566b3d92cd86746b40075d0d3024776fa0a SHA512 605f059fce9fd93b4b71b8a7f8fab9976200dd7fc47fd2eb8103a4b776c57f6a8e93dd85d175df48dc48a6902391dd45212fde9a00fa6c1a977b42bbe4424fc2
-DIST firefox-92.0-tr.xpi 560032 BLAKE2B 2f4a4f3d1cfdd09c19faee316400cfffa52171589127b069ea422670afa5d006ed9f355c60a375222b6846aa67545c2f65f5d28f7cfe52722865dbbce468b51b SHA512 3fc203fbb9e19a7f3e0036ef0e3ca1e77d0bfeb7adf127da0035c6073c319f2f7f88e2eb6331e625ad9d1c2eb878cf34ebe80195043e1b2617205a2fef58868a
-DIST firefox-92.0-trs.xpi 504293 BLAKE2B 9dc80f5c3f4d19c6d1e504eb073f2be0583bf19341380b3914d468f19783b7aade6d6ef6f562a362c2d1d09fd028d0ab368fd0b83b2d67b1939d57a8b332c615 SHA512 906b8201a3b90d4e7c002cc94cbf3a2dbedc686b6a0f663be348f2816e79e5c61c76b759a1efc308d4cfd29ab4f110a4e72049070eb8cb13c03197e9eba638aa
-DIST firefox-92.0-uk.xpi 630019 BLAKE2B 771aa32396ec1c57beda499060fbbf02f3146b92989e51913a245c6b1340b393c562a54eb4aaa264230bb83e43d1e26a537ec3a90e28c6607322b80f061fedb7 SHA512 5e9d1d6b74e8b7fb2fbed6b0861381e3d536f4fc53c619eb34d8ebf3d7046a6e84882724c274458e281d04f1e705971b81140ff90767ad2aef521796c7dc86a1
-DIST firefox-92.0-ur.xpi 573434 BLAKE2B 96b2bbe589296441e8a06987b10088487f28c880a36d58b3f5d03d75ac26569285b52c60758a5c928950704434b4f909b8890768b50a9edd6a178f67cc15d45d SHA512 c4ffdf34854c62a3326c0d3680d1733f4ea8d9f7bf421ca11d5a3b1c84ec2b18b48e34d020f9f79b6f18522db9b2d112c2405ed5922423e1321f4f6cb567f845
-DIST firefox-92.0-uz.xpi 481444 BLAKE2B 6e4a651e2915f0dd060e99fc229efc7a8c2f0cfd817d5b77fa33eeac0a3cd39c91a35b6ca7c45575c12aafa2822ddd7cd411165efe38bc97c91725c5f2d4c8e1 SHA512 4b68ad2389f2dd02d3855c131f7a5710ee23808ef79662de8790e2cb16f1b8eec3489407b62b00dbb718aabfbca407b67cdd382661c3590775a3d816fae27b9f
-DIST firefox-92.0-vi.xpi 581667 BLAKE2B 2a2c48c093a59101ec806c4754a020fa39bf29ca396150c7b0756081a5dbb8510df304f720813327bc331ac459d37e71cb41ff6faee8c6e8b9b25035717db838 SHA512 2e9fefb9b587046b659385fe656a35e3b14d3b8df598dd47332c03ec228cef058923a96a69f34f52683db94c724437b3ed3f968f7e5ef2b83faca6087664d01b
-DIST firefox-92.0-xh.xpi 435584 BLAKE2B 01d40abcd4fba4fffa1c5c3728f33a50dbe470dc3cf70764ebce255ddcf2b6db3662e9fb67d161b80984a415d9e91757886bed486c31bb64c8df4ee7ed474e1b SHA512 e0b548d92bfdd453ce4743d990497625245105d4f4bcd686c08b2bd1a185d2a2e5a4db1b797bdb0154dd25929119efdeed2acd8633ccb9af45f06627d88f5848
-DIST firefox-92.0-zh-CN.xpi 583255 BLAKE2B 6068bec5e9500fdf0f89d05f5f48ad06a20f93e7d96b6d4d1b4ab93496d308a25a7e1b6046625239d55e8e2e2ae3b66b3ae3d8463d01a492cb2b21dca831abbf SHA512 1ed700d048bf5029522737527996b4cfd4ba6221f3efd95cbc34123f2991f1137a310a7bd21e7ecceedf4891a8daa41f1ead74d2e280c44caf114e361335212b
-DIST firefox-92.0-zh-TW.xpi 583437 BLAKE2B 4a0d0ed4510867f786fd70635371e4431cdea9d97ce45246686515dd4ad65b19d5eda69ac8aa7efd296f55356dfec28fb2a2673e5cf5733d2f8121bd294a66cc SHA512 ac98b5609d9fb005811e9346fd933ca071cbf216c6b0bed7cc8bcae6e25d19add77d7bc3d04c3ddd32be6b8e0ad608826a36054e040e0a8b2fd78cbfec3356b0
-DIST firefox-92.0.1-ach.xpi 467091 BLAKE2B 69aca340ddc5d97b555f892231a25c7787ab653d0434c602d2cb482713f12a2855585005c41cf236b74276eea4c034eb3b4da6b762b9a094df05e8f9742366d5 SHA512 cedf46d637a422893d59ca80a5d5bb54557407f5b4b81c264ac0eea4fd3c099577a3adb7ac821776085c9be51700f7910e602dc487f8c7a0de3a97d925cc8a26
-DIST firefox-92.0.1-af.xpi 434922 BLAKE2B 74665b82986be45b12addab0cf7a8919dc7ff34743ac13fc4f81673d35caa73b98b27a1c096d7c11047992075588c3f2ca451073d478270c667999cfb30bfa24 SHA512 778b93916c34f8389266ba85da24ff401976ffebc027052504ffe9eaee677b88f8981fde8655e175be78358e9334b5c3e1fafb076d98469f8f4a6521c1ff33fd
-DIST firefox-92.0.1-an.xpi 517945 BLAKE2B eddb593c9a03a490089b9782c403c3486dbe50941c81ef10f20cc42cdc8ff029d29b1e6ca10c2944ff442fe94c41649ebfe17de9c0d75df6e76fbc15b5af6ca9 SHA512 30ea91d4effc5d151c34f999a114d4bd67debb72737f2d505ae9d51a0fe0499bfdb7cfd4e209bb52599a8de4768269ca526f3a89f9375dd105a0c5186bfa6344
-DIST firefox-92.0.1-ar.xpi 576665 BLAKE2B ef09d61145599aedde2e3429946cd60e5f675e027e600cb9d4e9bb29d167bcb9cf3aa015336820c55a489a1cb4e878d91eb4634c3f7f9593ab114e2a8f465e40 SHA512 baa81bf218257ec83d29c42ed4c2efa34bb322630c4b6a616d0bb4ebb5d60c97272520e1d8b9b345ed01d898987254830618abf2448613e51c2f81c15a64224e
-DIST firefox-92.0.1-ast.xpi 505296 BLAKE2B 044667d015d90a995e3aebd8fb7df65f261bb0ecf7ad81b418cd61ea0f21ce0e8b66d1fba112c7317b1e89b11d75b7acfff7617cb5920abc70269876ef5fe4d3 SHA512 68efc4f3c17d559471f3eff5fedab48e876543a1ec74b8b6f922ccec44649f0b23a82a2000c3309610e9a84f8cdc627ce1c0a9332ad92a010415b03a496f00fb
-DIST firefox-92.0.1-az.xpi 502850 BLAKE2B daece29843bcfb6f0f4c649bfe99e422c42515504beb9769efb8bcf64a0e94a3796c8b0c8804a73bfde270dafb00196f889a02883cc2e4e3778c64a378dd69b9 SHA512 18272f25199f8e40ebfb50c687989e63600562787450da6a773131c6cfe91b34d70260ad99fd042a0f5045f3c6ad83679421cea269e745d7dfa4da0f8042b887
-DIST firefox-92.0.1-be.xpi 632952 BLAKE2B 38ebe4481a4d1aa0512f2706a02b2b47d8d4d9babdf25be9757339c4f51e287ccdf0f92f58dd363d9e42eb9f198801695d72f5684964347e95781434d39cd602 SHA512 063930376ccd0ec362acfdc47e6bfe6a84667a2a7ee8d1443609c71395c4948ff36d79041e35a8d188c8358db241104514a46ccf3f69260293dde50efaac412f
-DIST firefox-92.0.1-bg.xpi 587050 BLAKE2B ab05b1eb1e0d0106006c8d9641e430500588bf867961931ac046f2726100e2bd3d39c2de5a07223c58d2dd919a19a5e508a45282f508b9f4e3a5361899d8a695 SHA512 a5a250cc67f6072a45e28ccfe6a088c972447407db5481af7b09308719397bcf20813d2de7dbd0ea8bb338ebf51ff2b9cfc1de298c1dc03a6d4f730ebbc42cb4
-DIST firefox-92.0.1-bn.xpi 578253 BLAKE2B 010f31e284612032bd97034fb94ea71e3133c5367e2e7785faa2dda8472257ca513a851f8087e97ce991e555113a465cfe3f4b1e94d5c14216cdb54d9de9a005 SHA512 6936bea3305db22b7feedddc870e8f69041ca43a889ec0d53f1118b188c5db263e74a9d542554142399b31c8fd9222a34a1f5213a4d446f61ddd80f7ed2f38a6
-DIST firefox-92.0.1-br.xpi 536626 BLAKE2B 59c83c882a9836a5bd244e2c1cbdcdeb83f804f5a069038b26935890bb0ee1398266d284333417efd5047091739cc7faddabb29e1f48459ba612fa69a9b9d010 SHA512 414d12959cfc20ece1833df145e708d065d98334db3b15f5de764f900f41ced178fce12640a9a7bb38cb2232a8771e1b0347b42e355e0e7ce0f0da26fbe7c14f
-DIST firefox-92.0.1-bs.xpi 474956 BLAKE2B 5f60dca9b238004c5ec2fba41d571462b4a4792ae9461db0b901e7fcb4279c554a786ab9099cc91f9cd2826998bc1e129e923f6362aa5e2eec8361c97f26bfd3 SHA512 0d468faafef0d744e58785706811e0b537eadb0019aabe098fe1e4275a9e23b5a95986100cf07d4242b1c6db761b1beed5a3857899f007468a042886837af6be
-DIST firefox-92.0.1-ca-valencia.xpi 545150 BLAKE2B 49c832e83be776020e2c6a980ce810619f52eeca8676f687289e237d3eb718392efd640c813383acae0baaa6edba4e0f6ce10348edf04cdf32839838a401603c SHA512 27891c006461663137f3ef5108251ed0e61a5df3f9aae254d6512592704d2363e80a5718020e55f4cb2ca33b5ef0cb9a9d6eb715506693e0fe3a45dd355476e7
-DIST firefox-92.0.1-ca.xpi 543595 BLAKE2B b9e3269c401f4422d578e527866f6e9fe8c9e30d40fc30745610b929a3aa1706d82486247045d44551e2818de8751e37c061b2e018e601bff702ca7d07c5fe0f SHA512 399dbd5a64a5fd5dea3f0d28217c180185409ca34c19aee6a4cea892bf63821b828106abae9dc8e92c29a8512132cfa40f751b2522b5caa603f8d56b0ee1f42b
-DIST firefox-92.0.1-cak.xpi 569987 BLAKE2B 69a87f4626ed81fcfad477a3dbe5944f77d76f3be7c4703677e987973e92adbb4814f7092d1e1349a014105ebc2d531c8ed1f7ad6c66668bf6bbe3b52a4d6ad6 SHA512 3020fbe0cada3f6170201e297962e431cea07980fd9ae0a4ec65d1e52f084b479962958727df46f2b166e0256b7f3718297fbe27e1b4ba07107ea696842a77af
-DIST firefox-92.0.1-cs.xpi 574516 BLAKE2B ebba30d9afd0f9fac6b7bd91a693527af53a02ace7b5cee5ff2fe8fb25dbb7b9e25f5071b4852eecdf55d6bf94ba5da0f2287384ef8413f6747fbca47b7fe676 SHA512 8b9f9c688215a5acd483344deb43fc6ce5cc70d8e3a99fddbfbd7a365781328195365fc4b4edc23f34eef2b61033559aed70f60d5e7cfcd7f056183fa0769a54
-DIST firefox-92.0.1-cy.xpi 550434 BLAKE2B 198fd5ef724364955ae1e465e6df6ce8c04b4166c31636164f48da89ed4e8fa98d76fe8ce15716db86c4a3a2743eafec075a05bdc978cd69d013d20b8d092ff3 SHA512 01a05cf99d47bbed6db1c6f5451694c1c32fd4c325b55cbdec1c7e2363da670d85dfd6d46a336840716df9413e46cbc76d75b942e8a50460930f4f93a6afa546
-DIST firefox-92.0.1-da.xpi 542309 BLAKE2B 37aebd2b404811e56353b971fc5b40e3348382d930f901065dd4ce2423394227e9151fea73a639daab2c317c49a41782e18a0c7ef31d8084c5fd28e16a566af6 SHA512 60a6177349af0ee7171dc24e786d32197f177d8998d0c468683fe156dbad6b746d522de90e088a68706a063fd9a7d42992dabd5e678ccb3660bc3f3433348d0f
-DIST firefox-92.0.1-de.xpi 562713 BLAKE2B ec14093825cc5d238fd6083eb1da42006375b6c28091d9649b3ae89b855fc16a4e3822233677a0ea97088b7adf4de165ab0fdc152052bac5b6092a7bc6f9a798 SHA512 096ba106dcdc34f67904ea88952e8941a751fd8e82ee244e20ae4b62f13f4cae57a45d06c5bdad5f0c1a3c37e4f8a8bb4384644728f6c1535bb4403a53335370
-DIST firefox-92.0.1-dsb.xpi 575414 BLAKE2B e5c4f231f2ee332a2ad3bad5084bb14bd06dac4e685641a40b8093c7fc0b26cadb1a35e4cd83342f510102bf4805aad454f71dd67cbb50d7eb8e26ccad622b1c SHA512 90d4fbb9616ae075494e869e4308a12978bca33ce3a67510f1edd6ff4131ba86a4d25f7a3e798381fc47749d8e1506c5e1336658019cda6424d450c1586a2e54
-DIST firefox-92.0.1-el.xpi 648536 BLAKE2B 7242a7f237fa95d5ce34ae69cddeee413bb9038333b3e098a31c0877553cf977dac7d9f646dfcd693819d9ba774ec1ba1c43b96453468ae541abfdcfcc71dcd2 SHA512 b2f5ab2ee854e0e8f98dcb3ed6032bad4f87f9e23b370ccec84bcd7ee872549ea4a351dc91cb443a28f38bb8f893aa8f34350f29877eeceb6275f3ad06d458ad
-DIST firefox-92.0.1-en-CA.xpi 517708 BLAKE2B d7c511ca653b3f06c7741a99c86dcfe167bf48ab33f6df0bafc868ecbc1e01858aaf15c5a151b671418af888317f99aa32c78dfd2036c9ceadf4f4b674ecd59b SHA512 568a3ded1e3ed0f2f0c906ca5c598ded3f67206d8cf8d755026ddd1ce488cd6240e8794b843b6485ae0cb465f87ebb59f1ddcf00bf095521f4650d0a6864ef96
-DIST firefox-92.0.1-en-GB.xpi 518288 BLAKE2B f4997bb8bf4efebd932b2168b169a71905833029f55eabeb796e129979664022499a159336b8829c3085711a90d2266ee8d77a7de4056e0c7a581676212ed1d6 SHA512 67f888c9280204db3afcbf1926e72416dfbe90eaca6998b53d4e7e59169a4649ee57265ed7fb55af61cce19a8379841ac039a41b6b8bcaec61557791c3e2f83c
-DIST firefox-92.0.1-eo.xpi 544471 BLAKE2B e1000cdc59b7ae59da9f68768f5584ad20b936b89facd3cd7ac5940b5367323ca865d47501ee052b10fa407fb5672fb53683d05a6464124a07dd86b97d5f8f43 SHA512 f2bb903f1ff5784cdb931590a593a68a19887d943c723b81a9cf7369e01bcde209e43a1946a3f27b5800138807eb2d12c27976f0b839d6e0eba14bda12f4324f
-DIST firefox-92.0.1-es-AR.xpi 555769 BLAKE2B 4f9771bf531c15b7ab318231311160bf302ae7668e215fa7eb20abd3575aef5a4921a56623f5c8cf52f8089b8c7330977d828288854ec3ba23c687a1506b09e6 SHA512 bc2d83fa348a7680b393f4a1e07fd739ee8c683dec2740b2d76e98bd08078a439cd6c3ddcf6176021d7d64fa14858635f9d8eefb48e4fd148a60dc3ef134fb12
-DIST firefox-92.0.1-es-CL.xpi 555069 BLAKE2B de7983a601eef0071265db8e2f7354f61d2489c5c091e209b887560a30b4e5052bc8af72745196628540e3f217f1d417ef89b58b60cc8c858a3de2352a265cac SHA512 28b768e3b141a906d565f61a0d90598d168f62e7a49e7fb4d92d5ead75eab16a162f73b8096c95ed0c4e057e4718a7c903b1cca1ab4d86780461f01e4520039f
-DIST firefox-92.0.1-es-ES.xpi 544458 BLAKE2B d0d27949b05006f02d8e28f9e19af048c9ea86ddea7818977e9b798b77d84dd374048e7db7b73e676f7933f629a2b43c986a08bea7aff80ed40cd0928fbc861c SHA512 a72be426a5944ff674e69f3fca0f257533de8e302848937ebed82f73f8f14d4ebf4d5d512e68ea236c5fc05ca8b7d118644a07ec54109c754f63db93e9c47565
-DIST firefox-92.0.1-es-MX.xpi 558216 BLAKE2B dafd0b8366b5d2d31d3edbd025cb26196e671c0e0b67aaa4015fb92e0a549d85f0b14502581d5422dc8f165fa8556e88a57c3be97e0b045799d6742385a06b99 SHA512 646487f1334d28793b1a2ab45491b93cb81026eaeadfd295fa33d997fedc8d1f54edae1f932256790e267e4f1c54b94840056d09fe50c30dca803392c20484fd
-DIST firefox-92.0.1-et.xpi 496094 BLAKE2B b1abd936dfd53da623a437def5bc0b37c35c64e09a36a30163d5c171258a0dedb1606101b36e732fd7980892c27f31b3012d3c8ec7a1dc42f6f4a76d8aaf0315 SHA512 c9e6e9edb7554f7cb3efea890a40fd44870d7de2a98ebbfbfa3807338c422d6870b12ee263bf6ca8fdfce153449526fd38b1f71b4c9bc9cc210a352bdaf795f0
-DIST firefox-92.0.1-eu.xpi 540994 BLAKE2B 680a466ab969833a8a204721c6cb74851e39d11414b78296da796c0bef0390ec8b0ad89a0230e670804bb6f161477be9604dc8d3abbb03397fa293b59e435e69 SHA512 008e54af9f429e000ccf9014984fcab80be8fda0076424d8eb78f85d1d04f1124cca0601bbd33506fe6a2ee9a07b59dffddbd9d4505f7d2d0b0d342a23d85a64
-DIST firefox-92.0.1-fa.xpi 572448 BLAKE2B 6c1a51dfb257c0085734d3509149982777e9b1d443b71e64edd1dae6cf9452e1c010003b94b77376d14b6e6160a2197dcf631dc9355262a9ba3df7a35838d696 SHA512 b5888fa334d9c94b9f139665c388f0de5f3c843fa57f37d8d9de65a8ad403080c924afab62f0fea08e708187964750161f7c4b563e7442abed447fb99d7aa76b
-DIST firefox-92.0.1-ff.xpi 487643 BLAKE2B b6f6184aa3921e9d404a109ba5a401892b958ec195c31c04c94a7419bfa9d04e5cf71385c11183bd8072507e265094e11e260f0cb0dd7af540ca63844b25c6e6 SHA512 30391a4fe1426566e05cfc53bedb7f4331690af9e478550a5356758930f014c59d3dfe5ff02d3471edbf92a440fe0a75c37f96a591f184e3ecfe5f38b10f8ebc
-DIST firefox-92.0.1-fi.xpi 541929 BLAKE2B 59d6b15a2d26ba69aea33ea0a91f066dded0acfba62db7b683c04aba889f7f18bae56cef5f964ce1814099d51b9ec903c9d66fa79d5c84abb73ada4bcf239b59 SHA512 d85eccfe46d281fd78c6b924bcdc08dce713c7ce2a2e4751444526be06d0016d7bdb43f20337c4af84c9611f226423f4dfe45537f4b86466f68bb7c0b753bfae
-DIST firefox-92.0.1-fr.xpi 566844 BLAKE2B 3cf3c42d97feeae841eb7022c7abc37b7cac44fc69dbd23cb62604de2aa7306e178ce5a08dfa241bc273cd95f116c15140993e290b79235b8c6551603e196ed8 SHA512 5520ac0e573cb514361ec149b7104d963e571e051a90529059661191c11566bf5d82f49f0e1eac0889210ae58acdd50b111fb53ed05593f70d96ece763cc8556
-DIST firefox-92.0.1-fy-NL.xpi 551027 BLAKE2B f9ee5f46933b110a770e0e7267eeb07df883d27a4dde193a97c2f1bb61e2fa8410c802556443f753c2625986c33e810e3630142f01a00756c0e4b7ab2dbb07f8 SHA512 045eadef3abe25d46006acaeadd73eda2e70bbd1266a6e2d1edbc2080aed8155f98a83a8c6268680149858155935369a171cf5ab3fae296a945282ac35c66d9f
-DIST firefox-92.0.1-ga-IE.xpi 472694 BLAKE2B dc8d8ef233a52809175b3ab0a88a4c55d70f5d61a881da09c316abd826ae754c4bede61a8bb56374d0f6b3fe0cb8f04fa67d857f0ebf893f50d39b81795b90d4 SHA512 10164d2c45ab6a9a2c66ab93aa5bfb64ba91df1e35b9a0b41f1b049db8d1d0b0de124ae52096b9d8f391093a3d8534eae5b8fc45861fe41d14de94be31529b01
-DIST firefox-92.0.1-gd.xpi 547163 BLAKE2B e568e5bab06b43a0b21a81f32fbf8996e2bb7792fa203ddd290f135e44536afc7c3978787e3466b53dfc602423ce1aadfb02b59e3071f445a2a3aad5cc1affc7 SHA512 fb849f1846356360ff5f26d2ff0d23b69e43be7c1a32eab5288ab29d1cfa2189f466510bb7c1fca8030a2764763cc19e11f2e78e35d53b1ebfd45e865ba9b4a5
-DIST firefox-92.0.1-gl.xpi 550222 BLAKE2B 05e12cb38f43f548ef22d79d7c8dcbe66d89341cb706d6c47d3c529cc4bfe422925992417b8170de056c5c5d6821a8b1c3e1456bcab2a8de21167b59cdb52f6c SHA512 7f54e4344b69e95ab46b3ba3685bba16087877883d3fdee23ab40c72ebf67543bbb2dbe403547a661fdf8ca2f891882e893dd808c3da98d7ba49d6b68c0129a0
-DIST firefox-92.0.1-gn.xpi 567834 BLAKE2B bcd3315219def7ff582547c9af04bc1e2970f40476f46a03ba0ba75c272846994f6c742c583877cbf9e2ad7214b18144252d8fbc8ce29506e135ddfad741e6ed SHA512 e866ea1f326ad55d873d0e233bb407cb707838c7fa43784b21cb58db07caba2ca30e509e42b1b7155371674d6949be7c6cb1a1889c2cb055d8c40a9084f8745b
-DIST firefox-92.0.1-gu-IN.xpi 546536 BLAKE2B 4e89f1165c0af2d73d7f15e284c19f0a69c0438589d480af1040f924599f82888a5a4ccc66b02150af3aa633fe7b5e924708eb746581fd5b013ad70758bc85ab SHA512 e7271ad3a77c81ed6665001578b4c43dd526250d1f8a91fbce69edfa01573091c8b025a5345398567363418f9e87167ced54446227aa583e6331a28a2dca78a2
-DIST firefox-92.0.1-he.xpi 565228 BLAKE2B ad2edd6e500109e164882a7c9aacac18043eb7496042893c8b22052fadf4803ee6096de94c0356f14874fc485f2fdf88d57884de6b3a999ec82db7054b0f91bd SHA512 3e17c056af8f8bb31915ec9f2715cb967b363d093adda9678454f1bacff6ad148e36af408cfcf5839fa63d63aa0eaf7d8f15a35c5646d7bc4fc7db0d95f5db42
-DIST firefox-92.0.1-hi-IN.xpi 577578 BLAKE2B 79b6eae21df015867d32cf8baa7a9aaca030066ed60d8573609477db353d865dc6daf2537d6fbb759fb40125ce0de68a577f041f6c212c29444628d9b597e6bb SHA512 4fc9bf7ccac9a49daac46b15570504a6c23675ca616add53eb6d6a673b0e1aa9e1f10699db1437f40a351970cb23057d540c13fe609232db0dbb91d9fccef6ba
-DIST firefox-92.0.1-hr.xpi 546282 BLAKE2B 4d21d64609e0923c10843d3f6e984ebaa6b28dd852ddd57909bbc79b988d48e516025518d15d07717ba3238d52a265bb4bd4c16b86e2650f2adbc2019d160007 SHA512 aa2f31c3e6e76fb8cca873c3837a7e7d95cf452ef503653c5b134b1470745ec1b196c2a419e51a82339b49c1f04725ff7f95c3d8f031562e954dc55f5b6e1efa
-DIST firefox-92.0.1-hsb.xpi 571502 BLAKE2B f8ce24b9b8dcf8b6731353df1e9838044af3c5b4056a7e6ea19a1527411d50d16023efebadc1b38868dc6aca0e144bdcebf24b76053331f45ae629d6f0da876a SHA512 fc2561e3af337a2fe6363a48fe69ae4764c78ae9621fae17786c9c5ff6cebb8415b54696488707476a6e5a401c63ff8fb3e456f879e3d71411489c459aeb8a52
-DIST firefox-92.0.1-hu.xpi 575396 BLAKE2B 2b3ffd087de2f04d8430eedba7364e8f670f50ed24ead6569355ca61d573e7b94f9529ffcbdfaa06bc6240d54c2e61adcd1f7af85d357b088f17902829de8e2a SHA512 15852bc771757e27768ef5912a49d320651f220d918a6ad935a49cc53915152f3c964f902e32ec242c3742e6ec42c7084962f26b3a1d7931468abd84cea0c6fe
-DIST firefox-92.0.1-hy-AM.xpi 600941 BLAKE2B 2afbe11e643feea3e817a0675227eab80e5516079c90331bb2d83cf9b2690d790e44455705aade47f392b2d46bb44f2647f1c9925eb2c357b0372fd1df81e2ed SHA512 6033ccee25c6a493b34bdca82aefa7b1d34854f09eddcd314d646cb0c710a4e9baba56ef4f0deda9a9387ce6d715f32fa173a493fadd26dac25472d5221e6264
-DIST firefox-92.0.1-ia.xpi 541035 BLAKE2B a62700cc1421970349c636c887a9654f0979adcf1a9e1956029fb2974f714b31d0627147b13b0779cb4d49425f59838fc25e0a2d99b00b8d2bdeeb4bce2c0159 SHA512 a29f3835198903531c3c4b086e1b27a5640d194582d01c6ec9dfeeee3407e6361e3de06e6bc6f24c960f8a85ed2eb5247c1db1743f4b14182216a8f06ab49700
-DIST firefox-92.0.1-id.xpi 535782 BLAKE2B 9d232f08c822cfa33b4cab57bac12f225e75810435fe3774ccbf872fc7aadd622ffccf7e18a4b5c70d2ca1f13d63b1c60f92005e2bacc2931c74b3ec527dfa94 SHA512 234b73a7204f688306b7a7387067c1948fb6197daddb382256d8f0585068960ff820f6d8fffefa02caf97dbbe6545433472259a277e3fecb1ee7d46dd2db7bf1
-DIST firefox-92.0.1-is.xpi 483259 BLAKE2B 30b5309c3863003cf1ed0d8614ee1aae89f8b275903c2da78eb047cbbe97a73f2127d967948d8481ed350a75e23327a6ab09998b1b2b15cfde58aa8f487616d3 SHA512 d39f3e7ab6dff8233151fcdebe608678413f8e1311a2cd9d8b0fcead26fce068e7b74ddb80bc8e1b606c358ffc325bf2bf62a07b936cf83d6bef95f7e73ea5d3
-DIST firefox-92.0.1-it.xpi 468804 BLAKE2B a144856da8118eb796b79a76d1f5e0f3d0b72820094c83851bb4b01e9dc71d3a0784fe8cf3130abeabe68877160fbf651b8b65e1cff85e51b4203fec68a698c8 SHA512 bc34be7a704beb17711f3cbcd2339853e35b6fef79ceca8d5b6b68b74463a16684bc07df9cf7f2ceb966fcf176d02afc8cff3838df753c10b07ab9ef4f98ae51
-DIST firefox-92.0.1-ja.xpi 600987 BLAKE2B 28371df404e08d1bc3c3ae42c9536bd41bf0e6f25a3aee226f36d073716189598c51c7cf5dcb4429a226177c4f0dd12355d8b181b031bddae991640739bae714 SHA512 a6a98fdf80ef0f5ecf3a83ca9bb3d9ea936c353de917ab767d83303f5deebac4b1ba024c20ee6a0ab7ef775b35f597c585753b1627268e753403555b10cc3644
-DIST firefox-92.0.1-ka.xpi 602473 BLAKE2B d8b9971b5d5a472d5faf05a4c5ba6de08fcdd1e2fb193f0dfb13f09bcbd34fff05730eb28093cf794a01979fac66e4dc8e1d5e8f2aab7f692ef64d1138139e38 SHA512 c1ca358b3ed5f4699202ef76bfb0712554637c90f09b65f3499eaf02d6bb24c1c5f03f3af8919fad6529536de66fdb9e0c9392dd854fa4b9d708a62d09f92fdf
-DIST firefox-92.0.1-kab.xpi 560163 BLAKE2B 0d250fe999d0a47de95bb15d1cafdc05b404ab1c6a9b7e61dba3a8dc64ac7f998b94362ea19f598a2780319c50c5daa8a47a7535edf2310d1ffc1f7cfef99595 SHA512 8b8c625518973e0013a86ff0e5341e7c20db9038f31d76151c2dca54bbe86015e9ae69d8dc5f6e1ab155d61091dca0bf4c73ad18513fe607f600a7fea61eb530
-DIST firefox-92.0.1-kk.xpi 616646 BLAKE2B d877bf963effd6850bf05a5f53542cbd27814b77b22a1073e20ed6765cb2616b298bf1bd577169b9ba2c7e0ffb38a3c9d53a1c4a7d407c69e3ab460a3e62b708 SHA512 eb6feee9fe266cb5472208d5fb1e86572ec2c98c644eed5367fbf48822966de9d5ac5ce6684b27537a349b36a99b1c150651948ea3f0097633f8a5f0ee47c083
-DIST firefox-92.0.1-km.xpi 546739 BLAKE2B 1cb95911a6d73481d7aeb09835765f29bb42fc1807466dd364118fe09796f1c5872aa5baca7518a917b3c3bc2908b641edfdd48efe73e5b3cca1f3e8f9456885 SHA512 5c09f8d8d4b71f4e1fc8aed767ad375e3fa012d642c499de8748fe3e1754ba4042cfc17ccb864f28fd5f134221fb404758ce1f16b0d3544d998e83ca2d28ecd2
-DIST firefox-92.0.1-kn.xpi 510404 BLAKE2B 4096d82c3becb34efad6742b85132356f4d77644f87640572d33cab3960c424144bad64adda1a80eaf733a6e609bfdc92af488f3df23a77846a6899e5c10d480 SHA512 51724d39bb53273b5b1992119c7045de4771091ee47ad49283ae55a958f1d03dad34473a79e1d57692fe20c8c12ca25114bdce319ccf952986d4a599b151baa4
-DIST firefox-92.0.1-ko.xpi 586709 BLAKE2B 8dbbf07c24c671491d37d0d087d89e4c7553c5185eb223f3063a3a233679d40b6d18559d2105cc892dccfdf5f9fcec8096fe100c42aa1a22a2d0356655312476 SHA512 c2111821f6c20f8168f26ee108cd91ad7e72a746e85db655276607a9877fc2b81ebeaa988cb3554082ce4e4c5b18a7e92adfd0c2b1f8427820d759c16df7928a
-DIST firefox-92.0.1-lij.xpi 483664 BLAKE2B 593a8e2de99e2d4b62ca73ec1356ff1d48ff7e966074365e2d515b1910e7896c2a9440b06540ad045bbced51313c6ef0b7aa1c6ecf0eb311f34bc17d9bf54712 SHA512 216c2b37fe8dc3160c5b03f33650c5c8db49e3b0b0812f9f5998faf0b3a2cf602f99bdd066aba4ccf070386896a6f8af0f40631e3e2d73bbbc78cafa25f02777
-DIST firefox-92.0.1-lt.xpi 569334 BLAKE2B ce33287575b37005b5a8599af50288435da063778aa0f50ef41077e1a2ecf5494fe528b0f7a7fa2074cd1e45528990ab6712cb86c6f028f10a11e79b154ff0e5 SHA512 35d7ee784a5e280511eb7986eb55301604d051d24718d856e2fbe347dd1ec862d2e54f3bb7b67fb03796dae3b0e54ad6b37c627bdb209e21f6b212f929c56420
-DIST firefox-92.0.1-lv.xpi 475270 BLAKE2B 1f83cb03241b986e3f1e8ac034c47bb93e7438cd54636bd924cf1b529290a621a7c1a170974e84aa3ab0ddcc589991aabd7daa7386b2b8fe981bd106dc00a692 SHA512 ceabb9c3d53813532286746ba9fb528f449e81a5ad9f4539a70e61b0194b07d03274a599adf4eadab29083bc27fb20897c3c23918ce3c56299fbc4ec0f8ad1ba
-DIST firefox-92.0.1-mk.xpi 475197 BLAKE2B 5b46b373dba926450d7b556f45f39a24be68339ce77f6a89d25caa640039c75469f929b8aa90fb6e5ed14a64375b240123095754b2e0822dacca716b26c3622f SHA512 e66ba3599cbbf01753412489eacfeb5349ec886a601b9b72a2c375d520ebed5e76a31aa4d0dc8e717257292343b2427354170a30e4ec186a39f194747ce16560
-DIST firefox-92.0.1-mr.xpi 548695 BLAKE2B 8277b68e6f977345d5e4e6635a1d8cf216d1fd0add1d85ffd53bdeb3a7719ad881920ca018f2d106c9497e2bbf84fbfcc310fed98b93e073b9d0f2401dc58592 SHA512 9b8ca1c31eca1c2935d1dd026422f9f69d9903b88c07987e616e07c6c35d2798d45f91061ae199ebd1882958de72c35d60ebae7f552c62c19b3a7cd44587d5a8
-DIST firefox-92.0.1-ms.xpi 459113 BLAKE2B 93bd3525707f6cecc94e38101a629168466c24575f93225c33d8605d119fd56d071c831946450a1c27ab30c7d445baf8b4d964117c8fd372692489e7547902f1 SHA512 8572f1a8dd9878ace14f1cb6f11ca460218dcdaca8136a2ddeb10fb26d1690ee75d23da6a6425659f1902d8745b7e1473d8b7e58fa95508045a975d48c6e8e03
-DIST firefox-92.0.1-my.xpi 532115 BLAKE2B 6a8751365950b932fc760ec1d42af89433522f04340c83fb71602eb8fe4826c1147fc6d07f80b63cb6cfc6a09260a334b4b6ecdb880cd6af89825e223805b25a SHA512 81008262fb836b9cd4c6f9f4ae1fd40f1c958be18239a5e891d345166cb01d5011003f292880b06918b6ec67ca63bee6d338e9dd3f2d6360cf3848d83a3ae433
-DIST firefox-92.0.1-nb-NO.xpi 537637 BLAKE2B cf359ed7cc20ce245f412eaabd95eec0212a8712d01654d0de0378beb440d3140ff079689905ca326ee26fa59c7552e65ef5a34c92decd344b69baa15ec42a49 SHA512 5159b1600501f64b66cbf6e76ec34cb9710e4cb30394b327c5120507464852adb4665be377c3e6cbb62f473ec7d004de464228ad636a5e2381619595f12f23ec
-DIST firefox-92.0.1-ne-NP.xpi 488068 BLAKE2B 6c20c38df8c4e7d50cea8651e2a5fc8b814061cff80516f30222eff05ce8aa9f32a6abd2333b20e80dd9f1e6aed8ec629dbdf4649c1f50fa76112a4c241c5763 SHA512 569a3375bf8d8c5a87f5315c6b9ef8d29cab2b0f8315765549fd09cfb8b35e4d29e2e5a8909832e0fff2356efee74a16ff9c2b1d106518c58db7e37c2a16d4f9
-DIST firefox-92.0.1-nl.xpi 545568 BLAKE2B 53b79d5cb04c1fdfbe39f77919e11c363024eafc742749f6e723fbc719cb09007674f45aceb594394987c1743d4ab30bdb320ca5272284ae2bae0ad67e6e9a27 SHA512 6b5a9b8d3d9453daede5665022191fe408c6ea3063b3b9759ca098261f386235a10e7fb58fa07d0e33672e521af4589100aff65a59848381f44f8be1a43e67b0
-DIST firefox-92.0.1-nn-NO.xpi 540432 BLAKE2B 5b6860b6eec352aff726ed211c42ba65a97931b9c2e87719f62d980d96c8515939532796d41cc8d482781189afb3c27fa0067c7c3162bb54d6370a5eef1b379c SHA512 55f5640ff1cd9a23e282e8a664063877041797524ad732007302b1663b21ca8dd2116919b765116a216114fb8ee02dc6491d82cc1c62fa54a3a0229f24dec955
-DIST firefox-92.0.1-oc.xpi 561710 BLAKE2B 1e67498e17e081c544eead14e74ab5bb7a14048c2d12f02eb0953f212b8fc7a57b9d122ea55ba8c9f0b11fc5df95a4bf7cf4ce77114902433a6c902d2a03aa83 SHA512 09555295b118f995004c21bca1e1f49b991911943fd9614d18407aeb41baba67c7e11592c2a4f17a7a7acc221cd78430f80d4d318b296e9a3eea6c684101b91b
-DIST firefox-92.0.1-pa-IN.xpi 606782 BLAKE2B 37c7458729cebaeb95ae358524d6342d5626296e6ed4b2501d4ac6dbdc7105f8f8e5c504bd73d95a461de8a26408258d0c565db19891b2782ceeb21b4f6ab500 SHA512 40a5e0f805d6311486867df9e8c176ee7a0b84a17ecdabeaf615305684a7423227ced86b53a80dc545d66b9c8dae9b95c52a2a13ca065985170e7f43e0450be8
-DIST firefox-92.0.1-pl.xpi 565472 BLAKE2B 926beb34f5c48702a39ecca6cbb8f2a3f91523a38676862a2c3260cec9fbb52b670ff68f9ef1e37f05bb5a176b34637b326b405065efce4af2e81169860ac69b SHA512 94755897209df0be77e0bbddfd70a3066f0d156edae021a362ae465599c15f6689d18b69942b90894cae10605e3c0bd40035278c144e28f8ea500108f71f0015
-DIST firefox-92.0.1-pt-BR.xpi 551336 BLAKE2B 7ee83e8207b94dc3003265d6a254905e709208f1624238fc3eaa6d02ef66bcf9b029437d51f96b059a90de6cc795bc749e24d728a7ec8af91e4d4bb27604c441 SHA512 8316846328f0b795da0566b4fc6feeff59bc833672ff1ec86c475f032c861ad7b17006d07c01b60b4235706b6e19d67442d4b6bd88b55d993484aa3593a622fc
-DIST firefox-92.0.1-pt-PT.xpi 554681 BLAKE2B 47cdc49753490d06e948dd112e07678a6e59c825278149f976dbe8cc7f33f1fc85b8e25fdff857dcaf07f875b1dcf5994165cd270db84ed2375e9e1b0848838e SHA512 95c33aa12d8da5ed6c47fd9737292b5c3e622864ab4f5fe0a66e3170fa6ad2d0a0bf160cd91c8f254f5f5ff8984d3d16a64546855e9372eddb0427295db6585d
-DIST firefox-92.0.1-rm.xpi 545692 BLAKE2B 2c15a7655985b10a9a8f973e03b10cd2f924f85746d44b1801c024d82d4aa2b471dd2681c399849e1d3fbac6435bbc2add96c0a8c75c1eecd14cc5543a5d079c SHA512 f27bd85a5af8f12c2f7f7c15afe67d6ddda831ed08f11ff212689872039245668ffb9a201a8e9f51e0561a3f9bb9ee698e81893b5779bffb81079f8ec3be62ea
-DIST firefox-92.0.1-ro.xpi 547345 BLAKE2B 9913ee0f7877f40170b5777a089ce198b9f663225e1a864ac9ab84e48604c87dd255e0db2b7c67d1592e0daec57836d317d6c9b7050fe9c2d3c8393438119a46 SHA512 2c45afd35cef5b17a3bd06f1b4e96bb3976839acfe38570cb2ae78217bac16f399d64fd1f66d9e7a51383233a8800c04c3f02ec7b78116c8dcd4521fbac69f29
-DIST firefox-92.0.1-ru.xpi 637278 BLAKE2B 49a0938762107625db347859ef9f38122d2d2e6407225206247e101c6dc901a380ff333a6eafec02d839333d080583ad4485c335cf34fd57280dc7e25fff2e47 SHA512 71d14a75a20b593058a55dbb9b34a132c238d741ef4474e787424bfc5a7b74cb7471c42ada99de09587399462c8f8de9d3aca5c6deea702bdad80918fd0b7dce
-DIST firefox-92.0.1-sco.xpi 514697 BLAKE2B 186f7beb84597887c79c70afe60661f1cab88ee76f8b5527531d2d856ffedc39e7163c84dc4765c312ecb0200780beb8b9a0a81d60a2ebd1a5352ff14e5d09c1 SHA512 4befd6e5e6b10fb266e6ccb0470e6aad8e26660592ce462bbe3b2d606e753306c9957e418c061c33a24c0481393a63ef382f16e97ee72e3d5127eb3e4fc8900e
-DIST firefox-92.0.1-si.xpi 498678 BLAKE2B f1595ae2b5777876e7bbb9eb75c4830a612c43581f8d43281457e4ecb42cdd0239e7fc3402021dcf660a33df098411672007713fd8f4807fb16777b19bba1c21 SHA512 969974e5667df25670ba0917afececee2895963aa7c1aa0a5d84f4de2d153b5b424e4009badc77ea7b268d9c2445d188cdc44f15688f127d0e425ad2cfb65071
-DIST firefox-92.0.1-sk.xpi 574783 BLAKE2B c207b3b9abcd9d80ae9432335fa8e7931dabe5cb0dfafd9fdd8338d0d70874703673930e76519876533444ce46b38c14b7e5083e19554985c7f8998da6421a30 SHA512 f34fedd725c889e26f3c68d7703df1392e221c0813bc433f350fb0957990b5012d76dceed7aab9cf98e2f791780e52a78da8404370b39abba4c4211cac6cf99e
-DIST firefox-92.0.1-sl.xpi 544638 BLAKE2B dd09c8cb671304f3527b9174c8daadbf85c1e95262a7e8bc98f446d9b8d94e1243fe5b8102c9871af4197d3795ae79166c3b224328f8a8ab8578e42311f518b7 SHA512 e2e8f395da4fb63f05a2c0e18f7b64924e07c9d136b7109310d307eb5df59570967f4a5562e5011430ec34b2f2536d2a77444f3e773fbeed0cd426d25f26d407
-DIST firefox-92.0.1-son.xpi 434675 BLAKE2B f8f9a342a2a7f8ad7bc9e3e1c1326b06bc22febba0540d204baa3e758e5cd59b83ab405ec1dd932d1ed991a3bf3430f2a96cf8f6c40c693f1cf9d202895b5da9 SHA512 22315bd63dc7a4e4788f69c043a83cfbce8799b27fc062d3b275805cd2114be373d17318ff403a59d5610aafa06d67a5bb11b5d1c9103f6d526a12c0c949a068
-DIST firefox-92.0.1-sq.xpi 564121 BLAKE2B d6dfd2ff91529f23b949b3c71c1ea6cf168937e357dbc741581183939d595068ff45fc77f293bce54477f1a00c133cd3cc4bb36f681d6978276b3a5d14126bc9 SHA512 9ae5f83ad613fc13a5ac981e5e26ef2a4c1d4591428207c02ab6eabc34730b093b17c60b76a9448367458ef9a723a2ff2450717b41c8c06c291af088af242d08
-DIST firefox-92.0.1-sr.xpi 602899 BLAKE2B ea0c668740684c63190121e5e8f76d4e79e4d5eac1338796f7aaac21595e3cd7490b31881d8cac12decff51b3b24329c9c77bee0bfbff4803f0dab4537617593 SHA512 36418408595689a861b6c163a20af801608c989f2264917135635ddcb93228486cc47e5dc42cff725d7e8682d516291664f35eb14688d6ab1e7b745305203db9
-DIST firefox-92.0.1-sv-SE.xpi 548845 BLAKE2B baf80c384c40fbdeef0ef0fd4c42829df6e41fc5775849cc26efeccb5e419eb8e41cd70a4c94c18cd51cd7140e32eb30ec8fd2d72bada565a47149d5095477b1 SHA512 6bcadc0f55358e70e31ec934395ac3f8fe055cf4f8bcab1ed72f03ec2014982e8beb2a901af70f2d9104513e4626bc286c48ae245a362a6f0a3257333aa35772
-DIST firefox-92.0.1-szl.xpi 524082 BLAKE2B 253cedeef55b8a40acb57f099d0d40e479a2d81420b18b22a50de6dbe059ed06c4b15fa75060ac562b3d69fa2076af5f835e5272a5b98d3fc8d99453a40f3fd4 SHA512 b5713cb95b1c1cc08541727a754c973484d50e53c105197fafd1e8fb512362759d0b588de9a4f0921e16a4d78629e33ce68ffb062331b40b88f26acc2e35c1da
-DIST firefox-92.0.1-ta.xpi 526874 BLAKE2B e53aff7808f2185fc8d7e2191efacfe2a70722bbfa04ad47654b3f6702a9588cd50ad688cab12c78355f62aea4c6eecddcf324c7aeb6f805063c6eb3e066e628 SHA512 b042c4254f92e336362f42b74f0242ba482c3d80afda46ade260843316f661af4b72029098952652b7169b1362af5023688bf6a293c3ab30ced392b691607d55
-DIST firefox-92.0.1-te.xpi 567533 BLAKE2B 138781adbfdc5f20b452debdde2804bd37f8df043d597c3da49fdd2e0b607709a843ee0ae0ea99db04485fae54fbb8e0cbf7e3db81d5dc3a8117353c338b07ee SHA512 7f8769435d56f37047791564a0e789fe1e6c32e35120ad7a765f68b37370b24a04dec92118ce9347cadced40e282a616a8a4ca511157c422ecfcecdc638ffe36
-DIST firefox-92.0.1-th.xpi 616406 BLAKE2B c6bb56c52095ddf3f84972fc1706c1847ebf2ebe21e68004f38f8bc52ae357941a99d9dcb2fa697abe08a07752581e122e4f07935fb9117ce440115582b5bcb7 SHA512 aeb1254e460978e2da78a15f734723d6fa8cae99bc412fc459fe92d7553863682380e8f719ef5b037edfc6aa4d8302060a89c426cb711c732a96d2859a4438a1
-DIST firefox-92.0.1-tl.xpi 533364 BLAKE2B 50fa717436824c3ffc43ca45aca4fa0427f93b7ddc9961e0da8b23006a0209298ccecb6f862e9c5985c5909b03999272c7f33b344e237777fea3f6aa09e7a558 SHA512 7e1da2f18e7a813dd5d205352df72de639fbce56c230db82d83b673f5d562caa4332fc75ad31f56054ebfe7d24fcd782dc8fb941e1f68711608ff87f5d84fa1c
-DIST firefox-92.0.1-tr.xpi 561252 BLAKE2B ce10a6df082f1f542c5474217da2021061cfcd10d6524a8f87fd426c7cf938733e4c5e3c9c50d46bc8e2c16078b35f6d36a90ef9e7e5290f2e522dc97eebd114 SHA512 cfd149dbce0e511fe9e536abe7de45078b36273d0fc92602b764de03c7dbc19be6aabfcd0c518ba334612ae9fb10add25e1bcb0a79cca24a4d45ff1eafc97077
-DIST firefox-92.0.1-trs.xpi 505515 BLAKE2B b8eea3b9822aa449fcec27acc1770b8f57734783ead5dda9777fe2e557104b1506c837ac87ff3a419e122a4465aa32bf87051792478930387e4e7e6275a888a6 SHA512 8fcfcba81f384b19a4f8a713ef4a97c0e6cf6c360fa9f85c964fbd06e3323f4e40c28b6ea4254b9d7eb6beda909b9cc7cc910c5518e50868c11db79196ec5337
-DIST firefox-92.0.1-uk.xpi 631240 BLAKE2B e947032e45a6f4f2605d3eb4ce5499372b86ca6676dd88d47643cdd8e2b76abfd701a536a432176c90e77a56a7c269198b1e3282e92ab8b5da85996d3c328446 SHA512 d87aa3cf3fd71757008cce57ea7dbe76ec01ea672e28a922aead20b05e6c206f50abab315899adcf09f6e74b19afe5d842193cf192a9786d253c7ce457070702
-DIST firefox-92.0.1-ur.xpi 574648 BLAKE2B cfe4bbfc114469b0317db3016bd9273ce2e23fd4a5bac24d796c9195b0ab1a4314ba536269507744439f11aa951194b79d8aa05970f01ffdacfa8739fc598032 SHA512 5e1ce66546562a23837b6fae0ad47877716d80c8a2fc0be27fb397023099dd0b69831706f10292b37000c6f062db6d6a5e4d583067f4f9b1432cdbfc0049773f
-DIST firefox-92.0.1-uz.xpi 482661 BLAKE2B 4ad0c7af4a6b8cd8ade9f6997d454ba0475762cf8484cf2676a6bda63413a4de534e2df2b6a80ecbb32643034d7bb726c761018ef2a36080d4804768486edba2 SHA512 6cd33b0a1a1d6753085f6a0644e3956ec6aec43af45aad0d5a823846076b1cb91992b57273467cd5d362e1759c7ce10dd83d23ab6b5c595e0bd66201863b1b55
-DIST firefox-92.0.1-vi.xpi 582888 BLAKE2B 099b24b3881cb78d06f333a3523b615c52ee414c8def0f20b00a929599fd361c15946db6743e75435b8e357aa315f5f54dcd19165c18b44620262747028005f7 SHA512 a36d7bfbbf97e5da3205c893d4d7b142f91b57611d5ab8dca4d0a20ce91779428ad7b3b007fe5c32c3b2f1e2b4e026c4a8e735a350270dcf6d5a1bce2e5aab9d
-DIST firefox-92.0.1-xh.xpi 436804 BLAKE2B be22329e3fbef2bac77d2842602449cca8128f2921625cff9addd116aeb768642a6a236bbb15cc0d05dd9753652bf7dad233c0e65da7395c6d3ef7ded275ddad SHA512 9ede42192fb5d367c852a157e1f5b2a012640b638180978246b4c88b3e64fc1137b6d37c878746115a927f2d39aaad28abd777e0d71b8d4fc95f107b96bb1e50
-DIST firefox-92.0.1-zh-CN.xpi 584481 BLAKE2B ad036c8632b6179c13a68c0984af1c556e81bde86c3693bd43bcdfbfba912224ee19e4b8f70e6335586b5d5007d2b2e9a7ff2e2a07d7224d4096b3d54abfceb8 SHA512 916d7809acafa752c70e62722f6c61b5626f5ce30762373f312583bf12787f72d5552be9014205bca03ba1339b4f9e013aec8afd1fd980803ee1021d59f8a98e
-DIST firefox-92.0.1-zh-TW.xpi 584667 BLAKE2B 5358642e7088f384fbf68ad3117bd7ea85a8abdc421bed792c13515654286024870cc756e8832176652727d321a4f85ec1af72ea5804c477909c4d9bd121b37d SHA512 ee7625608c6ac0c56791697c3dcd1c5998f719fa1636717b8b8d001748020f874a16214499595d07e69ab8fb736dbf045a0ef2830478e99366beeba942ef798f
-DIST firefox-92.0.1.source.tar.xz 383567460 BLAKE2B 021aaed695994145f4dec0a6d251bc57c3bcaa7a0772be060f1b2167d330ce70b14ef2867ecce24d8b833b814506196d290c2e1984db593d2cc1e4029ff0b8d8 SHA512 53361c231a4ac93a1808c9ccb29893d85b5e516fe939a770aac7f178abb4f43cbe3571097e5c5bf91b11fd95fc62b61f2aa215a45048357bfc9dad9eabdee9ef
-DIST firefox-92.0.source.tar.xz 385055824 BLAKE2B 782fa226c11d793383a577b1c355933ce83d153596574e864e1a357ab19ac18ff5489aaccc18a326a76af9f51bbfeb3fc5834503c7923b86f7490685588d767a SHA512 1a73cc275ea1790120845f579a7d21713ea78db0867ced767f393dfc25b132292dfbb673290fccdb9dcde86684e0300d56565841985fa3f0115376c91154ba8e
 DIST firefox-93-patches-01.tar.xz 21604 BLAKE2B fa9b993f7a5c95fc8a72c81c65c3167e896e4ab6517f5e3c4f543b6fc15714105d8486680557d82482f2ee5a99be23c831564e38ad8fb06f9a1c95d164d1dfb0 SHA512 ef982215b720ae9484229140a2bbfc5d2c606b888203a82113e566409b34451b7edd184e46f3ac500d2f371ecc1ec58f28610395d90f17db30fa58cb638d19fd
 DIST firefox-93.0-ach.xpi 452270 BLAKE2B c7fd81469026d99e21553ec59d0d005e906915483b3765898beba694cf31c02aef3c15789a5c2e2e2d1ee242aef323ca7fa1c142912917ec2ca02a8cb9c604fa SHA512 9a4c7f880801eb1c4391a57107e88e3d43e6ce0a1bd617ba4d11951957e2d62116f102e55bb62db22378460c68d2ecb3a9b9b0285951c46846920ae02360749b
 DIST firefox-93.0-af.xpi 425657 BLAKE2B 8f0f1df2ddc330f386d831696dbbbd15f639b0d95ae4d85b268924116f93f1bce22adc10b6053873f0ed6d69f9067515774b7904f7595c89a25edffde2e25e97 SHA512 f8c122c624c139c0afea5920f063b981665771ae107d32b654206dc0d00a8173230a357ca72649bc636d02825f1af90d291b5e09f9b7044d05b4af1ce39f6e6f
@@ -794,12 +205,6 @@ DIST firefox-93.0-xh.xpi 426899 BLAKE2B d089a23aa56a881db5a5092bf6da2133c001802c
 DIST firefox-93.0-zh-CN.xpi 567752 BLAKE2B f21d32140357de5cb98da2c75f5d8511c4d98e8405178b7c54553bfeb043aa372c796a79ac6b33704a64427edafa511ce40f69d8b7267d72f4c2037199972f20 SHA512 17c1f6cb48fec384a61ad60b0da4a93648bbd6da9a752be8db1f076dab13efaf5c22fbf539b89b4106427cb310e26aa0f708164f8eb13e045cfeba4e30d048cd
 DIST firefox-93.0-zh-TW.xpi 568218 BLAKE2B 4d842b6492967fa0a4e5cfd2fd46091e5f683df3b0cbc4dd13b4693023e79652a21eda449690acbced52df9e302e50ea32533420929baf76ca70cad416fc1a13 SHA512 11baeb65242512faccb1f4e813b62de681647e246268af1c0763e5a801e8d73dd741eb58b30a0a368f354f4a708dac88f7a1ad32a0497e98b67eb57ab0ef654d
 DIST firefox-93.0.source.tar.xz 382181136 BLAKE2B f4315a81ea5709fbf622ea39a4b259e44e8bafad95468d3f41fa8413dd1d5d92e260f549aacafe8b6af04f0c036fb9d59fe8531f0e2fa8de5dffcc403b33f2e1 SHA512 b29890e331819d47201b599b9feaaa7eaa0b02088fcbf980efc4f289d43da4f73970bf35ba2f763a2a892fd5318deb68cb9a66e71e9bc0c603642434c7e32e91
-EBUILD firefox-78.13.0.ebuild 34230 BLAKE2B 0edb04cf5df6ab00f88e7007638864ebc2a7dd6367298dacfd91fd127c86f83e55c56c191d6b6d72bf2dfcf7864e752ffdc61b460881fffc581ef74e4c427493 SHA512 30b0440297c041a0cfeab994a82fc893ed386d4ee25aa838acb22d8926de7f65446d79fe9eae728686484c3c4f255d0c67f2ca84bb75915feeae72c229b1296e
-EBUILD firefox-78.14.0.ebuild 34231 BLAKE2B 7d5aa4e93e5cc74aad9a67f82d5ae7340905a0c3da73cd7bb7736118177604b0d34e812e5c935335ccd0fedb1f083757d06e4cfaec7f97b069687c74a4122eb8 SHA512 03f95af9560d1132bc687d8fa880f07e6ff4dbd0c97a1a9d42ee8847cff67d94cd098cc0afb2fa5afe9bfe5e85523efefc1f17249b0182f2000134f8991623f5
 EBUILD firefox-78.15.0.ebuild 34230 BLAKE2B 6109618c8154dd2a2e92655b5d410c48c94a554a191cf3f4a38b8de68670081643addb2be3e3ff51eaf42725a6d28fdfa5fa63b39a27232bf8d65f7ff65163a9 SHA512 2ab103310bf4b729ba53198c7395ba53fe64d7118120b07f0b0ea44e9450eab1944fbfd147f9abcd7d821f6ea1b8a9a13963b43feb5ae8cc503cb6a6803797b9
-EBUILD firefox-91.0.1.ebuild 33580 BLAKE2B 8760dfb1afa842d7ea346dc77a931793e094747d4a13575a6d488f0d0d2f5a1f9da188f7ed4957119596f4a216763458f7c6d979548d82817bcb26e87bd7444a SHA512 871c85b85851361e1f4c989a222b995c26753d1f6dddf8cea6460e49b743af8e513588cc06f7c8a86dfe99c647ba86f78256d3e078e37649bd0bf2ea3096177e
-EBUILD firefox-91.0.2.ebuild 33584 BLAKE2B 93142a8e54ea4ae6d9cd3a071fb1d1b67a8a7dc7f09ba396cea793632da64c070aac1086be00b7de77eeaf16959b89744e9f2f2708df6f669a74f18fafa93547 SHA512 153e7cbdb260a3127d7e86c9e998b3afe9a0e2bd9b8b0f4f333df2a11690bd018e07166e5eedcdb3abfee8a308156bf9cc75cf54032ee79fca84714ec5478482
-EBUILD firefox-92.0.1.ebuild 33568 BLAKE2B d2e75e19a8c09fc7c5631c24fe835bd208b27545661ba3cd1b3a007600e41c7282ac6e57e62e182f3be913a80599c5cea80616e5da6852cd3c580bae924d216a SHA512 0de38bd1a00b677c4acbe3285aaeab483fb8ff00038517d03d7bea7260100d34c81875f56904cc3e158dc7d7eedd3e95116ecf70071f50599eec5bfb6cd35bd8
-EBUILD firefox-92.0.ebuild 33568 BLAKE2B 2ac9abb6fcd2db741a7c580ade9df72c2ed9dba69aba475f0de9b89928747a8644504361a5f536ea23429294853786d5192a499b3aba6548cc8d5820b7aacba5 SHA512 9965e215fe523b0c3d3a2c49eca3a2e0acebf1942740f80c0c7513e41a9c3221caea058833f8f57aa3ae329feb84fb98c28f08f10b7e079a764ebdb7291f131d
-EBUILD firefox-93.0.ebuild 33568 BLAKE2B 2e42c59f1615fab2dd1e75ce0dc00a37b4b6e463b4f22916883f69a357a9dd125c294666b362a4029f43ee57656b3fcfdae1ce460ed1e037c36436f1ce78287d SHA512 b5a200d16b3ded0d19d87e266947fe96771a701790f08ed84c7369bec3200509782f1fd02d401fa4cd533739334b67f2a0f79ccc7c1c748ae1e59c097e2a1619
+EBUILD firefox-93.0.ebuild 33601 BLAKE2B 68df23062f94facddf5b98d3ff397d38ae03af4ea45c6c056d92b04c5bcb038e1f3bf4b67de1eb2cf0f818cf8a2a9852e1f5a491dbf77c179172b308def6ccf8 SHA512 aa271bb31770068a0d5d53346e2cf7f626c4d4d86c60d6e1ac0e31896aa564c45bb15efa04c73bfb252b7aed88554a9cea359c853441b35625b08f23ef7c7c84
 MISC metadata.xml 2151 BLAKE2B 0dd5df0e78dee99abb7d7fc5a384126ac9920f8f39e886932c894328ab4c235aabf0e7fe401c6859973bb8c55f29bb64ec8cc571b58aa427325cd4b98a89fbf4 SHA512 14e367bb16402e3c3efbed5ed6cf2acd776fd725f4f29f5cbf20f4351ddbb59c89103b9d051fb56912bea461f994fe47741afb6da3b072710eaead0004da2c58
diff --git a/www-client/firefox/firefox-78.13.0.ebuild b/www-client/firefox/firefox-78.13.0.ebuild
deleted file mode 100644
index ddf98b0a1574..000000000000
--- a/www-client/firefox/firefox-78.13.0.ebuild
+++ /dev/null
@@ -1,1187 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-78esr-patches-16.tar.xz"
-
-LLVM_MAX_SLOT=12
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=yes
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-SLOT="0/esr$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
-	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux
-	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp wayland wifi"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	screencast? ( wayland )
-	wifi? ( dbus )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.14.3
-	>=net-libs/nodejs-10.21.0
-	virtual/pkgconfig
-	>=virtual/rust-1.41.0
-	|| (
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:11
-			sys-devel/llvm:11
-			clang? (
-				=sys-devel/lld-11*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:10
-			sys-devel/llvm:10
-			clang? (
-				=sys-devel/lld-10*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-	)
-	lto? (
-		!clang? ( sys-devel/binutils[gold] )
-	)
-	amd64? ( >=dev-lang/yasm-1.1 )
-	x86? ( >=dev-lang/yasm-1.1 )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-CDEPEND="
-	>=dev-libs/nss-3.53.1
-	>=dev-libs/nspr-4.25
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	screencast? ( media-video/pipewire:0/0.3 )
-	system-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.6.8:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-67.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
-	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
-	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
-	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
-	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
-	xh zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			# temp fix for https://bugs.gentoo.org/768543
-			# we can assume that rust 1.{49,50}.0 always uses llvm 11
-			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
-			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
-			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
-
-			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
-				local version_llvm_rust="11"
-			else
-				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-			fi
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-strip \
-		--disable-updater \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-png \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
-		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable screencast pipewire
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-		else
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
-
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold ; then
-			mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold || use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	export MACH_USE_SYSTEM_PYTHON=1
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Build system requires xargs but is unable to find it
-	mozconfig_add_options_mk 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menus
-	local wrapper_wayland="${PN}-wayland.sh"
-	local wrapper_x11="${PN}-x11.sh"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local display_protocols="auto X11"
-	local icon="${PN}"
-	local name="Mozilla ${MOZ_PN^}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		display_protocols+=" Wayland"
-		use_wayland="true"
-	fi
-
-	local app_name desktop_filename display_protocol exec_command
-	for display_protocol in ${display_protocols} ; do
-		app_name="${name} on ${display_protocol}"
-		desktop_filename="${PN}-${display_protocol,,}.desktop"
-
-		case ${display_protocol} in
-			Wayland)
-				exec_command="${PN}-wayland --name ${PN}-wayland"
-				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
-				;;
-			X11)
-				if ! use wayland ; then
-					# Exit loop here because there's no choice so
-					# we don't need wrapper/.desktop file for X11.
-					continue
-				fi
-
-				exec_command="${PN}-x11 --name ${PN}-x11"
-				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
-				;;
-			*)
-				app_name="${name}"
-				desktop_filename="${PN}.desktop"
-				exec_command="${PN}"
-				;;
-		esac
-
-		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			"${WORKDIR}/${PN}.desktop-template" \
-			|| die
-
-		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-		rm "${WORKDIR}/${PN}.desktop-template" || die
-	done
-
-	# Install generic wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}.sh" ${PN}
-
-	# Update wrapper
-	local wrapper
-	for wrapper in \
-		"${ED}/usr/bin/${PN}" \
-		"${ED}/usr/bin/${PN}-x11" \
-		"${ED}/usr/bin/${PN}-wayland" \
-	; do
-		[[ ! -f "${wrapper}" ]] && continue
-
-		sed -i \
-			-e "s:@PREFIX@:${EPREFIX}/usr:" \
-			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-			-e "s:@APULSELIB_DIR@:${apulselib}:" \
-			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-			"${wrapper}" \
-			|| die
-	done
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information show_normandy_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 70 ; then
-				# Tell user only once about our DoH default
-				show_doh_information=yes
-			fi
-
-			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
-				# Tell user only once about our Normandy default
-				show_normandy_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-}
diff --git a/www-client/firefox/firefox-78.14.0.ebuild b/www-client/firefox/firefox-78.14.0.ebuild
deleted file mode 100644
index dca07f912037..000000000000
--- a/www-client/firefox/firefox-78.14.0.ebuild
+++ /dev/null
@@ -1,1187 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-78esr-patches-17.tar.xz"
-
-LLVM_MAX_SLOT=12
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=yes
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
-
-SLOT="0/esr$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
-	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux
-	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp wayland wifi"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	screencast? ( wayland )
-	wifi? ( dbus )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.14.3
-	>=net-libs/nodejs-10.21.0
-	virtual/pkgconfig
-	>=virtual/rust-1.41.0
-	|| (
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:11
-			sys-devel/llvm:11
-			clang? (
-				=sys-devel/lld-11*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:10
-			sys-devel/llvm:10
-			clang? (
-				=sys-devel/lld-10*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-	)
-	lto? (
-		!clang? ( sys-devel/binutils[gold] )
-	)
-	amd64? ( >=dev-lang/yasm-1.1 )
-	x86? ( >=dev-lang/yasm-1.1 )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-CDEPEND="
-	>=dev-libs/nss-3.53.1
-	>=dev-libs/nspr-4.25
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	screencast? ( media-video/pipewire:0/0.3 )
-	system-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.6.8:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-67.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
-	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
-	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
-	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
-	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
-	xh zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			# temp fix for https://bugs.gentoo.org/768543
-			# we can assume that rust 1.{49,50}.0 always uses llvm 11
-			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
-			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
-			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
-
-			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
-				local version_llvm_rust="11"
-			else
-				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-			fi
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-strip \
-		--disable-updater \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-png \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
-		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable screencast pipewire
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-		else
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
-
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold ; then
-			mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold || use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	export MACH_USE_SYSTEM_PYTHON=1
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Build system requires xargs but is unable to find it
-	mozconfig_add_options_mk 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menus
-	local wrapper_wayland="${PN}-wayland.sh"
-	local wrapper_x11="${PN}-x11.sh"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local display_protocols="auto X11"
-	local icon="${PN}"
-	local name="Mozilla ${MOZ_PN^}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		display_protocols+=" Wayland"
-		use_wayland="true"
-	fi
-
-	local app_name desktop_filename display_protocol exec_command
-	for display_protocol in ${display_protocols} ; do
-		app_name="${name} on ${display_protocol}"
-		desktop_filename="${PN}-${display_protocol,,}.desktop"
-
-		case ${display_protocol} in
-			Wayland)
-				exec_command="${PN}-wayland --name ${PN}-wayland"
-				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
-				;;
-			X11)
-				if ! use wayland ; then
-					# Exit loop here because there's no choice so
-					# we don't need wrapper/.desktop file for X11.
-					continue
-				fi
-
-				exec_command="${PN}-x11 --name ${PN}-x11"
-				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
-				;;
-			*)
-				app_name="${name}"
-				desktop_filename="${PN}.desktop"
-				exec_command="${PN}"
-				;;
-		esac
-
-		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			"${WORKDIR}/${PN}.desktop-template" \
-			|| die
-
-		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-		rm "${WORKDIR}/${PN}.desktop-template" || die
-	done
-
-	# Install generic wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}.sh" ${PN}
-
-	# Update wrapper
-	local wrapper
-	for wrapper in \
-		"${ED}/usr/bin/${PN}" \
-		"${ED}/usr/bin/${PN}-x11" \
-		"${ED}/usr/bin/${PN}-wayland" \
-	; do
-		[[ ! -f "${wrapper}" ]] && continue
-
-		sed -i \
-			-e "s:@PREFIX@:${EPREFIX}/usr:" \
-			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-			-e "s:@APULSELIB_DIR@:${apulselib}:" \
-			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-			"${wrapper}" \
-			|| die
-	done
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information show_normandy_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 70 ; then
-				# Tell user only once about our DoH default
-				show_doh_information=yes
-			fi
-
-			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
-				# Tell user only once about our Normandy default
-				show_normandy_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-}
diff --git a/www-client/firefox/firefox-91.0.1.ebuild b/www-client/firefox/firefox-91.0.1.ebuild
deleted file mode 100644
index fa00e3528010..000000000000
--- a/www-client/firefox/firefox-91.0.1.ebuild
+++ /dev/null
@@ -1,1149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-91-patches-02.tar.xz"
-
-LLVM_MAX_SLOT=12
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0/$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
-	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux
-	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp wayland wifi"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	screencast? ( wayland )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.19.0
-	>=net-libs/nodejs-10.23.1
-	virtual/pkgconfig
-	>=virtual/rust-1.51.0
-	|| (
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:11
-			sys-devel/llvm:11
-			clang? (
-				=sys-devel/lld-11*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:10
-			sys-devel/llvm:10
-			clang? (
-				=sys-devel/lld-10*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.13 )
-	x86? ( >=dev-lang/nasm-2.13 )"
-
-CDEPEND="
-	>=dev-libs/nss-3.68
-	>=dev-libs/nspr-4.32
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	screencast? ( media-video/pipewire:0/0.3 )
-	system-av1? (
-		>=media-libs/dav1d-0.8.1:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.8.1:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( media-sound/sndio )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
-	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
-	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
-	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
-	si sk sl son sq sr sv-SE szl ta te th tl tr trs uk ur uz vi
-	xh zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			# temp fix for https://bugs.gentoo.org/768543
-			# we can assume that rust 1.{49,50}.0 always uses llvm 11
-			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
-			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
-			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
-
-			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
-				local version_llvm_rust="11"
-			else
-				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-			fi
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
-			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
-			# bug 792705
-			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
-			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-strip \
-		--disable-updater \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-png \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
-		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable sndio
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold || use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	export MACH_USE_SYSTEM_PYTHON=1
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information show_normandy_information show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since firefox-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla Firefox shortcut."
-		elog "If you still want to be able to select between running Mozilla Firefox"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-}
diff --git a/www-client/firefox/firefox-91.0.2.ebuild b/www-client/firefox/firefox-91.0.2.ebuild
deleted file mode 100644
index b606ecd707c3..000000000000
--- a/www-client/firefox/firefox-91.0.2.ebuild
+++ /dev/null
@@ -1,1149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-91-patches-03.tar.xz"
-
-LLVM_MAX_SLOT=12
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0/$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
-	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux
-	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp wayland wifi"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	screencast? ( wayland )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.19.0
-	>=net-libs/nodejs-10.23.1
-	virtual/pkgconfig
-	>=virtual/rust-1.51.0
-	|| (
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:11
-			sys-devel/llvm:11
-			clang? (
-				=sys-devel/lld-11*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:10
-			sys-devel/llvm:10
-			clang? (
-				=sys-devel/lld-10*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.13 )
-	x86? ( >=dev-lang/nasm-2.13 )"
-
-CDEPEND="
-	>=dev-libs/nss-3.68
-	>=dev-libs/nspr-4.32
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	screencast? ( media-video/pipewire:0/0.3 )
-	system-av1? (
-		>=media-libs/dav1d-0.8.1:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.8.1:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( media-sound/sndio )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
-	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
-	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
-	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru sco
-	si sk sl son sq sr sv-SE szl ta te th tl tr trs uk ur uz vi
-	xh zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			# temp fix for https://bugs.gentoo.org/768543
-			# we can assume that rust 1.{49,50}.0 always uses llvm 11
-			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
-			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
-			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
-
-			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
-				local version_llvm_rust="11"
-			else
-				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-			fi
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
-			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
-			# bug 792705
-			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
-			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-strip \
-		--disable-updater \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-png \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
-		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable sndio
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold || use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	export MACH_USE_SYSTEM_PYTHON=1
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information show_normandy_information show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since firefox-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla Firefox shortcut."
-		elog "If you still want to be able to select between running Mozilla Firefox"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-}
diff --git a/www-client/firefox/firefox-92.0.1.ebuild b/www-client/firefox/firefox-92.0.1.ebuild
deleted file mode 100644
index 8a5dd42b120f..000000000000
--- a/www-client/firefox/firefox-92.0.1.ebuild
+++ /dev/null
@@ -1,1148 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-92-patches-02.tar.xz"
-
-LLVM_MAX_SLOT=12
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0/$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
-	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux
-	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp wayland wifi"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	screencast? ( wayland )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.19.0
-	>=net-libs/nodejs-10.23.1
-	virtual/pkgconfig
-	>=virtual/rust-1.51.0
-	|| (
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:11
-			sys-devel/llvm:11
-			clang? (
-				=sys-devel/lld-11*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:10
-			sys-devel/llvm:10
-			clang? (
-				=sys-devel/lld-10*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.13 )
-	x86? ( >=dev-lang/nasm-2.13 )"
-
-CDEPEND="
-	>=dev-libs/nss-3.69
-	>=dev-libs/nspr-4.32
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	screencast? ( media-video/pipewire:0/0.3 )
-	system-av1? (
-		>=media-libs/dav1d-0.8.1:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.8.1:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( media-sound/sndio )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
-	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
-	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
-	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru sco
-	si sk sl son sq sr sv-SE szl ta te th tl tr trs uk ur uz vi
-	xh zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			# temp fix for https://bugs.gentoo.org/768543
-			# we can assume that rust 1.{49,50}.0 always uses llvm 11
-			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
-			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
-			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
-
-			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
-				local version_llvm_rust="11"
-			else
-				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-			fi
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
-			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
-			# bug 792705
-			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
-			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-strip \
-		--disable-updater \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-png \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
-		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable sndio
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold || use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	export MACH_USE_SYSTEM_PYTHON=1
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information show_normandy_information show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since firefox-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla Firefox shortcut."
-		elog "If you still want to be able to select between running Mozilla Firefox"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-}
diff --git a/www-client/firefox/firefox-92.0.ebuild b/www-client/firefox/firefox-92.0.ebuild
deleted file mode 100644
index 6f11db5bf68b..000000000000
--- a/www-client/firefox/firefox-92.0.ebuild
+++ /dev/null
@@ -1,1148 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-92-patches-01.tar.xz"
-
-LLVM_MAX_SLOT=12
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0/$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
-	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast sndio selinux
-	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp wayland wifi"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	screencast? ( wayland )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.19.0
-	>=net-libs/nodejs-10.23.1
-	virtual/pkgconfig
-	>=virtual/rust-1.51.0
-	|| (
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:11
-			sys-devel/llvm:11
-			clang? (
-				=sys-devel/lld-11*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:10
-			sys-devel/llvm:10
-			clang? (
-				=sys-devel/lld-10*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.13 )
-	x86? ( >=dev-lang/nasm-2.13 )"
-
-CDEPEND="
-	>=dev-libs/nss-3.69
-	>=dev-libs/nspr-4.32
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	screencast? ( media-video/pipewire:0/0.3 )
-	system-av1? (
-		>=media-libs/dav1d-0.8.1:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.8.1:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( media-sound/sndio )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
-	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
-	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
-	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru sco
-	si sk sl son sq sr sv-SE szl ta te th tl tr trs uk ur uz vi
-	xh zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			# temp fix for https://bugs.gentoo.org/768543
-			# we can assume that rust 1.{49,50}.0 always uses llvm 11
-			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
-			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
-			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
-
-			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
-				local version_llvm_rust="11"
-			else
-				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-			fi
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
-			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
-			# bug 792705
-			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
-			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-strip \
-		--disable-updater \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-png \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
-		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable sndio
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold || use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	export MACH_USE_SYSTEM_PYTHON=1
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information show_normandy_information show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since firefox-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla Firefox shortcut."
-		elog "If you still want to be able to select between running Mozilla Firefox"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-}
diff --git a/www-client/firefox/firefox-93.0.ebuild b/www-client/firefox/firefox-93.0.ebuild
index ac40ceb888da..00f330717b92 100644
--- a/www-client/firefox/firefox-93.0.ebuild
+++ b/www-client/firefox/firefox-93.0.ebuild
@@ -172,6 +172,8 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-mozilla )"
 
 DEPEND="${CDEPEND}
+	x11-libs/libICE
+	x11-libs/libSM
 	pulseaudio? (
 		|| (
 			media-sound/pulseaudio
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 251eee47dfaa..ba12656f925d 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_95.0.4638.40-1_amd64.deb 89759728 BLAKE2B d55b468fcddb8ce11f04c1b93662a2653b1161e721877c786c9875906a57bd46d8bbf2f13a446654ac00347e57ed59f8907ce179fd99d8d35c2e1f42cdb6c451 SHA512 28c2e05ac2583ee54f995d07e0678630d427b7d714116dc7ec68fd1ddf93f450c6da7a4ed7657b3bca45e0ea0d95401b85cc2592ae6e0c745f836ab1e87b2a12
-EBUILD google-chrome-beta-95.0.4638.40.ebuild 2715 BLAKE2B 2f8d64037e89699b67ba1ff4c047ede993b8df79fee8e2be24b2bee9d683c06b88626c58952e8662757ca94203265baada031d70b90f46ab67327088eb7bb632 SHA512 4f2344264e168f0d62e038222eb7f5e3ff81c71de4a2ee6dfe2272b84dfda06cf36dadf8ceab5c97061f2955b9d44ba92e863df7ffff4068576036043cdfbafe
+DIST google-chrome-beta_95.0.4638.54-1_amd64.deb 89066076 BLAKE2B 6bbf1ccb224184fbc88875cc6c717dc954988915c27a15d5db20eb72f0d89a821ccb5ca07513b41fbfb7d050afe0b3b1b04eb6689c88a5c290f599ead6993010 SHA512 f7fe19544041c6951d3787a515ed3a9dd234868f71d3beb91731c57c2364e0189551efcb724fe46212bfc62c60af420d5b3540e72a094fd79e3106404ab3ebdf
+EBUILD google-chrome-beta-95.0.4638.54.ebuild 2715 BLAKE2B 2f8d64037e89699b67ba1ff4c047ede993b8df79fee8e2be24b2bee9d683c06b88626c58952e8662757ca94203265baada031d70b90f46ab67327088eb7bb632 SHA512 4f2344264e168f0d62e038222eb7f5e3ff81c71de4a2ee6dfe2272b84dfda06cf36dadf8ceab5c97061f2955b9d44ba92e863df7ffff4068576036043cdfbafe
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-beta/google-chrome-beta-95.0.4638.40.ebuild b/www-client/google-chrome-beta/google-chrome-beta-95.0.4638.54.ebuild
index 56dba81cca90..56dba81cca90 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-95.0.4638.40.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-95.0.4638.54.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 7b46e969e3e0..2ab2cbd8bd9e 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_96.0.4655.0-1_amd64.deb 89354896 BLAKE2B 69b2e65712351b3b7835005eb975dc5ededb09a5172efd8f0de75ec7f0c781513d6af6014f90fa03ae8c7ae3ea4ab1299b8a9ee4ef61feeba7d26b9f64c1f379 SHA512 fae22eb0cb6b1e52cbc12f9d18fb2733da9efa53c7b8fbd3a71132766c0be9c341522aacb4853b9317f01e11e216dc8c4b970ae70a606149122a0eba95f5d165
-EBUILD google-chrome-unstable-96.0.4655.0.ebuild 2715 BLAKE2B 2f8d64037e89699b67ba1ff4c047ede993b8df79fee8e2be24b2bee9d683c06b88626c58952e8662757ca94203265baada031d70b90f46ab67327088eb7bb632 SHA512 4f2344264e168f0d62e038222eb7f5e3ff81c71de4a2ee6dfe2272b84dfda06cf36dadf8ceab5c97061f2955b9d44ba92e863df7ffff4068576036043cdfbafe
+DIST google-chrome-unstable_96.0.4664.9-1_amd64.deb 89408576 BLAKE2B aa19e91ab098ddc5957244b1a92d420e06deafce7b4fe366fcf55d5919eab39e11d2be8f0403670796bdd96719eabf58e66dc8c0d741e4f88c4385fa410300e8 SHA512 8eb4f4e166d1a5014ad616b2eccde71c240462ab321d2e5cf456b8b789919d6ddbd67eddca8e3b4a748e1198715ce52e8b771176f63b3de3cb798f8d8f08752a
+EBUILD google-chrome-unstable-96.0.4664.9.ebuild 2715 BLAKE2B 2f8d64037e89699b67ba1ff4c047ede993b8df79fee8e2be24b2bee9d683c06b88626c58952e8662757ca94203265baada031d70b90f46ab67327088eb7bb632 SHA512 4f2344264e168f0d62e038222eb7f5e3ff81c71de4a2ee6dfe2272b84dfda06cf36dadf8ceab5c97061f2955b9d44ba92e863df7ffff4068576036043cdfbafe
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-96.0.4655.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-96.0.4664.9.ebuild
index 56dba81cca90..56dba81cca90 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-96.0.4655.0.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-96.0.4664.9.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 6c81d14fa56a..8b08eab957eb 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_94.0.4606.81-1_amd64.deb 90229076 BLAKE2B 8944ec65dfe4838e177c48765e10cba153670fbccf50749cbef5da60169cce11d3957eb4f43ee4b2601413623636786b605f5e8b4b305f81de2e469acb1a94a7 SHA512 d2750a2123c9091ac51df2d543df1bc4ae7c148d67939a3583262aef29f97aa9bbd5150bccc947295d908a3283d66146cc0565741e08da8d630bfdb9109df00e
-EBUILD google-chrome-94.0.4606.81.ebuild 2714 BLAKE2B 54985b86452ee0b69c945df00de9492cd2f43166a785cfca1af85c39310187fa9cda80e6b46567cfdd45a8ee07af7e7ca187580658f6562e5aba6dcb590d2d8d SHA512 078f1e13c7b5155fcb7e7bef73c28e4e6ffa3115fc342b2387da25179b25d461e8df453664cfd7096e12f629d902809ccb012d4d20a96664b4bd8d6823d66ca0
+DIST google-chrome-stable_95.0.4638.54-1_amd64.deb 89046612 BLAKE2B b1c714490f81d034a3c34fb87a33f8db9737e555fbf795c2e7c81d570ff814049488f50fbb94ed8691cc50282b1c06546c8228143ae59f020075061061dda49a SHA512 eeaa1aa3787310640de72d8f6606a4d654f47138143de091e43208e13f10ae4115c5c0588cef11e49073bbf6f86646d8babc3a463e35714c64be5c61852382a6
+EBUILD google-chrome-95.0.4638.54.ebuild 2714 BLAKE2B 54985b86452ee0b69c945df00de9492cd2f43166a785cfca1af85c39310187fa9cda80e6b46567cfdd45a8ee07af7e7ca187580658f6562e5aba6dcb590d2d8d SHA512 078f1e13c7b5155fcb7e7bef73c28e4e6ffa3115fc342b2387da25179b25d461e8df453664cfd7096e12f629d902809ccb012d4d20a96664b4bd8d6823d66ca0
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome/google-chrome-94.0.4606.81.ebuild b/www-client/google-chrome/google-chrome-95.0.4638.54.ebuild
index dbce15cdcf9c..dbce15cdcf9c 100644
--- a/www-client/google-chrome/google-chrome-94.0.4606.81.ebuild
+++ b/www-client/google-chrome/google-chrome-95.0.4638.54.ebuild
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 100d2af29ab8..7c0ea8cf025d 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -2,6 +2,6 @@ DIST links-2.23.tar.bz2 6521143 BLAKE2B baefdadddc0d44511488ca1a085a45f3235b9c58
 DIST links-2.24.tar.bz2 6470666 BLAKE2B f6ae42f64283e250afc2041efbb1d8680ef860ea83d0592f9f92bb90a2c2a23e470cc6be4a8538bcbed5162bfb42be30336ac48b7d19e1b4b79c64deb9073f55 SHA512 093e24d8504faf95fa9e6ce50b4e6b01284995fa8ee156b5c8b2b52b4ca3bdbcdf95965c8f9c8b72adcfbedf8a5216467c85c122778381c3b148f5696b709fd1
 DIST links-2.25.tar.bz2 6505187 BLAKE2B 3efe9d43b9a8dad498101800ccdefd094a6371a2c74b264aaaaac2abf951db38729abcf00f74a45fdb7f0d24196413996aa02cd9d2ea3ee2cf008faf4062e365 SHA512 b094e3b2096b07da8385d6021e5a5794f5b602c90ec824c48b897e6b69def6d69cb879af3008a4af43effaa7d9359bf09e4feb8ed5371bb7ff22ffcb0794f690
 EBUILD links-2.23.ebuild 3376 BLAKE2B 9aa58d0dbd41479bbf9865d4646a2c8aeb2b13748547cc41655a4a7c34ca1da76f430061c20997d4d7f74855d585cdb72eaba988cba3fc35027e0b58bb4ed656 SHA512 48bb0f21478f61488821e49a7ccd4fd52844808a9c22fb252f5af766490af6f75a95f3ede0caaeafae39d1794e2194075d7992f90a5c4aa7ee5d4eb67be4188a
-EBUILD links-2.24.ebuild 3404 BLAKE2B 50ca2c575d8e94cb526b33134734a6e4ea17ae2bca2a022300e0be6c4fc7fe0c9aff5eaabee770a86bd6eab783124ee90a93ed5346b1ffc01e702289ac10200f SHA512 6863e084013309e586f19e491fea60d4d090f2c833923b9e3fbd0a7d9b2c2e07c59b310d3956696b087270b29be5c10a7a4581f5b875f31461ea8dde9052c822
+EBUILD links-2.24.ebuild 3397 BLAKE2B 56afff4600920104635a4ad6584eb04b6c3f544a2b856fb2db5f14c1c43f37628704423f3d20d2739f6267f643926cba1addbfdc7e46359c27a435108f41f83f SHA512 dafbff9fa822142f740b622c9a759b1a0affb18bc5a58ad0dc8fd574856efc3ae56ad6c2fec24480a35901c964ae9db08982223e472918b65e093eb89def24d4
 EBUILD links-2.25.ebuild 3404 BLAKE2B 50ca2c575d8e94cb526b33134734a6e4ea17ae2bca2a022300e0be6c4fc7fe0c9aff5eaabee770a86bd6eab783124ee90a93ed5346b1ffc01e702289ac10200f SHA512 6863e084013309e586f19e491fea60d4d090f2c833923b9e3fbd0a7d9b2c2e07c59b310d3956696b087270b29be5c10a7a4581f5b875f31461ea8dde9052c822
 MISC metadata.xml 672 BLAKE2B 5d282c043806b3ce47853e39f6fdee47b4223f0f02eae009124e9e0d9aee81e3f3c4135d27f733b9468760848499233763cd798f74f4ad751e345a6c67e355bb SHA512 198f8bf38632bc4348f8c50f8655dc6575db217ee307dcc8674822bec94c2ee904d650c4ee56a233629165f7085cb1b71eb1267d68b782a67fc88497116fa85b
diff --git a/www-client/links/links-2.24.ebuild b/www-client/links/links-2.24.ebuild
index 59c9f75ec2ed..7e6b3e1a2676 100644
--- a/www-client/links/links-2.24.ebuild
+++ b/www-client/links/links-2.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index bfbe708416fb..3b33d9e84a27 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -5,5 +5,5 @@ AUX lynx-2.9.0_pre9-parallel.patch 2625 BLAKE2B aca2c28c6d73f0b22fe378fdad533264
 DIST lynx2.9.0dev.6.tar.bz2 2730690 BLAKE2B 2b176db49ac053e6c057b366b625883f0877f0bbf9bc2fbc0dfe6a13af48e0c9d5a64de52e794a4e771d7f6b160c74589a9275543f2657cb678bba149cdba38c SHA512 0c15e00a8e36e43671a093182c69593d50bc5c51a4acd92faa59416055bf4a1fd9ecde903a0209963f1f55d1fd85136e8448ca7867e198100ff749c53e1e1531
 DIST lynx2.9.0dev.9.tar.bz2 2746988 BLAKE2B 6b5658b6bc224d02fe89fe31a1b8cdac5f736d68545fb6508f3a3b83e9c7537599dbacf5000320a019f0fab1059d5d4516e8d54341ef7d3384605d9e2f3c19da SHA512 ad343a7bc254cf287accde305db556101f7fa0f081e7c1c4327d7a4366c74cdbfb03ec003b0bc176768bbe726eae3e1bf8361416e0364ccdfe40d63fbc5b6dc4
 EBUILD lynx-2.9.0_pre6-r2.ebuild 2536 BLAKE2B 2e56c0a17e40ccba0f78199c3ff7bef7362b8b42d5ef42c1ed7792aa0e1fde92d20c70fdebe9e835083770f155bd0a84cc2ba9d40c1e270196aac8b38bc73247 SHA512 2d9aaa442037c25d0ea67bbd2acbc80361dbba7ebe6f27ed2525f74f6aff594b490bffe3aac9a1791d5470f832cc062151b022e193579b187af9935d25061a89
-EBUILD lynx-2.9.0_pre9.ebuild 2439 BLAKE2B 9ef15104cdc70b696cd4f1fbab3917708bdca54b68d6ea1371dbeec8276a46c8b4611bbf2e4cae40b35e8d1286a4cef6e47bc3d91df5f69e33880cbec883d82a SHA512 e504de4e5b098aaa6710a03e42c557e3f5e698d3a14c2a23b991fc83cfdd6a44ba7d09d9669da8d4c2f965e71ce55df4ee7194dd56d1fe48baadeaab50827373
+EBUILD lynx-2.9.0_pre9.ebuild 2432 BLAKE2B edce657ae894314ad69a1433db32049ee8edbf1795304af61fd6dc0d5fa3c65907193769a1e2c696acdf4108d1f1de7bb8fc0b2dbdbfa66f36382ff95c1d56f7 SHA512 612ea1dbcd824181f91e33419f73b8b7b696dc35f960367d75859e40a4dead26e2c9f66cd6d71019a0f3ae6c79e21d067492d248dcb6e71bcc494d4b751bd8e3
 MISC metadata.xml 454 BLAKE2B 065cada61ba3fae08cee69fbce83bef6daa178878ddff8dfd834d0dde0f8e3743744fafcfb40ed83a2ff75820007aa413daaa6cc202ee786b5b07aa2c501489f SHA512 179f656c2675f80a0bb17dba6b616064533df16575a42455a4f8188ac44305a21da35b0c24ef7fb97b270161b2b500906f1c0cb819074a57b381131d11de17c4
diff --git a/www-client/lynx/lynx-2.9.0_pre9.ebuild b/www-client/lynx/lynx-2.9.0_pre9.ebuild
index 56f7032772c4..7b9980120972 100644
--- a/www-client/lynx/lynx-2.9.0_pre9.ebuild
+++ b/www-client/lynx/lynx-2.9.0_pre9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://invisible-mirror.net/archives/lynx/tarballs/${MY_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="bzip2 cjk gnutls idn nls ssl"
 
 RDEPEND="sys-libs/ncurses:=[unicode(+)]
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index e54c9f405937..7dd0b2ae9b2d 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_94.0.992.31-1_amd64.deb 115045128 BLAKE2B c8e8475cf6608c548070af7e94920165c885c791671136884ceaf084043919a7f6d4b898cdedcd2b3fe1220f9aaa2a85e11110b4a0330712494fa875248ffce0 SHA512 ce68a505d220b4a5e1a5a6942d3501737747e8ee1c6b9a01b2a94de75406bc6ba2bfe361ebfb728ab6db16fb53b656a8ea0e089d9a141c29dc7ab43477cc9920
 DIST microsoft-edge-beta_95.0.1020.14-1_amd64.deb 115388596 BLAKE2B 15670298240e4f0878e02215afbef683681f93fa113c00bb60a0f907fa699fcd6dca7871c5f7d22df2d09c50692175ec9ad9c89341e98b52e17335f7f16aa8d2 SHA512 f057d1ec8ffaf905ea1171f9256e7a9886ff062d1e6bf9a7ceca1dc4253040c9bb30b36f627fe22a7047a968010c532f806ef61f1c13879f4a62077be3ee74c6
+DIST microsoft-edge-beta_95.0.1020.20-1_amd64.deb 115373860 BLAKE2B 357142de38183a5f79bce81755f3b3ac69e6c8ec16bc03ac592db70c4861e4078aee2011c7048c72094b99079674926294069e9a5343acd7570e3d01b85c0cde SHA512 c2fa6c884932c94b5da69ecad98c6b717d17cab473b83b9554b2dfb956676421ee771dce19127fc00448bda22949f0b1616bd1b1d8f88bf2bff50c4774bd4647
 DIST microsoft-edge-beta_95.0.1020.9-1_amd64.deb 115261788 BLAKE2B afa7ef4d5a40cf12d7f4c16e525cbdc56ac64a0298ecd64ddea8044dddf11b5ae61936e39dc04f2bd09012b04d50fb40fe2f212d714dc35e8ea590524be7078d SHA512 4dcf0963b174b38bdffc80e7aa8dcb02caf909369ba5803d206b9bfd55087f29d75716f669dd14bd9bd4021eb14673631a6e9e9e5b91abbb526f0b30c5c35f5c
-EBUILD microsoft-edge-beta-94.0.992.31.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
 EBUILD microsoft-edge-beta-95.0.1020.14.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
+EBUILD microsoft-edge-beta-95.0.1020.20.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
 EBUILD microsoft-edge-beta-95.0.1020.9.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
 MISC metadata.xml 438 BLAKE2B c33dc51ce04401c4fe43abbbfd73d89116311e7e9da4552fc2024185b49c6f279bdbb6b8dd84575afa5ea353b23d10f5400f877e0cad8691948183606632c675 SHA512 02485902fef7f459af8a203f75632d3524fc777beddafc5ace980f7e3e658e9b164797c233c0b99d404f37d4532dbd34bbf3a9984afab2454078891405f73c5c
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-94.0.992.31.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-94.0.992.31.ebuild
deleted file mode 100644
index 3b1abf5f25da..000000000000
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-94.0.992.31.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit chromium-2 desktop pax-utils unpacker xdg
-
-DESCRIPTION="The web browser from Microsoft"
-HOMEPAGE="https://www.microsoft.com/en-us/edge"
-
-if [[ ${PN} == microsoft-edge ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-KEYWORDS="-* ~amd64"
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="microsoft-edge"
-SLOT="0"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl[ssl]
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
-S=${WORKDIR}
-EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "microsoft-edge only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm _gpgorigin || die
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-
-	local suffix=
-	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
-	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${EDGE_HOME}/msedge"
-}
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.20.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.20.ebuild
new file mode 100644
index 000000000000..a14f69804a04
--- /dev/null
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-95.0.1020.20.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/en-us/edge"
+
+if [[ ${PN} == microsoft-edge ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+KEYWORDS="-* ~amd64"
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="microsoft-edge"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl[ssl]
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+S=${WORKDIR}
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm _gpgorigin || die
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index e437acf926e0..e8ad8695db4f 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-dev_95.0.1020.5-1_amd64.deb 115316476 BLAKE2B 5e99b0d43e5c7cbf7ce5ba1ee2d2a4c1dd7c60e0575d3c8c1c9d1506d339774ca832aaa2d69993c61c379654863230853fd414a96f1c1431af94a9d0ad11f785 SHA512 a565da7f78195410553145cfb6dff5ee32f62dfbe3f9522815dce64a6620aeb686c6acca43079fea3ac7febacbab82461df5c1b98fe4f9cf7df51936e2043df0
 DIST microsoft-edge-dev_96.0.1028.0-1_amd64.deb 115444532 BLAKE2B 13a1d6b04dc410fc54a9381daaeb173a4b4d3e3e923b0a7bd8ae06d240965757e5a3a7bb76fc6c4218ef11cc169bccdebe81ddb4fb840d12524614b307d52107 SHA512 18e3f34515ac5040097616e623386bf574a378d57d96e24e03759193e9fb03ef6fb57560138566834a5c99f494f08b7264836d466ce9d3552f78938791c97b00
 DIST microsoft-edge-dev_96.0.1032.0-1_amd64.deb 116577348 BLAKE2B ab383d482a66078813a7950ac1063903f8aaeb7ecac16eafe4dcec2938a8ace3d9886a81482ca887c36b7281f41962d0d980b6b6e37d9fe6d3634e222ac6d757 SHA512 5b8a4d61ba2dfde8d95a6e6491caaa30640568af19435048b4696d015a24465dc9f80532710784b706d39a96c969ff2939cd352457b73805d000c634856ebfba
-EBUILD microsoft-edge-dev-95.0.1020.5.ebuild 2221 BLAKE2B 0ccc2e8657c71211fa6f0ce5a409d8d4247bf40369aa32d1433d5f5685535d26ff90ff65a29f285c5abc6b7cf9ecbbe667d8e28ee532b17ef2324d9271a217aa SHA512 3025ff3ad488882104e6270a9cde8316b117912f445a4abe94555169066607e8c22be4a5c6cf3b297cb4771bfd81edc8d7370c3490c2d2ae211aae07d1620227
+DIST microsoft-edge-dev_96.0.1043.1-1_amd64.deb 117006816 BLAKE2B 34d28cc574c4e5325eb7a43e19d615b4d71174b255969fad9ad4a88cb6969c2a6c37c133b9e143154eadf8e010fa30740ae7a8b90e0b9bb47f5860b41f9876c2 SHA512 2826755c6cd30e5a068f66a4f73b37c0352034ff0a008b3575f84ed75c0e811537f522202e781d2e1ac88f43885a36fb9efac244cee62a36b5fac299306537af
 EBUILD microsoft-edge-dev-96.0.1028.0.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
 EBUILD microsoft-edge-dev-96.0.1032.0.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
+EBUILD microsoft-edge-dev-96.0.1043.1.ebuild 2221 BLAKE2B 780d2c7d2b4bbe2a30e7e8e88d9ef53a199c0fd0a1d5abdb5aab6ff308c1ca7e87265c2a58d6c5e82d25127ac653bed2f541cf6e113c0d1950016141114bfcc8 SHA512 1e2493595fb489116eea5d8d5d4043d52bb3e469059dd9072d79454611f72b478320b26ebf6d413559f536ddd3edacf049742f4c4c2e610caa55b4c59ae70d55
 MISC metadata.xml 438 BLAKE2B c33dc51ce04401c4fe43abbbfd73d89116311e7e9da4552fc2024185b49c6f279bdbb6b8dd84575afa5ea353b23d10f5400f877e0cad8691948183606632c675 SHA512 02485902fef7f459af8a203f75632d3524fc777beddafc5ace980f7e3e658e9b164797c233c0b99d404f37d4532dbd34bbf3a9984afab2454078891405f73c5c
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-95.0.1020.5.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-95.0.1020.5.ebuild
deleted file mode 100644
index 3b1abf5f25da..000000000000
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-95.0.1020.5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit chromium-2 desktop pax-utils unpacker xdg
-
-DESCRIPTION="The web browser from Microsoft"
-HOMEPAGE="https://www.microsoft.com/en-us/edge"
-
-if [[ ${PN} == microsoft-edge ]]; then
-	MY_PN=${PN}-stable
-else
-	MY_PN=${PN}
-fi
-
-KEYWORDS="-* ~amd64"
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="microsoft-edge"
-SLOT="0"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-fonts/liberation-fonts
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-misc/curl[ssl]
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
-S=${WORKDIR}
-EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "microsoft-edge only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm _gpgorigin || die
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-
-	local suffix=
-	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
-	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
-
-	local size
-	for size in 16 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${EDGE_HOME}/msedge"
-}
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1043.1.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1043.1.ebuild
new file mode 100644
index 000000000000..a14f69804a04
--- /dev/null
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-96.0.1043.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit chromium-2 desktop pax-utils unpacker xdg
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/en-us/edge"
+
+if [[ ${PN} == microsoft-edge ]]; then
+	MY_PN=${PN}-stable
+else
+	MY_PN=${PN}
+fi
+
+KEYWORDS="-* ~amd64"
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="microsoft-edge"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-misc/curl[ssl]
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+S=${WORKDIR}
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm _gpgorigin || die
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 878283930ed5..a41d1b378093 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,8 +1,8 @@
 DIST opera-beta_80.0.4170.11_amd64.deb 80002328 BLAKE2B 735ec69af328e8c79b65a46dca486c34ac290256ecc17283b8bee41bb5acb3d8e32facf73ea57f11d342ce2914b07c863773028cbcdfbee80c1e23c1e8c4bb5a SHA512 dd4729e16aa3078b932ab96b3e568032e68e0e6be2988827f68b0ff59796eb3b931d2629cecb5262dc6287b5ba2259e13e31394c4deecbef52f71fb4fc36ada1
-DIST opera-beta_80.0.4170.4_amd64.deb 80037964 BLAKE2B 040be729ef754438a793abca7ee448ab6eefa5929c75f09f8881a5a646efd4a301d27db35d3c02a54d2064c86e1279050dcc02c30af70de5b64bfe937ac07767 SHA512 00461d53d59ea3d5f0a5dabe7c70fa0e6e38d04fcd7e28106c1d6463ef75e9f1f2a501245e5eb603e3638cf38ee2b8055155802ae6ed05f993bb75d5b13c1968
 DIST opera-beta_80.0.4170.7_amd64.deb 80013760 BLAKE2B 8490351b1eaf05dea8d058074ef28dba00927805da669d958351893b28a54f560b21446f840db60553f32d5f2cfa4180374543ea8e1359f66495107270ebc980 SHA512 fdeeb2ea94429bc8aae0cdf5c59993fdc8b024e56e8ec58ed04a9dcebe3d7c1028b7b9fe4f51898354bb797fa9594cfccf64b3dcdd548c78f3567c9d02ebfcc2
+DIST opera-beta_81.0.4196.11_amd64.deb 79198584 BLAKE2B 8776d508c58e85a73ac8925c34a60b3f0c0f72a0de08bec311a946c1a112f7eb22f32351333f5b1eaeffc14f86705f9feebfa2814cad9bd3a74f847224d261dd SHA512 b9f70a2c4ae6789985e25506f344eabf36850c761777b7324deea3f54cc6d10ae198a5dbdeae9513e09352907f07308818337d840abe8219b0667dabc7192ff8
 DIST opera-ffmpeg-codecs-94.0.4603.0.tar.xz 1388572 BLAKE2B 55a598883dfbab598f48a662009ab02c4974a95ba023e3b2d36bdad3267ab4586cfd05891f83a96933b6b0b02dc1d2a496bb796ecb5421635a370f6c79c60a98 SHA512 dfeb7174ad5d696f78a86735462757d0245aecf0d00c21ba6ff3c16f6af586979457ebb23db228f3769cf09636ed70421aafe29eb622ca658e766dafc860827a
 EBUILD opera-beta-80.0.4170.11.ebuild 3575 BLAKE2B 41d12bc5b6a5dd9597a37dd262afc6b86e63ac8aa7d01fc89617fee33b319f2aadb58cb7d13b155f7f2645d6a1c734fd7a2ae481c768ee96f8e285e490f11dee SHA512 acd07f0c11df44177fb4e1686e6eb8d41ef122cc7f6cea9bfd3162707b93f922a116d03af6177fd9ca197e9b6d81623c3d6374062c59efc6d6d9e375000629a2
-EBUILD opera-beta-80.0.4170.4.ebuild 3575 BLAKE2B 41d12bc5b6a5dd9597a37dd262afc6b86e63ac8aa7d01fc89617fee33b319f2aadb58cb7d13b155f7f2645d6a1c734fd7a2ae481c768ee96f8e285e490f11dee SHA512 acd07f0c11df44177fb4e1686e6eb8d41ef122cc7f6cea9bfd3162707b93f922a116d03af6177fd9ca197e9b6d81623c3d6374062c59efc6d6d9e375000629a2
 EBUILD opera-beta-80.0.4170.7.ebuild 3575 BLAKE2B 41d12bc5b6a5dd9597a37dd262afc6b86e63ac8aa7d01fc89617fee33b319f2aadb58cb7d13b155f7f2645d6a1c734fd7a2ae481c768ee96f8e285e490f11dee SHA512 acd07f0c11df44177fb4e1686e6eb8d41ef122cc7f6cea9bfd3162707b93f922a116d03af6177fd9ca197e9b6d81623c3d6374062c59efc6d6d9e375000629a2
+EBUILD opera-beta-81.0.4196.11.ebuild 3575 BLAKE2B 41d12bc5b6a5dd9597a37dd262afc6b86e63ac8aa7d01fc89617fee33b319f2aadb58cb7d13b155f7f2645d6a1c734fd7a2ae481c768ee96f8e285e490f11dee SHA512 acd07f0c11df44177fb4e1686e6eb8d41ef122cc7f6cea9bfd3162707b93f922a116d03af6177fd9ca197e9b6d81623c3d6374062c59efc6d6d9e375000629a2
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera-beta/opera-beta-80.0.4170.4.ebuild b/www-client/opera-beta/opera-beta-81.0.4196.11.ebuild
index 0ca298be282f..0ca298be282f 100644
--- a/www-client/opera-beta/opera-beta-80.0.4170.4.ebuild
+++ b/www-client/opera-beta/opera-beta-81.0.4196.11.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index e02775364154..b6ba1795e89e 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
 DIST opera-ffmpeg-codecs-94.0.4603.0.tar.xz 1388572 BLAKE2B 55a598883dfbab598f48a662009ab02c4974a95ba023e3b2d36bdad3267ab4586cfd05891f83a96933b6b0b02dc1d2a496bb796ecb5421635a370f6c79c60a98 SHA512 dfeb7174ad5d696f78a86735462757d0245aecf0d00c21ba6ff3c16f6af586979457ebb23db228f3769cf09636ed70421aafe29eb622ca658e766dafc860827a
-DIST opera-stable_80.0.4170.16_amd64.deb 79488964 BLAKE2B d887df9c97d23d48fb576275cca4a3f2037e8ac509956426b319e213f6db78dd33989fb62b18a37dce676d87e0c6fe68749b53b314d2139fad6dafdab06613e3 SHA512 20a47f876e91e1e66513cc98003e2bda080bba029e0449ca64ab089e807d1f9befbc5a974a16e057a387a1f672b11d4590290a015c1809405e7a0da30c31ae41
-EBUILD opera-80.0.4170.16.ebuild 3574 BLAKE2B cfb936de9de46171a6393cbd95e83768741689b4238dd4fb512195a58261068236109bd97d68fe8c5d68dcae3db3306f138b8057252f8629b21fffaa58d0ecfd SHA512 b3502e92003ccc76e3c87741a40bae5cfdc4eb1db9e6a1a2c41b09acd3b8d31ca7f4123ed2944db2ee43adad874fca80343e9403bfb3a8a4b8b46e2bdfdb9ec3
+DIST opera-stable_80.0.4170.40_amd64.deb 79414828 BLAKE2B 151416b279a2f39365a2c40d433227c80590f16061342411b4bfea0ce68167e988466ea75853e5159eafabe781ea0435a0840e993b01899f7962d046bbb90ca5 SHA512 216f57c728fc9cb20992b585cd7ee7b8c88bcb7afb56fcf8349eed28c6dadf39257cd4a60e236365a38f2aa380ca8a36f3a1f6c329c6f56d300adfb5f6df897b
+EBUILD opera-80.0.4170.40.ebuild 3574 BLAKE2B cfb936de9de46171a6393cbd95e83768741689b4238dd4fb512195a58261068236109bd97d68fe8c5d68dcae3db3306f138b8057252f8629b21fffaa58d0ecfd SHA512 b3502e92003ccc76e3c87741a40bae5cfdc4eb1db9e6a1a2c41b09acd3b8d31ca7f4123ed2944db2ee43adad874fca80343e9403bfb3a8a4b8b46e2bdfdb9ec3
 MISC metadata.xml 590 BLAKE2B ecac1c1d44dff5d3f266f7e0a4135c035c2cd0b08055d30b9103308a53eb046328a9917fccdaff3e9f7ab56e7eec906fe6cfa59efa0f223a237db7ca1a9a2eb9 SHA512 9764641862a12bb0f3c396826265595a900a1801f3fdda45337f4b89088f868a4a036290962d6be64f0509c7c6e69e072de2bfdd490fdb04401c99d64188c7eb
diff --git a/www-client/opera/opera-80.0.4170.16.ebuild b/www-client/opera/opera-80.0.4170.40.ebuild
index df7d5f99d4b7..df7d5f99d4b7 100644
--- a/www-client/opera/opera-80.0.4170.16.ebuild
+++ b/www-client/opera/opera-80.0.4170.40.ebuild
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 34039ec51d4f..2899088b35ea 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,8 +1,6 @@
-DIST qutebrowser-2.2.3.tar.gz 6234298 BLAKE2B 7401241b5032bc2c98214930772a1228b9ef1cd9bdabba64295b10c7f0f8c0f336f321baeb4a25ffc7576328e9b838d6629b83c93a5c76defd4000743c4a859c SHA512 608a588ba670b60d6278bfcae324ca5c5454c4f932f7493189ae8666293a0077a2f2a0066211d080b649d180c687c14adbe075c6c92a411b88fee18446930c4e
-DIST qutebrowser-2.3.0.tar.gz 6244786 BLAKE2B 6722074efd854e70aeb40c5992277d0dad59045795c464ecea2b53fcd648b900054e9ad7d19cf2879d814624304a3827c166f495e721344ecc334aa0f49a0d39 SHA512 1f0afc642fe68d4524fa0263f8f196429710f1ae0a27edb43748a688f1eadd3dc42af82da96715b78cbe19e6d0e6c1e9604a55d6c5deb7ebc5eba97b9bfa118f
+AUX qutebrowser-2.3.1-pyyaml60.patch 682 BLAKE2B 572d1ffcb23fd1168b8e999300c4f2d7f8c59b1c8e47c3c91bfdbcfc37c1e2c909b608513070f2efde979db7f90e1548dab2f6156cd8f74d8a0c9e1cb32c3a3c SHA512 608103b77779855b636ca0dbc77b726650d6e571d0c44c7ef89d16228e19931ed0b8c6152487e30e59f36996883d7efe0957de5b28c9f8b5d7e4c5bc21ba2031
 DIST qutebrowser-2.3.1.tar.gz 6244845 BLAKE2B 55dff9141e65f3e65701027e81106bc7b5ebe98d982111055d3b18ae91470603848107139845b1af248bb98074e39a2e7ceb9ab3e1bf523a52c81aaddda4f211 SHA512 1798e4659a8e53f53df6fe0307d6cfaf4641fda1b68facec90d825c0fa04ffa32867d51e45c92cd57ebbb4240085592dc8cd9fc120abea9803b2c1aab7205239
-EBUILD qutebrowser-2.2.3-r1.ebuild 2677 BLAKE2B aebb54126e50c2fae543e956e307999d76acbf06d5d085646c032e15251bc8c490a6d0a041464fe8612535c2efce6cfbc251e87befc7778bf3c7ee131483de16 SHA512 aa0048e53dfc4f7bb8ede59d23e32fb0b7e7061389e92e78a7f75d6ecfbd8ca4b093b6dd52ceffb7af67dd0fcf07f6ef3b9ab01ae89d7c319fd6978e64fcb87c
-EBUILD qutebrowser-2.3.0.ebuild 2652 BLAKE2B 484d6584fe5bc5f50d64bcd6bb95ce4bfd2aa1bd17f918b1b4a0896240ab7f6950a4e30ee916dc2bd3b9199206aaf1608a7fd515f6f8177529338524c218752e SHA512 e5462b578c441d5388b5e77c75bffb733bb061a46efef642f6a72d155187613a17e86f120dbecea5a6e4bceaa6036fafaf2f2dff8d792a0d905cdff646d44d2d
-EBUILD qutebrowser-2.3.1.ebuild 2433 BLAKE2B 0d69b0eded34afbfac9e7593091ab07b75d3fb6b344bdc0b89292cddf759c25af0b4e99e110b5851cf8b42920aca27d11baa1e89d6b0bc56ae54a71b62b6fd67 SHA512 699a37119199e4da22deb74f9c6355f1576336ec397d181c77a4dfb01a31fc6d13cbe97c95fb45118429ae59abe1900d1f1a112a7efa6f646bdbc61f74ed4613
-EBUILD qutebrowser-9999.ebuild 2896 BLAKE2B 549f0bd0591b8424322dce3084b17972219c67f27413b65616c9e025b4820795e419b19103e253218c133419330c7931ed41ff2481cd101055ff7a25475b6ee4 SHA512 b6403374bd85e8ee99420cafac107c81f845ce72302ac4c891db5a46e396d01cff99e8f50964ae0dc6250075c231bd34414546952ff3e387d0f1e0bf2a06a500
-MISC metadata.xml 843 BLAKE2B 0eee30dbf7d7668960cdd6224102d16205d188b8d88a32619ddb6cd3142ca7c7d3d31537a7554d213ccb3b915bcdc4ddd2963aec223bc36a35d32ac330dd13b6 SHA512 5bd6354dc4bd676730e7e31bd96298a3c68d3ff3e22b456c5bbb6fb6ff741a5969c55d1b72f1c185f77ba9c1c0eb78f60ba6cad6eb341764dd55068a9be4e6de
+EBUILD qutebrowser-2.3.1-r1.ebuild 2436 BLAKE2B 30a9c3f7f66fa08d9665072ee3e006ef97adc66b365cb7b10a0ccdf3e553e0299ffc42a9ec80bb8ebd21e6c5517dece86aa4e12b702c2313fd3f40d8fa9c2764 SHA512 f23cb74b8036c2f204bd0c8554fa4040bd98271d68c35d04e2143aee4631343f6ae50a8a262f1610095c41f0b63a1b052f18f20308214c8285909fb486cb8ea9
+EBUILD qutebrowser-2.3.1-r2.ebuild 4303 BLAKE2B 3dee4b1317f8159b9bac01403c7cc68bfa68c5555c138801ec3777b7f4fb5974c84907eedda1f887f1a85bb594062ffd816a5c3cd36e789196d0f4769912d8a7 SHA512 7bc6de06328494517e086089a59c389bc9877b795acacc3fb5e15a4d4a67ea7a0a849a54b0539697433f06cfc80f27090f27f8497460f295a17bc4323050651c
+EBUILD qutebrowser-9999.ebuild 4274 BLAKE2B c67ca9a10a4ebbb26c1f573870586af1063f1adc4ec36c61965d861848501444004c60e8204aee9e7459183d8cd61c22a6fac7dd4d602a2d220802f9d2fe3265 SHA512 2d582bcd9ef99022acb48e320f2885cad81e9d2cf0e21cdd4d4933ae774325eb55575c0bf287fda24a6c918f1986e13a17f4a96fee38fb4e155fa5eeb1136a57
+MISC metadata.xml 945 BLAKE2B e796d777d56a5452b6652d77e011dfb160684f6e7498d0c4fad583bb828ecd111c25be5d80ed906b9b579e6ccd33315fc20a727342df0fb1b66b1a71effcea25 SHA512 80a65a391a84208042d9e7a6e0b5e8644ed07d5e389cd6a7b314b961dca5cff6406c5556693b34dcd275acfb27d05d9e40f77e9d503f9e3e8054ab6b6763932d
diff --git a/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch b/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
new file mode 100644
index 000000000000..d585109b9f2c
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
@@ -0,0 +1,19 @@
+https://github.com/qutebrowser/qutebrowser/commit/1547a48
+From: Florian Bruhin <me@the-compiler.org>
+Date: Thu, 14 Oct 2021 09:05:07 +0200
+Subject: [PATCH] tests: Adjust for PyYAML 6.0
+--- a/tests/unit/utils/test_utils.py
++++ b/tests/unit/utils/test_utils.py
+@@ -809,8 +809,11 @@ def test_load(self):
+         assert utils.yaml_load("[1, 2]") == [1, 2]
+ 
+     def test_load_float_bug(self):
+-        with pytest.raises(yaml.YAMLError):
++        try:
+             utils.yaml_load("._")
++        except yaml.YAMLError:
++            # Either no exception or YAMLError, not ValueError
++            pass
+ 
+     def test_load_file(self, tmp_path):
+         tmpfile = tmp_path / 'foo.yml'
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
index 9255ec048f57..44b66f5f9007 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>guillaumeseren@gmail.com</email>
 		<name>Guillaume Seren</name>
@@ -13,13 +17,14 @@
 		<email>steils@gentoo.org</email>
 		<name>Stefan Strogin</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">qutebrowser/qutebrowser</remote-id>
 	</upstream>
 	<use>
 		<flag name="adblock">Enable Brave's ABP-style adblocker library
 			for improved adblocking</flag>
-		<flag name="scripts">Installs userscripts from the misc/userscripts
-			directory to /usr/share/qutebrowser/userscripts.</flag>
+		<flag name="widevine">Unsupported closed-source DRM capability
+			(required by Netflix VOD)</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/qutebrowser/qutebrowser-2.2.3-r1.ebuild b/www-client/qutebrowser/qutebrowser-2.2.3-r1.ebuild
deleted file mode 100644
index a546f877c3da..000000000000
--- a/www-client/qutebrowser/qutebrowser-2.2.3-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit desktop distutils-r1 optfeature xdg-utils
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+adblock test"
-
-BDEPEND="app-text/asciidoc"
-RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-	adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_install_all() {
-	insinto /usr/share/metainfo
-	doins misc/org.qutebrowser.qutebrowser.appdata.xml
-	doman doc/${PN}.1
-	domenu misc/org.${PN}.${PN}.desktop
-	for s in 16 24 32 48 64 128 256 512; do
-		doicon -s ${s} icons/qutebrowser-${s}x${s}.png
-	done
-	doicon -s scalable icons/${PN}.svg
-
-	insinto /usr/share/qutebrowser/userscripts
-	doins misc/userscripts/README.md
-	exeinto /usr/share/qutebrowser/userscripts
-	for f in misc/userscripts/*; do
-		if [[ "${f}" == "__pycache__" ]]; then
-			continue
-		fi
-		doexe "${f}"
-	done
-
-	exeinto /usr/share/qutebrowser/scripts
-	for f in scripts/*; do
-		if [[ "${f}" == "scripts/__init__.py" || \
-		      "${f}" == "scripts/__pycache__" || \
-		      "${f}" == "scripts/dev" || \
-		      "${f}" == "scripts/testbrowser" || \
-		      "${f}" == "scripts/asciidoc2html.py" || \
-		      "${f}" == "scripts/setupcommon.py" || \
-		      "${f}" == "scripts/link_pyqt.py" ]]; then
-			continue
-		fi
-		doexe "${f}"
-	done
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "PDF display support" www-plugins/pdfjs
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/qutebrowser/qutebrowser-2.3.0.ebuild b/www-client/qutebrowser/qutebrowser-2.3.0.ebuild
deleted file mode 100644
index dd61b8b71581..000000000000
--- a/www-client/qutebrowser/qutebrowser-2.3.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit desktop distutils-r1 optfeature xdg-utils
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+adblock test"
-
-BDEPEND="app-text/asciidoc"
-RDEPEND=">=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
-	>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-	adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-# Tests depend (misc/requirements/requirements-tests.txt) on plugins
-# we don't have packages for.
-RESTRICT="test"
-
-python_compile_all() {
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_install_all() {
-	insinto /usr/share/metainfo
-	doins misc/org.qutebrowser.qutebrowser.appdata.xml
-	doman doc/${PN}.1
-	domenu misc/org.${PN}.${PN}.desktop
-	for s in 16 24 32 48 64 128 256 512; do
-		doicon -s ${s} icons/qutebrowser-${s}x${s}.png
-	done
-	doicon -s scalable icons/${PN}.svg
-
-	insinto /usr/share/qutebrowser/userscripts
-	doins misc/userscripts/README.md
-	exeinto /usr/share/qutebrowser/userscripts
-	for f in misc/userscripts/*; do
-		if [[ "${f}" == "__pycache__" ]]; then
-			continue
-		fi
-		doexe "${f}"
-	done
-
-	exeinto /usr/share/qutebrowser/scripts
-	for f in scripts/*; do
-		if [[ "${f}" == "scripts/__init__.py" || \
-		      "${f}" == "scripts/__pycache__" || \
-		      "${f}" == "scripts/dev" || \
-		      "${f}" == "scripts/testbrowser" || \
-		      "${f}" == "scripts/asciidoc2html.py" || \
-		      "${f}" == "scripts/setupcommon.py" || \
-		      "${f}" == "scripts/link_pyqt.py" ]]; then
-			continue
-		fi
-		doexe "${f}"
-	done
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "PDF display support" www-plugins/pdfjs
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild b/www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..fb10ef39b48f
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.3.1-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit desktop distutils-r1 optfeature xdg
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+adblock test"
+
+BDEPEND="app-text/asciidoc"
+RDEPEND=">=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
+	>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+	adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
+
+# Tests depend (misc/requirements/requirements-tests.txt) on plugins
+# we don't have packages for.
+RESTRICT="test"
+
+python_compile_all() {
+	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_install_all() {
+	insinto /usr/share/metainfo
+	doins misc/org.qutebrowser.qutebrowser.appdata.xml
+	doman doc/${PN}.1
+	domenu misc/org.${PN}.${PN}.desktop
+	for s in 16 24 32 48 64 128 256 512; do
+		doicon -s ${s} icons/qutebrowser-${s}x${s}.png
+	done
+	doicon -s scalable icons/${PN}.svg
+
+	insinto /usr/share/qutebrowser/userscripts
+	doins misc/userscripts/README.md
+	exeinto /usr/share/qutebrowser/userscripts
+	for f in misc/userscripts/*; do
+		if [[ ${f} == __pycache__ ]]; then
+			continue
+		fi
+		doexe "${f}"
+	done
+
+	exeinto /usr/share/qutebrowser/scripts
+	for f in scripts/*; do
+		if [[ ${f} == scripts/__init__.py ||
+		      ${f} == scripts/__pycache__ ||
+		      ${f} == scripts/dev ||
+		      ${f} == scripts/testbrowser ||
+		      ${f} == scripts/asciidoc2html.py ||
+		      ${f} == scripts/setupcommon.py ||
+		      ${f} == scripts/link_pyqt.py ]]; then
+			continue
+		fi
+		doexe "${f}"
+	done
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "PDF display support" www-plugins/pdfjs
+}
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
new file mode 100644
index 000000000000..3a90e9763a2d
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git"
+else
+	SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock widevine"
+
+RDEPEND="
+	dev-qt/qtcore:5[icu]
+	dev-qt/qtgui:5[png]
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
+	$(python_gen_cond_dep '
+		>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+		>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		dev-python/zipp[${PYTHON_USEDEP}]
+		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+	')
+	widevine? ( www-plugins/chrome-binary-plugins )"
+BDEPEND="
+	app-text/asciidoc
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+			dev-python/cheroot[${PYTHON_USEDEP}]
+			dev-python/flask[${PYTHON_USEDEP}]
+			dev-python/hypothesis[${PYTHON_USEDEP}]
+			dev-python/pytest-bdd[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+			dev-python/pytest-qt[${PYTHON_USEDEP}]
+			dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+			dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+			dev-python/tldextract[${PYTHON_USEDEP}]
+		)
+	')"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pyyaml60.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use widevine; then
+		sed "/yield from _qtwebengine_settings_args/a\    yield '--widevine-path=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so'" \
+			-i ${PN}/config/qtargs.py || die
+	fi
+
+	sed -i '/setup.py/d' misc/Makefile || die
+
+	[[ ${PV} != 9999 ]] || ${EPYTHON} scripts/asciidoc2html.py || die
+
+	# these plugins/tests are unnecessary here and have extra dependencies
+	sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \
+		-e '/pytest-instafail/d;s/--instafail//' \
+		-i pytest.ini || die
+	[[ ${PV} == 9999 ]] || rm tests/unit/scripts/test_problemmatchers.py || die
+	[[ ${PV} != 9999 ]] || rm tests/unit/scripts/test_run_vulture.py || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# end2end and other IPC tests are broken with "Name error" if
+		# socket path is over 104 characters (=124 in /var/tmp/portage)
+		# https://github.com/qutebrowser/qutebrowser/issues/888 (not just OSX)
+		tests/end2end
+		tests/unit/misc/test_ipc.py
+		# tests that don't know about our newer qtwebengine
+		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
+		tests/unit/utils/test_version.py::TestChromiumVersion
+		# needs qtwebkit and isn't skipped by default
+		tests/unit/config/test_websettings.py::test_config_init
+		# may misbehave depending on installed old python versions
+		tests/unit/misc/test_checkpyver.py::test_old_python
+	)
+	use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
+
+	# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
+	epytest -k 'not _bench and not _matches_tree and not _warning'
+}
+
+python_install_all() {
+	emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	rm "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die
+	fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
+	python_fix_shebang "${ED}"/usr/share/${PN}
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "PDF display support" www-plugins/pdfjs
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts"
+		elog "have additional dependencies not covered by this ebuild, for example"
+		elog "view_in_mpv needs media-video/mpv setup to use yt-dlp or youtube-dl."
+	fi
+}
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1.ebuild b/www-client/qutebrowser/qutebrowser-2.3.1.ebuild
deleted file mode 100644
index e11338abf31f..000000000000
--- a/www-client/qutebrowser/qutebrowser-2.3.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit desktop distutils-r1 optfeature xdg
-
-DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+adblock test"
-
-BDEPEND="app-text/asciidoc"
-RDEPEND=">=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
-	>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-	adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-# Tests depend (misc/requirements/requirements-tests.txt) on plugins
-# we don't have packages for.
-RESTRICT="test"
-
-python_compile_all() {
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_install_all() {
-	insinto /usr/share/metainfo
-	doins misc/org.qutebrowser.qutebrowser.appdata.xml
-	doman doc/${PN}.1
-	domenu misc/org.${PN}.${PN}.desktop
-	for s in 16 24 32 48 64 128 256 512; do
-		doicon -s ${s} icons/qutebrowser-${s}x${s}.png
-	done
-	doicon -s scalable icons/${PN}.svg
-
-	insinto /usr/share/qutebrowser/userscripts
-	doins misc/userscripts/README.md
-	exeinto /usr/share/qutebrowser/userscripts
-	for f in misc/userscripts/*; do
-		if [[ ${f} == __pycache__ ]]; then
-			continue
-		fi
-		doexe "${f}"
-	done
-
-	exeinto /usr/share/qutebrowser/scripts
-	for f in scripts/*; do
-		if [[ ${f} == scripts/__init__.py ||
-		      ${f} == scripts/__pycache__ ||
-		      ${f} == scripts/dev ||
-		      ${f} == scripts/testbrowser ||
-		      ${f} == scripts/asciidoc2html.py ||
-		      ${f} == scripts/setupcommon.py ||
-		      ${f} == scripts/link_pyqt.py ]]; then
-			continue
-		fi
-		doexe "${f}"
-	done
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "PDF display support" www-plugins/pdfjs
-}
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index b9c6a309b372..22d3277e6864 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -3,92 +3,120 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature xdg
 
-inherit desktop distutils-r1 git-r3 optfeature xdg
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git"
+else
+	SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
 
 DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+HOMEPAGE="https://www.qutebrowser.org/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="scripts test"
+IUSE="+adblock widevine"
 
-BDEPEND="
-	app-text/asciidoc"
 RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/cssutils[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5[icu]
+	dev-qt/qtgui:5[png]
 	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pypeg2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests setup.py
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile() {
-	${EPYTHON} scripts/asciidoc2html.py || die
-	distutils-r1_python_compile
+	$(python_gen_cond_dep '
+		>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+		>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+		>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml(+)]
+		>=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
+		>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
+		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+	')
+	widevine? ( www-plugins/chrome-binary-plugins )"
+BDEPEND="
+	app-text/asciidoc
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+			dev-python/cheroot[${PYTHON_USEDEP}]
+			dev-python/flask[${PYTHON_USEDEP}]
+			dev-python/hypothesis[${PYTHON_USEDEP}]
+			dev-python/pytest-bdd[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+			dev-python/pytest-qt[${PYTHON_USEDEP}]
+			dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+			dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+			dev-python/tldextract[${PYTHON_USEDEP}]
+		)
+	')"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use widevine; then
+		sed "/yield from _qtwebengine_settings_args/a\    yield '--widevine-path=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so'" \
+			-i ${PN}/config/qtargs.py || die
+	fi
+
+	sed -i '/setup.py/d' misc/Makefile || die
+
+	[[ ${PV} != 9999 ]] || ${EPYTHON} scripts/asciidoc2html.py || die
+
+	# these plugins/tests are unnecessary here and have extra dependencies
+	sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \
+		-e '/pytest-instafail/d;s/--instafail//' \
+		-i pytest.ini || die
+	[[ ${PV} == 9999 ]] || rm tests/unit/scripts/test_problemmatchers.py || die
+	[[ ${PV} != 9999 ]] || rm tests/unit/scripts/test_run_vulture.py || die
 }
 
-python_compile_all() {
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+python_test() {
+	local EPYTEST_DESELECT=(
+		# end2end and other IPC tests are broken with "Name error" if
+		# socket path is over 104 characters (=124 in /var/tmp/portage)
+		# https://github.com/qutebrowser/qutebrowser/issues/888 (not just OSX)
+		tests/end2end
+		tests/unit/misc/test_ipc.py
+		# tests that don't know about our newer qtwebengine
+		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
+		tests/unit/utils/test_version.py::TestChromiumVersion
+		# needs qtwebkit and isn't skipped by default
+		tests/unit/config/test_websettings.py::test_config_init
+		# may misbehave depending on installed old python versions
+		tests/unit/misc/test_checkpyver.py::test_old_python
+	)
+	use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
+
+	# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
+	epytest -k 'not _bench and not _matches_tree and not _warning'
 }
 
 python_install_all() {
-	doman doc/${PN}.1
-	domenu misc/org.${PN}.${PN}.desktop
-	doicon -s scalable icons/${PN}.svg
-
-	if use scripts; then
-		insinto /usr/share/qutebrowser/userscripts/
-		doins misc/userscripts/README.md
-		exeinto /usr/share/qutebrowser/userscripts/
-		doexe misc/userscripts/add-nextcloud-bookmarks \
-		      misc/userscripts/add-nextcloud-cookbook \
-		      misc/userscripts/cast \
-		      misc/userscripts/dmenu_qutebrowser \
-		      misc/userscripts/format_json \
-		      misc/userscripts/getbib \
-		      misc/userscripts/kodi \
-		      misc/userscripts/open_download \
-		      misc/userscripts/openfeeds \
-		      misc/userscripts/password_fill \
-		      misc/userscripts/qr \
-		      misc/userscripts/qute-bitwarden \
-		      misc/userscripts/qutedmenu \
-		      misc/userscripts/qute-keepass \
-		      misc/userscripts/qute-keepassxc \
-		      misc/userscripts/qute-lastpass \
-		      misc/userscripts/qute-pass \
-		      misc/userscripts/readability \
-		      misc/userscripts/readability-js \
-		      misc/userscripts/ripbang \
-		      misc/userscripts/rss \
-		      misc/userscripts/taskadd \
-		      misc/userscripts/tor_identity \
-		      misc/userscripts/view_in_mpv
-	fi
+	emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 
-	distutils-r1_python_install_all
+	rm "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die
+	fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
+	python_fix_shebang "${ED}"/usr/share/${PN}
+
+	einstalldocs
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
 
 	optfeature "PDF display support" www-plugins/pdfjs
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts"
+		elog "have additional dependencies not covered by this ebuild, for example"
+		elog "view_in_mpv needs media-video/mpv setup to use yt-dlp or youtube-dl."
+	fi
 }
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index 0e50c8a0f709..472d7e34f446 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -3,6 +3,6 @@ AUX surf-2.1-gentoo.patch 1082 BLAKE2B 76aeff15766cc1fe4355b04a5133e55e93dbcf4e3
 DIST surf-2.0.tar.gz 19056 BLAKE2B d9ef974ec14ce1ddf2437a43ccb0f424ada75d64ce926b19ac56f072d3589e6d251220842372f100f835ffbcccea2c402306a0c9f19f25462f5cb69fe4d7d175 SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5
 DIST surf-2.1.tar.gz 22555 BLAKE2B 3170b0b26893361ec84f2552051dc85b4a6fc132ff09a2dc2e9256f8ec8cdf93650c41b4d0466ebb5b608e2bde9282c1d1f64bb6f17114c58da7616994473f22 SHA512 06f31f683a941d9a587d908ae7f6949255937b0b0c9c133a18c6fa753c7da75de267adda1c83dd9ba0a8535e2b6d4ff2b5408cc5e8a2e315d4198fe68df5db12
 EBUILD surf-2.0-r1.ebuild 1220 BLAKE2B f0d509f11751b7e714f2ee38a3506b715ec7e41207de8f18a6c9fd6473895dac63bda8589a8839212babf5ba1b7a9ad0cdf654759e0e015bf2f7b18c23217caf SHA512 ac693af61ce07b3f112f68604074f708419e7c98d8e289a0f37bbe908506935ee4fe46a682f6ce484dac29e99a9441c424040655971f6453ef87b01f5c65cc4a
-EBUILD surf-2.1.ebuild 1410 BLAKE2B e1247d1fd4ea4c7e93336a0423c89710fa7cb3f22fdc3cefaf80e2944bcc7e9fe535810d3000a852182b500a9c8364b9a0fc92701636032fe24771343680d416 SHA512 e31b0605491640ce60d7ea97f732217a65db17cbda3ca0ec09698ac00bac696182d66a5d656c4ab6d026593323193eb29fcba53469f75417fa02f273562dcfc5
+EBUILD surf-2.1.ebuild 1408 BLAKE2B 8b82b3166d3263e0b6c10e5d54e93851fffbab83b32c3e8b00004378a9d2b0207edc05e6e405e09ab19e95e9eb32994dae5d93744b7e83bfba4a7cfb5d05da9c SHA512 1e9ca8126275d7a16e52bcb3007a752d4c4955bf3feec9edd58b28475f98082c8a1fd7f593b1f586b3f1c98b6fec0f540e43e07bb2a1eb098d916b062f640c97
 EBUILD surf-9999.ebuild 1862 BLAKE2B 32d174dce4c799a5555602454dfc25264cc2d0d84f85895996fa555869c22f9c60b8a0696cb98156d8d0faea3de2d2fabdf84fc8a20313cfe038b543053e4a13 SHA512 81676813aa151ac0f755d1da5870201ed121c060dded59d9fd04d3ccc8a3007b6dc7ddd483b3d8e26bc789ba06cf0ff6513c57a840e90732394a9ee9fc6b57bd
 MISC metadata.xml 698 BLAKE2B 5d07ccdc2993d6c7ba87076d37536d11fe799feb1234ad088cf4a60c9f0078cdb5f934ad752e27415bb6e76b3ebebf60830af463afca03c92e887428f4982478 SHA512 09ee0c4907018041ebdd7fb1c63c9200fd66a02baab706fd48775d1b557072f551be93d40284e5ce90b1b181a9cfd259c9b19411647e276c10aaf78672a4cf08
diff --git a/www-client/surf/surf-2.1.ebuild b/www-client/surf/surf-2.1.ebuild
index c4af2cd640b4..7422e29cff76 100644
--- a/www-client/surf/surf-2.1.ebuild
+++ b/www-client/surf/surf-2.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="surf-webkit2"
 else
 	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv ~x86"
+	KEYWORDS="amd64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index f73c59a9d0c7..e02f1d43d0c0 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -8,7 +8,11 @@ DIST vivaldi-stable_4.1.2369.21-1_armhf.deb 76573196 BLAKE2B 7103a117cc9b3094a1d
 DIST vivaldi-stable_4.3.2439.39-1_amd64.deb 88042364 BLAKE2B 71f471f9642e0a15584a2eaa9ba9300f0b473cf85ad17d3ce9b5c6d9123cf844014885b38cf9b5700eab0aa5a0063bacfeb013b293e02097de68fd7d4fa2d62f SHA512 fc1099b7cb1dac8882db3b093f213c674049fe9781106f2c8d0114020e25b55dc84621933c999a4dc04ff1e4e497927f8b85d4055747df79dd6bc942e05aa3a3
 DIST vivaldi-stable_4.3.2439.39-1_arm64.deb 82781716 BLAKE2B 7896804368d34a81aa936969b1473d32a414c14d344dce4df55f64a36c8cf52464979fb2d9ecb3508db01e24749d44a58f72ad3d7a2d474501394d2f5a5ed675 SHA512 437921cce2fb215728c1dfdd07975dc424208f0c89383a965738a3e2127f1ced9a0258ce2b1ea835bb0cfc71524652e519883e5371f33356cef5640741bd9e7c
 DIST vivaldi-stable_4.3.2439.39-1_armhf.deb 78946108 BLAKE2B 86a2ae7b947d7ebd7beab88e76e20b5d4115531329b1b4072f448cbcfd2f25ea396b88d976c977c1fde40a231d8e450b9c06953ec7412fc0be03212055cb3ea8 SHA512 081bc6a711ab3520008417520e572fc4b885400fd19f32950064382067b6c7b36eaeab918ec5b065f19540df706f03892f83c2b81cc49e66bbad2885e4b33cce
+DIST vivaldi-stable_4.3.2439.44-1_amd64.deb 88033720 BLAKE2B 1d2cea0200b9686254963c40e94fee389f3aa364c53575c60bda2c22252100b13920eef9c6de84cf2ca3d8d7f5514c2ba607cefde9ef73d8e66dec46365ecf4d SHA512 144aa07d85f9960faa36d0b266445ee6af91cf1b20e4bd9e1d1c8cb7143ad07ea11691996c3f4878288767628cbf88cb478d3c39c8933fdd4373d4498b627332
+DIST vivaldi-stable_4.3.2439.44-1_arm64.deb 82806876 BLAKE2B b83aead84525790e3f2f6249b0ebab9b96031598496fd9599be5448b2a4c64814c9b625a34f3d51ec459330998d540aec4b3a7f19713c70b7d10502d33076a9c SHA512 5a88c5b2ccd979d5d5c6e6b9aa8a8e94194ea0a5700bdabfd7ac44a7fb9530a51918340ea95740a07a5b796f08dd25fce48aee52250a10aff03ab984b024c789
+DIST vivaldi-stable_4.3.2439.44-1_armhf.deb 78995280 BLAKE2B e183d188a69a7e4f81234aa297602be6328959aee95ec7749db4222bbb3eb83a0a3153309e858be6e4bd654dfca4af787baa8481fc0be780ba4b0990848560da SHA512 afa0e0db5367ee260163d4ebfa802553710b1236ee3e3051842b0be40197fa4949e137f0fd6cec71bacbd34b18f51c0eac327f3a439f8002608b72e6543687c2
 EBUILD vivaldi-3.7.2218.58.ebuild 3553 BLAKE2B 3b6cd7c057d571f6a40d6578fd6a973cf5462aa7b64a854b5b6c88ea56b855311b8f23e1ca34a3c1350929fdaa6aa029c693783665cb034f4e759bf4f57e208d SHA512 757316d9fa2eb0d653591bde29b1a3520aafe713475d61ce3f71ca7f709119448ccf172870a1c0fd3fbe9890938dbeb47bc5f01c0b02b6c70accc10f74402fef
 EBUILD vivaldi-4.1.2369.21.ebuild 3549 BLAKE2B 91580e4afcd928523049e88050387f7f18bca8c311d1dc9e82e4a369a125a786a7ee9fc1986bf98bbc9e98e00b50ab42ac9d0198d6e0834159a814c89197c2bd SHA512 bf2443fe71ff0f4289b766c012099b738647bd1782654754ff951d25c6ec85ac1c52a894a12db07f0b8b3dcc52748c3a212c673948c7c747f9c6f50e4cea28c8
 EBUILD vivaldi-4.3.2439.39.ebuild 3601 BLAKE2B caa34ab42e85644b94ef8229ff287676755d9915221d1c4798befc9979dcd93eee9d9ca05e69570e65ea7f2ca8f13bb0deb68c1a4f5a431c18cc37d527dda24e SHA512 47408ac0e9ddd99e4d5a06cee8c5a165b05d2633485ba26270da3f6972483eea37478256ff807cfe9af89f220a8ef71e6da925ad6421af96d62e381a19f92cfb
+EBUILD vivaldi-4.3.2439.44.ebuild 3601 BLAKE2B caa34ab42e85644b94ef8229ff287676755d9915221d1c4798befc9979dcd93eee9d9ca05e69570e65ea7f2ca8f13bb0deb68c1a4f5a431c18cc37d527dda24e SHA512 47408ac0e9ddd99e4d5a06cee8c5a165b05d2633485ba26270da3f6972483eea37478256ff807cfe9af89f220a8ef71e6da925ad6421af96d62e381a19f92cfb
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi/vivaldi-4.3.2439.44.ebuild b/www-client/vivaldi/vivaldi-4.3.2439.44.ebuild
new file mode 100644
index 000000000000..9fafe2ed2efc
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-4.3.2439.44.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_VERSION="94"
+CHROMIUM_LANGS="
+	af
+	am
+	ar
+	az
+	be
+	bg
+	bn
+	ca
+	cs
+	da
+	de
+	de-CH
+	el
+	en-GB
+	en-US
+	eo
+	es
+	es-419
+	es-PE
+	et
+	eu
+	fa
+	fi
+	fil
+	fr
+	fy
+	gd
+	gl
+	gu
+	he
+	hi
+	hr
+	hu
+	hy
+	id
+	io
+	is
+	it
+	ja
+	jbo
+	ka
+	kab
+	kn
+	ko
+	ku
+	lt
+	lv
+	mk
+	ml
+	mr
+	ms
+	nb
+	nl
+	nn
+	pa
+	pl
+	pt-BR
+	pt-PT
+	ro
+	ru
+	sc
+	sk
+	sl
+	sq
+	sr
+	sr-Latn
+	sv
+	sw
+	ta
+	te
+	th
+	tr
+	uk
+	vi
+	zh-CN
+	zh-TW
+"
+
+inherit chromium-2 desktop unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+
+if [[ ${PV} = *_p* ]]; then
+	DEB_REV="${PV#*_p}"
+else
+	DEB_REV=1
+fi
+
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
+
+RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
+RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? ( ${VIVALDI_BASE_URI}armhf.deb )"
+RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? ( ${VIVALDI_BASE_URI}arm64.deb )"
+RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? ( ${VIVALDI_BASE_URI}i386.deb )"
+
+LICENSE="Vivaldi"
+SLOT="0"
+IUSE="proprietary-codecs widevine"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	proprietary-codecs? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	# Rename docs directory to our needs.
+	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
+
+	# Decompress the docs.
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	# The appdata directory is deprecated.
+	mv usr/share/{appdata,metainfo}/ || die
+
+	# Remove cron job for updating from Debian repos.
+	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
+	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
+
+	# Remove scripts that will most likely break things.
+	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
+
+	pushd ${VIVALDI_HOME}/locales > /dev/null || die
+	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use proprietary-codecs; then
+		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
+		rmdir ${VIVALDI_HOME}/lib || die
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	mv */ "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+
+	local logo size
+	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+		size=${logo##*_}
+		size=${size%.*}
+		newicon -s "${size}" "${logo}" ${PN}.png
+	done
+
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \
+			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
+	fi
+
+	if use widevine; then
+		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
+			  /${VIVALDI_HOME}/WidevineCdm
+	else
+		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
+	fi
+
+	[[ ${PN} = vivaldi-snapshot ]] &&
+		dosym ${PN} /${VIVALDI_HOME}/vivaldi
+}
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 26947bf0b162..ec36e73bfa83 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/buku/Manifest b/www-misc/buku/Manifest
index cfbdc1dda50a..fa5bdb1632c6 100644
--- a/www-misc/buku/Manifest
+++ b/www-misc/buku/Manifest
@@ -1,6 +1,3 @@
-AUX buku-4.5-hypothesis-fix.patch 17711 BLAKE2B fb5b57e25f36b15d8f3a48bb0291a657370d6d4c9f6df002a8bbf4a0e5af9b45cc2a53fb31e855b055775abf312aab2f752ed7621c9fca96163aecaa44a396bf SHA512 8489537c7c0c8ba81a4ca8e2b26e8a8a81f10f8b0f40c3481c55ce13abff1602ccc837351b00a4be6dad90e78820f144741753bf6f3ce39515a38c4a743e6d21
-DIST buku-4.5.tar.gz 488913 BLAKE2B 29ed93fa9af4503f72a711889fbf17d86bcde1bc1abbfc88242c4ebd18f1c1a57077781eebdd79d9d993078d2f5b5883c9a0ec4fee94e37c0e7bfb727c5154d0 SHA512 7bbb598d5c970e8e594d58c0a18f9b85245d4a214c01d64b537a5ccaadab32c964521046b90754c2f2c721bf816dc7f4438cfeff3a7e7eec75ce958cc41dfa7d
 DIST buku-4.6.tar.gz 491809 BLAKE2B 82597b845c56dadf1cc6973d1f3ce6cc4970230d08ac700cf286a8c41420144fb1f42817ab808041600ab8414d96f3a3883c1bd8fbe89f29570d877a495dcd96 SHA512 1c46006d8c950811493a8c11453d51557cac3f6346ea28d66dcb2ae3e4c52727af7349b4b6ea088f9c08a7e9d09e3a4d80679b41497b6cd0844d811f81c9811a
-EBUILD buku-4.5.ebuild 3020 BLAKE2B f1a2321b578aaf3c4e1dcd32341afa5d67e61d959c65923ef122dab5c727407dba7673581592df52acb6720b5396834869e2dd3d770eb30f8d5020e7aecd3725 SHA512 fcab0fd08a1f497f7979ff1d6b0d13aa7eafbe383d696d3590fee133e878152fc3b8fd5b88c477136148e5e111bb77415d678be4297bd96b36ee43992201127a
 EBUILD buku-4.6-r1.ebuild 2960 BLAKE2B 57bbb3add5bb5ec83148fdcb49be54a24eea8d1203c2fef72d6a9da1768cde0007d69d5731049cd82f99bfe65a8024b25df539ffff4a72506c5b90bfa0504add SHA512 b66fac6ad125166882af3680570724f76fec2f8b1d657cb43de1211acc5c8427855fe0b673093325acd6eb5a74a90a72a5bab0d564df814598ba3246ad03f645
 MISC metadata.xml 580 BLAKE2B b3eca833a48e557d420c951266207f9ef521fd436cb4c9b69683f327e36ac1e0428b91e1a09dfe4622077af1a65ba31db0e59c36a895a3377797e51bbb74e0d6 SHA512 bf04984b64a9e0e488c9eefb0416afef47df54aa40e8ca4ff5690433435ecbb6c881be930d6b99ee99fa15995f216fc970d2db197dc9ac82c74e0092c1b099e3
diff --git a/www-misc/buku/buku-4.5.ebuild b/www-misc/buku/buku-4.5.ebuild
deleted file mode 100644
index 378cb5f498bd..000000000000
--- a/www-misc/buku/buku-4.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Powerful command-line bookmark manager"
-HOMEPAGE="https://github.com/jarun/buku"
-SRC_URI="https://github.com/jarun/${PN}/archive/v$(ver_cut 1-2).tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/click-7.0[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		>=dev-python/py-1.5.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-4.2[${PYTHON_USEDEP}]
-		>=dev-python/vcrpy-4.0.2[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-hypothesis-fix.patch"
-)
-
-python_prepare_all() {
-	# Remove support for bukuserver - complex depgraph which isn't all
-	# sufficiently packaged in Gentoo
-	sed -ie '/console_scripts/s/,.*/]/' setup.py || die
-	sed -ie 's/.*bukuserver.*//' tests/test_views.py || die
-	sed -ie 's/.*flask.*//' tests/test_views.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/zsh/site-functions
-	doins auto-completion/zsh/_*
-
-	newbashcomp auto-completion/bash/buku-completion.bash "${PN}"
-
-	doman buku.1
-}
-
-python_test() {
-	local skipped_tests=(
-		# Disable tests related to bukuserver
-		tests/test_setup.py::test_bukuserver_requirement
-		tests/test_views.py::test_bmv_create_form
-		tests/test_views.py::test_bookmark_model_view
-		tests/test_views.py::test_load_firefox_database
-		tests/test_views.py::test_tag_model_view_get_list
-		tests/test_views.py::test_tag_model_view_get_list_empty_db
-
-		# Broken with network-sandbox
-		tests/test_buku.py::test_network_handler_with_url
-		tests/test_bukuDb.py::TestBukuDb::test_tnyfy_url
-		tests/test_bukuDb.py::test_add_rec_exec_arg
-		tests/test_bukuDb.py::test_load_firefox
-		tests/test_bukuDb.py::test_print_db
-		tests/test_bukuDb.py::test_print_rec
-		tests/test_bukuDb.py::test_refreshdb
-
-		# Hard to debug sandbox issue - these pass when run outside portage
-		# There also appears to be some state issue between these, because
-		# skipping one can result in a later one failing.
-		tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-True-False]
-		tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-False-True]
-		tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-False-False]
-		tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-True-True]
-	)
-
-	# tests/test_server.py is bukuserver tests, ignore it
-	pytest -v --ignore tests/test_server.py ${skipped_tests[@]/#/--deselect } || die "Tests failed with ${EPYTHON}"
-}
diff --git a/www-misc/buku/files/buku-4.5-hypothesis-fix.patch b/www-misc/buku/files/buku-4.5-hypothesis-fix.patch
deleted file mode 100644
index c742162ab1ca..000000000000
--- a/www-misc/buku/files/buku-4.5-hypothesis-fix.patch
+++ /dev/null
@@ -1,494 +0,0 @@
-From e4ef997dbbddcb372ba20cff18c8dc2a17da215c Mon Sep 17 00:00:00 2001
-From: rachmadaniHaryono <foreturiga@gmail.com>
-Date: Sat, 9 Jan 2021 13:35:34 +0800
-Subject: [PATCH 1/8] chg: test: basic for print_rec
-
----
- tests/test_bukuDb.py | 86 ++++++++++++++++++++------------------------
- 1 file changed, 38 insertions(+), 48 deletions(-)
-
-diff --git a/tests/test_bukuDb.py b/tests/test_bukuDb.py
-index 4413760c..b5c0d7a7 100644
---- a/tests/test_bukuDb.py
-+++ b/tests/test_bukuDb.py
-@@ -9,22 +9,21 @@
- import shutil
- import sqlite3
- import sys
-+import unittest
- import urllib
- import zipfile
--from tempfile import TemporaryDirectory, NamedTemporaryFile
--
--from unittest import mock
--import unittest
- from genericpath import exists
-+from tempfile import NamedTemporaryFile, TemporaryDirectory
-+from unittest import mock
-+
- import pytest
-+import vcr
- import yaml
--from hypothesis import given, example, settings
-+from hypothesis import HealthCheck, example, given, settings
- from hypothesis import strategies as st
--import vcr
- 
- from buku import BukuDb, parse_tags, prompt
- 
--
- logging.basicConfig()  # you need to initialize logging, otherwise you will not see anything from vcrpy
- vcr_log = logging.getLogger("vcr")
- vcr_log.setLevel(logging.INFO)
-@@ -686,54 +685,45 @@ def test_refreshdb(refreshdb_fixture, title_in, exp_res):
-     assert from_db[2] == exp_res, 'from_db: {}'.format(from_db)
- 
- 
--@given(
--    index=st.integers(min_value=-10, max_value=10),
--    low=st.integers(min_value=-10, max_value=10),
--    high=st.integers(min_value=-10, max_value=10),
--    is_range=st.booleans(),
--)
--@settings(deadline=None)
--def test_print_rec_hypothesis(caplog, setup, index, low, high, is_range):
--    """test when index, low or high is less than 0."""
--    # setup
--    caplog.handler.records.clear()
--    caplog.records.clear()
--
--    bdb = BukuDb()
-+@pytest.fixture
-+def test_print_db(tmp_path):
-+    bdb = BukuDb(dbfile=tmp_path / 'tmp.db')
-     # clear all record first before testing
-     bdb.delete_rec_all()
-     bdb.add_rec("http://one.com", "", parse_tags(['cat,ant,bee,1']), "")
--    db_len = 1
--    bdb.print_rec(index=index, low=low, high=high, is_range=is_range)
--
--    check_print = False
--    err_msg = ['Actual log:']
--    err_msg.extend(['{}:{}'.format(x.levelname, x.getMessage()) for x in caplog.records])
--
--    if index < 0 or (0 <= index <= db_len and not is_range):
--        check_print = True
--    # negative index/range on is_range
--    elif (is_range and any([low < 0, high < 0])):
--        assert any([x.levelname == "ERROR" for x in caplog.records]), \
--            '\n'.join(err_msg)
--        assert any([x.getMessage() == "Negative range boundary" for x in caplog.records]), \
--            '\n'.join(err_msg)
--    elif is_range:
--        check_print = True
--    else:
--        assert any([x.levelname == "ERROR" for x in caplog.records]), \
--            '\n'.join(err_msg)
--        assert any([x.getMessage().startswith("No matching index") for x in caplog.records]), \
--            '\n'.join(err_msg)
-+    yield bdb
-+    bdb.delete_rec(index=1)
- 
--    if check_print:
--        assert not any([x.levelname == "ERROR" for x in caplog.records]), \
--            '\n'.join(err_msg)
- 
--    # teardown
--    bdb.delete_rec(index=1)
-+@pytest.fixture
-+def test_print_caplog(caplog):
-     caplog.handler.records.clear()
-     caplog.records.clear()
-+    yield caplog
-+
-+
-+@pytest.mark.parametrize('kwargs, exp_res', [
-+    [{}, (True, [])],
-+    [{'is_range': True}, (True, [])],
-+    [{'index': 0}, (True, [])],
-+    [{'index': -1}, (True, [])],
-+    [{'index': -2}, (True, [])],
-+    [{'index': 2}, (False, [('root', 40, 'No matching index 2')])],
-+])
-+def test_print_rec(kwargs, exp_res, test_print_db, caplog):
-+    bdb = test_print_db
-+    # run the function
-+    assert (bdb.print_rec(**kwargs), caplog.record_tuples) == exp_res
-+
-+
-+@pytest.mark.parametrize('index, exp_res', [
-+    [0, (True, [('root', 40, '0 records')])],
-+    [-1, (False, [('root', 40, 'Empty database')])],
-+    [1, (False, [('root', 40, 'No matching index 1')])],
-+])
-+def test_print_rec_on_empty_db(tmp_path, caplog, index, exp_res):
-+    bdb = BukuDb(dbfile=tmp_path / 'tmp.db')
-+    assert (bdb.print_rec(index=index), caplog.record_tuples) == exp_res
- 
- 
- def test_list_tags(capsys, setup):
-
-From adb7314d49e47823d83bb7a07ef21ac1d628998a Mon Sep 17 00:00:00 2001
-From: rachmadaniHaryono <foreturiga@gmail.com>
-Date: Sat, 9 Jan 2021 13:42:17 +0800
-Subject: [PATCH 2/8] new: dev: type hint for print_rec
-
----
- buku | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/buku b/buku
-index 540c7d5e..a18c6b47 100755
---- a/buku
-+++ b/buku
-@@ -1658,7 +1658,7 @@ class BukuDb:
- 
-         return False
- 
--    def print_rec(self, index=0, low=0, high=0, is_range=False):
-+    def print_rec(self, index : int = 0 , low : int = 0, high : int = 0, is_range : bool = False) -> bool:
-         """Print bookmark details at index or all bookmarks if index is 0.
- 
-         A negative index behaves like tail, if title is blank show "Untitled".
-
-From 92caf1c6c8687773cb288434fff7e1218ae918ce Mon Sep 17 00:00:00 2001
-From: rachmadaniHaryono <foreturiga@gmail.com>
-Date: Sat, 9 Jan 2021 14:11:16 +0800
-Subject: [PATCH 3/8] chg: test: print_rec
-
-- merge no db and single rec test
-- more test case
----
- tests/test_bukuDb.py | 52 +++++++++++++++++++++++++++-----------------
- 1 file changed, 32 insertions(+), 20 deletions(-)
-
-diff --git a/tests/test_bukuDb.py b/tests/test_bukuDb.py
-index b5c0d7a7..2142dcf3 100644
---- a/tests/test_bukuDb.py
-+++ b/tests/test_bukuDb.py
-@@ -33,6 +33,7 @@
- TEST_TEMP_DBDIR_PATH = os.path.join(TEST_TEMP_DIR_PATH, 'buku')
- TEST_TEMP_DBFILE_PATH = os.path.join(TEST_TEMP_DBDIR_PATH, 'bookmarks.db')
- MAX_SQLITE_INT = int(math.pow(2, 63) - 1)
-+TEST_PRINT_REC = ("https://example.com", "", parse_tags(['cat,ant,bee,1']), "")
- 
- TEST_BOOKMARKS = [
-     ['http://slashdot.org',
-@@ -690,7 +691,7 @@ def test_print_db(tmp_path):
-     bdb = BukuDb(dbfile=tmp_path / 'tmp.db')
-     # clear all record first before testing
-     bdb.delete_rec_all()
--    bdb.add_rec("http://one.com", "", parse_tags(['cat,ant,bee,1']), "")
-+    bdb.add_rec
-     yield bdb
-     bdb.delete_rec(index=1)
- 
-@@ -702,30 +703,41 @@ def test_print_caplog(caplog):
-     yield caplog
- 
- 
--@pytest.mark.parametrize('kwargs, exp_res', [
--    [{}, (True, [])],
--    [{'is_range': True}, (True, [])],
--    [{'index': 0}, (True, [])],
--    [{'index': -1}, (True, [])],
--    [{'index': -2}, (True, [])],
--    [{'index': 2}, (False, [('root', 40, 'No matching index 2')])],
-+@pytest.mark.parametrize('kwargs, rec, exp_res', [
-+    [{}, TEST_PRINT_REC, (True, [])],
-+    [{'is_range': True}, TEST_PRINT_REC, (True, [])],
-+    [{'index': 0}, TEST_PRINT_REC, (True, [])],
-+    [{'index': -1}, TEST_PRINT_REC, (True, [])],
-+    [{'index': -2}, TEST_PRINT_REC, (True, [])],
-+    [{'index': 2}, TEST_PRINT_REC, (False, [('root', 40, 'No matching index 2')])],
-+    [{'low': -1, 'high': -1}, TEST_PRINT_REC, (True, [])],
-+    [{'low': -1, 'high': -1, 'is_range': True}, TEST_PRINT_REC, (False, [('root', 40, 'Negative range boundary')])],
-+    [{'low': 0, 'high': 0, 'is_range': True}, TEST_PRINT_REC, (True, [])],
-+    [{'low': 0, 'high': 1, 'is_range': True}, TEST_PRINT_REC, (True, [])],
-+    [{'low': 0, 'high': 2, 'is_range': True}, TEST_PRINT_REC, (True, [])],
-+    [{'low': 2, 'high': 2, 'is_range': True}, TEST_PRINT_REC, (True, [])],
-+    [{'low': 2, 'high': 3, 'is_range': True}, TEST_PRINT_REC, (True, [])],
-+    # empty database
-+    [{'is_range': True}, None, (True, [])],
-+    [{'index': 0}, None, (True, [('root', 40, '0 records')])],
-+    [{'index': -1}, None, (False, [('root', 40, 'Empty database')])],
-+    [{'index': 1}, None, (False, [('root', 40, 'No matching index 1')])],
-+    [{'low': -1, 'high': -1}, TEST_PRINT_REC, (True, [])],
-+    [{'low': -1, 'high': -1, 'is_range': True}, None, (False, [('root', 40, 'Negative range boundary')])],
-+    [{'low': 0, 'high': 0, 'is_range': True}, None, (True, [])],
-+    [{'low': 0, 'high': 1, 'is_range': True}, None, (True, [])],
-+    [{'low': 0, 'high': 2, 'is_range': True}, None, (True, [])],
-+    [{'low': 2, 'high': 2, 'is_range': True}, None, (True, [])],
-+    [{'low': 2, 'high': 3, 'is_range': True}, None, (True, [])],
- ])
--def test_print_rec(kwargs, exp_res, test_print_db, caplog):
--    bdb = test_print_db
-+def test_print_rec(setup, kwargs, rec, exp_res, tmp_path, caplog):
-+    bdb = BukuDb(dbfile=tmp_path / 'tmp.db')
-+    if rec:
-+        bdb.add_rec(*rec)
-     # run the function
-     assert (bdb.print_rec(**kwargs), caplog.record_tuples) == exp_res
- 
- 
--@pytest.mark.parametrize('index, exp_res', [
--    [0, (True, [('root', 40, '0 records')])],
--    [-1, (False, [('root', 40, 'Empty database')])],
--    [1, (False, [('root', 40, 'No matching index 1')])],
--])
--def test_print_rec_on_empty_db(tmp_path, caplog, index, exp_res):
--    bdb = BukuDb(dbfile=tmp_path / 'tmp.db')
--    assert (bdb.print_rec(index=index), caplog.record_tuples) == exp_res
--
--
- def test_list_tags(capsys, setup):
-     bdb = BukuDb()
- 
-
-From ae088057ccf5e7f0d6b4916293b5d3b3535a71ed Mon Sep 17 00:00:00 2001
-From: rachmadaniHaryono <foreturiga@gmail.com>
-Date: Sat, 9 Jan 2021 14:52:06 +0800
-Subject: [PATCH 4/8] chg: test: simplify
- test_delete_rec_range_and_delay_commit
-
----
- tests/test_bukuDb.py | 76 ++++++++++----------------------------------
- 1 file changed, 16 insertions(+), 60 deletions(-)
-
-diff --git a/tests/test_bukuDb.py b/tests/test_bukuDb.py
-index 2142dcf3..ad1ef5ba 100644
---- a/tests/test_bukuDb.py
-+++ b/tests/test_bukuDb.py
-@@ -774,74 +774,30 @@ def test_compactdb(setup):
- 
- 
- @vcr.use_cassette('tests/vcr_cassettes/test_delete_rec_range_and_delay_commit.yaml')
--@given(
--    low=st.integers(min_value=-10, max_value=10),
--    high=st.integers(min_value=-10, max_value=10),
--    delay_commit=st.booleans(),
--    input_retval=st.characters()
--)
--@example(low=0, high=0, delay_commit=False, input_retval='y')
--@settings(max_examples=2, deadline=None)
--def test_delete_rec_range_and_delay_commit(setup, low, high, delay_commit, input_retval):
-+@pytest.mark.parametrize('low, high, delay_commit, input_retval, exp_res', [
-+    #  delay_commit, y input_retval
-+    [0, 0, True, 'y', (True, [])],
-+    #  delay_commit, non-y input_retval
-+    [0, 0, True, 'x', (False, [tuple([x] + y + [0]) for x,y in zip(range(1, 4), TEST_BOOKMARKS)])],
-+    #  non delay_commit, y input_retval
-+    [0, 0, False, 'y', (True, [])],
-+    #  non delay_commit, non-y input_retval
-+    [0, 0, False, 'x', (False, [tuple([x] + y + [0]) for x,y in zip(range(1, 4), TEST_BOOKMARKS)])],
-+])
-+def test_delete_rec_range_and_delay_commit(setup, tmp_path, low, high, delay_commit, input_retval, exp_res):
-     """test delete rec, range and delay commit."""
--    bdb = BukuDb()
--    bdb_dc = BukuDb()  # instance for delay_commit check.
--    index = 0
--    is_range = True
-+    bdb = BukuDb(dbfile=tmp_path / 'tmp.db')
-+    kwargs = {'is_range': True, 'low': low, 'high': high, 'delay_commit': delay_commit} 
-+    kwargs['index'] = 0
- 
-     # Fill bookmark
-     for bookmark in TEST_BOOKMARKS:
-         bdb.add_rec(*bookmark)
--    db_len = len(TEST_BOOKMARKS)
--
--    # use normalized high and low variable
--    n_low, n_high = normalize_range(db_len=db_len, low=low, high=high)
--
--    exp_res = True
--    if n_high > db_len >= n_low:
--        exp_db_len = db_len - (db_len + 1 - n_low)
--    elif n_high == n_low > db_len:
--        exp_db_len = db_len
--        exp_res = False
--    elif n_high == n_low <= db_len:
--        exp_db_len = db_len - 1
--    else:
--        exp_db_len = db_len - (n_high + 1 - n_low)
- 
-     with mock.patch('builtins.input', return_value=input_retval):
--        res = bdb.delete_rec(
--            index=index, low=low, high=high, is_range=is_range, delay_commit=delay_commit)
-+        res = bdb.delete_rec(**kwargs)
- 
--    if n_low < 0:
--        assert not res
--        assert len(bdb_dc.get_rec_all()) == db_len
--        # teardown
--        os.environ['XDG_DATA_HOME'] = TEST_TEMP_DIR_PATH
--        return
--    if (low == 0 or high == 0) and input_retval != 'y':
--        assert not res
--        assert len(bdb_dc.get_rec_all()) == db_len
--        # teardown
--        os.environ['XDG_DATA_HOME'] = TEST_TEMP_DIR_PATH
--        return
--    if (low == 0 or high == 0) and input_retval == 'y':
--        assert res == exp_res
--        assert len(bdb_dc.get_rec_all()) == 0
--        # teardown
--        os.environ['XDG_DATA_HOME'] = TEST_TEMP_DIR_PATH
--        return
--    if n_low > db_len and n_low > 0:
--        assert not res
--        assert len(bdb_dc.get_rec_all()) == db_len
--        # teardown
--        os.environ['XDG_DATA_HOME'] = TEST_TEMP_DIR_PATH
--        return
--    assert res == exp_res
--    assert len(bdb.get_rec_all()) == exp_db_len
--    if delay_commit:
--        assert len(bdb_dc.get_rec_all()) == db_len
--    else:
--        assert len(bdb_dc.get_rec_all()) == exp_db_len
-+    assert (res, bdb.get_rec_all()) == exp_res
- 
-     # teardown
-     os.environ['XDG_DATA_HOME'] = TEST_TEMP_DIR_PATH
-
-From 70533309146cace69cc0b1d6163d6a239e73f055 Mon Sep 17 00:00:00 2001
-From: rachmadaniHaryono <foreturiga@gmail.com>
-Date: Sat, 9 Jan 2021 15:02:25 +0800
-Subject: [PATCH 5/8] new: dev: update test package
-
----
- setup.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 1cda44d1..60a36a37 100644
---- a/setup.py
-+++ b/setup.py
-@@ -20,12 +20,12 @@
-     'beautifulsoup4>=4.6.0',
-     'Click>=7.0',
-     'flake8>=3.4.1',
--    'hypothesis>=3.7.0',
-+    'hypothesis>=6.0.0',
-     'mypy-extensions==0.4.1',
-     'py>=1.5.0',
-     'pylint>=1.7.2',
-     'pytest-cov',
--    'pytest>=3.4.2',
-+    'pytest>=6.2.1',
-     'PyYAML>=4.2b1',
-     'setuptools>=41.0.1',
-     'vcrpy>=1.13.0',
-
-From 61592a42dcd1cadf168934a0fc74cb42da5fed0f Mon Sep 17 00:00:00 2001
-From: rachmadaniHaryono <foreturiga@gmail.com>
-Date: Sat, 9 Jan 2021 15:29:00 +0800
-Subject: [PATCH 6/8] fix: test: pylint
-
----
- buku                 | 2 +-
- tests/test_bukuDb.py | 8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/buku b/buku
-index a18c6b47..df2e1f8d 100755
---- a/buku
-+++ b/buku
-@@ -1658,7 +1658,7 @@ class BukuDb:
- 
-         return False
- 
--    def print_rec(self, index : int = 0 , low : int = 0, high : int = 0, is_range : bool = False) -> bool:
-+    def print_rec(self, index: int = 0, low: int = 0, high: int = 0, is_range: bool = False) -> bool:
-         """Print bookmark details at index or all bookmarks if index is 0.
- 
-         A negative index behaves like tail, if title is blank show "Untitled".
-diff --git a/tests/test_bukuDb.py b/tests/test_bukuDb.py
-index ad1ef5ba..e22ddacb 100644
---- a/tests/test_bukuDb.py
-+++ b/tests/test_bukuDb.py
-@@ -19,7 +19,7 @@
- import pytest
- import vcr
- import yaml
--from hypothesis import HealthCheck, example, given, settings
-+from hypothesis import example, given, settings
- from hypothesis import strategies as st
- 
- from buku import BukuDb, parse_tags, prompt
-@@ -778,16 +778,16 @@ def test_compactdb(setup):
-     #  delay_commit, y input_retval
-     [0, 0, True, 'y', (True, [])],
-     #  delay_commit, non-y input_retval
--    [0, 0, True, 'x', (False, [tuple([x] + y + [0]) for x,y in zip(range(1, 4), TEST_BOOKMARKS)])],
-+    [0, 0, True, 'x', (False, [tuple([x] + y + [0]) for x, y in zip(range(1, 4), TEST_BOOKMARKS)])],
-     #  non delay_commit, y input_retval
-     [0, 0, False, 'y', (True, [])],
-     #  non delay_commit, non-y input_retval
--    [0, 0, False, 'x', (False, [tuple([x] + y + [0]) for x,y in zip(range(1, 4), TEST_BOOKMARKS)])],
-+    [0, 0, False, 'x', (False, [tuple([x] + y + [0]) for x, y in zip(range(1, 4), TEST_BOOKMARKS)])],
- ])
- def test_delete_rec_range_and_delay_commit(setup, tmp_path, low, high, delay_commit, input_retval, exp_res):
-     """test delete rec, range and delay commit."""
-     bdb = BukuDb(dbfile=tmp_path / 'tmp.db')
--    kwargs = {'is_range': True, 'low': low, 'high': high, 'delay_commit': delay_commit} 
-+    kwargs = {'is_range': True, 'low': low, 'high': high, 'delay_commit': delay_commit}
-     kwargs['index'] = 0
- 
-     # Fill bookmark
-
-From 961071eac597206c63aac5c20e692f8b269d0171 Mon Sep 17 00:00:00 2001
-From: rachmadaniHaryono <foreturiga@gmail.com>
-Date: Sat, 9 Jan 2021 15:41:46 +0800
-Subject: [PATCH 7/8] fix: test: pylint wrong import order
-
----
- tests/test_bukuDb.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_bukuDb.py b/tests/test_bukuDb.py
-index e22ddacb..32738260 100644
---- a/tests/test_bukuDb.py
-+++ b/tests/test_bukuDb.py
-@@ -12,9 +12,9 @@
- import unittest
- import urllib
- import zipfile
--from genericpath import exists
- from tempfile import NamedTemporaryFile, TemporaryDirectory
- from unittest import mock
-+from genericpath import exists
- 
- import pytest
- import vcr
-
-From c51d454f2f7ff35995265f276a5d96adb5aff995 Mon Sep 17 00:00:00 2001
-From: rachmadaniHaryono <foreturiga@gmail.com>
-Date: Sat, 9 Jan 2021 15:42:00 +0800
-Subject: [PATCH 8/8] chg: test: remove unused fixture
-
----
- tests/test_bukuDb.py | 10 ----------
- 1 file changed, 10 deletions(-)
-
-diff --git a/tests/test_bukuDb.py b/tests/test_bukuDb.py
-index 32738260..23f2f84a 100644
---- a/tests/test_bukuDb.py
-+++ b/tests/test_bukuDb.py
-@@ -686,16 +686,6 @@ def test_refreshdb(refreshdb_fixture, title_in, exp_res):
-     assert from_db[2] == exp_res, 'from_db: {}'.format(from_db)
- 
- 
--@pytest.fixture
--def test_print_db(tmp_path):
--    bdb = BukuDb(dbfile=tmp_path / 'tmp.db')
--    # clear all record first before testing
--    bdb.delete_rec_all()
--    bdb.add_rec
--    yield bdb
--    bdb.delete_rec(index=1)
--
--
- @pytest.fixture
- def test_print_caplog(caplog):
-     caplog.handler.records.clear()
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 23a79f7c55c7..380484a6cdf7 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 2f030ae0388e..03139ee35146 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_95.0.4638.40-1_amd64.deb 89759728 BLAKE2B d55b468fcddb8ce11f04c1b93662a2653b1161e721877c786c9875906a57bd46d8bbf2f13a446654ac00347e57ed59f8907ce179fd99d8d35c2e1f42cdb6c451 SHA512 28c2e05ac2583ee54f995d07e0678630d427b7d714116dc7ec68fd1ddf93f450c6da7a4ed7657b3bca45e0ea0d95401b85cc2592ae6e0c745f836ab1e87b2a12
-DIST google-chrome-stable_94.0.4606.81-1_amd64.deb 90229076 BLAKE2B 8944ec65dfe4838e177c48765e10cba153670fbccf50749cbef5da60169cce11d3957eb4f43ee4b2601413623636786b605f5e8b4b305f81de2e469acb1a94a7 SHA512 d2750a2123c9091ac51df2d543df1bc4ae7c148d67939a3583262aef29f97aa9bbd5150bccc947295d908a3283d66146cc0565741e08da8d630bfdb9109df00e
-DIST google-chrome-unstable_96.0.4655.0-1_amd64.deb 89354896 BLAKE2B 69b2e65712351b3b7835005eb975dc5ededb09a5172efd8f0de75ec7f0c781513d6af6014f90fa03ae8c7ae3ea4ab1299b8a9ee4ef61feeba7d26b9f64c1f379 SHA512 fae22eb0cb6b1e52cbc12f9d18fb2733da9efa53c7b8fbd3a71132766c0be9c341522aacb4853b9317f01e11e216dc8c4b970ae70a606149122a0eba95f5d165
-EBUILD chrome-binary-plugins-94.0.4606.81.ebuild 1162 BLAKE2B 42cef63e0c49460e11b95cfe4383999f466204cc75069085ce15e435f9662e0d7eb143708334503c7c30df0144e5aa7bd378677ce36c4cfb5c9ccd82eea98b21 SHA512 d3d92b3333fae312d1ff0505368d67a9395f7aa19b4d89daa9241c844284c9465780639b485f9f132b1e85929f1f7713d8d4f86557b10c83e695002c0ec58c49
-EBUILD chrome-binary-plugins-95.0.4638.40_beta.ebuild 1163 BLAKE2B a8d31ca9c6a10536e4219032cf883e4b680faa33ecb455d50f49d2b6efa6fe494d718389183e680b80e517c9fbb6f0323513fb8e3a6e2f8427111a6e634b97d6 SHA512 0e048050229da9932403f5e05c859aa56237b06503d6745aa2e70ecd9d68d48568a63018f5c646096fd0d69bb2d35aa1f00302ee0c66e1b529fa1d6830094112
-EBUILD chrome-binary-plugins-96.0.4655.0_alpha.ebuild 1163 BLAKE2B a8d31ca9c6a10536e4219032cf883e4b680faa33ecb455d50f49d2b6efa6fe494d718389183e680b80e517c9fbb6f0323513fb8e3a6e2f8427111a6e634b97d6 SHA512 0e048050229da9932403f5e05c859aa56237b06503d6745aa2e70ecd9d68d48568a63018f5c646096fd0d69bb2d35aa1f00302ee0c66e1b529fa1d6830094112
+DIST google-chrome-beta_95.0.4638.54-1_amd64.deb 89066076 BLAKE2B 6bbf1ccb224184fbc88875cc6c717dc954988915c27a15d5db20eb72f0d89a821ccb5ca07513b41fbfb7d050afe0b3b1b04eb6689c88a5c290f599ead6993010 SHA512 f7fe19544041c6951d3787a515ed3a9dd234868f71d3beb91731c57c2364e0189551efcb724fe46212bfc62c60af420d5b3540e72a094fd79e3106404ab3ebdf
+DIST google-chrome-stable_95.0.4638.54-1_amd64.deb 89046612 BLAKE2B b1c714490f81d034a3c34fb87a33f8db9737e555fbf795c2e7c81d570ff814049488f50fbb94ed8691cc50282b1c06546c8228143ae59f020075061061dda49a SHA512 eeaa1aa3787310640de72d8f6606a4d654f47138143de091e43208e13f10ae4115c5c0588cef11e49073bbf6f86646d8babc3a463e35714c64be5c61852382a6
+DIST google-chrome-unstable_96.0.4664.9-1_amd64.deb 89408576 BLAKE2B aa19e91ab098ddc5957244b1a92d420e06deafce7b4fe366fcf55d5919eab39e11d2be8f0403670796bdd96719eabf58e66dc8c0d741e4f88c4385fa410300e8 SHA512 8eb4f4e166d1a5014ad616b2eccde71c240462ab321d2e5cf456b8b789919d6ddbd67eddca8e3b4a748e1198715ce52e8b771176f63b3de3cb798f8d8f08752a
+EBUILD chrome-binary-plugins-95.0.4638.54.ebuild 1162 BLAKE2B 42cef63e0c49460e11b95cfe4383999f466204cc75069085ce15e435f9662e0d7eb143708334503c7c30df0144e5aa7bd378677ce36c4cfb5c9ccd82eea98b21 SHA512 d3d92b3333fae312d1ff0505368d67a9395f7aa19b4d89daa9241c844284c9465780639b485f9f132b1e85929f1f7713d8d4f86557b10c83e695002c0ec58c49
+EBUILD chrome-binary-plugins-95.0.4638.54_beta.ebuild 1163 BLAKE2B a8d31ca9c6a10536e4219032cf883e4b680faa33ecb455d50f49d2b6efa6fe494d718389183e680b80e517c9fbb6f0323513fb8e3a6e2f8427111a6e634b97d6 SHA512 0e048050229da9932403f5e05c859aa56237b06503d6745aa2e70ecd9d68d48568a63018f5c646096fd0d69bb2d35aa1f00302ee0c66e1b529fa1d6830094112
+EBUILD chrome-binary-plugins-96.0.4664.9_alpha.ebuild 1163 BLAKE2B a8d31ca9c6a10536e4219032cf883e4b680faa33ecb455d50f49d2b6efa6fe494d718389183e680b80e517c9fbb6f0323513fb8e3a6e2f8427111a6e634b97d6 SHA512 0e048050229da9932403f5e05c859aa56237b06503d6745aa2e70ecd9d68d48568a63018f5c646096fd0d69bb2d35aa1f00302ee0c66e1b529fa1d6830094112
 MISC metadata.xml 263 BLAKE2B 63f20710af1b20f01824544c06058c4bef7c4b6e1b66a2bcd17c2dde8f48e6b30a074ec6c3940976d652bb8885a80495914a3ddf4de5766c04f5913780c85668 SHA512 85a03d35084d8d81e038c8065fe58a36f3dd1f5355aaf62033ba590636fa4855ee993ec5f3d10645a55754debddf0b57b4403172f3808e4575b3b2d8d7f180c0
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-94.0.4606.81.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-95.0.4638.54.ebuild
index 60e3ad6a5e17..60e3ad6a5e17 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-94.0.4606.81.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-95.0.4638.54.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-95.0.4638.40_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-95.0.4638.54_beta.ebuild
index e11c8c2a2bb2..e11c8c2a2bb2 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-95.0.4638.40_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-95.0.4638.54_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-96.0.4655.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-96.0.4664.9_alpha.ebuild
index e11c8c2a2bb2..e11c8c2a2bb2 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-96.0.4655.0_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-96.0.4664.9_alpha.ebuild
diff --git a/www-plugins/passff-host/Manifest b/www-plugins/passff-host/Manifest
index 5d0a10a96c67..1a243cc15e07 100644
--- a/www-plugins/passff-host/Manifest
+++ b/www-plugins/passff-host/Manifest
@@ -1,4 +1,7 @@
 DIST passff-host-1.2.1.json 176 BLAKE2B 8eddc19cd0c072d25afff5cfa86a95d960ae7b986727099a04a1d983b887922f9ad77e940a2c80e0838a169afe81fa3f6529a901998bb98a6750ac888a09c264 SHA512 e4a4b90fb5323c6dbec339b9e67a7d546c6d7a95754fe03b3a4d96396c28de1caba3068b4e936ee0ce0997f865c8b5e53a3da1fb34f0123a04c5889302c28911
 DIST passff-host-1.2.1.py 3666 BLAKE2B 6a95defc3b1abe91f95e83ab20e9d0e533da2ae0e2153d2b50abf0a77aeb426b6b0a0ed042c00912a434dadbf53a9091fa772df9b9f5c330982a9ab49b891bc8 SHA512 5fe848fe0d6a75b679ee18fd5d32fda963853b91ad382fc19780104d44d1052a7191188946af470722dab883f0318ec38980fc24f052aeb5c54cac98f810ee15
+DIST passff-host-1.2.2.json 176 BLAKE2B 8eddc19cd0c072d25afff5cfa86a95d960ae7b986727099a04a1d983b887922f9ad77e940a2c80e0838a169afe81fa3f6529a901998bb98a6750ac888a09c264 SHA512 e4a4b90fb5323c6dbec339b9e67a7d546c6d7a95754fe03b3a4d96396c28de1caba3068b4e936ee0ce0997f865c8b5e53a3da1fb34f0123a04c5889302c28911
+DIST passff-host-1.2.2.py 3691 BLAKE2B 3fb64c6ca0d512d61f7bd3884ff5714f5a1b93095ab1c99043645d8253b5128d3d054faec6bff0f560f536b10ffa1cd523dc440b19d90cfff3bac6009f0ce86e SHA512 407be35359e987f355f04a45bf8a0c1023ee04d3c6d7c4ea9cce29955957cd514302ca04aeda4367e8560e8d765159b5fddad2e51ea089f9eb2947564605b5cf
 EBUILD passff-host-1.2.1-r1.ebuild 1544 BLAKE2B 4669eb2223577b008c42c9d1018b5b4f4a623368843eaccb9c2abbb35a469277c8d8c5149164a636f20780adbc1446d9c8dee177fc1489df4cb4238966d06e8b SHA512 f5eeeb0beccb6cad2163f66230175afca1c4f322ecff2c68f39674572564bb947cdb820a286ae14d302462f36aaef34c3ab87bb1f5e67d8e76b88e78cf5c0ba4
+EBUILD passff-host-1.2.2.ebuild 1544 BLAKE2B 4669eb2223577b008c42c9d1018b5b4f4a623368843eaccb9c2abbb35a469277c8d8c5149164a636f20780adbc1446d9c8dee177fc1489df4cb4238966d06e8b SHA512 f5eeeb0beccb6cad2163f66230175afca1c4f322ecff2c68f39674572564bb947cdb820a286ae14d302462f36aaef34c3ab87bb1f5e67d8e76b88e78cf5c0ba4
 MISC metadata.xml 606 BLAKE2B a5d49f8a42512b029523ca6a6bd7381de2c8d55bba920eecb63b76936edd6a1821f3a89665e9e5aa934c94a4ec14d4ac6751f4e3085b9b953e0b02ef801e3329 SHA512 13da163e895654c551434f0765cb55e45209af882e822cbcf6a664fb6ce88b4ae8f64cf832c38a6e2827b0d0cccd945059196c7b8fff125ce25e3f0b6e283eb5
diff --git a/www-plugins/passff-host/passff-host-1.2.2.ebuild b/www-plugins/passff-host/passff-host-1.2.2.ebuild
new file mode 100644
index 000000000000..df908c998abd
--- /dev/null
+++ b/www-plugins/passff-host/passff-host-1.2.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-single-r1
+
+DESCRIPTION="Host app for the PassFF WebExtension"
+HOMEPAGE="https://github.com/passff/passff-host"
+
+SRC_URI="
+	https://github.com/passff/passff-host/releases/download/${PV}/passff.py -> ${P}.py
+	https://github.com/passff/passff-host/releases/download/${PV}/passff.json -> ${P}.json
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="chrome chromium +firefox vivaldi"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( chrome chromium firefox vivaldi )
+"
+
+RDEPEND="${PYTHON_DEPS}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp "${DISTDIR}/${P}.json" . || die
+	cp "${DISTDIR}/${P}.py" . || die
+}
+
+src_prepare() {
+	default
+	python_fix_shebang "${P}.py"
+}
+
+src_install() {
+	local target_dirs=()
+
+	use chrome   && target_dirs+=( "/etc/opt/chrome/native-messaging-hosts" )
+	use chromium && target_dirs+=( "/etc/chromium/native-messaging-hosts" )
+	use firefox  && target_dirs+=( "/usr/$(get_libdir)/mozilla/native-messaging-hosts" )
+	# www-client/firefox-bin compile-time dir is under /usr/lib/
+	use firefox  && target_dirs+=( "/usr/lib/mozilla/native-messaging-hosts" )
+	use vivaldi  && target_dirs+=( "/etc/vivaldi/native-messaging-hosts" )
+
+	for target_dir in "${target_dirs[@]}"; do
+		sed "s;PLACEHOLDER;${target_dir}/passff.py;g" "${P}.json" > "passff.json" || die
+
+		insinto "${target_dir}"
+		doins passff.json
+		exeinto "${target_dir}"
+		newexe "${P}.py" passff.py
+	done
+}
diff --git a/www-plugins/pdfjs/Manifest b/www-plugins/pdfjs/Manifest
index b6b4b32defc1..e99b8787acc6 100644
--- a/www-plugins/pdfjs/Manifest
+++ b/www-plugins/pdfjs/Manifest
@@ -1,7 +1,7 @@
 DIST pdfjs-2.10.377.zip 5274223 BLAKE2B 5cfc5dfa68519d987a440804d852834001d6b33b8677eaa3b2a27da872f5340472a00b0026f58917c15a8579670fe99aa53c76b31f79017a41778fdb74819f9c SHA512 ea26094558e1477b6fa9377ad96c9dd616257a65ff1cb05ef91f91e7dbb3f44ae17dde9577aa2743c20203c2d1c27537ea391ac1eff0dace134676beba1d0cb2
 DIST pdfjs-2.4.456.zip 3773255 BLAKE2B b3f293d57bd21e05d4de70f99d24ac047e51b91a844e763778e5d557e9af0dbb090f9157363c92b4453bc925db4ce1c954999f6064fd4d062f27ef5ceed4a2d6 SHA512 2f79af887aac0eab346ab48f9ad91e92aefbd037c4cbe00694c07283b61cea6e321fd0abd88846723b34e2e81abd81ce3a11258f88ba033fcb59f196d1497e7d
 DIST pdfjs-2.5.207.zip 3804074 BLAKE2B a6c61c755ecdbd90bdf4ae76ec1ed9ffe00293e32d9e1ec92623f1a19658462385dded7f33f65f2ee609f157cf95b568b7e8c5ccd03a24d1f514092dd660a7c0 SHA512 f23140bd1705966a950076c6c7aeea10da6e29db160fd760f3c877b6e632d24f313e15d3ece64c662077e3cc9e25eb5c8c937e48c7e8b32ec07df6cdb0827304
-EBUILD pdfjs-2.10.377.ebuild 467 BLAKE2B 9e45175e474e8d57ba926ee7c4c5a8a1171601ee9a07294f32de0dc6273000fe084a3686d865c47bdb4dabe62568ea280e22ebef5f1c4488ed5ea927687c5f3e SHA512 b05551bdd70dc0e575324a0e46373b2053b479cc134e75728328a6b9f71cfd5c81e7eab8ddb1b97407249828b7d2c3ebfdad707b1998f655ced656fea1b70b21
+EBUILD pdfjs-2.10.377.ebuild 474 BLAKE2B 17d13468cc669c47ddc597de5c779b4482481aaa8381896e155089546831106079c2facda04cced2e274ff90ca328d70aad48ee50d6e6633aae495f42caf5e42 SHA512 a4f01974264c68e25fb7b9f1506fb2491c4f3d6fb56408ce761484037ef77fa4764e1c9d2b851064f3cd2456bb5a5b8e6823ba3554af0cb7c497b65e205444e3
 EBUILD pdfjs-2.4.456.ebuild 467 BLAKE2B 9e45175e474e8d57ba926ee7c4c5a8a1171601ee9a07294f32de0dc6273000fe084a3686d865c47bdb4dabe62568ea280e22ebef5f1c4488ed5ea927687c5f3e SHA512 b05551bdd70dc0e575324a0e46373b2053b479cc134e75728328a6b9f71cfd5c81e7eab8ddb1b97407249828b7d2c3ebfdad707b1998f655ced656fea1b70b21
 EBUILD pdfjs-2.5.207.ebuild 467 BLAKE2B 9e45175e474e8d57ba926ee7c4c5a8a1171601ee9a07294f32de0dc6273000fe084a3686d865c47bdb4dabe62568ea280e22ebef5f1c4488ed5ea927687c5f3e SHA512 b05551bdd70dc0e575324a0e46373b2053b479cc134e75728328a6b9f71cfd5c81e7eab8ddb1b97407249828b7d2c3ebfdad707b1998f655ced656fea1b70b21
 MISC metadata.xml 332 BLAKE2B b729018cedc119a18ac5517fe7e9aecfcf848225330353da1aa33139a5ce33b9074e9a8a40bc9ce371d49d940dd5158866d26c63703f4d0f9e92ae7bf8b938c2 SHA512 1979b99c935c10801a9342ecc7abdb7d0b72abc9069a512d4da4d396fda2f9d22f8c0d29a907b489830c92cafcd2d9ffed6d77302ad3a16801bcbccf9da80fc9
diff --git a/www-plugins/pdfjs/pdfjs-2.10.377.ebuild b/www-plugins/pdfjs/pdfjs-2.10.377.ebuild
index 6f2bb76c6b3f..0a8c36acf003 100644
--- a/www-plugins/pdfjs/pdfjs-2.10.377.ebuild
+++ b/www-plugins/pdfjs/pdfjs-2.10.377.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index cb032201a73e..5f8399e62655 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index b52ee3eaeb4f..ed4f35e5d512 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -3,16 +3,21 @@ AUX caddy_config.json 603 BLAKE2B e4d4cacdd947f0266da8017c1872897aa53a5bd74f4e26
 AUX confd 86 BLAKE2B f75f8a9440b90a66fc4f56d5ed2f97ff428bc061a555c48b8c51c822050de6af6b7c81afc92f01c38ab90f16c863fed3ed49a312d04582952f4292ed7bc9dc62 SHA512 24e6eb385c739c470ea7a896c80340de5d3857f829a665edf17a82e44ea5580fd28b1678a68c72a528174e63be2a08fa1dc376163394d6db822f67e3e169c9e8
 AUX initd 736 BLAKE2B 67baedfce797cb3aa51a953b9762f44a5fc0605152c124ed723607a93c01ec83fad1aa22d2b4faa9e4d38d8f74fcd1bf4da0fa34f2411259dd0f333649e3c3ce SHA512 e79a77050ac127f7416137eee8247b8bf455fb80616b4efd53b331ea4dba08f984c150b546ec075c8bd99bce8e1d1dea45c1646f8d20eaaf8e92314a1d8267c1
 AUX logrotated 39 BLAKE2B 2801a25d70fe62aa7487da24561fe9d0efd96c0c76764edcbb2332dfb7f9e9ae7a2dee2abf0f5877a378618ac6a56ca8494800465cdfae839af84606db0f920e SHA512 2aa59645a23d8a7a8566532830883393b4b5ead245fe2fd2d752603bbdbe5beddcce522a22add725899995b87be44f801d0bfa721e5da1ac18273f1119e73d26
+DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20180421153158-65cc252bf669.mod 22 BLAKE2B c2b56c0b043a2c0225c3b4142f179a2d2e4938dad64b95c8662a6d641e69a455b50ed79c66a3bcc10982792d3b7742ac96a2d74eefa7fec40a7c3146e5c949cd SHA512 7b3ef87f98485bb9ec325680f57d43a9bd76e90bdcfb1e798458f28f7d3addf91dbb6a07b654749468860981413ad2267df2d5f3535c85579e9f79d9328d355c
+DIST bitbucket.org%2Fcreachadair%2Fshell%2F@v%2Fv0.0.6.mod 48 BLAKE2B 97b2e5e0f91c66c301db92f58f064d0c91a85b0766ee77d85a8298269e1ac8c82acd1880664e302517143892b98b1f011688d3003ff595a1f9adf0fe8df6e8ac SHA512 eb5c512e9be3b38de69c2708418456ce71dc4285f64abb5e5bea738375576ea1d9ac2f4bd46163af34e7a7f7ae554ca3439a8122e2dbbeedc60221865bbfc2b4
 DIST caddy-2.0.0.tar.gz 350050 BLAKE2B 5cf53b85fa267d6686ce00754d4653013aab56e1fd076f4c4f8c864d57f924ab3fedaba4bce24972159e83ce7ae3889b75d5d0e259c8d77a0620e0b53b3888e2 SHA512 b7393f117e33529990424a78804c0e04a86ff8af8393564134066ab7b6a1d64a141b73708928209c1f29147a2f8fd94b2056f11642b8205b6de4ede6a783f2af
 DIST caddy-2.3.0.tar.gz 412978 BLAKE2B 332c5039041ade93bf21d1e767bba4e24366f45654e039d4c21e58f7c6b225712c5005868ed5b385f6299413373653077b8e1dc921603065dcd055fe09c0ae94 SHA512 5416129f7152a0e2617cef0e32be27188d9248fff316fff9dc1ecaa13ec1287e11deb22eb84fe3dc88c234a8e8e8ff8e40b3ba23bcc60a7418c60b7c4fa24a1a
 DIST caddy-2.4.2.tar.gz 447543 BLAKE2B 23505ea9a44bacbf054f0ae0d74cba95247fff33917ef95149ff210c0b0ccb9bc7ad6477ccd9dc14913ec7cf355086853fdfe6924822937ac92302e6acc96640 SHA512 dbf23896693f14513fc7651665d237a4ee58e137f5f932a5468b773bb1be336223b16d7603bcc1031966f618d611a7a829172f20f91fbfce82296356e6234384
+DIST caddy-2.4.5.tar.gz 465145 BLAKE2B 72b4896f87fc9a403734aee352a3962a9e07e72eefefa14eb55f7cc21b87fe799585943b2e65c3e184295522289f1061f0a4aa2fc52506216316bca8b5d3f016 SHA512 bd90b5510b1cab6c62f1568c19b1d10dc8852176fb0140f2b5eb82c1e398beebadfcc54187e7f6e9ac7262a88435355a4bb043396cc6e32502060f50b8062dba
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.37.0.mod 1008 BLAKE2B 4927d7d7fae96f989d42ac23ac107e4fdab6ba955f3ba69140e56ceab2e4c618faf5fd88006794a20c3660e368e717dcead18289cb09608af3bd4fc4bda29f0c SHA512 24150b760cdcb32da7bcd7adf54085973c41904673ceebc13cf12609a63e68e6620737414de3ffca810525e1f69aa7b725a3b5635d114c1c2d31f13b2ca8a7e6
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.39.0.mod 1059 BLAKE2B 175c6f53a17c785d18eef838f35553aeb65463c35c4c56f617be30971ff9196d6642629eb71abf95ce39c4d5f6b1dd93b3e21c1f71f901e7a5c6eaf655b0aeab SHA512 8c0fbd092acafa28279d7255079d433968960cc57cffc36d69df114e9f9e87ba06e3dbf4f39fb5bd8ff60c46be965a6d3a74fc680a12fe45b935613537399333
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.3.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod 960 BLAKE2B 879529244d38fbecdaea27588031c2d0d82551d8173f7e41f004dae8356e2264259d80e66953e941aa856a9613ae82211ea8dc0b12f9188f65bdf54487052952 SHA512 cbe178d04fe28f9b7dd07b0317fd4404d805e80ceada4953ad47763bafa2f215f88464c1315261a902ebcc52145af09df4c96a341e42644d38526909fcef313c
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod 1129 BLAKE2B 975226b22ad0291e83a5e47d901c79ac5a7c684010972581dc15f9713154141f3d6dd7231407255240620e29cbfeb877f05f5b5d388100a70d381f8f54f7db5f SHA512 70400a50eedc5305fef765d38f0428f636f439195d09cbb283ee7779b8aba1f881f83d894acbc6ee90ff016358aa9b117c79557da15d10fc60264eb36ed3fe3c
@@ -28,6 +33,14 @@ DIST cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod 810 BLAKE2B 50cf503d994003d7974ad7
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod 831 BLAKE2B 9d34710c0f721d3f471c3da32555b4a3e559474afb8d30237b0935ce167e7bcb5507d2b19bd6675da724927109ed74ba79dc9dc3b3d8cb271515ef2c6bb0c7c1 SHA512 d1a718c4ba19ee0d4221858dd0710cc480fdf6c0b134f1ce5c4a805b15cac88a77e73f26e79f480b0852a6c0f499c63876dacdb3038ea40d38e9f8ae577ce219
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.70.0.mod 762 BLAKE2B bee05152a42b1d57df013e4bbfe076c1b1fea65534c9d652cf1f2f40c5c19bdaecd7dbbaa24cc2625b6277e56b9279aa4122db4e2b0057a7bd7fbc15bd10a06d SHA512 554d23669cb2f0c49ab3726bce53a2167598cad30a699e4cc0d44d158e5e5c2c2b0d5aa898935d503968b30b6d0353685adea9904e198f6e0dfad48acfe2e1dd
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.70.0.zip 1724750 BLAKE2B 715597a845c5cd5177aa7306ad20028e5ad241d2845172a02cb85261e765ef893d50e5b348a060ee0d2eb2cdeb7b1500aa4e052da5e361e113b1d7e14f36bb63 SHA512 11d01d11b5fdbb6608438fb6925e742347957ea3841e4e79a9771ff91c52cadb06c367deea7ecf9892f9bf7021d59ab0491c15065d34a5a48ddd726dd1b3ecd7
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod 762 BLAKE2B e6349d349c8249101b89b3fd324ef16b7fcf65dc5a87f751a8738b00619942abd06511247ee0e425b3f9b380a669475061f64cdb27c7c8f8f9007bd6067da13d SHA512 57501aa2452b72ec72fe2fc0cb2e2dc7e53f28895b0a9e829f4bcbf6e87464b9f1d05283f72c066fe7e5665b300112db1b92533affb36db3894ab5dbc04a0cbf
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod 799 BLAKE2B b9cf83579a32d0109d952fac0d6bda1f8524aadc267aa062e05f7679ad4e910ac18f2b0c652ce71cfc153a30f7df128f69fc742f7f95392c74fa6b32f360cd95 SHA512 123b30fd3799e31fa3ca7237b81cd6ba20874cedbe0c9c168409adf90c09d2dce45de24c7de61fd60c117bf3306ab5299fa22bf0f9231e0ea10bc1a7c9f2dc3e
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.75.0.mod 799 BLAKE2B 3b39fa8e0153dab4480fe721d90b21251e7edae3b74f112d639ff48e3577632041fa0ba35b3ae89958770639734bacfff51da0359f9db4a8816ee209b4d14274 SHA512 7f37811c234dce3f8940e83e0affce9ca3e247676a3b058dcb48ec51a082ea8ee905c18bbc5cc6122bc9424328ee48bd796fe97a115c8740bb24c4fba494ddec
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod 836 BLAKE2B a7c8abe165d93aff4607f158f66af5c6bba37fd06f42c89da797276a9dc3358b782b5d23da4c1c4706e9429b1e1e55583511695239fb552556af4c998a94b287 SHA512 8e02d438dcf1ef35271817b3ecde8a0bb29d95f08b9299463cc9eb82ee40c2669181f850e5b7c9cfbaee640a711952828772dcb47277c91064b5d30b9276da69
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod 734 BLAKE2B 0f3ff37abbf9359ae68c780de7406253cca023e201fa7bac86901abd52312429c5e94dce0b361dc5773f738b2155ca5dbb4273742da1f6599a30d60c432c1094 SHA512 2da8ed0a65a4825e939e8a35733d9cd828f102c531e322f233fb65d441ab566421f259f1e562743f982518f27334b4e1bffb6a22f8f7b4a3097df904f1e4aa03
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.81.0.mod 734 BLAKE2B e3ac7f5f2081a672878f5c017da4816147aa1d076dd1f24b9dd2a5ae07390323c15890f34d66a6089625da6a831545fb3c01a0a02a05c06a95a0799848172788 SHA512 0f20f17224815d31006304ee27cd0c79e25f3d83e962e1fff3e61483126b950dc21ecb7494dc585410b2ab7fa72f5c40c14d577ad85b50702d5b07758b2225a5
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.83.0.mod 717 BLAKE2B c7769274eab79772fa41793f0a6ab7560823e0bf101dfa0e5e583d6f59c3a7acaa74b7b4fcbacb5d4c9eab1472fc77fe31e6826d9c6e96e87ef27d9303466eff SHA512 1ff1b33b078484f834924b6c10c2d840749411314f56afbffc07f0ad4f97fc1b603aaac9293ff44e08600e56adbcf68398837eb5480b7b7b247de0ef4d1a30f1
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.83.0.zip 2504977 BLAKE2B 7070aebaaf5498a7a0adab8d58509e584ba767be32d6b93095a937b9c62e072dd48e16cf87f2bb587b839cd7d10f78eb6b8c3cc4b8668a7fbbed600576e6b919 SHA512 931d04fc10d6721b8b71df54c7aa2d497813f9f04813cf8797fa1161c7437072900fb272f91d5718aa5c38076e8e963d2790725df7a89c758ac60f3560c202ef
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod 555 BLAKE2B 6707e248be1fa35970275388888eb7692f976a8fca6ddc7cf02e355f8d44264c7eef6d093d90c115670b7a3b495658b79e622c47d1c90b95684b8d32547d7342 SHA512 2df2dbf07037f027100f8beba6416c00fc115fcde2dce19ea4c0fe4a036e8f66f7ae278e9765d0fc80149a330e6dd90eee8e9a0c93aecfe16da65d02320aabd1
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod 631 BLAKE2B f7d342f7b6a9e0cc3249d9133a5408e9738957c57cedb13a64bd54d638cf85a17902bade3b452660b5e8b6aa6dbd76e0e93f0b0e4f5711856916879049f28e13 SHA512 3de4d1cf52d35112353c8d7e76df9915e92ba8addcbcf4c72e6d24c677bb642ff0b1011fca4e17dd9d364a03443710f452effb51965d95fd1571358b9aed7039
@@ -36,18 +49,28 @@ DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod 649 BLAKE2B d4ef60eed1eb
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod 639 BLAKE2B dfcb82794bc8e88465ca9c754b798d6f1f270e1fe5891221d482f6b5854524d09e3d19b6f75e494f69b4861e2f1b2329c08fe9e4235005f2dff41928950dccc3 SHA512 74886885016c92ce56b584665bdcc925404bab745a25ace03dacc2ace3f812a0d568ab8d19044097906b9da479037c41468c33f1243e6d55b36fba4571117607
 DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
 DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod 566 BLAKE2B 93ded2035caa89bff7ac5a432c713751fa04791c513b9464c409524157c62d0ad19929a65126785a1d167c499fbca2289da6e6657ab182bf38234a4d2f380d72 SHA512 e7056a89df84a1027e2dcb4e15c6e89e0279d4a8bf5a45dad7778587bbd06f5f359c7addde5a5a62e0cb454032cc3ae0fc443477bf2adc3422cb0c38009f4e52
+DIST cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod 568 BLAKE2B d3d62f2d5c018c4ea3c829f7485e5a1239e2d810f79306af4d08ac32acda4d33e8e90c66c63540c4c95231f5fa116634758858dbf4af2a953a17b0db2b5c1cc9 SHA512 adb3d294ec1e9476bed820afa92aea5cabf77e7996d83bd1f03dff8447dfb13dd18ab4f091ad6ee209128151dcbfedb4967f99ccf7e10f5286e90b2ad56441d6
 DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
 DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod 755 BLAKE2B 2a2aa8bcee45060e8a277379fabf5ce73a2c0a0abea8802c1bf152e31522b565b969ace4a49367048672908e55142c18b3c4ad60c7a468866ddf3316c722699a SHA512 2b2720ffcf11b02b3e12e794132f0d25e5e0afa08e4d617f9d4147d8bafbb6f00c8aa4c5776e039eba4ff5c8add0b4e73c8c928f4b155c5c386f09a4e06b765c
 DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod 858 BLAKE2B 7efdc0f9b152a5f49c07fb611f1807548f81f18f3a63b54d7f6d49a2f27c40941dc2c266e2abe0cddc60844ccb237bfbfd8afa3daa3f13c3a7ee34093e1a437d SHA512 de93e34151997c18f5d0211702ffbc19cfa1bbcd77fa6d194747e1094ffdefe7014a197f3a7c28fe99ae7677dce76e049566caeaba8a067bd4507dddeafc4f6a
 DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod 625 BLAKE2B 43378388e5a3391a431d0e842e23ef1fc74263a797bfefacebb61ad88b42f21d133d99638f06e03cadb7894d271884f06d1f3ad9743648c31b7d22bf7e19283d SHA512 0e2dc636df1de8119b3b4153466d8f31b4e2e9fa637c625ea0a7fd94951ee38edc02064cc00d7fe9a4d9f7e3d1ed521809003602398d68508772b11939755cdf
+DIST cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.17.0.mod 439 BLAKE2B 5c7b8f7539c706f353b4947fa93f692feaedcf222bc5cc9750268c73717d9ce5eff44b64fbf8ba69cc69b8c64246740c73a43335502db97557f634ac7af2be2d SHA512 8d14e2384ca63341cbbd64191050694f315cc08b6aecf3c0f1148bf4b112042dd863b75f382eee528daf30b90b2178e77b25dbd41d34d9dfd9c16536a7ed17b7
+DIST cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.18.0.mod 439 BLAKE2B 48fb9cc5cacc954cddf86019b95c2bb2b161c7d16b16f4c5d9a29a5ff1556f23bbfd461a0af9ac2f79a38bd1f86e06ff509e6ff66ead65ae938933328398f5d3 SHA512 b181fd4f1f5dca41dfb973d961b79e1a11eef55a272ffd725e059abab759f11450a4513df7c7604c1eb139d9418dc15cc4665c6e0a67e425dde70aeea8b4498f
+DIST cloud.google.com%2Fgo%2Fspanner%2F@v%2Fv1.20.0.mod 439 BLAKE2B 85e9f35e8c58aad54f7991ca1f4543c0a6b1d7dcfae12c8ab1e122f14b14611b9e288d495e208a382e425ebb09e5216fb3d06caab4a8b420d682f1dd4fbce1b2 SHA512 4638f9d4893b27b0214e974f87a60050d992cdef5b324bccbfcc52a8699ff145c6d520728b138b128b6d2e66bd27813d161a7e2f4367355ab8cfd1ae65d1e1f4
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod 622 BLAKE2B eda541042b6fe3c3f77512f322d535505b5545eb72dec0f4f3440af05e037bda987f1f97faf7a94ec946201e8ca26a2220bc570d7a9c40a08cfadd724fc2973e SHA512 2825d124965f45e40b36bc1d2f8133f8a1fb5ff94dd95d2ae4383bc4a300ddfe0efb75ace2f9408582525c377769bd1f75cd3c0c655c74aa75708f7a66c56352
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead SHA512 33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38
+DIST code.gitea.io%2Fsdk%2Fgitea%2F@v%2Fv0.11.3.mod 129 BLAKE2B 1fd98e0758f2744fb2c4de1879eea99e2a0ab69f8405fb9a6d51e795fad15d3a3d75e0c67c221732365c4b93c278545d44f2a6a8c3d5f3531eef1c084e104852 SHA512 76cc0a38e1636d2bd04cb3eae31085ae40d2e03119592d89157a9760111d01fafd9f59d8372cf7517de957c7d91bd23b921c8b37605d9f252528d82a6d0e83ca
+DIST contrib.go.opencensus.io%2Fexporter%2Faws%2F@v%2Fv0.0.0-20181029163544-2befc13012d0.mod 120 BLAKE2B 326a975321b8f3912d8c91f69fd27e3e59b8e0921c4cd41fabe2ae77a2d5ce183e4ab7ae5acc98e72626ce30a1d4c16a3cf808618b8beec553b217aa5f73935a SHA512 e47a5e15b0e0b884fb8a9b27778f557cb170c974200848447a59c43953c3d0c3fc6895ad962e47cc6839a1a8efb1680fc1ae229abb9324227ccac9ed5954e2bc
 DIST contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.4.12.mod 385 BLAKE2B 0f2f1cf4e6f3c7c077581eda5d58abe44a40922f77d77f7b679c7f75a060c6341b59f32d96205dbf162ac7c915a6cd0ee8fa1c38e96c5d5fa8f877a46e50d87a SHA512 39d2d0883241829c4923434d321c6d675b3d4324a8062bd70006fb88ba700fe46b0164a55f0c6bba7cf9dd667a460dc1be0b58636481f521b3ec220365028667
 DIST contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.4.12.zip 47516 BLAKE2B d805a71f1ca0311f3bbe3d04c91fb7665b8e2d4baea41ae68d93d4d2b8d480cd291d3e282272f40f540abcfb65800f8b3c4b48200746d72fde70230216b727c0 SHA512 378b521e44fa569606b46eb952afcc01a708f8bdb01d9bb49668f22914d8426cf64db0fbe04b5e5ee782cc7c8d39af9fc84c874dc1f7d6f844b9c55f18a70414
+DIST contrib.go.opencensus.io%2Fexporter%2Focagent%2F@v%2Fv0.5.0.mod 385 BLAKE2B 9ca5a2f59466ce7e941aa1122ebacc246a98f50db7fa8c406ab4a9308bf277a5ff6bcbd2842d48f718960b31c45e883b5fb43715b44aa2465d37461f61773662 SHA512 07802584c237452afeb6210ba1a7ca189b7bc550b7554490a89e5edc18cd3dc575ab3be6063fa981214d6824dc8327435b34b0c09188db8a563b9bae42fea1ba
 DIST contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.12.1.mod 608 BLAKE2B aa76097167ec8e4f5c737e48499fbbdf6d69cd880cdc9fb4fae17d3944c07c754457fdbfd91435d673f2a27c8fd022947dd04f30c9f4f1426c64b057b2e55193 SHA512 79bbca334f01782edaec3ca700d70c7da4c50f388c1678e7e3696114cf93c08ce334a47cfdddf31c2cdd2259267c6f2059465e5be5c77f0b61f6fd18711ab8f0
+DIST contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.13.5.mod 859 BLAKE2B 297264f16528aa74b33fd8f1b4c24e395b87e8abdb1142e7e256e9116f3ff824e841810085b004ce3893c8e62968ace31d85ba7dbb46d7739ce82cc6689b49f3 SHA512 7e3b26bc7d1969bbc0e9f81420b8326854dfe9ce70c1c197257321d389399c58de2effc3e06894b584f5bff64eb8230e6357a8263e4e02dba3e75bcb27889c8e
+DIST contrib.go.opencensus.io%2Fexporter%2Fstackdriver%2F@v%2Fv0.13.7.mod 855 BLAKE2B 54d925dac1111121d95f1fb005b07e5afe6d46cffa440a7c8cff01629a40ab1f145a7fe391e77434ce78faebb15085863357d291524d2959c09cf71cc603c254 SHA512 9bd134a698f47b516e672d324d6fb8efd39bebf69835b126ed317c2ed3ba0366ce4bfb7fcb163400c07f11a2d68e30945bdc24255e61a8812aa5e020cadda6f5
+DIST contrib.go.opencensus.io%2Fintegrations%2Focsql%2F@v%2Fv0.1.4.mod 51 BLAKE2B ad5183c28197a963db05cf512f677e170d45629ee83351071da4fda3085c20efd3f3722896bae3f9a9ea802f38a2faa6c837ea98863e0ae9934a3bf93bf39b15 SHA512 3b21ef555adc99c8acd8a037ac9205a0ca2a629b43095c1a7f850d22695c1c9f4149f10256cfd0d0420d9dbf1345df8cdfb81c5a0162f06dbfc989d969694c2e
 DIST contrib.go.opencensus.io%2Fresource%2F@v%2Fv0.1.1.mod 41 BLAKE2B 639bac549658805f4d1a72df67aa74331c31c3baea598a2b27970d3561c7a7b905bcc0492ad52dbc94c34792569b3df637234f446f3ca4e487051115d7737a83 SHA512 58d1897cf3f5b661e344d5bf91b93e91d5cd8e741ea5f213687cd5ced518d102a9a92f0c6354fbca2bf88d4c6057f78d56900e75591490f0a22ea87ad536b21a
 DIST dmitri.shuralyov.com%2Fapp%2Fchanges%2F@v%2Fv0.0.0-20180602232624-0a106ad413e3.mod 40 BLAKE2B a701681a24f3354c06bffbbff75ce9ee56a1512189b5f3791cdfde30efedea11121f097b6d06f7dff40f9f651b0eab82e79bc33d0ac003bbeb123568d23124df SHA512 26c349638b8c031e65fde1387c9fad8fd99f09e2e165d943ee5ed2d1858db713936f07f640e9b2bb4e156c794cdf18f7076a559c4df7ecf39deb959232ca7940
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
@@ -59,8 +82,15 @@ DIST github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190306092124-e2d15f34
 DIST github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190306092124-e2d15f34fcf9.zip 10587 BLAKE2B b57eeddfb3f83a2dafb244f84b5fa69c8afa1b06facbe6f73847c10c505521c97d4d38614c66971355f46007ebea9cfe453994ec8142d519e47cb092f118a6e0 SHA512 f1a5f2083c6fb716b41aac17994043e8e9040fe804e83a57cfc91c45537c53da0799e074eab1a0e0eab47b64588b64419ad7c23597bea364b24ea15fe360a4a7
 DIST github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190825152654-46b345b51c96.mod 39 BLAKE2B 013c2db2238182e2b9b4b5aaf9dc8a744ba371ba0c6e8a6c45a0f78d6704a1514fea45f6b6c585975dcaf094f709be2e6c80964cc053d32bec015ad8342c1fe2 SHA512 f50e5abcaac0ba2453bb7e8f674ef126673e5235069d4755dc38922427952dd3cb56748db564ff1d18f733e183480ff139e4a7029416ddd362eb61b560cf4d9a
 DIST github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190825152654-46b345b51c96.zip 10890 BLAKE2B 714e266a17616031876392480d8b9ef543b80d4222be5f4e56e9dac58426d680d5f12013b2451b04e74a9db7882eb7919a01f83e8b19b92ecfaaf1e0cae30414 SHA512 6508ec4841085a1e4a6e3a651d5c3387d7659e56137c0520838e9d000a7450738308d5068ad7303d405dbde7152185178eadb6ba568554e42e0ed477674fd3de
+DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv2%2F@v%2Fv2.1.0.mod 646 BLAKE2B 599b6a1303ca22bd96bf5f7c3e64377ced370cca0422dbb38e49f80acfda9fb277125ba667055fca2e726451b68e876770357ec7b942f439b88e3c14cc6bdea4 SHA512 82a460ebced1232853e30fb0e0d0cd05efc84b0b5633f972bfe7965eac4021675bd54d29e4c9f1cacd324dd4d7342d8bec357bc4a30e2b09d0aa01e4bd127b28
+DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.1.mod 114 BLAKE2B 076d15a6625743dbc5baa1feb35668127bd5f390b60c80f044162dc587771709b6c41f91bb862110a120a90d5279944257b673fb39030e629992c80a822e565c SHA512 f3656f04c653b5651210e048b1663ed87b8899e4af6d2ccd0d3ed4ad97abe511d61e8b1f9a68582ffd49eb6b6e81c31ce955ffe79ab398836cb6fd5e37147a0e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv29.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv30.1.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv32.4.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv32.4.0+incompatible.zip 27726405 BLAKE2B 100ff64cdefb4946564f4fdb90c4fca16b955a1d3f7e049f689f6a704d377376f5ff8eba2d3145f12750956a4d795fa3d94a6181a3b4b8c13593d01b4ad252b1 SHA512 e45c03feb6411f889bbb23d508dc973622d5ec66ec7cedda56b1e1e7a34098e1da160e7bfb839a55be194a4b17954a2e7d176a438ebfb806595dcbf910f012d4
+DIST github.com%2F!azure%2Fazure-service-bus-go%2F@v%2Fv0.9.1.mod 900 BLAKE2B dd08751d31c0d5262186a97504c8f7b28f612ba33b9160a1b29a5c0f76a0b17e16b5d11e1b5ebd1f93a09a8c07face8969d84784e5e7a52386ed52b314fb3558 SHA512 f02506139f416d1d4c1f14f7c441d3540dc458c5a2f73e6d7321c266d26021ee315e947675786ed87d932ab4c052a82b048baa6a04f69f8093446028b2522aa3
+DIST github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.8.0.mod 197 BLAKE2B 292675e0016ac7235c23e13b7f5bb9ee8a3af41adcdb31af53c8b733962ee909064f6426ba721a42ded4b51965d5a3a526c0fa1789785c19e20eeb3cbd0206cf SHA512 20d76c44feef7ec31f420ee199da84f4c22f6376dd0099cae7bfa542f9836ccc32b63d6dac44bf58066049860cb9b33ce13e6c116763df09d466a52a767e8167
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.0.0+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.1.0.mod 341 BLAKE2B f2af2eee91df96ea7cd66b57eb37bae20ff8f2e9b9d7cbf5e22a61cfeb2d5547d7e53dbbc524da6f93e2ac549de01ea1973a8a845d55ec570dfaae2d8947af8c SHA512 aa01e43906f1fb64616bd5cc8755e5360c4450b67e137aac310220f8a5d881262f6a3d304088bdb307a483d368b9059b37013cb55bf1e14aa648dc00f0652af8
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.5.0.mod 341 BLAKE2B 9212897fd754574c6a6db9511dfe56a9693a02bd3faf0fdb1da0066d8cde590e30c5c237b2d252b91a6c5fb4332f8082a7dd478386284d77772a26dfa3bc77c0 SHA512 646a4f1258d2a30aea7dc2862dcd490e3b0f4ca310edc6cdb806f31ec133f0d8caa35d07807f9d4d3e55f44d74913a6bad77d69ca9bffb78912a945d094be4ab
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.5.0.zip 101531 BLAKE2B aa4f94f34f1c8d973e8cecb4c6eecb296d883d9af3d170cb8e455353492c4717c5a519b63608766738b7853546814d3a94b68f547d7973ed7f573c43b71c5d25 SHA512 7cc007d5d1b4ca47f5807e01e33084923e9c464a0e961f8f453a18dd8b8e00a6ad1061028fad6ba88723d6496fe1b155cc3369471d356db189682954289646fc
@@ -92,6 +122,7 @@ DIST github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.5.mod 31 BLAKE2B 3f699ae120e91b47
 DIST github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.5.zip 583030 BLAKE2B 06a7d0685e5e739867aba46dbe02ad93ce4943e34f729241dcd08c3ecfb94e8f98058a338f2ae2ff6536e66be585fb549c22b0202ab23e2a6aab2f5b93701504 SHA512 59b3734f44cd91169e27e9ca9b0267568dcab509c4568f0518ba65c1fc3086829e5c015eadcaa73b0121716828adfaf3dc1f53cef3ea25b2ff487b834dd37ba5
 DIST github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.mod 53 BLAKE2B ed6781e3006723a251f94bf5f96aba2964e7926617255ddedfb932ba74fd3265fe28ec906b90f7f1956509f521dc2c29701fcc7301513eb1a1764d33e50c2c8b SHA512 e46209635777bfc42c4399ff0eef13320a9b5d7a23dbe26f79da44a462b14941a949d812c586c023e3b4e617e741612ada3db8da7ae4e70ab242b8ffc123e880
 DIST github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.mod 349 BLAKE2B c25e546d66f5bb4679a66949169f3a4568602a7b6f8ac1386bfa7993704d79821c07d4f0931cc2779fb862b73465ed41d0f050f59149bc39dfa1602ea706f207 SHA512 51a8db67904d3f632dfad620e223c7b59efe42d8254bd4e0ef49ef1a40759e1dbe4558f87209059841b80e0ccda5130cabef7c869a399eff3786d4b4d8d3a747
+DIST github.com%2F!google!cloud!platform%2Fcloudsql-proxy%2F@v%2Fv0.0.0-20191009163259-e802c2cb94ae.mod 294 BLAKE2B 20956ac752467ca515120a0687536d96510b679e06ea04d946bf1a2365699ce63e3e76b924f6157714cd1b0b6119666958abde5bcb5e6b8d256e30363ff5f723 SHA512 e70098303230e59faac8940def165cdd46223ce203e9ec6db498178d391b983f01b6554668fddff92aaa9e56fbc859b4a43c8f8cc5b13215d1dfa3234fb885f1
 DIST github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod 35 BLAKE2B 68297267e33add40ca12e681b6b4461ef8a3dd23eb205a365b13b158d0e055e3650fa9539eae43bbbf4ddb559c872b95ed541a3f4330a0ad3395089c4cb9c9f8 SHA512 73bd53e14c96c10e3288cd859b5d7758e6d2897369060b1581b6a4290e233877e408c9dc6350b763c2ab678a2e8f3e8f7f3bf563928b43ad37a48187ccc0ee7b
 DIST github.com%2F!masterminds%2Fglide%2F@v%2Fv0.13.2.mod 36 BLAKE2B 90eea1d6bfb78f872b781706703178c3c010c549c94e28eac0b3ca2ca2ee4bf126bb5320fa8bc0c22aa2aeebb2361572081014253d12a0a8dcfcf28ee607a554 SHA512 37cffb84d5a0e51f4306f042f62a549cbac31f714b497a590149c78d1a16d9b9fb7c3ea9c4c89856dc38b1548fe18afbb537628f0c511faab6a4eb631bcbf43f
 DIST github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod 38 BLAKE2B 6bb3112d9b8ba6f9cf4d0c4ee376da93bf21b139563a211c51ee44a302caf9670181cd27f7e21c6fd05bf87c9273daa726c942749ffb18b623d17c7170aba6b1 SHA512 a3c38d1db1472c71e1c47b936d47ac2ecfb49519c2e78dd453d234f1a6153bf007eb96fabe0be7dcbd868160a3869e854ec6776356b9011fe7ef51a634b30aad
@@ -100,6 +131,8 @@ DIST github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.1.mod 38 BLAKE2B 6bb3112d9b
 DIST github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.1.zip 21693 BLAKE2B 1dd3bdbb029f299b18c6d710a43d58aaae40be9b231f578b6df5386325531050123c03d22b0ab5a8cce5af59cd730994a8457ac8eb1e5fefa56cbf9ce864c87d SHA512 b2d49c73d6e2f63158b3b67b57a4e433e98164e37f84ae587c305c7a9e5b56b93b29d812dec58856a0e3203a7d9ee2943190c44084a28b2cbc97a31ecee60536
 DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod 37 BLAKE2B 60b2ec6aeaaece8fbe3ca154b432f677dbb46672fdbc95b503f613190df535c7254900c9cfaa3319ab2d7562513640c7cc9fe650d75d97dc09fe84a17e359a86 SHA512 4f01cd11b3ae6f26266154ee37e7a4084e61e865fa9427187a24a02631415f2367a4afad83b4e1cf772b263aaf8f180b4b177e30ae884cdcab239919c9e08bbc
 DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.zip 20216 BLAKE2B cf3a8d5190067f8e58d632df761abcf3b122f7ff384137607a90b1afb23a42deb63a348dc1c1003d043a607adb7da997511c136d728f2c5fd553b2bced3fe62f SHA512 4c6cbe7e391a6c667c74b2cbd5f71be014d3f4cd5f384978fd4c6e2847b6e66ee6d5aa80cdeadef1e1edd6188a92d9032321a5365872ee18970175070b33c182
+DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod 37 BLAKE2B 60b2ec6aeaaece8fbe3ca154b432f677dbb46672fdbc95b503f613190df535c7254900c9cfaa3319ab2d7562513640c7cc9fe650d75d97dc09fe84a17e359a86 SHA512 4f01cd11b3ae6f26266154ee37e7a4084e61e865fa9427187a24a02631415f2367a4afad83b4e1cf772b263aaf8f180b4b177e30ae884cdcab239919c9e08bbc
+DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip 38193 BLAKE2B 13e82289c645e2a34250f8822274767c45c79bd6e54f505f20995c0c17a83b807be68b490c481fc9595637dbf2e0da4494cc230763a7138658a11aca9cc6b3f1 SHA512 4500f7ea6c626f82689009f5439d541a048918a986adb2d5e2d629fa96d2877783a33bb0c059a510788722a8ebf324c6c6a7ebc23174d1d9e7842cf5da55a96b
 DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.1.mod 49 BLAKE2B 75301dd276a9f53c22d9d15f2ec4fa32cb90eeacabd9ddcc604d7f306d7e9481f9ed3f8f8bdfa5090951623f2ad2bdc671808dd8eae512bf911be30a6b93cc99 SHA512 7b9615ed8dbc53987e0370b5ff24bf62bfbf4cd3644859b735dd267826ce75177666106d8447a113dd508542086919336c82819385c92ee520082f6f6ada7ac9
 DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.1.zip 29369 BLAKE2B 675db8802b544429f3eb3d03016b3362d17aaebea0ae931b8d610afa1c2b38baf78e591b640f1e180a96f5c32f5da50030a70847de3e6d831a06af8a4d7d95a3 SHA512 3612d456e242b053cf9af4518aa101a3f1b2d24893a2a7cceb9943ad0a1e96a139b48f22c3a8055dce13e05540f9115241ef6e2e09d78ddf37e61cacc3299844
 DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod 49 BLAKE2B 75301dd276a9f53c22d9d15f2ec4fa32cb90eeacabd9ddcc604d7f306d7e9481f9ed3f8f8bdfa5090951623f2ad2bdc671808dd8eae512bf911be30a6b93cc99 SHA512 7b9615ed8dbc53987e0370b5ff24bf62bfbf4cd3644859b735dd267826ce75177666106d8447a113dd508542086919336c82819385c92ee520082f6f6ada7ac9
@@ -108,6 +141,9 @@ DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.mod 49 BLAKE2B 75301d
 DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.zip 29693 BLAKE2B b82bf12654737a5719056c9aa16c0a2fbb510fc0680844485c79b45c1d54c2254832f41517440f4ff37f3d7bf292f594dace50038e221ef790ded3ccd18bef24 SHA512 ac438522dffc4312f7b67ae0dabd8b640584f5c934682e316b212c106cd4046486bf9a29ea4a7f00afbae98288b95633acb2cacc5034da65372fc8fb9e15a505
 DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.1.mod 49 BLAKE2B 75301dd276a9f53c22d9d15f2ec4fa32cb90eeacabd9ddcc604d7f306d7e9481f9ed3f8f8bdfa5090951623f2ad2bdc671808dd8eae512bf911be30a6b93cc99 SHA512 7b9615ed8dbc53987e0370b5ff24bf62bfbf4cd3644859b735dd267826ce75177666106d8447a113dd508542086919336c82819385c92ee520082f6f6ada7ac9
 DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.1.zip 29723 BLAKE2B ab4fd216e6da9dd165df3e989c4abe04b6d759462e6ce0999c50f9e0b79ed44d307f4661abc119a92f0f27504a8209a97daaf2a4742e7b5b5d79816f687b588f SHA512 db209ff21454a0856afef523cae1cc838e5f1c00e87fcc370459e237a133a514a6a2024d3a5eb886911d43320ce0b084334be70766a4ad4f93d2d2452c13e703
+DIST github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.15.0+incompatible.mod 36 BLAKE2B 39effbee6cce58e89a4f700e32424a1353ae2c4410579a0cdccce4e5e44cb2e8f0bf9c5419eb199628b1be549d4c3deb890a3675579997096ace6393ab5267a8 SHA512 86c3285d609dcf781e8ac5d63a6d320af0cee0465e7071caa925e5c7cb259f46451b570c1a6c122ebd6b099e2fc2a5ed4bf6da7fff906a62709982649cbb9a72
+DIST github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.mod 36 BLAKE2B 39effbee6cce58e89a4f700e32424a1353ae2c4410579a0cdccce4e5e44cb2e8f0bf9c5419eb199628b1be549d4c3deb890a3675579997096ace6393ab5267a8 SHA512 86c3285d609dcf781e8ac5d63a6d320af0cee0465e7071caa925e5c7cb259f46451b570c1a6c122ebd6b099e2fc2a5ed4bf6da7fff906a62709982649cbb9a72
+DIST github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.22.0+incompatible.zip 60916 BLAKE2B 342cdb2be3f2e185e0096e80bb1d0504441420ea3c707ac5b0baeec006b7dbf45544ddbdc880df79ea62294ec4ad16bbea90b0ba086e08911af0ff620c59bfc3 SHA512 b448168ae1cb6aa89f1512c4bc68928e84d85507fd3960c28215cae75f8ccab5424f58107f22c09a20e05c4eec557642e3cfc374cfd2cc70b3b7a138c50f6fe2
 DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.0.mod 405 BLAKE2B 8b1bba137a8b24663d45eac0ed56e83f148438910e8dfef338cad483c366624dea27eeb84bee8b699640002c7f2db21b564901a318a409809ab3fc41526a68d8 SHA512 51877bb3be8b8a388b82ed7876dd4023ebe4b5ddf59ee30c5ecea31fe0420e1f93b963d160e4b91185eb33764015a3381c4bac4dfde60548a800b5668bae4a6c
 DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.0.zip 65549 BLAKE2B adf2f127d73a027e234dfb60dd5edb84bcc08ae8f378429c192a1deaa021ad2f4b592412475324ca187e33a6500d02b3f5200c42fc9bd54cfb290c7599da5d43 SHA512 2596e3f541f941b9337289fe3a30f2e90b617bd81d7444c90c8f5fb54e18484e9c7c12e88ebdbab3d18507d3847566bffc464081bd81708771b5ec9b30bd4d29
 DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.2.mod 405 BLAKE2B 9c6d467ebf1d4627bf376f7865a64ec587bbddc41b8032daf75b67cf799cbc1c6a30d7669fad3463cf58d0ff51d3aa077a81e85ab007809ee36a82fefb1374b7 SHA512 264a23b0fae206105a5cc428d7e3c11793c4cde9c5ba9f0db326d22a903d4652a7002ba353a574a5da50b289b2d07f9d3371d82d0aa5968cf4e9ca45cb921993
@@ -137,6 +173,7 @@ DIST github.com%2Fakamai%2F!akamai!o!p!e!n-edgegrid-golang%2F@v%2Fv0.9.8.zip 203
 DIST github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod 39 BLAKE2B 040b84d78188cff54576ac29dc39bcb557c56bcbcdbf6767a3321163859ae29dddca6e8b3294490238eaca9da7281e6b48ebcc6045a38c5f31795d0a831103f1 SHA512 4d33264b51c07e85a857699f5dc7b1b8a45cf1a330d8bc333525cd22513c4aaa9ddb44530e2f3e47192b21c72ddbffe465c31672a4bb441b863d90020a631a4e
 DIST github.com%2Falangpierce%2Fgo-forceexport%2F@v%2Fv0.0.0-20160317203124-8f1d6941cd75.mod 45 BLAKE2B 451da80b89b0c53a48baa253fb4899701b97286de7c2fd501aa17d5776c5013a9e888a36075d4b1eda1c9c4bc123f64a007e7555d09b6ec3d828d9b15d3ef2a8 SHA512 3f616622bf613f062fd222135532d4ffdcf94dfa5dffa1966619f55c446aa8186ad38470b0c23a68d0cd1de7b0b3f2b4471a1cc61ba73e27311702366befdae8
 DIST github.com%2Falangpierce%2Fgo-forceexport%2F@v%2Fv0.0.0-20160317203124-8f1d6941cd75.zip 5901 BLAKE2B 0d89542d018a40bd92a755a630c6b528679b853671b018fedd5934e271528f8cba2a7c121ec8be4306732a795482c161e301fa578b2f50970c555ffb45a03eb9 SHA512 26eee92b278a89ea30eb1bd9c105dff9d96d662d7d3b4ff255caf3fce6a7ec660fb3f01e3209ccb66358d70cf7cb9354027dc85824f54a7a2b81f889028823f4
+DIST github.com%2Falcortesm%2Ftgz%2F@v%2Fv0.0.0-20161220082320-9c5fe88206d7.mod 32 BLAKE2B 9bf3bf45ceb1891fcb6ecbd977b3968e249d293377508fc645c3fac44f8ebfa0e6aac924836fadc02888ac771c7d641472c2022a31f3c3b068ba94b0dc0e27cb SHA512 678d2ba568fcff09b59e5110b204af334fa1a8357e14194b88d67bc982d4eb3d9c26000fb6f2d51e2a2ce2424681c7ff203b98a5cd3d0fdcb32145a5f05b49e6
 DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.mod 36 BLAKE2B d0745757255951a92d471fdb1eeaae2e118d367caf0fcea00a405536d7e30609f22276e7a453aac1ca38063635df798a0843f279c178d394a7cbef9c9f9b3c27 SHA512 87ff97fea3e25aa903503e56fe5afc337918f7253dd7175833adb144a7296451a7d4ebd76df504737a5b4c5237b1102920728d21a587957d5d25db5d38e1217b
 DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip 73310 BLAKE2B b0aaa346be477c14bd504f98219659c8a82ba08afdd94f1a5ffbb44cfcb6cc9b014c1ee35aec6071d4733134931e6d2a569940e9f1f06a5e69b00f56d82579e9 SHA512 adf9a3b8bda92edd028f497ca10648900a7aac4dae9372469b511afc74e79f8b990e448f375ab2a8df651a491bab5413196c06db531adc10358865f74de6f26b
 DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200305040604-4f3623dce67a.mod 674 BLAKE2B 41eb6ab1dedaf85f4eae33fd39f9bcaab0aad42ade09b145bb36f0f1e254c8e0b55584f4bfedd0c813ba7bdd0c26ba2ea09b8af9e8c7b622710550918d9c02fe SHA512 b8d1d453815756d8d12d6a5009921a7967dee726884bef700ddfe5318b16a29f834734857f223c6d6a5d8d676c65d1c8ccdfbdbda849969c0c572c63adb59fa3
@@ -147,8 +184,11 @@ DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.2.mod 687 BLAKE2B b987855d98e0
 DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.2.zip 816641 BLAKE2B 5ca6160412d4760ff0d7cbe7a5805bf2af26402dedeb3ee46cff993db6c7d88dff20d21e69f4959798515531bb7cc21ec3383963cd310efabb97a7b8bdcc79cc SHA512 431e8a1e183f2bd140fdfcca245fa4fe7c7ab096f17ae3b91f66e0198bc3d58b6242d68cc784d307333b6746d72ea58d6f46ec2611913f8babac92f83ece755e
 DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.1.mod 687 BLAKE2B 037093f3c31b25f31fdb74e339017a8d9b9d8288c45e17b0f3e2fa68dc2e202a497de538003135ccb129e5011085188ab1cfc170982bd681a318469734931b51 SHA512 3446750138a9161864d481e2ffdb0076dca59e2b0ea4dc9538d40f024b499f4a632e128be53a7da3ecbb4b3205d60ba10890376ff7212fccd8443e77f1aa41ad
 DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.1.zip 844766 BLAKE2B 502d3f48542d93e652d32cc95487df9ad03d7e0a6278b3a67ad2d7e8a0b9551241275d44c9688e96d09d5dad81d70100d8d21729f3ee996f1294dbb30d8e95c2 SHA512 ffdc4ccb5b9335406d699bad88a1a1d62b6da4d47c74c1c5a26b6247e2650819a7550bbe6e02b2b2e606d7cfe6f402c8cc8f6309816d8bca6c34921f63146b6c
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.2.mod 687 BLAKE2B 037093f3c31b25f31fdb74e339017a8d9b9d8288c45e17b0f3e2fa68dc2e202a497de538003135ccb129e5011085188ab1cfc170982bd681a318469734931b51 SHA512 3446750138a9161864d481e2ffdb0076dca59e2b0ea4dc9538d40f024b499f4a632e128be53a7da3ecbb4b3205d60ba10890376ff7212fccd8443e77f1aa41ad
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.9.2.zip 991041 BLAKE2B 74cf5ad78f78b65060fd2e4859a4b1e8b41e4a5780fc8e56f5a916fad2bfa6ef74c6426b286cc7e7de20c4fc57f0e8365b261f480c9579257a51810a4fda5a64 SHA512 f3352b2fb0ac1b7f790eadcf62630737bc253e54ef6bdd6e785feba66fa99b50b5cf37b4c99b273c4f47fb1eab4b13181f441d020b3c202726a180bd82612c84
 DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod 36 BLAKE2B 60ece6720c6735e5b01efc335fef7d7f1186087068e573d5fa073b811053ea60b761350f9c371dada8cdeb5b285911c4ff87495b800f9c19ffeb69739f4b143b SHA512 971e35af5346054a0930f5543dc936c5f32ca801433d3ca26461ae7c1583b4f814376e8880f4d5329c46c36a3bde5ee4290b825bf19fd70c6bf2fbbab03f8ff1
 DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip 4919 BLAKE2B a939fbc897831f04ef6995f3d6220d56b8b3a8e3ae4486b605b9601aeb5bf764249cdd619248ba55b650e15e208a720fe1571df99a850a0b742755ab36f86c0f SHA512 7947f0ed3b2b42b8454af3cfb0fb27ec38af8234936d7cfe29017d1168b80873dbb6ac1345719fc5c405df9c814bd732a4ecf6f985da880f4ad83cf2f25b7834
+DIST github.com%2Falecthomas%2Fkingpin%2F@v%2Fv2.2.6+incompatible.mod 37 BLAKE2B 61c62f7fd2c1558dcf6c405ee3a5e6e701d8cbd6062343ac39c6247f2c7a80913d983fa6fec80f039a077a49a4457970750d41d68f104f5bb2ad16ca37e0e593 SHA512 220bfd19201b9bcf210f4aebb287c35fc66b0240ab756ab9ca4bd76d338c68bfcaeacee7229483d18e3943a009de7c1dc69d69c7ac4473f12b61e8cf2dc40d10
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.1.17-0.20190424132513-439c674f7ae0.mod 252 BLAKE2B b5f48eb1337d61fd08a98d21e76d501d1206aaa607f1a112ca1e9240a3e87534db351cef7ed8768b48ba7ed956cb8f1d2cf393f1cbbd1df695d6bde55ec9a1dc SHA512 5d0b90c334067d9df55deb984b909ba31197e987c9d28b4fbda73995458762f319dac2bf152f4c36263721fe2bd6f5651d508bdcba61cf7f574ac332ec0dbc78
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod 252 BLAKE2B b5f48eb1337d61fd08a98d21e76d501d1206aaa607f1a112ca1e9240a3e87534db351cef7ed8768b48ba7ed956cb8f1d2cf393f1cbbd1df695d6bde55ec9a1dc SHA512 5d0b90c334067d9df55deb984b909ba31197e987c9d28b4fbda73995458762f319dac2bf152f4c36263721fe2bd6f5651d508bdcba61cf7f574ac332ec0dbc78
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod 219 BLAKE2B 188d73a4d4cf4bcb52cea7b32d8d8898086532d50e8ed0e92825e2b34ae1e035111dbc27b995b9a12d70e6be509d99bc693a0af8e3734641dc23cd1da39cf984 SHA512 165cb7ab17309c66d509af018c8a521bd90f9a58fec8fa9437e5b32aa2105ef1be19a1a0a1b13a51300e308c5e63c6cb74897ad938bd6f8b3bfb2d372347d02f
@@ -167,52 +207,84 @@ DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv1.61.112.zip 18396068 BL
 DIST github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv0.0.0-20190307165228-86c17b95fcd5.mod 43 BLAKE2B 4ad44ed79c3a1293847e7fb6ac4751a1188e294eb1eac69b6e42afd58f272bc64ecdc478ae78a4db170bfa295d5e4c7db3e0d7ac8852710cf902685d24b47895 SHA512 6db56823eb55279ac19e6127768c0763bd3c754fbf1b8e57c354a30fa4a0f13deb9ad31b5b7d109dea3ea844d69663e2be1e05788da76926f6d94a78fe8aef71
 DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod 35 BLAKE2B f41c90b71b4b9e1876a13df9703b57f52ec6d7fd4258a7c44bca15c12310b512e400b32715180bfbe4726887aa7284fa21832ca9f9eb1dd759ee7d0c627307ac SHA512 5a93ead508f4f5e229e5d0e59dc820840819d9b32158ddecf2d6dae7ee96ce92af6bd80d18a98e437cbdda5de6df6cac03f7b535017fa92ef868dcccbc6e1f27
 DIST github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod 35 BLAKE2B 42febcb2e06c46797f14a850943d1df3c0e15630f376b8f1c860cf4e26ae4e2acbb38947f1348f501665f719943510aa2c0ad091f336e635430408794e61feed SHA512 c3d0bc6de3cac8395d0a231f041437b4caf00a4678270ae447b2e76bba3a588a6913cc1df6ba438bf6dd361b48860c365e9d32af55575208bd0f4b705b0504f6
+DIST github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.0.mod 44 BLAKE2B 9ee187c88e6e4eba0b58dc16701725ff50dfc3af729ff9b58c3dcd200854af59d50689ffc51caafbe6af5685d5796331fc69dcb4a1813f6124c4e6f1a0bb5725 SHA512 e594fe55205c9dd96af55f58d011e5ef916c66eb057f7c0cb73fda0388133b6b476bce423969f85c1b95eb87ed9ed48bce7570fdbd131e0ad5e7ac6010514c58
 DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20190819145818-b43a4c3a8015.mod 31 BLAKE2B 8ba7e45848280b2365b9c8fafcffd70ac32c1c22bca0d2bccb965b98f1aba961faba0824e33941ba06e7330a7e89d6804860ce16e0c0d6dcff77ad4d9f8e68b6 SHA512 f82c53780113048de082df94ef28072fbd86dadd4531270567ee8cbf31295b2590973c83992c2271df2cc1abe0cad808e4d8c5f7857e3dfc94768db69327d2c4
 DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20190819145818-b43a4c3a8015.zip 5521853 BLAKE2B c5e12e4cea51874affa518311f7b92ad609b5fcb69fa5080c0d14738efb1ab4b75a7ea5419b91d51f8bece0990baa3c3ad8d0cd9ad29b5d88eedf8be6d6cc408 SHA512 b6bb5b340417579aff36ad9cd732ddab6fce3065605d0f4577867a2c64b3801103002175811321d10ffbf63c5ee3865ab05ef72b1cb1cd77af0a2bf8180acc64
 DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200503195918-621b933c7a7f.mod 31 BLAKE2B 8ba7e45848280b2365b9c8fafcffd70ac32c1c22bca0d2bccb965b98f1aba961faba0824e33941ba06e7330a7e89d6804860ce16e0c0d6dcff77ad4d9f8e68b6 SHA512 f82c53780113048de082df94ef28072fbd86dadd4531270567ee8cbf31295b2590973c83992c2271df2cc1abe0cad808e4d8c5f7857e3dfc94768db69327d2c4
 DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200503195918-621b933c7a7f.zip 5551669 BLAKE2B 551127506bf4b093e1f9331065d7c0fe2f80b1f0764334bef9bc77608ff67b8834ce8d4f512a281e747ddebcb0f23d5fc0a63a5b7191c5067234983c6eadc649 SHA512 b404ac23139a20bbdb68a2fa291903c581c5a678b0a2543cb75ac69f5b1ebb3f0548d80726614cd8fe8c3e9bc151c6dc94e6560677ec35a732f8e1eb229934f2
+DIST github.com%2Faokoli%2Fgoutils%2F@v%2Fv1.0.1.mod 33 BLAKE2B dbadf1cdab5b09126feb379cdcde51bb716658b130e1df5dcff57f4c5e18ba841a4a17a27a8cfa48656e25340c9e312162ad3d99dc3e00f52b4880e586317c04 SHA512 15ed869d5e1255a4074087ace7f70f2075edc683f811f47091afed4922010c618a7857196593549b5dd68fff8731a3a5e92497e98ac44a05a464ae8cb6f4acf2
+DIST github.com%2Fapache%2Fbeam%2F@v%2Fv2.28.0+incompatible.mod 30 BLAKE2B a985a1ff8575f4bb142b232f3e13634fbe3aaf2a75d4d94e30239374e5174ab8b953e19c7bdc2a93a5095967cd3230365b268b9fd45b88587e2f742a466714ef SHA512 ccb6c2b176d6ec60a964f5eb42f78b13dd277a5a230820de7d19796859dc5575ddd205fc9b9fedb32277b734f1fb5c0cfea986207e3ded304b7bae167a93e4dc
+DIST github.com%2Fapache%2Fbeam%2F@v%2Fv2.30.0+incompatible.mod 30 BLAKE2B a985a1ff8575f4bb142b232f3e13634fbe3aaf2a75d4d94e30239374e5174ab8b953e19c7bdc2a93a5095967cd3230365b268b9fd45b88587e2f742a466714ef SHA512 ccb6c2b176d6ec60a964f5eb42f78b13dd277a5a230820de7d19796859dc5575ddd205fc9b9fedb32277b734f1fb5c0cfea986207e3ded304b7bae167a93e4dc
 DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
 DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
+DIST github.com%2Fapex%2Flog%2F@v%2Fv1.1.4.mod 1021 BLAKE2B e2a0021fa4063a6f82b99413ab691f61c03d175333efc2a9c62b82c78b8cafec64d95a5d460d5471a3632ff8ecf8c2df2180de0250f553a3c28906a4b3882746 SHA512 037ea24d77438838bb1343e0128e839dd17ec1757bc80db189cdb742c00fbafe698a0164b02708b31dcdb42588ff872a71c37ea59816db767a44c7c455b7aa5a
+DIST github.com%2Fapex%2Flogs%2F@v%2Fv0.0.4.mod 155 BLAKE2B 19fc978debba380f1aa426c853b7deba0706bf668bcfe3dad4ad6dc7693afa961fc02905900dffb8f173d19b0c2baf6bd847c9412d5c0856426a5824b01e974d SHA512 92bf6185d4173c2510de3839bf1cb40a120903b630022263ee710738fafbfbb9782347b92a441e3671a069ad9d7c0e4765bb210013a6e47547fe161032280010
+DIST github.com%2Faphistic%2Fgolf%2F@v%2Fv0.0.0-20180712155816-02c07f170c5a.mod 32 BLAKE2B af57c9cd0291aa2d8b7831d94d7bb47b8e44ece55d63b5fb45f8235b91de5d7fc85178118f2d630c6cf59987d8bd9c2726372728f0efeeb1d7d25febf79c91e6 SHA512 671dfdd80d2545609d154864b85d15b25ffe4334183ef99e46020a22001d0501518902a50f71e8239eaacc2723df04166712b4ff194dea6ba25820f40fda8bbb
+DIST github.com%2Faphistic%2Fsweet%2F@v%2Fv0.2.0.mod 283 BLAKE2B 8debb42930980885b0523eb73bb93a37235e8682d75c4e1363b989a6a668f3096a146631985d047e413001dc2fe363346421d2e9b69069dec858254b7c31feac SHA512 c8e4699654b43fe58c813703548b51f140ff9cdd684ca837be627df34b4145ae86440c8c3e0ed6d699649a8de0f8ef90cd5d50cc04193e1b3ee9386046e77f25
 DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
 DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod 34 BLAKE2B 2ee2c993fac070e463df0896b1eb4c2160acf22c1f404b58a17024f8b5f2630d2cd1ad6526c611de0b651cd0c7f0f687398fabea864e7e7b0cebeeb7676579e9 SHA512 75898dfee327b793e7f253f5555409433214a7fb0336f3c33122ae5b2ef66e22ac44970202f67ed5d94f2dc02701b8a0f62cd1d80f543d93d347d83ec26da8c8
 DIST github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod 33 BLAKE2B c5557c9c02300d9fc6ecaac5694461cd440f5a1f5cf9ddcdb38e6fc51d9a55d9ca1e98bfabecb6c83fce81e87979e66e56c585760ef61fdf1866480c0e32eab3 SHA512 15b2cb1fba3e5103879548ffdad032ae30f0e723cfd26fa6bcf69afff14b18c2cf3373f511702b3690fbdb7040996c437f9cd0253bdfbf211b665ff14e97aafd
 DIST github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.zip 7602 BLAKE2B 2fc27b391e078d69ed74a5591b56a0cc68b868dddce7661671ff67625de752908701ab3cc8103a0f1764ea4197044fc338588e60f403215ed37fc4b1c4e7e971 SHA512 8dba6631336679777643a784662faf6468f6d6f5332a32a3b5b3768925c5dbe2a6865ee55999549d34748b7d7fb7fe9f13eef43884276564618f8c5ff315a1fc
 DIST github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20210328193216-ff5ff6dc229b.mod 33 BLAKE2B c5557c9c02300d9fc6ecaac5694461cd440f5a1f5cf9ddcdb38e6fc51d9a55d9ca1e98bfabecb6c83fce81e87979e66e56c585760ef61fdf1866480c0e32eab3 SHA512 15b2cb1fba3e5103879548ffdad032ae30f0e723cfd26fa6bcf69afff14b18c2cf3373f511702b3690fbdb7040996c437f9cd0253bdfbf211b665ff14e97aafd
 DIST github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20210328193216-ff5ff6dc229b.zip 6554 BLAKE2B 96d51947d1f1214a3b5a21c2f138d3b53bc00dbbc624e86680be00ae03809037fefde7f5a4692d07b013a5c59d577688b761da1e6d52c054548bebfd9d0b357f SHA512 1ced10aa88069f38e5280eb1f048f910e612618cf954f71ba587620c68bdea31018eba3ee33627fb228848c97e9d05a050283f7988d60e9395487fa4d2c4c4b8
 DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
 DIST github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod 125 BLAKE2B bee4d59ba1392d0211558f6ce3511c887a474463f784cd92069df7be6de5281079d579613f0e5988ad1f3355bc8ccbecdae7f1fd551fb122f7a0e8ef11523e1d SHA512 7e6ec3815d053e7d49d2b0a3d4fdde6c6eeac6048ad0eb681da1305f6d9d5bb6671e31834ff6e5d840d9a7944efa52707d40fa737fa9ec3d3ed9d130b589f9c6
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.27.mod 145 BLAKE2B f28dde209c4d43940897c3dc758b088b19b38db865cba75b246477b497c1303301de7cfbfbea2a7eb1b124021967e4ead6dcfa8475ad240a7381bc7ec256b565 SHA512 00cbada20d24a2d08b1f06e0da060140820972c9718e707f0cce56ad62f1ab7344a969cefece18bee79f6b92dfc390e496d6a4af7c95eea0b66d27cc0f59f3f8
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.18.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.45.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.20.6.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.23.0.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.23.0.zip 12934706 BLAKE2B a53a13e819803c53690c2a2f508f9b7ed0c6aac597b320e9c99d5d7a9c6afe18a883b7c8a2d147d3ff4b1b8464247aa1e8f11e7ed5e34475084b96bfbe342652 SHA512 d944239825d73d1c496f924a51b3c02bc1cfb65adbc447442c9065ba0947977714602257f3b606a28518f4d5f889e0cfbe2eada703c1029ccb8cf81395bdc2b7
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.23.20.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.11.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.29.mod 217 BLAKE2B 37aad2fa34cfaa65bef0b9aeaf421a69fecaea85895b1c30b24c31335ec7ce59e989478c08b1241fb5344d4c5708e1fab48e3b14c090eafc051b20df429e2969 SHA512 ec22b59d6d5febbe206b6697008cbea27b5ae35ee89799b92d7f137e205b6b4a65d2ebcc4ee00d41eca181a09ef8411513fc0ad851a6fb23db80c589a4d5c49e
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.29.zip 16296182 BLAKE2B b8543af646c194af988d8bd920d07c62d116522e187ef8dc2554e4151760178d47c2b19fc6459e4b23bd9985663b177208e00b190081112f9bf96ebdf4ad9ff0 SHA512 4c9cff01d43cd5a9e2ae65c5948a29f3e14c4ef663490c397b99d64832fd68d1ad8ea072da1aa65806ac2f207ba2b587f5c2e5ebdea3351066835dff7f46f4d1
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.0.mod 178 BLAKE2B 1aa7ac654a0577f654dd63b5950fe13b02c6b0cce274f43cef0c850b44e507fe37a78286cb3326a5eb1c6ce15e969381dee14ff2a474f7a183cc40e56d81efa3 SHA512 376db876c55dce630bbe0b3bc3898bbcca0169965e8d12a76a1018da34301e1654159957142b4e6f103c0d9e1713e9e158fcf598e5c87131a3904e4452f12a7b
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.0.zip 19798490 BLAKE2B 15703a40a370f5cf6f3a802f2f391edfe5512e2aa3043345bf5a55d1853f53f8d5132920be1e9c0d67828a0a461472734c3cd914461500da1e6523127cdf14f0 SHA512 4620bd5427dbf0deca4e0851ce036d301048d157e49f04057aca48c53cec4943e5a387a810d9e6a6b96b57e44aebb9fa93f328ea960cf4c32da036b0ee7d5e5d
 DIST github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.mod 444 BLAKE2B 330419975445f724ee7b9a3ef8395fc7a153f189012dbe70e982865f5f556c2ab0d41a3465ec5cfddad034f12f226f77fcee9e3c1024693a0f9b13ee26f18092 SHA512 bfdf66b04b9c41824815a5a2707acce5c3f74aecf15a510d45adc84b732367885a18920d3dc50d968d0bc5e8a4fe3d519f7212de80baad4656c6867357c8fca7
+DIST github.com%2Faybabtme%2Frgbterm%2F@v%2Fv0.0.0-20170906152045-cc83f3b3ce59.mod 35 BLAKE2B fcce8ec3cd6761ae9208a6138edaa637ccc04dd19aab3dfe5b3164dbb61689d8136264c02125ae754dd61be804852004ea91dc4b5ca217ddf9273a4b141ca0ab SHA512 92455aef226bdc8b6c7f82d6c627e7536c8e4da5196160e21280f32e79fdcf55e1a15699bcc5251f70004fa78c5c8bafc286bdac98eaa0e4a4fb3a1e72b0d752
 DIST github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod 45 BLAKE2B 224d034afb0473cdf6f065978a0b8cbaea268a46e3dc6b1b8ea89bed2d013ff52bd32408bb6d768097d3ddb20f95e35953b9b679439309ff832b2481d4e35401 SHA512 b398c531571bc397b2d97f369731fb7bbe8e07328f95043dec62c9be4a9f09562a0ef0faebeb05f1bafd488a77c30e6e957189d54548ddb94b9dc115b85dff53
+DIST github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.mod 45 BLAKE2B 57350526cf25f10ae2018fd72f9944dae239a72c2a44db02f0a7414d802cd03b48e58d3c63fea3cf02cffc26e6c7b334190b2f7a76b7e24ec50aaecdeba1a442 SHA512 d17d2e4a7184b75fde3ef47d7158c9913611ae55dc2e67ad2d0db87afaaf894d0eaf5f0f5b027e2d888c592735dec2d381c83c7992576eb164492e98b24b5f1d
+DIST github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.1.0.mod 45 BLAKE2B 6fd14841131ba1ec9265f7da966bdf8fc844a9104eccba0f301ec18c8935a37872501a3c10d1f2a3f0ad65f65feca94754da38b666672571d31e87f271a2664c SHA512 9eb6c7a80deb235d06d0a614de89d4dbfae015315bd6fa52fc6be8a630c57626199629e81c960351cd67735f21aa5fc3fc69f5a93625eb3e3b6baa2b2bc3b7d1
+DIST github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.1.0.zip 7287 BLAKE2B 71250b2e75be0072794cc7fa1b8a035921f143bed91884a36ac0edcc9837542786d2f7bdf0a1a6da03e9b88aa17077108404a8ae52a5e621ca3cb52545153262 SHA512 c9a661e3f3cdb532f919e0a484586c09691108ac4bd3ef1fb3df38a1bbca78364d1550fb75f85d28a2f3923600dc73151e1b49c3c502b4abeab09454ec29ff76
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf
 DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
+DIST github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod 568 BLAKE2B a2769032d81e02d8f4945648d36e862a996841d0e138077fd190b47b700fa08cd4e8e8d300925fcae5ebe48ea972afed0dcde81870f3673a3227ba90beb5e341 SHA512 262ec838f5c4b97bc186533c20456e62633038ae74747c7b884788bd06ce01863a59237557877d35f37338ebc018d2c1c8ae963e4a42dd42e0823a5b3ec81bb3
+DIST github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.mod 32 BLAKE2B 8ee548cb83775c93076fbc084a29ca01d08006ff664daf6b27bfbc5afacdcf5f9629f01d6d7e7b55a8040c1b9d571e0588f69aae6a716c4d8a89fae1437fb91d SHA512 d010a67773f9276989547ca4231752d7875e8d55ee833e980c577c606a983bfaaf957ebfbe01039de24670bd9e6e120de33f21bd0d4dd187d6f6faf61e83d8c4
+DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod 30 BLAKE2B bf7d457fdd333781e403b93aac891f5a0a8e202c62983ec6e34ab559ea5624c3e6cc525416fe400c7a0af20a3f647b49eac5717aa749d9ff79b02fe994c36d42 SHA512 7a1ef7d0fc6d5a3a8530b44dd5aa23d4248d952fd573b9f0f6f630b1bc38fa5c9c65ecc4894734c7115a8a0c7c71e8d0e2da0773ed4c5779c23f7f294e1e7d5f
 DIST github.com%2Fbombsimon%2Fwsl%2Fv2%2F@v%2Fv2.0.0.mod 339 BLAKE2B c3d4dca2fe6d21c32f0266aeccf5dd64efd07f0c5539389571ebc46330a858da87f7adc8381ce43f76dfdd3f844b7ed80cfb5e9fdfdcda52c24974f103aaed02 SHA512 ce2b34b8d77541c7e222a43ecaa3b2b3a434ab7f6d2fd27efb1e56b3be5e693ed4251f22eef4bd53a7abd1d992c3368dab3d08cb50265c164d68a9ccaae90493
 DIST github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.0.mod 36 BLAKE2B 357371a37d5f2ee657900c4ca455d9aa8aa993989fc6829e182a2c72586f18447600442e31110c5a01f6fbb8de8a17f881d86ee6b882b4b27db1bc566ca33fb4 SHA512 1487d5ffde5f6d64bc21be1aa02926261a519fad462731254f03cf124758162cb6f6848fe412cd5b02606674f566ed213ae4fb7b5e54afe29df5ea60e08d3c03
+DIST github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.1.mod 36 BLAKE2B 357371a37d5f2ee657900c4ca455d9aa8aa993989fc6829e182a2c72586f18447600442e31110c5a01f6fbb8de8a17f881d86ee6b882b4b27db1bc566ca33fb4 SHA512 1487d5ffde5f6d64bc21be1aa02926261a519fad462731254f03cf124758162cb6f6848fe412cd5b02606674f566ed213ae4fb7b5e54afe29df5ea60e08d3c03
 DIST github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.mod 36 BLAKE2B e415584f1b251058c7ad9fda35a53a9c7f94434150330fdce3e1ef768c0b46aaec572e027040773f022b5e3657c4950442c1bc17c2c9b7f5106ba26c4aab733b SHA512 f271a93a69cd074418eec8b114375ca0a196d7cb4b69856658946fa7f2d8fc40381b575f0f624e9fb7d90d180da09477083905c70f01ae875c1f1d97084bc58c
 DIST github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20181115193947-bf1c66bbce23.mod 35 BLAKE2B 87fd74b3a198f0c8a9897797611b73c9017378af758bc559464b3e91a6f57ecc39752ad6ea9d73ec0df128a794a3caa6384cf1092808275fe6a55731b6f0bf8b SHA512 082d6dfd13dc8bbe32bb5fc0c8c7e0e2d8fe412397df32f87639179374e57eed96f7eea00a3cda8c0c9a78b354f9275c0be3fcea4b6c797aa627dec71870a41a
+DIST github.com%2Fcaarlos0%2Fctrlc%2F@v%2Fv1.0.0.mod 33 BLAKE2B c72a1259c280c7788cbbd283fcaf293adec903a737594ccb22f5b8423e379eff65a919d9ada7b8810e3a24659fd9cdabd3aee2517b18e6f40ae483b9a7123b8d SHA512 c99b15c1a5152485a429b63ccdd83947120ebdb155ed208159613af4784cb6f76db465ff74a2944e5172ab5a43fcc265404115229df5e70ac51c175f9e8ebb83
 DIST github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.10.12.mod 188 BLAKE2B 42c2a9f176078c0bab6328d932452e1e5759ff5afd7e677fe856822c8ac2fcd00585e5396b6a3fa1e7c3a9de9c8ba04b48022b3fa5c3f5d60b5b5d3de31ebd09 SHA512 c085274ee66cb69cc5dced44e4c88a157d34166459d85bdeeae7c14aa0b965a6d78b50ab634aa9482b963d34deffef46ac3c714ca72030d1730d0f6c6390419e
 DIST github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.10.12.zip 125509 BLAKE2B 4b87f402a83c4115f7b677ca0f6e7133080e55893feaaf7753d0b9a5f2ef46bd2a80049cfdb323988d40d8c8c4f5c5caf38db31240d6cb9a8524b96765909904 SHA512 827d5c4c8c7cb37b9054cf4327c05bd73785b07cc08ae2fc7ea8dfa6063069e1eddd36a3d71df0c8d368761c28b42ec1958797906f145570f115bbbcfbd49255
 DIST github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.12.1-0.20201215190346-201f83a06067.mod 272 BLAKE2B 9f8c531b8295fd85925b5bb45b9be0a30fcb329ec0062867d4e9c0b5a8c22973e30a2f090bbd1329252f2ac3e90739cf5c6079d0f6cf5eebb78b200c86832936 SHA512 aceac486e795d9ca300ac2baca3ed5c14ba7ec5c3a77f2b3361cd1b9b21d0ab68df1f13ec4e2e6b408563291a2b00de62eaedae0a33c1eab5afdce419b9ff4d9
 DIST github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.12.1-0.20201215190346-201f83a06067.zip 127776 BLAKE2B 66af16d56fef206b50855ba5fb71b48436db7c9653437dc268f0d48a38a05ba8c5ccaf1ff68ca64b90dd36243ab4da394d219cae947e56a56cda276db3db8855 SHA512 4e01d3de1095ed35f61ae14faa7659182fefd6624a8038b059bbd7a304e4f08d646c8dfdf3661efeba1afbf402c0f2f062b93dcc18922901b9fb0dc15b566b16
 DIST github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.14.0.mod 328 BLAKE2B 814719ea7d4d6d0b51e00b300ac8a6d760fce9d1f3d344cc341122c1481bd21227016d18a7167cc009fd66e137a3f185dfc93b91e597ef5f394cd058b383ee5a SHA512 5b3340ad12e768d5f6356c6f538778e4e65317d55ff4bb82ab7b74cb317860d67125763530a6f53a8f7a5fa0b3da338fdfd1d3bf3cf6932e0443837b38c64be2
 DIST github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.14.0.zip 130443 BLAKE2B 01988e91feb3c3691060358a49d60f4e992b2297a9dfc4b5b7c00d8f59015177b6ab8d05fe887e06d7b327611c97f693b6684c002d434b09a5fc3c9bd7ffdfd9 SHA512 761483e521d7822295b7ecaec0792fa4935e6bfc92055ec5b145f000c32af5f43524c6659eac955d9fff2c5c31e413d0f28004160323b64ac787f0fdadda274e
+DIST github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.14.5.mod 328 BLAKE2B f566b352b2d816bf1a6fc6b579d1d95d96ecb9bf0738d5114898270ab8def846d07982a74d94f0a4c98cc5c4ae87e9e05524cedea8e296da9fffad93ac3c8e64 SHA512 9b230e300f4e79550944dd4cbe84d36e530218e330722b9250826abf36afc1d245cfc4e7808867536ab65d9a0ba55afa1e6b4dd3fc63aa8dbc1659e0bf04cb98
+DIST github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.14.5.zip 131929 BLAKE2B 573fa3706445cde887b1b7641384d9f20cb7140ca2b4762bb7d633f935ee6a5c5ca0f7a79ea79a756a7ae1f41ac84ebeda7f5158af342756a9fc1c498cb8d7e2 SHA512 4812a3e971c4b33de2536fb0f8f39a61f08b5c70eb18ace694c49aca3171a1ae4116056f7b4ab0f172fe639abd4fdf67e33cbffb748e1a30de612c549509be99
+DIST github.com%2Fcampoy%2Funique%2F@v%2Fv0.0.0-20180121183637-88950e537e7e.mod 32 BLAKE2B cb3a5e25e908f7ff022ef395a0586e93669913b2d5dbc33670a0a0de6007f033a836dfea0c442fef3fe51f1312c2395f02c99c4753ce3d4fe1005c18d6c0c4a5 SHA512 802c2093914f57328a419d57e080a7d6ec05840ec2fdad3e18efc0f3f9be225aa85bb6a47a06162f0639e11f81981c3570f03da9fd4db34d4f785fd833edbaea
 DIST github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.mod 122 BLAKE2B 47d561554f8fc26402a1aff96895741d9d50e201237346d2d147eff3e5977f356a3dbadee8c8b3c492bba7f6be33d48ad89dbd8a02e710dd96a4b29b1f3c1fd6 SHA512 1f9d455792a66a48351a4ca57810d37306ff60474da6e8e308f983fcaca4326f6f64bab9c677900e014271b52333d1588e287493c2fa853bc7fa40717556a670
+DIST github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.mod 40 BLAKE2B 4be6f8f0b0413010647c1f9fc44fffc44e94cdf323e9ed4fac2673bb6605b9a222f2452814da60ab4daf7720bc8b80da10b4fa3dcaee87e5f37a819086bfaf23 SHA512 53d46b3d05d85645a48552573e7fb9437d9d63336a0cecbec2fa1afc9dc5516a64f8006ae433067459154f80e92492f967a73190cb3397d40c6e0230572304e5
 DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab
 DIST github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.0.0.mod 47 BLAKE2B f238800b26c16806af21a26f7bc037b5b81768b47e48fb469740e3a8ef4febfa6514bcd86c596b8c9f4159dbc7d741cd17939f510394c1654656c27350952ff0 SHA512 c398310bf078b9e1c748d96334b1c10188057c8078ad7e7b58d0d0ac286221b7f95ae0ce6a69f6a4a4b8b50d89f2bddd9e03adfa447e37cfc250f395644c1764
 DIST github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.0.0.zip 15167 BLAKE2B eb7731c90c7b266ab6fc4d7e64d52784d358a030e1f4075afd44a2b4a18a0635d89489fe556c7bfa6b3d24a03cff7f45c357744a027b0df64d1d44c0c299663f SHA512 d2438de57fa3b290212432a0879dce16034ddf02dce4c8e7e34341dc90c4a0e6e3f4c8ff4917ad73fcff0b2cb50aabc6c081e140f1a242e96b241853f76810ad
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip 210929 BLAKE2B 7b1c57ae92e16ffa7370b069f7037dca01e73cbe8cc5723c092139779bdbae2c5a4483d623ec2b62322818bf324f2ef41e27b03a9b9ed82bafc5a1cdcc6f18b0 SHA512 4dbdefde602fa13bb1f0ab9dc6e947dc158defd284753b51bbddf9e52410dac5429e145637f155bb8703cfe8723fd2f5e4ec7898552d4a2956c8dfa01d4946cb
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.3.0.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20191021191039-0944d244cd40.mod 45 BLAKE2B c21093aebb1ef513bf84d13f3cc94ca5ed3dedfcb396d07a0e146031984a72d1ff488473cc8868303906fb397842b105bd81c8f725120eb80c17d59762ddeba3 SHA512 c1ab1e40d352c16aff7a2b91123ecab7500817522ca8cad2e5ed3c45d6dde6e63cf153f124ad3317c0ff4f6b74491d952e01fc3b329d0827b472878a6f001c10
+DIST github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20200922220541-2c3bb06c6054.mod 45 BLAKE2B c21093aebb1ef513bf84d13f3cc94ca5ed3dedfcb396d07a0e146031984a72d1ff488473cc8868303906fb397842b105bd81c8f725120eb80c17d59762ddeba3 SHA512 c1ab1e40d352c16aff7a2b91123ecab7500817522ca8cad2e5ed3c45d6dde6e63cf153f124ad3317c0ff4f6b74491d952e01fc3b329d0827b472878a6f001c10
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
@@ -230,8 +302,12 @@ DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255
 DIST github.com%2Fcloudflare%2Fcloudflare-go%2F@v%2Fv0.10.2.mod 408 BLAKE2B 8c4d31b483fedfaf21fe1f10730416f94739ff5aceb3133d39c9bcfc057d4f8d300b25714f81f9b06cfaf860caab45adc8ca5d2a97aa23b5e904dfb7948e3041 SHA512 0ee3b4c95d76249bcb53fd29a22f7185c1f4af4f9201ef53935b7db77f713a1e1e8c4c5b3170aefb821fe00ac65e58fe0436e0a6eed026aec94f61b5110bc801
 DIST github.com%2Fcloudflare%2Fcloudflare-go%2F@v%2Fv0.10.2.zip 155576 BLAKE2B 769d17e59fe56acc483a007219558f6332a82bf394afc77337fb9817a7f71037e02706b2030f8cfa65f525f5475fb158282bef47a429bfa6921048c8acfbc055 SHA512 55b52174748cf6d5e15057fa43b6b2e6c2069f2c8282172ce7fd340d0e72fb79234f811b504a5899c032116e5968a7a1e640bf3f0fc36d889bd13e905d88c492
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
+DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod 170 BLAKE2B c8f3e464fd2cb8f38cf999a300b44307a1e3d40101460176aaac8467ec7d371f08c69ebbcae7ad8086a48a02a0dd7fc4b1cda1bbd7b5199c4b76f1ff0492d7b3 SHA512 4cb0a4f9d5f74f3115a10661469cafa88044a8ed2de959b26054441714080fe8d639485b69df02e0f91fa9040db259fbef8281971c28a67953a5abe5b7220ccf
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod 170 BLAKE2B c8f3e464fd2cb8f38cf999a300b44307a1e3d40101460176aaac8467ec7d371f08c69ebbcae7ad8086a48a02a0dd7fc4b1cda1bbd7b5199c4b76f1ff0492d7b3 SHA512 4cb0a4f9d5f74f3115a10661469cafa88044a8ed2de959b26054441714080fe8d639485b69df02e0f91fa9040db259fbef8281971c28a67953a5abe5b7220ccf
 DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod 41 BLAKE2B fce07437afe34fbb38dc2b3c8695440413610213aa82b910471dfdd37a5dfabd332513dff18fbef7b84469c0c137530e821e2a5adf0e660a96bb78446a084cc6 SHA512 180a8be6b0f3596aa376ec5f264ee545a082328067b3ffa5523634cc95b106328fbc6330fffcada0a1cf250c3a988971073441184b9194fe0d05fd62a33901fa
+DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20200714090401-bf6692d28da5.mod 473 BLAKE2B a92fb866f551f78d532cdf06f354e02d27f64b0b6cf63529f2b272f94a88cdda0d67d10f20adfbc9cc64035437b78bd6935612889a7fefe3f6ab8736bb9ceb9a SHA512 76b1f03cf391c4a365282cc3caf4e1701c195cd0c0fff1e580333a722403868902dc28355f013cfe0e069a4013e2f54f28b10747e2cc1df00c64b84fffc947fd
+DIST github.com%2Fcockroachdb%2Ferrors%2F@v%2Fv1.2.4.mod 37 BLAKE2B 1cfd7c10c31fcc2d78708be02ddb7fe18098782df3764f4394b2bbbed579fbd4e7692d2f75e1481a994c35e5f2355549eac6de2319ca1d07ea2bda3939cf5013 SHA512 1b62593fcfd90463192016f145a970fcb4c458b8482e60b10505a53e49f0df7ab3cb9bf5acef1d79cc278a2fd742d08df4cd0969e0b0ac04eda6fe35c5cb5bcf
+DIST github.com%2Fcockroachdb%2Flogtags%2F@v%2Fv0.0.0-20190617123548-eb05cc24525f.mod 38 BLAKE2B 2b11ff7691f470b19935549dd6f4c0f112c2efcabf9d32a1b1e8130685b328f14c54907a51188deb8521cd6179a2d92a2c0f63d9a8dedb63a5bbbaa50f077232 SHA512 38726c73deabf25e639f9887a0f3787e43109d9c788427664d138ced64d883133c68cc75a2373483c3f54abd13daef92e0ca8d243f545058f0c0c59f995a6763
 DIST github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod 40 BLAKE2B 58aa150182b5b43107154bd337eb024049bc2c7e2d26cf4344c97d554e03d4175862ecbd1b65527aecc85b9824c474c3e5a49eacaad18e253cec50785963b18c SHA512 8a0be9bb45924e5d384fa68dc2e990a4705b46e8878558d4db10fb794c8e20b13ec54831e7387cf425613f3f33b5952702deed074bee5818fed3fb9cff7b4259
 DIST github.com%2Fcodegangsta%2Fcli%2F@v%2Fv1.20.0.mod 34 BLAKE2B 7a0262643eb160a5f679f4599cf391a7c76ec183874b69c64483d3255a0baf8a68578d1a1d160b5b947c28b124785a2209e9f1b25dbb8cea15cd58e0df481560 SHA512 ee383b82e3fcc05ecc8b39399b1dacbacf3ea7e89e00569c682d565da000a46e79d8cb330d1eb7e483508c0d0f152033df9d21f6f71f5fb6fc3834d50655111e
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
@@ -245,6 +321,8 @@ DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod 91 BLAKE2B fad30507d91fca15291c8f13100206c9d9eae4f73ca4034e37de10d1494b42b03535540ce704582cd7a4be4ffa2685f778ac9cd3aa647d6c48d8e6fe33a345cb SHA512 54e3700ced7222d086eac5a73a5973147473e9d063a7a8dd719bff2dbe3d61d9e4cd7427f30c926a2289ef53948f158bc09e189d9714f0437d446f7c30d0cc6e
+DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.mod 91 BLAKE2B 75d03e4a6fc970743c11a4a9d52dedc93f72b3dd3052c72cdd660af9df42b014f48ecd65961248e3b20f3e258d1ea36e058879a7039ea58441902ec5f339e382 SHA512 722430decd4f1022e8b035bcc7c1ed295db21a3c64f9dbdf409bd0442356664d378d4af37b7de828c02453014a5a9ddefb3397cbbbc8481c14179ecba9499a5a
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcorpix%2Fuarand%2F@v%2Fv0.1.1.mod 431 BLAKE2B f58dc1f8ced55fc31d771894000b6b8f7704b78a73a256c0a44ca6e81f82972cd8030f072319b9e6b8ed85853821a6cb82e0183cd9af9e7cd22263b1d66fe91c SHA512 5317b51f8fc23e83f415e5fc39a4202e6d2550ebe22c20140551265f8d3a538b2d4ff38cec62f81d2dda00415a4690d157fafcafc81ff1c00aa7db1622a19c1e
@@ -257,13 +335,17 @@ DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip 12266 BLAKE2B 93705895ca63c348ac5397fe8531214f5745a3be6f5760f9d3fbf67fd85b917dab4a2077376251a005bcf07450df1fe0b0114feacc5f92c6facbb2da637beacd SHA512 284116b4f2778ee7981e3aa5583c4e685afd8434e36ca647f0c72c5bb308e87bc3bfae8c83acd259c9da75549339aa382663b7103e4033b2418e314106923c0f
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
 DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
 DIST github.com%2Fdaaku%2Fgo.zipexe%2F@v%2Fv1.0.0.mod 43 BLAKE2B b7f6d4dca865e691a66b70dde813bf817f089aeaffc8c49d2d61f6efdc1271ecf380740213d28b12585ca60e0a00d8707ba0880710a1b82e578bad08f4a9d979 SHA512 55103bdbd54979e045985ac6176821e9eb480611acc20f430311cc02944dc8a303468536651a54cbe653117890a3e4c6ad48b02e638abe96cc8df7b4df7fcdd9
 DIST github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.mod 39 BLAKE2B 066fe4ec077d7fc003ec3450de6899062f4e0500efa3b410cf2afd8315c2f7166e4a21605d5970d3be17692b8b4d2fd0e4b48b32a01a09a310799c3faa1c31b3 SHA512 ce1047915fc0d4f3dc7148b20b90edbd878c7f0016823997aa5dc030d000f59658ddffcd911fc98a387387ac2175ddad9ceb9c8af18e0595549ea2c3859df6a9
 DIST github.com%2Fdanwakefield%2Ffnmatch%2F@v%2Fv0.0.0-20160403171240-cbb64ac3d964.zip 6032 BLAKE2B 0265eaf68c186fc505148e41ca53a84aa096eae82243502ccb3b3703bd248c3b42ff0cd87015d11e427dccc9564c69d58676df34c353d7fac22ab2260061b137 SHA512 04bbd7a8cef79a432684a2c84f4180401893fda4f43f18e7e78d9dff6380b645aa86a41c54526f8f18b8599889c4a167da364e197f6d090fa3450f71d6aa5177
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20161028175848-04cdfd42973b.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 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.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod 40 BLAKE2B 3090a8e1737078a28e24c1a01f78a18ca2ab94c0cd297a9ab04f970ffe05a6db291561b893c345c1d4f023a0743adf0a769f58365251ec94e3925da9187aaf62 SHA512 de55ba427379e57d671a31a72b9295e8e7fbe3bc0b80d05e63ccd31c1fd7030e74fd39fb0347d87f10f19bed208df6317714b0d1028057fa40e633820d49a03a
 DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.5.3.mod 35 BLAKE2B cb878d5c7457af4aaeffc81f34740798fe5bfb413f15efbe80c0af5108add18a9623f44f24b6ec47d4f15cde98452efb71701c71dd9914dbe48c8e8ec84a4c05 SHA512 14987165f56487477f7622d40ee2ec121d6a693bc7f13525e802819959207f347e1d7e1ede45ec6afc097861bad0f702206b649d29e5603c77d2718d701d997c
 DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.5.3.zip 1069597 BLAKE2B 289ba8e12d349a3dc3c2fc5be7665244b1debb62a75cf05f67b3f31efe61a94ce48f1405969ca1891b11e97ed71f67745dda70aac6aeffc69370de981052efa3 SHA512 0bd1cbd19ac17e9ac41fe66c1146edfc2c40ed7f31b8a08c966d0cb799c5f3cc35a69d57873c6dbc2e387daddfa895ba35b02a275fa2e35ed39052d6f8a72857
 DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.2.mod 596 BLAKE2B 447bedcf6165c3790175285c175e34f02e916b638605283f41ed5e906846f2310709617686afd6f2b644083d2d8c2301e4e1a5e6bdab3dbb8e690c4295e0c747 SHA512 5a02bc3a8aa33e8e865ca4447288e076684dc41d2d6f896863ba25d02632f419b41a44116380f4af631d58617d11c9366b9b86708f7d75b925b520743cea501b
@@ -272,9 +354,12 @@ DIST github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.1-rc1.0.20200413122845-09d
 DIST github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.1-rc1.0.20200413122845-09dd2e1a4195.zip 415754 BLAKE2B af9f6c13524f26bb149b64f986162c4c70b7bcf621366dd1f957068ce4c1f850a78099d8977fe0be2b0d9e29c46c08fca45a36323fd12a672302b39952ebe367 SHA512 bf1053992920e33e13fe0c128c58edf1a443cdb1de91f447ec3c468b69f1d284eae66644e04958f1651ce12156c7df3747cd1c9f1c2740707f5a8e94283f0d9b
 DIST github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.1-rc1.0.20201003150343-5d1bab4fc658.mod 723 BLAKE2B 8fd11a7aabd5a7f624a35055aae8c7c5c50ddcc1fc6e69553d6ce81d45a108a2b64086f5735aaaaf84466de39e19a127c97eb3d2991d886be5bbf8901e03724c SHA512 d1a3213bb8fa7c3544adeb9796b4520e3e62a0d15879b2e691444e9a8cd89e2f4e803526f590447542e2fd4dec8c44a97b6d127d0e03df4e3b567391f0d6967f
 DIST github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.1-rc1.0.20201003150343-5d1bab4fc658.zip 2660691 BLAKE2B 6c79ede0dc1555e3b0cd400251506653492cfcbafb5635622ffb442e584a22cb0b1cffb1ffac9a6d872cd34d024cac5ff040d3f3d796242e091ba0a2742b495d SHA512 e47f4a2a46708e647d4e134982ecd4e7a95758b7070a2f02a481d3daa716286febc961dc8f28e3a38227eb88d37881280db543096a1a032c4499417018f968e6
+DIST github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.2007.4.mod 730 BLAKE2B 4e044d519dfb436a3bc2a983b611d9826ee905c0556ad482e8e1259b143e4e1fad1458c8d96bb0234465dddc26eda49dc415cc33bbd5abc5b067074642c7eef4 SHA512 1a4b78907c138d2dd629a69b49a170e9ad97348a742ddd91645c320e5e97bbe7e27496cfcf75197ab6425eff05d3d7dee46643dde53b359c52878e612a72bf88
+DIST github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.2007.4.zip 425754 BLAKE2B 7951afcc8d80e055f8cb10cb6628dfc54eb1235a2266b8c2a3a1814aa0813432e6e20f2be30b5b51bf6d7ddfc8f7c50b6c4ae9f8c6e5a3869ab5c2d7f5ee9c6d SHA512 577ae9a78290bfb0149ecd5d443127b57e5f99bb09be4412fdbc6ca7f801d230fee8ab3664fd7ac41ea2c1b5fe38a91f364002bcbcb0334dad008d82520c1cf0
 DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2-0.20200115201040-8f368f2f2ab3.mod 193 BLAKE2B 0938da2ee0a3bc0acc3416db8387be68292b8848b72cf3b44c28e11d6d456037f7ed998fe08fd142f42ccb447bd0f0a7cb75ff72e72d73a5649a85f7def42070 SHA512 7752f28d6ae3da6cd4f2b5d23ff373a4bd8b8b24879d9bde17bd22b1689aa5b87ccd1c206f4f70aaf5acfd89f4e1f11a04ed822266a576abc0a1f979cdce2911
 DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2-0.20200115201040-8f368f2f2ab3.zip 54509 BLAKE2B dec6fbe5781132bb74b414da959392904b8db04e2e150c3611ea750ecd953d86ee860eae15b63a74af40c949c61298fd2c2155804cf4e1cc4d0091c3aae787c4 SHA512 dd76f220cc14f3b380c8b13ccae067c8da0588c94320bfef0d6a4e964fbf1e5432bdc76c00b2e5134cd4d079fc769e2b069c909395168bc1af7bd40a2efdc9bd
 DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2.mod 193 BLAKE2B 0938da2ee0a3bc0acc3416db8387be68292b8848b72cf3b44c28e11d6d456037f7ed998fe08fd142f42ccb447bd0f0a7cb75ff72e72d73a5649a85f7def42070 SHA512 7752f28d6ae3da6cd4f2b5d23ff373a4bd8b8b24879d9bde17bd22b1689aa5b87ccd1c206f4f70aaf5acfd89f4e1f11a04ed822266a576abc0a1f979cdce2911
+DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.3-0.20200630154024-f66de99634de.mod 193 BLAKE2B 0938da2ee0a3bc0acc3416db8387be68292b8848b72cf3b44c28e11d6d456037f7ed998fe08fd142f42ccb447bd0f0a7cb75ff72e72d73a5649a85f7def42070 SHA512 7752f28d6ae3da6cd4f2b5d23ff373a4bd8b8b24879d9bde17bd22b1689aa5b87ccd1c206f4f70aaf5acfd89f4e1f11a04ed822266a576abc0a1f979cdce2911
 DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.4-0.20200906165740-41ebdbffecfd.mod 231 BLAKE2B 21e1d822d9e28bf137cdf79aeed547df573d3b143b76b4686e02cae6a49cfbf196b84edde68806a89be16459a426019bf24a844cee1b7a749a452058485cafb5 SHA512 ee43e1509fa47916661bee45f8d14204ec98fe489c5031d75c9116498907a28d7e1f0969b8032cf67573e7cb52b0aaa94ab03779336aaafac07adc4901a0a3c8
 DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.4-0.20200906165740-41ebdbffecfd.zip 297048 BLAKE2B 8883ee05ffdb3cb9ddb738d388b526889cd626d14b704b3686ecebfbafa5b12d3a3832d80df911de443bcd5c167e00005e88bb9478bac590673ffb266161f842 SHA512 4f1e0ebfbb40a5bf17ab53ad3cfaf90cb4d00ff65b5b4d8f82c63d58a781794226760cb45ce33ee0807034f00f22a0d2c32fc6b6264e282b4b54b8483b64be47
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
@@ -305,20 +390,30 @@ DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod 40 BLAKE2B 9300f3006
 DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453
 DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod 32 BLAKE2B 51c322074fb7a69418dcdfd2e54b187fbfe541c21a979c8bf8b155a6264cc670eeaa95c2949f2b760b187fa582e86688a045f3f022cb45f053a58e00ec2c0c60 SHA512 bc43f85d5a21cbdf4b3821e707c845d08f8a6d8f2c6ef0f6ec76f7711c53bb4407f2a356c79bbbda438fe138a3cf74a4b279e8757cec7aa134a93f2173b931a0
 DIST github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod 33 BLAKE2B 52211e27792f060734989af8b47b48f3f9edbdc94b49917d715bd8853a3f05ac714cfbf752d3171b4c223a8787497df16e1ee46b07203a6d2c4cae3540c66af1 SHA512 ddf8e796d04c0741342eae18ad343861ad7a76d030a5dd9a27b1a68b2944a0f94ec21b1513640179c73c16d79ac309b8552dae42d6e45bc0f03d33269666bbf6
+DIST github.com%2Femirpasic%2Fgods%2F@v%2Fv1.12.0.mod 33 BLAKE2B bf061bb336cde22e7cbf1abc36be47d4d272c0e454ac2cb60c55e33976167d75571cc490dd73761e31e597f2a8daa8244ea4d05a55120f6038dd2abcd1bd4cd4 SHA512 ff65ee51114426fd17d1a36b6e7fa5b37d9ec0cec79b6eee9041f3506373582ef0208f33131ab27e0c4d20a13fc9657e55921a704ce5df1ed3bb7ba8f28a9e76
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod 46 BLAKE2B 26844d83faf5b29bc13a3a48ccf6a3648324503647617e8ff13baeabe4d95ebc0e4f2ca5014b553148964625323dc1a11bbc0a4fb5357be97770a3b6cf808bc5 SHA512 5ec3e01429b0c86caa7ee04de7fd70505cacce1ed540081ce4c40143c8776cbb75443dbaa47642da02e263c02c7e3557d6425c3cb60f03a5bc296a1cc3b6541d
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc51330df71ca612b3a573a93a8ebe57ef4e677157835221dfc5f7bcbada1fd90f7a6a3a002cbde08c6a95642477789d532ddc80e7ecae1f9e6e7c081364e970 SHA512 323c4b1c27bdc5bfb1795f1353d21ad6b7a2056bb0b364adab5960aabb7bea20ab3287ba60685df130abddbd66c3d82dc98a291aff1849dbce8c182c63c7b0bf
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod 543 BLAKE2B c757618d90ca032a7a1dba4ea988603324c82b3c8df0248caae59c5d33d601def8c5f6238acd40166aae227759bffe4ba9ef746ffb045da14416441e22f894bb SHA512 90f3298da3bac3bed1dcc040304c84939efe3757cfa4ea0d4367a459b3328f26da343a7aeb8d9b9185ac9e324e5cc6287243b51102edac6089b50209226b5018
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod 543 BLAKE2B 35a7d739e1bc24c321c5732b27fcfc0bd4ef872610759ae867d08f2dea85e55b3f515698fc48299902703b7a8cff9658f30f855a6b472d4f4945f38101ee42d8 SHA512 b52cfc5fde9300a89cb4e59585c549582fbe75c33ca19fe06d1d8797216fdccee4f35a30fb794f37a16ac0a5d54dee0ce53fd938073b42b73cd96203b3819c61
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod 543 BLAKE2B 35a7d739e1bc24c321c5732b27fcfc0bd4ef872610759ae867d08f2dea85e55b3f515698fc48299902703b7a8cff9658f30f855a6b472d4f4945f38101ee42d8 SHA512 b52cfc5fde9300a89cb4e59585c549582fbe75c33ca19fe06d1d8797216fdccee4f35a30fb794f37a16ac0a5d54dee0ce53fd938073b42b73cd96203b3819c61
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
+DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.3.0-java.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
+DIST github.com%2Fetcd-io%2Fgofail%2F@v%2Fv0.0.0-20190801230047-ad7f989257ca.mod 33 BLAKE2B e2d862747cffddd2d31ecd2975d44483f471d2690388ee362fd8d23979d2435291fa6a3cc3e74d247d4d90b10bd034d47bda73a44b2f9f2dde1f80333c5f9113 SHA512 8c2d922b5fd4c24a92fec8f5478ce95aad498f9039e890c803794684a74175f41b40b5fb60b0275e4feb1df6d932f891da950015202059f1df89fff8b8519478
 DIST github.com%2Fexoscale%2Fegoscale%2F@v%2Fv0.18.1.mod 87 BLAKE2B 9a3f9327dfa69321abfd93dd5e501d8faafdba4d5283ea9eaad6c74e00e2a17e3d078316367e96861db3a53400e3b5184afa6c20d8c8991f53803764b02ef2cf SHA512 462c3ad73b14ace4121bb97a0ab5fec0aa0c212a2561b89fe5c78da34df25c8d969f3031eae1e23122c0aff0d234f69593bd8633e37897264a6b02c17b580a9f
 DIST github.com%2Fexoscale%2Fegoscale%2F@v%2Fv0.18.1.zip 217089 BLAKE2B aeb98c05650c9445a20fdd65bf45586a71a1971cb8f3ac0d6ee8e010d840ce45fb6c165ec1bb8210f1983632db38a668f08e87e991e6e97f8de9779156268e85 SHA512 003299b9ea7eaec2c58e36ff9dc42cd3b2ead6b9ad026dda3905c15347fc51f486841bc39768b976d879afbe6807f5f39a1c4dd6ade2ab3beee2067cc524703e
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.6.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.8.0.mod 190 BLAKE2B 5ca57c301ae17a65276e9c96e743d1d8f1dc92179aa9d3d464231c1b2a733d2ca86745b85f4032ec9ba4300431d08a0be2983e510e3f2fc10f1f26afccb3796c SHA512 d7c71a763f87394bbfbd3be503ba8927e96eb40f836b0c48c9612566696e81864e2969d0ee44355b6324306237146f494f592e5e09a6f01182f9c9badfcb95b1
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
 DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod 32 BLAKE2B a73ae1e577fbb84fd72de422c367c1003355c117a9660cadbb5d6d52fcd0c102fa3b22c7c7dfb6e149dc14ddcb9b5fef847fb2a7b9379a35405c7bd9d83ff1b5 SHA512 2ef8ab60b4320b9358614a28a02b4207f3986c4a06798c3e253a79bfb63692dfb1765476e9d154e15f9d5e30983609c98b6ee39ae910c678a3773fddca208cee
 DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.zip 17890 BLAKE2B 663ee535dd3ddf1a89ae274a400bb744d6e22689a212b58e6f6a3ae45890be76761fd4cd08d1836ffa3b8fc290249a408c798001b343104d0f06d7e2abede6a2 SHA512 e42c37f71719ed662a4b3efc9c03725a3569ce04849d6bc845bb7967228b0e648d6b2cdf73ea18430e54df85486b2a3819aca6170538eca4401ac3ea4a512d3c
 DIST github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod 33 BLAKE2B 2c279a40bce4e61e5aad9d25a1c374b6c154586c296cfdfd56f52435c7739c8d9a8958e19d6da8026c2a03b728e0cb9bb512d5c094aa6111f9b10af24ab894ee SHA512 2bb0f125a91c8f92dc1cb5ec16441b27027585606a3862c216434b76324f3069941055c4bdc98372547543b095a4014155446de1be98264842504450121c941c
+DIST github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod 39 BLAKE2B 03c2848adc48e404015826fc857d2a7b923efe39f2b11ec28e238ad2b06b0c5f4539f256443f91a116bc135923de7c4013a44285763b482d2baab5db1bdbefc8 SHA512 6c5546d979277d5488fb31eeb9fc33999dea631baec6902f937e19f4d65a23a2bb8620481c3ec69606eabd019be0096553097040bc778522b05f85ebc56bb787
+DIST github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.3+incompatible.mod 39 BLAKE2B 03c2848adc48e404015826fc857d2a7b923efe39f2b11ec28e238ad2b06b0c5f4539f256443f91a116bc135923de7c4013a44285763b482d2baab5db1bdbefc8 SHA512 6c5546d979277d5488fb31eeb9fc33999dea631baec6902f937e19f4d65a23a2bb8620481c3ec69606eabd019be0096553097040bc778522b05f85ebc56bb787
+DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.2.0.mod 36 BLAKE2B 0b3e2e38c2a6c708af475f5550f4e6b366b9218fb9e29b9ace6fd61775be5635b5dfb237170e5c4a84c82a4f62e3901ce8854cc5f9a81aeb1e2da6f788470e1a SHA512 88ca10cb6af255e2e0ff960df075cbaf39e8baeb3b65e35b9a8f48843520a4cefe410765d0890781dc0429aebaa183aeda2290fc0643b852b9ef269c009ecbd1
+DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod 36 BLAKE2B 0b3e2e38c2a6c708af475f5550f4e6b366b9218fb9e29b9ace6fd61775be5635b5dfb237170e5c4a84c82a4f62e3901ce8854cc5f9a81aeb1e2da6f788470e1a SHA512 88ca10cb6af255e2e0ff960df075cbaf39e8baeb3b65e35b9a8f48843520a4cefe410765d0890781dc0429aebaa183aeda2290fc0643b852b9ef269c009ecbd1
 DIST github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.mod 962 BLAKE2B 4e010a5ff246d4e834d72b522e958d6f8063778261deb3abb11a5781a5d79c90e9697d43388158b4d80f811111eee0e86767d51ec58570d02ad4d7c8c9a31ba7 SHA512 c2b2b6ef8de68569c73aa8ce8c778dedd764f8204c8bc8a78b335d0138c49851af585da65e0ab9b2e561500f1eb0521a6f77d92794e38fcc22e6dec12113c959
 DIST github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.zip 231306 BLAKE2B 8db056d6fc6796e16bfc456d00ec08eeb0884fb7cf6e234193862453406a300e5bbfc23f0910bace51fc66e5c3801a14078aa8846dbf6b03a64c79414e350892 SHA512 822d1395436aee93d26cf53cdf65163247e8620b4f1bd3151270b9a9e2066012e9397158a10f433c0d0512dd8c4b6d53ec76b5e5d3f169be3e5970e3912dcccf
 DIST github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod 33 BLAKE2B 69d161a91f7a47f08054ac8715154885a3615d8366b32d226a08f3bc975f6c87d168006620ab53fff5ca938232f06ac9eccb1b7c0621c91f9d7368b38cf29bf4 SHA512 9376e6913b3d764bcf0de41f4d6cffec4da5a8d387488cf531113e1597371b838fc398020bc85fdbb0583fcd9fbc2fbcb23b246c3d8147a6c606bee3f0974882
@@ -327,8 +422,12 @@ DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod 106 BLAKE2B 4876f70d70d2d8703d7b6abea5457e093043912d6a672bf7794a892d1c17b159ed2b92dee05ba1625a1b7cd6c8d66d6dc715bfc1d7c0f1c47965ae8e30506bb2 SHA512 ea3a26ed1f6df26a7e2aa64ea9d5d4a4c3005163cd8adc05028cf25d56d01d115bcda38b7af992242013c2610f26a184ce43dd1826309c95fa008fa9c8c387d9
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip 42349 BLAKE2B f2c476034a47330b5424159be4a323bded799ca489163c8d485e95f17ce519d6c4d771a35eaed83e831acbe20c1d9ec5b782469ce20aa224ab03de459228fe59 SHA512 8df5f490e26760bcfbfee216b5479321d060d4e48911c98e4d3375a6f84bd161b5d80769fb0326b3122534ff726e8a987bdce365464cdd042ab4cb5366d674aa
+DIST github.com%2Ffullstorydev%2Fgrpcurl%2F@v%2Fv1.8.0.mod 529 BLAKE2B a6aae16bb2c99172c99d13912d2e1afb90f71bbe8349352812b9fed6de403f25afd103957ebe6ef74c6010c07aa50f856310f0e4d5d5646e389a2dca35b8dc62 SHA512 57be9ca229a49db82cdf8ba1344b6cfde1dad96d4bf70eaf16ba0e8775332b80b08b80b88f0611f69c87cf283a59c1a7c1d06fa624f5c073362f54cab2900904
+DIST github.com%2Ffullstorydev%2Fgrpcurl%2F@v%2Fv1.8.1.mod 595 BLAKE2B 498cb8a1b47efa64ddc552109d943ee8429426daf908b0fa77341422fdcf954ed7b9d4c038c8e002bff39cae636a0085e5cbfdd8ce7dcd5ae130b5c2550a4d01 SHA512 7932a7bf10b02de243a5541c52b2e20f9dea5cd883cea7fb5f9d9997b40d6a39e5acd4af06abc80fc9332124e448cc3ae26972113b952c4b21d8123fab2ab9c3
+DIST github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.mod 37 BLAKE2B f12e861904648d4931055fc40635565ba64e9e43909af9b6a238105ee85b98a01fc31da46c6ad7b737162f88648d4efe30f428a7d253cdcef7c38e9ff3863d5d SHA512 b10d9112b673106e50e51a54496b9f82af44ded3ae88811eefafcc0c1908b7fc89a1512d438a04748147326beb28026e01ca3e4dc3e833be7cb3d2b49d98e81f
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
 DIST github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod 33 BLAKE2B 18725478b6c6a565e4adc96f4edf09f8369553b8b6523f36f8e4733ae64eb9a859af67e14646e61d2faf5cfd651ada0a6bb2bae455ba6bb4570c92696b31f23c SHA512 e6592e0b4e0c9f344378efbc06365296f5978e173421824512ce6f8921212691aad2f35e73ff4562c72014897a4992b7b3e56e3c424a82159747f1fe328eaf50
+DIST github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod 33 BLAKE2B 18725478b6c6a565e4adc96f4edf09f8369553b8b6523f36f8e4733ae64eb9a859af67e14646e61d2faf5cfd651ada0a6bb2bae455ba6bb4570c92696b31f23c SHA512 e6592e0b4e0c9f344378efbc06365296f5978e173421824512ce6f8921212691aad2f35e73ff4562c72014897a4992b7b3e56e3c424a82159747f1fe328eaf50
 DIST github.com%2Fgo-acme%2Flego%2Fv3%2F@v%2Fv3.4.0.mod 2227 BLAKE2B 2770acc163869bc27e9a6badb76087ed323a2516eae45a9f83b6df1156be89860943d8eccba7e925974263117bf092eb8489546b94552a99143a163828f3da5d SHA512 6e6f7873278d618cc84c85be17714856b82b4b5a11453ab937f47a966382015839e6bd637a3d84b4a064986d23de2ae55cc1c9ace5159816c153399c33c0cd66
 DIST github.com%2Fgo-acme%2Flego%2Fv3%2F@v%2Fv3.4.0.zip 632770 BLAKE2B a53c4b920e68482fe3b39ac66c56679806b571d25d0be099c80e5dc88d90ceb439c423bccf6c5bad36ee493ac1ca74447c21f7ee1c28738c4097befaa9a1aefe SHA512 328b1d88435a1296e714f404207b2bd16ce0e7251fadbf133e5ba976883cf47e9fca36e97ac804e8d56d7d124701925abc3c06a481b104ed6f92eda175b5d248
 DIST github.com%2Fgo-acme%2Flego%2Fv3%2F@v%2Fv3.6.0.mod 2074 BLAKE2B 617402618d8f577ef9fb73d756a471579333f4c30474ffc2ca3f8a7fb47add79ca706b6e6d27bf030cadc1573be20b71806cd5495ff88da9b054a9b2a0a6cea2 SHA512 599d9292cd337fecae7d9c296efddd1df479b9ea3dbd8547fd12f35980848fe378a3e53cbf55a8838e6733c3d77ec178854b005fcb844a18dc348261a38522d4
@@ -345,8 +444,11 @@ DIST github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip 11197 BLAKE2B fbc5efeb39a
 DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8
 DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
 DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
+DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
 DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.44.0.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod 2670 BLAKE2B 211a6d7642da991f148a7998fd35875f316a143c62337214ff428b4eecc7dee7db044e42f337edf531edc70b9aa99f46e349821864a63d384c7d050e414a608a SHA512 fdfed8273d2014838eaed6d4d2b0d92ae905fd796a0fec6c5a0eb27d15ec31c72e1e79973d909a1ac01df1a2e5afac99bf17d5cc7d08f507474c8e8e7ea88ef8
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.zip 461958 BLAKE2B 025cdb8036d1e055a68ecb215d0e8464e0840d5ad9f63c7ea11cbdb20998c74d21f5b9d019bd4b36335e9bb485b6fa5ee285eab1080b755aad8bed59e29e7d9a SHA512 fce6fbee13f3b4eae6182c000d809d9d96918ee93be3d460a6ff359b0889299a806e76b9caf364454211116b5acabca02caf2f401e900c95ec41a5bc54c4d693
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.4.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod 121 BLAKE2B 6463ba6a856a7bb4efcd00a3369f6593b31b8ef39da4bb16ce1acd741c0808d2243ca7787c0a52d4653a5b402841159e97cd4b42e0f6172ad39429beb2b06993 SHA512 564f0a1b0318004a7ed478c8f3a371ea2f59efd56eb2efec4fc806183de1b4a065d5b44aab6dbd40446d28caf5a74545a7ff6a3d428b1b41cb6df5eefc11e5c3
@@ -354,15 +456,23 @@ DIST github.com%2Fgo-lintpack%2Flintpack%2F@v%2Fv0.5.2.mod 475 BLAKE2B a6ee9f4b8
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod 44 BLAKE2B 0122d72cea88331beb9500849a0936a966e7a48abdd2e76363151bbb124e35481e7248fd896523eba3c51c5f4575dbc13304c2471477757c1eb2f8fb2eee9cc1 SHA512 bfebb8d865586729abcb0dcf4c19a8938f06f9b502c78bed92d01c18d1d037f7df44cc1a1fbd4ca094b1835b8aefbd48fb5988e2884656ca44be0aa83206aadd
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.zip 15925 BLAKE2B 66134bbd8bbdb9f4ed2db1a77eafd5a0403916ba2dbed0a0da0f7328d2edd7a16a59cd101efba4b5167ec249388027c3a7152de336d1544b98316ae68cf06aea SHA512 26e1b68fb64eb8830aa1140f7cac6d067c7089ba1ce0f10bd59acf9c906add6f64d7797de2799b33232185b8ae9b611234645c324a814c5be338d39a6c2d3488
 DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod 32 BLAKE2B 165b3724097f123b839b3f65d2e401caf6d8046fe822d3d9b9f15d74e1da21c45b77706f79716fc1b9c5322127bec754b2dd35442fe077dad4f3e301cd168ca2 SHA512 14e60a75a483ff4a1f6313a7a8a1dbfbc6ed4c223c7a9d18c0b355e84261084204a22ef1125a40e30acb1b43abfc97e60c045dd91a16d2b4068a78a54d854d28
 DIST github.com%2Fgo-piv%2Fpiv-go%2F@v%2Fv1.5.0.mod 41 BLAKE2B 9a745b5b30bea918c74a3090698493c11a519cbe8e674bd091d4d506df987b30f9a629153bd61e085b34b4ba5a2f01c341e3cd6e49f920860ddaf88e99dcb246 SHA512 653964c5c17bd3917046870edeb3a51594d59693719f00d58d2c5bdfa8582638a85a5cba5ec271a75b22e00a3a1d95aa02b46b5983fc7ee3e86dab3a006dffec
 DIST github.com%2Fgo-piv%2Fpiv-go%2F@v%2Fv1.7.0.mod 41 BLAKE2B 9a745b5b30bea918c74a3090698493c11a519cbe8e674bd091d4d506df987b30f9a629153bd61e085b34b4ba5a2f01c341e3cd6e49f920860ddaf88e99dcb246 SHA512 653964c5c17bd3917046870edeb3a51594d59693719f00d58d2c5bdfa8582638a85a5cba5ec271a75b22e00a3a1d95aa02b46b5983fc7ee3e86dab3a006dffec
+DIST github.com%2Fgo-redis%2Fredis%2F@v%2Fv6.15.9+incompatible.mod 33 BLAKE2B f773c657bb78f4ed9b9f416c2937b9aac09523b89e9c8c5e6dfd577f968355359dbe799cd3a9d338572f5b3fc47e069a1bfb52976cc907d4f286371675e6b485 SHA512 0679350ba72b8ac3edcc78261e7bdfab2d60ef315924251a8e437af1cb08e6b1fb6f9b748c445c6146650e735cdb9af52ab262f2de1ad3b1035f8348663e2d70
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip 106521 BLAKE2B c7c61852b093d2b0452e9daf9ab26b83ee6426a9afa4f67abb0e0f98ef28961017f774075f5d90fc05d6de3c26fdf90a1916b426b32a41e2cee8fb0452e21f03 SHA512 023209372d47d4b5279789f581a6f4452aaff1e262ecbdb3fbdc48a0939599e319109b99d1c79414716f1c426c143cc1ce506dcd38f304dd5aa3e9348084628e
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod 47 BLAKE2B 7252c3d085ad65bc8d2694f6fabeaf42736c8af8f4e061f1b6f254c35859619db00c1e204057cf355434b40f403b1c67c29fa5f93661626284bde20c8877a606 SHA512 149783bbdf84f15c29931e06d98707db26048d13ae9fd157600b522c0ddc60612c39764dc177e063f844205321ba98a01eefc1744dbc6f786861d0607dbdb0bc
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip 113293 BLAKE2B 1bc68747a73c39e2b21bd2c45dbdc3cb41a6c69f9a2a5167a6960b4ed583fbc888a41f559a8866a004703939230ccf3536cb2dae43ff5a078d21151a115898c2 SHA512 d18a710e77e830e7a1e80a16a7743cfac418832c16a8e08da7749af791e2bc8116c2c3e7f028bcf9c4431cf8e61478d6f1a3549a47e569f725db2a623460986b
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.6.0.mod 47 BLAKE2B 7252c3d085ad65bc8d2694f6fabeaf42736c8af8f4e061f1b6f254c35859619db00c1e204057cf355434b40f403b1c67c29fa5f93661626284bde20c8877a606 SHA512 149783bbdf84f15c29931e06d98707db26048d13ae9fd157600b522c0ddc60612c39764dc177e063f844205321ba98a01eefc1744dbc6f786861d0607dbdb0bc
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.6.0.zip 117011 BLAKE2B ce99216a8c18289efd467ddb5f3dbe74d4e1a1fa743b6db5df02d3b34cf48ea63dc7e5d8ab97220d66b7648cfb4efa0b1aa23e208a266c7435fac65d26b970a9 SHA512 f356b0e4d723eff7b67f1879f0f67be7157a4a3a15de6863050f604319e5e3d2ee8b03648c4e4dc0c83e4a05d426eaebc953104f45b60675604aa759fcdcd4ca
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.6.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
 DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip 10204 BLAKE2B 37977dbc6c256bcd404d5b7076ac49d1c3c3c495ad0869cbdf8943b24b80ea5f155c80a0a23571b778e7fcb381140988fd19cae6b8ad681e115260b0fe19394c SHA512 1e834ba368fcac6e13fd8b3a478cbe9b181ec3660087733b68adc0dd41838e54367d22f9bc53e602ece889e6051e319fbf80d5874abcf4daeb0bfb9b64e298e6
+DIST github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.mod 142 BLAKE2B 54253a74012ab95ea6c91a438b815a4350aeaf4bf2ca1792cefe7c240e563a261567eda5338f05e4fec09e6342229ff00f09098919d1bd00e1cc73ba05d84a59 SHA512 a40438b84b2cbe6be587841e249d934f84f3a05335859ae5406f206e69b972095b51629c55a492114c4fb24c0f7b70ceb7650d97af73fe820b4f781e0411df4f
+DIST github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.zip 60633 BLAKE2B e76daed615c3d3860ac3f9be08600ff24eac095d32978d0fac5e4e2b70a64b7ddb1ffcf194c06321643fb473af6f1cf3fb68b6d4260bf391fa5152b12ced3439 SHA512 24c04030cfcd65739754d258ced5e15509ad049fd8d73d3895559bc96871b7500c436279ba8e59e0b41ade83f5a9a167059df6cccfa21abc59d41b60c44ec286
 DIST github.com%2Fgo-toolsmith%2Fastcast%2F@v%2Fv1.0.0.mod 146 BLAKE2B 929c15d08be251ebb09aac169eba126603d1f3bc4c8dfffa22b26baeb368d94d4725e3d91425aad4e96aedeebfe91f43b9dc707c5bb7bb11c28e44447e5d1b3b SHA512 fab7c8aca8025f6ffb09bc7cbfbbcc86e1a84608a1643b4443a386ac979aeddf6821e6b67538a033098c22a22c251077046c38b05e08bd8799deea5549b8d8a0
 DIST github.com%2Fgo-toolsmith%2Fastcopy%2F@v%2Fv1.0.0.mod 134 BLAKE2B 0aac384b872ae017d32169a21e2688b251a70d4f9b1a3479cc369d34ad0d81688caf207501fe6017c02764063d62497951270a3e2a2babbde20ce398dcb590cf SHA512 46da2d05a4724f95dca3057c5631239f1743e5fe3359bbdd81ebeb02fc13a22b59e69476bcca359361bab2603a57868e75dd8403cc24e80a27178ff071fb9028
 DIST github.com%2Fgo-toolsmith%2Fastequal%2F@v%2Fv0.0.0-20180903214952-dcb477bfacd6.mod 40 BLAKE2B 5c860e9a56012a35ba01aacdbea717d5416d65fb8b079f1522655fc71067950cf05b2b3293c96e512c637e381880405156811910ea4fa0822983bd40eeda93a8 SHA512 b33055f798f28acbd654635211a1db351a0f27568ea75b00e1b152cd9912d9f9203072058e55482b82de46c2cd3af050606a8e835d281781ee99ff10d1d52e6d
@@ -377,6 +487,8 @@ DIST github.com%2Fgo-toolsmith%2Fpkgload%2F@v%2Fv1.0.0.mod 102 BLAKE2B 80c36ef24
 DIST github.com%2Fgo-toolsmith%2Fstrparse%2F@v%2Fv1.0.0.mod 40 BLAKE2B 5ee28988c889c7536b2209c04b61b04c4227d958b516f29e879c51e28e348b0fd9eeb6511eeabfab51c1a72083f65c9e1f6553213cb99b23b8e966f4fbd1941a SHA512 caf03dc50181a339953b27cc8627613175928b80a128473e4d10701f3fe536a66758e199c7418babe3915cf9aeab51527ef66b98b0c084209314bfdbe53cdb5e
 DIST github.com%2Fgo-toolsmith%2Ftypep%2F@v%2Fv1.0.0.mod 37 BLAKE2B e168acbf68a0195c45b153e25098ece619b2656eb02eb648d2dcf11e6c7bab3fab50cd132354d9063c1961879127819944ebc1dd8d7e1d0987cbb91a86b35caf SHA512 854c0798c7e4ba498b3b6efa00375a93e09d84c3a5de042aaa8b58bc75df62cad93e2e0d4876f43de0d1e2956062cee758c8c7aeb2c0807e994f4153ee990624
 DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod 30 BLAKE2B c4b58079c7f353b01123ed35c24b8c9dc43139a9c87b12fd90cb99e41b97d6e2ce646710b261dedd2a6c9572ee42e677be0ffb43cbb8cb55b99d1eb92ac68f4b SHA512 e0a6df51284e6b2faa2ae12bbc2c53c649fc503427f0651fefe99cd852a012a76a9c5d967cd1a088e1b3270f9b68abc39f56a6d823c5913fa025b771145f80c6
+DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod 42 BLAKE2B 79541bfacd3378a6c6dbe9591309a80390444f2dc2419fb0137c723c6a2ec1e0588c00704ce3c19dc93297b19db89f79bfa09daa2632f6674e35e76819473cb0 SHA512 b9aad4f1c1d4f2c43b293b0c9ca8a600a37ca407ba8b22b0f826c8355828cb7860a96a85df84f720fe8aa2840974807ea7ea7b790790c6dafed794e761f1f26b
+DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod 42 BLAKE2B 79541bfacd3378a6c6dbe9591309a80390444f2dc2419fb0137c723c6a2ec1e0588c00704ce3c19dc93297b19db89f79bfa09daa2632f6674e35e76819473cb0 SHA512 b9aad4f1c1d4f2c43b293b0c9ca8a600a37ca407ba8b22b0f826c8355828cb7860a96a85df84f720fe8aa2840974807ea7ea7b790790c6dafed794e761f1f26b
 DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.0.0-20190320160742-5135e617513b.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
 DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod 29 BLAKE2B 5311a22dbbbedd78a98e34293e79fb5443c57774fa9049665943e377fd07984a9316f3ec5c8fb70da9b133c6390d32ab28b97e939f938bfeeef78883cca6fba2 SHA512 8a1ab67bf3555ca17b7efb1042fb6a7d58b225b4186302b0cf289e7b60f9aeaf23e36ff6d4e8da2ed728dcd676cb2f30f0625c430c0b6943dd25ee02d2c27247
 DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip 36892 BLAKE2B 86fda2a386b182044a4482b9cbb90fdca1c07b45b6c0f0a6f2c63468263840ea99f22140a3d7a9f68836674f884c425d8d44c6583df554ea6bbd1b7b84add874 SHA512 c8c217d61335e9b4c9ebad513fea36f7bc529d398ee7bf6f538bdc355ef62f0597aa7aa3d78b57e6571198cd43e53ef032e8ffb66650fdfd25fe49e17c7ce84d
@@ -384,8 +496,10 @@ DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod 34 BLAKE2B 92cad2efe22c009
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.0.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip 2698974 BLAKE2B 5fcb1c66d3fa55efca631fe5def383ec089fab784cad7d6a031ea390463a0c552f5fc4698f7648d271f40fb0ae3eee525f149347bb409c951d15d86b7f560e16 SHA512 c7e2170eda176da203ca64e402c11489c1fd183afd3359742e373927ff228d62e445f5dfc001a471303e1708862998c125ad4c2db86919596297b11cae4aee9e
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod 215 BLAKE2B 0077e3bcaad8a354f484c15844594107eb1a56d551e7ec55cd75e4594e50af02fe3850d9d212b0bc425da71c20bfd7dd470aa37be046b4eb88c28cb6bb63bb53 SHA512 8f928dfbe495a84c91744bf72527c5662422e608125f8b58908803289a39abfec1823d4628a52b987ab5150103ca588509ae0074fb08799d075e7ffc4157dc33
 DIST github.com%2Fgoji%2Fhttpauth%2F@v%2Fv0.0.0-20160601135302-2da839ab0f4d.mod 32 BLAKE2B 277920ac439062c049c6bf823817eb494f74b04c4e98fce8697b0fa7e73495681d209fea12d9265e7800cd8740a68ae3aba0837a6e76fe18df052734a13d40a3 SHA512 7a77a04ed51e7bf75d80d8accd810ef16587e1d941496c8f57517c7a8f185b3c00e01a456b8473c2d89e324175be7ad7e1cffc12c8d97209e0164cb60b24afbc
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda
@@ -397,6 +511,8 @@ DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip 39683 BLAKE2B cebd7b69e8f18547e77e07d49ca26fabd513b6bf95317553c5bcabac3b513dc1d7becc259118eadbad18ee4d45a1dffc3ec96864b80d87c0dc6885983bdbb3d4 SHA512 e7a8277f9b7d2e35d1e8586c580d03457ac1e755e1051fcda20ff9f819a6fb9c3cd1892be3a50d4cbf141b35d1c7b85b27bdc402eb45b700a37ce994be4e5b5e
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip 39701 BLAKE2B ecac1c4212267252571babe2c7332b517c22a7c535777a40b6e318299bc284ba3676ca75df60670dad69698450e97dc614b98c6c9fa793a4f3daa3bf88859167 SHA512 e4cc88b9e484d43a328c2ce80b812d4886fee13b915a41fb64b28cacb163960059de066b9be8aec33be081fdcd3db847ee491aeeb1a74b25aadca2c206c9587f
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.zip 39744 BLAKE2B b1bd8b2983e8b27709639e447fdcb2fa10c1f6602d90b06f03445e294dd3f243d8f0ed1715c569acaa7e8b9455b4c8f9fef55ea64b1e625c927d89ff863e2070 SHA512 52a3eade285f16ca743f29de8676a7ce7dfcfd4728d1f2fe1ab64d372082a621fa160520a31ca9bf231e32f650f4b7faeb91ec172c769022bd55dcfb0d7856b5
 DIST github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod 30 BLAKE2B 342057d82bd6cfc545f94289ce6dda498b35f949a3e5f9ad978910e5fcde556edd6e7a3847d136c5ef40115d99d9718e0c2bd2f420ed4ba72a4cbfda31db4c6e SHA512 fdf76199e91b2db4f75d0f8ce5844df0c4d0ea77319bec31ea1cc12f67121ebdee9f236eac8f6410313e84e3d4d625b92105802b8f1bf25de49c870aa6574d49
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.0.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
@@ -413,6 +529,8 @@ DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod 102 BLAKE2B fc65ca5527061bb3ae
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip 95367 BLAKE2B a94e0a99550bbf412c113e9721d41b4ebd81f0ee0ee1cbad9240abfbdfc91205a32a4d26676ba2b77e3b74fc86a739b5f5910aa0663a820757e541e6c889c0a7 SHA512 0097c67ed2453ee0ecf7571f15f229ce49ff98a9f7a9df8f7bb374fc693c784b6a74453c57509bb3e006833d341da7cdb9887ef3ad7e55a4ae8681e73b783931
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod 132 BLAKE2B f3b71704fc425084aaee253539f0748260138ee1fb493a98c2d0acc7c4c0b3533efd5d13e4ec578d0ac070f7d6fe01447f6270bc420cdb78cf3dc854d38ce5d8 SHA512 8529555c2751bec1c55edb40c210cd6afeb4b5f9f0cc38f99911c9da7afd6363a42bf225c742116707cd22aec2fc217802ce1c8d52e11185a80cdf398e8c4941
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.zip 120225 BLAKE2B e84b38f741c6f3d965e6f50d533566b0cab8e84f25922e84e7ebcb131ee9840868c846a09d7dcd3fbb51596ba87e726d911389180f4c5e2d64c3aec404b1f3de SHA512 519ab053be60c4e48000bd9777cfc342f5272fd32d08a1351aa499aa24ae6f4f8c8dac85ecb59c1541d5296c89c538f24d7fa755bfdf18852cfa725dbfce3e70
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.6.0.mod 104 BLAKE2B dd86cc7833414ad225f1dd2a51af2e5a1dd9511bebc712dce749d1452c52d2806a7de626eaf0a2c8e2f8a1796d1d394ebddfedac37f40159d37343c5a2709b2a SHA512 c1cbaa009d32793f323862b87efcd1e32324616df8df19abc7103633a215962df0f9038d1b52f7a715cdecd2da3b48a98e30618dc58532a1654934158ed160b6
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.6.0.zip 124156 BLAKE2B c1f55bccfb7f2cd10dc421b6d7246e2ceb0d6de6d5cffc8e5c13ef2368824839d449440b9b8729821b720170e17364b5e9080b8f81513a9045bacfbfb16655a7 SHA512 7fca057ab9ea3208388ab23d8102498fdb7eab796e8a20ef84a996e2074185c92f3b4c0d3558e4c63dccdcfbd3169d5a785025e848dfb50ffe76bdde21e459ad
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
@@ -431,6 +549,7 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod 124 BLAKE2B 3242575be48f0e
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip 206951 BLAKE2B da403116137f70222d2028df84c6f872d324e6aef808ceb2f58dae257e9b7cd2fb37b477c2b61bda55888f5aa72fe6f46afc79ed4fb440f1212c5105f8b6dcc2 SHA512 8df603b906846c265342236e7bff8ad4f37fbac2ab425b6002201ec727602bc2454708985d44de11bd91212e15e338ce1942f33a3e38c328f2ab9e3b990a2ab5
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod 129 BLAKE2B 15d140a0b2b22d6c9886ee9e517f923fda26ee8179755702a8eebf1ae8cf75be48e8d28a1df1bf875a7bfd499075d83a541c9716601856abe0e7c850a3ec68fd SHA512 467a3f6fb4c941cd55d8d4b2d6a2015966c60a8614691539c88c4bf0da2f8022055be8561cddd0e60b118f74f010be5998dd128b7b136f14edd2674e5650db2a
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod 124 BLAKE2B 4f470777c8d8816c52e0fb82b2ef37d4e9879c46fa93e8e4fc87c46b85c36ee6b4b1ffea22db22af2946c0fd3a12affa9df706f13f2367b14bb1a72c737ddb66 SHA512 6b46c8a019e49c6ed2307e7bf633d4fa04627938bcdffec22da42f722aeceb35de8655b04f69eb651fbc662ac5554b54b393340bec3ef4cdd01be2d7f6d07eab
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod 192 BLAKE2B 08ac45ddd213c260f4b9d33fec4ba9758ce949c699e2d8d6c7b31bc0fbd7498618cd5144a6ccc3e1b852e9f1a6b7d00191ada7d464dd5784d132506c9a8639ce SHA512 44c996ad31bf02aec42bef934d7cd65379ae5eca4d1069dab8c478be169f9479cbd55f8f72bd9567e51535d31c9f65cd1d56bbefb8b745f96cad0f5953f8c420
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip 206858 BLAKE2B 42c113333104cf0335d16d24748ca111dc44a52b3c6ceb8e11388c85b8ac80c5c324ca9c6d90d08c07dc865909eed4510fb145153024890e4e160cde2b877269 SHA512 6df84a92489b04e55e35bb2334f7e9e55f4fac646e9ad904eca189d069443609fe1affc4cf5e92d0f90ea9c75162a72f134c6298f828608efe9a71b6e496eeb5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
@@ -464,6 +583,7 @@ DIST github.com%2Fgolangci%2Frevgrep%2F@v%2Fv0.0.0-20180812185044-276a5c0a1039.m
 DIST github.com%2Fgolangci%2Funconvert%2F@v%2Fv0.0.0-20180507085042-28b1c447d1f4.mod 37 BLAKE2B 419c6e5eebd9f78b3e509972d55fdb5c0de90e393e15793a1f1fac97352758dbd5908bd3aca3169b8787b98d38d3dbfd0da3b432c271d39387607f30de75b5d8 SHA512 3910c0cb068e7633473069601aa57e05d47641120229e06ff0917fd4f34ca95b06d0eacbe6fc967fe6827f620779ae0494c4bb9479919e4f0c9a6c5315ff52f1
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.1.mod 629 BLAKE2B 301265d55a1b721f15a6761e5fa5123266ef57f11adac54db2d55b14a89b40dce70b307411dd012ff946c215fecf8a3c2b5342512ed0e974501c177499b95b2a SHA512 b1f1c83260a976b4d1e79b029bdcf7813184e3f6d45b066400f329b099ab478ac54afcddce10b3e358a14ae8af48c7a1b56dd231388ece034b6092fd11cc44c7
 DIST github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.4.1.mod 423 BLAKE2B f27df4dc2fad19e9c65efdd8ccf0e76770aa40cb1178eb95d372bc420f12366734357750dff159c15f87ef73d9f29e96a68983be6b3f9736951fb1de00c97e2a SHA512 2c4dab2b64619aea96859efbcd27e7c011166f5ae393be5eb3f32123a9d46f317b796485b7f785d6920b602b157c12845a92f302c0d7c16dfbe5c02d912ce77e
 DIST github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.4.1.zip 2239677 BLAKE2B 43ee2c765dd76d687fe36453d004c060d99d98ab5b0e830ffda981a14f4ecd6ee9861c2e69136537589dac928d39198cf4bcba320c0963437772a8ee4bfcd745 SHA512 577c74888be7804c4e1ef743a94f0a7ae1d361fdd0af36dbb6a1b0f57253026c6517e62fc0be40232909cdf5b4ef559b9665a698474afc522e381a01644e8ad7
 DIST github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.6.0.mod 364 BLAKE2B 07359e3161b23e583f4c03d876b770f90647990e5cac61c95c590af1d5efafaf3d2447cabe3d0768c7f6fd29b370ad110329545c19cd0b4bbc8399af019a690c SHA512 6e8f653ff78f1d9ec535465f448a3743f89daf2c1a15dd91c93bbba8cff5acbf4572940ffd69c7fdb386801d3fafba6f8a28ec0f6164d4f867e26eaa3ada190e
@@ -473,7 +593,11 @@ DIST github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.7.3.zip 2287280 BLAKE2B af293778ab84
 DIST github.com%2Fgoogle%2Fcel-spec%2F@v%2Fv0.3.0.mod 34 BLAKE2B ef0bf5a6b3ad1bfa2b99d2e3c2d51d89baf14069c27de6c0c453f5f9af89815b13af0b284ee14891e81690b18190722847941e512196c6b90e6eb70d9ae2922f SHA512 5d6a53da05253474978a6b74c947ca949bb5f812bc94ce99ff16e3e3c5bdcc644629bf7e88856496995eca6a439999786818dfb560728e0a7e6cfe2f85a8dd64
 DIST github.com%2Fgoogle%2Fcel-spec%2F@v%2Fv0.4.0.mod 399 BLAKE2B ced1a50b673c6aab91c6d915d135cca105171118d2e89469cfd22e3f6ff1a6e1ab5a83e693ed1f350f1ee77f0dcede89d69edca10c146ff2ddbac9bf28729b11 SHA512 411da41f1eab20f946992a2e346bebe14c8a1c04bbad8e665581733c3a4a467377d04b42e9d4c3486eff7f7b4c0e194010fa12d940fe3e1ede27fb2159dad799
 DIST github.com%2Fgoogle%2Fcel-spec%2F@v%2Fv0.5.0.mod 390 BLAKE2B fc86148d7906562e55a10e283058648cc40c085ef44e3896d5142a7f377b91b7603df894bd9accba2ea9b07109b312b624c5b01d119e42f5130a15ceca3d0d69 SHA512 950788499963fb79c162277265e08a7a1ca233465dd45d07a725ef5949e668760facb1fffbc19f55bc66366d121402716619cf5057465189ee585ac094f03852
+DIST github.com%2Fgoogle%2Fcertificate-transparency-go%2F@v%2Fv1.0.21.mod 53 BLAKE2B 273f506dbaf067282bc8ad7b0ea4c983377a1943ae8c6d6afafa015fc9ae0f2ae777e3af67ea40a14e0a2020ce36956edde9ed1cbf547a46d33d078e5665f743 SHA512 e28ff19187ea6c4b00f517ae4a0271512947e1e88be71a74d2bf0a5fa22e7e48451890517425e42c57507b5c31f50ea045a693a32cd7fd1338078ac727686262
 DIST github.com%2Fgoogle%2Fcertificate-transparency-go%2F@v%2Fv1.1.0.mod 2973 BLAKE2B 9f6e350d37e83d53df485e6121978b912346d5e7d51975367112287ab8367849370aad195a09eb9cb16c0eb30625d2934bb9b5e35b7b5e507f1b229a6f1d20e6 SHA512 08fc1b8c6ba361e20b92095021c1552007d69d118d69fecc8ba0c7ea064daf7d4f84152d53fbc45fec332ca964e2a4f11ea584284a0395517d511f30333c7d61
+DIST github.com%2Fgoogle%2Fcertificate-transparency-go%2F@v%2Fv1.1.2-0.20210422104406-9f33727a7a18.mod 1000 BLAKE2B 1bad0b255179ba7ef06cbe6cb902faf8d2b8abb0d896057d33af1a7f80cf646ec6d75acb5c10a56dabf6b50c81e4e88920216575fa463f3b302ffb359b066a86 SHA512 b74b37a0dc154a0f2bf94a631d3537bf0c7db84655caf46571491658b0ca9e69df6864174d673a465134c1f9b296d333a9d3c31e8f9a98e5d74999c1117e01a2
+DIST github.com%2Fgoogle%2Fcertificate-transparency-go%2F@v%2Fv1.1.2-0.20210512142713-bed466244fa6.mod 937 BLAKE2B 78ebda8259fef824fb04916b7893c0f1a1f19832746f963dd374f2dfa27cee8db261edb02b03ec9533f82930971c644cd62eb86c8435c55b211d7711f2f73985 SHA512 93c8ea9923e7d655055adcb4c41e76f48fec08618af68eb0ab25514d441b6932241784556783cef1adc8669c7834671f8c68a390c71288b5a85cd17a022f12b1
+DIST github.com%2Fgoogle%2Fcertificate-transparency-go%2F@v%2Fv1.1.2-0.20210623111010-a50f74f4ce95.mod 913 BLAKE2B 165f7e82bf1545925e182e253121fab03d3ffd0edf9106e38a7e09812598946aad81bffde996512afc51b03cddb7b2bb2789617bcc134a430b1f11b85f70beb9 SHA512 7e8d431664abb9dc653aa085b07725e1fb6a03d63e21e198d2b3f3380280c916e2537a677b59c242e9788fb62c5442f6b15c6cb2cb33a0dfa1e2a16efe806c9b
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip 99332 BLAKE2B d95e04036796b0687ccfe18e2cae196efa87fbfe7a763a219860a82117f5a7ac594af005d67698289a9fa0f19b9c397f850ebcc8f6b2e2390fcc6463e95dd47a SHA512 6922e27a1a67c4e858880ca338f68ed80bc01175801b2194a900ba265c00eb482c29e785c564e9afb8f60288593b315ae8af6c8f366d35475678003440115d26
@@ -484,15 +608,26 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod 105 BLAKE2B ffd22df03c1b351f
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip 130974 BLAKE2B 6e4efb8abb584c3839c7b1ab80c8060c125b695bddddd44c57f72c0fbf9de85d40595ecff57f57ddb533e34dbe72a95e0e8043d91d462d68818699f194766e90 SHA512 9cff1690cb177e70b1d67ddd305e4317e3d1ef2825f5f3ed4639210f7f2ee6e89ff03970495757b922f16fade5fafae5cc14c8da2b95694faa3fa48c63f3313d
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip 132988 BLAKE2B 48845d9df9bc0766f93a141ddc1989fcf850d76273824d62ee11297774703bed33b1dcbe77817b6eb417769ed11249d8089d248631a8c6669a75a6d34e048653 SHA512 22df4fc49c44a1e73eb72295195633bc04b67fda27df452893ae77932879b62b344455b880972e78022a61dafb30eba8b5b6a872f6c66e093323fd5d1c086466
 DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod 35 BLAKE2B 87a5884f51a766419a5bfaca4d6b317f2e86680e7347d29dba287e4c2004db6b8a8afcb2b2b8145cc3f9a502b768105eab89ba0f3e99db44427fd3eab9d3ac8c SHA512 6d285a58dc91fb57f990b76b3c2634247bee990ec1bb3e0f11b19fe1edb3b9b1998030def12b20a6f05c574965ddcefda6883121f5aae70c695e031e72425178
+DIST github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.mod 428 BLAKE2B e78c1cfae3615c6b7062d74c18a8695fa0f35af0b2dd545bf6f5f5d4ce5a3f334b7abf2a0526061b174b4ac0b458d59dbed25c00d4a63b71e25d4a98821ae524 SHA512 7d2a20a54c885207facafd3e6ab18698e102c9ec564daa2864e39ed887f88df20c6b37488185fc829685198ab628de978a7a99a0a07611d4ef6256f1a5ebc7c2
+DIST github.com%2Fgoogle%2Fgo-licenses%2F@v%2Fv0.0.0-20210329231322-ce1d9163b77d.mod 616 BLAKE2B 740f0efe1653250044e33a95671b51807081534d713cbf71a4d6d09afef71fc99d6252a234d81cf516c062ed33014a1eff585f6b6e6f99fe872c359cc54c0734 SHA512 7b1261d5444a0c062dc03d0a5861acd92f0bd34b3a796576738bbb1a7ab3ea5e327073f3ca5edfbd740a0b33b5e59d29253e0fb4fbeadd72b4829450f4a311f6
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 9151 BLAKE2B 853a982f1c3b2b60fb44e3da969f7cdbeb6e5214c549e47dee57329a9c93c8786bcb2af6e3aab5f7aacf0bf0c70beb26f95c42b796cc2cff5b9b825040cf5a11 SHA512 e13c7622fe1c4ba73fe147255c02d6828f5d5deaea74ee14a97dd689819547b913caef4721838a68490991c710156307cf0487866d200021cf9d774a4600e52e
+DIST github.com%2Fgoogle%2Fgo-replayers%2Fgrpcreplay%2F@v%2Fv0.1.0.mod 355 BLAKE2B a8d1fc49f0ce942f92bc9eaa5e21ae9290db26f96f1a924f09574293f502473896b595dc4fb588657a4d3cda1ba16831ec235b46a96c8b4ce0824c963ba159f8 SHA512 be86403e513712f8901d0a190d46a2822a3a061deaf72d5e635ecb9f9174391327086e954b125e3d2f8b53d67c805080e69889cdf0f4f2379b9d0f71acaa93cb
+DIST github.com%2Fgoogle%2Fgo-replayers%2Fhttpreplay%2F@v%2Fv0.1.0.mod 266 BLAKE2B 895883ae524c22d9d9d81f5bbc516745d0387e27c885070fde62950e8beccd8039be1b879d74d6e0c8b89564673fcead225d5c3f859a1849d333c83e4f19a137 SHA512 fe4d4c1f4dce02486a464f54257f19785b57d6e4a3dabcddbf16bce062956b85b4d7f6965d6f4821030d4a3b83585367df60319ca4c97416cab9ea41b81ac579
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Flicenseclassifier%2F@v%2Fv0.0.0-20210325184830-bb04aff29e72.mod 179 BLAKE2B bfc73ff2a7fedaf6ca6c61c2281c2163fa8c5f2dca5f2680bb26152529bb3596221f4f289578c8e8f1fdde418cba2ac4bff630d2523693f712f9ce462655e2d6 SHA512 555736791c0c083aa7c99d1c74609c5de178f4c6c6aae5e8febf479fa07d0bd6b3aefe219f21966e178453decff620b474692c6c0ae0deb8833ee98855f8f1d4
 DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.1-0.20190517191504-25dcb96d9e51+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
 DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod 106 BLAKE2B 642b1dc88eac799a72044e1cb20ff58c99820a1c82b9fb48db65abad1f4e8609c884ce2b94283b29a88567d6f05974640dc4af3475e394ad106670085fd2e580 SHA512 0e7277a311af830264de9ebf0771f9067ae479da8131a02d6528cda56628ea3d8a50af2d76f718da5b9f51de989424f79bd9f7d58825a8d5cf958f2fd02797fa
+DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod 106 BLAKE2B 642b1dc88eac799a72044e1cb20ff58c99820a1c82b9fb48db65abad1f4e8609c884ce2b94283b29a88567d6f05974640dc4af3475e394ad106670085fd2e580 SHA512 0e7277a311af830264de9ebf0771f9067ae479da8131a02d6528cda56628ea3d8a50af2d76f718da5b9f51de989424f79bd9f7d58825a8d5cf958f2fd02797fa
+DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.2.1.mod 325 BLAKE2B 1fc1dac97ee3aec3b241e5b53ed78c8ec01d33b391e3cba3e21e2e12bd2a7e65e9a61f6bf7a62bcef43e39d4832982d1591efe915ce6ee56724eb9e9f34a158c SHA512 06c412e77ce3fec3f136d9992f5187ffc6ace7a80dead0dbc0c97f289a66a65afb3fd6f43e9de8686d757e2aacdf783f231c676dc6e017ee26ddd731bbd39598
 DIST github.com%2Fgoogle%2Fmonologue%2F@v%2Fv0.0.0-20190606152607-4b11a32b5934.mod 35 BLAKE2B b9ac98a27ded910673525eca5d11db110623ec84feaf66d635fbf1631a51000251d97632e9caa4812b9936e2a59a20ac9d3dc668143b4aa7bbdc1f7860f070d2 SHA512 65f883f59ae891044cc86dfbb0f1a72ee47f11440268538b04463ca0e8a17829797ca4bb81ae3a8a65aed992b1286bfdab9560a453377b8c90130183d160b067
 DIST github.com%2Fgoogle%2Fmonologue%2F@v%2Fv0.0.0-20191220140058-35abc9683a6c.mod 35 BLAKE2B b9ac98a27ded910673525eca5d11db110623ec84feaf66d635fbf1631a51000251d97632e9caa4812b9936e2a59a20ac9d3dc668143b4aa7bbdc1f7860f070d2 SHA512 65f883f59ae891044cc86dfbb0f1a72ee47f11440268538b04463ca0e8a17829797ca4bb81ae3a8a65aed992b1286bfdab9560a453377b8c90130183d160b067
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
@@ -503,17 +638,34 @@ DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod 3
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201009210932-67992a1a5a35.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201218002935-b9804c9f04c2.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
 DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
+DIST github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.mod 219 BLAKE2B ab8e45112351fe2aa594f8f731c1143df4968325b27261dd448d76abf79322cc2a09ec59b566ff23a3df43f43e29099c03e14e3ddf6488d54f273e0fdb4f2335 SHA512 adbc2847756f54e409ff819dd33a1fcd3d5e4ca9f91a086526123d4396d337a884d6dece83960442b21359b978e7e66335a85e2187d62abe1195e5850f3daa25
+DIST github.com%2Fgoogle%2Fsubcommands%2F@v%2Fv1.0.1.mod 37 BLAKE2B 889b8d124501cd0e4e911f4778d36265620b7e42c785ffe0c3a80121f8a283bac29eeef29697a90e176a08665b5482a3b45b85c29cc002f1e69ce6586e8730c3 SHA512 907a01931662330c0a6698ae295bd892db2385a82d60a647096a25c33f541c2a7a770bd52ab2358d61e3464ee8fba19307462c7e8471523b950311d6c8e03470
 DIST github.com%2Fgoogle%2Ftrillian%2F@v%2Fv1.2.2-0.20190612132142-05461f4df60a.mod 34 BLAKE2B 106f1adca1c223780b2f1a67a3ce95b31f07b71411d936342b35f2accb0f6b157e0ab3c7a99090767d7b43755be54ef37f6d593132be714f8cee4a86bea41c85 SHA512 2a0f8a8c59a4f29eee354dc0b03769781f9158e0aa688a878828e78bba8b7a978b550d2672cf783a4eb0db4c0a34da28748b8f97e53ad64df6a724288a02d78c
+DIST github.com%2Fgoogle%2Ftrillian%2F@v%2Fv1.3.14-0.20210409160123-c5ea3abd4a41.mod 1950 BLAKE2B 611ea888f53263902717d85886521b19fe73ce6a9744f852fa0349c5cda05e99737128b3997134a6bb7d462568633dbd433c85a72299b5901f4d7b2d840ffa5c SHA512 6b9052e85ddb67b9fb3eeadc202b8add52e895758822e7fc83461742891d155ff8a0f4edcd45cdb35bedae5b524f77a538a4abe3df6ac0bd038fc913de327e3d
+DIST github.com%2Fgoogle%2Ftrillian%2F@v%2Fv1.3.14-0.20210511103300-67b5f349eefa.mod 1524 BLAKE2B 995d3506811928604482b2cf8a3f388ca919f39529f697d459f5701394002fae06ffeef5b2857c25abac6904feaeb6fac684d52608fe486ebeba21b32bce8397 SHA512 112ed0984f5f614149a0ab8fb6ba048eeccecebc85ea4c326bf074f1a2b68634b39d6f49b6c6a93d6be6ab92dd8ec2c0afd498e546c4c818dad8f1125bc42efc
+DIST github.com%2Fgoogle%2Ftrillian%2F@v%2Fv1.3.14-0.20210622121126-870e0cdde059.mod 1492 BLAKE2B 22511d2878236025072ed4486f699704e60c804ea9bf710724bd1b249da64979a6c1a15456b276d41e762455953574d939b3b5378795d202cd5cf91ecf8dc979 SHA512 8cc56007b43c6b3863404aa490be9a2d2542ae46db30b71660e6f7a51f50d85bc7eadda09cfa5a142947f76a308fe07e87fc923fa0d91290e452a5a4261e72be
 DIST github.com%2Fgoogle%2Ftrillian-examples%2F@v%2Fv0.0.0-20190603134952-4e75ba15216c.mod 43 BLAKE2B a7f5e1eaaf8d24785c86cd272e29f606c52b5a3c966c879fe613fc358c96117e3665cb681b6f8b73906b355114a65c72c566b7456d971336d5f696766a46ea23 SHA512 2a3ee3053e16294e76136a3d10e0235949dae7f3d511bcc6084fd90636b949b06796bb59872898b91e6070cd341f334f43be9efdac215baed6bcbc3397120c0d
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv0.0.0-20161128191214-064e2069ce9c.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip 21941 BLAKE2B 94e8f4d50c0651e1bb47daf76c642871e1e3c53b725910aa101991a7a9b83b8042f76f20be54323b66b5dda1900a7fa5c3708ba0ef02fa2a72c2012efcfa1644 SHA512 eef3b3444dce760fb6cbca5e22f3fcb33fd418e2b54509e80a2150cc644f41a05a59f0acfb7fee386c994dca06d96f4cd023fa192aab368be08ef20eac4a626b
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.3.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.3.0.zip 25027 BLAKE2B c7bce22cd6fc49d4e5250a6dadae0bebb869d88fc0c7efaf22fa3345763488c9a7e5acc826b87c5001c5e53915e327c653e0a4e0bb945d601a79a40e125a775d SHA512 7160b10282b5e11df66caff015b151a1cb2f52794cd97fb0011440a6a374dcd1e88141b516ab1951de594bac0ca9401b2637c4fbcf3f9227d6fed87a21fc95aa
+DIST github.com%2Fgoogle%2Fwire%2F@v%2Fv0.3.0.mod 288 BLAKE2B 92a8bde443a63d1bc97aefd562ca23a4bc32a793629556cdb381150ce24fc43f4dbfa03458ba720b47157e08fce01f89afcd2cf7afed927c16ecb429800e4ac4 SHA512 b3b4c4f5029956b8fb2cb317445665152083227cab9436aa5eb9092596e554f197ec279b11123b744c4f170b494634a34339b2e00e2743e260516a4ce423b56e
 DIST github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.mod 36 BLAKE2B b84f97e1dc580fd7a509f321486bba195bfc339dad35ec7dcecae4b44cc20690b04077d51cb4f70466a19e7edce89a8a50043ddef355c37fb4e529b81b99efcf SHA512 3f00f698f5b9c8c859553086638f72b732a210572ab7319c1d641a29962b317e4b424ee213c2421c06ec76c70e1252d7a770f43d4c46b999c5b371017a3c54ea
 DIST github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.0+incompatible.zip 13017 BLAKE2B 2b97e9684bdaaa81d0d98e108d1db1472af1860b6fe9dc5e78fd655e742d0b659c0d7ac9672d76a7b7f5678551d2ec78c3e9c95214db82cbe7aaa8c56d6209f2 SHA512 ded7ea77161a00ae05b6d0a34a7b54ef7c08cb7974294d6ad94a3aa1a4dbd8b68f4ea57a37374ada18058e30d60f26d0fb144ce0005472f489f2e0fd7c2be86e
+DIST github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.mod 36 BLAKE2B b84f97e1dc580fd7a509f321486bba195bfc339dad35ec7dcecae4b44cc20690b04077d51cb4f70466a19e7edce89a8a50043ddef355c37fb4e529b81b99efcf SHA512 3f00f698f5b9c8c859553086638f72b732a210572ab7319c1d641a29962b317e4b424ee213c2421c06ec76c70e1252d7a770f43d4c46b999c5b371017a3c54ea
+DIST github.com%2Fgoogleapis%2Fgax-go%2F@v%2Fv2.0.2+incompatible.zip 14095 BLAKE2B 14b36bc8e9ec2be3d0bd31d578953c4d911db72a92a29f0a17553f0eeae8b35ffca3f08d5eb3fc3859432255d802624141a18425bf687628d40ee4e4584fb5a1 SHA512 e8d236722ef338098d87bf6756e151f3549220a5b153254b2d7cddb1a6fdf135b682f089f7970445396acfb378b25ed74e7a976d578695e5d44d15cedb187a68
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.3.mod 79 BLAKE2B 00b450e2752b2b87b8c630d67af470188b9c3bca1cb1b7b1d619a573f59f3cd4652a6c2dd776db493323c7152454123e2b5d532161248e025cccbc5f55528b30 SHA512 b6f6f34a079219d53b3d4aaf2bde9a5f9b6b9e3265f4acc98c19ac150b6d0c8888a519c0a17a1952f8339b93118390af403fe3a259d10f4d830c030480706059
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
@@ -522,37 +674,53 @@ DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.3.0.mod 201 BLAKE2B bc1972
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.3.0.zip 1755614 BLAKE2B 5cef0193d9a8911541aad0d2ad9e0f94a49ce88b86dcfecdd98cf84b796a545dbebdb02b645b6f37201a27a72247a8ea9d237e9fb1f4f807718f28dc71e39ce2 SHA512 59c4ef378efc864290644b3c82dda610f77315f9d33d703a61cc440316ef463c48e0f4fb2752681d342b22312694cc33bd7ad76b6e96cf568b9fe8d5af68f66b
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
+DIST github.com%2Fgordonklaus%2Fineffassign%2F@v%2Fv0.0.0-20200309095847-7953dde2c7bf.mod 42 BLAKE2B e48b0c819cbaaa372d6529301a745c9b82d90bbd01cc195a3ab0d2b523c625ad5c2769a35ef634ffa9438f57ff8000fa92782c3787f3cea811b917774e287b50 SHA512 4b35d781a7e2cb1717e525e1acf2fb08789cbb25364e2c572c3c3e20a3c4e86c44f8a3bd7f0fb10c5d4773ec32aeb714c0b1cba5b017cd8a8f13a2ad5327964c
+DIST github.com%2Fgoreleaser%2Fgoreleaser%2F@v%2Fv0.134.0.mod 1088 BLAKE2B 7ab1ecb337f07a42e4891bd8c8d648550ec4d40186a12a011114b2f160eeaed621e4792721ef7a9778d1c40e1335a2daa1077970e276777ad8f4dc4ec51149b8 SHA512 bdbe55a99c9adbe74e3b304745e6bb853088c0777a21728c72573c4df321321a60d2dfeacbb54233cf9f2dda44a11eda731a9308111a9d90652f4ee4e08e99c6
+DIST github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.2.1.mod 1016 BLAKE2B d45226538ed7b09b77290c5a40a7de93f204a2d530d29483fecb2ae7070afd408037973b6892f0a98233a07dd98f7f85bdd41b2d274a5e953b495a29cd5dfc44 SHA512 8e2a82484787980f20ce9d101032e2dc781aec6ba0d8ca9a2e944a8d5b3028b71cb4af58fceb93fac47d0a0c434c785137aec8994734acbdab5db5186ae4762c
+DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv0.0.0-20160226214623-1ea25387ff6f.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b
 DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b
 DIST github.com%2Fgorilla%2Fcsrf%2F@v%2Fv1.6.0.mod 114 BLAKE2B 615da5161a82a6671eafe81e6b9d13163a96ba28ac37c9138e841a4155bd4252d02780b16004bf34ed5cd9148d939c1df73ae5de111756048a136745da0b04b4 SHA512 b91d15dce663147faec7143ccd4a4ea0cfbe4945b71a3e695268896ac1cb060b8d48ba5e656276c8536122d979ed767a1a4c8d5db8e520ae70df8f65d1bf8c9a
 DIST github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.1.mod 35 BLAKE2B 549faba95b001f14aa66c628d300b6b0e496c92cbd87ed5814b4dbddd422df6d5d7a38af10ea061e512df4129189d221bca001f2b23ce7bbd13fa0b7152bbf4b SHA512 b4c8a43e739f69430d5004c01d083be6f65a70301adc0cbe824955a3b7b50dd2b6033fe8db18419390cb577f89533e9b0399a169f1b10ea39fb2f0c0e3cc47a9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.4.0.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
 DIST github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod 39 BLAKE2B 18dedfc007aad3087ef83c141ac6fc1835681c7f09af9a657f879e1f2bfce5e8d501113ca0e044435979b1dfb0ac5ad6954661f91118af7ff00b929076a39206 SHA512 f5596bc3919bf32ebdb9851ba6b8e5931eb88583e5129c277f6d5de4b339433ca8a180c40b1bfb44420c35cc8a01f53e4bf1cf6f0aef6f3b790590234bbebf61
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
 DIST github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.0-20190318220348-4088753ea4d3.mod 120 BLAKE2B 0734abf8ddbb6c4bd190acb4f76c5f9e3f9ece54ffe3cb9a92f6f612bbb7844b46b9ce35fe680bdf9fedd66319f629866b79f311110b33167fef23752fc6b7dd SHA512 9e85c69bafa7a9f6ea007c63ebd31f4ecbf9fce14601a8f8ca2a5832414863b7911d36d629a1f6646cf31a17ad2ee29a1acfefb76da467fd2cb13a20b7436ffc
 DIST github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.3.mod 120 BLAKE2B 0734abf8ddbb6c4bd190acb4f76c5f9e3f9ece54ffe3cb9a92f6f612bbb7844b46b9ce35fe680bdf9fedd66319f629866b79f311110b33167fef23752fc6b7dd SHA512 9e85c69bafa7a9f6ea007c63ebd31f4ecbf9fce14601a8f8ca2a5832414863b7911d36d629a1f6646cf31a17ad2ee29a1acfefb76da467fd2cb13a20b7436ffc
 DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
+DIST github.com%2Fgroob%2Ffinalizer%2F@v%2Fv0.0.0-20170707115354-4c2ed49aabda.mod 34 BLAKE2B 64a31759911ba48b0d0856ed8adff89a331b59e699cb54c8374e10e4299cb707cc8386989da34ae541e699b5548a76ff714ad50f618626f54d6505f82071275a SHA512 293a404d2bfd6d38e6572753711951646037670b85ad8a18fae21a6582c99d1cbdfacd4ebbd7e6001a3aee009d8767ada6a00191189a28f7cf09e4eaae67e4c3
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.1.0.mod 613 BLAKE2B b44c16f9b7d3d98bf2443388c993fdfa2e3ef12701a2517673d02ff1e2f8af172c59fffb5209e2bd614a94dbd7025f7f3aa4016efed8739ef60b71d21950ccbe SHA512 e5e04af7c8223f2455614409c8bc5e856b0fa66ec84289bdc96d2bbdc5d800136e93e862b10dcdacd1e8d6ebdfbcd1d56f3f9725588c92b618b09cef2557e3bd
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.2.2.mod 914 BLAKE2B a387d5c347d4a5a0d8b18a7b93b3fd3fbb1b48a6cd00a94309bb01649e24c10443fc681f0dadef77ee58e4cb2206eed524379e7a1d32a4f6815a23e58b5c9d45 SHA512 cd222c9b59f4c14a6b37b576fe682aeb075ca22664bc16393bdf8c5df553ae4aaabd5dced19b9ab687c2d882f388043ffaf61a3b5793b2b80d2e47909a0eac5f
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.3.0.mod 746 BLAKE2B 91753d65b726ac5bfc246b9b84783a9374369c8883cffc0f4a55379ce12332f6bd611f698334d5431f9f39386d076e0e4c02c1303c3e7268b4f4fbd89f8a072a SHA512 3554fb792cf0898b664445f00e1d93a7298e3a8bfef948686f13b915592715e447c3c7e1214d640a582ff0bd83ee5ef1113709c0cb202c218ba80a6534c4f7b1
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.12.1.mod 535 BLAKE2B 2be9f841d89f87d8b4d2935360953fc003863569b6caafcbfbc17fa8c3f08b480c6a565861db774a4ac3b40539c42185e00d9ab3d4611ae7a92d8bf1acc5553b SHA512 f803cd5c2d7b959df845c0c0f118573718be692698685c1e8201aaea744279aa32b4f8a930e57dbc2fcacd5872498d253849066a97dfa832a45a309569e4e992
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.12.1.zip 572297 BLAKE2B c3918b6dd0629ec238c1bb7a02c5ac5c10c5c70456a36db837be393590913c4c6d5682166f09ab84f2796686fd8040fbc5ae3a0e5b52d1ab1a2c351126f9ed3b SHA512 c26c8a84e10aabd8c58882b479be2c29811ed0230c01ee58f15f445224cbd7506920dd2e5c573a10235534bc31f712c171a08106249cea73d5404a2f0a0d4dd1
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.14.6.mod 519 BLAKE2B 3f574e68642162573325f0625a357090a156d3e54f9f2ba07290f0e3484625b2119da6a053fa9418dc42d2515b4ec13e21664a5908ca77d9865044555553fcf6 SHA512 5577fe0a28a7a35da91622ae53c167c112799783b7dd88e031162f4f59165c551ef2c8926dd80af49c25fe65a312305f5dd8402ec87bff801338b8d356cfe7cd
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.mod 588 BLAKE2B b3d6657ba787034ed2a14fdb98a7dee43e3d9dbcf253558c588f9dc550b58a294db9022d548d48717ece007f20f52f5004ccec0fe92415120f9110ccad5c9288 SHA512 6d314f14132c60d5dc614c81746fa3492dc821c77f2c0cfa90dccb3dddd5dac671682cd842d9ec4b0d03aefe1da92e5bc2275e9bfa2bbce60e8bcb8ea6bdb173
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod 46 BLAKE2B a909a61754bdc458c27211bf62b57f4ead8065bcb84511f4fc8c6fa77f56d78ca714e7e311035c1544d92f596de2fca56bcc767f9aa360d8d2cc36b7301fde21 SHA512 b1c1ceafb509b0b3c2b1c5fa0a28281880084a63a071a32f6ea4a04dcd2b2c455c9824414da7f767b1e039a079b6a40c0505a2e71991b9e737c1ba01947ea434
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.2.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fh2non%2Fparth%2F@v%2Fv0.0.0-20190131123155-b4df798d6542.mod 30 BLAKE2B 1b23384397af6f7f44ae78fb4b3c33bb4ea9b982068597a40e67839791af178f96ca280f14d56678b4cf7afdcaf0acb410a1a7a96e2ce1f6b18d945d7e4e7e8a SHA512 9ffd1d80d503a9dac8286873a705320cae5acb96f7125d76d501890702727ff34f12cdfaef33743a248574a3002a4eb8a2e86f932e7c5da72f5770186427870d
 DIST github.com%2Fh2non%2Fparth%2F@v%2Fv0.0.0-20190131123155-b4df798d6542.zip 13100 BLAKE2B 0eac7069a495b3f96395edfbeed5fe92c91e2f79f3f7fb1a6ae6e8a692c80a4e82b6b88ebb8942927f78e7d5eaa21b7297e4f0de70f6d4849f01cc67f5d90cd3 SHA512 8f04f7d4d8cdc2ab2f5976186e43da178739f8ff0f19e7aa767076393257820a0bf90ed1615db339187fed48454d2af61104ed1e390b58169447ea9dce12490a
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod 449 BLAKE2B 1fbabe18b977c8e6283312fc1f8d8b35514104080a4880afd4445b92fa20af4db49ef3f7fe1da703d4237e6bd78902e64fcc7e9d4db85e84153c2bdbc6a6366b SHA512 a6d33e281b580e5a3461edadbf4e5ebe6aa74a8a929b9f0e96582592b24c85eea1ab202457f88f648018cf5991d267811132ec77255ab4886b6ccf958487d5eb
 DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod 449 BLAKE2B b4fd520f53e935f4e33630427d57ba97a516afc5c20d4b4c62d06cefa9f77c6f2a043afacf95c9e496e8ff573c8feaa638987ffe014d4432555725a9c9f920dd SHA512 ef9f64ec39004adc78f354ecd2c614f0c76cde23549fbbd778b458699f4aa104972fb2e5c270e7e223fff6354c309873c4c3611c8d746d2045f2a69dac861830
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
 DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
 DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
 DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.4.mod 147 BLAKE2B a87a317948074210158c83c25aa1e287c613665f0008c6337a41cde6fb7e1a0758c38762d8467fa508e0178fee74781f1db49a05a388d46f8871700fa3c85c92 SHA512 7ff5a339ab0da7023d7548056aa96eaf1fa9a0a36f9deb098f99910a9a77fbab43137b6e305b35cfbc4ab9d50adabda10b53c279bc701ffdf97e928fd19c7888
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
 DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
 DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
@@ -571,6 +739,7 @@ DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
+DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.0.0.mod 34 BLAKE2B 81df5fc82ecf06f4af986fb96b311889bc5bcd3f540654d68db7dd4d9550794cc5238791bfef309e64e11bdfd87d630520f3f21c542c9c6c791c323cd8175e37 SHA512 205880e4165d85c7ee34805bfd02b5c7ff04368a7b4fd25ee1fef1968f3dd356b94125d1de4beff92b33b145009ebc49f01b57650660cdf14b81f99f1b5e2278
 DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.mod 33 BLAKE2B 1001759c50e0b825975577d6b7752503eb891aacc3d3a5642a3f338fa90091ae6de3cc81d2d7270ca7fa0ad40e01cc53bb433dfd079cf419904a1ba910014bef SHA512 3f1f76283ecc9d917de9b7061becf780dff161774eab48319d9094f08f51b7e4d82a4a068fb543ef766ba73d26346de29c6a69ac31e83f43186924aabf5b3bb4
 DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.zip 23295 BLAKE2B 7509d0d278fb0e01c8a83013382c335d0974007ed7c7637248b1bb161cc75fc9eaa8e89766acca3f11f0749413388ceb07dc11ebe894545cac98726894855928 SHA512 9201c976a637124fda2853aa9963613653165f96d9a6a4d8f100ccadc692686b168355769e643e840c0f3e44944e5ccfefc18c58157f38ab6b8acaf3f4b29953
 DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.mod 43 BLAKE2B ea72fa407faa556d4164e25aac2a8093cfdd8efdff6f68f9ebb277ddca3aa7efe0df0f22546a36fe6858c22dc638869cadcde024e32d0a930e0cf12ef5b17c7b SHA512 f6d3531d393904144d7c84cb254becfa2dad42f8695ce32e3f44789abe89d60019f01543936a64ae1728f8d395dd96bace969282e3cd9f8a9eda8085d3d1475d
@@ -583,22 +752,35 @@ DIST github.com%2Fiij%2Fdoapi%2F@v%2Fv0.0.0-20190504054126-0bbf12d6d7df.mod 28 B
 DIST github.com%2Fiij%2Fdoapi%2F@v%2Fv0.0.0-20190504054126-0bbf12d6d7df.zip 14849 BLAKE2B 5db259149a633bc2b3ea35b5040e0d85bbba51508b7bd7fff5ad7d15f76ef2a8bede59c029a2737b6723a009950e438298d2a719a656003ea2760582af985710 SHA512 ca56726b0b3c709fc09601d4f49e9ca5b1d6ca9d07422812cced5ae6dfa83335ad83ebf93fca4aa5a216aedf5c3a7f5b75643eb3ba5c76315d419f4a6480b969
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.mod 74 BLAKE2B 47557579d6c1e12c3b7dfdd9e5dd37291411cb87ff396973a0e17c97ffc79da1f6d81dec640d75cbc5e84ad9a8e17d729992c998dd614ef89a973d3cf5083b60 SHA512 2638750386491e91639a8d6e0fdd5dfe58ffca24a228d2810556b0f280839ca1489bcb47ea77adf287beb3b2d70ab2b1a664e0fd1b8b24cb3c88aea1265e47ab
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.11.zip 38997 BLAKE2B 792e9f0dee385ecc3a0d3ab507a8b73c5f08392e63964f84045200fe1b380f05ece7e61a6359f263ef8daf682aae30e5b28b53ec17d0e897c83fbbf0dfe60e56 SHA512 fe6e378cd4bb82cbda102710a11a2f183d5286651ad7c641c33c9c1f251387bc95f72a5e995e4fb12dee33c69e6d4a81321a9ea75b27135cf977cddded98ff2b
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.4.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.zip 26261 BLAKE2B 65c5f6b4f0e2af1076e279c5d3f61f7d6b8654b8a7537aa291693a784886dc68da0c40b480d881c41bc46ffb28364b90d22d88b17cd82ac8380d5ecd9777414c SHA512 448dfe08b2a5f7f2f1e9868274be4dcf7d2f2ae495994d16c74924f8059742204547ef2abfb73428afac3938e5f477a9db51b29bc76fbda32e01b67419af46af
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip 28698 BLAKE2B 76fa171ec22419b864bf42855bc0286059dbb93de9e174f8693e132679c762346b1e7ade3616404a20b8b161336d1cb2ccda1c7366a1b8d9e329a82d4c2775f5 SHA512 6dbdd7d3f35f7b6fb1088c28dc1d05bad04fc46d907273acb55e991c708e7b06f5b2db86ae2d6669f0720c3bc95816971ec4b39e897e714344817a83d9ed4583
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod 46 BLAKE2B 825c65ce0e045d5c764d3ccae81a25c6224c44656bb8ceb93f39d06a0c8d766ce7562e5ea1ceed903a5d1ad4c035e27ee84b4311548d024e108a5cd6ca142508 SHA512 324450602d8234231b0cf40b07e8936948487354b8f6e92012f3e65ba3c646b0993e4722d3867a12d0bd3749c8dd6fca4a1118393e2ca682170e500b3d54e5fd
+DIST github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.5.mod 43 BLAKE2B 3d0d2a05e01b444fd374e5fb17a44bc8e5edfd9b6f3cfb4f11c5560b5cb7ff6fd6b17a71dc4f66b1b5bae36772c4f1b78f38c4d57e56781e7a8f49e20a119181 SHA512 7b584512981122677bbdb1c18358f1ecf72f7e97f61d80c9787f0887ea456e96c3f67155fc287a8cc7ce39584cf48696dd9c3a14c98e3c3f5b3a744cc6a4cd9f
+DIST github.com%2Fjbenet%2Fgo-context%2F@v%2Fv0.0.0-20150711004518-d14ea06fba99.mod 36 BLAKE2B 3face566779516d32818939bfc87f0c24ef4b03ec89330763cb2de2ab371a6a391eb5fbf24d9619a07719f160c4f6c403dd4fbe1c650764c5e0ff43a43051aa0 SHA512 fc1cd659d6210d91ef66189a759c3850b242b76267035f38959be2b2f35283b54a61334f4416b619ff017d39646433c5a13c6b181e53bdfb28fbc3f9c35f3dbd
 DIST github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod 40 BLAKE2B c5cfc13138ded13b58e87927dab91ee13e3c849559ef067ff5dfc7886e454946daed9a9c916fc33e7ca2d090ba3e20b66d2b3d5cce1ad52455621659ada6ddcb SHA512 400eef69c141ebd20b3b38df86e95cceac1cc214b0ee7837ee84c6c0acc96097a459add9ff20622f1fc7df10e7c525fbe1b573a0b0e7597678c9a8ebe52bc564
 DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
+DIST github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.6.1.mod 346 BLAKE2B 1db4aa714a36b995098b71c763380f02f6c2ffa03338feabc9dbe2e25f3c1b543445072025b4ecb30620a69955a9004646e6d83411adef1a82a84e46309bf5fc SHA512 e838a5f65d3c782e1aab772fb1ed79d83ed4999952644803db8b5b488e4a505515d6b80d1162d886571fcaa817a32d8af1dcfea7331f1dd2813575c7369acd87
+DIST github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.8.2.mod 587 BLAKE2B ef46605eba70582e6a09536425e91bafe5e2eda48576009df600a8448fe089ece7e0ac26f84deecb0aaf004352a824dc2f5bb0b224b8fd26bea5c7046efd643a SHA512 b499fb5f87c9d50cba81d462e5d072ce5b18f3ae8d513b010d3e4027ae3a37ebb50d4c933a9747387e34c9b8f20584662f388b75a21fd5c773370ce127d9f0d3
 DIST github.com%2Fjingyugao%2Frowserrcheck%2F@v%2Fv0.0.0-20191204022205-72ab7603b68a.mod 257 BLAKE2B 08655d4897aeac7154cf70065f1c31a481b4bf2d72c7bd8ab2a0fc421b0b6f40244a3b13d0c0add7e0015b5a0e19aaaf58d735e75449ab0399bae0e3e6cb2f2f SHA512 d1c424036636449e933e87817c52b60ae1996b118127102882af08fe48202120c4c6b801c871ddf6a6ed9ad16d6ae0146fa04be4347cb168fca5b289ca0b4448
 DIST github.com%2Fjirfag%2Fgo-printf-func-name%2F@v%2Fv0.0.0-20191110105641-45db9963cdd3.mod 117 BLAKE2B d97a81b094b60d62ce0a0d449cdab7364f435be4961f24f3ef33d76fb1084c46b6865e8b4f62b68b13ae0d5c80cc2b8b06cf204bfa39bc4644e577d2d7c0b61b SHA512 9aa39816a5605b4834cae305f86ea8c9ebcda52e16b2ca13b64667ddc838caf203684e0345df4080b862e36219677cc687561b31de242e20dc67d524a3298fa7
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
 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%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod 92 BLAKE2B 8b5eebcb883871ea090297a64f2ac5171b87eb4881fab71e73fc737e2ca4c301d8fa3a14f184d5c468120ea4b3f22c89867c952795fedbea7abc9b7e618d14c1 SHA512 8361dae50e9bc2db7887bd94f516f817dfc1a3c509c776640b0f9380343236d52a3f43a5ca0093a49a4ab6b5474ec2ad24a4c8549d5949e4f5fed0b322b83c21
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.zip 195553 BLAKE2B 82dfb1c701a06e1759c91bede2d7ac9614b92909431a1619d6bbb2dc2977d7628379c6ed622b57562ff6f2a1b063f1d8bf325435c85bc66f1a684adc29011a95 SHA512 8eba43cd8e422879a1b92a672826867a89691207b99cde00ed906c4fd6fa87b5c2ba4b0e58f5f1b1dd79bf7376aa790aa18b1d3eaec4b144cc1d789ff763c4f4
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod 113 BLAKE2B 7ea9e809aab218e2d044bdd2e5994eb3489fd36cf7709613b6cc98b4c1acd6882ecb35b27cfc214779ef3fbeefc930d5803999e12440458af7d1314ec0eb2998 SHA512 50c1339c7ab002f6ceb599f51ec49717e88cc2c5ae1193fccc9431440a531dea27d54e1d0a87b987825545d106a2bbf0dbdbcfb9883fd0e8decad70d88514d68
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip 195725 BLAKE2B d41015982c16856e2ec6710fc7f4c40e7bd11f5b5dc365e8bca6c45fe5055185395724ceff5e35147ab7d493f41db1e7a1dcf90d386444367c1c04dc75abeede SHA512 133747a475094107084d3d8fdf03db36e88eb4673e7781e8779fc9e99da77ecc95dd8c22ac87e80d62cd10c2b6228be449544d1f33d22afb6b978a061b953895
+DIST github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod 209 BLAKE2B 00b0c468a857190cd26890babb3e946e9ebbe5ebf0b94ae01519ba32a96f3d99b031140d6de003caee9ca076b33736c96fe4474fb715def44f6ea1eda3ef258c SHA512 8e54b9d01e16e47686cd7aa3b4b184b61a24b7d54fb83a37897c8b76621b3f4594fa86f05b8f08908f6999862e741309c49dcd90bcc928501be084b5667ddfbc
 DIST github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.1-0.20190826204134-d7d95172beb5.mod 145 BLAKE2B f260c703eec27a229b5bf30176cfdd57dace844cf14b184d9289cf197092ce4bb5d4c878dfaa54bbe3ce23e9c28eeb35b94376001f4085e2f05d3c977b48d4c7 SHA512 b529b6f0312bf2be99646e11a339a97885716f44408714cf2c4343d5c5cf114dfe454fdfe75e9d5ddd9e0ce8c3ba451ba0d3729eb27616246c0bb72aae6d29c5
+DIST github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod 32 BLAKE2B 108af2b21e180487fb535381cee881222cd34895f1b3d78561bee6bdfee40e7b9681c74345d10881fbe519fc496181b85eb880b5ec411e13b24926a39ae8a512 SHA512 5b3e66c42da78c7df031089cc05aabe56671eeda4617683a1e9857677108cd0dec00332f5b05f29923b1314fa1d1c88e57fac1b653808cadf5a3cde93daab03e
 DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.2.2.mod 47 BLAKE2B 82b32db5fad59fe9737687b615cbf4308dda3e892b04b34369022f27141f03b55e2cf1f348a7c18f763d67eb6f2e445b89cd49c938b396584d88d2490b99c778 SHA512 fab84681255c85de89c3909b709a0d535c078ae87832eec2386b43a07d73a1913ae2801a658f7023c83907ab7d4b489c82f7a69f83ecf867f22e7a78b531fe5f
+DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod 35 BLAKE2B f55b1c507e5054287bb6637b3c799d7d56342906f680ed3f691be557e93a417204fcc5a9c1a6c62a6081b895ffbd2558d7d2cd5e064672e2cd47472a92b15a30 SHA512 75c03e33527b1b86b6355b533ae18cc7d87df77338d8627602b7af2068fb020c94cffc51c971fcba4338aa166cc6722847e3437a6db1ccf209145314d60bcb45
 DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod 44 BLAKE2B eb9ba00998f4a45590f7ab28d94adcda4e2b511ae7078f5583bfdcc792d34b6eded81b8c0f71ced35b782cd1bf344542673677915b44b9eb31873e9c5d69e133 SHA512 4d591cc0f2d11ba450f294361950972fe0dd71bdff5bb0c3e72b673cad6ea990335680bf7650093e1f9978bc8556a0ef9329ae2e8a14c10b7de668aead7afe33
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
@@ -620,16 +802,21 @@ DIST github.com%2Fjuju%2Fratelimit%2F@v%2Fv1.0.1.mod 33 BLAKE2B 529c89dc43822871
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod 51 BLAKE2B 2e102c58874af58833146011d2b9d64950522530e5bb51d643b06f98b258d7cb52efa2caa36a1fd4d39d4307a37712de7f22d45990ebab7a755b7cacedcc861f SHA512 e208321653fa4f40d2af68b6db37a368134e27463a45691a1642bfbe67186efa2a6fa41cddb3e443e465c7425d8d44cee8364953b39e1b08fc16b447431cecb3
 DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod 41 BLAKE2B e9dae477e838938303749c4e7f1d0ece371d20bfb8f0d6fbb915a9ec249b82e300ef691c2175137488065828f67b02503576420fc95c2aa40f4fda262526dc7a SHA512 ab1be2f5ee91ad8c24a7c1d3c2277506dd76f85e8511f53e923ea7e0ecba140303c9312f0ecd2e09631e2e6591ad31a3b19e900ec102b486ed9b56c38a0d0c84
+DIST github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20190725054713-01f96b0aa0cd.mod 40 BLAKE2B fcc716fd56980eec2613156eac1c731cd653369416946bf532a2ac27df56a894cd6dcdbaee1f55d6b9bf2b7215cf21c6beae58404e55fa71a666b9958e69f7c5 SHA512 208caa4a93b3f365428dbd324ac42ca09f073c4028e06427c75a1883100eb1de0031aed9a63eb283742efc0d64e7abe644000829e704891362f59dd32da40b45
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod 107 BLAKE2B cd132ab287312d1ae53abd542a75e6bdd5cecdcd46c5311be91da88d54e1a114019440b12d71a9357851585672f440dc66eaf359a99b7682ce1bd4ee03869325 SHA512 302828b5c2b6eec77f4a2ed075cd8b721da8d62a8747883d4382d5674a7c82dcea01a7de664d15d5eeba7e35b9667347dceae9b4ec93858ed3acf8adee692967
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv0.0.0-20161130080628-0de1eaf82fa3.mod 33 BLAKE2B f8dbdaafe3a686fd557b1e1dde2a10402c841a8095800b56f4a0cc180befd45bd74de0575a7e90b5202bc50faee916196baef35d80f8ea013ddc78ae416af6d9 SHA512 3bc77706ea4909ed01ac069553bde55024b7bfa1612f5065a477d44fb68bad00d7254da1ef978a1518b2704b507ce4cb360571735905c39c7b97fb3e21c64422
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.4.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.4.zip 16811818 BLAKE2B 8c54587021045b8c13f86a8e666bcdf5e975ccf5ec436d20b471a45a9e130f1f702dc20d4403dde42fa415bedd286a6e8b45473fd41488db2ee3733413312416 SHA512 fe00530375de5ff95764f96e770c98eb91deb4abcd378b81e9d62cdab107a3b87f3fb77ade17e27a09bc46042ad9f73bce933da65b7127aa1d9afa945cc025cb
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.3.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.3.zip 17429355 BLAKE2B 8a95287e031087b368ec4fd7dd27c3515e901e091f82b9eb11c1f110e66e7eeff3c80103bcbec53ab47efdd78198bd07eb7c0f8d573e2cf277fdc18a08700724 SHA512 94f9a98b33011db2d24213ecb51c701951e323d45c671bd9ea8d091de45c5e5899650a6fa120c6602e0883e637e2204f4c5e905810ac8aafcf980dd9f35ab905
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.12.3.mod 99 BLAKE2B a790a0286893e5d0584fc25403bcd8844f321921992fc719399e34291f7e2f2155dff5202c7407eb5318713e580773208fc414404c86b6daaf8a94f6e3a71575 SHA512 40bef039d92b3a13a5759f1374a7348afa3ce43e1855494c765bf7c4905a22bc6a9abc6bf7b0e8de693f525189416e50eabed20422e07c9809d55d5b43e3df91
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.13.0.mod 99 BLAKE2B a790a0286893e5d0584fc25403bcd8844f321921992fc719399e34291f7e2f2155dff5202c7407eb5318713e580773208fc414404c86b6daaf8a94f6e3a71575 SHA512 40bef039d92b3a13a5759f1374a7348afa3ce43e1855494c765bf7c4905a22bc6a9abc6bf7b0e8de693f525189416e50eabed20422e07c9809d55d5b43e3df91
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.13.0.zip 15499036 BLAKE2B ecdc723f0ae4d73a0c0dc3f526cd5d6dc6e9d7db0677dbe94494c2bd9365854105d6c3093d13140da227cd5eb391bd4efe01e05f18dec9f59a5efad6b8f880e3 SHA512 1764f630c933788887255902fcfb2fede6cd20c5b6b9250d0286e409aef86c1bbd3ba26daf3060e2df59c8d52c06fdf9a3895c02aa6d90a330fc4e06e6bffee1
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.13.4.mod 99 BLAKE2B a790a0286893e5d0584fc25403bcd8844f321921992fc719399e34291f7e2f2155dff5202c7407eb5318713e580773208fc414404c86b6daaf8a94f6e3a71575 SHA512 40bef039d92b3a13a5759f1374a7348afa3ce43e1855494c765bf7c4905a22bc6a9abc6bf7b0e8de693f525189416e50eabed20422e07c9809d55d5b43e3df91
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.13.4.zip 15541575 BLAKE2B a2b6167107a573b8f0256eb4f2f65631a2ee3bed4927b2cd63c73368acf65637798eb56ce7cc85c7b5131405efe5b578b5d486c32a674781d449d823a79e1b44 SHA512 cd19bc5426192f1b19a677550ed33a1d23877b082d6a6f73b7cee7a2beb7f6cbe98c09d25e1363f5c9fc821fa000e7c2cee46ddb6369f79b56c9be771e2f930c
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.0.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
 DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv0.0.0-20180405133222-e7e905edc00e.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
@@ -643,6 +830,8 @@ DIST github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.1.mod 46 BLAKE2B 1b395032bc
 DIST github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.1.zip 345134 BLAKE2B 07b7ffb7a6375c6ea089a0eeba9c6fbf6e5af0b08638b88caca0da0d4b9210e0360d99ac83af1ccbfee4fe2ff43ec72691c0d85ad7c180e618931937cbcaa044 SHA512 b2229cc7bd2ad216d6aadd9de35e2a5102246173b5d01416e328404fe7bc9abc8c06c8c084299ab563a0f5dfc90481c5bfbf6b40c9910999d0f38285cab3c9f1
 DIST github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.6.mod 46 BLAKE2B 1b395032bc9be34d676b49f478c04109fe1dd010544690d6c1bdacc28a17489dce66c8edf61ea9de139feae36bf393c0180dc2f6b73d54e5e0884a7fdbb25b37 SHA512 16bc59642bcbc705e57b1862066193a922b9c98b271cb1b2c3b98886b06d7d5f6e73b272e61432c809b569fd9715ec00725266f5a4954e0812855e093cd87093
 DIST github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.6.zip 350313 BLAKE2B f0bdf03749ee77433ca5fbc1ca8a317b9fed689564014d789ad6141fbfd33f09882e36b292151a331266e6ca5abb075bab8ddad286e10f6263986ec26af0df8a SHA512 483ec8c05e4c329afda49685dacaea0cf3a065e49711dce4ccce36ae00ab7c2f86a44c45e6cbf13afc950b124c838e6a8dc02414a8d43d1ab8999e5dbb4937d1
+DIST github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.9.mod 46 BLAKE2B 1b395032bc9be34d676b49f478c04109fe1dd010544690d6c1bdacc28a17489dce66c8edf61ea9de139feae36bf393c0180dc2f6b73d54e5e0884a7fdbb25b37 SHA512 16bc59642bcbc705e57b1862066193a922b9c98b271cb1b2c3b98886b06d7d5f6e73b272e61432c809b569fd9715ec00725266f5a4954e0812855e093cd87093
+DIST github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.9.zip 351398 BLAKE2B ec230bd757417694d5613341a3cce44452f474072c4c256e104cae8e4af678d0a842d8a165ff0f659f160d64a1c728a0f8ee7bc3b60c5ae0abb2632e853a1cbb SHA512 c1c7c4e02e26fc371a7a058ecc50536221979fc63d2be80929457a90a18ed6621fdab89d8cb70505bd87f87484da5721e8c8148e572f33d9c57ac8fcc1970e7f
 DIST github.com%2Fkolo%2Fxmlrpc%2F@v%2Fv0.0.0-20190717152603-07c4ee3fd181.mod 30 BLAKE2B d5459de7c13dd18d24cdda6beaf02ac341eab5353626d462bdbd22dc7fdc5f67a41b078ee1a33ea578c9f718ab78bd20ac76d76a8355918ad31aa228aae0345d SHA512 a705d6ac18dd446fb821b3e614b74a5e0e5344d618ad889839f04b1d79283eaf0397bdb9d565385cd695b5ca2288150518d54f60fedbf9a8396bb07530b016cd
 DIST github.com%2Fkolo%2Fxmlrpc%2F@v%2Fv0.0.0-20190717152603-07c4ee3fd181.zip 15992 BLAKE2B 1f74bb00322f2419639e99c1c2b8b54ec35c6f3ed32f7c6dfc66e5da429eff8dbba43c762eb7378453e5d20690390a173c6d20c728a88439d4d9993de9d9cc76 SHA512 ced432b9b38cfbe55eaa4c78a7de33fd9aba1840f229335f128cfd91799f46136ec7193bb9af23e2866892027a2002e8559894c1ae826d8a15e540c12ba0f94e
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
@@ -655,11 +844,15 @@ DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip 11508 BLAKE2B 609b34f41f3c1579ae15bbdd5f9632dd58e9082917acce355ffc5402c33ea45bb0bda32d009a0a58c6cd60327aa87008453e0c4c36ed2a1be41c4f5337de72d9 SHA512 0f792e6f960b0cb8f9a30c25d3a3f30e7c459a05d7f03f68c98cb581967fc48b377314cb83b990c9509cde5680389bee0ce2b0b1efedbceb5592f38a9ae6a3ec
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.3.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod 72 BLAKE2B 796a88b0b7d88f469e90e59f66d12a3c515e0230eb2a7ec83f00f5266266d93eea475b752677f2ec81a7c99243a5034ec1a2e9f4e23a83b61bfe6e855246b6d3 SHA512 9c13eb40018d27bb2f5623251df11cee7b8c08eaee681b4678f854d7c023bfd3885bf04ae085183c7501e637d86386a00e3a979088aaf2c37a03f732d7655a5a
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0
 DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod 46 BLAKE2B 1989fd1b186328abc02f8dcd503bf396ee63b55630d3f37f576c7e55b4c48623f62d5f2b16d047afeaa13cd423ab014f254df5f210da52535bb8818a60b375d4 SHA512 4fcffc595708aba2673e895182e695e91d6d239f8feaaaeaf15d75fcff398112af0f0d5ebdb28506d95eae30533dcbb54112ac0b0a4034ee11d7a35b78674915
 DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip 25634 BLAKE2B a236740e22b6dcadaf27ea0f90a68c15bed68599ef6cb086acfb1c555a8c0210663f165f3bc64bd9cfc20f3b8a9f1c5828a4a658699d3bda97104f759aef78b4 SHA512 a5ffd5713ddc3d9bd49ee9cbb0a8f5154bcf0eb073c9a772c24a6e11e824b2deee18425347f84b267192c52f3559086573e966fdd8e73e84fcee03c1971e1b7f
 DIST github.com%2Flabbsr0x%2Fbindman-dns-webhook%2F@v%2Fv1.0.2.mod 377 BLAKE2B 90ca00e21936e419212332067fedee1be3f4c657aaad5e450ae0024cff7f8a626321744d9cceb539453b94423946e85b473841aeae8a77cda09f752f6174e8fe SHA512 bf9b490afac3bb8c25e121b1dd749edeb01a45ea742aff3d87751ebee22d63d53ec849d0a3a8f67081cbc48d5ada675152375992873ecb08aa142d08d30f1b39
@@ -667,6 +860,7 @@ DIST github.com%2Flabbsr0x%2Fbindman-dns-webhook%2F@v%2Fv1.0.2.zip 28257 BLAKE2B
 DIST github.com%2Flabbsr0x%2Fgoh%2F@v%2Fv1.0.1.mod 154 BLAKE2B 7e9fe7a30a1c799f76d112da0195fc4b29e05b37554c968a72bdaf61b292fa51ab2d1e4eda218e2f3e6b156225b9571811d77ad95d0a9bf2d13ce78c81bb5460 SHA512 423f928f873c32dfa048d9f88fb08cd01b823b07ab4d706651059f7ef6f3ed3ba05ed5d5806e27a78e9d409b340a638e911aa688b06b8becdd8a04df2751d443
 DIST github.com%2Flabbsr0x%2Fgoh%2F@v%2Fv1.0.1.zip 10386 BLAKE2B fcc8a120e05508a28635c4d40cbfa388d54d94d3fcfd426d1c9e26772f8ede86e045973d519e3103a8bf202ddc42c69c3af1d2350e378d575d286ab8c9366077 SHA512 d5af6aaa7eac9af1d8afe072677e66912dba7e723103d4dc554713ad1e9129eb0afba813e5dff4c875db806dc4a7e310e61dae29cb56982446702a868a3c460e
 DIST github.com%2Fletsencrypt%2Fpkcs11key%2F@v%2Fv2.0.1-0.20170608213348-396559074696+incompatible.mod 40 BLAKE2B f468cc8d32acf9031d65cdbc440a5375c2a5015cb13dc94f61b4e16d14563e5b2f0edbf07ee9623bc280fe4cc305e8d7a0ed271ab8e5f73ac23a933c941fe167 SHA512 896be9cca3500de2abf70e48fe56ceb8d6111e1c56a20a7c9858ba33229359e8f82b45937ab3ab14dc2d3f17bd290cc001cd4ad94d15fb92965c1b914f0ad9e9
+DIST github.com%2Fletsencrypt%2Fpkcs11key%2Fv4%2F@v%2Fv4.0.0.mod 92 BLAKE2B f27255c2157859ce44503372848276fe767672783590130e90ff85c5f7e764702ce87dcbd46a5a51783eca0856788864b59f034ea0677c4f3ab4615862da4048 SHA512 517eddf8dce3eea40bb880121fb20bc91d47c0d74d0880606304e193f88aaa9207c7b13e8947d0f817e6cd8e47a732dd49c04337e7b30fc69edcae7df682451e
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
@@ -689,6 +883,8 @@ DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.19.3.mod 814 BLAKE2B 110bd6
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.19.3.zip 728621 BLAKE2B 74936af3fed3ccaf9ce932a8b75b5dca7c23fac9295dc69a133277da579ab9e5b6203e3dc0fbafaf8ee7fa84c514c2e347d8e527bdf466836b12d1392765b383 SHA512 791bb623c9decfb027bd450b7f789616d737ef7ddbe1b4a89b33e9167dce8b65be66820fb82171ffe30a8ace37c9ec14060cc936d33a2264f08d160aac33266d
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.21.0.mod 700 BLAKE2B 1d2fe01e10aac898d7f935c027ca19d10d8a70fb303cfeb5c0bd964050bad7df11fdd02a3930e8f176a2af0f2eaf1304c9c78076ec6195c55e8f2ef6922b6c7a SHA512 cabee55fcc16aab91c8d5f846eb831b5466919613850775d4bff988f2ffaf6debe48e05f6ba3b92de8c2555ec0336c01a49c43945c91306dda24d9953139724e
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.21.0.zip 743141 BLAKE2B 8953490366b7ac48ba701cb6e56d682c4b0da5ba7923f076bdf1f09c7b2bc7677d315e693edfe8ae1155b752ce58fbf02ace60ed316e4c205ae6120a1d151d8f SHA512 fefacec05622f519e5ce9d10eb9ea9e3b75414c122233fb21386d986692823e6510933550ad1a7b2c91cd7b2563bc56f1811f1e38cc8e2957d0b2d3e0b3ce79b
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.23.0.mod 646 BLAKE2B de936cd0ba8f001e958cf99d355750f221ef2e0d09f191d0cb2523c22a5a475afc0e8b5e91302ec23faa1595e21094a74a7d09fa02504fdd34f7431c4fcaec56 SHA512 b95fdb9bf88b21d6b216c66d8091e0b967e6924d78fad7a586497723d17c2ab69e8318f55afff453b1c3e3c8baa077c013d3f53b3c1b9edbc0c986984a7a41c9
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.23.0.zip 744542 BLAKE2B 92a778755817371999db9ff7a29ac83e530b42ba4bcc8554f7f099a69e1fc77c6b0cfd920480d0a4bf88afea602500f963eeab97f5b7c34c73065d5daf4e411c SHA512 6c89652f78922e4bf4813ce3ebcf14654a5229d3a893979352563a29e1c9bb6c49d4f157ee95b026358ea1ebdce331810bd712dd74241a8911f41fcd222f0f83
 DIST github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv0.0.0-20180621232353-2d01aacdc34a.mod 37 BLAKE2B 0d60c4f85be76a6a73bd4b6403a73e12378ceaebf9dd48bba245ab0e14e846bc1fb480671f959ff56d52c5e2b41db8de0804d4258fb4cb58d6b0c618c1401104 SHA512 6a0913935e88940258478e250207882eb1df8727e18e66419ba5d4a06a0b2c8691642ed379d4b4ef16df715893b35e59d1e967d5276e6b0ea75b1f481e852a65
 DIST github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod 37 BLAKE2B 0d60c4f85be76a6a73bd4b6403a73e12378ceaebf9dd48bba245ab0e14e846bc1fb480671f959ff56d52c5e2b41db8de0804d4258fb4cb58d6b0c618c1401104 SHA512 6a0913935e88940258478e250207882eb1df8727e18e66419ba5d4a06a0b2c8691642ed379d4b4ef16df715893b35e59d1e967d5276e6b0ea75b1f481e852a65
 DIST github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.zip 5986 BLAKE2B 2a64b2fc6c1c5ba028df7a0050bc30cbc78a6b5b15491734bf277bbc838a8e48a7cfaa7aff1714dc0db286656012f6065eee36584f69f9073ff5ecc858f397aa SHA512 1fb0eda44917fb59b299080ed300f16b6cc0123d0a45b477dbbc2b1d6aaf705a74997614b2e96bb35c4cc9ed5b076a2369d13ba3963bd55f19d87a5e69e4f777
@@ -715,37 +911,57 @@ DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.4.mod 207 BLAKE2B 5b3
 DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.4.zip 590040 BLAKE2B df415074caba9999d8583ffe6a569171b9c45b2b84cc1a14333def1f5cce3e20f62ca3a721d9d20f59e56fc952f76f59a86bf78198291273dca34173eae56534 SHA512 734a561d804aed867b4ce6c919ca94365d388c4285d0077a48ed123e71c52b9eb68d3edf49eaf3873706595eb2c3782b1636b2c3c6fb051df188ed2345abdb5d
 DIST github.com%2Fmarten-seemann%2Fqtls-go1-16%2F@v%2Fv0.1.3.mod 207 BLAKE2B 88686761625cc8faa400c84dcff15769a2dce8f2557ad34b2c3012f8f52d5f287ff8654bb0c6ddfb389afbfc8d473f5d3e707e10d281136ed20bcb7ddabc189a SHA512 cd2717403e092ca6f2083031ca3abd1d26c0b8b5c73250e6f9ecc4380ef61147a85eb98bc5d1e8879b2ff2850a3a7622c8a56b57c17b7c48cf60d4fc229258d9
 DIST github.com%2Fmarten-seemann%2Fqtls-go1-16%2F@v%2Fv0.1.3.zip 589555 BLAKE2B b875f0ca7fc05317c611a606a9bd3b0a019c0d17bd4712d50d8f14b2b5aeb8dbec1f4c04bc64165470d55b54ae98a6f1dc1cbaf4ae6a6f04c5956c44616726f7 SHA512 9f0497cc4fcbeda286c24b11441e356a3b05177161138c48fa7f958fc49f663330d989e3f266e1a63d7b4cc67644ee4b5d339dc5843df968550be04eb9708246
+DIST github.com%2Fmarten-seemann%2Fqtls-go1-16%2F@v%2Fv0.1.4.mod 207 BLAKE2B 88686761625cc8faa400c84dcff15769a2dce8f2557ad34b2c3012f8f52d5f287ff8654bb0c6ddfb389afbfc8d473f5d3e707e10d281136ed20bcb7ddabc189a SHA512 cd2717403e092ca6f2083031ca3abd1d26c0b8b5c73250e6f9ecc4380ef61147a85eb98bc5d1e8879b2ff2850a3a7622c8a56b57c17b7c48cf60d4fc229258d9
+DIST github.com%2Fmarten-seemann%2Fqtls-go1-16%2F@v%2Fv0.1.4.zip 589598 BLAKE2B 1fe2f3ba3918c35d457b474c1c1df604446b1f138f6b1d489e65410e51b1759885520769e6368d4d8bd133953501782bbd862040b71dce9d73dbae1708171723 SHA512 bf432876f4e7a3d18d2e53f65eb79ee4e69771b77016246d7ad843d54b8ffc8ee50defc7257535763e81c8692c42e3ee2bf3314039a96f0a36757c60926614e1
 DIST github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0-alpha.1.mod 207 BLAKE2B 26790fd7cb5f90eb293bf0ec24e6c5497590ffa72a70051eaaf6bc82a1ebf802b8ea394409fb230bcb28e0659c902efa5976c2a54a63a7c1ae5648c3d5fc987c SHA512 82280532642c33a1570da5459a16a5853a131af1f84851e3100cfdce6cb080c209ccf89a56c6ba67e1453aa7afae7c31f4f02784409dc727962d87094aade179
 DIST github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0-alpha.1.zip 591299 BLAKE2B 0e144a3bfccab9521b8bdaea44ab200ca4b49a16cc20cdc9e036323df4a20af50ee422e340db59c7676c9d2b1dd64d05b6741ab809787166a70fd215e1e68c26 SHA512 8ef15534e69b8da795bb5e4c3db39ade02ae9f5cda8a9e095ae3571c5628aeac9659b54d8ec0f2c7df7703bb2953a97aa88e1cbcf9e3152305ce3eabaea44888
+DIST github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0.mod 265 BLAKE2B 49ca5d356079ead8dc4a49f38f4eaf1feb67bb0cfe083d0376f024b15c523f2ddcc970c6f526b883fd8815a78308a8ec2feebf90920bb33600ddec5cc062c04d SHA512 59e5b0998f94410a46225005f90d4f9099785ed09214c93b2436e854342a5565c454d5e499c52a55de7cef6832d8a6b541d7495f332cac0aaf45df5f17d753fd
+DIST github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0.zip 596960 BLAKE2B cae1cb1cbbc71f0d1e005020e7ea701c746ee3f41b71e41a264793b0d64c7d52c6b403c11835141bdcd9b4d5ff5261642ea0591697f709b8bb64424bf9c0dfc9 SHA512 777f2f8904c4afa94535532911ac0762e5b80330ab6d961b2a3bfe73ee711d52aab20dcd6e06344e8665229b84e05bf5a69736e52029abcaff791c974f6b4ef5
 DIST github.com%2Fmatoous%2Fgodox%2F@v%2Fv0.0.0-20190911065817-5d6d842e92eb.mod 104 BLAKE2B 75db721c7244fb3093e6fd5b7dabf0bd35cf91ab1c74d77b118e90cd9950f522ac58aed60c82cc241d769aa0bf19327ad25004740ac16d180b33ed4c5f31c842 SHA512 5d973082b1d8ee636c161b64a0bc2366652a83fb3b2e5c62104025915ff2633f02fca23af35d9b5bd2483f9c4d12c2c0b42cfa2d0833c428686156659851e4ee
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip 10606 BLAKE2B d9aed996970ecc4828716e86ddbc85a7949f60ceacc7326708ce499bfc09250bc8ee336806b229a44064839e7ce34f5cb2a7607da5e82c417a737ea869f97f03 SHA512 dd1763a8d04540b3e579d397fa4888c4bd8c00c3963cfcd1fe42af7c1990ef85f9a2e2fd5c5f2c7d3e6817448df5e2237241ff5a2cda651b061cc8932e0afdca
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod 80 BLAKE2B 60990a438d80f62d28312e2ca1f07f9ce277b9d9d52ca762201f9bdb4e9bc72bf7ae95b40f1a249126f70db8f296059bce4d7a098e82d2615186e1267e51eec9 SHA512 89a2e1340f04d1aa40eacc84c94ae2723fa34d2fc5772c60bad2d7e00512adfd5f503896aee75440173037f4d50ceaeb98f7266e80284f29ce00692d15bdd2f9
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip 12838 BLAKE2B 668586a4df02fa2d5db174a4ada1245a463946d4bccdef2599b791414af4f10eb07f56c61484977eeb21499db7f9b46f8fea03feebbaae5511504c13e3f7a64d SHA512 c3104e921a94b1a424cbf6936e8e5cdf5823947132f41190c211e050c9c8b7135c7b319eee0667a2b958c9f4fda27b9cbad4436d37b512e269716249dbfbef65
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip 13690 BLAKE2B cc3568a99c03ce4ef19e52a8429b485e774eabddc3ab24315a58b149e8168c448bb1fdbaabb8e3eaea918de96cb7411caa000be4585f851edcb26cb0be9f0a7a SHA512 c39ebb2cc99a555054d55ffcefd5680292c66eed23b1ba8a3595259dc24cd42d432b558014066554308f14fc452b7a830f8b10e635d317b5f14ac0e0b24b1528
+DIST github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190610004146-91bb50d98149.mod 35 BLAKE2B 0a7015c7402b5f49d0778bb3fdd06dab38d0a0252c40d08b0e236c94b78b7d6d7970e63efd25ee038f94b0d150979c1f81753ba1d73b34cb79ae5d57f18fee2e SHA512 66fe9fc0d2bd738f679bc576f84a807e5fa393b174d1193b448a84098cf1d5f17f884d4dc7d177092d3675176ad79070d51db45b3a5e3383246710e0f63d2018
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip 8885 BLAKE2B a9d15d5bb4264391abb906ef4b8ec929ecf61d0bbc781ad37aa36e236cf92f5a97f2035c0c08bb49c85142df10ba129c4c1755ede5bc8ec71743300f60af3d47 SHA512 4430b33d70f0fe35d07aefd6320ca0d8e49b71689d93b49e021e1893f8f9f043f8a6d16705e5517a600a538b3f35fed8f14a69a985b2955e8b6f34c19605c83f
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.13.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.13.zip 8623 BLAKE2B f4cc66d4782f84b13cc940e1235b8a76acb823c5f07baf15948e7e108e79d02154c3a7ac2a87b83ffdbf2f862f35bac436038b7ed2726a09b943269dc7321b14 SHA512 ecb1ef28f64bf0d0b713be8be6b338130aa2d7ea747d3644e79de6f0593ed0e5720e8100ff37cdf90798a28955e1854672e756fe364639c04d6bcaedc4c6bbeb
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip 7026 BLAKE2B 3cebbd0bdebcd1d32b7fc618b7190b7813876a1df010d1c3ca3800c41acd64b6537e4b3e4d4a574e3eb736822a27eda7bb2fffa197063baf9a347a820573883f SHA512 829b0596279218a2fad36695fa42036f265ce79903a0f5aad27495dfc7c6a33e8bad32010e59f4dc6853f1e38fd9e9f635ca2f56adaf5ea47e4914f2a892d251
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.5.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.10.mod 47 BLAKE2B 4a848f4f2e5cc615dfc3fc62a9523eb7b3d79244393ce8203978051a34f981b0219f13f10bbae5169e03d919404f0ed6502b39c536218f8c8c8a5492561c1112 SHA512 c1a6d910b914ceef7ffea53c61f2225ebffeba2fc87c290aebdb739bf520494e35fef046eb9ced4fc9a3767523efefcce41ef5026fe11bad97c005b8e55d96f8
 DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.10.0.mod 35 BLAKE2B dfade1d4d17af2380cb103ad9a0c91ce0eb7e570f9ab98d32c8d74a9056b1ba89c44c6fbceb4a2d5e5d45bb552a18e5845b1c40d8d1efbe5a9aa87e4af0ae2cd SHA512 c929334b82e3174b98a22bcc58dffd1291e3bcea6c5f789ab36296353cafe0b09640ba7015ff559acdaef58a9212b0367bada54aa89f563c6dd4773f3220c04e
 DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod 35 BLAKE2B dfade1d4d17af2380cb103ad9a0c91ce0eb7e570f9ab98d32c8d74a9056b1ba89c44c6fbceb4a2d5e5d45bb552a18e5845b1c40d8d1efbe5a9aa87e4af0ae2cd SHA512 c929334b82e3174b98a22bcc58dffd1291e3bcea6c5f789ab36296353cafe0b09640ba7015ff559acdaef58a9212b0367bada54aa89f563c6dd4773f3220c04e
 DIST github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.0-20180219170247-931426f7535a.mod 31 BLAKE2B 01ec123858a9bf8d2e9b6b2bb8415431e5d4145cf3ce82c16522eaad6f5bcb7667e391ddc4544a3ee04a8dc9dbf3fbdfb74173da09f3a330952bb5eedbbe203e SHA512 8c099ef777c49b02a62031dbe9d4fdb18839f4b2265802ac5fc3e6c6fd1d3278dbd3bc01e8674a0b52d2d6e6a394d1d4ef7bd64f4388c68e9b81749a4228773e
+DIST github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.mod 33 BLAKE2B 1b3613d2a34c4d25694fa94356e3bcf622b385518ca02d586ed42eae5844b1902124f2fd22d6e7974b584c5b92504b3a003904cb989792827977f63835df2729 SHA512 036860f698203a0c3d9e64a488acfa6ab3f879cdc7ac792ae67c1d10c1272ccc9a98723375dd2ad9b16f5f315f33618c5a28537ac7ffa0b74ecf19e9cf7df22b
 DIST github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod 34 BLAKE2B f00bbc47239c6bb31831b7a6a0f4ebd9e8d23275c2bbb0a851ba5726c310867d0a885c16984f55874b0b7378dda94533ac49a85a8de1d28fbada63ae7e94361a SHA512 e4e9e3ebfd69fb7f182352a03999e4bf657d58f783faf2c8fd0da1d71818502e12acba43292418ab929390623c638352b9603dbda6d8feda4711a9a765a931fb
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0
+DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod 29 BLAKE2B ced49475e4e8b7199364d477553bbdf91390d5969a6840e688e9d24d70afcf28ede7ef8fc09c89f23a32bfd65bc0bf9f9b58261b693e5162189e37be03bfba2f SHA512 93e7d64e25fc66cfcf514bf546e618198e32d2c35fadaec01684e9488489b484ee402efd301435eb2f725f086ea851ff0445fcdd26775848db3494795a09183b
 DIST github.com%2Fmholt%2Facmez%2F@v%2Fv0.1.1.mod 130 BLAKE2B cb89ba05855f7264611a5d1fca4fd5753dcbb8e3917411645c811f9bf4fc187b153dc05f9f0d70abb10d21a27746f2bdc27c10587555fee6c37772d8753b3ecf SHA512 7187e399781af7ff0c146fbf643af4e705726382fa3ea7929a2e65e0b1a8dbcb1dd05651776cfa23873e3f9527e194ce0a52e31a75d6a5391f33b638d30d36ad
 DIST github.com%2Fmholt%2Facmez%2F@v%2Fv0.1.1.zip 65374 BLAKE2B 65359052b52cc3415fd46615ea450c47434b44ab8333108dfda4e2bf615e6baa109d83eb1af9d307e2f730ca68c078c77d523b4aec015ab1ecde954242c4962f SHA512 51c652e7b39be89ebcdcc27f9f2da107cfb33f7dcace2d20ca7fc50fd32bd72128204232570a3a26614b6500df292851d35b304f34804fe99ddaea531145e164
 DIST github.com%2Fmholt%2Facmez%2F@v%2Fv0.1.3.mod 130 BLAKE2B cb89ba05855f7264611a5d1fca4fd5753dcbb8e3917411645c811f9bf4fc187b153dc05f9f0d70abb10d21a27746f2bdc27c10587555fee6c37772d8753b3ecf SHA512 7187e399781af7ff0c146fbf643af4e705726382fa3ea7929a2e65e0b1a8dbcb1dd05651776cfa23873e3f9527e194ce0a52e31a75d6a5391f33b638d30d36ad
 DIST github.com%2Fmholt%2Facmez%2F@v%2Fv0.1.3.zip 65504 BLAKE2B 67f1211ee0b5e638cab97afeedb22ff4ce7e1124a1638271a31bcf16ff9c6818341d26dbe075875bc90c81e5dd8a0624516688c999495883ee8babc6b31f6d16 SHA512 537d41fb13336f7a22cdead69da26cae17639ec30ecb9bc1f7cf1ee13188413c745e4b053a1708fa18dfebce5a69c715df751dc44ebdbd66cfeaf2089475294d
+DIST github.com%2Fmholt%2Facmez%2F@v%2Fv1.0.0.mod 130 BLAKE2B cb89ba05855f7264611a5d1fca4fd5753dcbb8e3917411645c811f9bf4fc187b153dc05f9f0d70abb10d21a27746f2bdc27c10587555fee6c37772d8753b3ecf SHA512 7187e399781af7ff0c146fbf643af4e705726382fa3ea7929a2e65e0b1a8dbcb1dd05651776cfa23873e3f9527e194ce0a52e31a75d6a5391f33b638d30d36ad
+DIST github.com%2Fmholt%2Facmez%2F@v%2Fv1.0.0.zip 65491 BLAKE2B 7e4d214213c0927eda982d35eb364a0a9b2955142486fa0969d8e0da59dafad60c3d61bae8eb26775700ba5ec5c404721db5f73a3d2d843a1fd10969cf430fed SHA512 83f839b299571b73dabee73824c59995bc2672d2790efc70ebaf242bdf5ac6ba51151d719b09ab0d1d3689e2a88223c09599ba1cd570159d7ac6064315327207
 DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod 42 BLAKE2B 1d5bc998881315c3b4507519cf19774b640d614dd686c11fdd8a9ea8f75b7c361a5bfbf13e4d005e768f6d8646a774000e3eac16d817dd7ea2d04f617c7eeab3 SHA512 c3fd7d7dfbb06289594cd16f09122e73d8882153ff54e1fcdf6f7c009c244fbbd7eae3f30154207f99a06c3fdee761b74cbcc8423131f714c626556d75ecaa94
+DIST github.com%2Fmicromdm%2Fscep%2Fv2%2F@v%2Fv2.0.0.mod 794 BLAKE2B 95e0496b6beb7b3a66e0ca85c572f1ff0864c2887d1b7ca42216b007a0f234aa7a733aeb8021483bc590040cc0225d9294fc2ff45de7368d7d66fa4a84e01fe5 SHA512 cc547fab9a563096a92049c51f2ed615970888fcf07d6092a260a39dbdeff500b9a45d2a130a99c80a46072a2bba58cc1efa7617323d7901850ea5413f520e2e
+DIST github.com%2Fmicromdm%2Fscep%2Fv2%2F@v%2Fv2.0.0.zip 82279 BLAKE2B a3f9bead661190e090ad887a36b24770556aa81f76518dab1dc937d14da6b67ea5d286822f128be018ae4ee5ee9493f48fc1b8914a84e15a435d64ef271c64a5 SHA512 7d35e8cb1514cf2eae02161e19dc10bb7cd4a10aed4be4eac9ae5db8bce06e88effa3d86be7d8bb18319a864a335d916662e86410e8a37532684d37baa1e05bb
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip 210715 BLAKE2B 246ffa14da7608d3f1b0dd2969b2ac4e3f0b62fbc5060ae3e7f39d8ce5cf40d17b2c074021205513c068b33607f108f887a9cfb42b5d9f013b642e70ef85158a SHA512 c7084476120e931394480ea1ef2d4df157500e89f5e5e2fcb05329e5439bb15c99d70a2566400bb74e419984ead7197809ec6cce16c624ac42b8cfff0e222d5a
@@ -757,6 +973,7 @@ DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.42.mod 210 BLAKE2B fed94d9122ba026bcaa
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.42.zip 237178 BLAKE2B 4a6964cc5fa4e6c8aa9e50beb75abd26c63bc1dcca09ca08cd3464d3df0b19a34187f73f57d53cfdcb8c526e74514b106e23c72fb3854810f7993aeb0e49ec3a SHA512 f5787ed7f33856509140c5d4a0b9143c67be07c77cb8b3c07c9c72ea75260cd03aab32b07cefe13d86fce88d8dabc2f85a096b1e607026fa3680462e2be51d9d
 DIST github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.2.mod 40 BLAKE2B 48753014b177fb672fb4b96c34fda82fd83e7cc16c40ccf8409628f3b41f24fcc34fb0601ac8cb7869558c7d7ee97f6f1b8e6f587d696222db2f482790a628b2 SHA512 571622dd3240dc43d9119a5cbf644cebbabf134314c46ed43438be1568c871617949d07c60b8af3d22f858f7504ab91effc9bf234de84da1fbf72a936aebdbff
 DIST github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3-0.20190429190417-a667d056470f.mod 40 BLAKE2B 48753014b177fb672fb4b96c34fda82fd83e7cc16c40ccf8409628f3b41f24fcc34fb0601ac8cb7869558c7d7ee97f6f1b8e6f587d696222db2f482790a628b2 SHA512 571622dd3240dc43d9119a5cbf644cebbabf134314c46ed43438be1568c871617949d07c60b8af3d22f858f7504ab91effc9bf234de84da1fbf72a936aebdbff
+DIST github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.mod 40 BLAKE2B 48753014b177fb672fb4b96c34fda82fd83e7cc16c40ccf8409628f3b41f24fcc34fb0601ac8cb7869558c7d7ee97f6f1b8e6f587d696222db2f482790a628b2 SHA512 571622dd3240dc43d9119a5cbf644cebbabf134314c46ed43438be1568c871617949d07c60b8af3d22f858f7504ab91effc9bf234de84da1fbf72a936aebdbff
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
 DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod 91 BLAKE2B 22854387f9c0bc85c6f4b7b9c5ce8a774c10c6be0c43ec6d188b6ff2f2e394ffdedcdd1bc0b8ba0e31fa3c418cc9339a78a798beeb355032a0724b284573c38a SHA512 8858ec62f3bcef65224ee7d66bbc16c080b2ed16609c46c5c6b6d983b9f7eef9e020a2ae78a16d0226c0f02c609ec5da92565861c02a81494cd6060dd56d005b
 DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip 11210 BLAKE2B a469026ecf6a1ee2f2d56091fd90f00857cf5e57164ead9e53c15af03d10a8b737a1d2b2fc336e3e972af014dacf8f1321ee1fa1cc9dab93790fb6d03ae195ed SHA512 30b1a531823403a911d9f877352218890bbea15d82390b4561ebaa4bab09f493d49181ea5c34078c18df31b1896165e80c4862b450ef5858ed8af55b2a0c42eb
@@ -775,6 +992,8 @@ DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f7304
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip 25943 BLAKE2B 9cf08441a9bb45da31ac429a372a969a822a0c5de569352bc25403cdc3e8559a7110dd2612cc9b93c91882973aefdc70f8ddadf44c1488eb0c3f5bc62cca2b73 SHA512 43d57d9ca99ee6af49e8a39be4d65799afccc8cb077a8c5b473a9147eba30d4653a8a4cb86abce66d4c8639d1eb0d961c4a50907ce9af2b2864acb615a2ecfc8
 DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod 40 BLAKE2B 82487f50b9cfb3e87f2500b992a68361ad1971106763efb2ae4833e3a0505d6131b87aad4f994d203123b8fde60d5799afe67704ae72d36b3b4e85240ace49a6 SHA512 e7ba1cdb05cc6f30a57cdbfd08d55766cdad89875e4db393c304c5004d8907d07952b9b7f542bdec1c8b2f722fbc5d2283a8ff9cae53b6da0f3b075b8d05f60f
 DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.zip 7647 BLAKE2B c7fede2886d6150a3e79d73526fc48df4922ebedadfbadb70c4b994d58626b0c7121beeeed6c7d83c1da0d2b98e7e31e7aa46d78638ce2ca834fd84a2a4da9d9 SHA512 41f5065474e14b5df4a5c9752c61231a1d330cb1c1448b3b7a4fdf5971e5511f7445361ad008a5ac7ac5f37633cfc490d7e64e605fd3a306018001e92cedf3b0
+DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod 40 BLAKE2B 82487f50b9cfb3e87f2500b992a68361ad1971106763efb2ae4833e3a0505d6131b87aad4f994d203123b8fde60d5799afe67704ae72d36b3b4e85240ace49a6 SHA512 e7ba1cdb05cc6f30a57cdbfd08d55766cdad89875e4db393c304c5004d8907d07952b9b7f542bdec1c8b2f722fbc5d2283a8ff9cae53b6da0f3b075b8d05f60f
+DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip 8002 BLAKE2B 0a8b00c6fa6fb7ee0edbd7c64c09d542cb3b5f3171663982d5391161855f908c91d938dd38d13c66f638fd37c6729f96f195ae75ca7e4dc9baad3f15cefcf619 SHA512 39e87a715707ec9243a382b6e9a3d951234a73e6a50be0f3e15825ebfc9d9a0cdc52e9584909e2f09c852525c1de0f2c5214f6786d3352ca9a9ead579f9d35c7
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip 10936 BLAKE2B b045256d37d4973e88d0d9c6dbad7397160ddd7b3102ea8420f92be2e8c3ebf6362f350eff10b52fc7fb447d98b00f07c2bc1da3f6e442ebdb8e90103492c8c5 SHA512 e7986e7dfb362e346309cf77ee3969c2881056959e34db07d2dfa0e505106844b7424270d8f17f1a89d335071688e98b992ac81e8ffe0c98c8a0e3d145144d4c
@@ -787,6 +1006,8 @@ DIST github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20190404164649-a3c1b6c
 DIST github.com%2Fmreiferson%2Fgo-httpclient%2F@v%2Fv0.0.0-20160630210159-31f0106b4474.mod 43 BLAKE2B ff4c9b108c54fa1040ace39dd53fab92b2feb161110c0f87a9e2cafa95a22938ec6e3ec45958e25a0394583552d23a1a393766ed4eb12a0972f13d953eb4570a SHA512 d5568a21faa8f0bf90f7091bef6b024cfdd7cf979943dcd658a8026e4fd252ec2751c2ecf7f6f7e7889ace70868f96261b226af6d533f3d401b476e99d5e100b
 DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
 DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fmwitkow%2Fgo-proto-validators%2F@v%2Fv0.0.0-20180403085117-0950a7990007.mod 46 BLAKE2B eb6d812f82d09c0f2bca14997a76701539baf5a85c4f4e0820f9f59507fa8be365f4e76e918e408dc6d112dbdcc852499399cd841171031ba90b7db395475c35 SHA512 e1c1ee405af3312be2ec4866ff49f580a6052f5dd42fb1a40cd04ef3f3c8a643c5a0737ff5ad96d9525f6c823c2a7b6112b78efaed8aac426bce31081dae014e
+DIST github.com%2Fmwitkow%2Fgo-proto-validators%2F@v%2Fv0.2.0.mod 163 BLAKE2B 752fe533a693add961dfaecfef98848841bdeadebab1ffef0cb8d870cca73e31719ca54edbeab1d069b788bfcb4bfdeef523d4240cf42e1e461ff31d8395637f SHA512 03f4b1f1185c3ed8e15ac097d2c96dbd4a66563f22b4d38814f87cbfbfdfd183aeca0fc7f881812074c9381c9812f3e5b983d061ff140749e0bd824fa975dcba
 DIST github.com%2Fnamedotcom%2Fgo%2F@v%2Fv0.0.0-20180403034216-08470befbe04.mod 32 BLAKE2B a2c30f1489eee8da31831e7a160dd0a2a9d456e7c59dbb902f97daa3676b9bc12376da69ac3770ea613f3fd862eea3736d3144144d4ce426c70aeefb1d2fbeaf SHA512 e28974c60d2dc0603fa14a6a57814c4119acc44afccc63e58ba69466b23bfa2b109e0747a7ae44c84b5c9374220b7a1e840241b7d834d5b369f3a1f6e0bd2a1a
 DIST github.com%2Fnamedotcom%2Fgo%2F@v%2Fv0.0.0-20180403034216-08470befbe04.zip 16736 BLAKE2B c804c37fbecf361160022b4400118c5f13de6b480581ac134a8b38ccdee6626dace6891b39cd6363e6db2ed4f8d575db59d7868a1227f12b9ea3c78425bd016d SHA512 71d7a9f08927eee21118b27d41dc70a4c525f37f67458b5e93481f1cdbe295b07a720fb433dbe07063affbd1b15820103b7017dd5d34205e5296d50263927cf0
 DIST github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod 39 BLAKE2B 7703b0d2668b61ecc03faf6c5d2acc198afe36da786cf9b3e0c7c52a62af3acabd59f4981abe0e6c99428a0a77264712c015985be45b0b65ee03b80900ea2d91 SHA512 18998ee91dba5395b06f49ab9b9b14b8f3f6271d9bd145ef0c536b62a121d062276fa03e0af4b540b838b30d927f39ad6403a51c1ed5e7185dc52700cf79ab00
@@ -809,6 +1030,7 @@ DIST github.com%2Fneelance%2Fastrewrite%2F@v%2Fv0.0.0-20160511093645-99348263ae8
 DIST github.com%2Fneelance%2Fsourcemap%2F@v%2Fv0.0.0-20151028013722-8c68805598ab.mod 37 BLAKE2B 627af5df50cde39e7808cd6bb979e0b1d2ea9733dac6c36d7cb0475ee6b3a1e1e6c20d6c1a34a08e2e5f59c9b41d7a8488f56cf57fdfae110508a54ee8cd307f SHA512 a089301914088a4f0b1e6905a8cdd5748134d1834d0ba34b95c41bdb463dbace1b33901e727257f3b03cd8dadebce33c3301870f0b7ccf63483a71fc63a4d045
 DIST github.com%2Fnewrelic%2Fgo-agent%2F@v%2Fv2.15.0+incompatible.mod 36 BLAKE2B 60eb66359212e60d8c79a37825a04d38a44ec4ea8af92b34101cf3ae8747fb47936367c1769172b6b4ea90ba233b9faf25d677c2748ceb254979e4f22ffbedac SHA512 39d756efdeef598cb80b77d5f4cb5899506def0e497c3f6b3bc575c87bfbf0199da86c3d92a51d90be730d3ac9b2761698e8c6b3a7974d2845872937f3342029
 DIST github.com%2Fngdinhtoan%2Fglide-cleanup%2F@v%2Fv0.2.0.mod 43 BLAKE2B ece48307ffab9cdcb36ff0b4b2174e235396fa8e5057e30edee6d17c1d3e603d5997261c4eb180d5898e2e468e6fa2a7b8b0740dfee019d1991f50604b680445 SHA512 d60b18a90945276c5ad4be80298abf955c160c3c37d289e038700d5941e18f6c6ce9afeb04adcef1b8d76191c7d430815b5f2ded1efd05fc5c835a0b8b32c0ef
+DIST github.com%2Fnishanths%2Fpredeclared%2F@v%2Fv0.0.0-20200524104333-86fad755b4d3.mod 112 BLAKE2B 5c969bb54e4be590e0327485ad8067914cfdf94ba66ef407acdbc0bff856fce217e7b354605e4bc28454afec83b13b56a4398c663bd3288946a03cb0f45ffda3 SHA512 2ad0c904d395e96db853470d6b287e0296f75eab93e46fa0299b0247183d5a6eda21649582e7bfc91d5f7677c1e4c42ddddbd934a028b994bc68454a252fe086
 DIST github.com%2Fnkovacs%2Fstreamquote%2F@v%2Fv0.0.0-20170412213628-49af9bddb229.mod 38 BLAKE2B 8d79ae5544eb700b505659942ce726874401d745f09108817e3d5ef9f520a3967b5f8fdae71f0206a9397ec3b298fb7531846cf6a7d66c72769f9f80d05f1187 SHA512 54cda8d52ccfb537609ca642d4b86226da9e8f9795f482137708c1e455b01e3163f0fa446442fb353fb345ade0967d9059e0a365c33bbf39551abb530f422e3f
 DIST github.com%2Fnrdcg%2Fauroradns%2F@v%2Fv1.0.0.mod 34 BLAKE2B f8cac9b50e9f1e77eb5436f61217973e8378f5e144beeaa0896511dd01eaae4852e95fd021744dd3ed7f76ab2d1d60e879911e020cbeabc1b373be1c578f8cf8 SHA512 d6532206c735e37e67281a4338a81d557d0c2a61d1e95d32116eb9c6d48147e9b18c4c1565bfac16569ca0af2dc28ea00c37b1c676952ab9b9e70131108773d3
 DIST github.com%2Fnrdcg%2Fauroradns%2F@v%2Fv1.0.1.mod 87 BLAKE2B 5526330c2665180862cde3488eb24bd725cbcc6465613b06cb1eaf2a1d9f9d02ccbc3f6fee1c71f56c4e2d0210f487dcd1c8fb8e88034362bbd8e508ac015fea SHA512 b358ce74b67a68ff3fbde609b0f6bb054cc31d089a44e0da0695fcd15b27fa964ae08b1e798de2771502fd86bbbe99078d480af70a552d11607a9e6ba65a652b
@@ -821,28 +1043,38 @@ DIST github.com%2Fnrdcg%2Fnamesilo%2F@v%2Fv0.2.1.mod 132 BLAKE2B 7360cf115d224b5
 DIST github.com%2Fnrdcg%2Fnamesilo%2F@v%2Fv0.2.1.zip 48006 BLAKE2B de663f4ed27419ba6ff621de2f93790beb007d7b78097118b536906e493bbd64c94eeea6c8decb2599e1dde4584577fd563c175b0a53604b0297d38897df1acb SHA512 efd22840d13e6a11ab29b1df2fd48b655e86f130ad62c434d205d04708efb27b1ce6e7c3f58201b9363b48449f2f57752a5a3b5fb425d936115ee115a3d52547
 DIST github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod 206 BLAKE2B 67500c3221887c3dd9f65540736ad077a412eb394a302c2dca06abe3a9313ef8fa1d42a24f5df385bab8146a2e291728bd0fc4da0069af9e6919588c630abe5c SHA512 b8aff850aff011830e02c0ad21b0c4bd70bcd09dae13d720262691299a180fa1039365a6695bf0329ad1a9dfdbd71ddf28ce51a7d3289248eef51cf472cb3a00
 DIST github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip 25231 BLAKE2B 507e1c3dcd006ed29aba002827bad1ad129a97f58fd1e5847d0cc41022716965401c5c3d4027900bdd3197caa4c0e797805a146b841bed1a80b3779fd74e3e24 SHA512 64e6ba58de56e5b305c7ce64285cef1375360e87a7fc506be637ea347b63a2a89a1b56b8db3687d16b0dd631f8faf9c107c2b473b630e450aec92cfed1040695
+DIST github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.mod 141 BLAKE2B e690296e75b3bd7a25e31adbb55351c991d61666c6ecaf13439ac29b8e0244726dc0fa4f3f5fddb9c08b24d823274f21b57157eda90809ad5f9befc2dad2c628 SHA512 e28417ec57ad5bd2062351f8fd71e3f70036a09c8033931c5598e601ad497053d768ad7a08982d8cf9ba2ea07293856f154d99b934069385a3d2befebc87b5e6
+DIST github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.zip 31499 BLAKE2B 87b7a109ab2a7780fbe9b85814b0308670d613556ee9316ead12e5b826172ad33a2f44f94020ea594709d19d1ce84ba0d480bf461a182e7dce1d21ed2ce484c6 SHA512 44bc18f913abf245a32b79bb74e8a6517be3db9ba38ecba0f019f242e1b8f7dfc776ab40edd8b9683cde5be11a074d04f975053e8684cbbb64729200999f48b5
 DIST github.com%2Foklog%2Foklog%2F@v%2Fv0.3.2.mod 30 BLAKE2B cccdd5811f1be90eb22900329526d699cb97bd2bca45cf30d8b2eb7fa1f2539f107b3f5ac4a93b4c38c44abf88d2957fb3e625d93544d9e726ed4b2f7a01a9fe SHA512 cc0a9caf1e57dcd87dc0757fb61c2b503e72195e089d758278323ceb46d06871dfc15508669ac95a470386987c6410cf72d0729140d36d9a445a038ea79155a9
 DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod 28 BLAKE2B d1f2187d0457fbf3087b388af0e41fa8c7a6c1d54c9f22fb631a144f42adf679bd372b5fc45f8d6f33d7e3cfbd57c1b7da2c4e969ae32185281390db58e9acbd SHA512 41e5c366b775318a4162bea00a6fa4e3d5a23c2ddb5c2707e4a4fb77c42855ce407429a7cf9c8e506bc79493ad5c56423c70dab081187ea6c94fbdaa0d5040d7
 DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.1.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod 96 BLAKE2B f192300c52fbe1d75a3a9c89e3d808d25f13944940475b8f2654b3e3a1205721f6a9aa553ab6293f7ea4c9e8be3d695bf7fd5fb55c35e3179cef924fd1334273 SHA512 29bf0aa6ae9cc8d66b0e1bf852534dda3a3e0e16c918be357cc8f6fec14f2d2537a94cafa1ca9cd06b64363a8f0f0d3c00dabcb5137699aced8d16af767f6ce8
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.mod 96 BLAKE2B 7014a0ac5adf29ba3e90a2ef7400121b655c47924fa0fffe686fdf4234b4e01fe92ba04e82b5153b63c8d20c8b466af03f0fd0975f5a9d6e8dc2f305e4712cef SHA512 79c65033c9ed8b95230cc1f11ae5f1684a3a0d48ca9c47bc33d46376b732be4d08a8b6d39788e388b86ec16e502e378fea4654424e81ab3fa372ff30e87bfdfb
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip 245650 BLAKE2B f917c3c8b6076add4a4cb59fcb1561b21785e9c7cd910c96f7decaeaf4f2c988566ef656925cf91842cb4218142d13f0487721c23dfd85bbdce1f847e12f1551 SHA512 bad04a31aa648777f437f3a7516549992962ef1c660694c02aee62508540c553a2ea36370b917d29a8e4510cc171d94590721c447e8878b562f55a7b0ca78f23
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod 166 BLAKE2B 8fad24303bf57553db631ffbce484b05ac3e7db117503b7ce555c55053a0550770ba6d7c6b831e3daea69a9733d98592e98f90b2e9f5b5f3020024b55c3d5cb2 SHA512 06e7e8754384929043159942b2d873ea872b974d9fae1971465592e44eeb26b072539de290adbd79402bad2a2c7fa38556a7597f5e8157e82d7576cad6b49692
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod 254 BLAKE2B 30062eca1c156d706683b2d2b88c70dee8e38da4d4bb8785c3894d7d496838f0628095fdbd020961bc619c8a653216f0efacbcceaf0909820f01d070fc1f9d9b SHA512 8a7b93a80585453b3795e1c536fa232511c6eb797125f3600ab8b1f613d9334559692425855a2ba95e329595bfdd38e8eb3588aad58aee8464f71aadc56f4fd9
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip 258725 BLAKE2B f40083a2965a442ea70d613f2fad5b4541cec4816b2ba6a28b92e6ac679d8e68a7f17a7c990b2db50583017668f355b1b242fd7019e26afc5160cd64dee96458 SHA512 42884272a9d723ca5d78c4fb5adfcba500eb4c6fc8fa22d11a2104fa36bbd4ce3c751b4a99f850c01efcacf3462fb855607bd26ece1f6182e1ddd68b29a734c4
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.2.mod 288 BLAKE2B 54894e7b679e652f482e824318ac795dc4500cdfb48a4a35f606726d99206ca9d4992f8a4199aa4bb60bfc06a95eeed797507772af168eb6884dd563da3c886c SHA512 1d886d0bb74668946d7aa2cadf770235d83447422d91a020ec2e049d19ebacb01799d9cbc22e4a2e190f205c1398a495d2069790ba30d87d8f4cc6ccd76ae04a
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.4.mod 366 BLAKE2B 4e856abba9dd7eecea1d60709494e10b84b5875047a823f05d523c2f088534ddd5a9c03213a2a49a6d3e5191a9e53f0909d9262a034055ef08cd1a469a76e276 SHA512 2be99360d5e1ad7f911dd9bfb96b08fc53ecf8ad7cb09e29798b417677b788114bf1b254ed8aefdd0e0af5d4d380fbb939070ad3190beee02ac6288867fe29cb
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.4.zip 287470 BLAKE2B af59216b4e377e4a59fe63ea849a2dba7a156ee117ea6350ae7c3c6cd20b2ca1e5347c26c9109b2bcc9dbec2ce2b3957dd922272d708cbae4e3b46d41f75aa17 SHA512 5963fb1a1373c128fa570c2e84805695ed10f6065f6aa6d121c8752bcddd718c287a04070219fd0686e5c2706e72ade578c57375d3830bb24a66718a7d6cff7a
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.zip 240603 BLAKE2B 7e8d8e71006ac015e66ccd29200ddd7a280029ef27516777a678bdd7f6b17e46d993e2f6e3e4e5b0d57e3ffa7e90622e199c3e60fbc49bf7338c64f009c0e57e SHA512 a7a5115d9cafa45cf44279dafc5e4e9a5922fea05e6e5cc3ca673130cc79fa711cb806d7c3994e81c37fe6c38c051c21939a5bfd83d7c9e6c7c5a6e25ee517c8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod 245 BLAKE2B 8ef01845f54a49336d1d911ec510a912ca5960eab195d6e193a4dd052d1e4158d2dc90a1c89749ab719e3d017decccb02a6af9e6d761016d871ea6498845f936 SHA512 2d89b68a9f4c3e3bf9d46d23d5b9f906d05a3c6ffdca50e83d2e07eb2f280707393828f8f12110cb64c28e96673b76fbc0235a6108d8ebe0064aa6fdf4d33f83
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip 167538 BLAKE2B b6ab81d8dafa47bf212bd61697aadb4f969fe78b5c0022aafa855f864db4989e4a06ac2966e4cc27a6b595eca7f09c4a171a30f8c31787f9366e278e596fd3bb SHA512 028f09b7234ad1a7a2788c4d9741e140fd4ecfeb6a9650b941577c5605512336848c86a17b011ca2bb48ebd5d34e6164ef568da4e3ca92227d39cd489025d430
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.13.0.mod 197 BLAKE2B b5a4df38443c9a98e3440ccaac22bc6ed23bfae91f553521d18ba3af06037ac145cbc7b9d7e4173429d046aeff7fc8eb517d0d1fdb7aa29059396c80b976b1ba SHA512 df0e3adffe3b888e5888e5a646023ac828e4e20d024aff2496a20c26157f56e5dbfdf577ccc4ba833f8cec9443c73a68bcf1bdbc5b5fa11182eed22832d52a29
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.13.0.zip 209427 BLAKE2B b4cfff52866694e1f6d40b45cadf2b31092f2b8c980c78f1b2aa17673024284f540050c92b63b02e76ff791b328023627bd49e4882028435c9ed0e6ca64d70e2 SHA512 0b68cbb1fafe64f2405200e1432cdb43a3119d152be7057ab5f27e1c535baa1681b815306603737608b4b1d1c5c7ab18dc31ffcc003e6c1eda24655550b693eb
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.zip 150535 BLAKE2B b9a2b9e5653d4e67b05242ea629d586206224c916e1a2a0e575d42645216e0b7d00da1288d75fadbd50cf49a65f5fcdb2ec98132710c1bb3b925356ac92a0ad0 SHA512 389a8ead0603ab417d1c471d773ab0ddb1668a7b952f990e7fcf26f9bdadf7937b8408a2976f74da10568a2726ab2ea15cd14ee4319f99c5c45b9ec4a1e5ee6e
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod 556 BLAKE2B 8e36edf565660234a9c939b93e99acfd61c30620cf45619158d5a87c102492333387de1bda35aa226695f913358a4385d1b8b768527d8a63d056ab8f13cdae61 SHA512 3c48b6f2cd9bc71efc218b11ae432776164936d4474df73510a785819c417fc894ca71f5783da77f323754ece56b681f8f1e9dacd5bf309f189997ba0b317dfb
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.8.1.mod 613 BLAKE2B 5c582ba17d40173653cf739137d0bd6cb866c34fa1f76bf8f0b96c1d05304c5ea52247ef99d6d31d5c6f41bbebdf5ad9e0fb21e275b2cb888098e0ca3ac8f30e SHA512 1a7624cfc159a3444be19238a2aacd003e1b0c6f586d3f6862adec175578e0bf40fca303049a15ae3cd96a1c61395dfded8427f867e1aed4dcca180417fd80f5
@@ -859,11 +1091,17 @@ DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod 1033 BLAKE2B a6a88217
 DIST github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod 369 BLAKE2B 96cb4a6ca9813f733a4a86753a406716bdffb636c0df7a43227c6eb5f950cf9fc8d1510a02a6ac9f75198609e377a6f4c3af16650527345d9a2d369ff6792d39 SHA512 cee2d00b0b1b1c3d09c27566af4f47243360366597b3b101656cbeb4293ee3e36c38ed046d193bc28dedfc86d36a9d24343c2b0e4f231aa74b7528e1c302617a
 DIST github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv7.0.0+incompatible.mod 36 BLAKE2B aa3c0143ce0099e48e07d3282bb4bb680612890e5011c4eb5e49c131d71447598bf13e93e6938b6982ba0450c668c2ea949b53f2ecc0848744512de232bff39a SHA512 cd96f5afd87e43290e6e74bf2828ae1636d4f905e1ffe068888bc30d1313a9e4ec752dc2dede29c75f4f1dd8e695c43acbb01c116c2b8fb62a21d123594a6b2a
 DIST github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv7.0.0+incompatible.zip 2638269 BLAKE2B 1774e973bcf8878a63fa7110c0ebb5111efa397850e1a7022394a16217fba818248bd49cf8090c08a61ad941a5454c44b4484be1fefd69dcf9585806918fe964 SHA512 9bdcb18865a426936752a2dfbc35a108a40630d5f40b7bc8940a3b4473489d97410df4ccb765a33eaab2f818f9c7662e6ff55565264225987128fd6dea26a8cd
+DIST github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.2.0.mod 80 BLAKE2B 04718a62a0874dff2d0a305cd3cc4160048fc38b45316e9453279d2437e817884bdd666fd1af6031f7e3b9e782a00248e6e98d0f0eb28c7b5c436ca6bdd1134b SHA512 9528e3b28299cc17b8e93c9314f457c1f0350313db0919ea57ed3124e80ddc5f1348eede9e8f199758d2cc256905d43e38a476d4d4f7fb7a03fbd85282abf57c
+DIST github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.mod 31 BLAKE2B 2672a50a0d2433b86cac9329ec96a520f2d426b5e04356056bd1173a3e297696c4bb6d2ba30efe34b557afa6c7c973af7267ea8d1a9d939860fb8c438863b6a7 SHA512 851f7cc28e17fbb5889fb46b71283312b4e66755e6bb6093b2170348352a68ed0c7855fdeb576160ed659563f79bf9d5af843a8c47c07c8239d4edb75e07f498
+DIST github.com%2Fotiai10%2Fcurr%2F@v%2Fv1.0.0.mod 80 BLAKE2B fb379c2984a53bfcc4c14a0a86655a7ea6a12d148aa2ce239c8c3497f6098b2f05af27cd1f8fdd8d5a04283b3b8a4234415c1472ae48ab6e65b5277fba9adcb2 SHA512 a8fb3d74f219262401918603b1944ce1d64a51f7e9cf89f4ea4aa58f9a2758637fe007741a1ca057ceecd59ebf2ad147082d00596fa35c8e4bb65f52906c0101
+DIST github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.mod 108 BLAKE2B 474e77997e73380c030b4809c8f282b643cb0da9bcd1e0b0a231aac20e8f3ec463df76824372300b199a1453ee90995e3d682ae1ac12bad05f1dbba4fc2ef517 SHA512 13789a725161311e33af6ced4e07d7b548ddaa069e34791d8c6b4f1bf29ca1653ea723f5da79953f2e2314a3d81239985882dfeb1700c3bab4a3579cf972eb4e
+DIST github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.1.mod 80 BLAKE2B 7dde564f562e2e049893762d2ddc6653434fb32cee6c9aeb6f298e90d534bde43b79814d95a9a38070c6291184e590c144433b39f4c1f27a11e3211e3e7b81a6 SHA512 0291055b9568f02df1eaa6c5d3a4cf31447e864a89a25e741471a9c2aa34cc686535bc1987e3e827934f412f2892997f9336159f13bb8c3c915b940fee8c2e6c
 DIST github.com%2Fovh%2Fgo-ovh%2F@v%2Fv0.0.0-20181109152953-ba5adb4cf014.mod 29 BLAKE2B 2d82d180af97e34712353c14a8f7f43e828f9453f0a9f50fd3532343f7f27475793c1c8ab2f8b30c0bcc44a0bde09480238f7eea4210e83fe7fa03a0601c0f5b SHA512 fda12385ad4188e0ca8a6a1b4b2c8035f4d537d23b1c30dcdc6cd55591b5d7fa7745fe30e12fcacd8b0859b9aeac8ae7d6aefc3c8d98d3def9412e1dfe61f51e
 DIST github.com%2Fovh%2Fgo-ovh%2F@v%2Fv0.0.0-20181109152953-ba5adb4cf014.zip 24599 BLAKE2B d040a7df967584a001d2277979a0847329fd1edf2a8a9c6e8d86d22da10e508891b1fa176db964cc85ae50e415eaf3dfe4ae0e18d2af905a9039867de76d656e SHA512 4b9ea67b0b2791401bdb9003da1e2c80732864f044eef359aa45d764b2e7b0ed7b69fc4c709ef9d25a12064a7f16a650611fd93d582a4649afad7315e1417e79
 DIST github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod 42 BLAKE2B 96c6dbda3f5479e2687e4dd71f0bda96d8f25d2edf4665e5e4b742c942fea4db9d879cb039442672cd9aea2d1667091355d745156911bdc21a3344fae5e52752 SHA512 64c2746a75d99c6637221fd8244cc1a07c805f055f4a1f3c1408e3b6c96471343caf438ae1b797c424d59660777011201f47f262ac7210aa81d37c6c3f28bcdd
 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
 DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod 70 BLAKE2B a94864739ead6676f2defd1020645bb86b8b77600037227aee95fe3e82070c31814fd055dad1fa16ce1a00f64f32be96a97968259ef43f70f20e8a55cb9943eb SHA512 aa2a52cf55149c10f76a8e535dc75ff9bc18b4f2515a31e8720a26a5f501459c736dc73548d2e37f348f27b78974bf0a3b18080df972eec26222fd8afbbcfabd
+DIST github.com%2Fpelletier%2Fgo-buffruneio%2F@v%2Fv0.2.0.mod 42 BLAKE2B 26e88451ad5d521cc8f48a08c91f2fd3fe6dc2e2ea084cb0012f25d8399f0e43329de5e96fd741255d910cf5a2146d3568718249980876c816a67f79e8b3290e SHA512 9f82f0d4d467420830ab8fb80ff97215e5fb47653b48d88304a6effdecabfc735f55dba9959319014ba943b2cbd27394ce86ebfba8a6d068c9c3d368f6b0cdfe
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.1.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod 153 BLAKE2B eb918832463d06e37d522e86feed16ac3efc2f6bca36524a0956920ac639f2efa6b87bf70ee22015108b4c9c7ae63eba7345b6c770568f605438863ad23fe0e9 SHA512 89b6489f7666b4eedab8c8edb345c82d42626c567d2e402a87344d18e63133f89bdb5c0f3aeca8568e8c4c76cfeac132a4b8904902f2ac47a734209d1ce814c8
@@ -876,6 +1114,7 @@ DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
 DIST github.com%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod 30 BLAKE2B f5ef9d146a30ae9c67d2f7e86eef366821045d1f7b6442681377ec8d4528e315b661373ce82bedce6dcc74bb3dd9b7b2e5d59c6d5fe6aae8302a09656bd61b04 SHA512 a8742602593700ae7d9d1bb18e567d5784239e9b158b2c9ffc0c16e1212013bb9fe49c4bdfd58fd2e61e1752b5bd0390fd6910d66e5ea8917450a3e41609d54e
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 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%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
@@ -887,9 +1126,13 @@ DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.4.mod 482 BLAKE2B 402a6fc5606c07fc947a79c61bab5535ddafb79857950ae34adbc7885db5369ad48a3c30fcc829ef692fe027ec1a8bce9644c25b7c0c72283bfe8969a4574ecb SHA512 4da31b59dd667b88601dfaacb15c4779d1f9069f686a99422552ea77e7ca960e8c806eac1e9221faa5704c53f7b3d9776ebab4b8a41f3d2a928ee436f785e55e
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod 357 BLAKE2B ade628b5e576aac499156117606ac8b2458a5b481ee77be1df4b551133a3957dbce70e8674431420c181a67dfcf886d754b927ea06d588cc3df4e10a0ab8fbc5 SHA512 7bdbda1cfee6852064c8d4b15f1037a5153bfc66b59b3555416518a225b70c1db1daca32c0a7058e90d2b0f55da3d9cbb2f5b119107b5d96a874034158a69958
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.0.mod 377 BLAKE2B dc1cdf5c083f87f165dcdfd61ba38bffecb85e0706995aeb5bc3ea3c9ae4465e86cebe7e089b4aaf1ec9f79f5b3d843db14d19b62ccdc32f09afabd41d3fede4 SHA512 01ef1e7e81764709488bca1ea7434352e33eda89dfc16aff0735cf16e774fdcf2507b3565c62c31b17c60b52abf3edb95afa0034596d4d07bd315da843d09471
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.1-0.20210603120351-253906201bda.mod 468 BLAKE2B 4ac6ec5b71271218f33b753092c494ec6dd01e73373df68af2f399d8d8ba32de0f02150c1c5fdac8518ac244391f126cdac602c63ec862bff559d76015cc78f5 SHA512 9c6244491c9a3012c4a2e575cdb361f7fa577f391ced254adfd8d567c361f073ce23ddd57a0f18ec3327189cf97ad737254c0d0ef2872085af6af7bf9dec1d72
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.10.1-0.20210603120351-253906201bda.zip 247009 BLAKE2B a1c27bb8f8a3d780c14400623d9ec05f3d4e9917e8c851a9b3f621f5f79e483ab9511607bb51599c408e5db43b8261491b2cc08eb80c0d402b89b81816389102 SHA512 534a7531d87e54e83272e544f85761d0c4644d8c7b8585dee6cf0848436da878d5559e3f00fb3464f783988ed6af4f41871699d78b4316bd5aafea1ff1e769f6
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod 468 BLAKE2B 4ac6ec5b71271218f33b753092c494ec6dd01e73373df68af2f399d8d8ba32de0f02150c1c5fdac8518ac244391f126cdac602c63ec862bff559d76015cc78f5 SHA512 9c6244491c9a3012c4a2e575cdb361f7fa577f391ced254adfd8d567c361f073ce23ddd57a0f18ec3327189cf97ad737254c0d0ef2872085af6af7bf9dec1d72
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip 240896 BLAKE2B 4745181476be50303fdf0e66ec147d643995c809a1fd969c846f656d453025f2cd67089f3065b41bede74bfcaa65e5307dd9541457ed7f7ace31b6b567e2e135 SHA512 20c4e6baf239cbc8c8a754ec1b9ee814ff29df1b41332f75f7440b27864bc28397071f3f4d60ba6ff4d0aa531b7a20857e11ecca93057784f76f03876151e8f8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod 375 BLAKE2B fdacadbb6c23350ffa04e625324420df9b523d9fe5bccd8bd1d8f6d592d7ef5a2b4620c1d16c78bbbbbba2716f3edd015cc16ae5b0c3c31e5959ed12143ff3b2 SHA512 e98ebe9ff7f5f5c893ce7a54c12b3d5b86ae1f99a5117875bfb78aa2b59d9e9a95bd54e45e1a16e8bdfa79f38192626f49366a0ea4e36a25681e7448b544b144
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.5.1.mod 612 BLAKE2B e77946b5137a632121f113e6d7b390d25891d1fdf214b7c07ee0307aa4e78f5d19e96d1f4bf01aa1d62a2b0918727db1e128fdca6b6f1daeb08632b940a3084e SHA512 46eb82a74b845f5eda8cd01e8ae182e5dec7867306b31a40cb5c6bb9df2045c3259070b57388cc7826f54ee7b9fddaf980436f74ed500ab88748a13f12b30ff8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod 569 BLAKE2B 0c975c1c48f40792b02fd8756be3b6bc044ca05725ae179445a858baed4861011ba76051aa25fb10be23c6cf14738cb9cab928418be49d8ad85211d398089ec8 SHA512 6fe81bf3c591058f2ff968b3c6656766d9d3fd74c8577b3e7cfac17e463392eed3268248237d252c98751b2f97bc7c48a8db15bfc3fbcd4afbbaca0e2970819b
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.9.0.mod 377 BLAKE2B 51ba08b9e8ab65c350bc60bf337cf786426ad6e51d2548f5358622b41608b7cec408d264ef87810da60f9ef0a7e6ca972cf048d0d5c1fb5df748f0e342d75cc6 SHA512 f325dde1f371b028a8f9e3a1464e8f90982aca72a9c262a3eab8edf752110fb1fbca55650ac48e7575a5e5ba98b371df47f2178ede11faeaafd68b0d27515641
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.9.0.zip 244293 BLAKE2B fe666ceb014052fd0aac0a092300eceec2a78a0c943e4b4890df6af74aae1c2f9134f4495374f0659d3f044b558fd5712d37decd37a542ea1e86ee847b09ff51 SHA512 136e3f1d2cd66a1d9acc5485f3838fc3ae8a201e448c5e8545dbe8f4ec22f59a19cb17d61ca978bce7f980996779ececdd04a72920e06a491e3e5e3e1bf5fbcd
@@ -905,6 +1148,7 @@ DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod 817 BLAKE2B b4cabfb93633359c6ac6dcd400484e6162bc6b609bf0edfc4a82a2cc0137edef114d0d3e9c55bc47d1abd906d9ac00f9d84f07ee7072452c570ba9f98118f4b2 SHA512 7e1b17c424c8ec889d0efb0f5a171043ac0fffb48725144836d8ac635c036e877e65f34f75055359747142051afd00374cec9e39911175adddca2c50fde4c893
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.15.0.mod 739 BLAKE2B 6a475498d76be0ec42814e1d5a932c707711b9538e8507afaa36a3ee6d26b78392f750e9553f960cd9768f3ba6a88b3d8c338b102ba48260c91b0f5b48e1cb06 SHA512 5d321367c7b93f913cb524c688dc515dfe28a0cd712665b61ac12dfebac8a67fd19ba578f8a3666b557b41670eb9f3cc718fb93ca413851552efd695859b7c4f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.15.0.zip 179538 BLAKE2B 63f0b8db91a63eeeeaca059ca5ab286c061ce89622af0a4083e1ba2456a09541eb01ca01c62d0f2c7f5e2fd6f35ce464443cfc787ccad3389099f508310f4f6f SHA512 5e715eb1efd6d64f6af867ec8c5171bbdca42881f6753e50390f59b6e68dda58976298e010ee1af178f116732f4fcea096f19d67eaf882120bd77f9290974f52
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.18.0.mod 739 BLAKE2B 6a475498d76be0ec42814e1d5a932c707711b9538e8507afaa36a3ee6d26b78392f750e9553f960cd9768f3ba6a88b3d8c338b102ba48260c91b0f5b48e1cb06 SHA512 5d321367c7b93f913cb524c688dc515dfe28a0cd712665b61ac12dfebac8a67fd19ba578f8a3666b557b41670eb9f3cc718fb93ca413851552efd695859b7c4f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod 794 BLAKE2B 91c9bb4469ac63bd98bdd1ce4d2f2cf3a233f62f6c30b1da0b2a94eb1215a975f3a19cf066c6bc5847fd1a642da6082b8377825987ab5ba21620c2ed9ef26af4 SHA512 05a0bd8a7de559925fc5ba7753d9fc80db41271fedfcd0ca3137f9620c68468c0bfb706e0b4915151657c74a5d64f52a5594736e19fa1421aa65124f551f0ddf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.zip 175437 BLAKE2B e86832a3d0eea09f43735d7b45ec2335200d530bad4981da1d7cb12939d284cd769dab8e85412482c3b58a778cc910de6f5492765ff9745ec9a03b8276440411 SHA512 979628ae2384dde963f40dca23a77bd12138dad2b8d7bdd261cba5951678cf9287c47c335d40d4e7b54b561cc3101fcbd6eb7d9b1d039dc603917dbc84c1c4ef
@@ -912,6 +1156,7 @@ DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e2
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod 693 BLAKE2B 414677e90b5a1e5e2b5b498e46386fb2fa7c93314b390bc4337c74865b6a72f8a64804e4c30aefc54515e9261cda168358d70bc533e8686cbbe0f625b8957d08 SHA512 829b3d7349806cebfad94252c09095aba4c5cbe0cb77cc124e7fc514ded1d8faf0f158d21be97911b8937ab9d330b284139275837607950ca602b3faebef146c
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod 857 BLAKE2B 4c4486d3772ba9c4ecb347940a8e6c84d650847e5e1d9f2a0165569bf062c2a2060cd01c8325221a0c59da8864881c35bcc1532acb0b52f617a02a28f4ebcce9 SHA512 17deca5d2ce10cfeaa0f8e0b1d83317023f4c9841149f9b989cedbc9ea2cdd2d05b2dec1a6323f6202290c7920a68d35da1d4b064892072fb056ba3a767129d2
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod 829 BLAKE2B 14a7c9b3754cce16715135e33ee294058d999f343d74281b9fd111a9c0a5632b90b6594d1ed220165b58614a695b2b2aae27b2ed9aa35ba1acc768ad12e46ea3 SHA512 4cb3dba50a3b47b9db735de9df4bd7b35d02464065919502bb1e17236c2f6b1bf1e74f312a8d0127d2d570344c30d58063d62031d3439f52a6dd8f47b29b9996
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180725123919-05ee40e3a273.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
@@ -925,15 +1170,19 @@ DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip 261840 BLAKE2B 0b2120e55
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod 198 BLAKE2B 954749eeaffd58f7885eff94ed89b9c933b2506dce66db05c8aa640fc7e8ff21032d855776ad091c86d43b77bd9e2d1db3cfa7b176f2984ea66c4a49b4373d9c SHA512 539fdd264ff10a459bf00eefdfcd2d3d079426cbcce7c4ecd27e1191d6392e0451804bddd5a39f7279e3c91e63a40ed882ebe1bcce7e71913d6109b7b6ba403b
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip 282768 BLAKE2B 22c62ac51bb14578571aa93f0acdecb984ca370b4617122078b28b8ec5ab4ac8cbd6e986d60335d5f9848028f51f94d8fcdae3d8b428c8d3c8196d97cb2f04db SHA512 1b73a550dfdda98e41da9ace048b230ba05bfe7518cec7b5f877c11afa58bdf9d53ad25fa848e316fcb5b25ff6eabb0a2d2688c1cfbd9642a8670b72c3f90a92
 DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
+DIST github.com%2Fpseudomuto%2Fprotoc-gen-doc%2F@v%2Fv1.4.1.mod 1076 BLAKE2B 4148d1bdd08c58548e3c7631975eeb0577c2715c2e0696dfe15a5db3f042efbbdbee1ad6aae86c38dd1730934da48199b2e639ec64292da8b3b47f192fea1a04 SHA512 4c0c03310d5f5a4dc93fe7657124e25ce340f28c543c083739c82857384ca04e468b3a427ba9bb6e4aec1bf3fe88391b5440fe68efcebf7a683b869877af6593
+DIST github.com%2Fpseudomuto%2Fprotokit%2F@v%2Fv0.2.0.mod 38 BLAKE2B fed872a80ef2f0bf2657f374efc69ec9fc00c5a173c07e1ebaaff355856630d78fbcd9874d164d1bec3d21af5845d0671e0a1d201f3d6f98b40c9332b63938b4 SHA512 5371f3acbd6042898e6b6bf1ccc42224fe6f070cc0f5d1d585a9262fce4f543fb1d2e41de18f628e9f2bfa635bee8aeda586788200ab731d2e205adfd8df1025
 DIST github.com%2Fquasilyte%2Fgo-consistent%2F@v%2Fv0.0.0-20190521200055-c6f3937de18c.mod 380 BLAKE2B d5e50ceb9388a268523bd969c58c4dcbb657248897a652fb1714f180bc5c6c84fded29702d68215f7984e4e100840c415985becd9856f6e1c4f3cf1d2be969be SHA512 a3bcbb78ac52866b5bb8ba27c58b93469ffde745ebabf78c91b06d33e9bfa4641d91afb189c75c10a66f10b8d080822fb8960719d588a1f4ed54650b3b97fa19
 DIST github.com%2Frainycape%2Fmemcache%2F@v%2Fv0.0.0-20150622160815-1031fa0ce2f2.mod 37 BLAKE2B 6f9f7bfabf21aade2c491a8aa4a57318e26aa0f5491fb449dad34390e4f3452b30ae634ed280b39a3acf66b647489ab3fd8e7c22176bc87e205b8538718e640a SHA512 08598c1c037738f47a8dc83f324d4adb81fff38c0e2f23ee7160d2452f965205a9995eb42ed4f503fc4eb67d3a9e483d30a2c00de50e274e0ea0b0b81e8ecc31
 DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.1.0.mod 45 BLAKE2B 6fe371f17a31bcd132ac67cb50052f6f3874c9f62e2d67f48d52d241026fd21e58ca9abdc15fd53cb949f79e7d40dd0c289af3849da3d4d9ff75b491e8235c10 SHA512 ea2e9a81d7720b4e11129fbdd4772be224b6e1267157c29b9d33813b6f4ae905e43c3840cf1ade6ff5f73bd22c103430a0bc882355c16715e124b442652cd4da
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod 45 BLAKE2B 6fe371f17a31bcd132ac67cb50052f6f3874c9f62e2d67f48d52d241026fd21e58ca9abdc15fd53cb949f79e7d40dd0c289af3849da3d4d9ff75b491e8235c10 SHA512 ea2e9a81d7720b4e11129fbdd4772be224b6e1267157c29b9d33813b6f4ae905e43c3840cf1ade6ff5f73bd22c103430a0bc882355c16715e124b442652cd4da
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.2.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
 DIST github.com%2Frs%2Fcors%2F@v%2Fv1.6.0.mod 26 BLAKE2B 8b06c3629b4e4371ae833fd22ee446fb963e300c42e4a92fb215f10500a826df54285a3d9718546fceef0e47f949034d0de0bf8aa9ca49150cd2d58e8272b1e0 SHA512 306c53774adbaefecb2283f1d90c11b088d9a45a29215ea7c627ec6d97027192bf5fe99a3cb473415ab47764802859ce9878e83ef38fdc4a87b4c7b0c5226a71
+DIST github.com%2Frs%2Fcors%2F@v%2Fv1.7.0.mod 26 BLAKE2B 8b06c3629b4e4371ae833fd22ee446fb963e300c42e4a92fb215f10500a826df54285a3d9718546fceef0e47f949034d0de0bf8aa9ca49150cd2d58e8272b1e0 SHA512 306c53774adbaefecb2283f1d90c11b088d9a45a29215ea7c627ec6d97027192bf5fe99a3cb473415ab47764802859ce9878e83ef38fdc4a87b4c7b0c5226a71
 DIST github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod 25 BLAKE2B 23b4d575cda8259ac3498731524edc19e21e56ca2881d58ab40adad9469eb97d94036eaecd4fa5e78558e852f4c8f4242f830c962843d14779fbef470f3f8f2b SHA512 18a8e8a8b69974b2112578bd8995f31235bcfe49c218b2d0affd6fd5d6b7938687d9f5405d4a228a2ee2960de7960496319a92a26e8b29f6076983c0d07ee66c
 DIST github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.zip 12755 BLAKE2B 3ed8de4c779bec9c9b6bfe63e2d70cd86a73f390bbd46c1da03c2d7d5e0073152c273b44a903314be7fa7a65db702cb4055e0545541a3f3a5c1b62a296748968 SHA512 0911d9b0fbf3c775aa2c1507973bfefda027364ee298ad02a1e52f86c480f4592a7e6fc84f9864030b70b9121a552ef3011437b5deddb1e7faf8ae6271741093
 DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
@@ -947,6 +1196,7 @@ DIST github.com%2Fsacloud%2Flibsacloud%2F@v%2Fv1.26.1.zip 352985 BLAKE2B 0f5e1ec
 DIST github.com%2Fsamfoo%2Fansi%2F@v%2Fv0.0.0-20160124022901-b6bd2ded7189.mod 30 BLAKE2B aaac68b939ffebebdf66ff051f43954a0450cef7812e0009cdb821669113858fbb9531121c1c355a581d8c343283200c5957108e13858c4808ba3e78603a9938 SHA512 e90c0e17e2792645cfb6cd61164c93e6a9b9abecae6f9a58df99a0eefd2e78348dd534267fc945e23c8757a6e769baf2cdf4d59fb9bd4d8ef9a26b20ef0a48a0
 DIST github.com%2Fsamfoo%2Fansi%2F@v%2Fv0.0.0-20160124022901-b6bd2ded7189.zip 7278 BLAKE2B b00c13c60dd6877a06bd301fc3797347037298eae3cb71c3a70f41df9dd7a36b1b1bfc93d928f0eb36ed54e3d21a094f93ac799dca4a0613becca0eda30ea3e3 SHA512 3c3977090a524ee9c34a43db5cf335d67dc5e7613d582d3b56ccf410f0185a984f10668275d49fc51d44f92d39270fbd84381e336a44d574bdb851656a1492a4
 DIST github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod 38 BLAKE2B ce3c91e2fcd6c3748acf0e0f6355a0af01db3c7b36a793fc07b94b1072133f7f25f4c49473bb27007ba2de7233454a3728f24eacecda76388570810e62a5d161 SHA512 54235e8bcd2f98cfbfdfe187ee4b2cc7d0efe155710474100709b1a8c2e55cc2e24a16559857fb9edf484a0b76debbcef69d5c182efe52594c9858a37b6b10f0
+DIST github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.mod 42 BLAKE2B 9e4031ac381b68e3952feeefc4919bf072f08d0fc0d815c43d3546f1405cd0d3fd439600dd9357cfcd38e2818d2fc526369cd5b393bfe7cc42d5041e67f4b8c8 SHA512 f45442b35464e13a4f02d7c7ba5aa2ba37c2af1ca61a1016db01136c2aa66ad22fe068f2c2943766365c9d30895e4eb9c0ecf4128e4850bc4843998468dab6fe
 DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
 DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
 DIST github.com%2Fsecurego%2Fgosec%2F@v%2Fv0.0.0-20191002120514-e680875ea14d.mod 830 BLAKE2B 3fe0e58e30d39e14d38ff07a8f411e46e68992aec872c5b90d098e68ca7ef22d5620a99a3f44a00ec43ce4b4a47afe9c4aa8f2b30be33ebe9dc6c3520c0cb8df SHA512 ba39611cdbb9db1aca8d5dd2cdf42dc58aa4fd68972b259bc3cb27de102f00772fbdc335e4e2e28f19782565a014548b5dc059102e476624b75e6f3f4b995dea
@@ -954,6 +1204,9 @@ DIST github.com%2Fsecurego%2Fgosec%2F@v%2Fv0.0.0-20200103095621-79fbf3af8d83.mod
 DIST github.com%2Fsecurego%2Fgosec%2F@v%2Fv0.0.0-20200106085552-9cb83e10afad.mod 893 BLAKE2B b7c4fce71eb1ae94235ec5ee140fa34606dc44d2af3e0dc98e3599e7cd6c4a196ddac0b7196c46b0838d41bd583424042cae8df68cf675a7455a9baf967ae779 SHA512 f65a6fc335e123b7e2c8672314548ff366f654e2cefc7fe5cc89952893b9c11f8f73503aa7aa9760c250cbbae53b8f96ff585f0a448e7faa1ac6bed65a3ad2f3
 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip 52931 BLAKE2B e511ef9edf7d968d848e021658001daefe7c8cc7169b1c6984ca5388fc4d6a5f54def9060483e57392711617892d21322d9de099234901bd1c251e57e6489f6b SHA512 e3d8a20d1cc351b8944579988feff39cb0aa3e1f2aacf2e2307180c25c153a0473f2a5a3ebda9d96868cb1f477ccccffdce06b117be7fa5409b2d1926b4c270a
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod 281 BLAKE2B 15a1cb67527ae81338a77cffa1432cd83c798bd7094eadfbc88a7eb79f5236690dc2d5c93e3daefedb396516c41bf05da21b5e12966f69fd2663e7621267d015 SHA512 7af123ea69147856e23249740b882d90213ccc3f19cf698d960dd5950fa3f3f72c600854c5e0bb94977e6c5eab617736dcd20e180eebf599399215ad8c5c0051
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.2.0.mod 281 BLAKE2B 15a1cb67527ae81338a77cffa1432cd83c798bd7094eadfbc88a7eb79f5236690dc2d5c93e3daefedb396516c41bf05da21b5e12966f69fd2663e7621267d015 SHA512 7af123ea69147856e23249740b882d90213ccc3f19cf698d960dd5950fa3f3f72c600854c5e0bb94977e6c5eab617736dcd20e180eebf599399215ad8c5c0051
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.2.0.zip 1350381 BLAKE2B 0fc40de0791e51b7fd7a619f85905eeec40d0b6e1b483554c064a6f0eac28d9e4d83d0a49b84554d1666ddc2dc9bf2e814c44a0491fa66a092f6518ee9a21a55 SHA512 63dc2b78fd00fbda2f5ea64f9b85637986c5fba15a35920326b70c5a89f822bd9d1310331e3543f23255835ca5fa6be39327a05504acba1002bd9568d34c66a0
 DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20180427012116-c95755e4bcd7.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
 DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20190901111213-e4ec7b275ada.mod 374 BLAKE2B 8f8e6a8c44b6851de496b625b525bfb0522f6cd98a7792392c700fd06c2eb71c81b19670785da2b8e2d723776e0f96913caf734a8a9c154f424d2ab259805a31 SHA512 6a10bcdb3f3853cb9b39cffcc91bd4fb107f4e642405f7fdd2c0630c47e50c7d0986044221d692415849b0f1502ba50bd68483f4c709920fef389ba347e2d366
 DIST github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod 29 BLAKE2B 5a64bc6a74e308dc780f55617c18661ee4a570f5c536a1d8470ae197f5bde87ba88412e360585c3e7191289a2c478ec7c96c18cdd7ab9e10fc92cb8b098281b0 SHA512 54b48a0f515bb99c21f86f0cc9dfe9e06dff5bf8de3a453b1d91816e28d04fe64a52d01c2c5a651b51cf21d328fba8f97a3cba92e23d66e229034f8aed23a545
@@ -991,6 +1244,8 @@ DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e232810
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod 301 BLAKE2B 5322be7914862368eba07f521c046dbd7580edafd47ac633116b8c9f4b61526d0d63df11ba6894223590a1ffcf4bf478c394a335c305010ca9fc18107d4e61b7 SHA512 8fe5a437a5f3f8c1ce0aff067ee261a946d946d7640aa5acf7c34b9c8c4ee65128a6421aa38bbb1feeba1339b356952ad58b4bad98f1c89ac455d94e86684a8c
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip 65802 BLAKE2B e0487985824efba7ee61c5a73df7b591d625dcda32f833ae276191cd82bec8f3db30cc2ba217d80cb56af1436b8954fcd22ed3f861c6c7fcb4a94818357bbde3 SHA512 abd13a98d10b6c996918712443edacf97ba5fcb9ece7615f59458a583130f68920dd313533ff0d8c84c6011fd2c4d221783b1250e3250b569a6ead9d7c02f7a7
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod 242 BLAKE2B 68986e3744d3ae593a16a24b6ce79876723d93cdf96c978c185b14e4fb8d73d379d4ba05e138b412973b465a76a98a458c6606137b0affdd085dbcf20851471e SHA512 ba06d3386a03812f2ce65f0597b932beb62b70b4da92974c5f5ed81c150fb71ce0285a2d9779ec8a40916870b0e4da5c2c8c5591c3687f3b8e829652a01ec1f6
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip 66939 BLAKE2B 20b3a98bf2aa70e3e1e923d1dab88b543c0a14377518497f960b5f89812f982cb09fe24158d117938c8b8f1da47ad29a330e82f5f952461cf4180fdf267aedd6 SHA512 5f7f556c264900b79a512f17005c7d3d3b1e5d26485002cfc828411e5b183b62d88cc4e3a4c0a352751ef9a561997903ea2ff4cbab419592afe0abd69977dfee
 DIST github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20160302144031-75fb7ed4208c.mod 41 BLAKE2B da40259a83c14d444c933f97bb673c4edee72b95d5c19ef021479afe2ebfb6f01bc157527214a19e35d100a6f4d353eeefc60badf51cb85dcd735a773aa5b033 SHA512 7a7b948320e1df47d23498732e5fd7e63fcd7e905299e11f74ee86a8146fe8df29dfea06abd59185810d75c7ff670e2ecba07ccc461b681a9469beafcfb7801b
 DIST github.com%2Fsmallstep%2Fassert%2F@v%2Fv0.0.0-20180720014142-de77670473b5.mod 35 BLAKE2B f411f099e83b64b58d94a4c7f7c73b5a9f6279c4c409c9d68029b58311f724de5f7826be0933bbcbcff2867da51cee0588fef9d2676195fd97de7154b852e413 SHA512 087930a63f8a2a49aee59fb30981c2bdb5701022d8f1d93f8b9611294e56825bd3dd7e8b72ab9be58c631edb05c4b4346bf65586fd6c935a8ea88a13bfca3b8d
 DIST github.com%2Fsmallstep%2Fassert%2F@v%2Fv0.0.0-20200103212524-b99dc1097b15.mod 44 BLAKE2B 318ba94a41e57bf13e65f55f5df649f48e027344ccc1edac32751cf9a274d5d6099089efd08ad4d15455d30d06a361e304d69b85d2de6ca1d325ad696ab29287 SHA512 6dd3d69b75b037bdd24be06b2027bb1b36d1a76f86eca0f2a5fbf07855ec9e0fe85a206e01305ee7ff35909c85b8a142294568ea300e978168e9b0f0155d018c
@@ -1006,9 +1261,13 @@ DIST github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.15.15.mod 1184 BLAKE2B 6414
 DIST github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.15.15.zip 17880189 BLAKE2B 84e1f3eb49595d5c95215cd982f766383737b2ba707f1bd89128c1abca390087820b5babb192649bfed6afc07a9837270ce7fd304d7ffe6d5111929225ac8751 SHA512 f4c5c93f52f4cb71caf3ca9411f244303968396bdecef65b77f41feba945f2810f90e9ef8d8fb969823ebe20815570a2a0190f4797c5dd916c57a2a149523fe6
 DIST github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.15.4.mod 1148 BLAKE2B 809c2fc150780b877d5311804f63134ad1ba386eaba4d4be3429d21f81ff48a27f1964fbb2be453686dcf3cd808b952f5a123d590f385cc640ab0bad3ff7a264 SHA512 7970bda13817620719765ab8dabb14812abef407664509e6d418e82beb8f8749e37d048a100d2a34ec810ec24631e133acb0526a7da655dbe451c99a15fea7cd
 DIST github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.15.4.zip 17777279 BLAKE2B c9278479f2518e63afd73231661c11d1da4dea18193c0c84d9d909ec8cffce16e1ffce0c8b65f16d7a374cd9f406c81e076e63765a32c73962d932a26dc49cc5 SHA512 d65385ae9233dd8f16d3c61c463a24613fe68a61bbc064118a2fe09b45e0c30942037a3cfb7cbaafec496f529cb13d8c1b2b42700db913c0c006cc34326f1da3
+DIST github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.16.0.mod 1697 BLAKE2B 15a5a319e16ef367306dcd8d812ac9e555f83951336ce2a07255dce9ec523e078f4b8d34b0a4fd79708392c4076cbd8246dce7fcc5edeb78c8aaf76b0fe2d782 SHA512 a4140039417cd289d5020e4530cee8bd348e9c5623b5d2db8e9b6f5c75cdf9752b02f1dbddbc57b8107cacfeb330288e99d98f6427c9ee45db7663a6476c3248
+DIST github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.16.4.mod 1777 BLAKE2B e605cf7d3f9b848aeb45e5545b0c2a882a09eb7180c62fda1ebc9c5f70ea4165e5646bcd37766dd048a7089ba6dc5156cd14b02075e2df062371be2a3ba7fdbc SHA512 562607815c5c84a9dbbcd5d3ed674f71b9c4a4cb981bbc61162941b0850590d5bfc80e19d7c7230a061989494deec56880d52317242d234167b055606f1be81b
+DIST github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.16.4.zip 17958511 BLAKE2B d0225b6072cdd44997bdd67387402c9163990242ce0861e675cbf62fcbaac1c0ae5d1ef7ef3b08540898fcbe73aee6ebf0e8d0c424fccb6d6bf9260cbd601c37 SHA512 8d5a78765060407a93387d751a23e4f445b79c77e7cfbadadbd7df455f0dd220862bc047822dd8d82a245f382c1e082c368d833314ce3af2a6c18614dc4676e8
 DIST github.com%2Fsmallstep%2Fcertinfo%2F@v%2Fv1.2.0.mod 2453 BLAKE2B 9e59305f109b7db54dbdf367906843f8a863889f010542be11f2b0d8eb43d23e9a6856fd9ded68484efd8d7b7cb496f3c074d327832c068616d7cd531b3fdc47 SHA512 e5908f5ac6cb39b8d5a8843f8c6cf0c286d0861f1d0e12d982ce8e440d2b523507eab2b480bfc08d0f9018b3e2729ed2db93e7bec5ac076ef58392e5b7d03030
 DIST github.com%2Fsmallstep%2Fcertinfo%2F@v%2Fv1.3.0.mod 2453 BLAKE2B 9e59305f109b7db54dbdf367906843f8a863889f010542be11f2b0d8eb43d23e9a6856fd9ded68484efd8d7b7cb496f3c074d327832c068616d7cd531b3fdc47 SHA512 e5908f5ac6cb39b8d5a8843f8c6cf0c286d0861f1d0e12d982ce8e440d2b523507eab2b480bfc08d0f9018b3e2729ed2db93e7bec5ac076ef58392e5b7d03030
 DIST github.com%2Fsmallstep%2Fcertinfo%2F@v%2Fv1.5.0.mod 143 BLAKE2B e1c89e9e00c071a75b5f2b683ec8f28c5c985042a77ae1700d777356012d008a2f6300216c54d3d7fa0106bfe00b65c99409b5c392f0651261de99667e1ac85f SHA512 98d792e5b57fc0f5fb6c823ace7a18f39654a7461227ca8d937fe8b9d8cb4693d7810e73d09042dfd48ecc0299fdf4e82d1803279768dfc073f40246946db456
+DIST github.com%2Fsmallstep%2Fcertinfo%2F@v%2Fv1.5.1.mod 173 BLAKE2B cd8a02902771ba2ca748f8f134a15a152c0ab05f550bfc2ea67b4dd47534cfd96acaf328c64911da3570aa8336000bde7a08b669f6cc3b22844e7fb48a42fb0d SHA512 c0c03828e40f594d4e0d0e00e7a5eb6affbdd2341c4fff68b4d70b5b7fb709601a1ef5ba3ec3b07268c58ec382a38690106f29248f5c304f20e794f49b99bd3e
 DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.14.2.mod 1587 BLAKE2B d053dcb2e21810e9703be70cf9226c1c57ec7c889daecfba6b0b102f34aeebc5b83dc3a037f1f31c2d0db8b0144120fc0441ec35f0e0107f0a77a07a24efb71a SHA512 0c5337caf7f1b230ef2e057d10ac4ef24a2583dad52a2da49eac3f37107da07f25c457789a94aa19528e1de225774df732cb6639726b2e2c5a344103b74622ce
 DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.14.2.zip 651430 BLAKE2B ac405a2cf355e640f128a766244b8e6843a3e70cd179b95ebd36d64d218a240d2efa9c7fff642e1e30a52631265f13d454ef4a177bc0132aed9ab6670438a6ad SHA512 5fc1840beb07290b5d0f02e4f3fb2dfcd3b0b4c6fc41fb0ab2266b694c73af4bf5a20c6d1e26e715a17382e240b87b494dab9727efa2c380261b5fbec20b5256
 DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.15.0.mod 1291 BLAKE2B 23937424336c1ca742b08acd736679929f1a7e392ab92dabdae65279001c6a32897be0682a3b41fa09edc585cb738ec89d165df621fb924766fea2d47f2d8188 SHA512 738cc8888ce23e5a0b4dea9fd6a99e5d41857d1eba8577ec4d3828362360c215b5bc326a4fe9c4b8aeb817c18075b69cc21f8ffa4c030d1f1c992f043512376c
@@ -1016,12 +1275,16 @@ DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.15.16.mod 2037 BLAKE2B e22e6db15a827
 DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.15.16.zip 1979844 BLAKE2B 86340091a192bc2e58c4585566a676ae0d6854be807209da2a7a5b9a4ea8f92ceed6496cfd85c057287c02fc9b3918adbcb9c6d8584200ba1f8970daf78793ec SHA512 76b762580b11143973c21536a46662de41fcf4ccfda43fa7495627ad7ffdb1dfd752fd91056326526c8a1f8822a95e2458ba66abab5e96937b3724d0dee868da
 DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.15.2.mod 1467 BLAKE2B 93d8bbba7926fd23bca5961c60a9337abb9539089832be1f334bd3837949803fa4e65f373379561e66123027ac63c0245f01fcf1de907e25ccbb6261ce3250b6 SHA512 0d8d92f415eeb36e03374dc05a06b0d1df8f8994cc5f7bd44b235bb6ae60236765ea32a3cc177d99de64664587f17bd65d9bfeae3f2b39799df591f85b55c237
 DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.15.2.zip 690579 BLAKE2B 63bdb0d4a624fa0de39b8f756132c0845868b552ca09b6b22976c9b91883336b7274205d6f60f8605b8cf7fec869732dbdf1655d6a4f2e10d390cb344b48cb94 SHA512 d16c452e7beb56afebc949fd1d92dfb4ec36ce6eaa37e3c49d5b523cf4e4f314cbd6c771617d7f212b90f0cbadc5a944a47a20e53df91a7b06d87df3c05a03c5
+DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.16.1.mod 1835 BLAKE2B 20b8dbf99bf45be3761748767528d5d400508c4cf11956ea35bd8d2e573bad32f7e266c9e426148041143d82edc14c150590e042016ce788887a67a83eb051c4 SHA512 56ec06204e0dde482c1801e3c35881204ce89340af4974edcaa89bfa0ae7650f67d0e85427f31404cb735c6606fe1de42ddc7b485b431b989a4b776229d2874f
+DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.16.1.zip 2016839 BLAKE2B 6da2b37d3ee0a0b651f2bf9f28c230f679e8b726bdc11bd77d1aca1b015cd5309ed0f2af0fe4a767bd3c6c563423520721550c488186d31de59e9e334848c0f7 SHA512 907a4049c7447ae5722b780039b367ec955c2ce5ce80c3d5b4df487fedcb682430aa48fcd066f2925f14d12e6555a11414062acb84029ef0b0d1e91cf6e8bfb3
 DIST github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.2.0.mod 678 BLAKE2B 74ccc942161cf87fdcf8a7796bdbace444c914e758e9d297e7b72ccb57c0ad7e64dce3cccd711eca9c5af5932dc571318207b42841b41f078b97d65240b9e196 SHA512 c4c415d250ad4db0a0c39a7629e88b905dd89e3da8e08fb7f8814555e955e72841f99434fd77b614a3dc3de5520f2e2a797b83c6aab1a61a01d013cb5f5efe48
 DIST github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.2.0.zip 23652 BLAKE2B 776297d2f20b974ada5440951017d8b4fe17f01bc3605e5c654a2c156684509a5e490c5875e41b9b8f3fac9eb63dd43ab9649c3ffa7768bbc1b7d36b848206f6 SHA512 97f22dd85e23d7b0ee70f000568bd97ea89b6196eb44a2985ea2b5a88a598f93a8c7e3efd08a66d402b4c63b179d041e19aea40c74ae1a99d699e7b1ed4bdf6e
 DIST github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.3.0.mod 621 BLAKE2B 371577909b06bc1738e167ef0547ae6b15a2fe403272d3c5512b0134bcc1cd74e128e69cf68e0bda874b1ccd91681deb272b26e40817112b686555d37b7aeff4 SHA512 72a8edae7356080f5aeec0d0d7e3fb43cc7159e3058f27e5794a803cb3bbc6880c7faefafa7cc377db054910613ee616406ade952f44f2cbf8dca55669ce1ae9
 DIST github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.3.0.zip 31106 BLAKE2B d79e85c0cb023aa7ac63502baa090789ab52556313bd0786ce4fc6c6947d610a359ac8c9874053bfa8a341c1a9f8583fd3feac499eac725a661528dcf870a0e0 SHA512 5d1b0978c291290752413e3ba769e9deb1d52659f001cc741cd44fb6d1948668d26d478282e798ad22a74a980ebbcc6b88cc3aea5ccc11ced4220e119011673b
 DIST github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.3.6.mod 712 BLAKE2B 0b2ae8c7a15590e98619dec76fabad41dfa6d477c44703575c1d7453e62ad904b6dface4357afb81fbd23ecec085dc8c9bbfce0501cad96c3136c5cfd954429e SHA512 32731b47d0ecf935857ca325790926097541bf455ff4aae393b0109f1dcd98f67ca8f656f21d46ba05c7aff1836116967e646f677f920e8847d5cba307cdece7
 DIST github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.3.6.zip 35677 BLAKE2B dd67dd59febc71bc5edf19a894d2e98929f32ed2532bab5f701e109aa8dd7a046c4da73f25b265430de86ff01101a259c5b872cc9055f287d64a0cf2e46c5f12 SHA512 42e2b202d4033ebc17d17edac75c2ddef6a7cbaa6cf01b94197f758275b5f7b45aa25bce0737663b148afa8e983a4a52ae40dab42953543466b65bc68f1911e9
+DIST github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.3.8.mod 592 BLAKE2B c7010f0048bd78527278aeb446ee33f96e2203c888100870939ed76e9220f7c50bd483bedc8f821137e415fb86bdaeb39701b3003a422a513b157d7eeb37b791 SHA512 ec2129a53cdf95672bd48fc19b922d01a12f8bc6eceffdafdb10d5661ed7a1517114f222119efb982d17f98c64dfe9ef0468d5ded30c77c55402156eefe35c95
+DIST github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.3.8.zip 35810 BLAKE2B 55316254024b44f1e28ce160ca6860065fb12390b99d7d4ac1555cc705c406ae4267fc10933b2617ff942df176a36d55f8c872a347298be833f8bda16b6c0ad0 SHA512 2543d3e40ecdf8987d10db41f9f8c4792bd82d5cb80a98bd1149948cdb936b4207141e56aa1baab8ffbf5f36c0764d4b1f13f849994fd16d642eb7c4d9137eb0
 DIST github.com%2Fsmallstep%2Ftruststore%2F@v%2Fv0.9.3.mod 39 BLAKE2B f9e77d71073eff0bad67ed0f5c03b1306cd76da54ef047a189e731bb3f06a14158d5cd6ee49d656752dfd904860e677d5a1f0a71696f280174fec6b58cae7fff SHA512 3ed6ee82f2913d430d2d0e66b6a5ed673657bf52a7871d64a4fc983942942ee8855c8d607a64b9c01d8190cdafee60564b2072476146844b8fb049453b0cb308
 DIST github.com%2Fsmallstep%2Ftruststore%2F@v%2Fv0.9.5.mod 109 BLAKE2B 05b481d29acb899b5917e051d5722d977a55611a52966eaefb736cb35bec7d696d2b192ce70fe42e3fa30cf6c07e741df7ce8923aee487f621a180cd9c05e3d8 SHA512 e01ff6eb4532c388e4f5102baef56cc47911c8ca6963543106117780716283fc96e644ec3a462d604e75965e59759e7af1c7b060cb4a2b168c011391215fdeb4
 DIST github.com%2Fsmallstep%2Ftruststore%2F@v%2Fv0.9.5.zip 17929 BLAKE2B 062ce2c31ccd7a0abce26bd0d31e883039771193a5b727998929274cfa9f9e47de3897f9b4cb653a4712112fd048fa4d77521a1fecac0c562463301a003f060e SHA512 85769d6d1afa3098313f634cb29087b9f719ab7ff433bd81764fb9aff65607b742025475b33d0bb0574afd9e15af506612e2bd94004bacbf981d07b17a2de17c
@@ -1031,10 +1294,15 @@ DIST github.com%2Fsmallstep%2Fzcrypto%2F@v%2Fv0.0.0-20200203191936-fbc32cf76bce.
 DIST github.com%2Fsmallstep%2Fzlint%2F@v%2Fv0.0.0-20180727184541-d84eaafe274f.mod 34 BLAKE2B 1d1e22d8a186a5e6047e60d939eddd154d8b92d8a06e7314abc1785e11c593dc8061846a80c47b0a216b7cba45d68b94b7911e10bc37940f91552d0b20721fca SHA512 2c3e518e2bf8c7b67a67240317b295c3f428e3ae36306849834ffc9f791c9468ec48adc19d168d0a64c471a8a2b7f4b4317834b43194ea6d79e1963ed6bc98b2
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.mod 52 BLAKE2B 3986b09ee44d8abc94fc0348107b410db374fccd11d77b9b0b7790b376a0f79b53bb3c70537d8d68b336ec007774fdb248237b6867b1a5c1802216073592fb0c SHA512 ae6455f8889d8aeea4b555e5c34c9583ffc5990e1772e75e5f6376d9e4d7d9e5f540ed0b04bcf142523347dfc21ae20a57d6de089718877d7db4387d9dc62319
+DIST github.com%2Fsmartystreets%2Fgo-aws-auth%2F@v%2Fv0.0.0-20180515143844-0c1422d1fdb9.mod 44 BLAKE2B 731913ee70462d90d65df204e4a8bd34a8334c6c1875792697fe1f7fc4663322d504625db21035d1b2b0541ad0d17c1e14dfaf9c7b46fa46e0ce7a56622c98c1 SHA512 b5d18ea4a5059700ab836e7b93325bc0556c66838f6f9a7049164124c8c1a2b5c44f2832b8137c4733256c6e75a14f5afeda6267ddee6c1cdd5c64bd43a374c0
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip 1521758 BLAKE2B 653e697d76d392b18c09e5c1c96734a737071667345b9d6ff9c9589bbe74e1c50849dcd7fc00b660adc1aaa30366aa9ca93a94d5eb4e605f7897d9714119f926 SHA512 3bdd2bbeaf755618d9fa7f324814497308361cb0f3f93a7ac84b9fc01b79ab346353ff0a022d3d85e74aef57b3773e03ea9279d0a60de317a1c57d5eca2d1507
+DIST github.com%2Fsmartystreets%2Fgunit%2F@v%2Fv1.0.0.mod 99 BLAKE2B 177be246e7569d2ba2c79728168cee15d47b21c1b0f774c0ef01bbf1fec84fcf90ddec716323133fd93297915816062303d5beca75eab0d222216678ba57756f SHA512 3e021b41fde9b047f53673f0e5dcf126e6a0acb51cb03a06a95f8edf79ecb8d3134127f5c9960c0b25c8d35385d95f3317dba498b1da887171a1d3d65503cc4a
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.5-0.20210205191134-5ec6847320e5.mod 102 BLAKE2B 437487bf75334bee113c97152964774acc961e5046807a28eb13a45886d61579182ca22a8b4cb29aea27604dfbca6d2fd16ec561c7b2ba59cd108821289af699 SHA512 761412f1b7047c5a737b2e930431fad9daf21cbcf40aafaec5879173c08779699f0072fa40357b427f8274aa68d9f31c466ce63b91a9d11f0cd2c115f76b1a4b
+DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.5.mod 102 BLAKE2B 437487bf75334bee113c97152964774acc961e5046807a28eb13a45886d61579182ca22a8b4cb29aea27604dfbca6d2fd16ec561c7b2ba59cd108821289af699 SHA512 761412f1b7047c5a737b2e930431fad9daf21cbcf40aafaec5879173c08779699f0072fa40357b427f8274aa68d9f31c466ce63b91a9d11f0cd2c115f76b1a4b
 DIST github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod 86 BLAKE2B 93d8710c720a6abfda7ce2f81229f4ba96088d4563b163f02fbe05c962e698f1ab1771ddc8a0296e8eab22a1e65f64258a5b3ad459f53de0d662e1ef3ca9edf9 SHA512 de0d160e304d1e1341fb3d3769ad300b61879ef491b3a293ebd1874ca259dc3fe95a3bd3f41b04e382cac8391174a54175e08b8422f243563e845208cac15070
 DIST github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod 39 BLAKE2B 0bf074876e4db2c76b675966ce28a4a32e7ac8a50c44f1f3c7f1cc929c682fd00d1fbdc5dd72d9d6dee2405d59d6699f1a8da4ed69863260258dd2574b81e924 SHA512 a6e5d41a24eded17812fae0ac1815c4e41dd3d60ac3ee667475e1801c3c654416346077d2473193be24dbdccb5d4fe7ae44acddcd354420d6a312a03df9daaf9
 DIST github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.1.mod 283 BLAKE2B 8d2ac0a93e8060c85b68a1c3b7f1a22572319c9a8c7f7d88857f8b04793cc55141d63e53728bd85ce4c2a2f3ac27bc7dd9c115b86f5f3ae9d27aed9ad4ebae1e SHA512 cf2637b8c82a9c67cbe323e6f6601e93c6d0840e053a4644b6e6170a4efb56d670007b15eda837e89abfd17b6c15f179c96cd92cc9cea4002f27125cad1049c9
@@ -1053,6 +1321,9 @@ DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip 12750 BLAKE2B 65fce8e1c7f8d6553
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod 310 BLAKE2B 851f2542f28849f4f5c33155e5d9562aa9aa2645f1fb57e6300e2c6e98c39e0728e01a5e26d4a514435245662fccc55b8eca4eb2633a21057a6c4a5d80d24fd4 SHA512 dfde1474aedc5f36508bed07a01fdfd433967d2a6c0acadc6d985ce862da5e1cbec7ced13d55073512afbc2d925e6ad3e3cdee9511ad17b14ea8a159d8adf8e0
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod 265 BLAKE2B ecbd8f71c2576f741916c7e6fa4c279c327766a9bf957e019164a1ff8af16ca1fc6810004935e57a3b085f81252549ff0f4ee2b89a5e53dc0110218acba937a6 SHA512 25511d7efe6d605b33c4e142ee073694b95d93b10cf3e9d74a161dfb71171de0accd626587299f41a061f4a3ea34482ec36fe7b9b2b3588d8af6b3545a35a45f
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod 265 BLAKE2B f7a8de886a358b7d2910807ee16a26c210850980541aea7d179b7880ee57af17f0aa62d0bfff1f1116d8b32c9ee05bb6ac7482313e9556494e92c60ccd03ba1e SHA512 383bafdea96d9fb12cb72123ec4c5bfe3669be7867fca80e2cf4dc7a64e5a69948272da4e74851d1464dab1430362efb9a43914985019bec4fcdf942fc21193f
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod 265 BLAKE2B 22909466af108048bc272b0e67db40f6fcac375de02b29aaee7bc31153d73b2c1130faab8e27a82dba9b5930c789de1840468fe9eafaa8881cbee126b0c9df1d SHA512 17049e0eb9bab7ebe298bcc1fd3ffe0eebd40a7642c48f4e5c2447dc37a3099359d04dd929643497f25ed55a71d7ab6ad6bf0e75553afd4fc98616295745a25b
 DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv0.0.0-20180109140146-7c0cea34c8ec.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
 DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
 DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod 188 BLAKE2B 26b2922f8d9ebbb77872bc280b6a40ce569be69e78a0734cf7f75def7709fd86183506274ff8b9e5853cb0dc29043ce315acdda631102497a8178cd749fb0c03 SHA512 a5da49fe5d41b33c03cd1af18affc92ca2572f0c735da70c55f06d668ff33ae4a231fcb6cfa2e85ab4b04ef4c7808d895739d0121ae874c43b01edad791f2735
@@ -1061,7 +1332,10 @@ DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf8009
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.0.2.mod 30 BLAKE2B 18e0337f9146af34821783f04024be09e18f3804558482ea56acf28048ec811ae679e0bc0f6044774e69a98c575b0a41e210277b966bfb04270d7ebf504cb1c0 SHA512 0b3a57fbf1292964f8d35a7b85e9c828bd2c1344d68e4d04ce84acc9c99e2239895058fa656d45e0e5e622afad62056b583fb00a5dd3181302798ea99b0b6799
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod 2018 BLAKE2B 516407d1afeaeb665c558a4babcaa35aff28dd9b41298d04b904378159f1978a924323195e4c160cb9cb992c264558c7ae4f07ec157dd8c65fb98853a3cdc53f SHA512 fda6d22c26332038895ea2f2c62458baebededb0df883728dc9a127c10102b9bfd3e8128dfee194d909d645ea652f3ccd5ef737a8cb7ceadab71864b21de117b
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.mod 2141 BLAKE2B 156a151b0a2adc3281ce942a6b33dd518a60248a9aa927241d787a6a6e4c37f8acb76cde85d8ce6e7351bea257bf0dd8a671c22c5f4d5d6a8ffb150e17ae291c SHA512 21bc1c47e67da822efa2fd98ffe8c0a9f432e95be723682a738a82098fab25771a2ebec1903561118fde91a08ae370989cd5375432cc21d80ce07ba2c44ff6d5
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod 1694 BLAKE2B 195244bf4042b519551efc149dfbd9fe10ff87e5b2ffe6f9a2d3777516315db8b43968533ff089b257c10f94f99babd076ff0a7203a434a79ea5aa7e39eb9818 SHA512 9f614a57ccae909af00a67e464b04eb91a92eebf1c28de3809351363b441d22a4a6628a1902fde8b67956d0bdedd91423d20158eaa6b9cd994fb7e284a35e061
+DIST github.com%2Fsrc-d%2Fgcfg%2F@v%2Fv1.4.0.mod 29 BLAKE2B b5d4003e44ee3e61a72146f100f7d669aac7047b096fdaf549194cde409e0ca927af590140e4344f57e77e2db5aa16e92055e3ef2edcb73c8616ddb0edf6c62c SHA512 59c1f5827727d54b89814acef7026a976343019b58d7c673b853382e661b72231e04e251c60377f8bfbaab0bd6768cb8144dc18f1fb207b6fbfd3d5534dea160
 DIST github.com%2Fstoewer%2Fgo-strcase%2F@v%2Fv1.2.0.mod 90 BLAKE2B 32b404a3a6e19f47c33f0f7803fa6cb7fbadd3d4b1f2867ba784d7edb0eea652ff46fc2bd077639aec880590020cccc5015ede4ece2f2c5ece1a429893e5e57f SHA512 f3dfdf14560790b30989cbdf4e295b54acafe9a8ea073ccb276f901a3a0497642707b7dfae14dd8e7ba92b6a7575d2ed899439772ec2dca8c0f66db3713d5023
 DIST github.com%2Fstoewer%2Fgo-strcase%2F@v%2Fv1.2.0.zip 9378 BLAKE2B dfd8a634518ceee4462ec373f61c1df136fd080780d2714b7598e5ab19b0aab9cd7519461fd72b5257fcdd6208c78fb014c99bf864ff00cdbf7bf5b463584678 SHA512 16ab2d7aa99b6702bb77fab373a00b8e736d4114d526c778ac282b1847a9000c932b45cc41a4132a9623e763bda13019e771b0746c3bf2e6c929a954d193f14f
 DIST github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod 42 BLAKE2B 528d17f9ad90612c6004aa88eb138daac467c3cd82e8f9a990e64ec956a9e50ebface9db66bb7800f74e7923a647999a9332d871f08d78a7eb09883e0fc6c811 SHA512 c5b104556b88e433f61bc94d0b61fabaa86fc25f3089a03f1360fe61b2b3487a5f2c6c3086eb08298d48cc05860652b58075c51d2767c2c4f2a698069b7dcbdb
@@ -1071,6 +1345,7 @@ DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip 42547 BLAKE2B af3f81b3947f0802a6542c60db0248aebac9521d75d0d991f76b5783f4eeb42f7902250cd22da1b8fcfc2f150342ffff53260276b7a6903c092febbe66f40ace SHA512 b21cdcb8683760280e515ae487e17b65b324b51dbdb36c6380ec0b272699297d388a34b1a6aac281b1aa149d85ca81640850e1fa0d84bf63f3dc67b794baa249
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20170130113145-4d4bfba8f1d1.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
@@ -1087,8 +1362,14 @@ DIST github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190721030226-87058b9bfcec.
 DIST github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190930140734-f7f2e9bca95e.mod 190 BLAKE2B b079349b0a65db4530e0ae682e1ad705f146a8ac2d1c735b9f660d2fa336088c04050defbd04f93d3b51a20dd396d338874065370242fb80ee5beb981fe613f6 SHA512 5056ac014217b14e7111984a99c6d49120404c31baf0ed510316b3b6edb95084b26d273da643e025e1d13fcffca82411a3542acf37dbadd4afaf9466a7a1c607
 DIST github.com%2Ftimewasted%2Flinode%2F@v%2Fv0.0.0-20160829202747-37e84520dcf7.mod 36 BLAKE2B 7184134b512e4150c612f5efa39b403b6b40d03736895abc3002208929efae56fd11a79adc7ef49218bc02812e36b65b519b019f843e7dcd86dfb0c780c72261 SHA512 cf6746073568cc38f71a6c892ff3a9968da47b3c92a838b6ffee30ab19129e81682281303e786db1ff56cc5d78137ff50f621cc833bc0c37c323d18cfbbd1ba4
 DIST github.com%2Ftimewasted%2Flinode%2F@v%2Fv0.0.0-20160829202747-37e84520dcf7.zip 11156 BLAKE2B 71243f92f8baea98a1f6cdceac34054aa695cca852a03c47d42b0b462bd546e7af2b85962ccbdd6ec4b864d6e907e60a9049e3e0905bc8eaf906bd601de84f37 SHA512 ba86da39a4a35e81d4ca6eb3348a287ddc22a120240ef9107a558727c3095606fe3511738a873a61a9adf80e77ccae23132913f3a758ced70e4f2cce2b8b419a
+DIST github.com%2Ftj%2Fassert%2F@v%2Fv0.0.0-20171129193455-018094318fb0.mod 28 BLAKE2B 742873e953a4c321d1a3fce242332cc938827e7cfd7da3872021fc5f94581945e9c01cdcd79f3d0d33c0cc18af4fd3dfefe334598902dcdc181ffd268e849e00 SHA512 4dcc75f1430a9a1c1c3f891c700daad7b2146edc8a8b83959bb7dbc8350b3d222ea42d1c09bce79cbf23a8d8ff72cba927f6a29f9f84ea981d25f52729c3060b
+DIST github.com%2Ftj%2Fgo-elastic%2F@v%2Fv0.0.0-20171221160941-36157cbbebc2.mod 32 BLAKE2B e6580635d6ff7d43b4882b1bbe937992259dfc43859a6413a6d7b97746549f3d8f1c30aa724d3bbe1a4499d6a8cc974a7053c87f14b7a91e2bd7f2a555a99454 SHA512 a1cc95f87b35b7c9a9c23cf2d2ad1781762d7238be4e34d4e18d66aa01393b4a85bba8ad55e6ec49bf43074fcf7b1f5a23bb41f6c0588d5f3f6c36ce7a629d61
+DIST github.com%2Ftj%2Fgo-kinesis%2F@v%2Fv0.0.0-20171128231115-08b17f58cb1b.mod 32 BLAKE2B 1bbc694f84cfd169e1607396d69b9aa5f94af0f157e6b24654b475eda460fb34fd271e44bb967747cff17b013879dc1e7fb42460b228d9b4f0b22eda0845a912 SHA512 c1a784f3badb6550f7f18ce3ed850e69a8d2b1786a50375b99f1ba7cbd3b2b823cd84427fdea4f94cb0c89cd958f3ce441bf046cc640b21d5693a062ce5e43b2
+DIST github.com%2Ftj%2Fgo-spin%2F@v%2Fv1.1.0.mod 29 BLAKE2B c59da323023887229c554d4ca24307b4e0e318efcd3bbb5008513bff44749335b6ead5d6c74cc0216452039a6534426287c37fe0a8807aca2c2f2bf9b328624e SHA512 d05db9df2782c526d0d7579a34966c6f6d510fba27465728bb6a2401482754fa37baabdf1c179d570d5c92453a5f189e74e985e5fcf6cda344846536d6743f04
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20200427203606-3cfed13b9966.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20201229170055-e5319fda7802.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Ftomasen%2Frealip%2F@v%2Fv0.0.0-20180522021738-f0c99a92ddce.mod 33 BLAKE2B 92e05addf2b65e704d351cb7f887ac28dce6f67184bf0a46e1bda350f26ba1e50e2ff7d2698a09320f05863b33c99a7034cdf517c56332a7820fc83bdf9a9888 SHA512 0661766aab15879d856bdd7df7033d9193eac91922137af549f3dda17a1adfa148d35f62122fa4ac178f6ffdb5c51a6d10a87ccf7ea2c93da7a86e3cdabdc223
 DIST github.com%2Ftommy-muehle%2Fgo-mnd%2F@v%2Fv1.1.1.mod 309 BLAKE2B 08c694a7e547971dd38604b0fae2620c1c46bffc1d19dc532377bb5d358d7c702b981960cb2f5a10240887d0667b23d2e3e766e18d35206b5e76dd49b2a8dcfa SHA512 59a9c250fef07de709fdffce7965fce26223014dc67c49584b2980c7116b6c398ce162fe3a9114a83b65432899ccf0bf2c281410366735582f14fe40cbd1436a
 DIST github.com%2Ftommy-muehle%2Fgo-mnd%2F@v%2Fv1.3.1-0.20200224220436-e6f9a994e8fa.mod 309 BLAKE2B 08c694a7e547971dd38604b0fae2620c1c46bffc1d19dc532377bb5d358d7c702b981960cb2f5a10240887d0667b23d2e3e766e18d35206b5e76dd49b2a8dcfa SHA512 59a9c250fef07de709fdffce7965fce26223014dc67c49584b2980c7116b6c398ce162fe3a9114a83b65432899ccf0bf2c281410366735582f14fe40cbd1436a
@@ -1100,6 +1381,8 @@ DIST github.com%2Fuber-go%2Fatomic%2F@v%2Fv1.3.2.mod 33 BLAKE2B b8f402df04871126
 DIST github.com%2Fuber-go%2Fatomic%2F@v%2Fv1.3.2.zip 15265 BLAKE2B 78be0cf1d2dfa9520c3b6751ec03906a947bfdedf0a90ddb9f038d20a6cabf69f79beb385f8980c2bead592feb1a181e3a42b598a4a1f1221df5e3a5768bf5b6 SHA512 fbb9ea92983cd9ccc2d20c530e0a42ac27aabb3634431850711dc4adaa21bd2799a4c5dd3a6c3695d687c39502a2188070ef7d572eba26571d1f777c398738e9
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
 DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
+DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod 31 BLAKE2B f8ed4b103891625af3043d86905f693014b245198a180911efb7e33480d81b93babd35912c5768df62cd26199e3a742f94365a82de619a97385d7407baa22424 SHA512 33639405743ddf22f19ca03d348c47d9cf963aa151fdab9e7303679ccd5cec373ceebce456eb96ef52dcf933f96e4ef7d4a8099822dfc183996d8cd4f09cba2e
+DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.7.mod 40 BLAKE2B cda2535ba0a3160edbe7d8908e254248e06311ace58d75f6e0b2c75fe1e68f534f68ddaf77a0eef2844b87c2b0234323d8b36a04ce39910cd5e3c0701073f350 SHA512 fc06f111ad8fe91b6233781e300d3abe760140633f45c51fc7b93c744b870f66727d12132e692b5d59526fddd1f728d7a18976e392052d9fe362d3a39149cbb1
 DIST github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.1.mod 35 BLAKE2B 8e3c38268bbf27256cb628341ea9b1772f7e0396f91f8d98137af08899752a2c7edfa235780fdd860a514176ac1e559b49fa1de26f6909b71ff4488666b73a9b SHA512 45b7c64fe3b0b38a2ca194c2b91ddbfa4cd1299685b99be460b86eaf952ac8e59b229e82d99850db3cbd4929e495413c92f2bf2c987adcc7252c501ee11b4ddb
 DIST github.com%2Fultraware%2Ffunlen%2F@v%2Fv0.0.2.mod 35 BLAKE2B 8e3c38268bbf27256cb628341ea9b1772f7e0396f91f8d98137af08899752a2c7edfa235780fdd860a514176ac1e559b49fa1de26f6909b71ff4488666b73a9b SHA512 45b7c64fe3b0b38a2ca194c2b91ddbfa4cd1299685b99be460b86eaf952ac8e59b229e82d99850db3cbd4929e495413c92f2bf2c987adcc7252c501ee11b4ddb
 DIST github.com%2Fultraware%2Fwhitespace%2F@v%2Fv0.0.4.mod 39 BLAKE2B f3a92be3ff6083e63024db0c80f8ac15e3709cb584a02e07c019aa19cf6729481e645ab85cdc1d7f1ca200bcceabc903b3f90e2fe58c49f3a87b859152ac1202 SHA512 97f4519da711fcc4bf156d007b7bd063a8afdca34199477ea575752550c71f32e030167957b161a423a04ee2c0633827b758c9eab69977c8271c03eb35295964
@@ -1110,6 +1393,8 @@ DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod 180 BLAKE2B 5d858ca40ba2af7917
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.zip 106836 BLAKE2B 1dc75781d1462b8b6d646ef09cf402ce7e301a981ae04efdfd205274cb593cbe849341374adcd4239887e4323d937964850ff4caf203242ac216fe0858f7fa60 SHA512 ebe55034b03a75da1e267c7cd06517a6e429d96557bfdd0253ef3967576d57b5866d8137172f15cad0875c009c2bd2efdb6994ee82c2ba83e804e9e8531f4a14
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.4.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.4.zip 109532 BLAKE2B ff6116d5112581b9836cb8e441ca181192f397d29b465522694d14c262c204a021212f35b619cac9e7259570a31a7d3907f9e68b707683a388054d8ac6c4e6c1 SHA512 fa67796ec04ffbfce4a84d55de6ebec571240d2c7a0642b4d2d403545d8a5ae36b4426f14d3fdfc679ed770b3a2e70643392c3317bd40d2a47cee27da3ac33bb
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.5.zip 109691 BLAKE2B 80448b0c68b6b929d8776ab78a6ef0ee956c82ffcdf2a1269c4658c896c2e7e9b0d11ab27219ca73bf1db3de3900ce3c89ba586d62fd4e0142313681b0f971f4 SHA512 1cfadcfa834663de819e8995a000b6d58dad804c614011ba99cd3d0936adae43a8f9a41522a0e55748459b456ed12abad7c89627329fcc7977005ea2ac711a14
 DIST github.com%2Fuudashr%2Fgocognit%2F@v%2Fv1.0.1.mod 44 BLAKE2B 48b6b025f3183a5b309f96aefc52322eb20259d25cddf0893979bd03a674b5ab80795765a12743c8dc1660dc5214a4173e919d4a6ae98e5481444deedce98be3 SHA512 a93db4cb6c0fa2eb3abe719f1db671319a75bc73f2de0a7b50092d0c96d680973493f4d22a4e2764be117c0faa7567ba278567f7d3fb1896e13226b12c4039e7
 DIST github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod 41 BLAKE2B b7c7dfaa36f45deedb2b403a7a0f09577321cdcd86d714724f9d8dd8044c05aae91dbee433deec1dc094d8af6ceb8d01924bf4a9812b7521ce52ffe5678e4a22 SHA512 887a7529d78ca53e5e8822ac041705ae20c34c337b1bb94d3f6b671e4afd2dbdcce3a52aac4a42defe3da92fde14eef180bc01293040f6150c362f23408e3fa3
 DIST github.com%2Fvalyala%2Ffasthttp%2F@v%2Fv1.2.0.mod 321 BLAKE2B f1b47bfc9434a89a99aa50b4a714d6cc2e140697e56e34475bd0dfd82cb9782f7837b922468d4769a15641a2a2dd90ce3eed92f1e15a718947537cd1c35bc50b SHA512 0e8018de1c1a59dad1f183e59a5ee1210925d16e4deffc37356b193991b24e23148def88dd6dcf010b2ca74d8172009cf96f500da80f5024ed872940ff191387
@@ -1122,10 +1407,13 @@ DIST github.com%2Fviant%2Ftoolbox%2F@v%2Fv0.24.0.mod 32 BLAKE2B da1ff9607ba3c4e6
 DIST github.com%2Fvultr%2Fgovultr%2F@v%2Fv0.1.4.mod 41 BLAKE2B 43abe7165b0ee1588edf9c848093d9ee9d04689e93571f948020282c634629a904e559befb6f27a6696ec0e0352c45f0740324b561570fe7e7c15f4ea2f9c584 SHA512 6885c689b09b16433bc387ec99d2eec3b7aff381b6427002230e9b8c8fa769ae8700564c244ac80aa76c924db054b3cdedcebf5fccaf20cec997fd3d87dfed76
 DIST github.com%2Fvultr%2Fgovultr%2F@v%2Fv0.1.4.zip 66277 BLAKE2B a4671a69e62dcc970e7f49795b01f73182723af8d025b440a19cc8a237518c7160dcf3a3b10fe2d6893acc461720bfdd8a7a0c6f0590f2d40ce2970af9dde237 SHA512 55b03e78dafb89acc61ef0319687cbf78dc1a7f01c9b5eba5ac4cea6e847aef44c9707d79d123af97245460ca34f41f68a03659d5e3c075108dba36cbcbff5dd
 DIST github.com%2Fweppos%2Fpublicsuffix-go%2F@v%2Fv0.4.0.mod 41 BLAKE2B c63f81a5ae45e613c409a5fc16a2ee33c943f5294422f96fb4222b2ead1dcbced0636f5b653a15db7e74e1c0a83d69cb0ee9c831860207b260f27d525b075a3d SHA512 8587bb4fe1736a6006cc120243f51397e00c425167a62a0d5e4f59814eeb49059ab805cde78e9a9efaa320460dee1e710287378728c5f89375f2df35beb390f8
+DIST github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.31.0.mod 510 BLAKE2B 9e07a37973a2696c7c7ceaea9c236736028de6601f47e34622ffb89974d4d5a2411f73de98158f24a74395ad461514eb5b320a5fd2ab1a067426f06c5415d993 SHA512 164454e2ad65b49db21ccf91cb97092c4d9f15bc347cebd9ff66b668de5b627ad599b0b20a373c38b309b4446444a013ef4f2e03fa7a6a239bbf968e3aa056f7
+DIST github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod 168 BLAKE2B 61409485b5a15b6972b31745d6d4153561aba9608993faefed322829f885949f7f09f4455d786ad2b088cc8b40f30bc6746388e86625964fe9adee36adc33035 SHA512 8685959ca2e8ca2ae8e0d802e8fa954c91c9cffd318b476669fc1a2bf969a0463ebe3fc0ec2588a5f151e2da394b0d37fabafb83c8d25337d9b65a307d79b51b
 DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod 40 BLAKE2B bd8fe364e43fdad423aa574d01229ce91e9b3211cbe3a0234070805150d960d3c0fc0c6ec229e7ce5b4079906f2595a2b5f50a8da7bbe9bd906a72a6a7a7434b SHA512 cdd8a665fc41a4b04c59e869b021d5a9b793b9a441c320a234bf2a13be67af9aa60378c58991161f73d83c184039a52fc3f11cd121490996737f0508e277e1cc
 DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod 42 BLAKE2B c2d6fb272d8ae4e541c98023713bcf0b7f47f334d09ad7f9f375ed13eb14d27ee2995745782ecea40d31a561e28702fddeae4b5e32750726c7188118d741cf82 SHA512 14c839017eebd5dcf49dd3495a1ef6421d522389a2943c010d7869d214f757fe7d19d6ac3482fb3d8cbaaeb3977c5c311523aba90e9f7909fb1ba593ba57ae8a
 DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.1.0.mod 39 BLAKE2B 4a9a7321d9c10929abaf038e336248709fcfcde17c0ec9ec8e96407a9e12910b84e7008a7a847f533bd8695b56a8e35313d5771931d2fb1dfddd74ff59b58d5b SHA512 8ee8fb19b40e1366446a91a48a495fa96e4626f594903b7d4a53355069043c5a2958612dd0bf0f8b0a01a4fadf9dd92d0b9dfafbd10ab9c8ee6e3bcaa01853d2
 DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.mod 240 BLAKE2B 0177599cd72c2547b6ab045588b64eab43cfe222a27ba0852f535300f41b39123916b3e1e0a222eda9ba72a29316e610617707246834e2b56a5a7fa23d4d3345 SHA512 d01fd1c1874dc5d24d9435452bbc641d2b6f199580abf24030be4d6465a68f6ae1f5afc4c83ea8ff9366649341ca167397dbbe1e6c8988c3117e2082338711b1
+DIST github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod 25 BLAKE2B 21e5b310a30482f79ce878f1649fa49b3d1b34db022063882a89a83e18e58db00042a2dc35005a715f1d75a3cb8fe72dc3637a91649946f2205582aad092a1fe SHA512 5b8492ae7974c4282c5302607f891aeb4f49dbc4c04bc492f99edd9e9cf89e4f6a37f52a0897ec28440cd2aa1c91ebd8e10075eae4156ea574f7ff4363845e74
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
 DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.22.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
@@ -1140,6 +1428,8 @@ DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod 41 BLAKE2B d7c63b68781b147d3
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.6.mod 41 BLAKE2B d7c63b68781b147d3baf10d81bce0539aaf0a046a70cd91958b59541dfb35107e01a73937b19de74504f42fe49983b46985a9635c45239e4d7a3e2cca2b85f72 SHA512 a6233a0864081261d4b9cda2d73cf37b236acada8f5fbc85b7b7978ccfbc3bd2949632f2fb67a7ba9db6eb43b41796df54460728379e0172082922820d6143a7
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.7.mod 41 BLAKE2B d7c63b68781b147d3baf10d81bce0539aaf0a046a70cd91958b59541dfb35107e01a73937b19de74504f42fe49983b46985a9635c45239e4d7a3e2cca2b85f72 SHA512 a6233a0864081261d4b9cda2d73cf37b236acada8f5fbc85b7b7978ccfbc3bd2949632f2fb67a7ba9db6eb43b41796df54460728379e0172082922820d6143a7
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.7.zip 269109 BLAKE2B 4faf7e34eb63866523ab81f3a3f233b778c9d1c7e57f24036bb9520526aa4653b6d44e16bbb01d0c9269817444da3f4b28d84e424ef9ffa3e750e13b94e66baf SHA512 29ff1b853bb00ef26a9ea8553602c3935c0bbc43f07fed04b2859500a5420791173e74346b4c7d6ca38eb5ce47f3030df7add7be914adf24ed344a62a957330f
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.4.0.mod 41 BLAKE2B d7c63b68781b147d3baf10d81bce0539aaf0a046a70cd91958b59541dfb35107e01a73937b19de74504f42fe49983b46985a9635c45239e4d7a3e2cca2b85f72 SHA512 a6233a0864081261d4b9cda2d73cf37b236acada8f5fbc85b7b7978ccfbc3bd2949632f2fb67a7ba9db6eb43b41796df54460728379e0172082922820d6143a7
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.4.0.zip 269493 BLAKE2B 21e76ba56b1eca9161a5f086725e191f8b750ca2d4413fe4edbc24d29dd0dbc2d82ac7429ccc21a17028535cc2455097766c74a9a0b83d8c88ce0977eecc2d68 SHA512 88dbafe0944a8ce19ab22d81d07c6073681eeb5d3cbcbb8ffdb2e639179083d5d10530a093ffb14b14b6042b5f9d22761b14d04d0035be17616f865c4ac8d907
 DIST github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.mod 481 BLAKE2B 7f6b0f2bfcc73b9f02244e0310b0ee8f511ba654cbaf737dd896ba2090168795835635fa5f520c6584a47a156c7c1c71150a60e8d283f7cc5edd8b140f70ea2d SHA512 42b1f424182644a589d0add502d537fcc508077e5db59757f70b8c9bada92a71ec9345149cdcdf5c33f479c3beef0740d297f3b64f9897aa12e7a858dcb3e9b9
 DIST github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.zip 12715 BLAKE2B f681c484ec877951d3c6f2bda0b6cff6ac109443637c887d9eeb74c70d37ceb8dbad999a8656f42175a8c91317a6a6c4e25ca829375137ec4fb7dd5957479b4a SHA512 b47bcfca1fd927ba733de1cae29328ad44293ea0b33cd498b878733ccf7faadb221c3f9f1d5913e00d8cbff3565bcb5ead52a03dfca3cbf5d098e7d8c96cb713
 DIST github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20210516132338-9216f9c5aa01.mod 214 BLAKE2B 401e7eb4cbc7d30d922a77a579310d400a42fb41d5bb1069f4ca9408dc2175dfd0f1baf9387d8020e999caebc8959fa72be5dcf568e6a0f408970d30063e65e3 SHA512 09bc0294ccd81eba239b5969afb7e94cdd6f13e5ac88a979cee0765dd7fd5464b75c2875b09ad5f99ff8f5a3d2ca0afaa9258ca08644630e1c627945b28ffb3c
@@ -1156,10 +1446,34 @@ DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip 112407 BLAKE2B af65ce0475f0b55ace7f03a7af6fdfaf8daae8b79e0ec1c9fd1aaa911cfe517c6760e6a5fb7881f87d7fed4da3274d14c78aa1424c85c003dc0fa98b092134ee SHA512 ff7060fd74bf2070006a55a739f6a8b64abc5ff09db2d2bc53fe978852e5b82f96bfc79c1f73b68e704bff423722f7adefba0b906de6d96d7e03c3e5740b7ac1
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod 94 BLAKE2B 5014c2a8459f1f01661c7cac0a7d2ad7de372b3e2916d56d721fd454e459fc75d5b4f6249a73dc54b46b91df00b1ef5c3d47d099fa28429a6967427ec7bfb36a SHA512 d3cfb7a75e321d2a6fc145b727dea76002189ae2caa8dd3162e5e6903a1acbe5bd55be81d7f112c71b47e61351534ff991be30993632be9c9d7443111600fe39
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip 115621 BLAKE2B f59bced3cd34292c237fe5a472a66fabca151ffdfd39553bd060bcc706433c248d0712fc4fcc7c44a67ee86fb3517a30cd1846c5c5e70b4549d42c1f12be9495 SHA512 0b6a8a073673708adc8fc0d01c96fb0ec4276db63a17f45ff02b4243235de9634952747aff63382ed767157c6dcbcaebd5399ace63a14e52cc826bd5c9749f82
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.6.mod 94 BLAKE2B 097619943e3530007d2f8f9798cdbac483ba077b239096303e4ff7637459e7cb6d28c7a98d893d52e6686ecbcf3fa8900fe8ce46fc16b9061c1f4b0011ede3ea SHA512 d8a4fceaca0875493f0788147e464f36a1a1b9806376318fe88f8b0091ea3ae4bd5ec141ccc7c8bb86d88f34f25a36d2061dbc24d0346a9d68c1fbe45173fdde
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.6.zip 118439 BLAKE2B 8cabb2171e4dc3f7587d6c2d7d56390dcc6ae14cd5cdc84b9b59afa8deabdff025c03090a8b86f3a45287b9e8eb51855076d7fe1fa6eaacbd434282aef81627a SHA512 2e71f7b8606ae949fb9f3287b76dcbc02c5273a44568bdb9b750c381dc1284ed9c4887fdcec652f572eb0e7066e4592a3bb9aa17117b039dfb65355033a0d54e
 DIST go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod 2182 BLAKE2B 024744c8c4b0f296f32ce1af2407eae0eb760a443d43e2a1824254c9b2aace62966a2f0f5b5dbfb0cdaf66f2f00740ab653a2b429cc9aadeb3e48421dd6e180b SHA512 904249febd483a4504d49a1b769ded804042c34acd6b7f76503af9f43c76c53063888a7d0e15ee457107cf688108d2bff057330d9d44548b2a30979336370f09
 DIST go.etcd.io%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod 23 BLAKE2B d7c442b8bc73b30a48b7416d878750c5d33103053eeed8e9e444d75f6772cda3d9f940e4816fbd6d5531a59a6d5ae128bac6042caec4ee008baa626954487cb5 SHA512 58c284df2f2a50dcb098d7f52bd60a6c4dedcc3d08a25d4fe6ef65e1879a7a68905b0b8a386c8f90637b087cf794fde3125b2c100bceb21d105449ae5f34898e
 DIST go.etcd.io%2Fetcd%2F@v%2Fv3.3.18+incompatible.mod 23 BLAKE2B d7c442b8bc73b30a48b7416d878750c5d33103053eeed8e9e444d75f6772cda3d9f940e4816fbd6d5531a59a6d5ae128bac6042caec4ee008baa626954487cb5 SHA512 58c284df2f2a50dcb098d7f52bd60a6c4dedcc3d08a25d4fe6ef65e1879a7a68905b0b8a386c8f90637b087cf794fde3125b2c100bceb21d105449ae5f34898e
+DIST go.etcd.io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0-alpha.0.mod 657 BLAKE2B 1d7b1fd678cae38c0b59b69f4d282db2b874defd7a2bf845c13b913a9a3a7230117fc6d04a2a1b8132c93ed281c02065aa3291e37cd37675c040c2944c4c3a74 SHA512 b129985f65be15f2fc596d905bd9872edf9d4b9e85af6b10d26f33409e5ae6831bcd3d141c2c74aa7d7d5080abd38670ef3f3becaa7f627da9aa5ff720d8841c
+DIST go.etcd.io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0.mod 657 BLAKE2B e13684938cec02c9e77e0205a3932eff426445dabecceae0f885b22bb1882e86403c9ba2279ed99b955031976624748178321f00ab33f190e801aa9b5843d677 SHA512 c38c82e0cda65b54a3b7d572fc564792a89d248b82ea5bba3cd44214facf79aa955381c4e432762d5a8dd92d6fafd36b9c5c7d76d3f853ada8c19a0ecd95b20a
+DIST go.etcd.io%2Fetcd%2Fclient%2Fpkg%2Fv3%2F@v%2Fv3.5.0.mod 179 BLAKE2B 4a2cc6bce6be4b0c59e37eb32413c7b84d31b79deb3de0e9dc01de1e45399dd57e0e27f17f04cb11da4b9eca5d26feb8556335482a975cf499dab62ea9a2708d SHA512 5c3cc3746a3fac7cef7e0de6b39b280c1f43244bba8c9890f9118654780b0717c5971304f9fefae1a5c7ddd70f82f7a08a4e5502ab8181155ea8bb926be7eb87
+DIST go.etcd.io%2Fetcd%2Fclient%2Fv2%2F@v%2Fv2.305.0-alpha.0.mod 548 BLAKE2B 972f7e2257325313f8fce6f0dff9cdd9ae8ad369d86fea333a220482616a93ed3c8d7c96ec9922fc47388ef68736cf60eba3c891bbcebcd543cad3173e10d5fd SHA512 c32d46a9d239c4dbb0c49b792cae302ae5e75e6967050906d792be6fce254769035d7b38b9e43ad8db9858d5b064761a5c53f598766c5bf4e31523e19b2cc188
+DIST go.etcd.io%2Fetcd%2Fclient%2Fv2%2F@v%2Fv2.305.0.mod 598 BLAKE2B 1067089e4696b50abacb1eb32584f0dac828b0714054d06ac71c4a3b9af0124d746ab520a449052ebeee3c7467d4f11aae6dbc962c1abeeff7e58df56113054e SHA512 90ea50338b3a9197faf9f11bd5966d23e82c89d6188d8a0f5425a9fbe1bbb32333f8c71449d620aa654f6afe5598fc01a4c56eb5d5236861fead943595227040
+DIST go.etcd.io%2Fetcd%2Fclient%2Fv3%2F@v%2Fv3.5.0-alpha.0.mod 690 BLAKE2B 41808a1fe423899c849e13218c0c7c7d8cb9def99eeba6821852383a7093dd5cef24d8e3fdb59df2de592aa1b25309c0aee9f0d7be3a12d2893a9c0660bd544a SHA512 6f7283f71377d3bbcf3f38abb544c6d9f7b1a79b4c9a0c57792b90d4d5cf361e30d0aef7c7028003186dba0656310223b714658fb5ae447597f6d559656d67af
+DIST go.etcd.io%2Fetcd%2Fclient%2Fv3%2F@v%2Fv3.5.0.mod 736 BLAKE2B 318c3607f86419c7a151f1de6b021d4ba7afb58665a8c93e8033b3e8a4ad3ae405c5e53dd8c477d026071d9c71e1dce94d1b87af5af5086222f3918a901ea859 SHA512 f8367459e4c0ad2e04ddaac7642cdcc9f75da70e361a871f82ff8d732b1ca9dc6e7820af3155309a7f405d2f587e990c561ac35f156b6ec61edbbd913f4f88a5
+DIST go.etcd.io%2Fetcd%2Fetcdctl%2Fv3%2F@v%2Fv3.5.0-alpha.0.mod 1210 BLAKE2B e92dbed805cad518a182c80bbe00f79742077e85a27012e22b58286856ae77d2c322c7f8efc7d3fa1b3e6dc3b4af50bf031f4c1bd278a1b2e64c60b682ffba4e SHA512 3a5b93ded967cc9b0bdd5ed1dcdc7e8235a6636170b878a1b7e59f61716a532f981bd321d0ae4d479c99023c0e648ee99922699701b97aa714ac18cb64accac3
+DIST go.etcd.io%2Fetcd%2Fetcdctl%2Fv3%2F@v%2Fv3.5.0.mod 1201 BLAKE2B 7afc3015774fd36832553a5f2916bdf5a19bf4980bd3518b8d75385f957fe8f14d5ad9ace981744214fbe7c02308ef18d398c3d9c5e50fec6c627367bcc1b15b SHA512 7e7bfa65754e55ab06cf38bec2af4b1a47ff2e4a6884a082da4666898507af24f91fb9f3b3e6706eff70765a492e9bae0ae541a62dce2bffea0a6b7b470e6357
+DIST go.etcd.io%2Fetcd%2Fetcdutl%2Fv3%2F@v%2Fv3.5.0.mod 961 BLAKE2B 005a375e41c4ca1da28bef55b73c6062e0f437d52f4fe3090c87b1e9c31f06deda8517b18519b30d4e1f08e8c70908431efeec39a30dd4bafbdbb67f52736cbd SHA512 bc395053fbbe672a6110bebc4042ed3fc9b0e7b1ef0904fd4ff3bcec7413723e5522a5ddc417a799093b6a618ca9a63915fa6e8a7bbf1b8d96bc6db5b50e6a46
+DIST go.etcd.io%2Fetcd%2Fpkg%2Fv3%2F@v%2Fv3.5.0-alpha.0.mod 508 BLAKE2B f30a2d535d9775dfc1f64f8e643969dc3e2721bf2b952f83baa07206547fcad0f9dfb7ec17a0a3837ebe2f5ab495f976d46ed23ca1f4f2297a0bdc9472962767 SHA512 5b105169d8ceeec0bb776c26302f2bd2958bedf7211e7eb80508a85171481f953b2dd614786ad492256aeaef4e1bcfa6f46795fce1704f4b22de3c67a2682fc3
+DIST go.etcd.io%2Fetcd%2Fpkg%2Fv3%2F@v%2Fv3.5.0.mod 613 BLAKE2B feda2a40abfb37d687adaa2d1dc0344d892d704bd061ff5618ed701f2af33038c97b94491c470a6dedcc5d23e3299539bf0d37691eca72a498aed19ed14a56bb SHA512 cfd51181d9183b43a76ef855fa47cc86b56801f01b7a9e55ca469050433644b9f16a0fccc13a8bfa5f8ac12f218f32a95f1d360c1ae54d9af4744b19b70236be
+DIST go.etcd.io%2Fetcd%2Fraft%2Fv3%2F@v%2Fv3.5.0-alpha.0.mod 523 BLAKE2B 5d7113fd3e9e3c7c4e0c31af56ef109918b21a51bc2a35849c055ccc447838828b1ed498ae76557e6f8a2144318b13bf236ba8da41717f43ad25e02442fb0122 SHA512 ed950d0c4c3b273815563334cfaa7540446e98548566742a6392e313ccbe6a61cf709abcc8ba575a7ba85e2e7ad25ba15c9a5d4185d891571d8ded26490d09a6
+DIST go.etcd.io%2Fetcd%2Fraft%2Fv3%2F@v%2Fv3.5.0.mod 613 BLAKE2B ec6104ebb47f85a6ce98405a7acf6544970e9f90ef8636c7bf589b4ee9d040db43b493183368e5aa37693e4808cf97e51014cff015d17c9eaf2d76c1b079dc42 SHA512 61c93cf8d0421878a378cd81e7e62bc34581d83e9b88c9207560ef57303da66729133f41bbb264549936695dcbfdac65157e4e0a62b0cf9571c62a57dbdf7e34
+DIST go.etcd.io%2Fetcd%2Fserver%2Fv3%2F@v%2Fv3.5.0-alpha.0.mod 2233 BLAKE2B 5bef203433b985e85327097498174da70887a3a58e6b5ae08570af3ea39725d3ead993c87ba533675b61b517abd5c57021b4ce215fdba8f7e88951b1d87ae9f4 SHA512 336f19fb2dcba3e25a852885a6f15495e2f6f7349199079356a3b4e35dcdbd4a57d3fc1092352099d53851c154db8336192f5a79a5d560850702bb9c874f05e2
+DIST go.etcd.io%2Fetcd%2Fserver%2Fv3%2F@v%2Fv3.5.0.mod 2260 BLAKE2B 9042096df23e62d675597b16bbe6de4a844e2bf242d9ce2430af84f31d1c95d2b5a234875aa6576de970e64d627491f825334de1f99f87dfdc06f91a9514b83a SHA512 ab2887cd66256771cfcdac53ce7897bf1d63d31101d8a7930045d0802bd827024a007c2ddce57ad991542a8b1a448d6708dc01975f96412d3c066edccb7c1939
+DIST go.etcd.io%2Fetcd%2Ftests%2Fv3%2F@v%2Fv3.5.0-alpha.0.mod 1310 BLAKE2B eac3d174b62ac5cb15730fed999f65120b9949ce20702d19c1d7aa17b06909674652a0c5365f5a0675753b8fec2fe8bbfc0dce5144b11681d1d87b55aa11ae97 SHA512 97f48b52523cbe49854d6f2c40a02ad992729b965a5f0ce478c473fb0381d5190cf58f5e7137c06a23ea12a7c2dc975c6a9a8813a8cbb8f7d1c65ad6f1bf18d3
+DIST go.etcd.io%2Fetcd%2Ftests%2Fv3%2F@v%2Fv3.5.0.mod 1469 BLAKE2B 04f2e1bb63c55dd58bbff5eaf55f1de38ea4a3f876fd6e49f84a1c8751fdf869ddfc1528d17e99c0eaa892ac1dfc63ffcd8ac69607abb5f56e90cde0a12c60b1 SHA512 842b01f165fd6b49baab28af740b7bc3d489bacbd07513c49b74c5e18ce3cdb793fefd504edddf5251591d3383d2c4ae458c29770b776a7dd4b1d794caa02141
+DIST go.etcd.io%2Fetcd%2Fv3%2F@v%2Fv3.5.0-alpha.0.mod 975 BLAKE2B 0d298d2dad0de4c014f9fadfbd8549c6be385725413e78ffd5cd5d476afb6f637eff9666b6cbd00d49b21c37cb1320e661158eece4ee38548b0c5e77d22e2a61 SHA512 d47c25f8bb6c187040ef1d5a178d8c8cee02c0056f39ea28e2a01abf476f95c9631de25af673efd64a3fa4cf05895bf3d36609b62d733262428b794abf47714f
+DIST go.etcd.io%2Fetcd%2Fv3%2F@v%2Fv3.5.0.mod 1065 BLAKE2B 3034d33f60cbc99f8e0104d5b43ff75c74546ea42496113ccfc6974aadfce6438b3f4298d35d98bbee4a61627fee40288584fdec0d51ea64ee424a159734bd9d SHA512 9e123ed53dee4d940dc554eff85a3f964448172560c6fa0e488a7edebba1fad56906aaafcae902ae7e4820e42da1fa76eb39958e4662e2b4799235edb3a7fb0c
 DIST go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.mod 37 BLAKE2B 9905f25ce802f6b0c6cd290cd4c4eab44332910bd906dbd211c5fbabac7af525fdcf35cc6106e204c194ed9d8e609dcbf0ed0eb5cf606913985076bf2dfa3985 SHA512 f65d060c9eac0fd1d9dfaaa10e03423934b68357cf0ce693486b3e5353b04eee3a4dba0e9fa85c655a0973fbee9b0b85b02c3415b2cce70c52a60209e756b13d
+DIST go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.zip 50649 BLAKE2B 2030f7c582bac3357fb1bbc63be2cebf08f6244e2037747c984624f4c823732c3db35a99a4a5a0b5eecbe4219e6f00dcaac3193b45b08f8ce582bc8804759096 SHA512 afefe82d08e44c4acfa6e70429806a081a5ae5222994fcc897f7ea5a57e4da417fbf612f2b1e1725b0caeb4fc47cf1e7d2a9ad2fa612a517e55d34f5e98dff34
+DIST go.opencensus.io%2F@v%2Fv0.15.0.mod 24 BLAKE2B 85855582571fd53e79b7badaf424c22a945e7367d8161f2c348ab762392114632264cc36187001da7e54eed58ebdbc519770977fcc56c3f846ce3bab22115835 SHA512 3b5d738ca5504c5c7f74f7557e389a002365294cd58bba99e8af5aca5a6fd4a0108f8ac5e8267eeaf73cfdec7bc3b2db0e445bd337670ea92470a05106f67461
 DIST go.opencensus.io%2F@v%2Fv0.18.0.mod 1118 BLAKE2B 55892f4e07819a81da5ad96866ff71d2195b51051b5786e11d1e7badca1804f8e7dc3231dc17f99c9d4d00df45e7825ea389a30be8fd0f0670e9620b551efb97 SHA512 6992b5459b8f831b93b69588300374d1ee59e27056887687dd52baf61bb18c41e2ca75079cb17acc339a9d94da79bb697aa96e68af966abd73408a724ab70d2e
 DIST go.opencensus.io%2F@v%2Fv0.20.1.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
 DIST go.opencensus.io%2F@v%2Fv0.20.2.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
@@ -1172,8 +1486,24 @@ DIST go.opencensus.io%2F@v%2Fv0.22.3.zip 299798 BLAKE2B 6adc76c28569e177bf40cd2d
 DIST go.opencensus.io%2F@v%2Fv0.22.4.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
 DIST go.opencensus.io%2F@v%2Fv0.22.5.mod 478 BLAKE2B aa63f336c10d04557c0f24301afc55f32d5d9062c70a03307bf7b5b7626e7f2125be07c7b6900cec97e1af9429d4930bac4d67179d87575e90acaf68d7fc3ffe SHA512 e94311fef653435875bf2c670a9c19e0e1fa2d6761b9323115504d2acb154596818d5ec9d4f65c662e607f4089cbbb6be0cfef0bb41631260ff8474c759c1323
 DIST go.opencensus.io%2F@v%2Fv0.22.5.zip 304246 BLAKE2B e0fec87affb4467ce127e62d6e86dd371bd32d4b8a7193e5c3cc39f306e289f67f3026b43930a23b60f6c42367f29c28a0d31a146cf19c13a79fed0e961af9b6 SHA512 905c4a03641b7978a06132f43f9fb2402ef4fdbea7438ca8e8524e48a142c0ff00656abc9857c7bf64bf0de159e7d3f972c3dac1cdf7f608afd3ba7506b8518b
+DIST go.opencensus.io%2F@v%2Fv0.22.6.mod 300 BLAKE2B 768900ce7738c5e1de5c550f1dadf600bae434c89eec337e532e50542487226c79bd113e2b8223c63c241be631ebf5b177441b1b583317425f850a0efc6a02bb SHA512 67849dda4a765e79351214a3641bf601dcdb404f83fd48cde5c6b4fd7249868567424b9f70e0bdf041f6e50f6fcb82239600be8f62253835e4c7c8a17c8d8871
+DIST go.opencensus.io%2F@v%2Fv0.23.0.mod 300 BLAKE2B 768900ce7738c5e1de5c550f1dadf600bae434c89eec337e532e50542487226c79bd113e2b8223c63c241be631ebf5b177441b1b583317425f850a0efc6a02bb SHA512 67849dda4a765e79351214a3641bf601dcdb404f83fd48cde5c6b4fd7249868567424b9f70e0bdf041f6e50f6fcb82239600be8f62253835e4c7c8a17c8d8871
+DIST go.opencensus.io%2F@v%2Fv0.23.0.zip 309862 BLAKE2B cc1876f2670ad970a82ad2b58cac621086428e29145ec62f9917902100236471547339be24e2656fd5c3d6ed4b2a10861edb5879e85c0bb9308b0b334df0f4d3 SHA512 90ec312a3ef194251f06ca8c6535b97b0303b72c55cdb602f6f33b1c691188fd5289e4c7323d01d5c66b15411b28a4fea4bc817c41fad6a7d206448fbfa498c9
+DIST go.opentelemetry.io%2Fcontrib%2F@v%2Fv0.20.0.mod 44 BLAKE2B a52ef031b2b9283ad316c95ccaf3958a369fe3d07c90cc54e28718f824fb0df687588be003bbc03149ac9ae4dcbd931be08f1e49d7504a10cc3b04be9473e3fd SHA512 2aeb2810ba46082ee859e3928d6117196accf750332c2b2e5f9e572e44845221e90b714f270786a46e8e34a1b4f6fbe053b63c21a9996b6dc5680669cc68a99f
+DIST go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fgoogle.golang.org%2Fgrpc%2Fotelgrpc%2F@v%2Fv0.20.0.mod 443 BLAKE2B dd18627161ac6a1840d7264f79ed7bd42d8cd28c9761839032ce2e1f72ae3381acab73da7a3063f9c8a6e2da13cda99ba1d8d06e312cee2d7a3a9c72be358674 SHA512 c375129bd65f22e9f24e52be6cafcaec52319a6d0811a9af7452a3d1ea143f351db541afca8026171d01c595b46eb37efc09e3423e7ccf43de3e9c1ff32c1117
+DIST go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.mod 1800 BLAKE2B e2005eaddd67d04b79f8295f1bf4d0018106f36cfe8a697a23ee1ac6767faad43b48a87b8fd0412c813139977f7188db008bd0c278fcfc0aa1000d5260487ae0 SHA512 0c44b58671f37f097def825346d69f0f0288e81926075b4fdb970e74757e333d22a8f552657ecbb152145e27277aeeaeeb2d09122de5fb1d1e284b1e93e68bed
+DIST go.opentelemetry.io%2Fotel%2Fexporters%2Fotlp%2F@v%2Fv0.20.0.mod 2062 BLAKE2B 446cef219447a1bf7da98f287595f5c1896ace21bcf84df7cea23519e4e04a47b61803278955b5a27ee4800ac73cae159078e84df909b7cffc04c99153542cd8 SHA512 a70147113108c327fc4fd41f64639aa6071c399d0e2690e74c369537add86dc3e6fce69c6add549b9fba88fd05d14bd47738bfe3f29d9780b3b4b7bb68ce2812
+DIST go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.mod 1775 BLAKE2B 1d218c7e1adf5e04b19fe3447d1dd7da1da15cc71b3e9294d7a51e0397265b64857ca8d32c6ebc3b61d82a0614ad371bd46d812569dd378508b9a1a61363981f SHA512 34f8d2fc9d8032e6548ca24f7680e8dcb0d528ee183cce383cfc23d4f1b643f52ca4ef624e34dd04cfd37cc9d7fb784a36e09bcc171cdfdc13aa5208951a9350
+DIST go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.mod 1744 BLAKE2B f053ca414f157096060ae3a07ac0d7f4723b716db892692152036f397d113dff46d43ca2b39679337bb47d48ffcfd6fbe3a49a8c63774383ce3518cba5854057 SHA512 cd84eadbecf933ea3f0785d4a604e5724d95deff0a152fb66a48ec38203f640da45780fdc86cb61d2cb8b996c9596e20fab92d6f54acb4f7fd22bad2354b0c41
+DIST go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.mod 1805 BLAKE2B ea3d75f8a92ae83eb39ed4230255d84c1897ba1c4658cbd603886aa9ff817279f6f79b336de3ab0dc4901add3bc256dc477d3c11a323e27c36e7e11aa7522dc5 SHA512 33568d8d5f47cb528f78f141f4f4970a3099ee9a1a651c1172c117a67dda0977372b9b052bc7ed258677ce7aeab7d22e33b0ce4a54deecbe50f2a744bed4f199
+DIST go.opentelemetry.io%2Fotel%2Fsdk%2Fexport%2Fmetric%2F@v%2Fv0.20.0.mod 1889 BLAKE2B 60980f58ebb7d0599609030f781ddb70f4d46240813658c51ea200cc061ad7444705f26250e3c0083814939c4b89dbce571b012035325ff85f038e361de16833 SHA512 2088e8a3e6c25b15511ba67618c9a68037aba4a6f63642cb3f772c14783daa2fba808db696d335dab13ab8dcd18ec014d56c5dc4d89274c726049c60337b9903
+DIST go.opentelemetry.io%2Fotel%2Fsdk%2Fmetric%2F@v%2Fv0.20.0.mod 1980 BLAKE2B d77532489fd26a0b67b6e29c01f258c932b3a25521cab45b5dfe94ba3915f691e8a99aecd41f1bc3cc4987f7197eeb412d05dcea7222fc5d03a417fbb30da031 SHA512 80f4e868f589281a2b083aa5f7a2e352262d95a49ccdf7c71afc4c0c6c0947de7107b00b6b890e1f17401a18d3e0905af6ffc49f2210e0585dfe28f6f325a68b
+DIST go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.mod 1732 BLAKE2B 63cbf98b7152adbb31a47908f91f994355df404ae5010388ac4a99ec19594ced0ab7947f11edca423e7539c0796df908876f6c4370dc6e0fb4316b07d50e125d SHA512 262d653a0e1d1ec20d5dc2fbb3df55f84100bfa803184ddb1bcaf86eeb055d927cf090f5909795558698ff0104703cda2b1826bef34660fda3b2154667461f1f
+DIST go.opentelemetry.io%2Fproto%2Fotlp%2F@v%2Fv0.7.0.mod 211 BLAKE2B 108e3a16472a1401b8ec1b18180c109e034394988b06050b6dd7e918d578917d1b6d139296b39046e09a9f6e251ea665a2cabb749b4b342cb301e6caa2cf0498 SHA512 4348e909c754b1ca8cabbafa293377cbb8f2b4f4d67ec412f6bcae4171d7d0212851d90631c1354e8b04b7955eb0a8077e5a86fbf8ed38d179e9ffb2e1ef16ae
 DIST go.step.sm%2Fcli-utils%2F@v%2Fv0.2.0.mod 920 BLAKE2B c63ae1118dcae942eff01baa728900170de794f090bd62b0e46189456905e7ea9f929540354db7351b7596bc8e5da88c9eafa639715d956dda9ca3672905484b SHA512 40d71ede335623a67ad6050bcb1b12bece0efdaae61586639a8593fbba8b399429b33b5b58a82d8ec17194a0400251f9729c12399cce62c0cbe0a602b9fac1c3
 DIST go.step.sm%2Fcli-utils%2F@v%2Fv0.2.0.zip 175738 BLAKE2B 0066f7ae4dc10cdca320e4a65271ce20fc7048120cb2bb355e8ed5a290a4c575c78296aac08bca9ca8eaa235934fd993640b45bfea9d177964fb70f29642dbf5 SHA512 9fdaff840fcdae1f4e9fe32881eb867d5e40592bc2da70e528e20db22787f5a5740c6c0cd61d26a8004854784c9804933b06f2338df2c16fa55e46043c3d4f91
+DIST go.step.sm%2Fcli-utils%2F@v%2Fv0.4.1.mod 1014 BLAKE2B 91d1707e9142e3958007a6f386405a28066f546004ec99f39af22361dd5026c746ec6460e46871996460abd1a2fcbdd79afd051b85f161ce4a80b0e75e165e32 SHA512 385a25d4dfb77805dfa2eab4ed50e289dda2e5c9cb3e900b135457c6bbdc42901b0b57f6bc13902378de31c842104e390f38705eb429897781597daf7f8533d0
+DIST go.step.sm%2Fcli-utils%2F@v%2Fv0.4.1.zip 178209 BLAKE2B bfc5256e28139fbbdd9f7015ced92abee639a588e184427eb528aade821d23bc1e7d1b3a2e7ab16152540797023f20726c63f5a0517390bdb8436892d7a7a626 SHA512 9fa99538456aedcb6155fac58ec171322387f857e2f5aac0ac34ae05ee6ee0577b4aa437bb90ac725c77cc547a165a14b9d1ded300fd8ce27b6fa977d4dfd9bd
 DIST go.step.sm%2Fcrypto%2F@v%2Fv0.0.0-20200805202904-ec18b6df3cf0.mod 117 BLAKE2B 414f2649386957b2889d0ceb9a26f2ecddba9997e0e698790bd5eea94d85b5b6e443df2ed01b2d522ae8b87b15132c0499225689504e023252972e27ff84490a SHA512 bceb2c901c47bb06edf8978e8db3d631e1fe6f160e0538a47c5ba1b4c4caa97080287ce8c6148525eecab0033c0fed728fce878d146b58be045e6f4960b3ef31
 DIST go.step.sm%2Fcrypto%2F@v%2Fv0.1.1.mod 237 BLAKE2B b50dbe5755300051504dd1ab510108803d528ffbc0b59bd23b89dff4fea4daf4a6d48586a952dd012497125684d7c5ab3d1fa6af3a0e68201cfa437a2ee04ade SHA512 4fab62ad1a41641792562708e42263f28f8b06b552631a726cfe656b9096fe51cee64757e8f9967b77962811f6bc5184b7721bc75b3bc7ca011cad67ddb3c5ed
 DIST go.step.sm%2Fcrypto%2F@v%2Fv0.2.0.mod 446 BLAKE2B e4c92ddbceb48b81cf7d1c93b784915b4774512a7b49a0e30b3725a8c6e798d5879cd08f2474481f7621e6ba57916b18a2581509c906c253f24a63719e2db918 SHA512 956c1d0683f5f26407b4c4a4be17de4751aabdb7de032271ce5ce2a6102c913f652ba22b28fcbb082223c138195f3a61cde21eb5f955ca3a2d5794fc33be0a09
@@ -1182,6 +1512,10 @@ DIST go.step.sm%2Fcrypto%2F@v%2Fv0.6.0.zip 187463 BLAKE2B f60e787fa2cf570a93500c
 DIST go.step.sm%2Fcrypto%2F@v%2Fv0.6.1.mod 272 BLAKE2B ec3dc9ac04aac0f907674a1b3e5e90af4ab61b0be10e1584a537d8f9ac128acf007c7261259a58e7471566e38d739c915c18f74515ea6d73fcd0171af6663eaa SHA512 878c6701fa641f31f2afa734f59be7ce749cdd3cbd042518c391bae57a6ce6e68237204ddb14bd972f3dab2d3607fbc4d92de3f15a13e13c4e11674779d2f896
 DIST go.step.sm%2Fcrypto%2F@v%2Fv0.8.0.mod 325 BLAKE2B 9f351c3d79aefb4446dfaa3b8964071a416c087702226cb7a2f699c5659f5a830e2703e132d560c907d33ade0bb498539df90cfac92a418351a6f331ab152874 SHA512 60c6866551413fb2590c09bfca8b77f6aae7cca15b2e9292d1fb555cbe921bf40374fa2773789bcb200a9583fd4cd0fbb00e659a4bb88a36e22345732650b99a
 DIST go.step.sm%2Fcrypto%2F@v%2Fv0.8.0.zip 199198 BLAKE2B 7f3c85ae6dd981e877aec4d91d5b95f27f210704f34c3350f94d8be6acf0c6216beac23c9aae8c054f213a1cf79650668fbe24c12c9c8c2d0a83d724bae072a0 SHA512 591b15f48eebdaa748da92c7b17b2005260464caaa6184cc2f91f48da24ab7ecb6cfd5e7c5b3df479820d76027628ce13387b874cacccad7d1a291b411bd4b65
+DIST go.step.sm%2Fcrypto%2F@v%2Fv0.9.0.mod 325 BLAKE2B 9f351c3d79aefb4446dfaa3b8964071a416c087702226cb7a2f699c5659f5a830e2703e132d560c907d33ade0bb498539df90cfac92a418351a6f331ab152874 SHA512 60c6866551413fb2590c09bfca8b77f6aae7cca15b2e9292d1fb555cbe921bf40374fa2773789bcb200a9583fd4cd0fbb00e659a4bb88a36e22345732650b99a
+DIST go.step.sm%2Fcrypto%2F@v%2Fv0.9.0.zip 204120 BLAKE2B 474fcbd0aeae9b9673eb8fc71856e4c93cff839b7da48c28633c1b186d2a9896e142a9bb36e94457ee7ade8a04408400d67656ce5c10959537e5e8b5fc843d68 SHA512 83e87c635c7ae192d3396704a110212d6f1f3444be69b767e91767af16f2db968a6cd28f0ae6e329620a7ff29bdc19d762f167140019f1553e5704794f36554d
+DIST go.step.sm%2Flinkedca%2F@v%2Fv0.0.0-20210611183751-27424aae8d25.mod 117 BLAKE2B 823200180c7112fb33a48e8f192a7b70fb80c6ee70cd83fb0b84fe85d12e2a0cf895f82c4b88f10d9e957659d5ffe1cdd9a6105bd104bddefe0380bb5ebdbbf6 SHA512 f293c7a3161d6910535765b74e08c97eccc0f55b1bf702f538d1dc2fc1ec5faacc31cff10d5534249528e5ea893431e599a8b24285d9be45b3a45fd93d4a5052
+DIST go.step.sm%2Flinkedca%2F@v%2Fv0.0.0-20210611183751-27424aae8d25.zip 32562 BLAKE2B 1600d5e7b5320b3ca90676d4e97b23130fde9c0d65c8fd5fc7bf4b3d4af0affdfa137fcc0a1a75b83b4a312bebf583373124eb557499e08b4b1cc586b6ff479b SHA512 08c98f5b19ed6156717b535f147501810c8ae2be8c0fc921f0c65031e7cef15c41493e31b1e66c15acd716a7d1a36d4faa2c49ce0c8626f98f886f2124bc2e1d
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip 15027 BLAKE2B 06a2451071b8cb0de9b4e664d007584998c91acf4bcca04be7f6c4e97c2579a9cc174e4db220347a00b252392cd6f3aa3e08e27ef3a231d422512a419a199c2a SHA512 be6b2545811ac8a869fd0365c1126be58531a6c0b51690feb17d7e88a2b79dfec6a466ac317df15e4d038c02df0f72993ae3e50a218c9f7f6659787c7f8e9333
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
@@ -1192,6 +1526,8 @@ DIST go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip 19110 BLAKE2B 749dab9cbf012066f0d8eb694b6592fd4d1819dd3b27052a76940502d65900b39820091e683c1c8561f4b65262dade55db6be331b1ba8517c22ef7aa39ade990 SHA512 21b8036b73a07887db6ffb620557794241c085e01be44e45c93ffdb2aa6b47783151f37fc4023bf847e091e1150466e84a67394070d945cc4a35a771d278f61f
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod 131 BLAKE2B 0abc8845d865fa3a1e96e938a9df81733f6d658b39592df46f26eb3292431b0db554eb5db00671f12471cc3c0e454bdf227215c0f9adb182493b5c146a12e3ee SHA512 ac727a2635d02ba4d12c9af7a9ca2d27c0f1bbdb2f2ef797a2852cf569d33cced35be8ce3e95e2ff3b13a0085b723622656ddb8731c055719fbf62cf10caa4df
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip 53254 BLAKE2B 55083a93da944305baacb592cc1145f191412b4fa0a98ff3f4180484d7a3bf4dc65561d71670b8a462126f10ea82a3ca2846f73bacde8c9d8c485e895b329598 SHA512 127df97ad28854e4db92b6ef8f147c50eecf49e6a3f70dd0524325f24aa6bfe977127513443cd8926589587654212acfa4cb8f153e2290b8b27aaa09dd846368
+DIST go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod 312 BLAKE2B 16bf4900b2afadc331814e16a34fa8cae0cfdc78c7ea9704312f121e166c93b7811db3604f6c167fc526faefdd1eb0ffca1dd09581094bfea4847fe0f62ecd91 SHA512 8814a6b8138027c366f3ebeea9033a71019990faf1cb613d75a25498a3a74d61fa2ba662302254150370a49a2a6f56da5c54889d4465117cf8afed4ec6cd9f63
+DIST go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip 24823 BLAKE2B 25394ce97a80093bcc7113c651d95fc383863a5efbb47825d053890ee2946f04ba4b9c4bb708458183b91f195133d22fb4bde840a25b6150c1c6a756ef417fd5 SHA512 cad58d0a0f37a7ba9ce7fc5d4598d511eda4bc675689f968b1d02c4b2e95d15976b6aae9d4b8655d2aa85e255308414e474fa6d42e4f49b31092e2b943648b36
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d
@@ -1215,24 +1551,32 @@ DIST go.uber.org%2Fzap%2F@v%2Fv1.16.0.mod 282 BLAKE2B cd8f8b009c9a5c34381fa6946d
 DIST go.uber.org%2Fzap%2F@v%2Fv1.16.0.zip 231211 BLAKE2B 3a325fbc884563de82d57f4c4060dd01c236317a4e075c3bad03664a19a9e56587dff4fd8a5fbc60b581ee719239b1d45eb1cc424c35acefc84999ab85cd33eb SHA512 da2e30804aead70f6a865de5f5774bba955aa3728a67a322e22413641c75abffffd830f1e5968d6ba241c9012708758a1f1a3629d435954f20602fa9b435c909
 DIST go.uber.org%2Fzap%2F@v%2Fv1.17.0.mod 257 BLAKE2B b03dc3f61ab15720e3e89d8725be6a3a500f9aeba17419403df4bff7ae52b60abafb43af2ef785479017f625c6a3170913ca975fac64c36c65c0476b519540b5 SHA512 9677119c715a41ff061ea5caef85c35b23f79648aa09015e7427ded423c7ed73c0ba7da24d8fb586ea038499bf42ff211e5a328102573b67122ab3a74bfd9ebe
 DIST go.uber.org%2Fzap%2F@v%2Fv1.17.0.zip 232744 BLAKE2B 1d18d6beb771fa235ee9b999c4315817e068d0f4feda90ac270b90e81b67ced86e1622e30777871def262923a71950e81661d08d53ffb64398078e367cf9609b SHA512 4e5aaf0142e579b5b5231adab8b5c9e0a05aa5cd535ab16d04814ba39ff6aa4caa938d8af7de00dc1cd3834328dd2bc424a522261a971590e87a0dda4fb41520
+DIST go.uber.org%2Fzap%2F@v%2Fv1.19.0.mod 322 BLAKE2B ab54fc54cb7c1e1e6b5d8fe1bbd3d19be4377d07c24d3c34dae35aaaed88411749d531cb81e86239bdd0f626bd5caf7c4d3d5ca0ff06063b52184a8af380cb97 SHA512 13030c97a9e0119342c1473ea7b25557511fda6eb4646f6df8694ae3b2efa168053f57fefae375add65f924325371fdd98a82e44f976eb8e8f29e34ce0aee82a
+DIST go.uber.org%2Fzap%2F@v%2Fv1.19.0.zip 252247 BLAKE2B 26640b154861b39c2704592310b523f60024a9cf0281de8618ddb5361cee6e2235ce95695881930d87c1d83d6a59073b46f2cbd36c0c340434dab88dece1bcc9 SHA512 9631c54a67de5e12fb7aed1eb0b8a434b3a8b71c42ddee8c09b2d968e71184936f93534e8848d5a4f58d229c64244885bbd1de97b142126b73a19a00b02812f7
 DIST go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
 DIST go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod 15 BLAKE2B 00f2fbcebe2e9f068ba7e7dc4da2bf2e66f09203415957a1dcf8d5ca6aee422579cbaf2efdb4383985742c6e71d41029a8c68c20a074819666d2db732cf1ed13 SHA512 5bccd8605a1e1d8381adc2f52e27c600732590e7dfe261521b149fb6519693e1124e471c61bb7e6bad8f683d684c7a652f5f11ecc766c84286a51e3837cea6af
+DIST gocloud.dev%2F@v%2Fv0.19.0.mod 2302 BLAKE2B 47e3f6aeccdba16842935e2a9ea537c2ee16b93027c6951379917f6f58ccd550232dc5d35f79e4599d90e7626666e0d2127f10e759d8b1d6aebef9f32ba5eb7d SHA512 1ffb6deeafb48fdba003899da97094945f6411325b0d02ea4e82b25e87caab1488b2bf2e9c09082f3fdf7b839789fc0e6fbca790b06645af38007437f040bc8c
 DIST golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.mod 4407 BLAKE2B 01f20c6ca234f03f65fb5bca568f3f86c4fe49308030dbd045434025ceebeb168508b7d104143fa38c8476c4a926cba29bdbdabcc7d8a1f8bbb1fa7d4bcadda3 SHA512 a207bc1fff631a38a2ce1e1c041548860885b201919aa2d729af31b9538f7616b61f695c3cbed18146ce5bb79c72823425914050b5b75115f9889fc94d29d1c6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180501155221-613d6eafa307.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180621125126-a49355c7e3f8.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 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-20190313024323-a1f597ede03a.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod 88 BLAKE2B 22568b660b7e13eed0dd423bfb6b033adf659a2c2b59c6ab12d707aca9f6f7317b7b438640caf6233dea4d9840aec4eb997eff5fcccbcdb193ba81db52d814d7 SHA512 fcfc8d63d333065f1193e9c27efe32a1fab270e450fbe1db533156e00427a13c75691163cd1bc7e9aa26b84d4142625c9fbd755535c575f83d63d82d7a276066
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod 146 BLAKE2B be8899d39fa75a36aa5a09db22d890466433efdd5310fbe61e7672f3c008a9aa34d038f844ca92450e9b8dde8c7d4d3649984f5edcb02abc34c71f46ce584c76 SHA512 173aab1e733ef5c18c3d259720c9fd7e46681d525ec934b4dc29a56beb91a362216768c28b50891b6230be003bb8e38636974e941d4fe6270a016798675fddea
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 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-20191117063200-497ca9f6d64f.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191227163750-53104e6ec876.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191227163750-53104e6ec876.zip 1861371 BLAKE2B 27c60a280e5b0644abb8ec34c645d165e6e01be124c2600d43e22955e785632f82c4597bb19ad1a61f04ae2701c4a5005f899f57d41f111d23535d6a169973b0 SHA512 62f52a80a1944263dc582e6f33a7f52d86aba7171b7ab4edc14dd22b69f523c83469fbbb04b2cfe2bd013b0920ddc15a9977ef8b58f09179d136157c64331576
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200221231518-2aa609cf4a9d.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
@@ -1247,9 +1591,12 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 B
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.zip 1876304 BLAKE2B fa57b9b35fbd6fc1e9c64a15e5f3545be4affa2bf773e375dc3658b4384a501de6e480e0b268d1f2c4eaebdd8f0cda71d42e7642472b4b89106bee11e58138d0 SHA512 cbffe21e7836f45412e5c7b2d07fb820b1c2f79e4708d1a3974eab3840460231083069fff4850499f2305326c4c5097b6b16754ba7ab3c39655ccf2218bad259
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod 247 BLAKE2B 66c7bddf0c6300cb14884379a13eacf7ce4cbd1e86cdd94fbef5f67bbb27e263ecd4cc2c936b7f95751b7afadee561629014be9d997159c742be2e5ce7bf099d SHA512 36d6474a79deda7b8749681b46e682e0440d07b3e8930279c66a45c0d42a6f2c6dd75b7bc7c3cc1ef50cdeff988442630af904ff0f58bb2def5f49040ade16cc
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip 1874670 BLAKE2B 15ddedd5ae7c1f4f279502fc220fed70155caf23a21b9a79c2bae6eafded5ef966b07b2c4e2748735017fa1e312062052c291ac2862adf5e1b7f9b110f9b6508 SHA512 6494794aff8498860f5af522d4a4921278c6aed6e7ce6bef3c8cfeabfb78810e932b66d47746a2bd416c538d5a277ccb82cab45a479b37fd0484dbe44cc78825
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210616213533-5ff15b29337e.zip 1874722 BLAKE2B bf7accca99c66208a9fed48a6cd003a5e29ba78bd28c836b5eeb0821c03a0729bc3b72177f249129f01292a4081731716b321e87dd577b9224aef22f081de179 SHA512 0f8c0643a716a7a84ed55906d7e5036ac99cfb0e3130486bd300e22fe942b825be6a46b6d217129232a0bd9f9fab98f5eca423feb0573ede7c23aa708b64aeec
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
@@ -1260,6 +1607,7 @@ DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod 485 BLAK
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod 515 BLAKE2B b37d0d779f058e58ca3e350248cceaac958c4e406d70872fc3682f49b862391dc75d0a17a9ecac8a5dde4339552a222ce2f36b99d8daa3ad01fa5d8632351b3e SHA512 c5f79afe4531059fbc6acf58b7ec7f1e9558df83c4936c830dcb138cbfd7dbc4bab6c0acce6e0c588cc742ec3984d4116ad3e03be815c4f64af32f7ea5024053
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod 572 BLAKE2B fe37c4263fa4f07a01e65941f859f6abd92e26911622e8b06464ca1e4b65efa46b43eb1c475d6888a67d21b6104aca3c227f42210f0ea8e6709a497f13e1b45f SHA512 a773e3b5c26e95dd24414b9f2aa88225a330581cd9ed0c1ca83a3a6712dd3639e1526abe7c0ea47f9ca701828eb39e1df2144edd6ab261caf584a058f092f0fb
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200331195152-e8c3332aa8e5.mod 626 BLAKE2B a58cd68fbf85374d55340edaff0de625de9d72f55863880579de5424028768981e6bfa78e082d7771fae27cb50b369c3eb16c7792e3e6f0f5516085aa2c08e51 SHA512 495be32e121d119b3ef9572fa92e7a9ea72a977cbd582e0830bd326c1c73a8b4bd88298063622b362d2ec51f2b1b2da4049d5a980cfa2000308e70bad9b923e2
 DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
 DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
@@ -1275,7 +1623,9 @@ DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.zip 45839 B
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip 46076 BLAKE2B a3611608a1963ae2e1e326da29671c30a1d44c7afd2698f85081aed84ae5699c16362af284e299bd4ed721d20052801a79886f0b1305f91b17a2bc5a091a3f27 SHA512 b35cfd6b7640a526780db3c3bc62a89ec731793e350a49894c1de278b8033c4105b5534b09c1ffbfedc8e020fce2f42757808550e98e0ef5d493891f971bf247
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20210508222113-6edffad5e616.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20210508222113-6edffad5e616.zip 46224 BLAKE2B 6a3961daa35b847f0bd943fba549cf89b69af80881d5de257cef88ea147f4f903598ae9e36232c00bf192dcaffc9375ce99854fbf32f897c81cb55dc2c31f7d2 SHA512 6a0f52ae48069a22d899047df2c2dc8b33ba053a5092eaf4f5b5dca59b97c38e189099918a725746b09fe02de5d68079926770d5f915424de223d2d4406362d2
 DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
 DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
@@ -1285,7 +1635,11 @@ DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod 159 BL
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip 126236 BLAKE2B 48caec10f6bf4b8da7028b0358645ab0414b5526004479ceececbd68380586bfbc5b4cfb9d43f8c608565f30521a0dbfe005669db7d5e245a1b63ddc8171d3e3 SHA512 2735c124a735b4cba606e4e3de5bb39c889aae2516525f778764d987b58677dd263cb286604fee63bc45636662c11e3dcc2c9726dcaf85a26e072ccd56597b93
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip 141789 BLAKE2B dc517e61f7a9c895d827ff139a36b319c7dd335e85755dc394d01ceaf8b3ce07ef13201bf6d704c31895bf7d91c15acbc4ac75bc8cde065ab4f81839453e0c5c SHA512 6376ecdccd2eeaf828a2c1f560e116c003caf5e09fe68e94a37d193697c93b18bee14abbc06edca93ca57a924f9b270bbe1792df84a7bd66e3641ce6aecbc9b1
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170726083632-f5079bd7f6f7.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170915142106-8351a756f30f.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180611182652-db08ff08e862.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@@ -1295,6 +1649,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180911220305-26e67e76b6c3.mod 24 BLAKE
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181029044818-c44066c5c816.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181108082009-03003ca0c849.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@@ -1312,6 +1667,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190619014844-b5b0513f8c1b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 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-20190628185345-da137c7871d7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
@@ -1320,6 +1676,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190930134127-c5a3c61f89f3.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191027093000-83d349e8ac1a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191119073136-fc4aabc6c914.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.zip 1499692 BLAKE2B 2ca64710a73a42e2c956ac30aff1ef35e9df2619ae3eaf7ebea4e6efe6cd322244daac868fce5842f08d14eb2ae3b20654d721bd8713fe2141b409aac593dbc7 SHA512 49ce7d40e2a126a4bece83b274e7c5ec18dfbc3fe2203290022a47d4eb651425dd3e90e23e747229e0b5c734fde374bfdbff629ff8466767cb17e8e94385719d
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
@@ -1329,6 +1686,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.zip 1500173 BLAKE2B 6b2b9d94b3d6dd87fe74caceeb75254930831b14e03a54c4774374c96e74ee05917bc2e92aa38ccaa2ec41a02134b6303b668947ac336e3635aa43b7e97d2272 SHA512 63daa5add6fb2c5d315b507208a42a08a65d122b7ee1ce5772087453940b25c2c59e404ba283fc543b4814df9f1bd900e18c5c3cc4e2acd9c70fb26e46949ae8
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200425230154-ff2c4b7c35a0.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200425230154-ff2c4b7c35a0.zip 1500495 BLAKE2B 29da4ab15ccf128967369fd5c3c881d94af2d8820d52de95b7ac99b221ed1e912b49a1318d9665fe9aa2431c3c267ad88bfecc87e4fd4ae50852de3de8bb6006 SHA512 c376001cee1c89fdc414adeeb9a277e81b8b69e243ba597efe07e3cf70c62c38196dc78e6eb1e2da01fd84b6d154e7636fd6043fedee14e65400757c67f77848
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
@@ -1340,15 +1698,26 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.zip 1580428 BLAKE2B 3bc05480dc51b5f2b1b67473a4955a40218100e989f6dff8d1bb337cee52b451554f743448f8b39c3df73066c30f0b7740303807141ff2580a0a9a5b96e3ff21 SHA512 d2d645328924c9e9eb76e267cb47a7397f5cb200ee0a1a295eac1b0da4ba87657c64a7b8f2fc8aea3a359c4f44255e8d44fc06e40c65db539f50f9738b55cb47
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201202161906-c7110b5ffcbb.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201209123823-ac852fbbde11.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod 179 BLAKE2B cbbf790357e705f6b365164e871ec1a61f38f08d3657730186e53b1e3a3d802cc0af8032be7f59252707c6d19dcdeb6f8b9ec3d4e7af74c1511bae31da54046b SHA512 22eca632a9bff1e24cdbbd1060a6c8a1aaf3bf7e06aa96b40f1848877cab00b8687309b9466f703664c4988264fb5a62ee99bc216038bf1096bc21fa27ef988b
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod 179 BLAKE2B d4f0ad22973a6e0a06b186e217dedbea3abb1800b259c56a29da9075c36808160620b42b0a485127f713760b24b4d9d6d9a61119c5739927340436bac307f5c4 SHA512 f48731641ffad3b90daf0a8bb79fdfc607c076961dbda1c51e71eab787dca0681e5984ffce048bd655ceb56052fa64426b30b32e6ee32957c92418a16d1c9f06
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210428140749-89ef3d95e781.mod 179 BLAKE2B 48e3d89e20ae78bf2300c3004911d5247c6a682b66e213cb0bb23e516b52d75215bcffc85a1f8cfeef888775b8eaf7c90f850bca034e49218c1f93e6aec6a7ff SHA512 98c9784c584e8141a9a51bfa8e4b361f3b8a62b83a922ee4fc02e0da396250d6d4d0ccd2a8ac6d1dda8e445859d09760010296191e95b86e15088425a2989b0c
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210503060351-7fd8e65b6420.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.zip 1566157 BLAKE2B 34caf278d6440392338ac082a6b532066b9dc29a381f8afc063de39980814e97c72dbdc933151dea18ecd95ac3786a6b7a25d40c73237d7ae600e6f9b2f484ba SHA512 4692d098499dcc3c1781380ae4e7fc0245a8539c26e5d6b86f8b83bab14c241cd6599855992e24a5974f794f9129fc3812d216f45bfbe07cd4a303084e7491cc
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210614182718-04defd469f4e.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210614182718-04defd469f4e.zip 1566909 BLAKE2B f1871b07e4d6376e257d1308dd2b2a27541cddf0b0f446b324eade87f5c47d2a3f7fb5672fbf6765f1c7804a2ac5964a7a62b09ebe2b0409d08bcafcb1cf363d SHA512 acea0db53572e8a5fb06af5a06c7cbf0f7ce91733275a8676595b0b03fd1ebd6ed6cd9f86dbdbbeae0cd7ce20599f2f954e6ef62a791354887da3ddef5b1d023
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181017192945-9dcd33a902f4.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181106182150-f42d05182288.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
@@ -1359,20 +1728,33 @@ DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 B
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip 84373 BLAKE2B 39bd0256afae566a53bb0b7b95adf0416653fd003bf5312c7a316a2d7c3e5d1fa25fd08bdbcdf75df45a56116fea54dcb1bf9b68b07d15d3a909e072f8f9fa06 SHA512 10a924e5fb556c2726795462c91fe7086472d6baab511ac21c1fb3c137e5a3e0db55f9ce8fe1952566d887225e3528ec8b747136f8984163acf71e869a0d8c58
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.zip 95731 BLAKE2B e67596980557613a1a596dbe39b8346663e4a31a8c3aeb2d24773811aee1e3457db6cf0d91c568c59b6907b3c5c0cea61d5e803ba89743075dccfda4fc89a42e SHA512 3765ad17beebf3dfe97d8095a64b8eba3e1ac19f5b1efa24daf5e155a6a51fbbd4241923ef3a4c3e8dd51c11965ffa09370dbf8300028d15d02f6a4d0f2f03d1
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210126194326-f9ce19ea3013.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210413134643-5e61552d6c78.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210427180440-81ed05c6b58c.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.zip 130280 BLAKE2B 059657166d467838c995726802e70dd5b8937ce28d20e13551e26ac1ad82f95b5e2e43eafe1dca541b532599e634b82c490b5308b3d73fa643da8d67b8a85619 SHA512 24239f223b233ab07c98dca5db08f569230403e564843f043fc7bddc82fd4ffd21c1e576bd97f4a1c1b462e47c9275cb59707a003c4f68b7b2af477b2c6f204b
 DIST golang.org%2Fx%2Fperf%2F@v%2Fv0.0.0-20180704124530-6e6d33e29852.mod 25 BLAKE2B 1f8cdb1bffe6a24b9ec7efc36b1f874d1949b34c1555db9cec96a5b0408931e9cb6629770bbf734a2348c5208ac055bc31034b6892b936ec6e60c47b1dbdbda2 SHA512 482a9cd9650c6ed60700e635b05ef1a9ba9d412adb3e6824015511dbc55aedfce3ad4636d195b76d393452b578c022df7bfe6ae868cceca5db1a8b9f08aa29cf
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190412183630-56d357773e84.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 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-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.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%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip 28693 BLAKE2B 3d6a34fa6da642f5ca71c930bd69a41439013f20ee60dde5d4dfab4bf688f1edb150a0477cb006670424c6c59e90d4bac9e5eb34f9fb4c518d903dfd26fb6cb7 SHA512 48b983589bd682ff9275c47733ec73637ebb5e58e1bca0c7744101229237d5cb34170efab63db0061aec857052cce9ef03c3497702b90a86287e6be88e1b33aa
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170728174421-0f826bdd13b5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20171026204733-164713f0dfce.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180202135801-37707fdb30a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180622082034-63fc586f45fe.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -1389,6 +1771,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181128092732-4ed8d59d0b35.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 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-20190221075227-b4e8571b14e0.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190316082340-a2f829d7f35f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -1399,6 +1782,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190424175732-18eb32c0e2f0.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190620070143-6f217b454f45.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -1411,6 +1795,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191119060738-e882bf8e40c2.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -1430,6 +1815,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -1440,18 +1826,37 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200828194041-157a740278f4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200923182605-d9f96fdee20d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201009025420-dfb3f7c4e634.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201214210602-f9fddec55a1e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201214210602-f9fddec55a1e.zip 1532022 BLAKE2B 8deaad7f0040f695cc5f98eeed5ffa9d0b66fc1938b1a551f7e409aeea2216df6f2ddc5afdb64ffd935d556a9d6ecaf9059118cdb05cfe13e8224229627dd9d5 SHA512 c416507064872878d070b4d0a1e8207ded1f149de8572951654feca5e349a5cb8e8ddf62fd26aee502cf73adf3d4dc7c90f8dff6702e8a67c49713d02e31c13a
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201231184435-2d18734c6014.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210104204734-6f8348627aad.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210112080510-489259a85091.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210220050731-9a76102bfb43.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210305230114-8fe3ee5dd75b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210309074719-68d13333faf2.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210412220455-f1c623a9e750.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210503080704-8803ae5d1324.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.zip 1639382 BLAKE2B 3d70aca9182ad2dd59a1260987d32b876da2d668a5181e6a94ce07f252399a5e861787ef0ddf5d3fb45a93c77b3289243fe23f724150f0719c0519dbc9db6a3e SHA512 ef385003c7858782b40f36e70eb0d4af9c9b18cf705872e474c7720eb2de61b889a6a9c85a2c9e1ecde43522cab440f97afba80598ab26f1c11703fe1e76eb77
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603125802-9665404d3644.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.zip 1646674 BLAKE2B a2975e42ede4b3923b53f6c28b8360a49b47734e5512ffe9e52e8920f79af09420d3702d3d7e54e5755c04fddd0836e11c7fb83441065bf9dd31da363f5121a2 SHA512 6a36b9dd8ab6582abf0721e3fdfd19c2cbf9caf02a2f8aeff8952175553e35ab9f9972c2e524ad947e51e24f5eaee23984fc1670d512c04e50b2d71890c5d392
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210503060354-a79de5458b56.mod 95 BLAKE2B e684a60aa4f81d9b1bc646e05933b19fbce141011fd2e6c68922bc35ae5605c7ac6bf360d23495386b2d6aa6dc1752fff42f9ee110395e7d693df4aecd600e65 SHA512 e9ea2b640f798292d676ee885d9390a0d39e97209bd1f361eb110acbaebcfc36dfa49140770fdd5d768daa4d7cf1554cfdfaa19864ee078825c84401a5a09658
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210503060354-a79de5458b56.zip 21403 BLAKE2B cbe932fa03ef0429e062a16019f125577b0a281902b93b0b84c30b56e1a8d120211b0e5f435eafee842cbc2430f877bff71e3ded19db5316ad4ddf5e92dd1f2b SHA512 71948fb5bb4e2802e3dbc1bbea9cef38a11f07719c357cbf519c62d85cd49a544e36c64f6a1193a329d29f19006dd753de986644338a9b01ac21c5d5fbd0269d
@@ -1463,6 +1868,7 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ec
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip 8610726 BLAKE2B 78870544de29f5cd9216befa8822c2387654c3987e09994dccf55d210ad7c517edb93bddcc68bd981f2c083a4ec5e012d558b0164901e2d74f6f447e75edfadf SHA512 494d58f2bc02819ec24d8e55f668a06694568e63bc4b41064a7e44aefcb2778c74983fc9126b50277845da8e6739e83fc1334aed989981e8e53b869878803d17
@@ -1473,6 +1879,8 @@ DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190921001708-c4c64cad1fd0.mod 25 BLAK
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190921001708-c4c64cad1fd0.zip 11753 BLAKE2B 1c778c3f73994890f47263af5f770cdcb69e5dda5e290aa850c16b38725a2ce9a7b18ec3a28a5226e9e6864f633ea21a9030f38b9c1c45a5e8c67b3a0a1b629b SHA512 41b17807e865578fcd17e4f7b92f907ed9fcd11bbbdb32beba9d219212ddeb76a3dfb93faf8077219c43e5430582fb8e86c75d05cd8df4e6eef29ea6a91c00d2
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip 11971 BLAKE2B 7b29c746b75b42c23fca353b8299a4feaf69556ce1395872470e891835a8dec88a4e4c3b64ba6dcb4b5512aafb9bb44cc38c68915a0f6702f1027cda89d03d81 SHA512 58cb42ebeb88c06e049caf8c609e95243e7bdba51057de7d7301885aa904111dbe85962b5faef216ae45aa73f371b5de6516800a6f5765219cfde3fb06372afe
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200630173020-3af7569d3a1e.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20170915040203-e531a2a1c15f.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -1492,6 +1900,7 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLA
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190322203728-c1a832b0ad89.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190422233926-fe54fb35175b.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190521203540-521d6ed310dd.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
@@ -1500,19 +1909,23 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190719005602-e377ae9d6386.mod 155 BLAKE2B 23d2d8015cce612ac3719373303a968d64840c82a2c4442c1c287baf2d7f30e5422fdbf0eb451912f2d38d23a4c36e7730f2c60d5aa1edb55e0b63c0b6359aea SHA512 99b2e19040279bbf7ccafe1de879eaed0dc22c49d60cc3a0e267b533ca04523ca12f35bbbb3b4b85033f1025b036acf9ee3e526d45ff6fa1ecf30d67a3ffedd9
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190729092621-ff9f1409240a.mod 155 BLAKE2B 23d2d8015cce612ac3719373303a968d64840c82a2c4442c1c287baf2d7f30e5422fdbf0eb451912f2d38d23a4c36e7730f2c60d5aa1edb55e0b63c0b6359aea SHA512 99b2e19040279bbf7ccafe1de879eaed0dc22c49d60cc3a0e267b533ca04523ca12f35bbbb3b4b85033f1025b036acf9ee3e526d45ff6fa1ecf30d67a3ffedd9
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190909030654-5b82db07426d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190910044552-dd2b5c81c578.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911151314-feee8acb394c.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190930201159-7c411dea38b0.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191010075000-0337d82405ff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113232020-e2727e816f5a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191118222007-07fc4c7f2b98.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 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-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
@@ -1536,16 +1949,32 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod 237 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.zip 3015771 BLAKE2B 25d8865c3f9de4738a72eeeb15020ff33f36ac4a9e3f7993efe841d44fbedcc72dc192efaf13e5afc7dd880c8982b66351662796b59e161a8b51de19acdaeb36 SHA512 5b4dfb3efcdec110b63517b2bddfba5206316ad12ec5f17ab8a1f3b188ca3c8315dbefd9a18cf397d4f6a201ef29e8422f23267e659b7c00403c966a4234d1ca
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod 271 BLAKE2B daceb2d4e388208a2619f2476085e0daa6b6546122a32355a3e005e6ac51ce72069c959a72c76078dedf82201fb217941091d3cc2b1bf4be8c77949b78ef6cd5 SHA512 c2c79e2a50a05d79909d58a13703e35f9cc9cf209be9593546c84883ac272e4e31a8ec9b2247d750b7cb42b088ad90214279c04b83a48173388fa13a71b6572d
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200426102838-f3a5411a4c3b.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200522201501-cb1345f3a375.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200717024301-6ddee64345a6.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod 270 BLAKE2B a160bf39c4d5efcdab43134808910d37ca9029684c921d91d4dea4e264bf24b592db0f063029f1c0b50e6dc8e1822394503b7acba305a82330371bf9cb5f2017 SHA512 9124d96cde52e0dee04886ef164f35a03a7c05b11398d3667cf0d28f84aac0bb5b44a0f52343033d62886ff62728cbdfa045e5f865c1d96203844f3986f95957
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201014170642-d1624618ad65.mod 270 BLAKE2B b41915c3832f7da9591429edd55565a9db62232673a9788e81d877f70dd574c14a77db730e1b27d25db1cffcb60dc7de926fc39fade1123b3072ac35e848b2cf SHA512 3f901620a7f769ec147d5b7af39969c5992990c0fde2ba8eb8b1d513dec5dd1804d7ddfc49e80911152a24fd837ef008d210af54585485bed8136dcec5b6c863
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201017001424-6003fad69a88.mod 270 BLAKE2B b41915c3832f7da9591429edd55565a9db62232673a9788e81d877f70dd574c14a77db730e1b27d25db1cffcb60dc7de926fc39fade1123b3072ac35e848b2cf SHA512 3f901620a7f769ec147d5b7af39969c5992990c0fde2ba8eb8b1d513dec5dd1804d7ddfc49e80911152a24fd837ef008d210af54585485bed8136dcec5b6c863
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201224043029-2b0845dc783e.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210108195828-e2f9c7f1fc8e.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod 323 BLAKE2B 703b8f1e36b74c6bea0f942558045ef2333c658e31a3b4c2b7924c8e436c31a7d596b60587027f7605f65f8fb20597e0a7e7628f0ec2eeb423f3519870d8e0a2 SHA512 13d4c5dc1bb206cae17c38b6e387386573b402a3679054c12a53acf384e15d5d77ebbb77ad374993b1bba547faf34f4189fe5d77b80d57f0831dac1ee54a98c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.1.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.3.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.3.zip 3474807 BLAKE2B f22664f8b9dd5afe1ad3b5e8f908ba48fe4f236eba59386f97c8f1959e8deeec092c363a2ebb98556cd50f01cdbe4fd5b463990f3a41c78af47ce8e7262ddafa SHA512 eefd96c8081f7d70c453dc97b8f11e51220092a53b82c13bc2ada634f42b261f77a0fcac13dda86cde771c99744ccb536bc1be610d68e8cb8030f5fd2d02fc2f
 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-20191011141410-1b5146add898.zip 19898 BLAKE2B a1233d14bcda685e77649385f4cb03d5c0c0e2491dd01db12a81d3e255e0cc2636950142ea3f647f8177390401ad6236fc05af3537e9561e2e021a4c60ab612b SHA512 464d0f5e1ce45f303f0cf3b6c109629384cb23a8d1e23c5cbf16fbaffb19ae1641da4457b1baabd0e8d2f9784fda64774adfb4c1baaae837877275396d0f22fa
@@ -1556,6 +1985,7 @@ DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip 2229
 DIST google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180910000450-7ca32eb868bf.mod 29 BLAKE2B 411ad882e1d61d9e7a02f83256abf55c6a9557a980b89d7fd1a8981cd44f81182c17659e2fec1f4a587163a16556076418f166e90118a04041a8c488f9bb69dd SHA512 f2367919f017863362525d492f3c7f9e36aa311a55f96533ad6a2db1dcbdc9628f516ca435a43cd63a09c677c3528c2fe386907fda1da7dcb69ac2f6c95bfdc1
 DIST google.golang.org%2Fapi%2F@v%2Fv0.0.0-20181030000543-1d582fd0359e.mod 29 BLAKE2B 411ad882e1d61d9e7a02f83256abf55c6a9557a980b89d7fd1a8981cd44f81182c17659e2fec1f4a587163a16556076418f166e90118a04041a8c488f9bb69dd SHA512 f2367919f017863362525d492f3c7f9e36aa311a55f96533ad6a2db1dcbdc9628f516ca435a43cd63a09c677c3528c2fe386907fda1da7dcb69ac2f6c95bfdc1
 DIST google.golang.org%2Fapi%2F@v%2Fv0.1.0.mod 342 BLAKE2B d29044f7528980834df69508a5a430885c808b2261128c98294db54509193fd9d938f9b00d5065d8747039fcfd2d1508ec3d1d28f45cace47746dceb88f2756b SHA512 f0f467b0cd37057b1c5c215a4554a85273ff29efbe22fc7476b4cb03e7d19701a18d1cc8db27d2988f63da66089cd79d82a53180c17e260fbde4100e070316ab
+DIST google.golang.org%2Fapi%2F@v%2Fv0.10.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
 DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
 DIST google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
 DIST google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
@@ -1573,7 +2003,18 @@ DIST google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod 506 BLAKE2B 106ba1eae2f79ddc10b69
 DIST google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod 582 BLAKE2B 9551c78d14cf644fc943fc5fd7446eb42482bcb793f5f20db40e61f44178a306ce9aa8d49fddc9e36fff3cd0874d4c7b84b2a2a2139f32e915c938f9c6cd5af5 SHA512 936dc2fb686660be7aa7982ff5b224ac0dabb22d3bceb27287453a8dff62d846b81316588db4f7cbbd9bd172faee0eea6f2a55a8bf0e0ccc7af6414808ca4c02
 DIST google.golang.org%2Fapi%2F@v%2Fv0.33.0.mod 582 BLAKE2B c48eded2a495e3b15d0e72fe82347bf3ea517ee9fc06011b1f3b7a634fab445fdabc88391b802cb0d2376bf322c9dbdb135c2125ac8a95f4f225cd16a1e5aff5 SHA512 7182d531a7ead6167213f15a305e853f1c8cfc92189f4390a0572c735b7c1100584b7572b7b1fe44eb5539ac846a3e5fc66bc2f2c841e5110ee9ae5e5886c063
 DIST google.golang.org%2Fapi%2F@v%2Fv0.33.0.zip 17750175 BLAKE2B ede93b7c0db8152a1ad01faf39f08b8ea74b4dacd85237f2549fa7839b41f5ae69f301f2dae9528dea0486f70de21bc3eb85f92e262917e6810b95456f3a0637 SHA512 209aa3b11d07d1ee7abb4d95e39639d33145ee14e5897ac5a3e9a97cc17598202f84078f9b63808e4d1e72c6b49bf8c713e667259308cfe625b7e9a1aba82513
+DIST google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod 582 BLAKE2B c48eded2a495e3b15d0e72fe82347bf3ea517ee9fc06011b1f3b7a634fab445fdabc88391b802cb0d2376bf322c9dbdb135c2125ac8a95f4f225cd16a1e5aff5 SHA512 7182d531a7ead6167213f15a305e853f1c8cfc92189f4390a0572c735b7c1100584b7572b7b1fe44eb5539ac846a3e5fc66bc2f2c841e5110ee9ae5e5886c063
+DIST google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod 582 BLAKE2B 6144aaa4d8f028d41ecbc807a0286e1d703bbd248c2741c117d78e380c3d84c004a2f7552899c3fd7f241441b8931db63c904b4e8d81e860c5236d921074402a SHA512 a80b81fe93766e995ce621dd5459b203f694e7b4fefbfcd06ff7f75a07c31d23b4575c9d1947ad570efa969083d120f7bdcfecaacd8a386efedad7c740088f69
+DIST google.golang.org%2Fapi%2F@v%2Fv0.37.0.mod 582 BLAKE2B ce5d0b2f3965440e4ea032e13b44ac8b1fd84267df7c4c68c81e771771090f2573f3852bcaedf586a5dbd9b746446d56fde8803cdb7d6603f605bb8013b2be04 SHA512 33b7cbedac4b2c779aac3c67f883ec122079830cee7af6ddac0883ab69fe89482d9d73fc0f48b2596d396b87b19daf625ee4af0026648c8040a484560781bb87
 DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod 582 BLAKE2B ce5d0b2f3965440e4ea032e13b44ac8b1fd84267df7c4c68c81e771771090f2573f3852bcaedf586a5dbd9b746446d56fde8803cdb7d6603f605bb8013b2be04 SHA512 33b7cbedac4b2c779aac3c67f883ec122079830cee7af6ddac0883ab69fe89482d9d73fc0f48b2596d396b87b19daf625ee4af0026648c8040a484560781bb87
+DIST google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod 554 BLAKE2B 5a047b5fc1095d1f7968701852d42e33545b9d32d0f384f2425c317f2f69c1f5110ff6c91ca2878449f2993c112f0fe98269aaff33cfabc1d56b0e73089ed1ac SHA512 8663309700a5c7b090ed954ce89f8d06999a3e6d943e1bd2b87c77cb75788272a0057718db9e145a10329c4bf2cb97ac00f7ef0d1b52355f54847b596c26710e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.43.0.mod 554 BLAKE2B 1762b991f8e9106a131452afda7303a8483cdd0dfc6551a97f4fbeb8e6588d4adc03b35972902eb6c86e2bd759d917b3de3e4354bd4460d6fccf8c83e31b7726 SHA512 d5a9b88edc13a0ae616c249beca3a712f5db2c643ef13c771f22e64b81548a32b46aa19fd87507bb27b385a9525423f586157bf9efd111d29677d38f02c85908
+DIST google.golang.org%2Fapi%2F@v%2Fv0.45.0.mod 607 BLAKE2B dbec8fa0c5b6d620d63aaa66315b42bf25517d040a0fd6e674143e1429892d84af24431d26121cabfb898dc7b77c01b13637b3895aa92b40b82e78cfb678472b SHA512 25531fccc7e4a38c0652d75bf2a5de96593eda785bd47d774daefd7bb16c36e673699a84c2bdbc3f10c2ebeddcef381517e93e5ae92eea54f40181f31a54f211
+DIST google.golang.org%2Fapi%2F@v%2Fv0.46.0.mod 607 BLAKE2B efc52d22ea37954d9f356acc14ea2e6aeb5970e933669b7ec51bc31323a5a2c1bc2628a641daeba057ad980ab3e59213f2dcda2a78106a66e01929ee46ac4706 SHA512 1611a6051784ba7eafc66baae39698e265139149685b8751f94a2b750b4df2be681e06899da6a16daaaca2ceda0242aa178e62355c0aadc7d428b4d058f2e752
+DIST google.golang.org%2Fapi%2F@v%2Fv0.47.0.mod 661 BLAKE2B db842ff2a2911217bea521a84017983a98a9cf6b95b804da3abab14a8dc5237e722d7e80a0b1e196998de65b86e64fd34ea363bbfcc50ebfbc950b8c5e537e55 SHA512 9b7bd454c604432874fe9647a1768157bd384537992fe62bbc7a72e6feff614a4d33a7fbf89af1961ec71258115498980dabbbb040e7faebd9ef26a8802e8e31
+DIST google.golang.org%2Fapi%2F@v%2Fv0.48.0.mod 661 BLAKE2B 107ccb932948c454c8634c03a423ddfe3333c607fd82252be8d47d2081f27bf6235cdf6c2723ee799bab6dc2c480066739ed57782536335b419ccee8761467d3 SHA512 72192b22a77ca7c06873e9238461da5f9457a9901d7a269d1bccdf9749c818f24d2db7f007398fb2a0b197fec77ec186d8cebbcb8124ca24dac749248277a685
+DIST google.golang.org%2Fapi%2F@v%2Fv0.48.0.zip 22040610 BLAKE2B bb6677cb1d92630152fe85f545c079181939758cb1c13e947e1e018e7bd2d55850a1b0500a0f0f5f9abe76b57266a3f9f2ba15c0e25d2667368e6669772d2451 SHA512 be7f80758e5fd1eeda238ff07099b1621be34fcd46145f5ea20c5baae1ec1f3f427f23e7bc76c038c0e99bdc43ed84bfaa2e083af393d806e27bbd450ec6f806
 DIST google.golang.org%2Fapi%2F@v%2Fv0.5.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
 DIST google.golang.org%2Fapi%2F@v%2Fv0.6.0.mod 814 BLAKE2B 4467907a8c67804ae0d799a6b80323ce0d14c0612c5a9500e6bb8a59ac72e937b6101043d58d5df29e74ed752ed539e3b549262aff31cc2fa51ce329fd3b2aa4 SHA512 ebce54fde531bd84ab00dd8ceaddb4985906372f790a110c7ef68d934315b2d6a14dac19f655fc7ae92d1fca33c32d99df6568587816d1eeafc68e81c6327f51
 DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
@@ -1585,21 +2026,28 @@ DIST google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod 162 BLAKE2B 21c4d160665b6a8
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.2.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip 417678 BLAKE2B cdb4e693ed5fb2bb77ed1ce0e0b1b25dbc3648c00554ade874ce28fffd5824f487fac744f9f2cb0920aad2c94a82024e1d233d1663887f0681790488a3af6f3c SHA512 1ffe3894d8fd004f6c28916e06d8e64708c20321ff914e82d05c50ce4c62b76bcd93e74e45871f7adc779791240ef8e25df08fdaaf2abdce20a3640d8964bb28
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip 417793 BLAKE2B 7219518f67d83fad94a863f889af4c3a28a48b60fced31f33a3026c00bccfb6319060c5ff4712fed598824b5bf1448b0981fc21a6755855e91ce53b4026db062 SHA512 26520c7bbc5ec3c02dc86e5882ffae74b040f0600aa99832cb08cead5d3cd5c21a32d6df332c2c74a76b6c2a684141720b4fce874a07241412bc01837784b115
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip 417823 BLAKE2B 3ba5afeec03711fd1e2ecb11739fcc4dd770d5f1c23489549c7b3697fd7bb8eb8471fa76569a73b7ad4a2b634a126a055e1d67ab654e399005398655f0bf8a31 SHA512 cb047087045fe995e28b96c1a3ea3cef8b46facfcca80fdc14707f4f09d1429daeca9cbc456ecd9bb2e3d32dde145b75929506b10ffd67d35b3604674dc27b01
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20170818010345-ee236bd376b0.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180831171423-11092d34479b.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181029155118-b69ba1387ce2.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181107211654-5fc9ac540362.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20181202183823-bd91e49a0898.mod 167 BLAKE2B 986a022473dc24178c99e6f660397dbee93b9680a5bd2ee1de8ce1e6d7b3b71bd9a79a70230daefd5f579c65669511a0bf89289889db3d6234583bd0b03ecf45 SHA512 bf0f5825495820d6f0416598bba137d80131ff8fea005163afca3f2984f57bd24c9005fab4ba0408bd09dfcb2f9ab1cd845e1cc3d0d9dfed1bedf0507567f570
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190306203927-b5d61aea6440.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190508193815-b515fa19cec8.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190605220351-eb0b1bdb6ae6.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190620144150-6af8c5fc6601.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3
@@ -1622,8 +2070,10 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200413115906-b5235f65be36.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200413115906-b5235f65be36.zip 10949147 BLAKE2B a636c26775c061bb2890c94ec2fce7ab3cffdecf50fbd266cdec1d558d4950e37d85be91f0bac5c228b475a5cfebc6a8ee2f63541e202e31156b3417820dcb08 SHA512 fd5e6fc11d6d6c687bf7c56393e530423b2bb0b6fa979d0d5e616d3c80551957025a973e667bfe38db5241ef7a30f83d733245d9c316d50a2c9270ca0fbd5203
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200416231807-8751e049a2a0.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200423170343-7949de9c1215.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200513103714-09dca8ec2884.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod 323 BLAKE2B 76123f14f32c6702557406271ddd9e0304f0c9d5bb53c2b503a0a1ca74892da8a685270b6463faf7fe746f7398080f8364afc94b6f7ac8ba1170d645328ce5ca SHA512 67bb03661d5b872932d9a18ee7edc2908612a31db6391a8797e1cfa9aec45c6a3643b7943c4157db60f7e7aa235368a844c5e1fb382fa705074fc721c855a441
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod 353 BLAKE2B 7e159067adb934153bc2a45c1a091ea85083c9e52927db8aba3e7ef9e13f984dd738aaf3890e85f7daf86afdab8e5717775250715285c0edc05625a544664cd2 SHA512 17266a643d974e2fae18e7055986002b9705bd2a7fb1e3cd3664fe6dbefbc7a04aef6900146c1e1c3ed84bea8b4d1bda4d6c355af2cda013c01f19eed57568d5
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod 323 BLAKE2B 264c38a1d0b5dec10ed5c1d4a073c68817dd538b602446ea3db3b53569f14dc1bd88250b6bc14656c5206d23e17858b986188fe0c217bf8853c76121d999b08f SHA512 ab15d32d1f044b9b5806dcf075f3cc4e32f2c79e9a273e5dd30848b6ebb26d71270627536f34010cfe23c130badcb02e5b6f306a1cc1f73ba76bb86bc5ba21b5
@@ -1635,8 +2085,26 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201019141844-1ed22bb0c154.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201102152239-715cce707fb0.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201210142538-e3217bee35cc.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201214200347-8c77b98c765d.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210108203827-ffc7fda8c3d7.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210126160654-44e461bb6506.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210222152913-aa3ee6e6a81c.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210310155132-4ce2db91004e.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210331142528-b7513248f0ba.mod 408 BLAKE2B ffa3c2000ed843b4274bfd1c06aedf4c5a9aa1fa9abbe06f96c2c09fb1ea8bc18e451fc226097659f5da5e603a67d00aee7d31d7bb7db22614de0c99950ff73a SHA512 c6d892fa8ab198a921437b1b017a9108e516f1d91a79b3fe0c39b674d19aa74385c30ae9456fdd1565c6c6308ce1b811d7b49db45e3fdedf1286aed38c1c48b4
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210402141018-6c239bbf2bb1.mod 408 BLAKE2B ffa3c2000ed843b4274bfd1c06aedf4c5a9aa1fa9abbe06f96c2c09fb1ea8bc18e451fc226097659f5da5e603a67d00aee7d31d7bb7db22614de0c99950ff73a SHA512 c6d892fa8ab198a921437b1b017a9108e516f1d91a79b3fe0c39b674d19aa74385c30ae9456fdd1565c6c6308ce1b811d7b49db45e3fdedf1286aed38c1c48b4
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210413151531-c14fb6ef47c3.mod 408 BLAKE2B 60b36881020cdd512e1981a98fffb1f83de54dbf69a6d55719e86995ac322d80c6c35f5b84d7b7b2346804350a50b023d23ea7dcde89d45feded023a90a0461c SHA512 8d6f7f28525e6ee67df587c2e013821259261f6dbf0a477dd26d0147aebca87ad0ad65fb662a37042252d2e82714f9c9e487164b74e67ad25a92e232ed9e5bee
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210427215850-f767ed18ee4d.mod 408 BLAKE2B 60b36881020cdd512e1981a98fffb1f83de54dbf69a6d55719e86995ac322d80c6c35f5b84d7b7b2346804350a50b023d23ea7dcde89d45feded023a90a0461c SHA512 8d6f7f28525e6ee67df587c2e013821259261f6dbf0a477dd26d0147aebca87ad0ad65fb662a37042252d2e82714f9c9e487164b74e67ad25a92e232ed9e5bee
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210429181445-86c259c2b4ab.mod 408 BLAKE2B 60b36881020cdd512e1981a98fffb1f83de54dbf69a6d55719e86995ac322d80c6c35f5b84d7b7b2346804350a50b023d23ea7dcde89d45feded023a90a0461c SHA512 8d6f7f28525e6ee67df587c2e013821259261f6dbf0a477dd26d0147aebca87ad0ad65fb662a37042252d2e82714f9c9e487164b74e67ad25a92e232ed9e5bee
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210513213006-bf773b8c8384.mod 408 BLAKE2B 60b36881020cdd512e1981a98fffb1f83de54dbf69a6d55719e86995ac322d80c6c35f5b84d7b7b2346804350a50b023d23ea7dcde89d45feded023a90a0461c SHA512 8d6f7f28525e6ee67df587c2e013821259261f6dbf0a477dd26d0147aebca87ad0ad65fb662a37042252d2e82714f9c9e487164b74e67ad25a92e232ed9e5bee
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210602131652-f16073e35f0c.mod 278 BLAKE2B bc29676533b5813b8383ab995cd9c117cfa3712c1a7091b504a3feb60614b704fd031692dabd7a479fef427efc584b697b74346fdea2fd6df6d09cca8efecf9e SHA512 dbc012381b6e5c891ca583f791ec02094b4d1c43f0c22d1d4a992497d5f2503fcc78fb8f119c891a474156dd8fcde92acc27e75f40cc026cd37913aa83298fc5
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210602131652-f16073e35f0c.zip 11160629 BLAKE2B 22ee67ad1080d743f680eaf4f208f8832f7d8c196d532dd0869a574cd3d1ec3f663b445ab8bbcb847fa422763f5ea49c9867b32eec4f7cf1ca20565653481871 SHA512 90fb80975cb11ac20012ad30211ad4f34907adc353ac037df4f7e14f516946bbded4cf33c0595f53d7aeb34fd0b5384ceca19318c5261e455c50cd0d2eff2e2b
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210604141403-392c879c8b08.mod 278 BLAKE2B bc29676533b5813b8383ab995cd9c117cfa3712c1a7091b504a3feb60614b704fd031692dabd7a479fef427efc584b697b74346fdea2fd6df6d09cca8efecf9e SHA512 dbc012381b6e5c891ca583f791ec02094b4d1c43f0c22d1d4a992497d5f2503fcc78fb8f119c891a474156dd8fcde92acc27e75f40cc026cd37913aa83298fc5
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210604141403-392c879c8b08.zip 11219249 BLAKE2B 938f9eafb5080bf1d2bd516cb11702befe05a5963d586a880a8f46a3e8901e21ba80d4d8eae6acd3e8964911f3c4edbe49f4b944c416a7d27e6a3029b2a11e58 SHA512 d59b0e2de40f862759ca1ef3141f96959f6609a39b04fcd33f3f4b76e2f6f576cec377ad7235ffbcc4eafb7c9ee8f8fa0bdbc1257278604c4841abd5e9558161
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod 903 BLAKE2B dd9ff44489e2a944c07f3e58c3246534b472b407eb15780bfcf9a30370eea7353a8ec12601a6c3e0e39edad1de6651df1c959f86a528a0cb53ff7d2e8514d1e6 SHA512 1e7c2190023d06747cf81e4d6f25aa284a250912ac304e3d590e1b85f5ca3ad3d9963a0ff7106e5dc55f82f58eea953c72f131f4baa6618b46017a575669742b
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod 832 BLAKE2B 9de27394e05cf42e762a8b7ed42b6715244ea1086acd7c44f71b04bc0dc23c31ab236e6474fea423953eb3001dcaa357938daad1d54debfb5d52bdecc1de6bda SHA512 ac90f3fc374cc1ac7706146efaa8488a59634a209c30bf87453fa150bf8849870db2ec04e854438d59911ea35930a5dd8f40f5d5954786d0e0565907fc42f711
@@ -1662,9 +2130,18 @@ DIST google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod 511 BLAKE2B 94c30e556883cd2f714
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.32.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.33.1.mod 542 BLAKE2B e4b2b7b1fa60a14dbc498ae1ba77dfe6056d4f990c8b699323802ca3f5c31896c498d907c766b49c093d0c89edf7d57604daac7f64a543fc5e0745e7b6fd1bc2 SHA512 4e4f309652556a76b4dcd3bc14b32c69d8aac9dde500456d1d9f9f4c773a5aeaa19061f29f5148f7e815c0c5dd0ba377470975d004b0b73213206e7d5aeb89df
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod 578 BLAKE2B db5963bd3e0da1108af3ae72d613cc24fbe23c0569e137ff8c4ba94e393b2b574612e0133a263e8a264cf781469983363a8f147a7f0d9e0f21ed4831772565a0 SHA512 3c04e477a21db637ce07078cb89ad236db3151ca0fe474eab32c326e7e849b41abfa873045d2214bc95e34ebec7767a68f9d5a9828ef286abb4636a14677c479
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod 578 BLAKE2B 620224161970d1fb64725588af21b34b4c986349185177b34fc7d8b33db92fcbbd270f1ff6bb9449b6e1289c17d9fd6cb0c284f774fe52c68deaf147266d593e SHA512 b9535ff6b3954975139cadd62af8d229c8e27b2ed3b62f0307bd99c3ec211e1fdd1c70c2bb93d755c8b59b7f4f22dcfc3dfa2d8d959ac30e1905435ec1d870ad
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod 608 BLAKE2B 01e491f455fd8b3faf2dabdc8ba3e343c67461f3c58621a9c63575940474e3b4346e4eb1c8f260e78f3ca7cfecddf54f7656f590665d3596e6af1391974b284f SHA512 33faa853ccdf8c52a82c9c44e4b5f2dae76e5cc2c1e8227036f8f5fe7f1b496066fa72a379714491c6d2ac14e0ea8fe5419dc0a1626f9e60933b897903377b45
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod 608 BLAKE2B 01e491f455fd8b3faf2dabdc8ba3e343c67461f3c58621a9c63575940474e3b4346e4eb1c8f260e78f3ca7cfecddf54f7656f590665d3596e6af1391974b284f SHA512 33faa853ccdf8c52a82c9c44e4b5f2dae76e5cc2c1e8227036f8f5fe7f1b496066fa72a379714491c6d2ac14e0ea8fe5419dc0a1626f9e60933b897903377b45
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.36.1.mod 608 BLAKE2B 01e491f455fd8b3faf2dabdc8ba3e343c67461f3c58621a9c63575940474e3b4346e4eb1c8f260e78f3ca7cfecddf54f7656f590665d3596e6af1391974b284f SHA512 33faa853ccdf8c52a82c9c44e4b5f2dae76e5cc2c1e8227036f8f5fe7f1b496066fa72a379714491c6d2ac14e0ea8fe5419dc0a1626f9e60933b897903377b45
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.mod 608 BLAKE2B 7de276dcb3541de0e9509c95860d13991855aa3f9193d32fe540fd41b28db88e3787c767073a6be9c294b6ece11742d80d13a98cbc1a57c48fe81d1bb7c45004 SHA512 bf2d4e70b656e1345aee9029d35a922424bdbdd05edb45fd8f0267af3a17da53d1d1ff005d58b99d721883e7371b2d2ea99fb67bda9ae880f5ea12a32d8f2078
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.37.1.mod 608 BLAKE2B 7de276dcb3541de0e9509c95860d13991855aa3f9193d32fe540fd41b28db88e3787c767073a6be9c294b6ece11742d80d13a98cbc1a57c48fe81d1bb7c45004 SHA512 bf2d4e70b656e1345aee9029d35a922424bdbdd05edb45fd8f0267af3a17da53d1d1ff005d58b99d721883e7371b2d2ea99fb67bda9ae880f5ea12a32d8f2078
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.mod 608 BLAKE2B 7de276dcb3541de0e9509c95860d13991855aa3f9193d32fe540fd41b28db88e3787c767073a6be9c294b6ece11742d80d13a98cbc1a57c48fe81d1bb7c45004 SHA512 bf2d4e70b656e1345aee9029d35a922424bdbdd05edb45fd8f0267af3a17da53d1d1ff005d58b99d721883e7371b2d2ea99fb67bda9ae880f5ea12a32d8f2078
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.zip 1561437 BLAKE2B 6d0db85a058df199dd8237906082862bba5de66e2c6f92e01e8d90a6473100a0a9075b7239be96495457d7b822b67ff84b9f00d6cbcc4cc2f24dfa3dd0977f4f SHA512 197022bcb7846cbc2257410b6bf0f1b64592e889b222633ed6c3cc3cc9efe1ab3ea36e57b5bd8fa2cf72bae75271821888e91a354b3cf57e3932f05a2bb8678c
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.8.0.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
+DIST google.golang.org%2Fgrpc%2Fcmd%2Fprotoc-gen-go-grpc%2F@v%2Fv1.1.0.mod 105 BLAKE2B 1fd1c6f20bdc1fb0a8a89ff7a9dd787d9c69a81f87249f44edefefb5bd1293a513ec4f7111be0df03044b54e42426b0b1083a24c76e50fa96f76aa393334e78b SHA512 e5e455ab72efe80c6d130c4631162f2d42690edff30064c0314700c8ce9d3c77b14554ff1b398aebb940e6501bef102af78a32e05b424b3b381625ca7d5e7cd0
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
@@ -1676,9 +2153,12 @@ DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.m
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod 186 BLAKE2B ac72ab4b58c29ea036b52ea6972dba93b3ff95ceea9b476355b14bc335bfb99ac350101e70ec678bfb6656157679f3dd42a200a1531b982ad9c995c5063ad541 SHA512 d9197910537264ba24d95110f470ce2b057b795e7244bcae423ea922a8eb4f2c89df3b6dceb58e71cc7ba1f68ccaa3dfa78d7c26d63f5949d4014b8df336512c
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.zip 1510578 BLAKE2B 71a34f94325a05f830fb7fc951f43c7328fdcddbbdadf03f6e68baa84973be7dfaece317c77fb25bddbc3079f3960a5026ed81fc0ad7d83cdaf224080a2ffc17 SHA512 119be6e0aab9487c1340fdd4c73b57cab4fc74d2290430aac19f650c2a4f56ec34f8eb34c8a87fa267c979e5577cdac72deacfb6d2b9a68cd8f33e19841e0c9a
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.1-0.20200805231151-a709e31e5d12.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod 83 BLAKE2B 0e4901ba1d4e31ef22f0f978ee7b7d926ac2cd3a1cb5d8d8a81a33e02f9dc81aad6508280d65659862c3a9bc0667c334cb6cd8c0c532d5fdb3735a415c2a5eca SHA512 a7b2aad691925341e3d1f6d1d1453b68386902a4e2e1c0deb406bc157d04328c5519a01ce938a33a6e358cbd9dc0c2f862c9822bde5314d2eb9d416d7bf789d2
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod 123 BLAKE2B 73f875413489557d8f0bbcd665c06356b900f87e2cd9ef0ee5aba218a3a910842912d36dc9e653afa538c99cc723d28327a8bec6eac1f6bd93277d70fa891339 SHA512 d618524aca1cb3e525060bb66b0c8f06c9ad6be5389be228d265dbcdb368442f4f0a7e98f8c9082916b2579d77e627a550904f0b1c058b7d5e45eb7ceb77c2e0
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip 1557709 BLAKE2B bc672854cc46d48461bf28395c5be02fe99ff9da1d23e212078e549bf3e2beeaf953cc185e059c73a374f3e2662cb81fd6c3ff53472934964b8461f370b51a78 SHA512 de309c033d05be35503d6073e14ead585db4e6b75d478a674a37f93c7757e914c67bad446cf7ce04ccd49659d1ab2f9a024ee639a7536480ef92bb6b8b52dfdb
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.27.1.mod 123 BLAKE2B 73f875413489557d8f0bbcd665c06356b900f87e2cd9ef0ee5aba218a3a910842912d36dc9e653afa538c99cc723d28327a8bec6eac1f6bd93277d70fa891339 SHA512 d618524aca1cb3e525060bb66b0c8f06c9ad6be5389be228d265dbcdb368442f4f0a7e98f8c9082916b2579d77e627a550904f0b1c058b7d5e45eb7ceb77c2e0
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.27.1.zip 1572746 BLAKE2B 372a55a68ec03bf9367368d85088a51267228a63a1fc04777dc435a5e9a6c46495f5dae27f82f3f5cf6effa41d6bc9c0a49fe1678f94d435b2516b952d24a484 SHA512 0a27f0189b04291bcd96a52a84e4ebbac6424c02e1d899655d0ecf1592150290144f5e6c8ef81c6a2f0c43db5cbda7d383119a027ef9aed8cf5e623495001077
 DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod 36 BLAKE2B 33002a8288351a233f5e8236743a91df1f630355380a4ae8df10c32abc03470955eac6c15c95655caec990eb17ef2661985570e49293cb146517828090d95635 SHA512 8482c3135335a3a69611529f0d50bd19257b0fe8a8de2d4f2d6441ccde5f1e7a57d487cedc375575c5fe16094e5fc1c7f7f1a6bf04acc8a9d4f92701db279002
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
@@ -1714,6 +2194,9 @@ DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.0.mod 34 BLAKE2B 618a69c0e95948b
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.0.zip 347725 BLAKE2B 2af6055809b90346269333b5ffc1c44802ab613d3f37325385b6e36f74740f3ab701e756950252ca375d59af2f8b1ec19689b9237c2d24f81a8e1daa41cb80eb SHA512 cf0551e8b01220d1472d88e08a3e3646c8001dd4605d2c8cb6e665c08c96904c4cdcdf994f27088972300b3511f699ed4ef8b45e0b6d1d9258e5700fac2d75cc
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip 353844 BLAKE2B e4d24ee5a99951c19c32328d6eef3fd6c886338bc7189eec9e60c99fe89e5728b3f00824d0f321bbc921738a40900d8d90ab4d9879e8efee529ed4273df0c2a1 SHA512 7ec385824affaaa72aca2b5af052dc7e941a24b1712e0e1945fe6276df3b02ca9eaaf79fdc0888e398aaf10ce3b261f0d23b2c6485184e6a6587e1d04f1c8742
+DIST gopkg.in%2Fsrc-d%2Fgo-billy.v4%2F@v%2Fv4.3.2.mod 233 BLAKE2B c1fc00ae50a9dc2ae76534d85ed853a215dc9c685867cf9981544739806e10c47e42e14c702a613f0d19ecadb72ba486c7e8f5ba5d62933b66f2ac5dea267657 SHA512 b39a6f26eb0dae87688149c00768ab232cf1615b55f210d69fd10423034e2ace9c48d8e246cc12e235e93e7ef539dc116083107a589b02f565d6e713ccdfecfc
+DIST gopkg.in%2Fsrc-d%2Fgo-git-fixtures.v3%2F@v%2Fv3.5.0.mod 41 BLAKE2B 03ca301a47c343c381196bfbcfda429e85a7af164f9b299043c5ed8ce3f3c31254ed733b2ae946dbf69b57d8ac0852b4e4be05ff4e2288ff37cc1bac3f902251 SHA512 cf6f2393997a22a6e1f8549bd632b9406ae54a300c1d0981453a1bd6bdb084de71e6f5515cde2d875cc006651d689769159fa3d38fb761c194402d484bde02da
+DIST gopkg.in%2Fsrc-d%2Fgo-git.v4%2F@v%2Fv4.13.1.mod 1258 BLAKE2B 3e337c2ac0851d9f7572156b4bbd960943da2e95815f85f3b72e5bb1d011c244aeb81d7e6177c2aca41068ca5bf3075922b9fbdc871e613a4ff92102958c83d8 SHA512 d8cc528d1e6d8e8f1ca6f3da5d74f63bf70ed45e3dbaacaed27065ea666dce1aed2e675a15b22e6faddc9893f8af7704f95276b8249f2209a6402a61fdbabfd1
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a
 DIST gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod 28 BLAKE2B 39555ca91c4818bcc1955c20438d83965ad6f1b2058c6d8590f4c30688eab2ac08dfa1655d4de34bd68006afea1788a89fb0240d60b048be9616c8e44d8a801f SHA512 6fe714c089847582c8c01e055e4bd6b991e8fddc6e420aa03a40efb35fc4ecc5e87a60c44aa82fe004899eab427d4b82262cfebb3331b7443a2c7a68718f8f75
@@ -1755,10 +2238,12 @@ DIST mvdan.cc%2Flint%2F@v%2Fv0.0.0-20170908181259-adc824a0674b.mod 21 BLAKE2B ed
 DIST mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20190209190245-fbb59629db34.mod 132 BLAKE2B 0cfd958e837b6bbe113fd2272427856718bb241eff20fd6dc479e4a64303c9ab5323587bfdf5e731aa63da0f7af859e48f0348b5fcaf33d8cec272a84ae1a854 SHA512 cf385a4361bad78e100100fec51fd485600a90340028393ff9fc4b7fa7ed85c3cefee28c6a2789af8f0f4f92c8694e30c22d63fbceb9be1af1fbfe38072a0ba2
 DIST mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20190720180237-d51796306d8f.mod 141 BLAKE2B 6dde3d0dadd66923b18a63621f7981937a11684364e1c7c2e1c62be026a6318ee911c1756ef75790b2ee37275065962c0c8ac90e0652921da5fddf30a5eadf7a SHA512 27cc16d07ba63ad7bcd8081fbd1e571d263abeb8b047be5116c91e17b193db7648a87d0746e9cba2fce465b31fd6a71e52a5776e495558ae30a9318bcaf3f3f6
 DIST mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20191111180625-960b1ec0f2c2.mod 207 BLAKE2B a095d605043ec479fb0703c97c73ab47eef76fa1bc25dbcfdf68b0d04ca4be8ab49226297dde23a9c8c7d687044b3e50eda9177e946a786234c640960ad85cca SHA512 6e8b0a9d39f725ebbe4e470f5383d107593cb51793b8bf448d870836b60e5cbf8c51f5e662a13c7daf557b5c6a0f771870f483782bead73d7460a42f8089df0a
+DIST pack.ag%2Famqp%2F@v%2Fv0.11.2.mod 20 BLAKE2B d5f63707dc993966cf972285b18d24c5448f4e40f4a9dd5cd5b2eaa20ac8b7c19d5a6391aae35d2fa108cd21275c5e624a1adec488e4d214bdb770c83d7ed3d4 SHA512 fd1aa736efb3454de105d381170d31621ebb53f331e8c677498c90843ff2b1230a86e721905a93e621369b3c50d513d957b7447803e31576c4e3ebba6ea44dc0
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
 DIST software.sslmate.com%2Fsrc%2Fgo-pkcs12%2F@v%2Fv0.0.0-20201103104416-57fc603b7f52.mod 42 BLAKE2B abe664186109087cfb218c4f35147ce524b2dbb26e58a51c2bd57f333bff13172669b394987c58ccbf83a5f3f738077e3c4ac93485dd64d235d6887cdaaeec83 SHA512 a8c989ab7fd82fc4215ace85e81d33156ae354ec09e859b2c42fab1b53d0c3608458628c3371a48c4f0e6f338985f6f7f31cd16f1ba9498c275d5a6c9b812375
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f361d08bba5f5689a0e8b51dc17f11fe893c1fb3c0b671d323c6f66448d0c73d26b64586ce2236cc91f44839eba5ebf2a858b04aa85b5bde847c5956b0a519 SHA512 ef74bbbbb50cb01b861dc25c1a1ee276cebb64a383a31f4acf3f78db0e1b5fa907c6ecb9a88e4819d4aa7d5fccced97b574c12e147c36677a8d4e5f73b55d04c
@@ -1767,4 +2252,5 @@ DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv1.0.0.mod 76 BLAKE2B 2b8d5265d8f690
 EBUILD caddy-2.0.0.ebuild 66030 BLAKE2B 6b32af19bfa3a76058d88fc019f16e1b03d07fb6e1e15cd8c8d455f6aded141270fa1726f1a6b816a5349025f88dfda20345eb8eae963d61632f94abd1f8e759 SHA512 453fefda0c13df71a2fec8f31ed21edb32e0d1b5ab1a9249b72f32cca901d993ccfbcdf0ce3092afe598783e55767906808720616098ce0464602e7140a3e1f8
 EBUILD caddy-2.3.0-r1.ebuild 61281 BLAKE2B a46961057a26c729bb17e855fc30cec49ac4f06ecfee7f833f0a309f24392bca7f6edac8994abce6a00faa10cbdbf02c2a0072f01128b7e9f885158e39b0ec3c SHA512 b21a6832e6ba4cb5a0791a7621af8b35b19819b49699522bef1c7883088183c13669d1db829906f67926b15bcafacf541cd4bbc4f1ff18b5742c2327cf6d6501
 EBUILD caddy-2.4.2.ebuild 62509 BLAKE2B 4d6b9713dcb03e806be65a1f4debf575f31c8815c6f3065330882c31d89a939c1521db8e1890a57aeaea60c2d93cc45535ef4231b97410fb3fe7fab33de0eeb2 SHA512 44c2bbc17808c8308f5b53f11d54ed8542195c20a4595ad4251761f885688d8875957ed96d1e6cd0a15f6611bf594a3284a14454ddd25c49cbfc47d2fc3f5f22
+EBUILD caddy-2.4.5.ebuild 84567 BLAKE2B ee94bace65a2ff0e653e357c2d11844bb4683ffb2d3e4fc26c5a9f3a3097e6499695de183064952ce09993bba49106dfba7237e3fc75969ec822c72addd927e8 SHA512 b4673f0752f31916e43655e5a4a004b14e2f1c6240847cafd9ca8d0f47d13ea5c473aec81b0182c9a8c01700365c6b2ef99a58a3670e0bfa8e85981ab6ebfb6d
 MISC metadata.xml 327 BLAKE2B c733fe2ddb3626e38631dea64fc3edf837fc52c8454ed7a37f2859a9759db43db0ef018753649276f846cf4a67b705f2080d7bf55856848c8fb2a2a5db43cb4a SHA512 c52162e031367163930279cf1ebb06b5a59a5d0d13769fe79f6ee146c4752865ac6e4bb13fb8087a569be125dc6d8ee0b2d052088f27d2ae327ba6a31160252b
diff --git a/www-servers/caddy/caddy-2.4.5.ebuild b/www-servers/caddy/caddy-2.4.5.ebuild
new file mode 100644
index 000000000000..b016b9d60f57
--- /dev/null
+++ b/www-servers/caddy/caddy-2.4.5.ebuild
@@ -0,0 +1,1613 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit fcaps go-module systemd
+
+DESCRIPTION="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
+HOMEPAGE="https://caddyserver.com"
+
+EGO_SUM=(
+"bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod"
+"bitbucket.org/creachadair/shell v0.0.6/go.mod"
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.31.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.37.0/go.mod"
+"cloud.google.com/go v0.38.0/go.mod"
+"cloud.google.com/go v0.39.0/go.mod"
+"cloud.google.com/go v0.44.1/go.mod"
+"cloud.google.com/go v0.44.2/go.mod"
+"cloud.google.com/go v0.44.3/go.mod"
+"cloud.google.com/go v0.45.1/go.mod"
+"cloud.google.com/go v0.46.3/go.mod"
+"cloud.google.com/go v0.50.0/go.mod"
+"cloud.google.com/go v0.52.0/go.mod"
+"cloud.google.com/go v0.53.0/go.mod"
+"cloud.google.com/go v0.54.0/go.mod"
+"cloud.google.com/go v0.56.0/go.mod"
+"cloud.google.com/go v0.57.0/go.mod"
+"cloud.google.com/go v0.62.0/go.mod"
+"cloud.google.com/go v0.65.0/go.mod"
+"cloud.google.com/go v0.72.0/go.mod"
+"cloud.google.com/go v0.74.0/go.mod"
+"cloud.google.com/go v0.75.0/go.mod"
+"cloud.google.com/go v0.78.0/go.mod"
+"cloud.google.com/go v0.79.0/go.mod"
+"cloud.google.com/go v0.81.0/go.mod"
+"cloud.google.com/go v0.83.0"
+"cloud.google.com/go v0.83.0/go.mod"
+"cloud.google.com/go/bigquery v1.0.1/go.mod"
+"cloud.google.com/go/bigquery v1.3.0/go.mod"
+"cloud.google.com/go/bigquery v1.4.0/go.mod"
+"cloud.google.com/go/bigquery v1.5.0/go.mod"
+"cloud.google.com/go/bigquery v1.7.0/go.mod"
+"cloud.google.com/go/bigquery v1.8.0/go.mod"
+"cloud.google.com/go/datastore v1.0.0/go.mod"
+"cloud.google.com/go/datastore v1.1.0/go.mod"
+"cloud.google.com/go/firestore v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.0.1/go.mod"
+"cloud.google.com/go/pubsub v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.2.0/go.mod"
+"cloud.google.com/go/pubsub v1.3.1/go.mod"
+"cloud.google.com/go/spanner v1.17.0/go.mod"
+"cloud.google.com/go/spanner v1.18.0/go.mod"
+"cloud.google.com/go/spanner v1.20.0/go.mod"
+"cloud.google.com/go/storage v1.0.0/go.mod"
+"cloud.google.com/go/storage v1.5.0/go.mod"
+"cloud.google.com/go/storage v1.6.0/go.mod"
+"cloud.google.com/go/storage v1.8.0/go.mod"
+"cloud.google.com/go/storage v1.10.0/go.mod"
+"code.gitea.io/sdk/gitea v0.11.3/go.mod"
+"contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod"
+"contrib.go.opencensus.io/exporter/ocagent v0.5.0/go.mod"
+"contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod"
+"contrib.go.opencensus.io/exporter/stackdriver v0.13.5/go.mod"
+"contrib.go.opencensus.io/exporter/stackdriver v0.13.7/go.mod"
+"contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod"
+"contrib.go.opencensus.io/resource v0.1.1/go.mod"
+"dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod"
+"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+"dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod"
+"dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod"
+"dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod"
+"git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod"
+"github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96"
+"github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod"
+"github.com/Azure/azure-amqp-common-go/v2 v2.1.0/go.mod"
+"github.com/Azure/azure-pipeline-go v0.2.1/go.mod"
+"github.com/Azure/azure-sdk-for-go v29.0.0+incompatible/go.mod"
+"github.com/Azure/azure-sdk-for-go v30.1.0+incompatible/go.mod"
+"github.com/Azure/azure-service-bus-go v0.9.1/go.mod"
+"github.com/Azure/azure-storage-blob-go v0.8.0/go.mod"
+"github.com/Azure/go-autorest v12.0.0+incompatible/go.mod"
+"github.com/BurntSushi/toml v0.3.1"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+"github.com/DataDog/zstd v1.4.1/go.mod"
+"github.com/DataDog/zstd v1.4.5/go.mod"
+"github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20191009163259-e802c2cb94ae/go.mod"
+"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod"
+"github.com/Masterminds/glide v0.13.2/go.mod"
+"github.com/Masterminds/goutils v1.1.0/go.mod"
+"github.com/Masterminds/goutils v1.1.1"
+"github.com/Masterminds/goutils v1.1.1/go.mod"
+"github.com/Masterminds/semver v1.4.2/go.mod"
+"github.com/Masterminds/semver v1.5.0"
+"github.com/Masterminds/semver v1.5.0/go.mod"
+"github.com/Masterminds/semver/v3 v3.0.3/go.mod"
+"github.com/Masterminds/semver/v3 v3.1.0/go.mod"
+"github.com/Masterminds/semver/v3 v3.1.1"
+"github.com/Masterminds/semver/v3 v3.1.1/go.mod"
+"github.com/Masterminds/sprig v2.15.0+incompatible/go.mod"
+"github.com/Masterminds/sprig v2.22.0+incompatible"
+"github.com/Masterminds/sprig v2.22.0+incompatible/go.mod"
+"github.com/Masterminds/sprig/v3 v3.1.0/go.mod"
+"github.com/Masterminds/sprig/v3 v3.2.2"
+"github.com/Masterminds/sprig/v3 v3.2.2/go.mod"
+"github.com/Masterminds/vcs v1.13.0/go.mod"
+"github.com/Microsoft/go-winio v0.4.14/go.mod"
+"github.com/OneOfOne/xxhash v1.2.2"
+"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+"github.com/Shopify/sarama v1.19.0/go.mod"
+"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+"github.com/ThalesIgnite/crypto11 v1.2.4/go.mod"
+"github.com/ThomasRooney/gexpect v0.0.0-20161231170123-5482f0350944/go.mod"
+"github.com/VividCortex/gohistogram v1.0.0/go.mod"
+"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod"
+"github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod"
+"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
+"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
+"github.com/alecthomas/chroma v0.7.2-0.20200305040604-4f3623dce67a/go.mod"
+"github.com/alecthomas/chroma v0.9.2"
+"github.com/alecthomas/chroma v0.9.2/go.mod"
+"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
+"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
+"github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod"
+"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod"
+"github.com/alecthomas/kong v0.2.4/go.mod"
+"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897"
+"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+"github.com/antihax/optional v1.0.0/go.mod"
+"github.com/antlr/antlr4 v0.0.0-20200503195918-621b933c7a7f"
+"github.com/antlr/antlr4 v0.0.0-20200503195918-621b933c7a7f/go.mod"
+"github.com/aokoli/goutils v1.0.1/go.mod"
+"github.com/apache/beam v2.28.0+incompatible/go.mod"
+"github.com/apache/beam v2.30.0+incompatible/go.mod"
+"github.com/apache/thrift v0.12.0/go.mod"
+"github.com/apache/thrift v0.13.0/go.mod"
+"github.com/apex/log v1.1.4/go.mod"
+"github.com/apex/logs v0.0.4/go.mod"
+"github.com/aphistic/golf v0.0.0-20180712155816-02c07f170c5a/go.mod"
+"github.com/aphistic/sweet v0.2.0/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod"
+"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
+"github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b"
+"github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b/go.mod"
+"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+"github.com/aws/aws-lambda-go v1.13.3/go.mod"
+"github.com/aws/aws-sdk-go v1.15.27/go.mod"
+"github.com/aws/aws-sdk-go v1.19.18/go.mod"
+"github.com/aws/aws-sdk-go v1.19.45/go.mod"
+"github.com/aws/aws-sdk-go v1.20.6/go.mod"
+"github.com/aws/aws-sdk-go v1.23.20/go.mod"
+"github.com/aws/aws-sdk-go v1.25.11/go.mod"
+"github.com/aws/aws-sdk-go v1.27.0/go.mod"
+"github.com/aws/aws-sdk-go v1.30.29/go.mod"
+"github.com/aws/aws-sdk-go v1.37.0"
+"github.com/aws/aws-sdk-go v1.37.0/go.mod"
+"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
+"github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod"
+"github.com/benbjohnson/clock v1.0.3/go.mod"
+"github.com/benbjohnson/clock v1.1.0"
+"github.com/benbjohnson/clock v1.1.0/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
+"github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/boombuler/barcode v1.0.1/go.mod"
+"github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod"
+"github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod"
+"github.com/caarlos0/ctrlc v1.0.0/go.mod"
+"github.com/caddyserver/certmagic v0.14.5"
+"github.com/caddyserver/certmagic v0.14.5/go.mod"
+"github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e/go.mod"
+"github.com/casbin/casbin/v2 v2.1.2/go.mod"
+"github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod"
+"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod"
+"github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod"
+"github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod"
+"github.com/cespare/xxhash v1.1.0"
+"github.com/cespare/xxhash v1.1.0/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/cheekybits/genny v1.0.0"
+"github.com/cheekybits/genny v1.0.0/go.mod"
+"github.com/chzyer/logex v1.1.10"
+"github.com/chzyer/logex v1.1.10/go.mod"
+"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+"github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+"github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod"
+"github.com/cockroachdb/errors v1.2.4/go.mod"
+"github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod"
+"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
+"github.com/codegangsta/cli v1.20.0/go.mod"
+"github.com/coreos/bbolt v1.3.2/go.mod"
+"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
+"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+"github.com/coreos/go-semver v0.2.0/go.mod"
+"github.com/coreos/go-semver v0.3.0/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+"github.com/coreos/go-systemd/v22 v22.1.0/go.mod"
+"github.com/coreos/go-systemd/v22 v22.3.2/go.mod"
+"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+"github.com/corpix/uarand v0.1.1/go.mod"
+"github.com/cpuguy83/go-md2man v1.0.10"
+"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+"github.com/creack/pty v1.1.7/go.mod"
+"github.com/creack/pty v1.1.9/go.mod"
+"github.com/creack/pty v1.1.11/go.mod"
+"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
+"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod"
+"github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/devigned/tab v0.1.1/go.mod"
+"github.com/dgraph-io/badger v1.6.2"
+"github.com/dgraph-io/badger v1.6.2/go.mod"
+"github.com/dgraph-io/badger/v2 v2.0.1-rc1.0.20201003150343-5d1bab4fc658/go.mod"
+"github.com/dgraph-io/badger/v2 v2.2007.4"
+"github.com/dgraph-io/badger/v2 v2.2007.4/go.mod"
+"github.com/dgraph-io/ristretto v0.0.2/go.mod"
+"github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod"
+"github.com/dgraph-io/ristretto v0.0.4-0.20200906165740-41ebdbffecfd"
+"github.com/dgraph-io/ristretto v0.0.4-0.20200906165740-41ebdbffecfd/go.mod"
+"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod"
+"github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13"
+"github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod"
+"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+"github.com/dimchansky/utfbom v1.1.0/go.mod"
+"github.com/dlclark/regexp2 v1.1.6/go.mod"
+"github.com/dlclark/regexp2 v1.2.0/go.mod"
+"github.com/dlclark/regexp2 v1.4.0"
+"github.com/dlclark/regexp2 v1.4.0/go.mod"
+"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+"github.com/dustin/go-humanize v1.0.0/go.mod"
+"github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac"
+"github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac/go.mod"
+"github.com/eapache/go-resiliency v1.1.0/go.mod"
+"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+"github.com/eapache/queue v1.1.0/go.mod"
+"github.com/edsrzf/mmap-go v1.0.0/go.mod"
+"github.com/emirpasic/gods v1.12.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.7/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.3.0-java/go.mod"
+"github.com/etcd-io/gofail v0.0.0-20190801230047-ad7f989257ca/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.9.0/go.mod"
+"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+"github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod"
+"github.com/fortytw2/leaktest v1.2.0/go.mod"
+"github.com/fortytw2/leaktest v1.3.0/go.mod"
+"github.com/francoispqt/gojay v1.2.13/go.mod"
+"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
+"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/fsnotify/fsnotify v1.4.9"
+"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+"github.com/fullstorydev/grpcurl v1.8.0/go.mod"
+"github.com/fullstorydev/grpcurl v1.8.1/go.mod"
+"github.com/getsentry/raven-go v0.2.0/go.mod"
+"github.com/ghodss/yaml v1.0.0/go.mod"
+"github.com/gliderlabs/ssh v0.1.1/go.mod"
+"github.com/gliderlabs/ssh v0.2.2/go.mod"
+"github.com/go-chi/chi v4.0.2+incompatible/go.mod"
+"github.com/go-chi/chi v4.1.2+incompatible"
+"github.com/go-chi/chi v4.1.2+incompatible/go.mod"
+"github.com/go-errors/errors v1.0.1/go.mod"
+"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+"github.com/go-ini/ini v1.25.4/go.mod"
+"github.com/go-kit/kit v0.4.0/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-kit/kit v0.10.0"
+"github.com/go-kit/kit v0.10.0/go.mod"
+"github.com/go-kit/log v0.1.0/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-logfmt/logfmt v0.5.0"
+"github.com/go-logfmt/logfmt v0.5.0/go.mod"
+"github.com/go-piv/piv-go v1.7.0/go.mod"
+"github.com/go-redis/redis v6.15.9+incompatible/go.mod"
+"github.com/go-sql-driver/mysql v1.4.0/go.mod"
+"github.com/go-sql-driver/mysql v1.4.1/go.mod"
+"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+"github.com/go-sql-driver/mysql v1.6.0"
+"github.com/go-sql-driver/mysql v1.6.0/go.mod"
+"github.com/go-stack/stack v1.6.0/go.mod"
+"github.com/go-stack/stack v1.8.0"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0"
+"github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod"
+"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+"github.com/godbus/dbus/v5 v5.0.4/go.mod"
+"github.com/gogo/googleapis v1.1.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.0/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/gogo/protobuf v1.3.0/go.mod"
+"github.com/gogo/protobuf v1.3.1/go.mod"
+"github.com/gogo/protobuf v1.3.2/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+"github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da"
+"github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod"
+"github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/mock v1.3.1/go.mod"
+"github.com/golang/mock v1.4.0/go.mod"
+"github.com/golang/mock v1.4.1/go.mod"
+"github.com/golang/mock v1.4.3/go.mod"
+"github.com/golang/mock v1.4.4/go.mod"
+"github.com/golang/mock v1.5.0/go.mod"
+"github.com/golang/mock v1.6.0"
+"github.com/golang/mock v1.6.0/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/protobuf v1.3.3/go.mod"
+"github.com/golang/protobuf v1.3.4/go.mod"
+"github.com/golang/protobuf v1.3.5/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+"github.com/golang/protobuf v1.4.0/go.mod"
+"github.com/golang/protobuf v1.4.1/go.mod"
+"github.com/golang/protobuf v1.4.2/go.mod"
+"github.com/golang/protobuf v1.4.3/go.mod"
+"github.com/golang/protobuf v1.5.0/go.mod"
+"github.com/golang/protobuf v1.5.1/go.mod"
+"github.com/golang/protobuf v1.5.2"
+"github.com/golang/protobuf v1.5.2/go.mod"
+"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+"github.com/golang/snappy v0.0.1/go.mod"
+"github.com/golang/snappy v0.0.2/go.mod"
+"github.com/golang/snappy v0.0.3"
+"github.com/golang/snappy v0.0.3/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/btree v1.0.1/go.mod"
+"github.com/google/cel-go v0.7.3"
+"github.com/google/cel-go v0.7.3/go.mod"
+"github.com/google/cel-spec v0.5.0/go.mod"
+"github.com/google/certificate-transparency-go v1.0.21/go.mod"
+"github.com/google/certificate-transparency-go v1.1.2-0.20210422104406-9f33727a7a18/go.mod"
+"github.com/google/certificate-transparency-go v1.1.2-0.20210512142713-bed466244fa6/go.mod"
+"github.com/google/certificate-transparency-go v1.1.2-0.20210623111010-a50f74f4ce95/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.4.1/go.mod"
+"github.com/google/go-cmp v0.5.0/go.mod"
+"github.com/google/go-cmp v0.5.1/go.mod"
+"github.com/google/go-cmp v0.5.2/go.mod"
+"github.com/google/go-cmp v0.5.3/go.mod"
+"github.com/google/go-cmp v0.5.4/go.mod"
+"github.com/google/go-cmp v0.5.5/go.mod"
+"github.com/google/go-cmp v0.5.6"
+"github.com/google/go-cmp v0.5.6/go.mod"
+"github.com/google/go-github v17.0.0+incompatible/go.mod"
+"github.com/google/go-github/v28 v28.1.1/go.mod"
+"github.com/google/go-licenses v0.0.0-20210329231322-ce1d9163b77d/go.mod"
+"github.com/google/go-querystring v1.0.0/go.mod"
+"github.com/google/go-replayers/grpcreplay v0.1.0/go.mod"
+"github.com/google/go-replayers/httpreplay v0.1.0/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/licenseclassifier v0.0.0-20210325184830-bb04aff29e72/go.mod"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod"
+"github.com/google/martian/v3 v3.0.0/go.mod"
+"github.com/google/martian/v3 v3.1.0/go.mod"
+"github.com/google/martian/v3 v3.2.1/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+"github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod"
+"github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod"
+"github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod"
+"github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod"
+"github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod"
+"github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod"
+"github.com/google/renameio v0.1.0/go.mod"
+"github.com/google/rpmpack v0.0.0-20191226140753-aa36bfddb3a0/go.mod"
+"github.com/google/subcommands v1.0.1/go.mod"
+"github.com/google/trillian v1.3.14-0.20210409160123-c5ea3abd4a41/go.mod"
+"github.com/google/trillian v1.3.14-0.20210511103300-67b5f349eefa/go.mod"
+"github.com/google/trillian v1.3.14-0.20210622121126-870e0cdde059/go.mod"
+"github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod"
+"github.com/google/uuid v1.0.0/go.mod"
+"github.com/google/uuid v1.1.1/go.mod"
+"github.com/google/uuid v1.1.2/go.mod"
+"github.com/google/uuid v1.3.0"
+"github.com/google/uuid v1.3.0/go.mod"
+"github.com/google/wire v0.3.0/go.mod"
+"github.com/googleapis/gax-go v2.0.0+incompatible/go.mod"
+"github.com/googleapis/gax-go v2.0.2+incompatible"
+"github.com/googleapis/gax-go v2.0.2+incompatible/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.3/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+"github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod"
+"github.com/goreleaser/goreleaser v0.134.0/go.mod"
+"github.com/goreleaser/nfpm v1.2.1/go.mod"
+"github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod"
+"github.com/gorilla/context v1.1.1/go.mod"
+"github.com/gorilla/mux v1.4.0/go.mod"
+"github.com/gorilla/mux v1.6.2/go.mod"
+"github.com/gorilla/mux v1.7.3/go.mod"
+"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+"github.com/gorilla/websocket v1.4.0/go.mod"
+"github.com/gorilla/websocket v1.4.2/go.mod"
+"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+"github.com/groob/finalizer v0.0.0-20170707115354-4c2ed49aabda/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod"
+"github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod"
+"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.2/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod"
+"github.com/hashicorp/consul/api v1.1.0/go.mod"
+"github.com/hashicorp/consul/api v1.3.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.6.4/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go-version v1.2.0/go.mod"
+"github.com/hashicorp/go.net v0.0.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.0/go.mod"
+"github.com/hashicorp/memberlist v0.1.3/go.mod"
+"github.com/hashicorp/serf v0.8.2/go.mod"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/huandu/xstrings v1.0.0/go.mod"
+"github.com/huandu/xstrings v1.2.0/go.mod"
+"github.com/huandu/xstrings v1.3.1"
+"github.com/huandu/xstrings v1.3.1/go.mod"
+"github.com/hudl/fargo v1.3.0/go.mod"
+"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
+"github.com/icrowley/fake v0.0.0-20180203215853-4178557ae428/go.mod"
+"github.com/imdario/mergo v0.3.4/go.mod"
+"github.com/imdario/mergo v0.3.8/go.mod"
+"github.com/imdario/mergo v0.3.9/go.mod"
+"github.com/imdario/mergo v0.3.11"
+"github.com/imdario/mergo v0.3.11/go.mod"
+"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
+"github.com/jarcoal/httpmock v1.0.5/go.mod"
+"github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod"
+"github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod"
+"github.com/jessevdk/go-flags v1.4.0/go.mod"
+"github.com/jhump/protoreflect v1.6.1/go.mod"
+"github.com/jhump/protoreflect v1.8.2/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+"github.com/jmespath/go-jmespath v0.4.0"
+"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+"github.com/joho/godotenv v1.3.0/go.mod"
+"github.com/jonboulle/clockwork v0.1.0/go.mod"
+"github.com/jonboulle/clockwork v0.2.2/go.mod"
+"github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod"
+"github.com/jpillora/backoff v1.0.0/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.8/go.mod"
+"github.com/json-iterator/go v1.1.9/go.mod"
+"github.com/json-iterator/go v1.1.10/go.mod"
+"github.com/json-iterator/go v1.1.11/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+"github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a"
+"github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod"
+"github.com/juju/ratelimit v1.0.1/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/julienschmidt/httprouter v1.3.0/go.mod"
+"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
+"github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod"
+"github.com/kisielk/errcheck v1.1.0/go.mod"
+"github.com/kisielk/errcheck v1.2.0/go.mod"
+"github.com/kisielk/errcheck v1.5.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/klauspost/compress v1.12.3/go.mod"
+"github.com/klauspost/compress v1.13.4"
+"github.com/klauspost/compress v1.13.4/go.mod"
+"github.com/klauspost/cpuid/v2 v2.0.6/go.mod"
+"github.com/klauspost/cpuid/v2 v2.0.9"
+"github.com/klauspost/cpuid/v2 v2.0.9/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pretty v0.2.0/go.mod"
+"github.com/kr/pretty v0.2.1"
+"github.com/kr/pretty v0.2.1/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/pty v1.1.3/go.mod"
+"github.com/kr/pty v1.1.8/go.mod"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/kr/text v0.2.0"
+"github.com/kr/text v0.2.0/go.mod"
+"github.com/kylelemons/godebug v1.1.0"
+"github.com/kylelemons/godebug v1.1.0/go.mod"
+"github.com/letsencrypt/pkcs11key/v4 v4.0.0/go.mod"
+"github.com/lib/pq v1.1.1/go.mod"
+"github.com/libdns/libdns v0.2.1"
+"github.com/libdns/libdns v0.2.1/go.mod"
+"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
+"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
+"github.com/lucas-clemente/quic-go v0.23.0"
+"github.com/lucas-clemente/quic-go v0.23.0/go.mod"
+"github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a/go.mod"
+"github.com/lunixbochs/vtclean v1.0.0"
+"github.com/lunixbochs/vtclean v1.0.0/go.mod"
+"github.com/lyft/protoc-gen-validate v0.0.13/go.mod"
+"github.com/magiconair/properties v1.8.0/go.mod"
+"github.com/magiconair/properties v1.8.1/go.mod"
+"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+"github.com/manifoldco/promptui v0.8.0"
+"github.com/manifoldco/promptui v0.8.0/go.mod"
+"github.com/marten-seemann/qpack v0.2.1"
+"github.com/marten-seemann/qpack v0.2.1/go.mod"
+"github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod"
+"github.com/marten-seemann/qtls-go1-16 v0.1.4"
+"github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod"
+"github.com/marten-seemann/qtls-go1-17 v0.1.0"
+"github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod"
+"github.com/mattn/go-colorable v0.0.9/go.mod"
+"github.com/mattn/go-colorable v0.1.1/go.mod"
+"github.com/mattn/go-colorable v0.1.2/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-colorable v0.1.6/go.mod"
+"github.com/mattn/go-colorable v0.1.8"
+"github.com/mattn/go-colorable v0.1.8/go.mod"
+"github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod"
+"github.com/mattn/go-isatty v0.0.3/go.mod"
+"github.com/mattn/go-isatty v0.0.4/go.mod"
+"github.com/mattn/go-isatty v0.0.5/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/mattn/go-isatty v0.0.13"
+"github.com/mattn/go-isatty v0.0.13/go.mod"
+"github.com/mattn/go-runewidth v0.0.2/go.mod"
+"github.com/mattn/go-runewidth v0.0.7/go.mod"
+"github.com/mattn/go-runewidth v0.0.9/go.mod"
+"github.com/mattn/go-shellwords v1.0.10/go.mod"
+"github.com/mattn/go-zglob v0.0.1/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
+"github.com/mholt/acmez v1.0.0"
+"github.com/mholt/acmez v1.0.0/go.mod"
+"github.com/microcosm-cc/bluemonday v1.0.1/go.mod"
+"github.com/micromdm/scep/v2 v2.0.0"
+"github.com/micromdm/scep/v2 v2.0.0/go.mod"
+"github.com/miekg/dns v1.0.14/go.mod"
+"github.com/miekg/dns v1.1.42"
+"github.com/miekg/dns v1.1.42/go.mod"
+"github.com/miekg/pkcs11 v1.0.2/go.mod"
+"github.com/miekg/pkcs11 v1.0.3-0.20190429190417-a667d056470f/go.mod"
+"github.com/miekg/pkcs11 v1.0.3/go.mod"
+"github.com/mitchellh/cli v1.0.0/go.mod"
+"github.com/mitchellh/copystructure v1.0.0"
+"github.com/mitchellh/copystructure v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/gox v0.4.0/go.mod"
+"github.com/mitchellh/iochan v1.0.0/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+"github.com/mitchellh/reflectwalk v1.0.1"
+"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod"
+"github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
+"github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod"
+"github.com/mwitkow/go-proto-validators v0.2.0/go.mod"
+"github.com/naoina/go-stringutil v0.1.0"
+"github.com/naoina/go-stringutil v0.1.0/go.mod"
+"github.com/naoina/toml v0.1.1"
+"github.com/naoina/toml v0.1.1/go.mod"
+"github.com/nats-io/jwt v0.3.0/go.mod"
+"github.com/nats-io/jwt v0.3.2/go.mod"
+"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
+"github.com/nats-io/nats.go v1.9.1/go.mod"
+"github.com/nats-io/nkeys v0.1.0/go.mod"
+"github.com/nats-io/nkeys v0.1.3/go.mod"
+"github.com/nats-io/nuid v1.0.1/go.mod"
+"github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod"
+"github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod"
+"github.com/newrelic/go-agent v2.15.0+incompatible/go.mod"
+"github.com/ngdinhtoan/glide-cleanup v0.2.0/go.mod"
+"github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod"
+"github.com/nxadm/tail v1.4.4/go.mod"
+"github.com/nxadm/tail v1.4.8"
+"github.com/nxadm/tail v1.4.8/go.mod"
+"github.com/oklog/oklog v0.3.2/go.mod"
+"github.com/oklog/run v1.0.0/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+"github.com/olekukonko/tablewriter v0.0.4/go.mod"
+"github.com/olekukonko/tablewriter v0.0.5/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.7.0/go.mod"
+"github.com/onsi/ginkgo v1.10.3/go.mod"
+"github.com/onsi/ginkgo v1.12.1/go.mod"
+"github.com/onsi/ginkgo v1.14.0/go.mod"
+"github.com/onsi/ginkgo v1.16.2/go.mod"
+"github.com/onsi/ginkgo v1.16.4"
+"github.com/onsi/ginkgo v1.16.4/go.mod"
+"github.com/onsi/gomega v1.4.3/go.mod"
+"github.com/onsi/gomega v1.5.0/go.mod"
+"github.com/onsi/gomega v1.7.1/go.mod"
+"github.com/onsi/gomega v1.10.1/go.mod"
+"github.com/onsi/gomega v1.13.0"
+"github.com/onsi/gomega v1.13.0/go.mod"
+"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
+"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
+"github.com/opentracing/basictracer-go v1.0.0/go.mod"
+"github.com/opentracing/opentracing-go v1.0.2/go.mod"
+"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
+"github.com/openzipkin/zipkin-go v0.1.1/go.mod"
+"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
+"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
+"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
+"github.com/otiai10/copy v1.2.0/go.mod"
+"github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod"
+"github.com/otiai10/curr v1.0.0/go.mod"
+"github.com/otiai10/mint v1.3.0/go.mod"
+"github.com/otiai10/mint v1.3.1/go.mod"
+"github.com/pact-foundation/pact-go v1.0.4/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pborman/uuid v1.2.0/go.mod"
+"github.com/pelletier/go-buffruneio v0.2.0/go.mod"
+"github.com/pelletier/go-toml v1.2.0/go.mod"
+"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
+"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pkg/errors v0.9.1"
+"github.com/pkg/errors v0.9.1/go.mod"
+"github.com/pkg/profile v1.2.1/go.mod"
+"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/pquerna/otp v1.0.0/go.mod"
+"github.com/prometheus/client_golang v0.8.0/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+"github.com/prometheus/client_golang v0.9.3/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.3.0/go.mod"
+"github.com/prometheus/client_golang v1.5.1/go.mod"
+"github.com/prometheus/client_golang v1.7.1/go.mod"
+"github.com/prometheus/client_golang v1.10.0/go.mod"
+"github.com/prometheus/client_golang v1.11.0"
+"github.com/prometheus/client_golang v1.11.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.1.0/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.2.0/go.mod"
+"github.com/prometheus/common v0.4.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.7.0/go.mod"
+"github.com/prometheus/common v0.9.1/go.mod"
+"github.com/prometheus/common v0.10.0/go.mod"
+"github.com/prometheus/common v0.18.0/go.mod"
+"github.com/prometheus/common v0.26.0"
+"github.com/prometheus/common v0.26.0/go.mod"
+"github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/prometheus/procfs v0.1.3/go.mod"
+"github.com/prometheus/procfs v0.2.0/go.mod"
+"github.com/prometheus/procfs v0.6.0"
+"github.com/prometheus/procfs v0.6.0/go.mod"
+"github.com/prometheus/tsdb v0.7.1/go.mod"
+"github.com/pseudomuto/protoc-gen-doc v1.4.1/go.mod"
+"github.com/pseudomuto/protokit v0.2.0/go.mod"
+"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
+"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+"github.com/rogpeppe/fastuuid v1.1.0/go.mod"
+"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+"github.com/rs/cors v1.7.0/go.mod"
+"github.com/rs/xid v1.2.1"
+"github.com/rs/xid v1.2.1/go.mod"
+"github.com/russross/blackfriday v1.5.2"
+"github.com/russross/blackfriday v1.5.2/go.mod"
+"github.com/russross/blackfriday/v2 v2.0.1"
+"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+"github.com/samfoo/ansi v0.0.0-20160124022901-b6bd2ded7189"
+"github.com/samfoo/ansi v0.0.0-20160124022901-b6bd2ded7189/go.mod"
+"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
+"github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+"github.com/sergi/go-diff v1.0.0/go.mod"
+"github.com/sergi/go-diff v1.1.0/go.mod"
+"github.com/sergi/go-diff v1.2.0"
+"github.com/sergi/go-diff v1.2.0/go.mod"
+"github.com/shopspring/decimal v1.2.0"
+"github.com/shopspring/decimal v1.2.0/go.mod"
+"github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod"
+"github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod"
+"github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod"
+"github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod"
+"github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod"
+"github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod"
+"github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod"
+"github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod"
+"github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod"
+"github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod"
+"github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod"
+"github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod"
+"github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod"
+"github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod"
+"github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod"
+"github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod"
+"github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod"
+"github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod"
+"github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod"
+"github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+"github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod"
+"github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.3.0/go.mod"
+"github.com/sirupsen/logrus v1.4.1/go.mod"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/sirupsen/logrus v1.6.0/go.mod"
+"github.com/sirupsen/logrus v1.7.0"
+"github.com/sirupsen/logrus v1.7.0/go.mod"
+"github.com/smallstep/assert v0.0.0-20180720014142-de77670473b5/go.mod"
+"github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262"
+"github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262/go.mod"
+"github.com/smallstep/certificates v0.16.0/go.mod"
+"github.com/smallstep/certificates v0.16.4"
+"github.com/smallstep/certificates v0.16.4/go.mod"
+"github.com/smallstep/certinfo v1.5.1/go.mod"
+"github.com/smallstep/cli v0.16.1"
+"github.com/smallstep/cli v0.16.1/go.mod"
+"github.com/smallstep/nosql v0.3.6/go.mod"
+"github.com/smallstep/nosql v0.3.8"
+"github.com/smallstep/nosql v0.3.8/go.mod"
+"github.com/smallstep/truststore v0.9.6"
+"github.com/smallstep/truststore v0.9.6/go.mod"
+"github.com/smallstep/zcrypto v0.0.0-20200203191936-fbc32cf76bce/go.mod"
+"github.com/smallstep/zlint v0.0.0-20180727184541-d84eaafe274f/go.mod"
+"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+"github.com/smartystreets/assertions v1.0.0/go.mod"
+"github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod"
+"github.com/smartystreets/goconvey v1.6.4/go.mod"
+"github.com/smartystreets/gunit v1.0.0/go.mod"
+"github.com/soheilhy/cmux v0.1.4/go.mod"
+"github.com/soheilhy/cmux v0.1.5-0.20210205191134-5ec6847320e5/go.mod"
+"github.com/soheilhy/cmux v0.1.5/go.mod"
+"github.com/sony/gobreaker v0.4.1/go.mod"
+"github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod"
+"github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod"
+"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+"github.com/spaolacci/murmur3 v1.1.0"
+"github.com/spaolacci/murmur3 v1.1.0/go.mod"
+"github.com/spf13/afero v1.1.2/go.mod"
+"github.com/spf13/cast v1.3.0/go.mod"
+"github.com/spf13/cast v1.3.1"
+"github.com/spf13/cast v1.3.1/go.mod"
+"github.com/spf13/cobra v0.0.3/go.mod"
+"github.com/spf13/cobra v0.0.5/go.mod"
+"github.com/spf13/cobra v1.0.0/go.mod"
+"github.com/spf13/cobra v1.1.1/go.mod"
+"github.com/spf13/cobra v1.1.3/go.mod"
+"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+"github.com/spf13/pflag v1.0.1/go.mod"
+"github.com/spf13/pflag v1.0.3/go.mod"
+"github.com/spf13/pflag v1.0.5/go.mod"
+"github.com/spf13/viper v1.3.2/go.mod"
+"github.com/spf13/viper v1.4.0/go.mod"
+"github.com/spf13/viper v1.7.0/go.mod"
+"github.com/src-d/gcfg v1.4.0/go.mod"
+"github.com/stoewer/go-strcase v1.2.0"
+"github.com/stoewer/go-strcase v1.2.0/go.mod"
+"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
+"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
+"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/objx v0.2.0/go.mod"
+"github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/stretchr/testify v1.5.1/go.mod"
+"github.com/stretchr/testify v1.6.1/go.mod"
+"github.com/stretchr/testify v1.7.0"
+"github.com/stretchr/testify v1.7.0/go.mod"
+"github.com/subosito/gotenv v1.2.0/go.mod"
+"github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod"
+"github.com/thales-e-security/pool v0.0.2/go.mod"
+"github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod"
+"github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod"
+"github.com/tj/go-kinesis v0.0.0-20171128231115-08b17f58cb1b/go.mod"
+"github.com/tj/go-spin v1.1.0/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod"
+"github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod"
+"github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod"
+"github.com/ugorji/go v1.1.4/go.mod"
+"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+"github.com/ulikunitz/xz v0.5.6/go.mod"
+"github.com/ulikunitz/xz v0.5.7/go.mod"
+"github.com/urfave/cli v1.20.0/go.mod"
+"github.com/urfave/cli v1.22.1/go.mod"
+"github.com/urfave/cli v1.22.2/go.mod"
+"github.com/urfave/cli v1.22.4/go.mod"
+"github.com/urfave/cli v1.22.5"
+"github.com/urfave/cli v1.22.5/go.mod"
+"github.com/viant/assertly v0.4.8/go.mod"
+"github.com/viant/toolbox v0.24.0/go.mod"
+"github.com/weppos/publicsuffix-go v0.4.0/go.mod"
+"github.com/xanzy/go-gitlab v0.31.0/go.mod"
+"github.com/xanzy/ssh-agent v0.2.1/go.mod"
+"github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod"
+"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+"github.com/yuin/goldmark v1.1.25/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"github.com/yuin/goldmark v1.1.32/go.mod"
+"github.com/yuin/goldmark v1.2.1/go.mod"
+"github.com/yuin/goldmark v1.3.5/go.mod"
+"github.com/yuin/goldmark v1.3.6/go.mod"
+"github.com/yuin/goldmark v1.4.0"
+"github.com/yuin/goldmark v1.4.0/go.mod"
+"github.com/yuin/goldmark-highlighting v0.0.0-20210516132338-9216f9c5aa01"
+"github.com/yuin/goldmark-highlighting v0.0.0-20210516132338-9216f9c5aa01/go.mod"
+"github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod"
+"github.com/zmap/rc2 v0.0.0-20190804163417-abaa70531248/go.mod"
+"github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod"
+"github.com/zmap/zcertificate v0.0.0-20190521191901-30e388164f71/go.mod"
+"github.com/zmap/zcrypto v0.0.0-20190329181646-dff83107394d/go.mod"
+"github.com/zmap/zlint v0.0.0-20190516161541-9047d02cf65a/go.mod"
+"go.etcd.io/bbolt v1.3.2/go.mod"
+"go.etcd.io/bbolt v1.3.3/go.mod"
+"go.etcd.io/bbolt v1.3.5/go.mod"
+"go.etcd.io/bbolt v1.3.6"
+"go.etcd.io/bbolt v1.3.6/go.mod"
+"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
+"go.etcd.io/etcd/api/v3 v3.5.0-alpha.0/go.mod"
+"go.etcd.io/etcd/api/v3 v3.5.0/go.mod"
+"go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod"
+"go.etcd.io/etcd/client/v2 v2.305.0-alpha.0/go.mod"
+"go.etcd.io/etcd/client/v2 v2.305.0/go.mod"
+"go.etcd.io/etcd/client/v3 v3.5.0-alpha.0/go.mod"
+"go.etcd.io/etcd/client/v3 v3.5.0/go.mod"
+"go.etcd.io/etcd/etcdctl/v3 v3.5.0-alpha.0/go.mod"
+"go.etcd.io/etcd/etcdctl/v3 v3.5.0/go.mod"
+"go.etcd.io/etcd/etcdutl/v3 v3.5.0/go.mod"
+"go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0/go.mod"
+"go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod"
+"go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0/go.mod"
+"go.etcd.io/etcd/raft/v3 v3.5.0/go.mod"
+"go.etcd.io/etcd/server/v3 v3.5.0-alpha.0/go.mod"
+"go.etcd.io/etcd/server/v3 v3.5.0/go.mod"
+"go.etcd.io/etcd/tests/v3 v3.5.0-alpha.0/go.mod"
+"go.etcd.io/etcd/tests/v3 v3.5.0/go.mod"
+"go.etcd.io/etcd/v3 v3.5.0-alpha.0/go.mod"
+"go.etcd.io/etcd/v3 v3.5.0/go.mod"
+"go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1"
+"go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod"
+"go.opencensus.io v0.15.0/go.mod"
+"go.opencensus.io v0.18.0/go.mod"
+"go.opencensus.io v0.20.1/go.mod"
+"go.opencensus.io v0.20.2/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0/go.mod"
+"go.opencensus.io v0.22.2/go.mod"
+"go.opencensus.io v0.22.3/go.mod"
+"go.opencensus.io v0.22.4/go.mod"
+"go.opencensus.io v0.22.5/go.mod"
+"go.opencensus.io v0.22.6/go.mod"
+"go.opencensus.io v0.23.0"
+"go.opencensus.io v0.23.0/go.mod"
+"go.opentelemetry.io/contrib v0.20.0/go.mod"
+"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod"
+"go.opentelemetry.io/otel v0.20.0/go.mod"
+"go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod"
+"go.opentelemetry.io/otel/metric v0.20.0/go.mod"
+"go.opentelemetry.io/otel/oteltest v0.20.0/go.mod"
+"go.opentelemetry.io/otel/sdk v0.20.0/go.mod"
+"go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod"
+"go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod"
+"go.opentelemetry.io/otel/trace v0.20.0/go.mod"
+"go.opentelemetry.io/proto/otlp v0.7.0/go.mod"
+"go.step.sm/cli-utils v0.4.1"
+"go.step.sm/cli-utils v0.4.1/go.mod"
+"go.step.sm/crypto v0.9.0"
+"go.step.sm/crypto v0.9.0/go.mod"
+"go.step.sm/linkedca v0.0.0-20210611183751-27424aae8d25"
+"go.step.sm/linkedca v0.0.0-20210611183751-27424aae8d25/go.mod"
+"go.uber.org/atomic v1.3.2/go.mod"
+"go.uber.org/atomic v1.4.0/go.mod"
+"go.uber.org/atomic v1.5.0/go.mod"
+"go.uber.org/atomic v1.6.0/go.mod"
+"go.uber.org/atomic v1.7.0"
+"go.uber.org/atomic v1.7.0/go.mod"
+"go.uber.org/goleak v1.1.10"
+"go.uber.org/goleak v1.1.10/go.mod"
+"go.uber.org/multierr v1.1.0/go.mod"
+"go.uber.org/multierr v1.3.0/go.mod"
+"go.uber.org/multierr v1.5.0/go.mod"
+"go.uber.org/multierr v1.6.0"
+"go.uber.org/multierr v1.6.0/go.mod"
+"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+"go.uber.org/zap v1.10.0/go.mod"
+"go.uber.org/zap v1.13.0/go.mod"
+"go.uber.org/zap v1.15.0/go.mod"
+"go.uber.org/zap v1.16.0/go.mod"
+"go.uber.org/zap v1.17.0/go.mod"
+"go.uber.org/zap v1.19.0"
+"go.uber.org/zap v1.19.0/go.mod"
+"go4.org v0.0.0-20180809161055-417644f6feb5/go.mod"
+"gocloud.dev v0.19.0/go.mod"
+"golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod"
+"golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod"
+"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod"
+"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
+"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+"golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f/go.mod"
+"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
+"golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod"
+"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
+"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
+"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod"
+"golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e"
+"golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+"golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod"
+"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+"golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod"
+"golang.org/x/lint v0.0.0-20210508222113-6edffad5e616"
+"golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod"
+"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+"golang.org/x/mod v0.1.0/go.mod"
+"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/mod v0.3.0/go.mod"
+"golang.org/x/mod v0.4.0/go.mod"
+"golang.org/x/mod v0.4.1/go.mod"
+"golang.org/x/mod v0.4.2"
+"golang.org/x/mod v0.4.2/go.mod"
+"golang.org/x/net v0.0.0-20170726083632-f5079bd7f6f7/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod"
+"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
+"golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190301231341-16b79f2e4e95/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+"golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod"
+"golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914/go.mod"
+"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+"golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod"
+"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+"golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod"
+"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+"golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod"
+"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+"golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod"
+"golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
+"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod"
+"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod"
+"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
+"golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod"
+"golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod"
+"golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod"
+"golang.org/x/net v0.0.0-20210614182718-04defd469f4e"
+"golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod"
+"golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod"
+"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
+"golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod"
+"golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod"
+"golang.org/x/oauth2 v0.0.0-20210126194326-f9ce19ea3013/go.mod"
+"golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod"
+"golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod"
+"golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod"
+"golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/go.mod"
+"golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c/go.mod"
+"golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c"
+"golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod"
+"golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+"golang.org/x/sys v0.0.0-20170728174421-0f826bdd13b5/go.mod"
+"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
+"golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod"
+"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
+"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+"golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+"golang.org/x/sys v0.0.0-20190620070143-6f217b454f45/go.mod"
+"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+"golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod"
+"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
+"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20191119060738-e882bf8e40c2/go.mod"
+"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
+"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
+"golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod"
+"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+"golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod"
+"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+"golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod"
+"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
+"golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod"
+"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+"golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod"
+"golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod"
+"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+"golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod"
+"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod"
+"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
+"golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod"
+"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod"
+"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
+"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+"golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod"
+"golang.org/x/sys v0.0.0-20210412220455-f1c623a9e750/go.mod"
+"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+"golang.org/x/sys v0.0.0-20210503080704-8803ae5d1324/go.mod"
+"golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod"
+"golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod"
+"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod"
+"golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod"
+"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
+"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c"
+"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/term v0.0.0-20210503060354-a79de5458b56"
+"golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod"
+"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/text v0.3.4/go.mod"
+"golang.org/x/text v0.3.5/go.mod"
+"golang.org/x/text v0.3.6"
+"golang.org/x/text v0.3.6/go.mod"
+"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod"
+"golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod"
+"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod"
+"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+"golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod"
+"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+"golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod"
+"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+"golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod"
+"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
+"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
+"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
+"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+"golang.org/x/tools v0.0.0-20191118222007-07fc4c7f2b98/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
+"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+"golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod"
+"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+"golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod"
+"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+"golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod"
+"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
+"golang.org/x/tools v0.0.0-20201014170642-d1624618ad65/go.mod"
+"golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod"
+"golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod"
+"golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod"
+"golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod"
+"golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod"
+"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
+"golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod"
+"golang.org/x/tools v0.1.0/go.mod"
+"golang.org/x/tools v0.1.1/go.mod"
+"golang.org/x/tools v0.1.2/go.mod"
+"golang.org/x/tools v0.1.3"
+"golang.org/x/tools v0.1.3/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"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+"google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod"
+"google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod"
+"google.golang.org/api v0.1.0/go.mod"
+"google.golang.org/api v0.3.1/go.mod"
+"google.golang.org/api v0.4.0/go.mod"
+"google.golang.org/api v0.5.0/go.mod"
+"google.golang.org/api v0.6.0/go.mod"
+"google.golang.org/api v0.7.0/go.mod"
+"google.golang.org/api v0.8.0/go.mod"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/api v0.10.0/go.mod"
+"google.golang.org/api v0.13.0/go.mod"
+"google.golang.org/api v0.14.0/go.mod"
+"google.golang.org/api v0.15.0/go.mod"
+"google.golang.org/api v0.17.0/go.mod"
+"google.golang.org/api v0.18.0/go.mod"
+"google.golang.org/api v0.19.0/go.mod"
+"google.golang.org/api v0.20.0/go.mod"
+"google.golang.org/api v0.22.0/go.mod"
+"google.golang.org/api v0.24.0/go.mod"
+"google.golang.org/api v0.28.0/go.mod"
+"google.golang.org/api v0.29.0/go.mod"
+"google.golang.org/api v0.30.0/go.mod"
+"google.golang.org/api v0.35.0/go.mod"
+"google.golang.org/api v0.36.0/go.mod"
+"google.golang.org/api v0.37.0/go.mod"
+"google.golang.org/api v0.40.0/go.mod"
+"google.golang.org/api v0.41.0/go.mod"
+"google.golang.org/api v0.43.0/go.mod"
+"google.golang.org/api v0.45.0/go.mod"
+"google.golang.org/api v0.46.0/go.mod"
+"google.golang.org/api v0.47.0/go.mod"
+"google.golang.org/api v0.48.0"
+"google.golang.org/api v0.48.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.2.0/go.mod"
+"google.golang.org/appengine v1.3.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.1/go.mod"
+"google.golang.org/appengine v1.6.2/go.mod"
+"google.golang.org/appengine v1.6.5/go.mod"
+"google.golang.org/appengine v1.6.6/go.mod"
+"google.golang.org/appengine v1.6.7"
+"google.golang.org/appengine v1.6.7/go.mod"
+"google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod"
+"google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod"
+"google.golang.org/genproto v0.0.0-20181107211654-5fc9ac540362/go.mod"
+"google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod"
+"google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod"
+"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+"google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod"
+"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
+"google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601/go.mod"
+"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+"google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod"
+"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+"google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod"
+"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
+"google.golang.org/genproto v0.0.0-20201102152239-715cce707fb0/go.mod"
+"google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod"
+"google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod"
+"google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod"
+"google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod"
+"google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod"
+"google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506/go.mod"
+"google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod"
+"google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod"
+"google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod"
+"google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod"
+"google.golang.org/genproto v0.0.0-20210331142528-b7513248f0ba/go.mod"
+"google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod"
+"google.golang.org/genproto v0.0.0-20210413151531-c14fb6ef47c3/go.mod"
+"google.golang.org/genproto v0.0.0-20210427215850-f767ed18ee4d/go.mod"
+"google.golang.org/genproto v0.0.0-20210429181445-86c259c2b4ab/go.mod"
+"google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod"
+"google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod"
+"google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08"
+"google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod"
+"google.golang.org/grpc v1.8.0/go.mod"
+"google.golang.org/grpc v1.14.0/go.mod"
+"google.golang.org/grpc v1.16.0/go.mod"
+"google.golang.org/grpc v1.17.0/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.0/go.mod"
+"google.golang.org/grpc v1.20.1/go.mod"
+"google.golang.org/grpc v1.21.0/go.mod"
+"google.golang.org/grpc v1.21.1/go.mod"
+"google.golang.org/grpc v1.22.1/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.23.1/go.mod"
+"google.golang.org/grpc v1.25.1/go.mod"
+"google.golang.org/grpc v1.26.0/go.mod"
+"google.golang.org/grpc v1.27.0/go.mod"
+"google.golang.org/grpc v1.27.1/go.mod"
+"google.golang.org/grpc v1.28.0/go.mod"
+"google.golang.org/grpc v1.29.1/go.mod"
+"google.golang.org/grpc v1.30.0/go.mod"
+"google.golang.org/grpc v1.31.0/go.mod"
+"google.golang.org/grpc v1.31.1/go.mod"
+"google.golang.org/grpc v1.32.0/go.mod"
+"google.golang.org/grpc v1.33.1/go.mod"
+"google.golang.org/grpc v1.33.2/go.mod"
+"google.golang.org/grpc v1.34.0/go.mod"
+"google.golang.org/grpc v1.35.0/go.mod"
+"google.golang.org/grpc v1.36.0/go.mod"
+"google.golang.org/grpc v1.36.1/go.mod"
+"google.golang.org/grpc v1.37.0/go.mod"
+"google.golang.org/grpc v1.37.1/go.mod"
+"google.golang.org/grpc v1.38.0"
+"google.golang.org/grpc v1.38.0/go.mod"
+"google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod"
+"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+"google.golang.org/protobuf v1.21.0/go.mod"
+"google.golang.org/protobuf v1.22.0/go.mod"
+"google.golang.org/protobuf v1.23.0/go.mod"
+"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+"google.golang.org/protobuf v1.24.0/go.mod"
+"google.golang.org/protobuf v1.25.0/go.mod"
+"google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod"
+"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+"google.golang.org/protobuf v1.26.0/go.mod"
+"google.golang.org/protobuf v1.27.1"
+"google.golang.org/protobuf v1.27.1/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+"gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod"
+"gopkg.in/errgo.v2 v2.1.0/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/gcfg.v1 v1.2.3/go.mod"
+"gopkg.in/inf.v0 v0.9.1/go.mod"
+"gopkg.in/ini.v1 v1.51.0/go.mod"
+"gopkg.in/natefinch/lumberjack.v2 v2.0.0"
+"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
+"gopkg.in/resty.v1 v1.12.0/go.mod"
+"gopkg.in/square/go-jose.v2 v2.5.1"
+"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+"gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod"
+"gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod"
+"gopkg.in/src-d/go-git.v4 v4.13.1/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/warnings.v0 v0.1.2/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.3/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.2.7/go.mod"
+"gopkg.in/yaml.v2 v2.2.8/go.mod"
+"gopkg.in/yaml.v2 v2.3.0/go.mod"
+"gopkg.in/yaml.v2 v2.4.0"
+"gopkg.in/yaml.v2 v2.4.0/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+"grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod"
+"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+"howett.net/plist v0.0.0-20181124034731-591f970eefbb"
+"howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod"
+"pack.ag/amqp v0.11.2/go.mod"
+"rsc.io/binaryregexp v0.2.0/go.mod"
+"rsc.io/quote/v3 v3.1.0/go.mod"
+"rsc.io/sampler v1.3.0/go.mod"
+"sigs.k8s.io/yaml v1.1.0/go.mod"
+"sigs.k8s.io/yaml v1.2.0/go.mod"
+"software.sslmate.com/src/go-pkcs12 v0.0.0-20201103104416-57fc603b7f52/go.mod"
+"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
+"sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod"
+"sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD ECL-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+RDEPEND="
+	acct-user/http
+	acct-group/http"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test"
+
+FILECAPS=(
+	-m 755 'cap_net_bind_service=+ep' usr/bin/${PN}
+)
+
+src_compile() {
+	go build ./cmd/caddy || die
+}
+
+src_install() {
+	dobin caddy
+	dodoc README.md
+	keepdir /etc/caddy
+	insinto /etc/caddy
+	newins "${FILESDIR}"/caddy_config.json caddy_config.json.example
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newinitd "${FILESDIR}/initd" "${PN}"
+	newconfd "${FILESDIR}/confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotated" "${PN}"
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+}
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 24bacbb63185..9b7b3b7eeddf 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -13,5 +13,5 @@ DIST lighttpd-1.4.58.tar.xz 956828 BLAKE2B b8b0a111db64a8af429dd9922503991e55276
 DIST lighttpd-1.4.59.tar.xz 968352 BLAKE2B 8997386be24d9d84fa8012aedd8ac97b3ad4fd19bb756163d3e9b8c6984c740475c6db2810817db9d1a246320bcd81f7ab35847707316454523c614a4485299f SHA512 94d312f6ac65c32057018b749c4865220b43b3e4b7fe9396848aa403ea7fdc2ccbf3f4f91daf281b754cf272a52a8bcdc689502773ea33cae36eead2785daa0f
 EBUILD lighttpd-1.4.55-r101.ebuild 6969 BLAKE2B 4d4f5f97ecf84b270d405e639d2b80c739e9bf80e4fb9282cb76395ab4e02b0d41775ae3c5af504d487cf040072523ebec063059f6d508de81292243f20ff77a SHA512 ffc11c91eb34e8c06727725b2c12570def1ab2165e3497643d2cb468e2913b8835436e2afe936365055032e9a05b22a23eed22a85ab7fcefc49a3f8a0b7edb6e
 EBUILD lighttpd-1.4.58-r1.ebuild 7583 BLAKE2B cb86b521d9affc799ed4dd3feeec74305377043d5610beeb83440cdbb5f3fa1bd59b3727736e62f55f0bc2f6694533b7809b6887cb9db923bb10e37fcb2dbf22 SHA512 c1ea434d4a75494fa3115ac5efe37baa5f38212089e6cf6f01ce4b408e704806b560aa82c59ea17dbcd495651b94db137c5fa10b38ab438ec7f9b6b6305936d1
-EBUILD lighttpd-1.4.59-r1.ebuild 6660 BLAKE2B 563407dd0174623b5f595cdd927af15cda641e11ca467ae0dd3787cdb34794b0fa7f8afc4a6782d6c42216d5117af719e3ee1b7d5ebfeb0d2d024fe64cffcad7 SHA512 03f0012a825934e04c5a71ca450f8192a90083eed75f9178d9888d8f6e283ca5b10ebd115929cae91ab95384261b8e3b73e45c4fff0d057aefc6a9f9d5f972aa
+EBUILD lighttpd-1.4.59-r1.ebuild 6654 BLAKE2B c8bf96550c734593f4534e193114dfa761ee42d8dabd8078615ebcaed2eef0364a44b0c3f8cdf31347b30164a2c578814dc86bbc815067563f3ed1390bf0c8d7 SHA512 90a14e1209121b5da973d150a906a39b11d96fc7d58736445887eea693ac0f47117de6e62ede730c5588d4500320fbf87a658e194ae597f40aae110677cb9823
 MISC metadata.xml 1796 BLAKE2B 2967de0aafd959ce940beb7ba1bb989d12322a33345e80feec53d0b9764429050b8d321f4b24d60fb948b21aacf2c773e6fbdf2e16f8fa3bb2e4c62c5075b106 SHA512 9fa3689a6cfc647babce4b908ea4be51d549db0ac3ab5706224f8623cf38d28f33e2d70964a517f8fb02e3bcc04f49c9b58393bd053841b9fcc5565e30a539fa
diff --git a/www-servers/lighttpd/lighttpd-1.4.59-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.59-r1.ebuild
index 6c00dcca0b4f..0c8ece24963c 100644
--- a/www-servers/lighttpd/lighttpd-1.4.59-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.59-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="brotli bzip2 dbi doc gdbm gnutls ipv6 kerberos ldap libev lua maxminddb mbedtls mmap memcached mysql nss pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index d95797d0817b..5d0ff8c6734d 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -5,4 +5,5 @@ DIST nginx-unit-1.22.0.tar.gz 824763 BLAKE2B 3ef343d62f3cfe793840c78fe18fd68ecad
 DIST nginx-unit-1.25.0.tar.gz 853280 BLAKE2B 7aa33e687ba754ebaaca4a0076df3f1cc05e83213de1b64cf28718bf53b9085a26a78c036f4e98308cabec0026ce2b4e91718dfb9d8d83fdad779a587e1c1d71 SHA512 fc001ab21c5aa6c07b092f7b1f44be3b88636f9e2059c8bc4049a06d863daae1bbfa2531a4a24bdd5976250d7a0e260dcf0dbb0dec63efcc008b5398c6bb4bbd
 EBUILD nginx-unit-1.22.0-r1.ebuild 1986 BLAKE2B 3acda1df9975cb822bb051544984567dc47e5ac7b57ee848235d5bce2cd0173e39ec26e43d7fea1f2b01c6280c348bba24b5fdd77b9f82fcbb4b3a9fc712c5eb SHA512 1115deb7a894188cf819b2611651f7b3515145e33f378d2ecf1f44d053b76722b3dade71d83faf9591d1bdb983737366958b201cb0e14a254343c32651fc5fda
 EBUILD nginx-unit-1.25.0-r1.ebuild 2089 BLAKE2B 77878fc08dd4fb2dffff5f042324c9cc11bc5f58edf0bfdb35a16b559d65207bc9e6d966164de12643ae5b31c5fffd8a9812991042d78c62a36ca956a96d7923 SHA512 bec3902e163eb05dc53f2627e01af02f9ac0511043702f4a08b90f6fa5af7bbda35f43342c0fe607197555d77671414cc44475dd8d0e696311c8ecf7b4482ad3
+EBUILD nginx-unit-1.25.0-r2.ebuild 2089 BLAKE2B 402140a7c4e024e11325bf91c8faf50a88a3ff0805cb6ec1ce6616125766dcbff2037b9aeb7cf168362178a861e8d2036e849115ed52c64eecf1d7905d383450 SHA512 ceeebf4b46cd0ac752a338b75636e4987b284c841e5b503d011e76d8a0e0e9306461d66de904285aad9d5a23fbc3047f926b35ffcfe55dd1735814eee77f9d34
 MISC metadata.xml 1100 BLAKE2B aace2457ae0f0c2d4f294b4e4b596e4939dd967ea0126c40ae39d34c9ae9257d527b54f0f4e2dd315e944c59bac4319b6c4b6b9a5a2de2239bd35accb1a93b36 SHA512 91af085df5d35fd10de25cf5d4c843d03d38aac302c825566ee7db801923b69ef4f35ab7b3a9e2b7d670a5b4785bdad7ab902ffb6b8a5c23b42a7cae98407e38
diff --git a/www-servers/nginx-unit/nginx-unit-1.25.0-r2.ebuild b/www-servers/nginx-unit/nginx-unit-1.25.0-r2.ebuild
new file mode 100644
index 000000000000..1d9e098f0bcb
--- /dev/null
+++ b/www-servers/nginx-unit/nginx-unit-1.25.0-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit flag-o-matic python-single-r1 systemd toolchain-funcs
+
+MY_P="unit-${PV}"
+DESCRIPTION="Dynamic web and application server"
+HOMEPAGE="https://unit.nginx.org"
+SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+MY_USE="perl python ruby"
+MY_USE_PHP="php7-3 php7-4"
+IUSE="${MY_USE} ${MY_USE_PHP} ssl"
+REQUIRED_USE="|| ( ${IUSE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="perl? ( dev-lang/perl:= )
+	php7-3? ( dev-lang/php:7.3[embed] )
+	php7-4? ( dev-lang/php:7.4[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		dev-lang/ruby:=
+		dev-ruby/rubygems:=
+	)
+	ssl? ( dev-libs/openssl:0= )
+	virtual/libcrypt:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-glibc-2.34.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	sed -i '/^CFLAGS/d' auto/make || die
+	default
+}
+
+src_configure() {
+	local opt=(
+		--control=unix:/run/${PN}.sock
+		--log=/var/log/${PN}
+		--modules=$(get_libdir)/${PN}
+		--pid=/run/${PN}.pid
+		--prefix=/usr
+		--state=/var/lib/${PN}
+	)
+
+	use ssl && opt+=( --openssl )
+	export AR="$(tc-getAR)"
+	export CC="$(tc-getCC)"
+	./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed"
+
+	# Modules require position-independent code
+	append-cflags $(test-flags-CC -fPIC)
+
+	for flag in ${MY_USE} ; do
+		if use ${flag} ; then
+			./configure ${flag} || die "Module configuration failed: ${flag}"
+		fi
+	done
+
+	for flag in ${MY_USE_PHP} ; do
+		if use ${flag} ; then
+			local php_slot="/usr/$(get_libdir)/${flag/-/.}"
+			./configure php \
+				--module=${flag} \
+				--config=${php_slot}/bin/php-config \
+				--lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
+		fi
+	done
+}
+
+src_install() {
+	default
+
+	diropts -m 0770
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index f17b3c029476..d3f36d8a9188 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -8,24 +8,14 @@ AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
-DIST apache-tomcat-10.0.10-src.tar.gz 6032784 BLAKE2B f73d2b0d549d773a13a8adcc76a87713f0f146d80bca2d2ba633ce3145d69505fb7172eac0f04bb6d10fd9f9abb0cbbca7fb6d5b4608e2f6f07df88e5e661d70 SHA512 6241a62d01dcbf37e4745803c77dfbc4307d43c884e8e4c78c33b10d45a9b42e0103ef94acaff19790fa4876bdb369e9aca4974a4dae2622cedfa56b3fbe0658
-DIST apache-tomcat-10.0.11-src.tar.gz 6065513 BLAKE2B e734a3f5086d94dd49886a1fc7e1fddc1b500240837ccba945dc0d10ad5aaaf580d1b9e2c78aca8af474c4312d723bc4095ec8e90a14f0bd7f292b9333bc554f SHA512 c06f4069c1664483f176231dd9fe132c89e7c66f845d82b41d6c962ea2d2ba2d3c6004b6a875388925ba295761f533ced416fc91261ecb97d11219a87940db2b
 DIST apache-tomcat-10.0.12-src.tar.gz 6066701 BLAKE2B 24acb9e10de923c9d6443c956cd6e6c5b5463f4f6af72d89445c7d635731449afc9b7050c95af3cbd3653168c073840f02472dd01bde65c1bcbdfcba41814117 SHA512 753d36edb5ce873e346856305d6a7f40d762ae8fb9ecd20406ed9ff400e9e1261f66d4549fc98f20a05b01136ff4beaacb462147e84a306858e2acc7fcd98d5b
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.70-src.tar.gz 5939095 BLAKE2B 9a2bf14c9b9f551af15ebf2b95ffede140b3accdb9fc1b9836c980169b597e8c796d5aa59df28cd42ccff67dbda83c7b7ced8b0ac2954a40214a0767ad8b90ce SHA512 fe752c4196d12496a3dcb4e6b59df30da10cd52b8642f9273de7158dcf6dd16d2443675744db0033e6dc5c1cf0aeaf0125c9921e1e36ceb8dea9ba58328a4133
-DIST apache-tomcat-8.5.71-src.tar.gz 5945776 BLAKE2B b7a5b344dbe09ef88ee046dcce701ea65d8587f1d8c2f980c67fff5466979d15dea019a9abae6d48a45797a989ebddb4dbdbc5196c8740cde9ebc45041b857ef SHA512 df99749d7ef387e29c1d2976c584dc219fc8764f618a004a646564315ab3f00a71ca94408d1fbaff20c3bab3911c82af4f7cf2ec02f0408d9e829c27f8aabdba
-DIST apache-tomcat-9.0.52-src.tar.gz 6110883 BLAKE2B 8d2d4e3640fdc43a3b20d9722a73a8756de7ad71b2f05e8b2090bc712811cfcf6f8e79eeded039291b9306d1c49aec46fe8c7e347aab10384ca293894984ab27 SHA512 8b1817c171fa49e5568fb24a72b6b7533c5eb3ddd6d232b78e67186574f70bb311bbef9a58af047caa14bdae57c27c6a3df721c4583072740fec0a3863bb068d
-DIST apache-tomcat-9.0.53-src.tar.gz 6142608 BLAKE2B 71f45e04ac01221cbfc6e730066e1aa7f5d65d31a497a775a3147180591f23799f0b47db3a1dd4a86936c40f624795cf4fd1d3dd44d4d39633aeb0733f4f9f26 SHA512 f72b9abff6af24d486a1e3dd3cd8b6cb44feab811efb74a3469502676e661bdb4cfed0fe44f38b7f5a6f74a6776ae1c0c732504d26609b88280e0b0da6710b27
+DIST apache-tomcat-8.5.72-src.tar.gz 5954383 BLAKE2B ddf342e3bb604ffd5d70e9b822a110654434aac0da0bd28e8649a0ce312706c202f48077ee18f43398d91bc000ea5287d87e0fd2bda9d2c8493e1b6b012945fc SHA512 69c27076d193a874416c83a1dcb80f71af78cb201b0990795d389f0a389e0537749b62256408c6249031abd2e62f268c8b451328284dbbff50a457937cfa6f6d
 DIST apache-tomcat-9.0.54-src.tar.gz 6132613 BLAKE2B 5d37359ac9cac2a1387675a095aa0bea3e2bc74740d761a13fb2313aaca8ddb14f10922a8edc0932c9139c04b4df7f5735b067a71ac75ebbfe16ff6066311993 SHA512 e9d532a966aa8e7c2fcf28e4ecb0a618a8be4dacf8dc579a407483de86ef969383e3662fba07be629bfb8fbd85c041a5a2f1dd8875cc309b69a147b37c58974b
 DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
 DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b
-EBUILD tomcat-10.0.10.ebuild 5920 BLAKE2B 6bc1cb899bfac912196be33f6e4f03dda576987af8786ae5233981b930a39d1b1f7600410d7a0c9cb80e8a0e345e12218de8129121c58480c882ba4f350b12c6 SHA512 7a68ce76cb33398a8a4d3a1eb93139be2f14e5e22c75421dc03136aeed06a8bcc3d5d5bd94bea93d8f8c6c2d0625fb0c2d1aac73838ff3d6eaeaddf900b6fd6b
-EBUILD tomcat-10.0.11.ebuild 5920 BLAKE2B 6bc1cb899bfac912196be33f6e4f03dda576987af8786ae5233981b930a39d1b1f7600410d7a0c9cb80e8a0e345e12218de8129121c58480c882ba4f350b12c6 SHA512 7a68ce76cb33398a8a4d3a1eb93139be2f14e5e22c75421dc03136aeed06a8bcc3d5d5bd94bea93d8f8c6c2d0625fb0c2d1aac73838ff3d6eaeaddf900b6fd6b
 EBUILD tomcat-10.0.12.ebuild 5920 BLAKE2B 6bc1cb899bfac912196be33f6e4f03dda576987af8786ae5233981b930a39d1b1f7600410d7a0c9cb80e8a0e345e12218de8129121c58480c882ba4f350b12c6 SHA512 7a68ce76cb33398a8a4d3a1eb93139be2f14e5e22c75421dc03136aeed06a8bcc3d5d5bd94bea93d8f8c6c2d0625fb0c2d1aac73838ff3d6eaeaddf900b6fd6b
 EBUILD tomcat-7.0.109.ebuild 4147 BLAKE2B 8023fb9265a3e57bbdb506559bfe9a337f566e09b6cccd0e74e84341e54d1434134eb0aecaf72a97113826d8f7359dea1e5672db44e9dfb706b020cf79c51802 SHA512 0730da2fe90a5fa203e03eef5044eb8b90c5b800d064d65467370834b788c3de03ea5c57ccfe20b29deac9c560c68029e94a80be180b240356565121d453a2a4
-EBUILD tomcat-8.5.70.ebuild 4736 BLAKE2B 99ac3fe1e217729c87256b892cbd781cbda8f3235b526d19f087fcb39613f725825fde1802c013427c5b2621ca9e1380a2afe0f7fc4600570c640619d52cef0a SHA512 122f809b5148b3da0e83a3fe2e3fc4db4a6db8e0b8ec1270cde7a282ee074eaba6a8b716814b2065b9f29730a8dca221712830088f378417dd47789ab0174c62
-EBUILD tomcat-8.5.71.ebuild 4737 BLAKE2B 0fc89880a266872832a8f199af5cfc3aa6ec0e14ab8214eca907dbf91e68f5306c23fcef1fdfa852c7e8051ec6953086338380552ea1c08ec45a828d6fc35d9a SHA512 f3b4c598e3a022baf63a81068751a4c73f3106a1583c5d9d3493fd6aa5fc7a87e91cc023203b81c86ed3683bacdaed728886bbffadd1bb102b5e2a678f75b26a
-EBUILD tomcat-9.0.52.ebuild 5632 BLAKE2B 616ff7cfe9e1e408be386a2c6f9146370440ac4cd84a3afa15893bc5e00afa73a47b8760d5c2434099b38cfaa069bd65f23efe78eee64b0abcbf499bb72a97d4 SHA512 9eca0997e3559fad1b90b567a68e915e6d22a25e05eacd08cb7abba0575e7e6db76168a3aa1fd33d60b19754d6082f1578417deb4c04ae82fb1575531e50709a
-EBUILD tomcat-9.0.53.ebuild 5632 BLAKE2B 616ff7cfe9e1e408be386a2c6f9146370440ac4cd84a3afa15893bc5e00afa73a47b8760d5c2434099b38cfaa069bd65f23efe78eee64b0abcbf499bb72a97d4 SHA512 9eca0997e3559fad1b90b567a68e915e6d22a25e05eacd08cb7abba0575e7e6db76168a3aa1fd33d60b19754d6082f1578417deb4c04ae82fb1575531e50709a
+EBUILD tomcat-8.5.72.ebuild 4736 BLAKE2B 99ac3fe1e217729c87256b892cbd781cbda8f3235b526d19f087fcb39613f725825fde1802c013427c5b2621ca9e1380a2afe0f7fc4600570c640619d52cef0a SHA512 122f809b5148b3da0e83a3fe2e3fc4db4a6db8e0b8ec1270cde7a282ee074eaba6a8b716814b2065b9f29730a8dca221712830088f378417dd47789ab0174c62
 EBUILD tomcat-9.0.54.ebuild 5632 BLAKE2B 616ff7cfe9e1e408be386a2c6f9146370440ac4cd84a3afa15893bc5e00afa73a47b8760d5c2434099b38cfaa069bd65f23efe78eee64b0abcbf499bb72a97d4 SHA512 9eca0997e3559fad1b90b567a68e915e6d22a25e05eacd08cb7abba0575e7e6db76168a3aa1fd33d60b19754d6082f1578417deb4c04ae82fb1575531e50709a
 MISC metadata.xml 713 BLAKE2B 8a4ecfb2190e156b77598a825550953f936ddc1a1303a95bcae173592ac4f482e81af1d7b62bc62248c20ac92cdd1dd3a9c351c74f684193085c0b242043fee7 SHA512 946fed270cb43e9c239f6f831ac2e8021526a9c3b1b8fea91d00d1b48f979273de3f7c227bce03009de04bcc8386803606864ffdb85666005d6b0ef5c49f01c5
diff --git a/www-servers/tomcat/tomcat-10.0.10.ebuild b/www-servers/tomcat/tomcat-10.0.10.ebuild
deleted file mode 100644
index 0b16b403fb0f..000000000000
--- a/www-servers/tomcat/tomcat-10.0.10.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="5.1.1"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="10"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-SAPI_SLOT="5.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/glassfish-xmlrpc-api:0
-	dev-java/jakartaee-migration:0
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
-	dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
-	acct-group/tomcat
-	acct-user/tomcat
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	dev-java/ant-core
-	virtual/jdk:1.8
-	test? (
-		dev-java/ant-junit:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
-	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
-	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled servlet-api
-	rm -rv java/jakarta/{el,servlet} || die
-
-	eapply "${FILESDIR}/${PN}-10.0.4-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
-	java-ant-2_src_configure
-
-	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "Please note that since version 10 the primary package for all implemented APIs"
-	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
-	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-10.0.11.ebuild b/www-servers/tomcat/tomcat-10.0.11.ebuild
deleted file mode 100644
index 0b16b403fb0f..000000000000
--- a/www-servers/tomcat/tomcat-10.0.11.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="5.1.1"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-5.0/JSP-3.0/EL-4.0/WebSocket-2.0/JASIC-2.0 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="10"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-SAPI_SLOT="5.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/glassfish-xmlrpc-api:0
-	dev-java/jakartaee-migration:0
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
-	dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
-	acct-group/tomcat
-	acct-user/tomcat
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	dev-java/ant-core
-	virtual/jdk:1.8
-	test? (
-		dev-java/ant-junit:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
-	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
-	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled servlet-api
-	rm -rv java/jakarta/{el,servlet} || die
-
-	eapply "${FILESDIR}/${PN}-10.0.4-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
-	java-ant-2_src_configure
-
-	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "Please note that since version 10 the primary package for all implemented APIs"
-	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
-	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.71.ebuild b/www-servers/tomcat/tomcat-8.5.71.ebuild
deleted file mode 100644
index ce92130bddc8..000000000000
--- a/www-servers/tomcat/tomcat-8.5.71.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
-	acct-group/tomcat
-	acct-user/tomcat
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	dev-java/ant-core
-	virtual/jdk:1.8
-	doc? (
-		dev-java/glassfish-xmlrpc-api:0
-		dev-java/wsdl4j:0
-	)
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled servlet-api
-	rm -rv java/javax/{el,servlet} || die
-
-	eapply "${FILESDIR}/${PN}-8.5.66-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only glassfish-xmlrpc-api glassfish-xmlrpc-api.jar):$(java-pkg_getjar --build-only wsdl4j wsdl4j.jar)"
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.70.ebuild b/www-servers/tomcat/tomcat-8.5.72.ebuild
index 0d566b00a7b8..0d566b00a7b8 100644
--- a/www-servers/tomcat/tomcat-8.5.70.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.72.ebuild
diff --git a/www-servers/tomcat/tomcat-9.0.52.ebuild b/www-servers/tomcat/tomcat-9.0.52.ebuild
deleted file mode 100644
index 8905e0fad241..000000000000
--- a/www-servers/tomcat/tomcat-9.0.52.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="5.1.1"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-SAPI_SLOT="4.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/glassfish-xmlrpc-api:0
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
-	dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
-	acct-group/tomcat
-	acct-user/tomcat
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=dev-java/ant-core-1.9.13
-	virtual/jdk:1.8
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
-	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
-	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled servlet-api
-	rm -rv java/javax/{el,servlet} || die
-
-	eapply "${FILESDIR}/${PN}-9.0.46-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
-	java-ant-2_src_configure
-
-	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-9.0.53.ebuild b/www-servers/tomcat/tomcat-9.0.53.ebuild
deleted file mode 100644
index 8905e0fad241..000000000000
--- a/www-servers/tomcat/tomcat-9.0.53.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 prefix
-
-MY_P="apache-${PN}-${PV}-src"
-
-# Currently we bundle binary versions of bnd.jar and bndlib.jar
-# See bugs #203080 and #676116
-BND_VERSION="5.1.1"
-BND="biz.aQute.bnd-${BND_VERSION}.jar"
-BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
-
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
-	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.15"
-SAPI_SLOT="4.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/glassfish-xmlrpc-api:0
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
-	dev-java/wsdl4j:0"
-RDEPEND="${COMMON_DEP}
-	acct-group/tomcat
-	acct-user/tomcat
-	virtual/jre"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=dev-java/ant-core-1.9.13
-	virtual/jdk:1.8
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
-)
-
-BND_HOME="${S}/tomcat-build-libs/bnd"
-BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
-BND_JAR="${BND_HOME}/${BND}"
-BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
-	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
-	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled servlet-api
-	rm -rv java/javax/{el,servlet} || die
-
-	eapply "${FILESDIR}/${PN}-9.0.46-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_configure() {
-	java-ant-2_src_configure
-
-	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
-}
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
-	LC_ALL=C java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 126beabd2320..1b1a73edcb35 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/luit/Manifest b/x11-apps/luit/Manifest
index d04c343d4b44..cba30d8bcafb 100644
--- a/x11-apps/luit/Manifest
+++ b/x11-apps/luit/Manifest
@@ -2,4 +2,4 @@ DIST luit-20190106.tgz 190866 BLAKE2B 44098a00cade37aacdd7e67e1dae68157b652458b8
 DIST luit-20210218.tgz 202363 BLAKE2B a7eb88c567125e66b6f257f5f1365cc20cf30a37ec4d172c9d6396f3aebf0e5e505af604df109eebde195dc5152afe50e6ac82f485f3309c852d1dca7cae5f27 SHA512 92bfdfd5b03c73803caaf3ffb1eb92660c6c97c30b7d716454df1b5007af9cf7f75d8f255841a87f8fe266c33bff9af6c1195eb13e5160b7787a3a9e693b21e8
 EBUILD luit-20190106.ebuild 638 BLAKE2B e20f5efaacb29eca2768254115e6d3d3a820e9f0fb24b3621df2a0f3bd721e6e4e1003eccb2d94adbb77a0a154c8f18fae01fe38fb877cf5e152f51f5c5080a8 SHA512 32e422c19cfd3c2040af081db37a03ef99a6d5fc4aeabb95e4e2cd3bd946dfc1aba8602359610b0249573bc385757767d7ca7930f7123affd63d383f24a35194
 EBUILD luit-20210218.ebuild 637 BLAKE2B 4f74e3a515491cd6ac65830f71d71c65f266ea8c1c92687526a7d30f06377f007dd2a1c0c10aa57fbe965071a2416f0419f374bda5295f2d54879547c46ecb90 SHA512 051d2412a4756149f182b04465277172ae21f009a82167536beaa93a5fa8df12be4f2bdb94652259c68637b04a8e8b8c84c91dc24994970d688eae991e9a7bff
-MISC metadata.xml 344 BLAKE2B 2dc2e034eecc2ba12428c9fe359543e6d355f5605045a932230799214c49d523cba4a1778d6260bb1c60b1ad73ad930ec20c7fbb75fffb6b6e01627a6181b2f3 SHA512 1a4b9b09587b02f383a2fbc5b2d38e2f24ff50653beb146d04f3ff66492802919dc3a92acd9b8278e7551c338e29fa5333353f26db8809adabedea877bad3e10
+MISC metadata.xml 266 BLAKE2B 480d87d101d6c5967bb91a576bb1c3702ebf9b6aceafcb69a7a25a89927cdb7fa48a4d305c8636b580c1261497c215c94c9136340ebde6a2f39a49c671d5bc8f SHA512 138e12ed699397d42af1e5b9bcb5c9d94235ff5333192258b93b0b30f0f7a0ba7c321e3c8d4fa79d6da60c3f19286caf01a675e4d9b1f04ed935b93310890cc6
diff --git a/x11-apps/luit/metadata.xml b/x11-apps/luit/metadata.xml
index 1b896ff7ffe8..a9008c5e06b0 100644
--- a/x11-apps/luit/metadata.xml
+++ b/x11-apps/luit/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<changelog>https://invisible-island.net/luit/luit.log.html</changelog>
 	</upstream>
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 16a7c0240d4e..b1b85e324c34 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 3a578df143a4..c35e44cbef3e 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -9,33 +9,43 @@ AUX nvidia-settings-390.141-fno-common.patch 478 BLAKE2B 2b222b26049aeb669235061
 DIST NVIDIA-Linux-aarch64-460.91.03.run 111886330 BLAKE2B 24ab316e216caa61f7edb4dbcb34541709d3229d495e6ead95e99db7403cddee03467ee28d007f0fa3c4f2fa267e1994533c90a7a67885e9e76d501ab0f8aaa5 SHA512 edcfd3b11afe625c8996cda488a8de2e0e40eb4b95c8cf0ead9e1226d7cee8140a83c247d745ceefe997a39cfcf3e3f9bde575d97aa39090f97f88817d89cb28
 DIST NVIDIA-Linux-aarch64-470.63.01.run 184137823 BLAKE2B d8525d70a3c68a3912d6b03aca2569d657029cc3dce2276f17acf538b5d74001a779e7d8e6c3c7a8d5fe9d12579e0f6170558a4bd596e7e8cab4ea3a20cb911c SHA512 582d7d0f427f4effe02415ae2d248f24c730481f3a0f143987ee640d14476924912827ad17263271f47ad67f24ab9c0dc5af0fd4d49b029b77cc59e4f821a433
 DIST NVIDIA-Linux-aarch64-470.74.run 183973692 BLAKE2B dd5e637161b1880e77ce1ac9df62f817af0d6ad3109db437bdca0d248f02c24f18a1a483a0d1efe6c80ebb76a5753cb1901d26c7b18594bdb5208f5eeec20b1a SHA512 29a5a6a3622e316bf31acfba7486fb59485a82b4500860dd8db34e714791a0ea73120354559f412465f8f862b2f2c046a7f2a973068f18913d80fb81f0c839d9
+DIST NVIDIA-Linux-aarch64-495.29.05.run 210310796 BLAKE2B ef1cce048a89d8f6ecdc1e14068c4a872a28387b7894d213d0d86ddc594ca77c6ae265b05da27a56bb1b9ea72e1a4eac0b24b5a2ab91d65f557fe1d02ea30abb SHA512 46fb44f285f40873e22cae2e04dc79f4547b94213b3d7491f878c7afe5ef06329811cb0743ab0e71ad13d08fd37ef6e688454b752e9fb24d434b56525b75ffd4
 DIST NVIDIA-Linux-x86-390.144.run 49210937 BLAKE2B b7e6edb55af88be74e4322ff1d270388a60a9d9809314c3a0502f86ed97edb99dfcdd3c81c5f51e681c8fcc47ecbfecd124b4d733141d23726226a3965b4c1f1 SHA512 d962c7e7b4b9c4635a887767d34a49c401a89e5975a5e57fa83366ca824ab70d5b8a81f3dce2e05e0528afddc72d70b2fcd69a216bd16d75e7b88ec704390546
 DIST NVIDIA-Linux-x86_64-390.144.run 85000417 BLAKE2B 8ecfa768fb8fe92170ff5b82698a7fb22da8bc557ab2036464bf5650b6fffc7028e25a68e1f5638f6bc171eb45a4aba459465490c7a99aacd36dc769994062e8 SHA512 9503ebf41037a14deba995288a364768cb03fb682de8653a4b0c05955b23603443c41c4216c93eac7d7efc301734416012864ede728324ab47b93ff167d93da4
 DIST NVIDIA-Linux-x86_64-460.91.03.run 178201292 BLAKE2B 4d407b7bb3a99ab71c62c3cd18dc3549c98a24e7af28276e6e6a21dd33efcab017fed3f782f6dfb060c4437cd718f19c2f9900de367cc47bf19fa2718a18ad55 SHA512 4ac11130fe5a8f1c26f459e9c19660b3ff6f23011e9f77b09ca948fc42609e523ecea70d3bf6def50a75b4a3079ab280018753fb6e53875d9bb8093a033e3b70
+DIST NVIDIA-Linux-x86_64-470.62.05.run 271634590 BLAKE2B a37d33d188e9e36c5bfb3ba48af257c76fa58e482733d96326220028a073656a45f7eb40939a54bdfc6fc0df0eec610d5efac54dac83251975ccfeb287457aec SHA512 413b2d2c9d29d91c81f9696c17eb04fce0d7bf00a54779f86ceb16b59c32479a34c4d5a29222e095a8bddbfcafd90af0451493f0cb82a0d268a9160795bbe8d1
 DIST NVIDIA-Linux-x86_64-470.63.01.run 271484294 BLAKE2B 7769f53897dccea716d459a12808d1f5a738072415639063e47dee82b489bb17121516cf585c1bb6b39f71b11f62f636a466284aba5854a5cfb4f553353cf8d3 SHA512 d3dadf93df86e5462ecb4ae6a04f03b05bf1450ad91e8c2aa73e838ddc9aa11b4e926fc32714d32bd7c606498fee5a54c77d5e40ecc08a039d3e9c2d331ad454
 DIST NVIDIA-Linux-x86_64-470.74.run 270479241 BLAKE2B dacae4273d67fb9a2ab9ce4d0a6cb6255935abc5dacc7381f33c249ffeb515c84cb88f6c92f9a5bff23a92a55952525fe85594cd67fa4319c046a2e38dd26be6 SHA512 21e4290d98bbbf09eed7be32df8743f0adf728f9e88869afb02fc1d0f0be87cf42af2d4f04322a76d68a1704ef044e83cd403377e60af917ff3ec0a04985801a
+DIST NVIDIA-Linux-x86_64-495.29.05.run 282081751 BLAKE2B bd603f9fd08600192be193e8b5d2e5091b319173f7cc7bb1662f537292a36a3ed652740f4fb0e2288f795f81e9bf35aa343d6e41aa892c6370dd607d94971f0e SHA512 bcdb4a52217d98f656d2daad32b4112fe5bda362d8aeb6fd8dda17474a95e5914385823c19dacc71fc1fe2c4327d8f5beb267e6083aed54dd66f7abdae6f5cc1
 DIST nvidia-installer-390.144.tar.bz2 150017 BLAKE2B 1a633594ecb9b54ee5a1e3620263a95db30c1ddebf547ecc7f267e1f0b799bcdb44cc3ddd6c96eda085d9be5c8f691e92556296f250495d80eec0c2f155f5bd5 SHA512 e4c624afc18bd1d61264f93bdcbc72afe42687baadf31683a6dd11a45c6257f6a5185b91f4b3d4c0316b8eb03ed79511f9ad260ee9e6f299fc136f5dc2178e42
 DIST nvidia-installer-460.91.03.tar.bz2 144463 BLAKE2B b8c381158f614331fbfd04dcfdd7227fcb3eb16cbe4e3cbcbb34ba6af2370b05ebd72dc46375b2099b950817e6a0565c418e62b6364f1d7269f78c1dce5f5535 SHA512 10c873597202a1d8aa0dc4629b1e64f8c1f65a68c91f6babe312cf9fabbb9257b77d03a3917c0f4f5d6994e90cf58c6c7d9a802a675ea3ef60b571c9b7abc391
 DIST nvidia-installer-470.63.01.tar.bz2 146093 BLAKE2B 49f16fd7b27552013067410e3cfc80d44a4ec9c454d5db542caaa84b34e20cddabdeba2391d451aab39c832745fc2fbfc5bda3876a67859027d83b482d55118f SHA512 92d680d845abb39d77a51ccc47f1102825387b664e87fb2f5d976a0a4cc6baee508fe86bc92f5f0c77f1cec61506826b155ca1ef02708c39d145c9d897868397
 DIST nvidia-installer-470.74.tar.bz2 145896 BLAKE2B d2f77b84ce9802088465bfb7020216436cb7766180fb11f6853beacef535a2f697799854dbd4a61f843dfa51fe8f6c9f6bf5dcdda07d200f424e5316c024f4a5 SHA512 b05f4b40428a6073d3439faeb20dfce2a86f9c18f0cc5cb16a48ff0e11f15eab9260c3a7e1c2eecffc36417e6471cce718923cfef3d36212bb53c6aca10ee80b
+DIST nvidia-installer-495.29.05.tar.bz2 147017 BLAKE2B 0cdb79c98d2b80a4174e10c5e8cbb131bf186170345679636573f3054666e92bb46229ef50b7f676b99e5a53fb61db9a636122342bf01418ebc4bcfd7598db65 SHA512 1a72b8cf106b8fc30815afdd03a5e880f892d4950e18e83d9965b292eabadd7d9b03cc3c0489008329229e50326958e404d806dbed00eef48d638091b3694d63
 DIST nvidia-modprobe-390.144.tar.bz2 35308 BLAKE2B 1930c315aeb0e296c0d4795170d44a275da5ff8838fd8230559227852001b679fbca2830142ca7abcfa9c84626c9d9f222f7ab0cb3984d8d517f5ce431e5a9ea SHA512 d542c1a7634a8c5ff803ca79f2fc02b17b129185177226ad60625a4d246bbaf740719ff024dbde0f5aa8273949446561261d700a27cf88217c2572e69882142c
 DIST nvidia-modprobe-460.91.03.tar.bz2 38144 BLAKE2B 660b381f8757fe8862f7c4a971e44d3124afa3783d52af29543b8ed67486ba03b76c0b5d8dfadc5da8fdcc2c8799ec5f9c3016fd58e9c209fcc3ae897fb0436b SHA512 aa47a9c0744b8e11e87d2c0f300b13fee435cd5225444be7fb0b6bea49af33811dfa723a9ccfe904c7de2b5a8da36b707c1024eb495e3f0b587e3231a4bc4f39
 DIST nvidia-modprobe-470.63.01.tar.bz2 38357 BLAKE2B 906f966df5aafe5478550bb30b4d624247c2c621ecc5e21fa9aa0e37f1ffe39b3e44d70f24864d49c99c63d5a5045057f46b9b364f6f662bd5676b242fa3c265 SHA512 f41a168fe4b2278cd4cc53dd0e334e7e7dfccc91abd818b7e2b5d67c3a806d2ce5d1b11cd3cdc2f4507cc0baf42c3c5985784e19665c7a3bafb9ab433132271e
 DIST nvidia-modprobe-470.74.tar.bz2 38346 BLAKE2B 15067809d5ddf9c3e5a09e9851d92f7629843290c109373fc42cd97d06e05d3d8fac2fabfc8da0c57251e23039dbe4cbc827d8e16d60303cf9dc2fb01c91069a SHA512 9d6a51bb9bb329c658040c761f722e8f15897f11cfb08a993ddda8f829a1fa7c028a76a2257cf97a07e6b7d9bcc1dbe86934998094d4aa431ada059ac46a41e9
+DIST nvidia-modprobe-495.29.05.tar.bz2 38402 BLAKE2B fdf6bfe0c3e72da7bf36595db282b32f5b5c6b10dce6b39b243f3e0362ff25e1ab1dda8ae3fbb9d930dbc98b0880ef29f5278820c1792039d0efe9e2288deb57 SHA512 8fe71362723be613d133805506a410b457b2b88d7a1ebfd6b49d1aade79caf80b30e24d8a2c98ad1b2abbd5c006d39b2268169daaf59d91a1baf8bbdb981169f
 DIST nvidia-persistenced-390.144.tar.bz2 48672 BLAKE2B 82a92a33eb40971e56b772ffab121214f5675d0a8c618e356e7b55bc38ff9605fd2701d740d00a1e26c158c9df0ab38d0ba10891a3850f8e8cbee8fb231ba52d SHA512 4432f2dd18c7c91fd0d59e4f2bdf7254f58ed2a6b652d319c4f7ce674522da1797a68dd6939c38e71710dcd3b754ae7cc8c6e7acb47a76e13d2091e8a8ee99c8
 DIST nvidia-persistenced-460.91.03.tar.bz2 46160 BLAKE2B f7f34cc12de2a4d69184c60caf7a8e8025b58005ade0a3e9a1a0e95856055f7211a710a1145d674d8a2e97cf70a43175cbc5c9a5dabc49ce378623be1720c6ea SHA512 c3ff5875353c264cb224b3f512ff8308bf1b0b95282e34500d88da2574719c3c514581e5900841b089c2e6f0fe29198fa06a11668de8e21c59f9f96244a74757
 DIST nvidia-persistenced-470.63.01.tar.bz2 46544 BLAKE2B c2bbc76bc06db1dc963ed34731fc9ca9ad2145dad4326586a7e37a395ff8ffac940800138bec08cdfafa9eb8ab5b79412e66e78cb5ef58aca4ee476d31ce0c89 SHA512 6ae699cae67911f92ac2dae82856e0a4d31a8d47a3d2e8e6fbae6469f28960caab4a56aae1a1ac3de0339c78dedc344c09136ec922690abd9fb5abc96afba5ca
 DIST nvidia-persistenced-470.74.tar.bz2 46521 BLAKE2B ee959d6d44c31cf89da0227b5f64f83e2be6e89e55a6249d9d4985e4e4012430fdd057b5267401ed1a185523e8fd795ccbb0fed59898f801a72c899ff7a79de3 SHA512 1bab92b85febf3ca1f5e7195e69faf5db6dc281d2f65a64d58585e48dee573ecb469b5036e7737da9a12bce937ffa7c961cb3b4908765f0d0ce46c6ba708332b
+DIST nvidia-persistenced-495.29.05.tar.bz2 46274 BLAKE2B e309795caf2c477c8f8f5be5fcc74e764b14496bab12e48d661ce8aba9cb99ba41bf31dbd819c216f3b9eb404d6f971c30183834416d7b6b33ce6cff60d87fcc SHA512 ac88198d5e7a781bbab773265ab7b1dfe10674292ba21d1fdcc0df8cf24b282cc21bc583a948965a2f8882e905aa46014b6a0bd3f4fac4ac580246401b4744f5
 DIST nvidia-settings-390.144.tar.bz2 1109104 BLAKE2B 6724f49c7e469f580206fc17308190bd346b6167348a8b8b3886209f58aca61b65eff30658484c1fee40af8c0d89fb62f73329b05a6ac45178ea4a6870e5aa85 SHA512 90afe201361d492c3152057d3ec46d68c0cd722fe0ea0587aa1156718017d59fb5f26f3db89d91d4680b2390617867dbe93bd14e1fb3dc70402527bfacf0ae5c
 DIST nvidia-settings-460.91.03.tar.bz2 1061093 BLAKE2B 13f1da07eda3a0e7e96ac69091e4a34fcd75a8f459a4db3840c64272dd54080694c4df3b7c326884ff032eb1b8708b5e19107b112afee2c80eed242281292b02 SHA512 172ea3366065aa30e71a5a47b31366d076477b8801a8a37e0d76972406e69c8872daa80011ee020960bc5e00163c4e9e5f63aa4f0dc726065671d76851b4ad71
 DIST nvidia-settings-470.63.01.tar.bz2 1062399 BLAKE2B b3193ef94cf3cde41cf2b5f38cc39c090e54b5c0f980bdf6bff318554d155cb3639d5d65baf7148b5a5d378f483b3235aaa4ffa0cd625b44e7dd4ffcb7156f00 SHA512 d8458f8e103de0a5026857009da6cd55e969fbc2481d526b7e22fac92e865f9f226a2670bd984b743be093acd0fcd1970c1a20819ca736b0582b645a5c4c6e1e
 DIST nvidia-settings-470.74.tar.bz2 1062544 BLAKE2B 283808542e3b24594d52781b6638163ea6de638057792f50c91fb85728f97986d2d0f722f8e18f20866f6d873382e7b4df6d2eb565a4c7a0fb1e8b973ae7a6fb SHA512 eaaff811e9f3968efa82dd5ab60eb504538f34976bcbeec5a1451be14e1bb6f7d1ad7d732dddfd003e275a9e24e80438ab7a5a7ec8ad5c17556a6de1f884b102
+DIST nvidia-settings-495.29.05.tar.bz2 1062315 BLAKE2B 65e8525cdb6ce316c58e7a99b00a9dc63ae71b119b6c5de381b0d6e83710d6a79ec842b36594d0cc1cb6d77b4f71bca4ff8590dfa615a674c37939abb0e4f810 SHA512 5e1559cdf7cefbbcff5992cdbab9ed5380eea7a1f1362cc485a517dc3bd3a125c961418403272f93a201536a16ba82962c3ee1ca056e05bec88732cef36a8854
 DIST nvidia-xconfig-390.144.tar.bz2 107147 BLAKE2B 1b6ea6dfbe33474cd3e9409a7559a38716c4ce8d2583354232225a2a7ec10c7dbc2163f07c6849f4929e16c2fad179d583daad8a67d9cba950a62209b8ebebfa SHA512 09bb3558be178deda4b26031560ebad4e98e68b6186e247d4638cbcb4bb5dc05937c6baeaf1cd4db5a7b7433af97c3150c526ed972ff51b6e1c7552235ec6b51
 DIST nvidia-xconfig-460.91.03.tar.bz2 108477 BLAKE2B d95505e508ca16d8ebe8c22c445a1b686c32a626c379b1b48e2a8101969fc03b90446953cc30e945da9388237fa1b9e5f83417aba1fb062d58866a523c256769 SHA512 4bb8f7fc42e7fa5e3897884bd7e722c4fe8ab1e4a87cad4136e1764cdd91d4795f817dcee63a20279315b4839d92fe5244d073ea2310c704f8aacd38bacb28a4
 DIST nvidia-xconfig-470.63.01.tar.bz2 109078 BLAKE2B 786d4be4e1aa23ecdd51b0c5628e27a42472f4f119979acc62d100e094d077be6c7b893353d7d31ea4a47fe99135c01ea4ca0b539da62379295644fcd7b38c79 SHA512 5a3b599cba4be7e272fb1fc3c1dc31c09b1f101f81e7d24a27cf88d96746d42c84ba89f5ebeb4f602e012e0aa04804015cab5cf24947e60131652f1e010e96e2
 DIST nvidia-xconfig-470.74.tar.bz2 108624 BLAKE2B 1e1df7c80456fd90fb8b54b2fdbdabfc5fce504a7c0ff1de816b47addcd09d0a17d5cfa35da2518e2568525d3092b3829b8de3c1461d75b65794b11b3137e878 SHA512 7c922b4524cc7eee4345b2a06b11c292a19f168187f3670351feccfb3baca2845322b0a8c669e55bfadc8bb4009ba6aabba37245ac3347117ccbf62bbee71cfc
-EBUILD nvidia-drivers-390.144.ebuild 11599 BLAKE2B 062ed7a52fa32c3603add477318781cecaaeb17e38835e5dd4f830ca8244b5b049b06d0d2a88ba3947f917dd638192607bef2eb86e95c56de217cd04eb4435fe SHA512 fe3747bea69e337b7cf8295efaae551f6da97a0118d4ac4ebbac3a90d47817255441ddc5ffb4babc0aebeb90afdc516ed08372a9e9349434e344c3a89e418b9b
-EBUILD nvidia-drivers-460.91.03.ebuild 11774 BLAKE2B f1dbd1b2edfab144149437a7e7c33728da2a39829834926c80f297afdc075c8e15348079c068f423ceeac3d4ff24fc3d32e142d86297b1c1b0b0b59730ce0e17 SHA512 d9d79a51cdbfa1ce7af1478c05824e062885e98d01deab08b26baa9933d89536e30c2edb7109da1499277fe751091e9c792692572dabb28ff28db17baa9f44c7
-EBUILD nvidia-drivers-470.63.01.ebuild 13926 BLAKE2B 4ea2fb7accc59a8e161f759df11693645553c915142ef160d087fac92c3da4d14ba09f8363b97f5b809ef9390a08a1e8fbd96cad86369d74ef4a224c398b5fb5 SHA512 bb65b0c0a7369bc2678f2af66bd2482479ea60d0d8fc805a12bad043b71b5fa01ee86dacb0309acb5bdcb11a4f34323ba6dfebf00752d9bf6cad6fcb7c56b977
-EBUILD nvidia-drivers-470.74.ebuild 13930 BLAKE2B 7d45ec6f18bc39f2b0e480481373be8689ff415d2e661335aaecb8f995573dfc2302fc86faf2ae2a3e179f09b122a1f0ec05d4f4a25d90c4e7d62242a46dd020 SHA512 2dda6c293872c73965104fd5c1471520d59df8e10f4154c4e54cafd979b2f472d837881106eed6784ccb5736a9a5148a420d8dde4b38e3363e782daaf01eb962
+DIST nvidia-xconfig-495.29.05.tar.bz2 108794 BLAKE2B 20958cf72ae0c25ddd1424746e613df7cead4c011963ba3c5fa29a37527604bf1b4b0318c43d39e9757c20fbadbfeb00fc88c91c6537340f2345ac710171f267 SHA512 38d38c2b92b4e17de360b173231003e7f2ab64e3d456689d7d942035f41bede4bf8533f65348dfe4dbbaf48a84017f73550c05bd18c6f52dca413a502c243e5c
+EBUILD nvidia-drivers-390.144.ebuild 11679 BLAKE2B e2cb1a89e4444c3a47caa132760a9aed69f2e2b324cdbfaacfc0cbfba20111e75f11745f899db5441c17db50b51a036458759a08e00362696edc11d212683c20 SHA512 afbf0ad209c5cd30e1363edafbb27c87721d26d3fd0efcbbd0600ab8ceb7814a981aaa086bd2c9b6b7c18a1427a3d778ee533acfdf3dae460695fdad48256d85
+EBUILD nvidia-drivers-460.91.03.ebuild 11843 BLAKE2B a7e02b27aefffa21fa470a922c150d23cc77ba3c9296788e3f14c13ebc62f4b547b060641df5821d088230b69e20d8649289495d3054e1437f9033e1d18dc75f SHA512 1bfac2999c2ce6cf73349580440c55697374cba034022459f88d7a30da91e44276ee75c066283349ad433bae3e5ba8b4adabd7ad3d7e78b150e08360560f9847
+EBUILD nvidia-drivers-470.62.05.ebuild 13867 BLAKE2B 724216476153ce71ae73242175a59d2f1413159d6cb795cc20de594c7661a9311babe2f04d08c6802d3eac835cbc3c5e76c10d652289de1b42a51ac01ffaf153 SHA512 1bff73b823abeb3055f61673b783b67bab1982db941e1458c3ad92187f2df109b7b274b861ee620ba3d124fc4ed62455335ac27e2ec9b81bc5f2097a618852f2
+EBUILD nvidia-drivers-470.63.01.ebuild 13995 BLAKE2B fda5ba678b2cd415ffbc6b624dfe5f1f84ed5f7879685d8a7a554c08157fb459e04fce033734dcd4438cb23aa4e1ee94ca74e38d94629c9e021e998bbf9e7a55 SHA512 6aeff868adf71710575449104f83c12147be6e53a045f915e398646f34cf08f3e581186082803820efb1b10dcc3a4606fd5df61e5c35ba55753358173a21cdca
+EBUILD nvidia-drivers-470.74.ebuild 13999 BLAKE2B b97c1609d1e1b2ee6f0314d1eb926219d6664be0ea8b63f206a92a218473d24fbca876ad4e075c699f07c1bf1f827a645e4c750354fe2dd4b4a3a2c3f56410d8 SHA512 a64a9bf863963a47637b8d161034aef01bf5991b64a03b53fbc76ba956ed35a829c44390f1ce6d9aa1b8cc544bf5c3d2b2830bb6707c687c29e46df6b27c89e1
+EBUILD nvidia-drivers-495.29.05-r1.ebuild 14778 BLAKE2B 35b53f7dc9bd5b43ece0cf2fee6b7f1c8333cef05fd7d24586ca438b2d7a00eebc3b7f2a438c7a9990608440f6289a887b0796b804c1620f0316f3ac3aab8d2f SHA512 23a92a516094ff609c9055bde9d72c233a1f76a6fc6cfc771f531a825f3e21a74783cb833726fb43b0f8900bf4a5ff2bd0594355c310fb98817a0c8c6d9607c0
 MISC metadata.xml 902 BLAKE2B 4c8373f3c7ac73f1f2b18e9c4a9a95868fe2c780aa4b200e366823e6094cd28a74e7a6e2a4dcbe1df3b711ddc753d497e9bd43ae677f1bdddd0e20aa3997beb1 SHA512 0d165817d0cdb0bbe3c8c4e096e058ba8f4ba8bdb92fa4705b68412dce07213c73c522fd35b3f93da963a5f24f03725e32d6db63c75e01c93a8be4c7f2c1fa4a
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
index 669f669cd416..f85a6e3a7a1a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.144.ebuild
@@ -98,6 +98,8 @@ pkg_setup() {
 	options such as CONFIG_DRM_FBDEV_EMULATION instead.
 	390.xx branch: also used by a GLX workaround needed for OpenGL."
 
+	use amd64 || use x86 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+
 	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
 	use x86 && BUILD_PARAMS+=' ARCH=i386' # needed for recognition
 	BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
index 6d71ba06004b..29ce7c8d9dd6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03.ebuild
@@ -95,6 +95,8 @@ pkg_setup() {
 	Cannot be directly selected in the kernel's menuconfig, so enable
 	options such as CONFIG_DRM_FBDEV_EMULATION instead."
 
+	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+
 	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
 	BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
 	MODULE_NAMES="
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild
new file mode 100644
index 000000000000..406ac0e96fc2
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.05.ebuild
@@ -0,0 +1,478 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MODULES_OPTIONAL_USE="driver"
+inherit desktop linux-info linux-mod multilib-build \
+	readme.gentoo-r1 systemd toolchain-funcs unpacker
+
+NV_KERNEL_MAX="5.14"
+NV_URI="https://download.nvidia.com/XFree86/"
+NV_PIN="470.63.01"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="https://www.nvidia.com/download/index.aspx"
+SRC_URI="
+	https://developer.nvidia.com/vulkan-beta-${PV//./}-linux -> NVIDIA-Linux-x86_64-${PV}.run
+	${NV_URI}nvidia-installer/nvidia-installer-${NV_PIN}.tar.bz2
+	${NV_URI}nvidia-modprobe/nvidia-modprobe-${NV_PIN}.tar.bz2
+	${NV_URI}nvidia-persistenced/nvidia-persistenced-${NV_PIN}.tar.bz2
+	${NV_URI}nvidia-settings/nvidia-settings-${NV_PIN}.tar.bz2
+	${NV_URI}nvidia-xconfig/nvidia-xconfig-${NV_PIN}.tar.bz2"
+# nvidia-installer is unused but here for GPL-2's "distribute sources"
+S="${WORKDIR}"
+
+LICENSE="GPL-2 MIT NVIDIA-r2 ZLIB"
+SLOT="0/vulkan"
+KEYWORDS="-* ~amd64"
+IUSE="+X +driver static-libs +tools wayland"
+
+COMMON_DEPEND="
+	acct-group/video
+	acct-user/nvpd
+	net-libs/libtirpc:=
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		media-libs/harfbuzz:=
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		x11-libs/pango
+	)"
+RDEPEND="
+	${COMMON_DEPEND}
+	X? (
+		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	wayland? (
+		>=gui-libs/egl-wayland-1.1.7-r1
+		media-libs/libglvnd
+	)"
+DEPEND="
+	${COMMON_DEPEND}
+	static-libs? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	tools? (
+		media-libs/libglvnd
+		sys-apps/dbus
+		x11-base/xorg-proto
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libvdpau
+	)"
+BDEPEND="
+	app-misc/pax-utils
+	virtual/pkgconfig"
+
+QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
+
+PATCHES=(
+	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
+)
+
+DOCS=(
+	README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
+	nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
+)
+HTML_DOCS=( html/. )
+
+pkg_setup() {
+	use driver || return
+
+	local CONFIG_CHECK="
+		PROC_FS
+		~DRM_KMS_HELPER
+		~SYSVIPC
+		~!LOCKDEP
+		~!SLUB_DEBUG_ON
+		!DEBUG_MUTEXES"
+	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
+	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
+	Cannot be directly selected in the kernel's menuconfig, so enable
+	options such as CONFIG_DRM_FBDEV_EMULATION instead."
+
+	kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+
+	MODULE_NAMES="
+		nvidia(video:kernel)
+		nvidia-drm(video:kernel)
+		nvidia-modeset(video:kernel)
+		nvidia-peermem(video:kernel)
+		nvidia-uvm(video:kernel)"
+
+	linux-mod_pkg_setup
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
+	BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
+
+	if linux_chkconfig_present CC_IS_CLANG; then
+		ewarn "Warning: building ${PN} with a clang-built kernel is experimental."
+
+		BUILD_PARAMS+=' CC=${CHOST}-clang'
+		if linux_chkconfig_present LD_IS_LLD; then
+			BUILD_PARAMS+=' LD=ld.lld'
+			if linux_chkconfig_present LTO_CLANG_THIN; then
+				# kernel enables cache by default leading to sandbox violations
+				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+			fi
+		fi
+	fi
+
+	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
+		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of nvidia-drivers"
+		ewarn "or was not tested with it. It is recommended to use one of:"
+		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
+		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		ewarn "You are free to try or use /etc/portage/patches, but support will"
+		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
+		ewarn
+		ewarn "Do _not_ file a bug report if run into issues."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# make user patches usable across versions
+	rm nvidia-modprobe && mv nvidia-modprobe{-${NV_PIN},} || die
+	rm nvidia-persistenced && mv nvidia-persistenced{-${NV_PIN},} || die
+	rm nvidia-settings && mv nvidia-settings{-${NV_PIN},} || die
+	rm nvidia-xconfig && mv nvidia-xconfig{-${NV_PIN},} || die
+
+	default
+
+	# prevent detection of incomplete kernel DRM support (bug #603818)
+	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
+		-i kernel/conftest.sh || die
+
+	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
+		-e '/Categories=/s/_.*/System;Settings;/' \
+		-i nvidia-settings/doc/nvidia-settings.desktop || die
+
+	# remove gtk2 support (bug #592730)
+	sed '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
+		-i nvidia-settings/src/Makefile || die
+
+	sed 's/__USER__/nvpd/' \
+		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
+		> nvidia-persistenced.service || die
+
+	# enable nvidia-drm.modeset=1 by default with USE=wayland
+	cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
+	if use wayland; then
+		sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
+	fi
+
+	gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die
+}
+
+src_compile() {
+	nvidia-drivers_make() {
+		emake -C nvidia-${1} ${2} \
+			PREFIX="${EPREFIX}/usr" \
+			HOST_CC="$(tc-getBUILD_CC)" \
+			HOST_LD="$(tc-getBUILD_LD)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 DO_STRIP= OUTPUTDIR=out
+	}
+
+	tc-export AR CC LD OBJCOPY
+
+	# may no longer be relevant but kept as a safety
+	export DISTCC_DISABLE=1 CCACHE_DISABLE=1
+
+	use driver && linux-mod_src_compile
+
+	nvidia-drivers_make modprobe
+	nvidia-drivers_make persistenced
+	use X && nvidia-drivers_make xconfig
+
+	if use tools; then
+		nvidia-drivers_make settings
+	elif use static-libs; then
+		nvidia-drivers_make settings/src out/libXNVCtrl.a
+	fi
+}
+
+src_install() {
+	nvidia-drivers_make_install() {
+		emake -C nvidia-${1} install \
+			DESTDIR="${D}" \
+			PREFIX="${EPREFIX}/usr" \
+			LIBDIR="${ED}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
+	}
+
+	nvidia-drivers_libs_install() {
+		local libs=(
+			EGL_nvidia
+			GLESv1_CM_nvidia
+			GLESv2_nvidia
+			cuda
+			nvcuvid
+			nvidia-allocator
+			nvidia-compiler
+			nvidia-eglcore
+			nvidia-encode
+			nvidia-glcore
+			nvidia-glsi
+			nvidia-glvkspirv
+			nvidia-ml
+			nvidia-opencl
+			nvidia-opticalflow
+			nvidia-ptxjitcompiler
+			nvidia-tls
+		)
+
+		if use X; then
+			libs+=(
+				GLX_nvidia
+				nvidia-fbc
+				nvidia-ifr
+				vdpau_nvidia
+			)
+		fi
+
+		local libdir=.
+		if [[ ${ABI} == x86 ]]; then
+			libdir+=/32
+		else
+			libs+=(
+				libnvidia-nvvm.so.4.0.0
+				nvidia-cfg
+				nvidia-ngx
+				nvidia-rtcore
+				nvoptix
+			)
+			use wayland && libs+=( nvidia-vulkan-producer )
+		fi
+
+		local lib soname
+		for lib in "${libs[@]}"; do
+			[[ ${lib:0:3} != lib ]] && lib=lib${lib}.so.${PV}
+
+			# auto-detect soname and create appropriate symlinks
+			soname=$(scanelf -qF'%S#F' ${lib}) || die "Scanning ${lib} failed"
+			if [[ ${soname} && ${soname} != ${lib} ]]; then
+				ln -s ${lib} ${libdir}/${soname} || die
+			fi
+			ln -s ${lib} ${libdir}/${lib%.so*}.so || die
+
+			dolib.so ${libdir}/${lib%.so*}*
+		done
+	}
+
+	if use driver; then
+		linux-mod_src_install
+
+		insinto /etc/modprobe.d
+		doins "${T}"/nvidia.conf
+
+		insinto /lib/firmware/nvidia/${PV}
+		doins firmware/gsp.bin
+
+		# used for gpu verification with binpkgs (not kept)
+		insinto /usr/share/nvidia
+		doins supported-gpus/supported-gpus.json
+	fi
+
+	if use X; then
+		exeinto /usr/$(get_libdir)/xorg/modules/drivers
+		doexe nvidia_drv.so
+
+		exeinto /usr/$(get_libdir)/xorg/modules/extensions
+		newexe libglxserver_nvidia.so{.${PV},}
+
+		insinto /usr/share/X11/xorg.conf.d
+		newins {,50-}nvidia-drm-outputclass.conf
+
+		# vulkan icd uses libGLX_nvidia.so and so requires X
+		insinto /usr/share/vulkan/icd.d
+		doins nvidia_icd.json
+		insinto /usr/share/vulkan/implicit_layer.d
+		doins nvidia_layers.json
+	fi
+
+	insinto /usr/share/glvnd/egl_vendor.d
+	doins 10_nvidia.json
+
+	insinto /etc/OpenCL/vendors
+	doins nvidia.icd
+
+	insinto /etc/nvidia
+	newins nvidia-application-profiles{-${PV},}-rc
+
+	# install built helpers
+	nvidia-drivers_make_install modprobe
+	# allow video group to load mods and create devs (bug #505092)
+	fowners :video /usr/bin/nvidia-modprobe
+	fperms 4710 /usr/bin/nvidia-modprobe
+
+	nvidia-drivers_make_install persistenced
+	newconfd "${FILESDIR}/nvidia-persistenced.confd" nvidia-persistenced
+	newinitd "${FILESDIR}/nvidia-persistenced.initd" nvidia-persistenced
+	systemd_dounit nvidia-persistenced.service
+
+	use X && nvidia-drivers_make_install xconfig
+
+	if use tools; then
+		nvidia-drivers_make_install settings
+		doicon nvidia-settings/doc/nvidia-settings.png
+		domenu nvidia-settings/doc/nvidia-settings.desktop
+
+		insinto /usr/share/nvidia
+		newins nvidia-application-profiles{-${PV},}-key-documentation
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	if use static-libs; then
+		dolib.a nvidia-settings/src/out/libXNVCtrl.a
+
+		insinto /usr/include/NVCtrl
+		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
+	fi
+
+	# install prebuilt-only helpers
+	exeinto /opt/bin
+
+	doexe nvidia-cuda-mps-control
+	doman nvidia-cuda-mps-control.1
+	doexe nvidia-cuda-mps-server
+
+	doexe nvidia-debugdump
+	dobin nvidia-bug-report.sh
+
+	doexe nvidia-smi
+	doman nvidia-smi.1
+
+	# install prebuilt-only libraries
+	multilib_foreach_abi nvidia-drivers_libs_install
+
+	# install dlls for optional use with proton/wine
+	insinto /usr/$(get_libdir)/nvidia/wine
+	doins {_,}nvngx.dll
+
+	# install systemd sleep services
+	exeinto /lib/systemd/system-sleep
+	doexe systemd/system-sleep/nvidia
+	dobin systemd/nvidia-sleep.sh
+	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
+
+	# create README.gentoo
+	local DISABLE_AUTOFORMATTING="yes"
+	local DOC_CONTENTS=\
+"Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.
+
+For general information on using nvidia-drivers, please see:
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
+	readme.gentoo_create_doc
+
+	einstalldocs
+}
+
+pkg_preinst() {
+	use driver || return
+	linux-mod_pkg_preinst
+
+	# set video group id based on live system (bug #491414)
+	local g=$(getent group video | cut -d: -f3)
+	[[ ${g} ]] || die "Failed to determine video group id"
+	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
+
+	# try to find driver mismatches using temporary supported-gpus.json
+	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
+		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
+			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
+		if [[ ${g} ]]; then
+			g=$((${g##*\"}+1))
+			if ver_test -ge ${g}; then
+				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
+				break
+			fi
+		fi
+	done
+	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
+
+	has_version "x11-drivers/nvidia-drivers[wayland]" && NV_HAD_WAYLAND=1
+}
+
+pkg_postinst() {
+	use driver && linux-mod_pkg_postinst
+
+	readme.gentoo_print_elog
+
+	if [[ -r /proc/driver/nvidia/version &&
+		$(grep -o '  [0-9.]*  ' /proc/driver/nvidia/version) != "  ${PV}  " ]]; then
+		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
+		ewarn "libraries and will lead to GPU-using application issues."
+		use driver && ewarn "The easiest way to fix this is usually to reboot."
+	fi
+
+	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
+		ewarn "Detected that the current kernel command line is using 'slub_debug=',"
+		ewarn "this may lead to system instability/freezes with this version of"
+		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
+	fi
+
+	if [[ ${NV_LEGACY_MASK} ]]; then
+		ewarn "***WARNING***"
+		ewarn "You are installing a version of nvidia-drivers known not to work"
+		ewarn "with a GPU of the current system. If unwanted, add the mask:"
+		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
+			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
+		else
+			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
+		fi
+		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
+		ewarn "https://www.nvidia.com/object/IO_32667.html"
+	fi
+
+	if use wayland && use driver && [[ ! ${NV_HAD_WAYLAND} ]]; then
+		elog
+		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
+		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
+		elog "experimental but is required for EGLStream (used for wayland acceleration"
+		elog "in compositors that support it)."
+		elog
+		elog "If you experience issues, please comment out the option from nvidia.conf."
+		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
+		if has_version "gnome-base/gdm[wayland]"; then
+			elog
+			elog "This also cause gnome-base/gdm to use a wayland session by default,"
+			elog "select 'GNOME on Xorg' if you wish to continue using it."
+		fi
+	fi
+
+	# Try to show this message only to users that may really need it
+	# given the workaround is discouraged and usage isn't widespread.
+	if use X && [[ ${REPLACING_VERSIONS} ]] &&
+		ver_test ${REPLACING_VERSIONS} -lt 460.73.01 &&
+		grep -qr Coolbits "${EROOT}"/etc/X11/{xorg.conf,xorg.conf.d/*.conf} 2>/dev/null; then
+		elog
+		elog "Coolbits support with ${PN} has been restricted to require Xorg"
+		elog "with root privilege by NVIDIA (being in video group is not sufficient)."
+		elog "e.g. attempting to change fan speed with nvidia-settings would fail."
+		elog
+		elog "Depending on your display manager (e.g. sddm starts X as root, gdm doesn't)"
+		elog "or if using startx, it may be necessary to emerge x11-base/xorg-server with"
+		elog 'USE="suid -elogind -systemd" if wish to keep using this feature.'
+		elog "Bug: https://bugs.gentoo.org/784248"
+	fi
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild
index 6f30694aadeb..c4d23b1df07a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild
@@ -100,6 +100,8 @@ pkg_setup() {
 	Cannot be directly selected in the kernel's menuconfig, so enable
 	options such as CONFIG_DRM_FBDEV_EMULATION instead."
 
+	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+
 	MODULE_NAMES="
 		nvidia(video:kernel)
 		nvidia-drm(video:kernel)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild
index f9aedac372c8..9d38a366a0c3 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.74.ebuild
@@ -101,6 +101,8 @@ pkg_setup() {
 	Cannot be directly selected in the kernel's menuconfig, so enable
 	options such as CONFIG_DRM_FBDEV_EMULATION instead."
 
+	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+
 	MODULE_NAMES="
 		nvidia(video:kernel)
 		nvidia-drm(video:kernel)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.29.05-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-495.29.05-r1.ebuild
new file mode 100644
index 000000000000..a6ff5fae1f51
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-495.29.05-r1.ebuild
@@ -0,0 +1,499 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MODULES_OPTIONAL_USE="driver"
+inherit desktop eapi8-dosym linux-mod multilib-build \
+	readme.gentoo-r1 systemd toolchain-funcs unpacker
+
+NV_KERNEL_MAX="5.14"
+NV_URI="https://download.nvidia.com/XFree86/"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="https://www.nvidia.com/download/index.aspx"
+SRC_URI="
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
+	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
+	${NV_URI}nvidia-installer/nvidia-installer-${PV}.tar.bz2
+	${NV_URI}nvidia-modprobe/nvidia-modprobe-${PV}.tar.bz2
+	${NV_URI}nvidia-persistenced/nvidia-persistenced-${PV}.tar.bz2
+	${NV_URI}nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	${NV_URI}nvidia-xconfig/nvidia-xconfig-${PV}.tar.bz2"
+# nvidia-installer is unused but here for GPL-2's "distribute sources"
+S="${WORKDIR}"
+
+LICENSE="NVIDIA-r2 BSD GPL-2 MIT ZLIB"
+SLOT="0/${PV%%.*}"
+KEYWORDS="-* ~amd64"
+IUSE="+X +driver static-libs +tools wayland"
+
+COMMON_DEPEND="
+	acct-group/video
+	acct-user/nvpd
+	net-libs/libtirpc:=
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		media-libs/harfbuzz:=
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		x11-libs/pango
+	)"
+RDEPEND="
+	${COMMON_DEPEND}
+	X? (
+		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	wayland? (
+		>=gui-libs/egl-wayland-1.1.7-r1
+		media-libs/libglvnd
+		>=media-libs/mesa-21.2[gbm(+)]
+		x11-libs/libdrm
+	)"
+DEPEND="
+	${COMMON_DEPEND}
+	static-libs? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	tools? (
+		media-libs/libglvnd
+		sys-apps/dbus
+		x11-base/xorg-proto
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libvdpau
+	)"
+BDEPEND="
+	app-misc/pax-utils
+	virtual/pkgconfig"
+
+QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
+
+PATCHES=(
+	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
+)
+
+pkg_setup() {
+	use driver || return
+
+	local CONFIG_CHECK="
+		PROC_FS
+		~DRM_KMS_HELPER
+		~SYSVIPC
+		~!LOCKDEP
+		~!SLUB_DEBUG_ON
+		!DEBUG_MUTEXES"
+	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
+	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
+	Cannot be directly selected in the kernel's menuconfig, so enable
+	options such as CONFIG_DRM_FBDEV_EMULATION instead."
+
+	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+
+	MODULE_NAMES="
+		nvidia(video:kernel)
+		nvidia-drm(video:kernel)
+		nvidia-modeset(video:kernel)
+		nvidia-peermem(video:kernel)
+		nvidia-uvm(video:kernel)"
+
+	linux-mod_pkg_setup
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
+	BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
+
+	if linux_chkconfig_present CC_IS_CLANG; then
+		ewarn "Warning: building ${PN} with a clang-built kernel is experimental."
+
+		BUILD_PARAMS+=' CC=${CHOST}-clang'
+		if linux_chkconfig_present LD_IS_LLD; then
+			BUILD_PARAMS+=' LD=ld.lld'
+			if linux_chkconfig_present LTO_CLANG_THIN; then
+				# kernel enables cache by default leading to sandbox violations
+				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
+			fi
+		fi
+	fi
+
+	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
+		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of nvidia-drivers"
+		ewarn "or was not tested with it. It is recommended to use one of:"
+		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
+		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		ewarn "You are free to try or use /etc/portage/patches, but support will"
+		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
+		ewarn
+		ewarn "Do _not_ file a bug report if run into issues."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# make user patches usable across versions
+	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
+	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
+	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
+	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
+
+	default
+
+	# prevent detection of incomplete kernel DRM support (bug #603818)
+	sed 's/defined(CONFIG_DRM)/defined(CONFIG_DRM_KMS_HELPER)/' \
+		-i kernel/conftest.sh || die
+
+	sed -e '/Exec=\|Icon=/s/_.*/nvidia-settings/' \
+		-e '/Categories=/s/_.*/System;Settings;/' \
+		-i nvidia-settings/doc/nvidia-settings.desktop || die
+
+	# remove gtk2 support (bug #592730)
+	sed '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
+		-i nvidia-settings/src/Makefile || die
+
+	sed 's/__USER__/nvpd/' \
+		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
+		> nvidia-persistenced.service || die
+
+	# enable nvidia-drm.modeset=1 by default with USE=wayland
+	cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
+	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
+
+	gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die
+}
+
+src_compile() {
+	nvidia-drivers_make() {
+		emake -C nvidia-${1} ${2} \
+			PREFIX="${EPREFIX}/usr" \
+			HOST_CC="$(tc-getBUILD_CC)" \
+			HOST_LD="$(tc-getBUILD_LD)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 DO_STRIP= OUTPUTDIR=out
+	}
+
+	tc-export AR CC LD OBJCOPY
+
+	# may no longer be relevant but kept as a safety
+	export DISTCC_DISABLE=1 CCACHE_DISABLE=1
+
+	use driver && linux-mod_src_compile
+
+	nvidia-drivers_make modprobe
+	nvidia-drivers_make persistenced
+	use X && nvidia-drivers_make xconfig
+
+	if use tools; then
+		nvidia-drivers_make settings
+	elif use static-libs; then
+		nvidia-drivers_make settings/src out/libXNVCtrl.a
+	fi
+}
+
+src_install() {
+	nvidia-drivers_make_install() {
+		emake -C nvidia-${1} install \
+			DESTDIR="${D}" \
+			PREFIX="${EPREFIX}/usr" \
+			LIBDIR="${ED}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
+	}
+
+	nvidia-drivers_libs_install() {
+		local libs=(
+			EGL_nvidia
+			GLESv1_CM_nvidia
+			GLESv2_nvidia
+			cuda
+			nvcuvid
+			nvidia-allocator
+			nvidia-eglcore
+			nvidia-encode
+			nvidia-glcore
+			nvidia-glsi
+			nvidia-glvkspirv
+			nvidia-ml
+			nvidia-opencl
+			nvidia-opticalflow
+			nvidia-ptxjitcompiler
+			nvidia-tls
+			$(usex X '
+				GLX_nvidia
+				nvidia-fbc
+				vdpau_nvidia
+			' '')
+			$(usex amd64 nvidia-compiler '')
+		)
+
+		local libdir=.
+		if [[ ${ABI} == x86 ]]; then
+			libdir+=/32
+		else
+			libs+=(
+				libnvidia-nvvm.so.4.0.0
+				nvidia-cfg
+				nvidia-ngx
+				nvidia-rtcore
+				nvoptix
+				$(usex wayland '
+					libnvidia-egl-gbm.so.1.1.0
+					nvidia-vulkan-producer
+				' '')
+			)
+		fi
+
+		local lib soname
+		for lib in "${libs[@]}"; do
+			[[ ${lib:0:3} != lib ]] && lib=lib${lib}.so.${PV}
+
+			# auto-detect soname and create appropriate symlinks
+			soname=$(scanelf -qF'%S#F' ${lib}) || die "Scanning ${lib} failed"
+			if [[ ${soname} && ${soname} != ${lib} ]]; then
+				ln -s ${lib} ${libdir}/${soname} || die
+			fi
+			ln -s ${lib} ${libdir}/${lib%.so*}.so || die
+
+			dolib.so ${libdir}/${lib%.so*}*
+		done
+	}
+
+	if use driver; then
+		linux-mod_src_install
+
+		insinto /etc/modprobe.d
+		doins "${T}"/nvidia.conf
+
+		insinto /lib/firmware/nvidia/${PV}
+		doins firmware/gsp.bin
+
+		# used for gpu verification with binpkgs (not kept)
+		insinto /usr/share/nvidia
+		doins supported-gpus/supported-gpus.json
+	fi
+
+	if use X; then
+		exeinto /usr/$(get_libdir)/xorg/modules/drivers
+		doexe nvidia_drv.so
+
+		exeinto /usr/$(get_libdir)/xorg/modules/extensions
+		newexe libglxserver_nvidia.so{.${PV},}
+
+		insinto /usr/share/X11/xorg.conf.d
+		newins {,50-}nvidia-drm-outputclass.conf
+
+		# vulkan icd uses libGLX_nvidia.so and so requires X
+		insinto /usr/share/vulkan/icd.d
+		doins nvidia_icd.json
+		insinto /usr/share/vulkan/implicit_layer.d
+		doins nvidia_layers.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins 15_nvidia_gbm.json
+
+		dosym8 -r /usr/$(get_libdir)/{libnvidia-allocator.so.1,gbm/nvidia-drm_gbm.so}
+	fi
+
+	insinto /usr/share/glvnd/egl_vendor.d
+	doins 10_nvidia.json
+
+	insinto /etc/OpenCL/vendors
+	doins nvidia.icd
+
+	insinto /etc/nvidia
+	newins nvidia-application-profiles{-${PV},}-rc
+
+	# install built helpers
+	nvidia-drivers_make_install modprobe
+	# allow video group to load mods and create devs (bug #505092)
+	fowners :video /usr/bin/nvidia-modprobe
+	fperms 4710 /usr/bin/nvidia-modprobe
+
+	nvidia-drivers_make_install persistenced
+	newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
+	newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
+	systemd_dounit nvidia-persistenced.service
+
+	use X && nvidia-drivers_make_install xconfig
+
+	if use tools; then
+		nvidia-drivers_make_install settings
+		doicon nvidia-settings/doc/nvidia-settings.png
+		domenu nvidia-settings/doc/nvidia-settings.desktop
+
+		insinto /usr/share/nvidia
+		newins nvidia-application-profiles{-${PV},}-key-documentation
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	if use static-libs; then
+		dolib.a nvidia-settings/src/out/libXNVCtrl.a
+
+		insinto /usr/include/NVCtrl
+		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
+	fi
+
+	# install prebuilt-only helpers
+	exeinto /opt/bin
+
+	doexe nvidia-cuda-mps-control
+	doman nvidia-cuda-mps-control.1
+	doexe nvidia-cuda-mps-server
+
+	doexe nvidia-debugdump
+	dobin nvidia-bug-report.sh
+
+	doexe nvidia-ngx-updater
+
+	doexe nvidia-smi
+	doman nvidia-smi.1
+
+	# install prebuilt-only libraries
+	multilib_foreach_abi nvidia-drivers_libs_install
+
+	# install dlls for optional use with proton/wine
+	insinto /usr/$(get_libdir)/nvidia/wine
+	use amd64 && doins {_,}nvngx.dll
+
+	# install systemd sleep services
+	exeinto /lib/systemd/system-sleep
+	doexe systemd/system-sleep/nvidia
+	dobin systemd/nvidia-sleep.sh
+	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
+
+	# create README.gentoo
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS=\
+"Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.
+
+For general information on using nvidia-drivers, please see:
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
+	readme.gentoo_create_doc
+
+	local DOCS=(
+		README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
+		nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
+	)
+	local HTML_DOCS=( html/. )
+	einstalldocs
+}
+
+pkg_preinst() {
+	use driver || return
+	linux-mod_pkg_preinst
+
+	# set video group id based on live system (bug #491414)
+	local g=$(getent group video | cut -d: -f3)
+	[[ ${g} ]] || die "Failed to determine video group id"
+	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
+
+	# try to find driver mismatches using temporary supported-gpus.json
+	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
+		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
+			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
+		if [[ ${g} ]]; then
+			g=$((${g##*\"}+1))
+			if ver_test -ge ${g}; then
+				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
+				break
+			fi
+		fi
+	done
+	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
+
+	has_version "x11-drivers/nvidia-drivers[wayland]" && NV_HAD_WAYLAND=1
+}
+
+pkg_postinst() {
+	use driver && linux-mod_pkg_postinst
+
+	readme.gentoo_print_elog
+
+	if [[ -r /proc/driver/nvidia/version &&
+		$(grep -o '  [0-9.]*  ' /proc/driver/nvidia/version) != "  ${PV}  " ]]; then
+		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
+		ewarn "libraries and will lead to GPU-using application issues."
+		use driver && ewarn "The easiest way to fix this is usually to reboot."
+	fi
+
+	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
+		ewarn "Detected that the current kernel command line is using 'slub_debug=',"
+		ewarn "this may lead to system instability/freezes with this version of"
+		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
+	fi
+
+	if [[ ${NV_LEGACY_MASK} ]]; then
+		ewarn
+		ewarn "***WARNING***"
+		ewarn
+		ewarn "You are installing a version of nvidia-drivers known not to work"
+		ewarn "with a GPU of the current system. If unwanted, add the mask:"
+		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
+			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
+		else
+			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
+		fi
+		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
+		ewarn "https://www.nvidia.com/object/IO_32667.html"
+	fi
+
+	if use wayland && use driver && [[ ! ${NV_HAD_WAYLAND} ]]; then
+		elog
+		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
+		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
+		elog "experimental but is required for EGLStream (used for wayland acceleration"
+		elog "in compositors that support it)."
+		elog
+		elog "If you experience issues, please comment out the option from nvidia.conf."
+		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
+		if has_version "gnome-base/gdm[wayland]"; then
+			elog
+			elog "This may also cause gnome-base/gdm to use a wayland session by default,"
+			elog "select 'GNOME on Xorg' if you wish to continue using it."
+		fi
+	fi
+
+	if use wayland && [[ ${REPLACING_VERSIONS} ]] &&
+		ver_test ${REPLACING_VERSIONS} -lt 495.53.02; then
+		elog
+		elog "While this version of ${PN} adds GBM support (allowing a wider"
+		elog "range of wayland compositors, such as sway), be warned it is very"
+		elog "experimental. While not essential, some features also need"
+		elog ">=egl-wayland-1.1.8 which is known to cause EGLStream regressions."
+		elog
+		elog "If lacking a cursor with wlroots, try WLR_NO_HARDWARE_CURSORS=1"
+		elog "Also of interest: __GLX_VENDOR_LIBRARY_NAME=nvidia, GBM_BACKEND=nvidia-drm"
+	fi
+
+	# Try to show this message only to users that may really need it
+	# given the workaround is discouraged and usage isn't widespread.
+	if use X && [[ ${REPLACING_VERSIONS} ]] &&
+		ver_test ${REPLACING_VERSIONS} -lt 460.73.01 &&
+		grep -qr Coolbits "${EROOT}"/etc/X11/{xorg.conf,xorg.conf.d/*.conf} 2>/dev/null; then
+		elog
+		elog "Coolbits support with ${PN} has been restricted to require Xorg"
+		elog "with root privilege by NVIDIA (being in video group is not sufficient)."
+		elog "e.g. attempting to change fan speed with nvidia-settings would fail."
+		elog
+		elog "Depending on your display manager (e.g. sddm starts X as root, gdm doesn't)"
+		elog "or if using startx, it may be necessary to emerge x11-base/xorg-server with"
+		elog 'USE="suid -elogind -systemd" if wish to keep using this feature.'
+		elog "Bug: https://bugs.gentoo.org/784248"
+	fi
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index d78adda838c2..36a132166d35 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index 9294a8607d12..f2adbc9ef5b9 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -1,4 +1,4 @@
 AUX gl2ps-1.4.2-cmake.patch 1959 BLAKE2B 28725bdca4ec50c4cdb19100d30d3af4fe5705709b0aad92c79ca9d732da862170d922e037da29a43e174bf16b773d9ec73c2034a5f67803dd9e3c97dbc2f4d5 SHA512 a76a7649e8b2b62de6669f1bf1d3f4797708ae659ba8cdf9b3da21319dbc56035876d1b233c5b8934ee93a6b3d1b6562376734c6ef1da8764910a30b8849fe17
 DIST gl2ps-1.4.2.tgz 301134 BLAKE2B 43c93f93d09dd7a6af0711819647f5f82c0853a80822dbc600b7502f2c86612f5cb2edc31729c67abbab44cc8fec7aa1fa7e13f0d115b0d79c7a7d45fa1a3079 SHA512 46652e1b3825ace61dbd77c4b0bf451e7671c248eb18bbd3369e2fac00056ea4cd5d2578561984313c239e3b02f78b9d9a76d963c935af65a13bc2abfc538620
-EBUILD gl2ps-1.4.2.ebuild 1175 BLAKE2B 1d93619d65949298724339055bd760349d077b0cc0e5aadc80a7041c652406c9a83352260795b06ab0ddb7f941067dae3c09a81ad73e4cc6de556243e3b0233b SHA512 5c290a4ed8ab7ebff21a729196c64e013fa8f7df6dc93f7ca98937c7f1aafa6f4560edb5746855bd6ce399e88101fba16ab76a1d4b5e6822880143d5c7bbfa51
+EBUILD gl2ps-1.4.2.ebuild 1182 BLAKE2B 11401014d92ec04d8aa447320608da82a4cba53a080871a27998758f23b104b1ecbe6f807ef707d21a59947d3b6f56f924bb9d9dd6461d8ed1b5c5f49f85cf1a SHA512 fac3705e3bdbc93485c4a0a7d69660b47680ed030e229f9239ecdd41a9e185218ef0f5c6d01852bf2c902ab93648e6da3fc276c5b4b42acf669da274417230a1
 MISC metadata.xml 723 BLAKE2B 0223a2e0e304553ad5e16e22903ce5670b4136a444019b21bae423c8581ca6e779e0013096d0ea454838ead573282ba25dfd49d2bd010728a1ffd49465771d59 SHA512 0f9381190163456996ae79eea45bfc51294d53bf71c9ef5ec1dd140194f913a2d7c826a6135c35b0e889373c0ba0b2e59d691f84ccf8c96fafb35aa64ad431d5
diff --git a/x11-libs/gl2ps/gl2ps-1.4.2.ebuild b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
index a8f74181e305..e248470f2bde 100644
--- a/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
+++ b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc png zlib"
 
 RDEPEND="
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 9c9705cdb7ce..87166390413c 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,6 @@
 DIST libdrm-2.4.106.tar.xz 418176 BLAKE2B b0f935297239560179ec8994b62c7161494d4c1aa33bbfdc4d5e4ecff97d252f7556575391ebf486e24257c365415e656b9f84ac883dc9d56baf39e79ff8c5f2 SHA512 33140e579906ab54b716149056af500c628ce41cd9ae3b0c33496693d2f5903fbcfccee8a942dd1560e1591111ed240da42612d5af5e75558db6f6a85d14617d
 DIST libdrm-2.4.107.tar.xz 425612 BLAKE2B a685cd9a6549c7bdf1efb4e7ebddd0ea49554fa718f8328c868a1f245e7c072933e49546591c056ba7ece8d8841b8138e4247dd8697238a18c2cd92fe5446341 SHA512 c7542ba15c4c934519a6a1f3cb1ec21effa820a805a030d0175313bb1cc796cd311f39596ead883f9f251679d701e262894c5a297d5cf45093c80a6cd818def0
 EBUILD libdrm-2.4.106.ebuild 1742 BLAKE2B 85694c5857f949f178042878f79b04cb0c190d5f452c88cb7d7454e705510d0a0f3d871ecf45bb52ddb17b8c77585c3c56bcae2fbe27a13655b92338f20787f1 SHA512 45d320a9af316e549c9e38260cc994c6f8812834a8c426a5ad9cb4735159d9dc6c4eeb944b571575ae62ce6359d3d02e00fafc0991002ad7ad99a9d84e9160c9
-EBUILD libdrm-2.4.107.ebuild 1741 BLAKE2B a612df888b678eb226f670ddd6c7d50b206bcec528ea8f6d1004e0e0b7ae80894a5ae388e3abc51e4db974a55f3411d5d0f73b053cf5f347de1a590ded463323 SHA512 538a86d2fcb5f98f3aaabc78eb794cfd19f5e126efb713b5bb0043cd3b647eb4972633b79394dee83caf56c2ae156b0ef84e7a362335ae0fca91406f50cdccca
-EBUILD libdrm-9999.ebuild 1749 BLAKE2B 7d42273c2a45a5901adaa86e09b506a1ef299132cbf03e18516ae226c262841015dad8b5fc9ab1e4aa4168303471047f59e34865b7220c8bf4b142010f0787a1 SHA512 d2494d35d6bd00c046c8998f2530e172cc3b565b1b2ace0438fdc65b5fca074bb407167e86a546c63e4a1d70cc06499fb23354648b056e54a508ae3ca8cb1dd5
+EBUILD libdrm-2.4.107.ebuild 1958 BLAKE2B 5a9c0b7f38715a5d9ca657df44b6509569749519d0a8d297c0991af32d1aaec36f74785d80cfaafedfa285c6ed825986015115c7c7956611c3beb6a939f7513e SHA512 3c24a14847a59dc0d13d87d016aa623f2743d3297622301d6a8df583a10972a787fe8b76a415dadd99e84e4e4936783472f9dfd92171deeb2891f1f563417528
+EBUILD libdrm-9999.ebuild 1966 BLAKE2B 54d431322199e68cb172a9bfdddfb5901cc9cd482d7d6126efe6157a9ebaa5abe189180fcc23e12692dc93edf4e6a4e14ffc55d0969df0d392f9095019dc9c58 SHA512 ea18789d0813cb14a91ba3a5bc1fb8005ef530dbe34b77d9b643790e43dfe6cee26f29a2c9ea566a1b59273d834b72a67711bd27fa91e312abefeb5c5a23e159
 MISC metadata.xml 407 BLAKE2B 1ec724640ea057ea29a6c84f3dcd34cb6a3f4bd7731c00d486688c9ec1dce393133e58b86ade00e51f91c80fe521e8829cfb796bd7cdc2e3d8c7be450d4c4188 SHA512 b54da0a8739fda9bb388e9893d992323247df89d9e97d20f29c62e64b189bf38092615cf113ae5048ce223270ebfaa128bb6b5fa119e5e8c8cdf2bda76a64769
diff --git a/x11-libs/libdrm/libdrm-2.4.107.ebuild b/x11-libs/libdrm/libdrm-2.4.107.ebuild
index ffadd9d26435..a4ec5f0969d2 100644
--- a/x11-libs/libdrm/libdrm-2.4.107.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.107.ebuild
@@ -4,12 +4,13 @@
 EAPI=7
 
 EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
+PYTHON_COMPAT=( python3_{8..10} )
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-inherit ${GIT_ECLASS} meson-multilib
+inherit ${GIT_ECLASS} python-any-r1 meson-multilib
 
 DESCRIPTION="X.Org libdrm library"
 HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
@@ -34,6 +35,12 @@ RDEPEND="
 	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
+
+python_check_deps() {
+	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
+}
 
 multilib_src_configure() {
 	local emesonargs=(
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index f603cf783700..c34f20fb240d 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -4,12 +4,13 @@
 EAPI=7
 
 EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
+PYTHON_COMPAT=( python3_{8..10} )
 
 if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-inherit ${GIT_ECLASS} meson-multilib
+inherit ${GIT_ECLASS} python-any-r1 meson-multilib
 
 DESCRIPTION="X.Org libdrm library"
 HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
@@ -34,6 +35,12 @@ RDEPEND="
 	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
+
+python_check_deps() {
+	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
+}
 
 multilib_src_configure() {
 	local emesonargs=(
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 13305de0c0f3..f9cedc2ff2cc 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -12,6 +12,7 @@ DIST intel-media-21.2.2.tar.gz 23021952 BLAKE2B 0173eb8fb81c3012af30bb755b87e5f4
 DIST intel-media-21.2.3.tar.gz 23025524 BLAKE2B 0652563f8e8494c9fa181822a7af348cc5ce1e2446063c743fa89072ae46c6a4af0c71001fb8249b0306d67a220312f883a8f54dde1981078e6ee8fad71eaaa1 SHA512 b12ff5b3afbc4d4f34353c7a4ea50b1c66746b33920e450d7d17cffdc234921e82fc4c1afb025274caf2a5efbe87e577b6790d0648a52de08ea19b11a103ac81
 DIST intel-media-21.3.2.tar.gz 23069924 BLAKE2B cb7035698bc19eb65f0cf338e7fb0e11a379a27c243566b6f884d63897da10e2ded39523fcc81131f41885508d1413e7960e38cf9cf2d129d7a6a3994fa9b384 SHA512 27a1849ed2f2367e5de63189faa6e14a1a23f6708c45392f661fab819f856bb4a3d0d31754213b084c4f05be3b155b0a80c2f4e330c79879597910f77e3f1597
 DIST intel-media-21.3.3.tar.gz 23092541 BLAKE2B 083cc368095bbc9cf333953855ad94d7a8d633337b967f4f93d94e3c8e23bbcdadad19c1b1032cafc671ae9a9df9be547498ebe84426ad9d91a9e82557095eb8 SHA512 a9da8a627420c5ea0de9413ce0aeb471f40a0886abd67380ead7ffba32de4abbc1741c47cfcfc73d42b14456090266f4dad8d363c8ad590cef521ef48e42f692
+DIST intel-media-21.3.5.tar.gz 23110985 BLAKE2B 1dbbc1efa9ae2c8f3b4a34596c71173101f8a43591bf9e07d269a8499b7a57969d9af5c1d4ffb7774a6947947e572b441f871760d3ca695335bfa2976ac2cf6f SHA512 e7836b19050677e81aa34ce5d7cea661ca3b5ac55d73d5aa0bab93f1daba8ee010d84b1c585f62fcec65a4361ef2b7f14ed574858f56b85b4c4d59840ecb6cb6
 EBUILD libva-intel-media-driver-20.1.1-r2.ebuild 1182 BLAKE2B e453b09ac58040ab6e0da45768caf70d8cdace4b4683f94f8133904513212652e5fa7effa8392be7e495e00f8d6227163c465d4404f8628f804eebd9c0c3e3b4 SHA512 52b2221c79305305deda5a952314f8de487399f99f5840e0ec9a2d67ebce819cba2d8e31ee9de4e17300e758925d68ab5f3205ecec62631d19b0a1c7f213203c
 EBUILD libva-intel-media-driver-20.2.0-r2.ebuild 1225 BLAKE2B 195b1f1db03ad5bf2d42bae05cba99e9726a0ba3c682c993eb73b6cff6bf04b40004d15223d69fbd64fcae4b62bf1137f50911ec2b9c68bd9079d0302d682ba6 SHA512 a46e343c36dc51819c22b601b7eecc62f38c27b75cc4eafba844fdb32ce062047f3408e582b3daff9668a72df26d995d2a4909c7da98cf2fbc4a60682f41151b
 EBUILD libva-intel-media-driver-20.4.5.ebuild 1466 BLAKE2B 44ab893c79c0eace0f0e237c89a81636123733a51da2b71b4314f5707e98855a59696896cac73a783cfc0b646f9dd1b2e99bc555888d6b53ddd6a54d2e13dca7 SHA512 95749d2504f57449baddfe40b9f1595f45d5058e9afb3656b9ead1163a5dc8a899aef6e71c9bea3ffd5f452b181ca3eebbeae7943e563292be51be7bc24037e2
@@ -21,5 +22,6 @@ EBUILD libva-intel-media-driver-21.2.2_pre.ebuild 1484 BLAKE2B 30827123d8241e2cb
 EBUILD libva-intel-media-driver-21.2.3.ebuild 1456 BLAKE2B 3ef7e7a112b602fcc8bab298099e8cc139bfa7e2d2a3ab2eb5d515ac6bacd2b02d49fd5c0ef62951153e7bd19a8eafab68b51d0ab7ea7bb142f56cae827be1ae SHA512 5fffda372db6de84b266a9cd2d04f8f419a4a76d8576ea4fd04dd75798763899414cdf0e3db72469b43fb344741eaa8f158c0176e0b2d72977601bc293b27c8b
 EBUILD libva-intel-media-driver-21.3.2_pre.ebuild 1484 BLAKE2B 30827123d8241e2cb52bd92d1455ab40accbe60ca374206e38919f4f0add83c4b297b0a7fe86a4f38f1b8d9f1c8775d0e7d6181f0e9604afabcd406cc5a71519 SHA512 ded439fb9d7b41cd8ab6905dcfec3bcb4eb6f0527509a8ac62be6ce5873dc93dd9045be5e6222feca005385bcb16ad08f6e79769caa894ce4f5037fee4ae0392
 EBUILD libva-intel-media-driver-21.3.3_pre.ebuild 1484 BLAKE2B 30827123d8241e2cb52bd92d1455ab40accbe60ca374206e38919f4f0add83c4b297b0a7fe86a4f38f1b8d9f1c8775d0e7d6181f0e9604afabcd406cc5a71519 SHA512 ded439fb9d7b41cd8ab6905dcfec3bcb4eb6f0527509a8ac62be6ce5873dc93dd9045be5e6222feca005385bcb16ad08f6e79769caa894ce4f5037fee4ae0392
-EBUILD libva-intel-media-driver-9999.ebuild 1456 BLAKE2B 9ebc73549d3ad9d9d0cbbccce0ca012599e952d324731841d5546a9aeb90768ffb1a780e9be0f89a66cc4b6cc38f76f03527cf8bf1bee31a9dd260b717fb548c SHA512 c6264b876982e35ae775c0863b6d1add2707451c6d13dce567220192d5e0efb8015eea834f5a036f4088a97a2a87c0694f660cd2640fdc814167bd0252ec8d23
+EBUILD libva-intel-media-driver-21.3.5.ebuild 1494 BLAKE2B 19e86871ffcfc7429630d27ddfea83c12aad6515fb835a164d3af932680b1cdc11a1afc2607e010a63cfc8318128535c103ec05a34525eb952251b0632b47402 SHA512 377bcfa3181f363ec2df809c237435531411d7aee6da415227e15df89fce118edc72fe56bc44606b4255b53c012a7246f654bd63cb479a164cdc91a3412b6097
+EBUILD libva-intel-media-driver-9999.ebuild 1494 BLAKE2B 19e86871ffcfc7429630d27ddfea83c12aad6515fb835a164d3af932680b1cdc11a1afc2607e010a63cfc8318128535c103ec05a34525eb952251b0632b47402 SHA512 377bcfa3181f363ec2df809c237435531411d7aee6da415227e15df89fce118edc72fe56bc44606b4255b53c012a7246f654bd63cb479a164cdc91a3412b6097
 MISC metadata.xml 617 BLAKE2B 70709460de09a33bcaac37b7a6b46ab82366fefd61b525a9d73fca0e3bbab3332635cfcc52d01468f5270168222b55360bb221890fd97f01af3e9c46ceb8ca14 SHA512 bab84b0d3113695f920d4710329e5a147a946b9fe56cf6ff7e583694b249c7f284b359d2edd1a8c12d3035232dc0eaa12f8f3450992d6dc0d287b4db0a94f497
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5.ebuild
new file mode 100644
index 000000000000..15ca5a26b62c
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD"
+SLOT="0"
+IUSE="+custom-cflags set-as-default test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-21.3.1
+	>=x11-libs/libva-2.13.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+	"${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
+	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DUSE_X11=$(usex X)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use set-as-default ; then
+		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
+		doenvd "${T}/55libva-intel-media-driver"
+	fi
+}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index 7e53505dd384..15ca5a26b62c 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -15,7 +15,9 @@ else
 	MY_PV="${PV%_pre}"
 	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
 	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	KEYWORDS="~amd64"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
 fi
 
 DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
@@ -27,8 +29,8 @@ IUSE="+custom-cflags set-as-default test X"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=media-libs/gmmlib-21.1.3
-	>=x11-libs/libva-2.11.0[X?]
+DEPEND=">=media-libs/gmmlib-21.3.1
+	>=x11-libs/libva-2.13.0[X?]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index a120f018aff6..4e336608297e 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,7 @@
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
 DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586 SHA512 c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1
+DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a00006567240af45e2833e085e423ad47e29c4f9b2241e SHA512 edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc223459bbbb8ac876c5befd8873f700
 EBUILD qscintilla-2.11.6.ebuild 1959 BLAKE2B 5609b01ac7f134c828f00689ddfb3f63816b0098b028199edde287211a969cbdbfa4eeb1c3442fca58d8021d205bd9fb82cd736bb0c5e617cc85d362ea39cd3e SHA512 b8365aa48d71e5d2c6421dd45132601e58857f35569397f7d157b710af5c4210bffcf9c88ef6800fe1ce96c909e21cf6cf5cd71346ec5f35f5b38ebe1048290e
-EBUILD qscintilla-2.13.0.ebuild 1896 BLAKE2B 848a3f5f88a75733433a4dde205043d200d1983301c09696f2b93156b300128cc92a554c3653853d2f53e712fb4c74288b0a618fd0db7b061094bf3912546afe SHA512 cb5c43d8dc3651755928ee1ce640089374862ecb316affdcde06b4a79ae773a6c0b5212470b9079e025066fc941b84700c92e604733b0113a5e2146d25cba0e0
+EBUILD qscintilla-2.13.0.ebuild 1903 BLAKE2B 98ff80479a4440fa60b07b5d4aa92cda637b523ee62c728a985bf486dc81e5cedcf9f074156357325b8a96ecaa971d821d363b4d287648fbd3fd51c4c8fd7b51 SHA512 40d30762c011d7be0b63b2249860c4c1f643a39e36637393e7e27f65283885d377eee22b860667e4713c92132a5c73a3d9d2ab89d9d8cc2b1813df05bb78e2bc
+EBUILD qscintilla-2.13.1.ebuild 1903 BLAKE2B 98ff80479a4440fa60b07b5d4aa92cda637b523ee62c728a985bf486dc81e5cedcf9f074156357325b8a96ecaa971d821d363b4d287648fbd3fd51c4c8fd7b51 SHA512 40d30762c011d7be0b63b2249860c4c1f643a39e36637393e7e27f65283885d377eee22b860667e4713c92132a5c73a3d9d2ab89d9d8cc2b1813df05bb78e2bc
 MISC metadata.xml 605 BLAKE2B 926d6dffbaf1d0243678e72a7e09d537d58571413142bef96b5963ea21cf1edadb6404992a6c57c1698cc58f9154ef9eb80926f1472b0570f6f3c299e856304c SHA512 99a337e3019d6ea8f8887bd92130d3fbc8d042eeb4d0c42afd6ea943751b901dbe0bc94f3244ae55371e2e2b9cfc0e2c4709f2bcbd07b70e42c16c454ae83007
diff --git a/x11-libs/qscintilla/qscintilla-2.13.0.ebuild b/x11-libs/qscintilla/qscintilla-2.13.0.ebuild
index b724431bd160..28e0c4e73dc6 100644
--- a/x11-libs/qscintilla/qscintilla-2.13.0.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.13.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="designer doc"
 
 RDEPEND="
diff --git a/x11-libs/qscintilla/qscintilla-2.13.1.ebuild b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
new file mode 100644
index 000000000000..28e0c4e73dc6
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic qmake-utils
+
+DESCRIPTION="Qt port of Neil Hodgson's Scintilla C++ editor control"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+
+MY_PN=QScintilla
+MY_P=${MY_PN}_src-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0/15"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="designer doc"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	designer? ( dev-qt/designer:5 )
+"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	default
+
+	# Sub-slot sanity check
+	local subslot=${SLOT#*/}
+	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/src/qscintilla.pro || die)
+	local major=${version%%.*}
+	if [[ ${subslot} != ${major} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+}
+
+qsci_run_in() {
+	pushd "$1" >/dev/null || die
+	shift || die
+	"$@" || die
+	popd >/dev/null || die
+}
+
+src_configure() {
+	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../src
+		append-ldflags -L../src
+	fi
+
+	qsci_run_in src eqmake5
+	use designer && qsci_run_in designer eqmake5
+}
+
+src_compile() {
+	qsci_run_in src emake
+	use designer && qsci_run_in designer emake
+}
+
+src_install() {
+	qsci_run_in src emake INSTALL_ROOT="${D}" install
+	use designer && qsci_run_in designer emake INSTALL_ROOT="${D}" install
+
+	use doc && HTML_DOCS=( doc/html/. )
+	einstalldocs
+}
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 6f09df863d67..0ffb892c86a6 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -2,6 +2,6 @@ AUX qwt-6.0.2-invalid-read.patch 9447 BLAKE2B a3a9074113cee590bae03f0a55eb6cb280
 AUX qwt-6.1.1-pc-destdir.patch 498 BLAKE2B 4e3fefa36daebe0c173adaae02c33a622d70cefd626998f9baf65229291be87dcd5dff175961fb2b33d794e0b3f082a36209ce682434bd3f83de6fecc585137a SHA512 a2035e27af7110a2aaf4e28f316e2c6c49b6909345ceec01eb4793ac66445594bf362fa6939506ba6d0300bde9487c83ea770299af8c3ca8d71b162cbc71e769
 DIST qwt-5.2.3_p20210211.tar.gz 2324714 BLAKE2B 86556c9cf65af80500b3cba7ef78be8aec0f2413a1d485641f8870b447a1b1370b9821ad6b4a58c74f87a73172e4b2fa3eb2f02bb525c0ab3982aec550914666 SHA512 8268213c9e809015d83f3f7d42e66c85b6c9cb16efb9586ad4e5da2fa60fdcc5bdf52e0a422adcdfe928e36df0f63d8bbed1fabded91ef36d226e6cc7fa372bb
 DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
-EBUILD qwt-5.2.3_p20210211.ebuild 2323 BLAKE2B 958df6c967dc0ad4c9835d045526c6c6b004878e521a86fd67c3c54b49f29bc31a02e628b19211a40a56fd3d61b4d5ed6241aac60d9d2c3e85b703ae9baf3bc5 SHA512 a8465b3dc22dcbb067031fc5bd26c1bbf56a20859dabd207e6785f3c9d8c27a82c98e82864c0ce76d320685c9756f07dfd7f3eaac5b3d01cbc33f8797909fb81
+EBUILD qwt-5.2.3_p20210211.ebuild 2319 BLAKE2B b6062a5d1d7e0c4a42e6cac9ee80a0610a4e3ad4b0868f9806138f8d408c513abf5ae7ef5ecbfbde38b1e9398519ffc8bed798e6db7dfb2374e33c257fb337cc SHA512 2882706eb496ca52501c23d7da465122c4338648e6ef1b72ec202430b7437497568b1ba3e44b812a6ecc2048e00cc060640eaf88d7e8e4c138cfe48e0c0d7916
 EBUILD qwt-6.1.5.ebuild 3194 BLAKE2B 7a5d212d05ddfc7ae91c83fb5a8e4af7c3eb6a0b89a9da886a8bdbcaacf2583d8bfaddf0225ea7ed78a70b0fba53d9d75e5f4902ae2fd53b375475a2026d889e SHA512 a3906bee40011fdf0bc6594b230c0b29f3bea7d87d48127a36ab57edc61656043f46a2aae886fc22ec708dc34a10bf1c66082735cc1032862bf447592e2cf661
 MISC metadata.xml 930 BLAKE2B 7e69f5762e0abf8399921153b73c31e927803de990cb3902be1fcfeaba75d18c36300b374a84a57630fd3eb08f4c99194e8dd3f86059cf9fa05ec049649c3cf7 SHA512 f90beae03d5e96508f139da0206f4aea119fb323aaafaa92931e35c8b6e1fc56c0e4deaedd77c57c5c8173c36c34227b504b9444c7200427ef7daeae3204f14a
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
index 5762259d2e39..aa64d85aa9c9 100644
--- a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/SciDAVis/qwt5-qt5"
 SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="qwt"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 SLOT="5"
 IUSE="designer examples"
 
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index b23214690f62..5029f14055ee 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,5 +1,5 @@
 DIST xapps-2.2.1.tar.gz 239789 BLAKE2B ee7f3f2b3c54b0b40158dff6abbe2233c0d1a1fa4e134ce4bd6ee48842335b16e0d94ad430cb59301529dd85e2705cbb1c1f5ba10844b6fb85f598ca0c42d1db SHA512 412f5c207d81d2507f2aa5cc69beed2036db07058f08613793aa7c277bac30191a02d9aff4eca0aeb8829e3e39d5f3a87e34232bf51220c4d4bc7c8ee37b9e65
-DIST xapps-2.2.3.tar.gz 242330 BLAKE2B dba7f77eea7314fe978a1ba2b691f5c2d7e5d88f499d2f8533c8b1141262ce981cc395f8d6a0b1feaba715c63034e8dfe887e4183b5e119a0947b1ad85d99bbd SHA512 e8ac24decfa89aa949cf837a2e7a7ccdb8ef9d777081d0f3ea0e3a0b42378c721eed3eafacae669244a64c7f4202cb5c2a878d3574823f8f94bfdf51ec29f9ae
+DIST xapps-2.2.4.tar.gz 242171 BLAKE2B a2e53123776f3f0739778673d08f165d268f5d632ce57d722ac443a7201c22c14c1c88e08247f6c16dd708a01b2dd566d4bd9d55289d70eb50ba29b8f2a0987d SHA512 428fd4dc1911905d6f940c6e38fc8b572d55bcb2691d45ac807276ef554b781c9f6c57bbd6d0a95bf52ca1703a38d260f36a61b88a94bc2dc0812b575839a983
 EBUILD xapps-2.2.1.ebuild 2137 BLAKE2B 7d58cac8c262526bcab27af3cddb3ace003d65f89b4dbb41566e516a3e67fc515832115085c6c1f42e6a93bb02fdba198b665cf11a0ed0f246dad47bd51065bd SHA512 52d1fe7c51936c187a9c2bbb5ab7df97e657fa8a1ca5d0f874913bc75f5f25498abd28dc56c1fabd785d867f2cffe50abe36428f2afa8ea1797532eecc45e901
-EBUILD xapps-2.2.3.ebuild 2139 BLAKE2B 4a91afb77aadf2ffa5c7b31e06559f74be2c7f782bc7e491acad2e58e5fc3251dece2b9905d05e59c3608ccc776c964862b12a4c3c715b4c76e70317d732da7a SHA512 45d015894b5c354d486ae1f8bafac913b309a5ea86ec576396d4965664d7bd11f49ed83b3ec5a1b21ccc5f7b2a2ee36929e2d305ccbc5b54de0726be1065fe98
+EBUILD xapps-2.2.4.ebuild 2139 BLAKE2B 4a91afb77aadf2ffa5c7b31e06559f74be2c7f782bc7e491acad2e58e5fc3251dece2b9905d05e59c3608ccc776c964862b12a4c3c715b4c76e70317d732da7a SHA512 45d015894b5c354d486ae1f8bafac913b309a5ea86ec576396d4965664d7bd11f49ed83b3ec5a1b21ccc5f7b2a2ee36929e2d305ccbc5b54de0726be1065fe98
 MISC metadata.xml 485 BLAKE2B b5373ca9cd55c24bd3ea5b65bd11c5fd43519b6237ff1e73d08ee35303f2f1dd9805fe8a94343bddf2c044749a3914b4d76d1d1b71f02f52e6415c5ef6e1a91a SHA512 45a4105d5797c3ba05757cb93ae6a7e80c9283a9e31cf45cc8b6dcf0d8606e3b2c855bd85c9733750e927758982095047895cda09cc5f32a02cfdd840c101344
diff --git a/x11-libs/xapps/xapps-2.2.3.ebuild b/x11-libs/xapps/xapps-2.2.4.ebuild
index a7434062a552..a7434062a552 100644
--- a/x11-libs/xapps/xapps-2.2.3.ebuild
+++ b/x11-libs/xapps/xapps-2.2.4.ebuild
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 953451062a3c..c4146c753dbe 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/cbatticon/Manifest b/x11-misc/cbatticon/Manifest
index 50174433ded5..dda91458849c 100644
--- a/x11-misc/cbatticon/Manifest
+++ b/x11-misc/cbatticon/Manifest
@@ -1,3 +1,3 @@
 DIST cbatticon-1.6.10.tar.gz 32402 BLAKE2B 91ba6eb581b4cd0b31ae5a49b12970fc7d02d1ba790bffc80886c05ad2b0573ee1aca479d90591498dd6d816bb7e24bee6918e5a8fa8823cf376a3a3da598993 SHA512 cf499eb7ac1d775918a7af01700a9e8eeefd9e31a44fd63c9f38bff83945cea9fb21dde960052768f8d0a0c004caeea115f2d80cb3838789859d43e432eae055
-EBUILD cbatticon-1.6.10.ebuild 877 BLAKE2B bdd4ede897dde39c98210a79040e7a74dc4f5536e47a906d5dd00409d764c936ee93715438bc7a76b18dd41b0d0eaa8ae177c92046a055de7c7882d17099f3f1 SHA512 ff70f2c925cf4115f591e27cdbfe776ec4bd797579f909b67e76c883c38196e2bd17a78acab251fd460f8d9db818273b99188a579db1ff28370451cd45025e0c
+EBUILD cbatticon-1.6.10.ebuild 884 BLAKE2B cfe5c79b40894f34f68706ea30422df0836496a506bc019b5c9efa47927b1f6e99ab99adc08ee1f119e8f90a8c2a221d8a191a4dd0f26e5fbbcc47d02664b8c6 SHA512 324f2a83dc4876202743ebbc5ee41ac4dfacd6fad6980189be1ace8f6e00b8c7a2a5048331ba827cfa5a98c62daa848f8d920a18ea9f3b1fe3bf00ab7af33556
 MISC metadata.xml 325 BLAKE2B bd1eee6610c7863dfb492da2f16af43ea5ad15e92dd80ab968339ebe25554b7be7783cb282fc16522ebdff1594869efd47d5bdf737aa355f559cf218784ae327 SHA512 16771648d8e8318b78412c7a14b733ed185761fc0ed804e3739ba39bc67848a2f8a64b52229670263ca26fdeb8bbe2a7ca09fbb136304dbbc7b94abe7f43530b
diff --git a/x11-misc/cbatticon/cbatticon-1.6.10.ebuild b/x11-misc/cbatticon/cbatticon-1.6.10.ebuild
index e8b92011dab8..5992136aee48 100644
--- a/x11-misc/cbatticon/cbatticon-1.6.10.ebuild
+++ b/x11-misc/cbatticon/cbatticon-1.6.10.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/valr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="libnotify"
 
 RDEPEND="
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index b130340abb0b..29fee724e500 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,3 +1,3 @@
 DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
-EBUILD compose-tables-1.7.2.ebuild 920 BLAKE2B c4951cea2f0baafd69bbca4676f0c87d99f6dab768c30b389e891e2b47af3a4fafe623d82a51907551162559d82c45407d7320350a91aa966048da5e9afd9a7b SHA512 3c45c31de684ca27133aea29c086da1690186b0a396af9ed1f79631cca17fcdbf21704e21e274fc095d67e24ad5d37ad300d299e16c19f3cbda68d2b6d7f1a5e
+EBUILD compose-tables-1.7.2-r1.ebuild 920 BLAKE2B c4951cea2f0baafd69bbca4676f0c87d99f6dab768c30b389e891e2b47af3a4fafe623d82a51907551162559d82c45407d7320350a91aa966048da5e9afd9a7b SHA512 3c45c31de684ca27133aea29c086da1690186b0a396af9ed1f79631cca17fcdbf21704e21e274fc095d67e24ad5d37ad300d299e16c19f3cbda68d2b6d7f1a5e
 MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
diff --git a/x11-misc/compose-tables/compose-tables-1.7.2.ebuild b/x11-misc/compose-tables/compose-tables-1.7.2-r1.ebuild
index e6d977c13554..e6d977c13554 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.2-r1.ebuild
diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest
index 44f2964f0137..554e2ba9fadf 100644
--- a/x11-misc/compton/Manifest
+++ b/x11-misc/compton/Manifest
@@ -1,3 +1,3 @@
 DIST compton-0.1_beta2.tar.gz 144239 BLAKE2B 993c091aa0eab4171740a26c4ea8e9da66368fbcddbbdf9c466dd2cb2dbe0a685dc6c2027a5b56d08df4fd42d21784dd2cbb7cf56869feb1b74b4854db20a5f8 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0cb16d29449f68cc2f6a8d834569c9620ec6533ab85c1586da957c69b1ae341d9584535
 EBUILD compton-0.1_beta2-r1.ebuild 1618 BLAKE2B 6e591088f42a15057352e85c39f05f4c044c22338c4851d7949e8f369f993bca82e8b6f767a8dfdd3809f15fce39965105f8ea31edd4938b56bc130c743aab2e SHA512 4ffd1ada1439d583b36e87d55d130544785ad9f641639589b57ef0e3cc3256f48eb30bed209aa24ce0c45bd1e65c9cad12092dcbdd1c4560ce8259deaeb3d7b3
-MISC metadata.xml 485 BLAKE2B fdd928e582a604fd9eae1ef0e2624f92abd24e2b9eba0b52a3ead7c771bcc9c7fae691a8fd23b1c551fb828fe0973bb4a6f3818e77dcc29a96ac42827fd13fb9 SHA512 af66d004e08a2ab42de52a422a7094fff8995e074fa280dfe83ff12fcf7f89fda3cf19f4b28ff2c3169284d8fc0e0414aa31499dc8486232567015891c2f0386
+MISC metadata.xml 492 BLAKE2B 74c0a1f1a7099a52f157ff92aca2c82e57e8ac547ce8119962db0c8f29465e55d2c3d03a85b8a72585cde7195f77952673a98f8ab86715816cef77fcb214bea4 SHA512 fbb4101254eea39b9208d07f24ec6576b3218b34d8b6e8ff88930e95a252a619fd15db6f675940da9f5198268258ca361ad1079d98572da73b00424359159b83
diff --git a/x11-misc/compton/metadata.xml b/x11-misc/compton/metadata.xml
index 55d1d1c95396..2ebce28929db 100644
--- a/x11-misc/compton/metadata.xml
+++ b/x11-misc/compton/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
 	</maintainer>
 	<use>
 		<flag name="drm">Enable VSync with DRM_IOCTL_WAIT_VBLANK</flag>
diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest
index 0e86320758ef..95bf8a362ee2 100644
--- a/x11-misc/copyq/Manifest
+++ b/x11-misc/copyq/Manifest
@@ -1,6 +1,8 @@
 AUX copyq-4.1.0-bash-completion.patch 562 BLAKE2B de24e0e04fe07335254d919a0bf8174b0eb69b4e984aa56823589773cabecc837c273789b22bba45725a4be735e79edc7648e6935660043025ae38751449debc SHA512 89bb0127031151ab6c841902deffe53ba838989163b70891806ab406ef8d5659ad82a9e3ba204d7b70a03330d29b7f7a1ca4661b26a0cb99995fbd8715c9b02d
 DIST copyq-3.13.0.tar.gz 2917941 BLAKE2B e8fc963e6a773ae70ca5a39f9ea55a98de5c5d129b845d0da9ed08ffec65d88ed8b5dd138dea11a33d563b899f0497929ed3c40d418574e50c2a1fbbd7b1a9f6 SHA512 898d4501002202849f0b5302d7315e8c539f8b0f8d5198641b3d3a647839581841e2ef1e2519c690d3cc95f85fdc921c979f2879348184de42767d31e081c307
 DIST copyq-4.1.0.tar.gz 2999036 BLAKE2B 1252a66a3bbde3d4435ced9934792ed97066229b23cd5ec21a6187d4f36718d46ac5e16ff19c45afee8715a32686bfe8e47af1bbb37d61a1cacb4e9395dc7bc9 SHA512 538be8b5b60dc054cb8220174461516a4d1e9d6f7c1a03406770f143b83f9a23875b0cf663406e16d83a762b6170587f0e44c386a7d9d552ec6f914b3673206d
+DIST copyq-5.0.0.tar.gz 3019807 BLAKE2B d39c02867ed4a23eeeec7283f0cbf02a77a3c3fc3ece0a7323d67de9d2b8f03749318d066c23221ccd393923217c7cf357657bdf70802087edae7f4128a63529 SHA512 b6ff28bd7529bf371c7f9d10372eeafd5f291fd1f6bbed5416938973db43e43f0113a8f6ba4619840a7edd95d26ccb9369f8a58d30b740944d3f8510482b1405
 EBUILD copyq-3.13.0.ebuild 1052 BLAKE2B dd57b2a42902f3f8320a14df65c153db481807cf938e17f922876464b39dc67b0ccfce67a15a3b62f201b80b4f89923de9ed57a06dd4085b991ecfba4ed0a1b0 SHA512 cedc36d6c41c9f6cacc970cdb84023deb125d8e27be00ca70f76d43ea32b4b71f7be2e46461886f89ee2de2437a8ccbe367cf618fa5bf06d548087b6a43b2310
 EBUILD copyq-4.1.0.ebuild 1171 BLAKE2B 051e8c39d2c53ba008b957bf9b970a15f1168f9351df033247566a1057073d062abeabf919e9a4f905e48ff6e36660f2aadc01526805f23bf81272648cbf3a19 SHA512 23ce5cfef4d7d09ef58ab66cb4619cd3f47b3ff72c88aa47b0de9d35d399985176b5e670e368e2e02f7fc5bfe39c85365a1127c6e1ebfaf984657931fd5edcc0
+EBUILD copyq-5.0.0.ebuild 1116 BLAKE2B 9b3ec608c4d55298f5c652fb178a6ea8e490e340be19bd54b5b2d159c2ef4885463b0f920b56b80c51d33d221d42d55c7996875c33083088c6bdf381fe82a6a4 SHA512 5d6c7ca5e4763ecb46c815d5306e7b9c2b8346c330c9f6d2441dd058c3661b77d697f4e09d5773669271a2926b4aad741793ef365a7b7654fb898af273d097b3
 MISC metadata.xml 465 BLAKE2B d260d3e829c7916619fb6cd5d4626421a71fc3bee933ac1ae565c0ef7404121bd715aa1030b43a21c1680659c3db13a9f49937d06e4452efd932274f47eec0b0 SHA512 a89ed269c2315e3c8d4c82096c26930933a01c987b936ef898f81418623750d929d59dd33b8c0d0edb9114c09c526fd60e1a9ef3fbd11ae743a0c3d9226971ca
diff --git a/x11-misc/copyq/copyq-5.0.0.ebuild b/x11-misc/copyq/copyq-5.0.0.ebuild
new file mode 100644
index 000000000000..a8356570fecc
--- /dev/null
+++ b/x11-misc/copyq/copyq-5.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Clipboard manager with advanced features"
+HOMEPAGE="https://github.com/hluk/CopyQ"
+SRC_URI="https://github.com/hluk/CopyQ/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CopyQ-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/wayland
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwayland:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	kde-frameworks/knotifications:5
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins"
+		-DWITH_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/fireflies/Manifest b/x11-misc/fireflies/Manifest
index 46e546874738..780a8c24eb81 100644
--- a/x11-misc/fireflies/Manifest
+++ b/x11-misc/fireflies/Manifest
@@ -1,3 +1,3 @@
 DIST fireflies-2.08.tar.gz 134204 BLAKE2B 785524100d16361885907ec932cbb710c694c86c6f9e75b4630d9c5bd65dc8fbe276c6ac31c4787438281900279cd13f8939a60120b08d1e400e8e508e622851 SHA512 bbcafc74de04265462a863e8f9a34707fe89cc773eac86ffea47939d1411da9ba17dc8a9f217aee414af5b95b7177ada119206376abf339e7629813095fb6aa7
-EBUILD fireflies-2.08-r1.ebuild 828 BLAKE2B 1db86301b08ba68717f37cb1dd3c93c4ea781e2e585fd55329a8e909f28b962b36cb8eb89d4af17c22bb710e7e5a2afcc588862a2605c1b4cb51ed0e83f78cf2 SHA512 3d3e294ae7484559974720dafa4b791427106afc7c205c1243613941e6d953761449e784bf98de5d9101a9c107fb524a7a785a9f4806f400837ea0f629933a9d
+EBUILD fireflies-2.08-r1.ebuild 845 BLAKE2B 0622f72a9dced6ed68700bac6205f1cbd8fe1a3a74bf679bea9d6feadb16afa1c530f6347ac1caff7edbd3904cf0d694451affdbefb5277dbd7a744c0281835b SHA512 aeb7e6ef10ea8c96c219d47b5f87ed23923269d65123d22a63872797b86e49924b03853730ae12238b4cd472ac6a0493ef25593d65dc10701b721d58ec018a7b
 MISC metadata.xml 392 BLAKE2B 9c0fdb048a54184faea2e91869052f35293db974002becc301a90fdb053e13c34e8d46a9abfc4aadffd3787fb3f9e4565d5ad4f35abcdc50bbe3d1c725e6cbaa SHA512 a1e4d97691ec2539e75ec6b8516d01e17830a05a310fdfa3ecfa6130a8044f718b0fc093a719ac7150fdb90a28999dc22793c5a3ee6662dd05c3f2e87a895aff
diff --git a/x11-misc/fireflies/fireflies-2.08-r1.ebuild b/x11-misc/fireflies/fireflies-2.08-r1.ebuild
index e317d91ac42e..74dcafcc87e4 100644
--- a/x11-misc/fireflies/fireflies-2.08-r1.ebuild
+++ b/x11-misc/fireflies/fireflies-2.08-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools multilib
+EAPI=8
+
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Fireflies screensaver: Wicked cool eye candy"
 HOMEPAGE="https://github.com/mpcomplete/fireflies"
@@ -11,29 +12,28 @@ SRC_URI="https://github.com/mpcomplete/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2 icu"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-RDEPEND="media-libs/libsdl[X,opengl,video]
+RDEPEND="
+	media-libs/libsdl[X,opengl,video]
 	virtual/glu
 	virtual/opengl
 	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf-archive"  # for AX_CXX_BOOL macro
-
-DOCS=( ChangeLog README.md TODO )
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/autoconf-archive"  # for AX_CXX_BOOL macro
 
 src_prepare() {
+	default
 	eautoreconf
 }
 
 src_configure() {
+	tc-export AR
 	econf \
-		--with-confdir=/usr/share/xscreensaver/config \
-		--with-bindir="/usr/$(get_libdir)/misc/xscreensaver"
+		--with-confdir="${EPREFIX}"/usr/share/xscreensaver/config \
+		--with-bindir="${EPREFIX}"/usr/$(get_libdir)/misc/xscreensaver
 }
 
 src_install() {
-	newbin {,${PN}-}add-xscreensaver
-
 	default
+	newbin {,${PN}-}add-xscreensaver
 }
diff --git a/x11-misc/fpm2/Manifest b/x11-misc/fpm2/Manifest
index 440d3bb57922..7d19414932a2 100644
--- a/x11-misc/fpm2/Manifest
+++ b/x11-misc/fpm2/Manifest
@@ -1,3 +1,3 @@
 DIST fpm2-0.90.tar.xz 212972 BLAKE2B 2608b40fd39db18407da5625f07534021dee72456fe168ffcb0c7b1f0a86fae0c69cdec5a9bfbfd09838622afcf575051326b9be5c47eb69e0b089abc205f99f SHA512 e02ebbc7af4202538b85394ef2e91d6fe7b11fbe6aaec5c5bd521d473b557db4ca8426810d1bef69967496071c936a789112307fbf028a8e3771d792c97495b6
 EBUILD fpm2-0.90.ebuild 619 BLAKE2B 227bd7b0270bc173a7fdeff7e0313398470d4c16808f3306eaf4403af0a8ed669c4f2cca1a881fe7773c24f9e5832cb1ba2b07711a403c9ff0be0c3b360991a7 SHA512 213afc4e9f64221a323d7c0f47f8246c7d75943dc7f76c94b3e43bd3a16e9f03e416bd24612d7f35cb04e6f52a0552402324f6834b44b9c46d739314d82cf46f
-MISC metadata.xml 246 BLAKE2B 9ee65595d2ce7d0c82f8bfa5110c981e55be2592e0ab8beb2abf163268dcbbe4ac2c1825bc1f3619c26fd447ef95a3153ce7ca7f627ca806030c217493fd51f0 SHA512 79818ad9d4436efa7bbeb3c302aee6b3c72ceadb118aab6d390fc4431110d2fdbc6cfe2d2c3c4e360688449279001e52acc9ace257b5ac401eb5c401e299bec1
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-misc/fpm2/metadata.xml b/x11-misc/fpm2/metadata.xml
index be2af7044308..115e9d64a669 100644
--- a/x11-misc/fpm2/metadata.xml
+++ b/x11-misc/fpm2/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/gtkdialog/Manifest b/x11-misc/gtkdialog/Manifest
index 13e5896af45e..cde7527f718f 100644
--- a/x11-misc/gtkdialog/Manifest
+++ b/x11-misc/gtkdialog/Manifest
@@ -1,6 +1,6 @@
 AUX gtkdialog-0.8.3-do_variables_count_widgets.patch 214 BLAKE2B 7e8975b55ac8432ceeaa412b01c2a8362c1394575aadeb471ad93f6bb91e185f412c94c4c1e4122055b939723fce15efc8353587f1adc5f01d746b9143f7a5ef SHA512 befcd5644d268b734a15e8ce0d58fc410d61fca9b825cd97f14ba5000355d81684f42d6bbb65cdc84ec7fa01c3112901adb0ffabd6af0df4875f2441aa0a7235
 AUX gtkdialog-0.8.3-fno-common.patch 1535 BLAKE2B 1a881d8827c0ac815791b5bd482d1160158bbbce8a2b5a57235e1ba3131d8cb4c591f10b67fff35c5f1a632f097fa751749702b32696f1b86469629a4b4238f4 SHA512 5812ee6272bc7ffa85ea506bce9b64451c5d9a716c87272b7c5e0c166b85ac7ba7f1a8cf9c687df194b20fe0db942084b2d199cbf51093b05d204c217ea6e65c
 DIST gtkdialog-0.8.3_p20200202.tar.xz 356312 BLAKE2B 77358e0b04ddb484e3e3a093084776a2c799fa52b90849bdde3bce56a7c042c2cbe28d699f0c4dcc14cc69872d496b89fc5c8aa7140669560e01448d9c57c15d SHA512 9120ac515eace168e4a3987b6cf3a1b3aa0e7617e837ade21d5ffea25cc3f3abbff598bb4c33914fb800416ea687f0ec7dea2b24c8acc0c71734aa6b2b385bfe
-EBUILD gtkdialog-0.8.3_p20200202.ebuild 1077 BLAKE2B 3c64c762e7b867c6db7a7931cd0aa8eecac5fba66399a65a18e53495c8895be41c469d630cb8af20613ed204958d3a702aa98082f8e1dec3e1f21de563e7025f SHA512 d2d088500fa2411fdb1da1859e7988c133562d97ad944a4f28c95e8bc274e3a8a1687c986a0c148dc34f8c411f115f06873371f31961a0546f7a42e72ad11ce5
+EBUILD gtkdialog-0.8.3_p20200202.ebuild 1091 BLAKE2B daa3e9693c6b587e23770bb0aa8941a0b8ef2ffd9471292ebbd23b78fa1e28c30bbf71503b575bc626b228adf6fe4b22a5bde8a1655b89e66127b3383abefff9 SHA512 643e33af0139deea897c46bfd31de93361838fa6c7b9d44d3a0c3ebb0758170ad5da9511652bc4f42ab95d7a9d21cc1b26ffe6a29fb87940e1bef6ab1cd2ec04
 EBUILD gtkdialog-99999.ebuild 984 BLAKE2B 45f10fc9970e14219e457385e8d8e3ba28c29647a243192b124b88960aabb76655f39a4153e63ae493ffc23a46a6f56bb586a25ff3327d5b8cde32b3a16d6b93 SHA512 6e20dd7ccc761df933f7573ad6c999f4adf97935edc2e6c44aeebfcb96a2d83bebb124f8cf91e1e80aa839c910d78e61135d0af768f1e9bf0839b15d18fcc5c5
 MISC metadata.xml 953 BLAKE2B c296cbd3e36df8e3bc980989caf5f8db22870d18f1dc601e45082b80fff5b25a502fa825b01cd8e9747b422899cd03ce008a3e28992439672dc078380dbf11b5 SHA512 42f793ecd670fbdf8dc78ce05ee110c8e35e01d02c88943c64f79484f4e82ac31a1bd14c129946ef35d84a1609bbfbffe927b14629ded01b3ae80a4ad7e52b04
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
index fa5542bd4063..98d5e081d8c8 100644
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
@@ -6,7 +6,7 @@ inherit autotools xdg-utils
 
 DESCRIPTION="A small utility for fast and easy GUI building"
 HOMEPAGE="https://github.com/oshazard/gtkdialog"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/kbdd/Manifest b/x11-misc/kbdd/Manifest
index de59853d2d24..2e5960fd312a 100644
--- a/x11-misc/kbdd/Manifest
+++ b/x11-misc/kbdd/Manifest
@@ -1,3 +1,4 @@
+AUX kbdd-0.7.1-AM_PROG_AR.patch 166 BLAKE2B e5d4af231166dee644e86890130233d186ec06e9a59047f9c203c1a639a642af31c9ad2c630153edc3cfa4e5c1a7ff0bd63ad3ca7412edbcbce4e248703f5ba1 SHA512 db5b4d0b5b2761f72e0ad54cce1b3cb6f61fc3a9dbc5f4115cb6fceb4069643c6c128a461140341a6eae78630473cd52683e04778f83f43d8a78fb0db2428431
 DIST kbdd-0.7.1.tar.gz 33445 BLAKE2B e976eff90174dee79e96b0419459f074dfc5009b7b5f9c30b32765cde439f3076b3d0657849ef7e02e018d9528f18426f5ae4772a6c3880e7042971ce699ed48 SHA512 12246e6a64d6d826afdc4bdb019bf30298fc71de534d8b06b5cefbdd027c4416e30b0991a136f3a7988b79cf0ad48e2c67a732ce7c5a6d6ce356f6f34348dc09
-EBUILD kbdd-0.7.1.ebuild 577 BLAKE2B 0a62e9cba8f88a12c9a21166037de0b19dd92872aa3d295f71fb9e41ca6bb68ede1401fd306c48d2969818cbb54c73dc86e96a8c5f2fc814993e7afcd1524500 SHA512 5c1f9b4d8d3b6a20d576d3c7c5a94d0678c5149a94b08e3131843cdaf1f24d3526fb63318f6d5f9f25f143e0538160b1c2448255d9911bd57e938717c51226c6
+EBUILD kbdd-0.7.1.ebuild 658 BLAKE2B d3bde4b3c6e6577de578e9dd2dd5d28dc3dacb9a4eaad6d0a4c3362fd3defd699cec037fee274cfb9a89239ea9783641e7ec38595c2ddac0cc8ea9d6a33cbc2c SHA512 49ea1c4f93231814c4fcf6bfb8e3de398cfebbd4c21f0eee33c607ce614f91fa0dbc46a8a0ea807936e4d36452ec1c04d8faaa1783f4d9464046e118c74617b4
 MISC metadata.xml 247 BLAKE2B f66b662a020369d9670edc7135fc95df66e9ac1186fa5a3b930de5a0ac59f47b5009e51e6b8d476f6aa4bb4296ad877720384d40912fddca47bcb3ac12bad553 SHA512 b40a7cfb7a140a4b068ee413113861cc8405ca0bb56b871f926aea22a5f25d660cb9e141de8ca0fb03e67ca18e85b03585a320994b7ca5de71df2abe5efd9d81
diff --git a/x11-misc/kbdd/files/kbdd-0.7.1-AM_PROG_AR.patch b/x11-misc/kbdd/files/kbdd-0.7.1-AM_PROG_AR.patch
new file mode 100644
index 000000000000..1715a7d2c6b7
--- /dev/null
+++ b/x11-misc/kbdd/files/kbdd-0.7.1-AM_PROG_AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,6 +12,7 @@
+ # Checks for programs.
+ AC_PROG_CC
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ #check for pkg-config
+ PKG_PROG_PKG_CONFIG
diff --git a/x11-misc/kbdd/kbdd-0.7.1.ebuild b/x11-misc/kbdd/kbdd-0.7.1.ebuild
index d6939d16bd4e..5914a9a50443 100644
--- a/x11-misc/kbdd/kbdd-0.7.1.ebuild
+++ b/x11-misc/kbdd/kbdd-0.7.1.ebuild
@@ -1,29 +1,33 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit autotools vcs-snapshot
 
 DESCRIPTION="Very simple layout switcher"
 HOMEPAGE="https://github.com/qnikst/kbdd"
-SRC_URI="https://github.com/qnikst/kbdd/tarball/v${PV} -> ${PN}-${PV}.tar.gz"
+SRC_URI="https://github.com/qnikst/kbdd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="dbus"
 
-DEPEND="dev-libs/glib:2=
-	x11-libs/libX11:0=
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/libX11
 	dbus? (
-		sys-apps/dbus:0=
-		>=dev-libs/dbus-glib-0.86:0=
-	)
-"
-RDEPEND="${DEPEND}"
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/glib-utils" #669674
+
+PATCHES=( "${FILESDIR}"/${P}-AM_PROG_AR.patch )
 
 src_prepare() {
+	default
 	eautoreconf
 }
 
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index 54190a5bd602..a79a6314bda6 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,3 +1,3 @@
 DIST obconf-2.0.4_p20150213.tar.gz 154638 BLAKE2B 9ff9d206b8f789d2c7bf68f6f959f34d19f368645bc4efb77b5a730a8f69db5309ddecc0afb09e7cd2f9cb2af4e705112f3365f43dfbe94c4ff523d8a7f0dff5 SHA512 987c97729b248e9d9fb4c82a131517ee8f31df5dd455b5b658730204c354bf17f7876c269c1d1ec6497ca360698a393c7275b9e7ada5b31abb75ed7b06092e30
 EBUILD obconf-2.0.4_p20150213.ebuild 983 BLAKE2B b8c9fd85a019c53ffee70bd7f871da3737d063d0cc538ac0b08f1dcf248769a5055e91c0fe374245082e3546db3931fb7a5e749d8a7ba6bd2b86d55e6e5c8c39 SHA512 b5a8209b8d2c0775afd116469d0bc8ab79c5e2d9c28d48def08527d14d0491a68c49c80ea9994fac76a3c23346072d9fe3b2f512f313acd7f965d71c07365e92
-MISC metadata.xml 246 BLAKE2B 9ee65595d2ce7d0c82f8bfa5110c981e55be2592e0ab8beb2abf163268dcbbe4ac2c1825bc1f3619c26fd447ef95a3153ce7ca7f627ca806030c217493fd51f0 SHA512 79818ad9d4436efa7bbeb3c302aee6b3c72ceadb118aab6d390fc4431110d2fdbc6cfe2d2c3c4e360688449279001e52acc9ace257b5ac401eb5c401e299bec1
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-misc/obconf/metadata.xml b/x11-misc/obconf/metadata.xml
index be2af7044308..115e9d64a669 100644
--- a/x11-misc/obconf/metadata.xml
+++ b/x11-misc/obconf/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/parcellite/Manifest b/x11-misc/parcellite/Manifest
index 034e483bbd29..fc11e6912a8a 100644
--- a/x11-misc/parcellite/Manifest
+++ b/x11-misc/parcellite/Manifest
@@ -1,3 +1,4 @@
+AUX parcellite-1.2.1-desktop-QA.patch 269 BLAKE2B 4b604faf75bff0b8c147d506bc7214c6408d2c1c5d0ae05e15ecaa2385387f7b9b4264ffab1dc3471a9c5a84aa39228f25aa24f9d379b7f7faa5b09539cfe88e SHA512 568371144b0693815a45f6e6541ae0e07b5f45171da3a736a2ac2bea97f53b74ebdbbdff1c691beb4634690f581098fb5a4ae04c5b2b798bf610e3cd3479e841
 DIST parcellite-1.2.1.tar.gz 763956 BLAKE2B 487029ed2d0492a1b8fe5e8093ab5b1d488db22798b18dab130da339353d6bf6e5525cd4d5fbdf68526946156d646dd2ce1095d07167785d3aa23d81a163b094 SHA512 14b513e760e205666e00893dffb75ef3d42994aaeca3238b5adbed4af7495a7ed67cfabdcb163024fb9b0a7e832599bb31c54201217ac3fca88e0a4a22deb53d
-EBUILD parcellite-1.2.1.ebuild 917 BLAKE2B 0ad8e9f22bcb9b756dea536d4ef7f01e8f83315d8371319195793bed70f4600f5e247923bb7159cfa7fb89aa4eb9d22b7e316fa213fb5432b7dd5e6afe32f524 SHA512 758ab9d185efa59da38cbab49e3429d9d7c6f0adf3c45caf5b5f86f0f3385accc0c9e61fc93a414ca3761b68454f70af5eb29f8e32743b52aa984b2901ff0f80
+EBUILD parcellite-1.2.1.ebuild 698 BLAKE2B 6f664565c2ed5a49dac7e57ca0bc2b149a984b75a469059ad269f7a3d699e6299f91f0fb10f559af0d95dd8353e20f98bac69c152732377698a343b69989197c SHA512 d287e7710568a208d430c3d86ccc12d2314ca0951b58149ecadb0393b98ef8cb97adc855bce21dbf364490667449c21cd2e5657669aa7fd93b8252e7d92bda84
 MISC metadata.xml 357 BLAKE2B 94e74447b29de7114907b5e280b2e8d053036c3eafd692702219130dbcdc00edbb242eed3a381e07664e3bc8f6b85e87cc680d6525ae52b693427c6650bca2e9 SHA512 69accda4bd379c4c67616ed5cf40eb2fe2ecbfb722894312d2a51c09040f123ad8b775cc3b6d18537b5fae75baff96069e1b6eeba732c45e41686797d70eaf47
diff --git a/x11-misc/parcellite/files/parcellite-1.2.1-desktop-QA.patch b/x11-misc/parcellite/files/parcellite-1.2.1-desktop-QA.patch
new file mode 100644
index 000000000000..1590a76505bf
--- /dev/null
+++ b/x11-misc/parcellite/files/parcellite-1.2.1-desktop-QA.patch
@@ -0,0 +1,9 @@
+--- a/data/parcellite.desktop.in
++++ b/data/parcellite.desktop.in
+@@ -6,5 +6,5 @@
+ Exec=parcellite
+ Terminal=false
+ Type=Application
+-Categories=GTK;GNOME;Application;Utility;
++Categories=GTK;GNOME;Utility;
+ OnlyShowIn=GNOME;KDE;LXDE;MATE;Razor;ROX;TDE;Unity;XFCE;Old;
diff --git a/x11-misc/parcellite/parcellite-1.2.1.ebuild b/x11-misc/parcellite/parcellite-1.2.1.ebuild
index b89ab441c540..d9bab58ad41d 100644
--- a/x11-misc/parcellite/parcellite-1.2.1.ebuild
+++ b/x11-misc/parcellite/parcellite-1.2.1.ebuild
@@ -1,51 +1,41 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit autotools eutils xdg-utils
+inherit autotools xdg
 
 MY_P=${PN}-${PV/_}
 
 DESCRIPTION="A lightweight GTK+ based clipboard manager"
 HOMEPAGE="http://parcellite.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
 
-RDEPEND=">=dev-libs/glib-2.14
-	>=x11-libs/gtk+-2.10:2
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
 	x11-misc/xdotool"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? (
 		dev-util/intltool
 		sys-devel/gettext
 	)"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${P}-desktop-QA.patch )
 
 src_prepare() {
-	sed -i data/${PN}.desktop.in -e 's:Application;::g' || die
-
-	sed -i -e '/^ALL_LINGUAS=/d' configure.ac || die
-	strip-linguas -i po/
-	export ALL_LINGUAS="${LINGUAS}"
-
+	default
 	eautoreconf
 }
 
 src_configure() {
 	econf $(use_enable nls)
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index fc9e90b83143..e2a3c185541b 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -1,6 +1,6 @@
 DIST picom-8.2.tar.gz 242653 BLAKE2B 1c76ad4b3152d47155f957f8f1e75447ec8e30d05bc5fb9bf09c890552168cc3c607c8980b262b18cd5f3dc2654a3416cad20cb7fe829eaef8380783d1847c82 SHA512 bdc6675e73a211075ee0df2b056342cabb19ad27fd73586f5216886f503cd994536845eb866f371e07a8dc0404346c67b899a14830e9b7cbc9c01cbd782f36b1
 DIST picom-8.tar.gz 242059 BLAKE2B cfeec7f40eaa43c115bd326abeaa547553f7bdd22a2e6b2a96f46d87c164b0e9403a876f069077e3b85d11af685aadb0cff2a4e7df2cf87646f2552f9c1a01df SHA512 154dd42dea16aca463e7d7f9913a8f10740df892bfdda2fee210a94b13c8eaf6201b35e505daf45075fdb1980bb9b85adf170b649702c1b1e2fcdc1d88406b4a
 EBUILD picom-8-r1.ebuild 1526 BLAKE2B b016d3cbaa1b37d83866fc56923fe5d5d0c9d98f84b7ffaf61420cc929b902f2ff19c33f4a4f9b5220451c4124feca2e31aa53e48c9689510a1a92a12f6cfe25 SHA512 965f59726b168898fef69380c6d397632f19a9fcd7fb9b6458af815270700edd709ed845a37d59cf2b8329a6ccefd113516a03c2a57042b421c7b2c635f295ad
-EBUILD picom-8.2-r2.ebuild 1566 BLAKE2B b670c66324ebd845705367e77df8a7a5eb118e9fad48d07c61b9f7f7a71ac7daa879d221bc4c687f3b7a8070cdd919b45213f1e005bf7ad6880e5cd409e22180 SHA512 a399373fb4257f5ccae6aa71c2cf53669859081ba12a59f3337d67fc613215a9eed44049b3a499853c94ce61fadda06aea59b60b9dcc3bae59fe25fc641188f9
+EBUILD picom-8.2-r2.ebuild 1571 BLAKE2B 1a34b3747029521a437961651515852a0848e7b2eae64fedad08e33c08ae88c00c9165b500b5add7893a7b7fc430ccde5374b26130d716c38a1ce79677f4dd55 SHA512 9a705ae1291d4db41373465f3462badff819c1412f172d36b3ea10fdb3bb0c3f2851b027bcc3be187ce9fd5bc5e53b603e5fc0077816cdee62242433d4b036af
 EBUILD picom-9999.ebuild 1516 BLAKE2B 35d49008bffd1956f30f1038a23f4a34b242e5690fb84013ee2b968265b07522221720093a1b43eb01dbcdd6467bdc8cfb2ab66178b8b3d3f78072b2b4b1e69e SHA512 f51ef9e05acfd8d6e1dee42eccd6b029edc076395db79cf1e8235a696c856d322d53267d0dc68b5ccfe0ae2a8a1496409182a8c710acd8b3f048e6048f63c937
 MISC metadata.xml 678 BLAKE2B a2e430318134d3080d018d14913dce148151db13f6e59ed2c8b3c4b10c07e0fc16c2b7e9fbd95c0e849739753b1b3572c1d96418fd19955b2c6def2c655444da SHA512 7a172584db948430c11f8b682a918bb0d49d454ab835592047aafa9cf06f418fe0e3bfb2704f6a5ba45998a64096085dc23a2c0379c6f582a63d36f9ebb8e1b7
diff --git a/x11-misc/picom/picom-8.2-r2.ebuild b/x11-misc/picom/picom-8.2-r2.ebuild
index dbceb7f81df7..8c0a8512f14d 100644
--- a/x11-misc/picom/picom-8.2-r2.ebuild
+++ b/x11-misc/picom/picom-8.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit meson python-any-r1 virtualx xdg
 
 DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 IUSE="+config-file dbus +doc +drm opengl pcre test"
 
 REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 41da33003d5a..0bc95e25d9fa 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -4,4 +4,4 @@ DIST polybar-3.5.7.tar.gz 283520 BLAKE2B 3f7cad2886c0f8352b92e636035607b2abab6da
 DIST xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz 84121 BLAKE2B dea2384773803bbc5de2ec971ed0cf769b0af8b987bbcf918718647e4787b4713af54a358c029e9603c28c5424488731f76ecc430b6b124bcd9255aef893431f SHA512 646e159d47d6dac8f08a27a1cb54e2ef48e42cff952b55b3906c2021c424e015c070a31a7a1e70b62e0edc7a8b42b935a23b9a922eaab138d3f6929bc1fdb8d4
 EBUILD polybar-3.5.6.ebuild 1903 BLAKE2B a6256133894fe5e4d8ec5d66c47411376246b65406d5260a6973c5a2d7fc198319e54d767846a96b238feaba64de877013eb44acb86cf0d3688f72bfd317686e SHA512 1e772151348fb9029517f184f30adcbcc1700b1a7176b487b368ceb7dd61e224dd82842af20f7beba471ffabc053d8cdd87be3fe8ea4b2d3dfef5a687d9a79a2
 EBUILD polybar-3.5.7.ebuild 1905 BLAKE2B 266253f3680f8c2160c2681826b005af9433e2af5a8d9e3ba51b8dfe0a00c3c686568d3ba6751c74de09bedb13c46683a14e088b687ab02f319674fed2c073e8 SHA512 00fa80d9e76738de1a10d2a5e290d74129e8626df9eda2dc909c690c7d7ff0daabcdc644673309309eb7c241643937f5823fb036e7256c9569e398685c2b4276
-MISC metadata.xml 691 BLAKE2B f5d1616119bcd28233990ef0d5ca6414835db0389629a9beb7b63f1e3475b946a162ad12d34f615fe69c52cbda1cc297f1b875064723c3f1006e9b6336e6666b SHA512 0301d41560a3ae53076a99235dfdd0acc297ce40e77c227148db37dd531a0bd30a6986b0a98d86d2bfdefb9a086544bb8bc725a6601966b0f8cbeb4da2fad282
+MISC metadata.xml 585 BLAKE2B c792f265587effc07acc20f097adc1a1975d23ddf55ceb07b4bda02e61e1b48b1d20c5a07792ac18fa5f02949e0a88bc18fe6df2fffd9454406cda34ac33654b SHA512 c3f9080f68d989dbfd75492ec0c4870e4df9b0525a69256ac95bf55eea60022ac018cc1afe42677bc8f822beec75d137e1e7c8a876763c72664541a0a54b28f1
diff --git a/x11-misc/polybar/metadata.xml b/x11-misc/polybar/metadata.xml
index 5b53dd629344..f53f395dde65 100644
--- a/x11-misc/polybar/metadata.xml
+++ b/x11-misc/polybar/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>ajak@gentoo.org</email>
 		<name>John Helmert III</name>
 	</maintainer>
diff --git a/x11-misc/projecteur/Manifest b/x11-misc/projecteur/Manifest
index d1309ba09de0..2bf22025741f 100644
--- a/x11-misc/projecteur/Manifest
+++ b/x11-misc/projecteur/Manifest
@@ -1,4 +1,6 @@
 AUX projecteur-0.9.1-dont-compress-manpage.patch 1117 BLAKE2B b75c1510f0c6561f935a7e7dba5a200f1b0a9cd0be892818ef1e5251b3d9ad6ac3e95200d90c2de6cf9ff38e61fe546560c3c2118eeb20e45a963b3fbfa4d2ff SHA512 ff3734d495ad94e0ed527cb2efc5d4627f45947ec9b75a960564b99ef6114ecd7efc260d1b1293db5d4835a8dc1450f322d8a6e3d1548e850d888d692580e425
 DIST projecteur-0.9.1.tar.gz 392308 BLAKE2B 31ec19b81b9f3cf8c60712a52d3cf4dd96a215115d2fffc437892f276b9f1e6a58cf0c2165226166f0c2067f6ab2180829c8bc8204dbe368facbeef398da837f SHA512 28e0030a481dd2adb9eaba54066f060b61f7e4477918f46e25fad1e1a1c841dd5500c24779d66d3fab643e5aa39f92b0dd0c2fd7a0b80b8de8f258ae7572ed36
+DIST projecteur-0.9.2.tar.gz 394033 BLAKE2B 576a16853cdb2ae4614b83946caf85636f364c268320bcd99cdd9312ac1e76fb663f2e6c7cede4202df581770b4640444283eb55747735ab1bbb125d5bb9c6c1 SHA512 75c7e30b9ef72b4c1fc5e1a8e42c1668ccf2698677c1617cea080c7f5db722098635098304a7557f93f1a14143f8f2f089e8aed9265d44b2cfcd82974363baac
 EBUILD projecteur-0.9.1.ebuild 1004 BLAKE2B 47138e26b5b730289878381fb101c92c5110cc6c2b76daaadec30eeb7f686bf4c02b823ff20ef7f6bea117837a12b458063dea27d3da912a22412c93a5381fc0 SHA512 0accd0ed067e4eddfd48c562251883c1779c69e2e7c6673f5ea1719e07a5808306866e953f6f111462f6b25b629032b7c462615152bb723f89d6f77783ef866d
+EBUILD projecteur-0.9.2.ebuild 1006 BLAKE2B 16654ae21dbfe9c1bdd689b8ed912860499520edd05433b976e187f8926209852df98ffb20bc2d3d07740adea0e453df67c30b2bc16c2e32cfe1f6335424fb6b SHA512 aea3af93e03cd78a7d000a529a00e30fa9d2ab4aaec0e88257f8024720ee52c84e48dc062f971199c1e7d2f05516d461104f4d44f33061a8f83d8af3944a0a71
 MISC metadata.xml 613 BLAKE2B 20b189f745ba58949951ba9011e77ef1be5910caf7ac9e3797ec4002ef213327b2135a976eb8aa731bde535ff0fc5c44119fe3953712ac333735b8280e5b607d SHA512 956a65649dc36c2aadbf372f88546d78dca360fea24b0d37b6eb04080a8ff91b02c04885abd4c576913769bde1c792bf9d1cf7f8a83eb54da240d7dbf29af3bd
diff --git a/x11-misc/projecteur/projecteur-0.9.2.ebuild b/x11-misc/projecteur/projecteur-0.9.2.ebuild
new file mode 100644
index 000000000000..cab723fe1e8c
--- /dev/null
+++ b/x11-misc/projecteur/projecteur-0.9.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN/p/P}"
+
+inherit cmake udev xdg-utils
+
+DESCRIPTION="Linux Desktop Application for the Logitech Spotlight device"
+HOMEPAGE="https://github.com/jahnf/Projecteur"
+SRC_URI="https://github.com/jahnf/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	|| (
+		dev-qt/qtgui:5[X(-)]
+		dev-qt/qtgui:5[xcb(-)]
+	)
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	virtual/udev
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-0.9.1-dont-compress-manpage.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Don't treat all warnings as errors
+	sed -e '/add_compile_options/d' -i CMakeLists.txt || die
+}
+
+pkg_postinst() {
+	udev_reload
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	udev_reload
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/read-edid/Manifest b/x11-misc/read-edid/Manifest
index 9424a1a91362..05668d38b217 100644
--- a/x11-misc/read-edid/Manifest
+++ b/x11-misc/read-edid/Manifest
@@ -1,3 +1,3 @@
 DIST read-edid-3.0.2.tar.gz 17508 BLAKE2B bd27f01fba0b9bf5ca5e5d8d4af422cc14120ce280ec1abe047f31e11f85fbe1b8a8e729b97ef2272e2ab3354871175e91bc11f8c15b2aec0cd10d37aceba392 SHA512 779ebe7f1ffb6e7952762b5f886e07974f2c0fe5fa9be0722b928559466b56aae450f741817bb91bb2e33ca66ab27af39cea3c7af220c99b85dae81734138aac
-EBUILD read-edid-3.0.2-r1.ebuild 1016 BLAKE2B 3c1d26ff0c431df955817a45ba80db976611e5a397a72837937b3969da8d1f0c82fba2ccec985b9d0e159412c956fba0885caea1f6c18174dab8cd5c6f27dc1f SHA512 c45105555bf17975a9ce7bf1be37a4599e271c295bf1cc108f598ed34014993707cafaad472908f4f9e5968098190052c8bebe3fc0d8424e660ca0e96e36cb9c
+EBUILD read-edid-3.0.2-r1.ebuild 1023 BLAKE2B ba9aa13e47eaafcb89d4b2b50bd5ac66878afa9faa36985f8cef57c40ccb2cf47df6bd4435a87926eea123f397fb388e1f22d86c20b242443d7c487cfbd4b5f6 SHA512 dbd15be9bcea17fae6a809511f819ce6240e84ddea91ced61616e7b4b0e04f1403c78bf9ab3d25aefe1aa27f8cf7f46a6ddce43bb2c41f1ca9e963724010017b
 MISC metadata.xml 393 BLAKE2B 35b1d645c4d9e52bc475bfb14846b3e4fd854f8e39ae4d8f8277e4741327425496b9eb5e885fbd43b3c1a9456c838dece040605f69c21b0764622819e49edd2b SHA512 f07be82fafe3ef79faf4fdb22fd0a03b6b6ed367735884fa5f6adba11cee2915a28c40be85cf2fd7d1908ab525bcce4e6b06a1cc45a2e9c6f903e145b9759450
diff --git a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
index 66c7ab83c0b2..31cb28351002 100644
--- a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
+++ b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~riscv ~sparc x86"
 IUSE="vbe-mode"
 
 DEPEND="vbe-mode? ( >=dev-libs/libx86-1.1 )"
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index fba0062336f4..b0d3270eb1fe 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,5 +1,5 @@
 DIST redshift-1.12.tar.gz 659019 BLAKE2B 09339a57fee192e3428ba4387cbea498f2f9f97eb75a418588cdda3289cfa7b7fada4cb299e983e9e6d2ffe3822c8235082e67bdfa542716b6dee9fc853a8dc1 SHA512 6763f6964b577fc146191af1c67a283a60df5bbdd3a74bfc94f66d5f9f3bef8835a479c6ec8a648b650b83a0e245928884a0f628606ace8c3f58d8319d35036f
 EBUILD redshift-1.12-r3.ebuild 1955 BLAKE2B 9d6cbed8b116f5173c284fa6a58bb616ff00ac9af35c15945bf0615b2aeb90ee8084bb240e6a9ebe8c5cb79f846c58aeae35ed86cfd9bc7a3130f6ff3a437a9c SHA512 01007093bc7e4a841bb3eb66975c51d6f4e2a1b5ad664acf1885d26aa4914d8d4633f10e2d8cb051b1ebd07add545db4fa817d409b6761b6903d7c87af43f487
 EBUILD redshift-1.12-r4.ebuild 2032 BLAKE2B 6b3d47a74a0a93c8086b1db87a561467bcd238dd7af2e5551ce1576fb9e8758966694584590211ac377051b6b64c21f3221996a880902553b81cb7b3fa51c0d6 SHA512 b63ea2755fed84e4d5612ba13a36812e4b13b313cffbfa4a023a90158a9c6a04f009c0d70804380481b1fce805ce9809fc0a809f24fcff90245e6bd6de3f2d51
-EBUILD redshift-1.12-r5.ebuild 2117 BLAKE2B 0069596b439d23a6dd5a8a560b0c1097d8a156b4e5bbbaeeab71cb3280c5faf61b328b1e7aed8550fb2be8aef84050b531e6104029dfb4a61fbaa1560bbe4861 SHA512 3952dcf3f122b68843e4814dba639acb3c145ef0be2dca333edcdaac7c672eddd1acc716c4a91a6507c3615af560ec31e1624d2f075c753b13a96be8506a1231
+EBUILD redshift-1.12-r5.ebuild 2123 BLAKE2B 09c770afe6ac3b202ebd1b322a312bac23c7937953bd3ce2cd5df0c8ac132da4c44c433d605efc6869bc971e31ec5315a138fcec205c68cd87e50613c8b20310 SHA512 b46cda00f2687e022e9b0b6f931ed4c4110028838ee9904deec739a261d3a37a175a56066c5bb6950ee187620d94bdbbd7faaa91969dc5b935987576856d848d
 MISC metadata.xml 522 BLAKE2B db9be8da0b96a5f7d742baadda739df011a5f055a944d41b67b3ba3137b7e92acead9b0afd72410a4c4f203fedf300f49a052c809577351b3b107f447dbf4c6b SHA512 c5732a20ce965daea3c663ba00d2fd9ea484cade35c22011a9e4f051ce202a0da560c428c8775b5eefaa726c92f6f31014cc47780b4ba329db81c1dd7defbbbc
diff --git a/x11-misc/redshift/redshift-1.12-r5.ebuild b/x11-misc/redshift/redshift-1.12-r5.ebuild
index edd82c298964..9c1e4b29422b 100644
--- a/x11-misc/redshift/redshift-1.12-r5.ebuild
+++ b/x11-misc/redshift/redshift-1.12-r5.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{7,8,9} )
+
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit flag-o-matic systemd autotools gnome2-utils python-r1
 
@@ -12,7 +13,7 @@ SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="appindicator geoclue gtk nls"
 
 COMMON_DEPEND=">=x11-libs/libX11-1.4
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
index e0e63db100f1..cb3beba56498 100644
--- a/x11-misc/revelation/Manifest
+++ b/x11-misc/revelation/Manifest
@@ -1,3 +1,3 @@
 DIST revelation-0.5.4.tar.xz 282600 BLAKE2B 519b01252b82acf0e927a9d19783792f83822cc1f1a4c3be4af3678d5446f8012d993e12397f44aae616aca88257970de7391a1269e24cc1ebc08275d0c962ed SHA512 bd536f6c03e443d91a20606765b661dc54f3e4c1f45d060d3829a894a31e553a61785bb31d7508267abd66e057fc1d93f1716ed1b553566d92a2580ad696606f
-EBUILD revelation-0.5.4-r1.ebuild 1166 BLAKE2B 9e8f83a6f6b4b8a60a1ea22cdb7eb53b579c71bd3d8ecb66649d6879ef06f799a91bb1f8b0240326bc8dea0debfbb5f6b8ceb01a184a88d9597272f429ee1139 SHA512 7379d19e249bf98f024987a791906f3c55d3c58a1d8981f1f134c23c9caa1f3c392b8205baa04fb091624b86a9b4c0286163ed0be90ec86caf39ed0fc8d1b0cd
+EBUILD revelation-0.5.4-r1.ebuild 1171 BLAKE2B b8ded17b2056a1108636bc83b14385864b906b249e9e50c22c6aaa4eba989fb95a50cf9589a97fad68a004ed9932b415227197e2ac25ff3602eb6cbacd52bb2c SHA512 7fc74966a8a8b6aa84c849f158ade16daaf44a566a63ae49c556d011e34caab4c32a273b08cc3c5861e1fb53b42a90e223fe80b8c190e8cb56240de21626f89f
 MISC metadata.xml 413 BLAKE2B cf3df69453155e356f6f30026a06610f4cd5639d8de0ae4842b82442234c235b3c8933bf6943193674b0f7ca894f00b8aebceb2de65f11186ea0c66c42e6bab9 SHA512 e00344899c210aa59b4ac218773745d418730c934784cf4cef0a71511bd7ca4888a9591ef0fcf4603579b189cb78ef2f8b7654c53c8839f75ce6d400bfc3d408
diff --git a/x11-misc/revelation/revelation-0.5.4-r1.ebuild b/x11-misc/revelation/revelation-0.5.4-r1.ebuild
index e7a9a4ea2c77..61972b294f01 100644
--- a/x11-misc/revelation/revelation-0.5.4-r1.ebuild
+++ b/x11-misc/revelation/revelation-0.5.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit gnome2-utils python-single-r1 meson xdg
 
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 559236522a9f..ffc6010cfed4 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -2,6 +2,8 @@ AUX rofi-0.15.12-Werror.patch 437 BLAKE2B 6f230755bb2bcf5c91c354d4d2afec1c9e78a3
 AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9374fe412a97ff6b82b545ec4f050e087b8982b4e16ebf9553c71e5b6c145e8a3b8b469b1b107def04f443c01c57efe9e947 SHA512 75431eac4c6eac56716a6e2ec0ca4f5fd88aa38761b758b58c5f8c3f3fd6eb4a111af9c74b2d7c14fc3e66cbc7f361b2b3bc8658cfb31fb827e01cf19a58df67
 AUX rofi-1.6.1-autoconf-2.70.patch 916 BLAKE2B 21aba99a26a32e5b563e46d9d2ce6b2dafc2d107cfc78ed2702b7ec03e5928557f4c5bae12c8dd5ffd5b2b0a076858e201cf547ea7695842efc9bbc5446a0d97 SHA512 7f7cacd287137524f356e649e80fbfa077deef8cd864991d5d4631cfb8c9b883b33a9cc09ce50709a83a33dd7744d41a11f0f2ca3c48d188463b310425f17e88
 DIST rofi-1.6.1.tar.gz 569262 BLAKE2B 938b45f8326b5a28e349ac9f7028c476274faa4f932a773acc350d5e1dc8d5c05c7cfb7ec10f1ab5d8c83590074424c3379768671d37ee799d78e508b8c4a4cb SHA512 b54e75818a98fa9262a3016260051837de189d49beff4f4a158cb2e7f41438641377e11d75c164f423e6a86d8b8fca3b76e2630611678525465d06c21b393f60
-EBUILD rofi-1.6.1.ebuild 1220 BLAKE2B 19ef083739612c9b4ad1e018c447f6e21131a74a278473d584523d9f2fdafa612b2e8b033126f2385d9d4166ad68b895b784919f10df49094cad83350d2f6437 SHA512 43401b44db501d72e76a5ae39bab30996dc5b4703d8286a3151e8e1781efd78b0a33785973b4e159d7f2e433dfadf68e099a6875da0adc22cb888186372e32c6
-EBUILD rofi-99999.ebuild 1042 BLAKE2B 0c684ffbeef5366d83b4689a2e8ab9f27072e82d936985fe1a7d128a65cc8b3edcf6a42b09e85866496b280143af8d5f4ece9d8db452bdf1eae020a93302d10c SHA512 1a08b9ded70d742ef6fe5c9250291a6ff74b1efcb767594c4546bb5f7217d1c50cc04d259a55834b12d3c91b3262d82edfcd5c2ffb5ded4ac8718e54a3ea27a1
-MISC metadata.xml 373 BLAKE2B b7c92350ddd79f73e25f619f77ddcaf93b18e65cf129f95804c8560afefcfd0edf379fba697ea18a41bb159d656e330d84605454522f27e910fb3af0765a3bdc SHA512 3e5b29269fb95b948f0401f5bef699b4dcafcc3d43312e5ecdcf57d977292ffa9c804159a6ad7f46e69ffadc21d2d51d7723fd5e5ed2dbdcb15cb2c7391728ed
+DIST rofi-1.7.0.tar.gz 902294 BLAKE2B 281f48702650f65e4b037fdbbe6861e173dd3465cf6a80a1d2038271511a9f85ebdb19d8e7a1854f82d52172bbfea6eb1b1685228fc4ff874773033406c9267b SHA512 84a42ecf519c7eed8093c4af3b66731b890939a2bf2a63290e599103705f6bacaba59ade1b8a1bc854f6b767e8d44ee42c20e44f63886bcacbfdbe0468d350b4
+EBUILD rofi-1.6.1-r1.ebuild 1247 BLAKE2B d92fbb93dad604d5dbe58a90c1c63825952246d5581478578c056f82372d84ab5cd26fe4954601383193714cacafbed45371f913f4a311676e12069e68349324 SHA512 3b1bb1ac88c01a84841a3266fe86aa7c22101c85ef022356768eb04c49740b63b1469c83080dee49cda61260b18e16e24acbdb51f8c37dafbab1d020bc60bbe0
+EBUILD rofi-1.7.0-r1.ebuild 1590 BLAKE2B 9f8fce1d0fedea2eb2b2c3880a01a6bf655d6c2b33d60a2d63cbdf07cc635a09526e92d0cfbc3d18abdf2993b4cc7569c8c94ced76f9b51ae6a1577306cd2945 SHA512 48fece0953f6d794b032d619b12fc0b6d134b236023d8b1699e4399a67e11cfba156bc86c5fbea4a2b94ec154a9a91d86f68f9ecfc812e0b293ac729f029e86d
+EBUILD rofi-99999.ebuild 1055 BLAKE2B 1ce7aba0e86b1087bc207613e258bf8e9191312a51c097b4b473f10f2d1f1fc0789c6a847e28dbe750c390c4a9e01e24da0b91a34eba0107e76b2965aa57a566 SHA512 2091ea3513e3f0c601964dc1b5ecb7e5151735bc1771dd2fb2d2caee9c186f21e94ece539e2431efd631a215ace11ab63bae38fd34bf9da04d6fd60be9a29705
+MISC metadata.xml 719 BLAKE2B da98cdb710b9c17250168d4875247f27c030011d1197ceeb762530ff89ff6a5f269e4a2f24d8299530bff9b827da9d4c8566f5e97f3d16256d598bdcf460ce35 SHA512 af7a2aa04205a39bf77fe19995fbfd414d50aff50d015d2a3674cf9a4ec9e2ef48994b5a521404af90af9dc95a4c8a64a24be95b9fd5a9d1d2fea3b94cb5fad1
diff --git a/x11-misc/rofi/metadata.xml b/x11-misc/rofi/metadata.xml
index 87511edddce1..040d877273ac 100644
--- a/x11-misc/rofi/metadata.xml
+++ b/x11-misc/rofi/metadata.xml
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-<use>
-<flag name="drun">Enable desktop file run dialog</flag>
-<flag name="windowmode">Enable normal window mode</flag>
-</use>
-<upstream>
-<remote-id type="github">DaveDavenport/rofi</remote-id>
-</upstream>
+	<maintainer type="person" proxied="yes">
+		<email>petrus.zy.07@gmail.com</email>
+		<name>Petrus Zhao</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="drun">Enable desktop file run dialog</flag>
+		<flag name="windowmode">Enable normal window mode</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">DaveDavenport/rofi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/rofi/rofi-1.6.1-r1.ebuild b/x11-misc/rofi/rofi-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..e654777a5b58
--- /dev/null
+++ b/x11-misc/rofi/rofi-1.6.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://github.com/davatorium/rofi"
+SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="+drun test +windowmode"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/librsvg:2
+	media-libs/freetype
+	virtual/jpeg
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libxcb
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	x11-misc/xkeyboard-config
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	test? ( >=dev-libs/check-0.11 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
+	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
+	"${FILESDIR}"/${PN}-1.6.1-autoconf-2.70.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	local myeconfargs=(
+		$(use_enable drun)
+		$(use_enable test check)
+		$(use_enable windowmode)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/x11-misc/rofi/rofi-1.6.1.ebuild b/x11-misc/rofi/rofi-1.6.1.ebuild
deleted file mode 100644
index c919a190ff0f..000000000000
--- a/x11-misc/rofi/rofi-1.6.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A window switcher, run dialog and dmenu replacement"
-HOMEPAGE="https://github.com/davatorium/rofi"
-SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+drun test +windowmode"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	dev-libs/glib:2
-	gnome-base/librsvg:2
-	media-libs/freetype
-	virtual/jpeg
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libxcb
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	test? ( >=dev-libs/check-0.11 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
-	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
-	"${FILESDIR}"/${PN}-1.6.1-autoconf-2.70.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-
-	local myeconfargs=(
-		$(use_enable drun)
-		$(use_enable test check)
-		$(use_enable windowmode)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/x11-misc/rofi/rofi-1.7.0-r1.ebuild b/x11-misc/rofi/rofi-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..813b6e07de00
--- /dev/null
+++ b/x11-misc/rofi/rofi-1.7.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://github.com/davatorium/rofi"
+SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+drun test +windowmode"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/librsvg:2
+	media-libs/freetype
+	virtual/jpeg
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libxcb
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	x11-misc/xkeyboard-config
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	test? ( >=dev-libs/check-0.11 )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	local myeconfargs=(
+		$(use_enable drun)
+		$(use_enable test check)
+		$(use_enable windowmode)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 1.7.0; then
+			elog "Rofi 1.7.0 removed the (deprecated) xresources based configuration setup."
+			elog "If you are still using old configuration setup, please convert it to new format manually."
+			elog "The new format configuration can be generated by 'rofi -dump-config > ~/.config/rofi/config.rasi'."
+			elog "For more information, please see https://github.com/davatorium/rofi/releases/tag/1.7.0"
+		fi
+	done
+}
diff --git a/x11-misc/rofi/rofi-99999.ebuild b/x11-misc/rofi/rofi-99999.ebuild
index 81f8f9cf847d..080d70670508 100644
--- a/x11-misc/rofi/rofi-99999.ebuild
+++ b/x11-misc/rofi/rofi-99999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools git-r3 toolchain-funcs
 
 DESCRIPTION="A window switcher, run dialog and dmenu replacement"
@@ -11,13 +12,15 @@ EGIT_REPO_URI="https://github.com/davatorium/rofi"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="test windowmode"
+IUSE="+drun test +windowmode"
 RESTRICT="!test? ( test )"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	dev-libs/glib:2
 	gnome-base/librsvg:2
 	media-libs/freetype
+	virtual/jpeg
 	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libXft
 	x11-libs/libXinerama
@@ -28,28 +31,26 @@ RDEPEND="
 	x11-libs/xcb-util
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
+	x11-misc/xkeyboard-config
 "
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto
 	test? ( >=dev-libs/check-0.11 )
 "
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
-	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
-)
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
 src_configure() {
 	tc-export CC
 
-	econf \
-		$(use_enable test check) \
+	local myeconfargs=(
+		$(use_enable drun)
+		$(use_enable test check)
 		$(use_enable windowmode)
+	)
+	econf "${myeconfargs[@]}"
 }
diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index bc11a97bd182..54ea85ff154d 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -5,6 +5,6 @@ DIST safeeyes-2.1.3.tar.gz 354494 BLAKE2B 5f7977a8de280f5022cb226689c5b1d48f4949
 EBUILD safeeyes-2.0.9-r2.ebuild 1061 BLAKE2B f1f2da8fd981b9bae189691a6f3da6313c2b70138f3282cc536e20e0e30d9953236b81a65d8fe0f823129c1a4306673b530571da5a7c3959387bf9983335c2b2 SHA512 e9e1d7fdb90c1be5640bfa0457dcab4fdf8069198d76c9d66ea3011004b7b9963023a9b4730d8cf96dd6b0b5bcecfac78cdd003b64a37446c6dd69207c484a08
 EBUILD safeeyes-2.1.1.ebuild 1100 BLAKE2B b2bea10c80ec9014257debd33a69caa149ccbb0b3243a8f59e183ab04deefedfe6cd41147af6aba636368e5b5f00dba7e268b044c7efc7ee46c567298fb8ce5f SHA512 c93e668802febe7d6ca873017ada4f096c852da76fd06cc7752d3c1eab76eb437d53df7e856dbfd870100ee2adaf12d042be4f36dfb7c1338bdaa4411e2bdce0
 EBUILD safeeyes-2.1.2.ebuild 1100 BLAKE2B a698de06b0e7382e08c3bd19f07f997c9a1de6a7219623a448e6852105aab3d5aa124bba564d11b963493f0cd28b8ee99a9c991e4c07813f42a65f193b1e3f6d SHA512 f0164bda39aebc214d9a3a890b91760ee856da098bc799dbb67dbb8dbb3904f770302bae8a7595a90258c3239d34dcf4a1308183ac549e148af60956dee0b6c3
-EBUILD safeeyes-2.1.3-r1.ebuild 961 BLAKE2B ee9c691e3970d5d8543f359c526e03dcbf54c58ee0973650a6e4741a77d2e8faf8b6fcbb3dcee1ac36da38466943f0ff51ccc1f431a9b7f89956a5f4a5a4d307 SHA512 43d06bde372d78d0ac9e43342fc4d529e2dd47060494fa8654e6c17e21e58cfaee00c61ee6b4a49a123e90af82024d2f6062ff6197aafa0deb4a52309d720ec2
+EBUILD safeeyes-2.1.3-r1.ebuild 968 BLAKE2B 5e1a806a624f0355aeb52f2d0e698e82187dc923d4f9789f2b2f5bf15666d30acef200c11d71dd95c0f94d6f2f811cda61adc10575fa730f1ffc21ef357b4a24 SHA512 7b0442c1016c2a8615df8c5228f357baa0f81aecabc3cc83f0292be953587770a36a5ec83064053d54fa1e9c3e29cbbcbdae26640e5375784f9fac9d1a968903
 EBUILD safeeyes-2.1.3.ebuild 1100 BLAKE2B a698de06b0e7382e08c3bd19f07f997c9a1de6a7219623a448e6852105aab3d5aa124bba564d11b963493f0cd28b8ee99a9c991e4c07813f42a65f193b1e3f6d SHA512 f0164bda39aebc214d9a3a890b91760ee856da098bc799dbb67dbb8dbb3904f770302bae8a7595a90258c3239d34dcf4a1308183ac549e148af60956dee0b6c3
 MISC metadata.xml 347 BLAKE2B eda163f3ff13421872558f176120fc2fa5488afa1c9e2b2bd1c3aae6bf76e4e73758f35ba2af529beaf73d5677970ffe6319e8db22279c5eb7885f9f135e9243 SHA512 c09ce25d4d00dc7d322ab1505feb17b0bdec7aa1ec9e4a847705889ec38b76b03758d0a9bf1fc01fd6131d278850ae38462256ab8c968f183523e48dc2692aca
diff --git a/x11-misc/safeeyes/safeeyes-2.1.3-r1.ebuild b/x11-misc/safeeyes/safeeyes-2.1.3-r1.ebuild
index a8758f0a686d..d32153bf1daf 100644
--- a/x11-misc/safeeyes/safeeyes-2.1.3-r1.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit xdg distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index 0d84d3bd162c..7050a360e664 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,7 +1,5 @@
-DIST shutter-0.97.tar.gz 2558672 BLAKE2B 72d641750b81b0d4ea1942883b15bed20980c1eb2f96cbc3af101387897b686487b7d0a4e46dfd1ae82cc0d889fba6dd48472c340d088a9600ee9a919c262fe8 SHA512 40315ee03a138c71c29e05e82202d4a1adc0d930aef163e643e757ea2674dd8470e7a4d7d8b38ab5d3386ce8b9d774cbbb9a8b4bc2cb4d5b3b13812c77cf4334
-DIST shutter-0.98.tar.gz 2560060 BLAKE2B a7b48df221d8640a4705f2ffc856fd0ec50646cb26900aabe4bbafcc8b2595ae86aff158aed9c3522624ec5433e111ff322ba35a7b2cd8623356a3b68e90db7b SHA512 5a3321db635a81f6f67d5789cf374d846f21003a9bd3fd748bb58481d8a5fde450a1c4b5ad4d3edee49804cee6dd8da6ad7b4422eaef96bb333b8b3059cb3e41
+DIST shutter-0.99.1.tar.gz 1733952 BLAKE2B fcf5f9a34ce54f674a4b0f9bba2493917bf27141ea7f7e1d8528ae439eabfb33e4e6805bd3cb96131b297748046c9797747520952ad57cc033cf7f7362c4606c SHA512 4d6ee699d3b31194c6685019a9493968d7a4988ee86f9348cf5aaa15c573b0a5f515ba6e5d786faf8054762ae134fea5ca2add10dbb3e14905247daf1303c751
 DIST shutter-0.99.tar.gz 1734356 BLAKE2B c261d7792a2a7508fb8e73b968e1e07edbea0338b857132674caee5ec1bb7a3d58eb2e35645c581af652027007a27df6120b035218c41d8671bc53293b6548e7 SHA512 335c85730f49978d4b69ee2d5bbaa5d660d652d386a70618fdeb46c639bd209cee99743b44a8ef1019404f52328692de91bfbe47b14bea202efd089f80d36f82
-EBUILD shutter-0.97.ebuild 2131 BLAKE2B 28f354d1e340221e618c61165a560d00dbb29dcdb5aa98e1bb67b86051f1b4c62e23dd67eba07c527791fa3c0d9b23644990b49648e801b6f814dd6977925f2d SHA512 719411c211bcd34bc04920c5aee574743ece2fef9252682b1702a30fd1465cc715d16924d0785fbd4317e07782dde13507b5621cbd2baf4570e12ee6b3f56676
-EBUILD shutter-0.98.ebuild 2131 BLAKE2B 28f354d1e340221e618c61165a560d00dbb29dcdb5aa98e1bb67b86051f1b4c62e23dd67eba07c527791fa3c0d9b23644990b49648e801b6f814dd6977925f2d SHA512 719411c211bcd34bc04920c5aee574743ece2fef9252682b1702a30fd1465cc715d16924d0785fbd4317e07782dde13507b5621cbd2baf4570e12ee6b3f56676
-EBUILD shutter-0.99.ebuild 2158 BLAKE2B ffc42ed37d1158d2d92cb7c357580a6ac7239075ba2c749ca5ade60e017c540d07afc79c2ce711fbbc2647ab2042581be10851b6ce522f7efc68e49c4607327e SHA512 307521146637420a94847d11f5810c4fc5c9906f920045bf02a72f68de108d2ec7d4d2d7ed869b85124dccf0ff713e9c3f67d31c46e2ae6078c9d1037744f485
+EBUILD shutter-0.99.1.ebuild 2159 BLAKE2B 5f827b65e6c014b28579ce94f9405bd14f7a82a578472ef3813c496ac5a5691376bbc8b7bf4a04bc2786a968e28311527f0b5fceceb46417430a46e4881eb6e0 SHA512 0cd07998924c59db93b8bda4695d06409b3e29506d963cabddad46da4dfc4409008317d9ed16d80a2ee296992bca14fadc77dcfd1969f63e135986a55c1559e0
+EBUILD shutter-0.99.ebuild 2156 BLAKE2B d6462cf8be7f1f84bb51c4db29378c52b63fa7a9fcc0238abeaa89f80cfd13a7bdd9961754517c9600e723ed56997a2c9a9f69bdcd5b6eb90ca728baf70f83a8 SHA512 3402387ead7393b75773829b259f37932b8fcf83a5cb536754ba258767cac71bf0b3bef2105b5062a28e3b20a63fc56bc2943aeae4c7b127e0aaecd70e2ef68a
 MISC metadata.xml 404 BLAKE2B 89b0c69e56bace083baf4e82ff7deb14bddc671f418233e32c268056477328c4a22d427147fde4d3ad6093ad51d9b3c5e64bc28297add868281f1fe25382f450 SHA512 4fe92d2d4e6d8a0179df9c2748f6740d7c8f0cabab18650baab8df6ab1008a61f48fac5f82cf65f3f08341679dc3e554a37ddd98bb5cb0912d0cac4e6302f22d
diff --git a/x11-misc/shutter/shutter-0.97.ebuild b/x11-misc/shutter/shutter-0.97.ebuild
deleted file mode 100644
index 9d00eb454695..000000000000
--- a/x11-misc/shutter/shutter-0.97.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop optfeature prefix xdg
-
-DESCRIPTION="Feature-rich screenshot program"
-HOMEPAGE="https://shutter-project.org/"
-SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Carp-Always
-	dev-perl/libxml-perl
-	dev-perl/libwww-perl
-	dev-perl/Glib-Object-Introspection
-	dev-perl/GooCanvas2
-	dev-perl/GooCanvas2-CairoTypes
-	dev-perl/Gtk3
-	>=dev-perl/Gtk3-ImageView-9
-	dev-perl/File-DesktopEntry
-	dev-perl/File-HomeDir
-	dev-perl/File-Which
-	dev-perl/JSON
-	dev-perl/File-Copy-Recursive
-	dev-perl/File-MimeInfo
-	dev-perl/Locale-gettext
-	dev-perl/Net-DBus
-	dev-perl/Number-Bytes-Human
-	dev-perl/Pango
-	dev-perl/Proc-Simple
-	dev-perl/Proc-ProcessTable
-	dev-perl/Sort-Naturally
-	dev-perl/WWW-Mechanize
-	dev-perl/X11-Protocol
-	dev-perl/XML-Simple
-	virtual/imagemagick-tools[perl]
-	x11-libs/libwnck:3[introspection]
-"
-
-src_prepare() {
-	hprefixify bin/shutter
-	default
-}
-
-src_install() {
-	dobin bin/shutter
-	dodoc README
-	domenu share/applications/shutter.desktop
-	doicon share/pixmaps/shutter.png
-	doman share/man/man1/shutter.1
-
-	insinto /usr/share
-	doins -r share/shutter
-	doins -r share/locale
-	doins -r share/icons
-
-	insinto /usr/share/metainfo
-	doins share/appdata/shutter.appdata.xml
-
-	# .po doesn't belong to installed system, only .mo
-	rm -r "${ED}"/usr/share/shutter/resources/po || die
-
-	# shutter executes perl scripts as standalone scripts, and after that "require"s them.
-	find "${ED}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
-		|| die "failed to make plugins executables"
-	find "${ED}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
-		-name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "writing Exif information" media-libs/exiftool
-	optfeature "image hostings uploading" "dev-perl/JSON-MaybeXS dev-perl/Net-OAuth dev-perl/Path-Class"
-}
diff --git a/x11-misc/shutter/shutter-0.98.ebuild b/x11-misc/shutter/shutter-0.98.ebuild
deleted file mode 100644
index 9d00eb454695..000000000000
--- a/x11-misc/shutter/shutter-0.98.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop optfeature prefix xdg
-
-DESCRIPTION="Feature-rich screenshot program"
-HOMEPAGE="https://shutter-project.org/"
-SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Carp-Always
-	dev-perl/libxml-perl
-	dev-perl/libwww-perl
-	dev-perl/Glib-Object-Introspection
-	dev-perl/GooCanvas2
-	dev-perl/GooCanvas2-CairoTypes
-	dev-perl/Gtk3
-	>=dev-perl/Gtk3-ImageView-9
-	dev-perl/File-DesktopEntry
-	dev-perl/File-HomeDir
-	dev-perl/File-Which
-	dev-perl/JSON
-	dev-perl/File-Copy-Recursive
-	dev-perl/File-MimeInfo
-	dev-perl/Locale-gettext
-	dev-perl/Net-DBus
-	dev-perl/Number-Bytes-Human
-	dev-perl/Pango
-	dev-perl/Proc-Simple
-	dev-perl/Proc-ProcessTable
-	dev-perl/Sort-Naturally
-	dev-perl/WWW-Mechanize
-	dev-perl/X11-Protocol
-	dev-perl/XML-Simple
-	virtual/imagemagick-tools[perl]
-	x11-libs/libwnck:3[introspection]
-"
-
-src_prepare() {
-	hprefixify bin/shutter
-	default
-}
-
-src_install() {
-	dobin bin/shutter
-	dodoc README
-	domenu share/applications/shutter.desktop
-	doicon share/pixmaps/shutter.png
-	doman share/man/man1/shutter.1
-
-	insinto /usr/share
-	doins -r share/shutter
-	doins -r share/locale
-	doins -r share/icons
-
-	insinto /usr/share/metainfo
-	doins share/appdata/shutter.appdata.xml
-
-	# .po doesn't belong to installed system, only .mo
-	rm -r "${ED}"/usr/share/shutter/resources/po || die
-
-	# shutter executes perl scripts as standalone scripts, and after that "require"s them.
-	find "${ED}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
-		|| die "failed to make plugins executables"
-	find "${ED}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
-		-name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "writing Exif information" media-libs/exiftool
-	optfeature "image hostings uploading" "dev-perl/JSON-MaybeXS dev-perl/Net-OAuth dev-perl/Path-Class"
-}
diff --git a/x11-misc/shutter/shutter-0.99.1.ebuild b/x11-misc/shutter/shutter-0.99.1.ebuild
new file mode 100644
index 000000000000..8a35f2c4fbd4
--- /dev/null
+++ b/x11-misc/shutter/shutter-0.99.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature prefix xdg
+
+DESCRIPTION="Feature-rich screenshot program"
+HOMEPAGE="https://shutter-project.org/"
+SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Carp-Always
+	dev-perl/libxml-perl
+	dev-perl/libwww-perl
+	dev-perl/Glib-Object-Introspection
+	dev-perl/GooCanvas2
+	dev-perl/GooCanvas2-CairoTypes
+	dev-perl/Gtk3
+	>=dev-perl/Gtk3-ImageView-10
+	dev-perl/File-DesktopEntry
+	dev-perl/File-HomeDir
+	dev-perl/File-Which
+	dev-perl/JSON
+	dev-perl/File-Copy-Recursive
+	dev-perl/File-MimeInfo
+	dev-perl/Locale-gettext
+	dev-perl/Net-DBus
+	dev-perl/Number-Bytes-Human
+	dev-perl/Pango
+	dev-perl/Proc-Simple
+	dev-perl/Proc-ProcessTable
+	dev-perl/Sort-Naturally
+	dev-perl/WWW-Mechanize
+	dev-perl/X11-Protocol
+	dev-perl/XML-Simple
+	virtual/imagemagick-tools[perl]
+	x11-libs/libwnck:3[introspection]
+"
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	hprefixify bin/shutter
+	default
+}
+
+src_install() {
+	dobin bin/shutter
+	dodoc README
+	domenu share/applications/shutter.desktop
+	doicon share/pixmaps/shutter.png
+	doman share/man/man1/shutter.1
+
+	insinto /usr/share
+	doins -r share/shutter
+	doins -r share/locale
+	doins -r share/icons
+
+	insinto /usr/share/metainfo
+	doins share/appdata/shutter.appdata.xml
+
+	# .po doesn't belong to installed system, only .mo
+	rm -r "${ED}"/usr/share/shutter/resources/po || die
+
+	# shutter executes perl scripts as standalone scripts, and after that "require"s them.
+	find "${ED}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod +x {} + \
+		|| die "failed to make plugins executables"
+	find "${ED}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
+		-name "*.pm" -exec chmod +x {} + || die "failed to make upload plugins executables"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "writing Exif information" media-libs/exiftool
+	optfeature "image hostings uploading" "dev-perl/JSON-MaybeXS dev-perl/Net-OAuth dev-perl/Path-Class"
+}
diff --git a/x11-misc/shutter/shutter-0.99.ebuild b/x11-misc/shutter/shutter-0.99.ebuild
index 144918c4f2d6..b1392c23fefe 100644
--- a/x11-misc/shutter/shutter-0.99.ebuild
+++ b/x11-misc/shutter/shutter-0.99.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/x11-misc/sxhkd/Manifest b/x11-misc/sxhkd/Manifest
index 9db0129d716a..f2056e9ce6b7 100644
--- a/x11-misc/sxhkd/Manifest
+++ b/x11-misc/sxhkd/Manifest
@@ -1,5 +1,3 @@
-DIST sxhkd-0.6.1.tar.gz 34808 BLAKE2B b25ff934d0a7f28b3950152ef800da90c5f990f2efd92e9178fef8a77939dc1ed1bbde55bb5a990c33fd3d0be7490dfb2e799ca56abf3c3c6f20c258169eb100 SHA512 d8cd6166ff7e7bc800ed79c5d63cbdfad4f9824c5a5e19b6a315b2ec570295150600651376265932f5fde8b6127f629a553337c6454a1c78c62b3395aaeb55a2
 DIST sxhkd-0.6.2.tar.gz 35711 BLAKE2B a1dc409314dda68aa3df99bf584d20e492c7220dceb188b844a6bd9374a4c52b7e1a406b96fc77276498db86dd5e5114a50357ddee660f5f08d6fe974de8f990 SHA512 3f758aec3de76c6336a9008e997317ed7a05db0fcd81025d8f856694c2b8162022e25d9a48876de99056748a2dbe6a561a0e1594973c854ac2c98d44af6b03aa
-EBUILD sxhkd-0.6.1.ebuild 617 BLAKE2B 855913b42866ff8bac062f42d6215bf60b95ff76b120c795fc9288cb0e5719ca647b8668e0afcd7750a7e4be93a6e2a3b3c94e330b1fa1f61490256304656046 SHA512 4a31ec97909773124d3fb04bf3b704b232c09d3f0221a4e1e25eb2ef24f2052b5fb7e19d96b3f2bc1fc41ece9e7e1debb3a13f7af9dff87bd681437b977eee38
 EBUILD sxhkd-0.6.2.ebuild 667 BLAKE2B 7f066bf4563c1bedb2ca00c383cc4f9fc85ade14c1241ca6ecc07eb947d2273aae67ec8c08dcd8d085afa6fa69900c2299cf0b104a4e9be0e4b4e1b01b6aa2ee SHA512 32c4aaa0cf8020a71edeadda136db6a124c91ddb3d14898c09011060e536bbe2b5a58fd913bdf94196c676ee810ca1d09fcb6b20e9db740282b4fb4628b776ad
-MISC metadata.xml 328 BLAKE2B aa08b578e236cce8a5be46e77ad4ebd03b72f961e7f5a5434cd2b0943c9fb7d2272d8ade5eba20ce070490e6268303b46b9f6319f506c5a962b558baf997c106 SHA512 4c3a54be8d3b61920b44da68a64942c3fab360921fda741abaaa4284562151e1418dc84e83b49ce4aa500d83b0e054343fc81821446ca75c5db5a5d595560ced
+MISC metadata.xml 328 BLAKE2B ef5ee0d2400003eedf0d3a6371233fd6dee54b0c372458c25c14754959f7553731ce8a989029fe23462afcdd0a5d184a23808e619c465c483c1b8e72a77a6f48 SHA512 3ef7078052da12bb622dd64e3c6df6ede3e271953a2e9bfe49288a19d862e22bd085cd0b1aafd6e7bb16cdb9deae4d63c293f40f62ea4a0abc23b248df091a00
diff --git a/x11-misc/sxhkd/metadata.xml b/x11-misc/sxhkd/metadata.xml
index 5fda34c202f8..1f1b477b4371 100644
--- a/x11-misc/sxhkd/metadata.xml
+++ b/x11-misc/sxhkd/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">baskerville/sxhkd</remote-id>
diff --git a/x11-misc/sxhkd/sxhkd-0.6.1.ebuild b/x11-misc/sxhkd/sxhkd-0.6.1.ebuild
deleted file mode 100644
index fcdc146ee0ca..000000000000
--- a/x11-misc/sxhkd/sxhkd-0.6.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs systemd
-
-DESCRIPTION="Simple X hotkey daemon"
-HOMEPAGE="https://github.com/baskerville/sxhkd/"
-SRC_URI="https://github.com/baskerville/sxhkd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="x11-libs/libxcb
-	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}
-	x11-libs/xcb-util"
-
-src_compile() {
-	emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-	systemd_dounit contrib/systemd/${PN}.service
-}
diff --git a/x11-misc/tabbed/Manifest b/x11-misc/tabbed/Manifest
index 65460a004b29..32609c781cd6 100644
--- a/x11-misc/tabbed/Manifest
+++ b/x11-misc/tabbed/Manifest
@@ -1,3 +1,3 @@
 DIST tabbed-0.6.tar.gz 12926 BLAKE2B e92e2c7132f7a760286c61c99faa0b26e411326e172c231f3354e61f8151f561babd4a35998bc06cb7fd87dc962334ef0ddac78ba284cd3090bb1c2dcfa159be SHA512 bcad873251be6b5de21311531e8d24330003b42790cb94d559a0d1be45408b3e0722c14e7c7f2cefd0717fd2a2d7a100fa08fc4e10e7bb669935909602286553
-EBUILD tabbed-0.6-r1.ebuild 975 BLAKE2B aba3153ef2ae976380555aee19a390f02421886562c98f4b12f4a489522aa066121bacc8399e30263400922c181b3d74b6533a8dfb912166e15d1b2ce310f570 SHA512 2357091f0c4f889700e6946bab5a239de0e18fc02bfb822b13153fe3a7eca70f02c5f7575fb2af26652b9d4a27ee0248457c5dcd1b7987c0edc58d3f1958b85a
+EBUILD tabbed-0.6-r1.ebuild 974 BLAKE2B bc2c127509ba7e31f84712d7b5c246c5b0844b2ae567fed5d8589c5b48eb193f49d70764a722cd10aecd46d7705a7e2e2d2d2f546d6f978d79f4d24dce783305 SHA512 41ffea7ca5d761519f30e77a968706ae7be7877804d569e4c6cf0c2957d7ae68f3ba993206f27ef1e59ed66a1c7ecb6bdd84739dd717deebc2db8775e5cda19b
 MISC metadata.xml 252 BLAKE2B ed5f11ce8c4de4fde4020b83dc772d6b47192ea5617cacf05adf13ab5a29923858b2969ed9dc26e75194cb972d41ffceee40856e6f955f42039693af96ebb2e4 SHA512 7f9b5cf205b6500eb65742c67963c3c6c375fa05c7eb094037fb9950d9d2840930e8b4d3ef76c948ddf7f37005012be51c8217c758a615dd7e128c80b6b1db28
diff --git a/x11-misc/tabbed/tabbed-0.6-r1.ebuild b/x11-misc/tabbed/tabbed-0.6-r1.ebuild
index 790999dd6b2b..7351759f0314 100644
--- a/x11-misc/tabbed/tabbed-0.6-r1.ebuild
+++ b/x11-misc/tabbed/tabbed-0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest
index 85232b0bd665..b27971e9778d 100644
--- a/x11-misc/xdotool/Manifest
+++ b/x11-misc/xdotool/Manifest
@@ -1,5 +1,5 @@
 AUX xdotool-3.20210804.2-no_hardcoded_pkg-config.patch 1073 BLAKE2B 570221beabbad51f324bded0398afd68e9d3d4f30216b7a643dc9f8c76163721bd32778137fd322faffc2edafbc63d10cc036ec5311496b24410c737735f6482 SHA512 cb206c2b708835d8f3c656778edb07f08faafe3f9c1b407526e45321dc44b59981617b0c7b96865d6c1b968c855d40c0302ce888e8a1f57719b87ee9e774449e
 AUX xdotool-3.20210804.2-no_ldconfig.patch 493 BLAKE2B 044f6896b2f1279795a4263107309886518698125a818522a771374f3a1f2242f00446e87eaaff3b5eead3840459fc249405d49d47e7cd6568f5c923e096fb34 SHA512 7b3d4fe4a532e81358d81ebe9fd6e212bcceb08700df37d7d4c7fc16d95177c8f39ec8ef5a986eb6a08e7c6d209efaa8426483732dcedec39617b203de2faac5
 DIST xdotool-3.20210903.1.tar.gz 115051 BLAKE2B d1be4fc2f5c86991804b63b85c95748dc04098f85a515b3427d980dac3d355133da0408d3e91a39e5363ae6242b02d268a8b5bc014fdd5faf51e43e24fb54176 SHA512 446ba8d354031df6a21957df92220c7dcaae5bacbb8878568a57f31097db72a88701717ec8bcd35cca3f5356bfaf47eb3ed65d2159f03b0c7a7ae5550a9b1dce
-EBUILD xdotool-3.20210903.1.ebuild 1407 BLAKE2B 5b6599002f4e59db685c8cf4621e2ad2f0f25ab4317c6b70077c1c1e38563467baa9af93a5b3897f91c87c7ac0b6cb5055e8709384d741b7af340b73fdeb6c7e SHA512 52bc7955d5190c9ebc0b17a4aa2aab979660beda8ad0b550ef7ba5d0a29002966646fda704ec0f29b8aad46805aad4408df8c3ec91e4b19cd4c9c01555a771df
+EBUILD xdotool-3.20210903.1.ebuild 1414 BLAKE2B 122aec097283e3d75980d9639d982719a0ce3af7501dd2877ffad27d7e17358a369913b4aaad97b04d5e7d46d4a0e88492b18bd17f49bebfab660b34e226faf1 SHA512 da30202930aef39942f58d6f1b9a24cfee833e4ec69f50f43c50d2fe0e1f49dc4f9d86d7b5722f3226ba7d8efcdccb35cd06af71e7f29ab4cb7c09254c05905c
 MISC metadata.xml 560 BLAKE2B 9977cd6c5efe52174f07e4ef10141b7742c904c86afb7305ee82f9f222b2cf62a5b052f171f13d69cf3a7b00bf53f759f4cd108e7b285fafec5f5995828c0888 SHA512 381d5c1933c426b1847d2f239de60c68ec4877b482e6c33b60dffa74c7ff729cd5c62f852adcdf92b830ae8081f0b4c1a498b58416022f49bbae2013ca82ee74
diff --git a/x11-misc/xdotool/xdotool-3.20210903.1.ebuild b/x11-misc/xdotool/xdotool-3.20210903.1.ebuild
index 74cc0440567f..dd2a934b7fd1 100644
--- a/x11-misc/xdotool/xdotool-3.20210903.1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20210903.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 IUSE="examples"
 
 # Many the tests want to manually start Xvfb regardless of whether there
diff --git a/x11-misc/xfishtank/Manifest b/x11-misc/xfishtank/Manifest
index 936b72b9ae4c..9b3c2b243720 100644
--- a/x11-misc/xfishtank/Manifest
+++ b/x11-misc/xfishtank/Manifest
@@ -1,3 +1,3 @@
 DIST xfishtank-2.5.tar.gz 153464 BLAKE2B 0bb3121b84c3d08ea2251a70f9ad569e90fe6299ad3ee4942ec83d80483fcf4db0b0079161c28ff63461597f76b0d0532a65c1bde8aa821ff6bc92be189843f2 SHA512 1bfe16737bdbc2b7cf74abb98408bf632d8881f15753005424f84eba4afca756b07fa7ad424df800ee3f3e46e033b8f60142877bcd9a7e4e806e318ee283721f
-EBUILD xfishtank-2.5.ebuild 793 BLAKE2B f5e21a60bd5e740bfa2467dfb80659443cbfd55aa3878c73b985f76d619458016d3ee9b46103d582e666cfa1b57acb645b643addae2c173fc4a6dae8960987bb SHA512 09f6e410bf05471891dde26f8e549913420c5a176cddf0f685c9638fd194b6cae7b83162a8a68c4f7677e9786ecd92845db54d3de0f425f00c85e5afabff040d
+EBUILD xfishtank-2.5.ebuild 807 BLAKE2B 04870b17b7819646d3df34d371ce2f03763a4b5aca7620e333e41507e9cd073c94c3aa5dddc642bb010da0fc86dace11cbbc8d881a938b3184acb86a20054519 SHA512 7b93cf3e87cee2b3dd0a85d7491e1eb9c72a095fb317388912c497a78090a081d96a313f0bacc8289a92219e63461cf424f0ea14a50537cd405a62d67716d3e5
 MISC metadata.xml 277 BLAKE2B ebaa8353413cfc5519fce99f8627c71cf765fc6d42b42651e232274de315487c156d45dcb23a401dffb8f112600b0dadd56f93d2283ff86b4293dc5490ad4059 SHA512 c8ef9069153b124118a6be64375c6954ccc6f518a13805e4ff1c33c9cec136170132a580c4a9781930b709c93678c94d6448291625de34d18fea41bfd17f685d
diff --git a/x11-misc/xfishtank/xfishtank-2.5.ebuild b/x11-misc/xfishtank/xfishtank-2.5.ebuild
index cda06f5cd4d6..c8e58903ac86 100644
--- a/x11-misc/xfishtank/xfishtank-2.5.ebuild
+++ b/x11-misc/xfishtank/xfishtank-2.5.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Turns your root window into an aquarium"
 HOMEPAGE="https://jim.rees.org/computers/xfishtank.html"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/x11-misc/xprintidle/Manifest b/x11-misc/xprintidle/Manifest
index 7528b8adc582..b8cd7779b175 100644
--- a/x11-misc/xprintidle/Manifest
+++ b/x11-misc/xprintidle/Manifest
@@ -1,5 +1,5 @@
 DIST xprintidle-2.0.tar.gz 87308 BLAKE2B b2ef3cd82f7208b2c2a2a2cf3fcff028c318e682b7b1e5de4982a50bb757b263044cf54edcd5452fea7fd93f435b86da3da6d0ef38dbacee761bc77399f43665 SHA512 cc2f62b33ef387366246ee9a195be4cde68b2d13a49a4d1299640da2d42f7042152bfdf6932e7904a7f4211b0dc22486bbd62b47fdaf9d5d3db895e296b5f2f9
 DIST xprintidle-2.1.tar.gz 92360 BLAKE2B 9bfc08151a18200eb83b6569c2e9d79cbeb6326c39f0e8b9f5e400d0d3e28baa889ada32e3e0452197af77f90bae50d1094bae6972aeb0c3dbe81732246b6f1f SHA512 12393e10a6e53491f3e803fb2e946cc5e20d9fb6198c95d53512b3418034d0f262fddafe9fa10e1aa3f335940134365dcdecb0ac00216e32a2bc4cc5be1c8ec5
 EBUILD xprintidle-2.0.ebuild 653 BLAKE2B 8f17fd7c476ec814022435caba734d1cbe0cb21dc8d9c522d52a267304efd1ab0b96f73166e6ca0efdc63d793fff03f674bd094857fb36108c5e35c9788f3e18 SHA512 94c94b601d05b720c99c080074af43276a74415f3ecd670a517298945f96c5efdfa393483028edbb35ef7f4a6fe4a80ccf35b44cdb0466205f1b540c081a343a
-EBUILD xprintidle-2.1.ebuild 512 BLAKE2B 9c5cdd449e651e540626d6f0dadc0a405b0237c7c404456b93a2c09c7df188c987b3e2515991d77bfd25ab83a9a365bd7a2bae279873f3238c25d59cd52aa5e0 SHA512 ff01449cd64f7e82e211a3d46e04838104124bd63aca3d221cf09f67ad1c89fed04b583310f89681e06f5e6be2018bdc1d9cfd5481e6ed52eda5adab4ef10f42
+EBUILD xprintidle-2.1.ebuild 519 BLAKE2B a9502c5105358d9d6b2899153e4272d0104bb6d80a118acfb07963ed03d436cdbbddaeae664f137a48a619a3b33b92b1f90ce29acc21a7ddf0281c64b9e16cae SHA512 2ccdf6b7464894210c060db044311b4d0bbf8915fce8f9e3db3274ac224528d81fede1a35fdaca619f2dfb90461826595615d327035f448804f865eefbef1af0
 MISC metadata.xml 305 BLAKE2B 30358c219bb97538c65b0f57f3e931a5a8011e6597d091c2ab159e08d788f3f450fb0779b1229acef0ed02fc11653b0bb6f49cb47a241dc5aec28c1d2ac9b7e1 SHA512 ccc0edcd4814004c6bb6fb768a4e6789153b4c8d8387a5d3fccb42a9f3c8b61548ad7be9924da7aaab16320be8009c32512c8fcd578dfac8b8d2d147f3145a98
diff --git a/x11-misc/xprintidle/xprintidle-2.1.ebuild b/x11-misc/xprintidle/xprintidle-2.1.ebuild
index 6ec6053ea3aa..22c3a3eccd91 100644
--- a/x11-misc/xprintidle/xprintidle-2.1.ebuild
+++ b/x11-misc/xprintidle/xprintidle-2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Prints user's X server idle time in milliseconds"
 HOMEPAGE="https://github.com/lucianposton/xprintidle"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/lucianposton/xprintidle/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/x11-misc/xsetleds/Manifest b/x11-misc/xsetleds/Manifest
index 5fac74d6d2de..5f603b91283f 100644
--- a/x11-misc/xsetleds/Manifest
+++ b/x11-misc/xsetleds/Manifest
@@ -1,5 +1,5 @@
 AUX xsetleds-0.1.3-assignment.patch 208 BLAKE2B a1f5d7814e17fac4ca1a3f0e02e17be063d7dd61316bfa7c5899a3d1812d3bae3aaed25b5bd6512c22fd0d36e0ea0f19cca837a7e0ef655fef09ba164d05f57b SHA512 8434fecb410cdfa35de8e1b93b4c3021df0629fa8d44a05b484e0d9ced597811fdbfd740acc70f9900af7e38b6f866eb3c9fc0173664dfa260d5a3ccef5aa2bd
 AUX xsetleds-0.1.3-isalpha.patch 236 BLAKE2B 0a4599f5f4f0a56521967c30ceee7d79e65d7321b2f99065e42b77e94baf9cfd53611d192326a3e574c57f7de1df3a459ddd0905bb37c8013de21c65068d6ad6 SHA512 5191fc8ed447d921dfd0a47514de03e03dc744f17b22a1ac3973b1c91104c015c7881cc156c4e2e073f3ba18e17187b34b5db80359489ffc372a07c1e6bcbb10
 DIST xsetleds-0.1.3.tar.gz 221399 BLAKE2B 11311f972abc0f0c83ec47dbfe2743d4220daa4fe445c4c0f4a5d7c827d690549611bd373577882d1ac75b853e468ce36d3a6a447873a523a530676528bbd011 SHA512 7fe6baa77b4b2c8f57dfc331776bb457520facdb2f54a5c101764c590d7c5556cd00477e56d36e64cb7264a8de28698422b99ec4852798069189fbe6c1c19f72
-EBUILD xsetleds-0.1.3-r2.ebuild 723 BLAKE2B 9e83d5c5fa743211851cfcbc4068d30fbac6df92f391ed1b8ac96f979afa77c2c626618a1d513b6602c14c16878fc7bc119d010a2cf0d27d0283a1338816d80a SHA512 3ed0de8a105352e5b11d2a6a779fc4032869648efa8cb4e65256fff49751658742976ee798041d7da3089abbe873778dce357e89f5f8503ba276510635ccaeac
+EBUILD xsetleds-0.1.3-r2.ebuild 737 BLAKE2B 5836d66c4667bfcbabb226d7518cf6d77f27efee7a3a209a59300435f398266bc995e26242a512a7aa923286b76c32bebda28068c3c49c4757e7499866a5e53e SHA512 e90c1794944aa246d12b750d7ea56e820560b550915c8920f13b5bd9b83439fd777e10890d00098a208f54701b7c102259759be4d60abf5a5f55e9bde0f9c1db
 MISC metadata.xml 277 BLAKE2B ebaa8353413cfc5519fce99f8627c71cf765fc6d42b42651e232274de315487c156d45dcb23a401dffb8f112600b0dadd56f93d2283ff86b4293dc5490ad4059 SHA512 c8ef9069153b124118a6be64375c6954ccc6f518a13805e4ff1c33c9cec136170132a580c4a9781930b709c93678c94d6448291625de34d18fea41bfd17f685d
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
index 741d565b461c..1de8663792e8 100644
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
+++ b/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="small tool to report and change the keyboard LED states of an X dis
 HOMEPAGE="https://github.com/bmeurer/xsetleds"
 SRC_URI="
 	ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/${P}.tar.gz
-	https://dev.gentoo.org/~jer/${P}.tar.gz
+	https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz
 "
 
 LICENSE="GPL-2"
diff --git a/x11-misc/xxkb/Manifest b/x11-misc/xxkb/Manifest
index 6b11f1a16076..699fdfad4b76 100644
--- a/x11-misc/xxkb/Manifest
+++ b/x11-misc/xxkb/Manifest
@@ -8,5 +8,5 @@ AUX svg-appdefaults.patch 777 BLAKE2B 5fb362d421569377f907a07446b437270e01b75acb
 AUX svg-flags.patch 7143 BLAKE2B bb05bf9e8ad16983dd82670283c7c8a7915f358556eebd065b7a70b66c54b6c9ec37475f192bdd49c7734d5fc84c15939512b7f484667cf3dcd49aa2fc6a94e1 SHA512 e2d6bc62dc75d664007e4cb1d192ce4366ef9c859606e3ff4481d56bc8d0deeca32fa5727cab127bda832b5172ce7e33d5c2039463c9bc46df0679c24dd14ecd
 DIST xxkb-1.11.1-src.tar.gz 38123 BLAKE2B eb7cce9a6e64cdcf1a75e375f81f43edd312f443294959fe7b169e5bad1fa107a2e8294edc3b13f1022055027fdae8d52aa5fddef57bbb9f283a63e369b93de6 SHA512 081629ccee41016cd468bd411c8584298bf64d4d791bf803490f6286a330401b933f895fbff2f4a6d1fcfe86c0490267f86d334436c1cea743ad08d97b26038f
 DIST xxkb-flags.tar.bz2 2541 BLAKE2B cb8d181ea21dc29881450b2a12e381c72e98f70c225b25db53b183337436d30e300b34d983b060a8618b927afc7a43d10a015f841d4fba663a9856238904bff4 SHA512 c75929bf78a8aa84ffb615c85c2ad70110a9f7b0465891651a57e4772eae5e0ded61d10197f430f9cdd0cf707903af3d0af4250ff1743fdd59d9ff19bc0c33a9
-EBUILD xxkb-1.11.1-r1.ebuild 1702 BLAKE2B 9a043cfb89efd153c476d25f12806b6bfde20ed7e898cc9f1ff3abb4072ae43fad31588f9a2270ecaf3244df1b931a73208dd26f41ef5185095aac3e2cd8dd48 SHA512 cbc8701aed9ac8656e966b3d18712a81c248d00d7f5dc3f92d2c2b8cf608d3a4c2f45d933883931ad2f6481dbda8a5d33ee0ece8d83bf74d2369b92c29a90cd5
+EBUILD xxkb-1.11.1-r1.ebuild 1716 BLAKE2B 20c5fdfd1d55af1df111c2b57fae4fd0ccbb9c23ece83e93e8baa1a92289d135636ad05074133ccea361e0c35f1b93ca6a753684ee925f4e5c633edeb190f049 SHA512 4e68639a1d60b3b93cd227472d935aacc31facd74df052f2184de3b4e14ffd9d3ad8d7dd9d41e9d7e204c78017016493107b9479f02a24e2c83a10507ce0ed4d
 MISC metadata.xml 351 BLAKE2B a8344cc173184a570e48ff949d23953825f584c595ae890e38df788cb1b70df6ab3076cc5f5ab57925fbe3c1daa4e552761ced55c49a9e403c952c9b51f19fc9 SHA512 45599b1edb01d31d0ea557d7905f80353088fd1bcfeac1e6b1790b6ec9115c7bf8e7944ea25fb0605af516869e2e0c63173cffe32125ea2ea24fbbf78434b0ba
diff --git a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
index f95535a71bf9..b0977944da0a 100644
--- a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
+++ b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="eXtended XKB - assign different keymaps to different windows"
 HOMEPAGE="https://sourceforge.net/projects/xxkb/"
 SRC_URI="
 	mirror://sourceforge/${PN}/${P}-src.tar.gz
-	svg? ( https://dev.gentoo.org/~jer/${PN}-flags.tar.bz2 )
+	svg? ( https://dev.gentoo.org/~jsmolic/distfiles/${PN}-flags.tar.bz2 )
 "
 
 LICENSE="Artistic-2"
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 208c13b7bcc2..0a9c1c11ed95 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -2,7 +2,9 @@ AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd03109
 DIST zim-0.73.5.tar.gz 2702734 BLAKE2B 494dbe8ac0cbb46c15655cdf56bc25010591bd00faec94608ccd9fa7cec01385c6756480e5a3f37b50f44984ed69d30f33570ca913dab7ede2b89a4bf0cc4016 SHA512 f2c335d4697e7d0535b2abb200af45b7d753f2964e94a35c2ec8d4fb8deae0842aef086e09430a50d4ff5ecee89eb1f6f881a0b430877209e4a8d83ee046c4f9
 DIST zim-0.74.0.tar.gz 2917916 BLAKE2B 32b1086395142d07b46425264e3ee6d6782d62f138fb661c0bc392b09054f0664e7a2d8b75f409a843b1e85c93a11e41e041019f69ef657e11d311253ba804ae SHA512 39e3849c14bc474b90583a708c8ead287b27a8eb5f714ad63f168f205fb6584c4ff2f9df45755aa3e3b012639891587c7153ae4e0fef71276241ddce6e32c01f
 DIST zim-0.74.1.tar.gz 2994036 BLAKE2B 9de89ce74bc08ec0b60f34d693ffdb3b8220efe6f03e3d77686c9d3db135713d7eb5e0beed35eb6f979e489f12b9d65b9b66e0e7449c45b955711684154ae6b8 SHA512 f78bf1ee6082488efe2e581984c85ffbddbfb7e5adfdf491232e93a8376580275f329e2d02c482afd70bbc70f62ca6f0b3bce636cff58b0a1d592dd4b8194e3a
+DIST zim-0.74.2.tar.gz 3008954 BLAKE2B d0ecf666804931412f6e32aef54193ed96c67049e0fd3e7a373973d4826f16a9483eaa0940cc953573c104c704115905b036e5d0355961c0be86bebc6189bd9a SHA512 112c1e9d28a10643711f665e03c8a37259637b3471338aaca0a834afcc96c658ca5bf863e63bd5f01ce1fcdfb3eef3f2dcf1d10f8113d2158af2e91234b023b9
 EBUILD zim-0.73.5.ebuild 1820 BLAKE2B eeb3f5184d8e68aa56f461979e48fc11bb96979aff04a8063993da14b88c05a52c695e7d5163e15992795d3669554c26aa13b12e1d0093f8c815ad57805ef3d5 SHA512 6b82081c2ade2497a49db760a3cf2ea0c7e073de9ca639e2deeeff5e68c0d5a299c93b35839c96fcd6764f8f3c939504f4541fb0d296d390680131def695b5d7
 EBUILD zim-0.74.0.ebuild 1822 BLAKE2B e07614d05c5b81cd4aab38029af5e07675e7a44579b78e27eaf683856e84760603050446535d53262fde93566f24e84822aac9456b0c0a1ec9275650b25ce9b7 SHA512 c8ccbf826b541d23125a2f37c3524257514ddc8c00413586ac43aaf3679e1392baffe48a1346ccab6cad9765ce973d9b10ac7b9fe2f2a5287ff7a9ae93cd4b19
 EBUILD zim-0.74.1.ebuild 1822 BLAKE2B e07614d05c5b81cd4aab38029af5e07675e7a44579b78e27eaf683856e84760603050446535d53262fde93566f24e84822aac9456b0c0a1ec9275650b25ce9b7 SHA512 c8ccbf826b541d23125a2f37c3524257514ddc8c00413586ac43aaf3679e1392baffe48a1346ccab6cad9765ce973d9b10ac7b9fe2f2a5287ff7a9ae93cd4b19
+EBUILD zim-0.74.2.ebuild 1822 BLAKE2B e07614d05c5b81cd4aab38029af5e07675e7a44579b78e27eaf683856e84760603050446535d53262fde93566f24e84822aac9456b0c0a1ec9275650b25ce9b7 SHA512 c8ccbf826b541d23125a2f37c3524257514ddc8c00413586ac43aaf3679e1392baffe48a1346ccab6cad9765ce973d9b10ac7b9fe2f2a5287ff7a9ae93cd4b19
 MISC metadata.xml 805 BLAKE2B 15e1443ba8c937c389eff2a4771ea9ae5c6cd52127fe991e02776bbf17cb18cafab377fcea5572779fa0784344b385d57b2fe19c8ba15c568ea6048bd9ea7a29 SHA512 2489ccdc635377d0e8029e60365a8b72fad3efeff99de9d191bf5e1143f32402ea08a188271cf5c31ff7570c81b9a21a9bca54c59fd50984062e91f6ae54225e
diff --git a/x11-misc/zim/zim-0.74.2.ebuild b/x11-misc/zim/zim-0.74.2.ebuild
new file mode 100644
index 000000000000..131369dc0283
--- /dev/null
+++ b/x11-misc/zim/zim-0.74.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 virtualx xdg
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="
+	https://zim-wiki.org/
+	https://github.com/zim-desktop-wiki/zim-desktop-wiki
+"
+SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	')
+	x11-libs/gtk+:3[introspection]
+	x11-misc/xdg-utils
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+	export XDG_RUNTIME_DIR=fakethis
+}
+
+python_install() {
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Please install these packages for additional functionality"
+		elog "    dev-lang/R"
+		elog "    dev-python/gtkspell-python"
+		elog "    dev-vcs/bzr"
+		elog "    media-gfx/graphviz"
+		elog "    media-gfx/imagemagick"
+		elog "    media-gfx/scrot"
+		elog "    media-sound/lilypond"
+		elog "    sci-visualization/gnuplot"
+		elog "    virtual/latex-base app-text/dvipng"
+	fi
+}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 61ad46315c21..6de98be53da1 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/wmfsm/Manifest b/x11-plugins/wmfsm/Manifest
index 58f1b1057b56..a3a5fa3e3d5c 100644
--- a/x11-plugins/wmfsm/Manifest
+++ b/x11-plugins/wmfsm/Manifest
@@ -1,4 +1,3 @@
 DIST wmfsm-0.36.tar.gz 20456 BLAKE2B a9832bb4d6ae45b451c564d45ab2af085a17b3089b2f62411b70dab8f78e9c8725f6e1abfed75aa9334969dcea8258b6746c07e5a1e43cc021ab2083ae897de3 SHA512 d5d148f67f226e38a8b3c2475cdae9d93cb545ca79afe93060137b36f09a328db82b4561a6dd76abe7f5d59e944e8c8ed0f85ab1ff1727c659195c88d1d7406b
-EBUILD wmfsm-0.36-r1.ebuild 622 BLAKE2B 5dafc37253324f78b590861808654ee41210ef7dd0cb839d3170b885675b2007a305b93e46208ca98fa85979b35de154fe2212e21ee77f0533ba80fb815b6ab1 SHA512 1ed911d5dbbda65894bcb0c6544b8c45ec59757cdfc2fe1b1c6543d6f76db3bf97197e1102cc7b5d5483de994a194e33535947a07a5cb00a7bddf27cc0451d9d
-EBUILD wmfsm-0.36.ebuild 692 BLAKE2B a5f2759160ab9f22612fedcf2363bd037ff8f2164657a0161476196780a26b409a2b974aebb8d1efc5ac395d1420b1ebac703c14c408a184974b0a88a4fcdd5d SHA512 e5f7656ec36fd2a6a8b75c1f8cab2fbcc51ec86e9b5742fb238f6867c62b48cc33c32d7846ab8e2820a4b0e01c3a7447f09f0483435edf19584d21c5725f9f1c
+EBUILD wmfsm-0.36-r1.ebuild 545 BLAKE2B 74a0c3894e346d4426c3370eccc69feda719f325d89a5f0c378c2791a83b26d7e20a5714354dc2d4db0a95b162e0346b85728c5756316a5cf925906ecddadc9e SHA512 bfaf5096c0788a65f0231acb5975a9703cb5d191ed4628f52813bb90635e3cfef73be4dea8069581368e5919043641f2ff1bd18d81f46c1e4cf2aff791737e07
 MISC metadata.xml 424 BLAKE2B 38ae9b3e2e16efd2184ddfde2c9e5be3891c6b466c4e7297714082743b3e783b6a541ae96aba7f37e04492c08acb4f01dc61363450d908174e4a032a68a06c94 SHA512 791f08163435ea0180a8d698ab6ce6be109e35772a0c9386a27e3efcd20b4ceb70e6da8ba9e0b937e39aef6dcaa6e5cd69c8c0716d5ab650ea94443feabd6c6f
diff --git a/x11-plugins/wmfsm/wmfsm-0.36-r1.ebuild b/x11-plugins/wmfsm/wmfsm-0.36-r1.ebuild
index c350aba89612..9edd1516785a 100644
--- a/x11-plugins/wmfsm/wmfsm-0.36-r1.ebuild
+++ b/x11-plugins/wmfsm/wmfsm-0.36-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit autotools
 
@@ -13,7 +13,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-RDEPEND=">=x11-libs/libdockapp-0.7:=
+RDEPEND="
+	>=x11-libs/libdockapp-0.7:=
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXt
@@ -23,7 +24,5 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
-	sed -e "/^X11LIBS/s/-I$x_includes //" -i configure.ac || die "sed failed"
-
 	eautoreconf
 }
diff --git a/x11-plugins/wmfsm/wmfsm-0.36.ebuild b/x11-plugins/wmfsm/wmfsm-0.36.ebuild
deleted file mode 100644
index 43937a34e436..000000000000
--- a/x11-plugins/wmfsm/wmfsm-0.36.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-IUSE=""
-DESCRIPTION="dockapp for monitoring filesystem usage"
-HOMEPAGE="https://www.dockapps.net/wmfsm"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-RDEPEND=">=x11-libs/libdockapp-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	sed -e "/^X11LIBS/s/-I$x_includes //" -i configure.ac || die "sed failed"
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog
-}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 631d78bec00a..0b6872cd6149 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index f61d48b4f05c..4edf8b58eed4 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,5 +1,6 @@
 AUX guake-3.3.2-paths.patch 763 BLAKE2B f097157d3a6516bf5df888a8148cf2120695fc8dc6a80d14b6bc0326ab7a3a7fb4ad17adcd837766e8df442cd6d274eab9e1490c07f9969517785dd2a71641d4 SHA512 32015e084ba1e47c4cb5ece36548721f576e254ddcb29243db1609a403464a53a0ffb198f58cac84d54a2e22a432273687ced076d0ec7045865bfaf8536c1275
 DIST guake-3.7.0.tar.gz 1215186 BLAKE2B ff60f83fce5fbdd3712e261bbb72247cdcb311b8208af75007183bced88fcc2d2ebe3c49b76e2264786246444e9d07a41f884de949112c249277717070d64c11 SHA512 578c42ed41049acd253e0c409a9ecb103c7f71679fc5efdd94c60461b952ac77c836e59439361e1cd70e5fe6785ab4c15e7bf73b9f4c7d23b47c77468fa05f62
+DIST guake-3.8.0.tar.gz 1125090 BLAKE2B 72ee6b5e93c3433fcc2863d2b0aa198326cc4889126454040ce870fdeaa0ba110723410355ae49b5e2e4876fcad3f9d849873adaddfcf1ecfa83dc1583db57eb SHA512 6e0bb6b4a0c92c163bd6151c65936a38d93624166af5a4e2b042f9ade7f28683c8e8fad802b23a07edd478e2dd3b99a559069c9935f1154585be936d1b7a96ed
 EBUILD guake-3.7.0.ebuild 1767 BLAKE2B 3358dad3874118a2af413ba00a48fb072bf3cde0ec0d4d0a371ef0d7de2973ae4ba2f1d4d744821ad33201252a386191a59872a1d84cf3baa5ad2e2e27690f9c SHA512 38b8cfa20a37f06474978f067fd125aa863d92b1128af685540041d1ae49a6b4702878f5a248cebbe35b387bd8101ec5e23e49a57485f6d42936de80d2ba093b
-EBUILD guake-9999.ebuild 1538 BLAKE2B feb2481be734ddad1ca00b3fadc8424426d52b8e48f9eb03e5563daf79029c9105c8cf43f3848d07f9bd525ba2005aff2c22d2766a586f1ff34e0051a74bb4df SHA512 a84a18ddf1a4b908c4f439e89df8d067d0e8549f454059798ef7c0b5203ef4182060a48c1d19c2f8a5e242151c2414e916027b0df52a9e37e19c7b0573efe987
+EBUILD guake-3.8.0.ebuild 2123 BLAKE2B 8f7688df5ee33f68da0f5888e5e42540c7b5e14d7fe02c459078d9d6b083f26d22ae0745ce8d1b619c8d47a34c38a495dc46f3c1ec870370fb40d61ccb210cda SHA512 0e7ea5aec7364417070f528d1f0a5144dd115162a3c19b71a3dd780a011e77d703e3f945c905a5c901862a3265cbb65d946016d342b0d01c1f72ba2bd863c2af
 MISC metadata.xml 532 BLAKE2B 382002b9523b4776d8fe378774a8408b04f8bfac0979bca539e811fe41adec06a0dbce18201191373eb558d9bfabaa9b887eb4134262265e94c837139cafc773 SHA512 5ee8ef619e1d9f04d6560f3c62ed8bd1fa05912a4a6c94e0440ed8208d8efa1b49517c9266fc211cafde37e1b9ea029c64ba529331910688eacb5899fe8507fb
diff --git a/x11-terms/guake/guake-3.8.0.ebuild b/x11-terms/guake/guake-3.8.0.ebuild
new file mode 100644
index 000000000000..c4f5e779132f
--- /dev/null
+++ b/x11-terms/guake/guake-3.8.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 gnome2-utils virtualx xdg-utils
+
+DESCRIPTION="Drop-down terminal for GNOME"
+HOMEPAGE="http://guake-project.org/"
+SRC_URI="https://github.com/Guake/guake/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="utempter"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	dev-libs/keybinder:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/libwnck:3[introspection]
+	x11-libs/vte:2.91[introspection]
+	utempter? ( sys-libs/libutempter )"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pbr[${PYTHON_USEDEP}]
+		test? (
+			dev-python/pyfakefs[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+		)
+	')
+	dev-libs/glib:2
+	gnome-base/gsettings-desktop-schemas
+	sys-devel/gettext"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	emake PREFIX="${EPREFIX}/usr" prepare-install # paths.py.in -> paths.py
+
+	rm pyproject.toml || die # pytest fails if toml isn't installed
+
+	export PBR_VERSION=${PV} # needed if using github's tarball
+}
+
+python_test() {
+	# uses /usr/bin/bash if SHELL is not exported
+	SHELL=${SHELL} virtx distutils-r1_python_test
+}
+
+python_install() {
+	# done here so tests don't use the system's
+	sed -e "/^SCHEMA_DIR/s|=.*|= \"${EPREFIX}/usr/share/glib-2.0/schemas\"|" \
+		-e "/def get_default_data_dir/{n;s|=.*|= \"${EPREFIX}/usr/share/guake\"|}" \
+		-i "${BUILD_DIR}"/lib/guake/paths.py || die
+	rm -r "${BUILD_DIR}"/lib/guake/tests || die
+
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-{locale,schemas}
+
+	dodoc NEWS.rst README.rst
+
+	mv "${D}"/{,"${EPREFIX}"/usr/share/}metainfo || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
diff --git a/x11-terms/guake/guake-9999.ebuild b/x11-terms/guake/guake-9999.ebuild
deleted file mode 100644
index 0c37d44a1ac0..000000000000
--- a/x11-terms/guake/guake-9999.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Guake/guake.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Drop-down terminal for GNOME"
-HOMEPAGE="
-	https://github.com/Guake/guake/
-	https://pypi.org/project/guake/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="utempter"
-
-RDEPEND="
-	dev-libs/glib
-	dev-libs/keybinder:3[introspection]
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pbr[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	x11-libs/libnotify[introspection]
-	x11-libs/libwnck:3[introspection]
-	x11-libs/vte:2.91[introspection]
-	utempter? ( sys-libs/libutempter )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gnome-base/gsettings-desktop-schemas
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.2-paths.patch
-)
-
-python_compile_all() {
-	emake prepare-install PREFIX=/usr
-	emake generate-paths PREFIX=/usr DATA_DIR='$(datadir)/guake' DEV_SCHEMA_DIR='$(gsettingsschemadir)'
-	default
-}
-
-python_install_all() {
-	emake install-schemas install-locale PREFIX=/usr DESTDIR="${D}"
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 2a9e55fe7594..0f3103430950 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,14 +1,8 @@
 AUX kitty-terminfo-setup-0.19.1.patch 2054 BLAKE2B 542cad394ca0e05a075572a88519fa334e31f95736442fb151ae249aa0e550a9d5b34bf73c27dedd91fbb40cacf80953c42488e88553b193ffbcf34f5922fbe0 SHA512 ca45e263eb38557019065c699879f68259b7228d8570946c2a01a9a97475bed7f247c0fc8c9b835c1648fd712658230e4b7bd94e7712c35b4dbe33ec7da23cbc
 AUX kitty-terminfo-setup-0.20.1.patch 2148 BLAKE2B 820a445fb3b803164efb01c0ecc5ed12d173a484d702a890b7c673015e59026429e12b7254bb3b1819e972b853fbd07b098fa1459ea0241c3380c1b25eb8e043 SHA512 f45aba42732d01d577f09143cf867b983743b94cff72d07785398e2ebdd2bdaffff4b04a817e0381cb5cfdb505ed7b7fbbf090d1241d3d718b3148a5e76efa90
-DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
-DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd
-DIST kitty-0.20.3.tar.xz 3487500 BLAKE2B 49397ac2aef10e5fc41e351af65050ad510e58915392e6b1b8c022db31f2e5e81ac2cce645468ff213dafb609a30d43934b7388b93227fbbba5af7aa35be74e8 SHA512 9e9d81696bcb0d3894c04b08bc52ccf7aaf533125b3ecfb4c894b8d42dbf8511239c49f1c977d81872ce49fc6b3aa8e8c92b9c944bd31fe59fce6e3750295e58
 DIST kitty-0.21.2.tar.xz 4341440 BLAKE2B dd97d65ae6eb39b5676cc809d3b5ca48b0fcbbb4bb9cc1d212efeb1b5fb584f61decca9d286fdee6f4512aa4d56e08b3a19be70afa2f0155c8c1815e29fcd7ed SHA512 0ae41dfd61fc70746e8ec2d37c043dea7ceb70205aca056fd156348d4b9a2f6aac520c60de08fb5a3cd9bb908efdd2ad8129bbc01b69e5908f2976e5393269df
 DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94
-EBUILD kitty-terminfo-0.19.3.ebuild 995 BLAKE2B 5df1fb3ae3fd494e4ed2c8af9405443e24f8ee726f65f0736993c40f401c1831b394d14d15302bea50ff5203090568e2a8246a950db3480b170788df18904559 SHA512 ad1dc540be07de9c8c0e8dd7e524b5786f9b668b511c28ec388037b05b36f4a4b91f4948b377eed1f9d98881deee7da48c4aaa182131228aa678ec0d02696f93
-EBUILD kitty-terminfo-0.20.1.ebuild 995 BLAKE2B 69179592c87c135e8ec646b5fe9d483aefb3d0131414a6e2ede8837c58e22b1f8accb19220e66ed7e1793e1f7c2d57362dd22ea20e0f3cb86608dc631e3128b7 SHA512 5241997e9566a8c8a31320804e0e0c282dc0f20d2e941415ef661ff3b8931d1dae73821a0668617eaef2d8c8950319adc2ace55522dbe5fd445b4abdadd466d4
-EBUILD kitty-terminfo-0.20.3.ebuild 997 BLAKE2B 7ea814c3fe8ddfb828ae8f3a2cb1c9b284153c6055889344808a1f4b5be8c71b312ef759b243eda4dfcc5981b1311c18a6abb089c1f04ee3c92d3d8cda1dcda0 SHA512 017794236bf42ce2c6a49983f99229894211769d6b9ac0bc19bf21766fcc9b34e988dd1d7b5cff1bef4b9840af79381aac21e736bba3187fe48565ac40b5bdaa
 EBUILD kitty-terminfo-0.21.2.ebuild 997 BLAKE2B 7ea814c3fe8ddfb828ae8f3a2cb1c9b284153c6055889344808a1f4b5be8c71b312ef759b243eda4dfcc5981b1311c18a6abb089c1f04ee3c92d3d8cda1dcda0 SHA512 017794236bf42ce2c6a49983f99229894211769d6b9ac0bc19bf21766fcc9b34e988dd1d7b5cff1bef4b9840af79381aac21e736bba3187fe48565ac40b5bdaa
-EBUILD kitty-terminfo-0.23.1.ebuild 997 BLAKE2B 7ea814c3fe8ddfb828ae8f3a2cb1c9b284153c6055889344808a1f4b5be8c71b312ef759b243eda4dfcc5981b1311c18a6abb089c1f04ee3c92d3d8cda1dcda0 SHA512 017794236bf42ce2c6a49983f99229894211769d6b9ac0bc19bf21766fcc9b34e988dd1d7b5cff1bef4b9840af79381aac21e736bba3187fe48565ac40b5bdaa
-EBUILD kitty-terminfo-9999.ebuild 918 BLAKE2B 925db099759156ab53f750cdac53fb15bd453e1e493b419e7c807f236fd97f893718df6e7e5a4d8ef0d880544c8c4aaa16da684f5a1bb318c4d1b31432acd09a SHA512 c493c3d9fff637dc4dc8df0a3ec293f1389b5f4695a2d3b0669b6ffdcaec528db6f1b121ca10f10f69141b6bf6710c947b1b610db33dc146b7829d56d8668769
+EBUILD kitty-terminfo-0.23.1.ebuild 997 BLAKE2B 8fdd142b7c2a1afe010cd09da61097169401ba2a5af2626b7a5ed456e76a6c764fec8520678de488631ec779f307341920fad1aadccf91298b688342ecf49e56 SHA512 fe9114cacb8b3f30d44d05ef0575803a49afe410bd803580c489e7075b0ddc8bce9835f3e6e8cb661551452a5ae5fd68164c4f8c492835e55a8ac9194c03e44c
+EBUILD kitty-terminfo-9999.ebuild 920 BLAKE2B 04c2ef92eba28fe3a3fda238a8c0e9fae6b142da0446789543c8a8a4872dbab2f859627c47a620c6d679ff4b8f10288b6c21ed95a1fa7b72789c22936baa2331 SHA512 9b86523ac2eabd25194fccd6918912da9d0e10a52226dc8024eea3af890cb4aff056d2255b6a3cb9149be2b5a46a9e8ff88cc9ba5407e38fd9c1d30abc10eb15
 MISC metadata.xml 495 BLAKE2B f560d10edb2038d05893c8aa9ad5ee186b30f4bf48450df73a85b11db53e0949ee85964679c18f406b86273ca7b6d7ac4b7fd6de5bc8e197a68bb0d85f6368ca SHA512 5d43de9620940c971f8d11961bdac83906998625e44f0fe022e5daf7b7d8962c705c93817ef2991d233c15f4c62e344accc0ef52c0aa2bc6207f0763cb3e6b4a
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.19.3.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.19.3.ebuild
deleted file mode 100644
index 7f52297143e0..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.19.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/kitty-terminfo-setup-0.19.1.patch
-)
-
-# kitty-terminfo is a split package from kitty that only installs the terminfo
-# file. As tests are designed to be run with the whole package compiled they
-# would fail in this case.
-RESTRICT="test"
-
-src_compile() {
-	"${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		linux-terminfo || die "Failed to compile kitty."
-}
-
-src_install() {
-	insinto /usr
-	doins -r linux-package/*
-}
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.20.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.20.1.ebuild
deleted file mode 100644
index aa1dee870988..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.20.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/kitty-terminfo-setup-0.20.1.patch
-)
-
-# kitty-terminfo is a split package from kitty that only installs the terminfo
-# file. As tests are designed to be run with the whole package compiled they
-# would fail in this case.
-RESTRICT="test"
-
-src_compile() {
-	"${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		linux-terminfo || die "Failed to compile kitty."
-}
-
-src_install() {
-	insinto /usr
-	doins -r linux-package/*
-}
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.20.3.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.20.3.ebuild
deleted file mode 100644
index be10def6c282..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.20.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/kitty-terminfo-setup-0.20.1.patch
-)
-
-# kitty-terminfo is a split package from kitty that only installs the terminfo
-# file. As tests are designed to be run with the whole package compiled they
-# would fail in this case.
-RESTRICT="test"
-
-src_compile() {
-	"${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		linux-terminfo || die "Failed to compile kitty."
-}
-
-src_install() {
-	insinto /usr
-	doins -r linux-package/*
-}
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild
index be10def6c282..200f0cd96ff7 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-any-r1 toolchain-funcs xdg
 
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
index 4a33e547ef85..c060f3f8b166 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-any-r1 toolchain-funcs xdg git-r3
 
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 482ef77cc566..27fbb54b6de5 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,19 +1,14 @@
 AUX kitty-0.14.4-svg-icon.patch 616 BLAKE2B 2e362e1ea134f98839b8e21e337faa530de7a0613965c762589c1d85220fe2f89a17b4691dad7248669e29d511a5e9b5ded446bccc9a6d1cbdce56d715c137cb SHA512 3a60dbafc8567535a9eed422bd1ee0382ee2afa79b815dff7e8f68f090a67374741962206368ca7723e15b241556dc2ede3935b40fa67f4e6c20300b1a4850fa
-AUX kitty-0.16.0-remove-terminfo.patch 614 BLAKE2B 701aef294f7e52a2bf8a8cbe0fb192b226d1b430c1bed9f9d58e1f3c8e10362ac3b0cf04bc8de9c4e3a23acfce18bcbe3442191afcd77d76013539c8a7afe16e SHA512 667508e851c48bb66b85e3439cad92d98e12cef18dd0f45a6d8c4226b86b108d64e4d92fc5b650b7b80763665dba59f066930e4a654690d833e42e6aff13418f
-AUX kitty-0.17.2-flags.patch 1719 BLAKE2B 1d68d001f4750268375971bd533a0e153ecead672ce04410ede1a0a392098fc534ea989fcd5c2f7bd2d2581581c2ec64160c2364a1d5ef86eb67b07ec9440ea7 SHA512 49a1cb02beac7e56e6b75d1caf1fdf3111146eb5b40b29f0acf646052a95be84bb943c8a1b15eda8f2c10bc86437387dd465a8d9b044cbf7305cefee1c9fc97f
-AUX kitty-0.19.1-tests.patch 485 BLAKE2B 7058b51a6c2845d81839d8cd1c379ffc3bdd9e1dfc13a32d32570ee7926244c996d59a8ada237c81199547e2f3209299860585fc98609cefaac3ba98e4e32ba2 SHA512 6e14aa951d1553bbd68ebcbae55dfbab785361abd7301d480d729720c1a1945bc3658eec4148bd55a9d46772cbf35ec643fdfedb9d0e0d5ec92e956ba58f0893
 AUX kitty-0.20.1-flags.patch 1995 BLAKE2B e563ab5c09d43e8701e6ec5df519c47ae952054da72fedf106809f1c3775f00e172de7146734e10186f75ab10b8b0d42faa2ac6402cac5d57fdd8d5e611d90b0 SHA512 cbc8660909c3e07e16f720528265384bef2152fc33e41fbbef057fcd436216071ebfc0b4956284bd0e8e745ba28ba41221da8fff8d7f9a704fba6b79ea021f6f
 AUX kitty-0.20.1-remove-terminfo.patch 754 BLAKE2B 12fae3be4b6a9ae6a2c49671e95c24fb9c73e5d18261e4817e5abbbe4419804dc9ba3b387d77fd4fb296108f294c3a8a7f7285814edfa8d5d9e62b7b5cca36b1 SHA512 17101f03975210e183ee1a4370d65a5bd40812dbf253f66038c8f534085974369ee909302109a8315f1c982d00299aef5a7a52a98dadd7ff46f9431ead6f748b
 AUX kitty-0.20.1-tests.patch 514 BLAKE2B 69c4277b4ffc257cc8320dbfc5be95d72bcb35b70a377f8ef24ecd9a20036313ce52f245efd5f620b47ddea6f688cb0d3b4154d8787a3908d5c255ca26143f80 SHA512 bb5dd23b0e83118fd33296e1ee8c6485e51f29518406e1e875b2f5ec8e7de4103c9ec2b4c99516a3d4fe6134ccf5bf0d54e4a37bee89e64f294da4b0350d337c
 AUX kitty-0.20.3-flags.patch 2252 BLAKE2B 62743ee798196ec14ae3899e481271890507563b438ef87f8e7d19f2cfa79def5118aba39bdf402d6d505b208d1082af156c4feb4a113a5bd1fec481c1ffe20f SHA512 2480194e3f5dbee2fe2e70c5c54c69cb497d3dae9914508d3c0488de9227169cb8c023834627d0c55f863498d89890c31110fa3c3ee740b241b99bf299557007
 AUX kitty-0.21.2-flags.patch 2264 BLAKE2B f97139220f48a65fcb7da0cf166b27b9827d5e01f21bc0549f0bf3ce87287f787b167283cf05d82ca15bef7c996da4c512aa6e483900ea4a6c44015de362d11c SHA512 845bd40360730d498de16764423263014bd299c7a9072f12810e859ba851d88d7f1429d2844c7defd0b389694be7ea3dbc2d4e4a4718e35f090440b7d0ef0e84
 AUX kitty-0.21.2-remove-terminfo.patch 666 BLAKE2B e551e919d3a2ea31d53122e1bdd02e492e3ca0f6a0335b94d1e37585f82b2b0340743cd3536b43b9f26865917a01526e09379b02c9f2e55104bb8f4ec8b91b11 SHA512 2ca3ce3bdcbc1c0ec824d496d1682c800960f42289d75d2e92022873c8cf6a6a5095d97241fe5eb3b05949e18ae113719c7542643244d03521c01a857c59f48f
-DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
 DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd
 DIST kitty-0.20.3.tar.xz 3487500 BLAKE2B 49397ac2aef10e5fc41e351af65050ad510e58915392e6b1b8c022db31f2e5e81ac2cce645468ff213dafb609a30d43934b7388b93227fbbba5af7aa35be74e8 SHA512 9e9d81696bcb0d3894c04b08bc52ccf7aaf533125b3ecfb4c894b8d42dbf8511239c49f1c977d81872ce49fc6b3aa8e8c92b9c944bd31fe59fce6e3750295e58
 DIST kitty-0.21.2.tar.xz 4341440 BLAKE2B dd97d65ae6eb39b5676cc809d3b5ca48b0fcbbb4bb9cc1d212efeb1b5fb584f61decca9d286fdee6f4512aa4d56e08b3a19be70afa2f0155c8c1815e29fcd7ed SHA512 0ae41dfd61fc70746e8ec2d37c043dea7ceb70205aca056fd156348d4b9a2f6aac520c60de08fb5a3cd9bb908efdd2ad8129bbc01b69e5908f2976e5393269df
 DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94
-EBUILD kitty-0.19.3.ebuild 2259 BLAKE2B 2d1cca2f65297e9d90e50b417906ca25a6544aa11417bcbb1ed6fad3f2c23a324fa74248833cf8609812730cc0d30c939aa7468403df516db691b3038bd59af4 SHA512 00e930df5964ac1dc70df020dd8f71c9f43e474813662ff16381f71efd94c25f2bd988dde8fdda0f0db30012f17b7cb26eb771e9288c67482cdb46bd126234cd
 EBUILD kitty-0.20.1.ebuild 2437 BLAKE2B 8a4a8b12230e8bf949d8033f2625eaeac2c9b44cd650808610f7a5e898f8c4b7a0055f07e146fa665c668f606a3114e82f671acc8e851a1686e7f7068a6d943a SHA512 80dfe575df244ac936c2038513f263857b2175fcfed5f0c6b1baf01d080fa25941c6225a6d844ef59b2539822151a4253895bc36a797f5bd7e439cc9caee92a2
 EBUILD kitty-0.20.3.ebuild 2356 BLAKE2B 4c0cf0cda36e73e4127cc40c46a4ff3c56c63929538dd2077364cbfd2ea0e432df7e31528be1cc0600777295ede31e3369f0027a836663a0eff47737c76196dc SHA512 bb4a0e3ed5612ce5f0f7a8abc41b70925584a5d536d8210cae275bd94a16878f55fc8eeb2d91ca020e2974bf044f26b9a5fac6a434595fd6268bec5a9bcb3600
 EBUILD kitty-0.21.2.ebuild 2383 BLAKE2B 6f2831db949398f23a5402d91b6819c12e53c64f87ef2fdd7e855556d7b881a0f4fabc43b0f328025c3742920ca3702ed0c05825f3d9921700e6d14196e641c1 SHA512 4bf9028ca55a0e46b3aae6c35d01f1356fa8ecc3b02d53fe0865ffa69bc2629231243d187bc4a090941809bfb169fc98ec7f68ba7d6aecda72893a8c4fdda526
diff --git a/x11-terms/kitty/files/kitty-0.16.0-remove-terminfo.patch b/x11-terms/kitty/files/kitty-0.16.0-remove-terminfo.patch
deleted file mode 100644
index 4b7352aa73b3..000000000000
--- a/x11-terms/kitty/files/kitty-0.16.0-remove-terminfo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -837,11 +837,6 @@
-     safe_makedirs(launcher_dir)
-     build_launcher(args, launcher_dir, bundle_type)
-     os.makedirs(os.path.join(libdir, 'logo'))
--    build_terminfo = runpy.run_path('build-terminfo', run_name='import_build')
--    for x in (libdir, os.path.join(ddir, 'share')):
--        odir = os.path.join(x, 'terminfo')
--        safe_makedirs(odir)
--        build_terminfo['compile_terminfo'](odir)
-     shutil.copy2('__main__.py', libdir)
-     shutil.copy2('logo/kitty.rgba', os.path.join(libdir, 'logo'))
-     shutil.copy2('logo/kitty.png', os.path.join(libdir, 'logo'))
diff --git a/x11-terms/kitty/files/kitty-0.17.2-flags.patch b/x11-terms/kitty/files/kitty-0.17.2-flags.patch
deleted file mode 100644
index 5a247679dc82..000000000000
--- a/x11-terms/kitty/files/kitty-0.17.2-flags.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Respect user CFLAGS.
-
---- a/setup.py
-+++ b/setup.py
-@@ -236,7 +236,7 @@
-     if ccver >= (5, 0):
-         df += ' -Og'
-         float_conversion = '-Wfloat-conversion'
-     fortify_source = '-D_FORTIFY_SOURCE=2'
--    optimize = df if debug or sanitize else '-O3'
-+    optimize = ''
-     sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
-     cppflags_ = os.environ.get(
-         'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'),
-@@ -217,7 +217,7 @@
-     cflags = os.environ.get(
-         'OVERRIDE_CFLAGS', (
-             '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
--            ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
-+            ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden'
-         ).format(
-             float_conversion, std,
-             optimize,
-@@ -232,7 +232,7 @@
-     )
-     ldflags = os.environ.get(
-         'OVERRIDE_LDFLAGS',
--        '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
-+        '-Wall ' + ' '.join(sanitize_args)
-     )
-     ldflags = shlex.split(ldflags)
-     ldflags.append('-shared')
-@@ -614,7 +614,7 @@
- 
- 
- def build_launcher(args, launcher_dir='.', bundle_type='source'):
--    cflags = '-Wall -Werror -fpie'.split()
-+    cflags = '-Wall -fpie'.split()
-     cppflags = []
-     libs = []
-     if args.profile or args.sanitize:
-@@ -626,8 +626,6 @@
-             cflags.append('-g')
-         if args.profile:
-             libs.append('-lprofiler')
--    else:
--        cflags.append('-O3')
-     if bundle_type.endswith('-freeze'):
-         cppflags.append('-DFOR_BUNDLE')
-         cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
diff --git a/x11-terms/kitty/files/kitty-0.19.1-tests.patch b/x11-terms/kitty/files/kitty-0.19.1-tests.patch
deleted file mode 100644
index ee489b0dce34..000000000000
--- a/x11-terms/kitty/files/kitty-0.19.1-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/kitty/constants.py
-+++ b/kitty/constants.py
-@@ -64,7 +64,7 @@
- def kitty_exe() -> str:
-     rpath = sys._xoptions.get('bundle_exe_dir')
-     if not rpath:
--        items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(base, 'launcher')]
-+        items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(base, '../linux-package/bin')]
-         seen: Set[str] = set()
-         for candidate in filter(None, items):
-             if candidate not in seen:
diff --git a/x11-terms/kitty/kitty-0.19.3.ebuild b/x11-terms/kitty/kitty-0.19.3.ebuild
deleted file mode 100644
index af521efe1f62..000000000000
--- a/x11-terms/kitty/kitty-0.19.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_8 )
-
-inherit optfeature python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-1.5.0:=
-	media-libs/lcms
-	media-libs/libcanberra
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-libs/zlib
-	x11-libs/libxcb[xkb]
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrandr
-	x11-terms/kitty-terminfo
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.17
-	)
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
-"
-
-DEPEND="${RDEPEND}
-	media-libs/mesa[X]
-	sys-libs/ncurses
-"
-
-BDEPEND="virtual/pkgconfig"
-
-[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.17.2-flags.patch
-	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
-	"${FILESDIR}"/${PN}-0.16.0-remove-terminfo.patch
-	"${FILESDIR}"/${PN}-0.19.1-tests.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	# respect doc dir
-	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
-
-	tc-export CC
-}
-
-src_compile() {
-	"${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		--update-check-interval=0 \
-		linux-package || die "Failed to compile kitty."
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	insinto /usr
-	doins -r linux-package/*
-	dobin linux-package/bin/kitty
-	python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	optfeature "Displaying images in the terminal" virtual/imagemagick-tools
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/root-tail/Manifest b/x11-terms/root-tail/Manifest
index 5a39fcb7df51..d8a78d49f4f5 100644
--- a/x11-terms/root-tail/Manifest
+++ b/x11-terms/root-tail/Manifest
@@ -1,4 +1,4 @@
 AUX root-tail-1.2-kde.patch 3188 BLAKE2B 122e2ade46725c9e1dacaf5e68f283b3efe2c968407e48d7ee0567e10d5d360f479588ac1b9f6da74a5d0fec52e83ac51ddc6789d8b560c43a83aba5b1ba5ac4 SHA512 f99c8cd04664d7e1afe21854d2ba9114387c55fa89268aca7cbeb88ecfeedad26529bdfd2b52dbe88d74959f4943571bda1f518fb41d8827f04f25e250bc7fb7
 DIST root-tail-1.2.tar.gz 20805 BLAKE2B 29891f0bbedc18d6b4e6e726234d7abaf107fa96b3da3a38a5a3aa91edd00403ae52166491cd5ec59f903b12c0edcddc92a3576db3127a837ae9ac3480823c40 SHA512 9e0b046d3e22ad8e85baa356ae8850885759e28624840901465c88c5791595db89da8d7908446cfa52cef180d2ae5a6d3857310679dc37545b6a9cabdd1d3e10
-EBUILD root-tail-1.2-r4.ebuild 1068 BLAKE2B fd3ab90f2d0ec13e0d97641e486ff78421f5e242cf5796c14ed31db5682399e58bc4e16783edbf2b64d0c7d06739bc66e2fc9ce6b7671b19909e457c0b4b656a SHA512 936c40718b7b9ff2b559433a5600eeca7cfa34160e3e3cdefd8ff7b354a71c8f36d3c811b5092638c3f518e3744e3b869261899ae84f2f234ad6bf571751ac45
+EBUILD root-tail-1.2-r4.ebuild 1075 BLAKE2B fd551413aab84e94f4dc07c68b5188fb4973363eccef0895b224a94510f393c75f9586be2ce298cbf93aa52f33a11f991c4ad3e7bb3abefec1b57146b4de1296 SHA512 e214bab918f3da289e680b810f5e409befa33524ea0b00b1963400bcf60fd11deb5da7a331d372f9e80d8c3fc828f4e17f95801d154d2d59cafb5857bc497203
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-terms/root-tail/root-tail-1.2-r4.ebuild b/x11-terms/root-tail/root-tail-1.2-r4.ebuild
index ea4f261a0a94..aa82399568d3 100644
--- a/x11-terms/root-tail/root-tail-1.2-r4.ebuild
+++ b/x11-terms/root-tail/root-tail-1.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE="kde debug"
 
 RDEPEND="x11-libs/libXext
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index 4fa70d49d76d..adf27a5d8e2b 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,4 +1,6 @@
+AUX st-0.8.4-locale-musl-segfault.patch 513 BLAKE2B 2c2ee2aee8c7a19f11f00d89254e1679cc0278da09b64b469b296c0a81e6afecd67216b70f6244aad086ee1fd5f3729472376968f5247e6891ba39242a8ec9ae SHA512 367b8019ecec058eff0fc499baaea2e29abbf60df6b944eb9b5389336d4e6156fbbc2773326643978eff7cbf15810232f7d30587b0d951ee41ce34114e8277a5
 DIST st-0.8.4.tar.gz 47330 BLAKE2B 709278a669414d7d44beba02ebb606853dbaa9cfe71650e40a11d3691d6bee2c0b2e8db57ca2df52776ca564a20f64f3ef7acec8dbad6d66408d314fe26fb794 SHA512 f6f95081f9d09d442228bac1149d75d36a9f4f049b5504cf5ce00b353563ff92c62a2628ce728663fec107a14bea0eeb22b7a72804c37090de33819243d7512a
+EBUILD st-0.8.4-r1.ebuild 1466 BLAKE2B 6a12c7a52c2e626eefe0fcea85f655e54c247596e0ed2400f1e546d7f93012384620dd5717b85d30d6817e8b4623c6bb48ad1b61238c51c38c0427f5bfd3492e SHA512 869a37fed185091df0f48d306245738eb54bc7bcd8392b1582d077f3c389cde296cec2df43f01ee449ad9f159218c45a58717e3d86ec5148e94f1426e1700cc3
 EBUILD st-0.8.4.ebuild 1401 BLAKE2B 6400f8c79f9f20ea5c129aa2088dde5c7c554598eeedbec0beaa56ff31251723a7943974374cd70ba0dbe8c78f797f83ffb4283d1193b5c9f24c41798337a261 SHA512 870cbb53c3eef4f634d028750dee56262725d42e7f9c7902f2ae3e7c87ca40fa0626dbec7c58d86a9a8f5fba5703cd8c01c0da8624310180fd8bf36efd43419e
-EBUILD st-9999.ebuild 1367 BLAKE2B 17a55761d49fe1ae3c88a730ccae177895e4174b8755680d53836045bfeab38e2eae9cba338d8fbd4d66184b840f46035c9960972108d9d8239ee8c4c7107e5e SHA512 f30b676ff15da80725d672c35bf3581d7424c431dcede7c2412dfe2390fc31e4982de33c7cb2edd0a26d29de29a48a4a264ad9e86ca0518d36bca2f078f7cc4c
+EBUILD st-9999.ebuild 1368 BLAKE2B f71916b6b4d68e39140eb241d5384857645f7bd15c07e418ebeb4ec19dcb60d9baa5fb17244c574ae5dd0efa66bf8dd4a9ead92daa7180a0c7507aed489b3d58 SHA512 b9383a140252f7dd4bf5c1bfa218fd07f4d49f33ec6b904ba35afdb53d3cc126a0db7a2e8ff0de1c88cb28617444a94f911fcb7285e653c62dd3253b1efb855a
 MISC metadata.xml 254 BLAKE2B aabbd5365abdb36c7ee6418a30169bc87cdd6cf8175a1f3c5d4e27f84b4309f34a42342887ea5e73eeef602a69582854266900794cc81d8e951d2e5f0480b650 SHA512 030e3a92db3cdca585debc6b26403cc6679a4b5f87bdc188a9dfaf4779adca1b4e8445a755618abe5a43157300292a596c5a6850ebe6f6f7f400d3f46ef2e0f9
diff --git a/x11-terms/st/files/st-0.8.4-locale-musl-segfault.patch b/x11-terms/st/files/st-0.8.4-locale-musl-segfault.patch
new file mode 100644
index 000000000000..b70574025eb2
--- /dev/null
+++ b/x11-terms/st/files/st-0.8.4-locale-musl-segfault.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/784071
+https://git.suckless.org/st/commit/2f6e597ed871cff91c627850d03152cae5f45779.html
+--- a/x.c
++++ b/x.c
+@@ -1585,8 +1585,9 @@ xsettitle(char *p)
+ 	XTextProperty prop;
+ 	DEFAULT(p, opt_title);
+ 
+-	Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
+-			&prop);
++	if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
++			&prop) != Success)
++		return;
+ 	XSetWMName(xw.dpy, xw.win, &prop);
+ 	XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
+ 	XFree(prop.value);
diff --git a/x11-terms/st/st-0.8.4-r1.ebuild b/x11-terms/st/st-0.8.4-r1.ebuild
new file mode 100644
index 000000000000..9ce9140045af
--- /dev/null
+++ b/x11-terms/st/st-0.8.4-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop savedconfig toolchain-funcs
+
+DESCRIPTION="Simple terminal implementation for X"
+HOMEPAGE="https://st.suckless.org/"
+SRC_URI="https://dl.suckless.org/st/${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+IUSE="savedconfig"
+
+RDEPEND="
+	>=sys-libs/ncurses-6.0:0=
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXft
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-locale-musl-segfault.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
+		-e '/^STLDFLAGS/s|= .*|= $(LDFLAGS) $(LIBS)|g' \
+		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
+		config.mk || die
+	sed -i \
+		-e '/tic/d' \
+		Makefile || die
+
+	restore_config config.h
+}
+
+src_configure() {
+	sed -i \
+		-e "s|pkg-config|$(tc-getPKG_CONFIG)|g" \
+		config.mk || die
+
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+
+	dodoc TODO
+
+	make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' ''
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	if ! [[ "${REPLACING_VERSIONS}" ]]; then
+		elog "Please ensure a usable font is installed, like"
+		elog "    media-fonts/corefonts"
+		elog "    media-fonts/dejavu"
+		elog "    media-fonts/urw-fonts"
+	fi
+}
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index aeafbd94f115..525453f3d78e 100644
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit desktop git-r3 multilib savedconfig toolchain-funcs
+
+inherit desktop git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="simple terminal implementation for X"
 HOMEPAGE="https://st.suckless.org/"
@@ -21,9 +22,9 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto
 "
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 664db4caa3f7..1ecdc5768633 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-terminal-0.8.10.tar.bz2 978071 BLAKE2B a74f6037b3ea28ac5561e7251368c0e039a43af1968abab86c44fee5575d1fe9c61b3521be156b48bd7084f7169fdcd9757cb6bfe0c99b539bcb865e9150e358 SHA512 92310837445adf3b611c069d28abea05650b93d54500c0436fb90e0a9be8846122d6ca69f8e6f89a11f2067dc4bfae5557bb11af48d62135b2e5eb395ccdb0f4
-DIST xfce4-terminal-0.8.9.2.tar.bz2 945176 BLAKE2B a37a665601c5bdb2f53cd62a0909befaabd9bca0747d477fe369f4e325be15a362d249ae675e6cf707ecc89e623b4b1d73f7a31d32f6c6fcc13e4c57684f5d4b SHA512 1402d913bcc0c050b6c83405c754cdec71cf9bb56e2e68e4396d7ce48bec6e1b0cc875ea3ea2f7a0dff8280d306519fd74a8f9d9ebca383a8f295991cb9ddd94
+DIST xfce4-terminal-0.9.0.tar.bz2 1006628 BLAKE2B a96d661a38865af67119729ce0d401f2b08a43ed3ade891fc65756b007b40b43485d4fdad83529323984a6c9f6df4ea7548c9bcbadf7ec25dce97add5d0f0592 SHA512 c431cc3ba93695683301d4a742758ad26994d892d00f394d166315b62a70d00c04e32752fa478b9afbf5642916a0da9470ea22079f9698fbb8455f45f05e2453
 EBUILD xfce4-terminal-0.8.10.ebuild 977 BLAKE2B c608ad9804c99786378552eaddf13e32c4d56fe40065ba973aabd7752d2f4252cd6febe80a7f21110103190a069c55da341629d7ae8abcd35184641c3145252f SHA512 35aeff69ad1f1c579f89aa69ef341705439efe85acf7d89be6038aa27cc1354dca6f1edb000fead377e4dbb91d5f9cf13627749a499932589a339de5f5fe36a5
-EBUILD xfce4-terminal-0.8.9.2.ebuild 906 BLAKE2B 01069e7fe903b8b1769bc566384646a11b0cc2304efdb0d9a4ebf64aadc4c492d790b421c72e4bc305c6c288fb489b2ff3102bc6ed6101d1056e39043908f446 SHA512 d65079524bb575b840d826ec64d5185d77016f0d52cbbe4a0ecc6b77d241a9549bdd71a57cd8ab3e3016587f64f69863166df59f9fe0870882e367b1ab011fbc
+EBUILD xfce4-terminal-0.9.0.ebuild 983 BLAKE2B af82ca76d01cefa58b0bd25056fc697ffe6bb24572722757249ec7585653e73cb8d89b1625148dc9e5a1d3f98277f2e6352738e399f0ffc91aa4d890ae0f17f3 SHA512 bd3594e68e0e875d18c4e7f84b7925ae462e81ff22f0f703aa7ad6b5fe41f24a855e9d21449e62b6eb79218a68643de4a3cab6a4e10c8e0f4b895651d0c43b66
 MISC metadata.xml 372 BLAKE2B bb4bcd3652bb3bbaee272af26e6b07b5279167c165574cfcbaa1c23d8b9786cc79972325893fc563aac5ae1eef257ebe4807199497a02c147515af68b80e27a2 SHA512 722c99f01658541a9d1df513ffa218ac36897644e771d8b439bf6b2c38e241304c0a43c94115ed95f367ba6e3a8606bee2c63ef8c1ef9841f08b9f06977751c7
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.9.2.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.9.2.ebuild
deleted file mode 100644
index 3f7498753831..000000000000
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.9.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver
-
-DESCRIPTION="A terminal emulator for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="utempter"
-
-RDEPEND=">=dev-libs/glib-2.38:2=
-	>=x11-libs/gtk+-3.20.8:3=
-	x11-libs/libX11:=
-	>=x11-libs/vte-0.38:2.91=
-	>=xfce-base/libxfce4ui-4.10:=[gtk3(+)]
-	utempter? ( sys-libs/libutempter:= )"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS )
-
-src_configure() {
-	local myconf=(
-		$(use_with utempter)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.9.0.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.9.0.ebuild
new file mode 100644
index 000000000000..182386ffe3aa
--- /dev/null
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.9.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A terminal emulator for the Xfce desktop environment"
+HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="utempter"
+
+RDEPEND=">=dev-libs/glib-2.42:2=
+	>=x11-libs/gtk+-3.22:3=
+	x11-libs/libX11:=
+	>=x11-libs/vte-0.46:2.91=
+	>=xfce-base/libxfce4ui-4.14:=[gtk3(+)]
+	>=xfce-base/xfconf-4.14:=
+	utempter? ( sys-libs/libutempter:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_with utempter)
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 04595fccec1e..74f7dadf9234 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -6,4 +6,4 @@ EBUILD xterm-366.ebuild 2639 BLAKE2B 55e6d4909bf9f0e70d768850a4cca92c56225ce0283
 EBUILD xterm-367.ebuild 2639 BLAKE2B 55e6d4909bf9f0e70d768850a4cca92c56225ce0283ad197dc9d140940993a952295e462a8d3565f4fd1173e2d1688ed59b1e0272fc1b1b39d498cdbf3d00111 SHA512 8c59b66c2534ea3d224b1cde39bc54bfa11e5b47f2828dee855bd5d38a2603515caa003b9d12bc80bed4c60f4d43160cb12ef5d0c7d5051426584984c4777b2e
 EBUILD xterm-368.ebuild 2646 BLAKE2B a02c621fdb8353916253b308b2941dad2574b1dc40edd21aff79ae6e10c62b0d6103d40e260543a2d1d116218894ef39c2c0b8c660b66dfd3a5e9633cd961e29 SHA512 bcb84fc47ded01968d6c3c6a21483006521efcce366a39a984a7f13527affb3ccc870572d702dd263579db84fa2ed80766ad214eeab27e1670bf0fdc98da3255
 EBUILD xterm-369.ebuild 2646 BLAKE2B a02c621fdb8353916253b308b2941dad2574b1dc40edd21aff79ae6e10c62b0d6103d40e260543a2d1d116218894ef39c2c0b8c660b66dfd3a5e9633cd961e29 SHA512 bcb84fc47ded01968d6c3c6a21483006521efcce366a39a984a7f13527affb3ccc870572d702dd263579db84fa2ed80766ad214eeab27e1670bf0fdc98da3255
-MISC metadata.xml 562 BLAKE2B df34f1d08eef58a8e88c179d3a602a66774b96749258c96b8a23d1319a93a7deded0bf4829c2b746eb9a6fff6260878c8a45ec9968d5718db9ca24a26db043d0 SHA512 e46d04cfaa299f6fb1b1b8890cf30d3cae42c67c543a9f3c85f37a5728fb54c2669e4a86926988d97cb258d1d697432c618b3840e227e4f97483708b335e6411
+MISC metadata.xml 551 BLAKE2B ea228db9f2a50592917875e25ff88094c4aa1389db78b1301c59f98e3b3259ea69827c20e48a187c423b6303977532b9172a3dedd08e52cb1faf3e60bfb181db SHA512 fa450afa13de5b0fabb81f6fa55961e1b603f902836065736ed381cd447561eda6449a269e4c2a3d63c1c6967848c82997b93fa6462b7a622361929e619d1025
diff --git a/x11-terms/xterm/metadata.xml b/x11-terms/xterm/metadata.xml
index 4f54234194e4..f4e653d10222 100644
--- a/x11-terms/xterm/metadata.xml
+++ b/x11-terms/xterm/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
 	</maintainer>
 	<use>
 		<flag name="openpty">Use openpty() in preference to posix_openpt()</flag>
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 8909e6ff0632..ed0afd665910 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/fvwm-crystal/Manifest b/x11-themes/fvwm-crystal/Manifest
index 3e01f3d40f4b..a721badb1c49 100644
--- a/x11-themes/fvwm-crystal/Manifest
+++ b/x11-themes/fvwm-crystal/Manifest
@@ -1,3 +1,5 @@
 DIST fvwm-crystal-3.6.5.tar.gz 5899049 BLAKE2B addd82dbbab9b457a94715a969a27ff6ef2be07cddd33a379dc4d5348c9565d3a19943828b068ec5ef5f6d032f51b77a1990316ee7b3e16e5dc98ddf32f98c7d SHA512 45cd99b83342e5e5f0de89edc92dbba3311efc7ef431d509490e3fd5b49420e94d1cef55865f45e731fd4c13172c6e2d26fbd10107cdb4a4f525379e17b94e6d
+DIST fvwm-crystal-3.7.1.tar.gz 5936306 BLAKE2B 3a47ddab10365faf13c4b9de8ac172b2f91073addd7799315a47901c10b28b6b16c89ccb9c4a313285cd1e9b40d6ecd8b563e8764bb063d249ceb54804d63ec7 SHA512 0e61bd190ab0b9f4c51b65e9bbeb3689c38127769166f90fc2eff655c68b11c60e67ef35417ed7e97d06bb549d2a87ba6785fc6530a5269d19c1243d3cbe27ed
 EBUILD fvwm-crystal-3.6.5.ebuild 2479 BLAKE2B 869b8d37dcc17ee843ecdf79053fa9a08fbcce9e6d4b4c7ee5439e97018bc4fc454730195b5ff48c3d65a44a31b0dc5aab2b2661fd8057268cd55c544c61e26e SHA512 c30ac420f1c1c21776faa75dcd6b961efcb2708e098ee5859e646738440254cea723d22f5a9d627e5f53d2c1f1315e983a387e0e22da7974b2b95ee7580cd5f6
-MISC metadata.xml 1170 BLAKE2B dcfa2c6926ac3b3934a9d908248b636a916fe73c1d9665e6a5ff3cbdec88d3ca02429cdc1c60412e82b13873e285f9bfe4ea9271375b1357cc707860bbd72240 SHA512 660bbb2d56f93d44ddb6beeb28775f3950d330bd37c958c589a53c3952a761741b4c33bc1d9fda7c3a34b273c15ad909080f35a8015e9b3e7e426a0bfaae7390
+EBUILD fvwm-crystal-3.7.1.ebuild 2185 BLAKE2B 6458ae9c1b663040d868887fffe274798a07e3fbfe6660f95a459317aeb51485848cdf2eda19a5da695f4d5d7ca061c424ac808fe643ef127a5bcb91311cada0 SHA512 e20bb6ba33e518c5ea2abd05a042b605572e94c6711b6bee337402c0c330f6f5525afed232cb5cf0c065aab9e2816812c988b8824b1d0b6859066754368975a8
+MISC metadata.xml 1237 BLAKE2B 3309596bab642a50c8697ceaa0d513a4042fcb88d45b252fb2b01ac5e107b5204b54ea6511dc5c4b7d784461dd2ea919928e97240cc1d2481848f8a0c39dbf40 SHA512 57502a32cb3df26c4afa1a84acbb84fc8a59c0795e2ffba7cf4494ffe842aaba7642443f39f88e74ea18efdeb4d7fe66604dc8898fc2c2f26c94ce4ab5ebd70e
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.7.1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.7.1.ebuild
new file mode 100644
index 000000000000..341bd3f4a022
--- /dev/null
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.7.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit readme.gentoo-r1 python-single-r1 optfeature
+
+DESCRIPTION="Configurable FVWM theme with transparency and freedesktop compatible menu"
+HOMEPAGE="http://fvwm-crystal.sourceforge.net/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fvwm-crystal/fvwm-crystal.git"
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+RDEPEND="${PYTHON_DEPS}
+	acct-group/fvwm-crystal
+	>=x11-wm/fvwm-2.6.9[png]
+	virtual/imagemagick-tools
+	|| ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
+	|| ( x11-misc/hsetroot media-gfx/feh )
+	sys-apps/sed
+	sys-devel/bc
+	virtual/awk
+	x11-apps/xwd
+	media-sound/alsa-utils"
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="After a first time installation, execute the following commands:
+	$ cp -r "${EROOT}"/usr/share/doc/"${PF}"/addons/Xresources ~/.Xresources
+	$ cp -r "${EROOT}"/usr/share/doc/"${PF}"/addons/Xsession ~/.xinitrc
+You can edit these files at your convenience.
+
+Many applications can extend functionality of fvwm-crystal.
+They are listed in "${EROOT}"/usr/share/doc/"${PF}"/INSTALL.*
+
+To be able to use the exit menu, each user using ${PN}
+must be in the group fvwm-crystal.
+You can do that as root with:
+	$ useradd -G fvwm-crystal <user_name>
+and log out and in again.
+"
+
+src_install() {
+	emake DESTDIR="${ED}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+	# GNU License is globally in the portage tree
+	rm -vf "${ED}/usr/share/doc/${PF}"/LICENSE
+
+	python_doscript "${ED}/usr/bin/${PN}".{apps,wallpaper}
+	python_scriptinto "/usr/share/${PN}"/fvwm/scripts/FvwmMPD
+	python_doscript "${ED}/usr/share/${PN}"/fvwm/scripts/FvwmMPD/*.py
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	optfeature "localized XDG user directories support" "x11-misc/xdg-user-dirs"
+	optfeature "hibernate/resume support" "sys-apps/systemd"
+	optfeature "professional sound server" "media-sound/jack-audio-connection-kit"
+}
diff --git a/x11-themes/fvwm-crystal/metadata.xml b/x11-themes/fvwm-crystal/metadata.xml
index a26cb6f4f866..1e5a1b8f267c 100644
--- a/x11-themes/fvwm-crystal/metadata.xml
+++ b/x11-themes/fvwm-crystal/metadata.xml
@@ -23,5 +23,6 @@ with additional programs and scripts. Some of it's features are:
 </longdescription>
   <upstream>
     <remote-id type="sourceforge">fvwm-crystal</remote-id>
+    <remote-id type="github">fvwm-crystal/fvwm-crystal</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/x11-themes/silver-xcursors/Manifest b/x11-themes/silver-xcursors/Manifest
index 572f1cd6a9be..cb584b8ff73d 100644
--- a/x11-themes/silver-xcursors/Manifest
+++ b/x11-themes/silver-xcursors/Manifest
@@ -1,4 +1,4 @@
 AUX README.gentoo 568 BLAKE2B 3ae63af300467ccc8061fc7bceb862bfdbda0ff14bc3ca5cf8c7f0ddb9dac0b838fc4fcf8e6293ee96e4887249a7d3455a7cb77419addf613322eb60f4a09f71 SHA512 09a4bf7b2d7a395167ea67ce95e6f6b63f98af495d437b84757d742b73371b64e48ef6fafd61c57cbb5075506322318285d42aa18c25b98b5cc35cea0e71205d
 DIST 5533-Silver-XCursors-3D-0.4.tar.bz2 756159 BLAKE2B 7d90a44a022512e685b592e6285786e5b4898df723cba9deb52100e66c76865b5d2ed07968901656fc5c1ef565c54f281138e9e6f323e94bcb6c1b7884c792c5 SHA512 b5b44a796d5d9341a0e92f8f4351b84eb3974d1908eb2fdb012c0490e4374404e3d33b35873f49c1f7ccd56bdced4fff14338319edabab7d11ddf31cb46fd245
-EBUILD silver-xcursors-0.4-r3.ebuild 584 BLAKE2B 5ceaef8ac39f1767a7282bbcd30e9a9dfce33d730ea9da0f2165d2d825361dfa899010c597d9511987ec26e7b35ad0124c823dbcb6463015181defb10632082c SHA512 7729b2fc4f2409126b8c9b2dfbbe3820089034160d77e9480d3d3f198a890d14a76759267acf199ec470a9fc8852f46a3d030f51ddee6adafdb727b99ca2ad44
+EBUILD silver-xcursors-0.4-r4.ebuild 590 BLAKE2B 997b4bdf2a4db7e099dd042289a06b1f43805bf05a19131bbf140474318b4f793589f5c3c4fc0e6397326b0c1dbe700d62ab8990b6ef29fd3b10a42dcd14d086 SHA512 5282af4ab0b7dde9372a690d3d88af6460ce20c77416a484634f6342d4b039ac73f13d3278165d03018280fac5a5114758567271ccd1ba8726303f568a4cac2d
 MISC metadata.xml 301 BLAKE2B 8f534e0e2f0e32a387b601c233d53c757c7f5022a49a18fee92a9fc28cf28cac9a1404284635ff3350c8e44e6441a1a6033b09581d59eac94fd5bbe6258f7748 SHA512 73ad30968dea93e4fc4eeed94f946cd9f08a3cb7e4c529b0e807a987fc8cd60ab8b01ffc93d7418b0637fd8e0b2d4913e9bfca5363751716068a4f35e6885818
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4-r3.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4-r3.ebuild
deleted file mode 100644
index 9eea59ec7a08..000000000000
--- a/x11-themes/silver-xcursors/silver-xcursors-0.4-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="5533-Silver-XCursors-3D-${PV}"
-
-DESCRIPTION="A high quality set of animated mouse cursors"
-HOMEPAGE="https://store.kde.org/p/999966/"
-SRC_URI="mirror://gentoo/$MY_P.tar.bz2"
-S="${WORKDIR}/${MY_P:5}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
-
-RDEPEND="x11-libs/libXcursor"
-
-src_install() {
-	insinto /usr/share/cursors/xorg-x11/
-	doins -r Silver/cursors/
-	dodoc README "${FILESDIR}"/README.gentoo
-}
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4-r4.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4-r4.ebuild
new file mode 100644
index 000000000000..59cce34c6e26
--- /dev/null
+++ b/x11-themes/silver-xcursors/silver-xcursors-0.4-r4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="5533-Silver-XCursors-3D-${PV}"
+
+DESCRIPTION="A high quality set of animated mouse cursors"
+HOMEPAGE="https://store.kde.org/p/999966/"
+SRC_URI="mirror://gentoo/$MY_P.tar.bz2"
+S="${WORKDIR}/${MY_P:5}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
+
+RDEPEND="x11-libs/libXcursor"
+
+src_install() {
+	insinto /usr/share/cursors/xorg-x11/Silver
+	doins -r Silver/cursors/
+	dodoc README "${FILESDIR}"/README.gentoo
+}
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 0692037b5691..14f2f6c473f4 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/bspwm/Manifest b/x11-wm/bspwm/Manifest
index 4d0a91809c7f..6717abc71384 100644
--- a/x11-wm/bspwm/Manifest
+++ b/x11-wm/bspwm/Manifest
@@ -3,4 +3,4 @@ DIST bspwm-0.9.10.tar.gz 114099 BLAKE2B 0fd14d3605e05146435d408846844b7e5015290f
 DIST bspwm-0.9.9.tar.gz 111119 BLAKE2B b4f80f090582c48ff5322bf6b03db5aee5bab1868b39ee3c4a3ca9f46f0f5d243a94bd869f2c91dcfbca22136c632b4fa0a2dee0e5fd2f27bd170b1f85c69545 SHA512 17f70e44667813fafcf0df144ed211df5a4479af6dfaf6e0a6bb7154a7380fa48d6135e8c440b6202d07012b76ac7372f73d4bf2f0c3a6716ed998d2ee4e59a2
 EBUILD bspwm-0.9.10.ebuild 963 BLAKE2B 63c3c721e8a8fcb374d5d82a37b2415a57fd514601fc1ce02d8a2dfc5d863271ccc378bf8a4cc06601748dfc37a6d610ed770c3e645d709d22565ff5b2b4b5f4 SHA512 de2814bec71e338da2b2cde5f378b51d94ad548bdf60740cefd1e1d27daa6d1d786080e9810f57b4484b3bdc59624c6f0bba068faf17ea059c93f2828c5a703a
 EBUILD bspwm-0.9.9.ebuild 980 BLAKE2B 6334d4ef01fd74ed27c02b016784721c635567bf71c431bac57b02c5b510cb7916c3a6516e36482d84686ccd1f9683dd4365b3a55374a240d3e4970afeb45003 SHA512 674eed848ffd30d8cf299ab7606a2165b35e17e4f2c98aad47c9941edc43ba878b9ef6fcfd3f81e56571fd10591aa832565e66496de35ee8fefa48ef26f48147
-MISC metadata.xml 328 BLAKE2B e0d5c7e609c0ea7cfbef740e84d00a3c7c43e1ad9a08c912a30632bd2ad313daf885a616f7595d591f8303448c50960244fa7f6e563eda661835f806df38e4ba SHA512 f8b1666589ca805fa092f460a129c87e73cb43ffbf50767c18d7b42c027927d46e730a11a7b034f56ac08aaf71145bd87d5fd076bd02db9d1e00fe2d540ae270
+MISC metadata.xml 250 BLAKE2B 753e22fd7acbe07e206d1eb6a8a7d7a1a9752b8e11a6a84086c96ef112026ed6f0f8e64812d737c45edcb638cb63c50a8fa4ea1f22e9aed32f841c3d398a84d0 SHA512 7ee35c9acc3a7a67d28c368f27d4b052af0334423c941d183b170a713f3004289eda105d0ec27df474094fba6ba32226eeaa5bb7befdaea53357b61ef15cee9d
diff --git a/x11-wm/bspwm/metadata.xml b/x11-wm/bspwm/metadata.xml
index ca5ebdfac7a5..297ea5190a64 100644
--- a/x11-wm/bspwm/metadata.xml
+++ b/x11-wm/bspwm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">baskerville/bspwm</remote-id>
 	</upstream>
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 8fd30ec0ef35..7965aa8441c2 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -2,6 +2,6 @@ AUX i3-4.16-musl-GLOB_TILDE.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a
 DIST i3-4.19.1.tar.xz 1277648 BLAKE2B a4d01d10c076da092faef2111ba0fadb481257c0011419cc911be0b63c0ff78053a39ff4a2887f6344794ea895190ebf1ac3585b598dbb90ff77d4de8fad7c53 SHA512 7a73d005e4ec438a7cf92ab719e17701948c5043cc431740b16e028e9771d1478fa539aebd1a8198fff6bec664f8bcecc17c3bd1ff35d53077d50d3ad1a8f7dc
 DIST i3-4.19.2.tar.xz 1277396 BLAKE2B 28d4dba50ae30cb620dcbd759e0ba29e284071234261aca2a217b6eef9194f72eca67d3632dc1e6a9b9879925e55c18b7a42676eaed41dd1354f772e48309d45 SHA512 58f08228d842cd3c2bc417b72f6279fcd7050879e5fd4064b2cb00edaf98b6605d5b2361608f9534991a0f8357d3294e881c7e314f33dc075241cc45ca5ed94d
 EBUILD i3-4.19.1.ebuild 1962 BLAKE2B afa9253da2dab6628674bc2d2b613a2c6a25dc9009840fda4029957c80d1fd61453a95dddcbf346bf5a457030735295b7dce72c62020efbe633087a027f2f9dc SHA512 67b9bac58c187654464633f205728e0000eba33cbdc965499ee4c689452b7ac4a559252c21fc271361c31bd9e0b486aab03f52b1d6fb8f3e35d25ea46640ab9a
-EBUILD i3-4.19.2.ebuild 1980 BLAKE2B b47551d40cc02e24a0c61ee99cf721cb3e2580806b3b4298648dbe6f03eecf043f619bde78735c4d24df29d94d8f37ac7e7cf7310187844475291514f6f2396b SHA512 d072a4304375e6cdb4ff2ba060f0c16ff9ea11d0d65ffe0c242f10c87933a869e49ded091441e8d0d6ca3cddf1f8f1ede82f61b832389d728d48820bed81a66a
+EBUILD i3-4.19.2.ebuild 1979 BLAKE2B e0ae6c87c9fca9406b2296a93959e37fb45cdde17217f9428cc95f0b94ca6c6eb0458300fac140753cea324bc669cfb9451afe3c6dc19253f13385f78a920d74 SHA512 306cefdbc5a7a073e5f335db2eeec3689ded16ad77d34957ae485537759544d42590dd611b7397e8c99b4e8fada105c1083ebb68b43126603cb8705f39294128
 EBUILD i3-9999.ebuild 1973 BLAKE2B 6560c66a1e6b47f767f7b9b7711646aeab3603d4856dba9973751f12ba99019d4c0f5d45d6ab28a75f01652d300654847b7f6eea8be48efe797e0940adfd4697 SHA512 d240e390c4c7f949de52ac382421afd5cab2f507fbe2bec97756180424c098a2fb62190d595dc49c8a4d71e59a3b433cb8a0177086445315af7c82a5a7e10dc6
-MISC metadata.xml 467 BLAKE2B 698d3f7309aa859af72db95540288e3fb4a848094d0a09b2d1deb5589f814cadc664bc455c0815bd0ac3ded9129495d7a7df8f60de1f9a7b48541c100f645b46 SHA512 6eda0780c6b9962ae7111c8f1390705b987ceff160532353f27366e336cdb00499dec8acf91aefa87fdddf99117b1f4c942d8ba94be6d41c246d342c9f075364
+MISC metadata.xml 537 BLAKE2B 81033b6b7a90a15350b23f77fe6c99d277025ae1f36ef6b5d78bf28f0b5c9fab608c165809433577551f0b478e5a154bc7b95b64b19f7ef9be18f6c7772473f8 SHA512 157b7fc03f7d9c9a455b787061a3e806701e98e3335a0f9edb50fbd5f7712ee3ed6e9573046d8fe72093e162c3253bad3e564b73633f4c67c60a326a103583be
diff --git a/x11-wm/i3/i3-4.19.2.ebuild b/x11-wm/i3/i3-4.19.2.ebuild
index beb15ef579d1..280591df10c5 100644
--- a/x11-wm/i3/i3-4.19.2.ebuild
+++ b/x11-wm/i3/i3-4.19.2.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/x11-wm/i3/metadata.xml b/x11-wm/i3/metadata.xml
index 508b0597e266..7f98b6efd612 100644
--- a/x11-wm/i3/metadata.xml
+++ b/x11-wm/i3/metadata.xml
@@ -12,4 +12,7 @@
 	<use>
 		<flag name="doc">Build and install the HTML documentation and regenerate the man pages</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">i3/i3</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 77d93a695f23..9895d0205bab 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -3,6 +3,6 @@ DIST icewm-2.5.0.tar.lz 1722504 BLAKE2B caf5d61559dd5bb25583bebeaca82e54049e2a97
 DIST icewm-2.7.0.tar.lz 1738471 BLAKE2B 407f5290329de99519b806db4bbc8895623d2930f37912db701170145579a1c2819b7ae2576b0aee146e8b006a12c78f7344224dd407ed7e8a1eba1cffc43ced SHA512 829673a3f7aa26fd7f74a9a8ab220548b6bb7724026517fa7ec1d5705fca2c0aa9339078d603242dbb2209c194a7a64aebcf55454aea5f8a20c4785e63e8cc3f
 DIST icewm-2.8.0.tar.lz 1745937 BLAKE2B dc5c4c6e4b5f067881176a0f72914f971dbae3daa475ed7ca00dbf3f687aae97874a0cf2e94b0d22d45f7dc221390c0658674e9aad3ea19d21a171b6d478c4be SHA512 552d1da9ceb96c6c14a0dfd596656a56fb289716a787fb75e54b49ef6df84747a4999ce733a6ffb9ff7a1e4c0243253fc3f2fa7a2251e7f3987ab9f33c0a1b30
 EBUILD icewm-2.5.0.ebuild 2952 BLAKE2B b0d75ba7ec27295593caa2bb47d51c518b35a81e95a53210b424f7632d197bb2cb6116feeee53f56348409589a13c2c288f01ddd76a98549643d051da89bfdee SHA512 016db15eb35afcc81a5312690790d43de8d6f936f99de63fc1efe6974adaf0f8a074bfb6e53711af9a561490686786e2e5b860d7f4fc678058eba44347f8c440
-EBUILD icewm-2.7.0.ebuild 2953 BLAKE2B 5b366e518e1c58ddae0dc11dd8b2ff39fba2e636e61d2367564debac48648c4b8169e15e1e0b382f3d2ed2b3c7d310401a98a70d1d39c0fa4721ab4870f51471 SHA512 da1c72a707d80181bb567ecc33b61d426c50774d6b08fb998336d9f1917760bd53e442e61f141db63acc77327df41d6c8c719bbefe9bc00f327dcee83e1dcf4b
+EBUILD icewm-2.7.0.ebuild 2952 BLAKE2B b0d75ba7ec27295593caa2bb47d51c518b35a81e95a53210b424f7632d197bb2cb6116feeee53f56348409589a13c2c288f01ddd76a98549643d051da89bfdee SHA512 016db15eb35afcc81a5312690790d43de8d6f936f99de63fc1efe6974adaf0f8a074bfb6e53711af9a561490686786e2e5b860d7f4fc678058eba44347f8c440
 EBUILD icewm-2.8.0.ebuild 2956 BLAKE2B 733dadf47f5dde98dabfce3b0e74bc5cf8912cb45bca3821651a59270b1ba3abd51b3de7cb992cf0e6b3c654badfb968e8de275bc5955f377d8b9132c77cc40e SHA512 412d620843feb1394f51611d035e86bcb21ba4e1bbd553b0e5a0c76e4dedf7f5490a9f64cb7b23d20f0526dccd508c51301b9a97df7af55894e7f0ffa6c77a04
 MISC metadata.xml 748 BLAKE2B 340b1eea319761630ad5bc22dc734fbfc2492acb263f03ea267e3c37c6c2928ba23cde5ee670c9265dae8bc3f78cdacf584c32d6c65219e859cf6df3b283be4d SHA512 4ba0d01e983f7a6c16ce6da6a7f54fb962154d50db8b820855e2c0dda7609526fc1aae039b469c27eaf6bd09a71b3c951c58b2a84d8aea9ce9fce4a5eff48b46
diff --git a/x11-wm/icewm/icewm-2.7.0.ebuild b/x11-wm/icewm/icewm-2.7.0.ebuild
index 08620af4ea13..6215cdd777d4 100644
--- a/x11-wm/icewm/icewm-2.7.0.ebuild
+++ b/x11-wm/icewm/icewm-2.7.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 1adfaa6bba66..82a0db2ba553 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,5 +1,3 @@
-DIST metacity-3.36.1.tar.xz 2063452 BLAKE2B 2dd7b1c63e0b5f87ce4518d7d42d472223717012a46dd826dfda3c88f7e647809e6bf2449a28bd38573342fd5fec94e2233db958658ea4320b22c5451390e451 SHA512 98e73036cca238b713a112194b2cd7a866bcf7d08ef29fb590054b69a1bd807699317a51f9b851f9c474ae2557e27dc9fc4a52d7c436d93ad4a02babef68feeb
 DIST metacity-3.40.0.tar.xz 1970260 BLAKE2B 4ccd38b0ceaeef7145d28b1f4e579aebe75e1506af8097e97e5422f39e04ae9d1e259f17cc08dc68fe71d4eb082311c736dbcfafb4a3a775f6ddcce5ce77b859 SHA512 f9eeb0b08bb302c5fb0d174a4df97b253255741d507e94200820d3ebe9e89f179c9096b8e56798836fc84cbe1ac76b27fee6762f3d41373280c4726bc7cba2ff
-EBUILD metacity-3.36.1.ebuild 1230 BLAKE2B 5ed0a66a03c26b6dec890a10cefe295d703df73b2af5fa996d192d3f91d30f454a359886a71b329cc95f980541231ede4eb724d63dd3f828bc07f4316c9cf852 SHA512 55217e43229292e884d88d4abc6f88b7626ef41904127e0b39f77da84d44d73970f53bac28d803eff48ede7b5fa07cd8c2a06476b9aab021037e5932b4fedcf8
 EBUILD metacity-3.40.0.ebuild 1282 BLAKE2B 026027e84110b1aa9cb6364a8975299b2bed61b6d99e50d37641289e431375421ed0b748f5725cc572b0b2724113cf76d4952cb87e9b674d7b06e6a7f23ec225 SHA512 6121dd8fee4d2c2a5466e22bc08751d431cd65e91d953ce3be4b0d90471ca8ab0e251da57889ede4e8b2e7bb2ad82875d9aefefee6d97596e6e35b7c4ee558ba
 MISC metadata.xml 478 BLAKE2B 6b6edfb923803da21c7d6c7bb9732bc387e4f57d0682ad79a4bad3a973c8f4746ecfe3ccd376f4ae41784e019f29861b973c66cc35ba3535126de2fc6c827b98 SHA512 759912aaecef429c799aa70ec28428be7572f7eb5ddadcc3f6c0aec469d6fd9ddc3cb0d3f54585b60a2a5764bbc6b4bde5da596d9800f5989f638d60795b1533
diff --git a/x11-wm/metacity/metacity-3.36.1.ebuild b/x11-wm/metacity/metacity-3.36.1.ebuild
deleted file mode 100644
index bc33e8f6558b..000000000000
--- a/x11-wm/metacity/metacity-3.36.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GNOME Flashback window manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+libcanberra vulkan xinerama"
-KEYWORDS="~amd64"
-
-# TODO: libgtop could be optional, but no knob
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=x11-libs/gtk+-3.22.0:3[X]
-	>=x11-libs/pango-1.2.0
-	>=x11-libs/libXcomposite-0.3
-	>=gnome-base/gsettings-desktop-schemas-3.3.0
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXdamage
-	libcanberra? ( media-libs/libcanberra[gtk3] )
-	>=x11-libs/startup-notification-0.7
-	x11-libs/libXcursor
-	gnome-base/libgtop:2=
-	x11-libs/libX11
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libICE
-	x11-libs/libSM
-	gnome-extra/zenity
-	vulkan? ( media-libs/vulkan-loader )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.4
-	x11-base/xorg-proto
-	virtual/pkgconfig
-" # autoconf-archive for eautoreconf
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable libcanberra canberra) \
-		$(use_enable xinerama) \
-		$(use_enable vulkan)
-}
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 8a95e861b777..3623b9986381 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,6 +1,6 @@
 AUX muffin-4.8.1-slibtool.patch 6242 BLAKE2B 487b87b47378cb827eaa85b0dbaa533bf6e79eaf712939aa694a8d42b54bb100b9e99b5b4d5fdce828a6e735af0a79fd99946a5c7a29ac5ab4ef1cea685efdee SHA512 8734ffc295042fc988a6668f12bc7f13a3de6783eff23418dd6dfd07f5f8a38697fa82e23b7e0703cbb4e20c78fa3e5b63e2943b272f5b50a487d6aba7252cdb
 DIST muffin-4.8.1.tar.gz 5195618 BLAKE2B 33dbbf7231b8f8d5c7df23d6cf8ddb29a86caca7b8c3b4af1231c98e114ee797d1c6bc866574348fcabaa65a93ff95c80366329bd5a41a46a74ba53ba81ce545 SHA512 61b621c7a4e25fc8ac69f2f5182e2caf52dfcfd456154f3b91ebb8b126319e704acd927ab5abe9e19ff057f38002a3b7e322e8d411db21e0fee7ec19d7928d31
-DIST muffin-5.0.1.tar.gz 5197104 BLAKE2B b9c9039c2fcd042859c28829f0df1f2d6991a0d90f4a1647d34cc56069ee80f5e0b4a13b1a49797f84815a97adbd96379060cc879c4aa4966f7f0a23cf7e938e SHA512 8e91e37372a2ac67e216c5e1c457e3a1f2a57a274976716aa28bb9c8621af4241f49ab5e46da609588abb23bbbf48b2b67af5926e43d052f31ddc6c6068ef81f
+DIST muffin-5.0.2.tar.gz 5197188 BLAKE2B 88a7530359386ceb14b0b509e1769d8cc4d552d9afa45faf6dbd62a457c7ca19d59e553176cf3689c3d22962c761a8633f6880802ea3c5453ff07901e3ca5374 SHA512 4f31b5a4b81db5967a3bc21b7f2bdbb30f47f5dcde12be467cd27f340164483ab43b423cd043dce50201c9b900ccab4a0fc84f4f6e22c66e901cd0c6d986761d
 EBUILD muffin-4.8.1.ebuild 2391 BLAKE2B c7bba34a7a838e54661e93df09dd5939632d911d3e95a11f8cee8b432e1d0dce7f370986cac7c89f0cf8e52005f1c839e556cb684ec848160382267bbec5811f SHA512 f6a8d5f7d4d1bed6d019f2f50ef026b989ecf9cc37feab790f7de04c8c173390df70f82c4f1202e6edf98fb20e161c4df40a753caae6faaa9d2629207c124f7a
-EBUILD muffin-5.0.1-r1.ebuild 2341 BLAKE2B a970ae932f31099e2c072a648ac69ee64839044ad8ff5579a29dec4d1240fe6182425df3f435354b7bc40af4b016f851f9f6a93d5616b336189a0c8040477144 SHA512 68402d22b36fd23c1140c4e48026a871bb59d26e6db27972b990ff3b4e8d4a4c9673aa4054990405a34ff31fb4baaea5665a9f6e3d74aebb0a91f1d4a7ffd075
+EBUILD muffin-5.0.2.ebuild 2341 BLAKE2B a970ae932f31099e2c072a648ac69ee64839044ad8ff5579a29dec4d1240fe6182425df3f435354b7bc40af4b016f851f9f6a93d5616b336189a0c8040477144 SHA512 68402d22b36fd23c1140c4e48026a871bb59d26e6db27972b990ff3b4e8d4a4c9673aa4054990405a34ff31fb4baaea5665a9f6e3d74aebb0a91f1d4a7ffd075
 MISC metadata.xml 486 BLAKE2B 26fc8398897e069e47a85126a78fe71fe0f6b0fad0a32078f2799fd4d15db18ebe4ff010f2a2b4889e2c27fe1bdc6244abb2c11ac02f1f1c050a5f2ba37c810d SHA512 ffb4b8c46f6fe2324d68c3041308342e550b3424c1909455cfad12d1a268eda4279ea28bd1836893f453fe9a45df568e81a6fb15d72b68fefdaad27fb8106315
diff --git a/x11-wm/muffin/muffin-5.0.1-r1.ebuild b/x11-wm/muffin/muffin-5.0.2.ebuild
index bad4d915000b..bad4d915000b 100644
--- a/x11-wm/muffin/muffin-5.0.1-r1.ebuild
+++ b/x11-wm/muffin/muffin-5.0.2.ebuild
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 095840f74e3f..44d0d322d6f9 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,8 +1,13 @@
 AUX mutter-40.0-Disable-anonymous-file-test.patch 862 BLAKE2B bb7a0f0dfa5f0543c9187fe8c3aa8d1251fbb9c74dcf4c518a4674758a22da70a94de688f4b01d7673c679a2e96cbdfa5c33de3d009c85fecd2498061121dcf3 SHA512 d2d7ec9e1fcc3fad9dc058edf611fe16a3180a8d6694a9f3257b22eb3885dc0b311bc48054de0d183c661658e226d1b04e4ad81b1314a60a3f441a6f4c06bed8
 DIST mutter-40.3.tar.xz 2682460 BLAKE2B 41e505adc9aa6ca53d1f43d71051bc09c0f4f528803f10c8f4ad8fe2cf28f5a02a3d3dca1a4a02b702a40177501663e20b68415295805b6c0503690dbb5e53fc SHA512 beb9cb1b8dee153fe204aa5d799e4ba44380c8483362ab4f7b149c715be6fa929345386b78af73ca6ae7e864dd2923e5c0de88404f8ffe5d22f2ae9238bcc074
 DIST mutter-40.4.tar.xz 2682648 BLAKE2B fe3ed2edc20b4502db17bf3e6413159047eaa9812baa01b49f64ca2e3f05fe6f2e922a8e84ffd01636e8b6e5e31381653311153db5910f2dd1c84431d1892f6b SHA512 a38fe7c1ba2c65cb4510ee3ecd9b3e726cf3cb35922977e55f8b49f5ab847601277e1efaec63e7068ce0f924b38085adfe6d26b6d0af148a8f87400b31aba805
+DIST mutter-40.5-r1-patchset.tar.xz 5568 BLAKE2B 3e1cc6a8cb0a792a4abedaaa1f856eae679acf17be8fa5be6c4bf764924d89950c8fcd264859049fcf326ed94e2b4d74433bbee16acf06bb0e180674a9d3a2c2 SHA512 8da4f92b2268a6966d468cd15063fb361a71299aff671203141225e74d5655ee1cb4f4e2f1922e06355c3f3b756638f3a2243ecafeb30273e3ff04897b6a23d8
 DIST mutter-40.5.tar.xz 2682916 BLAKE2B 9ba2eeb5962a5473804fab02b1209c6044b151a1bc64b533762a27e91f6701a0ad655f582c8831cf92defc7be82e9eaa2c72b772fe7ea5e032dab5ecc96fb1b1 SHA512 ebd4f2bc4e8eef99d66305347673cbd2e38c5a058eb91eab6b932671ea7cb4a2f893dd65c4c5028ece454f8dd293898821bd125b68e304cf905ad237abff8837
+DIST mutter-41.0-r1-patchset.tar.xz 61232 BLAKE2B 89a5f86e488b45933225010a5c37d533163d6ee75253a94b3545dae1886bff95a1463da45198646d3ebfd1e95134c0df6863e16ea927d86106ecd243fbad77f0 SHA512 967e7db9b6644c2b620f71081913adfdcd06b01decef52c9d6e64e7040c3d528f9cf15d0d0c561ae7c7ef8abe891b4890dc7e21862105b3b922a77718e703717
+DIST mutter-41.0.tar.xz 2710476 BLAKE2B 821c967ac2f130b1803132725540494c4c23bc766738d34645fced50fa8de97464432f554161c44ae4c7f7569c524204f3a57359a2958946c31589f24f674f99 SHA512 ad1b19cc05d434610657ab1d4f8d060dbd4584feba410da0c18fc9232082d6abee8d5c3c3243b12a47019779da3fe3f13b172b992d85de552cef696952cf65a3
 EBUILD mutter-40.3-r1.ebuild 4845 BLAKE2B a21695fee7ce8398b5ab40ae41bbf69a8bfb83fe747e0310306763d3768c0a7815d76022b00b234f2567d34ca4729e079011b4c4e09cf4025a16b69083127ce9 SHA512 936522dfc39a0f7565bb8bb0b3e24793df32275db5352620bd72eb0f50ec6623bbd257cc6e6381bf72b226b36e744abd1fc15339efdb559becb734cc3003767a
 EBUILD mutter-40.4.ebuild 4970 BLAKE2B c8295fb63e9b21ccde5abdcaef8ac0c6bc914240510fc16098d61ef4ef95a27f7019e8d04d199d951d88b9d1ac4388490009652b01540b65607058d4de4bb9c1 SHA512 9ac9571c79616782c1e1d2459531298c8aef03086217e442ac5b7e9404fd46fb9fceda3749a0a96d6cd91fa3ea9b26f2b3e8cfd328f78985e2c810504a9a3ad4
+EBUILD mutter-40.5-r1.ebuild 5067 BLAKE2B 23ae09d56f2e66265ca906f648ea7e3ff2b421029607ecc71fa60415455ade569a62b414c662157620822b0df261ce164b8a8edda0bf6b96ab06984db9004dae SHA512 b5c3386b4daadc4fa8a4b4efa57815520aef9c8fefb0739aaf31fb68ea3e0f9013a2ed473cf996bd2b22fcd1466968d825efcd13490c9dce94d97d87e64e7eda
 EBUILD mutter-40.5.ebuild 4971 BLAKE2B e8cc75ad7e71f42f0f50be44c3981a9b9c97671f075e8fec8a5ed2801d51defe5cb939354cb5556a291c46a0727f3ef43de7cccd93ad28f146760d8a67ef742b SHA512 87b5871161f120e2809256289b54043ae0438c4fa9bdc99d9fc3a6ee8a35b339ea702628de934388301eb2e031f279cb8aa4f9a59aa43729afd84e46f5e04d17
+EBUILD mutter-41.0-r1.ebuild 5129 BLAKE2B 64bd59426566eddf7896c000a4e93ea1dcc5f62c8603b02529c38408554aabfb3c3eb0af72b5297241d293ffcac43dbd7c9ef4efa7506b7b25b55856e1f91c39 SHA512 77f297bc9aaf009dd636b406f7c22e7ac63d0b5f34c29c700894e886d9bb69814a19fb12ebaa99d8582f0b99a2ae402f26edf818d8b37450047d0bdd0f988ad4
 MISC metadata.xml 606 BLAKE2B 54a05fee61cf9a1d958a46e0cc94e1cd61e69e187f89393c483c7022d455b7248684df4f1df028f0733995dacfbdf1faab600d8c239885eb0c7ea3097326f156 SHA512 6dea733bb5da3bd2db059a467cec81f7cfc0765750cdcfa0404a72cbb168495f13d01051198206178615b1a3fa41f78dffd9f0a38f6d7579116e782d76fab899
diff --git a/x11-wm/mutter/mutter-40.5-r1.ebuild b/x11-wm/mutter/mutter-40.5-r1.ebuild
new file mode 100644
index 000000000000..4c687e7de45d
--- /dev/null
+++ b/x11-wm/mutter/mutter-40.5-r1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson udev virtualx xdg
+
+DESCRIPTION="GNOME compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+
+IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+	wayland? ( ^^ ( elogind systemd ) udev )
+	test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+	>=x11-libs/libX11-1.7.0
+	>=media-libs/graphene-1.10.2[introspection?]
+	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.46[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=x11-libs/cairo-1.14[X]
+	>=gnome-base/gsettings-desktop-schemas-40.0[introspection?]
+	>=dev-libs/glib-2.67.3:2
+	gnome-base/gnome-settings-daemon
+	>=dev-libs/json-glib-0.12.0[introspection?]
+	gnome-base/gnome-desktop:3=
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-libs/libXrender
+	>=x11-libs/libXrandr-1.5.0
+	x11-libs/libxcb
+	x11-libs/libXinerama
+	x11-libs/libXau
+	x11-libs/libICE
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=media-libs/libcanberra-0.26
+	sys-apps/dbus
+	media-libs/mesa[X(+),egl]
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	wayland? (
+		>=dev-libs/wayland-protocols-1.19
+		>=dev-libs/wayland-1.18.0
+		x11-libs/libdrm:=
+		>=media-libs/mesa-17.3[egl,gbm,wayland,gles2]
+		>=dev-libs/libinput-1.15.0
+		systemd? ( sys-apps/systemd )
+		elogind? ( sys-auth/elogind )
+		x11-base/xwayland
+		video_cards_nvidia? ( gui-libs/egl-wayland )
+	)
+	udev? ( >=dev-libs/libgudev-232:=
+		>=virtual/libudev-232-r1:= )
+	x11-libs/libSM
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+	>=x11-libs/startup-notification-0.7
+	screencast? ( >=media-video/pipewire-0.3.21:0/0.3 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gnome-extra/zenity
+"
+DEPEND="${DEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
+"
+# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary
+BDEPEND="
+	dev-libs/wayland
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	wayland? (
+		>=sys-kernel/linux-headers-4.4
+		|| (
+			x11-libs/libxcvt
+			<x11-base/xorg-server-1.20.11-r3[xorg,-minimal]
+		)
+	)
+"
+
+PATCHES=(
+	"${WORKDIR}"/patches/
+	"${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch
+)
+
+src_configure() {
+	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
+	local emesonargs=(
+		-Dopengl=true
+		#opengl_libname
+		#gles2_libname
+		$(meson_use wayland gles2)
+		-Degl=true
+		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use wayland native_backend)
+		$(meson_use screencast remote_desktop)
+		$(meson_use udev)
+		-Dudev_dir=$(get_udevdir)
+		$(meson_use input_devices_wacom libwacom)
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(meson_use introspection)
+		$(meson_use test cogl_tests)
+		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+		-Dnative_tests=false
+		$(meson_use test clutter_tests)
+		$(meson_use test tests)
+		$(meson_use sysprof profiler)
+		-Dinstalled_tests=false
+		#verbose # Let upstream choose default for verbose mode
+		#xwayland_path
+		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+		#xwayland_grab_default_access_rules
+	)
+
+	if use wayland && use video_cards_nvidia; then
+		emesonargs+=(
+			-Degl_device=true
+			-Dwayland_eglstream=true
+		)
+	else
+		emsonargs+=(
+			-Degl_device=false
+			-Dwayland_eglstream=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-wm/mutter/mutter-41.0-r1.ebuild b/x11-wm/mutter/mutter-41.0-r1.ebuild
new file mode 100644
index 000000000000..1ed4f561b96b
--- /dev/null
+++ b/x11-wm/mutter/mutter-41.0-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson udev xdg
+
+DESCRIPTION="GNOME compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+
+IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+	wayland? ( ^^ ( elogind systemd ) udev )
+	test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+	>=x11-libs/libX11-1.7.0
+	>=media-libs/graphene-1.10.2[introspection?]
+	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.46[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=x11-libs/cairo-1.14[X]
+	>=gnome-base/gsettings-desktop-schemas-40.0[introspection?]
+	>=dev-libs/glib-2.69.0:2
+	gnome-base/gnome-settings-daemon
+	>=dev-libs/json-glib-0.12.0[introspection?]
+	gnome-base/gnome-desktop:3=
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-libs/libXrender
+	>=x11-libs/libXrandr-1.5.0
+	x11-libs/libxcb
+	x11-libs/libXinerama
+	x11-libs/libXau
+	x11-libs/libICE
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=media-libs/libcanberra-0.26
+	sys-apps/dbus
+	media-libs/mesa[X(+),egl]
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	systemd? ( sys-apps/systemd )
+	wayland? (
+		>=dev-libs/wayland-protocols-1.21
+		>=dev-libs/wayland-1.18.0
+		x11-libs/libdrm:=
+		>=media-libs/mesa-17.3[egl,gbm,wayland,gles2]
+		>=dev-libs/libinput-1.18.0
+		elogind? ( sys-auth/elogind )
+		x11-base/xwayland
+		video_cards_nvidia? ( gui-libs/egl-wayland )
+	)
+	udev? ( >=dev-libs/libgudev-232:=
+		>=virtual/libudev-232-r1:= )
+	x11-libs/libSM
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+	>=x11-libs/startup-notification-0.7
+	screencast? ( >=media-video/pipewire-0.3.21:0/0.3 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gnome-extra/zenity
+"
+DEPEND="${DEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
+"
+# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary
+BDEPEND="
+	dev-libs/wayland
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		app-text/docbook-xml-dtd:4.5
+		x11-misc/xvfb-run
+	)
+	wayland? (
+		>=sys-kernel/linux-headers-4.4
+		|| (
+			x11-libs/libxcvt
+			<x11-base/xorg-server-1.20.11-r3[xorg,-minimal]
+		)
+	)
+"
+
+PATCHES=(
+	"${WORKDIR}"/patches/
+	"${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch
+)
+
+src_configure() {
+	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
+	local emesonargs=(
+		-Dopengl=true
+		#opengl_libname
+		#gles2_libname
+		$(meson_use wayland gles2)
+		-Degl=true
+		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use systemd)
+		$(meson_use wayland native_backend)
+		$(meson_use screencast remote_desktop)
+		$(meson_use udev)
+		-Dudev_dir=$(get_udevdir)
+		$(meson_use input_devices_wacom libwacom)
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(meson_use introspection)
+		$(meson_use test cogl_tests)
+		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+		-Dnative_tests=false
+		$(meson_use test clutter_tests)
+		$(meson_use test tests)
+		$(meson_use sysprof profiler)
+		-Dinstalled_tests=false
+		#verbose # Let upstream choose default for verbose mode
+		#xwayland_path
+		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+		#xwayland_grab_default_access_rules
+	)
+
+	if use wayland && use video_cards_nvidia; then
+		emesonargs+=(
+			-Degl_device=true
+			-Dwayland_eglstream=true
+		)
+	else
+		emsonargs+=(
+			-Degl_device=false
+			-Dwayland_eglstream=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-wm/page/Manifest b/x11-wm/page/Manifest
index 8b38ff39b562..8be714f7b6ca 100644
--- a/x11-wm/page/Manifest
+++ b/x11-wm/page/Manifest
@@ -1,5 +1,5 @@
 DIST page-1.9.8.tar.gz 162352 BLAKE2B acde0feb62d58f66708ec09545137978540fb8c5fab651961b6e87d7c9d7be3170b8e2171c80ec553a9059ae2c23869759f37953da783be3a8fb3ea471e8b15b SHA512 758b1efbecb6d0a3d6ea0f7261b1c55db0927aa46d871f1a30b77e5aa7b9819ae74ca6fb821692656f2150da758793ba5653bdd94ab92ba2b79b39e0d4a4882e
 DIST page-1.9.9-r1.tar.gz 1009216 BLAKE2B 8248705f9e5eceaeea37889a9859249d9eb236f215da804f5edad3c36007179f63f132c161c1e4a6a97df6240f87799242140c97877775ae00f2e86dd7eed69d SHA512 9e7594590b1fdeadcf59d715d30727bee9f640903a34cadd8c0d92b3e94059c183d931a7d8e96763adb74f59a94acb03f7bfbbd4f1f8b57371fe886e6a227012
 EBUILD page-1.9.8.ebuild 1348 BLAKE2B fd2f8a03df95bd652bb253568e7c0ca8348eeb834d06f223c0d6d601f67e6ada45c36ef20d33ae5b90b88494f469853d0cc9af7dd110143b29d8a207adf133c7 SHA512 cd7719566b074cf9f074ed4e94298a1ffdfc1f852a9494fd63c55077bfef9c2f41116e2209ed3b78620172a9238266c8f869ffdbf46a1755aabb8a68fa16a602
-EBUILD page-1.9.9-r3.ebuild 1338 BLAKE2B 57513e1153465c8eebd9d5465c575637ae9e7e10273bce49f9d9d0f9a1e50fc66693802e6e370305f09f72a1af6b4d443f16a51ea55264c238a2bbeb401722a1 SHA512 5bf39133d17b991f19c5bf8366da9585abb4b4d66aab2db2959482258e1c11eee635980ddec7cb111e74de007a1c1d828a91781247eda30fd81ca4057f85adfe
+EBUILD page-1.9.9-r3.ebuild 1341 BLAKE2B d6a18ab1c4ae879f3aac459160aa33fa09e79ecc05812b6593d9dec787f48ae47fd061ce2951b81b1daeefe642e20c0eee45d83865f04d6a138c2925fcfa6419 SHA512 e55c83ff9baec2bbe3b24aaeb553bd4f98eda6c24e92854b46af86f3dd2d585328cc7b00332492a7a392e9316436f2831090585aa2e340f8c1f2d491ae1d81d7
 MISC metadata.xml 529 BLAKE2B 4c6d01f77562ee31d8bd0f72c5217036cdad2b10f1c24fe2a1d3840a68502d130979d21a8a9a4791378f4ccaffd7eb685feb0c3fb81edfd18d08be6bd8aa345d SHA512 d2989494a7f5a4a8d3c48343763098dcb9a5f7fb6754455b008e0cb982b4284d84809d7c299c2c7bcdc1ee76429286efdd03a9ecdfb0163fccaaaaa4ee2b45fc
diff --git a/x11-wm/page/page-1.9.9-r3.ebuild b/x11-wm/page/page-1.9.9-r3.ebuild
index 8fc15947bd37..a5c53381b117 100644
--- a/x11-wm/page/page-1.9.9-r3.ebuild
+++ b/x11-wm/page/page-1.9.9-r3.ebuild
@@ -42,7 +42,7 @@ src_install() {
 	ebegin "Changing references from 'page' to 'pagewm'"
 	mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!"
 	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!"
-	eend
+	eend $?
 }
 
 pkg_postinst() {
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index f7e06bc8ebed..f6c248e33bfc 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -1,6 +1,6 @@
 DIST pekwm-0.1.17.tar.gz 429100 BLAKE2B 2b467539ef47f4404411f25146f9f945f9a63b7e4c85c997ed2cd0bf76ea713758e3a09dc9648064c02ab29818399623d12d78394f250c79f8f667a6e057281c SHA512 1950888402f11c5cd72c9d82de976c472d4a0443da206629a039d19a1729660fd7cd09535d35984d554dcdb366918d9e29536b1272521f36f7e54499df0c14af
 DIST pekwm-0.1.18.tar.gz 441810 BLAKE2B 8c3e98490681eed68e0f127c38c1653f8d643ceca2ddf8388f6b434d16daeb376fc9337de71786a658e9d9e7a080de922207173edb624b78732bc14da5d42eeb SHA512 31fe291b245b6e13fdfe27878162fd405fd60a766e9a7e762e817391179e7f82c41b664fba568af91e009582729e4633d23f76db95302f6f702cb74c2571db15
 DIST pekwm-themes.tar.bz2 138599 BLAKE2B b0c103d7ade6f9bb1ed19b7e12cfcf00fb48be7e1ed141a4b52aee404ebf9c7af5d29af166ff7265a720ca8d122ad7eddb6eaf42a0a8e18b6c1ff3af7b5e12d0 SHA512 c95bc980b5aeeb4f4832cb2dbbf82adf72e4a784fcd46432fd6e6a6577ef02823ec1c4b861d07747c066050fc5040aca975e2cdc78342abab99a3d486888a25d
-EBUILD pekwm-0.1.17-r3.ebuild 1814 BLAKE2B fe8d6041949245c2b74112b483c37e5f82839300f2d9fbeaea8ac2de3f76942ecec14133f1c82df01ae57caf620c0f4fd9c52e00560ed5da0fac0ea68c645b4e SHA512 93d5f39de1217adc9f296ce446aa590eb45aaaf029f888f48f40afde228f41b45a9cc0370d95d11c2cceefc88bdee51f301b9117df92e34e2b58266300a7ddc3
-EBUILD pekwm-0.1.18.ebuild 1825 BLAKE2B ae8f3cb1738eeb96c8686e9c517c2be87827ac4e990c0961d422d762f322174ccc926ad61c55ae8b85367ee2d9a1be0b9427876be61f1ae9a66f66eff54a7a64 SHA512 4712feb2621f58226c4a41c8e3d30100a7e4059675658c6e2604223dce1a2debdd9b65bb9316ce7658b3aa2aec1d4d2cf458397b585c5dddfeb06ad8ba6e6275
+EBUILD pekwm-0.1.17-r3.ebuild 1828 BLAKE2B 5d2b59a19fcbf54efc82a6af1762bed96a302834e289f2e1fb71cf78285d508b1845050a5c7b65f5282e00486be56943c1dbefe8d7a3fad9337fa42ded49c5bb SHA512 7230bdcceb9e5d2fff59e796657168a36242204d956acc72cc49052a6ecb13d54dd3c4e9a602582efaf8ed21aa597e7a4c4509eaa267efd5a99a39e8115b4aa6
+EBUILD pekwm-0.1.18.ebuild 1839 BLAKE2B 5a44e02032b69d69a13c6af33ebaa59f4c75d886cc742e7680f26757f53624b4fc8290b05c08eadea70c3384a572ed4485a467a16d3adbde1b59483ddb5d7c61 SHA512 ef24ddf5aa9c3f6c2750ce000eeed1a4f3a2af2cadf82f345d1f193bf69a9f20a760df1a86685669f77ab26bfeaecfb7dbe2165f59a167b2fa0004ce5c8fd90d
 MISC metadata.xml 767 BLAKE2B d8634006b5aef00a9d208b1100db237a84fc7e865dba4a96dd485e09e2d025b86bec92a8ca9cd7e69dd82762b9afe385acf96327f24a58ca6b0b7e0aa49dd01d SHA512 4c27bd4a13c54e198c541c9b57db3b6082b7b79c558a172ec242cdfd415edc4af47ffe3d02229c20bdc29912aff41dc3d86d5c07b2fd0e3bcf75bac204371a7d
diff --git a/x11-wm/pekwm/pekwm-0.1.17-r3.ebuild b/x11-wm/pekwm/pekwm-0.1.17-r3.ebuild
index 736b6d30d9cc..9954b8ef44ae 100644
--- a/x11-wm/pekwm/pekwm-0.1.17-r3.ebuild
+++ b/x11-wm/pekwm/pekwm-0.1.17-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/pekdon/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz
-	themes? ( https://dev.gentoo.org/~jer/${PN}-themes.tar.bz2 )
+	themes? ( https://dev.gentoo.org/~jsmolic/distfiles/${PN}-themes.tar.bz2 )
 "
 
 LICENSE="GPL-2"
diff --git a/x11-wm/pekwm/pekwm-0.1.18.ebuild b/x11-wm/pekwm/pekwm-0.1.18.ebuild
index b17eeaccaf65..7d866b5fa28c 100644
--- a/x11-wm/pekwm/pekwm-0.1.18.ebuild
+++ b/x11-wm/pekwm/pekwm-0.1.18.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/pekdon/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz
-	themes? ( https://dev.gentoo.org/~jer/${PN}-themes.tar.bz2 )
+	themes? ( https://dev.gentoo.org/~jsmolic/distfiles/${PN}-themes.tar.bz2 )
 "
 S="${WORKDIR}"/${PN}-release-${PV}
 
diff --git a/x11-wm/subtle/Manifest b/x11-wm/subtle/Manifest
index 59247b795b4f..7eb6977286f1 100644
--- a/x11-wm/subtle/Manifest
+++ b/x11-wm/subtle/Manifest
@@ -1,4 +1,3 @@
 DIST subtle-0.11.3244.tar.gz 190549 BLAKE2B bb4b78165741ef30c1e9e145d4f26c8903d597dfa210688246210bb6f04ffb8b62b9295ffdfd0829f1c36019287ff82677253daf87878562b7ba55a517fb00ce SHA512 3d6edd5cb1b5dcd058caeddf3ead024c7cce39684baca8bac9709683ce3130a5c8433cbe046d28dc7420637dd855a2b6775638097f78a5e701bb85e505e8167c
 EBUILD subtle-0.11.3244-r1.ebuild 1924 BLAKE2B ddaf40394ae07529b812de11215296a60fe776edc6cc667247be915a419bf9c651f6d09d19fa802feeb8070e024b5262dcc7cdc29e7c7ead94cea37d8e89bfe8 SHA512 dce8fa1370489615ec717f64cd735ebc015fd4eb9c4d665176e4c4a374fae4de4ce4ebaaf125f01730e7c5c5ca9d2be8488b3adae708832dc099f8f52e4fc57e
-EBUILD subtle-0.11.3244.ebuild 2070 BLAKE2B 1c2d16eeb72c171c164e4ec5862b18e52380b72aa26a3252d0192cdb4c3098d2e906fce700d2b2892ed96e3530078b39fc37415d967f81bb6e9a565273047df2 SHA512 c98a5bf12b1d3322344cdcf80ff612e5f4bc0f25ca637f6872538674e26c8aeed9a87ea4a2200f3636ea3f654256c64ec1c520f6a8e175a7f28ac7b301ea2fb2
 MISC metadata.xml 1072 BLAKE2B 1697a2fbbafb79feb3d03b01ca32c6491321c68bda436a4aea7917ab5bb6cc19cd1bd658fcc44541303763ca97c0ce65f477dbe892f79197341a3ad82e908e68 SHA512 efc00cf35734c9c77ba9cc52f3fd7af62ccc1f3a6d728a406b4c74d9727eb85ff727e62f0f9bd66c92cfe7919360400dba7247edba05eacc0d1d863e7991e02d
diff --git a/x11-wm/subtle/subtle-0.11.3244.ebuild b/x11-wm/subtle/subtle-0.11.3244.ebuild
deleted file mode 100644
index ef71c3fce45f..000000000000
--- a/x11-wm/subtle/subtle-0.11.3244.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EHG_REPO_URI="https://hg.subforge.org/subtle"
-	EHG_CHECKOUT_DIR=${S}/all
-	inherit mercurial
-else
-	SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A manual tiling window manager"
-HOMEPAGE="https://subforge.org/projects/subtle/wiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug doc +xft xinerama xpm +xrandr +xtest"
-RESTRICT="!test? ( test )"
-
-RDEPEND="x11-libs/libX11
-	xft? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-	xpm? ( x11-libs/libXpm )
-	xtest? ( x11-libs/libXtst )
-	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-ruby_add_rdepend "dev-ruby/archive-tar-minitar"
-ruby_add_bdepend "dev-ruby/rake doc? ( dev-ruby/rdoc )"
-
-all_ruby_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		mercurial_src_unpack
-	else
-		default
-	fi
-}
-
-each_ruby_configure() {
-	local myconf
-	use debug && myconf+=" debug=yes" || myconf+=" debug=no"
-	use xft && myconf+=" xft=yes" || myconf+=" xft=no"
-	use xinerama && myconf+=" xinerama=yes" || myconf+=" xinerama=no"
-	use xpm && myconf+=" xpm=yes" || myconf+=" xpm=no"
-	use xtest && myconf+=" xtest=yes" || myconf+=" xtest=no"
-	use xrandr && myconf+=" xrandr=yes" || myconf+=" xrandr=no"
-
-	${RUBY} -S rake -v CC="$(tc-getCC)" destdir="${D}" ${myconf} config || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake -v build || die
-}
-
-all_ruby_compile() {
-	use doc && { rake rdoc || die ; }
-}
-
-each_ruby_install() {
-	${RUBY} -S rake -v install || die
-}
-
-all_ruby_install() {
-	dodir /etc/X11/Sessions
-	cat <<-EOF > "${D}/etc/X11/Sessions/${PN}"
-		#!/bin/sh
-		exec /usr/bin/subtle
-	EOF
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	insinto /usr/share/xsessions
-	doins data/${PN}.desktop
-
-	dodoc AUTHORS NEWS
-
-	use doc && dodoc -r html
-}
-
-pkg_postinst() {
-	elog "Note that surserver will currently not work since dev-ruby/datamapper"
-	elog "is not in the tree."
-}
diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
index cf093f8ee02a..ab31d2ead6b7 100644
--- a/x11-wm/wmfs/Manifest
+++ b/x11-wm/wmfs/Manifest
@@ -3,6 +3,6 @@ AUX wmfs-99999999-desktop.patch 153 BLAKE2B e9a3f1039bddd76ddc05955e843e89c1ab81
 AUX wmfs-99999999-fno-common.patch 1986 BLAKE2B 096becca88a23b15e3fee115640b50baca0f1f3ba58c15903a74fd4da75bc2e1662d672982940ac55c506f79f3820ffa9e851981008f82d9163eaf291e4339cf SHA512 b7593e0c0c0e3e73421a1636cdc2b3cebd6c51896e404bad9bec378e733b54cb0168a53dea40466128210f47459a2bb5e04074d588d33b07908efd1581472eaf
 AUX wmfs-99999999-strncat.patch 598 BLAKE2B e80fd233e895162e24f7264cf152c9a570665d5f6ff48ea1ec9212963c2b786b5707c8052d33a1a354b283042af0c2b7d5ac45f34e8dc57a68abd517d7e410aa SHA512 9141bd044a122fbe0aa10189f38d02e127c453665ae7d926dee852bb16ec7812450357e86ab6dfc8f48a41ce16891759a8229bb4a67f1bb5a970c7e6452298fd
 DIST wmfs-20180520.tar.xz 56364 BLAKE2B 23530193ba2c37ae4129fd23dda2ff8cd301b0bd92d32e06b264efd990b7957b38170de31f04afca6fd9875d2e0450c8bede416e5f49d6e19962718fe2e240a3 SHA512 bcff251397d8483db49c037c51eef7b3dcc87a6d94650ae9e9cabc7104177216e0efa7e67bfb34978bae67dc4853884673ce288bb8087e95cb2993d519ab4f2f
-EBUILD wmfs-20180520.ebuild 1132 BLAKE2B cb7e3aebeb66a9c09f0984f6ef7d3b1971e1365c12af12a2ba33484aa05b67bbe62f24a586b04c3d0000a69941378868c2104813ea5a43618617c1a48f4a88ba SHA512 49d7081c5c0f5cf9177b898b3eb81e9275fa06aa9a45afeb235b5c3742e92f28edbc80fca9310fc1c4172fa5ab8eac3d90b2822afb5f331e88d82b8aee380dc0
+EBUILD wmfs-20180520.ebuild 1146 BLAKE2B 63687796ea6c489004b9c2e6849ddaf915ef6fe5b6a965e83843d962474e6508a74684422fa968b93b7b09662167110c27da5d46212af117ecdd48d8f223f1ea SHA512 e0e8d520722df622cd697bc3ab750a4f7325ef489e2232b98bf984ed012c30fa25c710edc2e66488ed2b750dcf43793769e6001ebf28c7283682b4a8b5f81568
 EBUILD wmfs-99999999.ebuild 1130 BLAKE2B d0e2ae315de0ce2a810b0ff2b7bfb5dcd0ea6f2e98201ade65e7f4154c61a421a1c642c541078379ef3ff6d31ce2aa78f50423454251bba4649286b3cef38d46 SHA512 b52a4cbb7ef9268c7e3da454d08ea38df0d1f585ea94ca71f4dc7da157f19b85f50749b9ef7f71226c2ec0304c23c3de1ca8b07bbfb4961a7a85a7c517bff2ad
 MISC metadata.xml 337 BLAKE2B 37cbcce41705581321945fb5883880d4b03fa675814722af9e5e3175ccd757fa35670ba3feb7832009833db42ab5b59f066ce8cacbed090039bace82f5f53e71 SHA512 93086638f6017c646bcf1a99ada107baa3c43d997677c818445894fbe55c10c97cdd882f51c872ac6acfde0f34ce982d5ee54efdc4221ef3ae166d3f8501b6e4
diff --git a/x11-wm/wmfs/wmfs-20180520.ebuild b/x11-wm/wmfs/wmfs-20180520.ebuild
index f01f6ce2129b..b0225851e54d 100644
--- a/x11-wm/wmfs/wmfs-20180520.ebuild
+++ b/x11-wm/wmfs/wmfs-20180520.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
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Window Manager From Scratch, A tiling window manager highly configurable"
 HOMEPAGE="https://github.com/xorg62/wmfs"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 4661fd3aa922..ddcb65c4751f 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 4ea8254f5a28..91a674664511 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,8 +1,6 @@
 AUX exo-4.16.0-allow-cross.patch 2264 BLAKE2B b59456418bfc355aae39841adc530b2303faa1e7f6f3ead6d0657aa7ce5861ed9ce6aa4275335d468a89742cdd8dbf3cbac84412d5a764e6b5aab623082de129 SHA512 69cc01d7780c9cc488a32aab1a4246c7a7933c4c2cf45ac88cbfd6e9259a682ee7f31c079d103f9e86030cdb585eda86e9342c63cfcaed0ef1b249f4ad020ec8
 DIST exo-4.16.2.tar.bz2 881098 BLAKE2B df1ad499becd22087724abb716d07a50e432ec555d03a3892d0b81745045c334cb3705419e901697e4c3bc10328837b4f5c4055800d1b6c79c9cfc503427643b SHA512 9c1252d78f5bb900254841a79f1c1b952cb60d9d0197e184266c35a86c340140cdff2460fa83f6fabb66380e2b3d7ab8a08719b4f4784d2215dde51410ce33e8
-DIST exo-4.17.0.tar.bz2 876215 BLAKE2B 252efe98447ff9f7437370d0223f76b64b804eab32d173b77ba1644984faa2ae061d3b6434ab92c952c366ee520900bb26f6542ddca2dc86aade84626517f54c SHA512 9551c0e223b105348c886e52de6879428b672c51766a3277c81e4458389e4b129491cdc81c7b535278da6bc5d97f15f4ce509d5f9597eb6c85546b06b5486312
 DIST exo-4.17.1.tar.bz2 877757 BLAKE2B 152e168568f4ad12e1eb03f7b1971b3369647da0adac57f55d36fc176c36f7c2ccf9125f6bad386843753855b4bbb679a7a6abd80a9375d2212550e0987d4fa4 SHA512 597fee2cc0188159d5278bb5d547f1a4619645684ba3da4046946c5eb38b2a4913731e589caeeb2f8505516bdcbba64bee03291857215e2b4208aa3d2c563988
 EBUILD exo-4.16.2.ebuild 1037 BLAKE2B fc845e4cba69c4bfde2512f34e6c8674b9dc0614617d76f6ef050b8f6ba25dc8616622eaa9b6abd18aa52f5e2515a0a68a9230f07168fa70c798308f17ff3331 SHA512 0962ad579e7bdbb0f2e0127c9bd90972d4a6dddd57ca7b383084b5852743f7308731ec4a9b393fb76db710b13f4971f5d2390f94e0298aa021a89612e9b3788a
-EBUILD exo-4.17.0.ebuild 935 BLAKE2B 4c0db54f43f1321868edff4df673bdeac0d42f8b70c482d2761ce657cf8705710190a26d2eafbf0ed2954e199de48a47db97e97ce37fcdebb3d8462d8488a69f SHA512 839b506425507ccc3da2e1ead78f011ade6adb255d95fed6a8e652cf017122b57f084b689b515bd0e13eb093ce8cf477c87fa25de35b172178d96f073aa2fad8
 EBUILD exo-4.17.1.ebuild 935 BLAKE2B 22e3173c32dc14eb338e159298070d55815c11b7e75a34935a14d125077f8b5822d234305fcbd8dd550667fe151abd99847c54d884342bccbdbefc334a515ab1 SHA512 37d72958a4967cdce59632e24ca231a3bc582182634aac2fc8a798d571b4b742845ab6a571db3847f0702ff5d9d670cc712cb1970b46ff3c37b862bcd62fa957
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/exo/exo-4.17.0.ebuild b/xfce-base/exo/exo-4.17.0.ebuild
deleted file mode 100644
index 89520e8b9e9c..000000000000
--- a/xfce-base/exo/exo-4.17.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.50
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.16.0
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 1aa71f449a8d..ee4bd16f07d5 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,9 +1,7 @@
 DIST libxfce4ui-4.16.0.tar.bz2 837838 BLAKE2B a7e0612bb2a6e47fb9e03c69f1f014740b1ed0f363e198823b328980c106bf5566c880cdeac254291a44ff5a4fc6c8ae95c0396b37e6869e0ec3721897c75d43 SHA512 07ce8399ca860d5414f91b0795ba61eff21b6022a9e8c26de77a6c4e6c45371e10318b626a892b7e2998d95c7e92cf32c2cd48fdefc291bb5521fe8a6cf93aed
 DIST libxfce4ui-4.16.1.tar.bz2 785811 BLAKE2B d1267b328b7e2d07bfe85ce320da6a60d5a7d739c5ded9b213b83b0cde2061d3badc937e71c4353291ed435fb9d1294cadcc99402cdae69f4bcecf412dd525f2 SHA512 c183bbc75539c777fe704d0a1c4e533fdd2efb6cbc980cfedc2eaa80d0e6223db038498774ffcdc720d7f991dd8d9634183a757a4c4d1728cc9956a33cb187d0
-DIST libxfce4ui-4.17.0.tar.bz2 879058 BLAKE2B 5dd8bc1b03aaa0fc9ead58f0d5eacf470712ec5c3dcf055513d40f3798f834d82e288b5ca448c25b7b917a1d815ebc082c779ecb5f607479e06247ce7cdf9efe SHA512 c95afd0568818886bc953dbac4fd5f9a583499c944aea6b5b1d61ee05bdf7afe733f78abd8575c84adde4f9e16f795ebefbab912e3a8ab7046d8c205601d0944
 DIST libxfce4ui-4.17.1.tar.bz2 805413 BLAKE2B 008ab4988e66bc4f3dff3a9071ff1bcb83b7100193a5b10bec123a3c55ae94a21e43cb1bbf9723d5b736bede32f96425ff3e1768f43d607142d0b42ece5ddf29 SHA512 4ec6da3c454752c024e8ca26a84e6524d5fc12644a36c77a77375d533faf8f971d95dec555db7441ec100a17dd9fffd094144226efe27a155490a7c2bdea6484
 EBUILD libxfce4ui-4.16.0.ebuild 1727 BLAKE2B 0e00b59daa3ff407dad5ec02f09c7806160a4a80f08b5d1c1d9ca89588b77a295aee83dfd3e697bc87e1e4bbd8a2dbd7b0852494f783a2439515dd171bbd4d2d SHA512 1c3910d58274816dd82ecc058218a33f64eb5f99509912e127fab2b3369f3e64bd6b0a70afd6b1fdd1af84939c197b18d48bf24ee15e530233117bcd978450c3
-EBUILD libxfce4ui-4.16.1.ebuild 1733 BLAKE2B 07e7488f6381ffba6c2f1362725b06efc2dc442d53d74464ffa91e62f9b58e1d335ad91af8ee921fe04f802caa5e2ba950498c9356b148bbf0a8465159299ef8 SHA512 b90b6132badb8264b5da82a88d0493f3da59177f0f59b8cd7b6c0a6cd18693b1b6a014c6d25f710ebe5a87c8795fa9593b7c3257ce4757e1f59074ff6f272dc1
-EBUILD libxfce4ui-4.17.0.ebuild 1734 BLAKE2B a324f7bcc500a5a6373db94ee3bc6bb58f7bfcf98cadd8dff70e7aed0fbcb6ab1f6dedd4bc5668f4457987e38248371263f1eb76c5123ee628ba798a94f48316 SHA512 c47195bac879cd7cc6629f7b9ca8de0ac08db5706dc7bc592d8d408b266f8fdabfa507d3e222939d1168307d1da726b4ddb3225738af98877c269c3eaa71e64a
+EBUILD libxfce4ui-4.16.1.ebuild 1729 BLAKE2B 679f8f904b420fc94ab947c44bf97cf1a9df6c6113cbc033297bb0d9a48078217beb0dbfd1e47e4297572cdc758c1ae12a15e02c4ba50769606fbc0123382347 SHA512 7953ffca626be872823bdc1daec4776c907c5caafdc88ef2e929b490dde63865b49da98ec8b421c39b23426fa9c836a1e50cf5f79ef7e677b9c45adacd02043d
 EBUILD libxfce4ui-4.17.1.ebuild 1734 BLAKE2B a324f7bcc500a5a6373db94ee3bc6bb58f7bfcf98cadd8dff70e7aed0fbcb6ab1f6dedd4bc5668f4457987e38248371263f1eb76c5123ee628ba798a94f48316 SHA512 c47195bac879cd7cc6629f7b9ca8de0ac08db5706dc7bc592d8d408b266f8fdabfa507d3e222939d1168307d1da726b4ddb3225738af98877c269c3eaa71e64a
 MISC metadata.xml 415 BLAKE2B 96ab20930d257e21f8cb46d95f24e7d0fe7568aba5cc097ffb9ec46a5341d58dcf366522de79d8c04b575cd0cf6b96724ed969b8d6338cb842bd50787620ea9b SHA512 9712241bf2f9bb14ac6969f02768e7c4a159f7349eff4a7c9bc8fb779955a555b4cb5770ed32203933e603acb2fa9456cd989a62e274c94320e81e820555644e
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.16.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.16.1.ebuild
index ae80995aa26f..3504bb0116f0 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.16.1.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.16.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug glade +introspection startup-notification system-info vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.17.0.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.17.0.ebuild
deleted file mode 100644
index 4652758c2dc4..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.17.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils vala
-
-DESCRIPTION="Unified widget and session management libs for Xfce"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug glade +introspection startup-notification system-info vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3[introspection?,X]
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
-	>=xfce-base/xfconf-4.12:=
-	glade? ( dev-util/glade:3.10 )
-	introspection? ( dev-libs/gobject-introspection:= )
-	startup-notification? ( x11-libs/startup-notification )
-	system-info? (
-		dev-libs/libgudev
-		gnome-base/libgtop
-		>=media-libs/libepoxy-1.2
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable system-info glibtop)
-		$(use_enable system-info epoxy)
-		$(use_enable system-info gudev)
-		$(use_enable startup-notification)
-		$(use_enable vala)
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index be625d71f928..d3a12d62faf5 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,7 +1,5 @@
 DIST libxfce4util-4.16.0.tar.bz2 508328 BLAKE2B 99578b898389bd90841a7f903f5473b2ff357cf81256efe1019425b48da32401ce238deffefd299987477f4cdfb77e86e415b55049863c30bf16e0e641e08c72 SHA512 dce6992c3da73367461d7464794a9b2a5503666113682e07a86e18b1c5383de2b087809448d5729097571f4fda6b4af5f4f4600848514ab2ab4b3f367ca26f5c
-DIST libxfce4util-4.17.0.tar.bz2 531849 BLAKE2B 5c5de18703ade8bfa6a6be823144839afc309422131c06679a54b405c8d6aced4f1ccd0b9d0158931b6eed90aa48ab29789d1173c98541f92d3813c197283762 SHA512 4cdca029fb5e8b1cb5b34ca54aa1003918626824ee162adf43cede4c717b5e9705a5c0ff73f1a6348db320c4f3dddf4c9b8c760fba55f00d42bdb8fe7a9d90fa
 DIST libxfce4util-4.17.1.tar.bz2 527366 BLAKE2B 12de2090c0e2f7bb2bdd19ce63988810978f6d5893f866d65348dedfbb260ec11b518f8375ddc19a0a3502b14743878eb731ece79f31edf94d2bd505ea80d9c5 SHA512 49d11b50bbb0f72637bbdb9abba4e526f34814900dae337ad5e53df4514019a9761a89ef65a39e6ad94d633f7617c8466cb3985c5fae5350c45955d36077a0fc
 EBUILD libxfce4util-4.16.0.ebuild 1041 BLAKE2B fc3943cc33715dc765858991b9a42396c377e65d556d0d2fee0c630efd09bb50dbc962aa53007fc0290d0f129af7a71c8f911b4737f564904e80bbd4035ce62d SHA512 b464c87b4a85ec3b45b14e159f4f9f36c5ebe2a3bdefcb21c76a901d4435bda8da287605cc399d88b07062c81dc1982be47663c9e6b9ba9044755c079ab19005
-EBUILD libxfce4util-4.17.0.ebuild 1048 BLAKE2B c1722bf8d881cefcce56d3e32bccc3fbc21a12fa1f3405d92e3fbe06d6841e94c34454a2f8adf2f66a9cdc2f84df1609273243659969bc76fd6df00a683a085d SHA512 47d588765fff62cebf12b6d738057d307740b1cf9e6cb5edde30ff0dbebda75accb89125ab88d530a7bcee4b2425ca734cada1a1cb372de37f731d33512df285
 EBUILD libxfce4util-4.17.1.ebuild 1048 BLAKE2B 400eaa8fd18106a245d1a25d3c6a6b61190930c51d866fa8fa384eab3b14ed43ebf6fc0ccfb894ae83ce5c85613902a0e60f0812ec24bcad6505e4a7a5cb3b48 SHA512 26c1b75e800dac0985748086dfcaa0c0fad08b3418603b73877f2e1a631138355a493a54abe5db359177cc99909f3b046a58e0f8348d0e208a10febf7809fb36
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/libxfce4util/libxfce4util-4.17.0.ebuild b/xfce-base/libxfce4util/libxfce4util-4.17.0.ebuild
deleted file mode 100644
index f17b8a526eb7..000000000000
--- a/xfce-base/libxfce4util/libxfce4util-4.17.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vala
-
-DESCRIPTION="A basic utility library for the Xfce desktop environment"
-HOMEPAGE="https://git.xfce.org/xfce/libxfce4util/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="+introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.50
-	introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable vala)
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 9f2677c2bf6e..e0c23601b8c0 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-cpugraph-plugin/Manifest b/xfce-extra/xfce4-cpugraph-plugin/Manifest
index 3ec44db6c4f6..bfe0a59dd80a 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/Manifest
+++ b/xfce-extra/xfce4-cpugraph-plugin/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-cpugraph-plugin-1.2.3.tar.bz2 427880 BLAKE2B 1e2223eab1c8db275eb2aa43197c9aac8a79faee96778a5b684c0dc74e1b55046d0c1bbe3c00d316118be33ef3ee3777cafd258ef3919d36bbbb073e51fc9455 SHA512 79d7c5b328e778156c6a35b1f4947732f42aaffb23f05fdc5e1e7668d03149f1a72ca4bf9b835904a93db6b23660cb10118b4d046b1bd2dded38ef382719052e
 DIST xfce4-cpugraph-plugin-1.2.4.tar.bz2 445048 BLAKE2B 03c8c6f3aa0ffcfda930e79b851e6c6a425cab18986c7968fbdcecff3b251dc3134aab0c632d13439208445d0786e6e29a9835ccdff189bf82ae95b9b6576d6d SHA512 0a31b60d263f53db9e19165580c6f03a826e514f41b24555b007ae12b0d038d5f1447e637aa21e77cafe9970177dbeab373385e223f77768d46ede4f1adb0ad2
+DIST xfce4-cpugraph-plugin-1.2.5.tar.bz2 455357 BLAKE2B 8408338e7bd858940b1c8b25d8c5f622e72bbbcd61a5b96d44a9c4a88438fac476d1911cbf65f42b8bca9c478e7703cbc2e6ce2668d1b5ef9cd4d68076df6113 SHA512 1a0b362afa2dcae30721dc468e31949e4edfe20f5e1063603111d0cd7fcbd3460f14d7ffd30ae1d687400661c37a51a9c1b2f7abedea6c9e9888e93fbbb56d4a
 EBUILD xfce4-cpugraph-plugin-1.2.3.ebuild 815 BLAKE2B c070d7478c0da519addbc77b994ef70b02bf2305f77dbc7f54ddda572ac525a921f5cba4dda9b14082f8f56815f556c1858799f70ed12672ea95339006b4a354 SHA512 9c995793b7412222b659740866971b37841a08e35cf8619339aaa3b7a6aa6061e2477750bde0ca00d5d45a29a52d929c1560851af7c72e4fa58bc070f893c8c6
 EBUILD xfce4-cpugraph-plugin-1.2.4.ebuild 851 BLAKE2B c2b80ad2e422542d1196db425d8be21b7c3b0352c0813722f1f8671259745278f6c91c97143875f85c005294d2987ed6c421a93464cf62f900a75e39532ba1a9 SHA512 26ea9ce50fe8d95116ed6704c520684ab12b1abcc89075e669a00880846effb1021aa181b8503bd7798bb0e427d25567db2aa29d79704bfd7f1d7acd2bee08fe
+EBUILD xfce4-cpugraph-plugin-1.2.5.ebuild 851 BLAKE2B c2b80ad2e422542d1196db425d8be21b7c3b0352c0813722f1f8671259745278f6c91c97143875f85c005294d2987ed6c421a93464cf62f900a75e39532ba1a9 SHA512 26ea9ce50fe8d95116ed6704c520684ab12b1abcc89075e669a00880846effb1021aa181b8503bd7798bb0e427d25567db2aa29d79704bfd7f1d7acd2bee08fe
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.5.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.5.ebuild
new file mode 100644
index 000000000000..6e63cc625b45
--- /dev/null
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A system load plug-in for the Xfce panel"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=x11-libs/gtk+-3.22:3
+	>=xfce-base/libxfce4ui-4.14:=
+	>=xfce-base/libxfce4util-4.14:=
+	>=xfce-base/xfce4-panel-4.14:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index cc24231df9d3..90b5cf8ca411 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-whiskermenu-plugin-2.5.3.tar.bz2 175578 BLAKE2B 8641506316cacff45d88db4817b5a7d949c7f31b0b2f6748b67c54e668852653f706891d62b0e52ded51c58d59f4ba853df137fa0bad548df54399b7b174b486 SHA512 b293bfeef07ae07d2b4654de7aee795ec7790b291094dbd2655a271f9ad7c7de739b2d4b8c97aee7db85bcdf116c2f1b1150e1875ec2ba2b8bf0ec9f13561ac5
 DIST xfce4-whiskermenu-plugin-2.6.0.tar.bz2 179133 BLAKE2B dd672b857f0b3b40414f2d2400ea108e3f327264a5e340b3957126f232a8f147ddf07b338a872b986ff2767965b3b5fa593452e2ae86e6e19057c5578e573495 SHA512 f548cd224623f3b273c1087c33883e0deecbb2b79a71c8b781778771a3f6715bb81bedf707274157e006503eef2872b7ff1d0fe92b7f4d4766df0c7faf1b783c
+DIST xfce4-whiskermenu-plugin-2.6.1.tar.bz2 179186 BLAKE2B f1b2880144bee2de3213f540e30da19050eab5cd9b00c03e55bd7ce69ff09460362a2251d183effcad5da85a30641db263546f0b65b11ffa94aa23257e298f7a SHA512 69d98dc992c6ec89c79cac63fba29cffa1546c8c836896418ee300126be5dbd1a106d40e25d11de5c5d88c2f5d99ce5f0dc509c0d549d2bfe89d56aa1d5b82a2
 EBUILD xfce4-whiskermenu-plugin-2.5.3.ebuild 919 BLAKE2B 6065f34d10c8960a37718e9cf6b7ef5a9f43dbfd02b11a33aa7dbabf7ce15e7b9bb6864fe49c73b07c77a77d31956228e2324e9bae859c00e070184ec88a35dd SHA512 b7a9b0f6e53288de8f8cedf623583533fc0587dabee8f10e0b3b14965efe48493f87ecca12b4a0dba75276e5d48b68e0ed9ad8edc969de1c42aa61019da667fb
 EBUILD xfce4-whiskermenu-plugin-2.6.0.ebuild 993 BLAKE2B 9a513dd5878851c6eb04f5c1d035e85d9cbc95f29ee95fec57d49985d586e7669d425ebf9bf7613990801a9547b8022da06c029bd97595c4819d1800fb68c107 SHA512 58df2e6bd9a05a19cda626534e88872bf7b5500be6337c4efb32b3ff0d38734a6ef80faf504de51a894054d42ab26731017b00057eedbeed52d600cb132f1cd8
+EBUILD xfce4-whiskermenu-plugin-2.6.1.ebuild 993 BLAKE2B 9a513dd5878851c6eb04f5c1d035e85d9cbc95f29ee95fec57d49985d586e7669d425ebf9bf7613990801a9547b8022da06c029bd97595c4819d1800fb68c107 SHA512 58df2e6bd9a05a19cda626534e88872bf7b5500be6337c4efb32b3ff0d38734a6ef80faf504de51a894054d42ab26731017b00057eedbeed52d600cb132f1cd8
 MISC metadata.xml 2114 BLAKE2B 301868122902e577bed6e790601a192b839d3345d601e87403d5651aa99a260b7c80d9bb16a6f273a3a06531f091b3a2416eeb4cb0453692d00c17cf5478df24 SHA512 f5e4445fca8f8ae4cb1aa681108256584729ef6073e531f23729bb7880d839c3d29995480e21eabcd453f1f3368fb41d078b5091bb691d0879215ad6e3e1eb3a
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.6.1.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.6.1.ebuild
new file mode 100644
index 000000000000..a535ab4e79d4
--- /dev/null
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.6.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake xdg-utils
+
+DESCRIPTION="Alternate application launcher for Xfce"
+HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin/"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/libintl
+	x11-libs/gtk+:3
+	xfce-base/exo:=
+	xfce-base/garcon:=
+	xfce-base/libxfce4ui:=
+	xfce-base/libxfce4util:=
+	xfce-base/xfce4-panel:=
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# upstream does fancy stuff in other build types
+CMAKE_BUILD_TYPE=Debug
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_AS_NEEDED=OFF
+		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
+		-DENABLE_DEVELOPER_MODE=OFF
+		-DENABLE_LINK_TIME_OPTIMIZATION=OFF
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}